0 files changed, 0 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..2303faa0c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,57 @@
+# ignore Elgg configuration
+/engine/settings.php
+/engine/handlers/views_simplecache/*
+/.htaccess
+/mod/*
+
+# don't ignore bundled plugins
+!/mod/blog/
+!/mod/bookmarks/
+!/mod/categories/
+!/mod/custom_index/
+!/mod/dashboard/
+!/mod/developers/
+!/mod/diagnostics/
+!/mod/embed/
+!/mod/externalpages/
+!/mod/file/
+!/mod/garbagecollector/
+!/mod/groups/
+!/mod/htmlawed/
+!/mod/invitefriends/
+!/mod/likes/
+!/mod/linkup/
+!/mod/logbrowser/
+!/mod/logrotate/
+!/mod/members/
+!/mod/messageboard/
+!/mod/messages/
+!/mod/notifications/
+!/mod/oauth_api/
+!/mod/pages/
+!/mod/profile/
+!/mod/reportedcontent/
+!/mod/search/
+!/mod/tagcloud/
+!/mod/thewire/
+!/mod/tinymce/
+!/mod/twitter/
+!/mod/twitter_api/
+!/mod/uservalidationbyemail/
+!/mod/zaudio/
+
+# ignore IDE/hidden/testing/OS cache files
+.*
+*~
+/nbproject
+/nb-configuration.xml
+Session.vim
+*.tmproj
+*.tmproject
+tmtags
+Thumbs.db
+Desktop.ini
+/JsTestDriver-*.jar
+
+# don't ignore travis config
+!/.travis.yml
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..5cc8f375a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+phps:
+ - 5.2
+ - 5.3
+
+script: phpunit --help
+
+branches:
+  only:
+    - master
+\ No newline at end of file
diff --git a/.tx/config b/.tx/config
new file mode 100644
index 000000000..b1600d70c
--- /dev/null
+++ b/.tx/config
@@ -0,0 +1,501 @@
+[main]
+host = https://www.transifex.com
+
+[lorea.engine]
+file_filter = languages/<lang>.php
+source_file = languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.blog]
+file_filter = mod/blog/languages/<lang>.php
+source_file = mod/blog/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.bookmarks]
+file_filter = mod/bookmarks/languages/<lang>.php
+source_file = mod/bookmarks/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.categories]
+file_filter = mod/categories/languages/<lang>.php
+source_file = mod/categories/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.ckeditor]
+file_filter = mod/ckeditor/languages/<lang>.php
+source_file = mod/ckeditor/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.custom_index]
+file_filter = mod/custom_index/languages/<lang>.php
+source_file = mod/custom_index/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.dashboard]
+file_filter = mod/dashboard/languages/<lang>.php
+source_file = mod/dashboard/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.developers]
+file_filter = mod/developers/languages/<lang>.php
+source_file = mod/developers/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.diagnostics]
+file_filter = mod/diagnostics/languages/<lang>.php
+source_file = mod/diagnostics/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.embed]
+file_filter = mod/embed/languages/<lang>.php
+source_file = mod/embed/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.externalpages]
+file_filter = mod/externalpages/languages/<lang>.php
+source_file = mod/externalpages/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.file]
+file_filter = mod/file/languages/<lang>.php
+source_file = mod/file/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.garbagecollector]
+file_filter = mod/garbagecollector/languages/<lang>.php
+source_file = mod/garbagecollector/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.groups]
+file_filter = mod/groups/languages/<lang>.php
+source_file = mod/groups/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.invitefriends]
+file_filter = mod/invitefriends/languages/<lang>.php
+source_file = mod/invitefriends/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.likes]
+file_filter = mod/likes/languages/<lang>.php
+source_file = mod/likes/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.logbrowser]
+file_filter = mod/logbrowser/languages/<lang>.php
+source_file = mod/logbrowser/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.logrotate]
+file_filter = mod/logrotate/languages/<lang>.php
+source_file = mod/logrotate/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.members]
+file_filter = mod/members/languages/<lang>.php
+source_file = mod/members/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.messageboard]
+file_filter = mod/messageboard/languages/<lang>.php
+source_file = mod/messageboard/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.messages]
+file_filter = mod/messages/languages/<lang>.php
+source_file = mod/messages/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.notifications]
+file_filter = mod/notifications/languages/<lang>.php
+source_file = mod/notifications/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.pages]
+file_filter = mod/pages/languages/<lang>.php
+source_file = mod/pages/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.profile]
+file_filter = mod/profile/languages/<lang>.php
+source_file = mod/profile/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.reportedcontent]
+file_filter = mod/reportedcontent/languages/<lang>.php
+source_file = mod/reportedcontent/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.search]
+file_filter = mod/search/languages/<lang>.php
+source_file = mod/search/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.tagcloud]
+file_filter = mod/tagcloud/languages/<lang>.php
+source_file = mod/tagcloud/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.thewire]
+file_filter = mod/thewire/languages/<lang>.php
+source_file = mod/thewire/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.twitter]
+file_filter = mod/twitter/languages/<lang>.php
+source_file = mod/twitter/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.twitter_api]
+file_filter = mod/twitter_api/languages/<lang>.php
+source_file = mod/twitter_api/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.uservalidationbyemail]
+file_filter = mod/uservalidationbyemail/languages/<lang>.php
+source_file = mod/uservalidationbyemail/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.install]
+file_filter = install/languages/<lang>.php
+source_file = install/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.admins]
+file_filter = mod/admins/languages/<lang>.php
+source_file = mod/admins/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.assemblies]
+file_filter = mod/assemblies/languages/<lang>.php
+source_file = mod/assemblies/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.elggman]
+file_filter = mod/elggman/languages/<lang>.php
+source_file = mod/elggman/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.autosubscribegroup]
+file_filter = mod/autosubscribegroup/languages/<lang>.php
+source_file = mod/autosubscribegroup/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.beechat]
+file_filter = mod/beechat/languages/<lang>.php
+source_file = mod/beechat/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.captcha]
+file_filter = mod/captcha/languages/<lang>.php
+source_file = mod/captcha/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.cic_theme]
+file_filter = mod/cic_theme/languages/<lang>.php
+source_file = mod/cic_theme/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.colorbox]
+file_filter = mod/colorbox/languages/<lang>.php
+source_file = mod/colorbox/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.crud]
+file_filter = mod/crud/languages/<lang>.php
+source_file = mod/crud/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.curatedgroups]
+file_filter = mod/curatedgroups/languages/<lang>.php
+source_file = mod/curatedgroups/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.custom_index_widgets]
+file_filter = mod/custom_index_widgets/languages/<lang>.php
+source_file = mod/custom_index_widgets/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.dokuwiki]
+file_filter = mod/dokuwiki/languages/<lang>.php
+source_file = mod/dokuwiki/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.elgg-activitystreams]
+file_filter = mod/elgg-activitystreams/languages/<lang>.php
+source_file = mod/elgg-activitystreams/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.elgg-ostatus]
+file_filter = mod/elgg-ostatus/languages/<lang>.php
+source_file = mod/elgg-ostatus/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.elggpg]
+file_filter = mod/elggpg/languages/<lang>.php
+source_file = mod/elggpg/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.elgg-push]
+file_filter = mod/elgg-push/languages/<lang>.php
+source_file = mod/elgg-push/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.email_revalidate]
+file_filter = mod/email_revalidate/languages/<lang>.php
+source_file = mod/email_revalidate/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.etherpad]
+file_filter = mod/etherpad/languages/<lang>.php
+source_file = mod/etherpad/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.favorites]
+file_filter = mod/favorites/languages/<lang>.php
+source_file = mod/favorites/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.federated-objects]
+file_filter = mod/federated-objects/languages/<lang>.php
+source_file = mod/federated-objects/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.friendrequest]
+file_filter = mod/friendrequest/languages/<lang>.php
+source_file = mod/friendrequest/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.gifts]
+file_filter = mod/gifts/languages/<lang>.php
+source_file = mod/gifts/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.group_alias]
+file_filter = mod/group_alias/languages/<lang>.php
+source_file = mod/group_alias/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.group_operators]
+file_filter = mod/group_operators/languages/<lang>.php
+source_file = mod/group_operators/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.identica]
+file_filter = mod/identica/languages/<lang>.php
+source_file = mod/identica/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.infinite_scroll]
+file_filter = mod/infinite_scroll/languages/<lang>.php
+source_file = mod/infinite_scroll/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.landing]
+file_filter = mod/landing/languages/<lang>.php
+source_file = mod/landing/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.lightpics]
+file_filter = mod/lightpics/languages/<lang>.php
+source_file = mod/lightpics/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.linkup]
+file_filter = mod/linkup/languages/<lang>.php
+source_file = mod/linkup/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.livestream]
+file_filter = mod/livestream/languages/<lang>.php
+source_file = mod/livestream/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.microthemes]
+file_filter = mod/microthemes/languages/<lang>.php
+source_file = mod/microthemes/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.n1_theme]
+file_filter = mod/n1_theme/languages/<lang>.php
+source_file = mod/n1_theme/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.openid_client]
+file_filter = mod/openid_client/languages/<lang>.php
+source_file = mod/openid_client/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.opensearch]
+file_filter = mod/opensearch/languages/<lang>.php
+source_file = mod/opensearch/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.profile_widgets]
+file_filter = mod/profile_widgets/languages/<lang>.php
+source_file = mod/profile_widgets/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.proposals]
+file_filter = mod/proposals/languages/<lang>.php
+source_file = mod/proposals/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.registrationterms]
+file_filter = mod/registrationterms/languages/<lang>.php
+source_file = mod/registrationterms/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.relatedgroups]
+file_filter = mod/relatedgroups/languages/<lang>.php
+source_file = mod/relatedgroups/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.river_privacy]
+file_filter = mod/river_privacy/languages/<lang>.php
+source_file = mod/river_privacy/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.simple_faq]
+file_filter = mod/simple_faq/languages/<lang>.php
+source_file = mod/simple_faq/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.simplepie]
+file_filter = mod/simplepie/languages/<lang>.php
+source_file = mod/simplepie/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.spotlight]
+file_filter = mod/spotlight/languages/<lang>.php
+source_file = mod/spotlight/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.subgroups]
+file_filter = mod/subgroups/languages/<lang>.php
+source_file = mod/subgroups/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.suicide]
+file_filter = mod/suicide/languages/<lang>.php
+source_file = mod/suicide/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.tasks]
+file_filter = mod/tasks/languages/<lang>.php
+source_file = mod/tasks/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.threads]
+file_filter = mod/threads/languages/<lang>.php
+source_file = mod/threads/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.tinymce]
+file_filter = mod/tinymce/languages/<lang>.php
+source_file = mod/tinymce/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.uservalidationbyadmin]
+file_filter = mod/uservalidationbyadmin/languages/<lang>.php
+source_file = mod/uservalidationbyadmin/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.videolist]
+file_filter = mod/videolist/languages/<lang>.php
+source_file = mod/videolist/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.openid_server]
+file_filter = mod/openid_server/languages/<lang>.php
+source_file = mod/openid_server/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
+[lorea.event_calendar]
+file_filter = mod/event_calendar/languages/<lang>.php
+source_file = mod/event_calendar/languages/en.php
+source_lang = en
+type = PHP_ARRAY
+
diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 000000000..f6974a3ae
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,679 @@
+Version 1.8.18
+(January 11, 2014 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Juho Jaakkola
+   * Steve Clay
+
+  Bugfixes:
+   * Fixes notify_user() broken in 1.8.17
+
+
+Version 1.8.17
+(January 1, 2014 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Brett Profitt
+   * Cash Costello
+   * Ed Lyons
+   * Evan Winslow
+   * Jeroen Dalsem
+   * Jerome Bakker
+   * Juho Jaakkola
+   * Matt Beckett
+   * Paweł Sroka
+   * Sem
+   * Steve Clay
+
+  Security Fixes:
+   * Specially-crafted request could return the contents of sensitive files.
+   * Reflected XSS attack was possible against 1.8 systems.
+   * The cryptographic key used for various purposes may have been generated with weak entropy, particularly on Windows.
+
+  Bugfixes:
+   * URLs with non-ASCII usernames again work
+   * Floated images are now properly cleared in content areas
+   * The activity page title now matches the document title
+   * Search again supports multiple comments on the same entity
+   * Blog archive sidebar now reverse chronological
+   * URLs with matching parens can now be auto-linked
+   * Log browser links for users now work
+   * Disabling over 50 objects should no longer result in an infinite loop
+   * Radio/checkbox inputs no longer have border radius (for IE10)
+   * User picker: the Only Friends checkbox again works
+   * Group bookmarklet no longer shown to non-members
+   * Widget reordering fixed when moving across columns
+   * Refuse to deactivate plugins needed as dependencies
+
+  Enhancements:
+   * Group member listings are ordered by name
+   * The system_log table can now store IPv6 addresses
+   * Web services auth_gettoken() now accepts email address
+   * List functions: no need to specify pagination for unlimited queries
+   * Htmlawed was upgraded to 1.1.16
+
+
+Version 1.8.16
+(June 25, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Brett Profitt
+   * Cash Costello
+   * Jeff Tilson
+   * Jerome Bakker
+   * Paweł Sroka
+   * Steve Clay
+
+  Security Fixes:
+   * Fixed avatar removal bug (thanks to Jerome Bakker for the first report of this)
+
+  Bugfixes:
+   * Fixed infinite loop when deleting/disabling an entity with > 50 annotations
+   * Fixed deleting log tables in log rotate plugin
+   * Added full text index for groups if missing
+   * Added workaround for IE8 and jumping user avatar
+   * Fixed pagination for members pages
+   * Fixed several internal cache issues
+   * Plus many more bug fixes
+
+
+Version 1.8.15
+(April 23, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Cash Costello
+   * Ismayil Khayredinov
+   * Jeff Tilson
+   * Juho Jaakkola
+   * Matt Beckett
+   * Paweł Sroka
+   * Sem
+   * Steve Clay
+   * Tom Voorneveld
+
+  Bugfixes:
+   * Not displaying http:// on profiles when website isn't set
+   * Fixed pagination display issue for small screens
+   * Not hiding subpages of top level pages that have been deleted
+   * Stop corrupting JavaScript views with elgg deprecation messages
+   * Fixed out of memory error due to query cache
+   * Fixed bug preventing users authorizing Twitter account access
+   * Fixed friends access level for editing pages
+   * Fixed uploading files within the embed dialog
+
+  Enhancements:
+   * Added browser caching of language JS files
+   * Adding nofollow on user posted URLs for spam deterrence (thanks to Hellekin)
+   * Auto-registering views for simplecache when their URL is requested
+   * Display helpful message for those who have site URL configuration issues
+   * Can revert to a previous revision with pages plugin
+   * Site owners can turn off posting wire messages to Twitter
+   * Search results are sorted by relevance
+
+  Dropped Plugins:
+   * Twitter widget due to changes in Twitter API and terms of service
+   * OAuth API plugin due to conflicts with the Twitter API plugin
+
+
+Version 1.8.14
+(March 12, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Aday Talavera
+   * Brett Profitt
+   * Cash Costello
+   * Ed Lyons
+   * German Bortoli
+   * Hellekin Wolf
+   * iionly
+   * Jerome Bakker
+   * Luciano Lima
+   * Matt Beckett
+   * Paweł Sroka
+   * Sem
+   * Steve Clay
+
+  Security Fixes:
+   * Fixed a XSS vulnerability when accepting URLs on user profiles
+   * Fixed bug that exposed subject lines of messages in inbox
+   * Added requirement for CSRF token for login
+
+  Bugfixes:
+   * Strip html tags from tag input
+   * Fixed several display issues for IE7
+   * Fixed several issues with blog drafts
+   * Fixed repeated token timeout errors
+   * Fixed JavaScript localization for non-English languages
+
+  Enhancements:
+   * Web services fall back to json if the viewtype is invalid
+
+
+Version 1.8.13
+(January 29, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Cash Costello
+   * Juho Jaakkola
+   * Kevin Jardine
+   * Krzysztof Różalski
+   * Steve Clay
+
+  Security Fixes:
+   * Added validation of Twitter usernames in Twitter widget
+
+  Bugfixes:
+   * CLI usages with walled garden fixed
+   * Upgrading from < 1.8 to 1.8 fixed
+   * Default widgets fixed
+   * Quotes in object titles no longer result in "qout" in URLs
+   * List of my groups is ordered now
+   * Language string river:comment:object:default is defined now
+   * Added language string for comments: generic_comment:on
+
+  Enhancements:
+   * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm)
+
+
+Version 1.8.12
+(January 4th, 2013 from https://github.com/Elgg/Elgg/tree/1.8)
+  Contributing Developers:
+   * Brett Profitt
+   * Cash Costello
+   * Jerome Bakker
+   * Matt Beckett
+   * Paweł Sroka
+   * Sem
+   * Steve Clay
+
+  Bugfixes:
+   * Added an AJAX workaround for the rewrite test.
+   * Code cleanup to prevent some notices and warnings.
+   * Removed "original_order" in menu item anchor tags.
+   * Site menu's selected item correctly persists through content pages.
+   * Static caches rewritten and improved to prevent stale data being returned.
+   * Installation: Invalid characters in admin username are handled correctly.
+   * Messages: Fixed inbox link in email notifications.
+   * The Wire: Fixed objects not displaying correctly when upgrading from 1.7.
+
+  Enhancements:
+   * Performance improvements and improved caching in entity loading.
+   * Added upgrade locking to prevent concurrent upgrade attempts.
+   * Replaced xml_to_object() and autop() with GPL / MIT-compatible code.
+   * Error messages (register_error()) only fade after being clicked.
+   * Groups: Added a sidebar entry to display membership status and a link to
+     group notification settings.
+   * Groups: Added pending membership and invitation requests to the sidebar.
+   * Groups: Better redirection for invisible and closed groups.
+   * Search: User profile fields are searched.
+   * Pages: Subpages can be reassigned to new parent pages.
+   * Twitter: Login with twitter supports persistent login and correctly forwards
+     after login.
+
+
+Version 1.8.11
+(December 5th, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+  Bugfix:
+   * Fixed fatal error in group creation form
+
+
+Version 1.8.10
+(December 4th, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+  Contributing Developers:
+   * Krzysztof Różalski
+   * Lars Hærvig
+   * Paweł Sroka
+   * RiverVanRain
+   * Sem
+   * Steve Clay
+
+  Security Enhancements:
+   * Cached metadata respects access restrictions to fix problems with profile
+     field display.
+   * Group RSS feeds are restricted to valid entities
+
+  Enhancements:
+   * UX: Added a list of Administrators in the admin area
+   * UX: Limiting message board activity stream entries to excerpts
+   * Performance: Prefetching river entries
+   * Performance: Plugin entities are cached
+
+  Bugfixes:
+   * Removed superfluous commas in JS files to fix IE compatibility.
+   * API: Fixed Twitter API.
+   * Performance: Outputting valid ETags and expires headers.
+
+
+Version 1.8.9
+(November 11, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Contributing Developers:
+  * Brett Profitt
+  * Cash Costello
+  * Evan Winslow
+  * Jeroen Dalsem
+  * Jerome Bakker
+  * Matt Beckett
+  * Paweł Sroka
+  * Sem
+  * Steve Clay
+
+ Security Enhancements:
+  * Sample CLI installer cannot break site
+  * Removed XSS vulnerabilities in titles and user profiles
+
+ Enhancements:
+  * UX: A group's owner can transfer ownership to another member
+  * UX: Search queries persist in the search box
+  * Several (X)HTML validation improvements
+  * Improved performance via more aggressive entity and metadata caching
+  * BC: 1.7 group profile URLs forward correctly
+
+ Bugfixes:
+  * UX: Titles containing HTML tokens are never mangled
+  * UX: Empty user profile values saved properly
+  * UX: Blog creator always mentioned in activity stream (not user who published it)
+  * UI: Fixed ordering of registered menu items in some cases
+  * UI: Embed dialog does not break file inputs
+  * UI: Datepicker now respects language
+  * UI: More reliable display of access input in widgets
+  * UI: Group edit form is sticky
+  * UI: Site categories are sticky in forms
+  * API: Language fallback works in Javascript
+  * API: Fallback to default viewtype if invalid one given
+  * API: Notices reported for missing language keys
+  * Memcache now safe to use; never bypasses access control
+  * BC: upgrade shows comments consistently in activity stream
+
+
+Version 1.8.8
+(July 11, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Contributing Developers:
+  * Cash Costello
+  * Miguel Rodriguez
+  * Sem
+
+ Enhancements:
+  * Added a delete button on river items for admins
+
+ Bugfixes:
+  * Fixed the significant bug with htmlawed plugin that caused duplicate tags
+
+
+Version 1.8.7
+(July 10, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Contributing Developers:
+  * Cash Costello
+  * Evan Winslow
+  * Ismayil Khayredinov
+  * Jeroen Dalsem
+  * Jerome Bakker
+  * Matt Beckett
+  * Miguel Rodriguez
+  * Paweł Sroka
+  * Sem
+  * Steve Clay
+
+ Enhancements:
+  * Better support for search engine friendly URLs
+  * Upgraded htmlawed (XSS filtering)
+  * Internationalization support for TinyMCE
+  * Public access not available for walled gardens
+  * Better forwarding and messages when they cannot view content because logged out
+
+ Bugfixes:
+  * Fatal errors due to type hints downgraded to warnings
+  * Group discussion reply notifications work again
+  * Sending user to inbox when deleting a message
+  * Fixed location profile information when it is an array
+  * Over 30 other bug fixes.
+
+
+Version 1.8.6
+(June 18, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Contributing Developers:
+  * Cash Costello
+  * Evan Winslow
+  * Ismayil Khayredinov
+  * Jeff Tilson
+  * Jerome Bakker
+  * Paweł Sroka
+  * Sem
+  * Steve Clay
+
+ Enhancements:
+  * New ajax spinner
+  * Detecting docx, xlsx, and pptx files in file plugin
+  * Showing ajax spinner when uploading file with embed plugin
+
+ Bugfixes:
+  * Fixed some language caching issues.
+  * Users can add sub-pages to another user's page in a group.
+  * Over 30 other bug fixes.
+
+
+Version 1.8.5
+(May 17, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+ 
+ Contributing Developers:
+  * Brett Profitt
+  * Evan Winslow
+  * Sem
+  * Steve Clay
+  * Jeroen Dalsem
+  * Jerome Bakker
+
+ Security Enhancements:
+  * Fixed possible XSS vulnerability if using a crafted URL.
+  * Fixed exploit to bypass new user validation if using a crafted form.
+  * Fixed incorrect caching of access lists that could allow plugins
+    to show private entities to non-admin and non-owning users. (Non-exploitable)
+
+ Bugfixes:
+  * Twitter API: New users are forwarded to the correct page after creating 
+                 an account with Twitter.
+  * Files: PDF files are downloaded as "inline" to display in the browser.
+  * Fixed possible duplication errors when writing metadata with multiple values.
+  * Fixed possible upgrade issue if using a plugin uses the system_log hooks.
+  * Fixed problems when enabling more than 50 metadata or annotations.
+
+ API:
+  * River entries' timestamps use elgg_view_friendly_time() and can be 
+     overridden with the friendly time output view.
+
+
+Version 1.8.4
+(April 24, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Contributing Developers:
+   * Adayth Talavera
+   * Brett Profitt
+   * Cash Costello
+   * Evan Winslow
+   * Ismayil Khayredinov
+   * Janek Lasocki-Biczysko
+   * Jerome Baker
+   * Sem
+   * Steve Clay
+   * Webgalli
+
+ Security Enhancements:
+  * Fixed an issue in the web services auth.get_token endpoint that
+    would give valid auth tokens to invalid credentials. Thanks to
+    Christian for reporting this!
+  * Fixed an that could show which plugins are loaded on a site.
+
+ Enhancements:
+  * UI: All bundled plugins' list pages display a no content message if there is nothing to list.
+  * UI: Site default access is limited to core access levels.
+  * UI: Showing a system message to the admin if plugins are disabled with the "disabled"
+    magic file.
+  * UI: Added transparent backgrounds for files and pages icons.
+  * External (Site) Pages: If in Wall Garden mode, Site Pages use the Walled Garden
+    theme when logged out.
+  * UI: Database errors only show the query to admin users.
+  * UI: Cannot set the data path to a relative path in installation or site settings.
+  * UI: Cleaned up notifications for bundled plugins.
+  * UI: Hiding crop button if no avatar is uploaded.
+  * UI: Bundled plugins are displayed with a gold border in the plugin admin area.
+  * UI: Can see all the categories a plugin belongs to.
+  * Web Services: Multiple tokens allowed for users.
+  * API: More efficient entity loading.
+  * API: Added IP address to system log.
+  * API: Languages are cached.
+  * API: ElggBatch supports disabling offsets for callbacks that delete entities.
+  * API: Cleaned up the boot process.
+  * API: Fixed situation in which the cache isn't properly cleared if a file can't be unlinked.
+
+ Bugfixes:
+  * UI: Tags display in the case they were saved.
+  * UI: Friendly titles keep -s.
+  * UI: Removed pagination in friends widget.
+  * UI: Profile settings actions correctly displays error messages as errors.
+  * UI: Tag search works for tags with spaces.
+  * UI: Fixed river display for friending that happens during registration.
+  * Groups: Link for managing join requests is restored in the sidebar.
+  * Walled Garden: Cron and web services endpoints are exposed as public sites.
+  * The Wire: UTF usernames are correctly linked with @ syntax.
+  * The Wire: No longer selecting the "Mine" tab for users who aren't you.
+  * Blogs: Notifications restored.
+  * Message Board: Fixed delete.
+  * Groups: Forwarding to correct page if trying to access closed group.
+  * API: entities loaded via elgg_get_entities_from_relationship() have the correct time_created.
+  * API: Deleting entities recursively works when code is logged out.
+  * API: Fixed multiple uses of deprecated functions.
+
+
+Version 1.8.3
+(January 12, 2012 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Enhancements:
+  * Adds a white list for ajax views
+  * Improved navigation tab options
+  * Added group specific search
+  * Added button for reverting avatar
+  * Improved documentation for core class attributes
+  * Adds a server info page under administer -> statistics
+  * Improving caching of icons and js/css
+  * Deprecation notices not displayed to non-admin users
+
+ Bugfixes:
+  * Fixed upgrade scripts for blog posts and groups forum posts
+  * Can now delete invitations to invisible groups
+  * Fixed several widget bugs
+  * Fixed access level on add to group river item
+  * Fixed recursive entity enabling
+  * Fixed limit on pages in sidebar navigation
+  * Fixed deletion of large numbers of annotations
+
+
+Version 1.8.2
+(December 21, 2011 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Enhancements:
+  * Added a 404 page
+  * Widgets controls now using the menu system
+  * Admins can edit users' account information
+  * Embed uploader supports uploading into groups
+  * Add a control panel widget for easy access to cache flushing and upgrading
+  * Comments now have a unqiue URL with fragment identifier
+  * JavaScript language files are cacheable
+  * jQuery form script only loaded when required
+
+ Bugfixes:
+  * Fixed default widgets
+  * Fixed activity filtering
+  * Embedding an image now inserts a medium sized image
+  * Search plugin only uses mbstring extension if enabled
+  * Site pages links returned to footer
+  * Fixed URL creation for users with non-ASCII characters in username
+  * The wire username parsing supports periods in usernames
+  * Returned the posting area to the main wire page
+  * Fixed layout issue on pages with a fragment identifier in URL
+  * Added support for call elgg_load_js() in header and footer
+  * Fixed user picker
+  * Fixed uservalidationbyemail plugin ignoring the actions of other plugins
+  * Fixed bug preventing the creation of admin users
+  * Fixed deleting a widget with JavaScript disabled
+  * Fixed many bugs in the unit/integration tests
+
+
+Version 1.8.1
+(November 16, 2011 from https://github.com/Elgg/Elgg/tree/1.8)
+
+ Enhancements:
+  * Completed styling of user validation admin page
+  * Adding rel=nofollow for non-trusted links
+  * Added direct icon loading for profile avatars in profile plugin
+  * Improved the structure of content views to make styling easier
+  * Updated version of jQuery to 1.6.4
+  * Added basic support for icon size customization
+  * Added a toggle for gallery/list view in file plugin
+  * Added support for passing CSS classes to icon views
+  * Added support for non http URLs to Elgg's normalize functions
+  * Added better support for the 404 forward if a page handler does handle a request
+
+ Bugfixes:
+  * Fixed autocomplete and userpicker
+  * Fixed RSS and web service-related view types
+  * Fixed walled garden display issues
+  * Added work around for IE/TinyMCE/embed insert problem
+  * Implemented ElggUser.isAdmin() JavaScript method
+  * Fixed the date views and JavaScript datepicker
+  * Fixed horizontal radio buttons styling
+  * Modules only display header if there is content for it
+
+
+Version 1.8.1b
+(October 11, 2011 from git://github.com/Elgg/Elgg.git)
+
+ Enhancements:
+  * New group activity widget for user dashboard.
+  * Added more sprites.
+  * version.php information cached instead of loaded 100s of times.
+  * Added class elgg-autofocus to add focus on inputs when the page loads.
+  * Admins can edit user avatars again.
+  * Added a filter for non-bundled plugins in plugin admin.
+  * Improvements to admin area theme.
+
+ Bugfixes:
+  * Fixed site dropdown menu for IE.
+  * ElggEntity->deleteMetadata() no longer deletes all metadata ever if
+    called on an unsaved entity.
+  * Fixed Embed plugin.
+  * Fixed activate and deactivate all plugins.
+  * Fixed URL for group membership request in notification email.
+  * Fixed log browser plugin's admin area display.
+  * Fixed RSS icon not showing up on some pages.
+  * Fixed river entries for forum posts that were lost if upgrading from 1.7.
+  * Better displaying of errors when activating, deactivating, or
+    reordering plugins.
+  * Fixed Developer Plugin's inspection tool.
+  * Fixed avatar cropping on IE 7.
+  * Bookmarks plugin accepts URLs with dashes.
+  * "More" menu item on site menu hidden if items are manually specified.
+  * Fixed hover menu floating if unrestrained.
+  * JS init, system fired when DOM and languages are read.
+  * Fixed the date picker input view.
+  * Fixed stack overflow when calling elgg_view() from a pagesetup
+    event.
+  * Menu links no longer have empty titles and confirm attributes.
+  * Fixed crash when attempting to change password to an invalid value.
+  * Fixed "More groups" link for groups widget.
+  * Fixed output/confirmlink to use a default question if not specified.
+  * Added missing language strings. Also added "new", "add", and "create".
+  * Registered security token refresh page as external to avoid token refresh
+    problems on Walled Garden sites.
+  * Displaying more accurate message if uploading an avatar fails.
+  * "Leave group" button doesn't display for group owners.
+  * Request group membership button displays only when logged in.
+  * Fixed the number of displayed items for Bookmarks widget.
+  * Fixed fallback to deprecated views for widgets.
+
+ API changes:
+  * Menus names must be unique to the entire menu, not just section.
+  * Input views that encode text use the option 'encode_text'.
+  * Added ElggPlugin->getFriendlyName().
+  * elgg_view_icon() accepts a class.
+  * Added hook output:before, page.
+  * Added hook output:before, layout.
+  * elgg_get_entities() and related functions return false if passed
+    valid options with invalid values.
+  * Can disable the user hover menu by passing hover => false to
+    elgg_view_icon(). Previously it was override => true.
+  * Embed plugin uses menu system. See readme for embed plugin.
+  * Manifest attributes are no longer translated via elgg_echo().
+  * Fixed livesearch ajax endpoint.
+  * Fixed site unit test.
+  * Unit tests tidy up after themselves better.
+  * forward() throws an exception if headers are already sent.
+  * Better errors if adding a user through admin area fails.
+  * Localized profile fields.
+  * Added 'is_trusted' parameter output/url to avoid escaping and filtering.
+    Defaults to false.
+  * Added elgg_unregister_action()
+  * Fixed ElggPriorityList::rewind().
+  * Fixed forwarding after login for login-protected pages.
+  * get_site_by_url() respects class inheritance for subclassing ElggSite.
+
+ Internal changes:
+  * Updated deprecated uses of internalname/id.
+  * Using wwwroot instead of www_root because of inconsistencies.
+
+
+Version 1.8.0 (Jackie)
+(September 5th, 2011 from git://github.com/Elgg/Elgg.git)
+
+ Notes:
+  Elgg 1.8 contains the most changes in Elgg since the transition from Elgg 
+  0.9 to Elgg 1.0. The core team tried to make the transition as smooth as
+  possible, but in the interest of following standards and simplifying the
+  development process for core and third party developers, we have made
+  changes that will require updating plugins. We believe these changes
+  will help Elgg development be easier for everyone.
+
+  It is unreasonable and unhelpful to list the full details of all changes in
+  this file. Instead, we will list the high level, overarching changes to
+  systems. If you are interested in the specifics, Elgg 1.8's source code is
+  highly documented and serves as a good guide and the git commit log can
+  provide excruciating details of what has changed between 1.7 and 1.8.
+
+  Please post your feedback, questions, and comments to the community site
+  at http://community.elgg.org. As always, thank you for using Elgg!
+
+  --The Elgg Core Development Team
+
+ A tip about updating plugins:
+  It's not difficult to update 1.7 plugins for 1.8. There is a detailed 
+  document outlining this process on the wiki:
+  http://docs.elgg.org/wiki/Updating_plugins_for_Elgg_1.8
+
+  The basic process is:
+  1. Clean up the plugin to make sure it conforms to coding standards,
+     official structure, and best practices.
+  2. Update any uses of deprecated functions. Functions deprecated in 1.7 will
+     produce visible notices in 1.8!
+  3. Use the new manifest format.
+  4. Use the new menu functions.
+  5. Use the new JS features.
+  6. Update the views to use core CSS helper functions and classes instead of
+     writing your own.
+
+  The documentation directory and the wiki has more information.
+
+ User-visible changes:
+  * New default theme.
+  * New installation.
+  * Separate and updated admin interface.
+  * Updated plugin themes.
+
+ Generic API changes:
+  * Improved the markup and CSS.
+  * Restructured and simplified the views layouts.
+  * Added a new menu system.
+  * Added new CSS and JS file registration functions.
+  * Added a JS engine.
+  * Added a breadcrumb system.
+  * Added a sticky forms system.
+
+ New plugins:
+  * Dashboard - The activity stream is now the default index page. A 1.7-style
+    dashboard is provided through the dashboard plugin.
+  * Developers Plugins - Developer tools.
+  * Likes - Allows users to "like" other users' content.
+  * oAuth API - A generic, reusable oAuth library.
+  * Tag Cloud - A widget-based tag cloud generator.
+  * Twitter API - A generic Twitter library that allows signin with Twitter
+    and pushing content to tweets. Replaces twitter_service.
+
+ Deprecated plugins:
+  * captcha - Captchas have long since stopped being useful as a deterrent
+    against spam.
+  * crontrigger - Real cron should be used.
+  * default_widgets - This functionality is now part of core.
+  * friends - This functionality is now part of core.
+  * riverdashboard - Displaying the river (activity stream) is default in
+    core. The original dashboard can be restored by the new Dashboard plugin.
+  * twitter_service - Replaced by Twitter API.
+
+ Elgg 1.8.0.1 was released immediately after 1.8.0 to correct a problem in
+ installation.
diff --git a/CODING.txt b/CODING.txt
new file mode 100644
index 000000000..1cfd58dba
--- /dev/null
+++ b/CODING.txt
@@ -0,0 +1 @@
+See documentation/coding_standards/
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
new file mode 100644
index 000000000..a8e74d3a4
--- /dev/null
+++ b/CONTRIBUTORS.txt
@@ -0,0 +1,30 @@
+The following have made notable contributions to the Elgg Project.
+(List in alphabetical order.)
+
+Steve Clay - http://www.mrclay.org/, https://twitter.com/mrclay_org
+
+Cash Costello - cash@elgg.org, http://cashcostello.com/
+
+Pete Harris - http://www.peteharris.co.uk/
+
+Kevin Jardine - http://radagast.biz/
+
+Jon Maul - MITRE http://www.mitre.org/
+
+Marcus Povey - http://marcuspovey.co.uk/
+
+Brett Profitt - brett@elgg.org, http://twitter.com/brettprofitt
+
+Nathan Rackliffe - MITRE http://mitre.org/
+
+Tom Read - MITRE http://mitre.org/
+
+Justin Richer - MITRE http://mitre.org/
+
+Dave Tosh - davidgtosh@gmail.com, http://twitter.com/davetosh
+
+Ben Werdmuller - http://benwerd.com/
+
+Nicholas Whitt - nick.whitt@gmail.com, http://twitter.com/nogoodnick
+
+Evan Winslow - evan@elgg.org, http://evanwinslow.com/
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
new file mode 100644
index 000000000..262515386
--- /dev/null
+++ b/COPYRIGHT.txt
@@ -0,0 +1,14 @@
+The follow individuals, companies, or entities have contributed significant 
+code to the Elgg project and share the copyright. (In alphabetical order.)
+
+Organizations:
+The MITRE Corportation (jricher@mitre.org)
+Curverider Ltd (info@elgg.com)
+
+Individuals:
+Steve Clay (steve@mrclay.org)
+Cash Costello (cash.costello@gmail.com)
+Brett Profitt (brett.profitt@gmail.com)
+Dave Tosh (davidgtosh@gmail.com)
+Ben Werdmuller (ben@benwerd.com)
+Evan Winslow (evan.b.winslow@gmail.com)
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 000000000..6fae5746c
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,39510 @@
+2012-04-24  Brett Profitt <brett.profitt@gmail.com>
+
+  	* CHANGES.txt, version.php: Version bump. Updated changes.
+
+  	* mod/groups/views/default/group/default.php: Fixed group entity display in
+  full_view.
+
+  	* views/default/river/elements/summary.php: Fixes #4339. Checking for
+  river:$action:$type in addition to river:$action:$type:$subtype.
+
+  	* engine/lib/sessions.php, engine/lib/web_services.php: Fixed problem in web
+  services where users with incorrect passwords could gain an access token.
+
+  	* actions/admin/site/update_advanced.php, languages/en.php: Fixes #4324. Not
+  allowing relative paths for dataroot in advance settings.
+
+  	* engine/lib/relationships.php: Fixes #4409. Selecting distinct across
+  entities.* and entity_relationships.id instead of r.* so entities loaded via
+  elgg_get_entities_from_relationship() have the correct time_created.
+
+2012-04-22  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/thewire/pages/thewire/owner.php: Fixes #4452. Passing the correct
+  filter context in the wire's owner page.
+
+  	* views/default/object/plugin.php: Fixes #4439. Redirecting if trying to
+  view a plugin object outside of admin.
+
+2012-04-18  Brett Profitt <brett.profitt@gmail.com>
+
+  	* ...1.8.3-multiple_user_tokens-852225f7fd89f6c5.php, version.php: Fixes
+  #4291. Removing the unique index on user and site guids in the
+  users_apisessions table.
+
+  	* actions/login.php, actions/register.php, actions/useradd.php,
+  ....8.3-dont_filter_passwords-c0ca4a18b38ae2bc.php,
+  engine/lib/user_settings.php,
+  .../actions/twitter_api/interstitial_settings.php, version.php: Fixes #1301.
+  Not filtering passwords.
+
+2012-04-16  Steve Clay <steve@mrclay.org>
+
+  	* engine/lib/users.php: Fixes #4414: Corrected name of river friend create
+  view
+
+  	* mod/thewire/start.php: Fixes #4413: Removes deprecated call to
+  get_loggedin_user
+
+2012-04-15  Evan Winslow <evan@elgg.org>
+
+  	* mod/likes/views/default/likes/button.php: Removes superfluous array
+  declaration
+
+2012-03-25  Evan Winslow <evan@elgg.org>
+
+  	* mod/pages/start.php: Fixes #4419: Pages icons now work with all sizes
+
+  	* views/default/icon/default.php: Refs #1279: Specifying image dimensions in
+  icon/default view.
+
+2012-03-15  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/classes/ElggSite.php: Fixes #4394. Added cron and services URLs to
+  the default public pages list for walled garden.
+
+2012-03-02  Evan Winslow <evan@elgg.org>
+
+  	* views/default/css/admin.php: Adds fixed-width font for pre + code in admin
+  area
+
+2012-02-22  Evan Winslow <evan@elgg.org>
+
+  	* .travis.yml: The travis-ci build should only run against master now.
+
+2012-02-13  Evan Winslow <evan@elgg.org>
+
+  	* .travis.yml: Adds trivial .travis.yml config so we can get started
+  building.
+
+2012-02-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/output.php, engine/tests/regression/trac_bugs.php: Fixes #3210.
+  Keeping -s in URL friendly titles.
+
+  	* engine/classes/ElggPluginManifest.php, views/default/admin/plugins.php,
+  views/default/css/admin.php, views/default/object/plugin/full.php: Fixes
+  #3312, #3632. Added class elgg-plugin-category-<category> to the plugin div.
+  Exposed plugin categories under more. Changed border color and size for
+  bundled categories.
+
+  	* mod/search/pages/search/index.php, mod/search/search_hooks.php,
+  mod/search/start.php: Fixes #3550. Merged slightly modified pull request 166
+  from sembrestels.
+
+2012-02-21  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: Refs #4335. Updated
+  discussion notifications.
+
+  	* mod/blog/languages/en.php, mod/blog/start.php,
+  mod/bookmarks/languages/en.php, mod/bookmarks/start.php,
+  mod/file/languages/en.php, mod/file/start.php, mod/pages/languages/en.php,
+  mod/pages/start.php: Fixes #4335. Cleaned up the notifications for new
+  content.
+
+2012-02-11  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/externalpages/start.php, .../views/default/expages/wrapper.php,
+  views/default/css/walled_garden.php: external pages plugin uses walled garden
+  layout when appropriate
+
+2012-02-10  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* views/default/forms/login.php, views/default/forms/register.php: passing 
+  to extending views
+
+2012-02-10  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/elgglib.php, views/default/js/walled_garden.php,
+  views/default/page/layouts/walled_garden.php: updated the walled garden js to
+  use new js lib
+
+  	* engine/classes/ElggSite.php, engine/lib/elgglib.php,
+  views/default/core/walled_garden/body.php,
+  views/default/core/walled_garden/login.php,
+  views/default/core/walled_garden/lost_password.php,
+  views/default/core/walled_garden/register.php,
+  views/default/js/walled_garden.php,
+  views/default/page/layouts/walled_garden.php: new layout and ajax loading for
+  walled garden
+
+2012-02-09  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggWidget.php: Fixes #4283 moving widgets from inactive
+  plugins to the bottom of columns
+
+  	* engine/lib/views.php: Fixes #2625 removed old hack from
+  elgg_view_annotation()
+
+  	* engine/lib/group.php: Fixes #4361 corrects forwarding logic for closed
+  groups
+
+  	* mod/groups/lib/groups.php: Fixes #4362 extra context was breaking group
+  sidebar menu logic
+
+  	* languages/en.php, pages/friends/index.php, pages/friends/of.php,
+  pages/river.php: Fixes #2942 all list pages should have messages when no
+  content now
+
+2012-02-08  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/pages/manifest.xml: Fixes #3678 adds better description of pages
+  plugin
+
+  	* actions/friends/add.php, languages/en.php: Fixes #4348 adds check for
+  missing user when friending
+
+  	* .../views/default/theme_preview/components.php,
+  .../default/theme_preview/components/table.php,
+  views/default/css/elements/components.php: Fixes #4357, #4358 updates
+  .elgg-table-alt
+
+2012-02-03  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* actions/avatar/crop.php, pages/avatar/edit.php: Fixes #4350 (Edit Avatar -
+  Crop button is misleading, should be hidden if avatar hasn't been created
+  yet)
+
+2012-02-07  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/plugins.php, languages/en.php: Fixes #3613 added system message
+  for admins when plugins are disabled
+
+  	* engine/lib/metadata.php: Fixes #1043 tags retain their case
+
+2012-02-04  cash <cash.costello@gmail.com>
+
+  	* mod/messageboard/actions/delete.php,
+  mod/messageboard/views/default/messageboard/js.php: Fixes #4354 fixes
+  messageboard delete
+
+  	* mod/thewire/start.php: removed some old code from thewire
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggObject.php, engine/classes/ElggSite.php,
+  engine/classes/ElggUser.php: Fixes #2112 not loading data from entities table
+  twice
+
+  	* mod/thewire/start.php, mod/thewire/tests/regex.php: Fixes #1853 matching
+  UTF8 characters in usernames
+
+  	* mod/blog/languages/en.php, mod/blog/start.php: Fixes #4310 adds missing
+  blog notification function
+
+2012-01-27  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* engine/lib/cache.php: lazy boolean expression evaluation leaves function
+  expressions unevaluated (!)
+
+  	* engine/lib/configuration.php: response from insert_data needs to be
+  checked for !== FALSE
+
+2012-01-27  Team Webgalli <webgalli@gmail.com>
+
+  	* views/default/widgets/friends/content.php: Removed pagination from friends
+  widget
+
+2012-02-03  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/users.php: improved documentation for get_user_by_email()
+
+2012-02-01  cash <cash.costello@gmail.com>
+
+  	* engine/lib/languages.php, engine/lib/plugins.php: fixed logic that caused
+  plugin language files to not be loaded
+
+2012-01-30  cash <cash.costello@gmail.com>
+
+  	* install/ElggInstaller.php, install/languages/en.php: Refs #4324 installer
+  checks for absolute path
+
+  	* install/ElggInstaller.php: Fixes #4342 updated the installer based on boot
+  reorg - no longer need caching code in installer
+
+  	* engine/lib/plugins.php: fixed typo in plugin code
+
+  	* install/languages/en.php, views/installation/install/nav.php: added
+  language strings to installer for refresh and next
+
+2012-01-28  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/cache.php: Refs #4180 was caching extensions which was causing
+  double extensions
+
+  	* mod/thewire/actions/add.php: replaced deprecated function call in the wire
+  plugin
+
+  	* engine/lib/views.php: fixed typo in docs
+
+  	* engine/lib/entities.php: Fixes #4329 removed old recursive delete
+  permissions override
+
+  	* engine/lib/entities.php: Fixes #2646 mention ELGG_ENTITIES_NO_VALUE in
+  elgg_get_entities() documentation
+
+2012-01-27  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/pages/languages/en.php: Fixes #4309 added language string
+
+  	* engine/settings.example.php: Fixes #3651 fixed documentation of disable db
+  cache setting and updated wiki
+
+  	* engine/lib/navigation.php: Fixes #3509 added documentation to menu system
+  about confirm links
+
+  	* actions/avatar/crop.php, actions/profile/fields/add.php,
+  actions/profile/fields/delete.php, actions/profile/fields/reorder.php: Fixes
+  #1808 using correct message function in profile actions
+
+2012-01-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/entities.php: Refs #4081. Correctly calling
+  setIncrementOffset(false) for deleting entities using ElggBatch.
+
+  	* engine/lib/entities.php, engine/tests/api/helpers.php,
+  engine/tests/objects/objects.php: Fixes #4081. Using ElggBatch to delete
+  recursive.
+
+2012-01-25  cash <cash.costello@gmail.com>
+
+  	* engine/lib/languages.php: not loading language files a second time when
+  session initialized
+
+  	* engine/lib/cache.php, engine/lib/plugins.php: plugins use language cache
+  and cache is cleared properly
+
+  	* engine/classes/ElggFileCache.php: implemented the clear method of the file
+  cache
+
+  	* engine/lib/cache.php, engine/lib/configuration.php,
+  engine/lib/elgglib.php, engine/lib/languages.php: caching language data
+
+2012-01-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/metastrings.php: Refs #4269. Using ElggBatch to delete
+  annotations / metadata again.
+
+  	* engine/classes/ElggBatch.php, engine/tests/api/helpers.php: Fixes #4288.
+  Added setIncrementOffset() to ElggBatch.
+
+2012-01-24  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/configuration.php, engine/lib/entities.php,
+  engine/lib/views.php: Fixes #4272 where an array of entity types can be used,
+  use array in config object
+
+2012-01-24  Brett Profitt <brett.profitt@gmail.com>
+
+  	* upgrade.php: Fixes #4326. Disabling system log for upgrades.
+
+2012-01-23  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/configuration.php, install/ElggInstaller.php: Refs #4147.
+  Changed default site name to "My New Community."
+
+  	* languages/en.php: Fixed typo in language string.
+
+  	* engine/lib/entities.php, engine/tests/objects/objects.php: Fixes #1196.
+  Added elgg_set_ignore_access() calls to disable_entity() when called with
+  recursive = true.
+
+2012-01-22  Brett Profitt <brett.profitt@gmail.com>
+
+  	* views/default/object/plugin/full.php,
+  views/default/object/plugin/invalid.php: Fixes #4311. Rewriting all invalid
+  CSS characters to - for plugin id in plugin admin area.
+
+  	* engine/schema/mysql.sql: Refs #2222. Added schema update for system log ip
+  address column.
+
+2012-01-22  cash <cash.costello@gmail.com>
+
+  	* engine/lib/access.php: Fixes #4295 using on duplicate key to not fail when
+  adding the same user more than once to an access collection
+
+2012-01-22  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/lib/metadata.php, engine/tests/api/metastrings.php: Fixes #4321. Limit
+  alone is no longer valid for batch delete operations for metadata or
+  annotations.
+
+  	* engine/lib/metadata.php: Refs #4325. Restored the null vs bool return in
+  elgg_delete_metadata().
+
+2012-01-22  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/search/views/default/search/list.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  views/default/navigation/pagination.php,
+  views/default/page/components/list.php: Fixes #4320 updated documentation for
+  base_url in pagination and added backward compatible code
+
+  	* engine/lib/metadata.php: Fixes #4318 added guid to the list of parameters
+  for elgg_delete_metadata()
+
+2012-01-22  Team Webgalli <webgalli@gmail.com>
+
+  	* mod/bookmarks/actions/bookmarks/save.php: Removed unnecessary gatekeeper
+  from bookmark actions.
+
+2012-01-21  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* engine/classes/ElggUser.php: fix for deprecated use of elgg_get_objects
+
+2012-01-21  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/cache.php, engine/lib/elgglib.php, engine/lib/plugins.php:
+  moved cache loading out of plugin code
+
+  	* engine/lib/cache.php, engine/lib/plugins.php: better location for system
+  cache in data directory
+
+  	* documentation/info/config.php, engine/lib/cache.php,
+  engine/lib/configuration.php,
+  ...2012100-1.8.3-system_cache-93100e7d55a24a11.php,
+  install/ElggInstaller.php, .../views/default/admin/developers/settings.php,
+  version.php, views/default/forms/admin/site/update_advanced.php: Fixes #4180
+  finished conversion to system cache by converting datalist/CONFIG var name
+
+  	* actions/admin/site/update_advanced.php, languages/en.php,
+  mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php,
+  .../views/default/admin/developers/settings.php,
+  views/default/forms/admin/site/update_advanced.php: updated the display to
+  show system cache language
+
+  	* actions/admin/plugins/activate.php,
+  actions/admin/plugins/activate_all.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/deactivate_all.php,
+  actions/admin/plugins/set_priority.php, actions/admin/site/flush_cache.php,
+  actions/admin/site/update_advanced.php, engine/lib/cache.php,
+  engine/lib/deprecated-1.8.php, engine/lib/plugins.php,
+  engine/lib/upgrades/2011010101.php,
+  mod/developers/actions/developers/settings.php, upgrade.php: switched the
+  function names to system cache
+
+  	* engine/lib/cache.php, engine/lib/configuration.php,
+  engine/lib/database.php, engine/lib/elgglib.php, engine/lib/languages.php,
+  engine/lib/sessions.php, engine/lib/sites.php, engine/lib/views.php,
+  engine/start.php: cleans up the boot process
+
+  	* engine/lib/languages.php, engine/start.php: single for loop for loading
+  libraries
+
+  	* engine/lib/configuration.php: updated documentation of configuration lib
+
+  	* engine/start.php: improved documentation in bootstrap script
+
+2012-01-20  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/system_log.php,
+  ...2012000-1.8.3-ip_in_syslog-87fe0f068cf62428.php,
+  mod/logbrowser/languages/en.php,
+  .../admin/administer_utilities/logbrowser.php,
+  .../views/default/forms/logbrowser/refine.php,
+  mod/logbrowser/views/default/logbrowser/table.php, version.php: Fixes #2222.
+  Added IP address to system log table and log browser. Fixed problem in log
+  browser that would only show entries without an owner_guid.
+
+2012-01-20  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggUser.php, engine/lib/statistics.php,
+  mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/owner.php,
+  views/default/core/settings/tools.php: Refs #4293 removed unnecessary
+  get_input('offset') calls since elgg_list_entities() calls that
+
+  	* engine/lib/entities.php, engine/lib/users.php,
+  mod/members/pages/members/search.php: Fixes #4303 passing arguments to
+  elgg_view_entity_list in options array
+
+2012-01-16  Sem <sembrestels@riseup.net>
+
+  	* views/default/forms/admin/site/update_advanced.php: Fixed #3155. Limited
+  site default access to core access levels.
+
+2012-01-13  Sem <sembrestels@riseup.net>
+
+  	* mod/file/graphics/icons/application.gif,
+  mod/file/graphics/icons/application_lrg.gif,
+  mod/file/graphics/icons/archive.gif, mod/file/graphics/icons/archive_lrg.gif,
+  mod/file/graphics/icons/excel.gif, mod/file/graphics/icons/excel_lrg.gif,
+  mod/file/graphics/icons/general.gif, mod/file/graphics/icons/general_lrg.gif,
+  mod/file/graphics/icons/music.gif, mod/file/graphics/icons/music_lrg.gif,
+  mod/file/graphics/icons/openoffice.gif,
+  mod/file/graphics/icons/openoffice_lrg.gif,
+  mod/file/graphics/icons/pages.gif, mod/file/graphics/icons/pages_lrg.gif,
+  mod/file/graphics/icons/pdf.gif, mod/file/graphics/icons/pdf_lrg.gif,
+  mod/file/graphics/icons/ppt.gif, mod/file/graphics/icons/ppt_lrg.gif,
+  mod/file/graphics/icons/text.gif, mod/file/graphics/icons/text_lrg.gif,
+  mod/file/graphics/icons/vcard.gif, mod/file/graphics/icons/vcard_lrg.gif,
+  mod/file/graphics/icons/video.gif, mod/file/graphics/icons/video_lrg.gif,
+  mod/file/graphics/icons/word.gif, mod/file/graphics/icons/word_lrg.gif,
+  mod/pages/images/pages.gif, mod/pages/images/pages_lrg.gif: Fixes #3911. File
+  and page icons with transparent backgrounds since now.
+
+2012-01-18  Jerome Bakker <jeabakker@coldtrick.com>
+
+  	* actions/admin/site/update_advanced.php: solves part of #4307
+
+  	* actions/admin/site/update_basic.php: solves part of #4307
+
+2012-01-17  adayth <aday.talavera@gmail.com>
+
+  	* mod/file/start.php: Fixes #4305 added backward compatibility for file read
+  url
+
+2012-01-16  Brett Profitt <brett.profitt@gmail.com>
+
+  	* .../messages/exceptions/admin_exception.php: Refs #4036. Forgot to add a
+  new view.
+
+2012-01-15  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/elgglib.php, languages/en.php,
+  views/failsafe/messages/exceptions/exception.php: Fixes #4036. Hiding
+  exceptions except for admin users.
+
+2012-01-12  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/object/widget.php: added clearfix to increase the size of
+  the area for the drag handle
+
+2012-01-11  cash <cash.costello@gmail.com>
+
+  	* CHANGES.txt, version.php: updated version and changes.txt
+
+  	* engine/lib/elgglib.php, engine/lib/views.php, mod/thewire/start.php: Fixes
+  #4292 added a white list for ajax views
+
+2012-01-11  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* views/default/css/elements/components.php, views/default/output/tags.php:
+  class namespacing
+
+2012-01-10  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, engine/tests/api/annotations.php,
+  engine/tests/api/metadata.php: Fixes #4269. Not using ElggBatch to delete
+  metadata / annotations. Added unit tests for deleting annotations/md. Fixed
+  an annoying inconsistency with "metastring/s" option in private functions.
+
+2012-01-09  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php: Fixes #4243. Added docs for metadata_calculation
+  option to elgg_get_metadata().
+
+2012-01-09  Jeroen Dalsem <jdalsem@coldtrick.com>
+
+  	* engine/classes/ElggWidget.php: Fixes #4285 move only fetches 10 items
+
+2012-01-09  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggBatch.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggMemcache.php, engine/classes/ElggWidget.php,
+  engine/classes/XMLRPCCall.php, engine/handlers/export_handler.php,
+  engine/lib/actions.php, engine/lib/configuration.php,
+  engine/lib/filestore.php, engine/lib/metadata.php, engine/lib/navigation.php,
+  engine/lib/output.php, engine/lib/private_settings.php, engine/lib/users.php,
+  engine/lib/views.php: coding standard fixes to engine
+
+2012-01-09  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* views/default/css/elements/components.php: tags css
+
+  	* views/default/output/tags.php: fixes tags html markup issues
+
+2012-01-08  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggExtender.php, engine/classes/ElggMenuBuilder.php,
+  engine/classes/ElggMenuItem.php, engine/classes/ElggMetadata.php,
+  engine/classes/ElggUser.php, engine/classes/SuccessResult.php,
+  engine/lib/annotations.php, engine/lib/cache.php, engine/lib/metadata.php,
+  engine/lib/output.php, engine/lib/pagehandler.php, engine/lib/pageowner.php,
+  engine/lib/plugins.php, engine/lib/users.php: most of the comments in the
+  engine now past the sniffer
+
+  	* engine/classes/ElggCache.php, engine/classes/ElggMenuBuilder.php,
+  engine/classes/ElggMenuItem.php, engine/classes/ElggPlugin.php,
+  engine/classes/ElggPluginPackage.php, engine/classes/ElggSite.php,
+  engine/lib/access.php, engine/lib/admin.php, engine/lib/database.php,
+  engine/lib/extender.php, engine/lib/input.php, engine/lib/relationships.php,
+  engine/lib/river.php: coding standards fixes - comments
+
+  	* mod/groups/actions/discussion/reply/save.php,
+  mod/groups/actions/discussion/save.php, mod/groups/lib/discussion.php: Fixes
+  #3216 passing type/subtype for group discussions
+
+  	* mod/search/pages/search/index.php: Fixes #2199 can now pass entity
+  type/subtype to tag search
+
+  	* mod/file/actions/file/upload.php, mod/file/start.php,
+  .../default/file/specialcontent/image/default.php: Fixes #2421 added icontime
+  to files with thumbnails
+
+  	* mod/search/pages/search/index.php: Fixes #2404 not using full set of query
+  parameters for custom search types
+
+  	* engine/lib/entities.php: Fixes #4234 forcing limit to be nonnegative
+
+  	* mod/messages/views/default/messages/js.php: updated the messages plugin to
+  use 1.8's JS hook system
+
+  	* mod/groups/views/default/groups/js.php: updated groups js to use new JS
+  hook system
+
+  	* js/lib/ui.widgets.js, mod/profile/views/default/profile/js.php: Fixes
+  #4192 making the bottom of widget columns equal rather than height
+
+  	* actions/login.php: Fixes #4171 login success message is now i18n friendly
+
+  	* engine/handlers/cache_handler.php: Fixes #2002 adds ETag support to simple
+  cache handler
+
+  	* engine/classes/ODDDocument.php: Refs #4271 integrates fix to 1.8 branch
+  for ODDDocument
+
+  	* engine/lib/elgglib.php: Fixes #4278 deprecation notices ignore debug level
+  but do respect whether the admin is logged in
+
+  	* engine/lib/elgglib.php: fixed some formatting
+
+2012-01-07  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/groups/icon.php, mod/profile/icondirect.php: added check for existance
+  of IF-NONE-MATCH header in request
+
+2012-01-03  Sem <sembrestels@riseup.net>
+
+  	* mod/groups/icon.php: Refs #4142. Also added ETag in group icon.
+
+  	* mod/profile/icondirect.php: Refs #4142. Added ETag header support for user
+  avatars.
+
+2012-01-07  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggRiverItem.php, mod/thewire/classes/ElggWire.php: Refs
+  #3209 fixed spacing and added options for wire method
+
+  	* engine/classes/ODDEntity.php, engine/classes/ODDMetaData.php,
+  engine/classes/ODDRelationship.php: pulled ODD classes out of ODDEntity
+
+2012-01-05  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php: Fixes #4243. Added docs to explain the
+  difference between annotation_calculation and calculation.
+
+2012-01-04  cash <cash.costello@gmail.com>
+
+  	* engine/lib/web_services.php: Fixes #4270 removed use of deprecated method
+
+  	* mod/pages/lib/pages.php, mod/pages/pages/pages/owner.php: Fixes #4266
+  fixed limit bugs with pages plugin
+
+  	* mod/embed/views/default/navigation/menu/embed.php,
+  views/default/navigation/tabs.php: updated options on navigation/tabs
+
+  	* engine/lib/entities.php: fixed enabling bug, added flag for recursion,
+  removed unnecessary code in disable function
+
+  	* engine/tests/objects/entities.php: added a unit test for recursive
+  enabling/disabling
+
+2012-01-03  Sem <sembrestels@riseup.net>
+
+  	* engine/lib/entities.php: Refs #2051. Fixed: ElggEntity's enable does not
+  recurse.
+
+2012-01-04  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/objects.php: Fixes #3710. Returning false from update, <type>
+  event no longer deletes entity. Returning false from create, <type> still
+  deletes the entity because of the "return false to halt events" approach.
+  This will be reviewed for #3784.
+
+2012-01-02  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/admin.php, languages/en.php,
+  views/default/admin/statistics/basic.php,
+  views/default/admin/statistics/numentities.php,
+  views/default/admin/statistics/overview.php,
+  views/default/admin/statistics/overview/basic.php,
+  .../admin/statistics/overview/numentities.php,
+  views/default/admin/statistics/server.php,
+  views/default/admin/statistics/server/php.php,
+  .../default/admin/statistics/server/web_server.php: Fixes #4164 adds a server
+  statistics page to admin area
+
+2012-01-01  cash <cash.costello@gmail.com>
+
+  	* mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  .../admin/administer_utilities/diagnostics.php,
+  .../admin/develop_utilities/diagnostics.php: moved diagnostics to administer
+  utilities menu area rather than developers
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: Fixes #2230 group acl
+  names are not i18n friendly
+
+  	* engine/lib/access.php, languages/en.php, views/default/output/access.php:
+  Fixes #3939 if user does not have permissions to see the name of the access
+  collection, it is shown as "Limited"
+
+2012-01-01  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggExtender.php, engine/classes/ElggObject.php,
+  engine/classes/ElggRelationship.php, engine/classes/ElggRiverItem.php,
+  mod/blog/classes/ElggBlog.php, mod/thewire/classes/ElggWire.php: Fixes #3209
+  finished adding class properties documentation
+
+  	* engine/classes/ElggCache.php: fixed copy and paste error in documentation
+  of ElggCache
+
+  	* engine/classes/ElggDiskFilestore.php: Refs #2290 removes check for
+  username
+
+  	* documentation/examples/plugins/start.php: Fixes #3225 added what was
+  missing from the basic init function example
+
+  	* engine/lib/users.php: Fixes #690 admin editing a user no longer makes them
+  appear active
+
+  	* engine/lib/admin.php: Fixes #4168 ignoring access when saving an admin
+  notice
+
+  	* views/default/css/admin.php: Fixes #3981 adds a better pre and code style
+  to admin theme
+
+  	* engine/lib/plugins.php: Fixes #3992 fixed notice when loading plugins for
+  first time
+
+  	* mod/developers/languages/en.php, mod/developers/start.php,
+  .../default/admin/develop_tools/unit_tests.php,
+  mod/diagnostics/languages/en.php,
+  .../admin/develop_utilities/diagnostics.php: Fixes #4137 moves test UI to
+  developers plugin
+
+2011-12-31  cash <cash.costello@gmail.com>
+
+  	* engine/lib/users.php: Fixes #4260 get_user_sites() now works
+
+  	* engine/lib/notification.php: Fixes #4208 notifications do not use site
+  guid
+
+  	* engine/classes/ElggSite.php: Fixes #4204 using only the relationship for
+  getting members of a site
+
+  	* engine/classes/ElggWidget.php: Fixes #4255 new widget ordering code
+
+2011-12-31  Evan Winslow <evan@elgg.org>
+
+  	* engine/classes/ElggGroup.php, engine/classes/ElggObject.php,
+  engine/classes/ElggSite.php, engine/classes/ElggUser.php: Refs #3209: Adds
+  property docs for the four main entity classes
+
+2011-12-31  cash <cash.costello@gmail.com>
+
+  	* engine/classes/ElggWidget.php: Fixes #4259 using container guid for
+  widgets when moving
+
+2011-12-29  Jeroen Dalsem <jdalsem@coldtrick.com>
+
+  	* engine/classes/ElggWidget.php: Small typo. Seems to work, but i prefer it
+  nice and tidy :)
+
+2011-12-31  cash <cash.costello@gmail.com>
+
+  	* engine/lib/widgets.php: Fixes #4254 not registering the default widgets
+  callback more than once per event
+
+  	* mod/groups/actions/groups/edit.php: Fixes #4152 setting access on group
+  creation river item
+
+  	* engine/lib/river.php: Fixes #4258 fixes add_to_river escaping
+
+  	* .../views/default/groups/group_sort_menu.php: Fixes #4228 group sort menu
+  view accepts selected menu item from page handler
+
+  	* views/default/css/admin.php: Fixes #4257 updates admin theme for widget
+  menu changes
+
+  	* mod/groups/upgrades/2011030101.php: Fixes #4256 reruns the forum topic
+  upgrade by checking the 5 oldest topics
+
+  	* ...3101-1.8.2-fix_blog_status-b14c2a0e7b9e7d55.php, version.php: Fixes
+  #4239 rerun corrected blog status upgrade
+
+2011-12-31  Cash Costello <cash.costello@gmail.com>
+
+  	* ...100-1.8.2-fix_friend_river-b17e7ff8345c2269.php, version.php: Fixes
+  #4248 fixed friend river text
+
+  	* mod/blog/start.php: Fixes #4253 added backward compatibility for blog read
+  url
+
+2011-12-24  Cash Costello <cash.costello@gmail.com>
+
+  	* actions/avatar/revert.php, engine/lib/users.php, languages/en.php,
+  views/default/core/avatar/upload.php: Fixes #3272 added button to revert
+  avatar
+
+  	* engine/lib/elgglib.php: Refs #4009 registering the walled garden css and
+  js on every request
+
+2011-12-23  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/blog/lib/blog.php, mod/blog/start.php,
+  mod/blog/views/default/blog/sidebar.php,
+  mod/blog/views/default/blog/sidebar/archives.php: Fixes #3751 adds a group
+  blog archive page
+
+  	* js/lib/ui.widgets.js, views/default/css/admin.php,
+  views/default/css/elements/modules.php, views/default/object/widget.php:
+  Fixes #4186 restricting the drag handle for widgets
+
+  	* mod/groups/languages/en.php, mod/groups/lib/groups.php,
+  mod/groups/views/default/forms/groups/find.php,
+  mod/groups/views/default/forms/groups/search.php,
+  mod/groups/views/default/groups/sidebar/find.php,
+  mod/groups/views/default/groups/sidebar/search.php: Fixes #2074 adds group
+  search
+
+  	* .../actions/groups/membership/delete_invite.php: Fixes #1922 can now
+  delete invites to invisible groups
+
+  	* mod/externalpages/actions/edit.php,
+  mod/externalpages/views/default/expages/menu.php,
+  .../views/default/forms/expages/edit.php: Fixes #4069 reusing the previous
+  ElggObject for external pages
+
+  	* engine/lib/annotations.php: Fixes #683 not deleting annotation when event
+  handlers return false on an update
+
+  	* engine/lib/metadata.php: Fixes #682 not deleting metadata when update,
+  metadata event handlers return false
+
+  	* engine/lib/users.php: Fixes #3716 setting the language when registering
+  new users
+
+2011-12-23  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* views/default/navigation/tabs.php: fixes spacing. add a note on text/title
+
+2011-12-23  cash <cash.costello@gmail.com>
+
+  	* mod/groups/upgrades/2011030101.php: added access override to the forum
+  upgrade
+
+  	* mod/blog/actions/blog/save.php, mod/blog/start.php,
+  mod/blog/views/default/object/blog.php: Fixes #4179 not setting excerpt if
+  none set
+
+  	* ...8_svn-blog_status_metadata-4645225d7b440876.php,
+  ...8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php, mod/blog/start.php,
+  mod/groups/upgrades/2011030101.php: Refs #4239 fixed upgrade scripts with bad
+  limits
+
+  	* engine/classes/ElggBatch.php: Refs #4239 improved the documentation on
+  ElggBatch for the limit option
+
+  	* mod/blog/views/default/blog/group_module.php: Fixes #4240 not showing
+  draft blog posts in group module
+
+2011-12-23  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* views/default/navigation/tabs.php: fixes for tab rendering
+
+2011-12-19  Steve Clay <steve@mrclay.org>
+
+  	* mod/tinymce/views/default/js/tinymce.php: Solves issue 4222: incorrectly
+  nested lists in Firefox
+
+2011-12-21  Cash Costello <cash.costello@gmail.com>
+
+  	* CHANGES.txt, version.php: Set version to 1.8.2 and updated the changes
+  list
+
+2011-12-19  cash <cash.costello@gmail.com>
+
+  	* engine/lib/widgets.php: Fixes #4184 dashboard default widgets should work
+  and widgets should be created regardless of access
+
+  	* mod/oauth_api/manifest.xml: Refs #4221 added a conflict statement to
+  manifest for PECL extension
+
+  	* engine/lib/pagehandler.php, views/default/css/elements/layout.php,
+  views/default/page/layouts/error.php: added more spacing to error layout
+
+2011-12-18  cash <cash.costello@gmail.com>
+
+  	* js/lib/ui.widgets.js: Refs #4192 adds proper 'px' to minHeight but does
+  not solve the issue
+
+2011-12-15  Ismayil Khayredinov <ismayil.khayredinov@hypejunction.com>
+
+  	* engine/lib/navigation.php, js/lib/ui.widgets.js,
+  views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php,
+  views/default/object/widget/elements/controls.php: Fix #4200: Converting
+  widgets controls into an elgg menu
+
+  	* engine/lib/views.php, mod/developers/start.php, mod/embed/start.php: Fixes
+  4209: jquery.form.js library loading
+
+2011-12-17  cash <cash.costello@gmail.com>
+
+  	* engine/lib/user_settings.php, engine/lib/users.php: moved user settings
+  extensions to user_settings library
+
+2011-12-17  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/layout.php,
+  mod/embed/views/default/js/embed/embed.php,
+  .../views/default/embed/file_upload/content.php: Fixes #4086 handling
+  containers for embed uploading
+
+  	* engine/lib/output.php: Fixes #4190 accepting full urls with non-ascii
+  characters
+
+  	* mod/embed/views/default/js/embed/embed.php: Refs #3971 inserting medium
+  size thumbnails rather than small
+
+  	* mod/embed/manifest.xml: embed can now be activated without the file plugin
+  as other plugins can provide content
+
+  	* mod/uservalidationbyemail/start.php: Fixes #4217 user validation by email
+  now respects decisions by other plugins
+
+2011-12-15  Cash Costello <cash.costello@gmail.com>
+
+  	* js/lib/ui.userpicker.js, views/default/input/userpicker.php: Fixes #4214
+  added missing dependency for userpicker
+
+2011-12-12  zcho <zcho05@gmail.com>
+
+  	* engine/lib/users.php: fixes elgg_get_user_validation_status() always
+  returning null
+
+2011-12-15  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/uservalidationbyemail/lib/functions.php: Refs #4196 integrates fix
+  into 1.8 branch
+
+2011-12-12  hypeJunction <ismayil.khayredinov@hypejunction.com>
+
+  	* mod/uservalidationbyemail/start.php: Fixed #4198 uservalidationbyemail
+  respects the return value of the register,user hook
+
+2011-12-08  cash <cash.costello@gmail.com>
+
+  	* engine/lib/languages.php, js/lib/languages.js: Fixes #3181 caching
+  language js on server side with proper headers
+
+  	* views/default/navigation/pagination.php: Fixes #4189 correctly getting the
+  base url in pagination view
+
+  	* engine/lib/annotations.php: Fixes #4025 added a url handler for comments
+
+  	* actions/admin/site/flush_cache.php, engine/lib/admin.php,
+  languages/en.php, views/default/widgets/control_panel/content.php: Fixes
+  #4185, #2111 adds control panel widget
+
+  	* views/default/navigation/menu/default.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/navigation/menu/elements/section.php: added the ability to pass
+  a class to be applied to all menu item <li> elements
+
+  	* engine/classes/ElggSite.php: Fixes #4182 if simplecache is empty, the
+  cache requests go through the engine and need to be white listed for the
+  walled garden
+
+2011-12-07  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/profile/start.php: fixed profile editing routing for profile plugin
+
+2011-12-06  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* engine/lib/entities.php: #4187 (get_entity optimization)
+
+2011-12-07  Cash Costello <cash.costello@gmail.com>
+
+  	* js/lib/ui.widgets.js: simplified the JavaScript for deleteing a widget
+
+2011-12-06  Jeroen Dalsem <jdalsem@coldtrick.com>
+
+  	* views/default/object/widget/elements/controls.php: delete action expects
+  widget_guid instead of guid
+
+2011-12-06  cash <cash.costello@gmail.com>
+
+  	* engine/lib/output.php: Fixes #4173 removed use of \w since it is locale
+  sensitive
+
+2011-12-05  cash <cash.costello@gmail.com>
+
+  	* engine/lib/pagehandler.php, languages/en.php,
+  views/default/errors/404.php, views/default/errors/default.php,
+  views/default/page/error.php, views/default/page/layouts/error.php: first
+  version of a 404 page
+
+2011-12-04  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/page/admin.php, views/default/page/default.php: Fixes #4032
+  rendering page elements before head/foot
+
+  	* engine/tests/regression/trac_bugs.php,
+  mod/blog/actions/blog/auto_save_revision.php, mod/blog/actions/blog/save.php:
+  removed some usage of deprecated methods
+
+2011-12-03  cash <cash.costello@gmail.com>
+
+  	* mod/search/start.php: Fixes #4046 checking offset compared to string
+  length
+
+  	* engine/lib/entities.php: Refs #4176 added elgg_list_registered_entities()
+  fix to 1.8 branch
+
+2011-12-01  Ash Ward <ash@netality.com>
+
+  	* mod/messages/languages/en.php, mod/messages/start.php: Fixes #4170:
+  Messages icon on top bar doesn't have a title attribute (tooltip)
+
+2011-12-01  cash <cash.costello@gmail.com>
+
+  	* views/default/graphics/ajax_loader.php: added support for passing classes
+  to ajax loader
+
+2011-11-22  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* engine/classes/ElggMemcache.php: Fixes #1995 (memcache: incorrect check
+  for get() return value)
+
+2011-11-25  Jeff Tilson <jrtilson@gmail.com>
+
+  	* engine/lib/views.php: Need to call
+  elgg_register_simplecache_view('css/lightbox') to register the lightbox CSS
+  with simplecache
+
+2011-11-28  cash <cash.costello@gmail.com>
+
+  	* engine/lib/river.php, engine/tests/api/river.php: Fixes #3496 finished up
+  this ticket by updating unit test and using more parantheses to make it clear
+  how the OR/AND gets applied
+
+2011-11-28  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/search/pages/search/index.php,
+  mod/search/views/default/search/search_box.php: Fixes #4139 if no mbstring
+  extension we strip characters for display with search
+
+  	* mod/likes/start.php: Fixes #4116 not liking users now since people think
+  they are liking the activity entry
+
+  	* .../views/default/forms/messages/process.php: Fixes #3986 not showing
+  message buttons if no messages
+
+  	* views/default/css/elements/forms.php: Fixes #4052 removed the :focus
+  styling on every input element
+
+2011-11-27  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/js/lightbox.php: Fixes #3773 added documentation hint for
+  using advanced features of fancybox
+
+  	* actions/profile/edit.php, views/default/core/settings/account/name.php:
+  Fixes #3953 adds back the ability to change display name from settings page
+
+  	* views/default/css/admin.php, views/default/css/elements/components.php,
+  views/default/css/elements/core.php: Fixes #3982 fixing scrolling issue with
+  elgg-body
+
+  	* views/default/admin/plugins.php, views/default/js/admin.php,
+  views/default/object/plugin/full.php: Fixes #3954 using lightbox for plugin
+  screenshots
+
+  	* engine/lib/entities.php: fixed some documentation related to subtypes
+
+  	* views/rss/page/components/gallery.php: rss view type needed a gallery view
+
+2011-11-24  András Szepesházi <szepeshazi@gmail.com>
+
+  	* actions/useradd.php: Fixed typo that prevented creating an admin user via
+  the Admin panel (user was created, but not elevated to admin).
+
+2011-11-25  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/elgglib.php, languages/en.php: added a better message for php
+  libraries that don't exist on disk
+
+  	* views/default/page/components/gallery.php: returning from gallery view if
+  no items in the gallery
+
+  	* .../views/default/groups/membershiprequests.php: Fixes #4151 removed
+  unnecessary $user definition
+
+2011-11-17  Danny Navarro <j@dannynavarro.net>
+
+  	* engine/lib/river.php: Refs #3496 improving type/subtype handling for the
+  river
+
+2011-11-23  cash <cash.costello@gmail.com>
+
+  	* engine/lib/river.php, pages/river.php: Refs #4143 adds a unit test for
+  type/subtype where sql generation
+
+  	* views/default/css/elements/navigation.php: Fixes #4145 using margin rather
+  than padding for topbar menu items
+
+2011-11-22  cash <cash.costello@gmail.com>
+
+  	* mod/logbrowser/start.php, .../admin/administer_utilities/logbrowser.php,
+  mod/logbrowser/views/default/logbrowser/refine.php: Fixes #3775 updates the
+  log browser link and keeps the refine area open if the page is loaded with a
+  user selected
+
+2011-11-20  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/groups/start.php: added check in case something goes wrong with the
+  container entity of a discussion
+
+2011-11-20  cash <cash.costello@gmail.com>
+
+  	* install/languages/en.php: Fixes #4140 fixed spelling mistake
+
+  	* views/default/css/elements/typography.php: fixed error in css for
+  .elgg-output ordered lists
+
+2011-11-19  cash <cash.costello@gmail.com>
+
+  	* views/default/object/elements/summary.php: don't display <h3> if no title
+
+2011-11-19  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/navigation/menu/site.php: Fixes #4102 handling no menu items
+  for site menu
+
+  	* actions/login.php, actions/user/requestnewpassword.php, languages/en.php,
+  views/default/forms/user/requestnewpassword.php: Fixes #641 users can submit
+  email address to reset password
+
+2011-11-18  cash <cash.costello@gmail.com>
+
+  	* engine/lib/user_settings.php, engine/lib/users.php, languages/en.php:
+  Fixes #3792 admin can edit settings again
+
+  	* languages/en.php: made status message a little more grammatical
+
+  	* js/lib/pageowner.js: Fixes #4093 making sure elgg.page_owner is defined
+
+  	* mod/profile/views/default/profile/owner_block.php: don't want hover menu
+  or link on owner block icon in profile
+
+  	* views/default/forms/admin/site/update_advanced.php,
+  views/default/forms/admin/site/update_basic.php: line between settings and
+  save button not needed
+
+  	* actions/admin/site/update_basic.php: Fixes #3996 displaying message when
+  basic site settings are saved
+
+  	* views/default/css/elements/navigation.php: Fixes #3929 used a combination
+  of min-width/max-width and overflow hidden to provide better support for long
+  names
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggObject.php, engine/classes/ElggSite.php,
+  engine/classes/ElggUser.php: Fixes #4111 guid is now an int
+
+  	* mod/thewire/start.php: Fixes #4085 accepting . in usernames for the wire
+
+  	* engine/tests/api/helpers.php: Fixes #4128 better test of null passed to
+  registering external files
+
+  	* engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_18/manifest.xml: Fixes #4134 improved plugin
+  manifest tests by using assertIdentical more
+
+  	* engine/classes/ElggPluginManifest.php, engine/tests/api/plugins.php: Fixes
+  #4133 updated type in plugin manifest test
+
+  	* engine/tests/api/metastrings.php: Fixes #4132 fixed metastring delete by
+  id test
+
+  	* engine/lib/metastrings.php, engine/tests/api/metastrings.php: Fixes #4131
+  elgg_delete_metastring_based_object_by_id() should return a bool
+
+  	* engine/tests/api/helpers.php: Fixes #4129 fixed priority list tests
+
+  	* engine/tests/api/entity_getter_functions.php: Fixes #4126 fixed test for
+  checking relationship existence
+
+  	* engine/classes/ElggGroup.php, engine/lib/relationships.php: Fixes #4118
+  returning bool from leave group functions
+
+  	* engine/lib/access.php, engine/tests/api/access_collections.php: Fixes
+  #4115 returning bool from remove_user_from_access_collection()
+
+  	* engine/lib/access.php: Fixes #4113 returning a bool from
+  delete_access_collection()
+
+  	* engine/tests/api/entity_getter_functions.php: Fixes #4125 checking count
+  correctly
+
+  	* engine/tests/api/entity_getter_functions.php: Fixes #4122, #4123, #4124
+  testing for empty arrays and added some documentation for the sanity of
+  future developers
+
+  	* engine/lib/users.php: Fixes #4112 get_user_by_username() returns false if
+  no user
+
+2011-11-18  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/tests/api/metastrings.php, engine/tests/objects/sites.php,
+  engine/tests/objects/users.php, engine/tests/test_skeleton.php: Fixes #4109
+  remove inaccurate comment due to copy & paste
+
+  	* engine/lib/entities.php, engine/tests/objects/entities.php,
+  engine/tests/objects/sites.php, engine/tests/objects/users.php: Fixes #4108
+  delete() returns bool now and updated unit tests
+
+  	* engine/tests/objects/entities.php: Fixes #4104, #4105 fixed casting in
+  testElggEntityMetadata()
+
+  	* engine/tests/api/access_collections.php: Fixes #4114 checking type for acl
+  test
+
+2011-11-17  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/tests/api/metadata.php: Fixes #4120 metadata tests now check for
+  the correct types
+
+  	* engine/tests/objects/entities.php: Fixes #4094, #4095 fixes casting issues
+  in unit tests - thanks to andres.fortier
+
+  	* mod/externalpages/start.php: Fixes #4101 added footer links back
+
+  	* mod/thewire/pages/thewire/everyone.php: Fixes #4100 adds the wire post
+  form back to all page
+
+2011-11-16  cash <cash.costello@gmail.com>
+
+  	* mod/thewire/pages/thewire/friends.php,
+  mod/thewire/pages/thewire/owner.php: removed two deprecated function calls
+  from thewire
+
+2011-11-15  Cash Costello <cash.costello@gmail.com>
+
+  	* CHANGES.txt: updated release date
+
+  	* documentation/examples/plugins/README.txt,
+  documentation/examples/plugins/start.php: updated the plugin skeleton with
+  some instructions
+
+  	* actions/avatar/crop.php, actions/avatar/upload.php: fixed bugs in avatar
+  cropping with remembering old crop coordinates and resizing the master
+
+  	* engine/lib/elgglib.php, js/lib/autocomplete.js, js/lib/avatar_cropper.js,
+  js/lib/friends_picker.js, js/lib/ui.autocomplete.js,
+  js/lib/ui.avatar_cropper.js, js/lib/ui.friends_picker.js,
+  js/lib/ui.userpicker.js, js/lib/userpicker.js: atleast renaming the ui js
+  libs
+
+  	* engine/classes/ElggRelationship.php: Fixes #4089 corrects documentation of
+  ElggRelationship constructor
+
+  	* engine/lib/relationships.php: Fixes #4090 removes double assignment -
+  thanks to andres.fortier
+
+2011-11-14  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/messages/pages/messages/send.php,
+  mod/messages/views/default/forms/messages/send.php: Refs #4083 increased
+  number of friends to 50
+
+2011-11-13  cash <cash.costello@gmail.com>
+
+  	* engine/classes/ElggMenuItem.php: added the missing set/get priority
+  methods to ElggMenuItem
+
+2011-11-13  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/users.php, .../views/default/bookmarks/bookmarklet.php,
+  views/default/core/avatar/upload.php, views/default/forms/avatar/crop.php,
+  views/default/icon/default.php, views/default/icon/user/default.php,
+  views/default/output/img.php: Fixes #4082 adds output/img
+
+  	* .../views/default/groups/profile/widgets.php: should be a ul rather than a
+  div
+
+  	* views/default/output/confirmlink.php: need to unset the trusted link key
+
+2011-11-12  cash <cash.costello@gmail.com>
+
+  	* documentation/examples/hooks/advanced.php,
+  documentation/examples/hooks/all.php, documentation/examples/hooks/basic.php,
+  documentation/examples/hooks/register/advanced.php,
+  documentation/examples/hooks/register/all.php,
+  documentation/examples/hooks/register/basic.php,
+  documentation/examples/hooks/register/emit.php,
+  documentation/examples/hooks/trigger.php,
+  documentation/examples/hooks/trigger/advanced.php,
+  documentation/examples/hooks/trigger/basic.php: cleaned up the plugin hooks
+  documentation
+
+  	* documentation/examples/actions/basic.php,
+  documentation/examples/actions/manual_tokens.php,
+  documentation/examples/events/advanced.php,
+  documentation/examples/events/all.php,
+  documentation/examples/events/basic.php,
+  documentation/examples/events/emit.php,
+  documentation/examples/events/trigger.php,
+  documentation/examples/plugins/README.txt,
+  documentation/examples/plugins/languages/en.php,
+  documentation/examples/plugins/manifest.xml,
+  .../examples/plugins/manifest_options/manifest.xml,
+  .../examples/plugins/skeleton/manifest.xml, documentation/info/config.php,
+  documentation/info/manifest.xml, documentation/stubs/config.php: added better
+  plugin skeleton and added documentation to some of the examples
+
+2011-11-12  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/admin.php: added bottom margin to info modules for
+  plugin settings
+
+  	* engine/lib/users.php, mod/groups/actions/groups/edit.php,
+  mod/groups/actions/groups/membership/leave.php, mod/invitefriends/start.php,
+  pages/entities/index.php, pages/settings/account.php,
+  pages/settings/statistics.php: removed uses of deprecated function for
+  setting page owner guid
+
+  	* mod/invitefriends/actions/invite.php: fixed exception being thrown when no
+  site email address has been set
+
+  	* views/default/css/admin.php: added a input class for text boxes so that
+  they aren't super long
+
+  	* mod/messages/pages/messages/send.php: removed deprecated function from
+  messages plugin
+
+2011-11-10  cash <cash.costello@gmail.com>
+
+  	* languages/en.php, mod/pages/pages/pages/edit.php: fixed WSOD when trying
+  to edit a private page
+
+  	* engine/lib/database.php: Fixes #4071 hellekin was right - it was a bad
+  idea to format queries
+
+  	* js/lib/ajax.js, js/lib/elgglib.js, js/lib/security.js,
+  js/tests/ElggLibTest.js, js/tests/ElggSecurityTest.js: Fixes #4010 not
+  sending naked query strings into add ajax tokens and also fixed a few related
+  bugs in JavaScript
+
+2011-11-08  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/likes/languages/en.php: exclamation marks are annoying in
+  notifications
+
+  	* CONTRIBUTORS.txt, COPYRIGHT.txt: we rewrote default widgets from scratch
+  so updated copyright/contributors to reflect that
+
+  	* .../examples/plugins/manifest_options/manifest.xml,
+  .../examples/plugins/skeleton/manifest.xml, engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_17/manifest.xml,
+  engine/tests/test_files/plugin_18/manifest.xml, mod/blog/manifest.xml,
+  mod/bookmarks/manifest.xml, mod/categories/manifest.xml,
+  mod/custom_index/manifest.xml, mod/dashboard/manifest.xml,
+  mod/developers/manifest.xml, mod/diagnostics/manifest.xml,
+  mod/embed/manifest.xml, mod/externalpages/manifest.xml,
+  mod/file/manifest.xml, mod/garbagecollector/manifest.xml,
+  mod/groups/manifest.xml, mod/htmlawed/manifest.xml,
+  mod/invitefriends/manifest.xml, mod/likes/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/members/manifest.xml, mod/messageboard/manifest.xml,
+  mod/messages/manifest.xml, mod/notifications/manifest.xml,
+  mod/oauth_api/manifest.xml, mod/pages/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/twitter_api/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: it is GPL General Public License not GPL Public
+  License
+
+  	* views/rss/page/default.php: Refs #3150 can pass description to RSS page
+  shell
+
+2011-11-07  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggUser.php, views/default/js/initialize_elgg.php: Refs
+  #4007 previous solution to admin population in ElggUser was throwing warnings
+
+  	* README.txt: fixed date on copyright and name of GPL
+
+  	* mod/custom_index/start.php: removing deprecated functions from
+  custom_index plugin
+
+  	* CHANGES.txt: Updated change log
+
+  	* version.php: incremented version number
+
+  	* INSTALL.txt: updated install instructions
+
+  	* UPGRADE.txt: fixed wording in upgrade instructions
+
+2011-11-07  Evan Winslow <evan.b.winslow@gmail.com>
+
+  	* documentation/coding_standards/best_practices.txt: Fixes #3397: Adds
+  'positive' variable name standard to best practices file.
+
+2011-11-06  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/tinymce/views/default/js/tinymce.php,
+  .../default/tinymce/embed_custom_insert_js.php: Fixes #3853 caching a
+  bookmark for insert carot when embedding content into TinyMCE editor
+
+  	* mod/tinymce/vendor/tinymce/changelog.txt,
+  .../tiny_mce/plugins/emotions/emotions.htm,
+  .../tiny_mce/plugins/emotions/js/emotions.js,
+  .../tiny_mce/plugins/emotions/langs/en_dlg.js,
+  .../tiny_mce/plugins/lists/editor_plugin.js,
+  .../tiny_mce/plugins/lists/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../tiny_mce/plugins/media/moxieplayer.swf,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/table.js,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../jscripts/tiny_mce/themes/advanced/charmap.htm,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../tiny_mce/themes/advanced/js/charmap.js,
+  .../tiny_mce/themes/advanced/js/color_picker.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_src.js: upgraded TinyMCE to 3.4.7
+
+  	* mod/embed/views/default/js/embed/embed.php,
+  mod/likes/views/default/annotation/likes.php,
+  mod/messages/views/default/object/messages.php,
+  .../views/default/thewire/profile_status.php,
+  .../forms/twitter_api/interstitial_settings.php: removed uses of CSS class
+  .right from plugins
+
+  	* views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php,
+  views/default/page/elements/footer.php: remove uses of the CSS class right
+  from core
+
+  	* engine/lib/entities.php, mod/blog/activate.php, mod/thewire/activate.php:
+  Fixes #4068 not forcing update on adds when the subtype exists Refs #4058
+
+  	* engine/lib/cron.php: $CONFIG->input is never initialized by page handling
+  so this code never did anything
+
+  	* mod/blog/activate.php, mod/blog/deactivate.php, mod/search/README.txt,
+  mod/thewire/activate.php, mod/thewire/deactivate.php, mod/thewire/start.php:
+  Fixes #4067 adds activate/deactivate scripts
+
+  	* views/default/icon/user/default.php: added a href override to the user
+  icon view
+
+2011-11-05  cash <cash.costello@gmail.com>
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/elgglib.php,
+  engine/lib/navigation.php, engine/lib/views.php, mod/blog/start.php,
+  mod/file/start.php, mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  .../views/default/object/groupforumtopic.php, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/profile/start.php,
+  mod/thewire/pages/thewire/everyone.php, pages/settings/account.php,
+  views/default/forms/login.php, views/default/input/button.php,
+  views/default/output/access.php, views/default/page/components/gallery.php,
+  views/default/page/components/list.php,
+  views/default/page/components/module.php,
+  views/default/page/layouts/one_column.php,
+  views/default/page/layouts/widgets.php: Fixes #4024 fixed a lot of notices -
+  enough for this release - found a few bugs
+
+  	* .../views/default/admin/users/unvalidated.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  .../views/default/uservalidationbyemail/css.php,
+  .../views/default/uservalidationbyemail/js.php,
+  .../uservalidationbyemail/unvalidated_user.php: Fixes #3867 finished up
+  uservalidationbyemail styling after a great start by Sem
+
+  	* views/default/css/admin.php, views/default/css/elements/core.php,
+  views/default/css/elements/helpers.php,
+  views/default/forms/admin/menu/save.php: cleaned up some CSS in admin theme
+
+  	* mod/file/languages/en.php, mod/file/start.php,
+  views/default/navigation/listtype.php, views/default/navigation/viewtype.php,
+  views/default/page/elements/sidebar.php: Fixes #1253 added toggle for list
+  types to file plugin. It's not pretty so we may want to style/rethink in
+  future version
+
+  	* engine/lib/input.php, engine/lib/views.php,
+  .../views/default/theme_preview/icons/avatars.php,
+  mod/file/views/default/icon/object/file.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../notifications/subscriptions/forminternals.php,
+  mod/profile/views/default/profile/owner_block.php,
+  views/default/icon/default.php, views/default/icon/user/default.php,
+  views/default/input/friendspicker.php, views/default/input/userpicker.php,
+  views/default/profile/icon.php, .../river/user/default/profileiconupdate.php:
+  Fixes #3567 standardized classes for icons
+
+  	* mod/file/views/default/icon/object/file.php,
+  views/default/icon/default.php, views/default/icon/user/default.php: Fixes
+  #4023 escaping alt and title attributes in icon views
+
+  	* mod/groups/start.php: Refs #4059 group icon handler needs to return true
+
+  	* views/default/input/date.php, views/default/output/date.php: Fixes #4050
+  using ISO 8601 standard for dates
+
+  	* engine/lib/entities.php: Fixes #4018 Refs #3722 merged up to 1.7.14 into
+  master
+
+  	* engine/lib/entities.php: fixed spacing on two uses of unset()
+
+  	* engine/lib/views.php, js/tests/jsTestDriver.conf,
+  vendors/jquery/jquery-1.6.1.min.js, vendors/jquery/jquery-1.6.2.min.js,
+  vendors/jquery/jquery-1.6.4.min.js, vendors/jquery/jquery-ui-1.8.14.min.js,
+  views/installation/page/default.php: Fixes #4057 updates jQuery version to
+  1.6.4
+
+  	* mod/file/download.php, mod/file/pages/file/download.php,
+  mod/file/pages/file/view.php, mod/file/start.php,
+  mod/file/views/rss/file/enclosure.php: Fixes #4048 using page handler for
+  file downloads
+
+  	* engine/lib/database.php: Fixes #4049 casting bool to int so it doesn't
+  disappear in the cache key
+
+  	* js/lib/elgglib.js, js/tests/ElggLibTest.js: Fixes #3976 fixed unit tests
+  for normalizing urls and standardized the code from the previous merge
+
+  	* js/tests/README, js/tests/jsTestDriver.conf: Changed default port to a
+  common one found in tutorials. Let me know if this is an issue. Also added
+  intructions for running the unit tests.
+
+2011-11-05  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/pagehandler.php: Refs #4053 improved documentation of
+  page_handler()
+
+  	* actions/avatar/upload.php: Refs #4011 forgot upload action
+
+  	* mod/twitter_api/lib/twitter_api.php: Fixes #4061 getting icon sizes from
+  config for twitter plugin
+
+  	* engine/lib/users.php, pages/account/login.php: Fixes #4060 combined some
+  page handlers for users lib
+
+2011-11-04  cash <cash.costello@gmail.com>
+
+  	* engine/lib/admin.php, engine/lib/cron.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/pagehandler.php, engine/lib/river.php,
+  engine/lib/tags.php, engine/lib/user_settings.php, engine/lib/users.php,
+  mod/blog/start.php, mod/bookmarks/start.php, mod/categories/start.php,
+  mod/dashboard/start.php, mod/developers/start.php,
+  mod/externalpages/start.php, mod/file/start.php, mod/groups/start.php,
+  mod/invitefriends/start.php, mod/members/start.php,
+  mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/search/start.php, mod/thewire/start.php,
+  mod/twitter_api/start.php, mod/uservalidationbyemail/start.php: Fixes #4059
+  returning true when handling a page
+
+  	* engine/lib/admin.php, engine/lib/deprecated-1.8.php,
+  engine/lib/elgglib.php, engine/lib/pagehandler.php, engine/lib/river.php,
+  engine/lib/tags.php, engine/lib/user_settings.php, engine/lib/users.php,
+  mod/blog/start.php, mod/bookmarks/start.php, mod/categories/start.php,
+  mod/dashboard/start.php, mod/developers/start.php, mod/diagnostics/start.php,
+  mod/externalpages/start.php, mod/file/start.php, mod/groups/start.php,
+  mod/invitefriends/start.php, mod/members/start.php,
+  mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/search/start.php, mod/thewire/start.php,
+  mod/twitter_api/start.php, mod/uservalidationbyemail/start.php: Fixes #4059
+  page handlers all return nothing
+
+  	* mod/blog/start.php: fixed typo in comment for blog page handler
+
+2011-11-04  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/entities.php: Fixes #4058 updating a subtype if it already
+  exists
+
+  	* mod/groups/languages/en.php,
+  .../views/rss/annotation/group_topic_post.php,
+  mod/groups/views/rss/discussion/replies.php,
+  mod/groups/views/rss/forum/topicposts.php,
+  mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/contentwrapper.php,
+  mod/groups/views/rss/groups/profile/layout.php,
+  mod/groups/views/rss/groups/profileitems.php,
+  mod/groups/views/rss/object/groupforumtopic.php: Fixes #4027 updated groups
+  RSS feeds for 1.8
+
+  	* .../views/default/custom_index/css.php,
+  .../views/default/page/layouts/custom_index.php: Refs #2937 featured is
+  primary module class and highlight is extension
+
+  	* views/default/core/walled_garden/login.php,
+  views/default/core/walled_garden/lost_password.php,
+  views/default/core/walled_garden/register.php,
+  views/default/page/components/module.php: Fixes #4047 header and footer
+  optional for the module view
+
+2011-11-03  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/ie7.php: updated CSS for walled garden and IE7
+
+  	* views/default/forms/login.php: Fixes #3882 Remember me needed to be
+  floated before the button was added
+
+  	* js/tests/jsTestDriver.conf: updated jsTest configuration for new jQuery
+  and hooks library
+
+  	* js/tests/ElggLanguagesTest.js, js/tests/ElggSecurityTest.js: Fixes #4051 -
+  fixes security token unit test and language unit tests
+
+  	* js/lib/elgglib.js: Fixes #4034 now using approach that exists in IE to
+  find elements in an Array
+
+  	* js/lib/hooks.js: Refs #4051 hooks trigger function was returning undefined
+  when it should have been returning true
+
+  	* js/classes/ElggPriorityList.js: Refs #4051 insert also needed to check for
+  undefined priorities
+
+  	* js/classes/ElggPriorityList.js: Refs #4051 fixed insert for case when
+  priority is set to 0
+
+  	* js/tests/ElggPriorityListTest.js: Refs #4051 fixed bad unit test for
+  ElggPriorityList.insert
+
+2011-11-03  Sem <sembrestels@riseup.net>
+
+  	* .../forms/uservalidationbyemail/bulk_action.php,
+  .../views/default/uservalidationbyemail/css.php,
+  .../views/default/uservalidationbyemail/js.php,
+  .../uservalidationbyemail/unvalidated_user.php, views/default/css/admin.php:
+  Refs #3867. Unvalidated users is an unordered list now. Added right class and
+  other css helpers to admin css. Standarized css namespaces and dashes in
+  classes. Acomplishing code standards.
+
+2011-11-03  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* engine/lib/entities.php: Fixes 4041 (Deleted entities remain in memcache)
+
+2011-11-03  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/bookmarks/languages/en.php,
+  mod/bookmarks/views/rss/object/bookmarks.php, mod/file/start.php,
+  mod/file/views/rss/file/enclosure.php, mod/file/views/rss/object/file.php,
+  mod/search/views/rss/search/list.php,
+  mod/search/views/rss/search/listing.php, mod/thewire/languages/en.php,
+  mod/thewire/views/rss/object/thewire.php,
+  views/rss/annotation/generic_comment.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/user/default.php: Refs #4027 updated
+  all rss views except for groups
+
+  	* mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/friends.php, mod/file/languages/en.php,
+  mod/file/pages/file/world.php, mod/groups/languages/en.php,
+  mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  .../views/default/discussion/group_module.php: Fixes #4042 made sure empty
+  content pages had a message about no content
+
+2011-11-03  Sem <sembrestels@riseup.net>
+
+  	* js/lib/elgglib.js, js/tests/ElggLibTest.js: Fixes #3976.
+  elgg.normalize_url() js function has the fix in #3747.
+
+2011-11-02  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/start.php, install/ElggInstaller.php: input lib depends on
+  pageowner lib now
+
+  	* .../views/default/theme_preview/forms.php: Refs #4039 updated the theming
+  sandbox for radio button classes
+
+2011-11-02  Sem <sembrestels@riseup.net>
+
+  	* .../forms/uservalidationbyemail/bulk_action.php,
+  .../views/default/uservalidationbyemail/css.php,
+  .../uservalidationbyemail/unvalidated_user.php: Refs #3867.
+  elgg_view_image_block used for list users. Bulk operations as a list.
+
+  	* mod/uservalidationbyemail/start.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  .../views/default/uservalidationbyemail/css.php,
+  .../views/default/uservalidationbyemail/js.php,
+  .../uservalidationbyemail/unvalidated_user.php: Fixes #3867. Rewrite and
+  style unvalidated users administration area.
+
+2011-11-02  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* views/default/css/elements/forms.php: #4039 (Incorrect CSS class set in
+  input/radio)
+
+2011-11-01  cash <cash.costello@gmail.com>
+
+  	* .../views/default/admin/developers/settings.php,
+  .../admin/develop_utilities/diagnostics.php,
+  .../views/default/admin/appearance/expages.php,
+  mod/externalpages/views/default/expages/menu.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/appearance/profile_fields.php,
+  views/default/admin/plugin_settings.php,
+  views/default/admin/settings/advanced.php,
+  views/default/admin/settings/basic.php, views/default/css/admin.php: Fixes
+  #3672 added class for settings forms in admin area
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/entities.php, engine/lib/location.php, engine/lib/metadata.php,
+  engine/lib/plugins.php, engine/lib/private_settings.php,
+  engine/lib/relationships.php: standardized the elgg_get_entities* function
+  @return documentation
+
+  	* mod/blog/lib/blog.php, mod/blog/views/default/object/blog.php,
+  mod/bookmarks/pages/bookmarks/view.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  views/default/object/elements/full.php: Fixes #4035 made the entity view
+  pages consistent for blog, bookmarks, file, pages, and forum posts
+
+  	* js/lib/ui.js: Fixes #4022 made JS lib a little more consistent
+
+  	* .../javascript_coding_standards.txt, js/lib/avatar_cropper.js,
+  js/lib/configuration.js, js/lib/elgglib.js, js/lib/hooks.js, js/lib/ui.js,
+  js/lib/ui.widgets.js, js/lib/userpicker.js,
+  mod/blog/views/default/js/blog/save_draft.php,
+  mod/bookmarks/views/default/bookmarks/js.php,
+  .../views/default/js/developers/developers.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  mod/thewire/views/default/js/thewire.php,
+  mod/tinymce/views/default/js/tinymce.php,
+  .../views/default/uservalidationbyemail/js.php: added semi-colons after
+  function expressions
+
+  	* engine/classes/ElggUser.php, js/classes/ElggUser.js: Fixes #4007 merged in
+  sembrestels fix for ElggUser.isAdmin but used prototype instead of extending
+  object in constructor
+
+  	* views/default/output/text.php: Fixes #4038 corrects comment for view
+  output/text
+
+2011-10-30  cash <cash.costello@gmail.com>
+
+  	* engine/lib/elgglib.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/walled_garden/body.php,
+  views/default/core/walled_garden/login.php,
+  views/default/core/walled_garden/lost_password.php,
+  views/default/core/walled_garden/register.php,
+  views/default/css/walled_garden.php, views/default/forms/login.php,
+  views/default/js/walled_garden.php, views/default/page/walled_garden.php:
+  added back support for registration and forgotten passwords to walled garden
+  index
+
+  	* _graphics/walled_garden/one_column_bottom.png,
+  _graphics/walled_garden/one_column_middle.png,
+  _graphics/walled_garden/one_column_top.png,
+  _graphics/walled_garden/two_column_bottom.png,
+  _graphics/walled_garden/two_column_middle.png,
+  _graphics/walled_garden/two_column_top.png,
+  _graphics/walled_garden_background_bottom.gif,
+  _graphics/walled_garden_background_extend.gif,
+  _graphics/walled_garden_background_top.gif,
+  _graphics/walled_garden_backgroundfull_bottom.gif,
+  _graphics/walled_garden_backgroundfull_top.gif, engine/lib/elgglib.php,
+  views/default/core/walled_garden/body.php,
+  views/default/css/walled_garden.php, views/default/page/walled_garden.php:
+  basic walled garden implementation for logging in
+
+  	* views/default/core/account/login_box.php: added support for specifying the
+  module type to login box
+
+2011-10-30  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/plugins.php, languages/en.php, views/default/admin/plugins.php:
+  Fixes #2821. Plugins that are active and cannot be started emit an admin
+  notice.
+
+2011-10-30  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/input.php, mod/htmlawed/start.php,
+  views/default/output/longtext.php: Fixes #3370 running the anti-spam option
+  of htmlawed when filtering for output
+
+  	* engine/lib/output.php: removed non-overridable insertion of inline style
+  to links
+
+  	* engine/lib/configuration.php, engine/lib/pageowner.php: setting
+  $CONFIG->context earlier to avoid using the context functions before it is
+  initialized
+
+2011-10-29  Brett Profitt <brett.profitt@gmail.com>
+
+  	* actions/widgets/save.php, views/default/widgets/river_widget/content.php,
+  views/default/widgets/river_widget/edit.php: Fixes #4001. Activity widget
+  passes a context so correct output is displayed upon save.
+
+  	* js/lib/elgglib.js, js/lib/security.js: Fixes #4010, refs #3927. Fixed
+  elgg.security.addToken() to work with query strings, relative URLs, and full
+  URLs.
+
+  	* mod/blog/lib/blog.php, mod/blog/start.php, mod/notifications/index.php,
+  mod/thewire/start.php, mod/tinymce/start.php: Refs #3859. Added
+  elgg_register_simplecache_view() to core plugins' js.
+
+  	* engine/lib/cache.php: Fixes #4029, refs #3859.
+  elgg_invalidate_simplecache() resets the lastcached and lastupdate datasets.
+  Added documentation about how to use simple cache views.
+
+2011-10-29  cash <cash.costello@gmail.com>
+
+  	* .../examples/plugins/full_manifest/manifest.xml,
+  .../examples/plugins/manifest_options/manifest.xml,
+  .../examples/plugins/simple_manifest/manifest.xml,
+  .../examples/plugins/skeleton/manifest.xml: better organization for the
+  manifests and plugin skeleton
+
+  	* .../examples/plugins/full_manifest/manifest.xml,
+  documentation/examples/plugins/manifest.xml,
+  .../examples/plugins/simple_manifest/manifest.xml: creates a simple manifest
+  for people to copy and use
+
+  	* .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  .../vendors/oauth/library/OAuthRequester.php,
+  .../vendors/oauth/library/OAuthServer.php: Refs #4028 reset the oAuth lib to
+  version r64 of oauth-php
+
+  	* engine/classes/ElggEntity.php, engine/classes/Locatable.php,
+  languages/en.php, views/default/annotation/generic_comment.php,
+  views/rss/annotation/default.php, views/rss/annotation/generic_comment.php,
+  views/rss/group/default.php, views/rss/object/creator.php,
+  views/rss/object/default.php, views/rss/object/georss.php,
+  views/rss/output/url.php, views/rss/page/components/creator.php,
+  views/rss/page/components/georss.php, views/rss/page/default.php,
+  views/rss/page/elements/comments.php, views/rss/river/item.php,
+  views/rss/search/entity_list.php, views/rss/user/default.php: Fixes #3201
+  updates rss view type for core Elgg
+
+  	* views/php/api/output.php, views/php/group/default.php,
+  views/php/object/default.php, views/php/page/default.php,
+  views/php/site/default.php, views/php/user/default.php: Refs #3201 updates
+  the php view type
+
+  	* views/json/api/output.php, views/json/entities/entity_list.php,
+  views/json/group/default.php, views/json/object/default.php,
+  views/json/site/default.php, views/json/user/default.php,
+  views/php/search/entity_list.php: Refs #3201 this finishes the updates on the
+  JSON view
+
+  	* engine/classes/ElggRiverItem.php, views/json/page/components/list.php,
+  views/json/page/default.php, views/json/river/item.php,
+  views/json/river/item/list.php, views/json/search/entity_list.php: Refs #3201
+  updates json river views and removed old search view
+
+  	* engine/lib/views.php, .../views/default/river/object/blog/create.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/river/object/file/create.php,
+  .../river/annotation/group_topic_post/reply.php,
+  mod/groups/views/default/river/group/create.php,
+  .../river/object/groupforumtopic/create.php,
+  .../default/river/relationship/member/create.php,
+  .../default/river/object/messageboard/create.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/thewire/create.php,
+  .../river/annotation/generic_comment/create.php,
+  views/default/river/elements/layout.php, views/default/river/item.php,
+  views/default/river/relationship/friend/create.php,
+  .../river/user/default/profileiconupdate.php,
+  views/default/river/user/default/profileupdate.php: adds a river layout view
+  that all river views should use
+
+  	* mod/search/search_hooks.php: Refs #3983 merged fix into master
+
+  	* pages/avatar/view.php: Refs #3396 fixed the integration of this 1.7 fix
+  into 1.8 and also added better expires header
+
+2011-10-29  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggEntity.php, mod/profile/icon.php,
+  mod/profile/icondirect.php, mod/profile/start.php: Fixes #3920 profile plugin
+  adds a fast loading of user avatars
+
+  	* mod/messages/pages/messages/read.php, mod/messages/start.php,
+  mod/messages/views/default/object/messages.php: Fixes #4015 decrementing the
+  count before adding to the topbar
+
+2011-10-28  Cash Costello <cash.costello@gmail.com>
+
+  	* js/lib/ui.js, views/default/input/date.php: Fixes #4012 when using a
+  timestamp with input/date, return UTC time rather than local time
+
+  	* .../views/default/theme_preview/forms.php: using correct date string now
+  in developers form sandbox
+
+2011-10-27  cash <cash.costello@gmail.com>
+
+  	* actions/avatar/crop.php, engine/lib/views.php,
+  mod/groups/actions/groups/edit.php: Fixes #4011 icon sizes are configurable
+  now
+
+  	* mod/externalpages/start.php, views/default/css/elements/navigation.php,
+  views/default/css/ie7.php, views/default/forms/login.php,
+  views/default/page/walled_garden.php: Fixes #3863 introduced
+  elgg-menu-general so that elgg-menu-footer can be specific to site footer
+
+  	* views/default/object/plugin.php, views/default/object/plugin/advanced.php,
+  views/default/object/plugin/full.php, views/default/object/plugin/simple.php:
+  Refs #3917 removed more code from simple plugin interface
+
+  	* mod/search/start.php, mod/search/views/default/search/css.php,
+  mod/search/views/default/search/header.php,
+  mod/search/views/default/search/search_box.php: Fixes #3687 added
+  .elgg-search-header for css specific to header search box
+
+  	* js/lib/avatar_cropper.js: Fixes #3832 initialize avatar crop area
+
+  	* mod/groups/lib/groups.php,
+  .../views/default/groups/membershiprequests.php: Refs #3296 displaying all
+  group membership requests on one page
+
+  	* views/rss/page/default.php: Fixes #3150 added a blank description field so
+  RSS is valid - any better ideas?
+
+  	* engine/lib/views.php, .../views/default/custom_index/css.php,
+  .../views/default/page/layouts/custom_index.php: Fixes #2937 added
+  .elgg-module-front
+
+2011-10-27  Cash Costello <cash.costello@gmail.com>
+
+  	* pages/account/register.php, views/default/css/admin.php,
+  views/default/css/elements/forms.php: Refs #3672 updated account forms for
+  max width
+
+  	* engine/lib/users.php: login page should not be displayed to logged in
+  users
+
+2011-10-26  Brett Profitt <brett.profitt@gmail.com>
+
+  	* UPGRADE.txt: Made instructions for removing mod/profile clearer.
+
+2011-10-26  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/likes/start.php: Fixes #3958 added special catch for liking groups
+
+  	* languages/en.php, .../admin/appearance/profile_fields/list.php,
+  views/default/forms/profile/fields/add.php: Fixes #3926 updated spacing for
+  edit profile field forms
+
+2011-10-26  Sem <sembrestels@riseup.net>
+
+  	* mod/externalpages/start.php, views/default/css/walled_garden.php,
+  views/default/page/walled_garden.php: Closes #3947. External pages are now
+  viewable by visitors in walled-garden sites. Footer menu is also added into
+  walled-garden logging page.
+
+2011-10-25  cash <cash.costello@gmail.com>
+
+  	* views/default/object/elements/summary.php: Fixes #2292 added
+  object/summary/extend view
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/pages/views/default/object/page_top.php,
+  views/default/object/elements/full.php: added new view for the full display
+  of objects
+
+2011-10-25  Cash Costello <cash.costello@gmail.com>
+
+  	* views/ical/export/entity.php, views/ical/object/default.php,
+  views/ical/page/default.php, views/ical/search/entity_list.php: Refs #3201 a
+  working ical view type
+
+2011-10-24  cash <cash.costello@gmail.com>
+
+  	* mod/profile/views/default/profile/metatags.php,
+  views/foaf/page/default.php, views/foaf/search/entity_list.php,
+  views/foaf/user/default.php: Refs #3201 updated foaf link to only be added to
+  user's pages
+
+  	* views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/page/default.php: Refs #3201 updating failsafe viewtype to
+  Elgg standards for CSS
+
+  	* .../admin/develop_utilities/diagnostics.php,
+  .../views/default/forms/diagnostics/download.php: Fixes #3868 removed
+  unnecessary form for downloading the diagnostics report
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  mod/pages/views/default/object/page_top.php: Fixes #3974 blog, bookmarks,
+  file, and pages plugins consistent in integration with categories plugin
+
+2011-10-23  germanazo <germanazo@phpdev>
+
+  	* engine/lib/users.php: Cleanned the login failures on passwords resets,
+  this have more sense
+
+2011-10-23  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/page/components/module.php: Fixes #4003 footer in modules is
+  included by default
+
+  	* views/default/input/reset.php, views/default/input/submit.php: Refs #3810
+  standardizes the button views
+
+2011-10-23  Brett Profitt <brett.profitt@gmail.com>
+
+  	* .../admin/appearance/profile_fields/list.php, views/default/js/admin.php:
+  Fixes #3864. Removed old code from profile fields sorting. Name spaced IDs
+  and classes.
+
+  	* engine/lib/elgglib.php, js/lib/avatar_cropper.js, js/lib/ui.js,
+  views/default/forms/avatar/crop.php: Fixes #3914. Pulled avatar code out into
+  its own library.
+
+  	* js/lib/ui.js, views/default/css/elements/misc.php,
+  views/default/forms/avatar/crop.php: Fixes #3914. Moved avatar cropping to
+  ui.js.
+
+  	* engine/lib/plugins.php: Fixes #3991. Populating provided_by in
+  elgg_get_plugins_provides().
+
+  	* UPGRADE.txt: Fixes #3975. Added mod/profile to the list of dirs to remove
+  for an upgrade.
+
+  	* mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/categories/manifest.xml, mod/custom_index/manifest.xml,
+  mod/dashboard/manifest.xml, mod/developers/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/embed/manifest.xml,
+  mod/externalpages/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/likes/manifest.xml, mod/logbrowser/manifest.xml,
+  mod/logrotate/manifest.xml, mod/members/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/oauth_api/manifest.xml,
+  mod/pages/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/twitter_api/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: Fixes #3959. Using elgg_release in core plugins.
+
+2011-10-21  Cash Costello <cash.costello@gmail.com>
+
+  	* install/ElggInstaller.php, install/cli/sample_installer.php: Fixes #3995
+  the batch installer now skips the settings file creation step if settings.php
+  already exists
+
+  	* install/ElggInstaller.php: Fixes #3994 cleaned up session handling for the
+  installer
+
+  	* engine/lib/filestore.php: don't set default filestore if we don't have a
+  dataroot
+
+  	* engine/classes/ElggSite.php: updated ElggSite::disable() to conform to
+  ElggEntity::disable()
+
+  	* engine/classes/ElggMetadata.php, engine/lib/entities.php: Fixes #3988
+  correctly passing user_guid through canEdit for metadata
+
+  	* engine/lib/entities.php: fixed access of non-object property in entities
+  lib
+
+  	* engine/lib/access.php: Fixes #3989 fixed access of non-object property in
+  access lib
+
+  	* views/installation/input/access.php, views/installation/input/button.php,
+  views/installation/input/checkbox.php, views/installation/input/dropdown.php,
+  views/installation/input/form.php, views/installation/input/password.php,
+  views/installation/input/text.php: cleaned up input views for installation so
+  that no notices are thrown
+
+2011-10-21  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* views/default/input/reset.php: #3810 (No class in input/reset view)
+
+2011-10-20  Brett Profitt <brett.profitt@gmail.com>
+
+  	* views/default/admin/plugins.php: Fixes #3990 Using
+  ElggPlugin->getFriendlyName() for sorting alphabetically to avoid WSODs with
+  invalid plugins.
+
+  	* engine/start.php: Fixes #3680. Explicitly connecting to db in start.php.
+
+  	* languages/en.php: Fixes #3968. Added 'on' and 'off' to core language.
+
+  	* views/default/forms/widgets/save.php: Fixes #3951. Added label for access
+  dropdown in widget edit view.
+
+2011-10-19  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/filestore.php, engine/lib/plugins.php: fixed minor errors in
+  the documentation in plugins and filestore lib
+
+2011-10-18  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/users.php: fixed typo in setting the default profile fields
+
+2011-10-17  cash <cash.costello@gmail.com>
+
+  	* actions/useradd.php: added another check to useradd action
+
+2011-10-17  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggPluginPackage.php: added additional readme names for
+  display on plugin page
+
+2011-10-15  Brett Profitt <brett.profitt@gmail.com>
+
+  	* js/lib/elgglib.js, js/lib/hooks.js: Fixes #3540. Added "instant hooks" to
+  JS hooks engine. elgg.register_instant_hook(name, type) will cause any
+  handler registering to that hook to be immediately executed if the hook has
+  been previously triggered. Open for better suggestions about the name.
+
+2011-10-14  Brett Profitt <brett.profitt@gmail.com>
+
+  	* js/lib/security.js: Fixes #3927. elgg.security.addToken() works for URLs
+  without query strings.
+
+  	* js/lib/elgglib.js: Refs #3927, #3976. Added elgg.parse_url() and
+  elgg.parse_str().
+
+2011-10-14  Janek Lasocki-Biczysko <j.lasocki-biczysko@intrallect.com>
+
+  	* engine/classes/ElggMemcache.php: Ticket #3928 updated
+  ElggMemecache->save() to take 3rd optional parameter
+
+2011-10-14  Cash Costello <cash.costello@gmail.com>
+
+  	* .../river/user/default/profileiconupdate.php: Fixes #3977 not showing
+  hover menu on avatar update in river
+
+2011-10-13  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php: Fixes #3901. Corrected typo for maxtime
+  sorting.
+
+  	* actions/admin/plugins/simple_update_states.php,
+  documentation/examples/plugins/manifest.xml,
+  engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser18.php, engine/lib/admin.php,
+  engine/tests/api/plugins.php, engine/tests/test_files/plugin_18/manifest.xml,
+  languages/en.php, mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/categories/manifest.xml, mod/custom_index/manifest.xml,
+  mod/dashboard/manifest.xml, mod/developers/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/embed/manifest.xml,
+  mod/externalpages/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/likes/manifest.xml, mod/logbrowser/manifest.xml,
+  mod/logrotate/manifest.xml, mod/members/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/pages/manifest.xml,
+  mod/profile/manifest.xml, mod/reportedcontent/manifest.xml,
+  mod/search/manifest.xml, mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/uservalidationbyemail/manifest.xml, mod/zaudio/manifest.xml: Fixes #3917.
+  Removed uses of admin interface in manifests. Removed related code.
+
+2011-10-13  cash <cash.costello@gmail.com>
+
+  	* js/lib/userpicker.js, views/default/input/userpicker.php: added
+  documentation for the userpicker
+
+2011-10-13  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/categories/listing.php, mod/categories/pages/categories/listing.php,
+  mod/categories/start.php: Fixes #3746. Moved the categories page handler
+  script. Updated the layout call.
+
+  	* views/default/css/admin.php: Fixes #3880. Removed the too greedy CSS rule
+  for elgg-admin-notice a so only the close icon is float right.
+
+2011-10-13  cash <cash.costello@gmail.com>
+
+  	* js/lib/userpicker.js: fixed bug where a removed user could not be added
+  again in userpicker
+
+2011-10-13  Brett Profitt <brett.profitt@gmail.com>
+
+  	* languages/en.php: Fixes #3734. Changed "Tested value" to "Expected value"
+  in the plugin deps matrix.
+
+2011-10-13  cash <cash.costello@gmail.com>
+
+  	* engine/lib/input.php, js/lib/userpicker.js,
+  views/default/css/elements/forms.php, views/default/input/userpicker.php:
+  displaying users that have been selected and added remove capability
+
+2011-10-13  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/twitter_api/languages/en.php,
+  .../default/plugins/twitter_api/usersettings.php: Fixes #3177. Don't show the
+  authorize twitter plugin setting if the admin hasn't set up the plugin.
+
+2011-10-13  cash <cash.costello@gmail.com>
+
+  	* js/lib/userpicker.js, views/default/input/userpicker.php: got the friends
+  option working for user picker
+
+2011-10-12  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/output.php, engine/tests/api/helpers.php: Fixes #3747. Using
+  filter_var to check for any valid URI.
+
+2011-10-12  cash <cash.costello@gmail.com>
+
+  	* engine/lib/input.php, mod/groups/views/default/group/default.php,
+  views/default/css/elements/forms.php, views/default/object/default.php,
+  views/default/user/default.php: Simple theme for autocomplete
+
+2011-10-11  Brett Profitt <brett.profitt@gmail.com>
+
+  	* version.php: Setting version to 1.8.1b1 instead of 1.8.1b.
+
+  	* CHANGES.txt: Fixed extra space in changes.
+
+2011-10-10  Brett Profitt <brett.profitt@gmail.com>
+
+  	* CHANGES.txt: Ordered the bugfixes in a for relevance.
+
+  	* CHANGES.txt: Fixed stray * in changes.
+
+  	* CHANGES.txt, version.php: Version bump. Updated changes.
+
+2011-10-10  cash <cash.costello@gmail.com>
+
+  	* engine/lib/user_settings.php, languages/en.php: Fixes #3952 handling
+  exceptions when password checks fail when changing password
+
+  	* mod/blog/lib/blog.php, mod/bookmarks/pages/bookmarks/friends.php,
+  mod/bookmarks/pages/bookmarks/owner.php, mod/file/pages/file/friends.php,
+  mod/file/pages/file/owner.php, mod/pages/pages/pages/friends.php,
+  mod/pages/pages/pages/owner.php, mod/thewire/pages/thewire/friends.php,
+  mod/thewire/pages/thewire/owner.php: Refs #3916 added checks to all content
+  plugins in master for page owner in mine and friends pages
+
+  	* mod/file/actions/file/upload.php, mod/file/languages/en.php: Refs #3919
+  merged file upload failure check to master
+
+2011-10-10  Cash Costello <cash.costello@gmail.com>
+
+  	* actions/widgets/save.php: Fixes #3950 falling back to deprecated view when
+  saving a widget
+
+  	* .../views/default/widgets/bookmarks/edit.php: Fixes #3949 bookmarks widget
+  fix
+
+2011-10-09  Cash Costello <cash.costello@gmail.com>
+
+  	* languages/en.php, mod/messages/languages/en.php,
+  mod/notifications/languages/en.php,
+  .../core/settings/account/notifications.php: Fixes #595 separating email
+  address from email notification in language strings
+
+  	* js/lib/ui.js, views/default/core/account/login_box.php,
+  views/default/forms/login.php, views/default/forms/register.php,
+  views/default/forms/user/requestnewpassword.php: Fixes #3673 added autofocus
+  class
+
+  	* engine/lib/sites.php: Fixes #3796 get_site_by_url() now respects class
+  inheritance
+
+  	* engine/classes/ElggSite.php: Fixes #3729 handling forwarding to page when
+  logging into a walled garden
+
+  	* engine/tests/api/access_collections.php,
+  engine/tests/api/entity_getter_functions.php, engine/tests/api/helpers.php,
+  engine/tests/api/metadata.php, engine/tests/objects/entities.php: Fixes #3948
+  cleaning up stuff left behind by unit tests
+
+  	* engine/classes/ElggSite.php: Fixes #3878 registering the security token
+  action as an external page
+
+2011-10-08  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/tests/objects/entities.php: Fixes #3946 deleting the temporary
+  entities created in entity unit tests
+
+  	* engine/lib/entities.php, engine/tests/objects/sites.php: Fixes #3897 fixed
+  source of infinite regression loop in delete_entity()
+
+  	* engine/classes/ElggAnnotation.php, engine/lib/access.php,
+  engine/lib/annotations.php, engine/tests/api/access_collections.php,
+  engine/tests/api/helpers.php, engine/tests/api/metadata.php,
+  engine/tests/objects/entities.php, engine/tests/objects/users.php,
+  engine/tests/regression/trac_bugs.php, mod/groups/start.php: Fixes #3942
+  fixed all the warnings and notices in the unit tests
+
+  	* engine/classes/ElggPriorityList.php: Fixes #3945 using reset on the array
+
+  	* engine/lib/widgets.php: Fixes #3944 fixing the default widgets
+  implementation
+
+  	* engine/lib/entities.php: Fixes #3943 returning false in
+  can_write_to_container() if container does not exist
+
+  	* engine/lib/elgglib.php: need to check if something exists before checking
+  its type
+
+  	* engine/tests/ui/submenu.php: removed unused unit tests for old submenu
+  code
+
+  	* engine/classes/ElggPlugin.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php: Fixes #3743 returning bool instead of int
+  when setting a private setting
+
+  	* .../views/default/plugins/logrotate/settings.php: fixed bug with variable
+  name in log rotation
+
+  	* engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/cache.php, engine/lib/calendar.php,
+  engine/lib/configuration.php, engine/lib/cron.php, engine/lib/database.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/filestore.php, engine/lib/group.php,
+  engine/lib/input.php, engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/navigation.php, engine/lib/notification.php,
+  engine/lib/objects.php, engine/lib/opendd.php, engine/lib/output.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/plugins.php, engine/lib/private_settings.php,
+  engine/lib/relationships.php, engine/lib/river.php, engine/lib/sessions.php,
+  engine/lib/sites.php, engine/lib/statistics.php, engine/lib/system_log.php,
+  engine/lib/tags.php, engine/lib/upgrade.php, engine/lib/user_settings.php,
+  engine/lib/users.php, engine/lib/views.php, engine/lib/web_services.php,
+  engine/lib/widgets.php, engine/lib/xml-rpc.php: Fixes #3936 added @access
+  private to internal functions
+
+  	* engine/lib/actions.php: Fixes #3941 Refs #3936 added @access private in
+  action lib and added elgg_unregister_action()
+
+  	* engine/lib/access.php, engine/lib/views.php: Fixes #3937 updated the
+  documentation for the access lib and a few minor code clean-ups
+
+  	* engine/classes/ElggMenuItem.php,
+  mod/blog/views/default/blog/group_module.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/object/blog.php,
+  mod/blog/views/default/widgets/blog/content.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/widgets/bookmarks/content.php,
+  .../views/default/theme_preview/general.php,
+  .../admin/develop_utilities/diagnostics.php,
+  mod/file/views/default/file/group_module.php,
+  mod/file/views/default/icon/object/file.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/widgets/filerepo/content.php,
+  .../views/default/discussion/group_module.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/profile/summary.php,
+  .../views/default/groups/sidebar/members.php,
+  .../views/default/object/groupforumtopic.php,
+  .../default/widgets/a_users_groups/content.php,
+  mod/likes/views/default/annotation/likes.php,
+  mod/likes/views/default/likes/button.php,
+  mod/logbrowser/views/default/logbrowser/table.php,
+  .../views/default/widgets/messageboard/content.php,
+  mod/messages/views/default/object/messages.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/group_module.php,
+  mod/pages/views/default/widgets/pages/content.php,
+  .../views/default/object/reported_content.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/widgets/thewire/content.php,
+  .../forms/twitter_api/interstitial_settings.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  views/default/admin/appearance/default_widgets.php,
+  .../admin/appearance/profile_fields/list.php, views/default/admin/header.php,
+  views/default/icon/default.php, views/default/icon/user/default.php,
+  views/default/navigation/breadcrumbs.php,
+  views/default/navigation/menu/user_hover.php,
+  views/default/navigation/pagination.php, views/default/navigation/tabs.php,
+  views/default/object/admin_notice.php, views/default/object/default.php,
+  views/default/object/elements/summary.php,
+  views/default/object/plugin/advanced.php,
+  views/default/object/plugin/simple.php,
+  views/default/object/widget/elements/controls.php,
+  views/default/output/tag.php, views/default/output/url.php,
+  views/default/page/elements/footer.php,
+  views/default/page/elements/tagcloud_block.php,
+  views/default/page/layouts/widgets/add_button.php,
+  views/default/river/elements/body.php,
+  views/default/river/elements/responses.php,
+  views/default/river/elements/summary.php,
+  .../river/user/default/profileiconupdate.php,
+  views/default/river/user/default/profileupdate.php,
+  views/default/widgets/content_stats/content.php: Fixes #3411 output/url now
+  has a is_trusted parameter - defaults to false
+
+2011-10-07  Cash Costello <cash.costello@gmail.com>
+
+  	* languages/en.php, .../admin/appearance/profile_fields/list.php,
+  views/default/forms/profile/fields/add.php: Fixes #3644 localized profile
+  field names
+
+2011-10-06  cash <cash.costello@gmail.com>
+
+  	* engine/lib/elgglib.php, engine/lib/input.php, js/lib/autocomplete.js,
+  vendors/jquery/jquery.ui.autocomplete.html.js,
+  views/default/input/autocomplete.php, views/default/user/default.php: using
+  html extension to jquery.ui autocomplete
+
+  	* engine/lib/input.php: Fixes #3932 Refs #3931 improved the livesearch
+  endpoint
+
+2011-10-05  cash <cash.costello@gmail.com>
+
+  	* actions/useradd.php, engine/lib/users.php, languages/en.php: Fixes #3704
+  displaying error messages when adding users through admin interface
+
+2011-10-04  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/tinymce/vendor/tinymce/changelog.txt,
+  mod/tinymce/vendor/tinymce/examples/full.html,
+  .../vendor/tinymce/jscripts/tiny_mce/langs/en.js,
+  .../tiny_mce/plugins/advhr/langs/en_dlg.js,
+  .../tiny_mce/plugins/advimage/editor_plugin.js,
+  .../tiny_mce/plugins/advimage/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advimage/js/image.js,
+  .../tiny_mce/plugins/advimage/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlink/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlist/editor_plugin.js,
+  .../tiny_mce/plugins/advlist/editor_plugin_src.js,
+  .../tiny_mce/plugins/autolink/editor_plugin.js,
+  .../tiny_mce/plugins/autolink/editor_plugin_src.js,
+  .../tiny_mce/plugins/autoresize/editor_plugin.js,
+  .../plugins/autoresize/editor_plugin_src.js,
+  .../tiny_mce/plugins/autosave/editor_plugin.js,
+  .../tiny_mce/plugins/autosave/editor_plugin_src.js,
+  .../tiny_mce/plugins/contextmenu/editor_plugin.js,
+  .../plugins/contextmenu/editor_plugin_src.js,
+  .../plugins/emotions/img/smiley-foot-in-mouth.gif,
+  .../plugins/emotions/img/smiley-laughing.gif,
+  .../plugins/emotions/img/smiley-sealed.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-smile.gif,
+  .../plugins/emotions/img/smiley-surprised.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-wink.gif,
+  .../tiny_mce/plugins/emotions/langs/en_dlg.js,
+  .../plugins/example_dependency/editor_plugin.js,
+  .../example_dependency/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullscreen/editor_plugin.js,
+  .../plugins/fullscreen/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullscreen/fullscreen.htm,
+  .../tiny_mce/plugins/inlinepopups/editor_plugin.js,
+  .../plugins/inlinepopups/editor_plugin_src.js,
+  .../inlinepopups/skins/clearlooks2/img/alert.gif,
+  .../inlinepopups/skins/clearlooks2/img/button.gif,
+  .../inlinepopups/skins/clearlooks2/img/confirm.gif,
+  .../inlinepopups/skins/clearlooks2/img/corners.gif,
+  .../skins/clearlooks2/img/vertical.gif,
+  .../tiny_mce/plugins/layer/editor_plugin.js,
+  .../tiny_mce/plugins/layer/editor_plugin_src.js,
+  .../tiny_mce/plugins/lists/editor_plugin.js,
+  .../tiny_mce/plugins/lists/editor_plugin_src.js,
+  .../tiny_mce/plugins/media/editor_plugin.js,
+  .../tiny_mce/plugins/media/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/media/media.htm,
+  .../tiny_mce/plugins/nonbreaking/editor_plugin.js,
+  .../plugins/nonbreaking/editor_plugin_src.js,
+  .../tiny_mce/plugins/noneditable/editor_plugin.js,
+  .../plugins/noneditable/editor_plugin_src.js,
+  .../tiny_mce/plugins/paste/editor_plugin.js,
+  .../tiny_mce/plugins/paste/editor_plugin_src.js,
+  .../tiny_mce/plugins/paste/langs/en_dlg.js,
+  .../tiny_mce/plugins/searchreplace/langs/en_dlg.js,
+  .../tiny_mce/plugins/spellchecker/editor_plugin.js,
+  .../plugins/spellchecker/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/style/js/props.js,
+  .../tiny_mce/plugins/style/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/style/props.htm,
+  .../tiny_mce/plugins/tabfocus/editor_plugin.js,
+  .../tiny_mce/plugins/tabfocus/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/cell.htm,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/cell.js,
+  .../jscripts/tiny_mce/plugins/table/js/row.js,
+  .../tiny_mce/plugins/table/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/table/row.htm,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../tiny_mce/plugins/template/langs/en_dlg.js,
+  .../tiny_mce/plugins/wordcount/editor_plugin.js,
+  .../plugins/wordcount/editor_plugin_src.js,
+  .../tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../tiny_mce/themes/advanced/img/colorpicker.jpg,
+  .../tiny_mce/themes/advanced/img/flash.gif,
+  .../tiny_mce/themes/advanced/img/icons.gif,
+  .../tiny_mce/themes/advanced/img/quicktime.gif,
+  .../tiny_mce/themes/advanced/img/shockwave.gif,
+  .../jscripts/tiny_mce/themes/advanced/js/anchor.js,
+  .../jscripts/tiny_mce/themes/advanced/js/image.js,
+  .../jscripts/tiny_mce/themes/advanced/langs/en.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../themes/advanced/skins/default/content.css,
+  .../themes/advanced/skins/default/img/buttons.png,
+  .../themes/advanced/skins/default/img/items.gif,
+  .../themes/advanced/skins/default/img/tabs.gif,
+  .../tiny_mce/themes/advanced/skins/default/ui.css,
+  .../themes/advanced/skins/highcontrast/content.css,
+  .../themes/advanced/skins/highcontrast/ui.css,
+  .../themes/advanced/skins/o2k7/content.css,
+  .../themes/advanced/skins/o2k7/img/button_bg.png,
+  .../advanced/skins/o2k7/img/button_bg_black.png,
+  .../advanced/skins/o2k7/img/button_bg_silver.png,
+  .../tiny_mce/themes/advanced/skins/o2k7/ui.css,
+  .../jscripts/tiny_mce/themes/simple/img/icons.gif,
+  .../jscripts/tiny_mce/themes/simple/langs/en.js,
+  .../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_src.js,
+  .../jscripts/tiny_mce/utils/editable_selects.js: Refs #3853. Upgraded TinyMCE
+  to 3.4.6. Embed still inserts the content in the wrong place for IE 8.
+
+  	* pages/avatar/view.php: Refs #3396. Added try / catch for avatar icon.
+
+2011-10-04  cash <cash.costello@gmail.com>
+
+  	* mod/blog/lib/blog.php: Fixes #3793 blogs respect closed groups for main
+  index page
+
+  	* .../views/default/object/reported_content.php,
+  views/default/css/admin.php: Refs #3809 implemented Evan's suggestion for
+  button spacing
+
+  	* engine/lib/users.php: Fixes #3700 using different names for add friend and
+  remove friend user hover menu items
+
+  	* mod/groups/lib/groups.php: Fixes #3841 not displaying leave group button
+  to group owners
+
+  	* mod/groups/lib/groups.php: Fixes #3898 checking whether the viewer is
+  logged in before adding join/requet buttons
+
+  	* engine/lib/entities.php: Fixes #3753 removed deprecated functions from
+  delete_entity()
+
+2011-10-03  cash <cash.costello@gmail.com>
+
+  	* views/default/css/admin.php: Fixes #3866 added CSS for entity menu in
+  admin theme
+
+  	* mod/embed/README.txt, mod/embed/views/default/embed/item.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/file/views/default/icon/object/file.php, views/default/icon/default.php:
+  using better insert class
+
+  	* mod/embed/README.txt, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/layout.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/embed/views/default/navigation/menu/embed.php, mod/file/start.php,
+  .../views/default/embed/file_upload/content.php: removed the sections from
+  the menu to provide more flexibility in tab ordering
+
+2011-10-02  Brett Profitt <brett.profitt@gmail.com>
+
+  	* pages/avatar/view.php: Fixed avatar handling for default icons if the
+  uploaded file is missing.
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/entities.php, engine/lib/metadata.php,
+  engine/lib/relationships.php: Merged docs update for getters from 1.7.
+
+  	* engine/classes/ElggFile.php, mod/file/actions/file/upload.php: Merged file
+  mime type detection from 1.7.
+
+  	* engine/lib/database.php: Merged fixes for delayed queries from 1.7.
+
+  	* engine/tests/regression/trac_bugs.php: Merged test for
+  can_write_to_container().
+
+2011-09-10  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/tests/suite.php: Fixes #3675. Added admin gate keeper to unit
+  tests.
+
+2011-10-02  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/categories/deactivate.php: Removing admin notice for unpopulated
+  categories when disabling categories plugin.
+
+  	* actions/admin/plugins/activate.php,
+  actions/admin/plugins/activate_all.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/deactivate_all.php,
+  actions/admin/plugins/set_priority.php, engine/classes/ElggPlugin.php,
+  engine/classes/ElggPluginPackage.php, languages/en.php: Fixes #3915. Added
+  ElggPlugin->getFriendlyName() to check for manifest->getName() first, then
+  for plugin ID. Added better descriptions for plugin activation errors.
+
+2011-10-01  cash <cash.costello@gmail.com>
+
+  	* engine/lib/navigation.php, engine/lib/views.php: Fixes #3860 changed
+  context-sensitive to dynamic to describe menus
+
+  	* mod/bookmarks/actions/bookmarks/save.php, mod/bookmarks/languages/en.php:
+  Fixes #3686 added work around for PHP bug when validating URLs with dashes
+
+2011-10-01  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/forms/avatar/crop.php: Fixes #3888 correcting initialization
+  of avatar cropping library
+
+  	* engine/lib/elgglib.php, views/default/forms/avatar/crop.php: Fixes #3913
+  registering jquery.imgareaselect
+
+  	* actions/avatar/upload.php: Fixes #3912 checking that the upload succeeded
+  before resizing
+
+  	* languages/en.php: more was defined twice in the core language file
+
+2011-10-01  cash <cash.costello@gmail.com>
+
+  	* mod/embed/README.txt, mod/embed/views/default/js/embed/embed.php: Updated
+  the instructions
+
+  	* mod/embed/views/default/js/embed/embed.php,
+  mod/file/views/default/embed/file/content.php,
+  .../views/default/embed/file_upload/content.php: fixed the forwarding of an
+  embed upload form
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/item.php,
+  mod/embed/views/default/js/embed/embed.php: cleaned up the embed item view
+  and removed the inline js
+
+  	* mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item.php,
+  mod/embed/views/default/embed/list.php,
+  mod/embed/views/default/embed/tabs.php,
+  mod/embed/views/default/group/default/embed.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/embed/views/default/object/default/embed.php,
+  mod/embed/views/default/object/file/embed.php,
+  mod/embed/views/default/object/file/embedlist.php,
+  mod/embed/views/default/site/default/embed.php,
+  mod/embed/views/default/user/default/embed.php: removed unnecessary code
+
+  	* mod/embed/languages/en.php, mod/embed/start.php,
+  mod/embed/views/default/embed/item.php,
+  mod/embed/views/default/embed/layout.php,
+  mod/embed/views/default/embed/list.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/embed/views/default/navigation/menu/embed.php, mod/file/start.php: using
+  the menu system for the embed tabs and adding a reusable select list view
+
+  	* engine/lib/configuration.php: Fixes #3826 using wwwroot in 1.8.x releases
+
+2011-09-30  cash <cash.costello@gmail.com>
+
+  	* views/default/forms/useradd.php: Fixes #3890 removed admin check in
+  useradd form since it is only used by admins
+
+  	* engine/lib/navigation.php, mod/groups/start.php,
+  mod/likes/views/default/annotation/likes.php, mod/messageboard/start.php,
+  mod/messages/views/default/object/messages.php,
+  views/default/core/friends/collection.php,
+  views/default/output/confirmlink.php: Fixes #3904 action word should come
+  first for encode_text parameter
+
+2011-09-29  cash <cash.costello@gmail.com>
+
+  	* views/default/css/elements/forms.php: Fixes #3894 ui-datepicker should
+  start out hidden
+
+  	* views/default/css/elements/forms.php: Fixes #3666, #3748 distinct CSS for
+  inline vs popup date picker and fixed position bug for prev/next links in
+  header
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/metadata.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php, engine/lib/relationships.php: Fixes #3827
+  updated documentation on @return for elgg_get_entities* functions
+
+2011-09-28  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/elgglib.php, engine/lib/views.php,
+  engine/tests/api/helpers.php: Fixes #3891. elgg_register_external_file()
+  defaults priority to 500. Elgg's default CSS now at 500 instead of 1.
+
+  	* .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/profile/views/default/profile/owner_block.php,
+  views/default/core/avatar/upload.php, views/default/forms/avatar/crop.php,
+  views/default/icon/user/default.php: Fixes #3879. Removed some instances of
+  deprecated views / functions.
+
+  	* mod/file/pages/file/search.php: Fixes #3823. More carefully casting to int
+  for file's search.
+
+  	* engine/tests/api/plugins.php: Refs #3808. Removed failing tests for
+  manifest translations.
+
+  	* engine/lib/entities.php, engine/lib/metastrings.php, engine/lib/river.php,
+  engine/lib/tags.php, engine/tests/api/entity_getter_functions.php: Fixes
+  #3713. elgg_get_entities() and friends return false if passed invalid
+  options.
+
+2011-09-26  cash <cash.costello@gmail.com>
+
+  	* engine/lib/output.php, views/default/input/checkboxes.php,
+  views/default/input/date.php, views/default/input/dropdown.php,
+  views/default/input/radio.php, views/default/input/userpicker.php: Fixes
+  #2921 clearing new ignore internal variables
+
+2011-09-25  cash <cash.costello@gmail.com>
+
+  	* engine/lib/navigation.php, views/default/navigation/menu/site.php: Fixes
+  #3876 fixed dangling more site menu when items are manually selected - thanks
+  to JEBailey
+
+  	* ...0.1-forum_reply_river_view-5758ce8d86ac56ce.php, version.php: Fixes
+  #3877 updates river db table for replying to forum topics
+
+  	* languages/en.php, views/default/river/user/default/profileupdate.php: Refs
+  #3842 adding river view back so that those upgrading from earlier Elgg views
+  don't have empty river messages
+
+2011-09-24  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/admin.php, views/default/css/elements/icons.php,
+  views/default/css/ie.php, views/default/css/ie7.php: Fixes #3653 shrink
+  wrapping .elgg-avatar so that hover menu arrow is constrained to the avatar
+  image
+
+  	* engine/lib/views.php, mod/embed/views/default/embed/css.php,
+  views/default/css/elements/core.php,
+  views/default/css/elements/navigation.php, views/default/css/ie.php,
+  views/default/css/ie6.php, views/default/css/ie7.php,
+  views/default/page/elements/head.php: Fixes #3845 added ie7 css view and
+  tested all current hacks for ie7
+
+2011-09-24  cash <cash.costello@gmail.com>
+
+  	* mod/file/languages/en.php: Fixes #3858 added file notification string
+  translation - thanks to slyhne
+
+  	* .../views/default/forms/logbrowser/refine.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/reportedcontent/admin_css.php, views/default/css/admin.php,
+  views/default/forms/admin/plugins/change_state.php,
+  views/default/forms/admin/plugins/filter.php,
+  views/default/forms/admin/plugins/sort.php: Fixes #3809 updated admin buttons
+  css
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/river.php, engine/lib/views.php,
+  mod/likes/views/default/likes/count.php,
+  mod/likes/views/default/likes/css.php, mod/likes/views/default/likes/js.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  views/default/css/elements/components.php: Fixes #3828 correct list classes
+
+  	* .../admin/administer_utilities/logbrowser.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/logbrowser/refine.php: Fixes #3865 updated
+  logbrowser refine form
+
+  	* views/default/css/admin.php: Fixes #3788 pagination highlighting updated
+  for admin theme
+
+  	* views/default/admin/appearance/profile_fields.php,
+  views/default/forms/profile/fields/add.php,
+  views/default/forms/profile/fields/reset.php: Refs #3864 updated the two form
+  bodies for edit profile fields
+
+  	* views/default/forms/account/settings.php, views/default/forms/login.php,
+  views/default/forms/plugins/settings/save.php,
+  views/default/forms/plugins/usersettings/save.php,
+  views/default/forms/register.php, views/default/forms/usersettings/save.php:
+  Fixes #3856 adds elgg-foot to forms missing it in /views/default/forms and
+  updated documentation
+
+2011-09-23  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/handlers/cache_handler.php: Refs #3859. Using PHP internal
+  functions to expire cache in +6 months instead of doing math manually to
+  avoid int overflow.
+
+2011-09-22  cash <cash.costello@gmail.com>
+
+  	* mod/embed/views/default/embed/css.php,
+  mod/file/views/default/embed/file/content.php: Fixes #3795 not inserting the
+  file title when embeding a file and tweaked css - thanks to slyhne
+
+  	* engine/classes/ElggPluginManifest.php, languages/en.php,
+  views/default/admin/plugins.php: Fixes #3808 not translating manifest fields
+  through elgg_echo()
+
+2011-09-22  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/upgrade.php: Fixes #3834 not loading version.php hundreds of
+  times - thanks to srokap
+
+2011-09-21  cash <cash.costello@gmail.com>
+
+  	* js/lib/ui.js, views/default/css/elements/navigation.php,
+  views/default/css/ie.php, views/default/navigation/menu/site.php: Fixes #3770
+  CSS only site menu that works in IE7
+
+2011-09-19  Steve Clay <steve@mrclay.org>
+
+  	* engine/lib/elgglib.php, engine/lib/group.php, engine/lib/sessions.php,
+  languages/en.php: forward throws Exception if headers sent. fix for
+  http://trac.elgg.org/ticket/3765
+
+  	* engine/lib/views.php: don't generate false internalid deprecation notices:
+  http://trac.elgg.org/ticket/2921#comment:3
+
+2011-09-18  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggMenuItem.php: Fixes #3786 menu code was corrupting link
+  class if an additional class was passed through getContent()
+
+  	* mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/admin/develop_tools/inspect.php,
+  .../views/default/admin/develop_tools/preview.php,
+  .../views/default/admin/developers/inspect.php,
+  .../views/default/admin/developers/preview.php: Fixes #3721 reorganized the
+  developer tools menu items in the admin area
+
+  	* .../views/default/js/developers/developers.php: Fixes #3825 need to
+  specify the data type as json
+
+2011-09-17  cash <cash.costello@gmail.com>
+
+  	* languages/en.php: Fixes #3819 added the request action words to the
+  language file
+
+  	* mod/logrotate/languages/en.php, mod/logrotate/start.php,
+  .../views/default/plugins/logrotate/settings.php,
+  .../default/plugins/twitter_api/usersettings.php: Fixes #3824 fixed
+  deprecation warnings for plugin settings and usersettings
+
+  	* views/default/object/plugin/advanced.php: Refs #3236 using .float-alt for
+  plugin activate button
+
+  	* .../default/plugins/garbagecollector/settings.php,
+  .../default/settings/garbagecollector/edit.php,
+  .../views/default/plugins/groups/settings.php,
+  mod/groups/views/default/settings/groups/edit.php,
+  .../views/default/plugins/logrotate/settings.php,
+  .../views/default/settings/logrotate/edit.php,
+  .../views/default/plugins/twitter_api/settings.php,
+  .../default/plugins/twitter_api/usersettings.php,
+  .../views/default/settings/twitter_api/edit.php,
+  .../default/usersettings/twitter_api/edit.php: Fixes #2990 updated the
+  bundled plugins to use the new plugin/user settings structure
+
+2011-09-17  Cash Costello <cash.costello@gmail.com>
+
+  	* .../views/default/settings/twitter_api/edit.php,
+  views/default/css/admin.php, views/default/object/plugin/advanced.php,
+  .../object/plugin/elements/dependencies.php,
+  views/default/object/plugin/invalid.php,
+  views/default/object/plugin/simple.php, views/default/page/admin.php: Fixes
+  #3236 finishes admin theme - open new tickets for new issues
+
+2011-09-15  cash <cash.costello@gmail.com>
+
+  	* engine/lib/views.php: Fixes #3178 updated elgg_view_icon() to take an
+  optional class
+
+  	* _graphics/elgg_sprites.png, mod/search/views/default/search/css.php,
+  views/default/css/elements/icons.php: Fixes #3400, #3820 added additional
+  icons to Elgg's sprite
+
+2011-09-15  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/lightbox.php: Fixes #3818 fixed short tag and extra
+  slash in URL for lightbox
+
+2011-09-14  Cash Costello <cash.costello@gmail.com>
+
+  	* .../notifications/subscriptions/forminternals.php,
+  views/default/icon/user/default.php, views/default/input/friendspicker.php:
+  Fixes #3742 not including the hover menu on the personal notifications page
+
+  	* engine/lib/navigation.php, languages/en.php,
+  mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  .../admin/develop_utilities/diagnostics.php,
+  .../views/default/admin/utilities/diagnostics.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  .../admin/administer_utilities/logbrowser.php,
+  .../views/default/admin/utilities/logbrowser.php,
+  mod/reportedcontent/languages/en.php, mod/reportedcontent/start.php,
+  .../admin/administer_utilities/reportedcontent.php,
+  .../default/admin/utilities/reportedcontent.php: Fixes #3681 fixed Utilities
+  menu collisions in admin section and added documentation about registering
+  more than one menu item with the same name to a menu
+
+  	* views/default/forms/admin/site/update_advanced.php: Fixes #3783 using an
+  associative array for advanced settings checkboxes
+
+2011-09-13  Cash Costello <cash.costello@gmail.com>
+
+  	* js/lib/elgglib.js, js/lib/languages.js, views/default/js/elgg.php: Fixes
+  #3539 two conditions for triggering init,system now - dom is ready and
+  languages loaded
+
+  	* views/default/output/confirmlink.php: Fixes #3811 defaulting title to
+  confirm text if passed to output/confirmlink
+
+  	* languages/en.php, views/default/admin/plugins.php: Fixes #3623 added
+  non-bundled filter option for plugins
+
+  	* .../default/widgets/a_users_groups/content.php: Fixes #3803 fixed groups
+  more link in widget
+
+2011-09-12  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/admin.php, views/default/js/admin.php: Refs #3800 including
+  jeditable on more admin pages
+
+  	* engine/lib/deprecated-1.8.php: Fixes #3801 fixed documentation for
+  page_owner_entity()
+
+  	* mod/externalpages/manifest.xml: Fixes #3804 using Site Pages for the
+  plugin name
+
+2011-09-12  Brett Profitt <brett.profitt@gmail.com>
+
+  	* .gitignore: Refs #3573. Using more specific rules in .gitignore.
+
+  	* mod/embed/manifest.xml: Refs #3771. Fixed incorrect requires plugin name.
+
+2011-09-11  Brett Profitt <brett.profitt@gmail.com>
+
+  	* .gitignore: Fixse #3573. Ignoring all files in /mod/ that aren't part of
+  core.
+
+  	* mod/embed/manifest.xml, mod/file/views/default/embed/file/content.php,
+  .../views/default/embed/file_upload/content.php: Fixes #3771. Added missing
+  files for embed support. Added requirement for file in embed's manifest.
+
+2011-09-11  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/dashboard/languages/en.php, mod/dashboard/start.php,
+  .../default/widgets/group_activity/content.php,
+  .../views/default/widgets/group_activity/edit.php: Fixes #3340 adds group
+  activity widget for the user dashboard
+
+2011-09-11  Ravindra Nath Kakarla <ravindhranath@gmail.com>
+
+  	* engine/lib/input.php: Livesearch handler returns proper JSON string now
+
+2011-09-11  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/users.php: Fixes #3794 fixes menu links so that admins can edit
+  avatars
+
+2011-09-10  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggMenuItem.php: Fixes #3741 fixed menu code so that all
+  links do not get empty title and confirm attributes
+
+  	* engine/lib/views.php: Fixes #3665, #3660 added plugin hooks for page and
+  layouts so that rss icon for page meta menu can be registered consistently
+
+  	* engine/lib/views.php: Fixes #3688 setting the page setup variable in
+  $CONFIG before trigger the event to prevent a stack overflow
+
+  	* actions/admin/plugins/activate.php: Fixes #3714 also forwarding to the top
+  of the page when a plugin activation fails
+
+  	* mod/groups/actions/groups/membership/join.php: Fixes #3752 corrected URL
+  for group membership requests
+
+  	* engine/lib/plugins.php: made the documentation of the plugin settings code
+  a little clearer
+
+  	* engine/classes/ElggEntity.php: Fixes #3782 only deleting metadata if the
+  entity has been saved
+
+  	* mod/logbrowser/start.php,
+  mod/logbrowser/views/default/logbrowser/form.php: Fixes #3775 updated admin
+  area for logbrowser to utilities
+
+2011-09-05  Brett Profitt <brett.profitt@gmail.com>
+
+  	* CHANGES.txt, engine/lib/access.php, version.php: Fixed a stupid problem I
+  introduced in the installation and only just caught >:O
+
+  	* version.php: Version bump to 1.8.0. *whew*
+
+  	* README.txt: Updated README to mention the Elgg Foundation.
+
+  	* js/lib/ui.js, views/default/css/ie.php: Refs #3449, #3770. Using JS to fix
+  submenu dropdown in IE7.
+
+  	* engine/lib/deprecated-1.8.php: Improved documentation for deprecated
+  functions.
+
+  	* UPGRADE.txt: Added instructions to delete deprecated plugins during
+  upgrade.
+
+  	* CHANGES.txt: Updated changes for 1.8.0.
+
+  	* CONTRIBUTORS.txt: Updated contributors file with @elgg.org email
+  addresses.
+
+  	* UPGRADE.txt: Added more explicit upgrade instructions for 1.7 -> 1.8.
+
+  	* views/default/css/ie.php: Refs #3449. Some IE7 CSS fixes. I need to shower
+  now.
+
+2011-09-04  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/entities.php: Fixes #3661. Pulled in recursive delete fixes to
+  master.
+
+  	* engine/classes/ElggEntity.php: Refs #3661. Merged lat/long metadata fixes
+  to master.
+
+  	* engine/lib/entities.php, mod/search/search_hooks.php: Refs #3661. Merged
+  XSS fixes in search to master.
+
+  	* mod/pages/pages/pages/edit.php: Refs #3661. Better filtering for
+  container_guid in pages.
+
+  	* mod/file/pages/file/search.php: Refs #3661. Pulled in XSS fixes for file
+  search.
+
+  	* mod/groups/lib/groups.php: Fixes #3720. Using correctly filters for tabs
+  on group landing page.
+
+  	* engine/start.php: Refs #3661. Merged $CONFIG->lastcache fix to master. 
+  Fixes #3530. $CONFIG->lastcache has correct value on page load when cache is
+  regenerated.   Conflicts:  engine/start.php
+
+2011-09-03  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/access.php: Fixed typo in call to function.
+
+2011-08-30  Brett Profitt <brett.profitt@gmail.com>
+
+  	* actions/friends/collections/add.php,
+  actions/friends/collections/delete.php, actions/friends/collections/edit.php,
+  engine/lib/access.php, engine/tests/api/access_collections.php,
+  languages/en.php: Fixes #3543. Ported access collections fix to master.
+
+2011-08-29  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/views.php, views/default/css/lightbox.php: Fixes #3461: Using
+  absolute URLs for lightbox CSS.
+
+  	* mod/embed/views/default/js/embed/embed.php: Removing debug string.
+
+2011-08-27  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/profile/views/default/profile/js.php: Fixes #3561. Only adding the
+  static profile block height to the widget canvas if on the profile page.
+
+  	* mod/embed/languages/en.php, mod/embed/start.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/gallery.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/embed/views/default/js/embed/inline.php, mod/file/start.php: Fixes #2911.
+  Embed plugins works again. Added menu for embed sections. This plugin is
+  painfully messy.
+
+  	* engine/classes/ElggPluginPackage.php, engine/lib/plugins.php,
+  languages/en.php, views/default/admin/plugins.php: Fixes #3434. Manifests are
+  checked more carefully on anything that checks deps. Disabling plugins with
+  invalid manifests from admin page.
+
+2011-08-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/views.php: Fixes #3535. elgg_view_form() automatically adds
+  elgg-form-action-name.
+
+  	* mod/likes/start.php: Removed unused code for likes notification.
+
+  	* mod/likes/actions/likes/add.php, mod/likes/languages/en.php,
+  mod/likes/start.php: Fixes #3131. Added generic liking notification text.
+
+  	* mod/blog/start.php: Fixes #3558. Added upgrade for excerpt in blogs.
+
+  	* mod/blog/start.php: Removed silly check for elgg version.
+
+  	* mod/blog/start.php: Fixing blog upgrades for excerpt.
+
+  	* CODING.txt: Fixes #3657. There's not a good way to ensure redirects for
+  CODING.txt because most of the code is off our servers now, so just putting a
+  placeholder.
+
+  	* views/default/page/elements/head.php,
+  views/default/page/elements/shortcut_icon.php: Fixes #3662. Pulled out
+  shortcut_icon to its own view for easier overriding.
+
+2011-08-24  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/classes/ElggPriorityList.php: Checking for === false when moving
+  elements in ElggPriorityList instead of just !$priority. Fixes problems when
+  moving elements to / from 0.
+
+  	* .../forms/uservalidationbyemail/bulk_action.php: Fixes #3621. Corrected
+  the URL for the unvalidated users pagination.
+
+  	* mod/groups/actions/discussion/reply/save.php, mod/groups/start.php,
+  .../views/default/annotation/group_topic_post.php,
+  .../views/default/forms/discussion/reply/save.php,
+  .../views/default/annotation/messageboard.php: Fixes #3612, #3750. Added edit
+  replies back to group plugin with the annotation menu.
+
+  	* mod/messageboard/start.php: Refs #3750. Messageboard using annotations
+  menu.
+
+  	* engine/lib/navigation.php, views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php,
+  views/default/css/elements/navigation.php: Refs #3750. Added annotation menu
+  for generic comments (delete) and default annotations (empty).
+
+  	* js/lib/hooks.js: Fixes #3589. JS "all" hook handlers called only once.
+
+  	* actions/avatar/upload.php: Refs #3557: Upscaling small icons to 200x200.
+  This doesn't fix the problem if someone uploads a 100x200 image.
+
+  	* mod/categories/actions/save.php, mod/categories/activate.php,
+  mod/categories/languages/en.php, mod/categories/start.php,
+  mod/categories/views/default/input/categories.php,
+  .../views/default/plugins/categories/settings.php,
+  .../views/default/settings/categories/edit.php: Refs #3746. Updated
+  categories for 1.8. Still some deprecation notices, but functional.
+
+2011-08-23  Brett Profitt <brett.profitt@gmail.com>
+
+  	* .../actions/twitter_api/interstitial_settings.php,
+  mod/twitter_api/languages/en.php, mod/twitter_api/lib/twitter_api.php,
+  mod/twitter_api/pages/twitter_api/interstitial.php,
+  mod/twitter_api/start.php, .../forms/twitter_api/interstitial_settings.php,
+  .../default/usersettings/twitter_api/edit.php: Fixes #3117. Added an
+  interstitial page for twitter new users.
+
+  	* views/default/navigation/menu/default.php: Rewriting more chars to - in
+  the default menu view.
+
+  	* engine/classes/ElggPriorityList.php, engine/lib/elgglib.php,
+  engine/lib/views.php, engine/tests/api/helpers.php: Fixes #3355. Added
+  ElggPriorityList. Adapted the externals system to use it.
+
+2011-08-22  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/views.php, vendors/jquery/jquery-1.6.2.min.js,
+  vendors/jquery/jquery-ui-1.8.16.min.js, views/installation/page/default.php:
+  Closes #3015. jQuery updated to 1.6.2. jQuery-UI updated to 1.8.16.
+
+2011-08-21  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/groups/lib/groups.php: Fixes #3701. Removed early call to elgg_echo()
+  for group action button menu.
+
+  	* engine/classes/ElggSite.php: Fixes #3606. Reset password page added to
+  public pages for walled garden mode.
+
+  	* engine/lib/river.php: Fixes #3496. Using OR to concatenate unpaired type
+  and subtype clauses in elgg_get_river_type_subtype_where_sql().
+
+2011-08-18  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/views.php: Fixing priorities for jquery.
+
+2011-08-17  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/classes/ElggPriorityList.php, engine/lib/elgglib.php,
+  engine/tests/api/helpers.php: Finished ElggPriorityList. Migrated external
+  files to use it.
+
+2011-08-17  tvld <tom@lorinthe.com>
+
+  	* htaccess_dist: My very first attempt to contribute... 
+  http://trac.elgg.org/ticket/3601  For optimal speed, Firebug's Yslow
+  complained that the js and ico files did not have an Etag.
+
+2011-08-15  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/classes/ElggPriorityList.php, engine/tests/api/helpers.php: Refs
+  #3355. Added ElggPriorityList.
+
+  	* pages/friends/collections/add.php,
+  pages/friends/collections/pickercallback.php,
+  pages/friends/collections/view.php, pages/friends/index.php,
+  pages/friends/of.php: Fixes #3715. Added the new collection button back.
+
+  	* mod/search/views/default/search/list.php: Fixed pagination for search.
+
+  	* mod/search/views/default/search/list.php: Fixes #3254. Removing limit for
+  "+X more Y" in search results.
+
+2011-07-27  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/classes/ElggBatch.php: Fixed some documentation.
+
+2011-07-27  Richard Loxley <richard.loxley@surevine.com>
+
+  	* engine/lib/actions.php: Fixes Ticket #3709 "Embed plugin: uploading a file
+  in Firefox tries to save a JSON file in the user's browser"
+
+2011-07-10  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/views.php: Fixes #3336 functions that used elgg_view_exists()
+  were not falling back to the default views
+
+2011-07-09  cash <cash.costello@gmail.com>
+
+  	* mod/file/pages/file/search.php: Refs #3685 need null for no container
+
+  	* engine/lib/users.php, pages/avatar/view.php: fixed redirect for user
+  avatars if we cannot get the user
+
+2011-07-07  Brett Profitt <brett.profitt@gmail.com>
+
+  	* mod/dashboard/start.php,
+  views/default/admin/appearance/default_widgets.php: Fixes #3669. Dashboard
+  now registers for default widgets.
+
+  	* version.php: Version bump to 1.8.0b2
+
+2011-07-07  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/elements/components.php,
+  views/default/river/elements/body.php,
+  views/default/river/relationship/friend/create.php: fixed the float issue
+  with the friends river view
+
+  	* views/default/icon/user/default.php: Refs #3567 added class extending to
+  icon/user/default
+
+2011-07-06  cash <cash.costello@gmail.com>
+
+  	* views/default/input/radio.php: Refs #3624 fixed radio button value
+  detection
+
+2011-07-06  Cash Costello <cash.costello@gmail.com>
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  engine/classes/ElggPlugin.php: Fixes #2204 standardized the hooks/overrides
+  for plugin settings and usersettings
+
+  	* engine/lib/river.php: $joins was not declared in elgg_get_river()
+
+  	* vendors/jquery/jquery.imgareaselect-0.8.min.js,
+  .../jquery.imgareaselect-0.9.8/GPL-LICENSE.txt,
+  .../jquery.imgareaselect-0.9.8/MIT-LICENSE.txt, .../css/border-anim-h.gif,
+  .../css/border-anim-v.gif, .../jquery.imgareaselect-0.9.8/css/border-h.gif,
+  .../jquery.imgareaselect-0.9.8/css/border-v.gif,
+  .../css/imgareaselect-animated.css, .../css/imgareaselect-default.css,
+  .../css/imgareaselect-deprecated.css, .../scripts/jquery.imgareaselect.js,
+  .../scripts/jquery.imgareaselect.min.js,
+  .../scripts/jquery.imgareaselect.pack.js, .../scripts/jquery.min.js,
+  views/default/forms/avatar/crop.php: Fixes #3663 upgrades imgareaselect
+  library
+
+  	* mod/likes/actions/likes/add.php,
+  .../default/river/annotation/likes/create.php: Fixes #3642 removing likes
+  river code
+
+  	* engine/lib/navigation.php, mod/blog/lib/blog.php,
+  mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/friends.php,
+  mod/bookmarks/pages/bookmarks/owner.php, mod/file/pages/file/friends.php,
+  mod/file/pages/file/owner.php, mod/file/pages/file/world.php,
+  mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  mod/messages/pages/messages/inbox.php, mod/messages/pages/messages/sent.php,
+  mod/pages/pages/pages/friends.php, mod/pages/pages/pages/owner.php,
+  mod/pages/pages/pages/world.php: changed new convenience function from
+  elgg_register_add_button() to elgg_register_title_button()
+
+  	* mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/js/embed/embed.php: updated the embed plugin for new
+  css class elgg-item rather than elgg-list-item
+
+2011-07-04  cash <cash.costello@gmail.com>
+
+  	* views/default/css/elements/forms.php: styled the date picker for the main
+  theme
+
+  	* views/default/css/admin.php: theming the date picker for the admin theme
+
+  	* js/lib/ui.js, views/default/input/date.php, views/default/output/date.php:
+  Fixes #3560 input/date and output/date support ISO 8601 (YYYY-MM-DD) and Unix
+  timestamps. Need to think about how to handle alternate text formats.
+
+2011-07-03  Brett Profitt <brett.profitt@gmail.com>
+
+  	* actions/friends/collections/add.php,
+  actions/friends/collections/delete.php, actions/friends/collections/edit.php,
+  engine/lib/access.php, engine/tests/api/access_collections.php,
+  languages/en.php: Merged ACL fixes from 1.7 branch.
+
+  	* engine/lib/access.php, engine/tests/api/access_collections.php: Merged
+  d423aee393458d6827db from 1.7 to master.  Fixes #3552. Addess ACL unit tests.
+  These currently fail because of #3522.   Conflicts:  engine/lib/access.php
+
+2011-07-03  cash <cash.costello@gmail.com>
+
+  	* .../views/default/page/layouts/custom_index.php: removed deprecated
+  function from custom_index plugin
+
+  	* views/default/page/elements/header_logo.php: reformatted the code in
+  page/elements/header_logo view due to line length
+
+  	* .../views/default/page/layouts/custom_index.php: removed deprecated
+  function from custom_index plugin
+
+  	* views/default/page/elements/header_logo.php: reformatted the code in
+  page/elements/header_logo view due to line length
+
+  	* mod/blog/languages/en.php: Fixes #3593 defining the blog post notification
+  string
+
+  	* languages/en.php: Fixes #3640 added 'none' as a language string
+
+  	* engine/classes/ElggUser.php: Fixes #3650 deprecated
+  ElggUser::getCollections()
+
+  	* documentation/coding_standards/best_practices.txt,
+  documentation/coding_standards/deprecation.txt: pulled deprecation guidelines
+  out of general best practices
+
+  	* CODING.txt, documentation/coding_standards/best_practices.txt,
+  .../coding_standards/css_coding_standards.txt,
+  .../coding_standards/html_best_practices.txt,
+  .../coding_standards/javascript_best_practices.txt,
+  .../javascript_coding_standards.txt,
+  .../coding_standards/php_best_practices.txt,
+  .../coding_standards/php_coding_standards.txt: separate out coding standards
+
+2011-07-03  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/classes/ElggCache.php: Fixes #3656 updates the AccessArray
+  interface methods for ElggCache
+
+  	* mod/notifications/start.php, mod/tinymce/start.php: these plugins should
+  not need special loading order
+
+  	* views/default/css/admin.php: updated the admin theme for the new css
+  classes on input elements
+
+2011-07-02  cash <cash.costello@gmail.com>
+
+  	* mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/admin/developers/settings.php: added logging of events and
+  plugin hooks
+
+  	* mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/admin/developers/settings.php: Fixes #3152 adds wrapping of
+  views with comments
+
+  	* mod/developers/classes/ElggLogCache.php: returning false to stop
+  elgg_dump() from also displaying the debugging information to the screen
+
+  	* mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/admin/developers/settings.php: Fixes #3500 added setting
+  for raw string display
+
+  	* mod/developers/views/default/developers/log.php: removed warning if no
+  messages in the cache
+
+  	* engine/classes/ElggPlugin.php,
+  mod/developers/actions/developers/settings.php,
+  mod/developers/classes/ElggLogCache.php, mod/developers/languages/en.php,
+  mod/developers/start.php, .../views/default/admin/developers/settings.php,
+  mod/developers/views/default/developers/css.php,
+  mod/developers/views/default/developers/log.php: added logging to the web
+  page footer
+
+  	* mod/developers/actions/developers/inspect.php,
+  mod/developers/classes/ElggInspector.php, mod/developers/languages/en.php,
+  mod/developers/start.php, mod/developers/vendors/jsTree/jquery.jstree.js,
+  mod/developers/vendors/jsTree/themes/apple/bg.jpg,
+  mod/developers/vendors/jsTree/themes/apple/d.png,
+  .../vendors/jsTree/themes/apple/dot_for_ie.gif,
+  .../vendors/jsTree/themes/apple/style.css,
+  .../vendors/jsTree/themes/apple/throbber.gif,
+  mod/developers/vendors/jsTree/themes/classic/d.gif,
+  mod/developers/vendors/jsTree/themes/classic/d.png,
+  .../vendors/jsTree/themes/classic/dot_for_ie.gif,
+  .../vendors/jsTree/themes/classic/style.css,
+  .../vendors/jsTree/themes/classic/throbber.gif,
+  .../vendors/jsTree/themes/default-rtl/d.gif,
+  .../vendors/jsTree/themes/default-rtl/d.png,
+  .../vendors/jsTree/themes/default-rtl/dots.gif,
+  .../vendors/jsTree/themes/default-rtl/style.css,
+  .../vendors/jsTree/themes/default-rtl/throbber.gif,
+  mod/developers/vendors/jsTree/themes/default/d.gif,
+  mod/developers/vendors/jsTree/themes/default/d.png,
+  .../vendors/jsTree/themes/default/style.css,
+  .../vendors/jsTree/themes/default/throbber.gif,
+  .../views/default/admin/developers/inspect.php,
+  mod/developers/views/default/developers/css.php,
+  mod/developers/views/default/developers/tree.php,
+  .../views/default/forms/developers/inspect.php,
+  .../views/default/js/developers/developers.php: added the inspect tool to
+  developers tool plugin
+
+  	* engine/lib/river.php, pages/river.php: fixed river for #3544
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/upload/content.php: fixed embed plugin for
+  #3544
+
+  	* mod/file/pages/file/search.php, mod/messages/pages/messages/send.php:
+  fixed messages and file plugins for #3544
+
+  	* engine/lib/input.php: added note about preventing reflected XSS
+  vulnerabilities.
+
+2011-07-02  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/input/access.php, views/default/input/autocomplete.php,
+  views/default/input/button.php, views/default/input/calendar.php,
+  views/default/input/captcha.php, views/default/input/checkbox.php,
+  views/default/input/checkboxes.php, views/default/input/date.php,
+  views/default/input/dropdown.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/location.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/plaintext.php, views/default/input/radio.php,
+  views/default/input/tag.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Fixes #3624 input
+  views use class extending rather than overriding
+
+  	* mod/blog/views/default/forms/blog/save.php: fixed the blog categories code
+  as the entity was not being passed
+
+2011-07-01  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/bookmarks/pages/bookmarks/bookmarklet.php: removed the add bookmark
+  button from get bookmarklet page
+
+2011-06-30  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/elgglib.php: Adds exception handling to shutdown hook from pull
+  request 50
+
+  	* engine/lib/views.php, vendors/jquery/jquery-1.5.min.js,
+  vendors/jquery/jquery-1.6.1.min.js, vendors/jquery/jquery-ui-1.8.14.min.js,
+  vendors/jquery/jquery-ui-1.8.9.min.js: Refs #3015 updated jquery and
+  jquery-ui to their latest releases
+
+  	* languages/en.php, views/default/object/plugin/advanced.php: Fixes #3635
+  added strings for activate and deactivate
+
+  	* languages/en.php: Fixes #3636 added general language strings for sort and
+  filter
+
+2011-06-29  cash <cash.costello@gmail.com>
+
+  	* .../views/default/groups/profile/widgets.php: made group widget columns
+  backward compatible so that content at least does not disappear
+
+  	* engine/classes/ElggMenuItem.php: handling spaces and uppercase characters
+  when creating menu item classes
+
+  	* engine/lib/views.php, views/default/page/elements/wrapper.php: added
+  backward compatibility for the view page_elements/content_wrapper
+
+  	* engine/lib/group.php: added @since dates on two functions in group library
+
+2011-06-29  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/tinymce/views/default/js/tinymce.php,
+  mod/tinymce/views/default/tinymce/css.php: Fixes #3537 using elgg.echo() for
+  i18n of word count
+
+  	* mod/tinymce/css/elgg_tinymce.css, mod/tinymce/tinymce_content.css,
+  mod/tinymce/views/default/js/tinymce.php: moved tinymce content css into its
+  own directory
+
+  	* views/default/css/admin.php, views/default/css/elements/modules.php: Fixes
+  #3629 added overflow hidden to .elgg-module for both default and admin themes
+
+  	* mod/thewire/pages/thewire/everyone.php,
+  mod/thewire/pages/thewire/friends.php, mod/thewire/pages/thewire/owner.php,
+  mod/thewire/pages/thewire/reply.php: Fixes #3578 added a css class to thewire
+  add form
+
+  	* actions/admin/plugins/activate.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/set_priority.php,
+  views/default/object/plugin/advanced.php: Fixes #3630 using the plugin id for
+  the css id
+
+2011-06-28  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/thewire/views/default/forms/thewire/add.php: Fixes #3579 using
+  input/plaintext in the wire form
+
+  	* views/default/css/admin.php, views/default/page/layouts/admin.php: Fixes
+  #3519 admin area now has title buttons
+
+  	* engine/lib/views.php, views/default/page/layouts/content/header.php: using
+  elgg_view_title() in content layout header
+
+  	* languages/en.php, views/default/widgets/content_stats/content.php: Fixes
+  #3597 defined a language string for 'more'
+
+  	* languages/en.php: Fixes #3505 define language string for
+  menu:page:header:default
+
+  	* .../views/default/forms/bookmarks/save.php,
+  .../views/default/forms/developers/settings.php,
+  .../views/default/forms/expages/edit.php,
+  mod/file/views/default/forms/file/upload.php,
+  .../views/default/forms/discussion/reply/save.php,
+  mod/groups/views/default/forms/discussion/save.php,
+  .../views/default/forms/invitefriends/invite.php,
+  .../views/default/forms/messages/process.php,
+  .../views/default/forms/messages/reply.php,
+  mod/messages/views/default/forms/messages/send.php,
+  .../forms/notificationsettings/groupsave.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/reportedcontent/add.php,
+  mod/thewire/views/default/forms/thewire/add.php: Fixes #3407 added elgg-foot
+  to plugin forms
+
+  	* views/default/navigation/menu/elements/item.php: updated the menu item
+  view to work with the new setLinkClass/addLinkClass methods
+
+2011-06-27  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/blog/lib/blog.php, mod/blog/views/default/forms/blog/save.php,
+  mod/groups/lib/groups.php, mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/edit.php,
+  .../default/forms/notificationsettings/save.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  views/default/core/settings/account.php,
+  views/default/css/elements/forms.php, views/default/forms/avatar/crop.php,
+  views/default/forms/avatar/upload.php, views/default/forms/comments/add.php,
+  views/default/forms/friends/collections/add.php,
+  views/default/forms/plugins/settings/save.php,
+  views/default/forms/profile/edit.php,
+  views/default/forms/user/requestnewpassword.php,
+  views/default/forms/useradd.php, views/default/forms/usersettings/save.php,
+  views/default/forms/widgets/save.php, views/default/input/form.php: Refs
+  #3407 using elgg-form and elgg-foot in core forms. Plugins next
+
+2011-06-26  cash <cash.costello@gmail.com>
+
+  	* mod/bookmarks/pages/bookmarks/add.php,
+  mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/bookmarklet.php,
+  mod/bookmarks/pages/bookmarks/edit.php,
+  mod/bookmarks/pages/bookmarks/friends.php,
+  mod/bookmarks/pages/bookmarks/owner.php, mod/file/pages/file/edit.php,
+  mod/file/pages/file/friends.php, mod/file/pages/file/owner.php,
+  mod/file/pages/file/search.php, mod/file/pages/file/upload.php,
+  mod/file/pages/file/view.php, mod/file/pages/file/world.php,
+  mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  .../views/default/groups/profile/buttons.php,
+  mod/members/pages/members/index.php,
+  mod/messageboard/pages/messageboard/owner.php,
+  mod/messages/pages/messages/inbox.php, mod/messages/pages/messages/read.php,
+  mod/messages/pages/messages/send.php, mod/messages/pages/messages/sent.php,
+  mod/messages/views/default/messages/js.php, mod/pages/pages/pages/edit.php,
+  mod/pages/pages/pages/friends.php, mod/pages/pages/pages/history.php,
+  mod/pages/pages/pages/new.php, mod/pages/pages/pages/owner.php,
+  mod/pages/pages/pages/revision.php, mod/pages/pages/pages/view.php,
+  mod/pages/pages/pages/world.php, mod/thewire/pages/thewire/everyone.php,
+  mod/thewire/pages/thewire/friends.php, mod/thewire/pages/thewire/owner.php,
+  mod/thewire/pages/thewire/previous.php, mod/thewire/pages/thewire/reply.php,
+  mod/thewire/pages/thewire/tag.php, mod/thewire/pages/thewire/thread.php,
+  pages/river.php: this should update all the core pages and plugins using
+  'buttons'
+
+  	* engine/lib/navigation.php, mod/blog/lib/blog.php,
+  views/default/page/layouts/content.php,
+  views/default/page/layouts/content/header.php: removed buttons logic from
+  content header view, created convenience function rather than copying and
+  pasting, and updated the blog plugin
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/navigation.php,
+  mod/groups/start.php: added a data array to ElggMenuItem. Now by default
+  options end up being passed to output/url.
+
+  	* mod/embed/images/close_button.gif, mod/embed/js/embed.js,
+  mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/js/embed/embed.php: updated based on Brett's comments
+   and removed old stuff related to facebox lightbox
+
+2011-06-26  Cash Costello <cash.costello@gmail.com>
+
+  	* engine/lib/relationships.php: Fixes #3585 do not need to check parameters
+  because was registered for only one event
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/navigation.php, js/lib/ui.js,
+  mod/groups/start.php, mod/logbrowser/views/default/logbrowser/form.php,
+  mod/profile/views/default/profile/owner_block.php,
+  .../views/default/object/reported_content.php,
+  views/default/object/plugin/advanced.php,
+  views/default/object/plugin/invalid.php,
+  views/default/object/widget/elements/controls.php,
+  views/default/page/layouts/widgets/add_button.php: Fixes #3470 using
+  rel=toggle now
+
+  	* mod/thewire/languages/en.php,
+  .../views/default/river/object/thewire/create.php: provided a way to get to
+  the wire from activity page
+
+  	* mod/blog/languages/en.php, mod/blog/lib/blog.php,
+  mod/bookmarks/pages/bookmarks/all.php, mod/bookmarks/start.php,
+  mod/file/languages/en.php, mod/file/pages/file/friends.php,
+  mod/file/pages/file/owner.php: made breadcrumbs consistent in content plugins
+
+  	* mod/groups/start.php: not displaying the reply button for discussion
+  topics in widgets
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/object/default.php, views/default/object/elements/summary.php:
+  Fixes #3368 combining $vars with parameters for object/elements/summary view
+
+  	* .../views/default/settings/logrotate/edit.php: removed use of deprecated
+  internalname key in log rotation
+
+  	* engine/classes/ElggEntity.php, mod/blog/lib/blog.php,
+  mod/bookmarks/pages/bookmarks/view.php, mod/file/pages/file/view.php,
+  mod/groups/lib/discussion.php, .../views/default/groups/sidebar/featured.php,
+  mod/messages/pages/messages/read.php, mod/pages/pages/pages/view.php,
+  mod/search/views/default/search/entity.php, pages/entities/index.php,
+  views/default/page/elements/owner_block.php,
+  views/json/entities/entity_list.php: Fixes #3614 updated use of
+  elgg_view_entity() throughout core
+
+  	* mod/messageboard/pages/messageboard/owner.php: better way of sorting
+  messageboard annotations
+
+2011-06-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/deprecated-1.8.php: Don't say the db was upgradeded when it
+  wasn't.
+
+  	* engine/lib/upgrade.php, engine/lib/upgrades/2011010101.php: Fixes #3554.
+  Pulled 1.7->1.8 upgrade bootstrapping into a separate function. Made the
+  plugin upgrade that forwards (2011010101) set itself in the processed
+  upgrades.
+
+2011-06-25  cash <cash.costello@gmail.com>
+
+  	* views/default/css/elements/layout.php,
+  views/default/page/layouts/one_column.php: one_column layout was not showing
+  title and nav
+
+  	* mod/messageboard/pages/messageboard/owner.php: fixed ordering of
+  messageboard posts
+
+2011-06-25  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/configuration.php: datalist_get() was incorrectly setting
+  escaped values in the cache.
+
+2011-06-25  cash <cash.costello@gmail.com>
+
+  	* engine/lib/admin.php: fixed spacing in
+  elgg_admin_add_plugin_settings_menu()
+
+  	* languages/en.php, .../river/user/default/profileiconupdate.php: actually
+  read Evan's comment on pull request #48 and fixed previous
+
+  	* languages/en.php, .../river/user/default/profileiconupdate.php: updates
+  the avatar update river view and closes pull request #48
+
+  	* views/default/river/elements/body.php,
+  views/default/river/elements/responses.php,
+  views/default/river/elements/summary.php: added documentation to new river
+  views and improved handling of responses
+
+  	* engine/classes/ElggEntity.php: Fixes #3609 removed use of deprecated
+  trigger_plugin_hook()
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/js.php,
+  mod/groups/views/default/groups/profile/module.php,
+  .../views/default/groups/profile/widgets.php: Fixes #3395 using a fluid
+  gallery for the groups profile page
+
+  	* js/lib/ui.js, mod/likes/start.php,
+  mod/likes/views/default/likes/count.php,
+  mod/likes/views/default/likes/js.php: Fixes #3610 $guid was not defined
+
+2011-06-25  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/css/elements/navigation.php: Fixes #3388 put vertical-align:
+  middle back on topbar icons
+
+  	* mod/likes/start.php, mod/likes/views/default/likes/button.php,
+  mod/likes/views/default/likes/count.php,
+  mod/likes/views/default/likes/css.php, views/default/river/elements/body.php:
+  Fixes #3566 separate out likes button from likes count
+
+  	* mod/likes/views/default/likes/button.php,
+  mod/likes/views/default/likes/display.php,
+  views/default/css/elements/core.php,
+  views/default/css/elements/navigation.php: Refs #3388 entity menu has better
+  vertical alignment
+
+2011-06-24  cash <cash.costello@gmail.com>
+
+  	* mod/groups/lib/groups.php: fixed breadcrumb on groups members page
+
+  	* .../views/default/forms/messageboard/add.php: added spacing between
+  messageboard textarea and submit button
+
+  	* mod/messages/pages/messages/read.php: adding some spacing between the
+  messages and the reply form
+
+  	* mod/blog/views/default/blog/group_module.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  .../default/groups/profile/activity_module.php,
+  mod/groups/views/default/groups/profile/module.php,
+  mod/pages/views/default/pages/group_module.php: Fixes #3139 DRYs up group
+  modules
+
+  	* mod/custom_index/index.php, .../views/default/groups/sidebar/members.php,
+  views/default/css/elements/components.php: Fixes #3559 adds
+  .elgg-gallery-users
+
+  	* engine/lib/entities.php, engine/lib/views.php, mod/custom_index/index.php,
+  mod/file/views/default/file/typecloud.php,
+  .../views/default/groups/sidebar/members.php,
+  views/default/widgets/friends/content.php: Refs #1253 using 'list_type'
+  string instead of boolean 'gallery' for entity listing
+
+  	* engine/lib/views.php, mod/search/views/default/search/list.php,
+  views/default/css/admin.php, views/default/css/elements/components.php,
+  views/default/object/elements/summary.php,
+  views/default/page/components/gallery.php,
+  views/default/page/components/list.php: cleaned up the list/gallery css
+  classes to use standard class naming - minor modifications only
+
+  	* .../graphics/sign-in-with-twitter-d.png,
+  .../graphics/sign-in-with-twitter-l.png, mod/twitter_api/lib/twitter_api.php,
+  .../views/default/twitter_api/login.php: Fixes #2958 cleaned up user login
+  for twitter
+
+  	* mod/thewire/start.php: Fixes #3204 adds hook trigger so that wire sends
+  out status updates
+
+  	* mod/twitter_api/lib/twitter_api.php, mod/twitter_api/start.php: fixed the
+  post to twitter capability - was not loading the twitter oauth class
+
+  	* mod/twitter_api/lib/twitter_api.php,
+  .../default/usersettings/twitter_api/edit.php: fixes the authorization to
+  post so that it does not include login
+
+  	* mod/twitter_api/start.php: twitter @anywhere was causing problems - pages
+  were not loading and js errors
+
+2011-06-20  benbro <ben.browitt@gmail.com>
+
+  	* engine/lib/statistics.php, engine/lib/users.php: added find_active_users
+  hook
+
+2011-06-24  Cash Costello <cash.costello@gmail.com>
+
+  	* .../river/object/groupforumtopic/create.php,
+  views/default/river/elements/body.php: fixed group forum discussion inline
+  replies for activity page
+
+2011-06-23  cash <cash.costello@gmail.com>
+
+  	* mod/twitter_api/languages/en.php, mod/twitter_api/start.php,
+  .../views/default/settings/twitter_api/edit.php,
+  mod/twitter_api/views/default/twitter_api/css.php: cleaned up the twitter api
+  plugin settings so instructions are correct. Need to verify that login works.
+
+  	* .../views/default/settings/twitter_api/edit.php: added instructions back
+  to twitter api plugin settings
+
+  	* views/default/css/admin.php: added a css class so that we can limit the
+  width of text instruction areas in admin area
+
+2011-06-23  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/groups/actions/groups/membership/remove.php,
+  mod/groups/languages/en.php: Refs #1867 let group owner know what user they
+  just removed
+
+  	* mod/dashboard/start.php, mod/dashboard/views/default/dashboard/blurb.php,
+  mod/dashboard/views/default/dashboard/css.php: Fixes #3599 spacing of
+  dashboard blurb fixed
+
+  	* views/default/css/elgg.php: Fixes #3471 moved helpers to end of css/elgg
+
+  	* mod/twitter/views/default/twitter/css.php: Fixes #3603 fixes display of
+  @username in twitter widget - thanks to ManUtopiK
+
+2011-06-22  cash <cash.costello@gmail.com>
+
+  	* views/default/page/default.php: backward compatibility of the admin page
+  shell was broken when we reorganized the page view directory
+
+  	* mod/thewire/languages/en.php, mod/thewire/views/default/thewire/reply.php:
+  added @username in the reply text for a wire post
+
+2011-06-22  Cash Costello <cash.costello@gmail.com>
+
+  	* mod/members/pages/members/search.php: Fixes #3598 sanitizing the $name
+  variable
+
+2011-06-21  Franz Liedke <franz@develophp.org>
+
+  	* engine/classes/ElggMenuItem.php: Add param description to PHPDoc comments
+  of setText() function.
+
+2011-06-20  cash <cash.costello@gmail.com>
+
+  	* engine/lib/actions.php: removed debug code
+
+2011-06-20  Franz Liedke <franz@develophp.org>
+
+  	* engine/classes/ElggMenuItem.php: Add setText() method to ElggMenuItem
+  class. Fixes #3546.
+
+  	* engine/classes/ElggMenuItem.php: Add setHref() method to ElggMenuItem
+  class. Fixes #3486.
+
+2011-06-19  cash <cash.costello@gmail.com>
+
+  	* mod/thewire/start.php: fixed the wire's previous ajax - the link class for
+  the menu was lost in the conversion from plain class to link_class
+
+  	* languages/en.php: fixed typo in edit profile fields instructions
+
+  	* mod/file/views/default/forms/file/upload.php: we "upload" new files and
+  "save" old ones
+
+  	* mod/file/pages/file/view.php, mod/file/views/default/object/file.php:
+  moved the download button for files to the action menu (which probably needs
+  to be a menu)
+
+  	* mod/embed/views/default/embed/upload/content.php,
+  mod/embed/views/default/js/embed/embed.php: File uploads working now. It is
+  hard coded to only work with file plugin.
+
+  	* engine/lib/actions.php: added another way for an action to be detected as
+  an Ajax action: set the request variable X-Requested-With = XMLHttpRequest.
+  This is because files cannot be uploaded with XMLHttpRequest
+
+  	* mod/file/actions/file/upload.php,
+  mod/file/views/default/file/embed_upload.php,
+  mod/file/views/default/forms/file/upload.php: removed the special ajax/embed
+  code from the file plugin
+
+  	* views/default/css/elements/layout.php: need the system messages to be
+  above the lightbox overlay at 1000 z-index
+
+  	* mod/file/views/default/forms/file/upload.php: need a default container for
+  files if form included from outside file plugin (like the embed plugin)
+
+2011-06-19  Cash Costello <cash.costello@gmail.com>
+
+  	* views/default/widgets/friends/content.php: Fixes #3581 checks that the
+  owner of a friends widget is a user
+
+2011-06-18  cash <cash.costello@gmail.com>
+
+  	* mod/embed/start.php: fixed issue with embedding a file in an embedded file
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/tabs.php,
+  mod/embed/views/default/js/embed/embed.php: added back tab switching
+
+  	* mod/embed/views/default/embed/addcontentjs.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/js/embed/embed.php: rewrote pagination for embed file
+  listing
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/js/embed/embed.php,
+  mod/embed/views/default/js/embed/inline.php: rewrote the insert javascript as
+  an intermediate step. I'm sure I completely broke ECML integration and
+  uploading files.
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/tabs.php,
+  views/default/css/elements/navigation.php: using the new lightbox and hacking
+  away at the complicated embed/embed view
+
+  	* mod/blog/actions/blog/save.php,
+  mod/blog/views/default/forms/blog/save.php: Fixes #3580 adding blog preview
+  button that uses save action
+
+  	* languages/en.php: added "Preview" as a general term defined in language
+  file
+
+  	* mod/blog/actions/blog/save.php: using elgg_delete_river() rather than
+  custom SQL in blog save action
+
+  	* mod/blog/views/default/forms/blog/save.php: moving the delete button in
+  blog form to right side
+
+  	* mod/twitter_api/languages/en.php: Calling normal user registration
+  "manual" was confusing admin manual registration with user initiated
+  registration
+
+2011-06-18  Cash Costello <cash.costello@gmail.com>
+
+  	* LICENCE.txt, LICENSE.txt: moved LICENCE.txt to LICENSE.txt to be
+  consistent with readme
+
+2011-06-13  Evan Winslow <evan@elgg.org>
+
+  	* views/default/css/elements/components.php: Using tabs, not spaces for
+  indentation
+
+  	* mod/groups/start.php, .../river/object/groupforumtopic/create.php,
+  views/default/river/elements/body.php,
+  views/default/river/elements/footer.php,
+  views/default/river/elements/responses.php: Renamed river footer to a more
+  semantic "responses".  Fixed discussion to work inline again with this new
+  layout.
+
+  	* views/default/css/elements/components.php: elgg-river-message and
+  elgg-river-attachments now get the old elgg-river-content styling
+
+2011-06-13  Jeff Tilson <jrtilson@gmail.com>
+
+  	* mod/groups/actions/groups/membership/remove.php,
+  mod/groups/languages/en.php, mod/groups/start.php: Added 'remove from group'
+  link to the user hover menu (only appears when the page owner is a group)
+
+2011-06-13  Ravindra Nath Kakarla <ravindhranath@gmail.com>
+
+  	* mod/thewire/views/default/js/thewire.php: textarea has to be jQuery object
+
+2011-06-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggMenuItem.php,
+  views/default/navigation/menu/elements/item.php: Fixes #3282 always using a
+  menu item's name in its class  
+
+  	* mod/tinymce/views/default/js/tinymce.php: Fixes #3175 toggled tinymce
+  takes full width now - thanks tomv  
+
+  	* languages/en.php: made some language clearer on default widgets
+  instructions  
+
+  	* .../views/default/forms/expages/edit.php: fixed formatting of site pages
+  creation form - longtext menu was overlapping tinymce  
+
+  	* views/default/css/admin.php: added the css for longtext control menu to
+  admin theme  
+
+2011-06-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/reportedcontent/admin_css.php: fixing some display issues
+  with reported content - code use a little cleanup  
+
+  	* mod/thewire/languages/en.php: pulling in blacktooth's wire language typo
+  fix : pull request #32  
+
+  	* mod/likes/start.php: Fixes #3521 removed unecessary anchor tags - thanks
+  to blacktooth  
+
+  	* engine/classes/ElggSite.php,
+  ...8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php, version.php: Fixes #2910
+  set the site_guid of site entities  
+
+  	* engine/lib/elgglib.php: Fixes #3480 not requiring a timestamp when using
+  the js/css page handler  
+
+  	* views/default/css/elements/layout.php: Fixes #3409 fixed small viewport
+  issue with default theme  
+
+  	* views/default/core/settings/tools.php: adjusted the spacing between the
+  settings tools text and the surrounding elements  
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/profile/fields.php: using divs for group
+  profile fields to work around html validation issues with the out/tags view
+  using a div  
+
+2011-06-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/details.php: convert profile details to
+  use divs so that we don't have invalid html due to output/tags  
+
+  	* views/default/page/layouts/widgets/add_panel.php: need to maintain key
+  associations with widget types  
+
+  	* views/default/page/layouts/widgets/add_panel.php: sort widgets for add
+  widgets panel  
+
+  	* views/default/css/elements/navigation.php: moved the elgg logo to the left
+  by 10 pixels  
+
+  	* engine/lib/elgglib.php, engine/lib/users.php,
+  views/default/css/elements/navigation.php: topbar icons were pushing the site
+  title. Forced the elgg logo and avatar to behave. Adding overflow hidden to
+  the topbar div would prevent future problems but cause issues for those
+  adding drop down menus  
+
+  	* actions/avatar/crop.php, actions/avatar/upload.php, languages/en.php:
+  added user avatar river messages back  
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/river.php: Fixes #3039 added
+  elgg_delete_river()  
+
+  	* views/default/css/elements/modules.php: made the widget edit area slightly
+  darker to provide contrast with content area  
+
+  	* mod/profile/views/default/profile/owner_block.php: added some spacing
+  around the profile action menu  
+
+  	* pages/account/forgotten_password.php, pages/account/register.php,
+  pages/account/reset_password.php, views/default/css/elements/forms.php,
+  views/default/forms/user/requestnewpassword.php: Fixes #3556 limiting width
+  of account text boxes  
+
+  	* index.php, mod/custom_index/index.php: Fixes #3376 added RSS feed to
+  default index page and suppressing on custom index front page  
+
+  	* engine/classes/ElggSite.php, engine/lib/users.php,
+  pages/account/forgotten_password.php, pages/account/reset_password.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/forms/login.php: Fixes #3515 created a unified page handler for
+  account pages  
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/group/elements/summary.php, views/default/object/default.php,
+  views/default/user/default.php, views/default/user/elements/summary.php:
+  Fixes #3096 added user and group summery views an updated plugins to use the
+  new view locations  
+
+  	* views/default/object/elements/summary.php,
+  views/default/page/components/summary.php: Refs #3096 Moved
+  page/components/summary to object/elements/summary.  Left
+  page/components/summary for backwards compatibility.  Plugins will eventually
+  need to be updated to use $type/elements/summary  
+
+  	* mod/pages/views/default/object/page_top.php: Fixes #3523 setting public
+  write access to logged in for pages  
+
+  	* mod/pages/start.php, mod/pages/views/default/input/write_access.php: Refs
+  #3523 added a view for write access in pages plugin  
+
+  	* mod/pages/pages/pages/view.php, mod/pages/start.php: Fixes #2672 limiting
+  deleting pages and creating sub pages  
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/admin.php: sorting plugin
+  settings menu items by text  
+
+  	* .../views/default/settings/categories/edit.php,
+  .../default/settings/garbagecollector/edit.php,
+  .../views/default/settings/logrotate/edit.php: Refs #2032 changed <p> to
+  <div> for plugin settings  
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/groups/actions/groups/delete.php,
+  mod/groups/views/default/forms/groups/delete.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/edit.php,
+  .../views/default/forms/invitefriends/invite.php,
+  .../notifications/subscriptions/forminternals.php,
+  views/default/css/elements/forms.php, views/default/forms/avatar/crop.php,
+  views/default/forms/avatar/upload.php, views/default/forms/comments/add.php,
+  views/default/forms/usersettings/save.php: Refs #3407 adds a footer for forms
+   
+
+  	* install/css/install.css, views/installation/install/nav.php,
+  views/installation/install/pages/complete.php: fixed disabled button in
+  installer - css class had changed  
+
+2011-06-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/languages/en.php,
+  .../views/default/theme_preview/general.php: Fixes #3394 added a landing page
+  to theme preview and break out of iframe link  
+
+  	* engine/lib/users.php, views/default/input/location.php,
+  views/default/input/tag.php, views/default/output/location.php,
+  views/default/output/tag.php, views/default/output/tags.php: Fixes #3489
+  added input/output views for tag and location  
+
+  	* mod/invitefriends/manifest.xml: added invite friends to default activated
+  plugins  
+
+  	* actions/admin/plugins/activate.php, actions/admin/plugins/deactivate.php:
+  Refs #2871 Forgot to update the forwarding for activate/deactivate actions  
+
+  	* languages/en.php, mod/diagnostics/languages/en.php,
+  mod/externalpages/languages/en.php: Refs #3410 all admin menu items have
+  consistent capitalization  
+
+  	* engine/lib/admin.php: Fixes #3548 the check for an admin menu's parent
+  wasn't working  
+
+  	* actions/admin/plugins/activate_all.php,
+  actions/admin/plugins/deactivate_all.php, views/default/admin/plugins.php,
+  views/default/css/admin.php,
+  views/default/forms/admin/plugins/change_state.php: Fixes #2871 activate
+  all/deactivate all now sensitive to filtering  
+
+  	* views/default/admin/plugins/simple.php,
+  .../forms/admin/plugins/simple_update_states.php: Refs #2871 removed the
+  simple plugins page  
+
+  	* engine/lib/admin.php, views/default/admin/plugins.php,
+  views/default/admin/plugins/advanced.php: Refs #2871 promoted advanced
+  plugins up to be a primary menu  
+
+  	* views/default/object/plugin/advanced.php: Refs #2871 also turning off
+  dragging when not in priority order  
+
+  	* views/default/admin/plugins/advanced.php,
+  views/default/object/plugin/advanced.php,
+  .../object/plugin/elements/dependencies.php: Refs #2871 only showing links
+  for changing priority when all plugins are shown in priority order  
+
+  	* languages/en.php, views/default/admin/plugins/advanced.php,
+  views/default/forms/admin/plugins/filter.php,
+  views/default/forms/admin/plugins/sort.php: Refs #2871 adding sorting to
+  advanced plugin page  
+
+  	* languages/en.php, views/default/admin/plugins/advanced.php: Refs #2871
+  filter plugins by active/inactive state  
+
+  	* mod/diagnostics/manifest.xml: setting correct category for diagnostics
+  plugin  
+
+2011-06-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Closes #3510. Merged CHANGES.txt for 1.7.9 to trunk.  
+
+  	* engine/lib/deprecated-1.8.php: Refs #3510, #3366. Added warning about
+  count vs sum in egef_annotation_count() to trunk.  
+
+  	* mod/profile/start.php: Refs #3510, #3316. Merged
+  register_metadata_as_independent() fix in profile.  
+
+2011-06-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2011052801.php, version.php: Refs #3510, #3416. Merged
+  update for making sure users have relationship member_of on site object.  
+
+  	* mod/messages/languages/en.php,
+  mod/messages/views/default/object/messages.php: Refs #3510, #3264. Ported fix
+  for icons of messages from deleted users to trunk.  
+
+2011-06-08  Evan Winslow <evan@elgg.org>
+
+  	* engine/lib/views.php, languages/en.php, mod/blog/languages/en.php,
+  .../views/default/river/object/blog/create.php,
+  mod/bookmarks/languages/en.php,
+  .../default/river/object/bookmarks/create.php, mod/file/languages/en.php,
+  .../views/default/river/object/file/create.php, mod/groups/languages/en.php,
+  .../river/annotation/group_topic_post/reply.php,
+  mod/groups/views/default/river/group/create.php,
+  .../river/object/groupforumtopic/create.php,
+  .../default/river/relationship/member/create.php,
+  .../default/river/annotation/likes/create.php,
+  mod/messageboard/languages/en.php,
+  .../default/river/object/messageboard/create.php, mod/pages/languages/en.php,
+  .../views/default/river/object/page/create.php, mod/thewire/languages/en.php,
+  .../views/default/river/object/thewire/create.php,
+  .../river/annotation/generic_comment/create.php,
+  views/default/river/elements/body.php,
+  views/default/river/elements/summary.php, views/default/river/item.php,
+  views/default/river/relationship/friend/create.php: River revamp for 1.8
+
+2011-06-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php: Refs #3510, #3414, #3536.
+  Ported https login fixes to trunk. Will need to backport changes to 1.7 for
+  #3536.  
+
+  	* engine/lib/group.php, engine/lib/sessions.php, languages/en.php: Refs
+  #3510, #3418. Merged fix for forwarding after output to trunk.  
+
+  	* mod/tinymce/vendor/tinymce/changelog.txt,
+  .../vendor/tinymce/examples/accessibility.html,
+  .../vendor/tinymce/examples/css/content.css,
+  mod/tinymce/vendor/tinymce/examples/css/word.css,
+  .../vendor/tinymce/examples/custom_formats.html,
+  mod/tinymce/vendor/tinymce/examples/full.html,
+  mod/tinymce/vendor/tinymce/examples/index.html,
+  .../vendor/tinymce/examples/lists/image_list.js,
+  .../vendor/tinymce/examples/lists/link_list.js,
+  .../vendor/tinymce/examples/lists/media_list.js,
+  .../vendor/tinymce/examples/lists/template_list.js,
+  mod/tinymce/vendor/tinymce/examples/media/logo.jpg,
+  .../vendor/tinymce/examples/media/logo_over.jpg,
+  .../vendor/tinymce/examples/media/sample.avi,
+  .../vendor/tinymce/examples/media/sample.dcr,
+  .../vendor/tinymce/examples/media/sample.flv,
+  .../vendor/tinymce/examples/media/sample.mov,
+  .../vendor/tinymce/examples/media/sample.ram,
+  .../vendor/tinymce/examples/media/sample.rm,
+  .../vendor/tinymce/examples/media/sample.swf,
+  mod/tinymce/vendor/tinymce/examples/menu.html,
+  mod/tinymce/vendor/tinymce/examples/simple.html,
+  mod/tinymce/vendor/tinymce/examples/skins.html,
+  .../vendor/tinymce/examples/templates/layout1.htm,
+  .../vendor/tinymce/examples/templates/snippet1.htm,
+  mod/tinymce/vendor/tinymce/examples/word.html,
+  .../vendor/tinymce/jscripts/tiny_mce/langs/en.js,
+  .../tiny_mce/plugins/advhr/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advhr/rule.htm,
+  .../jscripts/tiny_mce/plugins/advimage/image.htm,
+  .../jscripts/tiny_mce/plugins/advimage/js/image.js,
+  .../tiny_mce/plugins/advimage/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlink/js/advlink.js,
+  .../tiny_mce/plugins/advlink/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advlink/link.htm,
+  .../tiny_mce/plugins/advlist/editor_plugin.js,
+  .../tiny_mce/plugins/advlist/editor_plugin_src.js,
+  .../tiny_mce/plugins/autolink/editor_plugin.js,
+  .../tiny_mce/plugins/autolink/editor_plugin_src.js,
+  .../tiny_mce/plugins/autoresize/editor_plugin.js,
+  .../plugins/autoresize/editor_plugin_src.js,
+  .../tiny_mce/plugins/autosave/editor_plugin.js,
+  .../tiny_mce/plugins/autosave/editor_plugin_src.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin_src.js,
+  .../tiny_mce/plugins/contextmenu/editor_plugin.js,
+  .../plugins/contextmenu/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/emotions.htm,
+  .../tiny_mce/plugins/fullpage/css/fullpage.css,
+  .../tiny_mce/plugins/fullpage/editor_plugin.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/fullpage.htm,
+  .../tiny_mce/plugins/fullpage/js/fullpage.js,
+  .../tiny_mce/plugins/fullscreen/editor_plugin.js,
+  .../plugins/fullscreen/editor_plugin_src.js,
+  .../tiny_mce/plugins/inlinepopups/editor_plugin.js,
+  .../plugins/inlinepopups/editor_plugin_src.js,
+  .../inlinepopups/skins/clearlooks2/window.css,
+  .../tiny_mce/plugins/layer/editor_plugin.js,
+  .../tiny_mce/plugins/layer/editor_plugin_src.js,
+  .../tiny_mce/plugins/legacyoutput/editor_plugin.js,
+  .../plugins/legacyoutput/editor_plugin_src.js,
+  .../tiny_mce/plugins/lists/editor_plugin.js,
+  .../tiny_mce/plugins/lists/editor_plugin_src.js,
+  .../tiny_mce/plugins/media/css/content.css,
+  .../jscripts/tiny_mce/plugins/media/css/media.css,
+  .../tiny_mce/plugins/media/editor_plugin.js,
+  .../tiny_mce/plugins/media/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/img/flash.gif,
+  .../tiny_mce/plugins/media/img/flv_player.swf,
+  .../tiny_mce/plugins/media/img/quicktime.gif,
+  .../tiny_mce/plugins/media/img/realmedia.gif,
+  .../tiny_mce/plugins/media/img/shockwave.gif,
+  .../jscripts/tiny_mce/plugins/media/img/trans.gif,
+  .../tiny_mce/plugins/media/img/windowsmedia.gif,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/media/media.htm,
+  .../tiny_mce/plugins/media/moxieplayer.swf,
+  .../tiny_mce/plugins/nonbreaking/editor_plugin.js,
+  .../plugins/nonbreaking/editor_plugin_src.js,
+  .../tiny_mce/plugins/noneditable/editor_plugin.js,
+  .../plugins/noneditable/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/css/content.css,
+  .../tiny_mce/plugins/pagebreak/editor_plugin.js,
+  .../plugins/pagebreak/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/img/pagebreak.gif,
+  .../tiny_mce/plugins/pagebreak/img/trans.gif,
+  .../tiny_mce/plugins/paste/editor_plugin.js,
+  .../tiny_mce/plugins/paste/editor_plugin_src.js,
+  .../plugins/searchreplace/editor_plugin.js,
+  .../plugins/searchreplace/editor_plugin_src.js,
+  .../plugins/searchreplace/js/searchreplace.js,
+  .../plugins/searchreplace/searchreplace.htm,
+  .../tiny_mce/plugins/spellchecker/editor_plugin.js,
+  .../plugins/spellchecker/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/style/js/props.js,
+  .../tiny_mce/plugins/style/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/style/props.htm,
+  .../tiny_mce/plugins/tabfocus/editor_plugin.js,
+  .../tiny_mce/plugins/tabfocus/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/cell.htm,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/cell.js,
+  .../jscripts/tiny_mce/plugins/table/js/row.js,
+  .../jscripts/tiny_mce/plugins/table/js/table.js,
+  .../tiny_mce/plugins/table/langs/en_dlg.js,
+  .../tiny_mce/plugins/table/merge_cells.htm,
+  .../jscripts/tiny_mce/plugins/table/row.htm,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../tiny_mce/plugins/template/js/template.js,
+  .../tiny_mce/plugins/visualchars/editor_plugin.js,
+  .../plugins/visualchars/editor_plugin_src.js,
+  .../tiny_mce/plugins/wordcount/editor_plugin.js,
+  .../plugins/wordcount/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm,
+  .../tiny_mce/plugins/xhtmlxtras/acronym.htm,
+  .../tiny_mce/plugins/xhtmlxtras/attributes.htm,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm,
+  .../tiny_mce/plugins/xhtmlxtras/editor_plugin.js,
+  .../plugins/xhtmlxtras/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm,
+  .../tiny_mce/plugins/xhtmlxtras/js/attributes.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js,
+  .../plugins/xhtmlxtras/js/element_common.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js,
+  .../jscripts/tiny_mce/themes/advanced/about.htm,
+  .../jscripts/tiny_mce/themes/advanced/anchor.htm,
+  .../jscripts/tiny_mce/themes/advanced/charmap.htm,
+  .../tiny_mce/themes/advanced/color_picker.htm,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/advanced/image.htm,
+  .../tiny_mce/themes/advanced/img/flash.gif,
+  .../tiny_mce/themes/advanced/img/iframe.gif,
+  .../tiny_mce/themes/advanced/img/pagebreak.gif,
+  .../tiny_mce/themes/advanced/img/quicktime.gif,
+  .../tiny_mce/themes/advanced/img/realmedia.gif,
+  .../tiny_mce/themes/advanced/img/shockwave.gif,
+  .../tiny_mce/themes/advanced/img/trans.gif,
+  .../tiny_mce/themes/advanced/img/video.gif,
+  .../tiny_mce/themes/advanced/img/windowsmedia.gif,
+  .../jscripts/tiny_mce/themes/advanced/js/about.js,
+  .../jscripts/tiny_mce/themes/advanced/js/anchor.js,
+  .../tiny_mce/themes/advanced/js/charmap.js,
+  .../tiny_mce/themes/advanced/js/color_picker.js,
+  .../jscripts/tiny_mce/themes/advanced/js/image.js,
+  .../jscripts/tiny_mce/themes/advanced/js/link.js,
+  .../tiny_mce/themes/advanced/js/source_editor.js,
+  .../jscripts/tiny_mce/themes/advanced/langs/en.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/link.htm,
+  .../tiny_mce/themes/advanced/shortcuts.htm,
+  .../themes/advanced/skins/default/content.css,
+  .../tiny_mce/themes/advanced/skins/default/ui.css,
+  .../themes/advanced/skins/highcontrast/content.css,
+  .../themes/advanced/skins/highcontrast/dialog.css,
+  .../themes/advanced/skins/highcontrast/ui.css,
+  .../themes/advanced/skins/o2k7/content.css,
+  .../tiny_mce/themes/advanced/skins/o2k7/dialog.css,
+  .../tiny_mce/themes/advanced/skins/o2k7/ui.css,
+  .../themes/advanced/skins/o2k7/ui_black.css,
+  .../themes/advanced/skins/o2k7/ui_silver.css,
+  .../tiny_mce/themes/advanced/source_editor.htm,
+  .../tiny_mce/themes/simple/editor_template.js,
+  .../tiny_mce/themes/simple/editor_template_src.js,
+  .../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_popup.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_src.js,
+  .../tinymce/jscripts/tiny_mce/utils/form_utils.js,
+  .../tinymce/jscripts/tiny_mce/utils/mctabs.js,
+  .../tinymce/jscripts/tiny_mce/utils/validate.js: Refs #3510, #9113. Updated
+  tinyMCE version in trunk.  
+
+  	* engine/classes/ElggEntity.php: Refs #3510, #3433. Ported r9062 to trunk.
+  Fix for comment hook returning 0 comments.  
+
+  	* CHANGES.txt: Refs #3510: Merged r8938 to trunk. Removed exec props.  
+
+  	* README.txt: Merged README.txt version removal to trunk.  
+
+2011-06-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php: Fixes #3520 fix check for subdirectory in
+  installer  
+
+  	* mod/embed/README.txt, mod/embed/start.php,
+  mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/js.php,
+  .../default/tinymce/embed_custom_insert_js.php: Refs #3360 #2911 applying
+  ashleyward's patch for embed plugin - thanks!  
+
+  	* vendors/jquery/jquery.form.js: Refs #3360 updating the jquery form plugin 
+
+  	* mod/blog/actions/blog/delete.php, mod/blog/lib/blog.php,
+  mod/blog/start.php, mod/blog/views/default/blog/group_module.php,
+  mod/bookmarks/actions/bookmarks/delete.php,
+  mod/bookmarks/pages/bookmarks/view.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/file/actions/file/delete.php, mod/file/actions/file/upload.php,
+  mod/file/pages/file/search.php, mod/file/pages/file/upload.php,
+  mod/file/pages/file/view.php, mod/file/start.php,
+  mod/file/views/default/file/group_module.php,
+  mod/messageboard/pages/messageboard/owner.php, mod/messageboard/start.php,
+  .../views/default/widgets/messageboard/content.php,
+  mod/pages/actions/pages/delete.php, mod/pages/pages/pages/history.php,
+  mod/pages/pages/pages/revision.php, mod/pages/pages/pages/view.php,
+  mod/pages/start.php, mod/pages/views/default/pages/group_module.php: Fixes
+  #3138 using 'all' for group listing urls  
+
+  	* mod/likes/actions/likes/add.php, mod/likes/actions/likes/delete.php,
+  mod/likes/views/default/likes/display.php: Fixes #3497 users can unlike other
+  users content  
+
+2011-06-02  Russell McLoughlin <mcloughlin3@llnl.gov>
+
+  	* mod/file/actions/file/upload.php: fixed embarrassing spelling mistake.
+
+2011-06-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/likes/start.php: Fixes #3499 using consistent menu name for likes
+  plugin  
+
+2011-06-01  Russell McLoughlin <mcloughlin3@llnl.gov>
+
+  	* mod/file/actions/file/upload.php, mod/file/download.php: Modified upload
+  script to guarentee that the directory under elgg data is created or exists.
+  Removed strange chunking code with builtin php function
+
+  	* mod/file/actions/file/upload.php: Modified upload code so that it uses
+  php's built in file copy function rather than reading the entire uploaded
+  file into memory from the temporary upload directory and then saving it to
+  elgg's data dir.
+
+2011-06-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Fixes #3455 added documentation back to
+  deprecated functions  
+
+2011-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginPackage.php, languages/en.php,
+  views/default/css/admin.php, views/default/object/plugin/advanced.php: Fixes
+  #3467. Fixed bugs in priority deps. Can now disable active plugins with unmet
+  dependencies.  
+
+2011-05-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: Refs #3236 added some margin to the bottom of
+  the admin footer  
+
+  	* engine/lib/users.php, mod/dashboard/manifest.xml, mod/dashboard/start.php,
+  mod/dashboard/views/default/dashboard/blurb.php, pages/dashboard.php,
+  views/default/core/dashboard/blurb.php, views/default/css/elements/misc.php:
+  Refs #3340 pulls dashboard out as plugin  
+
+  	* views/default/annotation/generic_comment.php,
+  views/default/page/elements/comments_block.php: Fixes #3457 showing a snippet
+  of a comment in sidebar instead of entire comment  
+
+  	* views/default/input/access.php, views/default/input/tags.php,
+  views/default/output/tags.php: Fixes #3189 adds entity support to tags and
+  access views  
+
+  	* languages/en.php, mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/categories/manifest.xml, mod/diagnostics/manifest.xml,
+  mod/embed/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/logrotate/manifest.xml, mod/messageboard/manifest.xml,
+  mod/pages/manifest.xml, mod/tagcloud/manifest.xml, mod/tinymce/manifest.xml,
+  mod/twitter/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: Refs #2104 changed extension to enhancement and
+  added security, widget, and theme categories  
+
+  	* engine/lib/river.php: Fixes #3300 adds a created,river event  
+
+2011-05-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: 'creating', 'river' is the plugin hook for
+  preventing or catching a river addition before it happens  
+
+  	* engine/lib/output.php: Fixes #3454 not stripping empty attributes  
+
+  	* engine/lib/admin.php, views/default/object/plugin/advanced.php: Fixes
+  #3163 plugin/<plugin id>/settings.php is now the preferred way to add
+  settings plugins  
+
+  	* engine/classes/ElggPlugin.php, engine/lib/elgglib.php, languages/en.php:
+  Fixes #3462 empty classes directory is no longer treated as an error  
+
+2011-05-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js, views/default/output/confirmlink.php,
+  views/default/page/elements/header.php: Fixes #3385 rel now used for the
+  confirm text so that title can be used separately  
+
+  	* engine/lib/pagehandler.php: Fixes #3132 added 'route', $handler plugin
+  hook  
+
+  	* views/default/forms/register.php: Fixes #3419 removed code about admin
+  option from registration form  
+
+  	* mod/groups/start.php: Fixes #3464 group discussion replies work on
+  activity page  
+
+2011-05-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/languages/en.php: Fixes #3453 added link to wiki about the data
+  directory  
+
+  	* install/css/install.css,
+  views/installation/install/pages/requirements.php: fixed display issue in
+  installation where navigation was overlapping requirements  
+
+  	* install/ElggInstaller.php: fixed issue introduced with the session changes
+  in the installer  
+
+  	* install/ElggInstaller.php: do not need to initialize globals in installer
+  because they are now declared that way in Elgg core libs  
+
+  	* install/ElggInstaller.php: fixed regenerating cache when installing Elgg -
+  wasn't picking up the plugins before  
+
+  	* views/installation/page/elements/footer.php: helpful links in installer
+  open up in new page now  
+
+  	* install/ElggInstaller.php: Refs #3453 added $CONFIG->data_dir_override so
+  that people can put the data directory in Elgg's root if they want to. Will
+  add instructions to the wiki on using this and protecting the directory  
+
+  	* install/ElggInstaller.php, install/ElggRewriteTester.php,
+  install/css/install.css, install/js/install.js, install/languages/en.php,
+  views/installation/forms/install/template.php,
+  views/installation/input/checkbox.php,
+  views/installation/input/checkboxes.php, views/installation/input/combo.php,
+  views/installation/input/form.php, views/installation/input/hidden.php,
+  views/installation/input/text.php: Refs #3453 an implementation of creating
+  the data directory. This capability is turned off due to security concerns.  
+
+2011-05-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/installation/input/access.php, views/installation/input/button.php,
+  views/installation/input/checkboxes.php,
+  views/installation/input/dropdown.php, views/installation/input/form.php,
+  views/installation/input/hidden.php, views/installation/input/longtext.php,
+  views/installation/input/password.php, views/installation/input/reset.php,
+  views/installation/input/securitytoken.php,
+  views/installation/input/submit.php, views/installation/input/text.php: clean
+  up installation input views  
+
+  	* install/css/install.css: fixed the width of text boxes for the installer  
+
+  	* actions/logout.php: on logout send the user to the main page  
+
+  	* install/ElggInstaller.php: Fixes #3446 password is not required anymore
+  for installer  
+
+  	* install/js/install.js, views/installation/forms/install/template.php,
+  views/installation/page/default.php: fixed the double form submission code
+  for the installer  
+
+  	* engine/lib/users.php, views/default/user/default.php: Fixes #3456
+  user/default now works much like the object/<subtype> views regarding the
+  menu  
+
+  	* engine/lib/extender.php: not using deprecated get_annotation/get_metadata
+  functions in can_edit_extender()  
+
+  	* views/default/navigation/topbar_tools.php,
+  views/default/page/elements/topbar.php: only display deprecation message if
+  someone extends/overrides the deprecated tools view  
+
+  	* mod/developers/languages/en.php: defined
+  elgg_dev_tools:settings:explanation  
+
+  	* views/default/input/dropdown.php: fixes a php warning if no options are
+  passed to input/dropdown view  
+
+  	* engine/lib/users.php: removed a deprecated function use in users lib  
+
+  	* .../views/default/theme_preview/forms.php,
+  views/default/input/userpicker.php: fixed passing wrong parameters to
+  input/userpicker (which is not currently functional)  
+
+  	* mod/externalpages/start.php, mod/thewire/start.php, mod/twitter/start.php:
+  removed deprecated functions from these 3 plugins  
+
+  	* engine/lib/actions.php: improved documentation of elgg_register_action()  
+
+  	* mod/pages/start.php: fixed page revisions url override  
+
+  	* engine/lib/extender.php: improved documentation of
+  elgg_register_extender_url_handler()  
+
+  	* views/default/forms/admin/menu/save.php: fixed php warning when no custom
+  menu items  
+
+  	* languages/en.php: fixed typo in the admin welcome widget  
+
+  	* views/default/admin/plugins/advanced.php: sorting plugin categories before
+  display  
+
+  	* languages/en.php, mod/groups/manifest.xml, mod/likes/manifest.xml,
+  mod/oauth_api/manifest.xml, mod/twitter_api/manifest.xml,
+  mod/zaudio/manifest.xml: Refs #2104 more category work for bundled plugins  
+
+  	* engine/lib/database.php: made database query logging explicitly set to
+  NOTICE level  
+
+2011-05-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/lib/blog.php: Fixes #3439 forcing months to have leading zero  
+
+2011-05-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+2011-05-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/userpicker.js: Pulled in Jeff's patch to fix the user picker.  
+
+  	* engine/classes/ElggPluginPackage.php: Fixes 3426. Not using a horrible
+  variable name and fixing the bug created by it.  
+
+2011-05-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Fixed wrapper for annotation calculations. 
+
+2011-04-29  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/css/admin.php,
+  views/default/widgets/admin_welcome/content.php: Made admin welcome widget a
+  bit more semantic 
+
+  	* upgrade.php: comment typo 
+
+  	* engine/.htaccess: Bah, can't do that 
+
+  	* engine/.htaccess: Deny all HTTP access to the engine directory 
+
+2011-04-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitter/views/default/twitter/css.php: hacking the 1.7 css for current
+  twitter widget so it looks decent for screenshots  
+
+  	* mod/embed/start.php: Refs #3358 fixed another instance where link_class
+  should be used now due to changes in menu code  
+
+2011-04-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/security.js, js/lib/ui.js: Fixes #3408. During token refresh, only
+  touching hrefs that contain __elgg_ts and __elgg_token to avoid changing
+  selector-only hrefs since fragment-only hrefs are normalized by the browser.
+  Not sure how this didn't show up until now.  
+
+2011-04-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/widgets/admin_welcome/content.php: Trying
+  to increase probability that people will read the welcome widget by making
+  the text shorter  
+
+  	* languages/en.php, views/default/css/admin.php,
+  views/default/forms/profile/fields/reset.php: Refs #3236 updated the button
+  css so that disable plugin button looks like a button  
+
+  	* mod/messages/manifest.xml: activate messages plugin on install  
+
+  	* views/default/css/admin.php, .../object/plugin/elements/dependencies.php:
+  Refs #3236 removed elgg-states-* from admin css since it was overaggressive  
+
+  	* views/default/css/admin.php: Refs #3236 cleaned up the widget css in admin
+  area  
+
+2011-04-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/start.php: Refs #3358. Missed Tinymce's use of class for its
+  menu.  
+
+  	* views/default/css/admin.php: Fixes #3326. Added CSS for inputs in admin
+  area. No more tiny text fields!  
+
+  	* mod/messageboard/views/default/messageboard/js.php: Fixed a problem with
+  the ajax for deleting message board posts.  
+
+  	* engine/lib/actions.php: Removed unneeded else.  
+
+  	* engine/lib/actions.php: Fixes #3127. Normalizing the json returned by the
+  ajax action handler. Doing this in PHP.  
+
+2011-04-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: Added very basic CSS for elgg-markdown in
+  admin area.  
+
+  	* engine/lib/admin.php: Fixed possible WSOD for plugin text file page
+  handler.  
+
+  	* mod/search/README.txt: Fixed typo in search's readme.  
+
+  	* vendors/markdown/UPSTREAM_WARNING, vendors/markdown/markdown.php: Updated
+  markdown to add support for === instead of just ### for headers. Added
+  upstream warning.  
+
+  	* mod/search/README.txt: Updated search's readme to markdown.  
+
+  	* mod/logrotate/languages/en.php, mod/logrotate/start.php,
+  .../views/default/settings/logrotate/edit.php: Fixes #3253. Merged in
+  Shashank's patch.  
+
+  	* engine/lib/plugins.php: Removed stray test code.  
+
+  	* engine/lib/plugins.php, views/default/admin/plugins/advanced.php: Refs
+  #3362. Removed use of $show_bad in elgg_get_plugins().  
+
+  	* actions/admin/plugins/activate.php,
+  actions/admin/plugins/activate_all.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/deactivate_all.php,
+  actions/admin/plugins/set_priority.php,
+  actions/admin/plugins/simple_update_states.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggPluginPackage.php,
+  engine/lib/admin.php, engine/lib/deprecated-1.8.php, engine/lib/plugins.php,
+  install/ElggInstaller.php, views/default/admin/plugin_settings.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/core/settings/tools.php,
+  .../forms/admin/plugins/simple_update_states.php,
+  views/default/object/plugin/advanced.php,
+  .../object/plugin/elements/dependencies.php,
+  views/default/object/plugin/simple.php: Refs #3362. Plugins don't check deps
+  upon boot. Made package and manifest private properties of ElggPlugin and
+  added ->getPackage() and ->getManifest().  
+
+2011-04-26  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/icons.php: Fixes #3380: .elgg-icon-user states
+  are now consistent with other elgg-icons 
+
+  	* views/default/css/elements/core.php,
+  views/default/css/elements/navigation.php: Fixes #3388: .elgg-icon is now
+  middle-aligned by default 
+
+  	* views/default/page/components/gallery.php: Fixes #3290: Fluid gallery w/o
+  tables -- working great for fixed-width content 
+
+  	* views/default/css/elements/typography.php: Fixes #3389: Sandbox base
+  styles for dl, dt, dd 
+
+  	* engine/lib/input.php, views/default/input/autocomplete.php: Fixes #2922:
+  pg/livesearch now works with "term" parameter 
+
+  	* engine/lib/elgglib.php: Fixes some coding standard issues in elgglib.php 
+
+2011-04-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/readme.txt: Removed inaccurate readme.txt file.  
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginPackage.php,
+  engine/lib/admin.php, engine/lib/plugins.php, languages/en.php,
+  vendors/markdown/License.text, vendors/markdown/PHP Markdown Extra
+  Readme.text, vendors/markdown/markdown.php,
+  views/default/object/plugin/advanced.php,
+  views/default/object/plugin/simple.php: Fixes #2899, #2870. Added README.txt,
+  CHANGES.txt, COPYRIGHT.txt, LICENSE.txt, and INSTALL.txt as markdown files
+  for plugins. Added page handler to parse and serve them. Added links in
+  plugin admin. Refs #3236. Problems with displaying parsed markdown because of
+  missing parts of the admin theme's CSS.  
+
+  	* engine/classes/ElggPlugin.php: Renamed ElggPlugin->canIncludeFile() to
+  ->canReadFile() and am using is_readable() instead of file_exists().  
+
+2011-04-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/forms.php: Fixes #2196. Pulled in Francisco's
+  patch for datepicker CSS.  
+
+2011-04-23  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/page/theme_preview.php,
+  .../views/default/theme_preview/buttons.php,
+  .../views/default/theme_preview/components.php,
+  .../theme_preview/components/image_block.php,
+  .../default/theme_preview/components/list.php,
+  .../default/theme_preview/components/messages.php,
+  .../default/theme_preview/components/table.php,
+  .../views/default/theme_preview/forms.php,
+  .../views/default/theme_preview/general.php,
+  .../views/default/theme_preview/grid.php,
+  .../views/default/theme_preview/icons.php,
+  .../views/default/theme_preview/icons/avatars.php,
+  .../views/default/theme_preview/icons/loader.php,
+  .../views/default/theme_preview/icons/sprites.php,
+  .../views/default/theme_preview/modules.php,
+  .../default/theme_preview/modules/modules.php,
+  .../default/theme_preview/modules/widgets.php,
+  .../views/default/theme_preview/navigation.php,
+  .../theme_preview/navigation/breadcrumbs.php,
+  .../default/theme_preview/navigation/default.php,
+  .../default/theme_preview/navigation/extras.php,
+  .../default/theme_preview/navigation/filter.php,
+  .../theme_preview/navigation/horizontal.php,
+  .../theme_preview/navigation/owner_block.php,
+  .../default/theme_preview/navigation/page.php,
+  .../theme_preview/navigation/pagination.php,
+  .../default/theme_preview/navigation/site.php,
+  .../default/theme_preview/navigation/tabs.php,
+  .../views/default/theme_preview/objects.php,
+  .../views/default/theme_preview/typography.php,
+  .../default/theme_preview/typography/headings.php,
+  .../default/theme_preview/typography/misc.php,
+  .../default/theme_preview/typography/paragraph.php,
+  .../views/default/theme_preview/widgets.php: Fixes #3042: Theme preview navs
+  now match css/elements/*.  Also did a major cleanup of the presentation. 
+
+2011-04-22  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/forms/developers/settings.php: Fixes #3374: echo
+  developers settings explanation 
+
+  	* views/default/navigation/menu/elements/item.php: Fixes #3282: Added a
+  class to menu items which includes menu item name (just like ul contains a
+  class with the menu name) 
+
+2011-04-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Fixed rewriting for internalid and internalname to
+  not cause false deprecation notices if passed among views.  
+
+  	* views/default/forms/profile/fields/add.php: Fixed deprecated call to
+  input/pulldown.  
+
+  	* engine/lib/elgglib.php: Added 3rd param to elgg_deprecated_notice() to
+  control how much of the stack to show.  
+
+  	* engine/lib/statistics.php: Fixes some deprecated notices in admin online
+  user widget.  
+
+  	* engine/lib/views.php: Fixed erroneous notices about full_view when passing
+  $vars directly to another view within a view.  
+
+2011-04-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metastrings.php: Refs #3195.
+  Selectively joining certain tables for performance with annotation
+  calculations.  
+
+  	* engine/lib/annotations.php, engine/lib/metastrings.php: Reverting the
+  annotation changes because they're not ready yet.  
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/lib/metastrings.php, engine/tests/api/metastrings.php: Fixed a problem
+  with the annotation batch operation test.  
+
+  	* engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_18/manifest.xml: Fixes #3310. Removed old
+  on_activate unit tests.  
+
+2011-04-20  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: Fixes #3369: Bookmarks
+  now have rel=nofollow 
+
+2011-04-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/groups/featured.php, mod/groups/languages/en.php,
+  mod/groups/start.php: Fixes #3364: Added action tokens and fixed guids for
+  featuring/unfeaturing groups. Cleaned up language for result messages.  
+
+2011-04-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/navigation.php,
+  views/default/page/layouts/content/header.php: Fixes #3358. Renamed menu's
+  class to link_class and documented possible problems with passing <a> tags in
+  the text option.  
+
+  	* engine/lib/database.php, engine/lib/entities.php,
+  engine/lib/metastrings.php, engine/lib/river.php: Fixes #2046. Applied Franz'
+  patch for sanitize_int().  
+
+  	* engine/lib/cache.php: Fixes #3365. Pulled in blacktooth's patch.  
+
+2011-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser18.php, languages/en.php,
+  mod/blog/manifest.xml, mod/blog/start.php, mod/categories/manifest.xml,
+  mod/categories/start.php: Fixes #3310. Applied lie2815's patch to use
+  activate.php and deactivate.php instead of manifest on_de/activate fields in
+  plugins.  
+
+2011-04-16  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/metastrings.php, engine/tests/api/entity_getter_functions.php:
+  Removed debug calls.
+
+  	* .gitignore, engine/classes/ElggFile.php, engine/lib/annotations.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/tests/api/entity_getter_functions.php, engine/tests/suite.php:
+  Denormalizing annotation names for calculation functions.
+
+2011-04-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Fixed problem with
+  list_entities_from_metadata() wrapper.  
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php,
+  engine/lib/metastrings.php: Refs #3195. Changed the way annotation
+  calculations are performed. Seems to be working better, but will want to test
+  more before closing.  
+
+  	* engine/classes/ElggMenuItem.php: Refs #3023. Exposed item_class option in
+  the menu item factory. Should we change 'class' to 'link_class' to avoid
+  confusion?  
+
+2011-04-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/tests/api/helpers.php: fixed filtering of
+  external files array and suppressed warning in external files unit test  
+
+2011-04-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/core.php: Fixes #2972: Following elements have
+  default clearfix:  elgg-inner elgg-page-header elgg-page-footer elgg-foot
+  elgg-head elgg-col elgg-image-block 
+
+  	* views/default/page/admin.php, views/default/page/default.php,
+  views/default/page/elements/foot.php, views/default/page/walled_garden.php:
+  Fixes #3329: Added page/elements/foot and refactored page shells to use it 
+
+2011-04-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Fixes #3268 forwarding to referrer (fixed by
+  ashwanthkumar)  
+
+  	* engine/lib/metastrings.php: handles empty array in get_metastring_id()
+  (hellekin)  
+
+  	* engine/lib/sessions.php: preventing warnings with the user password
+  authorization pam (hellekin)  
+
+  	* engine/classes/ElggEntity.php: fixes warnings in ElggEntity::getMetadata()
+  (hellekin)  
+
+  	* engine/classes/ElggEntity.php: making sure ElggEntity::getAnnotations()
+  returns an array, check if temporary annotation exists before returning, and
+  added a warning about annotating unsaved entities  
+
+  	* engine/tests/services/api.php: suppressing warnings in web services unit
+  tests (hellekin)  
+
+  	* engine/classes/ElggPAM.php: checking that PAM handlers have been
+  registered for the policy being tested (hellekin)  
+
+  	* engine/classes/ElggUser.php: Checking that get_user_by_username() returned
+  something in ElggUser constructor to prevent notice (hellekin)  
+
+2011-04-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/cache_handler.php, engine/lib/cache.php,
+  engine/lib/elgglib.php: Fixes #3331. Changed cache schema to allow for JS/CSS
+  views with slashes and dots.  
+
+  	* engine/lib/elgglib.php: Consolidated the css and js pagehandlers with
+  elgg_cachable_view_pagehandler() and fixed for URLs with multiple dots after
+  the last / (like /js/calendars/fullcalendar.min.123456789.js)  
+
+2011-04-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixes #3347 fixes comment typo for ege  
+
+2011-04-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/initialize_elgg.php: Fixing JS problems when simple cache
+  is disabled.  
+
+2011-04-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/output.php: Fixes #3327 fixed typo  
+
+  	* views/default/css/elgg.php: Fixes #3333 removed include of chrome css  
+
+  	* views/default/css/admin.php: Fixes #3325 added cursor: pointer to system
+  messages in admin area  
+
+  	* mod/file/start.php: Fixes #3322 file link removed from owner_block if
+  disabled for a group  
+
+2011-04-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php, views/default/page/elements/head.php: Fixed #3313:
+  Removed the superfluous html_head/extend view from core.  Anyone following
+  trunk should extend page/elements/head instead 
+
+  	* js/lib/languages.js: Fixes #3182: No attempt to go through simplecache at
+  all, but any language can be exported to js now without any extra effort on
+  the part of language pack authors 
+
+  	* js/lib/elgglib.js, js/lib/languages.js, views/default/js/elgg.php,
+  views/default/js/initialize_elgg.php: Refs #3182: Feeding language loading
+  through /ajax/view to keep thing simpler for now.  Reorganized boot process
+  so that we can ajax load the languages asap 
+
+  	* views/default/css/elements/buttons.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/core.php, views/default/css/elements/grid.php,
+  views/default/css/elements/helpers.php, views/default/css/elements/icons.php,
+  views/default/css/elements/layout.php,
+  views/default/css/elements/navigation.php, views/default/css/elgg.php: Refs
+  #3281: css/elements/core.php for the cross-browser/hacky/non-trivial things
+  that themes should rarely, if ever, override. 
+
+2011-04-09  Brett Profitt <brett.profitt@gmail.com>
+
+  	* engine/lib/annotations.php, engine/lib/metastrings.php: Running
+  egef_annotation_calculation() through elgg_get_annotations() instead of
+  elgg_get_entities().
+
+2011-04-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* ....8_svn-admins_like_widgets-7f19d2783c1680d3.php: Reopens #3224 not as
+  clever as I thought - user experiences error before seeing reminder  
+
+  	* mod/bookmarks/languages/en.php, mod/bookmarks/start.php: registered
+  bookmarks widget  
+
+  	* views/default/css/admin.php: fixed delete icon in admin css  
+
+  	* actions/widgets/upgrade.php,
+  ...svn-update_default_widgets-7daf5a459720d06d.php, engine/lib/widgets.php,
+  languages/en.php, views/default/admin/appearance/default_widgets.php: Fixes
+  #3193 moves default widgets upgrade to an action  
+
+  	* engine/lib/upgrades/2011010101.php,
+  ....8_svn-admins_like_widgets-7f19d2783c1680d3.php: Fixes #3224 Fixes #3241
+  stopping upgrade after plugin upgrade and restarting  
+
+2011-04-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/entity_getter_functions.php: Fixes #2600. Applied
+  Hellekin's patch. Props to him for understanding what was going on because
+  whoa.  
+
+  	* mod/twitter_api/lib/twitter_api.php: Removing odd ? after docblock in
+  twitter_api.  
+
+2011-04-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrade.php: Refs #3241 sorting upgrades so that upgrades from
+  old upgrade system are ordered in datalist array  
+
+  	* ..._svn-goodbye_walled_garden-083121a656d06894.php: Refs #3241 deleting
+  old config value in registration upgrade  
+
+  	* engine/lib/upgrade.php, engine/lib/upgrades/2010050701.php,
+  ..._svn-goodbye_walled_garden-083121a656d06894.php: Refs #3241 cleaned up
+  upgrade sequence so that we don't need special catch for that one upgrade
+  created during 1.7 development. It doesn't hurt running it twice so sites
+  currently using svn trunk will not be negatively affected.  
+
+  	* engine/lib/upgrades/2010123101.php, engine/lib/upgrades/2011010401.php:
+  Refs #3241 moved the default site access check upgrade script to before the
+  plugin upgrade so plugin upgrade is last upgrade in old upgrade system. The
+  site access script can be run multiple times without causing problems.  
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/upgrade.php,
+  engine/lib/version.php, engine/start.php, install/ElggInstaller.php: Refs
+  #3241 upgrade.php is a much better name for the upgrade library  
+
+  	* engine/lib/upgrades/2008100701.php, engine/lib/upgrades/2009022701.php,
+  engine/lib/upgrades/2009041701.php, engine/lib/upgrades/2009070101.php,
+  engine/lib/upgrades/2009102801.php, engine/lib/upgrades/2010033101.php,
+  engine/lib/upgrades/2010040201.php, engine/lib/upgrades/2010061501.php: Refs
+  #3241 cleaned up comments on upgrades and removed the turning off of time
+  limit in individual upgrades since this is now handled by the upgrade
+  function  
+
+  	* ...11031400-1.8_svn-oauth_api-8f33ee79c3e66222.php: Refs #3241 we never
+  distributed an oauth_lib plugin so we don't need an upgrade (those following
+  svn trunk have already upgraded or can manually update this)  
+
+  	* engine/lib/upgrades/2010100500.php: Refs #3241 we never distributed a
+  plugin called oauth and Justin Richer has so let's not disable his plugin  
+
+  	* ....8_svn-admins_like_widgets-7f19d2783c1680d3.php: added a comment to
+  explain why the call to elgg_add_admin_widgets() in the upgrade script has
+  parameters like it does  
+
+2011-04-09  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/chrome.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/helpers.php,
+  views/default/css/elements/typography.php, views/default/css/elgg.php: Refs
+  #3286: Removed css/elements/chrome.php, putting all the style rules into
+  sensible locations 
+
+2011-04-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/sidebar_alt.php,
+  views/default/page/layouts/two_sidebar.php: Fixes #3319 alternate sidebar
+  should work now  
+
+  	* _graphics/admin_sprites.png, views/default/css/admin.php: Refs #3108
+  forgot the user hover menu for the admin area  
+
+  	* engine/lib/upgrades/2010121401.php: Fixes #3320 no longer require the
+  upgrade to disable the members plugin  
+
+2011-04-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: Fixes #3232 removed unnecessary distinct plus
+  variable in select for metastrings calculation  
+
+2011-04-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Refs #3278. No more likes in login popup handler.  
+
+2011-04-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/admin_sprites.png, .../admin/appearance/profile_fields/list.php,
+  views/default/css/admin.php: Fixes #3108 added admin sprites (enough for beta
+  release)  
+
+2011-04-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Fixes #3278 Login popup aligned to right side of button.  
+
+2011-04-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/SPRITES_LICENSE.TXT, _graphics/elgg_sprites.png,
+  mod/messages/views/default/messages/css.php,
+  mod/search/views/default/search/css.php,
+  views/default/css/elements/icons.php: Refs #3108 added more sprites and a
+  license file - no visible changes  
+
+2011-04-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_sprites.png, engine/lib/views.php, mod/bookmarks/start.php,
+  mod/bookmarks/views/default/object/bookmarks.php, mod/messages/start.php,
+  views/default/css/elements/helpers.php, views/default/css/elements/icons.php,
+  views/default/river/relationship/friend/create.php: Refs #3108 frontend
+  should be done and ready for review - admin area is next  
+
+  	* engine/lib/deprecated-1.7.php, engine/lib/objects.php,
+  engine/lib/users.php: moved two more deprecated functions out of the main
+  libs  
+
+2011-04-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/buttons.php: Fixes
+  #3289 added inline-block to buttons  
+
+  	* mod/groups/languages/en.php, mod/groups/start.php,
+  .../river/object/groupforumtopic/create.php,
+  views/default/css/elements/components.php,
+  views/default/river/elements/footer.php: Fixes #3275 forms in a river item
+  are not forced to be hidden  
+
+2011-04-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/favicon.ico, mod/reportedcontent/graphics/icon_reportthis.gif:
+  Refs #3307 removed executable prop from core files  
+
+  	* engine/lib/navigation.php, languages/en.php, mod/likes/start.php,
+  views/default/css/elements/navigation.php,
+  views/default/river/elements/body.php,
+  views/default/river/elements/controls.php, views/default/river/item.php: Refs
+  #3073 first version of horizontal river menu. css still needs work for likes
+  and the comment text bubble needs to be darkened  
+
+  	* mod/externalpages/start.php, mod/reportedcontent/start.php,
+  views/default/css/elements/navigation.php: Fixes #3305 switched default and
+  alt sections for footer menu  
+
+  	* _graphics/elgg_sprites.png, engine/lib/users.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/css/elements/chrome.php, views/default/css/elements/icons.php,
+  views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php,
+  views/default/object/widget/elements/controls.php: Refs #3108 fixed widgets
+  for main site (not admin) and tweaked topbar  
+
+2011-04-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/pages/file/world.php: removed unnecessary context setting  
+
+  	* .../views/default/groups/group_sort_menu.php: Fixes #3105 group sort menu
+  uses filter menu  
+
+  	* engine/lib/navigation.php, languages/en.php: better title attributes for
+  entity menu edit/delete links  
+
+  	* views/default/output/confirmlink.php: output/confirmlink now supports
+  title attribute  
+
+  	* views/default/output/access.php: cleaned up css for output/access  
+
+  	* mod/blog/start.php: Refs #3184 added span so that blog post status would
+  be vertically aligned  
+
+  	* _graphics/elgg_sprites.png, engine/lib/users.php,
+  views/default/css/elements/icons.php,
+  views/default/css/elements/navigation.php: Refs #3108 partial implementation
+  of new sprites (widgets, hover menu, search are all broken)  
+
+  	* mod/likes/languages/en.php, mod/likes/views/default/likes/display.php:
+  cleans up likes display which was causing issues in entity menu - less markup
+   
+
+  	* views/default/css/elements/navigation.php: Refs #3184 needed to set height
+  for the icons  
+
+  	* views/default/css/elements/navigation.php: Fixes #3184 fixed alignment
+  issues for entity menu  
+
+  	* views/default/css/elements/navigation.php: added spaces to standardize the
+  css statements  
+
+2011-04-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/pages/search/index.php,
+  mod/search/views/default/search/search_box.php: Refs #3179 pulled fix for
+  search query encoding into trunk from 1.7 branch  
+
+  	* engine/lib/elgglib.php: Refs #3149 reimplemented fix for calling a handler
+  more than once in trunk  
+
+  	* .../views/default/uservalidationbyemail/js.php: Refs #3001 made comment
+  change in trunk from 1.7 fix  
+
+  	* mod/search/search_hooks.php: Refs #2994 added group search fix from 1.7
+  branch to trunk  
+
+  	* engine/classes/ElggRelationship.php: Refs #2988 corrected typo in trunk  
+
+  	* mod/invitefriends/start.php: Refs #2968 invite friends link should not be
+  available for non-logged in users  
+
+  	* engine/lib/extender.php: Refs #2878 fixes detect_extender_valuetype() in
+  trunk  
+
+  	* documentation/examples/crontab.example: updated crontab example
+  documentation  
+
+  	* engine/lib/entities.php: Refs #3277 merged fix for recursive delete and
+  disabled entities into trunk  
+
+  	* mod/groups/start.php, mod/groups/views/default/groups/side_menu.php: Fixes
+  #3104 updated groups plugin to use new menu system for sidebar  
+
+  	* mod/groups/lib/groups.php,
+  mod/groups/views/default/groups/profile/layout.php: moved group profile
+  layout out of page handler so that plugins can override it  
+
+  	* engine/classes/ElggEntity.php, engine/lib/entities.php,
+  mod/blog/actions/blog/save.php: Fixes #3208 setting time_created on update  
+
+  	* actions/admin/plugins/activate.php: Refs #3229 at least we can forward so
+  that user sees error message immediately  
+
+  	* actions/register.php, views/default/forms/register.php: Refs #3233
+  registration form should be sticky too  
+
+  	* actions/useradd.php, views/default/forms/useradd.php: Fixes #3233 useradd
+  form is now sticky  
+
+  	* engine/classes/ElggPluginManifest.php: Fixes #3244 fixed variable name in
+  ElggPluginManifest  
+
+  	* .../views/default/theme_preview/widgets.php: fixed typo in theme preview -
+  widgets  
+
+2011-04-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/hooks.js: Returning false in JS hooks is now sent through to the
+  calling trigger. Null still returns the original value.  
+
+  	* js/lib/elgglib.js, js/lib/ui.js: Refs #3098. Changed elgg.getUrlFragment
+  to elgg.getSelectorFromUrlFragment to allow for better selectors.  
+
+2011-04-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, languages/en.php, mod/members/languages/en.php,
+  mod/members/manifest.xml, mod/members/pages/members/index.php,
+  mod/members/pages/members/search.php, mod/members/start.php,
+  mod/members/views/default/members/nav.php,
+  mod/members/views/default/members/sidebar.php, pages/members/index.php,
+  pages/members/search.php, views/default/core/members/nav.php,
+  views/default/core/members/sidebar.php: Fixes #3231 welcome back, members
+  plugin  
+
+  	* engine/classes/ElggMenuItem.php: Refs #3287 setting null for menu href
+  means you want an empty <a></a> tag with no href  
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/navigation.php: Fixes #3287
+  added documentation on non-link menu items  
+
+  	* engine/lib/metastrings.php: Refs #3245 pulling in
+  https://github.com/Elgg/Elgg/pull/11 and thanks also to gprasanth  
+
+  	* views/default/user/default.php: fixed hardcoded string in user/default
+  view  
+
+  	* mod/thewire/views/default/object/thewire.php: Refs #3200 any time a wire
+  post is displayed, we may need the 'previous' javascript  
+
+  	* mod/thewire/languages/en.php: added notification messages to the wire  
+
+  	* mod/bookmarks/start.php: Fixes #3044 removed bookmark link from user hover
+  menu  
+
+  	* engine/lib/users.php, views/default/forms/user/passwordreset.php: Fixes
+  #3207 passing code variable to form for password reset  
+
+2011-03-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Refs #2940 added php settings comments into trunk  
+
+2011-03-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Fixed ajax status for elgg.action().  
+
+2011-03-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/js/thewire.js, mod/thewire/languages/en.php,
+  mod/thewire/start.php, mod/thewire/views/default/js/thewire.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/previous.php: Fixes #3200 ajax-based view
+  previous link works for the wire  
+
+  	* mod/thewire/pages/thewire/previous.php: Refs #3200 pulling in
+  e1d75071737b2ed35cf9 from anirupdutta's pull request  
+
+2011-03-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, js/lib/ajax.js: Fixed auto-display of system
+  errors in ajax actions. Fixed docs for system_messages(). Blech...that needs
+  cleaned up.  
+
+2011-03-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/user_settings.php, mod/notifications/groups.php,
+  mod/notifications/index.php, .../forms/notificationsettings/groupsave.php,
+  .../notifications/subscriptions/forminternals.php: Fixes #3266 let the
+  settings pages have breadcrumbs  
+
+  	* views/default/page/layouts/content.php,
+  views/default/page/layouts/one_sidebar.php: one_sidebar layout wants
+  breadcrumbs, too!  
+
+  	* views/default/css/elements/chrome.php: fixed some typos in css chrome  
+
+2011-03-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Fixes #3234: Adding explicit collision param for popups.  
+
+2011-03-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/lib/groups.php,
+  mod/groups/start.php, mod/groups/views/default/groups/sidebar/find.php: Fixes
+  #3243 pulled in anirupdutta's patch with some modifications (moved tag search
+  to its own page handler function)  
+
+2011-03-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/css.php: made search box span sidebar in
+  default theme  
+
+2011-03-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php: Fixing css/elgg instead of css/screen.  
+
+2011-03-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, languages/en.php: Fixes #2591 removing newlines
+  in queries - thanks to Tachyon  
+
+  	* engine/lib/views.php: Refs #3085 updated elgg_view_annotation() to use
+  $vars array  
+
+  	* engine/lib/views.php: Refs #3085 added $vars array to
+  elgg_view_river_item()  
+
+  	* engine/lib/users.php, engine/lib/views.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/object/file.php, mod/groups/lib/groups.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  .../views/default/annotation/messageboard.php,
+  mod/messages/views/default/object/messages.php,
+  mod/pages/pages/pages/revision.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/annotation/generic_comment.php,
+  views/default/object/plugin.php, views/default/page/components/gallery.php,
+  views/default/page/components/list.php, views/json/entities/entity_list.php:
+  Fixes #3086 using full_view instead of full  
+
+  	* engine/lib/views.php: Refs #3086 adds backward compatibility code in
+  elgg_view() for full_view vs full  
+
+  	* mod/blog/views/default/blog/sidebar.php: Fixes #2969 turned off group blog
+  archives  
+
+2011-03-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/configuration.php,
+  mod/diagnostics/start.php, mod/profile/start.php: Fixes #3250
+  elgg_get_root_path() to be consistent  
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  engine/lib/actions.php: Fixes #3249 fixed name of actions exists function  
+
+  	* mod/messages/languages/en.php,
+  .../views/default/forms/messages/process.php,
+  mod/messages/views/default/messages/css.php: forcing a min-height on inbox
+  list in messages plugin  
+
+  	* views/default/css/admin.php, views/default/css/elements/layout.php: Fixes
+  #3084 added clearfix to elgg-layout  
+
+  	* views/default/css/elements/chrome.php: Fixes #3183 limiting size of user
+  inserted images in content  
+
+  	* mod/externalpages/languages/en.php, mod/externalpages/start.php,
+  .../views/default/admin/appearance/expages.php,
+  .../views/default/admin/site/expages.php,
+  mod/externalpages/views/default/expages/menu.php: Fixes #3106 putting
+  external pages under appearance - no better place  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/lib/navigation.php,
+  engine/lib/views.php: Fixes #3026 documentation for menu system  
+
+  	* engine/lib/admin.php: Fixes #2233 added documentation on admin menus and
+  pages  
+
+  	* engine/lib/deprecated-1.8.php: Refs #3248 deprecates remove_submenu_item()
+   
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggMetadata.php,
+  engine/lib/annotations.php: Refs #3238 #3246 anootations needed the same
+  fixes as metadata  
+
+  	* engine/lib/metadata.php: Refs #3238 fix for updating name of metadata for
+  trunk  
+
+  	* engine/classes/ElggMetadata.php: Fixes #3246 fixed ElggMetadata()
+  constructor  
+
+  	* engine/lib/pageowner.php: fixed notice in get_context() when no context is
+  set  
+
+  	* engine/lib/output.php, engine/lib/users.php, engine/lib/views.php,
+  engine/lib/widgets.php: some light standardization of the core libraries  
+
+2011-03-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Fixes #3234, refs #3094. Added the inTarget code back to the
+  popup closing function.  
+
+2011-03-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php, mod/thewire/actions/delete.php,
+  mod/thewire/classes/ElggWire.php, mod/thewire/languages/en.php,
+  mod/thewire/pages/thewire/everyone.php,
+  mod/thewire/pages/thewire/friends.php, mod/thewire/pages/thewire/owner.php,
+  mod/thewire/pages/thewire/reply.php, mod/thewire/pages/thewire/thread.php,
+  mod/thewire/start.php, mod/thewire/tests/regex.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/thewire/profile_status.php,
+  mod/thewire/views/rss/object/thewire.php: standardized thewire plugin  
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/tests/api/annotations.php, engine/tests/api/metadata.php,
+  engine/tests/objects/metadata.php: Closes #3202 'count' already supported,
+  added unit tests  
+
+  	* mod/bookmarks/lib/bookmarks.php,
+  .../views/default/forms/bookmarks/save.php, mod/file/lib/file.php,
+  mod/groups/lib/discussion.php, mod/pages/lib/pages.php: Fixes #3239 entities
+  aren't blown away in form prepare functions any more  
+
+  	* mod/pages/languages/en.php: fixed language strings in pages plugin  
+
+  	* mod/file/actions/file/upload.php: don't allow a user to remove a title on
+  a file, must replace with another title  
+
+  	* engine/lib/input.php, mod/blog/lib/blog.php: Refs #3239 added a new sticky
+  forms function to grab all variables and integrated into blog plugin  
+
+2011-03-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/reset.php: Refs
+  #2979 forces vertical scrollbar without breaking widget dragging  
+
+  	* engine/lib/navigation.php: Refs #3119 if only one item left, move it off
+  more menu (but only when nothing selected)  
+
+  	* actions/admin/menu/save.php, views/default/forms/admin/menu/save.php:
+  Fixes #3206 using space so that echo('none') is not passed as value  
+
+  	* views/default/css/admin.php: Refs #3236 removed some unused css from admin
+  theme and did some reorganizing  
+
+2011-03-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/languages/en.php: added missing language string for comments on
+  file in river  
+
+  	* engine/lib/views.php: Fixes #3166 registering css/elgg for simplecache  
+
+2011-03-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Refs #3193 rollback version number  
+
+  	* upgrade.php: display_errors is on for upgrades  
+
+  	* ...svn-update_default_widgets-7daf5a459720d06d.php, version.php: Fixes
+  #3193 converts the default widgets for 1.8 - leaves behind the default
+  widgets object  
+
+  	* engine/lib/admin.php, views/default/css/admin.php: Refs #3165 floating
+  admin widgets in same direction as profile widgets  
+
+  	* ....8_svn-admins_like_widgets-7f19d2783c1680d3.php, version.php: Fixes
+  #3165 admins get widgets on upgrade - new upgrade creation process super
+  smooth #thanksBrett  
+
+  	* engine/lib/admin.php, engine/lib/users.php, install/ElggInstaller.php:
+  Refs #3165 new admin users all get admin widgets  
+
+  	* engine/classes/ElggFile.php: Fixes #3160 just needed a small variation off
+  of [8762] to handle getting filestore before metadata is set but after the
+  guid is set  
+
+  	* engine/classes/ElggFile.php: Fixes #3205 reverting [8762]  
+
+  	* engine/lib/elgglib.php: Fixes #3180 adds ajax page handler  
+
+  	* mod/bookmarks/start.php, mod/thewire/start.php: added an owner block link
+  for the wire plugin  
+
+  	* languages/en.php, mod/blog/languages/en.php, mod/blog/lib/blog.php,
+  mod/bookmarks/pages/bookmarks/all.php, mod/bookmarks/start.php,
+  mod/file/pages/file/owner.php, mod/groups/languages/en.php,
+  mod/pages/languages/en.php, views/default/page/layouts/content/header.php:
+  Fixes #3218 group content pages now use container method to determine who can
+  add content  
+
+2011-03-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/pages/views/default/forms/pages/edit.php: fixed position of longtext
+  menu when editing pages  
+
+  	* mod/bookmarks/languages/en.php: better names for a bookmark - got rid of
+  'bookmark item'  
+
+  	* mod/bookmarks/views/default/bookmarks/sidebar.php,
+  mod/file/views/default/file/sidebar.php,
+  mod/pages/views/default/pages/sidebar.php,
+  mod/thewire/pages/thewire/everyone.php, mod/thewire/pages/thewire/owner.php,
+  mod/thewire/views/default/thewire/sidebar.php: Fixes #2091 completes sidebar
+  tagcloud for major content plugins  
+
+  	* engine/lib/tags.php, mod/blog/views/default/blog/sidebar.php,
+  mod/blog/views/default/blog/sidebar/tagcloud.php,
+  views/default/output/tagcloud.php,
+  views/default/page/elements/tagcloud_block.php: Refs #2091 added a tagcloud
+  block that accepts subtype  
+
+  	* views/default/page/elements/comments_block.php: Fixes #2090 context
+  sensitive sidebar box is added - groups off  
+
+  	* mod/bookmarks/views/default/bookmarks/js.php,
+  mod/groups/views/default/groups/js.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  mod/messages/views/default/messages/js.php,
+  .../views/default/uservalidationbyemail/js.php: Refs #3016 making the final
+  elgg.js more readable  
+
+  	* .../views/default/uservalidationbyemail/js.php: another example of an
+  extra ; in js due to lazy copy/paste jobs  
+
+  	* mod/file/pages/file/owner.php, mod/file/pages/file/world.php,
+  mod/file/views/default/file/sidebar.php, mod/pages/pages/pages/owner.php,
+  mod/pages/pages/pages/world.php, mod/pages/views/default/pages/sidebar.php,
+  views/default/page/elements/comments_block.php: Refs #2090 added sidebar
+  comment block to file and pages plugins  
+
+  	* mod/file/start.php, mod/pages/start.php: Refs #3176 missed group owner
+  page in script renaming  
+
+2011-03-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, vendors/jquery/fancybox/blank.gif,
+  vendors/jquery/fancybox/fancy_close.png,
+  vendors/jquery/fancybox/fancy_loading.png,
+  vendors/jquery/fancybox/fancy_nav_left.png,
+  vendors/jquery/fancybox/fancy_nav_right.png,
+  vendors/jquery/fancybox/fancy_shadow_e.png,
+  vendors/jquery/fancybox/fancy_shadow_n.png,
+  vendors/jquery/fancybox/fancy_shadow_ne.png,
+  vendors/jquery/fancybox/fancy_shadow_nw.png,
+  vendors/jquery/fancybox/fancy_shadow_s.png,
+  vendors/jquery/fancybox/fancy_shadow_se.png,
+  vendors/jquery/fancybox/fancy_shadow_sw.png,
+  vendors/jquery/fancybox/fancy_shadow_w.png,
+  vendors/jquery/fancybox/fancy_title_left.png,
+  vendors/jquery/fancybox/fancy_title_main.png,
+  vendors/jquery/fancybox/fancy_title_over.png,
+  vendors/jquery/fancybox/fancy_title_right.png,
+  vendors/jquery/fancybox/fancybox-x.png,
+  vendors/jquery/fancybox/fancybox-y.png, vendors/jquery/fancybox/fancybox.png,
+  vendors/jquery/fancybox/jquery.easing-1.3.pack.js,
+  vendors/jquery/fancybox/jquery.fancybox-1.3.4.css,
+  vendors/jquery/fancybox/jquery.fancybox-1.3.4.js,
+  .../jquery/fancybox/jquery.fancybox-1.3.4.pack.js,
+  .../fancybox/jquery.mousewheel-3.0.4.pack.js, views/default/js/lightbox.php:
+  Refs #2882 basic lightbox  
+
+2011-03-21  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: No need to document NULL as possible return value
+  here 
+
+  	* engine/classes/ElggEntity.php: oof -- how did that happen? 
+
+  	* engine/classes/ElggEntity.php: Added documentation of magic properties to
+  ElggEntity 
+
+2011-03-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/views/default/logbrowser/table.php: using - in log browser
+  css class names  
+
+  	* mod/bookmarks/languages/en.php: added missing language string  
+
+  	* mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/owner.php,
+  mod/bookmarks/views/default/bookmarks/sidebar.php: Refs #2090 added latest
+  comments to bookmarks sidebar  
+
+  	* engine/lib/views.php, languages/en.php,
+  mod/blog/views/default/blog/sidebar.php,
+  views/default/page/elements/comments.php,
+  views/default/page/elements/comments_block.php: Refs #2090 removed
+  elgg_view_latest_comments() and replaced it with a page elements view  
+
+  	* mod/groups/lib/groups.php,
+  mod/groups/views/default/groups/profile/fields.php,
+  .../views/default/groups/profile/profile_block.php,
+  .../views/default/groups/profile/summary.php: Fixes #3113 pulled group
+  profile fields out of top profile area  
+
+  	* views/default/admin/appearance/profile_fields.php: Fixes #3099 corrected
+  view name  
+
+  	* mod/logbrowser/views/default/logbrowser/form.php: Fixes #3082 fixed
+  toggler in log browser  
+
+  	* views/default/navigation/menu/user_hover.php: Fixes #3203 not calling the
+  view menu section code once per item  
+
+  	* views/default/page/layouts/widgets.php: Fixes #3168 not displaying a
+  widget when handler is not available  
+
+2011-03-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggObject.php, mod/blog/lib/blog.php,
+  mod/groups/actions/discussion/reply/save.php,
+  mod/groups/actions/discussion/save.php, mod/groups/languages/en.php,
+  mod/groups/lib/discussion.php, mod/groups/start.php,
+  .../river/object/groupforumtopic/create.php: Fixes #2974 using
+  canWriteToContainer() to control access to creating group content  
+
+  	* install/ElggInstaller.php: Fixes #3101 removed language setting from
+  installer until we provide language files besides English  
+
+  	* .../forms/admin/plugins/simple_update_states.php: Fixes #3102 removed
+  plugin reset button  
+
+  	* views/default/forms/admin/site/update_advanced.php: Fixes #3100 removed
+  viewtype from advanced settings  
+
+  	* install/ElggInstaller.php, install/languages/en.php: Fixes #3062 checks if
+  data directory exists  
+
+2011-03-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Fixes #3094. Removed event blocking code for popups.  
+
+  	* ..._svn-widgets_arent_plugins-61836261fa280a5c.php, version.php: Fixes
+  #3161. Added upgrade to update object, widget to ElggWidget.  
+
+2011-03-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, mod/twitter/start.php: Refs #3171 Using correct
+  widget registration method  
+
+2011-03-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/version.php: Fixes #3188. We no longer store the version as the
+  key, so a standard sort will do.  
+
+2011-03-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, pages/river.php, views/rss/core/river/body.php,
+  views/rss/river/item.php, views/rss/river/item/list.php: Fixes #3197 fixed
+  the RSS feed for activity (river)  
+
+  	* views/rss/layout/objects/image_block.php,
+  views/rss/layout/objects/list.php, views/rss/layout/shells/default.php,
+  views/rss/page/components/image_block.php,
+  views/rss/page/components/list.php, views/rss/page/layouts/default.php: Refs
+  #3197 fixed layout views for RSS viewtype  
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/sites.php,
+  engine/lib/users.php, engine/lib/views.php,
+  views/default/page/elements/sidebar.php: Fixes #3114 added the rss link back
+  to pages  
+
+  	* engine/lib/admin.php: Refs #2892 added elgg_get_admins() function - this
+  could eventually be a wrapper around elgg_get_users()  
+
+  	* mod/thewire/start.php: Fixes #3025 added back thewire's entity menu items 
+
+  	* engine/lib/elgglib.php: Fixes #3198 handling exceptions thrown in
+  exception handler by pointing to the error log  
+
+2011-03-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php: Fixes #3192, refs #650.
+  ElggEntity->getMetaData() sets the limit to 0 for array-based metadata.  
+
+  	* engine/lib/deprecated-1.8.php: Fixes #3190. Added elgg_count_comments() to
+  deprecated-1.8.php.  
+
+  	* upgrade.php: Fixes #3064. Can't use the pretty new views to display the
+  can't upgrade messages. Using the failsafe view type.  
+
+2011-03-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* ...031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php: Refs #3188 removed
+  empty call for guid  
+
+  	* languages/en.php: Fixes #3162  
+
+2011-03-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/widgets/friends/content.php,
+  views/default/widgets/new_users/content.php,
+  views/default/widgets/online_users/content.php: added documentation headers
+  to the core widgets  
+
+  	* engine/lib/river.php, languages/en.php,
+  views/default/widgets/river_widget/content.php,
+  views/default/widgets/river_widget/edit.php: Fixes #3171 added river widget
+  using same name as 1.7 riverdashboard plugin  
+
+  	* actions/friends/add.php: Fixes #3167 friending now shows up in river  
+
+  	* mod/twitter/manifest.xml: added "widget" to this plugin's name to
+  descrease confusion with the api plugin  
+
+  	* languages/en.php, mod/profile/views/default/profile/owner_block.php: Fixes
+  #3173 quote was missing from conversion to new toggler pattern  
+
+  	* mod/file/pages/file/index.php, mod/file/pages/file/owner.php,
+  mod/file/start.php, mod/pages/pages/pages/index.php,
+  mod/pages/pages/pages/owner.php, mod/pages/start.php,
+  mod/thewire/pages/thewire/owner.php, mod/thewire/pages/thewire/user.php,
+  mod/thewire/start.php: Fixes #3176 replaced usage of index.php where
+  appropriate  
+
+  	* mod/pages/edit.php, mod/pages/friends.php, mod/pages/history.php,
+  mod/pages/index.php, mod/pages/new.php, mod/pages/pages/pages/edit.php,
+  mod/pages/pages/pages/friends.php, mod/pages/pages/pages/history.php,
+  mod/pages/pages/pages/index.php, mod/pages/pages/pages/new.php,
+  mod/pages/pages/pages/revision.php, mod/pages/pages/pages/view.php,
+  mod/pages/pages/pages/world.php, mod/pages/revision.php, mod/pages/start.php,
+  mod/pages/view.php, mod/pages/world.php, mod/search/index.php,
+  mod/search/pages/search/index.php, mod/search/start.php: Fixes #3158 updated
+  search and pages plugins for page handler scripts  
+
+  	* mod/messages/inbox.php, mod/messages/pages/messages/inbox.php,
+  mod/messages/pages/messages/read.php, mod/messages/pages/messages/send.php,
+  mod/messages/pages/messages/sent.php, mod/messages/read.php,
+  mod/messages/send.php, mod/messages/sent.php, mod/messages/start.php: Refs
+  #3158 update messages plugin  
+
+  	* mod/messageboard/pages/messageboard/owner.php,
+  mod/messageboard/pages/owner.php, mod/messageboard/start.php: Refs #3158
+  Fixes #3170 namespaces messageboard plugin page scripts  
+
+  	* mod/file/edit.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/pages/file/edit.php, mod/file/pages/file/friends.php,
+  mod/file/pages/file/index.php, mod/file/pages/file/search.php,
+  mod/file/pages/file/upload.php, mod/file/pages/file/view.php,
+  mod/file/pages/file/world.php, mod/file/search.php, mod/file/start.php,
+  mod/file/upload.php, mod/file/view.php,
+  mod/file/views/default/file/typecloud.php, mod/file/world.php: Refs #3158
+  namespace file plugin's page scripts  
+
+2011-03-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/forms/register.php: using shorthand for document ready
+  callback 
+
+2011-03-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/start.php: Fixes #3164. Denormalized unread message counting
+  query because it was making things so slow I couldn't test.  
+
+  	* engine/classes/ElggFile.php: Fixes #3160. ElggFile->getFilehandler() is
+  less horrible.  
+
+  	* engine/lib/metastrings.php: Fixing pluralization of singular options for
+  elgg_get_metadata() and elgg_get_annotations().  
+
+2011-03-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/pages/add.php, mod/bookmarks/pages/all.php,
+  mod/bookmarks/pages/bookmarklet.php, mod/bookmarks/pages/bookmarks/add.php,
+  mod/bookmarks/pages/bookmarks/all.php,
+  mod/bookmarks/pages/bookmarks/bookmarklet.php,
+  mod/bookmarks/pages/bookmarks/edit.php,
+  mod/bookmarks/pages/bookmarks/friends.php,
+  mod/bookmarks/pages/bookmarks/owner.php,
+  mod/bookmarks/pages/bookmarks/view.php, mod/bookmarks/pages/edit.php,
+  mod/bookmarks/pages/friends.php, mod/bookmarks/pages/owner.php,
+  mod/bookmarks/pages/view.php, mod/bookmarks/start.php,
+  mod/thewire/pages/everyone.php, mod/thewire/pages/friends.php,
+  mod/thewire/pages/previous.php, mod/thewire/pages/reply.php,
+  mod/thewire/pages/tag.php, mod/thewire/pages/thewire/everyone.php,
+  mod/thewire/pages/thewire/friends.php,
+  mod/thewire/pages/thewire/previous.php, mod/thewire/pages/thewire/reply.php,
+  mod/thewire/pages/thewire/tag.php, mod/thewire/pages/thewire/thread.php,
+  mod/thewire/pages/thewire/user.php, mod/thewire/pages/thread.php,
+  mod/thewire/pages/user.php, mod/thewire/start.php: Refs #3158 namespaced
+  pages for bookmarks and thewire  
+
+2011-03-17  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/forminternals.php: Using shorthand
+  document ready initialization 
+
+  	* mod/embed/views/default/embed/embed.php: Switching click handler to "live"
+
+2011-03-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: fixed typo in welcome widget text  
+
+  	* engine/lib/system_log.php: Refs #3154 adding system log cache bug fix to
+  trunk  
+
+  	* engine/lib/system_log.php: Fixes #3098 catching exceptions when loading an
+  object in system log  
+
+2011-03-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Fixes #3094, Refs #3111. Clicking outside a popup closes the
+  visible popups.  
+
+  	* views/default/css/admin.php: elgg-head is no longer the direct child of
+  elgg-state-draggable. Restoring dragger icon for plugins.  
+
+  	* mod/blog/languages/en.php: Added missing language string.  
+
+  	* install/ElggInstaller.php: Changed order of the default admin widgets.  
+
+  	* engine/lib/cache.php, engine/lib/configuration.php,
+  ...-1.8_svn-datalist_grows_up-0b8aec5a55cc1e1c.php, engine/schema/mysql.sql,
+  version.php: Fixes #3123. Datalists and config names can now be up to 255
+  chars long. Debug mode is disabled when caching views to avoid saving bad
+  stuff.  
+
+  	* mod/likes/start.php: Fixes #3153. Fixed incorrect options.  
+
+  	* views/default/forms/comments/add.php,
+  views/default/river/elements/body.php: Fixes #3130. Fixed river/item/footer
+  -> river/elements/footer for comments.  
+
+  	* mod/twitter_api/lib/twitter_api.php: Fixes #2416. Twitter API pulls in
+  avatars from twitter for new users.  
+
+  	* ...031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php,
+  ...11031400-1.8_svn-oauth_api-8f33ee79c3e66222.php, languages/en.php,
+  mod/oauth_api/manifest.xml, mod/twitter_api/manifest.xml: Fixes #3141.
+  Disabling twitter_api and oauth_api upon upgrade because we can't check
+  previous states. Adding an admin notice. twitter_api conflicts with
+  twitterservice and oauth_api conflicts with oauth_lib.  
+
+  	* views/default/object/admin_notice.php: Refs #2242: Better placement for
+  the delete button for admin notices.  
+
+  	* engine/lib/plugins.php: Fixed a typo that broke ignore access. That was
+  fun to track down >:O  
+
+  	* views/default/object/admin_notice.php: Refs #2242. Removed incorrect
+  option passed to url view.  
+
+  	* actions/admin/delete_admin_notice.php, engine/lib/admin.php,
+  languages/en.php, views/default/css/admin.php, views/default/js/admin.php,
+  views/default/object/admin_notice.php, views/default/page/admin.php: Fixes
+  #2242. Can now delete admin notices manually.  
+
+2011-03-16  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Fixes #3066 moves setting of lastcache value up in boot
+  sequence  
+
+  	* engine/classes/ElggMenuBuilder.php: Fixes #3145 adds a default for menu
+  sort_by  
+
+  	* index.php: Fixes #3144 not using undefined $options variable  
+
+2011-03-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* ...031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php,
+  ...11031400-1.8_svn-oauth_api-8f33ee79c3e66222.php: Fixes #3141. Fixed
+  twitter_api and oauth_api upgrades. Only worked on localhost because of code
+  gnomes.  
+
+2011-03-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* ...11031400-1.8_svn-oauth_api-8f33ee79c3e66222.php: Fixes #3129. Fixed
+  faulty logic that broke upgrades.  
+
+2011-03-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #2814 can now check if an entity exists
+  indepedent of access permissions  
+
+2011-03-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ajax.js, js/lib/configuration.js, js/lib/security.js,
+  languages/en.php, views/default/js/elgg.php: Refs #2538. Loading
+  js/configuration.js again. Only updating tokens on success and showing a
+  basic warning if refresh fails.  
+
+  	* js/lib/languages.js: JS elgg.echo() returns the key if the string isn't
+  found. This is consistent with the PHP version.  
+
+  	* js/classes/ElggPriorityList.js, js/lib/elgglib.js, js/lib/hooks.js,
+  js/lib/languages.js, js/lib/prototypes.js, js/lib/security.js,
+  js/lib/session.js, js/lib/ui.js, js/lib/userpicker.js: Refs #2538: Added
+  documentation to most of the JS methods missing it.  
+
+  	* mod/oauth_api/manifest.xml, mod/oauth_api/start.php,
+  mod/oauth_api/vendors/oauth/LICENSE,
+  mod/oauth_api/vendors/oauth/example/server/INSTALL,
+  .../vendors/oauth/example/server/core/init.php,
+  .../example/server/core/templates/inc/footer.tpl,
+  .../example/server/core/templates/inc/header.tpl,
+  .../oauth/example/server/core/templates/index.tpl,
+  .../oauth/example/server/core/templates/logon.tpl,
+  .../example/server/core/templates/register.tpl,
+  .../vendors/oauth/example/server/www/hello.php,
+  .../vendors/oauth/example/server/www/index.php,
+  .../vendors/oauth/example/server/www/logon.php,
+  .../vendors/oauth/example/server/www/oauth.php,
+  .../vendors/oauth/example/server/www/register.php,
+  .../oauth/example/server/www/services.xrds.php,
+  .../vendors/oauth/library/OAuthDiscovery.php,
+  .../vendors/oauth/library/OAuthException.php,
+  .../vendors/oauth/library/OAuthRequest.php,
+  .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  .../vendors/oauth/library/OAuthRequester.php,
+  .../vendors/oauth/library/OAuthServer.php,
+  mod/oauth_api/vendors/oauth/library/OAuthStore.php,
+  .../library/body/OAuthBodyContentDisposition.php,
+  .../library/body/OAuthBodyMultipartFormdata.php,
+  .../vendors/oauth/library/discovery/xrds_parse.php,
+  .../vendors/oauth/library/discovery/xrds_parse.txt,
+  .../OAuthSignatureMethod.class.php, .../OAuthSignatureMethod_HMAC_SHA1.php,
+  .../signature_method/OAuthSignatureMethod_MD5.php,
+  .../OAuthSignatureMethod_PLAINTEXT.php,
+  .../OAuthSignatureMethod_RSA_SHA1.php,
+  .../library/store/OAuthStoreAbstract.class.php,
+  .../oauth/library/store/OAuthStoreAnyMeta.php,
+  .../oauth/library/store/OAuthStoreMySQL.php,
+  .../vendors/oauth/library/store/mysql/install.php,
+  .../vendors/oauth/library/store/mysql/mysql.sql,
+  .../oauth/test/discovery/xrds-fireeagle.xrds,
+  .../oauth/test/discovery/xrds-getsatisfaction.xrds,
+  .../oauth/test/discovery/xrds-magnolia.xrds,
+  mod/oauth_api/vendors/oauth/test/oauth_test.php, mod/oauth_lib/manifest.xml,
+  mod/oauth_lib/start.php, mod/oauth_lib/vendors/oauth/LICENSE,
+  mod/oauth_lib/vendors/oauth/example/server/INSTALL,
+  .../vendors/oauth/example/server/core/init.php,
+  .../example/server/core/templates/inc/footer.tpl,
+  .../example/server/core/templates/inc/header.tpl,
+  .../oauth/example/server/core/templates/index.tpl,
+  .../oauth/example/server/core/templates/logon.tpl,
+  .../example/server/core/templates/register.tpl,
+  .../vendors/oauth/example/server/www/hello.php,
+  .../vendors/oauth/example/server/www/index.php,
+  .../vendors/oauth/example/server/www/logon.php,
+  .../vendors/oauth/example/server/www/oauth.php,
+  .../vendors/oauth/example/server/www/register.php,
+  .../oauth/example/server/www/services.xrds.php,
+  .../vendors/oauth/library/OAuthDiscovery.php,
+  .../vendors/oauth/library/OAuthException.php,
+  .../vendors/oauth/library/OAuthRequest.php,
+  .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  .../vendors/oauth/library/OAuthRequester.php,
+  .../vendors/oauth/library/OAuthServer.php,
+  mod/oauth_lib/vendors/oauth/library/OAuthStore.php,
+  .../library/body/OAuthBodyContentDisposition.php,
+  .../library/body/OAuthBodyMultipartFormdata.php,
+  .../vendors/oauth/library/discovery/xrds_parse.php,
+  .../vendors/oauth/library/discovery/xrds_parse.txt,
+  .../OAuthSignatureMethod.class.php, .../OAuthSignatureMethod_HMAC_SHA1.php,
+  .../signature_method/OAuthSignatureMethod_MD5.php,
+  .../OAuthSignatureMethod_PLAINTEXT.php,
+  .../OAuthSignatureMethod_RSA_SHA1.php,
+  .../library/store/OAuthStoreAbstract.class.php,
+  .../oauth/library/store/OAuthStoreAnyMeta.php,
+  .../oauth/library/store/OAuthStoreMySQL.php,
+  .../vendors/oauth/library/store/mysql/install.php,
+  .../vendors/oauth/library/store/mysql/mysql.sql,
+  .../oauth/test/discovery/xrds-fireeagle.xrds,
+  .../oauth/test/discovery/xrds-getsatisfaction.xrds,
+  .../oauth/test/discovery/xrds-magnolia.xrds,
+  mod/oauth_lib/vendors/oauth/test/oauth_test.php,
+  mod/twitter_api/manifest.xml: Refs #3115. Moved oauth_lib to oauth_api.  
+
+  	* engine/lib/version.php: Refs #1433. Restored db_upgrade() call during
+  upgrades to fix issues for people upgrading from earlier versions of 1.7 than
+  2010062401. This is why we should follow deprecation policies, Brett........ 
+
+2011-03-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php, mod/developers/manifest.xml,
+  mod/developers/start.php, .../views/default/admin/developers/settings.php,
+  .../views/default/forms/developers/settings.php: Fixes #3009 a bare bones
+  developer tools settings  
+
+2011-03-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/js/embed.js, mod/embed/start.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/embed/lightbox_init.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/file/views/default/file/embed_upload.php, mod/groups/start.php,
+  mod/groups/views/default/groups/js.php,
+  .../views/default/groups/profile/widgets.php, mod/messages/start.php,
+  .../views/default/forms/messages/process.php,
+  .../views/default/forms/messages/reply.php,
+  mod/messages/views/default/messages/js.php, mod/profile/start.php,
+  mod/profile/views/default/profile/js.php,
+  mod/profile/views/default/profile/wrapper.php, mod/thewire/start.php,
+  mod/thewire/views/default/forms/thewire/add.php,
+  views/default/css/elements/buttons.php: Refs #3016: Removes inline javascript
+  from embed, file, groups, messages, profile, thewire 
+
+  	* views/default/css/admin.php, views/default/css/elements/icons.php,
+  views/default/css/elements/modules.php,
+  views/default/object/widget/elements/controls.php: Refs #3112: Pulled out
+  widget gear icon into elgg-icon-gear, which widgets now use 
+
+2011-03-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginPackage.php,
+  languages/en.php, views/default/admin/plugins/advanced.php,
+  views/default/object/plugin/invalid.php: Fixes #2928: Invalid plugins are
+  shown on the advance page with details about the problem and a link to the
+  docs.  
+
+2011-03-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/layout.php: Refs
+  #3109: Fixes 3 more instances of background-color being used when background
+  should be 
+
+  	* .../views/default/theme_preview/navigation.php,
+  mod/embed/views/default/embed/css.php,
+  mod/search/views/default/search/css.php,
+  mod/thewire/views/default/thewire/css.php, views/default/css/admin.php,
+  views/default/css/elements/buttons.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/forms.php, views/default/css/elements/icons.php,
+  views/default/css/elements/layout.php, views/default/css/elements/misc.php,
+  views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php: Refs #3109: More CSS cleanup. 
+  Fixes bugs introduced by last cleanup where background-color: was being used
+  instead of background: 
+
+2011-03-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, engine/lib/plugins.php: Refs #3079: Making
+  sure elgg_get_max_plugin_priority() returns 1 instead. Fixed problems when
+  bootstrapping elgg plugins. Will perform tests against MySQL 5.5 when I have
+  a real internet connection.  
+
+2011-03-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CODING.txt: Using tabs instead of spaces to indent lines in CODING.txt 
+
+  	* install/css/install.css, .../views/default/custom_index/css.php,
+  mod/embed/views/default/embed/css.php,
+  mod/groups/views/default/groups/css.php,
+  mod/messages/views/default/messages/css.php,
+  mod/profile/views/default/profile/css.php,
+  .../views/default/reportedcontent/admin_css.php,
+  mod/search/views/default/search/css.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  mod/twitter/views/default/twitter/css.php, views/default/css/admin.php,
+  views/default/css/elements/buttons.php,
+  views/default/css/elements/chrome.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/forms.php, views/default/css/elements/icons.php,
+  views/default/css/elements/misc.php, views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php: Fixes #3109: added
+  non-vendor-prefixed css property declarations where applicable.  Cleaned up
+  various other aspects of the css 
+
+  	* engine/handlers/page_handler.php: Fixes #3080: Move redirect code to
+  before engine inclusion 
+
+2011-03-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixes #3121 array_filter() passes array elements
+  to callback  
+
+2011-03-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/menu/page.php: Fixes #3103. Re-added code
+  accidentally removed in r8611 that broke page menu selected items.  
+
+  	* ...031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php,
+  mod/twitter_api/graphics/sign_in_with_twitter.gif,
+  mod/twitter_api/languages/en.php, mod/twitter_api/lib/twitter_api.php,
+  mod/twitter_api/manifest.xml, mod/twitter_api/start.php,
+  mod/twitter_api/vendors/twitteroauth/LICENSE,
+  mod/twitter_api/vendors/twitteroauth/OAuth.php,
+  mod/twitter_api/vendors/twitteroauth/README,
+  .../vendors/twitteroauth/twitterOAuth.php,
+  .../views/default/settings/twitter_api/edit.php,
+  mod/twitter_api/views/default/twitter_api/css.php,
+  .../views/default/twitter_api/login.php,
+  .../views/default/twitter_api/metatags.php,
+  .../default/usersettings/twitter_api/edit.php,
+  .../graphics/sign_in_with_twitter.gif, mod/twitterservice/languages/en.php,
+  mod/twitterservice/manifest.xml, mod/twitterservice/start.php,
+  mod/twitterservice/twitterservice_lib.php,
+  mod/twitterservice/vendors/twitteroauth/LICENSE,
+  mod/twitterservice/vendors/twitteroauth/OAuth.php,
+  mod/twitterservice/vendors/twitteroauth/README,
+  .../vendors/twitteroauth/twitterOAuth.php,
+  .../views/default/settings/twitterservice/edit.php,
+  .../views/default/twitterservice/css.php,
+  .../views/default/twitterservice/login.php,
+  .../views/default/twitterservice/metatags.php,
+  .../default/usersettings/twitterservice/edit.php, version.php: Refs #3115.
+  Migrated twitterservice to twitter_api. Added upgrade to migrate plugin and
+  user settings.  
+
+2011-03-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/start.php: fixed WSOD because of function name change when
+  using some 1.7 themes  
+
+  	* engine/lib/views.php: Refs #3059 should only fallback to 1.7 pageshell
+  when asking for default page shell - otherwise breaks admin area  
+
+  	* engine/lib/deprecated-1.8.php: Fixes #3116 old method of getting site menu
+  works again  
+
+  	* engine/handlers/page_handler.php: Refs #2228 reverting [8654] so
+  forwarding works  
+
+  	* languages/en.php: Reverted changes made for elgg.com on Tools menu  
+
+2011-03-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php: Refs #3079: Better checks in
+  ElggPlugin::setPriority() to avoid priorities of 0. Still requires testing
+  for MySQL 5.5.  
+
+  	* languages/en.php: Refs #3009. Fixed a few typos and inaccuracies in the
+  welcome widget.  
+
+2011-03-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/likes/views/default/likes/display.php: tweaked an id so that the likes
+  html would be valid  
+
+  	* views/default/page/elements/footer.php: how did that get there - removing
+  some test code  
+
+  	* js/lib/ui.js: Fixes #3110 - checking selector before running date picker
+  js  
+
+  	* .../views/default/admin/utilities/diagnostics.php,
+  .../views/default/diagnostics/forms/download.php: wrapped the submit button
+  in diagnostics plugin with a <p> so the bottom doesn't get cut off  
+
+  	* languages/en.php: Refs #2991 restored plugin settings language string
+  needed for page title  
+
+  	* languages/en.php: fixed typo in site settings  
+
+  	* .../views/default/groups/sidebar/members.php: Fixes #3072 using
+  elgg_list_entities*() in group members sidebar view  
+
+  	* mod/groups/languages/en.php, mod/groups/lib/groups.php: displaying a no
+  activity message on the activity page for new groups  
+
+  	* mod/pages/world.php: added text to pages plugin for case where no pages
+  have been created on site  
+
+  	* mod/file/index.php: fixed typo in file index.php  
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/object/default.php,
+  views/default/page/components/list/body.php,
+  views/default/page/components/summary.php, views/default/user/default.php:
+  Refs #3096 using 'summary' instead of list/body  
+
+2011-03-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/elements/body.php,
+  views/default/river/elements/controls.php,
+  views/default/river/elements/footer.php,
+  views/default/river/elements/image.php, views/default/river/item.php,
+  views/default/river/item/body.php, views/default/river/item/controls.php,
+  views/default/river/item/footer.php, views/default/river/item/image.php:
+  somehow we forgot to use 'elements' in river views  
+
+2011-03-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, upgrade.php, views/default/page/upgrade.php: Fixes
+  #3064. Checking for views/default/welcome.php and aborting upgrade if found. 
+  Need to add documention for how to replace views directory to wiki. Also
+  fixed ajax loader during upgrade.  
+
+2011-03-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggUser.php, mod/custom_index/index.php,
+  views/default/widgets/friends/content.php: Fixes #3045 custom index and the
+  friends widget now use the gallery view for user icons  
+
+  	* engine/lib/views.php, views/default/page/components/gallery.php,
+  views/default/page/components/list.php, views/default/user/default.php: Refs
+  #3045 adds a gallery context based view for users  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/views.php,
+  engine/tests/api/helpers.php, mod/blog/lib/blog.php, mod/blog/start.php,
+  .../views/default/page/theme_preview.php, mod/notifications/index.php,
+  .../notifications/subscriptions/forminternals.php, mod/pages/start.php,
+  mod/tinymce/start.php, mod/tinymce/views/default/tinymce/init.php,
+  mod/zaudio/start.php, mod/zaudio/views/default/zaudio/audioplayer.php,
+  views/default/input/autocomplete.php, views/default/input/friendspicker.php,
+  views/default/input/userpicker.php, views/default/page/elements/head.php:
+  Fixes #3091 adds load functions for js and css  
+
+2011-03-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php: Fixed #3093: Admin link shows only for admin users. 
+
+  	* languages/en.php: Fixes #3004: Updated admin widget text to reflect menu
+  changes.  
+
+  	* mod/blog/views/default/blog/sidebar/revisions.php: Fixed blog revision
+  links.  
+
+  	* js/lib/autocomplete.js, js/lib/elgglib.js, js/lib/events.js,
+  js/lib/hooks.js, js/lib/languages.js, js/lib/security.js, js/lib/ui.js,
+  js/lib/ui.widgets.js, js/lib/userpicker.js, js/tests/ElggEventsTest.js,
+  js/tests/ElggHooksTest.js, mod/blog/views/default/js/blog/save_draft.php,
+  mod/bookmarks/views/default/bookmarks/js.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  mod/tinymce/views/default/js/tinymce.php,
+  .../views/default/uservalidationbyemail/js.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/river/filter.php, views/default/js/admin.php,
+  views/default/js/elgg.php: Fixes #3065, #3089. Merged JS events and hooks to
+  a single system. Updated plugins and core to use it. Added
+  elgg.getURLFragment() and using it elgg.ui.popsUp().  
+
+2011-03-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/admin.php, views/default/page/default.php: forgot to
+  include js registered for the footer in page shells  
+
+  	* engine/lib/elgglib.php, engine/tests/api/helpers.php: Refs #3091
+  registering js and css support priority though does not maintain registration
+  order if items have equal priority  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/views.php,
+  engine/tests/api/helpers.php, mod/blog/lib/blog.php,
+  mod/notifications/index.php,
+  .../notifications/subscriptions/forminternals.php, mod/pages/start.php,
+  mod/tinymce/views/default/tinymce/init.php,
+  mod/zaudio/views/default/zaudio/audioplayer.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/input/autocomplete.php, views/default/input/friendspicker.php,
+  views/default/input/userpicker.php, views/default/page/components/list.php:
+  Refs #3091 rewrote the js and css register functions to require a name  
+
+  	* mod/blog/views/default/blog/group_module.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  mod/pages/views/default/pages/group_module.php: Fixes #3071 group "widgets"
+  check permissions now  
+
+2011-03-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/widgets.php,
+  views/default/admin/appearance/default_widgets.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/appearance/profile_fields.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/admin/settings/default_widgets.php,
+  views/default/admin/settings/menu_items.php,
+  views/default/admin/settings/profile_fields.php,
+  .../default/admin/settings/profile_fields/list.php,
+  views/default/css/admin.php, views/default/js/admin.php: Refs #2991: Readded
+  the appearance menu under configure. Moved plugin settings under
+  configure/settings.  
+
+  	* engine/lib/admin.php, languages/en.php, views/default/admin/sidebar.php,
+  views/default/css/admin.php: Refs #2991. Using section for admin menu.  
+
+  	* views/default/navigation/menu/elements/section.php: Refs #3088. Wrapping
+  section headers in <h2>s.  
+
+  	* engine/lib/views.php: Refs #3088. Added docs for section headers to
+  elgg_view_menu().  
+
+  	* views/default/navigation/menu/default.php,
+  views/default/navigation/menu/elements/section.php,
+  views/default/navigation/menu/page.php: Fixes #3088: Added section header
+  support to page and default menus.  
+
+2011-03-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Refs #3085  finished support for passing $vars to
+  elgg_view_entity()  
+
+  	* engine/lib/views.php, views/default/page/components/gallery.php,
+  views/default/page/components/list.php, views/rss/layout/objects/list.php:
+  Refs #3085 moved full_view out of elgg_view_list_item() into $vars to be
+  consistent with other elgg_view* functions  
+
+  	* engine/lib/views.php, views/default/page/elements/comments.php: Refs #3085
+  added $vars to elgg_view_comments()  
+
+  	* engine/lib/views.php: Refs #3085 improved documentation of
+  elgg_view_entity_list() which already supported $vars array  
+
+  	* engine/classes/ElggEntity.php, engine/lib/entities.php: improved
+  documentation of can write to container method/function  
+
+2011-03-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/elgg.php: Fixes #3081: Adding a new line between
+  javascript includes.  
+
+  	* engine/handlers/page_handler.php, engine/lib/admin.php,
+  engine/lib/widgets.php, languages/en.php, mod/developers/languages/en.php,
+  mod/developers/start.php, mod/diagnostics/start.php,
+  mod/externalpages/start.php, mod/logbrowser/start.php,
+  mod/reportedcontent/start.php, mod/uservalidationbyemail/start.php,
+  views/default/admin/appearance/default_widgets.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/appearance/profile_fields.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/admin/settings/advanced.php,
+  views/default/admin/settings/basic.php,
+  views/default/admin/settings/default_widgets.php,
+  views/default/admin/settings/menu_items.php,
+  views/default/admin/settings/profile_fields.php,
+  .../default/admin/settings/profile_fields/list.php,
+  views/default/admin/sidebar.php, views/default/admin/site/advanced.php,
+  views/default/admin/site/basic.php, views/default/css/admin.php,
+  views/default/js/admin.php: Refs #2991. First round at rearranging and
+  grouping admin menu based upon tasks.  
+
+2011-03-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/activate.php, actions/admin/plugins/deactivate.php,
+  actions/admin/user/delete.php, actions/friends/collections/add.php,
+  actions/friends/collections/delete.php, engine/classes/ElggSite.php,
+  engine/lib/admin.php, engine/lib/cache.php, engine/lib/cron.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/input.php,
+  engine/lib/navigation.php, engine/lib/output.php, engine/lib/pagehandler.php,
+  engine/lib/pageowner.php, engine/lib/plugins.php, engine/lib/river.php,
+  engine/lib/user_settings.php, engine/lib/users.php,
+  engine/tests/api/helpers.php, index.php, install/ElggInstaller.php,
+  js/lib/elgglib.js, js/lib/languages.js, js/lib/userpicker.js,
+  js/tests/ElggLibTest.js, mod/blog/actions/blog/delete.php,
+  mod/blog/actions/blog/save.php, mod/blog/lib/blog.php, mod/blog/start.php,
+  mod/blog/views/default/blog/group_module.php,
+  mod/blog/views/default/blog/sidebar/archives.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/object/blog.php,
+  mod/blog/views/default/widgets/blog/content.php,
+  mod/bookmarks/actions/bookmarks/delete.php,
+  mod/bookmarks/actions/bookmarks/save.php, mod/bookmarks/pages/friends.php,
+  mod/bookmarks/pages/view.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/widgets/bookmarks/content.php, mod/categories/start.php,
+  mod/categories/views/default/output/categories.php, mod/developers/start.php,
+  .../views/default/admin/developers/preview.php, mod/embed/start.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/externalpages/start.php,
+  mod/externalpages/views/default/expages/menu.php,
+  mod/file/actions/file/delete.php, mod/file/actions/file/upload.php,
+  mod/file/edit.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/search.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/view.php, mod/file/views/default/file/embed_upload.php,
+  mod/file/views/default/file/group_module.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/widgets/filerepo/content.php,
+  mod/groups/actions/discussion/delete.php,
+  mod/groups/actions/groups/delete.php,
+  mod/groups/actions/groups/membership/invite.php,
+  mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  mod/groups/start.php, .../views/default/discussion/group_module.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/profile/buttons.php,
+  mod/groups/views/default/groups/side_menu.php,
+  mod/groups/views/default/groups/sidebar/find.php,
+  .../views/default/groups/sidebar/members.php,
+  .../default/widgets/a_users_groups/content.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/start.php,
+  mod/logbrowser/start.php, mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/logbrowser/table.php,
+  mod/messageboard/pages/owner.php, mod/messageboard/start.php,
+  .../views/default/widgets/messageboard/content.php,
+  mod/messages/actions/messages/send.php, mod/messages/read.php,
+  mod/messages/start.php, mod/messages/views/default/object/messages.php,
+  mod/notifications/start.php, mod/pages/actions/pages/delete.php,
+  mod/pages/friends.php, mod/pages/history.php, mod/pages/revision.php,
+  mod/pages/start.php, mod/pages/view.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/group_module.php,
+  mod/pages/views/default/widgets/pages/content.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/search/index.php,
+  mod/search/views/default/search/list.php,
+  mod/search/views/default/search/search_box.php, mod/thewire/actions/add.php,
+  mod/thewire/actions/delete.php, mod/thewire/pages/friends.php,
+  mod/thewire/pages/reply.php, mod/thewire/pages/tag.php,
+  mod/thewire/pages/thread.php, mod/thewire/pages/user.php,
+  mod/thewire/start.php, mod/thewire/tests/regex.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/widgets/thewire/content.php, mod/twitterservice/start.php,
+  mod/twitterservice/twitterservice_lib.php,
+  .../views/default/twitterservice/login.php,
+  .../default/usersettings/twitterservice/edit.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  views/default/admin/appearance/default_widgets.php,
+  views/default/admin/header.php, views/default/admin/plugins/advanced.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/members/nav.php, views/default/core/members/sidebar.php,
+  views/default/forms/login.php, views/default/group/search/finishblurb.php,
+  views/default/input/autocomplete.php,
+  views/default/object/plugin/advanced.php,
+  views/default/object/plugin/simple.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/page/default.php,
+  views/default/page/layouts/content/filter.php,
+  views/default/page/layouts/content/header.php,
+  .../page/layouts/two_column_left_sidebar.php,
+  views/default/user/search/finishblurb.php,
+  views/default/widgets/content_stats/content.php, views/foaf/page/default.php,
+  views/installation/page/elements/footer.php, views/rss/core/river/body.php:
+  Fixes #2228: Major cleanup of urls -- remove leading pg/ and trailing / from
+  most urls in core and plugins 
+
+  	* .gitignore: Ignoring some standard eclipse files 
+
+  	* engine/handlers/page_handler.php, htaccess_dist: Refs #2228: Deprecated
+  use of pg/ in page handlers.  Now we get to have nice clean urls like
+  "example.com/bookmarks" 
+
+2011-03-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/manifest.xml: Added curl requirement to twitterservice.
+   
+
+  	* .../views/default/groups/sidebar/members.php: Fixes #3072: Fixed group
+  member list in sidebar. Thoughts about using the elgg-menu-hz class for this?
+  It's not exactly a menu, but that CSS does exactly what's needed.  
+
+  	* mod/groups/lib/groups.php: Fixes #3069. Added group activity content.  
+
+  	* languages/en.php, views/default/widgets/admin_welcome/content.php: Refs
+  #3004. First draft of welcome widget text.  
+
+  	* views/default/css/admin.php: Fixes #2948: Put specific rules in for
+  .elgg-plugin.elgg-state-active to get white backgrounds in plugins, but not
+  break the action button. The admin CSS still needs a bit of work.  
+
+2011-03-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php: fixed page owner setting for sites in a
+  subdirectory  
+
+  	* views/default/css/admin.php, views/default/page/admin.php: Fixes #3057
+  page wrapper now sets the margin so messages don't end up in far left  
+
+2011-03-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js, mod/likes/views/default/likes/display.php: Refs #3027: Using
+  the event popup, ui for advanced placement in elgg.ui.popsUp()  
+
+  	* engine/lib/views.php: Fixes #3059. elgg_view_layout() checks for
+  deprecated layouts in canvas/layouts/ and elgg_view_page() checks for
+  deprecated pageshells in pageshells/pageshell.  
+
+  	* engine/classes/ElggBatch.php: Fixed some typos in documentation of
+  ElggBatch.  
+
+2011-03-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/upgrades/2011030101.php: Fixes #2679 added a script to upgrade
+  forum topics from 1.7 and earlier  
+
+  	* actions/likes/add.php, actions/likes/delete.php,
+  engine/classes/ElggEntity.php, engine/lib/elgglib.php,
+  engine/lib/navigation.php, engine/lib/upgrades/2010121702.php,
+  engine/lib/views.php, languages/en.php,
+  .../views/default/theme_preview/icons.php, mod/likes/actions/likes/add.php,
+  mod/likes/actions/likes/delete.php, mod/likes/languages/en.php,
+  mod/likes/manifest.xml, mod/likes/start.php,
+  mod/likes/views/default/annotation/likes.php,
+  mod/likes/views/default/likes/css.php,
+  mod/likes/views/default/likes/display.php,
+  .../default/river/annotation/likes/create.php,
+  views/default/annotation/likes.php, views/default/core/likes/display.php,
+  views/default/css/admin.php, views/default/css/elements/components.php,
+  views/default/css/elements/icons.php, views/default/css/ie.php,
+  views/default/river/annotation/likes/create.php: Fixes #3058 pulls likes out
+  as a plugin  
+
+  	* views/default/navigation/menu/metadata.php: removed metadata menu which
+  has been replaced by the entity menu  
+
+2011-03-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/categories/manifest.xml, mod/custom_index/manifest.xml,
+  mod/developers/manifest.xml, mod/diagnostics/manifest.xml,
+  mod/embed/manifest.xml, mod/externalpages/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/oauth_lib/manifest.xml,
+  mod/twitter/manifest.xml: Refs #2104 added bundled category to all core
+  plugins  
+
+  	* .../views/default/theme_preview/forms.php: added padding to the display of
+  buttons in developer preview  
+
+  	* languages/en.php, views/default/admin/plugins/advanced.php: Refs #2871
+  advanced plugin filtering works - sorting still does odd things  
+
+2011-03-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, languages/en.php, views/default/admin/footer.php,
+  views/default/css/admin.php: Fixes #3005. Added links to admin faq, admin
+  manual, blog, and community forums in the admin footer.  
+
+  	* mod/thewire/start.php, mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/metadata.php: Fixes #3025: The wire uses
+  core's metadata view.  
+
+  	* engine/lib/views.php: Added a bit more docs to elgg_view_menu().  
+
+  	* engine/lib/upgrades/2010050701.php: Fixes #2310. Only conditionally
+  setting the allow_registration field for users who used
+  $CONFIG->disable_registration.  
+
+  	* js/lib/ui.js, views/default/core/likes/display.php: Fixes #3027. Likes
+  popup uses rel='popup' and elgg.ui.popsUp() to position absolute.  
+
+  	* mod/blog/views/default/blog/sidebar/revisions.php: Fixes #3054: Fixed URL
+  for editing a blog revision.  
+
+2011-03-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/start.php, mod/tinymce/views/default/js/tinymce.php,
+  mod/tinymce/views/default/tinymce/init.php, views/default/input/longtext.php:
+  fixed tinymce toggle  
+
+2011-03-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/js/blog/save_draft.php: Fixes #3053: Fixed JS for
+  blog draft autosave.  
+
+  	* ...8_svn-blog_status_metadata-4645225d7b440876.php,
+  mod/blog/actions/blog/auto_save_revision.php, mod/blog/actions/blog/save.php,
+  mod/blog/classes/ElggBlog.php, mod/blog/languages/en.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/input/datetime.php,
+  mod/blog/views/default/js/blog/save_draft.php,
+  mod/blog/views/default/object/blog.php, version.php: Fixes #2229. Removed
+  published data metadata in blog. Added upgrade to set all status metadata for
+  old blog posts.  
+
+  	* engine/classes/ElggBatch.php: Added a bit more docs to ElggBatch.  
+
+  	* mod/blog/lib/blog.php, mod/blog/views/default/blog/sidebar/archives.php:
+  Refs #2229: Using time_created instead of publish_date metadata to sort.  
+
+2011-03-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/longtext.php: fixed longtext menu display  
+
+2011-03-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/navigation.php, engine/lib/river.php, mod/blog/start.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php, mod/groups/start.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php, mod/pages/start.php,
+  mod/pages/views/default/object/page_top.php,
+  views/default/css/elements/navigation.php: Refs #2895 entity menu uses new
+  menu system  
+
+  	* engine/classes/ElggMenuItem.php: added support for confirm text to
+  ElggMenuItem  
+
+  	* views/default/output/confirmlink.php: made encoding text default to false
+  in confirm link  
+
+  	* mod/blog/views/default/blog/group_module.php,
+  .../views/default/bookmarks/group_module.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  mod/groups/views/default/forms/groups/delete.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/profile/profile_block.php,
+  .../views/default/groups/profile/widgets.php,
+  mod/pages/views/default/pages/group_module.php: cleaned up the groups plugin
+  css  
+
+  	* views/default/css/elements/navigation.php: owner block menu items appear
+  like normal page menu items in default theme  
+
+  	* engine/lib/river.php: not showing river buttons when displaying in widgets
+   
+
+2011-03-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Elgg's web services API is not RESTful  
+
+  	* mod/custom_index/start.php: custom index plugin checks return value on
+  hook now  
+
+  	* _graphics/walled_garden_background_top.gif, engine/lib/elgglib.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/css/walled_garden.php, views/default/page/elements/footer.php,
+  views/default/page/walled_garden.php: Refs #2693 walled garden code is
+  functional. Push back a thorough clean up until Elgg 1.9  
+
+  	* engine/lib/elgglib.php, languages/en.php,
+  views/default/css/walled_garden.php, views/default/page/walled_garden.php:
+  Refs #2693 pulled walled garden css out as separate view  
+
+  	* documentation/examples/plugins/manifest.xml, mod/blog/manifest.xml,
+  mod/bookmarks/manifest.xml, mod/developers/manifest.xml,
+  mod/file/manifest.xml, mod/pages/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitterservice/manifest.xml,
+  mod/uservalidationbyemail/manifest.xml, mod/zaudio/manifest.xml,
+  views/default/admin/plugins/advanced.php: Refs #2104 added some categories to
+  core (bundled) plugins  
+
+  	* mod/thewire/languages/en.php,
+  .../views/default/thewire/profile_status.php: Fixes #3024 thewire view for
+  the profile page is finished  
+
+  	* engine/lib/river.php, mod/groups/start.php,
+  .../views/default/forms/discussion/reply/save.php,
+  .../river/object/groupforumtopic/create.php,
+  views/default/river/item/controls.php: Refs #2679 can comment on discussion
+  forums in river now  
+
+  	* mod/groups/start.php: Refs #2413 registered the subtype for discussion
+  topics so search works  
+
+  	* mod/groups/start.php: Refs #2679 added a function for processing groups
+  plugin upgrades  
+
+  	* engine/lib/river.php, views/default/river/item/controls.php: Fixes #2895
+  river menu reimplemented using plugin hook  
+
+  	* upgrade.php: Fixes #3029 added an upgrade, system event that always fires 
+
+2011-03-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggMenuBuilder.php: added a catch to menu builder for bad
+  menu items  
+
+  	* views/default/css/elements/navigation.php: added background to li hover
+  for filter menu to work around sliver of white showing through - probably a
+  better way to do this  
+
+  	* mod/messages/start.php, mod/messages/views/default/messages/css.php: fixed
+  new message indicator  
+
+  	* views/default/navigation/menu/default.php: forcing dashes in elgg menu
+  classes  
+
+  	* mod/messages/read.php, mod/pages/view.php: changed rest of title buttons
+  to an elgg-menu  
+
+  	* mod/groups/languages/en.php, mod/groups/lib/groups.php: fixed some group
+  page titles  
+
+  	* mod/thewire/languages/en.php: thewire was missing object:<subtype> string 
+
+  	* views/default/css/elements/navigation.php: tweaked spacing of sidebar
+  menus  
+
+  	* languages/en.php: adjust language on like link title  
+
+  	* views/default/css/elements/layout.php,
+  views/default/css/elements/navigation.php: added a amrgin to elgg-menu-title
+  so that buttons have some space  
+
+  	* .../views/default/groups/profile/buttons.php: groups profile buttons now
+  elgg-menu-title - still need to be registered  
+
+  	* .../views/default/forms/messages/process.php,
+  mod/messages/views/default/object/messages.php,
+  views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/css/elements/buttons.php,
+  views/default/input/submit.php: cleared up confusion over elgg-icon-delete
+  and elgg-button-delete  
+
+  	* .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php: cleaned up the group
+  invitations and membership request pages  
+
+  	* mod/groups/actions/groups/edit.php,
+  mod/groups/views/default/forms/groups/edit.php: fixed a bug with invisible
+  groups - saving and display both had a problem  
+
+  	* mod/groups/views/default/forms/groups/search.php,
+  mod/groups/views/default/groups/edit.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../default/groups/profile/activity_module.php,
+  mod/groups/views/default/groups/side_menu.php,
+  .../views/default/groups/sidebar/members.php,
+  .../river/annotation/group_topic_post/reply.php,
+  .../default/river/relationship/member/create.php,
+  mod/groups/views/default/settings/groups/edit.php: reviewed groups plugin and
+  added todo's  
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: added owner icons to
+  bookmarks  
+
+  	* views/default/css/elements/misc.php: drop down button did not need to have
+  such a large z-index  
+
+  	* views/default/css/elements/buttons.php: removed shadow from
+  elgg-button-dropdown inherited from elgg-button  
+
+  	* views/default/page/elements/footer.php: make sure powered by icon does not
+  sneak up in the menu area  
+
+  	* .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/icon/object/file.php: fixed two validation issues with
+  ampersands in file plugin  
+
+  	* views/default/page/elements/footer.php: forgot to close div tag  
+
+  	* .../views/default/custom_index/css.php,
+  .../views/default/page/layouts/custom_index.php: updated custom index spacing
+  so it spans the width of the central area  
+
+  	* engine/lib/elgglib.php, mod/externalpages/start.php,
+  mod/reportedcontent/start.php, views/default/css/elements/navigation.php,
+  views/default/page/elements/footer.php: pulled power by icon out of menu in
+  footer as it serves a different purpose than other menu items  
+
+2011-03-05  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js, views/default/input/date.php,
+  views/default/input/datepicker.php, views/default/output/calendar.php,
+  views/default/output/date.php: Fixes #2321: Deprecated input/datepicker and
+  output/calendar in favor of input/date and output/date 
+
+2011-03-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/groups/membership/join.php, mod/groups/start.php: Fixes
+  #1926 flushing access list when adding a user to a group  
+
+  	* mod/groups/lib/groups.php, .../default/groups/profile/activity_module.php:
+  preventing crashes when user does not have access to the group on group
+  profile page  
+
+  	* engine/lib/access.php: Refs #1926 should not be ignoring the flush
+  variable  
+
+  	* engine/lib/access.php: updated comment on why we may want to keep access
+  cache  
+
+  	* mod/groups/start.php: Refs #1926 user is now being added to access
+  collection of invisible group  
+
+  	* engine/lib/access.php: Refs #1926 made 'access:collections:add_user',
+  'collection' plugin hook more useful  
+
+  	* mod/groups/actions/groups/edit.php, mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/edit.php: trying to make support for
+  invisible groups a little saner  
+
+  	* mod/groups/actions/groups/membership/join.php: fixed bug in accepting
+  invitations to closed groups  
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/delete.php,
+  mod/groups/actions/edit.php, mod/groups/actions/featured.php,
+  mod/groups/actions/groups/delete.php, mod/groups/actions/groups/edit.php,
+  mod/groups/actions/groups/featured.php,
+  mod/groups/actions/groups/membership/add.php,
+  .../actions/groups/membership/delete_invite.php,
+  .../actions/groups/membership/delete_request.php,
+  mod/groups/actions/groups/membership/invite.php,
+  mod/groups/actions/groups/membership/join.php,
+  mod/groups/actions/groups/membership/leave.php,
+  mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/start.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/profile/buttons.php: updated the group actions -
+  edit group needs more work  
+
+  	* engine/lib/entities.php: added a hint about 0 meaning no limit for ege  
+
+2011-03-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Refs #2679 preventing people from commenting on a
+  discussion topic in the river  
+
+  	* mod/groups/actions/discussion/reply/delete.php,
+  mod/groups/actions/discussion/reply/save.php, mod/groups/languages/en.php,
+  mod/groups/lib/discussion.php, mod/groups/lib/groups.php,
+  mod/groups/start.php, .../views/default/annotation/group_topic_post.php,
+  mod/groups/views/default/discussion/replies.php,
+  .../views/default/forms/discussion/reply/save.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/object/groupforumtopic.php,
+  .../river/annotation/group_topic_post/reply.php: Refs #2679 - returning to a
+  separate annotation for discussion forum replies. For those using the latest
+  out of svn you can update with this script: https://gist.github.com/852092  
+
+2011-03-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, mod/blog/views/default/forms/blog/save.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  .../notifications/subscriptions/forminternals.php,
+  views/default/css/elements/chrome.php,
+  views/default/forms/admin/site/update_advanced.php,
+  views/default/forms/admin/site/update_basic.php,
+  views/default/forms/usersettings/save.php: Fixes #3006 restores previous
+  dividers  
+
+  	* mod/categories/views/default/output/categories.php: not showing categories
+  label if not categories chosen  
+
+  	* actions/login.php: Fixes #3036 moved setting of forward url to before
+  login in case session variables are being lost  
+
+  	* views/default/river/item/controls.php: Refs #2895 reverting [8532] as code
+  is not working as intended. Can comment and like everything because menu
+  items are being registered. Perhaps questionable benefit of using the menu
+  system here.  
+
+  	* mod/groups/actions/discussion/save.php: fixed the view name for discussion
+  topic river  
+
+  	* .../views/default/object/groupforumtopic.php: showing the text of a forum
+  topic post  
+
+2011-03-02  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/views/default/tinymce/css.php,
+  views/default/core/friends/collection.php,
+  views/default/core/friends/collections.php,
+  views/default/core/friends/collectiontabs.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php,
+  views/default/page/elements/owner_block.php,
+  views/default/page/elements/topbar.php: Addressed several miscellaneous
+  todo's 
+
+  	* views/default/object/widget.php,
+  views/default/object/widget/elements/controls.php: Widget collapse button
+  uses elgg-toggler pattern 
+
+  	* views/default/page/layouts/widgets/add_button.php: Fixed widgets add
+  button 
+
+  	* views/default/object/plugin/advanced.php,
+  .../object/plugin/elements/dependencies.php: Plugin admin displays
+  dependencies again 
+
+  	* mod/twitterservice/start.php: Removed redundant requirements checking code
+
+  	* views/default/admin/statistics/basic.php,
+  views/default/admin/statistics/numentities.php,
+  views/default/admin/statistics/overview.php: Refactored admin statistics
+  views -- no longer manually building elgg-module 
+
+  	* engine/lib/output.php: Added comment explaining purpose of regex 
+
+  	* engine/lib/output.php: elgg_normalize_url leaves #target and ?query urls
+  alone 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/messages.php: Fixes #3012 added hidden li  
+
+  	* js/lib/elgglib.js: cleaned up appending system messages since <ul> will
+  always be there  
+
+  	* install/ElggInstaller.php: Fixes #2929 Installer handles private default
+  access now  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/layouts/content/filter.php: Filter tabs ordered
+  correctly 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php: fixed bug where dataroot wasn't being set when
+  regenerating cache during the install  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/modules.php,
+  views/default/css/elements/navigation.php,
+  views/default/navigation/menu/site.php: Some fixes for site menu 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/save.php: because river entry is deleted we do not
+  need to do an update  
+
+  	* views/default/forms/comments/add.php: put margin back between longtext and
+  submit button for comment form  
+
+  	* mod/blog/actions/blog/save.php: fixes saving a new blog post - was trying
+  to do an update to without a guid  
+
+  	* engine/lib/views.php: Fixes #3033 removed use of set_view_location() from
+  core  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/users.php,
+  mod/embed/start.php, mod/messages/start.php, mod/reportedcontent/start.php,
+  views/default/admin/footer.php, views/default/admin/sidebar.php,
+  views/default/css/admin.php, views/default/css/elements/navigation.php,
+  views/default/input/longtext.php, views/default/page/elements/footer.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/layouts/content/filter.php,
+  views/default/page/layouts/content/header.php,
+  views/default/river/item/controls.php: Fixes #3031 using 'priority' now  
+
+  	* engine/lib/users.php: Fixes #3010 moved topbar menu registration to page
+  setup so that the url override is registered  
+
+  	* mod/tinymce/views/default/js/tinymce.php: fixed tinymce js code so that at
+  least it doesn't have syntax errors and runtime exceptions  
+
+  	* mod/tinymce/start.php: tinymce longtext menu item also needed the longtext
+  class  
+
+  	* mod/tinymce/start.php: fixes tinymce longtext registration  
+
+  	* mod/embed/start.php: fixed embed longtext menu registration  
+
+  	* views/default/input/button.php, views/default/input/submit.php: added
+  better support for classes to buttons  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggMenuItem.php, js/lib/ui.js,
+  mod/profile/views/default/profile/owner_block.php,
+  .../views/default/object/reported_content.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/object/plugin/advanced.php,
+  views/default/object/widget/elements/controls.php,
+  views/default/page/layouts/widgets/add_button.php,
+  views/default/river/item/controls.php: Fixes #3032: toggler pattern is now <a
+  href="#target" class="elgg-toggler">...</a>  Wow, so much nicer. 
+
+  	* engine/classes/ElggMenuItem.php: Added support for "rel" to ElggMenuItem 
+
+  	* engine/classes/ElggMenuItem.php: Fixes #3023: added support for 'class'
+  argument in elgg_register_menu_item 
+
+  	* views/default/css/admin.php, views/default/css/elements/navigation.php,
+  views/default/navigation/menu/default.php,
+  views/default/navigation/menu/elements/group.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/navigation/menu/elements/section.php,
+  views/default/navigation/menu/metadata.php,
+  views/default/navigation/menu/page.php,
+  views/default/navigation/menu/site.php,
+  views/default/navigation/menu/user_hover.php,
+  views/default/page/elements/footer.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/layouts/content/filter.php,
+  views/default/page/layouts/content/header.php: Refs #3021:
+  elgg-section-$section => elgg-menu-$menu-$section Added elgg-menu-hz for
+  horizontal menus 
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/link.php: Fixes #2895:
+  Embed uses longtext menu -- I believe that covers *all* the menus we had
+  brought up! 
+
+  	* mod/tinymce/start.php, mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/js/tinymce.php,
+  mod/tinymce/views/default/tinymce/init.php, views/default/input/longtext.php:
+  Refs #2538: Cleaned up custom tinymce code into elgg.tinymce.*. Refs #2895:
+  TinyMCE makes use of longtext menu 
+
+  	* views/default/river/item/controls.php: Refs #2895: River items now emit a
+  "river" menu.  Not confident on the name, just trying to keep things short
+  and sweet. 
+
+  	* mod/search/start.php, views/default/page/elements/header.php: Removed
+  header/extend in favor of just extending page/elements/header 
+
+  	* views/default/css/elements/navigation.php,
+  views/default/page/layouts/content/header.php: Refs #2895: Content header now
+  emits a "title" menu 
+
+2011-03-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/save.php: Fixes #2425, #2427. Blog status for
+  published and draft correctly set the river items.  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/likes/display.php,
+  views/default/css/elements/navigation.php: core/likes/display uses
+  image-block component.  ensures that the like icon is even with the "x users
+  liked this" text.  Wondering if we should split the two up entirely. 
+
+  	* views/default/css/elements/navigation.php,
+  views/default/page/layouts/content/filter.php: Refs #2895: Converted content
+  filter to a menu, duplicated styles to mimic tabs... ick. 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/manifest.xml, mod/blog/start.php: blog plugin uses on_activate to
+  set its class or the upgrade event  
+
+  	* mod/groups/views/default/forms/groups/search.php,
+  mod/thewire/views/default/forms/thewire/add.php,
+  views/default/css/elements/buttons.php,
+  views/default/forms/members/name_search.php,
+  views/default/forms/members/tag_search.php,
+  views/default/forms/widgets/save.php, views/default/input/submit.php: brought
+  back the blue submit button  
+
+  	* views/default/css/elements/buttons.php: yuck - have to reset all the
+  styling from elgg-button for elgg-button-delete  
+
+  	* actions/admin/plugins/activate.php, actions/admin/plugins/deactivate.php:
+  Fixes #3013 activating/deactivating a plugin forwards to plugin page with
+  changed plugin given focus  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/pages/all.php: No need for ".=" here 
+
+  	* mod/groups/start.php: pg/groups/world => pg/groups/all 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/widgets.php, mod/developers/start.php,
+  mod/diagnostics/start.php, mod/externalpages/start.php,
+  mod/logbrowser/start.php, mod/reportedcontent/start.php,
+  mod/uservalidationbyemail/start.php: Fixes #3014 using more standard
+  "register" in admin convenience function  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/navigation.php: Fixes for breadcrumbs and
+  metadata menus.  Added basic styles for title menu 
+
+  	* views/default/core/likes/display.php: false is default for encode text in
+  output/url -- no need to specify 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messageboard/start.php, .../views/default/forms/messageboard/add.php,
+  .../views/default/messageboard/css.php: cleaned up the css for messageboard  
+
+  	* mod/messageboard/languages/en.php,
+  .../views/default/annotation/messageboard.php,
+  .../views/default/forms/messageboard/add.php,
+  .../views/default/messageboard/messageboard.php,
+  .../default/river/object/messageboard/create.php,
+  .../views/default/widgets/messageboard/content.php,
+  .../views/default/widgets/messageboard/edit.php: cleaned up the messageboard
+  plugin further  
+
+  	* views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php: finished making the "default"
+  view the default view for annotation rather than generic_comment  
+
+2011-03-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/river/filter.php: Convert river filter javascript to
+  new style 
+
+2011-03-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/annotation/default.php: improved the default annotation view
+   
+
+2011-02-28  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/topbar.php: No more reason to explicitly add
+  elgg-menu-topbar class 
+
+  	* views/default/css/elements/navigation.php,
+  views/default/navigation/menu/site.php: Fixes for several menu issues 
+
+  	* views/default/page/elements/footer.php: No more need to explicitly include
+  elgg-menu-footer class 
+
+  	* views/default/navigation/menu/default.php: Always include name of menu in
+  menu classes 
+
+  	* mod/bookmarks/start.php, views/default/page/elements/sidebar.php: Refs
+  #2895: Renamed "page_links" to "extras" -- feels more semantic (facebook's
+  menu has actions such as unfriend, share, block) 
+
+2011-02-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, mod/categories/manifest.xml,
+  mod/categories/start.php: Fixes #3011. on_activate and on_deactivate work for
+  plugins now. Updated the categories plugin to use it.  
+
+2011-02-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/categories/views/default/output/categories.php,
+  views/default/css/elements/icons.php,
+  views/default/page/components/list/body.php: pushing categories to the next
+  line when viewing an entity  
+
+  	* views/default/js/admin.php: slide up system messages in admin area  
+
+  	* views/default/page/admin.php: fixed the AWHOL state of system messages on
+  admin pages  
+
+  	* .../views/default/admin/users/unvalidated.php,
+  .../forms/uservalidationbyemail/bulk_action.php: fixed bad return value in
+  unvalidated users bulk action form  
+
+2011-02-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/forms/useradd.php: fixed useradd form  
+
+  	* engine/lib/admin.php, engine/lib/navigation.php: Fixes #2951 not
+  registering utilities menu item by default but added code to automatically
+  register a parent menu if not registered in admin menu registration function.
+  We lose the ability to set a weight on utilities.  
+
+  	* engine/lib/admin.php, engine/lib/widgets.php, mod/developers/start.php,
+  mod/diagnostics/start.php, mod/externalpages/start.php,
+  mod/logbrowser/start.php, mod/reportedcontent/start.php,
+  mod/uservalidationbyemail/start.php: simplified admin menu registration
+  function in preparation for adding sections  
+
+  	* install/ElggInstaller.php, install/languages/en.php: Fixes #2799 added
+  check for session.auto_start  
+
+  	* engine/lib/admin.php, views/default/css/admin.php,
+  views/default/page/admin.php: moved admin messages into admin page shell  
+
+  	* engine/lib/admin.php, install/ElggInstaller.php, languages/en.php,
+  views/default/css/admin.php, views/default/widgets/admin_welcome/content.php:
+  Fixes #2913 - directs the user to admin dashboard when installer finishes  
+
+  	* .../views/default/bookmarks/bookmarklet.php: Fixes #2977 changed title to
+  alt  
+
+  	* _graphics/friendspicker.png, actions/friends/collections/edit.php,
+  languages/en.php, pages/friends/collections/add.php,
+  pages/friends/collections/pickercallback.php,
+  views/default/core/friends/collections.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php,
+  views/default/forms/friends/collections/add.php,
+  views/default/forms/friends/collections/edit.php,
+  views/default/input/friendspicker.php: Fixes #2982 friends collections work
+  even if the code is convoluted and poorly written.  
+
+  	* .../notifications/subscriptions/forminternals.php: fixed notifications
+  plugin's hacked up friends picker...shudder  
+
+  	* mod/groups/lib/groups.php,
+  mod/groups/views/default/forms/groups/invite.php: fixed group invite form  
+
+  	* engine/lib/elgglib.php: fixed image size attributes added to "power by"
+  image  
+
+2011-02-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggSite.php: Refs #2693 - Added pg/css and pg/js to the
+  list of public pages for walled garden.  
+
+2011-02-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/addcollection.php, actions/friends/collections/add.php,
+  actions/friends/collections/delete.php, actions/friends/collections/edit.php,
+  actions/friends/deletecollection.php, actions/friends/editcollection.php,
+  engine/lib/users.php, pages/friends/add.php, pages/friends/collections.php,
+  pages/friends/collections/add.php,
+  pages/friends/collections/pickercallback.php,
+  pages/friends/collections/view.php, pages/friends/edit.php,
+  pages/friends/pickercallback.php, views/default/core/friends/collection.php,
+  views/default/core/friends/collections.php,
+  views/default/core/friends/collectiontabs.php,
+  views/default/forms/friends/collectionfields.php,
+  views/default/forms/friends/collections/edit.php,
+  views/default/forms/friends/edit.php: Refs #2982 adding and deleting friend
+  collections works - editing does not  
+
+  	* engine/lib/views.php, mod/groups/views/default/forms/groups/invite.php,
+  pages/friends/pickercallback.php, views/default/core/friends/collection.php,
+  views/default/core/friends/picker.php, views/default/forms/friends/edit.php,
+  views/default/input/friendspicker.php: fixed friends picker js include  
+
+2011-02-26  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/navigation.php: Switching elgg-menu-metadata to
+  inline-block method of declaring a horizontal menu 
+
+  	* mod/groups/views/default/group/default.php,
+  mod/thewire/views/default/thewire/metadata.php, views/default/css/admin.php,
+  views/default/css/elements/components.php,
+  views/default/css/elements/navigation.php,
+  views/default/navigation/menu/metadata.php,
+  views/default/object/plugin/advanced.php,
+  views/default/page/components/list/body.php, views/default/user/default.php:
+  Refs #2895: .elgg-list-metadata => .elgg-menu-metadata.  Still not using menu
+  system yet, though 
+
+  	* views/default/css/elements/navigation.php: .elgg-menu enhancement for
+  horizontal menus 
+
+  	* views/default/css/elements/layout.php,
+  views/default/css/elements/navigation.php,
+  views/default/navigation/breadcrumbs.php: .elgg-menu is no longer trivial 
+
+  	* engine/lib/elgglib.php: Added explicit height and width to powered_by_elgg
+  icon 
+
+  	* views/default/css/elements/icons.php: Fixes #2691: Switching elgg-icon to
+  display:inline-block -- matches behavior of <img> tag 
+
+2011-02-25  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/start.php, .../views/default/reportedcontent/css.php:
+  Converted report-this icon to be compatible with elgg_view_icon 
+
+  	* engine/lib/elgglib.php, mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/footer_link.php,
+  views/default/page/elements/footer.php: Refs #2895: Removed footer/links
+  view.  Moved report-this link into alternate footer menu 
+
+  	* engine/lib/elgglib.php, views/default/css/elements/layout.php,
+  views/default/css/elements/navigation.php,
+  views/default/page/elements/footer.php: Refs #2895: Added support for an
+  "alt" section in the footer menu.  Put "powered by Elgg" badge in here 
+
+  	* js/lib/elgglib.js, js/lib/session.js: Refs #2538: Functions don't need
+  double-namespacing 
+
+  	* views/default/css/elements/components.php,
+  views/default/css/elements/misc.php,
+  views/default/css/elements/navigation.php: Using shorthand in css to scrunch
+  it a bit 
+
+  	* views/default/css/elements/layout.php,
+  views/default/css/elements/page_layout.php, views/default/css/elgg.php:
+  Converted css/elements/page_layout to layout.  Now we have a bunch of nice,
+  terse, 1-word names :) 
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/users.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php,
+  views/default/page/elements/topbar.php: Refs #2895: Converted topbar to one
+  menu (felt dirty using two).  Fixed styles. 
+
+  	* engine/lib/users.php, mod/messages/start.php,
+  mod/messages/views/default/messages/topbar.php: Refs #2895: Messages now uses
+  new topbar menu 
+
+  	* mod/bookmarks/start.php, .../views/default/bookmarks/page_links.php,
+  views/default/page/elements/page_links.php,
+  views/default/page/elements/sidebar.php: Refs #2895: Converted page_links
+  into a menu.  Bookmarks now uses it 
+
+  	* engine/lib/admin.php, engine/lib/users.php,
+  views/default/page/elements/topbar.php: Refs #2895: Made topbar into 2 menus.
+   CSS will have to be fixed 
+
+  	* engine/lib/navigation.php: Corrects bug that occurred when ElggMenuItem is
+  passed 
+
+  	* mod/blog/views/default/object/blog.php, mod/groups/start.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/messages/views/default/object/messages.php,
+  .../notifications/subscriptions/forminternals.php,
+  mod/profile/views/default/profile/owner_block.php,
+  views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/core/friends/picker.php,
+  views/default/core/friends/tablelist.php,
+  views/default/forms/friends/edit.php, views/default/river/item/image.php,
+  views/default/river/relationship/friend/create.php,
+  views/default/user/default.php, views/default/widgets/friends/content.php:
+  Converted all uses of profile/icon in core + plugins to elgg_view_entity_icon
+
+  	* engine/lib/navigation.php: Emit a warning + debug info when an attempt to
+  register a menu item fails 
+
+  	* engine/classes/ElggMenuItem.php: Supporting is_action in ElggMenuItem 
+
+  	* views/installation/forms/install/template.php,
+  views/installation/install/pages/admin.php,
+  views/installation/install/pages/database.php,
+  views/installation/install/pages/settings.php: Cleaned up some js in the
+  installer 
+
+  	* views/installation/input/checkbox.php,
+  views/installation/input/checkboxes.php: Updated input/checkboxes code in
+  installation viewtype 
+
+  	* views/installation/install/forms/admin.php,
+  views/installation/install/forms/database.php,
+  views/installation/install/forms/settings.php,
+  views/installation/install/forms/template.php,
+  views/installation/install/pages/admin.php,
+  views/installation/install/pages/database.php,
+  views/installation/install/pages/settings.php: Converted installation forms
+  to use elgg_view_form and the /forms/ directory 
+
+2011-02-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/admin.php: Fixes #2998. Updated admin JS for dnd plugin
+  reordering with new plugin layout.  
+
+2011-02-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggAnnotation.php: Fixes #2960 removing river entry for
+  deleted annotation  
+
+  	* views/default/css/admin.php, views/default/css/elements/reset.php: fixed
+  dragging/scrolling issue caused by overflow-y on body  
+
+  	* engine/classes/ElggMenuItem.php: fixed typo in elgg menu updates from last
+  night  
+
+  	* engine/lib/users.php, languages/en.php, pages/friends/collections.php,
+  views/default/css/elements/misc.php: fixing friends collections for backward
+  compatibility  
+
+  	* engine/classes/ElggMenuItem.php,
+  views/default/navigation/menu/elements/item.php: finished the implementation
+  of non-links in menu system  
+
+  	* engine/classes/ElggMenuItem.php,
+  mod/profile/views/default/profile/owner_block.php,
+  views/default/navigation/menu/elements/item.php: using getContent() in menu
+  system in preparation for supporting non-links  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/admin.php, engine/lib/deprecated-1.8.php,
+  engine/lib/navigation.php, engine/lib/user_settings.php,
+  engine/lib/users.php, engine/lib/views.php, mod/bookmarks/start.php,
+  mod/developers/start.php, mod/file/views/default/file/typecloud.php,
+  mod/invitefriends/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/lib/pages.php: Fixes #2997 - href used
+  instead of url in menu system  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/admin.php, engine/lib/deprecated-1.8.php,
+  engine/lib/user_settings.php, engine/lib/users.php, engine/lib/views.php,
+  mod/bookmarks/start.php, mod/developers/start.php,
+  mod/file/views/default/file/typecloud.php, mod/invitefriends/start.php,
+  mod/messages/start.php, mod/notifications/start.php, mod/pages/lib/pages.php,
+  views/default/forms/admin/menu/save.php: Refs #2997 switching from title to
+  text for menu items  
+
+  	* views/default/core/friends/tablelist.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php:
+  moved another friends picker css section to forms css view  
+
+  	* views/default/core/avatar/crop.php, views/default/core/avatar/upload.php,
+  views/default/css/elements/misc.php, views/default/forms/avatar/crop.php:
+  cutting down the amount of css required for the avatar page  
+
+  	* views/default/core/river/body.php, views/default/core/river/controls.php,
+  views/default/core/river/footer.php, views/default/core/river/image.php,
+  views/default/river/item.php, views/default/river/item/body.php,
+  views/default/river/item/controls.php, views/default/river/item/footer.php,
+  views/default/river/item/image.php: organized the river views according to
+  the subview pattern  
+
+2011-02-23  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/modules.php: Adjusting offset for dropdown
+  module 
+
+  	* engine/lib/admin.php: Simplify registration of jeditable library 
+
+  	* views/default/css/elements/components.php,
+  views/default/css/elements/layout_objects.php, views/default/css/elgg.php:
+  Refs #2993: Changed css layout_objects to components 
+
+  	* views/default/css/elgg.php: Refs #2995: Including css/elements/buttons in
+  css/elgg 
+
+  	* views/default/css/elements/buttons.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php:
+  Fixes #2995: buttons get their own css file 
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/object/default.php,
+  views/default/object/elements/list_body.php,
+  views/default/page/components/list/body.php, views/default/user/default.php:
+  Fixes #2992: moved object/elements/list_body to page/components/list/body 
+
+  	* js/lib/ui.js: Fixes #2976: Removed second toggler implementation 
+
+  	* mod/blog/lib/blog.php, mod/file/index.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php, mod/messages/read.php,
+  .../views/default/forms/messages/process.php,
+  mod/messages/views/default/object/messages.php, mod/pages/view.php,
+  mod/profile/views/default/profile/owner_block.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/thewire/profile_status.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/friends/picker.php,
+  views/default/forms/profile/fields/reset.php, views/default/input/button.php,
+  views/default/object/plugin/advanced.php,
+  views/default/page/layouts/content/header.php,
+  views/default/page/layouts/widgets/add_button.php: Every occurrence of
+  elgg-button-$type needs an elgg-button base class declaration -- or should we
+  remove that requirement? 
+
+  	* mod/profile/views/default/profile/owner_block.php,
+  .../views/default/object/reported_content.php,
+  views/default/core/river/controls.php, views/default/core/river/footer.php,
+  views/default/object/widget/elements/controls.php,
+  views/default/object/widget/elements/settings.php,
+  views/default/page/layouts/widgets/add_button.php,
+  views/default/page/layouts/widgets/add_panel.php: Refs #2976: Converted most
+  markup to use elgg-toggler elgg-toggles-* pattern 
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/page/default.php: Fixes #2957: elgg-page-classic =>
+  elgg-page-default 
+
+  	* views/default/page/admin.php, views/default/page/layouts/one_column.php,
+  views/default/page/layouts/one_sidebar.php: Moved elgg-inner out of layouts
+  and into the page shell 
+
+  	* mod/messageboard/views/default/messageboard/js.php,
+  mod/messages/views/default/object/messages.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/css/ie.php,
+  views/default/css/ie6.php, views/default/page/upgrade.php: Converted
+  delete-button to elgg-button-delete throughout plugins 
+
+  	* views/default/css/elements/forms.php, views/default/css/elements/misc.php:
+  Moved elgg-button-dropdown to forms 
+
+  	* views/default/css/elements/chrome.php: Cleanup of css/elements/chrome.php 
+
+  	* views/default/css/elements/forms.php: Converted delete-button to
+  elgg-button-delete.  This breaks some things because the semantics of the two
+  are not equivalent. .delete-button just really needed to die 
+
+  	* views/failsafe/canvas/default.php, views/foaf/canvas/default.php,
+  views/ical/canvas/default.php, views/json/canvas/default.php,
+  views/opendd/canvas/default.php, views/php/canvas/default.php: Deleting
+  deprecated canvas/ directory from all viewtypes 
+
+  	* views/default/navigation/menu/default.php: DRY'ed up default menu a bit 
+
+2011-02-22  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/page/shells/theme_preview.php,
+  .../views/default/page/theme_preview.php: Moved theme_preview page shell out
+  into page/ 
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/page/elements/sidebar_alt.php,
+  views/default/page/layouts/one_column.php,
+  views/default/page/layouts/one_sidebar.php,
+  views/default/page/layouts/two_sidebar.php: Trying to simplify layout css: 
+  nixed elgg-aside .elgg-sidebar.elgg-alt => .elgg-sidebar-alt (similar to
+  .elgg-image-alt) 
+
+  	* views/default/admin/footer.php, views/default/admin/header.php,
+  views/default/page/admin.php, views/default/page/layouts/admin.php: extracted
+  admin header, footer to admin/*.  Moved pageshell code from admin layout to
+  admin pageshell. 
+
+  	* install/css/install.css, views/installation/install/footer.php,
+  views/installation/install/header.php,
+  views/installation/install/sidebar.php, views/installation/page/default.php,
+  views/installation/page/elements/footer.php,
+  views/installation/page/elements/header.php,
+  views/installation/page/elements/sidebar.php: Move install
+  footer/header/sidebar into page/elements.  Converted CSS to use more standard
+  Elgg framework objects 
+
+  	* views/default/page/elements/content_header.php,
+  .../page/elements/content_header_member.php: Removing holdovers from elgg.com
+
+  	* views/failsafe/page/default.php, views/failsafe/page/shells/default.php,
+  views/foaf/page/default.php, views/foaf/page/shells/default.php,
+  views/ical/page/default.php, views/ical/page/shells/default.php,
+  views/installation/page/default.php,
+  views/installation/page/shells/default.php, views/json/page/default.php,
+  views/json/page/shells/default.php, views/opendd/page/default.php,
+  views/opendd/page/shells/default.php, views/php/page/default.php,
+  views/php/page/shells/default.php, views/rss/page/default.php,
+  views/rss/page/shells/default.php, views/xml/page/default.php,
+  views/xml/page/shells/default.php: Moved page/shells/* to page/* 
+
+  	* mod/embed/views/default/embed/css.php, views/default/css/ie.php,
+  views/default/export/entity.php: entity-listing => elgg-image-block,
+  margin-top => mtm 
+
+  	* mod/groups/lib/groups.php,
+  mod/groups/views/default/forms/groups/delete.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forms/groups/search.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/profile/buttons.php,
+  .../views/default/groups/profile/profile_block.php,
+  .../views/default/groups/profile/widgets.php,
+  .../views/default/groups/sidebar/members.php: Touch ups of groups plugin 
+
+  	* mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php,
+  mod/embed/views/default/embed/lightbox_init.php,
+  mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/embed/views/default/group/default/embed.php,
+  mod/embed/views/default/object/file/embedlist.php: Touch ups for the embed
+  plugin -- this one needs some serious work still, though... 
+
+  	* views/default/output/url.php: Utilizing elgg_extract in output/url 
+
+  	* js/lib/configuration.js: Added elgg.get_site_url(), so people don't have
+  to deal with the config object. 
+
+  	* mod/diagnostics/actions/download.php,
+  .../views/default/admin/utilities/diagnostics.php,
+  .../views/default/diagnostics/forms/download.php: Touch ups for diagnostics
+  plugin 
+
+  	* views/default/admin/plugin_settings.php,
+  views/default/core/settings/tools.php,
+  views/default/forms/plugins/settings/save.php: Deprecated
+  (user)settings/$plugin_id/edit in favor of plugins/$plugin_id/(user)settings 
+
+  	* mod/bookmarks/start.php: Default permissions for new actions is logged_in,
+  so no need to make that explicit 
+
+  	* mod/blog/lib/blog.php, mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/input/datetime.php,
+  mod/blog/views/default/js/blog/save_draft.php: Cleaned up blog js 
+
+2011-02-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Fixes #2952 less silliness in Elgg now  
+
+  	* engine/lib/pageowner.php: Refs #2790 - fixes it for real this time  
+
+  	* engine/lib/pageowner.php: Fixes #2790 adds fix from 1.7 branch into trunk 
+
+2011-02-22  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* crontab.example, documentation/examples/crontab.example: Moved
+  crontab.example into documentation directory 
+
+2011-02-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/actions/developers/settings.php,
+  mod/developers/languages/en.php, mod/developers/manifest.xml,
+  .../views/default/admin/developers/settings.php,
+  mod/developers/views/default/developers/css.php,
+  .../views/default/forms/developers/settings.php: started adding a settings
+  page  
+
+2011-02-22  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* : hmmm... how did those get there? 
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/thewire/views/default/object/thewire.php,
+  views/default/object/default.php, views/default/page/layouts/content.php,
+  views/default/user/default.php: Fixes #2950: All files that were calling into
+  layout/* now use the up-to-date locations 
+
+  	* .../views/default/bookmarks/page_links.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/theme_preview/icons.php,
+  mod/thewire/views/default/thewire/metadata.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/core/likes/display.php, views/default/icon/user/default.php,
+  views/default/navigation/menu/metadata.php,
+  views/default/navigation/menu/site.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/page/elements/page_links.php,
+  views/default/page/elements/topbar.php,
+  views/default/river/relationship/friend/create.php: Fixes #2980: DRY'ed up
+  all plugins to use elgg_view_icon instead of generating their own html 
+
+  	* views/default/forms/comments/inline.php: Deprecated forms/comments/inline
+  in favor of passing inline => TRUE to forms/comments/add 
+
+  	* views/default/core/river/footer.php: core river footer taking advantage of
+  new DRY comment form 
+
+  	* engine/lib/views.php: Refs #2980: Added an elgg_view_icon function 
+
+  	* views/default/graphics/ajax_loader.php: Typo in ajax_loader 
+
+  	* views/default/navigation/listtype.php,
+  views/default/navigation/topbar_tools.php: Cleaned up some nav views 
+
+  	* views/default/navigation/menu/metadata.php: Refs #2950:
+  layout/objects/list/metadata => navigation/menu/metadata 
+
+  	* views/default/object/elements/list_body.php,
+  views/default/page/components/list/body.php,
+  views/default/page/layouts/content.php,
+  views/default/page/layouts/widgets.php: Refs #2950: update locations of
+  layout elements + moved page/components/list/body into
+  object/elements/list_body -- not sure if this will be the final location 
+
+  	* views/default/navigation/viewtype.php: Added appropraite @deprecated tag
+  to navigation/viewtype 
+
+  	* views/default/profile/icon.php: Included proper deprecation notice with
+  deprecated view 
+
+  	* views/default/layout/objects/list/body.php,
+  views/default/layout/objects/list/metadata.php,
+  views/default/layout/shells/content/filter.php,
+  views/default/layout/shells/content/footer.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/content/sidebar.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/layout/shells/widgets/add_panel.php,
+  views/default/page/components/list/body.php,
+  views/default/page/layouts/content/filter.php,
+  views/default/page/layouts/content/footer.php,
+  views/default/page/layouts/content/header.php,
+  views/default/page/layouts/content/sidebar.php,
+  views/default/page/layouts/widgets/add_button.php,
+  views/default/page/layouts/widgets/add_panel.php: Refs #2950: Moved /layout/
+  views into /page/ dir -- still not satisfied with page/components/list/body,
+  page/layouts/content/* and page/layouts/widgets/add_button 
+
+  	* views/default/forms/comments/add.php: Dry'ed up forms/comments/add a bit 
+
+  	* views/default/forms/comments/add.php: merged comments/inline and
+  comments/add forms 
+
+  	* views/default/forms/friends/edit.php: Deleted completed @todo 
+
+  	* pages/friends/add.php, pages/friends/edit.php,
+  views/default/forms/friends/edit.php: forms/friends/edit no longer contains
+  input/form logic 
+
+  	* views/default/admin/users/add.php, views/default/forms/useradd.php:
+  Extracted input/form login from forms/useradd 
+
+  	* engine/lib/admin.php, views/default/admin/components/invalid_plugin.php,
+  views/default/admin/components/plugin.php,
+  .../admin/components/plugin_dependencies.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugin_settings.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/core/settings/tools.php,
+  views/default/core/settings/tools/plugin.php,
+  .../forms/admin/plugins/simple_update_states.php,
+  views/default/forms/plugins/usersettings/save.php,
+  views/default/js/admin.php, views/default/object/plugin.php,
+  views/default/object/plugin/advanced.php,
+  .../object/plugin/elements/dependencies.php,
+  views/default/object/plugin/invalid.php,
+  views/default/object/plugin/simple.php: Refs #2950: Cleanup of plugin-related
+  view structure 
+
+  	* views/default/output/longtext.php: output/longtext can now apply arbitrary
+  html attributes to the wrapper div 
+
+  	* views/default/core/dashboard/blurb.php: Cleaned up core/dashboard/blurb to
+  take advantage of the new <div> wrapper around output/longtext 
+
+2011-02-21  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* pages/settings/tools.php: Removed use of deprecated set_page_owner 
+
+  	* views/default/admin/sidebar.php, views/default/admin/sidebar/menu.php,
+  views/default/page/layouts/admin.php: Refs #2950: Cleaned up admin sidebar
+  code 
+
+  	* engine/lib/deprecated-1.8.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/page/elements/owner_block.php: elgg-owner-block-menu =>
+  elgg-menu-owner-block 
+
+  	* views/default/admin/sidebar/menu.php,
+  views/default/layout/shells/admin/menu.php,
+  views/default/page/layouts/admin.php: Refs #2950: layout/shells/admin/menu =>
+  admin/sidebar/menu 
+
+  	* engine/lib/views.php, views/default/page/admin.php,
+  views/default/page/default.php, views/default/page/shells/admin.php,
+  views/default/page/shells/default.php, views/default/page/shells/upgrade.php,
+  views/default/page/shells/walled_garden.php, views/default/page/upgrade.php,
+  views/default/page/walled_garden.php: Refs #2950: Move page/shells/ directly
+  under /page/ since nowhere else in views do we use a shells directory. 
+
+  	* views/default/layout/objects/widget/controls.php,
+  views/default/layout/objects/widget/settings.php,
+  views/default/object/widget.php,
+  views/default/object/widget/elements/controls.php,
+  views/default/object/widget/elements/settings.php,
+  views/default/page/components/widget.php: Refs #2950: Moved widget code to
+  object/widget/* 
+
+2011-02-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php: Default page owner code now ignores the query.
+  Works for pages like pg/bookmarks/add/34?address=http://google.com  
+
+2011-02-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: fixed caching of user avatars  
+
+  	* engine/lib/admin.php, engine/lib/views.php, mod/bookmarks/start.php,
+  mod/categories/start.php, mod/custom_index/start.php,
+  .../views/default/page/shells/theme_preview.php, mod/embed/start.php,
+  mod/file/start.php, mod/groups/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/search/start.php, mod/tinymce/start.php,
+  mod/twitter/start.php, mod/zaudio/start.php, views/default/css.php,
+  views/default/css/elements/layout_objects.php, views/default/css/elgg.php,
+  views/default/css/screen.php, views/default/page/shells/default.php: Fixes
+  #2934 switching to css/elgg for css view since using a print viewtype is a
+  good idea and screen would become a confusing idea  
+
+  	* actions/likes/add.php, engine/classes/ElggEntity.php, languages/en.php,
+  views/default/core/likes/display.php, views/default/core/river/controls.php:
+  fixes #2885 #2569 likes controlled by canAnnotate() with plugin hook  
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggObject.php, engine/classes/ElggUser.php,
+  mod/blog/classes/ElggBlog.php, mod/thewire/classes/ElggWire.php,
+  mod/thewire/start.php, views/default/core/river/controls.php: Fixes #2971
+  added canComment() method and implemented it for ElggBlog  
+
+2011-02-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/activate.php,
+  actions/admin/plugins/activate_all.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/deactivate_all.php,
+  actions/admin/plugins/set_priority.php,
+  actions/admin/plugins/simple_update_states.php, install/ElggInstaller.php,
+  languages/en.php: Fixes #2452. Removed the first admin installation notice.
+  It was just a reminder to his "save" on the simple plugins screen. This is
+  pretty obvious.  
+
+  	* engine/lib/upgrades/2010050701.php: Fixes #2310. Rewriting
+  disable_registration to allow_registration in walled garden upgrade.  
+
+  	* mod/bookmarks/actions/bookmarks/save.php,
+  mod/messageboard/actions/add.php,
+  mod/messageboard/views/default/messageboard/js.php: Fixes #2719. Removing
+  hack from bookmarks add. Now appends http:// to www.example.com and validates
+  that.  
+
+2011-02-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/save.php, mod/blog/lib/blog.php: fixed blog sticky
+  forms  
+
+  	* mod/file/index.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/view.php, mod/groups/lib/discussion.php, mod/groups/start.php,
+  mod/pages/friends.php, mod/pages/index.php, mod/pages/start.php,
+  mod/thewire/start.php: Fixes #2970 updated groups, file, pages, and wire
+  plugins for automatic page owner setting  
+
+  	* mod/bookmarks/actions/bookmarks/save.php: fixed sticky forms for bookmarks
+   
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: fixed copy and paste
+  error in bookmarks  
+
+  	* mod/blog/lib/blog.php, mod/bookmarks/pages/add.php,
+  mod/bookmarks/pages/all.php, mod/bookmarks/pages/edit.php,
+  mod/bookmarks/pages/friends.php, mod/bookmarks/pages/owner.php,
+  mod/bookmarks/pages/view.php, mod/bookmarks/start.php: Refs #2970 updated
+  blog and bookmarks plugins  
+
+2011-02-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/create_upgrade.php: Fixed a few bugs with
+  create_upgrade.php.  It now also automatically increments version.php.  
+
+  	* version.php: Refs #2049: Missed version.php.  
+
+2011-02-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php: added code to figure out page owner rather than
+  explicitly setting in all the plugin page handlers  
+
+2011-02-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* ..._svn-custom_profile_fields-390ac967b0bb5665.php: Fixes #2049. Created
+  migration for 1.7 custom profile fields to 1.8.  
+
+  	* mod/groups/actions/delete.php: Refs #2787, #2956: Merged fix for deleting
+  group icon files on group delete to trunk.  
+
+  	* views/default/core/river/filter.php: Refs #2697, #2956. Ported fix to show
+  users and groups in river filter to trunk.  
+
+  	* engine/lib/actions.php: Refs #2833, #2956. Merged 1.7's action timeout
+  changes to 1.8.  
+
+  	* engine/tests/regression/trac_bugs.php: Refs #2956. Merged left out merges
+  from r2799 to trunk.  
+
+  	* engine/lib/elgglib.php: Refs #2749, #2956. Merged elgg_depracated_notice()
+  fixes to trunk.  
+
+  	* engine/lib/configuration.php: Refs #2793, #2956. Ported
+  run_function_once() and datalist_get/set() changes for values > 32 chars to
+  trunk.  
+
+  	* engine/lib/configuration.php: Refs #2813, #2956. Ported get_config()
+  returns null to 1.8's get_config() and elgg_get_config().  
+
+  	* engine/lib/notification.php: Refs #2617, #2956: Merged email notification
+  exception message fix in r7926 to trunk.  
+
+  	* mod/file/start.php: Refs #2765, #2956. Merged r7830 fix for group files to
+  trunk.  
+
+  	* engine/classes/ElggEntity.php, engine/tests/objects/entities.php: Fixes
+  #2963: Rewrote ElggEntity->setMetadata() because yikes. Wrote unit tests for
+  setting metadata on saved / unsaved entities.  
+
+2011-02-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/layouts/admin.php: only include footer/analytics view
+  once on admin pages  
+
+2011-02-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../actions/resend_validation.php,
+  mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  .../views/default/uservalidationbyemail/js.php,
+  .../uservalidationbyemail/unvalidated_user.php: Fixes #2658. Merged
+  uservalidationbyemail changes from 1.7 to 1.8. This plugin needs cleanup.  
+
+  	* engine/lib/widgets.php: Fixed problems with user-self registration if
+  default widgets are set.  
+
+  	* js/lib/ui.js: Removing more debug code.  
+
+  	* js/lib/ui.js: Removing debug code from previous.  
+
+  	* js/lib/ui.js: Fixes #2947: User hover menu attached to body and shows
+  regardless of overflow.  
+
+  	* mod/bookmarks/actions/bookmarks/save.php: Fixes #2719: Addresses are
+  checked and normalized (and checked again) for bookmarks.  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/views/default/forms/messages/send.php: Can send messages to
+  non-friends.  
+
+  	* languages/en.php, views/default/admin/appearance/default_widgets.php:
+  Added instructions for default widgets.  
+
+  	* actions/widgets/add.php: No need to say the widget was added because we
+  can see it happen.  
+
+  	* views/default/css/admin.php: Copied all the icons into the admin theme.  
+
+  	* install/ElggInstaller.php: Installation loads 3 default widgets for the
+  admin dashboard.  
+
+  	* views/default/css/elements/icons.php: Refs #2961: Restoring old icon CSS
+  for sprites and hover menu.  
+
+  	* mod/messageboard/views/default/messageboard/js.php: Fixes #2962. I hate
+  ie.  
+
+  	* mod/messageboard/actions/add.php, mod/messageboard/actions/delete.php,
+  mod/messageboard/ajax_endpoint/load.php, mod/messageboard/history.php,
+  mod/messageboard/index.php, mod/messageboard/languages/en.php,
+  mod/messageboard/manifest.xml, mod/messageboard/pages/owner.php,
+  mod/messageboard/start.php, .../views/default/annotation/messageboard.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  .../default/messageboard/messageboard_content.php,
+  .../views/default/widgets/messageboard/content.php,
+  .../views/default/widgets/messageboard/edit.php: Refs #2916. More cleanup of
+  the messageboard widget.  
+
+  	* views/default/admin/appearance/default_widgets.php: Refs #2753. Missed
+  this one.  
+
+  	* js/lib/ajax.js: elgg.action() now supports full URLs.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/views/default/input/longtext.php: fixed tinymce "remove
+  editor" javascript  
+
+  	* languages/en.php: updated language string for comments  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/elgglib.js: elgg.normalize_url() JS does the same as
+  elgg_normalize_url() PHP.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/layout/shells/custom_index.php,
+  .../views/default/page/layouts/custom_index.php: updated the custom index for
+  new views layout structure  
+
+  	* mod/notifications/start.php: fixed the call to unextend the user settings
+  for notifications  
+
+  	* views/default/page/elements/messages.php: system messages use autop() for
+  formatting rather than output/longtext  
+
+  	* views/default/css/elements/chrome.php,
+  views/default/forms/comments/add.php,
+  views/default/page/elements/comments.php: improved the styling of the comment
+  area  
+
+  	* languages/en.php, mod/blog/languages/en.php, mod/blog/lib/blog.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php,
+  mod/thewire/views/default/object/thewire.php: Fixes #2824 moved byline text
+  in core language file  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js: Avatar menus use live() so they'll work with content
+  inserted into the dom.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/chrome.php,
+  views/default/css/elements/typography.php, views/default/output/longtext.php:
+  added elgg-output class for displaying user input with typical styling for
+  lists and tables  
+
+  	* engine/lib/views.php: fixed typo  
+
+  	* views/default/page/elements/comments.php: another work around to suppress
+  incorrect warnings from elgg_view()  
+
+  	* views/default/input/longtext.php: added a work around for injecting
+  internal* variables to handle deprecation code - this prevents warnings from
+  being emitted for no reason  
+
+  	* mod/bookmarks/views/default/object/bookmarks.php,
+  views/default/css/elements/icons.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php,
+  views/default/layout/objects/list/body.php,
+  views/default/output/tagcloud.php, views/default/output/tags.php: improved
+  icon css so that they do not require having display: block  
+
+  	* views/default/css/screen.php: removed a $CONFIG usage in css/screen view  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/annotation/generic_comment.php: Genericked up
+  annotation/generic_comment view to allow reuse in plugins.  
+
+  	* install/ElggInstaller.php: Fixes #2959: Removed engine/lib/install.php
+  from ElggInstaller since it's no longer required.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/likes/display.php: fixed typo on function name  
+
+2011-02-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/css/elements/typography.php: Moving elgg-heading-main into
+  typography 
+
+  	* views/default/css/elements/page_layout.php: That wasn't supposed to be
+  there... 
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/css/elements/typography.php: Moved elgg-heading-site into
+  typography 
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messageboard/actions/add.php, mod/messageboard/start.php,
+  .../views/default/forms/messageboard/add.php,
+  .../views/default/messageboard/forms/add.php,
+  mod/messageboard/views/default/messageboard/js.php,
+  .../views/default/widgets/messageboard/content.php: Refs #2916: Moved
+  messageboard js into elgg.messageboard object. Moved forms into
+  forms/messageboard.  Can post now, but wow this plugin needs cleaned up.  
+
+2011-02-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/views/default/messages/topbar.php: More consistent way of
+  building topbar item for messages plugin 
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/actions/bookmarks/save.php: sticky form wasn't being cleared
+  in bookmarks - that's fixed now  
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: fixed display issue when
+  a bookmark has no description text  
+
+2011-02-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/theme_preview/forms.php: elgg-state-selected doesn't
+  make sense for non-default buttons 
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/actions/bookmarks/delete.php: fixed forward url when
+  deleting a bookmark  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixes #2905: Admin action links on user hover menu
+  asks for confirmation.  
+
+  	* engine/classes/ElggMenuItem.php,
+  views/default/navigation/menu/elements/item.php: Added 4 methods to
+  ElggMenuItem: get/setLinkClass() and get/setItemClass(). This allows you to
+  put classes on the a and li tags it generates.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: added documentation for the livesearch page handler 
+
+2011-02-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/page/shells/theme_preview.php,
+  .../views/default/theme_preview/forms.php: More buttons in forms theme
+  preview 
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js, views/default/output/confirmlink.php: Pulled the confirm
+  link output view's JS into elgg.us. Any links with elgg-requires-confirmation
+  will get a confirm box with the title of the anchor tag as the question, or
+  the default "Are you sure?" if that doesn't exist.  
+
+  	* views/default/input/plaintext.php: Fixed the tab that was showing up in
+  every text area.  
+
+2011-02-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/search_hooks.php: removed $CONFIG usage in search hooks  
+
+  	* mod/pages/views/default/pages/sidebar/history.php: Fixes #2955 fixed typo 
+
+  	* mod/blog/lib/blog.php, mod/thewire/tests/regex.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/forms/admin/menu/save.php: Fixes #2428 last of the $CONFIG
+  removals. Anything missed can be individual tickets  
+
+2011-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/wrapper.php: Fixes #2768. min-height
+  needed a little bit more for the profile widgets.  
+
+  	* mod/groups/start.php: Removing test group default widget code.  
+
+  	* actions/widgets/add.php, actions/widgets/delete.php,
+  actions/widgets/move.php, actions/widgets/save.php, engine/lib/views.php,
+  engine/lib/widgets.php, js/lib/ui.widgets.js, languages/en.php,
+  mod/defaultwidgets/actions/update.php, mod/defaultwidgets/languages/en.php,
+  mod/defaultwidgets/manifest.xml, mod/defaultwidgets/start.php,
+  .../admin/appearance/default_dashboard_widgets.php,
+  .../admin/appearance/default_profile_widgets.php,
+  .../views/default/defaultwidgets/editor.php, mod/groups/start.php,
+  mod/profile/start.php, views/default/object/plugin.php,
+  views/default/page/components/widget.php,
+  views/default/page/layouts/widgets.php: Fixes #2753: Default widgets merged
+  into core as extensible admin section and updated to work with new widgets.
+  Will need an upgrade for users running the old default widgets in 1.7.  
+
+2011-02-19  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/shells/widgets/add_panel.php: clearfix > clearfloat 
+
+  	* mod/developers/languages/en.php, mod/developers/start.php,
+  .../views/default/page/shells/theme_preview.php,
+  .../views/default/theme_preview/header.php,
+  .../views/default/theme_preview/index.php,
+  mod/developers/views/default/theme_preview/nav.php,
+  .../views/default/theme_preview/navigation.php: theme_preview is using more
+  familiar/correct page handling practices 
+
+2011-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/pageowner.js, views/default/js/elgg.php: Added stub for page owners
+  in elgg.js  
+
+  	* views/default/core/likes/display.php: Fixes #2953: Like button doesn't
+  show up for logged out users.  
+
+  	* engine/lib/entities.php: Fixing list_registered_entities() from displaying
+  things it should.  You now must explicitly register object subtypes to get
+  them to display.  
+
+  	* views/default/forms/plugins/settings/save.php: Fixed plugin settings save
+  form.  
+
+  	* .../views/default/thewire/scripts/counter.js,
+  mod/twitterservice/start.php, mod/twitterservice/twitterservice_lib.php,
+  .../views/default/twitterservice/metatags.php: Removing unneeded @copyright
+  and @license tags.  
+
+2011-02-18  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: Added some color to the selected state for
+  admin page menu so we can tell what page we're on 
+
+  	* views/default/css/admin.php, views/default/css/elements/reset.php: Added
+  overflow-y: scroll by default so that the page doesn't get jerky when an
+  animation breaks the fold 
+
+  	* views/default/css/admin.php: Improved the admin menu a bit 
+
+2011-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/categories/manifest.xml, mod/custom_index/manifest.xml,
+  mod/defaultwidgets/manifest.xml, mod/developers/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/embed/manifest.xml,
+  mod/externalpages/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/oauth_lib/manifest.xml,
+  mod/pages/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/twitterservice/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: Updated copyright and author information in plugin
+  manifests.  
+
+2011-02-18  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php, engine/start.php: Fixes #2943: Removed
+  engine/lib/install.php 
+
+2011-02-18  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/twitterservice_lib.php: Adding plugin hooks for
+  authorization and login events.  
+
+2011-02-18  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/river.php, engine/lib/views.php,
+  .../views/default/theme_preview/objects.php,
+  views/default/core/river/body.php, views/default/layout/objects/gallery.php,
+  views/default/layout/objects/image_block.php,
+  views/default/layout/objects/list.php,
+  views/default/layout/objects/module.php,
+  views/default/layout/objects/widget.php, views/default/object/widget.php,
+  views/default/page/components/gallery.php,
+  views/default/page/components/image_block.php,
+  views/default/page/components/list.php,
+  views/default/page/components/module.php,
+  views/default/page/components/widget.php,
+  views/default/page/elements/owner_block.php, views/default/river/item.php:
+  Refs #2950: layout/objects => page/components 
+
+2011-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/layouts/widgets.php: Removed unused var in widgets
+  layout.  
+
+2011-02-18  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, views/default/layout/shells/admin.php,
+  views/default/layout/shells/content.php,
+  views/default/layout/shells/default.php,
+  views/default/layout/shells/one_column.php,
+  views/default/layout/shells/one_sidebar.php,
+  .../layout/shells/two_column_left_sidebar.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/layout/shells/widgets.php,
+  views/default/page/layouts/admin.php, views/default/page/layouts/content.php,
+  views/default/page/layouts/default.php,
+  views/default/page/layouts/one_column.php,
+  views/default/page/layouts/one_sidebar.php,
+  .../page/layouts/two_column_left_sidebar.php,
+  views/default/page/layouts/two_sidebar.php,
+  views/default/page/layouts/widgets.php: Refs #2950: layout/shells =>
+  page/layouts 
+
+  	* engine/lib/views.php, mod/search/views/default/search/list.php,
+  views/default/layout/elements/comments.php,
+  views/default/layout/elements/owner_block.php,
+  views/default/layout/elements/page_links.php,
+  views/default/layout/elements/sidebar.php,
+  views/default/layout/elements/title.php,
+  views/default/layout/shells/one_sidebar.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/page/elements/comments.php,
+  views/default/page/elements/owner_block.php,
+  views/default/page/elements/page_links.php,
+  views/default/page/elements/sidebar.php,
+  views/default/page/elements/title.php: Refs #2950: layout/elements =>
+  page/elements 
+
+  	* views/default/admin/statistics/overview.php: @todos for refactoring admin
+  statistics 
+
+2011-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginPackage.php, languages/en.php: Fixes #2945, Refs
+  #2946. Plugins that require priority on an uninstalled plugin don't crash the
+  plugins admin.  
+
+  	* .../views/default/bookmarks/page_links.php: Don't show the bookmark this
+  link if you're not logged in.  
+
+2011-02-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/views/default/file/css.php,
+  .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/icon/object/file.php,
+  views/default/css/elements/chrome.php,
+  views/default/css/elements/layout_objects.php: improved .elgg-gallery and
+  added .elgg-photo  
+
+2011-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php: Refs #2847. Install now sets the
+  viewspath_cache_enabled.  
+
+  	* engine/lib/cache.php, install/ElggInstaller.php: Refs #2847. Fixed
+  simplecache settings and functionality for initial installation.  
+
+  	* engine/lib/database.php, engine/lib/deprecated-1.8.php,
+  engine/lib/upgrades/create_upgrade.php, engine/lib/version.php,
+  install/ElggInstaller.php, upgrade.php: Fixes #1433, #2183. Upgrades are now
+  tracked and will be run if needed regardless of version.  
+
+2011-02-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/twitterservice_lib.php: Fixes faulty logic in twitter
+  services that allowed new users to register via twitter when site
+  registration was off.  
+
+  	* views/default/admin/components/plugin_settings.php: Fixes #2938: Restored
+  the $vars['entity'] in plugin settings for backward compatibility with
+  plugins.  
+
+2011-02-17  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/components/plugin_settings.php: Cleaned up a manual
+  implementation of elgg-module 
+
+2011-02-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_bookmarklet.gif, mod/bookmarks/graphics/bookmark.gif,
+  mod/bookmarks/graphics/bookmarklet.gif, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/bookmarks/js.php,
+  .../views/default/bookmarks/page_links.php: Further cleanup of bookmarks.
+  Moved bookmarklet to plugin. Pulled in the 1.7 bookmark pin and made the
+  "Bookmark this page" less ugly. Added js to append the title.  
+
+  	* mod/bookmarks/actions/bookmarks/edit.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/group_module.php,
+  .../default/bookmarks/groupprofile_bookmarks.php,
+  .../views/default/forms/bookmarks/save.php: Fixes #2680. Added group profile
+  bookmark widget. Fixed a problem editing bookmarks.  
+
+  	* mod/bookmarks/pages/owner.php: Hiding the filter tabs for bookmarks when
+  not in a filter context.  
+
+  	* views/default/layout/shells/content/filter.php: Fixed typo in filter nav
+  view.  
+
+  	* mod/bookmarks/lib/bookmarks.php, mod/bookmarks/pages/add.php,
+  mod/bookmarks/pages/edit.php, mod/bookmarks/pages/owner.php,
+  mod/bookmarks/start.php: Fixes #2680: Added group support to bookmarks
+  plugin.  
+
+  	* mod/bookmarks/bookmarklet.php, mod/bookmarks/languages/en.php,
+  mod/bookmarks/lib/bookmarks.php, mod/bookmarks/pages/add.php,
+  mod/bookmarks/pages/all.php, mod/bookmarks/pages/bookmarklet.php,
+  mod/bookmarks/pages/friends.php, mod/bookmarks/pages/owner.php,
+  mod/bookmarks/start.php, .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/owner_block.php,
+  mod/bookmarks/views/default/bookmarks/sharing.php,
+  .../default/river/object/bookmarks/annotate.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/edit.php: Refs #2680: Bookmarks revamp,
+  part 3: menus and bookmarklet.  
+
+2011-02-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/file/views/default/object/file.php: calling the new category output view
+  in the plugins - looks like the pages plugin is missing the categories code  
+
+  	* mod/tinymce/start.php: added tinymce to admin css  
+
+2011-02-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/widget/settings.php: Fixes #2915. Can edit
+  widget settings again.  
+
+  	* mod/bookmarks/actions/bookmarks/add.php,
+  mod/bookmarks/actions/bookmarks/delete.php,
+  mod/bookmarks/actions/bookmarks/save.php, mod/bookmarks/lib/bookmarks.php,
+  mod/bookmarks/pages/add.php, mod/bookmarks/pages/edit.php,
+  mod/bookmarks/pages/inbox.php, mod/bookmarks/pages/view.php,
+  mod/bookmarks/start.php, .../views/default/forms/bookmarks/save.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/widgets/bookmarks/content.php,
+  .../views/default/widgets/bookmarks/edit.php,
+  .../views/default/widgets/bookmarks/view.php: Refs #2680. Bookmarks revamp,
+  part 2.  
+
+2011-02-16  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/groups/start.php, mod/messages/start.php, mod/pages/start.php,
+  mod/profile/start.php, mod/thewire/start.php: Updated
+  register_entity_url_handler => elgg_* in plugins.  Used this regex:
+  ([^_a-z])register_entity_url_handler\((.*),(.*,.*)\); 
+
+2011-02-15  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.7.php, engine/lib/deprecated-1.8.php,
+  engine/lib/elgglib.php, engine/lib/install.php, engine/lib/pam.php,
+  engine/lib/views.php, engine/lib/widgets.php: Moved all deprecated core
+  functions into the appropriate deprecation fine 
+
+  	* engine/lib/entities.php, engine/lib/users.php, mod/blog/start.php,
+  mod/bookmarks/start.php, mod/file/start.php, mod/groups/start.php,
+  mod/pages/start.php, mod/thewire/start.php: Removed all calls to deprecated
+  register_entity_type 
+
+  	* actions/admin/site/update_advanced.php, engine/handlers/cache_handler.php,
+  engine/lib/actions.php, engine/lib/admin.php, engine/lib/cache.php,
+  engine/lib/deprecated-1.8.php, engine/lib/upgrades/2010060101.php,
+  engine/lib/views.php, engine/start.php,
+  .../views/default/page/shells/theme_preview.php, mod/notifications/index.php,
+  mod/profile/start.php, views/default/core/friends/picker.php,
+  views/default/page/elements/head.php: Fixes #2923: Removed "view" prefix from
+  simplecache function names 
+
+  	* engine/lib/elgglib.php: Fixes #2695: Return false on autoload fail, rather
+  than throwing exception 
+
+  	* engine/lib/entities.php: Fixes #2777: delete_entity is now recursive 
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php,
+  engine/lib/entities.php, engine/lib/extender.php, engine/lib/metadata.php,
+  engine/lib/relationships.php: Fixes #2860: Deprecated several registration
+  functions that were using the 'callback-first' ordering 
+
+  	* views/default/css/elements/grid.php: Fixes #2924: elgg-grid clearfixes 
+
+  	* engine/lib/entities.php: Fixes #2476: update_entity_last_action()
+  sanitizes posted time. 
+
+2011-02-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Updated egef_plugin_user_settings() to accept
+  plugin_id instead of plugin_name.  
+
+  	* engine/lib/upgrades/2011010101.php: Fixes #2926: Fixed upgrade for plugin
+  user settings.  
+
+2011-02-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/languages/en.php: added language strings for theme preview 
+
+2011-02-15  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/shells/walled_garden.php: Refs #2693: Walledgarden code
+  cleanup -- Too much custom code 
+
+2011-02-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/start.php,
+  mod/developers/views/default/developers/ipsum.php,
+  .../views/default/theme_preview/forms.php,
+  .../views/default/theme_preview/general.php,
+  .../views/default/theme_preview/objects.php,
+  .../views/default/theme_preview/widgets.php: moved lorem ipsum into a view  
+
+2011-02-15  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/lib/blog.php, mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/input/datetime.php,
+  mod/blog/views/default/widgets/blog/edit.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  mod/bookmarks/views/default/bookmarks/sharing.php,
+  mod/categories/views/default/input/categories.php,
+  .../views/default/settings/categories/edit.php,
+  .../views/default/defaultwidgets/editor.php,
+  .../views/default/theme_preview/forms.php,
+  mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/upload/content.php,
+  .../views/default/forms/expages/edit.php,
+  mod/file/views/default/file/embed_upload.php,
+  mod/file/views/default/forms/file/upload.php,
+  mod/file/views/default/widgets/filerepo/edit.php,
+  .../default/settings/garbagecollector/edit.php,
+  mod/groups/views/default/forms/discussion/save.php,
+  mod/groups/views/default/forms/groups/delete.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forms/groups/search.php,
+  mod/groups/views/default/settings/groups/edit.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  .../views/default/settings/logrotate/edit.php, mod/messages/read.php,
+  .../views/default/forms/messages/process.php,
+  .../views/default/forms/messages/reply.php,
+  mod/messages/views/default/forms/messages/send.php,
+  .../notifications/subscriptions/forminternals.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  .../views/default/forms/reportedcontent/add.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/widgets/reportedcontent/edit.php,
+  .../views/default/widgets/tagcloud/edit.php,
+  mod/thewire/views/default/forms/thewire/add.php,
+  mod/thewire/views/default/widgets/thewire/edit.php,
+  mod/tinymce/views/default/input/longtext.php,
+  .../views/default/settings/twitterservice/edit.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  .../uservalidationbyemail/unvalidated_user.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/friends/picker.php, views/default/core/river/controls.php,
+  views/default/core/river/filter.php, views/default/core/river/footer.php,
+  .../core/settings/account/default_access.php,
+  views/default/core/settings/account/email.php,
+  views/default/core/settings/account/language.php,
+  views/default/core/settings/account/name.php,
+  .../core/settings/account/notifications.php,
+  views/default/core/settings/account/password.php,
+  views/default/forms/admin/menu/save.php,
+  views/default/forms/admin/site/update_advanced.php,
+  views/default/forms/admin/site/update_basic.php,
+  views/default/forms/avatar/crop.php, views/default/forms/avatar/upload.php,
+  views/default/forms/comments/add.php,
+  views/default/forms/comments/inline.php,
+  views/default/forms/friends/edit.php, views/default/forms/login.php,
+  views/default/forms/members/name_search.php,
+  views/default/forms/members/tag_search.php,
+  views/default/forms/plugins/settings/save.php,
+  views/default/forms/profile/edit.php,
+  views/default/forms/profile/fields/add.php, views/default/forms/register.php,
+  views/default/forms/user/passwordreset.php,
+  views/default/forms/user/requestnewpassword.php,
+  views/default/forms/useradd.php, views/default/forms/widgets/save.php,
+  views/default/graphics/ajax_loader.php, views/default/input/access.php,
+  views/default/input/checkboxes.php, views/default/input/datepicker.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/radio.php, views/default/input/securitytoken.php,
+  views/default/input/userpicker.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_panel.php,
+  views/default/navigation/tabs.php,
+  views/default/widgets/content_stats/edit.php,
+  views/default/widgets/friends/edit.php,
+  views/default/widgets/new_users/edit.php,
+  views/default/widgets/online_users/edit.php,
+  views/installation/input/access.php, views/installation/input/button.php,
+  views/installation/input/checkboxes.php,
+  views/installation/input/dropdown.php, views/installation/input/form.php,
+  views/installation/input/hidden.php, views/installation/input/longtext.php,
+  views/installation/input/password.php,
+  views/installation/input/securitytoken.php,
+  views/installation/input/text.php,
+  views/installation/install/forms/template.php: Fixes #2921: converted
+  internalname => name and internalid => id 
+
+  	* engine/lib/cache.php, engine/lib/views.php: Fixes #2920: Moved simplecache
+  functions into cache.php 
+
+  	* engine/classes/ElggBatch.php, engine/classes/ElggPluginManifest.php,
+  engine/lib/admin.php, engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/lib/metastrings.php, engine/lib/plugins.php, engine/lib/river.php,
+  engine/lib/views.php, engine/lib/xml.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/forms/file/upload.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/forms/discussion/save.php,
+  mod/groups/views/default/groups/edit.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/messages/views/default/forms/messages/send.php,
+  mod/messages/views/default/object/messages.php,
+  mod/pages/views/default/object/page_top.php,
+  .../views/default/pages/sidebar/navigation.php,
+  mod/profile/views/default/profile/owner_block.php,
+  mod/thewire/views/default/forms/thewire/add.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/metadata.php,
+  mod/uservalidationbyemail/start.php,
+  .../uservalidationbyemail/unvalidated_user.php,
+  views/default/admin/components/invalid_plugin.php,
+  .../admin/components/plugin_dependencies.php,
+  views/default/annotation/generic_comment.php,
+  views/default/forms/plugins/settings/save.php,
+  views/default/forms/widgets/save.php, views/default/icon/user/default.php,
+  views/default/input/checkboxes.php, views/default/input/radio.php,
+  views/default/layout/elements/comments.php,
+  views/default/layout/objects/gallery.php,
+  views/default/layout/objects/image_block.php,
+  views/default/layout/objects/list.php,
+  views/default/layout/objects/list/body.php,
+  views/default/layout/objects/list/metadata.php,
+  views/default/layout/objects/module.php,
+  views/default/layout/objects/widget.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/shells/content.php,
+  views/default/layout/shells/content/filter.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_panel.php,
+  views/default/navigation/breadcrumbs.php,
+  views/default/navigation/menu/elements/group.php,
+  views/default/navigation/menu/user_hover.php,
+  views/default/navigation/pagination.php, views/default/navigation/tabs.php,
+  views/default/object/plugin.php, views/default/output/confirmlink.php,
+  views/default/output/longtext.php, views/default/output/url.php,
+  views/default/page/elements/body.php, views/default/profile/icon.php,
+  views/rss/layout/objects/list.php: Fixes #2808: elgg_get_array_value =>
+  elgg_extract 
+
+  	* js/lib/userpicker.js, views/default/input/autocomplete.php,
+  views/default/input/userpicker.php: Refs #2102: addressing more
+  userpicker/autocomplete bugs 
+
+  	* views/default/input/autocomplete.php: Refs #2102: Some input/autocomplete
+  fixes 
+
+  	* documentation/stubs/config.php, engine/handlers/page_handler.php,
+  engine/lib/admin.php, engine/lib/cron.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/input.php, engine/lib/pagehandler.php,
+  engine/lib/river.php, engine/lib/tags.php, engine/lib/user_settings.php,
+  engine/lib/users.php, js/lib/friends_picker.js, mod/blog/start.php,
+  mod/bookmarks/start.php, mod/categories/start.php, mod/developers/start.php,
+  mod/diagnostics/start.php, mod/embed/start.php, mod/externalpages/start.php,
+  mod/file/start.php, mod/groups/start.php, mod/invitefriends/start.php,
+  mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/search/start.php, mod/thewire/start.php,
+  mod/twitterservice/start.php, mod/uservalidationbyemail/start.php: Replaced
+  all occurrences of register_page_handler in core with
+  elgg_register_page_handler 
+
+  	* views/default/js/friendsPickerv1.php: Friendspicker was moved to
+  js/lib/friends_picker.js 
+
+  	* js/lib/userpicker.js, views/default/input/userpicker.php: Refs #2102:
+  Replace input/userpicker with jQuery UI autocomplete 
+
+  	* htaccess_dist: Combining two rewrite rules into one 
+
+2011-02-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/autocomplete.js, views/default/input/autocomplete.php: Refs #2102:
+  Replaced input/autocomplete with jQuery UI autocomplete (untested) 
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/pagehandler.php: Prepended elgg_
+  to (un)register_page_handler() functions.  Deprecated old ones 
+
+  	* views/default/js/initialize_elgg.php,
+  views/default/page/elements/head.php: Views in the js/ directory should not
+  contain <script> tags 
+
+2011-02-14  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/twitterservice_lib.php: Saving avatar filename with
+  user GUID instead of old-style username.  
+
+2011-02-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/elgg.php: Removed unnecessary deprecated javascript
+  function 
+
+  	* js/lib/languages.js, js/lib/session.js, js/lib/ui.widgets.js: No need for
+  double-namespacing of javascript functions 
+
+  	* mod/developers/views/default/developers/css.php: Give the css preview a
+  little more vertical breathing room 
+
+  	* engine/lib/views.php: Refs #2610: Custom template handler for views now
+  sent through call_user_func 
+
+  	* engine/lib/views.php: Refs #2124: Adding backwards compatibility
+  conversions for internalname/internalid 
+
+  	* views/default/page/elements/body.php,
+  views/default/page/elements/footer.php,
+  views/default/page/elements/header.php,
+  views/default/page/elements/messages.php,
+  views/default/page/elements/topbar.php, views/default/page/shells/admin.php,
+  views/default/page/shells/default.php: Cleaned up views/default/page/
+  directory 
+
+  	* engine/lib/views.php, vendors/jquery/jquery-1.4.2.min.js,
+  vendors/jquery/jquery-1.5.min.js, vendors/jquery/jquery-ui-1.7.2.min.js,
+  vendors/jquery/jquery-ui-1.8.9.min.js: Refs #2525: jQuery => 1.5, jQuery UI
+  => 1.8.9 
+
+  	* views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php,
+  views/default/css/elements/modules.php: More cleanup of login/forms css --
+  converted login_dropdown to use elgg-toggler pattern 
+
+  	* js/lib/ui.js: Fixes #2902: Added elgg-toggler pattern. 
+
+2011-02-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: remove some unused css from admin theme  
+
+2011-02-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggBatch.php: Clearing caches in ElggBatch.  
+
+  	* engine/handlers/cache_handler.php: Cache handler won't serve up cached
+  pages if caching is disabled. Refs #2758: Added call to
+  elgg_view_regenerate_simplecache() on cache misses if cache is enabled.
+  Leaving #2758 open in case Cash has a better idea since he's more familiar
+  with the simple cache changes.  
+
+  	* engine/classes/ElggEntity.php, engine/lib/metadata.php: Removed last of
+  deprecated metadata calls in trunk.  
+
+  	* actions/comments/delete.php, actions/likes/delete.php,
+  actions/profile/edit.php, engine/classes/ElggAnnotation.php,
+  engine/classes/ElggEntity.php, engine/classes/ElggRiverItem.php,
+  engine/handlers/export_handler.php, engine/lib/annotations.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/tests/api/entity_getter_functions.php,
+  engine/tests/api/metastrings.php, engine/tests/regression/trac_bugs.php,
+  mod/blog/lib/blog.php, mod/messageboard/actions/delete.php,
+  mod/pages/revision.php: Updated trunk to use new annotation functions. Added
+  checks for annotations_* options vs annotation_* options because it's so easy
+  to confuse.  
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggUser.php,
+  engine/lib/entities.php: Fixes #2918. Moved annotation/metadata delete
+  functions from ElggUser to ElggEntity. When deleted, entities now correctly
+  delete metadata they own as well as metadata on them. Removed uses of
+  deprecated functions.  
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php: More fixes to annotations/metadata changes. Now
+  all function support getting via a metastring id.  
+
+  	* engine/lib/relationships.php: Fixes #2914. Merged fix for r.time_created
+  sorting to trunk.  
+
+2011-02-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/developers/start.php, .../views/default/theme_preview/forms.php,
+  .../views/default/theme_preview/header.php, views/default/icon/default.php:
+  getting rid of some warnings in theme preview  
+
+  	* mod/developers/start.php, .../views/default/admin/developers/preview.php,
+  .../views/default/theme_preview/forms.php,
+  .../views/default/theme_preview/general.php,
+  .../views/default/theme_preview/grid.php,
+  .../views/default/theme_preview/header.php,
+  .../views/default/theme_preview/icons.php,
+  mod/developers/views/default/theme_preview/nav.php,
+  .../views/default/theme_preview/objects.php,
+  .../views/default/theme_preview/widgets.php: Refs #2903 navigation updated
+  for theme preview  
+
+2011-02-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php,
+  engine/lib/elgglib.php, engine/lib/metadata.php,
+  engine/tests/api/metastrings.php,
+  mod/pages/views/default/object/page_top.php: Refs #2912. Added checks for
+  constraints in dangerous functions. Unit tests no longer remove all
+  metadata/annotations.  
+
+2011-02-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/theming/preview/forms.php,
+  documentation/theming/preview/general.php,
+  documentation/theming/preview/grid.php,
+  documentation/theming/preview/head.php,
+  documentation/theming/preview/icons.php,
+  documentation/theming/preview/index.php,
+  documentation/theming/preview/nav.php,
+  documentation/theming/preview/objects.php,
+  documentation/theming/preview/widgets.php, mod/developers/start.php,
+  .../views/default/page/shells/theme_preview.php,
+  .../views/default/theme_preview/forms.php,
+  .../views/default/theme_preview/general.php,
+  .../views/default/theme_preview/grid.php,
+  .../views/default/theme_preview/icons.php,
+  .../views/default/theme_preview/index.php,
+  mod/developers/views/default/theme_preview/nav.php,
+  .../views/default/theme_preview/objects.php,
+  .../views/default/theme_preview/widgets.php: Refs #2903 moving theme preview
+  into developers plugin - navigation and titles are broken  
+
+2011-02-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php, engine/lib/entities.php,
+  engine/tests/objects/entities.php: Deprecated ElggEntity->clearMetadata() by
+  ElggEntity->deleteMetadata(). Disabling entities now disables their
+  annotations and metadata. Enabling entities enables annotations and metadata.
+  Fixes #1115.  
+
+  	* engine/classes/ElggBatch.php: If using a callback in ElggBatch, make sure
+  there's an initial value to return.  
+
+  	* engine/lib/metastrings.php: Allowing metastrings_type for metastring-based
+  object functions.  
+
+2011-02-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: added tabs to admin theme  
+
+  	* mod/externalpages/actions/add.php, mod/externalpages/actions/addfront.php,
+  mod/externalpages/actions/edit.php, mod/externalpages/index.php,
+  mod/externalpages/languages/en.php, mod/externalpages/manifest.xml,
+  mod/externalpages/read.php, mod/externalpages/start.php,
+  .../views/default/expages/analytics.php,
+  mod/externalpages/views/default/expages/css.php,
+  .../views/default/expages/footer_menu.php,
+  .../views/default/expages/forms/edit.php,
+  .../views/default/expages/forms/editfront.php,
+  .../views/default/expages/front_left.php,
+  .../views/default/expages/front_right.php,
+  mod/externalpages/views/default/expages/menu.php,
+  .../views/default/forms/expages/edit.php,
+  mod/externalpages/views/default/object/expages.php: updates externalpages to
+  1.8  
+
+2011-02-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggMetadata.php, engine/lib/annotations.php,
+  engine/lib/deprecated-1.8.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/tests/api/metastrings.php: Refs #2907. DRY'd up and abstracted out a
+  lot of metadata / annotation functions so I can implement #1115 with a clean
+  conscious.  
+
+2011-02-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/externalpages/actions/add.php, mod/externalpages/actions/addfront.php,
+  mod/externalpages/index.php, mod/externalpages/languages/en.php,
+  mod/externalpages/manifest.xml, mod/externalpages/read.php,
+  mod/externalpages/start.php, .../views/default/expages/analytics.php,
+  mod/externalpages/views/default/expages/css.php,
+  .../views/default/expages/footer_menu.php,
+  .../views/default/expages/forms/edit.php,
+  .../views/default/expages/forms/editfront.php,
+  .../views/default/expages/front_left.php,
+  .../views/default/expages/front_right.php,
+  mod/externalpages/views/default/expages/menu.php,
+  mod/externalpages/views/default/object/expages.php, mod/sitepages/README.txt,
+  mod/sitepages/actions/edit_settings.php, mod/sitepages/index.php,
+  mod/sitepages/languages/en.php, mod/sitepages/manifest.xml,
+  mod/sitepages/sitepages_functions.php, mod/sitepages/start.php,
+  .../views/default/admin/site/sitepages.php,
+  .../views/default/canvas/layouts/frontpage.php,
+  mod/sitepages/views/default/sitepages/css.php,
+  .../views/default/sitepages/custom_frontpage.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  .../views/default/sitepages/keywords/sitestats.php,
+  .../views/default/sitepages/keywords/userlist.php,
+  mod/sitepages/views/default/sitepages/members.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/sitepages/views/default/sitepages/metatags.php,
+  mod/sitepages/views/default/sitepages/sidebar.php,
+  mod/sitepages/views/default/sitepages/welcome.php: swapping sitepages for
+  externalpages since the external pages is easier to integrate into 1.8 .
+  sitepages needs more work before it is ready for release (plus we would need
+  an upgrade script)  
+
+  	* engine/lib/entities.php: Refs #2301 demoting type:subtype warnings to
+  notices  
+
+  	* actions/email/save.php, actions/user/default_access.php,
+  actions/user/language.php, actions/user/name.php, actions/user/password.php,
+  engine/lib/user_settings.php, engine/lib/users.php,
+  views/default/core/settings/account/language.php,
+  views/default/forms/account/settings.php: Fixes #2848 pulls user settings
+  code out of actions into functions. We should investigate putting them in a
+  library that is only loaded on demand  
+
+  	* engine/lib/user_settings.php, engine/lib/usersettings.php,
+  engine/start.php, install/ElggInstaller.php: user settings library is now
+  user_settings.php  
+
+  	* engine/lib/admin.php: documentation update for admin functions  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/admin.php, languages/en.php,
+  views/default/layout/shells/admin/menu.php: admin menu uses weights for
+  ordering  
+
+2011-02-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggBatch.php: Additional checking in ElggBatch for valid
+  key.  
+
+2011-02-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/confirmlink.php, views/default/output/dropdown.php,
+  views/default/output/email.php, views/default/output/pulldown.php,
+  views/default/output/radio.php, views/default/output/text.php,
+  views/default/output/url.php: Fixed #2218 finished up the encoding issues by
+  turning of double encoding  
+
+  	* mod/categories/views/default/categories/css.php,
+  mod/categories/views/default/input/categories.php: categories are listed
+  horizontally  
+
+2011-02-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggBatch.php: Added ability to get results of callback
+  function in ElggBatch.  
+
+  	* engine/classes/ElggBatch.php: Fixed ElggBatch problems when specifying a
+  limit of 0. Fixed a shoot yourself in the foot situation if passing a dumb
+  number to chunk size. 
+
+  	* engine/classes/ElggBatch.php: Added ElggBatch class for more efficient
+  batch operations on large sets of Elgg* objects.  
+
+2011-02-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/shells/admin.php: added the footer analytics view for
+  js  
+
+  	* mod/custom_index/index.php, mod/custom_index/languages/en.php,
+  mod/custom_index/manifest.xml, mod/custom_index/start.php,
+  .../views/default/canvas/layouts/new_index.php,
+  .../views/default/custom_index/css.php,
+  .../views/default/layout/shells/custom_index.php: updated custom index for
+  1.8  
+
+2011-02-13  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/account/login_dropdown.php,
+  views/default/css/elements/misc.php: Renamed signin to elgg-button-dropdown 
+
+  	* views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/misc.php, views/default/css/elements/modules.php,
+  views/default/forms/login.php: Progress refactoring the login dropdown and
+  login forms -- not quite there yet, though  Added another module: dropdown. 
+
+2011-02-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/custom_index/index.php, mod/custom_index/languages/en.php,
+  mod/custom_index/manifest.xml, mod/custom_index/start.php,
+  .../views/default/canvas/layouts/new_index.php,
+  .../views/default/custom_index/css.php: moved custom_index back into core  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/layout_objects.php: Updated docs for
+  layout_objects 
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php, views/default/core/river/footer.php: Refs
+  #650. Replaced count_annotations(). 
+
+  	* mod/pages/views/default/pages/sidebar/history.php,
+  views/default/core/likes/display.php, views/default/core/river/controls.php,
+  views/default/layout/elements/comments.php: Refs #650. Replaced
+  list_annotations() by elgg_list_annotations().  
+
+  	* engine/classes/ElggEntity.php, engine/lib/views.php,
+  mod/messageboard/history.php: Updated a few recent calls to
+  elgg_get_annotations() to use 'reverse_order_by' => true.  
+
+  	* engine/lib/metastrings.php: Refs #2906. Missed a file. 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php: Fixes #2906. Added
+  elgg_sql_reverse_order_by() and wired it up to ege() and ega(). Pass
+  'reverse_order_by' => true in option arrays. 
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php, mod/thewire/actions/delete.php,
+  mod/thewire/add.php, mod/thewire/everyone.php, mod/thewire/index.php,
+  mod/thewire/languages/en.php, mod/thewire/manifest.xml,
+  mod/thewire/pages/everyone.php, mod/thewire/pages/friends.php,
+  mod/thewire/pages/previous.php, mod/thewire/pages/reply.php,
+  mod/thewire/pages/tag.php, mod/thewire/pages/thread.php,
+  mod/thewire/pages/user.php, mod/thewire/readme.txt, mod/thewire/start.php,
+  mod/thewire/tests/regex.php, mod/thewire/views/default/forms/thewire/add.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/thewire/views/default/thewire/metadata.php,
+  mod/thewire/views/default/thewire/notfound.php,
+  .../views/default/thewire/profile_status.php,
+  mod/thewire/views/default/thewire/reply.php,
+  mod/thewire/views/default/thewire/view.php,
+  .../views/default/widgets/thewire/content.php,
+  mod/thewire/views/default/widgets/thewire/edit.php: a mostly completed port
+  of JHU/APL wire plugin to 1.8  
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php, engine/lib/annotations.php,
+  engine/lib/views.php, engine/tests/objects/entities.php,
+  mod/messageboard/history.php, views/default/core/likes/display.php,
+  views/default/core/river/controls.php, views/default/core/river/footer.php:
+  Refs #650. Replaced calls to get_annotations() by elgg_get_annotations(). 
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/details.php: added the status view into
+  details on profile page  
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php, engine/lib/users.php,
+  views/default/forms/profile/edit.php: Refs #650. Replaced uses for
+  get_metadata_byname() by elgg_get_metadata() 
+
+  	* engine/classes/ElggMetadata.php, engine/handlers/export_handler.php,
+  engine/lib/deprecated-1.8.php, engine/lib/metadata.php: Refs #650. Changed
+  elgg_get_metadata_by_id() to elgg_get_metadata_from_id() to be consistent
+  with other functions.  
+
+  	* engine/classes/ElggMetadata.php, engine/handlers/export_handler.php,
+  engine/lib/metadata.php: Refs #650. Replaced get_metadata() by
+  elgg_get_metadata_by_id()  
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggFile.php,
+  engine/lib/metadata.php, engine/lib/notification.php,
+  views/default/export/entity.php: Refs #650: Replaced uses of
+  get_metadata_for_entity() by elgg_get_metadata().  
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/list/body.php: allow plugins to decline the
+  addition of tags to their entity list view  
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/metadata.php: Deprecated
+  get_metadata() by elgg_get_metadata_by_id() to avoid confusion with
+  elgg_get_metadata(). Not in love with the name...had considered
+  elgg_get_metadatum(). Open to suggestions.  
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php: Refs #650: Deprecated
+  find_metadata() with elgg_get_metadata(). Deprecated
+  get_metadata_for_entity() and get_metadata_byname() <twitch>. Added
+  elgg_get_metastrings_based_objects() to deal with the commonalities between
+  the metadata and annotation getter functions.  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/checkboxes.php: Label wraps checkbox for usability 
+
+  	* mod/minify/lib/min/.htaccess, mod/minify/lib/min/README.txt,
+  mod/minify/lib/min/builder/_index.js, mod/minify/lib/min/builder/bm.js,
+  mod/minify/lib/min/builder/index.php, mod/minify/lib/min/builder/ocCheck.php,
+  mod/minify/lib/min/builder/rewriteTest.js, mod/minify/lib/min/config.php,
+  mod/minify/lib/min/groupsConfig.php, mod/minify/lib/min/index.php,
+  mod/minify/lib/min/lib/CSS.php, mod/minify/lib/min/lib/FirePHP.php,
+  mod/minify/lib/min/lib/HTTP/ConditionalGet.php,
+  mod/minify/lib/min/lib/HTTP/Encoder.php, mod/minify/lib/min/lib/JSMin.php,
+  mod/minify/lib/min/lib/JSMinPlus.php, mod/minify/lib/min/lib/Minify.php,
+  mod/minify/lib/min/lib/Minify/Build.php,
+  mod/minify/lib/min/lib/Minify/CSS/Compressor.php,
+  mod/minify/lib/min/lib/Minify/CSS/UriRewriter.php,
+  mod/minify/lib/min/lib/Minify/Cache/APC.php,
+  mod/minify/lib/min/lib/Minify/Cache/File.php,
+  mod/minify/lib/min/lib/Minify/Cache/Memcache.php,
+  mod/minify/lib/min/lib/Minify/CommentPreserver.php,
+  mod/minify/lib/min/lib/Minify/Controller/Base.php,
+  mod/minify/lib/min/lib/Minify/Controller/Files.php,
+  .../lib/min/lib/Minify/Controller/Groups.php,
+  .../lib/min/lib/Minify/Controller/MinApp.php,
+  mod/minify/lib/min/lib/Minify/Controller/Page.php,
+  .../lib/min/lib/Minify/Controller/Version1.php,
+  mod/minify/lib/min/lib/Minify/HTML.php,
+  mod/minify/lib/min/lib/Minify/ImportProcessor.php,
+  mod/minify/lib/min/lib/Minify/Lines.php,
+  mod/minify/lib/min/lib/Minify/Logger.php,
+  mod/minify/lib/min/lib/Minify/Packer.php,
+  mod/minify/lib/min/lib/Minify/Source.php,
+  mod/minify/lib/min/lib/Minify/YUICompressor.php,
+  mod/minify/lib/min/lib/Solar/Dir.php, mod/minify/lib/min/utils.php,
+  mod/minify/manifest.xml, mod/minify/start.php: Doh, how did this get here? 
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/examples/plugins/manifest.xml,
+  engine/tests/test_files/plugin_18/manifest.xml: Refs #2898: Updated docs and
+  test manifest for the xmlns changes.  
+
+  	* engine/classes/ElggPluginManifest.php, mod/blog/manifest.xml,
+  mod/bookmarks/manifest.xml, mod/categories/manifest.xml,
+  mod/defaultwidgets/manifest.xml, mod/developers/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/embed/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/minify/manifest.xml, mod/notifications/manifest.xml,
+  mod/oauth_lib/manifest.xml, mod/pages/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/sitepages/manifest.xml, mod/tagcloud/manifest.xml,
+  mod/thewire/manifest.xml, mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/twitterservice/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: Refs #2898: Using an XML namespace instead of
+  version attribute on plugin manifests.  
+
+  	* mod/twitterservice/languages/en.php,
+  mod/twitterservice/twitterservice_lib.php,
+  .../views/default/settings/twitterservice/edit.php: Cleaned up more
+  twitterservice code. Twitter usernames now have random digits appended upon
+  name collision. Added the option for admins to allow twitter sign up even if
+  site registration is disabled.  
+
+  	* actions/admin/user/delete.php: Deleting a user from his profile forwards
+  to the right page.  
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/delete.php, mod/file/actions/file/upload.php,
+  mod/pages/actions/pages/delete.php: Fixed #2887 redirects on blog, file, and
+  pages works now - bookmarks plugin still needs plenty of work  
+
+  	* mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, .../actions/reportedcontent/add.php,
+  .../actions/reportedcontent/archive.php,
+  .../actions/reportedcontent/delete.php, mod/reportedcontent/start.php,
+  .../views/default/forms/reportedcontent/add.php,
+  .../views/default/reportedcontent/form.php: updated reported content to use
+  elgg_view_form  
+
+  	* views/default/css/admin.php,
+  views/default/forms/admin/site/update_advanced.php,
+  views/default/forms/admin/site/update_basic.php,
+  views/default/forms/avatar/crop.php, views/default/forms/avatar/upload.php,
+  views/default/forms/comments/add.php, views/default/forms/friends/edit.php,
+  views/default/forms/login.php, views/default/forms/plugins/settings/save.php,
+  views/default/forms/profile/edit.php, views/default/forms/register.php,
+  views/default/forms/user/requestnewpassword.php,
+  views/default/forms/useradd.php, views/default/forms/usersettings/save.php,
+  views/default/forms/widgets/save.php, views/default/group/default.php: Refs
+  #2032 core forms use divs  
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/widgets/blog/edit.php,
+  mod/categories/views/default/input/categories.php,
+  .../views/default/forms/diagnostics/download.php,
+  mod/file/views/default/forms/file/upload.php,
+  mod/file/views/default/widgets/filerepo/edit.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  .../views/default/forms/invitefriends/invite.php,
+  .../views/default/forms/messages/reply.php,
+  mod/messages/views/default/forms/messages/send.php,
+  .../forms/notificationsettings/groupsave.php,
+  .../default/forms/notificationsettings/save.php,
+  .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/personal.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/widgets/reportedcontent/edit.php,
+  .../default/usersettings/twitterservice/edit.php: updated the plugins that
+  have already been updated to 1.8 html/css to use divs rather than p tags in
+  forms  
+
+  	* mod/groups/views/default/forms/groups/delete.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/edit.php: pulled delete form out of edit view
+  for groups  
+
+  	* mod/groups/views/default/forms/discussion/save.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  views/default/css/elements/forms.php: recommended to use <div> in forms for
+  wrapping content - added css to support that and updated all group forms  
+
+  	* views/default/input/form.php: moved security tokens to top of form so we
+  can use :last-child  
+
+  	* views/default/input/access.php: fixed another bug from last night  
+
+  	* views/default/input/plaintext.php, views/default/input/radio.php: fixing a
+  few bugs introduced last night in the input views  
+
+  	* mod/bookmarks/languages/en.php: fixed enable group bookmarks language
+  string  
+
+  	* views/default/input/checkboxes.php, views/default/input/radio.php: Refs
+  #1393 added work around note to checkboxes and radio inputs for integer
+  labels  
+
+  	* views/default/css/elements/forms.php, views/default/input/checkboxes.php,
+  views/default/input/radio.php: Fixes #972 checkboxes and radio input fields
+  support horizontal and vertical alignments  
+
+  	* mod/blog/lib/blog.php: blog object wasn't being passed to the form view  
+
+  	* engine/lib/output.php: fixed bug in elgg_format_attributes() that caused
+  none string values to be ignored  
+
+  	* views/default/input/form.php: reverted part of [8148] that broke all forms
+   
+
+  	* views/default/admin/components/plugin_settings.php,
+  views/default/forms/plugins/settings/save.php: continued cleaning up admin
+  plugin settings  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/radio.php: Fixes #2143: DRYed up input/radio -- other
+  views still should be addressed, but not because they aren't DRY, therefore
+  I'm calling this ticket closed 
+
+  	* views/default/input/checkbox.php, views/default/input/form.php,
+  views/default/input/password.php, views/default/input/pulldown.php: Refs
+  #2143: General cleanup of input views 
+
+  	* views/default/input/access.php: Refs #2143: DRYed up input/access -- wow,
+  that feels good 
+
+  	* views/default/input/longtext.php: Refs #2143: DRYed up input/longtext --
+  maybe I missed it, but was there a difference b/w plaintext and longtext? 
+
+  	* views/default/input/plaintext.php: Refs #2143: DRYed up input/plaintext 
+
+  	* views/default/input/dropdown.php: Refs #2143: DRYed up input/dropdown --
+  probably could be better still 
+
+  	* views/default/input/hidden.php: Refs #2143: DRY up input/hidden 
+
+  	* views/default/input/password.php: Refs #2143: DRYed up input/password 
+
+  	* views/default/input/file.php: Refs #2143: DRYed up input/file 
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/entities.php:
+  register_entity_url_handler => elgg_register_entity_url_handler (because
+  every other reigstration function asks for the callback last) 
+
+  	* engine/lib/entities.php, engine/lib/extender.php,
+  engine/lib/relationships.php: Refs #2610: Using call_user_func in url hooks 
+
+  	* engine/lib/pagehandler.php: Page handler uses call_user_func (so methods
+  of classes can be used as page handlers) 
+
+2011-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/start.php, mod/twitterservice/twitterservice_lib.php:
+  Twitter services now allows login with twitter properly for a single user.  
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php: Added
+  elgg_get_entities_from_plugin_user_settings(). Added a name_prefix option to
+  elgg_get_entities_from_private_settings().  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/theming/preview/objects.php, engine/lib/views.php,
+  mod/blog/views/default/blog/group_module.php,
+  mod/blog/views/default/blog/sidebar/archives.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/sidebar/featured.php,
+  mod/groups/views/default/groups/sidebar/find.php,
+  .../views/default/groups/sidebar/members.php,
+  mod/pages/views/default/pages/group_module.php,
+  mod/pages/views/default/pages/sidebar/history.php,
+  .../views/default/pages/sidebar/navigation.php,
+  views/default/core/members/sidebar.php, views/default/core/river/body.php,
+  views/default/layout/elements/owner_block.php,
+  views/default/layout/shells/admin/menu.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/output/tagcloud.php: Fixes #2904: Converted most
+  elgg_view('layout/objects/module') instances to elgg_view_module() 
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/head.php, views/default/page/shells/admin.php,
+  views/default/page/shells/default.php,
+  views/default/page/shells/walled_garden.php: pulled <head> out into page
+  shell also  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Added an elgg_view_module shortcut function -- now
+  to try it out! 
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/topbar.php: fixed topbar html  
+
+2011-02-12  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Added missing @deprecated tags to a couple
+  functions 
+
+  	* engine/lib/deprecated-1.8.php, engine/lib/views.php: set_view_location =>
+  elgg_set_view_location (to match elgg_get_view_location) 
+
+  	* views/default/spotlight/default.php: Bye bye spotlight 
+
+  	* engine/lib/users.php: One more conversion to elgg_view_form 
+
+  	* .../views/default/diagnostics/forms/download.php,
+  .../views/default/forms/diagnostics/download.php,
+  mod/file/views/default/file/embed_upload.php,
+  mod/file/views/default/forms/file/upload.php,
+  .../views/default/forms/invitefriends/invite.php,
+  .../views/default/invitefriends/form.php,
+  .../views/default/invitefriends/formitems.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/minify/lib/min/.htaccess, mod/minify/lib/min/README.txt,
+  mod/minify/lib/min/builder/_index.js, mod/minify/lib/min/builder/bm.js,
+  mod/minify/lib/min/builder/index.php, mod/minify/lib/min/builder/ocCheck.php,
+  mod/minify/lib/min/builder/rewriteTest.js, mod/minify/lib/min/config.php,
+  mod/minify/lib/min/groupsConfig.php, mod/minify/lib/min/index.php,
+  mod/minify/lib/min/lib/CSS.php, mod/minify/lib/min/lib/FirePHP.php,
+  mod/minify/lib/min/lib/HTTP/ConditionalGet.php,
+  mod/minify/lib/min/lib/HTTP/Encoder.php, mod/minify/lib/min/lib/JSMin.php,
+  mod/minify/lib/min/lib/JSMinPlus.php, mod/minify/lib/min/lib/Minify.php,
+  mod/minify/lib/min/lib/Minify/Build.php,
+  mod/minify/lib/min/lib/Minify/CSS/Compressor.php,
+  mod/minify/lib/min/lib/Minify/CSS/UriRewriter.php,
+  mod/minify/lib/min/lib/Minify/Cache/APC.php,
+  mod/minify/lib/min/lib/Minify/Cache/File.php,
+  mod/minify/lib/min/lib/Minify/Cache/Memcache.php,
+  mod/minify/lib/min/lib/Minify/CommentPreserver.php,
+  mod/minify/lib/min/lib/Minify/Controller/Base.php,
+  mod/minify/lib/min/lib/Minify/Controller/Files.php,
+  .../lib/min/lib/Minify/Controller/Groups.php,
+  .../lib/min/lib/Minify/Controller/MinApp.php,
+  mod/minify/lib/min/lib/Minify/Controller/Page.php,
+  .../lib/min/lib/Minify/Controller/Version1.php,
+  mod/minify/lib/min/lib/Minify/HTML.php,
+  mod/minify/lib/min/lib/Minify/ImportProcessor.php,
+  mod/minify/lib/min/lib/Minify/Lines.php,
+  mod/minify/lib/min/lib/Minify/Logger.php,
+  mod/minify/lib/min/lib/Minify/Packer.php,
+  mod/minify/lib/min/lib/Minify/Source.php,
+  mod/minify/lib/min/lib/Minify/YUICompressor.php,
+  mod/minify/lib/min/lib/Solar/Dir.php, mod/minify/lib/min/utils.php,
+  mod/minify/manifest.xml, mod/minify/start.php, mod/notifications/groups.php,
+  .../forms/notificationsettings/groupsave.php,
+  .../default/forms/notificationsettings/save.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../forms/uservalidationbyemail/bulk_action.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/river/footer.php, views/default/core/settings/account.php,
+  views/default/forms/admin/site/update_advanced.php,
+  views/default/forms/admin/site/update_basic.php,
+  views/default/forms/friends/edit.php,
+  views/default/forms/user/passwordreset.php, views/default/forms/useradd.php,
+  views/default/forms/usersettings/save.php,
+  views/default/forms/widgets/save.php,
+  views/default/layout/objects/widget/settings.php,
+  views/installation/install/forms/admin.php,
+  views/installation/install/forms/database.php,
+  views/installation/install/forms/settings.php: Converted most forms to use
+  elgg_view_form (therefore also moved the views to forms/*).  Some views are
+  left that _only_ do elgg_view_form, so I wonder if those should even be kept
+  around. 
+
+2011-02-12  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/twitterservice_lib.php: Registering forward() calls to
+  a plugin-specific reason for use in plugin hooks.  
+
+2011-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php, mod/embed/start.php,
+  mod/embed/views/default/embed/addcontentjs.php,
+  mod/embed/views/default/embed/lightbox_init.php,
+  mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/metatags.php: light clean up on the embed
+  plugin which doesn't appear to work at present  
+
+2011-02-11  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Typo correction: @deprecate => @deprecated 
+
+  	* mod/blog/views/default/js/blog/save_draft.php,
+  .../views/default/widgets/bookmarks/view.php,
+  .../views/default/defaultwidgets/editor.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/gallery.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/metatags.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/file/views/default/file/embed_upload.php,
+  .../views/default/groups/profile/widgets.php,
+  .../views/default/widgets/messageboard/content.php,
+  .../views/default/forms/messages/process.php,
+  .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/jsfuncs.php,
+  .../views/default/pages/sidebar/navigation.php,
+  mod/profile/views/default/profile/wrapper.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/tinymce/views/default/tinymce/init.php,
+  mod/zaudio/views/default/zaudio/audioplayer.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/friends/collection.php,
+  views/default/core/friends/collections.php,
+  views/default/core/friends/collectiontabs.php,
+  views/default/core/friends/picker.php,
+  .../default/core/friends/tablelistcountupdate.php,
+  views/default/core/river/filter.php, views/default/forms/avatar/crop.php,
+  views/default/forms/register.php,
+  views/default/forms/user/requestnewpassword.php,
+  views/default/input/autocomplete.php, views/default/input/datepicker.php,
+  views/default/input/userpicker.php,
+  views/installation/install/forms/template.php: Added disapproving @todo's
+  wherever I could find javascript not conforming to 1.8 conventions 
+
+2011-02-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/categories/actions/save.php, mod/categories/languages/en.php,
+  mod/categories/listing.php, mod/categories/readme.txt,
+  mod/categories/start.php, mod/categories/views/default/categories.php,
+  mod/categories/views/default/categories/list.php,
+  mod/categories/views/default/categories/view.php,
+  mod/categories/views/default/input/categories.php,
+  mod/categories/views/default/output/categories.php,
+  .../views/default/settings/categories/edit.php: some clean up of the
+  categories plugin - html/css polish needed  
+
+2011-02-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Fixes #2888: Plugins are checked for validity in
+  elgg_get_plugins(). It won't return broken plugins unless specifically
+  requested.  
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php: Moved
+  list_entities_from_annotation_count_by_metadata() to deprecated-18.php.  
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php: Refs #650.
+  Added 'annotation_calculation' to elgg_get_annotations(). Deprecated
+  list_annotations() by elgg_list_annotations(). Deprecated get_annotations_*()
+  by elgg_get_annotations() and passing annotation_calculation.  
+
+  	* engine/lib/entities.php: Added $viewer callback option for
+  elgg_list_entities().  
+
+  	* engine/lib/views.php: Fixed doc spacing that was throwing errors in PHP
+  Code Sniffer.  
+
+2011-02-11  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/page_layout.php,
+  views/default/page/shells/admin.php, views/default/page/shells/default.php:
+  elgg-classic => elgg-page-classic, elgg-admin => elgg-page-admin 
+
+  	* views/default/css/elements/layout_objects.php,
+  views/default/css/elements/modules.php, views/default/css/screen.php: Added
+  css/elements/modules.php.  Modules and widgets deserve their own space. 
+
+  	* views/default/admin/components/plugin.php, views/default/css/admin.php,
+  views/default/page/shells/default.php: Cleaned up admin advanced plugins view
+  a bit 
+
+  	* views/default/page/elements/head.php,
+  views/default/page/elements/html_begin.php,
+  views/default/page/elements/html_end.php,
+  views/default/page/shells/admin.php, views/default/page/shells/default.php,
+  views/default/page/shells/walled_garden.php: Fixes #1303: Pulled
+  html_begin/end into page shells.  extracted <head> element into
+  page/elements/head 
+
+  	* mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/categories/manifest.xml, mod/defaultwidgets/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/embed/manifest.xml, mod/file/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/invitefriends/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/oauth_lib/manifest.xml,
+  mod/pages/manifest.xml, mod/reportedcontent/manifest.xml,
+  mod/search/manifest.xml, mod/sitepages/manifest.xml,
+  mod/tagcloud/manifest.xml, mod/thewire/manifest.xml,
+  mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/twitterservice/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: Converted all manifest files to 1.8 style 
+
+2011-02-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/deprecated-1.8.php: Moved
+  get_annotations() to deprecated-1.8.  
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/tests/api/entity_getter_functions.php: Refs #650. Deprecated
+  get_annotations() for elgg_get_annotations().  
+
+2011-02-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/diagnostics/start.php: not outputing all the plugin information in
+  diagnostics plugin due to new plugin system structure  
+
+  	* engine/lib/admin.php: Fixes #2872 - returned plugin settings menu to
+  working order  
+
+2011-02-11  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php,
+  .../forms/admin/plugins/simple_update_states.php: Cleanup of basic plugins
+  area 
+
+  	* views/default/admin/components/invalid_plugin.php,
+  views/default/admin/components/plugin.php, views/default/css/admin.php,
+  .../forms/admin/plugins/simple_update_states.php, views/default/js/admin.php:
+  More cleanup of admin/plugins css 
+
+  	* views/default/admin/components/plugin.php,
+  .../admin/components/plugin_dependencies.php, views/default/css/admin.php:
+  elgg-$state-dependency => elgg-state-(error|success) 
+
+  	* views/default/output/rss_view.php: Removed unused view: output/rss_view 
+
+  	* .../uservalidationbyemail/unvalidated_user.php: Converted hardcoded styles
+  to css primitives 
+
+2011-02-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/reset.php, views/default/input/submit.php: Removed
+  nonsensical comments 
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  .../notifications/subscriptions/forminternals.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/core/settings/account.php,
+  views/default/css/elements/chrome.php,
+  views/default/page/elements/topbar.php: Added border primitives
+  "b<loc><type>" where type is "a" or "b" -- anyone want to choose better
+  names? :) 
+
+  	* mod/blog/views/default/forms/blog/save.php: 
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/groups/views/default/groups/edit.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php: disabled =>
+  elgg-state-disabled in plugins (only found in blog and groups) 
+
+  	* views/default/admin/plugins/simple.php,
+  .../forms/admin/plugins/simple_update_states.php: Moved the simple plugins
+  admin form to the forms/ dir 
+
+  	* views/default/admin/components/plugin.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/css/admin.php, views/default/css/elements/forms.php,
+  views/default/forms/profile/fields/reset.php,
+  views/default/page/shells/walled_garden.php,
+  views/installation/install/nav.php: .disabled => .elgg-state-disabled (core
+  only) 
+
+  	* views/default/admin/plugins/advanced.php: Using spacing primitives rather
+  than <br/> 
+
+  	* views/default/css/admin.php: Corrected minor problem with admin tables 
+
+  	* views/default/forms/plugins/settings/save.php,
+  views/default/forms/plugins/usersettings/save.php,
+  views/default/object/plugin.php: Plugin settings forms now use the forms/
+  directory 
+
+2011-02-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/navigation.php: fixed access issue on menu name 
+
+2011-02-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/theming/preview/forms.php, mod/blog/lib/blog.php,
+  mod/blog/views/default/forms/blog/save.php,
+  .../views/default/admin/utilities/diagnostics.php, mod/file/index.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/edit.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/groups/profile/buttons.php, mod/messages/read.php,
+  .../views/default/forms/messages/process.php, mod/pages/view.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/owner_block.php,
+  .../views/default/object/reported_content.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/friends/picker.php, views/default/css/admin.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php,
+  views/default/forms/profile/fields/reset.php, views/default/input/button.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/page/elements/content_header.php,
+  views/installation/input/button.php: Converted buttons to elgg-object-type
+  naming convention.  Added table of buttons to forms theming preview meant for
+  previewing all button types and states (still have to implement those...) 
+
+2011-02-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php, mod/garbagecollector/start.php,
+  mod/groups/actions/edit.php, mod/groups/views/default/forms/groups/edit.php,
+  mod/logrotate/start.php, mod/sitepages/start.php,
+  mod/twitterservice/start.php, mod/twitterservice/twitterservice_lib.php,
+  .../views/default/twitterservice/metatags.php,
+  views/default/core/settings/tools/plugin.php: Refs #2874. Finished removing
+  calls to deprecated plugin mgmt functions in core and core plugins.  
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  engine/lib/admin.php, engine/lib/deprecated-1.8.php, engine/lib/plugins.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/core/settings/tools.php,
+  views/default/core/settings/tools/plugin.php,
+  views/default/object/plugin.php: Refs #2874: More removal of deprecated
+  function user in plugins systems.  
+
+  	* engine/classes/ElggPlugin.php, engine/lib/deprecated-1.8.php,
+  engine/lib/plugins.php: Refs #2869, #2874. Renamed ElggPlugin::remove*
+  functions to unset*.  Added ElggPlugin::getAllUserSettings() and
+  getAllSettings(). Deprecated all plugin settings and user setting functions
+  with correctly named functions.  
+
+2011-02-09  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/helpers.php: Slightly more efficient way of
+  declaring spacing helpers 
+
+2011-02-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/manifest.xml, mod/messages/manifest.xml, mod/pages/manifest.xml,
+  mod/search/manifest.xml: updated version number  
+
+2011-02-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, engine/lib/plugins.php: Refs #2869: Fixed
+  problems when deleting user settings using wrapper function.  
+
+  	* engine/classes/ElggPluginPackage.php, engine/lib/admin.php,
+  mod/diagnostics/start.php, pages/settings/tools.php,
+  views/default/core/settings/tools.php,
+  views/default/core/settings/tools/plugin.php,
+  views/default/object/plugin.php: Refs #2874: Using elgg_get_plugins() instead
+  of get_installed_plugins().  
+
+  	* engine/classes/ElggPlugin.php: Fixed typo that break
+  ElggPlugin::isActive().  
+
+  	* engine/lib/input.php, engine/lib/upgrades/2010050701.php,
+  engine/lib/upgrades/2010100500.php, mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/link.php, mod/notifications/start.php,
+  mod/sitepages/index.php, mod/thewire/start.php, mod/twitterservice/start.php,
+  views/default/core/settings/tools.php: Refs #2874: Using
+  elgg_is_active_plugin() in core and bundled plugins.  
+
+2011-02-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php, engine/lib/deprecated-1.8.php,
+  engine/lib/plugins.php: Fixes #2858: is_plugin_enabled() is deprecated by
+  elgg_is_active_plugin() instead of ElggPlugin::isActive().  
+
+  	* engine/classes/ElggPlugin.php, engine/lib/plugins.php: Fixes #2869: User
+  settings for plugins work again.  
+
+2011-02-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/languages/de.php, mod/tagcloud/languages/en.php,
+  mod/tagcloud/manifest.xml, mod/tagcloud/start.php, mod/tagcloud/tagcloud.php,
+  mod/tagcloud/views/default/tagcloud/css.php,
+  .../views/default/widgets/tagcloud/content.php,
+  .../views/default/widgets/tagcloud/edit.php: cleaned up tagcloud plugin  
+
+  	* mod/search/start.php, .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/list.php: updated search plugin for new
+  html/css  
+
+  	* .../views/default/admin/utilities/diagnostics.php: ahhh...missed this one
+  too  
+
+  	* mod/logbrowser/views/default/logbrowser/form.php: missed this file in the
+  admin backend update last night  
+
+  	* engine/lib/views.php, views/default/layout/elements/title.php: added a
+  class variable to title view  
+
+2011-02-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginPackage.php: Fixes #2863: Can now use all 6 dep
+  types with conflicts.  
+
+  	* engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser18.php,
+  engine/classes/ElggPluginPackage.php, engine/lib/plugins.php,
+  engine/tests/api/plugins.php, engine/tests/test_files/plugin_18/manifest.xml,
+  languages/en.php, views/default/admin/components/plugin.php,
+  .../admin/components/plugin_dependencies.php, views/default/css/admin.php:
+  Added suggests to the plugins deps system. It parallels the requires system,
+  but doesn't affect if the plugin can be enabled and only shows up in the deps
+  table on the advanced view.  
+
+  	* engine/classes/ElggPluginManifest.php: Running plugins' blurb,
+  description, name, and screenshot->description through elgg_echo().  
+
+2011-02-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/layout/shells/admin.php,
+  views/default/page/shells/admin.php: rough system messages implementation for
+  admin backend  
+
+  	* js/lib/ui.js, views/default/admin/components/plugin_settings.php,
+  views/default/admin/statistics/overview.php,
+  views/default/admin/users/newest.php, views/default/admin/users/online.php,
+  views/default/css/admin.php, views/default/forms/admin/menu/save.php,
+  views/default/forms/useradd.php, views/default/layout/shells/admin.php,
+  views/default/layout/shells/admin/menu.php: updates for the admin css based
+  on the reworking I did to the html  
+
+  	* .../views/default/reportedcontent/footer_link.php,
+  views/default/annotation/generic_comment.php,
+  views/default/css/elements/forms.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/typography.php, views/default/icon/default.php,
+  views/default/input/form.php, views/default/navigation/menu/user_hover.php,
+  views/default/output/tagcloud.php: bringing us a little closer to validating 
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  .../notifications/subscriptions/forminternals.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/core/settings/account.php,
+  views/default/css/elements/chrome.php: a tiny amount of progress on the css
+  chrome element view  
+
+  	* js/lib/ui.js, views/default/css/elements/chrome.php,
+  views/default/css/elements/forms.php, views/default/css/elements/grid.php,
+  views/default/css/elements/helpers.php, views/default/css/elements/icons.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php,
+  views/default/css/elements/typography.php,
+  views/default/layout/elements/page_links.php,
+  views/default/layout/objects/image_block.php,
+  views/default/navigation/menu/page.php,
+  views/default/navigation/menu/site.php,
+  views/default/navigation/menu/user_hover.php,
+  views/default/page/elements/footer.php: more tweaking of css - menu and
+  general clean up  
+
+  	* views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php,
+  views/default/layout/shells/content/header.php,
+  views/default/page/elements/header_logo.php: starting to standardize on
+  elgg-<type>-<subtype> for css such as elgg-heading-site  
+
+2011-02-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/chrome.php,
+  views/default/css/elements/forms.php,
+  views/default/css/elements/page_layout.php,
+  views/default/css/elements/reset.php,
+  views/default/css/elements/typography.php: removed some old css no longer
+  supported by modern browsers  
+
+2011-02-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/profile/fields/add.php, actions/profile/fields/edit.php,
+  engine/lib/admin.php, .../admin/appearance/profile_fields/list.php,
+  views/default/css/admin.php, views/default/js/admin.php: Pulled elgg-icon and
+  elgg-icon-* into the admin css. Pulled out profile field JS into elgg.admin
+  obj. Fixed editing profile field names.  
+
+  	* _graphics/elgg_sprites.png, documentation/theming/preview/icons.php,
+  views/default/css/elements/icons.php: Added dragger icon.  
+
+2011-02-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: fixed typo in plugin library  
+
+  	* languages/en.php, mod/search/index.php, mod/search/start.php,
+  mod/search/views/default/search/list.php,
+  mod/search/views/default/search/listing.php: Fixes 2354 Using list instead of
+  listing for search now  
+
+  	* mod/search/index.php, mod/search/start.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/entity_list.php,
+  mod/search/views/default/search/gallery.php,
+  .../views/default/search/gallery_listing.php,
+  mod/search/views/default/search/layout.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/search_box.php,
+  mod/search/views/default/search/startblurb.php,
+  mod/search/views/rss/search/comments/entity.php,
+  mod/search/views/rss/search/entity.php,
+  mod/search/views/rss/search/layout.php,
+  mod/search/views/rss/search/listing.php: Fixes #2335 #2336 clean up and minor
+  standardization of search plugin - needs html/css clean up  
+
+2011-02-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php, views/default/js/admin.php: Added
+  drag and drop reordering of plugins. Started pulling out admin area's js into
+  elgg.admin JS object.   
+
+2011-02-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/input.php: moved sticky forms into the
+  input library  
+
+2011-02-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/entity.php,
+  views/default/entities/entity_list.php,
+  views/default/entities/entity_listing.php,
+  views/default/entities/gallery.php,
+  views/default/entities/gallery_listing.php, views/default/entities/list.php,
+  views/default/entities/list_item.php, views/default/graphics/icon.php,
+  views/default/object/default.php: removing old entities views that are no
+  longer needed and did the last changes for the icon system  
+
+  	* mod/groups/icon.php, mod/groups/start.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/groups/profile/profile_block.php: updated the groups plugin
+  to use the new icon structure  
+
+  	* engine/lib/views.php, mod/file/start.php,
+  mod/file/views/default/file/icon.php,
+  .../default/file/icon/application/default.php,
+  .../views/default/file/icon/application/excel.php,
+  .../views/default/file/icon/application/msword.php,
+  .../views/default/file/icon/application/pdf.php,
+  .../default/file/icon/application/powerpoint.php,
+  .../default/file/icon/application/vnd.ms-excel.php,
+  .../file/icon/application/vnd.ms-powerpoint.php,
+  .../application/vnd.oasis.opendocument.text.php,
+  .../views/default/file/icon/application/x-gzip.php,
+  .../file/icon/application/x-rar-compressed.php,
+  .../default/file/icon/application/x-stuffit.php,
+  .../views/default/file/icon/application/zip.php,
+  mod/file/views/default/file/icon/archive.php,
+  mod/file/views/default/file/icon/audio.php,
+  mod/file/views/default/file/icon/audio/default.php,
+  mod/file/views/default/file/icon/default.php,
+  mod/file/views/default/file/icon/document.php,
+  mod/file/views/default/file/icon/text/default.php,
+  .../views/default/file/icon/text/directory.php,
+  mod/file/views/default/file/icon/text/v-card.php,
+  mod/file/views/default/file/icon/video.php,
+  mod/file/views/default/file/icon/video/default.php,
+  mod/file/views/default/object/file.php, views/default/icon/default.php:
+  updated the file plugin to use the new icon structure  
+
+  	* engine/classes/ElggUser.php, engine/lib/actions.php,
+  engine/lib/database.php, engine/lib/deprecated-1.7.php,
+  engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/lib/relationships.php, engine/lib/widgets.php: fixed some minor
+  documentation issues  
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: missed this use of
+  elgg_count_comments() in change to ->countComments()  
+
+2011-02-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPlugin.php: Fixed bug when trying to set a plugin's
+  priority to 1 without using "first."  
+
+2011-02-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php, engine/lib/elgglib.php,
+  engine/lib/views.php, mod/blog/views/default/object/blog.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/pages/views/default/object/page_top.php,
+  views/default/core/likes/display.php: moved the count comments and likes
+  functions into the ElggEntity class  
+
+  	* engine/lib/views.php, mod/file/edit.php, mod/messages/read.php: Fixes
+  #2854 removing my bad idea of auto-appending action in elgg_view_form()  
+
+  	* mod/pages/actions/pages/delete.php, mod/pages/start.php,
+  .../views/default/icon/object/page/medium.php,
+  mod/pages/views/default/icon/object/page/small.php,
+  .../views/default/icon/object/page_top/medium.php,
+  .../views/default/icon/object/page_top/small.php,
+  mod/pages/views/default/pages/icon.php: Fixes #2853 pages plugin uses the
+  icon url plugin hook and fixes delete action  
+
+  	* documentation/theming/preview/objects.php, js/lib/elgglib.js,
+  .../core/settings/statistics/numentities.php,
+  views/default/core/settings/statistics/online.php,
+  views/default/css/elements/chrome.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/page_layout.php,
+  views/default/page/elements/messages.php: more css/html improvements - added
+  .elgg-table and a featured module  
+
+  	* views/default/input/access.php, views/default/input/checkboxes.php,
+  views/default/input/datepicker.php, views/default/input/dropdown.php,
+  views/default/input/email.php, views/default/input/hidden.php,
+  views/default/input/longtext.php, views/default/input/plaintext.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/input/userpicker.php: Fixes #2510 sticky forms is finish - Elgg
+  1.9 could have a ElggForm class that makes it even easier to use a sticky
+  form  
+
+2011-02-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/theming/preview/objects.php, engine/lib/views.php,
+  mod/blog/views/default/blog/group_module.php,
+  mod/blog/views/default/blog/sidebar/archives.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  .../default/groups/profile/activity_module.php,
+  .../views/default/groups/sidebar/featured.php,
+  mod/groups/views/default/groups/sidebar/find.php,
+  .../views/default/groups/sidebar/members.php,
+  .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/personal.php,
+  mod/pages/views/default/pages/group_module.php,
+  mod/pages/views/default/pages/sidebar/history.php,
+  .../views/default/pages/sidebar/navigation.php,
+  views/default/core/likes/display.php, views/default/core/members/sidebar.php,
+  .../core/settings/account/default_access.php,
+  views/default/core/settings/account/email.php,
+  views/default/core/settings/account/language.php,
+  .../core/settings/account/notifications.php,
+  views/default/core/settings/account/password.php,
+  .../core/settings/statistics/numentities.php,
+  views/default/core/settings/statistics/online.php,
+  views/default/core/settings/tools/plugin.php,
+  views/default/css/elements/chrome.php, views/default/css/elements/grid.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/page_layout.php,
+  views/default/css/elements/reset.php, views/default/output/tagcloud.php:
+  using elgg-module-<type>  
+
+  	* views/default/icon/user/default/large.php,
+  views/default/icon/user/default/master.php,
+  views/default/icon/user/default/medium.php,
+  views/default/icon/user/default/small.php,
+  views/default/icon/user/default/tiny.php,
+  views/default/icon/user/default/topbar.php, views/default/profile/hover.php:
+  a little clean up of unnecessary views  
+
+  	* documentation/theming/preview/icons.php, engine/classes/ElggEntity.php,
+  engine/lib/deprecated-1.8.php, engine/lib/entities.php, engine/lib/input.php,
+  engine/lib/users.php, engine/lib/views.php, js/lib/ui.js,
+  mod/pages/views/default/pages/icon.php, views/default/css/elements/icons.php,
+  views/default/input/userpicker.php, views/default/page/elements/topbar.php,
+  views/default/profile/icon.php, views/foaf/page/shells/default.php: Fixes
+  #2559 refs #2475 added ElggEntity:getIconURL() and  elgg_view_entity_icon()  
+
+2011-02-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php, views/default/css/admin.php: The
+  screenshot desc is now used. Small css changes.  
+
+  	* views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php, views/default/css/admin.php: Better
+  displaying of full screenshots in plugins admin.  
+
+  	* engine/classes/ElggPluginPackage.php, engine/lib/plugins.php: Fixes #2852:
+  Checking other plugins' conflicts to see if plugin is able to be activated in
+  ElggPluginPackage->checkDependencies(). Some language clarification in admin
+  panel.  
+
+2011-02-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/theming/preview/widgets.php: fixed widgets theming preview
+  by overriding some javascript  
+
+  	* engine/classes/ElggEntity.php: supporting private settings before an
+  entity is saved  
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggWidget.php,
+  engine/lib/users.php: using setPrivateSetting() and getPrivateSetting()
+  instead of procedural functions  
+
+  	* views/default/css/elements/icons.php,
+  views/default/graphics/ajax_loader.php: fixed ajax loader css and html  
+
+  	* documentation/css/preview/forms.php,
+  documentation/css/preview/general.php, documentation/css/preview/grid.php,
+  documentation/css/preview/head.php, documentation/css/preview/icons.php,
+  documentation/css/preview/index.php, documentation/css/preview/nav.php,
+  documentation/css/preview/objects.php, documentation/css/preview/widgets.php,
+  documentation/theming/preview/forms.php,
+  documentation/theming/preview/general.php,
+  documentation/theming/preview/grid.php,
+  documentation/theming/preview/head.php,
+  documentation/theming/preview/icons.php,
+  documentation/theming/preview/index.php,
+  documentation/theming/preview/nav.php,
+  documentation/theming/preview/objects.php,
+  documentation/theming/preview/widgets.php, mod/developers/languages/en.php,
+  .../views/default/admin/developers/preview.php: changed named from css
+  preview to theming preview  
+
+  	* documentation/css/preview/forms.php,
+  documentation/css/preview/general.php, documentation/css/preview/grid.php,
+  documentation/css/preview/icons.php, documentation/css/preview/nav.php,
+  documentation/css/preview/objects.php, documentation/css/preview/widgets.php:
+  better navigation for theming previews  
+
+  	* documentation/css/preview/grid.php, documentation/css/preview/icons.php,
+  js/lib/ui.js, views/default/css/elements/grid.php,
+  views/default/css/elements/icons.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/navigation.php, views/default/js/elgg.php,
+  views/default/profile/hover.php: cleaned up hover menu  
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  views/default/css/elements/base.php, views/default/css/elements/chrome.php,
+  views/default/css/elements/core.php, views/default/css/elements/forms.php,
+  views/default/css/elements/helpers.php,
+  views/default/css/elements/layout.php,
+  views/default/css/elements/layout_objects.php,
+  views/default/css/elements/misc.php,
+  views/default/css/elements/page_layout.php,
+  views/default/css/elements/spacing.php,
+  views/default/css/elements/typography.php, views/default/css/screen.php,
+  views/default/page/elements/header_logo.php: getting back to the css - making
+  changes based on Evan's comments  
+
+  	* documentation/css/preview/forms.php,
+  documentation/css/preview/general.php, documentation/css/preview/grid.php,
+  documentation/css/preview/icons.php, documentation/css/preview/images.php,
+  documentation/css/preview/index.php, documentation/css/preview/nav.php,
+  documentation/css/preview/objects.php, documentation/css/preview/widgets.php:
+  cleaned up navigation of the css preview documentation  
+
+  	* mod/developers/start.php, .../views/default/admin/developers/preview.php,
+  mod/developers/views/default/developers/css.php: setting size for iframe for
+  css preview  
+
+  	* views/default/css/admin.php, views/default/layout/shells/admin.php:
+  removed unecessary inner div for .elgg-main because of switch back to
+  overflow: hidden  
+
+2011-02-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Fixed a problem with detecting conflicting plugin
+  versions.  Not showing a stray = when versions aren't specified in conflicts
+  and requires.  
+
+2011-02-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, views/default/admin/components/plugin.php,
+  views/default/css/admin.php: Added support for screenshots in the advanced
+  plugin admin.  
+
+  	* engine/classes/ElggPlugin.php: Fixed typo that caused ElggPlugin->path not
+  to be correctly set when loading from a plugin id.  
+
+  	* documentation/examples/plugins/manifest.xml,
+  engine/classes/ElggPluginManifest.php, engine/classes/ElggPluginPackage.php,
+  engine/lib/plugins.php, engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_18/manifest.xml: Renamed 'name' to 'plugin'
+  for priority req. Updated unit tests and docs.  
+
+  	* documentation/examples/plugins/manifest.xml: Added priority requires to
+  example manifest.  
+
+  	* engine/lib/plugins.php, languages/en.php,
+  views/default/admin/components/plugin.php: Fixed problems showing detected
+  values for plugin conflicts. Clarified language for what the first value
+  column means.  
+
+  	* engine/classes/ElggMenuItem.php, engine/classes/ElggPlugin.php,
+  engine/classes/ElggPluginManifest.php, engine/classes/ElggPluginPackage.php,
+  engine/lib/plugins.php, languages/en.php,
+  .../admin/components/plugin_dependencies.php, views/default/css/admin.php:
+  Added new priority 'requires' for plugin dep system. You can now say that a
+  plugin is required to be after / before another plugin in the system.  
+
+2011-02-04  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggData.php: I'm a dummy -- getType and getSubtype are
+  taken care of by Loggable... 
+
+  	* engine/classes/ElggData.php: Added type and subtype abstract functions to
+  ElggData 
+
+2011-02-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Fixes #2822: Added missing language string.  
+
+  	* engine/classes/ElggPluginPackage.php, engine/lib/deprecated-1.8.php,
+  engine/lib/plugins.php: Fixes #2820, Fixes #2823. Using elgg_get_plugins() in
+  elgg_get_plugins_provides(). Fixed plugin conflicts system. Removed cruft
+  from ElggPluginPackage. Fixed deprecated get_installed_plugins() to honor the
+  type requested.  
+
+2011-02-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/deprecated-1.8.php: Updated elgg_get_plugin_path in
+  load_plugin_manifest to elgg_get_plugins_path 
+
+  	* mod/profile/start.php, mod/sitepages/views/default/sitepages/css.php,
+  pages/dashboard.php, views/default/layout/shells/widgets.php: Changed widgets
+  layout "box" parameter to "content" just like the other layouts 
+
+2011-02-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/css/preview/forms.php, install/ElggInstaller.php,
+  mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/input/datetime.php,
+  mod/blog/views/default/widgets/blog/edit.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/file/views/default/widgets/filerepo/edit.php,
+  .../default/settings/garbagecollector/edit.php,
+  mod/groups/views/default/forms/discussion/save.php,
+  mod/groups/views/default/settings/groups/edit.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  .../views/default/settings/logrotate/edit.php,
+  mod/messages/views/default/forms/messages/send.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  .../views/default/widgets/reportedcontent/edit.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  .../views/default/widgets/tagcloud/edit.php,
+  .../views/default/settings/twitterservice/edit.php,
+  .../views/default/admin/users/unvalidated.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/core/river/filter.php,
+  views/default/core/settings/account/language.php,
+  views/default/css/admin.php, views/default/forms/admin/menu/save.php,
+  views/default/input/access.php, views/default/input/dropdown.php,
+  views/default/input/pulldown.php, views/default/output/dropdown.php,
+  views/default/output/pulldown.php,
+  views/default/widgets/content_stats/edit.php,
+  views/default/widgets/friends/edit.php,
+  views/default/widgets/new_users/edit.php,
+  views/default/widgets/online_users/edit.php,
+  views/installation/input/access.php, views/installation/input/dropdown.php,
+  views/installation/input/pulldown.php: changed input/pulldown to
+  input/dropdown  
+
+  	* engine/lib/tags.php, engine/lib/views.php, engine/tests/ui/submenu.php,
+  mod/bookmarks/bookmarklet.php, mod/thewire/add.php, mod/thewire/everyone.php,
+  mod/thewire/index.php, pages/friends/edit.php,
+  .../layout/shells/one_column_with_sidebar.php: removed
+  one_column_with_sidebar layout - use one_sidebar instead  
+
+  	* engine/lib/views.php, mod/categories/views/default/categories.php,
+  mod/categories/views/default/categories/list.php,
+  .../views/default/sitepages/keywords/userlist.php: removed uses of
+  $vars[config] in views  
+
+  	* engine/lib/output.php, .../views/default/twitterservice/login.php,
+  .../views/default/admin/users/unvalidated.php: removes uses of $vars[url]
+  from core and plugins  
+
+  	* engine/lib/views.php: Fixes #2124 only setting $vars[user], $vars[url],
+  and $vars[config] in elgg_view() if not already set  
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginPackage.php,
+  engine/lib/configuration.php, engine/lib/plugins.php, mod/blog/start.php,
+  mod/categories/start.php, mod/defaultwidgets/start.php,
+  mod/developers/start.php, mod/diagnostics/start.php,
+  mod/file/actions/file/download.php, mod/file/start.php, mod/groups/icon.php,
+  mod/groups/start.php, mod/invitefriends/start.php,
+  mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php,
+  mod/reportedcontent/start.php, mod/sitepages/start.php,
+  mod/thewire/start.php, mod/twitterservice/start.php,
+  views/default/admin/components/plugin.php: changed elgg_get_plugin_path() to
+  elgg_get_plugins_path()  
+
+  	* engine/lib/configuration.php, mod/categories/start.php,
+  mod/defaultwidgets/start.php, mod/diagnostics/start.php,
+  mod/groups/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/search/start.php, mod/twitterservice/languages/en.php,
+  mod/twitterservice/twitterservice_lib.php,
+  .../default/usersettings/twitterservice/edit.php: Refs #2428 just a few more
+  CONFIG uses left to be replaced  
+
+  	* mod/categories/actions/save.php,
+  .../views/default/settings/categories/edit.php, mod/file/start.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/delete.php,
+  mod/groups/actions/featured.php, mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/icon.php,
+  mod/invitefriends/actions/invite.php,
+  .../views/default/invitefriends/formitems.php, mod/notifications/start.php,
+  mod/pages/start.php, mod/profile/icon.php, mod/profile/start.php,
+  mod/sitepages/sitepages_functions.php, mod/twitterservice/start.php,
+  mod/twitterservice/twitterservice_lib.php,
+  .../default/usersettings/twitterservice/edit.php,
+  mod/uservalidationbyemail/lib/functions.php: Refs #2428 almost done removing
+  CONFIG access - mostly plugin start.php left  
+
+2011-02-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/actions/add.php, mod/bookmarks/actions/bookmarks/add.php,
+  mod/bookmarks/actions/bookmarks/delete.php,
+  mod/bookmarks/actions/bookmarks/edit.php, mod/bookmarks/actions/delete.php,
+  mod/bookmarks/actions/edit.php, mod/bookmarks/actions/reference.php,
+  mod/bookmarks/actions/remove.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/languages/en.php, mod/bookmarks/pages/add.php,
+  mod/bookmarks/pages/all.php, mod/bookmarks/pages/friends.php,
+  mod/bookmarks/pages/inbox.php, mod/bookmarks/pages/owner.php,
+  mod/bookmarks/pages/view.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  .../default/bookmarks/groupprofile_bookmarks.php,
+  .../views/default/bookmarks/owner_block.php,
+  mod/bookmarks/views/default/bookmarks/sharing.php,
+  mod/bookmarks/views/default/bookmarks/stats.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/river/object/bookmarks/annotate.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/bookmarks/views/rss/object/bookmarks.php: Refs #2680: First pass at
+  porting the 1.7 bookmarks to 1.8. Functional, but code is still messy.  
+
+  	* engine/lib/actions.php: Added more info to the @params documentation for
+  elgg_register_action.  
+
+2011-02-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  .../core/settings/account/default_access.php,
+  views/default/core/settings/account/language.php,
+  views/default/forms/login.php, views/default/input/button.php,
+  views/default/js/initialize_elgg.php,
+  views/default/page/elements/html_begin.php,
+  views/default/page/elements/html_end.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/rss/page/shells/default.php,
+  views/xml/messages/exceptions/exception.php: Refs #2428 removed some uses of
+  CONFIG in the views  
+
+  	* views/default/css/elements/navigation.php,
+  views/default/navigation/pagination.php: Fixes #2802 put state class on list
+  element rather than span  
+
+  	* install/ElggInstaller.php: fixes #2784 for real this time  
+
+  	* install/ElggInstaller.php: Fixes #2784 #2842 installer uses new plugin
+  system now  
+
+2011-02-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/manifest.xml, mod/bookmarks/manifest.xml,
+  mod/defaultwidgets/manifest.xml, mod/embed/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/logbrowser/manifest.xml,
+  mod/logrotate/manifest.xml, mod/messageboard/manifest.xml,
+  mod/messages/manifest.xml, mod/notifications/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/search/manifest.xml,
+  mod/tinymce/manifest.xml, mod/uservalidationbyemail/manifest.xml,
+  mod/zaudio/manifest.xml: updated the plugin manifest files to use the new
+  variable name for activation on installation  
+
+2011-02-02  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, views/default/river/item.php: Fixes #2846:
+  elgg_view_river_item calls river/item view first. 
+
+  	* views/default/core/river/body.php: Adding quotes to "constant" item 
+
+2011-02-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Fixes #2844 setting table for access_id to fix fatal
+  error  
+
+  	* mod/groups/actions/edit.php, mod/groups/start.php,
+  mod/groups/views/default/forms/groups/edit.php: moved name out of
+  configurable fields for a group  
+
+  	* mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/edit.php: more clean up of the group edit
+  form  
+
+  	* mod/groups/lib/groups.php, mod/groups/start.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/edit.php: a little clean up of the groups
+  edit form  
+
+  	* .../layout/shells/two_column_left_sidebar.php,
+  views/default/page/shells/default.php: backward compatibility code for
+  plugins that add admin pages  
+
+  	* languages/en.php: added a string from 1.7 profile plugin into core for
+  backward compatibility  
+
+2011-02-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page/elements/html_begin.php: Puts css before js in the
+  head, per website performance best practices 
+
+  	* engine/lib/views.php: Initialize global $CURRENT_SYSTEM_VIEWTYPE correctly
+
+  	* engine/lib/deprecated-1.7.php, engine/lib/deprecated-1.8.php,
+  engine/lib/sessions.php, engine/lib/sites.php, engine/lib/tags.php,
+  engine/lib/users.php, engine/lib/usersettings.php, engine/lib/views.php:
+  Moved deprecated files from sessions.php - xml.php into deprecation files for
+  1.7 and 1.8 
+
+  	* engine/lib/deprecated-1.7.php, engine/lib/deprecated-1.8.php,
+  engine/lib/group.php, engine/lib/location.php, engine/lib/metadata.php,
+  engine/lib/navigation.php, engine/lib/objects.php, engine/lib/output.php,
+  engine/lib/pageowner.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php, engine/lib/relationships.php,
+  engine/lib/river.php: Moved functions from export.php - river.php into
+  deprecated files 
+
+  	* engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/deprecated-1.7.php,
+  engine/lib/deprecated-1.8.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/start.php: Moving deprecated functions out of
+  files access.php - entities.php.  This time into two files based on version
+  deprecated and maintaining documentation 
+
+  	* engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/deprecated.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/install.php, engine/lib/location.php, engine/lib/mb_wrapper.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/navigation.php, engine/lib/objects.php, engine/lib/output.php,
+  engine/lib/pageowner.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php: Reversing 7975 
+
+  	* engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/deprecated.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/install.php, engine/lib/location.php, engine/lib/mb_wrapper.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/navigation.php, engine/lib/objects.php, engine/lib/output.php,
+  engine/lib/pageowner.php, engine/lib/plugins.php,
+  engine/lib/private_settings.php, engine/start.php: Refs #2839: moved
+  deprecated functions from access.php - private_settings.php to
+  deprecated.php.  Still have to do relationships.php - xml.php.  Deleted
+  documentation for these functions since 1) it was using up precious bytes,
+  and 2) documentation should not be needed since people should not be trying
+  to use these if they are using 1.8, and 3) I assume the documentation will
+  exist as archived 1.7 docs. 
+
+2011-01-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/group_module.php,
+  mod/file/views/default/file/group_module.php,
+  .../views/default/discussion/group_module.php,
+  mod/groups/views/default/groups/css.php,
+  .../default/groups/profile/activity_module.php,
+  mod/pages/views/default/pages/group_module.php,
+  views/default/css/elements/core.php: fixed css for group module headers  
+
+  	* engine/lib/output.php: supporting 'javascript:' when normalizing urls  
+
+  	* engine/lib/pageowner.php: fixed typo in deprecation notice  
+
+  	* .../layout/shells/two_column_left_sidebar.php: made
+  two_column_left_sidebar layout also handle $vars['content']  
+
+  	* engine/lib/navigation.php: accidently removed the site menu set up
+  function  
+
+2011-01-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/forms/blog/save.php,
+  mod/pages/views/default/annotation/page.php,
+  views/default/annotation/default.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/css/admin.php,
+  views/default/css/elements/core.php,
+  views/default/layout/objects/list/body.php: introducing elgg-subtext as
+  replacement for elgg-list-subtitle and elgg-subtitle  
+
+  	* engine/lib/elgglib.php, engine/lib/navigation.php,
+  engine/tests/ui/submenu.php, views/default/layout/elements/sidebar.php,
+  views/default/layout/elements/title.php,
+  views/default/navigation/sidebar_menu.php,
+  views/default/navigation/submenu_group.php,
+  views/default/navigation/submenu_item.php,
+  views/default/navigation/submenu_js.php: removed menu code introduced for
+  elgg.com that did not make it into 1.8  
+
+  	* views/default/annotation/default.php: using the new image block rather
+  than deprecated listing view  
+
+  	* views/default/navigation/tabs.php: supporting adding a class to navigation
+  tabs  
+
+2011-01-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/statistics/overview.php: updated the overview
+  statistics page  
+
+  	* engine/lib/group.php, engine/lib/pageowner.php, engine/lib/users.php,
+  engine/lib/widgets.php, mod/blog/views/default/blog/group_module.php,
+  mod/blog/views/default/blog/sidebar/archives.php,
+  mod/blog/views/default/blog/sidebar/tagcloud.php,
+  mod/blog/views/default/widgets/blog/content.php,
+  mod/bookmarks/bookmarklet.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  .../views/default/widgets/bookmarks/view.php,
+  .../views/default/defaultwidgets/editor.php, mod/file/friends.php,
+  mod/file/index.php, mod/file/search.php, mod/file/upload.php,
+  mod/file/view.php, mod/file/views/default/file/group_module.php,
+  .../views/default/widgets/filerepo/content.php, mod/groups/lib/groups.php,
+  .../default/widgets/a_users_groups/content.php, mod/messageboard/index.php,
+  .../views/default/widgets/messageboard/content.php, mod/messages/inbox.php,
+  mod/messages/read.php, mod/messages/sent.php, mod/pages/friends.php,
+  mod/pages/index.php, mod/pages/revision.php, mod/pages/view.php,
+  mod/pages/views/default/pages/group_module.php,
+  .../views/default/pages/sidebar/navigation.php,
+  mod/pages/views/default/widgets/pages/content.php, mod/profile/icon.php,
+  mod/profile/views/default/profile/details.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/owner_block.php, mod/thewire/index.php,
+  .../views/default/widgets/thewire/content.php, pages/avatar/edit.php,
+  pages/avatar/view.php, pages/friends/index.php, pages/friends/of.php,
+  pages/friends/pickercallback.php, pages/profile/edit.php,
+  pages/settings/account.php, pages/settings/statistics.php,
+  pages/settings/tools.php, .../core/settings/account/default_access.php,
+  views/default/core/settings/account/email.php,
+  views/default/core/settings/account/language.php,
+  views/default/core/settings/account/name.php,
+  views/default/core/settings/account/password.php,
+  views/default/js/initialize_elgg.php,
+  views/default/layout/elements/owner_block.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/widgets.php,
+  views/default/page/elements/content_header.php,
+  .../page/elements/content_header_member.php,
+  views/foaf/page/shells/default.php: changed elgg_get_page_owner() to
+  elgg_get_page_owner_entity() to be more consistent  
+
+  	* mod/file/languages/en.php: updated language file for file plugin due to
+  change in groups  
+
+  	* mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/groups/css.php,
+  .../default/groups/profile/activity_module.php,
+  .../default/groups/profile/activity_widget.php,
+  .../views/default/groups/profile/widgets.php: adding activity module to
+  groups  
+
+  	* views/default/css/admin.php: going back to overflow:hidden on elgg-body -
+  too many issues with display: table-cell  
+
+  	* languages/en.php, views/default/css/admin.php,
+  views/default/widgets/content_stats/content.php,
+  views/default/widgets/content_stats/edit.php,
+  views/default/widgets/friends/edit.php,
+  views/default/widgets/new_users/edit.php,
+  views/default/widgets/online_users/edit.php: added edit views for admin
+  widgets  
+
+  	* mod/ecml/README.txt, mod/ecml/actions/save_permissions.php,
+  mod/ecml/ecml_functions.php, mod/ecml/graphics/dailymotion.png,
+  mod/ecml/graphics/ecml.png, mod/ecml/graphics/googlemaps.png,
+  mod/ecml/graphics/logo_bliptv.gif, mod/ecml/graphics/logo_dailymotion.gif,
+  mod/ecml/graphics/logo_googlemaps.gif, mod/ecml/graphics/logo_livevideo.gif,
+  mod/ecml/graphics/logo_redlasso.gif, mod/ecml/graphics/logo_slideshare.gif,
+  mod/ecml/graphics/logo_vimeo.gif, mod/ecml/graphics/logo_youtube.gif,
+  mod/ecml/graphics/redlasso_1.png, mod/ecml/graphics/redlasso_2.png,
+  mod/ecml/graphics/slideshare.png, mod/ecml/graphics/url_status.png,
+  mod/ecml/graphics/vimeo.png, mod/ecml/graphics/youtube.png,
+  mod/ecml/languages/en.php, mod/ecml/manifest.xml, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/help.php,
+  mod/ecml/views/default/ecml/help/blip.tv.php,
+  mod/ecml/views/default/ecml/help/dailymotion.php,
+  mod/ecml/views/default/ecml/help/googlemaps.php,
+  mod/ecml/views/default/ecml/help/livevideo.php,
+  mod/ecml/views/default/ecml/help/redlasso.php,
+  mod/ecml/views/default/ecml/help/slideshare.php,
+  mod/ecml/views/default/ecml/help/vimeo.php,
+  mod/ecml/views/default/ecml/help/youtube.php,
+  mod/ecml/views/default/ecml/input_ext.php,
+  mod/ecml/views/default/ecml/keyword_help.php,
+  mod/ecml/views/default/ecml/keywords/blip.tv.php,
+  .../views/default/ecml/keywords/dailymotion.php,
+  mod/ecml/views/default/ecml/keywords/entity.php,
+  .../views/default/ecml/keywords/googlemaps.php,
+  mod/ecml/views/default/ecml/keywords/livevideo.php,
+  mod/ecml/views/default/ecml/keywords/redlasso.php,
+  .../views/default/ecml/keywords/slideshare.php,
+  mod/ecml/views/default/ecml/keywords/user_list.php,
+  mod/ecml/views/default/ecml/keywords/vimeo.php,
+  mod/ecml/views/default/ecml/keywords/youtube.php,
+  .../views/default/embed/web_services/content.php,
+  mod/ecml/views/default/settings/ecml/edit.php: moving ecml to plugins
+  repository as it won't be a part of 1.8.0. It will be back though...  
+
+  	* views/default/css/admin.php, views/default/css/elements/navigation.php,
+  views/default/css/elements/reset.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/navigation/pagination.php, views/default/navigation/tabs.php:
+  adding elgg-state-* css elements  
+
+  	* engine/lib/views.php: fixed bug where a null passed as 2nd parameter to
+  elgg_view_layout() prevented backward compatibility  
+
+  	* js/lib/ui.widgets.js: one too many parents in the widget collapse code  
+
+  	* mod/ecml/views/default/ecml/input_ext.php,
+  mod/embed/views/default/embed/link.php, views/default/css/admin.php,
+  views/default/css/elements/forms.php: namespaced longtext-control  
+
+  	* mod/tinymce/graphics/ed-bg.gif, mod/tinymce/graphics/example.gif,
+  mod/tinymce/graphics/more.gif, mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  mod/tinymce/views/default/tinymce/init.php: cleaned up tinymce plugin  
+
+  	* mod/reportedcontent/start.php, .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/user_report.php,
+  .../default/widgets/reportedcontent/content.php,
+  .../views/default/widgets/reportedcontent/edit.php: added reported content
+  widget  
+
+  	* mod/reportedcontent/languages/en.php, mod/reportedcontent/start.php,
+  .../default/admin/utilities/reportedcontent.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/reportedcontent/admin_css.php, views/default/css/admin.php:
+  adding margin to admin buttons  
+
+  	* .../graphics/sign_in_with_twitter.gif,
+  mod/twitterservice/languages/en.php, mod/twitterservice/manifest.xml,
+  mod/twitterservice/start.php, mod/twitterservice/twitterservice_lib.php,
+  mod/twitterservice/vendors/twitteroauth/LICENSE,
+  mod/twitterservice/vendors/twitteroauth/OAuth.php,
+  mod/twitterservice/vendors/twitteroauth/README,
+  .../vendors/twitteroauth/twitterOAuth.php,
+  .../views/default/settings/twitterservice/edit.php,
+  .../views/default/twitterservice/css.php,
+  .../views/default/twitterservice/login.php,
+  .../views/default/twitterservice/metatags.php,
+  .../default/usersettings/twitterservice/edit.php: moved twitterservice into
+  core  
+
+2011-01-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/chrome.php,
+  views/default/css/elements/core.php, views/default/css/elements/icons.php,
+  views/default/css/elements/navigation.php,
+  views/default/layout/objects/gallery.php,
+  views/default/layout/objects/list.php: light clean-up of the css  
+
+  	* js/lib/ui.widgets.js, pages/dashboard.php,
+  views/default/admin/dashboard.php, views/default/css/admin.php,
+  views/default/css/elements/core.php, views/default/layout/objects/widget.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/objects/widget/settings.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/layout/shells/widgets/add_panel.php: converted widgets to
+  modules  
+
+  	* engine/lib/views.php: added support for $vars to elgg_view_entity() - need
+  to clean up documentation and deprecate old usage  
+
+2011-01-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/widgets.php, languages/en.php,
+  mod/developers/languages/en.php, mod/developers/start.php,
+  mod/thewire/start.php, views/default/admin/dashboard.php,
+  views/default/admin/overview/statistics.php,
+  views/default/admin/statistics/overview.php, views/default/css/admin.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_panel.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/widgets/content_stats/content.php,
+  views/default/widgets/new_users/content.php,
+  views/default/widgets/online_users/content.php: welcome to the admin
+  dashboard  
+
+2011-01-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/logbrowser/start.php,
+  .../views/default/admin/utilities/logbrowser.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/logbrowser/table.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/appearance/profile_fields.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/overview/statistics.php,
+  views/default/admin/users/newest.php, views/default/admin/users/online.php,
+  views/default/css/admin.php, views/default/forms/admin/menu/save.php,
+  views/default/forms/profile/fields/add.php, views/default/forms/useradd.php,
+  views/default/layout/shells/admin.php,
+  views/default/layout/shells/admin/menu.php: updated more of the admin backend
+  to use new CSS/HTML  
+
+  	* views/default/admin/overview/statistics.php, views/default/css/admin.php:
+  starting to remove the old HTML/CSS in the admin backend  
+
+  	* views/default/css/admin.php, views/default/layout/shells/admin.php,
+  views/default/layout/shells/admin/menu.php: take two of the admin header and
+  sidebar menu - sidebar menu still needs plenty of work  
+
+  	* views/default/layout/objects/module.php: default elgg-inner to false in
+  module  
+
+  	* engine/lib/group.php, mod/groups/start.php: Refs #2557 merged fix into
+  trunk from 1.7 branch  
+
+  	* engine/lib/database.php, engine/lib/entities.php,
+  engine/lib/metastrings.php, engine/lib/notification.php, engine/lib/pam.php,
+  engine/lib/users.php, engine/lib/web_services.php, engine/lib/xml-rpc.php:
+  Refs #2804 #2805 pulling changes in trunk from 1.7 branch  
+
+  	* languages/en.php: forgot these language strings in the admin theme update 
+
+  	* views/default/css/admin.php, views/default/layout/shells/admin.php:
+  playing around a little with the admin theme  
+
+2011-01-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ErrorResult.php: Fixes #2586 ErrorResult has PHP5
+  constructor now  
+
+  	* engine/lib/web_services.php: missed check for null parameters in web
+  services parameter code  
+
+  	* engine/lib/web_services.php: Fixes #2548 do not need include_post_data()
+  because of changes to rewrite rules  
+
+  	* engine/lib/sessions.php, engine/lib/web_services.php,
+  mod/uservalidationbyemail/start.php: testing for the existence of username in
+  pam credentials before using  
+
+  	* mod/groups/languages/en.php, mod/groups/lib/groups.php,
+  mod/groups/start.php, .../views/default/groups/sidebar/members.php: Fixes
+  #2295 added a group member list page  
+
+  	* views/default/css/elements/base.php,
+  .../layout/shells/one_column_with_sidebar.php: css now provides center for
+  text and centered for divs  
+
+  	* mod/pages/history.php, mod/pages/images/application.png,
+  mod/pages/images/code.png, mod/pages/images/css.png, mod/pages/images/db.png,
+  mod/pages/images/directory.png, mod/pages/images/doc.png,
+  mod/pages/images/file.gif, mod/pages/images/file.png,
+  mod/pages/images/film.png, mod/pages/images/flash.png,
+  mod/pages/images/folder-closed.gif, mod/pages/images/folder.gif,
+  mod/pages/images/folder_open.png, mod/pages/images/html.png,
+  mod/pages/images/java.png, mod/pages/images/linux.png,
+  mod/pages/images/minus.gif, mod/pages/images/music.png,
+  mod/pages/images/pdf.png, mod/pages/images/php.png,
+  mod/pages/images/picture.png, mod/pages/images/plus.gif,
+  mod/pages/images/ppt.png, mod/pages/images/psd.png,
+  mod/pages/images/ruby.png, mod/pages/images/script.png,
+  mod/pages/images/spinner.gif, mod/pages/images/treeview-black-line.gif,
+  mod/pages/images/treeview-black.gif,
+  mod/pages/images/treeview-default-line.gif,
+  mod/pages/images/treeview-default.gif,
+  mod/pages/images/treeview-famfamfam-line.gif,
+  mod/pages/images/treeview-famfamfam.gif,
+  mod/pages/images/treeview-gray-line.gif, mod/pages/images/treeview-gray.gif,
+  mod/pages/images/treeview-red-line.gif, mod/pages/images/treeview-red.gif,
+  mod/pages/images/txt.png, mod/pages/images/xls.png, mod/pages/images/zip.png,
+  mod/pages/index.php, mod/pages/javascript/jquery.treeview.async.js,
+  mod/pages/javascript/jquery.treeview.js, mod/pages/lib/pages.php,
+  mod/pages/new.php, mod/pages/pagesTree.php, mod/pages/revision.php,
+  mod/pages/start.php, mod/pages/vendors/jquery-treeview/.gitignore,
+  mod/pages/vendors/jquery-treeview/README.md,
+  mod/pages/vendors/jquery-treeview/changelog.txt,
+  mod/pages/vendors/jquery-treeview/demo/async.html,
+  mod/pages/vendors/jquery-treeview/demo/bg.gif,
+  mod/pages/vendors/jquery-treeview/demo/demo.js,
+  mod/pages/vendors/jquery-treeview/demo/edit.html,
+  mod/pages/vendors/jquery-treeview/demo/images.html,
+  mod/pages/vendors/jquery-treeview/demo/index.html,
+  mod/pages/vendors/jquery-treeview/demo/large.html,
+  .../vendors/jquery-treeview/demo/prerendered.html,
+  mod/pages/vendors/jquery-treeview/demo/screen.css,
+  mod/pages/vendors/jquery-treeview/demo/simple.html,
+  .../vendors/jquery-treeview/demo/sortable.html,
+  mod/pages/vendors/jquery-treeview/demo/source.php,
+  mod/pages/vendors/jquery-treeview/demo/source.phps,
+  .../vendors/jquery-treeview/images/ajax-loader.gif,
+  mod/pages/vendors/jquery-treeview/images/file.gif,
+  .../jquery-treeview/images/folder-closed.gif,
+  .../vendors/jquery-treeview/images/folder.gif,
+  mod/pages/vendors/jquery-treeview/images/minus.gif,
+  mod/pages/vendors/jquery-treeview/images/plus.gif,
+  .../jquery-treeview/images/treeview-black-line.gif,
+  .../jquery-treeview/images/treeview-black.gif,
+  .../images/treeview-default-line.gif,
+  .../jquery-treeview/images/treeview-default.gif,
+  .../images/treeview-famfamfam-line.gif,
+  .../jquery-treeview/images/treeview-famfamfam.gif,
+  .../jquery-treeview/images/treeview-gray-line.gif,
+  .../jquery-treeview/images/treeview-gray.gif,
+  .../jquery-treeview/images/treeview-red-line.gif,
+  .../jquery-treeview/images/treeview-red.gif,
+  .../jquery-treeview/jquery.treeview.async.js,
+  .../vendors/jquery-treeview/jquery.treeview.css,
+  .../jquery-treeview/jquery.treeview.edit.js,
+  .../vendors/jquery-treeview/jquery.treeview.js,
+  .../vendors/jquery-treeview/jquery.treeview.min.js,
+  .../jquery-treeview/jquery.treeview.sortable.js,
+  .../vendors/jquery-treeview/lib/jquery.cookie.js,
+  mod/pages/vendors/jquery-treeview/lib/jquery.js,
+  mod/pages/vendors/jquery-treeview/todo, mod/pages/view.php,
+  mod/pages/views/default/pages/css.php,
+  mod/pages/views/default/pages/metatags.php,
+  mod/pages/views/default/pages/sidebar/history.php,
+  .../views/default/pages/sidebar/navigation.php,
+  .../views/default/pages/sidebar/sidebarthis.php,
+  mod/pages/views/default/pages/sidebar/starter.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/sidebar/wrapper.php: finished the first pass on
+  the pages plugin for using the new HTML/CSS  
+
+  	* views/default/layout/shells/content/header.php: this time got the guid
+  correct for the add button  
+
+  	* views/default/css/elements/navigation.php: limiting the +/- additions to
+  page menus  
+
+  	* js/lib/ui.js: limit the collapsible menus to page menus  
+
+  	* actions/widgets/add.php: making sure context is set correctly when adding
+  a widget  
+
+  	* views/default/layout/shells/content/header.php: fixed add link for all
+  site content pages  
+
+  	* mod/pages/actions/pages/edit.php, mod/pages/edit.php,
+  mod/pages/friends.php, mod/pages/history.php, mod/pages/index.php,
+  mod/pages/languages/en.php, mod/pages/lib/pages.php, mod/pages/new.php,
+  mod/pages/revision.php, mod/pages/start.php,
+  mod/pages/views/default/annotation/icon.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/css.php,
+  mod/pages/views/default/pages/group_module.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/icon.php,
+  mod/pages/views/default/pages/pagegallery.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/pages/sidebar/navigation.php,
+  mod/pages/views/default/widgets/pages/content.php,
+  mod/pages/views/default/widgets/pages/edit.php, mod/pages/world.php: more
+  clean up of the pages plugin to use new HTML/CSS  
+
+  	* mod/blog/views/default/object/blog.php: using list metadata view rather
+  than custom code  
+
+  	* engine/classes/ElggPlugin.php: fixed bug with plugin settings because of
+  assignment operator confusion  
+
+  	* engine/lib/private_settings.php: do not need {} around quoted variables
+  surrounded by quotes  
+
+  	* engine/classes/ElggPlugin.php: Fixes #2812 - correct check for guid now  
+
+  	* engine/classes/ElggPlugin.php: fixed backward compatibility issue with
+  $CONFIG in plugins' start.php  
+
+  	* engine/lib/navigation.php: deprecated add_menu() and made it compatible
+  with 1.8  
+
+  	* .../layout/shells/two_column_left_sidebar.php: added the
+  two_column_left_sidebar layout back so that plugins from 1.7 work with 1.8  
+
+2011-01-21  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php, views/default/css/elements/base.php,
+  views/default/css/elements/chrome.php, views/default/css/elements/core.php,
+  views/default/css/elements/forms.php, views/default/css/elements/grid.php,
+  views/default/css/elements/icons.php, views/default/css/elements/layout.php,
+  views/default/css/elements/misc.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/reset.php, views/default/css/elements/spacing.php,
+  views/default/css/elements/typography.php: Made a thorough pass over the css.
+   Included todo's throughout to track what still needs to be done. 
+
+2011-01-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/list/metadata.php: moved likes to end of
+  metadata and added a links parameter  
+
+  	* views/default/layout/shells/content/header.php: using page owner rather
+  than owner for better support for groups  
+
+  	* engine/lib/views.php: adding 'action' to url when overriding the form
+  action  
+
+2011-01-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/actions/delete.php, mod/messages/actions/messages/delete.php,
+  mod/messages/actions/messages/process.php,
+  mod/messages/actions/messages/send.php, mod/messages/actions/send.php,
+  mod/messages/inbox.php, mod/messages/index.php,
+  mod/messages/languages/en.php, mod/messages/lib/messages.php,
+  mod/messages/read.php, mod/messages/readme.txt, mod/messages/send.php,
+  mod/messages/sent.php, mod/messages/start.php,
+  .../views/default/forms/messages/process.php,
+  .../views/default/forms/messages/reply.php,
+  mod/messages/views/default/forms/messages/send.php,
+  mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php,
+  mod/messages/views/default/object/messages.php: Updated the messages plugin
+  to use the new CSS/HTML  
+
+  	* mod/pages/actions/pages/editwelcome.php, mod/pages/edit.php,
+  mod/pages/friends.php, mod/pages/history.php, mod/pages/index.php,
+  mod/pages/languages/en.php, mod/pages/lib/pages.php, mod/pages/new.php,
+  mod/pages/start.php, mod/pages/view.php,
+  .../views/default/forms/pages/editwelcome.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/welcome.php, mod/pages/welcome.php,
+  mod/pages/world.php: pages plugin using new layout - still need to get
+  subpages working and navigation  
+
+2011-01-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/export_handler.php, index.php,
+  mod/reportedcontent/start.php, mod/sitepages/sitepages_functions.php,
+  mod/tagcloud/tagcloud.php, pages/friends/add.php,
+  pages/friends/collections.php: changed layout on pages to one_sidebar  
+
+  	* mod/search/index.php, mod/search/views/default/search/layout.php,
+  mod/search/views/default/search/no_results.php: using new menu system and
+  page layouts in search  
+
+  	* mod/groups/graphics/icon.php, mod/groups/icon.php,
+  mod/groups/languages/en.php, mod/groups/lib/discussion.php,
+  mod/groups/start.php, .../views/default/discussion/group_module.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  .../views/default/groups/profile/forum_widget.php,
+  .../views/default/groups/profile/widgets.php,
+  .../views/default/object/groupforumtopic.php: finished discussion rewrite to
+  use new html/css  
+
+2011-01-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/discussion/delete.php,
+  mod/groups/actions/discussion/save.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/addtopic.php,
+  mod/groups/edittopic.php, mod/groups/forum.php, mod/groups/languages/en.php,
+  mod/groups/lib/discussion.php, mod/groups/start.php,
+  mod/groups/topicposts.php,
+  mod/groups/views/default/forms/discussion/save.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/viewposts.php,
+  .../views/default/groups/group_sort_menu.php,
+  .../views/default/groups/profile/forum_widget.php,
+  .../views/default/object/groupforumtopic.php: discussion topics using new
+  page handler  
+
+  	* mod/developers/languages/en.php, mod/developers/manifest.xml,
+  mod/developers/start.php, .../views/default/admin/developers/preview.php:
+  added the beginnings of a core developers tool plugin  
+
+  	* documentation/css/preview/general.php, documentation/css/preview/grid.php,
+  documentation/css/preview/images.php, documentation/css/preview/index.php,
+  documentation/css/preview/nav.php, documentation/css/preview/objects.php,
+  documentation/css/preview/widgets.php: Added images to css preview and
+  removed the page centering  
+
+  	* engine/lib/river.php: Fixes #2402 adds 'add' 'river' plugin hook  
+
+  	* actions/profile/edit.php: Fixes #2372 fixed the entity included in profile
+  update event  
+
+  	* engine/tests/suite.php: Refs #2757 merged fix into trunk  
+
+  	* mod/twitter/languages/en.php, mod/twitter/start.php: Refs #2791 merged fix
+  into trunk  
+
+2011-01-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/list/body.php: Small typo in comment 
+
+2011-01-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/invite.php, mod/groups/lib/groups.php,
+  mod/groups/membershipreq.php, mod/groups/start.php,
+  .../views/default/groups/profile/buttons.php: finished moving the group pages
+  to library - forum pages next  
+
+  	* mod/groups/activity.php, mod/groups/all.php, mod/groups/edit.php,
+  mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invitations.php, mod/groups/languages/en.php,
+  mod/groups/lib/groups.php, mod/groups/membership.php, mod/groups/new.php,
+  mod/groups/start.php, .../views/default/groups/group_sort_menu.php,
+  .../views/default/groups/profile/buttons.php: moved most of the groups pages
+  into its library  
+
+2011-01-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, mod/diagnostics/languages/en.php,
+  mod/logbrowser/languages/en.php,
+  .../views/default/admin/utilities/logbrowser.php: finished the admin title
+  modifications  
+
+  	* engine/lib/system_log.php: Fixed problem where system log code would crash
+  due to new plugin code  
+
+  	* engine/lib/admin.php, languages/en.php, mod/defaultwidgets/start.php,
+  .../views/default/admin/utilities/diagnostics.php,
+  mod/uservalidationbyemail/languages/en.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/appearance/profile_fields.php,
+  views/default/admin/overview/numentities.php,
+  views/default/admin/overview/online.php,
+  views/default/admin/overview/statistics.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/admin/users/add.php, views/default/admin/users/newest.php,
+  views/default/admin/users/online.php, views/default/layout/shells/admin.php,
+  views/default/layout/shells/administration.php: drying up the title creation
+  in the admin backend  
+
+  	* mod/groups/all.php, mod/groups/languages/en.php,
+  mod/groups/views/default/group/default.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  .../views/default/groups/sidebar/featured.php,
+  mod/groups/views/default/groups/sidebar/find.php,
+  .../views/default/icon/group/default/large.php,
+  .../views/default/icon/group/default/medium.php,
+  .../views/default/icon/group/default/small.php,
+  .../views/default/icon/group/default/tiny.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/settings/groups/edit.php: cleanup of the groups
+  plugin views  
+
+2011-01-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/installation/canvas/default.php: elgg_view_layout is not used in
+  installation so removing old view 
+
+  	* install/css/install.css, views/installation/messages/errors/error.php,
+  views/installation/messages/errors/list.php,
+  views/installation/messages/list.php,
+  views/installation/messages/messages/list.php,
+  views/installation/messages/messages/message.php,
+  views/installation/page/elements/messages.php,
+  views/installation/page/shells/default.php: Fixes #2783 - updated
+  installation message code to mirror default views 
+
+2011-01-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginPackage.php: Refs #2781: Checking if a dir was
+  passed as a plugin package. Need to do this to allow packages to be loaded
+  outside of plugin_dir.  
+
+  	* engine/classes/ElggPlugin.php: Refs #2781: Using same technique to check
+  for full plugin path in ElggPlugin.  
+
+  	* views/default/admin/plugins/simple.php: Refs #2782: Fixed WSOD for simple
+  plugin admin.  
+
+  	* languages/en.php, views/default/admin/components/invalid_plugin.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php: Refs #2782: Fixed WSOD for invalid
+  plugins on admin screen. Needs better CSS, but holding off until admin area
+  CSS revamp.  
+
+  	* engine/lib/entities.php: Changed callback function option from
+  'row_callback' to 'callback' for elgg_get_entities().  
+
+2011-01-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginPackage.php: Refs #2781 path checking in
+  ElggPluginPackage constructor should work for both *nix and Windows now 
+
+  	* mod/groups/groupprofile.php, .../views/default/groups/activity_latest.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/members.php,
+  .../default/groups/profile/activity_widget.php,
+  .../views/default/groups/profile/buttons.php,
+  .../default/groups/profile/closed_membership.php,
+  .../views/default/groups/profile/forum_widget.php,
+  .../views/default/groups/profile/profile_block.php,
+  .../views/default/groups/profile/widgets.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/groups/sidebar/members.php: cleaned up the group profile  
+
+2011-01-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/file/views/default/object/file.php,
+  views/default/css/elements/chrome.php, views/default/output/tags.php: changed
+  tag display to <ul>  
+
+2011-01-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixes #1242: elgg_get_data() correctly returns an
+  empty array on no results. It still returns false on error, but I consider
+  that the correct behavior. Please reopen if it needs discussion.  
+
+  	* engine/lib/database.php, engine/tests/objects/entities.php: Refs #1242,
+  Fixes #2775. Pulled common code between get_data() and get_data_row() into
+  elgg_query_runner(). Caching is now done in the query runner instead of
+  spread across execute_query() and get_data*(). Namespacing cache for callback
+  and single row request. I'm open to better names for that function. Not
+  closing #1242 because the elgg_get_entities*() functions can still return
+  false.  
+
+2011-01-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/start.php: moved action registration into init  
+
+  	* mod/sitepages/sitepages_functions.php: updating the site pages class to
+  use initializeAttributes  
+
+  	* mod/blog/languages/en.php, mod/blog/lib/blog.php, mod/blog/start.php,
+  mod/blog/views/default/blog/group_module.php, mod/file/index.php,
+  mod/file/languages/en.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/file/group_module.php,
+  views/default/layout/shells/content/header.php: switched from new to add  
+
+  	* engine/lib/relationships.php: Fixes test for $relationship_guid in sql
+  generating function  
+
+  	* engine/classes/ElggPluginPackage.php, engine/lib/elgglib.php,
+  engine/lib/metadata.php, engine/lib/views.php, engine/lib/xml.php: Fixes
+  #2774 - fixes several E_NOTICE issues - mostly due to accessign array indexes
+   
+
+  	* engine/start.php: replaced deprecated load_plugins() - thanks to hellekin 
+
+2011-01-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ajax.js: Refs #2770 - success messages are stoted is success array
+  now in json  
+
+  	* js/lib/ui.js, views/default/js/elgg.php: Refs #2676 removes old
+  elgg_system_messages() function  
+
+2011-01-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/elgglib.js: Fixes #2770: Corrected markup in JS to create system
+  messages.  
+
+  	* mod/profile/manifest.xml: Refs #2761. Removed test dep from profile
+  manifest. Profile no longer requires a version of Elgg from the year 3009.  
+
+  	* actions/admin/plugins/activate.php,
+  actions/admin/plugins/activate_all.php, actions/admin/plugins/deactivate.php,
+  actions/admin/plugins/deactivate_all.php, actions/admin/plugins/disable.php,
+  actions/admin/plugins/disableall.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/enableall.php, actions/admin/plugins/reorder.php,
+  actions/admin/plugins/set_priority.php,
+  actions/admin/plugins/simple_update_states.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginPackage.php, engine/lib/plugins.php,
+  languages/en.php, mod/profile/manifest.xml,
+  views/default/admin/components/plugin.php,
+  .../admin/components/plugin_dependencies.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php: Fixes #2760. Refs #2759. Updated
+  plugin admin actions to use the new system.  Added plugin dependency views in
+  admin. ElggPluginPackage->checkDependencies() now returns the detected value.
+   
+
+  	* engine/classes/ElggPluginManifestParser17.php: Refs #2759: Added
+  elgg_version to 1.7 manifest parser.  
+
+  	* mod/oauth_lib/start.php: Fixes #2764. Corrected plugin path for oauth
+  vendor libs.  
+
+2011-01-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.js, views/default/js/elgg.php: Fixes #2676 system messages fade
+  out again  
+
+  	* engine/lib/upgrades/2011010401.php, version.php: Fixes #2458 adds upgrade
+  to set default_access on old installs  
+
+2011-01-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../page/elements/content_header_member.php,
+  views/default/page/shells/admin.php: Refs #7221: Removed CRLFs.  
+
+  	* views/default/js/languages.php, views/default/js/languages/en.php: Refs
+  #2771: Removed CRLFs.  
+
+  	* engine/lib/filestore.php: Refs #2771: Removed CRLF.  
+
+  	* js/lib/ajax.js, js/lib/elgglib.js, js/lib/languages.js,
+  js/lib/security.js, js/lib/session.js, js/lib/ui.js, js/lib/ui.widgets.js,
+  js/tests/ElggAjaxOptionsTest.js, js/tests/ElggAjaxTest.js,
+  js/tests/ElggLanguagesTest.js, js/tests/ElggLibTest.js,
+  js/tests/ElggSecurityTest.js, js/tests/ElggSessionTest.js,
+  js/tests/jsTestDriver.conf: Refs #2771: Removing CRLFs from javascript files.
+   
+
+  	* engine/lib/plugins.php: Fixed problem removing plugin entities if physical
+  files were deleted.  
+
+2011-01-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/start.php: Refs #2732 added link to site pages but tab menu
+  still does not work  
+
+  	* mod/captcha/backgrounds/bg1.jpg, mod/captcha/backgrounds/bg2.jpg,
+  mod/captcha/backgrounds/bg3.jpg, mod/captcha/backgrounds/bg4.jpg,
+  mod/captcha/backgrounds/bg5.jpg, mod/captcha/captcha.php,
+  mod/captcha/fonts/1.ttf, mod/captcha/fonts/Liberation_serif_License.txt,
+  mod/captcha/languages/en.php, mod/captcha/manifest.xml,
+  mod/captcha/start.php, mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php, mod/crontrigger/manifest.xml,
+  mod/crontrigger/start.php: moving captcha and crontrigger plugins out of core
+   
+
+2011-01-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginPackage.php: Removed experimental duplicate code
+  from ElggPlugin.  
+
+  	* engine/classes/ElggPlugin.php: Added ElggPlugin::getPath().  
+
+  	* engine/lib/plugins.php: Reindexing plugin priorities after regenerating
+  entities.  
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginManifest.php,
+  engine/lib/plugins.php: Fixes #2763. Better normalizing for unused 1.7
+  manifest options.  Added logging when ElggPluginPackage can't be loaded.
+  Better disabling of deleted physical plugins.  
+
+  	* mod/oauth_lib/manifest.xml: Removing unsupported requires in 1.7 manifest
+  for oauth lib.  
+
+2011-01-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/examples/plugins/manifest.xml,
+  engine/classes/ElggPlugin.php, engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser18.php,
+  engine/classes/ElggPluginPackage.php, engine/lib/plugins.php,
+  engine/lib/upgrades/2011010101.php, engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_18/manifest.xml, languages/en.php,
+  version.php: Fixes #1986, #2170, #2225, #2759. Integrated ElggPluginPackage
+  and ElggPluginManifest with ElggPlugin. System now uses ElggPlugin objects to
+  determin plugins. Order is stored in private settings. This absolutely
+  requires running upgrade.php.  
+
+  	* engine/lib/elgglib.php: Refs #7552, #2547. Autoloading functions return
+  bool.  
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggExtender.php,
+  engine/classes/ElggRelationship.php, engine/classes/ElggWidget.php: Refs
+  #2490. Using array_key_exists() instead of isset() in get() overrides to
+  prevent a check for (invalid) metadata with the name of an attribute if that
+  attribute evaluates to !isset().  
+
+  	* engine/lib/private_settings.php: Added checking for real entities to other
+  private setting functions.  
+
+  	* engine/lib/private_settings.php: set_private_setting() checks if the guid
+  is a real entity.  
+
+  	* upgrade.php: Upgrade invalidates simplecache instead of regenerating it.  
+
+2011-01-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/save.php, mod/groups/languages/en.php,
+  mod/groups/views/default/groups/featured.php,
+  .../default/widgets/a_users_groups/content.php,
+  .../views/default/widgets/a_users_groups/edit.php: updated group widget  
+
+  	* engine/lib/admin.php, views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/plugins_advanced.php,
+  views/default/admin/plugins/plugins_simple.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/admin/site/site_advanced.php,
+  views/default/admin/site/site_basic.php: revert structure of admin views and
+  fixed uniqueness of admin page menu items  
+
+2011-01-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, mod/blog/views/default/blog/sidebar/archives.php,
+  mod/blog/views/default/blog/sidebar/revisions.php,
+  mod/blog/views/default/forms/blog/save.php,
+  mod/embed/views/default/object/file/embedlist.php,
+  mod/groups/views/default/forms/groups/search.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/members.php,
+  views/default/annotation/generic_comment.php,
+  views/default/core/likes/display.php, views/default/core/members/sidebar.php,
+  views/default/css/admin.php, views/default/css/elements/core.php,
+  views/default/css/elements/misc.php, views/default/output/tagcloud.php:
+  updating the sidebar boxes to use the new module classes  
+
+  	* engine/lib/languages.php, .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/personal.php,
+  views/default/core/dashboard/blurb.php,
+  .../core/settings/account/default_access.php,
+  views/default/core/settings/account/email.php,
+  views/default/core/settings/account/language.php,
+  .../core/settings/account/notifications.php,
+  views/default/core/settings/account/password.php,
+  .../core/settings/statistics/numentities.php,
+  views/default/core/settings/statistics/online.php,
+  views/default/core/settings/tools/plugin.php,
+  views/default/css/elements/forms.php, views/default/css/elements/misc.php,
+  views/default/css/screen.php: using the info module for user settings  
+
+  	* views/default/css/admin.php, views/default/css/elements/base.php,
+  views/default/css/elements/chrome.php, views/default/css/elements/core.php,
+  views/default/css/elements/icons.php, views/default/css/elements/layout.php,
+  views/default/css/elements/misc.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/skin.php, views/default/css/elements/spacing.php,
+  views/default/css/elements/typography.php, views/default/css/screen.php,
+  .../layout/shells/one_column_with_sidebar.php: Refs #2317 dividing css
+  element views into skin views and base views. The expectation is that the
+  base views would not be overridden in a theme so the admin css can depend on
+  them.  
+
+  	* mod/blog/views/default/object/blog.php,
+  views/default/css/elements/core.php, views/default/navigation/menu/site.php,
+  views/default/output/longtext.php: starting adding a .elgg-text class -
+  plugins need to use output/longtext when displaying text  
+
+  	* .../views/default/bookmarks/bookmarklet.php,
+  views/default/css/elements/core.php: added discoverable pattern to css  
+
+  	* mod/blog/views/default/widgets/blog/edit.php,
+  mod/file/actions/file/delete.php, mod/file/actions/file/download.php,
+  mod/file/actions/file/save.php, mod/file/actions/file/upload.php,
+  mod/file/classes/FilePluginFile.php, mod/file/edit.php, mod/file/friends.php,
+  mod/file/index.php, mod/file/languages/en.php, mod/file/lib/file.php,
+  mod/file/search.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/file/css.php,
+  mod/file/views/default/file/group_module.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/icon.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/file/upload.php,
+  mod/file/views/default/forms/file/upload.php,
+  .../views/default/widgets/filerepo/content.php,
+  mod/file/views/default/widgets/filerepo/edit.php, mod/file/world.php,
+  mod/groups/views/default/groups/css.php,
+  views/default/output/confirmlink.php: almost finished updating the file
+  plugin to work with new html/css  
+
+  	* engine/lib/elgglib.php: removed unnecessary variable from stick forms code
+   
+
+  	* engine/lib/views.php: fixed the function for viewing latest comments  
+
+  	* engine/lib/output.php: stop double encoding attributes in output/input
+  elements  
+
+  	* engine/lib/users.php, languages/en.php: Fixes #2740 - exception messages
+  using the value for minimum username and password length  
+
+  	* engine/lib/group.php: Fixes #2561 only triggering join, group event if the
+  add relationship succeeded  
+
+  	* engine/lib/metadata.php: Fixes #2698 not sanitizing strings to prevent
+  double encoding  
+
+2010-12-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #2684, #2754: Merged r7701 to trunk.  
+
+2010-12-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: not caching js and css when not served through
+  simple cache right now  
+
+2010-12-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Refs #2583, #2754: Merged r7445-7446 to
+  trunk.  
+
+2010-12-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* documentation/css/preview/grid.php: added borders to the css grid preview 
+
+2010-12-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php, engine/lib/views.php: Refs #2752, #2635. Merged
+  r7299 to trunk.  
+
+  	* engine/lib/metadata.php: Merged r7272 from 1.7 to trunk.  
+
+2010-12-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/lib/blog.php, mod/file/download.php, mod/file/index.php,
+  mod/file/start.php, mod/file/thumbnail.php, mod/file/upload.php,
+  mod/file/views/default/file/groupprofile_files.php: file index page now
+  working for both users and groups  
+
+  	* mod/file/download.php, mod/file/index.php, mod/file/search.php,
+  mod/file/thumbnail.php, mod/file/views/default/file/upload.php,
+  .../views/default/widgets/filerepo/content.php,
+  mod/file/views/rss/object/file.php: a little standardization of the file
+  plugin code  
+
+  	* mod/embed/views/default/embed/embed.php,
+  views/default/navigation/tabs.php: Fixes #2703 - added support for url ids in
+  navigation tabs  
+
+  	* mod/embed/views/default/embed/css.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  views/default/core/friends/collectiontabs.php, views/default/css/admin.php,
+  views/default/css/elements/navigation.php, views/default/css/ie.php,
+  views/default/navigation/tabs.php: switching to a better name for tabs in css
+   
+
+  	* views/default/css/admin.php, views/default/css/elements/heading.php,
+  views/default/css/screen.php: removed heading css elements view  
+
+  	* views/default/navigation/menu/site.php: site menu needs a clearfix  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/views.php,
+  mod/file/search.php, mod/file/views/default/file/css.php,
+  views/default/layout/objects/gallery.php: added a proper gallery view - still
+  need to wire up the elgg_view_list_item functions and remove the use of
+  context  
+
+  	* mod/blog/views/default/object/blog.php: updated blog plugin due to change
+  in output/confirmlink  
+
+2010-12-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/search.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/object/file.php, views/default/css/elements/core.php,
+  views/default/layout/objects/list.php,
+  views/default/layout/objects/list/metadata.php: added gallery css for the
+  file plugin  
+
+  	* documentation/css/preview/forms.php,
+  documentation/css/preview/general.php, documentation/css/preview/grid.php,
+  documentation/css/preview/head.php, documentation/css/preview/index.php,
+  documentation/css/preview/nav.php, documentation/css/preview/objects.php,
+  documentation/css/preview/widgets.php: major addition - adding preview of CSS
+  for developers and themers  
+
+  	* views/default/css/elements/skin.php: added some base css for 4 different
+  modules  
+
+  	* views/default/layout/objects/widget.php,
+  views/default/layout/objects/widget/controls.php: allow anyone to minimize a
+  widget  
+
+  	* views/default/widgets/friends/content.php: put a catch in for a bad owner
+  in the friends widget  
+
+  	* engine/lib/entities.php: adding ability to override access regardless of
+  whether the entity is saved in the database yet  
+
+  	* views/default/graphics/icon.php, views/default/output/confirmlink.php,
+  views/default/profile/hover.php: more html validation cleanup  
+
+  	* mod/tinymce/views/default/input/longtext.php: supporting an id in tinycme
+  longtext and not using the invalid language attribute  
+
+  	* views/default/input/autocomplete.php, views/default/input/checkboxes.php,
+  views/default/input/datepicker.php, views/default/input/userpicker.php: fixed
+  a few minor issues in input views for validation  
+
+  	* views/default/layout/objects/list/metadata.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/output/access.php: updated the default object entity view  
+
+  	* views/default/layout/objects/list/metadata.php: let likes code handle
+  whether the user is logged in or not  
+
+  	* views/default/input/autocomplete.php: fixes documentation and url of
+  endpoint  
+
+  	* mod/file/view.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/file/icon.php,
+  .../default/file/icon/application/default.php,
+  .../views/default/file/icon/application/excel.php,
+  .../views/default/file/icon/application/msword.php,
+  .../views/default/file/icon/application/pdf.php,
+  .../default/file/icon/application/powerpoint.php,
+  .../default/file/icon/application/vnd.ms-excel.php,
+  .../file/icon/application/vnd.ms-powerpoint.php,
+  .../application/vnd.oasis.opendocument.text.php,
+  .../views/default/file/icon/application/x-gzip.php,
+  .../file/icon/application/x-rar-compressed.php,
+  .../default/file/icon/application/x-stuffit.php,
+  .../views/default/file/icon/application/zip.php,
+  mod/file/views/default/file/icon/archive.php,
+  mod/file/views/default/file/icon/audio.php,
+  mod/file/views/default/file/icon/audio/default.php,
+  mod/file/views/default/file/icon/default.php,
+  mod/file/views/default/file/icon/document.php,
+  mod/file/views/default/file/icon/text/default.php,
+  .../views/default/file/icon/text/directory.php,
+  mod/file/views/default/file/icon/text/v-card.php,
+  mod/file/views/default/file/icon/video.php,
+  mod/file/views/default/file/icon/video/default.php,
+  .../default/file/specialcontent/audio/mid.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/x-wav.php,
+  .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/object/file.php: updated the object/file view  
+
+  	* actions/admin/user/resetpassword.php, actions/register.php,
+  actions/user/default_access.php, actions/useradd.php,
+  pages/account/register.php, pages/avatar/view.php,
+  views/default/admin/overview/statistics.php, views/default/profile/hover.php,
+  views/installation/input/button.php: Refs #2428 removed more CONFIG uses  
+
+  	* mod/groups/all.php, mod/groups/views/default/group/default.php: fixed new
+  groups listing  
+
+  	* engine/lib/views.php: required for river rss to work  
+
+  	* views/rss/canvas/default.php, views/rss/core/river/body.php,
+  views/rss/layout/objects/image_block.php, views/rss/output/url.php:
+  supporting river rss  
+
+  	* views/rss/entities/entity_list.php, views/rss/layout/objects/list.php,
+  views/rss/layout/shells/default.php: Fixes #2113 - updated rss view type to
+  use new view structure for lists  
+
+  	* engine/lib/plugins.php, views/default/admin/plugins/plugins_simple.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/admin/site/site_advanced.php,
+  views/default/admin/site/site_basic.php: fixed a few issues with the admin
+  backend - need to look into better ways to structure admin sub views  
+
+2010-12-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/categories/views/default/categories/css.php,
+  mod/embed/views/default/embed/css.php,
+  .../views/default/invitefriends/formitems.php,
+  .../views/default/messageboard/forms/add.php,
+  .../views/default/widgets/messageboard/content.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/messages.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  mod/tinymce/views/default/input/longtext.php,
+  .../uservalidationbyemail/unvalidated_user.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/plugins_advanced.php,
+  views/default/css/admin.php, views/default/css/elements/forms.php,
+  views/default/css/screen.php, views/default/input/access.php,
+  views/default/input/checkbox.php, views/default/input/checkboxes.php,
+  views/default/input/email.php, views/default/input/file.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/plaintext.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/page/shells/walled_garden.php,
+  views/installation/input/access.php, views/installation/input/checkboxes.php,
+  views/installation/input/longtext.php, views/installation/input/pulldown.php:
+  stage 1 in moving the forms markup to elgg- namespaced css - buttons still
+  need work  
+
+  	* mod/diagnostics/index.php, mod/diagnostics/start.php,
+  .../views/default/admin/utilities/diagnostics.php,
+  .../views/default/diagnostics/forms/download.php,
+  .../views/default/diagnostics/runalltests.php: updated the diagnostics plugin
+  to use the new admin backend  
+
+  	* engine/lib/admin.php, languages/en.php, mod/logbrowser/start.php,
+  mod/reportedcontent/start.php: added admin utilities menu item  
+
+  	* mod/diagnostics/index.php, mod/search/index.php,
+  mod/sitepages/sitepages_functions.php,
+  views/default/page/elements/content.php: Fixes #2241 - removed direct calls
+  to the content wrapper view and removed the view as it is been replaced by a
+  body view  
+
+  	* mod/blog/lib/blog.php: Refs #2077 added new blog post button to group blog
+  - can be used as module for remianing group tools  
+
+  	* mod/blog/lib/blog.php: Fixes #2169 - setting the blog edit page owner to
+  container  
+
+  	* mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/messages.php,
+  views/foaf/user/default.php: Refs #1553 - removed all hard coded profile urls
+  from core  
+
+  	* engine/lib/river.php, engine/lib/views.php: Fixes #2221 - rewrite of rover
+  functions has been completed with moving elgg_view_river_item() into the
+  views library. The ugly C&P functions were moved into the riverdashboard
+  plugin and new 1.7 style get/list functions were introduced  
+
+  	* actions/profile/edit.php, actions/profile/fields/add.php,
+  actions/profile/fields/delete.php, actions/profile/fields/reorder.php,
+  actions/profile/fields/reset.php, engine/lib/users.php,
+  mod/profile/views/default/profile/details.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/forms/profile/edit.php: Fixes #2751 profile custom fields uses
+  the config table now  
+
+  	* engine/lib/configuration.php: added a catch for configuration names longer
+  than 32 characters  
+
+  	* engine/lib/configuration.php: fixed bug where get_config was returning 0
+  because there is not not auto id on the config table  
+
+  	* mod/tabbed_profile/actions/addcomment.php,
+  mod/tabbed_profile/actions/deletecomment.php,
+  mod/tabbed_profile/graphics/defaultlarge.gif,
+  mod/tabbed_profile/graphics/defaultmaster.gif,
+  mod/tabbed_profile/graphics/defaultmedium.gif,
+  mod/tabbed_profile/graphics/defaultsmall.gif,
+  mod/tabbed_profile/graphics/defaulttiny.gif,
+  mod/tabbed_profile/graphics/defaulttopbar.gif,
+  mod/tabbed_profile/graphics/drag_handle.png,
+  mod/tabbed_profile/graphics/speech_bubble_tail.gif,
+  mod/tabbed_profile/graphics/twitter16px.png, mod/tabbed_profile/icon.php,
+  mod/tabbed_profile/icondirect.php, mod/tabbed_profile/languages/en.php,
+  mod/tabbed_profile/manifest.xml, mod/tabbed_profile/start.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  .../views/default/profile/content_wrapper.php,
+  mod/tabbed_profile/views/default/profile/css.php,
+  .../views/default/profile/listing.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  .../views/default/profile/menu/links.php,
+  .../views/default/profile/metatags.php,
+  .../views/default/profile/ownerblock.php,
+  .../views/default/profile/sidebar.php,
+  .../views/default/profile/tab_navigation.php,
+  .../views/default/profile/tabs/activity.php,
+  .../views/default/profile/tabs/commentwall.php,
+  .../views/default/profile/tabs/details.php,
+  .../views/default/profile/tabs/friends.php,
+  .../views/default/profile/tabs/groups.php,
+  .../views/default/profile/tabs/twitter.php: Fixes #2481 - moving
+  tabbed_profile plugin into the plugins repo from core - it needs some updates
+  to reflect changes to the core profile plugin  
+
+  	* mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  mod/riverdashboard/endpoint/get_comments.php,
+  mod/riverdashboard/endpoint/get_likes.php,
+  mod/riverdashboard/endpoint/ping.php,
+  mod/riverdashboard/graphics/follow_icon.png,
+  mod/riverdashboard/graphics/refresh.png, mod/riverdashboard/index.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/manifest.xml,
+  mod/riverdashboard/start.php, .../views/default/river/dashboard.php,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/ecml/activity.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/river/body.php,
+  .../views/default/riverdashboard/river/footer.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/json/riverdashboard/container.php,
+  .../views/rss/riverdashboard/container.php: Fixes #2226 moves riverdashboard
+  into secondary plugins from core plugins - most of riverdashboard
+  functionality is now in core (except for displaying who has liked stuff and
+  ajax refreshes)  
+
+  	* views/default/css/screen.php, views/default/forms/likes/display.php,
+  views/default/forms/likes/link.php: cleaned up left over views and css from
+  likes  
+
+  	* actions/likes/add.php, actions/likes/delete.php, engine/lib/elgglib.php,
+  js/lib/ui.js, languages/en.php, views/default/annotation/likes.php,
+  views/default/core/likes/display.php, views/default/core/river/controls.php,
+  views/default/css/screen.php, views/default/forms/likes/edit.php,
+  views/default/js/elgg.php: rewrote the display of likes  
+
+  	* engine/lib/annotations.php: updated documentation on new
+  elgg_annotation_exists() function  
+
+  	* mod/blog/views/default/object/blog.php: let likes code handle logged in
+  user status  
+
+  	* views/default/css/elements/navigation.php: forgot to remove commented css
+  statement  
+
+  	* views/default/css/elements/navigation.php,
+  views/default/page/elements/footer.php: styled the footer menu  
+
+  	* views/default/css/elements/core.php, views/default/css/elements/skin.php,
+  views/default/layout/elements/page_links.php,
+  views/default/layout/elements/sidebar.php: created a new layout element -
+  page links - holds stuff like the rss link  
+
+  	* mod/file/classes/FilePluginFile.php, mod/file/start.php: moved the file
+  class into a class file  
+
+  	* mod/blog/lib/blog.php, mod/blog/start.php: more clean up of the blog
+  plugin - removed unused functions and moved the url forwarder into library  
+
+  	* mod/defaultwidgets/start.php, mod/diagnostics/start.php,
+  mod/logbrowser/start.php, mod/messages/start.php,
+  mod/reportedcontent/start.php, mod/uservalidationbyemail/start.php: updating
+  plugins to use new page menu  
+
+  	* mod/file/view.php: forgot to add this file for the fie plugin  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/admin.php, engine/lib/navigation.php, engine/lib/users.php,
+  js/lib/ui.js, views/default/admin/overview.php,
+  views/default/admin/overview/statistics.php, views/default/css/admin.php,
+  views/default/css/elements/navigation.php,
+  views/default/layout/elements/sidebar.php,
+  views/default/navigation/menu/elements/group.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/navigation/menu/page.php: page menu using the new menu system -
+  admin menu updated  
+
+  	* mod/file/actions/delete.php, mod/file/actions/download.php,
+  mod/file/actions/file/delete.php, mod/file/actions/file/download.php,
+  mod/file/actions/file/save.php, mod/file/actions/file/upload.php,
+  mod/file/actions/save.php, mod/file/actions/upload.php, mod/file/edit.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/languages/en.php,
+  mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/object/file.php, mod/file/world.php: starting to
+  update the file plugin to use the new html/css  
+
+  	* mod/blog/languages/en.php, mod/blog/lib/blog.php, mod/blog/start.php,
+  mod/blog/views/default/blog/group_module.php,
+  views/default/layout/shells/content/header.php: new content link uses guid to
+  make supporting groups and users easier  
+
+  	* views/default/output/url.php: supporting anchors with a href in output/url
+   
+
+  	* views/default/layout/objects/list/metadata.php: added a general metadata
+  view for lists  
+
+2010-12-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Cleaned up register_translations().  
+
+2010-12-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Added elgg_register_viewtype().  
+
+2010-12-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: merged the admin profile edit fields language strings
+  into core  
+
+  	* engine/lib/plugins.php: fixing merge of plugin code [7727] - it blew away
+  the plugin class loading code  
+
+  	* languages/en.php, mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/details.php: moved profile fields language
+  strings into core and update profile plugin details view  
+
+  	* engine/lib/users.php, views/default/navigation/menu/user_admin.php:
+  removed early version of admin context menu and fixed missing edit profile
+  button  
+
+2010-12-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Refs #2635, #2643. Merged cache changes into
+  trunk.  
+
+2010-12-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/graphics/drag_handle.png,
+  mod/profile/graphics/twitter16px.png, mod/profile/languages/en.php,
+  mod/profile/start.php, mod/profile/views/default/profile/box.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/details.php,
+  mod/profile/views/default/profile/listing.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  mod/profile/views/default/profile/menu/links.php,
+  mod/profile/views/default/profile/owner_block.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  mod/profile/views/default/profile/sidebar.php,
+  mod/profile/views/default/profile/wrapper.php: more clean up of the basic
+  profile plugin - reorged views and removed a lot of cruft  
+
+2010-12-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Refs #2543: set_default_config() uses better
+  names. get_config() rewrites old names to new, but have to double up
+  assignments in $CONFIG for ppl not using get_config().  
+
+2010-12-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/users.php, engine/lib/views.php, mod/blog/start.php,
+  mod/bookmarks/start.php, mod/file/start.php, mod/logbrowser/start.php,
+  mod/messages/start.php, mod/pages/start.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  views/default/navigation/menu/user_hover.php: improved menu creation for on
+  demand menus and integrated hover menu items into profile owner block  
+
+  	* engine/classes/ElggUser.php, engine/lib/elgglib.php, engine/lib/users.php,
+  mod/logbrowser/start.php, mod/messages/start.php,
+  views/default/css/elements/navigation.php, views/default/js/elgg.php,
+  views/default/navigation/menu/user_hover.php,
+  views/default/profile/hover.php: moved most of the code for the user hover
+  menu into the new menu system  
+
+2010-12-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/icons/user/defaultlarge.gif,
+  _graphics/icons/user/defaultmaster.gif,
+  _graphics/icons/user/defaultmedium.gif,
+  _graphics/icons/user/defaultsmall.gif, _graphics/icons/user/defaulttiny.gif,
+  _graphics/icons/user/defaulttopbar.gif,
+  mod/profile/graphics/defaultlarge.gif,
+  mod/profile/graphics/defaultmaster.gif,
+  mod/profile/graphics/defaultmedium.gif,
+  mod/profile/graphics/defaultsmall.gif, mod/profile/graphics/defaulttiny.gif,
+  mod/profile/graphics/defaulttopbar.gif,
+  mod/profile/graphics/speech_bubble_tail.gif,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  views/default/icon/user/default/large.php,
+  views/default/icon/user/default/master.php,
+  views/default/icon/user/default/medium.php,
+  views/default/icon/user/default/small.php,
+  views/default/icon/user/default/tiny.php,
+  views/default/icon/user/default/topbar.php: moved default profile icons into
+  core  
+
+  	* mod/blog/start.php, mod/blog/views/default/blog/group_module.php,
+  mod/bookmarks/languages/en.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/groups/views/default/group/default.php, mod/pages/start.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/skin.php,
+  views/default/layout/elements/owner_block.php,
+  views/default/layout/elements/sidebar.php,
+  views/default/layout/objects/list/body.php,
+  views/default/navigation/menu/default.php, views/default/user/default.php:
+  updated owner blocks for users and groups  
+
+2010-12-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, mod/blog/views/default/object/blog.php,
+  views/default/layout/elements/comments.php: supporting id for comments for in
+  page links  
+
+  	* mod/blog/views/default/object/blog.php,
+  views/default/layout/objects/list/body.php: fixing a few display issues in
+  the object/blog view  
+
+  	* mod/blog/views/default/object/blog.php,
+  views/default/css/elements/core.php,
+  views/default/layout/objects/list/body.php: creating standard list body for
+  plugins  
+
+2010-12-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/profile/tabs/friends.php,
+  .../views/default/profile/tabs/groups.php: using new list methods in tabbed
+  profile plugin 
+
+  	* engine/classes/ElggUser.php: Added list groups and list friends class
+  methods - will be handy for federation 
+
+  	* engine/classes/ElggUser.php: added a class math to get a user's groups and
+  cleaned up some documentation 
+
+  	* engine/lib/users.php: Refs #2283 using entity_row_to_elggstar() when
+  loading user from username or code so that ElggUser can be subclassed 
+
+  	* views/default/layout/objects/list.php: Fixes #2730 - passing the vars
+  array into elgg_view_list_item so that eventually plugins can pass additional
+  parameters into list views 
+
+  	* engine/lib/elgglib.php: Fixes #2741 skipping :// when replacing // in file
+  paths so that we support URIs 
+
+  	* mod/tabbed_profile/manifest.xml: do not enable tabbed profile by default -
+  also need to set a conflict key in its manifest for the profile plugin 
+
+2010-12-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/defaultwidgets/editor.php,
+  .../views/default/embed/web_services/content.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../views/default/riverdashboard/css.php,
+  views/default/admin/components/plugin.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/core/friends/picker.php, views/default/css/admin.php,
+  views/default/css/elements/forms.php, views/default/css/screen.php,
+  views/default/input/button.php, views/installation/input/button.php: adding
+  elgg namespace to button css classes 
+
+2010-12-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: merged the fix to get access collection
+  documentation into trunk from 1.7 branch  
+
+2010-12-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php, pages/entities/index.php,
+  views/default/css/elements/skin.php, views/default/css/screen.php,
+  views/default/forms/likes/edit.php, views/default/output/confirmlink.php:
+  added elgg-icon-delete and elgg-icon-likes  
+
+  	* engine/lib/views.php, mod/groups/views/default/groups/grouplisting.php,
+  .../views/default/profile/listing.php,
+  .../views/default/profile/tabs/activity.php,
+  .../views/default/profile/tabs/friends.php,
+  .../views/default/profile/tabs/groups.php: added the core river to the tabbed
+  profile plugin and fixed some deprecated function warnings  
+
+2010-12-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/admin.php: fixed a bug I introduced in the admin css  
+
+  	* mod/profile/views/default/profile/box.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/details.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  mod/profile/views/default/profile/sidebar.php,
+  views/default/css/elements/skin.php: an almost done widget-based profile
+  plugin  
+
+  	* actions/widgets/save.php, engine/classes/ElggDiskFilestore.php,
+  js/lib/ui.js, js/lib/ui.widgets.js,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php, pages/dashboard.php,
+  views/default/css/screen.php, views/default/graphics/ajax_loader.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/objects/widget/settings.php,
+  views/default/layout/shells/widgets.php: fixed a few bugs and updated the
+  widget code  
+
+  	* js/lib/ui.widgets.js, views/default/css/screen.php,
+  views/default/layout/objects/widget.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/objects/widget/settings.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/layout/shells/widgets/add_panel.php: namespaced the widget code
+   
+
+  	* js/lib/ui.widgets.js, pages/dashboard.php,
+  views/default/core/dashboard/blurb.php, views/default/css/screen.php,
+  views/default/layout/shells/widgets.php: starting to use the grid in the
+  widget code  
+
+  	* engine/lib/river.php: fixed missed variable name change in river's use of
+  image block pattern  
+
+  	* mod/profile/views/default/profile/javascript.php,
+  .../views/default/profile/javascript.php: moved avatar drop down javascript
+  into core  
+
+  	* mod/file/views/default/file/css.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/icon.php, mod/profile/start.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/tabbed_profile/start.php,
+  mod/tabbed_profile/views/default/profile/css.php,
+  .../views/default/profile/javascript.php, views/default/css/screen.php,
+  views/default/js/elgg.php, views/default/profile/icon.php: using
+  elgg-user-icon instead of usericon and moving the css into core  
+
+  	* mod/blog/views/default/forms/blog/save.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/messages/views/default/messages/messages.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  .../views/default/object/reported_content.php,
+  mod/tabbed_profile/views/default/profile/css.php,
+  .../views/default/profile/ownerblock.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/css/admin.php, views/default/css/elements/forms.php,
+  views/default/css/elements/skin.php, views/default/css/screen.php,
+  views/default/forms/profile/fields/reset.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/page/elements/content_header.php: replacing action-button with
+  elgg-action-button  
+
+  	* views/default/css/elements/skin.php,
+  views/default/layout/shells/content/header.php: using more generic markup for
+  main header  
+
+  	* mod/search/views/default/search/css.php,
+  mod/search/views/default/search/search_box.php: updated search box css  
+
+  	* .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/footer_link.php, mod/sitepages/start.php,
+  .../views/default/sitepages/footer_menu.php,
+  views/default/css/elements/skin.php, views/default/page/elements/footer.php:
+  cleaning up the page footer - still need to add css for footer menu  
+
+  	* views/default/css/elements/skin.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/page/elements/topbar.php: refining the elgg-alt pattern  
+
+  	* views/default/css/admin.php, views/default/css/elements/core.php,
+  views/default/css/elements/layout.php, views/default/css/screen.php,
+  views/default/layout/objects/image_block.php: completed the media to image
+  block switch  
+
+  	* engine/lib/river.php, engine/lib/views.php,
+  mod/blog/views/default/object/blog.php, mod/riverdashboard/start.php,
+  views/default/annotation/generic_comment.php,
+  views/default/css/elements/layout.php,
+  views/default/layout/objects/image_block.php,
+  views/default/layout/objects/media.php: changed name from media block to
+  image block  
+
+  	* views/default/css/admin.php,
+  views/default/layout/shells/administration.php,
+  views/default/page/shells/admin.php: started cleaning up the admin css  
+
+  	* engine/lib/admin.php, engine/lib/views.php, engine/start.php: added a
+  ready,system event so that plugins can do things after the init has finished
+  but before pages are created  
+
+  	* views/default/navigation/menu/user_admin.php,
+  views/default/profile/hover.php, views/default/profile/icon.php: cleaned up
+  profile hover menu  
+
+  	* engine/lib/users.php, mod/logbrowser/start.php,
+  .../views/default/logbrowser/adminlinks.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  .../views/default/profile/admin_menu.php,
+  .../views/default/profile/hoverover.php,
+  mod/tabbed_profile/views/default/profile/icon.php,
+  .../views/default/profile/ownerblock.php,
+  views/default/navigation/menu/user_admin.php, views/default/profile/icon.php:
+  added a user admin menu that plugins can add menu items to  
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/pages/start.php, mod/profile/views/default/profile/ownerblock.php: pulled
+  user owner block menu out of profile plugin with new menu code  
+
+  	* mod/profile/actions/addcomment.php, mod/profile/actions/deletecomment.php,
+  mod/profile/start.php, mod/profile/views/default/profile/box.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  .../views/default/profile/content_wrapper.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/details.php,
+  .../views/default/profile/tab_navigation.php,
+  .../views/default/profile/tabs/activity.php,
+  .../views/default/profile/tabs/commentwall.php,
+  mod/profile/views/default/profile/tabs/details.php,
+  mod/profile/views/default/profile/tabs/friends.php,
+  mod/profile/views/default/profile/tabs/groups.php,
+  mod/profile/views/default/profile/tabs/twitter.php,
+  mod/tabbed_profile/actions/addcomment.php,
+  mod/tabbed_profile/actions/deletecomment.php,
+  mod/tabbed_profile/graphics/defaultlarge.gif,
+  mod/tabbed_profile/graphics/defaultmaster.gif,
+  mod/tabbed_profile/graphics/defaultmedium.gif,
+  mod/tabbed_profile/graphics/defaultsmall.gif,
+  mod/tabbed_profile/graphics/defaulttiny.gif,
+  mod/tabbed_profile/graphics/defaulttopbar.gif,
+  mod/tabbed_profile/graphics/drag_handle.png,
+  mod/tabbed_profile/graphics/speech_bubble_tail.gif,
+  mod/tabbed_profile/graphics/twitter16px.png, mod/tabbed_profile/icon.php,
+  mod/tabbed_profile/icondirect.php, mod/tabbed_profile/languages/en.php,
+  mod/tabbed_profile/manifest.xml, mod/tabbed_profile/start.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  .../views/default/profile/admin_menu.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  .../views/default/profile/content_wrapper.php,
+  mod/tabbed_profile/views/default/profile/css.php,
+  .../views/default/profile/hoverover.php,
+  mod/tabbed_profile/views/default/profile/icon.php,
+  .../views/default/profile/javascript.php,
+  .../views/default/profile/listing.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  .../views/default/profile/menu/links.php,
+  .../views/default/profile/metatags.php,
+  .../views/default/profile/ownerblock.php,
+  .../views/default/profile/sidebar.php,
+  .../views/default/profile/tab_navigation.php,
+  .../views/default/profile/tabs/activity.php,
+  .../views/default/profile/tabs/commentwall.php,
+  .../views/default/profile/tabs/details.php,
+  .../views/default/profile/tabs/friends.php,
+  .../views/default/profile/tabs/groups.php,
+  .../views/default/profile/tabs/twitter.php: rough widget profile plugin  
+
+  	* mod/profile/javascript.php, mod/profile/start.php,
+  .../views/default/profile/content_wrapper.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/ownerblock.php,
+  .../views/default/profile/profile_content.php,
+  .../default/profile/profile_contents/activity.php,
+  .../profile/profile_contents/commentwall.php,
+  .../default/profile/profile_contents/details.php,
+  .../default/profile/profile_contents/friends.php,
+  .../default/profile/profile_contents/groups.php,
+  .../default/profile/profile_contents/twitter.php,
+  .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php,
+  mod/profile/views/default/profile/sidebar.php,
+  .../views/default/profile/tab_navigation.php,
+  .../views/default/profile/tabs/activity.php,
+  .../views/default/profile/tabs/commentwall.php,
+  mod/profile/views/default/profile/tabs/details.php,
+  mod/profile/views/default/profile/tabs/friends.php,
+  mod/profile/views/default/profile/tabs/groups.php,
+  mod/profile/views/default/profile/tabs/twitter.php: more profile clean up  
+
+  	* mod/profile/edit.php, mod/profile/index.php, mod/profile/profile_lib.php,
+  mod/profile/start.php: more cleanup of the profile plugin from the
+  reorganization  
+
+2010-12-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/profile/fields/add.php, actions/profile/fields/delete.php,
+  actions/profile/fields/reorder.php, actions/profile/fields/reset.php,
+  engine/lib/admin.php, mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/editdefault.php, mod/profile/actions/editfield.php,
+  mod/profile/actions/reorder.php, mod/profile/actions/resetdefaultprofile.php,
+  mod/profile/start.php, mod/profile/vendor/jquery.jeditable.mini.js,
+  .../default/admin/appearance/defaultprofile.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../default/profile/editdefaultprofileitems.php,
+  vendors/jquery/jquery.jeditable.mini.js,
+  views/default/admin/appearance/profile_fields.php,
+  .../admin/appearance/profile_fields/list.php,
+  views/default/forms/profile/fields/add.php,
+  views/default/forms/profile/fields/reset.php: continuing to slash and burn
+  the profile plugin - moving the admin profile fields into core - last major
+  change  
+
+  	* actions/profile/edit.php, engine/lib/users.php, languages/en.php,
+  mod/profile/actions/edit.php, mod/profile/start.php, pages/avatar/edit.php,
+  pages/profile/edit.php, views/default/forms/profile/edit.php: moved profile
+  edit form into core  
+
+  	* engine/lib/users.php, languages/en.php, mod/profile/editicon.php,
+  .../views/default/js/jquery.imgareaselect-0.8.js,
+  .../default/js/jquery.imgareaselect-0.8.min.js,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/editicon.php,
+  .../views/default/profile/profile_ownerblock.php, pages/avatar/edit.php,
+  pages/avatar/view.php, vendors/jquery/jquery.imgareaselect-0.8.min.js,
+  views/default/core/avatar/crop.php, views/default/core/avatar/upload.php,
+  views/default/css/screen.php, views/default/forms/avatar/crop.php,
+  views/default/forms/avatar/upload.php: pulling the avatar code out of the
+  profile plugin - just some minor icon related code left  
+
+  	* actions/avatar/crop.php, actions/avatar/upload.php, engine/lib/users.php,
+  languages/en.php, mod/groups/start.php, mod/profile/actions/cropicon.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/views/default/profile/editicon.php,
+  views/default/forms/avatar/crop.php, views/default/forms/avatar/upload.php:
+  moved the avatar forms and actions into core from profile plugin  
+
+  	* engine/classes/ElggMenuItem.php, engine/lib/users.php,
+  engine/lib/usersettings.php, mod/invitefriends/index.php,
+  mod/invitefriends/start.php, .../views/default/invitefriends/formitems.php,
+  mod/notifications/groups.php, mod/notifications/index.php,
+  mod/notifications/start.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/groupsform.php,
+  views/default/css/elements/navigation.php,
+  views/default/layout/elements/sidebar.php,
+  views/default/navigation/menu/default.php: half way through converting
+  submenu to new menu code - pages and groups are the two major users left  
+
+  	* actions/admin/menu/save.php, actions/admin/menu_items.php,
+  engine/classes/ElggMenuItem.php, engine/lib/admin.php,
+  engine/lib/navigation.php, engine/lib/river.php, engine/lib/users.php,
+  mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/groups/start.php, mod/pages/start.php, mod/riverdashboard/start.php,
+  mod/thewire/start.php, views/default/admin/appearance/menu_items.php,
+  views/default/navigation/menu/elements/item.php,
+  views/default/navigation/menu/site.php,
+  views/default/navigation/site_nav.php,
+  views/default/page/elements/header.php: site nav menu now uses new menu code
+  (and finished the implementation of custom menu items while I was at it - not
+  backward compatible with the previous half finished version)  
+
+2010-12-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* pages/account/forgotten_password.php, pages/account/register.php,
+  pages/entities/list.php, pages/friends/index.php, pages/friends/of.php,
+  pages/settings/statistics.php: updated some of the core pages based on new
+  CSS and layouts 
+
+  	* mod/notifications/start.php: fixed another underline to dash conversion
+  issue 
+
+  	* engine/lib/upgrades/2010121702.php, languages/en.php, version.php,
+  views/default/annotation/annotatelike.php,
+  views/default/river/annotation/likes/create.php: last of the river updates I
+  hope - fixes the likes river view 
+
+  	* engine/lib/notification.php, engine/lib/statistics.php,
+  engine/lib/users.php, engine/lib/usersettings.php,
+  mod/notifications/start.php, pages/settings/account.php,
+  pages/settings/index.php, pages/settings/plugins.php,
+  pages/settings/statistics.php, pages/settings/tools.php,
+  pages/settings/user.php, views/default/core/settings/account.php,
+  .../core/settings/account/default_access.php,
+  views/default/core/settings/account/email.php,
+  views/default/core/settings/account/language.php,
+  views/default/core/settings/account/name.php,
+  .../core/settings/account/notifications.php,
+  views/default/core/settings/account/password.php,
+  views/default/core/settings/statistics.php,
+  .../core/settings/statistics/numentities.php,
+  views/default/core/settings/statistics/online.php,
+  views/default/core/settings/tools.php,
+  views/default/core/settings/tools/plugin.php,
+  views/default/forms/account/settings.php,
+  views/default/page/elements/topbar.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php, views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/notifications.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/usersettings/user.php: reorganized the settings views and
+  updated the pages to use new layout 
+
+  	* .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php: removed old river code from
+  the profile plugin - profile updates no longer go to the river 
+
+  	* engine/lib/upgrades/2010121701.php, mod/groups/languages/en.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  .../river/object/groupforumtopic/annotate.php,
+  .../river/object/groupforumtopic/create.php,
+  .../river/object/groupforumtopic/update.php,
+  .../default/river/relationship/member/create.php, version.php: updated group
+  member and group forum topics to new river 
+
+  	* mod/pages/actions/pages/edit.php,
+  .../views/default/river/object/page/update.php,
+  .../views/default/river/object/page_top/update.php: removed pages update
+  river code 
+
+  	* mod/pages/languages/en.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/page_top/create.php,
+  mod/thewire/languages/en.php,
+  .../views/default/river/object/thewire/create.php: added pages and thewire
+  river entries  
+
+  	* languages/en.php, .../views/default/river/object/blog/create.php,
+  .../default/river/object/bookmarks/create.php, mod/file/languages/en.php,
+  .../views/default/river/object/file/create.php, mod/groups/languages/en.php,
+  mod/groups/views/default/river/group/create.php: supporting putting content
+  in groups in for river views and added file river code  
+
+  	* .../views/default/river/object/blog/create.php,
+  mod/bookmarks/languages/en.php,
+  .../default/river/object/bookmarks/create.php, views/default/css/screen.php,
+  .../river/annotation/generic_comment/create.php,
+  views/default/river/relationship/friend/create.php: updated river views for
+  content display and added new bookmarks river view code  
+
+  	* mod/bookmarks/start.php: bookmarks plugin needs to be rewritten - hacked
+  it to get the add functionality working  
+
+  	* engine/classes/ElggMenuBuilder.php, engine/classes/ElggMenuItem.php,
+  engine/lib/navigation.php, engine/lib/views.php: Refs #2320 added new menu
+  functions and classes  
+
+  	* mod/riverdashboard/start.php, .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/river/footer.php: fixed remaining javascript
+  for riverdashboard - it's ready to be moved out to plugins  
+
+  	* .../views/default/riverdashboard/css.php: fixed comment form toggle in
+  riverdashboard plugin  
+
+  	* mod/riverdashboard/index.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/river/body.php,
+  .../views/default/riverdashboard/river/footer.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  views/default/forms/likes/display.php: updated riverdashboard plugin to use
+  new river display code - javascript code currently broken for comments and
+  likes  
+
+  	* .../views/default/river/object/blog/create.php,
+  mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  mod/riverdashboard/start.php, .../views/default/river/item/list.php: updated
+  riverdashboard to load the river item class  
+
+  	* actions/comments/add.php, engine/lib/upgrades/2010121602.php,
+  mod/blog/languages/en.php, mod/file/languages/en.php,
+  mod/pages/languages/en.php, .../views/default/river/object/page/annotate.php,
+  .../default/river/object/page_top/annotate.php, version.php,
+  views/default/annotation/annotate.php,
+  .../river/annotation/generic_comment/create.php: updated the river
+  generic_comment view for the new river code  
+
+  	* _graphics/elgg_sprites.png, engine/lib/upgrades/2010121601.php,
+  languages/en.php, .../default/river/relationship/friend/create.php,
+  version.php, views/default/core/river/controls.php,
+  views/default/css/elements/skin.php, views/default/css/screen.php,
+  views/default/friends/river/create.php, views/default/river/item/list.php,
+  views/default/river/item/wrapper.php,
+  views/default/river/relationship/friend/create.php: updated the river friend
+  view for the new river code  
+
+2010-12-16  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/upload_js.php: Fixes #2313, #1106 removed the last of the
+  aborted multiple file uploading code 
+
+  	* engine/lib/elgglib.php, js/lib/languages.js: Fixes #2725 - js page handler
+  now handles javascript views with slashes in their names 
+
+  	* engine/lib/elgglib.php: fixed a lot of notices being generated by the new
+  plugin hook code 
+
+  	* pages/members/search.php: replaced deprecated function in members search
+  page 
+
+  	* views/default/css/elements/skin.php,
+  views/default/layout/shells/one_column.php,
+  views/default/layout/shells/one_sidebar.php,
+  views/default/layout/shells/two_sidebar.php: adjusted page body css to use
+  top level class to determine width and centering  
+
+  	* pages/members/search.php, views/default/layout/shells/one_sidebar.php:
+  added title parameter to one_sidebar layout  
+
+  	* pages/members/search.php, views/default/layout/shells/content.php,
+  views/default/layout/shells/one_sidebar.php: layout views should use
+  'content' to support alternate viewtypes (like rss) - updated the one_sidebar
+  view  
+
+  	* engine/lib/users.php, languages/en.php, mod/friends/languages/en.php,
+  mod/friends/manifest.xml, mod/friends/start.php,
+  .../views/default/widgets/friends/content.php,
+  mod/friends/views/default/widgets/friends/edit.php,
+  views/default/widgets/friends/content.php,
+  views/default/widgets/friends/edit.php: moved friends widget into core  
+
+2010-12-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/widget.php,
+  views/default/layout/objects/widget/controls.php,
+  views/default/layout/objects/widget/settings.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout/shells/widgets/add_button.php,
+  views/default/layout/shells/widgets/add_panel.php,
+  views/default/object/widget.php, views/default/widgets/add_button.php,
+  views/default/widgets/add_panel.php, views/default/widgets/controls.php,
+  views/default/widgets/settings.php, views/default/widgets/wrapper.php: moved
+  widget into layout/objects as one of our core css objects 
+
+  	* engine/classes/ElggPluginManifestParser17.php: Fixes #2728 creating a name
+  for plugins with 1.7 manifests based on hellekin's patch 
+
+  	* views/default/admin/plugins/advanced.php: checking if categories are set
+  before looping (hellekin) 
+
+  	* engine/lib/statistics.php, mod/diagnostics/start.php,
+  mod/groups/start.php: updated to removing more deprecation warnings (from
+  hellekin) 
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/friends/start.php, mod/groups/start.php, mod/messageboard/start.php,
+  mod/pages/start.php, mod/tagcloud/start.php, mod/thewire/start.php,
+  mod/twitter/start.php: replacing calls to add_widget_type() with
+  elgg_register_widget_type() (from hellekin) 
+
+  	* install/ElggRewriteTester.php: Ignore SSL certificate errors when testing
+  URL rewriting during installation (from hellekin) 
+
+  	* engine/lib/access.php, engine/lib/users.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  pages/friends/pickercallback.php, views/default/core/friends/collection.php,
+  views/default/core/friends/collections.php,
+  views/default/core/friends/collectiontabs.php,
+  views/default/core/friends/picker.php,
+  views/default/core/friends/tablelist.php,
+  .../default/core/friends/tablelistcountupdate.php,
+  views/default/forms/friends/edit.php, views/default/friends/collection.php,
+  views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php, views/default/friends/picker.php,
+  views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php: moving friends views into
+  core  
+
+  	* pages/friends/add.php, pages/friends/edit.php,
+  pages/friends/pickercallback.php,
+  views/default/forms/friends/collectionfields.php,
+  views/default/forms/friends/edit.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php: moved friend forms into forms directory
+   
+
+  	* engine/lib/elgglib.php, .../default/river/object/bookmarks/create.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/river/object/thewire/create.php,
+  views/default/annotation/annotate.php, views/default/core/river/controls.php,
+  views/default/forms/likes/display.php, views/default/forms/likes/edit.php,
+  views/default/forms/likes/link.php, views/default/likes/forms/display.php,
+  views/default/likes/forms/edit.php, views/default/likes/forms/link.php: moved
+  likes forms into forms directory  
+
+  	* mod/notifications/index.php: added friends picker js to notifications
+  plugin - is there a reason it isn't using the friends picker view?  
+
+  	* engine/lib/notification.php, mod/notifications/start.php,
+  .../notifications/settings/usersettings.php,
+  views/default/usersettings/notifications.php: moved default notification
+  settings into usersettings  
+
+  	* views/default/js/initialise_elgg.php,
+  views/default/js/initialize_elgg.php,
+  views/default/page/elements/html_begin.php,
+  views/default/scripts/initialize_elgg.php: last step in conversion to elgg.js
+   
+
+  	* engine/lib/views.php, mod/embed/start.php, mod/profile/start.php,
+  views/default/js/elgg.php, views/default/js/initialise_elgg.php: 1st step in
+  changing initialise_elgg.js to elgg.js  
+
+  	* views/default/upload/upload_form_content.php: upload form content view not
+  used anywhere  
+
+  	* views/default/settings/system.php: site settings were moved to admin views
+   
+
+  	* pages/account/forgotten_password.php, pages/account/register.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php, views/default/admin/users/add.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/forms/login.php, views/default/forms/register.php,
+  views/default/forms/user/requestnewpassword.php,
+  views/default/forms/useradd.php: moved account forms into forms directory  
+
+2010-12-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/users.php, index.php,
+  mod/sitepages/start.php, views/default/account/login_box.php,
+  views/default/account/login_dropdown.php,
+  views/default/account/login_walled_garden.php,
+  views/default/core/account/login_box.php,
+  views/default/core/account/login_dropdown.php,
+  views/default/core/account/login_walled_garden.php,
+  views/default/page/elements/header.php: moved account views into core views -
+  account forms are next  
+
+  	* views/default/css/elements/core.php,
+  views/default/css/elements/layout.php,
+  views/default/css/elements/page_layout.php,
+  views/default/css/elements/skin.php,
+  views/default/css/elements/typography.php, views/default/css/screen.php:
+  moving more css into the skin view - including page layout information 
+
+  	* upgrade.php, views/default/page/shells/upgrade.php,
+  views/default/settings/upgrading.php: Refs #2733 added explanation on the
+  security of the upgrade script 
+
+  	* engine/lib/users.php: Fixes #2103 adding a site nav entry for members  
+
+  	* mod/members/index.php, mod/members/languages/en.php,
+  mod/members/manifest.xml, mod/members/start.php,
+  mod/members/views/default/members/css.php,
+  .../views/default/members/members_navigation.php,
+  mod/members/views/default/members/search.php: Refs #2723 removing old members
+  plugin  
+
+  	* engine/lib/upgrades/2010121401.php, engine/lib/users.php,
+  languages/en.php, pages/members/index.php, pages/members/search.php,
+  version.php, views/default/core/members/nav.php,
+  views/default/core/members/sidebar.php,
+  views/default/forms/members/name_search.php,
+  views/default/forms/members/tag_search.php: Fixes #2723 members listing pages
+  now in core  
+
+2010-12-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: sanitise_filepath() removes double /s.  
+
+  	* engine/classes/ElggPluginPackage.php: Cleaned up constructor logic for
+  ElggPluginPackage.  Better detection of invalid paths.  
+
+2010-12-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: front page code does not depend on riverdashboard plugin
+  anymore 
+
+  	* .../views/default/river/object/blog/create.php: Refs #2226 need a catch in
+  river views until riverdashboard plugin is updated  
+
+  	* mod/blog/languages/en.php, .../views/default/river/object/blog/create.php:
+  Refs #2226 updated blog plugin to use new river view  
+
+  	* engine/classes/ElggRiverItem.php, engine/lib/annotations.php,
+  engine/lib/river.php, engine/lib/views.php, languages/en.php,
+  mod/riverdashboard/index.php, mod/riverdashboard/start.php,
+  .../views/default/river/item/list.php, pages/river.php,
+  views/default/core/river/body.php, views/default/core/river/controls.php,
+  views/default/core/river/filter.php, views/default/core/river/footer.php,
+  views/default/core/river/image.php, views/default/css/screen.php,
+  views/default/forms/comments/inline.php: Refs #2226 moving riverdashboard
+  into core - need to clean up riverdashboard plugin and move to plugins
+  repository and update plugins with new river views  
+
+2010-12-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/core/dashboard/blurb.php, views/default/dashboard/blurb.php:
+  adding a place to put views for core pages  
+
+  	* js/lib/ui.js: added toggler function  
+
+  	* views/default/page/shells/admin.php,
+  views/default/page/shells/default.php: removed unnecessary title code in page
+  shells  
+
+  	* pages/dashboard/latest.php: removed unused dashboard directory  
+
+  	* engine/lib/users.php, pages/dashboard.php, pages/dashboard/index.php:
+  moved dashboard handler into base pages directory  
+
+  	* views/default/layout/objects/media.php: fixed typo  
+
+2010-12-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/layout/objects/media.php: added alternate picture block to css
+  media object  
+
+  	* views/default/layout/shells/content.php,
+  views/default/layout/shells/one_column.php,
+  views/default/layout/shells/one_sidebar.php,
+  views/default/layout/shells/two_sidebar.php: supporting an additional class
+  on primary layouts  
+
+  	* views/default/layout/objects/list.php: added better list id's based on
+  type  
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/layout/objects/module.php, views/default/output/tagcloud.php:
+  updated module markup and fixed a bug with its footer code  
+
+  	* engine/lib/entities.php: fixed spelling error in documentation  
+
+  	* engine/lib/tags.php: updated tags library to use new sql functions  
+
+  	* engine/lib/relationships.php: provided more flexibility in creating the
+  relationships join sql  
+
+  	* views/default/page/elements/topbar.php: fixed copy and paste error in the
+  topbar view  
+
+2010-12-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/lib/blog.php, views/default/layout/shells/content/filter.php:
+  using all rather than everyone to be more consistent  
+
+  	* views/default/css/elements/core.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/reset.php, views/default/css/elements/skin.php,
+  views/default/css/screen.php: Refs #2317 starting create a css skin sub view 
+
+  	* engine/lib/views.php, views/default/css/elements/page_layout.php,
+  views/default/layout/objects/media.php: changed name of icon block to picture
+  block in media object to avoid conflicts with elgg sprites  
+
+  	* mod/search/views/default/search/css.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php, views/default/css/screen.php,
+  views/default/navigation/site_nav.php: a few more adjustments to the page
+  header  
+
+  	* views/default/css/elements/navigation.php,
+  views/default/navigation/site_nav.php: finished clean up the header css
+  (except for search box in search plugin  
+
+  	* _graphics/elgg_toolbar_logo.gif, mod/search/views/default/search/css.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php,
+  views/default/navigation/site_nav.php,
+  views/default/page/elements/header_logo.php: stage 1 of cleaning up page
+  header css  
+
+  	* views/default/css/elements/page_layout.php, views/default/css/screen.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/elements/topbar_logout.php: completed the topbar
+  modifications  
+
+2010-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/css.php: Fixes #2724 fixed typo in
+  riverdashboard CSS 
+
+  	* views/default/input/userpicker.php: Fixes #2726 applied zcho's patch to
+  fix more errors from the "_" to "-" CSS conversion 
+
+2010-12-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #1411: Can specify custom row callbacks with
+  'row_callback' options in elgg_get_entities().  
+
+2010-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php, .../views/default/profile/topbar_extend.php: topbar
+  friends should be in core, not profile plugin 
+
+  	* mod/embed/views/default/embed/js.php,
+  views/default/settings/upgrading.php: Fixes #2717 - fixing more errors
+  introduced by my over aggressive renaming script - thanks to zcho and
+  hellekin 
+
+  	* engine/classes/ElggSite.php: Fixes #2721 fixed typo - thanks for the
+  report! 
+
+2010-12-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Refs #1411: Documentation fix.  
+
+  	* engine/lib/annotations.php: Refs #1411. Added ability to specify
+  annotation time_created lower and upper.  Deprecated remaining
+  get/list_entities_from/by_annotation*() functions.  
+
+2010-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/page_layout.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/elements/topbar_logout.php: cleaning up the topbar CSS  
+
+2010-12-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/tests/api/entity_getter_functions.php:
+  Refs #1411. Added elgg_get_entities_from_annotation_calculation(). Deprecated
+  get_entities_from_annotations_count() and
+  get_entities_from_annotation_calculate_x(). 
+  elgg_get_entities_from_annotations() now runs through egef_metadata() for
+  backward compatibility support.  
+
+2010-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layout/objects/list.php: added ability to include pagination
+  before and after a list  
+
+  	* engine/lib/views.php, views/default/layout/objects/list.php,
+  views/default/navigation/pagination.php: fixed pagination for annotations due
+  to changes in views  
+
+2010-12-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: DRY'd up elgg_get_entities() where clause helper
+  functions.  Added ability to specify guids in elgg_get_entity*() functions.  
+
+2010-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/elements/core.php,
+  views/default/css/elements/navigation.php,
+  views/default/css/elements/page_layout.php, views/default/css/screen.php:
+  Refs #2317 pulled more css out into sub views  
+
+  	* views/default/css/screen.php, views/default/navigation/pagination.php:
+  Updated pagination to use semantic html  
+
+2010-12-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added ability to check for empty string in
+  elgg_get_array_value().  
+
+  	* engine/lib/entities.php: Fixed a bug that wouldn't let you specify
+  multiple selects in get_entities().  
+
+  	* engine/lib/relationships.php: Refs #1411. Deprecated
+  get_entities_by_relationship_count() and
+  list_entities_by_relationship_count().  
+
+  	* engine/tests/api/entity_getter_functions.php: Removed the silly things I
+  was doing in the egef_relationship_count() test.  
+
+2010-12-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/ajax/loader.php, views/default/graphics/ajax_loader.php:
+  moved ajax loader into the graphics view directory  
+
+  	* views/default/css/components/OOCSS_LICENSE,
+  views/default/css/components/forms.php,
+  views/default/css/components/grid.php,
+  views/default/css/components/heading.php,
+  views/default/css/components/reset.php,
+  views/default/css/components/spacing.php,
+  views/default/css/components/typography.php,
+  views/default/css/elements/OOCSS_LICENSE,
+  views/default/css/elements/forms.php, views/default/css/elements/grid.php,
+  views/default/css/elements/heading.php, views/default/css/elements/reset.php,
+  views/default/css/elements/spacing.php,
+  views/default/css/elements/typography.php, views/default/css/screen.php:
+  changed css/components to css/elements  
+
+  	* views/default/css/screen.php, views/default/page/elements/footer.php,
+  views/default/page/elements/header.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/shells/default.php: using the generic .elgg-inner class on
+  topbar, header, and footer  
+
+2010-12-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/entity_getter_functions.php: D'oh. Re-enabled the other
+  getter unit tests.  
+
+  	* engine/lib/relationships.php,
+  engine/tests/api/entity_getter_functions.php: Refs #1411: Added
+  elgg_get_entity_from_relationship_count().  
+
+2010-12-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/comments/latest.php: comment views have been moved  
+
+  	* engine/lib/views.php, mod/blog/views/default/blog/sidebar_menu.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/list.php, views/default/comments/list.php,
+  views/default/layout/elements/comments.php,
+  views/default/layout/objects/list.php: Fixes #2189 created the object/list
+  view with semantic markup  
+
+  	* engine/lib/elgglib.php, engine/lib/views.php, mod/blog/lib/blog.php,
+  mod/bookmarks/bookmarklet.php, mod/bookmarks/start.php,
+  mod/diagnostics/index.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/search.php, mod/file/world.php, mod/groups/all.php,
+  mod/groups/index.php, mod/groups/membership.php, mod/members/index.php,
+  mod/search/index.php, mod/sitepages/sitepages_functions.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/page/elements/body.php,
+  views/default/page/elements/content.php,
+  views/default/page/elements/content_header.php,
+  .../page/elements/content_header_member.php,
+  views/default/page/elements/footer.php,
+  views/default/page/elements/header.php,
+  views/default/page/elements/header_logo.php,
+  views/default/page/elements/html_begin.php,
+  views/default/page/elements/html_end.php,
+  views/default/page/elements/messages.php,
+  views/default/page/elements/topbar.php,
+  views/default/page/elements/topbar_logout.php,
+  views/default/page/shells/admin.php, views/default/page/shells/default.php,
+  views/default/page/shells/walled_garden.php,
+  views/default/page_elements/body.php,
+  views/default/page_elements/content.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_logo.php,
+  views/default/page_elements/html_begin.php,
+  views/default/page_elements/html_end.php,
+  views/default/page_elements/messages.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_elements/topbar_logout.php,
+  views/default/page_shells/admin.php, views/default/page_shells/default.php,
+  views/default/page_shells/walled_garden.php,
+  views/failsafe/page/shells/default.php,
+  views/failsafe/page_shells/default.php, views/foaf/page/shells/default.php,
+  views/foaf/page_elements/contentwrapper.php,
+  views/foaf/page_shells/default.php, views/ical/page/shells/default.php,
+  views/ical/pageshells/pageshell.php,
+  views/installation/page/shells/default.php,
+  views/installation/page_shells/default.php,
+  views/json/page/shells/default.php,
+  views/json/page_elements/contentwrapper.php,
+  views/json/page_shells/default.php, views/opendd/page/shells/default.php,
+  views/opendd/pageshells/pageshell.php, views/php/page/shells/default.php,
+  views/php/page_shells/default.php, views/rss/page/shells/default.php,
+  views/rss/page_elements/contentwrapper.php,
+  views/rss/page_shells/default.php, views/xml/page/shells/default.php,
+  views/xml/page_shells/default.php: reorganized the page views as discussed  
+
+  	* views/js/object/default.php, views/js/pageshells/pageshell.php,
+  views/js/user/default.php: removed unused viewtype js  
+
+  	* views/default/layout/elements/owner_block.php,
+  views/default/layout/elements/sidebar.php,
+  views/default/layout/elements/title.php,
+  views/default/layout/shells/administration.php,
+  .../layout/shells/one_column_with_sidebar.php,
+  views/default/layout/shells/one_sidebar.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/sidebar.php,
+  views/default/page_elements/title.php: moved a few elements to layout from
+  page  
+
+  	* views/default/content/filter.php, views/default/content/footer.php,
+  views/default/content/header.php, views/default/content/sidebar.php,
+  views/default/layout/shells/content.php,
+  views/default/layout/shells/content/filter.php,
+  views/default/layout/shells/content/footer.php,
+  views/default/layout/shells/content/header.php,
+  views/default/layout/shells/content/sidebar.php: moved content views into
+  layout/shells/content  
+
+2010-12-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/item/wrapper.php: Refs #2700 fixed another stray
+  conversion in riverdashboard 
+
+  	* engine/lib/views.php, mod/blog/start.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  views/default/layout/objects/media.php,
+  views/default/layout/objects/module.php,
+  views/default/layout/shells/administration.php,
+  views/default/layout/shells/content.php,
+  views/default/layout/shells/default.php,
+  views/default/layout/shells/one_column.php,
+  .../layout/shells/one_column_with_sidebar.php,
+  views/default/layout/shells/one_sidebar.php,
+  views/default/layout/shells/two_sidebar.php,
+  views/default/layout/shells/widgets.php,
+  views/default/layout_elements/media.php,
+  views/default/layout_elements/module.php,
+  views/default/layouts/administration.php, views/default/layouts/default.php,
+  views/default/layouts/main_content.php, views/default/layouts/one_column.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/layouts/one_sidebar.php, views/default/layouts/two_sidebar.php,
+  views/default/layouts/widgets.php, views/default/output/tagcloud.php:
+  reorganized the layout views  
+
+2010-12-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Refs #2220. Check that an autoload class is
+  registered before trying to include it.  
+
+  	* engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginPackage.php: Removed leading _ in private var names.
+   
+
+2010-12-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser17.php,
+  engine/classes/ElggPluginManifestParser18.php,
+  engine/classes/ElggPluginPackage.php, engine/tests/api/plugins.php,
+  engine/tests/test_files/plugin_18/manifest.xml: Renamed 'elgg' manifest
+  requirment to 'elgg_version' to be more in line with the current options. 
+  Removed assignments in if statements.  1.7 manifest files properly show
+  elgg_version as a requirement.  
+
+2010-12-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/views.php,
+  views/default/messages/list.php, views/default/page_elements/messages.php,
+  views/default/page_shells/admin.php, views/default/page_shells/default.php,
+  views/default/page_shells/walled_garden.php: cleaned up system messages
+  display code  
+
+  	* views/default/friends/list.php,
+  views/default/messages/exceptions/exception.php: removing unused views  
+
+  	* views/default/css/screen.php, views/default/layout_elements/media.php,
+  views/default/layout_elements/module.php: added more options to module view  
+
+  	* engine/lib/views.php, languages/en.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/list.php, views/default/comments/forms/edit.php,
+  views/default/forms/comments/add.php,
+  views/default/layout_elements/media.php: comments use the media view now  
+
+  	* mod/blog/lib/blog.php, views/default/css/screen.php: Fixed minor display
+  issues with blog breadcrumbs and also the archives page  
+
+2010-12-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/screen.php, views/default/navigation/breadcrumbs.php:
+  rewrote breadcrumbs  
+
+  	* languages/en.php: changed "my friends" to "friends"  
+
+  	* engine/lib/views.php, mod/blog/languages/en.php, mod/blog/lib/blog.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/forms/blog/save.php,
+  mod/blog/views/default/js/blog/save_draft.php, views/default/css/screen.php:
+  blog plugin now uses the new elgg_view_form() function  
+
+  	* engine/lib/views.php: Fixes #2616 Adds Evan's view form convenience
+  function  
+
+  	* engine/lib/views.php, mod/blog/views/default/object/blog.php,
+  views/default/annotation/generic_comment.php: added a convience function for
+  the media content pattern - is elgg_view_media() a good name?  
+
+  	* mod/blog/views/default/object/blog.php,
+  views/default/annotation/generic_comment.php, views/default/css/screen.php,
+  views/default/layout_elements/media.php: changed img | body media element to
+  icon | body  
+
+  	* engine/lib/views.php: moved the view functions around so that they are
+  grouped together by function  
+
+  	* engine/lib/views.php, languages/en.php, mod/blog/actions/blog/delete.php,
+  mod/blog/actions/blog/save.php, mod/blog/languages/en.php,
+  mod/blog/lib/blog.php, mod/blog/start.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php, views/default/content/filter.php,
+  views/default/content/header.php, views/default/css/components/forms.php:
+  Clean-up of the blog plugin - now using urls from 1.7.5  
+
+  	* mod/uservalidationbyemail/start.php: fixed bug in uservalidationbyemail
+  permissions hook handler - was giving everyone permission to everything  
+
+2010-12-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, mod/blog/blog_lib.php, mod/blog/lib/blog.php,
+  mod/blog/start.php: Fixes #2519 we can now register and load php libraries -
+  blog plugin is using this  
+
+  	* engine/lib/views.php, mod/blog/views/default/object/blog.php,
+  views/default/annotation/generic_comment.php,
+  views/default/comments/latest.php, views/default/css/screen.php,
+  views/default/entities/list.php: object/blog view uses new media view - needs
+  some clean up  
+
+  	* engine/lib/views.php, mod/blog/views/default/blog/sidebar_menu.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/world.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/comments/latest.php, views/default/css/screen.php,
+  views/default/layout_elements/media.php,
+  views/default/layout_elements/module.php: welcome to the new media view - it
+  is being used in the new latest comments module  
+
+  	* views/default/css/screen.php, views/default/layouts/main_content.php,
+  views/default/layouts/one_sidebar.php, views/default/page_elements/body.php,
+  views/default/page_elements/content.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_shells/default.php: using classes for page level divs  
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/object/blog.php, views/default/content/header.php,
+  views/default/css/screen.php: fitting blog object display into new html
+  structure  
+
+  	* mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  views/default/annotation/latest_comments.php, views/default/css/screen.php,
+  views/default/layout_elements/module.php, views/default/layouts/module.php,
+  views/default/output/tagcloud.php: blog sidebar html updates finished - uses
+  modules!  
+
+  	* mod/blog/blog_lib.php, mod/blog/start.php,
+  views/default/content/filter.php, views/default/content/footer.php,
+  views/default/content/header.php, views/default/content/sidebar.php,
+  views/default/css/screen.php, views/default/layouts/main_content.php: a
+  better main content view structure  
+
+  	* views/default/css/screen.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/page_elements/content.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_shells/default.php: striking balance between all classes
+  and giving ids on major layout elements for easy css-only theming  
+
+  	* engine/lib/views.php: check if there are any messages before grabbing them
+  in elgg_view_page()  
+
+2010-12-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Fixes #2706 simplecache url generator was not
+  handling an empty last cache date 
+
+  	* install/ElggInstaller.php, install/css/install.css,
+  views/installation/install/forms/template.php,
+  views/installation/install/nav.php,
+  views/installation/install/pages/complete.php,
+  views/installation/page_shells/default.php: Refs #2706 updates display of
+  installer due to switch to dashes in CSS elements 
+
+2010-12-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/cache_handler.php: Cache handler needs to support _ in
+  views  
+
+  	* mod/riverdashboard/index.php,
+  .../views/default/riverdashboard/ecml/activity.php: Refs #2700: Removed a few
+  stray hyphens.  
+
+  	* install/ElggInstaller.php: Refs #2706. Added configuration.php to
+  installation engine bootstrapping.  Required because of use of
+  elgg_get_site_url().  
+
+2010-12-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/components/grid.php: updated grid css - added sixths 
+
+  	* engine/lib/views.php, views/default/entities/list.php,
+  views/default/entities/list_item.php: Refs #2189 the beginning of semantic
+  markup for entity lists - needs some reorganization  
+
+  	* views/default/navigation/tabs.php: removed extra div in navigation/tabs  
+
+2010-12-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/item/wrapper.php: Another stray hyphens 
+
+  	* .../views/default/river/item/list.php: hyphen snuck in to
+  elgg_view_river_item 
+
+2010-12-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser.php,
+  engine/classes/ElggPluginManifestParser17.php,
+  engine/classes/ElggPluginManifestParser18.php,
+  engine/classes/ElggPluginPackage.php, engine/lib/plugins.php,
+  engine/tests/api/plugins.php, engine/tests/test_files/plugin_17/manifest.xml,
+  engine/tests/test_files/plugin_18/manifest.xml, languages/en.php: Refs #1986
+  #2170 #2225. Added semantic manifest.xml support and unit tests.  Also added
+  plugin dependencies system. See
+  engine/tests/test_files/plugin_18/manifest.xml for examples.  Not closing
+  tickets pending discussion.  
+
+  	* mod/oauth_lib/manifest.xml, mod/sitepages/manifest.xml: Removed more
+  incompatible 1.8 attributes in 1.7-style manifests.  
+
+  	* mod/ecml/manifest.xml: Removing unsupported 1.7-style manifest elements.  
+
+2010-12-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php, mod/blog/start.php, views/default/css/screen.php,
+  views/default/layouts/module.php,
+  views/default/page_elements/main_header.php,
+  views/default/page_elements/main_module.php,
+  views/default/page_elements/main_nav.php: preview of what the main content
+  area looks like with a module approach  
+
+  	* views/default/css/screen.php, views/default/navigation/breadcrumbs.php:
+  updated breadcrumbs with elgg- namespace  
+
+  	* views/default/css/screen.php, views/default/layouts/one_column.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/page_elements/footer.php: adjusted the one column and two
+  column layouts  
+
+  	* mod/blog/views/default/object/blog.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/groups/groupprofile.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/messages/views/default/messages/messages.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php, views/default/css/screen.php,
+  views/default/js/initialise_elgg.php, views/default/likes/forms/edit.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php: Refs #2700 completed the _ to -
+  conversion for screen.css (leaves admin.css and plugin css)  
+
+2010-12-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/start.php: Refs #2700. Fixed a misplaced - in
+  riverdashboard from the css _ to - conversion.  
+
+2010-12-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/layouts/module.php: adding a generic module layout 
+
+  	* views/default/css/screen.php, views/default/page_elements/header.php:
+  cleaned up header css for new layout 
+
+2010-12-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Better code and docs or previous.  
+
+  	* engine/lib/elgglib.php: Added 'true' as a truthy value for ini_get_bool().
+   
+
+2010-12-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css/screen.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/page_elements/footer.php: more cleanup of the basic layout css 
+
+  	* views/default/css/screen.php, views/default/page_elements/topbar.php:
+  cleaned up the topbar css 
+
+  	* views/default/widgets/wrapper.php: fixed typo in widget display
+  deprecation 
+
+  	* views/default/page_elements/footer.php: restored the powered by badge
+  image 
+
+  	* js/lib/ui.js, views/default/css/components/reset.php,
+  views/default/css/screen.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/messages/errors/list.php, views/default/messages/list.php,
+  views/default/messages/messages/list.php,
+  views/default/page_elements/content.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_shells/default.php: rough implementation of Evan's page
+  layout  
+
+  	* engine/lib/sites.php: added a function for getting current site entity  
+
+  	* js/lib/ui.js, js/lib/ui.widgets.js, views/default/js/initialise_elgg.php,
+  views/default/layouts/widgets.php, views/default/widgets/add_panel.php,
+  views/default/widgets/wrapper.php: Refs #2700 fixed the widget code with the
+  new CSS element names  
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php,
+  .../views/default/river/object/blog/create.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/view.php,
+  .../views/default/defaultwidgets/editor.php,
+  .../views/default/embed/web_services/content.php,
+  mod/ecml/views/default/settings/ecml/edit.php,
+  mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/object/file/embedlist.php, mod/file/friends.php,
+  mod/file/index.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/upload.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/widgets/filerepo/content.php, mod/groups/groupprofile.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../default/river/relationship/member/create.php,
+  .../views/default/invitefriends/formitems.php, mod/members/index.php,
+  mod/members/views/default/members/css.php,
+  .../views/default/members/members_navigation.php,
+  mod/members/views/default/members/search.php,
+  .../views/default/widgets/messageboard/content.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/view.php, mod/notifications/start.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../views/default/river/object/page/create.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../default/profile/editdefaultprofileitems.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/listing.php,
+  .../views/default/profile/profile_navigation.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  .../default/admin/overview/reportedcontent.php,
+  .../views/default/reportedcontent/form.php,
+  mod/riverdashboard/endpoint/get_comments.php,
+  mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  mod/riverdashboard/start.php, .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/ecml/activity.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/search_box.php,
+  .../views/default/canvas/layouts/frontpage.php,
+  mod/sitepages/views/default/sitepages/css.php,
+  mod/sitepages/views/default/sitepages/members.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  mod/thewire/views/default/thewire/css.php,
+  .../views/default/thewire/profile_status.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/account/login_dropdown.php,
+  views/default/account/login_walled_garden.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/overview.php, views/default/admin/overview/online.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/admin/users/newest.php, views/default/admin/users/online.php,
+  views/default/ajax/loader.php, views/default/annotation/annotate.php,
+  views/default/annotation/annotatelike.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/annotation/likes.php, views/default/comments/forms/edit.php,
+  views/default/css/admin.php, views/default/css/ie.php,
+  views/default/css/ie6.php, views/default/css/screen.php,
+  views/default/dashboard/blurb.php, views/default/entities/entity_listing.php,
+  views/default/export/entity.php, views/default/export/metadata.php,
+  views/default/export/relationship.php, views/default/friends/collection.php,
+  views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php, views/default/friends/picker.php,
+  views/default/input/userpicker.php, views/default/js/friendsPickerv1.php,
+  views/default/js/initialise_elgg.php,
+  views/default/layouts/administration.php,
+  views/default/layouts/one_column.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/layouts/widgets.php, views/default/likes/forms/edit.php,
+  views/default/likes/forms/link.php, views/default/messages/errors/list.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/navigation/listtype.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/site_nav.php, views/default/navigation/tabs.php,
+  .../notifications/settings/usersettings.php,
+  views/default/output/rss_view.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_logo.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_elements/topbar_logout.php,
+  views/default/page_shells/walled_garden.php,
+  views/default/river/item/wrapper.php, views/default/settings/system.php,
+  views/default/settings/upgrading.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/widgets/add_button.php, views/default/widgets/add_panel.php,
+  views/default/widgets/controls.php, views/default/widgets/settings.php,
+  views/default/widgets/wrapper.php,
+  views/installation/page_shells/default.php: Refs #2700 replaced most
+  underscores with hyphens - there may be broken display code due to extent of
+  this change  
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/object/blog.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/defaultwidgets/editor.php,
+  mod/ecml/views/default/ecml/input_ext.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/link.php,
+  mod/file/views/default/object/file.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/object/groupforumtopic.php,
+  .../views/default/invitefriends/formitems.php,
+  .../views/default/messageboard/forms/add.php,
+  .../views/default/widgets/messageboard/content.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/view.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../default/admin/appearance/defaultprofile.php,
+  .../profile/commentwall/commentwall_content.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../default/profile/editdefaultprofileitems.php,
+  mod/profile/views/default/profile/editicon.php,
+  .../views/default/profile/profile_ownerblock.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/riverdashboard/css.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/twitter/views/default/twitter/css.php,
+  .../uservalidationbyemail/unvalidated_user.php,
+  views/default/account/forms/register.php,
+  views/default/account/login_walled_garden.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/css/admin.php,
+  views/default/css/components/forms.php, views/default/css/ie.php,
+  views/default/css/ie6.php, views/default/css/screen.php,
+  views/default/friends/picker.php, views/default/input/access.php,
+  views/default/input/button.php, views/default/input/checkbox.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php, views/default/input/userpicker.php,
+  views/default/js/upload_js.php, views/default/layouts/widgets.php,
+  views/default/page_elements/content_header.php,
+  views/default/page_shells/walled_garden.php,
+  views/default/usersettings/form.php, views/default/widgets/add_button.php,
+  views/installation/input/access.php, views/installation/input/button.php,
+  views/installation/input/longtext.php, views/installation/input/password.php,
+  views/installation/input/text.php: Refs #2700 changed underscores to hyphens
+  for the forms css elements  
+
+  	* views/default/css/admin.php, views/default/css/components/OOCSS_LICENSE,
+  views/default/css/components/forms.php,
+  views/default/css/components/grid.php,
+  views/default/css/components/heading.php,
+  views/default/css/components/reset.php,
+  views/default/css/components/spacing.php,
+  views/default/css/components/typography.php, views/default/css/screen.php:
+  Refs #2317 pulled a few sections of CSS out to try out granular CSS  
+
+  	* views/default/css.php, views/default/css/screen.php: moved the CSS into
+  the new css/screen view and added a check for old themes  
+
+2010-12-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php, mod/blog/start.php, mod/bookmarks/start.php,
+  mod/captcha/start.php, mod/categories/start.php, mod/ecml/start.php,
+  mod/embed/start.php, mod/file/start.php, mod/groups/start.php,
+  mod/members/start.php, mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/riverdashboard/start.php,
+  mod/search/start.php, mod/sitepages/start.php, mod/tagcloud/start.php,
+  mod/thewire/start.php, mod/tinymce/start.php, mod/twitter/start.php,
+  mod/zaudio/start.php, views/default/css/elgg.php,
+  views/default/css/screen.php: screen.css is a better name for our main css
+  file  
+
+2010-12-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Fixes #1457. Added optional status param for
+  get_installed_plugins()  
+
+2010-12-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Fixes #2461 unsetting CONFIG variable in
+  unset_config()  
+
+  	* engine/lib/access.php: Fixes #2430 adds
+  get_entities_from_access_collection() into trunk  
+
+  	* .../views/default/widgets/filerepo/content.php,
+  mod/file/views/default/widgets/filerepo/view.php,
+  .../views/default/widgets/friends/content.php,
+  mod/friends/views/default/widgets/friends/view.php,
+  .../default/widgets/a_users_groups/content.php,
+  .../views/default/widgets/a_users_groups/view.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php,
+  .../views/default/widgets/messageboard/content.php,
+  .../views/default/widgets/messageboard/view.php,
+  mod/pages/views/default/widgets/pages/content.php,
+  mod/pages/views/default/widgets/pages/view.php,
+  .../views/default/widgets/tagcloud/content.php,
+  .../views/default/widgets/tagcloud/view.php,
+  .../views/default/widgets/thewire/content.php,
+  mod/thewire/views/default/widgets/thewire/view.php,
+  .../views/default/widgets/twitter/content.php,
+  mod/twitter/views/default/widgets/twitter/view.php,
+  views/default/widgets/wrapper.php: Fixes #2555 content.php is the new display
+  view for widgets  
+
+2010-11-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Fix typo in previous.  
+
+  	* engine/classes/ElggPlugin.php, engine/classes/ElggPluginManifest.php,
+  engine/classes/ElggPluginManifestParser.php,
+  engine/classes/ElggPluginManifestParser17.php,
+  engine/classes/ElggPluginManifestParser18.php, engine/lib/plugins.php,
+  engine/tests/api/plugins.php: Refs #1986 #2170 #2225 Added
+  ElggPluginManifest, ElggPluginManifestParser, and its parser classes for 1.7
+  and 1.8 style manifests.  Changed load_plugin_manifest() to use new parser. 
+  Added initial unit tests.  
+
+2010-11-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/user/passwordreset.php, actions/usersettings/save.php,
+  pages/account/register.php, pages/dashboard/latest.php,
+  pages/friends/pickercallback.php: Refs #2428 removed a few CONFIG uses in
+  core  
+
+  	* mod/crontrigger/start.php, mod/garbagecollector/start.php,
+  mod/invitefriends/start.php, mod/logbrowser/start.php, mod/members/start.php,
+  mod/messageboard/start.php, mod/reportedcontent/start.php,
+  mod/sitepages/start.php, mod/thewire/start.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php: Refs #2428 removed some global CONFIG
+  usage in plugins  
+
+  	* mod/uservalidationbyemail/start.php: fixed typo in uservalidationbyemail
+  plugin  
+
+  	* mod/messages/start.php, mod/messages/views/default/messages/topbar.php:
+  started cleaning up the messages plugin  
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php: Refs #2428 adds
+  elgg_get_plugin_path() and elgg_get_data_path()  
+
+  	* mod/zaudio/manifest.xml, mod/zaudio/readme.txt, mod/zaudio/start.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/mpg.php,
+  mod/zaudio/views/default/zaudio/audioplayer.php,
+  mod/zaudio/views/default/zaudio/css.php: Updated the zaudio plugin for 1.8  
+
+2010-11-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggEntity.php: Refs #2668: Deprecated
+  ElggEntity::setContainer() for setContainerGUID()  
+
+2010-11-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Fixes #2694 fixed typo in join_group() 
+
+  	* engine/handlers/export_handler.php: fixed typo in the code that I moved
+  from /services/export 
+
+  	* mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php: Fixes #2508 Sending user to referrer
+  in reported content admin actions  
+
+  	* engine/lib/configuration.php, views/default/page_shells/admin.php,
+  views/default/page_shells/default.php,
+  views/default/page_shells/walled_garden.php: Refs #2428 added
+  elgg_get_config(), elgg_set_config(), and elgg_save_config()  
+
+  	* views/default/css/admin.php: removed reported content css in admin css
+  view  
+
+  	* mod/crontrigger/start.php, mod/garbagecollector/languages/en.php,
+  mod/garbagecollector/start.php,
+  .../default/settings/garbagecollector/edit.php,
+  mod/logrotate/languages/en.php, mod/logrotate/start.php,
+  .../views/default/settings/logrotate/edit.php, mod/tinymce/languages/en.php,
+  mod/tinymce/start.php: cleaned up some of the other smaller plugins  
+
+  	* mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  .../views/default/admin/overview/logbrowser.php,
+  .../views/default/logbrowser/adminlinks.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/logbrowser/table.php,
+  mod/logbrowser/views/default/object/logwrapper.php: Cleaned up the log
+  browser plugin  
+
+  	* mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/languages/en.php, mod/reportedcontent/start.php,
+  .../default/admin/overview/reportedcontent.php,
+  .../views/default/object/reported_content.php,
+  .../views/default/reportedcontent/admin_css.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/footer_link.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/reportedcontent/user_report.php: cleaned up the reported
+  content plugin  
+
+2010-11-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/views.php,
+  views/default/friends/picker.php, views/default/page_elements/html_begin.php:
+  Fixes #2173 #2507 integrated the ie and admin stylesheets into the new
+  simplecache code  
+
+  	* _css/css.php, _css/js.php, engine/handlers/cache_handler.php,
+  engine/lib/views.php, engine/start.php, htaccess_dist, simplecache/view.php,
+  views/default/css/elgg.php, views/default/friends/picker.php: Fixes #2160
+  #2678 introducing a more flexible simplecache handler (this requires an
+  htaccess update)  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, views/default/css/admin.php,
+  views/default/css/ie.php, views/default/css/ie6.php,
+  views/default/css_ie.php, views/default/css_ie6.php,
+  views/default/layouts/administration.php,
+  views/default/page_elements/html_begin.php,
+  views/default/page_elements/html_begin_admin.php,
+  views/default/page_shells/admin.php: Refs #2173 #2160 #2507 added a css page
+  handler to support multiple css files  
+
+  	* services/export/handler.php: Refs #2681 removes services directory  
+
+  	* engine/handlers/export_handler.php, htaccess_dist: Fixes #2681 moves
+  export handler into handler directory - current installs need to have
+  .htaccess updated  
+
+  	* engine/lib/web_services.php, services/api/rest_api.php: moved rest/rpc web
+  services handler into web_services library  
+
+  	* engine/lib/api.php, engine/lib/web_services.php, engine/start.php,
+  install/ElggInstaller.php: moved api.php to web_services.php as it is more
+  descriptive  
+
+2010-11-27  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/ajax/loader.php: Fixes #2280: ajax/loader view starts out
+  with display set to none 
+
+2010-11-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: Updated contrib file.  
+
+  	* CONTRIBUTORS.txt, README.txt: Cleaned up some typos and formatting issues
+  in README and CONTRIB files.  
+
+  	* CONTRIBUTORS.txt, COPYRIGHT.txt: Fixed typos and cleaned up copyright and
+  contrib file.  
+
+2010-11-24  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Fixes #2664: elgg_view_entity subtype defaults to
+  "default" rather than $type 
+
+  	* engine/handlers/page_handler.php, engine/handlers/pagehandler.php,
+  htaccess_dist: Fixes #2667: pagehandler.php => page_handler.php.  You'll need
+  to update .htaccess to keep developing 
+
+  	* mod/sitepages/start.php: unnecessary declaration of global $CONFIG; 
+
+  	* mod/blog/blog_lib.php, mod/blog/start.php, mod/sitepages/start.php:
+  Removing superfluous calls to insert site root in urls 
+
+  	* engine/lib/metadata.php: Deprecated list_entities_from_metadata_multi 
+
+  	* languages/en.php: Added generic function deprecation translation 
+
+  	* mod/bookmarks/actions/add.php, mod/bookmarks/actions/edit.php,
+  mod/defaultwidgets/actions/update.php, mod/defaultwidgets/start.php,
+  mod/file/actions/upload.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/featured.php, mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/start.php,
+  mod/messages/actions/delete.php, mod/pages/actions/pages/edit.php,
+  mod/pages/actions/pages/editwelcome.php, mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/editfield.php, mod/profile/actions/iconupload.php,
+  mod/profile/actions/reorder.php, mod/profile/actions/resetdefaultprofile.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/start.php,
+  mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php:
+  Refs #2451: Removes (admin_)gatekeeper() calls from core plugin actions 
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, actions/admin/site/update_advanced.php,
+  actions/admin/site/update_basic.php, actions/admin/user/ban.php,
+  actions/admin/user/delete.php, actions/admin/user/makeadmin.php,
+  actions/admin/user/removeadmin.php, actions/admin/user/resetpassword.php,
+  actions/admin/user/unban.php, actions/comments/add.php,
+  actions/email/save.php, actions/entities/delete.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/remove.php, actions/import/opendd.php, actions/likes/add.php,
+  .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php, actions/user/spotlight.php,
+  actions/useradd.php, actions/usersettings/save.php,
+  engine/lib/notification.php, engine/lib/users.php: Refs #2451: Removed
+  gatekeeper/admin_gatekeeper() calls from core actions 
+
+  	* engine/lib/actions.php, engine/lib/admin.php, engine/lib/elgglib.php,
+  engine/lib/export.php, engine/lib/plugins.php, engine/lib/sessions.php,
+  engine/lib/users.php, engine/lib/widgets.php, mod/blog/start.php,
+  mod/bookmarks/start.php, mod/categories/start.php,
+  mod/defaultwidgets/start.php, mod/diagnostics/start.php, mod/ecml/start.php,
+  mod/file/start.php, mod/groups/start.php, mod/invitefriends/start.php,
+  mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/sitepages/start.php,
+  mod/thewire/start.php, mod/uservalidationbyemail/start.php: Fixes #2655:
+  Converted register_action to elgg_register_action throughout core 
+
+  	* engine/lib/actions.php: Refs #2655: Introducing elgg_register_action() + a
+  few fixes to typos in documentation 
+
+2010-11-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/cron_handler.php, engine/lib/cron.php: Fixes #2472 move
+  cron_handler.php logic into cron page handler 
+
+  	* mod/groups/views/default/groups/groupprofile.php: Fixes #2638 - specifying
+  the full url on the urls so we don't have this problem anymore 
+
+  	* mod/embed/start.php, mod/pages/start.php, mod/profile/start.php,
+  mod/sitepages/start.php, views/default/page_elements/html_begin.php: Fixes
+  #2270 - deprecates metatags view and replaces with html_head/extend 
+
+  	* mod/profile/actions/cropicon.php, mod/profile/actions/iconupload.php:
+  Fixes #2418 and merges [7121] into trunk  
+
+  	* engine/lib/widgets.php: returning an empty array when there are no widgets
+  for a context  
+
+  	* views/default/css.php: adjusted text color of widget titles  
+
+  	* views/default/input/checkbox.php, views/default/input/checkboxes.php:
+  Fixes #397 and Refs #2396 Can suppress the default value for both
+  input/checkbox and input/checkboxes  
+
+2010-11-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggSite.php, engine/lib/sites.php: Fixes #2488 "return"
+  was missing in ElggSite::getObjects() (also updated some documentation) 
+
+  	* engine/classes/ElggSite.php, engine/lib/sites.php: updated the deprecated
+  list_site_members() to use new ElggSite::listMembers() method and updated
+  ElggSite::getMembers() to accept all the arguments from elgg_get_entities() 
+
+  	* engine/lib/sites.php: deprecated some sites functions that were never
+  supported or fully implemented 
+
+  	* engine/lib/database.php, engine/lib/plugins.php: Refs #2673 moved changes
+  into trunk from 1.7 branch  
+
+2010-11-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Refs #2660: Merged r7409's
+  remove_group_tool_option() to trunk.  
+
+  	* mod/bookmarks/actions/add.php,
+  mod/bookmarks/views/default/object/bookmarks.php: Merged bookmarks XSS fixes
+  in r7406 to trunk.  
+
+2010-11-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: widgets should not have content outside their
+  container  
+
+  	* engine/classes/ElggWidget.php, engine/lib/widgets.php: widget column ids
+  must be integers  
+
+2010-11-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/user/password.php, languages/en.php,
+  views/default/user/settings/password.php: Refs #2669: Merged password change
+  fixes in 7404 to trunk.  
+
+  	* mod/members/views/default/members/search.php: Refs #2612: Merged r7402 to
+  trunk.  
+
+  	* mod/profile/views/default/profile/listing.php,
+  .../default/profile/profile_contents/details.php: Refs #2670: Merged XFN
+  fixes from 1.7 to 1.8. Removed unused code in profile_contents/details.php  
+
+2010-11-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/index.php: removed call to deprecated page_owner()  
+
+  	* engine/lib/tags.php, mod/blog/views/default/blog/sidebar_menu.php,
+  mod/file/start.php, mod/tagcloud/tagcloud.php,
+  .../views/default/widgets/tagcloud/view.php: removed deprecated tag library
+  calls  
+
+  	* engine/classes/ElggSite.php, engine/lib/sites.php, engine/lib/views.php,
+  mod/thewire/index.php: deprecated two site functions and removed a use of
+  previously deprecated function in the wire plugin  
+
+  	* engine/lib/widgets.php: fix for previous  
+
+  	* engine/lib/widgets.php: use more Elgg standrad function names -
+  elgg_register_widget_type()  
+
+2010-11-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ui.widgets.js: added hack for opera/jquery-ui bug  
+
+  	* js/lib/ui.widgets.js, languages/en.php, views/default/css.php,
+  views/default/widgets/controls.php, views/default/widgets/wrapper.php: added
+  collapsible state to widgets  
+
+  	* engine/classes/ElggData.php: Refs #2629 Brett is correct - don't need the
+  call to initializeAttributes() because all the first level subclasses call
+  initializeAttributes()  
+
+  	* engine/classes/ElggData.php, engine/classes/ElggFile.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggWidget.php: Refs #2629 This
+  should fix this ticket. Need to remove initialise_attributes from any class
+  updated with new method and add call to initializeAttributes in ElggData for
+  those that are not updated.  
+
+  	* engine/classes/ElggWidget.php, languages/en.php, views/default/css.php,
+  views/default/dashboard/blurb.php, views/default/widgets/controls.php,
+  views/default/widgets/wrapper.php: added some light styling to the widget
+  control buttons  
+
+2010-11-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggGroup.php, engine/classes/ElggObject.php,
+  engine/classes/ElggSite.php, engine/classes/ElggUser.php: Fixes #2629: Pulled
+  old initialise_attributes() into ElggData and added a default param to emit a
+  deprecation notice if called.  
+
+2010-11-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/widgets/settings.php: Fixes #1342 dashboard widgets do not
+  have access controls  
+
+  	* js/lib/ui.widgets.js, mod/friends/start.php,
+  views/default/widgets/add_panel.php, views/default/widgets/wrapper.php: Fixes
+  #472 handling interactive adding/deleting of widgets with single/multiple
+  instance constraints  
+
+  	* js/lib/ui.widgets.js, languages/en.php, mod/friends/start.php,
+  views/default/css.php, views/default/layouts/widgets.php,
+  views/default/widgets/add_panel.php: Refs #472 not allowing widgets to be
+  added if only single instance allowed  
+
+  	* actions/widgets/add.php, actions/widgets/save.php,
+  engine/classes/ElggWidget.php, engine/lib/widgets.php: moved save widget
+  settings function to ElggWidget  
+
+  	* engine/lib/widgets.php, views/default/layouts/widgets.php: added a plugin
+  hook for determining who can edit a widget layout  
+
+  	* actions/widgets/add.php, engine/classes/ElggWidget.php,
+  js/lib/ui.widgets.js: fixed bug where widgets were not saving their new
+  position  
+
+  	* engine/classes/ElggWidget.php: do not need special canEdit method for
+  ElggWidget  
+
+  	* engine/classes/ElggEntity.php, engine/tests/objects/objects.php: Refs
+  #2668 adds getContainerGUID()  
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggUser.php,
+  engine/classes/Loggable.php, engine/lib/entities.php,
+  engine/lib/extender.php, engine/tests/objects/entities.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/actions/leave.php,
+  mod/thewire/actions/delete.php: Fixes #2668 adding getOwnerGUID()  
+
+2010-11-20  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/helpers.php: Fixed typos in text expectations that were
+  cause elgg_normalize_url unit tests to fial 
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggObject.php, engine/classes/ElggSite.php,
+  engine/classes/ElggUser.php, engine/tests/objects/entities.php,
+  engine/tests/objects/objects.php, engine/tests/objects/sites.php,
+  engine/tests/objects/users.php: Fixes #2490: attributes initialize to NULL
+  instead of empty string or 0.  Updated tests to reflect this 
+
+  	* engine/classes/ElggPlugin.php: Marking initialise_attributes as deprecated
+  in ElggPlugin 
+
+  	* engine/classes/ElggGroup.php: Marking initialise_attributes as deprecated 
+
+  	* engine/handlers/pagehandler.php, engine/lib/actions.php,
+  engine/lib/elgglib.php, engine/lib/group.php, engine/lib/sessions.php: Fixes
+  #2237: Added 'reason' parameter to forward() to allow proper headers and more
+  flexible destinations via plugin hooks.  Also made use of this in core
+  gatekeeper functions and in pagehandler.php 
+
+  	* views/default/input/checkbox.php, views/default/input/checkboxes.php:
+  Fixes #2396: Added a new input/checkbox view.  input/checkboxes harnesses it 
+
+  	* engine/lib/views.php: Fixes #2615: Viewtype now included in views plugin
+  hooks 
+
+  	* mod/htmlawed/start.php: Fixes #2497: htmLawed now uses a plugin hook for
+  allowed_styles and htmlawed_config 
+
+  	* engine/lib/elgglib.php, engine/lib/users.php: Fixes #2468: Deprecated
+  call_gatekeeper() and callpath_gatekeeper() 
+
+  	* views/default/output/calendar.php, views/default/output/confirmlink.php,
+  views/default/output/email.php, views/default/output/friendlytime.php,
+  views/default/output/pulldown.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php: Fixes #2036: using htmlspecialchars in output
+  views 
+
+  	* js/lib/security.js: Fixes #2620: Security token refresh action is now
+  security/refreshtoken 
+
+  	* mod/messageboard/actions/add.php: Fixes #2357: messageboard post action
+  redirects to referrer 
+
+  	* engine/classes/ElggEntity.php, engine/lib/entities.php,
+  engine/tests/objects/entities.php: Fixes #2473: removes
+  initialise_entity_cache() 
+
+  	* mod/blog/views/default/blog/forms/edit.php, mod/diagnostics/index.php,
+  .../views/default/embed/web_services/content.php,
+  .../views/default/admin/users/unvalidated.php,
+  views/default/admin/plugins/advanced.php, views/default/input/button.php,
+  views/default/input/reset.php, views/default/input/submit.php,
+  views/installation/input/reset.php, views/installation/input/submit.php: Refs
+  #2143: DRY up button input views (button, reset, submit).  Changed core uses
+  of button to reflect the fact that it no longer defaults to submit 
+
+  	* js/lib/security.js: Utilizing elgg.extend, rather than jQuery.extend 
+
+  	* js/lib/languages.js: Commented elgg.add_translation Utilizing elgg.extend
+  instead of $.extend 
+
+  	* js/lib/elgglib.js: Added an elgg.extend method for merging two or more
+  objects 
+
+  	* views/default/input/submit.php: Refs #2143: Cleaned up input/submit 
+
+  	* views/default/input/tags.php: Refs #2143: DRY up input/tags 
+
+  	* views/default/input/email.php: Refs #2143: DRY up input/email 
+
+  	* views/default/input/text.php: Refs #2143: DRY up input/text 
+
+  	* views/default/input/form.php: Refs #2143: DRYed up input/form 
+
+  	* engine/lib/output.php: Doesn't make any sense for elgg_format_attributes
+  to default to an empty array... 
+
+  	* engine/lib/output.php, views/default/input/url.php,
+  views/default/output/url.php: Refs #2143: Added elgg_format_attributes() for
+  generating an attribute string from an associative array.  DRYed up
+  input/output url 
+
+2010-11-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/add.php, engine/lib/widgets.php, js/lib/ui.widgets.js,
+  views/default/css.php, views/default/layouts/widgets.php,
+  views/default/widgets/add.php, views/default/widgets/add_panel.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/settings.php,
+  views/default/widgets/wrapper.php: improving interactions of widgets -
+  containment wasn't working due to height issues 
+
+  	* engine/lib/widgets.php, views/default/widgets/add.php,
+  views/default/widgets/wrapper.php: finished updated the widgets library 
+
+  	* actions/widgets/save.php, js/lib/ui.widgets.js,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php:
+  updating widget contents when settings are changed 
+
+  	* actions/widgets/save.php, engine/lib/widgets.php, js/lib/ui.widgets.js,
+  views/default/css.php, views/default/widgets/controls.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php:
+  saving widget settings 
+
+  	* actions/widgets/delete.php, engine/classes/ElggWidget.php,
+  engine/lib/widgets.php, js/lib/ui.widgets.js, languages/en.php,
+  views/default/css.php, views/default/widgets/controls.php,
+  views/default/widgets/wrapper.php: users can delete widgets from layout 
+
+  	* actions/widgets/add.php, actions/widgets/move.php,
+  engine/classes/ElggWidget.php, engine/lib/widgets.php: moved some widget
+  functionality into ElggWidget class  
+
+  	* mod/file/views/default/widgets/filerepo/edit.php,
+  mod/file/views/default/widgets/filerepo/view.php: updated file widget to use
+  1.7 elgg_get_entities* APIs  
+
+  	* .../views/default/widgets/bookmarks/edit.php,
+  .../views/default/widgets/bookmarks/view.php: updated bookmarks widget to use
+  1.7 APIs  
+
+  	* actions/register.php: Closes #2653 users are logged in on registration and
+  login exceptions are caught for unvalidated users  
+
+  	* engine/lib/users.php, mod/uservalidationbyemail/actions/delete.php,
+  .../actions/resend_validation.php,
+  mod/uservalidationbyemail/actions/validate.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php: Closes #617 core has get and set
+  functions for user validation status  
+
+  	* actions/widgets/add.php, actions/widgets/move.php, engine/lib/widgets.php,
+  js/lib/ui.widgets.js, languages/en.php, views/default/layouts/widgets.php,
+  views/default/widgets/wrapper.php: saving widget position after moving  
+
+  	* engine/lib/version.php: $CONFIG->path is not set up early enough for some
+  elgg deprecate notices  
+
+  	* engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/pagehandler.php, engine/handlers/service_handler.php,
+  engine/handlers/xml-rpc_handler.php: switching to using full paths in
+  handlers  
+
+2010-11-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/add.php, engine/lib/widgets.php, js/lib/ui.widgets.js:
+  Added functions to support moving and adding widgets 
+
+  	* engine/lib/widgets.php, views/default/css.php,
+  views/default/layouts/widgets.php, views/default/widgets/wrapper.php: Refs
+  #1793 getting sorted widgets from elgg_get_widgets() 
+
+  	* actions/widgets/add.php, engine/lib/widgets.php, js/lib/ui.widgets.js,
+  languages/en.php, views/default/css.php, views/default/layouts/widgets.php,
+  views/default/widgets/add.php, views/default/widgets/add_button.php: Refs
+  #1793 added ability to add widgets to layout through ajax 
+
+  	* engine/lib/location.php: Refs #1411, #2165 added
+  elgg_list_entities_from_location() and deprecated in_area functions  
+
+  	* engine/lib/location.php, engine/tests/api/entity_getter_functions.php:
+  Refs #2165 adds elgg_get_entities_from_location()  
+
+  	* engine/lib/private_settings.php,
+  engine/tests/api/entity_getter_functions.php: Refs #2165 added
+  elgg_get_entities_from_private_settings()  
+
+2010-11-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/url.php: Refs #2143 I need ids for urls for the
+  widget code right now 
+
+  	* engine/lib/widgets.php, js/lib/ui.widgets.js, languages/en.php,
+  views/default/css.php, views/default/layouts/widgets.php,
+  views/default/widgets/add.php, views/default/widgets/add_button.php: Refs
+  #1793 - added a basic add new widgets view - it is not wired up yet 
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/removeadmin.php, actions/admin/user/resetpassword.php,
+  actions/admin/user/unban.php, languages/en.php: Closes #1422 admin user
+  actions now check for self before banning, deleting, or removing admin
+  privileges  
+
+  	* pages/friends/index.php, pages/friends/of.php: Refs #1411 using new
+  elgg_list* functions in friends page handlers  
+
+  	* pages/friends/index.php, pages/friends/of.php: Refs #2662 removed html
+  from friends page handlers  
+
+  	* js/lib/ui.widgets.js, views/default/css.php,
+  views/default/layouts/widgets.php, views/default/widgets/wrapper.php: Refs
+  #821 #1793 early widget layout - does not include edit settings, delete,
+  collapsing, reloading, or adding widgets  
+
+2010-11-16  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/lib/functions.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../uservalidationbyemail/unvalidated_user.php: Refs #2573 updates the
+  uservalidationbyemail plugin to work with new validation metadata approach  
+
+  	* engine/lib/upgrades/2010111501.php, version.php: Fixes #2573 upgrade
+  script for new user validation approach  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/views.php,
+  install/ElggInstaller.php: Fixes #2642 changed elgg_view_page() to always
+  pick up page_shell views for the page_shells directory  
+
+  	* .gitignore, engine/lib/actions.php, engine/settings.example.php,
+  install/ElggInstaller.php: Pulled in hellekin's fixes from
+  https://github.com/Elgg/Elgg/pull/2  
+
+  	* engine/lib/views.php: made page_draw() backward compatible with 1.7  
+
+  	* engine/lib/install.php: just in case any plugin called the previous
+  install functions, I put them back as stubs  
+
+2010-11-15  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Refs #617 put user validation functions back in
+  users lib  
+
+  	* mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php: Refs #2573 fixes validation issue for
+  users registered with validation turned off. Still need to write an upgrade
+  script since validation status wasn't set on unvalidated users before this  
+
+  	* engine/classes/ElggPAM.php, engine/lib/pam.php,
+  mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/start.php: Fixes #1417 Users get notified when
+  their accounts are not validated for any authentication attempt  
+
+  	* actions/register.php: #Refs 2653 removed login() call since it was
+  conflicting with user validation plugin  
+
+2010-11-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, engine/classes/ElggPAM.php,
+  engine/classes/LoginException.php, engine/lib/api.php, engine/lib/pam.php,
+  engine/lib/sessions.php, engine/tests/services/api.php, languages/en.php:
+  Refs #1417 Elgg core now passes back useful messages to user when log in
+  fails - uservalidationbyemail is next  
+
+  	* index.php: fixed bug where the front page wasn't being populated with the
+  views  
+
+  	* engine/classes/ElggAccess.php: fixed typo in comment  
+
+2010-11-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/entities/entity_listing.php: Refs
+  #2391: Baby steps toward getting a unified css -- haven't landed on a name
+  yet, but listing/icon/info seems to make the most sense.  Do we need to be
+  worried about naming collisions, since those names are so simple? 
+
+  	* js/classes/ElggPriorityList.js, js/lib/elgglib.js, js/lib/events.js,
+  js/lib/languages.js, js/lib/prototypes.js, js/tests/ElggEventsTest.js,
+  js/tests/ElggLibTest.js, js/tests/jsTestDriver.conf, vendors/sprintf.js,
+  views/default/js/initialise_elgg.php: Refs #2538: Added vsprintf support to
+  elgg.echo.  Added unit tests for normalize_url, added prototype definitions
+  for Array#forEach for compatibility with IE. 
+
+  	* js/classes/ElggPriorityList.js, js/lib/events.js: Refs #2538: Refactored
+  and cleaned up ElggPriorityList and events 
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/calendar.php, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/location.php, engine/lib/metadata.php,
+  engine/lib/relationships.php, engine/lib/users.php, engine/lib/views.php,
+  mod/ecml/ecml_functions.php, mod/file/search.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/object/file.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/search/views/default/search/entity_list.php,
+  views/default/entities/entity_list.php,
+  views/default/navigation/listtype.php, views/default/navigation/viewtype.php,
+  views/default/object/default.php, views/default/user/default.php: Fixes
+  #2334: Converted viewtype => listtype and viewtypetoggle => listtypetoggle. 
+  Did my best to maintain backwards compatibility but might have missed
+  something... 
+
+  	* engine/tests/api/helpers.php: Added some more unit tests for
+  elgg_normalize_url 
+
+  	* engine/classes/ElggEntity.php: No comment... 
+
+  	* engine/classes/ElggEntity.php: Wow, what a blunder -- what to go deleting
+  random methods, Winslow 
+
+  	* views/default/input/button.php: Refs #1208: Default input/button to
+  'button' type (rather than 'submit' type). 
+
+  	* engine/classes/ElggEntity.php: Refs #2486: Added support for the
+  'recursive' parameter to ElggEntity::delete() 
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggData.php,
+  engine/classes/ElggEntity.php: Added comments to several undocumented methods
+
+  	* mod/pages/actions/pages/editwelcome.php: Fixes #2572: Removed last
+  @license tag from pages plugin 
+
+2010-11-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Fixes #2561 fixed typo - thanks for the report  
+
+2010-11-13  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/objects/entities.php: Cleaning up database after new
+  ElggEntity unit test.  
+
+2010-11-12  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/tests/objects/entities.php: Updating
+  ElggEntity::clearMetaData() to fail when passed a non-existent metadata name.
+   Fixes #2273  
+
+2010-11-11  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Obliterated C&P in elgg_trigger_plugin_hook 
+
+  	* engine/lib/elgglib.php: Making CodeSniffer happy + reduced C&P in
+  elgg_trigger_event 
+
+2010-11-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Refs #2641 merged [7295] into trunk  
+
+  	* mod/groups/views/default/groups/groupprofile.php: Fixes #2638 fixes group
+  action url problem  
+
+  	* mod/groups/all.php: Refs #2640 fixes a layout issue due to change in
+  elgg_view_layout()  
+
+  	* views/default/canvas/default.php,
+  views/default/canvas/layouts/administration.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/one_column_with_sidebar.php,
+  views/default/canvas/layouts/widgets.php: Closes #2637 good-bye canvas  
+
+  	* engine/lib/views.php, views/default/layouts/administration.php,
+  views/default/layouts/default.php, views/default/layouts/one_column.php,
+  views/default/layouts/one_column_with_sidebar.php,
+  views/default/layouts/widgets.php: Refs #2637 moved canvas/layouts to layouts
+   
+
+  	* engine/lib/admin.php, engine/lib/tags.php, engine/lib/users.php,
+  engine/lib/views.php, engine/tests/ui/submenu.php, index.php,
+  mod/blog/start.php, mod/bookmarks/bookmarklet.php, mod/bookmarks/start.php,
+  mod/diagnostics/index.php, mod/ecml/start.php, mod/file/edit.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/search.php,
+  mod/file/upload.php, mod/file/world.php, mod/groups/activity.php,
+  mod/groups/addtopic.php, mod/groups/all.php, mod/groups/edit.php,
+  mod/groups/edittopic.php, mod/groups/forum.php, mod/groups/groupprofile.php,
+  mod/groups/index.php, mod/groups/invitations.php, mod/groups/invite.php,
+  mod/groups/membership.php, mod/groups/membershipreq.php, mod/groups/new.php,
+  mod/groups/topicposts.php, mod/invitefriends/index.php,
+  mod/members/index.php, mod/messages/index.php, mod/messages/read.php,
+  mod/messages/send.php, mod/messages/sent.php, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/pages/edit.php, mod/pages/history.php,
+  mod/pages/index.php, mod/pages/new.php, mod/pages/view.php,
+  mod/pages/welcome.php, mod/pages/world.php, mod/profile/edit.php,
+  mod/profile/editicon.php, mod/profile/index.php, mod/profile/start.php,
+  mod/reportedcontent/add.php, mod/riverdashboard/index.php,
+  mod/search/index.php, mod/search/views/default/search/layout.php,
+  mod/sitepages/index.php, mod/sitepages/sitepages_functions.php,
+  mod/tagcloud/tagcloud.php, mod/thewire/add.php, mod/thewire/everyone.php,
+  mod/thewire/index.php, pages/account/forgotten_password.php,
+  pages/account/register.php, pages/dashboard/index.php,
+  pages/dashboard/latest.php, pages/entities/index.php, pages/friends/add.php,
+  pages/friends/collections.php, pages/friends/edit.php,
+  pages/friends/index.php, pages/friends/of.php, pages/settings/plugins.php,
+  pages/settings/statistics.php, pages/settings/user.php,
+  services/export/handler.php, views/default/canvas/default.php,
+  views/default/canvas/layouts/administration.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/one_column_with_sidebar.php,
+  views/default/js/initialise_elgg.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/page_elements/sidebar.php: Fixes #2640 - elgg_view_layout now
+  uses a parameter array like all the other elgg_view* functions  
+
+2010-11-11  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixes #2367: Corrected plugin hook documentation
+  to maintain that the default priority is 500 
+
+2010-11-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixes #2306: deprecated get/count/list_user_objects
+  as well as get_user_objects_by_metadata 
+
+  	* engine/lib/elgglib.php: Using max() to give priority a minimum value of 0
+  for plugin hooks 
+
+  	* actions/login.php, actions/plugins/settings/save.php,
+  actions/register.php, actions/usersettings/save.php,
+  documentation/examples/events/advanced.php,
+  documentation/examples/events/all.php,
+  documentation/examples/events/basic.php,
+  documentation/examples/events/emit.php,
+  documentation/examples/hooks/basic.php,
+  documentation/examples/hooks/register/advanced.php,
+  documentation/examples/hooks/register/all.php,
+  documentation/examples/hooks/register/basic.php,
+  documentation/examples/hooks/register/emit.php,
+  documentation/examples/hooks/trigger/advanced.php,
+  documentation/examples/hooks/trigger/basic.php,
+  documentation/stubs/config.php, engine/classes/ElggSession.php,
+  engine/classes/ElggSite.php, engine/handlers/cron_handler.php,
+  engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/api.php, engine/lib/configuration.php,
+  engine/lib/cron.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/filestore.php, engine/lib/group.php, engine/lib/input.php,
+  engine/lib/location.php, engine/lib/metadata.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/output.php,
+  engine/lib/pageowner.php, engine/lib/plugins.php,
+  engine/lib/relationships.php, engine/lib/sessions.php, engine/lib/sites.php,
+  engine/lib/statistics.php, engine/lib/system_log.php, engine/lib/users.php,
+  engine/lib/usersettings.php, engine/lib/version.php, engine/lib/views.php,
+  engine/lib/widgets.php, engine/start.php, engine/tests/suite.php,
+  engine/tests/test_skeleton.php, index.php, install/ElggInstaller.php,
+  mod/blog/start.php, mod/bookmarks/start.php, mod/captcha/start.php,
+  mod/categories/start.php, mod/crontrigger/start.php,
+  mod/defaultwidgets/start.php, mod/diagnostics/actions/download.php,
+  mod/diagnostics/start.php, mod/ecml/ecml_functions.php, mod/ecml/start.php,
+  mod/embed/start.php, mod/embed/views/default/embed/embed.php,
+  mod/file/start.php, mod/friends/start.php, mod/garbagecollector/start.php,
+  mod/groups/start.php, mod/htmlawed/start.php, mod/invitefriends/start.php,
+  mod/logbrowser/start.php, mod/logrotate/start.php, mod/members/index.php,
+  mod/members/start.php, mod/messageboard/start.php, mod/messages/start.php,
+  mod/notifications/start.php, mod/pages/start.php,
+  mod/profile/actions/edit.php, mod/profile/actions/iconupload.php,
+  mod/profile/start.php, mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/start.php,
+  mod/riverdashboard/start.php, mod/search/index.php, mod/search/start.php,
+  mod/sitepages/start.php, mod/tagcloud/start.php, mod/thewire/start.php,
+  mod/tinymce/start.php, mod/twitter/start.php,
+  mod/uservalidationbyemail/start.php, mod/zaudio/start.php,
+  services/api/rest_api.php, services/export/handler.php,
+  views/default/page_elements/owner_block.php: Fixes #2367: With fear and
+  trepidation, converting events/plugin hooks to use elgg_ prefixed versions 
+
+  	* engine/lib/views.php: Refs #2124: Removed js, page_owner, and
+  page_owner_user variables from $vars 
+
+  	* engine/lib/views.php: Refs #2124: Removed session variables from $vars 
+
+2010-11-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/register.php: Refs #866 - registration uses
+  https if configured for login  
+
+2010-11-10  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/login_box.php: No sense in calling
+  elgg_get_site_url() twice here... 
+
+  	* views/default/account/login_box.php: Prevent "https login" from breaking
+  login on sites that are https by default 
+
+2010-11-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php: Refs #2609 - added fix to trunk  
+
+  	* views/default/annotation/default.php: Refs #2626 - adds default annotation
+  view to trunk  
+
+  	* engine/lib/metadata.php: Refs #2632 - cleaned up documentation on metadata
+   
+
+  	* engine/lib/elgglib.php, engine/lib/users.php, index.php,
+  mod/sitepages/start.php, views/default/account/forms/login.php,
+  views/default/account/forms/login_dropdown.php,
+  .../default/account/forms/login_walled_garden.php,
+  views/default/account/login_box.php,
+  views/default/account/login_dropdown.php,
+  views/default/account/login_walled_garden.php, views/default/css.php,
+  views/default/css_ie.php, views/default/page_elements/header.php: Refs #2506
+  reorged the login box views - css still needs to be cleaned up  
+
+  	* mod/diagnostics/index.php, mod/members/index.php, mod/search/index.php,
+  mod/sitepages/sitepages_functions.php,
+  views/default/canvas/layouts/administration.php,
+  .../canvas/layouts/one_column_with_sidebar.php,
+  views/default/page_elements/content.php,
+  views/default/page_elements/elgg_content.php,
+  views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/elgg_header.php,
+  views/default/page_elements/elgg_header_logo.php,
+  views/default/page_elements/elgg_sidebar.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/elgg_topbar_logout.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_logo.php,
+  views/default/page_elements/sidebar.php,
+  views/default/page_elements/topbar.php,
+  views/default/page_elements/topbar_logout.php,
+  views/default/page_shells/admin.php, views/default/page_shells/default.php:
+  Fixes #2631 removes 'elgg_' namespace from the page element views - anyone
+  working with the trunk will need to update their theme and/or flush their
+  cache  
+
+2010-11-09  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/tests/ElggLibTest.js: Renamed test method appropriately.  jslinted
+  ElggLibTest. 
+
+  	* js/tests/ElggEventsTest.js: Using nullFunction + abstractMethod reference
+  instead of new closures in EventsTest 
+
+  	* js/tests/ElggAjaxOptionsTest.js: Using nullFunction reference instead of
+  new closure in ajaxOptionsTest 
+
+  	* js/lib/ui.widgets.js: jslinted ui.widgets.js 
+
+  	* js/lib/ui.js: jslinted ui.js 
+
+  	* js/lib/session.js: jsLinted session.js, employed elgg type-checker
+  functions, and did some more miscellaneous cleanup 
+
+  	* js/lib/elgglib.js: Added elgg.isNumber type-checking function 
+
+  	* js/lib/security.js: jsLinted security.js + using elgg typecheckers rather
+  than === 
+
+  	* js/lib/languages.js: jslinted languages.js 
+
+  	* js/lib/elgglib.js: Abstract methods are no longer nameable 
+
+2010-11-07  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ajax.js: Various tweaks to coding style + comments (apologies for
+  my schizo here... trying to experiment to see what works).  Using
+  type-checking helpers rather than raw typeof and === checks 
+
+  	* js/lib/elgglib.js: Addition of type-checking helper functions, various
+  tweaks to comments, code style, etc. 
+
+2010-11-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggDiskFilestore.php: replaced usages of
+  make_file_matrix() with new method makeFileMatrix()  
+
+  	* views/default/css.php: added text color for warnings otherwise warnings
+  that occur in topbar end up blank  
+
+  	* engine/lib/entities.php, engine/lib/private_settings.php,
+  engine/start.php, install/ElggInstaller.php: pulled private settings out into
+  a separate lib  
+
+  	* engine/lib/relationships.php: Refs #1411 fixes bug introduced in [7213]
+  that broke listing relationships  
+
+2010-11-06  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* js/lib/ajax.js: jsLinted ajax.js, removed experimental functions 
+
+2010-11-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php: removed hacked in link to conversations
+  plugin in riverdashboard 
+
+2010-11-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* COPYRIGHT.txt, README.txt: small tweaks to the readme and copyright pages 
+
+2010-11-04  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/output.php, engine/tests/api/helpers.php: Fixes #2463: Added
+  support for forwarding to root-level files, e.g. forward('install.php') 
+
+2010-11-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/output.php: Refs #2463 Added trim for leading /s to avoid //s
+  when passing elgg_normalize_url('/mod/some/file.php').  
+
+2010-11-04  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/output.php, engine/tests/api/helpers.php: Fixes #2463: Added ^
+  to beginning of normalize_url regex to prevent matching on urls like
+  mod/plugin/page.php.  Added unit tests to verify functionality. 
+
+  	* engine/lib/elgglib.php: Added @deprecated docblock tag to events() 
+
+  	* engine/tests/objects/objects.php: Removed requirement that object
+  container be a group 
+
+2010-11-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/views.php,
+  views/default/friends/picker.php, views/default/page_elements/html_begin.php:
+  Fixes #2210 - using new functions for registering the core js and css files  
+
+2010-11-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php: Moved list_entities_groups
+  to groups.php and deprecated in favor of elgg_list_entities 
+
+2010-11-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/river/create.php: Fixed missing ).  
+
+  	* COPYRIGHT.txt: Added myself to the copyright.  
+
+  	* mod/blog/start.php, mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/object/blog.php,
+  .../views/default/river/object/blog/create.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  .../default/river/object/bookmarks/create.php, mod/categories/listing.php,
+  mod/categories/start.php, mod/diagnostics/actions/download.php,
+  mod/diagnostics/start.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/search.php, mod/file/start.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/river/object/file/create.php,
+  mod/garbagecollector/start.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/invite.php, mod/groups/actions/joinrequest.php,
+  mod/groups/activity.php, mod/groups/all.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../river/object/groupforumtopic/annotate.php,
+  .../river/object/groupforumtopic/create.php,
+  .../river/object/groupforumtopic/update.php,
+  .../default/river/relationship/member/create.php,
+  mod/invitefriends/actions/invite.php,
+  .../views/default/invitefriends/formitems.php, mod/members/index.php,
+  mod/messageboard/index.php, mod/messageboard/start.php,
+  .../default/river/object/messageboard/create.php, mod/messages/index.php,
+  mod/messages/read.php, mod/messages/send.php, mod/messages/sent.php,
+  mod/messages/start.php, mod/pages/history.php, mod/pages/index.php,
+  mod/pages/new.php, mod/pages/start.php, mod/pages/view.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/annotate.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/page/update.php,
+  .../default/river/object/page_top/annotate.php,
+  .../views/default/river/object/page_top/create.php,
+  .../views/default/river/object/page_top/update.php, mod/pages/welcome.php,
+  mod/pages/world.php, mod/profile/actions/addcomment.php,
+  mod/profile/actions/edit.php,
+  .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/welcome.php, mod/search/index.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/startblurb.php,
+  mod/search/views/rss/search/comments/entity.php, mod/tagcloud/tagcloud.php,
+  mod/thewire/index.php, mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/rss/object/thewire.php,
+  .../views/rss/search/object/thewire/entity.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  .../uservalidationbyemail/unvalidated_user.php: Fixes #1320: Bundled mods use
+  elgg_echo()'s internal string substitution.  
+
+2010-11-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Refs #2351: deprecated get_objects_in_group() in
+  favor of elgg_get_entities().  There's nothing the former can do that the
+  latter can't, so it's not worth maintaining. 
+
+2010-11-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, actions/admin/user/delete.php,
+  actions/admin/user/resetpassword.php, actions/comments/add.php,
+  actions/entities/delete.php, actions/friends/add.php,
+  actions/friends/remove.php, actions/likes/add.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, engine/classes/ElggAnnotation.php,
+  engine/classes/ElggDiskFilestore.php, engine/classes/ElggExtender.php,
+  engine/classes/ElggFile.php, engine/classes/ElggFileCache.php,
+  engine/classes/ElggGroup.php, engine/classes/ElggMemcache.php,
+  engine/classes/ElggMetadata.php, engine/classes/ElggObject.php,
+  engine/classes/ElggRelationship.php, engine/classes/ElggSite.php,
+  engine/classes/ElggUser.php, engine/handlers/cron_handler.php,
+  engine/lib/actions.php, engine/lib/api.php, engine/lib/cron.php,
+  engine/lib/database.php, engine/lib/entities.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/group.php, engine/lib/notification.php,
+  engine/lib/objects.php, engine/lib/output.php, engine/lib/plugins.php,
+  engine/lib/relationships.php, engine/lib/sites.php, engine/lib/users.php,
+  engine/lib/xml-rpc.php, index.php, install/ElggInstaller.php,
+  install/ElggRewriteTester.php, languages/en.php, pages/friends/index.php,
+  pages/friends/of.php, services/export/handler.php,
+  views/default/admin/plugins/simple.php,
+  views/default/annotation/annotate.php,
+  views/default/friends/river/create.php,
+  views/default/group/search/startblurb.php, views/default/object/default.php,
+  views/default/user/search/startblurb.php: Refs #1320. Updated core to use
+  elgg_echo()'s native string replacement.  
+
+  	* engine/lib/languages.php: Refs #1320: elgg_echo() has built-in sprintf
+  support.  
+
+  	* mod/groups/views/default/groups/find.php: Refs #2582. Merged [7224] to
+  trunk.  
+
+2010-11-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, mod/blog/views/default/object/blog.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/object/file/embedlist.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/widgets/filerepo/view.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../views/default/groups/invitationrequests.php,
+  mod/groups/views/default/groups/members.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/widgets/a_users_groups/view.php,
+  .../views/default/admin/overview/logbrowser.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/view.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../views/default/profile/profile_ownerblock.php,
+  .../views/default/reportedcontent/listing.php,
+  mod/riverdashboard/endpoint/get_comments.php,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/entity.php,
+  .../views/default/canvas/layouts/frontpage.php,
+  mod/sitepages/views/default/sitepages/members.php,
+  mod/sitepages/views/default/sitepages/sidebar.php,
+  mod/sitepages/views/default/sitepages/welcome.php,
+  mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  .../default/account/forms/login_walled_garden.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/annotation/likes.php,
+  views/default/canvas/layouts/administration.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/one_column_with_sidebar.php, views/default/css.php,
+  views/default/css_ie.php, views/default/entities/entity_listing.php,
+  views/default/entities/gallery_listing.php, views/default/friends/picker.php,
+  views/default/likes/forms/edit.php, views/default/navigation/pagination.php,
+  views/default/navigation/site_nav.php, views/default/output/rss_view.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_shells/walled_garden.php: Fixes #2440: Converted
+  clearfloat to clearfix, brought back orig clearfloat 
+
+  	* engine/lib/entities.php: Refs #2050: Added missing docblock parameters 
+
+  	* engine/classes/ElggEntity.php, engine/lib/entities.php: Fixes #2050: Added
+  subtype parameter to can_write_to_container functions and hooks 
+
+  	* engine/lib/entities.php: Set return type of get_entity to ElggEntity 
+
+  	* engine/classes/ElggEntity.php, engine/classes/ElggObject.php: Fixes #2134:
+  Moved getContainerEntity() method to ElggEntity 
+
+  	* engine/lib/group.php: Refs #1411: Deprecated
+  get_entities_from_metadata_groups(_multi) in favor of
+  elgg_get_entities_from_metadata.  Added proper deprecation for
+  delete_group_entity.  Unsure of version deprecated -- set to 1.6 
+
+  	* engine/lib/access.php: bah! forgot to rename all variables in
+  list_entities_from_access_id 
+
+  	* engine/lib/access.php: Fixed regression in deprecated
+  list_entities_from_access_id -- was passing access_id as 'collection_id'
+  instead of 'access_id' 
+
+2010-11-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/api.php, engine/lib/navigation.php,
+  engine/lib/users.php, engine/lib/usersettings.php, engine/lib/views.php,
+  engine/lib/widgets.php, engine/tests/ui/submenu.php, index.php,
+  mod/bookmarks/start.php, .../default/river/object/bookmarks/create.php,
+  mod/categories/listing.php, .../views/default/defaultwidgets/editor.php,
+  mod/diagnostics/index.php, mod/diagnostics/start.php, mod/ecml/start.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/search.php,
+  mod/file/start.php, mod/file/views/default/object/file.php,
+  mod/file/world.php, mod/groups/all.php, mod/groups/forum.php,
+  mod/groups/groupprofile.php, mod/groups/index.php, mod/groups/membership.php,
+  mod/groups/start.php, .../views/default/object/groupforumtopic.php,
+  mod/invitefriends/index.php, mod/invitefriends/start.php,
+  mod/members/index.php, mod/messages/start.php, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/notifications/start.php,
+  mod/pages/actions/pages/edit.php, mod/pages/index.php, mod/pages/start.php,
+  mod/pages/view.php, mod/pages/world.php, mod/profile/edit.php,
+  mod/profile/editicon.php, mod/profile/start.php,
+  mod/riverdashboard/index.php, .../views/default/river/item/wrapper.php,
+  mod/sitepages/index.php, mod/sitepages/start.php,
+  mod/sitepages/views/default/sitepages/metatags.php,
+  .../views/default/widgets/tagcloud/view.php, mod/thewire/start.php,
+  mod/uservalidationbyemail/start.php, pages/dashboard/index.php,
+  pages/dashboard/latest.php, pages/entities/index.php,
+  pages/entities/list.php, views/default/admin/overview/online.php,
+  views/default/admin/users/online.php, views/default/annotation/annotate.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/site_nav.php, views/default/output/tagcloud.php,
+  views/default/page_elements/content_header.php,
+  views/default/widgets/editwrapper.php: Fixes #2128 - replaces all uses of
+  set_context() and get_context() in core and plugins  
+
+2010-11-03  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: Fixes #2151: Replaced elgg_get_viewtype()
+  implementation with @cash's much simpler version 
+
+  	* engine/lib/annotations.php, engine/lib/relationships.php: Refs #1411:
+  Deprecated list_entities_from_relationship() in favor of
+  elgg_list_entities_from_relationship() 
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/entities.php, engine/lib/metadata.php: Fixes #2606: Abstracted
+  elgg_list_entities.  Takes an optional second argument for the 'getter',
+  defaulting to 'elgg_get_entities'.  Converted current elgg_list_entities*
+  functions to use it 
+
+  	* README.txt: Added .txt for consistency 
+
+2010-11-02  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/xml-rpc_handler.php, engine/lib/admin.php,
+  engine/lib/api.php, engine/lib/elgglib.php, engine/lib/tags.php,
+  engine/lib/users.php, engine/lib/xml-rpc.php, engine/tests/ui/submenu.php,
+  index.php, install/ElggInstaller.php, mod/blog/start.php,
+  mod/bookmarks/bookmarklet.php, mod/bookmarks/start.php,
+  mod/categories/listing.php, mod/diagnostics/index.php, mod/ecml/start.php,
+  mod/file/edit.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/search.php, mod/file/upload.php, mod/file/world.php,
+  mod/groups/activity.php, mod/groups/addtopic.php, mod/groups/all.php,
+  mod/groups/edit.php, mod/groups/edittopic.php, mod/groups/forum.php,
+  mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invitations.php, mod/groups/invite.php, mod/groups/membership.php,
+  mod/groups/membershipreq.php, mod/groups/new.php, mod/groups/topicposts.php,
+  mod/invitefriends/index.php, mod/members/index.php,
+  mod/messageboard/history.php, mod/messageboard/index.php,
+  mod/messages/index.php, mod/messages/read.php, mod/messages/send.php,
+  mod/messages/sent.php, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/pages/edit.php, mod/pages/history.php,
+  mod/pages/index.php, mod/pages/new.php, mod/pages/view.php,
+  mod/pages/welcome.php, mod/pages/world.php, mod/profile/edit.php,
+  mod/profile/editicon.php, mod/profile/index.php, mod/profile/start.php,
+  mod/reportedcontent/add.php, mod/riverdashboard/index.php,
+  mod/search/index.php, mod/sitepages/index.php, mod/sitepages/start.php,
+  mod/tagcloud/tagcloud.php, mod/thewire/add.php, mod/thewire/everyone.php,
+  mod/thewire/index.php, pages/account/forgotten_password.php,
+  pages/account/register.php, pages/dashboard/index.php,
+  pages/dashboard/latest.php, pages/entities/index.php,
+  pages/entities/list.php, pages/friends/add.php,
+  pages/friends/collections.php, pages/friends/edit.php,
+  pages/friends/index.php, pages/friends/of.php, pages/settings/plugins.php,
+  pages/settings/statistics.php, pages/settings/user.php,
+  services/api/rest_api.php, services/export/handler.php: Fixes #2360:
+  page_draw => elgg_view_page in core + bundled plugins 
+
+  	* documentation/examples/hooks/basic.php,
+  documentation/examples/hooks/register/all.php,
+  documentation/examples/hooks/register/emit.php: Fixed several typos in
+  documentation examples 
+
+  	* documentation/examples/hooks/register/advanced.php, engine/lib/views.php:
+  Refs #2360: Deprecated page_draw in favor of elgg_view_page.  Updated
+  packaged documentation to reflect this. 
+
+  	* engine/lib/elgglib.php, engine/tests/api/helpers.php: Added url
+  normalization support to elgg_register_js and elgg_register_css 
+
+  	* documentation/examples/hooks/register/advanced.php,
+  documentation/examples/hooks/register/basic.php: Corrected a couple typos in
+  the documentation that are being registered as php errors 
+
+  	* .../default/messageboard/messageboard_content.php, mod/messages/start.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/view.php, mod/pages/history.php,
+  mod/pages/new.php, mod/pages/start.php, mod/pages/view.php,
+  mod/pages/welcome.php, mod/profile/start.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  .../views/default/riverdashboard/sitemessage.php, mod/sitepages/start.php,
+  mod/thewire/start.php, mod/thewire/views/default/object/thewire.php,
+  .../uservalidationbyemail/unvalidated_user.php: Fixes #2463: Removed
+  gratuitous references to $CONFIG->url, etc. from the rest of the plugins. 
+
+  	* mod/blog/start.php, mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php, mod/bookmarks/start.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/diagnostics/forms/download.php, mod/file/start.php,
+  mod/file/views/default/object/file.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/join.php, mod/groups/all.php, mod/groups/index.php,
+  mod/groups/membership.php, mod/groups/start.php,
+  mod/groups/views/default/forum/maintopic.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  .../views/default/object/groupforumtopic.php: Refs #2463: Removed gratuitous
+  references to $CONFIG->url, etc. in blog - groups plugins 
+
+  	* engine/lib/actions.php, engine/lib/entities.php, engine/lib/extender.php:
+  Refs #2463: Added URL normalization support for entity and extender url
+  handlers 
+
+  	* views/default/page_elements/content_header.php: Refs #2463:
+  page_elements/content_header normalizes 'new_link' 
+
+  	* engine/lib/entities.php: Refs #2463: Fixed typo of elgg_normalize_url
+  function 
+
+  	* engine/classes/ElggSite.php, engine/lib/actions.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/navigation.php,
+  engine/lib/views.php, engine/tests/ui/submenu.php, install/ElggInstaller.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/likes.php, views/default/friends/collection.php,
+  views/default/object/default.php,
+  views/default/page_elements/content_header.php,
+  views/default/page_elements/elgg_topbar_logout.php: Refs #2463: Removed some
+  more instances of $CONFIG->url.  Added support for elgg_normalize_url to
+  elgg_add_action_tokens_to_url 
+
+  	* engine/lib/output.php, views/default/output/confirmlink.php,
+  views/default/output/url.php: Refs #2463: Added url normalization support to
+  output/url, output/confirmlink.  Enhanced normalization to take care of urls
+  like "example.com" 
+
+  	* engine/lib/admin.php, engine/lib/users.php, mod/bookmarks/start.php,
+  mod/diagnostics/start.php, .../views/default/diagnostics/runalltests.php,
+  mod/file/views/default/file/embed_upload.php, mod/groups/start.php,
+  mod/invitefriends/start.php, .../views/default/invitefriends/form.php,
+  mod/logbrowser/views/default/logbrowser/form.php, mod/messages/start.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/notifications/groups.php, mod/notifications/start.php,
+  .../default/notifications/subscriptions/form.php, mod/pages/index.php,
+  mod/pages/start.php, mod/pages/view.php, mod/pages/world.php,
+  mod/profile/start.php, .../default/admin/appearance/defaultprofile.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/admin/users/unvalidated.php,
+  views/default/account/forms/forgotten_password.php,
+  .../default/account/forms/login_walled_garden.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugins/simple.php,
+  views/default/comments/forms/edit.php, views/default/friends/forms/edit.php,
+  views/default/object/plugin.php, views/default/usersettings/form.php,
+  views/default/widgets/editwrapper.php: Refs #2463: Removed many more
+  graituitous calls to elgg_get_site_url(), $CONFIG->url, etc. 
+
+  	* views/default/input/form.php: Refs #2463: input/form now normalizes the
+  action parameter 
+
+  	* engine/lib/output.php: Refs #2463: Removed stay { that was causing the
+  regexp to break 
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/groups/start.php, mod/pages/start.php, mod/riverdashboard/start.php,
+  mod/thewire/start.php: Refs #2463: Removed some gratuitous calls to
+  elgg_get_site_url() from core plugins 
+
+  	* engine/lib/elgglib.php, engine/lib/navigation.php, engine/lib/output.php:
+  Refs #2463: Added elgg_normalize_url.  forward() and add_menu() make use of
+  it 
+
+  	* actions/admin/menu_items.php, actions/admin/plugins/disable.php,
+  actions/admin/plugins/disableall.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/enableall.php, actions/admin/plugins/reorder.php,
+  actions/admin/plugins/simple_update_states.php,
+  actions/admin/site/update_advanced.php, actions/admin/site/update_basic.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  actions/admin/user/resetpassword.php, actions/admin/user/unban.php,
+  actions/comments/add.php, actions/comments/delete.php,
+  actions/email/save.php, actions/entities/delete.php, actions/friends/add.php,
+  actions/friends/remove.php, actions/import/opendd.php, actions/likes/add.php,
+  actions/likes/delete.php, actions/login.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/user/name.php, actions/useradd.php, actions/usersettings/save.php,
+  actions/widgets/add.php, actions/widgets/reorder.php,
+  actions/widgets/save.php, mod/blog/actions/blog/delete.php,
+  mod/blog/start.php, mod/bookmarks/actions/delete.php,
+  mod/categories/actions/save.php, mod/ecml/actions/save_permissions.php,
+  mod/file/actions/upload.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/edit.php, mod/groups/actions/featured.php,
+  mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/invitefriends/actions/invite.php,
+  mod/messages/actions/delete.php, mod/notifications/actions/groupsave.php,
+  mod/notifications/actions/save.php, mod/pages/actions/pages/delete.php,
+  mod/pages/actions/pages/edit.php, mod/profile/actions/addcomment.php,
+  mod/profile/actions/cropicon.php, mod/profile/actions/deletecomment.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/actions/resetdefaultprofile.php,
+  mod/sitepages/actions/edit_settings.php: Using REFERER shorthand throughout
+  core 
+
+  	* js/lib/elgglib.js: Refs #2538: Removed stray 'f' from elgg.system_messages
+  that was causing fatal error 
+
+  	* js/tests/jsTestDriver.conf, jsTestDriver.conf: Refs #2538: Moved
+  jsTestDriver.conf to js/tests/ 
+
+  	* engine/js/classes/ElggEntity.js, engine/js/classes/ElggPriorityList.js,
+  engine/js/classes/ElggUser.js, engine/js/lib/ajax.js,
+  engine/js/lib/configuration.js, engine/js/lib/elgglib.js,
+  engine/js/lib/events.js, engine/js/lib/languages.js,
+  engine/js/lib/security.js, engine/js/lib/session.js, engine/js/lib/ui.js,
+  engine/js/lib/ui.widgets.js, engine/js/tests/ElggAjaxOptionsTest.js,
+  engine/js/tests/ElggAjaxTest.js, engine/js/tests/ElggEventsTest.js,
+  engine/js/tests/ElggLanguagesTest.js, engine/js/tests/ElggLibTest.js,
+  engine/js/tests/ElggPriorityListTest.js, engine/js/tests/ElggSecurityTest.js,
+  engine/js/tests/ElggSessionTest.js, js/classes/ElggEntity.js,
+  js/classes/ElggPriorityList.js, js/classes/ElggUser.js, js/lib/ajax.js,
+  js/lib/configuration.js, js/lib/elgglib.js, js/lib/events.js,
+  js/lib/languages.js, js/lib/security.js, js/lib/session.js, js/lib/ui.js,
+  js/lib/ui.widgets.js, js/tests/ElggAjaxOptionsTest.js,
+  js/tests/ElggAjaxTest.js, js/tests/ElggEventsTest.js,
+  js/tests/ElggLanguagesTest.js, js/tests/ElggLibTest.js,
+  js/tests/ElggPriorityListTest.js, js/tests/ElggSecurityTest.js,
+  js/tests/ElggSessionTest.js, jsTestDriver.conf,
+  views/default/js/initialise_elgg.php: Refs #2538: Moved js directory to elgg
+  root. 
+
+  	* engine/js/lib/ajax.js, engine/js/lib/elgglib.js,
+  engine/js/tests/ElggLibTest.js, engine/lib/entities.php: Refs #2538: Renamed
+  elgg.extendUrl to elgg.normalize_url 
+
+  	* engine/js/lib/elgglib.js: Refs #2538: Added type checking to some more
+  core functions 
+
+  	* engine/js/classes/ElggPriorityList.js, engine/js/lib/elgglib.js,
+  engine/js/lib/events.js, engine/js/lib/languages.js,
+  engine/js/lib/security.js, engine/js/lib/ui.js, engine/js/lib/ui.widgets.js,
+  engine/js/tests/ElggEventsTest.js, engine/js/tests/ElggLibTest.js,
+  engine/js/tests/ElggPriorityListTest.js,
+  views/default/js/initialise_elgg.php: Refs #2538: Added Elggy event system. 
+  Javascript boot sequence mimics PHP. 
+
+2010-11-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/js/lib/elgglib.js, views/default/css.php,
+  views/default/messages/errors/list.php, views/default/messages/list.php,
+  views/default/messages/messages/list.php: Fixes #2318: Adjusted system
+  message markup + styles to work with ajax actions 
+
+  	* engine/lib/actions.php: Refs #2538: Pulled in support for ajax actions 
+
+  	* actions/security/refreshtoken.php, engine/js/classes/ElggEntity.js,
+  engine/js/classes/ElggUser.js, engine/js/lib/elgglib.js,
+  engine/js/lib/languages.js, engine/js/tests/ElggLibTest.js,
+  jsTestDriver.conf, views/default/js/initialise_elgg.php,
+  views/default/js/languages.php, views/default/js/languages/en.php,
+  views/default/page_elements/html_begin.php,
+  views/default/page_elements/html_begin_admin.php,
+  views/default/scripts/initialize_elgg.php: Refs #2538: Added some models,
+  inheritance, more bootstrapping code 
+
+  	* engine/js/classes/ElggUser.js, engine/js/lib/elgglib.js,
+  engine/js/lib/languages.js, engine/js/lib/session.js,
+  engine/js/tests/ElggLanguagesTest.js: Refs #2538: Pulled in some i18n
+  features 
+
+  	* engine/js/tests/ElggAjaxOptionsTest.js, engine/js/tests/ElggLibTest.js,
+  engine/js/tests/ElggSecurityTest.js: Commented some js Test files 
+
+  	* jsTestDriver.conf: Switched jsTestDriver.conf to use default jsTestDriver
+  port 
+
+2010-11-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggSite.php: Fixes #2603: Corrected is_public_page() to
+  isPublicPage().  
+
+2010-11-01  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/js/lib/ajax.js, engine/js/lib/configuration.js,
+  engine/js/lib/elgglib.js, engine/js/lib/security.js,
+  engine/js/lib/session.js, engine/js/lib/ui.js, engine/js/lib/ui.widgets.js,
+  engine/js/tests/ElggAjaxOptionsTest.js, engine/js/tests/ElggAjaxTest.js,
+  engine/js/tests/ElggLibTest.js, engine/js/tests/ElggSecurityTest.js,
+  engine/js/tests/ElggSessionTest.js, jsTestDriver.conf: Refs #2538: Pulled in
+  elgg JS object and unit tests 
+
+2010-10-31  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php: Refs #2597: Pushed getOwner and
+  getOwnerEntity into ElggEntity and ElggExtender 
+
+  	* engine/classes/ElggData.php, engine/classes/Loggable.php: Refs #2597:
+  Deprecated Loggable::getObjectOwnerGUID() 
+
+2010-10-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Refs #2210 - added functions for managing
+  javascript and css files  
+
+  	* engine/tests/regression/trac_bugs.php: Fixed bug in regression test for
+  upscaling turned off  
+
+  	* engine/tests/objects/sites.php, engine/tests/objects/users.php: Fixes for
+  [7165] - entity variable changed  
+
+  	* engine/tests/objects/filestore.php: updated unit test for file matrix to
+  reflect updates in directory structure and class method names  
+
+  	* engine/tests/objects/entities.php, engine/tests/objects/objects.php,
+  engine/tests/objects/sites.php, engine/tests/objects/users.php: Refs #2597 -
+  fixes some unit tests broken in the reorg of the data models  
+
+  	* engine/tests/suite.php: Unit tests with the system log turned on are too
+  slow  
+
+2010-10-31  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggData.php,
+  engine/classes/ElggEntity.php, engine/classes/ElggMetadata.php,
+  engine/classes/ElggRelationship.php: Refs #2597: Pulled __set, __get, __isset
+  magic functions definitions into ElggData 
+
+  	* engine/classes/ElggEntity.php: Refs #2597: Auto-initialize temp_metadata,
+  temp_annotations, and volatile as arrays 
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggRelationship.php: Refs
+  #2597: Moved "implements Exportable" up to {{{ElggData}}} 
+
+  	* engine/classes/ElggEntity.php: Refs #2597:
+  ElggEntity::initializeAttributes calls into parent initializeAttributes() 
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggData.php,
+  engine/classes/ElggEntity.php, engine/classes/ElggExtender.php,
+  engine/classes/ElggMetadata.php, engine/classes/ElggRelationship.php:
+  Improved initializeAttributes implementations 
+
+  	* engine/classes/ElggGroup.php, engine/classes/ElggObject.php,
+  engine/classes/ElggUser.php: Refs #2597: Entity type constructors all use
+  initializeAttributes now 
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php: Refs #2597: Added getURL(),
+  getTimeCreated(), and initializeAttributes() to {{{ElggData}}} 
+
+2010-10-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php: Refs #2597: pulled getOwner and
+  getOwnerEntity functions into ElggData  I thought this would be OK even
+  though relationships don't technically have owners because ElggRelationship
+  implemented the getObectOwnerGUID method 
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggRelationship.php: Refs
+  #2597: Pulled Loggable functions with identical implementations into ElggData
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggRelationship.php: Refs
+  #2597: Pulled identical {{{Iterator}}} and {{{ArrayAccess}}} implementations
+  into {{{ElggData}}} 
+
+2010-10-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php, engine/lib/pageowner.php: Refs #2128 - added
+  stack context functions  
+
+2010-10-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggData.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggRelationship.php: Refs
+  #2597: Added a new ElggData class that ElggEntity, ElggExtender, and
+  ElggRelationship all extend 
+
+  	* views/default/page_elements/title.php: Changed get_submenu to
+  elgg_get_submenu 
+
+  	* mod/bookmarks/views/default/object/bookmarks.php,
+  mod/ecml/views/default/ecml/input_ext.php,
+  .../views/default/groups/activity_latest.php,
+  mod/groups/views/default/river/forum/create.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  .../views/default/profile/menu/adminlinks.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php:
+  Refs #2598: Converted the rest of the $vars['url'] references to
+  elgg_get_site_url() 
+
+  	* mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/captcha/views/default/input/captcha.php,
+  mod/categories/views/default/categories/view.php,
+  .../views/default/defaultwidgets/editor.php,
+  .../views/default/diagnostics/runalltests.php,
+  mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/help/blip.tv.php,
+  mod/ecml/views/default/ecml/help/dailymotion.php,
+  mod/ecml/views/default/ecml/help/googlemaps.php,
+  mod/ecml/views/default/ecml/help/livevideo.php,
+  mod/ecml/views/default/ecml/help/redlasso.php,
+  mod/ecml/views/default/ecml/help/slideshare.php,
+  mod/ecml/views/default/ecml/help/vimeo.php,
+  mod/ecml/views/default/ecml/help/youtube.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/js.php, mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/upload/content.php,
+  mod/file/views/default/file/css.php,
+  mod/file/views/default/file/embed_upload.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/icon.php,
+  .../default/file/specialcontent/audio/mid.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/x-wav.php,
+  .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/file/upload.php,
+  mod/file/views/default/object/file.php,
+  mod/file/views/default/widgets/filerepo/view.php,
+  mod/file/views/rss/object/file.php, mod/groups/actions/delete.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../views/default/groups/invitationrequests.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/groups/views/default/groups/side_menu.php,
+  .../views/default/icon/group/default/large.php,
+  .../views/default/icon/group/default/medium.php,
+  .../views/default/icon/group/default/small.php,
+  .../views/default/icon/group/default/tiny.php,
+  .../views/default/object/groupforumtopic.php,
+  .../views/default/river/forum/topic/create.php,
+  .../views/default/invitefriends/form.php,
+  .../views/default/logbrowser/adminlinks.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  .../views/default/members/members_navigation.php,
+  mod/members/views/default/members/search.php,
+  .../views/default/messageboard/css.php,
+  .../views/default/messageboard/forms/add.php,
+  .../default/messageboard/messageboard_content.php,
+  .../views/default/widgets/messageboard/view.php,
+  mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php,
+  .../views/default/notifications/css.php,
+  .../default/notifications/subscriptions/form.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../views/default/icon/object/page/medium.php,
+  mod/pages/views/default/icon/object/page/small.php,
+  .../views/default/icon/object/page_top/medium.php,
+  .../views/default/icon/object/page_top/small.php,
+  mod/pages/views/default/pages/css.php,
+  mod/pages/views/default/pages/metatags.php,
+  mod/pages/views/default/widgets/pages/view.php,
+  mod/profile/actions/cropicon.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../default/profile/editdefaultprofileitems.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/icon.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  .../views/default/profile/profile_ownerblock.php,
+  .../views/default/profile/topbar_extend.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/footer_link.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/search_box.php,
+  .../views/default/sitepages/footer_menu.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  mod/thewire/views/default/widgets/thewire/view.php,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/twitter/views/default/twitter/css.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../uservalidationbyemail/unvalidated_user.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/mpg.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/login_dropdown.php,
+  .../default/account/forms/login_walled_garden.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/plugins/simple.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/annotation/likes.php,
+  views/default/canvas/layouts/administration.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/comments/forms/edit.php, views/default/css.php,
+  views/default/dashboard/blurb.php, views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/forms/edit.php,
+  views/default/group/search/finishblurb.php,
+  views/default/input/autocomplete.php, views/default/input/userpicker.php,
+  views/default/likes/forms/edit.php, views/default/likes/forms/link.php,
+  views/default/object/default.php, views/default/object/plugin.php,
+  views/default/output/tagcloud.php, views/default/output/tags.php,
+  views/default/page_elements/content_header.php,
+  views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/elgg_header_logo.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/elgg_topbar_logout.php,
+  views/default/page_elements/html_begin.php,
+  views/default/page_elements/html_begin_admin.php,
+  views/default/page_shells/walled_garden.php,
+  views/default/settings/system.php, views/default/settings/upgrading.php,
+  views/default/user/search/finishblurb.php,
+  views/default/usersettings/form.php, views/default/widgets/editwrapper.php,
+  views/default/widgets/wrapper.php, views/foaf/page_shells/default.php,
+  views/foaf/user/default.php, views/installation/install/header.php,
+  views/installation/install/nav.php,
+  views/installation/install/pages/complete.php,
+  views/installation/page_shells/default.php: Refs #2598: Converted most
+  $vars['url'] to elgg_get_site_url() 
+
+2010-10-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: checking if the site has any groups before looping
+  over them  
+
+  	* mod/blog/blog_lib.php: fixed minor issue where blog code wasn't setting
+  type when getting subtype  
+
+2010-10-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php, engine/lib/relationships.php,
+  install/ElggInstaller.php, mod/blog/start.php,
+  mod/blog/views/default/blog/sidebar_menu.php, mod/bookmarks/start.php,
+  mod/diagnostics/index.php, mod/diagnostics/start.php,
+  mod/file/actions/save.php, mod/file/actions/upload.php, mod/file/start.php,
+  .../default/file/icon/application/default.php,
+  .../views/default/file/icon/application/excel.php,
+  .../views/default/file/icon/application/msword.php,
+  .../views/default/file/icon/application/pdf.php,
+  .../default/file/icon/application/powerpoint.php,
+  .../default/file/icon/application/vnd.ms-excel.php,
+  .../file/icon/application/vnd.ms-powerpoint.php,
+  .../application/vnd.oasis.opendocument.text.php,
+  mod/file/views/default/file/icon/archive.php,
+  mod/file/views/default/file/icon/audio.php,
+  mod/file/views/default/file/icon/default.php,
+  mod/file/views/default/file/icon/document.php,
+  .../views/default/file/icon/text/directory.php,
+  mod/file/views/default/file/icon/video.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/activity.php,
+  mod/groups/forum.php, mod/groups/start.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/start.php,
+  mod/members/index.php, mod/messageboard/start.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/messages/start.php, mod/notifications/groups.php,
+  mod/notifications/start.php, mod/pages/index.php, mod/pages/start.php,
+  mod/pages/view.php, mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/world.php, mod/profile/actions/addcomment.php,
+  mod/profile/start.php, .../default/admin/appearance/defaultprofile.php,
+  .../views/default/reportedcontent/user_report.php,
+  mod/riverdashboard/start.php, mod/search/index.php, mod/thewire/start.php,
+  views/default/page_elements/content_header.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/installation/input/button.php: Refs #2598: Converted virtually all uses
+  of $CONFIG->wwwroot to elgg_get_site_url() 
+
+2010-10-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggFile.php, engine/tests/objects/entities.php,
+  mod/blog/classes/ElggBlog.php: finished the conversion to
+  initializeAttributes()  
+
+2010-10-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixes #2598: Added elgg_get_site_url() 
+
+  	* .../admin/appearance/default_dashboard_widgets.php,
+  .../admin/appearance/default_profile_widgets.php, mod/file/search.php,
+  mod/file/world.php, mod/groups/actions/leave.php, mod/pages/world.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  mod/profile/views/default/profile/icon.php,
+  .../views/default/profile/menu/adminlinks.php, mod/thewire/index.php,
+  mod/thewire/start.php: Replaced $_SESSION['id'] and $_SESSION['guid'] with
+  get_loggedin_userid() 
+
+2010-10-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: fixed php exception and error handlers not being
+  next to each other in elgglib  
+
+  	* documentation/stubs/config.php, engine/lib/configuration.php,
+  engine/lib/database.php, engine/lib/install.php, engine/lib/sessions.php,
+  engine/lib/sites.php, engine/lib/version.php, engine/start.php: ripped out
+  last remaining tentacles of old installer from core - just needs removal of
+  install.php when elgg_view() is updated  
+
+2010-10-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/users.php, engine/lib/views.php,
+  mod/blog/views/default/blog/sidebar_menu.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/start.php, .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  .../views/default/widgets/bookmarks/view.php,
+  .../views/default/defaultwidgets/editor.php, mod/file/edit.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/search.php,
+  mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/file/upload.php, mod/file/world.php,
+  mod/groups/activity.php, mod/groups/addtopic.php, mod/groups/all.php,
+  mod/groups/edittopic.php, mod/groups/forum.php, mod/groups/index.php,
+  mod/groups/membership.php, mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  .../views/default/groups/activity_latest.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/object/groupforumtopic.php, mod/members/index.php,
+  mod/messageboard/index.php, .../views/default/messageboard/forms/add.php,
+  .../views/default/widgets/messageboard/view.php, mod/messages/send.php,
+  mod/pages/edit.php, mod/pages/history.php, mod/pages/index.php,
+  mod/pages/new.php, mod/pages/start.php, mod/pages/view.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php, mod/profile/edit.php, mod/profile/editicon.php,
+  mod/profile/icon.php, mod/profile/start.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/metatags.php,
+  .../default/profile/profile_contents/details.php,
+  .../views/default/profile/profile_ownerblock.php,
+  mod/reportedcontent/add.php, .../views/default/widgets/tagcloud/view.php,
+  mod/thewire/index.php, mod/thewire/start.php,
+  mod/thewire/views/default/widgets/thewire/view.php, pages/friends/index.php,
+  pages/friends/of.php, pages/friends/pickercallback.php,
+  pages/settings/index.php, pages/settings/plugins.php,
+  pages/settings/statistics.php, pages/settings/user.php,
+  views/default/canvas/layouts/widgets.php,
+  .../notifications/settings/usersettings.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/title.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php,
+  views/foaf/page_shells/default.php: Refs #1439: Using new page_owner
+  functions in all of core 
+
+  	* engine/lib/filestore.php, mod/bookmarks/actions/add.php,
+  mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  mod/diagnostics/actions/download.php, mod/file/actions/delete.php,
+  mod/file/actions/save.php, mod/file/world.php, mod/groups/actions/delete.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/actions/leave.php,
+  mod/groups/groupprofile.php, mod/groups/membership.php, mod/groups/start.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/side_menu.php, mod/members/index.php,
+  mod/messages/actions/delete.php, mod/messages/send.php,
+  mod/messages/sent.php, mod/messages/start.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php,
+  .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/personal.php,
+  mod/pages/actions/pages/edit.php, mod/pages/edit.php, mod/pages/new.php,
+  mod/pages/start.php, mod/pages/welcome.php, mod/pages/world.php,
+  mod/profile/actions/addcomment.php, mod/profile/actions/edit.php,
+  mod/profile/start.php, mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/icon.php,
+  .../views/default/profile/profile_ownerblock.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/add.php,
+  .../views/default/reportedcontent/form.php,
+  mod/riverdashboard/actions/add.php, mod/riverdashboard/index.php,
+  .../views/default/riverdashboard/ecml/activity.php,
+  .../views/default/riverdashboard/welcome.php, mod/thewire/index.php,
+  mod/thewire/start.php, views/default/canvas/layouts/widgets.php,
+  views/foaf/page_shells/default.php: Refs #2124: Using get_loggedin_user
+  functions instead of $vars['user'], $_SESSION['user'], etc. 
+
+  	* mod/pages/views/default/pages/breadcrumbs.php,
+  views/foaf/user/default.php: Refs #2124: Using elgg_get_page_owner instead of
+  $vars['page_owner'] in views 
+
+2010-10-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: organized functions in elgglib by purpose - more
+  or less  
+
+  	* engine/lib/elgglib.php, engine/lib/navigation.php, engine/start.php,
+  install/ElggInstaller.php: pulled navigation functions out of elgglib.php  
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php: moved datalist code
+  into the configuration lib  
+
+  	* engine/lib/plugins.php: fixed spelling mistake in comment  
+
+  	* engine/lib/cache.php, engine/lib/elgglib.php: moved file path cache
+  functions into the cache lib which seems to be a more logical location for
+  them  
+
+2010-10-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/useradd.php, engine/lib/entities.php: Fixed an invalid call to
+  get_pageowner_guid() in can_edit_entity(). Removed the call to the validation
+  function in useradd.  
+
+2010-10-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt, README.txt: Language changes for contributors and
+  readme.  
+
+2010-10-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: small readme tweak. 
+
+2010-10-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/mb_wrapper.php: Fixes #2544. Pulled out the eval() for creating
+  elgg_*() mb wrapper functions.  
+
+  	* engine/lib/filestore.php: Fixes #2150: Removed old code in filestore.  
+
+  	* CHANGES.txt, _css/css.php, _css/js.php, actions/admin/menu_items.php,
+  actions/admin/plugins/simple_update_states.php, actions/comments/add.php,
+  actions/email/save.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/editcollection.php, actions/friends/remove.php,
+  actions/likes/add.php, actions/likes/delete.php, actions/login.php,
+  actions/register.php, actions/user/language.php, actions/user/password.php,
+  actions/user/spotlight.php, actions/useradd.php,
+  actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php,
+  engine/classes/APIException.php, engine/classes/CallException.php,
+  engine/classes/ClassException.php, engine/classes/ClassNotFoundException.php,
+  engine/classes/ConfigurationException.php, engine/classes/CronException.php,
+  engine/classes/DataFormatException.php, engine/classes/DatabaseException.php,
+  engine/classes/ElggAccess.php, engine/classes/ElggAnnotation.php,
+  engine/classes/ElggCache.php, engine/classes/ElggDiskFilestore.php,
+  engine/classes/ElggEntity.php, engine/classes/ElggExtender.php,
+  engine/classes/ElggFile.php, engine/classes/ElggFileCache.php,
+  engine/classes/ElggFilestore.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggHMACCache.php, engine/classes/ElggMemcache.php,
+  engine/classes/ElggMetadata.php, engine/classes/ElggObject.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggRelationship.php,
+  engine/classes/ElggSession.php, engine/classes/ElggSharedMemoryCache.php,
+  engine/classes/ElggSite.php, engine/classes/ElggStaticVariableCache.php,
+  engine/classes/ElggUser.php, engine/classes/ElggWidget.php,
+  engine/classes/ErrorResult.php, engine/classes/ExportException.php,
+  engine/classes/Exportable.php, engine/classes/Friendable.php,
+  engine/classes/GenericResult.php, engine/classes/IOException.php,
+  engine/classes/ImportException.php, engine/classes/Importable.php,
+  engine/classes/InstallationException.php,
+  engine/classes/InvalidClassException.php,
+  engine/classes/InvalidParameterException.php, engine/classes/Locatable.php,
+  engine/classes/Loggable.php, engine/classes/NotImplementedException.php,
+  engine/classes/Notable.php, engine/classes/NotificationException.php,
+  engine/classes/ODD.php, engine/classes/ODDDocument.php,
+  engine/classes/ODDEntity.php, engine/classes/PluginException.php,
+  engine/classes/RegistrationException.php,
+  engine/classes/SecurityException.php, engine/classes/SuccessResult.php,
+  engine/classes/XMLRPCArrayParameter.php,
+  engine/classes/XMLRPCBase64Parameter.php,
+  engine/classes/XMLRPCBoolParameter.php, engine/classes/XMLRPCCall.php,
+  engine/classes/XMLRPCDateParameter.php,
+  engine/classes/XMLRPCDoubleParameter.php,
+  engine/classes/XMLRPCErrorResponse.php,
+  engine/classes/XMLRPCIntParameter.php, engine/classes/XMLRPCParameter.php,
+  engine/classes/XMLRPCResponse.php, engine/classes/XMLRPCStringParameter.php,
+  engine/classes/XMLRPCStructParameter.php,
+  engine/classes/XMLRPCSuccessResponse.php, engine/classes/XmlElement.php,
+  engine/handlers/xml-rpc_handler.php, engine/lib/access.php,
+  engine/lib/actions.php, engine/lib/admin.php, engine/lib/annotations.php,
+  engine/lib/api.php, engine/lib/calendar.php, engine/lib/configuration.php,
+  engine/lib/cron.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/filestore.php, engine/lib/group.php, engine/lib/input.php,
+  engine/lib/install.php, engine/lib/languages.php, engine/lib/location.php,
+  engine/lib/memcache.php, engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/opendd.php,
+  engine/lib/output.php, engine/lib/pagehandler.php, engine/lib/pageowner.php,
+  engine/lib/pam.php, engine/lib/plugins.php, engine/lib/relationships.php,
+  engine/lib/river.php, engine/lib/sessions.php, engine/lib/sites.php,
+  engine/lib/statistics.php, engine/lib/system_log.php, engine/lib/tags.php,
+  engine/lib/upgrades/2008100701.php, engine/lib/upgrades/2008101303.php,
+  engine/lib/upgrades/2009022701.php, engine/lib/upgrades/2009041701.php,
+  engine/lib/upgrades/2009070101.php, engine/lib/upgrades/2009102801.php,
+  engine/lib/upgrades/2010033101.php, engine/lib/upgrades/2010060401.php,
+  engine/lib/upgrades/2010061501.php, engine/lib/upgrades/2010062301.php,
+  engine/lib/upgrades/2010071001.php, engine/lib/upgrades/2010071002.php,
+  engine/lib/users.php, engine/lib/usersettings.php, engine/lib/version.php,
+  engine/lib/views.php, engine/lib/widgets.php, engine/lib/xml-rpc.php,
+  engine/lib/xml.php, engine/settings.example.php, engine/start.php, index.php,
+  install.php, install/ElggInstaller.php, install/ElggRewriteTester.php,
+  .../views/default/profile/profile_ownerblock.php,
+  pages/account/forgotten_password.php, pages/account/register.php,
+  pages/dashboard/index.php, pages/dashboard/latest.php,
+  pages/entities/index.php, pages/friends/add.php, pages/friends/edit.php,
+  pages/friends/index.php, pages/friends/of.php,
+  pages/friends/pickercallback.php, pages/settings/plugins.php,
+  services/api/rest_api.php, services/export/handler.php, simplecache/view.php,
+  upgrade.php: Standardized code in all of core, not including language files,
+  tests, or core mods.  
+
+2010-10-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt, README.txt: Updated readme to reflect the MIT license. 
+  Updated contributors to be a flat list.  
+
+2010-10-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* simplecache/view.php: Fixes #2590 - simplecache now works when simplecache
+  turned off  
+
+2010-10-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/AccessControlQueryComponent.php,
+  engine/classes/DeleteQueryTypeQueryComponent.php,
+  engine/classes/InsertQueryTypeQueryComponent.php,
+  engine/classes/JoinQueryComponent.php,
+  engine/classes/LimitOffsetQueryComponent.php,
+  engine/classes/OrderQueryComponent.php, engine/classes/Query.php,
+  engine/classes/QueryComponent.php,
+  engine/classes/QueryTypeQueryComponent.php,
+  engine/classes/SelectFieldQueryComponent.php,
+  engine/classes/SelectQueryTypeQueryComponent.php,
+  engine/classes/SetQueryComponent.php, engine/classes/SimpleQuery.php,
+  engine/classes/TableQueryComponent.php,
+  engine/classes/UpdateQueryTypeQueryComponent.php,
+  engine/classes/WhereQueryComponent.php,
+  engine/classes/WhereSetQueryComponent.php,
+  engine/classes/WhereStaticQueryComponent.php: Closes #2511.  Query object
+  classes removed.  
+
+2010-10-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* COPYRIGHT.txt, actions/admin/menu_items.php, actions/comments/add.php,
+  actions/comments/delete.php, actions/entities/delete.php,
+  actions/friends/add.php, actions/friends/addcollection.php,
+  actions/friends/deletecollection.php, actions/friends/editcollection.php,
+  actions/friends/remove.php, actions/import/opendd.php, actions/likes/add.php,
+  actions/likes/delete.php, actions/logout.php,
+  .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/spotlight.php,
+  actions/useradd.php, actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php,
+  engine/classes/ElggFile.php, engine/classes/ElggFileCache.php,
+  engine/classes/ElggFilestore.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggHMACCache.php, engine/classes/ElggMemcache.php,
+  engine/classes/ElggMetadata.php, engine/classes/ElggStaticVariableCache.php,
+  engine/classes/ErrorResult.php, engine/classes/Exportable.php,
+  engine/classes/GenericResult.php, engine/classes/IOException.php,
+  engine/classes/Importable.php,
+  engine/classes/InsertQueryTypeQueryComponent.php,
+  engine/classes/InstallationException.php,
+  engine/classes/InvalidClassException.php,
+  engine/classes/InvalidParameterException.php,
+  engine/classes/JoinQueryComponent.php,
+  engine/classes/LimitOffsetQueryComponent.php, engine/classes/Loggable.php,
+  engine/classes/NotImplementedException.php,
+  engine/classes/NotificationException.php, engine/classes/ODD.php,
+  engine/classes/ODDDocument.php, engine/classes/ODDEntity.php,
+  engine/classes/OrderQueryComponent.php, engine/classes/Query.php,
+  engine/classes/QueryComponent.php,
+  engine/classes/QueryTypeQueryComponent.php,
+  engine/classes/RegistrationException.php,
+  engine/classes/SecurityException.php,
+  engine/classes/SelectFieldQueryComponent.php,
+  engine/classes/SelectQueryTypeQueryComponent.php,
+  engine/classes/SetQueryComponent.php, engine/classes/SimpleQuery.php,
+  engine/classes/SuccessResult.php, engine/classes/TableQueryComponent.php,
+  engine/classes/UpdateQueryTypeQueryComponent.php,
+  engine/classes/WhereQueryComponent.php,
+  engine/classes/WhereSetQueryComponent.php,
+  engine/classes/WhereStaticQueryComponent.php,
+  engine/classes/XMLRPCArrayParameter.php,
+  engine/classes/XMLRPCBase64Parameter.php,
+  engine/classes/XMLRPCBoolParameter.php, engine/classes/XMLRPCCall.php,
+  engine/classes/XMLRPCDateParameter.php,
+  engine/classes/XMLRPCDoubleParameter.php,
+  engine/classes/XMLRPCErrorResponse.php,
+  engine/classes/XMLRPCIntParameter.php, engine/classes/XMLRPCParameter.php,
+  engine/classes/XMLRPCResponse.php, engine/classes/XMLRPCStringParameter.php,
+  engine/classes/XMLRPCStructParameter.php,
+  engine/classes/XMLRPCSuccessResponse.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/api.php, engine/lib/cache.php,
+  engine/lib/calendar.php, engine/lib/cron.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/filestore.php, engine/lib/group.php,
+  engine/lib/input.php, engine/lib/install.php, engine/lib/languages.php,
+  engine/lib/location.php, engine/lib/memcache.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, engine/lib/notification.php,
+  engine/lib/objects.php, engine/lib/opendd.php, engine/lib/output.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/plugins.php, engine/lib/relationships.php, engine/lib/river.php,
+  engine/lib/sessions.php, engine/lib/sites.php, engine/lib/statistics.php,
+  engine/lib/system_log.php, engine/lib/tags.php, engine/lib/users.php,
+  engine/lib/usersettings.php, engine/lib/version.php, engine/lib/widgets.php,
+  engine/lib/xml-rpc.php, engine/lib/xml.php,
+  engine/tests/api/entity_getter_functions.php, engine/tests/api/helpers.php,
+  engine/tests/objects/entities.php, engine/tests/objects/filestore.php,
+  engine/tests/objects/metadata.php, engine/tests/objects/objects.php,
+  engine/tests/objects/sites.php, engine/tests/objects/users.php,
+  engine/tests/regression/trac_bugs.php, engine/tests/services/api.php,
+  engine/tests/suite.php, engine/tests/test_skeleton.php, index.php,
+  install.php, install/ElggInstaller.php, languages/en.php,
+  mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/delete.php, mod/blog/actions/blog/save.php,
+  mod/blog/blog_lib.php, mod/blog/start.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php, mod/bookmarks/actions/add.php,
+  mod/bookmarks/actions/delete.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/start.php, .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../views/default/widgets/bookmarks/edit.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/bookmarks/views/rss/object/bookmarks.php, mod/captcha/captcha.php,
+  mod/captcha/languages/en.php, mod/captcha/start.php,
+  mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php, mod/categories/actions/save.php,
+  mod/categories/listing.php, mod/categories/start.php,
+  mod/categories/views/default/categories.php,
+  mod/categories/views/default/categories/css.php,
+  .../views/default/settings/categories/edit.php, mod/crontrigger/start.php,
+  mod/defaultwidgets/actions/update.php, mod/defaultwidgets/start.php,
+  .../admin/appearance/default_dashboard_widgets.php,
+  .../admin/appearance/default_profile_widgets.php,
+  .../views/default/defaultwidgets/editor.php,
+  mod/diagnostics/actions/download.php, mod/diagnostics/index.php,
+  mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  .../views/default/diagnostics/forms/download.php,
+  .../views/default/diagnostics/runalltests.php,
+  mod/ecml/actions/save_permissions.php, mod/ecml/ecml_functions.php,
+  mod/ecml/languages/en.php, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/help.php,
+  mod/ecml/views/default/ecml/input_ext.php,
+  mod/ecml/views/default/ecml/keywords/blip.tv.php,
+  .../views/default/ecml/keywords/dailymotion.php,
+  mod/ecml/views/default/ecml/keywords/entity.php,
+  .../views/default/ecml/keywords/googlemaps.php,
+  mod/ecml/views/default/ecml/keywords/livevideo.php,
+  mod/ecml/views/default/ecml/keywords/redlasso.php,
+  .../views/default/ecml/keywords/slideshare.php,
+  mod/ecml/views/default/ecml/keywords/user_list.php,
+  mod/ecml/views/default/ecml/keywords/vimeo.php,
+  mod/ecml/views/default/ecml/keywords/youtube.php,
+  mod/ecml/views/default/settings/ecml/edit.php, mod/embed/start.php,
+  mod/embed/views/default/embed/css.php, mod/file/actions/delete.php,
+  mod/file/actions/download.php, mod/file/actions/save.php,
+  mod/file/actions/upload.php, mod/file/download.php, mod/file/edit.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/languages/en.php,
+  mod/file/search.php, mod/file/start.php, mod/file/thumbnail.php,
+  mod/file/upload.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/file/icon.php, mod/file/views/default/file/upload.php,
+  mod/file/views/default/object/file.php, mod/file/views/rss/object/file.php,
+  mod/file/world.php, mod/friends/start.php,
+  mod/friends/views/default/widgets/friends/edit.php,
+  mod/friends/views/default/widgets/friends/view.php,
+  mod/garbagecollector/languages/en.php, mod/garbagecollector/start.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/edit.php,
+  mod/groups/actions/featured.php, mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/all.php, mod/groups/edit.php,
+  mod/groups/graphics/icon.php, mod/groups/groupprofile.php,
+  mod/groups/index.php, mod/groups/invitations.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/membership.php,
+  mod/groups/membershipreq.php, mod/groups/new.php, mod/groups/start.php,
+  mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/group/default.php,
+  .../views/default/groups/activity_latest.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  mod/groups/views/default/groups/members.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/object/groupforumtopic.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php,
+  mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/profileitems.php,
+  mod/groups/views/rss/object/groupforumtopic.php, mod/htmlawed/start.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/index.php,
+  mod/invitefriends/languages/en.php, mod/invitefriends/start.php,
+  .../views/default/invitefriends/form.php,
+  .../views/default/invitefriends/formitems.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  .../views/default/admin/overview/logbrowser.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/object/logwrapper.php,
+  mod/logrotate/languages/en.php, mod/logrotate/start.php,
+  mod/members/index.php, mod/members/languages/en.php, mod/members/start.php,
+  mod/members/views/default/members/css.php,
+  mod/members/views/default/members/search.php,
+  mod/messageboard/actions/add.php, mod/messageboard/actions/delete.php,
+  mod/messageboard/ajax_endpoint/load.php, mod/messageboard/history.php,
+  mod/messageboard/index.php, mod/messageboard/start.php,
+  .../views/default/messageboard/css.php,
+  .../views/default/messageboard/forms/add.php,
+  .../views/default/messageboard/messageboard.php,
+  .../default/messageboard/messageboard_content.php,
+  .../views/default/widgets/messageboard/edit.php,
+  .../views/default/widgets/messageboard/view.php,
+  mod/messages/actions/delete.php, mod/messages/actions/send.php,
+  mod/messages/index.php, mod/messages/languages/en.php, mod/messages/read.php,
+  mod/messages/send.php, mod/messages/sent.php, mod/messages/start.php,
+  mod/messages/views/default/messages/css.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php,
+  mod/notifications/actions/groupsave.php, mod/notifications/actions/save.php,
+  mod/notifications/groups.php, mod/notifications/index.php,
+  mod/notifications/start.php, .../views/default/notifications/css.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/groupsform.php,
+  mod/pages/actions/pages/editwelcome.php, mod/pages/history.php,
+  mod/pages/views/default/widgets/pages/view.php,
+  mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/editfield.php, mod/profile/actions/iconupload.php,
+  mod/profile/actions/reorder.php, mod/profile/actions/resetdefaultprofile.php,
+  mod/profile/edit.php, mod/profile/editicon.php, mod/profile/icon.php,
+  mod/profile/icondirect.php, mod/profile/index.php,
+  mod/profile/javascript.php, mod/profile/profile_lib.php,
+  mod/profile/start.php, .../default/admin/appearance/defaultprofile.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/listing.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/friendlinks.php,
+  mod/profile/views/default/profile/menu/links.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/sidebar.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/languages/en.php, mod/reportedcontent/start.php,
+  .../default/admin/overview/reportedcontent.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/footer_link.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/riverdashboard/ecml/activity.php,
+  .../views/default/riverdashboard/sitemessage.php, mod/search/index.php,
+  mod/search/search_hooks.php, mod/search/start.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/gallery.php,
+  .../views/default/search/gallery_listing.php,
+  mod/search/views/default/search/layout.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/startblurb.php,
+  mod/search/views/rss/search/comments/entity.php,
+  mod/search/views/rss/search/entity.php,
+  mod/search/views/rss/search/listing.php, mod/sitepages/languages/en.php,
+  mod/sitepages/sitepages_functions.php, mod/sitepages/start.php,
+  .../views/default/admin/site/sitepages.php,
+  .../views/default/sitepages/custom_frontpage.php,
+  .../views/default/sitepages/footer_menu.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  .../views/default/sitepages/keywords/sitestats.php,
+  .../views/default/sitepages/keywords/userlist.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/sitepages/views/default/sitepages/metatags.php,
+  mod/thewire/actions/add.php, mod/thewire/actions/delete.php,
+  mod/thewire/add.php, mod/thewire/everyone.php, mod/thewire/index.php,
+  mod/thewire/start.php, mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/thewire/views/default/thewire/notfound.php,
+  mod/thewire/views/default/thewire/view.php,
+  mod/thewire/views/rss/object/thewire.php,
+  .../views/rss/search/object/thewire/entity.php, mod/tinymce/start.php,
+  mod/tinymce/views/default/input/longtext.php, mod/twitter/start.php,
+  mod/twitter/views/default/twitter/css.php,
+  mod/twitter/views/default/widgets/twitter/edit.php,
+  mod/twitter/views/default/widgets/twitter/view.php, mod/zaudio/start.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/mpg.php, pages/dashboard/index.php,
+  pages/dashboard/latest.php, pages/entities/index.php,
+  pages/entities/list.php, pages/friends/add.php,
+  pages/friends/collections.php, pages/friends/edit.php,
+  pages/friends/index.php, pages/friends/of.php,
+  pages/friends/pickercallback.php, pages/settings/index.php,
+  pages/settings/plugins.php, pages/settings/statistics.php,
+  pages/settings/user.php, services/api/rest_api.php,
+  services/export/handler.php, simplecache/view.php, upgrade.php, version.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/admin/appearance/menu_items.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/overview.php,
+  views/default/admin/overview/numentities.php,
+  views/default/admin/overview/online.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/ajax/loader.php, views/default/api/output.php,
+  views/default/canvas/default.php,
+  views/default/canvas/layouts/administration.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/one_column_with_sidebar.php,
+  views/default/comments/forms/edit.php, views/default/dashboard/blurb.php,
+  views/default/entities/entity_list.php,
+  views/default/entities/entity_listing.php,
+  views/default/entities/gallery.php,
+  views/default/entities/gallery_listing.php, views/default/export/entity.php,
+  views/default/export/metadata.php, views/default/export/relationship.php,
+  views/default/friends/collection.php, views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/list.php,
+  views/default/friends/picker.php, views/default/friends/river/create.php,
+  views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php,
+  views/default/graphics/icon.php, views/default/group/default.php,
+  views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php, views/default/input/access.php,
+  views/default/input/autocomplete.php, views/default/input/button.php,
+  views/default/input/captcha.php, views/default/input/checkboxes.php,
+  views/default/input/datepicker.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/form.php,
+  views/default/input/hidden.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/reset.php, views/default/input/securitytoken.php,
+  views/default/input/submit.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/input/urlshortener.php, views/default/input/userpicker.php,
+  views/default/likes/forms/display.php, views/default/likes/forms/edit.php,
+  views/default/likes/forms/link.php, views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/breadcrumbs.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/sidebar_menu.php,
+  views/default/navigation/submenu_group.php,
+  views/default/navigation/submenu_item.php,
+  views/default/navigation/submenu_js.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/navigation/viewtype.php,
+  .../notifications/settings/usersettings.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/object/plugin.php, views/default/object/widget.php,
+  views/default/output/calendar.php, views/default/output/checkboxes.php,
+  views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/email.php, views/default/output/iframe.php,
+  views/default/output/longtext.php, views/default/output/pulldown.php,
+  views/default/output/radio.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php, views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_shells/admin.php, views/default/page_shells/default.php,
+  views/default/river/item/list.php, views/default/river/item/wrapper.php,
+  views/default/settings/system.php, views/default/settings/upgrading.php,
+  views/default/site/default.php, views/default/spotlight/default.php,
+  views/default/upload/upload_form_content.php, views/default/user/default.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php, views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/usersettings/user.php, views/default/widgets/editwrapper.php,
+  views/default/widgets/wrapper.php, views/failsafe/canvas/default.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/page_shells/default.php, views/foaf/canvas/default.php,
+  views/foaf/page_elements/contentwrapper.php,
+  views/foaf/page_shells/default.php, views/foaf/search/entity_list.php,
+  views/foaf/user/default.php, views/ical/canvas/default.php,
+  views/ical/export/entity.php, views/ical/object/default.php,
+  views/ical/pageshells/pageshell.php, views/ical/search/entity_list.php,
+  views/installation/canvas/default.php, views/installation/input/access.php,
+  views/installation/input/button.php, views/installation/input/checkboxes.php,
+  views/installation/input/form.php, views/installation/input/hidden.php,
+  views/installation/input/longtext.php, views/installation/input/password.php,
+  views/installation/input/pulldown.php, views/installation/input/reset.php,
+  views/installation/input/securitytoken.php,
+  views/installation/input/submit.php, views/installation/input/text.php,
+  views/installation/messages/errors/error.php,
+  views/installation/messages/errors/list.php,
+  views/installation/messages/list.php,
+  views/installation/messages/messages/list.php,
+  views/installation/messages/messages/message.php,
+  views/installation/page_shells/default.php, views/js/object/default.php,
+  views/js/pageshells/pageshell.php, views/js/user/default.php,
+  views/json/api/output.php, views/json/canvas/default.php,
+  views/json/export/entity.php, views/json/export/metadata.php,
+  views/json/export/relationship.php, views/json/group/default.php,
+  views/json/messages/exceptions/exception.php, views/json/object/default.php,
+  views/json/page_elements/contentwrapper.php,
+  views/json/page_shells/default.php, views/json/river/item/list.php,
+  views/json/search/entity_list.php, views/json/site/default.php,
+  views/json/user/default.php, views/opendd/canvas/default.php,
+  views/opendd/export/entity.php, views/opendd/export/metadata.php,
+  views/opendd/export/relationship.php, views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/search/entity_list.php, views/opendd/site/default.php,
+  views/opendd/user/default.php, views/php/api/output.php,
+  views/php/canvas/default.php, views/php/export/entity.php,
+  views/php/export/metadata.php, views/php/export/relationship.php,
+  views/php/group/default.php, views/php/messages/exceptions/exception.php,
+  views/php/object/default.php, views/php/page_shells/default.php,
+  views/php/search/entity_list.php, views/php/site/default.php,
+  views/php/user/default.php, views/rss/annotation/default.php,
+  views/rss/canvas/default.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/page_elements/contentwrapper.php,
+  views/rss/page_shells/default.php, views/rss/river/item/list.php,
+  views/rss/search/entity_list.php, views/rss/user/default.php,
+  views/xml/api/output.php, views/xml/messages/exceptions/exception.php,
+  views/xml/page_shells/default.php, views/xml/xml-rpc/output.php: Removed
+  @license, @copyright, and @author from files. License and copyright are
+  covered by LICENSE.txt and COPYRIGHT.txt in root.  
+
+2010-10-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* pages/entities/index.php, pages/entities/list.php: Fixes #2578 - entity
+  pages should not need call to load engine  
+
+  	* engine/lib/elgglib.php: Fixes #733 - events now support PHP callbacks  
+
+  	* engine/lib/elgglib.php: better creation of event and plugin hook
+  registration arrays  
+
+  	* engine/lib/elgglib.php: Fixes #2466 - split events() into register and
+  trigger functions  
+
+2010-10-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Refs #733 - plugin hooks now support PHP callbacks
+   
+
+2010-10-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/actions/add.php, mod/bookmarks/languages/en.php,
+  mod/bookmarks/views/default/object/bookmarks.php: Refs #2551 - merged [7051]
+  and [7053] into trunk  
+
+  	* views/default/annotation/annotate.php: Merges [7038] into trunk from 1.7
+  branch  
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php,
+  actions/admin/plugins/simple_update_states.php: Refs #2537 - merged [7026]
+  into trunk from 1.7 branch  
+
+  	* engine/lib/views.php, simplecache/view.php: Refs #2410 - merged [7024]
+  into trunk from 1.7 branch  
+
+  	* mod/profile/views/default/profile/javascript.php,
+  .../views/default/riverdashboard/js.php: Refs #2493 - merged [7008] into
+  trunk from 1.7 branch  
+
+  	* engine/classes/ElggMemcache.php: Refs #2465 - merged [7007] into trunk
+  from 1.7 branch  
+
+  	* engine/lib/filestore.php, mod/profile/actions/iconupload.php: Refs #2499 -
+  merged [6990] into trunk from 1.7 branch  
+
+  	* mod/groups/views/default/river/forum/create.php: Refs #2498 - merged
+  [6982] into trunk from 1.7 branch  
+
+  	* mod/file/start.php, mod/file/views/default/file/groupprofile_files.php:
+  Refs #2489 - manually merged [6981] from 1.7 branch to keep group file option
+  consistent across Elgg versions  
+
+  	* engine/lib/database.php: Refs #2474 - merged [6976] from 1.7 branch into
+  trunk  
+
+  	* mod/pages/actions/pages/editwelcome.php, mod/pages/index.php,
+  mod/pages/start.php, .../views/default/forms/pages/editwelcome.php,
+  mod/pages/welcome.php, mod/pages/world.php: Refs #2496 - manually merged
+  [6975] from 1.7 branch  
+
+  	* mod/pages/actions/pages/edit.php: fixed stray character that got into
+  pages edit action  
+
+  	* install/ElggInstaller.php, views/installation/install/forms/admin.php,
+  views/installation/install/forms/database.php,
+  views/installation/install/forms/settings.php: Fixes #2570 - cannot replicate
+  issue with current_page_url() so returned to using it - fixes subdirectory
+  install issue  
+
+2010-10-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/languages/en.php: added a check for
+  register globals  
+
+2010-10-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/input.php, engine/start.php: Fixes
+  #2563 - setup autoload in elgglib.php so exceptions and other classes are
+  available as soon as possible  
+
+  	* install/ElggInstaller.php: removed exceptions.php from install boot
+  loading  
+
+2010-10-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, languages/en.php: Fixes #2514 - separating action
+  error messages for undefined and no action script file  
+
+  	* engine/lib/query.php, engine/start.php, install/ElggInstaller.php: Refs
+  #2511 - removed empty query.php lib file  
+
+  	* engine/lib/elgglib.php, engine/lib/output.php, engine/lib/social.php,
+  engine/start.php, install/ElggInstaller.php: Fixes #2339 - removes social
+  library and deprecates its two functions (put it output.php for lack of a
+  better location)  
+
+  	* engine/lib/entities.php: Fixes #2403 - adds unregister_entity_type()  
+
+2010-10-14  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/exceptions.php, engine/start.php: Deprecated unnecessary
+  exceptions.php lib file 
+
+  	* mod/blog/classes/ElggBlog.php: Switching blog over to autoload method for
+  plugin classes 
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php, engine/start.php,
+  mod/blog/blog_lib.php: Fixes #2547: Plugins can now participate in
+  autoloading classes. 
+
+2010-10-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/ElggRewriteTester.php,
+  install/cli/sample_installer.php, install/languages/en.php: Fixes #2556 - one
+  step install now supported with sample cli script  
+
+2010-10-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/languages/en.php: Fixes #2312 -
+  checking value of arg_separator.output during install  
+
+  	* views/installation/input/button.php, views/installation/input/form.php,
+  views/installation/install/forms/admin.php,
+  views/installation/install/forms/database.php,
+  views/installation/install/forms/settings.php,
+  views/installation/install/forms/template.php,
+  views/installation/install/nav.php: Fixes #2522 - disabling form submission
+  after first submission  
+
+  	* install/ElggRewriteTester.php, install/languages/en.php: Fixes #2521 -
+  added check for old .htaccess  
+
+  	* install/ElggInstaller.php, install/languages/en.php, languages/en.php:
+  better handling of settings file issues during installation  
+
+  	* htaccess_dist: forgot to update rewrite rule in htaccess_dist  
+
+2010-10-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/ElggRewriteTester.php,
+  install/languages/en.php: Pulled rewrite test out into separate class  
+
+2010-10-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/start.php: Fixes #2529 for real this time.  Not
+  using made up ElggEntity attributes. Added canEdit() override for user
+  validation so it can disable users after they register.  
+
+  	* engine/lib/entities.php: Checking for a valid entity before using its
+  methods in update_entity().  
+
+  	* engine/classes/ElggEntity.php: ElggEntity::disable() and enable() now
+  update the attributes so you don't have stale data on the object.  
+
+2010-10-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, engine/settings.example.php,
+  install/ElggInstaller.php, install/languages/en.php: using config variable
+  for minimum password length  
+
+  	* install/ElggInstaller.php, install/languages/en.php: better error messages
+  when there are already Elgg database tables in the database  
+
+  	* install/ElggInstaller.php: fixed issue when settings.php is filled out
+  before installation is started  
+
+  	* engine/lib/elgglib.php, engine/lib/install.php, languages/en.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/page_shells/default.php: handling the database being down/busy
+  or an incomplete install. Also cleaned up failsafe views  
+
+  	* engine/lib/database.php: removed function replaced by installer  
+
+  	* install/ElggInstaller.php, views/installation/install/pages/complete.php:
+  finished the auto login option for the installer  
+
+2010-10-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/register.php, install/ElggInstaller.php, install/languages/en.php:
+  pulled out special exception in registration action for first admin login  
+
+2010-10-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/start.php: Fixes #2529. User validation only
+  prevents logins for disabled users to avoid conflicting with alternative
+  login plugins.  
+
+2010-10-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/languages/en.php: using new email
+  validation in installer  
+
+  	* engine/lib/input.php, engine/lib/users.php: Fixes #2161 - using
+  filter_var() in email validation and moved is_email_address() to the input
+  library  
+
+2010-10-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, install/languages/en.php,
+  views/installation/install/pages/complete.php: pulled more language strings
+  out of installer into language file  
+
+  	* _graphics/elgg_logo.png, install/css/install.css, install/install.css,
+  views/installation/install/header.php,
+  views/installation/page_shells/default.php: added Elgg logo to installer
+  screens  
+
+2010-10-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/actions/validate.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../uservalidationbyemail/unvalidated_user.php: Merged some fixes from the
+  1.7.4 backport of uservalidationbyemail.  
+
+2010-10-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, engine/lib/actions.php,
+  engine/lib/elgglib.php, engine/lib/install.php, engine/start.php,
+  install/languages/en.php, languages/en.php,
+  views/default/settings/install.php: removed several parts of the old
+  installer from the core  
+
+  	* .../messages/sanitisation/dbsettings_error.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/settings/install.php, views/failsafe/settings/system.php:
+  removed old views used in previous installer  
+
+  	* install/ElggInstaller.php, install/languages/en.php, languages/en.php,
+  views/installation/install/forms/template.php,
+  views/installation/page_shells/default.php: Pulled installation language
+  strings out of core language file into installer  
+
+2010-10-05  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2010100500.php, version.php: Creating an upgrade to
+  migrate users from old oauth to new oauth_lib plugin.  Closes #2532  
+
+  	* mod/oauth/manifest.xml, mod/oauth/start.php,
+  mod/oauth/vendors/oauth/LICENSE,
+  mod/oauth/vendors/oauth/example/server/INSTALL,
+  .../vendors/oauth/example/server/core/init.php,
+  .../example/server/core/templates/inc/footer.tpl,
+  .../example/server/core/templates/inc/header.tpl,
+  .../oauth/example/server/core/templates/index.tpl,
+  .../oauth/example/server/core/templates/logon.tpl,
+  .../example/server/core/templates/register.tpl,
+  .../vendors/oauth/example/server/www/hello.php,
+  .../vendors/oauth/example/server/www/index.php,
+  .../vendors/oauth/example/server/www/logon.php,
+  .../vendors/oauth/example/server/www/oauth.php,
+  .../vendors/oauth/example/server/www/register.php,
+  .../oauth/example/server/www/services.xrds.php,
+  mod/oauth/vendors/oauth/library/OAuthDiscovery.php,
+  mod/oauth/vendors/oauth/library/OAuthException.php,
+  mod/oauth/vendors/oauth/library/OAuthRequest.php,
+  .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  mod/oauth/vendors/oauth/library/OAuthRequester.php,
+  mod/oauth/vendors/oauth/library/OAuthServer.php,
+  mod/oauth/vendors/oauth/library/OAuthStore.php,
+  .../library/body/OAuthBodyContentDisposition.php,
+  .../library/body/OAuthBodyMultipartFormdata.php,
+  .../vendors/oauth/library/discovery/xrds_parse.php,
+  .../vendors/oauth/library/discovery/xrds_parse.txt,
+  .../OAuthSignatureMethod.class.php, .../OAuthSignatureMethod_HMAC_SHA1.php,
+  .../signature_method/OAuthSignatureMethod_MD5.php,
+  .../OAuthSignatureMethod_PLAINTEXT.php,
+  .../OAuthSignatureMethod_RSA_SHA1.php,
+  .../library/store/OAuthStoreAbstract.class.php,
+  .../oauth/library/store/OAuthStoreAnyMeta.php,
+  .../oauth/library/store/OAuthStoreMySQL.php,
+  .../vendors/oauth/library/store/mysql/install.php,
+  .../vendors/oauth/library/store/mysql/mysql.sql,
+  .../oauth/test/discovery/xrds-fireeagle.xrds,
+  .../oauth/test/discovery/xrds-getsatisfaction.xrds,
+  .../oauth/test/discovery/xrds-magnolia.xrds,
+  mod/oauth/vendors/oauth/test/oauth_test.php, mod/oauth_lib/manifest.xml,
+  mod/oauth_lib/start.php, mod/oauth_lib/vendors/oauth/LICENSE,
+  mod/oauth_lib/vendors/oauth/example/server/INSTALL,
+  .../vendors/oauth/example/server/core/init.php,
+  .../example/server/core/templates/inc/footer.tpl,
+  .../example/server/core/templates/inc/header.tpl,
+  .../oauth/example/server/core/templates/index.tpl,
+  .../oauth/example/server/core/templates/logon.tpl,
+  .../example/server/core/templates/register.tpl,
+  .../vendors/oauth/example/server/www/hello.php,
+  .../vendors/oauth/example/server/www/index.php,
+  .../vendors/oauth/example/server/www/logon.php,
+  .../vendors/oauth/example/server/www/oauth.php,
+  .../vendors/oauth/example/server/www/register.php,
+  .../oauth/example/server/www/services.xrds.php,
+  .../vendors/oauth/library/OAuthDiscovery.php,
+  .../vendors/oauth/library/OAuthException.php,
+  .../vendors/oauth/library/OAuthRequest.php,
+  .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  .../vendors/oauth/library/OAuthRequester.php,
+  .../vendors/oauth/library/OAuthServer.php,
+  mod/oauth_lib/vendors/oauth/library/OAuthStore.php,
+  .../library/body/OAuthBodyContentDisposition.php,
+  .../library/body/OAuthBodyMultipartFormdata.php,
+  .../vendors/oauth/library/discovery/xrds_parse.php,
+  .../vendors/oauth/library/discovery/xrds_parse.txt,
+  .../OAuthSignatureMethod.class.php, .../OAuthSignatureMethod_HMAC_SHA1.php,
+  .../signature_method/OAuthSignatureMethod_MD5.php,
+  .../OAuthSignatureMethod_PLAINTEXT.php,
+  .../OAuthSignatureMethod_RSA_SHA1.php,
+  .../library/store/OAuthStoreAbstract.class.php,
+  .../oauth/library/store/OAuthStoreAnyMeta.php,
+  .../oauth/library/store/OAuthStoreMySQL.php,
+  .../vendors/oauth/library/store/mysql/install.php,
+  .../vendors/oauth/library/store/mysql/mysql.sql,
+  .../oauth/test/discovery/xrds-fireeagle.xrds,
+  .../oauth/test/discovery/xrds-getsatisfaction.xrds,
+  .../oauth/test/discovery/xrds-magnolia.xrds,
+  mod/oauth_lib/vendors/oauth/test/oauth_test.php: Changing the name of the
+  oAuth plugin to reflect it's library service status.  Refs #2532  
+
+2010-10-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/install.css, views/installation/messages/errors/list.php,
+  views/installation/messages/messages/list.php: Fixes #2523 - errors get red
+  box during install  
+
+  	* install/ElggInstaller.php, views/failsafe/input/access.php,
+  views/failsafe/input/button.php, views/failsafe/input/checkboxes.php,
+  views/failsafe/input/form.php, views/failsafe/input/hidden.php,
+  views/failsafe/input/longtext.php, views/failsafe/input/password.php,
+  views/failsafe/input/pulldown.php, views/failsafe/input/reset.php,
+  views/failsafe/input/securitytoken.php, views/failsafe/input/submit.php,
+  views/failsafe/input/text.php, views/failsafe/install/footer.php,
+  views/failsafe/install/forms/admin.php,
+  views/failsafe/install/forms/database.php,
+  views/failsafe/install/forms/settings.php,
+  views/failsafe/install/forms/template.php, views/failsafe/install/header.php,
+  views/failsafe/install/nav.php, views/failsafe/install/pages/admin.php,
+  views/failsafe/install/pages/complete.php,
+  views/failsafe/install/pages/database.php,
+  views/failsafe/install/pages/requirements.php,
+  views/failsafe/install/pages/settings.php,
+  views/failsafe/install/pages/welcome.php, views/failsafe/install/sidebar.php,
+  views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php, views/failsafe/messages/list.php,
+  views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/page_shells/install.php, views/installation/input/access.php,
+  views/installation/input/button.php, views/installation/input/checkboxes.php,
+  views/installation/input/form.php, views/installation/input/hidden.php,
+  views/installation/input/longtext.php, views/installation/input/password.php,
+  views/installation/input/pulldown.php, views/installation/input/reset.php,
+  views/installation/input/securitytoken.php,
+  views/installation/input/submit.php, views/installation/input/text.php,
+  views/installation/install/footer.php,
+  views/installation/install/forms/admin.php,
+  views/installation/install/forms/database.php,
+  views/installation/install/forms/settings.php,
+  views/installation/install/forms/template.php,
+  views/installation/install/header.php, views/installation/install/nav.php,
+  views/installation/install/pages/admin.php,
+  views/installation/install/pages/complete.php,
+  views/installation/install/pages/database.php,
+  views/installation/install/pages/requirements.php,
+  views/installation/install/pages/settings.php,
+  views/installation/install/pages/welcome.php,
+  views/installation/install/sidebar.php,
+  views/installation/messages/errors/error.php,
+  views/installation/messages/errors/list.php,
+  views/installation/messages/list.php,
+  views/installation/messages/messages/list.php,
+  views/installation/messages/messages/message.php,
+  views/installation/page_shells/default.php: moved installation to its own
+  viewtype  
+
+2010-10-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/lib/functions.php,
+  .../views/default/admin/users/unvalidated.php: Using more built-in API to get
+  unvalidated users.  
+
+2010-10-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, languages/en.php: Refs #2129: Pulls some
+  strings out into elgg_echo() in new installation.  
+
+  	* languages/en.php: Refs #2129: Added missing language string for new
+  installer.  
+
+  	* htaccess_dist: Cleaned up tabs vs spaces in htaccess_dist.  
+
+  	* languages/en.php: Refs #2129: Added missing language string for new
+  installer.  
+
+2010-10-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php: uservalidationbyemail is turned on by default
+  so we need to have the first admin user validated  
+
+2010-10-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install/ElggInstaller.php, languages/en.php: Closes #2129 - installer now
+  works with web servers besides Apache - tested with nginx  
+
+2010-10-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/actions/bulk_action.php,
+  mod/uservalidationbyemail/actions/delete.php,
+  .../actions/resend_validation.php,
+  mod/uservalidationbyemail/actions/validate.php,
+  mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php,
+  .../views/default/admin/users/unvalidated.php,
+  .../uservalidationbyemail/unvalidated_user.php: Added admin page to validate,
+  resend validation requests, or delete unvalidated users.  
+
+2010-10-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login_dropdown.php: Fixes #2505 - fixes the
+  registration link on the drop down login form 
+
+2010-10-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/start.php,
+  .../default/admin/overview/reportedcontent.php: Fixed incorrect echoing of an
+  array.  
+
+  	* simplecache/view.php: Fixes #2504. Renamed $view to $view_name in
+  simplecache/view.php to avoid var name collision with engine/start.php's
+  $view.  
+
+2010-10-01  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: replacing more documentation lost in integration of
+  installer  
+
+  	* engine/settings.example.php, engine/start.php, htaccess_dist, install.php,
+  install/ElggInstaller.php, install/install.css, languages/en.php,
+  views/failsafe/input/password.php, views/failsafe/install/footer.php,
+  views/failsafe/install/forms/admin.php,
+  views/failsafe/install/forms/database.php,
+  views/failsafe/install/forms/settings.php,
+  views/failsafe/install/forms/template.php, views/failsafe/install/header.php,
+  views/failsafe/install/nav.php, views/failsafe/install/pages/admin.php,
+  views/failsafe/install/pages/complete.php,
+  views/failsafe/install/pages/database.php,
+  views/failsafe/install/pages/requirements.php,
+  views/failsafe/install/pages/settings.php,
+  views/failsafe/install/pages/welcome.php, views/failsafe/install/sidebar.php,
+  views/failsafe/page_shells/install.php: Refs #2129 - integrates new installer
+  code from http://github.com/cash/Elgg - does not work yet with non-Apache web
+  servers  
+
+2010-09-30  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, friends/add.php, friends/collections.php,
+  friends/edit.php, friends/index.php, friends/of.php,
+  friends/pickercallback.php, pages/friends/add.php,
+  pages/friends/collections.php, pages/friends/edit.php,
+  pages/friends/index.php, pages/friends/of.php,
+  pages/friends/pickercallback.php, views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php: Closes #2344 - moves friends pages
+  into pages directory  
+
+  	* engine/lib/entities.php, entities/index.php, entities/list.php,
+  mod/file/start.php, pages/entities/index.php, pages/entities/list.php: Refs
+  #2344 - moves entities directory to pages directory  
+
+  	* admin/index.php, engine/lib/admin.php, search/index.php: Refs #2344 -
+  removed unused search and admin directories  
+
+  	* engine/lib/usersettings.php, pages/settings/index.php,
+  pages/settings/plugins.php, pages/settings/statistics.php,
+  pages/settings/user.php, settings/index.php, settings/plugins.php,
+  settings/statistics.php, settings/user.php: Refs #2344 - moves settings pages
+  into the pages directory  
+
+  	* dashboard/index.php, dashboard/latest.php, engine/lib/users.php,
+  pages/dashboard/index.php, pages/dashboard/latest.php,
+  views/default/dashboard/blurb.php: Refs #2344 - moves dashboard pages into
+  pages directory  
+
+  	* account/forgotten_password.php, account/register.php,
+  engine/classes/ElggSite.php, engine/lib/users.php,
+  pages/account/forgotten_password.php, pages/account/register.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/login_dropdown.php,
+  .../default/account/forms/login_walled_garden.php: Refs #2344 - move account
+  pages into pages directory  
+
+2010-09-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/register.php,
+  actions/user/requestnewpassword.php, engine/lib/sessions.php,
+  engine/lib/users.php, languages/en.php,
+  mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/lib/functions.php,
+  mod/uservalidationbyemail/start.php: Fixes #617, #2271 User validation
+  removed from core to UserValidationByEmail plugin. Without a validation
+  plugin, users can login immediately. Fixes #2243 Removed "You have validated
+  your email" email. Users are logged in immediately after registration or
+  validating email. Refs #2409 Added register, user plugin hook that is called
+  only on self registration. Can be used to halt registration.  
+
+2010-09-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Checking for menu items before doing a foreach(). 
+
+  	* engine/lib/views.php: Checking for $CONFIG->view_type before accessing it
+  in elgg_is_valid_viewtype().  Prevents a notice during installation.  
+
+2010-09-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/save.php: Cleaned up the file docblock.  
+
+2010-09-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/save.php: Fixes #1418: Changing an email address no longer
+  invalidates an account.  
+
+  	* engine/classes/ElggUser.php: Refs #617: ElggUser:makeAdmin() and
+  removeAdmin() correctly set the attribute for unsaved users.  
+
+  	* engine/lib/api.php: Refs #2459: Merged [6927] to trunk.  
+
+  	* views/json/entities/entity_list.php: Merged [6923] to trunk.  
+
+  	* actions/register.php, languages/en.php: Refs #2454: Merged [6920] to
+  trunk.  
+
+  	* mod/profile/start.php: Merged [6905] to trunk.  
+
+  	* engine/lib/group.php: Refs #2437: Merged [6707] to trunk.  
+
+  	* mod/profile/start.php: Refs #2429: Merged [6889] to trunk.  
+
+2010-09-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/ElggObject.php, engine/classes/ElggSite.php: Refs #2450:
+  Documented ElggSite, clarified some docs on ElggObject.  
+
+2010-09-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/APIException.php,
+  engine/classes/AccessControlQueryComponent.php,
+  engine/classes/CallException.php, engine/classes/ClassException.php,
+  engine/classes/ClassNotFoundException.php,
+  engine/classes/ConfigurationException.php, engine/classes/CronException.php,
+  engine/classes/DataFormatException.php, engine/classes/DatabaseException.php,
+  engine/classes/DeleteQueryTypeQueryComponent.php,
+  engine/classes/ElggAccess.php, engine/classes/ElggAnnotation.php,
+  engine/classes/ElggCache.php, engine/classes/ElggEntity.php,
+  engine/classes/ElggExtender.php, engine/classes/ElggFileCache.php,
+  engine/classes/ElggFilestore.php, engine/classes/ElggGroup.php,
+  engine/classes/ElggHMACCache.php, engine/classes/ElggMemcache.php,
+  engine/classes/ElggMetadata.php, engine/classes/ElggObject.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggRelationship.php,
+  engine/classes/ElggSession.php, engine/classes/ElggSharedMemoryCache.php,
+  engine/classes/ElggSite.php, engine/classes/ElggStaticVariableCache.php,
+  engine/classes/ElggUser.php, engine/classes/ElggWidget.php,
+  engine/classes/ErrorResult.php, engine/classes/ExportException.php,
+  engine/classes/Exportable.php, engine/classes/GenericResult.php,
+  engine/classes/IOException.php, engine/classes/ImportException.php,
+  engine/classes/Importable.php,
+  engine/classes/InsertQueryTypeQueryComponent.php,
+  engine/classes/InstallationException.php,
+  engine/classes/InvalidClassException.php,
+  engine/classes/InvalidParameterException.php,
+  engine/classes/JoinQueryComponent.php,
+  engine/classes/LimitOffsetQueryComponent.php, engine/classes/Locatable.php,
+  engine/classes/Loggable.php, engine/classes/NotImplementedException.php,
+  engine/classes/Notable.php, engine/classes/NotificationException.php,
+  engine/classes/ODD.php, engine/classes/ODDDocument.php,
+  engine/classes/ODDEntity.php, engine/classes/OrderQueryComponent.php,
+  engine/classes/PluginException.php, engine/classes/Query.php,
+  engine/classes/QueryComponent.php,
+  engine/classes/QueryTypeQueryComponent.php,
+  engine/classes/RegistrationException.php,
+  engine/classes/SecurityException.php,
+  engine/classes/SelectFieldQueryComponent.php,
+  engine/classes/SelectQueryTypeQueryComponent.php,
+  engine/classes/SetQueryComponent.php, engine/classes/SimpleQuery.php,
+  engine/classes/SuccessResult.php, engine/classes/TableQueryComponent.php,
+  engine/classes/UpdateQueryTypeQueryComponent.php,
+  engine/classes/WhereQueryComponent.php,
+  engine/classes/WhereSetQueryComponent.php,
+  engine/classes/WhereStaticQueryComponent.php,
+  engine/classes/XMLRPCArrayParameter.php,
+  engine/classes/XMLRPCBase64Parameter.php,
+  engine/classes/XMLRPCBoolParameter.php, engine/classes/XMLRPCCall.php,
+  engine/classes/XMLRPCDateParameter.php,
+  engine/classes/XMLRPCDoubleParameter.php,
+  engine/classes/XMLRPCErrorResponse.php,
+  engine/classes/XMLRPCIntParameter.php, engine/classes/XMLRPCParameter.php,
+  engine/classes/XMLRPCResponse.php, engine/classes/XMLRPCStringParameter.php,
+  engine/classes/XMLRPCStructParameter.php,
+  engine/classes/XMLRPCSuccessResponse.php, engine/classes/XmlElement.php:
+  Converted line endings to unix.  
+
+  	* engine/classes/ElggAnnotation.php, engine/classes/ElggExtender.php,
+  engine/classes/ElggPlugin.php, engine/classes/ElggRelationship.php: Refs
+  #2450: Documented a few more classes.  
+
+  	* engine/classes/ElggObject.php: Refs #2450: Documented ElggObject.  
+
+  	* engine/classes/ElggEntity.php: Refs #2450: ElggEntity documented.  
+
+  	* engine/lib/entities.php: Refs #2450: Changed the subpackage and fixed a
+  typo.  
+
+2010-09-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/APIException.php,
+  engine/classes/AccessControlQueryComponent.php,
+  engine/classes/CallException.php, engine/classes/ClassException.php,
+  engine/classes/ClassNotFoundException.php,
+  engine/classes/ConfigurationException.php, engine/classes/CronException.php,
+  engine/classes/DataFormatException.php, engine/classes/DatabaseException.php,
+  engine/classes/DeleteQueryTypeQueryComponent.php,
+  engine/classes/ElggAccess.php, engine/classes/ElggAnnotation.php,
+  engine/classes/ElggCache.php, engine/classes/ElggDiskFilestore.php: Refs
+  #2450: Documented first bit of the classes.  
+
+  	* engine/lib/views.php: Refs #2450: Documented views.php.  
+
+2010-09-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Fixes #2479: Removed unused actions init and
+  registered "error" action.  
+
+  	* documentation/examples/actions/manual_tokens.php,
+  engine/handlers/action_handler.php, engine/lib/actions.php: Refs #2450: Added
+  documentation for actions.  
+
+2010-09-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Refs #2450: Documented access.php.  
+
+  	* engine/lib/elgglib.php: Refs #2450: Changed preferred syntax for talking
+  about hooks / events because :s are used in some names.  Now using $name,
+  $type.  
+
+  	* engine/lib/elgglib.php: Correct spaces issue in autoload function.  
+
+  	* engine/lib/entities.php: Refs #2450: Documented entities.php  
+
+2010-09-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/pagehandler.php, engine/handlers/service_handler.php,
+  engine/handlers/xml-rpc_handler.php: Refs #2450: Documented handler files.  
+
+2010-09-15  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/classes/APIException.php,
+  engine/classes/AccessControlQueryComponent.php,
+  engine/classes/CallException.php, engine/classes/ClassException.php,
+  engine/classes/ClassNotFoundException.php,
+  engine/classes/ConfigurationException.php,
+  engine/classes/DataFormatException.php, engine/classes/DatabaseException.php,
+  engine/classes/DeleteQueryTypeQueryComponent.php,
+  engine/classes/IOException.php,
+  engine/classes/InsertQueryTypeQueryComponent.php,
+  engine/classes/InstallationException.php,
+  engine/classes/InvalidClassException.php,
+  engine/classes/InvalidParameterException.php,
+  engine/classes/JoinQueryComponent.php,
+  engine/classes/LimitOffsetQueryComponent.php,
+  engine/classes/NotImplementedException.php,
+  engine/classes/NotificationException.php,
+  engine/classes/OrderQueryComponent.php, engine/classes/PluginException.php,
+  engine/classes/Query.php, engine/classes/QueryComponent.php,
+  engine/classes/QueryTypeQueryComponent.php,
+  engine/classes/RegistrationException.php,
+  engine/classes/SecurityException.php,
+  engine/classes/SelectFieldQueryComponent.php,
+  engine/classes/SelectQueryTypeQueryComponent.php,
+  engine/classes/SetQueryComponent.php, engine/classes/SimpleQuery.php,
+  engine/classes/TableQueryComponent.php,
+  engine/classes/UpdateQueryTypeQueryComponent.php,
+  engine/classes/WhereQueryComponent.php,
+  engine/classes/WhereSetQueryComponent.php,
+  engine/classes/WhereStaticQueryComponent.php, engine/lib/access.php,
+  engine/lib/actions.php, engine/lib/admin.php, engine/lib/annotations.php,
+  engine/lib/api.php, engine/lib/cache.php, engine/lib/calendar.php,
+  engine/lib/cron.php, engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/lib/exceptions.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/filestore.php, engine/lib/group.php, engine/lib/input.php,
+  engine/lib/install.php, engine/lib/location.php, engine/lib/memcache.php,
+  engine/lib/metadata.php, engine/lib/notification.php, engine/lib/objects.php,
+  engine/lib/opendd.php, engine/lib/plugins.php, engine/lib/query.php,
+  engine/lib/relationships.php, engine/lib/river.php, engine/lib/sessions.php,
+  engine/lib/sites.php, engine/lib/system_log.php, engine/lib/tags.php,
+  engine/lib/users.php, engine/lib/widgets.php, engine/lib/xml-rpc.php,
+  engine/lib/xml.php: Refs #2220: Pulled remaining classes out of lib files. 
+  Core classes now autoloaded via __autoload(). 
+
+2010-09-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/forgotten_password.php, account/register.php: Refs #2450: Updated
+  docs for account/*  
+
+  	* engine/start.php: Refs #2450: Documented engine/start.php  
+
+  	* documentation/stubs/config.php: Refs @2450: Better documentation for
+  $CONFIG->view.  
+
+  	* documentation/stubs/config.php: Refs #2450: Added config.php stub to
+  document many of the $CONFIG vars.  
+
+  	* actions/admin/menu_items.php: Removing unused
+  'menu_items_hide_toolbar_entries' config value.  
+
+  	* engine/lib/elgglib.php: Fixes #2366: Deprecated test_ip() and
+  is_ip_in_array().  
+
+  	* documentation/examples/events/advanced.php,
+  documentation/examples/events/all.php,
+  documentation/examples/events/basic.php,
+  documentation/examples/events/emit.php,
+  documentation/examples/hooks/basic.php,
+  documentation/examples/hooks/register/advanced.php,
+  documentation/examples/hooks/register/all.php,
+  documentation/examples/hooks/register/basic.php,
+  documentation/examples/hooks/register/emit.php,
+  documentation/examples/hooks/trigger/advanced.php,
+  documentation/examples/hooks/trigger/basic.php: Adding documentation and
+  examples.  
+
+  	* engine/lib/elgglib.php: Refs #2450: Added documentation to elgglib.  
+
+2010-09-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Refs #2450: Really removed the @uses and @see
+  tags.  
+
+  	* engine/lib/database.php: Refs #2450: Removing @see and @uses. Replaced NB:
+  with English phrases.  
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php,
+  actions/admin/plugins/simple_update_states.php,
+  actions/admin/site/update_advanced.php, actions/admin/site/update_basic.php,
+  actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  actions/admin/user/resetpassword.php, actions/admin/user/unban.php: Refs
+  #2450: Updated docs for core admin actions.  
+
+2010-09-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Merged get_entities() is_numeric() fix to trunk. 
+
+2010-09-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/settings.example.php: Updated settings.example.php docs  
+
+  	* engine/lib/configuration.php: Refs #2450: Documented configuration.php.  
+
+2010-09-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Refs #2450: Documentation added for database
+  functions.  
+
+  	* engine/settings.example.php: Refs #2450: Added db_disable_query_cache to
+  settings.example.php.  
+
+  	* engine/settings.example.php: Refs #2450: Documented db-related $CONFIG
+  vars.  
+
+2010-09-07  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, _css/js.php: Refs #2450: Fixed some typos in css/js
+  simplecache documentation 
+
+2010-09-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/forgotten_password.php, account/register.php: Refs #2450:
+  Documentation for account/ files added. 
+
+  	* _css/js.php: Refs #2450: Added the default viewtype in the views dir for
+  the @see tag.  
+
+  	* _css/css.php, _css/js.php: Refs #2450: Added documentation for js and css
+  files.  
+
+2010-08-31  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php: Refs #2434 - make view
+  failures spectacular rather than silent since they should only happen during
+  development  
+
+  	* mod/profile/start.php, .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php: Refs #2434 - made the
+  profile plugin more robust to bad urls and did a little code standardization 
+
+2010-08-30  ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php, mod/groups/views/default/group/default.php,
+  mod/groups/views/default/group/group.php: Fixes #2289: grouprofile.php now
+  uses elgg_view_entity and group/group has been renamed to group/default 
+
+  	* views/default/css.php, views/default/navigation/breadcrumbs.php: Refs
+  #2394: changed breadcrumbs from an id to a class 
+
+2010-08-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/metadata.php: Merged [6875] from 1.7 branch into trunk  
+
+  	* mod/captcha/start.php: merged [6876] into trunk from 1.7 branch  
+
+2010-08-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: added escaping to
+  get_entities_from_private_setting_multi()  
+
+2010-08-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Closes #2420 Trac seems to work.  
+
+  	* README.txt: Refs #2420 trac test. 
+
+  	* README.txt: Refs #2420: Trac test. 
+
+  	* README.txt: Refs #2420 trac test.  
+
+2010-08-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php: Refs #1439 added better page owner functions  
+
+2010-08-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2010062301.php: Merged [6857] into trunk  
+
+2010-08-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/captcha/captcha.php, mod/captcha/languages/en.php,
+  mod/captcha/manifest.xml, mod/captcha/start.php,
+  mod/captcha/views/default/input/captcha.php: standardized captcha plugin  
+
+2010-08-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, .../views/default/object/groupforumtopic.php:
+  Merged [6819] into trunk from 1.7 branch  
+
+  	* mod/thewire/languages/en.php,
+  .../views/default/thewire/profile_status.php: merged [6828] into trunk from
+  1.7 branch  
+
+  	* mod/thewire/languages/en.php,
+  mod/thewire/views/default/object/thewire.php: merged [6829] from 1.7 branch
+  into trunk  
+
+  	* .../views/default/object/groupforumtopic.php: merged [6832] into trunk
+  from 1.7 branch  
+
+2010-08-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Fixed text overflow and word-breaking for base
+  theme 
+
+2010-08-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, CONTRIBUTORS.txt, engine/lib/annotations.php,
+  engine/lib/entities.php, engine/lib/plugins.php,
+  engine/schema/upgrades/2009100701.sql, engine/start.php, languages/en.php,
+  mod/embed/views/default/object/default/embed.php,
+  mod/reportedcontent/languages/en.php, mod/search/start.php,
+  mod/twitter/views/default/widgets/twitter/view.php,
+  views/default/messages/errors/error.php,
+  views/default/messages/messages/message.php,
+  views/default/output/longtext.php: Merged r6812:6837 from 1.7 branch to trunk
+  (skipping some changes to plugins like groups and wire)  
+
+  	* CHANGES.txt, .../notifications/settings/usersettings/save.php,
+  actions/user/default_access.php, engine/lib/access.php,
+  engine/lib/actions.php, engine/lib/annotations.php, engine/lib/api.php,
+  engine/lib/cache.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/extender.php, engine/lib/filestore.php,
+  engine/lib/group.php, engine/lib/install.php, engine/lib/languages.php,
+  engine/lib/location.php, engine/lib/mb_wrapper.php, engine/lib/memcache.php,
+  engine/lib/metadata.php, engine/lib/notification.php, engine/lib/objects.php,
+  engine/lib/pam.php, engine/lib/plugins.php, engine/lib/query.php,
+  engine/lib/relationships.php, engine/lib/river.php, engine/lib/sessions.php,
+  engine/lib/sites.php, engine/lib/tags.php, engine/lib/users.php,
+  engine/lib/views.php, engine/lib/widgets.php, engine/lib/xml-rpc.php,
+  languages/en.php, mod/friends/add.php, mod/friends/collections.php,
+  mod/friends/edit.php, mod/friends/languages/en.php, mod/friends/start.php,
+  mod/friends/views/default/widgets/friends/edit.php,
+  mod/friends/views/default/widgets/friends/view.php, mod/htmlawed/start.php,
+  mod/messages/start.php, .../views/default/widgets/messages/view.php,
+  mod/pages/languages/en.php, mod/riverdashboard/languages/en.php,
+  services/export/handler.php, views/default/account/forms/useradd.php,
+  views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php,
+  views/default/input/autocomplete.php, views/default/page_elements/title.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php: Merged r6757:6810 from
+  1.7 branch into trunk  
+
+  	* actions/email/save.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/remove.php, actions/plugins/usersettings/save.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php, actions/user/spotlight.php,
+  engine/lib/annotations.php, engine/lib/database.php,
+  engine/lib/filestore.php, engine/lib/group.php, engine/lib/metadata.php,
+  engine/lib/plugins.php, engine/lib/relationships.php, engine/lib/tags.php,
+  engine/tests/regression/trac_bugs.php, entities/list.php,
+  mod/categories/listing.php, mod/categories/views/default/categories/list.php,
+  mod/file/search.php, mod/groups/actions/addtogroup.php,
+  mod/groups/languages/en.php, .../views/default/groups/closedmembership.php,
+  settings/index.php, settings/plugins.php, settings/statistics.php,
+  settings/user.php, views/json/river/item/list.php: Merged r6701:6756 from 1.7
+  branch into trunk  
+
+  	* engine/lib/entities.php, engine/lib/relationships.php,
+  engine/lib/upgrades/2010071001.php, engine/lib/upgrades/2010071002.php,
+  mod/notifications/start.php, mod/pages/actions/pages/edit.php,
+  mod/pages/start.php, mod/pages/views/default/forms/pages/edit.php,
+  mod/profile/actions/cropicon.php, mod/profile/actions/iconupload.php,
+  mod/profile/icon.php, mod/profile/icondirect.php, mod/profile/start.php,
+  version.php: Merged r6684:6694 from 1.7 branch to trunk (pages plugin was
+  manually merged due to standardization of code in trunk but not branch)  
+
+  	* engine/lib/entities.php, engine/lib/metadata.php, engine/lib/output.php,
+  engine/lib/views.php, engine/lib/widgets.php, mod/file/world.php: Merged
+  r6671:6683 from 1.7 branch to trunk  
+
+  	* actions/admin/user/delete.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/filestore.php, engine/lib/metadata.php,
+  engine/lib/output.php, engine/lib/version.php, engine/lib/views.php,
+  htaccess_dist, languages/en.php,
+  mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/delete.php, mod/blog/actions/blog/save.php,
+  mod/bookmarks/actions/delete.php,
+  mod/embed/views/default/embed/item/gallery.php,
+  mod/embed/views/default/embed/item/list.php, mod/file/actions/delete.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/pages/actions/pages/delete.php,
+  .../views/default/river/object/page/create.php,
+  .../default/admin/overview/reportedcontent.php,
+  mod/riverdashboard/endpoint/get_comments.php,
+  .../views/default/river/item/wrapper.php, views/default/input/checkboxes.php,
+  views/default/input/radio.php, views/failsafe/input/checkboxes.php: Merged
+  r6620:6653 from 1.7 branch into trunk  
+
+  	* engine/lib/annotations.php, engine/lib/api.php, mod/file/start.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/sharing/invite.php: Merged r6614:6617 from 1.7
+  branch into trunk  
+
+  	* engine/lib/upgrades/2010070301.php, mod/groups/actions/edit.php,
+  mod/groups/actions/join.php, mod/groups/languages/en.php,
+  mod/groups/views/default/river/group/create.php,
+  .../default/river/relationship/member/create.php, version.php: Merged [6612]
+  from 1.7 into the trunk  
+
+  	* engine/lib/entities.php, engine/lib/export.php, engine/lib/input.php,
+  engine/lib/metadata.php, engine/tests/objects/metadata.php,
+  .../views/default/forms/forums/edittopic.php,
+  .../views/default/object/groupforumtopic.php,
+  .../views/default/river/object/group/create.php,
+  views/foaf/page_elements/title.php, views/json/page_elements/title.php,
+  views/rss/navigation/pagination.php, views/rss/page_elements/title.php:
+  Merged [6600],[6601],[6605],[6606],[6607],[6608],[6611] from 1.7 branch into
+  trunk  
+
+2010-08-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/output.php, mod/blog/start.php,
+  mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php,
+  .../views/default/river/object/blog/create.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/object/file/embedlist.php, mod/file/start.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/object/file.php,
+  mod/file/views/default/widgets/filerepo/view.php, mod/groups/start.php,
+  mod/groups/views/default/forum/maintopic.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../default/messageboard/messageboard_content.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/view.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/river/object/page/create.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  .../views/default/reportedcontent/listing.php,
+  mod/riverdashboard/endpoint/get_comments.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/entity.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  .../views/default/thewire/profile_status.php,
+  views/default/annotation/annotate.php,
+  views/default/annotation/annotatelike.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/annotation/likes.php, views/default/object/default.php,
+  views/default/output/friendlytime.php, views/default/river/item/wrapper.php:
+  Merged r6586:6587 from 1.7 branch into trunk  
+
+  	* engine/lib/actions.php, mod/groups/views/default/forms/groups/edit.php,
+  views/default/graphics/icon.php: Merged [6573],[6574],[6582] from 1.7 branch
+  into trunk  
+
+  	* CODING.txt, INSTALL.txt, engine/lib/elgglib.php, engine/lib/metadata.php,
+  engine/lib/output.php, engine/lib/relationships.php,
+  engine/lib/upgrades/2010062301.php, engine/lib/upgrades/2010062302.php,
+  engine/schema/mysql.sql, engine/schema/upgrades/2010062401.sql,
+  engine/tests/api/entity_getter_functions.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/views/default/groups/grouplisting.php,
+  mod/search/search_hooks.php, mod/search/start.php, version.php,
+  views/default/friends/picker.php, views/default/input/checkboxes.php: Merged
+  r6534-6559 from 1.7 branch to trunk  
+
+  	* engine/lib/metadata.php, engine/lib/upgrades/2010061501.php,
+  engine/tests/api/entity_getter_functions.php, mod/search/start.php: Merging
+  r6517:6520 from 1.7 branch  
+
+2010-08-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_shells/walled_garden.php: Updated walledgarden login to
+  wraplongnames 
+
+2010-08-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* LICENCE.txt: cleaned up the included license, GPL v2 
+
+2010-08-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/html_begin.php: Removed additional
+  header/extend view from HTML head.  Moved metatags view to right before
+  </html>.  Removed the check if the view exists since it's done in elgg_view()
+  anyway.  
+
+2010-08-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Added optional param to sanitise_filepath() that
+  appends a / or not.  Also removes any ../s  
+
+2010-08-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/css.php: Updated embed css 
+
+  	* views/default/page_shells/walled_garden.php: Updated walled-garden login
+  input boxes - so they are not effected by any theme running 
+
+2010-08-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/html_begin.php: a view inserted for plugins to
+  extend 
+
+2010-08-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/overview.php: inserted a view for plugins to extend 
+
+2010-07-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: correcting a mistake in the readme file. 
+
+2010-07-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/nav.php: small nav tweak to the filter 
+
+2010-07-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php, .../views/default/riverdashboard/nav.php:
+  Moved start conversation button 
+
+2010-07-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php: missing string added 
+
+  	* mod/profile/index.php, .../default/profile/profile_contents/groups.php,
+  .../views/default/profile/profile_navigation.php: groups tab added to profile
+
+  	* .../views/default/riverdashboard/nav.php: lang tweak on activity filter 
+
+2010-07-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/activity.php, mod/riverdashboard/index.php,
+  .../views/default/riverdashboard/nav.php: Added interface elements for inline
+  conversation posting from activity stream 
+
+2010-07-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php: added a view for plugins to extend the
+  activity view if required 
+
+2010-07-18  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/activity.php: view for plugins to extend on group activity 
+
+2010-07-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/pages/actions/pages/edit.php, mod/pages/history.php: More code cleanup
+  to pages.  
+
+  	* engine/lib/views.php: Added display:page plugin hook in page_draw
+  function.  
+
+  	* engine/lib/output.php, mod/ecml/start.php: plugin hook output:strip_tags
+  is now format:strip_tags.  
+
+  	* engine/lib/output.php: elgg_make_excerpt() uses elgg_strip_tags().  
+
+2010-07-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Using elgg_strip_tags() for notification
+  body.  
+
+  	* mod/ecml/start.php: ECML removes keywords for elgg_strip_tags().  
+
+  	* engine/lib/output.php: Fixes #2099. Added elgg_strip_tags() to allow
+  plugins to remove extra formatting.  
+
+  	* mod/pages/start.php: Parsing pages views for ecml.  
+
+  	* mod/pages/actions/pages/delete.php, mod/pages/actions/pages/edit.php,
+  mod/pages/actions/pages/editwelcome.php, mod/pages/edit.php,
+  mod/pages/history.php, mod/pages/index.php, mod/pages/languages/en.php,
+  mod/pages/new.php, mod/pages/pagesTree.php, mod/pages/start.php,
+  mod/pages/view.php, mod/pages/views/default/annotation/icon.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../views/default/icon/object/page/medium.php,
+  mod/pages/views/default/icon/object/page/small.php,
+  .../views/default/icon/object/page_top/medium.php,
+  .../views/default/icon/object/page_top/small.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/css.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/metatags.php,
+  mod/pages/views/default/pages/pagegallery.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/pages/sidebar/sidebarthis.php,
+  mod/pages/views/default/pages/sidebar/starter.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/sidebar/wrapper.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/annotate.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/page/update.php,
+  .../default/river/object/page_top/annotate.php,
+  .../views/default/river/object/page_top/create.php,
+  .../views/default/river/object/page_top/update.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php: First pass at standardizing pages.  
+
+  	* mod/pages/actions/pages/editwelcome.php, mod/pages/history.php,
+  mod/pages/index.php, mod/pages/languages/en.php, mod/pages/new.php,
+  mod/pages/start.php, .../views/default/forms/pages/editwelcome.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/css.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/update.php,
+  .../views/default/river/object/page_top/update.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php: Converting spaces to tabs without the stray t.  
+
+  	* mod/pages/actions/pages/editwelcome.php, mod/pages/history.php,
+  mod/pages/index.php, mod/pages/languages/en.php, mod/pages/new.php,
+  mod/pages/start.php, .../views/default/forms/pages/editwelcome.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/css.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/update.php,
+  .../views/default/river/object/page_top/update.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php: Convert spaces to tabs.  
+
+  	* views/default/page_elements/elgg_header.php,
+  views/default/page_elements/elgg_header_logo.php: Fixes #2284.  Pulled out
+  home link in elgg_header to page_elements/elgg_header_logo. Removed
+  csseditor-specific code that caused custom logos to still appear even when
+  csseditor was disabled.  
+
+2010-07-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/account/forms/login_walled_garden.php: Added ugly hack to get
+  around problems with sliding in hidden images in visual captcha on login
+  pages in webkit browsers.  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/views.php: Fixes
+  #2195. 3rd and 4th params of page_draw() are now $page_shell and $vars.  
+
+2010-07-14  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/invitefriends/languages/en.php,
+  .../views/default/invitefriends/formitems.php: Disabling friend invite form
+  when site has disabled new user registration.  
+
+2010-07-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/join.php,
+  mod/groups/views/default/groups/groupprofile.php: Admin users can join
+  groups.  Don't request to join a closed group if admin.  
+
+2010-07-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css_ie.php: Added clearfloat improvement to IE7/8 CSS 
+
+  	* mod/ecml/graphics/logo_bliptv.gif, mod/ecml/graphics/logo_dailymotion.gif,
+  mod/ecml/graphics/logo_googlemaps.gif, mod/ecml/graphics/logo_livevideo.gif,
+  mod/ecml/graphics/logo_redlasso.gif, mod/ecml/graphics/logo_slideshare.gif,
+  mod/ecml/graphics/logo_vimeo.gif, mod/ecml/graphics/logo_youtube.gif,
+  mod/ecml/views/default/ecml/admin/css.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php: Added logos to embed web services
+  pane, and made embed nav-bar theme agnostic 
+
+  	* mod/embed/views/default/embed/css.php: Removed old classes from embed 
+
+  	* mod/ecml/graphics/url_status.png,
+  mod/ecml/views/default/ecml/admin/css.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php: Updated ecml and embed with new
+  success/failure for input code. 
+
+  	* views/default/css.php: Added disabled class to submit_button 
+
+  	* .../views/default/embed/web_services/content.php: Corrected js for preview
+  pane toggleclass 
+
+2010-07-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/start.php: messages now parse ecml 
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: ecml added to group
+  profiles 
+
+2010-07-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/link.php: Web services tab now default embed
+  tab if ecml is enabled.  
+
+2010-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/views/default/ecml/admin/css.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php: Updated embed/ecml modal interface 
+
+2010-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/start.php: keep sitepages settings in their normal location 
+
+2010-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_sprites.png: Updated elgg sprites graphic with embed modal
+  arrows 
+
+  	* mod/ecml/languages/en.php, mod/ecml/views/default/ecml/admin/css.php,
+  .../views/default/embed/web_services/content.php: continuation of embed modal
+  interfacing 
+
+  	* mod/ecml/views/default/ecml/admin/css.php,
+  .../views/default/embed/web_services/content.php,
+  mod/embed/views/default/embed/css.php: Beginnings of embed modal web-services
+  interfacing improvements. 
+
+2010-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/river/group/create.php: river view tweaked 
+
+  	* mod/ecml/languages/en.php: missing string added 
+
+2010-07-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php: Added instructions.  
+
+  	* mod/ecml/graphics/dailymotion.png, mod/ecml/graphics/googlemaps.png,
+  mod/ecml/graphics/redlasso_1.png, mod/ecml/graphics/redlasso_2.png,
+  mod/ecml/graphics/slideshare.png, mod/ecml/graphics/vimeo.png,
+  mod/ecml/graphics/youtube.png, mod/ecml/languages/en.php, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/help/blip.tv.php,
+  mod/ecml/views/default/ecml/help/dailymotion.php,
+  mod/ecml/views/default/ecml/help/googlemaps.php,
+  mod/ecml/views/default/ecml/help/livevideo.php,
+  mod/ecml/views/default/ecml/help/redlasso.php,
+  mod/ecml/views/default/ecml/help/slideshare.php,
+  mod/ecml/views/default/ecml/help/vimeo.php,
+  mod/ecml/views/default/ecml/help/youtube.php,
+  mod/ecml/views/default/ecml/keyword_help.php,
+  .../views/default/ecml/keywords/googlemaps.php,
+  mod/ecml/views/default/ecml/keywords/livevideo.php,
+  .../views/default/embed/web_services/content.php: Added ecml help for web
+  service embeds.  
+
+2010-07-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/oauth/start.php: Adding a missed oauth library file.  
+
+2010-07-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/README.txt, mod/embed/start.php,
+  mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/embed.php: Sorting tabs and upload sections
+  correctly by name instead of id. Passing internal_name to all views related
+  to embedding to allow correct calls to elggEmbedInsertContent() in overrided
+  layouts.   
+
+  	* .../views/default/embed/web_services/content.php: Added missing important
+  view for ECML web services embed.  
+
+  	* mod/ecml/README.txt, mod/ecml/ecml_functions.php, mod/ecml/start.php:
+  Pulled ECML regex into a constant. Added ecml_get_keywords(),
+  ecml_parse_string(), ecml_extract_keywords(), ecml_get_keyword_info(). Added
+  callback for resolving ECML given an embed code / URL. Removed unused page
+  setup hook. Added web services support. Updated docs.  
+
+2010-07-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  .../views/default/groups/invitationrequests.php: Updated group forum forms
+  with an id 
+
+  	* .../views/default/river/object/blog/create.php,
+  .../default/river/object/bookmarks/create.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/river/object/thewire/create.php,
+  views/default/annotation/annotate.php: Moved all river entry metadata inside
+  span (pushed onto new line) and added relevant css 
+
+2010-07-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added elgg_sort_3d_array_by_value().  I do this
+  often enough that a helper function will be nice.  
+
+2010-07-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/manifest.xml: undo the last sitepages manifest change 
+
+  	* mod/sitepages/manifest.xml: site pages enabled 
+
+  	* mod/bookmarks/views/default/bookmarks/form.php: bookmark edit form access
+  options fixed for groups 
+
+2010-07-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php,
+  mod/embed/views/default/embed/upload/content.php: Pulled out some language
+  strings.  
+
+  	* mod/file/views/default/file/embed_upload.php: Removed stray </div> that
+  broke IE and wasted 3 hours.  
+
+  	* mod/file/actions/upload.php, mod/file/start.php,
+  mod/file/views/default/file/embed_upload.php: Added upload support to file
+  embed.  
+
+  	* mod/file/start.php: Added embed support to file plugin.  
+
+  	* mod/embed/README.txt, mod/embed/languages/en.php, mod/embed/start.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/link.php: Updated documentation for embed.
+  Fixed bug passing internal_name for elggEmbedInsertContent().  Showing a
+  message if no embedable items are returned.  
+
+2010-07-06  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Adding javascript and CSS to the walled garden
+  whitelist.  
+
+2010-07-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/upload.php: Removed unused upload.php file in embed.  
+
+2010-07-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Updated small button hover text 
+
+  	* mod/groups/activity.php: Added js to groups riverdashboard view 
+
+2010-07-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php: small lang tweak 
+
+2010-07-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/item/noaccess.php: removing stopgap from [3082] since
+  denied river items are now skipped 
+
+  	* views/default/river/dashboard.php: Removing another pre-1.5 view that is
+  no longer used 
+
+  	* views/default/river/relationship/friend/create.php: Closes #2121 - removed
+  view from pre-1.5 days 
+
+  	* views/default/river/wrapper.php: leftover view from pre-Elgg 1.5 days 
+
+2010-07-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/start.php: removing navigation when editing for consistency 
+
+2010-07-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/oauth/manifest.xml, mod/oauth/start.php,
+  mod/oauth/vendors/oauth/LICENSE,
+  mod/oauth/vendors/oauth/example/server/INSTALL,
+  .../vendors/oauth/example/server/core/init.php,
+  .../example/server/core/templates/inc/footer.tpl,
+  .../example/server/core/templates/inc/header.tpl,
+  .../oauth/example/server/core/templates/index.tpl,
+  .../oauth/example/server/core/templates/logon.tpl,
+  .../example/server/core/templates/register.tpl,
+  .../vendors/oauth/example/server/www/hello.php,
+  .../vendors/oauth/example/server/www/index.php,
+  .../vendors/oauth/example/server/www/logon.php,
+  .../vendors/oauth/example/server/www/oauth.php,
+  .../vendors/oauth/example/server/www/register.php,
+  .../oauth/example/server/www/services.xrds.php,
+  mod/oauth/vendors/oauth/library/OAuthDiscovery.php,
+  mod/oauth/vendors/oauth/library/OAuthException.php,
+  mod/oauth/vendors/oauth/library/OAuthRequest.php,
+  .../vendors/oauth/library/OAuthRequestLogger.php,
+  .../vendors/oauth/library/OAuthRequestSigner.php,
+  .../vendors/oauth/library/OAuthRequestVerifier.php,
+  mod/oauth/vendors/oauth/library/OAuthRequester.php,
+  mod/oauth/vendors/oauth/library/OAuthServer.php,
+  mod/oauth/vendors/oauth/library/OAuthStore.php,
+  .../library/body/OAuthBodyContentDisposition.php,
+  .../library/body/OAuthBodyMultipartFormdata.php,
+  .../vendors/oauth/library/discovery/xrds_parse.php,
+  .../vendors/oauth/library/discovery/xrds_parse.txt,
+  .../OAuthSignatureMethod.class.php, .../OAuthSignatureMethod_HMAC_SHA1.php,
+  .../signature_method/OAuthSignatureMethod_MD5.php,
+  .../OAuthSignatureMethod_PLAINTEXT.php,
+  .../OAuthSignatureMethod_RSA_SHA1.php,
+  .../library/store/OAuthStoreAbstract.class.php,
+  .../oauth/library/store/OAuthStoreAnyMeta.php,
+  .../oauth/library/store/OAuthStoreMySQL.php,
+  .../vendors/oauth/library/store/mysql/install.php,
+  .../vendors/oauth/library/store/mysql/mysql.sql,
+  .../oauth/test/discovery/xrds-fireeagle.xrds,
+  .../oauth/test/discovery/xrds-getsatisfaction.xrds,
+  .../oauth/test/discovery/xrds-magnolia.xrds,
+  mod/oauth/vendors/oauth/test/oauth_test.php: Moved oauth from plugins to core
+  since twitterservices is core and it depends upon oauth.  
+
+2010-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php,
+  views/default/page_elements/html_begin_admin.php,
+  views/default/page_shells/admin.php: Updated admin area to be stand-alone.
+  Added a new html begin for admin area. 
+
+2010-07-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/views.php,
+  views/default/page_shells/admin.php: added a parameter to the page_draw
+  function so you can specify a different page shell if required. 
+
+2010-06-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/README.txt, mod/sitepages/start.php,
+  .../views/default/admin/site/sitepages.php,
+  .../views/default/settings/sitepages/edit.php: Updated README.txt for new
+  ECML.  Moved settings to site category.  
+
+  	* mod/tinymce/views/default/embed/addcontentjs.php,
+  .../default/tinymce/embed_custom_insert_js.php: Embed's
+  elggEmbedInsertContent() now supports multiple losely coupled views to handle
+  custom insertion js.  Plugin order no longer matters.  
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/embed.php: Embed
+  correctly passes text area name to elggEmbedInsertContent().  
+
+2010-06-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/views/default/sitepages/members.php,
+  mod/sitepages/views/default/sitepages/sidebar.php,
+  mod/sitepages/views/default/sitepages/welcome.php: Interface updates to
+  sitepages 
+
+  	* views/default/canvas/layouts/administration.php: Added more stand-alone
+  admin area rules 
+
+  	* mod/groups/start.php, mod/groups/views/default/forms/groups/edit.php,
+  views/default/page_elements/elgg_sidebar.php: Added classname to group edit
+  form, divider before edit buttons, and moved the invalid number preceding the
+  classname. 
+
+  	* mod/members/views/default/members/search.php: Added classnames to members
+  search form 
+
+  	* mod/members/views/default/members/search.php: Updated wrapper with new
+  naming 
+
+2010-06-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/tagcloud.php: Added wrapper to tagcloud + title (for
+  theming) 
+
+  	* mod/profile/views/default/profile/admin_menu.php: Added float-clear on
+  owner-block links (for theming) 
+
+2010-06-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Updated sidebar comments text overflow 
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/object/blog.php: Updated the layout of a blogpost 
+
+  	* mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/groups/css.php: Updated the layout of a topic post
+  within group discussions 
+
+2010-06-27  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/html_begin.php,
+  views/default/page_elements/owner_block.php: Closes #2307 #2308 - encoding
+  ampersands in RSS links  
+
+2010-06-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/object/thewire/create.php: The wire can now have
+  comments and likes via the activity stream. 
+
+2010-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css_ie.php: Updates to IE7 css 
+
+  	* views/default/admin/components/plugin.php: Updated advanced plugin strings
+  markup/classes 
+
+2010-06-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/manifest.xml: notfications default state enabled 
+
+  	* mod/bookmarks/manifest.xml: changed the default state for bookmarks 
+
+2010-06-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Added optional 4th argument 'class' for
+  elgg_instanceof().  
+
+  	* views/default/page_elements/content_header.php: Updated documentation for
+  page_elements/content_header  
+
+2010-06-23  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/tabs.php: Only displaying navigation div when
+  tabs are present.  
+
+2010-06-22  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/content_header.php: Allowing plugin authors to
+  override the default tabs (filters) displayed on the content header.  
+
+2010-06-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, .../views/default/bookmarks/group_bookmarks.php,
+  .../views/default/groups/activity_latest.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/forum_latest.php: Added a 'view all' link to
+  group tools widgets. 
+
+  	* mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/groups/css.php: Updated groups/forums topic css 
+
+2010-06-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/edittopic.php: forward to the correct place
+  after editing a topic 
+
+  	* mod/groups/actions/forums/addpost.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletepost.php,
+  mod/groups/actions/forums/editpost.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/activity.php,
+  mod/groups/addtopic.php, mod/groups/all.php, mod/groups/discussions.php,
+  mod/groups/edit.php, mod/groups/edittopic.php, mod/groups/forum.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forum/maintopic.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/object/groupforumtopic.php,
+  .../views/default/river/forum/topic/create.php: There was no point in group
+  discussions having their own comment annotations, better to use the generic
+  comments so this has been changed and a full group activity stream added. For
+  v1.8, there will need to be an upgrade script which will change
+  'group_topic_post' -> 'generic_comment' and on all existing topics, take the
+  first annotation of type 'group_topic_post' and populate the topic's
+  description. 
+
+  	* .../views/default/river/item/wrapper.php: group discussion no longer needs
+  this check as it will be possible to comment on discussions from the activity
+  stream. 
+
+2010-06-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php: Ref #2294 - group creation action also needs
+  page owner set 
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/join.php,
+  mod/groups/actions/joinrequest.php, mod/groups/actions/leave.php: Refs #2294
+  - groups_write_acl_plugin_hook depends on page owner since [5782] and group
+  actions seem to end up with the group owner as the page owner. This is a
+  temporary fix for this issue. All group activity since [5782] on installs now
+  have corrupted group access lists. I have a script to fix this that I can
+  share. 
+
+  	* mod/groups/actions/join.php: Fixed broken join action for closed groups -
+  encoding issue on forward URL 
+
+2010-06-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/views.php: included an option to display existing comments but
+  not show the new comment form. 
+
+2010-06-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2010061501.php, engine/lib/views.php,
+  engine/start.php, mod/groups/actions/invite.php, version.php: Merged
+  r6506:6509 from 1.7 to trunk.  
+
+  	* engine/lib/pagehandler.php, friends/add.php, friends/collections.php,
+  friends/edit.php, friends/index.php, friends/of.php: Merged friends pages
+  fixes in r6501:6503 from 1.7 to trunk.  
+
+  	* engine/lib/notification.php, engine/lib/users.php, languages/en.php:
+  Merging r6497:6499 to trunk.  
+
+  	* mod/groups/actions/featured.php,
+  mod/groups/views/default/groups/grouplisting.php: Merged group featuring
+  fixes to trunk [6493]  
+
+2010-06-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/pages/views/default/pages/breadcrumbs.php: Updated Pages breadcrumbs
+  markup to use generic breadcrumb style 
+
+2010-06-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/pages/start.php: Making menu link for pages go to all pages instead of
+  owned pages.  
+
+  	* mod/pages/actions/pages/delete.php,
+  mod/pages/actions/pages/editwelcome.php, mod/pages/edit.php,
+  mod/pages/history.php, mod/pages/index.php, mod/pages/languages/en.php,
+  mod/pages/new.php, mod/pages/pagesTree.php, mod/pages/start.php,
+  mod/pages/view.php, mod/pages/views/default/annotation/icon.php,
+  mod/pages/views/default/annotation/page.php,
+  .../views/default/icon/object/page/medium.php,
+  mod/pages/views/default/icon/object/page/small.php,
+  .../views/default/icon/object/page_top/medium.php,
+  .../views/default/icon/object/page_top/small.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/pagegallery.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/pages/sidebar/sidebarthis.php,
+  mod/pages/views/default/pages/sidebar/starter.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/sidebar/wrapper.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/annotate.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/page/update.php,
+  .../default/river/object/page_top/annotate.php,
+  .../views/default/river/object/page_top/create.php,
+  .../views/default/river/object/page_top/update.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php: Quick and dirty changes to pages to work on 1.8's
+  layout.  
+
+  	* engine/start.php: Making sure to load all plugins when doing an upgrade to
+  pull in CSS changes and allow plugins to register for the upgrade hook.  
+
+2010-06-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/views.php, engine/start.php: Merged
+  [6485] and [6486] to trunk.  
+
+2010-06-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Merged 6482 to trunk.  
+
+2010-06-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/register.php, engine/lib/access.php, engine/lib/users.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/languages/en.php:
+  Merged r6362:6366 from 1.7 to trunk.  
+
+2010-06-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: Always show access level when
+  listing blogs, regardless of canEdit().  
+
+  	* mod/blog/blog_lib.php: Removing old time_created fudging for blogs.  It
+  doens't work right.  
+
+  	* mod/profile/languages/en.php, mod/profile/profile_lib.php,
+  mod/profile/start.php, .../views/default/profile/profile_content.php,
+  .../default/profile/profile_contents/activity.php,
+  .../profile/profile_contents/commentwall.php,
+  .../default/profile/profile_contents/details.php,
+  .../default/profile/profile_contents/friends.php,
+  .../default/profile/profile_contents/sidebar.php,
+  .../default/profile/profile_contents/twitter.php,
+  mod/profile/views/default/profile/sidebar.php: Some code cleanup on profile
+  plugin. Added wrapper view for profile content. Added ECML for profile
+  content. Moved profile/profile_content/sidebar to profile/sidebar  
+
+  	* mod/groups/languages/en.php: Slight code cleanup in groups langauges.
+  Added string for group discussion ECML option.  
+
+  	* mod/groups/start.php: Added group forums to ECML views to parse.  
+
+  	* mod/bookmarks/languages/en.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php: Small code cleanup on bookmarks.
+  Added better logic for determining the username to use when adding a bookmark
+  via the bookmarklet.  
+
+  	* .../views/default/river/item/wrapper.php: Activity stream comments now
+  show up outside of the hidden div so you can see them when on the like tab.  
+
+  	* mod/riverdashboard/languages/en.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php: Added "Show less" on activity stream
+  comments.  
+
+2010-06-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/css.php: Updates to embed interface to make
+  it theme agnostic in core 
+
+  	* .../views/default/riverdashboard/css.php: Updated inline comment form css
+  height - for a smoother slide animation 
+
+2010-06-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php: Updated administration
+  area css with more styles to make it totally stand-alone 
+
+  	* mod/profile/views/default/profile/css.php: Small update to latest tweets
+  list style 
+
+  	* .../profile/profile_contents/commentwall.php: Added wrapper to profile
+  page commentwall 
+
+2010-06-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php: ECML is
+  parsed on the activity stream.  
+
+2010-06-10  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/endpoint/get_comments.php,
+  .../views/default/river/item/wrapper.php: Adding "twitter_anywhere" class to
+  Conversation and Riverdashboard posts.  
+
+  	* views/default/input/userpicker.php: Performing checks to handle empty
+  arrays and malformed values.  
+
+2010-06-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: Moved view extend call -
+  so it's for all users (not just object owner), and added likes to bookmarks
+  (as we already have it in the activity stream) 
+
+2010-06-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/bookmarks/group_bookmarks.php: group bookmarks now
+  provides a link to create if none exist 
+
+  	* mod/groups/views/default/groups/forum_latest.php: if there is no group
+  discussion, provide a link to create a topic 
+
+2010-06-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/js.php: Added a 'show less' link. [Still
+  needs a js function adding to collapse list] 
+
+  	* mod/groups/all.php, .../views/default/groups/group_sort_menu.php: Updated
+  Groups tabs so you land on newest groups tab rather than discussion. 
+
+2010-06-09  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: Pre-populating userpicker list when
+  values are passed.  
+
+2010-06-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/upload/content.php: Updated embed modal
+  listings with timestamp and text formatting / css. 
+
+2010-06-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/gallery.php,
+  mod/embed/views/default/embed/item/list.php: Embed hooks now accept icon_size
+  for displaying items in gallery / list view.  
+
+  	* .../views/default/riverdashboard/js.php: Removing debug call...I've been
+  very bad about this!  
+
+  	* mod/embed/views/default/embed/item/gallery.php: Embed default gallery list
+  uses medium icon instead of tiny.  
+
+2010-06-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/views/default/ecml/keywords/entity.php,
+  mod/embed/views/default/embed/css.php: Updated embeded object links ui 
+
+  	* mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php,
+  mod/embed/views/default/embed/upload/content.php: Updated embed modal with
+  wrappers & classnames for each pane 
+
+  	* mod/embed/views/default/embed/css.php: Updated embed modal with an initial
+  default size 
+
+  	* mod/ecml/views/default/ecml/keywords/entity.php: Updated ecml inline
+  embeded document links to have a classname 
+
+  	* views/default/css.php: Updated core css download button 
+
+2010-06-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/profile/profile_navigation.php: Properly extending
+  profile navigation view.  
+
+2010-06-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/endpoint/get_likes.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/js.php: Ajaxified likes view on activity
+  stream.  
+
+2010-06-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/groups/groupprofile.php: Cleaning up groups
+  navigation.  Action buttons have replaced the submenu links, helping to
+  standardize user experience. Added a membership-dependent breadcrumb trail.  
+
+2010-06-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/profile/profile_ownerblock.php: profile owmer block link
+  fixed 
+
+2010-06-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/views/default/embed/embed.php: removing debug output.  
+
+  	* mod/embed/views/default/embed/embed.php: Fixed invalid variable name that
+  caused embed to ignore custom views for embed content.  
+
+  	* mod/embed/views/default/embed/embed.php: Upload tab selected when
+  uploading in embed modal.  
+
+2010-06-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Updated documents. Removed large and small document
+  icons - we now just use the very small ones from the old filter directory.
+  Updated doc's list view and download button. 
+
+  	* .../views/default/riverdashboard/css.php: Updated riverdashboard more
+  comments link 
+
+  	* views/default/css.php, views/default/css_ie.php,
+  views/default/js/initialise_elgg.php: Updated display and position of likes
+  lists. Added js to dismiss list if a click outside the list is detected, also
+  added js so only one list is viewable at a time. 
+
+2010-06-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_sidebar.php: Reverting [6371] because
+  Cash already took care of it.  
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php:
+  elgg_get_entities_from_metadata() and egef_annotations() support singular ->
+  plural rewrites.  (Why didn't I add this originally?!)  
+
+2010-06-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/endpoint/get_comments.php,
+  mod/riverdashboard/index.php, mod/riverdashboard/languages/en.php,
+  mod/riverdashboard/start.php, .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/js.php: Minimal attempt to bring
+  riverdashboard up to code standards. Fixed comment count in +N more string.
+  Added ajax grabbing of all comments when clicking more link.   
+
+  	* mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/save.php: Added metadata 'new_post' when autosaving
+  blogs to help with river / revision logic.  Autosaved blogs now correctly
+  show up in river and don't create a revision upon initial save.  
+
+  	* mod/blog/views/default/blog/forms/edit.php: Fix for displaying auto save
+  time.  HTML was changed without relevent JS updates.  
+
+2010-06-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, .../views/default/widgets/a_users_groups/view.php:
+  Removing deprecated calls to get_entities_from_relationship() from core code.
+   
+
+2010-06-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php: group create river action moved 
+
+2010-06-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topicposts.php,
+  views/default/annotation/generic_comment.php: Added a classname to generic
+  comment and forum topic posts anchors - for theming purposes. 
+
+2010-06-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/languages/en.php,
+  .../notifications/subscriptions/collections.php: Updating Notifications
+  language file.  
+
+2010-06-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php, mod/groups/languages/en.php,
+  mod/groups/views/default/river/group/create.php: creating a new group now
+  displays in the activity stream. 
+
+  	* mod/groups/languages/en.php,
+  .../views/default/river/forum/topic/create.php: updated the group discussion
+  river view 
+
+2010-06-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, views/default/admin/users/find.php: Removing user
+  "Find" from Admin area.  Closes #2216  
+
+2010-06-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: lang tweak 
+
+  	* mod/groups/actions/featured.php, mod/groups/languages/en.php,
+  mod/groups/views/default/groups/grouplisting.php: featuring and unfeaturing
+  groups now works 
+
+  	* mod/ecml/start.php: don't extend input fields yet with ecml as it is not
+  designed as an end user tool 
+
+  	* mod/blog/views/default/object/blog.php: blog tags will not display the
+  class if no tags exist 
+
+  	* actions/likes/add.php, languages/en.php: missing lang strings added 
+
+2010-06-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_sidebar.php: Added elgg_sidebar/extend
+  view.  
+
+2010-06-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php: Added missing language string for embed.  
+
+  	* mod/embed/start.php, mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/upload/content.php: Added first loosely coupled
+  upload support to embed.  
+
+2010-06-04  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/users/find.php, views/default/css.php: Updating Find
+  User in the Admin section to use the livesearch user picker.  
+
+2010-06-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2010060401.php,
+  .../views/default/widgets/a_users_groups/view.php, version.php: Merged
+  r6349:6351 from 1.7 to trunk.  
+
+  	* engine/lib/elgglib.php, engine/lib/upgrades/2010060101.php,
+  engine/start.php, .../views/default/defaultwidgets/editor.php,
+  mod/notifications/start.php, mod/profile/views/default/profile/icon.php,
+  simplecache/view.php, upgrade.php, version.php,
+  views/default/canvas/layouts/widgets.php: Merge r6301:6338 from 1.7 to trunk.
+   
+
+2010-06-04  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/start.php: Allowing new users to validate email
+  addresses if the site is a Private Network.  
+
+2010-06-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/invite.php: Added id to invite
+  friends to group form (for theming purposes). 
+
+  	* .../profile/profile_contents/commentwall.php: Removed profile content
+  wrapper from comment wall content. 
+
+2010-06-03  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php: Updating views to no
+  longer parse usernames as this is handled directly thru Mentions.  
+
+2010-06-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/README.txt, mod/ecml/ecml_functions.php, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/keywords/entity.php: Added entity keyword to
+  ECML.  (NB: The old entity keyword is now entity_list)  
+
+2010-06-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/views/default/input/longtext.php: Removed one unused and one
+  absent plugin from tinyMCE init that was causing problems in some browsers. 
+
+2010-06-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CODING.txt: Updated CODING.txt with more best practices. Simplified some
+  of the examples.  
+
+  	* mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/gallery.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php: Moved most of the logic for
+  embed viewing into a single place. Added gallery support (still no CSS).  
+
+2010-06-02  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Mathematical calculations on annotations will
+  return false for non-existent entity subtypes.  
+
+  	* engine/lib/tags.php, languages/en.php, mod/tagcloud/start.php,
+  mod/tagcloud/views/default/tagcloud/extend.php,
+  views/default/output/tagcloud.php: Moving new Site Tags functionality out of
+  Tagcloud plugin and into core.  
+
+  	* engine/lib/annotations.php, engine/tests/objects/entities.php: Requesting
+  annotations from a non-existent subtype will now return nothing instead of
+  everything.  This functionality is required to preserve context.  
+
+2010-06-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/languages/en.php: Added missing language strings for blog.  
+
+  	* views/default/entities/entity_listing.php,
+  views/default/entities/gallery_listing.php: Updated documentation for
+  entity_listing and gallery_listing.  
+
+  	* views/default/entities/gallery_listing.php: Updated gallery_listing.php
+  view.  No CSS yet.  
+
+  	* mod/embed/embed.php, mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/media.php,
+  mod/embed/views/default/embed/pagination.php,
+  mod/embed/views/default/embed/simpletype.php,
+  mod/embed/views/default/embed/tabs.php,
+  mod/embed/views/default/embed/upload.php: Removing unused views and files
+  from embed.  
+
+2010-06-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/views/default/tagcloud/extend.php: Updated tagcloud link 
+
+2010-06-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/languages/en.php, mod/embed/views/default/embed/embed.php:
+  Standardized embed language file. Fixed title language string for embed
+  modal.  
+
+2010-06-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/walled_garden_background_top.gif,
+  _graphics/walled_garden_backgroundfull_bottom.gif,
+  _graphics/walled_garden_backgroundfull_top.gif,
+  .../default/account/forms/login_walled_garden.php,
+  views/default/account/forms/register.php, views/default/css.php,
+  views/default/page_shells/walled_garden.php: Updated private network
+  (previously walled garden) login/register/lost password to be independent of
+  any theme running, and improved interface. 
+
+2010-06-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php: removed redundant view call 
+
+2010-06-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/start.php: Updated all site Tagcloud to use 2column canvas. 
+
+2010-06-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/embed/README.txt, mod/embed/embed.php, mod/embed/manifest.xml,
+  mod/embed/start.php, mod/embed/views/default/embed/addcontentjs.php,
+  mod/embed/views/default/embed/embed.php,
+  mod/embed/views/default/embed/item/list.php,
+  mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/embed/layouts/gallery.php,
+  mod/embed/views/default/embed/layouts/list.php,
+  mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/media.php,
+  mod/embed/views/default/embed/upload.php: First pass at a loosely couple
+  embed plugin using ECML.  
+
+2010-06-01  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/account/forms/login_walled_garden.php, views/default/css.php:
+  Adding a "Register" link to the Walled Garden login screen.  This mimics
+  pre-existing "Lost Password" functionality without redirecting to an internal
+  page.  
+
+2010-06-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Pagination uses
+  elgg_get_array_value().  
+
+  	* engine/lib/elgglib.php: Added elgg_get_array_value() helper function.  
+
+  	* views/default/navigation/pagination.php: Fixed bug in detecting and using
+  baseurl in navingation/pagination view.  
+
+  	* views/default/entities/entity_listing.php: Updated documentation for
+  entities/entity_listing view.  
+
+2010-06-01  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/start.php, mod/tagcloud/views/default/tagcloud/extend.php,
+  views/default/output/tagcloud.php: Extending default tagcloud view to include
+  a link to all site tags.  Also fixing a bug where errant "," was prepended to
+  tag list.  
+
+2010-06-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: get_input() defaults to NULL instead of empty
+  string.  Works better with isset().  
+
+  	* mod/tinymce/tinymce_content.css,
+  .../themes/advanced/skins/default/content.css: Forgot to svn add
+  tinymce_content.css.  Added tinymce_content.css and reverted [6300] to allow
+  for easier tinymce upgrades.  
+
+2010-06-01  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php, mod/blog/views/default/blog/sidebar_menu.php:
+  Restricting tag cloud display on Blogs and Documents by context.  
+
+2010-06-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/start.php, mod/sitepages/views/default/sitepages/css.php,
+  mod/sitepages/views/default/sitepages/sidebar.php,
+  mod/sitepages/views/default/sitepages/welcome.php: Updated Sitepages homepage
+  markup with clearfloat, content wrappers and associated css. 
+
+  	* mod/profile/views/default/profile/css.php: Updated avatar user-menu
+  font-style. 
+
+  	* .../themes/advanced/skins/default/content.css: TinyMCE default editor
+  font-size increased to match preview and publish size. 
+
+2010-05-31  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php: remove the filter header if not logged in 
+
+  	* mod/bookmarks/languages/en.php,
+  .../default/river/object/bookmarks/create.php: bookmarks river view altered
+  for groups 
+
+2010-05-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: make sure logged out river display correctly 
+
+  	* engine/lib/river.php: small tweak to the new river 
+
+  	* mod/bookmarks/start.php: removed a breadcrumb view when on the all page 
+
+  	* mod/bookmarks/languages/en.php: change community to group for consistency 
+
+2010-05-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/output.php: Merged r6263:6271 to trunk.
+   
+
+  	* engine/handlers/pagehandler.php, engine/lib/pagehandler.php,
+  mod/tinymce/views/default/input/longtext.php,
+  views/default/input/pulldown.php: Merged [6248] - [6252] into trunk.  
+
+  	* engine/lib/upgrades/2010052601.php, mod/groups/actions/edit.php,
+  mod/groups/views/default/forms/groups/edit.php, version.php: Merged [6223] -
+  [6228] into trunk.  
+
+  	* mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/editpost.php: Merging [6091] to trunk.  
+
+  	* mod/tinymce/languages/en.php, mod/tinymce/readme.txt,
+  mod/tinymce/start.php, mod/tinymce/tinymce/changelog.txt,
+  mod/tinymce/tinymce/jscripts/tiny_mce/langs/en.js,
+  mod/tinymce/tinymce/jscripts/tiny_mce/license.txt,
+  .../jscripts/tiny_mce/plugins/advhr/css/advhr.css,
+  .../tiny_mce/plugins/advhr/editor_plugin.js,
+  .../tiny_mce/plugins/advhr/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advhr/js/rule.js,
+  .../tiny_mce/plugins/advhr/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advhr/rule.htm,
+  .../tiny_mce/plugins/advimage/css/advimage.css,
+  .../tiny_mce/plugins/advimage/editor_plugin.js,
+  .../tiny_mce/plugins/advimage/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advimage/image.htm,
+  .../tiny_mce/plugins/advimage/img/sample.gif,
+  .../jscripts/tiny_mce/plugins/advimage/js/image.js,
+  .../tiny_mce/plugins/advimage/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlink/css/advlink.css,
+  .../tiny_mce/plugins/advlink/editor_plugin.js,
+  .../tiny_mce/plugins/advlink/editor_plugin_src.js,
+  .../tiny_mce/plugins/advlink/js/advlink.js,
+  .../tiny_mce/plugins/advlink/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advlink/link.htm,
+  .../tiny_mce/plugins/autosave/editor_plugin.js,
+  .../tiny_mce/plugins/autosave/editor_plugin_src.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin_src.js,
+  .../tiny_mce/plugins/compat2x/editor_plugin.js,
+  .../tiny_mce/plugins/compat2x/editor_plugin_src.js,
+  .../tiny_mce/plugins/contextmenu/editor_plugin.js,
+  .../plugins/contextmenu/editor_plugin_src.js,
+  .../plugins/directionality/editor_plugin.js,
+  .../plugins/directionality/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/editor_plugin.js,
+  .../tiny_mce/plugins/emotions/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/emotions.htm,
+  .../tiny_mce/plugins/emotions/img/smiley-cool.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-cry.gif,
+  .../plugins/emotions/img/smiley-embarassed.gif,
+  .../plugins/emotions/img/smiley-foot-in-mouth.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-frown.gif,
+  .../plugins/emotions/img/smiley-innocent.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-kiss.gif,
+  .../plugins/emotions/img/smiley-laughing.gif,
+  .../plugins/emotions/img/smiley-money-mouth.gif,
+  .../plugins/emotions/img/smiley-sealed.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-smile.gif,
+  .../plugins/emotions/img/smiley-surprised.gif,
+  .../plugins/emotions/img/smiley-tongue-out.gif,
+  .../plugins/emotions/img/smiley-undecided.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-wink.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-yell.gif,
+  .../tiny_mce/plugins/emotions/js/emotions.js,
+  .../tiny_mce/plugins/emotions/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/example/dialog.htm,
+  .../tiny_mce/plugins/example/editor_plugin.js,
+  .../tiny_mce/plugins/example/editor_plugin_src.js,
+  .../tiny_mce/plugins/example/img/example.gif,
+  .../jscripts/tiny_mce/plugins/example/js/dialog.js,
+  .../jscripts/tiny_mce/plugins/example/langs/en.js,
+  .../tiny_mce/plugins/example/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullpage/css/fullpage.css,
+  .../tiny_mce/plugins/fullpage/editor_plugin.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/fullpage.htm,
+  .../tiny_mce/plugins/fullpage/js/fullpage.js,
+  .../tiny_mce/plugins/fullpage/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullscreen/editor_plugin.js,
+  .../plugins/fullscreen/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullscreen/fullscreen.htm,
+  .../tiny_mce/plugins/iespell/editor_plugin.js,
+  .../tiny_mce/plugins/iespell/editor_plugin_src.js,
+  .../tiny_mce/plugins/inlinepopups/editor_plugin.js,
+  .../plugins/inlinepopups/editor_plugin_src.js,
+  .../inlinepopups/skins/clearlooks2/img/alert.gif,
+  .../inlinepopups/skins/clearlooks2/img/button.gif,
+  .../inlinepopups/skins/clearlooks2/img/buttons.gif,
+  .../inlinepopups/skins/clearlooks2/img/confirm.gif,
+  .../inlinepopups/skins/clearlooks2/img/corners.gif,
+  .../skins/clearlooks2/img/horizontal.gif,
+  .../skins/clearlooks2/img/vertical.gif,
+  .../inlinepopups/skins/clearlooks2/window.css,
+  .../tiny_mce/plugins/inlinepopups/template.htm,
+  .../plugins/insertdatetime/editor_plugin.js,
+  .../plugins/insertdatetime/editor_plugin_src.js,
+  .../tiny_mce/plugins/layer/editor_plugin.js,
+  .../tiny_mce/plugins/layer/editor_plugin_src.js,
+  .../tiny_mce/plugins/media/css/content.css,
+  .../jscripts/tiny_mce/plugins/media/css/media.css,
+  .../tiny_mce/plugins/media/editor_plugin.js,
+  .../tiny_mce/plugins/media/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/img/flash.gif,
+  .../tiny_mce/plugins/media/img/flv_player.swf,
+  .../tiny_mce/plugins/media/img/quicktime.gif,
+  .../tiny_mce/plugins/media/img/realmedia.gif,
+  .../tiny_mce/plugins/media/img/shockwave.gif,
+  .../jscripts/tiny_mce/plugins/media/img/trans.gif,
+  .../tiny_mce/plugins/media/img/windowsmedia.gif,
+  .../jscripts/tiny_mce/plugins/media/js/embed.js,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/media/media.htm,
+  .../tiny_mce/plugins/nonbreaking/editor_plugin.js,
+  .../plugins/nonbreaking/editor_plugin_src.js,
+  .../tiny_mce/plugins/noneditable/editor_plugin.js,
+  .../plugins/noneditable/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/css/content.css,
+  .../tiny_mce/plugins/pagebreak/editor_plugin.js,
+  .../plugins/pagebreak/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/img/pagebreak.gif,
+  .../tiny_mce/plugins/pagebreak/img/trans.gif,
+  .../jscripts/tiny_mce/plugins/paste/blank.htm,
+  .../jscripts/tiny_mce/plugins/paste/css/blank.css,
+  .../tiny_mce/plugins/paste/css/pasteword.css,
+  .../tiny_mce/plugins/paste/editor_plugin.js,
+  .../tiny_mce/plugins/paste/editor_plugin_src.js,
+  .../tiny_mce/plugins/paste/js/pastetext.js,
+  .../tiny_mce/plugins/paste/js/pasteword.js,
+  .../tiny_mce/plugins/paste/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/paste/pastetext.htm,
+  .../jscripts/tiny_mce/plugins/paste/pasteword.htm,
+  .../tiny_mce/plugins/preview/editor_plugin.js,
+  .../tiny_mce/plugins/preview/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/preview/example.html,
+  .../tiny_mce/plugins/preview/jscripts/embed.js,
+  .../tiny_mce/plugins/print/editor_plugin.js,
+  .../tiny_mce/plugins/print/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/safari/blank.htm,
+  .../tiny_mce/plugins/safari/editor_plugin.js,
+  .../tiny_mce/plugins/safari/editor_plugin_src.js,
+  .../tiny_mce/plugins/save/editor_plugin.js,
+  .../tiny_mce/plugins/save/editor_plugin_src.js,
+  .../plugins/searchreplace/css/searchreplace.css,
+  .../plugins/searchreplace/editor_plugin.js,
+  .../plugins/searchreplace/editor_plugin_src.js,
+  .../plugins/searchreplace/js/searchreplace.js,
+  .../tiny_mce/plugins/searchreplace/langs/en_dlg.js,
+  .../plugins/searchreplace/searchreplace.htm,
+  .../tiny_mce/plugins/spellchecker/css/content.css,
+  .../tiny_mce/plugins/spellchecker/editor_plugin.js,
+  .../plugins/spellchecker/editor_plugin_src.js,
+  .../tiny_mce/plugins/spellchecker/img/wline.gif,
+  .../jscripts/tiny_mce/plugins/style/css/props.css,
+  .../tiny_mce/plugins/style/editor_plugin.js,
+  .../tiny_mce/plugins/style/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/style/js/props.js,
+  .../tiny_mce/plugins/style/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/style/props.htm,
+  .../jscripts/tiny_mce/plugins/table/cell.htm,
+  .../jscripts/tiny_mce/plugins/table/css/cell.css,
+  .../jscripts/tiny_mce/plugins/table/css/row.css,
+  .../jscripts/tiny_mce/plugins/table/css/table.css,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/cell.js,
+  .../tiny_mce/plugins/table/js/merge_cells.js,
+  .../jscripts/tiny_mce/plugins/table/js/row.js,
+  .../jscripts/tiny_mce/plugins/table/js/table.js,
+  .../tiny_mce/plugins/table/langs/en_dlg.js,
+  .../tiny_mce/plugins/table/merge_cells.htm,
+  .../jscripts/tiny_mce/plugins/table/row.htm,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../jscripts/tiny_mce/plugins/template/blank.htm,
+  .../tiny_mce/plugins/template/css/template.css,
+  .../tiny_mce/plugins/template/editor_plugin.js,
+  .../tiny_mce/plugins/template/editor_plugin_src.js,
+  .../tiny_mce/plugins/template/js/template.js,
+  .../tiny_mce/plugins/template/langs/en_dlg.js,
+  .../tiny_mce/plugins/template/template.htm,
+  .../tiny_mce/plugins/visualchars/editor_plugin.js,
+  .../plugins/visualchars/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm,
+  .../tiny_mce/plugins/xhtmlxtras/acronym.htm,
+  .../tiny_mce/plugins/xhtmlxtras/attributes.htm,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm,
+  .../tiny_mce/plugins/xhtmlxtras/css/attributes.css,
+  .../tiny_mce/plugins/xhtmlxtras/css/popup.css,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm,
+  .../tiny_mce/plugins/xhtmlxtras/editor_plugin.js,
+  .../plugins/xhtmlxtras/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm,
+  .../tiny_mce/plugins/xhtmlxtras/js/abbr.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/acronym.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/attributes.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/cite.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js,
+  .../plugins/xhtmlxtras/js/element_common.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js,
+  .../tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/about.htm,
+  .../jscripts/tiny_mce/themes/advanced/anchor.htm,
+  .../jscripts/tiny_mce/themes/advanced/charmap.htm,
+  .../tiny_mce/themes/advanced/color_picker.htm,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/advanced/image.htm,
+  .../tiny_mce/themes/advanced/img/colorpicker.jpg,
+  .../tiny_mce/themes/advanced/img/icons.gif,
+  .../jscripts/tiny_mce/themes/advanced/js/about.js,
+  .../jscripts/tiny_mce/themes/advanced/js/anchor.js,
+  .../tiny_mce/themes/advanced/js/charmap.js,
+  .../tiny_mce/themes/advanced/js/color_picker.js,
+  .../jscripts/tiny_mce/themes/advanced/js/image.js,
+  .../jscripts/tiny_mce/themes/advanced/js/link.js,
+  .../tiny_mce/themes/advanced/js/source_editor.js,
+  .../jscripts/tiny_mce/themes/advanced/langs/en.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/link.htm,
+  .../themes/advanced/skins/default/content.css,
+  .../themes/advanced/skins/default/dialog.css,
+  .../themes/advanced/skins/default/img/buttons.png,
+  .../themes/advanced/skins/default/img/items.gif,
+  .../advanced/skins/default/img/menu_arrow.gif,
+  .../advanced/skins/default/img/menu_check.gif,
+  .../themes/advanced/skins/default/img/progress.gif,
+  .../themes/advanced/skins/default/img/tabs.gif,
+  .../tiny_mce/themes/advanced/skins/default/ui.css,
+  .../themes/advanced/skins/o2k7/content.css,
+  .../tiny_mce/themes/advanced/skins/o2k7/dialog.css,
+  .../themes/advanced/skins/o2k7/img/button_bg.png,
+  .../advanced/skins/o2k7/img/button_bg_black.png,
+  .../advanced/skins/o2k7/img/button_bg_silver.png,
+  .../tiny_mce/themes/advanced/skins/o2k7/ui.css,
+  .../themes/advanced/skins/o2k7/ui_black.css,
+  .../themes/advanced/skins/o2k7/ui_silver.css,
+  .../tiny_mce/themes/advanced/source_editor.htm,
+  .../tiny_mce/themes/simple/editor_template.js,
+  .../tiny_mce/themes/simple/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/simple/img/icons.gif,
+  .../jscripts/tiny_mce/themes/simple/langs/en.js,
+  .../themes/simple/skins/default/content.css,
+  .../tiny_mce/themes/simple/skins/default/ui.css,
+  .../tiny_mce/themes/simple/skins/o2k7/content.css,
+  .../themes/simple/skins/o2k7/img/button_bg.png,
+  .../tiny_mce/themes/simple/skins/o2k7/ui.css,
+  mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_popup.js,
+  .../jscripts/tiny_mce/utils/editable_selects.js,
+  .../tinymce/jscripts/tiny_mce/utils/form_utils.js,
+  .../tinymce/jscripts/tiny_mce/utils/mctabs.js,
+  .../tinymce/jscripts/tiny_mce/utils/validate.js,
+  mod/tinymce/vendor/tinymce/changelog.txt,
+  .../vendor/tinymce/jscripts/tiny_mce/langs/en.js,
+  .../vendor/tinymce/jscripts/tiny_mce/license.txt,
+  .../jscripts/tiny_mce/plugins/advhr/css/advhr.css,
+  .../tiny_mce/plugins/advhr/editor_plugin.js,
+  .../tiny_mce/plugins/advhr/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advhr/js/rule.js,
+  .../tiny_mce/plugins/advhr/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advhr/rule.htm,
+  .../tiny_mce/plugins/advimage/css/advimage.css,
+  .../tiny_mce/plugins/advimage/editor_plugin.js,
+  .../tiny_mce/plugins/advimage/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advimage/image.htm,
+  .../tiny_mce/plugins/advimage/img/sample.gif,
+  .../jscripts/tiny_mce/plugins/advimage/js/image.js,
+  .../tiny_mce/plugins/advimage/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlink/css/advlink.css,
+  .../tiny_mce/plugins/advlink/editor_plugin.js,
+  .../tiny_mce/plugins/advlink/editor_plugin_src.js,
+  .../tiny_mce/plugins/advlink/js/advlink.js,
+  .../tiny_mce/plugins/advlink/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advlink/link.htm,
+  .../tiny_mce/plugins/advlist/editor_plugin.js,
+  .../tiny_mce/plugins/advlist/editor_plugin_src.js,
+  .../tiny_mce/plugins/autoresize/editor_plugin.js,
+  .../plugins/autoresize/editor_plugin_src.js,
+  .../tiny_mce/plugins/autosave/editor_plugin.js,
+  .../tiny_mce/plugins/autosave/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/autosave/langs/en.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin_src.js,
+  .../tiny_mce/plugins/contextmenu/editor_plugin.js,
+  .../plugins/contextmenu/editor_plugin_src.js,
+  .../plugins/directionality/editor_plugin.js,
+  .../plugins/directionality/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/editor_plugin.js,
+  .../tiny_mce/plugins/emotions/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/emotions.htm,
+  .../tiny_mce/plugins/emotions/img/smiley-cool.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-cry.gif,
+  .../plugins/emotions/img/smiley-embarassed.gif,
+  .../plugins/emotions/img/smiley-foot-in-mouth.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-frown.gif,
+  .../plugins/emotions/img/smiley-innocent.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-kiss.gif,
+  .../plugins/emotions/img/smiley-laughing.gif,
+  .../plugins/emotions/img/smiley-money-mouth.gif,
+  .../plugins/emotions/img/smiley-sealed.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-smile.gif,
+  .../plugins/emotions/img/smiley-surprised.gif,
+  .../plugins/emotions/img/smiley-tongue-out.gif,
+  .../plugins/emotions/img/smiley-undecided.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-wink.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-yell.gif,
+  .../tiny_mce/plugins/emotions/js/emotions.js,
+  .../tiny_mce/plugins/emotions/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/example/dialog.htm,
+  .../tiny_mce/plugins/example/editor_plugin.js,
+  .../tiny_mce/plugins/example/editor_plugin_src.js,
+  .../tiny_mce/plugins/example/img/example.gif,
+  .../jscripts/tiny_mce/plugins/example/js/dialog.js,
+  .../jscripts/tiny_mce/plugins/example/langs/en.js,
+  .../tiny_mce/plugins/example/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullpage/css/fullpage.css,
+  .../tiny_mce/plugins/fullpage/editor_plugin.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/fullpage.htm,
+  .../tiny_mce/plugins/fullpage/js/fullpage.js,
+  .../tiny_mce/plugins/fullpage/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullscreen/editor_plugin.js,
+  .../plugins/fullscreen/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullscreen/fullscreen.htm,
+  .../tiny_mce/plugins/iespell/editor_plugin.js,
+  .../tiny_mce/plugins/iespell/editor_plugin_src.js,
+  .../tiny_mce/plugins/inlinepopups/editor_plugin.js,
+  .../plugins/inlinepopups/editor_plugin_src.js,
+  .../inlinepopups/skins/clearlooks2/img/alert.gif,
+  .../inlinepopups/skins/clearlooks2/img/button.gif,
+  .../inlinepopups/skins/clearlooks2/img/buttons.gif,
+  .../inlinepopups/skins/clearlooks2/img/confirm.gif,
+  .../inlinepopups/skins/clearlooks2/img/corners.gif,
+  .../skins/clearlooks2/img/horizontal.gif,
+  .../skins/clearlooks2/img/vertical.gif,
+  .../inlinepopups/skins/clearlooks2/window.css,
+  .../tiny_mce/plugins/inlinepopups/template.htm,
+  .../plugins/insertdatetime/editor_plugin.js,
+  .../plugins/insertdatetime/editor_plugin_src.js,
+  .../tiny_mce/plugins/layer/editor_plugin.js,
+  .../tiny_mce/plugins/layer/editor_plugin_src.js,
+  .../tiny_mce/plugins/legacyoutput/editor_plugin.js,
+  .../plugins/legacyoutput/editor_plugin_src.js,
+  .../tiny_mce/plugins/media/css/content.css,
+  .../jscripts/tiny_mce/plugins/media/css/media.css,
+  .../tiny_mce/plugins/media/editor_plugin.js,
+  .../tiny_mce/plugins/media/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/img/flash.gif,
+  .../tiny_mce/plugins/media/img/flv_player.swf,
+  .../tiny_mce/plugins/media/img/quicktime.gif,
+  .../tiny_mce/plugins/media/img/realmedia.gif,
+  .../tiny_mce/plugins/media/img/shockwave.gif,
+  .../jscripts/tiny_mce/plugins/media/img/trans.gif,
+  .../tiny_mce/plugins/media/img/windowsmedia.gif,
+  .../jscripts/tiny_mce/plugins/media/js/embed.js,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/media/media.htm,
+  .../tiny_mce/plugins/nonbreaking/editor_plugin.js,
+  .../plugins/nonbreaking/editor_plugin_src.js,
+  .../tiny_mce/plugins/noneditable/editor_plugin.js,
+  .../plugins/noneditable/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/css/content.css,
+  .../tiny_mce/plugins/pagebreak/editor_plugin.js,
+  .../plugins/pagebreak/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/img/pagebreak.gif,
+  .../tiny_mce/plugins/pagebreak/img/trans.gif,
+  .../tiny_mce/plugins/paste/editor_plugin.js,
+  .../tiny_mce/plugins/paste/editor_plugin_src.js,
+  .../tiny_mce/plugins/paste/js/pastetext.js,
+  .../tiny_mce/plugins/paste/js/pasteword.js,
+  .../tiny_mce/plugins/paste/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/paste/pastetext.htm,
+  .../jscripts/tiny_mce/plugins/paste/pasteword.htm,
+  .../tiny_mce/plugins/preview/editor_plugin.js,
+  .../tiny_mce/plugins/preview/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/preview/example.html,
+  .../tiny_mce/plugins/preview/jscripts/embed.js,
+  .../jscripts/tiny_mce/plugins/preview/preview.html,
+  .../tiny_mce/plugins/print/editor_plugin.js,
+  .../tiny_mce/plugins/print/editor_plugin_src.js,
+  .../tiny_mce/plugins/save/editor_plugin.js,
+  .../tiny_mce/plugins/save/editor_plugin_src.js,
+  .../plugins/searchreplace/css/searchreplace.css,
+  .../plugins/searchreplace/editor_plugin.js,
+  .../plugins/searchreplace/editor_plugin_src.js,
+  .../plugins/searchreplace/js/searchreplace.js,
+  .../tiny_mce/plugins/searchreplace/langs/en_dlg.js,
+  .../plugins/searchreplace/searchreplace.htm,
+  .../tiny_mce/plugins/spellchecker/css/content.css,
+  .../tiny_mce/plugins/spellchecker/editor_plugin.js,
+  .../plugins/spellchecker/editor_plugin_src.js,
+  .../tiny_mce/plugins/spellchecker/img/wline.gif,
+  .../jscripts/tiny_mce/plugins/style/css/props.css,
+  .../tiny_mce/plugins/style/editor_plugin.js,
+  .../tiny_mce/plugins/style/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/style/js/props.js,
+  .../tiny_mce/plugins/style/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/style/props.htm,
+  .../tiny_mce/plugins/tabfocus/editor_plugin.js,
+  .../tiny_mce/plugins/tabfocus/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/cell.htm,
+  .../jscripts/tiny_mce/plugins/table/css/cell.css,
+  .../jscripts/tiny_mce/plugins/table/css/row.css,
+  .../jscripts/tiny_mce/plugins/table/css/table.css,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/cell.js,
+  .../tiny_mce/plugins/table/js/merge_cells.js,
+  .../jscripts/tiny_mce/plugins/table/js/row.js,
+  .../jscripts/tiny_mce/plugins/table/js/table.js,
+  .../tiny_mce/plugins/table/langs/en_dlg.js,
+  .../tiny_mce/plugins/table/merge_cells.htm,
+  .../jscripts/tiny_mce/plugins/table/row.htm,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../jscripts/tiny_mce/plugins/template/blank.htm,
+  .../tiny_mce/plugins/template/css/template.css,
+  .../tiny_mce/plugins/template/editor_plugin.js,
+  .../tiny_mce/plugins/template/editor_plugin_src.js,
+  .../tiny_mce/plugins/template/js/template.js,
+  .../tiny_mce/plugins/template/langs/en_dlg.js,
+  .../tiny_mce/plugins/template/template.htm,
+  .../tiny_mce/plugins/visualchars/editor_plugin.js,
+  .../plugins/visualchars/editor_plugin_src.js,
+  .../tiny_mce/plugins/wordcount/editor_plugin.js,
+  .../plugins/wordcount/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm,
+  .../tiny_mce/plugins/xhtmlxtras/acronym.htm,
+  .../tiny_mce/plugins/xhtmlxtras/attributes.htm,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm,
+  .../tiny_mce/plugins/xhtmlxtras/css/attributes.css,
+  .../tiny_mce/plugins/xhtmlxtras/css/popup.css,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm,
+  .../tiny_mce/plugins/xhtmlxtras/editor_plugin.js,
+  .../plugins/xhtmlxtras/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm,
+  .../tiny_mce/plugins/xhtmlxtras/js/abbr.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/acronym.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/attributes.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/cite.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js,
+  .../plugins/xhtmlxtras/js/element_common.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js,
+  .../tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/about.htm,
+  .../jscripts/tiny_mce/themes/advanced/anchor.htm,
+  .../jscripts/tiny_mce/themes/advanced/charmap.htm,
+  .../tiny_mce/themes/advanced/color_picker.htm,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/advanced/image.htm,
+  .../tiny_mce/themes/advanced/img/colorpicker.jpg,
+  .../tiny_mce/themes/advanced/img/icons.gif,
+  .../jscripts/tiny_mce/themes/advanced/js/about.js,
+  .../jscripts/tiny_mce/themes/advanced/js/anchor.js,
+  .../tiny_mce/themes/advanced/js/charmap.js,
+  .../tiny_mce/themes/advanced/js/color_picker.js,
+  .../jscripts/tiny_mce/themes/advanced/js/image.js,
+  .../jscripts/tiny_mce/themes/advanced/js/link.js,
+  .../tiny_mce/themes/advanced/js/source_editor.js,
+  .../jscripts/tiny_mce/themes/advanced/langs/en.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/link.htm,
+  .../themes/advanced/skins/default/content.css,
+  .../themes/advanced/skins/default/dialog.css,
+  .../themes/advanced/skins/default/img/buttons.png,
+  .../themes/advanced/skins/default/img/items.gif,
+  .../advanced/skins/default/img/menu_arrow.gif,
+  .../advanced/skins/default/img/menu_check.gif,
+  .../themes/advanced/skins/default/img/progress.gif,
+  .../themes/advanced/skins/default/img/tabs.gif,
+  .../tiny_mce/themes/advanced/skins/default/ui.css,
+  .../themes/advanced/skins/o2k7/content.css,
+  .../tiny_mce/themes/advanced/skins/o2k7/dialog.css,
+  .../themes/advanced/skins/o2k7/img/button_bg.png,
+  .../advanced/skins/o2k7/img/button_bg_black.png,
+  .../advanced/skins/o2k7/img/button_bg_silver.png,
+  .../tiny_mce/themes/advanced/skins/o2k7/ui.css,
+  .../themes/advanced/skins/o2k7/ui_black.css,
+  .../themes/advanced/skins/o2k7/ui_silver.css,
+  .../tiny_mce/themes/advanced/source_editor.htm,
+  .../tiny_mce/themes/simple/editor_template.js,
+  .../tiny_mce/themes/simple/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/simple/img/icons.gif,
+  .../jscripts/tiny_mce/themes/simple/langs/en.js,
+  .../themes/simple/skins/default/content.css,
+  .../tiny_mce/themes/simple/skins/default/ui.css,
+  .../tiny_mce/themes/simple/skins/o2k7/content.css,
+  .../themes/simple/skins/o2k7/img/button_bg.png,
+  .../tiny_mce/themes/simple/skins/o2k7/ui.css,
+  .../vendor/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_popup.js,
+  .../jscripts/tiny_mce/utils/editable_selects.js,
+  .../tinymce/jscripts/tiny_mce/utils/form_utils.js,
+  .../tinymce/jscripts/tiny_mce/utils/mctabs.js,
+  .../tinymce/jscripts/tiny_mce/utils/validate.js,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php: Upgraded TinyMCE to 3.3.6.  
+
+2010-05-29  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/breadcrumbs.php: added a hint on breadcrumb usage
+
+  	* views/default/page_elements/owner_block.php: removed some code made
+  unnecessary by the changes to layout in 1.8 
+
+  	* views/default/page_elements/elgg_sidebar.php: updated documentation on
+  optional parameters 
+
+  	* views/default/canvas/layouts/administration.php: updated administration
+  layout to work with new sidebar view 
+
+2010-05-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/sidebar_menu.php,
+  views/default/page_elements/elgg_sidebar.php,
+  views/default/page_elements/owner_block.php: sidebar menu deserves its own
+  view 
+
+2010-05-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php: Refs #2115: Added
+  elgg_is_valid_view_type(). Currently calculated at each load but will want to
+  cache like view paths. Cleaned up autoregister_views() and load_plugins()
+  code. Added spaces between function params in numerous places.  C'mon
+  guys...spaces are free.   
+
+2010-05-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/editdefaultprofileitems.php: Removed debug log to
+  console as it was preventing FF from executing the rest of the callback
+  function. 
+
+2010-05-28  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php: when editing details, return to the details
+  tab when done. 
+
+2010-05-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/appearance/menu_items.php,
+  views/default/canvas/layouts/administration.php: Updated interface for custom
+  menu items 
+
+  	* mod/profile/views/default/profile/css.php,
+  .../default/profile/editdefaultprofileitems.php: Updated interface for edit
+  profile fields 
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/sidebar_menu.php: Updated archive list-style 
+
+2010-05-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: Fixed mismatched <span></a> tags
+  in blog list status display.  
+
+  	* mod/blog/views/default/blog/sidebar_menu.php: Fixed typo in blog sidebar
+  menu that caused an extra LI item in archives.  
+
+2010-05-27  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Registering user password request/reset as public
+  actions.  
+
+2010-05-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: Fixing code for JS userpicker remove
+  function to cope with recent structure changes.  
+
+2010-05-27  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cron.php, engine/lib/sites.php, mod/sitepages/start.php:
+  Updating walled garden to register public pages as regular expressions.  
+
+2010-05-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php,
+  .../views/default/profile/profile_navigation.php: removed hard coded lang in
+  profile tabs 
+
+2010-05-26  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/start.php, .../notifications/settings/usersettings.php:
+  Un-extending core notification view in favor of Notifications plugin.  
+
+  	* mod/sitepages/actions/add.php, mod/sitepages/actions/addfront.php,
+  mod/sitepages/actions/addfrontsimple.php, mod/sitepages/actions/addmeta.php,
+  mod/sitepages/actions/edit_settings.php,
+  mod/sitepages/sitepages_functions.php, mod/sitepages/start.php,
+  .../views/default/settings/sitepages/edit.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../views/default/sitepages/forms/editfront.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/menu.php: Updating Sitepages plugin
+  settings for new administration layout.  
+
+2010-05-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php: Gatekeeper() added to blog edit/create pagehandler.  
+
+  	* engine/lib/entities.php: Fix problem rewriting type_subtype_pair ->
+  type_subtype_pairs in elgg_get_entities().  
+
+2010-05-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/forums/addtopic.php: group discussion
+  access defaults to the group 
+
+2010-05-26  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php, mod/groups/start.php: Ensuring Blogs and Forum links
+  display properly in the group ownerblock.  
+
+2010-05-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/content_header.php: small tweak to header
+  contents 
+
+  	* mod/bookmarks/start.php: bookmark header bug fixed 
+
+2010-05-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../page_elements/content_header_member.php: Updated content area title
+  when viewing a users objects 
+
+  	* .../views/default/profile/profile_ownerblock.php: Additional links to
+  tools added to profile pages ownerblock (hardcoded for phase1) 
+
+2010-05-25  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/defaultwidgets/actions/update.php, mod/defaultwidgets/dashboard.php,
+  mod/defaultwidgets/profile.php, mod/defaultwidgets/start.php,
+  .../admin/appearance/default_dashboard_widgets.php,
+  .../admin/appearance/default_profile_widgets.php, mod/logbrowser/index.php,
+  mod/logbrowser/start.php, .../views/default/admin/overview/logbrowser.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/profile/defaultprofile.php, mod/profile/start.php,
+  .../default/admin/appearance/defaultprofile.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/index.php,
+  mod/reportedcontent/start.php,
+  .../default/admin/overview/reportedcontent.php: Updating administration
+  plugins with admin submenu views.  
+
+2010-05-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/tabs.php: Navigation/tabs uses output/url for the
+  links.  
+
+  	* views/default/output/url.php: Added title to output/url. Fixed typo
+  breaking js support in output/url.  
+
+  	* CHANGES.txt: Added changes to CHANGES.txt.  
+
+  	* views/default/output/url.php: Fixed documentation for output/url view.  
+
+  	* views/default/output/url.php: Added title to url output.  
+
+2010-05-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/start.php: change the bookmark header depending on whose
+  bookmarks are being viewed 
+
+2010-05-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Updated documentation for register_plugin_hook(). 
+
+  	* engine/lib/elgglib.php: Updated documentation and cleaned up code for
+  trigger_plugin_hook().  
+
+2010-05-25  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/walled_garden_background_bottom.gif,
+  _graphics/walled_garden_background_extend.gif,
+  _graphics/walled_garden_background_top.gif, engine/lib/elgglib.php,
+  .../default/account/forms/login_walled_garden.php, views/default/css.php,
+  views/default/page_shells/walled_garden.php: Walled Garden login page is no
+  longer tied to the default page shell.  
+
+2010-05-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: only display comment count if
+  there are comments 
+
+  	* mod/blog/blog_lib.php: check to see if comments are on or off 
+
+  	* mod/blog/views/default/blog/sidebar_revisions.php: blog revisions tweaked 
+
+2010-05-25  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/defaultwidgets/dashboard.php, mod/defaultwidgets/profile.php,
+  mod/defaultwidgets/start.php, .../views/default/defaultwidgets/editor.php:
+  Updating Default Widgets administration to use new canvas layout.  
+
+2010-05-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/css.php: Fix for blogs list view interface in
+  some browsers 
+
+2010-05-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php: comment wall notification message tweaked 
+
+2010-05-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_revisions.php: Updates to Blogs edit UI. 
+
+2010-05-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../page_elements/content_header_member.php: content header added for use
+  when viewing another user 
+
+  	* mod/tagcloud/all.php, mod/tagcloud/tagcloud.php: added an all site
+  tagcloud view, tagcloud.php will be customised to run in the sidebar. 
+
+2010-05-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php: UI update to avatar menu
+  list-style. 
+
+2010-05-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../canvas/layouts/one_column_with_sidebar.php,
+  views/default/page_elements/elgg_sidebar.php: Refs #2114 - added elgg_sidebar
+  view 
+
+2010-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/languages/en.php, mod/blog/views/default/object/blog.php: Added
+  blog author link by line on blog list.  
+
+  	* mod/blog/views/default/object/blog.php: Added access level in blog list.  
+
+  	* views/default/output/access.php: Added output/access view for displaying
+  entity access levels.  
+
+2010-05-24  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/index.php, mod/logbrowser/start.php, mod/profile/start.php,
+  mod/reportedcontent/start.php, mod/sitepages/start.php: Updating multiple
+  plugins to no longer register admin menus with an event hook.  
+
+2010-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/save.php, mod/blog/blog_lib.php,
+  mod/blog/views/default/object/blog.php: Blog uses elgg_make_excerpt() now
+  instead of its own.  
+
+  	* engine/lib/output.php: Replacing '...' with html elipse character (&#8230)
+  in elgg_make_excerpt().  
+
+  	* engine/lib/river.php: Copied explaination for weird str_replace() in
+  get_river_items() to the same call in elgg_get_river_items_new() so I stay
+  sane.  
+
+  	* mod/blog/actions/blog/save.php, mod/blog/blog_lib.php,
+  mod/blog/views/default/blog/forms/edit.php: Removing publish_date interface
+  for blogs pending better l10n for dates.  
+
+  	* mod/blog/start.php: Removing blogs from groups, part 2.  
+
+  	* mod/blog/start.php: Removing blog options from groups, part 1.  
+
+2010-05-24  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php: Only notifying name change when it actually
+  changed.  
+
+  	* views/default/output/url.php: Ensuring text displays on URL view for both
+  "value" and "html" sent as property.  
+
+2010-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php: Moved blog edit sidebar revisions to the top of the
+  sidebar.  
+
+2010-05-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/object/blog/create.php,
+  .../default/river/object/bookmarks/create.php: you can no longer comment on
+  river item while logged out 
+
+2010-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/forms/edit.php: Blog edit/create form displays
+  correct title.  
+
+  	* mod/blog/actions/blog/save.php: Blogs only show up in the river if in
+  published state.  
+
+  	* mod/riverdashboard/endpoint/ping.php: Added access controls to the
+  activity stream update count.  
+
+  	* mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/js.php: The activity stream's count uses the
+  river table instead of trying to combine entities + annotations based up on
+  time_created. Also brought small bits of code up to standards.  
+
+2010-05-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php, views/default/css.php: UI
+  updates to users links and admin menu on profile pages 
+
+2010-05-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/views/default/sitepages/menu.php: the correct tab now
+  highlights 
+
+2010-05-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php: Saving a blog post no longer rewrites all entity
+  time_created and time_updated fields.  Yikes.  
+
+2010-05-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php, views/default/css.php:
+  Updated css for admin area/plugins and submenu list style 
+
+  	* mod/profile/views/default/profile/css.php, views/default/css.php: Added
+  missing formatting to user-generated content 
+
+2010-05-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/start.php: messages now display the correct number unread 
+
+2010-05-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Updated group forum link to only appear in group
+  ownerblock, and when group forum is enabled. 
+
+  	* mod/messages/views/default/messages/forms/send.php: Updated 'Send a
+  message to' form to display users display name rather than username. 
+
+2010-05-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/invite.php: Small tweak to group
+  invite friends so it will show your friends correctly 
+
+2010-05-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: Group forum link added
+  to group ownerblock 
+
+2010-05-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/index.php: sitepages river tweak 
+
+  	* mod/sitepages/index.php: sitepages now displays the correct river 
+
+  	* mod/riverdashboard/index.php,
+  .../views/default/settings/riverdashboard/edit.php: activity type toggle
+  removed as it was poorly thought out and implemented. 
+
+  	* mod/sitepages/actions/addfrontsimple.php, mod/sitepages/index.php,
+  mod/sitepages/languages/en.php, mod/sitepages/sitepages_functions.php,
+  mod/sitepages/start.php, .../views/default/canvas/layouts/frontpage.php,
+  mod/sitepages/views/default/sitepages/css.php,
+  .../default/sitepages/forms/editfrontsimple.php,
+  mod/sitepages/views/default/sitepages/members.php,
+  mod/sitepages/views/default/sitepages/sidebar.php,
+  mod/sitepages/views/default/sitepages/welcome.php: a simple version of the
+  sitepages index - we will need to turn this into a basic and advance
+  selection for admins. 
+
+2010-05-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  views/default/page_elements/owner_block.php: Ownerblock links to users
+  objects interface updated. 
+
+  	* mod/groups/start.php: Group link to forum removed from sidebar submenu 
+
+  	* mod/blog/start.php, mod/bookmarks/start.php: Group blog and bookmarks
+  submenu removed from sidebar (links are now in the group ownerblock) 
+
+2010-05-23  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/page_shells/default.php, views/foaf/pageshells/pageshell.php,
+  views/php/page_shells/default.php, views/php/pageshells/pageshell.php,
+  views/xml/page_shells/default.php, views/xml/pageshells/pageshell.php: fixed
+  page shells for xml, php, and foaf 
+
+2010-05-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php,
+  .../views/default/reportedcontent/footer_link.php: added title attribute to
+  report this footer link 
+
+  	* mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/footer_link.php,
+  views/default/page_elements/elgg_footer.php: removing reported content
+  dependency from core code...again 
+
+  	* views/default/page_elements/elgg_footer.php: Fixes #2122 - footer
+  analytics view added 
+
+2010-05-21  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: Using a lambda function to
+  sort the profile menu.  
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  views/default/page_elements/owner_block.php: Registering new plugin hooks to
+  extend the owner block profile menu.  
+
+  	* views/default/page_elements/owner_block.php: Fixing a typo. Works this
+  time; no, really.  
+
+  	* mod/pages/start.php, mod/pages/views/default/pages/profile_extend.php:
+  Updating Pages plugin to extend profile owner block directly with
+  user-specific links.  
+
+  	* views/default/page_elements/owner_block.php: Cleaning up profile owner
+  blocks to allow for view extensions.  
+
+2010-05-20  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/pages/start.php: Adding submenu items for standard plugins to owner
+  block.  
+
+2010-05-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/entity_getter_functions.php: Fixes #2159: Updated entity
+  getter test to order by guid instead of time_created.  
+
+  	* engine/tests/objects/entities.php, engine/tests/objects/objects.php,
+  engine/tests/objects/sites.php, engine/tests/objects/users.php: Update unit
+  tests for last_action column.  
+
+  	* engine/lib/entities.php, engine/lib/river.php: create_entity() now adds a
+  default last_action set to the same as time_created. This solves a problem of
+  having to specify an order by of last_action desc, time_created desc on each
+  call. Standardized update_entity_last_action() and moved it from river.php to
+  entities.php.  
+
+  	* engine/lib/river.php: Properly merged old 1.8 river2.php with river.php to
+  fix last_action-based bubble ups.  
+
+2010-05-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/content_header.php: small edit to header
+  contents, will need to find a better way to extend this view in the required
+  fashion. 
+
+  	* mod/bookmarks/start.php: small bookmark add bug fixed. 
+
+2010-05-20  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/annotation/default.php, views/rss/object/creator.php,
+  views/rss/object/default.php, views/rss/object/georss.php: Updating RSS views
+  to allow for object creator and geolocation.  
+
+2010-05-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/forgotten_password.php, account/register.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php: Updated Register and ForgottenLogin
+  forms to use default canvases. 
+
+  	* views/default/canvas/layouts/administration.php: Added a link to 'return
+  to network' from admin area. 
+
+2010-05-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, languages/en.php,
+  views/default/admin/users/newest.php: Added "Newest Users" admin section.  
+
+  	* mod/groups/all.php, mod/groups/discussions.php, mod/groups/forum.php,
+  mod/groups/views/default/forum/topics.php: Removed legacy calls from groups. 
+
+  	* engine/lib/annotations.php: Refs #2165: Added
+  elgg_list_entities_from_annotations() to deprecate
+  list_entities_from_annotations().  
+
+  	* mod/groups/forum.php: Missed passing group_guid to forum topics.  
+
+  	* mod/groups/views/default/forum/topics.php: Fixed incorrect call for $vars
+  in group forum topics.  
+
+  	* mod/riverdashboard/manifest.xml: Riverdashboard enabled on default
+  installs.  
+
+  	* mod/custom_index/index.php, mod/custom_index/languages/en.php,
+  mod/custom_index/manifest.xml, mod/custom_index/start.php,
+  .../views/default/canvas/layouts/new_index.php,
+  .../views/default/custom_index/css.php: Custom index is deprecated by Site
+  pages.  These two provide the same functionality but in different ways, so
+  just moving Custom Index to the plugins repo.  
+
+  	* mod/externalpages/actions/add.php, mod/externalpages/index.php,
+  mod/externalpages/languages/en.php, mod/externalpages/manifest.xml,
+  mod/externalpages/read.php, mod/externalpages/start.php,
+  .../views/default/expages/analytics.php,
+  mod/externalpages/views/default/expages/css.php,
+  .../views/default/expages/footer_menu.php,
+  .../views/default/expages/forms/edit.php,
+  mod/externalpages/views/default/expages/menu.php,
+  mod/externalpages/views/default/object/expages.php: The Externalpages plugin
+  is now Site Pages.  Removing old plugin.  
+
+2010-05-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/jquery/jquery-1.4.2.min.js, vendors/jquery/jquery-1.4.min.js,
+  views/default/page_elements/html_begin.php: jQuery updated to v1.4.2 
+
+  	* mod/groups/views/default/groups/css.php: Small UI update to Group activity
+  widget. 
+
+  	* views/default/annotation/annotatelike.php: Likes river entry timestamp
+  wrapped in span. 
+
+2010-05-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Moved output.php into the pre-installation required lib
+  list to fix trunk installation.  
+
+2010-05-18  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/graphics/background_bottom.gif,
+  mod/walledgarden/graphics/background_extend.gif,
+  mod/walledgarden/graphics/background_top.gif, mod/walledgarden/index.php,
+  mod/walledgarden/languages/en.php, mod/walledgarden/manifest.xml,
+  mod/walledgarden/readme.txt, mod/walledgarden/start.php,
+  .../views/default/account/forms/login.php,
+  .../default/page_shells/walled_garden_index.php,
+  .../views/default/walledgarden/css.php,
+  .../views/default/walledgarden/walledgarden.php: Removing Walled Garden
+  plugin from trunk.  
+
+  	* engine/lib/elgglib.php, engine/lib/sites.php: Ensuring the Walled Garden
+  hook properly exits before plugins can continue to extend view.  
+
+  	* views/json/canvas/default.php, views/json/page_shells/default.php,
+  views/json/pageshells/pageshell.php: Updating the core JSON views to allow
+  for proper object export.  
+
+2010-05-18  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/members/index.php: browse members now working for 1.8 
+
+  	* languages/en.php, views/default/account/forms/login.php,
+  views/default/account/forms/login_dropdown.php: as you can login with either
+  username or email, reflect this in the lang. 
+
+2010-05-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/components/plugin_settings.php,
+  views/default/canvas/layouts/administration.php: Interface updates to plugins
+  settings form. 
+
+2010-05-18  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: small lang changes 
+
+2010-05-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php: Admin area long-text
+  fields width updated. 
+
+2010-05-17  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/river/item/list.php: Defaulting RSS view to use Elgg Entity
+  view.  
+
+  	* views/rss/object/default.php, views/rss/page_shells/default.php,
+  views/rss/pageshells/pageshell.php, views/rss/river/item/list.php: Updating
+  RSS feeds to use proper views called with page_shells.  
+
+2010-05-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/css.php: Another UI update to individual blog
+  page. 
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/profile/views/default/profile/css.php: ..a couple more ui tweaks. 
+
+  	* mod/messages/views/default/messages/forms/view.php,
+  mod/profile/graphics/speech_bubble_tail.gif,
+  mod/profile/graphics/twitter16px.png,
+  views/default/canvas/layouts/administration.php: A few UI updates. 
+
+2010-05-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/css.php, views/default/css.php: Updates
+  to core css UI and riverdashboard mod. 
+
+2010-05-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Fixed loading of activity and database files.  
+
+  	* engine/lib/actions.php, engine/lib/activity.php, engine/lib/api.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/input.php,
+  engine/lib/output.php, engine/lib/pagehandler.php, engine/lib/river.php,
+  engine/lib/river2.php, engine/lib/sessions.php, engine/start.php,
+  htaccess_dist, languages/en.php, mod/groups/invitations.php,
+  mod/groups/new.php, mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  .../views/default/river/object/page/create.php, mod/profile/actions/edit.php:
+  Merged 5928-6908 from 1.7 branch to trunk.  
+
+  	* actions/widgets/save.php, engine/lib/access.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/notification.php, engine/lib/river2.php,
+  engine/lib/sessions.php, engine/lib/system_log.php, engine/lib/tags.php,
+  engine/lib/users.php, mod/groups/forum.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/index.php,
+  mod/invitefriends/languages/en.php, mod/invitefriends/start.php,
+  .../views/default/invitefriends/form.php,
+  .../views/default/invitefriends/formitems.php, mod/profile/icon.php,
+  views/default/friends/river/create.php, views/rss/entities/entity_list.php:
+  merge -r5898:5928 (not excluding riverdashboard, notifications, and
+  messageboard) from 1.7 to trunk.  
+
+2010-05-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php: Updated admin area css 
+
+2010-05-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/actions.php, engine/lib/api.php,
+  engine/lib/elgglib.php, engine/lib/notification.php, engine/lib/river2.php,
+  mod/invitefriends/actions/invite.php, services/api/rest_api.php: merge
+  -r5832:5898 from 1.7 to trunk.  
+
+  	* views/foaf/pageshells/pageshell.php, views/foaf/user/default.php: merge
+  -r5822:5825 from 1.7 to trunk.  
+
+  	* engine/lib/xml.php, mod/file/actions/upload.php,
+  mod/groups/actions/forums/deletepost.php: Merge r5761:5788 from 1.7 to trunk.
+   
+
+2010-05-14  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php: Moving login/extend view to call
+  after the login button (consistent with login dropdown).  
+
+  	* engine/lib/sites.php, languages/en.php: Updating language files for new
+  Walled Garden support.  
+
+  	* _css/css.php, _css/js.php, engine/handlers/action_handler.php,
+  engine/handlers/cron_handler.php, engine/handlers/pagehandler.php,
+  engine/handlers/service_handler.php, engine/handlers/xml-rpc_handler.php,
+  engine/lib/cron.php, engine/lib/sites.php, index.php,
+  mod/externalpages/read.php, upgrade.php: Updating core code to allow public
+  pages using new Walled Garden functionality.  
+
+2010-05-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/sidebar_menu.php, mod/tagcloud/tagcloud.php,
+  mod/tagcloud/views/default/tagcloud/css.php, views/default/css.php,
+  views/default/output/tagcloud.php: Updated core tagcloud view markup/css. 
+
+2010-05-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/views/default/output/tagcloud.php: Removing tagcloud output
+  view from tagcloud mod--it's in core now.  
+
+2010-05-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/administration.php, views/default/css.php:
+  Update to submenu items css. 
+
+  	* mod/profile/defaultprofile.php, mod/reportedcontent/index.php,
+  mod/sitepages/sitepages_functions.php: Updated plugins to use new admin area
+  canvas. 
+
+2010-05-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: To detect if a submenu item is selected, using
+  output from full_url() instead of $_SERVER['REQUEST_URI'] because the host
+  isn't set in REQUEST_URI.  
+
+2010-05-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, views/default/canvas/layouts/administration.php,
+  views/default/css.php: Beginnings of a stand-alone admin area. 
+
+  	* mod/profile/views/default/profile/icon.php: Fix for @mentions mod creating
+  multiple hrefs in avatar submenu. 
+
+  	* views/default/admin/overview.php, views/default/admin/site/advanced.php,
+  views/default/admin/site/basic.php, views/default/admin/users/add.php,
+  views/default/admin/users/find.php, views/default/admin/users/online.php:
+  Added content titles to admin area pages. 
+
+2010-05-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php: removed extra div from riverdashboard index
+  page 
+
+  	* mod/riverdashboard/start.php, .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php: merged [5959] from 1.7 branch into
+  trunk for riverdashboard plugin 
+
+  	* mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/ecml/activity.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/default/settings/riverdashboard/edit.php: attempting to standardize
+  riverdashboard plugin in similar manner as 1.7 branch revision [5943] 
+
+  	* mod/notifications/actions/groupsave.php,
+  mod/notifications/actions/save.php, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/notifications/languages/en.php,
+  mod/notifications/start.php, .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/jsfuncs.php,
+  .../notifications/subscriptions/personal.php: merged in notifications plugin
+  cleanup from 1.7 branch: [5962], [5978] - [5980], [6000] 
+
+2010-05-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messageboard/actions/add.php, mod/messageboard/actions/delete.php,
+  mod/messageboard/ajax_endpoint/load.php, mod/messageboard/history.php,
+  mod/messageboard/index.php, mod/messageboard/languages/en.php,
+  mod/messageboard/readme.txt, mod/messageboard/start.php,
+  .../views/default/messageboard/css.php,
+  .../views/default/messageboard/forms/add.php,
+  .../default/messageboard/group_messageboard.php,
+  .../views/default/messageboard/messageboard.php,
+  .../default/messageboard/messageboard_content.php,
+  .../default/river/object/messageboard/create.php,
+  .../views/default/widgets/messageboard/edit.php,
+  .../views/default/widgets/messageboard/view.php: merging messageboard cleanup
+  from 1.7 branch [5908],[5909],[5917] 
+
+2010-05-12  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/register.php, engine/lib/elgglib.php, engine/lib/sites.php,
+  mod/sitepages/start.php: Creating a hook for plugin authors to register
+  Walled Garden public sites.  
+
+2010-05-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/languages/en.php: removed a duplicate lang string 
+
+  	* .../views/default/bookmarks/group_bookmarks.php: fix so group bookmarks
+  display on group frontpage 
+
+2010-05-11  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_advanced.php,
+  actions/systemsettings/install.php, engine/lib/elgglib.php,
+  engine/lib/sites.php, engine/lib/upgrades/2010050701.php,
+  views/default/admin/site/advanced.php: Do not display site pages when in
+  Walled Garden mode, excepting system-defined whitelist.  
+
+  	* account/register.php: Not allowing new user registration to continue
+  action when disabled.  
+
+2010-05-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Fixed a typo.  
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php,
+  views/default/navigation/submenu_item.php: Fix admin area for overview and
+  appearance.  
+
+2010-05-10  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/elgg_topbar_logout.php: Breaking logout link into
+  a separate view.  
+
+2010-05-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/tests/ui/submenu.php,
+  .../default/admin/components/admin_page_layout.php,
+  views/default/admin/components/sidemenu.php,
+  views/default/navigation/submenu_item.php, views/default/output/url.php,
+  views/default/page_elements/owner_block.php: Admin area now uses standard
+  submenu tools.  
+
+2010-05-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/basic_elements/welcome.php, views/default/welcome.php,
+  views/default/welcome/logged_in.php, views/default/welcome/logged_out.php:
+  removing more views that haven't been used/touched in almost 2 years 
+
+  	* views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php: removing some chuff that's been just sitting
+  there for a long time - these views ended up in the external pages/site pages
+  plugins 
+
+2010-05-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Not setting $item->selected on a submenu item acts
+  the same as setting it to NULL for selected state guessing. Removed unused
+  code in submenu system.  
+
+  	* engine/lib/elgglib.php, engine/tests/ui/submenu.php,
+  views/default/canvas_header/submenu_group.php,
+  views/default/canvas_header/submenu_template.php, views/default/css.php,
+  views/default/navigation/submenu_group.php,
+  views/default/navigation/submenu_item.php,
+  views/default/navigation/submenu_js.php: Added new submenu system. Added
+  elgg_http_url_is_identical(). Moved canvas_header/submenu* to
+  navigation/submenu*. Added UI test for submenu.   
+
+2010-05-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_advanced.php, actions/register.php,
+  actions/systemsettings/install.php, engine/lib/upgrades/2010050701.php,
+  version.php, views/default/account/forms/login.php,
+  views/default/account/forms/login_dropdown.php,
+  views/default/admin/site/advanced.php: Adding an option to restrict new user
+  registration in advanced site settings.  This is the first step in fully
+  merging "Walled Garden" plugin into core Elgg engine.  
+
+2010-05-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php,
+  actions/admin/plugins/simple_update_states.php,
+  actions/admin/site/update_advanced.php, actions/admin/site/update_basic.php,
+  actions/login.php, actions/plugins/settings/save.php, actions/register.php,
+  actions/systemsettings/install.php, admin/index.php, admin/menu_items.php,
+  admin/plugins.php, admin/site.php, admin/statistics.php, admin/user.php,
+  engine/lib/actions.php, engine/lib/admin.php, engine/lib/plugins.php,
+  engine/lib/sessions.php, languages/en.php, mod/blog/manifest.xml,
+  mod/blog/views/default/blog/forms/edit.php, mod/bookmarks/manifest.xml,
+  mod/captcha/manifest.xml, mod/categories/actions/save.php,
+  mod/categories/languages/en.php, mod/categories/manifest.xml,
+  mod/categories/settings.php, mod/categories/start.php,
+  mod/categories/views/default/categories/css.php,
+  .../views/default/categories/settings.php,
+  .../views/default/categories/settingsform.php,
+  .../views/default/settings/categories/edit.php, mod/crontrigger/manifest.xml,
+  mod/custom_index/manifest.xml, mod/defaultwidgets/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/ecml/manifest.xml, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/admin/ecml_admin.php,
+  mod/ecml/views/default/settings/ecml/edit.php, mod/embed/manifest.xml,
+  mod/externalpages/manifest.xml, mod/file/manifest.xml,
+  mod/friends/manifest.xml, mod/garbagecollector/manifest.xml,
+  mod/groups/manifest.xml, mod/htmlawed/manifest.xml,
+  mod/invitefriends/manifest.xml, mod/logbrowser/manifest.xml,
+  mod/logrotate/manifest.xml, mod/members/manifest.xml,
+  mod/messageboard/manifest.xml, mod/messages/manifest.xml,
+  mod/notifications/manifest.xml, mod/pages/manifest.xml,
+  mod/profile/manifest.xml, mod/reportedcontent/manifest.xml,
+  mod/riverdashboard/manifest.xml, mod/search/manifest.xml,
+  mod/sitepages/manifest.xml, mod/tagcloud/manifest.xml,
+  mod/thewire/manifest.xml, mod/tinymce/manifest.xml, mod/twitter/manifest.xml,
+  mod/uservalidationbyemail/manifest.xml, mod/walledgarden/manifest.xml,
+  mod/zaudio/manifest.xml, views/default/admin/appearance/menu_items.php,
+  .../default/admin/components/admin_page_layout.php,
+  views/default/admin/components/plugin.php,
+  views/default/admin/components/plugin_settings.php,
+  views/default/admin/components/sidemenu.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/menu_items.php,
+  views/default/admin/overview.php,
+  views/default/admin/overview/numentities.php,
+  views/default/admin/overview/online.php, views/default/admin/plugins.php,
+  views/default/admin/plugins/advanced.php,
+  views/default/admin/plugins/simple.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/site/advanced.php, views/default/admin/site/basic.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/search.php, views/default/admin/users/add.php,
+  views/default/admin/users/find.php, views/default/admin/users/online.php,
+  views/default/css.php, views/default/object/admin_notice.php: Merged
+  18_new_admin branch to trunk.  
+
+2010-05-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/usersettings/form.php: Added ID to submit button on user
+  settings form. 
+
+  	* views/default/canvas_header/submenu_group.php: Updated submenu with
+  missing groupname. 
+
+  	* mod/profile/views/default/profile/editicon.php: Addition of a wrapper on
+  edit avatar page for theming purposes. 
+
+2010-05-04  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: Returning extended view to
+  original location in code (to preserve CSS rendering).  
+
+2010-05-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php: Updated avatar sub-menu font
+  sizes. 
+
+2010-05-04  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php, .../views/default/profile/topbar_extend.php:
+  Extending topbar view to include My Friends link.  
+
+  	* views/default/page_elements/elgg_topbar.php: Removing hard-coded plugin
+  extensions from core topbar.  
+
+2010-05-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/views/default/bookmarks/form.php: Added id to bookmark edit
+  form (for use theming). 
+
+  	* .../default/profile/commentwall/commentwall.php: Minor update to the
+  comment wall wrapper div. 
+
+2010-05-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: Fixes #1480 - not passing empty array element
+  from page_handler()  
+
+2010-04-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/groupsform.php,
+  views/default/usersettings/plugins.php: Minor updates to User Settings
+  interface. 
+
+  	* mod/search/views/default/search/entity.php: Search results float cleared. 
+
+2010-04-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/activity.php,
+  .../views/default/riverdashboard/css.php: Updated activity stream on users
+  Profile to include riverdashboard js. Added extra css rules for inline
+  comments and likes on profile activity. 
+
+  	* mod/profile/views/default/profile/edit.php, views/default/css_ie.php,
+  views/default/js/initialise_elgg.php: Updates to Profile edit, likes js, and
+  tools css for IE7 rendering. 
+
+2010-04-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/tabs.php: Added navigation/tabs view for tabbed
+  navigation.  
+
+2010-04-27  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/start.php: Restricting external user creation from
+  Facebook Services.  
+
+2010-04-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: if the activity stream is enabled show on the frontpage, if
+  not, list entities. 
+
+2010-04-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/css_ie.php: More fixes for IE
+  rendering (entity listings, private messages, topbar, profile, activity) 
+
+2010-04-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/languages/en.php, mod/sitepages/start.php: Updated language
+  strings for site page ecml  
+
+  	* mod/ecml/languages/en.php, mod/ecml/start.php: Removed view and entity
+  ECML. Updated language strings.  
+
+  	* mod/sitepages/start.php, .../views/default/sitepages/forms/editfront.php:
+  Only admin users can view site pages. Corrected ECML default for site pages.
+  Moved view and entity ECML keywords to sitepages and restricted them.  
+
+  	* engine/lib/users.php, mod/blog/manifest.xml, mod/riverdashboard/index.php,
+  mod/riverdashboard/manifest.xml, mod/riverdashboard/start.php,
+  .../views/default/river/item/list.php,
+  views/default/account/forms/login_dropdown.php: Graceful degrading for non-JS
+  users on the dropdown login box.  
+
+  	* mod/ecml/views/default/ecml/admin/ecml_admin.php: Fixed admin area
+  language string.  
+
+  	* .../views/default/river/object/blog/create.php: Fixes #2098: River view
+  for blog pulls correct time.  
+
+  	* engine/lib/plugins.php: Plugins are *required* to have a manifest.xml
+  file.  
+
+2010-04-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/item/wrapper.php, views/default/css_ie.php:
+  Updates to riverdashboard wrapper for IE rendering. Temporary IE rules for
+  riverdashboard added to css_ie.php. 
+
+2010-04-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php, mod/groups/index.php, mod/groups/membership.php:
+  Updated calls to content_header to point to correct new link in groups.  
+
+  	* mod/bookmarks/add.php, mod/bookmarks/all.php, mod/bookmarks/friends.php,
+  mod/bookmarks/index.php, mod/bookmarks/start.php: Bookmarks work with groups
+  and use new style content header filter.  
+
+2010-04-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login_dropdown.php, views/default/css.php:
+  Updates to homepage layout and drop-down login for IE. 
+
+  	* mod/groups/views/default/forms/groups/edit.php: Update to edit Groups page
+  for ECML and longtext controls positioning. 
+
+  	* .../views/default/sitepages/forms/editfront.php: Updated SitePages with
+  example homepage markup/ECML. 
+
+  	* .../views/default/sitepages/forms/editfront.php, views/default/css.php:
+  Update to SitePages and CSSEditor code input fields, code input (monospaced
+  style) added to base css file. 
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/icon.php: Update to site user avatars to
+  use CSS3 rounding for modern browsers. Older browsers will display as square
+  avatars. 
+
+2010-04-26  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Fixes #2084 - layout issue with front page  
+
+2010-04-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/account/forms/login.php,
+  .../default/page_shells/walled_garden_index.php,
+  .../views/default/walledgarden/css.php: Updated WalledGarden login page for
+  correct rendering in IE. 
+
+  	* languages/en.php, .../views/default/account/forms/login.php,
+  .../default/page_shells/walled_garden_index.php: Updates to WalledGarden
+  login. Lost password text simplified/shortened, text spacing adjusted, rule
+  added to prevent custom css page background from showing on walledgarden
+  login page. 
+
+2010-04-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/graphics/background_bottom.gif,
+  mod/walledgarden/graphics/background_extend.gif,
+  mod/walledgarden/graphics/background_top.gif,
+  .../views/default/account/forms/login.php,
+  .../default/page_shells/walled_garden_index.php,
+  .../views/default/walledgarden/css.php: Updated walledgarden login. 
+
+  	* mod/groups/views/default/forms/forums/addtopic.php: Completed breadcrumb
+  for addtopic (missed in 5855) 
+
+  	* mod/ecml/start.php, mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/input_ext.php, mod/embed/languages/en.php,
+  mod/embed/start.php, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/link.php,
+  .../views/default/expages/forms/edit.php,
+  mod/externalpages/views/default/expages/menu.php,
+  mod/file/views/default/file/upload.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/messages.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../views/default/reportedcontent/form.php, mod/tinymce/languages/en.php,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  views/default/comments/forms/edit.php, views/default/css.php,
+  views/default/upload/upload_form_content.php: Updated longtext/tinymce area
+  extra controls. Moved and updated ecml help link, 'edit/remove editor' link
+  and 'add media' links both moved and improved. Redundant css removed. 
+
+2010-04-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/index.php, .../views/default/account/forms/login.php,
+  .../default/account/forms/login_walledgarden.php: small walled garden tweak 
+
+  	* mod/sitepages/start.php: frontpage creation respects walledgarden 
+
+  	* .../default/account/forms/login_walledgarden.php: included a view for
+  plugins to extend 
+
+  	* mod/walledgarden/index.php, mod/walledgarden/start.php,
+  .../default/account/forms/login_walledgarden.php,
+  .../default/page_shells/walled_garden_index.php: The start of a new walled
+  garden index page 
+
+2010-04-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/forum.php, mod/groups/views/default/forum/viewposts.php:
+  Completed breadcrumbs for Groups Forums. 
+
+2010-04-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/all.php, mod/bookmarks/index.php: Updated booksmarks to 1.7
+  API.  
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/sharing/invite.php,
+  .../views/default/widgets/a_users_groups/view.php: Updated groups to 1.7 api.
+   
+
+2010-04-22  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/object/groupforumtopic.php: group forum discussion view
+  updated to match the community 
+
+  	* .../views/default/object/groupforumtopic.php: a small tweak so latest
+  discussion shows the last user to comment. 
+
+2010-04-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Cleaned up some comments about group acl hooks.  
+
+  	* mod/blog/views/default/blog/sidebar_revisions.php: Cleaned up code to show
+  revisions. Added ability to go to published revision.  
+
+  	* mod/blog/views/default/blog/forms/edit.php: Decoding html entities for
+  blog excerpts in edit form.  
+
+  	* mod/blog/blog_lib.php, mod/blog/views/default/object/blog.php: Blog
+  excerpts now work for MB strings and properly detect word breaks.  
+
+  	* mod/blog/blog_lib.php: Removing unneeded order by metadata.  
+
+  	* mod/blog/blog_lib.php: Rewriting time_created and time_updated instead of
+  trying to be tricky with metadata.  
+
+2010-04-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/profile/profile_ownerblock.php: profile owner block can
+  now be viewed while logged out. 
+
+  	* mod/groups/start.php: a simple function which can be used to restrict
+  group access options 
+
+  	* .../default/river/object/bookmarks/create.php: bookmark activity view
+  altered to work with both the classic and new versions of activity. 
+
+  	* .../views/default/river/object/blog/create.php: remove likes and comments
+  from blog activity view if in classic mode 
+
+  	* engine/lib/river2.php, .../default/profile/profile_contents/activity.php,
+  mod/riverdashboard/index.php, mod/riverdashboard/languages/en.php,
+  .../views/default/river/item/wrapper_classic.php,
+  .../views/default/settings/riverdashboard/edit.php: let site admins toggle
+  between a classic activity stream or the new clustered version 
+
+2010-04-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: cleaning up [5822] - putting elgg_format_url() in
+  the same location in elgglib.php 
+
+2010-04-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/start.php,
+  .../views/default/settings/riverdashboard/edit.php: Removed toggle for
+  overriding river dashboard.  If the plugin is enabled, the dashboard is
+  enabled.  
+
+  	* engine/lib/elgglib.php: Merge previous to trunk.  
+
+2010-04-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_sprites.png, index.php,
+  views/default/account/forms/login_dropdown.php, views/default/css.php,
+  views/default/page_elements/elgg_header.php: Added the beginnings of a
+  drop-down login box for Elgg as an alternative to the front-page login box in
+  the homepage sidebar. 
+
+2010-04-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/languages/en.php: Fixed missing language string in admin  
+
+  	* mod/ecml/views/default/ecml/admin/ecml_admin.php: Added smarter check all
+  checkboxes for ECML admin area.  
+
+  	* mod/search/index.php, mod/search/search_hooks.php: Merged previous to
+  trunk.  
+
+2010-04-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/river/object/bookmarks/create.php: #2087 fixed 
+
+2010-04-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Updated docs for types and subtypes in
+  elgg_get_entities().  
+
+2010-04-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: pass the entity so other plugins
+  can extend properly 
+
+  	* mod/ecml/start.php: correct layout applied to ecml help page 
+
+  	* mod/sitepages/actions/addfront.php: missing ] added to the frontpage
+  action file 
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Merged type_subtype_pair fix from 1.7 branch.  
+
+2010-04-16  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/start.php: Removed attempt to hook into system index page
+  from Walled Garden.  This is unnecessary at best, and conflicts entirely when
+  custom login Site Pages are used.  
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Fixing a logged out problem with group access.  
+
+2010-04-16  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/languages/en.php, mod/walledgarden/start.php: Registering
+  a Walled Garden hook which will not allow new user signup with Twitter
+  Services.  
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Only showing group access levels within group
+  contexts. Not showing unrelated access levels within group contexts.  
+
+2010-04-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/bookmarks/group_bookmarks.php,
+  mod/file/views/default/file/css.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/widgets/filerepo/view.php: Removed js drop-down
+  description on group profile tools widgets. 
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/actions/save_permissions.php, mod/ecml/languages/en.php,
+  mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/admin/ecml_admin.php: ECML permissions frontend
+  presents a whitelist instead of a black list.  
+
+2010-04-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_sprites.png, engine/lib/users.php, views/default/css.php,
+  views/default/page_elements/elgg_topbar.php: Friends link removed from
+  primary nav and added to top toolbar. 
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/ecml/activity.php: Fixed activity stream
+  ecml view.  
+
+  	* mod/sitepages/languages/en.php, mod/sitepages/start.php: Removed some left
+  over code from decoupling ECML. Fixed help files for [[ -> [ transition.  
+
+  	* mod/ecml/README.txt, mod/ecml/languages/en.php, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/help.php: ECML now only requires a single square
+  bracket.  
+
+  	* mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/ecml/activity.php: Added activity ecml
+  keyword.  
+
+  	* mod/sitepages/actions/addfront.php: Correctly checking for logoutbox for
+  custom front pages.  
+
+  	* mod/thewire/actions/add.php: Fix the name of the input in the wire's add
+  action.  
+
+2010-04-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/blog/views/default/blog/sidebar_menu.php: Tagcloud
+  localized and updated on blogs. 
+
+  	* views/default/css.php: Tweaked 'Likes' icon css. 
+
+  	* views/default/css.php: Updated tools menu spacing and added selected class
+  rule for tools submenu items. 
+
+  	* _graphics/indicator.gif: Removed unused indicator gif. Spinners across the
+  site have been updated to use elgg's ajax_loader gif, except Shared Access
+  mod which still uses indicator gif - which is now in the shared access plugin
+  bundle. 
+
+2010-04-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/indicator.gif, engine/lib/elgglib.php,
+  mod/categories/actions/save.php, mod/categories/languages/en.php,
+  mod/categories/listing.php, mod/categories/settings.php,
+  mod/categories/start.php, mod/categories/views/default/categories.php,
+  mod/categories/views/default/categories/list.php,
+  .../views/default/categories/settings.php,
+  mod/categories/views/default/categories/view.php,
+  mod/profile/actions/cropicon.php, mod/profile/icondirect.php,
+  mod/profile/start.php, mod/search/search_hooks.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity.php,
+  mod/thewire/views/rss/object/thewire.php: Merged [5623]:head from 1.7 to
+  trunk.  
+
+  	* mod/ecml/start.php, mod/ecml/views/default/ecml/keywords/blip.tv.php,
+  .../views/default/ecml/keywords/dailymotion.php,
+  mod/ecml/views/default/ecml/keywords/livevideo.php,
+  mod/ecml/views/default/ecml/keywords/redlasso.php: Added more video sources.
+  Allowing the . character in keywords.  
+
+2010-04-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/views/default/ecml/admin/ecml_admin.php: Added ability to check
+  all rows or columns in ecml permissions page.  
+
+  	* mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/admin/ecml_admin.php: Inverted the admin matrix
+  for ecml views / keywords.  
+
+  	* mod/sitepages/languages/en.php, mod/sitepages/start.php,
+  .../default/sitepages/keywords/site_stats.php,
+  .../views/default/sitepages/keywords/sitestats.php,
+  .../views/default/sitepages/keywords/user_list.php,
+  .../views/default/sitepages/keywords/userlist.php: Added usage to the
+  keywords. Restricting keywords to userlist, loginbox, and sitestats to custom
+  front page.  
+
+  	* mod/ecml/start.php: Correctly setting context to admin to pull in the
+  admin sidebar for ECML permissions page.  
+
+  	* mod/ecml/README.txt: Updated docs with a FAQ.  
+
+2010-04-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/groups/activity_latest.php: Activity view added for
+  Groups profile page, based on code by Jon Maul. 
+
+2010-04-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: Jon Maul added as a contributor with MITRE.  
+
+  	* mod/blog/blog_lib.php, mod/blog/views/default/object/blog.php: Separated
+  blog object view from comments.  
+
+  	* mod/ecml/ecml_functions.php,
+  mod/ecml/views/default/ecml/admin/ecml_admin.php: Added ability for ECML
+  keyword definitions to restrict themselves to specific views.  
+
+2010-04-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/start.php, mod/ecml/views/default/ecml/admin/ecml_admin.php:
+  Small UI updates to ECML. 
+
+  	* mod/search/views/default/search/entity.php, views/default/css.php: Update
+  to search results view, and small entity list style updates. 
+
+2010-04-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/README.txt, mod/ecml/actions/save_permissions.php,
+  mod/ecml/ecml_functions.php, mod/ecml/languages/en.php, mod/ecml/start.php,
+  mod/ecml/views/default/ecml/admin/css.php,
+  mod/ecml/views/default/ecml/admin/ecml_admin.php,
+  .../views/default/ecml/keywords/googlemaps.php: Added granular access for
+  views in ECML. Added 'usage' on keyword info. Updated docs.  
+
+  	* mod/ecml/start.php, .../views/default/ecml/keywords/googlemaps.php:
+  Googlemaps support added for ECML.  
+
+  	* mod/ecml/views/default/ecml/help.php: ECML keyword help page now properly
+  lists all registered keywords.  
+
+  	* mod/sitepages/start.php: Removed _ from Site Pages ECML keywords.  
+
+  	* mod/ecml/README.txt, mod/ecml/ecml_functions.php, mod/ecml/manifest.xml,
+  mod/ecml/start.php: Updated ECML docs. Removed the _ as a valid keyword
+  character (it looks funny). Added the media sites in start.php. Fixed bug
+  that prevented [[view]] from working.  Consequently, [[view]] now requires a
+  src="" attribute.  
+
+2010-04-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/start.php, mod/ecml/views/default/ecml/keywords/vimeo.php: Added
+  vimeo support to ECML.  
+
+  	* mod/ecml/ecml_functions.php, mod/ecml/start.php,
+  .../views/default/ecml/keywords/slideshare.php,
+  mod/ecml/views/default/ecml/keywords/youtube.php: Changed tokenizer for ECML
+  to support attribute quotes. Added core youtube and slideshare keywords.
+  Passing the full keyword and attribute string to views.   
+
+  	* mod/blog/start.php: Added ECML support in blogs.  
+
+2010-04-13  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Creating a function to clear user-specific plugin
+  settings.  
+
+2010-04-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/ecml/start.php: Remove unneeded check in ecml view hook.  
+
+  	* mod/ecml/start.php: ECML uses the brand new granular view hooks.  
+
+  	* mod/blog/languages/en.php: Added item:object:blog language key for stats. 
+
+  	* engine/lib/elgglib.php: Added granular view hook view:$view_name instead
+  of a monolithic display:view hook.  
+
+  	* mod/ecml/start.php: Update todo.  
+
+  	* mod/ecml/README.txt, mod/ecml/ecml_functions.php,
+  mod/ecml/graphics/ecml.png, mod/ecml/languages/en.php, mod/ecml/manifest.xml,
+  mod/ecml/start.php, mod/ecml/views/default/ecml/help.php,
+  mod/ecml/views/default/ecml/input_ext.php,
+  mod/ecml/views/default/ecml/keywords/user_list.php: First version of ecml.  
+
+  	* mod/sitepages/README.txt, mod/sitepages/languages/en.php,
+  mod/sitepages/manifest.xml, mod/sitepages/sitepages_functions.php,
+  mod/sitepages/start.php, mod/sitepages/views/default/sitepages/keywords.php,
+  .../views/default/sitepages/keywords/user_list.php: Removed ECML from Site
+  Pages.  
+
+2010-04-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/bookmarks/group_bookmarks.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/groups/languages/en.php, mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/river/item/wrapper.php: Groups profile page tool widget
+  boxes updated. 
+
+  	* views/default/css.php, views/default/page_elements/elgg_header.php:
+  Updates to site header and css for Custom Logo mod. 
+
+2010-04-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/README.txt, mod/sitepages/actions/addfront.php,
+  mod/sitepages/languages/en.php, mod/sitepages/sitepages_functions.php,
+  mod/sitepages/start.php, .../default/sitepages/keywords/site_stats.php,
+  .../views/default/sitepages/keywords/user_list.php: Updated site pages docs.
+  Added ability to pass arguments to custom keywords. Added user_list keyword.
+  Reject logged out front pages that don't have [[login_box]].  
+
+  	* mod/sitepages/manifest.xml, mod/sitepages/sitepages_functions.php: Added
+  'customization' category to manifest. Cleaned up some comments.  
+
+  	* mod/sitepages/start.php: Checking if we need to pull in a view before
+  calling it.  
+
+  	* mod/sitepages/views/default/sitepages/menu.php: DRY'd up the edit code in
+  site pages.  
+
+  	* mod/sitepages/README.txt: Added docs for site pages.  
+
+2010-04-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/defaultprofile.php, mod/profile/languages/en.php,
+  mod/profile/views/default/profile/css.php,
+  .../default/profile/editdefaultprofileitems.php: Updated custom profile
+  fields admin area / list re-ordering ui. 
+
+  	* _graphics/avatar_menu_arrows.gif, _graphics/elgg_sprites.png,
+  _graphics/elgg_toolbar_logout.gif, _graphics/friends_picker_arrows.gif,
+  _graphics/icon_bookmarkthis.gif, _graphics/icon_customise_drag.gif,
+  _graphics/icon_customise_info.gif, _graphics/icon_customise_remove.gif,
+  _graphics/icon_customise_remove.png, _graphics/icon_delete.png,
+  _graphics/icon_gallery.gif, _graphics/icon_like.png, _graphics/icon_odd.gif,
+  _graphics/icon_reportthis.gif, _graphics/icon_rss.gif,
+  _graphics/icon_rss.png, _graphics/icon_tag.gif, _graphics/icon_tag.png,
+  _graphics/more_sprite.png, _graphics/river_icons/river_icon_blog.gif,
+  _graphics/river_icons/river_icon_bookmarks.gif,
+  _graphics/river_icons/river_icon_comment.gif,
+  _graphics/river_icons/river_icon_feed.gif,
+  _graphics/river_icons/river_icon_files.gif,
+  _graphics/river_icons/river_icon_forum.gif,
+  _graphics/river_icons/river_icon_friends.gif,
+  _graphics/river_icons/river_icon_messageboard.gif,
+  _graphics/river_icons/river_icon_pages.gif,
+  _graphics/river_icons/river_icon_plugin.gif,
+  .../river_icons/river_icon_privatemessage.gif,
+  _graphics/river_icons/river_icon_profile.gif,
+  _graphics/river_icons/river_icon_status.gif,
+  _graphics/river_icons/river_icon_thewire.gif, _graphics/search.png,
+  _graphics/speech_bubble_tail.gif, _graphics/thewire_speech_bubble.gif,
+  _graphics/topbar_icons.png, _graphics/twitter16px.png,
+  mod/file/views/default/file/css.php,
+  mod/profile/views/default/profile/css.php, mod/twitter/graphics/twitter.png,
+  mod/twitter/graphics/twitter16px.png,
+  mod/twitter/views/default/twitter/css.php, views/default/css.php,
+  views/default/output/rss_view.php: Collected all core sprites into graphics
+  and updated css accordingly. Removed unused core graphics. Moved
+  plugin-specific graphics into respective plugins graphics directories. 
+
+2010-04-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/html_begin.php: Removed custom-form-elements  
+
+2010-04-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/toolbar_messages_icon.gif,
+  mod/messages/graphics/toolbar_messages_icon.gif,
+  mod/messages/views/default/messages/css.php: Messages icon removed form main
+  css and graphics and added to messages mod. 
+
+  	* _graphics/icon_like.png, languages/en.php, views/default/css.php,
+  views/default/js/initialise_elgg.php, views/default/likes/forms/edit.php:
+  Icon added to likes and interface tweaked. Likes list js fixed to correctly
+  get height of current list. 
+
+  	* languages/en.php, mod/blog/views/default/object/blog.php,
+  mod/profile/views/default/profile/css.php, views/default/css.php,
+  views/default/likes/forms/edit.php: Likes updated for plugins entity list
+  display (just icon remaining to add) 
+
+2010-04-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php, views/default/page_elements/content_header.php:
+  create a new group button added 
+
+  	* .../views/default/bookmarks/group_bookmarks.php: change group bookmarks to
+  get from container guid 
+
+2010-04-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: Updated Likes on Blog and
+  Videolist single entity pages 
+
+  	* .../views/default/riverdashboard/css.php, views/default/css.php,
+  views/default/js/initialise_elgg.php, views/default/likes/forms/edit.php:
+  Added a popup list of users for Likes. 
+
+2010-04-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php: Allow login via email.  
+
+2010-04-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_header.php: allow for a site logo 
+
+2010-04-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/twitterservice/languages/en.php, mod/twitterservice/manifest.xml,
+  mod/twitterservice/start.php, mod/twitterservice/vendors/twitter/license.txt,
+  mod/twitterservice/vendors/twitter/load.php,
+  mod/twitterservice/vendors/twitter/readme.txt,
+  mod/twitterservice/vendors/twitter/send.php,
+  .../vendors/twitter/twitter.class.php,
+  .../default/usersettings/twitterservice/edit.php: Moving Twitter Service
+  plugin from core into the plugins directory.  
+
+  	* mod/blog/languages/en.php: Adding a language definition.  
+
+2010-04-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/item/wrapper.php: conversations now use
+  generic_comments for replies so no need for the extra logic in the river
+  wrapper. 
+
+2010-04-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/addcomment.php, mod/profile/actions/deletecomment.php,
+  mod/profile/actions/editfield.php, mod/profile/actions/reorder.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  .../default/profile/editdefaultprofileitems.php,
+  .../profile/profile_contents/commentwall.php: Removed windows line endings.  
+
+  	* mod/profile/actions/deletedefaultprofileitem.php,
+  .../default/profile/editdefaultprofileitems.php: Fixed incorrect casting to
+  int for profile ids. Fixed incorrect URL for reordering.  
+
+  	* mod/profile/start.php: Fixed displaying of custom profile fields on
+  profile page.  
+
+  	* mod/profile/start.php, .../default/profile/editdefaultprofileitems.php:
+  Fixed editable profile fields.  
+
+  	* mod/profile/vendor/jq.editable.min.js,
+  mod/profile/vendor/jquery.jeditable.mini.js,
+  .../default/profile/editdefaultprofileitems.php: Wrong jquery editable lib.  
+
+  	* mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/editdefault.php, mod/profile/actions/editfield.php,
+  mod/profile/actions/reorder.php, mod/profile/actions/resetdefaultprofile.php,
+  mod/profile/defaultprofile.php, mod/profile/graphics/drag_handle.png,
+  mod/profile/languages/en.php, mod/profile/manifest.xml,
+  mod/profile/start.php, mod/profile/vendor/jq.editable.min.js,
+  .../views/default/profile/editdefaultprofile.php,
+  .../default/profile/editdefaultprofileitems.php: First go at merging in
+  draggable profile fields. Added categories to profile plugin.  
+
+  	* engine/lib/elgglib.php: Added optional html_encode parameter to
+  elgg_add_action_tokens_to_url() so it can be used in ajax calls.  
+
+2010-04-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php, mod/blog/languages/en.php, mod/blog/start.php:
+  Highlighting current tab in content header.  Includes updates to language
+  strings.  
+
+2010-04-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/index.php: mine tab selects correctly now 
+
+2010-04-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php, mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/object/blog.php: Creating content for the blog posts
+  of user's friends.  
+
+2010-04-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php: Fixed broken interface on
+  updated plugin list 
+
+2010-04-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/views/default/blog/forms/edit.php: Updating autosave handler and
+  "Saved date" return values.  
+
+  	* engine/lib/metadata.php: Ensuring malformed offset/limit values are
+  ignored by elgg_list_entities_from_metadata().  Refs #2046  
+
+2010-04-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, .../views/default/river/object/blog/create.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  views/default/annotation/annotate.php, views/default/annotation/likes.php,
+  views/default/css.php, views/default/js/initialise_elgg.php,
+  views/default/likes/forms/display.php, views/default/likes/forms/edit.php,
+  views/default/likes/forms/link.php: Riverdashboard refreshed, and updated
+  display of comments and likes (the loading of these needs to be moved to ajax
+  callbacks) 
+
+2010-04-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/feeds.php,
+  .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php: profile feeds moved from
+  top tabs 
+
+2010-04-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/settings/system.php: Removed installation usage settings.  
+
+2010-04-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/css.php,
+  views/default/js/initialise_elgg.php: Added screenshots to plugins list.  
+
+2010-04-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: 
+
+  	* CONTRIBUTORS.txt: upon request 
+
+2010-04-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Sanitise int on the offset.  
+
+2010-04-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_footer.php: Footer float cleared for
+  theming purposes. 
+
+2010-04-05  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/save.php, mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/input/datetime.php: Adding a datetime view for use
+  with blog publication.  
+
+2010-04-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php, languages/en.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php: Added category and name as valid
+  plugin manifest keys/values.  
+
+2010-04-05  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Metadata lists will default offset and limit to
+  existing url elements.  
+
+2010-04-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: load_plugin_manifest() converts multiple keys with
+  the same name into assoc arrays.  
+
+2010-04-05  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog.php: Ensuring generic text line breaks
+  are replaced by paragraph tags.  
+
+  	* engine/lib/metadata.php: Passing entity list options on to view.  
+
+  	* engine/lib/elgglib.php: Refs #1947: Do not require views to explicitly
+  pass in the offset.  
+
+2010-04-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/input.php, engine/schema/mysql.sql,
+  mod/htmlawed/start.php, mod/messages/views/default/messages/css.php,
+  .../notifications/subscriptions/forminternals.php,
+  mod/profile/actions/edit.php, mod/search/languages/en.php,
+  mod/search/search_hooks.php, mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/rss/search/comments/entity.php,
+  views/default/account/forms/register.php, views/default/friends/picker.php,
+  views/default/output/friendlytitle.php: Merged 5605:5622 from 1.7 to trunk.  
+
+  	* CHANGES.txt, actions/admin/user/makeadmin.php,
+  actions/admin/user/removeadmin.php, actions/register.php,
+  actions/useradd.php, engine/lib/actions.php, engine/lib/annotations.php,
+  engine/lib/database.php, engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/lib/group.php, engine/lib/metadata.php, engine/lib/notification.php,
+  engine/lib/river2.php, engine/lib/sessions.php,
+  engine/lib/upgrades/2010033101.php, engine/lib/upgrades/2010040201.php,
+  engine/lib/users.php, engine/lib/widgets.php,
+  engine/schema/upgrades/2009100701.sql,
+  engine/tests/api/entity_getter_functions.php, engine/tests/objects/users.php,
+  languages/en.php, mod/bookmarks/index.php, mod/bookmarks/start.php,
+  .../views/default/widgets/bookmarks/edit.php, mod/file/index.php,
+  mod/file/start.php, mod/file/views/default/widgets/filerepo/edit.php,
+  mod/file/views/default/widgets/filerepo/view.php, mod/groups/discussions.php,
+  mod/pages/index.php, mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/profile/actions/edit.php,
+  mod/profile/icondirect.php, .../views/default/profile/menu/adminlinks.php,
+  mod/search/index.php, mod/thewire/actions/add.php, mod/thewire/everyone.php,
+  mod/thewire/languages/en.php, mod/thewire/start.php,
+  .../views/default/thewire/activity_view.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/widgets/thewire/edit.php,
+  mod/thewire/views/default/widgets/thewire/view.php,
+  .../views/rss/search/object/thewire/entity.php, version.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/output/friendlytime.php,
+  views/default/output/friendlytitle.php, views/default/output/url.php,
+  views/default/page_elements/elgg_topbar.php: Merged 5530:5604 from 1.7 to
+  trunk.  
+
+  	* engine/lib/entities.php, mod/bookmarks/actions/add.php,
+  mod/embed/views/default/embed/media.php,
+  mod/embed/views/default/embed/pagination.php, mod/file/actions/save.php,
+  mod/groups/actions/edit.php, mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/members/index.php,
+  mod/members/views/default/members/search.php, mod/messages/actions/send.php,
+  mod/pages/actions/pages/edit.php, views/default/output/url.php,
+  views/failsafe/messages/sanitisation/settings.php: Merged 5487:5525 from 1.7
+  to trunk.  
+
+2010-04-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/feeds.php: count added 
+
+  	* mod/profile/profile_lib.php,
+  .../default/profile/profile_contents/feeds.php,
+  .../views/default/profile/profile_navigation.php: feeds options added to the
+  profile 
+
+  	* views/default/account/forms/login.php: return to referer added to the
+  login form 
+
+2010-04-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/forminternals.php: merged [5526] - [5530]
+  into trunk from 1.7 branch - there are more changes before and after these
+  revisions to be merged 
+
+  	* views/default/admin/plugins.php: the disable button may be for disabling
+  plugins but it is not disabled itself 
+
+  	* CHANGES.txt, engine/lib/elgglib.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php: Fixes #1184 - added
+  elgg_format_url() for handling ampersands in urls 
+
+  	* views/default/page_elements/elgg_topbar.php: target is not allowed in
+  xhtml strict 
+
+  	* views/default/account/forms/login.php: fixed some markup issues with login
+  box 
+
+  	* views/default/navigation/site_nav.php: only display navigation if there
+  are registered nav items - cannot have ul element without li elements 
+
+  	* views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/html_begin.php: removed two elements not allowed
+  with xhtml strict and removed blank line at top of html sent to browser 
+
+2010-04-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/site_nav.php: Fixed the empty nav item entries
+  when automatically building menu.  
+
+2010-04-02  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php: Determining which content header to use based on
+  blog owner.  Primary navigation tabs should not display on other users' blog
+  lists.  
+
+  	* mod/blog/blog_lib.php, mod/blog/languages/en.php: Allowing non-owners to
+  view published blog posts.  
+
+  	* mod/blog/blog_lib.php: Truncating lengthy blog excerpts on word breaks.  
+
+  	* mod/blog/blog_lib.php, mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/object/blog.php: Fixing breadcrumb navigation and
+  content header links for blogs.  
+
+  	* views/default/page_elements/content_header.php: Allowing default page
+  handler to be overridden.  You can pass in full url overrides to the content
+  header view for all/mine/friend tabs.  
+
+2010-04-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/activity.php: limit set for profile
+  river 
+
+  	* views/default/annotation/latest_comments.php: small lang tweak 
+
+  	* mod/groups/start.php: point the groups main nav link to the all groups
+  page 
+
+  	* mod/bookmarks/all.php, mod/bookmarks/languages/en.php,
+  mod/bookmarks/views/default/bookmarks/stats.php: bookmark stats now correct,
+  missing strings applied and a function call moved out of the view. 
+
+  	* mod/profile/start.php: hash out the profile menu option for now, this will
+  be moved to the topbar. 
+
+2010-03-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/more_sprite.png, languages/en.php,
+  views/default/admin/menu_items.php, views/default/css.php,
+  views/default/css_ie.php, views/default/css_ie6.php,
+  views/default/navigation/site_nav.php: Updated site primary nav bar and
+  improved drop-down submenu and made IE compatible, also cleaned up / improved
+  menuitem admin area. 
+
+2010-03-31  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/languages/en.php, .../views/default/river/object/blog/create.php:
+  blog river view altered to pull out some content 
+
+2010-03-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css_ie.php, views/default/css_ie6.php,
+  views/default/page_elements/html_begin.php: Updated paths to IE specific css,
+  and triggered hasLayout for IE. 
+
+2010-03-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/languages/en.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/group_bookmarks.php,
+  mod/groups/views/default/groups/css.php: Added the beginnings of a bookmark
+  view for group profile pages. 
+
+  	* mod/file/start.php, mod/file/views/default/file/groupprofile_files.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/profileitems.php: Added the beginnings of a
+  new method for displaying the latest content from each tool on a groups
+  profile page. 
+
+  	* mod/blog/views/default/blog/sidebar_menu.php: Changed blog archive header
+  tag. 
+
+  	* mod/profile/languages/en.php,
+  .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  mod/profile/views/default/profile/css.php: Updated UI for commentwall on
+  profile page. 
+
+2010-03-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/addcomment.php, mod/profile/actions/deletecomment.php,
+  mod/profile/languages/en.php, mod/profile/profile_lib.php,
+  mod/profile/start.php, .../default/profile/commentwall/commentwall.php,
+  .../profile/commentwall/commentwall_content.php,
+  .../default/profile/commentwall/commentwalladd.php,
+  .../profile/profile_contents/commentwall.php,
+  .../views/default/profile/profile_navigation.php: simple comment wall added
+  to profiles 
+
+  	* .../views/default/profile/profile_navigation.php: inserted a view for
+  others to extend on profile navigation 
+
+2010-03-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/object/blog/create.php: Added river item views to
+  blog.  
+
+  	* README.txt: Changed Ben's email addy in README.txt.  
+
+2010-03-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/likes/forms/edit.php: Updated Likes link. 
+
+  	* languages/en.php, views/default/comments/forms/edit.php: Updated generic
+  comment submit button text. 
+
+2010-03-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Bumped version in README.  
+
+  	* actions/likes/delete.php, mod/bookmarks/actions/edit.php,
+  mod/bookmarks/actions/reference.php, mod/bookmarks/actions/remove.php,
+  mod/bookmarks/views/default/bookmarks/stats.php,
+  .../views/default/members/members_navigation.php,
+  mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  .../views/default/riverdashboard/welcome.php,
+  mod/sitepages/actions/addmeta.php, mod/sitepages/sitepages_functions.php,
+  .../views/default/settings/sitepages/edit.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/keywords.php,
+  mod/sitepages/views/default/sitepages/metatags.php,
+  views/default/annotation/annotatelike.php,
+  views/default/annotation/likes.php, views/foaf/search/entity_list.php,
+  views/opendd/search/entity_list.php, views/rss/search/entity_list.php:
+  Converting all line endings to unix style.  
+
+  	* .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/rivercomment.php,
+  views/default/js/initialise_elgg.php, views/default/likes/forms/edit.php:
+  Fixed likes interface JS.  
+
+  	* mod/blog/actions/blog/save.php, mod/blog/blog_lib.php,
+  mod/blog/languages/en.php, mod/blog/start.php: Added river support to blog.  
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php: Cleaned up the likes
+  interface a bit.  
+
+  	* mod/blog/blog_lib.php: Fixed weird login in blog for real.  
+
+  	* mod/blog/blog_lib.php: Added access controls to blog archive grabbing
+  function. Corrected weird logic for checking validity of blog entities while
+  displaying posts.  
+
+2010-03-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/mpg.php: Small update to zaudio player
+  spacing for new layout. 
+
+2010-03-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/search/comments/entity.php,
+  views/default/annotation/generic_comment.php: Added anchor names for
+  comments.  
+
+  	* actions/admin/menu_items.php, engine/lib/elgglib.php, languages/en.php,
+  views/default/admin/menu_items.php: Added ability to make arbitrary links for
+  the menu items.  
+
+  	* mod/blog/blog_lib.php, mod/blog/views/default/blog/sidebar_menu.php: Added
+  archive view for blogs.  
+
+  	* engine/lib/metadata.php: Added documentation for order_by_metadata.  
+
+2010-03-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: tag cloud functions are deprecated in 1.8  
+
+2010-03-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/blog_lib.php, mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/sidebar_menu.php: Added filtering by archive
+  date.  
+
+  	* views/default/input/datepicker.php: Corrected bug in datepicker for
+  passing in values.  
+
+  	* CHANGES.txt, engine/lib/entities.php: Added remove_subtype() and
+  update_subtype().  
+
+  	* engine/lib/elgglib.php: Added missing merge from Merge Monday.  
+
+  	* mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/save.php, mod/blog/blog_lib.php,
+  mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/object/blog.php: Added an ElggBlog class to override
+  the time_created field. Added extra language files.  
+
+2010-03-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php, mod/riverdashboard/index.php: Minor update
+  to profile language strings, and corrected view on riverdashboard for views
+  to extend. 
+
+  	* views/default/input/userpicker.php: Updated userpicker to use generic
+  delete button 
+
+  	* views/default/page_elements/elgg_topbar.php: Reordered the top toolbar
+  items. 
+
+  	* views/default/css.php: Moved Shared Access css into plugin 
+
+2010-03-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/site_nav.php: Added selected class in navbar
+  menu.  
+
+2010-03-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/languages/en.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../views/default/sitepages/forms/editfront.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/keywords.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/sitepages/views/default/sitepages/metatags.php: Updated SitePages to new
+  code standards & UI. 
+
+2010-03-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/settings/upgrading.php: Update to
+  ajax loader css and upgrade.php 
+
+2010-03-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/configuration.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/input.php,
+  engine/lib/install.php, engine/lib/metadata.php, engine/lib/tags.php,
+  engine/lib/users.php, languages/en.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  mod/custom_index/languages/en.php, mod/externalpages/actions/add.php,
+  .../views/default/expages/forms/edit.php,
+  mod/groups/actions/groupskillinvitation.php, mod/groups/all.php,
+  mod/groups/languages/en.php, mod/groups/views/default/groups/find.php,
+  .../views/default/groups/invitationrequests.php,
+  mod/groups/views/rss/groups/profileitems.php,
+  mod/groups/views/rss/object/groupforumtopic.php, mod/messages/index.php,
+  mod/messages/sent.php, mod/search/views/rss/search/layout.php,
+  mod/thewire/start.php, mod/tinymce/views/default/input/longtext.php,
+  views/default/output/tagcloud.php,
+  .../messages/sanitisation/dbsettings_error.php: Merged 1.7 bugfixes back into
+  core. (5376:HEAD).  
+
+2010-03-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/start.php, mod/file/views/default/file/menu.php,
+  mod/messages/start.php, mod/messages/views/default/messages/menu.php,
+  mod/pages/start.php, mod/pages/views/default/pages/menu.php,
+  mod/profile/languages/en.php, mod/profile/start.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminwrapper.php,
+  .../views/default/profile/menu/friendlinks.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  .../views/default/profile/profile_ownerblock.php,
+  mod/profile/views/default/profile/submenu.php,
+  .../views/default/reportedcontent/user_report.php: Updated avatar menu:
+  Removed links to tools, provided a view to extend menu, added @username to
+  menu, cleaned-up and simplified menu generation. 
+
+  	* mod/profile/index.php, mod/profile/profile_lib.php, mod/profile/start.php,
+  .../views/default/profile/profile_navigation.php: Removed widget view from
+  Profile. 
+
+2010-03-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/rivercomment.php: hide the river comment
+  form - still need to add a handle to each one so the correct comment form
+  opens 
+
+  	* actions/comments/add.php, actions/comments/delete.php,
+  mod/riverdashboard/start.php, .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/rivercomment.php: the beginnings of a
+  mechanism to comment on river objects 
+
+  	* actions/likes/delete.php: after delete action, return to the correct
+  context 
+
+  	* views/default/annotation/likes.php: timestamp added to like action view 
+
+  	* .../views/default/river/item/wrapper.php,
+  views/default/likes/forms/edit.php: more tweaks to likes on the activity
+  stream 
+
+  	* .../views/default/river/item/wrapper.php: likes added to the activity
+  river 
+
+  	* mod/blog/views/default/object/blog.php: like display added to blog object 
+
+  	* mod/blog/views/default/object/blog.php: like added to blog posts 
+
+  	* actions/likes/add.php, actions/likes/delete.php,
+  engine/lib/annotations.php, engine/lib/elgglib.php, languages/en.php,
+  views/default/annotation/annotatelike.php,
+  views/default/annotation/likes.php, views/default/likes/forms/edit.php:
+  generic like this functionality added 
+
+2010-03-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, languages/en.php,
+  views/default/admin/menu_items.php, views/default/css.php,
+  views/default/navigation/site_nav.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/page_elements/elgg_topbar.php: Moved toolbar dropdown menu to
+  main nav. Added CSS for main nav dropdown. Emptied navigation/topbar_tools
+  view.   
+
+  	* engine/start.php: Removed non-working "lightmode" option.  
+
+  	* engine/lib/elgglib.php, engine/start.php: Removed ui_page_setup() to fix
+  installation. Gave engine/start.php a bit of love.  
+
+2010-03-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/start.php, mod/bookmarks/start.php, mod/file/start.php,
+  mod/groups/start.php, mod/riverdashboard/start.php,
+  mod/thewire/languages/en.php, mod/thewire/start.php: Default all tools' menu
+  items to "world" view.  Removed "My" prefix.  
+
+  	* mod/tinymce/views/default/input/longtext.php: Added a space between the
+  word count colon and the number for tinymce.  
+
+  	* engine/lib/elgglib.php: Namespaces sticky forms. Requires more testing.  
+
+2010-03-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/content_header_filter.gif,
+  vendors/jquery/custom-form-elements.js, views/default/css.php,
+  views/default/page_elements/content_header.php: Removed page content area
+  filter menu, in favor of simple tabs. 
+
+  	* languages/en.php, mod/blog/views/default/blog/sidebar_menu.php,
+  mod/file/friends.php, mod/file/index.php, mod/file/world.php,
+  views/default/annotation/latest_comments.php, views/default/css.php: Updated
+  latest comments to new UI and coding standards, and added to Blog and Files
+  sidebar. 
+
+2010-03-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/blog/auto_save_revision.php,
+  mod/blog/actions/blog/save.php, mod/blog/actions/blog/save_draft.php,
+  mod/blog/blog_lib.php, mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/sidebar_edit.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/sidebar_revisions.php,
+  mod/blog/views/default/object/blog.php: Updated blog to support multiple
+  revisions and automatic saving of drafts.   
+
+2010-03-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/object/blog.php, mod/bookmarks/add.php,
+  mod/bookmarks/all.php, mod/bookmarks/friends.php, mod/bookmarks/index.php,
+  mod/bookmarks/views/default/object/bookmarks.php: Included a view for plugins
+  to extend (on the new reworked Bookmarks and Blogs). 
+
+2010-03-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/languages/en.php: Added blog languages.  
+
+  	* actions/admin/menu_items.php, admin/menu_items.php, engine/lib/admin.php,
+  engine/lib/elgglib.php, engine/lib/users.php, languages/en.php,
+  views/default/admin/menu_items.php, views/default/navigation/site_nav.php,
+  views/default/navigation/topbar_tools.php: Added config options for tabs and
+  menu items.  
+
+2010-03-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/activity.php,
+  .../views/default/river/item/wrapper.php, views/default/css.php,
+  views/default/navigation/site_nav.php: Updates to: site nav (changed unused
+  id's to title tags), latest wire post in admin/user lists, riverdashboard
+  timestamps unified, and latest wire post on profile page. 
+
+2010-03-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Updated documentation for set_config(). 
+  Removed unnecessary escaping of value before serializing, which broke arrays
+  anyway...  
+
+  	* views/default/input/pulldown.php: Documented pulldown quirks for NULL and
+  FALSE as values.  Fixed bug when calling htmlentities() on the values before
+  testing them.  
+
+  	* views/default/input/pulldown.php: Refs #1362: Fixed a problem when
+  comparing int and string values to determin the pulldown's selected value.  
+
+2010-03-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/messages/views/default/messages/css.php: Minor css update to new
+  message notification. 
+
+  	* views/default/navigation/site_nav.php: Addition of 'conversations' to
+  temporary site_nav. 
+
+  	* entities/list.php, mod/blog/start.php,
+  mod/bookmarks/views/default/bookmarks/stats.php,
+  .../views/default/widgets/bookmarks/view.php, mod/members/index.php: Replaced
+  more calls to deprecated functions. 
+
+  	* services/export/handler.php, views/default/export/entity.php,
+  views/default/export/metadata.php, views/default/export/relationship.php:
+  Updates to default entity views (within admin/log browser). 
+
+  	* mod/logbrowser/views/default/logbrowser/form.php: Minor update (form
+  spacing) to log browser. 
+
+  	* .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/form.php: Minor UI updates to reported
+  content. 
+
+  	* mod/file/views/default/widgets/filerepo/view.php,
+  views/default/navigation/viewtype.php: Minor updates to Files. 
+
+  	* mod/embed/embed.php, mod/embed/images/button_spacer.gif,
+  mod/embed/images/loading.gif, mod/embed/images/media_modal.png,
+  mod/embed/start.php, mod/embed/views/default/embed/css.php,
+  mod/embed/views/default/embed/js.php, mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/media.php,
+  mod/embed/views/default/embed/pagination.php,
+  mod/embed/views/default/embed/simpletype.php,
+  mod/embed/views/default/embed/tabs.php,
+  mod/embed/views/default/embed/upload.php,
+  mod/embed/views/default/group/default/embed.php,
+  mod/embed/views/default/object/default/embed.php,
+  mod/embed/views/default/object/file/embed.php,
+  mod/embed/views/default/object/file/embedlist.php,
+  mod/embed/views/default/site/default/embed.php,
+  mod/embed/views/default/user/default/embed.php: Updated Embed mod to new UI. 
+
+  	* views/default/css.php: Updates to generic comments 
+
+2010-03-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/views/default/file/css.php,
+  mod/file/views/default/object/file.php: Further updates to files single
+  entity view. 
+
+  	* entities/index.php, mod/file/edit.php, mod/file/friends.php,
+  mod/file/index.php, mod/file/languages/en.php, mod/file/search.php,
+  mod/file/start.php, mod/file/upload.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/file/upload.php,
+  mod/file/views/default/object/file.php, mod/file/world.php,
+  mod/profile/views/default/profile/css.php,
+  mod/search/views/default/search/gallery.php,
+  mod/tinymce/views/default/tinymce/css.php, views/default/css.php,
+  views/default/entities/gallery.php, views/default/navigation/site_nav.php:
+  Updated File mod to new UI. 
+
+  	* mod/profile/defaultprofile.php: Corrected misspelt classname. 
+
+2010-03-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tagcloud/start.php: Replaced extend_view() with elgg_extend_view().  
+
+  	* .../views/default/reportedcontent/listing.php, mod/sitepages/start.php,
+  views/default/output/confirmlink.php, views/default/output/url.php: Replaced
+  calls to deprecated elgg_validate_action_url() with
+  elgg_add_action_tokens_to_url().  
+
+2010-03-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php, views/default/css.php: Update to
+  longtext/tintMCE input box ui. 
+
+  	* admin/plugins.php, mod/profile/defaultprofile.php,
+  mod/profile/views/default/profile/css.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../views/default/reportedcontent/listing.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  views/default/admin/plugins.php, views/default/admin/plugins_opt/plugin.php,
+  views/default/admin/site.php, views/default/admin/user.php,
+  views/default/css.php, views/default/settings/system.php: Updates to Admin
+  area UI. 
+
+  	* mod/captcha/captcha.php, mod/captcha/start.php,
+  mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php: Updated Captcha UI. 
+
+  	* mod/twitter/views/default/twitter/css.php,
+  mod/twitter/views/default/widgets/twitter/view.php,
+  mod/twitterservice/start.php,
+  .../default/usersettings/twitterservice/edit.php: Updates to Twitter and
+  TwitterService UI. 
+
+  	* views/default/usersettings/plugins.php: Small update to
+  user-settings/tools page. 
+
+  	* mod/thewire/everyone.php: …and doing it properly this time. 
+
+  	* mod/invitefriends/index.php, mod/invitefriends/manifest.xml,
+  mod/invitefriends/start.php, .../views/default/invitefriends/formitems.php:
+  Updated Invite Friends mod to new ui. 
+
+  	* .../graphics/icon_notifications_site.gif, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/notifications/languages/en.php,
+  .../views/default/notifications/css.php,
+  .../notifications/settings/usersettings.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/personal.php, views/default/css.php: Updated
+  Notifications to new UI. 
+
+2010-03-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Trunk isn't 1.7.  
+
+2010-03-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/search_box.php,
+  views/default/input/form.php: seems you need to wrap form inputs fields with
+  the fieldset tag for strict xhtml 
+
+  	* views/default/page_elements/html_begin.php: capitals not allow for strict
+  xhtml 
+
+  	* views/default/page_elements/html_begin.php: self close the favicon link 
+
+2010-03-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/blog/sidebar_menu.php,
+  mod/tagcloud/languages/de.php, mod/tagcloud/languages/en.php,
+  mod/tagcloud/manifest.xml, mod/tagcloud/start.php, mod/tagcloud/tagcloud.php,
+  mod/tagcloud/views/default/output/tagcloud.php,
+  mod/tagcloud/views/default/tagcloud/css.php,
+  .../views/default/widgets/tagcloud/edit.php,
+  .../views/default/widgets/tagcloud/view.php, views/default/css.php: Added
+  updated tagcloud plugin and added to core mods. 
+
+2010-03-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* UPGRADE.txt, admin/user.php, engine/lib/elgglib.php, index.php,
+  languages/en.php, mod/diagnostics/start.php, mod/file/friends.php,
+  mod/file/index.php, mod/file/search.php, mod/file/world.php,
+  mod/groups/all.php, mod/groups/index.php, mod/groups/membership.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/pages/actions/pages/edit.php, mod/pages/index.php,
+  mod/pages/languages/en.php, mod/pages/views/default/forms/pages/edit.php,
+  mod/pages/views/default/pages/welcome.php, mod/pages/world.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/search/search_hooks.php,
+  mod/thewire/everyone.php, mod/uservalidationbyemail/start.php: Merged Cash's
+  bugfixes from the 1.7 branch (3288:5377).  
+
+2010-03-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/header_shadow.png, mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/object/blog.php,
+  views/default/annotation/annotate.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php, views/default/css.php:
+  Updated/cleaned-up generic comments with new UI. 
+
+  	* mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/object/blog.php,
+  views/default/annotation/generic_comment.php,
+  views/default/comments/forms/edit.php: Updated interface on new blog
+  (listings and edit/new blog pages). 
+
+  	* mod/bookmarks/views/default/object/bookmarks.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/groups/css.php,
+  mod/messages/views/default/messages/view.php,
+  mod/thewire/views/default/object/thewire.php, views/default/css.php: Updated
+  and simplified generic entity listings metadata block (edit, delete, access)
+  to not use tables. 
+
+  	* mod/blog/views/default/blog/sidebar_menu.php,
+  mod/groups/views/default/groups/side_menu.php, mod/members/index.php,
+  mod/profile/views/default/profile/submenu.php,
+  .../views/default/riverdashboard/menu.php,
+  views/default/canvas_header/submenu_group.php, views/default/css.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/title.php: Removed unneeded div from around
+  submenu lists. 
+
+2010-03-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Added elgg_list_entities_from_metadata() and
+  deprecated list_entities_from_metadata().  
+
+  	* views/default/input/calendar.php, views/default/input/datepicker.php:
+  Added datepicker view and deprecated calendar view.  
+
+  	* mod/blog/actions/add.php, mod/blog/actions/blog/delete.php,
+  mod/blog/actions/blog/save.php, mod/blog/actions/blog/save_draft.php,
+  mod/blog/actions/delete.php, mod/blog/actions/edit.php, mod/blog/add.php,
+  mod/blog/all.php, mod/blog/archive.php, mod/blog/blog_lib.php,
+  mod/blog/edit.php, mod/blog/endpoint/index.php, mod/blog/everyone.php,
+  mod/blog/friends.php, mod/blog/index.php, mod/blog/languages/en.php,
+  mod/blog/manifest.xml, mod/blog/preview.php, mod/blog/read.php,
+  mod/blog/savedraft.php, mod/blog/shared.php, mod/blog/start.php,
+  mod/blog/views/default/blog/archive.php,
+  mod/blog/views/default/blog/categorylist.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/gallery.php,
+  mod/blog/views/default/blog/listing.php,
+  mod/blog/views/default/blog/menu.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/previewpane.php,
+  mod/blog/views/default/blog/sidebar_menu.php,
+  mod/blog/views/default/blog/stats.php, mod/blog/views/default/blog/view.php,
+  mod/blog/views/default/object/blog.php,
+  .../views/default/river/object/blog/annotate.php,
+  .../views/default/river/object/blog/create.php,
+  .../views/default/river/object/blog/update.php: Rough first version of a new
+  blog plugin.  
+
+2010-03-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/css.php: Minor interface updates for
+  search results. 
+
+2010-03-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/elgglib.php,
+  mod/tinymce/views/default/input/longtext.php, views/default/input/access.php,
+  views/default/input/calendar.php, views/default/input/checkboxes.php,
+  views/default/input/email.php, views/default/input/hidden.php,
+  views/default/input/longtext.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php, views/default/input/userpicker.php: Implemented
+  sticky forms.  
+
+2010-03-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/search/comments/entity.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/listing.php, views/default/css.php,
+  views/default/entities/gallery_listing.php: Updated Search results UI. 
+
+2010-03-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/elgglib.php, mod/bookmarks/add.php,
+  mod/bookmarks/index.php, mod/groups/forum.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/messages/views/default/messages/messages.php,
+  views/default/navigation/breadcrumbs.php,
+  views/default/page_elements/breadcrumbs.php,
+  views/default/page_elements/content_header.php: Added breadcrumb support and
+  updated the mods with old-style breadcrumbs.  
+
+2010-03-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/user.php, mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/embed/views/default/embed/upload.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/invitefriends/formitems.php,
+  mod/tinymce/views/default/input/longtext.php, views/default/css.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php, views/failsafe/input/access.php,
+  views/failsafe/input/longtext.php, views/failsafe/input/text.php: Updates:
+  longtext editor default size added (and overridden in group/forums), more
+  updates to lists of members, remaining/previously-missed generic input
+  classes renamed to lowercase. 
+
+  	* friends/index.php, friends/of.php,
+  mod/members/views/default/members/css.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/thewire/views/default/thewire/css.php,
+  views/default/admin/statistics_opt/online.php, views/default/css.php: Updated
+  friends/members listings when there is a latest wire post to display. 
+
+  	* mod/blog/views/default/blog/menu.php,
+  mod/file/views/default/file/menu.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/pages/views/default/pages/menu.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminwrapper.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  .../views/default/reportedcontent/user_report.php: Updated avatar user menu
+  to generate an ordered list, reinstated the add/remove friend link, & cleaned
+  up css. 
+
+  	* .../default/river/object/bookmarks/create.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  mod/riverdashboard/endpoint/ping.php,
+  mod/riverdashboard/graphics/refresh.png,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/default/river/object/thewire/create.php,
+  mod/thewire/views/default/thewire/css.php,
+  views/default/annotation/annotate.php, views/default/css.php,
+  views/default/friends/river/create.php, views/default/river/item/wrapper.php,
+  views/default/river/wrapper.php: Riverdashboard updated to new UI. DOM
+  simplified a bit & css cleaned up. 
+
+2010-03-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/tests/api/helpers.php: Added elgg_instanceof().  
+
+2010-03-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/languages/en.php, mod/members/views/default/members/css.php,
+  .../views/default/notifications/css.php,
+  .../notifications/subscriptions/forminternals.php, views/default/css.php,
+  views/default/friends/collections.php, views/default/friends/picker.php,
+  views/default/js/friendsPickerv1.php: Updated Friends Picker UI and added to
+  core css. 
+
+  	* mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/css.php: Minor ui updates to group forms 
+
+2010-03-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/profile/profile_contents/activity.php: profile activity
+  tweaked // it is still not working correctly but doesn't cause a wsod 
+
+2010-03-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php, mod/groups/discussions.php, mod/groups/forum.php,
+  mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/group/group.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  .../views/default/groups/invitationrequests.php,
+  mod/groups/views/default/groups/members.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/rss/groups/profileitems.php: Updated Groups to the new
+  interface. Some view clean-up & simplification done. 
+
+2010-03-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php: river time stamps added to
+  profile edits 
+
+  	* mod/bookmarks/views/default/object/bookmarks.php: bookmarks open in a new
+  window ticket #1965 
+
+  	* mod/riverdashboard/index.php: closing div applied. Note: this needs
+  cleaning up. 
+
+  	* mod/riverdashboard/endpoint/ping.php, mod/riverdashboard/index.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/manifest.xml,
+  mod/riverdashboard/start.php, .../views/default/river/dashboard.php,
+  .../views/default/river/item/list.php,
+  .../views/default/river/item/wrapper.php,
+  .../default/river/relationship/friend/create.php,
+  .../views/default/river/sitemessage/create.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/menu.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/default/settings/riverdashboard/edit.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php: the beginnings of a new
+  activity river with ajax notification and conversation clustering. 
+
+  	* engine/lib/river2.php: new activity river api functions 
+
+2010-03-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed incorrect deprecated function rewrite for
+  list_entities().  
+
+  	* .../canvas/layouts/one_column_with_sidebar.php: Fixed documentation for
+  one_column_with_sidebar layout.  
+
+2010-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/add.php, mod/blog/actions/delete.php,
+  mod/blog/actions/edit.php, mod/blog/add.php, mod/blog/edit.php,
+  mod/blog/endpoint/index.php, mod/blog/languages/en.php,
+  mod/blog/manifest.xml, mod/blog/savedraft.php, mod/blog/start.php,
+  mod/blog/views/default/blog/archive.php,
+  mod/blog/views/default/blog/categorylist.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/gallery.php,
+  mod/blog/views/default/blog/listing.php,
+  mod/blog/views/default/blog/menu.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/previewpane.php,
+  mod/blog/views/default/blog/stats.php, mod/blog/views/default/blog/view.php,
+  mod/blog/views/default/object/blog.php: Blogs updated to new UI (needs Brett
+  to look over first) 
+
+  	* mod/profile/profile_lib.php,
+  .../default/profile/profile_contents/sidebar.php,
+  .../views/default/profile/profile_ownerblock.php: Added large avatar to
+  Profile/details page. 
+
+2010-03-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php: Forwarding to index.php after login instead of
+  pg/dashboard.  
+
+2010-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/index.php, .../default/profile/profile_contents/details.php:
+  Full profile fields reinstated on profile/details page 
+
+  	* mod/profile/index.php, .../default/profile/profile_contents/activity.php:
+  Updated profile page calls to profile_contents. 
+
+2010-03-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/sitepages_functions.php: Fixes #1956: Corrected typo for
+  filtering by owner=username.  
+
+2010-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/languages/en.php, views/default/css.php,
+  views/default/navigation/main_nav.php, views/default/navigation/site_nav.php,
+  views/default/page_elements/elgg_header.php: Added basic (stage1) site-wide
+  navigation. Needs improving with a way for admin and plugin authors to decide
+  which mods display in the primary nav-bar, and which page within each tool
+  they point at. 
+
+  	* _graphics/icon_rss.png, languages/en.php,
+  mod/bookmarks/views/default/bookmarks/form.php, views/default/css.php,
+  views/default/page_elements/owner_block.php: Generic rss feed icon added 
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/editicon.php: Edit profile icon ui fixed. 
+
+2010-03-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/sitepages/forms/editmeta.php: add/edit metatags form bug
+  fixed 
+
+2010-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/edit.php, mod/profile/editicon.php, mod/profile/start.php:
+  Fixed canvas layout for profile edit views 
+
+2010-03-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/object/thewire.php: Ticket #1954 fixed 
+
+2010-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/languages/en.php, mod/thewire/start.php: Updated 'my wire'
+  link in toolbar menu 
+
+  	* mod/bookmarks/all.php, mod/members/index.php: Removed users owner block
+  from 'all bookmarks', and 'all members' views. 
+
+  	* admin/plugins.php, admin/site.php, admin/statistics.php, admin/user.php,
+  dashboard/latest.php, friends/add.php, friends/collections.php,
+  friends/edit.php, friends/index.php, friends/of.php, index.php,
+  mod/blog/all.php, mod/blog/archive.php, mod/blog/everyone.php,
+  mod/blog/friends.php, mod/blog/index.php, mod/blog/preview.php,
+  mod/blog/read.php, mod/blog/shared.php, mod/bookmarks/add.php,
+  mod/bookmarks/all.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/friends.php, mod/bookmarks/index.php,
+  mod/diagnostics/index.php, mod/externalpages/index.php,
+  mod/externalpages/read.php, mod/groups/addtopic.php, mod/groups/all.php,
+  mod/groups/discussions.php, mod/groups/edit.php, mod/groups/edittopic.php,
+  mod/groups/forum.php, mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invitations.php, mod/groups/invite.php, mod/groups/membership.php,
+  mod/groups/membershipreq.php, mod/groups/new.php, mod/groups/topicposts.php,
+  mod/logbrowser/index.php, mod/members/index.php, mod/messages/index.php,
+  mod/messages/read.php, mod/messages/send.php, mod/messages/sent.php,
+  mod/profile/defaultprofile.php, mod/profile/edit.php,
+  mod/profile/editicon.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/index.php, mod/search/index.php,
+  mod/search/views/default/search/layout.php,
+  mod/sitepages/sitepages_functions.php, mod/thewire/add.php,
+  mod/thewire/everyone.php, mod/thewire/index.php, mod/walledgarden/index.php,
+  settings/plugins.php, settings/statistics.php, settings/user.php,
+  .../canvas/layouts/one_column_with_sidebar.php: Updated new page canvases
+  (and calls to elgg_view_layout) so that empty vars are not required. 
+
+2010-03-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/actions/addfront.php, mod/sitepages/actions/addmeta.php,
+  mod/sitepages/languages/en.php, mod/sitepages/sitepages_functions.php,
+  mod/sitepages/start.php, .../views/default/settings/sitepages/edit.php,
+  .../views/default/sitepages/custom_frontpage.php,
+  .../views/default/sitepages/footer_menu.php,
+  .../views/default/sitepages/forms/editfront.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/keywords.php,
+  mod/sitepages/views/default/sitepages/metatags.php: Added dynamic keywords
+  for view and entity. Separated logged in and logged out front page views.
+  Fixed a problem with saving metatags. Added PHPDoc headers. Updated language
+  strings.  
+
+  	* mod/sitepages/actions/add.php, mod/sitepages/actions/addfront.php,
+  mod/sitepages/actions/addmeta.php, mod/sitepages/frontpage.php,
+  mod/sitepages/index.php, mod/sitepages/languages/en.php,
+  mod/sitepages/read.php, mod/sitepages/sitepages_functions.php,
+  mod/sitepages/start.php, .../views/default/sitepages/analytics.php,
+  mod/sitepages/views/default/sitepages/css.php,
+  .../views/default/sitepages/custom_frontpage.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../views/default/sitepages/forms/editfront.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/keywords.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/sitepages/views/default/sitepages/metatags.php: Brought sitepages up to
+  standards. Added basic static keyword/view substitution support.  
+
+2010-03-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/start.php, .../views/default/page_elements/searchbox.php,
+  mod/search/views/default/search/search_box.php,
+  views/default/page_elements/elgg_header.php,
+  views/default/page_elements/html_begin.php: Removed hard-coded search box and
+  replaced with extended header/extend view from search page.  
+
+2010-03-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php, mod/groups/edit.php, mod/groups/groupprofile.php,
+  mod/groups/views/default/groups/contentwrapper.php: Removed the superfluous
+  groups contentwrapper 
+
+  	* mod/groups/addtopic.php, mod/groups/all.php, mod/groups/discussions.php,
+  mod/groups/edit.php, mod/groups/edittopic.php, mod/groups/forum.php,
+  mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invitations.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/manifest.xml,
+  mod/groups/membership.php, mod/groups/membershipreq.php, mod/groups/new.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/css.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/side_menu.php: Beginnings of the refreshed
+  groups interface 
+
+  	* .../page_elements/content_header_member.php,
+  views/default/page_elements/title.php: updates to page_elements 
+
+2010-03-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/html_begin.php: Commenting out old (hopefully
+  unneeded) jquery hack.  
+
+2010-03-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/sitepages/actions/add.php, mod/sitepages/actions/addfront.php,
+  mod/sitepages/actions/addmeta.php, mod/sitepages/frontpage.php,
+  mod/sitepages/index.php, mod/sitepages/languages/en.php,
+  mod/sitepages/manifest.xml, mod/sitepages/read.php,
+  mod/sitepages/sitepages_functions.php, mod/sitepages/start.php,
+  .../views/default/settings/sitepages/edit.php,
+  .../views/default/sitepages/analytics.php,
+  mod/sitepages/views/default/sitepages/css.php,
+  .../views/default/sitepages/footer_menu.php,
+  .../views/default/sitepages/forms/edit.php,
+  .../views/default/sitepages/forms/editfront.php,
+  .../views/default/sitepages/forms/editmeta.php,
+  mod/sitepages/views/default/sitepages/keywords.php,
+  mod/sitepages/views/default/sitepages/menu.php,
+  mod/sitepages/views/default/sitepages/metatags.php: Site pages will
+  eventually replace the external pages and custom index plugins as well as
+  introduce a new keywords system to enable dynamic content to be displayed
+  without needing to know php or Elgg. This will be handy for frontpage
+  layout/design. 
+
+2010-03-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php, mod/thewire/add.php,
+  mod/thewire/everyone.php, mod/thewire/graphics/thewire_speech_bubble.gif,
+  mod/thewire/index.php, mod/thewire/languages/en.php,
+  mod/thewire/manifest.xml, mod/thewire/views/default/object/thewire.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/thewire/scripts/counter.js: Updates to thewire interface 
+
+  	* mod/profile/views/default/profile/css.php, views/default/css.php,
+  views/default/page_elements/owner_block.php: Updates to Profile and
+  owner_block interface 
+
+2010-03-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tinymce/graphics/ed-bg.gif, mod/tinymce/graphics/example.gif,
+  mod/tinymce/graphics/more.gif, mod/tinymce/manifest.xml,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php: Updated tinymce to new interface 
+
+2010-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/profile_lib.php, mod/profile/start.php,
+  mod/profile/views/default/profile/css.php: Removed horizontal nav from avatar
+  edit view and debug string from sidebar. Added temp fix for large avatar
+  upload image scaling 
+
+2010-03-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/profile_lib.php, mod/profile/start.php,
+  .../default/profile/profile_contents/activity.php,
+  .../default/profile/profile_contents/details.php,
+  .../default/profile/profile_contents/friends.php,
+  .../default/profile/profile_contents/sidebar.php,
+  .../default/profile/profile_contents/twitter.php: Pulled profile sidebar out
+  into separate view. Using one_column_with_sidebar layout for editing profile.
+   
+
+  	* mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/actions/resetdefaultprofile.php, mod/profile/defaultprofile.php,
+  mod/profile/edit.php, mod/profile/editicon.php, mod/profile/icon.php,
+  mod/profile/icondirect.php, mod/profile/index.php,
+  mod/profile/javascript.php, mod/profile/languages/en.php,
+  mod/profile/profile_lib.php, mod/profile/start.php,
+  mod/profile/views/default/profile/admin_menu.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/adminwrapper.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/metatags.php,
+  .../default/profile/profile_contents/activity.php,
+  .../default/profile/profile_contents/details.php,
+  .../default/profile/profile_contents/friends.php,
+  .../default/profile/profile_contents/twitter.php,
+  .../views/default/profile/profile_navigation.php,
+  .../views/default/profile/profile_ownerblock.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/userdetails.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php: Merged interface changes to
+  profile in.  
+
+2010-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/bookmarks/add.php, mod/bookmarks/all.php,
+  mod/bookmarks/bookmarklet.php, mod/bookmarks/friends.php,
+  mod/bookmarks/index.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  .../default/bookmarks/bookmarklet_menu_option.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/object/bookmarks.php, views/default/css.php:
+  Updated Bookmarks interface (old sidebar nav removed, breadcrumbs fixed,
+  bookmarklet fixed & updated) 
+
+  	* .../default/bookmarks/bookmarklet_menu_option.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/messages/views/default/messages/messages.php,
+  .../views/default/reportedcontent/listing.php: Removed empty href in
+  elgg_slide_toggle calls to prevent page jump 
+
+  	* views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/register.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/input/form.php,
+  views/default/js/initialise_elgg.php: Interface updates to js, and login,
+  register, lost password 
+
+  	* languages/en.php: Merged EN language updates 
+
+  	* _graphics/favicon.ico: Added the default elgg favicon (linked from
+  html_begin) 
+
+  	* vendors/jquery/jquery-ui-1.7.2.custom.min.js: Removed jquery custom UI
+  package, we now provide/use the full 1.7.2 UI package 
+
+  	* mod/search/index.php, mod/search/views/default/search/layout.php,
+  mod/search/views/default/search/startblurb.php: Merged Search interface
+  updates 
+
+  	* mod/messages/graphics/icon_notifications_site.gif, mod/messages/sent.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php: Merged missing Messages
+  interface modifications 
+
+  	* mod/members/views/default/members/search.php: Added missing php closing
+  tag 
+
+  	* mod/bookmarks/add.php, mod/bookmarks/all.php, mod/bookmarks/index.php,
+  .../views/default/bookmarks/bookmarklet.php: Merged missing Bookmarks
+  interface modifications 
+
+2010-03-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/walledgarden/index.php, .../views/default/account/forms/login.php,
+  .../views/default/canvas/layouts/new_index.php,
+  .../views/default/walledgarden/css.php: Merged walledgarden changes.  
+
+  	* mod/walledgarden/index.php, mod/walledgarden/manifest.xml,
+  mod/walledgarden/readme.txt, mod/walledgarden/start.php,
+  .../views/default/account/forms/login.php,
+  .../views/default/canvas/layouts/new_index.php,
+  .../views/default/walledgarden/css.php,
+  .../views/default/walledgarden/walledgarden.php: Moved walled garden into
+  trunk.  
+
+  	* mod/reportedcontent/add.php,
+  mod/reportedcontent/graphics/icon_reportthis.gif,
+  mod/reportedcontent/index.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/start.php, .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/reportedcontent/owner_block.php: Merged reported content
+  interface changes.  
+
+  	* mod/messages/actions/delete.php, mod/messages/actions/send.php,
+  mod/messages/index.php, mod/messages/languages/en.php, mod/messages/read.php,
+  mod/messages/readme.txt, mod/messages/send.php, mod/messages/sent.php,
+  mod/messages/start.php, mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/message.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/send.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php: Merged messages interface
+  changes.  
+
+  	* mod/members/index.php, mod/members/languages/en.php,
+  mod/members/start.php, mod/members/views/default/members/css.php,
+  .../views/default/members/members_navigation.php,
+  .../views/default/members/members_sort_menu.php,
+  mod/members/views/default/members/online.php,
+  mod/members/views/default/members/search.php: Merged members plugin's new
+  layout.  
+
+  	* mod/externalpages/actions/addfront.php, mod/externalpages/index.php,
+  mod/externalpages/read.php, mod/externalpages/start.php,
+  mod/externalpages/views/default/expages/css.php,
+  .../views/default/expages/footer_menu.php,
+  .../views/default/expages/forms/editfront.php,
+  .../views/default/expages/front_left.php,
+  .../views/default/expages/front_right.php,
+  mod/externalpages/views/default/expages/menu.php: Updated external pages to
+  new interface.  
+
+2010-03-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/jquery/custom-form-elements.js,
+  vendors/jquery/jquery-1.3.2.min.js, vendors/jquery/jquery-1.4.min.js: Added
+  new version of jQuery and custom form elements.  
+
+  	* mod/bookmarks/actions/add.php, mod/bookmarks/actions/delete.php,
+  mod/bookmarks/actions/edit.php, mod/bookmarks/actions/reference.php,
+  mod/bookmarks/actions/remove.php, mod/bookmarks/add.php,
+  mod/bookmarks/all.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/everyone.php, mod/bookmarks/friends.php,
+  mod/bookmarks/inbox.php, mod/bookmarks/index.php,
+  mod/bookmarks/languages/en.php, mod/bookmarks/start.php,
+  .../views/default/bookmarks/bookmarklet.php,
+  .../default/bookmarks/bookmarklet_menu_option.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/owner_block.php,
+  mod/bookmarks/views/default/bookmarks/sharing.php,
+  mod/bookmarks/views/default/bookmarks/stats.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/river/object/bookmarks/annotate.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/edit.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/bookmarks/views/rss/object/bookmarks.php: Updated bookmarks with new
+  interface.  
+
+  	* index.php, languages/en.php, settings/plugins.php,
+  settings/statistics.php, settings/user.php: Pulling in MORE changes that
+  weren't in the patch.  Apparently I fail at patching.  
+
+  	* _graphics/spacer.gif: Removing unneeded svn:executable properties on
+  files.  
+
+  	* views/default/page_shells/default.php: Merged in a lost change for the
+  interface.  
+
+  	* actions/systemsettings/install.php: Forward to the registration
+  pagehandler after installation.  
+
+  	* views/failsafe/page_shells/default.php,
+  views/failsafe/pageshells/pageshell.php: Installation uses new views system. 
+
+2010-03-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/edit_layout.php,
+  views/default/canvas/layouts/sidebar_boxes.php,
+  .../canvas/layouts/two_column_right_sidebar.php: old canvases removed 
+
+2010-03-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/users.php: Pulled in missing interface
+  modifications for the engine dir.  
+
+2010-03-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/ajax_loader_bw.gif, _graphics/button_background.gif,
+  _graphics/button_graduation.png, _graphics/content_header_filter.gif,
+  _graphics/icon_delete.png, _graphics/icon_tag.png, _graphics/search.png,
+  _graphics/sidebar_background.gif, _graphics/speech_bubble_tail.gif,
+  _graphics/topbar_icons.png, _graphics/twitter16px.png, views/default/css.php:
+  new graphics added and css updated to reflect new location 
+
+2010-03-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/forgotten_password.php, admin/plugins.php, admin/site.php,
+  admin/statistics.php, admin/user.php, dashboard/latest.php, friends/add.php,
+  friends/collections.php, friends/edit.php, friends/index.php, friends/of.php,
+  mod/blog/actions/add.php, mod/blog/actions/delete.php,
+  mod/blog/actions/edit.php, mod/blog/add.php, mod/blog/archive.php,
+  mod/blog/edit.php, mod/blog/everyone.php, mod/blog/friends.php,
+  mod/blog/index.php, mod/blog/languages/en.php, mod/blog/manifest.xml,
+  mod/blog/preview.php, mod/blog/read.php, mod/blog/savedraft.php,
+  mod/blog/start.php, mod/blog/views/default/blog/categorylist.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/gallery.php,
+  mod/blog/views/default/blog/listing.php,
+  mod/blog/views/default/blog/menu.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/previewpane.php,
+  mod/blog/views/default/blog/view.php, mod/blog/views/default/object/blog.php,
+  .../views/default/river/object/blog/annotate.php,
+  .../views/default/river/object/blog/create.php,
+  .../views/default/river/object/blog/update.php,
+  mod/bookmarks/actions/add.php, mod/bookmarks/actions/delete.php,
+  mod/bookmarks/add.php, mod/bookmarks/bookmarklet.php,
+  mod/bookmarks/everyone.php, mod/bookmarks/friends.php,
+  mod/bookmarks/inbox.php, mod/bookmarks/index.php,
+  mod/bookmarks/languages/en.php, mod/bookmarks/manifest.xml,
+  mod/bookmarks/start.php, .../views/default/bookmarks/bookmarklet.php,
+  mod/bookmarks/views/default/bookmarks/css.php,
+  mod/bookmarks/views/default/bookmarks/form.php,
+  .../views/default/bookmarks/owner_block.php,
+  mod/bookmarks/views/default/bookmarks/sharing.php,
+  mod/bookmarks/views/default/object/bookmarks.php,
+  .../default/river/object/bookmarks/annotate.php,
+  .../default/river/object/bookmarks/create.php,
+  .../views/default/widgets/bookmarks/edit.php,
+  .../views/default/widgets/bookmarks/view.php,
+  mod/bookmarks/views/rss/object/bookmarks.php,
+  mod/captcha/backgrounds/bg1.jpg, mod/captcha/backgrounds/bg2.jpg,
+  mod/captcha/backgrounds/bg3.jpg, mod/captcha/backgrounds/bg4.jpg,
+  mod/captcha/backgrounds/bg5.jpg, mod/captcha/captcha.php,
+  mod/captcha/fonts/1.ttf, mod/captcha/fonts/Liberation_serif_License.txt,
+  mod/captcha/languages/en.php, mod/captcha/manifest.xml,
+  mod/captcha/start.php, mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php, mod/categories/actions/save.php,
+  mod/categories/languages/en.php, mod/categories/manifest.xml,
+  mod/categories/readme.txt, mod/categories/settings.php,
+  mod/categories/start.php, mod/categories/views/default/categories.php,
+  mod/categories/views/default/categories/css.php,
+  mod/categories/views/default/categories/list.php,
+  .../views/default/categories/settings.php,
+  .../views/default/categories/settingsform.php,
+  mod/categories/views/default/categories/view.php, mod/custom_index/index.php,
+  mod/custom_index/languages/en.php, mod/custom_index/manifest.xml,
+  mod/custom_index/start.php, .../views/default/canvas/layouts/new_index.php,
+  .../views/default/custom_index/css.php,
+  mod/defaultwidgets/actions/update.php, mod/defaultwidgets/dashboard.php,
+  mod/defaultwidgets/languages/en.php, mod/defaultwidgets/manifest.xml,
+  mod/defaultwidgets/profile.php, mod/defaultwidgets/start.php,
+  .../views/default/defaultwidgets/editor.php, mod/diagnostics/index.php,
+  mod/diagnostics/languages/en.php, mod/embed/README.txt, mod/embed/embed.php,
+  mod/embed/images/button_spacer.gif, mod/embed/images/close_button.gif,
+  mod/embed/images/loading.gif, mod/embed/images/media_modal.png,
+  mod/embed/languages/en.php, mod/embed/manifest.xml, mod/embed/start.php,
+  mod/embed/upload.php, mod/embed/views/default/embed/addcontentjs.php,
+  mod/embed/views/default/embed/css.php, mod/embed/views/default/embed/js.php,
+  mod/embed/views/default/embed/link.php,
+  mod/embed/views/default/embed/media.php,
+  mod/embed/views/default/embed/metatags.php,
+  mod/embed/views/default/embed/pagination.php,
+  mod/embed/views/default/embed/simpletype.php,
+  mod/embed/views/default/embed/tabs.php,
+  mod/embed/views/default/embed/upload.php,
+  mod/embed/views/default/group/default/embed.php,
+  mod/embed/views/default/object/default/embed.php,
+  mod/embed/views/default/object/file/embed.php,
+  mod/embed/views/default/object/file/embedlist.php,
+  mod/embed/views/default/site/default/embed.php,
+  mod/embed/views/default/user/default/embed.php,
+  mod/externalpages/actions/add.php, mod/externalpages/actions/addfront.php,
+  mod/externalpages/index.php, mod/externalpages/languages/en.php,
+  mod/externalpages/manifest.xml, mod/externalpages/read.php,
+  mod/externalpages/start.php, .../views/default/expages/analytics.php,
+  mod/externalpages/views/default/expages/css.php,
+  .../views/default/expages/footer_menu.php,
+  .../views/default/expages/forms/edit.php,
+  .../views/default/expages/forms/editfront.php,
+  .../views/default/expages/front_left.php,
+  .../views/default/expages/front_right.php,
+  mod/externalpages/views/default/expages/menu.php,
+  mod/externalpages/views/default/object/expages.php,
+  mod/file/actions/delete.php, mod/file/actions/download.php,
+  mod/file/actions/save.php, mod/file/actions/upload.php,
+  mod/file/download.php, mod/file/edit.php, mod/file/friends.php,
+  mod/file/graphics/icons/application.gif,
+  mod/file/graphics/icons/application_lrg.gif,
+  mod/file/graphics/icons/archive.gif, mod/file/graphics/icons/archive_lrg.gif,
+  mod/file/graphics/icons/excel.gif, mod/file/graphics/icons/excel_lrg.gif,
+  mod/file/graphics/icons/general.gif, mod/file/graphics/icons/general_lrg.gif,
+  mod/file/graphics/icons/music.gif, mod/file/graphics/icons/music_lrg.gif,
+  mod/file/graphics/icons/openoffice.gif,
+  mod/file/graphics/icons/openoffice_lrg.gif,
+  mod/file/graphics/icons/pages.gif, mod/file/graphics/icons/pages_lrg.gif,
+  mod/file/graphics/icons/pdf.gif, mod/file/graphics/icons/pdf_lrg.gif,
+  mod/file/graphics/icons/ppt.gif, mod/file/graphics/icons/ppt_lrg.gif,
+  mod/file/graphics/icons/text.gif, mod/file/graphics/icons/text_lrg.gif,
+  mod/file/graphics/icons/vcard.gif, mod/file/graphics/icons/vcard_lrg.gif,
+  mod/file/graphics/icons/video.gif, mod/file/graphics/icons/video_lrg.gif,
+  mod/file/graphics/icons/word.gif, mod/file/graphics/icons/word_lrg.gif,
+  mod/file/index.php, mod/file/languages/en.php, mod/file/manifest.xml,
+  mod/file/search.php, mod/file/start.php, mod/file/thumbnail.php,
+  mod/file/upload.php, mod/file/views/default/file/css.php,
+  mod/file/views/default/file/groupprofile_files.php,
+  mod/file/views/default/file/icon.php,
+  .../default/file/icon/application/default.php,
+  .../views/default/file/icon/application/excel.php,
+  .../views/default/file/icon/application/msword.php,
+  .../views/default/file/icon/application/pdf.php,
+  .../default/file/icon/application/powerpoint.php,
+  .../default/file/icon/application/vnd.ms-excel.php,
+  .../file/icon/application/vnd.ms-powerpoint.php,
+  .../application/vnd.oasis.opendocument.text.php,
+  .../views/default/file/icon/application/x-gzip.php,
+  .../file/icon/application/x-rar-compressed.php,
+  .../default/file/icon/application/x-stuffit.php,
+  .../views/default/file/icon/application/zip.php,
+  mod/file/views/default/file/icon/archive.php,
+  mod/file/views/default/file/icon/audio.php,
+  mod/file/views/default/file/icon/audio/default.php,
+  mod/file/views/default/file/icon/default.php,
+  mod/file/views/default/file/icon/document.php,
+  mod/file/views/default/file/icon/text/default.php,
+  .../views/default/file/icon/text/directory.php,
+  mod/file/views/default/file/icon/text/v-card.php,
+  mod/file/views/default/file/icon/video.php,
+  mod/file/views/default/file/icon/video/default.php,
+  mod/file/views/default/file/menu.php,
+  .../default/file/specialcontent/audio/mid.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/x-wav.php,
+  .../default/file/specialcontent/image/default.php,
+  mod/file/views/default/file/typecloud.php,
+  mod/file/views/default/file/upload.php,
+  mod/file/views/default/object/file.php,
+  .../views/default/river/object/file/create.php,
+  mod/file/views/default/widgets/filerepo/edit.php,
+  mod/file/views/default/widgets/filerepo/view.php,
+  mod/file/views/rss/object/file.php, mod/file/world.php, mod/friends/add.php,
+  mod/friends/collections.php, mod/friends/edit.php,
+  mod/friends/languages/en.php, mod/friends/manifest.xml,
+  mod/friends/start.php, mod/friends/views/default/widgets/friends/edit.php,
+  mod/friends/views/default/widgets/friends/view.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/delete.php,
+  mod/groups/actions/edit.php, mod/groups/actions/featured.php,
+  mod/groups/actions/forums/addpost.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletepost.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/editpost.php,
+  mod/groups/actions/forums/edittopic.php,
+  mod/groups/actions/groupskillinvitation.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/addtopic.php, mod/groups/all.php,
+  mod/groups/discussions.php, mod/groups/edit.php, mod/groups/edittopic.php,
+  mod/groups/forum.php, mod/groups/graphics/defaultlarge.gif,
+  mod/groups/graphics/defaultmedium.gif, mod/groups/graphics/defaultsmall.gif,
+  mod/groups/graphics/defaulttiny.gif, mod/groups/graphics/icon.php,
+  mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invitations.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/manifest.xml,
+  mod/groups/membership.php, mod/groups/membershipreq.php, mod/groups/new.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/group/group.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/contentwrapper.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  .../views/default/groups/invitationrequests.php,
+  mod/groups/views/default/groups/members.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/groups/views/default/groups/profileitems.php,
+  mod/groups/views/default/groups/side_menu.php,
+  .../views/default/icon/group/default/large.php,
+  .../views/default/icon/group/default/medium.php,
+  .../views/default/icon/group/default/small.php,
+  .../views/default/icon/group/default/tiny.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../views/default/river/object/group/create.php,
+  .../river/object/groupforumtopic/annotate.php,
+  .../river/object/groupforumtopic/create.php,
+  .../river/object/groupforumtopic/update.php,
+  .../default/river/relationship/member/create.php,
+  mod/groups/views/default/settings/groups/edit.php,
+  mod/groups/views/default/sharing/invite.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  .../views/default/widgets/a_users_groups/view.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php,
+  mod/groups/views/rss/forum/topicposts.php,
+  mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/contentwrapper.php,
+  mod/groups/views/rss/groups/profileitems.php,
+  mod/invitefriends/actions/invite.php, mod/invitefriends/index.php,
+  mod/invitefriends/languages/en.php, mod/invitefriends/manifest.xml,
+  mod/invitefriends/start.php, .../views/default/invitefriends/form.php,
+  .../views/default/invitefriends/formitems.php, mod/logbrowser/index.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/logbrowser/form.php, mod/members/index.php,
+  mod/members/languages/en.php, mod/members/manifest.xml,
+  mod/members/start.php, mod/members/views/default/members/css.php,
+  .../views/default/members/members_sort_menu.php,
+  mod/members/views/default/members/online.php,
+  mod/members/views/default/members/search.php,
+  mod/messageboard/actions/add.php, mod/messageboard/actions/delete.php,
+  mod/messageboard/ajax_endpoint/load.php, mod/messageboard/history.php,
+  mod/messageboard/index.php, mod/messageboard/languages/en.php,
+  mod/messageboard/manifest.xml, mod/messageboard/readme.txt,
+  mod/messageboard/start.php, .../views/default/messageboard/css.php,
+  .../views/default/messageboard/forms/add.php,
+  .../default/messageboard/group_messageboard.php,
+  .../views/default/messageboard/messageboard.php,
+  .../default/messageboard/messageboard_content.php,
+  .../default/river/object/messageboard/create.php,
+  .../views/default/widgets/messageboard/edit.php,
+  .../views/default/widgets/messageboard/view.php,
+  mod/messages/actions/delete.php, mod/messages/actions/send.php,
+  mod/messages/graphics/icon_notifications_site.gif, mod/messages/index.php,
+  mod/messages/languages/en.php, mod/messages/manifest.xml,
+  mod/messages/read.php, mod/messages/readme.txt, mod/messages/send.php,
+  mod/messages/sent.php, mod/messages/start.php,
+  mod/messages/views/default/messages/css.php,
+  .../views/default/messages/forms/message.php,
+  .../views/default/messages/forms/reply.php,
+  mod/messages/views/default/messages/forms/view.php,
+  mod/messages/views/default/messages/menu.php,
+  mod/messages/views/default/messages/messages.php,
+  mod/messages/views/default/messages/topbar.php,
+  mod/messages/views/default/messages/view.php,
+  .../views/default/widgets/messages/view.php,
+  mod/notifications/actions/groupsave.php, mod/notifications/actions/save.php,
+  .../graphics/icon_notifications_email.gif, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/notifications/languages/en.php,
+  mod/notifications/manifest.xml, mod/notifications/start.php,
+  .../views/default/notifications/css.php,
+  .../notifications/settings/usersettings.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/jsfuncs.php,
+  .../notifications/subscriptions/personal.php,
+  mod/pages/actions/pages/delete.php, mod/pages/actions/pages/edit.php,
+  mod/pages/actions/pages/editwelcome.php, mod/pages/edit.php,
+  mod/pages/history.php, mod/pages/images/application.png,
+  mod/pages/images/code.png, mod/pages/images/css.png, mod/pages/images/db.png,
+  mod/pages/images/directory.png, mod/pages/images/doc.png,
+  mod/pages/images/file.gif, mod/pages/images/file.png,
+  mod/pages/images/film.png, mod/pages/images/flash.png,
+  mod/pages/images/folder-closed.gif, mod/pages/images/folder.gif,
+  mod/pages/images/folder_open.png, mod/pages/images/html.png,
+  mod/pages/images/java.png, mod/pages/images/linux.png,
+  mod/pages/images/minus.gif, mod/pages/images/music.png,
+  mod/pages/images/pages.gif, mod/pages/images/pages_lrg.gif,
+  mod/pages/images/pdf.png, mod/pages/images/php.png,
+  mod/pages/images/picture.png, mod/pages/images/plus.gif,
+  mod/pages/images/ppt.png, mod/pages/images/psd.png,
+  mod/pages/images/ruby.png, mod/pages/images/script.png,
+  mod/pages/images/spinner.gif, mod/pages/images/treeview-black-line.gif,
+  mod/pages/images/treeview-black.gif,
+  mod/pages/images/treeview-default-line.gif,
+  mod/pages/images/treeview-default.gif,
+  mod/pages/images/treeview-famfamfam-line.gif,
+  mod/pages/images/treeview-famfamfam.gif,
+  mod/pages/images/treeview-gray-line.gif, mod/pages/images/treeview-gray.gif,
+  mod/pages/images/treeview-red-line.gif, mod/pages/images/treeview-red.gif,
+  mod/pages/images/txt.png, mod/pages/images/xls.png, mod/pages/images/zip.png,
+  mod/pages/index.php, mod/pages/javascript/jquery.treeview.async.js,
+  mod/pages/javascript/jquery.treeview.js, mod/pages/languages/en.php,
+  mod/pages/manifest.xml, mod/pages/new.php, mod/pages/pagesTree.php,
+  mod/pages/start.php, mod/pages/view.php,
+  mod/pages/views/default/annotation/icon.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  .../views/default/icon/object/page/medium.php,
+  mod/pages/views/default/icon/object/page/small.php,
+  .../views/default/icon/object/page_top/medium.php,
+  .../views/default/icon/object/page_top/small.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/css.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/menu.php,
+  mod/pages/views/default/pages/metatags.php,
+  mod/pages/views/default/pages/pagegallery.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/pages/sidebar/sidebarthis.php,
+  mod/pages/views/default/pages/sidebar/starter.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/sidebar/wrapper.php,
+  mod/pages/views/default/pages/welcome.php,
+  .../views/default/river/object/page/annotate.php,
+  .../views/default/river/object/page/create.php,
+  .../views/default/river/object/page/update.php,
+  .../default/river/object/page_top/annotate.php,
+  .../views/default/river/object/page_top/create.php,
+  .../views/default/river/object/page_top/update.php,
+  mod/pages/views/default/widgets/pages/edit.php,
+  mod/pages/views/default/widgets/pages/view.php, mod/pages/welcome.php,
+  mod/pages/world.php, mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/actions/resetdefaultprofile.php, mod/profile/defaultprofile.php,
+  mod/profile/edit.php, mod/profile/editicon.php,
+  mod/profile/graphics/defaultlarge.gif,
+  mod/profile/graphics/defaultmaster.gif,
+  mod/profile/graphics/defaultmedium.gif,
+  mod/profile/graphics/defaultsmall.gif, mod/profile/graphics/defaulttiny.gif,
+  mod/profile/graphics/defaulttopbar.gif, mod/profile/icon.php,
+  mod/profile/icondirect.php, mod/profile/index.php,
+  mod/profile/javascript.php, mod/profile/languages/en.php,
+  mod/profile/manifest.xml, mod/profile/start.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  .../views/default/js/jquery.imgareaselect-0.8.js,
+  .../default/js/jquery.imgareaselect-0.8.min.js,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/adminwrapper.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/submenu.php,
+  mod/profile/views/default/profile/userdetails.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/index.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/manifest.xml, mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/reportedcontent/owner_block.php,
+  .../views/default/reportedcontent/user_report.php,
+  mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  mod/riverdashboard/graphics/follow_icon.png, mod/riverdashboard/index.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/manifest.xml,
+  mod/riverdashboard/start.php, .../views/default/river/sitemessage/create.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/default/settings/riverdashboard/edit.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../views/json/riverdashboard/container.php,
+  .../views/rss/riverdashboard/container.php,
+  mod/search/views/default/search/css.php, mod/thewire/actions/add.php,
+  mod/thewire/actions/delete.php, mod/thewire/add.php,
+  mod/thewire/everyone.php, mod/thewire/graphics/river_icon_thewire.gif,
+  mod/thewire/graphics/thewire_speech_bubble.gif, mod/thewire/index.php,
+  mod/thewire/languages/en.php, mod/thewire/manifest.xml,
+  mod/thewire/readme.txt, mod/thewire/start.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  .../views/default/thewire/activity_view.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/thewire/views/default/thewire/notfound.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/thewire/scripts/counter.js,
+  mod/thewire/views/default/thewire/view.php,
+  mod/thewire/views/default/widgets/thewire/edit.php,
+  mod/thewire/views/default/widgets/thewire/view.php,
+  mod/tinymce/languages/en.php, mod/tinymce/manifest.xml,
+  mod/tinymce/readme.txt, mod/tinymce/start.php,
+  mod/tinymce/tinymce/changelog.txt,
+  mod/tinymce/tinymce/jscripts/tiny_mce/langs/en.js,
+  mod/tinymce/tinymce/jscripts/tiny_mce/license.txt,
+  .../jscripts/tiny_mce/plugins/advhr/css/advhr.css,
+  .../tiny_mce/plugins/advhr/editor_plugin.js,
+  .../tiny_mce/plugins/advhr/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advhr/js/rule.js,
+  .../tiny_mce/plugins/advhr/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advhr/rule.htm,
+  .../tiny_mce/plugins/advimage/css/advimage.css,
+  .../tiny_mce/plugins/advimage/editor_plugin.js,
+  .../tiny_mce/plugins/advimage/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/advimage/image.htm,
+  .../tiny_mce/plugins/advimage/img/sample.gif,
+  .../jscripts/tiny_mce/plugins/advimage/js/image.js,
+  .../tiny_mce/plugins/advimage/langs/en_dlg.js,
+  .../tiny_mce/plugins/advlink/css/advlink.css,
+  .../tiny_mce/plugins/advlink/editor_plugin.js,
+  .../tiny_mce/plugins/advlink/editor_plugin_src.js,
+  .../tiny_mce/plugins/advlink/js/advlink.js,
+  .../tiny_mce/plugins/advlink/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/advlink/link.htm,
+  .../tiny_mce/plugins/autosave/editor_plugin.js,
+  .../tiny_mce/plugins/autosave/editor_plugin_src.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin.js,
+  .../tiny_mce/plugins/bbcode/editor_plugin_src.js,
+  .../tiny_mce/plugins/compat2x/editor_plugin.js,
+  .../tiny_mce/plugins/compat2x/editor_plugin_src.js,
+  .../tiny_mce/plugins/contextmenu/editor_plugin.js,
+  .../plugins/contextmenu/editor_plugin_src.js,
+  .../plugins/directionality/editor_plugin.js,
+  .../plugins/directionality/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/editor_plugin.js,
+  .../tiny_mce/plugins/emotions/editor_plugin_src.js,
+  .../tiny_mce/plugins/emotions/emotions.htm,
+  .../tiny_mce/plugins/emotions/img/smiley-cool.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-cry.gif,
+  .../plugins/emotions/img/smiley-embarassed.gif,
+  .../plugins/emotions/img/smiley-foot-in-mouth.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-frown.gif,
+  .../plugins/emotions/img/smiley-innocent.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-kiss.gif,
+  .../plugins/emotions/img/smiley-laughing.gif,
+  .../plugins/emotions/img/smiley-money-mouth.gif,
+  .../plugins/emotions/img/smiley-sealed.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-smile.gif,
+  .../plugins/emotions/img/smiley-surprised.gif,
+  .../plugins/emotions/img/smiley-tongue-out.gif,
+  .../plugins/emotions/img/smiley-undecided.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-wink.gif,
+  .../tiny_mce/plugins/emotions/img/smiley-yell.gif,
+  .../tiny_mce/plugins/emotions/js/emotions.js,
+  .../tiny_mce/plugins/emotions/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/example/dialog.htm,
+  .../tiny_mce/plugins/example/editor_plugin.js,
+  .../tiny_mce/plugins/example/editor_plugin_src.js,
+  .../tiny_mce/plugins/example/img/example.gif,
+  .../jscripts/tiny_mce/plugins/example/js/dialog.js,
+  .../jscripts/tiny_mce/plugins/example/langs/en.js,
+  .../tiny_mce/plugins/example/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullpage/css/fullpage.css,
+  .../tiny_mce/plugins/fullpage/editor_plugin.js,
+  .../tiny_mce/plugins/fullpage/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullpage/fullpage.htm,
+  .../tiny_mce/plugins/fullpage/js/fullpage.js,
+  .../tiny_mce/plugins/fullpage/langs/en_dlg.js,
+  .../tiny_mce/plugins/fullscreen/editor_plugin.js,
+  .../plugins/fullscreen/editor_plugin_src.js,
+  .../tiny_mce/plugins/fullscreen/fullscreen.htm,
+  .../tiny_mce/plugins/iespell/editor_plugin.js,
+  .../tiny_mce/plugins/iespell/editor_plugin_src.js,
+  .../tiny_mce/plugins/inlinepopups/editor_plugin.js,
+  .../plugins/inlinepopups/editor_plugin_src.js,
+  .../inlinepopups/skins/clearlooks2/img/alert.gif,
+  .../inlinepopups/skins/clearlooks2/img/button.gif,
+  .../inlinepopups/skins/clearlooks2/img/buttons.gif,
+  .../inlinepopups/skins/clearlooks2/img/confirm.gif,
+  .../inlinepopups/skins/clearlooks2/img/corners.gif,
+  .../skins/clearlooks2/img/horizontal.gif,
+  .../skins/clearlooks2/img/vertical.gif,
+  .../inlinepopups/skins/clearlooks2/window.css,
+  .../tiny_mce/plugins/inlinepopups/template.htm,
+  .../plugins/insertdatetime/editor_plugin.js,
+  .../plugins/insertdatetime/editor_plugin_src.js,
+  .../tiny_mce/plugins/layer/editor_plugin.js,
+  .../tiny_mce/plugins/layer/editor_plugin_src.js,
+  .../tiny_mce/plugins/media/css/content.css,
+  .../jscripts/tiny_mce/plugins/media/css/media.css,
+  .../tiny_mce/plugins/media/editor_plugin.js,
+  .../tiny_mce/plugins/media/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/media/img/flash.gif,
+  .../tiny_mce/plugins/media/img/flv_player.swf,
+  .../tiny_mce/plugins/media/img/quicktime.gif,
+  .../tiny_mce/plugins/media/img/realmedia.gif,
+  .../tiny_mce/plugins/media/img/shockwave.gif,
+  .../jscripts/tiny_mce/plugins/media/img/trans.gif,
+  .../tiny_mce/plugins/media/img/windowsmedia.gif,
+  .../jscripts/tiny_mce/plugins/media/js/embed.js,
+  .../jscripts/tiny_mce/plugins/media/js/media.js,
+  .../tiny_mce/plugins/media/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/media/media.htm,
+  .../tiny_mce/plugins/nonbreaking/editor_plugin.js,
+  .../plugins/nonbreaking/editor_plugin_src.js,
+  .../tiny_mce/plugins/noneditable/editor_plugin.js,
+  .../plugins/noneditable/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/css/content.css,
+  .../tiny_mce/plugins/pagebreak/editor_plugin.js,
+  .../plugins/pagebreak/editor_plugin_src.js,
+  .../tiny_mce/plugins/pagebreak/img/pagebreak.gif,
+  .../tiny_mce/plugins/pagebreak/img/trans.gif,
+  .../jscripts/tiny_mce/plugins/paste/blank.htm,
+  .../jscripts/tiny_mce/plugins/paste/css/blank.css,
+  .../tiny_mce/plugins/paste/css/pasteword.css,
+  .../tiny_mce/plugins/paste/editor_plugin.js,
+  .../tiny_mce/plugins/paste/editor_plugin_src.js,
+  .../tiny_mce/plugins/paste/js/pastetext.js,
+  .../tiny_mce/plugins/paste/js/pasteword.js,
+  .../tiny_mce/plugins/paste/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/paste/pastetext.htm,
+  .../jscripts/tiny_mce/plugins/paste/pasteword.htm,
+  .../tiny_mce/plugins/preview/editor_plugin.js,
+  .../tiny_mce/plugins/preview/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/preview/example.html,
+  .../tiny_mce/plugins/preview/jscripts/embed.js,
+  .../tiny_mce/plugins/print/editor_plugin.js,
+  .../tiny_mce/plugins/print/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/safari/blank.htm,
+  .../tiny_mce/plugins/safari/editor_plugin.js,
+  .../tiny_mce/plugins/safari/editor_plugin_src.js,
+  .../tiny_mce/plugins/save/editor_plugin.js,
+  .../tiny_mce/plugins/save/editor_plugin_src.js,
+  .../plugins/searchreplace/css/searchreplace.css,
+  .../plugins/searchreplace/editor_plugin.js,
+  .../plugins/searchreplace/editor_plugin_src.js,
+  .../plugins/searchreplace/js/searchreplace.js,
+  .../tiny_mce/plugins/searchreplace/langs/en_dlg.js,
+  .../plugins/searchreplace/searchreplace.htm,
+  .../tiny_mce/plugins/spellchecker/css/content.css,
+  .../tiny_mce/plugins/spellchecker/editor_plugin.js,
+  .../plugins/spellchecker/editor_plugin_src.js,
+  .../tiny_mce/plugins/spellchecker/img/wline.gif,
+  .../jscripts/tiny_mce/plugins/style/css/props.css,
+  .../tiny_mce/plugins/style/editor_plugin.js,
+  .../tiny_mce/plugins/style/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/style/js/props.js,
+  .../tiny_mce/plugins/style/langs/en_dlg.js,
+  .../jscripts/tiny_mce/plugins/style/props.htm,
+  .../jscripts/tiny_mce/plugins/table/cell.htm,
+  .../jscripts/tiny_mce/plugins/table/css/cell.css,
+  .../jscripts/tiny_mce/plugins/table/css/row.css,
+  .../jscripts/tiny_mce/plugins/table/css/table.css,
+  .../tiny_mce/plugins/table/editor_plugin.js,
+  .../tiny_mce/plugins/table/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/table/js/cell.js,
+  .../tiny_mce/plugins/table/js/merge_cells.js,
+  .../jscripts/tiny_mce/plugins/table/js/row.js,
+  .../jscripts/tiny_mce/plugins/table/js/table.js,
+  .../tiny_mce/plugins/table/langs/en_dlg.js,
+  .../tiny_mce/plugins/table/merge_cells.htm,
+  .../jscripts/tiny_mce/plugins/table/row.htm,
+  .../jscripts/tiny_mce/plugins/table/table.htm,
+  .../jscripts/tiny_mce/plugins/template/blank.htm,
+  .../tiny_mce/plugins/template/css/template.css,
+  .../tiny_mce/plugins/template/editor_plugin.js,
+  .../tiny_mce/plugins/template/editor_plugin_src.js,
+  .../tiny_mce/plugins/template/js/template.js,
+  .../tiny_mce/plugins/template/langs/en_dlg.js,
+  .../tiny_mce/plugins/template/template.htm,
+  .../tiny_mce/plugins/visualchars/editor_plugin.js,
+  .../plugins/visualchars/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm,
+  .../tiny_mce/plugins/xhtmlxtras/acronym.htm,
+  .../tiny_mce/plugins/xhtmlxtras/attributes.htm,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm,
+  .../tiny_mce/plugins/xhtmlxtras/css/attributes.css,
+  .../tiny_mce/plugins/xhtmlxtras/css/popup.css,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/del.htm,
+  .../tiny_mce/plugins/xhtmlxtras/editor_plugin.js,
+  .../plugins/xhtmlxtras/editor_plugin_src.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm,
+  .../tiny_mce/plugins/xhtmlxtras/js/abbr.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/acronym.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/attributes.js,
+  .../tiny_mce/plugins/xhtmlxtras/js/cite.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js,
+  .../plugins/xhtmlxtras/js/element_common.js,
+  .../jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js,
+  .../tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/about.htm,
+  .../jscripts/tiny_mce/themes/advanced/anchor.htm,
+  .../jscripts/tiny_mce/themes/advanced/charmap.htm,
+  .../tiny_mce/themes/advanced/color_picker.htm,
+  .../tiny_mce/themes/advanced/editor_template.js,
+  .../themes/advanced/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/advanced/image.htm,
+  .../tiny_mce/themes/advanced/img/colorpicker.jpg,
+  .../tiny_mce/themes/advanced/img/icons.gif,
+  .../jscripts/tiny_mce/themes/advanced/js/about.js,
+  .../jscripts/tiny_mce/themes/advanced/js/anchor.js,
+  .../tiny_mce/themes/advanced/js/charmap.js,
+  .../tiny_mce/themes/advanced/js/color_picker.js,
+  .../jscripts/tiny_mce/themes/advanced/js/image.js,
+  .../jscripts/tiny_mce/themes/advanced/js/link.js,
+  .../tiny_mce/themes/advanced/js/source_editor.js,
+  .../jscripts/tiny_mce/themes/advanced/langs/en.js,
+  .../tiny_mce/themes/advanced/langs/en_dlg.js,
+  .../jscripts/tiny_mce/themes/advanced/link.htm,
+  .../themes/advanced/skins/default/content.css,
+  .../themes/advanced/skins/default/dialog.css,
+  .../themes/advanced/skins/default/img/buttons.png,
+  .../themes/advanced/skins/default/img/items.gif,
+  .../advanced/skins/default/img/menu_arrow.gif,
+  .../advanced/skins/default/img/menu_check.gif,
+  .../themes/advanced/skins/default/img/progress.gif,
+  .../themes/advanced/skins/default/img/tabs.gif,
+  .../tiny_mce/themes/advanced/skins/default/ui.css,
+  .../themes/advanced/skins/o2k7/content.css,
+  .../tiny_mce/themes/advanced/skins/o2k7/dialog.css,
+  .../themes/advanced/skins/o2k7/img/button_bg.png,
+  .../advanced/skins/o2k7/img/button_bg_black.png,
+  .../advanced/skins/o2k7/img/button_bg_silver.png,
+  .../tiny_mce/themes/advanced/skins/o2k7/ui.css,
+  .../themes/advanced/skins/o2k7/ui_black.css,
+  .../themes/advanced/skins/o2k7/ui_silver.css,
+  .../tiny_mce/themes/advanced/source_editor.htm,
+  .../tiny_mce/themes/simple/editor_template.js,
+  .../tiny_mce/themes/simple/editor_template_src.js,
+  .../jscripts/tiny_mce/themes/simple/img/icons.gif,
+  .../jscripts/tiny_mce/themes/simple/langs/en.js,
+  .../themes/simple/skins/default/content.css,
+  .../tiny_mce/themes/simple/skins/default/ui.css,
+  .../tiny_mce/themes/simple/skins/o2k7/content.css,
+  .../themes/simple/skins/o2k7/img/button_bg.png,
+  .../tiny_mce/themes/simple/skins/o2k7/ui.css,
+  mod/tinymce/tinymce/jscripts/tiny_mce/tiny_mce.js,
+  .../tinymce/jscripts/tiny_mce/tiny_mce_popup.js,
+  .../jscripts/tiny_mce/utils/editable_selects.js,
+  .../tinymce/jscripts/tiny_mce/utils/form_utils.js,
+  .../tinymce/jscripts/tiny_mce/utils/mctabs.js,
+  .../tinymce/jscripts/tiny_mce/utils/validate.js,
+  mod/tinymce/views/default/embed/addcontentjs.php,
+  mod/tinymce/views/default/input/longtext.php,
+  mod/tinymce/views/default/tinymce/css.php,
+  mod/twitter/graphics/thewire_speech_bubble.gif,
+  mod/twitter/graphics/twitter.png, mod/twitter/languages/en.php,
+  mod/twitter/manifest.xml, mod/twitter/start.php,
+  mod/twitter/views/default/twitter/css.php,
+  mod/twitter/views/default/widgets/twitter/edit.php,
+  mod/twitter/views/default/widgets/twitter/view.php,
+  mod/twitterservice/languages/en.php, mod/twitterservice/manifest.xml,
+  mod/twitterservice/start.php, mod/twitterservice/vendors/twitter/license.txt,
+  mod/twitterservice/vendors/twitter/load.php,
+  mod/twitterservice/vendors/twitter/readme.txt,
+  mod/twitterservice/vendors/twitter/send.php,
+  .../vendors/twitter/twitter.class.php,
+  .../default/usersettings/twitterservice/edit.php,
+  mod/zaudio/audioplayer/audio-player.js, mod/zaudio/audioplayer/license.txt,
+  mod/zaudio/audioplayer/player.swf, mod/zaudio/manifest.xml,
+  mod/zaudio/readme.txt, mod/zaudio/start.php,
+  .../default/file/specialcontent/audio/mp3.php,
+  .../default/file/specialcontent/audio/mpeg.php,
+  .../default/file/specialcontent/audio/mpg.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php,
+  views/default/annotation/annotate.php,
+  views/default/annotation/generic_comment.php,
+  views/default/annotation/latest_comments.php,
+  views/default/canvas/default.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/one_column_with_sidebar.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/canvas_header/submenu_group.php,
+  views/default/comments/forms/edit.php, views/default/css.php,
+  views/default/css_ie.php, views/default/css_ie6.php,
+  views/default/entities/entity_list.php,
+  views/default/entities/entity_listing.php, views/default/friends/picker.php,
+  views/default/friends/river/create.php,
+  views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php, views/default/input/access.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php, views/default/js/initialise_elgg.php,
+  views/default/js/upload_js.php, views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/main_nav.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/topbar_tools.php,
+  .../notifications/settings/usersettings.php,
+  views/default/output/confirmlink.php, views/default/output/rss_view.php,
+  views/default/output/tags.php, views/default/output/url.php,
+  views/default/page_elements/breadcrumbs.php,
+  views/default/page_elements/content_header.php,
+  .../page_elements/content_header_member.php,
+  views/default/page_elements/contentwrapper.php,
+  views/default/page_elements/elgg_content.php,
+  views/default/page_elements/elgg_footer.php,
+  views/default/page_elements/elgg_header.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_contents.php,
+  views/default/page_elements/html_begin.php,
+  views/default/page_elements/html_end.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/spotlight.php,
+  views/default/page_elements/title.php, views/default/page_shells/default.php,
+  views/default/pageshells/pageshell.php, views/default/river/item/list.php,
+  views/default/river/item/wrapper.php, views/default/settings/system.php,
+  views/default/spotlight/default.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php, views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php: Pulled in the interface
+  changes.  
+
+2010-03-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes file for 1.7 release.  
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2010030101.sql,
+  version.php: Fixes #1562: Added a default value for entities.last_action in
+  the schema and as an upgraded.  Bumped version number to 1.7 final.  
+
+  	* mod/search/search_hooks.php, mod/search/views/default/search/entity.php:
+  Updated the the default search entity view to check for users and groups and
+  properly display their profile icons.  
+
+2010-03-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Fixing punctuation in upgrade strings.  
+
+  	* INSTALL.txt: Refs #1562: Updated requirements for Elgg.  
+
+  	* engine/lib/group.php: Fixes #1566: Rewriting calls to get_group_members()
+  to use 1.7's constant for site_guid.  
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/tests/regression/trac_bugs.php: Fixes #1558: Applied Cash's patch. 
+  Added unit tests to test for regressions for any bugs fixed in trac.  
+
+  	* engine/tests/objects/entities.php, engine/tests/objects/objects.php: Fixed
+  unit tests for exportable values after [3977].  
+
+  	* engine/lib/entities.php: Fixes #1563: Added time_updated and site_guid to
+  the export vals.  
+
+  	* mod/search/languages/en.php: Changed search language array variable name. 
+
+2010-02-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Fixes #1540: Added site_guid to
+  get_user_access_collections().  
+
+  	* engine/lib/relationships.php: Refs #1553: Corrected profile link in
+  friending notification.  
+
+  	* engine/lib/tags.php: Fixes #1555: Added missing call to
+  elgg_get_registered_tag_metadata_names() and defined missing variable.  
+
+  	* engine/lib/actions.php: Added login to the list of actions not requiring a
+  security token.  
+
+2010-02-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump.  
+
+  	* engine/lib/metadata.php, engine/tests/api/entity_getter_functions.php:
+  Fixes #1542: Pulled in Kevin's patch to add ability to sort by metadata. 
+  Added unit tests for this.  
+
+2010-02-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/tests/api/entity_getter_functions.php:
+  Refs #1543: Added support to have pass an array as a value in the
+  metadata_name_value_pair option of elgg_get_entities_from_metadata(). Added
+  unit tests for elgg_get_entities_from_metadata(). Cleaned up some
+  documentation for elgg_get_entities_from_metadata().  
+
+2010-02-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/objects.php, engine/lib/users.php: Fixes
+  #1528: Correctly throwing exceptions for objects, groups, and users.  
+
+2010-02-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: river plugin is defunct so does not
+  need to be enabled on install  
+
+  	* mod/diagnostics/actions/download.php, mod/diagnostics/start.php: Fixes
+  #1544: plugin hook for diagnostics now for entity "system"  
+
+2010-02-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixes #1531: Correctly implemented dates for
+  friendly times. No more coding while watching the Olympics!  
+
+2010-02-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/url.php: Fixes #1541: javascript now correctly
+  included in output/url view  
+
+2010-02-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/xml/pageshells/pageshell.php: Fixes #1517 - let web server set
+  content length on xml files  
+
+2010-02-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/elgglib.php, views/default/output/confirmlink.php,
+  views/default/output/url.php, views/default/page_elements/spotlight.php:
+  Deprecated elgg_validate_action_url() by elgg_add_action_tokens_to_url(). 
+  Updated elgg_deprecated_notice() to include the file & line of the caller. 
+  Updated core to use elgg_add_action_tokens_to_url().  
+
+2010-02-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/xml.php: Refs #1517: only encode <,>, and & for strings in xml 
+
+2010-02-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, actions/admin/site/update_basic.php,
+  actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  actions/admin/user/resetpassword.php, actions/admin/user/unban.php,
+  actions/comments/add.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/remove.php,
+  actions/import/opendd.php, actions/login.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, actions/usersettings/save.php, actions/widgets/save.php:
+  Refs #1538: Removed action_gatekeeper() from action files in core.  
+
+  	* htaccess_dist: Fixes #1539: Removed line endings from htaccess_dist.  
+
+2010-02-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, services/api/rest.php, services/api/rest_api.php:
+  Apache's MultiViews was matching the rest page handler incorrectly  
+
+2010-02-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, languages/en.php: Refs #1531: Added full time and
+  dates to friendly time stamptes via acronym tags.  
+
+  	* mod/search/index.php, mod/search/search_hooks.php, mod/search/start.php:
+  Fixes #1523: Updated search to use ELGG_ENTITIES_NO_VALUE/ANY_VALUE and
+  removed some commented out code.  
+
+2010-02-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixes #1421: Banning and unbanning users invalidates
+  the memcache entity.  
+
+  	* admin/user.php: Corrected fullview call in users admin section.  
+
+  	* views/default/js/initialise_elgg.php: Refs #1504: Removing revert option
+  from widget draggables to avoid fly away effect in IE 7.  
+
+  	* views/default/canvas/layouts/widgets.php: Fixed a bug in widget layouts
+  that caused the "edit page" link to not work if no widgets were defined.  
+
+  	* views/default/friends/picker.php: Fixes #1532: Added security tokens to
+  friend picker when in form mode.  
+
+  	* views/rss/pageshells/pageshell.php: Fixes #1535: Corrected double replace
+  for URL in RSS title view.  
+
+  	* engine/lib/access.php: Fixes #1519: Corrected site_guid in
+  create_access_collection().  
+
+2010-02-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/entity_getter_functions.php: Getter API test: Moved the
+  setup and tear down into the construct and destruct methods.  Fixed a few new
+  tests that were failing because of sorting by time.  
+
+2010-02-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/user.php, dashboard/latest.php, engine/lib/activity.php,
+  engine/lib/admin.php, engine/lib/entities.php, engine/lib/export.php,
+  engine/lib/group.php, engine/lib/input.php, engine/lib/metadata.php,
+  engine/lib/notification.php, engine/lib/objects.php,
+  engine/lib/relationships.php, engine/lib/river2.php, engine/lib/sites.php,
+  engine/lib/users.php, index.php: Fixes #1488: Removed use of deprecated
+  functions in core.  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/metadata.php,
+  engine/tests/api/entity_getter_functions.php: Refs #1523: elgg_get_entities()
+  uses the constants for defaults and conditionals.  Added some tests to check
+  for no subtypes.  Updated the documentation.  
+
+  	* engine/tests/api/entity_getter_functions.php, mod/diagnostics/index.php,
+  mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  mod/diagnostics/testreport.php, mod/diagnostics/unittester.php,
+  mod/diagnostics/views/default/diagnostics/test.php,
+  .../views/default/diagnostics/testresult.php: Fixes #1526: Big honking
+  warning added to unit tests.  Getter test also deletes its subtypes now.  
+
+  	* mod/search/README.txt: Updated docs for search.  
+
+  	* engine/lib/actions.php: Fixes #1527: Logout doens't require an action
+  token. This is a temporary fix until #1509 is implemented.  
+
+  	* mod/search/search_hooks.php: Fixes #1499: User and group search default to
+  ignoring subtypes to return all entities.  
+
+2010-02-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/index.php: Fixed incorrect variable calls in search.  
+
+  	* mod/search/search_hooks.php: Not using elgg_get_entities_from_metadata()
+  for tag search because of performance issues.  Switched to custom WHERE /
+  JOINs with elgg_get_entities().  
+
+  	* engine/lib/elgglib.php: Removing embed extended view from core.  
+
+2010-02-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, languages/en.php, mod/search/search_hooks.php,
+  views/default/output/tags.php: Cleaned up tag searching so you can search on
+  a specific tag.  Useful in search so a tag in "Things I like" won't match a
+  tag in "Things I hate."  
+
+2010-02-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Can't type hint for strings.  
+
+  	* CHANGES.txt, engine/lib/entities.php, engine/lib/tags.php,
+  mod/search/search_hooks.php: Closes #1506: Added
+  elgg_register_tag_metadata_name(), elgg_get_registered_tag_metadata_names(),
+  and ElggEntity::getTags().  Search on tags updated to use registered tag
+  names instead of hard-coded 'tags' metadata name.  
+
+  	* engine/lib/elgglib.php: Fixes #1510: Added elgg_get_file_list(). 
+  get_library_files() wraps to this function with a deprecation notice for any
+  plugin authors using it to auto-load files.  
+
+  	* engine/lib/api.php, engine/lib/elgglib.php, engine/lib/input.php,
+  engine/lib/mb_wrapper.php, engine/lib/pagehandler.php,
+  mod/search/views/default/search/listing.php: Fixes #1512: Using a helper
+  function for mb_parse_str() instead of wrapping it exactly.  
+
+2010-02-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, languages/en.php: updated documentation on the REST
+  API user authentication 
+
+2010-02-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/lib/elgglib.php, engine/lib/input.php,
+  engine/lib/mb_wrapper.php, engine/lib/pagehandler.php: Fixes #1501: Setting
+  ini for mbstring.internal_encoding to utf8 to work around a PHP bug. Replaced
+  calls to parse_str() with elgg_parse_str().  
+
+  	* views/default/navigation/pagination.php: Fixes #1507: $vars['baseurl']
+  used instead of undefined $baseurl in pagination view.  
+
+2010-02-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: fixes #1505 - some lazy css was impacting opera for
+  checkboxes - overriding border and padding properties inherited from input
+  selector 
+
+2010-02-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/url.php: Made the output/url view backward compatible
+  for the few plugins that used it.  
+
+2010-02-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Remove version from default theme's css.  
+
+2010-02-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/start.php: Fixes #1503, fixes #1474:
+  Library files are loaded using a hard-coded list to better deal with removed
+  files. Also, ~4% performance increase per page load on my server!  
+
+  	* mod/search/start.php: Correcting the corrected documentation.  
+
+  	* mod/search/start.php: Documentation correction in search.  
+
+2010-02-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php, mod/crontrigger/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/garbagecollector/manifest.xml,
+  mod/htmlawed/manifest.xml, mod/logbrowser/manifest.xml,
+  mod/logrotate/manifest.xml, mod/search/manifest.xml,
+  mod/uservalidationbyemail/manifest.xml: Updated copyright for core plugin
+  manifests.  
+
+  	* engine/lib/access.php, engine/tests/api/entity_getter_functions.php: Fixes
+  #1496: delete_access_collection() invalidates the access collection cache
+  before attempting to delete.  Removed a misplaced unset() in a unit test that
+  was causing test objects not to be properly deleted.  
+
+2010-02-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/settings/system.php: finished the fix to #1492 
+
+  	* languages/en.php: more user friendly section title on user stats page 
+
+  	* languages/en.php: fixed punctuation issue on install instructions 
+
+  	* engine/lib/api.php, languages/en.php: tweaked some documentation on the
+  REST API 
+
+2010-02-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Correcting documentation for
+  elgg_get_entities_from_metadata().  
+
+2010-02-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/header.php: & replaced by &amp; in the header and
+  alt added to some header graphics 
+
+  	* CONTRIBUTORS.txt: updated 
+
+2010-02-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/api/entity_getter_functions.php, engine/tests/suite.php: Refs
+  #1200: Added tests to test for false being returned with elgg_get_entities().
+   Disabled execution time during unit tests.  
+
+  	* actions/systemsettings/install.php, engine/lib/ping.php, languages/en.php,
+  views/failsafe/settings/system.php: Fixes #1492: Removed usage info
+  collecting from installation.  
+
+  	* engine/schema/mysql.sql: Fixes #1493: Updated schema to set auto_increment
+  IDs for access_collections to 3 to avoid overwriting default values with
+  group / shared access ACLs.  
+
+  	* views/default/css.php: Fixes #1491: Removed mistakingly assigned
+  input-password with input-textarea.  
+
+2010-02-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/version.php: missing new on upgrade_details object creation 
+
+  	* engine/lib/elgglib.php: fixes #1486 - elgg_dump now works when sending to
+  server error log 
+
+2010-02-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Fixes #1404: Added input-password rules in default
+  css.  
+
+2010-02-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, languages/en.php: Fixes #1483: Reset password emails
+  forward to a confirmation page handler instead of directly to an action.  
+
+  	* engine/lib/pageowner.php: Fixes #1212: Removed unused code.  
+
+  	* engine/lib/elgglib.php: Fixes #1486: elgg_log() can now log arrays and
+  objects to error_log().  
+
+  	* engine/lib/xml-rpc.php: Fixes #1319: Applied patch for missing xml-rpc
+  <value> tag.  
+
+  	* CHANGES.txt, engine/lib/elgglib.php,
+  views/default/navigation/pagination.php, views/default/river/item/list.php:
+  Fixes #1481: Applie Mike's patch and created function
+  elgg_http_add_url_query_elements() to handle what the pagination view was
+  trying to do.  
+
+2010-02-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: updated copyright to 2010 
+
+2010-02-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/tests/api/entity_getter_functions.php: Refs #1200: Changed logic in
+  elgg_get_entity_type_subtype_where_sql() to return FALSE if there are no
+  valid subtypes passed. Ignores all invalid subtypes.  Added (partial) tests
+  for elgg_get_entities() types and subtypes.  
+
+2010-02-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* INSTALL.txt: updated install instructions to encourage more use of the
+  wiki instructions/troubleshooting and discourage setting data directory to
+  777 as default 
+
+  	* views/rss/pageshells/pageshell.php: fixed a comment in rss pageshell 
+
+2010-02-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: PHP complains about not casting the timestampt
+  to int for use in date().  
+
+  	* engine/lib/metadata.php: Added error checking to
+  clear_metadata_by_owner().  
+
+  	* engine/lib/entities.php: Fixed incorrect variable for subtype in
+  get_entity_dates().  
+
+  	* views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php: Fixes #1328: Removed rows and cols
+  from the installation textareas and added CSS to format width/height at 100%
+  to make it easier to read and select.  
+
+  	* engine/lib/elgglib.php: Fixes #340: add_menu() and make_register_object()
+  deprecated.  
+
+  	* engine/lib/languages.php: Fixes #1166. get_installed_translations() only
+  calculates completion if admin is logge din.  
+
+  	* CHANGES.txt, engine/lib/entities.php: Fixes #1406: get_entity_dates()
+  supports order by.  
+
+  	* engine/lib/database.php: Adding some \ns between the SQL error and the
+  query in the database exception.  
+
+  	* engine/lib/input.php: Fixes #1398: autop() doesn't call missing
+  clean_pre() function.  
+
+  	* CHANGES.txt, engine/lib/entities.php: Fixes #1376: added
+  ElggEntity::removeRelationship().  
+
+  	* engine/lib/elgglib.php: Fixes #1478: uh....how did that get in there?  
+
+  	* engine/lib/elgglib.php: Fixes: #1475.  elgg_http_build_url() correctly
+  sets port number.  
+
+  	* engine/lib/filestore.php: Fixes #1314: Filestore opens read-only with rb
+  instead of r+b.  
+
+  	* actions/email/save.php: Refs #1290: Changed email addresses are checked in
+  action:email/save  
+
+  	* engine/lib/elgglib.php: Fixes #1261: Exceptions force an HTTP recache.  
+
+  	* CHANGES.txt, engine/lib/relationships.php: Fixes #1213:
+  delete_relationship() triggers delete:relationship hook.  
+
+  	* engine/lib/pageowner.php: Fixes #1211: page_owner() sets the page owner
+  after figuring it out.  
+
+  	* engine/lib/entities.php: Updated documentation for elgg_get_entities().  
+
+  	* CHANGES.txt, engine/lib/entities.php: Fixes #1325:
+  ElggEntities::countEntitiesFromRelationship() support inverse relationships. 
+
+  	* engine/lib/users.php, views/default/account/forms/login.php: Fixes #1473:
+  Simple patch to create a view for the registration page.  
+
+  	* engine/lib/annotations.php: Fixed incorrect deprecated warning.  
+
+  	* engine/lib/elgglib.php: Refs #1079: elgg_view() casts view to a string
+  before attempting to call views.  
+
+  	* engine/lib/users.php: Fixes #678.  Friending appears in the river for
+  invited new users.  
+
+  	* engine/lib/entities.php: Put the can_write_to_container() plugin hook in
+  the right place after [3871].  
+
+  	* CHANGES.txt, engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/metadata.php, engine/lib/objects.php,
+  engine/lib/relationships.php, engine/lib/sites.php, engine/lib/users.php,
+  views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php: Add elgg_deprecated_notice() so we
+  don't have to re-write all the elgg_log() deprecated notices to
+  register_error()s.  Updated current ones to use this.  
+
+2010-01-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/listing.php: Removing var_dump().  
+
+  	* CHANGES.txt, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php,
+  mod/search/views/default/search/listing.php,
+  views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php: Deprecated old search functions and
+  views.  
+
+  	* CHANGES.txt, engine/lib/entities.php: Fixes #1164:
+  can_write_to_container() now sends default values through
+  container_permissions_check hook.  
+
+  	* mod/htmlawed/start.php: htmlawed no longer creates tags with extra spaces
+  (<p >).  
+
+  	* views/rss/pageshells/pageshell.php: Fixes #1289: Pragma: public header
+  added for RSS feeds.  
+
+  	* engine/lib/users.php: Fixes #804: A relationship is created between a new
+  user and the site it was created on.  
+
+  	* engine/lib/elgglib.php, views/default/navigation/pagination.php,
+  views/default/navigation/viewtype.php, views/default/river/item/list.php:
+  Fixes #959: Added elgg_http_remove_url_query_element() to remove a GET
+  element instead of using faulty regexp.  
+
+2010-01-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Changed array_key_exists() to isset() in
+  elgg_validate_action_url().  
+
+  	* engine/lib/elgglib.php: Added checking for $query array in
+  elgg_validate_action_url().  
+
+  	* engine/lib/input.php: Setting a default value to avoid notices.  
+
+  	* mod/htmlawed/start.php, mod/htmlawed/vendors/htmLawed/htmLawed.php,
+  mod/htmlawed/vendors/htmLawed/htmLawedTest.php,
+  mod/htmlawed/vendors/htmLawed/htmLawed_README.htm,
+  mod/htmlawed/vendors/htmLawed/htmLawed_README.txt,
+  .../vendors/htmLawed/htmLawed_TESTCASE.txt: Fixes #1425, Fixes #1341:
+  Upgraded htmlawed to latest. Altered the htmlawed attribute filtering
+  function to return <attr="val"> for proper linking in parse_urls().  Added
+  background-color as a non-filtered style attribute.  
+
+  	* engine/lib/input.php: Refs #1425: Cleaned up regexp for parlse_urls().  
+
+2010-01-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Fixes #1468: Cleaned up logic for enabling and
+  disabling plugins. Checking for arrays when metadata returns only a single
+  enabled plugin.  
+
+  	* admin/plugins.php, mod/diagnostics/index.php, mod/logbrowser/index.php:
+  Removed unneeded owner block icons from admin.  
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2010012901.sql,
+  version.php: Added db migration 2010012901 that adds last_action column to
+  entities table. Bumped version number to 1.7b (2010012901).  
+
+  	* CHANGES.txt, engine/lib/relationships.php: Fixes #1472:
+  get_entity_relationships() supports inverse relationships.  
+
+  	* engine/lib/elgglib.php: Fixes #1470, Fixes #1471:
+  elgg_view_regenerate_simplecache() no longer triggers the pagesetup/system
+  hook.  Fixes problems with creating the submenu.  
+
+2010-01-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Corrected clear_plugin_setting() to only remove a
+  single plugin setting instead of all setting for a plugin. Added
+  clear_all_plugin_settings() to remove all settings for a plugin.  
+
+2010-01-28  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: changed my email address to web site in contributors
+  file 
+
+2010-01-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/useradd.php, engine/lib/users.php: Fixes #1049, Fixes #1435:
+  Admin-created users and first admin user are marked as validated to prevent
+  inaccurate "Please validate your account" messages and emails.  
+
+2010-01-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/annotations.php, engine/lib/river2.php: Fixes
+  #1419: Added remove_from_river_by_annotation(). Deleting annotations now
+  deletes their river entry.  
+
+  	* CHANGES.txt: Updated changes.  
+
+  	* engine/lib/elgglib.php: Fixes #1465: Added unregister_event_handler() and
+  unregister_plugin_hook().  
+
+  	* engine/lib/sessions.php: Fixes #1464: A new session is created in logout()
+  after destorying the old session to display old $_SESSION['msg'] messages.  
+
+2010-01-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes for the display name change.  
+
+  	* actions/user/name.php, languages/en.php,
+  views/default/user/settings/name.php: Display names are limited to 50 chars
+  and have HTML tags removed.  
+
+  	* README.txt: Bumped version number in README.  
+
+  	* views/default/css.php: Fixed a typo in css that broke everything in FF
+  3.6.  
+
+  	* CHANGES.txt, engine/lib/plugins.php, languages/en.php: Fixes #1454:
+  Applied Cash's patch.  Bad plugins are automatically disabled and a notice is
+  displayed instead of breaking the site.  
+
+2010-01-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, engine/lib/input.php: Fixes #1450, Fixes #1461:
+  Using $_SERVER['REQUEST_URI'] to pull in GET params on apache servers.  
+
+2010-01-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Correctly forwarding messages among multiple
+  forwards (action_gatekeeper() -> index -> dashboard would drop messages
+  generated in action_gatekeeper()).  
+
+  	* actions/systemsettings/install.php: Refs #1450, Refs #1461, Refs #1460:
+  Install now clears out views caches.  
+
+  	* mod/diagnostics/start.php: Masking dbpassword in dianostics file.  
+
+  	* engine/lib/actions.php: Fixes #1460, Fixes #1459: Tokens are not required
+  to disable a plugin or install.  This allows users to disable plugins that
+  overwrite admin pages without tokens.  
+
+  	* views/failsafe/input/form.php, views/failsafe/input/securitytoken.php:
+  Refs #1459: Added missing security tokens for failsafe (installation) view.  
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, actions/admin/user/ban.php,
+  actions/admin/user/delete.php, actions/admin/user/makeadmin.php,
+  actions/admin/user/removeadmin.php, actions/admin/user/resetpassword.php,
+  actions/admin/user/unban.php, actions/email/save.php,
+  actions/entities/delete.php, actions/register.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, actions/usersettings/save.php: Removing calls to
+  engine/start.php in action files.  
+
+  	* CODING.txt: Added best practices to CODING.txt.  
+
+2010-01-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/object/default.php: Fixed missing ) causing a WSOD.  
+
+  	* views/default/admin/user_opt/search.php: Fixes #1455: Updated search URL
+  for admin user search. (The old one worked, but didn't limit to users.)  
+
+2010-01-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../actions/email/confirm.php, mod/uservalidationbyemail/manifest.xml,
+  mod/uservalidationbyemail/start.php: Changed uservalidationbyemail to not use
+  an action and cleaned up some of its code.  
+
+  	* engine/lib/elgglib.php: Fixed a bug preventing messages and warnings from
+  passing during a forward().  
+
+2010-01-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/basic_elements/welcome.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/welcome/logged_in.php: Updated views to use output/url with
+  action flag set.  
+
+  	* views/default/output/action_link.php, views/default/output/url.php:
+  Removed output/action_link view as it duplicated much of output/url. Improved
+  output/url view.  
+
+  	* engine/lib/metadata.php: Corrected a possible SQL insertion bug in
+  elgg_get_entity_metadata_where_sql().  
+
+  	* engine/lib/filestore.php: Fixing bug in resizing function that would
+  incorrectly attempt to crop a picture that was smaller than the target image.
+   
+
+  	* engine/lib/elgglib.php: Changed default declaration of $vars in
+  elgg_view() to array().  
+
+  	* views/default/object/default.php: Fixed a typo causing a WSOD.  
+
+  	* engine/lib/actions.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/basic_elements/welcome.php,
+  views/default/canvas/layouts/widgets.php, views/default/css.php,
+  views/default/object/default.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/spotlight.php,
+  views/default/welcome/logged_in.php: Fixes #750: All actions require
+  __elgg_ts and __elgg_token.  
+
+  	* engine/lib/elgglib.php: elgg_http_build_query() now supports ports.
+  Checking for __elgg_ts also in elgg_validate_action_url(). Fixed a spelling
+  mistake ;)  
+
+  	* views/default/output/action_link.php: Adding a view to generate action
+  links for single-click actions.  
+
+2010-01-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/listing.php: Fixing bugs in search that
+  would break pagination.  
+
+  	* views/rss/navigation/pagination.php: Refs #1161: Added empty pagination
+  view for RSS feeds.  
+
+  	* engine/lib/filestore.php: Resetting cropping coords for images that can't
+  be cropped in filestore.  
+
+  	* engine/lib/filestore.php: Fixes #1445:
+  get_resized_image_from_existing_file() has an optional parameter to allow
+  upscaling if requested image is larger than original image.  
+
+  	* engine/lib/entities.php: Fixed documentation for time created and modified
+  params in elgg_get_entities().  
+
+2010-01-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/search_hooks.php: Removing order by clause for now in search.  
+
+  	* CHANGES.txt: Updated CHANGES for #1414.  
+
+2010-01-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/page_elements/searchbox.php: Stripping slashes on output
+  of original search query.  
+
+  	* mod/search/start.php: Allowing no table prefix in
+  search_get_search_where_sql()  
+
+  	* mod/search/start.php: Fixed incorrect order by for search sorting.  
+
+  	* mod/search/index.php, mod/search/search_hooks.php, mod/search/start.php:
+  Fixed an incorrect var name that caused a bug when hooking against a type but
+  not a subtype. Added first pass at results sorting.  
+
+  	* mod/search/README.txt, mod/search/index.php, mod/search/start.php,
+  mod/search/views/default/search/layout.php: Removed unnecessary view
+  directories. Added option of overriding the default layout for search
+  queries. Updated documentation reflecting those changes. Clarified some
+  points in the documentation.  
+
+  	* engine/lib/elgglib.php: Added checking and an ERROR log if elgg_view() is
+  passed a non-array $vars.  
+
+2010-01-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: Updated contributors with entire MITRE team.  
+
+2010-01-13  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Creating a helper function to return INI values in
+  bytes.  
+
+2010-01-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixes #1414: Metadata set to a falsy value
+  (except NULL) returns TRUE for isset($obj->md).  
+
+2010-01-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/metadata.php,
+  engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php,
+  engine/tests/objects/objects.php, engine/tests/objects/users.php: closes
+  #1145 - deprecated current "copy constructor" for all entities and
+  implemented a clone method. The clone copies over all metadata but not
+  annotations and private settings. It sets the guid to 0 so saving the cloned
+  entity creates a new database record. The ownership/access of metadata is set
+  during the save and will be the same as that of the entity. 
+
+2010-01-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/rss/search/entity.php: Cleaned up RSS entity view for
+  search a bit.  
+
+  	* mod/search/index.php, mod/search/views/rss/search/entity.php,
+  mod/search/views/rss/search/listing.php: Added phpdoc header to index.php
+  Added RSS support to search. Nifty.  
+
+2010-01-11  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/output/confirmlink.php: Always
+  generating action tokens with output/confirmlink.  Includes a check for
+  actions already defining the tokens.  
+
+2010-01-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/README.txt: Fixed a few spelling mistakes. Added descriptions
+  for the vars in 3.2  
+
+  	* engine/lib/relationships.php: Sanitising relationship in
+  elgg_get_entities_from_relationship();  
+
+  	* views/default/output/tags.php: Fixed tag output link for new search.  
+
+  	* mod/search/README.txt, mod/search/index.php, mod/search/start.php,
+  .../views/default/search/comments/entity.php,
+  .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/entity.php,
+  mod/search/views/default/search/listing.php: Pulling out entity views in
+  search. Adding dev documentation.  
+
+2010-01-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fixes #1399: Case sensitivity was never in the
+  deprecated function, so no need to add it.  Use the new functions if
+  required.  
+
+  	* engine/lib/metadata.php: Fixes #538. Applied Cash's patch. This is an old
+  one...jeepers.  
+
+  	* engine/lib/metadata.php: Fixes #1375: Metadata names and values are
+  properly escaped.  
+
+2010-01-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #1400: Fixed a typo in checking the
+  site_guid.  Can't duplicate #1400 now, so possible fix for that. Waiting for
+  other tests to close this one.  
+
+  	* languages/en.php: Updated language file to reflect default prefix change. 
+
+  	* views/failsafe/messages/sanitisation/settings.php: Changed default prefix
+  to 'elgg_' for table name readability.  
+
+  	* actions/systemsettings/install.php, engine/lib/input.php: Fixes #1172: URL
+  now checked for trailing slash upon installation.  
+
+2010-01-06  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009102801.php: Fixing an upgrade issue relating from
+  invalid (non-existent) usernames  
+
+2010-01-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2010010501.php, version.php: Added an upgrade to
+  enable the search plugin. Bumped internal version number.  
+
+2010-01-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Set admin user's validation upon initial
+  registration. Fixes an incorrect error message if the first admin user enters
+  the wrong password.   
+
+2009-12-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Closes #1424: Faulty database migrations will now
+  halt an upgrade.  
+
+  	* engine/lib/metadata.php: Removed debug data.  
+
+  	* engine/schema/upgrades/2009100701.sql: Removed lock tables from db utf8
+  migration because it fails on some (all?) servers.  
+
+2009-12-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/access.php, views/default/input/button.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/tags.php, views/default/output/confirmlink.php,
+  views/default/page_elements/header.php: a little cleanup of documentation and
+  variable handling in input and output views 
+
+  	* entities/index.php: removed unused variable in entities index 
+
+  	* engine/lib/group.php: fixed #1087 - is_group_member() now returns boolean
+  values only 
+
+  	* engine/lib/entities.php: fixes #988 - subtype is now available on new
+  entities after being saved 
+
+2009-12-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: fixed bug where array of messages passed to
+  system_messages caused execution to stop - also displaying only errors if
+  they exist rather than having success and error messages overlapping each
+  other 
+
+  	* engine/lib/users.php: fixes #1322 - "remember me" cookie code is cleared
+  when a user is banned 
+
+  	* views/default/page_elements/header.php,
+  views/failsafe/pageshells/pageshell.php: fixes #1193 - now specify charset in
+  both metatag and http header 
+
+  	* engine/lib/database.php: cleaned up logic on db query cache 
+
+  	* engine/lib/entities.php: fixed typo in list_entities() 
+
+2009-12-18  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Clarified the documentation for
+  add_entity_relationship().  
+
+2009-12-18  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/comments/add.php: add comment action now using get_loggedin_user()
+  rather than $_SESSION['user'] 
+
+  	* views/default/input/form.php: added js to input/form 
+
+  	* engine/lib/actions.php, engine/lib/pagehandler.php: better parsing of
+  query for action and page handlers 
+
+2009-12-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/mb_wrapper.php: perhaps this is what Brett intended with the
+  new mb_wrapper code 
+
+  	* views/default/input/button.php, views/default/input/form.php,
+  views/default/input/submit.php, views/default/input/text.php: fixed notices
+  caused by some input views 
+
+  	* engine/lib/database.php: fixed warning due to database query cache 
+
+  	* engine/lib/entities.php: when asking for a count of entities, we now
+  return an integer rather than a string 
+
+  	* engine/lib/elgglib.php: get_submenu was throwing out tons of notices -
+  this should be fixed now 
+
+  	* views/default/css.php: fixes #951 - using background-color rather than
+  background 
+
+2009-12-16  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: better version of
+  get_resized_image_from_existing_file() - fixes #685 - more robust to errors,
+  and fixes a memory leak - tested with both profile photos and file plugin
+  photos - old installs will still have profile icons of the wrong size due to
+  #685 
+
+  	* engine/lib/input.php: added comments on get_input and set_input since they
+  do not handle nested arrays 
+
+2009-12-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: Fixes #1413: New server test.  
+
+2009-12-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: closes #1277 - display_tagcloud() now has same
+  parameters as get_tags() 
+
+  	* views/default/output/tagcloud.php: fixes #1197 - no division by zero
+  warning any longer 
+
+  	* views/default/account/forms/login.php,
+  views/default/account/forms/register.php: easier to extend login and
+  registration forms now 
+
+  	* CHANGES.txt: updated CHANGES.txt with info on river table 
+
+  	* engine/tests/services/api.php: fixed line endings on services api unit
+  tests 
+
+  	* languages/en.php: added some missing language strings 
+
+2009-12-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: closes #1244 - checking whether file exists before
+  deleting it in cache 
+
+  	* views/default/friends/collectiontabs.php: closes #1226 - fixes eclipse
+  validation error 
+
+  	* languages/en.php, views/default/admin/user_opt/search.php: fixes #1230 -
+  spelling corrected 
+
+  	* engine/lib/access.php: using defines for ACCESS values - closes #1064 
+
+  	* mod/htmlawed/start.php: removes @ from include - closes #879 
+
+  	* actions/admin/user/ban.php: removes unused variables - closes #1129 
+
+2009-12-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: minor tweak in comment - closes #1264 
+
+  	* views/default/css.php, views/default/page_elements/owner_block.php: fixes
+  #973 - pulls reported content and bookmark code out of core owner_block view
+  - left images in _graphics since themes probably depend on that and did not
+  want to break themes 
+
+  	* engine/lib/relationships.php: fixes #1323 and #1186 - PHP 5.3 requires
+  magic methods to be public 
+
+2009-12-08  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/users.php,
+  engine/tests/objects/users.php: fixes #1305 - user and entity cache now
+  cleared on delete 
+
+  	* engine/lib/sessions.php, languages/en.php: gatekeeper functions now
+  display helpful messages - closes #1060 
+
+  	* engine/lib/group.php: fixes #1287 - users now removed from group acl when
+  leaving group - changed order of event and relationship removal 
+
+  	* .../canvas/layouts/two_column_right_sidebar.php, views/default/css.php:
+  fixes #537 - missing area3 added to two_column_right_sidebar - also added
+  enough css so that the login page works with right sidebar 
+
+2009-12-07  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Adding alias ElggSession methods  
+
+2009-12-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: fixes #1187 
+
+  	* actions/comments/add.php, languages/en.php: fixes #1018 - blank comments
+  are now rejected 
+
+  	* views/default/input/form.php, views/failsafe/input/form.php,
+  views/failsafe/messages/sanitisation/settings.php: fixes #1183 - correct case
+  for form method now 
+
+  	* engine/lib/elgglib.php: fixed issue where php notices were written to log
+  on any debug level and added a plugin hook so plugins can direct elgg_log
+  messages where they want 
+
+  	* actions/login.php: fixed warning on access of array index that did not
+  exist in session global 
+
+  	* engine/lib/access.php: removed code that wasn't doing anything in
+  access.php 
+
+  	* engine/lib/relationships.php: fixed typo in
+  get_entities_from_relationship() 
+
+2009-12-05  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/start.php: adding more security to the user
+  validation by email code - before people could fake the validation with
+  knowledge of the code making it possible for bots to register and validate
+  without an email address 
+
+  	* engine/lib/annotations.php: get_entities_from_annotations was ignoring
+  group_guid - setting container_guid now 
+
+  	* mod/htmlawed/start.php: fixed trivial bug in htmlawed plugin. The ;
+  delimiter should only be used between sets of schemes (protocols). This is
+  due to some slightly lazy coding in htmlawed. 
+
+  	* engine/lib/sessions.php: if there is already a user in the session, we
+  don't need to set the code from the cookie 
+
+  	* engine/lib/plugins.php: fixed bug introduced in [3608] 
+
+  	* languages/en.php, views/default/annotation/annotate.php: fixed bug in
+  comment river view due to missing } 
+
+2009-12-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: fixes #1273 - replaced previous hack with call to
+  getType 
+
+  	* engine/lib/api.php, engine/tests/services/api.php: fixes #1397 and updates
+  unit tests - comma was missing 
+
+2009-12-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: fixes #1396 - thanks for reporting this 
+
+2009-12-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/search_hooks.php: Stripping tags to remove HTML on title and
+  description for comment search.  
+
+  	* mod/search/search_hooks.php: Removed a line breaking description for
+  comments in search.  
+
+  	* mod/search/search_hooks.php: Comments' search hook now correctly trims
+  description and title.  
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php: Removed pagination from top of
+  results.  
+
+  	* engine/lib/elgglib.php: Trimming the paths when detecting which nav item
+  to mark as selected.  
+
+2009-12-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/listing.php: Search types without a
+  subtype now display properly.  
+
+  	* engine/lib/elgglib.php: Changed the way the sidebar nav "selected" class
+  is applied.  Should yield more accurate results if the URIs aren't exactly
+  the same.  
+
+  	* CHANGES.txt: Removed duplicate changes entry.  
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php: Changed avatar size to small in
+  search results. Fixed a bug so comment owners' avatars show up instead of
+  commented entity's owners' avatars.  
+
+2009-12-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/usersettings.php, languages/en.php: closes #876 - profile
+  language strings moved to profile plugin 
+
+2009-11-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/listing.php: Added pagination to comments
+  view.  
+
+  	* mod/search/search_hooks.php, mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/tags/listing.php: Removed tag search listing.
+  Added ability to provide extra info in searches as 'search_matched_extra'.
+  Allowing overrides for titles.   
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php: If a search result returns a
+  user, make the icon be for the user and not the owner (which is no one)  
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/tags/listing.php: Listings use profile/icon
+  view instead of calling icon directly.  
+
+2009-11-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/entity_list.php: search results view
+  tweaked 
+
+2009-11-24  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixing a bug resulting from get_loggedin_user()
+  return FALSE.  This bug could throw a fatal error to non-loggedin users.  
+
+  	* engine/tests/test_skeleton.php: Adding documentation to the unit test
+  skeleton file.  
+
+2009-11-24  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: entities can now have metadata of 0 and return
+  the correct type. Fixes #1192 
+
+  	* dashboard/latest.php: dashboard latest wasn't specifying fullview as false
+
+  	* engine/lib/languages.php: fixes 1315 - language static now being set
+  correctly 
+
+  	* engine/lib/entities.php: fixes #935 
+
+  	* engine/lib/users.php: made the get user friends objects functions
+  consistent and added some missing documentation - no api usage changes 
+
+2009-11-23  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, engine/lib/users.php,
+  engine/tests/objects/filestore.php: Deleting a user will remove all user
+  files.  Fixes #607  
+
+2009-11-22  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/remove.php: remove friend action, return user to the place
+  the action was triggered 
+
+  	* actions/friends/add.php: when friending another user, return to the page
+  you carried out the action 
+
+2009-11-21  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/relationships.php: fixes #1374 - owner_guid wasn't being set
+  correctly in options array 
+
+  	* engine/lib/metadata.php: get_entities_from_metadata_multi() had bad option
+  keys - related to #1374. 
+
+  	* engine/lib/users.php: fixes #1380 - get_user_friends() was being called
+  with subtype of desired objects in get_user_friends_objects() - thanks for
+  the report 
+
+2009-11-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed a bug with group by and order by in
+  elgg_get_entities. #ElggCampBA  
+
+2009-11-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: updated some documentation on
+  register_page_handler(). This fixes #1373 
+
+2009-11-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: updating the contributors file 
+
+2009-11-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bump.  
+
+2009-11-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/tags/listing.php: 'More' links on serarch
+  results moved, and link added to Tag results 
+
+  	* .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/tags/listing.php: Search UI cleaned up 
+
+2009-11-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/views/default/search/listing.php: Fixed typo to display the
+  type of search.  
+
+  	* actions/systemsettings/install.php, views/default/site/default.php: Added
+  an INSTALLING constant when installing. Fixed a bug when trying to export a
+  site that causes the browser to redirect to the site's url, which caused the
+  installation process to skip past the "create your admin user" prompt when
+  "ping home" was checked.  
+
+2009-11-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/start.php: Added a missing elgg_strlen() in
+  search_remove_ignored_words()  
+
+  	* CHANGES.txt: Updated changes file with search and user data storage info. 
+   
+
+2009-11-14  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: fixes #1169 as described on ticket 
+
+  	* CHANGES.txt, engine/lib/api.php: updated documentation of API functions -
+  perhaps ready for developer preview 
+
+2009-11-13  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/jquery/jquery-ui-1.7.2.min.js: Including jQuery UI 1.7.2 in core. 
+  The custom build did not contain all the features we would like to have.
+  Leaving the custom build in place for community additions.  
+
+  	* engine/lib/annotations.php: Properly ordering annotation objects returned
+  by Elgg methods.  
+
+  	* search/index.php: Creating a redirect page for legacy themes using search.
+   
+
+2009-11-13  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/services/api.php: more test cases related to #1364. 
+
+  	* engine/lib/api.php, engine/tests/services/api.php: should fix #1364 and
+  added relevant unit test cases for this bug (yeah for unit tests) 
+
+2009-11-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: fixed typo with handling web services request
+  parameters 
+
+  	* engine/lib/api.php: rest api parameters can now have default values 
+
+2009-11-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/entities/entity_listing.php,
+  views/default/entities/gallery_listing.php: Fixes: #1356. Reverted
+  search_listing to entity_listing for theme support.  
+
+2009-11-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, languages/en.php: added a nonce to hmac signature and
+  header so same call in same second does not get caught by replay check 
+
+2009-11-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/mb_wrapper.php: Accidentally removed the eval with my debug
+  statements.  
+
+  	* engine/lib/mb_wrapper.php: Wrapped all multibyte functions that are
+  directly interchangable with non mb functions with elgg_*().  
+
+2009-11-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: fixes #1286 - ElggPlugin get() wasn't handling "0"
+  and returning null instead 
+
+2009-11-12  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009102801.php: Data migration: Disabled execution
+  time and clearing out caches to avoid OOM errors.  
+
+2009-11-12  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river2.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2009091901.sql: fixes #1329 - schema for river is
+  fixed - was incomplete before 
+
+2009-11-11  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: fixes #1339 - elgg_view_exists now handles view
+  extensions for non-default viewtypes (for one level of recursion) 
+
+  	* engine/lib/elgglib.php: get_views deprecated for elgg_get_views (just to
+  be consistent with views api) 
+
+2009-11-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/page_elements/title.php, views/json/page_elements/title.php,
+  views/rss/page_elements/title.php: these viewtypes need an empty title view
+  or html shows up because they fallback on default view 
+
+2009-11-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/start.php: Removing explicit MySQL 5.1-specific 'IN NATURAL
+  LANGUAGE MODE' option.  
+
+2009-11-10  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009102801.php: Using php default functions instead of
+  ElggUser in upgrade script.  Large Elgg sites could not handle the "select *
+  from users" query without hitting memory limit.  
+
+2009-11-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php, engine/lib/usersettings.php,
+  mod/logbrowser/start.php, mod/search/start.php: elgg_extend_view() replaces
+  extend_view() 
+
+  	* engine/lib/elgglib.php: updated documentation of functions used in
+  creating the topbar tools dropdown menu 
+
+2009-11-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/start.php, mod/search/views/default/search/css.php: Sorting
+  search contexts by longest related substring. Added more pretty highlight
+  colors.  
+
+  	* mod/search/start.php: Fixed displaying of ...s in search.  
+
+  	* mod/search/index.php: I hate you search.  
+
+  	* mod/search/index.php: Missed an htmlspecialchars().  
+
+  	* mod/search/index.php, mod/search/start.php: Removed unneeded url_encode()s
+  for links.  
+
+  	* mod/search/start.php: Underscores. grr.  
+
+  	* mod/search/start.php: Adjusted default context length to 500. Added url
+  decoding to needle string.  
+
+  	* mod/search/search_hooks.php, mod/search/start.php: Trying out the new
+  context grabbing function in search.  
+
+2009-11-10  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/service_handler.php, engine/lib/api.php, htaccess_dist:
+  introducing a new web services handler 
+
+  	* engine/lib/notification.php: do not register notification rest api calls
+  by default since no other apis exposed not directly related to the api 
+
+  	* views/json/api/output.php: leaner json objects for web services api calls 
+
+2009-11-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/search_hooks.php: For real this time.  
+
+  	* mod/search/search_hooks.php: Sanitising string on tag search.  
+
+  	* mod/search/search_hooks.php, mod/search/start.php: Sanitising strings to
+  avoid sql insertion hacks.  
+
+  	* mod/search/index.php, mod/search/search_hooks.php, mod/search/start.php,
+  .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php: Updated search to allow
+  filtering of results by clicking on submenu items. Fixes #1358: Using raw
+  mysql_query() / fetch() to get ft_min/max vars since they aren't set on some
+  versions of MySQL.  
+
+  	* engine/lib/entities.php: Ignoring empty owner_guids in elgg_get_entities. 
+
+  	* engine/lib/elgglib.php: Removed old code from get_submenu().  
+
+  	* CODING.txt: Added deprecation procedures to coding standards.  
+
+2009-11-09  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: updated changes.txt 
+
+  	* engine/lib/api.php: REST api hmac signature encoding now compatible with
+  Amazon S3 and OAuth 
+
+2009-11-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/search/comments/listing.php: Fixed the wrapper for
+  comment listing.  
+
+  	* mod/search/start.php: Uncommenting out the bulk of the search functions.  
+
+  	* mod/search/search_hooks.php, mod/search/start.php,
+  .../views/default/search/comments/listing.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/tags/listing.php: Added super-basic support
+  for searching comments.  
+
+2009-11-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/lib/pam.php, engine/tests/services/api.php,
+  services/api/rest.php: combined the two different pams into one and fixed an
+  issue with hmac authentication 
+
+2009-11-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/search/search_hooks.php: Reverted groups and users to LIKE instead of
+  MATCH AGAINST.  
+
+  	* engine/lib/group.php, engine/lib/objects.php, engine/lib/tags.php,
+  engine/lib/users.php, mod/search/index.php, mod/search/search_hooks.php,
+  mod/search/start.php, .../views/default/page_elements/searchbox.php,
+  mod/search/views/default/search/listing.php: Moved default search hooks into
+  search mod. Using MySQL's MATCH ... AGAINST instead of likes for most
+  searches. Changed 'tag' to 'q' while maintaining backward compatibility.  
+
+2009-11-07  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: fixed bug in list_entities() wrapper function -
+  it was ignoring false values - there are probably similar problems in the
+  other new wrapper functions 
+
+  	* _graphics/icons/default/topbar.png: fixes #1324 - default topbar icon now
+  exists 
+
+  	* engine/lib/metastrings.php: fixes #1227 - this one has been causing nasty
+  problems for far too long 
+
+2009-11-06  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: removed space which would break the schema
+  parsing routine for the next poor sucker who tried to add a table - not the
+  most robust code 
+
+  	* services/api/rest.php: strike previous - we need the password auth to get
+  the user token - will just need to document that pam_auth_pass does not work
+  with REST because the user credentials are not set 
+
+  	* engine/lib/pam.php, services/api/rest.php: removing username/password
+  authorization for REST by default - developers can add their own custom PAM
+  using the plugin hook if they require this 
+
+2009-11-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Removed old group search hook.  
+
+  	* engine/lib/users.php: Removed old user search.  
+
+  	* engine/lib/group.php, engine/lib/tags.php, engine/lib/users.php: Added
+  search for group, tags, and users.  
+
+  	* engine/lib/entities.php: Added ability to pass 0 as a subtype meaning
+  "entities without a subtype".  
+
+  	* engine/lib/objects.php: Added default object search.  
+
+  	* engine/lib/metadata.php: Corrected documentation for
+  elgg_get_entities_from_metadata()  
+
+  	* actions/systemsettings/install.php: Enable search mod upon installation.  
+
+  	* mod/search/index.php, mod/search/start.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/startblurb.php,
+  mod/search/views/default/search/tags/listing.php: Updated search for FTS.  
+
+2009-11-04  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/sessions.php: users now allowed to have multiple
+  sessions but not multiple remember me cookies (yet) 
+
+2009-11-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/htmlawed/start.php: Updated htmlawed to allow the default TinyMCE
+  styles.  
+
+2009-11-03  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php, engine/lib/plugins.php, engine/lib/xml-rpc.php,
+  engine/lib/xml.php: standardized xml.php and fixed output of booleans in xml
+  view 
+
+2009-11-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes for deprecated functions.  
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/metadata.php: Deprecated elgg_get_entities_from_annotations().  
+
+  	* engine/lib/access.php: Changed elgg_get_entities_from_access_id() to be
+  closer to how other functions work.  
+
+  	* mod/htmlawed/start.php: Updated htmlawed to disallow many style
+  attributes.  
+
+2009-11-02  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/xml/pageshells/pageshell.php: setting xml version and encoding in
+  xml pageshell 
+
+2009-10-30  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, engine/lib/access.php, engine/tests/objects/users.php:
+  Deprecating get_entities_from_access_id().  
+
+2009-10-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: No longer using fullview for listing registered entities on
+  front page.  
+
+2009-10-30  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Removing deprecated function call from
+  find_plugin_settings().  
+
+2009-10-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/tests/objects/metadata.php: Namespaced
+  metadata keys for elgg_get_entities_from_metadata() so no clashes will happen
+  with annotations.  
+
+2009-10-30  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updating 1.7 CHANGES file.  
+
+2009-10-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes for the relationship functions.  
+
+2009-10-30  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Cleaning up logic regarding view error notices.  
+
+2009-10-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/lib/relationships.php: Deprecated
+  get_entities_from_relationships_and_meta().  
+
+2009-10-29  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, engine/tests/objects/filestore.php: Fully
+  deprecating file matrix use with username.  Plugins building the file matrix
+  with the username will still work, but a warning is logged.  
+
+  	* engine/tests/objects/metadata.php: Updating unit test to reflect
+  deprecated functions.  
+
+2009-10-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Fixed incorrect wrapper for
+  get_entities_from_relationship() -> elgg_get_entities_from_relationship().  
+
+2009-10-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Deprecated get_entities_from_relationship() 
+
+  	* engine/lib/metadata.php: Actually fixed the documentation for
+  elgg_get_entities_from_metadata().  
+
+  	* engine/lib/metadata.php: Cleaned up table prefix for
+  elgg_get_entity_metadata_where_sql(). Cleaned up some documentation.  
+
+  	* engine/lib/metadata.php: Updated documentation for
+  elgg_get_entity_metadata_where_sql()  
+
+  	* engine/schema/upgrades/2009100701.sql: Got rid of the silly conditional
+  comments in the db upgrade now that I know what they are.  
+
+  	* engine/schema/upgrades/2009100701.sql: Added table locking and disabling
+  keys for the UTF8 database upgrade.  
+
+2009-10-28  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009102801.php, version.php: Creating an upgrade
+  script for new user filepath.  
+
+2009-10-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: Deprecated
+  get_entities_from_metadata() and get_entities_from_metadata_multi().   
+
+2009-10-27  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/objects/filestore.php: Removing local debug info from
+  filestore unit test.  
+
+  	* engine/lib/filestore.php, engine/tests/elgg_unit_test.php,
+  engine/tests/objects/filestore.php, engine/tests/objects/users.php: Modifying
+  user file locations to be based on guid.  Previous implementations utilized
+  the owner's username to determine a file path matrix based on (up to) the
+  first five letters. To eliminate language and filesystem inconsistencies, the
+  matrix is now created from the entity's creation date and guid. This has the
+  added benefit of (potentially) allowing users to update their usernames.  
+
+2009-10-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes for bug #1161 and deprecated
+  get_entities_from_metadata()  
+
+  	* engine/tests/objects/metadata.php: Fixed caching issue that caused
+  metadata test for get_entities_from_metadata() to fail.  
+
+  	* engine/lib/entities.php: Removed some commented out code.  
+
+  	* engine/lib/metadata.php: Fixed get_entities_from_metadata() wrapper when
+  passing case_sensitive = FALSE.  
+
+  	* engine/lib/elgglib.php: Fixes #1161: Views now default to 'default' if not
+  found.  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/metadata.php:
+  Created elgg_get_entities_from_metadata() and made
+  get_entities_from_metadata(). Made elgg_get_entities() accept extra joins and
+  wheres in the options. Created a helper function
+  elgg_normalise_plural_options_array() to rewrite shortcut singular options to
+  plurals.  
+
+2009-10-26  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: Rewriting metastrings search query for
+  simplicity.  
+
+2009-10-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updated changes to show deprecated get_entities().  
+
+2009-10-25  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/tests/services/api.php, languages/en.php:
+  cleaned up the web services unit tests 
+
+2009-10-25  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Corrected bug when passing container_guids or
+  owner_guids of 0. Changed the name of the $prefix to $table in sql helper
+  functions. Improved documentation.  
+
+2009-10-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Created elgg_get_entities() and rewrote
+  get_entities() to pass to the new function. First go at removing
+  get_entities() calls in native functions.  
+
+  	* engine/lib/elgglib.php: Cleaned up some code in elgg_view().  
+
+  	* engine/lib/access.php: Slight code cleanup.  
+
+2009-10-23  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, engine/tests/objects/users.php: Creating a unit test
+  for ElggUser  
+
+2009-10-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/entities/entity_list.php,
+  views/default/entities/entity_listing.php: Standardized entity listing views.
+   
+
+  	* CODING.txt: Updated standards for method names.  
+
+2009-10-22  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Refs #1330: Contributed autop() to Wordpress.  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/search.php,
+  mod/search/index.php, mod/search/languages/en.php, mod/search/manifest.xml,
+  mod/search/start.php, .../views/default/page_elements/searchbox.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity_list.php,
+  mod/search/views/default/search/gallery.php,
+  .../views/default/search/gallery_listing.php,
+  mod/search/views/default/search/listing.php,
+  mod/search/views/default/search/startblurb.php, search/groups.php,
+  search/index.php, search/users.php, views/default/css.php,
+  views/default/entities/entity_list.php,
+  views/default/entities/entity_listing.php,
+  views/default/entities/gallery.php,
+  views/default/entities/gallery_listing.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/search/entity_list.php, views/default/search/gallery.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php,
+  views/default/search/startblurb.php: Pulling in MITRE's search core. 
+  Fo'rizzle this time.  Yo.  
+
+2009-10-22  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt: Updating core changes file  
+
+  	* mod/diagnostics/index.php, mod/diagnostics/languages/en.php: Adding unit
+  testing to the GUI.  Unit tests can be run from the core Diagnostics mod.  
+
+2009-10-22  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/tests/services/api.php, languages/en.php: more
+  unit tests for REST api 
+
+2009-10-21  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/tests/objects/metadata.php: Allowing entities to be retrieved by
+  case-insensitive search.  Adding a new unit test for ElggMetadata.  
+
+  	* engine/lib/elgglib.php, engine/tests/suite.php: Reducing the output level
+  of log messages set to "DEBUG".  Debug level messages will be logged at the
+  same level as warnings.  Additionally, users will be notified when attempting
+  to run the test suite without first placing the site in debug mode.  
+
+2009-10-20  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/tests/services/api.php, languages/en.php: more
+  unit tests for REST api 
+
+  	* CHANGES.txt: updated CHANGES.txt with services API changes 
+
+2009-10-19  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Replacing a direct call to error_log() with new
+  elgg_log().  
+
+  	* CHANGES.txt, actions/admin/site/update_basic.php,
+  actions/systemsettings/install.php, engine/lib/elgglib.php, languages/en.php,
+  views/default/settings/system.php, views/failsafe/settings/system.php: Adding
+  debug options to admin site settings.  Debugging errors and warnings to
+  screen. If notice level is enabled, output is sent to system log file.  
+
+2009-10-19  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/tests/services/api.php, languages/en.php,
+  services/api/rest.php: first version of new REST api 
+
+2009-10-17  cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pam.php: updated documentation on PAMs as I will be fixing some
+  API PAM issues 
+
+2009-10-16  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/group.php, engine/lib/languages.php,
+  engine/lib/memcache.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php, engine/start.php, engine/tests/suite.php,
+  views/default/messages/exceptions/exception.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/xml/messages/exceptions/exception.php: Rewriting core debug messages to
+  be more informative.  Introducing the concept of levels for Elgg debugging:
+  notices, warnings and errors are displayed when the appropriate debugging
+  level is enabled. An additional level of "debug" exists to differentiate from
+  errors.  
+
+2009-10-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/canvas/default.php,
+  views/foaf/page_elements/contentwrapper.php,
+  views/foaf/pageshells/pageshell.php, views/foaf/search/entity_list.php,
+  views/foaf/user/default.php, views/ical/canvas/default.php,
+  views/ical/export/entity.php, views/ical/object/default.php,
+  views/ical/pageshells/pageshell.php, views/ical/search/entity_list.php,
+  views/js/object/default.php, views/js/pageshells/pageshell.php,
+  views/js/user/default.php, views/json/api/output.php,
+  views/json/canvas/default.php, views/json/export/entity.php,
+  views/json/export/metadata.php, views/json/export/relationship.php,
+  views/json/group/default.php, views/json/messages/exceptions/exception.php,
+  views/json/object/default.php, views/json/page_elements/contentwrapper.php,
+  views/json/pageshells/pageshell.php, views/json/river/item/list.php,
+  views/json/search/entity_list.php, views/json/site/default.php,
+  views/json/user/default.php, views/opendd/canvas/default.php,
+  views/opendd/export/entity.php, views/opendd/export/metadata.php,
+  views/opendd/export/relationship.php, views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/search/entity_list.php, views/opendd/site/default.php,
+  views/opendd/user/default.php, views/php/api/output.php,
+  views/php/canvas/default.php, views/php/export/entity.php,
+  views/php/export/metadata.php, views/php/export/relationship.php,
+  views/php/group/default.php, views/php/messages/exceptions/exception.php,
+  views/php/object/default.php, views/php/pageshells/pageshell.php,
+  views/php/search/entity_list.php, views/php/site/default.php,
+  views/php/user/default.php, views/rss/annotation/default.php,
+  views/rss/canvas/default.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/page_elements/contentwrapper.php,
+  views/rss/pageshells/pageshell.php, views/rss/river/item/list.php,
+  views/rss/search/entity_list.php, views/rss/user/default.php,
+  views/xml/api/output.php, views/xml/messages/exceptions/exception.php,
+  views/xml/pageshells/pageshell.php, views/xml/xml-rpc/output.php: Finished
+  standardizing seconday views.  
+
+  	* views/failsafe/canvas/default.php, views/failsafe/input/access.php,
+  views/failsafe/input/button.php, views/failsafe/input/checkboxes.php,
+  views/failsafe/input/form.php, views/failsafe/input/hidden.php,
+  views/failsafe/input/longtext.php, views/failsafe/input/pulldown.php,
+  views/failsafe/input/reset.php, views/failsafe/input/submit.php,
+  views/failsafe/input/text.php, views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/list.php, views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php, views/failsafe/settings/install.php,
+  views/failsafe/settings/system.php: Standardized views/failsafe/*  
+
+  	* views/default/css.php, views/default/settings/install.php,
+  views/default/settings/system.php, views/default/settings/upgrading.php,
+  views/default/site/default.php, views/default/spotlight/default.php,
+  views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php,
+  views/default/upload/upload_form_content.php, views/default/user/default.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php, views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/usersettings/user.php, views/default/welcome.php,
+  views/default/welcome/logged_in.php, views/default/welcome/logged_out.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php:
+  Finish up standardizing views/default/*  
+
+  	* views/default/page_elements/contentwrapper.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_contents.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/spotlight.php,
+  views/default/page_elements/title.php,
+  views/default/pageshells/pageshell.php, views/default/river/dashboard.php,
+  views/default/river/item/list.php, views/default/river/item/noaccess.php,
+  views/default/river/item/wrapper.php,
+  views/default/river/relationship/friend/create.php,
+  views/default/river/wrapper.php, views/default/search/entity_list.php,
+  views/default/search/gallery.php, views/default/search/gallery_listing.php,
+  views/default/search/listing.php, views/default/search/startblurb.php: More
+  views cleanup.  
+
+  	* views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php,
+  views/default/graphics/icon.php, views/default/group/default.php,
+  views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php, views/default/input/access.php,
+  views/default/input/autocomplete.php, views/default/input/button.php,
+  views/default/input/calendar.php, views/default/input/captcha.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/form.php,
+  views/default/input/hidden.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/reset.php, views/default/input/securitytoken.php,
+  views/default/input/submit.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/input/urlshortener.php, views/default/input/userpicker.php,
+  views/default/js/initialise_elgg.php,
+  views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/navigation/viewtype.php,
+  .../notifications/settings/usersettings.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/object/plugin.php, views/default/object/widget.php,
+  views/default/output/calendar.php, views/default/output/checkboxes.php,
+  views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/email.php, views/default/output/iframe.php,
+  views/default/output/longtext.php, views/default/output/pulldown.php,
+  views/default/output/radio.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php: Standardizing views.`  
+
+  	* views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php, views/default/ajax/loader.php,
+  views/default/annotation/annotate.php,
+  views/default/annotation/generic_comment.php, views/default/api/output.php,
+  views/default/basic_elements/welcome.php, views/default/canvas/default.php,
+  views/default/canvas/layouts/edit_layout.php,
+  views/default/canvas/layouts/one_column.php,
+  views/default/canvas/layouts/sidebar_boxes.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  .../canvas/layouts/two_column_right_sidebar.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/canvas_header/submenu_group.php,
+  views/default/canvas_header/submenu_template.php,
+  views/default/comments/forms/edit.php, views/default/dashboard/blurb.php,
+  views/default/export/entity.php, views/default/export/metadata.php,
+  views/default/export/relationship.php, views/default/friends/collection.php,
+  views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/list.php,
+  views/default/friends/picker.php, views/default/friends/river/create.php:
+  Standardized more files.  
+
+  	* engine/tests/objects/objects.php, engine/tests/suite.php,
+  friends/index.php, friends/of.php, friends/pickercallback.php, index.php,
+  install.php, languages/en.php, search/groups.php, search/index.php,
+  search/users.php, services/api/rest.php, services/export/handler.php,
+  settings/index.php, settings/plugins.php, settings/statistics.php,
+  settings/user.php, simplecache/view.php, upgrade.php, version.php:
+  Standardized files  
+
+2009-10-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/admin.php: Merged admin access override
+  hook with ignore access system override hook. get_sql_access_prefix() now
+  correctly uses elgg_check_access_overrides() instead of
+  elgg_get_ignore_access().  
+
+  	* friends/add.php, friends/collections.php, friends/edit.php: Standardized
+  files.  
+
+  	* entities/index.php, entities/list.php: Standardized files.  
+
+  	* engine/lib/widgets.php, engine/settings.example.php, engine/start.php:
+  Standardized files.  
+
+  	* engine/lib/calendar.php, engine/lib/configuration.php,
+  engine/lib/cron.php, engine/lib/exceptions.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/filestore.php, engine/lib/group.php,
+  engine/lib/input.php, engine/lib/install.php, engine/lib/languages.php,
+  engine/lib/location.php, engine/lib/mb_wrapper.php, engine/lib/memcache.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/opendd.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/ping.php, engine/lib/plugins.php, engine/lib/query.php,
+  engine/lib/relationships.php, engine/lib/river2.php, engine/lib/search.php,
+  engine/lib/sites.php, engine/lib/social.php, engine/lib/statistics.php,
+  engine/lib/system_log.php, engine/lib/tags.php, engine/lib/users.php,
+  engine/lib/usersettings.php, engine/lib/version.php, engine/lib/widgets.php:
+  Standardized gobs of files.  
+
+2009-10-14  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Standardized engine/lib/cache.php  
+
+  	* engine/lib/api.php: Standardized engine/lib/api.php  
+
+  	* engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/pagehandler.php, engine/handlers/xml-rpc_handler.php:
+  Standardized engine/handlers/*  
+
+  	* dashboard/index.php, dashboard/latest.php: Standardized dashboard/*  
+
+  	* admin/index.php, admin/plugins.php, admin/site.php, admin/statistics.php,
+  admin/user.php: Standardized admin/*  
+
+  	* actions/email/save.php, actions/entities/delete.php,
+  actions/friends/add.php, actions/friends/addcollection.php,
+  actions/friends/deletecollection.php, actions/friends/editcollection.php,
+  actions/friends/remove.php, actions/import/opendd.php, actions/login.php,
+  actions/logout.php, .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/systemsettings/install.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  actions/user/spotlight.php, actions/useradd.php,
+  actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php: Standardized actions/*
+   
+
+  	* actions/comments/add.php, actions/comments/delete.php: Standardized.  
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, actions/admin/site/update_basic.php,
+  actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  actions/admin/user/resetpassword.php, actions/admin/user/unban.php:
+  Standardized actions/admin/*  
+
+  	* account/forgotten_password.php, account/register.php: Standardized
+  account/*  
+
+  	* _css/css.php, _css/js.php: Standardized _css/*  
+
+  	* CHANGES.txt: Updated changes file for $is_admin deprecation.  
+
+2009-10-13  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/objects/entities.php, engine/tests/objects/objects.php,
+  engine/tests/test_skeleton.php: Swallowing all Elgg notices within unit
+  tests.  By default, SimpleTest converts PHP errors into exceptions. This is
+  restricted by adding a call to swallowErrors() within the tearDown() methods.
+  This has also been noted within the unit test skeleton.  
+
+  	* engine/lib/sites.php, engine/tests/objects/sites.php: Creating a generic
+  ElggSite unit test.  
+
+2009-10-13  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/admin.php, engine/lib/entities.php,
+  engine/lib/users.php: Standardized users and entities. Fleshed out
+  elgg_set_ignore_access() and elgg_get_ignore_access()  
+
+  	* engine/lib/elgglib.php: Standardize elgglib.php  
+
+  	* engine/tests/suite.php: Test suite now requires admin for web-based tests.
+  Uses access overrides for cli-based tests.  
+
+  	* engine/lib/entities.php: Standardized entities.php.  
+
+  	* engine/lib/access.php: Fix typo in ElggAccess:get_ignore_access().  
+
+  	* engine/lib/access.php, engine/lib/admin.php, engine/lib/sessions.php:
+  First pass at removing $is_admin global.  
+
+2009-10-12  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/objects/entities.php, engine/tests/objects/objects.php,
+  engine/tests/suite.php: Adding unit tests for the ElggObject class. 
+  Restricting testing suite to only be run as a logged-in user. This will not
+  allow the tests to be run from the command line, but this is already the case
+  due to debug static.  
+
+2009-10-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CHANGES.txt, CODING.txt: Added coding styles and changes documents.  
+
+2009-10-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Standardized annotations.php.  
+
+  	* engine/lib/admin.php: Standardized admin.php  
+
+  	* engine/lib/activity.php: Standardized activity.  
+
+  	* engine/lib/actions.php: Standardized actions.php  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/search.php,
+  engine/schema/upgrades/2009093001.sql, mod/search/index.php,
+  mod/search/languages/en.php, mod/search/manifest.xml, mod/search/start.php,
+  .../views/default/page_elements/searchbox.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity_list.php,
+  mod/search/views/default/search/gallery.php,
+  mod/search/views/default/search/listing.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/search/entity_list.php, views/default/search/gallery.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php,
+  views/default/search/startblurb.php: Reverted back to previous copy removing
+  Justin's search because of views problems in plugins.  
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/search.php,
+  engine/schema/upgrades/2009093001.sql, mod/search/index.php,
+  mod/search/languages/en.php, mod/search/manifest.xml, mod/search/start.php,
+  .../views/default/page_elements/searchbox.php,
+  mod/search/views/default/search/css.php,
+  mod/search/views/default/search/entity_list.php,
+  mod/search/views/default/search/gallery.php,
+  mod/search/views/default/search/listing.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/search/entity_list.php, views/default/search/gallery.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php,
+  views/default/search/startblurb.php: Pulled in Justin's search changes from
+  github.  
+
+2009-10-09  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/objects.php,
+  engine/tests/objects/entities.php, engine/tests/objects/objects.php,
+  engine/tests/test_skeleton.php: Creating an ElggObject unit test.  Fixing
+  issues with the unit test plugin hooks, as well as infinite looping bugs
+  introduced by the unit test skeleton.  
+
+2009-10-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/objects/entities.php: Adding unit test for ElggEntity
+  annotations.  
+
+2009-10-08  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/sessions.php: Brought access.php and
+  sesssion.php up to code standards.  
+
+2009-10-08  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/tests/core/entities.php,
+  engine/tests/objects/entities.php: Adding generic unit tests for ElggEntity. 
+
+2009-10-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: database.php now more closely matches coding
+  standards.  
+
+  	* engine/lib/database.php, engine/schema/upgrades/2009100701.sql: Fixes
+  #1181: UTF8 now correctly stored in database.  
+
+  	* engine/lib/entities.php, engine/lib/notification.php,
+  engine/lib/users.php, engine/lib/version.php: Fixes #790: Removing unneeded
+  @s.  
+
+2009-10-06  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/tests/core/entities.php,
+  engine/tests/elgg_unit_test.php, engine/tests/test_skeleton.php: Adding unit
+  test methods to the new Entities test.  
+
+2009-10-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/diagnostics/start.php: Removed elgg_test entries.  
+
+2009-10-06  nickw <nickw@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fixing a spacing issue with constructed SQL
+  query.  Closes #1295.  
+
+2009-10-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/testing.php: Removing old testing.php lib.  
+
+2009-10-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/core/entities.php, engine/tests/entities.php,
+  engine/tests/suite.php, engine/tests/test_skeleton.php: Moved core tests into
+  tests/core. Fixed typo in skeleton and entities tests. Only run tests in
+  debug mode.   
+
+2009-10-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/tests/entities.php, engine/tests/test_skeleton.php: Added more info
+  to the test. Added a test skeleton.  
+
+  	* engine/lib/entities.php: Added unit tests for entities.  
+
+  	* engine/tests/entities.php, engine/tests/suite.php: Added unit tests.  
+
+  	* engine/tests/elgg_unit_test.php, engine/tests/suite.php,
+  vendors/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE,
+  vendors/simpletest/LICENSE, vendors/simpletest/README,
+  vendors/simpletest/VERSION, vendors/simpletest/authentication.php,
+  vendors/simpletest/autorun.php, vendors/simpletest/browser.php,
+  vendors/simpletest/collector.php, vendors/simpletest/compatibility.php,
+  vendors/simpletest/cookies.php, vendors/simpletest/default_reporter.php,
+  vendors/simpletest/detached.php,
+  .../docs/en/authentication_documentation.html,
+  .../simpletest/docs/en/browser_documentation.html,
+  vendors/simpletest/docs/en/docs.css,
+  .../docs/en/expectation_documentation.html,
+  .../docs/en/form_testing_documentation.html,
+  .../docs/en/group_test_documentation.html,
+  vendors/simpletest/docs/en/index.html,
+  .../docs/en/mock_objects_documentation.html,
+  vendors/simpletest/docs/en/overview.html,
+  .../docs/en/partial_mocks_documentation.html,
+  .../simpletest/docs/en/reporter_documentation.html,
+  .../docs/en/unit_test_documentation.html,
+  .../docs/en/web_tester_documentation.html,
+  .../docs/fr/authentication_documentation.html,
+  .../simpletest/docs/fr/browser_documentation.html,
+  vendors/simpletest/docs/fr/docs.css,
+  .../docs/fr/expectation_documentation.html,
+  .../docs/fr/form_testing_documentation.html,
+  .../docs/fr/group_test_documentation.html,
+  vendors/simpletest/docs/fr/index.html,
+  .../docs/fr/mock_objects_documentation.html,
+  vendors/simpletest/docs/fr/overview.html,
+  .../docs/fr/partial_mocks_documentation.html,
+  .../simpletest/docs/fr/reporter_documentation.html,
+  .../docs/fr/unit_test_documentation.html,
+  .../docs/fr/web_tester_documentation.html, vendors/simpletest/dumper.php,
+  vendors/simpletest/eclipse.php, vendors/simpletest/encoding.php,
+  vendors/simpletest/errors.php, vendors/simpletest/exceptions.php,
+  vendors/simpletest/expectation.php,
+  vendors/simpletest/extensions/pear_test_case.php,
+  .../simpletest/extensions/phpunit_test_case.php,
+  vendors/simpletest/extensions/testdox.php,
+  vendors/simpletest/extensions/testdox/test.php, vendors/simpletest/form.php,
+  vendors/simpletest/frames.php, vendors/simpletest/http.php,
+  vendors/simpletest/invoker.php, vendors/simpletest/mock_objects.php,
+  vendors/simpletest/page.php, vendors/simpletest/parser.php,
+  vendors/simpletest/reflection_php4.php,
+  vendors/simpletest/reflection_php5.php, vendors/simpletest/remote.php,
+  vendors/simpletest/reporter.php, vendors/simpletest/scorer.php,
+  vendors/simpletest/selector.php, vendors/simpletest/shell_tester.php,
+  vendors/simpletest/simpletest.php, vendors/simpletest/socket.php,
+  vendors/simpletest/tag.php, vendors/simpletest/test/acceptance_test.php,
+  vendors/simpletest/test/adapter_test.php,
+  vendors/simpletest/test/all_tests.php,
+  vendors/simpletest/test/authentication_test.php,
+  vendors/simpletest/test/autorun_test.php,
+  vendors/simpletest/test/bad_test_suite.php,
+  vendors/simpletest/test/browser_test.php,
+  vendors/simpletest/test/collector_test.php,
+  vendors/simpletest/test/command_line_test.php,
+  vendors/simpletest/test/compatibility_test.php,
+  vendors/simpletest/test/cookies_test.php,
+  vendors/simpletest/test/detached_test.php,
+  vendors/simpletest/test/dumper_test.php,
+  vendors/simpletest/test/eclipse_test.php,
+  vendors/simpletest/test/encoding_test.php,
+  vendors/simpletest/test/errors_test.php,
+  vendors/simpletest/test/exceptions_test.php,
+  vendors/simpletest/test/expectation_test.php,
+  vendors/simpletest/test/form_test.php,
+  vendors/simpletest/test/frames_test.php,
+  vendors/simpletest/test/http_test.php,
+  vendors/simpletest/test/interfaces_test.php,
+  vendors/simpletest/test/live_test.php,
+  vendors/simpletest/test/mock_objects_test.php,
+  vendors/simpletest/test/page_test.php,
+  vendors/simpletest/test/parse_error_test.php,
+  vendors/simpletest/test/parser_test.php,
+  vendors/simpletest/test/reflection_php4_test.php,
+  vendors/simpletest/test/reflection_php5_test.php,
+  vendors/simpletest/test/remote_test.php,
+  vendors/simpletest/test/shell_test.php,
+  vendors/simpletest/test/shell_tester_test.php,
+  vendors/simpletest/test/simpletest_test.php,
+  vendors/simpletest/test/socket_test.php,
+  .../simpletest/test/support/empty_test_file.php,
+  vendors/simpletest/test/support/latin1_sample,
+  vendors/simpletest/test/support/spl_examples.php,
+  .../test/support/supplementary_upload_sample.txt,
+  vendors/simpletest/test/support/test1.php,
+  vendors/simpletest/test/support/upload_sample.txt,
+  vendors/simpletest/test/tag_test.php,
+  vendors/simpletest/test/test_with_parse_error.php,
+  vendors/simpletest/test/unit_tester_test.php,
+  vendors/simpletest/test/unit_tests.php, vendors/simpletest/test/url_test.php,
+  vendors/simpletest/test/user_agent_test.php,
+  vendors/simpletest/test/visual_test.php,
+  vendors/simpletest/test/web_tester_test.php,
+  vendors/simpletest/test/xml_test.php, vendors/simpletest/test_case.php,
+  vendors/simpletest/unit_tester.php, vendors/simpletest/url.php,
+  vendors/simpletest/user_agent.php, vendors/simpletest/web_tester.php,
+  vendors/simpletest/xml.php: Added simpletest and start of unit tests.  
+
+2009-09-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php: Added autofocusing of the username
+  field on the login page.  
+
+2009-09-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: new activity river - clipped overflow for long
+  urls/strings 
+
+2009-09-23  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: Upped minChars to 2 for user picker.  
+
+  	* views/default/input/userpicker.php: Disabled matchContains in user picker.
+   
+
+  	* engine/lib/input.php: Updated the user picker to avoid possible mysql
+  injection attacks and to search only by leading chars.  
+
+2009-09-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: collections picker - delete link given
+  classname and brackets removed from string 
+
+2009-09-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/embed/addcontentjs.php, views/default/embed/js.php: Removing
+  embed view in favor of the correct views in the plugin.  
+
+2009-09-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/comments/add.php, engine/lib/annotations.php,
+  engine/lib/river2.php, engine/schema/upgrades/2009091901.sql, version.php,
+  views/default/annotation/annotate.php: New river code added to allow user
+  comment to be pulled out and displayed 
+
+2009-09-17  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: Updated user picker to return 25
+  results, text input to be 30 wide.  
+
+2009-09-16  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Changed get_entities_from_access_collection() to
+  get_entities_from_access_id() to be more generic.  
+
+  	* engine/lib/extender.php: Fixes #1238: Added ElggExtender::getOwnerEntity()
+  and changed ElggExtender::getOwner() to return just the GUID. Also, this
+  fixes a bug with checking permissions on annotations.  
+
+2009-09-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/index.php, friends/of.php: Fixes #1251: Correct strings applied.  
+
+2009-09-10  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/sessions.php: Updated fixes for checking
+  for admin in get_access_sql_prefix()  
+
+  	* engine/lib/access.php: Checking against admin metadata instead of
+  $is_admin global in get_access_sql_suffix().  
+
+  	* engine/lib/access.php: Fixing a bug with when getting the sql suffix for
+  the non-loggedin user.  
+
+2009-09-09  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Added "Only Friends" string for user picker.  
+
+  	* views/default/input/userpicker.php: Defaulted userpicker to all users.
+  Checkbox makes it only friends.  
+
+2009-09-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: updating the version number in the readme 
+
+2009-09-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/userpicker.php: Better jquery deleting of user entity
+  for user picker.  
+
+  	* languages/en.php, views/default/input/userpicker.php: Pulled out language
+  string to language file.  
+
+  	* views/default/css.php, views/default/input/userpicker.php: Added bolding
+  to term searc in user picker.  
+
+  	* engine/lib/input.php, views/default/css.php: Updated livesearch page
+  handler to use classes instead of hard coded css.  
+
+  	* views/default/css.php, views/default/input/userpicker.php: Added rough
+  version of a new user picker.  
+
+  	* admin/user.php, views/default/search/entity_list.php: Fixes #1207: Using
+  fullviews with proper list_entity params.  
+
+2009-09-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt, version.php: Bumped version number.  
+
+  	* views/default/site/default.php: Fixed a potential security issue
+  concerning site views.  
+
+2009-09-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Added strip_tags() to setting titles in
+  ElggEntity  
+
+2009-09-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Patch submitted for ticket #886 rolled back
+  as it was causing #1205 -> #886 will need further investigating 
+
+  	* views/default/css.php, views/default/river/item/wrapper.php: activity
+  display toggle so site admins can choose avatars or the small icons 
+
+2009-09-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/input.php: Adding additional hooks to
+  add/remove/update users for access_collections() Added autocomplete endpoint
+  in input_init()  
+
+  	* views/default/input/autocomplete.php: Cleaning up autocomplete view.  
+
+  	* vendors/jquery/jquery.autocomplete.min.js,
+  views/default/input/autocomplete.php: Added autocomplete view to core.  
+
+2009-09-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: missing comma added 
+
+  	* views/default/search/entity_list.php: fullview hashed out for now as it
+  caused unexpected behaviour on admin user list view, needs more investigating
+
+2009-09-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: order by bug fixed in
+  get_entities_from_relationship 
+
+2009-09-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: a simple function which returns a string version of
+  an entity's access level 
+
+2009-08-31  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt, INSTALL.txt, README.txt, _css/css.php, _css/js.php,
+  account/register.php, actions/admin/plugins/disable.php,
+  actions/admin/plugins/disableall.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/reorder.php, actions/admin/site/update_basic.php,
+  actions/admin/user/ban.php, actions/comments/add.php,
+  actions/comments/delete.php, actions/email/save.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/editcollection.php, actions/friends/remove.php,
+  actions/login.php, actions/logout.php, actions/register.php,
+  actions/systemsettings/install.php, actions/user/default_access.php,
+  actions/user/requestnewpassword.php, actions/user/spotlight.php,
+  actions/useradd.php, actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php, admin/index.php,
+  admin/plugins.php, admin/site.php, admin/user.php, dashboard/index.php,
+  dashboard/latest.php, engine/handlers/action_handler.php,
+  engine/handlers/cron_handler.php, engine/handlers/pagehandler.php,
+  engine/handlers/xml-rpc_handler.php, engine/lib/access.php,
+  engine/lib/activity.php, engine/lib/admin.php, engine/lib/api.php,
+  engine/lib/configuration.php, engine/lib/database.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/extender.php,
+  engine/lib/input.php, engine/lib/install.php, engine/lib/languages.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/plugins.php, engine/lib/query.php, engine/lib/relationships.php,
+  engine/lib/river2.php, engine/lib/sessions.php, engine/lib/sites.php,
+  engine/lib/social.php, engine/lib/statistics.php, engine/lib/tags.php,
+  engine/lib/upgrades/2008101303.php, engine/lib/users.php,
+  engine/lib/version.php, engine/lib/widgets.php, engine/settings.example.php,
+  engine/start.php, entities/index.php, entities/list.php, friends/add.php,
+  friends/collections.php, friends/edit.php, friends/index.php, friends/of.php,
+  friends/pickercallback.php, index.php, install.php, languages/en.php,
+  mod/garbagecollector/languages/en.php, mod/logbrowser/index.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  .../views/default/logbrowser/adminlinks.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/object/logwrapper.php,
+  mod/uservalidationbyemail/start.php, settings/index.php,
+  simplecache/view.php, upgrade.php, vendors/calendarpopup/CalendarPopup.js,
+  vendors/jquery/jquery.form.js, version.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php, views/default/admin/main.php,
+  views/default/admin/plugins_opt/plugin.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php,
+  views/default/admin/user_opt/search.php, views/default/ajax/loader.php,
+  views/default/annotation/annotate.php,
+  views/default/annotation/generic_comment.php,
+  views/default/basic_elements/welcome.php, views/default/canvas/default.php,
+  views/default/canvas/layouts/edit_layout.php,
+  views/default/canvas/layouts/sidebar_boxes.php,
+  views/default/canvas_header/submenu_group.php,
+  views/default/canvas_header/submenu_template.php,
+  views/default/comments/forms/edit.php, views/default/dashboard/blurb.php,
+  views/default/embed/addcontentjs.php, views/default/embed/js.php,
+  views/default/friends/collection.php, views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/list.php,
+  views/default/friends/picker.php, views/default/friends/river/create.php,
+  views/default/friends/tablelistcountupdate.php,
+  views/default/input/access.php, views/default/input/calendar.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php, views/default/js/friendsPickerv1.php,
+  views/default/js/initialise_elgg.php, views/default/js/upload_js.php,
+  views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/viewtype.php,
+  .../notifications/settings/usersettings.php, views/default/object/widget.php,
+  views/default/output/calendar.php, views/default/output/checkboxes.php,
+  views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/email.php, views/default/output/longtext.php,
+  views/default/output/pulldown.php, views/default/output/radio.php,
+  views/default/output/tagcloud.php, views/default/output/tags.php,
+  views/default/output/text.php, views/default/output/url.php,
+  views/default/page_elements/contentwrapper.php,
+  views/default/page_elements/header_contents.php,
+  views/default/page_elements/owner_block.php,
+  views/default/river/item/list.php, views/default/river/item/noaccess.php,
+  views/default/river/item/wrapper.php, views/default/river/wrapper.php,
+  views/default/settings/install.php, views/default/settings/system.php,
+  views/default/settings/upgrading.php, views/default/spotlight/default.php,
+  views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php,
+  views/default/upload/upload_form_content.php, views/default/user/default.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php, views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  .../usersettings/statistics_opt/numentities.php, views/default/welcome.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php,
+  views/failsafe/canvas/default.php, views/failsafe/input/access.php,
+  views/failsafe/input/checkboxes.php, views/failsafe/input/longtext.php,
+  views/failsafe/input/pulldown.php, views/failsafe/input/text.php,
+  views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php, views/failsafe/messages/list.php,
+  views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/settings/install.php, views/failsafe/settings/system.php,
+  views/foaf/canvas/default.php, views/foaf/page_elements/contentwrapper.php,
+  views/foaf/pageshells/pageshell.php, views/foaf/user/default.php,
+  views/js/object/default.php, views/js/pageshells/pageshell.php,
+  views/js/user/default.php, views/json/api/output.php,
+  views/json/canvas/default.php, views/json/export/entity.php,
+  views/json/export/metadata.php, views/json/export/relationship.php,
+  views/json/messages/exceptions/exception.php,
+  views/json/page_elements/contentwrapper.php,
+  views/json/pageshells/pageshell.php, views/json/river/item/list.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/rss/annotation/default.php, views/rss/canvas/default.php,
+  views/rss/group/default.php, views/rss/object/default.php,
+  views/rss/page_elements/contentwrapper.php, views/rss/river/item/list.php,
+  views/rss/user/default.php, views/xml/messages/exceptions/exception.php: All
+  line endings are now Unix-style.  
+
+2009-08-28  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/register.php, engine/lib/entities.php: Fixes #1196:
+  ElggEntity::disable() now accepts a 2nd arg for recursive.  New users are not
+  recursively disabled for plugins that need to create entities owned by the
+  new user upon entity creation.  
+
+2009-08-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/search.php: Fixes #1191: set_input() was never being called for
+  tag in search_page_handler().  
+
+2009-08-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/annotation/annotate.php: a missing pipe added 
+
+  	* views/default/annotation/annotate.php: a snippet of a new comment on an
+  object will now appear in the activity river 
+
+2009-08-26  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Added entity_owner_guid to get_annotations()  
+
+2009-08-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: a simple solution to a css/js
+  loading bug. We need to come up with something better, long term. 
+
+2009-08-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: new style added for page update action appearing in
+  the river 
+
+2009-08-21  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Fixes #1180: Group join event triggered after
+  joining group. This trigger's return was never being tested so no overriding
+  could be done.  If we decide to test the trigger to stop group joining,
+  groups_write_acl_plugin_hook() will need to be changed...  
+
+2009-08-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/river/create.php: new friending river view applied 
+
+2009-08-20  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump to 1.6.  
+
+  	* _css/css.php, _css/js.php, account/forgotten_password.php,
+  account/register.php, actions/admin/plugins/disable.php,
+  actions/admin/plugins/disableall.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/enableall.php, actions/admin/plugins/reorder.php,
+  actions/admin/site/update_basic.php, actions/admin/user/ban.php,
+  actions/admin/user/delete.php, actions/admin/user/makeadmin.php,
+  actions/admin/user/removeadmin.php, actions/admin/user/resetpassword.php,
+  actions/admin/user/unban.php, actions/comments/add.php,
+  actions/comments/delete.php, actions/email/save.php,
+  actions/entities/delete.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/editcollection.php, actions/friends/remove.php,
+  actions/import/opendd.php, actions/login.php, actions/logout.php,
+  .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/systemsettings/install.php,
+  actions/user/default_access.php, actions/user/language.php,
+  actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php, admin/index.php,
+  admin/plugins.php, admin/site.php, admin/statistics.php, admin/user.php,
+  dashboard/index.php, dashboard/latest.php,
+  engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/pagehandler.php, engine/handlers/xml-rpc_handler.php,
+  engine/lib/access.php, engine/lib/actions.php, engine/lib/activity.php,
+  engine/lib/admin.php, engine/lib/annotations.php, engine/lib/api.php,
+  engine/lib/cache.php, engine/lib/calendar.php, engine/lib/configuration.php,
+  engine/lib/cron.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/exceptions.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/filestore.php, engine/lib/group.php,
+  engine/lib/input.php, engine/lib/install.php, engine/lib/languages.php,
+  engine/lib/location.php, engine/lib/mb_wrapper.php, engine/lib/memcache.php,
+  engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/opendd.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/ping.php, engine/lib/plugins.php, engine/lib/query.php,
+  engine/lib/relationships.php, engine/lib/river2.php, engine/lib/search.php,
+  engine/lib/sessions.php, engine/lib/sites.php, engine/lib/social.php,
+  engine/lib/statistics.php, engine/lib/system_log.php, engine/lib/tags.php,
+  engine/lib/testing.php, engine/lib/users.php, engine/lib/usersettings.php,
+  engine/lib/version.php, engine/lib/widgets.php, engine/lib/xml-rpc.php,
+  engine/lib/xml.php, engine/schema/mysql.sql, engine/start.php,
+  entities/index.php, entities/list.php, friends/add.php,
+  friends/collections.php, friends/edit.php, friends/index.php, friends/of.php,
+  friends/pickercallback.php, index.php, install.php,
+  mod/crontrigger/start.php, mod/diagnostics/actions/download.php,
+  mod/diagnostics/index.php, mod/diagnostics/languages/en.php,
+  mod/diagnostics/start.php, mod/diagnostics/testreport.php,
+  mod/diagnostics/unittester.php,
+  .../views/default/diagnostics/forms/download.php,
+  .../views/default/diagnostics/runalltests.php,
+  mod/diagnostics/views/default/diagnostics/test.php,
+  .../views/default/diagnostics/testresult.php,
+  mod/garbagecollector/languages/en.php, mod/garbagecollector/start.php,
+  mod/htmlawed/start.php, mod/logbrowser/index.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/object/logwrapper.php,
+  mod/logrotate/languages/en.php, mod/logrotate/start.php,
+  .../actions/email/confirm.php, mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/start.php, search/groups.php, search/index.php,
+  search/users.php, services/api/rest.php, services/export/handler.php,
+  settings/index.php, settings/plugins.php, settings/statistics.php,
+  settings/user.php, simplecache/view.php, upgrade.php, version.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php, views/default/ajax/loader.php,
+  views/default/annotation/generic_comment.php, views/default/api/output.php,
+  views/default/basic_elements/welcome.php, views/default/canvas/default.php,
+  views/default/canvas/layouts/edit_layout.php,
+  views/default/canvas/layouts/one_column.php,
+  views/default/canvas/layouts/sidebar_boxes.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  .../canvas/layouts/two_column_right_sidebar.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/comments/forms/edit.php, views/default/css.php,
+  views/default/export/entity.php, views/default/export/metadata.php,
+  views/default/export/relationship.php, views/default/friends/collection.php,
+  views/default/friends/collections.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/list.php,
+  views/default/friends/picker.php, views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php,
+  views/default/graphics/icon.php, views/default/group/default.php,
+  views/default/input/access.php, views/default/input/button.php,
+  views/default/input/calendar.php, views/default/input/captcha.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/form.php,
+  views/default/input/hidden.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/plaintext.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/reset.php, views/default/input/securitytoken.php,
+  views/default/input/submit.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/input/urlshortener.php,
+  views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/navigation/viewtype.php,
+  .../notifications/settings/usersettings.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/object/plugin.php, views/default/object/widget.php,
+  views/default/output/calendar.php, views/default/output/checkboxes.php,
+  views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/email.php, views/default/output/iframe.php,
+  views/default/output/longtext.php, views/default/output/pulldown.php,
+  views/default/output/radio.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php, views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/page_elements/header_contents.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/spotlight.php,
+  views/default/page_elements/title.php,
+  views/default/pageshells/pageshell.php, views/default/river/dashboard.php,
+  views/default/river/item/wrapper.php,
+  views/default/river/relationship/friend/create.php,
+  views/default/river/wrapper.php, views/default/search/gallery.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php,
+  views/default/settings/install.php, views/default/settings/system.php,
+  views/default/site/default.php, views/default/spotlight/default.php,
+  views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php, views/default/user/default.php,
+  views/default/user/settings/default_access.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/welcome.php, views/default/welcome/logged_in.php,
+  views/default/welcome/logged_out.php, views/default/widgets/editwrapper.php,
+  views/default/widgets/wrapper.php, views/failsafe/canvas/default.php,
+  views/failsafe/input/access.php, views/failsafe/input/button.php,
+  views/failsafe/input/checkboxes.php, views/failsafe/input/form.php,
+  views/failsafe/input/hidden.php, views/failsafe/input/longtext.php,
+  views/failsafe/input/pulldown.php, views/failsafe/input/reset.php,
+  views/failsafe/input/submit.php, views/failsafe/input/text.php,
+  views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/list.php, views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php, views/failsafe/settings/install.php,
+  views/failsafe/settings/system.php, views/foaf/canvas/default.php,
+  views/foaf/pageshells/pageshell.php, views/foaf/user/default.php,
+  views/ical/canvas/default.php, views/ical/export/entity.php,
+  views/ical/object/default.php, views/ical/pageshells/pageshell.php,
+  views/ical/search/entity_list.php, views/js/object/default.php,
+  views/js/pageshells/pageshell.php, views/js/user/default.php,
+  views/json/api/output.php, views/json/canvas/default.php,
+  views/json/export/entity.php, views/json/export/metadata.php,
+  views/json/export/relationship.php, views/json/group/default.php,
+  views/json/messages/exceptions/exception.php, views/json/object/default.php,
+  views/json/pageshells/pageshell.php, views/json/search/entity_list.php,
+  views/json/site/default.php, views/json/user/default.php,
+  views/opendd/canvas/default.php, views/opendd/export/entity.php,
+  views/opendd/export/metadata.php, views/opendd/export/relationship.php,
+  views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/site/default.php, views/opendd/user/default.php,
+  views/php/api/output.php, views/php/canvas/default.php,
+  views/php/export/entity.php, views/php/export/metadata.php,
+  views/php/export/relationship.php, views/php/group/default.php,
+  views/php/messages/exceptions/exception.php, views/php/object/default.php,
+  views/php/pageshells/pageshell.php, views/php/search/entity_list.php,
+  views/php/site/default.php, views/php/user/default.php,
+  views/rss/annotation/default.php, views/rss/canvas/default.php,
+  views/rss/group/default.php, views/rss/object/default.php,
+  views/rss/pageshells/pageshell.php, views/rss/user/default.php,
+  views/xml/api/output.php, views/xml/messages/exceptions/exception.php,
+  views/xml/pageshells/pageshell.php, views/xml/xml-rpc/output.php: Whoa nelly
+  this is a big one: Removed license and copyright for files.  
+
+2009-08-19  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* LICENCE.txt: Fixes #1176: Added date back to license.  
+
+  	* LICENCE.txt: Test  
+
+2009-08-11  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixes #942: In register_user, replaced
+  sanitise_string() call with a simple trim().  Not a problem because all SQL
+  sanitation is handled elsewhere.  
+
+  	* engine/lib/annotations.php: Added timelower and timeupper to
+  get_annotations() and __get_annotations_calculate_x() and its helpers.  
+
+2009-08-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/captcha/backgrounds/bg1.jpg, mod/captcha/backgrounds/bg2.jpg,
+  mod/captcha/backgrounds/bg3.jpg, mod/captcha/backgrounds/bg4.jpg,
+  mod/captcha/backgrounds/bg5.jpg, mod/captcha/captcha.php,
+  mod/captcha/fonts/1.ttf, mod/captcha/fonts/Liberation_serif_License.txt,
+  mod/captcha/languages/en.php, mod/captcha/manifest.xml,
+  mod/captcha/start.php, mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/delete.php,
+  mod/groups/actions/edit.php, mod/groups/actions/featured.php,
+  mod/groups/actions/forums/addpost.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletepost.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/editpost.php,
+  mod/groups/actions/forums/edittopic.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/actions/invite.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/addtopic.php, mod/groups/all.php,
+  mod/groups/discussions.php, mod/groups/edit.php, mod/groups/edittopic.php,
+  mod/groups/forum.php, mod/groups/graphics/defaultlarge.gif,
+  mod/groups/graphics/defaultmedium.gif, mod/groups/graphics/defaultsmall.gif,
+  mod/groups/graphics/defaulttiny.gif, mod/groups/graphics/icon.php,
+  mod/groups/groupprofile.php, mod/groups/index.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/manifest.xml,
+  mod/groups/membership.php, mod/groups/membershipreq.php, mod/groups/new.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/group/group.php,
+  .../views/default/groups/closedmembership.php,
+  mod/groups/views/default/groups/contentwrapper.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  mod/groups/views/default/groups/members.php,
+  .../views/default/groups/membershiprequests.php,
+  mod/groups/views/default/groups/profileitems.php,
+  mod/groups/views/default/groups/side_menu.php,
+  .../views/default/icon/group/default/large.php,
+  .../views/default/icon/group/default/medium.php,
+  .../views/default/icon/group/default/small.php,
+  .../views/default/icon/group/default/tiny.php,
+  .../views/default/object/groupforumtopic.php,
+  mod/groups/views/default/river/forum/create.php,
+  .../views/default/river/forum/topic/create.php,
+  mod/groups/views/default/river/group/create.php,
+  .../views/default/river/object/group/create.php,
+  .../river/object/groupforumtopic/annotate.php,
+  .../river/object/groupforumtopic/create.php,
+  .../river/object/groupforumtopic/update.php,
+  .../default/river/relationship/member/create.php,
+  mod/groups/views/default/settings/groups/edit.php,
+  mod/groups/views/default/sharing/invite.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  .../views/default/widgets/a_users_groups/view.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php,
+  mod/groups/views/rss/forum/topicposts.php,
+  mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/contentwrapper.php,
+  mod/groups/views/rss/groups/profileitems.php,
+  mod/notifications/actions/groupsave.php, mod/notifications/actions/save.php,
+  .../graphics/icon_notifications_email.gif, mod/notifications/groups.php,
+  mod/notifications/index.php, mod/notifications/languages/en.php,
+  mod/notifications/manifest.xml, mod/notifications/start.php,
+  .../views/default/notifications/css.php,
+  .../notifications/settings/usersettings.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/jsfuncs.php,
+  .../notifications/subscriptions/personal.php,
+  mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/actions/resetdefaultprofile.php, mod/profile/defaultprofile.php,
+  mod/profile/edit.php, mod/profile/editicon.php,
+  mod/profile/graphics/defaultlarge.gif,
+  mod/profile/graphics/defaultmaster.gif,
+  mod/profile/graphics/defaultmedium.gif,
+  mod/profile/graphics/defaultsmall.gif, mod/profile/graphics/defaulttiny.gif,
+  mod/profile/graphics/defaulttopbar.gif, mod/profile/icon.php,
+  mod/profile/icondirect.php, mod/profile/index.php,
+  mod/profile/javascript.php, mod/profile/manifest.xml, mod/profile/start.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  .../views/default/js/jquery.imgareaselect-0.8.js,
+  .../default/js/jquery.imgareaselect-0.8.min.js,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/adminwrapper.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/submenu.php,
+  mod/profile/views/default/profile/userdetails.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/index.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/manifest.xml, mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/reportedcontent/user_report.php,
+  mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  mod/riverdashboard/index.php, mod/riverdashboard/languages/en.php,
+  mod/riverdashboard/manifest.xml, mod/riverdashboard/start.php,
+  .../views/default/river/sitemessage/create.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php,
+  .../views/default/settings/riverdashboard/edit.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../views/json/riverdashboard/container.php,
+  .../views/rss/riverdashboard/container.php, mod/thewire/actions/add.php,
+  mod/thewire/actions/delete.php, mod/thewire/add.php,
+  mod/thewire/everyone.php, mod/thewire/graphics/river_icon_thewire.gif,
+  mod/thewire/graphics/thewire_speech_bubble.gif, mod/thewire/index.php,
+  mod/thewire/languages/en.php, mod/thewire/manifest.xml,
+  mod/thewire/readme.txt, mod/thewire/start.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  .../views/default/thewire/activity_view.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/thewire/views/default/thewire/notfound.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/thewire/scripts/counter.js,
+  mod/thewire/views/default/thewire/view.php,
+  mod/thewire/views/default/widgets/thewire/edit.php,
+  mod/thewire/views/default/widgets/thewire/view.php: removed all main plugins
+  from core - they now live in the plugins svn 
+
+2009-08-05  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Added documentation to
+  list_entities_from_access_collection();  
+
+2009-08-04  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed a security issues when simple cache is off. 
+
+2009-08-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: small edit 
+
+2009-08-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Added starttime and endtime for
+  get_entities_from_annotation().  
+
+2009-07-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Refs #1089: Removed [B] flag from htaccess.  This flag is
+  wildly inconsistent in functionality and support in Apache.  Will have to
+  implement a solution in PHP.  
+
+2009-07-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Added get/list_entities_from_access_collection().  
+
+  	* engine/lib/cache.php: Fixes #1151: Added is_dir() check before attempting
+  to create cache directory.  
+
+2009-07-27  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Fixes #1148: Correctly comparing strings to
+  get OS.  
+
+2009-07-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/css.php: small fix to force facebook and
+  twitter user icons to the right size in the recent members sidebar 
+
+2009-07-24  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Fixes #1144: Added comma between order by fields.
+   
+
+2009-07-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, version.php: Closes #1137: Setting a hidden variable
+  "returntoreferer" in a login form will now cause the action to use the
+  "referrer" address on a successful login. Version bump. 
+
+  	* mod/profile/views/default/profile/editicon.php: Minor bugfix on username 
+
+2009-07-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* .../views/default/object/groupforumtopic.php: Closes #1131: htmlentities
+  in view around user text 
+
+2009-07-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: readme tweak 
+
+  	* CONTRIBUTORS.txt: small tweak 
+
+2009-07-15  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icondirect.php, simplecache/view.php: Forcing a new db connect
+  for simplecache/view.php and mod/profile/icondirect.php Will avoid bugs if a
+  previous connection has been created.  
+
+2009-07-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Closes #1119: If post data not initially found then
+  input stream is used. 
+
+2009-07-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: Removed #1100 hack 
+
+2009-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: Closes #1100: Added a dummy
+  function to page shell to initialise jquery 
+
+  	* views/default/canvas/layouts/widgets.php: Closes #1113: Htmlentities made
+  UTF-8 and quotes safe. 
+
+2009-07-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php, version.php: Closes #1111: Using substr
+  instead of parse_url. 
+
+  	* engine/lib/elgglib.php: Refs #427: Added $vars array to hook call. 
+
+2009-07-07  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/htmlawed/start.php: Closes #956: Classes are removed by the HTML
+  filter.  
+
+  	* engine/lib/access.php, mod/groups/start.php: Refs #1099: Using write
+  access hook to allow group-only ACLs.  Need to examine better solutions after
+  1.7.  
+
+2009-07-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/pulldown.php: Closes #1105: Value on input/pulldown
+  view now escaped. 
+
+  	* engine/lib/xml-rpc.php: Closes #1075: XML-RPC client behaving as per spec 
+
+2009-07-06  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php, htaccess_dist: Refs #1089: Added [B] flag to
+  rewrite for tags.  Won't work until apache 2.2.12.  Cleaned up some query
+  code in pagehandler().  
+
+2009-07-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/cropicon.php: Admin cropping of other user icons now
+  works as expected. 
+
+  	* mod/profile/start.php: Fixed doubling on icon edit (nb. this was not the
+  same issue as Refs #1100) 
+
+  	* mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php: Removed edit profile, added
+  links to own page. 
+
+2009-07-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: small tweak to filestore 
+
+2009-07-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/cropicon.php, mod/profile/actions/edit.php,
+  mod/profile/actions/iconupload.php, mod/profile/editicon.php,
+  mod/profile/manifest.xml, mod/profile/start.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/menu/links.php,
+  mod/profile/views/default/profile/userdetails.php, version.php: * Closes
+  #1104: Edit profile and edit icon links on pulldown menu for editable users.
+  * Closes #545: Admins are now able to edit profiles and icons of other users.
+  * CSRF protection added to icon upload and edit code. * Version bump. 
+
+  	* engine/lib/entities.php: Closes #742: Ability to retrieve master icon from
+  getIcon() interface. 
+
+  	* languages/en.php, mod/profile/views/default/profile/editicon.php: Closes
+  #1103: Profile text now has translation tag 
+
+2009-07-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: added css rule for em tags to work properly with
+  htmlawed and tinyMCE editor 
+
+2009-07-03  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/htmlawed/start.php: Allowing selected style attributes in htmlawed.  
+
+2009-07-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Removing update client from initial
+  modules. 
+
+  	* actions/systemsettings/install.php: Refs #1086 & #1073: Filtering and
+  captcha have correct install defaults. 
+
+2009-07-02  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Closes #859: Group forum thread-starters receive
+  same email as participants.  
+
+2009-07-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: order by now works on get entities from metadata 
+
+2009-07-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/htmlawed/start.php: Fixed a typo in htmlawed filtering.  
+
+  	* engine/lib/users.php: Refs #1058: Using validated metadata for new user
+  permission check.  Correctly allows for enable() / disable(), but still not
+  ideal.  
+
+2009-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009070101.php, mod/kses/manifest.xml,
+  mod/kses/start.php, mod/kses/vendors/kses/AUTHORS,
+  mod/kses/vendors/kses/COPYING, mod/kses/vendors/kses/ChangeLog,
+  mod/kses/vendors/kses/README, mod/kses/vendors/kses/TODO,
+  mod/kses/vendors/kses/docs/attribute-value-checks,
+  mod/kses/vendors/kses/docs/hooks,
+  mod/kses/vendors/kses/docs/stripping-everything,
+  mod/kses/vendors/kses/docs/supported-formats,
+  .../vendors/kses/docs/whitelisted-url-protocols,
+  mod/kses/vendors/kses/examples/filter.php,
+  mod/kses/vendors/kses/examples/test.php, mod/kses/vendors/kses/kses.php,
+  mod/kses/vendors/kses/oop/oop.kses.changelog.txt,
+  mod/kses/vendors/kses/oop/oop.simple.api.txt,
+  mod/kses/vendors/kses/oop/php4.class.kses.php,
+  mod/kses/vendors/kses/oop/php5.class.kses.php,
+  mod/kses/vendors/kses/oop/test.oop.kses.php, version.php: Refs #1086:
+  Deprecating kses and removing it from core. Version bump. 
+
+2009-07-01  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/htmlawed/manifest.xml, mod/htmlawed/start.php,
+  mod/htmlawed/vendors/htmLawed/htmLawed.php,
+  mod/htmlawed/vendors/htmLawed/htmLawedTest.php,
+  mod/htmlawed/vendors/htmLawed/htmLawed_README.htm,
+  mod/htmlawed/vendors/htmLawed/htmLawed_README.txt,
+  .../vendors/htmLawed/htmLawed_TESTCASE.txt: Refs #1086: Added htmLawed plugin
+  as replacement for kses.  
+
+2009-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Closes #1097: Results set by set_input are now also
+  filtered by get_input() 
+
+  	* engine/lib/annotations.php: Short circuit on delete annotations to avoid
+  error message 
+
+  	* engine/lib/metadata.php: Metadata delete now passing correct object, also
+  handles missing metadata entity. 
+
+2009-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/jsfuncs.php,
+  .../views/default/js/jquery.imgareaselect-0.4.2.js,
+  .../default/js/jquery.imgareaselect-0.4.2.min.js,
+  .../views/default/js/jquery.imgareaselect-0.8.js,
+  .../default/js/jquery.imgareaselect-0.8.min.js,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/javascript.php,
+  vendors/jquery/jquery-1.2.6.pack.js, vendors/jquery/jquery-1.3.2.min.js,
+  vendors/jquery/jquery-ui-1.7.2.custom.min.js,
+  .../jquery/jquery-ui-personalized-1.5.3.packed.js,
+  vendors/jquery/jquery.form.js, views/default/embed/addcontentjs.php,
+  views/default/js/initialise_elgg.php, views/default/js/upload_js.php,
+  views/default/page_elements/header.php: update to jquery 1.3.2 and jqueryUI
+  1.7.2 closes #941 
+
+2009-06-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php: fixed wire reply button
+  (missing 'echo'), and tweaked river/dashboard reply link for the default
+  theme. Also fixed a typo in the admin area 
+
+2009-06-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/groups.php, search/index.php, search/users.php: Refs #1086: Fixes
+  specific issues mentioned pending KSES fix / replacement 
+
+2009-06-30  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, views/default/friends/collection.php,
+  views/default/output/confirmlink.php: Modified output/confirmlink view to
+  accept a class param. user_remove_friend() uses
+  remove_user_from_access_collection() instead of raw SQL. Deleting an access
+  collection prompts using output/confirmlink.  
+
+2009-06-30  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/river/object/thewire/create.php: wire links will now
+  work in the activity river 
+
+2009-06-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Fixed typo 
+
+2009-06-29  brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php: Ref #1015: Correctly placed the end
+  div for access collection delete link.  
+
+  	* views/default/friends/collection.php: Closes #1015: Added a prompt before
+  deleting an access collection.  Also cleaned up some hard vs soft tab issues.
+   
+
+  	* engine/lib/users.php: Closes #502: Removing unfriended users from access
+  lists upon unfriending.  
+
+  	* engine/lib/annotations.php: Closes #337: Added checking for metastrings in
+  __get_annotations_calculate_x()  
+
+  	* engine/lib/entities.php, engine/lib/relationships.php: Updated get_*()
+  functions ot return false if an invalid subtype is specified.  
+
+2009-06-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009050801.php: Closes #1073: Captcha off by default 
+
+2009-06-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river2.php: Access levels on add_to_river() will now respect
+  ACCESS_DEFAULT level. 
+
+  	* views/rss/pageshells/pageshell.php: Closes #1090: Removed xml:base from
+  RSS channel tag. 
+
+2009-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/captcha/manifest.xml: Minor point of clarification 
+
+2009-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: tweak to input box size 
+
+2009-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* engine/lib/elgglib.php: Closes #427: Original view name passed to plugin
+  hook. 
+
+  	* engine/lib/filestore.php: Some tidying of file download manager functions.
+
+2009-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* actions/friends/add.php, actions/friends/remove.php,
+  mod/profile/views/default/profile/menu/actions.php: Action gatekeeper added
+  to add and remove friends. 
+
+2009-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump. 
+
+  	* views/ical/canvas/default.php, views/ical/export/entity.php,
+  views/ical/object/default.php, views/ical/pageshells/pageshell.php,
+  views/ical/search/entity_list.php: Closes #581: First draft ICAL export views
+  for Notable calendar events. 
+
+2009-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump. 
+
+  	* engine/lib/filestore.php: Closes #601: Provides default for new
+  ElggFilestore objects to remove warning message. 
+
+2009-06-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php: * Translation 'reply'
+  fixed. * Now possible to reply to wire posts from within the river. 
+
+  	* engine/lib/annotations.php: Closes #719: More options on annotation count
+  functions. 
+
+  	* views/default/input/access.php, views/default/input/button.php,
+  views/default/input/checkboxes.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/hidden.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/plaintext.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Closes #540:
+  input/* views have internalid attribute. 
+
+  	* engine/lib/elgglib.php: Refs #964: Correct detection of type. 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/system_log.php: Refs #328: Documentation tweak. 
+
+  	* engine/lib/elgglib.php: Refs #964: Tidied plugin hook into framework
+  function, changed hook to entity:annotate. 
+
+2009-06-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, version.php: Marcus Povey 20090616: * Closes #964:
+  Introduces a plugin hook 'annotations:view', $entity_class
+  (object/user/group/site) called elgg_view_entity on FULL view. This lets you
+  return annotations to an entity and control the order in which they're
+  displayed. Existing views remain un-effected but should probably be
+  retrofitted. * Version bump. 
+
+  	* engine/lib/system_log.php: Bugfix to archive logs sql 
+
+2009-06-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/urlshortener.php: URL shortener view. 
+
+  	* htaccess_dist: Actions rewrite rule will now match against numbers as well
+  as letters. 
+
+  	* version.php: Version bump 
+
+  	* mod/thewire/views/default/thewire/forms/add.php: Call out to a url
+  shortner if one is available, through the use of the input/urlshortner view. 
+
+2009-06-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* engine/lib/filestore.php, engine/lib/users.php: Refs #1041: * Speculative
+  fix, extended blacklist of invalid characters for user signup * Mapping some
+  filestore matrix characters (notable '.') to a safe char 
+
+  	* engine/lib/filestore.php, languages/en.php: Refs #1041: Extra debug 
+
+2009-06-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Block URL unsafe characters from username 
+
+2009-06-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: File cache attempts to create directory if it is not
+  present. 
+
+2009-06-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/mb_wrapper.php, mod/thewire/start.php: * Introducing substr
+  wrapper function * Wire strips tags (Closes #1045) 
+
+2009-06-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/mb_wrapper.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, search/index.php, version.php: Closes #639: *
+  Metastrings can be searched either case sensitive or insensitive modes. *
+  Tags now have case lowered in a UTF8 safe way (requires mbstring support). *
+  Introducing mb_wrapper.php containing multibyte wrapper functions. * Version
+  bump. * Introduces #1043 for consideration. 
+
+  	* engine/lib/actions.php, engine/lib/pagehandler.php: Close #1040: Limited
+  explode on action and page handler. 
+
+2009-06-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/checkboxes.php: Closes #1037: Removed double pasting 
+
+2009-06-04  kevin <kevin@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/js/upload_js.php: Changed a variable name that IE did not
+  like. 
+
+2009-06-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Closes #998 : Operator selection on get by
+  metadata multi 
+
+2009-06-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Removed some error messages 
+
+2009-05-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Option to suppress visible errors in token
+  validation code. 
+
+2009-05-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/upload/upload_form_content.php: hashed out folders view 
+
+2009-05-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: Closes #1035: Page handler now urldecodes
+  input, necessary as vars are extracted from request_uri and not $_REQUEST
+  (which is automatically decoded) 
+
+  	* engine/lib/group.php: Fixed some typos in group search 
+
+  	* languages/en.php: Group search language correction 
+
+  	* languages/en.php, search/groups.php: Group search language correction 
+
+  	* views/default/user/search/finishblurb.php: Refs #965: Correct some search
+  links. 
+
+  	* views/default/group/search/finishblurb.php,
+  views/default/user/search/finishblurb.php: Refs #965: Correct some search
+  links. 
+
+  	* engine/lib/entities.php, engine/lib/search.php, search/index.php,
+  version.php: Refs #965: Search now correctly using page handler to make it
+  easier to replace. 
+
+  	* views/default/page_elements/elgg_topbar.php: Refs #965: Topbar search now
+  pointing at correct url. 
+
+  	* languages/en.php, views/default/page_elements/elgg_topbar.php: Closes
+  #805: Top bar search now internationalised. Refs #965 
+
+2009-05-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Delete event now
+  triggered on metadata and annotation delete 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/sessions.php: Admin shortcut flag set on login as well as init 
+
+2009-05-27  kevin <kevin@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Removed plugin-specific references from
+  file_display_thumbnail and file_add_to_folders. 
+
+2009-05-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Refs #965: Allowing upgrades to be loaded from
+  other locations. 
+
+  	* engine/lib/group.php, engine/lib/users.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2009052201.sql, languages/en.php, search/groups.php,
+  version.php, views/default/group/search/finishblurb.php,
+  views/default/group/search/startblurb.php: Closes #1030: Group title and
+  description search added, refs #965 
+
+  	* engine/lib/users.php: Closes #1031: Restored wildcard as it didn't appear
+  that slow. 
+
+2009-05-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/captcha/views/default/input/captcha.php: captcha layout tweak 
+
+2009-05-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* engine/lib/database.php: Refs #1027: Introducing
+  $CONFIG->db_disable_query_cache which allows disabling of query cache for
+  implementation in CLI mode 
+
+  	* engine/lib/actions.php: Closes #1026: Removed "@" from include statement 
+
+2009-05-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Closes #1025: Using the correct variable. 
+
+2009-05-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* views/rss/annotation/default.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/pageshells/pageshell.php,
+  views/rss/user/default.php: Closes #646: GeoRSS support added to Locatable
+  objects with coordinates on RSS feeds 
+
+  	* views/rss/annotation/default.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/pageshells/pageshell.php,
+  views/rss/user/default.php: Closes #1024: Added call to views which allow
+  extensions to be made. 
+
+  	* views/rss/annotation/default.php, views/rss/group/default.php,
+  views/rss/object/default.php, views/rss/pageshells/pageshell.php: Making use
+  of the Dublin Core extensions to provide owner information in RSS feeds 
+
+  	* engine/lib/location.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2009051401.sql, version.php: Fixed geocode stuff +
+  version bump 
+
+2009-05-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  mod/diagnostics/views/default/diagnostics/test.php,
+  .../views/default/diagnostics/testresult.php: Closes #1009: Diagnostics unit
+  test with example 
+
+  	* engine/lib/testing.php, mod/diagnostics/index.php,
+  mod/diagnostics/languages/en.php, mod/diagnostics/start.php,
+  mod/diagnostics/testreport.php, mod/diagnostics/unittester.php,
+  .../views/default/diagnostics/runalltests.php,
+  mod/diagnostics/views/default/diagnostics/test.php,
+  .../views/default/diagnostics/testresult.php: Refs #1009: Enhancements to
+  diagnostics tool to use the test framework. 
+
+  	* engine/lib/testing.php: Refs #1009: Changed the method tests are
+  performed. 
+
+  	* engine/lib/testing.php: Refs #1009: Simple test framework outline added. 
+
+2009-05-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: Closes #1003: Using more efficient query 
+
+  	* engine/lib/river.php, version.php: Removed deprecated river library +
+  version bump 
+
+  	* engine/lib/actions.php: Closes #749: Warning message on missing token. 
+
+2009-05-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php: Closes #944: Changed owner check to a
+  canEdit check on the group. 
+
+  	* engine/lib/river.php: Deprecated old river code 
+
+  	* engine/lib/system_log.php, version.php: Closes #1010: Log event now called
+  on an event of its own, this permits plugins to add additional logging or
+  replace the logging method altogether.  This is only possible now that the
+  old river code has been replaced. 
+
+  	* engine/lib/version.php: Refs #965 & #967: Event triggered on upgrade,
+  allowing easier integration with plugins. 
+
+  	* views/default/spotlight/default.php: Closes #1017: Div no longer closed
+  early. 
+
+  	* views/default/page_elements/elgg_topbar.php: Closes #1016: Image tag
+  closed 
+
+  	* version.php: Version bump 
+
+  	* mod/captcha/start.php: Captcha list can now be extended by other plugins 
+
+2009-05-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/start.php: Hard limit to string lengths. 
+
+  	* mod/captcha/fonts/Liberation_serif_License.txt: Added font licence, refs
+  #1011 
+
+  	* actions/systemsettings/install.php, engine/lib/upgrades/2009050801.php,
+  mod/captcha/backgrounds/bg1.jpg, mod/captcha/backgrounds/bg2.jpg,
+  mod/captcha/backgrounds/bg3.jpg, mod/captcha/backgrounds/bg4.jpg,
+  mod/captcha/backgrounds/bg5.jpg, mod/captcha/captcha.php,
+  mod/captcha/fonts/1.ttf, mod/captcha/languages/en.php,
+  mod/captcha/manifest.xml, mod/captcha/start.php,
+  mod/captcha/views/default/captcha/css.php,
+  mod/captcha/views/default/input/captcha.php, version.php: Closes #1011: Added
+  basic captcha support. 
+
+  	* actions/systemsettings/install.php: System default plugins now accepts
+  array as well as CSV 
+
+  	* views/default/account/forms/forgotten_password.php: Refs #1011: Correctly
+  CSSed and now using captcha if available 
+
+2009-05-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* views/default/account/forms/register.php, views/default/input/captcha.php:
+  Closes #983: Introducing input/captcha view, use wherever a captcha is
+  required - override with plugins and use the actions hook to do additional
+  validation! 
+
+  	* engine/lib/relationships.php: Refs #975: Get entities from metadata and
+  relationship now behaves as expected 
+
+2009-05-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Closes #994: elgg_view_exists will now check to
+  see if a view exists by dint of being extended. 
+
+  	* engine/lib/access.php, engine/lib/elgglib.php: Removing spurious error log
+  messages 
+
+  	* mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php: Closes #725: Typo corrected. 
+
+  	* languages/en.php, mod/riverdashboard/languages/en.php,
+  .../views/default/riverdashboard/welcome.php,
+  views/default/basic_elements/welcome.php,
+  views/default/welcome/logged_in.php: Closes #950: Fixed missing translations.
+
+  	* mod/riverdashboard/languages/en.php,
+  .../views/default/riverdashboard/welcome.php: Closes #1004: Welcome no longer
+  hard coded. 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/entities.php: Closes #1007: Private data now removed on entity
+  deletion. 
+
+  	* engine/lib/users.php: Closes #1008: Fixed typo 
+
+2009-05-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Closes #824: Test variable to prevent error
+  message in log. 
+
+2009-05-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Closes #1002: Committed missing variable code 
+
+  	* UPGRADE.txt: Test  
+
+  	* UPGRADE.txt: Test   
+
+2009-04-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* UPGRADE.txt: Closes #1001: This is a test 
+
+  	* UPGRADE.txt: Refs #4: This is a test 
+
+  	* UPGRADE.txt: 
+
+  	* UPGRADE.txt: 
+
+  	* UPGRADE.txt: Test  
+
+  	* UPGRADE.txt: Test  
+
+  	* UPGRADE.txt: Test  
+
+  	* UPGRADE.txt: Test   
+
+  	* UPGRADE.txt: TEst  
+
+  	* UPGRADE.txt: Test  
+
+  	* UPGRADE.txt: Removed test  
+
+  	* UPGRADE.txt: Test  
+
+2009-04-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Closes #927: Minimum user length no longer hard
+  coded. 
+
+  	* engine/lib/relationships.php: Closes #975: Now possible to search by
+  metadata and relationship 
+
+  	* engine/lib/users.php: Closes #943: Event triggered when banning or
+  unbanning a user. 
+
+2009-04-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* mod/groups/actions/edit.php,
+  mod/groups/views/default/forms/groups/edit.php: Added security token to group
+  edit form 
+
+  	* views/default/input/form.php, views/default/input/securitytoken.php:
+  Introducing input/securitytoken as an intermediate step for form conversion. 
+
+  	* mod/groups/actions/edit.php, mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/edit.php: Closes #969: Admin option to
+  allow the setting of certain access controls on a group 
+
+  	* actions/useradd.php, engine/lib/users.php: Closes #856: Admin created
+  users are no longer created as being owned by the admin 
+
+2009-04-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: Refs #969: Added admin menu option for
+  enabling private groups 
+
+  	* mod/groups/views/default/settings/groups/edit.php: Refs #969: Added admin
+  menu option for enabling private groups 
+
+  	* engine/lib/group.php: Closes #980: group_gatekeeper() now has an admin
+  override if the admin is logged in 
+
+  	* simplecache/view.php: Closes #989: Forces regenerate on next refresh when
+  cache file is missing 
+
+2009-04-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php, engine/lib/users.php:
+  Deleting correct data + using correct tables 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/metadata.php, engine/lib/users.php: Closes #957: Annotations and
+  metadata owned by a deleted user are now also deleted. 
+
+  	* languages/en.php, mod/groups/views/default/forum/topicposts.php,
+  .../views/default/object/groupforumtopic.php: Closes #957: Groups topics now
+  handle deleted users, I recommend that people look at what I've done and
+  handle deleted users in a similar way in their plugins. 
+
+2009-04-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Belts and braces checking on isloggedin() 
+
+2009-04-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/sidebar_boxes.php: an extra view to extend,
+  added to sidebar boxes 
+
+2009-04-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/kses/manifest.xml: Refs #833: Added manifest 
+
+  	* actions/systemsettings/install.php, engine/lib/input.php,
+  engine/lib/upgrades/2009041701.php, mod/kses/start.php,
+  mod/kses/vendors/kses/AUTHORS, mod/kses/vendors/kses/COPYING,
+  mod/kses/vendors/kses/ChangeLog, mod/kses/vendors/kses/README,
+  mod/kses/vendors/kses/TODO,
+  mod/kses/vendors/kses/docs/attribute-value-checks,
+  mod/kses/vendors/kses/docs/hooks,
+  mod/kses/vendors/kses/docs/stripping-everything,
+  mod/kses/vendors/kses/docs/supported-formats,
+  .../vendors/kses/docs/whitelisted-url-protocols,
+  mod/kses/vendors/kses/examples/filter.php,
+  mod/kses/vendors/kses/examples/test.php, mod/kses/vendors/kses/kses.php,
+  mod/kses/vendors/kses/oop/oop.kses.changelog.txt,
+  mod/kses/vendors/kses/oop/oop.simple.api.txt,
+  mod/kses/vendors/kses/oop/php4.class.kses.php,
+  mod/kses/vendors/kses/oop/php5.class.kses.php,
+  mod/kses/vendors/kses/oop/test.oop.kses.php, vendors/kses/AUTHORS,
+  vendors/kses/COPYING, vendors/kses/ChangeLog, vendors/kses/README,
+  vendors/kses/TODO, vendors/kses/docs/attribute-value-checks,
+  vendors/kses/docs/hooks, vendors/kses/docs/stripping-everything,
+  vendors/kses/docs/supported-formats,
+  vendors/kses/docs/whitelisted-url-protocols,
+  vendors/kses/examples/filter.php, vendors/kses/examples/test.php,
+  vendors/kses/kses.php, vendors/kses/oop/oop.kses.changelog.txt,
+  vendors/kses/oop/oop.simple.api.txt, vendors/kses/oop/php4.class.kses.php,
+  vendors/kses/oop/php5.class.kses.php, vendors/kses/oop/test.oop.kses.php,
+  version.php: Closes #833: Kses now built as module  
+
+  	* engine/lib/input.php: Reverted last 
+
+2009-04-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: small tweak to kses input, for now. 
+
+2009-04-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Removed style on code 
+
+  	* engine/lib/input.php: Removed columns 
+
+  	* engine/lib/input.php: Slightly more draconian kses rules 
+
+  	* engine/lib/plugins.php: Closes #982: Object limit maximum raised. 
+
+2009-04-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Moved old file mime type guesser back to files
+  plugin so that there are no conflicts 
+
+2009-04-16  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Passed container_guid to any quota plugins and
+  removed duplicate function definition. 
+
+  	* engine/lib/filestore.php: Added file_get_general_file_type() function 
+
+2009-04-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, version.php: Centralised mimetype function 
+
+  	* engine/lib/filestore.php, views/default/js/upload_js.php,
+  views/default/upload/upload_form_content.php: Rolled in Kevin's file store
+  enhancements and upload code. 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/pageowner.php, languages/en.php: Error logged on page forward
+  due to missing page owner. 
+
+2009-04-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/graphics/river_icon_thewire.gif,
+  .../views/default/thewire/activity_view.php: link to the wire added to bottom
+  of latest wire post box on riverdashboard page 
+
+2009-04-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: small profile custom
+  fields tweak 
+
+2009-04-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/start.php: The Wire incoming SMS now uses the default access
+  level. 
+
+  	* mod/thewire/start.php: Moving the wire to use $SESSION instead of
+  $_SESSION 
+
+  	* engine/lib/elgglib.php: Removing viewtype autoforward, because it broke
+  installs. 
+
+2009-04-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/actionurl.php, views/default/output/confirmlink.php,
+  views/default/output/url.php: Rolled token into url and confirmlink 
+
+  	* engine/lib/tags.php: Closes #977: get_tags now functional for entities
+  without subtypes. 
+
+2009-04-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/actionurl.php: Introducing actionurl.php (Refs #749) 
+
+  	* engine/lib/pageowner.php: Forward user if a page owner is inaccessible
+  (Refs #969) 
+
+  	* engine/lib/elgglib.php: Non-default view types now preserved when
+  forwarding. 
+
+  	* engine/lib/metadata.php: Closes #974: Owner_guid may now be an array 
+
+2009-04-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, engine/lib/configuration.php,
+  engine/lib/elgglib.php, languages/en.php, views/default/settings/system.php:
+  Close #968: View path cache can now be turned on and off 
+
+  	* engine/lib/elgglib.php: Removed unused experimental cache functions 
+
+  	* actions/admin/plugins/reorder.php, engine/lib/plugins.php: Refs #946:
+  Improved documentation on enable/disable/reorder plugin commands 
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, engine/lib/elgglib.php,
+  engine/lib/plugins.php, upgrade.php: Refs #968 & #946: Tidied filepath cache
+  stuff by placing them in function calls. 
+
+  	* mod/profile/views/default/profile/userdetails.php,
+  views/default/admin/main.php, views/default/admin/plugins.php,
+  views/default/admin/site.php, views/default/admin/user.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/messages/errors/error.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/messages/message.php,
+  views/default/usersettings/main.php, views/default/usersettings/plugins.php:
+  Refs #963: Autop changed to longtext on standard views 
+
+  	* engine/lib/database.php, version.php: Added callback support to
+  get_data_row() 
+
+2009-04-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Closes #937: Added time constraints to the tag
+  retrieval query. 
+
+2009-04-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: The inclusion of a new library merits a new internal version
+  number. 
+
+2009-04-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php,
+  .../views/default/riverdashboard/newestmembers.php: Closes #932: Recent
+  members string no longer hard coded 
+
+2009-04-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/jquery/jquery.form.js, views/default/page_elements/header.php:
+  jQuery Form plugin, welcome to Elgg Core. 
+
+2009-04-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/object/thewire.php: Closes #949: Method in "via
+  {{Method}}" now wrapped in an elgg_echo 
+
+  	* engine/lib/plugins.php: Closes #945: enable/disable_plugin now updates
+  $ENABLED_PLUGINS_CACHE 
+
+2009-03-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/manifest.xml, version.php: Version bump 
+
+  	* engine/lib/metadata.php, engine/lib/users.php,
+  mod/uservalidationbyemail/start.php: Closes #896: Error thrown if user not
+  validate. Metadata physically removed rather than simply blanked when
+  validation is requested. Note: update_metadata no longer seems to support
+  anonymous metadata which is likely to have knock on issues elsewhere... 
+
+2009-03-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icondirect.php: Closes #916: Icondirect now using multibyte
+  safe str_split code from filestore.php 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/database.php: Closes #875: Using db link 
+
+  	* engine/lib/notification.php: Closes #889: Decoding html entities from
+  messages before stripping tags 
+
+  	* engine/lib/elgglib.php: Closes #897: Memcache datalists correctly saved on
+  first load 
+
+  	* views/default/css.php: Closes #903: Large <pre> and <code> blocks no
+  longer break page shell 
+
+  	* mod/riverdashboard/index.php: Closes #899: River dash ajax now UTF-8 
+
+  	* views/default/page_elements/owner_block.php: Closes #914: Removed odd line
+
+2009-03-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php: Context can now be assigned by defining a
+  constant in the page. 
+
+2009-03-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php: Refs #926: Private wire posts get bumped to
+  'logged in' 
+
+2009-03-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: small lang tweak 
+
+  	* languages/en.php, .../views/default/profile/editdefaultprofile.php: small
+  lang tweak 
+
+2009-03-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/edittopic.php: Closes #930: addtopic -> edittopic 
+
+2009-03-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/river_widget/view.php: small tweak 
+
+  	* .../views/default/river/object/thewire/create.php: river view tweak for
+  the wire 
+
+2009-03-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Different assignment. 
+
+  	* engine/lib/users.php: Disposed of unnecessary $result variables. 
+
+  	* engine/lib/api.php: Closes #844: API parameter test logic improved 
+
+  	* engine/lib/languages.php: Closes #883: Using different operator logic so
+  that plugins can replace existing translation entries. 
+
+  	* mod/groups/actions/addtogroup.php: Closes #893: Using ->join() method
+  instead to ensure that event is triggered. 
+
+2009-03-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt, version.php: Oh hai Elgg 1.5 
+
+  	* actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  .../actions/email/confirm.php, version.php: Closes #873: Mail/password
+  reset/confirm actions forward to wwwroot rather than ref. Version bump. 
+
+  	* engine/lib/elgglib.php: Fixes #877: Minor typo addressed. Note: This
+  function is currently not used. 
+
+2009-03-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, version.php: Fixed typo in default
+  plugins init + version bump 
+
+2009-03-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* engine/lib/notification.php: Provide a From email address workaround for
+  those with windows servers. See issue http://bugs.php.net/bug.php?id=28038 
+
+2009-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Profile user icon URL fix. 
+
+2009-03-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/objects.php,
+  engine/lib/sites.php, engine/lib/users.php, languages/en.php, version.php:
+  Closes 868: Fixes regression introduced in [3119]. Version number bumped. 
+
+2009-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Added a clause that will detect if insert_data
+  returned 0 rather than false, and returns 'true' in this case. Fixes #867 
+
+  	* views/default/page_elements/header.php: Javascript loaded using a safer
+  URL scheme. Fixes #862 
+
+2009-03-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, .../views/default/groups/group_sort_menu.php:
+  missing lang strings fixed 
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/groups/grouplisting.php: missing strings added 
+
+2009-03-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: left column sidebar background color changed for
+  consistency with other pages (props to Cash for spotting it) 
+
+2009-03-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Minor api tweak 
+
+2009-03-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Changing version number 
+
+  	* version.php: Elgg 1.5 RC2. Hi! 
+
+2009-03-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Closes #823: Root cause was that the Headers decl requires
+  mod_headers to be installed (and Apache had a very unhelpful failure mode for
+  instances when it wasn't). The Header def has now been IfModuled out. 
+  mod_headers is still recommended for correct functioning across proxies. 
+
+2009-03-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: openID river rules removed 
+
+2009-03-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Refs #823: Mod_deflate htaccess def now disabled by
+  default. 
+
+  	* mod/groups/actions/edit.php: Admins can now change group profile picture. 
+
+2009-03-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Banned users always have default icons. 
+
+  	* mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php: Some
+  tweaks to river dashboard, including proper language usage. 
+
+  	* engine/lib/notification.php: Banned users no longer get notifications 
+
+  	* actions/register.php, engine/lib/users.php: User validation no longer
+  occurs on first install 
+
+  	* engine/lib/filestore.php: Icons are now correctly resized 
+
+2009-03-09  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php, mod/groups/start.php,
+  mod/groups/views/default/forms/groups/edit.php: Groups now support
+  add_group_tool_option so that any group tool can be toggled on or off via the
+  group's edit form. 
+
+  	* engine/lib/group.php: Introducing the add_group_tool_option function. 
+
+2009-03-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/crontrigger/manifest.xml, mod/diagnostics/manifest.xml,
+  mod/garbagecollector/manifest.xml, mod/groups/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/notifications/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/riverdashboard/manifest.xml,
+  mod/thewire/manifest.xml, mod/uservalidationbyemail/manifest.xml: Bumped
+  version numbers on bundled plugins 
+
+2009-03-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: css river rule added for openID user updating
+  profile 
+
+2009-03-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version bump 
+
+  	* mod/profile/views/default/profile/userdetails.php: Closes #851: Fixed
+  regression. It is now possible for an admin to edit another user's profile
+  consistent with 1.2 
+
+  	* _css/css.php, _css/js.php: Closes #844 & #845: Override is now no longer
+  forced on and so will now obey view cache settings. 
+
+  	* mod/groups/actions/invite.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/views/default/forms/groups/invite.php:
+  Closes #843: Introducing intermediary invite action to establish invite
+  relationship but ask a user to join 
+
+  	* version.php: Version bump 
+
+  	* engine/lib/users.php: Closes #841: User request for password changes now
+  functional. 
+
+2009-03-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: one column canvas padding adding 
+
+2009-03-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Very minor comment tweak 
+
+  	* engine/lib/group.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Reversed delete procedure on entities, parent now
+  checked first before sub deleted. Any stubs left over will be handled by the
+  garbage collector. 
+
+2009-03-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: river icon added for openID friend, blockquote
+  style tweaked, elgg horizontal nav bar improved 
+
+2009-03-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bumped version number corresponding to the change 
+
+  	* engine/lib/entities.php: Added garbage collector hook to clear up orphaned
+  sub table entities. 
+
+  	* mod/garbagecollector/start.php: Changed 'system','gc' to 'gc','system' 
+
+2009-03-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Fixed icon overrides 
+
+  	* engine/lib/river2.php: If you don't have any friends, the river no longer
+  returns all on the 'friends' view. Fixes #839 
+
+  	* mod/profile/views/default/profile/listing.php: Removed banned listing 
+
+  	* mod/profile/index.php: Banned profiles are now hidden 
+
+  	* mod/profile/views/default/profile/userdetails.php: Fixed user profile ban
+  message 
+
+2009-03-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version number bump 
+
+  	* engine/lib/languages.php: Closes #838: Missing set from static var. 
+
+2009-03-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/json/riverdashboard/container.php,
+  views/json/river/item/list.php: Improved JSON version of the dashboard 
+
+2009-03-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: missing river entry style added 
+
+2009-03-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php: Online users list works properly 
+
+  	* languages/en.php, views/default/annotation/annotate.php: Fixed generic
+  river comment view 
+
+  	* mod/riverdashboard/languages/en.php: Corrected a poorly formatted text
+  string 
+
+  	* mod/thewire/manifest.xml: New manifest description for the wire. 
+
+  	* version.php: Elgg 1.5 RC1 is gearing up to leave the building. 
+
+  	* mod/apiadmin/actions/generate.php, mod/apiadmin/actions/revokekey.php,
+  mod/apiadmin/index.php, mod/apiadmin/languages/en.php,
+  mod/apiadmin/manifest.xml, mod/apiadmin/start.php,
+  .../views/default/apiadmin/forms/add_key.php,
+  mod/apiadmin/views/default/object/api_key.php,
+  mod/guidtool/actions/delete.php, mod/guidtool/export.php,
+  mod/guidtool/format_picker.php, mod/guidtool/import.php,
+  mod/guidtool/index.php, mod/guidtool/languages/en.php,
+  mod/guidtool/manifest.xml, mod/guidtool/start.php, mod/guidtool/view.php,
+  .../views/default/forms/guidtool/export.php,
+  .../views/default/forms/guidtool/format.php,
+  .../views/default/forms/guidtool/import.php,
+  mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php,
+  mod/guidtool/views/default/guidtool/profile.php,
+  .../views/default/object/guidtoolwrapper.php: Farewell APIadmin, farewell
+  GUIDtool. We'll see you over in the plugins repo. 
+
+  	* mod/thewire/actions/add.php: Wire posts now save as default access level 
+
+  	* mod/thewire/actions/add.php: Wire posts are now default access 
+
+  	* UPGRADE.txt: Improved upgrade text 
+
+  	* engine/lib/entities.php: Error in subtype detection 
+
+2009-03-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/newestmembers.php: a small layout tweak 
+
+2009-03-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, htaccess_dist: Fixed search RSS 
+
+2009-03-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bumped version 
+
+  	* mod/crontrigger/start.php: Surpressing cron output 
+
+2009-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: tiny rule added to make widget layout consistent
+  across all widgets 
+
+2009-03-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Private items never trigger notifications 
+
+  	* engine/lib/entities.php: Access fix 
+
+  	* engine/lib/entities.php: Let's go with the most obvious application of
+  this. 
+
+  	* engine/lib/entities.php, engine/lib/river2.php: River access issues 
+
+  	* engine/lib/river2.php, languages/en.php,
+  views/default/river/item/noaccess.php: Stopgap for when you can no longer
+  view river items. 
+
+  	* views/default/input/button.php: Button src isn't always required. 
+
+  	* mod/notifications/languages/en.php: Text changes to hopefully make friends
+  notification settings a little less confusing 
+
+  	* CONTRIBUTORS.txt: Addition to the contributors file 
+
+2009-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/thewire/css.php: css tweak 
+
+2009-03-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/forms/guidtool/export.php,
+  .../views/default/forms/guidtool/import.php: GUIDtool now uses
+  input/plaintext 
+
+  	* engine/lib/access.php: Access modification - owners can always see their
+  own content 
+
+  	* views/foaf/user/default.php: Correction to FOAF URL 
+
+  	* views/foaf/user/default.php: FOAF URL fix 
+
+  	* views/foaf/page_elements/contentwrapper.php: FOAF contentwrapper 
+
+2009-03-04  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Changed notification to use
+  has_access_to_entity to move all access control checks to a single mechanism 
+
+2009-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/thewire/css.php: added rule to prevent character
+  remaing field focus on thewire individual page 
+
+2009-03-04  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Added has_access_to_entity function 
+
+  	* engine/lib/access.php: Added the ability to optionally specify the user to
+  get_access_sql_suffix 
+
+2009-03-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/group/default.php, views/rss/object/default.php,
+  views/rss/river/item/list.php: URL sanitation for RSS feeds 
+
+  	* mod/groups/views/default/groups/contentwrapper.php: Removing extra quotes 
+
+  	* views/json/page_elements/contentwrapper.php: JSON contentwrapper view 
+
+  	* engine/lib/elgglib.php, mod/groups/all.php, mod/groups/edit.php,
+  mod/groups/groupprofile.php,
+  mod/groups/views/default/groups/contentwrapper.php,
+  mod/groups/views/rss/groups/contentwrapper.php,
+  views/default/page_elements/contentwrapper.php,
+  views/rss/page_elements/contentwrapper.php: Added contentWrapper view 
+
+2009-03-04  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/query.php: AccessControlQueryComponent::__toString changed to
+  use get_access_sql_suffix 
+
+2009-03-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidtool/export.php, mod/guidtool/format_picker.php,
+  mod/guidtool/import.php, mod/guidtool/index.php,
+  mod/guidtool/languages/en.php, mod/guidtool/start.php: Moved GUID tool to
+  admin menu. 
+
+2009-03-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/css.php: added a rule to prevent
+  characters remaining field on thewire receiving focus/highlighting 
+
+2009-03-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/river/item/list.php: Title fix. 
+
+  	* engine/lib/elgglib.php, views/rss/river/item/list.php: Fixed river RSS
+  views 
+
+2009-03-04  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Commented out a no longer needed line of code 
+
+  	* engine/lib/tags.php: get_tags now uses get_access_sql_suffix for access
+  control. 
+
+2009-03-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/river/item/list.php: Ampersand fix 
+
+  	* engine/lib/elgglib.php, .../views/rss/riverdashboard/container.php,
+  views/rss/river/item/list.php: Improvements to elgg_view, plus river
+  dashboard RSS feed 
+
+  	* mod/groups/start.php: The 'manage join requests' link doesn't show up if
+  the current group doesn't have public membership. 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, mod/profile/icon.php, mod/profile/icondirect.php,
+  simplecache/view.php: Moving to a smaller chunk size. 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bumping version number 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icon.php: Profile icons come in chunks. 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, simplecache/view.php: Echoing the large output
+  buffer in chunks 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icon.php, mod/profile/icondirect.php, simplecache/view.php:
+  Splitting output into chunks. 
+
+  	* htaccess_dist: Improved .htaccess 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Stub for experimental view caching (disabled) 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, _css/js.php: Far future expires header 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Using faster array concatination 
+
+  	* views/default/input/button.php: Closes #832: Internal name now handled 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: $vars is once again populated with session data 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Removed utterly pointless lines 
+
+  	* engine/lib/languages.php: Current language now cached per process in
+  elgg_echo. 
+
+  	* engine/lib/plugins.php: Minor tweaks 
+
+  	* engine/lib/elgglib.php: Minor tweaks 
+
+  	* engine/lib/languages.php: Removed directory test to languages since it's
+  probably fair to assume that this isn't going to be the case 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* simplecache/view.php: Content length on the simplecache. 
+
+2009-03-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: tiny amendment to owner-block icon spacing 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/js.php: JS override. 
+
+  	* simplecache/view.php: Fix for previous. 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Removing the stupidly slow array_merge from lang
+  load code 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, simplecache/view.php: A quiet little CSS override update. 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Made get_library_files non-recursive and removed
+  is_dir test... makes the func <1% of total execution time 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/objects.php,
+  engine/lib/sites.php, engine/lib/users.php: Removed calls to the deprecated
+  entity cache 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/crontrigger/start.php: Suppressing output on cron trigger 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: Getting rid of needless double-trimming. 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/disableall.php,
+  actions/admin/plugins/enable.php, actions/admin/plugins/enableall.php,
+  actions/admin/plugins/reorder.php, engine/lib/elgglib.php,
+  engine/lib/plugins.php, upgrade.php: Closes #831: Plugin view location is now
+  cached in a file in dataroot and is invalidated on upgrade and plugin
+  enable/disable/reorder. This means that views no longer have to be discovered
+  on boot - reducing file IO from crazy amounts to 1. This also helps make
+  adding new plugins a linear event. 
+
+2009-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* simplecache/view.php: Eliminating the content-length header 
+
+2009-03-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Refs #830: Minor tweak 
+
+  	* engine/lib/cache.php: Cache delete now functional 
+
+2009-03-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Limitless queries now supported 
+
+2009-03-02  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php, mod/groups/views/default/groups/forum_latest.php:
+  Changed group forums to default to enabled. 
+
+  	* engine/lib/access.php: Changed the order of the access dropdown so that it
+  is in order of increasing restriction (private, friends, logged-in, public). 
+
+2009-03-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  .../views/default/object/groupforumtopic.php: discussion list updated for
+  long usernames, and clearing issues fixed for pc 
+
+2009-03-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Corrected unnecessarily patriotic comments. 
+
+2009-03-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Removing duplicate deletion code. 
+
+2009-03-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php: Minor change to previous. 
+
+  	* engine/lib/install.php: A different table to check db existence against. 
+
+2009-03-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/object/groupforumtopic.php: small tweak to change from
+  username to name on discussion 
+
+2009-03-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: mac alignment fixed on delete
+  button 
+
+  	* mod/groups/views/default/groups/css.php,
+  .../views/default/object/groupforumtopic.php: delete discussion button layout
+  tweaked 
+
+2009-03-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bump 
+
+  	* engine/lib/input.php, views/default/output/longtext.php: Closes #828:
+  Quite correct - rather tired - arrays are individually trimmed - non-arrays
+  are not. Closes #714: Input filtering now triggers on a plugin hook, this
+  allows plugins to provide other filtering methods than kses (Refs #561). 
+
+2009-03-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/object/groupforumtopic.php: deleting discussions added 
+
+2009-03-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Closes #828: Array input values now trimmed
+  individually. 
+
+2009-03-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/languages/en.php: Wire lang string tweaked 
+
+2009-03-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/icon_bookmarkthis.gif, _graphics/icon_reportthis.gif: owner
+  block icons background color corrected for new theme 
+
+  	* .../views/default/riverdashboard/css.php: reply and delete button removed
+  on latest post on riverdashboard 
+
+  	* mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forum/topicposts.php,
+  .../views/default/reportedcontent/form.php,
+  views/default/comments/forms/edit.php, views/default/css.php: input/longtext
+  and remove editor link layout improved 
+
+2009-02-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Closes #665: Using a bit of preg callback magic to
+  do <wbr> encoding and href encoding in one pass. 
+
+  	* engine/lib/languages.php: Closes #824: $language is initialised 
+
+2009-02-28  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/river_widget/edit.php: activity widget default
+  tweaked 
+
+  	* mod/thewire/languages/en.php: the wire lang tweaked 
+
+  	* mod/thewire/views/default/object/thewire.php: the wire now uses name
+  rather than username 
+
+2009-02-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2009022701.php: Disabling updateclient on installs as
+  part of upgrade, this is because it is no longer included and can cause
+  problems. 
+
+2009-02-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/object/groupforumtopic.php: autop removed on fetching
+  group description for list view (to remove extraneous <br />) 
+
+  	* mod/groups/views/default/groups/forum_latest.php: clearfloat fixed 
+
+  	* mod/groups/views/default/groups/css.php,
+  .../views/default/object/groupforumtopic.php: groups latest discussion list
+  view timestamp moved/formatted 
+
+2009-02-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php: Removed email force from notification
+  emails 
+
+2009-02-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: groups widgets layout made
+  consistent 
+
+2009-02-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: enable/disable mods buttons layout tweaked 
+
+2009-02-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php: Corrected capitalisation, added
+  better description to 'add message' link 
+
+2009-02-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/footer_back.gif, _graphics/friends_picker_arrows.gif,
+  _graphics/icons/default/topbar.png, _graphics/owner_block_back.jpg,
+  _graphics/owner_block_menu_arrow.gif, _graphics/owner_block_menu_dot.gif,
+  _graphics/page_back_linen.gif, _graphics/page_back_linen_shadow.gif,
+  _graphics/skyscraper.gif, _graphics/spotlight_back.gif,
+  _graphics/thewire_speech_bubble.gif, _graphics/toolbar_arrow.png,
+  _graphics/toolbar_arrow_ie.gif, _graphics/tools_over.png,
+  mod/groups/graphics/defaultlarge.gif, mod/groups/graphics/defaultmedium.gif,
+  mod/groups/graphics/defaultsmall.gif, mod/groups/graphics/defaulttiny.gif,
+  mod/groups/views/default/groups/css.php,
+  mod/logbrowser/views/default/logbrowser/css.php,
+  .../views/default/notifications/css.php,
+  mod/profile/graphics/defaultlarge.gif, mod/profile/graphics/defaultlarge.jpg,
+  mod/profile/graphics/defaultmaster.gif,
+  mod/profile/graphics/defaultmaster.jpg,
+  mod/profile/graphics/defaultmedium.gif,
+  mod/profile/graphics/defaultmedium.jpg,
+  mod/profile/graphics/defaultsmall.gif, mod/profile/graphics/defaultsmall.jpg,
+  mod/profile/graphics/defaulttiny.gif, mod/profile/graphics/defaulttiny.jpg,
+  mod/profile/graphics/defaulttopbar.gif,
+  mod/profile/graphics/defaulttopbar.jpg,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php,
+  mod/profile/views/default/profile/css.php,
+  .../views/default/reportedcontent/css.php,
+  .../views/default/riverdashboard/css.php,
+  mod/thewire/graphics/thewire_speech_bubble.gif,
+  mod/thewire/views/default/thewire/css.php, views/default/css.php,
+  views/default/js/friendsPickerv1.php, views/default/js/initialise_elgg.php:
+  default theme changed 
+
+2009-02-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Bumped version number 
+
+2009-02-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/editpost.php,
+  mod/groups/views/default/forum/topicposts.php: forum post edit bug fixed 
+
+2009-02-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Deflation is now turned off by default because a version of
+  a certain majority-share browser really doesn't like it. 
+
+2009-02-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins.php: buttons moved 
+
+  	* views/default/admin/plugins.php: class names added to enable/disable
+  buttons 
+
+2009-02-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disableall.php, actions/admin/plugins/enableall.php,
+  engine/lib/plugins.php, languages/en.php, views/default/admin/plugins.php:
+  Enable all / disable all functionality added 
+
+2009-02-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/widgets/thewire/view.php: set a default num of
+  wire posts to appear on a widget 
+
+2009-02-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php,
+  mod/groups/actions/groupskillrequest.php, mod/groups/languages/en.php,
+  mod/groups/membershipreq.php, mod/groups/start.php,
+  .../views/default/groups/membershiprequests.php: Join request management
+  added. 
+
+2009-02-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/forms/guidtool/export.php,
+  mod/profile/views/default/profile/icon.php, views/default/input/access.php,
+  views/default/input/button.php, views/default/input/checkboxes.php,
+  views/default/input/email.php, views/default/input/hidden.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/plaintext.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/output/calendar.php, views/default/output/confirmlink.php,
+  views/default/output/email.php, views/default/output/pulldown.php,
+  views/default/output/tagcloud.php, views/default/output/tags.php,
+  views/default/output/text.php, views/default/output/url.php,
+  views/failsafe/input/button.php, views/failsafe/input/checkboxes.php,
+  views/failsafe/input/hidden.php, views/failsafe/input/text.php,
+  views/failsafe/messages/exceptions/exception.php: Closes #651: I agree,
+  changed to convert both quotes. 
+
+2009-02-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Added 'accept' to the language list 
+
+2009-02-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topicposts.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/riverdashboard/sitemessage.php, views/default/css.php,
+  views/default/js/initialise_elgg.php: generic reusable collapsible div added
+  (replacing manifest_file which is solely for admin plugins page) 
+
+2009-02-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/jsfuncs.php,
+  .../notifications/subscriptions/personal.php: Fixed checkboxes on the
+  notification screen. 
+
+  	* views/default/admin/plugins_opt/plugin.php: Plugin descriptions are now
+  displayed on the tool menu, for better ease of use. 
+
+2009-02-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, languages/en.php: Redirect to tools on first admin
+  login. 
+
+2009-02-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/newestmembers.php: members box fixed for
+  IE6&7 
+
+  	* mod/thewire/views/default/object/thewire.php: thewire user icon layout
+  fixed for IE / cross-browser consistency 
+
+2009-02-26  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/uservalidationbyemail/start.php: Event functions should return true to
+  prevent an event from being halted. Now this one does. 
+
+2009-02-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/members.php,
+  .../views/default/object/groupforumtopic.php,
+  views/default/canvas/layouts/sidebar_boxes.php: markup fixing / cleanup / ie6
+  fixes 
+
+2009-02-26  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/widgets.php: Fixes to container
+  permissions and widgets to allow default widgets to work with the Elgg
+  permissions system. 
+
+2009-02-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: The search endpoint can now be told to go fetch a users'
+  friends. 
+
+2009-02-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php:
+  enable/disable plugin actions now support arrays as parameters 
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/join.php,
+  mod/groups/actions/joinrequest.php: Closes #801, Refs #277: Group
+  join/request logic altered. 
+
+2009-02-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/thewire/profile_status.php: broken wire link fixed 
+
+2009-02-26  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topicposts.php: Gave each edit box a unique
+  ID 
+
+2009-02-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Small access tweak for sending notifications.
+
+  	* mod/groups/start.php: Fixed duplicate notifications. 
+
+  	* mod/groups/start.php: Fixed the first-post forum topic notification error.
+  Fixes #816 
+
+2009-02-26  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Added "enemies" code to get_access_sql_suffix. This
+  implements two features: a. a user can prevent another user from seeing any
+  of his content and b. a user can filter out all the content created by
+  another user.  There is no interface for this yet, but adding one should be
+  easy with this core support. 
+
+2009-02-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/object/thewire.php,
+  views/default/navigation/pagination.php: markup fixed for cross-browser
+  rendering consistency 
+
+2009-02-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php: Fixed pagination when filtering. 
+
+2009-02-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php: Closes #822: Action file existed however the action
+  was not registered (previously called directly) 
+
+  	* account/forgotten_password.php, account/register.php,
+  dashboard/latest.php, engine/lib/elgglib.php, entities/list.php,
+  friends/add.php, friends/collections.php, friends/edit.php,
+  friends/index.php, friends/of.php, index.php, install.php,
+  mod/notifications/groups.php, mod/notifications/index.php,
+  mod/reportedcontent/add.php, mod/riverdashboard/index.php: Closes #807:
+  Removed echo on page_draw() 
+
+2009-02-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/views/default/groups/find.php:
+  Corrected bad form action for group tag and made search label a little more
+  specific. 
+
+2009-02-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Refs #808: Bug was actually fixed by not using
+  empty... register_translations has to be in the wild otherwise install won't
+  load translation. 
+
+  	* engine/lib/languages.php: Closes #808: Removed register_translation from
+  the wild, now called on boot so that it is always after configuration_init 
+
+2009-02-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/longtext.php: output/longtext now parses URLs. 
+
+2009-02-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: small lang tweak 
+
+2009-02-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/js.php: Fixed river pagination issue 
+
+2009-02-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/languages/en.php: lang file replaced 
+
+  	* mod/riverdashboard/languages/en.php: missing lang string 
+
+2009-02-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Architectural version number change 
+
+2009-02-25  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/elgglib.php, languages/en.php: Added
+  friends access level 
+
+  	* actions/admin/site/update_basic.php, engine/lib/access.php,
+  engine/lib/users.php, languages/en.php, views/default/settings/system.php:
+  Introduces user default access. 
+
+2009-02-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Closes #800: Fixes typo 
+
+2009-02-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/forminternals.php,
+  views/default/friends/picker.php: Unicode character fix for friends picker.
+  Fixes #281 
+
+  	* mod/thewire/languages/en.php: SPG fix 
+
+  	* .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/groupsform.php,
+  .../notifications/subscriptions/personal.php: Removing the jumps on the
+  notification pickers. 
+
+  	* mod/groups/start.php: Removing the membership requests link for now. 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php,
+  mod/groups/views/default/groups/groupprofile.php: Removing an infinite loop
+  in groups. 
+
+  	* mod/groups/views/default/forms/groups/invite.php: The group invite friends
+  picker now correctly highlights friends' tabs 
+
+  	* engine/lib/metadata.php: Syntax improvements for the get_metadata
+  functions 
+
+  	* engine/lib/relationships.php: Fix for previous, including a change to
+  check_entity_relationships that actually returns the relationship object. 
+
+  	* engine/lib/relationships.php: Introducing the 'delete relationship' event.
+  Fixes #779 
+
+  	* mod/groups/languages/en.php: Defining grouptopic:blank; fixes #809 
+
+  	* engine/lib/notification.php: Notifications with nonexistent handlers no
+  longer throw an exception; they now write to the error log. Refs #754 
+
+  	* engine/lib/sessions.php: The session initialisation order is slightly
+  altered to allow for language setup on the index page. Fixes #803 
+
+  	* mod/groups/start.php: Group topics now have a friendlier URL. This will
+  help a lot for notifications. 
+
+  	* engine/lib/notification.php: Fixed error in notification procedure 
+
+  	* .../graphics/icon_notifications_web.gif: Removing web notification
+  graphic; will sit elsewhere. 
+
+2009-02-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../graphics/icon_notifications_web.gif: web notification icon added 
+
+2009-02-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/find.php: all groups search form 
+
+2009-02-24  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/user/requestnewpassword.php,
+  mod/uservalidationbyemail/languages/en.php: Attempts by unvalidated users to
+  login or request new passwords now trigger plugin hooks (if available) or
+  trigger the user validation event by default. Thus, in the default case, the
+  user will be remailed a validation link. Addresses part of
+  http://trac.elgg.org/elgg/ticket/759 . 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icondirect.php: Removing a minor simplecache debug message
+  that accidentally made it in. 
+
+  	* mod/profile/icon.php, mod/profile/icondirect.php: Default icons are
+  preserved. 
+
+2009-02-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/settings/riverdashboard/edit.php: you can now replace the
+  default dashboard with the new activity river, if required. 
+
+2009-02-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/search/startblurb.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php: search results formatted 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, _css/js.php, upgrade.php: CSS, JS, upgrade are marked as
+  external pages. 
+
+2009-02-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/groupprofile.php: groups:notfound:details
+  text string formatted 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/discussions.php, mod/groups/forum.php,
+  mod/groups/membership.php, mod/groups/topicposts.php: Group gatekeeper on
+  internal group pages. 
+
+  	* engine/lib/xml-rpc.php: Minor variable fix. Fixes #811 
+
+2009-02-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/delete.php: when deleting a group you now go back to
+  your groups 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: A further architecture update version increment. 
+
+2009-02-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/invite.php: invite friends to group
+  page modified 
+
+2009-02-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/widgets.php: Added fixes to
+  create_entity and add_widgets to correctly handle containers. 
+
+2009-02-24  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/thewire/profile_status.php: profile update wire tweaked 
+
+2009-02-24  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, engine/lib/elgglib.php,
+  mod/profile/icondirect.php: Made icon views work properly for non-default
+  icons, and introduced elgg_view_enable_simplecache and
+  elgg_view_disable_simplecache functions. 
+
+2009-02-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/thewire/profile_status.php: profile status update link
+  formatted 
+
+2009-02-23  kevinjardine <kevinjardine@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, engine/lib/configuration.php,
+  languages/en.php, mod/profile/icondirect.php, simplecache/view.php,
+  views/default/settings/system.php: Added the ability to turn simplecache on
+  and off. 
+
+2009-02-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/thewire/forms/add.php: post to wire from thewire
+  page styled 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: You should no longer get notified of your own topic
+  posts. 
+
+  	* engine/lib/elgglib.php: ACCESS_DEFAULT is now defined. 
+
+2009-02-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/views/default/thewire/forms/add.php: a tweak to the wire 
+
+  	* mod/thewire/actions/add.php, mod/thewire/everyone.php,
+  mod/thewire/index.php, mod/thewire/languages/en.php, mod/thewire/start.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  .../views/default/thewire/profile_status.php: new wire work 
+
+2009-02-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/profileitems.php: right_column changed from
+  class to id to match left_column 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php, mod/groups/views/rss/groups/profileitems.php:
+  Group RSS feed. 
+
+  	* mod/groups/views/rss/forum/topics.php: RSS fix for groups. 
+
+  	* engine/handlers/pagehandler.php: Removing the external definition from the
+  page handler again. 
+
+  	* engine/lib/annotations.php, mod/groups/start.php,
+  mod/groups/topicposts.php, mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/rss/forum/topicposts.php,
+  mod/groups/views/rss/forum/viewposts.php, views/rss/object/default.php: RSS
+  for group topics, including fixes for annotation getURL() override 
+
+2009-02-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/page_elements/elgg_topbar.php: top toolbar menu id changed to
+  class. messages div slide action in some browsers removed. 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/pagehandler.php: Further external marker on the
+  pagehandler for walledgarden 
+
+2009-02-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/editpost.php, mod/groups/start.php,
+  mod/groups/views/default/forum/topicposts.php: new group edit options on
+  discussion 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/xml-rpc_handler.php, index.php: Hook for better walled garden
+
+2009-02-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/editpost.php,
+  mod/groups/views/default/forum/topicposts.php: a couple more group comment
+  edit tweaks 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topicposts.php: Translating untranslated
+  string 
+
+2009-02-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/editpost.php,
+  mod/groups/views/default/forum/topicposts.php: small edit comment bug fixed 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Slight version change to represent architectural changes. 
+
+2009-02-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topics.php,
+  .../views/default/object/groupforumtopic.php: groups interface details
+  cleanup 
+
+2009-02-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, mod/groups/groupprofile.php: Introducing
+  group_gatekeeper() 
+
+  	* mod/thewire/languages/en.php: New post wire string 
+
+  	* views/failsafe/input/access.php: Introducing the access control to the
+  failsafe view. 
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/access.php, engine/lib/widgets.php, languages/en.php,
+  mod/profile/actions/edit.php, mod/profile/views/default/profile/edit.php,
+  views/default/input/access.php, views/default/settings/system.php,
+  views/failsafe/settings/system.php: Added site default access permissions.
+  Refs #744 
+
+2009-02-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topicposts.php: superfluous <p> tags
+  removed 
+
+2009-02-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: missing lang tweak 
+
+  	* mod/groups/views/default/forum/topics.php: new group discussion layout
+  tweaked to actually work 
+
+  	* mod/groups/actions/forums/addtopic.php, mod/groups/languages/en.php,
+  .../views/default/river/forum/topic/create.php: topic starting included in
+  river 
+
+2009-02-22  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/forum.php, mod/groups/languages/en.php,
+  .../views/default/object/groupforumtopic.php: new group discussion layout 
+
+  	* mod/groups/languages/en.php: tweaks to the group discussion lang 
+
+  	* mod/groups/forum.php: group forum posts are now displayed based on last
+  action 
+
+  	* mod/groups/actions/forums/deletepost.php,
+  mod/groups/actions/forums/editpost.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/views/default/forum/topicposts.php: users
+  can now edit and delete their forum comments 
+
+  	* mod/groups/actions/join.php, mod/groups/languages/en.php,
+  mod/groups/views/default/river/group/create.php: new join group river view
+  added 
+
+  	* mod/groups/actions/forums/addpost.php,
+  mod/groups/views/default/river/forum/create.php: new river view added for
+  group forum posts 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php,
+  .../views/default/riverdashboard/container.php,
+  .../views/default/riverdashboard/js.php,
+  .../views/default/riverdashboard/nav.php: Riverdashboard now loads tabs via
+  jQuery AJAX. 
+
+  	* .../notifications/subscriptions/forminternals.php,
+  views/default/friends/forms/edit.php, views/default/friends/picker.php: The
+  friends picker now highlights tabs when creating a collection if a user is
+  present there. Also, the separate friends picker in the notification plugin
+  is also now internationalised. 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/a_users_groups/view.php: groups widget class
+  added 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Correction for previous. 
+
+  	* mod/groups/start.php: Forum topic notifications fix. 
+
+  	* engine/lib/notification.php: Notification messages can be suppressed
+  programmatically. 
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/a_users_groups/view.php: group widget tweaked 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fixes an annoying problem in countAnnotations.
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: group email tweak to
+  include lang 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/defaultprofile.php: custom profile fields admin panel
+  formatted 
+
+  	* .../views/default/thewire/profile_status.php: brackets added around
+  timestamp 
+
+2009-02-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: isFriend() now retrieving userid correctly 
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/thewire/profile_status.php: profile status view tweaked 
+
+2009-02-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php: Closes #784: Action now checks that the
+  user is the logged in user's friend before invite. 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/usersettings/plugins_opt/plugin.php: configure tools page -
+  individual tools formatted 
+
+  	* .../views/default/widgets/river_widget/view.php: activity widget interface
+
+  	* views/default/spotlight/default.php: formatted spotlight footer 
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/listing.php: status moved on member
+  listings 
+
+2009-02-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/membershipreq.php,
+  mod/groups/start.php: Placeholder for future work (refs #277) 
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php: tweak to the add to wire action to make sure
+  forward takes the user to the correct place 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/grouplisting.php: group details
+  containerised 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Removing unnecessary mod_rewrite rule 
+
+  	* languages/en.php, views/default/friends/picker.php: The friends picker can
+  now be internationalized, also allows you to view users whose usernames don't
+  begin with a letter in the char array. 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/river_widget/edit.php: riverdash activity widget
+  edit panel formatted 
+
+  	* mod/thewire/views/default/widgets/thewire/view.php: empty <p> tags causing
+  issues removed 
+
+  	* mod/groups/views/default/forms/groups/edit.php: button floated and cleared
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/spotlight/default.php: Went in to decapitalise "intranet",
+  ended up making the text hopefully more immediate. 
+
+2009-02-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/edit.php: delete group button moved
+  into own area 
+
+  	* mod/groups/views/default/forms/forums/addtopic.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/side_menu.php: group areas interfacing 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/plugins.php, admin/site.php, admin/statistics.php, admin/user.php,
+  views/default/page_elements/owner_block.php: Removed unnecessary owner
+  blocks. 
+
+2009-02-20  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/spotlight/default.php: new spotlight contents 
+
+2009-02-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/messages/exceptions/exception.php: Minor improvement to
+  exception message 
+
+  	* views/default/messages/exceptions/exception.php: Minor improvement to
+  exception message 
+
+  	* engine/lib/elgglib.php, views/default/messages/exceptions/exception.php:
+  Closes #487: Removed superfluous page_draw from exception view. 
+
+2009-02-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, engine/lib/river2.php: Added some documentation to
+  the river functions. 
+
+2009-02-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apiadmin/manifest.xml, mod/crontrigger/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/garbagecollector/manifest.xml,
+  mod/groups/manifest.xml, mod/guidtool/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/notifications/manifest.xml, mod/profile/manifest.xml,
+  mod/reportedcontent/manifest.xml, mod/thewire/manifest.xml,
+  mod/uservalidationbyemail/manifest.xml: Updated core module manifests to
+  contain today's build number. Refs #394 
+
+  	* mod/riverdashboard/manifest.xml: Closes #795: Added manifest to
+  riverdashboard 
+
+  	* mod/groups/languages/en.php: Closes #798: Fixing language definition which
+  somehow got clobbered. Nice spot! 
+
+  	* engine/lib/entities.php: Fixes warning messages on disable or delete for
+  times when an entity has no sub items. 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river2.php, .../views/default/widgets/river_widget/view.php,
+  views/default/river/item/list.php: Pagination is now optional on river lists;
+  is removed on the river widget 
+
+  	* engine/lib/river2.php: Friends river no longer shows your own stuff. 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/edit.php: missing wrapper added 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/forum.php: Added a title to group forum topics. Fixes #603 
+
+  	* mod/groups/membership.php: For now, the group membership page is
+  protected, although eventually this should get its own profile dropdown menu.
+  Fixes #605 
+
+2009-02-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/profileitems.php: groups interface updated 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: An alternative template handler will now be sought
+  by elgg_view by default. Fixes #768 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/find.php,
+  mod/groups/views/default/groups/side_menu.php: all groups submenu tweaked 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php: A lighter way to detect if the db has been
+  installed. Fixes #791 
+
+2009-02-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/featured.php: featured groups sidebar styled 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixed parameter errors in site-related functions.
+  Fixes #793 
+
+  	* mod/profile/icondirect.php: Better unicode patching for icons. Fixes #789 
+
+2009-02-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Updated version number to today's build 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php: small tweak to popular groups 
+
+  	* mod/groups/all.php: it is now possible to list groups by most popular 
+
+  	* views/default/page_elements/header.php,
+  views/default/page_elements/header_contents.php,
+  views/default/pageshells/pageshell.php: the header has been split out so that
+  theme authors can target the header output without worrying about overwriting
+  the whole header file. 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Introduced get / list entities by
+  relationship count 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/thewire/actions/add.php, mod/thewire/actions/delete.php,
+  mod/thewire/add.php, mod/thewire/everyone.php,
+  mod/thewire/graphics/thewire_speech_bubble.gif, mod/thewire/index.php,
+  mod/thewire/languages/en.php, mod/thewire/manifest.xml,
+  mod/thewire/readme.txt, mod/thewire/start.php,
+  mod/thewire/views/default/object/thewire.php,
+  .../views/default/river/object/thewire/create.php,
+  .../views/default/thewire/activity_view.php,
+  mod/thewire/views/default/thewire/css.php,
+  mod/thewire/views/default/thewire/forms/add.php,
+  mod/thewire/views/default/thewire/notfound.php,
+  .../views/default/thewire/profile_status.php,
+  .../views/default/thewire/scripts/counter.js,
+  mod/thewire/views/default/thewire/view.php,
+  mod/thewire/views/default/widgets/thewire/edit.php,
+  mod/thewire/views/default/widgets/thewire/view.php: the wire has been moved
+  to core as it now powers profile status and status on member search 
+
+  	* mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php, mod/activity/manifest.xml,
+  mod/activity/opendd.php, mod/activity/start.php,
+  mod/activity/views/default/activity/css.php,
+  mod/activity/views/default/activity/dashboard.php,
+  mod/activity/views/default/activity/offset.php,
+  mod/activity/views/default/activity/wrapper.php,
+  .../views/default/settings/activity/edit.php,
+  mod/activity/views/opendd/activity/dashboard.php, mod/river/languages/en.php,
+  mod/river/manifest.xml, mod/river/start.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/edit.php,
+  .../default/widgets/river_widget_friends/view.php: old activity and river
+  removed 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist, .../views/default/apiadmin/forms/add_key.php,
+  mod/apiadmin/views/default/object/api_key.php,
+  .../views/default/diagnostics/forms/download.php,
+  mod/groups/actions/join.php, mod/profile/defaultprofile.php,
+  .../views/default/profile/editdefaultprofile.php,
+  .../views/default/profile/menu/adminlinks.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/object/default.php: Repointed actions/ to action/ in all views
+  and removed actions/* from the action handler. 
+
+2009-02-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php: Removed some bad links on
+  actions 
+
+  	* engine/lib/languages.php: Fixed strange infinite loop on language loading.
+
+  	* engine/lib/languages.php: Removed @ from register translation include_once
+
+  	* engine/lib/plugins.php, languages/en.php,
+  views/default/admin/plugins_opt/plugin.php: Closes #394: May now specify
+  elgg_version in the manifest to specify a minimum version of elgg required. 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/canvas_header/submenu_template.php:
+  delete confirmation added to delete pages 
+
+  	* .../views/default/riverdashboard/sitemessage.php: input view changed on
+  site messages 
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/edit.php: warning applied to group
+  deletion 
+
+  	* mod/groups/edit.php: title tweaked 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fix for user object counting with upper and lower
+  time limits. 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: missing lang file 
+
+  	* views/default/page_elements/owner_block.php: ownerblock tweak 
+
+2009-02-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/users.php, languages/en.php:
+  Introducing archive functionality. 
+
+2009-02-19  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/river/sitemessage/create.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php: new river widget 
+
+2009-02-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_toolbar_logo.gif: updated elgg toolbar logo 
+
+2009-02-18  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/featured.php: missing id applied 
+
+  	* mod/groups/actions/featured.php, mod/groups/all.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/grouplisting.php: admins can highlight
+  featured groups 
+
+2009-02-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/find.php: sidebar forms styled 
+
+2009-02-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/start.php: Closes #790: Removed @ before
+  include statements. 
+
+2009-02-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/item/list.php: forward and back text added 
+
+  	* mod/profile/defaultprofile.php: reset button wrapped 
+
+  	* .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  views/default/river/item/list.php: pagination on river fixed / styled, and
+  site message styled 
+
+2009-02-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Helping plugin developers by no longer suppressing
+  parsing errors in plugins. 
+
+2009-02-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/start.php: Fix for previous 
+
+  	* mod/riverdashboard/start.php: Riverdashboard registers an init event
+  handler now ..... 
+
+2009-02-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php, mod/groups/views/default/groups/find.php: style
+  applied 
+
+2009-02-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/all.php, mod/groups/views/default/groups/side_menu.php: more
+  more all groups tweak 
+
+  	* mod/groups/all.php, mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/groups/featured.php,
+  mod/groups/views/default/groups/find.php,
+  .../views/default/groups/group_sort_menu.php,
+  mod/groups/views/default/groups/grouplisting.php: new all groups view 
+
+  	* mod/profile/views/default/profile/userdetails.php: bug fixed in profile
+  status 
+
+  	* views/default/river/item/wrapper.php: river view altered 
+
+2009-02-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/widgets/wrapper.php: Closes #763: A
+  message is now displayed for widgets belonging to disabled plugins explaining
+  what has happened. 
+
+2009-02-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/css.php: css added to sep file 
+
+2009-02-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/riverdashboard/welcome.php: welcome message tweaked 
+
+  	* mod/riverdashboard/actions/add.php, mod/riverdashboard/actions/delete.php,
+  mod/riverdashboard/languages/en.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/sitemessage.php: simple site message added 
+
+  	* mod/groups/views/default/groups/profileitems.php: removed a redundant view
+
+2009-02-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php, mod/groups/languages/en.php,
+  .../views/default/groups/closedmembership.php: Closes #786: Only basic
+  profile information provided to non-joined users of closed groups. 
+
+2009-02-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/listing.php: entity passed to status
+  view 
+
+2009-02-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/css.php,
+  .../views/default/riverdashboard/nav.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php, views/default/css.php,
+  views/default/friends/collectiontabs.php: interface updated, markup tweaked
+  etc 
+
+2009-02-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/listing.php: new status view created
+  that can be extended 
+
+2009-02-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/start.php: Added some very basic page load
+  profiling. 
+
+  	* engine/lib/elgglib.php: Closes #785: datalists now pulls all settings on
+  first item load. 
+
+  	* engine/start.php: Closes #783: Initial cache write on start now checks
+  whether elgg has been fully installed before proceeding. 
+
+2009-02-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: new view added to allow
+  status plugins to extend and display as part of the profile block 
+
+2009-02-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icondirect.php: Icondirect now falls back on the cached
+  default view 
+
+  	* mod/profile/start.php: Icon default views are now registered as cached 
+
+  	* views/default/input/plaintext.php: Introducing input/plaintext. 
+
+2009-02-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/viewtype.php: loose page elements wrapped in
+  container div 
+
+2009-02-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/start.php, upgrade.php: A little more
+  flexibility for the simplecache. 
+
+2009-02-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Short circuit get entity on impossible values,
+  saving two db queries per page 
+
+2009-02-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, _css/js.php, engine/lib/elgglib.php, engine/start.php,
+  simplecache/view.php, views/default/page_elements/header.php: Views
+  simplecache improvements. 
+
+2009-02-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/footer.php: another view added for analytics
+  which plugins can extend 
+
+  	* views/default/page_elements/footer.php: footer links replaced by a view
+  which plugins can extend 
+
+2009-02-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Removed select_default_memcache as this was not
+  used. 
+
+  	* engine/lib/languages.php, engine/lib/sessions.php, engine/start.php,
+  version.php: Closes #429: Language loading now no longer loads all possible
+  translations - only english + user's preferred language/site preference 
+
+2009-02-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/usersettings.php, languages/en.php,
+  mod/profile/views/default/profile/userdetails.php,
+  views/default/friends/collections.php, views/default/friends/forms/edit.php,
+  views/default/friends/tablelist.php: theme updates 
+
+2009-02-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/reorder.php: Simplecache improvements. 
+
+  	* _css/css.php, _css/js.php, engine/lib/elgglib.php, engine/start.php,
+  mod/profile/start.php, mod/profile/views/default/profile/metatags.php,
+  simplecache/view.php, upgrade.php, views/default/page_elements/header.php:
+  Committing the simplecache for views. 
+
+2009-02-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collections.php: removed broken expand all link and
+  js 
+
+2009-02-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/admin/plugins_opt/plugin.php: Closes #777:
+  Plugin version now displayed under "more info" link in plugin admin settings.
+
+2009-02-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: latest activity link removed as it will be
+  replaced by a full activity stream 
+
+  	* views/default/admin/statistics.php: removed redundant stats info 
+
+2009-02-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/usersettings/form.php: user settings style brought in line
+  with other settings pages 
+
+2009-02-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/forum_latest.php: removed the dropdown
+  menu from forum latest view on group profiles 
+
+  	* mod/groups/start.php: allow users to put a widget of their groups on their
+  dashboard as well as profile. 
+
+  	* mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/profileitems.php: group homepage forum view
+  tweaked 
+
+2009-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Fixes #778. Thanks! 
+
+2009-02-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/apiadmin/forms/add_key.php,
+  mod/apiadmin/views/default/object/api_key.php, mod/diagnostics/index.php,
+  .../views/default/diagnostics/forms/download.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/groupsform.php,
+  mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  views/default/admin/plugins.php, views/default/admin/site.php,
+  views/default/admin/statistics.php, views/default/admin/user.php,
+  views/default/usersettings/form.php, views/default/usersettings/plugins.php:
+  css classname cleanup, prep for v1.5 default theme 
+
+2009-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river2.php, views/default/river/item/list.php: Simple river
+  pagination. 
+
+2009-02-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php,
+  .../views/default/riverdashboard/newestmembers.php,
+  .../views/default/riverdashboard/sitemessage.php,
+  .../views/default/riverdashboard/welcome.php: new views for riverdashboard 
+
+2009-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php, views/default/css.php,
+  views/default/js/initialise_elgg.php: Moved plugin settings so they're more
+  obvious. 
+
+2009-02-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Fixed logic bug in login() 
+
+  	* engine/schema/upgrades/2009021301.sql, mod/groups/actions/edit.php,
+  mod/groups/languages/en.php, mod/groups/views/default/forms/groups/edit.php,
+  version.php: Closes #761, #718: Group permissions now made much much simpler.
+
+2009-02-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/comments/add.php, views/default/annotation/annotate.php: new
+  annotations activity view 
+
+2009-02-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/edit.php,
+  .../views/default/forms/guidtool/format.php,
+  .../views/default/forms/guidtool/import.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/comments/forms/edit.php, views/default/export/entity.php: loose
+  text strings cleaned up, extra container divs added 
+
+2009-02-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/index.php: changed the activity view 
+
+2009-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/riverdashboard/languages/en.php,
+  .../views/default/riverdashboard/nav.php: Language updates to river dashboard
+
+  	* mod/riverdashboard/index.php, .../views/default/riverdashboard/nav.php:
+  Added better content filtering for dashboard 
+
+  	* mod/riverdashboard/index.php, mod/riverdashboard/start.php,
+  .../views/default/riverdashboard/nav.php: New river dashboard. 
+
+  	* engine/lib/river2.php: Removing an erroneous system_message call. 
+
+  	* engine/lib/river2.php: Data sanitisation fix. 
+
+2009-02-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/sidebar_boxes.php, views/default/css.php: new
+  layout canvas 
+
+2009-02-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Added lazy database connections to delay
+  establishing the db link until actually required - will allow for future
+  lite/static content endpoints that bypass db connections and session
+  creation. 
+
+  	* engine/lib/elgglib.php: Closes #769: Added short circuit to quit function
+  if entity is null. 
+
+  	* engine/lib/elgglib.php: Closes #772: $value no longer being incorrectly
+  set when memcache is enabled. 
+
+2009-02-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: A correction to the way attributes are set for
+  extenders. 
+
+  	* languages/en.php: New base translation word: publish 
+
+  	* engine/schema/mysql.sql: Schema fix 
+
+  	* engine/lib/entities.php: Clear river items on entity delete 
+
+  	* engine/lib/river2.php: A minor stabilisation change for river2 
+
+  	* engine/lib/river2.php: A minor stabilisation change for river2 
+
+2009-02-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/kses/kses.php: Refs #561: Removed &amp encoding from kses but
+  retaining script input and entities. 
+
+2009-02-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river2.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2009021201.sql, version.php,
+  views/default/river/item/list.php, views/default/river/item/wrapper.php:
+  Alternative river system trial. This is a test. 
+
+2009-02-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Avoiding wsod for deleted users 
+
+2009-02-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/views/default/activity/offset.php: div cleared after
+  pagination for theme compatability 
+
+2009-02-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/activity.php: 
+
+  	* mod/groups/languages/en.php: Added some missing translations 
+
+  	* crontab.example: Added links to better documentation 
+
+  	* engine/lib/input.php: Closes #684: Scratching a particular itch of mine by
+  no longer hiding urls when converting them to active links. This issue has
+  caused many a headache. The url is now preserved but with a <wbr /> inserted
+  after every /, this lets long urls be wrapped without breaking the url. 
+
+2009-02-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Removing wildcard from the beginning of 'like'
+  search for user/username 
+
+2009-02-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/activity.php: Filtering on type,subtype and event 
+
+  	* engine/lib/activity.php, engine/lib/river.php, mod/activity/start.php:
+  Relocation of activity database queries to the core. 
+
+2009-02-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/plugins.php, admin/plugins/index.php, admin/site.php,
+  admin/site/index.php, admin/statistics.php, admin/statistics/index.php,
+  admin/user.php, admin/user/index.php, engine/lib/admin.php: Cleaned up the
+  admin directory using a pagehandler. 
+
+  	* languages/en.php, settings/plugins.php: Minor confusion clearups 
+
+  	* views/default/output/calendar.php, views/default/output/confirmlink.php,
+  views/default/output/email.php, views/default/output/longtext.php,
+  views/default/output/pulldown.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php: Closes #756: htmlentities on all output forms 
+
+  	* mod/profile/views/default/profile/userdetails.php: XSS filtering on output
+
+  	* engine/lib/input.php: Refs #561: Split filtering into separate function 
+
+2009-02-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icondirect.php, mod/profile/start.php: Speedy icon bypass. 
+
+2009-02-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/views/default/activity/dashboard.php: add a view to site wide
+  activity that can be extended by the wire 
+
+2009-02-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Further changes to the notification
+  mechanism. 
+
+2009-02-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Closes #757: Removed strtolower as it is not UTF8
+  safe. See http://www.phpwact.org/php/i18n/utf-8 for further discussion. 
+
+  	* views/default/input/access.php, views/default/input/email.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/pulldown.php: Refs
+  #756: htmlentities on all input views 
+
+  	* mod/activity/all.php, mod/activity/index.php: Marcus Povey
+  <marcus@elgg.com> * Pagination not displayed when no activity present *
+  OpenDD link for your activity now functioning 
+
+2009-02-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/collections.php: Fixed 'all friends'
+  button. 
+
+2009-02-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/edit_layout.php: new edit canvas layout 
+
+2009-02-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php, mod/groups/views/default/forms/groups/edit.php:
+  Closes #752: Delete move to edit, making it less fatal. Probably needs
+  skinning. 
+
+2009-02-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/notification.php,
+  mod/groups/start.php: A single notification is now sent out on forum topic
+  creation.  This also contains an update to $entity->countAnnotations, which
+  no longer requires you to specify the annotation type. 
+
+  	* engine/lib/notification.php: Notification fix: you no longer get
+  notifications on your own content. 
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: Introducing group forum
+  notifications 
+
+2009-02-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #640: Entity disable now recursive 
+
+  	* mod/groups/actions/delete.php, mod/groups/languages/en.php,
+  mod/groups/start.php: Closes #282, Refs #640: Group deletion enabled. TODO:
+  Suggested enhancement #752 
+
+2009-02-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Added the 'annotate' event on entities. 
+
+  	* .../notifications/subscriptions/collections.php: Minor display fix. 
+
+  	* mod/notifications/actions/save.php: Group notification settings now save
+  properly 
+
+  	* engine/lib/relationships.php: Added a new filter to delete relationship
+  functions 
+
+2009-02-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #640, #282: Recursive deletion of owned and
+  contained entities. 
+
+  	* .../views/default/profile/menu/adminlinks.php: Closes #223: Admin options
+  now use output/confirmlink 
+
+  	* mod/guidtool/actions/delete.php, mod/guidtool/languages/en.php,
+  mod/guidtool/start.php, mod/guidtool/views/default/guidtool/listing.php: Refs
+  #492: Export and delete links next to entity 
+
+2009-02-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Extra security for object notifications. 
+
+  	* mod/notifications/actions/groupsave.php,
+  mod/notifications/actions/save.php, mod/notifications/groups.php,
+  mod/notifications/languages/en.php, mod/notifications/start.php,
+  .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/groupsform.php: Group notifications, all
+  friends notification option 
+
+2009-02-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Couple of extra words 
+
+  	* languages/en.php, views/default/output/confirmlink.php: Added default to
+  confirm link. 
+
+2009-02-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/views/default/activity/css.php,
+  mod/activity/views/default/activity/offset.php: pagination on activity stream
+  added 
+
+2009-02-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Closes #584: Removed exception, get_user will now
+  return false if GUID exists but is not a user. This probably makes more sense
+  as Exceptions should probably be reserved for major Ooopses.  The error in
+  this bug was caused by this exception being thrown and not caught in the
+  access group handler. This may have been the cause of a number of group
+  related / permission related errors. 
+
+  	* engine/lib/users.php: Refs #584: Fixed error message. 
+
+  	* engine/lib/entities.php: Closes #720: setCalendarTimeAndDuration() now
+  saves end time correctly. 
+
+2009-02-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/members.php: drop down menu removed from
+  members avatars on the group home page. You can change this back by removing
+  'override' => 'true' 
+
+  	* mod/groups/languages/en.php,
+  .../views/default/river/object/group/create.php,
+  .../river/object/groupforumtopic/annotate.php,
+  .../river/object/groupforumtopic/create.php,
+  .../river/object/groupforumtopic/update.php,
+  .../default/river/relationship/member/create.php: new river views added to
+  groups 
+
+  	* mod/activity/views/default/activity/css.php,
+  .../river/user/default/profileiconupdate.php: profile icon added to change
+  river view and css added to activity 
+
+  	* mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php,
+  mod/activity/views/default/activity/offset.php: small additions to the
+  activity view 
+
+  	* mod/notifications/manifest.xml: manifest file added to notifications 
+
+2009-02-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/languages/en.php,
+  .../notifications/subscriptions/collections.php: Language and UI changes for
+  the notifications plugin. 
+
+2009-02-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/notifications/css.php: styles for notifications 
+
+2009-02-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../notifications/subscriptions/collections.php: Javascript just about
+  beaten into submission. Viewers of the public SVN, I apologise for clogging
+  up the history view.  Here's a joke by way of penance: 
+
+  	* mod/notifications/actions/save.php: Save action corrections 
+
+  	* .../notifications/subscriptions/collections.php: An attempt at fixing the
+  toggle issue 
+
+  	* .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/personal.php: Notification settings. Still
+  not right though .. 
+
+  	* .../notifications/subscriptions/collections.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/personal.php: More notification settings
+  work. 
+
+  	* .../notifications/subscriptions/collections.php: Notification icons work
+  properly when selecting / deselecting a friends collection. 
+
+  	* mod/notifications/languages/en.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/personal.php: Friends collections work 
+
+2009-02-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/river_icons/river_icon_pages.gif,
+  _graphics/river_icons/river_icon_thewire.gif: icons for river added 
+
+  	* mod/activity/views/default/activity/css.php: updated activity css 
+
+2009-02-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Added digits to pagehandler rewrite rule. Fixes #741 
+
+  	* mod/notifications/actions/save.php,
+  .../notifications/subscriptions/collections.php: Friends collections
+  preferences are saved 
+
+  	* mod/notifications/languages/en.php,
+  .../notifications/subscriptions/collections.php: Collections titles 
+
+  	* .../views/default/notifications/css.php,
+  .../notifications/subscriptions/collections.php: Access collections toggle
+  beginnings 
+
+  	* mod/notifications/actions/save.php, mod/notifications/languages/en.php,
+  mod/notifications/start.php, .../views/default/notifications/css.php,
+  .../notifications/settings/usersettings.php,
+  .../notifications/subscriptions/collections.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php,
+  .../notifications/subscriptions/personal.php: Further notification settings
+  changes. 
+
+  	* mod/notifications/actions/save.php,
+  .../graphics/icon_notifications_email.gif,
+  mod/notifications/languages/en.php, mod/notifications/start.php,
+  .../views/default/notifications/css.php,
+  .../default/notifications/subscriptions/form.php,
+  .../notifications/subscriptions/forminternals.php: Fitter, happier, more
+  productive notifications plugin. 
+
+  	* engine/lib/notification.php: Belts and braces with notifications 
+
+  	* engine/lib/access.php: Minor change to access SQL. Fixes #687 
+
+  	* htaccess_dist: Further htaccess change 
+
+  	* htaccess_dist: htaccess update 
+
+  	* mod/profile/start.php: Added profile updates to the notification handler 
+
+2009-02-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/json/api/output.php: API results now JSON export properly. Refs #716
+
+  	* views/json/canvas/default.php, views/json/export/entity.php,
+  views/json/export/metadata.php, views/json/export/relationship.php,
+  views/json/group/default.php, views/json/messages/exceptions/exception.php,
+  views/json/object/default.php, views/json/pageshells/pageshell.php,
+  views/json/search/entity_list.php, views/json/site/default.php,
+  views/json/user/default.php: JSON feeds now work. Fixes #716 
+
+  	* engine/lib/access.php, engine/lib/notification.php: Access improvements on
+  granular notifications 
+
+  	* languages/en.php: DB credentials are no longer unnecessarily revealed on
+  failure to connect. Fixes #723 
+
+  	* CONTRIBUTORS.txt: Contributors patch 
+
+  	* mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/languages/en.php:
+  Added plugin hook triggers to reportedcontent plugin. Fixes #725 
+
+  	* views/default/input/button.php: Added class to input/button. Fixes #618 
+
+  	* mod/groups/views/default/forum/viewposts.php: Added pagination to group
+  topic posts. Fixes #704 
+
+  	* entities/index.php: Added unique title tags to the entity browser. Fixes
+  #722 
+
+  	* CONTRIBUTORS.txt, htaccess_dist, views/default/output/tags.php: Tag URLs
+  now conform to the microformats specification. Fixes #729 
+
+  	* CONTRIBUTORS.txt: Minor changes to contrib file 
+
+2009-02-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: tweaks to the contributors file 
+
+2009-02-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/entities.php, engine/lib/group.php,
+  engine/lib/metadata.php, engine/lib/plugins.php, engine/lib/system_log.php,
+  engine/lib/tags.php, engine/lib/users.php, engine/lib/widgets.php,
+  engine/start.php, languages/en.php, mod/apiadmin/actions/generate.php,
+  mod/groups/actions/edit.php, mod/groups/views/default/forms/groups/edit.php,
+  mod/profile/actions/edit.php, mod/profile/views/default/profile/edit.php,
+  mod/reportedcontent/actions/add.php,
+  .../views/default/reportedcontent/form.php: Moves access permissions
+  references over to using the ACCESS_* constants defined in access.php. Refs
+  #687 
+
+  	* engine/lib/access.php, engine/lib/elgglib.php: Moved the access constant
+  definitions from access.php to elgglib.php, so they'll be loaded initially. 
+
+  	* engine/lib/users.php: When a new password is generated, the salt is now
+  regenerated first. Fixes #726. 
+
+2009-02-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Corrected pagination limit error.
+
+  	* engine/lib/elgglib.php, views/default/embed/addcontentjs.php,
+  views/default/embed/js.php: Elgg Javascript update content function 
+
+2009-02-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: ticket #728 dealt with 
+
+  	* mod/groups/views/default/groups/members.php: changed the number of group
+  members to display on group frontpages from 9999 to 10 (This should become
+  configurable) 
+
+  	* engine/lib/entities.php: patch number #724 applied 
+
+2009-02-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/useradd.php, languages/en.php: Users are now notified when an
+  account has been created for them on a site. 
+
+2009-02-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed bug in get_entities allowing for multiple
+  subtypes. 
+
+2009-02-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/forums/addtopic.php: removed redundant post
+  options 
+
+2009-01-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Moving over to use file_exists to check for
+  default entity icons, which should be lighter to load and produce fewer
+  errors. 
+
+2009-01-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php: Tentatively downgraded version requirement. 
+
+2009-01-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: notify_user now traps exceptions and logs
+  them. 
+
+2009-01-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Change to notification object registration
+  function. 
+
+2009-01-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/friends/picker.php: friendspicker /
+  collections updated to work with more than 12+ friends per pane 
+
+2009-01-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: tweak to banned user 
+
+  	* views/default/admin/statistics.php: small admin tweak 
+
+2009-01-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Added container_guid to ElggEntity->save() and
+  update_entity() functions. Fixes #711 
+
+  	* engine/lib/elgglib.php: Moving actions into the boot event. 
+
+2009-01-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Moved actions out of init files 
+
+  	* engine/lib/notification.php: Added object notifications plugin hook
+  override. 
+
+  	* engine/lib/annotations.php: Fixed pagination issue with count annotations
+  function. 
+
+2009-01-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Fixes #709: get_language() now fails correctly.
+  @ben Why is this introduced? Surely this is the same as
+  get_current_language()? 
+
+2009-01-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Fixing access controls on multi-metadata 
+
+2009-01-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Refs #706: Copyright in readme 
+
+  	* views/default/admin/plugins_opt/plugin.php: Support for people who can't
+  spell 
+
+  	* _css/css.php, account/forgotten_password.php, account/register.php,
+  actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  actions/admin/plugins/reorder.php, actions/admin/site/update_basic.php,
+  actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  actions/admin/user/resetpassword.php, actions/admin/user/unban.php,
+  actions/comments/add.php, actions/comments/delete.php,
+  actions/email/save.php, actions/entities/delete.php, actions/friends/add.php,
+  actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/editcollection.php, actions/friends/remove.php,
+  actions/import/opendd.php, actions/login.php, actions/logout.php,
+  .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/systemsettings/install.php,
+  actions/user/language.php, actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, actions/usersettings/save.php, actions/widgets/add.php,
+  actions/widgets/reorder.php, actions/widgets/save.php, admin/index.php,
+  admin/plugins/index.php, admin/site/index.php, admin/statistics/index.php,
+  admin/user/index.php, dashboard/index.php, dashboard/latest.php,
+  engine/handlers/action_handler.php, engine/handlers/cron_handler.php,
+  engine/handlers/pagehandler.php, engine/handlers/xml-rpc_handler.php,
+  engine/lib/access.php, engine/lib/actions.php, engine/lib/admin.php,
+  engine/lib/annotations.php, engine/lib/api.php, engine/lib/cache.php,
+  engine/lib/calendar.php, engine/lib/configuration.php, engine/lib/cron.php,
+  engine/lib/database.php, engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/lib/exceptions.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/filestore.php, engine/lib/group.php, engine/lib/input.php,
+  engine/lib/install.php, engine/lib/languages.php, engine/lib/location.php,
+  engine/lib/memcache.php, engine/lib/metadata.php, engine/lib/metastrings.php,
+  engine/lib/notification.php, engine/lib/objects.php, engine/lib/opendd.php,
+  engine/lib/pagehandler.php, engine/lib/pageowner.php, engine/lib/pam.php,
+  engine/lib/ping.php, engine/lib/plugins.php, engine/lib/query.php,
+  engine/lib/relationships.php, engine/lib/river.php, engine/lib/sessions.php,
+  engine/lib/sites.php, engine/lib/social.php, engine/lib/statistics.php,
+  engine/lib/system_log.php, engine/lib/tags.php, engine/lib/users.php,
+  engine/lib/usersettings.php, engine/lib/version.php, engine/lib/widgets.php,
+  engine/lib/xml-rpc.php, engine/lib/xml.php, engine/schema/mysql.sql,
+  engine/start.php, entities/index.php, entities/list.php, friends/add.php,
+  friends/collections.php, friends/edit.php, friends/index.php, friends/of.php,
+  friends/pickercallback.php, htaccess_dist, index.php, install.php,
+  mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php, mod/activity/manifest.xml,
+  mod/activity/opendd.php, mod/activity/start.php,
+  mod/activity/views/default/activity/css.php,
+  mod/activity/views/default/activity/wrapper.php, mod/apiadmin/index.php,
+  mod/apiadmin/languages/en.php, mod/apiadmin/manifest.xml,
+  mod/apiadmin/start.php, mod/crontrigger/manifest.xml,
+  mod/crontrigger/start.php, mod/diagnostics/actions/download.php,
+  mod/diagnostics/index.php, mod/diagnostics/languages/en.php,
+  mod/diagnostics/manifest.xml, mod/diagnostics/start.php,
+  .../views/default/diagnostics/forms/download.php,
+  mod/garbagecollector/languages/en.php, mod/garbagecollector/manifest.xml,
+  mod/garbagecollector/start.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/edit.php, mod/groups/actions/forums/addpost.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletepost.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/actions/join.php,
+  mod/groups/actions/joinrequest.php, mod/groups/actions/leave.php,
+  mod/groups/addtopic.php, mod/groups/all.php, mod/groups/discussions.php,
+  mod/groups/edit.php, mod/groups/edittopic.php, mod/groups/forum.php,
+  mod/groups/graphics/icon.php, mod/groups/groupprofile.php,
+  mod/groups/index.php, mod/groups/invite.php, mod/groups/languages/en.php,
+  mod/groups/manifest.xml, mod/groups/membership.php, mod/groups/new.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/group/group.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  mod/groups/views/default/groups/members.php,
+  mod/groups/views/default/groups/profileitems.php,
+  .../views/default/object/groupforumtopic.php,
+  .../default/river/relationship/member/create.php,
+  mod/groups/views/default/sharing/invite.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php,
+  mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/profileitems.php, mod/guidtool/export.php,
+  mod/guidtool/format_picker.php, mod/guidtool/import.php,
+  mod/guidtool/index.php, mod/guidtool/languages/en.php,
+  mod/guidtool/manifest.xml, mod/guidtool/start.php, mod/guidtool/view.php,
+  .../views/default/forms/guidtool/export.php,
+  .../views/default/forms/guidtool/format.php,
+  .../views/default/forms/guidtool/import.php,
+  mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php,
+  mod/guidtool/views/default/guidtool/profile.php,
+  .../views/default/object/guidtoolwrapper.php, mod/logbrowser/index.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/manifest.xml,
+  mod/logbrowser/start.php, mod/logbrowser/views/default/object/logwrapper.php,
+  mod/logrotate/languages/en.php, mod/logrotate/manifest.xml,
+  mod/logrotate/start.php, mod/profile/actions/cropicon.php,
+  mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/edit.php, mod/profile/actions/editdefault.php,
+  mod/profile/actions/iconupload.php,
+  mod/profile/actions/resetdefaultprofile.php, mod/profile/defaultprofile.php,
+  mod/profile/edit.php, mod/profile/editicon.php, mod/profile/icon.php,
+  mod/profile/index.php, mod/profile/javascript.php, mod/profile/manifest.xml,
+  mod/profile/start.php, mod/profile/views/default/profile/edit.php,
+  .../views/default/profile/editdefaultprofile.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/submenu.php,
+  mod/profile/views/default/profile/userdetails.php,
+  mod/reportedcontent/actions/add.php, mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/index.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/manifest.xml, mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/form.php, mod/river/manifest.xml,
+  mod/river/start.php, .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/edit.php,
+  .../default/widgets/river_widget_friends/view.php,
+  .../actions/email/confirm.php, mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/manifest.xml, mod/uservalidationbyemail/start.php,
+  search/index.php, search/users.php, services/api/rest.php,
+  services/export/handler.php, settings/index.php, settings/plugins.php,
+  settings/statistics.php, settings/user.php, upgrade.php, version.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php, views/default/ajax/loader.php,
+  views/default/annotation/generic_comment.php, views/default/api/output.php,
+  views/default/basic_elements/welcome.php, views/default/canvas/default.php,
+  views/default/canvas/layouts/one_column.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  .../canvas/layouts/two_column_right_sidebar.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/comments/forms/edit.php, views/default/css.php,
+  views/default/export/entity.php, views/default/export/metadata.php,
+  views/default/export/relationship.php, views/default/friends/collection.php,
+  views/default/friends/collections.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/list.php,
+  views/default/friends/picker.php, views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php,
+  views/default/graphics/icon.php, views/default/group/default.php,
+  views/default/input/access.php, views/default/input/button.php,
+  views/default/input/calendar.php, views/default/input/checkboxes.php,
+  views/default/input/email.php, views/default/input/file.php,
+  views/default/input/form.php, views/default/input/hidden.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/reset.php, views/default/input/submit.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php, views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php,
+  views/default/navigation/pagination.php,
+  views/default/navigation/topbar_tools.php,
+  views/default/navigation/viewtype.php,
+  .../notifications/settings/usersettings.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/object/plugin.php, views/default/object/widget.php,
+  views/default/output/calendar.php, views/default/output/checkboxes.php,
+  views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/email.php, views/default/output/iframe.php,
+  views/default/output/longtext.php, views/default/output/pulldown.php,
+  views/default/output/radio.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/url.php, views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/owner_block.php,
+  views/default/page_elements/spotlight.php,
+  views/default/page_elements/title.php,
+  views/default/pageshells/pageshell.php, views/default/river/dashboard.php,
+  views/default/river/relationship/friend/create.php,
+  views/default/river/wrapper.php, views/default/search/gallery.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php,
+  views/default/settings/install.php, views/default/settings/system.php,
+  views/default/site/default.php, views/default/spotlight/default.php,
+  views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php, views/default/user/default.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/default/welcome.php, views/default/welcome/logged_in.php,
+  views/default/welcome/logged_out.php, views/default/widgets/editwrapper.php,
+  views/default/widgets/wrapper.php, views/failsafe/canvas/default.php,
+  views/failsafe/input/button.php, views/failsafe/input/checkboxes.php,
+  views/failsafe/input/form.php, views/failsafe/input/hidden.php,
+  views/failsafe/input/longtext.php, views/failsafe/input/pulldown.php,
+  views/failsafe/input/reset.php, views/failsafe/input/submit.php,
+  views/failsafe/input/text.php, views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/list.php, views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php, views/failsafe/settings/install.php,
+  views/failsafe/settings/system.php, views/foaf/canvas/default.php,
+  views/foaf/pageshells/pageshell.php, views/foaf/user/default.php,
+  views/js/object/default.php, views/js/pageshells/pageshell.php,
+  views/js/user/default.php, views/json/api/output.php,
+  views/json/canvas/default.php, views/json/export/entity.php,
+  views/json/export/metadata.php, views/json/export/relationship.php,
+  views/json/group/default.php, views/json/messages/exceptions/exception.php,
+  views/json/object/default.php, views/json/pageshells/pageshell.php,
+  views/json/search/entity_list.php, views/json/site/default.php,
+  views/json/user/default.php, views/opendd/canvas/default.php,
+  views/opendd/export/entity.php, views/opendd/export/metadata.php,
+  views/opendd/export/relationship.php, views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/site/default.php, views/opendd/user/default.php,
+  views/php/api/output.php, views/php/canvas/default.php,
+  views/php/export/entity.php, views/php/export/metadata.php,
+  views/php/export/relationship.php, views/php/group/default.php,
+  views/php/messages/exceptions/exception.php, views/php/object/default.php,
+  views/php/pageshells/pageshell.php, views/php/search/entity_list.php,
+  views/php/site/default.php, views/php/user/default.php,
+  views/rss/annotation/default.php, views/rss/canvas/default.php,
+  views/rss/group/default.php, views/rss/object/default.php,
+  views/rss/pageshells/pageshell.php, views/rss/user/default.php,
+  views/xml/api/output.php, views/xml/messages/exceptions/exception.php,
+  views/xml/pageshells/pageshell.php, views/xml/xml-rpc/output.php: Refs #706 
+
+2009-01-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/notifications/languages/en.php, mod/notifications/start.php: Menu
+  heading changes 
+
+  	* mod/notifications/actions/save.php: Added save action for the notification
+  subscriptions. 
+
+  	* mod/notifications/index.php, mod/notifications/languages/en.php,
+  mod/notifications/start.php,
+  .../default/notifications/subscriptions/form.php: Added notification
+  subscriptions page. 
+
+  	* engine/lib/languages.php: Moved current language detection out into the
+  function get_language(); 
+
+2009-01-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/js/initialise_elgg.php,
+  views/default/navigation/topbar_tools.php: new cross-browser js toolbar menu 
+
+2009-01-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Refs #562: Configuration flag to disable database
+  sessions. 
+
+  	* languages/en.php: Fixes missing translations 
+
+  	* version.php: Bumped version to today 
+
+2009-01-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../default/usersettings/statistics_opt/online.php: Closes #702: Correct
+  parameters fed to get_system_log 
+
+2009-01-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  .../jquery/jquery-easing-compatibility.1.2.pack.js,
+  vendors/jquery/jquery-easing.1.2.pack.js,
+  .../jquery/jquery-ui-personalized-1.5.3.packed.js,
+  .../jquery/jquery-ui-personalized-1.5.packed.js,
+  vendors/jquery/jquery.easing.1.3.packed.js,
+  views/default/js/friendsPickerv1.php, views/default/js/initialise_elgg.php,
+  views/default/page_elements/header.php: jquery framework and avatar menu
+  updated 
+
+2009-01-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: A further change to ensure notification
+  messages don't get changed for every method if one method needs to make a
+  change. 
+
+  	* engine/lib/notification.php: Slight change to notifications. 
+
+  	* engine/lib/notification.php: Added more granular notification hook 
+
+2009-01-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/metadata.php: Closes #701: Blank tags
+  not returned by string_to_tag_array 
+
+2009-01-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Granular notification: a start 
+
+2009-01-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Relationships no longer double added 
+
+2009-01-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Closes #700: If a plugin doesn't physically exist
+  then it is deleted. 
+
+  	* views/default/usersettings/plugins_opt/plugin.php: User settings
+  translated 
+
+  	* views/default/admin/plugins_opt/plugin.php,
+  views/default/usersettings/plugins_opt/plugin.php: Reverted. 
+
+  	* views/default/admin/plugins_opt/plugin.php,
+  views/default/usersettings/plugins_opt/plugin.php: Tools menus now elgg_echo
+  folder name 
+
+2009-01-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Introducing a function that orders by sums of
+  an annotation AND limits by a metadata value 
+
+2009-01-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php, mod/activity/manifest.xml,
+  mod/activity/opendd.php, mod/activity/start.php,
+  mod/activity/views/default/activity/css.php,
+  mod/activity/views/default/activity/dashboard.php,
+  mod/activity/views/default/activity/wrapper.php,
+  .../views/default/settings/activity/edit.php,
+  mod/activity/views/opendd/activity/dashboard.php: Added Activity stream back
+  in 
+
+  	* engine/lib/users.php: Closes #699: get_user_by_username now using access
+  controls. Will no longer throw exception when accessing disabled users. 
+
+2009-01-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Added toggling for the annotation sum list
+  functions. 
+
+  	* engine/lib/annotations.php: Added to and fixed the list by annotation
+  count functions. 
+
+  	* engine/lib/annotations.php: Fix for previous 
+
+  	* engine/lib/annotations.php: Added the missing 'group by' clause to the get
+  annotations by sum SQL query. 
+
+2009-01-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Added user to user settings 
+
+  	* engine/lib/plugins.php: Refs #697: Now using plugin hook so one can do
+  live validation of values 
+
+  	* engine/lib/widgets.php: Closes #698: Typo corrected - nice spot! 
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  engine/lib/plugins.php: Closes #697: Events triggered when plugin settings
+  are updated. 
+
+2009-01-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fix for previous. 
+
+  	* engine/lib/annotations.php: Added annotation sum functions 
+
+2009-01-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: Closes #691: Should have been
+  is_memcache_available() 
+
+2009-01-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/save.php, actions/user/language.php, actions/user/name.php:
+  Closes #689: Email now only changed if it is different than the one
+  registered, also a number of other settings changed in this way. 
+
+  	* actions/widgets/add.php, actions/widgets/reorder.php: Widget save errors
+  now use correct message box 
+
+2009-01-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: Elgg version info now present in
+  headers. 
+
+  	* mod/crontrigger/manifest.xml, mod/crontrigger/start.php: Closes #672: Poor
+  mans cron plugin enabled. This triggers events according to page load. 
+
+  	* engine/lib/elgglib.php: 
+
+  	* engine/lib/elgglib.php: Added shutdown, system event. Refs #672 
+
+  	* mod/groups/actions/forums/edittopic.php: Editing post no longer takes
+  ownership 
+
+  	* actions/email/save.php: Refs #641: Email changer now prevents changing to
+  the same as another user. 
+
+2009-01-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php, languages/en.php: Closes #669: Logins rate
+  limited. Accounts are limited to 5 fails in a 5 minute period, meaning an
+  attacker can try one password per minute. 
+
+2009-01-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: Comment correction. 
+
+  	* engine/lib/elgglib.php: Fix for template handler override. 
+
+2009-01-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Closes #676: Entity subtables now deleted on failed
+  connections. 
+
+2009-01-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Better trigger_plugin_hook documentation. 
+
+2009-01-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/resetpassword.php, engine/lib/users.php: Closes #675:
+  Salt changed during password reset 
+
+  	* engine/lib/sessions.php: 
+
+2009-01-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Tag updates. 
+
+2009-01-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: Added rel="nofollow" rss and
+  opendd links in ownerblock 
+
+2009-01-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/makeadmin.php, actions/admin/user/removeadmin.php,
+  languages/en.php, .../views/default/profile/menu/adminlinks.php: Closes #240:
+  It is now possible to downgrade an admin user. 
+
+  	* engine/lib/users.php: Closes #560: Pagination parameters added. 
+
+  	* mod/groups/languages/en.php, .../views/default/object/groupforumtopic.php:
+  Closes #544: Logged out view now shows correct dates, also tidied up some
+  translation issues. 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php: Minor variable name and
+  comment change. 
+
+  	* actions/admin/user/unban.php, engine/lib/api.php, engine/lib/sessions.php,
+  engine/lib/users.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2009010901.sql, languages/en.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/listing.php,
+  .../views/default/profile/menu/adminlinks.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/userdetails.php, version.php: Closes #668:
+  Banning now works through a flag in the users_entity table. Database upgrade
+  required. * Added ElggUser::isBanned(); * Added 'banned' column to
+  users_entity * Modified ban() and unban() * Modified pam functions to check
+  $user->isBanned() * Modified login() to check $user->isBanned() * Modified
+  sessions_init() to check isBanned() and destroy session accordingly *
+  Modified profile views to highlight banned users and prevent menus for
+  non-admin users. 
+
+2009-01-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: Closes #588: Don't remember adding this
+  check... but anyway, double entries regression fixed. 
+
+  	* engine/lib/entities.php: Minor error message improvement 
+
+  	* engine/lib/entities.php: Added extra belts and braces check (minor) 
+
+  	* engine/lib/entities.php: Added extra belts and braces check (minor) 
+
+  	* engine/lib/users.php: Refs #668: Building on [2546] and providing ban and
+  unban functions. Later these will be replaced with "banning" functions. 
+
+  	* mod/groups/views/default/forms/groups/edit.php: Closes #664: Defaults
+  added to radio buttons 
+
+  	* engine/lib/statistics.php: Limit max display of active users to 10. 
+
+  	* actions/admin/user/ban.php, engine/lib/users.php: Refs #668, #640: Cleaner
+  interface provided for banning. 
+
+  	* actions/admin/user/ban.php, engine/lib/entities.php, engine/lib/users.php:
+  Refs #640: Renamed and moved entities.php:disable_entities to
+  user.php:disable_user_entities  
+
+  	* engine/lib/entities.php: Delete replaced by disable in disable_entity 
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2009010801.sql,
+  version.php: Closes #666: Added some extra indexes 
+
+  	* languages/en.php, mod/uservalidationbyemail/languages/en.php: Closes #546:
+  Translation moved 
+
+  	* engine/lib/annotations.php: Closes #663: Added access checks on entity on
+  get_entities_from_annotation and count functions. 
+
+  	* engine/lib/metadata.php: Closes #667: Minor tweak, an e should be an m 
+
+2009-01-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php,
+  .../default/widgets/group_members_widget/view.php: Closes #410: Pagination
+  parameter now passed in relationship list view. 
+
+  	* engine/lib/access.php, mod/groups/groupprofile.php,
+  mod/groups/languages/en.php: Closes #286: Group access restrictions issue
+  fixed, modified from patch supplied with #315 
+
+  	* views/failsafe/settings/system.php: Refs #622: Missing command from
+  failsafe view 
+
+  	* mod/groups/views/default/groups/forum_latest.php: Closes #660: Minor text
+  tweak 
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  languages/en.php, views/default/account/forms/login.php,
+  views/default/settings/system.php: Closes #662: https on login. 
+
+2009-01-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Closes #587: The area of code in
+  question hasn't been coded as defencively as it could have been. 
+
+  	* engine/lib/annotations.php: Fixes #648: Copy and paste error corrected. 
+
+2009-01-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: * Added addRelationship to ElggEntity... bit of
+  an omission! 
+
+  	* htaccess_dist: Closes #656: Disabled mod_deflate for all actions so that
+  active downloads will no longer be double compressed. 
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php,
+  engine/lib/sites.php: Fixes #655, Refs #628: Install now working with correct
+  event chain (#628). 
+
+2009-01-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/add.php: Closes #649: Added checking to report when friend
+  add fails. 
+
+2009-01-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: bug #634 fixed 
+
+  	* mod/groups/views/default/groups/forum_latest.php: lang tweak in group
+  forums 
+
+  	* mod/groups/actions/edit.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/forum_latest.php: groups owners can choose if
+  they want pages/files/forum enabled or not. Still a little more to do, this
+  is just the beginning code. 
+
+  	* mod/groups/languages/en.php: missing group lang items added 
+
+2008-12-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php, engine/settings.example.php: Closes #579:
+  Allows configurable option $CONFIG->broken_mta = true. If set, this uses "\n"
+  instead of "\r\n" in email headers. 
+
+2008-12-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Closes #643: Confirmed bug, applied fix as
+  suggested. 
+
+  	* views/default/page_elements/owner_block.php: Closes #633: User name in
+  owner block is now link. This may require additional skinning. 
+
+  	* engine/lib/plugins.php: Closes #608: Placing a file called "disabled" in
+  mod now disables all plugins, allowing easier recovery of an elgg site with
+  screwed up modules. 
+
+  	* views/default/input/button.php: Closes #519: Typo. Well spotted. 
+
+  	* languages/en.php: Closes #500 
+
+  	* mod/reportedcontent/languages/en.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php: Closes #504 
+
+2008-12-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Closes #396: Form should probably not be permitted
+  on input. 
+
+2008-12-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Closes #628: Event change now terminates on false.
+  Nice spot :) 
+
+2008-12-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/updateclient/index.php, mod/updateclient/languages/en.php,
+  mod/updateclient/manifest.xml, mod/updateclient/start.php,
+  .../views/default/settings/updateclient/edit.php: Removed upgrade client
+  since it doesn't really matter. 
+
+  	* README.txt, version.php: Ticked up version number 
+
+2008-12-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008120501.sql: Fixes #615
+
+2008-12-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php: Fixes to user banning (action side). 
+
+  	* engine/lib/elgglib.php: Fixes to user banning. 
+
+2008-12-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Prototype view caching 
+
+  	* engine/lib/notification.php: Closes #597: GUID must now be non-zero for
+  messages to be sent 
+
+2008-12-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: unused rule removed #583 
+
+2008-12-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008111901.sql,
+  engine/schema/upgrades/2008120501.sql, version.php: Closes #611: Made name
+  field longer 
+
+2008-12-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Closes #421 : Catches the DB Exception, so
+  hopefully this will prevent the error from showing up in the future :) 
+
+  	* languages/en.php, views/default/friends/collectiontabs.php: Closes #501 
+
+  	* engine/lib/users.php, mod/uservalidationbyemail/start.php: Closes #609 
+
+  	* engine/schema/upgrades/2008112002.sql: Fixed update script 
+
+  	* htaccess_dist: ETag support 
+
+2008-12-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/forum_latest.php: latest group discussion
+  bug fixed 
+
+2008-12-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/location.php: Some location tweaks 
+
+  	* engine/lib/users.php: Closes #550: Code metadata now moved to private
+  storage 
+
+  	* mod/groups/membership.php: Closes #604 
+
+2008-11-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/radio.php: Improved radio button value retention 
+
+  	* views/default/input/checkboxes.php: Improved checkbox value retention 
+
+2008-11-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/metatags.php: FOAF header added to
+  profile 
+
+  	* views/foaf/user/default.php: Foaf ident on mailbox for friends 
+
+  	* engine/schema/upgrades/2008112601.sql: Closes #571: Widgets now use
+  private store for settings 
+
+  	* engine/lib/entities.php, engine/lib/widgets.php: Closes #571: Widgets now
+  use private store for settings 
+
+  	* engine/lib/opendd.php: 
+
+2008-11-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/location.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008112501.sql, version.php: Hook for future geocoding
+  library added. 
+
+  	* engine/schema/mysql.sql: 
+
+2008-11-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Closes #580: Fixed tagging trim and strtolower 
+
+2008-11-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/calendar.php: Refs #452: Basic entity listing functions. Needs
+  canvas. 
+
+  	* engine/lib/users.php: Closes #554: Validation procedure now correctly
+  screening for ascii space 
+
+2008-11-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: 
+
+  	* engine/lib/sessions.php: Added site secret to fingerprint to make it
+  harder to guess 
+
+  	* engine/lib/sessions.php, engine/lib/users.php: Fixes #548: Introducing
+  set_last_login($user_guid). Called from login(), but call from any
+  authentication code where appropriate. 
+
+  	* engine/lib/calendar.php, engine/lib/entities.php: Refs #452: Calendar
+  interface on entities 
+
+  	* engine/lib/entities.php: Introducing get_entities_from_private_setting(); 
+
+2008-11-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php, mod/groups/topicposts.php, upgrade.php: No need to
+  trigger the init event on upgrade. 
+
+2008-11-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/upgrades/2008112001.sql,
+  engine/schema/upgrades/2008112002.sql, version.php: Refs #569, #570, #571:
+  Update script for both users and plugins plugin settings 
+
+  	* engine/schema/upgrades/2008111901.sql,
+  engine/schema/upgrades/2008112001.sql, version.php: Migrate plugin settings
+  from plugin to new settigns store. 
+
+  	* engine/lib/entities.php, engine/lib/plugins.php: Refs #571. Fixes #569,
+  #570: * Plugin functions set to use private data store. * Fixed some db
+  queries * Modified plugin class overriding get/set functions 
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008111901.sql: Refs #569,
+  #570, #571: Minor database schema errors corrected 
+
+  	* engine/lib/entities.php: Refs #569, #570, #571: Corrected and optimised
+  insert query 
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008111901.sql: Refs #569,
+  #570, #571: Minor database schema errors corrected 
+
+  	* engine/lib/entities.php: Refs #569, #570, #571: dbprefix not prefix; 
+
+  	* engine/lib/entities.php: Refs #569, #570, #571: Added
+  remove_all_private_settings() 
+
+  	* engine/lib/entities.php: Refs #569, #570, #571: Added
+  get_all_private_settings(); 
+
+  	* engine/lib/metadata.php: Fixes #531: Access permissions enforced 
+
+2008-11-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/group.php, engine/lib/objects.php, engine/lib/relationships.php,
+  engine/lib/sites.php, engine/lib/users.php, views/default/export/entity.php,
+  views/json/export/entity.php, views/json/export/metadata.php,
+  views/json/export/relationship.php, views/php/export/entity.php,
+  views/php/export/metadata.php, views/php/export/relationship.php: Fixes #568:
+  Exportable code now inclusive not exclusive. * Added extra function
+  Exportable interface * OpenDD export modified * PHP & JSON export views
+  modified * Default export view will still show all data if you are logged in
+  as admin (since this view is used by the guidtool) 
+
+2008-11-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/upgrades/2008111901.sql: Introducing the new private
+  settings table. 
+
+2008-11-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/calendar.php: Added get notable enities on relationship 
+
+  	* engine/lib/calendar.php: Added get notable enities on metadata 
+
+  	* engine/lib/calendar.php: Added get notable enities 
+
+2008-11-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Closes #557 
+
+2008-11-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* dashboard/index.php, engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/entities.php, engine/lib/extender.php, engine/lib/filestore.php,
+  engine/lib/group.php, engine/lib/languages.php, engine/lib/metadata.php,
+  engine/lib/notification.php, engine/lib/plugins.php, engine/lib/sessions.php,
+  engine/lib/tags.php, engine/lib/users.php, engine/lib/usersettings.php: *
+  Introducing get_loggedin_user() and get_loggedin_userid() * ACLs now using
+  get_loggedin_user* * Some logic cleaned up * Some "Undefined..." messages
+  cleaned up 
+
+  	* views/default/search/entity_list.php: 
+
+  	* views/default/search/entity_list.php: Removed some "Undefined" messages 
+
+  	* engine/lib/elgglib.php: Removed some "Undefined" messages 
+
+  	* views/default/input/access.php, views/default/input/button.php,
+  views/default/input/submit.php: Removed some "Undefined" messages 
+
+  	* mod/profile/views/default/profile/userdetails.php: Removed some
+  "Undefined" messages 
+
+  	* views/default/canvas/layouts/widgets.php: Removed some "Undefined"
+  messages 
+
+  	* engine/lib/elgglib.php: "Undefined" messages tidied up 
+
+  	* engine/lib/metastrings.php: "Undefined" messages tidied up 
+
+  	* engine/lib/river.php: "Undefined" messages tidied up 
+
+  	* engine/lib/sessions.php: 
+
+  	* engine/lib/sessions.php: * Candidate for initial ElggSession magic class *
+  Session now properly cleared on init and logout - this has knock on effect
+  that you can no longer assume that $_SESSION['id'] or 'guid' will be integer,
+  making it necessary to cast. 
+
+  	* engine/lib/admin.php: Minor tidying of code 
+
+2008-11-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Experimental ElggCache 
+
+2008-11-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/cache.php: No longer blanks all caches when clearing 
+
+  	* engine/lib/cache.php: Closes #543 
+
+2008-11-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Ifdef expires 
+
+  	* htaccess_dist: Minor tweaks to mod_gzip config. Note that gzip can't
+  compress some things due to the way that the apache 1.3 stack works 
+
+  	* htaccess_dist: Simplified GZIP  
+
+  	* htaccess_dist: Mod deflate support added 
+
+  	* htaccess_dist: Turned on mod_gzip if available 
+
+  	* htaccess_dist: Added default expiry 
+
+  	* mod/groups/graphics/icon.php: Expires header added to group icons 
+
+2008-11-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icon.php: Content length on images 
+
+  	* mod/groups/graphics/icon.php: Content length on images 
+
+  	* _css/css.php, engine/lib/elgglib.php: Content length headers on JS and css
+
+  	* engine/lib/elgglib.php: Javascript now correctly marked as cacheable 
+
+  	* _css/css.php: Fixes #541: CSS Now not being cached. Error is being caused
+  somewhere in the elgg framework which prevents pragma caching from working...
+  not sure what 
+
+  	* languages/en.php: Refs #520 
+
+  	* languages/en.php, views/default/friends/collections.php: Closes #501 
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/groups/forum_latest.php: Closes #507 
+
+  	* engine/lib/memcache.php: Tidied. 
+
+2008-11-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Profiling now showing queries executed before
+  debug flag being set 
+
+  	* engine/lib/metadata.php: Refs #529: Experimental memcaching for metadata 
+
+  	* engine/lib/elgglib.php: Fixed datalists error 
+
+  	* engine/lib/elgglib.php: Refs #529: Experimental memcaching on datalists 
+
+  	* engine/start.php: Removing unnecessary call to datalists 
+
+  	* index.php: Fixes #530 
+
+  	* engine/lib/metastrings.php: Refs #529: Experimental caching of metastrings
+
+  	* engine/lib/entities.php: Refs #529: Experimental object level caching 
+
+2008-11-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Reverted limited caching back to array since
+  caching objects don't work so well for these. 
+
+  	* engine/lib/elgglib.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008110601.sql, version.php: datalists now has primary
+  key, datalist set function optimised 
+
+  	* engine/lib/elgglib.php: Not possible to get any more, so tell them so 
+
+  	* engine/lib/users.php: Last action query update delayed to avoid
+  invalidating query cache unnecessarily. 
+
+  	* engine/lib/database.php: * Database functions optimised and centralised a
+  bit * Caching now caches queries which return no data * Introducing
+  execute_delayed_query family for executing queries AFTER the page has loaded.
+
+  	* engine/lib/cache.php: isset fixes 
+
+  	* engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/relationships.php: Some tidying of objects and opendd export 
+
+  	* engine/lib/cache.php, engine/lib/memcache.php: Added test to see if
+  memcache is available. 
+
+  	* engine/lib/cache.php, engine/lib/memcache.php: Class hierachy changed to
+  separate shared memory caching 
+
+2008-11-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: 
+
+  	* engine/lib/river.php: Minor extension to river 
+
+  	* engine/lib/memcache.php: Minor tweak 
+
+  	* engine/lib/river.php: Slight rejig in the way the river works 
+
+  	* engine/lib/elgglib.php: Extends elgg_view_tree to support other view
+  types. 
+
+  	* engine/lib/cache.php: Added "add" method to cache only if it doesn't exist
+  already. 
+
+  	* engine/lib/database.php: Revert use of memcache for database query cache 
+
+  	* engine/lib/memcache.php: Changed default timeout 
+
+2008-11-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/memcache.php: Removed cache clearing for now. 
+
+  	* engine/lib/database.php, engine/lib/memcache.php: More tweaks 
+
+  	* engine/lib/memcache.php: Experimental memcache support 
+
+  	* engine/lib/memcache.php, languages/en.php: Closes #516: Experimental
+  memcache support 
+
+  	* engine/settings.example.php: Installation notes 
+
+  	* languages/en.php: Refs #514: Memcache error messages  
+
+  	* engine/settings.example.php: Refs #514: Memcache settings 
+
+  	* engine/lib/cache.php: Refs #514 : Using memcache if available 
+
+  	* engine/settings.example.php: Refs #514 
+
+  	* engine/lib/memcache.php: First draft memcache object. No testing yet
+  carried out, submitted 'cos I'm moving computers. 
+
+  	* engine/lib/cache.php: 
+
+  	* engine/lib/cache.php, engine/lib/database.php, engine/lib/entities.php:
+  Moved caching to function so it can be easily replaced 
+
+2008-11-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Refs #514: Entity and subtype caching 
+
+  	* engine/lib/cache.php: Minor tweaks 
+
+  	* engine/lib/cache.php: back to private 
+
+  	* engine/lib/cache.php: Initialisation correct 
+
+  	* engine/lib/database.php: Database using new memory cache object 
+
+  	* engine/lib/api.php, engine/lib/cache.php: * ElggCache interface improved *
+  ElggStaticVariableCache introduced as a placeholder for more advanced
+  caching. 
+
+  	* engine/lib/database.php: Experimental database query caching, please
+  report problems asap. 
+
+  	* engine/lib/calendar.php: Stub added refs #452 
+
+  	* engine/lib/database.php: Experimental database query caching, please
+  report problems asap. 
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008110301.sql,
+  version.php: Some missing keys added. 
+
+  	* engine/lib/access.php, engine/lib/annotations.php,
+  engine/lib/configuration.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/group.php, engine/lib/objects.php,
+  engine/lib/query.php, engine/lib/relationships.php, engine/lib/sites.php,
+  engine/lib/users.php: Minor tweaks 'cos case does matter... 
+
+2008-11-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/object/groupforumtopic.php: Minor style fix. 
+
+  	* mod/groups/discussions.php, .../views/default/object/groupforumtopic.php:
+  Latest discussion fix 
+
+2008-10-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Closes #378: Fixed incorrect relationship direction.
+
+  	* engine/lib/notification.php: Closes #446: * Errant \r\n and \r chars
+  coverted to \n. * newlines stripped from subject headers. * Lines starting
+  with From are changed to >From 
+
+  	* engine/handlers/cron_handler.php, mod/garbagecollector/start.php: Changed
+  cron to use output buffering (letting you simply echo rather than needing to
+  pass variables around) 
+
+  	* mod/groups/views/default/forms/groups/edit.php: Closes #461: Localisations
+  added 
+
+  	* mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php: Refs #494: GUID listed 
+
+  	* mod/garbagecollector/start.php: Added system, gc plugin hook to garbage
+  collector 
+
+  	* engine/lib/notification.php: Closes #488: This is indeed a typo... well
+  spotted :) 
+
+  	* engine/lib/database.php, engine/lib/metastrings.php,
+  mod/garbagecollector/start.php: Closes #493: Moved database queries out of
+  module and in to core in line with best practice. 
+
+2008-10-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/groupprofile.php: Closes #486 
+
+2008-10-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* README.txt: Version number fail. 
+
+  	* version.php: Elgg 1.1 final. 
+
+  	* version.php: Further version update 
+
+  	* README.txt: Version number change in the readme file. 
+
+2008-10-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: profile block layout issue in IE7 fixed 
+
+2008-10-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Version number change 
+
+  	* languages/en.php: A better description of the RESTful API 
+
+2008-10-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Reverted database access permission caching. 
+
+2008-10-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: Group topic error message 
+
+  	* _graphics/upgrader.gif, upgrade.php, views/default/settings/upgrading.php:
+  Replacement upgrade notifier 
+
+  	* INSTALL.txt, UPGRADE.txt: Slight update to crontab instructions 
+
+  	* mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php, mod/activity/manifest.xml,
+  mod/activity/start.php, mod/activity/views/default/activity/dashboard.php,
+  mod/activity/views/default/activity/wrapper.php,
+  .../views/default/settings/activity/edit.php: Farewell, activity, we hardly
+  knew ye. 
+
+2008-10-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* INSTALL.txt, UPGRADE.txt: Modification to install and upgrade text files
+  to include details about the crontab 
+
+2008-10-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/settings/upgrading.php: Added upgrading screen 
+
+  	* _graphics/upgrader.gif, languages/en.php, upgrade.php: Visual upgrader. 
+
+2008-10-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/manifest.xml, mod/apiadmin/manifest.xml,
+  mod/diagnostics/manifest.xml, mod/garbagecollector/manifest.xml,
+  mod/groups/manifest.xml, mod/guidtool/manifest.xml,
+  mod/logbrowser/manifest.xml, mod/logrotate/manifest.xml,
+  mod/profile/manifest.xml, mod/river/manifest.xml,
+  mod/updateclient/manifest.xml, mod/uservalidationbyemail/manifest.xml:
+  manifest files sync'ed 
+
+2008-10-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php, views/default/css.php: persistent
+  login checkbox styled 
+
+2008-10-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Menu link text change, to be more descriptive 
+
+2008-10-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php, mod/profile/views/default/profile/userdetails.php:
+  Hide 'about me' on custom profiles 
+
+2008-10-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Annotation pagination is now corrected where more
+  than 10 items are being displayed at once. 
+
+2008-10-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js, javascript/initialise_elgg.js: remove js,
+  moved into views 
+
+  	* javascript/initialise_elgg.js, views/default/css.php,
+  views/default/js/initialise_elgg.php: updates for v1.1, css cleanup, removal
+  of redundant classes, redundant js removed 
+
+2008-10-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php, mod/logrotate/start.php: Logrotate and archive
+  containing offset. Table still created as $now but containing < $now-period. 
+
+2008-10-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/garbagecollector/languages/en.php, mod/garbagecollector/manifest.xml,
+  mod/garbagecollector/start.php,
+  .../default/settings/garbagecollector/edit.php: Introducing the Elgg garbage
+  collector. 
+
+2008-10-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: layout bug when not group owner 
+
+2008-10-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/toolbox.php: Removed the toolbox. 
+
+  	* views/default/page_elements/header.php: Removed needless comment 
+
+2008-10-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: added additional styles for code, pre, blockquote,
+  dl, dt etc 
+
+2008-10-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php: Views are now more
+  granular. 
+
+2008-10-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, languages/en.php,
+  views/default/account/forms/login.php: Closes #306 
+
+2008-10-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/messages/list.php: messages in failsafe mode moved to
+  inline ones - so they don't obscure text below 
+
+2008-10-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../river/annotation/generic_comment/create.php: Hoiking out the generic
+  comment view again. Needs to be rethought. 
+
+  	* languages/en.php, .../river/annotation/generic_comment/create.php:
+  Committed a generic comment view. 
+
+2008-10-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/social.php, languages/en.php: Closes #440 
+
+  	* engine/lib/access.php: Flags to prevent queries being run multiple times. 
+
+  	* engine/lib/access.php: Removed spurious notice 
+
+  	* languages/en.php, views/default/admin/plugins_opt/plugin.php: Closes #476:
+  Well spotted. 
+
+2008-10-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: additional dicv added to
+  owner block for theme purposes 
+
+2008-10-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* crontab.example: 
+
+  	* mod/groups/languages/fr.php, mod/groups/languages/it.php,
+  mod/groups/languages/ru.php, mod/groups/languages/th.php,
+  mod/groups/languages/zh.php: REMOVED LANGUAGE FILES FROM CORE. This is due to
+  a stupid and frustrating legal reason. 
+
+  	* languages/de.php, languages/es.php, languages/fr.php, languages/it.php,
+  languages/ru.php, languages/th.php, languages/zh.php,
+  mod/activity/languages/ru.php, mod/apiadmin/languages/ru.php,
+  mod/diagnostics/languages/fr.php, mod/diagnostics/languages/it.php,
+  mod/diagnostics/languages/ru.php, mod/diagnostics/languages/th.php,
+  mod/diagnostics/languages/zh.php, mod/guidtool/languages/it.php,
+  mod/guidtool/languages/ru.php, mod/guidtool/languages/th.php,
+  mod/guidtool/languages/zh.php, mod/logbrowser/languages/fr.php,
+  mod/logbrowser/languages/it.php, mod/logbrowser/languages/ru.php,
+  mod/logbrowser/languages/th.php, mod/logbrowser/languages/zh.php,
+  mod/reportedcontent/languages/fr.php, mod/reportedcontent/languages/it.php,
+  mod/reportedcontent/languages/ru.php, mod/reportedcontent/languages/th.php,
+  mod/reportedcontent/languages/zh.php, mod/river/languages/fr.php,
+  mod/river/languages/it.php, mod/river/languages/ru.php,
+  mod/river/languages/th.php, mod/river/languages/zh.php,
+  mod/updateclient/languages/fr.php, mod/updateclient/languages/it.php,
+  mod/updateclient/languages/ru.php, mod/updateclient/languages/th.php,
+  mod/updateclient/languages/zh.php,
+  mod/uservalidationbyemail/languages/ru.php: REMOVED LANGUAGE FILES FROM CORE.
+  This is due to a stupid and tedious legal reason. 
+
+  	* mod/logrotate/languages/en.php, mod/logrotate/manifest.xml,
+  mod/logrotate/start.php, .../views/default/settings/logrotate/edit.php:
+  Closes #215: Log rotation added. 
+
+2008-10-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/leave.php, mod/groups/start.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  .../views/default/object/groupforumtopic.php: Removing WSOD errors in groups 
+
+2008-10-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: Refs #215: Minor tweak to logic 
+
+2008-10-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Hopefully slightly friendlier token mismatch errors. 
+
+2008-10-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: Refs #215: System hook for archiving log. Cron
+  yet to be added. 
+
+  	* .../views/default/profile/menu/adminlinks.php: Closes #448: Functionality
+  was present, but was lacking interface. Interface provided. 
+
+  	* views/default/object/default.php: Closes #460: Good spot, thanks for the
+  contribution! 
+
+  	* languages/en.php: Closes #473: Good spot 
+
+2008-10-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/register.php, actions/register.php, engine/lib/users.php,
+  views/default/account/forms/register.php: The friend invite infrastructure is
+  now secure. 
+
+2008-10-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/languages/ru.php: 
+
+  	* mod/activity/languages/ru.php: Closes #469: Thankyou for the translation! 
+
+2008-10-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/register.php, register.php: Further additions to the registration
+  form. 
+
+  	* views/default/account/forms/register.php: Added friend guid handling to
+  the registration form. 
+
+  	* engine/lib/users.php: Added the ability to add a user to a user's friends
+  list on registration. 
+
+  	* actions/register.php: Added the ability to add a user to a user's friends
+  list on registration. 
+
+  	* engine/lib/entities.php: Revert. 
+
+  	* engine/lib/entities.php: Improvements for container overrides. 
+
+2008-10-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/radio.php: Fix for input/radio where keys aren't
+  specified 
+
+2008-10-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/usersettings/plugins_opt/plugin.php: Minor tweaks to tools
+  settings 
+
+  	* languages/en.php: Added reply 
+
+2008-10-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Small language additions for open and close. 
+
+2008-10-22  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/shout_speech_bubble.gif: removed and added to thewire plugin 
+
+2008-10-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cron.php: Better default forward 
+
+2008-10-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: Fixed typo! Well spotted,
+  @notomodungwa 
+
+2008-10-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* crontab.example, engine/lib/cron.php: Increasing sub-hour cron granularity
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008102101.sql: Removed
+  unnecessary column 
+
+  	* engine/lib/sessions.php: Closes #453 and #463: Completed work. Sessions
+  now stored in database. 
+
+  	* engine/lib/sessions.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008102101.sql: Semi-working session code. Still won't
+  permit logging in, commented out until there is time to fix.  Problem seems
+  to be based around the action_gatekeeper() and the values set for the
+  __elgg_session. Removing this component from the key causes the token to be
+  valid.  My feeling is that the session is not being saved or loaded
+  correctly. 
+
+2008-10-21  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php: #458 fixed - IE7 conditional
+  statement bug 
+
+2008-10-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008102101.sql, version.php: Database session code. 
+  IMPORTANT NOTE:  The trigger for this is commented out, so old session code
+  is used. There are serious problems with using the new code since it causes a
+  chicken and egg problem with the upgrade script. 
+
+  	* engine/lib/group.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Closes #457: Now returns $guid on success, false on
+  fail 
+
+  	* engine/lib/sites.php, languages/en.php: Added safety rail to prevent
+  disabling/deleting of currently viewed site. 
+
+2008-10-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/checkboxes.php: Output/checkboxes now defers to
+  output/tags rather than output/text; much more sensible. 
+
+  	* engine/lib/input.php: The input filter now deals with two-dimensional
+  input arrays. 
+
+2008-10-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apiadmin/views/default/object/api_key.php: 
+
+  	* mod/apiadmin/views/default/object/api_key.php: Minor tweaks to avoid
+  breaking non-admin css 
+
+2008-10-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Important fix for deleted plugins. 
+
+2008-10-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/checkboxes.php, views/default/output/radio.php:
+  Default output fields for radio and checkboxes 
+
+  	* search/users.php: Fixed double layout issue 
+
+2008-10-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/usersettings.php, languages/en.php, settings/index.php,
+  settings/plugins.php, settings/statistics.php, settings/statistics/index.php,
+  settings/user.php, settings/user/index.php, views/default/object/plugin.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php: Closes #335: Marcus Povey
+  : * Per user tools settings now present again (only displays if there are
+  settings present AND the plugin is enabled - needs skinning accordingly) *
+  Re-jigged the settings code to behave like a proper page handler. * Minor
+  tweak to language 
+
+  	* engine/lib/system_log.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008101701.sql, version.php: Changes to access any
+  system log code. Introducing owner guid on items which is necessary for
+  access control. Requires upgrade.php to be run 
+
+2008-10-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php, views/default/css.php:
+  activity stream basic style applied, and plugin reorder links adjusted 
+
+2008-10-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: widget gallery more info spacing fixed 
+
+2008-10-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Minor language tweak. 
+
+  	* actions/admin/plugins/reorder.php, admin/plugins/index.php,
+  engine/lib/plugins.php, languages/en.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php: You can now reorder plugins. 
+
+2008-10-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php: gap in user menu removed 
+
+2008-10-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/activity/all.php, mod/activity/friends.php, mod/activity/index.php,
+  mod/activity/languages/en.php, mod/activity/manifest.xml,
+  mod/activity/start.php, mod/activity/views/default/activity/dashboard.php,
+  mod/activity/views/default/activity/wrapper.php,
+  .../views/default/settings/activity/edit.php: Initial activity view.  Missing
+  functionality: comments, tabs and drill down ability. 
+
+2008-10-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php: Improved online users stats so that more than
+  10 get displayed 
+
+2008-10-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Moving internal function out of elgg_view_tree()
+  since this caused problems 
+
+  	* engine/lib/configuration.php: Closes #438 
+
+  	* engine/lib/river.php: 
+
+  	* engine/lib/river.php, engine/lib/system_log.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008101601.sql, version.php: Closes #442: Requires
+  schema upgrade. Side effect - friends activity rivers will be blanked. 
+
+  	* engine/lib/river.php: River performance tweak 
+
+2008-10-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/ru.php: Committing groups translation 
+
+  	* .../notifications/settings/usersettings.php: Notification methods now
+  better translated 
+
+  	* languages/ru.php: Closes #433: Merged changes from trac and email
+  submissions. Thanks for all submissions! 
+
+  	* languages/ru.php: Initial core russian translation 
+
+  	* mod/apiadmin/languages/ru.php, mod/diagnostics/languages/ru.php,
+  mod/guidtool/languages/ru.php, mod/logbrowser/languages/ru.php,
+  mod/reportedcontent/languages/ru.php, mod/river/languages/ru.php,
+  mod/updateclient/languages/ru.php,
+  mod/uservalidationbyemail/languages/ru.php: Refs #433: Russian translations
+  for core plugins 
+
+2008-10-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: view link added to en.php 
+
+2008-10-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/social.php: Removed an annoying variable cast that was
+  destroying everything. 
+
+  	* engine/lib/social.php: The word blacklist for filter_string is now loaded
+  on init. 
+
+2008-10-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Edit profile form modified 
+
+2008-10-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: 
+
+  	* mod/profile/actions/deletedefaultprofileitem.php,
+  mod/profile/actions/editdefault.php,
+  mod/profile/actions/resetdefaultprofile.php, mod/profile/defaultprofile.php,
+  mod/profile/start.php, .../views/default/profile/editdefaultprofile.php:
+  Closes #235: Simple profile editor in place 
+
+2008-10-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/friends_picker_arrow_left.gif,
+  _graphics/friends_picker_arrow_right.gif,
+  _graphics/friends_picker_arrows.gif, _graphics/gallery_back_icon.gif,
+  _graphics/gallery_back_icon_on.gif, views/default/css.php: Friends picker
+  arrows combined into one resource, and updated with hover effect. Redundant
+  image gallery icons removed. 
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: 
+
+  	* engine/lib/elgglib.php: Catching error on datalists 
+
+2008-10-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/avatar_menu_arrow.gif, _graphics/avatar_menu_arrow_hover.gif,
+  _graphics/avatar_menu_arrow_open.gif, _graphics/avatar_menu_arrows.gif,
+  mod/profile/views/default/profile/css.php: Avatar user menu arrows updated to
+  use one image rather than 3 
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Closes #412 
+
+  	* engine/lib/river.php: Refs #431: Belts and braces added to river view 
+
+2008-10-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/useradd.php: Adjusted spacing on add user form
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Refs #432: Typo 
+
+  	* mod/groups/start.php: Closes #432: Hook added as profile 
+
+  	* mod/profile/start.php: Minor commenting 
+
+2008-10-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* INSTALL.txt, UPGRADE.txt: Updated the install and upgrade text. 
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/zh.php: Refs #424: reportedcontent 
+
+  	* mod/groups/languages/zh.php, mod/guidtool/languages/zh.php,
+  mod/river/languages/zh.php: Refs #424: guidtool, groups, river 
+
+  	* mod/diagnostics/languages/zh.php, mod/logbrowser/languages/zh.php,
+  mod/updateclient/languages/zh.php: Refs #424: Diagnostics, logbrowser,
+  updateclient 
+
+  	* languages/zh.php: Refs #424: Core translations added. 
+
+  	* UPGRADE.txt, engine/lib/version.php, upgrade.php: Closes #430 
+
+2008-10-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/graphics/defaultlarge.gif,
+  mod/groups/graphics/defaultmedium.gif, mod/groups/graphics/defaultsmall.gif,
+  mod/groups/graphics/defaulttiny.gif,
+  .../views/default/icon/group/default/large.php,
+  .../views/default/icon/group/default/medium.php,
+  .../views/default/icon/group/default/small.php,
+  .../views/default/icon/group/default/tiny.php,
+  mod/profile/graphics/defaultlarge.jpg,
+  mod/profile/graphics/defaultmedium.jpg,
+  mod/profile/graphics/defaultsmall.jpg, mod/profile/graphics/defaulttiny.jpg,
+  mod/profile/graphics/defaulttopbar.jpg: Groups updated to use new icon method
+  and new groups icons added. Profile updated with new default avatars 
+
+2008-10-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2008101303.php, version.php: Fixed the previous user
+  login issue. 
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Introducing get_current_language(). Refs #235 
+
+  	* mod/profile/start.php: Refs #235: Added hooks for future admin interface 
+
+  	* mod/profile/start.php: 
+
+2008-10-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/annotation/generic_comment.php: default message styled 
+
+2008-10-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Refs #235: Now possible for plugins to change
+  default profile (plugin hook 'profile:fields', 'profile'. 
+
+2008-10-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: widget more info tooltip improvements 
+
+  	* views/default/canvas/layouts/widgets.php: further fixes to the widget
+  gallery to use css-based images 
+
+  	* views/default/canvas/layouts/widgets.php, views/default/css.php: Updated
+  widget picker gallery to use classes for images rather than hard-coded
+  resources. 
+
+2008-10-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php: user avatar menu method
+  adjusted to avoid hard-coded image resources 
+
+2008-10-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php: system message strings moved to
+  elgg_echo 
+
+2008-10-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, mod/profile/icon.php,
+  .../views/default/icon/user/default/large.php,
+  .../views/default/icon/user/default/master.php,
+  .../views/default/icon/user/default/medium.php,
+  .../views/default/icon/user/default/small.php,
+  .../views/default/icon/user/default/tiny.php,
+  .../views/default/icon/user/default/topbar.php: Default icon overrides. 
+
+  	* engine/lib/entities.php, mod/profile/icon.php: Simple hook to allow for
+  default user and entity icons. 
+
+2008-10-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/entities.php, mod/groups/graphics/defaultlarge.jpg,
+  mod/groups/graphics/defaultmedium.jpg, mod/groups/graphics/defaultsmall.jpg,
+  mod/groups/graphics/defaulttiny.jpg, mod/groups/start.php,
+  mod/groups/views/default/groups/icon.php: Closes #417 & #418 
+
+  	* engine/lib/filestore.php, mod/profile/start.php: Minor optimisations.
+  Introducing exists() on filestores 
+
+  	* _graphics/icons/default/topbar.png, engine/lib/entities.php,
+  mod/profile/icon.php, mod/profile/start.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/icon.php,
+  views/default/page_elements/elgg_topbar.php: Closes #301: Profile icons now
+  use getIcon() API. Overrides now possible:  For themes to override, create a
+  plugin hook listening to 'entity:icon:url' and object 'user'.  In the hook
+  return a different url.  To replace default user icons in a plugin one might
+  create a hook:  function profile_usericon_hook($hook, $entity_type,
+  $returnvalue, $params) { if ((!$returnvalue) && ($params['entity'] instanceof
+  ElggUser)) { // return your default graphic here. } }  And set it to priority
+  900 (lower priority than the code that displays a pretty icon for users but
+  higher than the default object display code in entities.php) 
+
+  	* engine/lib/users.php: Allowing '.' in username, refs #415 
+
+  	* views/rss/pageshells/pageshell.php: Fixes #413: Rss feeds with GET query
+  strings now functioning.  Thanks for your patch, nice spot! 
+
+  	* languages/en.php: Fixes #415 
+
+2008-10-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/ajax/loader.php, views/default/css.php: ajax loader updated
+  to use an image from _graphics rather than a hard-coded image resource (to
+  make theming possible). 
+
+2008-10-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php: Removing pagination from online users. 
+
+2008-10-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Removed debug 
+
+  	* engine/lib/entities.php: Minor tweaks to the getIcon code: * Default now
+  running on priority 1000 * Renamed default hook to a better name Marcus Povey
+
+2008-10-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php,
+  .../views/default/widgets/a_users_groups/view.php: Removed pagination for the
+  groups widget 
+
+2008-10-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql, engine/schema/upgrades/2008100601.sql: Bugfixes
+  to river script 
+
+  	* engine/schema/mysql.sql: Added river key to main schema 
+
+2008-10-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/messages/list.php: updated failsafe message divs
+  dimensions 
+
+2008-10-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/upgrades/2008100601.php, engine/lib/upgrades/2008100701.php:
+  Changed the name. Refs #409 
+
+  	* engine/lib/database.php, engine/lib/upgrades/2008100601.php,
+  engine/lib/version.php, languages/en.php, version.php: Closes #409: PHP
+  update script to update core added 
+
+  	* mod/uservalidationbyemail/start.php: removed debug 
+
+  	* mod/groups/languages/th.php: Removing BOM 
+
+  	* mod/updateclient/languages/th.php: Thai language pack  
+
+  	* mod/river/languages/th.php: Thai language pack  
+
+  	* mod/reportedcontent/languages/th.php: Thai language pack  
+
+  	* mod/logbrowser/languages/th.php: Thai language pack  
+
+  	* mod/guidtool/languages/th.php: Thai language pack  
+
+  	* mod/groups/languages/th.php: Thai language pack  
+
+  	* mod/diagnostics/languages/th.php: Thai language pack  
+
+  	* languages/th.php: Closes #406: Thanks for your submission 
+
+2008-10-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, mod/profile/start.php: Introduced a way to either
+  tether metadata access to entities, or to make them independent - in either
+  case, explicitly. 
+
+2008-10-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: 
+
+  	* engine/lib/river.php: Deleted old gumpf refs #402 and #407 
+
+  	* engine/lib/river.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008100601.sql,
+  .../default/river/ElggRelationship/create.php,
+  .../default/river/relationship/member/create.php,
+  .../default/river/ElggUser/profileiconupdate.php,
+  .../views/default/river/ElggUser/profileupdate.php,
+  .../river/user/default/profileiconupdate.php,
+  .../default/river/user/default/profileupdate.php,
+  views/default/river/ElggRelationship/create.php,
+  views/default/river/relationship/friend/create.php: Closes #402 and #407 :
+  Right! Finally nailed this fscking issue to the wall (hopefully).  Modified
+  system log to hold extra information about the class being stored, this lets
+  us pull only the required rows from the event log.  This drastically
+  simplifies and speeds up the query.  Requires: Database upgrade. Outstanding
+  issues: Query is using filesort despite using correct index. Still much
+  faster than the last method! 
+
+  	* engine/lib/elgglib.php: Removed unnecessary debug 
+
+2008-10-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/metadata.php,
+  views/default/search/entity_list.php: You can now remove pagination from a
+  list 
+
+  	* search/users.php: User browsing is revamped. 
+
+  	* engine/lib/users.php: List_user_friends_objects now lets you hide the
+  toggle to gallery view 
+
+2008-10-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/index.php: Refs #402 and #407: Extra fields added to
+  system_log 
+
+  	* engine/lib/extender.php, engine/lib/relationships.php,
+  engine/lib/system_log.php, engine/schema/mysql.sql,
+  engine/schema/upgrades/2008100601.sql, version.php: Refs #402 and #407: Extra
+  fields added to system_log 
+
+2008-10-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Minor fix for previous. 
+
+  	* engine/lib/elgglib.php: Introducing elgg_view_tree, for getting an array
+  of views 
+
+  	* engine/lib/elgglib.php, views/default/js/friendsPickerv1.php,
+  views/default/js/initialise_elgg.php, views/default/page_elements/header.php:
+  Elgg Javascript now goes through the views system 
+
+  	* engine/lib/access.php: A massive speed increase for access permissions. :)
+
+2008-10-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Closes #405: If -> else if. Nice spot. 
+
+2008-10-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/comments/forms/edit.php: removed ratings hook from comments.
+  It will now go into plugins. 
+
+2008-10-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php: updated messaging system with
+  'click to dismiss' and moved it's position to not overlap the top toolbar 
+
+2008-10-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Closes #399 
+
+  	* engine/lib/version.php: Fixes #401 
+
+  	* languages/en.php, mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/start.php: Refs #311: Modified message slightly 
+
+  	* actions/register.php, engine/lib/users.php, .../actions/email/confirm.php,
+  mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/start.php: Fixes #311, closes #345: Validation now
+  called via event 'user', 'validate'. Email validation now a plugin. 
+
+2008-10-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/messages/errors/list.php,
+  views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/messages/list.php: updated messages system 
+
+2008-10-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Removed old validation code 
+
+  	* languages/en.php: Refs #311 : Removing old email confirmation code. 
+
+  	* actions/email/confirm.php: Refs #311 : Removing old email confirmation
+  code. 
+
+  	* engine/lib/install.php: Fixing whitescreen on settings file creation 
+
+  	* mod/uservalidationbyemail/languages/en.php,
+  mod/uservalidationbyemail/manifest.xml, mod/uservalidationbyemail/start.php:
+  Refs #311: Saving stub prior to relocation... 
+
+  	* actions/systemsettings/install.php: Refs #311: Enable email validation
+  module by default 
+
+  	* engine/lib/users.php: Refs #311 
+
+  	* engine/lib/sessions.php: Refs #311 
+
+  	* actions/register.php: Refs #311 
+
+  	* actions/email/save.php: Refs #311 
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php:
+  Closes #398 
+
+  	* engine/lib/install.php, engine/settings.example.php: Fixing installer
+  issue. 
+
+2008-10-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Fitter, happier group links 
+
+  	* engine/lib/admin.php: Added an admin override for container permissions
+  checking. 
+
+  	* mod/groups/start.php: Improved group menu items. 
+
+2008-10-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* crontab.example, engine/handlers/cron_handler.php, engine/lib/cron.php,
+  htaccess_dist, languages/en.php: Improved cron support 
+
+  	* engine/lib/metadata.php: Closes #379 
+
+  	* engine/lib/metadata.php: Closes #389 
+
+  	* engine/lib/database.php, engine/lib/install.php: Fixes #395 
+
+2008-09-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Minor tweaks 
+
+  	* engine/lib/actions.php: Changed to plugin hook 
+
+  	* engine/lib/actions.php: Closes #390: Triggers an event 'action', $action
+  before action is included.  This is rather kludgy and we need to rethink this
+  a bit. 
+
+  	* engine/lib/plugins.php: Actually, bad idea... 
+
+  	* engine/lib/plugins.php: Events now triggered on plugin enable/disable 
+
+  	* actions/friends/remove.php, engine/lib/configuration.php,
+  engine/lib/users.php: Closes #388: Additionally the site check in
+  configuration_init() should be instanceof. Nice spot, thanks. 
+
+2008-09-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php: Messages/error notification system
+  updated with dismiss button, longer delay, and sticky/fixed position (at top
+  of viewport). 
+
+2008-09-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/version.php: Install now works again 
+
+2008-09-30  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/comments/forms/edit.php: ratings hook added to comments
+  block 
+
+2008-09-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added IP address tools, todo check licence. 
+
+  	* engine/lib/notification.php, languages/en.php: Set the notification
+  settings 
+
+  	* engine/lib/notification.php, languages/en.php: Notifications get
+  notification stuff in API form. 
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  languages/en.php, views/default/settings/system.php,
+  views/failsafe/settings/system.php: Closes #383 & #384 
+
+  	* engine/lib/notification.php: Closes #369: For entities which are not users
+  the ->email field is used, failing that it tries to work out an address from
+  ->url and lastly from $CONFIG->site_guid. Closes #382: Fix applied as
+  suggested. 
+
+2008-09-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: get_input can now be properly overridden by
+  set_input. Fixes #324 
+
+2008-09-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: 
+
+  	* engine/lib/api.php: 
+
+  	* engine/lib/api.php: Debug 
+
+  	* engine/lib/api.php, engine/lib/sessions.php, services/api/rest.php:
+  Committing what I have at the end of the day, api still not 100% 
+
+  	* engine/lib/cache.php: Caching support fixed. 
+
+  	* engine/lib/api.php: Fixing auth_token code  
+
+  	* engine/lib/pam.php: Fixed issue with pam handler, now if required method
+  throws an exception the authentication short circuits with false. 
+
+2008-09-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Clear annotations now clears annotations
+  properly when no name is specified. Fixes #357 
+
+  	* engine/lib/annotations.php: Count annotations now fails properly if a
+  metastring is not found. Fixes #377 
+
+2008-09-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Make statisics nicer 
+
+  	* mod/apiadmin/languages/en.php: Make statisics nicer 
+
+  	* engine/lib/api.php: view now set by endpoint 
+
+  	* engine/lib/widgets.php: Closes #326: add_widget uses the specified
+  $user_guid as $widget->owner_guid 
+
+2008-09-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php: 
+
+  	* languages/en.php: Closes #360: Will now install on 5.1.6 or greater with a
+  warning, 5.2 with now warning. 
+
+  	* engine/lib/install.php: Closes #360: Will now install on 5.1.6 or greater
+  with a warning, 5.2 with now warning. 
+
+  	* mod/updateclient/start.php: Modified pinger to use new style endpoint
+  format. Note, this will require ping.elgg.org to be upgraded come next
+  release! 
+
+  	* engine/lib/ping.php: Modified pinger to use new style endpoint format.
+  Note, this will require ping.elgg.org to be upgraded come next release! 
+
+  	* engine/lib/ping.php, mod/diagnostics/start.php,
+  mod/updateclient/start.php, views/default/admin/statistics_opt/basic.php:
+  Closes 374: Using get_version function instead of including the version file.
+
+  	* engine/lib/api.php, languages/en.php: Minor improvements to failure mode. 
+
+  	* engine/lib/api.php: auth_token api call now functional 
+
+  	* services/api/rest.php: Addapted to be called from pagehandler 
+
+  	* engine/lib/api.php: 
+
+2008-09-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Returning cache control back to access permissions.
+
+2008-09-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apiadmin/actions/generate.php, mod/apiadmin/actions/revokekey.php,
+  mod/apiadmin/views/default/object/api_key.php: Added action_gatekeeper() code
+
+  	* engine/lib/api.php: 
+
+  	* engine/lib/api.php: Added endpoint page handler. 
+
+  	* mod/apiadmin/actions/generate.php, mod/apiadmin/actions/revokekey.php,
+  mod/apiadmin/index.php, mod/apiadmin/languages/en.php,
+  mod/apiadmin/manifest.xml, mod/apiadmin/start.php,
+  .../views/default/apiadmin/forms/add_key.php,
+  mod/apiadmin/views/default/object/api_key.php: Introducing API key
+  administration panel 
+
+  	* engine/lib/api.php: Create keypair code added 
+
+  	* engine/lib/api.php: Added create_api_user 
+
+  	* engine/lib/api.php: Added remove_api_user function 
+
+  	* engine/lib/api.php: Will now handle banned users 
+
+2008-09-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/metadata.php: Metadata permissions now
+  work as advertised, but had to remove caching in the process. Will attempt to
+  re-enable it shortly. 
+
+2008-09-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/user/settings/name.php: Closes #362: Nice spot.  Cause was
+  an omission of the user being edited being passed. No security issues
+  introduced by having this user set, since editing user must still pass a
+  canEdit() in the action itself. 
+
+2008-09-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, engine/lib/version.php,
+  engine/schema/upgrades/2008092301.sql, languages/en.php, version.php: The
+  database schema will now automatically update itself on upgrade. 
+
+  	* engine/lib/api.php, engine/start.php: The cache library is now loaded
+  before the main library boot. 
+
+2008-09-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Belts and braces 
+
+2008-09-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/upgrades/2008092301.sql: Database upgrade script from 1.0 to
+  latest schema. 
+
+2008-09-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: API improvement. Authentication via token now logs
+  user in for that session. 
+
+  	* mod/profile/index.php: Closes #367: Widgets only displayed for found
+  profiles. 
+
+2008-09-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Apparently non-p connections are better in many
+  cases, see http://www.slideshare.net/techdude/how-to-kill-mysql-performance 
+
+  	* languages/it.php: Closes #363 
+
+2008-09-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/index.php, friends/of.php: Closes #358 and #359. Well spotted. 
+
+  	* languages/fr.php: Closes #356: Thanks for the contribution! 
+
+2008-09-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: API explanations added to language file 
+
+  	* engine/lib/access.php: Access permissions now cached correctly. 
+
+  	* engine/lib/plugins.php: Optimised plugin query. 
+
+  	* engine/lib/metadata.php: Short circuit added for missing values. 
+
+  	* engine/lib/plugins.php: Removed old gunk 
+
+  	* engine/lib/api.php: Load cache php 
+
+  	* engine/lib/api.php: Changed caching to memory. 
+
+  	* engine/schema/mysql.sql: Added hmac cache of hmacs we have seen before
+  (MEMORY TABLE) 
+
+  	* engine/schema/mysql.sql: Added hmac cache of hmacs we have seen before
+  (MEMORY TABLE) 
+
+  	* engine/lib/api.php: Some api improvements: * User tokens setable * List
+  api no longer requires token 
+
+  	* engine/schema/mysql.sql: Changed users_apisessions to use memory, since
+  there is no reason to store this forever. 
+
+  	* languages/de.php: Added german core from Elgg development group 
+
+  	* engine/lib/system_log.php: System log now using delayed writes. 
+
+2008-09-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Marcus Povey: * Some missing indexes added to
+  database. * Removed privileged path table since this is no longer used. 
+
+  	* engine/lib/elgglib.php: Removed privileged path code since this is no
+  longer used 
+
+  	* engine/lib/entities.php: Closes #346: More granularity on enable/disable. 
+
+  	* mod/reportedcontent/languages/it.php: Italian language patch 
+
+  	* mod/updateclient/languages/it.php: Italian language patch 
+
+  	* mod/river/languages/it.php: Italian language patch 
+
+  	* mod/logbrowser/languages/it.php: Italian language patch 
+
+  	* mod/guidtool/languages/it.php: Italian language patch 
+
+  	* mod/groups/languages/it.php: Italian language patch 
+
+  	* mod/diagnostics/languages/it.php: Italian language patch 
+
+2008-09-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/userdetails.php: Basic XFN support 
+
+2008-09-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php: Added missing translation 
+
+2008-09-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: Closes #349: We need to improve
+  detect_extender_valuetype 
+
+  	* languages/it.php: Closes #348: Thanks for the patch! 
+
+  	* languages/it.php: Closes #339 : Italian alpha core language pack applied.
+  Thanks for the contribution! 
+
+  	* engine/lib/languages.php: Improved language completeness algorithm. 
+
+2008-09-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/fr.php: Closes #342: Thanks for the updates! 
+
+  	* engine/lib/languages.php: Minor tweak: Only shows percentage on things
+  less than 100% complete 
+
+  	* engine/lib/languages.php: Some language helper tools. 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Closes #338: You're
+  quite right, this is was an error on our part. Nice spot! 
+
+  	* engine/lib/languages.php, languages/en.php: Introducing: Admin only
+  translation "completeness" helper. 
+
+2008-09-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/es.php: Preliminary spanish translation 
+
+  	* engine/lib/xml-rpc.php: Refs #172: Removed line endings on spec. 
+
+  	* mod/diagnostics/languages/fr.php, mod/groups/languages/fr.php,
+  mod/logbrowser/languages/fr.php, mod/reportedcontent/languages/fr.php,
+  mod/river/languages/fr.php, mod/updateclient/languages/fr.php: Closes #298:
+  Thankyou for your contribution! 
+
+  	* languages/fr.php: Closes #300: Thanks for the translation! 
+
+  	* languages/en.php, mod/groups/actions/forums/edittopic.php,
+  mod/groups/languages/en.php: Closes #320: Filled in missing translations 
+
+2008-09-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/checkboxes.php, views/default/input/radio.php,
+  .../notifications/settings/usersettings.php: Fixes 334: Radio buttons were
+  part of the problem, label and option were the wrong way round (compare with
+  input/checkboxes).  Second part of the problem was actually with
+  views/default/notifications/settings/usersettings.php, where the value of the
+  field was incorrectly being extracted from the settings array.  Thanks for
+  the spot! 
+
+2008-09-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  views/default/admin/plugins_opt/plugin.php: Closes #327: Thanks for the
+  pointer. In the end I modified the fix from the patch you sent, it still uses
+  get but the generated token should make a CSRF attack much harder. 
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/resetpassword.php,
+  actions/admin/user/unban.php, .../views/default/profile/menu/adminlinks.php:
+  Fixes #332: Added tokens and action_gatekeeper() 
+
+  	* engine/lib/database.php: Fixes #330: I implemented the changes you
+  suggested (except for quotes around the table name). What problems did you
+  encounter? 
+
+  	* mod/reportedcontent/languages/en.php: Refs #331: Trying this again... 
+
+  	* mod/reportedcontent/languages/en.php,
+  views/default/page_elements/owner_block.php: Closes 331: Removed fixed string
+  in translation. Thanks for the spot! 
+
+2008-09-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Set default db to UTF 8... for what it's worth. 
+
+2008-09-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Closes #305 
+
+  	* actions/admin/site/update_basic.php: Fixes #244 
+
+  	* views/default/settings/system.php: Fixes the regression introduced by
+  [2023] 
+
+  	* engine/lib/actions.php, engine/lib/sessions.php: Additional per-session
+  random token, additional randomness protection against CSRF. Report problems.
+
+2008-08-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, engine/lib/sessions.php: Some session
+  fingerprinting code. Requires user agent to be consistent across requests. 
+
+  	* engine/lib/sessions.php: Regenerates session ID on user login. This helps
+  prevent some hijacking attacks. 
+
+  	* engine/lib/sessions.php: Minor tweak, logout now calls session_destroy() 
+
+2008-08-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php, engine/start.php: Closes #313, Fixes #274:
+  Resolved strange OSX language file browsing, including speculative windows
+  fix. Thanks for the patch! 
+
+2008-08-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/canvas/layouts/widgets.php,
+  views/default/navigation/toolbox.php,
+  views/default/navigation/topbar_tools.php: Closes #304: Thanks for the patch!
+
+  	* languages/en.php: Fixes #275: Thanks for the report! 
+
+  	* engine/lib/statistics.php, languages/en.php,
+  views/default/admin/statistics_opt/basic.php: Minor tweak to basic stats to
+  clarify number of users in the system. 
+
+2008-08-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, engine/lib/users.php, languages/en.php: Closes
+  #254: If mb_string is installed then internationalised usernames are
+  supported in file system.  Because of this I have raised mbstring from
+  recommended to a (non-fatal) core requirement.  Because of the lack of a
+  unicode ctype_alnum function the validation occurs at username input. Because
+  of this I have improved the user registration code:  This code now validates
+  for special chars etc in the username. I have also introduced the following
+  new plugin hooks (which are run after primary validation) which provide
+  plugins with the ability to add other requirements (extra security etc). 
+  'registeruser:validate:password' 'registeruser:validate:username'
+  'registeruser:validate:email'  Marcus Povey 25/8/08 
+
+2008-08-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php: Committing kses fix 
+
+2008-08-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Fixed ping error. Fixes #269 
+
+  	* engine/lib/elgglib.php, engine/lib/input.php: Fixed input for people with
+  magic quotes on. 
+
+2008-08-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Actually fixes #269 
+
+  	* actions/systemsettings/install.php: Fixes #269 
+
+2008-08-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added plugin hook to elgg_view. 
+
+2008-08-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Prelude to release 
+
+  	* engine/lib/elgglib.php: Fixes #280 
+
+  	* engine/lib/sessions.php: Blanking session code on initialisation fail 
+
+2008-08-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/dashboard.php: Closes #253: Patch provided by
+  edfactor. Thanks for your contribution! 
+
+2008-08-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/failsafe/pageshells/pageshell.php: install process password box
+  added 
+
+  	* views/failsafe/messages/errors/list.php,
+  views/failsafe/pageshells/pageshell.php: increased the size of the input
+  boxes on the install pages to faciliate url checking 
+
+2008-08-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Making it case insensitive... 
+
+2008-08-20  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/avatar_mini.gif: removed unused image 
+
+2008-08-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/input.php, languages/en.php: Refs #273: Extra sanity checking on
+  install 
+
+2008-08-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Language change 
+
+  	* languages/en.php, views/default/settings/system.php,
+  views/failsafe/settings/system.php: Installation clarity fixes 
+
+2008-08-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Refs #272: Speculative fix. Added PORT support to
+  current_page_url(). Please test to see if this solves your problem... 
+
+  	* version.php: Oopsy, wrong package number  
+
+  	* version.php: Raising point number pre-package 
+
+2008-08-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Revised rewrite rules. 
+
+2008-08-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Refs #266: Error given if no database has been
+  set up. 
+
+  	* engine/lib/database.php, engine/lib/elgglib.php, engine/lib/install.php,
+  install.php, languages/en.php,
+  views/failsafe/messages/exceptions/exception.php: Refs #256: Basic
+  installation parameters checked. Fixes #266: If the install flag isn't set
+  then elgg_view will no longer attempt to load data from the database. 
+
+  	* engine/lib/elgglib.php: Refs #265: If $CONFIG->view not blank then it
+  overrides the session even if the session is set. 
+
+  	* engine/schema/mysql.sql: Fixes #260: Done. Nice spot. 
+
+2008-08-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Small access fix 
+
+  	* CONTRIBUTORS.txt: And again. 
+
+  	* CONTRIBUTORS.txt: Minor contributor file fix. 
+
+  	* engine/lib/access.php: Corrected minor friend collection issue 
+
+2008-08-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* CONTRIBUTORS.txt: changed bens twitter account url 
+
+2008-08-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php: Moving the disable_entities call 
+
+  	* engine/lib/elgglib.php: More submenu corrections 
+
+  	* actions/admin/user/ban.php: Banning a user disables their entities 
+
+  	* engine/lib/entities.php, engine/lib/users.php: Removing a user disables
+  their entities 
+
+2008-08-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Updated for release 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed the submenu 
+
+2008-08-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/graphics/defaultmaster.jpg: default image for cropper tool 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php: The top tool menu is now
+  alphabetically sorted. 
+
+  	* engine/lib/elgglib.php: Submenu items are now sorted. 
+
+  	* mod/groups/start.php: Renamed groups submenus 
+
+  	* mod/groups/languages/en.php: Added a missing translation string to groups.
+
+  	* mod/groups/start.php: Corrected the 'your groups' link 
+
+2008-08-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/spotlight/default.php: spotlight tweaks 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/picker.php: Removed the context menu in the friends
+  picker. 
+
+2008-08-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: force tinyMCE editor initial width for safari 
+
+  	* views/default/page_elements/footer.php: footer updated to fit more links 
+
+  	* _graphics/spotlight_back.gif, views/default/css.php: Opera fixes and new
+  spotlight back 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* dashboard/index.php, dashboard/latest.php, engine/lib/elgglib.php,
+  languages/en.php, views/default/dashboard/blurb.php: Wired in latest
+  activity, so new users aren't as lonely as they otherwise might be. 
+
+2008-08-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  .../views/default/object/groupforumtopic.php: groups listing icon changed
+  from tiny to small latest discussion listing info block styled up 
+
+2008-08-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/footer.php: footer tweak 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php: Ensuring that tags are saved correctly in
+  profile 
+
+2008-08-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php, views/default/css.php: avatar
+  menu fixes for IE 
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/javascript.php: avatar menu fix for IE
+  groups and profile pages 
+
+2008-08-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* INSTALL.txt: Updated installation instructions 
+
+2008-08-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/javascript.php: avatar menu in IE, z-index
+  bug work-around 
+
+  	* mod/profile/views/default/profile/javascript.php, views/default/css.php:
+  tools menu removed dynamic z-index 
+
+2008-08-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/userdetails.php: Removed avatar context
+  menu from large profile picture 
+
+  	* mod/logbrowser/start.php, .../views/default/logbrowser/adminlinks.php,
+  mod/profile/start.php, .../views/default/profile/menu/adminlinks.php,
+  .../views/default/profile/menu/adminwrapper.php: Admin links are now
+  consolidated 
+
+  	* engine/lib/users.php: Removing gallery on search user list function 
+
+2008-08-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: menu selected item ie6 fix 
+
+2008-08-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/spotlight/default.php: a little content added to the
+  spotlight 
+
+  	* .../views/default/reportedcontent/listing.php: reported content tweak 
+
+2008-08-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php, mod/profile/start.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/metatags.php: Individual profile items can
+  now have access restrictions; also made the profile JS more cache friendly 
+
+2008-08-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/listing.php, views/default/css.php:
+  reported content updates 
+
+  	* views/default/css.php: tools settings updated 
+
+2008-08-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: lang string missing 
+
+2008-08-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: groups widget fixed for ie6 
+
+2008-08-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/diagnostics/languages/en.php, mod/diagnostics/start.php: Globals and
+  PHP info added to diagnostics 
+
+2008-08-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php: further tweaks on admin
+  settings 
+
+  	* views/default/admin/plugins_opt/plugin.php: plugin settings moved to
+  hidden dropdown 
+
+2008-08-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Code also useless 
+
+  	* engine/lib/entities.php: Salt free diet 
+
+2008-08-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php, views/default/css.php: avatar
+  menu fixed in admin area, admin area h3's fixed 
+
+2008-08-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/owner_block_menu_dot.gif, views/default/css.php: owner block
+  menu 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Correction for the search list users by name
+  function. 
+
+  	* mod/reportedcontent/languages/en.php: A rookie error. 
+
+2008-08-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/joinrequest.php:
+  Closes #234: Please use brackets defensively; The statement:  if ($user =
+  get_entity($foo) && $group = get_entity($bar))  Will not do what you expect
+  it to do! 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, languages/en.php, search/users.php,
+  views/default/user/search/finishblurb.php: Added proper search for users by
+  name 
+
+  	* mod/groups/views/rss/forum/topics.php,
+  mod/groups/views/rss/forum/viewposts.php,
+  mod/groups/views/rss/groups/profileitems.php: RSS views for forums 
+
+  	* views/rss/group/default.php: Group default RSS view 
+
+2008-08-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: sidebar arrow position fixed for ie 6 & 7 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, mod/profile/icon.php, mod/profile/javascript.php,
+  views/default/friends/picker.php, views/default/page_elements/header.php:
+  Caching enhancements 
+
+2008-08-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: screwed up profile page on ie6 fixed 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php: Added a language entry for reported
+  items (again) 
+
+2008-08-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/membership.php: gallery view removed from group lists 
+
+  	* mod/reportedcontent/index.php: reportedcontent bug sorted 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forms/groups/invite.php: Ensured that all friends
+  come through for group invite 
+
+  	* mod/groups/views/default/forms/groups/invite.php: Ensured that all friends
+  come through for group invite 
+
+  	* views/default/page_elements/owner_block.php: Owner block defaults to
+  current logged in user. 
+
+  	* engine/lib/input.php: Improved the kses whitelist 
+
+2008-08-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install.php, views/failsafe/canvas/default.php,
+  views/failsafe/input/button.php, views/failsafe/input/checkboxes.php,
+  views/failsafe/input/form.php, views/failsafe/input/hidden.php,
+  views/failsafe/input/longtext.php, views/failsafe/input/pulldown.php,
+  views/failsafe/input/reset.php, views/failsafe/input/submit.php,
+  views/failsafe/input/text.php, views/failsafe/messages/messages/list.php,
+  views/failsafe/messages/messages/message.php,
+  views/failsafe/pageshells/pageshell.php, views/failsafe/settings/install.php,
+  views/failsafe/settings/system.php: Closes #224: Install now using failsafe
+  views. Please test from scratch (including blanking setup) and make sure it
+  works for you! 
+
+2008-08-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/membership.php: groups view tweaked 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php, views/default/navigation/pagination.php,
+  views/default/widgets/wrapper.php: Removed pagination in widgets 
+
+  	* engine/lib/relationships.php: Added the ability to hide the gallery view
+  on list_entities_from_relationships 
+
+  	* languages/en.php: Language addition to make it clearer that you need to
+  validate before you can log in. 
+
+2008-08-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: group lang bug fixed 
+
+  	* mod/reportedcontent/actions/add.php,
+  mod/reportedcontent/actions/archive.php,
+  mod/reportedcontent/actions/delete.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/start.php, .../views/default/reportedcontent/css.php,
+  .../views/default/reportedcontent/listing.php: reported content updated 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php: Added a language entry for reported
+  items 
+
+2008-08-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: owner block head - divider
+  line method changed to work in ie6 
+
+  	* views/default/css.php: owner block fixes and blog post tweaks 
+
+2008-08-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php, mod/profile/views/default/profile/listing.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/input/checkboxes.php, views/default/search/entity_list.php:
+  Refs #249 
+
+2008-08-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, index.php: The front page now only shows content
+  and groups. 
+
+2008-08-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/edit.php, views/default/page_elements/owner_block.php: Refs
+  #249 
+
+2008-08-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/reportedcontent/languages/en.php,
+  .../views/default/reportedcontent/listing.php: reported content tweaks 
+
+2008-08-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/userdetails.php, views/default/css.php: IE
+  6 & 7 profile page avatar menu and submenu fixed, toolbar new msg icon
+  position, 
+
+2008-08-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: owner block changes 
+
+2008-08-14  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/reportedcontent/listing.php: reportedcontent list tweaks
+
+2008-08-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed an issue with the submenu. 
+
+2008-08-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Fixes #245: Tags now stripped from email
+  messages. 
+
+2008-08-14  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/diagnostics/index.php, mod/logbrowser/index.php,
+  mod/reportedcontent/index.php: more owner blocks added 
+
+  	* admin/plugins/index.php, admin/site/index.php, admin/statistics/index.php,
+  admin/user/index.php: owner block added to admin pages 
+
+2008-08-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: collections, friends picker, status, search items
+  updated for IE6 
+
+  	* views/default/friends/picker.php, views/default/friends/tablelist.php:
+  friends picker table bug fixed and spacing adjusted on collections 
+
+2008-08-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Redefined the default submenu item group to 'a',
+  so most usually it will appear on top 
+
+  	* mod/groups/start.php, views/default/canvas_header/submenu_group.php,
+  views/default/page_elements/owner_block.php: Further submenu clustering 
+
+  	* engine/lib/elgglib.php, views/default/canvas_header/submenu_group.php:
+  Added the facility to group submenus 
+
+2008-08-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js, views/default/css.php: friends picker
+  modified for IE 6 
+
+  	* _graphics/friends_picker_arrow_left.gif,
+  _graphics/friends_picker_arrow_right.gif: new picker arrows 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/confirm.php, actions/register.php, engine/lib/entities.php,
+  engine/lib/users.php: Closes #227 and #243: Hopefully this has the fscking
+  thing nailed to the wall.  Please report any problems, especially is they
+  relate to access permissions (granted when you shouldn't or denied when you
+  should)   
+
+  	* mod/diagnostics/languages/en.php, mod/diagnostics/start.php: Added session
+  to diagnostics. 
+
+  	* engine/lib/sessions.php: Fixing some session blanking problems. 
+
+  	* actions/email/confirm.php, actions/register.php, engine/lib/entities.php,
+  engine/lib/users.php: Reverted changes so users can now register again. 
+  There are critical issues with enable/disable.  Primarily:  1) A number of
+  functions do not use the access controls, these throw an exception when
+  accessing a disabled entity.  2) #243 does not seem possible.  
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: owner block fixed for safari
+  and ie6 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, languages/en.php: Correct menus being used 
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/members.php, views/default/css.php: numerous
+  polishing and rendering fixes to groups 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: 
+
+  	* actions/admin/user/unban.php, engine/lib/admin.php,
+  engine/lib/entities.php, languages/en.php,
+  .../views/default/profile/menu/adminlinks.php: Refs #237: Added option, now
+  just needs a search listing banned users.  Depends #243 
+
+  	* actions/email/confirm.php, actions/register.php, engine/lib/entities.php:
+  Closes #227. Depends on #243 to work. 
+
+  	* engine/lib/access.php: Refs #237, #46 and #227: Added override code. 
+
+  	* engine/lib/entities.php: Actually closes #46 
+
+  	* views/default/admin/plugins_opt/plugin.php: placeholder for settings
+  toggle 
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: login and register boxes fixed 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: Now only displays 'report
+  this' when plugin is enabled. 
+
+2008-08-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: Sturdier enhancement for the
+  owner block. 
+
+  	* index.php, languages/en.php, mod/pages/actions/pages/delete.php,
+  mod/pages/actions/pages/edit.php, mod/pages/actions/pages/editwelcome.php,
+  mod/pages/edit.php, mod/pages/history.php, mod/pages/images/application.png,
+  mod/pages/images/code.png, mod/pages/images/css.png, mod/pages/images/db.png,
+  mod/pages/images/directory.png, mod/pages/images/doc.png,
+  mod/pages/images/file.gif, mod/pages/images/file.png,
+  mod/pages/images/film.png, mod/pages/images/flash.png,
+  mod/pages/images/folder-closed.gif, mod/pages/images/folder.gif,
+  mod/pages/images/folder_open.png, mod/pages/images/html.png,
+  mod/pages/images/java.png, mod/pages/images/linux.png,
+  mod/pages/images/minus.gif, mod/pages/images/music.png,
+  mod/pages/images/pdf.png, mod/pages/images/php.png,
+  mod/pages/images/picture.png, mod/pages/images/plus.gif,
+  mod/pages/images/ppt.png, mod/pages/images/psd.png,
+  mod/pages/images/ruby.png, mod/pages/images/script.png,
+  mod/pages/images/spinner.gif, mod/pages/images/treeview-black-line.gif,
+  mod/pages/images/treeview-black.gif,
+  mod/pages/images/treeview-default-line.gif,
+  mod/pages/images/treeview-default.gif,
+  mod/pages/images/treeview-famfamfam-line.gif,
+  mod/pages/images/treeview-famfamfam.gif,
+  mod/pages/images/treeview-gray-line.gif, mod/pages/images/treeview-gray.gif,
+  mod/pages/images/treeview-red-line.gif, mod/pages/images/treeview-red.gif,
+  mod/pages/images/txt.png, mod/pages/images/xls.png, mod/pages/images/zip.png,
+  mod/pages/index.php, mod/pages/javascript/jquery.treeview.async.js,
+  mod/pages/javascript/jquery.treeview.js, mod/pages/languages/en.php,
+  mod/pages/manifest.xml, mod/pages/new.php, mod/pages/pagesTree.php,
+  mod/pages/start.php, mod/pages/view.php,
+  mod/pages/views/default/annotation/icon.php,
+  mod/pages/views/default/annotation/page.php,
+  mod/pages/views/default/forms/pages/edit.php,
+  .../views/default/forms/pages/editwelcome.php,
+  mod/pages/views/default/object/page.php,
+  mod/pages/views/default/object/page_top.php,
+  mod/pages/views/default/pages/breadcrumbs.php,
+  mod/pages/views/default/pages/css.php,
+  .../views/default/pages/groupprofile_pages.php,
+  mod/pages/views/default/pages/menu.php,
+  mod/pages/views/default/pages/metatags.php,
+  mod/pages/views/default/pages/pagegallery.php,
+  mod/pages/views/default/pages/pagelisting.php,
+  mod/pages/views/default/pages/pageprofile.php,
+  .../views/default/pages/sidebar/sidebarthis.php,
+  mod/pages/views/default/pages/sidebar/starter.php,
+  mod/pages/views/default/pages/sidebar/tree.php,
+  mod/pages/views/default/pages/sidebar/wrapper.php,
+  mod/pages/views/default/pages/welcome.php, mod/pages/welcome.php,
+  mod/pages/world.php: Added a new latest activity title to the front page 
+
+  	* views/default/page_elements/owner_block.php: The owner block now doesn't
+  display at all if there's no page owner 
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php, views/default/css.php: front page
+  login box 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php: Banned now gives a reason why user disabled. 
+
+  	* engine/lib/entities.php: Added a reason for disabled objects. 
+
+  	* engine/lib/entities.php: Closes #46: Method for activating an entity. No
+  hookup yet. 
+
+  	* engine/lib/access.php: Refs #237, #46 and #227: Added active only override
+  to get_access_sql_suffix 
+
+2008-08-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/add.php, mod/blog/actions/delete.php,
+  mod/blog/actions/edit.php, mod/blog/add.php, mod/blog/edit.php,
+  mod/blog/everyone.php, mod/blog/friends.php, mod/blog/index.php,
+  mod/blog/languages/en.php, mod/blog/manifest.xml, mod/blog/read.php,
+  mod/blog/start.php, mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/gallery.php,
+  mod/blog/views/default/blog/listing.php,
+  mod/blog/views/default/blog/menu.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/view.php, mod/blog/views/default/object/blog.php,
+  mod/blog/views/default/river/blog/annotate.php,
+  mod/blog/views/default/river/blog/create.php,
+  mod/blog/views/default/river/blog/update.php: This shouldn't be here! 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/delete.php, engine/lib/group.php,
+  engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: Fixes
+  #241: Changed order, delete user using object's delete method rather than the
+  low level function 
+
+2008-08-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: Removed page handler default errors 
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: widget boxes fixed for IE 
+
+2008-08-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Added a page handler for the dashboard 
+
+2008-08-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/useradd.php, engine/lib/sessions.php: Fixes #238: Problem was
+  caused by authenticate not having the user email validated flag set. 
+  Introduced new flag ->admin_created to distinguish between the two types.  
+
+2008-08-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php: A warning fix for the dashboard
+  layout. 
+
+  	* views/default/input/button.php, views/default/input/form.php: Some safety
+  fixes for the new form views 
+
+  	* engine/lib/elgglib.php: Only log warnings in debug mode. 
+
+  	* mod/blog/actions/add.php, mod/blog/actions/delete.php,
+  mod/blog/actions/edit.php, mod/blog/add.php, mod/blog/edit.php,
+  mod/blog/everyone.php, mod/blog/friends.php, mod/blog/index.php,
+  mod/blog/languages/en.php, mod/blog/manifest.xml, mod/blog/read.php,
+  mod/blog/start.php, mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/gallery.php,
+  mod/blog/views/default/blog/listing.php,
+  mod/blog/views/default/blog/menu.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/view.php, mod/blog/views/default/object/blog.php,
+  mod/blog/views/default/river/blog/annotate.php,
+  mod/blog/views/default/river/blog/create.php,
+  mod/blog/views/default/river/blog/update.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  .../canvas/layouts/two_column_right_sidebar.php,
+  views/default/input/form.php: Removing some messages 
+
+  	* engine/lib/pagehandler.php: Removing an error log entry in the page
+  handler function 
+
+  	* engine/lib/elgglib.php: Fixed select class issue for submenus 
+
+  	* search/index.php: Reinstated search label. 
+
+  	* mod/logbrowser/start.php, mod/profile/start.php: Admin links on profile
+  pages and in user context menus appear at the bottom. 
+
+  	* mod/profile/views/default/profile/userdetails.php: The profile edit button
+  is now wired up so that admins can edit any user. 
+
+  	* engine/lib/access.php, engine/lib/admin.php: Admins now see all! 
+
+2008-08-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: extra float clear for ie6 
+
+  	* _graphics/icon_gallery.gif: new gallery icon 
+
+  	* _graphics/blockquote.png, _graphics/dummy_river_icon.gif,
+  _graphics/footer_logo.gif: removed images not used 
+
+  	* _graphics/icon_bookmarkthis.gif, _graphics/icon_reportthis.gif,
+  views/default/css.php: owner block additional icons 
+
+2008-08-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/reportedcontent/listing.php: small tweak to reported
+  content 
+
+  	* mod/reportedcontent/actions/add.php, mod/reportedcontent/add.php,
+  mod/reportedcontent/index.php, mod/reportedcontent/languages/en.php,
+  mod/reportedcontent/manifest.xml, mod/reportedcontent/start.php,
+  .../views/default/reportedcontent/form.php,
+  .../views/default/reportedcontent/listing.php,
+  .../views/default/reportedcontent/user_report.php: report content added as a
+  core plugin. Still needs a couple of bits wired up. 
+
+  	* views/default/page_elements/owner_block.php: owner block tweaked to add
+  report this 
+
+2008-08-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Removed superadmin access controls. You can't call
+  get_entity from within get_access_sql_suffix and get_access_array as it
+  causes an infinite loop.  The only safe way to do this is via a plugin hook. 
+
+  	* actions/systemsettings/install.php: Refs #232: Diagnostics now on by
+  default on new installs. 
+
+  	* mod/diagnostics/actions/download.php, mod/diagnostics/index.php,
+  mod/diagnostics/languages/en.php, mod/diagnostics/manifest.xml,
+  mod/diagnostics/start.php, .../views/default/diagnostics/forms/download.php:
+  Closes #232: Produces a basic report plus checksums of all files in md5sum
+  format.  To add extra information to this report add a plugin hook listening
+  to:  'diagnostics:report'  And append to $returnvalue which is a simple text
+  buffer. 
+
+2008-08-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: sidebar menu additions 
+
+  	* _graphics/icons/default/large.png, _graphics/icons/default/medium.png,
+  _graphics/icons/default/small.png, _graphics/icons/default/tiny.png: new
+  default entity icons 
+
+2008-08-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Further access additions for admins. 
+
+  	* engine/lib/access.php: Admins can now see private data. 
+
+  	* mod/groups/views/default/forms/groups/invite.php: Group invites now uses
+  the friends picker. 
+
+2008-08-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/owner_block.php: bookmark this and report this
+  (still to be wired up) added to the owner block 
+
+2008-08-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/register.php, actions/useradd.php, engine/lib/users.php: Closes
+  #229: Admin signup now using different view + no password validation for
+  admin signup 
+
+  	* actions/register.php, engine/lib/exceptions.php, engine/lib/users.php,
+  languages/en.php, views/default/account/forms/register.php: Refs #229 :
+  Register now has more granular messages, dupe email checkiong, sanitisation +
+  fill in the blanks failure mode! (yay) 
+
+2008-08-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/members.php, views/default/css.php: groups
+  pages interface fixes/cleanup 
+
+2008-08-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Improved front page. 
+
+  	* mod/groups/start.php: Groups now links to a better place when you're
+  logged out. 
+
+2008-08-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Slight tweak to rewrite rules. 
+
+  	* actions/systemsettings/install.php: Forward not gatekeeper 
+
+2008-08-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: pagination display tweaked 
+
+2008-08-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/views/default/logbrowser/css.php, views/default/css.php:
+  settings and admin pages cleaned 
+
+2008-08-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, index.php, views/default/welcome/logged_out.php:
+  Added latest content to the front page 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/form.php: Logic error 
+
+  	* actions/friends/deletecollection.php: Refs #228: Will now error if
+  collection can not be deleted 
+
+2008-08-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: 
+
+  	* javascript/initialise_elgg.js: toggle more info button for admin panel
+  added 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/form.php: Added ability to disable security
+  enhancements on form (for certain cases) 
+
+2008-08-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, search/index.php: Clearer titles for search 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/forms/edit.php: 
+
+  	* actions/friends/addcollection.php, views/default/friends/forms/edit.php:
+  Refs #210 & #211: Friends form moved to action_gatekeeper code. 
+
+2008-08-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: Improved search submenu items 
+
+  	* languages/en.php: A clearer registration message. 
+
+  	* engine/lib/notification.php: Downgraded UTF support in the email
+  notification function to optional 
+
+2008-08-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins_opt/plugin.php: plugin admin layout tweaks 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, languages/en.php: Minor bugfix to
+  actions_gatekeeper() 
+
+  	* engine/schema/mysql.sql: Usernames now unique 
+
+2008-08-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/settings/system.php: further admin layout tweak 
+
+  	* views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php: further admin layout tweaks 
+
+  	* .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php: user settings tweaks 
+
+  	* .../notifications/settings/usersettings.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php: user settings tweaked 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/comments/add.php, views/default/comments/forms/edit.php: Refs #210
+  & #211 : Updated comments form 
+
+  	* actions/widgets/save.php, views/default/widgets/editwrapper.php: Refs #210
+  & #211 : Widgets edit now using action_gatekeeper 
+
+  	* views/default/input/form.php: Minor modifications to form. 
+
+2008-08-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/grouplisting.php,
+  mod/profile/views/default/profile/listing.php: Added class to user and group
+  details 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  actions/usersettings/save.php, views/default/settings/system.php,
+  views/default/usersettings/form.php: Refs #210 & #211 : Some more core
+  settings / admin pages moved to use admin_gatekeeper. Install script action
+  now also refuses to be run if the site has already been installed. 
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  views/default/object/plugin.php: Refs #210 & #211 : Plugins settings
+  converted. 
+
+2008-08-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/toolbar_messages_icon.gif, views/default/css.php,
+  views/default/welcome/logged_in.php, views/default/welcome/logged_out.php:
+  toolbar messages icon rollover state added. Logged in/out front page wrapped
+  in paragraph tags 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/basic_elements/login.php: Removed basic_elements/login ...
+  didn't seem to be used and is duped by main login. 
+
+  	* actions/register.php, actions/useradd.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php: Refs #210 & #211 
+
+2008-08-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/users.php,
+  search/index.php: Added a search submenu. 
+
+2008-08-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/user/requestnewpassword.php, languages/en.php:
+  Refs #210 & #211 
+
+2008-08-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/widgets/a_users_groups/view.php: group profile widget
+  tweaked 
+
+2008-08-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Closes #223 
+
+2008-08-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: top toolbar elements fixed for ie 
+
+  	* views/default/css.php, views/default/navigation/pagination.php: pagination
+  overlap in ie fixed 
+
+  	* javascript/friendsPickerv1.js, views/default/css.php: 
+
+  	* views/default/css.php: 
+
+2008-08-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php,
+  .../views/default/widgets/a_users_groups/edit.php,
+  .../views/default/widgets/a_users_groups/view.php: a simple widget that
+  displays a users groups on their profile 
+
+  	* mod/groups/views/default/groups/grouplisting.php: group listings now
+  include the brief description 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/users.php,
+  mod/groups/actions/forums/addtopic.php, mod/groups/addtopic.php,
+  mod/groups/topicposts.php: Major access fix. 
+
+  	* engine/lib/entities.php, engine/lib/group.php: Solved write issues in
+  groups for non-admin users. 
+
+  	* README.txt: Slight readme update. 
+
+  	* CONTRIBUTORS.txt, account/forgotten_password.php,
+  actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  actions/admin/site/update_basic.php, actions/admin/user/ban.php,
+  actions/admin/user/delete.php, actions/admin/user/makeadmin.php,
+  actions/admin/user/resetpassword.php, actions/email/save.php,
+  actions/entities/delete.php, actions/import/opendd.php,
+  .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/user/language.php, actions/user/name.php, actions/user/password.php,
+  actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  actions/useradd.php, admin/plugins/index.php, admin/site/index.php,
+  admin/statistics/index.php, admin/user/index.php,
+  engine/handlers/cron_handler.php, engine/handlers/xml-rpc_handler.php,
+  engine/lib/admin.php, engine/lib/annotations.php, engine/lib/api.php,
+  engine/lib/cache.php, engine/lib/entities.php, engine/lib/exceptions.php,
+  engine/lib/export.php, engine/lib/extender.php, engine/lib/filestore.php,
+  engine/lib/group.php, engine/lib/input.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, engine/lib/notification.php,
+  engine/lib/opendd.php, engine/lib/pam.php, engine/lib/ping.php,
+  engine/lib/plugins.php, engine/lib/query.php, engine/lib/relationships.php,
+  engine/lib/river.php, engine/lib/sites.php, engine/lib/statistics.php,
+  engine/lib/system_log.php, engine/lib/tags.php, engine/lib/usersettings.php,
+  engine/lib/xml-rpc.php, engine/lib/xml.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/edit.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/groups/all.php, mod/groups/discussions.php,
+  mod/groups/edit.php, mod/groups/graphics/icon.php,
+  mod/groups/groupprofile.php, mod/groups/index.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/membership.php, mod/groups/new.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/group/group.php,
+  mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/icon.php,
+  .../default/river/ElggRelationship/create.php,
+  mod/groups/views/default/sharing/invite.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php, mod/guidtool/export.php,
+  mod/guidtool/format_picker.php, mod/guidtool/import.php,
+  mod/guidtool/index.php, mod/guidtool/languages/en.php,
+  mod/guidtool/start.php, mod/guidtool/view.php,
+  .../views/default/forms/guidtool/export.php,
+  .../views/default/forms/guidtool/format.php,
+  .../views/default/forms/guidtool/import.php,
+  mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php,
+  mod/guidtool/views/default/guidtool/profile.php,
+  .../views/default/object/guidtoolwrapper.php, mod/logbrowser/index.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  mod/logbrowser/views/default/object/logwrapper.php,
+  mod/profile/actions/cropicon.php, mod/profile/actions/edit.php,
+  mod/profile/actions/iconupload.php, mod/profile/edit.php,
+  mod/profile/editicon.php, mod/profile/icon.php, mod/profile/index.php,
+  mod/profile/javascript.php, mod/profile/start.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/userdetails.php, mod/river/start.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/edit.php,
+  .../default/widgets/river_widget_friends/view.php,
+  mod/updateclient/languages/en.php, mod/updateclient/start.php,
+  .../views/default/settings/updateclient/edit.php, services/api/rest.php,
+  services/export/handler.php, settings/statistics/index.php,
+  settings/user/index.php, views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/useradd.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/admin/plugins.php,
+  views/default/admin/plugins_opt/plugin.php, views/default/admin/site.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php, views/default/api/output.php,
+  views/default/comments/forms/edit.php, views/default/export/entity.php,
+  views/default/export/metadata.php, views/default/export/relationship.php,
+  views/default/graphics/icon.php, views/default/group/default.php,
+  views/default/input/button.php, views/default/input/form.php,
+  views/default/input/hidden.php, views/default/input/reset.php,
+  views/default/input/submit.php, .../notifications/settings/usersettings.php,
+  views/default/object/default.php, views/default/object/object.php,
+  views/default/object/plugin.php, views/default/output/iframe.php,
+  views/default/river/ElggRelationship/create.php,
+  views/default/river/dashboard.php, views/default/site/default.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php,
+  views/failsafe/pageshells/pageshell.php, views/foaf/pageshells/pageshell.php,
+  views/json/api/output.php, views/json/canvas/default.php,
+  views/json/export/entity.php, views/json/export/metadata.php,
+  views/json/export/relationship.php, views/json/group/default.php,
+  views/json/messages/exceptions/exception.php, views/json/object/default.php,
+  views/json/pageshells/pageshell.php, views/json/search/entity_list.php,
+  views/json/site/default.php, views/json/user/default.php,
+  views/opendd/canvas/default.php, views/opendd/export/entity.php,
+  views/opendd/export/metadata.php, views/opendd/export/relationship.php,
+  views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/site/default.php, views/opendd/user/default.php,
+  views/php/api/output.php, views/php/canvas/default.php,
+  views/php/export/entity.php, views/php/export/metadata.php,
+  views/php/export/relationship.php, views/php/group/default.php,
+  views/php/messages/exceptions/exception.php, views/php/object/default.php,
+  views/php/pageshells/pageshell.php, views/php/search/entity_list.php,
+  views/php/site/default.php, views/php/user/default.php,
+  views/xml/api/output.php, views/xml/messages/exceptions/exception.php,
+  views/xml/pageshells/pageshell.php, views/xml/xml-rpc/output.php: Adjusted
+  contributors file. 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/forms/guidtool/export.php,
+  mod/profile/views/default/profile/icon.php,
+  views/default/canvas/layouts/widgets.php, views/default/input/button.php,
+  views/default/messages/exceptions/exception.php,
+  views/failsafe/messages/exceptions/exception.php: Remaining htmlentities
+  calls converted to utf-8 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* INSTALL.txt: Small formatting correction to the install file. 
+
+  	* CONTRIBUTORS.txt, INSTALL.txt, README.txt: Added content to stub files 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/confirm.php, engine/lib/notification.php,
+  engine/lib/users.php, languages/en.php: Closes #221: Body and subject now
+  internationalised. 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: The title no longer causes a WSOD 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/checkboxes.php, views/default/input/hidden.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Refs #206:
+  Hopefully the last of it. Please remember to use htmlentities($foo, null,
+  'UTF-8'); whenever using htmlentities! 
+
+2008-08-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/icon.php: Refs #206: A better solution 
+
+  	* mod/profile/views/default/profile/icon.php: Refs #206; Icons title now
+  displayed correctly 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/canvas/layouts/widgets.php: Added extra
+  translation strings to the widget canvas 
+
+2008-08-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/navigation/pagination.php: pagination
+  "..." fixed 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/addtopic.php, mod/groups/discussions.php,
+  mod/groups/edittopic.php, mod/groups/topicposts.php: Removing some wsod
+  issues 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php, views/default/page_elements/header.php,
+  views/default/pageshells/pageshell.php: Refs #206: Character encoding on both
+  widget and main page now UTF-8 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Group forums should work 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, views/default/input/form.php: Closes #220: Removed
+  action from hash. Timestamp should make this unpredictable enough. 
+
+  	* views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php, views/default/input/access.php,
+  views/default/input/button.php, views/default/input/checkboxes.php,
+  views/default/input/email.php, views/default/input/file.php,
+  views/default/input/longtext.php, views/default/input/password.php,
+  views/default/input/pulldown.php, views/default/input/radio.php,
+  views/default/input/reset.php, views/default/input/submit.php,
+  views/default/input/tags.php, views/default/input/text.php,
+  views/default/input/url.php: Refs #211: Two forms converted + extra
+  functionality to input views 
+
+  	* engine/lib/dummy.php: Removed dummy 
+
+2008-08-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/css.php: continuation of cleanup on groups 
+
+2008-08-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Friendly titles no longer have more than one
+  hyphen in a row 
+
+2008-08-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php,
+  mod/groups/views/default/groups/forum_latest.php: latest discussions widget 
+
+2008-08-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: Put minor fix back 
+
+2008-08-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: lang tweak on groups 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php, engine/lib/sessions.php: Removed ElggDummy live
+  code for now. 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/css.php: groups css added 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/statistics.php: Elgg.org -> elgg.com 
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/members.php: Group forum additions 
+
+  	* mod/groups/languages/en.php: Small grammar correction 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/deletepost.php, mod/groups/start.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/groups/forum_latest.php: more group tweaks 
+
+2008-08-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js: updated, cleaned-up, credited, and tweaked
+  friends picker 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/group.php, engine/lib/objects.php,
+  engine/lib/sites.php, engine/lib/users.php: Centralised set and get magic
+  functions to the tlc. Added isset and unset magic methods.  Report any
+  problems! 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php: Slight change to group vocabulary. 
+
+  	* mod/groups/topicposts.php,
+  mod/groups/views/default/groups/groupprofile.php: Wired up group member count
+  and fixed topic page title 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/addpost.php: group tweak 
+
+  	* .../views/default/object/groupforumtopic.php: changed the latest
+  discussion view 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: removed print_r 
+
+  	* engine/lib/dummy.php, engine/lib/pageowner.php, engine/lib/sessions.php,
+  views/default/page_elements/title.php: Refs #174: Introducing the ElggDummy
+  class which returns false for all methods and set variables called on it.
+  This is what the logged out $_SESSION['user'] is set to and is also what
+  page_owner_entity will return if page_owner is invalid.  This means that
+  calls to things like $_SESSION['user']->getGUID() are now safe and will no
+  longer cause a parsing error.  Please report any issues. 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Adjusted list_entities_from_annotations to
+  hide the gallery view by default 
+
+  	* .../views/default/object/groupforumtopic.php: Minor language change to
+  group topics 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/discussions.php, mod/groups/languages/en.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  .../views/default/object/groupforumtopic.php: more group profile work 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/index.php, mod/groups/languages/en.php,
+  mod/groups/membership.php, mod/groups/start.php: Added a 'member of' groups
+  page and made it default 
+
+  	* engine/lib/access.php, mod/groups/start.php, mod/profile/start.php: Fixed
+  access permissions wrt groups 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php: new tools menu added -
+  latest discussion 
+
+  	* mod/groups/languages/en.php,
+  mod/groups/views/default/groups/forum_latest.php: forum latest for group
+  profile page 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Removed an extra sanitise_string call in
+  update_annotations 
+
+2008-08-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/forums/addpost.php,
+  mod/groups/actions/forums/addtopic.php,
+  mod/groups/actions/forums/deletetopic.php,
+  mod/groups/actions/forums/edittopic.php, mod/groups/addtopic.php,
+  mod/groups/edittopic.php, mod/groups/forum.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/topicposts.php,
+  mod/groups/views/default/forms/forums/addpost.php,
+  mod/groups/views/default/forms/forums/addtopic.php,
+  .../views/default/forms/forums/edittopic.php,
+  mod/groups/views/default/forum/topicposts.php,
+  mod/groups/views/default/forum/topics.php,
+  mod/groups/views/default/forum/viewposts.php,
+  mod/groups/views/default/groups/forum_latest.php,
+  mod/groups/views/default/groups/profileitems.php: groups now have forums 
+
+2008-08-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/toolbar_arrow_ie.gif, views/default/css.php,
+  views/default/navigation/topbar_tools.php: new dropdown toolbar menu that
+  works corss platform. Widget page layout fixed for ie6 & 7 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Refs #210: Will trigger a plugin hook
+  'action_gatekeeper:permissions:check'. 
+
+  	* views/default/page_elements/title.php: Refs #174: Checking that session
+  user exists before calling methods on it 
+
+  	* install.php: Install site secret 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/languages/en.php, mod/logbrowser/start.php,
+  .../views/default/logbrowser/adminlinks.php: Added explore log option to user
+  context menu, albeit in the wrong place. 
+
+  	* languages/en.php, views/default/admin/statistics.php: Direct link from
+  statistics through to elgg.org 
+
+  	* languages/en.php: Adjusted statistics message 
+
+  	* languages/en.php, views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php: Updated admin statistics 
+
+  	* engine/lib/system_log.php: You can now filter by ID. 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/graphics/icon.php: Minor tweaks to the default icon 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/views/default/object/logwrapper.php: Easy drilldown into
+  logs 
+
+  	* engine/lib/system_log.php: System log functions now allow searching. 
+
+  	* mod/logbrowser/index.php, mod/logbrowser/languages/en.php,
+  mod/logbrowser/start.php, mod/logbrowser/views/default/logbrowser/css.php,
+  mod/logbrowser/views/default/logbrowser/form.php,
+  mod/logbrowser/views/default/object/logwrapper.php: The log browser is now
+  searchable. 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, languages/en.php: Closes #218 
+
+2008-08-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/index.php, mod/logbrowser/start.php,
+  .../views/default/logbrowser/gallery.php,
+  .../views/default/logbrowser/listing.php,
+  mod/logbrowser/views/default/object/logwrapper.php: Initial changes to log
+  browser 
+
+2008-08-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/form.php: Todo has been done 
+
+2008-08-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: collections, pages nav and numerous other fixes 
+
+  	* views/default/css.php: breadcrumbs sorted 
+
+  	* mod/groups/views/default/groups/groupprofile.php, views/default/css.php:
+  groups styles and group owner layout changed 
+
+2008-08-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: title block tweaked 
+
+2008-08-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/owner_block_menu_arrow.gif, views/default/css.php: owner block
+  menu 'selected' style added 
+
+2008-08-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/profileitems.php: group profile layout
+  tweaked 
+
+2008-08-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Edited container-related permissions. 
+
+2008-08-06  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/profileitems.php: group profile tweak 
+
+  	* mod/groups/groupprofile.php: group profile tweak 
+
+  	* mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/members.php,
+  mod/groups/views/default/groups/profileitems.php: group profile layout
+  tweaked 
+
+2008-08-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/opendd.php, .../views/default/forms/guidtool/import.php:
+  Example of usage (Refs #210), also refs #211. 
+
+  	* views/default/messages/exceptions/exception.php: Tidied up exception 
+
+  	* engine/lib/actions.php, languages/en.php, views/default/input/button.php,
+  views/default/input/form.php: Refs #210 and #211 
+
+2008-08-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/page_elements/footer.php: footer
+  links update, changes to gallery view 
+
+2008-08-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/button.php: Images and security fixes 
+
+  	* views/default/input/button.php, views/default/input/reset.php,
+  views/default/input/submit.php: Closes #212 
+
+2008-08-06  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/navigation/topbar_tools.php: tool menu
+  slide effect removed, language file changed for dashboatrd instructions 
+
+2008-08-06  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/hidden.php: Closes #209 
+
+  	* views/default/input/form.php: Closes #208 
+
+  	* account/forgotten_password.php: Fixes #207: Thanks for your report eike! 
+
+2008-08-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: river additions 
+
+  	* views/default/css.php: toolbar fixes and register box positioning fixed 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/sessions.php: Tweaked the way
+  forwarding works. 
+
+  	* engine/lib/access.php, engine/lib/group.php, mod/groups/start.php: Fixed
+  group-specific access controls, and site-specific access controls 
+
+2008-08-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/river_icons/river_icon_bookmarks.gif,
+  _graphics/river_icons/river_icon_shares.gif,
+  _graphics/river_icons/river_icon_status.gif,
+  _graphics/toolbar_messages_icon.gif, views/default/css.php: numerous fixes to
+  messageboard, status, river icons, 
+
+2008-08-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Log though will now not store a url relating to an
+  action... it is now possible to log in again if you are logged out! :D 
+
+  	* engine/lib/river.php, engine/lib/system_log.php: Fixes #121 and #143.
+  Please confirm. 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/logbrowser/index.php, mod/logbrowser/start.php: The log browser is now
+  a part of the admin panel. 
+
+  	* engine/lib/widgets.php: Fixed an issue where the third widget column drops
+  widgets. 
+
+  	* views/default/canvas/layouts/widgets.php: Widget layout update 
+
+2008-08-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php: Fixes #204 
+
+  	* actions/login.php, engine/lib/elgglib.php: Closes #196: Stores last
+  forwarded page in session, this is used by logon to forward page to correct
+  location.  Also fixed current_page_url() which was introducing a superfluous
+  "/" before $_SERVER['REQUEST_URI'] 
+
+2008-08-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/toolbar_messages_icon.gif, views/default/css.php,
+  views/default/page_elements/elgg_topbar.php: topbar with message count and
+  icon 
+
+2008-08-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php: largest avatar size changed from 600
+  to 550 
+
+  	* mod/profile/editicon.php: icon crop area layout tweaked 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Tagging issue on unsaved entities: solved. 
+
+2008-08-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Speculative fix for metadata issue. 
+
+  	* engine/lib/entities.php: Actually fixes #202 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php: Fixes #202 : Listen to
+  plugin hook 'entity:icon:url', which passes parameters:  'entity' The entity
+  'viewtype' The view (eg 'default') 'size' The size (eg, large, tiny etc)  You
+  should return a url for the object's icon if you can.. otherwise return
+  nothing at all. 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Fixed accidental group link error 
+
+  	* views/default/account/forms/login.php: Removed an annoying notify error 
+
+2008-08-05  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidtool/views/default/guidtool/listing.php: Using correct entity for
+  icon. 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install.php: The install script uses the one column layout 
+
+2008-08-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/groupprofile.php: more group profile
+  layout tweaks 
+
+  	* mod/groups/views/default/groups/groupprofile.php: group profile tweaked 
+
+2008-08-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: 
+
+2008-08-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/edit.php, mod/groups/index.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/groups/grouplinks.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/menu/actions.php,
+  .../views/default/groups/menu/adminlinks.php,
+  mod/groups/views/default/groups/menu/links.php,
+  .../views/default/groups/menu/ownerlinks.php: Moved group links to the
+  sidebar 
+
+2008-08-05  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/powered_by_elgg_badge_drk_bckgnd.gif,
+  _graphics/powered_by_elgg_badge_light_bckgnd.gif,
+  views/default/page_elements/footer.php: powered by badge in footer 
+
+2008-08-05  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php, mod/groups/views/default/groups/items.php,
+  mod/groups/views/default/groups/profileitems.php: group profile view tweaked 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/index.php, admin/plugins/index.php, admin/site/index.php,
+  admin/statistics/index.php, admin/user/index.php, engine/lib/admin.php,
+  engine/lib/entities.php, views/default/account/forms/useradd.php,
+  views/default/admin/user_opt/adduser.php,
+  views/default/admin/user_opt/search.php: Further changes to the admin panel 
+
+2008-08-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/views/default/groups/items.php: groups profile page layout
+  tweak 
+
+  	* mod/groups/edit.php, mod/groups/groupprofile.php,
+  mod/groups/languages/en.php, mod/groups/views/default/groups/items.php,
+  mod/groups/views/default/groups/members.php: new group profile views 
+
+2008-08-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php: Minor improvement to guid
+  tool 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* settings/index.php, settings/statistics/index.php,
+  settings/user/index.php, .../notifications/settings/usersettings.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php: User changes to settings 
+
+  	* engine/lib/users.php, engine/lib/usersettings.php, languages/en.php,
+  mod/profile/languages/en.php, mod/profile/start.php, settings/index.php,
+  settings/plugins/index.php, settings/statistics/index.php,
+  settings/user/index.php, .../notifications/settings/usersettings.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php,
+  views/default/usersettings/statistics.php,
+  .../usersettings/statistics_opt/numentities.php,
+  .../default/usersettings/statistics_opt/online.php: User settings 
+
+2008-08-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/xml-rpc.php: Error message bugfix 
+
+  	* mod/guidtool/index.php, mod/guidtool/languages/en.php,
+  mod/guidtool/start.php: Adapted to use new menus. 
+
+  	* services/export/handler.php: Handler output made a little more pretty. 
+
+  	* mod/guidtool/export.php, mod/guidtool/format_picker.php,
+  mod/guidtool/import.php, mod/guidtool/index.php, mod/guidtool/view.php,
+  mod/logbrowser/index.php: Using the new view 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed the container_guid override. 
+
+2008-08-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/navigation/topbar_tools.php,
+  views/default/page_elements/footer.php: updates to toolbar menu fixes, error
+  messages, owner block 
+
+2008-08-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/entities/delete.php, languages/en.php,
+  views/default/group/default.php, views/default/object/default.php,
+  views/default/site/default.php: Fixes #199 
+
+  	* engine/lib/xml-rpc.php: XML-RPC helper functions suggested by Misja 
+
+2008-08-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: search layout tweaked 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/metadata.php, search/index.php,
+  views/default/search/entity_list.php: Hidden viewtype toggle on search. 
+
+  	* views/default/page_elements/owner_block.php: Added owner_block/extend to
+  the owner block 
+
+2008-08-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* LICENCE.txt: Refs #197: Added placeholders & gpl 2 licence. 
+
+  	* engine/lib/sessions.php, engine/lib/users.php, engine/schema/mysql.sql:
+  Closes #193: Added salt field to database and new users will be generated
+  with salted passwords.  Existing users remain unchanged and should still be
+  able to log in.  Requires a schema change and the following code run against
+  the database:  alter table elggusers_entity add column salt     varchar(8) 
+  NOT NULL default '' after password; 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../canvas/layouts/narrow_right_sidebar.php,
+  views/default/canvas/layouts/two_column.php: Removed old, no-longer-necessary
+  canvas areas. 
+
+2008-08-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* account/forgotten_password.php, account/register.php,
+  actions/systemsettings/install.php, languages/en.php,
+  views/default/account/forms/forgotten_password.php,
+  views/default/account/forms/login.php: Closes #195 & #191 
+
+2008-08-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Altered pagination so that it
+  does display if we already have an offset. 
+
+2008-08-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/edit.php: profile edit layout altered 
+
+  	* views/default/page_elements/title.php: tweaked the old title block - we no
+  longer need the user avatar now we have the owner block. 
+
+  	* mod/groups/all.php, mod/groups/groupprofile.php, mod/groups/index.php,
+  mod/groups/invite.php, mod/groups/languages/en.php, mod/groups/new.php,
+  mod/groups/start.php: some work on groups to make them work with the new
+  layout 
+
+  	* mod/profile/languages/en.php, mod/profile/start.php,
+  views/default/page_elements/owner_block.php: brief description added to the
+  owner block and profile 
+
+  	* views/default/navigation/pagination.php: pagination now only displays if
+  there is content to paginate through 
+
+2008-08-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: minor interface fixes 
+
+2008-08-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/annotation/default.php: Default annotation RSS view. 
+
+2008-08-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/icon_odd.gif, _graphics/icon_rss.gif,
+  _graphics/owner_block_back.jpg,
+  mod/profile/views/default/profile/userdetails.php, views/default/css.php:
+  more interface fixes and improvements. Icons and background added to owner
+  block 
+
+2008-08-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/canvas/default.php, views/foaf/friends/list.php,
+  views/foaf/search/entity_list.php, views/foaf/user/default.php: Fixed FOAF
+  view 
+
+  	* friends/index.php, friends/of.php,
+  mod/profile/views/default/user/default.php, views/default/user/default.php,
+  views/rss/user/default.php: Fixed RSS and OpenDD feeds for users 
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/json/canvas/default.php, views/json/group/default.php,
+  views/json/object/default.php, views/json/search/entity_list.php,
+  views/json/site/default.php, views/json/user/default.php,
+  views/php/canvas/default.php, views/php/group/default.php,
+  views/php/object/default.php, views/php/search/entity_list.php,
+  views/php/site/default.php, views/php/user/default.php: PHP and JSON entity
+  list views... which should work. 
+
+2008-08-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixed erroneous friends link issue 
+
+  	* views/default/page_elements/header.php,
+  views/default/page_elements/owner_block.php,
+  views/opendd/search/entity_list.php: Fixed OpenDD feeds 
+
+  	* languages/en.php, views/default/page_elements/owner_block.php: RSS and
+  OpenDD feeds autolink in owner block 
+
+  	* actions/user/spotlight.php, engine/lib/users.php,
+  views/default/page_elements/spotlight.php: Spotlight state persists. 
+
+2008-08-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: friends picker modified, minor fixes and css
+  cleanup / re-sort 
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/user/passwordreset.php, actions/user/requestnewpassword.php,
+  engine/lib/users.php, languages/en.php: Refs #191: Actions for resetting
+  passwords, but no front end as yet.  To request a password reset access
+  http://..../actions/user/requestnewpassword/?username=username 
+
+2008-08-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php, views/default/css.php: river
+  updated, widget layout fixed, page block tweaked, 
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php: GUIDTool now displays some
+  generic information about entities where available. 
+
+2008-08-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/reorder.php, engine/lib/widgets.php, entities/index.php,
+  views/default/canvas/layouts/widgets.php: Widgets now work in three columns 
+
+  	* engine/lib/elgglib.php: Introducing the new pagesetup event. 
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Message changes, refs #190 
+
+  	* mod/guidtool/start.php: Guidtool only available to admins 
+
+  	* engine/lib/entities.php, engine/lib/users.php: Changed so that
+  validated_email flag written as null user. Refs #190.  Also confirms fix and
+  closes #104. 
+
+2008-08-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: The metadata permissions
+  check now passes along (optionally) the specific piece of metadata. Refs #104
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Closes #190. Note however that logins will be
+  broken until #104 has been resolved! 
+
+  	* actions/import/opendd.php, engine/lib/input.php: Fixes #194 
+
+  	* actions/import/opendd.php: Refs #194 
+
+2008-08-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, entities/index.php,
+  .../canvas/layouts/two_column_left_sidebar.php,
+  views/default/page_elements/owner_block.php: Introducing the consistent owner
+  block 
+
+2008-08-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Fixed what I presume was an error: namely it was
+  using $site instead of $guid in get_entity 
+
+2008-07-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php: delete collection action - div
+  prevented from showing 
+
+2008-07-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/deletecollection.php, languages/en.php: Collections now
+  delete successfully 
+
+2008-07-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collections.php: temporarily allow h2 click to
+  propagate through to delete button 
+
+2008-07-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/opendd.php: Bugfix 
+
+2008-07-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/pickercallback.php, views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/tablelist.php,
+  views/default/friends/tablelistcountupdate.php: Counts now update when you
+  save a friends collection 
+
+  	* engine/lib/access.php, views/default/friends/picker.php: More updates for
+  collections - save now works properly. 
+
+  	* actions/friends/editcollection.php: Removing the reference to the
+  collection name for now 
+
+  	* actions/friends/editcollection.php, engine/lib/access.php,
+  friends/pickercallback.php, languages/en.php,
+  views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php,
+  views/default/friends/forms/collectionfields.php,
+  views/default/friends/forms/edit.php, views/default/friends/picker.php:
+  Picker saves correctly! 
+
+2008-07-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/iframe.php: Added iframe output 
+
+  	* mod/guidtool/export.php, mod/guidtool/format_picker.php,
+  mod/guidtool/import.php, mod/guidtool/index.php,
+  mod/guidtool/languages/en.php, mod/guidtool/start.php, mod/guidtool/view.php,
+  .../views/default/forms/guidtool/export.php,
+  .../views/default/forms/guidtool/format.php,
+  mod/guidtool/views/default/guidtool/gallery.php,
+  mod/guidtool/views/default/guidtool/listing.php,
+  mod/guidtool/views/default/guidtool/profile.php,
+  .../views/default/object/guidtoolwrapper.php: Guid tool for import, export
+  and browsing. 
+
+  	* views/default/graphics/icon.php: Refs #151: graphics/icon view 
+
+2008-07-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/footer_logo.gif, views/default/canvas/layouts/widgets.php,
+  views/default/css.php, views/default/navigation/pagination.php,
+  views/default/page_elements/footer.php: footer logo added, widget gallery
+  instructions changed, pagination block styles added to all pagination 
+
+2008-07-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/addcollection.php, actions/friends/deletecollection.php,
+  actions/friends/editcollection.php, engine/lib/users.php, friends/add.php,
+  friends/collections.php, friends/edit.php, languages/en.php,
+  views/default/friends/forms/edit.php: Friends collections are now fully part
+  of the main core 
+
+2008-07-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/icons/default/large.png, _graphics/icons/default/medium.png,
+  _graphics/icons/default/small.png, _graphics/icons/default/tiny.png,
+  engine/lib/elgglib.php, engine/lib/entities.php: Closes #151: Introducing
+  getIcon($size) 
+
+  	* mod/logbrowser/graphics/defaultlarge.jpg,
+  mod/logbrowser/graphics/defaultmedium.jpg,
+  mod/logbrowser/graphics/defaultsmall.jpg,
+  mod/logbrowser/graphics/defaulttiny.jpg,
+  .../views/default/logbrowser/gallery.php,
+  mod/logbrowser/views/default/logbrowser/icon.php,
+  .../views/default/logbrowser/listing.php: Logbrowser now using getIcon for
+  graphics 
+
+  	* mod/logbrowser/index.php: Title added 
+
+  	* engine/lib/elgglib.php: Introducing elgg_get_view_location() 
+
+2008-07-31  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/toolbar_arrow.png, views/default/css.php: arrow icon added to
+  dropdown menu 
+
+  	* views/default/css.php, views/default/friends/picker.php: save and cancel
+  buttons added to collections 
+
+2008-07-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/pickercallback.php, javascript/friendsPickerv1.js,
+  views/default/friends/collection.php, views/default/friends/collections.php,
+  views/default/friends/collectiontabs.php, views/default/friends/picker.php:
+  Hurrah! Made the friendspickers work 
+
+2008-07-31  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidtool/import.php, mod/guidtool/index.php,
+  mod/guidtool/languages/en.php, mod/guidtool/manifest.xml,
+  mod/guidtool/start.php, .../views/default/forms/guidtool/import.php: Added
+  guidtool and switching to desktop. 
+
+2008-07-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php: Friends picker tab initialisation
+  updates 
+
+2008-07-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/picker.php, views/default/friends/tablelist.php:
+  small change to collection members display - as a table 
+
+  	* javascript/friendsPickerv1.js, views/default/friends/collectiontabs.php:
+  minor fixes from earlier today - re-instating the a-z slider, and correctly
+  switching the picker tabs 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php: Removing the members from the
+  collections content 
+
+  	* views/default/friends/picker.php: Picker works better on ajax load. 
+
+  	* views/default/friends/collectiontabs.php: Added specific numbering to tab
+  classes for the picker 
+
+  	* views/default/friends/picker.php: Removing js on picker load 
+
+  	* views/default/friends/collection.php, views/default/friends/picker.php:
+  Collections open blank (for now) 
+
+  	* views/default/friends/collectiontabs.php: Committing in loads 
+
+2008-07-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collectiontabs.php: pete's collectiontabs code 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/odd.php, actions/import/opendd.php, engine/lib/export.php,
+  services/export/handler.php, views/odd/canvas/default.php,
+  views/odd/export/entity.php, views/odd/export/metadata.php,
+  views/odd/export/relationship.php, views/odd/group/default.php,
+  views/odd/messages/exceptions/exception.php, views/odd/object/default.php,
+  views/odd/pageshells/pageshell.php, views/odd/site/default.php,
+  views/odd/user/default.php, views/opendd/canvas/default.php,
+  views/opendd/export/entity.php, views/opendd/export/metadata.php,
+  views/opendd/export/relationship.php, views/opendd/group/default.php,
+  views/opendd/messages/exceptions/exception.php,
+  views/opendd/object/default.php, views/opendd/pageshells/pageshell.php,
+  views/opendd/site/default.php, views/opendd/user/default.php: Closes #189:
+  ODD -> OpenDD 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php, views/default/friends/picker.php:
+  AJAX improvements to picker 
+
+  	* engine/lib/elgglib.php, views/default/navigation/pagination.php: Lists of
+  comments etc no longer display "none found" if there aren't any. 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/odd.php: Forward to referer 
+
+  	* services/export/handler.php: 
+
+  	* actions/import/odd.php: Admin gatekeeper 
+
+2008-07-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_toolbar_logout.gif, _graphics/elgg_toolbar_logout_over.gif,
+  _graphics/icon_customise_remove.png, views/default/css.php,
+  views/default/friends/collection.php: toolbar logout icon changed to work as
+  a single image resource (for caching purposes), delete icon on collections
+  changed to work as a single image rollover 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/export/entity.php: Minor improvements to
+  default entity view. 
+
+  	* views/default/export/metadata.php, views/default/export/relationship.php:
+  Improved views 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/pickercallback.php, views/default/friends/picker.php,
+  views/default/friends/tablelist.php: Added friends picker callback 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php, engine/lib/relationships.php: Refs #186: Get URL
+  for relationships 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php,
+  views/default/friends/collectiontabs.php, views/default/friends/picker.php:
+  Moved collection tabs out of the main picker view 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: Refs #186 
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php: Introducing url handlers for extenders. 
+
+  	* engine/lib/export.php: Changed export uuid, refs #186 
+
+  	* htaccess_dist: Changed export rewrite rules. 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/collection.php, views/default/friends/picker.php,
+  views/default/friends/tablelist.php: Added friends collections members list 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Using guid_to_uuid 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/tablelist.php: Added the tablelist view 
+
+2008-07-30  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js, views/default/css.php,
+  views/default/friends/collection.php, views/default/friends/picker.php: the
+  beginnings of the tabbed friends picker 
+
+2008-07-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php: Extender getURL() support (no overide as of yet) 
+
+  	* mod/opendd/actions/opendd/feed/delete.php,
+  mod/opendd/actions/opendd/feed/subscribe.php, mod/opendd/edit.php,
+  mod/opendd/feeds.php, mod/opendd/graphics/defaultlarge.jpg,
+  mod/opendd/graphics/defaultmedium.jpg, mod/opendd/graphics/defaultsmall.jpg,
+  mod/opendd/graphics/defaulttiny.jpg, mod/opendd/index.php,
+  mod/opendd/languages/en.php, mod/opendd/manage.php, mod/opendd/manifest.xml,
+  mod/opendd/start.php, mod/opendd/viewfeed.php,
+  .../views/default/forms/opendd/subscribe.php,
+  mod/opendd/views/default/object/oddentity.php,
+  mod/opendd/views/default/object/oddfeed.php,
+  mod/opendd/views/default/object/oddmetadata.php,
+  .../views/default/object/oddrelationship.php,
+  mod/opendd/views/default/opendd/css.php,
+  mod/opendd/views/default/opendd/gallery.php,
+  mod/opendd/views/default/opendd/icon.php,
+  mod/opendd/views/default/opendd/link_logo.php,
+  mod/opendd/views/default/opendd/links.php,
+  mod/opendd/views/default/opendd/listing.php,
+  mod/opendd/views/default/opendd/metatags.php,
+  mod/opendd/views/default/opendd/profile.php,
+  mod/opendd/views/default/output/uuid.php,
+  .../widgets/opendd_friends_elsewhere/edit.php,
+  .../widgets/opendd_friends_elsewhere/view.php, mod/opendd/viewuuid.php: Moved
+  OpenDD out of the central repo. 
+
+  	* mod/logbrowser/index.php: Logbrowser using admin gatekeeper. 
+
+2008-07-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/widgets.php: Widget state cookie is now removed on widget
+  delete. 
+
+2008-07-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js, views/default/canvas/layouts/widgets.php,
+  views/default/widgets/wrapper.php: individual widgets state now saved in
+  cookies 
+
+2008-07-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Default view added to export, for completeness 
+
+  	* engine/lib/system_log.php: 
+
+  	* views/odd/group/default.php, views/odd/site/default.php: OpenDD default
+  views on entities 
+
+  	* views/default/export/entity.php: Improvements to export view 
+
+  	* views/default/object/default.php, views/default/site/default.php: Added
+  some default views. 
+
+  	* .../views/default/logbrowser/gallery.php: And in gallery view 
+
+  	* .../views/default/logbrowser/listing.php: Handle anonymous events. 
+
+  	* actions/systemsettings/install.php,
+  mod/logbrowser/graphics/defaultlarge.jpg,
+  mod/logbrowser/graphics/defaultmedium.jpg,
+  mod/logbrowser/graphics/defaultsmall.jpg,
+  mod/logbrowser/graphics/defaulttiny.jpg, mod/logbrowser/index.php,
+  mod/logbrowser/languages/en.php, mod/logbrowser/manifest.xml,
+  mod/logbrowser/start.php, .../views/default/logbrowser/gallery.php,
+  mod/logbrowser/views/default/logbrowser/icon.php,
+  .../views/default/logbrowser/listing.php,
+  mod/logbrowser/views/default/object/logwrapper.php: Added basic log browser.
+  updateclient & logbrowser are switched on by default in new installs. 
+
+  	* engine/lib/system_log.php: Fixed count 
+
+  	* engine/lib/system_log.php: Typo 
+
+  	* engine/lib/system_log.php: Added some useful helper functions. 
+
+  	* engine/lib/system_log.php: Count support added 
+
+2008-07-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php, views/default/css.php: final
+  changes to widgets - all ready to wire up now 
+
+2008-07-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/opendd/start.php: Typo  
+
+  	* actions/register.php, languages/en.php,
+  views/default/account/forms/login.php: Registration disabled option (no admin
+  screen yet), closes #184 
+
+2008-07-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* dashboard/index.php: dashboard widget tweak 
+
+  	* views/default/canvas/layouts/widgets.php: tweak to the profile widget
+  picker 
+
+2008-07-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/updateclient/languages/en.php, mod/updateclient/start.php,
+  .../views/default/settings/updateclient/edit.php: Update client gets updates 
+
+  	* engine/lib/admin.php: Admin notify method added, view 'admin_message' for
+  this. 
+
+2008-07-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/canvas/layouts/widgets.php: widget layout
+  help context sensitive. 
+
+2008-07-29  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php: Only on install 
+
+  	* mod/updateclient/languages/en.php, mod/updateclient/start.php: Update
+  client 
+
+2008-07-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/updateclient/languages/en.php,
+  .../views/default/settings/updateclient/edit.php: Added configuration to
+  client. 
+
+  	* views/default/admin/plugins_opt/plugin.php: Minor look and feel tweaks 
+
+  	* mod/updateclient/index.php, mod/updateclient/languages/en.php,
+  mod/updateclient/manifest.xml, mod/updateclient/start.php,
+  .../views/default/settings/updateclient/edit.php: Adding updateclient
+  (non-functional) and now switching back to base station. 
+
+2008-07-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php: new start page layout/style 
+
+  	* views/default/css.php: fixes to toolbar and owner box ie 6 issues 
+
+  	* views/default/css.php: top toolbar styled up, and owner block items 
+
+  	* _graphics/tools_over.png, javascript/initialise_elgg.js, languages/en.php,
+  views/default/canvas/layouts/widgets.php, views/default/css.php,
+  views/default/navigation/topbar_tools.php: new 3 column widget gallery (needs
+  wiring up), profile page profile box alignment sorted, topbar menu tweaked
+  and image added, 
+
+2008-07-28  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/start.php: Fixes #182 
+
+2008-07-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php,
+  views/default/canvas/layouts/widgets.php, views/default/css.php: profile and
+  dashboard pages altered for 3 widget columns 
+
+2008-07-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/footer.php: fixed a small footer error 
+
+  	* views/default/page_elements/footer.php: wired up the footer menu links 
+
+  	* views/default/pageshells/pageshell.php: the spotlight is now only
+  available for logged in users. 
+
+2008-07-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js, views/default/css.php,
+  views/default/friends/picker.php: friends picker fixed for new page layout,
+  and hopefully I've fixed the load issue too 
+
+2008-07-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php,
+  views/default/canvas/layouts/widgets.php, views/default/css.php,
+  views/default/page_elements/elgg_topbar.php,
+  views/default/pageshells/pageshell.php: canvas layout updates, ie6&7 layout
+  fixes, new 3-column widget view 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/ping.php: Some notes 
+
+  	* engine/lib/ping.php: Using correct ping address 
+
+  	* engine/lib/entities.php: User test negative non-fatal on permissions check
+
+  	* engine/lib/entities.php: Actually fetching the user 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* friends/index.php, friends/of.php: friends pages altered 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/opendd/views/default/output/uuid.php: Introducing UUID view 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php, entities/list.php: changed list and entity canvas
+  layout 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/ping.php: Main pinging mechanism now functional 
+
+  	* engine/lib/ping.php: Temp disabled 
+
+  	* engine/schema/mysql.sql: Fixing access collections table 
+
+2008-07-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/one_column.php, views/default/css.php,
+  views/default/page_elements/title.php: more canvas layout additions, and page
+  owner block added to sidebar 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../canvas/layouts/two_column_left_sidebar.php: tweak to the two_column
+  left to add the owner block 
+
+2008-07-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php: menu fix 
+
+  	* views/default/css.php: new canvas layouts 
+
+  	* .../canvas/layouts/two_column_left_sidebar.php,
+  .../canvas/layouts/two_column_right_sidebar.php: new canvas layouts 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/ping.php: Sends url with version (to retrieve site if already
+  loaded) 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php: bug in tools fixed 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/ping.php: Set to ping ping.elgg.org 
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/ping.php, languages/en.php, views/default/settings/system.php:
+  Ping now configurable. 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php: tools added to topbar 
+
+  	* views/default/pageshells/pageshell.php: removed toolbox from main content
+  area 
+
+2008-07-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: minor tweak 
+
+  	* views/default/navigation/topbar_tools.php,
+  views/default/page_elements/elgg_topbar.php: tools menu item fixed and jquery
+  animation added 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/settings/system.php: Moving to laptop   
+
+2008-07-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, views/default/friends/collection.php,
+  views/default/friends/picker.php: Improved friend picker. 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, engine/lib/configuration.php:
+  sitedescription now loaded into config and displayed 
+
+2008-07-25  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topbar_tools.php,
+  views/default/page_elements/elgg_topbar.php: added tools to the topbar 
+
+2008-07-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  languages/en.php, views/default/settings/system.php: Now possible to specify
+  a site description. 
+
+  	* engine/lib/ping.php: 
+
+  	* views/default/output/url.php: Fixed another oopsy 
+
+  	* engine/lib/api.php: 
+
+  	* engine/lib/entities.php: Support multiple metadata values on entities,
+  closes #179 
+
+2008-07-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/ping.php: 
+
+  	* engine/lib/api.php: API Client bugfixes 
+
+  	* engine/lib/api.php: 
+
+2008-07-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/friendsPickerv1.js, views/default/friends/picker.php: Tabs on
+  the friend picker now work. 
+
+2008-07-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Fixing oopsy... 
+
+2008-07-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/friends/picker.php: Fixed the friends picker. 
+
+  	* views/default/friends/picker.php: The picker now selects the
+  friendspickerN variable correctly. 
+
+  	* engine/lib/access.php, engine/lib/relationships.php,
+  engine/schema/mysql.sql, languages/en.php,
+  views/default/friends/collection.php, views/default/friends/collections.php,
+  views/default/friends/picker.php: Introducing the (still issue-packed) friend
+  picker. 
+
+2008-07-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Allowing multiple 
+
+  	* views/default/output/url.php: Support HTTPS 
+
+  	* engine/lib/api.php: Api tweaks refs #149 
+
+  	* engine/lib/ping.php: New site pinger, refs #149 
+
+  	* engine/lib/entities.php: Correctly exporting site and container as opendd 
+
+2008-07-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, services/api/rest.php: Updated to use pam for auth
+  token. Added anonymous function support. 
+
+  	* engine/lib/pam.php: PAM now supports 'required' and 'sufficient' 
+
+2008-07-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/friends_picker_arrow_left.gif,
+  _graphics/friends_picker_arrow_right.gif, javascript/friendsPickerv1.js,
+  .../jquery/jquery-easing-compatibility.1.2.pack.js,
+  vendors/jquery/jquery-easing.1.2.pack.js, views/default/css.php,
+  views/default/page_elements/header.php: new files for friends picker 
+
+2008-07-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Fixed typo 
+
+  	* engine/lib/api.php, languages/en.php: API client added to code & changed
+  order of expose_function  
+
+  	* engine/lib/entities.php, engine/lib/group.php: Moving canWriteToContainer 
+
+2008-07-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/footer_logo.gif, views/default/page_elements/footer.php: removal
+  of the official elgg logo from the footer, this is not GPL. 
+
+2008-07-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/groupprofile.php: The group profile now sets page ownership to
+  the group 
+
+  	* mod/groups/views/default/groups/grouplinks.php: Slight modification to
+  group links. 
+
+  	* engine/lib/objects.php: Yet more container refactoring. 
+
+2008-07-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/access.php, views/default/input/checkboxes.php,
+  views/default/input/file.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Disabled support
+  added to forms. 
+
+2008-07-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/metadata.php,
+  engine/lib/relationships.php: More owner_guid to container_guid transfer 
+
+  	* engine/lib/metadata.php, engine/lib/tags.php: Updated further functions to
+  work from container_guids rather than owner_guids 
+
+  	* mod/groups/start.php, mod/groups/views/default/groups/icon.php,
+  mod/profile/views/default/profile/icon.php: Icons now handle elegantly if you
+  try and display a non-ElggUser entity. 
+
+  	* engine/lib/group.php, engine/lib/pageowner.php,
+  mod/groups/languages/en.php: Groups now have usernames of a sort 
+
+  	* engine/lib/elgglib.php, engine/lib/group.php, engine/lib/users.php:
+  Introducing the Friendable interface 
+
+  	* mod/profile/views/default/user/default.php,
+  mod/profile/views/default/user/user.php: Moved the default user view from
+  user/user to user/default. 
+
+2008-07-22  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: 
+
+  	* engine/lib/entities.php: Saving cached annotations 
+
+2008-07-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/new.php: Typo 
+
+  	* mod/opendd/edit.php, mod/opendd/feeds.php, mod/opendd/index.php,
+  mod/opendd/manage.php, mod/opendd/viewfeed.php, mod/opendd/viewuuid.php:
+  OpenDD using elgg_view_title 
+
+  	* engine/lib/entities.php: Exporting full profile 
+
+  	* mod/groups/all.php, mod/groups/edit.php, mod/groups/groupprofile.php,
+  mod/groups/index.php, mod/groups/invite.php, mod/groups/new.php: Groups using
+  elgg_view_title 
+
+  	* engine/lib/access.php: Fixes #175 
+
+2008-07-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fix for can_write_to_container 
+
+  	* engine/lib/entities.php: Fixed the can_write_to_container function when
+  you're logged out. 
+
+  	* engine/lib/entities.php, engine/lib/users.php: Further fixes. 
+
+  	* engine/lib/entities.php: Fix for previous. 
+
+  	* engine/lib/entities.php: Container_guid is set intelligently for
+  get_entities when owner_guid is set. 
+
+  	* engine/lib/users.php: Slight fix to previous. 
+
+  	* engine/lib/users.php: Altered the get_user_friends_objects functions to
+  work with containers. 
+
+  	* engine/lib/entities.php, engine/lib/group.php: Moved
+  can_write_to_container into elgglib 
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/lib/entities.php, engine/lib/group.php, engine/lib/objects.php,
+  engine/lib/pageowner.php, engine/lib/users.php, engine/schema/mysql.sql,
+  mod/groups/actions/addtogroup.php, views/default/page_elements/title.php:
+  Moved container_guid to entities, modified a bunch of functions. 
+
+  	* engine/lib/plugins.php: Standardised plugin loading 
+
+2008-07-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, mod/groups/languages/en.php, mod/groups/start.php:
+  Closes #166 
+
+2008-07-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Slight change to write access permissions function 
+
+  	* engine/lib/access.php: Reinstating plugin hooks for access collections. 
+
+  	* engine/lib/input.php, mod/profile/views/default/profile/userdetails.php,
+  views/default/admin/main.php, views/default/admin/plugins.php,
+  views/default/admin/site.php, views/default/admin/statistics.php,
+  views/default/admin/user.php, views/default/messages/errors/error.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/messages/message.php,
+  views/default/output/longtext.php, views/default/settings/install.php,
+  views/default/usersettings/main.php, views/default/usersettings/plugins.php,
+  views/default/usersettings/statistics.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/odd/messages/exceptions/exception.php, views/rss/object/default.php,
+  views/rss/user/default.php, views/xml/messages/exceptions/exception.php:
+  Added the autop function, replaced any references to nl2br 
+
+  	* engine/lib/access.php, engine/schema/mysql.sql: Fixed a bug with the
+  revamped access collections 
+
+  	* engine/lib/pageowner.php, engine/lib/plugins.php: Improvements to
+  get_context 
+
+  	* engine/lib/access.php: Fix for access collections 
+
+  	* views/default/input/text.php: Short text values are now properly escaped
+  in the input/text view. 
+
+  	* engine/schema/mysql.sql: Added auto increment initial val. Fixes #171 
+
+2008-07-18  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: new functions added to access in order to allow
+  collections to be created 
+
+2008-07-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: access_collections now auto_increment 
+
+2008-07-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: access groups renamed to access collections 
+
+2008-07-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: access_groups -> access_collections 
+
+  	* engine/lib/access.php: Fix to previous 
+
+  	* engine/lib/access.php: New access control hooks 
+
+2008-07-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, mod/groups/groupprofile.php,
+  mod/groups/start.php: Closes #165 & #167 
+
+  	* services/export/handler.php: 
+
+2008-07-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Added new access group control functions 
+
+2008-07-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Fixes #164: Seems there is something erroniously
+  setting 'guid' to something in logged in systems (or alternatively this is
+  just a session problem on my system) either way I have modified isloggedin to
+  check both guid and id... which seems to work. 
+
+  	* engine/lib/entities.php, engine/lib/extender.php,
+  services/export/handler.php: Closes #160 
+
+2008-07-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fixed get_entities_by_annotation 
+
+  	* engine/lib/annotations.php: Introducing list_entities_from_annotations 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, mod/opendd/viewuuid.php,
+  views/default/friends/list.php, views/default/search/entity_list.php,
+  views/js/object/default.php, views/js/user/default.php: Fixed numerous
+  occurrances of elgg_view_entity being called incorrectly. Fixes #163 
+
+2008-07-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php: Fixed the single entity viewer 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/index.php: Fixes #162 
+
+  	* mod/opendd/viewuuid.php: Closes #161 
+
+2008-07-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/add.php, actions/friends/remove.php: Add and remove friend
+  actions now use try / catch 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/extender.php: Closes #155: Introduces
+  'volatile' type of metadata in odd feeds. 
+
+  	* engine/lib/elgglib.php: Closes #157: Introducing elgg_[get|set]_viewtype()
+
+  	* engine/lib/river.php: Reversed ben's changes 
+
+2008-07-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Fix for river items when the item is an annotation,
+  not an entity in itself 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Closes #158: Renamed $location to $view_location
+  within elgg_view. This seems to be a successful workaround. 
+
+2008-07-16  misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/xml-rpc_handler.php: Set the view with set_input rather
+  than via the session 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php: Closes #156 & #139 
+
+2008-07-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: The friends river now grabs more friends ... 
+
+2008-07-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/joinrequest.php: Fixes #154 
+
+  	* engine/lib/metadata.php, mod/groups/actions/join.php: Closes #116: Groups
+  join clears invite flags http://trac.elgg.org/elgg/ticket/116 
+
+  	* mod/profile/actions/edit.php, mod/profile/actions/iconupload.php,
+  mod/profile/languages/en.php,
+  .../default/river/ElggUser/profileiconupdate.php,
+  .../views/default/river/ElggUser/profileupdate.php,
+  .../views/default/river/ElggUser/update.php: Closes #152 and as a bonus you
+  get a river notification for icon upload as well. Aren't I nice? 
+
+2008-07-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: river blog updated - added 
+
+2008-07-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/opendd/start.php: Fixes #147 
+
+  	* mod/opendd/start.php: 
+
+  	* mod/opendd/start.php: Closes #150 
+
+  	* mod/opendd/start.php, .../widgets/opendd_friends_elsewhere/view.php,
+  mod/opendd/viewuuid.php: Closes #145: Override getURL on imported entities. 
+
+2008-07-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: You can now override entity URLs with the
+  setURL($string) method. 
+
+2008-07-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/edit.php,
+  mod/groups/actions/joinrequest.php, mod/groups/languages/en.php,
+  mod/groups/start.php, mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/groupgallery.php,
+  mod/groups/views/default/groups/grouplisting.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  .../default/river/ElggRelationship/create.php: Fixes #144 
+
+2008-07-15  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/javascript.php: javascript menu dropdown IE
+  bug fixed for friends widget, still an issue with friends of 
+
+2008-07-15  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/ElggRelationship/create.php,
+  views/default/river/wrapper.php,
+  views/json/messages/exceptions/exception.php,
+  views/php/messages/exceptions/exception.php,
+  views/xml/messages/exceptions/exception.php: Closes #140 
+
+  	* engine/lib/extender.php, mod/opendd/languages/en.php,
+  mod/opendd/manage.php, mod/opendd/start.php, mod/opendd/viewfeed.php,
+  .../widgets/opendd_friends_elsewhere/edit.php,
+  .../widgets/opendd_friends_elsewhere/view.php: Closes #135: First version of
+  the OpenDD friends elsewhere feed. 
+
+  	* engine/lib/river.php, .../default/river/ElggRelationship/create.php,
+  .../views/default/river/ElggUser/update.php: Using ElggRiverStatement. Plugin
+  writers update your views! Refs #135. 
+
+  	* engine/lib/entities.php: Moved temp array caching stuff to the correct
+  functions. 
+
+  	* engine/lib/entities.php: Entity metadata can now be saved using
+  setMetaData() interface even if guid not specified. 
+
+2008-07-15  misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/handlers/xml-rpc_handler.php, engine/lib/xml-rpc.php: Remove rogue
+  print_r() statement, rightly set the xml view and fix incorrect xml-rpc view
+  call. 
+
+  	* engine/lib/xml-rpc.php: Fix uninitialized XML-RPC handler value 
+
+  	* engine/lib/xml-rpc.php: Fixed registering of XML-RPC handlers 
+
+2008-07-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: Time_created should be time_updated. 
+
+  	* engine/lib/opendd.php: Refs #139: Using UTF-8 encoding as a speculative
+  fix. Test and confirm.  
+
+2008-07-14  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updated toolabr logout for old IE 6's 
+
+  	* views/default/css.php: updates to log out, pagination, search box 
+
+2008-07-14  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: Introducing oddmetadata_to_elggextender(), a
+  function used for import but functionised to let you use it from elsewhere. 
+
+2008-07-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Introducing oddentity_to_elggentity(), a function
+  used for import but functionised to let you use it from elsewhere. 
+
+2008-07-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: and again 
+
+  	* views/default/css.php: river_forums_update added 
+
+2008-07-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: new date and time lang 
+
+2008-07-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/search/entity_list.php,
+  views/rss/search/entity_list.php: The lists now go through the
+  search/entity_list view. 
+
+2008-07-11  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php: Added getNumElements() 
+
+  	* engine/lib/entities.php: Fixes #137: annotate and getAnnotations now
+  functions for unsaved entities. Maths functions non-functional at present. 
+  Refs #135. 
+
+  	* engine/lib/entities.php: Added Group entity support to import. 
+
+  	* languages/en.php, services/export/handler.php: Better errors for attempt
+  to access a GUID you can't 
+
+  	* views/odd/messages/exceptions/exception.php: Exceptions in OpenDD export
+  now appear as comments for debugging. 
+
+  	* engine/lib/relationships.php, services/export/handler.php: relationships
+  are addressable and have working UUIDs, refs #132 
+
+  	* actions/comments/add.php, actions/comments/delete.php,
+  actions/email/confirm.php, actions/email/save.php, actions/friends/add.php,
+  actions/friends/remove.php, actions/import/odd.php, actions/login.php,
+  actions/logout.php, .../notifications/settings/usersettings/save.php,
+  actions/plugins/settings/save.php, actions/plugins/usersettings/save.php,
+  actions/register.php, actions/user/language.php, actions/user/name.php,
+  actions/user/password.php, actions/useradd.php, actions/widgets/save.php,
+  languages/en.php: Using register_error on errors rather than system_message. 
+  Also, fixed widget save to handle arrays (Refs #135) 
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php,
+  actions/admin/user/makeadmin.php, actions/admin/user/resetpassword.php: Using
+  register_error on errors rather than system_message 
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  mod/groups/actions/addtogroup.php, mod/groups/actions/edit.php,
+  mod/groups/actions/join.php, mod/groups/actions/joinrequest.php,
+  mod/groups/actions/leave.php, mod/opendd/actions/opendd/feed/delete.php,
+  mod/opendd/actions/opendd/feed/subscribe.php: Using register_error on errors
+  rather than system_message 
+
+2008-07-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: defaut font reset to verdana 
+
+  	* views/default/css.php: full list of pc names for Lucida Sans added 
+
+2008-07-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/two_column.php, views/default/css.php: two
+  column layout fix 
+
+  	* views/default/canvas/layouts/two_column.php, views/default/css.php: two
+  column canvas layout fixed 
+
+2008-07-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/page_elements/title.php:
+  elgg_view_title can now suppress the submenu 
+
+2008-07-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_toolbar_logout_over.gif, views/default/css.php,
+  views/default/page_elements/elgg_topbar.php: elgg topbar logout re-done with
+  rollover 
+
+2008-07-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/admin/plugins.php: Killed pagination on the plugin admin
+  page 
+
+  	* engine/lib/elgglib.php: Added a plugin hook for counting comments. 
+
+2008-07-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/widgets.php: Working with multiple values in array 
+
+2008-07-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/elgg_bookmarklet.gif: bookmarklet graphic 
+
+2008-07-10  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixes #134: Using else between statements to
+  ensure that they are only ever triggered once. Please confirm that there are
+  no other issues attached. 
+
+2008-07-10  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  .../views/default/profile/menu/adminlinks.php, views/default/css.php: avatar
+  submenu altered and messages div coloured up 
+
+2008-07-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/messages/errors/list.php,
+  views/default/messages/messages/list.php: Error messages now have a different
+  div name 
+
+  	* views/default/page_elements/title.php: The submenu div doesn't appear if
+  there is no submenu. 
+
+  	* engine/lib/plugins.php: Fixed issue with get_plugin_name and pagehandlers.
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/comments/forms/edit.php: Fixed
+  comments! 
+
+  	* engine/lib/elgglib.php: Fixed submenu tab contexts 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Blocking some information from export, closes
+  #130 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: Updated the edit icon form
+  view 
+
+  	* mod/profile/editicon.php: Restoring old edit icon page 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, mod/opendd/actions/opendd/feed/delete.php,
+  mod/opendd/actions/opendd/feed/subscribe.php, mod/opendd/edit.php,
+  mod/opendd/feeds.php, mod/opendd/graphics/defaultlarge.jpg,
+  mod/opendd/graphics/defaultmedium.jpg, mod/opendd/graphics/defaultsmall.jpg,
+  mod/opendd/graphics/defaulttiny.jpg, mod/opendd/index.php,
+  mod/opendd/languages/en.php, mod/opendd/manage.php, mod/opendd/manifest.xml,
+  mod/opendd/start.php, mod/opendd/viewfeed.php,
+  .../views/default/forms/opendd/subscribe.php,
+  mod/opendd/views/default/object/oddentity.php,
+  mod/opendd/views/default/object/oddfeed.php,
+  mod/opendd/views/default/object/oddmetadata.php,
+  .../views/default/object/oddrelationship.php,
+  mod/opendd/views/default/opendd/css.php,
+  mod/opendd/views/default/opendd/gallery.php,
+  mod/opendd/views/default/opendd/icon.php,
+  mod/opendd/views/default/opendd/link_logo.php,
+  mod/opendd/views/default/opendd/links.php,
+  mod/opendd/views/default/opendd/listing.php,
+  mod/opendd/views/default/opendd/metatags.php,
+  mod/opendd/views/default/opendd/profile.php: Closes #81: OpenDD aggregator
+  http://trac.elgg.org/elgg/ticket/81 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Further profile text fix 
+
+  	* mod/profile/languages/en.php, mod/profile/start.php: Added profile submenu
+
+  	* engine/lib/elgglib.php: Fixed minor profile tab issue 
+
+2008-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: mini avatar in page title area fixed 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/user/index.php: The user administator page now results in an RSS
+  feed 
+
+  	* engine/lib/elgglib.php, views/default/canvas_header/submenu_template.php,
+  views/default/page_elements/title.php: Introducing the submenu 
+
+2008-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: edit profile button moved 
+
+2008-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: profile edit link moved
+
+  	* friends/of.php: friends of title 
+
+  	* friends/index.php, friends/of.php: titles on friend list pages 
+
+2008-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: css for page tabs submenu 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/rss/pageshells/pageshell.php: RSS feeds live again when you're
+  logged out! 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Fixed opendd metadata .htaccess rules 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php: Refs #81: Subtype can be
+  returned on a non-saved entity. 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added a comment hook so that other plugins can
+  handle comments instead 
+
+  	* vendors/kses/kses.php: Removed a kses warning. 
+
+  	* views/default/comments/forms/edit.php: The comment form only appears if
+  you are logged in. 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Removed toggle since it broke the handler
+  prototype 
+
+2008-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: new view added to the canvas title
+  view. 
+
+2008-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/page_elements/elgg_topbar.php: topbar
+  altered for messages and links style 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/object/object.php: Closes #129: Placeholder object default
+  view 
+
+2008-07-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/editicon.php, mod/profile/languages/en.php,
+  views/default/css.php: new avatar crop page and instructions 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/languages/en.php, mod/groups/start.php,
+  .../default/widgets/group_entities_widget/edit.php,
+  .../default/widgets/group_entities_widget/view.php: Refs #129, #109 & #106 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Plugins can now override the front page 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Introducing list_entities_groups() 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: The relationship listing function wasn't
+  taking offsets properly. 
+
+  	* views/default/navigation/pagination.php: Further pagination change. 
+
+2008-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: new topbar 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Further pagination change. 
+
+  	* views/default/navigation/pagination.php: Slightly more descriptive
+  pagination. 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Modified rewrite rules for page handler to support - and _ 
+
+2008-07-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php, vendors/kses/AUTHORS, vendors/kses/COPYING,
+  vendors/kses/ChangeLog, vendors/kses/README, vendors/kses/TODO,
+  vendors/kses/docs/attribute-value-checks, vendors/kses/docs/hooks,
+  vendors/kses/docs/stripping-everything, vendors/kses/docs/supported-formats,
+  vendors/kses/docs/whitelisted-url-protocols,
+  vendors/kses/examples/filter.php, vendors/kses/examples/test.php,
+  vendors/kses/kses.php, vendors/kses/oop/oop.kses.changelog.txt,
+  vendors/kses/oop/oop.simple.api.txt, vendors/kses/oop/php4.class.kses.php,
+  vendors/kses/oop/php5.class.kses.php, vendors/kses/oop/test.oop.kses.php:
+  Elgg 1.0, meet kses. Kses, Elgg 1.0. 
+
+2008-07-09  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php: Minor tweak to OpenDD library  
+
+2008-07-09  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/editicon.php, mod/profile/languages/en.php,
+  mod/profile/views/default/profile/editicon.php: new profile avatar page 
+
+2008-07-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/gallery.php: users gallery view sorted 
+
+2008-07-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Closes #128 
+
+2008-07-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: new canvas title 
+
+2008-07-08  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/river_icons/river_icon_friends.gif, views/default/css.php: river
+  icon for friends 
+
+2008-07-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/vendors/calendarpopup/CalendarPopup.js,
+  engine/vendors/jquery/jquery.js, vendors/calendarpopup/CalendarPopup.js,
+  views/default/input/calendar.php: Moved the calendar popup, erased the
+  duplicate jQuery 
+
+  	* actions/comments/add.php, engine/lib/notification.php, languages/en.php:
+  Introducing notifications on generic comments. 
+
+  	* entities/list.php: Rough and ready entity list page 
+
+2008-07-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: reverted the new title 
+
+  	* views/default/page_elements/title.php: title tweaks 
+
+2008-07-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: OpenDD autodiscovery header 
+
+2008-07-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: moved generic comments css from plugin to core 
+
+2008-07-08  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Closes #125: get_entities_by_latest_annotation
+  function 
+
+2008-07-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/widgets.php, views/default/output/tags.php: widget are now
+  logged in by default, tag output tweaked 
+
+2008-07-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/metastrings.php, mod/profile/actions/iconupload.php: Removing
+  annoying warning messages 
+
+2008-07-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: Users online, not user's ... 
+
+  	* actions/admin/user/makeadmin.php, engine/lib/admin.php,
+  engine/lib/entities.php, engine/lib/metadata.php, engine/lib/sessions.php,
+  engine/lib/users.php, views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php: Administration tweaks; fixed
+  users online functions, as well as last_action functions, and the 'make
+  admin' functionality 
+
+  	* views/default/page_elements/title.php: Removed the 'your' prefix from
+  titles 
+
+  	* engine/lib/pageowner.php: page_owner() now works off owner_guid, not
+  owner_id 
+
+  	* languages/en.php: Added the word 'all' to the vocabulary 
+
+2008-07-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/title.php: changes to the title view 
+
+2008-07-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/wrapper.php: Relationship river items are now
+  correctly wrapped in divs 
+
+  	* mod/profile/graphics/defaulttopbar.jpg, mod/profile/graphics/topbar.jpg:
+  Default topbar graphic should now be included 
+
+2008-07-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/graphics/topbar.jpg: default avatar added for topbar 
+
+2008-07-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: Introducing
+  canEditMetadata 
+
+2008-07-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Closes #107, this has been superceded by groups
+  functionality (#106). 
+
+  	* engine/lib/notification.php: Option to hide sender. 
+
+2008-07-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/gallery_back_icon.gif, _graphics/gallery_back_icon_on.gif:
+  gallery overview icons 
+
+  	* _graphics/icon_tag.gif: piccy for tags 
+
+  	* views/default/css.php: tags icon and files update 
+
+2008-07-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/tags.php: class wrapped around tag string. 
+
+2008-07-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Closes #123 
+
+2008-07-07  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/comments/forms/edit.php: removed the title from generic
+  comments 
+
+2008-07-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Fixes #122 
+
+2008-07-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/search/gallery.php: updated file
+  gallery 
+
+2008-07-07  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php: Decode on import 
+
+  	* engine/lib/group.php, mod/groups/actions/edit.php,
+  mod/groups/actions/join.php, mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/edit.php,
+  mod/groups/views/default/groups/menu/actions.php: Closes #120 
+
+2008-07-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed friendly_time 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/edit.php, mod/groups/languages/en.php,
+  mod/groups/views/default/forms/groups/edit.php: Closes #109: Group icons can
+  be set. Fixed recreate group on edit. 
+
+  	* mod/groups/graphics/defaultlarge.jpg,
+  mod/groups/graphics/defaultmedium.jpg, mod/groups/graphics/defaultsmall.jpg,
+  mod/groups/graphics/defaulttiny.jpg, mod/groups/graphics/icon.php,
+  mod/groups/views/default/groups/icon.php: Refs #109: Default graphics set.
+  Custom graphics must be in groups/{$GROUP_GUID}{$size}.jpg 
+
+2008-07-04  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: changes to the icon
+  editing page. 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../views/default/profile/menu/adminlinks.php: Removed blank space on menu
+
+2008-07-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/menu/actions.php: REmoved duplicate
+  admin links 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php: Fixes #119 
+
+  	* languages/en.php, mod/groups/actions/addtogroup.php,
+  mod/groups/actions/edit.php, mod/groups/edit.php, mod/groups/invite.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  mod/groups/views/default/forms/groups/invite.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/icon.php,
+  mod/groups/views/default/groups/menu/actions.php,
+  mod/groups/views/default/sharing/invite.php: Refs #109: Invite support added 
+
+2008-07-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updates for friends widget 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Fixed regression 
+
+2008-07-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js: updated js 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/pageowner.php,
+  mod/groups/languages/en.php, mod/groups/start.php,
+  .../default/widgets/group_members_widget/edit.php,
+  .../default/widgets/group_members_widget/view.php: Refs #109: Group members
+  widget. 
+
+  	* mod/groups/groupprofile.php, mod/groups/languages/en.php,
+  mod/groups/start.php: Refs #109 : Widget support 
+
+  	* mod/groups/groupprofile.php, mod/groups/start.php,
+  mod/groups/views/default/groups/grouplinks.php,
+  mod/groups/views/default/groups/groupprofile.php,
+  mod/groups/views/default/groups/menu/actions.php,
+  .../views/default/groups/menu/ownerlinks.php: Refs #109 - Basic profile
+  layout 
+
+  	* mod/groups/languages/en.php,
+  .../default/river/ElggRelationship/create.php: Refs #109: River functionality
+
+2008-07-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updates to river(ie fixes), and sharing 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/ElggRelationship/create.php: Using entities rather
+  than object 
+
+2008-07-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, languages/en.php, search/index.php,
+  views/default/search/startblurb.php,
+  views/default/user/search/finishblurb.php,
+  views/default/user/search/startblurb.php: First pass on user search 
+
+2008-07-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: more river updates 
+
+2008-07-04  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/groups/actions/addtogroup.php: Refs #109 : Private group membership
+  full exchange. 
+
+  	* engine/lib/notification.php: Unnecessary sanitise string causing issues on
+  some subjects 
+
+  	* mod/groups/actions/addtogroup.php, mod/groups/actions/joinrequest.php,
+  mod/groups/languages/en.php, mod/groups/start.php: Join requests on closed
+  groups, full loop. Refs #109 
+
+2008-07-04  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: more river icon fixes 
+
+2008-07-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/graphics/defaultlarge.jpg,
+  mod/profile/graphics/defaultmedium.jpg,
+  mod/profile/graphics/defaultsmall.jpg, mod/profile/graphics/defaulttiny.jpg:
+  new default avatar (your's was good Ben - just changed the blue a wee bit) 
+
+  	* _graphics/river_icons/river_icon_blog.gif,
+  _graphics/river_icons/river_icon_comment.gif,
+  _graphics/river_icons/river_icon_feed.gif,
+  _graphics/river_icons/river_icon_files.gif,
+  _graphics/river_icons/river_icon_forum.gif,
+  _graphics/river_icons/river_icon_messageboard.gif,
+  _graphics/river_icons/river_icon_plugin.gif,
+  .../river_icons/river_icon_privatemessage.gif,
+  _graphics/river_icons/river_icon_profile.gif,
+  _graphics/river_icons/river_icon_shares.gif,
+  _graphics/river_icons/river_icon_status.gif: icons for the river 
+
+2008-07-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Refs #109 
+
+2008-07-03  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: river icons added 
+
+2008-07-03  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/spotlight/default.php: content added to the spotlight 
+
+2008-07-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/wrapper.php: Fixed a subtype bug in the river item
+  wrapper. 
+
+2008-07-03  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: It would help if I added the functions to the right
+  scope. Oops! Refs #106 
+
+  	* engine/lib/opendd.php: Fixes #113 
+
+  	* admin/user/index.php: Fixes #111 
+
+  	* views/default/input/access.php: Extended access to support options
+  override 
+
+  	* engine/lib/elgglib.php: Collection to group, refs #106 
+
+2008-07-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/userdetails.php,
+  .../canvas/layouts/narrow_right_sidebar.php, views/default/css.php: profile,
+  forum and canvas updated 
+
+  	* views/default/css.php: status widget updates 
+
+  	* views/default/css.php: generic comments moved/cleaned 
+
+2008-07-02  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Typo on database table 
+
+2008-07-02  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  views/default/canvas/layouts/one_column.php, views/default/css.php: profile
+  menu, single view layout, and comments all updated 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/userdetails.php: avatar menu fixed for
+  non-200px wide avatars 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* dashboard/index.php, languages/en.php,
+  views/default/canvas/layouts/widgets.php: Default text for the dashboard. 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/start.php: Closes #112 
+
+  	* .../views/default/profile/menu/adminlinks.php,
+  mod/profile/views/default/profile/userdetails.php: Closes #112 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php: The widget layout now uses areas
+  3 and 4 as the column content if there aren't any widgets 
+
+  	* views/default/canvas/layouts/widgets.php: The widget layout now uses areas
+  3 and 4 as the column content if there aren't any widgets 
+
+2008-07-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: created settings link 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/menu/actions.php,
+  mod/profile/views/default/profile/userdetails.php: Admin menus to the
+  contextual menu 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Closes #110 
+
+  	* actions/systemsettings/install.php: NEW - #109: Groups core plugin
+  http://trac.elgg.org/elgg/ticket/109 
+
+  	* actions/systemsettings/install.php: Refs #109: Groups plugin active by
+  default 
+
+  	* engine/lib/users.php: Closes #108 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/javascript.php,
+  views/default/widgets/wrapper.php: Fixed avatar menu on widgets 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Fixed notification subject 
+
+2008-07-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: small tweak to topbar 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php: lines in avatar menu 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Correction to get_river_entities 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/page_elements/elgg_topbar.php: mini
+  avatar style and position and link 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Membership functions, and introducing
+  can_write_to_container, and its hook group_permission_check. Refs #106. 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/reset.css: unnecessary file 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Limits properly propagate to the pagination views.
+
+  	* mod/profile/views/default/profile/gallery.php: Sanitising the profile
+  gallery view for now 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/pageshells/pageshell.php: pageshell /
+  logged out modification 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/search/gallery.php: Gallery view now displays 3 per row 
+
+2008-07-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: further topbar tweak 
+
+  	* views/default/page_elements/elgg_topbar.php: topbar tweaks 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php,
+  views/default/account/forms/register.php,
+  views/default/account/forms/useradd.php,
+  views/default/canvas/layouts/one_column.php, views/default/css.php: login
+  front door tidied up 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Entity loader support for ElggGroup, refs #106 
+
+  	* engine/lib/group.php: Bugfix, refs #106 
+
+2008-07-01  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/elgg_topbar.php: top_bar icon 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/manifest.xml: Licence in manifest 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/dashboard/index.php, mod/dashboard/manifest.xml,
+  mod/dashboard/start.php, mod/dashboard/views/default/dashboard/welcome.php:
+  No need to have the dashboard plugin. Dashboard is part of core. 
+
+  	* mod/profile/actions/cropicon.php, mod/profile/actions/iconupload.php,
+  mod/profile/icon.php, mod/profile/views/default/profile/icon.php: Toolbar ->
+  topbar in profile icons 
+
+  	* mod/profile/actions/cropicon.php, mod/profile/actions/iconupload.php,
+  mod/profile/icon.php, mod/profile/views/default/profile/icon.php: Added
+  toolbar size for the icons 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php, engine/lib/objects.php, languages/en.php: Group
+  class, refs #106 
+
+  	* engine/schema/mysql.sql: Added groups, refs #106 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Fix for the schema 
+
+  	* views/default/search/gallery.php: Gallery should probably only be three
+  squares wide for now. 
+
+  	* views/default/css.php: Small fix for gallery view users 
+
+  	* mod/profile/views/default/profile/gallery.php: Small fix for gallery view
+  users 
+
+  	* mod/profile/views/default/profile/gallery.php,
+  mod/profile/views/default/user/user.php,
+  views/default/search/gallery_listing.php, views/default/search/listing.php:
+  Gallery view for users 
+
+  	* views/default/css.php: CSS additions 
+
+2008-07-01  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topmenu.php: previous top menu removed - replaced
+  by new elgg_topbar view 
+
+  	* _graphics/avatar_mini.gif, _graphics/elgg_toolbar_logo.gif,
+  _graphics/elgg_toolbar_logout.gif, _graphics/toptoolbar_background.gif,
+  views/default/css.php, views/default/page_elements/elgg_topbar.php,
+  views/default/page_elements/header.php: topbar menu 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: The $entity_guid on get_annotations can now be
+  an array. 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Added object in container search, refs #106. 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: get_annotations can now optionally take an
+  array as owner_guid 
+
+  	* actions/login.php: Users are now logged into the dashboard. 
+
+  	* engine/lib/elgglib.php, views/default/navigation/gallery.php,
+  views/default/search/gallery.php: Moved navigation/gallery to search/gallery,
+  which makes more sense. 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/group.php: Refs #106: Group prototype class 
+
+  	* engine/lib/entities.php: Added site_guid to internal db fields 
+
+2008-07-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/widgets/wrapper.php: Widgets now load after the main page 
+
+2008-07-01  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Refs #106: Added schema 
+
+2008-06-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/widgets.php, views/default/canvas/layouts/widgets.php: Added
+  the ability to control widget contexts 
+
+2008-06-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/makeadmin.php, languages/en.php,
+  mod/profile/views/default/profile/userdetails.php: Closes #105: Make admin
+  option http://trac.elgg.org/elgg/ticket/105 
+
+  	* actions/useradd.php, engine/lib/users.php, languages/en.php,
+  views/default/account/forms/useradd.php,
+  views/default/admin/user_opt/adduser.php: Added some user code - needs div
+  hiding 
+
+2008-06-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php: Fixed entity page 
+
+2008-06-30  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed minor cache counting issue 
+
+  	* engine/lib/plugins.php, languages/en.php: Refs #102 - Speculative fix 
+
+2008-06-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php, views/default/widgets/wrapper.php: Partial fix for
+  constantly-shrinking widgets bug. 
+
+2008-06-29  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/footer_logo.gif, views/default/css.php,
+  views/default/page_elements/footer.php: page footer added and msg div fixed
+  for IE 
+
+  	* _graphics/page_back_linen.gif, _graphics/page_back_linen_shadow.gif,
+  views/default/css.php: new page style, new floating msg box, other fixes &
+  cleanup 
+
+2008-06-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/listing.php: changed the friends list
+  view order 
+
+2008-06-28  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: more listings items cleanup 
+
+  	* views/default/css.php: fixed several listing item spacing issues 
+
+  	* views/default/canvas/layouts/widgets.php, views/default/css.php: cancel
+  button added to widget gallery 
+
+2008-06-28  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/listing.php: added user status to the
+  friends view 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: Sanitising search 
+
+  	* engine/lib/widgets.php: Fixed widget saving 
+
+2008-06-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js, views/default/canvas/layouts/widgets.php,
+  views/default/css.php: new widget gallery 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: 
+
+  	* engine/lib/entities.php: Caching (most) subtype queries, drastically
+  reduces database queries in most use cases, refs #101 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Introducing friendly_title 
+
+  	* languages/en.php: Some more translations for comments 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: 
+
+  	* engine/lib/metastrings.php: Metastrings now keeps a record of strings it
+  knows aren't present and so removes the need to futher look for them. Refs
+  #101 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Bug fix for previous. 
+
+  	* engine/lib/elgglib.php: Introducing elgg_count_comments 
+
+  	* views/default/annotation/generic_comment.php,
+  views/default/comments/forms/edit.php, views/default/css.php: Tweaks to
+  generic comment CSS 
+
+  	* actions/comments/add.php, actions/comments/delete.php,
+  engine/lib/elgglib.php, languages/en.php,
+  views/default/annotation/generic_comment.php,
+  views/default/comments/forms/edit.php: Brought generic comments into Elgg
+  core 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Using persistent db connections. This should
+  speed up pages with numerous small DB calls. Please report any issues asap.
+  Refs #101 
+
+  	* engine/lib/metastrings.php: Minor textual changes 
+
+  	* engine/lib/users.php: Added mapping to cache username => guid & code =>
+  guid. Refs #101. 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/icon.php: Icon menus now work when
+  you're logged out. 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Removed explains since these weren't much use 
+
+  	* engine/lib/install.php: Db installed flag on config, Refs #101 
+
+  	* engine/lib/elgglib.php: Caching datalists. Refs #101 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Fixed the contextual nubbin on search indices
+  (really) 
+
+  	* views/default/css.php: Fixed the contextual nubbin on search indices 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Short circuited query if could not possibly
+  return a value. Refs #101 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Forced search result icon sizes to be 40px 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Refs #101 - DB Profiling in debug mode
+  (recommended usage means putting $CONFIG->debug = true in settings.php) 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: Search now sets context appropriately 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Removed debug warning 
+
+2008-06-27  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/metadata.php,
+  engine/lib/relationships.php, engine/lib/sites.php, engine/lib/users.php,
+  friends/index.php, friends/of.php, search/index.php: Added a 'display full
+  view' parameter to all of the listings functions 
+
+  	* engine/lib/elgglib.php, mod/profile/views/default/profile/listing.php,
+  views/default/search/listing.php: Introducing elgg_view_listing 
+
+  	* mod/profile/views/default/profile/icon.php: Minor fix to the icon code 
+
+  	* mod/profile/views/default/profile/icon.php: Fix to icon links, so they
+  display actions too 
+
+  	* mod/profile/views/default/profile/listing.php, views/default/css.php:
+  Added search listing styles 
+
+  	* mod/profile/views/default/profile/icon.php: Fix to previous 
+
+  	* mod/profile/views/default/profile/icon.php: Further contextual menu work 
+
+  	* mod/profile/javascript.php, mod/profile/profile.js,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/javascript.php,
+  mod/profile/views/default/profile/metatags.php,
+  views/default/navigation/topmenu.php: Initial inclusion of profile icon
+  navigation 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Fixes #100 - User not having any notification
+  method no longer a hard error. 
+
+2008-06-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php: tweak to profile language 
+
+2008-06-27  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/avatar_menu_arrow.gif, _graphics/avatar_menu_arrow_hover.gif,
+  _graphics/avatar_menu_arrow_open.gif, mod/profile/profile.js,
+  mod/profile/views/default/profile/css.php, views/default/css.php: avatar
+  contextual menus 
+
+2008-06-27  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: Refs #86 - Better debug 
+
+  	* engine/lib/metastrings.php: Closes #86 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, .../notifications/settings/usersettings.php,
+  views/default/settings/system.php, views/default/user/settings/language.php:
+  Closes #98 
+
+  	* views/default/input/pulldown.php: Pulldown menu view now supports passing
+  values as well as options as an associative array "value" => "option text"
+  called $vars['options_values'] 
+
+2008-06-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/listing.php,
+  mod/profile/views/default/user/user.php: Improved profile listings 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Added get_installed_translations() to return an
+  array of available translations together with native language translation of
+  the text. Refs #98 
+
+  	* languages/en.php: Added ISo-639 language codes, refs #98 
+
+2008-06-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: Tweaked the title CSS now that it's going to appear
+  inline within canvases. 
+
+  	* engine/lib/river.php: Widget river items are now of the form
+  river/widget/handler/event. 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/resetpassword.php, engine/lib/admin.php,
+  engine/lib/users.php, languages/en.php,
+  mod/profile/views/default/profile/userdetails.php: Closes #16:
+  Administration: Reset password functionality on user admin screen
+  http://trac.elgg.org/elgg/ticket/16 
+
+2008-06-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/save.php, .../notifications/settings/usersettings/save.php,
+  actions/user/language.php, actions/user/name.php, actions/user/password.php,
+  actions/usersettings/save.php, engine/lib/notification.php,
+  engine/lib/users.php, settings/user/index.php,
+  .../notifications/settings/usersettings.php,
+  views/default/user/settings/email.php,
+  views/default/user/settings/language.php,
+  views/default/user/settings/name.php,
+  views/default/user/settings/password.php,
+  views/default/usersettings/form.php: Unified user settings form 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/register.php: Closes #96: Administration: Add
+  user (with optional admin flag) http://trac.elgg.org/elgg/ticket/96 
+
+  	* views/default/admin/user_opt/adduser.php: Refs #96: Administration: Add
+  user (with optional admin flag) http://trac.elgg.org/elgg/ticket/96 
+
+  	* actions/register.php, languages/en.php,
+  views/default/account/forms/register.php, views/default/admin/user.php,
+  views/default/admin/user_opt/adduser.php: Refs #96: Administration: Add user
+  (with optional admin flag) http://trac.elgg.org/elgg/ticket/96 
+
+  	* actions/user/language.php, engine/lib/languages.php, engine/lib/users.php,
+  languages/en.php, views/default/user/settings/language.php: Closes #92:
+  Settings: Set user language http://trac.elgg.org/elgg/ticket/92 
+
+2008-06-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/checkboxes.php: Checkboxes now work happily with
+  arrays. 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/user/name.php, actions/user/password.php, engine/lib/sessions.php,
+  engine/lib/users.php, languages/en.php,
+  views/default/user/settings/password.php: Fixes #91 and #97  
+
+  	* actions/email/save.php, actions/user/name.php,
+  engine/lib/notification.php, engine/lib/users.php, languages/en.php,
+  views/default/notifications/settings/email.php,
+  views/default/user/settings/email.php, views/default/user/settings/name.php:
+  Closes #90: Settings: Change name http://trac.elgg.org/elgg/ticket/90 
+
+2008-06-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php: Layout update for the single entity view. 
+
+2008-06-26  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Fixes #95 - Now keying off system log entries so
+  that whenever a user does something that triggers an event they are boosted. 
+
+  	* views/default/admin/statistics_opt/basic.php: Fixes #94 
+
+  	* actions/email/save.php, engine/lib/notification.php, languages/en.php,
+  views/default/notifications/settings/email.php: Closes #89: Provide
+  functionality for a user to set their email address in user settings
+  http://trac.elgg.org/elgg/ticket/89 
+
+2008-06-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/confirm.php, actions/register.php,
+  engine/lib/notification.php, engine/lib/sites.php, engine/lib/users.php,
+  languages/en.php: Closes #79: Email confirmation on registration & email
+  change http://trac.elgg.org/elgg/ticket/79 
+
+2008-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: river icon additions 
+
+  	* javascript/initialise_elgg.js, views/default/css.php: widget gallery
+  tooltip positioning and layer issue fixed 
+
+2008-06-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, search/index.php: Search and metadata functions
+  now support multiple user GUIDs 
+
+2008-06-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/email/confirm.php, engine/lib/users.php, languages/en.php: Refs
+  #79 
+
+2008-06-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Small ownership tweak to get_tags 
+
+  	* search/index.php: The search page now takes more options. 
+
+2008-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/shout_speech_bubble.gif: shouts bubble 
+
+2008-06-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: get_tags can now take an array as owner_guid. 
+
+  	* engine/lib/filestore.php: Fixes for filestore. 
+
+  	* engine/lib/filestore.php: Added grabFile() to the filestore, for much more
+  efficient file reading. 
+
+  	* engine/lib/river.php, engine/lib/system_log.php: Made the friends river
+  entities functions loads more efficient. 
+
+2008-06-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Fixes #87 & #88 
+
+  	* engine/lib/notification.php, engine/lib/relationships.php,
+  languages/en.php: Refs #78: Email notifications on friending, comments
+  http://trac.elgg.org/elgg/ticket/78 
+
+2008-06-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, views/default/river/wrapper.php: The river now
+  passes entities to each river view as $vars['entity'] 
+
+  	* engine/lib/annotations.php: Adding an annotation triggers an 'annotate'
+  event 
+
+2008-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/spotlight_back.gif, _graphics/temp_spotlight.gif,
+  views/default/css.php, views/default/spotlight/default.php: default spotlight
+
+2008-06-25  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php, engine/lib/sites.php, languages/en.php: Fixes
+  #84: Method for retrieving preferences for a user and notifying accordingly
+  http://trac.elgg.org/elgg/ticket/84 
+
+2008-06-25  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updated staus box 
+
+  	* views/default/css.php: moved message styles into plugin 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: messaging styles 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Removed the circular delete mechanism that was
+  plaguing ElggFile 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/ajax/loader.php: centred loader gif 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Caching the show_db_tables function 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php, views/default/css.php:
+  profile box fixes 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Serious memory optimisation for the photo resize
+  functions 
+
+2008-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/odd/canvas/default.php, views/odd/object/default.php,
+  views/odd/user/default.php: Refs #82 - oops... forgot to add these... 
+
+  	* .../notifications/settings/usersettings/save.php,
+  engine/lib/notification.php, languages/en.php,
+  .../notifications/settings/usersettings.php: Closes #83 - API & Interface for
+  selecting notification methods 
+
+  	* actions/plugins/settings/save.php, actions/plugins/usersettings/save.php:
+  Added gatekeeper 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php, engine/lib/sites.php: Removing more notices. 
+
+  	* engine/lib/entities.php: Removing an annoying notice 
+
+  	* engine/lib/elgglib.php: Minor fix to elgg_view_entity where ElggEntities
+  are subclassed 
+
+2008-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/edit.php: Fixes #69 - Clicking on profile "edit" causes crash.
+   I have retrieved  the user again from $_SESSION['id'] since
+  $_SESSION['user'] is not being set.  This may point to a larger problem since
+  the $_SESSION looks far from complete. 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Fix for previous river functionality 
+
+  	* engine/lib/river.php: Minor formatting fix 
+
+  	* views/default/admin/plugins.php: Update plugins list so 50 display on a
+  page 
+
+  	* engine/lib/river.php: A fix to the river function. 
+
+2008-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php, views/odd/export/entity.php,
+  views/odd/export/metadata.php, views/odd/export/relationship.php,
+  views/odd/pageshells/pageshell.php: Closes #82: OpenDD feeds in the same vein
+  as RSS http://trac.elgg.org/elgg/ticket/82 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/widgets/editwrapper.php: Fix to edit wrapper saving 
+
+  	* views/default/pageshells/pageshell.php: Removing title from pageshell
+  outright 
+
+  	* views/default/page_elements/title.php,
+  views/default/widgets/editwrapper.php: Introducing elgg_view_title 
+
+  	* engine/lib/elgglib.php: Introducing elgg_view_title 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updated 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/save.php, views/default/widgets/editwrapper.php: Save
+  widget improvements. 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/userdetails.php,
+  mod/profile/views/default/user/user.php,
+  .../canvas/layouts/narrow_right_sidebar.php,
+  views/default/canvas/layouts/two_column.php,
+  views/default/canvas/layouts/widgets.php, views/default/css.php,
+  views/default/pageshells/pageshell.php: updated profile box 
+
+2008-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/plugins/usersettings/save.php, engine/lib/plugins.php,
+  languages/en.php, settings/plugins/index.php,
+  views/default/object/plugin.php, views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php: Refs #76: User settings
+  page (to Elgg Classic standard) 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: River views now run off subtypes 
+
+  	* views/default/ajax/loader.php: Introducing the AJAX loader 
+
+  	* _graphics/ajax-loader.gif, _graphics/ajax_loader.gif,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php:
+  Widgets now reload properly 
+
+2008-06-24  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/ajax-loader.gif: ajax loader gif 
+
+2008-06-24  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php, languages/en.php,
+  .../default/usersettings/statistics_opt/online.php: Refs #76: User settings
+  page (to Elgg Classic standard) 
+
+2008-06-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/cropicon.php,
+  views/default/canvas/layouts/widgets.php: Widget fixes 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/cropicon.php: Added mission crop icon action 
+
+2008-06-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: container box fixes 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: No need to duplicate
+  the user's name. 
+
+  	* engine/lib/filestore.php, mod/profile/actions/iconupload.php,
+  mod/profile/languages/en.php, mod/profile/start.php,
+  mod/profile/views/default/profile/editicon.php: Image cropping works! 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: rearranged the main
+  profile area 
+
+  	* mod/profile/views/default/profile/userdetails.php: moved the about me
+  below the other profile info 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/widgets/editwrapper.php: Some tweaks to
+  the 'saving' box 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php, languages/en.php, settings/index.php,
+  settings/plugins/index.php, settings/statistics/index.php,
+  settings/user/index.php, usersettings/index.php,
+  usersettings/plugins/index.php, usersettings/statistics/index.php,
+  usersettings/user/index.php, views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  .../usersettings/statistics_opt/numentities.php: Refs #76: User settings page
+  (to Elgg Classic standard). Committing some work before shutting down for the
+  day. 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: small bug fix on icon
+  cropper 
+
+2008-06-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/dummy_river_icon.gif, views/default/css.php: river updates 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/river/dashboard.php: Removed extra divs. 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: more icon cropper tweaks,
+  form added 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* entities/index.php, views/default/widgets/editwrapper.php,
+  views/default/widgets/wrapper.php: Widgets now save on a per-widget basis.
+  TODO: get the collapsing widgets to work once they've saved .. 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: coordinates in for the
+  icon cropper 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php: Widgets are now loaded as
+  separate JS scripts 
+
+  	* engine/lib/elgglib.php, views/js/object/default.php,
+  views/js/pageshells/pageshell.php, views/js/user/default.php: You can now get
+  a Javascript version of any entity 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php, engine/lib/usersettings.php, engine/start.php,
+  languages/en.php, usersettings/index.php, usersettings/plugins/index.php,
+  usersettings/statistics/index.php, usersettings/user/index.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php,
+  views/default/admin/main_opt/statistics.php,
+  views/default/admin/main_opt/user.php, views/default/object/plugin.php,
+  views/default/usersettings/main.php,
+  views/default/usersettings/main_opt/plugins.php,
+  views/default/usersettings/main_opt/statistics.php,
+  views/default/usersettings/main_opt/user.php,
+  views/default/usersettings/plugins.php,
+  views/default/usersettings/plugins_opt/plugin.php,
+  views/default/usersettings/statistics.php,
+  views/default/usersettings/user.php: Refs #76: User settings page (to Elgg
+  Classic standard). Committing some work before shutting down for the day. 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/editicon.php: added coordinates to the
+  icon cropper 
+
+  	* .../views/default/profile/hoverover/actions.php,
+  .../views/default/profile/hoverover/links.php,
+  mod/profile/views/default/profile/menu/actions.php,
+  mod/profile/views/default/profile/menu/links.php,
+  .../views/default/profile/menu/linksownpage.php,
+  mod/profile/views/default/profile/profilelinks.php: new profile links system.
+
+2008-06-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php, views/default/css.php: css
+  updates 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php,
+  .../views/default/js/jquery.imgareaselect-0.4.2.js,
+  .../default/js/jquery.imgareaselect-0.4.2.min.js,
+  mod/profile/views/default/profile/editicon.php: beginnings of the icon
+  cropper tool 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* settings/index.php, settings/plugins/index.php: Refs #76: User settings
+  page (to Elgg Classic standard) 
+
+  	* settings/plugins/index.php: Refs #76: User settings page (to Elgg Classic
+  standard) 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php: Fix to icon upload 
+
+  	* views/default/css.php, views/default/page_elements/header.php,
+  views/default/pageshells/pageshell.php: Page title is now displayed at the
+  top of the canvas. 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* settings/index.php: 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/icon.php, mod/profile/views/default/profile/icon.php: Added
+  master icon size (part 2) 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php: Forwards to
+  http_referer 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php: Added master icon size 
+
+2008-06-23  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php:
+  Forwards to http_referer 
+
+  	* views/default/admin/plugins.php: Pagination on admin page 
+
+  	* engine/handlers/cron_handler.php, htaccess_dist: Closes #77 - Cron
+  endpoint and event 
+
+  	* languages/en.php: Refs #75 
+
+  	* views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/online.php: Refs #75 
+
+2008-06-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: Update for pagination, to allow
+  it to properly take a word other than 'offset' as the word to work from. 
+
+2008-06-23  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/pagination.php: greater than, less than
+  pagination symbol changed 
+
+2008-06-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/messages/messages/list.php: system messages now fade out
+  after 3 seconds. 
+
+2008-06-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  views/default/navigation/pagination.php: Introducing the annotation listing
+  functions. 
+
+  	* engine/lib/elgglib.php, engine/lib/metastrings.php: Introducing
+  elgg_view_annotation 
+
+2008-06-22  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/profilelinks.php,
+  mod/profile/views/default/profile/userdetails.php: added a new profile links
+  view 
+
+2008-06-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php: Fixes #72 
+
+2008-06-21  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/spotlight/default.php: tweaks to the
+  spotlight 
+
+  	* mod/profile/views/default/profile/userdetails.php: a further temp tweak to
+  the profile layout 
+
+  	* mod/profile/views/default/profile/userdetails.php,
+  views/default/canvas/layouts/widgets.php: a couple of small, temp, profile
+  layout tweaks. 
+
+2008-06-21  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Plugin init only called on sanitised installs where
+  installation is complete. 
+
+2008-06-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/page_elements/spotlight.php: Improvements
+  to spotlight  
+
+  	* views/default/page_elements/spotlight.php,
+  views/default/spotlight/default.php: Plugins can set their own context 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Added licence example 
+
+2008-06-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php, mod/profile/edit.php,
+  mod/profile/views/default/profile/edit.php: Fixed profile, and allowed admins
+  to edit other profiles 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php: Fixes #71 
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php: Additional
+  fixes to #70 
+
+2008-06-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php:
+  Changed the engine reference in the action 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: 
+
+  	* actions/plugins/settings/save.php, engine/lib/plugins.php,
+  languages/en.php, views/default/admin/plugins_opt/plugin.php,
+  views/default/object/plugin.php: Closes #66: Per site plugin settings
+  configuration panel.  Use the same technique as edit pages on widgets, i.e. 
+  1) Create a new view in your plugins view/default called
+  settings/PLUGINNAME/edit  Where PLUGINNAME is the plugin directory, eg
+  "river" or "profile".  2) Place your edit code in edit.php, fields should
+  save to params[fieldname].  3) The view will be passed $vars['entity'] which
+  holds any configuration values already set in the metadata.  Note. Settings
+  are PER SITE. 
+
+  	* .../views/default/widgets/river_widget/edit.php,
+  .../default/widgets/river_widget_friends/edit.php: Using a different test to
+  handle metadata better 
+
+  	* languages/en.php, mod/river/manifest.xml,
+  views/default/admin/plugins_opt/plugin.php: Closes #67 : Added new displayed
+  field "licence" 
+
+2008-06-20  misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/dashboard/manifest.xml, mod/profile/manifest.xml: Adding manifest
+  files to plugins 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/plugins/disable.php, actions/admin/plugins/enable.php,
+  admin/plugins/index.php, engine/lib/plugins.php, languages/en.php,
+  views/default/admin/plugins.php, views/default/admin/plugins_opt/plugin.php,
+  views/default/object/plugin.php: Closes #20: Plugin management and config
+  panel http://trac.elgg.org/elgg/ticket/20 
+
+  	* actions/admin/site/update_basic.php: Added admin gatekeeper 
+
+2008-06-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/profile/edit.php,
+  views/default/canvas/layouts/widgets.php: Widget gallery updates -
+  internationalised and more 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Further fixes #59 
+
+  	* mod/river/languages/en.php, mod/river/manifest.xml, mod/river/start.php:
+  Using new manifest code (via manifest.xml) 
+
+  	* engine/lib/plugins.php: Bypass plugin loading disable code 
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php, engine/start.php: Closes
+  #60: Enable/disable plugins on a site by site basis
+  http://trac.elgg.org/elgg/ticket/60 
+
+  	* engine/lib/elgglib.php: Bugfixes on privileged code execution. 
+
+  	* engine/lib/database.php: Removed database gatekeepers to avoid chicken and
+  egg problems with privileged codeblock execution, and because it is too
+  problematic. 
+
+  	* engine/lib/plugins.php: Actually closes #60: Enable/disable plugins on a
+  site by site basis http://trac.elgg.org/elgg/ticket/60 
+
+  	* engine/lib/metadata.php, engine/lib/plugins.php: Closes #60:
+  Enable/disable plugins on a site by site basis 
+
+2008-06-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: update_data now returns true on a successful
+  update. 
+
+  	* mod/profile/views/default/profile/userdetails.php: Let's use a slightly
+  smaller image on the main profile page .. 
+
+  	* mod/profile/graphics/defaultlarge.jpg,
+  mod/profile/graphics/defaultmedium.jpg,
+  mod/profile/graphics/defaultsmall.jpg, mod/profile/graphics/defaulttiny.jpg:
+  New default profile pics 
+
+2008-06-20  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/plugins.php: Refs #61 - Added ability to find settings for
+  plugins other than the one you are in. 
+
+  	* engine/lib/plugins.php: Closes #61: Enable plugins to store site specific
+  configurations 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/canvas/default.php,
+  views/default/page_elements/header.php, views/foaf/pageshells/pageshell.php,
+  views/rss/canvas/default.php, views/rss/object/default.php,
+  views/rss/pageshells/pageshell.php, views/rss/user/default.php: Automatic RSS
+  feeds! 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Re-enabled database gatekeepers, please report
+  problems. Refs #3, #45 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/widgettest/start.php, .../views/default/widgets/widgettest/edit.php,
+  .../views/default/widgets/widgettest/view.php: Removing widgettest, which has
+  done its job. 
+
+  	* mod/river/languages/en.php, mod/river/start.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/view.php,
+  views/default/widgets/wrapper.php: Put titles back in their correct place for
+  widgets. 
+
+  	* engine/lib/system_log.php: System_log no longer adds double entries. 
+
+  	* engine/lib/river.php, views/default/river/wrapper.php: Minor improvement
+  to previous - river items now are wrapped in a number of divs that make sense
+  according to what they refer to 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/river/languages/en.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/edit.php,
+  .../default/widgets/river_widget_friends/view.php: Fixes #50 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php, .../views/default/river/ElggUser/update.php,
+  views/default/river/wrapper.php: Modified river functions to use a common
+  wrapper 
+
+  	* mod/profile/languages/en.php, .../views/default/river/ElggUser/update.php:
+  Profile updates now show up in the river. 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php: 
+
+  	* engine/lib/plugins.php, languages/en.php, mod/river/languages/en.php,
+  mod/river/start.php: Closes #59: Plugin manifest. See
+  register_plugin_manifest() & register_plugin_manifest_basic(). Ref #20. 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/profile.js, mod/profile/views/default/profile/metatags.php:
+  Removing the hoverover menu. Refs #58 
+
+  	* mod/profile/views/default/profile/css.php: CSS update for hoverover 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php, engine/lib/users.php,
+  views/default/admin/statistics_opt/online.php: Fixes #55 : "Users online now"
+  function 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/topmenu.php: Wired up search 
+
+  	* mod/profile/views/default/profile/hoverover.php,
+  .../views/default/profile/hoverover/actions.php,
+  .../views/default/profile/hoverover/links.php: Sorting hoverover links into
+  actions and plain links 
+
+  	* mod/profile/views/default/profile/hoverover.php: Whoops! Replacing
+  'bwerdmuller' with $vars['entity']->username 
+
+  	* mod/profile/profile.js, mod/profile/start.php,
+  mod/profile/views/default/profile/css.php,
+  mod/profile/views/default/profile/hoverover.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/profile/menu.php,
+  mod/profile/views/default/profile/metatags.php,
+  mod/profile/views/default/user/user.php: Added a hover-over menu, which can
+  be added to by plugins. 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Ref #57 
+
+  	* engine/lib/river.php, languages/en.php, mod/river/start.php,
+  .../views/default/widgets/river_widget/edit.php,
+  .../views/default/widgets/river_widget/view.php,
+  .../default/widgets/river_widget_friends/edit.php,
+  .../default/widgets/river_widget_friends/view.php,
+  views/default/river/dashboard.php: Fixed #50: River widgets
+  http://trac.elgg.org/elgg/ticket/50 
+
+  	* mod/profile/views/default/profile/userdetails.php: Fixes #56 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php, friends/index.php, friends/of.php: The
+  friends pages now use listing functions; also fixed a minor bug in the
+  get_entities_from_relationship function. 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: *actually* fixes #48: Elgg_view_river wrapper
+  function http://trac.elgg.org/elgg/ticket/48 
+
+  	* engine/lib/river.php: Fixes #48: Elgg_view_river wrapper function
+  http://trac.elgg.org/elgg/ticket/48 
+
+2008-06-19  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js, views/default/canvas/layouts/widgets.php,
+  views/default/css.php: final amends to popups 
+
+2008-06-19  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Fixes #54 - 'Enabled' functionality needs to be
+  added to metadata, refs #53 
+
+2008-06-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Minor change to the navigation placement on list
+  view. 
+
+  	* engine/schema/mysql.sql: Added 'enabled' field to annotations. Refs #51 
+
+2008-06-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js, views/default/canvas/layouts/widgets.php,
+  views/default/css.php: widget description popups added 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Hopefully fixed default wwwroot. refs #51 -
+  Misja, if this works for you, could you please close the ticket? 
+
+2008-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php,
+  engine/lib/entities.php: Fixes #15: Ban user functionality 
+
+  	* engine/lib/access.php, engine/schema/mysql.sql: Fixes #12: Active variable
+  on entities table. Update db schema. 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* dashboard/index.php: Introducing the dashboard! 
+
+  	* engine/lib/entities.php, engine/lib/languages.php, engine/lib/sites.php,
+  engine/lib/users.php, engine/lib/widgets.php: Removing some error notices 
+
+2008-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Speculative fix for mac install 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/widgets/editwrapper.php: Better access
+  control labels. 
+
+  	* engine/lib/database.php: Re-commented out callpath_gatekeeper. refs #37 
+
+2008-06-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: added default class for submit buttons 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/reorder.php, languages/en.php: Corrected widget panel save
+  messages. 
+
+  	* actions/widgets/reorder.php, engine/lib/widgets.php,
+  views/default/canvas/layouts/widgets.php, views/default/input/access.php:
+  Added widget handling. 
+
+2008-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/user/index.php, views/default/admin/user_opt/search.php: Minor tweak
+  to make compatible with search form 
+
+  	* engine/lib/sites.php: Fixes #43: Site full text search over name,
+  description and url 
+
+  	* engine/lib/objects.php: Fixes #42: Object full text search on description 
+
+  	* admin/user/index.php, engine/lib/users.php, views/default/admin/user.php:
+  Further fixes to #41 with admin panel support 
+
+  	* admin/user/index.php, engine/lib/users.php, engine/schema/mysql.sql: Fixes
+  #41: User full text search. See caveats in function search_for_user() 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, views/default/navigation/pagination.php: Interface
+  tweak when no results are found. 
+
+  	* views/default/canvas/layouts/widgets.php: Descriptions are now registered
+  in widgets as a hidden field. 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/metadata.php,
+  engine/lib/relationships.php, engine/lib/sites.php, engine/lib/users.php,
+  languages/en.php, search/index.php, views/default/navigation/pagination.php:
+  Added generic listing and pagination functions 
+
+2008-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/elgglib.php, languages/en.php, views/default/settings/system.php:
+  Fixes #18: Set default view type in admin http://trac.elgg.org/elgg/ticket/18
+
+2008-06-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js, views/default/canvas/layouts/widgets.php:
+  widget drag n drop 
+
+2008-06-18  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/configuration.php, languages/en.php,
+  views/default/input/checkboxes.php, views/default/settings/system.php: Fixes
+  #17 - Debug mode toggle. Introduced unset_config() which is also called
+  automatically by set_config(). Also modified the view input/checkboxes to set
+  values on the checkbox. 
+
+  	* actions/admin/site/update_basic.php, actions/systemsettings/install.php,
+  engine/lib/configuration.php, languages/en.php,
+  views/default/settings/system.php: Fixes #19: Default language selector
+  http://trac.elgg.org/elgg/ticket/19 
+
+2008-06-18  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/account/forms/login.php,
+  views/default/account/forms/register.php, views/default/css.php: tweaked
+  login boxes n buttons 
+
+2008-06-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/widgets.php: Added GUIDs and handlers to the
+  widget panel 
+
+2008-06-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../canvas/layouts/narrow_right_sidebar.php, views/default/css.php:
+  updated page layout 
+
+2008-06-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, languages/en.php: Fixes #24 - Added a funky
+  display function called friendly_time($timestamp). 
+
+  	* engine/start.php: Fixed #36 - CSS now works on the install page. 
+
+  	* engine/lib/sessions.php: isloggedin() doesn't touch the session if we're
+  not fully installed yet. 
+
+2008-06-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* install.php: - To use main site config Marcus Povey 
+
+  	* install.php: CLOSED - #36: CSS broken on initial install page.
+  http://trac.elgg.org/elgg/ticket/36 
+
+  	* engine/lib/elgglib.php, engine/lib/input.php, engine/lib/install.php,
+  engine/settings.example.php, engine/start.php, htaccess_dist,
+  languages/en.php, views/default/messages/sanitisation/htaccess.php,
+  views/default/messages/sanitisation/settings.php,
+  views/failsafe/messages/errors/error.php,
+  views/failsafe/messages/errors/list.php,
+  views/failsafe/messages/exceptions/exception.php,
+  views/failsafe/messages/list.php,
+  views/failsafe/messages/sanitisation/htaccess.php,
+  views/failsafe/messages/sanitisation/settings.php,
+  views/failsafe/pageshells/pageshell.php: CLOSED - #34: Install process must
+  be completely graphical http://trac.elgg.org/elgg/ticket/34 
+
+2008-06-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Fixed #37. It turns out callpath_gatekeeper
+  worked fine; PHP 5.2 with the Zend Optimizer 3.2 does not, which was borking
+  our OSX MAMP installation. We're going to need a great big red warning box
+  for people installing on a Mac, alerting them to the fact that they'll need
+  to switch off the Optimizer. 
+
+2008-06-17  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: updated css 
+
+2008-06-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Removed references to callpath_gatekeeper. 
+
+  	* engine/lib/database.php: Disabling the gatekeeper for now. Reopened #3 
+
+  	* engine/start.php: We need actions to work when the installation hasn't
+  been settled. Refs #3 
+
+2008-06-17  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, views/default/river/ElggRelationship/create.php,
+  views/default/river/ElggUser/login.php,
+  views/default/river/ElggUser/logout.php, views/default/river/dashboard.php,
+  views/default/river/shell.php: CLOSED - #35: Create specific river views for
+  dashboard http://trac.elgg.org/elgg/ticket/35 
+
+2008-06-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php: is_installed now returns a much more
+  representative result. Refs #3 
+
+  	* engine/lib/filestore.php, mod/profile/actions/iconupload.php,
+  mod/profile/languages/en.php: Fixed #33 - all profile icons except for the
+  largest size are cropped to squares. Additionally, the image resampling
+  functions now take an extra boolean parameter to specify squareness (or not).
+
+2008-06-17  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/index.php, admin/plugins/index.php, admin/site/index.php,
+  admin/statistics/index.php, admin/user/index.php: pushed the admin panel
+  through the correct canvas area 
+
+  	* mod/apitest/index.php, mod/apitest/start.php,
+  mod/apitest/views/default/apitest/configform.php,
+  mod/apitest/views/default/apitest/main.php, mod/exporttest/index.php,
+  mod/exporttest/start.php, mod/exporttest/views/default/exporttest/main.php,
+  .../views/default/exporttest/outputxml.php, mod/guidbrowser/index.php,
+  mod/guidbrowser/languages/en.php, mod/guidbrowser/start.php,
+  .../views/default/guidbrowser/browser.php,
+  .../views/default/guidbrowser/entity.php,
+  .../views/default/guidbrowser/entity_full.php,
+  .../views/default/guidbrowser/newentity.php,
+  .../views/default/guidbrowser/prevnext.php: removed guid exporter, exporttest
+  and apitest from core and put them into the plugins folder 
+
+2008-06-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php, engine/lib/plugins.php,
+  views/default/navigation/toolbox.php: Sticky menu items, but also, much more
+  intelligent context detection. Plugin authors need not bother with
+  set_context() any more - the context should be set automatically. This is
+  overruled by page handling settings, if set, which use the first element of
+  the URL to determine context. Fixes #32 
+
+  	* engine/lib/plugins.php: More intelligent context detection. Refs #32 
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php, mod/profile/start.php,
+  views/default/navigation/toolbox.php: Registers contexts for each menu item.
+  Refs #32 
+
+2008-06-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: CLOSED - #30: $CONFIG is not populated from
+  elggconfig or datalists http://trac.elgg.org/elgg/ticket/30 
+
+2008-06-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/userdetails.php: updated profile interface 
+
+  	* views/default/css.php: updated css 
+
+2008-06-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: CLOSED - #26: Lengthing metadata fields
+  http://trac.elgg.org/elgg/ticket/26 
+
+2008-06-16  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* .../canvas/layouts/narrow_right_sidebar.php,
+  views/default/canvas/layouts/one_column.php,
+  views/default/canvas/layouts/two_column.php,
+  views/default/canvas/layouts/widgets.php: new canvas area added 
+
+2008-06-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: CLOSED - #5: Boolean metadata values
+  http://trac.elgg.org/elgg/ticket/5 
+
+  	* engine/lib/xml-rpc.php: - Minor tweak to exception report. Marcus Povey 
+
+  	* engine/handlers/xml-rpc_handler.php, engine/lib/xml-rpc.php,
+  htaccess_dist, languages/en.php, views/xml/xml-rpc/output.php: CLOSED - #14:
+  XML-RPC handler http://trac.elgg.org/elgg/ticket/14 
+
+2008-06-16  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js: updated interface js to fix submit button
+  bug 
+
+2008-06-16  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/xml/pageshells/pageshell.php: Added Content-Length to XML pageshell
+  for compatibility with most XML based formats. 
+
+  	* engine/lib/sessions.php: CLOSED - #27: Standard login system to go through
+  PAM http://trac.elgg.org/elgg/ticket/27 
+
+2008-06-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php: Search once again displays results. Fixes #28 
+
+  	* views/default/widgets/wrapper.php: Widget edit controls now only appear if
+  you can edit the widget in question. 
+
+2008-06-15  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/widgets/wrapper.php: small tweak to the widget wrapper 
+
+2008-06-13  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _graphics/icon_customise_drag.gif, _graphics/icon_customise_info.gif,
+  _graphics/icon_customise_remove.gif, javascript/initialise_elgg.js,
+  .../jquery/jquery-ui-personalized-1.5.packed.js,
+  views/default/canvas/layouts/widgets.php, views/default/css.php,
+  views/default/navigation/toolbox.php, views/default/page_elements/header.php:
+  updated and new stuff pertaining to the customise panel, new jquery also 
+
+2008-06-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/profile/userdetails.php: 
+
+  	* views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php: - Fixed basic statistics
+  Marcus Povey 
+
+  	* actions/admin/user/ban.php: 
+
+2008-06-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: added $order to docs 
+
+2008-06-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed typo 
+
+2008-06-13  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/entities.php: getAnnotations now
+  has an extra param $order 
+
+2008-06-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Metadata now inherits its parent entity's
+  permissions 
+
+  	* engine/lib/widgets.php: using_widgets(); 
+
+  	* views/default/input/access.php, views/default/widgets/editwrapper.php:
+  Added access controls to widgets and fixed the access control input 
+
+2008-06-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/user/ban.php, actions/admin/user/delete.php,
+  languages/en.php, mod/profile/views/default/profile/userdetails.php,
+  views/default/admin/user.php: ASSIGNED - # 2: Administration panel
+  http://trac.elgg.org/elgg/ticket/2 - Added ban template and delete 
+
+2008-06-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: Fixed
+  update/insert issue on all top-level entities 
+
+  	* views/default/canvas/layouts/widgets.php: Added the stub for Pete's widget
+  reorderer 
+
+  	* engine/lib/widgets.php: Widget fix 
+
+2008-06-13  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* admin/user/index.php: - Some thoughts Marcus Povey 
+
+  	* engine/lib/database.php, engine/lib/entities.php, languages/en.php,
+  .../views/default/guidbrowser/entity_full.php: Marcus Povey: CLOSED - # 9:
+  FilePluginFile not found http://trac.elgg.org/ticket/9 
+
+  	* admin/user/index.php, languages/en.php, views/default/admin/site.php,
+  views/default/admin/statistics_opt/online.php, views/default/admin/user.php,
+  views/default/admin/user_opt/search.php: - User search box Marcus Povey 
+
+2008-06-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/statistics.php,
+  views/default/admin/statistics.php,
+  views/default/admin/statistics_opt/basic.php,
+  views/default/admin/statistics_opt/numentities.php,
+  views/default/admin/statistics_opt/online.php: - Moved statistics to their
+  own component views. Yay. Marcus Povey 
+
+2008-06-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apitest/index.php, mod/exporttest/index.php,
+  mod/guidbrowser/index.php: put remaining core plugins through the canvas
+  views 
+
+  	* mod/profile/edit.php, mod/profile/editicon.php: piped remaining profile
+  pages through the canvas system 
+
+  	* views/default/editmenu.php, views/default/pageshell.php: removing some old
+  views 
+
+2008-06-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/widgets/add.php, actions/widgets/save.php, engine/lib/widgets.php,
+  mod/profile/index.php, mod/profile/start.php, mod/widgettest/start.php,
+  .../views/default/widgets/widgettest/edit.php,
+  .../views/default/widgets/widgettest/view.php,
+  views/default/canvas/layouts/widgets.php, views/default/widgets/wrapper.php:
+  Widgets, including a test widget plugin 
+
+  	* views/default/canvas/layouts/widgets.php: The widget canvas layout now
+  automatically grabs widgets. 
+
+  	* engine/lib/elgglib.php: We only have one pageshell. 
+
+  	* engine/lib/widgets.php: Extra helpful widgets functions 
+
+  	* actions/widgets/save.php, engine/lib/widgets.php, languages/en.php,
+  views/default/widgets/editwrapper.php: Widget API changes, as well as edit
+  and action infrastructure 
+
+2008-06-12  marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/statistics.php: 
+
+2008-06-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/object/widget.php: Added a simple widget alias so widgets
+  display automatically. 
+
+  	* views/default/canvas/layouts/one_column.php,
+  views/default/canvas/layouts/two_column.php,
+  views/default/canvas/layouts/widgets.php,
+  views/default/widgets/editwrapper.php, views/default/widgets/wrapper.php:
+  Widget wrapper, widget views 
+
+2008-06-12  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/pageshells/pageshell.php: logic for not displaying toolbar
+  when non-logged 
+
+  	* views/default/welcome/logged_in.php: updated welcome pages 
+
+  	* views/default/page_elements/spotlight.php: new view for page spotlight 
+
+  	* views/default/welcome/logged_out.php: toolbar switched off for non-logged
+  users 
+
+  	* _graphics/skyscraper.gif: placeholder skyscaper ad for non logged-in pages
+
+  	* views/default/canvas/layouts/one_column.php,
+  views/default/canvas/layouts/two_column.php, views/default/css.php,
+  views/default/pageshells/pageshell.php: new layout using canvas view 
+
+2008-06-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Further documentation fixes. 
+
+  	* engine/lib/entities.php: Some extra entity documentation 
+
+2008-06-12  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/statistics.php,
+  views/default/admin/site.php, views/default/admin/statistics.php: Marcus
+  Povey <marcus@dushka.co.uk> * Added stub for statistics * Added stub
+  statistics library   
+
+2008-06-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/widgets.php: Added use_widgets function to register a context
+  for widget use. 
+
+  	* engine/lib/widgets.php: Added widgets library to core. 
+
+2008-06-12  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/pageshells/pageshell_loggedout.php,
+  views/default/pageshells/pageshell_sidebar.php: removed old pageshells 
+
+2008-06-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/admin.php, engine/lib/entities.php: Edit permissions changes
+  for admins 
+
+2008-06-11  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* javascript/initialise_elgg.js: new subdirectory added to house the init js
+  for the page - feel free to move elsewhere 
+
+  	* views/default/css.php, views/default/navigation/toolbox.php,
+  views/default/navigation/topmenu.php, views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/pageshells/pageshell.php: latest interface stuff 
+
+  	* _graphics/footer_back.gif, _graphics/spacer.gif,
+  _graphics/temp_spotlight.gif: new images added 
+
+  	* _graphics/pagebackground.gif, _graphics/pagebackground.jpg: old images
+  removed 
+
+2008-06-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/admin/site/update_basic.php: Marcus Povey <marcus@dushka.co.uk> *
+  Removed debug 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Default of
+  can_edit_entity trigger plugin hook set to true. 
+
+  	* actions/admin/site/update_basic.php, engine/lib/admin.php,
+  engine/lib/entities.php, engine/lib/sites.php, languages/en.php,
+  views/default/admin/site.php: Marcus Povey <marcus@dushka.co.uk> * Basic site
+  admin 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * All queries
+  echoed in debug mode 
+
+  	* views/default/admin/plugins.php: Marcus Povey <marcus@dushka.co.uk> *
+  Comments 
+
+  	* engine/lib/admin.php: Marcus Povey <marcus@dushka.co.uk> * Documentation 
+
+  	* admin/index.php, admin/plugins/index.php, admin/site/index.php,
+  admin/user/index.php, engine/lib/admin.php, engine/lib/elgglib.php,
+  languages/en.php, views/default/admin/main.php,
+  views/default/admin/main_opt/plugins.php,
+  views/default/admin/main_opt/site.php, views/default/admin/main_opt/user.php,
+  views/default/admin/plugins.php, views/default/admin/site.php,
+  views/default/admin/user.php: Marcus Povey <marcus@dushka.co.uk> * Initial
+  administration panel 
+
+  	* engine/lib/admin.php, engine/lib/elgglib.php: 
+
+  	* engine/lib/sessions.php: Marcus Povey <marcus@dushka.co.uk> * actions with
+  admin only support 
+
+  	* engine/lib/actions.php: Marcus Povey <marcus@dushka.co.uk> * actions with
+  admin only support 
+
+  	* admin/index.php, admin/plugins/index.php, admin/settings/index.php,
+  admin/users/index.php, engine/lib/admin.php: Marcus Povey
+  <marcus@dushka.co.uk> * Starting admin and relocating to the garden... 
+
+2008-06-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php, mod/profile/icon.php,
+  mod/profile/views/default/profile/icon.php: Fixed icon cache issue. 
+
+2008-06-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Marcus Povey <marcus@dushka.co.uk> * Introducing
+  admin_gatekeeper() 
+
+2008-06-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, languages/en.php: Marcus Povey
+  <marcus@dushka.co.uk> * Debug added to site installation 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Spelling
+  error 
+
+2008-06-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/output/tags.php: Sorting out tag links. 
+
+  	* engine/schema/mysql.sql: Added an explicit conversion to MyISAM in the db
+  tables when a FULLTEXT key is used. 
+
+2008-06-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: 
+
+  	* engine/lib/languages.php: 
+
+2008-06-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: A better fix for language pack loading ... 
+
+  	* mod/profile/languages/en.php: Fixed a bad header in profile 
+
+  	* engine/lib/languages.php: Fix for language pack loading. 
+
+2008-06-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Marcus Povey <marcus@dushka.co.uk> * Modified
+  elgg_echo to return $message_key if no translations found, meaning you will
+  always get _something_ from the command and will serve to prompt people for
+  missing translations. 
+
+2008-06-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Error text change. 
+
+  	* engine/start.php: Languages are now loaded before the main engine starts. 
+
+  	* engine/lib/actions.php, engine/lib/configuration.php,
+  engine/lib/database.php, engine/lib/elgglib.php, engine/lib/entities.php,
+  engine/lib/export.php, engine/lib/filestore.php, engine/lib/install.php,
+  engine/lib/languages.php, engine/lib/notification.php,
+  engine/lib/objects.php, engine/lib/sessions.php, engine/lib/sites.php,
+  engine/lib/system_log.php, engine/lib/users.php, engine/start.php,
+  mod/apitest/start.php, mod/dashboard/start.php, mod/exporttest/start.php,
+  mod/guidbrowser/start.php, mod/profile/start.php: register_event_handler and
+  trigger_event have been renamed to register_elgg_event_handler and
+  trigger_elgg_event respectively. 
+
+2008-06-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, languages/en.php: Marcus Povey
+  <marcus@dushka.co.uk> * Debug added to db connect 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Bugfix on
+  filestore 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Removed
+  debug 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Bugfixed
+  canEdit and isFullyLoaded 
+
+2008-06-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Caching complete 
+
+  	* engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: 
+
+  	* engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: Marcus
+  Povey <marcus@dushka.co.uk> * Added the code to the correct method. Doh! 
+
+  	* engine/lib/entities.php, engine/lib/users.php: 
+
+  	* engine/lib/users.php: 
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: 
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Added table
+  counter 
+
+2008-06-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Annoying typo bugfix 
+
+  	* views/default/page_elements/header.php: Moving the location of metatags so
+  that we can add jQuery plugins after jQuery gets loaded. 
+
+2008-06-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: 
+
+2008-06-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Fixed class instanceof errors 
+
+2008-06-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php, engine/lib/users.php: Marcus Povey
+  <marcus@dushka.co.uk> * Reverted caching error 
+
+  	* engine/lib/entities.php, engine/lib/sites.php, engine/lib/users.php:
+  Marcus Povey <marcus@dushka.co.uk> * Added caching to entities. Please report
+  any problems. 
+
+2008-06-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/users.php: Interim fix for user saving
+
+2008-06-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/messages/exceptions/exception.php: Marcus Povey
+  <marcus@dushka.co.uk> * Updated to show improved debug in debug mode. 
+
+  	* views/default/messages/exceptions/exception.php: Marcus Povey
+  <marcus@dushka.co.uk> * Updated to show improved debug in debug mode. 
+
+2008-06-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Fixed previously-introduced entity save issue. 
+
+  	* engine/lib/entities.php: There are line breaks in my query. Hrm. 
+
+  	* engine/lib/entities.php: Fixed issue on save 
+
+2008-06-06  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, languages/en.php: Marcus Povey <marcus@dushka.co.uk> *
+  More internationalisation 
+
+  	* languages/en.php, services/api/rest.php: Marcus Povey
+  <marcus@dushka.co.uk> * More internationalisation 
+
+  	* languages/en.php, services/export/handler.php: Marcus Povey
+  <marcus@dushka.co.uk> * More internationalisation 
+
+  	* languages/en.php, views/default/export/entity.php: Marcus Povey
+  <marcus@dushka.co.uk> * More internationalisation 
+
+  	* engine/lib/query.php, languages/en.php: Marcus Povey <marcus@dushka.co.uk>
+  * More internationalisation 
+
+  	* actions/register.php: Marcus Povey <marcus@dushka.co.uk> * Blank passwords
+  and blank second password no longer permitted 
+
+  	* engine/lib/entities.php, engine/lib/extender.php,
+  engine/lib/relationships.php, engine/lib/river.php,
+  engine/lib/system_log.php: Marcus Povey <marcus@dushka.co.uk> * Limit to
+  specific users and/or relationships 
+
+2008-06-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php, engine/lib/users.php, mod/profile/start.php:
+  Fixes for metadata and for the run order. 
+
+2008-06-05  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: 
+
+  	* engine/lib/river.php: Marcus Povey <marcus@dushka.co.uk> * River now
+  passes performed_by_guid user as an object to sub views 
+
+  	* engine/lib/system_log.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * System log performs the id of the user who performed
+  a given action (or 0 if no user was logged in). Update your DB schema. 
+
+  	* views/default/river/shell.php: 
+
+  	* views/default/river/ElggUser/login.php,
+  views/default/river/ElggUser/logout.php: 
+
+  	* views/default/river/shell.php: 
+
+  	* languages/en.php, views/default/river/ElggUser/login.php,
+  views/default/river/ElggUser/logout.php, views/default/river/shell.php:
+  Marcus Povey <marcus@dushka.co.uk> * Some basic river code 
+
+  	* mod/profile/index.php, views/default/river/ElggUser/login.php,
+  views/default/river/ElggUser/logout.php, views/default/river/shell.php:
+  Marcus Povey <marcus@dushka.co.uk> * 
+
+2008-06-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php, engine/settings.example.php: Removing assorted
+  errors which will allow for excellent river operation 
+
+2008-06-05  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: 
+
+2008-06-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/filestore.php,
+  views/default/pageshells/pageshell.php: Further cleanup 
+
+  	* views/default/page_elements/header.php, views/default/pageshell.php:
+  Further sitename fix. 
+
+2008-06-05  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, engine/lib/notification.php, languages/en.php:
+  Marcus Povey <marcus@dushka.co.uk> * More text internationalised 
+
+2008-06-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Fixed a foreach bug. 
+
+  	* views/default/page_elements/header.php: Returned the site name to the
+  header. 
+
+2008-06-05  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/cache.php, engine/lib/database.php,
+  engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/export.php,
+  engine/lib/extender.php, engine/lib/filestore.php, engine/lib/metadata.php,
+  engine/lib/objects.php, engine/lib/plugins.php, engine/lib/relationships.php,
+  engine/lib/sites.php, engine/lib/users.php, languages/en.php: Marcus Povey
+  <marcus@dushka.co.uk> * Partial internationalisation of exceptions 
+
+2008-06-05  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/systemsettings/install.php, engine/lib/elgglib.php, install.php,
+  views/default/account/forms/register.php, views/default/settings/system.php:
+  Installation and initial account creation should now be stable. 
+
+2008-06-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: A more elegant event passthrough mechanism. 
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php,
+  engine/lib/languages.php, engine/lib/sessions.php, engine/lib/sites.php:
+  Fixed the installation labels issue! 
+
+2008-06-04  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/query.php: Marcus Povey <marcus@dushka.co.uk> * Documentation
+  added to query. 
+
+2008-06-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, engine/lib/install.php, engine/lib/sessions.php,
+  engine/lib/users.php, views/default/account/forms/login.php: Fixed actions
+  issues 
+
+  	* engine/lib/elgglib.php: Fixed the callpath_gatekeeper on Windows machines.
+
+2008-06-04  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/query.php: 
+
+  	* engine/lib/system_log.php: 
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> * Belts
+  and braces 
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> * Supports
+  multiple delivery methods as an array 
+
+  	* engine/lib/system_log.php: Marcus Povey <marcus@dushka.co.uk> * Minor
+  documentation  
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> *
+  Documentation 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Minor
+  documentation 
+
+  	* engine/lib/query.php: 
+
+  	* engine/lib/query.php: Marcus Povey <marcus@dushka.co.uk> * More
+  documentation added 
+
+  	* engine/lib/database.php, engine/lib/query.php: Marcus Povey
+  <marcus@dushka.co.uk> * Moved Query object et al to their own file 
+
+2008-06-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Minor doc
+  tweak 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  documentation 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Removed
+  superfluous event 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Debug
+  removed 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/metadata.php, engine/lib/relationships.php: Marcus Povey
+  <marcus@dushka.co.uk> * Fixed annotations not returning anything * Access
+  control on db now disabled when run from privileged code block. 
+
+  	* engine/lib/access.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  restricted mode 
+
+2008-06-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: Added the metatags element into
+  the page header. 
+
+2008-06-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php: Marcus Povey <marcus@dushka.co.uk> * Removed and
+  because you can always add it. 
+
+  	* engine/lib/access.php: Marcus Povey <marcus@dushka.co.uk> * Added access
+  control shorthand function. REPLACE THIS WHEN QUERY OBJECT COMPLETE 
+
+  	* engine/lib/database.php: 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed set
+  ommission 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Path check no
+  longer an event, forces path check 
+
+  	* engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: Marcus
+  Povey <marcus@dushka.co.uk> * Update and creates now handled separately, with
+  the appropriate events triggered. 
+
+  	* action_handler.php, pagehandler.php: Marcus Povey <marcus@dushka.co.uk> *
+  Moved handlers to engine/handlers/ to avoid them running foul of the
+  callpath_gatekeeper.. UPDATE YOUR .htaccess! 
+
+  	* engine/handlers/action_handler.php, engine/handlers/pagehandler.php,
+  htaccess_dist: Marcus Povey <marcus@dushka.co.uk> * Moved handlers to
+  engine/handlers/ to avoid them running foul of the callpath_gatekeeper..
+  UPDATE YOUR .htaccess! 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Minor bugfix 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Missing $CONFIG from insert_data 
+
+  	* engine/lib/elgglib.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Privileged path check to privileged function
+  execution.  ... i really don't like this exception stuff. I think it would be
+  better to say that you can't access stuff you can't access. 
+
+2008-05-30  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Removed debug
+
+  	* engine/lib/database.php, engine/lib/elgglib.php: Marcus Povey
+  <marcus@dushka.co.uk> * Bugfix on gatekeeper and forcing data functions to
+  privileged only 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Renamed
+  limited to strict 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Improved
+  callpath_gatekeeper 
+
+2008-05-29  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/export/entity.php: Marcus Povey <marcus@dushka.co.uk> * Removed
+  foaf/export since this has been superceded. 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Turns out i
+  needed reflection afterall. 
+
+2008-05-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/friends/list.php, views/foaf/pageshells/pageshell.php: Added
+  FOAF 
+
+  	* views/default/canvas/layouts/one_column.php: Correcting one column font
+  size issue 
+
+2008-05-29  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Introducing
+  callpath_gatekeeper 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Simplified
+  call_gatekeeper() 
+
+  	* engine/lib/elgglib.php: 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Introducing
+  call_gatekeeper() 
+
+2008-05-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/friends/add.php, actions/friends/remove.php,
+  engine/lib/social.php, engine/lib/users.php, friends/index.php,
+  friends/of.php, languages/en.php, mod/profile/views/default/profile/menu.php,
+  mod/profile/views/default/profile/userdetails.php,
+  mod/profile/views/default/user/user.php, views/default/friends/list.php:
+  Added friends pages and related functionality 
+
+2008-05-29  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: 
+
+2008-05-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/user/user.php: Slight change to the user view in
+  profiles, to facilitate the friends page 
+
+2008-05-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Import now
+  does simple checks for failure 
+
+  	* engine/lib/opendd.php: Marcus Povey <marcus@dushka.co.uk> * Sanity checks
+  added to OpenDD import 
+
+  	* mod/exporttest/views/default/exporttest/main.php: 
+
+2008-05-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Query fixes for previous. 
+
+  	* engine/lib/tags.php: Adding support for db prefixes to previous 
+
+2008-05-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/odd.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  gatekeeper 
+
+  	* mod/exporttest/views/default/exporttest/main.php: Marcus Povey
+  <marcus@dushka.co.uk> * export test import set to use new import action 
+
+2008-05-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php, views/default/output/tagcloud.php: Added new tagcloud
+  functions 
+
+2008-05-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/import/odd.php, languages/en.php: Marcus Povey
+  <marcus@dushka.co.uk> * Importing ODD action added 
+
+2008-05-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* search/index.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php: Subtypes and object types for search. 
+
+2008-05-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Minor doc
+  update 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Minor doc
+  update 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed Where,
+  WhereStatic and WhereSet 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  order/limit 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed tables
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  spacing issue  
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Throws
+  exception if fields are missing on a select query 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  $CONFIG->prefix now $CONFIG->dbprefix * Exception thrown on missing tables 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Fixed ACL
+  where "where" is missing * Added catch for exceptions 
+
+2008-05-28  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/one_column.php: small tweak to the canvas
+  view - this is temp 
+
+2008-05-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: A further fix for previous. 
+
+  	* engine/lib/sessions.php: Solidifying the login() function so that the
+  session data is always consistent. 
+
+  	* actions/login.php, engine/lib/sessions.php: Revamped the login functions
+  to separate login from authentication. 
+
+  	* engine/lib/sessions.php: login() can now be extended by other
+  authentication methods. TODO: wrap this up with the PAM functionality. 
+
+  	* engine/lib/sessions.php: Adding login and logout events. 
+
+2008-05-27  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Fixed DB
+  code 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  incorrect event trigger code - problem caused by incorrect is_array clause on
+  event trigger functions 
+
+2008-05-27  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/input.php, engine/lib/social.php: create a new social library
+  in the engine. Moved string parsing for links to input.php and removed
+  converting strings to tags from the shouts plugin and added them to the
+  social library. 
+
+2008-05-27  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Marcus Povey <marcus@dushka.co.uk> * Offset
+  incremented each pass, will no longer get stuck in the infinite loop 
+
+  	* engine/lib/system_log.php: Marcus Povey <marcus@dushka.co.uk> *
+  Restrictions checked 
+
+  	* engine/lib/river.php: Marcus Povey <marcus@dushka.co.uk> * Views looked
+  for now river/$CLASSNAME/$EVENT 
+
+2008-05-26  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: new fixed width 
+
+  	* views/default/css.php: fixed width page 
+
+  	* vendors/jquery/init.js, vendors/jquery/jquery-1.2.4a.js,
+  vendors/jquery/jquery-1.2.6.pack.js, vendors/jquery/jquery.js,
+  vendors/jquery/ui.base.js, vendors/jquery/ui.draggable.js,
+  vendors/jquery/ui.droppable.js, vendors/jquery/ui.sortable.js: new jquery,
+  removed old 
+
+  	* _graphics/footer.gif, _graphics/header.gif, _graphics/sidebar-bottom.gif,
+  _graphics/sidebar-top.gif: removed old graphics 
+
+  	* _graphics/pagebackground.gif, _graphics/pagebackground.jpg: pics needed 
+
+  	* views/default/css.php, views/default/navigation/toolbox.php,
+  views/default/page_elements/header.php, views/default/reset.css: simple
+  default theme as a starting point 
+
+2008-05-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/canvas/layouts/one_column.php: added a new canvas area to
+  views, this is for plugins to layout their content. 
+
+2008-05-26  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fix for elgg_view_layout 
+
+  	* engine/lib/elgglib.php: Added layout manager to elgglib 
+
+2008-05-26  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: added some relationship helper functions for
+  relationship type 'attached' 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Slight tweak to the entities
+  getEntitiesFromRelationship method. We need inverse relationships! 
+
+  	* views/default/pageshells/pageshell.php: Sticking the sidebar somewhere for
+  now 
+
+  	* engine/lib/access.php, languages/en.php: Added a plugin hook and
+  translations for previous. 
+
+  	* engine/lib/access.php, views/default/input/access.php: Introducing a
+  visual widget for inputting access permissions. 
+
+2008-05-23  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/pageshells/pageshell.php: reverted
+  back to a simple layout for now 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/views/default/user/user.php: Similar profile fix to previous 
+
+2008-05-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/extender.php, engine/lib/metadata.php,
+  engine/lib/relationships.php, engine/lib/river.php,
+  engine/lib/system_log.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Support for river entries 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/languages/en.php, mod/profile/views/default/profile/edit.php:
+  You can now edit your profile again .. 
+
+2008-05-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * View debug
+  messages now echoed to system log instead of to the screen. * Minor doc fix 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Removing double sanitise_string on save metadata 
+
+2008-05-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Added
+  access_id 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Removing conflict over 'event' keyword in views 
+
+  	* engine/lib/elgglib.php: ... and again ... 
+
+2008-05-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/system_log.php: 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fix for previous 
+
+  	* mod/profile/actions/iconupload.php, mod/profile/icon.php,
+  mod/profile/views/default/profile/icon.php: Introducing the 'tiny' profile
+  icon size 
+
+2008-05-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/extender.php,
+  engine/lib/relationships.php, engine/lib/system_log.php, engine/start.php:
+  Marcus Povey <marcus@dushka.co.uk> * System log event code 
+
+2008-05-23  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Similar tweak as for events, but with plugin hooks
+
+  	* engine/lib/elgglib.php: trigger_event now passes the actual event details
+  on 'all' 
+
+  	* engine/lib/entities.php: An improvement to the clearMetadata method on
+  ElggEntities - specify a name and it only clears metadata of that type. 
+
+2008-05-22  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Marcus Povey <marcus@dushka.co.uk> * Added system log to
+  prerequisite loader 
+
+  	* engine/lib/system_log.php: Marcus Povey <marcus@dushka.co.uk> * Can now
+  run 
+
+  	* engine/lib/river.php, engine/lib/system_log.php: Marcus Povey
+  <marcus@dushka.co.uk> * Moving back to desktop  
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Added
+  system_log table 
+
+2008-05-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Removing duplicate metastring issue 
+
+2008-05-22  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * undid
+  previous as it was a dumb idea 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> *
+  Clarification: Trigger event can only be passed a context related to a
+  ElggEntity 
+
+2008-05-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Rearranging events: stage 1 
+
+2008-05-22  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/river.php: Marcus Povey <marcus@dushka.co.uk> * River stub for
+  the pub. 
+
+2008-05-22  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pagehandler.php: The context is now set automatically when the
+  page handler is in use. 
+
+  	* engine/lib/pageowner.php: Plugins can now set context 
+
+2008-05-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: And again 
+
+  	* engine/lib/entities.php: Minor fix for setting metadata 
+
+2008-05-21  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Marcus Povey <marcus@dushka.co.uk> * Tag cloud for
+  files 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Introducing
+  find_metadata as a counterpart to get_entities_from_metadata 
+
+2008-05-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/relationships.php: Entities now clear
+  all associated relationships on delete 
+
+  	* engine/lib/relationships.php: Added function to remove all entity
+  relationships of a particular kind associated with an entity 
+
+  	* engine/lib/access.php: Creating the constants ACCESS_PUBLIC,
+  ACCESS_PRIVATE, ACCESS_LOGGED_IN 
+
+2008-05-21  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/tags.php: Marcus Povey <marcus@dushka.co.uk> * Added tag cloud
+  functions 
+
+2008-05-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/iconupload.php, mod/profile/icon.php: Assorted profile
+  icon fixes 
+
+  	* engine/lib/entities.php: Metadata can now be added to before an entity is
+  saved. It will be added to the db on save. 
+
+  	* views/default/pageshells/pageshell.php: Allowing for further extension to
+  the sidebar 
+
+  	* engine/lib/elgglib.php, views/default/pageshells/pageshell.php: Added
+  easier sidebar population 
+
+2008-05-20  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Introducing
+  get_resized_image_from_existing_file * Consolidated
+  get_resized_image_from_uploaded_file to use it 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  get_subtype_id now shortcircuits returning unmodified $subtype if $subtype is
+  "" 
+
+  	* engine/lib/objects.php, engine/lib/sites.php, engine/lib/users.php: Marcus
+  Povey <marcus@dushka.co.uk> * Fixed direct load by guid issue 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  strange regression in get_entities, now returns all stuff even if subtype is
+  blank. 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Revised
+  matrix generation on filestore 
+
+2008-05-20  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Removing a PHP notice 
+
+2008-05-20  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/atom.php, engine/lib/export.php, engine/lib/opendd.php,
+  views/atom/export/entity.php, views/atom/export/metadata.php,
+  views/atom/export/relationship.php, views/atom/pageshells/pageshell.php:
+  Marcus Povey <marcus@dushka.co.uk> * reverted previous 
+
+  	* engine/lib/atom.php, engine/lib/export.php, engine/lib/opendd.php,
+  views/atom/export/entity.php, views/atom/export/metadata.php,
+  views/atom/export/relationship.php, views/atom/pageshells/pageshell.php:
+  Marcus Povey <marcus@dushka.co.uk> * Committed abortive Atom wrapper... we
+  need to support different import/export 
+
+  	* engine/start.php: Marcus Povey <marcus@dushka.co.uk> * Debug mode now
+  lists libraries loaded 
+
+  	* services/export/handler.php: Marcus Povey <marcus@dushka.co.uk> * 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Introducing:
+  current_page_url() 
+
+2008-05-19  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php, engine/start.php,
+  views/default/pageshells/pageshell.php: Fixing the install process, step 1. 
+
+  	* engine/lib/sessions.php: Session init now fails if the db hasn't been
+  installed. 
+
+  	* engine/start.php: Elgg will now enter light mode (no plugins are loaded,
+  system init doesn't happen) if the parameter lightmode = "true" 
+
+2008-05-16  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* services/export/handler.php: Marcus Povey <marcus@dushka.co.uk> * Minor
+  clarification 
+
+  	* endpoints/rest.php, mod/apitest/start.php, services/api/rest.php: Marcus
+  Povey <marcus@dushka.co.uk> * Refactored API under services 
+
+  	* export/handler.php, htaccess_dist, services/export/handler.php: Marcus
+  Povey <marcus@dushka.co.uk> * Refactored export to services/export for future
+  expansion of other rest style endpoints  
+
+2008-05-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/pageshells/pageshell.php: Removed the double body issue to
+  prevent confusion 
+
+  	* admin/index.php, admin/plugins/index.php, admin/settings/index.php,
+  admin/users/index.php, languages/en.php, mod/blog/actions/add.php,
+  mod/blog/actions/comments/add.php, mod/blog/actions/comments/delete.php,
+  mod/blog/actions/delete.php, mod/blog/actions/edit.php, mod/blog/add.php,
+  mod/blog/edit.php, mod/blog/everyone.php, mod/blog/index.php,
+  mod/blog/languages/en.php, mod/blog/read.php, mod/blog/start.php,
+  mod/blog/views/default/blog/css.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/blog/notfound.php,
+  mod/blog/views/default/blog/view.php,
+  mod/blog/views/default/object/blog-comment.php,
+  mod/blog/views/default/object/blog-comments.php,
+  mod/blog/views/default/object/blog.php, mod/file/actions/download.php,
+  mod/file/actions/upload.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/languages/en.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/file/file.php, mod/file/views/default/file/footer.php,
+  mod/file/views/default/file/icon.php, mod/file/views/default/file/upload.php,
+  mod/file/world.php, mod/tasklist/index.php, mod/tasklist/start.php,
+  mod/tasklist/views/default/tasklist/item.php,
+  mod/tasklist/views/default/tasklist/main.php,
+  mod/tasklist/views/default/tasklist/newtask.php,
+  views/default/admin/main.php, views/default/editmenu.php,
+  views/default/navigation/topmenu.php: Moving some stuff into the plugins
+  repo, where it belongs. 
+
+  	* engine/lib/users.php: Introducing getFriendsObjects to ElggUser 
+
+2008-05-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Debug mode
+  causes queries that return no data to issue a warning 
+
+  	* engine/lib/opendd.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  ommission: setPublished 
+
+2008-05-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/opendd.php: Added version 
+
+  	* engine/lib/opendd.php: Marcus Povey <marcus@dushka.co.uk> * Including XML
+  so it stands as a standalone lib 
+
+  	* engine/lib/export.php, engine/lib/opendd.php: Marcus Povey
+  <marcus@dushka.co.uk> * Moved ODD stuff to its own lib [untested] 
+
+  	* views/json/pageshells/pageshell.php: Marcus Povey <marcus@dushka.co.uk> *
+  Being "strictly correct" by returning application/json for json content type.
+
+2008-05-09  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* vendors/jquery/init.js, vendors/jquery/jquery-1.2.4a.js,
+  vendors/jquery/ui.base.js, vendors/jquery/ui.draggable.js,
+  vendors/jquery/ui.droppable.js, vendors/jquery/ui.sortable.js: jquery
+  framework 
+
+  	* views/default/css.php, views/default/navigation/topmenu.php,
+  views/default/page_elements/header.php,
+  views/default/pageshells/pageshell.php: drag n drop interface test 
+
+2008-05-08  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Moved shortcut so that subtype of "" doesn't cause fail. 
+
+2008-05-07  pete <pete@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: 
+
+  	* views/default/css.php, views/default/navigation/toolbox.php,
+  views/default/pageshells/pageshell.php,
+  views/default/pageshells/pageshell_sidebar.php: new toolbar menu 
+
+2008-05-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Removed a debug message 
+
+  	* engine/lib/entities.php: A fix for get_entities, which was borking if the
+  subtype of object specified didn't exist. 
+
+  	* engine/lib/configuration.php, engine/lib/sessions.php,
+  engine/lib/sites.php: Configuration prerequisites are now loaded on boot time
+  rathr than init 
+
+  	* engine/lib/filestore.php: The filestore is no longer so greedy about its
+  init function, and therefore gets the correct filestore location 
+
+  	* engine/lib/configuration.php: A small validation check 
+
+2008-05-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: reversed my last tweak, another solution will
+  be required 
+
+2008-05-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php, views/default/navigation/topmenu.php: Adding a user
+  icon to the top menu 
+
+2008-05-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: small tweak to get annotations 
+
+2008-05-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Minor bug fix in configuration 
+
+  	* engine/start.php: Update to start.php to fix bug on installation 
+
+  	* actions/systemsettings/install.php: Corrected an issue with actions. 
+
+  	* actions/systemsettings/install.php: Fixed a bug where the site was private
+  unless you were logged out ... 
+
+  	* actions/systemsettings/install.php, engine/lib/configuration.php,
+  engine/lib/database.php, engine/lib/entities.php, engine/lib/install.php,
+  engine/lib/languages.php, engine/lib/metadata.php,
+  engine/lib/relationships.php, engine/lib/users.php, engine/start.php,
+  install.php, languages/en.php, views/default/navigation/toolbox.php,
+  views/default/pageshells/pageshell_sidebar.php,
+  views/default/settings/install.php, views/default/settings/system.php: The
+  system now uses the site GUID to get and set entity data. Also, installation
+  is a great deal more visual. 
+
+2008-05-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> * Now
+  registers email handler (oops) 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/foaf/export/entity.php: Marcus Povey <marcus@dushka.co.uk> * FOAF
+  view uses correctly formatted UUID 
+
+  	* views/foaf/export/entity.php, views/foaf/pageshells/pageshell.php: Marcus
+  Povey <marcus@dushka.co.uk> * Added prototype FOAF view 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Establishing $CONFIG->site 
+
+  	* engine/lib/install.php: Further changes to the site install procedure. 
+
+  	* engine/lib/elgglib.php, engine/lib/install.php, engine/lib/sites.php,
+  engine/schema/mysql.sql: Major site config changes 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/actions/upload.php: Marcus Povey <marcus@dushka.co.uk> * Uploads
+  and downloads now work. 
+
+  	* engine/lib/filestore.php: 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Schema update for configuration 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Bugfixing
+  my sillyness 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php: Fixed a bug in countAnnotations 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Bugfix 
+
+  	* mod/file/actions/download.php, mod/file/languages/en.php: Marcus Povey
+  <marcus@dushka.co.uk> * Download support 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Added tell 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Added eof
+  functionality to datastore 
+
+  	* mod/file/actions/download.php, mod/file/start.php,
+  mod/file/views/default/file/file.php: Marcus Povey <marcus@dushka.co.uk> *
+  Download page added 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Docs for previous 
+
+  	* engine/lib/actions.php: Added GET variable processing to the action
+  handler. 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/start.php, mod/file/views/default/file/file.php: Marcus Povey
+  <marcus@dushka.co.uk> * Name tweaks 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Get and set per-site configuration values
+  from the database 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/actions/upload.php: Marcus Povey <marcus@dushka.co.uk> * Minor
+  tweak 
+
+  	* mod/file/actions/upload.php: Marcus Povey <marcus@dushka.co.uk> * Error
+  handling 
+
+  	* mod/file/actions/upload.php: Marcus Povey <marcus@dushka.co.uk> * Save to
+  get the GUID 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX: Typo
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: $CONFIG->dbprefix, not $CONFIG->prefix 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php, mod/file/upload.php: Marcus Povey
+  <marcus@dushka.co.uk> * Bugfix: uses the correct filename 
+
+2008-05-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Introducing gatekeeper(); 
+
+  	* engine/lib/elgglib.php: Introducing run_function_once($functionname,
+  $timelastupdatedcheck). 
+
+2008-05-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/actions/upload.php, mod/file/index.php, mod/file/start.php,
+  mod/file/views/default/file/file.php, mod/file/views/default/file/icon.php:
+  Marcus Povey <marcus@dushka.co.uk> * Using mime types 
+
+  	* engine/lib/database.php, engine/lib/entities.php: Marcus Povey
+  <marcus@dushka.co.uk> * Fixed regression on custom class loader 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Now
+  registers ElggFile for 'object' & 'file' 
+
+2008-04-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Fix for previous fix for previous fix 
+
+  	* engine/lib/entities.php: Slight correction to the count entities from
+  relationship alias in ElggEntity 
+
+  	* engine/lib/relationships.php: Fix for previous fix 
+
+  	* engine/lib/relationships.php: Fix for previous 
+
+  	* engine/lib/entities.php, engine/lib/relationships.php: Fixing some
+  functions relating to relationships 
+
+2008-04-30  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Minor tweak:
+  removed $ns references from ODD __toString() 
+
+  	* engine/lib/export.php, engine/lib/relationships.php: Marcus Povey
+  <marcus@dushka.co.uk> * Changed "verb" to "type" in relationship, as
+  described in ODD spec 0.5 
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> * Removed
+  get_notifications... you should provide a list of guid's yourself  
+
+  	* mod/file/views/default/file/footer.php: Marcus Povey <marcus@dushka.co.uk>
+  * Simple footer 
+
+2008-04-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: get_entities returns false if the subtype name
+  couldn't be found. 
+
+2008-04-30  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/file/actions/upload.php, mod/file/friends.php, mod/file/index.php,
+  mod/file/languages/en.php, mod/file/start.php, mod/file/upload.php,
+  mod/file/views/default/file/file.php, mod/file/views/default/file/footer.php,
+  mod/file/views/default/file/upload.php, mod/file/world.php: Marcus Povey
+  <marcus@dushka.co.uk> * First draft file upload 
+
+2008-04-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/relationships.php: Introducing
+  getEntitiesFromRelationship and countEntitiesFromRelationship methods on
+  ElggEntity 
+
+  	* mod/blog/views/default/object/blog.php: Fixed a (presumably transient)
+  comments issue in blogs. 
+
+  	* mod/blog/views/default/object/blog.php: Temporary style fix 
+
+  	* mod/blog/views/default/object/blog.php: Updating blog view to involve
+  icons 
+
+2008-04-30  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> *
+  ElggDiskFilestore now uses matrix formed from username, and supports paths. 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * 
+
+2008-04-30  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Resizing images now resamples them for better
+  clarity. 
+
+  	* mod/profile/actions/iconupload.php: Better error reporting on previous. 
+
+  	* mod/profile/actions/iconupload.php: Fixed profile resizing issue 
+
+  	* engine/lib/filestore.php: Previous now returns false. 
+
+  	* engine/lib/filestore.php: Fixed image resizing issue, corrected function
+  to create a jpeg using output buffering rather than a temporary file 
+
+2008-04-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/page_elements/header.php: added jquery to the main pageshell
+  header 
+
+  	* vendors/jquery/jquery.js: Uploaded the latest jquery into core. 
+
+2008-04-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/profile/actions/iconupload.php,
+  mod/profile/editicon.php, mod/profile/graphics/defaultlarge.jpg,
+  mod/profile/graphics/defaultmedium.jpg,
+  mod/profile/graphics/defaultsmall.jpg, mod/profile/icon.php,
+  mod/profile/languages/en.php, mod/profile/start.php,
+  mod/profile/views/default/profile/editicon.php,
+  mod/profile/views/default/profile/icon.php,
+  mod/profile/views/default/user/user.php: Introducing profile icons. 
+
+  	* engine/lib/filestore.php: Fix for make_file_matrix 
+
+  	* engine/lib/filestore.php: Filenames fix 
+
+  	* engine/lib/filestore.php: Non-invasive fix for previous. 
+
+  	* engine/lib/filestore.php: Introducing get_uploaded_file and
+  get_resized_image_from_uploaded_file. 
+
+  	* engine/lib/extender.php: Sledgehammer tactics on can_edit_extender 
+
+  	* engine/lib/extender.php: Attempt at an extender canEdit fix 
+
+  	* engine/lib/annotations.php: Fixed typo 
+
+  	* engine/lib/extender.php: Added getEntity() to ElggExtender 
+
+  	* engine/lib/annotations.php: Fixed a minor SQL error in annotation sum
+  functions 
+
+  	* engine/lib/annotations.php: Minor fix involving ratings and get
+  annotations 
+
+2008-04-29  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Import functionality works, removed update but no change error on update 
+
+  	* engine/lib/extender.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Missing name 
+
+  	* engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Fixed bug in
+  getOwner override 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  incorrect if condition logic 
+
+2008-04-29  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/calendar.php: small tweak to the calendar input 
+
+2008-04-29  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/input/calendar.php: Replacing strip_string with
+  sanitise_string in the calendar input 
+
+2008-04-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/notification.php: Marcus Povey <marcus@dushka.co.uk> * Notify
+  and email notify added (not tested) ... still unsure about get_notify_list,
+  attempted a number of options ... not sure if this is as simple as it could
+  be  
+
+2008-04-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/vendors/calendarpopup/CalendarPopup.js,
+  views/default/input/calendar.php, views/default/output/calendar.php: Calendar
+  popup input for dates 
+
+  	* views/default/output/tags.php: Removing undefined index notice 
+
+  	* views/default/welcome.php: Removed annoying reference to $vars['name'] in
+  the welcome view 
+
+  	* mod/profile/actions/edit.php, mod/profile/languages/en.php,
+  mod/profile/start.php, mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/user/user.php: The profile now has fields set in
+  start.php. TODO: make those user editable, once we have the admin panel ... 
+
+  	* views/default/output/tags.php: The tag output view can now use
+  $vars['value'], bringing it in line with all the others 
+
+  	* views/default/input/email.php, views/default/output/email.php: Email
+  address input and output fields 
+
+2008-04-25  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php: Marcus Povey <marcus@dushka.co.uk> * Removed minor
+  config stuff 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Crude
+  deleteall method added 
+
+  	* htaccess_dist: Marcus Povey <marcus@dushka.co.uk> * JSON & PHP export
+  rewrite rules 
+
+  	* views/json/export/entity.php, views/json/export/metadata.php,
+  views/json/export/relationship.php, views/php/export/entity.php,
+  views/php/export/metadata.php, views/php/export/relationship.php: Marcus
+  Povey <marcus@dushka.co.uk> * JSON & PHP Export modes 
+
+  	* engine/lib/extender.php, engine/lib/relationships.php: Marcus Povey
+  <marcus@dushka.co.uk> * Metadata and relationships can now be accessed as
+  arrays 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Objects can
+  be accessed as arrays 
+
+2008-04-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Adding get_entities_from_metadata_multi 
+
+2008-04-25  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* export/handler.php, htaccess_dist, odd/handler.php: Marcus Povey
+  <marcus@dushka.co.uk> * Renamed /odd to /export since the handler can now do
+  so much more... 
+
+2008-04-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/editmenu.php: Editmenu stub view 
+
+2008-04-25  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Marcus Povey <marcus@dushka.co.uk> * Using ODD view by
+  default 
+
+  	* odd/handler.php, views/default/export/entity.php,
+  views/default/export/metadata.php, views/default/export/relationship.php,
+  views/odd/export/entity.php, views/odd/export/metadata.php,
+  views/odd/export/relationship.php, views/odd/pageshells/pageshell.php: Marcus
+  Povey <marcus@dushka.co.uk> * Updated ODD handler, now uses views * Normal
+  and ODD view for all data items... cute eh? :) 
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Using common
+  attribute type var to determine ODD export type for uuid generation, now
+  attributes can support a uuid 
+
+  	* .../views/default/guidbrowser/entity_full.php: Marcus Povey
+  <marcus@dushka.co.uk> * Uses guid_one as well 
+
+  	* odd/handler.php: Marcus Povey <marcus@dushka.co.uk> * Removed session
+  debug 
+
+  	* action.php, engine/lib/api.php, engine/lib/elgglib.php,
+  views/default/api/output.php, views/json/api/output.php,
+  views/json/pageshells/pageshell.php, views/php/api/output.php,
+  views/php/pageshells/pageshell.php, views/xml/api/output.php,
+  views/xml/pageshells/pageshell.php: Marcus Povey <marcus@dushka.co.uk> * 
+
+  	* endpoints/rest.php: Marcus Povey <marcus@dushka.co.uk> * API converted to
+  use views system 
+
+2008-04-25  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fix to the debug messages for elgg_view 
+
+2008-04-25  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/export.php: Marcus Povey
+  <marcus@dushka.co.uk> * Removed all namespacing code 
+
+2008-04-24  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Namespace
+  support added to export 
+
+2008-04-24  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* version.php: Minor edit to the version number spec 
+
+  	* engine/lib/elgglib.php, engine/lib/version.php, engine/schema/mysql.sql,
+  version.php: The beginnings of a db upgrade system. See lib/version.php,
+  /version.php and the datalist functions in elgglib.php. 
+
+2008-04-24  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Removed header
+  object 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Unhandled
+  elements issue a warning on import 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Removed ODD
+  header element 
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/extender.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Generated now published * Metadata and annotations
+  use time from db * Attributes use time from entity 
+
+2008-04-23  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Improved
+  documentation 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Filesize
+  support added, now possible to get all file contents with
+  $file->read($file->size());  
+
+2008-04-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/profile/actions/edit.php, mod/profile/edit.php, mod/profile/index.php,
+  mod/profile/languages/en.php, mod/profile/start.php,
+  mod/profile/views/default/profile/edit.php,
+  mod/profile/views/default/user/user.php: Introduced profile plugin 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php, engine/lib/users.php:
+  Fixed user GUID and multiple metadata bugs 
+
+  	* engine/lib/sessions.php: Session init now gets priority 
+
+  	* engine/lib/metadata.php: Improving the metadata search in cases where
+  users have multiple tags with the same text 
+
+  	* mod/blog/start.php: Added doc for blog URL function 
+
+  	* engine/lib/entities.php: Minor update to the default entity URLs 
+
+  	* engine/lib/elgglib.php: Fixed an inconsistency in elgg_view_entity 
+
+2008-04-21  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Numerous
+  bugs fixed 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * No longer
+  saves file automatically, this gives you the option as to how to handle files
+  - either as proper objects or adhoc file handles which still use the
+  filestore code. 
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Save and
+  Load (read/write) work * TODO: Loaded can not be loaded via name, only
+  guid... correct? 
+
+2008-04-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: can_edit_entity now always returns false if the
+  user is logged out 
+
+2008-04-21  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Marcus Povey <marcus@dushka.co.uk> * Removed tiny
+  debug output 
+
+2008-04-21  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php: Fix for lingering sessions with nonexistent users
+
+  	* engine/schema/mysql.sql: Removing extraneous character from schema 
+
+  	* engine/schema/mysql.sql: Added site_guid to the entities table 
+
+2008-04-18  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/filestore.php: Marcus Povey <marcus@dushka.co.uk> * Unfinished
+  filestore code 
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * Cleaned up doc 
+
+2008-04-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: If you feed an entity a metadata array, it
+  assumes multiple values are allowed 
+
+  	* views/default/input/tags.php: Updated input tag field to take in strings
+  as well as arrays 
+
+  	* mod/blog/views/default/object/blog.php: Link fix 
+
+  	* htaccess_dist: Minor page handler mod_rewrite fix 
+
+2008-04-18  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/exporttest/index.php, mod/guidbrowser/index.php: Marcus Povey
+  <marcus@dushka.co.uk> * Hardcoded sessions no longer necessary now that login
+  works 
+
+2008-04-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/views/default/object/blog-comment.php,
+  mod/blog/views/default/object/blog.php,
+  views/default/account/forms/register.php: Removing references to action.php 
+
+  	* action_handler.php: Searunner?! 
+
+2008-04-18  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* action_handler.php, htaccess_dist: Marcus Povey <marcus@dushka.co.uk> *
+  Fixed broken actions code on linux 
+
+2008-04-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Removing previous 
+
+2008-04-18  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Fixed ODD mod-rewrite rules  
+
+2008-04-18  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Action debug 
+
+  	* htaccess_dist, mod/blog/start.php: Fix for page handler bugs 
+
+2008-04-17  misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Misja Hoebe <misja@curverider.co.uk> Clean up svn cruft 
+
+2008-04-16  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, search/index.php: Introducing search 
+
+  	* engine/lib/elgglib.php, mod/blog/views/default/object/blog.php: No need
+  for elgg_view_entity to separately load the owner entity 
+
+  	* engine/lib/entities.php, mod/blog/start.php: ElggEntity->getOwnerUser() ->
+  ElggEntity->getOwnerEntity() 
+
+  	* mod/blog/start.php, mod/blog/views/default/object/blog.php: URL handling
+  for the blog plugin 
+
+  	* engine/lib/entities.php: Added the getURL and getOwnerUser methods to
+  ElggEntity (gets the URL to display the current entity and the ElggUser
+  entity that represents the owner respectively) 
+
+  	* engine/lib/entities.php, engine/lib/users.php, entities/index.php,
+  languages/en.php: Generic entity view system 
+
+  	* mod/blog/start.php, mod/blog/views/default/object/blog.php: Blog plugin
+  now serves as a fancy URL example 
+
+  	* views/default/messages/errors/list.php, views/default/messages/list.php,
+  views/default/messages/messages/list.php: Fixing the message views 
+
+  	* engine/lib/input.php, engine/lib/pagehandler.php: Added better GET query
+  variable handling into the page handler mix 
+
+2008-04-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* _css/css.php, _graphics/blockquote.png, _graphics/footer.gif,
+  _graphics/header.gif, _graphics/sidebar-bottom.gif,
+  _graphics/sidebar-top.gif, css/css.php, engine/lib/pagehandler.php,
+  graphics/blockquote.png, graphics/footer.gif, graphics/header.gif,
+  graphics/sidebar-bottom.gif, graphics/sidebar-top.gif, htaccess_dist,
+  pagehandler.php, views/default/css.php,
+  views/default/page_elements/header.php: Natty page handling functions. See
+  engine/lib/pagehandler.php 
+
+2008-04-15  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: Marcus Povey <marcus@dushka.co.uk> * Hopefully correct
+  mod-rewrite rules 
+
+2008-04-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, engine/lib/entities.php, engine/lib/users.php:
+  get_entities now allows for arrays of GUIDs to be supplied as an owner, and
+  can be asked to count entities rather than return them; as a result,
+  get_user_friends_objects and count_* functionality is also now available 
+
+2008-04-15  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* odd/handler.php: Marcus Povey <marcus@dushka.co.uk> * ODD handler added,
+  still needs modrewrite rules to be specified. 
+
+2008-04-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/comments/delete.php, mod/blog/languages/en.php,
+  mod/blog/start.php, mod/blog/views/default/object/blog-comment.php,
+  mod/blog/views/default/object/blog-comments.php,
+  mod/blog/views/default/object/blog.php: Blog plugin improvements, including
+  delete on comments 
+
+  	* languages/en.php: A couple of additions to the language file 
+
+  	* views/default/input/checkboxes.php, views/default/input/file.php,
+  views/default/input/gender.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Cleaning up input
+  field views 
+
+  	* views/default/output/confirmlink.php, views/default/output/date.php,
+  views/default/output/file.php, views/default/output/gender.php,
+  views/default/output/longtext.php, views/default/output/pulldown.php,
+  views/default/output/tagcloud.php, views/default/output/tags.php,
+  views/default/output/text.php, views/default/output/timestamp.php,
+  views/default/output/url.php: Tidied up output views 
+
+2008-04-15  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Removed
+  canedit shortcut 
+
+  	* engine/lib/relationships.php: Marcus Povey <marcus@dushka.co.uk> *
+  Modified to not throw exception on missing verb conversion 
+
+  	* engine/lib/relationships.php: Marcus Povey <marcus@dushka.co.uk> *
+  Relationship import 
+
+2008-04-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/extender.php: Improvement to canEdit() for extenders, which
+  takes into account the canEdit() status of entities the extender is attached
+  to 
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metastrings.php: Removing the multiple slash problem on
+  metastrings in extenders 
+
+2008-04-15  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/relationships.php: Marcus Povey <marcus@dushka.co.uk> *
+  Relationships export 
+
+  	* engine/lib/xml.php: Marcus Povey <marcus@dushka.co.uk> * Improved XML to
+  array code 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Minor tweaks 
+
+  	* engine/lib/extender.php: Marcus Povey <marcus@dushka.co.uk> * Extender
+  import support. * Removed Importable interface on extender, its easier to
+  just use the entity object interface. 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Blocking
+  create and update dates from ODD export, since these don't make sense to
+  export. 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  optional set multiple on metadata 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Belts and
+  braces 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Entity
+  import. 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Using common detect_extender_valuetype function 
+
+2008-04-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Undone last as
+  it was a bad idea. 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Exception
+  thrown on unrecognised import tag. 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Import
+  functions now deal in ODD! 
+
+  	* engine/lib/export.php, engine/lib/xml.php: Marcus Povey
+  <marcus@dushka.co.uk> * XML Import processor 
+
+  	* engine/lib/relationships.php: Marcus Povey <marcus@dushka.co.uk> *
+  Relationships export 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Relationships
+  export  
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * ODD
+  relationship verb -> relationship mapping functions 
+
+  	* mod/guidbrowser/index.php, mod/guidbrowser/start.php,
+  .../views/default/guidbrowser/entity_full.php: Marcus Povey
+  <marcus@dushka.co.uk> * Relationships added to GUID browser 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> *
+  Relationships table brought in line with code... oops 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/extender.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * ODD Annotation and Metadata export 
+
+2008-04-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Added owner
+  uuid to type 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  subclass 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Comment tweak 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/export.php, engine/lib/extender.php, engine/lib/metadata.php,
+  engine/lib/relationships.php: Marcus Povey <marcus@dushka.co.uk> * Entity ODD
+  export 
+
+  	* engine/lib/xml.php: Marcus Povey <marcus@dushka.co.uk> * Moved XML stuff
+  to xml.php 
+
+  	* engine/lib/exceptions.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  DataFormatException 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Minor tweak 
+
+2008-04-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php, engine/lib/api.php, engine/lib/pam.php: Marcus Povey
+  <marcus@dushka.co.uk> * Created PAM library * API moved to use new PAM
+  functions 
+
+2008-04-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apitest/index.php, mod/apitest/start.php,
+  mod/apitest/views/default/apitest/configform.php,
+  mod/apitest/views/default/apitest/main.php: Marcus Povey
+  <marcus@dushka.co.uk> * Package header added 
+
+  	* mod/tasklist/index.php, mod/tasklist/start.php,
+  mod/tasklist/views/default/tasklist/item.php,
+  mod/tasklist/views/default/tasklist/main.php,
+  mod/tasklist/views/default/tasklist/newtask.php: Marcus Povey
+  <marcus@dushka.co.uk> * Package header added 
+
+  	* mod/exporttest/index.php, mod/exporttest/start.php,
+  mod/exporttest/views/default/exporttest/main.php,
+  .../views/default/exporttest/outputxml.php: Marcus Povey
+  <marcus@dushka.co.uk> * Package header added 
+
+  	* mod/guidbrowser/languages/en.php, mod/guidbrowser/start.php,
+  .../views/default/guidbrowser/browser.php,
+  .../views/default/guidbrowser/entity.php,
+  .../views/default/guidbrowser/entity_full.php,
+  .../views/default/guidbrowser/newentity.php,
+  .../views/default/guidbrowser/prevnext.php: Marcus Povey
+  <marcus@dushka.co.uk> * Package header added 
+
+2008-04-09  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/start.php: Fixed some bugs including a
+  load order patch from Rolando, and an update issue 
+
+  	* engine/lib/pam.php: Empty PAM include file 
+
+2008-04-08  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Simplified extender types, now only supports integer
+  and text - types deamed not to be necessary (yet), also simplifies import and
+  export. * Types better detected. 
+
+2008-04-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/users.php, engine/start.php:
+  Incorporating setup fixes from Rolando 
+
+2008-04-08  misja <misja@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php, engine/lib/cache.php, engine/lib/database.php: Misja
+  Hoebe <misja@curverider.co.uk> More doctag fixes 
+
+  	* endpoints/rest.php, engine/lib/annotations.php, engine/lib/entities.php,
+  engine/lib/exceptions.php, engine/lib/export.php, engine/lib/extender.php,
+  engine/lib/metadata.php, engine/lib/objects.php, engine/lib/plugins.php,
+  engine/lib/relationships.php, engine/lib/sites.php, engine/lib/users.php:
+  Misja Hoebe <misja@curverider.co.uk> More docstring fixes 
+
+  	* action.php, engine/lib/annotations.php, engine/lib/sites.php,
+  engine/lib/users.php: Misja Hoebe <misja@curverider.co.uk> Fixing doctags 
+
+2008-04-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Further annotation /
+  metadata fixes 
+
+  	* views/default/output/tags.php: Improved tag display 
+
+  	* engine/lib/annotations.php: Fixing undeclared error 
+
+  	* mod/blog/actions/delete.php, mod/blog/actions/edit.php,
+  mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/object/blog.php: CRUD for blog posts 
+
+  	* engine/lib/sites.php, engine/lib/users.php: Same bugfix for sites and
+  users 
+
+  	* engine/lib/elgglib.php, engine/lib/entities.php, engine/lib/objects.php:
+  Further adventures in getting things to delete correctly 
+
+  	* engine/lib/annotations.php, engine/lib/elgglib.php,
+  engine/lib/entities.php: Further delete and event trigger fixes 
+
+  	* engine/lib/entities.php: Triggering events on create, update and delete
+  actions on entities 
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php: Properly extensible canEdit functionality for
+  metadata, annotations, and anything else that supports the ElggExtender
+  interface 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: Much better handling for
+  deleting entities and metadata 
+
+2008-04-04  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/edit.php, mod/blog/edit.php, mod/blog/start.php,
+  mod/blog/views/default/blog/forms/edit.php,
+  mod/blog/views/default/object/blog.php: Blog edit updates 
+
+  	* views/default/input/tags.php: Updated the tags input field 
+
+  	* languages/en.php: Adding 'edit' to the language file 
+
+  	* engine/lib/entities.php: Added $entity->canEdit() (true|false) 
+
+  	* mod/blog/everyone.php, mod/blog/index.php, mod/blog/languages/en.php,
+  mod/blog/start.php: Introducing the all blog posts page. 
+
+  	* views/default/output/tags.php: Tweaking the output/tags view 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: Added better support for
+  arrays of metadata 
+
+  	* mod/blog/actions/add.php, mod/blog/views/default/object/blog.php: Added
+  tags to the blog plugin 
+
+  	* mod/blog/read.php, mod/blog/views/default/blog/notfound.php: Further blog
+  enhancements 
+
+2008-04-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/relationships.php: Marcus Povey
+  <marcus@dushka.co.uk> * Relationship related code moved to relationships.php
+  * Added ElggRelationship class as wrapper (to help with import and export) *
+  Import and Export relationship code added (NOT TESTED) 
+
+  	* mod/exporttest/index.php: 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Minor text
+  change 
+
+2008-04-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/actions/comments/add.php, mod/blog/languages/en.php,
+  mod/blog/start.php, mod/blog/views/default/object/blog-comment.php,
+  mod/blog/views/default/object/blog-comments.php,
+  mod/blog/views/default/object/blog.php: Added comments to blog 
+
+  	* engine/lib/database.php: Added query display to database exceptions 
+
+  	* engine/lib/sessions.php: Fixed session initialisation issue 
+
+2008-04-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/lib/extender.php, engine/lib/metadata.php:
+  Marcus Povey <marcus@dushka.co.uk> * Annotations and metadata now imported 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Bugfixes 
+
+  	* mod/guidbrowser/index.php, mod/guidbrowser/start.php,
+  .../views/default/guidbrowser/browser.php,
+  .../views/default/guidbrowser/entity.php,
+  .../views/default/guidbrowser/entity_full.php,
+  .../views/default/guidbrowser/navbar.php,
+  .../views/default/guidbrowser/prevnext.php: Marcus Povey
+  <marcus@dushka.co.uk> * Basic guid browser 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  Iterator interface to override foreach behaviour 
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/sites.php,
+  engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Exception thrown
+  if load fails 
+
+2008-04-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/languages/en.php, mod/blog/read.php,
+  mod/blog/views/default/blog/css.php, mod/blog/views/default/object/blog.php:
+  Blog: extended comment form, etc. 
+
+  	* engine/lib/elgglib.php: Slight fix for previous 
+
+  	* engine/lib/elgglib.php: Update for elgg_view_entity 
+
+  	* engine/lib/database.php: Slight get_data revert 
+
+  	* views/default/page_elements/header.php: Changing, once again, the way
+  titles work 
+
+  	* engine/lib/pageowner.php: Pages can now manually override the page owner 
+
+  	* mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/css.php, mod/blog/views/default/object/blog.php:
+  Adding name and posted date to blog entries 
+
+  	* mod/blog/index.php, mod/blog/views/default/blog/view.php,
+  mod/blog/views/default/object/blog.php: Blog update: you can post and view
+  blog entries. 
+
+  	* engine/lib/elgglib.php: Improved elgg_view_entity 
+
+2008-04-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Cut and
+  paste is a killer 
+
+  	* engine/lib/plugins.php: Marcus Povey <marcus@dushka.co.uk> * Fixed
+  language autoload 
+
+2008-04-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/guidbrowser/index.php, mod/guidbrowser/languages/en.php,
+  mod/guidbrowser/start.php, .../views/default/guidbrowser/entity.php,
+  .../views/default/guidbrowser/entity_full.php,
+  .../views/default/guidbrowser/navbar.php,
+  .../views/default/guidbrowser/newentity.php: Marcus Povey
+  <marcus@dushka.co.uk> * End of day 
+
+2008-04-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php, engine/lib/entities.php, engine/lib/users.php:
+  Assorted entity fixes 
+
+  	* engine/lib/plugins.php: Plugins now autoregister translations 
+
+  	* engine/lib/entities.php: Small fix for get_entities 
+
+  	* mod/blog/actions/add.php, mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/forms/edit.php: Blog posting 
+
+2008-04-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Access id
+  better handled 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Subtype is
+  converted to its exportable string version 
+
+2008-04-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php: Removed some unnecessary debug junk 
+
+  	* engine/lib/actions.php: Fixed action registration for plugins 
+
+2008-04-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/exporttest/index.php: Marcus Povey <marcus@dushka.co.uk> * Minor tweak
+  to actually get the command from it all 
+
+2008-04-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Modified page_draw to behave correctly depending
+  on sessions 
+
+  	* languages/en.php: Language updates 
+
+  	* action.php: Removing debug issue 
+
+  	* action.php: Debug message in actions 
+
+  	* views/default/account/forms/register.php: Changing the destination of the
+  register form 
+
+  	* views/default/css.php, views/default/page_elements/header.php: Separating
+  sitename and title in the header 
+
+  	* views/default/css.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php: Let's make the
+  classes for input elements consistent 
+
+  	* views/default/pageshells/pageshell.php: Reinstating the side menu 
+
+2008-04-02  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* graphics/blockquote.png, graphics/footer.gif, graphics/header.gif,
+  graphics/sidebar-bottom.gif, graphics/sidebar-top.gif, views/default/css.php,
+  views/default/page_elements/footer.php,
+  views/default/pageshells/pageshell.php: basic skin added 
+
+2008-04-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * BUGFIX: User creation * User import functionality
+  working 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Offset/limit 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Value to
+  value_id 
+
+  	* mod/exporttest/views/default/exporttest/main.php: Marcus Povey
+  <marcus@dushka.co.uk> * Now using method=post 
+
+  	* engine/lib/entities.php, mod/tasklist/start.php: Marcus Povey
+  <marcus@dushka.co.uk> * REMOVED DEBUG * WARNING!!! THERE IS A PHP BUG ON
+  UBUNTU/APACHE2/PHP5 that will prevent metadata from functioning. Values
+  appear to get unset. No fix known. 
+
+  	* engine/lib/entities.php: 
+
+  	* mod/tasklist/start.php: 
+
+  	* mod/tasklist/start.php: 
+
+  	* mod/tasklist/start.php: 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php: 
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/entities.php: 
+
+  	* engine/lib/entities.php: 
+
+  	* mod/tasklist/start.php: debug 
+
+  	* engine/lib/entities.php: removed debug 
+
+  	* engine/lib/entities.php: debug 
+
+  	* engine/lib/entities.php: debug 
+
+  	* engine/lib/metadata.php: debug 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Entity type/ subtype functional 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> *
+  get_metadata_byname better handles single/multiple return values 
+
+  	* mod/tasklist/start.php, mod/tasklist/views/default/tasklist/newtask.php: 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> *
+  get_metadata_byname better handles single/multiple return values 
+
+2008-04-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/blog/index.php: Slight change to blogs 
+
+2008-04-02  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: debug 
+
+  	* engine/lib/metadata.php: removed debug  
+
+  	* engine/lib/metadata.php: debug 
+
+  	* mod/tasklist/index.php, mod/tasklist/start.php: test 
+
+2008-04-02  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* htaccess_dist: htaccess dist 
+
+  	* engine/lib/users.php: Small fix 
+
+  	* engine/lib/pageowner.php: Smaller version of previous 
+
+  	* engine/lib/pageowner.php: Introducing page_owner_entity 
+
+  	* engine/lib/friends.php: Removing the friends module (it's unnecessary) 
+
+  	* engine/lib/pageowner.php: Fix to previous 
+
+  	* engine/lib/pageowner.php: Reverting page_owner 
+
+2008-04-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * End of day... 
+
+  	* engine/lib/annotations.php, engine/lib/extender.php,
+  engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Moved common
+  functionality of metadata and annotations into superclass. 
+
+2008-04-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* languages/en.php, mod/blog/add.php, mod/blog/edit.php, mod/blog/index.php,
+  mod/blog/languages/en.php, mod/blog/start.php,
+  mod/blog/views/default/blog/forms/edit.php: Further adventures in blogging;
+  saving for now 
+
+  	* mod/blog/index.php, mod/blog/languages/en.php, mod/blog/start.php,
+  views/default/welcome/logged_in.php: Blog mod and welcome screen updates 
+
+  	* engine/lib/pageowner.php: Update to docs for previous 
+
+  	* engine/lib/pageowner.php, engine/lib/users.php: page_owner() now returns
+  an ElggUser or false 
+
+  	* views/default/navigation/toolbox.php: Modified toolbox to display menu
+  items correctly 
+
+  	* engine/lib/elgglib.php: Fixed the menu item function 
+
+2008-04-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Marcus Povey <marcus@dushka.co.uk> * Removed debug 
+
+2008-04-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/languages.php: Added the register_languages function, for
+  easier loading of language files from plugins 
+
+  	* actions/register.php, engine/lib/entities.php, engine/lib/sessions.php,
+  engine/lib/users.php: Registration, login, logout work. Victory! 
+
+  	* views/default/account/forms/register.php: Registration form update 
+
+  	* engine/lib/users.php: Updated the registration function 
+
+  	* languages/en.php, register.php, views/default/account/forms/login.php,
+  views/default/account/forms/register.php, views/default/login.php,
+  views/default/welcome/logged_out.php: Further adventures in registration 
+
+2008-04-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Some UUID
+  functions 
+
+2008-04-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/logout.php, actions/register.php,
+  engine/lib/entities.php, engine/lib/users.php, languages/en.php,
+  views/default/login.php: User registration gubbins 
+
+2008-04-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Used wrong
+  function decl 
+
+  	* mod/exporttest/index.php,
+  mod/exporttest/views/default/exporttest/main.php: Marcus Povey
+  <marcus@dushka.co.uk> * Added import block 
+
+  	* engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Moved import to
+  ElggEntity 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Moved import
+  to ElggEntity 
+
+2008-04-01  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php, languages/en.php,
+  views/default/navigation/topmenu.php, views/default/page_elements/header.php,
+  views/default/welcome.php, views/default/welcome/logged_in.php,
+  views/default/welcome/logged_out.php: Fixed some session stuff, modified a
+  few views 
+
+2008-04-01  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Moved import
+  to ElggEntity 
+
+  	* engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * Moved import to
+  ElggEntity 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Entities
+  owner_guid exported as owner_uuid 
+
+2008-03-31  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Tidied up
+  comments 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Somewhat more
+  robust import logic 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Owner guid converted to a uuid 
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Initial xml
+  import. 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Export of
+  entities now includes uuid 
+
+2008-03-31  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/test/graphics/elgg.powered.png, mod/test/graphics/leaf.jpg,
+  mod/test/graphics/logo.png, mod/test/graphics/orange_small.png,
+  mod/test/graphics/purplecrayon.gif, mod/test/index.php, mod/test/start.php,
+  mod/test/views/default/css.php, mod/test/views/default/menu.php,
+  mod/test/views/default/pageshells/pageshell.php,
+  mod/test/views/default/testplugin/pageshell.php: Removing the mod/test
+  plugin. It doesn't need to be here... 
+
+2008-03-31  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php: Marcus Povey <marcus@dushka.co.uk> *
+  Reverted regression 
+
+2008-03-29  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * No such entity
+  error thrown if invalid guid given for export 
+
+2008-03-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/api.php, engine/lib/entities.php,
+  engine/lib/export.php, engine/lib/metadata.php, index.php: Marcus Povey
+  <marcus@dushka.co.uk> * Metadata and Annotations now exported. 
+
+  	* engine/start.php: Marcus Povey <marcus@dushka.co.uk> * Preloads export
+  library - todo: do this better! 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * 
+
+  	* mod/exporttest/index.php, mod/exporttest/start.php,
+  mod/exporttest/views/default/exporttest/main.php,
+  .../views/default/exporttest/outputxml.php: Marcus Povey
+  <marcus@dushka.co.uk> * Export test 
+
+  	* engine/lib/entities.php, engine/lib/export.php: Marcus Povey
+  <marcus@dushka.co.uk> * Export functionality for ElggEntity and children 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Whitespace 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Using export()
+  instead of toStdClass() 
+
+2008-03-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Corresponding fix for register_plugin_hook 
+
+  	* engine/lib/elgglib.php: Fix for trigger_plugin_hook 
+
+  	* engine/lib/configuration.php: Autoconfiguration update .. again 
+
+  	* engine/lib/elgglib.php: Some extra params for elgg_view_entity 
+
+  	* engine/lib/elgglib.php: Added elgg_view_entity(ElggEntity $entity) to
+  intelligently display entities 
+
+2008-03-28  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Moved XML
+  serialisation functions to export.php 
+
+2008-03-28  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added custom return values to trigger_plugin_hook 
+
+  	* engine/lib/elgglib.php: Some extra documentation 
+
+  	* engine/lib/elgglib.php: Plugin hooks 
+
+2008-03-27  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/export.php: Marcus Povey <marcus@dushka.co.uk> * Sketch
+  import/export functions added, pending event handling functions 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Array
+  support added 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Add / update
+  meta from array 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Multiple
+  meta tag support (requires db schema change) 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Removed sql
+  restriction to allow multiple tag entries 
+
+2008-03-26  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/apitest/index.php, mod/apitest/start.php,
+  mod/apitest/views/default/apitest/configform.php,
+  mod/apitest/views/default/apitest/main.php: Marcus Povey
+  <marcus@dushka.co.uk> * Basic API testrig 
+
+2008-03-25  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Subtype subclass instantiation 
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * IO Exception if
+  cache directory doesn't exist 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Removed debug. 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Array support
+  added to api 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Call method now
+  specified in api 
+
+2008-03-22  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Whitespace
+  removed 
+
+2008-03-21  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Tweak for
+  unrecognised output format handling 
+
+2008-03-20  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/tasklist/index.php: Marcus Povey <marcus@dushka.co.uk> * tags 
+
+  	* engine/lib/annotations.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Annotations now using metastrings table for name_ids
+  * Stupid amounts of whitespace removed 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php, engine/schema/mysql.sql:
+  Marcus Povey <marcus@dushka.co.uk> * Metadata now using metastrings *
+  Entities will now throw an exception when creation is attempted with no owner
+
+  	* mod/tasklist/index.php, mod/tasklist/views/default/tasklist/newtask.php:
+  Marcus Povey <marcus@dushka.co.uk> * Tags 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * a/cvs/csv ...
+  oops 
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * Age checking on
+  cache. 
+
+2008-03-19  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Exports working
+  system.api.list 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Removed warning
+  when calling undeclaired functions 
+
+  	* endpoints/rest.php: Marcus Povey <marcus@dushka.co.uk> * Added some
+  default values - these should be removed! 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Using simple
+  cache for replay protection... still need to clear cache of old files etc. 
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * Cache no longer
+  using matrix directory due to issues with mkdir. 
+
+  	* endpoints/rest.php: Marcus Povey <marcus@dushka.co.uk> * Added expose and
+  call functions. 
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Added expose and
+  call functions. 
+
+  	* endpoints/rest.php, engine/lib/api.php, index.php: Marcus Povey
+  <marcus@dushka.co.uk> * API now uses PAM 
+
+2008-03-18  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php, engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk>
+  * API now supporting pluggable output format 
+
+  	* mod/tasklist/index.php, mod/tasklist/start.php,
+  mod/tasklist/views/default/tasklist/item.php,
+  mod/tasklist/views/default/tasklist/main.php,
+  mod/tasklist/views/default/tasklist/newtask.php: Marcus Povey
+  <marcus@dushka.co.uk> * Added VERY simple tasklist plugin. 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Final tweaks
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Moved order
+  and limit the right way 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Get Metadata
+  now actually works 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Modified to better deal with metastrings table 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Value to
+  value_id 
+
+2008-03-17  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Marcus Povey <marcus@dushka.co.uk> * getOwner now
+  consistent with class hierachy 
+
+  	* engine/lib/objects.php, engine/lib/users.php: Marcus Povey
+  <marcus@dushka.co.uk> * getOwner now consistent with class hierachy 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Fixed sql
+  error on clear annotaitons 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * limit/offset
+  the wrong way round 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * guid not
+  needed in subtype since this is just a label. 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  Added config 
+
+  	* engine/lib/sessions.php, engine/lib/users.php: Marcus Povey
+  <marcus@dushka.co.uk> * Some minor tweaks 
+
+  	* engine/lib/configuration.php: Marcus Povey <marcus@dushka.co.uk> *
+  Reverted regression caused by previous revision 
+
+2008-03-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sessions.php, engine/lib/users.php: Session functionality,
+  hello again! 
+
+2008-03-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/languages.php: Marcus Povey
+  <marcus@dushka.co.uk> * Removed error outputs * Fixed languages 
+
+  	* engine/lib/access.php: Marcus Povey <marcus@dushka.co.uk> * Made site test
+  conditional to remove debug message 
+
+2008-03-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: A quick syntax fix for objects 
+
+2008-03-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/entities.php: Marcus Povey
+  <marcus@dushka.co.uk> * Get and set annotations seem to be working 
+
+  	* engine/lib/annotations.php, engine/lib/entities.php: Marcus Povey
+  <marcus@dushka.co.uk> * Get annotations 
+
+2008-03-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php, engine/lib/usersnew.php: Whoops, that should be
+  users.php 
+
+  	* engine/lib/usersnew.php: Removed a needless comment 
+
+  	* engine/lib/usersnew.php: New users module 
+
+  	* engine/lib/entities.php, engine/lib/objects.php, engine/lib/users.php:
+  Adding a couple of extra functions, deleting the old users module 
+
+2008-03-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/entities.php: Marcus Povey
+  <marcus@dushka.co.uk> * Annotations added 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  average calcs 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Removed debug 
+
+  	* engine/lib/entities.php, engine/lib/metadata.php, index.php: Marcus Povey
+  <marcus@dushka.co.uk> * Metadata code 
+
+2008-03-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Added new objects class 
+
+  	* engine/lib/entities.php, engine/lib/objects.php: Removing old objects
+  class 
+
+2008-03-14  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metastrings.php: Marcus Povey <marcus@dushka.co.uk> *
+  Metastrings modified for new schema 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Belts and
+  braces 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Belts and
+  braces 
+
+2008-03-13  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Use
+  $CONFIG->debug = true to enable query profiling 
+
+  	* engine/lib/entities.php, engine/lib/sites.php: Marcus Povey
+  <marcus@dushka.co.uk> * Finally got sites to load :) 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Undone 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Owner ID
+  detected if not specified. 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Now saves 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Access
+  control fields ok 
+
+  	* engine/lib/access.php: Marcus Povey <marcus@dushka.co.uk> * Access using
+  new schema 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Added access
+  groups 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Fixed insert
+  SQL 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Types
+  initialised for first time creation 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Bugfix:
+  getMetaData 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Bugfix:
+  setMetaData 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Made URL
+  unique 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Commented out
+  sites_init - this needs to be rewritten! 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Added ElggSite 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  relationship code 
+
+  	* engine/lib/entities.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Removed site_guid references, since this should be
+  handled by relationships 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Ooops...
+  forgot access controls 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Changed a
+  couple of table names 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  delete_entity 
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Initial
+  framework of ElggEntity code 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * A little bit
+  of extra info. 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Made subtype
+  a unique key 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * New database
+  schema. THIS IS A FLAG DAY! 
+
+2008-03-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Added the ability to set an alternative template
+  handler 
+
+2008-03-12  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Multiple
+  searches. 
+
+  	* engine/lib/annotations.php: 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, engine/lib/sites.php, index.php: Marcus Povey
+  <marcus@dushka.co.uk> * Subtyping on annotations and metadata 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * BUGFIX:
+  get_data now catches mysql_errors 
+
+2008-03-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/actions.php, mod/test/start.php: Actions fix 
+
+  	* engine/lib/actions.php, engine/lib/objects.php, languages/en.php,
+  mod/test/index.php, mod/test/start.php,
+  mod/test/views/default/testplugin/pageshell.php: Language updates 
+
+2008-03-12  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/entities.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  get_entity_subtypes function 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * object_*
+  changed to entity_* in metadata and annotations 
+
+2008-03-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Fixing incorrect primary key 
+
+  	* engine/schema/mysql.sql, mod/test/index.php: Fixing incorrect primary key 
+
+  	* engine/lib/access.php, engine/lib/objects.php, mod/test/index.php: Updates
+  to both objects (in order to be able to resave type properly) and access (to
+  add useful constants) 
+
+2008-03-12  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * object_*
+  changed to entity_* in metadata and annotations 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * object_* changed to entity_* 
+
+2008-03-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/test/views/default/css.php,
+  mod/test/views/default/pageshells/pageshell.php: tweak to ben's elgg 0.2
+  theme plugin 
+
+2008-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* mod/test/graphics/elgg.powered.png, mod/test/graphics/leaf.jpg,
+  mod/test/graphics/logo.png, mod/test/graphics/orange_small.png,
+  mod/test/graphics/purplecrayon.gif, mod/test/views/default/css.php,
+  mod/test/views/default/menu.php,
+  mod/test/views/default/pageshells/pageshell.php,
+  views/default/navigation/toolbox.php: Adding a friendly old template to the
+  test plugin 
+
+2008-03-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * File cache
+  outline 
+
+2008-03-11  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/css.php: css tweak 
+
+  	* index.php, mod/dashboard/views/default/dashboard/welcome.php: index page
+  changes so it now logs you into the dashboard 
+
+  	* mod/dashboard/index.php, mod/dashboard/start.php,
+  mod/dashboard/views/default/dashboard/welcome.php, views/default/css.php,
+  views/default/navigation/topmenu.php: css, dashboard and topmenu tweaks 
+
+2008-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php, mod/test/index.php: Fixes
+  for previous 
+
+  	* engine/lib/elgglib.php, engine/lib/plugins.php, mod/test/index.php,
+  mod/test/start.php: God bless 'em! Plugins now autoregister their own views. 
+
+2008-03-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Removed subtypes until problems with tag system are
+  sorted out. 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Added orderby and limits 
+
+2008-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Page_draw echoes 
+
+2008-03-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/cache.php: Marcus Povey <marcus@dushka.co.uk> * ElggCache
+  superclass 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Value type
+  added 
+
+2008-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: user_info() ftw 
+
+2008-03-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk> * Added api to list
+  apis 
+
+2008-03-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/pageowner.php, engine/lib/users.php: Et voila: page ownership! 
+
+  	* engine/lib/elgglib.php, views/default/pageshell.php,
+  views/default/pageshells/pageshell.php: The pageshell now correctly passes
+  elements to the header, footer etc. 
+
+  	* mod/test/index.php: Minor test plugin fix 
+
+  	* engine/lib/elgglib.php, views/default/navigation/toolbox.php: Menu items
+  fix 
+
+  	* mod/test/start.php: Initial test plugin menu items 
+
+  	* views/default/navigation/toolbox.php: Toolbox navigation edit 
+
+  	* engine/lib/elgglib.php: Registers and menu items 
+
+2008-03-11  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php, engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk>
+  * Site id specified 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Removed log 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/metastrings.php, engine/schema/mysql.sql: Marcus Povey
+  <marcus@dushka.co.uk> * Added metadata/metastrings tag stuff. Lorks. 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Fixed db
+  problems 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Removed
+  count based on this conversation:  [10:05:38] … basically, if you add an
+  item, you need to create a tag entry in the metastrings table (as discussed
+  yesterday) [10:05:56] … if you then delete the item, that leaves a tag
+  [10:06:07] … if you want to delete the tag when nothing references it
+  [10:06:11] … it needs a counter [10:06:29] … which means for every add
+  and delete query you need to check for and sometimes update this counter
+  [10:06:36] … making three queries for every one [10:06:47] … but if you
+  don't do that the meta strings table grows over time [10:06:54] … making it
+  space inefficient [10:07:03] … so, which do you do? [10:10:31] … ?
+  [10:10:43] … i'd be tempted to not delete [10:10:58] … because the
+  multiple queries will be a pain for everyone all the time [10:11:05] … and
+  storage costs are cheap [10:11:32] Ben Werdmuller: I would be very tempted to
+  do the same [10:11:35] … so let's do that :) [10:11:36] Marcus Povey: maybe
+  we could write an admin script to clean up or something [10:11:45] Ben
+  Werdmuller: exactly, we could clean up on a cron if people really want
+  [10:11:59] … but for now, let's just go with the growing tag cloud 
+
+2008-03-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/logout.php, engine/lib/languages.php,
+  languages/en.php, views/default/login.php,
+  views/default/navigation/topmenu.php, views/default/page_elements/footer.php,
+  views/default/welcome.php: More language integration 
+
+  	* actions/login.php, actions/logout.php, engine/lib/languages.php,
+  languages/en.php: Languages! There's a little more to do, but ... 
+
+2008-03-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Added count 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Changed
+  metadata database to use metastrings as described (all values in metadata are
+  now storing data only once) 
+
+  	* endpoints/rest.php, engine/lib/api.php: Marcus Povey <marcus@dushka.co.uk>
+  * First draft api 
+
+2008-03-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Updated ref to get_objects 
+
+  	* engine/lib/sites.php: Fixing access permissions error on site update 
+
+  	* engine/lib/objects.php: Updated objects with metadata and annotations 
+
+2008-03-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php, engine/lib/api.php, engine/lib/users.php,
+  engine/schema/mysql.sql, index.php: Marcus Povey <marcus@dushka.co.uk> *
+  Tokens and execute code added to api 
+
+2008-03-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/navigation/toolbox.php,
+  views/default/navigation/topmenu.php, views/default/page_elements/header.php:
+  top level navigation added 
+
+  	* views/default/text/about.php, views/default/text/privacy_view.php,
+  views/default/text/tos_view.php: changes to the text pages 
+
+  	* engine/lib/elgglib.php, views/default/basic_elements/login.php,
+  views/default/basic_elements/welcome.php, views/default/css.php,
+  views/default/input/checkboxes.php, views/default/input/file.php,
+  views/default/input/gender.php, views/default/input/longtext.php,
+  views/default/input/password.php, views/default/input/pulldown.php,
+  views/default/input/radio.php, views/default/input/tags.php,
+  views/default/input/text.php, views/default/input/url.php,
+  views/default/navigation/toolbox.php, views/default/navigation/topmenu.php,
+  views/default/output/date.php, views/default/output/file.php,
+  views/default/output/gender.php, views/default/output/longtext.php,
+  views/default/output/pulldown.php, views/default/output/tagcloud.php,
+  views/default/output/tags.php, views/default/output/text.php,
+  views/default/output/timestamp.php, views/default/output/url.php,
+  views/default/page_elements/footer.php,
+  views/default/page_elements/header.php,
+  views/default/pageshells/pageshell.php,
+  views/default/pageshells/pageshell_loggedout.php,
+  views/default/pageshells/pageshell_sidebar.php, views/default/text/about.php,
+  views/default/text/privacy_view.php, views/default/text/tos_view.php: some
+  new views 
+
+2008-03-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, engine/lib/users.php: Adding metadata and annotations
+  for users. 
+
+2008-03-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Erp 
+
+2008-03-10  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* views/default/welcome.php: logout bug fix 
+
+2008-03-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: 
+
+  	* engine/lib/annotations.php, engine/lib/sites.php: Marcus Povey
+  <marcus@dushka.co.uk> * Simple maths functions added 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Site objects 
+
+2008-03-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, actions/logout.php, engine/lib/actions.php,
+  engine/lib/elgglib.php, engine/lib/users.php,
+  views/default/messages/list.php, views/default/messages/messages/list.php,
+  views/default/pageshell.php: Messages and actions: fixed! 
+
+2008-03-10  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Remove site
+  metadata 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Get user sites 
+
+2008-03-10  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* actions/login.php, views/default/login.php: Fixing the login form 
+
+2008-03-09  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* index.php: Marcus Povey <marcus@dushka.co.uk> * Commented out my testing 
+
+  	* engine/lib/annotations.php: 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Fixed copy
+  constructor 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Will now
+  return objects via metadata 
+
+  	* engine/schema/mysql.sql: 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Corrected
+  database fault 
+
+2008-03-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/settings.example.php: add url field to settings 
+
+  	* views/default/css.php: css tweak 
+
+  	* actions/login.php, actions/logout.php, engine/lib/users.php, index.php,
+  views/default/css.php, views/default/login.php, views/default/pageshell.php,
+  views/default/welcome.php: crude login and logout functionality 
+
+2008-03-08  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  get_objects_from_metadatas (untested) 
+
+2008-03-08  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php, mod/test/index.php: Configuration fix 
+
+2008-03-08  dave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/vendors/jquery/jquery.js: jquery added to core 
+
+2008-03-07  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Add name and
+  value to get_metadatas 
+
+2008-03-07  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/users.php: Log in and logout 
+
+  	* mod/test/start.php, mod/test/views/default/testplugin/pageshell.php: Test
+  plugin 
+
+  	* engine/lib/elgglib.php: Event API fix 
+
+  	* engine/lib/plugins.php, engine/start.php: Some extra plugins stuff 
+
+  	* engine/lib/users.php: Grabbing the ElggUser and sticking it in the session
+  as appropriate 
+
+  	* engine/lib/friends.php, engine/lib/users.php, engine/schema/mysql.sql,
+  index.php: Users and friends 
+
+  	* engine/lib/sites.php: Fix for ElggSites 
+
+2008-03-07  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* endpoints/rest.php, engine/lib/api.php, engine/schema/mysql.sql: Marcus
+  Povey <marcus@dushka.co.uk> * Initial work on API 
+
+2008-03-06  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/sites.php: Marcus Povey
+  <marcus@dushka.co.uk> * Added delete annotations, fixed error on annotation
+  search (missing params) 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Delete site
+  implemented 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Count added 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Casting done 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Updated 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Added
+  count to annotations 
+
+  	* engine/lib/objects.php: Marcus Povey <marcus@dushka.co.uk> * Casting takes
+  advantage of constructor 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php, engine/lib/sites.php,
+  index.php: Marcus Povey <marcus@dushka.co.uk> * Initial annotations and
+  metadata get/sets functional, combined with site test 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Can
+  retrieve annotations 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Metadata
+  creates and updates 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Meta now
+  updates if item already exists (if the user has permission) 
+
+2008-03-06  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Objects are now cast to ElggObjects on get 
+
+2008-03-06  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Marcus Povey
+  <marcus@dushka.co.uk> * Cleared up typo 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * User ID
+  detected if not provided 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Very
+  crude type detection for annotation tags, defaults to 'tag' 
+
+  	* engine/lib/sites.php: Marcus Povey <marcus@dushka.co.uk> * Implemented
+  update site 
+
+  	* engine/lib/annotations.php: Marcus Povey <marcus@dushka.co.uk> * Ability
+  to change owner 
+
+  	* engine/lib/metadata.php: Marcus Povey <marcus@dushka.co.uk> * Ability to
+  change owner 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php,
+  engine/lib/objects.php: Marcus Povey <marcus@dushka.co.uk> * Fixed get/sets 
+
+  	* engine/lib/objects.php: Fixed ElggObject attributes. 
+
+  	* engine/schema/mysql.sql: 
+
+  	* engine/schema/mysql.sql: Marcus Povey <marcus@dushka.co.uk> * Removed
+  write access id on sites since it seemed superfluous 
+
+2008-03-05  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php, engine/lib/sites.php,
+  index.php: End of day 
+
+  	* engine/lib/database.php: Marcus Povey <marcus@dushka.co.uk> * Sanitise
+  trims as well 
+
+  	* engine/lib/exceptions.php: Marcus Povey <marcus@dushka.co.uk> * A couple
+  more exceptions 
+
+  	* engine/lib/elgglib.php: Marcus Povey <marcus@dushka.co.uk> * Exceptions
+  that are handled by the default elgg error handler are now echoed to the
+  error log. 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Minor tweaks 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Switching to desktop 
+
+  	* engine/lib/annotations.php, engine/lib/metadata.php: Types forced on
+  $object->value 
+
+  	* engine/lib/metadata.php: Added metadata object and methods 
+
+  	* engine/schema/mysql.sql: Added owner id to metadata 
+
+  	* engine/lib/annotations.php, engine/lib/sites.php: Changed
+  mysql_real_escape_string to sanitise_string 
+
+  	* engine/lib/annotations.php: Get annotations 
+
+2008-03-04  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/metadata.php: Commit so i can switch to the laptop...  
+
+  	* engine/lib/annotations.php: initial annotations library added (untested) 
+
+  	* engine/schema/mysql.sql: Added metadata and annotations, removed
+  superfluous tables. 
+
+  	* engine/lib/sites.php: 
+
+  	* engine/lib/sites.php: Get site prototype 
+
+  	* engine/lib/sites.php: Save 
+
+  	* engine/lib/sites.php: Added a basic ElggSite outline 
+
+2008-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Further additions to the ElggObject, according to
+  spec 
+
+2008-03-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/schema/mysql.sql: new site db 
+
+  	* engine/lib/database.php: Fixed get_tables so install works correctly 
+
+  	* engine/lib/configuration.php: Fixed wwwroot 
+
+2008-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Extending stdClass is silly 
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php: Removed some notices
+
+  	* engine/lib/database.php: Fixed install issue 
+
+2008-03-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: removed echo 
+
+2008-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/configuration.php, engine/lib/database.php,
+  engine/schema/mysql.sql, engine/settings.example.php, engine/start.php:
+  Installation issues: fixed 
+
+2008-03-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed short circuit comparison 
+
+2008-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Some further fixes 
+
+  	* engine/lib/elgglib.php: Views directory fix 
+
+2008-03-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Fixed file exist error 
+
+  	* engine/lib/elgglib.php: Removed test to see if .htaccess exists, this test
+  doesn't work on my machine. Reason unknown. 
+
+  	* engine/lib/database.php: Candidate for deletion  
+
+2008-03-03  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Added callbacks to get_data 
+
+  	* engine/lib/objects.php, index.php: Some misc changes 
+
+2008-03-03  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Database errors now distinct from "no data",
+  errors are hard fails 
+
+2008-02-17  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/objects.php: Further metadata and ElggObject updates. 
+
+  	* engine/lib/objects.php: Added most of an ElggObject class 
+
+  	* engine/lib/objects.php: Full object and object metadata CRUD functionality
+
+2008-02-15  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/access.php, engine/lib/database.php, engine/lib/objects.php,
+  engine/lib/sites.php, engine/lib/users.php, engine/schema/mysql.sql,
+  index.php: All kinds of object and database stuff 
+
+  	* engine/schema/mysql.sql, engine/start.php, install.php: Added the concept
+  of a site_id to msot of the database tables. Also some extra installation
+  stuff. 
+
+  	* views/default/css.php: Added a CSS file 
+
+  	* engine/lib/actions.php, engine/lib/database.php, engine/lib/elgglib.php,
+  engine/lib/plugins.php, engine/schema/mysql.sql, engine/settings.example.php:
+  Adding more plugin-related fun 
+
+  	* engine/lib/configuration.php, views/default/pageshell.php: Various
+  configuration things 
+
+  	* engine/lib/configuration.php, engine/lib/elgglib.php,
+  engine/lib/plugins.php, engine/start.php: Simple plugin mechanism 
+
+  	* engine/lib/elgglib.php: Correction to previous 
+
+  	* engine/lib/elgglib.php: Plugins can now extend views. 
+
+  	* css/css.php: Importing the dynamic CSS file 
+
+2008-02-14  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/install.php, install.php, views/default/pageshell.php: Some
+  further installation tweaks 
+
+  	* engine/lib/database.php, engine/lib/elgglib.php, install.php: A simple
+  beginning to an install script 
+
+  	* action.php, htaccess_dist, index.php, views/default/pageshell.php: Changes
+  to site structure 
+
+  	* engine/lib/actions.php, engine/lib/elgglib.php, engine/schema/mysql.sql,
+  engine/settings.example.php, index.php,
+  views/default/messages/sanitisation/htaccess.php: Actions, .htaccess, and the
+  database schema 
+
+2008-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/database.php: Added more context to the database function notes
+
+  	* engine/lib/database.php, engine/start.php: Added some fancy database
+  connection gubbins. If you give it loads of read or write dbs to pick from,
+  Elgg will choose one at random for each category! 
+
+  	* engine/lib/elgglib.php, engine/start.php, views/default/pageshell.php:
+  Messages and exceptions, working merrily together. Aww. 
+
+  	* views/default/messages/messages/list.php,
+  views/default/messages/messages/message.php: Standard messages are now
+  displayed. 
+
+  	* engine/lib/elgglib.php, engine/start.php,
+  views/default/messages/errors/exception.php,
+  views/default/messages/exceptions/exception.php,
+  views/default/messages/list.php, views/default/pageshell.php: Further message
+  handling in the template 
+
+  	* engine/lib/elgglib.php, engine/lib/input.php, engine/start.php,
+  views/default/messages/errors/exception.php: Exception handling 
+
+2008-02-13  icewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php: Moving on to explodenew 
+
+  	* engine/lib/exceptions.php: Updates  
+
+  	* engine/lib/input.php: Added input method 
+
+  	* engine/start.php: Start now reporting errors using exceptions... 
+
+  	* engine/lib/exceptions.php: Added installation exception  
+
+  	* engine/start.php: Loads now 
+
+  	* engine/lib/elgglib.php: Ooops... 
+
+  	* engine/start.php: Loading exceptions 
+
+  	* engine/lib/elgglib.php: Added error handler stuff. 
+
+  	* engine/lib/exceptions.php: Added exceptions 
+
+  	* engine/start.php: Added CVS exclude to start.php 
+
+2008-02-13  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/start.php, views/default/messages/sanitisation/settings.php: A
+  slightly better no-settings error. It's probably a good idea to eventually
+  allow people to edit settings.php directly if they have the access defined. 
+
+  	* engine/start.php: Let's be a little more friendly. 
+
+  	* engine/start.php, views/default/messages/errors/error.php,
+  views/default/messages/errors/list.php, views/default/pageshell.php: Some
+  error reporting and initial (very, very basic) templating 
+
+  	* engine/lib/elgglib.php: A little reoirganisation in elgglib 
+
+2008-02-12  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/lib/elgglib.php: Adding priority and a little more description to
+  the events API. 
+
+  	* engine/lib/elgglib.php, engine/start.php: Adding the events API 
+
+  	* engine/lib/elgglib.php, engine/start.php: Sanitisation 
+
+  	* engine/lib/elgglib.php, engine/start.php,
+  views/default/messages/sanitisation/settings.php: Introducing views and some
+  sanitisation 
+
+  	* engine/lib/elgglib.php, engine/start.php, index.php: The engine starter
+  now functions appropriately 
+
+2008-02-11  ben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>
+
+  	* engine/settings.example.php, engine/start.functions.php, engine/start.php:
+  Some more bootstrapping. 
diff --git a/INSTALL.txt b/INSTALL.txt
new file mode 100644
index 000000000..f4ecbffe1
--- /dev/null
+++ b/INSTALL.txt
@@ -0,0 +1,113 @@
+The latest version of the installation instructions is available at:
+[http://docs.elgg.org/wiki/Installation]
+
+Installation Troubleshooting is available at:
+[http://docs.elgg.org/wiki/Troubleshooting]
+
+
+ELGG INSTALLATION INSTRUCTIONS
+
+TECHNICAL REQUIREMENTS
+
+Elgg runs on a combination of the Apache web server, MySQL database 
+system and the PHP interpreted scripting language. This is the most 
+popular web server environment in the world. (Elgg can also run on
+other web servers such a nginx and IIS, but requires further configuration).
+
+Due to Elgg's advanced functionality, there are some extra 
+configuration requirements:
+
+    * The Apache web server needs to be installed with the following
+      modules:
+          o mod_rewrite
+          o PHP 
+    * MySQL 5+.
+    * PHP 5.2+ needs to be installed as an Apache module
+      with the following libraries:
+          o GD (for graphics processing such as avatar cropping)
+          o Multibyte String support (for internationalization)
+
+It is recommended that you increase the memory available to PHP 
+threads beyond the standard 8 or 12M, and increase the maximum 
+uploaded filesize (which defaults to 2M). In both cases, this can be
+found in your php.ini.
+
+
+INSTALLING ELGG
+
+Before you begin, make sure you have read Elgg's technical 
+requirements. If you discover problems after following these 
+instructions, check out the troubleshooting page at 
+[http://docs.elgg.org/wiki/Troubleshooting].
+
+
+1. Upload Elgg
+
+Unzip Elgg and upload it to your site's document root.
+
+
+2. Create a data folder
+
+Elgg needs a special folder to store uploaded files, including 
+profile icons and photos. You will need to create this for it.
+
+We recommend that this folder is called data, and is stored outside 
+of your document root. For example, if Elgg is installed in 
+/home/elgg/html/, you might create it in /home/elgg/data.
+
+Once this folder has been created, you'll need to make sure that your
+web server has permission to write to it. This shouldn't be a problem 
+on Windows-based servers, but if your server runs Linux or a UNIX variant, 
+you'll need to figure out what user Apache runs under. For Debian-based 
+distros, it is usually www-data and for RedHat, it is often apache. If you
+cannot figure out what the ownership and permissions should be, you can
+set the permissions for world access (though not recommended):
+
+chmod 777 /home/elgg/data/
+
+If you use a graphical client to upload files, you can usually set 
+this by right or shift-clicking on the folder and selecting 
+'properties'.
+
+
+3. Create a database
+
+Using your database administration tool of choice (if you're unsure 
+about this, ask your system administrator), create a new database for 
+Elgg. Make sure you know the username and password necessary to 
+access this.
+
+
+4. Visit your Elgg site
+
+Once you've performed these steps, visit your Elgg site in your web 
+browser. Elgg will take you through the rest of the installation 
+process from there.
+
+
+A note on settings.php and .htaccess
+
+The Elgg installer will try and create two files for you:
+
+    * engine/settings.php, which contains the database settings for 
+      your installation
+    * .htaccess, which allows Elgg to generate dynamic URLs 
+
+If your web server does not have permission to create these files, you
+will need to either 
+
+1. Change the permissions on the directory where you are installing 
+   Elgg and the engine directory and try again. Remember to change the
+   permissions back to the original values after installation is complete.
+
+2. Copy engine/settings.example.php to engine/settings.php, open
+   it up in a text editor and fill in your database details. Then
+   copy /htaccess_dist to /.htaccess 
+
+
+
+The latest version of this document is available at:
+[http://docs.elgg.org/wiki/Installation]
+
+Installation Troubleshooting is available at:
+[http://docs.elgg.org/wiki/Troubleshooting]
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 000000000..f833d881e
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,280 @@
+		    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..a1b3e1cbf
--- /dev/null
+++ b/README.md
@@ -0,0 +1,28 @@
+Lorea
+=====
+
+(Re-)Taking the Networks!
+
+The [lorea](https://lorea.org) code aims at providing individuals and teams with privacy-aware, security-conscious, and user-controlled-data collaborative tools over the Web, and around it.
+
+The main application is based on [Elgg](http://elgg.org), a PHP-based social networking platform. Lorea extends it with plugins to provide better privacy features, including strong encryption, *OStatus-based federation* with other Lorea/Elgg installations and OStatus-compliant projects, etc.
+
+It also integrates other popular technologies such as [DokuWiki](http://www.dokuwiki.org), [Etherpad](http://etherpad.org), [XMPP](http://xmpp.org), etc., and provides *GPG-encrypted mailing-lists* to groups.
+
+### Installation
+
+Our code is divided in two git repositories: elgg and lorea-plugins. You can get it using the following commands.
+
+<pre>
+$ git clone git://gitorious.org/lorea/elgg.git
+$ cd elgg
+$ git remote add lorea-plugins git://gitorious.org/lorea/lorea-plugins.git
+$ git pull lorea-plugins master
+</pre>
+
+You can update the code to the latest release using:
+
+<pre>
+$ git pull origin master
+$ git pull lorea-plugins master
+</pre>
diff --git a/UPGRADE.txt b/UPGRADE.txt
new file mode 100644
index 000000000..e9610fe39
--- /dev/null
+++ b/UPGRADE.txt
@@ -0,0 +1,71 @@
+Elgg Upgrade Instructions
+=========================
+
+Note: Upgrades are one way--You cannot downgrade once you run the upgrade 
+      script. Always back up your database, code, and data directory
+      before upgrading!
+
+
+Upgrading from Elgg 1.7 to 1.8.
+----------------------------------------------------
+
+1. Back up your Elgg database, code, and data directory.
+
+2. Download the latest version of Elgg from http://elgg.org/.
+
+3. Identify and save any changes to core files. Pay special attention to
+   the views and actions directories. You should put these changes in plugins
+   once you have installed Elgg 1.8.
+
+3. Delete the following directories in the Elgg root on your server:
+	* _css
+	* account
+	* actions
+	* admin
+	* dashboard
+	* entities
+	* friends
+	* search
+	* settings
+	* simplecache
+	* views
+
+4. Delete the following core plugins from the Elgg mod directory. Most of these
+   plugins are deprecated and no longer supported by Elgg's core developers.
+   Others have been significantly changed and need to be replaced by new versions.
+   If you modified these plugins, you will need to upgrade the plugin to work
+   in Elgg 1.8.
+	* captcha
+	* crontrigger
+	* default_widgets
+	* friends
+	* riverdashboard
+	* twitter_service
+	* profile
+
+5. Upload and overwrite your existing Elgg files with the Elgg 1.8 files.
+
+6. Copy htaccess_dist to .htaccess, replacing your existing version. Any
+   modifications to the original .htaccess should be moved to the new
+   .htaccess file.
+
+7. Visit http://your-elgg-site/upgrade.php
+
+
+Upgrading to the latest release
+-----------------------------------------
+
+1. Back up your Elgg database, code, and data directory.
+
+2. Download the latest version of Elgg from http://elgg.org/.
+
+3. Upload and overwrite your existing Elgg files. Any modifications should
+   have been written within plugins so that they are not lost. If this is
+   not the case, take care to maintain your modifications. If you have
+   modified core files, Elgg may not work correctly.
+
+4. Copy htaccess_dist to .htaccess, replacing your existing version. Any 
+   modifications to the original .htaccess should be moved to the new
+   .htaccess file.
+
+5. Visit http://your-elgg-site/upgrade.php
diff --git a/_graphics/SPRITES_LICENSE.TXT b/_graphics/SPRITES_LICENSE.TXT
new file mode 100644
index 000000000..61b0daf3a
--- /dev/null
+++ b/_graphics/SPRITES_LICENSE.TXT
@@ -0,0 +1,9 @@
+The Sprites are copyright © GentleFace http://www.gentleface.com/
+
+They are licensed under Creative Commons
+Attribution-NonCommercial-NoDerivs 3.0 Unported (CC BY-NC-ND 3.0) with special
+permission to distribute and use with the Elgg open source framework. For uses
+outside of Elgg, please see the license and/or contact the author at
+design@gentleface.com
+
+http://creativecommons.org/licenses/by-nc-nd/3.0/
+\ No newline at end of file
diff --git a/_graphics/admin_sprites.png b/_graphics/admin_sprites.png
new file mode 100644
index 000000000..82a66f5b2
--- /dev/null
+++ b/_graphics/admin_sprites.png
diff --git a/_graphics/ajax_loader.gif b/_graphics/ajax_loader.gif
new file mode 100644
index 000000000..b55e148bb
--- /dev/null
+++ b/_graphics/ajax_loader.gif
diff --git a/_graphics/ajax_loader_bw.gif b/_graphics/ajax_loader_bw.gif
new file mode 100644
index 000000000..e195e1fd8
--- /dev/null
+++ b/_graphics/ajax_loader_bw.gif
diff --git a/_graphics/button_background.gif b/_graphics/button_background.gif
new file mode 100644
index 000000000..99eac3ecd
--- /dev/null
+++ b/_graphics/button_background.gif
diff --git a/_graphics/button_graduation.png b/_graphics/button_graduation.png
new file mode 100644
index 000000000..4ca37bbdc
--- /dev/null
+++ b/_graphics/button_graduation.png
diff --git a/_graphics/elgg_logo.png b/_graphics/elgg_logo.png
new file mode 100644
index 000000000..7a7e01f06
--- /dev/null
+++ b/_graphics/elgg_logo.png
diff --git a/_graphics/elgg_sprites.png b/_graphics/elgg_sprites.png
new file mode 100644
index 000000000..02b452d94
--- /dev/null
+++ b/_graphics/elgg_sprites.png
diff --git a/_graphics/elgg_toolbar_logo.gif b/_graphics/elgg_toolbar_logo.gif
new file mode 100644
index 000000000..a7c03a918
--- /dev/null
+++ b/_graphics/elgg_toolbar_logo.gif
diff --git a/_graphics/favicon.ico b/_graphics/favicon.ico
new file mode 100644
index 000000000..9e1ecc699
--- /dev/null
+++ b/_graphics/favicon.ico
diff --git a/_graphics/friendspicker.png b/_graphics/friendspicker.png
new file mode 100644
index 000000000..78b540397
--- /dev/null
+++ b/_graphics/friendspicker.png
diff --git a/_graphics/header_shadow.png b/_graphics/header_shadow.png
new file mode 100644
index 000000000..4c07b814a
--- /dev/null
+++ b/_graphics/header_shadow.png
diff --git a/_graphics/icons/default/large.png b/_graphics/icons/default/large.png
new file mode 100644
index 000000000..1c1b208a3
--- /dev/null
+++ b/_graphics/icons/default/large.png
diff --git a/_graphics/icons/default/medium.png b/_graphics/icons/default/medium.png
new file mode 100644
index 000000000..aef97cb08
--- /dev/null
+++ b/_graphics/icons/default/medium.png
diff --git a/_graphics/icons/default/small.png b/_graphics/icons/default/small.png
new file mode 100644
index 000000000..ae33fd096
--- /dev/null
+++ b/_graphics/icons/default/small.png
diff --git a/_graphics/icons/default/tiny.png b/_graphics/icons/default/tiny.png
new file mode 100644
index 000000000..a8ffe5153
--- /dev/null
+++ b/_graphics/icons/default/tiny.png
diff --git a/_graphics/icons/default/topbar.png b/_graphics/icons/default/topbar.png
new file mode 100644
index 000000000..149dfea7f
--- /dev/null
+++ b/_graphics/icons/default/topbar.png
diff --git a/_graphics/icons/user/defaultlarge.gif b/_graphics/icons/user/defaultlarge.gif
new file mode 100644
index 000000000..6ea3bd4cd
--- /dev/null
+++ b/_graphics/icons/user/defaultlarge.gif
diff --git a/_graphics/icons/user/defaultmaster.gif b/_graphics/icons/user/defaultmaster.gif
new file mode 100644
index 000000000..5bfd67a2d
--- /dev/null
+++ b/_graphics/icons/user/defaultmaster.gif
diff --git a/_graphics/icons/user/defaultmedium.gif b/_graphics/icons/user/defaultmedium.gif
new file mode 100644
index 000000000..c6b2e6a6d
--- /dev/null
+++ b/_graphics/icons/user/defaultmedium.gif
diff --git a/_graphics/icons/user/defaultsmall.gif b/_graphics/icons/user/defaultsmall.gif
new file mode 100644
index 000000000..661d72f04
--- /dev/null
+++ b/_graphics/icons/user/defaultsmall.gif
diff --git a/_graphics/icons/user/defaulttiny.gif b/_graphics/icons/user/defaulttiny.gif
new file mode 100644
index 000000000..1775346bc
--- /dev/null
+++ b/_graphics/icons/user/defaulttiny.gif
diff --git a/_graphics/icons/user/defaulttopbar.gif b/_graphics/icons/user/defaulttopbar.gif
new file mode 100644
index 000000000..c3616aeb5
--- /dev/null
+++ b/_graphics/icons/user/defaulttopbar.gif
diff --git a/_graphics/powered_by_elgg_badge_drk_bckgnd.gif b/_graphics/powered_by_elgg_badge_drk_bckgnd.gif
new file mode 100644
index 000000000..5c2ddc4fc
--- /dev/null
+++ b/_graphics/powered_by_elgg_badge_drk_bckgnd.gif
diff --git a/_graphics/powered_by_elgg_badge_light_bckgnd.gif b/_graphics/powered_by_elgg_badge_light_bckgnd.gif
new file mode 100644
index 000000000..6367ef302
--- /dev/null
+++ b/_graphics/powered_by_elgg_badge_light_bckgnd.gif
diff --git a/_graphics/sidebar_background.gif b/_graphics/sidebar_background.gif
new file mode 100644
index 000000000..868012bb1
--- /dev/null
+++ b/_graphics/sidebar_background.gif
diff --git a/_graphics/spacer.gif b/_graphics/spacer.gif
new file mode 100644
index 000000000..5bfd67a2d
--- /dev/null
+++ b/_graphics/spacer.gif
diff --git a/_graphics/toptoolbar_background.gif b/_graphics/toptoolbar_background.gif
new file mode 100644
index 000000000..1b1166e7b
--- /dev/null
+++ b/_graphics/toptoolbar_background.gif
diff --git a/_graphics/two_sidebar_background.gif b/_graphics/two_sidebar_background.gif
new file mode 100644
index 000000000..947f5cf46
--- /dev/null
+++ b/_graphics/two_sidebar_background.gif
diff --git a/_graphics/walled_garden/one_column_bottom.png b/_graphics/walled_garden/one_column_bottom.png
new file mode 100644
index 000000000..bd2296896
--- /dev/null
+++ b/_graphics/walled_garden/one_column_bottom.png
diff --git a/_graphics/walled_garden/one_column_middle.png b/_graphics/walled_garden/one_column_middle.png
new file mode 100644
index 000000000..f53abc123
--- /dev/null
+++ b/_graphics/walled_garden/one_column_middle.png
diff --git a/_graphics/walled_garden/one_column_top.png b/_graphics/walled_garden/one_column_top.png
new file mode 100644
index 000000000..dc8de438a
--- /dev/null
+++ b/_graphics/walled_garden/one_column_top.png
diff --git a/_graphics/walled_garden/two_column_bottom.png b/_graphics/walled_garden/two_column_bottom.png
new file mode 100644
index 000000000..21e076991
--- /dev/null
+++ b/_graphics/walled_garden/two_column_bottom.png
diff --git a/_graphics/walled_garden/two_column_middle.png b/_graphics/walled_garden/two_column_middle.png
new file mode 100644
index 000000000..9a93f19a9
--- /dev/null
+++ b/_graphics/walled_garden/two_column_middle.png
diff --git a/_graphics/walled_garden/two_column_top.png b/_graphics/walled_garden/two_column_top.png
new file mode 100644
index 000000000..cd71a4262
--- /dev/null
+++ b/_graphics/walled_garden/two_column_top.png
diff --git a/actions/admin/delete_admin_notice.php b/actions/admin/delete_admin_notice.php
new file mode 100644
index 000000000..a9c3b8758
--- /dev/null
+++ b/actions/admin/delete_admin_notice.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Removes an admin notice.
+ */
+
+$guid = get_input('guid');
+$notice = get_entity($guid);
+
+if (!(elgg_instanceof($notice, 'object', 'admin_notice') && $notice->delete())) {
+	register_error(elgg_echo("admin:notices:could_not_delete"));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/menu/save.php b/actions/admin/menu/save.php
new file mode 100644
index 000000000..66ce71082
--- /dev/null
+++ b/actions/admin/menu/save.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Save menu items.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// featured menu items
+$featured_names = get_input('featured_menu_names', array());
+$featured_names = array_unique($featured_names);
+if (in_array(' ', $featured_names)) {
+	unset($featured_names[array_search(' ', $featured_names)]);
+}
+elgg_save_config('site_featured_menu_names', $featured_names);
+
+// custom menu items
+$custom_menu_titles = get_input('custom_menu_titles', array());
+$custom_menu_urls = get_input('custom_menu_urls', array());
+$num_menu_items = count($custom_menu_titles);
+$custom_menu_items = array();
+for ($i = 0; $i < $num_menu_items; $i++) {
+	if (trim($custom_menu_urls[$i]) && trim($custom_menu_titles[$i])) {
+		$url = $custom_menu_urls[$i];
+		$title = $custom_menu_titles[$i];
+		$custom_menu_items[$title] = $url;
+	}
+}
+elgg_save_config('site_custom_menu_items', $custom_menu_items);
+
+
+system_message(elgg_echo('admin:menu_items:saved'));
+
+forward(REFERER);
diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
new file mode 100644
index 000000000..5234a4ca5
--- /dev/null
+++ b/actions/admin/plugins/activate.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Activate a plugin or plugins.
+ *
+ * Plugins to be activated are passed via $_REQUEST['plugin_guids'] as GUIDs.
+ * After activating the plugin(s), the views cache and simplecache are invalidated.
+ *
+ * @uses mixed $_GET['plugin_guids'] The GUIDs of the plugin to activate. Can be an array.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Plugins
+ */
+
+$plugin_guids = get_input('plugin_guids');
+
+if (!is_array($plugin_guids)) {
+	$plugin_guids = array($plugin_guids);
+}
+
+$activated_guids = array();
+foreach ($plugin_guids as $guid) {
+	$plugin = get_entity($guid);
+
+	if (!($plugin instanceof ElggPlugin)) {
+		register_error(elgg_echo('admin:plugins:activate:no', array($guid)));
+		continue;
+	}
+
+	if ($plugin->activate()) {
+		$activated_guids[] = $guid;
+	} else {
+		$msg = $plugin->getError();
+		$string = ($msg) ? 'admin:plugins:activate:no_with_msg' : 'admin:plugins:activate:no';
+		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+	}
+}
+
+// don't regenerate the simplecache because the plugin won't be
+// loaded until next run.  Just invalidate and let it regenerate as needed
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+if (count($activated_guids) === 1) {
+	$url = 'admin/plugins';
+	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	if ($query) {
+		$url .= "?$query";
+	}
+	$plugin = get_entity($plugin_guids[0]);
+	$id = $css_id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
+	forward("$url#$id");
+} else {
+	// forward to top of page with a failure so remove any #foo
+	$url = $_SERVER['HTTP_REFERER'];
+	if (strpos($url, '#')) {
+		$url = substr(0, strpos($url, '#'));
+	}
+	forward($url);
+}
+\ No newline at end of file
diff --git a/actions/admin/plugins/activate_all.php b/actions/admin/plugins/activate_all.php
new file mode 100644
index 000000000..4514ccbdf
--- /dev/null
+++ b/actions/admin/plugins/activate_all.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Activates all specified installed and inactive plugins.
+ *
+ * All specified plugins in the mod/ directory are that aren't active are activated and the views
+ * cache and simplecache are invalidated.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Plugins
+ */
+
+$guids = get_input('guids');
+$guids = explode(',', $guids);
+
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if (!$plugin->isActive()) {
+		if ($plugin->activate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			$msg = $plugin->getError();
+			$string = ($msg) ? 'admin:plugins:activate:no_with_msg' : 'admin:plugins:activate:no';
+			register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+		}
+	}
+}
+
+// don't regenerate the simplecache because the plugin won't be
+// loaded until next run.  Just invalidate and let it regnerate as needed
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
new file mode 100644
index 000000000..354f4717d
--- /dev/null
+++ b/actions/admin/plugins/deactivate.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Deactivate a plugin or plugins.
+ *
+ * Plugins to be deactivated are passed via $_REQUEST['plugin_guids'] as GUIDs.
+ * After deactivating the plugin(s), the views cache and simplecache are invalidated.
+ *
+ * @uses mixed $_GET['plugin_guids'] The GUIDs of the plugin to deactivate. Can be an array.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Plugins
+ */
+
+$plugin_guids = get_input('plugin_guids');
+
+if (!is_array($plugin_guids)) {
+	$plugin_guids = array($plugin_guids);
+}
+
+foreach ($plugin_guids as $guid) {
+	$plugin = get_entity($guid);
+
+	if (!($plugin instanceof ElggPlugin)) {
+		register_error(elgg_echo('admin:plugins:deactivate:no', array($guid)));
+		continue;
+	}
+
+	if ($plugin->deactivate()) {
+		//system_message(elgg_echo('admin:plugins:deactivate:yes', array($plugin->getManifest()->getName())));
+	} else {
+		$msg = $plugin->getError();
+		$string = ($msg) ? 'admin:plugins:deactivate:no_with_msg' : 'admin:plugins:deactivate:no';
+		register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+	}
+}
+
+// don't regenerate the simplecache because the plugin won't be
+// loaded until next run.  Just invalidate and let it regnerate as needed
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+if (count($plugin_guids) == 1) {
+	$url = 'admin/plugins';
+	$query = (string)parse_url($_SERVER['HTTP_REFERER'], PHP_URL_QUERY);
+	if ($query) {
+		$url .= "?$query";
+	}
+	$plugin = get_entity($plugin_guids[0]);
+	$id = preg_replace('/[^a-z0-9-]/i', '-', $plugin->getID());
+	forward("$url#$id");
+} else {
+	forward(REFERER);
+}
diff --git a/actions/admin/plugins/deactivate_all.php b/actions/admin/plugins/deactivate_all.php
new file mode 100644
index 000000000..8b347a633
--- /dev/null
+++ b/actions/admin/plugins/deactivate_all.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Disable all specified installed plugins.
+ *
+ * Specified plugins in the mod/ directory are disabled and the views cache and simplecache
+ * are reset.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Plugins
+ */
+
+$guids = get_input('guids');
+$guids = explode(',', $guids);
+
+foreach ($guids as $guid) {
+	$plugin = get_entity($guid);
+	if ($plugin->isActive()) {
+		if ($plugin->deactivate()) {
+			//system_message(elgg_echo('admin:plugins:activate:yes', array($plugin->getManifest()->getName())));
+		} else {
+			$msg = $plugin->getError();
+			$string = ($msg) ? 'admin:plugins:deactivate:no_with_msg' : 'admin:plugins:deactivate:no';
+			register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+		}
+	}
+}
+
+// don't regenerate the simplecache because the plugin won't be
+// loaded until next run.  Just invalidate and let it regnerate as needed
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+forward(REFERER);
diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php
new file mode 100644
index 000000000..edd735371
--- /dev/null
+++ b/actions/admin/plugins/set_priority.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Changes the load priority of a plugin.
+ *
+ * Plugin priority affects view, action, and page handler
+ * overriding as well as the order of view extensions.  Plugins with higher
+ * priority are loaded after and override plugins with lower priorities.
+ *
+ * NOTE: When viewing the plugin admin page, plugins LOWER on the page
+ * have HIGHER priority and will override views, etc from plugins above them.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Plugins
+ */
+
+$plugin_guid = get_input('plugin_guid');
+$priority = get_input('priority');
+
+$plugin = get_entity($plugin_guid);
+
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('admin:plugins:set_priority:no', array($plugin_guid)));
+	forward(REFERER);
+}
+
+if ($plugin->setPriority($priority)) {
+	//system_message(elgg_echo('admin:plugins:set_priority:yes', array($plugin->getManifest()->getName())));
+} else {
+	$msg = $plugin->getError();
+	$string = ($msg) ? 'admin:plugins:set_priority:no_with_msg' : 'admin:plugins:set_priority:no';
+	register_error(elgg_echo($string, array($plugin->getFriendlyName(), $plugin->getError())));
+}
+
+// don't regenerate the simplecache because the plugin won't be
+// loaded until next run.  Just invalidate and let it regnerate as needed
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/site/flush_cache.php b/actions/admin/site/flush_cache.php
new file mode 100644
index 000000000..ebb8296c7
--- /dev/null
+++ b/actions/admin/site/flush_cache.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Flush all the caches
+ */
+
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+system_message(elgg_echo('admin:cache:flushed'));
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/site/regenerate_secret.php b/actions/admin/site/regenerate_secret.php
new file mode 100644
index 000000000..3112fb5f3
--- /dev/null
+++ b/actions/admin/site/regenerate_secret.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Generate a new site secret
+ */
+
+init_site_secret();
+elgg_reset_system_cache();
+
+system_message(elgg_echo('admin:site:secret_regenerated'));
+
+forward(REFERER);
diff --git a/actions/admin/site/unlock_upgrade.php b/actions/admin/site/unlock_upgrade.php
new file mode 100644
index 000000000..b625b1d26
--- /dev/null
+++ b/actions/admin/site/unlock_upgrade.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Unlocks the upgrade script 
+ */
+
+if (_elgg_upgrade_is_locked()) {
+	_elgg_upgrade_unlock();
+}
+system_message(elgg_echo('upgrade:unlock:success'));
+forward(REFERER);
diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php
new file mode 100644
index 000000000..4888b0a8d
--- /dev/null
+++ b/actions/admin/site/update_advanced.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Updates the advanced settings for the primary site object.
+ *
+ * Options are saved among metadata on the site object, entries
+ * in the datalist table, and entries in the config table.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Site
+ */
+
+if ($site = elgg_get_site_entity()) {
+	if (!($site instanceof ElggSite)) {
+		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
+	}
+
+	$site->url = rtrim(get_input('wwwroot', '', false), '/') . '/';
+
+	datalist_set('path', sanitise_filepath(get_input('path', '', false)));
+	$dataroot = sanitise_filepath(get_input('dataroot', '', false));
+
+	// check for relative paths
+	if (stripos(PHP_OS, 'win') === 0) {
+		if (strpos($dataroot, ':') !== 1) {
+			$msg = elgg_echo('admin:configuration:dataroot:relative_path', array($dataroot));
+			register_error($msg);
+			forward(REFERER);
+		}
+	} else {
+		if (strpos($dataroot, '/') !== 0) {
+			$msg = elgg_echo('admin:configuration:dataroot:relative_path', array($dataroot));
+			register_error($msg);
+			forward(REFERER);
+		}
+	}
+
+	datalist_set('dataroot', $dataroot);
+
+	if (get_input('simplecache_enabled')) {
+		elgg_enable_simplecache();
+	} else {
+		elgg_disable_simplecache();
+	}
+
+	if (get_input('system_cache_enabled')) {
+		elgg_enable_system_cache();
+	} else {
+		elgg_disable_system_cache();
+	}
+
+	set_config('default_access', get_input('default_access', ACCESS_PRIVATE), $site->getGUID());
+
+	$user_default_access = (get_input('allow_user_default_access')) ? 1 : 0;
+	set_config('allow_user_default_access', $user_default_access, $site->getGUID());
+
+	$debug = get_input('debug');
+	if ($debug) {
+		set_config('debug', $debug, $site->getGUID());
+	} else {
+		unset_config('debug', $site->getGUID());
+	}
+
+	// allow new user registration?
+	if (get_input('allow_registration', FALSE)) {
+		set_config('allow_registration', TRUE, $site->getGUID());
+	} else {
+		set_config('allow_registration', FALSE, $site->getGUID());
+	}
+
+	// setup walled garden
+	if (get_input('walled_garden', FALSE)) {
+		set_config('walled_garden', TRUE, $site->getGUID());
+	} else {
+		set_config('walled_garden', FALSE, $site->getGUID());
+	}
+
+	$https_login = get_input('https_login');
+	if ($https_login) {
+		set_config('https_login', 1, $site->getGUID());
+	} else {
+		unset_config('https_login', $site->getGUID());
+	}
+
+	$api = get_input('api');
+	if ($api) {
+		unset_config('disable_api', $site->getGUID());
+	} else {
+		set_config('disable_api', 'disabled', $site->getGUID());
+	}
+
+	if ($site->save()) {
+		system_message(elgg_echo("admin:configuration:success"));
+	} else {
+		register_error(elgg_echo("admin:configuration:fail"));
+	}
+
+	forward(REFERER);
+}
+\ No newline at end of file
diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php
new file mode 100644
index 000000000..9765182cc
--- /dev/null
+++ b/actions/admin/site/update_basic.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Updates the basic settings for the primary site object.
+ *
+ * Basic site settings are saved as metadata on the site object,
+ * with the exception of the default language, which is saved in
+ * the config table.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.Site
+ */
+
+if ($site = elgg_get_site_entity()) {
+	if (!($site instanceof ElggSite)) {
+		throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite'));
+	}
+
+	$site->description = get_input('sitedescription');
+	$site->name = strip_tags(get_input('sitename'));
+	$site->email = get_input('siteemail');
+	$site->save();
+
+	set_config('language', get_input('language'), $site->getGUID());
+}
+
+system_message(elgg_echo('admin:configuration:success'));
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/user/ban.php b/actions/admin/user/ban.php
new file mode 100644
index 000000000..209ece2a0
--- /dev/null
+++ b/actions/admin/user/ban.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Bans a user.
+ *
+ * User entities are banned by setting the 'banned' column
+ * to 'yes' in the users_entity table.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if ($guid == elgg_get_logged_in_user_guid()) {
+	register_error(elgg_echo('admin:user:self:ban:no'));
+	forward(REFERER);
+}
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->ban('banned')) {
+		system_message(elgg_echo('admin:user:ban:yes'));
+	} else {
+		register_error(elgg_echo('admin:user:ban:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:ban:no'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/user/delete.php b/actions/admin/user/delete.php
new file mode 100644
index 000000000..7cfbd0925
--- /dev/null
+++ b/actions/admin/user/delete.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Delete a user.
+ *
+ * The user will be deleted recursively, meaning all entities
+ * owned or contained by the user will also be removed.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+// Get the user
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if ($guid == elgg_get_logged_in_user_guid()) {
+	register_error(elgg_echo('admin:user:self:delete:no'));
+	forward(REFERER);
+}
+
+$name = $user->name;
+$username = $user->username;
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->delete()) {
+		system_message(elgg_echo('admin:user:delete:yes', array($name)));
+	} else {
+		register_error(elgg_echo('admin:user:delete:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:delete:no'));
+}
+
+// forward to user administration if on a user's page as it no longer exists
+$forward = REFERER;
+if (strpos($_SERVER['HTTP_REFERER'], $username) != FALSE) {
+	$forward = "admin/users/newest";
+}
+
+forward($forward);
diff --git a/actions/admin/user/makeadmin.php b/actions/admin/user/makeadmin.php
new file mode 100644
index 000000000..54b0b7070
--- /dev/null
+++ b/actions/admin/user/makeadmin.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Grants admin privileges to a user.
+ *
+ * In >=1.7.1, admin is flagged by setting the admin
+ * column in the users_entity table.
+ *
+ * In <1.7.1, admin is a piece of metadata on the user object.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->makeAdmin()) {
+		system_message(elgg_echo('admin:user:makeadmin:yes'));
+	} else {
+		register_error(elgg_echo('admin:user:makeadmin:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:makeadmin:no'));
+}
+
+forward(REFERER);
diff --git a/actions/admin/user/removeadmin.php b/actions/admin/user/removeadmin.php
new file mode 100644
index 000000000..8cebc7078
--- /dev/null
+++ b/actions/admin/user/removeadmin.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Revokes admin privileges from a user.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if ($guid == elgg_get_logged_in_user_guid()) {
+	register_error(elgg_echo('admin:user:self:removeadmin:no'));
+	forward(REFERER);
+}
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->removeAdmin()) {
+		system_message(elgg_echo('admin:user:removeadmin:yes'));
+	} else {
+		register_error(elgg_echo('admin:user:removeadmin:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:removeadmin:no'));
+}
+
+forward(REFERER);
diff --git a/actions/admin/user/resetpassword.php b/actions/admin/user/resetpassword.php
new file mode 100644
index 000000000..d019a7f55
--- /dev/null
+++ b/actions/admin/user/resetpassword.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Reset a user's password.
+ *
+ * This is an admin action that generates a new salt and password
+ * for a user, then emails the password to the user's registered
+ * email address.
+ *
+ * NOTE: This is different to the "reset password" link users
+ * can use in that it does not first email the user asking if
+ * they want to have their password reset.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	$password = generate_random_cleartext_password();
+
+	// Always reset the salt before generating the user password.
+	$user->salt = generate_random_cleartext_password();
+	$user->password = generate_user_password($user, $password);
+
+	if ($user->save()) {
+		system_message(elgg_echo('admin:user:resetpassword:yes'));
+
+		notify_user($user->guid,
+			elgg_get_site_entity()->guid,
+			elgg_echo('email:resetpassword:subject'),
+			elgg_echo('email:resetpassword:body', array($user->username, $password)),
+			NULL,
+			'email');
+	} else {
+		register_error(elgg_echo('admin:user:resetpassword:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:resetpassword:no'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/admin/user/unban.php b/actions/admin/user/unban.php
new file mode 100644
index 000000000..7a772a0d3
--- /dev/null
+++ b/actions/admin/user/unban.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Unbans a user.
+ *
+ * @package Elgg.Core
+ * @subpackage Administration.User
+ */
+
+$access_status = access_get_show_hidden_status();
+access_show_hidden_entities(true);
+
+$guid = get_input('guid');
+$user = get_entity($guid);
+
+if (($user instanceof ElggUser) && ($user->canEdit())) {
+	if ($user->unban()) {
+		system_message(elgg_echo('admin:user:unban:yes'));
+	} else {
+		register_error(elgg_echo('admin:user:unban:no'));
+	}
+} else {
+	register_error(elgg_echo('admin:user:unban:no'));
+}
+
+access_show_hidden_entities($access_status);
+
+forward(REFERER);
diff --git a/actions/avatar/crop.php b/actions/avatar/crop.php
new file mode 100644
index 000000000..b9a80f331
--- /dev/null
+++ b/actions/avatar/crop.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Avatar crop action
+ *
+ */
+
+$guid = get_input('guid');
+$owner = get_entity($guid);
+
+if (!$owner || !($owner instanceof ElggUser) || !$owner->canEdit()) {
+	register_error(elgg_echo('avatar:crop:fail'));
+	forward(REFERER);
+}
+
+$x1 = (int) get_input('x1', 0);
+$y1 = (int) get_input('y1', 0);
+$x2 = (int) get_input('x2', 0);
+$y2 = (int) get_input('y2', 0);
+
+$filehandler = new ElggFile();
+$filehandler->owner_guid = $owner->getGUID();
+$filehandler->setFilename("profile/" . $owner->guid . "master" . ".jpg");
+$filename = $filehandler->getFilenameOnFilestore();
+
+// ensuring the avatar image exists in the first place
+if (!file_exists($filename)) {
+	register_error(elgg_echo('avatar:crop:fail'));
+	forward(REFERER);
+}
+
+$icon_sizes = elgg_get_config('icon_sizes');
+unset($icon_sizes['master']);
+
+// get the images and save their file handlers into an array
+// so we can do clean up if one fails.
+$files = array();
+foreach ($icon_sizes as $name => $size_info) {
+	$resized = get_resized_image_from_existing_file($filename, $size_info['w'], $size_info['h'], $size_info['square'], $x1, $y1, $x2, $y2, $size_info['upscale']);
+
+	if ($resized) {
+		//@todo Make these actual entities.  See exts #348.
+		$file = new ElggFile();
+		$file->owner_guid = $guid;
+		$file->setFilename("profile/{$guid}{$name}.jpg");
+		$file->open('write');
+		$file->write($resized);
+		$file->close();
+		$files[] = $file;
+	} else {
+		// cleanup on fail
+		foreach ($files as $file) {
+			$file->delete();
+		}
+
+		register_error(elgg_echo('avatar:resize:fail'));
+		forward(REFERER);
+	}
+}
+
+$owner->icontime = time();
+
+$owner->x1 = $x1;
+$owner->x2 = $x2;
+$owner->y1 = $y1;
+$owner->y2 = $y2;
+
+system_message(elgg_echo('avatar:crop:success'));
+$view = 'river/user/default/profileiconupdate';
+elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+add_to_river($view, 'update', $owner->guid, $owner->guid);
+
+forward(REFERER);
diff --git a/actions/avatar/remove.php b/actions/avatar/remove.php
new file mode 100644
index 000000000..9cb40a760
--- /dev/null
+++ b/actions/avatar/remove.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Avatar remove action
+ */
+
+$user_guid = get_input('guid');
+$user = get_user($user_guid);
+
+if (!$user || !$user->canEdit()) {
+	register_error(elgg_echo('avatar:remove:fail'));
+	forward(REFERER);
+}
+
+// Delete all icons from diskspace
+$icon_sizes = elgg_get_config('icon_sizes');
+foreach ($icon_sizes as $name => $size_info) {
+	$file = new ElggFile();
+	$file->owner_guid = $user_guid;
+	$file->setFilename("profile/{$user_guid}{$name}.jpg");
+	$filepath = $file->getFilenameOnFilestore();
+	if (!$file->delete()) {
+		elgg_log("Avatar file remove failed. Remove $filepath manually, please.", 'WARNING');
+	}
+}
+
+// Remove crop coords
+unset($user->x1);
+unset($user->x2);
+unset($user->y1);
+unset($user->y2);
+
+// Remove icon
+unset($user->icontime);
+
+system_message(elgg_echo('avatar:remove:success'));
+forward(REFERER);
diff --git a/actions/avatar/upload.php b/actions/avatar/upload.php
new file mode 100644
index 000000000..0752615e0
--- /dev/null
+++ b/actions/avatar/upload.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Avatar upload action
+ */
+
+$guid = get_input('guid');
+$owner = get_entity($guid);
+
+if (!$owner || !($owner instanceof ElggUser) || !$owner->canEdit()) {
+	register_error(elgg_echo('avatar:upload:fail'));
+	forward(REFERER);
+}
+
+if ($_FILES['avatar']['error'] != 0) {
+	register_error(elgg_echo('avatar:upload:fail'));
+	forward(REFERER);
+}
+
+$icon_sizes = elgg_get_config('icon_sizes');
+
+// get the images and save their file handlers into an array
+// so we can do clean up if one fails.
+$files = array();
+foreach ($icon_sizes as $name => $size_info) {
+	$resized = get_resized_image_from_uploaded_file('avatar', $size_info['w'], $size_info['h'], $size_info['square'], $size_info['upscale']);
+
+	if ($resized) {
+		//@todo Make these actual entities.  See exts #348.
+		$file = new ElggFile();
+		$file->owner_guid = $guid;
+		$file->setFilename("profile/{$guid}{$name}.jpg");
+		$file->open('write');
+		$file->write($resized);
+		$file->close();
+		$files[] = $file;
+	} else {
+		// cleanup on fail
+		foreach ($files as $file) {
+			$file->delete();
+		}
+
+		register_error(elgg_echo('avatar:resize:fail'));
+		forward(REFERER);
+	}
+}
+
+// reset crop coordinates
+$owner->x1 = 0;
+$owner->x2 = 0;
+$owner->y1 = 0;
+$owner->y2 = 0;
+
+$owner->icontime = time();
+if (elgg_trigger_event('profileiconupdate', $owner->type, $owner)) {
+	system_message(elgg_echo("avatar:upload:success"));
+
+	$view = 'river/user/default/profileiconupdate';
+	elgg_delete_river(array('subject_guid' => $owner->guid, 'view' => $view));
+	add_to_river($view, 'update', $owner->guid, $owner->guid);
+}
+
+forward(REFERER);
diff --git a/actions/comments/add.php b/actions/comments/add.php
new file mode 100644
index 000000000..5bd741413
--- /dev/null
+++ b/actions/comments/add.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * Elgg add comment action
+ *
+ * @package Elgg.Core
+ * @subpackage Comments
+ */
+
+$entity_guid = (int) get_input('entity_guid');
+$comment_text = get_input('generic_comment');
+
+if (empty($comment_text)) {
+	register_error(elgg_echo("generic_comment:blank"));
+	forward(REFERER);
+}
+
+// Let's see if we can get an entity with the specified GUID
+$entity = get_entity($entity_guid);
+if (!$entity) {
+	register_error(elgg_echo("generic_comment:notfound"));
+	forward(REFERER);
+}
+
+$user = elgg_get_logged_in_user_entity();
+
+$annotation = create_annotation($entity->guid,
+								'generic_comment',
+								$comment_text,
+								"",
+								$user->guid,
+								$entity->access_id);
+
+// tell user annotation posted
+if (!$annotation) {
+	register_error(elgg_echo("generic_comment:failure"));
+	forward(REFERER);
+}
+
+// notify if poster wasn't owner
+if ($entity->owner_guid != $user->guid) {
+
+	notify_user($entity->owner_guid,
+				$user->guid,
+				elgg_echo('generic_comment:email:subject'),
+				elgg_echo('generic_comment:email:body', array(
+					$entity->title,
+					$user->name,
+					$comment_text,
+					$entity->getURL(),
+					$user->name,
+					$user->getURL()
+				))
+			);
+}
+
+system_message(elgg_echo("generic_comment:posted"));
+
+//add to river
+add_to_river('river/annotation/generic_comment/create', 'comment', $user->guid, $entity->guid, "", 0, $annotation);
+
+// Forward to the page the action occurred on
+forward(REFERER);
diff --git a/actions/comments/delete.php b/actions/comments/delete.php
new file mode 100644
index 000000000..c6b481da4
--- /dev/null
+++ b/actions/comments/delete.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg delete comment action
+ *
+ * @package Elgg
+ */
+
+// Make sure we can get the comment in question
+$annotation_id = (int) get_input('annotation_id');
+$comment = elgg_get_annotation_from_id($annotation_id);
+if ($comment && $comment->canEdit()) {
+	$comment->delete();
+	system_message(elgg_echo("generic_comment:deleted"));
+} else {
+	register_error(elgg_echo("generic_comment:notdeleted"));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/entities/delete.php b/actions/entities/delete.php
new file mode 100644
index 000000000..251e1f01c
--- /dev/null
+++ b/actions/entities/delete.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Default entity delete action
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$guid = get_input('guid');
+$entity = get_entity($guid);
+
+if (($entity) && ($entity->canEdit())) {
+	if ($entity->delete()) {
+		system_message(elgg_echo('entity:delete:success', array($guid)));
+	} else {
+		register_error(elgg_echo('entity:delete:fail', array($guid)));
+	}
+} else {
+	register_error(elgg_echo('entity:delete:fail', array($guid)));
+}
+
+forward(REFERER);
diff --git a/actions/friends/add.php b/actions/friends/add.php
new file mode 100644
index 000000000..d1800ee14
--- /dev/null
+++ b/actions/friends/add.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Elgg add friend action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Management
+ */
+
+// Get the GUID of the user to friend
+$friend_guid = get_input('friend');
+$friend = get_entity($friend_guid);
+if (!$friend) {
+	register_error(elgg_echo('error:missing_data'));
+	forward(REFERER);
+}
+
+$errors = false;
+
+// Get the user
+try {
+	if (!elgg_get_logged_in_user_entity()->addFriend($friend_guid)) {
+		$errors = true;
+	}
+} catch (Exception $e) {
+	register_error(elgg_echo("friends:add:failure", array($friend->name)));
+	$errors = true;
+}
+if (!$errors) {
+	// add to river
+	add_to_river('river/relationship/friend/create', 'friend', elgg_get_logged_in_user_guid(), $friend_guid);
+	system_message(elgg_echo("friends:add:successful", array($friend->name)));
+}
+
+// Forward back to the page you friended the user on
+forward(REFERER);
diff --git a/actions/friends/collections/add.php b/actions/friends/collections/add.php
new file mode 100644
index 000000000..e63a149f7
--- /dev/null
+++ b/actions/friends/collections/add.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg collection add page
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_name = htmlspecialchars(get_input('collection_name', '', false), ENT_QUOTES, 'UTF-8');
+$friends = get_input('friends_collection');
+
+if (!$collection_name) {
+	register_error(elgg_echo("friends:nocollectionname"));
+	forward(REFERER);
+}
+
+$id = create_access_collection($collection_name);
+
+if ($id) {
+	$result = update_access_collection($id, $friends);
+	if ($result) {
+		system_message(elgg_echo("friends:collectionadded"));
+		forward("collections/" . elgg_get_logged_in_user_entity()->username);
+	} else {
+		register_error(elgg_echo("friends:nocollectionname"));
+		forward(REFERER);
+	}
+} else {
+	register_error(elgg_echo("friends:nocollectionname"));
+	forward(REFERER);
+}
+\ No newline at end of file
diff --git a/actions/friends/collections/delete.php b/actions/friends/collections/delete.php
new file mode 100644
index 000000000..ff8f1fb55
--- /dev/null
+++ b/actions/friends/collections/delete.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg friends: delete collection action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_id = (int) get_input('collection');
+
+// check the ACL exists and we can edit
+if (!can_edit_access_collection($collection_id)) {
+	register_error(elgg_echo("friends:collectiondeletefailed"));
+	forward(REFERER);
+}
+
+if (delete_access_collection($collection_id)) {
+	system_message(elgg_echo("friends:collectiondeleted"));
+} else {
+	register_error(elgg_echo("friends:collectiondeletefailed"));
+}
+
+forward(REFERER);
diff --git a/actions/friends/collections/edit.php b/actions/friends/collections/edit.php
new file mode 100644
index 000000000..9eb5e1eab
--- /dev/null
+++ b/actions/friends/collections/edit.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Friends collection edit action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Collections
+ */
+
+$collection_id = get_input('collection_id');
+$friends = get_input('friend');
+
+// check it exists and we can edit
+if (!can_edit_access_collection($collection_id)) {
+	system_message(elgg_echo('friends:collection:edit_failed'));
+}
+
+if (update_access_collection($collection_id, $friends)) {
+	system_message(elgg_echo('friends:collections:edited'));
+} else {
+	system_message(elgg_echo('friends:collection:edit_failed'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/friends/remove.php b/actions/friends/remove.php
new file mode 100644
index 000000000..d69d18f31
--- /dev/null
+++ b/actions/friends/remove.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Elgg remove friend action
+ *
+ * @package Elgg.Core
+ * @subpackage Friends.Management
+ */
+
+// Get the GUID of the user to friend
+$friend_guid = get_input('friend');
+$friend = get_entity($friend_guid);
+$errors = false;
+
+// Get the user
+try{
+	if ($friend instanceof ElggUser) {
+		elgg_get_logged_in_user_entity()->removeFriend($friend_guid);
+	} else {
+		register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+		$errors = true;
+	}
+} catch (Exception $e) {
+	register_error(elgg_echo("friends:remove:failure", array($friend->name)));
+	$errors = true;
+}
+
+if (!$errors) {
+	system_message(elgg_echo("friends:remove:successful", array($friend->name)));
+}
+
+// Forward back to the page you made the friend on
+forward(REFERER);
diff --git a/actions/import/opendd.php b/actions/import/opendd.php
new file mode 100644
index 000000000..e63607145
--- /dev/null
+++ b/actions/import/opendd.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Elgg OpenDD import action.
+ *
+ * This action accepts data to import (in OpenDD format) and performs and import. It accepts
+ * data as $data.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$data = get_input('data', '', false);
+
+$return = import($data);
+
+if ($return) {
+	system_message(elgg_echo('importsuccess'));
+} else {
+	register_error(elgg_echo('importfail'));
+}
+
+forward(REFERER);
diff --git a/actions/login.php b/actions/login.php
new file mode 100644
index 000000000..bd7f91299
--- /dev/null
+++ b/actions/login.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Elgg login action
+ *
+ * @package Elgg.Core
+ * @subpackage User.Authentication
+ */
+
+// set forward url
+if (!empty($_SESSION['last_forward_from'])) {
+	$forward_url = $_SESSION['last_forward_from'];
+} elseif (get_input('returntoreferer')) {
+	$forward_url = REFERER;
+} else {
+	// forward to main index page
+	$forward_url = '';
+}
+
+$username = get_input('username');
+$password = get_input('password', null, false);
+$persistent = (bool) get_input("persistent");
+$result = false;
+
+if (empty($username) || empty($password)) {
+	register_error(elgg_echo('login:empty'));
+	forward();
+}
+
+// check if logging in with email address
+if (strpos($username, '@') !== false && ($users = get_user_by_email($username))) {
+	$username = $users[0]->username;
+}
+
+$result = elgg_authenticate($username, $password);
+if ($result !== true) {
+	register_error($result);
+	forward(REFERER);
+}
+
+$user = get_user_by_username($username);
+if (!$user) {
+	register_error(elgg_echo('login:baduser'));
+	forward(REFERER);
+}
+
+try {
+	login($user, $persistent);
+	// re-register at least the core language file for users with language other than site default
+	register_translations(dirname(dirname(__FILE__)) . "/languages/");
+} catch (LoginException $e) {
+	register_error($e->getMessage());
+	forward(REFERER);
+}
+
+// elgg_echo() caches the language and does not provide a way to change the language.
+// @todo we need to use the config object to store this so that the current language
+// can be changed. Refs #4171
+if ($user->language) {
+	$message = elgg_echo('loginok', array(), $user->language);
+} else {
+	$message = elgg_echo('loginok');
+}
+
+if (isset($_SESSION['last_forward_from'])) {
+	unset($_SESSION['last_forward_from']);
+}
+
+system_message($message);
+forward($forward_url);
diff --git a/actions/logout.php b/actions/logout.php
new file mode 100644
index 000000000..c48a26b15
--- /dev/null
+++ b/actions/logout.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg logout action
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// Log out
+$result = logout();
+
+// Set the system_message as appropriate
+if ($result) {
+	system_message(elgg_echo('logoutok'));
+	forward();
+} else {
+	register_error(elgg_echo('logouterror'));
+}
+\ No newline at end of file
diff --git a/actions/notifications/settings/usersettings/save.php b/actions/notifications/settings/usersettings/save.php
new file mode 100644
index 000000000..455a444e1
--- /dev/null
+++ b/actions/notifications/settings/usersettings/save.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Elgg notifications user preference save acion.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$method = get_input('method');
+
+$current_settings = get_user_notification_settings();
+
+$result = false;
+foreach ($method as $k => $v) {
+	// check if setting has changed and skip if not
+	if ($current_settings->$k == ($v == 'yes')) {
+		continue;
+	}
+
+	$result = set_user_notification_setting(elgg_get_logged_in_user_guid(), $k, ($v == 'yes') ? true : false);
+
+	if (!$result) {
+		register_error(elgg_echo('notifications:usersettings:save:fail'));
+	}
+}
+
+if ($result) {
+	system_message(elgg_echo('notifications:usersettings:save:ok'));
+}
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
new file mode 100644
index 000000000..581a2f9ec
--- /dev/null
+++ b/actions/plugins/settings/save.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Saves global plugin settings.
+ *
+ * This action can be overriden for a specific plugin by creating the
+ * <plugin_id>/settings/save action in that plugin.
+ *
+ * @uses array $_REQUEST['params']    A set of key/value pairs to save to the ElggPlugin entity
+ * @uses int   $_REQUEST['plugin_id'] The ID of the plugin
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
+ */
+
+$params = get_input('params');
+$plugin_id = get_input('plugin_id');
+$plugin = elgg_get_plugin_from_id($plugin_id);
+
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('plugins:settings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
+
+$plugin_name = $plugin->getManifest()->getName();
+
+$result = false;
+
+// allow a plugin to override the save action for their settings
+if (elgg_action_exists("$plugin_id/settings/save")) {
+	action("$plugin_id/settings/save");
+} else {
+	foreach ($params as $k => $v) {
+		$result = $plugin->setSetting($k, $v);
+		if (!$result) {
+			register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
+			forward(REFERER);
+			exit;
+		}
+	}
+}
+
+system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name)));
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
new file mode 100644
index 000000000..f6b8ab0b6
--- /dev/null
+++ b/actions/plugins/usersettings/save.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Saves user-specific plugin settings.
+ *
+ * This action can be overriden for a specific plugin by creating the
+ * <plugin_id>/usersettings/save action in that plugin.
+ *
+ * @uses array $_REQUEST['params']    A set of key/value pairs to save to the ElggPlugin entity
+ * @uses int   $_REQUEST['plugin_id'] The id of the plugin
+ * @uses int   $_REQUEST['user_guid'] The GUID of the user to save settings for.
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
+ */
+
+$params = get_input('params');
+$plugin_id = get_input('plugin_id');
+$user_guid = get_input('user_guid', elgg_get_logged_in_user_guid());
+$plugin = elgg_get_plugin_from_id($plugin_id);
+$user = get_entity($user_guid);
+
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
+
+if (!($user instanceof ElggUser)) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
+
+$plugin_name = $plugin->getManifest()->getName();
+
+// make sure we're admin or the user
+if (!$user->canEdit()) {
+	register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_name)));
+	forward(REFERER);
+}
+
+$result = false;
+
+if (elgg_action_exists("$plugin_id/usersettings/save")) {
+	action("$plugin_id/usersettings/save");
+} else {
+	foreach ($params as $k => $v) {
+		// Save
+		$result = $plugin->setUserSetting($k, $v, $user->guid);
+
+		// Error?
+		if (!$result) {
+			register_error(elgg_echo('plugins:usersettings:save:fail', array($plugin_name)));
+			forward(REFERER);
+		}
+	}
+}
+
+system_message(elgg_echo('plugins:usersettings:save:ok', array($plugin_name)));
+forward(REFERER);
diff --git a/actions/profile/edit.php b/actions/profile/edit.php
new file mode 100644
index 000000000..e1f066e82
--- /dev/null
+++ b/actions/profile/edit.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Elgg profile edit action
+ *
+ */
+
+elgg_make_sticky_form('profile:edit');
+
+$guid = get_input('guid');
+$owner = get_entity($guid);
+
+if (!$owner || !($owner instanceof ElggUser) || !$owner->canEdit()) {
+	register_error(elgg_echo('profile:edit:fail'));
+	forward(REFERER);
+}
+
+// grab the defined profile field names and their load the values from POST.
+// each field can have its own access, so sort that too.
+$input = array();
+$accesslevel = get_input('accesslevel');
+
+if (!is_array($accesslevel)) {
+	$accesslevel = array();
+}
+
+/**
+ * wrapper for recursive array walk decoding
+ */
+function profile_array_decoder(&$v) {
+	$v = _elgg_html_decode($v);
+}
+
+$profile_fields = elgg_get_config('profile_fields');
+foreach ($profile_fields as $shortname => $valuetype) {
+	// the decoding is a stop gap to prevent &amp;&amp; showing up in profile fields
+	// because it is escaped on both input (get_input()) and output (view:output/text). see #561 and #1405.
+	// must decode in utf8 or string corruption occurs. see #1567.
+	$value = get_input($shortname);
+	if (is_array($value)) {
+		array_walk_recursive($value, 'profile_array_decoder');
+	} else {
+		$value = _elgg_html_decode($value);
+	}
+
+	// limit to reasonable sizes
+	// @todo - throwing away changes due to this is dumb!
+	if (!is_array($value) && $valuetype != 'longtext' && elgg_strlen($value) > 250) {
+		$error = elgg_echo('profile:field_too_long', array(elgg_echo("profile:{$shortname}")));
+		register_error($error);
+		forward(REFERER);
+	}
+
+	if ($value && $valuetype == 'url' && !preg_match('~^https?\://~i', $value)) {
+		$value = "http://$value";
+	}
+
+	if ($valuetype == 'tags') {
+		$value = string_to_tag_array($value);
+	}
+	
+	$input[$shortname] = $value;
+}
+
+// display name is handled separately
+$name = strip_tags(get_input('name'));
+if ($name) {
+	if (elgg_strlen($name) > 50) {
+		register_error(elgg_echo('user:name:fail'));
+	} elseif ($owner->name != $name) {
+		$owner->name = $name;
+		$owner->save();
+	}
+}
+
+// go through custom fields
+if (sizeof($input) > 0) {
+	foreach ($input as $shortname => $value) {
+		$options = array(
+			'guid' => $owner->guid,
+			'metadata_name' => $shortname,
+			'limit' => false
+		);
+		elgg_delete_metadata($options);
+		
+		if (!is_null($value) && ($value !== '')) {
+			// only create metadata for non empty values (0 is allowed) to prevent metadata records with empty string values #4858
+			
+			if (isset($accesslevel[$shortname])) {
+				$access_id = (int) $accesslevel[$shortname];
+			} else {
+				// this should never be executed since the access level should always be set
+				$access_id = ACCESS_DEFAULT;
+			}
+			if (is_array($value)) {
+				$i = 0;
+				foreach ($value as $interval) {
+					$i++;
+					$multiple = ($i > 1) ? TRUE : FALSE;
+					create_metadata($owner->guid, $shortname, $interval, 'text', $owner->guid, $access_id, $multiple);
+				}
+			} else {
+				create_metadata($owner->getGUID(), $shortname, $value, 'text', $owner->getGUID(), $access_id);
+			}
+		}
+	}
+
+	$owner->save();
+
+	// Notify of profile update
+	elgg_trigger_event('profileupdate', $owner->type, $owner);
+
+	elgg_clear_sticky_form('profile:edit');
+	system_message(elgg_echo("profile:saved"));
+}
+
+forward($owner->getUrl());
diff --git a/actions/profile/fields/add.php b/actions/profile/fields/add.php
new file mode 100644
index 000000000..fce783092
--- /dev/null
+++ b/actions/profile/fields/add.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Elgg profile plugin edit default profile action
+ *
+ */
+
+$label = get_input('label');
+$type = get_input('type');
+
+$fieldlist = elgg_get_config('profile_custom_fields');
+if (!$fieldlist) {
+	$fieldlist = '';
+	$id = 1;
+} else {
+	$fieldlistarray = explode(',', $fieldlist);
+	foreach ($fieldlistarray as $key => $value) {
+		$fieldlistarray[$key] = (int)$value;
+	}
+	$id = max($fieldlistarray) + 1;
+}
+
+if (($label) && ($type)) {
+	if (!empty($fieldlist)) {
+		$fieldlist .= ',';
+	}
+	$fieldlist .= "$id";
+
+	if (elgg_save_config("admin_defined_profile_$id", $label) &&
+		elgg_save_config("admin_defined_profile_type_$id", $type) &&
+		elgg_save_config('profile_custom_fields', $fieldlist)) {
+
+		system_message(elgg_echo('profile:editdefault:success'));
+	} else {
+		register_error(elgg_echo('profile:editdefault:fail'));
+	}
+} else {
+	register_error(elgg_echo('profile:editdefault:fail'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/profile/fields/delete.php b/actions/profile/fields/delete.php
new file mode 100644
index 000000000..9879feb3f
--- /dev/null
+++ b/actions/profile/fields/delete.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg profile plugin edit default profile action removal
+ *
+ */
+
+$id = get_input('id');
+
+$fieldlist = elgg_get_config('profile_custom_fields');
+if (!$fieldlist) {
+	$fieldlist = '';
+}
+
+$fieldlist = str_replace("{$id},", "", $fieldlist);
+$fieldlist = str_replace(",{$id}", "", $fieldlist);
+$fieldlist = str_replace("{$id}", "", $fieldlist);
+
+if ($id &&
+	unset_config("admin_defined_profile_$id") &&
+	unset_config("admin_defined_profile_type_$id") &&
+	elgg_save_config('profile_custom_fields', $fieldlist)) {
+	
+	system_message(elgg_echo('profile:editdefault:delete:success'));
+} else {
+	register_error(elgg_echo('profile:editdefault:delete:fail'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/profile/fields/edit.php b/actions/profile/fields/edit.php
new file mode 100644
index 000000000..5fc84ff11
--- /dev/null
+++ b/actions/profile/fields/edit.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Edit a custom profile field
+ */
+
+$id = get_input('id');
+$label = get_input('label');
+
+if (!elgg_get_config("admin_defined_profile_$id")) {
+	register_error(elgg_echo('profile:editdefault:fail'));
+	forward(REFERER);
+}
+
+if (elgg_save_config("admin_defined_profile_$id", $label)) {
+	system_message(elgg_echo('profile:editdefault:success'));
+} else {
+	register_error(elgg_echo('profile:editdefault:fail'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/profile/fields/reorder.php b/actions/profile/fields/reorder.php
new file mode 100644
index 000000000..27c716749
--- /dev/null
+++ b/actions/profile/fields/reorder.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Elgg profile plugin reorder fields
+ *
+ */
+
+$ordering = get_input('fieldorder');
+
+$result = elgg_save_config('profile_custom_fields', $ordering);
+
+// called by ajax so we exit
+exit;
diff --git a/actions/profile/fields/reset.php b/actions/profile/fields/reset.php
new file mode 100644
index 000000000..19efae479
--- /dev/null
+++ b/actions/profile/fields/reset.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Reset profile fields action
+ *
+ */
+
+$fieldlist = elgg_get_config('profile_custom_fields');
+if ($fieldlist) {
+	$fieldlistarray = explode(',', $fieldlist);
+	foreach ($fieldlistarray as $listitem) {
+		unset_config("admin_defined_profile_{$listitem}");
+		unset_config("admin_defined_profile_type_{$listitem}");
+	}
+}
+
+unset_config('profile_custom_fields');
+
+system_message(elgg_echo('profile:defaultprofile:reset'));
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/register.php b/actions/register.php
new file mode 100644
index 000000000..73926232c
--- /dev/null
+++ b/actions/register.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Elgg registration action
+ *
+ * @package Elgg.Core
+ * @subpackage User.Account
+ */
+
+elgg_make_sticky_form('register');
+
+// Get variables
+$username = get_input('username');
+$password = get_input('password', null, false);
+$password2 = get_input('password2', null, false);
+$email = get_input('email');
+$name = get_input('name');
+$friend_guid = (int) get_input('friend_guid', 0);
+$invitecode = get_input('invitecode');
+
+if (elgg_get_config('allow_registration')) {
+	try {
+		if (trim($password) == "" || trim($password2) == "") {
+			throw new RegistrationException(elgg_echo('RegistrationException:EmptyPassword'));
+		}
+
+		if (strcmp($password, $password2) != 0) {
+			throw new RegistrationException(elgg_echo('RegistrationException:PasswordMismatch'));
+		}
+
+		$guid = register_user($username, $password, $name, $email, false, $friend_guid, $invitecode);
+
+		if ($guid) {
+			$new_user = get_entity($guid);
+
+			// allow plugins to respond to self registration
+			// note: To catch all new users, even those created by an admin,
+			// register for the create, user event instead.
+			// only passing vars that aren't in ElggUser.
+			$params = array(
+				'user' => $new_user,
+				'password' => $password,
+				'friend_guid' => $friend_guid,
+				'invitecode' => $invitecode
+			);
+
+			// @todo should registration be allowed no matter what the plugins return?
+			if (!elgg_trigger_plugin_hook('register', 'user', $params, TRUE)) {
+				$ia = elgg_set_ignore_access(true);
+				$new_user->delete();
+				elgg_set_ignore_access($ia);
+				// @todo this is a generic messages. We could have plugins
+				// throw a RegistrationException, but that is very odd
+				// for the plugin hooks system.
+				throw new RegistrationException(elgg_echo('registerbad'));
+			}
+
+			elgg_clear_sticky_form('register');
+			system_message(elgg_echo("registerok", array(elgg_get_site_entity()->name)));
+
+			// if exception thrown, this probably means there is a validation
+			// plugin that has disabled the user
+			try {
+				login($new_user);
+			} catch (LoginException $e) {
+				// do nothing
+			}
+
+			// Forward on success, assume everything else is an error...
+			forward();
+		} else {
+			register_error(elgg_echo("registerbad"));
+		}
+	} catch (RegistrationException $r) {
+		register_error($r->getMessage());
+	}
+} else {
+	register_error(elgg_echo('registerdisabled'));
+}
+
+forward(REFERER);
diff --git a/actions/river/delete.php b/actions/river/delete.php
new file mode 100644
index 000000000..0d8297932
--- /dev/null
+++ b/actions/river/delete.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * River item delete action
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$id = get_input('id', false);
+
+if ($id !== false && elgg_is_admin_logged_in()) {
+	if (elgg_delete_river(array('id' => $id))) {
+		system_message(elgg_echo('river:delete:success'));
+	} else {
+		register_error(elgg_echo('river:delete:fail'));
+	}
+} else {
+	register_error(elgg_echo('river:delete:fail'));
+}
+
+forward(REFERER);
diff --git a/actions/security/refreshtoken.php b/actions/security/refreshtoken.php
new file mode 100644
index 000000000..74a72c4af
--- /dev/null
+++ b/actions/security/refreshtoken.php
@@ -0,0 +1,5 @@
+<?php
+$ts = time();
+$token = generate_action_token($ts);
+
+echo json_encode(array('__elgg_ts' => $ts, '__elgg_token' => $token));
+\ No newline at end of file
diff --git a/actions/user/passwordreset.php b/actions/user/passwordreset.php
new file mode 100644
index 000000000..201d6abcf
--- /dev/null
+++ b/actions/user/passwordreset.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Action to reset a password and send success email.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$user_guid = get_input('u');
+$code = get_input('c');
+
+if (execute_new_password_request($user_guid, $code)) {
+	system_message(elgg_echo('user:password:success'));
+} else {
+	register_error(elgg_echo('user:password:fail'));
+}
+
+forward();
+exit;
diff --git a/actions/user/requestnewpassword.php b/actions/user/requestnewpassword.php
new file mode 100644
index 000000000..f1d4fa43c
--- /dev/null
+++ b/actions/user/requestnewpassword.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Action to request a new password.
+ *
+ * @package Elgg.Core
+ * @subpackage User.Account
+ */
+
+$username = get_input('username');
+
+// allow email addresses
+if (strpos($username, '@') !== false && ($users = get_user_by_email($username))) {
+	$username = $users[0]->username;
+}
+
+$user = get_user_by_username($username);
+if ($user) {
+	if (send_new_password_request($user->guid)) {
+		system_message(elgg_echo('user:password:resetreq:success'));
+	} else {
+		register_error(elgg_echo('user:password:resetreq:fail'));
+	}
+} else {
+	register_error(elgg_echo('user:username:notfound', array($username)));
+}
+
+forward();
diff --git a/actions/user/spotlight.php b/actions/user/spotlight.php
new file mode 100644
index 000000000..202dde387
--- /dev/null
+++ b/actions/user/spotlight.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Close or open spotlight.
+ *
+ * @package Elgg.Core
+ * @subpackage Spotlight
+ * @todo This is deprecated in 1.8
+ */
+
+$closed = get_input('closed', 'true');
+if ($closed != 'true') {
+	$closed = false;
+} else {
+	$closed = true;
+}
+
+elgg_get_logged_in_user_entity()->spotlightclosed = $closed;
+// exit as this action is called through Ajax
+exit;
+\ No newline at end of file
diff --git a/actions/useradd.php b/actions/useradd.php
new file mode 100644
index 000000000..17459021b
--- /dev/null
+++ b/actions/useradd.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Elgg add action
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+elgg_make_sticky_form('useradd');
+
+// Get variables
+$username = get_input('username');
+$password = get_input('password', null, false);
+$password2 = get_input('password2', null, false);
+$email = get_input('email');
+$name = get_input('name');
+
+$admin = get_input('admin');
+if (is_array($admin)) {
+	$admin = $admin[0];
+}
+
+// no blank fields
+if ($username == '' || $password == '' || $password2 == '' || $email == '' || $name == '') {
+	register_error(elgg_echo('register:fields'));
+	forward(REFERER);
+}
+
+if (strcmp($password, $password2) != 0) {
+	register_error(elgg_echo('RegistrationException:PasswordMismatch'));
+	forward(REFERER);
+}
+
+// For now, just try and register the user
+try {
+	$guid = register_user($username, $password, $name, $email, TRUE);
+
+	if ($guid) {
+		$new_user = get_entity($guid);
+		if ($new_user && $admin && elgg_is_admin_logged_in()) {
+			$new_user->makeAdmin();
+		}
+
+		elgg_clear_sticky_form('useradd');
+
+		$new_user->admin_created = TRUE;
+		// @todo ugh, saving a guid as metadata!
+		$new_user->created_by_guid = elgg_get_logged_in_user_guid();
+
+		$subject = elgg_echo('useradd:subject');
+		$body = elgg_echo('useradd:body', array(
+			$name,
+			elgg_get_site_entity()->name,
+			elgg_get_site_entity()->url,
+			$username,
+			$password,
+		));
+
+		notify_user($new_user->guid, elgg_get_site_entity()->guid, $subject, $body);
+
+		system_message(elgg_echo("adduser:ok", array(elgg_get_site_entity()->name)));
+	} else {
+		register_error(elgg_echo("adduser:bad"));
+	}
+} catch (RegistrationException $r) {
+	register_error($r->getMessage());
+}
+
+forward(REFERER);
diff --git a/actions/usersettings/save.php b/actions/usersettings/save.php
new file mode 100644
index 000000000..eb6cdbd5d
--- /dev/null
+++ b/actions/usersettings/save.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Aggregate action for saving settings
+ *
+ * @package Elgg.Core
+ * @subpackage UserSettings
+ */
+
+elgg_trigger_plugin_hook('usersettings:save', 'user');
+
+forward(REFERER);
diff --git a/actions/widgets/add.php b/actions/widgets/add.php
new file mode 100644
index 000000000..d7b2f291c
--- /dev/null
+++ b/actions/widgets/add.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Elgg widget add action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
+
+$owner_guid = get_input('owner_guid');
+$handler = get_input('handler');
+$context = get_input('context');
+$show_access = (bool)get_input('show_access', true);
+$column = get_input('column', 1);
+$default_widgets = get_input('default_widgets', 0);
+
+elgg_push_context($context);
+if ($default_widgets) {
+	elgg_push_context('default_widgets');
+}
+elgg_push_context('widgets');
+
+if (!empty($owner_guid)) {
+	$owner = get_entity($owner_guid);
+	if ($owner && $owner->canEdit()) {
+		$guid = elgg_create_widget($owner->getGUID(), $handler, $context);
+		if ($guid) {
+			$widget = get_entity($guid);
+
+			// position the widget
+			$widget->move($column, 0);
+
+			// send widget html for insertion
+			echo elgg_view_entity($widget, array('show_access' => $show_access));
+
+			//system_message(elgg_echo('widgets:add:success'));
+			forward(REFERER);
+		}
+	}
+}
+
+register_error(elgg_echo('widgets:add:failure'));
+forward(REFERER);
diff --git a/actions/widgets/delete.php b/actions/widgets/delete.php
new file mode 100644
index 000000000..47920013d
--- /dev/null
+++ b/actions/widgets/delete.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Elgg widget delete action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
+
+$widget_guid = get_input('widget_guid');
+$owner_guid = get_input('owner_guid', elgg_get_logged_in_user_guid());
+
+$widget = get_entity($widget_guid);
+$owner = get_entity($owner_guid);
+
+if ($widget && $owner->canEdit() && $widget->delete()) {
+	forward(REFERER);
+}
+
+register_error(elgg_echo('widgets:remove:failure'));
+forward(REFERER);
diff --git a/actions/widgets/move.php b/actions/widgets/move.php
new file mode 100644
index 000000000..eab650c9c
--- /dev/null
+++ b/actions/widgets/move.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg widget move action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
+
+$widget_guid = get_input('widget_guid');
+$column = get_input('column', 1);
+$position = get_input('position');
+$owner_guid = get_input('owner_guid', elgg_get_logged_in_user_guid());
+
+$widget = get_entity($widget_guid);
+$owner = get_entity($owner_guid);
+
+
+if ($widget && $owner->canEdit()) {
+	$widget->move($column, $position);
+	forward(REFERER);
+}
+
+register_error(elgg_echo('widgets:move:failure'));
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/widgets/reorder.php b/actions/widgets/reorder.php
new file mode 100644
index 000000000..e43a0ba73
--- /dev/null
+++ b/actions/widgets/reorder.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg widget reorder action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
+
+$owner = get_input('owner');
+$context = get_input('context');
+
+$maincontent = get_input('debugField1');
+$sidebar = get_input('debugField2');
+$rightbar = get_input('debugField3');
+
+$result = reorder_widgets_from_panel($maincontent, $sidebar, $rightbar, $context, $owner);
+
+if ($result) {
+	system_message(elgg_echo('widgets:panel:save:success'));
+} else {
+	register_error(elgg_echo('widgets:panel:save:failure'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/widgets/save.php b/actions/widgets/save.php
new file mode 100644
index 000000000..e15deab77
--- /dev/null
+++ b/actions/widgets/save.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Elgg save widget settings action
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ *
+ * @uses int    $_REQUEST['guid']            The guid of the widget to save
+ * @uses array  $_REQUEST['params']          An array of params to set on the widget.
+ * @uses int    $_REQUEST['default_widgets'] Flag for if these settings are for default wigets.
+ * @uses string $_REQUEST['context']         An optional context of the widget. Used to return
+ *                                           the correct output if widget content changes
+ *                                           depending on context.
+ *
+ */
+
+elgg_set_context('widgets');
+
+$guid = get_input('guid');
+$params = get_input('params');
+$default_widgets = get_input('default_widgets', 0);
+$context = get_input('context');
+
+$widget = get_entity($guid);
+if ($widget && $widget->saveSettings($params)) {
+	elgg_set_page_owner_guid($widget->getContainerGUID());
+	if ($context) {
+		elgg_push_context($context);
+	}
+	
+	if (!$default_widgets) {
+		if (elgg_view_exists("widgets/$widget->handler/content")) {
+			$view = "widgets/$widget->handler/content";
+		} else {
+			elgg_deprecated_notice("widgets use content as the display view", 1.8);
+			$view = "widgets/$widget->handler/view";
+		}
+		echo elgg_view($view, array('entity' => $widget));
+	}
+} else {
+	register_error(elgg_echo('widgets:save:failure'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/actions/widgets/upgrade.php b/actions/widgets/upgrade.php
new file mode 100644
index 000000000..0a5cf8d48
--- /dev/null
+++ b/actions/widgets/upgrade.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Upgrade default widgets for Elgg 1.8
+ *
+ * Pre-1.8, default widgets were stored as metadata on a defaultwidgets object.
+ * Now they are stored as widget objects owned by the site.
+ * 
+ * @package Elgg.Core
+ * @subpackage Widgets.Management
+ */
+
+$object = elgg_get_entities(array(
+	'type' => 'object',
+	'subtype' => 'moddefaultwidgets',
+	'limit' => 1,
+));
+
+if (!$object) {
+	forward(REFERER);
+}
+
+$object = $object[0];
+
+$site = elgg_get_site_entity();
+
+$ia = elgg_set_ignore_access(true);
+foreach (array('profile', 'dashboard') as $context) {
+	if (isset($object->$context)) {
+		elgg_push_context($context);
+		elgg_push_context('default_widgets');
+		elgg_push_context('widgets');
+
+		// deserialize the widget information
+		list($left, $middle, $right) = split('%%', $object->$context);
+		$left_widgets = split('::', $left);
+		$middle_widgets = split('::', $middle);
+		$right_widgets = split('::', $right);
+
+		// 1st column is right column in default theme
+		$widgets = array(
+			1 => array_reverse($right_widgets),
+			2 => array_reverse($middle_widgets),
+			3 => array_reverse($left_widgets),
+		);
+
+		foreach ($widgets as $column => $column_widgets) {
+			foreach ($column_widgets as $handler) {
+				$guid = elgg_create_widget($site->getGUID(), $handler, $context);
+				if ($guid) {
+					$widget = get_entity($guid);
+					$widget->move($column, 0);
+				}
+			}
+		}
+
+		elgg_pop_context();
+		elgg_pop_context();
+		elgg_pop_context();
+	}
+}
+elgg_set_ignore_access($ia);
+
+$object->delete();
+system_message(elgg_echo('upgrade:core'));
+forward(REFERER);
diff --git a/documentation/coding_standards/best_practices.txt b/documentation/coding_standards/best_practices.txt
new file mode 100644
index 000000000..df04aa845
--- /dev/null
+++ b/documentation/coding_standards/best_practices.txt
@@ -0,0 +1,60 @@
+*** CODING BEST PRACTICES ***
+
+The following best practices make code easier to read, easier to maintain,
+and easier to debug.  Consistent use of these guidelines means less guess
+work for developers, which means happier, more productive developers.
+
+* 	Adhere to "Don't Repeat Yourself" (DRY) principles of code design and
+	organization. If you are copy-and-pasting code YOU ARE DOING SOMETHING WRONG.
+	If you find a block of code that you want to use multiple times, make a
+	function.  If you find views that are identical except for a single value,
+	pull it out into a generic view that takes an option.
+
+* 	Whitespace is free.  Don't be afraid to use it to separate blocks of code.
+	Use a single space to separate function params and string concatenation.
+
+* 	Use self-documenting variable names.  $group_guids is better than $array.
+
+*   Use "positive" variable names. Prefer `$enable = true` to `$disable = false`.
+
+* 	Functions returning an array should return an empty array instead of FALSE
+	on no results.
+
+* 	Functions not throwing an exception on error should return FALSE upon
+	failure.
+
+* 	Functions returning only boolean should be prefaced with is_ or has_ (eg,
+	elgg_is_logged_in(), elgg_has_access_to_entity()).
+
+* 	Ternary syntax is acceptable for single-line, non-embedded statements.
+
+* 	Use comments effectively.  Good comments describe the "why."  Good code
+	describes the "how."  Ex:
+		Not a very useful comment:
+
+		// increment $i only when the entity is marked as active.
+		foreach($entities as $entity) {
+			if ($entity->active == TRUE) {
+				$i++;
+			}
+		}
+
+		Useful comment:
+
+		// find the next index for inserting a new active entity.
+		foreach($entities as $entity) {
+			if ($entity->active == TRUE) {
+				$i++;
+			}
+		}
+
+* 	Use commit messages effectively.  Be concise and meaningful. Ex:
+		Not meaningful:
+		Small fix to groups.
+
+		Meaningful:
+		Fixes #1234: Added missing ) that caused a WSOD on group profile page
+		when logged out.
+
+* 	Commit effectively: Err on the side of atomic commits.  One revision with
+	many changes is scary.
diff --git a/documentation/coding_standards/css_coding_standards.txt b/documentation/coding_standards/css_coding_standards.txt
new file mode 100644
index 000000000..195ca345b
--- /dev/null
+++ b/documentation/coding_standards/css_coding_standards.txt
@@ -0,0 +1,67 @@
+*** CSS CODING STANDARDS ***
+
+* 	Use shorthand where possible:
+		Bad:
+		background-color: #333333;
+		background-image:  url(...);
+		background-repeat:  repeat-x;
+		background-position:  left 10px;
+		padding: 2px 9px 2px 9px;
+
+		Good:
+		background: #333 url(...) repeat-x left 10px;
+		padding: 2px 9px;
+
+* 	Use hyphens as separators in classes/ids, not underscores:
+		Bad:
+		.example_class
+
+		Good:
+		.example-class
+
+* 	One property per line
+		Bad:
+		color: white;font-size: smaller;
+
+		Good:
+		color: white;
+		font-size: smaller;
+
+* 	Property declarations should be spaced like so: `property: value;`
+		Bad:
+		color:value;
+		color :value;
+		color : value;
+
+		Good:
+		color: value;
+
+* 	Group vendor-prefixes for the same property together:
+* 	Longest vendor-prefixed version first:
+* 	Always include non-vendor-prefixed version:
+* 	Put an extra newline between vendor-prefixed groups and other properties:
+		Bad:
+		-moz-border-radius: 5px;
+		border: 1px solid #999999;
+		-webkit-border-radius: 5px;
+		width: auto;
+
+		Good:
+		border: 1px solid #999999;
+
+		-webkit-border-radius: 5px;
+		-moz-border-radius: 5px;
+		border-radius: 5px;
+
+		width: auto;
+
+* 	Group declarations of subproperties:
+		Bad:
+		background-color: white;
+		color: #0054A7;
+		background-position: 2px -257px;
+
+		Good:
+		background-color: white;
+		background-position: 2px -257px;
+		color: #0054A7;
diff --git a/documentation/coding_standards/deprecation.txt b/documentation/coding_standards/deprecation.txt
new file mode 100644
index 000000000..370090138
--- /dev/null
+++ b/documentation/coding_standards/deprecation.txt
@@ -0,0 +1,36 @@
+*** DEPRECATING APIs ***
+
+Occasionally, functions and classes must be deprecated in favor of newer
+replacements.  Since 3rd party plugin authors rely on a consistent API,
+backward compatibility must be maintained, but will not be maintained
+indefinitely as plugin authors are expected to properly update their
+plugins.  In order to maintain backward compatibility, deprecated APIs will
+follow these guidelines:
+
+* 	Incompatible API changes cannot occur between bugfix versions
+	(1.6.0 - 1.6.1).
+
+* 	API changes between minor versions (1.6 - 1.7) must maintain backward
+	compatibility for at least 2 minor versions.  (1.7 and 1.8. See
+	procedures, below.)
+
+* 	Bugfixes that change the API cannot be included in bugfix versions.
+
+* 	API changes between major versions (1.0 - 2.0) can occur without regard to
+	backward compatibility.
+
+The procedure for deprecating an API is as follows:
+
+* 	The first minor version (1.7) with a deprecated API must include a wrapper
+	function/class (or otherwise appropriate means) to maintain backward
+	compatibility, including any bugs in the original function/class.
+	This compatibility layer uses elgg_deprecated_notice('...', 1.7) to log
+	that the function is deprecated.
+
+* 	The second minor version (1.8) maintains the backward compatibility
+	layer, but elgg_deprecated_notice() will produce a visible warning.
+
+* 	The third minor version (1.9) removes the compatibility layer.  Any use of
+	the deprecated API should be corrected before this.
+
+The general timeline for two minor releases is 8 to 12 months.
diff --git a/documentation/coding_standards/html_best_practices.txt b/documentation/coding_standards/html_best_practices.txt
new file mode 100644
index 000000000..ac2338a77
--- /dev/null
+++ b/documentation/coding_standards/html_best_practices.txt
@@ -0,0 +1 @@
+*** HTML BEST PRACTICES ***
diff --git a/documentation/coding_standards/javascript_best_practices.txt b/documentation/coding_standards/javascript_best_practices.txt
new file mode 100644
index 000000000..9ec1d0a19
--- /dev/null
+++ b/documentation/coding_standards/javascript_best_practices.txt
@@ -0,0 +1 @@
+*** JAVASCRIPT BEST PRACTICES ***
diff --git a/documentation/coding_standards/javascript_coding_standards.txt b/documentation/coding_standards/javascript_coding_standards.txt
new file mode 100644
index 000000000..9939e80ab
--- /dev/null
+++ b/documentation/coding_standards/javascript_coding_standards.txt
@@ -0,0 +1,13 @@
+*** JAVASCRIPT CODING STANDARDS ***
+
+*	Same formatting standards as PHP.
+
+*	All functions should be in the elgg namespace.
+
+*	Function expressions should end with a semi-colon:
+
+	elgg.ui.toggles = function(event) {
+		event.preventDefault();
+		$(target).slideToggle('medium');
+	};
+
diff --git a/documentation/coding_standards/php_best_practices.txt b/documentation/coding_standards/php_best_practices.txt
new file mode 100644
index 000000000..9e4c63483
--- /dev/null
+++ b/documentation/coding_standards/php_best_practices.txt
@@ -0,0 +1 @@
+*** PHP BEST PRACTICES ***
diff --git a/documentation/coding_standards/php_coding_standards.txt b/documentation/coding_standards/php_coding_standards.txt
new file mode 100644
index 000000000..b7adc5dd9
--- /dev/null
+++ b/documentation/coding_standards/php_coding_standards.txt
@@ -0,0 +1,55 @@
+*** PHP CODING STANDARDS ***
+
+These are the coding standards for Elgg.  All core development and bundled
+plugins are required to be in this format. Plugin developers are strongly
+encouraged to adopt these standards.
+
+* 	Unix line endings.
+
+* 	Hard tabs, 4 character tab spacing.
+
+* 	No PHP shortcut tags ( <? or <?= or <% ).
+
+* 	PHPDoc comments on functions and classes (all methods; declared properties
+	when appropriate).
+
+* 	Mandatory wrapped {}s around any code blocks. 
+		Bad:
+		if (true) 
+			foreach($arr as $elem) 
+				echo $elem;
+	
+		Good:
+		if (true) {
+			foreach ($arr as $elem) {
+				echo $elem;
+			}
+		}
+
+* 	Name standalone functions using underscore_character().
+
+* 	Name classes using CamelCase() and methods using lowerCamelCase().
+
+* 	Name globals and constants in ALL_CAPS (ACCESS_FRIENDS, $CONFIG).
+
+* 	Use underscores / camel case to separate standard English words in
+	functions, classes, and methods. (get_default_site(), ElggUser->isLoggedIn()).
+
+* 	Space functions like_this($required, $optional = TRUE).
+
+* 	Space keywords and constructs like this: if (FALSE) { ... }.
+
+* 	Correctly use spaces, quotes, and {}s in strings: 
+		Bad (hard to read, misuse of quotes and {}s): 
+		echo 'Hello, '.$name."!  How is your {$time_of_day}?";
+		
+		Good:
+		echo "Hello, $name!  How is your $time_of_day?"; 
+
+* 	Line lengths should be reasonable.  If you are writing lines over 100 
+	characters on a line, please revise the code.
+
+* 	Use // or /* */ when commenting.
+
+* 	No closing PHP tag (?>) at EOF unless after a heredoc. (Avoids problems with 
+	trailing whitespace. Required after heredoc by PHP.)
diff --git a/documentation/examples/actions/basic.php b/documentation/examples/actions/basic.php
new file mode 100644
index 000000000..926e11b79
--- /dev/null
+++ b/documentation/examples/actions/basic.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Demonstrates adding an annotation through an action
+ *
+ * This action adds a rating annotation to an entity. If this was coming from
+ * a five-star rating tool, the rating would be a number between 0 and 5. The
+ * GUID of the entity being rating is also submitted to the action.
+ */
+
+$rating = get_input('rating');
+$guid = get_input('guid');
+
+$entity = get_entity($guid);
+if (!$entity) {
+	register_error(elgg_echo('rating:failure'));
+	forward(REFERER);
+}
+
+$entity->annotate('rating', $rating);
+
+system_message(elgg_echo('rating:success'));
+forward(REFERER);
diff --git a/documentation/examples/crontab.example b/documentation/examples/crontab.example
new file mode 100644
index 000000000..f25f5cb07
--- /dev/null
+++ b/documentation/examples/crontab.example
@@ -0,0 +1,28 @@
+# Crontab example.
+#
+# This file is an example of triggering Elgg cron events. It hits a URL to
+# trigger the events. For testing, you can simulate the cronjob by loading the
+# URL in a browser.
+#
+# See http://docs.elgg.org/wiki/Cron for more information
+#
+# @author Marcus Povey
+
+# Location of GET (see: http://docs.elgg.org/wiki/What_is_get)
+GET='/usr/bin/GET'
+
+# Location of your site (don't forget the trailing slash!)
+ELGG='http://www.example.com/'
+
+# The crontab
+# Don't edit below this line unless you know what you are doing
+@reboot $GET ${ELGG}cron/reboot/
+* * * * * $GET ${ELGG}cron/minute/
+*/5 * * * * $GET ${ELGG}cron/fiveminute/
+15,30,45,59 * * * * $GET ${ELGG}cron/fifteenmin/
+30,59 * * * * $GET ${ELGG}cron/halfhour/
+@hourly $GET ${ELGG}cron/hourly/
+@daily $GET ${ELGG}cron/daily/
+@weekly $GET ${ELGG}cron/weekly/
+@monthly $GET ${ELGG}cron/monthly/
+@yearly $GET ${ELGG}cron/yearly/
diff --git a/documentation/examples/events/advanced.php b/documentation/examples/events/advanced.php
new file mode 100644
index 000000000..73edea9da
--- /dev/null
+++ b/documentation/examples/events/advanced.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * This snippets demonstrates how returning false changes the normal operation
+ * of Elgg.
+ */
+
+elgg_register_event_handler('create', 'object', 'example_event_handler');
+
+function example_event_handler($event, $type, $object) {
+	// Don't allow any non-admin users to create objects
+	// Returning false from this function will halt the creation of the object.
+	return elgg_is_admin_logged_in();
+}
diff --git a/documentation/examples/events/all.php b/documentation/examples/events/all.php
new file mode 100644
index 000000000..0ad02c1d4
--- /dev/null
+++ b/documentation/examples/events/all.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * If you register an 'all' string for the event name, the handler function will
+ * be called for all events with that name, regardless of event type. The same
+ * can be done for the event type argument. Registering 'all' for both
+ * argyuments results in a handler being called for every event.
+ */
+
+elgg_register_event_handler('all', 'object', 'example_event_handler');
+
+// This function will be called for any event of type 'object'
+function example_event_handler($event, $type, $object) {
+	// check what sort of object is passed
+	if ($object instanceof ElggObject) {
+		$subtype = $object->getSubtype();
+
+		switch ($subtype) {
+			case 'blog':
+			case 'thewire':
+			case 'pages':
+				// prevent these object subtypes from being saved or changed
+				return false;
+			default:
+				return true;
+		}
+
+	}
+
+	return true;
+}
diff --git a/documentation/examples/events/basic.php b/documentation/examples/events/basic.php
new file mode 100644
index 000000000..ca2762344
--- /dev/null
+++ b/documentation/examples/events/basic.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This snippet demonstrates how to register for an event. It dumps the
+ * parameters that the handler receives to the screen. The third argument
+ * of the handler function is an object that is related to the event. For
+ * the 'init', 'system' eveny, it is null.
+ */
+
+elgg_register_event_handler('init', 'system', 'example_event_handler');
+
+function example_event_handler($event, $type, $object) {
+	var_dump($event);
+	var_dump($type);
+	var_dump($object);
+
+	return true;
+}
diff --git a/documentation/examples/events/trigger.php b/documentation/examples/events/trigger.php
new file mode 100644
index 000000000..6ce3a76f0
--- /dev/null
+++ b/documentation/examples/events/trigger.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * These two snippets demonstrates triggering an event and how to register for
+ * that event.
+ */
+
+$object = new ElggObject();
+elgg_trigger_event('test', 'example', $object);
+
+// elsewhere a handler could be registered by saying
+elgg_register_event_handler('test', 'example', 'example_event_handler');
diff --git a/documentation/examples/hooks/advanced.php b/documentation/examples/hooks/advanced.php
new file mode 100644
index 000000000..ca036c46a
--- /dev/null
+++ b/documentation/examples/hooks/advanced.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * This snippet demonstrates how to change the value of a hook. The content
+ * passed into the hook is 'This is some Sample Content.'. After the two hook
+ * handlers are done, the new content is 'This is some $@mple Content.'.
+ */
+
+// the output:page hook is triggered by elgg_view_page().
+elgg_register_plugin_hook_handler('output', 'page', 'example_plugin_hook_handler', 600);
+elgg_register_plugin_hook_handler('output', 'page', 'example_plugin_hook_handler_2', 601);
+
+function example_plugin_hook_handler($hook, $type, $value, $params) {
+	// change a to @
+	$value = str_replace('a', '@', $value);
+
+	return $value;
+}
+
+function example_plugin_hook_handler_2($hook, $type, $value, $params) {
+	// change S to $
+	$value = str_replace('S', '$', $value);
+
+	return $value;
+}
+
+$content = 'This is some Sample Content.';
+
+echo elgg_view_page('Title', $content);
diff --git a/documentation/examples/hooks/all.php b/documentation/examples/hooks/all.php
new file mode 100644
index 000000000..76b562335
--- /dev/null
+++ b/documentation/examples/hooks/all.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * This snippet demonstrates how to register for multiple hooks with the same
+ * type.
+ */
+
+elgg_register_plugin_hook_handler('all', 'system', 'example_plugin_hook_handler');
+
+// This function will be called for any hook of type 'system'
+function example_plugin_hook_handler($hook, $type, $value, $params) {
+	// logic here.
+}
diff --git a/documentation/examples/hooks/basic.php b/documentation/examples/hooks/basic.php
new file mode 100644
index 000000000..734d9e884
--- /dev/null
+++ b/documentation/examples/hooks/basic.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * The handler for a plugin hook receives information about the hook (name and
+ * type), the current value for the hook, and parameters related to the hook.
+ */
+
+elgg_register_plugin_hook_handler('forward', '404', 'example_plugin_hook_handler');
+
+function example_plugin_hook_handler($hook, $type, $value, $params) {
+	var_dump($hook);
+	var_dump($type);
+	var_dump($value);
+	var_dump($params);
+
+	// we are not changing $value so return null
+	return null;
+}
diff --git a/documentation/examples/hooks/trigger.php b/documentation/examples/hooks/trigger.php
new file mode 100644
index 000000000..4216fd6c0
--- /dev/null
+++ b/documentation/examples/hooks/trigger.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * The current value for the hook is passed into the trigger function. Handlers
+ * can change this value. In this snippet, we check if the value of true was
+ * changed by the handler functions.
+ */
+
+$result = elgg_trigger_plugin_hook('get_status', 'example', null, true);
+
+if ($result) {
+	var_dump('Plugin hook says ok!');
+} else {
+	var_dump('Plugin hook says no.');
+}
diff --git a/documentation/examples/plugins/README.txt b/documentation/examples/plugins/README.txt
new file mode 100644
index 000000000..704f56598
--- /dev/null
+++ b/documentation/examples/plugins/README.txt
@@ -0,0 +1,5 @@
+Plugin Skeleton
+=========================
+This directory includes a plugin skeleton to be used as the starting point when
+creating a new plugin. Just create a new directory in /mod/ and copy the files
+and directories into it. Then update the manifest and start coding.
+\ No newline at end of file
diff --git a/documentation/examples/plugins/actions/.gitignore b/documentation/examples/plugins/actions/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/documentation/examples/plugins/actions/.gitignore
diff --git a/documentation/examples/plugins/languages/en.php b/documentation/examples/plugins/languages/en.php
new file mode 100644
index 000000000..35f838560
--- /dev/null
+++ b/documentation/examples/plugins/languages/en.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * The core language file is in /languages/en.php and each plugin has its
+ * language files in a languages directory. To change a string, copy the
+ * mapping into this file.
+ *
+ * For example, to change the blog Tools menu item
+ * from "Blog" to "Rantings", copy this pair:
+ * 			'blog' => "Blog",
+ * into the $mapping array so that it looks like:
+ * 			'blog' => "Rantings",
+ *
+ * Follow this pattern for any other string you want to change. Make sure this
+ * plugin is lower in the plugin list than any plugin that it is modifying.
+ *
+ * If you want to add languages other than English, name the file according to
+ * the language's ISO 639-1 code: http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
+ */
+
+$mapping = array(
+	'string:here' => 'Display string here',
+);
+
+add_translation('en', $mapping);
diff --git a/documentation/examples/plugins/manifest.xml b/documentation/examples/plugins/manifest.xml
new file mode 100644
index 000000000..e31624432
--- /dev/null
+++ b/documentation/examples/plugins/manifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>My Plugin</name>
+	<author>My Name</author>
+	<version>1.0</version>
+	<description>This is a description of my plugin and its features.</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>(C) My Name or Company 2012</copyright>
+	<license>GNU General Public License version 2</license>
+
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+
+	<category>communication</category>
+
+</plugin_manifest>
diff --git a/documentation/examples/plugins/start.php b/documentation/examples/plugins/start.php
new file mode 100644
index 000000000..3af50ce38
--- /dev/null
+++ b/documentation/examples/plugins/start.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Describe plugin here
+ */
+
+elgg_register_event_handler('init', 'system', 'my_plugin_init');
+
+function my_plugin_init() {
+	// Rename this function based on the name of your plugin and update the
+	// elgg_register_event_handler() call accordingly
+
+	// Register a script to handle (usually) a POST request (an action)
+	$base_dir = elgg_get_plugins_path() . 'my_plugin/actions/my_plugin';
+	elgg_register_action('my_plugin', "$base_dir/my_action.php");
+
+	// Extend the main CSS file
+	elgg_extend_view('css/elgg', 'my_plugin/css');
+
+	// Add a menu item to the main site menu
+	$item = new ElggMenuItem('my_plugin', elgg_echo('my_plugin:menu'), 'my_url');
+	elgg_register_menu_item('site', $item);
+}
diff --git a/documentation/examples/plugins/views/default/.gitignore b/documentation/examples/plugins/views/default/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/documentation/examples/plugins/views/default/.gitignore
diff --git a/documentation/info/config.php b/documentation/info/config.php
new file mode 100644
index 000000000..b45428477
--- /dev/null
+++ b/documentation/info/config.php
@@ -0,0 +1,430 @@
+<?php
+/**
+ * Stub info for $CONFIG global options.
+ *
+ * @tip Plugins should never use the $CONFIG array directly.
+ *
+ * @package Elgg.Core
+ * @subpackage Configuration
+ */
+
+/**
+ * Event information for the events subsystem.
+ *
+ * Events are added with {@link elgg_register_event_handler()} and
+ * can be removed in >= 1.8 with {@link elgg_unregister_event_handler()}.
+ *
+ * Events are stored as a multidimensional array in the format:
+ * <code>
+ * $CONFIG->events[str $event_name][str $event_type][int priority] = str callback_function
+ * </code>
+ *
+ * @global array $CONFIG->events
+ * @name $CONFIG->events
+ * @see events()
+ * @see elgg_register_event_handler()
+ * @see elgg_unregister_event_handler()
+ * @see elgg_trigger_event()
+ */
+$CONFIG->events;
+
+/**
+ * Plugin Hook information for the plugin hooks subsystem.
+ *
+ * Hooks are added with {@link elgg_register_plugin_hook_handler()} and
+ * can be removed in >= 1.8 with {@link elgg_unregister_plugin_hook_handler()}.
+ *
+ * Hooks are stored as a multidimensional array in the format:
+ * <code>
+ * $CONFIG->hooks[str $hook_name][str $hook_type][int priority] = str callback_function
+ * </code>
+ *
+ * @global array $CONFIG->hooks
+ * @see elgg_register_plugin_hook_handler()
+ * @see elgg_unregister_plugin_hook_handler()
+ * @see elgg_trigger_plugin_hook()
+ */
+$CONFIG->hooks;
+
+/**
+ * Paths to scan for autoloading languages.
+ *
+ * Languages are automatically loaded for the site or
+ * user's default language.  Plugins can extend or override strings.
+ * language_paths is an array of paths to scan for PHP files matching
+ * the default language.  The order of paths is determined by the plugin load order,
+ * with later entries overriding earlier.  Language files within these paths are
+ * named as the two-letter ISO 639-1 country codes for the language they represent.
+ *
+ * Language paths are stored as array keys in the format:
+ * <code>
+ * $CONFIG->language_paths[str $language_path] = true
+ * </code>
+ *
+ * @link http://en.wikipedia.org/wiki/ISO_639-1
+ * @see register_language()
+ * @global array $CONFIG->language_paths
+ */
+$CONFIG->language_paths;
+
+
+/**
+ * String translations for the current language.
+ *
+ * Elgg uses a key-based system for string internationalization, which
+ * is accessed with {@link elgg_echo()}.
+ *
+ * Translations are stored as an array in the following format:
+ * <code>
+ * $CONFIG->translations[str $language_code][str $string_key] = str 'Translated Language String';
+ * </code>
+ *
+ * @see register_translation()
+ * @see elgg_echo()
+ * @global array $CONFIG->translations
+ */
+$CONFIG->translations;
+
+/**
+ * Stores input used by {@link set_input()} and {@link get_input()}.
+ *
+ * @global array $CONFIG->input
+ */
+$CONFIG->input;
+
+/**
+ * An array of metadata names to be used as tags.
+ *
+ * Because tags are simply names of meatdata, This is used
+ * in search to prevent data exposure by searching on
+ * arbitrary metadata.
+ *
+ * @global array $CONFIG->registered_tag_metadata_names
+ */
+$CONFIG->registered_tag_metadata_names;
+
+/**
+ * An associative array of page handlers and their function names.
+ *
+ * Page handlers must be registered by {@link elgg_register_page_handler()} and
+ * will be dispatched by {@link engine/handlers/pagehandler.php} to the
+ * proper function.
+ *
+ *  @global array $CONFIG->pagehandler
+ */
+$CONFIG->pagehandler;
+
+/**
+ * An object holding valid widgets and their configurations.
+ *
+ * This object stores the valid context for widgets, and the handlers
+ * registered, as well as a description of the widget.
+ *
+ * Widgets are added with {@link add_widget_type()}.
+ *
+ *  @global stdClass $CONFIG->widgets
+ */
+$CONFIG->widgets;
+
+/**
+ * The full path where Elgg is installed.
+ *
+ * @global string $CONFIG->path;
+ */
+$CONFIG->path;
+
+/**
+ * The full path for core views.
+ *
+ * @global string $CONFIG->viewpath
+ */
+$CONFIG->viewpath;
+
+/**
+ * The full path where plugins are stored.
+ *
+ * @global string $CONFIG->pluginspath
+ */
+$CONFIG->pluginspath;
+
+/**
+ * The full URL where Elgg is installed
+ *
+ * @global string $CONFIG->wwwroot
+ */
+$CONFIG->wwwroot;
+
+/**
+ * The full URL where Elgg is installed
+ *
+ * @global string $CONFIG->wwwroot
+ */
+$CONFIG->url;
+
+/**
+ * The name of the site as defined in the config table.
+ *
+ * @global string $CONFIG->sitename
+ */
+$CONFIG->sitename;
+
+/**
+ * The current language for either the site or the user.
+ *
+ * @global $CONFIG->language
+ */
+$CONFIG->language;
+
+/**
+ * Is the site fully installed
+ *
+ * @global bool $CONFIG->installed
+ */
+$CONFIG->installed;
+
+/**
+ * The guid of the current site object.
+ *
+ * @global int $CONFIG->site_id
+ */
+$CONFIG->site_id;
+
+/**
+ * The guid of the current site object.
+ *
+ * @global int $CONFIG->site_id
+ */
+$CONFIG->site_guid;
+
+/**
+ * The current site object.
+ *
+ * @global ElggSite $CONFIG->site
+ */
+$CONFIG->site;
+
+/**
+ * The full path to the data directory.
+ *
+ * @global string $CONFIG->dataroot
+ */
+$CONFIG->dataroot;
+
+/**
+ * Is simplecache enabled?
+ *
+ * @global string $CONFIG->simplecache_enabled
+ */
+$CONFIG->simplecache_enabled;
+
+/**
+ * Is the system cache enabled
+ *
+ * @global string $CONFIG->system_cache_enabled
+ */
+$CONFIG->system_cache_enabled;
+
+/**
+ * The site description from the current site object.
+ *
+ * @global string $CONFIG->sitedescription
+ */
+$CONFIG->sitedescription;
+
+/**
+ * The site email from the current site object.
+ *
+ * @global string $CONFIG->siteemail
+ */
+$CONFIG->siteemail;
+
+/**
+ * The current view type
+ *
+ * View types determin the location of view files that are used to draw pages.
+ * They are set system-wide by the $_REQUEST['view'].  If a view type is manually
+ * set in settings.php or through a function hooking to the {@elgg_hook
+ *
+ * @warning This is the current view type used to determine where to load views.
+ * Don't confuse this with the current view.
+ *
+ * @global string $CONFIG->view
+ */
+$CONFIG->view;
+
+/**
+ * Default access as defined in the config table for the current site.
+ *
+ * @global string $CONFIG->default_access
+ */
+$CONFIG->default_access;
+
+/**
+ * Is registration enabled?
+ *
+ * @global bool $CONFIG->allow_registration
+ */
+$CONFIG->allow_registration;
+
+/**
+ * Is current site in walled garden mode?
+ *
+ * @global bool $CONFIG->walled_garden
+ */
+$CONFIG->walled_garden;
+
+/**
+ * Are users allow to enter their own default access levels
+ *
+ * @global bool $CONFIG->allow_user_default_access
+ */
+$CONFIG->allow_user_default_access;
+
+/**
+ * A list of feature URLs for the main site menu.
+ *
+ * These links are added via the admin interface.
+ *
+ * @global string $CONFIG->menu_items_featured_urls
+ */
+$CONFIG->menu_items_featured_urls;
+
+/**
+ * The custom menu items entered in the administration.
+ *
+ * @global string $CONFIG->menu_items_custom_items
+ */
+$CONFIG->menu_items_custom_items;
+
+/**
+ * A list of registered actions, their file locations, and access permissions.
+ *
+ * @global array $CONFIG->actions
+ */
+$CONFIG->actions;
+
+/**
+ * Holds information about views.
+ *
+ * @global object $CONFIG->views
+ */
+$CONFIG->views;
+
+/**
+ * A list of views to cache in the simple cache.
+ *
+ * @global object $CONFIG->views->simplecache
+ */
+$CONFIG->views->simplecache;
+
+/**
+ * A list of views and the top level views directory to search for the view in.
+ *
+ * @note Views are stored as the key and the top level view location is stored as the value.
+ * The current viewtype {@link $CONFIG->view} is used to determin which directory under the entry
+ * in $CONFIG->views->location to search.  View names are automatically appened a '.php' extension.
+ *
+ * @global object $CONFIG->views->locations
+ */
+$CONFIG->views->locations;
+
+
+/**
+ * A list of valid view types as discovered.
+ *
+ * @global array $CONFIG->view_types
+ */
+$CONFIG->view_types;
+
+/**
+ * A list of plugins and their load order
+ *
+ * @global string $CONFIG->pluginlistcache
+ */
+$CONFIG->pluginlistcache;
+
+/**
+ * Holds URL handler information for ElggExtender objects.
+ *
+ * @global array $CONFIG->extender_url_handler
+ */
+$CONFIG->extender_url_handler;
+
+/**
+ * A list of registered entities and subtypes.  Used in search.
+ *
+ * @global array $CONFIG->registered_entities
+ */
+$CONFIG->registered_entities;
+
+/**
+ * A list of URL handlers for {@link ElggEntity::getURL()}
+ *
+ * @global array $CONFIG->entity_url_handler
+ */
+$CONFIG->entity_url_handler;
+
+/**
+ * A list of entity types and subtypes that have metadata whose access permission
+ * can be changed independently of the main object.  {@link register_metadata_as_indepenent()}
+ *
+ * @global string $CONFIG->independents
+ */
+$CONFIG->independents;
+
+/**
+ * Holds items for all submenus.
+ *
+ * @global string $CONFIG->submenu_items
+ */
+$CONFIG->submenu_items;
+
+/**
+ * Holds the service handlers as registered by {@register_service_handler()}
+ *
+ * @global array $CONFIG->servicehandler
+ */
+$CONFIG->servicehandler;
+
+/**
+ * A list of stop works for search.  Not currently used.
+ *
+ * @global array $CONFIG->wordblacklist
+ * @todo currently unused.
+ */
+$CONFIG->wordblacklist;
+
+/**
+ * A list of menu contexts for menus registered with {@link add_menu()}.  Not currently used.
+ *
+ * @global array $CONFIG->menucontexts
+ */
+$CONFIG->menucontexts;
+
+/**
+ * A list of registers and their children added via {@add_to_register()}.  Used only for menus.
+ *
+ * @global string $CONFIG->registers
+ */
+$CONFIG->registers;
+
+/**
+ * A list of objects that can emit notifications.  {@link register_notification_object()}
+ *
+ * @global array $CONFIG->register_objects
+ */
+$CONFIG->register_objects;
+
+/**
+ * Holds available group tools options.  Added with {@link add_group_tool_option()}
+ *
+ * @global array $CONFIG->group_tool_options
+ */
+$CONFIG->group_tool_options;
+
+/**
+ * The last cache time for the current viewtype.  Used in the generation of CSS and JS links.
+ *
+ * @global string $CONFIG->lastcache
+ */
+$CONFIG->lastcache;
+\ No newline at end of file
diff --git a/documentation/info/manifest.xml b/documentation/info/manifest.xml
new file mode 100644
index 000000000..4fd4be8ce
--- /dev/null
+++ b/documentation/info/manifest.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>My Plugin</name>
+	<author>Elgg</author>
+	<version>1.0</version>
+	<blurb>A concise description.</blurb>
+	<description>This is a longer, more interesting description of my plugin, its features, and other important information.</description>
+	<website>http://www.elgg.org/</website>
+	<repository>https://github.com/Elgg/Elgg</repository>
+	<bugtracker>https://github.com/Elgg/Elgg/issues</bugtracker>
+	<donations>http://elgg.org/supporter.php</donations>
+	<copyright>(C) Elgg 2011</copyright>
+	<license>GNU General Public License version 2</license>
+
+	<requires>
+		<type>elgg_version</type>
+		<version>2009030802</version>
+	</requires>
+
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+
+	<screenshot>
+		<description>An example screenshot</description>
+		<path>graphics/plugin_ss1.png</path>
+	</screenshot>
+
+	<screenshot>
+		<description>Another screenshot</description>
+		<path>graphics/plugin_ss2.png</path>
+	</screenshot>
+
+	<category>admin</category>
+	<category>api</category>
+
+	<requires>
+		<type>php_extension</type>
+		<name>gd</name>
+	</requires>
+
+	<requires>
+		<type>php_ini</type>
+		<name>short_open_tag</name>
+		<value>off</value>
+	</requires>
+
+	<requires>
+		<type>php_extension</type>
+		<name>made_up</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>fake_plugin</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>profile</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.3</version>
+		<comparison>lt</comparison>
+	</requires>
+
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>blog</plugin>
+	</requires>
+
+	<conflicts>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.0</version>
+	</conflicts>
+
+	<provides>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.3</version>
+	</provides>
+
+	<provides>
+		<type>php_extension</type>
+		<name>curl</name>
+		<version>1.0</version>
+	</provides>
+
+</plugin_manifest>
diff --git a/engine/classes/APIException.php b/engine/classes/APIException.php
new file mode 100644
index 000000000..b6e1c347b
--- /dev/null
+++ b/engine/classes/APIException.php
@@ -0,0 +1,11 @@
+<?php
+
+/**
+ * API Exception Stub
+ *
+ * Generic parent class for API exceptions.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class APIException extends Exception {}
diff --git a/engine/classes/CallException.php b/engine/classes/CallException.php
new file mode 100644
index 000000000..22b8f14f5
--- /dev/null
+++ b/engine/classes/CallException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Call Exception Stub
+ *
+ * Generic parent class for Call exceptions
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class CallException extends Exception {}
diff --git a/engine/classes/ClassException.php b/engine/classes/ClassException.php
new file mode 100644
index 000000000..7544f0ec9
--- /dev/null
+++ b/engine/classes/ClassException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Class Exception
+ *
+ * A generic parent class for Class exceptions
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class ClassException extends Exception {}
diff --git a/engine/classes/ClassNotFoundException.php b/engine/classes/ClassNotFoundException.php
new file mode 100644
index 000000000..6a9bcd327
--- /dev/null
+++ b/engine/classes/ClassNotFoundException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Class not found
+ *
+ * Thrown when trying to load a class that doesn't exist.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions
+ */
+class ClassNotFoundException extends ClassException {}
diff --git a/engine/classes/ConfigurationException.php b/engine/classes/ConfigurationException.php
new file mode 100644
index 000000000..3ace5dd4b
--- /dev/null
+++ b/engine/classes/ConfigurationException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Configuration exception
+ *
+ * A generic parent class for Configuration exceptions
+ *
+ * @package    Elgg
+ * @subpackage Exceptions.Stub
+ */
+class ConfigurationException extends Exception {}
diff --git a/engine/classes/CronException.php b/engine/classes/CronException.php
new file mode 100644
index 000000000..86370ef31
--- /dev/null
+++ b/engine/classes/CronException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Cron exception
+ *
+ * A generic parent class for cron exceptions
+ *
+ * @package    Elgg
+ * @subpackage Exceptions.Stub
+ */
+class CronException extends Exception {}
diff --git a/engine/classes/DataFormatException.php b/engine/classes/DataFormatException.php
new file mode 100644
index 000000000..0f28a0902
--- /dev/null
+++ b/engine/classes/DataFormatException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Data format exception
+ * An exception thrown when there is a problem in the format of some data.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class DataFormatException extends Exception {}
diff --git a/engine/classes/DatabaseException.php b/engine/classes/DatabaseException.php
new file mode 100644
index 000000000..6c8f57d7d
--- /dev/null
+++ b/engine/classes/DatabaseException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Database Exception
+ *
+ * A generic parent class for database exceptions
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class DatabaseException extends Exception {}
diff --git a/engine/classes/ElggAccess.php b/engine/classes/ElggAccess.php
new file mode 100644
index 000000000..0aed477fc
--- /dev/null
+++ b/engine/classes/ElggAccess.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Class used to determine if access is being ignored.
+ *
+ * @package    Elgg.Core
+ * @subpackage Access
+ * @access     private
+ * @see        elgg_get_ignore_access()
+ *
+ * @todo       I don't remember why this was required beyond scope concerns.
+ */
+class ElggAccess {
+	/**
+	 * Bypass Elgg's access control if true.
+	 * @var bool
+	 */
+	private $ignore_access;
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Get current ignore access setting.
+	 *
+	 * @return bool
+	 * @deprecated 1.8 Use ElggAccess::getIgnoreAccess()
+	 */
+	public function get_ignore_access() {
+		elgg_deprecated_notice('ElggAccess::get_ignore_access() is deprecated by ElggAccess::getIgnoreAccess()', 1.8);
+		return $this->getIgnoreAccess();
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Get current ignore access setting.
+	 *
+	 * @return bool
+	 */
+	public function getIgnoreAccess() {
+		return $this->ignore_access;
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Set ignore access.
+	 *
+	 * @param bool $ignore Ignore access
+	 *
+	 * @return bool Previous setting
+	 *
+	 * @deprecated 1.8 Use ElggAccess:setIgnoreAccess()
+	 */
+	public function set_ignore_access($ignore = true) {
+		elgg_deprecated_notice('ElggAccess::set_ignore_access() is deprecated by ElggAccess::setIgnoreAccess()', 1.8);
+		return $this->setIgnoreAccess($ignore);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Set ignore access.
+	 *
+	 * @param bool $ignore Ignore access
+	 *
+	 * @return bool Previous setting
+	 */
+	public function setIgnoreAccess($ignore = true) {
+		$prev = $this->ignore_access;
+		$this->ignore_access = $ignore;
+
+		return $prev;
+	}
+}
diff --git a/engine/classes/ElggAnnotation.php b/engine/classes/ElggAnnotation.php
new file mode 100644
index 000000000..175e7049d
--- /dev/null
+++ b/engine/classes/ElggAnnotation.php
@@ -0,0 +1,133 @@
+<?php
+/**
+ * Elgg Annotations
+ *
+ * Annotations allow you to attach bits of information to entities.
+ * They are essentially the same as metadata, but with additional
+ * helper functions.
+ *
+ * @internal Annotations are stored in the annotations table.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Annotations
+ * @link       http://docs.elgg.org/DataModel/Annotations
+ *
+ * @property string $value_type
+ * @property string $enabled
+ */
+class ElggAnnotation extends ElggExtender {
+
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see ElggData::initializeAttributes()
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = 'annotation';
+	}
+
+	/**
+	 * Construct a new annotation object
+	 *
+	 * @param mixed $id The annotation ID or a database row as stdClass object
+	 */
+	function __construct($id = null) {
+		$this->initializeAttributes();
+
+		if (!empty($id)) {
+			// Create from db row
+			if ($id instanceof stdClass) {
+				$annotation = $id;
+
+				$objarray = (array) $annotation;
+				foreach ($objarray as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else {
+				// get an ElggAnnotation object and copy its attributes
+				$annotation = elgg_get_annotation_from_id($id);
+				$this->attributes = $annotation->attributes;
+			}
+		}
+	}
+
+	/**
+	 * Save this instance
+	 *
+	 * @return int an object id
+	 *
+	 * @throws IOException
+	 */
+	function save() {
+		if ($this->id > 0) {
+			return update_annotation($this->id, $this->name, $this->value, $this->value_type,
+				$this->owner_guid, $this->access_id);
+		} else {
+			$this->id = create_annotation($this->entity_guid, $this->name, $this->value,
+				$this->value_type, $this->owner_guid, $this->access_id);
+
+			if (!$this->id) {
+				throw new IOException(elgg_echo('IOException:UnableToSaveNew', array(get_class())));
+			}
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Delete the annotation.
+	 *
+	 * @return bool
+	 */
+	function delete() {
+		elgg_delete_river(array('annotation_id' => $this->id));
+		return elgg_delete_metastring_based_object_by_id($this->id, 'annotations');
+	}
+
+	/**
+	 * Disable the annotation.
+	 *
+	 * @return bool
+	 * @since 1.8
+	 */
+	function disable() {
+		return elgg_set_metastring_based_object_enabled_by_id($this->id, 'no', 'annotations');
+	}
+
+	/**
+	 * Enable the annotation.
+	 *
+	 * @return bool
+	 * @since 1.8
+	 */
+	function enable() {
+		return elgg_set_metastring_based_object_enabled_by_id($this->id, 'yes', 'annotations');
+	}
+
+	/**
+	 * Get a url for this annotation.
+	 *
+	 * @return string
+	 */
+	public function getURL() {
+		return get_annotation_url($this->id);
+	}
+
+	// SYSTEM LOG INTERFACE
+
+	/**
+	 * For a given ID, return the object associated with it.
+	 * This is used by the river functionality primarily.
+	 * This is useful for checking access permissions etc on objects.
+	 *
+	 * @param int $id An annotation ID.
+	 *
+	 * @return ElggAnnotation
+	 */
+	public function getObjectFromID($id) {
+		return elgg_get_annotation_from_id($id);
+	}
+}
diff --git a/engine/classes/ElggAttributeLoader.php b/engine/classes/ElggAttributeLoader.php
new file mode 100644
index 000000000..ffc80b02d
--- /dev/null
+++ b/engine/classes/ElggAttributeLoader.php
@@ -0,0 +1,248 @@
+<?php
+
+/**
+ * Loads ElggEntity attributes from DB or validates those passed in via constructor
+ *
+ * @access private
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel
+ */
+class ElggAttributeLoader {
+
+	/**
+	 * @var array names of attributes in all entities
+	 */
+	protected static $primary_attr_names = array(
+		'guid',
+		'type',
+		'subtype',
+		'owner_guid',
+		'container_guid',
+		'site_guid',
+		'access_id',
+		'time_created',
+		'time_updated',
+		'last_action',
+		'enabled',
+	);
+
+	/**
+	 * @var array names of secondary attributes required for the entity
+	 */
+	protected $secondary_attr_names = array();
+
+	/**
+	 * @var string entity type (not class) required for fetched primaries
+	 */
+	protected $required_type;
+
+	/**
+	 * @var array
+	 */
+	protected $initialized_attributes;
+
+	/**
+	 * @var string class of object being loaded
+	 */
+	protected $class;
+
+	/**
+	 * @var bool should access control be considered when fetching entity?
+	 */
+	public $requires_access_control = true;
+
+	/**
+	 * @var callable function used to load attributes from {prefix}entities table
+	 */
+	public $primary_loader = 'get_entity_as_row';
+
+	/**
+	 * @var callable function used to load attributes from secondary table
+	 */
+	public $secondary_loader = '';
+
+	/**
+	 * @var callable function used to load all necessary attributes
+	 */
+	public $full_loader = '';
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $class             class of object being loaded
+	 * @param string $required_type     entity type this is being used to populate
+	 * @param array  $initialized_attrs attributes after initializeAttributes() has been run
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($class, $required_type, array $initialized_attrs) {
+		if (!is_string($class)) {
+			throw new InvalidArgumentException('$class must be a class name.');
+		}
+		$this->class = $class;
+
+		if (!is_string($required_type)) {
+			throw new InvalidArgumentException('$requiredType must be a system entity type.');
+		}
+		$this->required_type = $required_type;
+
+		$this->initialized_attributes = $initialized_attrs;
+		unset($initialized_attrs['tables_split'], $initialized_attrs['tables_loaded']);
+		$all_attr_names = array_keys($initialized_attrs);
+		$this->secondary_attr_names = array_diff($all_attr_names, self::$primary_attr_names);
+	}
+
+	/**
+	 * Get primary attributes missing that are missing
+	 *
+	 * @param stdClass $row Database row
+	 * @return array
+	 */
+	protected function isMissingPrimaries($row) {
+		return array_diff(self::$primary_attr_names, array_keys($row)) !== array();
+	}
+
+	/**
+	 * Get secondary attributes that are missing
+	 *
+	 * @param stdClass $row Database row
+	 * @return array
+	 */
+	protected function isMissingSecondaries($row) {
+		return array_diff($this->secondary_attr_names, array_keys($row)) !== array();
+	}
+
+	/**
+	 * Check that the type is correct
+	 *
+	 * @param stdClass $row Database row
+	 * @return void
+	 * @throws InvalidClassException
+	 */
+	protected function checkType($row) {
+		if ($row['type'] !== $this->required_type) {
+			$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($row['guid'], $this->class));
+			throw new InvalidClassException($msg);
+		}
+	}
+
+	/**
+	 * Get all required attributes for the entity, validating any that are passed in. Returns empty array
+	 * if can't be loaded (Check $failure_reason).
+	 *
+	 * This function splits loading between "primary" attributes (those in {prefix}entities table) and
+	 * "secondary" attributes (e.g. those in {prefix}objects_entity), but can load all at once if a
+	 * combined loader is available.
+	 *
+	 * @param mixed $row a row loaded from DB (array or stdClass) or a GUID
+	 * @return array will be empty if failed to load all attributes (access control or entity doesn't exist)
+	 *
+	 * @throws InvalidArgumentException|LogicException|IncompleteEntityException
+	 */
+	public function getRequiredAttributes($row) {
+		if (!is_array($row) && !($row instanceof stdClass)) {
+			// assume row is the GUID
+			$row = array('guid' => $row);
+		}
+		$row = (array) $row;
+		if (empty($row['guid'])) {
+			throw new InvalidArgumentException('$row must be or contain a GUID');
+		}
+
+		// these must be present to support isFullyLoaded()
+		foreach (array('tables_split', 'tables_loaded') as $key) {
+			if (isset($this->initialized_attributes[$key])) {
+				$row[$key] = $this->initialized_attributes[$key];
+			}
+		}
+
+		$was_missing_primaries = $this->isMissingPrimaries($row);
+		$was_missing_secondaries = $this->isMissingSecondaries($row);
+
+		// some types have a function to load all attributes at once, it should be faster
+		if (($was_missing_primaries || $was_missing_secondaries) && is_callable($this->full_loader)) {
+			$fetched = (array) call_user_func($this->full_loader, $row['guid']);
+			if (!$fetched) {
+				return array();
+			}
+			$row = array_merge($row, $fetched);
+			$this->checkType($row);
+		} else {
+			if ($was_missing_primaries) {
+				if (!is_callable($this->primary_loader)) {
+					throw new LogicException('Primary attribute loader must be callable');
+				}
+				if ($this->requires_access_control) {
+					$fetched = (array) call_user_func($this->primary_loader, $row['guid']);
+				} else {
+					$ignoring_access = elgg_set_ignore_access();
+					$fetched = (array) call_user_func($this->primary_loader, $row['guid']);
+					elgg_set_ignore_access($ignoring_access);
+				}
+				if (!$fetched) {
+					return array();
+				}
+				$row = array_merge($row, $fetched);
+			}
+
+			// We must test type before trying to load the secondaries so that InvalidClassException
+			// gets thrown. Otherwise the secondary loader will fail and return false.
+			$this->checkType($row);
+
+			if ($was_missing_secondaries) {
+				if (!is_callable($this->secondary_loader)) {
+					throw new LogicException('Secondary attribute loader must be callable');
+				}
+				$fetched = (array) call_user_func($this->secondary_loader, $row['guid']);
+				if (!$fetched) {
+					if ($row['type'] === 'site') {
+						// A special case is needed for sites: When vanilla ElggEntities are created and
+						// saved, these are stored w/ type "site", but with no sites_entity row. These
+						// are probably only created in the unit tests.
+						// @todo Don't save vanilla ElggEntities with type "site"
+
+						$row = $this->filterAddedColumns($row);
+						$row['guid'] = (int) $row['guid'];
+						return $row;
+					}
+					throw new IncompleteEntityException("Secondary loader failed to return row for {$row['guid']}");
+				}
+				$row = array_merge($row, $fetched);
+			}
+		}
+
+		$row = $this->filterAddedColumns($row);
+
+		// Note: If there are still missing attributes, we're running on a 1.7 or earlier schema. We let
+		// this pass so the upgrades can run.
+
+		// guid needs to be an int  https://github.com/elgg/elgg/issues/4111
+		$row['guid'] = (int) $row['guid'];
+
+		return $row;
+	}
+
+	/**
+	 * Filter out keys returned by the query which should not appear in the entity's attributes
+	 *
+	 * @param array $row All columns from the query
+	 * @return array Columns acceptable for the entity's attributes
+	 */
+	protected function filterAddedColumns($row) {
+		// make an array with keys as acceptable attribute names
+		$acceptable_attrs = self::$primary_attr_names;
+		array_splice($acceptable_attrs, count($acceptable_attrs), 0, $this->secondary_attr_names);
+		$acceptable_attrs = array_combine($acceptable_attrs, $acceptable_attrs);
+
+		// @todo remove these when #4584 is in place
+		$acceptable_attrs['tables_split'] = true;
+		$acceptable_attrs['tables_loaded'] = true;
+
+		foreach ($row as $key => $val) {
+			if (!isset($acceptable_attrs[$key])) {
+				unset($row[$key]);
+			}
+		}
+		return $row;
+	}
+}
diff --git a/engine/classes/ElggAutoP.php b/engine/classes/ElggAutoP.php
new file mode 100644
index 000000000..05842d1b2
--- /dev/null
+++ b/engine/classes/ElggAutoP.php
@@ -0,0 +1,336 @@
+<?php
+
+/**
+ * Create wrapper P and BR elements in HTML depending on newlines. Useful when
+ * users use newlines to signal line and paragraph breaks. In all cases output
+ * should be well-formed markup.
+ *
+ * In DIV elements, Ps are only added when there would be at
+ * least two of them.
+ * 
+ * @package    Elgg.Core
+ * @subpackage Output
+ */
+class ElggAutoP {
+
+	public $encoding = 'UTF-8';
+
+	/**
+	 * @var DOMDocument
+	 */
+	protected $_doc = null;
+
+	/**
+	 * @var DOMXPath
+	 */
+	protected $_xpath = null;
+
+	protected $_blocks = 'address article area aside blockquote caption col colgroup dd 
+		details div dl dt fieldset figure figcaption footer form h1 h2 h3 h4 h5 h6 header 
+		hr hgroup legend map math menu nav noscript p pre section select style summary
+		table tbody td tfoot th thead tr ul ol option li';
+
+	/**
+	 * @var array
+	 */
+	protected $_inlines = 'a abbr audio b button canvas caption cite code command datalist
+		del dfn em embed i iframe img input ins kbd keygen label map mark meter object
+		output progress q rp rt ruby s samp script select small source span strong style
+		sub sup textarea time var video wbr';
+
+	/**
+	 * Descend into these elements to add Ps
+	 *
+	 * @var array
+	 */
+	protected $_descendList = 'article aside blockquote body details div footer form
+		header section';
+
+	/**
+	 * Add Ps inside these elements
+	 *
+	 * @var array
+	 */
+	protected $_alterList = 'article aside blockquote body details div footer header
+		section';
+
+	/** @var string */
+	protected $_unique = '';
+
+	/**
+	 * Constructor
+	 */
+	public function __construct() {
+		$this->_blocks = preg_split('@\\s+@', $this->_blocks);
+		$this->_descendList = preg_split('@\\s+@', $this->_descendList);
+		$this->_alterList = preg_split('@\\s+@', $this->_alterList);
+		$this->_inlines = preg_split('@\\s+@', $this->_inlines);
+		$this->_unique = md5(__FILE__);
+	}
+
+	/**
+	 * Intance of class for singleton pattern.
+	 * @var ElggAutoP
+	 */
+	private static $instance;
+	
+	/**
+	 * Singleton pattern.
+	 * @return ElggAutoP
+	 */
+	public static function getInstance() {
+		$className = __CLASS__;
+		if (!(self::$instance instanceof $className)) {
+			self::$instance = new $className();
+		}
+		return self::$instance;
+	}
+	
+	/**
+	 * Create wrapper P and BR elements in HTML depending on newlines. Useful when
+	 * users use newlines to signal line and paragraph breaks. In all cases output
+	 * should be well-formed markup.
+	 *
+	 * In DIV, LI, TD, and TH elements, Ps are only added when their would be at
+	 * least two of them.
+	 *
+	 * @param string $html snippet
+	 * @return string|false output or false if parse error occurred
+	 */
+	public function process($html) {
+		// normalize whitespace
+		$html = str_replace(array("\r\n", "\r"), "\n", $html);
+
+		// allows preserving entities untouched
+		$html = str_replace('&', $this->_unique . 'AMP', $html);
+
+		$this->_doc = new DOMDocument();
+
+		// parse to DOM, suppressing loadHTML warnings
+		// http://www.php.net/manual/en/domdocument.loadhtml.php#95463
+		libxml_use_internal_errors(true);
+
+		// Do not load entities. May be unnecessary, better safe than sorry
+		$disable_load_entities = libxml_disable_entity_loader(true);
+
+		if (!$this->_doc->loadHTML("<html><meta http-equiv='content-type' " 
+				. "content='text/html; charset={$this->encoding}'><body>{$html}</body>"
+				. "</html>")) {
+
+			libxml_disable_entity_loader($disable_load_entities);
+			return false;
+		}
+
+		libxml_disable_entity_loader($disable_load_entities);
+
+		$this->_xpath = new DOMXPath($this->_doc);
+		// start processing recursively at the BODY element
+		$nodeList = $this->_xpath->query('//body[1]');
+		$this->addParagraphs($nodeList->item(0));
+
+		// serialize back to HTML
+		$html = $this->_doc->saveHTML();
+
+		// Note: we create <autop> elements, which will later be converted to paragraphs
+
+		// split AUTOPs into multiples at /\n\n+/
+		$html = preg_replace('/(' . $this->_unique . 'NL){2,}/', '</autop><autop>', $html);
+		$html = str_replace(array($this->_unique . 'BR', $this->_unique . 'NL', '<br>'), 
+				'<br />',
+				$html);
+		$html = str_replace('<br /></autop>', '</autop>', $html);
+
+		// re-parse so we can handle new AUTOP elements
+
+		// Do not load entities. May be unnecessary, better safe than sorry
+		$disable_load_entities = libxml_disable_entity_loader(true);
+
+		if (!$this->_doc->loadHTML($html)) {
+			libxml_disable_entity_loader($disable_load_entities);
+			return false;
+		}
+
+		libxml_disable_entity_loader($disable_load_entities);
+
+		// must re-create XPath object after DOM load
+		$this->_xpath = new DOMXPath($this->_doc);
+
+		// strip AUTOPs that only have comments/whitespace
+		foreach ($this->_xpath->query('//autop') as $autop) {
+			/* @var DOMElement $autop */
+			$hasContent = false;
+			if (trim($autop->textContent) !== '') {
+				$hasContent = true;
+			} else {
+				foreach ($autop->childNodes as $node) {
+					if ($node->nodeType === XML_ELEMENT_NODE) {
+						$hasContent = true;
+						break;
+					}
+				}
+			}
+			if (!$hasContent) {
+				// mark to be later replaced w/ preg_replace (faster than moving nodes out)
+				$autop->setAttribute("r", "1");
+			}
+		}
+
+		// If a DIV contains a single AUTOP, remove it
+		foreach ($this->_xpath->query('//div') as $el) {
+			/* @var DOMElement $el */
+			$autops = $this->_xpath->query('./autop', $el);
+			if ($autops->length === 1) {
+				$firstAutop = $autops->item(0);
+				/* @var DOMElement $firstAutop */
+				$firstAutop->setAttribute("r", "1");
+			}
+		}
+
+		$html = $this->_doc->saveHTML();
+
+		// trim to the contents of BODY
+		$bodyStart = strpos($html, '<body>');
+		$bodyEnd = strpos($html, '</body>', $bodyStart + 6);
+		$html = substr($html, $bodyStart + 6, $bodyEnd - $bodyStart - 6);
+		
+		// strip AUTOPs that should be removed
+		$html = preg_replace('@<autop r="1">(.*?)</autop>@', '\\1', $html);
+
+		// commit to converting AUTOPs to Ps
+		$html = str_replace('<autop>', "\n<p>", $html);
+		$html = str_replace('</autop>', "</p>\n", $html);
+		
+		$html = str_replace('<br>', '<br />', $html);
+		$html = str_replace($this->_unique . 'AMP', '&', $html);
+		return $html;
+	}
+
+	/**
+	 * Add P and BR elements as necessary
+	 *
+	 * @param DOMElement $el DOM element
+	 * @return void
+	 */
+	protected function addParagraphs(DOMElement $el) {
+		// no need to call recursively, just queue up
+		$elsToProcess = array($el);
+		$inlinesToProcess = array();
+		while ($el = array_shift($elsToProcess)) {
+			// if true, we can alter all child nodes, if not, we'll just call
+			// addParagraphs on each element in the descendInto list
+			$alterInline = in_array($el->nodeName, $this->_alterList);
+
+			// inside affected elements, we want to trim leading whitespace from
+			// the first text node
+			$ltrimFirstTextNode = true;
+
+			// should we open a new AUTOP element to move inline elements into?
+			$openP = true;
+			$autop = null;
+
+			// after BR, ignore a newline
+			$isFollowingBr = false;
+
+			$node = $el->firstChild;
+			while (null !== $node) {
+				if ($alterInline) {
+					if ($openP) {
+						$openP = false;
+						// create a P to move inline content into (this may be removed later)
+						$autop = $el->insertBefore($this->_doc->createElement('autop'), $node);
+					}
+				}
+
+				$isElement = ($node->nodeType === XML_ELEMENT_NODE);
+				if ($isElement) {
+					$isBlock = in_array($node->nodeName, $this->_blocks);
+				} else {
+					$isBlock = false;
+				}
+
+				if ($alterInline) {
+					$isText = ($node->nodeType === XML_TEXT_NODE);
+					$isLastInline = (! $node->nextSibling
+							|| ($node->nextSibling->nodeType === XML_ELEMENT_NODE
+								&& in_array($node->nextSibling->nodeName, $this->_blocks)));
+					if ($isElement) {
+						$isFollowingBr = ($node->nodeName === 'br');
+					}
+
+					if ($isText) {
+						$nodeText = $node->nodeValue;
+						if ($ltrimFirstTextNode) {
+							$nodeText = ltrim($nodeText);
+							$ltrimFirstTextNode = false;
+						}
+						if ($isFollowingBr && preg_match('@^[ \\t]*\\n[ \\t]*@', $nodeText, $m)) {
+							// if a user ends a line with <br>, don't add a second BR
+							$nodeText = substr($nodeText, strlen($m[0]));
+						}
+						if ($isLastInline) {
+							$nodeText = rtrim($nodeText);
+						}
+						$nodeText = str_replace("\n", $this->_unique . 'NL', $nodeText);
+						$tmpNode = $node;
+						$node = $node->nextSibling; // move loop to next node
+
+						// alter node in place, then move into AUTOP
+						$tmpNode->nodeValue = $nodeText;
+						$autop->appendChild($tmpNode);
+
+						continue;
+					}
+				}
+				if ($isBlock || ! $node->nextSibling) {
+					if ($isBlock) {
+						if (in_array($node->nodeName, $this->_descendList)) {
+							$elsToProcess[] = $node;
+							//$this->addParagraphs($node);
+						}
+					}
+					$openP = true;
+					$ltrimFirstTextNode = true;
+				}
+				if ($alterInline) {
+					if (! $isBlock) {
+						$tmpNode = $node;
+						if ($isElement && false !== strpos($tmpNode->textContent, "\n")) {
+							$inlinesToProcess[] = $tmpNode;
+						}
+						$node = $node->nextSibling;
+						$autop->appendChild($tmpNode);
+						continue;
+					}
+				}
+
+				$node = $node->nextSibling;
+			}
+		}
+
+		// handle inline nodes
+		// no need to recurse, just queue up
+		while ($el = array_shift($inlinesToProcess)) {
+			$ignoreLeadingNewline = false;
+			foreach ($el->childNodes as $node) {
+				if ($node->nodeType === XML_ELEMENT_NODE) {
+					if ($node->nodeValue === 'BR') {
+						$ignoreLeadingNewline = true;
+					} else {
+						$ignoreLeadingNewline = false;
+						if (false !== strpos($node->textContent, "\n")) {
+							$inlinesToProcess[] = $node;
+						}
+					}
+					continue;
+				} elseif ($node->nodeType === XML_TEXT_NODE) {
+					$text = $node->nodeValue;
+					if ($text[0] === "\n" && $ignoreLeadingNewline) {
+						$text = substr($text, 1);
+						$ignoreLeadingNewline = false;
+					}
+					$node->nodeValue = str_replace("\n", $this->_unique . 'BR', $text);
+				}
+			}
+		}
+	}
+}
diff --git a/engine/classes/ElggBatch.php b/engine/classes/ElggBatch.php
new file mode 100644
index 000000000..d810ea066
--- /dev/null
+++ b/engine/classes/ElggBatch.php
@@ -0,0 +1,433 @@
+<?php
+/**
+ * Efficiently run operations on batches of results for any function
+ * that supports an options array.
+ *
+ * This is usually used with elgg_get_entities() and friends,
+ * elgg_get_annotations(), and elgg_get_metadata().
+ *
+ * If you pass a valid PHP callback, all results will be run through that
+ * callback. You can still foreach() through the result set after.  Valid
+ * PHP callbacks can be a string, an array, or a closure.
+ * {@link http://php.net/manual/en/language.pseudo-types.php}
+ *
+ * The callback function must accept 3 arguments: an entity, the getter
+ * used, and the options used.
+ *
+ * Results from the callback are stored in callbackResult. If the callback
+ * returns only booleans, callbackResults will be the combined result of
+ * all calls. If no entities are processed, callbackResults will be null.
+ *
+ * If the callback returns anything else, callbackresult will be an indexed
+ * array of whatever the callback returns.  If returning error handling
+ * information, you should include enough information to determine which
+ * result you're referring to.
+ *
+ * Don't combine returning bools and returning something else.
+ *
+ * Note that returning false will not stop the foreach.
+ *
+ * @warning If your callback or foreach loop deletes or disable entities
+ * you MUST call setIncrementOffset(false) or set that when instantiating.
+ * This forces the offset to stay what it was in the $options array.
+ *
+ * @example
+ * <code>
+ * // using foreach
+ * $batch = new ElggBatch('elgg_get_entities', array());
+ * $batch->setIncrementOffset(false);
+ *
+ * foreach ($batch as $entity) {
+ * 	$entity->disable();
+ * }
+ *
+ * // using both a callback
+ * $callback = function($result, $getter, $options) {
+ * 	var_dump("Looking at annotation id: $result->id");
+ *  return true;
+ * }
+ *
+ * $batch = new ElggBatch('elgg_get_annotations', array('guid' => 2), $callback);
+ * </code>
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel
+ * @link       http://docs.elgg.org/DataModel/ElggBatch
+ * @since      1.8
+ */
+class ElggBatch
+	implements Iterator {
+
+	/**
+	 * The objects to interator over.
+	 *
+	 * @var array
+	 */
+	private $results = array();
+
+	/**
+	 * The function used to get results.
+	 *
+	 * @var mixed A string, array, or closure, or lamda function
+	 */
+	private $getter = null;
+
+	/**
+	 * The number of results to grab at a time.
+	 *
+	 * @var int
+	 */
+	private $chunkSize = 25;
+
+	/**
+	 * A callback function to pass results through.
+	 *
+	 * @var mixed A string, array, or closure, or lamda function
+	 */
+	private $callback = null;
+
+	/**
+	 * Start after this many results.
+	 *
+	 * @var int
+	 */
+	private $offset = 0;
+
+	/**
+	 * Stop after this many results.
+	 *
+	 * @var int
+	 */
+	private $limit = 0;
+
+	/**
+	 * Number of processed results.
+	 *
+	 * @var int
+	 */
+	private $retrievedResults = 0;
+
+	/**
+	 * The index of the current result within the current chunk
+	 *
+	 * @var int
+	 */
+	private $resultIndex = 0;
+
+	/**
+	 * The index of the current chunk
+	 *
+	 * @var int
+	 */
+	private $chunkIndex = 0;
+
+	/**
+	 * The number of results iterated through
+	 *
+	 * @var int
+	 */
+	private $processedResults = 0;
+
+	/**
+	 * Is the getter a valid callback
+	 *
+	 * @var bool
+	 */
+	private $validGetter = null;
+
+	/**
+	 * The result of running all entities through the callback function.
+	 *
+	 * @var mixed
+	 */
+	public $callbackResult = null;
+
+	/**
+	 * If false, offset will not be incremented. This is used for callbacks/loops that delete.
+	 *
+	 * @var bool
+	 */
+	private $incrementOffset = true;
+
+	/**
+	 * Entities that could not be instantiated during a fetch
+	 *
+	 * @var stdClass[]
+	 */
+	private $incompleteEntities = array();
+
+	/**
+	 * Total number of incomplete entities fetched
+	 *
+	 * @var int
+	 */
+	private $totalIncompletes = 0;
+
+	/**
+	 * Batches operations on any elgg_get_*() or compatible function that supports
+	 * an options array.
+	 *
+	 * Instead of returning all objects in memory, it goes through $chunk_size
+	 * objects, then requests more from the server.  This avoids OOM errors.
+	 *
+	 * @param string $getter     The function used to get objects.  Usually
+	 *                           an elgg_get_*() function, but can be any valid PHP callback.
+	 * @param array  $options    The options array to pass to the getter function. If limit is
+	 *                           not set, 10 is used as the default. In most cases that is not
+	 *                           what you want.
+	 * @param mixed  $callback   An optional callback function that all results will be passed
+	 *                           to upon load.  The callback needs to accept $result, $getter,
+	 *                           $options.
+	 * @param int    $chunk_size The number of entities to pull in before requesting more.
+	 *                           You have to balance this between running out of memory in PHP
+	 *                           and hitting the db server too often.
+	 * @param bool   $inc_offset Increment the offset on each fetch. This must be false for
+	 *                           callbacks that delete rows. You can set this after the
+	 *                           object is created with {@see ElggBatch::setIncrementOffset()}.
+	 */
+	public function __construct($getter, $options, $callback = null, $chunk_size = 25,
+			$inc_offset = true) {
+		
+		$this->getter = $getter;
+		$this->options = $options;
+		$this->callback = $callback;
+		$this->chunkSize = $chunk_size;
+		$this->setIncrementOffset($inc_offset);
+
+		if ($this->chunkSize <= 0) {
+			$this->chunkSize = 25;
+		}
+
+		// store these so we can compare later
+		$this->offset = elgg_extract('offset', $options, 0);
+		$this->limit = elgg_extract('limit', $options, 10);
+
+		// if passed a callback, create a new ElggBatch with the same options
+		// and pass each to the callback.
+		if ($callback && is_callable($callback)) {
+			$batch = new ElggBatch($getter, $options, null, $chunk_size, $inc_offset);
+
+			$all_results = null;
+
+			foreach ($batch as $result) {
+				if (is_string($callback)) {
+					$result = $callback($result, $getter, $options);
+				} else {
+					$result = call_user_func_array($callback, array($result, $getter, $options));
+				}
+
+				if (!isset($all_results)) {
+					if ($result === true || $result === false || $result === null) {
+						$all_results = $result;
+					} else {
+						$all_results = array();
+					}
+				}
+
+				if (($result === true || $result === false || $result === null) && !is_array($all_results)) {
+					$all_results = $result && $all_results;
+				} else {
+					$all_results[] = $result;
+				}
+			}
+
+			$this->callbackResult = $all_results;
+		}
+	}
+
+	/**
+	 * Tell the process that an entity was incomplete during a fetch
+	 *
+	 * @param stdClass $row
+	 *
+	 * @access private
+	 */
+	public function reportIncompleteEntity(stdClass $row) {
+		$this->incompleteEntities[] = $row;
+	}
+
+	/**
+	 * Fetches the next chunk of results
+	 *
+	 * @return bool
+	 */
+	private function getNextResultsChunk() {
+
+		// always reset results.
+		$this->results = array();
+
+		if (!isset($this->validGetter)) {
+			$this->validGetter = is_callable($this->getter);
+		}
+
+		if (!$this->validGetter) {
+			return false;
+		}
+
+		$limit = $this->chunkSize;
+
+		// if someone passed limit = 0 they want everything.
+		if ($this->limit != 0) {
+			if ($this->retrievedResults >= $this->limit) {
+				return false;
+			}
+
+			// if original limit < chunk size, set limit to original limit
+			// else if the number of results we'll fetch if greater than the original limit
+			if ($this->limit < $this->chunkSize) {
+				$limit = $this->limit;
+			} elseif ($this->retrievedResults + $this->chunkSize > $this->limit) {
+				// set the limit to the number of results remaining in the original limit
+				$limit = $this->limit - $this->retrievedResults;
+			}
+		}
+
+		if ($this->incrementOffset) {
+			$offset = $this->offset + $this->retrievedResults;
+		} else {
+			$offset = $this->offset + $this->totalIncompletes;
+		}
+
+		$current_options = array(
+			'limit' => $limit,
+			'offset' => $offset,
+			'__ElggBatch' => $this,
+		);
+
+		$options = array_merge($this->options, $current_options);
+
+		$this->incompleteEntities = array();
+		$this->results = call_user_func_array($this->getter, array($options));
+
+		$num_results = count($this->results);
+		$num_incomplete = count($this->incompleteEntities);
+
+		$this->totalIncompletes += $num_incomplete;
+
+		if ($this->incompleteEntities) {
+			// pad the front of the results with nulls representing the incompletes
+			array_splice($this->results, 0, 0, array_pad(array(), $num_incomplete, null));
+			// ...and skip past them
+			reset($this->results);
+			for ($i = 0; $i < $num_incomplete; $i++) {
+				next($this->results);
+			}
+		}
+
+		if ($this->results) {
+			$this->chunkIndex++;
+
+			// let the system know we've jumped past the nulls
+			$this->resultIndex = $num_incomplete;
+
+			$this->retrievedResults += ($num_results + $num_incomplete);
+			if ($num_results == 0) {
+				// This fetch was *all* incompletes! We need to fetch until we can either
+				// offer at least one row to iterate over, or give up.
+				return $this->getNextResultsChunk();
+			}
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Increment the offset from the original options array? Setting to
+	 * false is required for callbacks that delete rows.
+	 *
+	 * @param bool $increment Set to false when deleting data
+	 * @return void
+	 */
+	public function setIncrementOffset($increment = true) {
+		$this->incrementOffset = (bool) $increment;
+	}
+
+	/**
+	 * Implements Iterator
+	 */
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::rewind()
+	 * @return void
+	 */
+	public function rewind() {
+		$this->resultIndex = 0;
+		$this->retrievedResults = 0;
+		$this->processedResults = 0;
+
+		// only grab results if we haven't yet or we're crossing chunks
+		if ($this->chunkIndex == 0 || $this->limit > $this->chunkSize) {
+			$this->chunkIndex = 0;
+			$this->getNextResultsChunk();
+		}
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::current()
+	 * @return mixed
+	 */
+	public function current() {
+		return current($this->results);
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::key()
+	 * @return int
+	 */
+	public function key() {
+		return $this->processedResults;
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::next()
+	 * @return mixed
+	 */
+	public function next() {
+		// if we'll be at the end.
+		if (($this->processedResults + 1) >= $this->limit && $this->limit > 0) {
+			$this->results = array();
+			return false;
+		}
+
+		// if we'll need new results.
+		if (($this->resultIndex + 1) >= $this->chunkSize) {
+			if (!$this->getNextResultsChunk()) {
+				$this->results = array();
+				return false;
+			}
+
+			$result = current($this->results);
+		} else {
+			// the function above resets the indexes, so only inc if not
+			// getting new set
+			$this->resultIndex++;
+			$result = next($this->results);
+		}
+
+		$this->processedResults++;
+		return $result;
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::valid()
+	 * @return bool
+	 */
+	public function valid() {
+		if (!is_array($this->results)) {
+			return false;
+		}
+		$key = key($this->results);
+		return ($key !== NULL && $key !== FALSE);
+	}
+}
diff --git a/engine/classes/ElggCache.php b/engine/classes/ElggCache.php
new file mode 100644
index 000000000..909eab39b
--- /dev/null
+++ b/engine/classes/ElggCache.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * ElggCache The elgg cache superclass.
+ * This defines the interface for a cache (wherever that cache is stored).
+ *
+ * @package    Elgg.Core
+ * @subpackage Cache
+ */
+abstract class ElggCache implements ArrayAccess {
+	/**
+	 * Variables for the cache object.
+	 *
+	 * @var array
+	 */
+	private $variables;
+
+	/**
+	 * Set the constructor.
+	 */
+	function __construct() {
+		$this->variables = array();
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Set a cache variable.
+	 *
+	 * @param string $variable Name
+	 * @param string $value    Value
+	 *
+	 * @return void
+	 *
+	 * @deprecated 1.8 Use ElggCache:setVariable()
+	 */
+	public function set_variable($variable, $value) {
+		elgg_deprecated_notice('ElggCache::set_variable() is deprecated by ElggCache::setVariable()', 1.8);
+		$this->setVariable($variable, $value);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Set a cache variable.
+	 *
+	 * @param string $variable Name
+	 * @param string $value    Value
+	 *
+	 * @return void
+	 */
+	public function setVariable($variable, $value) {
+		if (!is_array($this->variables)) {
+			$this->variables = array();
+		}
+
+		$this->variables[$variable] = $value;
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Get variables for this cache.
+	 *
+	 * @param string $variable Name
+	 *
+	 * @return mixed The value or null;
+	 *
+	 * @deprecated 1.8 Use ElggCache::getVariable()
+	 */
+	public function get_variable($variable) {
+		elgg_deprecated_notice('ElggCache::get_variable() is deprecated by ElggCache::getVariable()', 1.8);
+		return $this->getVariable($variable);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Get variables for this cache.
+	 *
+	 * @param string $variable Name
+	 *
+	 * @return mixed The variable or null;
+	 */
+	public function getVariable($variable) {
+		if (isset($this->variables[$variable])) {
+			return $this->variables[$variable];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Class member get overloading, returning key using $this->load defaults.
+	 *
+	 * @param string $key Name
+	 *
+	 * @return mixed
+	 */
+	function __get($key) {
+		return $this->load($key);
+	}
+
+	/**
+	 * Class member set overloading, setting a key using $this->save defaults.
+	 *
+	 * @param string $key   Name
+	 * @param mixed  $value Value
+	 *
+	 * @return mixed
+	 */
+	function __set($key, $value) {
+		return $this->save($key, $value);
+	}
+
+	/**
+	 * Supporting isset, using $this->load() with default values.
+	 *
+	 * @param string $key The name of the attribute or metadata.
+	 *
+	 * @return bool
+	 */
+	function __isset($key) {
+		return (bool)$this->load($key);
+	}
+
+	/**
+	 * Supporting unsetting of magic attributes.
+	 *
+	 * @param string $key The name of the attribute or metadata.
+	 *
+	 * @return bool
+	 */
+	function __unset($key) {
+		return $this->delete($key);
+	}
+
+	/**
+	 * Save data in a cache.
+	 *
+	 * @param string $key  Name
+	 * @param string $data Value
+	 *
+	 * @return bool
+	 */
+	abstract public function save($key, $data);
+
+	/**
+	 * Load data from the cache using a given key.
+	 *
+	 * @todo $offset is a horrible variable name because it creates confusion
+	 * with the ArrayAccess methods
+	 *
+	 * @param string $key    Name
+	 * @param int    $offset Offset
+	 * @param int    $limit  Limit
+	 *
+	 * @return mixed The stored data or false.
+	 */
+	abstract public function load($key, $offset = 0, $limit = null);
+
+	/**
+	 * Invalidate a key
+	 *
+	 * @param string $key Name
+	 *
+	 * @return bool
+	 */
+	abstract public function delete($key);
+
+	/**
+	 * Clear out all the contents of the cache.
+	 *
+	 * @return bool
+	 */
+	abstract public function clear();
+
+	/**
+	 * Add a key only if it doesn't already exist.
+	 * Implemented simply here, if you extend this class and your caching engine
+	 * provides a better way then override this accordingly.
+	 *
+	 * @param string $key  Name
+	 * @param string $data Value
+	 *
+	 * @return bool
+	 */
+	public function add($key, $data) {
+		if (!isset($this[$key])) {
+			return $this->save($key, $data);
+		}
+
+		return false;
+	}
+
+	// ARRAY ACCESS INTERFACE //////////////////////////////////////////////////////////
+
+	/**
+	 * Assigns a value for the specified key
+	 *
+	 * @see ArrayAccess::offsetSet()
+	 *
+	 * @param mixed $key   The key (offset) to assign the value to.
+	 * @param mixed $value The value to set.
+	 *
+	 * @return void
+	 */
+	function offsetSet($key, $value) {
+		$this->save($key, $value);
+	}
+
+	/**
+	 * Get the value for specified key
+	 *
+	 * @see ArrayAccess::offsetGet()
+	 *
+	 * @param mixed $key The key (offset) to retrieve.
+	 *
+	 * @return mixed
+	 */
+	function offsetGet($key) {
+		return $this->load($key);
+	}
+
+	/**
+	 * Unsets a key.
+	 *
+	 * @see ArrayAccess::offsetUnset()
+	 *
+	 * @param mixed $key The key (offset) to unset.
+	 *
+	 * @return void
+	 */
+	function offsetUnset($key) {
+		if (isset($this->$key)) {
+			unset($this->$key);
+		}
+	}
+
+	/**
+	 * Does key exist
+	 *
+	 * @see ArrayAccess::offsetExists()
+	 *
+	 * @param mixed $key A key (offset) to check for.
+	 *
+	 * @return bool
+	 */
+	function offsetExists($key) {
+		return isset($this->$key);
+	}
+}
diff --git a/engine/classes/ElggCrypto.php b/engine/classes/ElggCrypto.php
new file mode 100644
index 000000000..317d371e4
--- /dev/null
+++ b/engine/classes/ElggCrypto.php
@@ -0,0 +1,208 @@
+<?php
+/**
+ * ElggCrypto
+ *
+ * @package    Elgg.Core
+ * @subpackage Crypto
+ *
+ * @access private
+ */
+class ElggCrypto {
+
+	/**
+	 * Character set for temp passwords (no risk of embedded profanity/glyphs that look similar)
+	 */
+	const CHARS_PASSWORD = 'bcdfghjklmnpqrstvwxyz2346789';
+
+	/**
+	 * Generate a string of highly randomized bytes (over the full 8-bit range).
+	 *
+	 * @param int $length Number of bytes needed
+	 * @return string Random bytes
+	 *
+	 * @author George Argyros <argyros.george@gmail.com>
+	 * @copyright 2012, George Argyros. All rights reserved.
+	 * @license Modified BSD
+	 * @link https://github.com/GeorgeArgyros/Secure-random-bytes-in-PHP/blob/master/srand.php Original
+	 *
+	 * Redistribution and use in source and binary forms, with or without
+	 * modification, are permitted provided that the following conditions are met:
+	 *    * Redistributions of source code must retain the above copyright
+	 *      notice, this list of conditions and the following disclaimer.
+	 *    * Redistributions in binary form must reproduce the above copyright
+	 *      notice, this list of conditions and the following disclaimer in the
+	 *      documentation and/or other materials provided with the distribution.
+	 *    * Neither the name of the <organization> nor the
+	 *      names of its contributors may be used to endorse or promote products
+	 *      derived from this software without specific prior written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+	 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+	 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+	 * DISCLAIMED. IN NO EVENT SHALL GEORGE ARGYROS BE LIABLE FOR ANY
+	 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+	 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+	 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+	 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+	 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+	 */
+	public function getRandomBytes($length) {
+		/**
+		 * Our primary choice for a cryptographic strong randomness function is
+		 * openssl_random_pseudo_bytes.
+		 */
+		$SSLstr = '4'; // http://xkcd.com/221/
+		if (function_exists('openssl_random_pseudo_bytes')
+				&& (version_compare(PHP_VERSION, '5.3.4') >= 0 || substr(PHP_OS, 0, 3) !== 'WIN')) {
+			$SSLstr = openssl_random_pseudo_bytes($length, $strong);
+			if ($strong) {
+				return $SSLstr;
+			}
+		}
+
+		/**
+		 * If mcrypt extension is available then we use it to gather entropy from
+		 * the operating system's PRNG. This is better than reading /dev/urandom
+		 * directly since it avoids reading larger blocks of data than needed.
+		 * Older versions of mcrypt_create_iv may be broken or take too much time
+		 * to finish so we only use this function with PHP 5.3.7 and above.
+		 * @see https://bugs.php.net/bug.php?id=55169
+		 */
+		if (function_exists('mcrypt_create_iv')
+				&& (version_compare(PHP_VERSION, '5.3.7') >= 0 || substr(PHP_OS, 0, 3) !== 'WIN')) {
+			$str = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+			if ($str !== false) {
+				return $str;
+			}
+		}
+
+		/**
+		 * No build-in crypto randomness function found. We collect any entropy
+		 * available in the PHP core PRNGs along with some filesystem info and memory
+		 * stats. To make this data cryptographically strong we add data either from
+		 * /dev/urandom or if its unavailable, we gather entropy by measuring the
+		 * time needed to compute a number of SHA-1 hashes.
+		 */
+		$str = '';
+		$bits_per_round = 2; // bits of entropy collected in each clock drift round
+		$msec_per_round = 400; // expected running time of each round in microseconds
+		$hash_len = 20; // SHA-1 Hash length
+		$total = $length; // total bytes of entropy to collect
+
+		$handle = @fopen('/dev/urandom', 'rb');
+		if ($handle && function_exists('stream_set_read_buffer')) {
+			@stream_set_read_buffer($handle, 0);
+		}
+
+		do {
+			$bytes = ($total > $hash_len) ? $hash_len : $total;
+			$total -= $bytes;
+
+			//collect any entropy available from the PHP system and filesystem
+			$entropy = rand() . uniqid(mt_rand(), true) . $SSLstr;
+			$entropy .= implode('', @fstat(@fopen(__FILE__, 'r')));
+			$entropy .= memory_get_usage() . getmypid();
+			$entropy .= serialize($_ENV) . serialize($_SERVER);
+			if (function_exists('posix_times')) {
+				$entropy .= serialize(posix_times());
+			}
+			if (function_exists('zend_thread_id')) {
+				$entropy .= zend_thread_id();
+			}
+
+			if ($handle) {
+				$entropy .= @fread($handle, $bytes);
+			} else {
+				// Measure the time that the operations will take on average
+				for ($i = 0; $i < 3; $i++) {
+					$c1 = microtime(true);
+					$var = sha1(mt_rand());
+					for ($j = 0; $j < 50; $j++) {
+						$var = sha1($var);
+					}
+					$c2 = microtime(true);
+					$entropy .= $c1 . $c2;
+				}
+
+				// Based on the above measurement determine the total rounds
+				// in order to bound the total running time.
+				$rounds = (int) ($msec_per_round * 50 / (int) (($c2 - $c1) * 1000000));
+
+				// Take the additional measurements. On average we can expect
+				// at least $bits_per_round bits of entropy from each measurement.
+				$iter = $bytes * (int) (ceil(8 / $bits_per_round));
+
+				for ($i = 0; $i < $iter; $i++) {
+					$c1 = microtime();
+					$var = sha1(mt_rand());
+					for ($j = 0; $j < $rounds; $j++) {
+						$var = sha1($var);
+					}
+					$c2 = microtime();
+					$entropy .= $c1 . $c2;
+				}
+			}
+
+			// We assume sha1 is a deterministic extractor for the $entropy variable.
+			$str .= sha1($entropy, true);
+
+		} while ($length > strlen($str));
+
+		if ($handle) {
+			@fclose($handle);
+		}
+
+		return substr($str, 0, $length);
+	}
+
+	/**
+	 * Generate a random string of specified length.
+	 *
+	 * Uses supplied character list for generating the new string.
+	 * If no character list provided - uses Base64 URL character set.
+	 *
+	 * @param int         $length Desired length of the string
+	 * @param string|null $chars  Characters to be chosen from randomly. If not given, the Base64 URL
+	 *                            charset will be used.
+	 *
+	 * @return string The random string
+	 *
+	 * @throws InvalidArgumentException
+	 *
+	 * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
+	 * @license   http://framework.zend.com/license/new-bsd New BSD License
+	 *
+	 * @see https://github.com/zendframework/zf2/blob/master/library/Zend/Math/Rand.php#L179
+	 */
+	public static function getRandomString($length, $chars = null) {
+		if ($length < 1) {
+			throw new InvalidArgumentException('Length should be >= 1');
+		}
+
+		if (empty($chars)) {
+			$numBytes = ceil($length * 0.75);
+			$bytes    = self::getRandomBytes($numBytes);
+			$string = substr(rtrim(base64_encode($bytes), '='), 0, $length);
+
+			// Base64 URL
+			return strtr($string, '+/', '-_');
+		}
+
+		$listLen = strlen($chars);
+
+		if ($listLen == 1) {
+			return str_repeat($chars, $length);
+		}
+
+		$bytes  = self::getRandomBytes($length);
+		$pos    = 0;
+		$result = '';
+		for ($i = 0; $i < $length; $i++) {
+			$pos     = ($pos + ord($bytes[$i])) % $listLen;
+			$result .= $chars[$pos];
+		}
+
+		return $result;
+	}
+}
diff --git a/engine/classes/ElggData.php b/engine/classes/ElggData.php
new file mode 100644
index 000000000..4f843cde4
--- /dev/null
+++ b/engine/classes/ElggData.php
@@ -0,0 +1,309 @@
+<?php
+/**
+ * A generic class that contains shared code b/w
+ * ElggExtender, ElggEntity, and ElggRelationship
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel
+ *
+ * @property int $owner_guid
+ * @property int $time_created
+ */
+abstract class ElggData implements
+	Loggable,	// Can events related to this object class be logged
+	Iterator,	// Override foreach behaviour
+	ArrayAccess, // Override for array access
+	Exportable
+{
+
+	/**
+	 * The main attributes of an entity.
+	 * Holds attributes to save to database
+	 * This contains the site's main properties (id, etc)
+	 * Blank entries for all database fields should be created by the constructor.
+	 * Subclasses should add to this in their constructors.
+	 * Any field not appearing in this will be viewed as a
+	 */
+	protected $attributes = array();
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Initialise the attributes array.
+	 *
+	 * This is vital to distinguish between metadata and base parameters.
+	 *
+	 * @param bool $pre18_api Compatibility for subclassing in 1.7 -> 1.8 change.
+	 *                        Passing true (default) emits a deprecation notice.
+	 *                        Passing false returns false.  Core constructors always pass false.
+	 *                        Does nothing either way since attributes are initialized by the time
+	 *                        this is called.
+	 * @return void
+	 * @deprecated 1.8 Use initializeAttributes()
+	 */
+	protected function initialise_attributes($pre18_api = true) {
+		if ($pre18_api) {
+			elgg_deprecated_notice('initialise_attributes() is deprecated by initializeAttributes()', 1.8);
+		}
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Initialize the attributes array.
+	 *
+	 * This is vital to distinguish between metadata and base parameters.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		// Create attributes array if not already created
+		if (!is_array($this->attributes)) {
+			$this->attributes = array();
+		}
+
+		$this->attributes['time_created'] = NULL;
+	}
+
+	/**
+	 * Return an attribute or a piece of metadata.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function __get($name) {
+		return $this->get($name);
+	}
+
+	/**
+	 * Set an attribute or a piece of metadata.
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return mixed
+	 */
+	public function __set($name, $value) {
+		return $this->set($name, $value);
+	}
+
+	/**
+	 * Test if property is set either as an attribute or metadata.
+	 *
+	 * @tip Use isset($entity->property)
+	 *
+	 * @param string $name The name of the attribute or metadata.
+	 *
+	 * @return bool
+	 */
+	function __isset($name) {
+		return $this->$name !== NULL;
+	}
+
+	/**
+	 * Fetch the specified attribute
+	 *
+	 * @param string $name The attribute to fetch
+	 *
+	 * @return mixed The attribute, if it exists.  Otherwise, null.
+	 */
+	abstract protected function get($name);
+
+	/**
+	 * Set the specified attribute
+	 *
+	 * @param string $name  The attribute to set
+	 * @param mixed  $value The value to set it to
+	 *
+	 * @return bool The success of your set function?
+	 */
+	abstract protected function set($name, $value);
+
+	/**
+	 * Get a URL for this object
+	 *
+	 * @return string
+	 */
+	abstract public function getURL();
+
+	/**
+	 * Save this data to the appropriate database table.
+	 *
+	 * @return bool
+	 */
+	abstract public function save();
+	
+	/**
+	 * Delete this data.
+	 *
+	 * @return bool
+	 */
+	abstract public function delete();
+
+	/**
+	 * Returns the UNIX epoch time that this entity was created
+	 *
+	 * @return int UNIX epoch time
+	 */
+	public function getTimeCreated() {
+		return $this->time_created;
+	}
+
+	/*
+	 *  SYSTEM LOG INTERFACE
+	 */
+
+	/**
+	 * Return the class name of the object.
+	 *
+	 * @return string
+	 */
+	public function getClassName() {
+		return get_class($this);
+	}
+
+	/**
+	 * Return the GUID of the owner of this object.
+	 *
+	 * @return int
+	 * @deprecated 1.8 Use getOwnerGUID() instead
+	 */
+	public function getObjectOwnerGUID() {
+		elgg_deprecated_notice("getObjectOwnerGUID() was deprecated.  Use getOwnerGUID().", 1.8);
+		return $this->owner_guid;
+	}
+
+	/*
+	 * ITERATOR INTERFACE
+	 */
+
+	/*
+	 * This lets an entity's attributes be displayed using foreach as a normal array.
+	 * Example: http://www.sitepoint.com/print/php5-standard-library
+	 */
+	protected $valid = FALSE;
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::rewind()
+	 *
+	 * @return void
+	 */
+	public function rewind() {
+		$this->valid = (FALSE !== reset($this->attributes));
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::current()
+	 *
+	 * @return mixed
+	 */
+	public function current() {
+		return current($this->attributes);
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::key()
+	 *
+	 * @return string
+	 */
+	public function key() {
+		return key($this->attributes);
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::next()
+	 *
+	 * @return void
+	 */
+	public function next() {
+		$this->valid = (FALSE !== next($this->attributes));
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::valid()
+	 *
+	 * @return bool
+	 */
+	public function valid() {
+		return $this->valid;
+	}
+
+	/*
+	 * ARRAY ACCESS INTERFACE
+	 */
+
+	/*
+	 * This lets an entity's attributes be accessed like an associative array.
+	 * Example: http://www.sitepoint.com/print/php5-standard-library
+	 */
+
+	/**
+	 * Array access interface
+	 *
+	 * @see ArrayAccess::offsetSet()
+	 *
+	 * @param mixed $key   Name
+	 * @param mixed $value Value
+	 *
+	 * @return void
+	 */
+	public function offsetSet($key, $value) {
+		if (array_key_exists($key, $this->attributes)) {
+			$this->attributes[$key] = $value;
+		}
+	}
+
+	/**
+	 * Array access interface
+	 *
+	 * @see ArrayAccess::offsetGet()
+	 *
+	 * @param mixed $key Name
+	 *
+	 * @return mixed
+	 */
+	public function offsetGet($key) {
+		if (array_key_exists($key, $this->attributes)) {
+			return $this->attributes[$key];
+		}
+		return null;
+	}
+
+	/**
+	 * Array access interface
+	 *
+	 * @see ArrayAccess::offsetUnset()
+	 *
+	 * @param mixed $key Name
+	 *
+	 * @return void
+	 */
+	public function offsetUnset($key) {
+		if (array_key_exists($key, $this->attributes)) {
+			// Full unsetting is dangerous for our objects
+			$this->attributes[$key] = "";
+		}
+	}
+
+	/**
+	 * Array access interface
+	 *
+	 * @see ArrayAccess::offsetExists()
+	 *
+	 * @param int $offset Offset
+	 *
+	 * @return int
+	 */
+	public function offsetExists($offset) {
+		return array_key_exists($offset, $this->attributes);
+	}
+}
diff --git a/engine/classes/ElggDiskFilestore.php b/engine/classes/ElggDiskFilestore.php
new file mode 100644
index 000000000..6e2354012
--- /dev/null
+++ b/engine/classes/ElggDiskFilestore.php
@@ -0,0 +1,417 @@
+<?php
+/**
+ * A filestore that uses disk as storage.
+ *
+ * @warning This should be used by a wrapper class
+ * like {@link ElggFile}.
+ *
+ * @package    Elgg.Core
+ * @subpackage FileStore.Disk
+ * @link       http://docs.elgg.org/DataModel/FileStore/Disk
+ */
+class ElggDiskFilestore extends ElggFilestore {
+	/**
+	 * Directory root.
+	 */
+	private $dir_root;
+
+	/**
+	 * Default depth of file directory matrix
+	 */
+	private $matrix_depth = 5;
+
+	/**
+	 * Construct a disk filestore using the given directory root.
+	 *
+	 * @param string $directory_root Root directory, must end in "/"
+	 */
+	public function __construct($directory_root = "") {
+		global $CONFIG;
+
+		if ($directory_root) {
+			$this->dir_root = $directory_root;
+		} else {
+			$this->dir_root = $CONFIG->dataroot;
+		}
+	}
+
+	/**
+	 * Open a file for reading, writing, or both.
+	 *
+	 * @note All files are opened binary safe.
+	 * @warning This will try to create the a directory if it doesn't exist,
+	 * even in read-only mode.
+	 *
+	 * @param ElggFile $file The file to open
+	 * @param string   $mode read, write, or append.
+	 *
+	 * @throws InvalidParameterException
+	 * @return resource File pointer resource
+	 * @todo This really shouldn't try to create directories if not writing.
+	 */
+	public function open(ElggFile $file, $mode) {
+		$fullname = $this->getFilenameOnFilestore($file);
+
+		// Split into path and name
+		$ls = strrpos($fullname, "/");
+		if ($ls === false) {
+			$ls = 0;
+		}
+
+		$path = substr($fullname, 0, $ls);
+		$name = substr($fullname, $ls);
+		// @todo $name is unused, remove it or do we need to fix something?
+
+		// Try and create the directory
+		try {
+			$this->makeDirectoryRoot($path);
+		} catch (Exception $e) {
+
+		}
+
+		if (($mode != 'write') && (!file_exists($fullname))) {
+			return false;
+		}
+
+		switch ($mode) {
+			case "read" :
+				$mode = "rb";
+				break;
+			case "write" :
+				$mode = "w+b";
+				break;
+			case "append" :
+				$mode = "a+b";
+				break;
+			default:
+				$msg = elgg_echo('InvalidParameterException:UnrecognisedFileMode', array($mode));
+				throw new InvalidParameterException($msg);
+		}
+
+		return fopen($fullname, $mode);
+
+	}
+
+	/**
+	 * Write data to a file.
+	 *
+	 * @param resource $f    File pointer resource
+	 * @param mixed    $data The data to write.
+	 *
+	 * @return bool
+	 */
+	public function write($f, $data) {
+		return fwrite($f, $data);
+	}
+
+	/**
+	 * Read data from a file.
+	 *
+	 * @param resource $f      File pointer resource
+	 * @param int      $length The number of bytes to read
+	 * @param int      $offset The number of bytes to start after
+	 *
+	 * @return mixed Contents of file or false on fail.
+	 */
+	public function read($f, $length, $offset = 0) {
+		if ($offset) {
+			$this->seek($f, $offset);
+		}
+
+		return fread($f, $length);
+	}
+
+	/**
+	 * Close a file pointer
+	 *
+	 * @param resource $f A file pointer resource
+	 *
+	 * @return bool
+	 */
+	public function close($f) {
+		return fclose($f);
+	}
+
+	/**
+	 * Delete an ElggFile file.
+	 *
+	 * @param ElggFile $file File to delete
+	 *
+	 * @return bool
+	 */
+	public function delete(ElggFile $file) {
+		$filename = $this->getFilenameOnFilestore($file);
+		if (file_exists($filename)) {
+			return unlink($filename);
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * Seek to the specified position.
+	 *
+	 * @param resource $f        File resource
+	 * @param int      $position Position in bytes
+	 *
+	 * @return bool
+	 */
+	public function seek($f, $position) {
+		return fseek($f, $position);
+	}
+
+	/**
+	 * Return the current location of the internal pointer
+	 *
+	 * @param resource $f File pointer resource
+	 *
+	 * @return int|false
+	 */
+	public function tell($f) {
+		return ftell($f);
+	}
+
+	/**
+	 * Tests for end of file on a file pointer
+	 *
+	 * @param resource $f File pointer resource
+	 *
+	 * @return bool
+	 */
+	public function eof($f) {
+		return feof($f);
+	}
+
+	/**
+	 * Returns the file size of an ElggFile file.
+	 *
+	 * @param ElggFile $file File object
+	 *
+	 * @return int The file size
+	 */
+	public function getFileSize(ElggFile $file) {
+		return filesize($this->getFilenameOnFilestore($file));
+	}
+
+	/**
+	 * Get the filename as saved on disk for an ElggFile object
+	 *
+	 * Returns an empty string if no filename set
+	 *
+	 * @param ElggFile $file File object
+	 *
+	 * @return string The full path of where the file is stored
+	 * @throws InvalidParameterException
+	 */
+	public function getFilenameOnFilestore(ElggFile $file) {
+		$owner_guid = $file->getOwnerGuid();
+		if (!$owner_guid) {
+			$owner_guid = elgg_get_logged_in_user_guid();
+		}
+
+		if (!$owner_guid) {
+			$msg = elgg_echo('InvalidParameterException:MissingOwner',
+				array($file->getFilename(), $file->guid));
+			throw new InvalidParameterException($msg);
+		}
+
+		$filename = $file->getFilename();
+		if (!$filename) {
+			return '';
+		}
+
+		return $this->dir_root . $this->makeFileMatrix($owner_guid) . $filename;
+	}
+
+	/**
+	 * Returns the contents of the ElggFile file.
+	 *
+	 * @param ElggFile $file File object
+	 *
+	 * @return string
+	 */
+	public function grabFile(ElggFile $file) {
+		return file_get_contents($file->getFilenameOnFilestore());
+	}
+
+	/**
+	 * Tests if an ElggFile file exists.
+	 *
+	 * @param ElggFile $file File object
+	 *
+	 * @return bool
+	 */
+	public function exists(ElggFile $file) {
+		if (!$file->getFilename()) {
+			return false;
+		}
+		return file_exists($this->getFilenameOnFilestore($file));
+	}
+
+	/**
+	 * Returns the size of all data stored under a directory in the disk store.
+	 *
+	 * @param string $prefix         Optional/ The prefix to check under.
+	 * @param string $container_guid The guid of the entity whose data you want to check.
+	 *
+	 * @return int|false
+	 */
+	public function getSize($prefix = '', $container_guid) {
+		if ($container_guid) {
+			return get_dir_size($this->dir_root . $this->makeFileMatrix($container_guid) . $prefix);
+		} else {
+			return false;
+		}
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Create a directory $dirroot
+	 *
+	 * @param string $dirroot The full path of the directory to create
+	 *
+	 * @throws IOException
+	 * @return true
+	 * @deprecated 1.8 Use ElggDiskFilestore::makeDirectoryRoot()
+	 */
+	protected function make_directory_root($dirroot) {
+		elgg_deprecated_notice('ElggDiskFilestore::make_directory_root() is deprecated by ::makeDirectoryRoot()', 1.8);
+
+		return $this->makeDirectoryRoot($dirroot);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Create a directory $dirroot
+	 *
+	 * @param string $dirroot The full path of the directory to create
+	 *
+	 * @throws IOException
+	 * @return true
+	 */
+	protected function makeDirectoryRoot($dirroot) {
+		if (!file_exists($dirroot)) {
+			if (!@mkdir($dirroot, 0700, true)) {
+				throw new IOException(elgg_echo('IOException:CouldNotMake', array($dirroot)));
+			}
+		}
+
+		return true;
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Multibyte string tokeniser.
+	 *
+	 * Splits a string into an array. Will fail safely if mbstring is
+	 * not installed.
+	 *
+	 * @param string $string  String
+	 * @param string $charset The charset, defaults to UTF8
+	 *
+	 * @return array
+	 * @deprecated 1.8 Files are stored by date and guid; no need for this.
+	 */
+	private function mb_str_split($string, $charset = 'UTF8') {
+		elgg_deprecated_notice('ElggDiskFilestore::mb_str_split() is deprecated.', 1.8);
+
+		if (is_callable('mb_substr')) {
+			$length = mb_strlen($string);
+			$array = array();
+
+			while ($length) {
+				$array[] = mb_substr($string, 0, 1, $charset);
+				$string = mb_substr($string, 1, $length, $charset);
+
+				$length = mb_strlen($string);
+			}
+
+			return $array;
+		} else {
+			return str_split($string);
+		}
+	}
+	// @codingStandardsIgnoreEnd
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Construct a file path matrix for an entity.
+	 *
+	 * @param int $identifier The guide of the entity to store the data under.
+	 *
+	 * @return string The path where the entity's data will be stored.
+	 * @deprecated 1.8 Use ElggDiskFilestore::makeFileMatrix()
+	 */
+	protected function make_file_matrix($identifier) {
+		elgg_deprecated_notice('ElggDiskFilestore::make_file_matrix() is deprecated by ::makeFileMatrix()', 1.8);
+
+		return $this->makeFileMatrix($identifier);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Construct a file path matrix for an entity.
+	 *
+	 * @param int $guid The guide of the entity to store the data under.
+	 *
+	 * @return string The path where the entity's data will be stored.
+	 */
+	protected function makeFileMatrix($guid) {
+		$entity = get_entity($guid);
+
+		if (!($entity instanceof ElggEntity) || !$entity->time_created) {
+			return false;
+		}
+
+		$time_created = date('Y/m/d', $entity->time_created);
+
+		return "$time_created/$entity->guid/";
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Construct a filename matrix.
+	 *
+	 * Generates a matrix using the entity's creation time and
+	 * unique guid.
+	 *
+	 * File path matrixes are:
+	 * YYYY/MM/DD/guid/
+	 *
+	 * @param int $guid The entity to contrust a matrix for
+	 *
+	 * @return string The
+	 */
+	protected function user_file_matrix($guid) {
+		elgg_deprecated_notice('ElggDiskFilestore::user_file_matrix() is deprecated by ::makeFileMatrix()', 1.8);
+
+		return $this->makeFileMatrix($guid);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Returns a list of attributes to save to the database when saving
+	 * the ElggFile object using this file store.
+	 *
+	 * @return array
+	 */
+	public function getParameters() {
+		return array("dir_root" => $this->dir_root);
+	}
+
+	/**
+	 * Sets parameters that should be saved to database.
+	 *
+	 * @param array $parameters Set parameters to save to DB for this filestore.
+	 *
+	 * @return bool
+	 */
+	public function setParameters(array $parameters) {
+		if (isset($parameters['dir_root'])) {
+			$this->dir_root = $parameters['dir_root'];
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
new file mode 100644
index 000000000..a563f6fad
--- /dev/null
+++ b/engine/classes/ElggEntity.php
@@ -0,0 +1,1770 @@
+<?php
+/**
+ * The parent class for all Elgg Entities.
+ *
+ * An ElggEntity is one of the basic data models in Elgg.  It is the primary
+ * means of storing and retrieving data from the database.  An ElggEntity
+ * represents one row of the entities table.
+ *
+ * The ElggEntity class handles CRUD operations for the entities table.
+ * ElggEntity should always be extended by another class to handle CRUD
+ * operations on the type-specific table.
+ *
+ * ElggEntity uses magic methods for get and set, so any property that isn't
+ * declared will be assumed to be metadata and written to the database
+ * as metadata on the object.  All children classes must declare which
+ * properties are columns of the type table or they will be assumed
+ * to be metadata.  See ElggObject::initialise_entities() for examples.
+ *
+ * Core supports 4 types of entities: ElggObject, ElggUser, ElggGroup, and
+ * ElggSite.
+ *
+ * @tip Most plugin authors will want to extend the ElggObject class
+ * instead of this class.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Entities
+ *
+ * @property string $type           object, user, group, or site (read-only after save)
+ * @property string $subtype        Further clarifies the nature of the entity (read-only after save)
+ * @property int    $guid           The unique identifier for this entity (read only)
+ * @property int    $owner_guid     The GUID of the creator of this entity
+ * @property int    $container_guid The GUID of the entity containing this entity
+ * @property int    $site_guid      The GUID of the website this entity is associated with
+ * @property int    $access_id      Specifies the visibility level of this entity
+ * @property int    $time_created   A UNIX timestamp of when the entity was created (read-only, set on first save)
+ * @property int    $time_updated   A UNIX timestamp of when the entity was last updated (automatically updated on save)
+ * @property-read string $enabled
+ */
+abstract class ElggEntity extends ElggData implements
+	Notable,    // Calendar interface
+	Locatable,  // Geocoding interface
+	Importable // Allow import of data
+{
+
+	/**
+	 * If set, overrides the value of getURL()
+	 */
+	protected $url_override;
+
+	/**
+	 * Icon override, overrides the value of getIcon().
+	 */
+	protected $icon_override;
+
+	/**
+	 * Holds metadata until entity is saved.  Once the entity is saved,
+	 * metadata are written immediately to the database.
+	 */
+	protected $temp_metadata = array();
+
+	/**
+	 * Holds annotations until entity is saved.  Once the entity is saved,
+	 * annotations are written immediately to the database.
+	 */
+	protected $temp_annotations = array();
+
+	/**
+	 * Holds private settings until entity is saved. Once the entity is saved,
+	 * private settings are written immediately to the database.
+	 */
+	protected $temp_private_settings = array();
+
+	/**
+	 * Volatile data structure for this object, allows for storage of data
+	 * in-memory that isn't sync'd back to the metadata table.
+	 */
+	protected $volatile = array();
+
+	/**
+	 * Initialize the attributes array.
+	 *
+	 * This is vital to distinguish between metadata and base parameters.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['guid'] = NULL;
+		$this->attributes['type'] = NULL;
+		$this->attributes['subtype'] = NULL;
+
+		$this->attributes['owner_guid'] = elgg_get_logged_in_user_guid();
+		$this->attributes['container_guid'] = elgg_get_logged_in_user_guid();
+
+		$this->attributes['site_guid'] = NULL;
+		$this->attributes['access_id'] = ACCESS_PRIVATE;
+		$this->attributes['time_created'] = NULL;
+		$this->attributes['time_updated'] = NULL;
+		$this->attributes['last_action'] = NULL;
+		$this->attributes['enabled'] = "yes";
+
+		// There now follows a bit of a hack
+		/* Problem: To speed things up, some objects are split over several tables,
+		 * this means that it requires n number of database reads to fully populate
+		 * an entity. This causes problems for caching and create events
+		 * since it is not possible to tell whether a subclassed entity is complete.
+		 *
+		 * Solution: We have two counters, one 'tables_split' which tells whatever is
+		 * interested how many tables are going to need to be searched in order to fully
+		 * populate this object, and 'tables_loaded' which is how many have been
+		 * loaded thus far.
+		 *
+		 * If the two are the same then this object is complete.
+		 *
+		 * Use: isFullyLoaded() to check
+		 */
+		$this->attributes['tables_split'] = 1;
+		$this->attributes['tables_loaded'] = 0;
+	}
+
+	/**
+	 * Clone an entity
+	 *
+	 * Resets the guid so that the entity can be saved as a distinct entity from
+	 * the original. Creation time will be set when this new entity is saved.
+	 * The owner and container guids come from the original entity. The clone
+	 * method copies metadata but does not copy annotations or private settings.
+	 *
+	 * @note metadata will have its owner and access id set when the entity is saved
+	 * and it will be the same as that of the entity.
+	 *
+	 * @return void
+	 */
+	public function __clone() {
+		$orig_entity = get_entity($this->guid);
+		if (!$orig_entity) {
+			elgg_log("Failed to clone entity with GUID $this->guid", "ERROR");
+			return;
+		}
+
+		$metadata_array = elgg_get_metadata(array(
+			'guid' => $this->guid,
+			'limit' => 0
+		));
+
+		$this->attributes['guid'] = "";
+
+		$this->attributes['subtype'] = $orig_entity->getSubtype();
+
+		// copy metadata over to new entity - slightly convoluted due to
+		// handling of metadata arrays
+		if (is_array($metadata_array)) {
+			// create list of metadata names
+			$metadata_names = array();
+			foreach ($metadata_array as $metadata) {
+				$metadata_names[] = $metadata['name'];
+			}
+			// arrays are stored with multiple enties per name
+			$metadata_names = array_unique($metadata_names);
+
+			// move the metadata over
+			foreach ($metadata_names as $name) {
+				$this->set($name, $orig_entity->$name);
+			}
+		}
+	}
+
+	/**
+	 * Return the value of a property.
+	 *
+	 * If $name is defined in $this->attributes that value is returned, otherwise it will
+	 * pull from the entity's metadata.
+	 *
+	 * Q: Why are we not using __get overload here?
+	 * A: Because overload operators cause problems during subclassing, so we put the code here and
+	 * create overloads in subclasses.
+	 *
+	 * @todo What problems are these?
+	 *
+	 * @warning Subtype is returned as an id rather than the subtype string. Use getSubtype()
+	 * to get the subtype string.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed Returns the value of a given value, or null.
+	 */
+	public function get($name) {
+		// See if its in our base attributes
+		if (array_key_exists($name, $this->attributes)) {
+			return $this->attributes[$name];
+		}
+
+		// No, so see if its in the meta data for this entity
+		$meta = $this->getMetaData($name);
+
+		// getMetaData returns NULL if $name is not found
+		return $meta;
+	}
+
+	/**
+	 * Sets the value of a property.
+	 *
+	 * If $name is defined in $this->attributes that value is set, otherwise it is
+	 * saved as metadata.
+	 *
+	 * @warning Metadata set this way will inherit the entity's owner and access ID. If you want
+	 * to set metadata with a different owner, use create_metadata().
+	 *
+	 * @warning It is important that your class populates $this->attributes with keys
+	 * for all base attributes, anything not in their gets set as METADATA.
+	 *
+	 * Q: Why are we not using __set overload here?
+	 * A: Because overload operators cause problems during subclassing, so we put the code here and
+	 * create overloads in subclasses.
+	 *
+	 * @todo What problems?
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return bool
+	 */
+	public function set($name, $value) {
+		if (array_key_exists($name, $this->attributes)) {
+			// Certain properties should not be manually changed!
+			switch ($name) {
+				case 'guid':
+				case 'time_updated':
+				case 'last_action':
+					return FALSE;
+					break;
+				default:
+					$this->attributes[$name] = $value;
+					break;
+			}
+		} else {
+			return $this->setMetaData($name, $value);
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Return the value of a piece of metadata.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed The value, or NULL if not found.
+	 */
+	public function getMetaData($name) {
+		$guid = $this->getGUID();
+
+		if (! $guid) {
+			if (isset($this->temp_metadata[$name])) {
+				// md is returned as an array only if more than 1 entry
+				if (count($this->temp_metadata[$name]) == 1) {
+					return $this->temp_metadata[$name][0];
+				} else {
+					return $this->temp_metadata[$name];
+				}
+			} else {
+				return null;
+			}
+		}
+
+		// upon first cache miss, just load/cache all the metadata and retry.
+		// if this works, the rest of this function may not be needed!
+		$cache = elgg_get_metadata_cache();
+		if ($cache->isKnown($guid, $name)) {
+			return $cache->load($guid, $name);
+		} else {
+			$cache->populateFromEntities(array($guid));
+			// in case ignore_access was on, we have to check again...
+			if ($cache->isKnown($guid, $name)) {
+				return $cache->load($guid, $name);
+			}
+		}
+
+		$md = elgg_get_metadata(array(
+			'guid' => $guid,
+			'metadata_name' => $name,
+			'limit' => 0,
+		));
+
+		$value = null;
+
+		if ($md && !is_array($md)) {
+			$value = $md->value;
+		} elseif (count($md) == 1) {
+			$value = $md[0]->value;
+		} else if ($md && is_array($md)) {
+			$value = metadata_array_to_values($md);
+		}
+
+		$cache->save($guid, $name, $value);
+
+		return $value;
+	}
+
+	/**
+	 * Unset a property from metadata or attribute.
+	 *
+	 * @warning If you use this to unset an attribute, you must save the object!
+	 *
+	 * @param string $name The name of the attribute or metadata.
+	 *
+	 * @return void
+	 */
+	function __unset($name) {
+		if (array_key_exists($name, $this->attributes)) {
+			$this->attributes[$name] = "";
+		} else {
+			$this->deleteMetadata($name);
+		}
+	}
+
+	/**
+	 * Set a piece of metadata.
+	 *
+	 * Plugin authors should use the magic methods or create_metadata().
+	 *
+	 * @warning The metadata will inherit the parent entity's owner and access ID.
+	 * If you want to write metadata with a different owner, use create_metadata().
+	 *
+	 * @access private
+	 *
+	 * @param string $name       Name of the metadata
+	 * @param mixed  $value      Value of the metadata (doesn't support assoc arrays)
+	 * @param string $value_type Types supported: integer and string. Will auto-identify if not set
+	 * @param bool   $multiple   Allow multiple values for a single name (doesn't support assoc arrays)
+	 *
+	 * @return bool
+	 */
+	public function setMetaData($name, $value, $value_type = null, $multiple = false) {
+
+		// normalize value to an array that we will loop over
+		// remove indexes if value already an array.
+		if (is_array($value)) {
+			$value = array_values($value);
+		} else {
+			$value = array($value);
+		}
+
+		// saved entity. persist md to db.
+		if ($this->guid) {
+			// if overwriting, delete first.
+			if (!$multiple) {
+				$options = array(
+					'guid' => $this->getGUID(),
+					'metadata_name' => $name,
+					'limit' => 0
+				);
+				// @todo in 1.9 make this return false if can't add metadata
+				// https://github.com/elgg/elgg/issues/4520
+				//
+				// need to remove access restrictions right now to delete
+				// because this is the expected behavior
+				$ia = elgg_set_ignore_access(true);
+				if (false === elgg_delete_metadata($options)) {
+					return false;
+				}
+				elgg_set_ignore_access($ia);
+			}
+
+			// add new md
+			$result = true;
+			foreach ($value as $value_tmp) {
+				// at this point $value should be appended because it was cleared above if needed.
+				$md_id = create_metadata($this->getGUID(), $name, $value_tmp, $value_type,
+						$this->getOwnerGUID(), $this->getAccessId(), true);
+				if (!$md_id) {
+					return false;
+				}
+			}
+
+			return $result;
+		} else {
+			// unsaved entity. store in temp array
+			// returning single entries instead of an array of 1 element is decided in
+			// getMetaData(), just like pulling from the db.
+			//
+			// if overwrite, delete first
+			if (!$multiple || !isset($this->temp_metadata[$name])) {
+				$this->temp_metadata[$name] = array();
+			}
+
+			// add new md
+			$this->temp_metadata[$name] = array_merge($this->temp_metadata[$name], $value);
+			return true;
+		}
+	}
+
+	/**
+	 * Deletes all metadata on this object (metadata.entity_guid = $this->guid).
+	 * If you pass a name, only metadata matching that name will be deleted.
+	 *
+	 * @warning Calling this with no $name will clear all metadata on the entity.
+	 *
+	 * @param null|string $name The name of the metadata to remove.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function deleteMetadata($name = null) {
+
+		if (!$this->guid) {
+			return false;
+		}
+
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['metadata_name'] = $name;
+		}
+
+		return elgg_delete_metadata($options);
+	}
+
+	/**
+	 * Deletes all metadata owned by this object (metadata.owner_guid = $this->guid).
+	 * If you pass a name, only metadata matching that name will be deleted.
+	 *
+	 * @param null|string $name The name of metadata to delete.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function deleteOwnedMetadata($name = null) {
+		// access is turned off for this because they might
+		// no longer have access to an entity they created metadata on.
+		$ia = elgg_set_ignore_access(true);
+		$options = array(
+			'metadata_owner_guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['metadata_name'] = $name;
+		}
+
+		$r = elgg_delete_metadata($options);
+		elgg_set_ignore_access($ia);
+		return $r;
+	}
+
+	/**
+	 * Remove metadata
+	 *
+	 * @warning Calling this with no or empty arguments will clear all metadata on the entity.
+	 *
+	 * @param string $name The name of the metadata to clear
+	 * @return mixed bool
+	 * @deprecated 1.8 Use deleteMetadata()
+	 */
+	public function clearMetaData($name = '') {
+		elgg_deprecated_notice('ElggEntity->clearMetadata() is deprecated by ->deleteMetadata()', 1.8);
+		return $this->deleteMetadata($name);
+	}
+
+	/**
+	 * Disables metadata for this entity, optionally based on name.
+	 *
+	 * @param string $name An options name of metadata to disable.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function disableMetadata($name = '') {
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['metadata_name'] = $name;
+		}
+
+		return elgg_disable_metadata($options);
+	}
+
+	/**
+	 * Enables metadata for this entity, optionally based on name.
+	 *
+	 * @warning Before calling this, you must use {@link access_show_hidden_entities()}
+	 *
+	 * @param string $name An options name of metadata to enable.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function enableMetadata($name = '') {
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['metadata_name'] = $name;
+		}
+
+		return elgg_enable_metadata($options);
+	}
+
+	/**
+	 * Get a piece of volatile (non-persisted) data on this entity.
+	 *
+	 * @param string $name The name of the volatile data
+	 *
+	 * @return mixed The value or NULL if not found.
+	 */
+	public function getVolatileData($name) {
+		if (!is_array($this->volatile)) {
+			$this->volatile = array();
+		}
+
+		if (array_key_exists($name, $this->volatile)) {
+			return $this->volatile[$name];
+		} else {
+			return NULL;
+		}
+	}
+
+	/**
+	 * Set a piece of volatile (non-persisted) data on this entity
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return void
+	 */
+	public function setVolatileData($name, $value) {
+		if (!is_array($this->volatile)) {
+			$this->volatile = array();
+		}
+
+		$this->volatile[$name] = $value;
+	}
+
+	/**
+	 * Remove all relationships to and from this entity.
+	 *
+	 * @return true
+	 * @todo This should actually return if it worked.
+	 * @see ElggEntity::addRelationship()
+	 * @see ElggEntity::removeRelationship()
+	 */
+	public function deleteRelationships() {
+		remove_entity_relationships($this->getGUID());
+		remove_entity_relationships($this->getGUID(), "", true);
+		return true;
+	}
+
+	/**
+	 * Remove all relationships to and from this entity.
+	 *
+	 * @return bool
+	 * @see ElggEntity::addRelationship()
+	 * @see ElggEntity::removeRelationship()
+	 * @deprecated 1.8 Use ->deleteRelationship()
+	 */
+	public function clearRelationships() {
+		elgg_deprecated_notice('ElggEntity->clearRelationships() is deprecated by ->deleteRelationships()', 1.8);
+		return $this->deleteRelationships();
+	}
+
+	/**
+	 * Add a relationship between this an another entity.
+	 *
+	 * @tip Read the relationship like "$guid is a $relationship of this entity."
+	 *
+	 * @param int    $guid         Entity to link to.
+	 * @param string $relationship The type of relationship.
+	 *
+	 * @return bool
+	 * @see ElggEntity::removeRelationship()
+	 * @see ElggEntity::clearRelationships()
+	 */
+	public function addRelationship($guid, $relationship) {
+		return add_entity_relationship($this->getGUID(), $relationship, $guid);
+	}
+
+	/**
+	 * Remove a relationship
+	 *
+	 * @param int $guid         GUID of the entity to make a relationship with
+	 * @param str $relationship Name of relationship
+	 *
+	 * @return bool
+	 * @see ElggEntity::addRelationship()
+	 * @see ElggEntity::clearRelationships()
+	 */
+	public function removeRelationship($guid, $relationship) {
+		return remove_entity_relationship($this->getGUID(), $relationship, $guid);
+	}
+
+	/**
+	 * Adds a private setting to this entity.
+	 *
+	 * Private settings are similar to metadata but will not
+	 * be searched and there are fewer helper functions for them.
+	 *
+	 * @param string $name  Name of private setting
+	 * @param mixed  $value Value of private setting
+	 *
+	 * @return bool
+	 */
+	function setPrivateSetting($name, $value) {
+		if ((int) $this->guid > 0) {
+			return set_private_setting($this->getGUID(), $name, $value);
+		} else {
+			$this->temp_private_settings[$name] = $value;
+			return true;
+		}
+	}
+
+	/**
+	 * Returns a private setting value
+	 *
+	 * @param string $name Name of the private setting
+	 *
+	 * @return mixed
+	 */
+	function getPrivateSetting($name) {
+		if ((int) ($this->guid) > 0) {
+			return get_private_setting($this->getGUID(), $name);
+		} else {
+			if (isset($this->temp_private_settings[$name])) {
+				return $this->temp_private_settings[$name];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Removes private setting
+	 *
+	 * @param string $name Name of the private setting
+	 *
+	 * @return bool
+	 */
+	function removePrivateSetting($name) {
+		return remove_private_setting($this->getGUID(), $name);
+	}
+
+	/**
+	 * Deletes all annotations on this object (annotations.entity_guid = $this->guid).
+	 * If you pass a name, only annotations matching that name will be deleted.
+	 *
+	 * @warning Calling this with no or empty arguments will clear all annotations on the entity.
+	 *
+	 * @param null|string $name The annotations name to remove.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function deleteAnnotations($name = null) {
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['annotation_name'] = $name;
+		}
+
+		return elgg_delete_annotations($options);
+	}
+
+	/**
+	 * Deletes all annotations owned by this object (annotations.owner_guid = $this->guid).
+	 * If you pass a name, only annotations matching that name will be deleted.
+	 *
+	 * @param null|string $name The name of annotations to delete.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function deleteOwnedAnnotations($name = null) {
+		// access is turned off for this because they might
+		// no longer have access to an entity they created annotations on.
+		$ia = elgg_set_ignore_access(true);
+		$options = array(
+			'annotation_owner_guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['annotation_name'] = $name;
+		}
+
+		$r = elgg_delete_annotations($options);
+		elgg_set_ignore_access($ia);
+		return $r;
+	}
+
+	/**
+	 * Disables annotations for this entity, optionally based on name.
+	 *
+	 * @param string $name An options name of annotations to disable.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function disableAnnotations($name = '') {
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['annotation_name'] = $name;
+		}
+
+		return elgg_disable_annotations($options);
+	}
+
+	/**
+	 * Enables annotations for this entity, optionally based on name.
+	 *
+	 * @warning Before calling this, you must use {@link access_show_hidden_entities()}
+	 *
+	 * @param string $name An options name of annotations to enable.
+	 * @return bool
+	 * @since 1.8
+	 */
+	public function enableAnnotations($name = '') {
+		$options = array(
+			'guid' => $this->guid,
+			'limit' => 0
+		);
+		if ($name) {
+			$options['annotation_name'] = $name;
+		}
+
+		return elgg_enable_annotations($options);
+	}
+
+	/**
+	 * Helper function to return annotation calculation results
+	 *
+	 * @param string $name        The annotation name.
+	 * @param string $calculation A valid MySQL function to run its values through
+	 * @return mixed
+	 */
+	private function getAnnotationCalculation($name, $calculation) {
+		$options = array(
+			'guid' => $this->getGUID(),
+			'annotation_name' => $name,
+			'annotation_calculation' => $calculation
+		);
+
+		return elgg_get_annotations($options);
+	}
+
+	/**
+	 * Adds an annotation to an entity.
+	 *
+	 * @warning By default, annotations are private.
+	 *
+	 * @warning Annotating an unsaved entity more than once with the same name
+	 *          will only save the last annotation.
+	 *
+	 * @param string $name      Annotation name
+	 * @param mixed  $value     Annotation value
+	 * @param int    $access_id Access ID
+	 * @param int    $owner_id  GUID of the annotation owner
+	 * @param string $vartype   The type of annotation value
+	 *
+	 * @return bool
+	 */
+	function annotate($name, $value, $access_id = ACCESS_PRIVATE, $owner_id = 0, $vartype = "") {
+		if ((int) $this->guid > 0) {
+			return create_annotation($this->getGUID(), $name, $value, $vartype, $owner_id, $access_id);
+		} else {
+			$this->temp_annotations[$name] = $value;
+		}
+		return true;
+	}
+
+	/**
+	 * Returns an array of annotations.
+	 *
+	 * @param string $name   Annotation name
+	 * @param int    $limit  Limit
+	 * @param int    $offset Offset
+	 * @param string $order  Order by time: asc or desc
+	 *
+	 * @return array
+	 */
+	function getAnnotations($name, $limit = 50, $offset = 0, $order = "asc") {
+		if ((int) ($this->guid) > 0) {
+
+			$options = array(
+				'guid' => $this->guid,
+				'annotation_name' => $name,
+				'limit' => $limit,
+				'offset' => $offset,
+			);
+
+			if ($order != 'asc') {
+				$options['reverse_order_by'] = true;
+			}
+
+			return elgg_get_annotations($options);
+		} else if (isset($this->temp_annotations[$name])) {
+			return array($this->temp_annotations[$name]);
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Remove an annotation or all annotations for this entity.
+	 *
+	 * @warning Calling this method with no or an empty argument will remove
+	 * all annotations on the entity.
+	 *
+	 * @param string $name Annotation name
+	 * @return bool
+	 * @deprecated 1.8 Use ->deleteAnnotations()
+	 */
+	function clearAnnotations($name = "") {
+		elgg_deprecated_notice('ElggEntity->clearAnnotations() is deprecated by ->deleteAnnotations()', 1.8);
+		return $this->deleteAnnotations($name);
+	}
+
+	/**
+	 * Count annotations.
+	 *
+	 * @param string $name The type of annotation.
+	 *
+	 * @return int
+	 */
+	function countAnnotations($name = "") {
+		return $this->getAnnotationCalculation($name, 'count');
+	}
+
+	/**
+	 * Get the average of an integer type annotation.
+	 *
+	 * @param string $name Annotation name
+	 *
+	 * @return int
+	 */
+	function getAnnotationsAvg($name) {
+		return $this->getAnnotationCalculation($name, 'avg');
+	}
+
+	/**
+	 * Get the sum of integer type annotations of a given name.
+	 *
+	 * @param string $name Annotation name
+	 *
+	 * @return int
+	 */
+	function getAnnotationsSum($name) {
+		return $this->getAnnotationCalculation($name, 'sum');
+	}
+
+	/**
+	 * Get the minimum of integer type annotations of given name.
+	 *
+	 * @param string $name Annotation name
+	 *
+	 * @return int
+	 */
+	function getAnnotationsMin($name) {
+		return $this->getAnnotationCalculation($name, 'min');
+	}
+
+	/**
+	 * Get the maximum of integer type annotations of a given name.
+	 *
+	 * @param string $name Annotation name
+	 *
+	 * @return int
+	 */
+	function getAnnotationsMax($name) {
+		return $this->getAnnotationCalculation($name, 'max');
+	}
+
+	/**
+	 * Count the number of comments attached to this entity.
+	 *
+	 * @return int Number of comments
+	 * @since 1.8.0
+	 */
+	function countComments() {
+		$params = array('entity' => $this);
+		$num = elgg_trigger_plugin_hook('comments:count', $this->getType(), $params);
+
+		if (is_int($num)) {
+			return $num;
+		} else {
+			return $this->getAnnotationCalculation('generic_comment', 'count');
+		}
+	}
+
+	/**
+	 * Gets an array of entities with a relationship to this entity.
+	 *
+	 * @param string $relationship Relationship type (eg "friends")
+	 * @param bool   $inverse      Is this an inverse relationship?
+	 * @param int    $limit        Number of elements to return
+	 * @param int    $offset       Indexing offset
+	 *
+	 * @return array|false An array of entities or false on failure
+	 */
+	function getEntitiesFromRelationship($relationship, $inverse = false, $limit = 50, $offset = 0) {
+		return elgg_get_entities_from_relationship(array(
+			'relationship' => $relationship,
+			'relationship_guid' => $this->getGUID(),
+			'inverse_relationship' => $inverse,
+			'limit' => $limit,
+			'offset' => $offset
+		));
+	}
+
+	/**
+	 * Gets the number of of entities from a specific relationship type
+	 *
+	 * @param string $relationship         Relationship type (eg "friends")
+	 * @param bool   $inverse_relationship Invert relationship
+	 *
+	 * @return int|false The number of entities or false on failure
+	 */
+	function countEntitiesFromRelationship($relationship, $inverse_relationship = FALSE) {
+		return elgg_get_entities_from_relationship(array(
+			'relationship' => $relationship,
+			'relationship_guid' => $this->getGUID(),
+			'inverse_relationship' => $inverse_relationship,
+			'count' => TRUE
+		));
+	}
+
+	/**
+	 * Can a user edit this entity.
+	 *
+	 * @param int $user_guid The user GUID, optionally (default: logged in user)
+	 *
+	 * @return bool
+	 */
+	function canEdit($user_guid = 0) {
+		return can_edit_entity($this->getGUID(), $user_guid);
+	}
+
+	/**
+	 * Can a user edit metadata on this entity
+	 *
+	 * @param ElggMetadata $metadata  The piece of metadata to specifically check
+	 * @param int          $user_guid The user GUID, optionally (default: logged in user)
+	 *
+	 * @return bool
+	 */
+	function canEditMetadata($metadata = null, $user_guid = 0) {
+		return can_edit_entity_metadata($this->getGUID(), $user_guid, $metadata);
+	}
+
+	/**
+	 * Can a user add an entity to this container
+	 *
+	 * @param int    $user_guid The user.
+	 * @param string $type      The type of entity we're looking to write
+	 * @param string $subtype   The subtype of the entity we're looking to write
+	 *
+	 * @return bool
+	 */
+	public function canWriteToContainer($user_guid = 0, $type = 'all', $subtype = 'all') {
+		return can_write_to_container($user_guid, $this->guid, $type, $subtype);
+	}
+
+	/**
+	 * Can a user comment on an entity?
+	 *
+	 * @tip Can be overridden by registering for the permissions_check:comment,
+	 * <entity type> plugin hook.
+	 *
+	 * @param int $user_guid User guid (default is logged in user)
+	 *
+	 * @return bool
+	 */
+	public function canComment($user_guid = 0) {
+		if ($user_guid == 0) {
+			$user_guid = elgg_get_logged_in_user_guid();
+		}
+		$user = get_entity($user_guid);
+
+		// By default, we don't take a position of whether commenting is allowed
+		// because it is handled by the subclasses of ElggEntity
+		$params = array('entity' => $this, 'user' => $user);
+		return elgg_trigger_plugin_hook('permissions_check:comment', $this->type, $params, null);
+	}
+
+	/**
+	 * Can a user annotate an entity?
+	 *
+	 * @tip Can be overridden by registering for the permissions_check:annotate,
+	 * <entity type> plugin hook.
+	 *
+	 * @tip If you want logged out users to annotate an object, do not call
+	 * canAnnotate(). It's easier than using the plugin hook.
+	 *
+	 * @param int    $user_guid       User guid (default is logged in user)
+	 * @param string $annotation_name The name of the annotation (default is unspecified)
+	 *
+	 * @return bool
+	 */
+	public function canAnnotate($user_guid = 0, $annotation_name = '') {
+		if ($user_guid == 0) {
+			$user_guid = elgg_get_logged_in_user_guid();
+		}
+		$user = get_entity($user_guid);
+
+		$return = true;
+		if (!$user) {
+			$return = false;
+		}
+
+		$params = array(
+			'entity' => $this,
+			'user' => $user,
+			'annotation_name' => $annotation_name,
+		);
+		return elgg_trigger_plugin_hook('permissions_check:annotate', $this->type, $params, $return);
+	}
+
+	/**
+	 * Returns the access_id.
+	 *
+	 * @return int The access ID
+	 */
+	public function getAccessID() {
+		return $this->get('access_id');
+	}
+
+	/**
+	 * Returns the guid.
+	 *
+	 * @return int|null GUID
+	 */
+	public function getGUID() {
+		return $this->get('guid');
+	}
+
+	/**
+	 * Returns the entity type
+	 *
+	 * @return string Entity type
+	 */
+	public function getType() {
+		return $this->get('type');
+	}
+
+	/**
+	 * Returns the entity subtype string
+	 *
+	 * @note This returns a string.  If you want the id, use ElggEntity::subtype.
+	 *
+	 * @return string The entity subtype
+	 */
+	public function getSubtype() {
+		// If this object hasn't been saved, then return the subtype string.
+		if (!((int) $this->guid > 0)) {
+			return $this->get('subtype');
+		}
+
+		return get_subtype_from_id($this->get('subtype'));
+	}
+
+	/**
+	 * Get the guid of the entity's owner.
+	 *
+	 * @return int The owner GUID
+	 */
+	public function getOwnerGUID() {
+		return $this->owner_guid;
+	}
+
+	/**
+	 * Return the guid of the entity's owner.
+	 *
+	 * @return int The owner GUID
+	 * @deprecated 1.8 Use getOwnerGUID()
+	 */
+	public function getOwner() {
+		elgg_deprecated_notice("ElggEntity::getOwner deprecated for ElggEntity::getOwnerGUID", 1.8);
+		return $this->getOwnerGUID();
+	}
+
+	/**
+	 * Gets the ElggEntity that owns this entity.
+	 *
+	 * @return ElggEntity The owning entity
+	 */
+	public function getOwnerEntity() {
+		return get_entity($this->owner_guid);
+	}
+
+	/**
+	 * Set the container for this object.
+	 *
+	 * @param int $container_guid The ID of the container.
+	 *
+	 * @return bool
+	 */
+	public function setContainerGUID($container_guid) {
+		$container_guid = (int)$container_guid;
+
+		return $this->set('container_guid', $container_guid);
+	}
+
+	/**
+	 * Set the container for this object.
+	 *
+	 * @param int $container_guid The ID of the container.
+	 *
+	 * @return bool
+	 * @deprecated 1.8 use setContainerGUID()
+	 */
+	public function setContainer($container_guid) {
+		elgg_deprecated_notice("ElggObject::setContainer deprecated for ElggEntity::setContainerGUID", 1.8);
+		$container_guid = (int)$container_guid;
+
+		return $this->set('container_guid', $container_guid);
+	}
+
+	/**
+	 * Gets the container GUID for this entity.
+	 *
+	 * @return int
+	 */
+	public function getContainerGUID() {
+		return $this->get('container_guid');
+	}
+
+	/**
+	 * Gets the container GUID for this entity.
+	 *
+	 * @return int
+	 * @deprecated 1.8 Use getContainerGUID()
+	 */
+	public function getContainer() {
+		elgg_deprecated_notice("ElggObject::getContainer deprecated for ElggEntity::getContainerGUID", 1.8);
+		return $this->get('container_guid');
+	}
+
+	/**
+	 * Get the container entity for this object.
+	 *
+	 * @return ElggEntity
+	 * @since 1.8.0
+	 */
+	public function getContainerEntity() {
+		return get_entity($this->getContainerGUID());
+	}
+
+	/**
+	 * Returns the UNIX epoch time that this entity was last updated
+	 *
+	 * @return int UNIX epoch time
+	 */
+	public function getTimeUpdated() {
+		return $this->get('time_updated');
+	}
+
+	/**
+	 * Returns the URL for this entity
+	 *
+	 * @return string The URL
+	 * @see register_entity_url_handler()
+	 * @see ElggEntity::setURL()
+	 */
+	public function getURL() {
+		if (!empty($this->url_override)) {
+			return $this->url_override;
+		}
+		return get_entity_url($this->getGUID());
+	}
+
+	/**
+	 * Overrides the URL returned by getURL()
+	 *
+	 * @warning This override exists only for the life of the object.
+	 *
+	 * @param string $url The new item URL
+	 *
+	 * @return string The URL
+	 */
+	public function setURL($url) {
+		$this->url_override = $url;
+		return $url;
+	}
+
+	/**
+	 * Get the URL for this entity's icon
+	 *
+	 * Plugins can register for the 'entity:icon:url', <type> plugin hook
+	 * to customize the icon for an entity.
+	 *
+	 * @param string $size Size of the icon: tiny, small, medium, large
+	 *
+	 * @return string The URL
+	 * @since 1.8.0
+	 */
+	public function getIconURL($size = 'medium') {
+		$size = elgg_strtolower($size);
+
+		if (isset($this->icon_override[$size])) {
+			elgg_deprecated_notice("icon_override on an individual entity is deprecated", 1.8);
+			return $this->icon_override[$size];
+		}
+
+		$type = $this->getType();
+		$params = array(
+			'entity' => $this,
+			'size' => $size,
+		);
+
+		$url = elgg_trigger_plugin_hook('entity:icon:url', $type, $params, null);
+		if ($url == null) {
+			$url = "_graphics/icons/default/$size.png";
+		}
+
+		return elgg_normalize_url($url);
+	}
+
+	/**
+	 * Returns a URL for the entity's icon.
+	 *
+	 * @param string $size Either 'large', 'medium', 'small' or 'tiny'
+	 *
+	 * @return string The url or false if no url could be worked out.
+	 * @deprecated Use getIconURL()
+	 */
+	public function getIcon($size = 'medium') {
+		elgg_deprecated_notice("getIcon() deprecated by getIconURL()", 1.8);
+		return $this->getIconURL($size);
+	}
+
+	/**
+	 * Set an icon override for an icon and size.
+	 *
+	 * @warning This override exists only for the life of the object.
+	 *
+	 * @param string $url  The url of the icon.
+	 * @param string $size The size its for.
+	 *
+	 * @return bool
+	 * @deprecated 1.8 See getIconURL() for the plugin hook to use
+	 */
+	public function setIcon($url, $size = 'medium') {
+		elgg_deprecated_notice("icon_override on an individual entity is deprecated", 1.8);
+
+		$url = sanitise_string($url);
+		$size = sanitise_string($size);
+
+		if (!$this->icon_override) {
+			$this->icon_override = array();
+		}
+		$this->icon_override[$size] = $url;
+
+		return true;
+	}
+
+	/**
+	 * Tests to see whether the object has been fully loaded.
+	 *
+	 * @return bool
+	 */
+	public function isFullyLoaded() {
+		return ! ($this->attributes['tables_loaded'] < $this->attributes['tables_split']);
+	}
+
+	/**
+	 * Save an entity.
+	 *
+	 * @return bool|int
+	 * @throws IOException
+	 */
+	public function save() {
+		$guid = $this->getGUID();
+		if ($guid > 0) {
+
+			// See #5600. This ensures the lower level can_edit_entity() check will use a
+			// fresh entity from the DB so it sees the persisted owner_guid
+			_elgg_disable_caching_for_entity($guid);
+
+			$ret = update_entity(
+				$guid,
+				$this->get('owner_guid'),
+				$this->get('access_id'),
+				$this->get('container_guid'),
+				$this->get('time_created')
+			);
+
+			_elgg_enable_caching_for_entity($guid);
+			_elgg_cache_entity($this);
+
+			return $ret;
+		} else {
+			// Create a new entity (nb: using attribute array directly
+			// 'cos set function does something special!)
+			$this->attributes['guid'] = create_entity($this->attributes['type'],
+				$this->attributes['subtype'], $this->attributes['owner_guid'],
+				$this->attributes['access_id'], $this->attributes['site_guid'],
+				$this->attributes['container_guid']);
+
+			if (!$this->attributes['guid']) {
+				throw new IOException(elgg_echo('IOException:BaseEntitySaveFailed'));
+			}
+
+			// Save any unsaved metadata
+			// @todo How to capture extra information (access id etc)
+			if (sizeof($this->temp_metadata) > 0) {
+				foreach ($this->temp_metadata as $name => $value) {
+					$this->$name = $value;
+					unset($this->temp_metadata[$name]);
+				}
+			}
+
+			// Save any unsaved annotations.
+			if (sizeof($this->temp_annotations) > 0) {
+				foreach ($this->temp_annotations as $name => $value) {
+					$this->annotate($name, $value);
+					unset($this->temp_annotations[$name]);
+				}
+			}
+
+			// Save any unsaved private settings.
+			if (sizeof($this->temp_private_settings) > 0) {
+				foreach ($this->temp_private_settings as $name => $value) {
+					$this->setPrivateSetting($name, $value);
+					unset($this->temp_private_settings[$name]);
+				}
+			}
+
+			// set the subtype to id now rather than a string
+			$this->attributes['subtype'] = get_subtype_id($this->attributes['type'],
+				$this->attributes['subtype']);
+
+			_elgg_cache_entity($this);
+
+			return $this->attributes['guid'];
+		}
+	}
+
+	/**
+	 * Loads attributes from the entities table into the object.
+	 *
+	 * @param mixed $guid GUID of entity or stdClass object from entities table
+	 *
+	 * @return bool
+	 */
+	protected function load($guid) {
+		if ($guid instanceof stdClass) {
+			$row = $guid;
+		} else {
+			$row = get_entity_as_row($guid);
+		}
+
+		if ($row) {
+			// Create the array if necessary - all subclasses should test before creating
+			if (!is_array($this->attributes)) {
+				$this->attributes = array();
+			}
+
+			// Now put these into the attributes array as core values
+			$objarray = (array) $row;
+			foreach ($objarray as $key => $value) {
+				$this->attributes[$key] = $value;
+			}
+
+			// Increment the portion counter
+			if (!$this->isFullyLoaded()) {
+				$this->attributes['tables_loaded']++;
+			}
+
+			// guid needs to be an int  https://github.com/elgg/elgg/issues/4111
+			$this->attributes['guid'] = (int)$this->attributes['guid'];
+
+			// Cache object handle
+			if ($this->attributes['guid']) {
+				_elgg_cache_entity($this);
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Disable this entity.
+	 *
+	 * Disabled entities are not returned by getter functions.
+	 * To enable an entity, use {@link enable_entity()}.
+	 *
+	 * Recursively disabling an entity will disable all entities
+	 * owned or contained by the parent entity.
+	 *
+	 * @internal Disabling an entity sets the 'enabled' column to 'no'.
+	 *
+	 * @param string $reason    Optional reason
+	 * @param bool   $recursive Recursively disable all contained entities?
+	 *
+	 * @return bool
+	 * @see enable_entity()
+	 * @see ElggEntity::enable()
+	 */
+	public function disable($reason = "", $recursive = true) {
+		if ($r = disable_entity($this->get('guid'), $reason, $recursive)) {
+			$this->attributes['enabled'] = 'no';
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Enable an entity
+	 *
+	 * @warning Disabled entities can't be loaded unless
+	 * {@link access_show_hidden_entities(true)} has been called.
+	 *
+	 * @see enable_entity()
+	 * @see access_show_hiden_entities()
+	 * @return bool
+	 */
+	public function enable() {
+		if ($r = enable_entity($this->get('guid'))) {
+			$this->attributes['enabled'] = 'yes';
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Is this entity enabled?
+	 *
+	 * @return boolean
+	 */
+	public function isEnabled() {
+		if ($this->enabled == 'yes') {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Delete this entity.
+	 *
+	 * @param bool $recursive Whether to delete all the entities contained by this entity
+	 *
+	 * @return bool
+	 */
+	public function delete($recursive = true) {
+		return delete_entity($this->get('guid'), $recursive);
+	}
+
+	/*
+	 * LOCATABLE INTERFACE
+	 */
+
+	/**
+	 * Gets the 'location' metadata for the entity
+	 *
+	 * @return string The location
+	 */
+	public function getLocation() {
+		return $this->location;
+	}
+
+	/**
+	 * Sets the 'location' metadata for the entity
+	 *
+	 * @todo Unimplemented
+	 *
+	 * @param string $location String representation of the location
+	 *
+	 * @return bool
+	 */
+	public function setLocation($location) {
+		$this->location = $location;
+		return true;
+	}
+
+	/**
+	 * Set latitude and longitude metadata tags for a given entity.
+	 *
+	 * @param float $lat  Latitude
+	 * @param float $long Longitude
+	 *
+	 * @return bool
+	 * @todo Unimplemented
+	 */
+	public function setLatLong($lat, $long) {
+		$this->set('geo:lat', $lat);
+		$this->set('geo:long', $long);
+
+		return true;
+	}
+
+	/**
+	 * Return the entity's latitude.
+	 *
+	 * @return float
+	 * @todo Unimplemented
+	 */
+	public function getLatitude() {
+		return (float)$this->get('geo:lat');
+	}
+
+	/**
+	 * Return the entity's longitude
+	 *
+	 * @return float
+	 */
+	public function getLongitude() {
+		return (float)$this->get('geo:long');
+	}
+
+	/*
+	 * NOTABLE INTERFACE
+	 */
+
+	/**
+	 * Set the time and duration of an object
+	 *
+	 * @param int $hour     If ommitted, now is assumed.
+	 * @param int $minute   If ommitted, now is assumed.
+	 * @param int $second   If ommitted, now is assumed.
+	 * @param int $day      If ommitted, now is assumed.
+	 * @param int $month    If ommitted, now is assumed.
+	 * @param int $year     If ommitted, now is assumed.
+	 * @param int $duration Duration of event, remainder of the day is assumed.
+	 *
+	 * @return true
+	 * @todo Unimplemented
+	 */
+	public function setCalendarTimeAndDuration($hour = NULL, $minute = NULL, $second = NULL,
+	$day = NULL, $month = NULL, $year = NULL, $duration = NULL) {
+
+		$start = mktime($hour, $minute, $second, $month, $day, $year);
+		$end = $start + abs($duration);
+		if (!$duration) {
+			$end = get_day_end($day, $month, $year);
+		}
+
+		$this->calendar_start = $start;
+		$this->calendar_end = $end;
+
+		return true;
+	}
+
+	/**
+	 * Returns the start timestamp.
+	 *
+	 * @return int
+	 * @todo Unimplemented
+	 */
+	public function getCalendarStartTime() {
+		return (int)$this->calendar_start;
+	}
+
+	/**
+	 * Returns the end timestamp.
+	 *
+	 * @todo Unimplemented
+	 *
+	 * @return int
+	 */
+	public function getCalendarEndTime() {
+		return (int)$this->calendar_end;
+	}
+
+	/*
+	 * EXPORTABLE INTERFACE
+	 */
+
+	/**
+	 * Returns an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array(
+			'guid',
+			'type',
+			'subtype',
+			'time_created',
+			'time_updated',
+			'container_guid',
+			'owner_guid',
+			'site_guid'
+		);
+	}
+
+	/**
+	 * Export this class into an array of ODD Elements containing all necessary fields.
+	 * Override if you wish to return more information than can be found in
+	 * $this->attributes (shouldn't happen)
+	 *
+	 * @return array
+	 */
+	public function export() {
+		$tmp = array();
+
+		// Generate uuid
+		$uuid = guid_to_uuid($this->getGUID());
+
+		// Create entity
+		$odd = new ODDEntity(
+			$uuid,
+			$this->attributes['type'],
+			get_subtype_from_id($this->attributes['subtype'])
+		);
+
+		$tmp[] = $odd;
+
+		$exportable_values = $this->getExportableValues();
+
+		// Now add its attributes
+		foreach ($this->attributes as $k => $v) {
+			$meta = NULL;
+
+			if (in_array($k, $exportable_values)) {
+				switch ($k) {
+					case 'guid':			// Dont use guid in OpenDD
+					case 'type':			// Type and subtype already taken care of
+					case 'subtype':
+						break;
+
+					case 'time_created':	// Created = published
+						$odd->setAttribute('published', date("r", $v));
+						break;
+
+					case 'site_guid':	// Container
+						$k = 'site_uuid';
+						$v = guid_to_uuid($v);
+						$meta = new ODDMetaData($uuid . "attr/$k/", $uuid, $k, $v);
+						break;
+
+					case 'container_guid':	// Container
+						$k = 'container_uuid';
+						$v = guid_to_uuid($v);
+						$meta = new ODDMetaData($uuid . "attr/$k/", $uuid, $k, $v);
+						break;
+
+					case 'owner_guid':			// Convert owner guid to uuid, this will be stored in metadata
+						$k = 'owner_uuid';
+						$v = guid_to_uuid($v);
+						$meta = new ODDMetaData($uuid . "attr/$k/", $uuid, $k, $v);
+						break;
+
+					default:
+						$meta = new ODDMetaData($uuid . "attr/$k/", $uuid, $k, $v);
+				}
+
+				// set the time of any metadata created
+				if ($meta) {
+					$meta->setAttribute('published', date("r", $this->time_created));
+					$tmp[] = $meta;
+				}
+			}
+		}
+
+		// Now we do something a bit special.
+		/*
+		 * This provides a rendered view of the entity to foreign sites.
+		 */
+
+		elgg_set_viewtype('default');
+		$view = elgg_view_entity($this, array('full_view' => true));
+		elgg_set_viewtype();
+
+		$tmp[] = new ODDMetaData($uuid . "volatile/renderedentity/", $uuid,
+			'renderedentity', $view, 'volatile');
+
+		return $tmp;
+	}
+
+	/*
+	 * IMPORTABLE INTERFACE
+	 */
+
+	/**
+	 * Import data from an parsed ODD xml data array.
+	 *
+	 * @param ODD $data XML data
+	 *
+	 * @return true
+	 *
+	 * @throws InvalidParameterException
+	 */
+	public function import(ODD $data) {
+		if (!($data instanceof ODDEntity)) {
+			throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnexpectedODDClass'));
+		}
+
+		// Set type and subtype
+		$this->attributes['type'] = $data->getAttribute('class');
+		$this->attributes['subtype'] = $data->getAttribute('subclass');
+
+		// Set owner
+		$this->attributes['owner_guid'] = elgg_get_logged_in_user_guid(); // Import as belonging to importer.
+
+		// Set time
+		$this->attributes['time_created'] = strtotime($data->getAttribute('published'));
+		$this->attributes['time_updated'] = time();
+
+		return true;
+	}
+
+	/*
+	 * SYSTEM LOG INTERFACE
+	 */
+
+	/**
+	 * Return an identification for the object for storage in the system log.
+	 * This id must be an integer.
+	 *
+	 * @return int
+	 */
+	public function getSystemLogID() {
+		return $this->getGUID();
+	}
+
+	/**
+	 * For a given ID, return the object associated with it.
+	 * This is used by the river functionality primarily.
+	 *
+	 * This is useful for checking access permissions etc on objects.
+	 *
+	 * @param int $id GUID.
+	 *
+	 * @todo How is this any different or more useful than get_entity($guid)
+	 * or new ElggEntity($guid)?
+	 *
+	 * @return int GUID
+	 */
+	public function getObjectFromID($id) {
+		return get_entity($id);
+	}
+
+	/**
+	 * Returns tags for this entity.
+	 *
+	 * @warning Tags must be registered by {@link elgg_register_tag_metadata_name()}.
+	 *
+	 * @param array $tag_names Optionally restrict by tag metadata names.
+	 *
+	 * @return array
+	 */
+	public function getTags($tag_names = NULL) {
+		if ($tag_names && !is_array($tag_names)) {
+			$tag_names = array($tag_names);
+		}
+
+		$valid_tags = elgg_get_registered_tag_metadata_names();
+		$entity_tags = array();
+
+		foreach ($valid_tags as $tag_name) {
+			if (is_array($tag_names) && !in_array($tag_name, $tag_names)) {
+				continue;
+			}
+
+			if ($tags = $this->$tag_name) {
+				// if a single tag, metadata returns a string.
+				// if multiple tags, metadata returns an array.
+				if (is_array($tags)) {
+					$entity_tags = array_merge($entity_tags, $tags);
+				} else {
+					$entity_tags[] = $tags;
+				}
+			}
+		}
+
+		return $entity_tags;
+	}
+}
diff --git a/engine/classes/ElggExtender.php b/engine/classes/ElggExtender.php
new file mode 100644
index 000000000..25aba354f
--- /dev/null
+++ b/engine/classes/ElggExtender.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * The base class for ElggEntity extenders.
+ *
+ * Extenders allow you to attach extended information to an
+ * ElggEntity.  Core supports two: ElggAnnotation and ElggMetadata.
+ *
+ * Saving the extender data to database is handled by the child class.
+ *
+ * @tip Plugin authors would probably want to extend either ElggAnnotation
+ * or ElggMetadata instead of this class.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Extender
+ * @link       http://docs.elgg.org/DataModel/Extenders
+ * @see        ElggAnnotation
+ * @see        ElggMetadata
+ * 
+ * @property string $type         annotation or metadata (read-only after save)
+ * @property int    $id           The unique identifier (read-only)
+ * @property int    $entity_guid  The GUID of the entity that this extender describes
+ * @property int    $access_id    Specifies the visibility level of this extender
+ * @property string $name         The name of this extender
+ * @property mixed  $value        The value of the extender (int or string)
+ * @property int    $time_created A UNIX timestamp of when the extender was created (read-only, set on first save)
+ */
+abstract class ElggExtender extends ElggData {
+
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see ElggData::initializeAttributes()
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = NULL;
+	}
+
+	/**
+	 * Returns an attribute
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	protected function get($name) {
+		if (array_key_exists($name, $this->attributes)) {
+			// Sanitise value if necessary
+			if ($name == 'value') {
+				switch ($this->attributes['value_type']) {
+					case 'integer' :
+						return (int)$this->attributes['value'];
+						break;
+
+					//case 'tag' :
+					//case 'file' :
+					case 'text' :
+						return ($this->attributes['value']);
+						break;
+
+					default :
+						$msg = elgg_echo('InstallationException:TypeNotSupported', array(
+							$this->attributes['value_type']));
+
+						throw new InstallationException($msg);
+						break;
+				}
+			}
+
+			return $this->attributes[$name];
+		}
+		return null;
+	}
+
+	/**
+	 * Set an attribute
+	 *
+	 * @param string $name       Name
+	 * @param mixed  $value      Value
+	 * @param string $value_type Value type
+	 *
+	 * @return boolean
+	 */
+	protected function set($name, $value, $value_type = "") {
+		$this->attributes[$name] = $value;
+		if ($name == 'value') {
+			$this->attributes['value_type'] = detect_extender_valuetype($value, $value_type);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Get the GUID of the extender's owner entity.
+	 *
+	 * @return int The owner GUID
+	 */
+	public function getOwnerGUID() {
+		return $this->owner_guid;
+	}
+
+	/**
+	 * Return the guid of the entity's owner.
+	 *
+	 * @return int The owner GUID
+	 * @deprecated 1.8 Use getOwnerGUID
+	 */
+	public function getOwner() {
+		elgg_deprecated_notice("ElggExtender::getOwner deprecated for ElggExtender::getOwnerGUID", 1.8);
+		return $this->getOwnerGUID();
+	}
+
+	/**
+	 * Get the entity that owns this extender
+	 *
+	 * @return ElggEntity
+	 */
+	public function getOwnerEntity() {
+		return get_entity($this->owner_guid);
+	}
+
+	/**
+	 * Get the entity this describes.
+	 *
+	 * @return ElggEntity The entity
+	 */
+	public function getEntity() {
+		return get_entity($this->entity_guid);
+	}
+
+	/**
+	 * Returns if a user can edit this extended data.
+	 *
+	 * @param int $user_guid The GUID of the user (defaults to currently logged in user)
+	 *
+	 * @return bool
+	 */
+	public function canEdit($user_guid = 0) {
+		return can_edit_extender($this->id, $this->type, $user_guid);
+	}
+
+	/*
+	 * EXPORTABLE INTERFACE
+	 */
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array(
+			'id',
+			'entity_guid',
+			'name',
+			'value',
+			'value_type',
+			'owner_guid',
+			'type',
+		);
+	}
+
+	/**
+	 * Export this object
+	 *
+	 * @return array
+	 */
+	public function export() {
+		$uuid = get_uuid_from_object($this);
+
+		$meta = new ODDMetaData($uuid, guid_to_uuid($this->entity_guid), $this->attributes['name'],
+			$this->attributes['value'], $this->attributes['type'], guid_to_uuid($this->owner_guid));
+		$meta->setAttribute('published', date("r", $this->time_created));
+
+		return $meta;
+	}
+
+	/*
+	 * SYSTEM LOG INTERFACE
+	 */
+
+	/**
+	 * Return an identification for the object for storage in the system log.
+	 * This id must be an integer.
+	 *
+	 * @return int
+	 */
+	public function getSystemLogID() {
+		return $this->id;
+	}
+
+	/**
+	 * Return a type of extension.
+	 *
+	 * @return string
+	 */
+	public function getType() {
+		return $this->type;
+	}
+
+	/**
+	 * Return a subtype. For metadata & annotations this is the 'name' and
+	 * for relationship this is the relationship type.
+	 *
+	 * @return string
+	 */
+	public function getSubtype() {
+		return $this->name;
+	}
+
+}
diff --git a/engine/classes/ElggFile.php b/engine/classes/ElggFile.php
new file mode 100644
index 000000000..23080834b
--- /dev/null
+++ b/engine/classes/ElggFile.php
@@ -0,0 +1,440 @@
+<?php
+
+/**
+ * This class represents a physical file.
+ *
+ * Create a new ElggFile object and specify a filename, and optionally a
+ * FileStore (if one isn't specified then the default is assumed.)
+ *
+ * Open the file using the appropriate mode, and you will be able to
+ * read and write to the file.
+ *
+ * Optionally, you can also call the file's save() method, this will
+ * turn the file into an entity in the system and permit you to do
+ * things like attach tags to the file etc. This is not done automatically
+ * since there are many occasions where you may want access to file data
+ * on datastores using the ElggFile interface but do not want to create
+ * an Entity reference to it in the system (temporary files for example).
+ *
+ * @class      ElggFile
+ * @package    Elgg.Core
+ * @subpackage DataModel.File
+ */
+class ElggFile extends ElggObject {
+	/** Filestore */
+	private $filestore;
+
+	/** File handle used to identify this file in a filestore. Created by open. */
+	private $handle;
+
+	/**
+	 * Set subtype to 'file'.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['subtype'] = "file";
+	}
+
+	/**
+	 * Loads an ElggFile entity.
+	 *
+	 * @param int $guid GUID of the ElggFile object
+	 */
+	public function __construct($guid = null) {
+		parent::__construct($guid);
+
+		// Set default filestore
+		$this->filestore = $this->getFilestore();
+	}
+
+	/**
+	 * Set the filename of this file.
+	 *
+	 * @param string $name The filename.
+	 *
+	 * @return void
+	 */
+	public function setFilename($name) {
+		$this->filename = $name;
+	}
+
+	/**
+	 * Return the filename.
+	 *
+	 * @return string
+	 */
+	public function getFilename() {
+		return $this->filename;
+	}
+
+	/**
+	 * Return the filename of this file as it is/will be stored on the
+	 * filestore, which may be different to the filename.
+	 *
+	 * @return string
+	 */
+	public function getFilenameOnFilestore() {
+		return $this->filestore->getFilenameOnFilestore($this);
+	}
+
+	/**
+	 * Return the size of the filestore associated with this file
+	 *
+	 * @param string $prefix         Storage prefix
+	 * @param int    $container_guid The container GUID of the checked filestore
+	 *
+	 * @return int
+	 */
+	public function getFilestoreSize($prefix = '', $container_guid = 0) {
+		if (!$container_guid) {
+			$container_guid = $this->container_guid;
+		}
+		$fs = $this->getFilestore();
+		// @todo add getSize() to ElggFilestore
+		return $fs->getSize($prefix, $container_guid);
+	}
+
+	/**
+	 * Get the mime type of the file.
+	 *
+	 * @return string
+	 */
+	public function getMimeType() {
+		if ($this->mimetype) {
+			return $this->mimetype;
+		}
+
+		// @todo Guess mimetype if not here
+	}
+
+	/**
+	 * Set the mime type of the file.
+	 *
+	 * @param string $mimetype The mimetype
+	 *
+	 * @return bool
+	 */
+	public function setMimeType($mimetype) {
+		return $this->mimetype = $mimetype;
+	}
+
+	/**
+	 * Detects mime types based on filename or actual file.
+	 *
+	 * @param mixed $file    The full path of the file to check. For uploaded files, use tmp_name.
+	 * @param mixed $default A default. Useful to pass what the browser thinks it is.
+	 * @since 1.7.12
+	 *
+	 * @note If $file is provided, this may be called statically
+	 *
+	 * @return mixed Detected type on success, false on failure.
+	 */
+	public function detectMimeType($file = null, $default = null) {
+		if (!$file) {
+			if (isset($this) && $this->filename) {
+				$file = $this->filename;
+			} else {
+				return false;
+			}
+		}
+
+		$mime = false;
+
+		// for PHP5 folks.
+		if (function_exists('finfo_file') && defined('FILEINFO_MIME_TYPE')) {
+			$resource = finfo_open(FILEINFO_MIME_TYPE);
+			if ($resource) {
+				$mime = finfo_file($resource, $file);
+			}
+		}
+
+		// for everyone else.
+		if (!$mime && function_exists('mime_content_type')) {
+			$mime = mime_content_type($file);
+		}
+
+		// default
+		if (!$mime) {
+			return $default;
+		}
+
+		return $mime;
+	}
+
+	/**
+	 * Set the optional file description.
+	 *
+	 * @param string $description The description.
+	 *
+	 * @return bool
+	 */
+	public function setDescription($description) {
+		$this->description = $description;
+	}
+
+	/**
+	 * Open the file with the given mode
+	 *
+	 * @param string $mode Either read/write/append
+	 *
+	 * @return resource File handler
+	 *
+	 * @throws IOException|InvalidParameterException
+	 */
+	public function open($mode) {
+		if (!$this->getFilename()) {
+			throw new IOException(elgg_echo('IOException:MissingFileName'));
+		}
+
+		// See if file has already been saved
+		// seek on datastore, parameters and name?
+
+		// Sanity check
+		if (
+			($mode != "read") &&
+			($mode != "write") &&
+			($mode != "append")
+		) {
+			$msg = elgg_echo('InvalidParameterException:UnrecognisedFileMode', array($mode));
+			throw new InvalidParameterException($msg);
+		}
+
+		// Get the filestore
+		$fs = $this->getFilestore();
+
+		// Ensure that we save the file details to object store
+		//$this->save();
+
+		// Open the file handle
+		$this->handle = $fs->open($this, $mode);
+
+		return $this->handle;
+	}
+
+	/**
+	 * Write data.
+	 *
+	 * @param string $data The data
+	 *
+	 * @return bool
+	 */
+	public function write($data) {
+		$fs = $this->getFilestore();
+
+		return $fs->write($this->handle, $data);
+	}
+
+	/**
+	 * Read data.
+	 *
+	 * @param int $length Amount to read.
+	 * @param int $offset The offset to start from.
+	 *
+	 * @return mixed Data or false
+	 */
+	public function read($length, $offset = 0) {
+		$fs = $this->getFilestore();
+
+		return $fs->read($this->handle, $length, $offset);
+	}
+
+	/**
+	 * Gets the full contents of this file.
+	 *
+	 * @return mixed The file contents.
+	 */
+	public function grabFile() {
+		$fs = $this->getFilestore();
+		return $fs->grabFile($this);
+	}
+
+	/**
+	 * Close the file and commit changes
+	 *
+	 * @return bool
+	 */
+	public function close() {
+		$fs = $this->getFilestore();
+
+		if ($fs->close($this->handle)) {
+			$this->handle = NULL;
+
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Delete this file.
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		$fs = $this->getFilestore();
+		
+		$result = $fs->delete($this);
+		
+		if ($this->getGUID() && $result) {
+			$result = parent::delete();
+		}
+		
+		return $result;
+	}
+
+	/**
+	 * Seek a position in the file.
+	 *
+	 * @param int $position Position in bytes
+	 *
+	 * @return bool
+	 */
+	public function seek($position) {
+		$fs = $this->getFilestore();
+
+		// @todo add seek() to ElggFilestore
+		return $fs->seek($this->handle, $position);
+	}
+
+	/**
+	 * Return the current position of the file.
+	 *
+	 * @return int The file position
+	 */
+	public function tell() {
+		$fs = $this->getFilestore();
+
+		return $fs->tell($this->handle);
+	}
+
+	/**
+	 * Return the size of the file in bytes.
+	 *
+	 * @return int
+	 */
+	public function size() {
+		return $this->filestore->getFileSize($this);
+	}
+
+	/**
+	 * Return a boolean value whether the file handle is at the end of the file
+	 *
+	 * @return bool
+	 */
+	public function eof() {
+		$fs = $this->getFilestore();
+
+		return $fs->eof($this->handle);
+	}
+
+	/**
+	 * Returns if the file exists
+	 *
+	 * @return bool
+	 */
+	public function exists() {
+		$fs = $this->getFilestore();
+
+		return $fs->exists($this);
+	}
+
+	/**
+	 * Set a filestore.
+	 *
+	 * @param ElggFilestore $filestore The file store.
+	 *
+	 * @return void
+	 */
+	public function setFilestore(ElggFilestore $filestore) {
+		$this->filestore = $filestore;
+	}
+
+	/**
+	 * Return a filestore suitable for saving this file.
+	 * This filestore is either a pre-registered filestore,
+	 * a filestore as recorded in metadata or the system default.
+	 *
+	 * @return ElggFilestore
+	 *
+	 * @throws ClassNotFoundException
+	 */
+	protected function getFilestore() {
+		// Short circuit if already set.
+		if ($this->filestore) {
+			return $this->filestore;
+		}
+
+		// ask for entity specific filestore
+		// saved as filestore::className in metadata.
+		// need to get all filestore::* metadata because the rest are "parameters" that
+		// get passed to filestore::setParameters()
+		if ($this->guid) {
+			$options = array(
+				'guid' => $this->guid,
+				'where' => array("n.string LIKE 'filestore::%'"),
+			);
+
+			$mds = elgg_get_metadata($options);
+
+			$parameters = array();
+			foreach ($mds as $md) {
+				list($foo, $name) = explode("::", $md->name);
+				if ($name == 'filestore') {
+					$filestore = $md->value;
+				}
+				$parameters[$name] = $md->value;
+			}
+		}
+
+		// need to check if filestore is set because this entity is loaded in save()
+		// before the filestore metadata is saved.
+		if (isset($filestore)) {
+			if (!class_exists($filestore)) {
+				$msg = elgg_echo('ClassNotFoundException:NotFoundNotSavedWithFile',
+					array($filestore, $this->guid));
+				throw new ClassNotFoundException($msg);
+			}
+
+			$this->filestore = new $filestore();
+			$this->filestore->setParameters($parameters);
+			// @todo explain why $parameters will always be set here (PhpStorm complains)
+		}
+
+		// this means the entity hasn't been saved so fallback to default
+		if (!$this->filestore) {
+			$this->filestore = get_default_filestore();
+		}
+
+		return $this->filestore;
+	}
+
+	/**
+	 * Save the file
+	 *
+	 * Write the file's data to the filestore and save
+	 * the corresponding entity.
+	 *
+	 * @see ElggObject::save()
+	 *
+	 * @return bool
+	 */
+	public function save() {
+		if (!parent::save()) {
+			return false;
+		}
+
+		// Save datastore metadata
+		$params = $this->filestore->getParameters();
+		foreach ($params as $k => $v) {
+			$this->setMetaData("filestore::$k", $v);
+		}
+
+		// Now make a note of the filestore class
+		$this->setMetaData("filestore::filestore", get_class($this->filestore));
+
+		return true;
+	}
+}
diff --git a/engine/classes/ElggFileCache.php b/engine/classes/ElggFileCache.php
new file mode 100644
index 000000000..94143f777
--- /dev/null
+++ b/engine/classes/ElggFileCache.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * ElggFileCache
+ * Store cached data in a file store.
+ *
+ * @package    Elgg.Core
+ * @subpackage Caches
+ */
+class ElggFileCache extends ElggCache {
+	/**
+	 * Set the Elgg cache.
+	 *
+	 * @param string $cache_path The cache path.
+	 * @param int    $max_age    Maximum age in seconds, 0 if no limit.
+	 * @param int    $max_size   Maximum size of cache in seconds, 0 if no limit.
+	 *
+	 * @throws ConfigurationException
+	 */
+	function __construct($cache_path, $max_age = 0, $max_size = 0) {
+		$this->setVariable("cache_path", $cache_path);
+		$this->setVariable("max_age", $max_age);
+		$this->setVariable("max_size", $max_size);
+
+		if ($cache_path == "") {
+			throw new ConfigurationException(elgg_echo('ConfigurationException:NoCachePath'));
+		}
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Create and return a handle to a file.
+	 *
+	 * @deprecated 1.8 Use ElggFileCache::createFile()
+	 *
+	 * @param string $filename Filename to save as
+	 * @param string $rw       Write mode
+	 *
+	 * @return mixed
+	 */
+	protected function create_file($filename, $rw = "rb") {
+		elgg_deprecated_notice('ElggFileCache::create_file() is deprecated by ::createFile()', 1.8);
+
+		return $this->createFile($filename, $rw);
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Create and return a handle to a file.
+	 *
+	 * @param string $filename Filename to save as
+	 * @param string $rw       Write mode
+	 *
+	 * @return mixed
+	 */
+	protected function createFile($filename, $rw = "rb") {
+		// Create a filename matrix
+		$matrix = "";
+		$depth = strlen($filename);
+		if ($depth > 5) {
+			$depth = 5;
+		}
+
+		// Create full path
+		$path = $this->getVariable("cache_path") . $matrix;
+		if (!is_dir($path)) {
+			mkdir($path, 0700, true);
+		}
+
+		// Open the file
+		if ((!file_exists($path . $filename)) && ($rw == "rb")) {
+			return false;
+		}
+
+		return fopen($path . $filename, $rw);
+	}
+
+	// @codingStandardsIgnoreStart
+	/**
+	 * Create a sanitised filename for the file.
+	 *
+	 * @deprecated 1.8 Use ElggFileCache::sanitizeFilename()
+	 *
+	 * @param string $filename The filename
+	 *
+	 * @return string
+	 */
+	protected function sanitise_filename($filename) {
+		// @todo : Writeme
+
+		return $filename;
+	}
+	// @codingStandardsIgnoreEnd
+
+	/**
+	 * Create a sanitised filename for the file.
+	 *
+	 * @param string $filename The filename
+	 *
+	 * @return string
+	 */
+	protected function sanitizeFilename($filename) {
+		// @todo : Writeme
+
+		return $filename;
+	}
+
+	/**
+	 * Save a key
+	 *
+	 * @param string $key  Name
+	 * @param string $data Value
+	 *
+	 * @return boolean
+	 */
+	public function save($key, $data) {
+		$f = $this->createFile($this->sanitizeFilename($key), "wb");
+		if ($f) {
+			$result = fwrite($f, $data);
+			fclose($f);
+
+			return $result;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Load a key
+	 *
+	 * @param string $key    Name
+	 * @param int    $offset Offset
+	 * @param int    $limit  Limit
+	 *
+	 * @return string
+	 */
+	public function load($key, $offset = 0, $limit = null) {
+		$f = $this->createFile($this->sanitizeFilename($key));
+		if ($f) {
+			if (!$limit) {
+				$limit = -1;
+			}
+
+			$data = stream_get_contents($f, $limit, $offset);
+
+			fclose($f);
+
+			return $data;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Invalidate a given key.
+	 *
+	 * @param string $key Name
+	 *
+	 * @return bool
+	 */
+	public function delete($key) {
+		$dir = $this->getVariable("cache_path");
+
+		if (file_exists($dir . $key)) {
+			return unlink($dir . $key);
+		}
+		return TRUE;
+	}
+
+	/**
+	 * Delete all files in the directory of this file cache
+	 *
+	 * @return void
+	 */
+	public function clear() {
+		$dir = $this->getVariable("cache_path");
+
+		$exclude = array(".", "..");
+
+		$files = scandir($dir);
+		if (!$files) {
+			return;
+		}
+
+		foreach ($files as $f) {
+			if (!in_array($f, $exclude)) {
+				unlink($dir . $f);
+			}
+		}
+	}
+
+	/**
+	 * Preform cleanup and invalidates cache upon object destruction
+	 *
+	 * @throws IOException
+	 */
+	public function __destruct() {
+		// @todo Check size and age, clean up accordingly
+		$size = 0;
+		$dir = $this->getVariable("cache_path");
+
+		// Short circuit if both size and age are unlimited
+		if (($this->getVariable("max_age") == 0) && ($this->getVariable("max_size") == 0)) {
+			return;
+		}
+
+		$exclude = array(".", "..");
+
+		$files = scandir($dir);
+		if (!$files) {
+			throw new IOException(elgg_echo('IOException:NotDirectory', array($dir)));
+		}
+
+		// Perform cleanup
+		foreach ($files as $f) {
+			if (!in_array($f, $exclude)) {
+				$stat = stat($dir . $f);
+
+				// Add size
+				$size .= $stat['size'];
+
+				// Is this older than my maximum date?
+				if (($this->getVariable("max_age") > 0) && (time() - $stat['mtime'] > $this->getVariable("max_age"))) {
+					unlink($dir . $f);
+				}
+
+				// @todo Size
+			}
+		}
+	}
+}
diff --git a/engine/classes/ElggFilestore.php b/engine/classes/ElggFilestore.php
new file mode 100644
index 000000000..16430feac
--- /dev/null
+++ b/engine/classes/ElggFilestore.php
@@ -0,0 +1,139 @@
+<?php
+/**
+ * This class defines the interface for all elgg data repositories.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataStorage
+ * @class   ElggFilestore
+ */
+abstract class ElggFilestore {
+	/**
+	 * Attempt to open the file $file for storage or writing.
+	 *
+	 * @param ElggFile $file A file
+	 * @param string   $mode "read", "write", "append"
+	 *
+	 * @return mixed A handle to the opened file or false on error.
+	 */
+	abstract public function open(ElggFile $file, $mode);
+
+	/**
+	 * Write data to a given file handle.
+	 *
+	 * @param mixed  $f    The file handle - exactly what this is depends on the file system
+	 * @param string $data The binary string of data to write
+	 *
+	 * @return int Number of bytes written.
+	 */
+	abstract public function write($f, $data);
+
+	/**
+	 * Read data from a filestore.
+	 *
+	 * @param mixed $f      The file handle
+	 * @param int   $length Length in bytes to read.
+	 * @param int   $offset The optional offset.
+	 *
+	 * @return mixed String of data or false on error.
+	 */
+	abstract public function read($f, $length, $offset = 0);
+
+	/**
+	 * Seek a given position within a file handle.
+	 *
+	 * @param mixed $f        The file handle.
+	 * @param int   $position The position.
+	 *
+	 * @return void
+	 */
+	abstract public function seek($f, $position);
+
+	/**
+	 * Return a whether the end of a file has been reached.
+	 *
+	 * @param mixed $f The file handle.
+	 *
+	 * @return boolean
+	 */
+	abstract public function eof($f);
+
+	/**
+	 * Return the current position in an open file.
+	 *
+	 * @param mixed $f The file handle.
+	 *
+	 * @return int
+	 */
+	abstract public function tell($f);
+
+	/**
+	 * Close a given file handle.
+	 *
+	 * @param mixed $f The file handle
+	 *
+	 * @return bool
+	 */
+	abstract public function close($f);
+
+	/**
+	 * Delete the file associated with a given file handle.
+	 *
+	 * @param ElggFile $file The file
+	 *
+	 * @return bool
+	 */
+	abstract public function delete(ElggFile $file);
+
+	/**
+	 * Return the size in bytes for a given file.
+	 *
+	 * @param ElggFile $file The file
+	 *
+	 * @return int
+	 */
+	abstract public function getFileSize(ElggFile $file);
+
+	/**
+	 * Return the filename of a given file as stored on the filestore.
+	 *
+	 * @param ElggFile $file The file
+	 *
+	 * @return string
+	 */
+	abstract public function getFilenameOnFilestore(ElggFile $file);
+
+	/**
+	 * Get the filestore's creation parameters as an associative array.
+	 * Used for serialisation and for storing the creation details along side a file object.
+	 *
+	 * @return array
+	 */
+	abstract public function getParameters();
+
+	/**
+	 * Set the parameters from the associative array produced by $this->getParameters().
+	 *
+	 * @param array $parameters A list of parameters
+	 *
+	 * @return bool
+	 */
+	abstract public function setParameters(array $parameters);
+
+	/**
+	 * Get the contents of the whole file.
+	 *
+	 * @param mixed $file The file handle.
+	 *
+	 * @return mixed The file contents.
+	 */
+	abstract public function grabFile(ElggFile $file);
+
+	/**
+	 * Return whether a file physically exists or not.
+	 *
+	 * @param ElggFile $file The file
+	 *
+	 * @return bool
+	 */
+	abstract public function exists(ElggFile $file);
+}
diff --git a/engine/classes/ElggGroup.php b/engine/classes/ElggGroup.php
new file mode 100644
index 000000000..7e69b7a84
--- /dev/null
+++ b/engine/classes/ElggGroup.php
@@ -0,0 +1,393 @@
+<?php
+
+/**
+ * Class representing a container for other elgg entities.
+ *
+ * @package    Elgg.Core
+ * @subpackage Groups
+ * 
+ * @property string $name        A short name that captures the purpose of the group
+ * @property string $description A longer body of content that gives more details about the group
+ */
+class ElggGroup extends ElggEntity
+	implements Friendable {
+
+	/**
+	 * Sets the type to group.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = "group";
+		$this->attributes['name'] = NULL;
+		$this->attributes['description'] = NULL;
+		$this->attributes['tables_split'] = 2;
+	}
+
+	/**
+	 * Construct a new group entity, optionally from a given guid value.
+	 *
+	 * @param mixed $guid If an int, load that GUID.
+	 * 	If an entity table db row, then will load the rest of the data.
+	 *
+	 * @throws IOException|InvalidParameterException if there was a problem creating the group.
+	 */
+	function __construct($guid = null) {
+		$this->initializeAttributes();
+
+		// compatibility for 1.7 api.
+		$this->initialise_attributes(false);
+
+		if (!empty($guid)) {
+			// Is $guid is a entity table DB row
+			if ($guid instanceof stdClass) {
+				// Load the rest
+				if (!$this->load($guid)) {
+					$msg = elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid->guid));
+					throw new IOException($msg);
+				}
+			} else if ($guid instanceof ElggGroup) {
+				// $guid is an ElggGroup so this is a copy constructor
+				elgg_deprecated_notice('This type of usage of the ElggGroup constructor was deprecated. Please use the clone method.', 1.7);
+
+				foreach ($guid->attributes as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else if ($guid instanceof ElggEntity) {
+				// @todo why separate from else
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonElggGroup'));
+			} else if (is_numeric($guid)) {
+				// $guid is a GUID so load entity
+				if (!$this->load($guid)) {
+					throw new IOException(elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid)));
+				}
+			} else {
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnrecognisedValue'));
+			}
+		}
+	}
+
+	/**
+	 * Add an ElggObject to this group.
+	 *
+	 * @param ElggObject $object The object.
+	 *
+	 * @return bool
+	 */
+	public function addObjectToGroup(ElggObject $object) {
+		return add_object_to_group($this->getGUID(), $object->getGUID());
+	}
+
+	/**
+	 * Remove an object from the containing group.
+	 *
+	 * @param int $guid The guid of the object.
+	 *
+	 * @return bool
+	 */
+	public function removeObjectFromGroup($guid) {
+		return remove_object_from_group($this->getGUID(), $guid);
+	}
+
+	/**
+	 * Returns an attribute or metadata.
+	 *
+	 * @see ElggEntity::get()
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function get($name) {
+		if ($name == 'username') {
+			return 'group:' . $this->getGUID();
+		}
+		return parent::get($name);
+	}
+
+	/**
+	 * Start friendable compatibility block:
+	 *
+	 * 	public function addFriend($friend_guid);
+		public function removeFriend($friend_guid);
+		public function isFriend();
+		public function isFriendsWith($user_guid);
+		public function isFriendOf($user_guid);
+		public function getFriends($subtype = "", $limit = 10, $offset = 0);
+		public function getFriendsOf($subtype = "", $limit = 10, $offset = 0);
+		public function getObjects($subtype="", $limit = 10, $offset = 0);
+		public function getFriendsObjects($subtype = "", $limit = 10, $offset = 0);
+		public function countObjects($subtype = "");
+	 */
+
+	/**
+	 * For compatibility with Friendable.
+	 *
+	 * Join a group when you friend ElggGroup.
+	 *
+	 * @param int $friend_guid The GUID of the user joining the group.
+	 *
+	 * @return bool
+	 */
+	public function addFriend($friend_guid) {
+		return $this->join(get_entity($friend_guid));
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * Leave group when you unfriend ElggGroup.
+	 *
+	 * @param int $friend_guid The GUID of the user leaving.
+	 *
+	 * @return bool
+	 */
+	public function removeFriend($friend_guid) {
+		return $this->leave(get_entity($friend_guid));
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * Friending a group adds you as a member
+	 *
+	 * @return bool
+	 */
+	public function isFriend() {
+		return $this->isMember();
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param int $user_guid The GUID of a user to check.
+	 *
+	 * @return bool
+	 */
+	public function isFriendsWith($user_guid) {
+		return $this->isMember($user_guid);
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param int $user_guid The GUID of a user to check.
+	 *
+	 * @return bool
+	 */
+	public function isFriendOf($user_guid) {
+		return $this->isMember($user_guid);
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param string $subtype The GUID of a user to check.
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return bool
+	 */
+	public function getFriends($subtype = "", $limit = 10, $offset = 0) {
+		return get_group_members($this->getGUID(), $limit, $offset);
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param string $subtype The GUID of a user to check.
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return bool
+	 */
+	public function getFriendsOf($subtype = "", $limit = 10, $offset = 0) {
+		return get_group_members($this->getGUID(), $limit, $offset);
+	}
+
+	/**
+	 * Get objects contained in this group.
+	 *
+	 * @param string $subtype Entity subtype
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return array|false
+	 */
+	public function getObjects($subtype = "", $limit = 10, $offset = 0) {
+		// @todo are we deprecating this method, too?
+		return get_objects_in_group($this->getGUID(), $subtype, 0, 0, "", $limit, $offset, false);
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param string $subtype Entity subtype
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return array|false
+	 */
+	public function getFriendsObjects($subtype = "", $limit = 10, $offset = 0) {
+		// @todo are we deprecating this method, too?
+		return get_objects_in_group($this->getGUID(), $subtype, 0, 0, "", $limit, $offset, false);
+	}
+
+	/**
+	 * For compatibility with Friendable
+	 *
+	 * @param string $subtype Subtype of entities
+	 *
+	 * @return array|false
+	 */
+	public function countObjects($subtype = "") {
+		// @todo are we deprecating this method, too?
+		return get_objects_in_group($this->getGUID(), $subtype, 0, 0, "", 10, 0, true);
+	}
+
+	/**
+	 * End friendable compatibility block
+	 */
+
+	/**
+	 * Get a list of group members.
+	 *
+	 * @param int  $limit  Limit
+	 * @param int  $offset Offset
+	 * @param bool $count  Count
+	 *
+	 * @return mixed
+	 */
+	public function getMembers($limit = 10, $offset = 0, $count = false) {
+		return get_group_members($this->getGUID(), $limit, $offset, 0, $count);
+	}
+
+	/**
+	 * Returns whether the current group is public membership or not.
+	 *
+	 * @return bool
+	 */
+	public function isPublicMembership() {
+		if ($this->membership == ACCESS_PUBLIC) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Return whether a given user is a member of this group or not.
+	 *
+	 * @param ElggUser $user The user
+	 *
+	 * @return bool
+	 */
+	public function isMember($user = null) {
+		if (!($user instanceof ElggUser)) {
+			$user = elgg_get_logged_in_user_entity();
+		}
+		if (!($user instanceof ElggUser)) {
+			return false;
+		}
+		return is_group_member($this->getGUID(), $user->getGUID());
+	}
+
+	/**
+	 * Join an elgg user to this group.
+	 *
+	 * @param ElggUser $user User
+	 *
+	 * @return bool
+	 */
+	public function join(ElggUser $user) {
+		return join_group($this->getGUID(), $user->getGUID());
+	}
+
+	/**
+	 * Remove a user from the group.
+	 *
+	 * @param ElggUser $user User
+	 *
+	 * @return bool
+	 */
+	public function leave(ElggUser $user) {
+		return leave_group($this->getGUID(), $user->getGUID());
+	}
+
+	/**
+	 * Load the ElggGroup data from the database
+	 *
+	 * @param mixed $guid GUID of an ElggGroup entity or database row from entity table
+	 *
+	 * @return bool
+	 */
+	protected function load($guid) {
+		$attr_loader = new ElggAttributeLoader(get_class(), 'group', $this->attributes);
+		$attr_loader->requires_access_control = !($this instanceof ElggPlugin);
+		$attr_loader->secondary_loader = 'get_group_entity_as_row';
+
+		$attrs = $attr_loader->getRequiredAttributes($guid);
+		if (!$attrs) {
+			return false;
+		}
+
+		$this->attributes = $attrs;
+		$this->attributes['tables_loaded'] = 2;
+		_elgg_cache_entity($this);
+
+		return true;
+	}
+
+	/**
+	 * Override the save function.
+	 *
+	 * @return bool
+	 */
+	public function save() {
+		// Save generic stuff
+		if (!parent::save()) {
+			return false;
+		}
+
+		// Now save specific stuff
+
+		_elgg_disable_caching_for_entity($this->guid);
+		$ret = create_group_entity($this->get('guid'), $this->get('name'), $this->get('description'));
+		_elgg_enable_caching_for_entity($this->guid);
+
+		return $ret;
+	}
+
+	// EXPORTABLE INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array_merge(parent::getExportableValues(), array(
+			'name',
+			'description',
+		));
+	}
+
+	/**
+	 * Can a user comment on this group?
+	 *
+	 * @see ElggEntity::canComment()
+	 *
+	 * @param int $user_guid User guid (default is logged in user)
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function canComment($user_guid = 0) {
+		$result = parent::canComment($user_guid);
+		if ($result !== null) {
+			return $result;
+		}
+		return false;
+	}
+}
diff --git a/engine/classes/ElggGroupItemVisibility.php b/engine/classes/ElggGroupItemVisibility.php
new file mode 100644
index 000000000..2c7e2abb4
--- /dev/null
+++ b/engine/classes/ElggGroupItemVisibility.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Determines if otherwise visible items should be hidden from a user due to group
+ * policy or visibility.
+ *
+ * @class      ElggGroupItemVisibility
+ * @package    Elgg.Core
+ * @subpackage Groups
+ *
+ * @access private
+ */
+class ElggGroupItemVisibility {
+
+	const REASON_MEMBERSHIP = 'membershiprequired';
+	const REASON_LOGGEDOUT = 'loggedinrequired';
+	const REASON_NOACCESS = 'noaccess';
+
+	/**
+	 * @var bool
+	 */
+	public $shouldHideItems = false;
+
+	/**
+	 * @var string
+	 */
+	public $reasonHidden = '';
+
+	/**
+	 * Determine visibility of items within a container for the current user
+	 *
+	 * @param int $container_guid GUID of a container (may/may not be a group)
+	 *
+	 * @return ElggGroupItemVisibility
+	 *
+	 * @todo Make this faster, considering it must run for every river item.
+	 */
+	static public function factory($container_guid) {
+		// cache because this may be called repeatedly during river display, and
+		// due to need to check group visibility, cache will be disabled for some
+		// get_entity() calls
+		static $cache = array();
+
+		$ret = new ElggGroupItemVisibility();
+
+		if (!$container_guid) {
+			return $ret;
+		}
+
+		$user = elgg_get_logged_in_user_entity();
+		$user_guid = $user ? $user->guid : 0;
+
+		$container_guid = (int) $container_guid;
+
+		$cache_key = "$container_guid|$user_guid";
+		if (empty($cache[$cache_key])) {
+			// compute
+
+			$container = get_entity($container_guid);
+			$is_visible = (bool) $container;
+
+			if (!$is_visible) {
+				// see if it *really* exists...
+				$prev_access = elgg_set_ignore_access();
+				$container = get_entity($container_guid);
+				elgg_set_ignore_access($prev_access);
+			}
+
+			if ($container && $container instanceof ElggGroup) {
+				/* @var ElggGroup $container */
+
+				if ($is_visible) {
+					if (!$container->isPublicMembership()) {
+						if ($user) {
+							if (!$container->isMember($user) && !$user->isAdmin()) {
+								$ret->shouldHideItems = true;
+								$ret->reasonHidden = self::REASON_MEMBERSHIP;
+							}
+						} else {
+							$ret->shouldHideItems = true;
+							$ret->reasonHidden = self::REASON_LOGGEDOUT;
+						}
+					}
+				} else {
+					$ret->shouldHideItems = true;
+					$ret->reasonHidden = self::REASON_NOACCESS;
+				}
+			}
+			$cache[$cache_key] = $ret;
+		}
+		return $cache[$cache_key];
+	}
+}
diff --git a/engine/classes/ElggHMACCache.php b/engine/classes/ElggHMACCache.php
new file mode 100644
index 000000000..c2f468815
--- /dev/null
+++ b/engine/classes/ElggHMACCache.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * ElggHMACCache
+ * Store cached data in a temporary database, only used by the HMAC stuff.
+ *
+ * @package    Elgg.Core
+ * @subpackage HMAC
+ */
+class ElggHMACCache extends ElggCache {
+	/**
+	 * Set the Elgg cache.
+	 *
+	 * @param int $max_age Maximum age in seconds, 0 if no limit.
+	 */
+	function __construct($max_age = 0) {
+		$this->setVariable("max_age", $max_age);
+	}
+
+	/**
+	 * Save a key
+	 *
+	 * @param string $key  Name
+	 * @param string $data Value
+	 *
+	 * @return boolean
+	 */
+	public function save($key, $data) {
+		global $CONFIG;
+
+		$key = sanitise_string($key);
+		$time = time();
+
+		$query = "INSERT into {$CONFIG->dbprefix}hmac_cache (hmac, ts) VALUES ('$key', '$time')";
+		return insert_data($query);
+	}
+
+	/**
+	 * Load a key
+	 *
+	 * @param string $key    Name
+	 * @param int    $offset Offset
+	 * @param int    $limit  Limit
+	 *
+	 * @return string
+	 */
+	public function load($key, $offset = 0, $limit = null) {
+		global $CONFIG;
+
+		$key = sanitise_string($key);
+
+		$row = get_data_row("SELECT * from {$CONFIG->dbprefix}hmac_cache where hmac='$key'");
+		if ($row) {
+			return $row->hmac;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Invalidate a given key.
+	 *
+	 * @param string $key Name
+	 *
+	 * @return bool
+	 */
+	public function delete($key) {
+		global $CONFIG;
+
+		$key = sanitise_string($key);
+
+		return delete_data("DELETE from {$CONFIG->dbprefix}hmac_cache where hmac='$key'");
+	}
+
+	/**
+	 * Clear out all the contents of the cache.
+	 *
+	 * Not currently implemented in this cache type.
+	 *
+	 * @return true
+	 */
+	public function clear() {
+		return true;
+	}
+
+	/**
+	 * Clean out old stuff.
+	 *
+	 */
+	public function __destruct() {
+		global $CONFIG;
+
+		$time = time();
+		$age = (int)$this->getVariable("max_age");
+
+		$expires = $time - $age;
+
+		delete_data("DELETE from {$CONFIG->dbprefix}hmac_cache where ts<$expires");
+	}
+}
diff --git a/engine/classes/ElggLRUCache.php b/engine/classes/ElggLRUCache.php
new file mode 100644
index 000000000..f51af2ed7
--- /dev/null
+++ b/engine/classes/ElggLRUCache.php
@@ -0,0 +1,181 @@
+<?php
+
+/**
+ * Least Recently Used Cache
+ *
+ * A fixed sized cache that removes the element used last when it reaches its
+ * size limit.
+ * 
+ * Based on https://github.com/cash/LRUCache
+ * 
+ * @access private
+ * 
+ * @package    Elgg.Core
+ * @subpackage Cache
+ */
+class ElggLRUCache implements ArrayAccess {
+	/** @var int */
+	protected $maximumSize;
+
+	/**
+	 * The front of the array contains the LRU element
+	 *
+	 * @var array
+	 */
+	protected $data = array();
+
+	/**
+	 * Create a LRU Cache
+	 *
+	 * @param int $size The size of the cache
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct($size) {
+		if (!is_int($size) || $size <= 0) {
+			throw new InvalidArgumentException();
+		}
+		$this->maximumSize = $size;
+	}
+
+	/**
+	 * Get the value cached with this key
+	 *
+	 * @param int|string $key     The key. Strings that are ints are cast to ints.
+	 * @param mixed      $default The value to be returned if key not found. (Optional)
+	 * @return mixed
+	 */
+	public function get($key, $default = null) {
+		if (isset($this->data[$key])) {
+			$this->recordAccess($key);
+			return $this->data[$key];
+		} else {
+			return $default;
+		}
+	}
+
+	/**
+	 * Add something to the cache
+	 *
+	 * @param int|string $key   The key. Strings that are ints are cast to ints.
+	 * @param mixed      $value The value to cache
+	 * @return void
+	 */
+	public function set($key, $value) {
+		if (isset($this->data[$key])) {
+			$this->data[$key] = $value;
+			$this->recordAccess($key);
+		} else {
+			$this->data[$key] = $value;
+			if ($this->size() > $this->maximumSize) {
+				// remove least recently used element (front of array)
+				reset($this->data);
+				unset($this->data[key($this->data)]);
+			}
+		}
+	}
+
+	/**
+	 * Get the number of elements in the cache
+	 *
+	 * @return int
+	 */
+	public function size() {
+		return count($this->data);
+	}
+
+	/**
+	 * Does the cache contain an element with this key
+	 *
+	 * @param int|string $key The key
+	 * @return boolean
+	 */
+	public function containsKey($key) {
+		return isset($this->data[$key]);
+	}
+
+	/**
+	 * Remove the element with this key.
+	 *
+	 * @param int|string $key The key
+	 * @return mixed Value or null if not set
+	 */
+	public function remove($key) {
+		if (isset($this->data[$key])) {
+			$value = $this->data[$key];
+			unset($this->data[$key]);
+			return $value;
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Clear the cache
+	 * 
+	 * @return void
+	 */
+	public function clear() {
+		$this->data = array();
+	}
+
+	/**
+	 * Moves the element from current position to end of array
+	 * 
+	 * @param int|string $key The key
+	 * @return void
+	 */
+	protected function recordAccess($key) {
+		$value = $this->data[$key];
+		unset($this->data[$key]);
+		$this->data[$key] = $value;
+	}
+
+	/**
+	 * Assigns a value for the specified key
+	 *
+	 * @see ArrayAccess::offsetSet()
+	 *
+	 * @param int|string $key   The key to assign the value to.
+	 * @param mixed      $value The value to set.
+	 * @return void
+	 */
+	public function offsetSet($key, $value) {
+		$this->set($key, $value);
+	}
+
+	/**
+	 * Get the value for specified key
+	 *
+	 * @see ArrayAccess::offsetGet()
+	 *
+	 * @param int|string $key The key to retrieve.
+	 * @return mixed
+	 */
+	public function offsetGet($key) {
+		return $this->get($key);
+	}
+
+	/**
+	 * Unsets a key.
+	 *
+	 * @see ArrayAccess::offsetUnset()
+	 *
+	 * @param int|string $key The key to unset.
+	 * @return void
+	 */
+	public function offsetUnset($key) {
+		$this->remove($key);
+	}
+
+	/**
+	 * Does key exist?
+	 *
+	 * @see ArrayAccess::offsetExists()
+	 *
+	 * @param int|string $key A key to check for.
+	 * @return boolean
+	 */
+	public function offsetExists($key) {
+		return $this->containsKey($key);
+	}
+}
diff --git a/engine/classes/ElggMemcache.php b/engine/classes/ElggMemcache.php
new file mode 100644
index 000000000..91d50ab89
--- /dev/null
+++ b/engine/classes/ElggMemcache.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Memcache wrapper class.
+ *
+ * @package    Elgg.Core
+ * @subpackage Memcache
+ */
+class ElggMemcache extends ElggSharedMemoryCache {
+	/**
+	 * Minimum version of memcached needed to run
+	 *
+	 */
+	private static $MINSERVERVERSION = '1.1.12';
+
+	/**
+	 * Memcache object
+	 */
+	private $memcache;
+
+	/**
+	 * Expiry of saved items (default timeout after a day to prevent anything getting too stale)
+	 */
+	private $expires = 86400;
+
+	/**
+	 * The version of memcache running
+	 */
+	private $version = 0;
+
+	/**
+	 * Connect to memcache.
+	 *
+	 * @param string $namespace The namespace for this cache to write to -
+	 * note, namespaces of the same name are shared!
+	 *
+	 * @throws ConfigurationException
+	 */
+	function __construct($namespace = 'default') {
+		global $CONFIG;
+
+		$this->setNamespace($namespace);
+
+		// Do we have memcache?
+		if (!class_exists('Memcache')) {
+			throw new ConfigurationException('PHP memcache module not installed, you must install php5-memcache');
+		}
+
+		// Create memcache object
+		$this->memcache	= new Memcache;
+
+		// Now add servers
+		if (!$CONFIG->memcache_servers) {
+			throw new ConfigurationException('No memcache servers defined, please populate the $CONFIG->memcache_servers variable');
+		}
+
+		if (is_callable(array($this->memcache, 'addServer'))) {
+			foreach ($CONFIG->memcache_servers as $server) {
+				if (is_array($server)) {
+					$this->memcache->addServer(
+						$server[0],
+						isset($server[1]) ? $server[1] : 11211,
+						isset($server[2]) ? $server[2] : FALSE,
+						isset($server[3]) ? $server[3] : 1,
+						isset($server[4]) ? $server[4] : 1,
+						isset($server[5]) ? $server[5] : 15,
+						isset($server[6]) ? $server[6] : TRUE
+					);
+
+				} else {
+					$this->memcache->addServer($server, 11211);
+				}
+			}
+		} else {
+			// don't use elgg_echo() here because most of the config hasn't been loaded yet
+			// and it caches the language, which is hard coded in $CONFIG->language as en.
+			// overriding it with real values later has no effect because it's already cached.
+			elgg_log("This version of the PHP memcache API doesn't support multiple servers.", 'ERROR');
+
+			$server = $CONFIG->memcache_servers[0];
+			if (is_array($server)) {
+				$this->memcache->connect($server[0], $server[1]);
+			} else {
+				$this->memcache->addServer($server, 11211);
+			}
+		}
+
+		// Get version
+		$this->version = $this->memcache->getVersion();
+		if (version_compare($this->version, ElggMemcache::$MINSERVERVERSION, '<')) {
+			$msg = vsprintf('Memcache needs at least version %s to run, you are running %s',
+				array(ElggMemcache::$MINSERVERVERSION,
+				$this->version
+			));
+
+			throw new ConfigurationException($msg);
+		}
+
+		// Set some defaults
+		if (isset($CONFIG->memcache_expires)) {
+			$this->expires = $CONFIG->memcache_expires;
+		}
+	}
+
+	/**
+	 * Set the default expiry.
+	 *
+	 * @param int $expires The lifetime as a unix timestamp or time from now. Defaults forever.
+	 *
+	 * @return void
+	 */
+	public function setDefaultExpiry($expires = 0) {
+		$this->expires = $expires;
+	}
+
+	/**
+	 * Combine a key with the namespace.
+	 * Memcache can only accept <250 char key. If the given key is too long it is shortened.
+	 *
+	 * @param string $key The key
+	 *
+	 * @return string The new key.
+	 */
+	private function makeMemcacheKey($key) {
+		$prefix = $this->getNamespace() . ":";
+
+		if (strlen($prefix . $key) > 250) {
+			$key = md5($key);
+		}
+
+		return $prefix . $key;
+	}
+
+	/**
+	 * Saves a name and value to the cache
+	 *
+	 * @param string  $key     Name
+	 * @param string  $data    Value
+	 * @param integer $expires Expires (in seconds)
+	 *
+	 * @return bool
+	 */
+	public function save($key, $data, $expires = null) {
+		$key = $this->makeMemcacheKey($key);
+
+		if ($expires === null) {
+			$expires = $this->expires;
+		}
+
+		$result = $this->memcache->set($key, $data, null, $expires);
+		if ($result === false) {
+			elgg_log("MEMCACHE: FAILED TO SAVE $key", 'ERROR');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Retrieves data.
+	 *
+	 * @param string $key    Name of data to retrieve
+	 * @param int    $offset Offset
+	 * @param int    $limit  Limit
+	 *
+	 * @return mixed
+	 */
+	public function load($key, $offset = 0, $limit = null) {
+		$key = $this->makeMemcacheKey($key);
+
+		$result = $this->memcache->get($key);
+		if ($result === false) {
+			elgg_log("MEMCACHE: FAILED TO LOAD $key", 'ERROR');
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Delete data
+	 *
+	 * @param string $key Name of data
+	 *
+	 * @return bool
+	 */
+	public function delete($key) {
+		$key = $this->makeMemcacheKey($key);
+
+		return $this->memcache->delete($key, 0);
+	}
+
+	/**
+	 * Clears the entire cache?
+	 *
+	 * @todo write or remove.
+	 *
+	 * @return true
+	 */
+	public function clear() {
+		// DISABLE clearing for now - you must use delete on a specific key.
+		return true;
+
+		// @todo Namespaces as in #532
+	}
+}
diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php
new file mode 100644
index 000000000..b463143d8
--- /dev/null
+++ b/engine/classes/ElggMenuBuilder.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Elgg Menu Builder
+ *
+ * @package    Elgg.Core
+ * @subpackage Navigation
+ * @since      1.8.0
+ */
+class ElggMenuBuilder {
+
+	/**
+	 * @var ElggMenuItem[]
+	 */
+	protected $menu = array();
+
+	protected $selected = null;
+
+	/**
+	 * ElggMenuBuilder constructor
+	 *
+	 * @param ElggMenuItem[] $menu Array of ElggMenuItem objects
+	 */
+	public function __construct(array $menu) {
+		$this->menu = $menu;
+	}
+
+	/**
+	 * Get a prepared menu array
+	 *
+	 * @param mixed $sort_by Method to sort the menu by. @see ElggMenuBuilder::sort()
+	 * @return array
+	 */
+	public function getMenu($sort_by = 'text') {
+
+		$this->selectFromContext();
+
+		$this->selected = $this->findSelected();
+
+		$this->setupSections();
+
+		$this->setupTrees();
+
+		$this->sort($sort_by);
+
+		return $this->menu;
+	}
+
+	/**
+	 * Get the selected menu item
+	 *
+	 * @return ElggMenuItem
+	 */
+	public function getSelected() {
+		return $this->selected;
+	}
+
+	/**
+	 * Select menu items for the current context
+	 *
+	 * @return void
+	 */
+	protected function selectFromContext() {
+		if (!isset($this->menu)) {
+			$this->menu = array();
+			return;
+		}
+
+		// get menu items for this context
+		$selected_menu = array();
+		foreach ($this->menu as $menu_item) {
+			if (!is_object($menu_item)) {
+				elgg_log("A non-object was passed to ElggMenuBuilder", "ERROR");
+				continue;
+			}
+			if ($menu_item->inContext()) {
+				$selected_menu[] = $menu_item;
+			}
+		}
+
+		$this->menu = $selected_menu;
+	}
+
+	/**
+	 * Group the menu items into sections
+	 * 
+	 * @return void
+	 */
+	protected function setupSections() {
+		$sectioned_menu = array();
+		foreach ($this->menu as $menu_item) {
+			if (!isset($sectioned_menu[$menu_item->getSection()])) {
+				$sectioned_menu[$menu_item->getSection()] = array();
+			}
+			$sectioned_menu[$menu_item->getSection()][] = $menu_item;
+		}
+		$this->menu = $sectioned_menu;
+	}
+
+	/**
+	 * Create trees for each menu section
+	 *
+	 * @internal The tree is doubly linked (parent and children links)
+	 * @return void
+	 */
+	protected function setupTrees() {
+		$menu_tree = array();
+
+		foreach ($this->menu as $key => $section) {
+			$parents = array();
+			$children = array();
+			// divide base nodes from children
+			foreach ($section as $menu_item) {
+				/* @var ElggMenuItem $menu_item */
+				$parent_name = $menu_item->getParentName();
+				if (!$parent_name) {
+					$parents[$menu_item->getName()] = $menu_item;
+				} else {
+					$children[] = $menu_item;
+				}
+			}
+
+			// attach children to parents
+			$iteration = 0;
+			$current_gen = $parents;
+			$next_gen = null;
+			while (count($children) && $iteration < 5) {
+				foreach ($children as $index => $menu_item) {
+					$parent_name = $menu_item->getParentName();
+					if (array_key_exists($parent_name, $current_gen)) {
+						$next_gen[$menu_item->getName()] = $menu_item;
+						if (!in_array($menu_item, $current_gen[$parent_name]->getData('children'))) {
+							$current_gen[$parent_name]->addChild($menu_item);
+							$menu_item->setParent($current_gen[$parent_name]);
+						}
+						unset($children[$index]);
+					}
+				}
+				$current_gen = $next_gen;
+				$iteration += 1;
+			}
+
+			// convert keys to indexes for first level of tree
+			$parents = array_values($parents);
+
+			$menu_tree[$key] = $parents;
+		}
+
+		$this->menu = $menu_tree;
+	}
+
+	/**
+	 * Find the menu item that is currently selected
+	 *
+	 * @return ElggMenuItem
+	 */
+	protected function findSelected() {
+
+		// do we have a selected menu item already
+		foreach ($this->menu as $menu_item) {
+			if ($menu_item->getSelected()) {
+				return $menu_item;
+			}
+		}
+
+		// scan looking for a selected item
+		foreach ($this->menu as $menu_item) {
+			if ($menu_item->getHref()) {
+				if (elgg_http_url_is_identical(current_page_url(), $menu_item->getHref())) {
+					$menu_item->setSelected(true);
+					return $menu_item;
+				}
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Sort the menu sections and trees
+	 *
+	 * @param mixed $sort_by Sort type as string or php callback
+	 * @return void
+	 */
+	protected function sort($sort_by) {
+
+		// sort sections
+		ksort($this->menu);
+
+		switch ($sort_by) {
+			case 'text':
+				$sort_callback = array('ElggMenuBuilder', 'compareByText');
+				break;
+			case 'name':
+				$sort_callback = array('ElggMenuBuilder', 'compareByName');
+				break;
+			case 'priority':
+				$sort_callback = array('ElggMenuBuilder', 'compareByWeight');
+				break;
+			case 'register':
+				// use registration order - usort breaks this
+				return;
+				break;
+			default:
+				if (is_callable($sort_by)) {
+					$sort_callback = $sort_by;
+				} else {
+					return;
+				}
+				break;
+		}
+
+		// sort each section
+		foreach ($this->menu as $index => $section) {
+			foreach ($section as $key => $node) {
+				$section[$key]->setData('original_order', $key);
+			}
+			usort($section, $sort_callback);
+			$this->menu[$index] = $section;
+
+			// depth first traversal of tree
+			foreach ($section as $root) {
+				$stack = array();
+				array_push($stack, $root);
+				while (!empty($stack)) {
+					$node = array_pop($stack);
+					/* @var ElggMenuItem $node */
+					$node->sortChildren($sort_callback);
+					$children = $node->getChildren();
+					if ($children) {
+						$stack = array_merge($stack, $children);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Compare two menu items by their display text
+	 *
+	 * @param ElggMenuItem $a Menu item
+	 * @param ElggMenuItem $b Menu item
+	 * @return bool
+	 */
+	public static function compareByText($a, $b) {
+		$at = $a->getText();
+		$bt = $b->getText();
+
+		$result = strnatcmp($at, $bt);
+		if ($result === 0) {
+			return $a->getData('original_order') - $b->getData('original_order');
+		}
+		return $result;
+	}
+
+	/**
+	 * Compare two menu items by their identifiers
+	 *
+	 * @param ElggMenuItem $a Menu item
+	 * @param ElggMenuItem $b Menu item
+	 * @return bool
+	 */
+	public static function compareByName($a, $b) {
+		$an = $a->getName();
+		$bn = $b->getName();
+
+		$result = strcmp($an, $bn);
+		if ($result === 0) {
+			return $a->getData('original_order') - $b->getData('original_order');
+		}
+		return $result;
+	}
+
+	/**
+	 * Compare two menu items by their priority
+	 *
+	 * @param ElggMenuItem $a Menu item
+	 * @param ElggMenuItem $b Menu item
+	 * @return bool
+	 *
+	 * @todo change name to compareByPriority
+	 */
+	public static function compareByWeight($a, $b) {
+		$aw = $a->getWeight();
+		$bw = $b->getWeight();
+
+		if ($aw == $bw) {
+			return $a->getData('original_order') - $b->getData('original_order');
+		}
+		return $aw - $bw;
+	}
+}
diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php
new file mode 100644
index 000000000..81ce6c099
--- /dev/null
+++ b/engine/classes/ElggMenuItem.php
@@ -0,0 +1,590 @@
+<?php
+/**
+ * Elgg Menu Item
+ *
+ * To create a menu item that is not a link, pass false for $href.
+ *
+ * @package    Elgg.Core
+ * @subpackage Navigation
+ * @since      1.8.0
+ */
+class ElggMenuItem {
+
+	/**
+	 * @var array Non-rendered data about the menu item
+	 */
+	protected $data = array(
+		// string Identifier of the menu
+		'name' => '',
+
+		// array Page contexts this menu item should appear on
+		'contexts' => array('all'),
+
+		// string Menu section identifier
+		'section' => 'default',
+
+		// int Smaller priorities float to the top
+		'priority' => 100,
+
+		// bool Is this the currently selected menu item
+		'selected' => false,
+
+		// string Identifier of this item's parent
+		'parent_name' => '',
+
+		// ElggMenuItem The parent object or null
+		'parent' => null,
+
+		// array Array of children objects or empty array
+		'children' => array(),
+
+		// array Classes to apply to the li tag
+		'itemClass' => array(),
+
+		// array Classes to apply to the anchor tag
+		'linkClass' => array(),
+	);
+
+	/**
+	 * @var string The menu display string
+	 */
+	protected $text;
+
+	/**
+	 * @var string The menu url
+	 */
+	protected $href = null;
+
+	/**
+	 * @var string Tooltip
+	 */
+	protected $title = false;
+
+	/**
+	 * @var string The string to display if link is clicked
+	 */
+	protected $confirm = '';
+
+
+	/**
+	 * ElggMenuItem constructor
+	 *
+	 * @param string $name Identifier of the menu item
+	 * @param string $text Display text of the menu item
+	 * @param string $href URL of the menu item (false if not a link)
+	 */
+	public function __construct($name, $text, $href) {
+		//$this->name = $name;
+		$this->text = $text;
+		if ($href) {
+			$this->href = elgg_normalize_url($href);
+		} else {
+			$this->href = $href;
+		}
+
+		$this->data['name'] = $name;
+	}
+
+	/**
+	 * ElggMenuItem factory method
+	 *
+	 * This static method creates an ElggMenuItem from an associative array.
+	 * Required keys are name, text, and href.
+	 *
+	 * @param array $options Option array of key value pairs
+	 *
+	 * @return ElggMenuItem or NULL on error
+	 */
+	public static function factory($options) {
+		if (!isset($options['name']) || !isset($options['text'])) {
+			return NULL;
+		}
+		if (!isset($options['href'])) {
+			$options['href'] = '';
+		}
+
+		$item = new ElggMenuItem($options['name'], $options['text'], $options['href']);
+		unset($options['name']);
+		unset($options['text']);
+		unset($options['href']);
+
+		// special catch in case someone uses context rather than contexts
+		if (isset($options['context'])) {
+			$options['contexts'] = $options['context'];
+			unset($options['context']);
+		}
+		
+		// make sure contexts is set correctly
+		if (isset($options['contexts'])) {
+			$item->setContext($options['contexts']);
+			unset($options['contexts']);
+		}
+
+		if (isset($options['link_class'])) {
+			$item->setLinkClass($options['link_class']);
+			unset($options['link_class']);
+		}
+
+		if (isset($options['item_class'])) {
+			$item->setItemClass($options['item_class']);
+			unset($options['item_class']);
+		}
+
+		if (isset($options['data']) && is_array($options['data'])) {
+			$item->setData($options['data']);
+			unset($options['data']);
+		}
+		
+		foreach ($options as $key => $value) {
+			if (isset($item->data[$key])) {
+				$item->data[$key] = $value;
+			} else {
+				$item->$key = $value;
+			}
+		}
+
+		return $item;
+	}
+
+	/**
+	 * Set a data key/value pair or a set of key/value pairs
+	 *
+	 * This method allows storage of arbitrary data with this menu item. The
+	 * data can be used for sorting, custom rendering, or any other use.
+	 *
+	 * @param mixed $key   String key or an associative array of key/value pairs
+	 * @param mixed $value The value if $key is a string
+	 * @return void
+	 */
+	public function setData($key, $value = null) {
+		if (is_array($key)) {
+			$this->data += $key;
+		} else {
+			$this->data[$key] = $value;
+		}
+	}
+
+	/**
+	 * Get stored data
+	 *
+	 * @param string $key The key for the requested key/value pair
+	 * @return mixed
+	 */
+	public function getData($key) {
+		if (isset($this->data[$key])) {
+			return $this->data[$key];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Set the identifier of the menu item
+	 *
+	 * @param string $name Unique identifier
+	 * @return void
+	 */
+	public function setName($name) {
+		$this->data['name'] = $name;
+	}
+
+	/**
+	 * Get the identifier of the menu item
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		return $this->data['name'];
+	}
+
+	/**
+	 * Set the display text of the menu item
+	 * 
+	 * @param string $text The display text
+	 * @return void
+	 */
+	public function setText($text) {
+		$this->text = $text;
+	}
+
+	/**
+	 * Get the display text of the menu item
+	 *
+	 * @return string
+	 */
+	public function getText() {
+		return $this->text;
+	}
+
+	/**
+	 * Set the URL of the menu item
+	 *
+	 * @param string $href URL or false if not a link
+	 * @return void
+	 */
+	public function setHref($href) {
+		$this->href = $href;
+	}
+
+	/**
+	 * Get the URL of the menu item
+	 *
+	 * @return string
+	 */
+	public function getHref() {
+		return $this->href;
+	}
+
+	/**
+	 * Set the contexts that this menu item is available for
+	 *
+	 * @param array $contexts An array of context strings
+	 * @return void
+	 */
+	public function setContext($contexts) {
+		if (is_string($contexts)) {
+			$contexts = array($contexts);
+		}
+		$this->data['contexts'] = $contexts;
+	}
+
+	/**
+	 * Get an array of context strings
+	 *
+	 * @return array
+	 */
+	public function getContext() {
+		return $this->data['contexts'];
+	}
+
+	/**
+	 * Should this menu item be used given the current context
+	 *
+	 * @param string $context A context string (default is empty string for
+	 *                        current context stack).
+	 * @return bool
+	 */
+	public function inContext($context = '') {
+		if ($context) {
+			return in_array($context, $this->data['contexts']);
+		}
+
+		if (in_array('all', $this->data['contexts'])) {
+			return true;
+		}
+
+		foreach ($this->data['contexts'] as $context) {
+			if (elgg_in_context($context)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Set the selected flag
+	 *
+	 * @param bool $state Selected state (default is true)
+	 * @return void
+	 */
+	public function setSelected($state = true) {
+		$this->data['selected'] = $state;
+	}
+
+	/**
+	 * Get selected state
+	 *
+	 * @return bool
+	 */
+	public function getSelected() {
+		return $this->data['selected'];
+	}
+
+	/**
+	 * Set the tool tip text
+	 *
+	 * @param string $text The text of the tool tip
+	 * @return void
+	 */
+	public function setTooltip($text) {
+		$this->title = $text;
+	}
+
+	/**
+	 * Get the tool tip text
+	 *
+	 * @return string
+	 */
+	public function getTooltip() {
+		return $this->title;
+	}
+
+	/**
+	 * Set the confirm text shown when link is clicked
+	 *
+	 * @param string $text The text to show
+	 * @return void
+	 */
+	public function setConfirmText($text) {
+		$this->confirm = $text;
+	}
+
+	/**
+	 * Get the confirm text
+	 *
+	 * @return string
+	 */
+	public function getConfirmText() {
+		return $this->confirm;
+	}
+
+	/**
+	 * Set the anchor class
+	 *
+	 * @param mixed $class An array of class names, or a single string class name.
+	 * @return void
+	 */
+	public function setLinkClass($class) {
+		if (!is_array($class)) {
+			$this->data['linkClass'] = array($class);
+		} else {
+			$this->data['linkClass'] = $class;
+		}
+	}
+
+	/**
+	 * Get the anchor classes as text
+	 *
+	 * @return string
+	 */
+	public function getLinkClass() {
+		return implode(' ', $this->data['linkClass']);
+	}
+
+	/**
+	 * Add a link class
+	 *
+	 * @param mixed $class An array of class names, or a single string class name.
+	 * @return void
+	 */
+	public function addLinkClass($class) {
+		if (!is_array($class)) {
+			$this->data['linkClass'][] = $class;
+		} else {
+			$this->data['linkClass'] += $class;
+		}
+	}
+
+	/**
+	 * Set the li classes
+	 *
+	 * @param mixed $class An array of class names, or a single string class name.
+	 * @return void
+	 */
+	public function setItemClass($class) {
+		if (!is_array($class)) {
+			$this->data['itemClass'] = array($class);
+		} else {
+			$this->data['itemClass'] = $class;
+		}
+	}
+
+	/**
+	 * Get the li classes as text
+	 *
+	 * @return string
+	 */
+	public function getItemClass() {
+		// allow people to specify name with underscores and colons
+		$name = strtolower($this->getName());
+		$name = str_replace('_', '-', $name);
+		$name = str_replace(':', '-', $name);
+		$name = str_replace(' ', '-', $name);
+
+		$class = implode(' ', $this->data['itemClass']);
+		if ($class) {
+			return "elgg-menu-item-$name $class";
+		} else {
+			return "elgg-menu-item-$name";
+		}
+	}
+
+	/**
+	 * Set the priority of the menu item
+	 *
+	 * @param int $priority The smaller numbers mean higher priority (1 before 100)
+	 * @return void
+	 * @deprecated
+	 */
+	public function setWeight($priority) {
+		$this->data['priority'] = $priority;
+	}
+
+	/**
+	 * Get the priority of the menu item
+	 *
+	 * @return int
+	 * @deprecated
+	 */
+	public function getWeight() {
+		return $this->data['priority'];
+	}
+
+	/**
+	 * Set the priority of the menu item
+	 *
+	 * @param int $priority The smaller numbers mean higher priority (1 before 100)
+	 * @return void
+	 */
+	public function setPriority($priority) {
+		$this->data['priority'] = $priority;
+	}
+
+	/**
+	 * Get the priority of the menu item
+	 *
+	 * @return int
+	 */
+	public function getPriority() {
+		return $this->data['priority'];
+	}
+
+	/**
+	 * Set the section identifier
+	 *
+	 * @param string $section The identifier of the section
+	 * @return void
+	 */
+	public function setSection($section) {
+		$this->data['section'] = $section;
+	}
+
+	/**
+	 * Get the section identifier
+	 *
+	 * @return string
+	 */
+	public function getSection() {
+		return $this->data['section'];
+	}
+
+	/**
+	 * Set the parent identifier
+	 *
+	 * @param string $name The identifier of the parent ElggMenuItem
+	 * @return void
+	 */
+	public function setParentName($name) {
+		$this->data['parent_name'] = $name;
+	}
+
+	/**
+	 * Get the parent identifier
+	 *
+	 * @return string
+	 */
+	public function getParentName() {
+		return $this->data['parent_name'];
+	}
+
+	/**
+	 * Set the parent menu item
+	 *
+	 * @param ElggMenuItem $parent The parent of this menu item
+	 * @return void
+	 */
+	public function setParent($parent) {
+		$this->data['parent'] = $parent;
+	}
+
+	/**
+	 * Get the parent menu item
+	 *
+	 * @return ElggMenuItem or null
+	 */
+	public function getParent() {
+		return $this->data['parent'];
+	}
+
+	/**
+	 * Add a child menu item
+	 *
+	 * @param ElggMenuItem $item A child menu item
+	 * @return void
+	 */
+	public function addChild($item) {
+		$this->data['children'][] = $item;
+	}
+
+	/**
+	 * Set the menu item's children
+	 *
+	 * @param array $children Array of ElggMenuItems
+	 * @return void
+	 */
+	public function setChildren($children) {
+		$this->data['children'] = $children;
+	}
+
+	/**
+	 * Get the children menu items
+	 *
+	 * @return array
+	 */
+	public function getChildren() {
+		return $this->data['children'];
+	}
+
+	/**
+	 * Sort the children
+	 *
+	 * @param string $sortFunction A function that is passed to usort()
+	 * @return void
+	 */
+	public function sortChildren($sortFunction) {
+		foreach ($this->data['children'] as $key => $node) {
+			$this->data['children'][$key]->data['original_order'] = $key;
+		}
+		usort($this->data['children'], $sortFunction);
+	}
+
+	/**
+	 * Get the menu item content (usually a link)
+	 *
+	 * @param array $vars Options to pass to output/url if a link
+	 * @return string
+	 * @todo View code in a model.  How do we feel about that?
+	 */
+	public function getContent(array $vars = array()) {
+
+		if ($this->href === false) {
+			return $this->text;
+		}
+
+		$defaults = get_object_vars($this);
+		unset($defaults['data']);
+
+		$vars += $defaults;
+
+		if ($this->data['linkClass']) {
+			if (isset($vars['class'])) {
+				$vars['class'] = $vars['class'] . ' ' . $this->getLinkClass();
+			} else {
+				$vars['class'] = $this->getLinkClass();
+			}
+		}
+
+		if (!isset($vars['rel']) && !isset($vars['is_trusted'])) {
+			$vars['is_trusted'] = true;
+		}
+
+		if ($this->confirm) {
+			$vars['confirm'] = $this->confirm;
+			return elgg_view('output/confirmlink', $vars);
+		} else {
+			unset($vars['confirm']);
+		}
+
+		return elgg_view('output/url', $vars);
+	}
+}
diff --git a/engine/classes/ElggMetadata.php b/engine/classes/ElggMetadata.php
new file mode 100644
index 000000000..3a8e2d817
--- /dev/null
+++ b/engine/classes/ElggMetadata.php
@@ -0,0 +1,158 @@
+<?php
+
+/**
+ * ElggMetadata
+ * This class describes metadata that can be attached to ElggEntities.
+ *
+ * @package    Elgg.Core
+ * @subpackage Metadata
+ *
+ * @property string $value_type
+ * @property int $owner_guid
+ * @property string $enabled
+ */
+class ElggMetadata extends ElggExtender {
+
+	/**
+	 * (non-PHPdoc)
+	 *
+	 * @see ElggData::initializeAttributes()
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = "metadata";
+	}
+
+	/**
+	 * Construct a metadata object
+	 *
+	 * @param mixed $id ID of metadata or a database row as stdClass object
+	 */
+	function __construct($id = null) {
+		$this->initializeAttributes();
+
+		if (!empty($id)) {
+			// Create from db row
+			if ($id instanceof stdClass) {
+				$metadata = $id;
+				
+				$objarray = (array) $metadata;
+				foreach ($objarray as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else {
+				// get an ElggMetadata object and copy its attributes
+				$metadata = elgg_get_metadata_from_id($id);
+				$this->attributes = $metadata->attributes;
+			}
+		}
+	}
+
+	/**
+	 * Determines whether or not the user can edit this piece of metadata
+	 *
+	 * @param int $user_guid The GUID of the user (defaults to currently logged in user)
+	 *
+	 * @return bool Depending on permissions
+	 */
+	function canEdit($user_guid = 0) {
+		if ($entity = get_entity($this->get('entity_guid'))) {
+			return $entity->canEditMetadata($this, $user_guid);
+		}
+		return false;
+	}
+
+	/**
+	 * Save metadata object
+	 *
+	 * @return int|bool the metadata object id or true if updated
+	 *
+	 * @throws IOException
+	 */
+	function save() {
+		if ($this->id > 0) {
+			return update_metadata($this->id, $this->name, $this->value,
+				$this->value_type, $this->owner_guid, $this->access_id);
+		} else {
+			$this->id = create_metadata($this->entity_guid, $this->name, $this->value,
+				$this->value_type, $this->owner_guid, $this->access_id);
+
+			if (!$this->id) {
+				throw new IOException(elgg_echo('IOException:UnableToSaveNew', array(get_class())));
+			}
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Delete the metadata
+	 *
+	 * @return bool
+	 */
+	function delete() {
+		$success = elgg_delete_metastring_based_object_by_id($this->id, 'metadata');
+		if ($success) {
+			// we mark unknown here because this deletes only one value
+			// under this name, and there may be others remaining.
+			elgg_get_metadata_cache()->markUnknown($this->entity_guid, $this->name);
+		}
+		return $success;
+	}
+
+	/**
+	 * Disable the metadata
+	 *
+	 * @return bool
+	 * @since 1.8
+	 */
+	function disable() {
+		$success = elgg_set_metastring_based_object_enabled_by_id($this->id, 'no', 'metadata');
+		if ($success) {
+			// we mark unknown here because this disables only one value
+			// under this name, and there may be others remaining.
+			elgg_get_metadata_cache()->markUnknown($this->entity_guid, $this->name);
+		}
+		return $success;
+	}
+
+	/**
+	 * Enable the metadata
+	 *
+	 * @return bool
+	 * @since 1.8
+	 */
+	function enable() {
+		$success = elgg_set_metastring_based_object_enabled_by_id($this->id, 'yes', 'metadata');
+		if ($success) {
+			elgg_get_metadata_cache()->markUnknown($this->entity_guid, $this->name);
+		}
+		return $success;
+	}
+
+	/**
+	 * Get a url for this item of metadata.
+	 *
+	 * @return string
+	 */
+	public function getURL() {
+		return get_metadata_url($this->id);
+	}
+
+	// SYSTEM LOG INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * For a given ID, return the object associated with it.
+	 * This is used by the river functionality primarily.
+	 * This is useful for checking access permissions etc on objects.
+	 *
+	 * @param int $id Metadata ID
+	 *
+	 * @return ElggMetadata
+	 */
+	public function getObjectFromID($id) {
+		return elgg_get_metadata_from_id($id);
+	}
+}
diff --git a/engine/classes/ElggObject.php b/engine/classes/ElggObject.php
new file mode 100644
index 000000000..aeaa3ba5c
--- /dev/null
+++ b/engine/classes/ElggObject.php
@@ -0,0 +1,216 @@
+<?php
+/**
+ * Elgg Object
+ *
+ * Elgg objects are the most common means of storing information in the database.
+ * They are a child class of ElggEntity, so receive all the benefits of the Entities,
+ * but also include a title and description field.
+ *
+ * An ElggObject represents a row from the objects_entity table, as well
+ * as the related row in the entities table as represented by the parent
+ * ElggEntity object.
+ *
+ * @internal Title and description are stored in the objects_entity table.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Object
+ * 
+ * @property string $title       The title, name, or summary of this object
+ * @property string $description The body, description, or content of the object
+ * @property array  $tags        Array of tags that describe the object
+ */
+class ElggObject extends ElggEntity {
+
+	/**
+	 * Initialise the attributes array to include the type,
+	 * title, and description.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = "object";
+		$this->attributes['title'] = NULL;
+		$this->attributes['description'] = NULL;
+		$this->attributes['tables_split'] = 2;
+	}
+
+	/**
+	 * Load or create a new ElggObject.
+	 *
+	 * If no arguments are passed, create a new entity.
+	 *
+	 * If an argument is passed, attempt to load a full ElggObject entity.
+	 * Arguments can be:
+	 *  - The GUID of an object entity.
+	 *  - A DB result object from the entities table with a guid property
+	 *
+	 * @param mixed $guid If an int, load that GUID.  If a db row, then will attempt to
+	 * load the rest of the data.
+	 *
+	 * @throws IOException If passed an incorrect guid
+	 * @throws InvalidParameterException If passed an Elgg* Entity that isn't an ElggObject
+	 */
+	function __construct($guid = null) {
+		$this->initializeAttributes();
+
+		// compatibility for 1.7 api.
+		$this->initialise_attributes(false);
+
+		if (!empty($guid)) {
+			// Is $guid is a DB row from the entity table
+			if ($guid instanceof stdClass) {
+				// Load the rest
+				if (!$this->load($guid)) {
+					$msg = elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid->guid));
+					throw new IOException($msg);
+				}
+			} else if ($guid instanceof ElggObject) {
+				// $guid is an ElggObject so this is a copy constructor
+				elgg_deprecated_notice('This type of usage of the ElggObject constructor was deprecated. Please use the clone method.', 1.7);
+
+				foreach ($guid->attributes as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else if ($guid instanceof ElggEntity) {
+				// @todo remove - do not need separate exception
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonElggObject'));
+			} else if (is_numeric($guid)) {
+				// $guid is a GUID so load
+				if (!$this->load($guid)) {
+					throw new IOException(elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid)));
+				}
+			} else {
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnrecognisedValue'));
+			}
+		}
+	}
+
+	/**
+	 * Loads the full ElggObject when given a guid.
+	 *
+	 * @param mixed $guid GUID of an ElggObject or the stdClass object from entities table
+	 *
+	 * @return bool
+	 * @throws InvalidClassException
+	 */
+	protected function load($guid) {
+		$attr_loader = new ElggAttributeLoader(get_class(), 'object', $this->attributes);
+		$attr_loader->requires_access_control = !($this instanceof ElggPlugin);
+		$attr_loader->secondary_loader = 'get_object_entity_as_row';
+
+		$attrs = $attr_loader->getRequiredAttributes($guid);
+		if (!$attrs) {
+			return false;
+		}
+
+		$this->attributes = $attrs;
+		$this->attributes['tables_loaded'] = 2;
+		_elgg_cache_entity($this);
+
+		return true;
+	}
+
+	/**
+	 * Saves object-specific attributes.
+	 *
+	 * @internal Object attributes are saved in the objects_entity table.
+	 *
+	 * @return bool
+	 */
+	public function save() {
+		// Save ElggEntity attributes
+		if (!parent::save()) {
+			return false;
+		}
+
+		// Save ElggObject-specific attributes
+
+		_elgg_disable_caching_for_entity($this->guid);
+		$ret = create_object_entity($this->get('guid'), $this->get('title'), $this->get('description'));
+		_elgg_enable_caching_for_entity($this->guid);
+
+		return $ret;
+	}
+
+	/**
+	 * Return sites that this object is a member of
+	 *
+	 * Site membership is determined by relationships and not site_guid.d
+	 *
+	 * @todo This should be moved to ElggEntity
+	 * @todo Unimplemented
+	 *
+	 * @param string $subtype Optionally, the subtype of result we want to limit to
+	 * @param int    $limit   The number of results to return
+	 * @param int    $offset  Any indexing offset
+	 *
+	 * @return array|false
+	 */
+	function getSites($subtype = "", $limit = 10, $offset = 0) {
+		return get_site_objects($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Add this object to a site
+	 *
+	 * @param int $site_guid The guid of the site to add it to
+	 *
+	 * @return bool
+	 */
+	function addToSite($site_guid) {
+		return add_site_object($this->getGUID(), $site_guid);
+	}
+
+	/*
+	 * EXPORTABLE INTERFACE
+	 */
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array_merge(parent::getExportableValues(), array(
+			'title',
+			'description',
+		));
+	}
+
+	/**
+	 * Can a user comment on this object?
+	 *
+	 * @see ElggEntity::canComment()
+	 *
+	 * @param int $user_guid User guid (default is logged in user)
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function canComment($user_guid = 0) {
+		$result = parent::canComment($user_guid);
+		if ($result !== null) {
+			return $result;
+		}
+
+		if ($user_guid == 0) {
+			$user_guid = elgg_get_logged_in_user_guid();
+		}
+
+		// must be logged in to comment
+		if (!$user_guid) {
+			return false;
+		}
+
+		// must be member of group
+		if (elgg_instanceof($this->getContainerEntity(), 'group')) {
+			if (!$this->getContainerEntity()->canWriteToContainer($user_guid)) {
+				return false;
+			}
+		}
+
+		// no checks on read access since a user cannot see entities outside his access
+		return true;
+	}
+}
diff --git a/engine/classes/ElggPAM.php b/engine/classes/ElggPAM.php
new file mode 100644
index 000000000..f07095fc1
--- /dev/null
+++ b/engine/classes/ElggPAM.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * ElggPAM Pluggable Authentication Module
+ *
+ * @package    Elgg.Core
+ * @subpackage Authentication
+ */
+class ElggPAM {
+	/**
+	 * @var string PAM policy type: user, api or plugin-defined policies
+	 */
+	protected $policy;
+
+	/**
+	 * @var array Failure mesages
+	 */
+	protected $messages;
+
+	/**
+	 * ElggPAM constructor
+	 * 
+	 * @param string $policy PAM policy type: user, api, or plugin-defined policies
+	 */
+	public function __construct($policy) {
+		$this->policy = $policy;
+		$this->messages = array('sufficient' => array(), 'required' => array());
+	}
+
+	/**
+	 * Authenticate a set of credentials against a policy
+	 * This function will process all registered PAM handlers or stop when the first
+	 * handler fails. A handler fails by either returning false or throwing an
+	 * exception. The advantage of throwing an exception is that it returns a message
+	 * that can be passed to the user. The processing order of the handlers is
+	 * determined by the order that they were registered.
+	 *
+	 * If $credentials are provided, the PAM handler should authenticate using the
+	 * provided credentials. If not, then credentials should be prompted for or
+	 * otherwise retrieved (eg from the HTTP header or $_SESSION).
+	 *
+	 * @param array $credentials Credentials array dependant on policy type
+	 * @return bool
+	 */
+	public function authenticate($credentials = array()) {
+		global $_PAM_HANDLERS;
+
+		if (!isset($_PAM_HANDLERS[$this->policy]) ||
+			!is_array($_PAM_HANDLERS[$this->policy])) {
+			return false;
+		}
+
+		$authenticated = false;
+
+		foreach ($_PAM_HANDLERS[$this->policy] as $k => $v) {
+			$handler = $v->handler;
+			if (!is_callable($handler)) {
+				continue;
+			}
+			/* @var callable $handler */
+
+			$importance = $v->importance;
+
+			try {
+				// Execute the handler
+				// @todo don't assume $handler is a global function
+				$result = call_user_func($handler, $credentials);
+				if ($result) {
+					$authenticated = true;
+				} elseif ($result === false) {
+					if ($importance == 'required') {
+						$this->messages['required'][] = "$handler:failed";
+						return false;
+					} else {
+						$this->messages['sufficient'][] = "$handler:failed";
+					}
+				}
+			} catch (Exception $e) {
+				if ($importance == 'required') {
+					$this->messages['required'][] = $e->getMessage();
+					return false;
+				} else {
+					$this->messages['sufficient'][] = $e->getMessage();
+				}
+			}
+		}
+
+		return $authenticated;
+	}
+
+	/**
+	 * Get a failure message to display to user
+	 * 
+	 * @return string
+	 */
+	public function getFailureMessage() {
+		$message = elgg_echo('auth:nopams');
+		if (!empty($this->messages['required'])) {
+			$message = $this->messages['required'][0];
+		} elseif (!empty($this->messages['sufficient'])) {
+			$message = $this->messages['sufficient'][0];
+		}
+
+		return elgg_trigger_plugin_hook('fail', 'auth', $this->messages, $message);
+	}
+}
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
new file mode 100644
index 000000000..545b9a53c
--- /dev/null
+++ b/engine/classes/ElggPlugin.php
@@ -0,0 +1,1006 @@
+<?php
+/**
+ * Stores site-side plugin settings as private data.
+ *
+ * This class is currently a stub, allowing a plugin to
+ * save settings in an object's private settings for each site.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins.Settings
+ */
+class ElggPlugin extends ElggObject {
+	private $package;
+	private $manifest;
+
+	private $path;
+	private $pluginID;
+	private $errorMsg = '';
+
+	/**
+	 * Set subtype to 'plugin'
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['subtype'] = "plugin";
+
+		// plugins must be public.
+		$this->access_id = ACCESS_PUBLIC;
+	}
+
+	/**
+	 * Loads the plugin by GUID or path.
+	 *
+	 * @warning Unlike other ElggEntity objects, you cannot null instantiate
+	 *          ElggPlugin. You must point it to an actual plugin GUID or location.
+	 *
+	 * @param mixed $plugin The GUID of the ElggPlugin object or the path of the plugin to load.
+	 *
+	 * @throws PluginException
+	 */
+	public function __construct($plugin) {
+		if (!$plugin) {
+			throw new PluginException(elgg_echo('PluginException:NullInstantiated'));
+		}
+
+		// ElggEntity can be instantiated with a guid or an object.
+		// @todo plugins w/id 12345
+		if (is_numeric($plugin) || is_object($plugin)) {
+			parent::__construct($plugin);
+			$this->path = elgg_get_plugins_path() . $this->getID();
+		} else {
+			$plugin_path = elgg_get_plugins_path();
+
+			// not a full path, so assume an id
+			// use the default path
+			if (strpos($plugin, $plugin_path) !== 0) {
+				$plugin = $plugin_path . $plugin;
+			}
+
+			// path checking is done in the package
+			$plugin = sanitise_filepath($plugin);
+			$this->path = $plugin;
+			$path_parts = explode('/', rtrim($plugin, '/'));
+			$plugin_id = array_pop($path_parts);
+			$this->pluginID = $plugin_id;
+
+			// check if we're loading an existing plugin
+			$existing_plugin = elgg_get_plugin_from_id($this->pluginID);
+			$existing_guid = null;
+
+			if ($existing_plugin) {
+				$existing_guid = $existing_plugin->guid;
+			}
+
+			// load the rest of the plugin
+			parent::__construct($existing_guid);
+		}
+
+		_elgg_cache_plugin_by_id($this);
+	}
+
+	/**
+	 * Save the plugin object.  Make sure required values exist.
+	 *
+	 * @see ElggObject::save()
+	 * @return bool
+	 */
+	public function save() {
+		// own by the current site so users can be deleted without affecting plugins
+		$site = get_config('site');
+		$this->attributes['site_guid'] = $site->guid;
+		$this->attributes['owner_guid'] = $site->guid;
+		$this->attributes['container_guid'] = $site->guid;
+		$this->attributes['title'] = $this->pluginID;
+
+		if (parent::save()) {
+			// make sure we have a priority
+			$priority = $this->getPriority();
+			if ($priority === FALSE || $priority === NULL) {
+				return $this->setPriority('last');
+			}
+		} else {
+			return false;
+		}
+	}
+
+
+	// Plugin ID and path
+
+	/**
+	 * Returns the ID (dir name) of this plugin
+	 *
+	 * @return string
+	 */
+	public function getID() {
+		return $this->title;
+	}
+
+	/**
+	 * Returns the manifest's name if available, otherwise the ID.
+	 * 
+	 * @return string
+	 * @since 1.8.1
+	 */
+	public function getFriendlyName() {
+		$manifest = $this->getManifest();
+		if ($manifest) {
+			return $manifest->getName();
+		}
+
+		return $this->getID();
+	}
+
+	/**
+	 * Returns the plugin's full path with trailing slash.
+	 *
+	 * @return string
+	 */
+	public function getPath() {
+		return sanitise_filepath($this->path);
+	}
+
+	/**
+	 * Sets the location of this plugin.
+	 *
+	 * @param string $id The path to the plugin's dir.
+	 * @return bool
+	 */
+	public function setID($id) {
+		return $this->attributes['title'] = $id;
+	}
+
+	/**
+	 * Returns an array of available markdown files for this plugin
+	 * 
+	 * @return array
+	 */
+	public function getAvailableTextFiles() {
+		$filenames = $this->getPackage()->getTextFilenames();
+
+		$files = array();
+		foreach ($filenames as $filename) {
+			if ($this->canReadFile($filename)) {
+				$files[$filename] = "$this->path/$filename";
+			}
+		}
+
+		return $files;
+	}
+
+	// Load Priority
+
+	/**
+	 * Gets the plugin's load priority.
+	 *
+	 * @return int
+	 */
+	public function getPriority() {
+		$name = elgg_namespace_plugin_private_setting('internal', 'priority');
+		return $this->$name;
+	}
+
+	/**
+	 * Sets the priority of the plugin
+	 *
+	 * @param mixed $priority  The priority to set. One of +1, -1, first, last, or a number.
+	 *                         If given a number, this will displace all plugins at that number
+	 *                         and set their priorities +1
+	 * @param mixed $site_guid Optional site GUID.
+	 * @return bool
+	 */
+	public function setPriority($priority, $site_guid = null) {
+		if (!$this->guid) {
+			return false;
+		}
+
+		$db_prefix = get_config('dbprefix');
+		$name = elgg_namespace_plugin_private_setting('internal', 'priority');
+		// if no priority assume a priority of 1
+		$old_priority = (int) $this->getPriority();
+		$old_priority = (!$old_priority) ? 1 : $old_priority;
+		$max_priority = elgg_get_max_plugin_priority();
+
+		// can't use switch here because it's not strict and
+		// php evaluates +1 == 1
+		if ($priority === '+1') {
+			$priority = $old_priority + 1;
+		} elseif ($priority === '-1') {
+			$priority = $old_priority - 1;
+		} elseif ($priority === 'first') {
+			$priority = 1;
+		} elseif ($priority === 'last') {
+			$priority = $max_priority;
+		}
+
+		// should be a number by now
+		if ($priority > 0) {
+			if (!is_numeric($priority)) {
+				return false;
+			}
+
+			// there's nothing above the max.
+			if ($priority > $max_priority) {
+				$priority = $max_priority;
+			}
+
+			// there's nothing below 1.
+			if ($priority < 1) {
+				$priority = 1;
+			}
+
+			if ($priority > $old_priority) {
+				$op = '-';
+				$where = "CAST(value as unsigned) BETWEEN $old_priority AND $priority";
+			} else {
+				$op = '+';
+				$where = "CAST(value as unsigned) BETWEEN $priority AND $old_priority";
+			}
+
+			// displace the ones affected by this change
+			$q = "UPDATE {$db_prefix}private_settings
+				SET value = CAST(value as unsigned) $op 1
+				WHERE entity_guid != $this->guid
+				AND name = '$name'
+				AND $where";
+
+			if (!update_data($q)) {
+				return false;
+			}
+
+			// set this priority
+			if ($this->set($name, $priority)) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+
+	// Plugin settings
+
+	/**
+	 * Returns a plugin setting
+	 *
+	 * @param string $name The setting name
+	 * @return mixed
+	 */
+	public function getSetting($name) {
+		return $this->$name;
+	}
+
+	/**
+	 * Returns an array of all settings saved for this plugin.
+	 *
+	 * @note Unlike user settings, plugin settings are not namespaced.
+	 *
+	 * @return array An array of key/value pairs.
+	 */
+	public function getAllSettings() {
+		if (!$this->guid) {
+			return false;
+		}
+
+		$db_prefix = elgg_get_config('dbprefix');
+		// need to remove all namespaced private settings.
+		$us_prefix = elgg_namespace_plugin_private_setting('user_setting', '', $this->getID());
+		$is_prefix = elgg_namespace_plugin_private_setting('internal', '', $this->getID());
+
+		// Get private settings for user
+		$q = "SELECT * FROM {$db_prefix}private_settings
+			WHERE entity_guid = $this->guid
+			AND name NOT LIKE '$us_prefix%'
+			AND name NOT LIKE '$is_prefix%'";
+
+		$private_settings = get_data($q);
+
+		$return = array();
+
+		if ($private_settings) {
+			foreach ($private_settings as $setting) {
+				$return[$setting->name] = $setting->value;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Set a plugin setting for the plugin
+	 *
+	 * @todo This will only work once the plugin has a GUID.
+	 *
+	 * @param string $name  The name to set
+	 * @param string $value The value to set
+	 *
+	 * @return bool
+	 */
+	public function setSetting($name, $value) {
+		if (!$this->guid) {
+			return false;
+		}
+
+		return $this->set($name, $value);
+	}
+
+	/**
+	 * Removes a plugin setting name and value.
+	 *
+	 * @param string $name The setting name to remove
+	 *
+	 * @return bool
+	 */
+	public function unsetSetting($name) {
+		return remove_private_setting($this->guid, $name);
+	}
+
+	/**
+	 * Removes all settings for this plugin.
+	 *
+	 * @todo Should be a better way to do this without dropping to raw SQL.
+	 * @todo If we could namespace the plugin settings this would be cleaner.
+	 * @return bool
+	 */
+	public function unsetAllSettings() {
+		$db_prefix = get_config('dbprefix');
+
+		$us_prefix = elgg_namespace_plugin_private_setting('user_setting', '', $this->getID());
+		$is_prefix = elgg_namespace_plugin_private_setting('internal', '', $this->getID());
+
+		$q = "DELETE FROM {$db_prefix}private_settings
+			WHERE entity_guid = $this->guid
+			AND name NOT LIKE '$us_prefix%'
+			AND name NOT LIKE '$is_prefix%'";
+
+		return delete_data($q);
+	}
+
+
+	// User settings
+
+	/**
+	 * Returns a user's setting for this plugin
+	 *
+	 * @param string $name      The setting name
+	 * @param int    $user_guid The user GUID
+	 *
+	 * @return mixed The setting string value or false
+	 */
+	public function getUserSetting($name, $user_guid = null) {
+		$user_guid = (int)$user_guid;
+
+		if ($user_guid) {
+			$user = get_entity($user_guid);
+		} else {
+			$user = elgg_get_logged_in_user_entity();
+		}
+
+		if (!($user instanceof ElggUser)) {
+			return false;
+		}
+
+		$name = elgg_namespace_plugin_private_setting('user_setting', $name, $this->getID());
+		return get_private_setting($user->guid, $name);
+	}
+
+	/**
+	 * Returns an array of all user settings saved for this plugin for the user.
+	 *
+	 * @note Plugin settings are saved with a prefix. This removes that prefix.
+	 *
+	 * @param int $user_guid The user GUID. Defaults to logged in.
+	 * @return array An array of key/value pairs.
+	 */
+	public function getAllUserSettings($user_guid = null) {
+		$user_guid = (int)$user_guid;
+
+		if ($user_guid) {
+			$user = get_entity($user_guid);
+		} else {
+			$user = elgg_get_logged_in_user_entity();
+		}
+
+		if (!($user instanceof ElggUser)) {
+			return false;
+		}
+
+		$db_prefix = elgg_get_config('dbprefix');
+		// send an empty name so we just get the first part of the namespace
+		$ps_prefix = elgg_namespace_plugin_private_setting('user_setting', '', $this->getID());
+		$ps_prefix_len = strlen($ps_prefix);
+
+		// Get private settings for user
+		$q = "SELECT * FROM {$db_prefix}private_settings
+			WHERE entity_guid = {$user->guid}
+			AND name LIKE '$ps_prefix%'";
+
+		$private_settings = get_data($q);
+
+		$return = array();
+
+		if ($private_settings) {
+			foreach ($private_settings as $setting) {
+				$name = substr($setting->name, $ps_prefix_len);
+				$value = $setting->value;
+
+				$return[$name] = $value;
+			}
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Sets a user setting for a plugin
+	 *
+	 * @param string $name      The setting name
+	 * @param string $value     The setting value
+	 * @param int    $user_guid The user GUID
+	 *
+	 * @return mixed The new setting ID or false
+	 */
+	public function setUserSetting($name, $value, $user_guid = null) {
+		$user_guid = (int)$user_guid;
+
+		if ($user_guid) {
+			$user = get_entity($user_guid);
+		} else {
+			$user = elgg_get_logged_in_user_entity();
+		}
+
+		if (!($user instanceof ElggUser)) {
+			return false;
+		}
+
+		// Hook to validate setting
+		// note: this doesn't pass the namespaced name
+		$value = elgg_trigger_plugin_hook('usersetting', 'plugin', array(
+			'user' => $user,
+			'plugin' => $this,
+			'plugin_id' => $this->getID(),
+			'name' => $name,
+			'value' => $value
+		), $value);
+
+		// set the namespaced name.
+		$name = elgg_namespace_plugin_private_setting('user_setting', $name, $this->getID());
+
+		return set_private_setting($user->guid, $name, $value);
+	}
+
+
+	/**
+	 * Removes a user setting name and value.
+	 *
+	 * @param string $name      The user setting name
+	 * @param int    $user_guid The user GUID
+	 * @return bool
+	 */
+	public function unsetUserSetting($name, $user_guid = null) {
+		$user_guid = (int)$user_guid;
+
+		if ($user_guid) {
+			$user = get_entity($user_guid);
+		} else {
+			$user = elgg_get_logged_in_user_entity();
+		}
+
+		if (!($user instanceof ElggUser)) {
+			return false;
+		}
+
+		// set the namespaced name.
+		$name = elgg_namespace_plugin_private_setting('user_setting', $name, $this->getID());
+
+		return remove_private_setting($user->guid, $name);
+	}
+
+	/**
+	 * Removes all User Settings for this plugin
+	 *
+	 * Use {@link removeAllUsersSettings()} to remove all user
+	 * settings for all users.  (Note the plural 'Users'.)
+	 *
+	 * @param int $user_guid The user GUID to remove user settings.
+	 * @return bool
+	 */
+	public function unsetAllUserSettings($user_guid) {
+		$db_prefix = get_config('dbprefix');
+		$ps_prefix = elgg_namespace_plugin_private_setting('user_setting', '', $this->getID());
+
+		$q = "DELETE FROM {$db_prefix}private_settings
+			WHERE entity_guid = $user_guid
+			AND name LIKE '$ps_prefix%'";
+
+		return delete_data($q);
+	}
+
+	/**
+	 * Removes this plugin's user settings for all users.
+	 *
+	 * Use {@link removeAllUserSettings()} if you just want to remove
+	 * settings for a single user.
+	 *
+	 * @return bool
+	 */
+	public function unsetAllUsersSettings() {
+		$db_prefix = get_config('dbprefix');
+		$ps_prefix = elgg_namespace_plugin_private_setting('user_setting', '', $this->getID());
+
+		$q = "DELETE FROM {$db_prefix}private_settings
+			WHERE name LIKE '$ps_prefix%'";
+
+		return delete_data($q);
+	}
+
+
+	// validation
+
+	/**
+	 * Returns if the plugin is complete, meaning has all required files
+	 * and Elgg can read them and they make sense.
+	 *
+	 * @todo bad name? This could be confused with isValid() from ElggPluginPackage.
+	 *
+	 * @return bool
+	 */
+	public function isValid() {
+		if (!$this->getID()) {
+			$this->errorMsg = elgg_echo('ElggPlugin:NoId', array($this->guid));
+			return false;
+		}
+
+		if (!$this->getPackage() instanceof ElggPluginPackage) {
+			$this->errorMsg = elgg_echo('ElggPlugin:NoPluginPackagePackage', array($this->getID(), $this->guid));
+			return false;
+		}
+
+		if (!$this->getPackage()->isValid()) {
+			$this->errorMsg = $this->getPackage()->getError();
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Is this plugin active?
+	 *
+	 * @param int $site_guid Optional site guid.
+	 * @return bool
+	 */
+	public function isActive($site_guid = null) {
+		if (!$this->guid) {
+			return false;
+		}
+
+		if ($site_guid) {
+			$site = get_entity($site_guid);
+		} else {
+			$site = get_config('site');
+		}
+
+		if (!($site instanceof ElggSite)) {
+			return false;
+		}
+
+		return check_entity_relationship($this->guid, 'active_plugin', $site->guid);
+	}
+
+	/**
+	 * Checks if this plugin can be activated on the current
+	 * Elgg installation.
+	 *
+	 * @todo remove $site_guid param or implement it
+	 *
+	 * @param mixed $site_guid Optional site guid
+	 * @return bool
+	 */
+	public function canActivate($site_guid = null) {
+		if ($this->getPackage()) {
+			$result = $this->getPackage()->isValid() && $this->getPackage()->checkDependencies();
+			if (!$result) {
+				$this->errorMsg = $this->getPackage()->getError();
+			}
+
+			return $result;
+		}
+
+		return false;
+	}
+
+
+	// activating and deactivating
+
+	/**
+	 * Actives the plugin for the current site.
+	 *
+	 * @param mixed $site_guid Optional site GUID.
+	 * @return bool
+	 */
+	public function activate($site_guid = null) {
+		if ($this->isActive($site_guid)) {
+			return false;
+		}
+
+		if (!$this->canActivate()) {
+			return false;
+		}
+
+		// set in the db, now perform tasks and emit events
+		if ($this->setStatus(true, $site_guid)) {
+			// emit an event. returning false will make this not be activated.
+			// we need to do this after it's been fully activated
+			// or the deactivate will be confused.
+			$params = array(
+				'plugin_id' => $this->pluginID,
+				'plugin_entity' => $this
+			);
+
+			$return = elgg_trigger_event('activate', 'plugin', $params);
+
+			// if there are any on_enable functions, start the plugin now and run them
+			// Note: this will not run re-run the init hooks!
+			if ($return) {
+				if ($this->canReadFile('activate.php')) {
+					$flags = ELGG_PLUGIN_INCLUDE_START | ELGG_PLUGIN_REGISTER_CLASSES |
+							ELGG_PLUGIN_REGISTER_LANGUAGES | ELGG_PLUGIN_REGISTER_VIEWS;
+
+					$this->start($flags);
+
+					$return = $this->includeFile('activate.php');
+				}
+			}
+
+			if ($return === false) {
+				$this->deactivate($site_guid);
+			}
+
+			return $return;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Deactivates the plugin.
+	 *
+	 * @param mixed $site_guid Optional site GUID.
+	 * @return bool
+	 */
+	public function deactivate($site_guid = null) {
+		if (!$this->isActive($site_guid)) {
+			return false;
+		}
+
+		// emit an event. returning false will cause this to not be deactivated.
+		$params = array(
+			'plugin_id' => $this->pluginID,
+			'plugin_entity' => $this
+		);
+
+		$return = elgg_trigger_event('deactivate', 'plugin', $params);
+
+		// run any deactivate code
+		if ($return) {
+			if ($this->canReadFile('deactivate.php')) {
+				$return = $this->includeFile('deactivate.php');
+			}
+		}
+
+		if ($return === false) {
+			return false;
+		} else {
+			return $this->setStatus(false, $site_guid);
+		}
+	}
+
+	/**
+	 * Start the plugin.
+	 *
+	 * @param int $flags Start flags for the plugin. See the constants in lib/plugins.php for details.
+	 * @return true
+	 * @throws PluginException
+	 */
+	public function start($flags) {
+		//if (!$this->canActivate()) {
+		//	return false;
+		//}
+
+		// include classes
+		if ($flags & ELGG_PLUGIN_REGISTER_CLASSES) {
+			$this->registerClasses();
+		}
+		
+		// include start file
+		if ($flags & ELGG_PLUGIN_INCLUDE_START) {
+			$this->includeFile('start.php');
+		}
+
+		// include views
+		if ($flags & ELGG_PLUGIN_REGISTER_VIEWS) {
+			$this->registerViews();
+		}
+
+		// include languages
+		if ($flags & ELGG_PLUGIN_REGISTER_LANGUAGES) {
+			$this->registerLanguages();
+		}
+
+		return true;
+	}
+
+
+	// start helpers
+
+	/**
+	 * Includes one of the plugins files
+	 *
+	 * @param string $filename The name of the file
+	 *
+	 * @throws PluginException
+	 * @return mixed The return value of the included file (or 1 if there is none)
+	 */
+	protected function includeFile($filename) {
+		// This needs to be here to be backwards compatible for 1.0-1.7.
+		// They expect the global config object to be available in start.php.
+		if ($filename == 'start.php') {
+			global $CONFIG;
+		}
+
+		$filepath = "$this->path/$filename";
+
+		if (!$this->canReadFile($filename)) {
+			$msg = elgg_echo('ElggPlugin:Exception:CannotIncludeFile',
+							array($filename, $this->getID(), $this->guid, $this->path));
+			throw new PluginException($msg);
+		}
+
+		return include $filepath;
+	}
+
+	/**
+	 * Checks whether a plugin file with the given name exists
+	 *
+	 * @param string $filename The name of the file
+	 * @return bool
+	 */
+	protected function canReadFile($filename) {
+		return is_readable($this->path . '/' . $filename);
+	}
+
+	/**
+	 * Registers the plugin's views
+	 *
+	 * @throws PluginException
+	 * @return true
+	 */
+	protected function registerViews() {
+		$view_dir = "$this->path/views/";
+
+		// plugins don't have to have views.
+		if (!is_dir($view_dir)) {
+			return true;
+		}
+
+		// but if they do, they have to be readable
+		$handle = opendir($view_dir);
+		if (!$handle) {
+			$msg = elgg_echo('ElggPlugin:Exception:CannotRegisterViews',
+							array($this->getID(), $this->guid, $view_dir));
+			throw new PluginException($msg);
+		}
+
+		while (FALSE !== ($view_type = readdir($handle))) {
+			$view_type_dir = $view_dir . $view_type;
+
+			if ('.' !== substr($view_type, 0, 1) && is_dir($view_type_dir)) {
+				if (autoregister_views('', $view_type_dir, $view_dir, $view_type)) {
+					elgg_register_viewtype($view_type);
+				} else {
+					$msg = elgg_echo('ElggPlugin:Exception:CannotRegisterViews',
+									array($this->getID(), $view_type_dir));
+					throw new PluginException($msg);
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Registers the plugin's languages
+	 *
+	 * @throws PluginException
+	 * @return true
+	 */
+	protected function registerLanguages() {
+		$languages_path = "$this->path/languages";
+
+		// don't need to have classes
+		if (!is_dir($languages_path)) {
+			return true;
+		}
+
+		// but need to have working ones.
+		if (!register_translations($languages_path)) {
+			$msg = elgg_echo('ElggPlugin:Exception:CannotRegisterLanguages',
+							array($this->getID(), $this->guid, $languages_path));
+			throw new PluginException($msg);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Registers the plugin's classes
+	 *
+	 * @throws PluginException
+	 * @return true
+	 */
+	protected function registerClasses() {
+		$classes_path = "$this->path/classes";
+
+		// don't need to have classes
+		if (!is_dir($classes_path)) {
+			return true;
+		}
+
+		elgg_register_classes($classes_path);
+
+		return true;
+	}
+
+
+	// generic helpers and overrides
+
+	/**
+	 * Get a value from private settings.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function get($name) {
+		// rewrite for old and inaccurate plugin:setting
+		if (strstr($name, 'plugin:setting:')) {
+			$msg = 'Direct access of user settings is deprecated. Use ElggPlugin->getUserSetting()';
+			elgg_deprecated_notice($msg, 1.8);
+			$name = str_replace('plugin:setting:', '', $name);
+			$name = elgg_namespace_plugin_private_setting('user_setting', $name);
+		}
+
+		// See if its in our base attribute
+		if (array_key_exists($name, $this->attributes)) {
+			return $this->attributes[$name];
+		}
+
+		// No, so see if its in the private data store.
+		// get_private_setting() returns false if it doesn't exist
+		$meta = $this->getPrivateSetting($name);
+
+		if ($meta === false) {
+			// Can't find it, so return null
+			return NULL;
+		}
+
+		return $meta;
+	}
+
+	/**
+	 * Save a value as private setting or attribute.
+	 *
+	 * Attributes include title and description.
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return bool
+	 */
+	public function set($name, $value) {
+		if (array_key_exists($name, $this->attributes)) {
+			// Check that we're not trying to change the guid!
+			if ((array_key_exists('guid', $this->attributes)) && ($name == 'guid')) {
+				return false;
+			}
+
+			$this->attributes[$name] = $value;
+
+			return true;
+		} else {
+			// Hook to validate setting
+			$value = elgg_trigger_plugin_hook('setting', 'plugin', array(
+				'plugin_id' => $this->pluginID,
+				'plugin' => $this,
+				'name' => $name,
+				'value' => $value
+			), $value);
+
+			return $this->setPrivateSetting($name, $value);
+		}
+	}
+
+	/**
+	 * Sets the plugin to active or inactive for $site_guid.
+	 *
+	 * @param bool  $active    Set to active or inactive
+	 * @param mixed $site_guid Int for specific site, null for current site.
+	 *
+	 * @return bool
+	 */
+	private function setStatus($active, $site_guid = null) {
+		if (!$this->guid) {
+			return false;
+		}
+
+		if ($site_guid) {
+			$site = get_entity($site_guid);
+
+			if (!($site instanceof ElggSite)) {
+				return false;
+			}
+		} else {
+			$site = get_config('site');
+		}
+
+		if ($active) {
+			return add_entity_relationship($this->guid, 'active_plugin', $site->guid);
+		} else {
+			return remove_entity_relationship($this->guid, 'active_plugin', $site->guid);
+		}
+	}
+
+	/**
+	 * Returns the last error message registered.
+	 *
+	 * @return string|null
+	 */
+	public function getError() {
+		return $this->errorMsg;
+	}
+
+	/**
+	 * Returns this plugin's ElggPluginManifest object
+	 *
+	 * @return ElggPluginManifest
+	 */
+	public function getManifest() {
+		if ($this->manifest instanceof ElggPluginManifest) {
+			return $this->manifest;
+		}
+
+		try {
+			$this->manifest = $this->getPackage()->getManifest();
+		} catch (Exception $e) {
+			elgg_log("Failed to load manifest for plugin $this->guid. " . $e->getMessage(), 'WARNING');
+			$this->errorMsg = $e->getmessage();
+		}
+
+		return $this->manifest;
+	}
+
+	/**
+	 * Returns this plugin's ElggPluginPackage object
+	 *
+	 * @return ElggPluginPackage
+	 */
+	public function getPackage() {
+		if ($this->package instanceof ElggPluginPackage) {
+			return $this->package;
+		}
+
+		try {
+			$this->package = new ElggPluginPackage($this->path, false);
+		} catch (Exception $e) {
+			elgg_log("Failed to load package for $this->guid. " . $e->getMessage(), 'WARNING');
+			$this->errorMsg = $e->getmessage();
+		}
+
+		return $this->package;
+	}
+}
diff --git a/engine/classes/ElggPluginManifest.php b/engine/classes/ElggPluginManifest.php
new file mode 100644
index 000000000..6912c2b08
--- /dev/null
+++ b/engine/classes/ElggPluginManifest.php
@@ -0,0 +1,656 @@
+<?php
+/**
+ * Parses Elgg manifest.xml files.
+ *
+ * Normalizes the values from the ElggManifestParser object.
+ *
+ * This requires an ElggPluginManifestParser class implementation
+ * as $this->parser.
+ *
+ * To add new parser versions, name them ElggPluginManifestParserXX
+ * where XX is the version specified in the top-level <plugin_manifest>
+ * tag's XML namespace.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins
+ * @since      1.8
+ */
+class ElggPluginManifest {
+
+	/**
+	 * The parser object
+	 */
+	protected $parser;
+
+	/**
+	 * The root for plugin manifest namespaces.
+	 * This is in the format http://www.elgg.org/plugin_manifest/<version>
+	 */
+	protected $namespace_root = 'http://www.elgg.org/plugin_manifest/';
+
+	/**
+	 * The expected structure of a plugins requires element
+	 */
+	private $depsStructPlugin = array(
+		'type' => '',
+		'name' => '',
+		'version' => '',
+		'comparison' => 'ge'
+	);
+
+	/**
+	 * The expected structure of a priority element
+	 */
+	private $depsStructPriority = array(
+		'type' => '',
+		'priority' => '',
+		'plugin' => ''
+	);
+
+	/*
+	 * The expected structure of elgg_version and elgg_release requires element
+	 */
+	private $depsStructElgg = array(
+		'type' => '',
+		'version' => '',
+		'comparison' => 'ge'
+	);
+
+	/**
+	 * The expected structure of a requires php_ini dependency element
+	 */
+	private $depsStructPhpIni = array(
+		'type' => '',
+		'name' => '',
+		'value' => '',
+		'comparison' => '='
+	);
+
+	/**
+	 * The expected structure of a requires php_extension dependency element
+	 */
+	private $depsStructPhpExtension = array(
+		'type' => '',
+		'name' => '',
+		'version' => '',
+		'comparison' => '='
+	);
+
+	/**
+	 * The expected structure of a conflicts depedency element
+	 */
+	private $depsConflictsStruct = array(
+		'type' => '',
+		'name' => '',
+		'version' => '',
+		'comparison' => '='
+	);
+
+	/**
+	 * The expected structure of a provides dependency element.
+	 */
+	private $depsProvidesStruct = array(
+		'type' => '',
+		'name' => '',
+		'version' => ''
+	);
+
+	/**
+	 * The expected structure of a screenshot element
+	 */
+	private $screenshotStruct = array(
+		'description' => '',
+		'path' => ''
+	);
+
+	/**
+	 * The API version of the manifest.
+	 *
+	 * @var int
+	 */
+	protected $apiVersion;
+
+	/**
+	 * The optional plugin id this manifest belongs to.
+	 *
+	 * @var string
+	 */
+	protected $pluginID;
+
+	/**
+	 * Load a manifest file, XmlElement or path to manifest.xml file
+	 *
+	 * @param mixed  $manifest  A string, XmlElement, or path of a manifest file.
+	 * @param string $plugin_id Optional ID of the owning plugin. Used to
+	 *                          fill in some values automatically.
+	 */
+	public function __construct($manifest, $plugin_id = null) {
+		if ($plugin_id) {
+			$this->pluginID = $plugin_id;
+		}
+
+		// see if we need to construct the xml object.
+		if ($manifest instanceof ElggXMLElement) {
+			$manifest_obj = $manifest;
+		} else {
+			if (substr(trim($manifest), 0, 1) == '<') {
+				// this is a string
+				$raw_xml = $manifest;
+			} elseif (is_file($manifest)) {
+				// this is a file
+				$raw_xml = file_get_contents($manifest);
+			}
+
+			$manifest_obj = xml_to_object($raw_xml);
+		}
+
+		if (!$manifest_obj) {
+			throw new PluginException(elgg_echo('PluginException:InvalidManifest',
+						array($this->getPluginID())));
+		}
+
+		// set manifest api version
+		if (isset($manifest_obj->attributes['xmlns'])) {
+			$namespace = $manifest_obj->attributes['xmlns'];
+			$version = str_replace($this->namespace_root, '', $namespace);
+		} else {
+			$version = 1.7;
+		}
+
+		$this->apiVersion = $version;
+
+		$parser_class_name = 'ElggPluginManifestParser' . str_replace('.', '', $this->apiVersion);
+
+		// @todo currently the autoloader freaks out if a class doesn't exist.
+		try {
+			$class_exists = class_exists($parser_class_name);
+		} catch (Exception $e) {
+			$class_exists = false;
+		}
+
+		if ($class_exists) {
+			$this->parser = new $parser_class_name($manifest_obj, $this);
+		} else {
+			throw new PluginException(elgg_echo('PluginException:NoAvailableParser',
+							array($this->apiVersion, $this->getPluginID())));
+		}
+
+		if (!$this->parser->parse()) {
+			throw new PluginException(elgg_echo('PluginException:ParserError',
+						array($this->apiVersion, $this->getPluginID())));
+		}
+
+		return true;
+	}
+
+	/**
+	 * Returns the API version in use.
+	 *
+	 * @return int
+	 */
+	public function getApiVersion() {
+		return $this->apiVersion;
+	}
+
+	/**
+	 * Returns the plugin ID.
+	 *
+	 * @return string
+	 */
+	public function getPluginID() {
+		if ($this->pluginID) {
+			return $this->pluginID;
+		} else {
+			return elgg_echo('unknown');
+		}
+	}
+
+	/**
+	 * Returns the manifest array.
+	 *
+	 * Used for backward compatibility.  Specific
+	 * methods should be called instead.
+	 *
+	 * @return array
+	 */
+	public function getManifest() {
+		return $this->parser->getManifest();
+	}
+
+	/***************************************
+	 * Parsed and Normalized Manifest Data *
+	 ***************************************/
+
+	/**
+	 * Returns the plugin name
+	 *
+	 * @return string
+	 */
+	public function getName() {
+		$name = $this->parser->getAttribute('name');
+
+		if (!$name && $this->pluginID) {
+			$name = ucwords(str_replace('_', ' ', $this->pluginID));
+		}
+
+		return $name;
+	}
+
+
+	/**
+	 * Return the description
+	 *
+	 * @return string
+	 */
+	public function getDescription() {
+		return $this->parser->getAttribute('description');
+	}
+
+	/**
+	 * Return the short description
+	 *
+	 * @return string
+	 */
+	public function getBlurb() {
+		$blurb = $this->parser->getAttribute('blurb');
+
+		if (!$blurb) {
+			$blurb = elgg_get_excerpt($this->getDescription());
+		}
+
+		return $blurb;
+	}
+
+	/**
+	 * Returns the license
+	 *
+	 * @return string
+	 */
+	public function getLicense() {
+		// license vs licence.  Use license.
+		$en_us = $this->parser->getAttribute('license');
+		if ($en_us) {
+			return $en_us;
+		} else {
+			return $this->parser->getAttribute('licence');
+		}
+	}
+
+	/**
+	 * Returns the repository url
+	 *
+	 * @return string
+	 */
+	public function getRepositoryURL() {
+		return $this->parser->getAttribute('repository');
+	}
+
+	/**
+	 * Returns the bug tracker page
+	 *
+	 * @return string
+	 */
+	public function getBugTrackerURL() {
+		return $this->parser->getAttribute('bugtracker');
+	}
+
+	/**
+	 * Returns the donations page
+	 *
+	 * @return string
+	 */
+	public function getDonationsPageURL() {
+		return $this->parser->getAttribute('donations');
+	}
+
+	/**
+	 * Returns the version of the plugin.
+	 *
+	 * @return float
+	 */
+	public function getVersion() {
+		return $this->parser->getAttribute('version');
+	}
+
+	/**
+	 * Returns the plugin author.
+	 *
+	 * @return string
+	 */
+	public function getAuthor() {
+		return $this->parser->getAttribute('author');
+	}
+
+	/**
+	 * Return the copyright
+	 *
+	 * @return string
+	 */
+	public function getCopyright() {
+		return $this->parser->getAttribute('copyright');
+	}
+
+	/**
+	 * Return the website
+	 *
+	 * @return string
+	 */
+	public function getWebsite() {
+		return $this->parser->getAttribute('website');
+	}
+
+	/**
+	 * Return the categories listed for this plugin
+	 *
+	 * @return array
+	 */
+	public function getCategories() {
+		$bundled_plugins = array('blog', 'bookmarks', 'categories',
+			'custom_index', 'dashboard', 'developers', 'diagnostics',
+			'embed', 'externalpages', 'file', 'garbagecollector',
+			'groups', 'htmlawed', 'invitefriends', 'likes',
+			'logbrowser', 'logrotate', 'members', 'messageboard',
+			'messages', 'notifications', 'oauth_api', 'pages', 'profile',
+			'reportedcontent', 'search', 'tagcloud', 'thewire', 'tinymce',
+			'twitter', 'twitter_api', 'uservalidationbyemail', 'zaudio',
+		);
+
+		$cats = $this->parser->getAttribute('category');
+
+		if (!$cats) {
+			$cats = array();
+		}
+
+		if (in_array('bundled', $cats) && !in_array($this->getPluginID(), $bundled_plugins)) {
+			unset($cats[array_search('bundled', $cats)]);
+		}
+
+		return $cats;
+	}
+
+	/**
+	 * Return the screenshots listed.
+	 *
+	 * @return array
+	 */
+	public function getScreenshots() {
+		$ss = $this->parser->getAttribute('screenshot');
+
+		if (!$ss) {
+			$ss = array();
+		}
+
+		$normalized = array();
+		foreach ($ss as $s) {
+			$normalized[] = $this->buildStruct($this->screenshotStruct, $s);
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Return the list of provides by this plugin.
+	 *
+	 * @return array
+	 */
+	public function getProvides() {
+		// normalize for 1.7
+		if ($this->getApiVersion() < 1.8) {
+			$provides = array();
+		} else {
+			$provides = $this->parser->getAttribute('provides');
+		}
+
+		if (!$provides) {
+			$provides = array();
+		}
+
+		// always provide ourself if we can
+		if ($this->pluginID) {
+			$provides[] = array(
+				'type' => 'plugin',
+				'name' => $this->getPluginID(),
+				'version' => $this->getVersion()
+			);
+		}
+
+		$normalized = array();
+		foreach ($provides as $provide) {
+			$normalized[] = $this->buildStruct($this->depsProvidesStruct, $provide);
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Returns the dependencies listed.
+	 *
+	 * @return array
+	 */
+	public function getRequires() {
+		// rewrite the 1.7 style elgg_version as a real requires.
+		if ($this->apiVersion < 1.8) {
+			$elgg_version = $this->parser->getAttribute('elgg_version');
+			if ($elgg_version) {
+				$reqs = array(
+					array(
+						'type' => 'elgg_version',
+						'version' => $elgg_version,
+						'comparison' => 'ge'
+					)
+				);
+			} else {
+				$reqs = array();
+			}
+		} else {
+			$reqs = $this->parser->getAttribute('requires');
+		}
+
+		if (!$reqs) {
+			$reqs = array();
+		}
+
+		$normalized = array();
+		foreach ($reqs as $req) {
+			$normalized[] = $this->normalizeDep($req);
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Returns the suggests elements.
+	 *
+	 * @return array
+	 */
+	public function getSuggests() {
+		$suggests = $this->parser->getAttribute('suggests');
+
+		if (!$suggests) {
+			$suggests = array();
+		}
+
+		$normalized = array();
+		foreach ($suggests as $suggest) {
+			$normalized[] = $this->normalizeDep($suggest);
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Normalizes a dependency array using the defined structs.
+	 * Can be used with either requires or suggests.
+	 *
+	 * @param array $dep A dependency array.
+	 * @return array The normalized deps array.
+	 */
+	private function normalizeDep($dep) {
+		switch ($dep['type']) {
+			case 'elgg_version':
+			case 'elgg_release':
+				$struct = $this->depsStructElgg;
+				break;
+
+			case 'plugin':
+				$struct = $this->depsStructPlugin;
+				break;
+
+			case 'priority':
+				$struct = $this->depsStructPriority;
+				break;
+
+			case 'php_extension':
+				$struct = $this->depsStructPhpExtension;
+				break;
+
+			case 'php_ini':
+				$struct = $this->depsStructPhpIni;
+
+				// also normalize boolean values
+				if (isset($dep['value'])) {
+					switch (strtolower($dep['value'])) {
+						case 'yes':
+						case 'true':
+						case 'on':
+						case 1:
+							$dep['value'] = 1;
+							break;
+
+						case 'no':
+						case 'false':
+						case 'off':
+						case 0:
+						case '':
+							$dep['value'] = 0;
+							break;
+					}
+				}
+				break;
+			default:
+				// unrecognized so we just return the raw dependency
+				return $dep;
+		}
+
+		$normalized_dep = $this->buildStruct($struct, $dep);
+
+		// normalize comparison operators
+		if (isset($normalized_dep['comparison'])) {
+			switch ($normalized_dep['comparison']) {
+				case '<':
+					$normalized_dep['comparison'] = 'lt';
+					break;
+
+				case '<=':
+					$normalized_dep['comparison'] = 'le';
+					break;
+
+				case '>':
+					$normalized_dep['comparison'] = 'gt';
+					break;
+
+				case '>=':
+					$normalized_dep['comparison'] = 'ge';
+					break;
+
+				case '==':
+				case 'eq':
+					$normalized_dep['comparison'] = '=';
+					break;
+
+				case '<>':
+				case 'ne':
+					$normalized_dep['comparison'] = '!=';
+					break;
+			}
+		}
+
+		return $normalized_dep;
+	}
+
+	/**
+	 * Returns the conflicts listed
+	 *
+	 * @return array
+	 */
+	public function getConflicts() {
+		// normalize for 1.7
+		if ($this->getApiVersion() < 1.8) {
+			$conflicts = array();
+		} else {
+			$conflicts = $this->parser->getAttribute('conflicts');
+		}
+
+		if (!$conflicts) {
+			$conflicts = array();
+		}
+
+		$normalized = array();
+
+		foreach ($conflicts as $conflict) {
+			$normalized[] = $this->buildStruct($this->depsConflictsStruct, $conflict);
+		}
+
+		return $normalized;
+	}
+
+	/**
+	 * Should this plugin be activated when Elgg is installed
+	 *
+	 *  @return bool
+	 */
+	public function getActivateOnInstall() {
+		$activate = $this->parser->getAttribute('activate_on_install');
+		switch (strtolower($activate)) {
+			case 'yes':
+			case 'true':
+			case 'on':
+			case 1:
+				return true;
+
+			case 'no':
+			case 'false':
+			case 'off':
+			case 0:
+			case '':
+				return false;
+		}
+	}
+
+	/**
+	 * Normalizes an array into the structure specified
+	 *
+	 * @param array $struct The struct to normalize $element to.
+	 * @param array $array  The array
+	 *
+	 * @return array
+	 */
+	protected function buildStruct(array $struct, array $array) {
+		$return = array();
+
+		foreach ($struct as $index => $default) {
+			$return[$index] = elgg_extract($index, $array, $default);
+		}
+
+		return $return;
+	}
+
+	/**
+	 * Returns a category's friendly name. This can be localized by
+	 * defining the string 'admin:plugins:category:<category>'. If no
+	 * localization is found, returns the category with _ and - converted to ' '
+	 * and then ucwords()'d.
+	 *
+	 * @param str $category The category as defined in the manifest.
+	 * @return str A human-readable category
+	 */
+	static public function getFriendlyCategory($category) {
+		$cat_raw_string = "admin:plugins:category:$category";
+		$cat_display_string = elgg_echo($cat_raw_string);
+		if ($cat_display_string == $cat_raw_string) {
+			$category = str_replace(array('-', '_'), ' ', $category);
+			$cat_display_string = ucwords($category);
+		}
+		return $cat_display_string;
+	}
+}
diff --git a/engine/classes/ElggPluginManifestParser.php b/engine/classes/ElggPluginManifestParser.php
new file mode 100644
index 000000000..af152b561
--- /dev/null
+++ b/engine/classes/ElggPluginManifestParser.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Parent class for manifest parsers.
+ *
+ * Converts manifest.xml files or strings to an array.
+ *
+ * This should be extended by a class that does the actual work
+ * to convert based on the manifest.xml version.
+ *
+ * This class only parses XML to an XmlEntity object and
+ * an array.  The array should be used primarily to extract
+ * information since it is quicker to parse once and store
+ * values from the XmlElement object than to parse the object
+ * each time.
+ *
+ * The array should be an exact representation of the manifest.xml
+ * file or string.  Any normalization needs to be done in the
+ * calling class / function.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins
+ * @since      1.8
+ */
+abstract class ElggPluginManifestParser {
+	/**
+	 * The XmlElement object
+	 *
+	 * @var XmlElement
+	 */
+	protected $manifestObject;
+
+	/**
+	 * The manifest array
+	 *
+	 * @var array
+	 */
+	protected $manifest;
+
+	/**
+	 * All valid manifest attributes with default values.
+	 *
+	 * @var array
+	 */
+	protected $validAttributes;
+
+	/**
+	 * The object we're doing parsing for.
+	 *
+	 * @var object
+	 */
+	protected $caller;
+
+	/**
+	 * Loads the manifest XML to be parsed.
+	 *
+	 * @param ElggXmlElement $xml    The Manifest XML object to be parsed
+	 * @param object         $caller The object calling this parser.
+	 */
+	public function __construct(ElggXMLElement $xml, $caller) {
+		$this->manifestObject = $xml;
+		$this->caller = $caller;
+	}
+
+	/**
+	 * Returns the manifest XML object
+	 *
+	 * @return XmlElement
+	 */
+	public function getManifestObject() {
+		return $this->manifestObject;
+	}
+
+	/**
+	 * Return the parsed manifest array
+	 *
+	 * @return array
+	 */
+	public function getManifest() {
+		return $this->manifest;
+	}
+
+	/**
+	 * Return an attribute in the manifest.
+	 *
+	 * @param string $name Attribute name
+	 * @return mixed
+	 */
+	public function getAttribute($name) {
+		if (in_array($name, $this->validAttributes) && isset($this->manifest[$name])) {
+			return $this->manifest[$name];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Parse the XML object into an array
+	 *
+	 * @return bool
+	 */
+	abstract public function parse();
+}
diff --git a/engine/classes/ElggPluginManifestParser17.php b/engine/classes/ElggPluginManifestParser17.php
new file mode 100644
index 000000000..5658ee804
--- /dev/null
+++ b/engine/classes/ElggPluginManifestParser17.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Plugin manifest.xml parser for Elgg 1.7 and lower.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins
+ * @since      1.8
+ */
+class ElggPluginManifestParser17 extends ElggPluginManifestParser {
+	/**
+	 * The valid top level attributes and defaults for a 1.7 manifest
+	 */
+	protected $validAttributes = array(
+		'author', 'version', 'description', 'website',
+		'copyright', 'license', 'licence', 'elgg_version',
+
+		// were never really used and not enforced in code.
+		'requires', 'recommends', 'conflicts',
+
+		// not a 1.7 field, but we need it
+		'name',
+	);
+
+	/**
+	 * Parse a manifest object from 1.7 or earlier.
+	 *
+	 * @return void
+	 */
+	public function parse() {
+		if (!isset($this->manifestObject->children)) {
+			return false;
+		}
+
+		$elements = array();
+
+		foreach ($this->manifestObject->children as $element) {
+			$key = $element->attributes['key'];
+			$value = $element->attributes['value'];
+
+			// create arrays if multiple fields are set
+			if (array_key_exists($key, $elements)) {
+				if (!is_array($elements[$key])) {
+					$orig = $elements[$key];
+					$elements[$key] = array($orig);
+				}
+
+				$elements[$key][] = $value;
+			} else {
+				$elements[$key] = $value;
+			}
+		}
+
+		if ($elements && !array_key_exists('name', $elements)) {
+			$elements['name'] = $this->caller->getName();
+		}
+
+		$this->manifest = $elements;
+
+		if (!$this->manifest) {
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return an attribute in the manifest.
+	 *
+	 * Overrides ElggPluginManifestParser::getAttribute() because before 1.8
+	 * there were no rules...weeeeeeeee!
+	 *
+	 * @param string $name Attribute name
+	 * @return mixed
+	 */
+	public function getAttribute($name) {
+		if (isset($this->manifest[$name])) {
+			return $this->manifest[$name];
+		}
+
+		return false;
+	}
+}
diff --git a/engine/classes/ElggPluginManifestParser18.php b/engine/classes/ElggPluginManifestParser18.php
new file mode 100644
index 000000000..3b753f17b
--- /dev/null
+++ b/engine/classes/ElggPluginManifestParser18.php
@@ -0,0 +1,97 @@
+<?php
+/**
+ * Plugin manifest.xml parser for Elgg 1.8 and above.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins
+ * @since      1.8
+ */
+class ElggPluginManifestParser18 extends ElggPluginManifestParser {
+	/**
+	 * The valid top level attributes and defaults for a 1.8 manifest array.
+	 *
+	 * @var array
+	 */
+	protected $validAttributes = array(
+		'name', 'author', 'version', 'blurb', 'description','website',
+		'repository', 'bugtracker', 'donations', 'copyright', 'license',
+		'requires', 'suggests', 'conflicts', 'provides',
+		'screenshot', 'category', 'activate_on_install'
+	);
+
+	/**
+	 * Required attributes for a valid 1.8 manifest
+	 *
+	 * @var array
+	 */
+	protected $requiredAttributes = array(
+		'name', 'author', 'version', 'description', 'requires'
+	);
+
+	/**
+	 * Parse a manifest object from 1.8 and later
+	 *
+	 * @return void
+	 */
+	public function parse() {
+		$parsed = array();
+		foreach ($this->manifestObject->children as $element) {
+			switch ($element->name) {
+				// single elements
+				case 'blurb':
+				case 'description':
+				case 'name':
+				case 'author':
+				case 'version':
+				case 'website':
+				case 'copyright':
+				case 'license':
+				case 'repository':
+				case 'bugtracker':
+				case 'donations':
+				case 'activate_on_install':
+					$parsed[$element->name] = $element->content;
+					break;
+
+				// arrays
+				case 'category':
+					$parsed[$element->name][] = $element->content;
+					break;
+
+				// 3d arrays
+				case 'screenshot':
+				case 'provides':
+				case 'conflicts':
+				case 'requires':
+				case 'suggests':
+					if (!isset($element->children)) {
+						return false;
+					}
+
+					$info = array();
+					foreach ($element->children as $child_element) {
+						$info[$child_element->name] = $child_element->content;
+					}
+
+					$parsed[$element->name][] = $info;
+					break;
+			}
+		}
+
+		// check we have all the required fields
+		foreach ($this->requiredAttributes as $attr) {
+			if (!array_key_exists($attr, $parsed)) {
+				throw new PluginException(elgg_echo('PluginException:ParserErrorMissingRequiredAttribute',
+							array($attr, $this->caller->getPluginID())));
+			}
+		}
+
+		$this->manifest = $parsed;
+
+		if (!$this->manifest) {
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/engine/classes/ElggPluginPackage.php b/engine/classes/ElggPluginPackage.php
new file mode 100644
index 000000000..37eb4bf4d
--- /dev/null
+++ b/engine/classes/ElggPluginPackage.php
@@ -0,0 +1,640 @@
+<?php
+/**
+ * Manages plugin packages under mod.
+ *
+ * @todo This should eventually be merged into ElggPlugin.
+ * Currently ElggPlugin objects are only used to get and save
+ * plugin settings and user settings, so not every plugin
+ * has an ElggPlugin object.  It's not implemented in ElggPlugin
+ * right now because of conflicts with at least the constructor,
+ * enable(), disable(), and private settings.
+ *
+ * Around 1.9 or so we should each plugin over to using
+ * ElggPlugin and merge ElggPluginPackage and ElggPlugin.
+ *
+ * @package    Elgg.Core
+ * @subpackage Plugins
+ * @since      1.8
+ */
+class ElggPluginPackage {
+
+	/**
+	 * The required files in the package
+	 *
+	 * @var array
+	 */
+	private $requiredFiles = array(
+		'start.php', 'manifest.xml'
+	);
+
+	/**
+	 * The optional files that can be read and served through the markdown page handler
+	 * @var array
+	 */
+	private $textFiles = array(
+		'README.txt', 'CHANGES.txt', 
+		'INSTALL.txt', 'COPYRIGHT.txt', 'LICENSE.txt',
+
+		'README', 'README.md', 'README.markdown'
+	);
+
+	/**
+	 * Valid types for provides.
+	 *
+	 * @var array
+	 */
+	private $providesSupportedTypes = array(
+		'plugin', 'php_extension'
+	);
+
+	/**
+	 * The type of requires/conflicts supported
+	 *
+	 * @var array
+	 */
+	private $depsSupportedTypes = array(
+		'elgg_version', 'elgg_release', 'php_extension', 'php_ini', 'plugin', 'priority',
+	);
+
+	/**
+	 * An invalid plugin error.
+	 */
+	private $errorMsg = '';
+
+	/**
+	 * Any dependencies messages
+	 */
+	private $depsMsgs = array();
+
+	/**
+	 * The plugin's manifest object
+	 *
+	 * @var ElggPluginManifest
+	 */
+	protected $manifest;
+
+	/**
+	 * The plugin's full path
+	 *
+	 * @var string
+	 */
+	protected $path;
+
+	/**
+	 * Is the plugin valid?
+	 *
+	 * @var mixed Bool after validation check, null before.
+	 */
+	protected $valid = null;
+
+	/**
+	 * The plugin ID (dir name)
+	 *
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * Load a plugin package from mod/$id or by full path.
+	 *
+	 * @param string $plugin   The ID (directory name) or full path of the plugin.
+	 * @param bool   $validate Automatically run isValid()?
+	 *
+	 * @throws PluginException
+	 */
+	public function __construct($plugin, $validate = true) {
+		$plugin_path = elgg_get_plugins_path();
+		// @todo wanted to avoid another is_dir() call here.
+		// should do some profiling to see how much it affects
+		if (strpos($plugin, $plugin_path) === 0 || is_dir($plugin)) {
+			// this is a path
+			$path = sanitise_filepath($plugin);
+
+			// the id is the last element of the array
+			$path_array = explode('/', trim($path, '/'));
+			$id = array_pop($path_array);
+		} else {
+			// this is a plugin id
+			// strict plugin names
+			if (preg_match('/[^a-z0-9\.\-_]/i', $plugin)) {
+				throw new PluginException(elgg_echo('PluginException:InvalidID', array($plugin)));
+			}
+
+			$path = "{$plugin_path}$plugin/";
+			$id = $plugin;
+		}
+
+		if (!is_dir($path)) {
+			throw new PluginException(elgg_echo('PluginException:InvalidPath', array($path)));
+		}
+
+		$this->path = $path;
+		$this->id = $id;
+
+		if ($validate && !$this->isValid()) {
+			if ($this->errorMsg) {
+				throw new PluginException(elgg_echo('PluginException:InvalidPlugin:Details',
+							array($plugin, $this->errorMsg)));
+			} else {
+				throw new PluginException(elgg_echo('PluginException:InvalidPlugin', array($plugin)));
+			}
+		}
+
+		return true;
+	}
+
+	/********************************
+	 * Validation and sanity checks *
+	 ********************************/
+
+	/**
+	 * Checks if this is a valid Elgg plugin.
+	 *
+	 * Checks for requires files as defined at the start of this
+	 * class.  Will check require manifest fields via ElggPluginManifest
+	 * for Elgg 1.8 plugins.
+	 *
+	 * @note This doesn't check dependencies or conflicts.
+	 * Use {@link ElggPluginPackage::canActivate()} or
+	 * {@link ElggPluginPackage::checkDependencies()} for that.
+	 *
+	 * @return bool
+	 */
+	public function isValid() {
+		if (isset($this->valid)) {
+			return $this->valid;
+		}
+
+		// check required files.
+		$have_req_files = true;
+		foreach ($this->requiredFiles as $file) {
+			if (!is_readable($this->path . $file)) {
+				$have_req_files = false;
+				$this->errorMsg =
+					elgg_echo('ElggPluginPackage:InvalidPlugin:MissingFile', array($file));
+				break;
+			}
+		}
+
+		// check required files
+		if (!$have_req_files) {
+			return $this->valid = false;
+		}
+
+		// check for valid manifest.
+		if (!$this->loadManifest()) {
+			return $this->valid = false;
+		}
+
+		// can't require or conflict with yourself or something you provide.
+		// make sure provides are all valid.
+		if (!$this->isSaneDeps()) {
+			return $this->valid = false;
+		}
+
+		return $this->valid = true;
+	}
+
+	/**
+	 * Check the plugin doesn't require or conflict with itself
+	 * or something provides.  Also check that it only list
+	 * valid provides.  Deps are checked in checkDependencies()
+	 *
+	 * @note Plugins always provide themselves.
+	 *
+	 * @todo Don't let them require and conflict the same thing
+	 *
+	 * @return bool
+	 */
+	private function isSaneDeps() {
+		// protection against plugins with no manifest file
+		if (!$this->getManifest()) {
+			return false;
+		}
+
+		// Note: $conflicts and $requires are not unused. They're called dynamically
+		$conflicts = $this->getManifest()->getConflicts();
+		$requires = $this->getManifest()->getRequires();
+		$provides = $this->getManifest()->getProvides();
+
+		foreach ($provides as $provide) {
+			// only valid provide types
+			if (!in_array($provide['type'], $this->providesSupportedTypes)) {
+				$this->errorMsg =
+					elgg_echo('ElggPluginPackage:InvalidPlugin:InvalidProvides', array($provide['type']));
+				return false;
+			}
+
+			// doesn't conflict or require any of its provides
+			$name = $provide['name'];
+			foreach (array('conflicts', 'requires') as $dep_type) {
+				foreach (${$dep_type} as $dep) {
+					if (!in_array($dep['type'], $this->depsSupportedTypes)) {
+						$this->errorMsg =
+							elgg_echo('ElggPluginPackage:InvalidPlugin:InvalidDependency', array($dep['type']));
+						return false;
+					}
+
+					// make sure nothing is providing something it conflicts or requires.
+					if (isset($dep['name']) && $dep['name'] == $name) {
+						$version_compare = version_compare($provide['version'], $dep['version'], $dep['comparison']);
+
+						if ($version_compare) {
+							$this->errorMsg =
+								elgg_echo('ElggPluginPackage:InvalidPlugin:CircularDep',
+									array($dep['type'], $dep['name'], $this->id));
+
+							return false;
+						}
+					}
+				}
+			}
+		}
+
+		return true;
+	}
+
+
+	/************
+	 * Manifest *
+	 ************/
+
+	/**
+	 * Returns a parsed manifest file.
+	 *
+	 * @return ElggPluginManifest
+	 */
+	public function getManifest() {
+		if (!$this->manifest) {
+			if (!$this->loadManifest()) {
+				return false;
+			}
+		}
+
+		return $this->manifest;
+	}
+
+	/**
+	 * Loads the manifest into this->manifest as an
+	 * ElggPluginManifest object.
+	 *
+	 * @return bool
+	 */
+	private function loadManifest() {
+		$file = $this->path . 'manifest.xml';
+
+		try {
+			$this->manifest = new ElggPluginManifest($file, $this->id);
+		} catch (Exception $e) {
+			$this->errorMsg = $e->getMessage();
+			return false;
+		}
+
+		if ($this->manifest instanceof ElggPluginManifest) {
+			return true;
+		}
+
+		$this->errorMsg = elgg_echo('unknown_error');
+		return false;
+	}
+
+	/****************
+	 * Readme Files *
+	 ***************/
+
+	/**
+	 * Returns an array of present and readable text files
+	 *
+	 * @return array
+	 */
+	public function getTextFilenames() {
+		return $this->textFiles;
+	}
+
+	/***********************
+	 * Dependencies system *
+	 ***********************/
+
+	/**
+	 * Returns if the Elgg system meets the plugin's dependency
+	 * requirements.  This includes both requires and conflicts.
+	 *
+	 * Full reports can be requested.  The results are returned
+	 * as an array of arrays in the form array(
+	 * 	'type' => requires|conflicts,
+	 * 	'dep' => array( dependency array ),
+	 * 	'status' => bool if depedency is met,
+	 * 	'comment' => optional comment to display to the user.
+	 * )
+	 *
+	 * @param bool $full_report Return a full report.
+	 * @return bool|array
+	 */
+	public function checkDependencies($full_report = false) {
+		// Note: $conflicts and $requires are not unused. They're called dynamically
+		$requires = $this->getManifest()->getRequires();
+		$conflicts = $this->getManifest()->getConflicts();
+
+		$enabled_plugins = elgg_get_plugins('active');
+		$this_id = $this->getID();
+		$report = array();
+
+		// first, check if any active plugin conflicts with us.
+		foreach ($enabled_plugins as $plugin) {
+			$temp_conflicts = array();
+			$temp_manifest = $plugin->getManifest();
+			if ($temp_manifest instanceof ElggPluginManifest) {
+				$temp_conflicts = $plugin->getManifest()->getConflicts();
+			}
+			foreach ($temp_conflicts as $conflict) {
+				if ($conflict['type'] == 'plugin' && $conflict['name'] == $this_id) {
+					$result = $this->checkDepPlugin($conflict, $enabled_plugins, false);
+
+					// rewrite the conflict to show the originating plugin
+					$conflict['name'] = $plugin->getManifest()->getName();
+
+					if (!$full_report && !$result['status']) {
+						$this->errorMsg = "Conflicts with plugin \"{$plugin->getManifest()->getName()}\".";
+						return $result['status'];
+					} else {
+						$report[] = array(
+							'type' => 'conflicted',
+							'dep' => $conflict,
+							'status' => $result['status'],
+							'value' => $this->getManifest()->getVersion()
+						);
+					}
+				}
+			}
+		}
+
+		$check_types = array('requires', 'conflicts');
+
+		if ($full_report) {
+			// Note: $suggests is not unused. It's called dynamically
+			$suggests = $this->getManifest()->getSuggests();
+			$check_types[] = 'suggests';
+		}
+
+		foreach ($check_types as $dep_type) {
+			$inverse = ($dep_type == 'conflicts') ? true : false;
+
+			foreach (${$dep_type} as $dep) {
+				switch ($dep['type']) {
+					case 'elgg_version':
+						$result = $this->checkDepElgg($dep, get_version(), $inverse);
+						break;
+
+					case 'elgg_release':
+						$result = $this->checkDepElgg($dep, get_version(true), $inverse);
+						break;
+
+					case 'plugin':
+						$result = $this->checkDepPlugin($dep, $enabled_plugins, $inverse);
+						break;
+
+					case 'priority':
+						$result = $this->checkDepPriority($dep, $enabled_plugins, $inverse);
+						break;
+
+					case 'php_extension':
+						$result = $this->checkDepPhpExtension($dep, $inverse);
+						break;
+
+					case 'php_ini':
+						$result = $this->checkDepPhpIni($dep, $inverse);
+						break;
+				}
+
+				// unless we're doing a full report, break as soon as we fail.
+				if (!$full_report && !$result['status']) {
+					$this->errorMsg = "Missing dependencies.";
+					return $result['status'];
+				} else {
+					// build report element and comment
+					$report[] = array(
+						'type' => $dep_type,
+						'dep' => $dep,
+						'status' => $result['status'],
+						'value' => $result['value']
+					);
+				}
+			}
+		}
+
+		if ($full_report) {
+			// add provides to full report
+			$provides = $this->getManifest()->getProvides();
+
+			foreach ($provides as $provide) {
+				$report[] = array(
+					'type' => 'provides',
+					'dep' => $provide,
+					'status' => true,
+					'value' => ''
+				);
+			}
+
+			return $report;
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks if $plugins meets the requirement by $dep.
+	 *
+	 * @param array $dep     An Elgg manifest.xml deps array
+	 * @param array $plugins A list of plugins as returned by elgg_get_plugins();
+	 * @param bool  $inverse Inverse the results to use as a conflicts.
+	 * @return bool
+	 */
+	private function checkDepPlugin(array $dep, array $plugins, $inverse = false) {
+		$r = elgg_check_plugins_provides('plugin', $dep['name'], $dep['version'], $dep['comparison']);
+
+		if ($inverse) {
+			$r['status'] = !$r['status'];
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Checks if $plugins meets the requirement by $dep.
+	 *
+	 * @param array $dep     An Elgg manifest.xml deps array
+	 * @param array $plugins A list of plugins as returned by elgg_get_plugins();
+	 * @param bool  $inverse Inverse the results to use as a conflicts.
+	 * @return bool
+	 */
+	private function checkDepPriority(array $dep, array $plugins, $inverse = false) {
+		// grab the ElggPlugin using this package.
+		$plugin_package = elgg_get_plugin_from_id($this->getID());
+		$plugin_priority = $plugin_package->getPriority();
+		$test_plugin = elgg_get_plugin_from_id($dep['plugin']);
+
+		// If this isn't a plugin or the plugin isn't installed or active
+		// priority doesn't matter. Use requires to check if a plugin is active.
+		if (!$plugin_package || !$test_plugin || !$test_plugin->isActive()) {
+			return array(
+				'status' => true,
+				'value' => 'uninstalled'
+			);
+		}
+
+		$test_plugin_priority = $test_plugin->getPriority();
+
+		switch ($dep['priority']) {
+			case 'before':
+				$status = $plugin_priority < $test_plugin_priority;
+				break;
+
+			case 'after':
+				$status = $plugin_priority > $test_plugin_priority;
+				break;
+
+			default;
+				$status = false;
+		}
+
+		// get the current value
+		if ($plugin_priority < $test_plugin_priority) {
+			$value = 'before';
+		} else {
+			$value = 'after';
+		}
+
+		if ($inverse) {
+			$status = !$status;
+		}
+
+		return array(
+			'status' => $status,
+			'value' => $value
+		);
+	}
+
+	/**
+	 * Checks if $elgg_version meets the requirement by $dep.
+	 *
+	 * @param array $dep          An Elgg manifest.xml deps array
+	 * @param array $elgg_version An Elgg version (either YYYYMMDDXX or X.Y.Z)
+	 * @param bool  $inverse      Inverse the result to use as a conflicts.
+	 * @return bool
+	 */
+	private function checkDepElgg(array $dep, $elgg_version, $inverse = false) {
+		$status = version_compare($elgg_version, $dep['version'], $dep['comparison']);
+
+		if ($inverse) {
+			$status = !$status;
+		}
+
+		return array(
+			'status' => $status,
+			'value' => $elgg_version
+		);
+	}
+
+	/**
+	 * Checks if the PHP extension in $dep is loaded.
+	 *
+	 * @todo Can this be merged with the plugin checker?
+	 *
+	 * @param array $dep     An Elgg manifest.xml deps array
+	 * @param bool  $inverse Inverse the result to use as a conflicts.
+	 * @return array An array in the form array(
+	 * 	'status' => bool
+	 * 	'value' => string The version provided
+	 * )
+	 */
+	private function checkDepPhpExtension(array $dep, $inverse = false) {
+		$name = $dep['name'];
+		$version = $dep['version'];
+		$comparison = $dep['comparison'];
+
+		// not enabled.
+		$status = extension_loaded($name);
+
+		// enabled. check version.
+		$ext_version = phpversion($name);
+
+		if ($status) {
+			// some extensions (like gd) don't provide versions. neat.
+			// don't check version info and return a lie.
+			if ($ext_version && $version) {
+				$status = version_compare($ext_version, $version, $comparison);
+			}
+
+			if (!$ext_version) {
+				$ext_version = '???';
+			}
+		}
+
+		// some php extensions can be emulated, so check provides.
+		if ($status == false) {
+			$provides = elgg_check_plugins_provides('php_extension', $name, $version, $comparison);
+			$status = $provides['status'];
+			$ext_version = $provides['value'];
+		}
+
+		if ($inverse) {
+			$status = !$status;
+		}
+
+		return array(
+			'status' => $status,
+			'value' => $ext_version
+		);
+	}
+
+	/**
+	 * Check if the PHP ini setting satisfies $dep.
+	 *
+	 * @param array $dep     An Elgg manifest.xml deps array
+	 * @param bool  $inverse Inverse the result to use as a conflicts.
+	 * @return bool
+	 */
+	private function checkDepPhpIni($dep, $inverse = false) {
+		$name = $dep['name'];
+		$value = $dep['value'];
+		$comparison = $dep['comparison'];
+
+		// ini_get() normalizes truthy values to 1 but falsey values to 0 or ''.
+		// version_compare() considers '' < 0, so normalize '' to 0.
+		// ElggPluginManifest normalizes all bool values and '' to 1 or 0.
+		$setting = ini_get($name);
+
+		if ($setting === '') {
+			$setting = 0;
+		}
+
+		$status = version_compare($setting, $value, $comparison);
+
+		if ($inverse) {
+			$status = !$status;
+		}
+
+		return array(
+			'status' => $status,
+			'value' => $setting
+		);
+	}
+
+	/**
+	 * Returns the Plugin ID
+	 *
+	 * @return string
+	 */
+	public function getID() {
+		return $this->id;
+	}
+
+	/**
+	 * Returns the last error message.
+	 * 
+	 * @return string
+	 */
+	public function getError() {
+		return $this->errorMsg;
+	}
+}
diff --git a/engine/classes/ElggPriorityList.php b/engine/classes/ElggPriorityList.php
new file mode 100644
index 000000000..416df885c
--- /dev/null
+++ b/engine/classes/ElggPriorityList.php
@@ -0,0 +1,366 @@
+<?php
+/**
+ * Iterate over elements in a specific priority.
+ *
+ * $pl = new ElggPriorityList();
+ * $pl->add('Element 0');
+ * $pl->add('Element 10', 10);
+ * $pl->add('Element -10', -10);
+ *
+ * foreach ($pl as $priority => $element) {
+ *	var_dump("$priority => $element");
+ * }
+ *
+ * Yields:
+ * -10 => Element -10
+ * 0 => Element 0
+ * 10 => Element 10
+ *
+ * Collisions on priority are handled by inserting the element at or as close to the
+ * requested priority as possible:
+ *
+ * $pl = new ElggPriorityList();
+ * $pl->add('Element 5', 5);
+ * $pl->add('Colliding element 5', 5);
+ * $pl->add('Another colliding element 5', 5);
+ *
+ * foreach ($pl as $priority => $element) {
+ *	var_dump("$priority => $element");
+ * }
+ *
+ * Yields:
+ *	5 => 'Element 5',
+ *	6 => 'Colliding element 5',
+ *	7 => 'Another colliding element 5'
+ *
+ * You can do priority lookups by element:
+ *
+ * $pl = new ElggPriorityList();
+ * $pl->add('Element 0');
+ * $pl->add('Element -5', -5);
+ * $pl->add('Element 10', 10);
+ * $pl->add('Element -10', -10);
+ *
+ * $priority = $pl->getPriority('Element -5');
+ * 
+ * Or element lookups by priority.
+ * $element = $pl->getElement(-5);
+ *
+ * To remove elements, pass the element.
+ * $pl->remove('Element -10');
+ *
+ * To check if an element exists:
+ * $pl->contains('Element -5');
+ *
+ * To move an element:
+ * $pl->move('Element -5', -3);
+ *
+ * ElggPriorityList only tracks priority. No checking is done in ElggPriorityList for duplicates or
+ * updating. If you need to track this use objects and an external map:
+ *
+ * function elgg_register_something($id, $display_name, $location, $priority = 500) {
+ *	// $id => $element.
+ *	static $map = array();
+ *	static $list;
+ *
+ *	if (!$list) {
+ *		$list = new ElggPriorityList();
+ *	}
+ *
+ *	// update if already registered.
+ *	if (isset($map[$id])) {
+ *		$element = $map[$id];
+ *		// move it first because we have to pass the original element.
+ *		if (!$list->move($element, $priority)) {
+ *			return false;
+ *		}
+ *		$element->display_name = $display_name;
+ *		$element->location = $location;
+ *	} else {
+ *		$element = new stdClass();
+ *		$element->display_name = $display_name;
+ *		$element->location = $location;
+ *		if (!$list->add($element, $priority)) {
+ *			return false;
+ *		}
+ *		$map[$id] = $element;
+ *	}
+ *
+ *	return true;
+ * }
+ *
+ * @package    Elgg.Core
+ * @subpackage Helpers
+ */
+class ElggPriorityList
+	implements Iterator, Countable {
+
+	/**
+	 * The list of elements
+	 *
+	 * @var array
+	 */
+	private $elements = array();
+
+	/**
+	 * Create a new priority list.
+	 *
+	 * @param array $elements An optional array of priorities => element
+	 */
+	public function __construct(array $elements = array()) {
+		if ($elements) {
+			foreach ($elements as $priority => $element) {
+				$this->add($element, $priority);
+			}
+		}
+	}
+
+	/**
+	 * Adds an element to the list.
+	 *
+	 * @warning This returns the priority at which the element was added, which can be 0. Use
+	 *          !== false to check for success.
+	 *
+	 * @param mixed $element  The element to add to the list.
+	 * @param mixed $priority Priority to add the element. In priority collisions, the original element
+	 *                        maintains its priority and the new element is to the next available
+	 *                        slot, taking into consideration all previously registered elements.
+	 *                        Negative elements are accepted.
+	 * @param bool  $exact    unused
+	 * @return int            The priority of the added element.
+	 * @todo remove $exact or implement it. Note we use variable name strict below.
+	 */
+	public function add($element, $priority = null, $exact = false) {
+		if ($priority !== null && !is_numeric($priority)) {
+			return false;
+		} else {
+			$priority = $this->getNextPriority($priority);
+		}
+
+		$this->elements[$priority] = $element;
+		$this->sorted = false;
+		return $priority;
+	}
+
+	/**
+	 * Removes an element from the list.
+	 *
+	 * @warning The element must have the same attributes / values. If using $strict, it must have
+	 *          the same types. array(10) will fail in strict against array('10') (str vs int).
+	 *
+	 * @param mixed $element The element to remove from the list
+	 * @param bool  $strict  Whether to check the type of the element match
+	 * @return bool
+	 */
+	public function remove($element, $strict = false) {
+		$index = array_search($element, $this->elements, $strict);
+		if ($index !== false) {
+			unset($this->elements[$index]);
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Move an existing element to a new priority.
+	 *
+	 * @param mixed $element      The element to move
+	 * @param int   $new_priority The new priority for the element
+	 * @param bool  $strict       Whether to check the type of the element match
+	 * @return bool
+	 */
+	public function move($element, $new_priority, $strict = false) {
+		$new_priority = (int) $new_priority;
+		
+		$current_priority = $this->getPriority($element, $strict);
+		if ($current_priority === false) {
+			return false;
+		}
+
+		if ($current_priority == $new_priority) {
+			return true;
+		}
+
+		// move the actual element so strict operations still work
+		$element = $this->getElement($current_priority);
+		unset($this->elements[$current_priority]);
+		return $this->add($element, $new_priority);
+	}
+
+	/**
+	 * Returns the elements
+	 *
+	 * @return array
+	 */
+	public function getElements() {
+		$this->sortIfUnsorted();
+		return $this->elements;
+	}
+
+	/**
+	 * Sort the elements optionally by a callback function.
+	 *
+	 * If no user function is provided the elements are sorted by priority registered.
+	 *
+	 * The callback function should accept the array of elements as the first 
+	 * argument and should return a sorted array.
+	 *
+	 * This function can be called multiple times.
+	 *
+	 * @param callback $callback The callback for sorting. Numeric sorting is the default.
+	 * @return bool
+	 */
+	public function sort($callback = null) {
+		if (!$callback) {
+			ksort($this->elements, SORT_NUMERIC);
+		} else {
+			$sorted = call_user_func($callback, $this->elements);
+
+			if (!$sorted) {
+				return false;
+			}
+
+			$this->elements = $sorted;
+		}
+		
+		$this->sorted = true;
+		return true;
+	}
+
+	/**
+	 * Sort the elements if they haven't been sorted yet.
+	 *
+	 * @return bool
+	 */
+	private function sortIfUnsorted() {
+		if (!$this->sorted) {
+			return $this->sort();
+		}
+	}
+
+	/**
+	 * Returns the next priority available.
+	 *
+	 * @param int $near Make the priority as close to $near as possible.
+	 * @return int
+	 */
+	public function getNextPriority($near = 0) {
+		$near = (int) $near;
+		
+		while (array_key_exists($near, $this->elements)) {
+			$near++;
+		}
+
+		return $near;
+	}
+
+	/**
+	 * Returns the priority of an element if it exists in the list.
+	 * 
+	 * @warning This can return 0 if the element's priority is 0.
+	 *
+	 * @param mixed $element The element to check for.
+	 * @param bool  $strict  Use strict checking?
+	 * @return mixed False if the element doesn't exists, the priority if it does.
+	 */
+	public function getPriority($element, $strict = false) {
+		return array_search($element, $this->elements, $strict);
+	}
+
+	/**
+	 * Returns the element at $priority.
+	 *
+	 * @param int $priority The priority
+	 * @return mixed The element or false on fail.
+	 */
+	public function getElement($priority) {
+		return (isset($this->elements[$priority])) ? $this->elements[$priority] : false;
+	}
+
+	/**
+	 * Returns if the list contains $element.
+	 *
+	 * @param mixed $element The element to check.
+	 * @param bool  $strict  Use strict checking?
+	 * @return bool
+	 */
+	public function contains($element, $strict = false) {
+		return $this->getPriority($element, $strict) !== false;
+	}
+
+	
+	/**********************
+	 * Interface methods *
+	 **********************/
+
+	/**
+	 * Iterator
+	 */
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::rewind()
+	 * @return void
+	 */
+	public function rewind() {
+		$this->sortIfUnsorted();
+		return reset($this->elements);
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::current()
+	 * @return mixed
+	 */
+	public function current() {
+		$this->sortIfUnsorted();
+		return current($this->elements);
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::key()
+	 * @return int
+	 */
+	public function key() {
+		$this->sortIfUnsorted();
+		return key($this->elements);
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::next()
+	 * @return mixed
+	 */
+	public function next() {
+		$this->sortIfUnsorted();
+		return next($this->elements);
+	}
+
+	/**
+	 * PHP Iterator Interface
+	 *
+	 * @see Iterator::valid()
+	 * @return bool
+	 */
+	public function valid() {
+		$this->sortIfUnsorted();
+		$key = key($this->elements);
+		return ($key !== NULL && $key !== FALSE);
+	}
+
+	/**
+	 * Countable interface
+	 *
+	 * @see Countable::count()
+	 * @return int
+	 */
+	public function count() {
+		return count($this->elements);
+	}
+}
+\ No newline at end of file
diff --git a/engine/classes/ElggRelationship.php b/engine/classes/ElggRelationship.php
new file mode 100644
index 000000000..d2e88882a
--- /dev/null
+++ b/engine/classes/ElggRelationship.php
@@ -0,0 +1,231 @@
+<?php
+/**
+ * Relationship class.
+ *
+ * @package    Elgg.Core
+ * @subpackage Core
+ * 
+ * @property int    $id           The unique identifier (read-only)
+ * @property int    $guid_one     The GUID of the subject of the relationship
+ * @property string $relationship The name of the relationship
+ * @property int    $guid_two     The GUID of the object of the relationship
+ * @property int    $time_created A UNIX timestamp of when the relationship was created (read-only, set on first save)
+ */
+class ElggRelationship extends ElggData implements
+	Importable
+{
+
+	/**
+	 * Create a relationship object, optionally from a given id value or row.
+	 *
+	 * @param mixed $id ElggRelationship id, database row, or null for new relationship
+	 */
+	function __construct($id = null) {
+		$this->initializeAttributes();
+
+		if (!empty($id)) {
+			if ($id instanceof stdClass) {
+				$relationship = $id; // Create from db row
+			} else {
+				$relationship = get_relationship($id);
+			}
+
+			if ($relationship) {
+				$objarray = (array) $relationship;
+				foreach ($objarray as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Class member get overloading
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	function get($name) {
+		if (array_key_exists($name, $this->attributes)) {
+			return $this->attributes[$name];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Class member set overloading
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return mixed
+	 */
+	function set($name, $value) {
+		$this->attributes[$name] = $value;
+		return true;
+	}
+
+	/**
+	 * Save the relationship
+	 *
+	 * @return int the relationship id
+	 * @throws IOException
+	 */
+	public function save() {
+		if ($this->id > 0) {
+			delete_relationship($this->id);
+		}
+
+		$this->id = add_entity_relationship($this->guid_one, $this->relationship, $this->guid_two);
+		if (!$this->id) {
+			throw new IOException(elgg_echo('IOException:UnableToSaveNew', array(get_class())));
+		}
+
+		return $this->id;
+	}
+
+	/**
+	 * Delete a given relationship.
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		return delete_relationship($this->id);
+	}
+
+	/**
+	 * Get a URL for this relationship.
+	 *
+	 * @return string
+	 */
+	public function getURL() {
+		return get_relationship_url($this->id);
+	}
+
+	// EXPORTABLE INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array(
+			'id',
+			'guid_one',
+			'relationship',
+			'guid_two'
+		);
+	}
+
+	/**
+	 * Export this relationship
+	 *
+	 * @return array
+	 */
+	public function export() {
+		$uuid = get_uuid_from_object($this);
+		$relationship = new ODDRelationship(
+			guid_to_uuid($this->guid_one),
+			$this->relationship,
+			guid_to_uuid($this->guid_two)
+		);
+
+		$relationship->setAttribute('uuid', $uuid);
+
+		return $relationship;
+	}
+
+	// IMPORTABLE INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * Import a relationship
+	 *
+	 * @param ODD $data ODD data
+
+	 * @return bool
+	 * @throws ImportException|InvalidParameterException
+	 */
+	public function import(ODD $data) {
+		if (!($data instanceof ODDRelationship)) {
+			throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnexpectedODDClass'));
+		}
+
+		$uuid_one = $data->getAttribute('uuid1');
+		$uuid_two = $data->getAttribute('uuid2');
+
+		// See if this entity has already been imported, if so then we need to link to it
+		$entity1 = get_entity_from_uuid($uuid_one);
+		$entity2 = get_entity_from_uuid($uuid_two);
+		if (($entity1) && ($entity2)) {
+			// Set the item ID
+			$this->attributes['guid_one'] = $entity1->getGUID();
+			$this->attributes['guid_two'] = $entity2->getGUID();
+
+			// Map verb to relationship
+			//$verb = $data->getAttribute('verb');
+			//$relationship = get_relationship_from_verb($verb);
+			$relationship = $data->getAttribute('type');
+
+			if ($relationship) {
+				$this->attributes['relationship'] = $relationship;
+				// save
+				$result = $this->save();
+				if (!$result) {
+					throw new ImportException(elgg_echo('ImportException:ProblemSaving', array(get_class())));
+				}
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	// SYSTEM LOG INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * Return an identification for the object for storage in the system log.
+	 * This id must be an integer.
+	 *
+	 * @return int
+	 */
+	public function getSystemLogID() {
+		return $this->id;
+	}
+
+	/**
+	 * For a given ID, return the object associated with it.
+	 * This is used by the river functionality primarily.
+	 * This is useful for checking access permissions etc on objects.
+	 *
+	 * @param int $id ID
+	 *
+	 * @return ElggRelationship
+	 */
+	public function getObjectFromID($id) {
+		return get_relationship($id);
+	}
+
+	/**
+	 * Return a type of the object - eg. object, group, user, relationship, metadata, annotation etc
+	 *
+	 * @return string 'relationship'
+	 */
+	public function getType() {
+		return 'relationship';
+	}
+
+	/**
+	 * Return a subtype. For metadata & annotations this is the 'name' and for relationship this
+	 * is the relationship type.
+	 *
+	 * @return string
+	 */
+	public function getSubtype() {
+		return $this->relationship;
+	}
+
+}
diff --git a/engine/classes/ElggRiverItem.php b/engine/classes/ElggRiverItem.php
new file mode 100644
index 000000000..d3d09cd91
--- /dev/null
+++ b/engine/classes/ElggRiverItem.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * River item class.
+ *
+ * @package    Elgg.Core
+ * @subpackage Core
+ * 
+ * @property int    $id            The unique identifier (read-only)
+ * @property int    $subject_guid  The GUID of the actor
+ * @property int    $object_guid   The GUID of the object
+ * @property int    $annotation_id The ID of the annotation involved in the action
+ * @property string $type          The type of one of the entities involved in the action
+ * @property string $subtype       The subtype of one of the entities involved in the action
+ * @property string $action_type   The name of the action
+ * @property string $view          The view for displaying this river item
+ * @property int    $access_id     The visibility of the river item
+ * @property int    $posted        UNIX timestamp when the action occurred
+ */
+class ElggRiverItem {
+	public $id;
+	public $subject_guid;
+	public $object_guid;
+	public $annotation_id;
+	public $type;
+	public $subtype;
+	public $action_type;
+	public $access_id;
+	public $view;
+	public $posted;
+
+	/**
+	 * Construct a river item object given a database row.
+	 *
+	 * @param stdClass $object Object obtained from database
+	 */
+	function __construct($object) {
+		if (!($object instanceof stdClass)) {
+			// throw exception
+		}
+
+		// the casting is to support typed serialization like json
+		$int_types = array('id', 'subject_guid', 'object_guid', 'annotation_id', 'access_id', 'posted');
+		foreach ($object as $key => $value) {
+			if (in_array($key, $int_types)) {
+				$this->$key = (int)$value;
+			} else {
+				$this->$key = $value;
+			}
+		}
+	}
+
+	/**
+	 * Get the subject of this river item
+	 * 
+	 * @return ElggEntity
+	 */
+	public function getSubjectEntity() {
+		return get_entity($this->subject_guid);
+	}
+
+	/**
+	 * Get the object of this river item
+	 *
+	 * @return ElggEntity
+	 */
+	public function getObjectEntity() {
+		return get_entity($this->object_guid);
+	}
+
+	/**
+	 * Get the Annotation for this river item
+	 * 
+	 * @return ElggAnnotation
+	 */
+	public function getAnnotation() {
+		return elgg_get_annotation_from_id($this->annotation_id);
+	}
+
+	/**
+	 * Get the view used to display this river item
+	 *
+	 * @return string
+	 */
+	public function getView() {
+		return $this->view;
+	}
+
+	/**
+	 * Get the time this activity was posted
+	 * 
+	 * @return int
+	 */
+	public function getPostedTime() {
+		return (int)$this->posted;
+	}
+
+	/**
+	 * Get the type of the object
+	 *
+	 * @return string 'river'
+	 */
+	public function getType() {
+		return 'river';
+	}
+
+	/**
+	 * Get the subtype of the object
+	 *
+	 * @return string 'item'
+	 */
+	public function getSubtype() {
+		return 'item';
+	}
+
+}
diff --git a/engine/classes/ElggSession.php b/engine/classes/ElggSession.php
new file mode 100644
index 000000000..9750f063e
--- /dev/null
+++ b/engine/classes/ElggSession.php
@@ -0,0 +1,153 @@
+<?php
+/**
+ * Magic session class.
+ * This class is intended to extend the $_SESSION magic variable by providing an API hook
+ * to plug in other values.
+ *
+ * Primarily this is intended to provide a way of supplying "logged in user"
+ * details without touching the session (which can cause problems when
+ * accessed server side).
+ *
+ * If a value is present in the session then that value is returned, otherwise
+ * a plugin hook 'session:get', '$var' is called, where $var is the variable
+ * being requested.
+ *
+ * Setting values will store variables in the session in the normal way.
+ *
+ * LIMITATIONS: You can not access multidimensional arrays
+ *
+ * @package    Elgg.Core
+ * @subpackage Sessions
+ */
+class ElggSession implements ArrayAccess {
+	/** Local cache of trigger retrieved variables */
+	private static $__localcache;
+
+	/**
+	 * Test if property is set either as an attribute or metadata.
+	 *
+	 * @param string $key The name of the attribute or metadata.
+	 *
+	 * @return bool
+	 */
+	function __isset($key) {
+		return $this->offsetExists($key);
+	}
+
+	/**
+	 * Set a value, go straight to session.
+	 *
+	 * @param string $key   Name
+	 * @param mixed  $value Value
+	 *
+	 * @return void
+	 */
+	function offsetSet($key, $value) {
+		$_SESSION[$key] = $value;
+	}
+
+	/**
+	 * Get a variable from either the session, or if its not in the session
+	 * attempt to get it from an api call.
+	 *
+	 * @see ArrayAccess::offsetGet()
+	 *
+	 * @param mixed $key Name
+	 *
+	 * @return mixed
+	 */
+	function offsetGet($key) {
+		if (!ElggSession::$__localcache) {
+			ElggSession::$__localcache = array();
+		}
+
+		if (isset($_SESSION[$key])) {
+			return $_SESSION[$key];
+		}
+
+		if (isset(ElggSession::$__localcache[$key])) {
+			return ElggSession::$__localcache[$key];
+		}
+
+		$value = NULL;
+		$value = elgg_trigger_plugin_hook('session:get', $key, NULL, $value);
+
+		ElggSession::$__localcache[$key] = $value;
+
+		return ElggSession::$__localcache[$key];
+	}
+
+	/**
+	 * Unset a value from the cache and the session.
+	 *
+	 * @see ArrayAccess::offsetUnset()
+	 *
+	 * @param mixed $key Name
+	 *
+	 * @return void
+	 */
+	function offsetUnset($key) {
+		unset(ElggSession::$__localcache[$key]);
+		unset($_SESSION[$key]);
+	}
+
+	/**
+	 * Return whether the value is set in either the session or the cache.
+	 *
+	 * @see ArrayAccess::offsetExists()
+	 *
+	 * @param int $offset Offset
+	 *
+	 * @return bool
+	 */
+	function offsetExists($offset) {
+		if (isset(ElggSession::$__localcache[$offset])) {
+			return true;
+		}
+
+		if (isset($_SESSION[$offset])) {
+			return true;
+		}
+
+		if ($this->offsetGet($offset)) {
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Alias to ::offsetGet()
+	 *
+	 * @param string $key Name
+	 *
+	 * @return mixed
+	 */
+	function get($key) {
+		return $this->offsetGet($key);
+	}
+
+	/**
+	 * Alias to ::offsetSet()
+	 *
+	 * @param string $key   Name
+	 * @param mixed  $value Value
+	 *
+	 * @return void
+	 */
+	function set($key, $value) {
+		$this->offsetSet($key, $value);
+	}
+
+	/**
+	 * Alias to offsetUnset()
+	 *
+	 * @param string $key Name
+	 *
+	 * @return void
+	 */
+	function del($key) {
+		$this->offsetUnset($key);
+	}
+}
diff --git a/engine/classes/ElggSharedMemoryCache.php b/engine/classes/ElggSharedMemoryCache.php
new file mode 100644
index 000000000..f5f11d2c7
--- /dev/null
+++ b/engine/classes/ElggSharedMemoryCache.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Shared memory cache description.
+ * Extends ElggCache with functions useful to shared memory
+ * style caches (static variables, memcache etc)
+ *
+ * @package    Elgg.Core
+ * @subpackage Cache
+ */
+abstract class ElggSharedMemoryCache extends ElggCache {
+	/**
+	 * Namespace variable used to keep various bits of the cache
+	 * separate.
+	 *
+	 * @var string
+	 */
+	private $namespace;
+
+	/**
+	 * Set the namespace of this cache.
+	 * This is useful for cache types (like memcache or static variables) where there is one large
+	 * flat area of memory shared across all instances of the cache.
+	 *
+	 * @param string $namespace Namespace for cache
+	 *
+	 * @return void
+	 */
+	public function setNamespace($namespace = "default") {
+		$this->namespace = $namespace;
+	}
+
+	/**
+	 * Get the namespace currently defined.
+	 *
+	 * @return string
+	 */
+	public function getNamespace() {
+		return $this->namespace;
+	}
+}
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php
new file mode 100644
index 000000000..dd996fe98
--- /dev/null
+++ b/engine/classes/ElggSite.php
@@ -0,0 +1,455 @@
+<?php
+/**
+ * A Site entity.
+ *
+ * ElggSite represents a single site entity.
+ *
+ * An ElggSite object is an ElggEntity child class with the subtype
+ * of "site."  It is created upon installation and hold all the
+ * information about a site:
+ *  - name
+ *  - description
+ *  - url
+ *
+ * Every ElggEntity (except ElggSite) belongs to a site.
+ *
+ * @internal ElggSite represents a single row from the sites_entity
+ * table, as well as the corresponding ElggEntity row from the entities table.
+ *
+ * @warning Multiple site support isn't fully developed.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataMode.Site
+ * @link       http://docs.elgg.org/DataModel/Sites
+ * 
+ * @property string $name        The name or title of the website
+ * @property string $description A motto, mission statement, or description of the website
+ * @property string $url         The root web address for the site, including trailing slash
+ */
+class ElggSite extends ElggEntity {
+
+	/**
+	 * Initialise the attributes array.
+	 * This is vital to distinguish between metadata and base parameters.
+	 *
+	 * Place your base parameters here.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = "site";
+		$this->attributes['name'] = NULL;
+		$this->attributes['description'] = NULL;
+		$this->attributes['url'] = NULL;
+		$this->attributes['tables_split'] = 2;
+	}
+
+	/**
+	 * Load or create a new ElggSite.
+	 *
+	 * If no arguments are passed, create a new entity.
+	 *
+	 * If an argument is passed attempt to load a full Site entity.  Arguments
+	 * can be:
+	 *  - The GUID of a site entity.
+	 *  - A URL as stored in ElggSite->url
+	 *  - A DB result object with a guid property
+	 *
+	 * @param mixed $guid If an int, load that GUID.  If a db row then will
+	 * load the rest of the data.
+	 *
+	 * @throws IOException If passed an incorrect guid
+	 * @throws InvalidParameterException If passed an Elgg* Entity that isn't an ElggSite
+	 */
+	function __construct($guid = null) {
+		$this->initializeAttributes();
+
+		// compatibility for 1.7 api.
+		$this->initialise_attributes(false);
+
+		if (!empty($guid)) {
+			// Is $guid is a DB entity table row
+			if ($guid instanceof stdClass) {
+				// Load the rest
+				if (!$this->load($guid)) {
+					$msg = elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid->guid));
+					throw new IOException($msg);
+				}
+			} else if ($guid instanceof ElggSite) {
+				// $guid is an ElggSite so this is a copy constructor
+				elgg_deprecated_notice('This type of usage of the ElggSite constructor was deprecated. Please use the clone method.', 1.7);
+
+				foreach ($guid->attributes as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else if ($guid instanceof ElggEntity) {
+				// @todo remove and just use else clause
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonElggSite'));
+			} else if (strpos($guid, "http") !== false) {
+				// url so retrieve by url
+				$guid = get_site_by_url($guid);
+				foreach ($guid->attributes as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else if (is_numeric($guid)) {
+				// $guid is a GUID so load
+				if (!$this->load($guid)) {
+					throw new IOException(elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid)));
+				}
+			} else {
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnrecognisedValue'));
+			}
+		}
+	}
+
+	/**
+	 * Loads the full ElggSite when given a guid.
+	 *
+	 * @param mixed $guid GUID of ElggSite entity or database row object
+	 *
+	 * @return bool
+	 * @throws InvalidClassException
+	 */
+	protected function load($guid) {
+		$attr_loader = new ElggAttributeLoader(get_class(), 'site', $this->attributes);
+		$attr_loader->requires_access_control = !($this instanceof ElggPlugin);
+		$attr_loader->secondary_loader = 'get_site_entity_as_row';
+
+		$attrs = $attr_loader->getRequiredAttributes($guid);
+		if (!$attrs) {
+			return false;
+		}
+
+		$this->attributes = $attrs;
+		$this->attributes['tables_loaded'] = 2;
+		_elgg_cache_entity($this);
+
+		return true;
+	}
+
+	/**
+	 * Saves site-specific attributes.
+	 *
+	 * @internal Site attributes are saved in the sites_entity table.
+	 *
+	 * @return bool
+	 */
+	public function save() {
+		global $CONFIG;
+
+		// Save generic stuff
+		if (!parent::save()) {
+			return false;
+		}
+
+		// make sure the site guid is set (if not, set to self)
+		if (!$this->get('site_guid')) {
+			$guid = $this->get('guid');
+			update_data("UPDATE {$CONFIG->dbprefix}entities SET site_guid=$guid
+				WHERE guid=$guid");
+		}
+
+		// Now save specific stuff
+		return create_site_entity($this->get('guid'), $this->get('name'),
+			$this->get('description'), $this->get('url'));
+	}
+
+	/**
+	 * Delete the site.
+	 *
+	 * @note You cannot delete the current site.
+	 *
+	 * @return bool
+	 * @throws SecurityException
+	 */
+	public function delete() {
+		global $CONFIG;
+		if ($CONFIG->site->getGUID() == $this->guid) {
+			throw new SecurityException('SecurityException:deletedisablecurrentsite');
+		}
+
+		return parent::delete();
+	}
+
+	/**
+	 * Disable the site
+	 *
+	 * @note You cannot disable the current site.
+	 *
+	 * @param string $reason    Optional reason for disabling
+	 * @param bool   $recursive Recursively disable all contained entities?
+	 *
+	 * @return bool
+	 * @throws SecurityException
+	 */
+	public function disable($reason = "", $recursive = true) {
+		global $CONFIG;
+
+		if ($CONFIG->site->getGUID() == $this->guid) {
+			throw new SecurityException('SecurityException:deletedisablecurrentsite');
+		}
+
+		return parent::disable($reason, $recursive);
+	}
+
+	/**
+	 * Gets an array of ElggUser entities who are members of the site.
+	 *
+	 * @param array $options An associative array for key => value parameters
+	 *                       accepted by elgg_get_entities(). Common parameters
+	 *                       include 'limit', and 'offset'.
+	 *                       Note: this was $limit before version 1.8
+	 * @param int   $offset  Offset @deprecated parameter
+	 *
+	 * @todo remove $offset in 2.0
+	 *
+	 * @return array of ElggUsers
+	 */
+	public function getMembers($options = array(), $offset = 0) {
+		if (!is_array($options)) {
+			elgg_deprecated_notice("ElggSite::getMembers uses different arguments!", 1.8);
+			$options = array(
+				'limit' => $options,
+				'offset' => $offset,
+			);
+		}
+
+		$defaults = array(
+			'site_guids' => ELGG_ENTITIES_ANY_VALUE,
+			'relationship' => 'member_of_site',
+			'relationship_guid' => $this->getGUID(),
+			'inverse_relationship' => TRUE,
+			'type' => 'user',
+		);
+
+		$options = array_merge($defaults, $options);
+
+		return elgg_get_entities_from_relationship($options);
+	}
+
+	/**
+	 * List the members of this site
+	 *
+	 * @param array $options An associative array for key => value parameters
+	 *                       accepted by elgg_list_entities(). Common parameters
+	 *                       include 'full_view', 'limit', and 'offset'.
+	 *
+	 * @return string
+	 * @since 1.8.0
+	 */
+	public function listMembers($options = array()) {
+		$defaults = array(
+			'site_guids' => ELGG_ENTITIES_ANY_VALUE,
+			'relationship' => 'member_of_site',
+			'relationship_guid' => $this->getGUID(),
+			'inverse_relationship' => TRUE,
+			'type' => 'user',
+		);
+
+		$options = array_merge($defaults, $options);
+
+		return elgg_list_entities_from_relationship($options);
+	}
+
+	/**
+	 * Adds a user to the site.
+	 *
+	 * @param int $user_guid GUID
+	 *
+	 * @return bool
+	 */
+	public function addUser($user_guid) {
+		return add_site_user($this->getGUID(), $user_guid);
+	}
+
+	/**
+	 * Removes a user from the site.
+	 *
+	 * @param int $user_guid GUID
+	 *
+	 * @return bool
+	 */
+	public function removeUser($user_guid) {
+		return remove_site_user($this->getGUID(), $user_guid);
+	}
+
+	/**
+	 * Returns an array of ElggObject entities that belong to the site.
+	 *
+	 * @warning This only returns objects that have been explicitly added to the
+	 * site through addObject()
+	 *
+	 * @param string $subtype Entity subtype
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return array
+	 */
+	public function getObjects($subtype = "", $limit = 10, $offset = 0) {
+		return get_site_objects($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Adds an object to the site.
+	 *
+	 * @param int $object_guid GUID
+	 *
+	 * @return bool
+	 */
+	public function addObject($object_guid) {
+		return add_site_object($this->getGUID(), $object_guid);
+	}
+
+	/**
+	 * Remvoes an object from the site.
+	 *
+	 * @param int $object_guid GUID
+	 *
+	 * @return bool
+	 */
+	public function removeObject($object_guid) {
+		return remove_site_object($this->getGUID(), $object_guid);
+	}
+
+	/**
+	 * Get the collections associated with a site.
+	 *
+	 * @param string $subtype Subtype
+	 * @param int    $limit   Limit
+	 * @param int    $offset  Offset
+	 *
+	 * @return unknown
+	 * @deprecated 1.8 Was never implemented
+	 */
+	public function getCollections($subtype = "", $limit = 10, $offset = 0) {
+		elgg_deprecated_notice("ElggSite::getCollections() is deprecated", 1.8);
+		get_site_collections($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/*
+	 * EXPORTABLE INTERFACE
+	 */
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array_merge(parent::getExportableValues(), array(
+			'name',
+			'description',
+			'url',
+		));
+	}
+
+	/**
+	 * Halts bootup and redirects to the site front page
+	 * if site is in walled garden mode, no user is logged in,
+	 * and the URL is not a public page.
+	 *
+	 * @link http://docs.elgg.org/Tutorials/WalledGarden
+	 *
+	 * @return void
+	 * @since 1.8.0
+	 */
+	public function checkWalledGarden() {
+		global $CONFIG;
+
+		// command line calls should not invoke the walled garden check
+		if (PHP_SAPI === 'cli') {
+			return;
+		}
+
+		if ($CONFIG->walled_garden) {
+			if ($CONFIG->default_access == ACCESS_PUBLIC) {
+				$CONFIG->default_access = ACCESS_LOGGED_IN;
+			}
+			elgg_register_plugin_hook_handler(
+					'access:collections:write',
+					'user',
+					'_elgg_walled_garden_remove_public_access');
+
+			if (!elgg_is_logged_in()) {
+				// hook into the index system call at the highest priority
+				elgg_register_plugin_hook_handler('index', 'system', 'elgg_walled_garden_index', 1);
+
+				if (!$this->isPublicPage()) {
+					if (!elgg_is_xhr()) {
+						$_SESSION['last_forward_from'] = current_page_url();
+					}
+					register_error(elgg_echo('loggedinrequired'));
+					forward();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Returns if a URL is public for this site when in Walled Garden mode.
+	 *
+	 * Pages are registered to be public by {@elgg_plugin_hook public_pages walled_garden}.
+	 *
+	 * @param string $url Defaults to the current URL.
+	 *
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function isPublicPage($url = '') {
+		global $CONFIG;
+
+		if (empty($url)) {
+			$url = current_page_url();
+
+			// do not check against URL queries
+			if ($pos = strpos($url, '?')) {
+				$url = substr($url, 0, $pos);
+			}
+		}
+
+		// always allow index page
+		if ($url == elgg_get_site_url($this->guid)) {
+			return TRUE;
+		}
+
+		// default public pages
+		$defaults = array(
+			'walled_garden/.*',
+			'login',
+			'action/login',
+			'register',
+			'action/register',
+			'forgotpassword',
+			'resetpassword',
+			'action/user/requestnewpassword',
+			'action/user/passwordreset',
+			'action/security/refreshtoken',
+			'ajax/view/js/languages',
+			'upgrade\.php',
+			'xml-rpc\.php',
+			'mt/mt-xmlrpc\.cgi',
+			'css/.*',
+			'js/.*',
+			'cache/css/.*',
+			'cache/js/.*',
+			'cron/.*',
+			'services/.*',
+		);
+
+		// include a hook for plugin authors to include public pages
+		$plugins = elgg_trigger_plugin_hook('public_pages', 'walled_garden', NULL, array());
+
+		// allow public pages
+		foreach (array_merge($defaults, $plugins) as $public) {
+			$pattern = "`^{$CONFIG->url}$public/*$`i";
+			if (preg_match($pattern, $url)) {
+				return TRUE;
+			}
+		}
+
+		// non-public page
+		return FALSE;
+	}
+}
diff --git a/engine/classes/ElggStaticVariableCache.php b/engine/classes/ElggStaticVariableCache.php
new file mode 100644
index 000000000..9c14fdfba
--- /dev/null
+++ b/engine/classes/ElggStaticVariableCache.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * ElggStaticVariableCache
+ * Dummy cache which stores values in a static array. Using this makes future
+ * replacements to other caching back ends (eg memcache) much easier.
+ *
+ * @package    Elgg.Core
+ * @subpackage Cache
+ */
+class ElggStaticVariableCache extends ElggSharedMemoryCache {
+	/**
+	 * The cache.
+	 *
+	 * @var array
+	 */
+	private static $__cache;
+
+	/**
+	 * Create the variable cache.
+	 *
+	 * This function creates a variable cache in a static variable in
+	 * memory, optionally with a given namespace (to avoid overlap).
+	 *
+	 * @param string $namespace The namespace for this cache to write to.
+	 * @warning namespaces of the same name are shared!
+	 */
+	function __construct($namespace = 'default') {
+		$this->setNamespace($namespace);
+		$this->clear();
+	}
+
+	/**
+	 * Save a key
+	 *
+	 * @param string $key  Name
+	 * @param string $data Value
+	 *
+	 * @return boolean
+	 */
+	public function save($key, $data) {
+		$namespace = $this->getNamespace();
+
+		ElggStaticVariableCache::$__cache[$namespace][$key] = $data;
+
+		return true;
+	}
+
+	/**
+	 * Load a key
+	 *
+	 * @param string $key    Name
+	 * @param int    $offset Offset
+	 * @param int    $limit  Limit
+	 *
+	 * @return string
+	 */
+	public function load($key, $offset = 0, $limit = null) {
+		$namespace = $this->getNamespace();
+
+		if (isset(ElggStaticVariableCache::$__cache[$namespace][$key])) {
+			return ElggStaticVariableCache::$__cache[$namespace][$key];
+		}
+
+		return false;
+	}
+
+	/**
+	 * Invalidate a given key.
+	 *
+	 * @param string $key Name
+	 *
+	 * @return bool
+	 */
+	public function delete($key) {
+		$namespace = $this->getNamespace();
+
+		unset(ElggStaticVariableCache::$__cache[$namespace][$key]);
+
+		return true;
+	}
+
+	/**
+	 * Clears the cache for a particular namespace
+	 *
+	 * @return void
+	 */
+	public function clear() {
+		$namespace = $this->getNamespace();
+
+		if (!isset(ElggStaticVariableCache::$__cache)) {
+			ElggStaticVariableCache::$__cache = array();
+		}
+
+		ElggStaticVariableCache::$__cache[$namespace] = array();
+	}
+}
diff --git a/engine/classes/ElggTranslit.php b/engine/classes/ElggTranslit.php
new file mode 100644
index 000000000..b4bf87797
--- /dev/null
+++ b/engine/classes/ElggTranslit.php
@@ -0,0 +1,269 @@
+<?php
+/**
+ * Elgg Transliterate
+ *
+ * For creating "friendly titles" for URLs
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ *
+ * @package Elgg.Core
+ * @author  Konsta Vesterinen <kvesteri@cc.hut.fi>
+ * @author  Jonathan H. Wage <jonwage@gmail.com>
+ * @author  Steve Clay <steve@mrclay.org>
+ *
+ * @access private Plugin authors should not use this directly
+ */
+class ElggTranslit {
+
+	/**
+	 * Create a version of a string for embedding in a URL
+	 *
+	 * @param string $string    A UTF-8 string
+	 * @param string $separator The character to separate words with
+	 * @return string
+	 */
+	static public function urlize($string, $separator = '-') {
+		// Iñtërnâtiônàlizætiøn, AND 日本語!
+
+		// try to force combined chars because the translit map and others expect it
+		if (self::hasNormalizerSupport()) {
+			$nfc = normalizer_normalize($string);
+			if (is_string($nfc)) {
+				$string = $nfc;
+			}
+		}
+		// Internationalization, AND 日本語!
+		$string = self::transliterateAscii($string);
+
+		// allow HTML tags in titles
+		$string = preg_replace('~<([a-zA-Z][^>]*)>~', ' $1 ', $string);
+
+		// more substitutions
+		// @todo put these somewhere else
+		$string = strtr($string, array(
+			// currency
+			"\xE2\x82\xAC" /* € */ => ' E ',
+			"\xC2\xA3" /* £ */ => ' GBP ',
+		));
+
+		// remove all ASCII except 0-9a-zA-Z, hyphen, underscore, and whitespace
+		// note: "x" modifier did not work with this pattern.
+		$string = preg_replace('~['
+			. '\x00-\x08'  // control chars
+			. '\x0b\x0c'   // vert tab, form feed
+			. '\x0e-\x1f'  // control chars
+			. '\x21-\x2c'  // ! ... ,
+			. '\x2e\x2f'   // . slash
+			. '\x3a-\x40'  // : ... @
+			. '\x5b-\x5e'  // [ ... ^
+			. '\x60'       // `
+			. '\x7b-\x7f'  // { ... DEL
+			. ']~', '', $string);
+		$string = strtr($string, '', '');
+
+		// internationalization, and 日本語!
+		// note: not using elgg_strtolower to keep this class portable
+		$string = is_callable('mb_strtolower')
+			? mb_strtolower($string, 'UTF-8')
+			: strtolower($string);
+
+		// split by ASCII chars not in 0-9a-zA-Z
+		// note: we cannot use [^0-9a-zA-Z] because that matches multibyte chars.
+		// note: "x" modifier did not work with this pattern.
+		$pattern = '~['
+			. '\x00-\x2f'  // controls ... slash
+			. '\x3a-\x40'  // : ... @
+			. '\x5b-\x60'  // [ ... `
+			. '\x7b-\x7f'  // { ... DEL
+			. ']+~x';
+
+		// ['internationalization', 'and', '日本語']
+		$words = preg_split($pattern, $string, -1, PREG_SPLIT_NO_EMPTY);
+
+		// ['internationalization', 'and', '%E6%97%A5%E6%9C%AC%E8%AA%9E']
+		$words = array_map('urlencode', $words);
+
+		// internationalization-and-%E6%97%A5%E6%9C%AC%E8%AA%9E
+		return implode($separator, $words);
+	}
+
+	/**
+	 * Transliterate Western multibyte chars to ASCII
+	 *
+	 * @param string $utf8 a UTF-8 string
+	 * @return string
+	 */
+	static public function transliterateAscii($utf8) {
+		static $map = null;
+		if (!preg_match('/[\x80-\xff]/', $utf8)) {
+			return $utf8;
+		}
+		if (null === $map) {
+			$map = self::getAsciiTranslitMap();
+		}
+		return strtr($utf8, $map);
+	}
+
+	/**
+	 * Get array of UTF-8 (NFC) character replacements.
+	 *
+	 * @return array
+	 */
+	static public function getAsciiTranslitMap() {
+		return array(
+			// Decompositions for Latin-1 Supplement
+			"\xC2\xAA" /* ª */ => 'a', "\xC2\xBA" /* º */ => 'o', "\xC3\x80" /* À */ => 'A',
+			"\xC3\x81" /* Á */ => 'A', "\xC3\x82" /* Â */ => 'A', "\xC3\x83" /* Ã */ => 'A',
+			"\xC3\x84" /* Ä */ => 'A', "\xC3\x85" /* Å */ => 'A', "\xC3\x86" /* Æ */ => 'AE',
+			"\xC3\x87" /* Ç */ => 'C', "\xC3\x88" /* È */ => 'E', "\xC3\x89" /* É */ => 'E',
+			"\xC3\x8A" /* Ê */ => 'E', "\xC3\x8B" /* Ë */ => 'E', "\xC3\x8C" /* Ì */ => 'I',
+			"\xC3\x8D" /* Í */ => 'I', "\xC3\x8E" /* Î */ => 'I', "\xC3\x8F" /* Ï */ => 'I',
+			"\xC3\x90" /* Ð */ => 'D', "\xC3\x91" /* Ñ */ => 'N', "\xC3\x92" /* Ò */ => 'O',
+			"\xC3\x93" /* Ó */ => 'O', "\xC3\x94" /* Ô */ => 'O', "\xC3\x95" /* Õ */ => 'O',
+			"\xC3\x96" /* Ö */ => 'O', "\xC3\x99" /* Ù */ => 'U', "\xC3\x9A" /* Ú */ => 'U',
+			"\xC3\x9B" /* Û */ => 'U', "\xC3\x9C" /* Ü */ => 'U', "\xC3\x9D" /* Ý */ => 'Y',
+			"\xC3\x9E" /* Þ */ => 'TH', "\xC3\x9F" /* ß */ => 'ss', "\xC3\xA0" /* à */ => 'a',
+			"\xC3\xA1" /* á */ => 'a', "\xC3\xA2" /* â */ => 'a', "\xC3\xA3" /* ã */ => 'a',
+			"\xC3\xA4" /* ä */ => 'a', "\xC3\xA5" /* å */ => 'a', "\xC3\xA6" /* æ */ => 'ae',
+			"\xC3\xA7" /* ç */ => 'c', "\xC3\xA8" /* è */ => 'e', "\xC3\xA9" /* é */ => 'e',
+			"\xC3\xAA" /* ê */ => 'e', "\xC3\xAB" /* ë */ => 'e', "\xC3\xAC" /* ì */ => 'i',
+			"\xC3\xAD" /* í */ => 'i', "\xC3\xAE" /* î */ => 'i', "\xC3\xAF" /* ï */ => 'i',
+			"\xC3\xB0" /* ð */ => 'd', "\xC3\xB1" /* ñ */ => 'n', "\xC3\xB2" /* ò */ => 'o',
+			"\xC3\xB3" /* ó */ => 'o', "\xC3\xB4" /* ô */ => 'o', "\xC3\xB5" /* õ */ => 'o',
+			"\xC3\xB6" /* ö */ => 'o', "\xC3\xB8" /* ø */ => 'o', "\xC3\xB9" /* ù */ => 'u',
+			"\xC3\xBA" /* ú */ => 'u', "\xC3\xBB" /* û */ => 'u', "\xC3\xBC" /* ü */ => 'u',
+			"\xC3\xBD" /* ý */ => 'y', "\xC3\xBE" /* þ */ => 'th', "\xC3\xBF" /* ÿ */ => 'y',
+			"\xC3\x98" /* Ø */ => 'O',
+			// Decompositions for Latin Extended-A
+			"\xC4\x80" /* Ā */ => 'A', "\xC4\x81" /* ā */ => 'a', "\xC4\x82" /* Ă */ => 'A',
+			"\xC4\x83" /* ă */ => 'a', "\xC4\x84" /* Ą */ => 'A', "\xC4\x85" /* ą */ => 'a',
+			"\xC4\x86" /* Ć */ => 'C', "\xC4\x87" /* ć */ => 'c', "\xC4\x88" /* Ĉ */ => 'C',
+			"\xC4\x89" /* ĉ */ => 'c', "\xC4\x8A" /* Ċ */ => 'C', "\xC4\x8B" /* ċ */ => 'c',
+			"\xC4\x8C" /* Č */ => 'C', "\xC4\x8D" /* č */ => 'c', "\xC4\x8E" /* Ď */ => 'D',
+			"\xC4\x8F" /* ď */ => 'd', "\xC4\x90" /* Đ */ => 'D', "\xC4\x91" /* đ */ => 'd',
+			"\xC4\x92" /* Ē */ => 'E', "\xC4\x93" /* ē */ => 'e', "\xC4\x94" /* Ĕ */ => 'E',
+			"\xC4\x95" /* ĕ */ => 'e', "\xC4\x96" /* Ė */ => 'E', "\xC4\x97" /* ė */ => 'e',
+			"\xC4\x98" /* Ę */ => 'E', "\xC4\x99" /* ę */ => 'e', "\xC4\x9A" /* Ě */ => 'E',
+			"\xC4\x9B" /* ě */ => 'e', "\xC4\x9C" /* Ĝ */ => 'G', "\xC4\x9D" /* ĝ */ => 'g',
+			"\xC4\x9E" /* Ğ */ => 'G', "\xC4\x9F" /* ğ */ => 'g', "\xC4\xA0" /* Ġ */ => 'G',
+			"\xC4\xA1" /* ġ */ => 'g', "\xC4\xA2" /* Ģ */ => 'G', "\xC4\xA3" /* ģ */ => 'g',
+			"\xC4\xA4" /* Ĥ */ => 'H', "\xC4\xA5" /* ĥ */ => 'h', "\xC4\xA6" /* Ħ */ => 'H',
+			"\xC4\xA7" /* ħ */ => 'h', "\xC4\xA8" /* Ĩ */ => 'I', "\xC4\xA9" /* ĩ */ => 'i',
+			"\xC4\xAA" /* Ī */ => 'I', "\xC4\xAB" /* ī */ => 'i', "\xC4\xAC" /* Ĭ */ => 'I',
+			"\xC4\xAD" /* ĭ */ => 'i', "\xC4\xAE" /* Į */ => 'I', "\xC4\xAF" /* į */ => 'i',
+			"\xC4\xB0" /* İ */ => 'I', "\xC4\xB1" /* ı */ => 'i', "\xC4\xB2" /* Ĳ */ => 'IJ',
+			"\xC4\xB3" /* ĳ */ => 'ij', "\xC4\xB4" /* Ĵ */ => 'J', "\xC4\xB5" /* ĵ */ => 'j',
+			"\xC4\xB6" /* Ķ */ => 'K', "\xC4\xB7" /* ķ */ => 'k', "\xC4\xB8" /* ĸ */ => 'k',
+			"\xC4\xB9" /* Ĺ */ => 'L', "\xC4\xBA" /* ĺ */ => 'l', "\xC4\xBB" /* Ļ */ => 'L',
+			"\xC4\xBC" /* ļ */ => 'l', "\xC4\xBD" /* Ľ */ => 'L', "\xC4\xBE" /* ľ */ => 'l',
+			"\xC4\xBF" /* Ŀ */ => 'L', "\xC5\x80" /* ŀ */ => 'l', "\xC5\x81" /* Ł */ => 'L',
+			"\xC5\x82" /* ł */ => 'l', "\xC5\x83" /* Ń */ => 'N', "\xC5\x84" /* ń */ => 'n',
+			"\xC5\x85" /* Ņ */ => 'N', "\xC5\x86" /* ņ */ => 'n', "\xC5\x87" /* Ň */ => 'N',
+			"\xC5\x88" /* ň */ => 'n', "\xC5\x89" /* ŉ */ => 'N', "\xC5\x8A" /* Ŋ */ => 'n',
+			"\xC5\x8B" /* ŋ */ => 'N', "\xC5\x8C" /* Ō */ => 'O', "\xC5\x8D" /* ō */ => 'o',
+			"\xC5\x8E" /* Ŏ */ => 'O', "\xC5\x8F" /* ŏ */ => 'o', "\xC5\x90" /* Ő */ => 'O',
+			"\xC5\x91" /* ő */ => 'o', "\xC5\x92" /* Œ */ => 'OE', "\xC5\x93" /* œ */ => 'oe',
+			"\xC5\x94" /* Ŕ */ => 'R', "\xC5\x95" /* ŕ */ => 'r', "\xC5\x96" /* Ŗ */ => 'R',
+			"\xC5\x97" /* ŗ */ => 'r', "\xC5\x98" /* Ř */ => 'R', "\xC5\x99" /* ř */ => 'r',
+			"\xC5\x9A" /* Ś */ => 'S', "\xC5\x9B" /* ś */ => 's', "\xC5\x9C" /* Ŝ */ => 'S',
+			"\xC5\x9D" /* ŝ */ => 's', "\xC5\x9E" /* Ş */ => 'S', "\xC5\x9F" /* ş */ => 's',
+			"\xC5\xA0" /* Š */ => 'S', "\xC5\xA1" /* š */ => 's', "\xC5\xA2" /* Ţ */ => 'T',
+			"\xC5\xA3" /* ţ */ => 't', "\xC5\xA4" /* Ť */ => 'T', "\xC5\xA5" /* ť */ => 't',
+			"\xC5\xA6" /* Ŧ */ => 'T', "\xC5\xA7" /* ŧ */ => 't', "\xC5\xA8" /* Ũ */ => 'U',
+			"\xC5\xA9" /* ũ */ => 'u', "\xC5\xAA" /* Ū */ => 'U', "\xC5\xAB" /* ū */ => 'u',
+			"\xC5\xAC" /* Ŭ */ => 'U', "\xC5\xAD" /* ŭ */ => 'u', "\xC5\xAE" /* Ů */ => 'U',
+			"\xC5\xAF" /* ů */ => 'u', "\xC5\xB0" /* Ű */ => 'U', "\xC5\xB1" /* ű */ => 'u',
+			"\xC5\xB2" /* Ų */ => 'U', "\xC5\xB3" /* ų */ => 'u', "\xC5\xB4" /* Ŵ */ => 'W',
+			"\xC5\xB5" /* ŵ */ => 'w', "\xC5\xB6" /* Ŷ */ => 'Y', "\xC5\xB7" /* ŷ */ => 'y',
+			"\xC5\xB8" /* Ÿ */ => 'Y', "\xC5\xB9" /* Ź */ => 'Z', "\xC5\xBA" /* ź */ => 'z',
+			"\xC5\xBB" /* Ż */ => 'Z', "\xC5\xBC" /* ż */ => 'z', "\xC5\xBD" /* Ž */ => 'Z',
+			"\xC5\xBE" /* ž */ => 'z', "\xC5\xBF" /* ſ */ => 's',
+			// Decompositions for Latin Extended-B
+			"\xC8\x98" /* Ș */ => 'S', "\xC8\x99" /* ș */ => 's',
+			"\xC8\x9A" /* Ț */ => 'T', "\xC8\x9B" /* ț */ => 't',
+			// unmarked
+			"\xC6\xA0" /* Ơ */ => 'O', "\xC6\xA1" /* ơ */ => 'o',
+			"\xC6\xAF" /* Ư */ => 'U', "\xC6\xB0" /* ư */ => 'u',
+			// grave accent
+			"\xE1\xBA\xA6" /* Ầ */ => 'A', "\xE1\xBA\xA7" /* ầ */ => 'a',
+			"\xE1\xBA\xB0" /* Ằ */ => 'A', "\xE1\xBA\xB1" /* ằ */ => 'a',
+			"\xE1\xBB\x80" /* Ề */ => 'E', "\xE1\xBB\x81" /* ề */ => 'e',
+			"\xE1\xBB\x92" /* Ồ */ => 'O', "\xE1\xBB\x93" /* ồ */ => 'o',
+			"\xE1\xBB\x9C" /* Ờ */ => 'O', "\xE1\xBB\x9D" /* ờ */ => 'o',
+			"\xE1\xBB\xAA" /* Ừ */ => 'U', "\xE1\xBB\xAB" /* ừ */ => 'u',
+			"\xE1\xBB\xB2" /* Ỳ */ => 'Y', "\xE1\xBB\xB3" /* ỳ */ => 'y',
+			// hook
+			"\xE1\xBA\xA2" /* Ả */ => 'A', "\xE1\xBA\xA3" /* ả */ => 'a',
+			"\xE1\xBA\xA8" /* Ẩ */ => 'A', "\xE1\xBA\xA9" /* ẩ */ => 'a',
+			"\xE1\xBA\xB2" /* Ẳ */ => 'A', "\xE1\xBA\xB3" /* ẳ */ => 'a',
+			"\xE1\xBA\xBA" /* Ẻ */ => 'E', "\xE1\xBA\xBB" /* ẻ */ => 'e',
+			"\xE1\xBB\x82" /* Ể */ => 'E', "\xE1\xBB\x83" /* ể */ => 'e',
+			"\xE1\xBB\x88" /* Ỉ */ => 'I', "\xE1\xBB\x89" /* ỉ */ => 'i',
+			"\xE1\xBB\x8E" /* Ỏ */ => 'O', "\xE1\xBB\x8F" /* ỏ */ => 'o',
+			"\xE1\xBB\x94" /* Ổ */ => 'O', "\xE1\xBB\x95" /* ổ */ => 'o',
+			"\xE1\xBB\x9E" /* Ở */ => 'O', "\xE1\xBB\x9F" /* ở */ => 'o',
+			"\xE1\xBB\xA6" /* Ủ */ => 'U', "\xE1\xBB\xA7" /* ủ */ => 'u',
+			"\xE1\xBB\xAC" /* Ử */ => 'U', "\xE1\xBB\xAD" /* ử */ => 'u',
+			"\xE1\xBB\xB6" /* Ỷ */ => 'Y', "\xE1\xBB\xB7" /* ỷ */ => 'y',
+			// tilde
+			"\xE1\xBA\xAA" /* Ẫ */ => 'A', "\xE1\xBA\xAB" /* ẫ */ => 'a',
+			"\xE1\xBA\xB4" /* Ẵ */ => 'A', "\xE1\xBA\xB5" /* ẵ */ => 'a',
+			"\xE1\xBA\xBC" /* Ẽ */ => 'E', "\xE1\xBA\xBD" /* ẽ */ => 'e',
+			"\xE1\xBB\x84" /* Ễ */ => 'E', "\xE1\xBB\x85" /* ễ */ => 'e',
+			"\xE1\xBB\x96" /* Ỗ */ => 'O', "\xE1\xBB\x97" /* ỗ */ => 'o',
+			"\xE1\xBB\xA0" /* Ỡ */ => 'O', "\xE1\xBB\xA1" /* ỡ */ => 'o',
+			"\xE1\xBB\xAE" /* Ữ */ => 'U', "\xE1\xBB\xAF" /* ữ */ => 'u',
+			"\xE1\xBB\xB8" /* Ỹ */ => 'Y', "\xE1\xBB\xB9" /* ỹ */ => 'y',
+			// acute accent
+			"\xE1\xBA\xA4" /* Ấ */ => 'A', "\xE1\xBA\xA5" /* ấ */ => 'a',
+			"\xE1\xBA\xAE" /* Ắ */ => 'A', "\xE1\xBA\xAF" /* ắ */ => 'a',
+			"\xE1\xBA\xBE" /* Ế */ => 'E', "\xE1\xBA\xBF" /* ế */ => 'e',
+			"\xE1\xBB\x90" /* Ố */ => 'O', "\xE1\xBB\x91" /* ố */ => 'o',
+			"\xE1\xBB\x9A" /* Ớ */ => 'O', "\xE1\xBB\x9B" /* ớ */ => 'o',
+			"\xE1\xBB\xA8" /* Ứ */ => 'U', "\xE1\xBB\xA9" /* ứ */ => 'u',
+			// dot below
+			"\xE1\xBA\xA0" /* Ạ */ => 'A', "\xE1\xBA\xA1" /* ạ */ => 'a',
+			"\xE1\xBA\xAC" /* Ậ */ => 'A', "\xE1\xBA\xAD" /* ậ */ => 'a',
+			"\xE1\xBA\xB6" /* Ặ */ => 'A', "\xE1\xBA\xB7" /* ặ */ => 'a',
+			"\xE1\xBA\xB8" /* Ẹ */ => 'E', "\xE1\xBA\xB9" /* ẹ */ => 'e',
+			"\xE1\xBB\x86" /* Ệ */ => 'E', "\xE1\xBB\x87" /* ệ */ => 'e',
+			"\xE1\xBB\x8A" /* Ị */ => 'I', "\xE1\xBB\x8B" /* ị */ => 'i',
+			"\xE1\xBB\x8C" /* Ọ */ => 'O', "\xE1\xBB\x8D" /* ọ */ => 'o',
+			"\xE1\xBB\x98" /* Ộ */ => 'O', "\xE1\xBB\x99" /* ộ */ => 'o',
+			"\xE1\xBB\xA2" /* Ợ */ => 'O', "\xE1\xBB\xA3" /* ợ */ => 'o',
+			"\xE1\xBB\xA4" /* Ụ */ => 'U', "\xE1\xBB\xA5" /* ụ */ => 'u',
+			"\xE1\xBB\xB0" /* Ự */ => 'U', "\xE1\xBB\xB1" /* ự */ => 'u',
+			"\xE1\xBB\xB4" /* Ỵ */ => 'Y', "\xE1\xBB\xB5" /* ỵ */ => 'y',
+		);
+	}
+
+	/**
+	 * Tests that "normalizer_normalize" exists and works
+	 *
+	 * @return bool
+	 */
+	static public function hasNormalizerSupport() {
+		static $ret = null;
+		if (null === $ret) {
+			$form_c = "\xC3\x85"; // 'LATIN CAPITAL LETTER A WITH RING ABOVE' (U+00C5)
+			$form_d = "A\xCC\x8A"; // A followed by 'COMBINING RING ABOVE' (U+030A)
+			$ret = (function_exists('normalizer_normalize')
+				&& $form_c === normalizer_normalize($form_d));
+		}
+		return $ret;
+	}
+}
diff --git a/engine/classes/ElggUser.php b/engine/classes/ElggUser.php
new file mode 100644
index 000000000..6163f9b62
--- /dev/null
+++ b/engine/classes/ElggUser.php
@@ -0,0 +1,588 @@
+<?php
+/**
+ * ElggUser
+ *
+ * Representation of a "user" in the system.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.User
+ * 
+ * @property string $name     The display name that the user will be known by in the network
+ * @property string $username The short, reference name for the user in the network
+ * @property string $email    The email address to which Elgg will send email notifications
+ * @property string $language The language preference of the user (ISO 639-1 formatted)
+ * @property string $banned   'yes' if the user is banned from the network, 'no' otherwise
+ * @property string $admin    'yes' if the user is an administrator of the network, 'no' otherwise
+ * @property string $password The hashed password of the user
+ * @property string $salt     The salt used to secure the password before hashing
+ */
+class ElggUser extends ElggEntity
+	implements Friendable {
+
+	/**
+	 * Initialise the attributes array.
+	 * This is vital to distinguish between metadata and base parameters.
+	 *
+	 * Place your base parameters here.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['type'] = "user";
+		$this->attributes['name'] = NULL;
+		$this->attributes['username'] = NULL;
+		$this->attributes['password'] = NULL;
+		$this->attributes['salt'] = NULL;
+		$this->attributes['email'] = NULL;
+		$this->attributes['language'] = NULL;
+		$this->attributes['code'] = NULL;
+		$this->attributes['banned'] = "no";
+		$this->attributes['admin'] = 'no';
+		$this->attributes['prev_last_action'] = NULL;
+		$this->attributes['last_login'] = NULL;
+		$this->attributes['prev_last_login'] = NULL;
+		$this->attributes['tables_split'] = 2;
+	}
+
+	/**
+	 * Construct a new user entity, optionally from a given id value.
+	 *
+	 * @param mixed $guid If an int, load that GUID.
+	 * 	If an entity table db row then will load the rest of the data.
+	 *
+	 * @throws Exception if there was a problem creating the user.
+	 */
+	function __construct($guid = null) {
+		$this->initializeAttributes();
+
+		// compatibility for 1.7 api.
+		$this->initialise_attributes(false);
+
+		if (!empty($guid)) {
+			// Is $guid is a DB entity row
+			if ($guid instanceof stdClass) {
+				// Load the rest
+				if (!$this->load($guid)) {
+					$msg = elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid->guid));
+					throw new IOException($msg);
+				}
+			} else if (is_string($guid)) {
+				// $guid is a username
+				$user = get_user_by_username($guid);
+				if ($user) {
+					foreach ($user->attributes as $key => $value) {
+						$this->attributes[$key] = $value;
+					}
+				}
+			} else if ($guid instanceof ElggUser) {
+				// $guid is an ElggUser so this is a copy constructor
+				elgg_deprecated_notice('This type of usage of the ElggUser constructor was deprecated. Please use the clone method.', 1.7);
+
+				foreach ($guid->attributes as $key => $value) {
+					$this->attributes[$key] = $value;
+				}
+			} else if ($guid instanceof ElggEntity) {
+				// @todo why have a special case here
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonElggUser'));
+			} else if (is_numeric($guid)) {
+				// $guid is a GUID so load entity
+				if (!$this->load($guid)) {
+					throw new IOException(elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid)));
+				}
+			} else {
+				throw new InvalidParameterException(elgg_echo('InvalidParameterException:UnrecognisedValue'));
+			}
+		}
+	}
+
+	/**
+	 * Load the ElggUser data from the database
+	 *
+	 * @param mixed $guid ElggUser GUID or stdClass database row from entity table
+	 *
+	 * @return bool
+	 */
+	protected function load($guid) {
+		$attr_loader = new ElggAttributeLoader(get_class(), 'user', $this->attributes);
+		$attr_loader->secondary_loader = 'get_user_entity_as_row';
+
+		$attrs = $attr_loader->getRequiredAttributes($guid);
+		if (!$attrs) {
+			return false;
+		}
+
+		$this->attributes = $attrs;
+		$this->attributes['tables_loaded'] = 2;
+		_elgg_cache_entity($this);
+
+		return true;
+	}
+
+	/**
+	 * Saves this user to the database.
+	 *
+	 * @return bool
+	 */
+	public function save() {
+		// Save generic stuff
+		if (!parent::save()) {
+			return false;
+		}
+
+		// Now save specific stuff
+		_elgg_disable_caching_for_entity($this->guid);
+		$ret = create_user_entity($this->get('guid'), $this->get('name'), $this->get('username'),
+			$this->get('password'), $this->get('salt'), $this->get('email'), $this->get('language'),
+			$this->get('code'));
+		_elgg_enable_caching_for_entity($this->guid);
+
+		return $ret;
+	}
+
+	/**
+	 * User specific override of the entity delete method.
+	 *
+	 * @return bool
+	 */
+	public function delete() {
+		global $USERNAME_TO_GUID_MAP_CACHE, $CODE_TO_GUID_MAP_CACHE;
+
+		// clear cache
+		if (isset($USERNAME_TO_GUID_MAP_CACHE[$this->username])) {
+			unset($USERNAME_TO_GUID_MAP_CACHE[$this->username]);
+		}
+		if (isset($CODE_TO_GUID_MAP_CACHE[$this->code])) {
+			unset($CODE_TO_GUID_MAP_CACHE[$this->code]);
+		}
+
+		clear_user_files($this);
+
+		// Delete entity
+		return parent::delete();
+	}
+
+	/**
+	 * Ban this user.
+	 *
+	 * @param string $reason Optional reason
+	 *
+	 * @return bool
+	 */
+	public function ban($reason = "") {
+		return ban_user($this->guid, $reason);
+	}
+
+	/**
+	 * Unban this user.
+	 *
+	 * @return bool
+	 */
+	public function unban() {
+		return unban_user($this->guid);
+	}
+
+	/**
+	 * Is this user banned or not?
+	 *
+	 * @return bool
+	 */
+	public function isBanned() {
+		return $this->banned == 'yes';
+	}
+
+	/**
+	 * Is this user admin?
+	 *
+	 * @return bool
+	 */
+	public function isAdmin() {
+
+		// for backward compatibility we need to pull this directly
+		// from the attributes instead of using the magic methods.
+		// this can be removed in 1.9
+		// return $this->admin == 'yes';
+		return $this->attributes['admin'] == 'yes';
+	}
+
+	/**
+	 * Make the user an admin
+	 *
+	 * @return bool
+	 */
+	public function makeAdmin() {
+		// If already saved, use the standard function.
+		if ($this->guid && !make_user_admin($this->guid)) {
+			return FALSE;
+		}
+
+		// need to manually set attributes since they've already been loaded.
+		$this->attributes['admin'] = 'yes';
+
+		return TRUE;
+	}
+
+	/**
+	 * Remove the admin flag for user
+	 *
+	 * @return bool
+	 */
+	public function removeAdmin() {
+		// If already saved, use the standard function.
+		if ($this->guid && !remove_user_admin($this->guid)) {
+			return FALSE;
+		}
+
+		// need to manually set attributes since they've already been loaded.
+		$this->attributes['admin'] = 'no';
+
+		return TRUE;
+	}
+
+	/**
+	 * Get sites that this user is a member of
+	 *
+	 * @param string $subtype Optionally, the subtype of result we want to limit to
+	 * @param int    $limit   The number of results to return
+	 * @param int    $offset  Any indexing offset
+	 *
+	 * @return array
+	 */
+	function getSites($subtype = "", $limit = 10, $offset = 0) {
+		return get_user_sites($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Add this user to a particular site
+	 *
+	 * @param int $site_guid The guid of the site to add it to
+	 *
+	 * @return bool
+	 */
+	function addToSite($site_guid) {
+		return add_site_user($site_guid, $this->getGUID());
+	}
+
+	/**
+	 * Remove this user from a particular site
+	 *
+	 * @param int $site_guid The guid of the site to remove it from
+	 *
+	 * @return bool
+	 */
+	function removeFromSite($site_guid) {
+		return remove_site_user($site_guid, $this->getGUID());
+	}
+
+	/**
+	 * Adds a user as a friend
+	 *
+	 * @param int $friend_guid The GUID of the user to add
+	 *
+	 * @return bool
+	 */
+	function addFriend($friend_guid) {
+		return user_add_friend($this->getGUID(), $friend_guid);
+	}
+
+	/**
+	 * Removes a user as a friend
+	 *
+	 * @param int $friend_guid The GUID of the user to remove
+	 *
+	 * @return bool
+	 */
+	function removeFriend($friend_guid) {
+		return user_remove_friend($this->getGUID(), $friend_guid);
+	}
+
+	/**
+	 * Determines whether or not this user is a friend of the currently logged in user
+	 *
+	 * @return bool
+	 */
+	function isFriend() {
+		return $this->isFriendOf(elgg_get_logged_in_user_guid());
+	}
+
+	/**
+	 * Determines whether this user is friends with another user
+	 *
+	 * @param int $user_guid The GUID of the user to check against
+	 *
+	 * @return bool
+	 */
+	function isFriendsWith($user_guid) {
+		return user_is_friend($this->getGUID(), $user_guid);
+	}
+
+	/**
+	 * Determines whether or not this user is another user's friend
+	 *
+	 * @param int $user_guid The GUID of the user to check against
+	 *
+	 * @return bool
+	 */
+	function isFriendOf($user_guid) {
+		return user_is_friend($user_guid, $this->getGUID());
+	}
+
+	/**
+	 * Gets this user's friends
+	 *
+	 * @param string $subtype Optionally, the user subtype (leave blank for all)
+	 * @param int    $limit   The number of users to retrieve
+	 * @param int    $offset  Indexing offset, if any
+	 *
+	 * @return array|false Array of ElggUser, or false, depending on success
+	 */
+	function getFriends($subtype = "", $limit = 10, $offset = 0) {
+		return get_user_friends($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Gets users who have made this user a friend
+	 *
+	 * @param string $subtype Optionally, the user subtype (leave blank for all)
+	 * @param int    $limit   The number of users to retrieve
+	 * @param int    $offset  Indexing offset, if any
+	 *
+	 * @return array|false Array of ElggUser, or false, depending on success
+	 */
+	function getFriendsOf($subtype = "", $limit = 10, $offset = 0) {
+		return get_user_friends_of($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Lists the user's friends
+	 *
+	 * @param string $subtype Optionally, the user subtype (leave blank for all)
+	 * @param int    $limit   The number of users to retrieve
+	 * @param array  $vars    Display variables for the user view
+	 *
+	 * @return string Rendered list of friends
+	 * @since 1.8.0
+	 */
+	function listFriends($subtype = "", $limit = 10, array $vars = array()) {
+		$defaults = array(
+			'type' => 'user',
+			'relationship' => 'friend',
+			'relationship_guid' => $this->guid,
+			'limit' => $limit,
+			'full_view' => false,
+		);
+
+		$options = array_merge($defaults, $vars);
+
+		if ($subtype) {
+			$options['subtype'] = $subtype;
+		}
+
+		return elgg_list_entities_from_relationship($options);
+	}
+
+	/**
+	 * Gets the user's groups
+	 *
+	 * @param string $subtype Optionally, the subtype of user to filter to (leave blank for all)
+	 * @param int    $limit   The number of groups to retrieve
+	 * @param int    $offset  Indexing offset, if any
+	 *
+	 * @return array|false Array of ElggGroup, or false, depending on success
+	 */
+	function getGroups($subtype = "", $limit = 10, $offset = 0) {
+		$options = array(
+			'type' => 'group',
+			'relationship' => 'member',
+			'relationship_guid' => $this->guid,
+			'limit' => $limit,
+			'offset' => $offset,
+		);
+
+		if ($subtype) {
+			$options['subtype'] = $subtype;
+		}
+
+		return elgg_get_entities_from_relationship($options);
+	}
+
+	/**
+	 * Lists the user's groups
+	 *
+	 * @param string $subtype Optionally, the user subtype (leave blank for all)
+	 * @param int    $limit   The number of users to retrieve
+	 * @param int    $offset  Indexing offset, if any
+	 *
+	 * @return string
+	 */
+	function listGroups($subtype = "", $limit = 10, $offset = 0) {
+		$options = array(
+			'type' => 'group',
+			'relationship' => 'member',
+			'relationship_guid' => $this->guid,
+			'limit' => $limit,
+			'offset' => $offset,
+			'full_view' => false,
+		);
+
+		if ($subtype) {
+			$options['subtype'] = $subtype;
+		}
+
+		return elgg_list_entities_from_relationship($options);
+	}
+
+	/**
+	 * Get an array of ElggObject owned by this user.
+	 *
+	 * @param string $subtype The subtype of the objects, if any
+	 * @param int    $limit   Number of results to return
+	 * @param int    $offset  Any indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getObjects($subtype = "", $limit = 10, $offset = 0) {
+		$params = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'owner_guid' => $this->getGUID(),
+			'limit' => $limit,
+			'offset' => $offset
+		);
+		return elgg_get_entities($params);
+	}
+
+	/**
+	 * Get an array of ElggObjects owned by this user's friends.
+	 *
+	 * @param string $subtype The subtype of the objects, if any
+	 * @param int    $limit   Number of results to return
+	 * @param int    $offset  Any indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getFriendsObjects($subtype = "", $limit = 10, $offset = 0) {
+		return get_user_friends_objects($this->getGUID(), $subtype, $limit, $offset);
+	}
+
+	/**
+	 * Counts the number of ElggObjects owned by this user
+	 *
+	 * @param string $subtype The subtypes of the objects, if any
+	 *
+	 * @return int The number of ElggObjects
+	 */
+	public function countObjects($subtype = "") {
+		return count_user_objects($this->getGUID(), $subtype);
+	}
+
+	/**
+	 * Get the collections associated with a user.
+	 *
+	 * @param string $subtype Optionally, the subtype of result we want to limit to
+	 * @param int    $limit   The number of results to return
+	 * @param int    $offset  Any indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getCollections($subtype = "", $limit = 10, $offset = 0) {
+		elgg_deprecated_notice("ElggUser::getCollections() has been deprecated", 1.8);
+		return false;
+	}
+
+	/**
+	 * Get a user's owner GUID
+	 *
+	 * Returns it's own GUID if the user is not owned.
+	 *
+	 * @return int
+	 */
+	function getOwnerGUID() {
+		if ($this->owner_guid == 0) {
+			return $this->guid;
+		}
+
+		return $this->owner_guid;
+	}
+
+	/**
+	 * If a user's owner is blank, return its own GUID as the owner
+	 *
+	 * @return int User GUID
+	 * @deprecated 1.8 Use getOwnerGUID()
+	 */
+	function getOwner() {
+		elgg_deprecated_notice("ElggUser::getOwner deprecated for ElggUser::getOwnerGUID", 1.8);
+		$this->getOwnerGUID();
+	}
+
+	// EXPORTABLE INTERFACE ////////////////////////////////////////////////////////////
+
+	/**
+	 * Return an array of fields which can be exported.
+	 *
+	 * @return array
+	 */
+	public function getExportableValues() {
+		return array_merge(parent::getExportableValues(), array(
+			'name',
+			'username',
+			'language',
+		));
+	}
+
+	/**
+	 * Need to catch attempts to make a user an admin.  Remove for 1.9
+	 *
+	 * @param string $name  Name
+	 * @param mixed  $value Value
+	 *
+	 * @return bool
+	 */
+	public function __set($name, $value) {
+		if ($name == 'admin' || $name == 'siteadmin') {
+			elgg_deprecated_notice('The admin/siteadmin metadata are not longer used.  Use ElggUser->makeAdmin() and ElggUser->removeAdmin().', 1.7);
+
+			if ($value == 'yes' || $value == '1') {
+				$this->makeAdmin();
+			} else {
+				$this->removeAdmin();
+			}
+		}
+		return parent::__set($name, $value);
+	}
+
+	/**
+	 * Need to catch attempts to test user for admin.  Remove for 1.9
+	 *
+	 * @param string $name Name
+	 *
+	 * @return bool
+	 */
+	public function __get($name) {
+		if ($name == 'admin' || $name == 'siteadmin') {
+			elgg_deprecated_notice('The admin/siteadmin metadata are not longer used.  Use ElggUser->isAdmin().', 1.7);
+			return $this->isAdmin();
+		}
+
+		return parent::__get($name);
+	}
+
+	/**
+	 * Can a user comment on this user?
+	 *
+	 * @see ElggEntity::canComment()
+	 * 
+	 * @param int $user_guid User guid (default is logged in user)
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function canComment($user_guid = 0) {
+		$result = parent::canComment($user_guid);
+		if ($result !== null) {
+			return $result;
+		}
+		return false;
+	}
+}
diff --git a/engine/classes/ElggVolatileMetadataCache.php b/engine/classes/ElggVolatileMetadataCache.php
new file mode 100644
index 000000000..4acda7cee
--- /dev/null
+++ b/engine/classes/ElggVolatileMetadataCache.php
@@ -0,0 +1,355 @@
+<?php
+/**
+ * ElggVolatileMetadataCache
+ * In memory cache of known metadata values stored by entity.
+ *
+ * @package    Elgg.Core
+ * @subpackage Cache
+ *
+ * @access private
+ */
+class ElggVolatileMetadataCache {
+
+	/**
+	 * The cached values (or null for known to be empty). If the portion of the cache
+	 * is synchronized, missing values are assumed to indicate that values do not
+	 * exist in storage, otherwise, we don't know what's there.
+	 *
+	 * @var array
+	 */
+	protected $values = array();
+
+	/**
+	 * Does the cache know that it contains all names fetch-able from storage?
+	 * The keys are entity GUIDs and either the value exists (true) or it's not set.
+	 *
+	 * @var array
+	 */
+	protected $isSynchronized = array();
+
+	/**
+	 * @var null|bool
+	 */
+	protected $ignoreAccess = null;
+
+	/**
+	 * Cache metadata for an entity
+	 * 
+	 * @param int   $entity_guid The GUID of the entity
+	 * @param array $values      The metadata values to cache
+	 * @return void
+	 */
+	public function saveAll($entity_guid, array $values) {
+		if (!$this->getIgnoreAccess()) {
+			$this->values[$entity_guid] = $values;
+			$this->isSynchronized[$entity_guid] = true;
+		}
+	}
+
+	/**
+	 * Get the metadata for an entity
+	 * 
+	 * @param int $entity_guid The GUID of the entity
+	 * @return array
+	 */
+	public function loadAll($entity_guid) {
+		if (isset($this->values[$entity_guid])) {
+			return $this->values[$entity_guid];
+		} else {
+			return array();
+		}
+	}
+
+	/**
+	 * Declare that there may be fetch-able metadata names in storage that this
+	 * cache doesn't know about
+	 *
+	 * @param int $entity_guid The GUID of the entity
+	 * @return void
+	 */
+	public function markOutOfSync($entity_guid) {
+		unset($this->isSynchronized[$entity_guid]);
+	}
+
+	/**
+	 * Have all the metadata for this entity been cached?
+	 * 
+	 * @param int $entity_guid The GUID of the entity
+	 * @return bool
+	 */
+	public function isSynchronized($entity_guid) {
+		return isset($this->isSynchronized[$entity_guid]);
+	}
+
+	/**
+	 * Cache a piece of metadata
+	 * 
+	 * @param int                   $entity_guid    The GUID of the entity
+	 * @param string                $name           The metadata name
+	 * @param array|int|string|null $value          The metadata value. null means it is 
+	 *                                              known that there is no fetch-able 
+	 *                                              metadata under this name
+	 * @param bool                  $allow_multiple Can the metadata be an array
+	 * @return void
+	 */
+	public function save($entity_guid, $name, $value, $allow_multiple = false) {
+		if ($this->getIgnoreAccess()) {
+			// we don't know if what gets saves here will be available to user once
+			// access control returns, hence it's best to forget :/
+			$this->markUnknown($entity_guid, $name);
+		} else {
+			if ($allow_multiple) {
+				if ($this->isKnown($entity_guid, $name)) {
+					$existing = $this->load($entity_guid, $name);
+					if ($existing !== null) {
+						$existing = (array) $existing;
+						$existing[] = $value;
+						$value = $existing;
+					}
+				} else {
+					// we don't know whether there are unknown values, so it's
+					// safest to leave that assumption
+					$this->markUnknown($entity_guid, $name);
+					return;
+				}
+			}
+			$this->values[$entity_guid][$name] = $value;
+		}
+	}
+
+	/**
+	 * Warning: You should always call isKnown() beforehand to verify that this
+	 * function's return value should be trusted (otherwise a null return value
+	 * is ambiguous).
+	 *
+	 * @param int    $entity_guid The GUID of the entity
+	 * @param string $name        The metadata name
+	 * @return array|string|int|null null = value does not exist
+	 */
+	public function load($entity_guid, $name) {
+		if (isset($this->values[$entity_guid]) && array_key_exists($name, $this->values[$entity_guid])) {
+			return $this->values[$entity_guid][$name];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Forget about this metadata entry. We don't want to try to guess what the
+	 * next fetch from storage will return
+	 *
+	 * @param int    $entity_guid The GUID of the entity
+	 * @param string $name        The metadata name
+	 * @return void
+	 */
+	public function markUnknown($entity_guid, $name) {
+		unset($this->values[$entity_guid][$name]);
+		$this->markOutOfSync($entity_guid);
+	}
+
+	/**
+	 * If true, load() will return an accurate value for this name
+	 *
+	 * @param int    $entity_guid The GUID of the entity
+	 * @param string $name        The metadata name
+	 * @return bool
+	 */
+	public function isKnown($entity_guid, $name) {
+		if (isset($this->isSynchronized[$entity_guid])) {
+			return true;
+		} else {
+			return (isset($this->values[$entity_guid]) && array_key_exists($name, $this->values[$entity_guid]));
+		}
+
+	}
+
+	/**
+	 * Declare that metadata under this name is known to be not fetch-able from storage
+	 *
+	 * @param int    $entity_guid The GUID of the entity
+	 * @param string $name        The metadata name
+	 * @return array
+	 */
+	public function markEmpty($entity_guid, $name) {
+		$this->values[$entity_guid][$name] = null;
+	}
+
+	/**
+	 * Forget about all metadata for an entity
+	 *
+	 * @param int $entity_guid The GUID of the entity
+	 * @return void
+	 */
+	public function clear($entity_guid) {
+		$this->values[$entity_guid] = array();
+		$this->markOutOfSync($entity_guid);
+	}
+
+	/**
+	 * Clear entire cache and mark all entities as out of sync
+	 * 
+	 * @return void
+	 */
+	public function flush() {
+		$this->values = array();
+		$this->isSynchronized = array();
+	}
+
+	/**
+	 * Use this value instead of calling elgg_get_ignore_access(). By default that
+	 * function will be called.
+	 *
+	 * This setting makes this component a little more loosely-coupled.
+	 *
+	 * @param bool $ignore Whether to ignore access or not
+	 * @return void
+	 */
+	public function setIgnoreAccess($ignore) {
+		$this->ignoreAccess = (bool) $ignore;
+	}
+
+	/**
+	 * Tell the cache to call elgg_get_ignore_access() to determing access status.
+	 * 
+	 * @return void
+	 */
+	public function unsetIgnoreAccess() {
+		$this->ignoreAccess = null;
+	}
+
+	/**
+	 * Get the ignore access value
+	 * 
+	 * @return bool
+	 */
+	protected function getIgnoreAccess() {
+		if (null === $this->ignoreAccess) {
+			return elgg_get_ignore_access();
+		} else {
+			return $this->ignoreAccess;
+		}
+	}
+
+	/**
+	 * Invalidate based on options passed to the global *_metadata functions
+	 *
+	 * @param string $action  Action performed on metadata. "delete", "disable", or "enable"
+	 * @param array  $options Options passed to elgg_(delete|disable|enable)_metadata
+	 *                         "guid" if given, invalidation will be limited to this entity
+	 *                         "metadata_name" if given, invalidation will be limited to metadata with this name
+	 * @return void
+	 */
+	public function invalidateByOptions($action, array $options) {
+		// remove as little as possible, optimizing for common cases
+		if (empty($options['guid'])) {
+			// safest to clear everything unless we want to make this even more complex :(
+			$this->flush();
+		} else {
+			if (empty($options['metadata_name'])) {
+				// safest to clear the whole entity
+				$this->clear($options['guid']);
+			} else {
+				switch ($action) {
+					case 'delete':
+						$this->markEmpty($options['guid'], $options['metadata_name']);
+						break;
+					default:
+						$this->markUnknown($options['guid'], $options['metadata_name']);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Populate the cache from a set of entities
+	 * 
+	 * @param int|array $guids Array of or single GUIDs
+	 * @return void
+	 */
+	public function populateFromEntities($guids) {
+		if (empty($guids)) {
+			return;
+		}
+		if (!is_array($guids)) {
+			$guids = array($guids);
+		}
+		$guids = array_unique($guids);
+
+		// could be useful at some point in future
+		//$guids = $this->filterMetadataHeavyEntities($guids);
+
+		$db_prefix = elgg_get_config('dbprefix');
+		$options = array(
+			'guids' => $guids,
+			'limit' => 0,
+			'callback' => false,
+			'joins' => array(
+				"JOIN {$db_prefix}metastrings v ON n_table.value_id = v.id",
+				"JOIN {$db_prefix}metastrings n ON n_table.name_id = n.id",
+			),
+			'selects' => array('n.string AS name', 'v.string AS value'),
+			'order_by' => 'n_table.entity_guid, n_table.time_created ASC',
+
+			// @todo don't know why this is necessary
+			'wheres' => array(get_access_sql_suffix('n_table')),
+		);
+		$data = elgg_get_metadata($options);
+
+		// build up metadata for each entity, save when GUID changes (or data ends)
+		$last_guid = null;
+		$metadata = array();
+		$last_row_idx = count($data) - 1;
+		foreach ($data as $i => $row) {
+			$name = $row->name;
+			$value = ($row->value_type === 'text') ? $row->value : (int) $row->value;
+			$guid = $row->entity_guid;
+			if ($guid !== $last_guid) {
+				if ($last_guid) {
+					$this->saveAll($last_guid, $metadata);
+				}
+				$metadata = array();
+			}
+			if (isset($metadata[$name])) {
+				$metadata[$name] = (array) $metadata[$name];
+				$metadata[$name][] = $value;
+			} else {
+				$metadata[$name] = $value;
+			}
+			if (($i == $last_row_idx)) {
+				$this->saveAll($guid, $metadata);
+			}
+			$last_guid = $guid;
+		}
+	}
+
+	/**
+	 * Filter out entities whose concatenated metadata values (INTs casted as string)
+	 * exceed a threshold in characters. This could be used to avoid overpopulating the
+	 * cache if RAM usage becomes an issue.
+	 *
+	 * @param array $guids GUIDs of entities to examine
+	 * @param int   $limit Limit in characters of all metadata (with ints casted to strings)
+	 * @return array
+	 */
+	public function filterMetadataHeavyEntities(array $guids, $limit = 1024000) {
+		$db_prefix = elgg_get_config('dbprefix');
+
+		$options = array(
+			'guids' => $guids,
+			'limit' => 0,
+			'callback' => false,
+			'joins' => "JOIN {$db_prefix}metastrings v ON n_table.value_id = v.id",
+			'selects' => array('SUM(LENGTH(v.string)) AS bytes'),
+			'order_by' => 'n_table.entity_guid, n_table.time_created ASC',
+			'group_by' => 'n_table.entity_guid',
+		);
+		$data = elgg_get_metadata($options);
+		// don't cache if metadata for entity is over 10MB (or rolled INT)
+		foreach ($data as $row) {
+			if ($row->bytes > $limit || $row->bytes < 0) {
+				array_splice($guids, array_search($row->entity_guid, $guids), 1);
+			}
+		}
+		return $guids;
+	}
+}
diff --git a/engine/classes/ElggWidget.php b/engine/classes/ElggWidget.php
new file mode 100644
index 000000000..66191bf47
--- /dev/null
+++ b/engine/classes/ElggWidget.php
@@ -0,0 +1,245 @@
+<?php
+
+/**
+ * ElggWidget
+ *
+ * Stores metadata in private settings rather than as ElggMetadata
+ *
+ * @package    Elgg.Core
+ * @subpackage Widgets
+ *
+ * @property-read string $handler internal, do not use
+ * @property-read string $column internal, do not use
+ * @property-read string $order internal, do not use
+ * @property-read string $context internal, do not use
+ */
+class ElggWidget extends ElggObject {
+
+	/**
+	 * Set subtype to widget.
+	 *
+	 * @return void
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['subtype'] = "widget";
+	}
+
+	/**
+	 * Override entity get and sets in order to save data to private data store.
+	 *
+	 * @param string $name Name
+	 *
+	 * @return mixed
+	 */
+	public function get($name) {
+		// See if its in our base attribute
+		if (array_key_exists($name, $this->attributes)) {
+			return $this->attributes[$name];
+		}
+
+		// No, so see if its in the private data store.
+		$meta = $this->getPrivateSetting($name);
+		if ($meta) {
+			return $meta;
+		}
+
+		// Can't find it, so return null
+		return null;
+	}
+
+	/**
+	 * Override entity get and sets in order to save data to private data store.
+	 *
+	 * @param string $name  Name
+	 * @param string $value Value
+	 *
+	 * @return bool
+	 */
+	public function set($name, $value) {
+		if (array_key_exists($name, $this->attributes)) {
+			// Check that we're not trying to change the guid!
+			if ((array_key_exists('guid', $this->attributes)) && ($name == 'guid')) {
+				return false;
+			}
+
+			$this->attributes[$name] = $value;
+		} else {
+			return $this->setPrivateSetting($name, $value);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Set the widget context
+	 *
+	 * @param string $context The widget context
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function setContext($context) {
+		return $this->setPrivateSetting('context', $context);
+	}
+
+	/**
+	 * Get the widget context
+	 *
+	 * @return string
+	 * @since 1.8.0
+	 */
+	public function getContext() {
+		return $this->getPrivateSetting('context');
+	}
+
+	/**
+	 * Get the title of the widget
+	 *
+	 * @return string
+	 * @since 1.8.0
+	 */
+	public function getTitle() {
+		$title = $this->title;
+		if (!$title) {
+			global $CONFIG;
+			$title = $CONFIG->widgets->handlers[$this->handler]->name;
+		}
+		return $title;
+	}
+
+	/**
+	 * Move the widget
+	 *
+	 * @param int $column The widget column
+	 * @param int $rank   Zero-based rank from the top of the column
+	 * @return void
+	 * @since 1.8.0
+	 */
+	public function move($column, $rank) {
+		$options = array(
+			'type' => 'object',
+			'subtype' => 'widget',
+			'container_guid' => $this->container_guid,
+			'limit' => false,
+			'private_setting_name_value_pairs' => array(
+				array('name' => 'context', 'value' => $this->getContext()),
+				array('name' => 'column', 'value' => $column)
+			)
+		);
+		$widgets = elgg_get_entities_from_private_settings($options);
+		if (!$widgets) {
+			$this->column = (int)$column;
+			$this->order = 0;
+			return;
+		}
+
+		usort($widgets, create_function('$a,$b','return (int)$a->order > (int)$b->order;'));
+
+		// remove widgets from inactive plugins
+		$widget_types = elgg_get_widget_types($this->context);
+		$inactive_widgets = array();
+		foreach ($widgets as $index => $widget) {
+			if (!array_key_exists($widget->handler, $widget_types)) {
+				$inactive_widgets[] = $widget;
+				unset($widgets[$index]);
+			}
+		}
+
+		$bottom_rank = count($widgets);
+		if ($column == $this->column) {
+			$bottom_rank--;
+		}
+		
+		if ($rank == 0) {
+			// top of the column
+			$this->order = reset($widgets)->order - 10;
+		} elseif ($rank == $bottom_rank) {
+			// bottom of the column of active widgets
+			$this->order = end($widgets)->order + 10;
+		} else {
+			// reorder widgets
+
+			// remove the widget that's being moved from the array
+			foreach ($widgets as $index => $widget) {
+				if ($widget->guid == $this->guid) {
+					unset($widgets[$index]);
+				}
+			}
+
+			// split the array in two and recombine with the moved widget in middle
+			$before = array_slice($widgets, 0, $rank);
+			array_push($before, $this);
+			$after = array_slice($widgets, $rank);
+			$widgets = array_merge($before, $after);
+			ksort($widgets);
+			$order = 0;
+			foreach ($widgets as $widget) {
+				$widget->order = $order;
+				$order += 10;
+			}
+		}
+
+		// put inactive widgets at the bottom
+		if ($inactive_widgets) {
+			$bottom = 0;
+			foreach ($widgets as $widget) {
+				if ($widget->order > $bottom) {
+					$bottom = $widget->order;
+				}
+			}
+			$bottom += 10;
+			foreach ($inactive_widgets as $widget) {
+				$widget->order = $bottom;
+				$bottom += 10;
+			}
+		}
+
+		$this->column = $column;
+	}
+
+	/**
+	 * Saves the widget's settings
+	 *
+	 * Plugins can override the save mechanism using the plugin hook:
+	 * 'widget_settings', <widget handler identifier>. The widget and
+	 * the parameters are passed. The plugin hook handler should return
+	 * true to indicate that it has successfully saved the settings.
+	 *
+	 * @warning The values in the parameter array cannot be arrays
+	 *
+	 * @param array $params An array of name => value parameters
+	 *
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function saveSettings($params) {
+		if (!$this->canEdit()) {
+			return false;
+		}
+
+		// plugin hook handlers should return true to indicate the settings have
+		// been saved so that default code does not run
+		$hook_params = array(
+			'widget' => $this,
+			'params' => $params
+		);
+		if (elgg_trigger_plugin_hook('widget_settings', $this->handler, $hook_params, false) == true) {
+			return true;
+		}
+
+		if (is_array($params) && count($params) > 0) {
+			foreach ($params as $name => $value) {
+				if (is_array($value)) {
+					// private settings cannot handle arrays
+					return false;
+				} else {
+					$this->$name = $value;
+				}
+			}
+			$this->save();
+		}
+
+		return true;
+	}
+}
diff --git a/engine/classes/ElggXMLElement.php b/engine/classes/ElggXMLElement.php
new file mode 100644
index 000000000..cbd3fc5ce
--- /dev/null
+++ b/engine/classes/ElggXMLElement.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * A parser for XML that uses SimpleXMLElement
+ *
+ * @package    Elgg.Core
+ * @subpackage XML
+ */
+class ElggXMLElement {
+	/**
+	 * @var SimpleXMLElement
+	 */
+	private $_element;
+
+	/**
+	 * Creates an ElggXMLParser from a string or existing SimpleXMLElement
+	 * 
+	 * @param string|SimpleXMLElement $xml The XML to parse
+	 */
+	public function __construct($xml) {
+		if ($xml instanceof SimpleXMLElement) {
+			$this->_element = $xml;
+		} else {
+			// do not load entities
+			$disable_load_entities = libxml_disable_entity_loader(true);
+
+			$this->_element = new SimpleXMLElement($xml);
+
+			libxml_disable_entity_loader($disable_load_entities);
+		}
+	}
+
+	/**
+	 * @return string The name of the element
+	 */
+	public function getName() {
+		return $this->_element->getName();
+	}
+
+	/**
+	 * @return string[] The attributes
+	 */
+	public function getAttributes() {
+		//include namespace declarations as attributes
+		$xmlnsRaw = $this->_element->getNamespaces();
+		$xmlns = array();
+		foreach ($xmlnsRaw as $key => $val) {
+			$label = 'xmlns' . ($key ? ":$key" : $key);
+			$xmlns[$label] = $val;
+		}
+		//get attributes and merge with namespaces
+		$attrRaw = $this->_element->attributes();
+		$attr = array();
+		foreach ($attrRaw as $key => $val) {
+			$attr[$key] = $val;
+		}
+		$attr = array_merge((array) $xmlns, (array) $attr);
+		$result = array();
+		foreach ($attr as $key => $val) {
+			$result[$key] = (string) $val;
+		}
+		return $result;
+	}
+
+	/**
+	 * @return string CData
+	 */
+	public function getContent() {
+		return (string) $this->_element;
+	}
+
+	/**
+	 * @return ElggXMLElement[] Child elements
+	 */
+	public function getChildren() {
+		$children = $this->_element->children();
+		$result = array();
+		foreach ($children as $val) {
+			$result[] = new ElggXMLElement($val);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Override ->
+	 * 
+	 * @param string $name Property name
+	 * @return mixed
+	 */
+	function __get($name) {
+		switch ($name) {
+			case 'name':
+				return $this->getName();
+				break;
+			case 'attributes':
+				return $this->getAttributes();
+				break;
+			case 'content':
+				return $this->getContent();
+				break;
+			case 'children':
+				return $this->getChildren();
+				break;
+		}
+		return null;
+	}
+
+	/**
+	 * Override isset
+	 * 
+	 * @param string $name Property name
+	 * @return boolean
+	 */
+	function __isset($name) {
+		switch ($name) {
+			case 'name':
+				return $this->getName() !== null;
+				break;
+			case 'attributes':
+				return $this->getAttributes() !== null;
+				break;
+			case 'content':
+				return $this->getContent() !== null;
+				break;
+			case 'children':
+				return $this->getChildren() !== null;
+				break;
+		}
+		return false;
+	}
+}
diff --git a/engine/classes/ErrorResult.php b/engine/classes/ErrorResult.php
new file mode 100644
index 000000000..afad4c740
--- /dev/null
+++ b/engine/classes/ErrorResult.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * ErrorResult
+ * The error result class.
+ *
+ * @package    Elgg.Core
+ * @subpackage WebServicesAPI
+ */
+class ErrorResult extends GenericResult {
+	// Fail with no specific code
+	public static $RESULT_FAIL = -1 ;
+
+	public static $RESULT_FAIL_APIKEY_DISABLED = -30;
+	public static $RESULT_FAIL_APIKEY_INACTIVE = -31;
+	public static $RESULT_FAIL_APIKEY_INVALID = -32;
+
+	// Invalid, expired or missing auth token
+	public static $RESULT_FAIL_AUTHTOKEN = -20;
+
+	/**
+	 * A new error result
+	 *
+	 * @param string    $message   Message
+	 * @param int       $code      Error Code
+	 * @param Exception $exception Exception object
+	 *
+	 * @return void
+	 */
+	public function __construct($message, $code = "", Exception $exception = NULL) {
+		if ($code == "") {
+			$code = ErrorResult::$RESULT_FAIL;
+		}
+
+		if ($exception != NULL) {
+			$this->setResult($exception->__toString());
+		}
+
+		$this->setStatusCode($code, $message);
+	}
+
+	/**
+	 * Get a new instance of the ErrorResult.
+	 *
+	 * @param string    $message   Message
+	 * @param int       $code      Code
+	 * @param Exception $exception Optional exception for generating a stack trace.
+	 *
+	 * @return ErrorResult
+	 */
+	public static function getInstance($message, $code = "", Exception $exception = NULL) {
+		// Return a new error object.
+		return new ErrorResult($message, $code, $exception);
+	}
+}
diff --git a/engine/classes/ExportException.php b/engine/classes/ExportException.php
new file mode 100644
index 000000000..ae8a8e41b
--- /dev/null
+++ b/engine/classes/ExportException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Export exception
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ *
+ */
+class ExportException extends DataFormatException {}
diff --git a/engine/classes/Exportable.php b/engine/classes/Exportable.php
new file mode 100644
index 000000000..0c1ea5282
--- /dev/null
+++ b/engine/classes/Exportable.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Define an interface for all ODD exportable objects.
+ *
+ * @package    Elgg.Core
+ * @subpackage ODD
+ */
+interface Exportable {
+	/**
+	 * This must take the contents of the object and convert it to exportable ODD
+	 *
+	 * @return object or array of objects.
+	 */
+	public function export();
+
+	/**
+	 * Return a list of all fields that can be exported.
+	 * This should be used as the basis for the values returned by export()
+	 *
+	 * @return array
+	 */
+	public function getExportableValues();
+}
diff --git a/engine/classes/Friendable.php b/engine/classes/Friendable.php
new file mode 100644
index 000000000..c308b4598
--- /dev/null
+++ b/engine/classes/Friendable.php
@@ -0,0 +1,104 @@
+<?php
+/**
+ * An interface for objects that behave as elements within a social network that have a profile.
+ *
+ * @package    Elgg.Core
+ * @subpackage SocialModel.Friendable
+ */
+interface Friendable {
+	/**
+	 * Adds a user as a friend
+	 *
+	 * @param int $friend_guid The GUID of the user to add
+	 *
+	 * @return bool
+	 */
+	public function addFriend($friend_guid);
+
+	/**
+	 * Removes a user as a friend
+	 *
+	 * @param int $friend_guid The GUID of the user to remove
+	 *
+	 * @return bool
+	 */
+	public function removeFriend($friend_guid);
+
+	/**
+	 * Determines whether or not the current user is a friend of this entity
+	 *
+	 * @return bool
+	 */
+	public function isFriend();
+
+	/**
+	 * Determines whether or not this entity is friends with a particular entity
+	 *
+	 * @param int $user_guid The GUID of the entity this entity may or may not be friends with
+	 *
+	 * @return bool
+	 */
+	public function isFriendsWith($user_guid);
+
+	/**
+	 * Determines whether or not a foreign entity has made this one a friend
+	 *
+	 * @param int $user_guid The GUID of the foreign entity
+	 *
+	 * @return bool
+	 */
+	public function isFriendOf($user_guid);
+
+	/**
+	 * Returns this entity's friends
+	 *
+	 * @param string $subtype The subtype of entity to return
+	 * @param int    $limit   The number of entities to return
+	 * @param int    $offset  Indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getFriends($subtype = "", $limit = 10, $offset = 0);
+
+	/**
+	 * Returns entities that have made this entity a friend
+	 *
+	 * @param string $subtype The subtype of entity to return
+	 * @param int    $limit   The number of entities to return
+	 * @param int    $offset  Indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getFriendsOf($subtype = "", $limit = 10, $offset = 0);
+
+	/**
+	 * Returns objects in this entity's container
+	 *
+	 * @param string $subtype The subtype of entity to return
+	 * @param int    $limit   The number of entities to return
+	 * @param int    $offset  Indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getObjects($subtype = "", $limit = 10, $offset = 0);
+
+	/**
+	 * Returns objects in the containers of this entity's friends
+	 *
+	 * @param string $subtype The subtype of entity to return
+	 * @param int    $limit   The number of entities to return
+	 * @param int    $offset  Indexing offset
+	 *
+	 * @return array|false
+	 */
+	public function getFriendsObjects($subtype = "", $limit = 10, $offset = 0);
+
+	/**
+	 * Returns the number of object entities in this entity's container
+	 *
+	 * @param string $subtype The subtype of entity to count
+	 *
+	 * @return int
+	 */
+	public function countObjects($subtype = "");
+}
diff --git a/engine/classes/GenericResult.php b/engine/classes/GenericResult.php
new file mode 100644
index 000000000..e42e924d1
--- /dev/null
+++ b/engine/classes/GenericResult.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * GenericResult Result superclass.
+ *
+ * @package    Elgg.Core
+ * @subpackage WebServicesAPI
+ */
+abstract class GenericResult {
+	/**
+	 * The status of the result.
+	 * @var int
+	 */
+	private $status_code;
+
+	/**
+	 * Message returned along with the status which is almost always an error message.
+	 * This must be human readable, understandable and localised.
+	 * @var string
+	 */
+	private $message;
+
+	/**
+	 * Result store.
+	 * Attach result specific informaton here.
+	 *
+	 * @var mixed. Should probably be an object of some sort.
+	 */
+	private $result;
+
+	/**
+	 * Set a status code and optional message.
+	 *
+	 * @param int    $status  The status code.
+	 * @param string $message The message.
+	 *
+	 * @return void
+	 */
+	protected function setStatusCode($status, $message = "") {
+		$this->status_code = $status;
+		$this->message = $message;
+	}
+
+	/**
+	 * Set the result.
+	 *
+	 * @param mixed $result The result
+	 *
+	 * @return void
+	 */
+	protected function setResult($result) {
+		$this->result = $result;
+	}
+
+	/**
+	 * Return the current status code
+	 *
+	 * @return string
+	 */
+	protected function getStatusCode() {
+		return $this->status_code;
+	}
+
+	/**
+	 * Return the current status message
+	 *
+	 * @return string
+	 */
+	protected function getStatusMessage() {
+		return $this->message;
+	}
+
+	/**
+	 * Return the current result
+	 *
+	 * @return string
+	 */
+	protected function getResult() {
+		return $this->result;
+	}
+
+	/**
+	 * Serialise to a standard class.
+	 *
+	 * DEVNOTE: The API is only interested in data, we can not easily serialise
+	 * custom classes without the need for 1) the other side being PHP, 2) you need to have the class
+	 * definition installed, 3) its the right version!
+	 *
+	 * Therefore, I'm not bothering.
+	 *
+	 * Override this to include any more specific information, however api results
+	 * should be attached to the class using setResult().
+	 *
+	 * if $CONFIG->debug is set then additional information about the runtime environment and
+	 * authentication will be returned.
+	 *
+	 * @return stdClass Object containing the serialised result.
+	 */
+	public function export() {
+		global $ERRORS, $CONFIG, $_PAM_HANDLERS_MSG;
+
+		$result = new stdClass;
+
+		$result->status = $this->getStatusCode();
+		if ($this->getStatusMessage() != "") {
+			$result->message = $this->getStatusMessage();
+		}
+
+		$resultdata = $this->getResult();
+		if (isset($resultdata)) {
+			$result->result = $resultdata;
+		}
+
+		if (isset($CONFIG->debug)) {
+			if (count($ERRORS)) {
+				$result->runtime_errors = $ERRORS;
+			}
+
+			if (count($_PAM_HANDLERS_MSG)) {
+				$result->pam = $_PAM_HANDLERS_MSG;
+			}
+		}
+
+		return $result;
+	}
+}
diff --git a/engine/classes/IOException.php b/engine/classes/IOException.php
new file mode 100644
index 000000000..57403f44c
--- /dev/null
+++ b/engine/classes/IOException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * IOException
+ * An IO Exception, throw when an IO Exception occurs. Subclass for specific IO Exceptions.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class IOException extends Exception {}
diff --git a/engine/classes/ImportException.php b/engine/classes/ImportException.php
new file mode 100644
index 000000000..909c599d5
--- /dev/null
+++ b/engine/classes/ImportException.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Import exception
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class ImportException extends DataFormatException {}
diff --git a/engine/classes/Importable.php b/engine/classes/Importable.php
new file mode 100644
index 000000000..23b2ce2c8
--- /dev/null
+++ b/engine/classes/Importable.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Define an interface for all ODD importable objects.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Importable
+ */
+interface Importable {
+	/**
+	 * Accepts an array of data to import, this data is parsed from the XML produced by export.
+	 * The function should return the constructed object data, or NULL.
+	 *
+	 * @param ODD $data Data in ODD format
+	 *
+	 * @return bool
+	 * @throws ImportException if there was a critical error importing data.
+	 */
+	public function import(ODD $data);
+}
diff --git a/engine/classes/IncompleteEntityException.php b/engine/classes/IncompleteEntityException.php
new file mode 100644
index 000000000..8c86edcc6
--- /dev/null
+++ b/engine/classes/IncompleteEntityException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * IncompleteEntityException
+ * Thrown when constructing an entity that is missing its secondary entity table
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ * @access private
+ */
+class IncompleteEntityException extends Exception {}
diff --git a/engine/classes/InstallationException.php b/engine/classes/InstallationException.php
new file mode 100644
index 000000000..1dad6c1e5
--- /dev/null
+++ b/engine/classes/InstallationException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * InstallationException
+ * Thrown when there is a major problem with the installation.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class InstallationException extends ConfigurationException {}
diff --git a/engine/classes/InvalidClassException.php b/engine/classes/InvalidClassException.php
new file mode 100644
index 000000000..12f353b9a
--- /dev/null
+++ b/engine/classes/InvalidClassException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * InvalidClassException
+ * An invalid class Exception, throw when a class is invalid.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class InvalidClassException extends ClassException {}
diff --git a/engine/classes/InvalidParameterException.php b/engine/classes/InvalidParameterException.php
new file mode 100644
index 000000000..fbc9bffc9
--- /dev/null
+++ b/engine/classes/InvalidParameterException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * InvalidParameterException
+ * A parameter is invalid.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class InvalidParameterException extends CallException {}
diff --git a/engine/classes/Locatable.php b/engine/classes/Locatable.php
new file mode 100644
index 000000000..7287d9798
--- /dev/null
+++ b/engine/classes/Locatable.php
@@ -0,0 +1,49 @@
+<?php
+
+/**
+ * Define an interface for geo-tagging entities.
+ *
+ * @package    Elgg.Core
+ * @subpackage SocialModel.Locatable
+ */
+interface Locatable {
+	/**
+	 * Set a location text
+	 *
+	 * @param string $location Textual representation of location
+	 *
+	 * @return bool
+	 */
+	public function setLocation($location);
+
+	/**
+	 * Set latitude and longitude tags for a given entity.
+	 *
+	 * @param float $lat  Latitude
+	 * @param float $long Longitude
+	 *
+	 * @return bool
+	 */
+	public function setLatLong($lat, $long);
+
+	/**
+	 * Get the contents of the ->geo:lat field.
+	 *
+	 * @return int
+	 */
+	public function getLatitude();
+
+	/**
+	 * Get the contents of the ->geo:lat field.
+	 *
+	 * @return int
+	 */
+	public function getLongitude();
+
+	/**
+	 * Get the ->location metadata.
+	 *
+	 * @return string
+	 */
+	public function getLocation();
+}
diff --git a/engine/classes/Loggable.php b/engine/classes/Loggable.php
new file mode 100644
index 000000000..b9e8bf26b
--- /dev/null
+++ b/engine/classes/Loggable.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Interface that provides an interface which must be implemented by all objects wishing to be
+ * recorded in the system log (and by extension the river).
+ *
+ * This interface defines a set of methods that permit the system log functions to
+ * hook in and retrieve the necessary information and to identify what events can
+ * actually be logged.
+ *
+ * To have events involving your object to be logged simply implement this interface.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Loggable
+ */
+interface Loggable {
+	/**
+	 * Return an identification for the object for storage in the system log.
+	 * This id must be an integer.
+	 *
+	 * @return int
+	 */
+	public function getSystemLogID();
+
+	/**
+	 * Return the class name of the object.
+	 * Added as a function because get_class causes errors for some reason.
+	 *
+	 * @return string
+	 */
+	public function getClassName();
+
+	/**
+	 * Return the type of the object - eg. object, group, user, relationship, metadata, annotation etc
+	 *
+	 * @return string
+	 */
+	public function getType();
+
+	/**
+	 * Return a subtype. For metadata & annotations this is the 'name' and for relationship this is the
+	 * relationship type.
+	 *
+	 * @return string
+	 */
+	public function getSubtype();
+
+	/**
+	 * For a given ID, return the object associated with it.
+	 * This is used by the river functionality primarily.
+	 * This is useful for checking access permissions etc on objects.
+	 *
+	 * @param int $id GUID of an entity
+	 *
+	 * @return ElggEntity
+	 */
+	public function getObjectFromID($id);
+
+	/**
+	 * Return the GUID of the owner of this object.
+	 *
+	 * @return int
+	 * @deprecated 1.8 Use getOwnerGUID() instead
+	 */
+	public function getObjectOwnerGUID();
+}
diff --git a/engine/classes/LoginException.php b/engine/classes/LoginException.php
new file mode 100644
index 000000000..7546fa36f
--- /dev/null
+++ b/engine/classes/LoginException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Login Exception Stub
+ *
+ * Generic parent class for login exceptions.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions.Stub
+ */
+class LoginException extends Exception {}
diff --git a/engine/classes/NotImplementedException.php b/engine/classes/NotImplementedException.php
new file mode 100644
index 000000000..d1decf75c
--- /dev/null
+++ b/engine/classes/NotImplementedException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * NotImplementedException
+ * Thrown when a method or function has not been implemented, primarily used
+ * in development... you should not see these!
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class NotImplementedException extends CallException {}
diff --git a/engine/classes/Notable.php b/engine/classes/Notable.php
new file mode 100644
index 000000000..0c21af27d
--- /dev/null
+++ b/engine/classes/Notable.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Calendar interface for events.
+ *
+ * @package    Elgg.Core
+ * @subpackage DataModel.Notable
+ *
+ * @todo Implement or remove.
+ */
+interface Notable {
+	/**
+	 * Calendar functionality.
+	 * This function sets the time of an object on a calendar listing.
+	 *
+	 * @param int $hour     If ommitted, now is assumed.
+	 * @param int $minute   If ommitted, now is assumed.
+	 * @param int $second   If ommitted, now is assumed.
+	 * @param int $day      If ommitted, now is assumed.
+	 * @param int $month    If ommitted, now is assumed.
+	 * @param int $year     If ommitted, now is assumed.
+	 * @param int $duration Duration of event, remainder of the day is assumed.
+	 *
+	 * @return bool
+	 */
+	public function setCalendarTimeAndDuration($hour = NULL, $minute = NULL, $second = NULL,
+		$day = NULL, $month = NULL, $year = NULL, $duration = NULL);
+
+	/**
+	 * Return the start timestamp.
+	 *
+	 * @return int
+	 */
+	public function getCalendarStartTime();
+
+	/**
+	 * Return the end timestamp.
+	 *
+	 * @return int
+	 */
+	public function getCalendarEndTime();
+}
diff --git a/engine/classes/NotificationException.php b/engine/classes/NotificationException.php
new file mode 100644
index 000000000..71c742f17
--- /dev/null
+++ b/engine/classes/NotificationException.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Notification exception.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class NotificationException extends Exception {}
diff --git a/engine/classes/ODD.php b/engine/classes/ODD.php
new file mode 100644
index 000000000..fa5b616fc
--- /dev/null
+++ b/engine/classes/ODD.php
@@ -0,0 +1,131 @@
+<?php
+/**
+ * Open Data Definition (ODD) superclass.
+ *
+ * @package    Elgg.Core
+ * @subpackage ODD
+ */
+abstract class ODD {
+	/**
+	 * Attributes.
+	 */
+	private $attributes = array();
+
+	/**
+	 * Optional body.
+	 */
+	private $body;
+
+	/**
+	 * Construct an ODD document with initial values.
+	 */
+	public function __construct() {
+		$this->body = "";
+	}
+
+	/**
+	 * Returns an array of attributes
+	 *
+	 * @return array
+	 */
+	public function getAttributes() {
+		return $this->attributes;
+	}
+
+	/**
+	 * Sets an attribute
+	 *
+	 * @param string $key   Name
+	 * @param mixed  $value Value
+	 *
+	 * @return void
+	 */
+	public function setAttribute($key, $value) {
+		$this->attributes[$key] = $value;
+	}
+
+	/**
+	 * Returns an attribute
+	 *
+	 * @param string $key Name
+	 *
+	 * @return mixed
+	 */
+	public function getAttribute($key) {
+		if (isset($this->attributes[$key])) {
+			return $this->attributes[$key];
+		}
+
+		return NULL;
+	}
+
+	/**
+	 * Sets the body of the ODD.
+	 *
+	 * @param mixed $value Value
+	 *
+	 * @return void
+	 */
+	public function setBody($value) {
+		$this->body = $value;
+	}
+
+	/**
+	 * Gets the body of the ODD.
+	 *
+	 * @return mixed
+	 */
+	public function getBody() {
+		return $this->body;
+	}
+
+	/**
+	 * Set the published time.
+	 *
+	 * @param int $time Unix timestamp
+	 *
+	 * @return void
+	 */
+	public function setPublished($time) {
+		$this->attributes['published'] = date("r", $time);
+	}
+
+	/**
+	 * Return the published time as a unix timestamp.
+	 *
+	 * @return int or false on failure.
+	 */
+	public function getPublishedAsTime() {
+		return strtotime($this->attributes['published']);
+	}
+
+	/**
+	 * For serialisation, implement to return a string name of the tag eg "header" or "metadata".
+	 *
+	 * @return string
+	 */
+	abstract protected function getTagName();
+
+	/**
+	 * Magic function to generate valid ODD XML for this item.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		// Construct attributes
+		$attr = "";
+		foreach ($this->attributes as $k => $v) {
+			$attr .= ($v != "") ? "$k=\"$v\" " : "";
+		}
+
+		$body = $this->getBody();
+		$tag = $this->getTagName();
+
+		$end = "/>";
+		if ($body != "") {
+			$end = "><![CDATA[$body]]></{$tag}>";
+		}
+
+		return "<{$tag} $attr" . $end . "\n";
+	}
+}
diff --git a/engine/classes/ODDDocument.php b/engine/classes/ODDDocument.php
new file mode 100644
index 000000000..540c35a3b
--- /dev/null
+++ b/engine/classes/ODDDocument.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * This class is used during import and export to construct.
+ *
+ * @package    Elgg.Core
+ * @subpackage ODD
+ */
+class ODDDocument implements Iterator {
+	/**
+	 * ODD Version
+	 *
+	 * @var string
+	 */
+	private $ODDSupportedVersion = "1.0";
+
+	/**
+	 * Elements of the document.
+	 */
+	private $elements;
+
+	/**
+	 * Optional wrapper factory.
+	 */
+	private $wrapperfactory;
+
+	/**
+	 * Create a new ODD Document.
+	 *
+	 * @param array $elements Elements to add
+	 *
+	 * @return void
+	 */
+	public function __construct(array $elements = NULL) {
+		if ($elements) {
+			if (is_array($elements)) {
+				$this->elements = $elements;
+			} else {
+				$this->addElement($elements);
+			}
+		} else {
+			$this->elements = array();
+		}
+	}
+
+	/**
+	 * Return the version of ODD being used.
+	 *
+	 * @return string
+	 */
+	public function getVersion() {
+		return $this->ODDSupportedVersion;
+	}
+
+	/**
+	 * Returns the number of elements
+	 *
+	 * @return int
+	 */
+	public function getNumElements() {
+		return count($this->elements);
+	}
+
+	/**
+	 * Add an element
+	 *
+	 * @param ODD $element An ODD element
+	 *
+	 * @return void
+	 */
+	public function addElement(ODD $element) {
+		if (!is_array($this->elements)) {
+			$this->elements = array();
+		}
+		$this->elements[] = $element;
+	}
+
+	/**
+	 * Add multiple elements at once
+	 *
+	 * @param array $elements Array of ODD elements
+	 *
+	 * @return void
+	 */
+	public function addElements(array $elements) {
+		foreach ($elements as $element) {
+			$this->addElement($element);
+		}
+	}
+
+	/**
+	 * Return all elements
+	 *
+	 * @return array
+	 */
+	public function getElements() {
+		return $this->elements;
+	}
+
+	/**
+	 * Set an optional wrapper factory to optionally embed the ODD document in another format.
+	 *
+	 * @param ODDWrapperFactory $factory The factory
+	 *
+	 * @return void
+	 */
+	public function setWrapperFactory(ODDWrapperFactory $factory) {
+		$this->wrapperfactory = $factory;
+	}
+
+	/**
+	 * Magic function to generate valid ODD XML for this item.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		$xml = "";
+
+		if ($this->wrapperfactory) {
+			// A wrapper has been provided
+			$wrapper = $this->wrapperfactory->getElementWrapper($this); // Get the wrapper for this element
+
+			$xml = $wrapper->wrap($this); // Wrap this element (and subelements)
+		} else {
+			// Output begin tag
+			$generated = date("r");
+			$xml .= "<odd version=\"{$this->ODDSupportedVersion}\" generated=\"$generated\">\n";
+
+			// Get XML for elements
+			foreach ($this->elements as $element) {
+				$xml .= "$element";
+			}
+
+			// Output end tag
+			$xml .= "</odd>\n";
+		}
+
+		return $xml;
+	}
+
+	// ITERATOR INTERFACE //////////////////////////////////////////////////////////////
+	/*
+	 * This lets an entity's attributes be displayed using foreach as a normal array.
+	 * Example: http://www.sitepoint.com/print/php5-standard-library
+	 */
+
+	private $valid = FALSE;
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::rewind()
+	 *
+	 * @return void
+	 */
+	function rewind() {
+		$this->valid = (FALSE !== reset($this->elements));
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::current()
+	 *
+	 * @return void
+	 */
+	function current() {
+		return current($this->elements);
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::key()
+	 *
+	 * @return void
+	 */
+	function key() {
+		return key($this->elements);
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::next()
+	 *
+	 * @return void
+	 */
+	function next() {
+		$this->valid = (FALSE !== next($this->elements));
+	}
+
+	/**
+	 * Iterator interface
+	 *
+	 * @see Iterator::valid()
+	 *
+	 * @return void
+	 */
+	function valid() {
+		return $this->valid;
+	}
+}
diff --git a/engine/classes/ODDEntity.php b/engine/classes/ODDEntity.php
new file mode 100644
index 000000000..e9bb5da6a
--- /dev/null
+++ b/engine/classes/ODDEntity.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * ODD Entity class.
+ *
+ * @package    Elgg.Core
+ * @subpackage ODD
+ */
+class ODDEntity extends ODD {
+
+	/**
+	 * New ODD Entity
+	 *
+	 * @param string $uuid     A universally unique ID
+	 * @param string $class    Class
+	 * @param string $subclass Subclass
+	 */
+	function __construct($uuid, $class, $subclass = "") {
+		parent::__construct();
+
+		$this->setAttribute('uuid', $uuid);
+		$this->setAttribute('class', $class);
+		$this->setAttribute('subclass', $subclass);
+	}
+
+	/**
+	 * Returns entity.
+	 *
+	 * @return 'entity'
+	 */
+	protected function getTagName() {
+		return "entity";
+	}
+}
diff --git a/engine/classes/ODDMetaData.php b/engine/classes/ODDMetaData.php
new file mode 100644
index 000000000..09b653582
--- /dev/null
+++ b/engine/classes/ODDMetaData.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * ODD Metadata class.
+ *
+ * @package    Elgg.Core
+ * @subpackage ODD
+ */
+class ODDMetaData extends ODD {
+
+	/**
+	 * New ODD metadata
+	 *
+	 * @param string $uuid        Unique ID
+	 * @param string $entity_uuid Another unique ID
+	 * @param string $name        Name
+	 * @param string $value       Value
+	 * @param string $type        Type
+	 * @param string $owner_uuid  Owner ID
+	 */
+	function __construct($uuid, $entity_uuid, $name, $value, $type = "", $owner_uuid = "") {
+		parent::__construct();
+
+		$this->setAttribute('uuid', $uuid);
+		$this->setAttribute('entity_uuid', $entity_uuid);
+		$this->setAttribute('name', $name);
+		$this->setAttribute('type', $type);
+		$this->setAttribute('owner_uuid', $owner_uuid);
+		$this->setBody($value);
+	}
+
+	/**
+	 * Returns 'metadata'
+	 *
+	 * @return string 'metadata'
+	 */
+	protected function getTagName() {
+		return "metadata";
+	}
+}
diff --git a/engine/classes/ODDRelationship.php b/engine/classes/ODDRelationship.php
new file mode 100644
index 000000000..8b1fe217b
--- /dev/null
+++ b/engine/classes/ODDRelationship.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ODD Relationship class.
+ *
+ * @package    Elgg
+ * @subpackage Core
+ */
+class ODDRelationship extends ODD {
+
+	/**
+	 * New ODD Relationship
+	 *
+	 * @param string $uuid1 First UUID
+	 * @param string $type  Type of telationship
+	 * @param string $uuid2 Second UUId
+	 */
+	function __construct($uuid1, $type, $uuid2) {
+		parent::__construct();
+
+		$this->setAttribute('uuid1', $uuid1);
+		$this->setAttribute('type', $type);
+		$this->setAttribute('uuid2', $uuid2);
+	}
+
+	/**
+	 * Returns 'relationship'
+	 *
+	 * @return string 'relationship'
+	 */
+	protected function getTagName() {
+		return "relationship";
+	}
+}
diff --git a/engine/classes/PluginException.php b/engine/classes/PluginException.php
new file mode 100644
index 000000000..a74303695
--- /dev/null
+++ b/engine/classes/PluginException.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * PluginException
+ *
+ * A plugin Exception, thrown when an Exception occurs relating to the plugin mechanism.
+ * Subclass for specific plugin Exceptions.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class PluginException extends Exception {}
diff --git a/engine/classes/RegistrationException.php b/engine/classes/RegistrationException.php
new file mode 100644
index 000000000..5246efc25
--- /dev/null
+++ b/engine/classes/RegistrationException.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * RegistrationException
+ * Could not register a new user for whatever reason.
+ *
+ * @package    Elgg.Core
+ * @subpackage Exceptions
+ */
+class RegistrationException extends InstallationException {}
diff --git a/engine/classes/SecurityException.php b/engine/classes/SecurityException.php
new file mode 100644
index 000000000..3b6382f9e
--- /dev/null
+++ b/engine/classes/SecurityException.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * SecurityException
+ * An Security Exception, throw when a Security Exception occurs. Subclass for
+ * specific Security Execeptions (access problems etc)
+ *
+ * @package    Elgg.Core
+ * @subpackage Exception
+ */
+class SecurityException extends Exception {}
diff --git a/engine/classes/SuccessResult.php b/engine/classes/SuccessResult.php
new file mode 100644
index 000000000..ab5468ad8
--- /dev/null
+++ b/engine/classes/SuccessResult.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * SuccessResult
+ * Generic success result class, extend if you want to do something special.
+ *
+ * @package    Elgg.Core
+ * @subpackage WebServicesAPI
+ */
+class SuccessResult extends GenericResult {
+	// Do not change this from 0
+	public static $RESULT_SUCCESS = 0;
+
+	/**
+	 * A new success result
+	 *
+	 * @param string $result The result
+	 */
+	public function __construct($result) {
+		$this->setResult($result);
+		$this->setStatusCode(SuccessResult::$RESULT_SUCCESS);
+	}
+
+	/**
+	 * Returns a new instance of this class
+	 *
+	 * @param unknown $result A result of some kind?
+	 *
+	 * @return SuccessResult
+	 */
+	public static function getInstance($result) {
+		// Return a new error object.
+		return new SuccessResult($result);
+	}
+}
diff --git a/engine/classes/XMLRPCArrayParameter.php b/engine/classes/XMLRPCArrayParameter.php
new file mode 100644
index 000000000..a8edccba7
--- /dev/null
+++ b/engine/classes/XMLRPCArrayParameter.php
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * An array containing other XMLRPCParameter objects.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ *
+ */
+class XMLRPCArrayParameter extends XMLRPCParameter
+{
+	/**
+	 * Construct an array.
+	 *
+	 * @param array $parameters Optional array of parameters, if not provided
+	 * then addField must be used.
+	 */
+	function __construct($parameters = NULL) {
+		parent::__construct();
+
+		if (is_array($parameters)) {
+			foreach ($parameters as $v) {
+				$this->addField($v);
+			}
+		}
+	}
+
+	/**
+	 * Add a field to the container.
+	 *
+	 * @param XMLRPCParameter $value The value.
+	 *
+	 * @return void
+	 */
+	public function addField(XMLRPCParameter $value) {
+		if (!is_array($this->value)) {
+			$this->value = array();
+		}
+
+		$this->value[] = $value;
+	}
+
+	/**
+	 * Converts XML array to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		$params = "";
+		foreach ($this->value as $value) {
+			$params .= "$value";
+		}
+
+		return "<array><data>$params</data></array>";
+	}
+}
diff --git a/engine/classes/XMLRPCBase64Parameter.php b/engine/classes/XMLRPCBase64Parameter.php
new file mode 100644
index 000000000..7db0a761c
--- /dev/null
+++ b/engine/classes/XMLRPCBase64Parameter.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * A base 64 encoded blob of binary.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCBase64Parameter extends XMLRPCParameter {
+	/**
+	 * Construct a base64 encoded block
+	 *
+	 * @param string $blob Unencoded binary blob
+	 */
+	function __construct($blob) {
+		parent::__construct();
+
+		$this->value = base64_encode($blob);
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		return "<value><base64>{$value}</base64></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCBoolParameter.php b/engine/classes/XMLRPCBoolParameter.php
new file mode 100644
index 000000000..607841cb8
--- /dev/null
+++ b/engine/classes/XMLRPCBoolParameter.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * A boolean.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCBoolParameter extends XMLRPCParameter {
+
+	/**
+	 * New bool parameter
+	 *
+	 * @param bool $value Value
+	 */
+	function __construct($value) {
+		parent::__construct();
+
+		$this->value = (bool)$value;
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		$code = ($this->value) ? "1" : "0";
+		return "<value><boolean>{$code}</boolean></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCCall.php b/engine/classes/XMLRPCCall.php
new file mode 100644
index 000000000..fd28f1e3e
--- /dev/null
+++ b/engine/classes/XMLRPCCall.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * An XMLRPC call
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCCall {
+	/** Method name */
+	private $methodname;
+
+	/** Parameters */
+	private $params;
+
+	/**
+	 * Construct a new XML RPC Call
+	 *
+	 * @param string $xml XML
+	 */
+	function __construct($xml) {
+		$this->parse($xml);
+	}
+
+	/**
+	 * Return the method name associated with the call.
+	 *
+	 * @return string
+	 */
+	public function getMethodName() { return $this->methodname; }
+
+	/**
+	 * Return the parameters.
+	 * Returns a nested array of XmlElement.
+	 *
+	 * @see XmlElement
+	 * @return array
+	 */
+	public function getParameters() { return $this->params; }
+
+	/**
+	 * Parse the xml into its components according to spec.
+	 * This first version is a little primitive.
+	 *
+	 * @param string $xml XML
+	 *
+	 * @return void
+	 */
+	private function parse($xml) {
+		$xml = xml_to_object($xml);
+
+		// sanity check
+		if ((isset($xml->name)) && (strcasecmp($xml->name, "methodCall") != 0)) {
+			throw new CallException(elgg_echo('CallException:NotRPCCall'));
+		}
+
+		// method name
+		$this->methodname = $xml->children[0]->content;
+
+		// parameters
+		$this->params = $xml->children[1]->children;
+	}
+}
diff --git a/engine/classes/XMLRPCDateParameter.php b/engine/classes/XMLRPCDateParameter.php
new file mode 100644
index 000000000..93bbbd8f5
--- /dev/null
+++ b/engine/classes/XMLRPCDateParameter.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * An ISO8601 data and time.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCDateParameter extends XMLRPCParameter {
+	/**
+	 * Construct a date
+	 *
+	 * @param int $timestamp The unix timestamp, or blank for "now".
+	 */
+	function __construct($timestamp = 0) {
+		parent::__construct();
+
+		$this->value = $timestamp;
+
+		if (!$timestamp) {
+			$this->value = time();
+		}
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		$value = date('c', $this->value);
+		return "<value><dateTime.iso8601>{$value}</dateTime.iso8601></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCDoubleParameter.php b/engine/classes/XMLRPCDoubleParameter.php
new file mode 100644
index 000000000..b7834650e
--- /dev/null
+++ b/engine/classes/XMLRPCDoubleParameter.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * A double precision signed floating point number.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCDoubleParameter extends XMLRPCParameter {
+
+	/**
+	 * New XML Double
+	 *
+	 * @param int $value Value
+	 */
+	function __construct($value) {
+		parent::__construct();
+
+		$this->value = (float)$value;
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		return "<value><double>{$this->value}</double></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCErrorResponse.php b/engine/classes/XMLRPCErrorResponse.php
new file mode 100644
index 000000000..425c075cc
--- /dev/null
+++ b/engine/classes/XMLRPCErrorResponse.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * XMLRPC Error Response
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCErrorResponse extends XMLRPCResponse {
+	/**
+	 * Set the error response and error code.
+	 *
+	 * @param string $message The message
+	 * @param int    $code    Error code (default = system error as defined by
+	 *                        http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php)
+	 */
+	function __construct($message, $code = -32400) {
+		$this->addParameter(
+			new XMLRPCStructParameter(
+				array (
+					'faultCode' => new XMLRPCIntParameter($code),
+					'faultString' => new XMLRPCStringParameter($message)
+				)
+			)
+		);
+	}
+
+	/**
+	 * Output to XML.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		return "<methodResponse><fault><value>{$this->parameters[0]}</value></fault></methodResponse>";
+	}
+}
diff --git a/engine/classes/XMLRPCIntParameter.php b/engine/classes/XMLRPCIntParameter.php
new file mode 100644
index 000000000..0fc146165
--- /dev/null
+++ b/engine/classes/XMLRPCIntParameter.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * An Integer.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCIntParameter extends XMLRPCParameter {
+
+	/**
+	 * A new XML int
+	 *
+	 * @param int $value Value
+	 */
+	function __construct($value) {
+		parent::__construct();
+
+		$this->value = (int)$value;
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		return "<value><i4>{$this->value}</i4></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCParameter.php b/engine/classes/XMLRPCParameter.php
new file mode 100644
index 000000000..ffbad8082
--- /dev/null
+++ b/engine/classes/XMLRPCParameter.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Superclass for all RPC parameters.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+abstract class XMLRPCParameter {
+	protected $value;
+
+	/**
+	 * Set initial values
+	 */
+	function __construct() { }
+
+}
diff --git a/engine/classes/XMLRPCResponse.php b/engine/classes/XMLRPCResponse.php
new file mode 100644
index 000000000..a6256d385
--- /dev/null
+++ b/engine/classes/XMLRPCResponse.php
@@ -0,0 +1,71 @@
+<?php
+
+/**
+ * XML-RPC Response.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+abstract class XMLRPCResponse {
+	/** An array of parameters */
+	protected $parameters = array();
+
+	/**
+	 * Add a parameter here.
+	 *
+	 * @param XMLRPCParameter $param The parameter.
+	 *
+	 * @return void
+	 */
+	public function addParameter(XMLRPCParameter $param) {
+		if (!is_array($this->parameters)) {
+			$this->parameters = array();
+		}
+
+		$this->parameters[] = $param;
+	}
+
+	/**
+	 * Add an integer
+	 *
+	 * @param int $value Value
+	 *
+	 * @return void
+	 */
+	public function addInt($value) {
+		$this->addParameter(new XMLRPCIntParameter($value));
+	}
+
+	/**
+	 * Add a string
+	 *
+	 * @param string $value Value
+	 *
+	 * @return void
+	 */
+	public function addString($value) {
+		$this->addParameter(new XMLRPCStringParameter($value));
+	}
+
+	/**
+	 * Add a double
+	 *
+	 * @param int $value Value
+	 *
+	 * @return void
+	 */
+	public function addDouble($value) {
+		$this->addParameter(new XMLRPCDoubleParameter($value));
+	}
+
+	/**
+	 * Add a boolean
+	 *
+	 * @param bool $value Value
+	 *
+	 * @return void
+	 */
+	public function addBoolean($value) {
+		$this->addParameter(new XMLRPCBoolParameter($value));
+	}
+}
diff --git a/engine/classes/XMLRPCStringParameter.php b/engine/classes/XMLRPCStringParameter.php
new file mode 100644
index 000000000..35b28214b
--- /dev/null
+++ b/engine/classes/XMLRPCStringParameter.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * A string.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCStringParameter extends XMLRPCParameter {
+
+	/**
+	 * A new XML string
+	 *
+	 * @param string $value Value
+	 */
+	function __construct($value) {
+		parent::__construct();
+
+		$this->value = $value;
+	}
+
+	/**
+	 * Convert to XML string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		$value = htmlentities($this->value);
+		return "<value><string>{$value}</string></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCStructParameter.php b/engine/classes/XMLRPCStructParameter.php
new file mode 100644
index 000000000..694ddf5df
--- /dev/null
+++ b/engine/classes/XMLRPCStructParameter.php
@@ -0,0 +1,55 @@
+<?php
+
+/**
+ * A structure containing other XMLRPCParameter objects.
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCStructParameter extends XMLRPCParameter {
+	/**
+	 * Construct a struct.
+	 *
+	 * @param array $parameters Optional associated array of parameters, if
+	 * not provided then addField must be used.
+	 */
+	function __construct($parameters = NULL) {
+		parent::__construct();
+
+		if (is_array($parameters)) {
+			foreach ($parameters as $k => $v) {
+				$this->addField($k, $v);
+			}
+		}
+	}
+
+	/**
+	 * Add a field to the container.
+	 *
+	 * @param string          $name  The name of the field.
+	 * @param XMLRPCParameter $value The value.
+	 *
+	 * @return void
+	 */
+	public function addField($name, XMLRPCParameter $value) {
+		if (!is_array($this->value)) {
+			$this->value = array();
+		}
+
+		$this->value[$name] = $value;
+	}
+
+	/**
+	 * Convert to string
+	 *
+	 * @return string
+	 */
+	function __toString() {
+		$params = "";
+		foreach ($this->value as $k => $v) {
+			$params .= "<member><name>$k</name>$v</member>";
+		}
+
+		return "<value><struct>$params</struct></value>";
+	}
+}
diff --git a/engine/classes/XMLRPCSuccessResponse.php b/engine/classes/XMLRPCSuccessResponse.php
new file mode 100644
index 000000000..e02e82c5c
--- /dev/null
+++ b/engine/classes/XMLRPCSuccessResponse.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Success Response
+ *
+ * @package    Elgg.Core
+ * @subpackage XMLRPC
+ */
+class XMLRPCSuccessResponse extends XMLRPCResponse {
+	/**
+	 * Output to XML.
+	 *
+	 * @return string
+	 */
+	public function __toString() {
+		$params = "";
+		foreach ($this->parameters as $param) {
+			$params .= "<param>$param</param>\n";
+		}
+
+		return "<methodResponse><params>$params</params></methodResponse>";
+	}
+}
diff --git a/engine/classes/XmlElement.php b/engine/classes/XmlElement.php
new file mode 100644
index 000000000..280bba664
--- /dev/null
+++ b/engine/classes/XmlElement.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * A class representing an XML element for import.
+ *
+ * @package    Elgg.Core
+ * @subpackage XML
+ */
+class XmlElement {
+	/** The name of the element */
+	public $name;
+
+	/** The attributes */
+	public $attributes;
+
+	/** CData */
+	public $content;
+
+	/** Child elements */
+	public $children;
+};
diff --git a/engine/handlers/action_handler.php b/engine/handlers/action_handler.php
new file mode 100644
index 000000000..bcad110b2
--- /dev/null
+++ b/engine/handlers/action_handler.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Action handler.
+ *
+ * This file dispatches actions.  It is called via a URL rewrite in .htaccess
+ * from http://site/action/.  Anything after 'action/' is considered the action
+ * and will be passed to {@link action()}.
+ *
+ * @warning This sets the input named 'action' to the current action.  When calling
+ * an action, get_input('action') will always return the action name.
+ *
+ * @package Elgg.Core
+ * @subpackage Actions
+ * @link http://docs.elgg.org/Tutorials/Actions
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+$action = get_input("action");
+action($action);
diff --git a/engine/handlers/cache_handler.php b/engine/handlers/cache_handler.php
new file mode 100644
index 000000000..36fc665bb
--- /dev/null
+++ b/engine/handlers/cache_handler.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Cache handler.
+ *
+ * External access to cached CSS and JavaScript views. The cached file URLS
+ * should be of the form: cache/<type>/<viewtype>/<name/of/view>.<unique_id>.<type> where
+ * type is either css or js, view is the name of the cached view, and
+ * unique_id is an identifier that is updated every time the cache is flushed.
+ * The simplest way to maintain a unique identifier is to use the lastcache
+ * variable in Elgg's config object.
+ *
+ * @see elgg_register_simplecache_view()
+ *
+ * @package Elgg.Core
+ * @subpackage Cache
+ */
+
+// Get dataroot
+require_once(dirname(dirname(__FILE__)) . '/settings.php');
+$mysql_dblink = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, true);
+if (!$mysql_dblink) {
+	echo 'Cache error: unable to connect to database server';
+	exit;
+}
+
+if (!mysql_select_db($CONFIG->dbname, $mysql_dblink)) {
+	echo 'Cache error: unable to connect to Elgg database';
+	exit;
+}
+
+$query = "select name, value from {$CONFIG->dbprefix}datalists
+		where name in ('dataroot', 'simplecache_enabled')";
+
+$result = mysql_query($query, $mysql_dblink);
+if (!$result) {
+	echo 'Cache error: unable to get the data root';
+	exit;
+}
+while ($row = mysql_fetch_object($result)) {
+	${$row->name} = $row->value;
+}
+mysql_free_result($result);
+
+
+$dirty_request = $_GET['request'];
+// only alphanumeric characters plus /, ., and _ and no '..'
+$filter = array("options" => array("regexp" => "/^(\.?[_a-zA-Z0-9\/]+)+$/"));
+$request = filter_var($dirty_request, FILTER_VALIDATE_REGEXP, $filter);
+if (!$request || !$simplecache_enabled) {
+	echo 'Cache error: bad request';
+	exit;
+}
+
+// testing showed regex to be marginally faster than array / string functions over 100000 reps
+// it won't make a difference in real life and regex is easier to read.
+// <type>/<viewtype>/<name/of/view.and.dots>.<ts>.<type>
+$regex = '|([^/]+)/([^/]+)/(.+)\.([^\.]+)\.([^.]+)$|';
+preg_match($regex, $request, $matches);
+
+$type = $matches[1];
+$viewtype = $matches[2];
+$view = $matches[3];
+$ts = $matches[4];
+
+// If is the same ETag, content didn't changed.
+$etag = $ts;
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && trim($_SERVER['HTTP_IF_NONE_MATCH']) == "\"$etag\"") {
+	header("HTTP/1.1 304 Not Modified");
+	exit;
+}
+
+switch ($type) {
+	case 'css':
+		header("Content-type: text/css", true);
+		$view = "css/$view";
+		break;
+	case 'js':
+		header('Content-type: text/javascript', true);
+		$view = "js/$view";
+		break;
+}
+
+header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+6 months")), true);
+header("Pragma: public", true);
+header("Cache-Control: public", true);
+header("ETag: \"$etag\"");
+
+$filename = $dataroot . 'views_simplecache/' . md5($viewtype . $view);
+
+if (file_exists($filename)) {
+	readfile($filename);
+} else {
+	// someone trying to access a non-cached file or a race condition with cache flushing
+	mysql_close($mysql_dblink);
+	require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+	global $CONFIG;
+	if (!in_array($view, $CONFIG->views->simplecache)) {
+		header("HTTP/1.1 404 Not Found");
+		exit;
+	}
+
+	elgg_set_viewtype($viewtype);
+	echo elgg_view($view);
+}
diff --git a/engine/handlers/export_handler.php b/engine/handlers/export_handler.php
new file mode 100644
index 000000000..aa5214c23
--- /dev/null
+++ b/engine/handlers/export_handler.php
@@ -0,0 +1,118 @@
+<?php
+/**
+ * Export handler.
+ *
+ * @package Elgg.Core
+ * @subpackage Export
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+
+// Get input values, these will be mapped via modrewrite
+$guid = get_input("guid"); // guid of the entity
+
+// For attributes eg http://example.com/odd/73/attr/owner_uuid/
+// or http://example.com/odd/73/metadata/86/
+$type = get_input("type"); // attr, metadata, annotation, relationship
+$id_or_name = get_input("idname"); // Either a number or the key name (if attribute)
+
+$body = "";
+$title = "";
+
+// Only export the GUID
+if (($guid != "") && ($type == "") && ($id_or_name == "")) {
+	$entity = get_entity($guid);
+
+	if (!$entity) {
+		$query = elgg_echo('InvalidParameterException:GUIDNotFound', array($guid));
+		throw new InvalidParameterException($query);
+	}
+
+	$title = "GUID:$guid";
+	$body = elgg_view("export/entity", array("entity" => $entity, "uuid" => guid_to_uuid($guid)));
+
+	// Export an individual attribute
+} else if (($guid != "") && ($type != "") && ($id_or_name != "")) {
+	// Get a uuid
+	$entity = get_entity($guid);
+	if (!$entity) {
+		$msg = elgg_echo('InvalidParameterException:GUIDNotFound', array($guid));
+		throw new InvalidParameterException($msg);
+	}
+
+	$uuid = guid_to_uuid($entity->getGUID()) . "$type/$id_or_name/";
+
+	switch ($type) {
+		case 'attr' : // @todo: Do this better? - This is a bit of a hack...
+			$v = $entity->get($id_or_name);
+			if (!$v) {
+				$msg = elgg_echo('InvalidParameterException:IdNotExistForGUID', array($id_or_name, $guid));
+				throw new InvalidParameterException($msg);
+			}
+
+			$m = new ElggMetadata();
+
+			$m->value = $v;
+			$m->name = $id_or_name;
+			$m->entity_guid = $guid;
+			$m->time_created = $entity->time_created;
+			$m->time_updated = $entity->time_updated;
+			$m->owner_guid = $entity->owner_guid;
+			$m->id = $id_or_name;
+			$m->type = "attr";
+			break;
+		case 'metadata' :
+			$m = elgg_get_metadata_from_id($id_or_name);
+			break;
+		case 'annotation' :
+			$m = elgg_get_annotation_from_id($id_or_name);
+			break;
+		case 'relationship' :
+			$r = get_relationship($id_or_name);
+			break;
+		case 'volatile' :
+			$m = elgg_trigger_plugin_hook('volatile', 'metadata', array(
+				'guid' => $guid,
+				'varname' => $id_or_name,
+			));
+			break;
+
+		default :
+			$msg = elgg_echo('InvalidParameterException:CanNotExportType', array($type));
+			throw new InvalidParameterException($msg);
+	}
+
+	// Render metadata or relationship
+	if ((!$m) && (!$r)) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:NoDataFound'));
+	}
+
+	// Exporting metadata?
+	if ($m) {
+		if ($m->entity_guid != $entity->guid) {
+			throw new InvalidParameterException(elgg_echo('InvalidParameterException:DoesNotBelong'));
+		}
+
+		$title = "$type:$id_or_name";
+		$body = elgg_view("export/metadata", array("metadata" => $m, "uuid" => $uuid));
+	}
+
+	// Exporting relationship
+	if ($r) {
+		if (($r->guid_one != $entity->guid) && ($r->guid_two != $entity->guid)) {
+			throw new InvalidParameterException(elgg_echo('InvalidParameterException:DoesNotBelongOrRefer'));
+		}
+
+		$title = "$type:$id_or_name";
+		$body = elgg_view("export/relationship", array("relationship" => $r, "uuid" => $uuid));
+	}
+
+	// Something went wrong
+} else {
+	throw new InvalidParameterException(elgg_echo('InvalidParameterException:MissingParameter'));
+}
+
+$content = elgg_view_title($title) . $body;
+$body = elgg_view_layout('one_sidebar', array('content' => $content));
+echo elgg_view_page($title, $body);
diff --git a/engine/handlers/page_handler.php b/engine/handlers/page_handler.php
new file mode 100644
index 000000000..1ed295b7d
--- /dev/null
+++ b/engine/handlers/page_handler.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Pages handler.
+ *
+ * This file dispatches pages.  It is called via a URL rewrite in .htaccess
+ * from http://site/handler/page1/page2.  The first element after site/ is
+ * the page handler name as registered by {@link elgg_register_page_handler()}.
+ * The rest of the string is sent to {@link page_handler()}.
+ * 
+ * Note that the following handler names are reserved by elgg and should not be
+ * registered by any plugins:
+ *  * action
+ *  * cache
+ *  * services
+ *  * export
+ *  * mt
+ *  * xml-rpc.php
+ *  * rewrite.php
+ *  * tag (deprecated, reserved for backwards compatibility)
+ *  * pg (deprecated, reserved for backwards compatibility)
+ *
+ * {@link page_handler()} explodes the pages string by / and sends it to
+ * the page handler function as registered by {@link elgg_register_page_handler()}.
+ * If a valid page handler isn't found, plugins have a chance to provide a 404.
+ *
+ * @package Elgg.Core
+ * @subpackage PageHandler
+ * @link http://docs.elgg.org/Tutorials/PageHandlers
+ */
+
+
+// Permanent redirect to pg-less urls
+$url = $_SERVER['REQUEST_URI'];
+$new_url = preg_replace('#/pg/#', '/', $url, 1);
+
+if ($url !== $new_url) {
+	header("HTTP/1.1 301 Moved Permanently"); 
+	header("Location: $new_url"); 
+}
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+$handler = get_input('handler');
+$page = get_input('page');
+
+if (!page_handler($handler, $page)) {
+	forward('', '404');
+}
diff --git a/engine/handlers/service_handler.php b/engine/handlers/service_handler.php
new file mode 100644
index 000000000..9cfcd230f
--- /dev/null
+++ b/engine/handlers/service_handler.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Services handler.
+ *
+ * This file dispatches requests to web services.  It is called via a URL rewrite
+ * in .htaccess from http://site/services/api/handler/response_format/request.
+ * The first element after 'services/api/' is the service handler name as
+ * registered by {@link register_service_handler()}.
+ *
+ * The remaining string is then passed to the {@link service_handler()}
+ * which explodes by /, extracts the first element as the response format
+ * (viewtype), and then passes the remaining array to the service handler
+ * function registered by {@link register_service_handler()}.
+ *
+ * If a service handler isn't found, a 404 header is sent.
+ *
+ * @package Elgg.Core
+ * @subpackage WebServices
+ * @link http://docs.elgg.org/Tutorials/WebServices
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+$handler = get_input('handler');
+$request = get_input('request');
+
+service_handler($handler, $request);
diff --git a/engine/handlers/xml-rpc_handler.php b/engine/handlers/xml-rpc_handler.php
new file mode 100644
index 000000000..2ee29e5b7
--- /dev/null
+++ b/engine/handlers/xml-rpc_handler.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * XML-RPC handler.
+ *
+ * @warning This is very old code. Does it work at all?
+ *
+ * @package Elgg.Core
+ * @subpackage XMLRPC
+ * @link http://docs.elgg.org/Tutorials/XMLRPC
+ * @todo Does this work?
+ */
+
+require_once(dirname(dirname(__FILE__)) . "/start.php");
+
+// Register the error handler
+error_reporting(E_ALL);
+set_error_handler('_php_xmlrpc_error_handler');
+
+// Register a default exception handler
+set_exception_handler('_php_xmlrpc_exception_handler');
+
+// Set some defaults
+$result = null;
+set_input('view', 'xml'); // Set default view regardless
+
+// Get the post data
+$input = get_post_data();
+
+if ($input) {
+	// 	Parse structures from xml
+	$call = new XMLRPCCall($input);
+
+	// Process call
+	$result = trigger_xmlrpc_handler($call);
+} else {
+	throw new CallException(elgg_echo('xmlrpc:noinputdata'));
+}
+
+if (!($result instanceof XMLRPCResponse)) {
+	throw new APIException(elgg_echo('APIException:ApiResultUnknown'));
+}
+
+// Output result
+echo elgg_view_page("XML-RPC", elgg_view("xml-rpc/output", array('result' => $result)));
diff --git a/engine/lib/access.php b/engine/lib/access.php
new file mode 100644
index 000000000..de0693ea8
--- /dev/null
+++ b/engine/lib/access.php
@@ -0,0 +1,1078 @@
+<?php
+/**
+ * Functions for Elgg's access system for entities, metadata, and annotations.
+ *
+ * Access is generally saved in the database as access_id.  This corresponds to
+ * one of the ACCESS_* constants defined in {@link elgglib.php} or the ID of an
+ * access collection.
+ *
+ * @package Elgg.Core
+ * @subpackage Access
+ * @link http://docs.elgg.org/Access
+ */
+
+/**
+ * Return an ElggCache static variable cache for the access caches
+ *
+ * @staticvar ElggStaticVariableCache $access_cache
+ * @return \ElggStaticVariableCache
+ * @access private
+ */
+function _elgg_get_access_cache() {
+	/**
+	 * A default filestore cache using the dataroot.
+	 */
+	static $access_cache;
+
+	if (!$access_cache) {
+		$access_cache = new ElggStaticVariableCache('access');
+	}
+
+	return $access_cache;
+}
+
+/**
+ * Return a string of access_ids for $user_id appropriate for inserting into an SQL IN clause.
+ *
+ * @uses get_access_array
+ *
+ * @link http://docs.elgg.org/Access
+ * @see get_access_array()
+ *
+ * @param int  $user_id User ID; defaults to currently logged in user
+ * @param int  $site_id Site ID; defaults to current site
+ * @param bool $flush   If set to true, will refresh the access list from the
+ *                      database rather than using this function's cache.
+ *
+ * @return string A list of access collections suitable for using in an SQL call
+ * @access private
+ */
+function get_access_list($user_id = 0, $site_id = 0, $flush = false) {
+	global $CONFIG, $init_finished;
+	$cache = _elgg_get_access_cache();
+	
+	if ($flush) {
+		$cache->clear();
+	}
+
+	if ($user_id == 0) {
+		$user_id = elgg_get_logged_in_user_guid();
+	}
+
+	if (($site_id == 0) && (isset($CONFIG->site_id))) {
+		$site_id = $CONFIG->site_id;
+	}
+	$user_id = (int) $user_id;
+	$site_id = (int) $site_id;
+
+	$hash = $user_id . $site_id . 'get_access_list';
+
+	if ($cache[$hash]) {
+		return $cache[$hash];
+	}
+	
+	$access_array = get_access_array($user_id, $site_id, $flush);
+	$access = "(" . implode(",", $access_array) . ")";
+
+	if ($init_finished) {
+		$cache[$hash] = $access;
+	}
+	
+	return $access;
+}
+
+/**
+ * Returns an array of access IDs a user is permitted to see.
+ *
+ * Can be overridden with the 'access:collections:read', 'user' plugin hook.
+ *
+ * This returns a list of all the collection ids a user owns or belongs
+ * to plus public and logged in access levels. If the user is an admin, it includes
+ * the private access level.
+ *
+ * @internal this is only used in core for creating the SQL where clause when
+ * retrieving content from the database. The friends access level is handled by
+ * get_access_sql_suffix().
+ *
+ * @see get_write_access_array() for the access levels that a user can write to.
+ *
+ * @param int  $user_id User ID; defaults to currently logged in user
+ * @param int  $site_id Site ID; defaults to current site
+ * @param bool $flush   If set to true, will refresh the access ids from the
+ *                      database rather than using this function's cache.
+ *
+ * @return array An array of access collections ids
+ */
+function get_access_array($user_id = 0, $site_id = 0, $flush = false) {
+	global $CONFIG, $init_finished;
+
+	$cache = _elgg_get_access_cache();
+
+	if ($flush) {
+		$cache->clear();
+	}
+
+	if ($user_id == 0) {
+		$user_id = elgg_get_logged_in_user_guid();
+	}
+
+	if (($site_id == 0) && (isset($CONFIG->site_guid))) {
+		$site_id = $CONFIG->site_guid;
+	}
+
+	$user_id = (int) $user_id;
+	$site_id = (int) $site_id;
+
+	$hash = $user_id . $site_id . 'get_access_array';
+
+	if ($cache[$hash]) {
+		$access_array = $cache[$hash];
+	} else {
+		$access_array = array(ACCESS_PUBLIC);
+
+		// The following can only return sensible data if the user is logged in.
+		if (elgg_is_logged_in()) {
+			$access_array[] = ACCESS_LOGGED_IN;
+
+			// Get ACL memberships
+			$query = "SELECT am.access_collection_id"
+				. " FROM {$CONFIG->dbprefix}access_collection_membership am"
+				. " LEFT JOIN {$CONFIG->dbprefix}access_collections ag ON ag.id = am.access_collection_id"
+				. " WHERE am.user_guid = $user_id AND (ag.site_guid = $site_id OR ag.site_guid = 0)";
+
+			$collections = get_data($query);
+			if ($collections) {
+				foreach ($collections as $collection) {
+					if (!empty($collection->access_collection_id)) {
+						$access_array[] = (int)$collection->access_collection_id;
+					}
+				}
+			}
+
+			// Get ACLs owned.
+			$query = "SELECT ag.id FROM {$CONFIG->dbprefix}access_collections ag ";
+			$query .= "WHERE ag.owner_guid = $user_id AND (ag.site_guid = $site_id OR ag.site_guid = 0)";
+
+			$collections = get_data($query);
+			if ($collections) {
+				foreach ($collections as $collection) {
+					if (!empty($collection->id)) {
+						$access_array[] = (int)$collection->id;
+					}
+				}
+			}
+
+			$ignore_access = elgg_check_access_overrides($user_id);
+
+			if ($ignore_access == true) {
+				$access_array[] = ACCESS_PRIVATE;
+			}
+		}
+
+		if ($init_finished) {
+			$cache[$hash] = $access_array;
+		}
+	}
+
+	$options = array(
+		'user_id' => $user_id,
+		'site_id' => $site_id
+	);
+	
+	return elgg_trigger_plugin_hook('access:collections:read', 'user', $options, $access_array);
+}
+
+/**
+ * Gets the default access permission.
+ *
+ * This returns the default access level for the site or optionally for the user.
+ *
+ * @param ElggUser $user Get the user's default access. Defaults to logged in user.
+ *
+ * @return int default access id (see ACCESS defines in elgglib.php)
+ * @link http://docs.elgg.org/Access
+ */
+function get_default_access(ElggUser $user = null) {
+	global $CONFIG;
+
+	if (!$CONFIG->allow_user_default_access) {
+		return $CONFIG->default_access;
+	}
+
+	if (!($user) && (!$user = elgg_get_logged_in_user_entity())) {
+		return $CONFIG->default_access;
+	}
+
+	if (false !== ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
+		return $default_access;
+	} else {
+		return $CONFIG->default_access;
+	}
+}
+
+/**
+ * Allow disabled entities and metadata to be returned by getter functions
+ *
+ * @todo Replace this with query object!
+ * @global bool $ENTITY_SHOW_HIDDEN_OVERRIDE
+ * @access private
+ */
+$ENTITY_SHOW_HIDDEN_OVERRIDE = false;
+
+/**
+ * Show or hide disabled entities.
+ *
+ * @param bool $show_hidden Show disabled entities.
+ * @return void
+ * @access private
+ */
+function access_show_hidden_entities($show_hidden) {
+	global $ENTITY_SHOW_HIDDEN_OVERRIDE;
+	$ENTITY_SHOW_HIDDEN_OVERRIDE = $show_hidden;
+}
+
+/**
+ * Return current status of showing disabled entities.
+ *
+ * @return bool
+ * @access private
+ */
+function access_get_show_hidden_status() {
+	global $ENTITY_SHOW_HIDDEN_OVERRIDE;
+	return $ENTITY_SHOW_HIDDEN_OVERRIDE;
+}
+
+/**
+ * Returns the SQL where clause for a table with a access_id and enabled columns.
+ *
+ * This handles returning where clauses for ACCESS_FRIENDS and the currently
+ * unused block and filter lists in addition to using get_access_list() for
+ * access collections and the standard access levels.
+ *
+ * @param string $table_prefix Optional table. prefix for the access code.
+ * @param int    $owner        The guid to check access for. Defaults to logged in user.
+ *
+ * @return string The SQL for a where clause
+ * @access private
+ */
+function get_access_sql_suffix($table_prefix = '', $owner = null) {
+	global $ENTITY_SHOW_HIDDEN_OVERRIDE, $CONFIG;
+
+	$sql = "";
+	$friends_bit = "";
+	$enemies_bit = "";
+
+	if ($table_prefix) {
+		$table_prefix = sanitise_string($table_prefix) . ".";
+	}
+
+	if (!isset($owner)) {
+		$owner = elgg_get_logged_in_user_guid();
+	}
+
+	if (!$owner) {
+		$owner = -1;
+	}
+
+	$ignore_access = elgg_check_access_overrides($owner);
+	$access = get_access_list($owner);
+
+	if ($ignore_access) {
+		$sql = " (1 = 1) ";
+	} else if ($owner != -1) {
+		// we have an entity's guid and auto check for friend relationships
+		$friends_bit = "{$table_prefix}access_id = " . ACCESS_FRIENDS . "
+			AND {$table_prefix}owner_guid IN (
+				SELECT guid_one FROM {$CONFIG->dbprefix}entity_relationships
+				WHERE relationship='friend' AND guid_two=$owner
+			)";
+
+		$friends_bit = '(' . $friends_bit . ') OR ';
+
+		// @todo untested and unsupported at present
+		if ((isset($CONFIG->user_block_and_filter_enabled)) && ($CONFIG->user_block_and_filter_enabled)) {
+			// check to see if the user is in the entity owner's block list
+			// or if the entity owner is in the user's filter list
+			// if so, disallow access
+			$enemies_bit = get_access_restriction_sql('elgg_block_list', "{$table_prefix}owner_guid", $owner, false);
+			$enemies_bit = '('
+				. $enemies_bit
+				. '	AND ' . get_access_restriction_sql('elgg_filter_list', $owner, "{$table_prefix}owner_guid", false)
+			. ')';
+		}
+	}
+
+	if (empty($sql)) {
+		$sql = " $friends_bit ({$table_prefix}access_id IN {$access}
+			OR ({$table_prefix}owner_guid = {$owner})
+			OR (
+				{$table_prefix}access_id = " . ACCESS_PRIVATE . "
+				AND {$table_prefix}owner_guid = $owner
+			)
+		)";
+	}
+
+	if ($enemies_bit) {
+		$sql = "$enemies_bit AND ($sql)";
+	}
+
+	if (!$ENTITY_SHOW_HIDDEN_OVERRIDE) {
+		$sql .= " and {$table_prefix}enabled='yes'";
+	}
+
+	return '(' . $sql . ')';
+}
+
+/**
+ * Get the where clause for an access restriction based on annotations
+ *
+ * Returns an SQL fragment that is true (or optionally false) if the given user has
+ * added an annotation with the given name to the given entity.
+ *
+ * @warning this is a private function for an untested capability and will likely
+ * be removed from a future version of Elgg.
+ *
+ * @param string  $annotation_name Name of the annotation
+ * @param string  $entity_guid     SQL GUID of entity the annotation is attached to.
+ * @param string  $owner_guid      SQL string that evaluates to the GUID of the annotation owner
+ * @param boolean $exists          If true, returns BOOL if the annotation exists
+ *
+ * @return string An SQL fragment suitable for inserting into a WHERE clause
+ * @access private
+ */
+function get_access_restriction_sql($annotation_name, $entity_guid, $owner_guid, $exists) {
+	global $CONFIG;
+
+	if ($exists) {
+		$not = '';
+	} else {
+		$not = 'NOT';
+	}
+
+	$sql = <<<END
+$not EXISTS (SELECT * FROM {$CONFIG->dbprefix}annotations a
+INNER JOIN {$CONFIG->dbprefix}metastrings ms ON (a.name_id = ms.id)
+WHERE ms.string = '$annotation_name'
+AND a.entity_guid = $entity_guid
+AND a.owner_guid = $owner_guid)
+END;
+	return $sql;
+}
+
+/**
+ * Can a user access an entity.
+ *
+ * @warning If a logged in user doesn't have access to an entity, the
+ * core engine will not load that entity.
+ *
+ * @tip This is mostly useful for checking if a user other than the logged in
+ * user has access to an entity that is currently loaded.
+ *
+ * @todo This function would be much more useful if we could pass the guid of the
+ * entity to test access for. We need to be able to tell whether the entity exists
+ * and whether the user has access to the entity.
+ *
+ * @param ElggEntity $entity The entity to check access for.
+ * @param ElggUser   $user   Optionally user to check access for. Defaults to
+ *                           logged in user (which is a useless default).
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Access
+ */
+function has_access_to_entity($entity, $user = null) {
+	global $CONFIG;
+
+	if (!isset($user)) {
+		$access_bit = get_access_sql_suffix("e");
+	} else {
+		$access_bit = get_access_sql_suffix("e", $user->getGUID());
+	}
+
+	$query = "SELECT guid from {$CONFIG->dbprefix}entities e WHERE e.guid = " . $entity->getGUID();
+	// Add access controls
+	$query .= " AND " . $access_bit;
+	if (get_data($query)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Returns an array of access permissions that the user is allowed to save content with.
+ * Permissions returned are of the form (id => 'name').
+ *
+ * Example return value in English:
+ * array(
+ *     0 => 'Private',
+ *    -2 => 'Friends',
+ *     1 => 'Logged in users',
+ *     2 => 'Public',
+ *    34 => 'My favorite friends',
+ * );
+ *
+ * Plugin hook of 'access:collections:write', 'user'
+ *
+ * @warning this only returns access collections that the user owns plus the
+ * standard access levels. It does not return access collections that the user
+ * belongs to such as the access collection for a group.
+ *
+ * @param int  $user_id The user's GUID.
+ * @param int  $site_id The current site.
+ * @param bool $flush   If this is set to true, this will ignore a cached access array
+ *
+ * @return array List of access permissions
+ * @link http://docs.elgg.org/Access
+ */
+function get_write_access_array($user_id = 0, $site_id = 0, $flush = false) {
+	global $CONFIG, $init_finished;
+	$cache = _elgg_get_access_cache();
+
+	if ($flush) {
+		$cache->clear();
+	}
+
+	if ($user_id == 0) {
+		$user_id = elgg_get_logged_in_user_guid();
+	}
+
+	if (($site_id == 0) && (isset($CONFIG->site_id))) {
+		$site_id = $CONFIG->site_id;
+	}
+
+	$user_id = (int) $user_id;
+	$site_id = (int) $site_id;
+
+	$hash = $user_id . $site_id . 'get_write_access_array';
+
+	if ($cache[$hash]) {
+		$access_array = $cache[$hash];
+	} else {
+		// @todo is there such a thing as public write access?
+		$access_array = array(
+			ACCESS_PRIVATE => elgg_echo("PRIVATE"),
+			ACCESS_FRIENDS => elgg_echo("access:friends:label"),
+			ACCESS_LOGGED_IN => elgg_echo("LOGGED_IN"),
+			ACCESS_PUBLIC => elgg_echo("PUBLIC")
+		);
+		
+		$query = "SELECT ag.* FROM {$CONFIG->dbprefix}access_collections ag ";
+		$query .= " WHERE (ag.site_guid = $site_id OR ag.site_guid = 0)";
+		$query .= " AND (ag.owner_guid = $user_id)";
+
+		$collections = get_data($query);
+		if ($collections) {
+			foreach ($collections as $collection) {
+				$access_array[$collection->id] = $collection->name;
+			}
+		}
+
+		if ($init_finished) {
+			$cache[$hash] = $access_array;
+		}
+	}
+
+	$options = array(
+		'user_id' => $user_id,
+		'site_id' => $site_id
+	);
+	return elgg_trigger_plugin_hook('access:collections:write', 'user',
+		$options, $access_array);
+}
+
+/**
+ * Can the user change this access collection?
+ *
+ * Use the plugin hook of 'access:collections:write', 'user' to change this.
+ * @see get_write_access_array() for details on the hook.
+ *
+ * Respects access control disabling for admin users and {@see elgg_set_ignore_access()}
+ *
+ * @see get_write_access_array()
+ *
+ * @param int   $collection_id The collection id
+ * @param mixed $user_guid     The user GUID to check for. Defaults to logged in user.
+ * @return bool
+ */
+function can_edit_access_collection($collection_id, $user_guid = null) {
+	if ($user_guid) {
+		$user = get_entity((int) $user_guid);
+	} else {
+		$user = elgg_get_logged_in_user_entity();
+	}
+
+	$collection = get_access_collection($collection_id);
+
+	if (!($user instanceof ElggUser) || !$collection) {
+		return false;
+	}
+
+	$write_access = get_write_access_array($user->getGUID(), 0, true);
+
+	// don't ignore access when checking users.
+	if ($user_guid) {
+		return array_key_exists($collection_id, $write_access);
+	} else {
+		return elgg_get_ignore_access() || array_key_exists($collection_id, $write_access);
+	}
+}
+
+/**
+ * Creates a new access collection.
+ *
+ * Access colletions allow plugins and users to create granular access
+ * for entities.
+ *
+ * Triggers plugin hook 'access:collections:addcollection', 'collection'
+ *
+ * @internal Access collections are stored in the access_collections table.
+ * Memberships to collections are in access_collections_membership.
+ *
+ * @param string $name       The name of the collection.
+ * @param int    $owner_guid The GUID of the owner (default: currently logged in user).
+ * @param int    $site_guid  The GUID of the site (default: current site).
+ *
+ * @return int|false The collection ID if successful and false on failure.
+ * @link http://docs.elgg.org/Access/Collections
+ * @see update_access_collection()
+ * @see delete_access_collection()
+ */
+function create_access_collection($name, $owner_guid = 0, $site_guid = 0) {
+	global $CONFIG;
+
+	$name = trim($name);
+	if (empty($name)) {
+		return false;
+	}
+
+	if ($owner_guid == 0) {
+		$owner_guid = elgg_get_logged_in_user_guid();
+	}
+	if (($site_guid == 0) && (isset($CONFIG->site_guid))) {
+		$site_guid = $CONFIG->site_guid;
+	}
+	$name = sanitise_string($name);
+
+	$q = "INSERT INTO {$CONFIG->dbprefix}access_collections
+		SET name = '{$name}',
+			owner_guid = {$owner_guid},
+			site_guid = {$site_guid}";
+	$id = insert_data($q);
+	if (!$id) {
+		return false;
+	}
+
+	$params = array(
+		'collection_id' => $id
+	);
+
+	if (!elgg_trigger_plugin_hook('access:collections:addcollection', 'collection', $params, true)) {
+		return false;
+	}
+
+	return $id;
+}
+
+/**
+ * Updates the membership in an access collection.
+ *
+ * @warning Expects a full list of all members that should
+ * be part of the access collection
+ *
+ * @note This will run all hooks associated with adding or removing
+ * members to access collections.
+ *
+ * @param int   $collection_id The ID of the collection.
+ * @param array $members       Array of member GUIDs
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Access/Collections
+ * @see add_user_to_access_collection()
+ * @see remove_user_from_access_collection()
+ */
+function update_access_collection($collection_id, $members) {
+	$acl = get_access_collection($collection_id);
+
+	if (!$acl) {
+		return false;
+	}
+	$members = (is_array($members)) ? $members : array();
+
+	$cur_members = get_members_of_access_collection($collection_id, true);
+	$cur_members = (is_array($cur_members)) ? $cur_members : array();
+
+	$remove_members = array_diff($cur_members, $members);
+	$add_members = array_diff($members, $cur_members);
+
+	$result = true;
+
+	foreach ($add_members as $guid) {
+		$result = $result && add_user_to_access_collection($guid, $collection_id);
+	}
+
+	foreach ($remove_members as $guid) {
+		$result = $result && remove_user_from_access_collection($guid, $collection_id);
+	}
+
+	return $result;
+}
+
+/**
+ * Deletes a specified access collection and its membership.
+ *
+ * @param int $collection_id The collection ID
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Access/Collections
+ * @see create_access_collection()
+ * @see update_access_collection()
+ */
+function delete_access_collection($collection_id) {
+	global $CONFIG;
+
+	$collection_id = (int) $collection_id;
+	$params = array('collection_id' => $collection_id);
+
+	if (!elgg_trigger_plugin_hook('access:collections:deletecollection', 'collection', $params, true)) {
+		return false;
+	}
+
+	// Deleting membership doesn't affect result of deleting ACL.
+	$q = "DELETE FROM {$CONFIG->dbprefix}access_collection_membership
+		WHERE access_collection_id = {$collection_id}";
+	delete_data($q);
+
+	$q = "DELETE FROM {$CONFIG->dbprefix}access_collections
+		WHERE id = {$collection_id}";
+	$result = delete_data($q);
+
+	return (bool)$result;
+}
+
+/**
+ * Get a specified access collection
+ *
+ * @note This doesn't return the members of an access collection,
+ * just the database row of the actual collection.
+ *
+ * @see get_members_of_access_collection()
+ *
+ * @param int $collection_id The collection ID
+ *
+ * @return object|false
+ */
+function get_access_collection($collection_id) {
+	global $CONFIG;
+	$collection_id = (int) $collection_id;
+
+	$query = "SELECT * FROM {$CONFIG->dbprefix}access_collections WHERE id = {$collection_id}";
+	$get_collection = get_data_row($query);
+
+	return $get_collection;
+}
+
+/**
+ * Adds a user to an access collection.
+ *
+ * Triggers the 'access:collections:add_user', 'collection' plugin hook.
+ *
+ * @param int $user_guid     The GUID of the user to add
+ * @param int $collection_id The ID of the collection to add them to
+ *
+ * @return bool
+ * @see update_access_collection()
+ * @see remove_user_from_access_collection()
+ * @link http://docs.elgg.org/Access/Collections
+ */
+function add_user_to_access_collection($user_guid, $collection_id) {
+	global $CONFIG;
+
+	$collection_id = (int) $collection_id;
+	$user_guid = (int) $user_guid;
+	$user = get_user($user_guid);
+
+	$collection = get_access_collection($collection_id);
+
+	if (!($user instanceof Elgguser) || !$collection) {
+		return false;
+	}
+
+	$params = array(
+		'collection_id' => $collection_id,
+		'user_guid' => $user_guid
+	);
+
+	$result = elgg_trigger_plugin_hook('access:collections:add_user', 'collection', $params, true);
+	if ($result == false) {
+		return false;
+	}
+
+	// if someone tries to insert the same data twice, we do a no-op on duplicate key
+	$q = "INSERT INTO {$CONFIG->dbprefix}access_collection_membership
+			SET access_collection_id = $collection_id, user_guid = $user_guid
+			ON DUPLICATE KEY UPDATE user_guid = user_guid";
+	$result = insert_data($q);
+
+	return $result !== false;
+}
+
+/**
+ * Removes a user from an access collection.
+ *
+ * Triggers the 'access:collections:remove_user', 'collection' plugin hook.
+ *
+ * @param int $user_guid     The user GUID
+ * @param int $collection_id The access collection ID
+ *
+ * @return bool
+ * @see update_access_collection()
+ * @see remove_user_from_access_collection()
+ * @link http://docs.elgg.org/Access/Collections
+ */
+function remove_user_from_access_collection($user_guid, $collection_id) {
+	global $CONFIG;
+
+	$collection_id = (int) $collection_id;
+	$user_guid = (int) $user_guid;
+	$user = get_user($user_guid);
+
+	$collection = get_access_collection($collection_id);
+
+	if (!($user instanceof Elgguser) || !$collection) {
+		return false;
+	}
+
+	$params = array(
+		'collection_id' => $collection_id,
+		'user_guid' => $user_guid
+	);
+
+	if (!elgg_trigger_plugin_hook('access:collections:remove_user', 'collection', $params, true)) {
+		return false;
+	}
+
+	$q = "DELETE FROM {$CONFIG->dbprefix}access_collection_membership
+		WHERE access_collection_id = {$collection_id}
+			AND user_guid = {$user_guid}";
+
+	return (bool)delete_data($q);
+}
+
+/**
+ * Returns an array of database row objects of the access collections owned by $owner_guid.
+ *
+ * @param int $owner_guid The entity guid
+ * @param int $site_guid  The GUID of the site (default: current site).
+ *
+ * @return array|false
+ * @see add_access_collection()
+ * @see get_members_of_access_collection()
+ * @link http://docs.elgg.org/Access/Collections
+ */
+function get_user_access_collections($owner_guid, $site_guid = 0) {
+	global $CONFIG;
+	$owner_guid = (int) $owner_guid;
+	$site_guid = (int) $site_guid;
+
+	if (($site_guid == 0) && (isset($CONFIG->site_guid))) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	$query = "SELECT * FROM {$CONFIG->dbprefix}access_collections
+			WHERE owner_guid = {$owner_guid}
+			AND site_guid = {$site_guid}";
+
+	$collections = get_data($query);
+
+	return $collections;
+}
+
+/**
+ * Get all of members of an access collection
+ *
+ * @param int  $collection The collection's ID
+ * @param bool $idonly     If set to true, will only return the members' GUIDs (default: false)
+ *
+ * @return array ElggUser guids or entities if successful, false if not
+ * @see add_user_to_access_collection()
+ * @see http://docs.elgg.org/Access/Collections
+ */
+function get_members_of_access_collection($collection, $idonly = FALSE) {
+	global $CONFIG;
+	$collection = (int)$collection;
+
+	if (!$idonly) {
+		$query = "SELECT e.* FROM {$CONFIG->dbprefix}access_collection_membership m"
+			. " JOIN {$CONFIG->dbprefix}entities e ON e.guid = m.user_guid"
+			. " WHERE m.access_collection_id = {$collection}";
+		$collection_members = get_data($query, "entity_row_to_elggstar");
+	} else {
+		$query = "SELECT e.guid FROM {$CONFIG->dbprefix}access_collection_membership m"
+			. " JOIN {$CONFIG->dbprefix}entities e ON e.guid = m.user_guid"
+			. " WHERE m.access_collection_id = {$collection}";
+		$collection_members = get_data($query);
+		if (!$collection_members) {
+			return FALSE;
+		}
+		foreach ($collection_members as $key => $val) {
+			$collection_members[$key] = $val->guid;
+		}
+	}
+
+	return $collection_members;
+}
+
+/**
+ * Return entities based upon access id.
+ *
+ * @param array $options Any options accepted by {@link elgg_get_entities()} and
+ * 	access_id => int The access ID of the entity.
+ *
+ * @see elgg_get_entities()
+ * @return mixed If count, int. If not count, array. false on errors.
+ * @since 1.7.0
+ */
+function elgg_get_entities_from_access_id(array $options = array()) {
+	// restrict the resultset to access collection provided
+	if (!isset($options['access_id'])) {
+		return FALSE;
+	}
+
+	// @todo add support for an array of collection_ids
+	$where = "e.access_id = '{$options['access_id']}'";
+	if (isset($options['wheres'])) {
+		if (is_array($options['wheres'])) {
+			$options['wheres'][] = $where;
+		} else {
+			$options['wheres'] = array($options['wheres'], $where);
+		}
+	} else {
+		$options['wheres'] = array($where);
+	}
+
+	// return entities with the desired options
+	return elgg_get_entities($options);
+}
+
+/**
+ * Lists entities from an access collection
+ *
+ * @param array $options See elgg_list_entities() and elgg_get_entities_from_access_id()
+ * 
+ * @see elgg_list_entities()
+ * @see elgg_get_entities_from_access_id()
+ * 
+ * @return string
+ */
+function elgg_list_entities_from_access_id(array $options = array()) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_access_id');
+}
+
+/**
+ * Return the name of an ACCESS_* constant or a access collection,
+ * but only if the user has write access on that ACL.
+ *
+ * @warning This function probably doesn't work how it's meant to.
+ *
+ * @param int $entity_access_id The entity's access id
+ *
+ * @return string 'Public', 'Private', etc.
+ * @since 1.7.0
+ * @todo I think this probably wants get_access_array() instead of get_write_access_array(),
+ * but those two functions return different types of arrays.
+ */
+function get_readable_access_level($entity_access_id) {
+	$access = (int) $entity_access_id;
+
+	//get the access level for object in readable string
+	$options = get_write_access_array();
+
+	if (array_key_exists($access, $options)) {
+		return $options[$access];
+	}
+
+	// return 'Limited' if the user does not have access to the access collection
+	return elgg_echo('access:limited:label');
+}
+
+/**
+ * Set if entity access system should be ignored.
+ *
+ * The access system will not return entities in any getter
+ * functions if the user doesn't have access.
+ *
+ * @internal For performance reasons this is done at the database access clause level.
+ *
+ * @tip Use this to access entities in automated scripts
+ * when no user is logged in.
+ *
+ * @note This clears the access cache.
+ *
+ * @warning This will not show disabled entities.
+ * Use {@link access_show_hidden_entities()} to access disabled entities.
+ *
+ * @param bool $ignore If true, disables all access checks.
+ *
+ * @return bool Previous ignore_access setting.
+ * @since 1.7.0
+ * @see http://docs.elgg.org/Access/IgnoreAccess
+ * @see elgg_get_ignore_access()
+ */
+function elgg_set_ignore_access($ignore = true) {
+	$cache = _elgg_get_access_cache();
+	$cache->clear();
+	$elgg_access = elgg_get_access_object();
+	return $elgg_access->setIgnoreAccess($ignore);
+}
+
+/**
+ * Get current ignore access setting.
+ *
+ * @return bool
+ * @since 1.7.0
+ * @see http://docs.elgg.org/Access/IgnoreAccess
+ * @see elgg_set_ignore_access()
+ */
+function elgg_get_ignore_access() {
+	return elgg_get_access_object()->getIgnoreAccess();
+}
+
+/**
+ * Decides if the access system should be ignored for a user.
+ *
+ * Returns true (meaning ignore access) if either of these 2 conditions are true:
+ *   1) an admin user guid is passed to this function.
+ *   2) {@link elgg_get_ignore_access()} returns true.
+ *
+ * @see elgg_set_ignore_access()
+ *
+ * @param int $user_guid The user to check against.
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function elgg_check_access_overrides($user_guid = 0) {
+	if (!$user_guid || $user_guid <= 0) {
+		$is_admin = false;
+	} else {
+		$is_admin = elgg_is_admin_user($user_guid);
+	}
+
+	return ($is_admin || elgg_get_ignore_access());
+}
+
+/**
+ * Returns the ElggAccess object.
+ *
+ * // @todo comment is incomplete
+ * This is used to
+ *
+ * @return ElggAccess
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_access_object() {
+	static $elgg_access;
+
+	if (!$elgg_access) {
+		$elgg_access = new ElggAccess();
+	}
+
+	return $elgg_access;
+}
+
+/**
+ * A flag to set if Elgg's access initialization is finished.
+ *
+ * @global bool $init_finished
+ * @access private
+ * @todo This is required to tell the access system to start caching because
+ * calls are made while in ignore access mode and before the user is logged in.
+ */
+$init_finished = false;
+
+/**
+ * A quick and dirty way to make sure the access permissions have been correctly set up
+ *
+ * @elgg_event_handler init system
+ * @todo Invesigate
+ *
+ * @return void
+ */
+function access_init() {
+	global $init_finished;
+	$init_finished = true;
+}
+
+/**
+ * Overrides the access system if appropriate.
+ *
+ * Allows admin users and calls after {@link elgg_set_ignore_access} to
+ * bypass the access system.
+ *
+ * Registered for the 'permissions_check', 'all' and the 
+ * 'container_permissions_check', 'all' plugin hooks.
+ *
+ * Returns true to override the access system or null if no change is needed.
+ *
+ * @param string $hook
+ * @param string $type
+ * @param bool $value
+ * @param array $params
+ * @return true|null
+ * @access private
+ */
+function elgg_override_permissions($hook, $type, $value, $params) {
+	$user = elgg_extract('user', $params);
+	if ($user) {
+		$user_guid = $user->getGUID();
+	} else {
+		$user_guid = elgg_get_logged_in_user_guid();
+	}
+
+	// don't do this so ignore access still works with no one logged in
+	//if (!$user instanceof ElggUser) {
+	//	return false;
+	//}
+
+	// check for admin
+	if ($user_guid && elgg_is_admin_user($user_guid)) {
+		return true;
+	}
+
+	// check access overrides
+	if ((elgg_check_access_overrides($user_guid))) {
+		return true;
+	}
+
+	// consult other hooks
+	return NULL;
+}
+
+/**
+ * Runs unit tests for the entities object.
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $value
+ * @param array $params
+ * @return array
+ *
+ * @access private
+ */
+function access_test($hook, $type, $value, $params) {
+	global $CONFIG;
+
+	$value[] = $CONFIG->path . 'engine/tests/api/access_collections.php';
+	return $value;
+}
+
+// Tell the access functions the system has booted, plugins are loaded,
+// and the user is logged in so it can start caching
+elgg_register_event_handler('ready', 'system', 'access_init');
+
+// For overrided permissions
+elgg_register_plugin_hook_handler('permissions_check', 'all', 'elgg_override_permissions');
+elgg_register_plugin_hook_handler('container_permissions_check', 'all', 'elgg_override_permissions');
+
+elgg_register_plugin_hook_handler('unit_test', 'system', 'access_test');
+\ No newline at end of file
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
new file mode 100644
index 000000000..8047914ac
--- /dev/null
+++ b/engine/lib/actions.php
@@ -0,0 +1,549 @@
+<?php
+/**
+ * Elgg Actions
+ *
+ * Actions are one of the primary controllers (The C in MVC) in Elgg. They are
+ * registered by {@link register_elgg_action()} and are called by URL
+ * http://elggsite.org/action/action_name. For URLs, a rewrite rule in
+ * .htaccess passes the action name to engine/handlers/action_handler.php,
+ * which dispatches the request for the action.
+ *
+ * An action name must be registered to a file in the system. Core actions are
+ * found in /actions/ and plugin actions are usually under /mod/<plugin>/actions/.
+ * It is recommended that actions be namespaced to avoid collisions.
+ *
+ * All actions require security tokens.  Using the {@elgg_view input/form} view
+ * will automatically add tokens as hidden inputs as will the elgg_view_form()
+ * function.  To manually add hidden inputs, use the {@elgg_view input/securitytoken} view.
+ *
+ * To include security tokens for actions called via GET, use
+ * {@link elgg_add_security_tokens_to_url()} or specify is_action as true when
+ * using {@lgg_view output/url}.
+ *
+ * Action tokens can be manually generated by using {@link generate_action_token()}.
+ *
+ * @tip When registered, actions can be restricted to logged in or admin users.
+ *
+ * @tip Action URLs should be called with a trailing / to prevent 301 redirects.
+ *
+ * @package Elgg.Core
+ * @subpackage Actions
+ * @link http://docs.elgg.org/Actions
+ * @link http://docs.elgg.org/Actions/Tokens
+ */
+
+/**
+ * Perform an action.
+ *
+ * This function executes the action with name $action as registered
+ * by {@link elgg_register_action()}.
+ *
+ * The plugin hook 'action', $action_name will be triggered before the action
+ * is executed.  If a handler returns false, it will prevent the action script
+ * from being called.
+ *
+ * @note If an action isn't registered in the system or is registered
+ * to an unavailable file the user will be forwarded to the site front
+ * page and an error will be emitted via {@link register_error()}.
+ *
+ * @warning All actions require {@link http://docs.elgg.org/Actions/Tokens Action Tokens}.
+ *
+ * @param string $action    The requested action
+ * @param string $forwarder Optionally, the location to forward to
+ *
+ * @link http://docs.elgg.org/Actions
+ * @see elgg_register_action()
+ *
+ * @return void
+ * @access private
+ */
+function action($action, $forwarder = "") {
+	global $CONFIG;
+
+	$action = rtrim($action, '/');
+
+	// @todo REMOVE THESE ONCE #1509 IS IN PLACE.
+	// Allow users to disable plugins without a token in order to
+	// remove plugins that are incompatible.
+	// Logout for convenience.
+	// file/download (see #2010)
+	$exceptions = array(
+		'admin/plugins/disable',
+		'logout',
+		'file/download',
+	);
+
+	if (!in_array($action, $exceptions)) {
+		action_gatekeeper($action);
+	}
+
+	$forwarder = str_replace(elgg_get_site_url(), "", $forwarder);
+	$forwarder = str_replace("http://", "", $forwarder);
+	$forwarder = str_replace("@", "", $forwarder);
+	if (substr($forwarder, 0, 1) == "/") {
+		$forwarder = substr($forwarder, 1);
+	}
+
+	if (!isset($CONFIG->actions[$action])) {
+		register_error(elgg_echo('actionundefined', array($action)));
+	} elseif (!elgg_is_admin_logged_in() && ($CONFIG->actions[$action]['access'] === 'admin')) {
+		register_error(elgg_echo('actionunauthorized'));
+	} elseif (!elgg_is_logged_in() && ($CONFIG->actions[$action]['access'] !== 'public')) {
+		register_error(elgg_echo('actionloggedout'));
+	} else {
+		// Returning falsy doesn't produce an error
+		// We assume this will be handled in the hook itself.
+		if (elgg_trigger_plugin_hook('action', $action, null, true)) {
+			if (!include($CONFIG->actions[$action]['file'])) {
+				register_error(elgg_echo('actionnotfound', array($action)));
+			}
+		}
+	}
+
+	$forwarder = empty($forwarder) ? REFERER : $forwarder;
+	forward($forwarder);
+}
+
+/**
+ * Registers an action.
+ *
+ * Actions are registered to a script in the system and are executed
+ * either by the URL http://elggsite.org/action/action_name/.
+ *
+ * $filename must be the full path of the file to register, or a path relative
+ * to the core actions/ dir.
+ *
+ * Actions should be namedspaced for your plugin.  Example:
+ * <code>
+ * elgg_register_action('myplugin/save_settings', ...);
+ * </code>
+ *
+ * @tip Put action files under the actions/<plugin_name> directory of your plugin.
+ *
+ * @tip You don't need to include engine/start.php in your action files.
+ *
+ * @internal Actions are saved in $CONFIG->actions as an array in the form:
+ * <code>
+ * array(
+ * 	'file' => '/location/to/file.php',
+ * 	'access' => 'public', 'logged_in', or 'admin'
+ * )
+ * </code>
+ *
+ * @param string $action   The name of the action (eg "register", "account/settings/save")
+ * @param string $filename Optionally, the filename where this action is located. If not specified,
+ *                         will assume the action is in elgg/actions/<action>.php
+ * @param string $access   Who is allowed to execute this action: public, logged_in, admin.
+ *                         (default: logged_in)
+ *
+ * @see action()
+ * @see http://docs.elgg.org/Actions
+ *
+ * @return bool
+ */
+function elgg_register_action($action, $filename = "", $access = 'logged_in') {
+	global $CONFIG;
+
+	// plugins are encouraged to call actions with a trailing / to prevent 301
+	// redirects but we store the actions without it
+	$action = rtrim($action, '/');
+
+	if (!isset($CONFIG->actions)) {
+		$CONFIG->actions = array();
+	}
+
+	if (empty($filename)) {
+		$path = "";
+		if (isset($CONFIG->path)) {
+			$path = $CONFIG->path;
+		}
+
+		$filename = $path . "actions/" . $action . ".php";
+	}
+
+	$CONFIG->actions[$action] = array(
+		'file' => $filename,
+		'access' => $access,
+	);
+	return true;
+}
+
+/**
+ * Unregisters an action
+ *
+ * @param string $action Action name
+ * @return bool
+ * @since 1.8.1
+ */
+function elgg_unregister_action($action) {
+	global $CONFIG;
+
+	if (isset($CONFIG->actions[$action])) {
+		unset($CONFIG->actions[$action]);
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Is the token timestamp within acceptable range?
+ * 
+ * @param int $ts timestamp from the CSRF token
+ * 
+ * @return bool
+ */
+function _elgg_validate_token_timestamp($ts) {
+	$action_token_timeout = elgg_get_config('action_token_timeout');
+	// default is 2 hours
+	$timeout = ($action_token_timeout !== null) ? $action_token_timeout : 2;
+
+	$hour = 60 * 60;
+	$timeout = $timeout * $hour;
+	$now = time();
+
+	// Validate time to ensure its not crazy
+	return ($timeout == 0 || ($ts > $now - $timeout) && ($ts < $now + $timeout));
+}
+
+/**
+ * Validate an action token.
+ *
+ * Calls to actions will automatically validate tokens. If tokens are not
+ * present or invalid, the action will be denied and the user will be redirected.
+ *
+ * Plugin authors should never have to manually validate action tokens.
+ *
+ * @param bool  $visibleerrors Emit {@link register_error()} errors on failure?
+ * @param mixed $token         The token to test against. Default: $_REQUEST['__elgg_token']
+ * @param mixed $ts            The time stamp to test against. Default: $_REQUEST['__elgg_ts']
+ *
+ * @return bool
+ * @see generate_action_token()
+ * @link http://docs.elgg.org/Actions/Tokens
+ * @access private
+ */
+function validate_action_token($visibleerrors = TRUE, $token = NULL, $ts = NULL) {
+	if (!$token) {
+		$token = get_input('__elgg_token');
+	}
+
+	if (!$ts) {
+		$ts = get_input('__elgg_ts');
+	}
+
+	$session_id = session_id();
+
+	if (($token) && ($ts) && ($session_id)) {
+		// generate token, check with input and forward if invalid
+		$required_token = generate_action_token($ts);
+
+		// Validate token
+		if ($token == $required_token) {
+			
+			if (_elgg_validate_token_timestamp($ts)) {
+				// We have already got this far, so unless anything
+				// else says something to the contrary we assume we're ok
+				$returnval = true;
+
+				$returnval = elgg_trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', array(
+					'token' => $token,
+					'time' => $ts
+				), $returnval);
+
+				if ($returnval) {
+					return true;
+				} else if ($visibleerrors) {
+					register_error(elgg_echo('actiongatekeeper:pluginprevents'));
+				}
+			} else if ($visibleerrors) {
+				// this is necessary because of #5133
+				if (elgg_is_xhr()) {
+					register_error(elgg_echo('js:security:token_refresh_failed', array(elgg_get_site_url())));
+				} else {
+					register_error(elgg_echo('actiongatekeeper:timeerror'));
+				}
+			}
+		} else if ($visibleerrors) {
+			// this is necessary because of #5133
+			if (elgg_is_xhr()) {
+				register_error(elgg_echo('js:security:token_refresh_failed', array(elgg_get_site_url())));
+			} else {
+				register_error(elgg_echo('actiongatekeeper:tokeninvalid'));
+			}
+		}
+	} else {
+		if (! empty($_SERVER['CONTENT_LENGTH']) && empty($_POST)) {
+			// The size of $_POST or uploaded file has exceed the size limit
+			$error_msg = elgg_trigger_plugin_hook('action_gatekeeper:upload_exceeded_msg', 'all', array(
+				'post_size' => $_SERVER['CONTENT_LENGTH'],
+				'visible_errors' => $visibleerrors,
+			), elgg_echo('actiongatekeeper:uploadexceeded'));
+		} else {
+			$error_msg = elgg_echo('actiongatekeeper:missingfields');
+		}
+		if ($visibleerrors) {
+			register_error($error_msg);
+		}
+	}
+
+	return FALSE;
+}
+
+/**
+ * Validates the presence of action tokens.
+ *
+ * This function is called for all actions.  If action tokens are missing,
+ * the user will be forwarded to the site front page and an error emitted.
+ *
+ * This function verifies form input for security features (like a generated token),
+ * and forwards if they are invalid.
+ *
+ * @param string $action The action being performed
+ * 
+ * @return mixed True if valid or redirects.
+ * @access private
+ */
+function action_gatekeeper($action) {
+	if ($action === 'login') {
+		if (validate_action_token(false)) {
+			return true;
+		}
+		
+		$token = get_input('__elgg_token');
+		$ts = (int)get_input('__elgg_ts');
+		if ($token && _elgg_validate_token_timestamp($ts)) {
+			// The tokens are present and the time looks valid: this is probably a mismatch due to the 
+			// login form being on a different domain.
+			register_error(elgg_echo('actiongatekeeper:crosssitelogin'));
+			
+			
+			forward('login', 'csrf');
+		}
+		
+		// let the validator send an appropriate msg
+		validate_action_token();
+		
+	} elseif (validate_action_token()) {
+		return true;
+	}
+
+	forward(REFERER, 'csrf');
+}
+
+/**
+ * Generate an action token.
+ *
+ * Action tokens are based on timestamps as returned by {@link time()}.
+ * They are valid for one hour.
+ *
+ * Action tokens should be passed to all actions name __elgg_ts and __elgg_token.
+ *
+ * @warning Action tokens are required for all actions.
+ *
+ * @param int $timestamp Unix timestamp
+ *
+ * @see @elgg_view input/securitytoken
+ * @see @elgg_view input/form
+ * @example actions/manual_tokens.php
+ *
+ * @return string|false
+ * @access private
+ */
+function generate_action_token($timestamp) {
+	$site_secret = get_site_secret();
+	$session_id = session_id();
+	// Session token
+	$st = $_SESSION['__elgg_session'];
+
+	if (($site_secret) && ($session_id)) {
+		return md5($site_secret . $timestamp . $session_id . $st);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Initialise the site secret (32 bytes: "z" to indicate format + 186-bit key in Base64 URL).
+ *
+ * Used during installation and saves as a datalist.
+ *
+ * Note: Old secrets were hex encoded.
+ *
+ * @return mixed The site secret hash or false
+ * @access private
+ * @todo Move to better file.
+ */
+function init_site_secret() {
+	$secret = 'z' . ElggCrypto::getRandomString(31);
+
+	if (datalist_set('__site_secret__', $secret)) {
+		return $secret;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Returns the site secret.
+ *
+ * Used to generate difficult to guess hashes for sessions and action tokens.
+ *
+ * @return string Site secret.
+ * @access private
+ * @todo Move to better file.
+ */
+function get_site_secret() {
+	$secret = datalist_get('__site_secret__');
+	if (!$secret) {
+		$secret = init_site_secret();
+	}
+
+	return $secret;
+}
+
+/**
+ * Get the strength of the site secret
+ *
+ * @return string "strong", "moderate", or "weak"
+ * @access private
+ */
+function _elgg_get_site_secret_strength() {
+	$secret = get_site_secret();
+	if ($secret[0] !== 'z') {
+		$rand_max = getrandmax();
+		if ($rand_max < pow(2, 16)) {
+			return 'weak';
+		}
+		if ($rand_max < pow(2, 32)) {
+			return 'moderate';
+		}
+	}
+	return 'strong';
+}
+
+/**
+ * Check if an action is registered and its script exists.
+ *
+ * @param string $action Action name
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_action_exists($action) {
+	global $CONFIG;
+
+	return (isset($CONFIG->actions[$action]) && file_exists($CONFIG->actions[$action]['file']));
+}
+
+/**
+ * Checks whether the request was requested via ajax
+ *
+ * @return bool whether page was requested via ajax
+ * @since 1.8.0
+ */
+function elgg_is_xhr() {
+	return isset($_SERVER['HTTP_X_REQUESTED_WITH'])
+		&& strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ||
+		get_input('X-Requested-With') === 'XMLHttpRequest';
+}
+
+/**
+ * Catch calls to forward() in ajax request and force an exit.
+ *
+ * Forces response is json of the following form:
+ * <pre>
+ * {
+ *     "current_url": "the.url.we/were/coming/from",
+ *     "forward_url": "the.url.we/were/going/to",
+ *     "system_messages": {
+ *         "messages": ["msg1", "msg2", ...],
+ *         "errors": ["err1", "err2", ...]
+ *     },
+ *     "status": -1 //or 0 for success if there are no error messages present
+ * }
+ * </pre>
+ * where "system_messages" is all message registers at the point of forwarding
+ *
+ * @param string $hook
+ * @param string $type
+ * @param string $reason
+ * @param array $params
+ * @return void
+ * @access private
+ */
+function ajax_forward_hook($hook, $type, $reason, $params) {
+	if (elgg_is_xhr()) {
+		// always pass the full structure to avoid boilerplate JS code.
+		$params = array(
+			'output' => '',
+			'status' => 0,
+			'system_messages' => array(
+				'error' => array(),
+				'success' => array()
+			)
+		);
+
+		//grab any data echo'd in the action
+		$output = ob_get_clean();
+
+		//Avoid double-encoding in case data is json
+		$json = json_decode($output);
+		if (isset($json)) {
+			$params['output'] = $json;
+		} else {
+			$params['output'] = $output;
+		}
+
+		//Grab any system messages so we can inject them via ajax too
+		$system_messages = system_messages(NULL, "");
+
+		if (isset($system_messages['success'])) {
+			$params['system_messages']['success'] = $system_messages['success'];
+		}
+
+		if (isset($system_messages['error'])) {
+			$params['system_messages']['error'] = $system_messages['error'];
+			$params['status'] = -1;
+		}
+
+		// Check the requester can accept JSON responses, if not fall back to
+		// returning JSON in a plain-text response.  Some libraries request
+		// JSON in an invisible iframe which they then read from the iframe,
+		// however some browsers will not accept the JSON MIME type.
+		if (stripos($_SERVER['HTTP_ACCEPT'], 'application/json') === FALSE) {
+			header("Content-type: text/plain");
+		} else {
+			header("Content-type: application/json");
+		}
+
+		echo json_encode($params);
+		exit;
+	}
+}
+
+/**
+ * Buffer all output echo'd directly in the action for inclusion in the returned JSON.
+ * @return void
+ * @access private
+ */
+function ajax_action_hook() {
+	if (elgg_is_xhr()) {
+		ob_start();
+	}
+}
+
+/**
+ * Initialize some ajaxy actions features
+ * @access private
+ */
+function actions_init() {
+	elgg_register_action('security/refreshtoken', '', 'public');
+
+	elgg_register_simplecache_view('js/languages/en');
+
+	elgg_register_plugin_hook_handler('action', 'all', 'ajax_action_hook');
+	elgg_register_plugin_hook_handler('forward', 'all', 'ajax_forward_hook');
+}
+
+elgg_register_event_handler('init', 'system', 'actions_init');
diff --git a/engine/lib/admin.php b/engine/lib/admin.php
new file mode 100644
index 000000000..f36f29668
--- /dev/null
+++ b/engine/lib/admin.php
@@ -0,0 +1,663 @@
+<?php
+/**
+ * Elgg admin functions.
+ *
+ * Admin menu items
+ * Elgg has a convenience function for adding menu items to the sidebar of the
+ * admin area. @see elgg_register_admin_menu_item()
+ *
+ * Admin pages
+ * Plugins no not need to provide their own page handler to add a page to the
+ * admin area. A view placed at admin/<section>/<subsection> can be access
+ * at http://example.org/admin/<section>/<subsection>. The title of the page
+ * will be elgg_echo('admin:<section>:<subsection>'). For an example of how to
+ * add a page to the admin area, see the diagnostics plugin.
+ *
+ * Admin notices
+ * System messages (success and error messages) are used in both the main site
+ * and the admin area. There is a special presistent message for the admin area
+ * called an admin notice. It should be used when a plugin requires an
+ * administrator to take an action. An example is the categories plugin
+ * requesting that the administrator set site categories after the plugin has
+ * been activated. @see elgg_add_admin_notice()
+ *
+ *
+ * @package Elgg.Core
+ * @subpackage Admin
+ */
+
+/**
+ * Get the admin users 
+ *
+ * @param array $options Options array, @see elgg_get_entities() for parameters
+ *
+ * @return mixed Array of admin users or false on failure. If a count, returns int.
+ * @since 1.8.0
+ */
+function elgg_get_admins(array $options = array()) {
+	global $CONFIG;
+
+	if (isset($options['joins'])) {
+		if (!is_array($options['joins'])) {
+			$options['joins'] = array($options['joins']);
+		}
+		$options['joins'][] = "join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid";
+	} else {
+		$options['joins'] = array("join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid");
+	}
+
+	if (isset($options['wheres'])) {
+		if (!is_array($options['wheres'])) {
+			$options['wheres'] = array($options['wheres']);
+		}
+		$options['wheres'][] = "u.admin = 'yes'";
+	} else {
+		$options['wheres'][] = "u.admin = 'yes'";
+	}
+
+	return elgg_get_entities($options);
+}
+
+/**
+ * Write a persistent message to the admin view.
+ * Useful to alert the admin to take a certain action.
+ * The id is a unique ID that can be cleared once the admin
+ * completes the action.
+ *
+ * eg: add_admin_notice('twitter_services_no_api',
+ * 	'Before your users can use Twitter services on this site, you must set up
+ * 	the Twitter API key in the <a href="link">Twitter Services Settings</a>');
+ *
+ * @param string $id      A unique ID that your plugin can remember
+ * @param string $message Body of the message
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_add_admin_notice($id, $message) {
+	if ($id && $message) {
+		if (elgg_admin_notice_exists($id)) {
+			return false;
+		}
+
+		// need to handle when no one is logged in
+		$old_ia = elgg_set_ignore_access(true);
+
+		$admin_notice = new ElggObject();
+		$admin_notice->subtype = 'admin_notice';
+		// admins can see ACCESS_PRIVATE but no one else can.
+		$admin_notice->access_id = ACCESS_PRIVATE;
+		$admin_notice->admin_notice_id = $id;
+		$admin_notice->description = $message;
+
+		$result = $admin_notice->save();
+
+		elgg_set_ignore_access($old_ia);
+
+		return (bool)$result;
+	}
+
+	return false;
+}
+
+/**
+ * Remove an admin notice by ID.
+ *
+ * eg In actions/twitter_service/save_settings:
+ * 	if (is_valid_twitter_api_key()) {
+ * 		delete_admin_notice('twitter_services_no_api');
+ * 	}
+ *
+ * @param string $id The unique ID assigned in add_admin_notice()
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_delete_admin_notice($id) {
+	if (!$id) {
+		return FALSE;
+	}
+	$result = TRUE;
+	$notices = elgg_get_entities_from_metadata(array(
+		'metadata_name' => 'admin_notice_id',
+		'metadata_value' => $id
+	));
+
+	if ($notices) {
+		// in case a bad plugin adds many, let it remove them all at once.
+		foreach ($notices as $notice) {
+			$result = ($result && $notice->delete());
+		}
+		return $result;
+	}
+	return FALSE;
+}
+
+/**
+ * Get admin notices. An admin must be logged in since the notices are private.
+ *
+ * @param int $limit Limit
+ *
+ * @return array Array of admin notices
+ * @since 1.8.0
+ */
+function elgg_get_admin_notices($limit = 10) {
+	return elgg_get_entities_from_metadata(array(
+		'type' => 'object',
+		'subtype' => 'admin_notice',
+		'limit' => $limit
+	));
+}
+
+/**
+ * Check if an admin notice is currently active.
+ *
+ * @param string $id The unique ID used to register the notice.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_admin_notice_exists($id) {
+	$old_ia = elgg_set_ignore_access(true);
+	$notice = elgg_get_entities_from_metadata(array(
+		'type' => 'object',
+		'subtype' => 'admin_notice',
+		'metadata_name_value_pair' => array('name' => 'admin_notice_id', 'value' => $id)
+	));
+	elgg_set_ignore_access($old_ia);
+
+	return ($notice) ? TRUE : FALSE;
+}
+
+/**
+ * Add an admin area section or child section.
+ * This is a wrapper for elgg_register_menu_item().
+ *
+ * Used in conjuction with http://elgg.org/admin/section_id/child_section style
+ * page handler. See the documentation at the top of this file for more details
+ * on that.
+ *
+ * The text of the menu item is obtained from elgg_echo(admin:$parent_id:$menu_id)
+ *
+ * This function handles registering the parent if it has not been registered.
+ *
+ * @param string $section   The menu section to add to
+ * @param string $menu_id   The unique ID of section
+ * @param string $parent_id If a child section, the parent section id
+ * @param int    $priority  The menu item priority
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_admin_menu_item($section, $menu_id, $parent_id = NULL, $priority = 100) {
+
+	// make sure parent is registered
+	if ($parent_id && !elgg_is_menu_item_registered('page', $parent_id)) {
+		elgg_register_admin_menu_item($section, $parent_id);
+	}
+
+	// in the admin section parents never have links
+	if ($parent_id) {
+		$href = "admin/$parent_id/$menu_id";
+	} else {
+		$href = NULL;
+	}
+
+	$name = $menu_id;
+	if ($parent_id) {
+		$name = "$parent_id:$name";
+	}
+
+	return elgg_register_menu_item('page', array(
+		'name' => $name,
+		'href' => $href,
+		'text' => elgg_echo("admin:$name"),
+		'context' => 'admin',
+		'parent_name' => $parent_id,
+		'priority' => $priority,
+		'section' => $section
+	));
+}
+
+/**
+ * Initialize the admin backend.
+ * @return void
+ * @access private
+ */
+function admin_init() {
+	elgg_register_action('admin/user/ban', '', 'admin');
+	elgg_register_action('admin/user/unban', '', 'admin');
+	elgg_register_action('admin/user/delete', '', 'admin');
+	elgg_register_action('admin/user/resetpassword', '', 'admin');
+	elgg_register_action('admin/user/makeadmin', '', 'admin');
+	elgg_register_action('admin/user/removeadmin', '', 'admin');
+
+	elgg_register_action('admin/site/update_basic', '', 'admin');
+	elgg_register_action('admin/site/update_advanced', '', 'admin');
+	elgg_register_action('admin/site/flush_cache', '', 'admin');
+	elgg_register_action('admin/site/unlock_upgrade', '', 'admin');
+	elgg_register_action('admin/site/regenerate_secret', '', 'admin');
+
+	elgg_register_action('admin/menu/save', '', 'admin');
+
+	elgg_register_action('admin/delete_admin_notice', '', 'admin');
+
+	elgg_register_action('profile/fields/reset', '', 'admin');
+	elgg_register_action('profile/fields/add', '', 'admin');
+	elgg_register_action('profile/fields/edit', '', 'admin');
+	elgg_register_action('profile/fields/delete', '', 'admin');
+	elgg_register_action('profile/fields/reorder', '', 'admin');
+
+	elgg_register_simplecache_view('css/admin');
+	elgg_register_simplecache_view('js/admin');
+	$url = elgg_get_simplecache_url('js', 'admin');
+	elgg_register_js('elgg.admin', $url);
+	elgg_register_js('jquery.jeditable', 'vendors/jquery/jquery.jeditable.mini.js');
+
+	// administer
+	// dashboard
+	elgg_register_menu_item('page', array(
+		'name' => 'dashboard',
+		'href' => 'admin/dashboard',
+		'text' => elgg_echo('admin:dashboard'),
+		'context' => 'admin',
+		'priority' => 10,
+		'section' => 'administer'
+	));
+	// statistics
+	elgg_register_admin_menu_item('administer', 'statistics', null, 20);
+	elgg_register_admin_menu_item('administer', 'overview', 'statistics');
+	elgg_register_admin_menu_item('administer', 'server', 'statistics');
+
+	// users
+	elgg_register_admin_menu_item('administer', 'users', null, 20);
+	elgg_register_admin_menu_item('administer', 'online', 'users', 10);
+	elgg_register_admin_menu_item('administer', 'admins', 'users', 20);
+	elgg_register_admin_menu_item('administer', 'newest', 'users', 30);
+	elgg_register_admin_menu_item('administer', 'add', 'users', 40);
+
+	// configure
+	// plugins
+	elgg_register_menu_item('page', array(
+		'name' => 'plugins',
+		'href' => 'admin/plugins',
+		'text' => elgg_echo('admin:plugins'),
+		'context' => 'admin',
+		'priority' => 75,
+		'section' => 'configure'
+	));
+
+	// settings
+	elgg_register_admin_menu_item('configure', 'appearance', null, 50);
+	elgg_register_admin_menu_item('configure', 'settings', null, 100);
+	elgg_register_admin_menu_item('configure', 'basic', 'settings', 10);
+	elgg_register_admin_menu_item('configure', 'advanced', 'settings', 20);
+	elgg_register_admin_menu_item('configure', 'advanced/site_secret', 'settings', 25);
+	elgg_register_admin_menu_item('configure', 'menu_items', 'appearance', 30);
+	elgg_register_admin_menu_item('configure', 'profile_fields', 'appearance', 40);
+	// default widgets is added via an event handler elgg_default_widgets_init() in widgets.php
+	// because it requires additional setup.
+
+	// plugin settings are added in elgg_admin_add_plugin_settings_menu() via the admin page handler
+	// for performance reasons.
+
+	// we want plugin settings menu items to be sorted alphabetical
+	if (elgg_in_context('admin')) {
+		elgg_register_plugin_hook_handler('prepare', 'menu:page', 'elgg_admin_sort_page_menu');
+	}
+
+	if (elgg_is_admin_logged_in()) {
+		elgg_register_menu_item('topbar', array(
+			'name' => 'administration',
+			'href' => 'admin',
+			'text' => elgg_view_icon('settings') . elgg_echo('admin'),
+			'priority' => 100,
+			'section' => 'alt',
+		));
+	}
+			
+	// widgets
+	$widgets = array('online_users', 'new_users', 'content_stats', 'admin_welcome', 'control_panel');
+	foreach ($widgets as $widget) {
+		elgg_register_widget_type(
+				$widget,
+				elgg_echo("admin:widget:$widget"),
+				elgg_echo("admin:widget:$widget:help"),
+				'admin'
+		);
+	}
+
+	// automatic adding of widgets for admin
+	elgg_register_event_handler('make_admin', 'user', 'elgg_add_admin_widgets');
+
+	elgg_register_page_handler('admin', 'admin_page_handler');
+	elgg_register_page_handler('admin_plugin_screenshot', 'admin_plugin_screenshot_page_handler');
+	elgg_register_page_handler('admin_plugin_text_file', 'admin_markdown_page_handler');
+}
+
+/**
+ * Create the plugin settings page menu.
+ *
+ * This is done in a separate function called from the admin
+ * page handler because of performance concerns.
+ *
+ * @return void
+ * @access private
+ * @since 1.8.0
+ */
+function elgg_admin_add_plugin_settings_menu() {
+
+	$active_plugins = elgg_get_plugins('active');
+	if (!$active_plugins) {
+		// nothing added because no items
+		return;
+	}
+
+	foreach ($active_plugins as $plugin) {
+		$plugin_id = $plugin->getID();
+		$settings_view_old = 'settings/' . $plugin_id . '/edit';
+		$settings_view_new = 'plugins/' . $plugin_id . '/settings';
+		if (elgg_view_exists($settings_view_new) || elgg_view_exists($settings_view_old)) {
+			elgg_register_menu_item('page', array(
+				'name' => $plugin_id,
+				'href' => "admin/plugin_settings/$plugin_id",
+				'text' => $plugin->getManifest()->getName(),
+				'parent_name' => 'settings',
+				'context' => 'admin',
+				'section' => 'configure',
+			));
+		}
+	}
+}
+
+/**
+ * Sort the plugin settings menu items
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array  $return
+ * @param array  $params
+ *
+ * @return void
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_admin_sort_page_menu($hook, $type, $return, $params) {
+	$configure_items = $return['configure'];
+	/* @var ElggMenuItem[] $configure_items */
+	foreach ($configure_items as $menu_item) {
+		if ($menu_item->getName() == 'settings') {
+			$settings = $menu_item;
+		}
+	}
+
+	// keep the basic and advanced settings at the top
+	/* @var ElggMenuItem $settings */
+	$children = $settings->getChildren();
+	$site_settings = array_splice($children, 0, 2);
+	usort($children, array('ElggMenuBuilder', 'compareByText'));
+	array_splice($children, 0, 0, $site_settings);
+	$settings->setChildren($children);
+}
+
+/**
+ * Handles any set up required for administration pages
+ *
+ * @return void
+ * @access private
+ */
+function admin_pagesetup() {
+	if (elgg_in_context('admin')) {
+		$url = elgg_get_simplecache_url('css', 'admin');
+		elgg_register_css('elgg.admin', $url);
+		elgg_load_css('elgg.admin');
+		elgg_unregister_css('elgg');
+
+		// setup footer menu
+		elgg_register_menu_item('admin_footer', array(
+			'name' => 'faq',
+			'text' => elgg_echo('admin:footer:faq'),
+			'href' => 'http://docs.elgg.org/wiki/Category:Administration_FAQ',
+		));
+
+		elgg_register_menu_item('admin_footer', array(
+			'name' => 'manual',
+			'text' => elgg_echo('admin:footer:manual'),
+			'href' => 'http://docs.elgg.org/wiki/Administration_Manual',
+		));
+
+		elgg_register_menu_item('admin_footer', array(
+			'name' => 'community_forums',
+			'text' => elgg_echo('admin:footer:community_forums'),
+			'href' => 'http://community.elgg.org/groups/all/',
+		));
+
+		elgg_register_menu_item('admin_footer', array(
+			'name' => 'blog',
+			'text' => elgg_echo('admin:footer:blog'),
+			'href' => 'http://blog.elgg.org/',
+		));
+	}
+}
+
+/**
+ * Handle admin pages.  Expects corresponding views as admin/section/subsection
+ *
+ * @param array $page Array of pages
+ *
+ * @return bool
+ * @access private
+ */
+function admin_page_handler($page) {
+
+	admin_gatekeeper();
+	elgg_admin_add_plugin_settings_menu();
+	elgg_set_context('admin');
+
+	elgg_unregister_css('elgg');
+	elgg_load_js('elgg.admin');
+	elgg_load_js('jquery.jeditable');
+
+	// default to dashboard
+	if (!isset($page[0]) || empty($page[0])) {
+		$page = array('dashboard');
+	}
+
+	// was going to fix this in the page_handler() function but
+	// it's commented to explicitly return a string if there's a trailing /
+	if (empty($page[count($page) - 1])) {
+		array_pop($page);
+	}
+
+	$vars = array('page' => $page);
+
+	// special page for plugin settings since we create the form for them
+	if ($page[0] == 'plugin_settings') {
+		if (isset($page[1]) && (elgg_view_exists("settings/{$page[1]}/edit") || 
+			elgg_view_exists("plugins/{$page[1]}/settings"))) {
+
+			$view = 'admin/plugin_settings';
+			$plugin = elgg_get_plugin_from_id($page[1]);
+			$vars['plugin'] = $plugin;
+
+			$title = elgg_echo("admin:{$page[0]}");
+		} else {
+			forward('', '404');
+		}
+	} else {
+		$view = 'admin/' . implode('/', $page);
+		$title = elgg_echo("admin:{$page[0]}");
+		if (count($page) > 1) {
+			$title .= ' : ' . elgg_echo('admin:' .  implode(':', $page));
+		}
+	}
+
+	// gets content and prevents direct access to 'components' views
+	if ($page[0] == 'components' || !($content = elgg_view($view, $vars))) {
+		$title = elgg_echo('admin:unknown_section');
+		$content = elgg_echo('admin:unknown_section');
+	}
+
+	$body = elgg_view_layout('admin', array('content' => $content, 'title' => $title));
+	echo elgg_view_page($title, $body, 'admin');
+	return true;
+}
+
+/**
+ * Serves up screenshots for plugins from
+ * admin_plugin_screenshot/<plugin_id>/<size>/<ss_name>.<ext>
+ *
+ * @param array $pages The pages array
+ * @return bool
+ * @access private
+ */
+function admin_plugin_screenshot_page_handler($pages) {
+	// only admins can use this for security
+	admin_gatekeeper();
+
+	$plugin_id = elgg_extract(0, $pages);
+	// only thumbnail or full.
+	$size = elgg_extract(1, $pages, 'thumbnail');
+
+	// the rest of the string is the filename
+	$filename_parts = array_slice($pages, 2);
+	$filename = implode('/', $filename_parts);
+	$filename = sanitise_filepath($filename, false);
+
+	$plugin = new ElggPlugin($plugin_id);
+	if (!$plugin) {
+		$file = elgg_get_root_path() . '_graphics/icons/default/medium.png';
+	} else {
+		$file = $plugin->getPath() . $filename;
+		if (!file_exists($file)) {
+			$file = elgg_get_root_path() . '_graphics/icons/default/medium.png';
+		}
+	}
+
+	header("Content-type: image/jpeg");
+
+	// resize to 100x100 for thumbnails
+	switch ($size) {
+		case 'thumbnail':
+			echo get_resized_image_from_existing_file($file, 100, 100, true);
+			break;
+
+		case 'full':
+		default:
+			echo file_get_contents($file);
+			break;
+	}
+	return true;
+}
+
+/**
+ * Formats and serves out markdown files from plugins.
+ *
+ * URLs in format like admin_plugin_text_file/<plugin_id>/filename.ext
+ *
+ * The only valid files are:
+ *	* README.txt
+ *	* CHANGES.txt
+ *	* INSTALL.txt
+ *	* COPYRIGHT.txt
+ *	* LICENSE.txt
+ *
+ * @param array $pages
+ * @return bool
+ * @access private
+ */
+function admin_markdown_page_handler($pages) {
+	admin_gatekeeper();
+
+	elgg_set_context('admin');
+
+	elgg_unregister_css('elgg');
+	elgg_load_js('elgg.admin');
+	elgg_load_js('jquery.jeditable');
+	elgg_load_library('elgg:markdown');
+
+	$plugin_id = elgg_extract(0, $pages);
+	$plugin = elgg_get_plugin_from_id($plugin_id);
+	$filename = elgg_extract(1, $pages);
+
+	$error = false;
+	if (!$plugin) {
+		$error = elgg_echo('admin:plugins:markdown:unknown_plugin');
+		$body = elgg_view_layout('admin', array('content' => $error, 'title' => $error));
+		echo elgg_view_page($error, $body, 'admin');
+		return true;
+	}
+
+	$text_files = $plugin->getAvailableTextFiles();
+
+	if (!array_key_exists($filename, $text_files)) {
+		$error = elgg_echo('admin:plugins:markdown:unknown_file');
+	}
+
+	$file = $text_files[$filename];
+	$file_contents = file_get_contents($file);
+
+	if (!$file_contents) {
+		$error = elgg_echo('admin:plugins:markdown:unknown_file');
+	}
+
+	if ($error) {
+		$title = $error;
+		$body = elgg_view_layout('admin', array('content' => $error, 'title' => $title));
+		echo elgg_view_page($title, $body, 'admin');
+		return true;
+	}
+
+	$title = $plugin->getManifest()->getName() . ": $filename";
+	$text = Markdown($file_contents);
+
+	$body = elgg_view_layout('admin', array(
+		// setting classes here because there's no way to pass classes
+		// to the layout
+		'content' => '<div class="elgg-markdown">' . $text . '</div>',
+		'title' => $title
+	));
+	
+	echo elgg_view_page($title, $body, 'admin');
+	return true;
+}
+
+/**
+ * Adds default admin widgets to the admin dashboard.
+ *
+ * @param string $event
+ * @param string $type
+ * @param ElggUser $user
+ *
+ * @return null|true
+ * @access private
+ */
+function elgg_add_admin_widgets($event, $type, $user) {
+	elgg_set_ignore_access(true);
+
+	// check if the user already has widgets
+	if (elgg_get_widgets($user->getGUID(), 'admin')) {
+		return true;
+	}
+
+	// In the form column => array of handlers in order, top to bottom
+	$adminWidgets = array(
+		1 => array('control_panel', 'admin_welcome'),
+		2 => array('online_users', 'new_users', 'content_stats'),
+	);
+	
+	foreach ($adminWidgets as $column => $handlers) {
+		foreach ($handlers as $position => $handler) {
+			$guid = elgg_create_widget($user->getGUID(), $handler, 'admin');
+			if ($guid) {
+				$widget = get_entity($guid);
+				/* @var ElggWidget $widget */
+				$widget->move($column, $position);
+			}
+		}
+	}
+	elgg_set_ignore_access(false);
+}
+
+elgg_register_event_handler('init', 'system', 'admin_init');
+elgg_register_event_handler('pagesetup', 'system', 'admin_pagesetup', 1000);
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
new file mode 100644
index 000000000..5e9b530de
--- /dev/null
+++ b/engine/lib/annotations.php
@@ -0,0 +1,618 @@
+<?php
+/**
+ * Elgg annotations
+ * Functions to manage object annotations.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Convert a database row to a new ElggAnnotation
+ *
+ * @param stdClass $row Db row result object
+ *
+ * @return ElggAnnotation
+ * @access private
+ */
+function row_to_elggannotation($row) {
+	if (!($row instanceof stdClass)) {
+		// @todo should throw in this case?
+		return $row;
+	}
+
+	return new ElggAnnotation($row);
+}
+
+/**
+ * Get a specific annotation by its id.
+ * If you want multiple annotation objects, use
+ * {@link elgg_get_annotations()}.
+ *
+ * @param int $id The id of the annotation object being retrieved.
+ *
+ * @return ElggAnnotation|false
+ */
+function elgg_get_annotation_from_id($id) {
+	return elgg_get_metastring_based_object_from_id($id, 'annotations');
+}
+
+/**
+ * Deletes an annotation using its ID.
+ *
+ * @param int $id The annotation ID to delete.
+ * @return bool
+ */
+function elgg_delete_annotation_by_id($id) {
+	$annotation = elgg_get_annotation_from_id($id);
+	if (!$annotation) {
+		return false;
+	}
+	return $annotation->delete();
+}
+
+/**
+ * Create a new annotation.
+ *
+ * @param int    $entity_guid Entity Guid
+ * @param string $name        Name of annotation
+ * @param string $value       Value of annotation
+ * @param string $value_type  Type of value (default is auto detection)
+ * @param int    $owner_guid  Owner of annotation (default is logged in user)
+ * @param int    $access_id   Access level of annotation
+ *
+ * @return int|bool id on success or false on failure
+ */
+function create_annotation($entity_guid, $name, $value, $value_type = '',
+$owner_guid = 0, $access_id = ACCESS_PRIVATE) {
+	global $CONFIG;
+
+	$result = false;
+
+	$entity_guid = (int)$entity_guid;
+	//$name = sanitise_string(trim($name));
+	//$value = sanitise_string(trim($value));
+	$value_type = detect_extender_valuetype($value, sanitise_string(trim($value_type)));
+
+	$owner_guid = (int)$owner_guid;
+	if ($owner_guid == 0) {
+		$owner_guid = elgg_get_logged_in_user_guid();
+	}
+
+	$access_id = (int)$access_id;
+	$time = time();
+
+	// Add the metastring
+	$value = add_metastring($value);
+	if (!$value) {
+		return false;
+	}
+
+	$name = add_metastring($name);
+	if (!$name) {
+		return false;
+	}
+
+	$entity = get_entity($entity_guid);
+
+	if (elgg_trigger_event('annotate', $entity->type, $entity)) {
+		// If ok then add it
+		$result = insert_data("INSERT into {$CONFIG->dbprefix}annotations
+			(entity_guid, name_id, value_id, value_type, owner_guid, time_created, access_id) VALUES
+			($entity_guid,'$name',$value,'$value_type', $owner_guid, $time, $access_id)");
+
+		if ($result !== false) {
+			$obj = elgg_get_annotation_from_id($result);
+			if (elgg_trigger_event('create', 'annotation', $obj)) {
+				return $result;
+			} else {
+				// plugin returned false to reject annotation
+				elgg_delete_annotation_by_id($result);
+				return FALSE;
+			}
+		}
+	}
+
+	return $result;
+}
+
+/**
+ * Update an annotation.
+ *
+ * @param int    $annotation_id Annotation ID
+ * @param string $name          Name of annotation
+ * @param string $value         Value of annotation
+ * @param string $value_type    Type of value
+ * @param int    $owner_guid    Owner of annotation
+ * @param int    $access_id     Access level of annotation
+ *
+ * @return bool
+ */
+function update_annotation($annotation_id, $name, $value, $value_type, $owner_guid, $access_id) {
+	global $CONFIG;
+
+	$annotation_id = (int)$annotation_id;
+	$name = (trim($name));
+	$value = (trim($value));
+	$value_type = detect_extender_valuetype($value, sanitise_string(trim($value_type)));
+
+	$owner_guid = (int)$owner_guid;
+	if ($owner_guid == 0) {
+		$owner_guid = elgg_get_logged_in_user_guid();
+	}
+
+	$access_id = (int)$access_id;
+
+	$access = get_access_sql_suffix();
+
+	// Add the metastring
+	$value = add_metastring($value);
+	if (!$value) {
+		return false;
+	}
+
+	$name = add_metastring($name);
+	if (!$name) {
+		return false;
+	}
+
+	// If ok then add it
+	$result = update_data("UPDATE {$CONFIG->dbprefix}annotations
+		set name_id='$name', value_id='$value', value_type='$value_type', access_id=$access_id, owner_guid=$owner_guid
+		where id=$annotation_id and $access");
+
+	if ($result !== false) {
+		// @todo add plugin hook that sends old and new annotation information before db access
+		$obj = elgg_get_annotation_from_id($annotation_id);
+		elgg_trigger_event('update', 'annotation', $obj);
+	}
+
+	return $result;
+}
+
+/**
+ * Returns annotations.  Accepts all elgg_get_entities() options for entity
+ * restraints.
+ *
+ * @see elgg_get_entities
+ *
+ * @param array $options Array in format:
+ *
+ * annotation_names              => NULL|ARR Annotation names
+ * annotation_values             => NULL|ARR Annotation values
+ * annotation_ids                => NULL|ARR annotation ids
+ * annotation_case_sensitive     => BOOL Overall Case sensitive
+ * annotation_owner_guids        => NULL|ARR guids for annotation owners
+ * annotation_created_time_lower => INT Lower limit for created time.
+ * annotation_created_time_upper => INT Upper limit for created time.
+ * annotation_calculation        => STR Perform the MySQL function on the annotation values returned.
+ *                                   Do not confuse this "annotation_calculation" option with the
+ *                                   "calculation" option to elgg_get_entities_from_annotation_calculation().
+ *                                   The "annotation_calculation" option causes this function to
+ *                                   return the result of performing a mathematical calculation on
+ *                                   all annotations that match the query instead of ElggAnnotation
+ *                                   objects.
+ *                                   See the docs for elgg_get_entities_from_annotation_calculation()
+ *                                   for the proper use of the "calculation" option.
+ *
+ *
+ * @return ElggAnnotation[]|mixed
+ * @since 1.8.0
+ */
+function elgg_get_annotations(array $options = array()) {
+
+	// @todo remove support for count shortcut - see #4393
+	if (isset($options['__egefac']) && $options['__egefac']) {
+		unset($options['__egefac']);
+	} else {
+		// support shortcut of 'count' => true for 'annotation_calculation' => 'count'
+		if (isset($options['count']) && $options['count']) {
+			$options['annotation_calculation'] = 'count';
+			unset($options['count']);
+		}		
+	}
+	
+	$options['metastring_type'] = 'annotations';
+	return elgg_get_metastring_based_objects($options);
+}
+
+/**
+ * Deletes annotations based on $options.
+ *
+ * @warning Unlike elgg_get_annotations() this will not accept an empty options array!
+ *          This requires at least one constraint: annotation_owner_guid(s),
+ *          annotation_name(s), annotation_value(s), or guid(s) must be set.
+ *
+ * @param array $options An options array. {@See elgg_get_annotations()}
+ * @return bool|null true on success, false on failure, null if no annotations to delete.
+ * @since 1.8.0
+ */
+function elgg_delete_annotations(array $options) {
+	if (!elgg_is_valid_options_for_batch_operation($options, 'annotations')) {
+		return false;
+	}
+
+	$options['metastring_type'] = 'annotations';
+	return elgg_batch_metastring_based_objects($options, 'elgg_batch_delete_callback', false);
+}
+
+/**
+ * Disables annotations based on $options.
+ *
+ * @warning Unlike elgg_get_annotations() this will not accept an empty options array!
+ *
+ * @param array $options An options array. {@See elgg_get_annotations()}
+ * @return bool|null true on success, false on failure, null if no annotations disabled.
+ * @since 1.8.0
+ */
+function elgg_disable_annotations(array $options) {
+	if (!elgg_is_valid_options_for_batch_operation($options, 'annotations')) {
+		return false;
+	}
+	
+	// if we can see hidden (disabled) we need to use the offset
+	// otherwise we risk an infinite loop if there are more than 50
+	$inc_offset = access_get_show_hidden_status();
+
+	$options['metastring_type'] = 'annotations';
+	return elgg_batch_metastring_based_objects($options, 'elgg_batch_disable_callback', $inc_offset);
+}
+
+/**
+ * Enables annotations based on $options.
+ *
+ * @warning Unlike elgg_get_annotations() this will not accept an empty options array!
+ *
+ * @warning In order to enable annotations, you must first use
+ * {@link access_show_hidden_entities()}.
+ *
+ * @param array $options An options array. {@See elgg_get_annotations()}
+ * @return bool|null true on success, false on failure, null if no metadata enabled.
+ * @since 1.8.0
+ */
+function elgg_enable_annotations(array $options) {
+	if (!$options || !is_array($options)) {
+		return false;
+	}
+
+	$options['metastring_type'] = 'annotations';
+	return elgg_batch_metastring_based_objects($options, 'elgg_batch_enable_callback');
+}
+
+/**
+ * Returns a rendered list of annotations with pagination.
+ *
+ * @param array $options Annotation getter and display options.
+ * {@see elgg_get_annotations()} and {@see elgg_list_entities()}.
+ *
+ * @return string The list of entities
+ * @since 1.8.0
+ */
+function elgg_list_annotations($options) {
+	$defaults = array(
+		'limit' => 25,
+		'offset' => (int) max(get_input('annoff', 0), 0),
+	);
+
+	$options = array_merge($defaults, $options);
+
+	return elgg_list_entities($options, 'elgg_get_annotations', 'elgg_view_annotation_list');
+}
+
+/**
+ * Entities interfaces
+ */
+
+/**
+ * Returns entities based upon annotations.  Also accepts all options available
+ * to elgg_get_entities() and elgg_get_entities_from_metadata().
+ *
+ * Entity creation time is selected as maxtime. To sort based upon
+ * this, pass 'order_by' => 'maxtime asc' || 'maxtime desc'
+ *
+ * @see elgg_get_entities
+ * @see elgg_get_entities_from_metadata
+ *
+ * @param array $options Array in format:
+ *
+ * 	annotation_names => NULL|ARR annotations names
+ *
+ * 	annotation_values => NULL|ARR annotations values
+ *
+ * 	annotation_name_value_pairs => NULL|ARR (name = 'name', value => 'value',
+ * 	'operator' => '=', 'case_sensitive' => TRUE) entries.
+ * 	Currently if multiple values are sent via an array (value => array('value1', 'value2')
+ * 	the pair's operator will be forced to "IN".
+ *
+ * 	annotation_name_value_pairs_operator => NULL|STR The operator to use for combining
+ *  (name = value) OPERATOR (name = value); default AND
+ *
+ * 	annotation_case_sensitive => BOOL Overall Case sensitive
+ *
+ *  order_by_annotation => NULL|ARR (array('name' => 'annotation_text1', 'direction' => ASC|DESC,
+ *  'as' => text|integer),
+ *
+ *  Also supports array('name' => 'annotation_text1')
+ *
+ *  annotation_owner_guids => NULL|ARR guids for annotaiton owners
+ *
+ * @return mixed If count, int. If not count, array. false on errors.
+ * @since 1.7.0
+ */
+function elgg_get_entities_from_annotations(array $options = array()) {
+	$defaults = array(
+		'annotation_names'						=>	ELGG_ENTITIES_ANY_VALUE,
+		'annotation_values'						=>	ELGG_ENTITIES_ANY_VALUE,
+		'annotation_name_value_pairs'			=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'annotation_name_value_pairs_operator'	=>	'AND',
+		'annotation_case_sensitive' 			=>	TRUE,
+		'order_by_annotation'					=>	array(),
+
+		'annotation_created_time_lower'			=>	ELGG_ENTITIES_ANY_VALUE,
+		'annotation_created_time_upper'			=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'annotation_owner_guids'				=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'order_by'								=>	'maxtime desc',
+		'group_by'								=>	'a.entity_guid'
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('annotation_name', 'annotation_value',
+	'annotation_name_value_pair', 'annotation_owner_guid');
+
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+	$options = elgg_entities_get_metastrings_options('annotation', $options);
+
+	if (!$options) {
+		return false;
+	}
+
+	// special sorting for annotations
+	//@todo overrides other sorting
+	$options['selects'][] = "max(n_table.time_created) as maxtime";
+	$options['group_by'] = 'n_table.entity_guid';
+
+	$time_wheres = elgg_get_entity_time_where_sql('a', $options['annotation_created_time_upper'],
+		$options['annotation_created_time_lower']);
+
+	if ($time_wheres) {
+		$options['wheres'] = array_merge($options['wheres'], $time_wheres);
+	}
+
+	return elgg_get_entities_from_metadata($options);
+}
+
+/**
+ * Returns a viewable list of entities from annotations.
+ *
+ * @param array $options Options array
+ *
+ * @see elgg_get_entities_from_annotations()
+ * @see elgg_list_entities()
+ *
+ * @return string
+ */
+function elgg_list_entities_from_annotations($options = array()) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_annotations');
+}
+
+/**
+ * Get entities ordered by a mathematical calculation on annotation values
+ *
+ * @param array $options An options array:
+ * 	'calculation'            => The calculation to use. Must be a valid MySQL function.
+ *                              Defaults to sum.  Result selected as 'annotation_calculation'.
+ *                              Don't confuse this "calculation" option with the
+ *                              "annotation_calculation" option to elgg_get_annotations().
+ *                              This "calculation" option is applied to each entity's set of
+ *                              annotations and is selected as annotation_calculation for that row.
+ *                              See the docs for elgg_get_annotations() for proper use of the
+ *                              "annotation_calculation" option.
+ *	'order_by'               => The order for the sorting. Defaults to 'annotation_calculation desc'.
+ *	'annotation_names'       => The names of annotations on the entity.
+ *	'annotation_values'	     => The values of annotations on the entity.
+ *
+ *	'metadata_names'         => The name of metadata on the entity.
+ *	'metadata_values'        => The value of metadata on the entitiy.
+ *
+ * @return mixed If count, int. If not count, array. false on errors.
+ */
+function elgg_get_entities_from_annotation_calculation($options) {
+	$db_prefix = elgg_get_config('dbprefix');
+	$defaults = array(
+		'calculation' => 'sum',
+		'order_by' => 'annotation_calculation desc'
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$function = sanitize_string(elgg_extract('calculation', $options, 'sum', false));
+
+	// you must cast this as an int or it sorts wrong.
+	$options['selects'][] = 'e.*';
+	$options['selects'][] = "$function(cast(a_msv.string as signed)) as annotation_calculation";
+
+	// need our own join to get the values because the lower level functions don't
+	// add all the joins if it's a different callback.
+	$options['joins'][] = "JOIN {$db_prefix}metastrings a_msv ON n_table.value_id = a_msv.id";
+
+	// don't need access control because it's taken care of by elgg_get_annotations.
+	$options['group_by'] = 'n_table.entity_guid';
+
+	$options['callback'] = 'entity_row_to_elggstar';
+
+	// see #4393
+	// @todo remove after the 'count' shortcut is removed from elgg_get_annotations()
+	$options['__egefac'] = true;
+
+	return elgg_get_annotations($options);
+}
+
+/**
+ * List entities from an annotation calculation.
+ *
+ * @see elgg_get_entities_from_annotation_calculation()
+ *
+ * @param array $options An options array.
+ *
+ * @return string
+ */
+function elgg_list_entities_from_annotation_calculation($options) {
+	$defaults = array(
+		'calculation' => 'sum',
+		'order_by' => 'annotation_calculation desc'
+	);
+	$options = array_merge($defaults, $options);
+
+	return elgg_list_entities($options, 'elgg_get_entities_from_annotation_calculation');
+}
+
+/**
+ * Export the annotations for the specified entity
+ *
+ * @param string $hook        'export'
+ * @param string $type        'all'
+ * @param mixed  $returnvalue Default return value
+ * @param mixed  $params      Parameters determining what annotations to export
+ *
+ * @elgg_plugin_hook export all
+ *
+ * @return array
+ * @throws InvalidParameterException
+ * @access private
+ */
+function export_annotation_plugin_hook($hook, $type, $returnvalue, $params) {
+	// Sanity check values
+	if ((!is_array($params)) && (!isset($params['guid']))) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:GUIDNotForExport'));
+	}
+
+	if (!is_array($returnvalue)) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonArrayReturnValue'));
+	}
+
+	$guid = (int)$params['guid'];
+	$options = array('guid' => $guid, 'limit' => 0);
+	if (isset($params['name'])) {
+		$options['annotation_name'] = $params['name'];
+	}
+
+	$result = elgg_get_annotations($options);
+
+	if ($result) {
+		foreach ($result as $r) {
+			$returnvalue[] = $r->export();
+		}
+	}
+
+	return $returnvalue;
+}
+
+/**
+ * Get the URL for this item of metadata, by default this links to the
+ * export handler in the current view.
+ *
+ * @param int $id Annotation id
+ *
+ * @return mixed
+ */
+function get_annotation_url($id) {
+	$id = (int)$id;
+
+	if ($extender = elgg_get_annotation_from_id($id)) {
+		return get_extender_url($extender);
+	}
+	return false;
+}
+
+/**
+ * Check to see if a user has already created an annotation on an object
+ *
+ * @param int    $entity_guid     Entity guid
+ * @param string $annotation_type Type of annotation
+ * @param int    $owner_guid      Defaults to logged in user.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_annotation_exists($entity_guid, $annotation_type, $owner_guid = NULL) {
+	global $CONFIG;
+
+	if (!$owner_guid && !($owner_guid = elgg_get_logged_in_user_guid())) {
+		return FALSE;
+	}
+
+	$entity_guid = sanitize_int($entity_guid);
+	$owner_guid = sanitize_int($owner_guid);
+	$annotation_type = sanitize_string($annotation_type);
+
+	$sql = "SELECT a.id FROM {$CONFIG->dbprefix}annotations a" .
+			" JOIN {$CONFIG->dbprefix}metastrings m ON a.name_id = m.id" .
+			" WHERE a.owner_guid = $owner_guid AND a.entity_guid = $entity_guid" .
+			" AND m.string = '$annotation_type'";
+
+	if (get_data_row($sql)) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Return the URL for a comment
+ *
+ * @param ElggAnnotation $comment The comment object 
+ * @return string
+ * @access private
+ */
+function elgg_comment_url_handler(ElggAnnotation $comment) {
+	$entity = $comment->getEntity();
+	if ($entity) {
+		return $entity->getURL() . '#item-annotation-' . $comment->id;
+	}
+	return "";
+}
+
+/**
+ * Register an annotation url handler.
+ *
+ * @param string $extender_name The name, default 'all'.
+ * @param string $function_name The function.
+ *
+ * @return string
+ */
+function elgg_register_annotation_url_handler($extender_name = "all", $function_name) {
+	return elgg_register_extender_url_handler('annotation', $extender_name, $function_name);
+}
+
+/**
+ * Register annotation unit tests
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $value
+ * @param array $params
+ * @return array
+ * @access private
+ */
+function annotations_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/annotations.php';
+	return $value;
+}
+
+/**
+ * Initialize the annotation library
+ * @access private
+ */
+function elgg_annotations_init() {
+	elgg_register_annotation_url_handler('generic_comment', 'elgg_comment_url_handler');
+
+	elgg_register_plugin_hook_handler("export", "all", "export_annotation_plugin_hook", 2);
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'annotations_test');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_annotations_init');
diff --git a/engine/lib/cache.php b/engine/lib/cache.php
new file mode 100644
index 000000000..3116c1a9b
--- /dev/null
+++ b/engine/lib/cache.php
@@ -0,0 +1,453 @@
+<?php
+/**
+ * Elgg cache
+ * Cache file interface for caching data.
+ *
+ * @package    Elgg.Core
+ * @subpackage Cache
+ */
+
+/* Filepath Cache */
+
+/**
+ * Returns an ElggCache object suitable for caching system information
+ *
+ * @todo Can this be done in a cleaner way?
+ * @todo Swap to memcache etc?
+ *
+ * @return ElggFileCache
+ */
+function elgg_get_system_cache() {
+	global $CONFIG;
+
+	/**
+	 * A default filestore cache using the dataroot.
+	 */
+	static $FILE_PATH_CACHE;
+
+	if (!$FILE_PATH_CACHE) {
+		$FILE_PATH_CACHE = new ElggFileCache($CONFIG->dataroot . 'system_cache/');
+	}
+
+	return $FILE_PATH_CACHE;
+}
+
+/**
+ * Reset the system cache by deleting the caches
+ *
+ * @return void
+ */
+function elgg_reset_system_cache() {
+	$cache = elgg_get_system_cache();
+	$cache->clear();
+}
+
+/**
+ * Saves a system cache.
+ *
+ * @param string $type The type or identifier of the cache
+ * @param string $data The data to be saved
+ * @return bool
+ */
+function elgg_save_system_cache($type, $data) {
+	global $CONFIG;
+
+	if ($CONFIG->system_cache_enabled) {
+		$cache = elgg_get_system_cache();
+		return $cache->save($type, $data);
+	}
+
+	return false;
+}
+
+/**
+ * Retrieve the contents of a system cache.
+ *
+ * @param string $type The type of cache to load
+ * @return string
+ */
+function elgg_load_system_cache($type) {
+	global $CONFIG;
+
+	if ($CONFIG->system_cache_enabled) {
+		$cache = elgg_get_system_cache();
+		$cached_data = $cache->load($type);
+
+		if ($cached_data) {
+			return $cached_data;
+		}
+	}
+
+	return NULL;
+}
+
+/**
+ * Enables the system disk cache.
+ *
+ * Uses the 'system_cache_enabled' datalist with a boolean value.
+ * Resets the system cache.
+ *
+ * @return void
+ */
+function elgg_enable_system_cache() {
+	global $CONFIG;
+
+	datalist_set('system_cache_enabled', 1);
+	$CONFIG->system_cache_enabled = 1;
+	elgg_reset_system_cache();
+}
+
+/**
+ * Disables the system disk cache.
+ *
+ * Uses the 'system_cache_enabled' datalist with a boolean value.
+ * Resets the system cache.
+ *
+ * @return void
+ */
+function elgg_disable_system_cache() {
+	global $CONFIG;
+
+	datalist_set('system_cache_enabled', 0);
+	$CONFIG->system_cache_enabled = 0;
+	elgg_reset_system_cache();
+}
+
+/** @todo deprecate in Elgg 1.9 **/
+
+/**
+ * @access private
+ */
+function elgg_get_filepath_cache() {
+	return elgg_get_system_cache();
+}
+/**
+ * @access private
+ */
+function elgg_filepath_cache_reset() {
+	elgg_reset_system_cache();
+}
+/**
+ * @access private
+ */
+function elgg_filepath_cache_save($type, $data) {
+	return elgg_save_system_cache($type, $data);
+}
+/**
+ * @access private
+ */
+function elgg_filepath_cache_load($type) {
+	return elgg_load_system_cache($type);
+}
+/**
+ * @access private
+ */
+function elgg_enable_filepath_cache() {
+	elgg_enable_system_cache();
+}
+/**
+ * @access private
+ */
+function elgg_disable_filepath_cache() {
+	elgg_disable_system_cache();
+}
+
+/* Simplecache */
+
+/**
+ * Registers a view to simple cache.
+ *
+ * Simple cache is a caching mechanism that saves the output of
+ * views and its extensions into a file.  If the view is called
+ * by the {@link simplecache/view.php} file, the Elgg framework will
+ * not be loaded and the contents of the view will returned
+ * from file.
+ *
+ * @warning Simple cached views must take no parameters and return
+ * the same content no matter who is logged in.
+ *
+ * @example
+ * 		$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
+ *		elgg_register_simplecache_view('js/blog/save_draft');
+ *		elgg_register_js('elgg.blog', $blog_js);
+ *		elgg_load_js('elgg.blog');
+ *
+ * @param string $viewname View name
+ *
+ * @return void
+ * @link http://docs.elgg.org/Views/Simplecache
+ * @see elgg_regenerate_simplecache()
+ * @since 1.8.0
+ */
+function elgg_register_simplecache_view($viewname) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->views)) {
+		$CONFIG->views = new stdClass;
+	}
+
+	if (!isset($CONFIG->views->simplecache)) {
+		$CONFIG->views->simplecache = array();
+	}
+
+	$CONFIG->views->simplecache[] = $viewname;
+}
+
+/**
+ * Get the URL for the cached file
+ *
+ * @warning You must register the view with elgg_register_simplecache_view()
+ * for caching to work. See elgg_register_simplecache_view() for a full example.
+ *
+ * @param string $type The file type: css or js
+ * @param string $view The view name
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_get_simplecache_url($type, $view) {
+	global $CONFIG;
+	$lastcache = (int)$CONFIG->lastcache;
+	$viewtype = elgg_get_viewtype();
+	elgg_register_simplecache_view("$type/$view");// see #5302
+	if (elgg_is_simplecache_enabled()) {
+		$url = elgg_get_site_url() . "cache/$type/$viewtype/$view.$lastcache.$type";
+	} else {
+		$url = elgg_get_site_url() . "$type/$view.$lastcache.$type";
+		$elements = array("view" => $viewtype);
+		$url = elgg_http_add_url_query_elements($url, $elements);
+	}
+	
+	return $url;
+}
+
+/**
+ * Regenerates the simple cache.
+ *
+ * @warning This does not invalidate the cache, but actively rebuilds it.
+ *
+ * @param string $viewtype Optional viewtype to regenerate. Defaults to all valid viewtypes.
+ *
+ * @return void
+ * @see elgg_register_simplecache_view()
+ * @since 1.8.0
+ */
+function elgg_regenerate_simplecache($viewtype = NULL) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->views->simplecache) || !is_array($CONFIG->views->simplecache)) {
+		return;
+	}
+
+	$lastcached = time();
+
+	// @todo elgg_view() checks if the page set is done (isset($CONFIG->pagesetupdone)) and
+	// triggers an event if it's not. Calling elgg_view() here breaks submenus
+	// (at least) because the page setup hook is called before any
+	// contexts can be correctly set (since this is called before page_handler()).
+	// To avoid this, lie about $CONFIG->pagehandlerdone to force
+	// the trigger correctly when the first view is actually being output.
+	$CONFIG->pagesetupdone = TRUE;
+
+	if (!file_exists($CONFIG->dataroot . 'views_simplecache')) {
+		mkdir($CONFIG->dataroot . 'views_simplecache');
+	}
+
+	if (isset($viewtype)) {
+		$viewtypes = array($viewtype);
+	} else {
+		$viewtypes = $CONFIG->view_types;
+	}
+
+	$original_viewtype = elgg_get_viewtype();
+
+	// disable error reporting so we don't cache problems
+	$old_debug = elgg_get_config('debug');
+	elgg_set_config('debug', null);
+
+	foreach ($viewtypes as $viewtype) {
+		elgg_set_viewtype($viewtype);
+		foreach ($CONFIG->views->simplecache as $view) {
+			$viewcontents = elgg_view($view);
+			$viewname = md5(elgg_get_viewtype() . $view);
+			if ($handle = fopen($CONFIG->dataroot . 'views_simplecache/' . $viewname, 'w')) {
+				fwrite($handle, $viewcontents);
+				fclose($handle);
+			}
+		}
+
+		datalist_set("simplecache_lastupdate_$viewtype", $lastcached);
+		datalist_set("simplecache_lastcached_$viewtype", $lastcached);
+	}
+
+	elgg_set_config('debug', $old_debug);
+	elgg_set_viewtype($original_viewtype);
+
+	// needs to be set for links in html head
+	$CONFIG->lastcache = $lastcached;
+
+	unset($CONFIG->pagesetupdone);
+}
+
+/**
+ * Is simple cache enabled
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_is_simplecache_enabled() {
+	if (elgg_get_config('simplecache_enabled')) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Enables the simple cache.
+ *
+ * @access private
+ * @see elgg_register_simplecache_view()
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_enable_simplecache() {
+	global $CONFIG;
+
+	datalist_set('simplecache_enabled', 1);
+	$CONFIG->simplecache_enabled = 1;
+	elgg_regenerate_simplecache();
+}
+
+/**
+ * Disables the simple cache.
+ *
+ * @warning Simplecache is also purged when disabled.
+ *
+ * @access private
+ * @see elgg_register_simplecache_view()
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_disable_simplecache() {
+	global $CONFIG;
+	if ($CONFIG->simplecache_enabled) {
+		datalist_set('simplecache_enabled', 0);
+		$CONFIG->simplecache_enabled = 0;
+
+		// purge simple cache
+		if ($handle = opendir($CONFIG->dataroot . 'views_simplecache')) {
+			while (false !== ($file = readdir($handle))) {
+				if ($file != "." && $file != "..") {
+					unlink($CONFIG->dataroot . 'views_simplecache/' . $file);
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+/**
+ * Deletes all cached views in the simplecache and sets the lastcache and
+ * lastupdate time to 0 for every valid viewtype.
+ *
+ * @return bool
+ * @since 1.7.4
+ */
+function elgg_invalidate_simplecache() {
+	global $CONFIG;
+
+	if (!isset($CONFIG->views->simplecache) || !is_array($CONFIG->views->simplecache)) {
+		return false;
+	}
+
+	$handle = opendir($CONFIG->dataroot . 'views_simplecache');
+
+	if (!$handle) {
+		return false;
+	}
+
+	// remove files.
+	$return = true;
+	while (false !== ($file = readdir($handle))) {
+		if ($file != "." && $file != "..") {
+			$return &= unlink($CONFIG->dataroot . 'views_simplecache/' . $file);
+		}
+	}
+	closedir($handle);
+
+	// reset cache times
+	$viewtypes = $CONFIG->view_types;
+
+	if (!is_array($viewtypes)) {
+		return false;
+	}
+
+	foreach ($viewtypes as $viewtype) {
+		$return &= datalist_set("simplecache_lastupdate_$viewtype", 0);
+		$return &= datalist_set("simplecache_lastcached_$viewtype", 0);
+	}
+
+	return $return;
+}
+
+/**
+ * @see elgg_reset_system_cache()
+ * @access private
+ */
+function _elgg_load_cache() {
+	global $CONFIG;
+
+	$CONFIG->system_cache_loaded = false;
+
+	$CONFIG->views = new stdClass();
+	$data = elgg_load_system_cache('view_locations');
+	if (!is_string($data)) {
+		return;
+	}
+	$CONFIG->views->locations = unserialize($data);
+	
+	$data = elgg_load_system_cache('view_types');
+	if (!is_string($data)) {
+		return;
+	}
+	$CONFIG->view_types = unserialize($data);
+
+	$CONFIG->system_cache_loaded = true;
+}
+
+/**
+ * @access private
+ */
+function _elgg_cache_init() {
+	global $CONFIG;
+
+	$viewtype = elgg_get_viewtype();
+
+	// Regenerate the simple cache if expired.
+	// Don't do it on upgrade because upgrade does it itself.
+	// @todo - move into function and perhaps run off init system event
+	if (!defined('UPGRADING')) {
+		$lastupdate = datalist_get("simplecache_lastupdate_$viewtype");
+		$lastcached = datalist_get("simplecache_lastcached_$viewtype");
+		if ($lastupdate == 0 || $lastcached < $lastupdate) {
+			elgg_regenerate_simplecache($viewtype);
+			$lastcached = datalist_get("simplecache_lastcached_$viewtype");
+		}
+		$CONFIG->lastcache = $lastcached;
+	}
+
+	// cache system data if enabled and not loaded
+	if ($CONFIG->system_cache_enabled && !$CONFIG->system_cache_loaded) {
+		elgg_save_system_cache('view_locations', serialize($CONFIG->views->locations));
+		elgg_save_system_cache('view_types', serialize($CONFIG->view_types));
+	}
+
+	if ($CONFIG->system_cache_enabled && !$CONFIG->i18n_loaded_from_cache) {
+		reload_all_translations();
+		foreach ($CONFIG->translations as $lang => $map) {
+			elgg_save_system_cache("$lang.lang", serialize($map));
+		}
+	}
+}
+
+elgg_register_event_handler('ready', 'system', '_elgg_cache_init');
diff --git a/engine/lib/calendar.php b/engine/lib/calendar.php
new file mode 100644
index 000000000..e6f95934c
--- /dev/null
+++ b/engine/lib/calendar.php
@@ -0,0 +1,573 @@
+<?php
+/**
+ * Elgg calendar / entity / event functions.
+ *
+ * @package    Elgg.Core
+ * @subpackage Calendar
+ *
+ * @todo Implement or remove
+ */
+
+/**
+ * Return a timestamp for the start of a given day (defaults today).
+ *
+ * @param int $day   Day
+ * @param int $month Month
+ * @param int $year  Year
+ *
+ * @return int
+ * @access private
+ */
+function get_day_start($day = null, $month = null, $year = null) {
+	return mktime(0, 0, 0, $month, $day, $year);
+}
+
+/**
+ * Return a timestamp for the end of a given day (defaults today).
+ *
+ * @param int $day   Day
+ * @param int $month Month
+ * @param int $year  Year
+ *
+ * @return int
+ * @access private
+ */
+function get_day_end($day = null, $month = null, $year = null) {
+	return mktime(23, 59, 59, $month, $day, $year);
+}
+
+/**
+ * Return the notable entities for a given time period.
+ *
+ * @todo this function also accepts an array(type => subtypes) for 3rd arg. Should we document this?
+ *
+ * @param int     $start_time     The start time as a unix timestamp.
+ * @param int     $end_time       The end time as a unix timestamp.
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param string  $order_by       The field to order by; by default, time_created desc
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param int     $offset         The indexing offset, 0 by default
+ * @param boolean $count          Set to true to get a count instead of entities. Defaults to false.
+ * @param int     $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param mixed   $container_guid Container or containers to get entities from (default: any).
+ *
+ * @return array|false
+ * @access private
+ */
+function get_notable_entities($start_time, $end_time, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "asc", $limit = 10, $offset = 0, $count = false, $site_guid = 0,
+$container_guid = null) {
+	global $CONFIG;
+
+	if ($subtype === false || $subtype === null || $subtype === 0) {
+		return false;
+	}
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	$where = array();
+
+	if (is_array($type)) {
+		$tempwhere = "";
+		if (sizeof($type)) {
+			foreach ($type as $typekey => $subtypearray) {
+				foreach ($subtypearray as $subtypeval) {
+					$typekey = sanitise_string($typekey);
+					if (!empty($subtypeval)) {
+						$subtypeval = (int) get_subtype_id($typekey, $subtypeval);
+					} else {
+						$subtypeval = 0;
+					}
+					if (!empty($tempwhere)) {
+						$tempwhere .= " or ";
+					}
+					$tempwhere .= "(e.type = '{$typekey}' and e.subtype = {$subtypeval})";
+				}
+			}
+		}
+		if (!empty($tempwhere)) {
+			$where[] = "({$tempwhere})";
+		}
+	} else {
+		$type = sanitise_string($type);
+		$subtype = get_subtype_id($type, $subtype);
+
+		if ($type != "") {
+			$where[] = "e.type='$type'";
+		}
+
+		if ($subtype !== "") {
+			$where[] = "e.subtype=$subtype";
+		}
+	}
+
+	if ($owner_guid != "") {
+		if (!is_array($owner_guid)) {
+			$owner_array = array($owner_guid);
+			$owner_guid = (int) $owner_guid;
+			$where[] = "e.owner_guid = '$owner_guid'";
+		} else if (sizeof($owner_guid) > 0) {
+			$owner_array = array_map('sanitise_int', $owner_guid);
+			// Cast every element to the owner_guid array to int
+			$owner_guid = implode(",", $owner_guid);
+			$where[] = "e.owner_guid in ({$owner_guid})";
+		}
+		if (is_null($container_guid)) {
+			$container_guid = $owner_array;
+		}
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if (!is_null($container_guid)) {
+		if (is_array($container_guid)) {
+			foreach ($container_guid as $key => $val) {
+				$container_guid[$key] = (int) $val;
+			}
+			$where[] = "e.container_guid in (" . implode(",", $container_guid) . ")";
+		} else {
+			$container_guid = (int) $container_guid;
+			$where[] = "e.container_guid = {$container_guid}";
+		}
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+
+	if (!$count) {
+		$query = "SELECT e.* from {$CONFIG->dbprefix}entities e $cal_join where ";
+	} else {
+		$query = "SELECT count(e.guid) as total from {$CONFIG->dbprefix}entities e $cal_join where ";
+	}
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	$query .= get_access_sql_suffix('e'); // Add access controls
+
+	if (!$count) {
+		$query .= " order by n.calendar_start $order_by";
+		// Add order and limit
+		if ($limit) {
+			$query .= " limit $offset, $limit";
+		}
+		$dt = get_data($query, "entity_row_to_elggstar");
+
+		return $dt;
+	} else {
+		$total = get_data_row($query);
+		return $total->total;
+	}
+}
+
+/**
+ * Return the notable entities for a given time period based on an item of metadata.
+ *
+ * @param int    $start_time     The start time as a unix timestamp.
+ * @param int    $end_time       The end time as a unix timestamp.
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param bool   $count          If true, returns count instead of entities. (Default: false)
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ * @access private
+ */
+function get_notable_entities_from_metadata($start_time, $end_time, $meta_name, $meta_value = "",
+$entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "",
+$site_guid = 0, $count = false) {
+
+	global $CONFIG;
+
+	$meta_n = get_metastring_id($meta_name);
+	$meta_v = get_metastring_id($meta_value);
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$entity_type = sanitise_string($entity_type);
+	$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$site_guid = (int) $site_guid;
+	if ((is_array($owner_guid) && (count($owner_guid)))) {
+		foreach ($owner_guid as $key => $guid) {
+			$owner_guid[$key] = (int) $guid;
+		}
+	} else {
+		$owner_guid = (int) $owner_guid;
+	}
+
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	//$access = get_access_list();
+
+	$where = array();
+
+	if ($entity_type != "") {
+		$where[] = "e.type='$entity_type'";
+	}
+
+	if ($entity_subtype) {
+		$where[] = "e.subtype=$entity_subtype";
+	}
+
+	if ($meta_name != "") {
+		$where[] = "m.name_id='$meta_n'";
+	}
+
+	if ($meta_value != "") {
+		$where[] = "m.value_id='$meta_v'";
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if (is_array($owner_guid)) {
+		$where[] = "e.container_guid in (" . implode(",", $owner_guid) . ")";
+	} else if ($owner_guid > 0) {
+		$where[] = "e.container_guid = {$owner_guid}";
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+	if (!$count) {
+		$query = "SELECT distinct e.* ";
+	} else {
+		$query = "SELECT count(distinct e.guid) as total ";
+	}
+
+	$query .= "from {$CONFIG->dbprefix}entities e"
+	. " JOIN {$CONFIG->dbprefix}metadata m on e.guid = m.entity_guid $cal_join where";
+
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix("e");
+	$query .= ' and ' . get_access_sql_suffix("m");
+
+	if (!$count) {
+		// Add order and limit
+		$query .= " order by $order_by limit $offset, $limit";
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($row = get_data_row($query)) {
+			return $row->total;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Return the notable entities for a given time period based on their relationship.
+ *
+ * @param int     $start_time           The start time as a unix timestamp.
+ * @param int     $end_time             The end time as a unix timestamp.
+ * @param string  $relationship         The relationship eg "friends_of"
+ * @param int     $relationship_guid    The guid of the entity to use query
+ * @param bool    $inverse_relationship Reverse the normal function of the query to say
+ *                                      "give me all entities for whom $relationship_guid is a
+ *                                      $relationship of"
+ * @param string  $type                 Entity type
+ * @param string  $subtype              Entity subtype
+ * @param int     $owner_guid           Owner GUID
+ * @param string  $order_by             Optional Order by
+ * @param int     $limit                Limit
+ * @param int     $offset               Offset
+ * @param boolean $count                If true returns a count of entities (default false)
+ * @param int     $site_guid            Site to get entities for. Default 0 = current site. -1 = any
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ * @access private
+ */
+function get_noteable_entities_from_relationship($start_time, $end_time, $relationship,
+$relationship_guid, $inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+
+	global $CONFIG;
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$relationship = sanitise_string($relationship);
+	$relationship_guid = (int)$relationship_guid;
+	$inverse_relationship = (bool)$inverse_relationship;
+	$type = sanitise_string($type);
+	$subtype = get_subtype_id($type, $subtype);
+	$owner_guid = (int)$owner_guid;
+	if ($order_by == "") {
+		$order_by = "time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	//$access = get_access_list();
+
+	$where = array();
+
+	if ($relationship != "") {
+		$where[] = "r.relationship='$relationship'";
+	}
+	if ($relationship_guid) {
+		$where[] = $inverse_relationship ?
+			"r.guid_two='$relationship_guid'" : "r.guid_one='$relationship_guid'";
+	}
+	if ($type != "") {
+		$where[] = "e.type='$type'";
+	}
+	if ($subtype) {
+		$where[] = "e.subtype=$subtype";
+	}
+	if ($owner_guid != "") {
+		$where[] = "e.container_guid='$owner_guid'";
+	}
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+	// Select what we're joining based on the options
+	$joinon = "e.guid = r.guid_one";
+	if (!$inverse_relationship) {
+		$joinon = "e.guid = r.guid_two";
+	}
+
+	if ($count) {
+		$query = "SELECT count(distinct e.guid) as total ";
+	} else {
+		$query = "SELECT distinct e.* ";
+	}
+	$query .= " from {$CONFIG->dbprefix}entity_relationships r"
+	. " JOIN {$CONFIG->dbprefix}entities e on $joinon $cal_join where ";
+
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+	// Add access controls
+	$query .= get_access_sql_suffix("e");
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Get all entities for today.
+ *
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param string  $order_by       The field to order by; by default, time_created desc
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param int     $offset         The indexing offset, 0 by default
+ * @param boolean $count          If true returns a count of entities (default false)
+ * @param int     $site_guid      Site to get entities for. Default 0 = current site. -1 = any
+ * @param mixed   $container_guid Container(s) to get entities from (default: any).
+ *
+ * @return array|false
+ * @access private
+ */
+function get_todays_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "",
+$limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null) {
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities($day_start, $day_end, $type, $subtype, $owner_guid, $order_by,
+		$limit, $offset, $count, $site_guid, $container_guid);
+}
+
+/**
+ * Get entities for today from metadata.
+ *
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param bool   $count          If true, returns count instead of entities. (Default: false)
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ * @access private
+ */
+function get_todays_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "",
+$entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0,
+$count = false) {
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities_from_metadata($day_start, $day_end, $meta_name, $meta_value,
+		$entity_type, $entity_subtype, $owner_guid, $limit, $offset, $order_by, $site_guid, $count);
+}
+
+/**
+ * Get entities for today from a relationship
+ *
+ * @param string  $relationship         The relationship eg "friends_of"
+ * @param int     $relationship_guid    The guid of the entity to use query
+ * @param bool    $inverse_relationship Reverse the normal function of the query to say
+ *                                      "give me all entities for whom $relationship_guid is a
+ *                                      $relationship of"
+ * @param string  $type                 Entity type
+ * @param string  $subtype              Entity subtype
+ * @param int     $owner_guid           Owner GUID
+ * @param string  $order_by             Optional Order by
+ * @param int     $limit                Limit
+ * @param int     $offset               Offset
+ * @param boolean $count                If true returns a count of entities (default false)
+ * @param int     $site_guid            Site to get entities for. Default 0 = current site. -1 = any
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ * @access private
+ */
+function get_todays_entities_from_relationship($relationship, $relationship_guid,
+$inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities_from_relationship($day_start, $day_end, $relationship,
+		$relationship_guid,	$inverse_relationship, $type, $subtype, $owner_guid, $order_by,
+		$limit, $offset, $count, $site_guid);
+}
+
+/**
+ * Returns a viewable list of entities for a given time period.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param int     $start_time     The start time as a unix timestamp.
+ * @param int     $end_time       The end time as a unix timestamp.
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param boolean $fullview       Whether or not to display the full view (default: true)
+ * @param boolean $listtypetoggle Whether or not to allow gallery view
+ * @param boolean $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @access private
+ */
+function list_notable_entities($start_time, $end_time, $type= "", $subtype = "", $owner_guid = 0,
+$limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
+
+	$offset = (int) get_input('offset');
+	$count = get_notable_entities($start_time, $end_time, $type, $subtype,
+		$owner_guid, "", $limit, $offset, true);
+
+	$entities = get_notable_entities($start_time, $end_time, $type, $subtype,
+		$owner_guid, "", $limit, $offset);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit,
+		$fullview, $listtypetoggle, $navigation);
+}
+
+/**
+ * Return a list of today's entities.
+ *
+ * @see list_notable_entities
+ *
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param boolean $fullview       Whether or not to display the full view (default: true)
+ * @param boolean $listtypetoggle Whether or not to allow gallery view
+ * @param boolean $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @access private
+ */
+function list_todays_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10,
+$fullview = true, $listtypetoggle = false, $navigation = true) {
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return list_notable_entities($day_start, $day_end, $type, $subtype, $owner_guid, $limit,
+		$fullview, $listtypetoggle, $navigation);
+}
diff --git a/engine/lib/configuration.php b/engine/lib/configuration.php
new file mode 100644
index 000000000..55e5bbd36
--- /dev/null
+++ b/engine/lib/configuration.php
@@ -0,0 +1,632 @@
+<?php
+/**
+ * Elgg configuration procedural code.
+ *
+ * Includes functions for manipulating the configuration values stored in the database
+ * Plugin authors should use the {@link elgg_get_config()}, {@link elgg_set_config()},
+ * {@link elgg_save_config()}, and {@unset_config()} functions to access or update
+ * config values.
+ *
+ * Elgg's configuration is split among 2 tables and 1 file:
+ * - dbprefix_config
+ * - dbprefix_datalists
+ * - engine/settings.php (See {@link settings.example.php})
+ *
+ * Upon system boot, all values in dbprefix_config are read into $CONFIG.
+ *
+ * @package Elgg.Core
+ * @subpackage Configuration
+ */
+
+/**
+ * Get the URL for the current (or specified) site
+ *
+ * @param int $site_guid The GUID of the site whose URL we want to grab
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_get_site_url($site_guid = 0) {
+	if ($site_guid == 0) {
+		global $CONFIG;
+		return $CONFIG->wwwroot;
+	}
+
+	$site = get_entity($site_guid);
+
+	if (!$site instanceof ElggSite) {
+		return false;
+	}
+	/* @var ElggSite $site */
+
+	return $site->url;
+}
+
+/**
+ * Get the plugin path for this installation
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_get_plugins_path() {
+	global $CONFIG;
+	return $CONFIG->pluginspath;
+}
+
+/**
+ * Get the data directory path for this installation
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_get_data_path() {
+	global $CONFIG;
+	return $CONFIG->dataroot;
+}
+
+/**
+ * Get the root directory path for this installation
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_get_root_path() {
+	global $CONFIG;
+	return $CONFIG->path;
+}
+
+/**
+ * Get an Elgg configuration value
+ *
+ * @param string $name      Name of the configuration value
+ * @param int    $site_guid NULL for installation setting, 0 for default site
+ *
+ * @return mixed Configuration value or null if it does not exist
+ * @since 1.8.0
+ */
+function elgg_get_config($name, $site_guid = 0) {
+	global $CONFIG;
+
+	$name = trim($name);
+
+	if (isset($CONFIG->$name)) {
+		return $CONFIG->$name;
+	}
+
+	if ($site_guid === null) {
+		// installation wide setting
+		$value = datalist_get($name);
+	} else {
+		// hit DB only if we're not sure if value exists or not
+		if (!isset($CONFIG->site_config_loaded)) {
+			// site specific setting
+			if ($site_guid == 0) {
+				$site_guid = (int) $CONFIG->site_id;
+			}
+			$value = get_config($name, $site_guid);
+		} else {
+			$value = null;
+		}
+	}
+
+	// @todo document why we don't cache false
+	if ($value === false) {
+		return null;
+	}
+
+	$CONFIG->$name = $value;
+	return $value;
+}
+
+/**
+ * Set an Elgg configuration value
+ *
+ * @warning This does not persist the configuration setting. Use elgg_save_config()
+ *
+ * @param string $name  Name of the configuration value
+ * @param mixed  $value Value
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_set_config($name, $value) {
+	global $CONFIG;
+
+	$name = trim($name);
+
+	$CONFIG->$name = $value;
+}
+
+/**
+ * Save a configuration setting
+ *
+ * @param string $name      Configuration name (cannot be greater than 255 characters)
+ * @param mixed  $value     Configuration value. Should be string for installation setting
+ * @param int    $site_guid NULL for installation setting, 0 for default site
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_save_config($name, $value, $site_guid = 0) {
+	global $CONFIG;
+
+	$name = trim($name);
+
+	if (strlen($name) > 255) {
+		elgg_log("The name length for configuration variables cannot be greater than 255", "ERROR");
+		return false;
+	}
+
+	elgg_set_config($name, $value);
+
+	if ($site_guid === NULL) {
+		if (is_array($value) || is_object($value)) {
+			return false;
+		}
+		return datalist_set($name, $value);
+	} else {
+		if ($site_guid == 0) {
+			$site_guid = (int) $CONFIG->site_id;
+		}
+		return set_config($name, $value, $site_guid);
+	}
+}
+
+/**
+ * Check that installation has completed and the database is populated.
+ *
+ * @throws InstallationException|DatabaseException
+ * @return void
+ * @access private
+ */
+function verify_installation() {
+	global $CONFIG;
+
+	if (isset($CONFIG->installed)) {
+		return;
+	}
+
+	try {
+		$dblink = get_db_link('read');
+		if (!$dblink) {
+			throw new DatabaseException();
+		}
+
+		mysql_query("SELECT value FROM {$CONFIG->dbprefix}datalists WHERE name = 'installed'", $dblink);
+		if (mysql_errno($dblink) > 0) {
+			throw new DatabaseException();
+		}
+
+		$CONFIG->installed = true;
+
+	} catch (DatabaseException $e) {
+		throw new InstallationException(elgg_echo('InstallationException:SiteNotInstalled'));
+	}
+}
+
+/**
+ * An array of key value pairs from the datalists table.
+ *
+ * Used as a cache in datalist functions.
+ *
+ * @global array $DATALIST_CACHE
+ */
+$DATALIST_CACHE = array();
+
+/**
+ * Get the value of a datalist element.
+ *
+ * @internal Datalists are stored in the datalist table.
+ *
+ * @tip Use datalists to store information common to a full installation.
+ *
+ * @param string $name The name of the datalist
+ * @return string|null|false String if value exists, null if doesn't, false on error
+ * @access private
+ */
+function datalist_get($name) {
+	global $CONFIG, $DATALIST_CACHE;
+
+	$name = trim($name);
+
+	// cannot store anything longer than 255 characters in db, so catch here
+	if (elgg_strlen($name) > 255) {
+		elgg_log("The name length for configuration variables cannot be greater than 255", "ERROR");
+		return false;
+	}
+
+	$name = sanitise_string($name);
+	if (isset($DATALIST_CACHE[$name])) {
+		return $DATALIST_CACHE[$name];
+	}
+
+	// If memcache enabled then cache value in memcache
+	$value = null;
+	static $datalist_memcache;
+	if ((!$datalist_memcache) && (is_memcache_available())) {
+		$datalist_memcache = new ElggMemcache('datalist_memcache');
+	}
+	if ($datalist_memcache) {
+		$value = $datalist_memcache->load($name);
+	}
+	if ($value) {
+		return $value;
+	}
+
+	// [Marcus Povey 20090217 : Now retrieving all datalist values on first
+	// load as this saves about 9 queries per page]
+	// This also causes OOM problems when the datalists table is large
+	// @todo make a list of datalists that we want to get in one grab
+	$result = get_data("SELECT * from {$CONFIG->dbprefix}datalists");
+	if ($result) {
+		foreach ($result as $row) {
+			$DATALIST_CACHE[$row->name] = $row->value;
+
+			// Cache it if memcache is available
+			if ($datalist_memcache) {
+				$datalist_memcache->save($row->name, $row->value);
+			}
+		}
+
+		if (isset($DATALIST_CACHE[$name])) {
+			return $DATALIST_CACHE[$name];
+		}
+	}
+
+	return null;
+}
+
+/**
+ * Set the value for a datalist element.
+ *
+ * @param string $name  The name of the datalist
+ * @param string $value The new value
+ *
+ * @return bool
+ * @access private
+ */
+function datalist_set($name, $value) {
+	global $CONFIG, $DATALIST_CACHE;
+
+	// cannot store anything longer than 255 characters in db, so catch before we set
+	if (elgg_strlen($name) > 255) {
+		elgg_log("The name length for configuration variables cannot be greater than 255", "ERROR");
+		return false;
+	}
+
+	$sanitised_name = sanitise_string($name);
+	$sanitised_value = sanitise_string($value);
+
+	// If memcache is available then invalidate the cached copy
+	static $datalist_memcache;
+	if ((!$datalist_memcache) && (is_memcache_available())) {
+		$datalist_memcache = new ElggMemcache('datalist_memcache');
+	}
+
+	if ($datalist_memcache) {
+		$datalist_memcache->delete($name);
+	}
+
+	$success = insert_data("INSERT into {$CONFIG->dbprefix}datalists"
+		. " set name = '{$sanitised_name}', value = '{$sanitised_value}'"
+		. " ON DUPLICATE KEY UPDATE value='{$sanitised_value}'");
+
+	if ($success !== FALSE) {
+		$DATALIST_CACHE[$name] = $value;
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Run a function one time per installation.
+ *
+ * If you pass a timestamp as the second argument, it will run the function
+ * only if (i) it has never been run before or (ii) the timestamp is >=
+ * the last time it was run.
+ *
+ * @warning Functions are determined by their name.  If you change the name of a function
+ * it will be run again.
+ *
+ * @tip Use $timelastupdatedcheck in your plugins init function to perform automated
+ * upgrades.  Schedule a function to run once and pass the timestamp of the new release.
+ * This will cause the run once function to be run on all installations.  To perform
+ * additional upgrades, create new functions for each release.
+ *
+ * @warning The function name cannot be longer than 255 characters long due to
+ * the current schema for the datalist table.
+ *
+ * @internal A datalist entry $functioname is created with the value of time().
+ *
+ * @param string $functionname         The name of the function you want to run.
+ * @param int    $timelastupdatedcheck A UNIX timestamp. If time() is > than this,
+ *                                     this function will be run again.
+ *
+ * @return bool
+ */
+function run_function_once($functionname, $timelastupdatedcheck = 0) {
+	$lastupdated = datalist_get($functionname);
+	if ($lastupdated) {
+		$lastupdated = (int) $lastupdated;
+	} elseif ($lastupdated !== false) {
+		$lastupdated = 0;
+	} else {
+		// unable to check datalist
+		return false;
+	}
+	if (is_callable($functionname) && $lastupdated <= $timelastupdatedcheck) {
+		$functionname();
+		datalist_set($functionname, time());
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Removes a config setting.
+ *
+ * @internal
+ * These settings are stored in the dbprefix_config table and read during system
+ * boot into $CONFIG.
+ *
+ * @param string $name      The name of the field.
+ * @param int    $site_guid Optionally, the GUID of the site (current site is assumed by default).
+ *
+ * @return int|false The number of affected rows or false on error.
+ *
+ * @see get_config()
+ * @see set_config()
+ */
+function unset_config($name, $site_guid = 0) {
+	global $CONFIG;
+
+	if (isset($CONFIG->$name)) {
+		unset($CONFIG->$name);
+	}
+
+	$name = sanitise_string($name);
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = (int) $CONFIG->site_id;
+	}
+
+	$query = "delete from {$CONFIG->dbprefix}config where name='$name' and site_guid=$site_guid";
+	return delete_data($query);
+}
+
+/**
+ * Add or update a config setting.
+ *
+ * If the config name already exists, it will be updated to the new value.
+ *
+ * @internal
+ * These settings are stored in the dbprefix_config table and read during system
+ * boot into $CONFIG.
+ *
+ * @param string $name      The name of the configuration value
+ * @param string $value     Its value
+ * @param int    $site_guid Optionally, the GUID of the site (current site is assumed by default)
+ *
+ * @return bool
+ * @todo The config table doens't have numeric primary keys so insert_data returns 0.
+ * @todo Use "INSERT ... ON DUPLICATE KEY UPDATE" instead of trying to delete then add.
+ * @see unset_config()
+ * @see get_config()
+ * @access private
+ */
+function set_config($name, $value, $site_guid = 0) {
+	global $CONFIG;
+
+	$name = trim($name);
+
+	// cannot store anything longer than 255 characters in db, so catch before we set
+	if (elgg_strlen($name) > 255) {
+		elgg_log("The name length for configuration variables cannot be greater than 255", "ERROR");
+		return false;
+	}
+
+	// Unset existing
+	unset_config($name, $site_guid);
+
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = (int) $CONFIG->site_id;
+	}
+	$CONFIG->$name = $value;
+	$value = sanitise_string(serialize($value));
+
+	$query = "insert into {$CONFIG->dbprefix}config"
+		. " set name = '{$name}', value = '{$value}', site_guid = {$site_guid}";
+	$result = insert_data($query);
+	return $result !== false;
+}
+
+/**
+ * Gets a configuration value
+ *
+ * @internal
+ * These settings are stored in the dbprefix_config table and read during system
+ * boot into $CONFIG.
+ *
+ * @param string $name      The name of the config value
+ * @param int    $site_guid Optionally, the GUID of the site (current site is assumed by default)
+ *
+ * @return mixed|null
+ * @see set_config()
+ * @see unset_config()
+ * @access private
+ */
+function get_config($name, $site_guid = 0) {
+	global $CONFIG;
+
+	$name = sanitise_string($name);
+	$site_guid = (int) $site_guid;
+
+	// check for deprecated values.
+	// @todo might be a better spot to define this?
+	$new_name = false;
+	switch($name) {
+		case 'viewpath':
+			$new_name = 'view_path';
+			$dep_version = 1.8;
+			break;
+
+		case 'pluginspath':
+			$new_name = 'plugins_path';
+			$dep_version = 1.8;
+			break;
+
+		case 'sitename':
+			$new_name = 'site_name';
+			$dep_version = 1.8;
+			break;
+	}
+
+	// @todo these haven't really been implemented in Elgg 1.8. Complete in 1.9.
+	// show dep message
+	if ($new_name) {
+		//	$msg = "Config value $name has been renamed as $new_name";
+		$name = $new_name;
+		//	elgg_deprecated_notice($msg, $dep_version);
+	}
+
+	// decide from where to return the value
+	if (isset($CONFIG->$name)) {
+		return $CONFIG->$name;
+	}
+
+	if ($site_guid == 0) {
+		$site_guid = (int) $CONFIG->site_id;
+	}
+
+	$result = get_data_row("SELECT value FROM {$CONFIG->dbprefix}config
+		WHERE name = '{$name}' and site_guid = {$site_guid}");
+
+	if ($result) {
+		$result = $result->value;
+		$result = unserialize($result->value);
+		$CONFIG->$name = $result;
+		return $result;
+	}
+
+	return null;
+}
+
+/**
+ * Loads all configuration values from the dbprefix_config table into $CONFIG.
+ *
+ * @param int $site_guid Optionally, the GUID of the site (current site is assumed by default)
+ *
+ * @return bool
+ * @access private
+ */
+function get_all_config($site_guid = 0) {
+	global $CONFIG;
+
+	$site_guid = (int) $site_guid;
+
+	if ($site_guid == 0) {
+		$site_guid = (int) $CONFIG->site_guid;
+	}
+
+	if ($result = get_data("SELECT * FROM {$CONFIG->dbprefix}config WHERE site_guid = $site_guid")) {
+		foreach ($result as $r) {
+			$name = $r->name;
+			$value = $r->value;
+			$CONFIG->$name = unserialize($value);
+		}
+
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Loads configuration related to this site
+ *
+ * This loads from the config database table and the site entity
+ * @access private
+ */
+function _elgg_load_site_config() {
+	global $CONFIG;
+
+	$CONFIG->site_guid = (int) datalist_get('default_site');
+	$CONFIG->site_id = $CONFIG->site_guid;
+	$CONFIG->site = get_entity($CONFIG->site_guid);
+	if (!$CONFIG->site) {
+		throw new InstallationException(elgg_echo('InstallationException:SiteNotInstalled'));
+	}
+
+	$CONFIG->wwwroot = $CONFIG->site->url;
+	$CONFIG->sitename = $CONFIG->site->name;
+	$CONFIG->sitedescription = $CONFIG->site->description;
+	$CONFIG->siteemail = $CONFIG->site->email;
+	$CONFIG->url = $CONFIG->wwwroot;
+
+	get_all_config();
+	// gives hint to elgg_get_config function how to approach missing values
+	$CONFIG->site_config_loaded = true;
+}
+
+/**
+ * Loads configuration related to Elgg as an application
+ *
+ * This loads from the datalists database table
+ * @access private
+ */
+function _elgg_load_application_config() {
+	global $CONFIG;
+
+	$install_root = str_replace("\\", "/", dirname(dirname(dirname(__FILE__))));
+	$defaults = array(
+		'path'			=>	"$install_root/",
+		'view_path'		=>	"$install_root/views/",
+		'plugins_path'	=>	"$install_root/mod/",
+		'language'		=>	'en',
+
+		// compatibility with old names for plugins not using elgg_get_config()
+		'viewpath'		=>	"$install_root/views/",
+		'pluginspath'	=>	"$install_root/mod/",
+	);
+
+	foreach ($defaults as $name => $value) {
+		if (empty($CONFIG->$name)) {
+			$CONFIG->$name = $value;
+		}
+	}
+
+	$path = datalist_get('path');
+	if (!empty($path)) {
+		$CONFIG->path = $path;
+	}
+	$dataroot = datalist_get('dataroot');
+	if (!empty($dataroot)) {
+		$CONFIG->dataroot = $dataroot;
+	}
+	$simplecache_enabled = datalist_get('simplecache_enabled');
+	if ($simplecache_enabled !== false) {
+		$CONFIG->simplecache_enabled = $simplecache_enabled;
+	} else {
+		$CONFIG->simplecache_enabled = 1;
+	}
+	$system_cache_enabled = datalist_get('system_cache_enabled');
+	if ($system_cache_enabled !== false) {
+		$CONFIG->system_cache_enabled = $system_cache_enabled;
+	} else {
+		$CONFIG->system_cache_enabled = 1;
+	}
+
+	// initialize context here so it is set before the get_input call
+	$CONFIG->context = array();
+
+	// needs to be set before system, init for links in html head
+	$viewtype = get_input('view', 'default');
+	$lastcached = datalist_get("simplecache_lastcached_$viewtype");
+	$CONFIG->lastcache = $lastcached;
+
+	$CONFIG->i18n_loaded_from_cache = false;
+
+	// this must be synced with the enum for the entities table
+	$CONFIG->entity_types = array('group', 'object', 'site', 'user');
+}
diff --git a/engine/lib/cron.php b/engine/lib/cron.php
new file mode 100644
index 000000000..4f3d05b93
--- /dev/null
+++ b/engine/lib/cron.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Elgg cron library.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Cron initialization
+ *
+ * @return void
+ * @access private
+ */
+function cron_init() {
+	// Register a pagehandler for cron
+	elgg_register_page_handler('cron', 'cron_page_handler');
+
+	// register a hook for Walled Garden public pages
+	elgg_register_plugin_hook_handler('public_pages', 'walled_garden', 'cron_public_pages');
+}
+
+/**
+ * Cron handler
+ *
+ * @param array $page Pages
+ *
+ * @return bool
+ * @throws CronException
+ * @access private
+ */
+function cron_page_handler($page) {
+	if (!isset($page[0])) {
+		forward();
+	}
+
+	$period = strtolower($page[0]);
+
+	$allowed_periods = array(
+		'minute', 'fiveminute', 'fifteenmin', 'halfhour', 'hourly',
+		'daily', 'weekly', 'monthly', 'yearly', 'reboot'
+	);
+
+	if (!in_array($period, $allowed_periods)) {
+		throw new CronException(elgg_echo('CronException:unknownperiod', array($period)));
+	}
+
+	// Get a list of parameters
+	$params = array();
+	$params['time'] = time();
+
+	// Data to return to
+	$old_stdout = "";
+	ob_start();
+
+	$old_stdout = elgg_trigger_plugin_hook('cron', $period, $params, $old_stdout);
+	$std_out = ob_get_clean();
+
+	echo $std_out . $old_stdout;
+	return true;
+}
+
+/**
+ * Register cron's pages as public in case we're in Walled Garden mode
+ *
+ * @param string $hook         public_pages
+ * @param string $type         system
+ * @param array  $return_value Array of pages to allow
+ * @param mixed  $params       Params
+ *
+ * @return array
+ * @access private
+ */
+function cron_public_pages($hook, $type, $return_value, $params) {
+	$return_value[] = 'cron/minute';
+	$return_value[] = 'cron/fiveminute';
+	$return_value[] = 'cron/fifteenmin';
+	$return_value[] = 'cron/halfhour';
+	$return_value[] = 'cron/hourly';
+	$return_value[] = 'cron/daily';
+	$return_value[] = 'cron/weekly';
+	$return_value[] = 'cron/monthly';
+	$return_value[] = 'cron/yearly';
+	$return_value[] = 'cron/reboot';
+
+	return $return_value;
+}
+
+elgg_register_event_handler('init', 'system', 'cron_init');
diff --git a/engine/lib/database.php b/engine/lib/database.php
new file mode 100644
index 000000000..a7949788d
--- /dev/null
+++ b/engine/lib/database.php
@@ -0,0 +1,764 @@
+<?php
+/**
+ * Elgg database procedural code.
+ *
+ * Includes functions for establishing and retrieving a database link,
+ * reading data, writing data, upgrading DB schemas, and sanitizing input.
+ *
+ * @package Elgg.Core
+ * @subpackage Database
+ */
+
+/**
+ * Query cache for all queries.
+ *
+ * Each query and its results are stored in this cache as:
+ * <code>
+ * $DB_QUERY_CACHE[query hash] => array(result1, result2, ... resultN)
+ * </code>
+ * @see elgg_query_runner() for details on the hash.
+ *
+ * @warning Elgg used to set this as an empty array to turn off the cache
+ *
+ * @global ElggLRUCache|null $DB_QUERY_CACHE
+ * @access private
+ */
+global $DB_QUERY_CACHE;
+$DB_QUERY_CACHE = null;
+
+/**
+ * Queries to be executed upon shutdown.
+ *
+ * These queries are saved to an array and executed using
+ * a function registered by register_shutdown_function().
+ *
+ * Queries are saved as an array in the format:
+ * <code>
+ * $DB_DELAYED_QUERIES[] = array(
+ * 	'q' => str $query,
+ * 	'l' => resource $dblink,
+ * 	'h' => str $handler // a callback function
+ * );
+ * </code>
+ *
+ * @global array $DB_DELAYED_QUERIES
+ * @access private
+ */
+global $DB_DELAYED_QUERIES;
+$DB_DELAYED_QUERIES = array();
+
+/**
+ * Database connection resources.
+ *
+ * Each database link created with establish_db_link($name) is stored in
+ * $dblink as $dblink[$name] => resource.  Use get_db_link($name) to retrieve it.
+ *
+ * @global resource[] $dblink
+ * @access private
+ */
+global $dblink;
+$dblink = array();
+
+/**
+ * Database call count
+ *
+ * Each call to the database increments this counter.
+ *
+ * @global integer $dbcalls
+ * @access private
+ */
+global $dbcalls;
+$dbcalls = 0;
+
+/**
+ * Establish a connection to the database servser
+ *
+ * Connect to the database server and use the Elgg database for a particular database link
+ *
+ * @param string $dblinkname The type of database connection. Used to identify the
+ * resource. eg "read", "write", or "readwrite".
+ *
+ * @return void
+ * @throws DatabaseException
+ * @access private
+ */
+function establish_db_link($dblinkname = "readwrite") {
+	// Get configuration, and globalise database link
+	global $CONFIG, $dblink, $DB_QUERY_CACHE;
+
+	if ($dblinkname != "readwrite" && isset($CONFIG->db[$dblinkname])) {
+		if (is_array($CONFIG->db[$dblinkname])) {
+			$index = rand(0, sizeof($CONFIG->db[$dblinkname]));
+			$dbhost = $CONFIG->db[$dblinkname][$index]->dbhost;
+			$dbuser = $CONFIG->db[$dblinkname][$index]->dbuser;
+			$dbpass = $CONFIG->db[$dblinkname][$index]->dbpass;
+			$dbname = $CONFIG->db[$dblinkname][$index]->dbname;
+		} else {
+			$dbhost = $CONFIG->db[$dblinkname]->dbhost;
+			$dbuser = $CONFIG->db[$dblinkname]->dbuser;
+			$dbpass = $CONFIG->db[$dblinkname]->dbpass;
+			$dbname = $CONFIG->db[$dblinkname]->dbname;
+		}
+	} else {
+		$dbhost = $CONFIG->dbhost;
+		$dbuser = $CONFIG->dbuser;
+		$dbpass = $CONFIG->dbpass;
+		$dbname = $CONFIG->dbname;
+	}
+
+	// Connect to database
+	if (!$dblink[$dblinkname] = mysql_connect($dbhost, $dbuser, $dbpass, true)) {
+		$msg = elgg_echo('DatabaseException:WrongCredentials',
+				array($dbuser, $dbhost, "****"));
+		throw new DatabaseException($msg);
+	}
+
+	if (!mysql_select_db($dbname, $dblink[$dblinkname])) {
+		$msg = elgg_echo('DatabaseException:NoConnect', array($dbname));
+		throw new DatabaseException($msg);
+	}
+
+	// Set DB for UTF8
+	mysql_query("SET NAMES utf8");
+
+	$db_cache_off = FALSE;
+	if (isset($CONFIG->db_disable_query_cache)) {
+		$db_cache_off = $CONFIG->db_disable_query_cache;
+	}
+
+	// Set up cache if global not initialized and query cache not turned off
+	if ((!$DB_QUERY_CACHE) && (!$db_cache_off)) {
+		// @todo if we keep this cache in 1.9, expose the size as a config parameter
+		$DB_QUERY_CACHE = new ElggLRUCache(200);
+	}
+}
+
+/**
+ * Establish database connections
+ *
+ * If the configuration has been set up for multiple read/write databases, set those
+ * links up separately; otherwise just create the one database link.
+ *
+ * @return void
+ * @access private
+ */
+function setup_db_connections() {
+	global $CONFIG;
+
+	if (!empty($CONFIG->db->split)) {
+		establish_db_link('read');
+		establish_db_link('write');
+	} else {
+		establish_db_link('readwrite');
+	}
+}
+
+/**
+ * Display profiling information about db at NOTICE debug level upon shutdown.
+ *
+ * @return void
+ * @access private
+ */
+function db_profiling_shutdown_hook() {
+	global $dbcalls;
+
+	// demoted to NOTICE as it corrupts javasript at DEBUG
+	elgg_log("DB Queries for this page: $dbcalls", 'NOTICE');
+}
+
+/**
+ * Execute any delayed queries upon shutdown.
+ *
+ * @return void
+ * @access private
+ */
+function db_delayedexecution_shutdown_hook() {
+	global $DB_DELAYED_QUERIES;
+
+	foreach ($DB_DELAYED_QUERIES as $query_details) {
+		try {
+			$link = $query_details['l'];
+
+			if ($link == 'read' || $link == 'write') {
+				$link = get_db_link($link);
+			} elseif (!is_resource($link)) {
+				elgg_log("Link for delayed query not valid resource or db_link type. Query: {$query_details['q']}", 'WARNING');
+			}
+			
+			$result = execute_query($query_details['q'], $link);
+			
+			if ((isset($query_details['h'])) && (is_callable($query_details['h']))) {
+				$query_details['h']($result);
+			}
+		} catch (Exception $e) {
+			// Suppress all errors since these can't be dealt with here
+			elgg_log($e, 'WARNING');
+		}
+	}
+}
+
+/**
+ * Returns (if required, also creates) a database link resource.
+ *
+ * Database link resources are stored in the {@link $dblink} global.  These
+ * resources are created by {@link setup_db_connections()}, which is called if
+ * no links exist.
+ *
+ * @param string $dblinktype The type of link we want: "read", "write" or "readwrite".
+ *
+ * @return resource Database link
+ * @access private
+ */
+function get_db_link($dblinktype) {
+	global $dblink;
+
+	if (isset($dblink[$dblinktype])) {
+		return $dblink[$dblinktype];
+	} else if (isset($dblink['readwrite'])) {
+		return $dblink['readwrite'];
+	} else {
+		setup_db_connections();
+		return get_db_link($dblinktype);
+	}
+}
+
+/**
+ * Execute an EXPLAIN for $query.
+ *
+ * @param string $query The query to explain
+ * @param mixed $link  The database link resource to user.
+ *
+ * @return mixed An object of the query's result, or FALSE
+ * @access private
+ */
+function explain_query($query, $link) {
+	if ($result = execute_query("explain " . $query, $link)) {
+		return mysql_fetch_object($result);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Execute a query.
+ *
+ * $query is executed via {@link mysql_query()}.  If there is an SQL error,
+ * a {@link DatabaseException} is thrown.
+ *
+ * @internal
+ * {@link $dbcalls} is incremented and the query is saved into the {@link $DB_QUERY_CACHE}.
+ *
+ * @param string $query  The query
+ * @param resource   $dblink The DB link
+ *
+ * @return resource result of mysql_query()
+ * @throws DatabaseException
+ * @access private
+ */
+function execute_query($query, $dblink) {
+	global $dbcalls;
+
+	if ($query == NULL) {
+		throw new DatabaseException(elgg_echo('DatabaseException:InvalidQuery'));
+	}
+
+	if (!is_resource($dblink)) {
+		throw new DatabaseException(elgg_echo('DatabaseException:InvalidDBLink'));
+	}
+
+	$dbcalls++;
+
+	$result = mysql_query($query, $dblink);
+
+	if (mysql_errno($dblink)) {
+		throw new DatabaseException(mysql_error($dblink) . "\n\n QUERY: " . $query);
+	}
+
+	return $result;
+}
+
+/**
+ * Queue a query for execution upon shutdown.
+ *
+ * You can specify a handler function if you care about the result. This function will accept
+ * the raw result from {@link mysql_query()}.
+ *
+ * @param string   $query   The query to execute
+ * @param resource|string $dblink  The database link to use or the link type (read | write)
+ * @param string   $handler A callback function to pass the results array to
+ *
+ * @return true
+ * @access private
+ */
+function execute_delayed_query($query, $dblink, $handler = "") {
+	global $DB_DELAYED_QUERIES;
+
+	if (!isset($DB_DELAYED_QUERIES)) {
+		$DB_DELAYED_QUERIES = array();
+	}
+
+	if (!is_resource($dblink) && $dblink != 'read' && $dblink != 'write') {
+		return false;
+	}
+
+	// Construct delayed query
+	$delayed_query = array();
+	$delayed_query['q'] = $query;
+	$delayed_query['l'] = $dblink;
+	$delayed_query['h'] = $handler;
+
+	$DB_DELAYED_QUERIES[] = $delayed_query;
+
+	return TRUE;
+}
+
+/**
+ * Write wrapper for execute_delayed_query()
+ *
+ * @param string $query   The query to execute
+ * @param string $handler The handler if you care about the result.
+ *
+ * @return true
+ * @uses execute_delayed_query()
+ * @uses get_db_link()
+ * @access private
+ */
+function execute_delayed_write_query($query, $handler = "") {
+	return execute_delayed_query($query, 'write', $handler);
+}
+
+/**
+ * Read wrapper for execute_delayed_query()
+ *
+ * @param string $query   The query to execute
+ * @param string $handler The handler if you care about the result.
+ *
+ * @return true
+ * @uses execute_delayed_query()
+ * @uses get_db_link()
+ * @access private
+ */
+function execute_delayed_read_query($query, $handler = "") {
+	return execute_delayed_query($query, 'read', $handler);
+}
+
+/**
+ * Retrieve rows from the database.
+ *
+ * Queries are executed with {@link execute_query()} and results
+ * are retrieved with {@link mysql_fetch_object()}.  If a callback
+ * function $callback is defined, each row will be passed as the single
+ * argument to $callback.  If no callback function is defined, the
+ * entire result set is returned as an array.
+ *
+ * @param mixed  $query    The query being passed.
+ * @param string $callback Optionally, the name of a function to call back to on each row
+ *
+ * @return array An array of database result objects or callback function results. If the query
+ *               returned nothing, an empty array.
+ * @access private
+ */
+function get_data($query, $callback = "") {
+	return elgg_query_runner($query, $callback, false);
+}
+
+/**
+ * Retrieve a single row from the database.
+ *
+ * Similar to {@link get_data()} but returns only the first row
+ * matched.  If a callback function $callback is specified, the row will be passed
+ * as the only argument to $callback.
+ *
+ * @param mixed  $query    The query to execute.
+ * @param string $callback A callback function
+ *
+ * @return mixed A single database result object or the result of the callback function.
+ * @access private
+ */
+function get_data_row($query, $callback = "") {
+	return elgg_query_runner($query, $callback, true);
+}
+
+/**
+ * Handles returning data from a query, running it through a callback function,
+ * and caching the results. This is for R queries (from CRUD).
+ *
+ * @access private
+ *
+ * @param string $query    The query to execute
+ * @param string $callback An optional callback function to run on each row
+ * @param bool   $single   Return only a single result?
+ *
+ * @return array An array of database result objects or callback function results. If the query
+ *               returned nothing, an empty array.
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_query_runner($query, $callback = null, $single = false) {
+	global $DB_QUERY_CACHE;
+
+	// Since we want to cache results of running the callback, we need to
+	// need to namespace the query with the callback and single result request.
+	// https://github.com/elgg/elgg/issues/4049
+	$hash = (string)$callback . (int)$single . $query;
+
+	// Is cached?
+	if ($DB_QUERY_CACHE) {
+		if (isset($DB_QUERY_CACHE[$hash])) {
+			elgg_log("DB query $query results returned from cache (hash: $hash)", 'NOTICE');
+			return $DB_QUERY_CACHE[$hash];
+		}
+	}
+
+	$dblink = get_db_link('read');
+	$return = array();
+
+	if ($result = execute_query("$query", $dblink)) {
+
+		// test for callback once instead of on each iteration.
+		// @todo check profiling to see if this needs to be broken out into
+		// explicit cases instead of checking in the iteration.
+		$is_callable = is_callable($callback);
+		while ($row = mysql_fetch_object($result)) {
+			if ($is_callable) {
+				$row = $callback($row);
+			}
+
+			if ($single) {
+				$return = $row;
+				break;
+			} else {
+				$return[] = $row;
+			}
+		}
+	}
+
+	if (empty($return)) {
+		elgg_log("DB query $query returned no results.", 'NOTICE');
+	}
+
+	// Cache result
+	if ($DB_QUERY_CACHE) {
+		$DB_QUERY_CACHE[$hash] = $return;
+		elgg_log("DB query $query results cached (hash: $hash)", 'NOTICE');
+	}
+
+	return $return;
+}
+
+/**
+ * Insert a row into the database.
+ *
+ * @note Altering the DB invalidates all queries in {@link $DB_QUERY_CACHE}.
+ *
+ * @param mixed $query The query to execute.
+ *
+ * @return int|false The database id of the inserted row if a AUTO_INCREMENT field is
+ *                   defined, 0 if not, and false on failure.
+ * @access private
+ */
+function insert_data($query) {
+
+	elgg_log("DB query $query", 'NOTICE');
+	
+	$dblink = get_db_link('write');
+
+	_elgg_invalidate_query_cache();
+
+	if (execute_query("$query", $dblink)) {
+		return mysql_insert_id($dblink);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Update the database.
+ *
+ * @note Altering the DB invalidates all queries in {@link $DB_QUERY_CACHE}.
+ *
+ * @param string $query The query to run.
+ *
+ * @return bool
+ * @access private
+ */
+function update_data($query) {
+
+	elgg_log("DB query $query", 'NOTICE');
+
+	$dblink = get_db_link('write');
+
+	_elgg_invalidate_query_cache();
+
+	if (execute_query("$query", $dblink)) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Remove data from the database.
+ *
+ * @note Altering the DB invalidates all queries in {@link $DB_QUERY_CACHE}.
+ *
+ * @param string $query The SQL query to run
+ *
+ * @return int|false The number of affected rows or false on failure
+ * @access private
+ */
+function delete_data($query) {
+
+	elgg_log("DB query $query", 'NOTICE');
+
+	$dblink = get_db_link('write');
+
+	_elgg_invalidate_query_cache();
+
+	if (execute_query("$query", $dblink)) {
+		return mysql_affected_rows($dblink);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Invalidate the query cache
+ *
+ * @access private
+ */
+function _elgg_invalidate_query_cache() {
+	global $DB_QUERY_CACHE;
+	if ($DB_QUERY_CACHE instanceof ElggLRUCache) {
+		$DB_QUERY_CACHE->clear();
+		elgg_log("Query cache invalidated", 'NOTICE');
+	} elseif ($DB_QUERY_CACHE) {
+		// In case someone sets the cache to an array and primes it with data
+		$DB_QUERY_CACHE = array();
+		elgg_log("Query cache invalidated", 'NOTICE');
+	}
+}
+
+/**
+ * Return tables matching the database prefix {@link $CONFIG->dbprefix}% in the currently
+ * selected database.
+ *
+ * @return array|false List of tables or false on failure
+ * @static array $tables Tables found matching the database prefix
+ * @access private
+ */
+function get_db_tables() {
+	global $CONFIG;
+	static $tables;
+
+	if (isset($tables)) {
+		return $tables;
+	}
+
+	try{
+		$result = get_data("show tables like '" . $CONFIG->dbprefix . "%'");
+	} catch (DatabaseException $d) {
+		// Likely we can't handle an exception here, so just return false.
+		return FALSE;
+	}
+
+	$tables = array();
+
+	if (is_array($result) && !empty($result)) {
+		foreach ($result as $row) {
+			$row = (array) $row;
+			if (is_array($row) && !empty($row)) {
+				foreach ($row as $element) {
+					$tables[] = $element;
+				}
+			}
+		}
+	} else {
+		return FALSE;
+	}
+
+	return $tables;
+}
+
+/**
+ * Optimise a table.
+ *
+ * Executes an OPTIMIZE TABLE query on $table.  Useful after large DB changes.
+ *
+ * @param string $table The name of the table to optimise
+ *
+ * @return bool
+ * @access private
+ */
+function optimize_table($table) {
+	$table = sanitise_string($table);
+	return update_data("optimize table $table");
+}
+
+/**
+ * Get the last database error for a particular database link
+ *
+ * @param resource $dblink The DB link
+ *
+ * @return string Database error message
+ * @access private
+ */
+function get_db_error($dblink) {
+	return mysql_error($dblink);
+}
+
+/**
+ * Runs a full database script from disk.
+ *
+ * The file specified should be a standard SQL file as created by
+ * mysqldump or similar.  Statements must be terminated with ;
+ * and a newline character (\n or \r\n) with only one statement per line.
+ *
+ * The special string 'prefix_' is replaced with the database prefix
+ * as defined in {@link $CONFIG->dbprefix}.
+ *
+ * @warning Errors do not halt execution of the script.  If a line
+ * generates an error, the error message is saved and the
+ * next line is executed.  After the file is run, any errors
+ * are displayed as a {@link DatabaseException}
+ *
+ * @param string $scriptlocation The full path to the script
+ *
+ * @return void
+ * @throws DatabaseException
+ * @access private
+ */
+function run_sql_script($scriptlocation) {
+	if ($script = file_get_contents($scriptlocation)) {
+		global $CONFIG;
+
+		$errors = array();
+
+		// Remove MySQL -- style comments
+		$script = preg_replace('/\-\-.*\n/', '', $script);
+
+		// Statements must end with ; and a newline
+		$sql_statements = preg_split('/;[\n\r]+/', $script);
+
+		foreach ($sql_statements as $statement) {
+			$statement = trim($statement);
+			$statement = str_replace("prefix_", $CONFIG->dbprefix, $statement);
+			if (!empty($statement)) {
+				try {
+					update_data($statement);
+				} catch (DatabaseException $e) {
+					$errors[] = $e->getMessage();
+				}
+			}
+		}
+		if (!empty($errors)) {
+			$errortxt = "";
+			foreach ($errors as $error) {
+				$errortxt .= " {$error};";
+			}
+
+			$msg = elgg_echo('DatabaseException:DBSetupIssues') . $errortxt;
+			throw new DatabaseException($msg);
+		}
+	} else {
+		$msg = elgg_echo('DatabaseException:ScriptNotFound', array($scriptlocation));
+		throw new DatabaseException($msg);
+	}
+}
+
+/**
+ * Format a query string for logging
+ *
+ * @param string $query Query string
+ * @return string
+ * @access private
+ */
+function elgg_format_query($query) {
+	// remove newlines and extra spaces so logs are easier to read
+	return preg_replace('/\s\s+/', ' ', $query);
+}
+
+/**
+ * Sanitise a string for database use, but with the option of escaping extra characters.
+ *
+ * @param string $string           The string to sanitise
+ * @param string $extra_escapeable Extra characters to escape with '\\'
+ *
+ * @return string The escaped string
+ */
+function sanitise_string_special($string, $extra_escapeable = '') {
+	$string = sanitise_string($string);
+
+	for ($n = 0; $n < strlen($extra_escapeable); $n++) {
+		$string = str_replace($extra_escapeable[$n], "\\" . $extra_escapeable[$n], $string);
+	}
+
+	return $string;
+}
+
+/**
+ * Sanitise a string for database use.
+ *
+ * @param string $string The string to sanitise
+ *
+ * @return string Sanitised string
+ */
+function sanitise_string($string) {
+	// @todo does this really need the trim?
+	// there are times when you might want trailing / preceeding white space.
+	return mysql_real_escape_string(trim($string));
+}
+
+/**
+ * Wrapper function for alternate English spelling
+ *
+ * @param string $string The string to sanitise
+ *
+ * @return string Sanitised string
+ */
+function sanitize_string($string) {
+	return sanitise_string($string);
+}
+
+/**
+ * Sanitises an integer for database use.
+ *
+ * @param int  $int    Value to be sanitized
+ * @param bool $signed Whether negative values should be allowed (true)
+ * @return int
+ */
+function sanitise_int($int, $signed = true) {
+	$int = (int) $int;
+
+	if ($signed === false) {
+		if ($int < 0) {
+			$int = 0;
+		}
+	}
+
+	return (int) $int;
+}
+
+/**
+ * Sanitizes an integer for database use.
+ * Wrapper function for alternate English spelling (@see sanitise_int)
+ *
+ * @param int  $int    Value to be sanitized
+ * @param bool $signed Whether negative values should be allowed (true)
+ * @return int
+ */
+function sanitize_int($int, $signed = true) {
+	return sanitise_int($int, $signed);
+}
+
+/**
+ * Registers shutdown functions for database profiling and delayed queries.
+ *
+ * @access private
+ */
+function init_db() {
+	register_shutdown_function('db_delayedexecution_shutdown_hook');
+	register_shutdown_function('db_profiling_shutdown_hook');
+}
+
+elgg_register_event_handler('init', 'system', 'init_db');
diff --git a/engine/lib/deprecated-1.7.php b/engine/lib/deprecated-1.7.php
new file mode 100644
index 000000000..ee95b5611
--- /dev/null
+++ b/engine/lib/deprecated-1.7.php
@@ -0,0 +1,1164 @@
+<?php
+/**
+ * Get entities with the specified access collection id.
+ *
+ * @deprecated 1.7. Use elgg_get_entities_from_access_id()
+ *
+ * @param int    $collection_id  ID of collection
+ * @param string $entity_type    Type of entities
+ * @param string $entity_subtype Subtype of entities
+ * @param int    $owner_guid     Guid of owner
+ * @param int    $limit          Limit of number of entities to return
+ * @param int    $offset         Skip this many entities
+ * @param string $order_by       Column to order by
+ * @param int    $site_guid      The site guid
+ * @param bool   $count          Return a count or entities
+ *
+ * @return array
+ */
+function get_entities_from_access_id($collection_id, $entity_type = "", $entity_subtype = "",
+	$owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0, $count = false) {
+	// log deprecated warning
+	elgg_deprecated_notice('get_entities_from_access_id() was deprecated by elgg_get_entities()', 1.7);
+
+	if (!$collection_id) {
+		return FALSE;
+	}
+
+	// build the options using given parameters
+	$options = array();
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+	$options['count'] = $count;
+
+	if ($entity_type) {
+		$options['type'] = sanitise_string($entity_type);
+	}
+
+	if ($entity_subtype) {
+		$options['subtype'] = $entity_subtype;
+	}
+
+	if ($site_guid) {
+		$options['site_guid'] = $site_guid;
+	}
+
+	if ($order_by) {
+		$options['order_by'] = sanitise_string("e.time_created, $order_by");
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($site_guid) {
+		$options['site_guid'] = $site_guid;
+	}
+
+	$options['access_id'] = $collection_id;
+
+	return elgg_get_entities_from_access_id($options);
+}
+
+/**
+ * @deprecated 1.7
+ */
+function get_entities_from_access_collection($collection_id, $entity_type = "", $entity_subtype = "",
+	$owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0, $count = false) {
+
+	elgg_deprecated_notice('get_entities_from_access_collection() was deprecated by elgg_get_entities()', 1.7);
+
+	return get_entities_from_access_id($collection_id, $entity_type, $entity_subtype,
+			$owner_guid, $limit, $offset, $order_by, $site_guid, $count);
+}
+
+/**
+ * Get entities from annotations
+ *
+ * No longer used.
+ *
+ * @deprecated 1.7 Use elgg_get_entities_from_annotations()
+ *
+ * @param mixed  $entity_type    Type of entity
+ * @param mixed  $entity_subtype Subtype of entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param int    $owner_guid     Guid of owner of annotation
+ * @param int    $group_guid     Guid of group
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       SQL order by string
+ * @param bool   $count          Count or return entities
+ * @param int    $timelower      Lower time limit
+ * @param int    $timeupper      Upper time limit
+ *
+ * @return unknown_type
+ */
+function get_entities_from_annotations($entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $owner_guid = 0, $group_guid = 0, $limit = 10, $offset = 0, $order_by = "asc",
+$count = false, $timelower = 0, $timeupper = 0) {
+	$msg = 'get_entities_from_annotations() is deprecated by elgg_get_entities_from_annotations().';
+	elgg_deprecated_notice($msg, 1.7);
+
+	$options = array();
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	$options['annotation_names'] = $name;
+
+	if ($value) {
+		$options['annotation_values'] = $value;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['annotation_owner_guids'] = $owner_guid;
+		} else {
+			$options['annotation_owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($group_guid) {
+		$options['container_guid'] = $group_guid;
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'] = "maxtime $order_by";
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	if ($timelower) {
+		$options['annotation_created_time_lower'] = $timelower;
+	}
+
+	if ($timeupper) {
+		$options['annotation_created_time_upper'] = $timeupper;
+	}
+
+	return elgg_get_entities_from_annotations($options);
+}
+
+/**
+ * Lists entities
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param string  $entity_type    Type of entity.
+ * @param string  $entity_subtype Subtype of entity.
+ * @param string  $name           Name of annotation.
+ * @param string  $value          Value of annotation.
+ * @param int     $limit          Maximum number of results to return.
+ * @param int     $owner_guid     Owner.
+ * @param int     $group_guid     Group container. Currently only supported if entity_type is object
+ * @param boolean $asc            Whether to list in ascending or descending order (default: desc)
+ * @param boolean $fullview       Whether to display the entities in full
+ * @param boolean $listtypetoggle Can 'gallery' view can be displayed (default: no)
+ *
+ * @deprecated 1.7 Use elgg_list_entities_from_annotations()
+ * @return string Formatted entity list
+ */
+function list_entities_from_annotations($entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $limit = 10, $owner_guid = 0, $group_guid = 0, $asc = false, $fullview = true,
+$listtypetoggle = false) {
+
+	$msg = 'list_entities_from_annotations is deprecated by elgg_list_entities_from_annotations';
+	elgg_deprecated_notice($msg, 1.8);
+
+	$options = array();
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	if ($name) {
+		$options['annotation_names'] = $name;
+	}
+
+	if ($value) {
+		$options['annotation_values'] = $value;
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($owner_guid) {
+		$options['annotation_owner_guid'] = $owner_guid;
+	}
+
+	if ($group_guid) {
+		$options['container_guid'] = $group_guid;
+	}
+
+	if ($asc) {
+		$options['order_by'] = 'maxtime desc';
+	}
+
+	if ($offset = sanitise_int(get_input('offset', null))) {
+		$options['offset'] = $offset;
+	}
+
+	$options['full_view'] = $fullview;
+	$options['list_type_toggle'] = $listtypetoggle;
+	$options['pagination'] = $pagination;
+
+	return elgg_list_entities_from_annotations($options);
+}
+
+/**
+ * Returns all php files in a directory.
+ *
+ * @deprecated 1.7 Use elgg_get_file_list() instead
+ *
+ * @param string $directory  Directory to look in
+ * @param array  $exceptions Array of extensions (with .!) to ignore
+ * @param array  $list       A list files to include in the return
+ *
+ * @return array
+ */
+function get_library_files($directory, $exceptions = array(), $list = array()) {
+	elgg_deprecated_notice('get_library_files() deprecated by elgg_get_file_list()', 1.7);
+	return elgg_get_file_list($directory, $exceptions, $list, array('.php'));
+}
+
+/**
+ * Add action tokens to URL.
+ *
+ * @param string $url URL
+ *
+ * @return string
+ *
+ * @deprecated 1.7 final
+ */
+function elgg_validate_action_url($url) {
+	elgg_deprecated_notice('elgg_validate_action_url() deprecated by elgg_add_action_tokens_to_url().',
+		1.7);
+
+	return elgg_add_action_tokens_to_url($url);
+}
+
+/**
+ * Does nothing.
+ *
+ * @deprecated 1.7
+ * @return 0
+ */
+function test_ip() {
+	elgg_deprecated_notice('test_ip() was removed because of licensing issues.', 1.7);
+
+	return 0;
+}
+
+/**
+ * Does nothing.
+ *
+ * @return bool
+ * @deprecated 1.7
+ */
+function is_ip_in_array() {
+	elgg_deprecated_notice('is_ip_in_array() was removed because of licensing issues.', 1.7);
+
+	return false;
+}
+
+/**
+ * Returns entities.
+ *
+ * @deprecated 1.7.  Use elgg_get_entities().
+ *
+ * @param string $type           Entity type
+ * @param string $subtype        Entity subtype
+ * @param int    $owner_guid     Owner GUID
+ * @param string $order_by       Order by clause
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param bool   $count          Return a count or an array of entities
+ * @param int    $site_guid      Site GUID
+ * @param int    $container_guid Container GUID
+ * @param int    $timelower      Lower time limit
+ * @param int    $timeupper      Upper time limit
+ *
+ * @return array
+ */
+function get_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10,
+$offset = 0, $count = false, $site_guid = 0, $container_guid = null, $timelower = 0,
+$timeupper = 0) {
+
+	elgg_deprecated_notice('get_entities() was deprecated by elgg_get_entities().', 1.7);
+
+	// rewrite owner_guid to container_guid to emulate old functionality
+	if ($owner_guid != "") {
+		if (is_null($container_guid)) {
+			$container_guid = $owner_guid;
+			$owner_guid = NULL;
+		}
+	}
+
+	$options = array();
+	if ($type) {
+		if (is_array($type)) {
+			$options['types'] = $type;
+		} else {
+			$options['type'] = $type;
+		}
+	}
+
+	if ($subtype) {
+		if (is_array($subtype)) {
+			$options['subtypes'] = $subtype;
+		} else {
+			$options['subtype'] = $subtype;
+		}
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($order_by) {
+		$options['order_by'] = $order_by;
+	}
+
+	// need to pass 0 for all option
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	if ($site_guid) {
+		$options['site_guids'] = $site_guid;
+	}
+
+	if ($container_guid) {
+		$options['container_guids'] = $container_guid;
+	}
+
+	if ($timeupper) {
+		$options['created_time_upper'] = $timeupper;
+	}
+
+	if ($timelower) {
+		$options['created_time_lower'] = $timelower;
+	}
+
+	$r = elgg_get_entities($options);
+	return $r;
+}
+
+/**
+ * Delete multiple entities that match a given query.
+ * This function iterates through and calls delete_entity on
+ * each one, this is somewhat inefficient but lets
+ * the 'delete' event be called for each entity.
+ *
+ * @deprecated 1.7. This is a dangerous function as it defaults to deleting everything.
+ *
+ * @param string $type       The type of entity (eg "user", "object" etc)
+ * @param string $subtype    The arbitrary subtype of the entity
+ * @param int    $owner_guid The GUID of the owning user
+ *
+ * @return false
+ */
+function delete_entities($type = "", $subtype = "", $owner_guid = 0) {
+	elgg_deprecated_notice('delete_entities() was deprecated because no one should use it.', 1.7);
+	return false;
+}
+
+/**
+ * Lists entities.
+ *
+ * @param int  $owner_guid     Owner GUID
+ * @param int  $limit          Limit
+ * @param bool $fullview       Show entity full views
+ * @param bool $listtypetoggle Show list type toggle
+ * @param bool $allowedtypes   A string of the allowed types
+ *
+ * @return string
+ * @deprecated 1.7.  Use elgg_list_registered_entities().
+ */
+function list_registered_entities($owner_guid = 0, $limit = 10, $fullview = true,
+$listtypetoggle = false, $allowedtypes = true) {
+
+	elgg_deprecated_notice('list_registered_entities() was deprecated by elgg_list_registered_entities().', 1.7);
+
+	$options = array();
+
+	// don't want to send anything if not being used.
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($allowedtypes) {
+		$options['allowed_types'] = $allowedtypes;
+	}
+
+	// need to send because might be BOOL
+	$options['full_view'] = $fullview;
+	$options['list_type_toggle'] = $listtypetoggle;
+
+	$options['offset'] = get_input('offset', 0);
+
+	return elgg_list_registered_entities($options);
+}
+
+/**
+ * Lists entities
+ *
+ * @deprecated 1.7.  Use elgg_list_entities().
+ *
+ * @param string $type           Entity type
+ * @param string $subtype        Entity subtype
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param bool   $fullview       Display entity full views?
+ * @param bool   $listtypetoggle Allow switching to gallery mode?
+ * @param bool   $pagination     Show pagination?
+ *
+ * @return string
+ */
+function list_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true,
+$listtypetoggle = false, $pagination = true) {
+
+	elgg_deprecated_notice('list_entities() was deprecated by elgg_list_entities()!', 1.7);
+
+	$options = array();
+
+	// rewrite owner_guid to container_guid to emulate old functionality
+	if ($owner_guid) {
+		$options['container_guids'] = $owner_guid;
+	}
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($offset = sanitise_int(get_input('offset', null))) {
+		$options['offset'] = $offset;
+	}
+
+	$options['full_view'] = $fullview;
+	$options['list_type_toggle'] = $listtypetoggle;
+	$options['pagination'] = $pagination;
+
+	return elgg_list_entities($options);
+}
+
+/**
+ * Searches for a group based on a complete or partial name or description
+ *
+ * @param string  $criteria The partial or full name or description
+ * @param int     $limit    Limit of the search.
+ * @param int     $offset   Offset.
+ * @param string  $order_by The order.
+ * @param boolean $count    Whether to return the count of results or just the results.
+ *
+ * @return mixed
+ * @deprecated 1.7
+ */
+function search_for_group($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) {
+	elgg_deprecated_notice('search_for_group() was deprecated by new search plugin.', 1.7);
+	global $CONFIG;
+
+	$criteria = sanitise_string($criteria);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$order_by = sanitise_string($order_by);
+
+	$access = get_access_sql_suffix("e");
+
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+
+	if ($count) {
+		$query = "SELECT count(e.guid) as total ";
+	} else {
+		$query = "SELECT e.* ";
+	}
+	$query .= "from {$CONFIG->dbprefix}entities e"
+		. " JOIN {$CONFIG->dbprefix}groups_entity g on e.guid=g.guid where ";
+
+	$query .= "(g.name like \"%{$criteria}%\" or g.description like \"%{$criteria}%\")";
+	$query .= " and $access";
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Returns a formatted list of groups suitable for injecting into search.
+ *
+ * @deprecated 1.7
+ *
+ * @param string $hook        Hook name
+ * @param string $user        User
+ * @param mixed  $returnvalue Previous hook's return value
+ * @param string $tag         Tag to search on
+ *
+ * @return string
+ */
+function search_list_groups_by_name($hook, $user, $returnvalue, $tag) {
+	elgg_deprecated_notice('search_list_groups_by_name() was deprecated by new search plugin', 1.7);
+	// Change this to set the number of groups that display on the search page
+	$threshold = 4;
+
+	$object = get_input('object');
+
+	if (!get_input('offset') && (empty($object) || $object == 'group')) {
+		if ($groups = search_for_group($tag, $threshold)) {
+			$countgroups = search_for_group($tag, 0, 0, "", true);
+
+			$return = elgg_view('group/search/startblurb', array('count' => $countgroups, 'tag' => $tag));
+			foreach ($groups as $group) {
+				$return .= elgg_view_entity($group);
+			}
+			$vars = array('count' => $countgroups, 'threshold' => $threshold, 'tag' => $tag);
+			$return .= elgg_view('group/search/finishblurb', $vars);
+			return $return;
+		}
+	}
+}
+
+/**
+ * Displays a list of group objects that have been searched for.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param string $tag   Search criteria
+ * @param int    $limit The number of entities to display on a page
+ *
+ * @return string The list in a form suitable to display
+ * @deprecated 1.7
+ */
+function list_group_search($tag, $limit = 10) {
+	elgg_deprecated_notice('list_group_search() was deprecated by new search plugin.', 1.7);
+	$offset = (int) get_input('offset');
+	$limit = (int) $limit;
+	$count = (int) search_for_group($tag, 10, 0, '', true);
+	$entities = search_for_group($tag, $limit, $offset);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, false);
+
+}
+
+/**
+ * Return a list of entities based on the given search criteria.
+ *
+ * @deprecated 1.7 use elgg_get_entities_from_metadata().
+ *
+ * @param mixed  $meta_name      Metadat name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site GUID. 0 for current, -1 for any.
+ * @param bool   $count          Return a count instead of entities
+ * @param bool   $case_sensitive Metadata names case sensitivity
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ */
+function get_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "",
+$entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "",
+$site_guid = 0, $count = FALSE, $case_sensitive = TRUE) {
+
+	elgg_deprecated_notice('get_entities_from_metadata() was deprecated by elgg_get_entities_from_metadata()!', 1.7);
+
+	$options = array();
+
+	$options['metadata_names'] = $meta_name;
+
+	if ($meta_value) {
+		$options['metadata_values'] = $meta_value;
+	}
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	// need to be able to pass false
+	$options['metadata_case_sensitive'] = $case_sensitive;
+
+	return elgg_get_entities_from_metadata($options);
+}
+
+/**
+ * Return entities from metadata
+ *
+ * @deprecated 1.7.  Use elgg_get_entities_from_metadata().
+ *
+ * @param mixed  $meta_array          Metadata name
+ * @param string $entity_type         The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype      The subtype of the entity.
+ * @param int    $owner_guid          Owner GUID
+ * @param int    $limit               Limit
+ * @param int    $offset              Offset
+ * @param string $order_by            Optional ordering.
+ * @param int    $site_guid           Site GUID. 0 for current, -1 for any.
+ * @param bool   $count               Return a count instead of entities
+ * @param bool   $meta_array_operator Operator for metadata values
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ */
+function get_entities_from_metadata_multi($meta_array, $entity_type = "", $entity_subtype = "",
+$owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0,
+$count = false, $meta_array_operator = 'and') {
+
+	elgg_deprecated_notice('get_entities_from_metadata_multi() was deprecated by elgg_get_entities_from_metadata()!', 1.7);
+
+	if (!is_array($meta_array) || sizeof($meta_array) == 0) {
+		return false;
+	}
+
+	$options = array();
+
+	$options['metadata_name_value_pairs'] = $meta_array;
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	$options['metadata_name_value_pairs_operator'] = $meta_array_operator;
+
+	return elgg_get_entities_from_metadata($options);
+}
+
+/**
+ * Returns a menu item for use in the children section of add_menu()
+ * This is not currently used in the Elgg core.
+ *
+ * @param string $menu_name The name of the menu item
+ * @param string $menu_url  Its URL
+ *
+ * @return stdClass|false Depending on success
+ * @deprecated 1.7
+ */
+function menu_item($menu_name, $menu_url) {
+	elgg_deprecated_notice('menu_item() is deprecated by add_submenu_item', 1.7);
+	return make_register_object($menu_name, $menu_url);
+}
+
+/**
+ * Searches for an object based on a complete or partial title
+ * or description using full text searching.
+ *
+ * IMPORTANT NOTE: With MySQL's default setup:
+ * 1) $criteria must be 4 or more characters long
+ * 2) If $criteria matches greater than 50% of results NO RESULTS ARE RETURNED!
+ *
+ * @param string  $criteria The partial or full name or username.
+ * @param int     $limit    Limit of the search.
+ * @param int     $offset   Offset.
+ * @param string  $order_by The order.
+ * @param boolean $count    Whether to return the count of results or just the results.
+ *
+ * @return int|false
+ * @deprecated 1.7
+ */
+function search_for_object($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) {
+	elgg_deprecated_notice('search_for_object() was deprecated by new search plugin.', 1.7);
+	global $CONFIG;
+
+	$criteria = sanitise_string($criteria);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$order_by = sanitise_string($order_by);
+	$container_guid = (int)$container_guid;
+
+	$access = get_access_sql_suffix("e");
+
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+
+	if ($count) {
+		$query = "SELECT count(e.guid) as total ";
+	} else {
+		$query = "SELECT e.* ";
+	}
+	$query .= "from {$CONFIG->dbprefix}entities e
+		join {$CONFIG->dbprefix}objects_entity o on e.guid=o.guid
+		where match(o.title,o.description) against ('$criteria') and $access";
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Returns a formatted list of objects suitable for injecting into search.
+ *
+ * @deprecated 1.7
+ *
+ * @param sting  $hook        Hook
+ * @param string $user        user
+ * @param mixed  $returnvalue Previous return value
+ * @param mixed  $tag         Search term
+ *
+ * @return array
+ */
+function search_list_objects_by_name($hook, $user, $returnvalue, $tag) {
+	elgg_deprecated_notice('search_list_objects_by_name was deprecated by new search plugin.', 1.7);
+
+	// Change this to set the number of users that display on the search page
+	$threshold = 4;
+
+	$object = get_input('object');
+
+	if (!get_input('offset') && (empty($object) || $object == 'user')) {
+		if ($users = search_for_user($tag, $threshold)) {
+			$countusers = search_for_user($tag, 0, 0, "", true);
+
+			$return = elgg_view('user/search/startblurb', array('count' => $countusers, 'tag' => $tag));
+			foreach ($users as $user) {
+				$return .= elgg_view_entity($user);
+			}
+			$return .= elgg_view('user/search/finishblurb',
+				array('count' => $countusers, 'threshold' => $threshold, 'tag' => $tag));
+
+			return $return;
+
+		}
+	}
+}
+
+/**
+ * Return entities from relationships
+ *
+ * @deprecated 1.7 Use elgg_get_entities_from_relationship()
+ *
+ * @param string $relationship         The relationship type
+ * @param int    $relationship_guid    The GUID of the relationship owner
+ * @param bool   $inverse_relationship Invert relationship?
+ * @param string $type                 Entity type
+ * @param string $subtype              Entity subtype
+ * @param int    $owner_guid           Entity owner GUID
+ * @param string $order_by             Order by clause
+ * @param int    $limit                Limit
+ * @param int    $offset               Offset
+ * @param bool   $count                Return a count instead of entities?
+ * @param int    $site_guid            Site GUID
+ *
+ * @return mixed
+ */
+function get_entities_from_relationship($relationship, $relationship_guid,
+$inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+
+	elgg_deprecated_notice('get_entities_from_relationship() was deprecated by elgg_get_entities_from_relationship()!', 1.7);
+
+	$options = array();
+
+	$options['relationship'] = $relationship;
+	$options['relationship_guid'] = $relationship_guid;
+	$options['inverse_relationship'] = $inverse_relationship;
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_relationship($options);
+}
+
+/**
+ * Searches for a site based on a complete or partial name
+ * or description or url using full text searching.
+ *
+ * IMPORTANT NOTE: With MySQL's default setup:
+ * 1) $criteria must be 4 or more characters long
+ * 2) If $criteria matches greater than 50% of results NO RESULTS ARE RETURNED!
+ *
+ * @param string  $criteria The partial or full name or username.
+ * @param int     $limit    Limit of the search.
+ * @param int     $offset   Offset.
+ * @param string  $order_by The order.
+ * @param boolean $count    Whether to return the count of results or just the results.
+ *
+ * @return mixed
+ * @deprecated 1.7
+ */
+function search_for_site($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) {
+	elgg_deprecated_notice('search_for_site() was deprecated by new search plugin.', 1.7);
+	global $CONFIG;
+
+	$criteria = sanitise_string($criteria);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$order_by = sanitise_string($order_by);
+
+	$access = get_access_sql_suffix("e");
+
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+
+	if ($count) {
+		$query = "SELECT count(e.guid) as total ";
+	} else {
+		$query = "SELECT e.* ";
+	}
+	$query .= "from {$CONFIG->dbprefix}entities e
+		join {$CONFIG->dbprefix}sites_entity s on e.guid=s.guid
+		where match(s.name, s.description, s.url) against ('$criteria') and $access";
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Searches for a user based on a complete or partial name or username.
+ *
+ * @param string  $criteria The partial or full name or username.
+ * @param int     $limit    Limit of the search.
+ * @param int     $offset   Offset.
+ * @param string  $order_by The order.
+ * @param boolean $count    Whether to return the count of results or just the results.
+ *
+ * @return mixed
+ * @deprecated 1.7
+ */
+function search_for_user($criteria, $limit = 10, $offset = 0, $order_by = "", $count = false) {
+	elgg_deprecated_notice('search_for_user() was deprecated by new search.', 1.7);
+	global $CONFIG;
+
+	$criteria = sanitise_string($criteria);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$order_by = sanitise_string($order_by);
+
+	$access = get_access_sql_suffix("e");
+
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+
+	if ($count) {
+		$query = "SELECT count(e.guid) as total ";
+	} else {
+		$query = "SELECT e.* ";
+	}
+	$query .= "from {$CONFIG->dbprefix}entities e
+		join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid where ";
+
+	$query .= "(u.name like \"%{$criteria}%\" or u.username like \"%{$criteria}%\")";
+	$query .= " and $access";
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit";
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Displays a list of user objects that have been searched for.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param string $tag   Search criteria
+ * @param int    $limit The number of entities to display on a page
+ *
+ * @return string The list in a form suitable to display
+ *
+ * @deprecated 1.7
+ */
+function list_user_search($tag, $limit = 10) {
+	elgg_deprecated_notice('list_user_search() deprecated by new search', 1.7);
+	$offset = (int) get_input('offset');
+	$limit = (int) $limit;
+	$count = (int) search_for_user($tag, 10, 0, '', true);
+	$entities = search_for_user($tag, $limit, $offset);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, false);
+}
+
+/**
+ * Returns a formatted list of users suitable for injecting into search.
+ *
+ * @deprecated 1.7
+ *
+ * @param string $hook        Hook name
+ * @param string $user        User?
+ * @param mixed  $returnvalue Previous hook's return value
+ * @param mixed  $tag         Tag to search against
+ *
+ * @return void
+ */
+function search_list_users_by_name($hook, $user, $returnvalue, $tag) {
+	elgg_deprecated_notice('search_list_users_by_name() was deprecated by new search', 1.7);
+	// Change this to set the number of users that display on the search page
+	$threshold = 4;
+
+	$object = get_input('object');
+
+	if (!get_input('offset') && (empty($object) || $object == 'user')) {
+		if ($users = search_for_user($tag, $threshold)) {
+			$countusers = search_for_user($tag, 0, 0, "", true);
+
+			$return = elgg_view('user/search/startblurb', array('count' => $countusers, 'tag' => $tag));
+			foreach ($users as $user) {
+				$return .= elgg_view_entity($user);
+			}
+
+			$vars = array('count' => $countusers, 'threshold' => $threshold, 'tag' => $tag);
+			$return .= elgg_view('user/search/finishblurb', $vars);
+			return $return;
+
+		}
+	}
+}
+
+/**
+ * Extend a view
+ *
+ * @deprecated 1.7.  Use elgg_extend_view().
+ *
+ * @param string $view      The view to extend.
+ * @param string $view_name This view is added to $view
+ * @param int    $priority  The priority, from 0 to 1000,
+ *                          to add at (lowest numbers displayed first)
+ * @param string $viewtype  Not used
+ *
+ * @return void
+ */
+function extend_view($view, $view_name, $priority = 501, $viewtype = '') {
+	elgg_deprecated_notice('extend_view() was deprecated by elgg_extend_view()!', 1.7);
+	elgg_extend_view($view, $view_name, $priority, $viewtype);
+}
+
+/**
+ * Get views in a dir
+ *
+ * @deprecated 1.7.  Use elgg_get_views().
+ *
+ * @param string $dir  Dir
+ * @param string $base Base view
+ *
+ * @return array
+ */
+function get_views($dir, $base) {
+	elgg_deprecated_notice('get_views() was deprecated by elgg_get_views()!', 1.7);
+	elgg_get_views($dir, $base);
+}
+
+/**
+ * Constructs and returns a register object.
+ *
+ * @param string $register_name  The name of the register
+ * @param mixed  $register_value The value of the register
+ * @param array  $children_array Optionally, an array of children
+ *
+ * @return false|stdClass Depending on success
+ * @deprecated 1.7 Use {@link add_submenu_item()}
+ */
+function make_register_object($register_name, $register_value, $children_array = array()) {
+	elgg_deprecated_notice('make_register_object() is deprecated by add_submenu_item()', 1.7);
+	if (empty($register_name) || empty($register_value)) {
+		return false;
+	}
+
+	$register = new stdClass;
+	$register->name = $register_name;
+	$register->value = $register_value;
+	$register->children = $children_array;
+
+	return $register;
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED.
+ *
+ * Delete a object's extra data.
+ *
+ * @todo - this should be removed - was deprecated in 1.5 or earlier
+ *
+ * @param int $guid GUID
+ *
+ * @return 1
+ * @deprecated 1.7
+ */
+function delete_object_entity($guid) {
+	system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
+
+	return 1; // Always return that we have deleted one row in order to not break existing code.
+}
+
+/**
+ * THIS FUNCTION IS DEPRECATED.
+ *
+ * Delete a user's extra data.
+ *
+ * @todo remove
+ *
+ * @param int $guid User GUID
+ *
+ * @return 1
+ * @deprecated 1.7
+ */
+function delete_user_entity($guid) {
+	system_message(elgg_echo('deprecatedfunction', array('delete_user_entity')));
+
+	return 1; // Always return that we have deleted one row in order to not break existing code.
+}
+\ No newline at end of file
diff --git a/engine/lib/deprecated-1.8.php b/engine/lib/deprecated-1.8.php
new file mode 100644
index 000000000..91068d047
--- /dev/null
+++ b/engine/lib/deprecated-1.8.php
@@ -0,0 +1,4820 @@
+<?php
+/**
+ * ***************************************************************************
+ * NOTE: If this is ever removed from Elgg, sites lose the ability to upgrade
+ * from 1.7.x and earlier to the latest version of Elgg without upgrading to
+ * 1.8 first.
+ * ***************************************************************************
+ *
+ * Upgrade the database schema in an ordered sequence.
+ *
+ * Executes all upgrade files in elgg/engine/schema/upgrades/ in sequential order.
+ * Upgrade files must be in the standard Elgg release format of YYYYMMDDII.sql
+ * where II is an incrementor starting from 01.
+ *
+ * Files that are < $version will be ignored.
+ *
+ * @warning Plugin authors should not call this function directly.
+ *
+ * @param int    $version The version you are upgrading from in the format YYYYMMDDII.
+ * @param string $fromdir Optional directory to load upgrades from. default: engine/schema/upgrades/
+ * @param bool   $quiet   If true, suppress all error messages. Only use for the upgrade from <=1.6.
+ *
+ * @return int The number of upgrades run.
+ * @see upgrade.php
+ * @see version.php
+ * @deprecated 1.8 Use PHP upgrades for sql changes.
+ */
+function db_upgrade($version, $fromdir = "", $quiet = FALSE) {
+	global $CONFIG;
+
+	elgg_deprecated_notice('db_upgrade() is deprecated by using PHP upgrades.', 1.8);
+
+	$version = (int) $version;
+
+	if (!$fromdir) {
+		$fromdir = $CONFIG->path . 'engine/schema/upgrades/';
+	}
+	
+	$i = 0;
+
+	if ($handle = opendir($fromdir)) {
+		$sqlupgrades = array();
+
+		while ($sqlfile = readdir($handle)) {
+			if (!is_dir($fromdir . $sqlfile)) {
+				if (preg_match('/^([0-9]{10})\.(sql)$/', $sqlfile, $matches)) {
+					$sql_version = (int) $matches[1];
+					if ($sql_version > $version) {
+						$sqlupgrades[] = $sqlfile;
+					}
+				}
+			}
+		}
+
+		asort($sqlupgrades);
+
+		if (sizeof($sqlupgrades) > 0) {
+			foreach ($sqlupgrades as $sqlfile) {
+
+				// hide all errors.
+				if ($quiet) {
+					try {
+						run_sql_script($fromdir . $sqlfile);
+					} catch (DatabaseException $e) {
+						error_log($e->getmessage());
+					}
+				} else {
+					run_sql_script($fromdir . $sqlfile);
+				}
+				$i++;
+			}
+		}
+	}
+
+	return $i;
+}
+
+/**
+ * Lists entities from an access collection
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_access_id()
+ *
+ * @return str
+ */
+function list_entities_from_access_id($access_id, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true) {
+
+	elgg_deprecated_notice("All list_entities* functions were deprecated in 1.8.  Use elgg_list_entities* instead.", 1.8);
+
+	echo elgg_list_entities_from_access_id(array('access_id' => $access_id,
+		'type' => $entity_type, 'subtype' => $entity_subtype, 'owner_guids' => $owner_guid,
+		'limit' => $limit, 'full_view' => $fullview, 'list_type_toggle' => $listtypetoggle,
+		'pagination' => $pagination,));
+}
+
+/**
+ * Registers a particular action in memory
+ *
+ * @deprecated 1.8 Use {@link elgg_register_action()} instead
+ *
+ * @param string $action The name of the action (eg "register", "account/settings/save")
+ * @param boolean $public Can this action be accessed by people not logged into the system?
+ * @param string $filename Optionally, the filename where this action is located
+ * @param boolean $admin_only Whether this action is only available to admin users.
+ */
+function register_action($action, $public = false, $filename = "", $admin_only = false) {
+	elgg_deprecated_notice("register_action() was deprecated by elgg_register_action()", 1.8);
+
+	if ($admin_only) {
+		$access = 'admin';
+	} elseif ($public) {
+		$access = 'public';
+	} else {
+		$access = 'logged_in';
+	}
+
+	return elgg_register_action($action, $filename, $access);
+}
+
+/**
+ * Register an admin page with the admin panel.
+ * This function extends the view "admin/main" with the provided view.
+ * This view should provide a description and either a control or a link to.
+ *
+ * @deprecated 1.8 Extend admin views manually
+ *
+ * Usage:
+ * 	- To add a control to the main admin panel then extend admin/main
+ *  - To add a control to a new page create a page which renders a view admin/subpage
+ *    (where subpage is your new page -
+ *    nb. some pages already exist that you can extend), extend the main view to point to it,
+ *    and add controls to your new view.
+ *
+ * At the moment this is essentially a wrapper around elgg_extend_view().
+ *
+ * @param string $new_admin_view The view associated with the control you're adding
+ * @param string $view           The view to extend, by default this is 'admin/main'.
+ * @param int    $priority       Optional priority to govern the appearance in the list.
+ *
+ * @return void
+ */
+function extend_elgg_admin_page($new_admin_view, $view = 'admin/main', $priority = 500) {
+	elgg_deprecated_notice('extend_elgg_admin_page() does nothing. Extend admin views manually.', 1.8);
+}
+
+/**
+ * Get entities ordered by a mathematical calculation
+ *
+ * @deprecated 1.8 Use elgg_get_entities_from_annotation_calculation()
+ *
+ * @param string $sum            What sort of calculation to perform
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $mdname         Metadata name
+ * @param string $mdvalue        Metadata value
+ * @param int    $owner_guid     GUID of owner of annotation
+ * @param int    $limit          Limit of results
+ * @param int    $offset         Offset of results
+ * @param string $orderdir       Order of results
+ * @param bool   $count          Return count or entities
+ *
+ * @return mixed
+ */
+function get_entities_from_annotations_calculate_x($sum = "sum", $entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false) {
+
+	$msg = 'get_entities_from_annotations_calculate_x() is deprecated by elgg_get_entities_from_annotation_calculation().';
+
+	elgg_deprecated_notice($msg, 1.8);
+
+	$options = array();
+
+	$options['calculation'] = $sum;
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	$options['annotation_names'] = $name;
+
+	if ($mdname) {
+		$options['metadata_names'] = $mdname;
+	}
+
+	if ($mdvalue) {
+		$options['metadata_values'] = $mdvalue;
+	}
+
+	// original function rewrote this to container guid.
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['container_guids'] = $owner_guid;
+		} else {
+			$options['container_guid'] = $owner_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+
+	$options['order_by'] = "annotation_calculation $orderdir";
+
+	$options['count'] = $count;
+
+	return elgg_get_entities_from_annotation_calculation($options);
+}
+
+/**
+ * Returns entities ordered by the sum of an annotation
+ *
+ * @warning This is function uses sum instead of count. THIS IS SLOW. See #3366.
+ *          This should be used when you have annotations with different values and you
+ *          want a list of entities ordered by the sum of all of those values.
+ *          If you want a list of entities ordered by the number of annotations on each entity,
+ *          use __get_entities_from_annotations_calculate_x() and pass 'count' as the first param.
+ *
+ * @deprecated 1.8 Use elgg_get_entities_from_annotation_calculation()
+ *
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $mdname         Metadata name
+ * @param string $mdvalue        Metadata value
+ * @param int    $owner_guid     GUID of owner of annotation
+ * @param int    $limit          Limit of results
+ * @param int    $offset         Offset of results
+ * @param string $orderdir       Order of results
+ * @param bool   $count          Return count or entities
+ *
+ * @return unknown
+ */
+function get_entities_from_annotation_count($entity_type = "", $entity_subtype = "", $name = "", $mdname = '', $mdvalue = '', $owner_guid = 0, $limit = 10, $offset = 0, $orderdir = 'desc', $count = false) {
+
+	$msg = 'get_entities_from_annotation_count() is deprecated by elgg_get_entities_from_annotation_calculation().';
+
+	elgg_deprecated_notice($msg, 1.8);
+
+	$options = array();
+
+	$options['calculation'] = 'sum';
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	$options['annotation_names'] = $name;
+
+	if ($mdname) {
+		$options['metadata_names'] = $mdname;
+	}
+
+	if ($mdvalue) {
+		$options['metadata_values'] = $mdvalue;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+
+	$options['order_by'] = "annotation_calculation $orderdir";
+
+	$options['count'] = $count;
+
+	return elgg_get_entities_from_annotation_calculation($options);
+}
+
+/**
+ * Lists entities by the totals of a particular kind of annotation
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_annotation_calculation()
+ *
+ * @param string  $entity_type    Type of entity.
+ * @param string  $entity_subtype Subtype of entity.
+ * @param string  $name           Name of annotation.
+ * @param int     $limit          Maximum number of results to return.
+ * @param int     $owner_guid     Owner.
+ * @param int     $group_guid     Group container. Currently only supported if entity_type is object
+ * @param boolean $asc            Whether to list in ascending or descending order (default: desc)
+ * @param boolean $fullview       Whether to display the entities in full
+ * @param boolean $listtypetoggle Can the 'gallery' view can be displayed (default: no)
+ * @param boolean $pagination     Add pagination
+ * @param string  $orderdir       Order desc or asc
+ *
+ * @return string Formatted entity list
+ */
+function list_entities_from_annotation_count($entity_type = "", $entity_subtype = "", $name = "", $limit = 10, $owner_guid = 0, $group_guid = 0, $asc = false, $fullview = true, $listtypetoggle = false, $pagination = true, $orderdir = 'desc') {
+
+	$msg = 'list_entities_from_annotation_count() is deprecated by elgg_list_entities_from_annotation_calculation().';
+
+	elgg_deprecated_notice($msg, 1.8);
+
+	$options = array();
+
+	$options['calculation'] = 'sum';
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	$options['annotation_names'] = $name;
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	$options['full_view'] = $fullview;
+
+	$options['list_type_toggle'] = $listtypetoggle;
+
+	$options['pagination'] = $pagination;
+
+	$options['limit'] = $limit;
+
+	$options['order_by'] = "annotation_calculation $orderdir";
+
+	return elgg_get_entities_from_annotation_calculation($options);
+}
+
+/**
+ * Adds an entry in $CONFIG[$register_name][$subregister_name].
+ *
+ * @deprecated 1.8 Use the new menu system.
+ * 
+ * This is only used for the site-wide menu.  See {@link add_menu()}.
+ *
+ * @param string $register_name     The name of the top-level register
+ * @param string $subregister_name  The name of the subregister
+ * @param mixed  $subregister_value The value of the subregister
+ * @param array  $children_array    Optionally, an array of children
+ *
+ * @return true|false Depending on success
+ */
+function add_to_register($register_name, $subregister_name, $subregister_value, $children_array = array()) {
+	elgg_deprecated_notice("add_to_register() has been deprecated", 1.8);
+	global $CONFIG;
+
+	if (empty($register_name) || empty($subregister_name)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->registers)) {
+		$CONFIG->registers = array();
+	}
+
+	if (!isset($CONFIG->registers[$register_name])) {
+		$CONFIG->registers[$register_name] = array();
+	}
+
+	$subregister = new stdClass;
+	$subregister->name = $subregister_name;
+	$subregister->value = $subregister_value;
+
+	if (is_array($children_array)) {
+		$subregister->children = $children_array;
+	}
+
+	$CONFIG->registers[$register_name][$subregister_name] = $subregister;
+	return true;
+}
+
+/**
+ * Removes a register entry from $CONFIG[register_name][subregister_name]
+ *
+ * @deprecated 1.8 Use the new menu system.
+ *
+ * This is used to by {@link remove_menu()} to remove site-wide menu items.
+ *
+ * @param string $register_name    The name of the top-level register
+ * @param string $subregister_name The name of the subregister
+ *
+ * @return true|false Depending on success
+ * @since 1.7.0
+ */
+function remove_from_register($register_name, $subregister_name) {
+	elgg_deprecated_notice("remove_from_register() has been deprecated", 1.8);
+	global $CONFIG;
+
+	if (empty($register_name) || empty($subregister_name)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->registers)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->registers[$register_name])) {
+		return false;
+	}
+
+	if (isset($CONFIG->registers[$register_name][$subregister_name])) {
+		unset($CONFIG->registers[$register_name][$subregister_name]);
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * If it exists, returns a particular register as an array
+ *
+ * @deprecated 1.8 Use the new menu system
+ *
+ * @param string $register_name The name of the register
+ *
+ * @return array|false Depending on success
+ */
+function get_register($register_name) {
+	elgg_deprecated_notice("get_register() has been deprecated", 1.8);
+	global $CONFIG;
+
+	if ($register_name == 'menu') {
+		// backward compatible code for site menu
+		$menu = $CONFIG->menus['site'];
+		$builder = new ElggMenuBuilder($menu);
+		$menu_items = $builder->getMenu('text');
+		$menu_items = $menu_items['default'];
+
+		$menu = array();
+		foreach ($menu_items as $item) {
+			$subregister = new stdClass;
+			$subregister->name = $item->getText();
+			$subregister->value = $item->getHref();
+			$menu[$subregister->name] = $subregister;
+		}
+		return $menu;
+	}
+
+	if (isset($CONFIG->registers[$register_name])) {
+		return $CONFIG->registers[$register_name];
+	}
+
+	return false;
+}
+
+/**
+ * Deprecated events core function. Code divided between elgg_register_event_handler()
+ * and trigger_elgg_event().
+ *
+ * @deprecated 1.8 Use explicit register/trigger event functions
+ *
+ * @param string  $event       The type of event (eg 'init', 'update', 'delete')
+ * @param string  $object_type The type of object (eg 'system', 'blog', 'user')
+ * @param string  $function    The name of the function that will handle the event
+ * @param int     $priority    Priority to call handler. Lower numbers called first (default 500)
+ * @param boolean $call        Set to true to call the event rather than add to it (default false)
+ * @param mixed   $object      Optionally, the object the event is being performed on (eg a user)
+ *
+ * @return true|false Depending on success
+ */
+function events($event = "", $object_type = "", $function = "", $priority = 500, $call = false, $object = null) {
+
+	elgg_deprecated_notice('events() has been deprecated.', 1.8);
+
+	// leaving this here just in case someone was directly calling this internal function
+	if (!$call) {
+		return elgg_register_event_handler($event, $object_type, $function, $priority);
+	} else {
+		return trigger_elgg_event($event, $object_type, $object);
+	}
+}
+
+/**
+ * Alias function for events, that registers a function to a particular kind of event
+ *
+ * @deprecated 1.8 Use elgg_register_event_handler() instead
+ * 
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @return true|false Depending on success
+ */
+function register_elgg_event_handler($event, $object_type, $callback, $priority = 500) {
+	elgg_deprecated_notice("register_elgg_event_handler() was deprecated by elgg_register_event_handler()", 1.8);
+	return elgg_register_event_handler($event, $object_type, $callback, $priority);
+}
+
+/**
+ * Unregisters a function to a particular kind of event
+ * 
+ * @deprecated 1.8 Use elgg_unregister_event_handler instead
+ *
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @since 1.7.0
+ */
+function unregister_elgg_event_handler($event, $object_type, $callback) {
+	elgg_deprecated_notice('unregister_elgg_event_handler => elgg_unregister_event_handler', 1.8);
+	elgg_unregister_event_handler($event, $object_type, $callback);
+}
+
+/**
+ * Alias function for events, that triggers a particular kind of event
+ *
+ * @deprecated 1.8 Use elgg_trigger_event() instead
+ * 
+ * @param string $event The event type
+ * @param string $object_type The object type
+ * @param string $function The function name
+ * @return true|false Depending on success
+ */
+function trigger_elgg_event($event, $object_type, $object = null) {
+	elgg_deprecated_notice('trigger_elgg_event() was deprecated by elgg_trigger_event()', 1.8);
+	return elgg_trigger_event($event, $object_type, $object);
+}
+
+/**
+ * Register a function to a plugin hook for a particular entity type, with a given priority.
+ *
+ * @deprecated 1.8 Use elgg_register_plugin_hook_handler() instead
+ * 
+ * eg if you want the function "export_user" to be called when the hook "export" for "user" entities
+ * is run, use:
+ *
+ * 		register_plugin_hook("export", "user", "export_user");
+ *
+ * "all" is a valid value for both $hook and $entity_type. "none" is a valid value for $entity_type.
+ *
+ * The export_user function would then be defined as:
+ *
+ * 		function export_user($hook, $entity_type, $returnvalue, $params);
+ *
+ * Where $returnvalue is the return value returned by the last function returned by the hook, and
+ * $params is an array containing a set of parameters (or nothing).
+ *
+ * @param string $hook The name of the hook
+ * @param string $entity_type The name of the type of entity (eg "user", "object" etc)
+ * @param string $function The name of a valid function to be run
+ * @param string $priority The priority - 0 is first, 1000 last, default is 500
+ * @return true|false Depending on success
+ */
+function register_plugin_hook($hook, $type, $callback, $priority = 500) {
+	elgg_deprecated_notice("register_plugin_hook() was deprecated by elgg_register_plugin_hook_handler()", 1.8);
+	return elgg_register_plugin_hook_handler($hook, $type, $callback, $priority);
+}
+
+/**
+ * Unregister a function to a plugin hook for a particular entity type
+ *
+ * @deprecated 1.8 Use elgg_unregister_plugin_hook_handler() instead
+ * 
+ * @param string $hook The name of the hook
+ * @param string $entity_type The name of the type of entity (eg "user", "object" etc)
+ * @param string $function The name of a valid function to be run
+ * @since 1.7.0
+ */
+function unregister_plugin_hook($hook, $entity_type, $callback) {
+	elgg_deprecated_notice("unregister_plugin_hook() was deprecated by elgg_unregister_plugin_hook_handler()", 1.8);
+	elgg_unregister_plugin_hook_handler($hook, $entity_type, $callback);
+}
+
+/**
+ * Triggers a plugin hook, with various parameters as an array. For example, to provide
+ * a 'foo' hook that concerns an entity of type 'bar', with a parameter called 'param1'
+ * with value 'value1', that by default returns true, you'd call:
+ *
+ * @deprecated 1.8 Use elgg_trigger_plugin_hook() instead
+ *
+ * trigger_plugin_hook('foo', 'bar', array('param1' => 'value1'), true);
+ *
+ * @see register_plugin_hook
+ * @param string $hook The name of the hook to trigger
+ * @param string $entity_type The name of the entity type to trigger it for (or "all", or "none")
+ * @param array $params Any parameters. It's good practice to name the keys, i.e. by using array('name' => 'value', 'name2' => 'value2')
+ * @param mixed $returnvalue An initial return value
+ * @return mixed|null The cumulative return value for the plugin hook functions
+ */
+function trigger_plugin_hook($hook, $type, $params = null, $returnvalue = null) {
+	elgg_deprecated_notice("trigger_plugin_hook() was deprecated by elgg_trigger_plugin_hook()", 1.8);
+	return elgg_trigger_plugin_hook($hook, $type, $params, $returnvalue);
+}
+
+/**
+ * Checks if code is being called from a certain function.
+ *
+ * To use, call this function with the function name (and optional
+ * file location) that it has to be called from, it will either
+ * return true or false.
+ *
+ * e.g.
+ *
+ * function my_secure_function()
+ * {
+ * 		if (!call_gatekeeper("my_call_function"))
+ * 			return false;
+ *
+ * 		... do secure stuff ...
+ * }
+ *
+ * function my_call_function()
+ * {
+ * 		// will work
+ * 		my_secure_function();
+ * }
+ *
+ * function bad_function()
+ * {
+ * 		// Will not work
+ * 		my_secure_function();
+ * }
+ *
+ * @param mixed  $function The function that this function must have in its call stack,
+ * 		                   to test against a method pass an array containing a class and
+ *                         method name.
+ * @param string $file     Optional file that the function must reside in.
+ *
+ * @return bool
+ *
+ * @deprecated 1.8 A neat but pointless function
+ */
+function call_gatekeeper($function, $file = "") {
+	elgg_deprecated_notice("call_gatekeeper() is neat but pointless", 1.8);
+	// Sanity check
+	if (!$function) {
+		return false;
+	}
+
+	// Check against call stack to see if this is being called from the correct location
+	$callstack = debug_backtrace();
+	$stack_element = false;
+
+	foreach ($callstack as $call) {
+		if (is_array($function)) {
+			if ((strcmp($call['class'], $function[0]) == 0) && (strcmp($call['function'], $function[1]) == 0)) {
+				$stack_element = $call;
+			}
+		} else {
+			if (strcmp($call['function'], $function) == 0) {
+				$stack_element = $call;
+			}
+		}
+	}
+
+	if (!$stack_element) {
+		return false;
+	}
+
+	// If file then check that this it is being called from this function
+	if ($file) {
+		$mirror = null;
+
+		if (is_array($function)) {
+			$mirror = new ReflectionMethod($function[0], $function[1]);
+		} else {
+			$mirror = new ReflectionFunction($function);
+		}
+
+		if ((!$mirror) || (strcmp($file, $mirror->getFileName()) != 0)) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+/**
+ * This function checks to see if it is being called at somepoint by a function defined somewhere
+ * on a given path (optionally including subdirectories).
+ *
+ * This function is similar to call_gatekeeper() but returns true if it is being called
+ * by a method or function which has been defined on a given path or by a specified file.
+ *
+ * @param string $path            The full path and filename that this function must have
+ *                                in its call stack If a partial path is given and
+ *                                $include_subdirs is true, then the function will return
+ *                                true if called by any function in or below the specified path.
+ * @param bool   $include_subdirs Are subdirectories of the path ok, or must you specify an
+ *                                absolute path and filename.
+ * @param bool   $strict_mode     If true then the calling method or function must be directly
+ *                                called by something on $path, if false the whole call stack is
+ *                                searched.
+ *
+ * @return void
+ *
+ * @deprecated 1.8 A neat but pointless function
+ */
+function callpath_gatekeeper($path, $include_subdirs = true, $strict_mode = false) {
+	elgg_deprecated_notice("callpath_gatekeeper() is neat but pointless", 1.8);
+
+	global $CONFIG;
+
+	$path = sanitise_string($path);
+
+	if ($path) {
+		$callstack = debug_backtrace();
+
+		foreach ($callstack as $call) {
+			$call['file'] = str_replace("\\", "/", $call['file']);
+
+			if ($include_subdirs) {
+				if (strpos($call['file'], $path) === 0) {
+
+					if ($strict_mode) {
+						$callstack[1]['file'] = str_replace("\\", "/", $callstack[1]['file']);
+						if ($callstack[1] === $call) {
+							return true;
+						}
+					} else {
+						return true;
+					}
+				}
+			} else {
+				if (strcmp($path, $call['file']) == 0) {
+					if ($strict_mode) {
+						if ($callstack[1] === $call) {
+							return true;
+						}
+					} else {
+						return true;
+					}
+				}
+			}
+
+		}
+		return false;
+	}
+
+	if (isset($CONFIG->debug)) {
+		system_message("Gatekeeper'd function called from {$callstack[1]['file']}:" . "{$callstack[1]['line']}\n\nStack trace:\n\n" . print_r($callstack, true));
+	}
+
+	return false;
+}
+
+/**
+ * Returns SQL where clause for owner and containers.
+ *
+ * @deprecated 1.8 Use elgg_get_guid_based_where_sql();
+ *
+ * @param string     $table       Entity table prefix as defined in SELECT...FROM entities $table
+ * @param NULL|array $owner_guids Owner GUIDs
+ *
+ * @return FALSE|str
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_owner_where_sql($table, $owner_guids) {
+	elgg_deprecated_notice('elgg_get_entity_owner_where_sql() is deprecated by elgg_get_guid_based_where_sql().', 1.8);
+
+	return elgg_get_guid_based_where_sql("{$table}.owner_guid", $owner_guids);
+}
+
+/**
+ * Returns SQL where clause for containers.
+ *
+ * @deprecated 1.8 Use elgg_get_guid_based_where_sql();
+ *
+ * @param string     $table           Entity table prefix as defined in
+ *                                    SELECT...FROM entities $table
+ * @param NULL|array $container_guids Array of container guids
+ *
+ * @return FALSE|string
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_container_where_sql($table, $container_guids) {
+	elgg_deprecated_notice('elgg_get_entity_container_where_sql() is deprecated by elgg_get_guid_based_where_sql().', 1.8);
+
+	return elgg_get_guid_based_where_sql("{$table}.container_guid", $container_guids);
+}
+
+/**
+ * Returns SQL where clause for site entities
+ *
+ * @deprecated 1.8 Use elgg_get_guid_based_where_sql()
+ *
+ * @param string     $table      Entity table prefix as defined in SELECT...FROM entities $table
+ * @param NULL|array $site_guids Array of site guids
+ *
+ * @return FALSE|string
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_site_where_sql($table, $site_guids) {
+	elgg_deprecated_notice('elgg_get_entity_site_where_sql() is deprecated by elgg_get_guid_based_where_sql().', 1.8);
+
+	return elgg_get_guid_based_where_sql("{$table}.site_guid", $site_guids);
+}
+
+/**
+ * Return an array of objects in a given container.
+ *
+ * @see get_entities()
+ *
+ * @param int    $group_guid The container (defaults to current page owner)
+ * @param string $subtype    The subtype
+ * @param int    $owner_guid Owner
+ * @param int    $site_guid  The site
+ * @param string $order_by   Order
+ * @param int    $limit      Limit on number of elements to return, by default 10.
+ * @param int    $offset     Where to start, by default 0.
+ * @param bool   $count      Whether to return the entities or a count of them.
+ *
+ * @return array|false
+ * @deprecated 1.8 Use elgg_get_entities() instead
+ */
+function get_objects_in_group($group_guid, $subtype = "", $owner_guid = 0, $site_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = FALSE) {
+	elgg_deprecated_notice("get_objects_in_group was deprected in 1.8.  Use elgg_get_entities() instead", 1.8);
+
+	global $CONFIG;
+
+	if ($subtype === FALSE || $subtype === null || $subtype === 0) {
+		return FALSE;
+	}
+
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int)$site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	$container_guid = (int)$group_guid;
+	if ($container_guid == 0) {
+		$container_guid = elgg_get_page_owner_guid();
+	}
+
+	$where = array();
+
+	$where[] = "e.type='object'";
+
+	if (!empty($subtype)) {
+		if (!$subtype = get_subtype_id('object', $subtype)) {
+			return FALSE;
+		}
+		$where[] = "e.subtype=$subtype";
+	}
+	if ($owner_guid != "") {
+		if (!is_array($owner_guid)) {
+			$owner_guid = (int)$owner_guid;
+			$where[] = "e.container_guid = '$owner_guid'";
+		} else if (sizeof($owner_guid) > 0) {
+			// Cast every element to the owner_guid array to int
+			$owner_guid = array_map("sanitise_int", $owner_guid);
+			$owner_guid = implode(",", $owner_guid);
+			$where[] = "e.container_guid in ({$owner_guid})";
+		}
+	}
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if ($container_guid > 0) {
+		$where[] = "e.container_guid = {$container_guid}";
+	}
+
+	if (!$count) {
+		$query = "SELECT * from {$CONFIG->dbprefix}entities e" . " join {$CONFIG->dbprefix}objects_entity o on e.guid=o.guid where ";
+	} else {
+		$query = "SELECT count(e.guid) as total from {$CONFIG->dbprefix}entities e" . " join {$CONFIG->dbprefix}objects_entity o on e.guid=o.guid where ";
+	}
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix('e');
+	if (!$count) {
+		$query .= " order by $order_by";
+
+		// Add order and limit
+		if ($limit) {
+			$query .= " limit $offset, $limit";
+		}
+
+		$dt = get_data($query, "entity_row_to_elggstar");
+		return $dt;
+	} else {
+		$total = get_data_row($query);
+		return $total->total;
+	}
+}
+
+/**
+ * Lists entities that belong to a group.
+ *
+ * @param string $subtype        The arbitrary subtype of the entity
+ * @param int    $owner_guid     The GUID of the owning user
+ * @param int    $container_guid The GUID of the containing group
+ * @param int    $limit          The number of entities to display per page (default: 10)
+ * @param bool   $fullview       Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle Whether or not to allow gallery view (default: true)
+ * @param bool   $pagination     Whether to display pagination (default: true)
+ *
+ * @return string List of parsed entities
+ *
+ * @see elgg_list_entities()
+ * @deprecated 1.8 Use elgg_list_entities() instead
+ */
+function list_entities_groups($subtype = "", $owner_guid = 0, $container_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true) {
+	elgg_deprecated_notice("list_entities_groups was deprecated in 1.8.  Use elgg_list_entities() instead.", 1.8);
+	$offset = (int)get_input('offset');
+	$count = get_objects_in_group($container_guid, $subtype, $owner_guid, 0, "", $limit, $offset, true);
+	$entities = get_objects_in_group($container_guid, $subtype, $owner_guid, 0, "", $limit, $offset);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $listtypetoggle, $pagination);
+}
+
+/**
+ * Get all the entities from metadata from a group.
+ *
+ * @param int    $group_guid     The ID of the group.
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner guid
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site GUID. 0 for current, -1 for any
+ * @param bool   $count          Return count instead of entities
+ *
+ * @return array|false
+ * @deprecated 1.8 Use elgg_get_entities_from_metadata()
+ */
+function get_entities_from_metadata_groups($group_guid, $meta_name, $meta_value = "", $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0, $count = false) {
+	elgg_deprecated_notice("get_entities_from_metadata_groups was deprecated in 1.8.", 1.8);
+	global $CONFIG;
+
+	$meta_n = get_metastring_id($meta_name);
+	$meta_v = get_metastring_id($meta_value);
+
+	$entity_type = sanitise_string($entity_type);
+	$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$site_guid = (int)$site_guid;
+	if (is_array($owner_guid)) {
+		foreach ($owner_guid as $key => $guid) {
+			$owner_guid[$key] = (int)$guid;
+		}
+	} else {
+		$owner_guid = (int)$owner_guid;
+	}
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	$container_guid = (int)$group_guid;
+	if ($container_guid == 0) {
+		$container_guid = elgg_get_page_owner_guid();
+	}
+
+	$where = array();
+
+	if ($entity_type != "") {
+		$where[] = "e.type='$entity_type'";
+	}
+	if ($entity_subtype) {
+		$where[] = "e.subtype=$entity_subtype";
+	}
+	if ($meta_name != "") {
+		$where[] = "m.name_id='$meta_n'";
+	}
+	if ($meta_value != "") {
+		$where[] = "m.value_id='$meta_v'";
+	}
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+	if ($container_guid > 0) {
+		$where[] = "e.container_guid = {$container_guid}";
+	}
+
+	if (is_array($owner_guid)) {
+		$where[] = "e.container_guid in (" . implode(",", $owner_guid) . ")";
+	} else if ($owner_guid > 0) {
+		$where[] = "e.container_guid = {$owner_guid}";
+	}
+
+	if (!$count) {
+		$query = "SELECT distinct e.* ";
+	} else {
+		$query = "SELECT count(e.guid) as total ";
+	}
+
+	$query .= "from {$CONFIG->dbprefix}entities e" . " JOIN {$CONFIG->dbprefix}metadata m on e.guid = m.entity_guid " . " JOIN {$CONFIG->dbprefix}objects_entity o on e.guid = o.guid where";
+
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix("e");
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($row = get_data_row($query)) {
+			return $row->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * As get_entities_from_metadata_groups() but with multiple entities.
+ *
+ * @param int    $group_guid     The ID of the group.
+ * @param array  $meta_array     Array of 'name' => 'value' pairs
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site GUID. 0 for current, -1 for any
+ * @param bool   $count          Return count of entities instead of entities
+ *
+ * @return int|array List of ElggEntities, or the total number if count is set to false
+ * @deprecated 1.8 Use elgg_get_entities_from_metadata()
+ */
+function get_entities_from_metadata_groups_multi($group_guid, $meta_array, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0, $count = false) {
+	elgg_deprecated_notice("get_entities_from_metadata_groups_multi was deprecated in 1.8.", 1.8);
+
+	global $CONFIG;
+
+	if (!is_array($meta_array) || sizeof($meta_array) == 0) {
+		return false;
+	}
+
+	$where = array();
+
+	$mindex = 1;
+	$join = "";
+	foreach ($meta_array as $meta_name => $meta_value) {
+		$meta_n = get_metastring_id($meta_name);
+		$meta_v = get_metastring_id($meta_value);
+		$join .= " JOIN {$CONFIG->dbprefix}metadata m{$mindex} on e.guid = m{$mindex}.entity_guid" . " JOIN {$CONFIG->dbprefix}objects_entity o on e.guid = o.guid ";
+
+		if ($meta_name != "") {
+			$where[] = "m{$mindex}.name_id='$meta_n'";
+		}
+
+		if ($meta_value != "") {
+			$where[] = "m{$mindex}.value_id='$meta_v'";
+		}
+
+		$mindex++;
+	}
+
+	$entity_type = sanitise_string($entity_type);
+	$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$owner_guid = (int)$owner_guid;
+
+	$site_guid = (int)$site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	//$access = get_access_list();
+
+	if ($entity_type != "") {
+		$where[] = "e.type = '{$entity_type}'";
+	}
+
+	if ($entity_subtype) {
+		$where[] = "e.subtype = {$entity_subtype}";
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if ($owner_guid > 0) {
+		$where[] = "e.owner_guid = {$owner_guid}";
+	}
+
+	if ($container_guid > 0) {
+		$where[] = "e.container_guid = {$container_guid}";
+	}
+
+	if ($count) {
+		$query = "SELECT count(e.guid) as total ";
+	} else {
+		$query = "SELECT distinct e.* ";
+	}
+
+	$query .= " from {$CONFIG->dbprefix}entities e {$join} where";
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+	$query .= get_access_sql_suffix("e"); // Add access controls
+
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * List items within a given geographic area.
+ *
+ * @param real   $lat            Latitude
+ * @param real   $long           Longitude
+ * @param real   $radius         The radius
+ * @param string $type           The type of entity (eg "user", "object" etc)
+ * @param string $subtype        The arbitrary subtype of the entity
+ * @param int    $owner_guid     The GUID of the owning user
+ * @param int    $limit          The number of entities to display per page (default: 10)
+ * @param bool   $fullview       Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle Whether or not to allow gallery view
+ * @param bool   $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @deprecated 1.8 Use elgg_get_entities_from_location()
+ */
+function list_entities_in_area($lat, $long, $radius, $type = "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
+	elgg_deprecated_notice('list_entities_in_area() was deprecated. Use elgg_list_entities_from_location()', 1.8);
+
+	$options = array();
+
+	$options['latitude'] = $lat;
+	$options['longitude'] = $long;
+	$options['distance'] = $radius;
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+
+	$options['full_view'] = $fullview;
+	$options['list_type_toggle'] = $listtypetoggle;
+	$options['pagination'] = $pagination;
+
+	return elgg_list_entities_from_location($options);
+}
+
+/**
+ * List entities in a given location
+ *
+ * @param string $location       Location
+ * @param string $type           The type of entity (eg "user", "object" etc)
+ * @param string $subtype        The arbitrary subtype of the entity
+ * @param int    $owner_guid     The GUID of the owning user
+ * @param int    $limit          The number of entities to display per page (default: 10)
+ * @param bool   $fullview       Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle Whether or not to allow gallery view
+ * @param bool   $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @deprecated 1.8 Use elgg_list_entities_from_location()
+ */
+function list_entities_location($location, $type = "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
+	elgg_deprecated_notice('list_entities_location() was deprecated. Use elgg_list_entities_from_metadata()', 1.8);
+
+	return list_entities_from_metadata('location', $location, $type, $subtype, $owner_guid, $limit, $fullview, $listtypetoggle, $navigation);
+}
+
+/**
+ * Return entities within a given geographic area.
+ *
+ * @param float     $lat            Latitude
+ * @param float     $long           Longitude
+ * @param float     $radius         The radius
+ * @param string    $type           The type of entity (eg "user", "object" etc)
+ * @param string    $subtype        The arbitrary subtype of the entity
+ * @param int       $owner_guid     The GUID of the owning user
+ * @param string    $order_by       The field to order by; by default, time_created desc
+ * @param int       $limit          The number of entities to return; 10 by default
+ * @param int       $offset         The indexing offset, 0 by default
+ * @param boolean   $count          Count entities
+ * @param int       $site_guid      Site GUID. 0 for current, -1 for any
+ * @param int|array $container_guid Container GUID
+ *
+ * @return array A list of entities.
+ * @deprecated 1.8 Use elgg_get_entities_from_location()
+ */
+function get_entities_in_area($lat, $long, $radius, $type = "", $subtype = "", $owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = NULL) {
+	elgg_deprecated_notice('get_entities_in_area() was deprecated by elgg_get_entities_from_location()!', 1.8);
+
+	$options = array();
+
+	$options['latitude'] = $lat;
+	$options['longitude'] = $long;
+	$options['distance'] = $radius;
+
+	// set container_guid to owner_guid to emulate old functionality
+	if ($owner_guid != "") {
+		if (is_null($container_guid)) {
+			$container_guid = $owner_guid;
+		}
+	}
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($container_guid) {
+		if (is_array($container_guid)) {
+			$options['container_guids'] = $container_guid;
+		} else {
+			$options['container_guid'] = $container_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_location($options);
+}
+
+/**
+ * Return a list of entities suitable for display based on the given search criteria.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_metadata
+ *
+ * @param mixed  $meta_name      Metadata name to search on
+ * @param mixed  $meta_value     The value to match, optionally
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Number of entities to display per page
+ * @param bool   $fullview       WDisplay the full view (default: true)
+ * @param bool   $listtypetoggle Allow users to toggle to the gallery view. Default: true
+ * @param bool   $pagination     Display pagination? Default: true
+ * @param bool   $case_sensitive Case sensitive metadata names?
+ *
+ * @return string
+ *
+ * @return string A list of entities suitable for display
+ */
+function list_entities_from_metadata($meta_name, $meta_value = "", $entity_type = ELGG_ENTITIES_ANY_VALUE, $entity_subtype = ELGG_ENTITIES_ANY_VALUE, $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true, $case_sensitive = true) {
+
+	elgg_deprecated_notice('list_entities_from_metadata() was deprecated by elgg_list_entities_from_metadata()!', 1.8);
+
+	$offset = (int)get_input('offset');
+	$limit = (int)$limit;
+	$options = array(
+		'metadata_name' => $meta_name,
+		'metadata_value' => $meta_value,
+		'type' => $entity_type,
+		'subtype' => $entity_subtype,
+		'limit' => $limit,
+		'offset' => $offset,
+		'count' => TRUE,
+		'metadata_case_sensitive' => $case_sensitive
+	);
+
+	// previous function allowed falsy $owner_guid for anything
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	$count = elgg_get_entities_from_metadata($options);
+
+	$options['count'] = FALSE;
+	$entities = elgg_get_entities_from_metadata($options);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $listtypetoggle, $pagination);
+}
+
+/**
+ * Returns a viewable list of entities based on the given search criteria.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param array  $meta_array     Array of 'name' => 'value' pairs
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param bool   $fullview       WDisplay the full view (default: true)
+ * @param bool   $listtypetoggle Allow users to toggle to the gallery view. Default: true
+ * @param bool   $pagination     Display pagination? Default: true
+ *
+ * @return string List of ElggEntities suitable for display
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_metadata() instead
+ */
+function list_entities_from_metadata_multi($meta_array, $entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $fullview = true, $listtypetoggle = true, $pagination = true) {
+	elgg_deprecated_notice(elgg_echo('deprecated:function', array(
+		'list_entities_from_metadata_multi', 'elgg_get_entities_from_metadata')), 1.8);
+
+	$offset = (int)get_input('offset');
+	$limit = (int)$limit;
+	$count = get_entities_from_metadata_multi($meta_array, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", $site_guid, true);
+	$entities = get_entities_from_metadata_multi($meta_array, $entity_type, $entity_subtype, $owner_guid, $limit, $offset, "", $site_guid, false);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $listtypetoggle, $pagination);
+}
+
+/**
+ * Deprecated by elgg_register_menu_item(). Set $menu_name to 'page'.
+ *
+ * @see elgg_register_menu_item()
+ * @deprecated 1.8 Use the new menu system
+ *
+ * @param string  $label    The label
+ * @param string  $link     The link
+ * @param string  $group    The group to store item in
+ * @param boolean $onclick  Add a confirmation when clicked?
+ * @param boolean $selected Is menu item selected
+ *
+ * @return bool
+ */
+function add_submenu_item($label, $link, $group = 'default', $onclick = false, $selected = NULL) {
+	elgg_deprecated_notice('add_submenu_item was deprecated by elgg_register_menu_item', 1.8);
+
+	// submenu items were added in the page setup hook usually by checking
+	// the context.  We'll pass in the current context here, which will
+	// emulate that effect.
+	// if context == 'main' (default) it probably means they always wanted
+	// the menu item to show up everywhere.
+	$context = elgg_get_context();
+
+	if ($context == 'main') {
+		$context = 'all';
+	}
+
+	$item = array('name' => $label, 'text' => $label, 'href' => $link, 'context' => $context,
+		'section' => $group,);
+
+	if ($selected) {
+		$item['selected'] = true;
+	}
+
+	if ($onclick) {
+		$js = "onclick=\"javascript:return confirm('" . elgg_echo('deleteconfirm') . "')\"";
+		$item['vars'] = array('js' => $js);
+	}
+
+	return elgg_register_menu_item('page', $item);
+}
+
+/**
+ * Remove an item from submenu by label
+ *
+ * @deprecated 1.8 Use the new menu system
+ * @see elgg_unregister_menu_item()
+ *
+ * @param string $label The item label
+ * @param string $group The submenu group (default "a")
+ * @return bool whether the item was removed or not
+ * @since 1.7.8
+ */
+function remove_submenu_item($label, $group = 'a') {
+	elgg_deprecated_notice('remove_submenu_item was deprecated by elgg_unregister_menu_item', 1.8);
+
+	return elgg_unregister_menu_item('page', $label);
+}
+
+/**
+ * Use elgg_view_menu(). Set $menu_name to 'owner_block'.
+ *
+ * @see elgg_view_menu()
+ * @deprecated 1.8 Use the new menu system. elgg_view_menu()
+ *
+ * @return string
+ */
+function get_submenu() {
+	elgg_deprecated_notice("get_submenu() has been deprecated by elgg_view_menu()", 1.8);
+	return elgg_view_menu('owner_block', array('entity' => $owner,
+		'class' => 'elgg-menu-owner-block',));
+}
+
+/**
+ * Adds an item to the site-wide menu.
+ *
+ * You can obtain the menu array by calling {@link get_register('menu')}
+ *
+ * @param string $menu_name     The name of the menu item
+ * @param string $menu_url      The URL of the page
+ * @param array  $menu_children Optionally, an array of submenu items (not used)
+ * @param string $context       (not used)
+ *
+ * @return true|false Depending on success
+ * @deprecated 1.8 use elgg_register_menu_item() for the menu 'site'
+ */
+function add_menu($menu_name, $menu_url, $menu_children = array(), $context = "") {
+	elgg_deprecated_notice('add_menu() deprecated by elgg_register_menu_item()', 1.8);
+
+	return elgg_register_menu_item('site', array('name' => $menu_name, 'text' => $menu_name,
+		'href' => $menu_url,));
+}
+
+/**
+ * Removes an item from the menu register
+ *
+ * @param string $menu_name The name of the menu item
+ *
+ * @return true|false Depending on success
+ * @deprecated 1.8 Use the new menu system
+ */
+function remove_menu($menu_name) {
+	elgg_deprecated_notice("remove_menu() deprecated by elgg_unregister_menu_item()", 1.8);
+	return elgg_unregister_menu_item('site', $menu_name);
+}
+
+/**
+ * When given a title, returns a version suitable for inclusion in a URL
+ *
+ * @param string $title The title
+ *
+ * @return string The optimised title
+ * @deprecated 1.8 Use elgg_get_friendly_title()
+ */
+function friendly_title($title) {
+	elgg_deprecated_notice('friendly_title was deprecated by elgg_get_friendly_title', 1.8);
+	return elgg_get_friendly_title($title);
+}
+
+/**
+ * Displays a UNIX timestamp in a friendly way (eg "less than a minute ago")
+ *
+ * @param int $time A UNIX epoch timestamp
+ *
+ * @return string The friendly time
+ * @deprecated 1.8 Use elgg_view_friendly_time()
+ */
+function friendly_time($time) {
+	elgg_deprecated_notice('friendly_time was deprecated by elgg_view_friendly_time', 1.8);
+	return elgg_view_friendly_time($time);
+}
+
+/**
+ * Filters a string into an array of significant words
+ *
+ * @deprecated 1.8 Don't use this.
+ *
+ * @param string $string A string
+ *
+ * @return array
+ */
+function filter_string($string) {
+	elgg_deprecated_notice('filter_string() was deprecated!', 1.8);
+
+	// Convert it to lower and trim
+	$string = strtolower($string);
+	$string = trim($string);
+
+	// Remove links and email addresses
+	// match protocol://address/path/file.extension?some=variable&another=asf%
+	$string = preg_replace("/\s([a-zA-Z]+:\/\/[a-z][a-z0-9\_\.\-]*[a-z]{2,6}" . "[a-zA-Z0-9\/\*\-\?\&\%\=]*)([\s|\.|\,])/iu", " ", $string);
+
+	// match www.something.domain/path/file.extension?some=variable&another=asf%
+	$string = preg_replace("/\s(www\.[a-z][a-z0-9\_\.\-]*[a-z]{2,6}" . "[a-zA-Z0-9\/\*\-\?\&\%\=]*)([\s|\.|\,])/iu", " ", $string);
+
+	// match name@address
+	$string = preg_replace("/\s([a-zA-Z][a-zA-Z0-9\_\.\-]*[a-zA-Z]" . "*\@[a-zA-Z][a-zA-Z0-9\_\.\-]*[a-zA-Z]{2,6})([\s|\.|\,])/iu", " ", $string);
+
+	// Sanitise the string; remove unwanted characters
+	$string = preg_replace('/\W/ui', ' ', $string);
+
+	// Explode it into an array
+	$terms = explode(' ', $string);
+
+	// Remove any blacklist terms
+	//$terms = array_filter($terms, 'remove_blacklist');
+
+	return $terms;
+}
+
+/**
+ * Returns true if the word in $input is considered significant
+ *
+ * @deprecated 1.8 Don't use this.
+ *
+ * @param string $input A word
+ *
+ * @return true|false
+ */
+function remove_blacklist($input) {
+	elgg_deprecated_notice('remove_blacklist() was deprecated!', 1.8);
+
+	global $CONFIG;
+
+	if (!is_array($CONFIG->wordblacklist)) {
+		return $input;
+	}
+
+	if (strlen($input) < 3 || in_array($input, $CONFIG->wordblacklist)) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Gets the guid of the entity that owns the current page.
+ *
+ * @deprecated 1.8  Use elgg_get_page_owner_guid()
+ *
+ * @return int The current page owner guid (0 if none).
+ */
+function page_owner() {
+	elgg_deprecated_notice('page_owner() was deprecated by elgg_get_page_owner_guid().', 1.8);
+	return elgg_get_page_owner_guid();
+}
+
+/**
+ * Gets the owner entity for the current page.
+ *
+ * @deprecated 1.8  Use elgg_get_page_owner_entity()
+ * @return ElggEntity|false The current page owner or false if none.
+ */
+function page_owner_entity() {
+	elgg_deprecated_notice('page_owner_entity() was deprecated by elgg_get_page_owner_entity().', 1.8);
+	return elgg_get_page_owner_entity();
+}
+
+/**
+ * Registers a page owner handler function
+ *
+ * @param string $functionname The callback function
+ *
+ * @deprecated 1.8  Use the 'page_owner', 'system' plugin hook
+ * @return void
+ */
+function add_page_owner_handler($functionname) {
+	elgg_deprecated_notice("add_page_owner_handler() was deprecated by the plugin hook 'page_owner', 'system'.", 1.8);
+}
+
+/**
+ * Set a page owner entity
+ *
+ * @param int $entitytoset The GUID of the entity
+ *
+ * @deprecated 1.8  Use elgg_set_page_owner_guid()
+ * @return void
+ */
+function set_page_owner($entitytoset = -1) {
+	elgg_deprecated_notice('set_page_owner() was deprecated by elgg_set_page_owner_guid().', 1.8);
+	elgg_set_page_owner_guid($entitytoset);
+}
+
+/**
+ * Sets the functional context of a page
+ *
+ * @deprecated 1.8  Use elgg_set_context()
+ *
+ * @param string $context The context of the page
+ *
+ * @return mixed Either the context string, or false on failure
+ */
+function set_context($context) {
+	elgg_deprecated_notice('set_context() was deprecated by elgg_set_context().', 1.8);
+	elgg_set_context($context);
+	if (empty($context)) {
+		return false;
+	}
+	return $context;
+}
+
+/**
+ * Returns the functional context of a page
+ *
+ * @deprecated 1.8  Use elgg_get_context()
+ *
+ * @return string The context, or 'main' if no context has been provided
+ */
+function get_context() {
+	elgg_deprecated_notice('get_context() was deprecated by elgg_get_context().', 1.8);
+	return elgg_get_context();
+
+	// @todo - used to set context based on calling script
+	// $context = get_plugin_name(true)
+}
+
+/**
+ * Returns a list of plugins to load, in the order that they should be loaded.
+ *
+ * @deprecated 1.8 Use elgg_get_plugin_ids_in_dir() or elgg_get_plugins()
+ *
+ * @return array List of plugins
+ */
+function get_plugin_list() {
+	elgg_deprecated_notice('get_plugin_list() is deprecated by elgg_get_plugin_ids_in_dir() or elgg_get_plugins()', 1.8);
+
+	$plugins = elgg_get_plugins('any');
+
+	$list = array();
+	if ($plugins) {
+		foreach ($plugins as $i => $plugin) {
+			// in <=1.7 this returned indexed by multiples of 10.
+			// uh...sure...why not.
+			$index = ($i + 1) * 10;
+			$list[$index] = $plugin->getID();
+		}
+	}
+
+	return $list;
+}
+
+/**
+ * Regenerates the list of known plugins and saves it to the current site
+ *
+ * Important: You should regenerate simplecache and the viewpath cache after executing this function
+ * otherwise you may experience view display artifacts. Do this with the following code:
+ *
+ * 		elgg_regenerate_simplecache();
+ *		elgg_reset_system_cache();
+ *
+ * @deprecated 1.8 Use elgg_generate_plugin_entities() and elgg_set_plugin_priorities()
+ *
+ * @param array $pluginorder Optionally, a list of existing plugins and their orders
+ *
+ * @return array The new list of plugins and their orders
+ */
+function regenerate_plugin_list($pluginorder = FALSE) {
+	$msg = 'regenerate_plugin_list() is (sorta) deprecated by elgg_generate_plugin_entities() and'
+			. ' elgg_set_plugin_priorities().';
+	elgg_deprecated_notice($msg, 1.8);
+
+	// they're probably trying to set it?
+	if ($pluginorder) {
+		if (elgg_generate_plugin_entities()) {
+			// sort the plugins by the index numerically since we used
+			// weird indexes in the old system.
+			ksort($pluginorder, SORT_NUMERIC);
+			return elgg_set_plugin_priorities($pluginorder);
+		}
+		return false;
+	} else {
+		// they're probably trying to regenerate from disk?
+		return elgg_generate_plugin_entities();
+	}
+}
+
+/**
+ * Get the name of the most recent plugin to be called in the
+ * call stack (or the plugin that owns the current page, if any).
+ *
+ * i.e., if the last plugin was in /mod/foobar/, get_plugin_name would return foo_bar.
+ *
+ * @deprecated 1.8 Use elgg_get_calling_plugin_id()
+ *
+ * @param boolean $mainfilename If set to true, this will instead determine the
+ *                              context from the main script filename called by
+ *                              the browser. Default = false.
+ *
+ * @return string|false Plugin name, or false if no plugin name was called
+ */
+function get_plugin_name($mainfilename = false) {
+	elgg_deprecated_notice('get_plugin_name() is deprecated by elgg_get_calling_plugin_id()', 1.8);
+
+	return elgg_get_calling_plugin_id($mainfilename);
+}
+
+/**
+ * Load and parse a plugin manifest from a plugin XML file.
+ *
+ * @example plugins/manifest.xml Example 1.8-style manifest file.
+ *
+ * @deprecated 1.8 Use ElggPlugin->getManifest()
+ *
+ * @param string $plugin Plugin name.
+ * @return array of values
+ */
+function load_plugin_manifest($plugin) {
+	elgg_deprecated_notice('load_plugin_manifest() is deprecated by ElggPlugin->getManifest()', 1.8);
+
+	$xml_file = elgg_get_plugins_path() . "$plugin/manifest.xml";
+
+	try {
+		$manifest = new ElggPluginManifest($xml_file, $plugin);
+	} catch(Exception $e) {
+		return false;
+	}
+
+	return $manifest->getManifest();
+}
+
+/**
+ * This function checks a plugin manifest 'elgg_version' value against the current install
+ * returning TRUE if the elgg_version is >= the current install's version.
+ *
+ * @deprecated 1.8 Use ElggPlugin->canActivate()
+ *
+ * @param string $manifest_elgg_version_string The build version (eg 2009010201).
+ * @return bool
+ */
+function check_plugin_compatibility($manifest_elgg_version_string) {
+	elgg_deprecated_notice('check_plugin_compatibility() is deprecated by ElggPlugin->canActivate()', 1.8);
+
+	$version = get_version();
+
+	if (strpos($manifest_elgg_version_string, '.') === false) {
+		// Using version
+		$req_version = (int)$manifest_elgg_version_string;
+
+		return ($version >= $req_version);
+	}
+
+	return false;
+}
+
+/**
+ * Shorthand function for finding the plugin settings.
+ *
+ * @deprecated 1.8 Use elgg_get_calling_plugin_entity() or elgg_get_plugin_from_id()
+ *
+ * @param string $plugin_id Optional plugin id, if not specified
+ *                          then it is detected from where you are calling.
+ *
+ * @return mixed
+ */
+function find_plugin_settings($plugin_id = null) {
+	elgg_deprecated_notice('find_plugin_setting() is deprecated by elgg_get_calling_plugin_entity() or elgg_get_plugin_from_id()', 1.8);
+	if ($plugin_id) {
+		return elgg_get_plugin_from_id($plugin_id);
+	} else {
+		return elgg_get_calling_plugin_entity();
+	}
+}
+
+/**
+ * Return an array of installed plugins.
+ *
+ * @deprecated 1.8 use elgg_get_plugins()
+ *
+ * @param string $status any|enabled|disabled
+ * @return array
+ */
+function get_installed_plugins($status = 'all') {
+	global $CONFIG;
+
+	elgg_deprecated_notice('get_installed_plugins() was deprecated by elgg_get_plugins()', 1.8);
+
+	$plugins = elgg_get_plugins($status);
+
+	if (!$plugins) {
+		return array();
+	}
+
+	$installed_plugins = array();
+
+	foreach ($plugins as $plugin) {
+		if (!$plugin->isValid()) {
+			continue;
+		}
+
+		$include = true;
+
+		if ($status == 'enabled' && !$plugin->isActive()) {
+			$include = false;
+		} elseif ($status == 'disabled' && $plugin->isActive()) {
+			$include = true;
+		}
+
+		if ($include) {
+			$installed_plugins[$plugin->getID()] = array(
+				'active' => $plugin->isActive(),
+				'manifest' => $plugin->getManifest()->getManifest()
+			);
+		}
+	}
+
+	return $installed_plugins;
+}
+
+/**
+ * Enable a plugin for a site (default current site)
+ *
+ * Important: You should regenerate simplecache and the viewpath cache after executing this function
+ * otherwise you may experience view display artifacts. Do this with the following code:
+ *
+ * 		elgg_regenerate_simplecache();
+ *		elgg_reset_system_cache();
+ *
+ * @deprecated 1.8 Use ElggPlugin->activate()
+ *
+ * @param string $plugin    The plugin name.
+ * @param int    $site_guid The site id, if not specified then this is detected.
+ *
+ * @return array
+ * @throws InvalidClassException
+ */
+function enable_plugin($plugin, $site_guid = null) {
+	elgg_deprecated_notice('enable_plugin() was deprecated by ElggPlugin->activate()', 1.8);
+
+	$plugin = sanitise_string($plugin);
+
+	$site_guid = (int) $site_guid;
+	if (!$site_guid) {
+		$site = get_config('site');
+		$site_guid = $site->guid;
+	}
+
+	try {
+		$plugin = new ElggPlugin($plugin);
+	} catch(Exception $e) {
+		return false;
+	}
+
+	if (!$plugin->canActivate($site_guid)) {
+		return false;
+	}
+
+	return $plugin->activate($site_guid);
+}
+
+/**
+ * Disable a plugin for a site (default current site)
+ *
+ * Important: You should regenerate simplecache and the viewpath cache after executing this function
+ * otherwise you may experience view display artifacts. Do this with the following code:
+ *
+ * 		elgg_regenerate_simplecache();
+ *		elgg_reset_system_cache();
+ *
+ * @deprecated 1.8 Use ElggPlugin->deactivate()
+ *
+ * @param string $plugin    The plugin name.
+ * @param int    $site_guid The site id, if not specified then this is detected.
+ *
+ * @return bool
+ * @throws InvalidClassException
+ */
+function disable_plugin($plugin, $site_guid = 0) {
+	elgg_deprecated_notice('disable_plugin() was deprecated by ElggPlugin->deactivate()', 1.8);
+
+	$plugin = sanitise_string($plugin);
+
+	$site_guid = (int) $site_guid;
+	if (!$site_guid) {
+		$site = get_config('site');
+		$site_guid = $site->guid;
+	}
+
+	try {
+		$plugin = new ElggPlugin($plugin);
+	} catch(Exception $e) {
+		return false;
+	}
+
+	return $plugin->deactivate($site_guid);
+}
+
+/**
+ * Return whether a plugin is enabled or not.
+ *
+ * @deprecated 1.8 Use elgg_is_active_plugin()
+ *
+ * @param string $plugin    The plugin name.
+ * @param int    $site_guid The site id, if not specified then this is detected.
+ *
+ * @return bool
+ */
+function is_plugin_enabled($plugin, $site_guid = 0) {
+	elgg_deprecated_notice('is_plugin_enabled() was deprecated by elgg_is_active_plugin()', 1.8);
+	return elgg_is_active_plugin($plugin, $site_guid);
+}
+
+/**
+ * Get entities based on their private data.
+ *
+ * @param string  $name           The name of the setting
+ * @param string  $value          The value of the setting
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param string  $order_by       The field to order by; by default, time_created desc
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param int     $offset         The indexing offset, 0 by default
+ * @param boolean $count          Return a count of entities
+ * @param int     $site_guid      The site to get entities for. 0 for current, -1 for any
+ * @param mixed   $container_guid The container(s) GUIDs
+ *
+ * @return array A list of entities.
+ * @deprecated 1.8 Use elgg_get_entities_from_private_settings()
+ */
+function get_entities_from_private_setting($name = "", $value = "", $type = "", $subtype = "",
+$owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0,
+$container_guid = null) {
+	elgg_deprecated_notice('get_entities_from_private_setting() was deprecated by elgg_get_entities_from_private_setting()!', 1.8);
+
+	$options = array();
+
+	$options['private_setting_name'] = $name;
+	$options['private_setting_value'] = $value;
+
+	// set container_guid to owner_guid to emulate old functionality
+	if ($owner_guid != "") {
+		if (is_null($container_guid)) {
+			$container_guid = $owner_guid;
+		}
+	}
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($container_guid) {
+		if (is_array($container_guid)) {
+			$options['container_guids'] = $container_guid;
+		} else {
+			$options['container_guid'] = $container_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_private_settings($options);
+}
+
+/**
+ * Get entities based on their private data by multiple keys.
+ *
+ * @param string $name           The name of the setting
+ * @param mixed  $type           Entity type
+ * @param string $subtype        Entity subtype
+ * @param int    $owner_guid     The GUID of the owning user
+ * @param string $order_by       The field to order by; by default, time_created desc
+ * @param int    $limit          The number of entities to return; 10 by default
+ * @param int    $offset         The indexing offset, 0 by default
+ * @param bool   $count          Count entities
+ * @param int    $site_guid      Site GUID. 0 for current, -1 for any.
+ * @param mixed  $container_guid Container GUID
+ *
+ * @return array A list of entities.
+ * @deprecated 1.8 Use elgg_get_entities_from_private_settings()
+ */
+function get_entities_from_private_setting_multi(array $name, $type = "", $subtype = "",
+$owner_guid = 0, $order_by = "", $limit = 10, $offset = 0, $count = false,
+$site_guid = 0, $container_guid = null) {
+
+	elgg_deprecated_notice('get_entities_from_private_setting_multi() was deprecated by elgg_get_entities_from_private_settings()!', 1.8);
+
+	$options = array();
+
+	$pairs = array();
+	foreach ($name as $setting_name => $setting_value) {
+		$pairs[] = array('name' => $setting_name, 'value' => $setting_value);
+	}
+	$options['private_setting_name_value_pairs'] = $pairs;
+
+	// set container_guid to owner_guid to emulate old functionality
+	if ($owner_guid != "") {
+		if (is_null($container_guid)) {
+			$container_guid = $owner_guid;
+		}
+	}
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	if ($container_guid) {
+		if (is_array($container_guid)) {
+			$options['container_guids'] = $container_guid;
+		} else {
+			$options['container_guid'] = $container_guid;
+		}
+	}
+
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_private_settings($options);
+}
+
+/**
+ * Returns a viewable list of entities by relationship
+ *
+ * @see elgg_view_entity_list
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_relationship()
+ *
+ * @param string $relationship The relationship eg "friends_of"
+ * @param int $relationship_guid The guid of the entity to use query
+ * @param bool $inverse_relationship Reverse the normal function of the query to instead say "give me all entities for whome $relationship_guid is a $relationship of"
+ * @param string $type The type of entity (eg 'object')
+ * @param string $subtype The entity subtype
+ * @param int $owner_guid The owner (default: all)
+ * @param int $limit The number of entities to display on a page
+ * @param true|false $fullview Whether or not to display the full view (default: true)
+ * @param true|false $viewtypetoggle Whether or not to allow gallery view
+ * @param true|false $pagination Whether to display pagination (default: true)
+ * @param bool $order_by SQL order by clause
+ * @return string The viewable list of entities
+ */
+function list_entities_from_relationship($relationship, $relationship_guid,
+$inverse_relationship = false, $type = ELGG_ENTITIES_ANY_VALUE,
+$subtype = ELGG_ENTITIES_ANY_VALUE, $owner_guid = 0, $limit = 10,
+$fullview = true, $listtypetoggle = false, $pagination = true, $order_by = '') {
+
+	elgg_deprecated_notice("list_entities_from_relationship was deprecated by elgg_list_entities_from_relationship()!", 1.8);
+	return elgg_list_entities_from_relationship(array(
+		'relationship' => $relationship,
+		'relationship_guid' => $relationship_guid,
+		'inverse_relationship' => $inverse_relationship,
+		'type' => $type,
+		'subtype' => $subtype,
+		'owner_guid' => $owner_guid,
+		'order_by' => $order_by,
+		'limit' => $limit,
+		'full_view' => $fullview,
+		'list_type_toggle' => $listtypetoggle,
+		'pagination' => $pagination,
+	));
+}
+
+/**
+ * Gets the number of entities by a the number of entities related to them in a particular way.
+ * This is a good way to get out the users with the most friends, or the groups with the
+ * most members.
+ *
+ * @deprecated 1.8 Use elgg_get_entities_from_relationship_count()
+ *
+ * @param string $relationship         The relationship eg "friends_of"
+ * @param bool   $inverse_relationship Inverse relationship owners
+ * @param string $type                 The type of entity (default: all)
+ * @param string $subtype              The entity subtype (default: all)
+ * @param int    $owner_guid           The owner of the entities (default: none)
+ * @param int    $limit                Limit
+ * @param int    $offset               Offset
+ * @param bool   $count                Return a count instead of entities
+ * @param int    $site_guid            Site GUID
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ */
+function get_entities_by_relationship_count($relationship, $inverse_relationship = true, $type = "",
+$subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+	elgg_deprecated_notice('get_entities_by_relationship_count() is deprecated by elgg_get_entities_from_relationship_count()', 1.8);
+
+	$options = array();
+
+	$options['relationship'] = $relationship;
+
+	// this used to default to true, which is wrong.
+	// flip it for the new function
+	$options['inverse_relationship'] = !$inverse_relationship;
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	$options['limit'] = $limit;
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_relationship_count($options);
+}
+
+/**
+ * Displays a human-readable list of entities
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_relationship_count()
+ *
+ * @param string $relationship         The relationship eg "friends_of"
+ * @param bool   $inverse_relationship Inverse relationship owners
+ * @param string $type                 The type of entity (eg 'object')
+ * @param string $subtype              The entity subtype
+ * @param int    $owner_guid           The owner (default: all)
+ * @param int    $limit                The number of entities to display on a page
+ * @param bool   $fullview             Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle       Whether or not to allow gallery view
+ * @param bool   $pagination           Whether to display pagination (default: true)
+ *
+ * @return string The viewable list of entities
+ */
+function list_entities_by_relationship_count($relationship, $inverse_relationship = true,
+$type = "", $subtype = "", $owner_guid = 0, $limit = 10, $fullview = true,
+$listtypetoggle = false, $pagination = true) {
+
+	elgg_deprecated_notice('list_entities_by_relationship_count() was deprecated by elgg_list_entities_from_relationship_count()', 1.8);
+
+	$options = array();
+
+	$options['relationship'] = $relationship;
+
+	// this used to default to true, which is wrong.
+	// flip it for the new function
+	$options['inverse_relationship'] = !$inverse_relationship;
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	$options['limit'] = $limit;
+
+	$options['full_view'] = $fullview;
+
+	return elgg_list_entities_from_relationship_count($options);
+}
+
+/**
+ * Gets the number of entities by a the number of entities related to
+ * them in a particular way also constrained by metadata.
+ *
+ * @deprecated 1.8 Use elgg_get_entities_from_relationship()
+ *
+ * @param string $relationship         The relationship eg "friends_of"
+ * @param int    $relationship_guid    The guid of the entity to use query
+ * @param bool   $inverse_relationship Inverse relationship owner
+ * @param String $meta_name            The metadata name
+ * @param String $meta_value           The metadata value
+ * @param string $type                 The type of entity (default: all)
+ * @param string $subtype              The entity subtype (default: all)
+ * @param int    $owner_guid           The owner of the entities (default: none)
+ * @param int    $limit                Limit
+ * @param int    $offset               Offset
+ * @param bool   $count                Return a count instead of entities
+ * @param int    $site_guid            Site GUID
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ */
+function get_entities_from_relationships_and_meta($relationship, $relationship_guid,
+$inverse_relationship = false, $meta_name = "", $meta_value = "", $type = "",
+$subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+
+	elgg_deprecated_notice('get_entities_from_relationship_and_meta() was deprecated by elgg_get_entities_from_relationship()!', 1.7);
+
+	$options = array();
+
+	$options['relationship'] = $relationship;
+	$options['relationship_guid'] = $relationship_guid;
+	$options['inverse_relationship'] = $inverse_relationship;
+
+	if ($meta_value) {
+		$options['values'] = $meta_value;
+	}
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($type) {
+		$options['types'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtypes'] = $subtype;
+	}
+
+	if ($owner_guid) {
+		$options['owner_guid'] = $owner_guid;
+	}
+
+	if ($limit) {
+		$options['limit'] = $limit;
+	}
+
+	if ($offset) {
+		$options['offset'] = $offset;
+	}
+
+	if ($order_by) {
+		$options['order_by'];
+	}
+
+	if ($site_guid) {
+		$options['site_guid'];
+	}
+
+	if ($count) {
+		$options['count'] = $count;
+	}
+
+	return elgg_get_entities_from_relationship($options);
+}
+
+
+/**
+ * Retrieves items from the river. All parameters are optional.
+ *
+ * @param int|array $subject_guid         Acting entity to restrict to. Default: all
+ * @param int|array $object_guid          Entity being acted on to restrict to. Default: all
+ * @param string    $subject_relationship If set to a relationship type, this will use
+ * 	                                      $subject_guid as the starting point and set the
+ *                                        subjects to be all users this
+ *                                        entity has this relationship with (eg 'friend').
+ *                                        Default: blank
+ * @param string    $type                 The type of entity to restrict to. Default: all
+ * @param string    $subtype              The subtype of entity to restrict to. Default: all
+ * @param string    $action_type          The type of river action to restrict to. Default: all
+ * @param int       $limit                The number of items to retrieve. Default: 20
+ * @param int       $offset               The page offset. Default: 0
+ * @param int       $posted_min           The minimum time period to look at. Default: none
+ * @param int       $posted_max           The maximum time period to look at. Default: none
+ *
+ * @return array|false Depending on success
+ * @deprecated 1.8 Use elgg_get_river()
+ */
+function get_river_items($subject_guid = 0, $object_guid = 0, $subject_relationship = '',
+$type = '',	$subtype = '', $action_type = '', $limit = 20, $offset = 0, $posted_min = 0,
+$posted_max = 0) {
+	elgg_deprecated_notice("get_river_items deprecated by elgg_get_river", 1.8);
+
+	$options = array();
+
+	if ($subject_guid) {
+		$options['subject_guid'] = $subject_guid;
+	}
+
+	if ($object_guid) {
+		$options['object_guid'] = $object_guid;
+	}
+
+	if ($subject_relationship) {
+		$options['relationship'] = $subject_relationship;
+		unset($options['subject_guid']);
+		$options['relationship_guid'] = $subject_guid;
+	}
+
+	if ($type) {
+		$options['type'] = $type;
+	}
+
+	if ($subtype) {
+		$options['subtype'] = $subtype;
+	}
+
+	if ($action_type) {
+		$options['action_type'] = $action_type;
+	}
+
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+
+	if ($posted_min) {
+		$options['posted_time_lower'] = $posted_min;
+	}
+
+	if ($posted_max) {
+		$options['posted_time_upper'] = $posted_max;
+	}
+
+	return elgg_get_river($options);
+}
+
+/**
+ * Returns a human-readable version of the river.
+ *
+ * @param int|array $subject_guid         Acting entity to restrict to. Default: all
+ * @param int|array $object_guid          Entity being acted on to restrict to. Default: all
+ * @param string    $subject_relationship If set to a relationship type, this will use
+ * 	                                      $subject_guid as the starting point and set
+ *                                        the subjects to be all users this entity has this
+ *                                        relationship with (eg 'friend'). Default: blank
+ * @param string    $type                 The type of entity to restrict to. Default: all
+ * @param string    $subtype              The subtype of entity to restrict to. Default: all
+ * @param string    $action_type          The type of river action to restrict to. Default: all
+ * @param int       $limit                The number of items to retrieve. Default: 20
+ * @param int       $posted_min           The minimum time period to look at. Default: none
+ * @param int       $posted_max           The maximum time period to look at. Default: none
+ * @param bool      $pagination           Show pagination?
+ *
+ * @return string Human-readable river.
+ * @deprecated 1.8 Use elgg_list_river()
+ */
+function elgg_view_river_items($subject_guid = 0, $object_guid = 0, $subject_relationship = '',
+$type = '', $subtype = '', $action_type = '', $limit = 20, $posted_min = 0,
+$posted_max = 0, $pagination = true) {
+	elgg_deprecated_notice("elgg_view_river_items deprecated for elgg_list_river", 1.8);
+
+	$river_items = get_river_items($subject_guid, $object_guid, $subject_relationship,
+			$type, $subtype, $action_type, $limit + 1, $posted_min, $posted_max);
+
+	// Get input from outside world and sanitise it
+	$offset = (int) get_input('offset', 0);
+
+	// view them
+	$params = array(
+		'items' => $river_items,
+		'count' => count($river_items),
+		'offset' => $offset,
+		'limit' => $limit,
+		'pagination' => $pagination,
+		'list-class' => 'elgg-list-river',
+	);
+
+	return elgg_view('page/components/list', $params);
+}
+
+/**
+ * Construct and execute the query required for the activity stream.
+ *
+ * @deprecated 1.8 This is outdated and uses the systemlog table instead of the river table.
+ *                 Don't use it.
+ */
+function get_activity_stream_data($limit = 10, $offset = 0, $type = "", $subtype = "",
+$owner_guid = "", $owner_relationship = "") {
+	elgg_deprecated_notice("get_activity_stream_data was deprecated", 1.8);
+
+	global $CONFIG;
+
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	if ($type) {
+		if (!is_array($type)) {
+			$type = array(sanitise_string($type));
+		} else {
+			foreach ($type as $k => $v) {
+				$type[$k] = sanitise_string($v);
+			}
+		}
+	}
+
+	if ($subtype) {
+		if (!is_array($subtype)) {
+			$subtype = array(sanitise_string($subtype));
+		} else {
+			foreach ($subtype as $k => $v) {
+				$subtype[$k] = sanitise_string($v);
+			}
+		}
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			foreach ($owner_guid as $k => $v) {
+				$owner_guid[$k] = (int)$v;
+			}
+		} else {
+			$owner_guid = array((int)$owner_guid);
+		}
+	}
+
+	$owner_relationship = sanitise_string($owner_relationship);
+
+	// Get a list of possible views
+	$activity_events = array();
+	$activity_views = array_merge(elgg_view_tree('activity', 'default'),
+		elgg_view_tree('river', 'default'));
+
+	$done = array();
+
+	foreach ($activity_views as $view) {
+		$fragments = explode('/', $view);
+		$tmp = explode('/', $view, 2);
+		$tmp = $tmp[1];
+
+		if ((isset($fragments[0])) && (($fragments[0] == 'river') || ($fragments[0] == 'activity'))
+			&& (!in_array($tmp, $done))) {
+
+			if (isset($fragments[1])) {
+				$f = array();
+				for ($n = 1; $n < count($fragments); $n++) {
+					$val = sanitise_string($fragments[$n]);
+					switch($n) {
+						case 1: $key = 'type'; break;
+						case 2: $key = 'subtype'; break;
+						case 3: $key = 'event'; break;
+					}
+					$f[$key] = $val;
+				}
+
+				// Filter result based on parameters
+				$add = true;
+				if ($type) {
+					if (!in_array($f['type'], $type)) {
+						$add = false;
+					}
+				}
+				if (($add) && ($subtype)) {
+					if (!in_array($f['subtype'], $subtype)) {
+						$add = false;
+					}
+				}
+				if (($add) && ($event)) {
+					if (!in_array($f['event'], $event)) {
+						$add = false;
+					}
+				}
+
+				if ($add) {
+					$activity_events[] = $f;
+				}
+			}
+
+			$done[] = $tmp;
+		}
+	}
+
+	$n = 0;
+	foreach ($activity_events as $details) {
+		// Get what we're talking about
+		if ($details['subtype'] == 'default') {
+			$details['subtype'] = '';
+		}
+
+		if (($details['type']) && ($details['event'])) {
+			if ($n > 0) {
+				$obj_query .= " or ";
+			}
+
+			$access = "";
+			if ($details['type'] != 'relationship') {
+				$access = " and " . get_access_sql_suffix('sl');
+			}
+
+			$obj_query .= "( sl.object_type='{$details['type']}'
+				AND sl.object_subtype='{$details['subtype']}'
+				AND sl.event='{$details['event']}' $access )";
+
+			$n++;
+		}
+	}
+
+	// User
+	if ((count($owner_guid)) &&  ($owner_guid[0] != 0)) {
+		$user = " and sl.performed_by_guid in (" . implode(',', $owner_guid) . ")";
+
+		if ($owner_relationship) {
+			$friendsarray = "";
+			if ($friends = elgg_get_entities_from_relationship(array(
+				'relationship' => $owner_relationship,
+				'relationship_guid' => $owner_guid[0],
+				'inverse_relationship' => FALSE,
+				'type' => 'user',
+				'subtype' => $subtype,
+				'limit' => false))
+			) {
+
+				$friendsarray = array();
+				foreach ($friends as $friend) {
+					$friendsarray[] = $friend->getGUID();
+				}
+
+				$user = " and sl.performed_by_guid in (" . implode(',', $friendsarray) . ")";
+			}
+		}
+	}
+
+	$query = "SELECT sl.* FROM {$CONFIG->dbprefix}system_log sl
+		WHERE 1 $user AND ($obj_query)
+		ORDER BY sl.time_created desc limit $offset, $limit";
+	return get_data($query);
+}
+
+/**
+ * Perform standard authentication with a given username and password.
+ * Returns an ElggUser object for use with login.
+ *
+ * @see login
+ *
+ * @param string $username The username, optionally (for standard logins)
+ * @param string $password The password, optionally (for standard logins)
+ *
+ * @return ElggUser|false The authenticated user object, or false on failure.
+ *
+ * @deprecated 1.8 Use elgg_authenticate
+ */
+function authenticate($username, $password) {
+	elgg_deprecated_notice('authenticate() has been deprecated for elgg_authenticate()', 1.8);
+	$pam = new ElggPAM('user');
+	$credentials = array('username' => $username, 'password' => $password);
+	$result = $pam->authenticate($credentials);
+	if ($result) {
+		return get_user_by_username($username);
+	}
+	return false;
+}
+
+
+/**
+ * Get the members of a site.
+ *
+ * @param int $site_guid Site GUID
+ * @param int $limit     User GUID
+ * @param int $offset    Offset
+ *
+ * @return mixed
+ * @deprecated 1.8 Use ElggSite::getMembers()
+ */
+function get_site_members($site_guid, $limit = 10, $offset = 0) {
+	elgg_deprecated_notice("get_site_members() deprecated.
+		Use ElggSite::getMembers()", 1.8);
+
+	$site = get_entity($site_guid);
+	if ($site) {
+		return $site->getMembers($limit, $offset);
+	}
+
+	return false;
+}
+
+/**
+ * Display a list of site members
+ *
+ * @param int  $site_guid The GUID of the site
+ * @param int  $limit     The number of members to display on a page
+ * @param bool $fullview  Whether or not to display the full view (default: true)
+ *
+ * @return string A displayable list of members
+ * @deprecated 1.8 Use ElggSite::listMembers()
+ */
+function list_site_members($site_guid, $limit = 10, $fullview = true) {
+	elgg_deprecated_notice("list_site_members() deprecated.
+		Use ElggSite::listMembers()", 1.8);
+
+	$options = array(
+		'limit' => $limit,
+		'full_view' => $full_view,
+	);
+
+	$site = get_entity($site_guid);
+	if ($site) {
+		return $site->listMembers($options);
+	}
+
+	return '';
+}
+
+
+/**
+ * Add a collection to a site.
+ *
+ * @param int $site_guid       Site GUID
+ * @param int $collection_guid Collection GUID
+ *
+ * @return mixed
+ * @deprecated 1.8 Don't use this.
+ */
+function add_site_collection($site_guid, $collection_guid) {
+	elgg_deprecated_notice("add_site_collection has been deprecated", 1.8);
+	global $CONFIG;
+
+	$site_guid = (int)$site_guid;
+	$collection_guid = (int)$collection_guid;
+
+	return add_entity_relationship($collection_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Remove a collection from a site.
+ *
+ * @param int $site_guid       Site GUID
+ * @param int $collection_guid Collection GUID
+ *
+ * @return mixed
+ * @deprecated 1.8 Don't use this.
+ */
+function remove_site_collection($site_guid, $collection_guid) {
+	elgg_deprecated_notice("remove_site_collection has been deprecated", 1.8);
+	$site_guid = (int)$site_guid;
+	$collection_guid = (int)$collection_guid;
+
+	return remove_entity_relationship($collection_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Get the collections belonging to a site.
+ *
+ * @param int    $site_guid Site GUID
+ * @param string $subtype   Subtype
+ * @param int    $limit     Limit
+ * @param int    $offset    Offset
+ *
+ * @return mixed
+ * @deprecated 1.8 Don't use this.
+ */
+function get_site_collections($site_guid, $subtype = "", $limit = 10, $offset = 0) {
+	elgg_deprecated_notice("get_site_collections has been deprecated", 1.8);
+	$site_guid = (int)$site_guid;
+	$subtype = sanitise_string($subtype);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	// collection isn't a valid type.  This won't work.
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'member_of_site',
+		'relationship_guid' => $site_guid,
+		'inverse_relationship' => TRUE,
+		'type' => 'collection',
+		'subtype' => $subtype,
+		'limit' => $limit,
+		'offset' => $offset
+	));
+}
+
+/**
+ * Get an array of tags with weights for use with the output/tagcloud view.
+ *
+ * @deprecated 1.8  Use elgg_get_tags().
+ *
+ * @param int    $threshold      Get the threshold of minimum number of each tags to
+ *                               bother with (ie only show tags where there are more
+ *                               than $threshold occurances)
+ * @param int    $limit          Number of tags to return
+ * @param string $metadata_name  Optionally, the name of the field you want to grab for
+ * @param string $entity_type    Optionally, the entity type ('object' etc)
+ * @param string $entity_subtype The entity subtype, optionally
+ * @param int    $owner_guid     The GUID of the tags owner, optionally
+ * @param int    $site_guid      Optionally, the site to restrict to (default is the current site)
+ * @param int    $start_ts       Optionally specify a start timestamp for tags used to
+ *                               generate cloud.
+ * @param int    $end_ts         Optionally specify an end timestamp for tags used to generate cloud
+ *
+ * @return array|false Array of objects with ->tag and ->total values, or false on failure
+ */
+function get_tags($threshold = 1, $limit = 10, $metadata_name = "", $entity_type = "object",
+$entity_subtype = "", $owner_guid = "", $site_guid = -1, $start_ts = "", $end_ts = "") {
+
+	elgg_deprecated_notice('get_tags() has been replaced by elgg_get_tags()', 1.8);
+
+	if (is_array($metadata_name)) {
+		return false;
+	}
+
+	$options = array();
+	if ($metadata_name === '') {
+		$options['tag_names'] = array();
+	} else {
+		$options['tag_names'] = array($metadata_name);
+	}
+
+	$options['threshold'] = $threshold;
+	$options['limit'] = $limit;
+
+	// rewrite owner_guid to container_guid to emulate old functionality
+	$container_guid = $owner_guid;
+	if ($container_guid) {
+		$options['container_guids'] = $container_guid;
+	}
+
+	if ($entity_type) {
+		$options['type'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtype'] = $entity_subtype;
+	}
+
+	if ($site_guid != -1) {
+		$options['site_guids'] = $site_guid;
+	}
+
+	if ($end_ts) {
+		$options['created_time_upper'] = $end_ts;
+	}
+
+	if ($start_ts) {
+		$options['created_time_lower'] = $start_ts;
+	}
+
+	$r = elgg_get_tags($options);
+	return $r;
+}
+
+/**
+ * Loads and displays a tagcloud given particular criteria.
+ *
+ * @deprecated 1.8 use elgg_view_tagcloud()
+ *
+ * @param int    $threshold      Get the threshold of minimum number of each tags
+ *                               to bother with (ie only show tags where there are
+ *                               more than $threshold occurances)
+ * @param int    $limit          Number of tags to return
+ * @param string $metadata_name  Optionally, the name of the field you want to grab for
+ * @param string $entity_type    Optionally, the entity type ('object' etc)
+ * @param string $entity_subtype The entity subtype, optionally
+ * @param int    $owner_guid     The GUID of the tags owner, optionally
+ * @param int    $site_guid      Optionally, the site to restrict to (default is the current site)
+ * @param int    $start_ts       Optionally specify a start timestamp for tags used to
+ *                               generate cloud.
+ * @param int    $end_ts         Optionally specify an end timestamp for tags used to generate
+ *                               cloud.
+ *
+ * @return string The HTML (or other, depending on view type) of the tagcloud.
+ */
+function display_tagcloud($threshold = 1, $limit = 10, $metadata_name = "", $entity_type = "object",
+$entity_subtype = "", $owner_guid = "", $site_guid = -1, $start_ts = "", $end_ts = "") {
+
+	elgg_deprecated_notice('display_tagcloud() was deprecated by elgg_view_tagcloud()!', 1.8);
+
+	$tags = get_tags($threshold, $limit, $metadata_name, $entity_type,
+		$entity_subtype, $owner_guid, $site_guid, $start_ts, $end_ts);
+
+	return elgg_view('output/tagcloud', array(
+		'value' => $tags,
+		'type' => $entity_type,
+		'subtype' => $entity_subtype,
+	));
+}
+
+
+/**
+ * Obtains a list of objects owned by a user
+ *
+ * @param int    $user_guid The GUID of the owning user
+ * @param string $subtype   Optionally, the subtype of objects
+ * @param int    $limit     The number of results to return (default 10)
+ * @param int    $offset    Indexing offset, if any
+ * @param int    $timelower The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper The latest time the entity can have been created. Default: all
+ *
+ * @return false|array An array of ElggObjects or false, depending on success
+ * @deprecated 1.8 Use elgg_get_entities() instead
+ */
+function get_user_objects($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $limit = 10,
+$offset = 0, $timelower = 0, $timeupper = 0) {
+	elgg_deprecated_notice("get_user_objects() was deprecated in favor of elgg_get_entities()", 1.8);
+	$ntt = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => $subtype,
+		'owner_guid' => $user_guid,
+		'limit' => $limit,
+		'offset' => $offset,
+		'container_guid' => $user_guid,
+		'created_time_lower' => $timelower,
+		'created_time_upper' => $timeupper
+	));
+	return $ntt;
+}
+
+/**
+ * Counts the objects (optionally of a particular subtype) owned by a user
+ *
+ * @param int    $user_guid The GUID of the owning user
+ * @param string $subtype   Optionally, the subtype of objects
+ * @param int    $timelower The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper The latest time the entity can have been created. Default: all
+ *
+ * @return int The number of objects the user owns (of this subtype)
+ * @deprecated 1.8 Use elgg_get_entities() instead
+ */
+function count_user_objects($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $timelower = 0,
+$timeupper = 0) {
+	elgg_deprecated_notice("count_user_objects() was deprecated in favor of elgg_get_entities()", 1.8);
+	$total = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => $subtype,
+		'owner_guid' => $user_guid,
+		'count' => TRUE,
+		'container_guid' => $user_guid,
+		'created_time_lower' => $timelower,
+		'created_time_upper' => $timeupper
+	));
+	return $total;
+}
+
+/**
+ * Displays a list of user objects of a particular subtype, with navigation.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param int    $user_guid      The GUID of the user
+ * @param string $subtype        The object subtype
+ * @param int    $limit          The number of entities to display on a page
+ * @param bool   $fullview       Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle Whether or not to allow gallery view (default: true)
+ * @param bool   $pagination     Whether to display pagination (default: true)
+ * @param int    $timelower      The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper      The latest time the entity can have been created. Default: all
+ *
+ * @return string The list in a form suitable to display
+ * @deprecated 1.8 Use elgg_list_entities() instead
+ */
+function list_user_objects($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $limit = 10,
+$fullview = true, $listtypetoggle = true, $pagination = true, $timelower = 0, $timeupper = 0) {
+	elgg_deprecated_notice("list_user_objects() was deprecated in favor of elgg_list_entities()", 1.8);
+
+	$offset = (int) get_input('offset');
+	$limit = (int) $limit;
+	$count = (int) count_user_objects($user_guid, $subtype, $timelower, $timeupper);
+	$entities = get_user_objects($user_guid, $subtype, $limit, $offset, $timelower, $timeupper);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit, $fullview, $listtypetoggle,
+		$pagination);
+}
+
+
+/**
+ * Get user objects by an array of metadata
+ *
+ * @param int    $user_guid The GUID of the owning user
+ * @param string $subtype   Optionally, the subtype of objects
+ * @param array  $metadata  An array of metadata
+ * @param int    $limit     The number of results to return (default 10)
+ * @param int    $offset    Indexing offset, if any
+ *
+ * @return false|array An array of ElggObjects or false, depending on success
+ * @deprecated 1.8 Use elgg_get_entities_from_metadata() instead
+ */
+function get_user_objects_by_metadata($user_guid, $subtype = "", $metadata = array(),
+$limit = 0, $offset = 0) {
+	elgg_deprecated_notice("get_user_objects_by_metadata() was deprecated in favor of elgg_get_entities_from_metadata()", 1.8);
+	return get_entities_from_metadata_multi($metadata, "object", $subtype, $user_guid,
+		$limit, $offset);
+}
+
+/**
+ * Set the validation status for a user.
+ *
+ * @param bool   $status Validated (true) or false
+ * @param string $method Optional method to say how a user was validated
+ * @return bool
+ * @deprecated 1.8 Use elgg_set_user_validation_status()
+ */
+function set_user_validation_status($user_guid, $status, $method = '') {
+	elgg_deprecated_notice("set_user_validation_status() is deprecated", 1.8);
+	return elgg_set_user_validation_status($user_guid, $status, $method);
+}
+
+/**
+ * Trigger an event requesting that a user guid be validated somehow - either by email address or some other way.
+ *
+ * This function invalidates any existing validation value.
+ *
+ * @param int $user_guid User's GUID
+ * @deprecated 1.8 Hook into the register, user plugin hook and request validation.
+ */
+function request_user_validation($user_guid) {
+	elgg_deprecated_notice("request_user_validation() is deprecated.
+		Plugins should register for the 'register, user' plugin hook", 1.8);
+	$user = get_entity($user_guid);
+
+	if (($user) && ($user instanceof ElggUser)) {
+		// invalidate any existing validations
+		set_user_validation_status($user_guid, false);
+
+		// request validation
+		trigger_elgg_event('validate', 'user', $user);
+	}
+}
+
+/**
+ * Register a user settings page with the admin panel.
+ * This function extends the view "usersettings/main" with the provided view.
+ * This view should provide a description and either a control or a link to.
+ *
+ * Usage:
+ * 	- To add a control to the main admin panel then extend usersettings/main
+ *  - To add a control to a new page create a page which renders a view
+ *    usersettings/subpage (where subpage is your new page -
+ *    nb. some pages already exist that you can extend), extend the main view
+ *    to point to it, and add controls to your new view.
+ *
+ * At the moment this is essentially a wrapper around elgg_extend_view().
+ *
+ * @param string $new_settings_view The view associated with the control you're adding
+ * @param string $view              The view to extend, by default this is 'usersettings/main'.
+ * @param int    $priority          Optional priority to govern the appearance in the list.
+ *
+ * @return bool
+ * @deprecated 1.8 Extend one of the views in core/settings
+ */
+function extend_elgg_settings_page($new_settings_view, $view = 'usersettings/main',
+$priority = 500) {
+	// see views: /core/settings
+	elgg_deprecated_notice("extend_elgg_settings_page has been deprecated. Extend one of the settings views instead", 1.8);
+
+	return elgg_extend_view($view, $new_settings_view, $priority);
+}
+
+/**
+ * Returns a representation of a full 'page' (which might be an HTML page,
+ * RSS file, etc, depending on the current viewtype)
+ *
+ * @param string $title
+ * @param string $body
+ * @return string
+ *
+ * @deprecated 1.8 Use elgg_view_page()
+ */
+function page_draw($title, $body, $sidebar = "") {
+	elgg_deprecated_notice("page_draw() was deprecated in favor of elgg_view_page() in 1.8.", 1.8);
+
+	$vars = array(
+		'sidebar' => $sidebar
+	);
+	echo elgg_view_page($title, $body, 'default', $vars);
+}
+
+/**
+ * Wrapper function to display search listings.
+ *
+ * @param string $icon The icon for the listing
+ * @param string $info Any information that needs to be displayed.
+ *
+ * @return string The HTML (etc) representing the listing
+ * @deprecated 1.8 use elgg_view_image_block()
+ */
+function elgg_view_listing($icon, $info) {
+	elgg_deprecated_notice('elgg_view_listing deprecated by elgg_view_image_block', 1.8);
+	return elgg_view('page/components/image_block', array('image' => $icon, 'body' => $info));
+}
+
+/**
+ * Return the icon URL for an entity.
+ *
+ * @tip Can be overridden by registering a plugin hook for entity:icon:url, $entity_type.
+ *
+ * @internal This is passed an entity rather than a guid to handle non-created entities.
+ *
+ * @param ElggEntity $entity The entity
+ * @param string     $size   Icon size
+ *
+ * @return string URL to the entity icon.
+ * @deprecated 1.8 Use $entity->getIconURL()
+ */
+function get_entity_icon_url(ElggEntity $entity, $size = 'medium') {
+	elgg_deprecated_notice("get_entity_icon_url() deprecated for getIconURL()", 1.8);
+	global $CONFIG;
+
+	$size = sanitise_string($size);
+	switch (strtolower($size)) {
+		case 'master':
+			$size = 'master';
+			break;
+
+		case 'large' :
+			$size = 'large';
+			break;
+
+		case 'topbar' :
+			$size = 'topbar';
+			break;
+
+		case 'tiny' :
+			$size = 'tiny';
+			break;
+
+		case 'small' :
+			$size = 'small';
+			break;
+
+		case 'medium' :
+		default:
+			$size = 'medium';
+	}
+
+	$url = false;
+
+	$viewtype = elgg_get_viewtype();
+
+	// Step one, see if anyone knows how to render this in the current view
+	$params = array('entity' => $entity, 'viewtype' => $viewtype, 'size' => $size);
+	$url = elgg_trigger_plugin_hook('entity:icon:url', $entity->getType(), $params, $url);
+
+	// Fail, so use default
+	if (!$url) {
+		$type = $entity->getType();
+		$subtype = $entity->getSubtype();
+
+		if (!empty($subtype)) {
+			$overrideurl = elgg_view("icon/{$type}/{$subtype}/{$size}", array('entity' => $entity));
+			if (!empty($overrideurl)) {
+				return $overrideurl;
+			}
+		}
+
+		$overrideurl = elgg_view("icon/{$type}/default/{$size}", array('entity' => $entity));
+		if (!empty($overrideurl)) {
+			return $overrideurl;
+		}
+
+		$url = "_graphics/icons/default/$size.png";
+	}
+
+	return elgg_normalize_url($url);
+}
+
+/**
+ * Return the current logged in user, or NULL if no user is logged in.
+ *
+ * If no user can be found in the current session, a plugin
+ * hook - 'session:get' 'user' to give plugin authors another
+ * way to provide user details to the ACL system without touching the session.
+ *
+ * @deprecated 1.8 Use elgg_get_logged_in_user_entity()
+ * @return ElggUser|NULL
+ */
+function get_loggedin_user() {
+	elgg_deprecated_notice('get_loggedin_user() is deprecated by elgg_get_logged_in_user_entity()', 1.8);
+	return elgg_get_logged_in_user_entity();
+}
+
+/**
+ * Return the current logged in user by id.
+ *
+ * @deprecated 1.8 Use elgg_get_logged_in_user_guid()
+ * @see elgg_get_logged_in_user_entity()
+ * @return int
+ */
+function get_loggedin_userid() {
+	elgg_deprecated_notice('get_loggedin_userid() is deprecated by elgg_get_logged_in_user_guid()', 1.8);
+	return elgg_get_logged_in_user_guid();
+}
+
+
+/**
+ * Returns whether or not the user is currently logged in
+ *
+ * @deprecated 1.8 Use elgg_is_logged_in();
+ * @return bool
+ */
+function isloggedin() {
+	elgg_deprecated_notice('isloggedin() is deprecated by elgg_is_logged_in()', 1.8);
+	return elgg_is_logged_in();
+}
+
+/**
+ * Returns whether or not the user is currently logged in and that they are an admin user.
+ *
+ * @deprecated 1.8 Use elgg_is_admin_logged_in()
+ * @return bool
+ */
+function isadminloggedin() {
+	elgg_deprecated_notice('isadminloggedin() is deprecated by elgg_is_admin_logged_in()', 1.8);
+	return elgg_is_admin_logged_in();
+}
+
+
+/**
+ * Loads plugins
+ *
+ * @deprecated 1.8 Use elgg_load_plugins()
+ *
+ * @return bool
+ */
+function load_plugins() {
+	elgg_deprecated_notice('load_plugins() is deprecated by elgg_load_plugins()', 1.8);
+	return elgg_load_plugins();
+}
+
+/**
+ * Find the plugin settings for a user.
+ *
+ * @param string $plugin_id Plugin name.
+ * @param int    $user_guid The guid who's settings to retrieve.
+ *
+ * @deprecated 1.8 Use elgg_get_all_plugin_user_settings() or ElggPlugin->getAllUserSettings()
+ * @return StdClass Object with all user settings.
+ */
+function find_plugin_usersettings($plugin_id = null, $user_guid = 0) {
+	elgg_deprecated_notice('find_plugin_usersettings() is deprecated by elgg_get_all_plugin_user_settings()', 1.8);
+	return elgg_get_all_plugin_user_settings($user_guid, $plugin_id, true);
+}
+
+/**
+ * Set a user specific setting for a plugin.
+ *
+ * @param string $name      The name - note, can't be "title".
+ * @param mixed  $value     The value.
+ * @param int    $user_guid Optional user.
+ * @param string $plugin_id Optional plugin name, if not specified then it
+ *                          is detected from where you are calling from.
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_set_plugin_user_setting() or ElggPlugin->setUserSetting()
+ */
+function set_plugin_usersetting($name, $value, $user_guid = 0, $plugin_id = "") {
+	elgg_deprecated_notice('find_plugin_usersettings() is deprecated by elgg_get_all_plugin_user_settings()', 1.8);
+	return elgg_set_plugin_user_setting($name, $value, $user_guid, $plugin_id);
+}
+
+/**
+ * Clears a user-specific plugin setting
+ *
+ * @param str $name      Name of the plugin setting
+ * @param int $user_guid Defaults to logged in user
+ * @param str $plugin_id Defaults to contextual plugin name
+ *
+ * @deprecated 1.8 Use elgg_unset_plugin_user_setting or ElggPlugin->unsetUserSetting().
+ * @return bool Success
+ */
+function clear_plugin_usersetting($name, $user_guid = 0, $plugin_id = '') {
+	elgg_deprecated_notice('clear_plugin_usersetting() is deprecated by elgg_unset_plugin_usersetting()', 1.8);
+	return elgg_unset_plugin_user_setting($name, $user_guid, $plugin_id);
+}
+
+/**
+ * Get a user specific setting for a plugin.
+ *
+ * @param string $name      The name.
+ * @param int    $user_guid Guid of owning user
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          it is detected from where you are calling.
+ *
+ * @deprecated 1.8 Use elgg_get_plugin_user_setting() or ElggPlugin->getUserSetting()
+ * @return mixed
+ */
+function get_plugin_usersetting($name, $user_guid = 0, $plugin_id = "") {
+	elgg_deprecated_notice('get_plugin_usersetting() is deprecated by elgg_get_plugin_user_setting()', 1.8);
+	return elgg_get_plugin_user_setting($name, $user_guid, $plugin_id);
+}
+
+/**
+ * Set a setting for a plugin.
+ *
+ * @param string $name      The name - note, can't be "title".
+ * @param mixed  $value     The value.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @deprecated 1.8 Use elgg_set_plugin_setting() or ElggPlugin->setSetting()
+ * @return int|false
+ */
+function set_plugin_setting($name, $value, $plugin_id = null) {
+	elgg_deprecated_notice('set_plugin_setting() is deprecated by elgg_set_plugin_setting()', 1.8);
+	return elgg_set_plugin_setting($name, $value, $plugin_id);
+}
+
+/**
+ * Get setting for a plugin.
+ *
+ * @param string $name      The name.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @deprecated 1.8 Use elgg_get_plugin_setting() or ElggPlugin->getSetting()
+ * @return mixed
+ */
+function get_plugin_setting($name, $plugin_id = "") {
+	elgg_deprecated_notice('get_plugin_setting() is deprecated by elgg_get_plugin_setting()', 1.8);
+	return elgg_get_plugin_setting($name, $plugin_id);
+}
+
+/**
+ * Clear a plugin setting.
+ *
+ * @param string $name      The name.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @deprecated 1.8 Use elgg_unset_plugin_setting() or ElggPlugin->unsetSetting()
+ * @return bool
+ */
+function clear_plugin_setting($name, $plugin_id = "") {
+	elgg_deprecated_notice('clear_plugin_setting() is deprecated by elgg_unset_plugin_setting()', 1.8);
+	return elgg_unset_plugin_setting($name, $plugin_id);
+}
+
+/**
+ * Unsets all plugin settings for a plugin.
+ *
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_unset_all_plugin_settings() or ElggPlugin->unsetAllSettings()
+ * @since 1.7.0
+ */
+function clear_all_plugin_settings($plugin_id = "") {
+	elgg_deprecated_notice('clear_all_plugin_settings() is deprecated by elgg_unset_all_plugin_setting()', 1.8);
+	return elgg_unset_all_plugin_settings($plugin_id);
+}
+
+
+/**
+ * Get a list of annotations for a given object/user/annotation type.
+ *
+ * @param int|array $entity_guid       GUID to return annotations of (falsey for any)
+ * @param string    $entity_type       Type of entity
+ * @param string    $entity_subtype    Subtype of entity
+ * @param string    $name              Name of annotation
+ * @param mixed     $value             Value of annotation
+ * @param int|array $owner_guid        Owner(s) of annotation
+ * @param int       $limit             Limit
+ * @param int       $offset            Offset
+ * @param string    $order_by          Order annotations by SQL
+ * @param int       $timelower         Lower time limit
+ * @param int       $timeupper         Upper time limit
+ * @param int       $entity_owner_guid Owner guid for the entity
+ *
+ * @return array
+ * @deprecated 1.8 Use elgg_get_annotations()
+ */
+function get_annotations($entity_guid = 0, $entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "asc", $timelower = 0,
+$timeupper = 0, $entity_owner_guid = 0) {
+
+	elgg_deprecated_notice('get_annotations() is deprecated by elgg_get_annotations()', 1.8);
+	$options = array();
+
+	if ($entity_guid) {
+		$options['guid'] = $entity_guid;
+	}
+
+	if ($entity_type) {
+		$options['type'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtype'] = $entity_subtype;
+	}
+
+	if ($name) {
+		$options['annotation_name'] = $name;
+	}
+
+	if ($value) {
+		$options['annotation_value'] = $value;
+	}
+
+	if ($owner_guid) {
+		$options['annotation_owner_guid'] = $owner_guid;
+	}
+
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+
+	if ($order_by == 'desc') {
+		$options['order_by'] = 'n_table.time_created desc';
+	}
+
+	if ($timelower) {
+		$options['annotation_time_lower'] = $timelower;
+	}
+
+	if ($timeupper) {
+		$options['annotation_time_upper'] = $timeupper;
+	}
+
+	if ($entity_owner_guid) {
+		$options['owner_guid'] = $entity_owner_guid;
+	}
+
+	return elgg_get_annotations($options);
+}
+
+
+/**
+ * Returns a human-readable list of annotations on a particular entity.
+ *
+ * @param int        $entity_guid The entity GUID
+ * @param string     $name        The name of the kind of annotation
+ * @param int        $limit       The number of annotations to display at once
+ * @param true|false $asc         Display annotations in ascending order. (Default: true)
+ *
+ * @return string HTML (etc) version of the annotation list
+ * @deprecated 1.8 Use elgg_list_annotations()
+ */
+function list_annotations($entity_guid, $name = "", $limit = 25, $asc = true) {
+	elgg_deprecated_notice('list_annotations() is deprecated by elgg_list_annotations()', 1.8);
+
+	if ($asc) {
+		$asc = "asc";
+	} else {
+		$asc = "desc";
+	}
+
+	$options = array(
+		'guid' => $entity_guid,
+		'limit' => $limit,
+		'order_by' => "n_table.time_created $asc"
+	);
+
+	return elgg_list_annotations($options);
+}
+
+/**
+ * Helper function to deprecate annotation calculation functions. Don't use.
+ *
+ * @param unknown_type $entity_guid
+ * @param unknown_type $entity_type
+ * @param unknown_type $entity_subtype
+ * @param unknown_type $name
+ * @param unknown_type $value
+ * @param unknown_type $value_type
+ * @param unknown_type $owner_guid
+ * @param unknown_type $timelower
+ * @param unknown_type $timeupper
+ * @param unknown_type $calculation
+ * @internal Don't use this at all.
+ * @deprecated 1.8 Use elgg_get_annotations()
+ */
+function elgg_deprecated_annotation_calculation($entity_guid = 0, $entity_type = "", $entity_subtype = "",
+$name = "", $value = "", $value_type = "", $owner_guid = 0, $timelower = 0,
+$timeupper = 0, $calculation = '') {
+
+	$options = array('annotation_calculation' => $calculation);
+
+	if ($entity_guid) {
+		$options['guid'] = $entity_guid;
+	}
+
+	if ($entity_type) {
+		$options['type'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtype'] = $entity_subtype;
+	}
+
+	if ($name) {
+		$options['annotation_name'] = $name;
+	}
+
+	if ($value) {
+		$options['annotation_value'] = $value;
+	}
+
+	if ($owner_guid) {
+		$options['annotation_owner_guid'] = $owner_guid;
+	}
+
+	if ($order_by == 'desc') {
+		$options['order_by'] = 'n_table.time_created desc';
+	}
+
+	if ($timelower) {
+		$options['annotation_time_lower'] = $timelower;
+	}
+
+	if ($timeupper) {
+		$options['annotation_time_upper'] = $timeupper;
+	}
+
+	return elgg_get_annotations($options);
+}
+
+/**
+ * Count the number of annotations based on search parameters
+ *
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ * @param int    $timelower      Lower time limit
+ * @param int    $timeupper      Upper time limit
+ *
+ * @deprecated 1.8 Use elgg_get_annotations() and pass 'count' => true
+ * @return int
+ */
+function count_annotations($entity_guid = 0, $entity_type = "", $entity_subtype = "",
+$name = "", $value = "", $value_type = "", $owner_guid = 0, $timelower = 0,
+$timeupper = 0) {
+	elgg_deprecated_notice('count_annotations() is deprecated by elgg_get_annotations() and passing "count" => true', 1.8);
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, 'count');
+}
+
+/**
+ * Return the sum of a given integer annotation.
+ *
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ *
+ * @deprecated 1.8 Use elgg_get_annotations() and pass 'annotation_calculation' => 'sum'
+ * @return int
+ */
+function get_annotations_sum($entity_guid, $entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $value_type = "", $owner_guid = 0) {
+	elgg_deprecated_notice('get_annotations_sum() is deprecated by elgg_get_annotations() and passing "annotation_calculation" => "sum"', 1.8);
+
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, 'sum');
+}
+
+/**
+ * Return the max of a given integer annotation.
+ *
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ *
+ * @deprecated 1.8 Use elgg_get_annotations() and pass 'annotation_calculation' => 'max'
+ * @return int
+ */
+function get_annotations_max($entity_guid, $entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $value_type = "", $owner_guid = 0) {
+	elgg_deprecated_notice('get_annotations_max() is deprecated by elgg_get_annotations() and passing "annotation_calculation" => "max"', 1.8);
+
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, 'max');
+}
+
+
+/**
+ * Return the minumum of a given integer annotation.
+ *
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ *
+ * @deprecated 1.8 Use elgg_get_annotations() and pass 'annotation_calculation' => 'min'
+ * @return int
+ */
+function get_annotations_min($entity_guid, $entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $value_type = "", $owner_guid = 0) {
+	elgg_deprecated_notice('get_annotations_min() is deprecated by elgg_get_annotations() and passing "annotation_calculation" => "min"', 1.8);
+
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, 'min');
+}
+
+
+/**
+ * Return the average of a given integer annotation.
+ *
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ *
+ * @deprecated 1.8 Use elgg_get_annotations() and pass 'annotation_calculation' => 'min'
+ *
+ * @return int
+ */
+function get_annotations_avg($entity_guid, $entity_type = "", $entity_subtype = "", $name = "",
+$value = "", $value_type = "", $owner_guid = 0) {
+	elgg_deprecated_notice('get_annotations_avg() is deprecated by elgg_get_annotations() and passing "annotation_calculation" => "avg"', 1.8);
+
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, 'avg');
+}
+
+
+/**
+ * Perform a mathmatical calculation on integer annotations.
+ *
+ * @param string $sum            What sort of calculation to perform
+ * @param int    $entity_guid    Guid of Entity
+ * @param string $entity_type    Type of Entity
+ * @param string $entity_subtype Subtype of Entity
+ * @param string $name           Name of annotation
+ * @param string $value          Value of annotation
+ * @param string $value_type     Type of value
+ * @param int    $owner_guid     GUID of owner of annotation
+ * @param int    $timelower      Lower time limit
+ * @param int    $timeupper      Upper time limit
+ *
+ * @return int
+ * @deprecated 1.8 Use elgg_get_annotations() and pass anntoation_calculation => <calculation>
+ */
+function get_annotations_calculate_x($sum = "avg", $entity_guid, $entity_type = "",
+$entity_subtype = "", $name = "", $value = "", $value_type = "", $owner_guid = 0,
+$timelower = 0, $timeupper = 0) {
+	elgg_deprecated_notice('get_annotations_calculate_x() is deprecated by elgg_get_annotations() and passing "annotation_calculation" => "calculation"', 1.8);
+
+	return elgg_deprecated_annotation_calculation($entity_guid, $entity_type, $entity_subtype,
+			$name, $value, $value_type, $owner_guid, $timelower, $timeupper, $sum);
+}
+
+
+/**
+ * Lists entities by the totals of a particular kind of annotation AND
+ * the value of a piece of metadata
+ *
+ * @param string  $entity_type    Type of entity.
+ * @param string  $entity_subtype Subtype of entity.
+ * @param string  $name           Name of annotation.
+ * @param string  $mdname         Metadata name
+ * @param string  $mdvalue        Metadata value
+ * @param int     $limit          Maximum number of results to return.
+ * @param int     $owner_guid     Owner.
+ * @param int     $group_guid     Group container. Currently only supported if entity_type is object
+ * @param boolean $asc            Whether to list in ascending or descending order (default: desc)
+ * @param boolean $fullview       Whether to display the entities in full
+ * @param boolean $listtypetoggle Can the 'gallery' view can be displayed (default: no)
+ * @param boolean $pagination     Display pagination
+ * @param string  $orderdir       'desc' or 'asc'
+ *
+ * @deprecated 1.8 Use elgg_list_entities_from_annotation_calculation().
+ *
+ * @return string Formatted entity list
+ */
+function list_entities_from_annotation_count_by_metadata($entity_type = "", $entity_subtype = "",
+$name = "", $mdname = '', $mdvalue = '', $limit = 10, $owner_guid = 0, $group_guid = 0,
+$asc = false, $fullview = true, $listtypetoggle = false, $pagination = true, $orderdir = 'desc') {
+
+	$msg = 'list_entities_from_annotation_count_by_metadata() is deprecated by elgg_list_entities_from_annotation_calculation().';
+
+	elgg_deprecated_notice($msg, 1.8);
+
+	$options = array();
+
+	$options['calculation'] = 'sum';
+
+	if ($entity_type) {
+		$options['types'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtypes'] = $entity_subtype;
+	}
+
+	$options['annotation_names'] = $name;
+
+	if ($mdname) {
+		$options['metadata_name'] = $mdname;
+	}
+
+	if ($mdvalue) {
+		$options['metadata_value'] = $mdvalue;
+	}
+
+	if ($owner_guid) {
+		if (is_array($owner_guid)) {
+			$options['owner_guids'] = $owner_guid;
+		} else {
+			$options['owner_guid'] = $owner_guid;
+		}
+	}
+
+	$options['full_view'] = $fullview;
+
+	$options['list_type_toggle'] = $listtypetoggle;
+
+	$options['pagination'] = $pagination;
+
+	$options['limit'] = $limit;
+
+	$options['order_by'] = "annotation_calculation $orderdir";
+
+	return elgg_get_entities_from_annotation_calculation($options);
+}
+
+/**
+ * Set an alternative base location for a view (as opposed to the default of $CONFIG->viewpath)
+ *
+ * @param string $view The name of the view
+ * @param string $location The base location path
+ *
+ * @deprecated 1.8 Use elgg_set_view_location()
+ */
+function set_view_location($view, $location, $viewtype = '') {
+	elgg_deprecated_notice("set_view_location() was deprecated by elgg_set_view_location()", 1.8);
+	return elgg_set_view_location($view, $location, $viewtype);
+}
+
+/**
+ * Sets the URL handler for a particular entity type and subtype
+ *
+ * @param string $function_name The function to register
+ * @param string $entity_type The entity type
+ * @param string $entity_subtype The entity subtype
+ * @return true|false Depending on success
+ *
+ * @deprecated 1.8 Use elgg_register_entity_url_handler()
+ */
+function register_entity_url_handler($function_name, $entity_type = "all", $entity_subtype = "all") {
+	elgg_deprecated_notice("register_entity_url_handler() was deprecated by elgg_register_entity_url_handler()", 1.8);
+	return elgg_register_entity_url_handler($entity_type, $entity_subtype, $function_name);
+}
+
+
+/**
+ * Get the metadata where the entities they are referring to match a given criteria.
+ *
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site GUID. 0 for current, -1 for any
+ *
+ * @return mixed
+ * @deprecated 1.8 Use elgg_get_metadata()
+ */
+function find_metadata($meta_name = "", $meta_value = "", $entity_type = "", $entity_subtype = "",
+	$limit = 10, $offset = 0, $order_by = "", $site_guid = 0) {
+
+	elgg_deprecated_notice('get_metadata() is deprecated by elgg_get_metadata()', 1.8);
+
+	$options = array();
+
+	if ($meta_name) {
+		$options['annotation_name'] = $meta_name;
+	}
+
+	if ($meta_value) {
+		$options['annotation_value'] = $meta_value;
+	}
+
+	if ($entity_type) {
+		$options['type'] = $entity_type;
+	}
+
+	if ($entity_subtype) {
+		$options['subtype'] = $entity_subtype;
+	}
+
+	$options['limit'] = $limit;
+	$options['offset'] = $offset;
+
+	if ($order_by == 'desc') {
+		$options['order_by'] = 'n_table.time_created desc';
+	}
+
+	if ($site_guid) {
+		$options['site_guid'] = $site_guid;
+	}
+
+	return elgg_get_metadata($options);
+}
+
+/**
+ * Get metadata objects by name.
+ *
+ * @param int    $entity_guid Entity GUID
+ * @param string $meta_name   Metadata name
+ *
+ * @return mixed ElggMetadata object, an array of ElggMetadata or false.
+ * @deprecated 1.8 Use elgg_get_metadata()
+ */
+function get_metadata_byname($entity_guid, $meta_name) {
+	elgg_deprecated_notice('get_metadata_byname() is deprecated by elgg_get_metadata()', 1.8);
+
+	if (!$entity_guid || !$meta_name) {
+		return false;
+	}
+
+	$options = array(
+		'guid' => $entity_guid,
+		'metadata_name' => $meta_name,
+		'limit' => 0
+	);
+
+	$md = elgg_get_metadata($options);
+
+	if ($md && count($md) == 1) {
+		return $md[0];
+	}
+
+	return $md;
+}
+
+/**
+ * Return all the metadata for a given GUID.
+ *
+ * @param int $entity_guid Entity GUID
+ *
+ * @return mixed
+ * @deprecated 1.8 Use elgg_get_metadata()
+ */
+function get_metadata_for_entity($entity_guid) {
+	elgg_deprecated_notice('get_metadata_for_entity() is deprecated by elgg_get_metadata()', 1.8);
+
+	if (!$entity_guid) {
+		return false;
+	}
+
+	$options = array(
+		'guid' => $entity_guid,
+		'limit' => 0
+	);
+
+	return elgg_get_metadata($options);
+}
+
+/**
+ * Get a specific metadata object.
+ *
+ * @param int $id The id of the metadata being retrieved.
+ *
+ * @return mixed False on failure or ElggMetadata
+ * @deprecated 1.8 Use elgg_get_metadata_from_id()
+ */
+function get_metadata($id) {
+	elgg_deprecated_notice('get_metadata() is deprecated by elgg_get_metadata_from_id()', 1.8);
+	return elgg_get_metadata_from_id($id);
+}
+
+/**
+ * Clear all the metadata for a given entity, assuming you have access to that entity.
+ *
+ * @param int $guid Entity GUID
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_delete_metadata()
+ */
+function clear_metadata($guid) {
+	elgg_deprecated_notice('clear_metadata() is deprecated by elgg_delete_metadata()', 1.8);
+	if (!$guid) {
+		return false;
+	}
+	return elgg_delete_metadata(array('guid' => $guid, 'limit' => 0));
+}
+
+/**
+ * Clear all metadata belonging to a given owner_guid
+ *
+ * @param int $owner_guid The owner
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_delete_metadata()
+ */
+function clear_metadata_by_owner($owner_guid) {
+	elgg_deprecated_notice('clear_metadata() is deprecated by elgg_delete_metadata()', 1.8);
+	if (!$owner_guid) {
+		return false;
+	}
+	return elgg_delete_metadata(array('metadata_owner_guid' => $owner_guid, 'limit' => 0));
+}
+
+/**
+ * Delete a piece of metadata, where the current user has access.
+ *
+ * @param int $id The id of metadata to delete.
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_delete_metadata()
+ */
+function delete_metadata($id) {
+	elgg_deprecated_notice('delete_metadata() is deprecated by elgg_delete_metadata()', 1.8);
+	if (!$id) {
+		return false;
+	}
+	return elgg_delete_metadata(array('metadata_id' => $id));
+}
+
+/**
+ * Removes metadata on an entity with a particular name, optionally with a given value.
+ *
+ * @param int    $guid  The entity GUID
+ * @param string $name  The name of the metadata
+ * @param string $value The value of the metadata (useful to remove a single item of a set)
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_delete_metadata()
+ */
+function remove_metadata($guid, $name, $value = "") {
+	elgg_deprecated_notice('delete_metadata() is deprecated by elgg_delete_metadata()', 1.8);
+
+	// prevent them from deleting everything
+	if (!$guid) {
+		return false;
+	}
+
+	$options = array(
+		'guid' => $guid,
+		'metadata_name' => $name,
+		'limit' => 0
+	);
+
+	if ($value) {
+		$options['metadata_value'] = $value;
+	}
+
+	return elgg_delete_metadata($options);
+}
+
+/**
+ * Get a specific annotation.
+ *
+ * @param int $annotation_id Annotation ID
+ *
+ * @return ElggAnnotation
+ * @deprecated 1.8 Use elgg_get_annotation_from_id()
+ */
+function get_annotation($annotation_id) {
+	elgg_deprecated_notice('get_annotation() is deprecated by elgg_get_annotation_from_id()', 1.8);
+	return elgg_get_annotation_from_id($annotation_id);
+}
+
+/**
+ * Delete a given annotation.
+ *
+ * @param int $id The annotation id
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_delete_annotations()
+ */
+function delete_annotation($id) {
+	elgg_deprecated_notice('delete_annotation() is deprecated by elgg_delete_annotations()', 1.8);
+	if (!$id) {
+		return false;
+	}
+	return elgg_delete_annotations(array('annotation_id' => $annotation_id));
+}
+
+/**
+ * Clear all the annotations for a given entity, assuming you have access to that metadata.
+ *
+ * @param int    $guid The entity guid
+ * @param string $name The name of the annotation to delete.
+ *
+ * @return int Number of annotations deleted or false if an error
+ * @deprecated 1.8 Use elgg_delete_annotations()
+ */
+function clear_annotations($guid, $name = "") {
+	elgg_deprecated_notice('clear_annotations() is deprecated by elgg_delete_annotations()', 1.8);
+
+	if (!$guid) {
+		return false;
+	}
+
+	$options = array(
+		'guid' => $guid,
+		'limit' => 0
+	);
+
+	if ($name) {
+		$options['annotation_name'] = $name;
+	}
+
+	return elgg_delete_annotations($options);
+}
+
+/**
+ * Clear all annotations belonging to a given owner_guid
+ *
+ * @param int $owner_guid The owner
+ *
+ * @return int Number of annotations deleted
+ * @deprecated 1.8 Use elgg_delete_annotations()
+ */
+function clear_annotations_by_owner($owner_guid) {
+	elgg_deprecated_notice('clear_annotations_by_owner() is deprecated by elgg_delete_annotations()', 1.8);
+
+	if (!$owner_guid) {
+		return false;
+	}
+
+	$options = array(
+		'annotation_owner_guid' => $guid,
+		'limit' => 0
+	);
+
+	return elgg_delete_annotations($options);
+}
+
+/**
+ * Registers a page handler for a particular identifier
+ *
+ * For example, you can register a function called 'blog_page_handler' for handler type 'blog'
+ * Now for all URLs of type http://yoururl/pg/blog/*, the blog_page_handler() function will be called.
+ * The part of the URL marked with * above will be exploded on '/' characters and passed as an
+ * array to that function.
+ * For example, the URL http://yoururl/blog/username/friends/ would result in the call:
+ * blog_page_handler(array('username','friends'), blog);
+ *
+ * Page handler functions should return true or the default page handler will be called.
+ *
+ * A request to register a page handler with the same identifier as previously registered
+ * handler will replace the previous one.
+ *
+ * The context is set to the page handler identifier before the registered
+ * page handler function is called. For the above example, the context is set to 'blog'.
+ *
+ * @param string $handler The page type to handle
+ * @param string $function Your function name
+ * @return true|false Depending on success
+ *
+ * @deprecated 1.8 Use {@link elgg_register_page_handler()}
+ */
+function register_page_handler($handler, $function){
+	elgg_deprecated_notice("register_page_handler() was deprecated by elgg_register_page_handler()", 1.8);
+	return elgg_register_page_handler($handler, $function);
+}
+
+/**
+ * Unregister a page handler for an identifier
+ *
+ * Note: to replace a page handler, call register_page_handler()
+ *
+ * @param string $handler The page type identifier
+ * @since 1.7.2
+ * 
+ * @deprecated 1.8 Use {@link elgg_unregister_page_handler()}
+ */
+function unregister_page_handler($handler) {
+	elgg_deprecated_notice("unregister_page_handler() was deprecated by elgg_unregister_page_handler()", 1.8);
+	return elgg_unregister_page_handler($handler);
+}
+
+/**
+ * Register an annotation url handler.
+ *
+ * @param string $function_name The function.
+ * @param string $extender_name The name, default 'all'.
+ *
+ * @deprecated 1.8 Use {@link elgg_register_annotation_url_handler()}
+ */
+function register_annotation_url_handler($function, $extender_name) {
+	elgg_deprecated_notice("register_annotation_url_handler() was deprecated by elgg_register_annotation_url_handler()", 1.8);
+	return elgg_register_annotation_url_handler($extender_name, $function);
+}
+
+/**
+ * Sets the URL handler for a particular extender type and name.
+ * It is recommended that you do not call this directly, instead use one of the wrapper functions in the
+ * subtype files.
+ *
+ * @param string $function_name The function to register
+ * @param string $extender_type Extender type
+ * @param string $extender_name The name of the extender
+ * @return true|false Depending on success
+ *
+ * @deprecated 1.8 Use {@link elgg_register_extender_url_handler()}
+ */
+function register_extender_url_handler($function, $type = "all", $name = "all") {
+	elgg_deprecated_notice("register_extender_url_handler() was deprecated by elgg_register_extender_url_handler()", 1.8);
+	return elgg_register_extender_url_handler($type, $name, $function);
+}
+
+/**
+ * Registers and entity type and subtype to return in search and other places.
+ * A description in the elgg_echo languages file of the form item:type:subtype
+ * is also expected.
+ *
+ * @param string $type The type of entity (object, site, user, group)
+ * @param string $subtype The subtype to register (may be blank)
+ * @return true|false Depending on success
+ * 
+ * @deprecated 1.8 Use {@link elgg_register_entity_type()}
+ */
+function register_entity_type($type, $subtype = null) {
+	elgg_deprecated_notice("register_entity_type() was deprecated by elgg_register_entity_type()", 1.8);
+	return elgg_register_entity_type($type, $subtype);
+}
+
+/**
+ * Register a metadata url handler.
+ *
+ * @param string $function_name The function.
+ * @param string $extender_name The name, default 'all'.
+ * 
+ * @deprecated 1.8 Use {@link elgg_register_metadata_url_handler()}
+ */
+function register_metadata_url_handler($function, $extender_name = "all") {
+	return elgg_register_metadata_url_handler($extender_name, $function);
+}
+
+/**
+ * Sets the URL handler for a particular relationship type
+ *
+ * @param string $function_name The function to register
+ * @param string $relationship_type The relationship type.
+ * @return true|false Depending on success
+ * 
+ * @deprecated 1.8 Use {@link elgg_register_relationship_url_handler()}
+ */
+function register_relationship_url_handler($function_name, $relationship_type = "all") {
+	elgg_deprecated_notice("register_relationship_url_handler() was deprecated by elgg_register_relationship_url_handler()", 1.8);
+	return elgg_register_relationship_url_handler($relationship_type, $function_name);
+}
+
+/**
+ * Registers a view to be simply cached
+ *
+ * Views cached in this manner must take no parameters and be login agnostic -
+ * that is to say, they look the same no matter who is logged in (or logged out).
+ *
+ * CSS and the basic jS views are automatically cached like this.
+ *
+ * @param string $viewname View name
+ *
+ * @deprecated 1.8 Use {@link elgg_register_simplecache_view()}
+ */
+function elgg_view_register_simplecache($viewname) {
+	elgg_deprecated_notice("elgg_view_register_simplecache() was deprecated by elgg_register_simplecache_view()", 1.8);
+	return elgg_register_simplecache_view($viewname);
+}
+
+/**
+ * Regenerates the simple cache.
+ *
+ * @param string $viewtype Optional viewtype to regenerate
+ * @see elgg_view_register_simplecache()
+ *
+ * @deprecated 1.8 Use {@link elgg_regenerate_simplecache()}
+ */
+function elgg_view_regenerate_simplecache($viewtype = NULL) {
+	elgg_deprecated_notice("elgg_view_regenerate_simplecache() was deprecated by elgg_regenerate_simplecache()", 1.8);
+	return elgg_regenerate_simplecache($viewtype);
+}
+
+/**
+ * Enables the simple cache.
+ *
+ * @see elgg_view_register_simplecache()
+ * 
+ * @deprecated 1.8 Use {@link elgg_enable_simplecache()}
+ */
+function elgg_view_enable_simplecache() {
+	elgg_deprecated_notice("elgg_view_enable_simplecache() was deprecated by elgg_enable_simplecache()", 1.8);
+	return elgg_enable_simplecache();
+}
+
+/**
+ * Disables the simple cache.
+ *
+ * @see elgg_view_register_simplecache()
+ * 
+ * @deprecated 1.8 Use {@link elgg_disable_simplecache()}
+ */
+function elgg_view_disable_simplecache() {
+	elgg_deprecated_notice("elgg_view_disable_simplecache() was deprecated by elgg_disable_simplecache()", 1.8);
+	return elgg_disable_simplecache();
+}
+
+// these were internal functions that perhaps can be removed rather than deprecated
+/**
+ * @deprecated 1.8
+ */
+function is_db_installed() {
+	elgg_deprecated_notice('is_db_installed() has been deprecated', 1.8);
+	return true;
+}
+
+/**
+ * @deprecated 1.8
+ */
+function is_installed() {
+	elgg_deprecated_notice('is_installed() has been deprecated', 1.8);
+	return true;
+}
+
+/**
+ * Attempt to authenticate.
+ * This function will process all registered PAM handlers or stop when the first
+ * handler fails. A handler fails by either returning false or throwing an
+ * exception. The advantage of throwing an exception is that it returns a message
+ * through the global $_PAM_HANDLERS_MSG which can be used in communication with
+ * a user. The order that handlers are processed is determined by the order that
+ * they were registered.
+ *
+ * If $credentials are provided the PAM handler should authenticate using the
+ * provided credentials, if not then credentials should be prompted for or
+ * otherwise retrieved (eg from the HTTP header or $_SESSION).
+ *
+ * @param mixed $credentials Mixed PAM handler specific credentials (e.g. username, password)
+ * @param string $policy - the policy type, default is "user"
+ * @return bool true if authenticated, false if not.
+ *
+ * @deprecated 1.8 See {@link ElggPAM}
+ */
+function pam_authenticate($credentials = NULL, $policy = "user") {
+	elgg_deprecated_notice('pam_authenticate has been deprecated for ElggPAM', 1.8);
+	global $_PAM_HANDLERS, $_PAM_HANDLERS_MSG;
+
+	$_PAM_HANDLERS_MSG = array();
+
+	$authenticated = false;
+
+	foreach ($_PAM_HANDLERS[$policy] as $k => $v) {
+		$handler = $v->handler;
+		$importance = $v->importance;
+
+		try {
+			// Execute the handler
+			if ($handler($credentials)) {
+				// Explicitly returned true
+				$_PAM_HANDLERS_MSG[$k] = "Authenticated!";
+
+				$authenticated = true;
+			} else {
+				$_PAM_HANDLERS_MSG[$k] = "Not Authenticated.";
+
+				// If this is required then abort.
+				if ($importance == 'required') {
+					return false;
+				}
+			}
+		} catch (Exception $e) {
+			$_PAM_HANDLERS_MSG[$k] = "$e";
+
+			// If this is required then abort.
+			if ($importance == 'required') {
+				return false;
+			}
+		}
+	}
+
+	return $authenticated;
+}
+
+
+/**
+ * When given a widget entity and a new requested location, saves the new location
+ * and also provides a sensible ordering for all widgets in that column
+ *
+ * @param ElggObject $widget The widget entity
+ * @param int        $order  The order within the column
+ * @param int        $column The column (1, 2 or 3)
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 use ElggWidget::move()
+ */
+function save_widget_location(ElggObject $widget, $order, $column) {
+	elgg_deprecated_notice('save_widget_location() is deprecated', 1.8);
+	if ($widget instanceof ElggObject) {
+		if ($widget->subtype == "widget") {
+			// If you can't move the widget, don't save a new location
+			if (!$widget->draggable) {
+				return false;
+			}
+
+			// Sanitise the column value
+			if ($column != 1 || $column != 2 || $column != 3) {
+				$column = 1;
+			}
+
+			$widget->column = (int) $column;
+
+			$ordertmp = array();
+			$params = array(
+				'context' => $widget->context,
+				'column' => $column,
+			);
+
+			if ($entities = get_entities_from_metadata_multi($params, 'object', 'widget')) {
+				foreach ($entities as $entity) {
+					$entityorder = $entity->order;
+					if ($entityorder < $order) {
+						$ordertmp[$entityorder] = $entity;
+					}
+					if ($entityorder >= $order) {
+						$ordertmp[$entityorder + 10000] = $entity;
+					}
+				}
+			}
+
+			$ordertmp[$order] = $widget;
+			ksort($ordertmp);
+
+			$orderticker = 10;
+			foreach ($ordertmp as $orderval => $entity) {
+				$entity->order = $orderticker;
+				$orderticker += 10;
+			}
+
+			return true;
+		} else {
+			register_error($widget->subtype);
+		}
+
+	}
+
+	return false;
+}
+
+/**
+ * Get widgets for a particular context and column, in order of display
+ *
+ * @param int    $user_guid The owner user GUID
+ * @param string $context   The context (profile, dashboard etc)
+ * @param int    $column    The column (1 or 2)
+ *
+ * @return array|false An array of widget ElggObjects, or false
+ * @deprecated 1.8 Use elgg_get_widgets()
+ */
+function get_widgets($user_guid, $context, $column) {
+	elgg_deprecated_notice('get_widgets is depecated for elgg_get_widgets', 1.8);
+	$params = array(
+		'column' => $column,
+		'context' => $context
+	);
+	$widgets = get_entities_from_private_setting_multi($params, "object",
+		"widget", $user_guid, "", 10000);
+
+	if ($widgets) {
+		$widgetorder = array();
+		foreach ($widgets as $widget) {
+			$order = $widget->order;
+			while (isset($widgetorder[$order])) {
+				$order++;
+			}
+			$widgetorder[$order] = $widget;
+		}
+
+		ksort($widgetorder);
+
+		return $widgetorder;
+	}
+
+	return false;
+}
+
+/**
+ * Add a new widget instance
+ *
+ * @param int    $entity_guid GUID of entity that owns this widget
+ * @param string $handler     The handler for this widget
+ * @param string $context     The page context for this widget
+ * @param int    $order       The order to display this widget in
+ * @param int    $column      The column to display this widget in (1, 2 or 3)
+ * @param int    $access_id   If not specified, it is set to the default access level
+ *
+ * @return int|false Widget GUID or false on failure
+ * @deprecated 1.8 use elgg_create_widget()
+ */
+function add_widget($entity_guid, $handler, $context, $order = 0, $column = 1, $access_id = null) {
+	elgg_deprecated_notice('add_widget has been deprecated for elgg_create_widget', 1.8);
+	if (empty($entity_guid) || empty($context) || empty($handler) || !widget_type_exists($handler)) {
+		return false;
+	}
+
+	if ($entity = get_entity($entity_guid)) {
+		$widget = new ElggWidget;
+		$widget->owner_guid = $entity_guid;
+		$widget->container_guid = $entity_guid;
+		if (isset($access_id)) {
+			$widget->access_id = $access_id;
+		} else {
+			$widget->access_id = get_default_access();
+		}
+
+		$guid = $widget->save();
+
+		// private settings cannot be set until ElggWidget saved
+		$widget->handler = $handler;
+		$widget->context = $context;
+		$widget->column = $column;
+		$widget->order = $order;
+
+		return $guid;
+	}
+
+	return false;
+}
+
+/**
+ * Define a new widget type
+ *
+ * @param string $handler     The identifier for the widget handler
+ * @param string $name        The name of the widget type
+ * @param string $description A description for the widget type
+ * @param string $context     A comma-separated list of contexts where this
+ *                            widget is allowed (default: 'all')
+ * @param bool   $multiple    Whether or not multiple instances of this widget
+ *                            are allowed on a single dashboard (default: false)
+ * @param string $positions   A comma-separated list of positions on the page
+ *                            (side or main) where this widget is allowed (default: "side,main")
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_register_widget_type
+ */
+function add_widget_type($handler, $name, $description, $context = "all",
+$multiple = false, $positions = "side,main") {
+	elgg_deprecated_notice("add_widget_type deprecated for elgg_register_widget_type", 1.8);
+
+	return elgg_register_widget_type($handler, $name, $description, $context, $multiple);
+}
+
+/**
+ * Remove a widget type
+ *
+ * @param string $handler The identifier for the widget handler
+ *
+ * @return void
+ * @since 1.7.1
+ * @deprecated 1.8 Use elgg_unregister_widget_type
+ */
+function remove_widget_type($handler) {
+	elgg_deprecated_notice("remove_widget_type deprecated for elgg_unregister_widget_type", 1.8);
+	return elgg_unregister_widget_type($handler);
+}
+
+/**
+ * Determines whether or not widgets with the specified handler have been defined
+ *
+ * @param string $handler The widget handler identifying string
+ *
+ * @return bool Whether or not those widgets exist
+ * @deprecated 1.8 Use elgg_is_widget_type
+ */
+function widget_type_exists($handler) {
+	elgg_deprecated_notice("widget_type_exists deprecated for elgg_is_widget_type", 1.8);
+	return elgg_is_widget_type($handler);
+}
+
+/**
+ * Returns an array of stdClass objects representing the defined widget types
+ *
+ * @return array A list of types defined (if any)
+ * @deprecated 1.8 Use elgg_get_widget_types
+ */
+function get_widget_types() {
+	elgg_deprecated_notice("get_widget_types deprecrated for elgg_get_widget_types", 1.8);
+	return elgg_get_widget_types();
+}
+
+/**
+ * Saves a widget's settings (by passing an array of
+ * (name => value) pairs to save_{$handler}_widget)
+ *
+ * @param int   $widget_guid The GUID of the widget we're saving to
+ * @param array $params      An array of name => value parameters
+ *
+ * @return bool
+ * @deprecated 1.8 Use elgg_save_widget_settings
+ */
+function save_widget_info($widget_guid, $params) {
+	elgg_deprecated_notice("save_widget_info() is deprecated for elgg_save_widget_settings", 1.8);
+	if ($widget = get_entity($widget_guid)) {
+
+		$subtype = $widget->getSubtype();
+
+		if ($subtype != "widget") {
+			return false;
+		}
+		$handler = $widget->handler;
+		if (empty($handler) || !widget_type_exists($handler)) {
+			return false;
+		}
+
+		if (!$widget->canEdit()) {
+			return false;
+		}
+
+		// Save the params to the widget
+		if (is_array($params) && sizeof($params) > 0) {
+			foreach ($params as $name => $value) {
+
+				if (!empty($name) && !in_array($name, array(
+					'guid', 'owner_guid', 'site_guid'
+				))) {
+					if (is_array($value)) {
+						// @todo Handle arrays securely
+						$widget->setMetaData($name, $value, "", true);
+					} else {
+						$widget->$name = $value;
+					}
+				}
+			}
+			$widget->save();
+		}
+
+		$function = "save_{$handler}_widget";
+		if (is_callable($function)) {
+			return $function($params);
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Reorders the widgets from a widget panel
+ *
+ * @param string $panelstring1 String of guids of ElggWidget objects separated by ::
+ * @param string $panelstring2 String of guids of ElggWidget objects separated by ::
+ * @param string $panelstring3 String of guids of ElggWidget objects separated by ::
+ * @param string $context      Profile or dashboard
+ * @param int    $owner        Owner guid
+ *
+ * @return void
+ * @deprecated 1.8 Don't use.
+ */
+function reorder_widgets_from_panel($panelstring1, $panelstring2, $panelstring3, $context, $owner) {
+	elgg_deprecated_notice("reorder_widgets_from_panel() is deprecated", 1.8);
+	$return = true;
+
+	$mainwidgets = explode('::', $panelstring1);
+	$sidewidgets = explode('::', $panelstring2);
+	$rightwidgets = explode('::', $panelstring3);
+
+	$handlers = array();
+	$guids = array();
+
+	if (is_array($mainwidgets) && sizeof($mainwidgets) > 0) {
+		foreach ($mainwidgets as $widget) {
+
+			$guid = (int) $widget;
+
+			if ("{$guid}" == "{$widget}") {
+				$guids[1][] = $widget;
+			} else {
+				$handlers[1][] = $widget;
+			}
+		}
+	}
+	if (is_array($sidewidgets) && sizeof($sidewidgets) > 0) {
+		foreach ($sidewidgets as $widget) {
+
+			$guid = (int) $widget;
+
+			if ("{$guid}" == "{$widget}") {
+				$guids[2][] = $widget;
+			} else {
+				$handlers[2][] = $widget;
+			}
+
+		}
+	}
+	if (is_array($rightwidgets) && sizeof($rightwidgets) > 0) {
+		foreach ($rightwidgets as $widget) {
+
+			$guid = (int) $widget;
+
+			if ("{$guid}" == "{$widget}") {
+				$guids[3][] = $widget;
+			} else {
+				$handlers[3][] = $widget;
+			}
+
+		}
+	}
+
+	// Reorder existing widgets or delete ones that have vanished
+	foreach (array(1, 2, 3) as $column) {
+		if ($dbwidgets = get_widgets($owner, $context, $column)) {
+
+			foreach ($dbwidgets as $dbwidget) {
+				if (in_array($dbwidget->getGUID(), $guids[1])
+				|| in_array($dbwidget->getGUID(), $guids[2]) || in_array($dbwidget->getGUID(), $guids[3])) {
+
+					if (in_array($dbwidget->getGUID(), $guids[1])) {
+						$pos = array_search($dbwidget->getGUID(), $guids[1]);
+						$col = 1;
+					} else if (in_array($dbwidget->getGUID(), $guids[2])) {
+						$pos = array_search($dbwidget->getGUID(), $guids[2]);
+						$col = 2;
+					} else {
+						$pos = array_search($dbwidget->getGUID(), $guids[3]);
+						$col = 3;
+					}
+					$pos = ($pos + 1) * 10;
+					$dbwidget->column = $col;
+					$dbwidget->order = $pos;
+				} else {
+					$dbguid = $dbwidget->getGUID();
+					if (!$dbwidget->delete()) {
+						$return = false;
+					} else {
+						// Remove state cookie
+						setcookie('widget' + $dbguid, null);
+					}
+				}
+			}
+
+		}
+		// Add new ones
+		if (sizeof($guids[$column]) > 0) {
+			foreach ($guids[$column] as $key => $guid) {
+				if ($guid == 0) {
+					$pos = ($key + 1) * 10;
+					$handler = $handlers[$column][$key];
+					if (!add_widget($owner, $handler, $context, $pos, $column)) {
+						$return = false;
+					}
+				}
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Register a particular context for use with widgets.
+ *
+ * @param string $context The context we wish to enable context for
+ *
+ * @return void
+ * @deprecated 1.8 Don't use.
+ */
+function use_widgets($context) {
+	elgg_deprecated_notice("use_widgets is deprecated", 1.8);
+	global $CONFIG;
+
+	if (!isset($CONFIG->widgets)) {
+		$CONFIG->widgets = new stdClass;
+	}
+
+	if (!isset($CONFIG->widgets->contexts)) {
+		$CONFIG->widgets->contexts = array();
+	}
+
+	if (!empty($context)) {
+		$CONFIG->widgets->contexts[] = $context;
+	}
+}
+
+/**
+ * Determines whether or not the current context is using widgets
+ *
+ * @return bool Depending on widget status
+ * @deprecated 1.8 Don't use.
+ */
+function using_widgets() {
+	elgg_deprecated_notice("using_widgets is deprecated", 1.8);
+	global $CONFIG;
+
+	$context = elgg_get_context();
+	if (isset($CONFIG->widgets->contexts) && is_array($CONFIG->widgets->contexts)) {
+		if (in_array($context, $CONFIG->widgets->contexts)) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Displays a particular widget
+ *
+ * @param ElggObject $widget The widget to display
+ * @return string The HTML for the widget, including JavaScript wrapper
+ * 
+ * @deprecated 1.8 Use elgg_view_entity()
+ */
+function display_widget(ElggObject $widget) {
+	elgg_deprecated_notice("display_widget() was been deprecated. Use elgg_view_entity().", 1.8);
+	return elgg_view_entity($widget);
+}
+
+/**
+ * Count the number of comments attached to an entity
+ *
+ * @param ElggEntity $entity
+ * @return int Number of comments
+ * @deprecated 1.8 Use ElggEntity->countComments()
+ */
+function elgg_count_comments($entity) {
+	elgg_deprecated_notice('elgg_count_comments() is deprecated by ElggEntity->countComments()', 1.8);
+
+	if ($entity instanceof ElggEntity) {
+		return $entity->countComments();
+	}
+
+	return 0;
+}
+
+/**
+ * Removes all items relating to a particular acting entity from the river
+ *
+ * @param int $subject_guid The GUID of the entity
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_subject($subject_guid) {
+	elgg_deprecated_notice("remove_from_river_by_subject() deprecated by elgg_delete_river()", 1.8);
+
+	return elgg_delete_river(array('subject_guid' => $subject_guid));
+}
+
+/**
+ * Removes all items relating to a particular entity being acted upon from the river
+ *
+ * @param int $object_guid The GUID of the entity
+ *
+ * @return bool Depending on success
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_object($object_guid) {
+	elgg_deprecated_notice("remove_from_river_by_object() deprecated by elgg_delete_river()", 1.8);
+
+	return elgg_delete_river(array('object_guid' => $object_guid));
+}
+
+/**
+ * Removes all items relating to a particular annotation being acted upon from the river
+ *
+ * @param int $annotation_id The ID of the annotation
+ *
+ * @return bool Depending on success
+ * @since 1.7.0
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_annotation($annotation_id) {
+	elgg_deprecated_notice("remove_from_river_by_annotation() deprecated by elgg_delete_river()", 1.8);
+
+	return elgg_delete_river(array('annotation_id' => $annotation_id));
+}
+
+/**
+ * Removes a single river entry
+ *
+ * @param int $id The ID of the river entry
+ *
+ * @return bool Depending on success
+ * @since 1.7.2
+ * @deprecated 1.8 Use elgg_delete_river()
+ */
+function remove_from_river_by_id($id) {
+	elgg_deprecated_notice("remove_from_river_by_id() deprecated by elgg_delete_river()", 1.8);
+
+	return elgg_delete_river(array('id' => $id));
+}
+
+/**
+ * A default page handler
+ * Tries to locate a suitable file to include. Only works for core pages, not plugins.
+ *
+ * @param array  $page    The page URL elements
+ * @param string $handler The base handler
+ *
+ * @return true|false Depending on success
+ * @deprecated 1.8
+ */
+function default_page_handler($page, $handler) {
+	global $CONFIG;
+
+	elgg_deprecated_notice("default_page_handler is deprecated", "1.8");
+
+	$page = implode('/', $page);
+
+	// protect against including arbitary files
+	$page = str_replace("..", "", $page);
+
+	$callpath = $CONFIG->path . $handler . "/" . $page;
+	if (is_dir($callpath)) {
+		$callpath = sanitise_filepath($callpath);
+		$callpath .= "index.php";
+		if (file_exists($callpath)) {
+			if (include($callpath)) {
+				return TRUE;
+			}
+		}
+	} else if (file_exists($callpath)) {
+		include($callpath);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Invalidate this class's entry in the cache.
+ *
+ * @param int $guid The entity guid
+ *
+ * @return void
+ * @access private
+ * @deprecated 1.8
+ */
+function invalidate_cache_for_entity($guid) {
+	elgg_deprecated_notice('invalidate_cache_for_entity() is a private function and should not be used.', 1.8);
+	_elgg_invalidate_cache_for_entity($guid);
+}
+
+/**
+ * Cache an entity.
+ *
+ * Stores an entity in $ENTITY_CACHE;
+ *
+ * @param ElggEntity $entity Entity to cache
+ *
+ * @return void
+ * @access private
+ * @deprecated 1.8
+ */
+function cache_entity(ElggEntity $entity) {
+	elgg_deprecated_notice('cache_entity() is a private function and should not be used.', 1.8);
+	_elgg_cache_entity($entity);
+}
+
+/**
+ * Retrieve a entity from the cache.
+ *
+ * @param int $guid The guid
+ *
+ * @return ElggEntity|bool false if entity not cached, or not fully loaded
+ * @access private
+ * @deprecated 1.8
+ */
+function retrieve_cached_entity($guid) {
+	elgg_deprecated_notice('retrieve_cached_entity() is a private function and should not be used.', 1.8);
+	return _elgg_retrieve_cached_entity($guid);
+}
diff --git a/engine/lib/deprecated-1.9.php b/engine/lib/deprecated-1.9.php
new file mode 100644
index 000000000..31d03428f
--- /dev/null
+++ b/engine/lib/deprecated-1.9.php
@@ -0,0 +1,582 @@
+<?php
+/**
+ * Return a timestamp for the start of a given day (defaults today).
+ *
+ * @param int $day   Day
+ * @param int $month Month
+ * @param int $year  Year
+ *
+ * @return int
+ * @access private
+ * @deprecated 1.9
+ */
+function get_day_start($day = null, $month = null, $year = null) {
+	elgg_deprecated_notice('get_day_start() has been deprecated', 1.9);
+	return mktime(0, 0, 0, $month, $day, $year);
+}
+
+/**
+ * Return a timestamp for the end of a given day (defaults today).
+ *
+ * @param int $day   Day
+ * @param int $month Month
+ * @param int $year  Year
+ *
+ * @return int
+ * @access private
+ * @deprecated 1.9
+ */
+function get_day_end($day = null, $month = null, $year = null) {
+	elgg_deprecated_notice('get_day_end() has been deprecated', 1.9);
+	return mktime(23, 59, 59, $month, $day, $year);
+}
+
+/**
+ * Return the notable entities for a given time period.
+ *
+ * @param int     $start_time     The start time as a unix timestamp.
+ * @param int     $end_time       The end time as a unix timestamp.
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param string  $order_by       The field to order by; by default, time_created desc
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param int     $offset         The indexing offset, 0 by default
+ * @param boolean $count          Set to true to get a count instead of entities. Defaults to false.
+ * @param int     $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param mixed   $container_guid Container or containers to get entities from (default: any).
+ *
+ * @return array|false
+ * @access private
+ * @deprecated 1.9
+ */
+function get_notable_entities($start_time, $end_time, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "asc", $limit = 10, $offset = 0, $count = false, $site_guid = 0,
+$container_guid = null) {
+	elgg_deprecated_notice('get_notable_entities() has been deprecated', 1.9);
+	global $CONFIG;
+
+	if ($subtype === false || $subtype === null || $subtype === 0) {
+		return false;
+	}
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	$where = array();
+
+	if (is_array($type)) {
+		$tempwhere = "";
+		if (sizeof($type)) {
+			foreach ($type as $typekey => $subtypearray) {
+				foreach ($subtypearray as $subtypeval) {
+					$typekey = sanitise_string($typekey);
+					if (!empty($subtypeval)) {
+						$subtypeval = (int) get_subtype_id($typekey, $subtypeval);
+					} else {
+						$subtypeval = 0;
+					}
+					if (!empty($tempwhere)) {
+						$tempwhere .= " or ";
+					}
+					$tempwhere .= "(e.type = '{$typekey}' and e.subtype = {$subtypeval})";
+				}
+			}
+		}
+		if (!empty($tempwhere)) {
+			$where[] = "({$tempwhere})";
+		}
+	} else {
+		$type = sanitise_string($type);
+		$subtype = get_subtype_id($type, $subtype);
+
+		if ($type != "") {
+			$where[] = "e.type='$type'";
+		}
+
+		if ($subtype !== "") {
+			$where[] = "e.subtype=$subtype";
+		}
+	}
+
+	if ($owner_guid != "") {
+		if (!is_array($owner_guid)) {
+			$owner_array = array($owner_guid);
+			$owner_guid = (int) $owner_guid;
+			$where[] = "e.owner_guid = '$owner_guid'";
+		} else if (sizeof($owner_guid) > 0) {
+			$owner_array = array_map('sanitise_int', $owner_guid);
+			// Cast every element to the owner_guid array to int
+			$owner_guid = implode(",", $owner_guid);
+			$where[] = "e.owner_guid in ({$owner_guid})";
+		}
+		if (is_null($container_guid)) {
+			$container_guid = $owner_array;
+		}
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if (!is_null($container_guid)) {
+		if (is_array($container_guid)) {
+			foreach ($container_guid as $key => $val) {
+				$container_guid[$key] = (int) $val;
+			}
+			$where[] = "e.container_guid in (" . implode(",", $container_guid) . ")";
+		} else {
+			$container_guid = (int) $container_guid;
+			$where[] = "e.container_guid = {$container_guid}";
+		}
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+
+	if (!$count) {
+		$query = "SELECT e.* from {$CONFIG->dbprefix}entities e $cal_join where ";
+	} else {
+		$query = "SELECT count(e.guid) as total from {$CONFIG->dbprefix}entities e $cal_join where ";
+	}
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	$query .= get_access_sql_suffix('e'); // Add access controls
+
+	if (!$count) {
+		$query .= " order by n.calendar_start $order_by";
+		// Add order and limit
+		if ($limit) {
+			$query .= " limit $offset, $limit";
+		}
+		$dt = get_data($query, "entity_row_to_elggstar");
+
+		return $dt;
+	} else {
+		$total = get_data_row($query);
+		return $total->total;
+	}
+}
+
+/**
+ * Return the notable entities for a given time period based on an item of metadata.
+ *
+ * @param int    $start_time     The start time as a unix timestamp.
+ * @param int    $end_time       The end time as a unix timestamp.
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param bool   $count          If true, returns count instead of entities. (Default: false)
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ * @access private
+ * @deprecated 1.9
+ */
+function get_notable_entities_from_metadata($start_time, $end_time, $meta_name, $meta_value = "",
+$entity_type = "", $entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "",
+$site_guid = 0, $count = false) {
+	elgg_deprecated_notice('get_notable_entities_from_metadata() has been deprecated', 1.9);
+
+	global $CONFIG;
+
+	$meta_n = get_metastring_id($meta_name);
+	$meta_v = get_metastring_id($meta_value);
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$entity_type = sanitise_string($entity_type);
+	$entity_subtype = get_subtype_id($entity_type, $entity_subtype);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	if ($order_by == "") {
+		$order_by = "e.time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$site_guid = (int) $site_guid;
+	if ((is_array($owner_guid) && (count($owner_guid)))) {
+		foreach ($owner_guid as $key => $guid) {
+			$owner_guid[$key] = (int) $guid;
+		}
+	} else {
+		$owner_guid = (int) $owner_guid;
+	}
+
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	//$access = get_access_list();
+
+	$where = array();
+
+	if ($entity_type != "") {
+		$where[] = "e.type='$entity_type'";
+	}
+
+	if ($entity_subtype) {
+		$where[] = "e.subtype=$entity_subtype";
+	}
+
+	if ($meta_name != "") {
+		$where[] = "m.name_id='$meta_n'";
+	}
+
+	if ($meta_value != "") {
+		$where[] = "m.value_id='$meta_v'";
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	if (is_array($owner_guid)) {
+		$where[] = "e.container_guid in (" . implode(",", $owner_guid) . ")";
+	} else if ($owner_guid > 0) {
+		$where[] = "e.container_guid = {$owner_guid}";
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+	if (!$count) {
+		$query = "SELECT distinct e.* ";
+	} else {
+		$query = "SELECT count(distinct e.guid) as total ";
+	}
+
+	$query .= "from {$CONFIG->dbprefix}entities e"
+	. " JOIN {$CONFIG->dbprefix}metadata m on e.guid = m.entity_guid $cal_join where";
+
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix("e");
+	$query .= ' and ' . get_access_sql_suffix("m");
+
+	if (!$count) {
+		// Add order and limit
+		$query .= " order by $order_by limit $offset, $limit";
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($row = get_data_row($query)) {
+			return $row->total;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Return the notable entities for a given time period based on their relationship.
+ *
+ * @param int     $start_time           The start time as a unix timestamp.
+ * @param int     $end_time             The end time as a unix timestamp.
+ * @param string  $relationship         The relationship eg "friends_of"
+ * @param int     $relationship_guid    The guid of the entity to use query
+ * @param bool    $inverse_relationship Reverse the normal function of the query to say
+ *                                      "give me all entities for whom $relationship_guid is a
+ *                                      $relationship of"
+ * @param string  $type                 Entity type
+ * @param string  $subtype              Entity subtype
+ * @param int     $owner_guid           Owner GUID
+ * @param string  $order_by             Optional Order by
+ * @param int     $limit                Limit
+ * @param int     $offset               Offset
+ * @param boolean $count                If true returns a count of entities (default false)
+ * @param int     $site_guid            Site to get entities for. Default 0 = current site. -1 = any
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ * @access private
+ * @deprecated 1.9
+ */
+function get_noteable_entities_from_relationship($start_time, $end_time, $relationship,
+$relationship_guid, $inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+	elgg_deprecated_notice('get_noteable_entities_from_relationship() has been deprecated', 1.9);
+
+	global $CONFIG;
+
+	$start_time = (int)$start_time;
+	$end_time = (int)$end_time;
+	$relationship = sanitise_string($relationship);
+	$relationship_guid = (int)$relationship_guid;
+	$inverse_relationship = (bool)$inverse_relationship;
+	$type = sanitise_string($type);
+	$subtype = get_subtype_id($type, $subtype);
+	$owner_guid = (int)$owner_guid;
+	if ($order_by == "") {
+		$order_by = "time_created desc";
+	}
+	$order_by = sanitise_string($order_by);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+
+	//$access = get_access_list();
+
+	$where = array();
+
+	if ($relationship != "") {
+		$where[] = "r.relationship='$relationship'";
+	}
+	if ($relationship_guid) {
+		$where[] = $inverse_relationship ?
+			"r.guid_two='$relationship_guid'" : "r.guid_one='$relationship_guid'";
+	}
+	if ($type != "") {
+		$where[] = "e.type='$type'";
+	}
+	if ($subtype) {
+		$where[] = "e.subtype=$subtype";
+	}
+	if ($owner_guid != "") {
+		$where[] = "e.container_guid='$owner_guid'";
+	}
+	if ($site_guid > 0) {
+		$where[] = "e.site_guid = {$site_guid}";
+	}
+
+	// Add the calendar stuff
+	$cal_join = "
+		JOIN {$CONFIG->dbprefix}metadata cal_start on e.guid=cal_start.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_name on cal_start.name_id=cal_start_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_start_value on cal_start.value_id=cal_start_value.id
+
+		JOIN {$CONFIG->dbprefix}metadata cal_end on e.guid=cal_end.entity_guid
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_name on cal_end.name_id=cal_end_name.id
+		JOIN {$CONFIG->dbprefix}metastrings cal_end_value on cal_end.value_id=cal_end_value.id
+	";
+	$where[] = "cal_start_name.string='calendar_start'";
+	$where[] = "cal_start_value.string>=$start_time";
+	$where[] = "cal_end_name.string='calendar_end'";
+	$where[] = "cal_end_value.string <= $end_time";
+
+	// Select what we're joining based on the options
+	$joinon = "e.guid = r.guid_one";
+	if (!$inverse_relationship) {
+		$joinon = "e.guid = r.guid_two";
+	}
+
+	if ($count) {
+		$query = "SELECT count(distinct e.guid) as total ";
+	} else {
+		$query = "SELECT distinct e.* ";
+	}
+	$query .= " from {$CONFIG->dbprefix}entity_relationships r"
+	. " JOIN {$CONFIG->dbprefix}entities e on $joinon $cal_join where ";
+
+	foreach ($where as $w) {
+		$query .= " $w and ";
+	}
+	// Add access controls
+	$query .= get_access_sql_suffix("e");
+	if (!$count) {
+		$query .= " order by $order_by limit $offset, $limit"; // Add order and limit
+		return get_data($query, "entity_row_to_elggstar");
+	} else {
+		if ($count = get_data_row($query)) {
+			return $count->total;
+		}
+	}
+	return false;
+}
+
+/**
+ * Get all entities for today.
+ *
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param string  $order_by       The field to order by; by default, time_created desc
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param int     $offset         The indexing offset, 0 by default
+ * @param boolean $count          If true returns a count of entities (default false)
+ * @param int     $site_guid      Site to get entities for. Default 0 = current site. -1 = any
+ * @param mixed   $container_guid Container(s) to get entities from (default: any).
+ *
+ * @return array|false
+ * @access private
+ * @deprecated 1.9
+ */
+function get_todays_entities($type = "", $subtype = "", $owner_guid = 0, $order_by = "",
+$limit = 10, $offset = 0, $count = false, $site_guid = 0, $container_guid = null) {
+	elgg_deprecated_notice('get_todays_entities() has been deprecated', 1.9);
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities($day_start, $day_end, $type, $subtype, $owner_guid, $order_by,
+		$limit, $offset, $count, $site_guid, $container_guid);
+}
+
+/**
+ * Get entities for today from metadata.
+ *
+ * @param mixed  $meta_name      Metadata name
+ * @param mixed  $meta_value     Metadata value
+ * @param string $entity_type    The type of entity to look for, eg 'site' or 'object'
+ * @param string $entity_subtype The subtype of the entity.
+ * @param int    $owner_guid     Owner GUID
+ * @param int    $limit          Limit
+ * @param int    $offset         Offset
+ * @param string $order_by       Optional ordering.
+ * @param int    $site_guid      Site to get entities for. Default 0 = current site. -1 = any.
+ * @param bool   $count          If true, returns count instead of entities. (Default: false)
+ *
+ * @return int|array A list of entities, or a count if $count is set to true
+ * @access private
+ * @deprecated 1.9
+ */
+function get_todays_entities_from_metadata($meta_name, $meta_value = "", $entity_type = "",
+$entity_subtype = "", $owner_guid = 0, $limit = 10, $offset = 0, $order_by = "", $site_guid = 0,
+$count = false) {
+	elgg_deprecated_notice('get_todays_entities_from_metadata() has been deprecated', 1.9);
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities_from_metadata($day_start, $day_end, $meta_name, $meta_value,
+		$entity_type, $entity_subtype, $owner_guid, $limit, $offset, $order_by, $site_guid, $count);
+}
+
+/**
+ * Get entities for today from a relationship
+ *
+ * @param string  $relationship         The relationship eg "friends_of"
+ * @param int     $relationship_guid    The guid of the entity to use query
+ * @param bool    $inverse_relationship Reverse the normal function of the query to say
+ *                                      "give me all entities for whom $relationship_guid is a
+ *                                      $relationship of"
+ * @param string  $type                 Entity type
+ * @param string  $subtype              Entity subtype
+ * @param int     $owner_guid           Owner GUID
+ * @param string  $order_by             Optional Order by
+ * @param int     $limit                Limit
+ * @param int     $offset               Offset
+ * @param boolean $count                If true returns a count of entities (default false)
+ * @param int     $site_guid            Site to get entities for. Default 0 = current site. -1 = any
+ *
+ * @return array|int|false An array of entities, or the number of entities, or false on failure
+ * @access private
+ * @deprecated 1.9
+ */
+function get_todays_entities_from_relationship($relationship, $relationship_guid,
+$inverse_relationship = false, $type = "", $subtype = "", $owner_guid = 0,
+$order_by = "", $limit = 10, $offset = 0, $count = false, $site_guid = 0) {
+	elgg_deprecated_notice('get_todays_entities_from_relationship() has been deprecated', 1.9);
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return get_notable_entities_from_relationship($day_start, $day_end, $relationship,
+		$relationship_guid,	$inverse_relationship, $type, $subtype, $owner_guid, $order_by,
+		$limit, $offset, $count, $site_guid);
+}
+
+/**
+ * Returns a viewable list of entities for a given time period.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param int     $start_time     The start time as a unix timestamp.
+ * @param int     $end_time       The end time as a unix timestamp.
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param boolean $fullview       Whether or not to display the full view (default: true)
+ * @param boolean $listtypetoggle Whether or not to allow gallery view
+ * @param boolean $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @access private
+ * @deprecated 1.9
+ */
+function list_notable_entities($start_time, $end_time, $type= "", $subtype = "", $owner_guid = 0,
+$limit = 10, $fullview = true, $listtypetoggle = false, $navigation = true) {
+	elgg_deprecated_notice('list_notable_entities() has been deprecated', 1.9);
+
+	$offset = (int) get_input('offset');
+	$count = get_notable_entities($start_time, $end_time, $type, $subtype,
+		$owner_guid, "", $limit, $offset, true);
+
+	$entities = get_notable_entities($start_time, $end_time, $type, $subtype,
+		$owner_guid, "", $limit, $offset);
+
+	return elgg_view_entity_list($entities, $count, $offset, $limit,
+		$fullview, $listtypetoggle, $navigation);
+}
+
+/**
+ * Return a list of today's entities.
+ *
+ * @see list_notable_entities
+ *
+ * @param string  $type           The type of entity (eg "user", "object" etc)
+ * @param string  $subtype        The arbitrary subtype of the entity
+ * @param int     $owner_guid     The GUID of the owning user
+ * @param int     $limit          The number of entities to return; 10 by default
+ * @param boolean $fullview       Whether or not to display the full view (default: true)
+ * @param boolean $listtypetoggle Whether or not to allow gallery view
+ * @param boolean $navigation     Display pagination? Default: true
+ *
+ * @return string A viewable list of entities
+ * @access private
+ * @deprecated 1.9
+ */
+function list_todays_entities($type= "", $subtype = "", $owner_guid = 0, $limit = 10,
+$fullview = true, $listtypetoggle = false, $navigation = true) {
+	elgg_deprecated_notice('list_todays_entities() has been deprecated', 1.9);
+
+	$day_start = get_day_start();
+	$day_end = get_day_end();
+
+	return list_notable_entities($day_start, $day_end, $type, $subtype, $owner_guid, $limit,
+		$fullview, $listtypetoggle, $navigation);
+}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
new file mode 100644
index 000000000..34111c69d
--- /dev/null
+++ b/engine/lib/elgglib.php
@@ -0,0 +1,2304 @@
+<?php
+/**
+ * Bootstrapping and helper procedural code available for use in Elgg core and plugins.
+ *
+ * @package Elgg.Core
+ * @todo These functions can't be subpackaged because they cover a wide mix of
+ * purposes and subsystems.  Many of them should be moved to more relevant files.
+ */
+
+// prep core classes to be autoloadable
+spl_autoload_register('_elgg_autoload');
+elgg_register_classes(dirname(dirname(__FILE__)) . '/classes');
+
+/**
+ * Autoload classes
+ *
+ * @param string $class The name of the class
+ *
+ * @return void
+ * @throws Exception
+ * @access private
+ */
+function _elgg_autoload($class) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->classes[$class]) || !include($CONFIG->classes[$class])) {
+		return false;
+	}
+}
+
+/**
+ * Register all files found in $dir as classes
+ * Need to be named MyClass.php
+ *
+ * @param string $dir The dir to look in
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_register_classes($dir) {
+	$classes = elgg_get_file_list($dir, array(), array(), array('.php'));
+
+	foreach ($classes as $class) {
+		elgg_register_class(basename($class, '.php'), $class);
+	}
+}
+
+/**
+ * Register a classname to a file.
+ *
+ * @param string $class    The name of the class
+ * @param string $location The location of the file
+ *
+ * @return true
+ * @since 1.8.0
+ */
+function elgg_register_class($class, $location) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->classes)) {
+		$CONFIG->classes = array();
+	}
+
+	$CONFIG->classes[$class] = $location;
+
+	return true;
+}
+
+/**
+ * Register a php library.
+ *
+ * @param string $name     The name of the library
+ * @param string $location The location of the file
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_register_library($name, $location) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->libraries)) {
+		$CONFIG->libraries = array();
+	}
+
+	$CONFIG->libraries[$name] = $location;
+}
+
+/**
+ * Load a php library.
+ *
+ * @param string $name The name of the library
+ *
+ * @return void
+ * @throws InvalidParameterException
+ * @since 1.8.0
+ * @todo return boolean in 1.9 to indicate whether the library has been loaded
+ */
+function elgg_load_library($name) {
+	global $CONFIG;
+
+	static $loaded_libraries = array();
+
+	if (in_array($name, $loaded_libraries)) {
+		return;
+	}
+
+	if (!isset($CONFIG->libraries)) {
+		$CONFIG->libraries = array();
+	}
+
+	if (!isset($CONFIG->libraries[$name])) {
+		$error = elgg_echo('InvalidParameterException:LibraryNotRegistered', array($name));
+		throw new InvalidParameterException($error);
+	}
+
+	if (!include_once($CONFIG->libraries[$name])) {
+		$error = elgg_echo('InvalidParameterException:LibraryNotFound', array(
+			$name,
+			$CONFIG->libraries[$name])
+		);
+		throw new InvalidParameterException($error);
+	}
+
+	$loaded_libraries[] = $name;
+}
+
+/**
+ * Forward to $location.
+ *
+ * Sends a 'Location: $location' header and exists.  If headers have
+ * already been sent, returns FALSE.
+ *
+ * @param string $location URL to forward to browser to. Can be path relative to the network's URL.
+ * @param string $reason   Short explanation for why we're forwarding
+ *
+ * @return false False if headers have been sent. Terminates execution if forwarding.
+ * @throws SecurityException
+ */
+function forward($location = "", $reason = 'system') {
+	if (!headers_sent($file, $line)) {
+		if ($location === REFERER) {
+			$location = $_SERVER['HTTP_REFERER'];
+		}
+
+		$location = elgg_normalize_url($location);
+
+		// return new forward location or false to stop the forward or empty string to exit
+		$current_page = current_page_url();
+		$params = array('current_url' => $current_page, 'forward_url' => $location);
+		$location = elgg_trigger_plugin_hook('forward', $reason, $params, $location);
+
+		if ($location) {
+			header("Location: {$location}");
+			exit;
+		} else if ($location === '') {
+			exit;
+		}
+	} else {
+		throw new SecurityException(elgg_echo('SecurityException:ForwardFailedToRedirect', array($file, $line)));
+	}
+}
+
+/**
+ * Register a JavaScript file for inclusion
+ *
+ * This function handles adding JavaScript to a web page. If multiple
+ * calls are made to register the same JavaScript file based on the $id
+ * variable, only the last file is included. This allows a plugin to add
+ * JavaScript from a view that may be called more than once. It also handles
+ * more than one plugin adding the same JavaScript.
+ *
+ * jQuery plugins often have filenames such as jquery.rating.js. A best practice
+ * is to base $name on the filename: "jquery.rating". It is recommended to not
+ * use version numbers in the name.
+ *
+ * The JavaScript files can be local to the server or remote (such as
+ * Google's CDN).
+ *
+ * @param string $name     An identifier for the JavaScript library
+ * @param string $url      URL of the JavaScript file
+ * @param string $location Page location: head or footer. (default: head)
+ * @param int    $priority Priority of the JS file (lower numbers load earlier)
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_js($name, $url, $location = 'head', $priority = null) {
+	return elgg_register_external_file('js', $name, $url, $location, $priority);
+}
+
+/**
+ * Unregister a JavaScript file
+ *
+ * @param string $name The identifier for the JavaScript library
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unregister_js($name) {
+	return elgg_unregister_external_file('js', $name);
+}
+
+/**
+ * Load a JavaScript resource on this page
+ *
+ * This must be called before elgg_view_page(). It can be called before the
+ * script is registered. If you do not want a script loaded, unregister it.
+ *
+ * @param string $name Identifier of the JavaScript resource
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_load_js($name) {
+	elgg_load_external_file('js', $name);
+}
+
+/**
+ * Get the JavaScript URLs that are loaded
+ *
+ * @param string $location 'head' or 'footer'
+ *
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_loaded_js($location = 'head') {
+	return elgg_get_loaded_external_files('js', $location);
+}
+
+/**
+ * Register a CSS file for inclusion in the HTML head
+ *
+ * @param string $name     An identifier for the CSS file
+ * @param string $url      URL of the CSS file
+ * @param int    $priority Priority of the CSS file (lower numbers load earlier)
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_css($name, $url, $priority = null) {
+	return elgg_register_external_file('css', $name, $url, 'head', $priority);
+}
+
+/**
+ * Unregister a CSS file
+ *
+ * @param string $name The identifier for the CSS file
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unregister_css($name) {
+	return elgg_unregister_external_file('css', $name);
+}
+
+/**
+ * Load a CSS file for this page
+ *
+ * This must be called before elgg_view_page(). It can be called before the
+ * CSS file is registered. If you do not want a CSS file loaded, unregister it.
+ *
+ * @param string $name Identifier of the CSS file
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_load_css($name) {
+	elgg_load_external_file('css', $name);
+}
+
+/**
+ * Get the loaded CSS URLs
+ *
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_loaded_css() {
+	return elgg_get_loaded_external_files('css', 'head');
+}
+
+/**
+ * Core registration function for external files
+ *
+ * @param string $type     Type of external resource (js or css)
+ * @param string $name     Identifier used as key
+ * @param string $url      URL
+ * @param string $location Location in the page to include the file
+ * @param int    $priority Loading priority of the file
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_external_file($type, $name, $url, $location, $priority = 500) {
+	global $CONFIG;
+
+	if (empty($name) || empty($url)) {
+		return false;
+	}
+
+	$url = elgg_format_url($url);
+	$url = elgg_normalize_url($url);
+	
+	elgg_bootstrap_externals_data_structure($type);
+
+	$name = trim(strtolower($name));
+
+	// normalize bogus priorities, but allow empty, null, and false to be defaults.
+	if (!is_numeric($priority)) {
+		$priority = 500;
+	}
+
+	// no negative priorities right now.
+	$priority = max((int)$priority, 0);
+
+	$item = elgg_extract($name, $CONFIG->externals_map[$type]);
+
+	if ($item) {
+		// updating a registered item
+		// don't update loaded because it could already be set
+		$item->url = $url;
+		$item->location = $location;
+
+		// if loaded before registered, that means it hasn't been added to the list yet
+		if ($CONFIG->externals[$type]->contains($item)) {
+			$priority = $CONFIG->externals[$type]->move($item, $priority);
+		} else {
+			$priority = $CONFIG->externals[$type]->add($item, $priority);
+		}
+	} else {
+		$item = new stdClass();
+		$item->loaded = false;
+		$item->url = $url;
+		$item->location = $location;
+
+		$priority = $CONFIG->externals[$type]->add($item, $priority);
+	}
+
+	$CONFIG->externals_map[$type][$name] = $item;
+
+	return $priority !== false;
+}
+
+/**
+ * Unregister an external file
+ *
+ * @param string $type Type of file: js or css
+ * @param string $name The identifier of the file
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unregister_external_file($type, $name) {
+	global $CONFIG;
+
+	elgg_bootstrap_externals_data_structure($type);
+
+	$name = trim(strtolower($name));
+	$item = elgg_extract($name, $CONFIG->externals_map[$type]);
+
+	if ($item) {
+		unset($CONFIG->externals_map[$type][$name]);
+		return $CONFIG->externals[$type]->remove($item);
+	}
+
+	return false;
+}
+
+/**
+ * Load an external resource for use on this page
+ *
+ * @param string $type Type of file: js or css
+ * @param string $name The identifier for the file
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_load_external_file($type, $name) {
+	global $CONFIG;
+
+	elgg_bootstrap_externals_data_structure($type);
+
+	$name = trim(strtolower($name));
+
+	$item = elgg_extract($name, $CONFIG->externals_map[$type]);
+
+	if ($item) {
+		// update a registered item
+		$item->loaded = true;
+	} else {
+		$item = new stdClass();
+		$item->loaded = true;
+		$item->url = '';
+		$item->location = '';
+
+		$CONFIG->externals[$type]->add($item);
+		$CONFIG->externals_map[$type][$name] = $item;
+	}
+}
+
+/**
+ * Get external resource descriptors
+ *
+ * @param string $type     Type of file: js or css
+ * @param string $location Page location
+ *
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_loaded_external_files($type, $location) {
+	global $CONFIG;
+
+	if (isset($CONFIG->externals) && $CONFIG->externals[$type] instanceof ElggPriorityList) {
+		$items = $CONFIG->externals[$type]->getElements();
+
+		$callback = "return \$v->loaded == true && \$v->location == '$location';";
+		$items = array_filter($items, create_function('$v', $callback));
+		if ($items) {
+			array_walk($items, create_function('&$v,$k', '$v = $v->url;'));
+		}
+		return $items;
+	}
+	return array();
+}
+
+/**
+ * Bootstraps the externals data structure in $CONFIG.
+ *
+ * @param string $type The type of external, js or css.
+ * @access private
+ */
+function elgg_bootstrap_externals_data_structure($type) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->externals)) {
+		$CONFIG->externals = array();
+	}
+
+	if (!isset($CONFIG->externals[$type]) || !$CONFIG->externals[$type] instanceof ElggPriorityList) {
+		$CONFIG->externals[$type] = new ElggPriorityList();
+	}
+
+	if (!isset($CONFIG->externals_map)) {
+		$CONFIG->externals_map = array();
+	}
+
+	if (!isset($CONFIG->externals_map[$type])) {
+		$CONFIG->externals_map[$type] = array();
+	}
+}
+
+/**
+ * Returns a list of files in $directory.
+ *
+ * Only returns files.  Does not recurse into subdirs.
+ *
+ * @param string $directory  Directory to look in
+ * @param array  $exceptions Array of filenames to ignore
+ * @param array  $list       Array of files to append to
+ * @param mixed  $extensions Array of extensions to allow, NULL for all. Use a dot: array('.php').
+ *
+ * @return array Filenames in $directory, in the form $directory/filename.
+ */
+function elgg_get_file_list($directory, $exceptions = array(), $list = array(),
+$extensions = NULL) {
+
+	$directory = sanitise_filepath($directory);
+	if ($handle = opendir($directory)) {
+		while (($file = readdir($handle)) !== FALSE) {
+			if (!is_file($directory . $file) || in_array($file, $exceptions)) {
+				continue;
+			}
+
+			if (is_array($extensions)) {
+				if (in_array(strrchr($file, '.'), $extensions)) {
+					$list[] = $directory . $file;
+				}
+			} else {
+				$list[] = $directory . $file;
+			}
+		}
+		closedir($handle);
+	}
+
+	return $list;
+}
+
+/**
+ * Sanitise file paths ensuring that they begin and end with slashes etc.
+ *
+ * @param string $path         The path
+ * @param bool   $append_slash Add tailing slash
+ *
+ * @return string
+ */
+function sanitise_filepath($path, $append_slash = TRUE) {
+	// Convert to correct UNIX paths
+	$path = str_replace('\\', '/', $path);
+	$path = str_replace('../', '/', $path);
+	// replace // with / except when preceeded by :
+	$path = preg_replace("/([^:])\/\//", "$1/", $path);
+
+	// Sort trailing slash
+	$path = trim($path);
+	// rtrim defaults plus /
+	$path = rtrim($path, " \n\t\0\x0B/");
+
+	if ($append_slash) {
+		$path = $path . '/';
+	}
+
+	return $path;
+}
+
+/**
+ * Queues a message to be displayed.
+ *
+ * Messages will not be displayed immediately, but are stored in
+ * for later display, usually upon next page load.
+ *
+ * The method of displaying these messages differs depending upon plugins and
+ * viewtypes.  The core default viewtype retrieves messages in
+ * {@link views/default/page/shells/default.php} and displays messages as
+ * javascript popups.
+ *
+ * @internal Messages are stored as strings in the $_SESSION['msg'][$register] array.
+ *
+ * @warning This function is used to both add to and clear the message
+ * stack.  If $messages is null, $register will be returned and cleared.
+ * If $messages is null and $register is empty, all messages will be
+ * returned and removed.
+ *
+ * @important This function handles the standard {@link system_message()} ($register =
+ * 'messages') as well as {@link register_error()} messages ($register = 'errors').
+ *
+ * @param mixed  $message  Optionally, a single message or array of messages to add, (default: null)
+ * @param string $register Types of message: "error", "success" (default: success)
+ * @param bool   $count    Count the number of messages (default: false)
+ *
+ * @return bool|array Either the array of messages, or a response regarding
+ *                          whether the message addition was successful.
+ * @todo Clean up. Separate registering messages and retrieving them.
+ */
+function system_messages($message = null, $register = "success", $count = false) {
+	if (!isset($_SESSION['msg'])) {
+		$_SESSION['msg'] = array();
+	}
+	if (!isset($_SESSION['msg'][$register]) && !empty($register)) {
+		$_SESSION['msg'][$register] = array();
+	}
+	if (!$count) {
+		if (!empty($message) && is_array($message)) {
+			$_SESSION['msg'][$register] = array_merge($_SESSION['msg'][$register], $message);
+			return true;
+		} else if (!empty($message) && is_string($message)) {
+			$_SESSION['msg'][$register][] = $message;
+			return true;
+		} else if (is_null($message)) {
+			if ($register != "") {
+				$returnarray = array();
+				$returnarray[$register] = $_SESSION['msg'][$register];
+				$_SESSION['msg'][$register] = array();
+			} else {
+				$returnarray = $_SESSION['msg'];
+				$_SESSION['msg'] = array();
+			}
+			return $returnarray;
+		}
+	} else {
+		if (!empty($register)) {
+			return sizeof($_SESSION['msg'][$register]);
+		} else {
+			$count = 0;
+			foreach ($_SESSION['msg'] as $submessages) {
+				$count += sizeof($submessages);
+			}
+			return $count;
+		}
+	}
+	return false;
+}
+
+/**
+ * Counts the number of messages, either globally or in a particular register
+ *
+ * @param string $register Optionally, the register
+ *
+ * @return integer The number of messages
+ */
+function count_messages($register = "") {
+	return system_messages(null, $register, true);
+}
+
+/**
+ * Display a system message on next page load.
+ *
+ * @see system_messages()
+ *
+ * @param string|array $message Message or messages to add
+ *
+ * @return bool
+ */
+function system_message($message) {
+	return system_messages($message, "success");
+}
+
+/**
+ * Display an error on next page load.
+ *
+ * @see system_messages()
+ *
+ * @param string|array $error Error or errors to add
+ *
+ * @return bool
+ */
+function register_error($error) {
+	return system_messages($error, "error");
+}
+
+/**
+ * Register a callback as an Elgg event handler.
+ *
+ * Events are emitted by Elgg when certain actions occur.  Plugins
+ * can respond to these events or halt them completely by registering a handler
+ * as a callback to an event.  Multiple handlers can be registered for
+ * the same event and will be executed in order of $priority.  Any handler
+ * returning false will halt the execution chain.
+ *
+ * This function is called with the event name, event type, and handler callback name.
+ * Setting the optional $priority allows plugin authors to specify when the
+ * callback should be run.  Priorities for plugins should be 1-1000.
+ *
+ * The callback is passed 3 arguments when called: $event, $type, and optional $params.
+ *
+ * $event is the name of event being emitted.
+ * $type is the type of event or object concerned.
+ * $params is an optional parameter passed that can include a related object.  See
+ * specific event documentation for details on which events pass what parameteres.
+ *
+ * @tip If a priority isn't specified it is determined by the order the handler was
+ * registered relative to the event and type.  For plugins, this generally means
+ * the earlier the plugin is in the load order, the earlier the priorities are for
+ * any event handlers.
+ *
+ * @tip $event and $object_type can use the special keyword 'all'.  Handler callbacks registered
+ * with $event = all will be called for all events of type $object_type.  Similarly,
+ * callbacks registered with $object_type = all will be called for all events of type
+ * $event, regardless of $object_type.  If $event and $object_type both are 'all', the
+ * handler callback will be called for all events.
+ *
+ * @tip Event handler callbacks are considered in the follow order:
+ *  - Specific registration where 'all' isn't used.
+ *  - Registration where 'all' is used for $event only.
+ *  - Registration where 'all' is used for $type only.
+ *  - Registration where 'all' is used for both.
+ *
+ * @warning If you use the 'all' keyword, you must have logic in the handler callback to
+ * test the passed parameters before taking an action.
+ *
+ * @tip When referring to events, the preferred syntax is "event, type".
+ *
+ * @internal Events are stored in $CONFIG->events as:
+ * <code>
+ * $CONFIG->events[$event][$type][$priority] = $callback;
+ * </code>
+ *
+ * @param string $event       The event type
+ * @param string $object_type The object type
+ * @param string $callback    The handler callback
+ * @param int    $priority    The priority - 0 is default, negative before, positive after
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Tutorials/Plugins/Events
+ * @example events/basic.php    Basic example of registering an event handler callback.
+ * @example events/advanced.php Advanced example of registering an event handler
+ *                              callback and halting execution.
+ * @example events/all.php      Example of how to use the 'all' keyword.
+ */
+function elgg_register_event_handler($event, $object_type, $callback, $priority = 500) {
+	global $CONFIG;
+
+	if (empty($event) || empty($object_type)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->events)) {
+		$CONFIG->events = array();
+	}
+	if (!isset($CONFIG->events[$event])) {
+		$CONFIG->events[$event] = array();
+	}
+	if (!isset($CONFIG->events[$event][$object_type])) {
+		$CONFIG->events[$event][$object_type] = array();
+	}
+
+	if (!is_callable($callback, true)) {
+		return false;
+	}
+
+	$priority = max((int) $priority, 0);
+
+	while (isset($CONFIG->events[$event][$object_type][$priority])) {
+		$priority++;
+	}
+	$CONFIG->events[$event][$object_type][$priority] = $callback;
+	ksort($CONFIG->events[$event][$object_type]);
+	return true;
+}
+
+/**
+ * Unregisters a callback for an event.
+ *
+ * @param string $event       The event type
+ * @param string $object_type The object type
+ * @param string $callback    The callback
+ *
+ * @return void
+ * @since 1.7
+ */
+function elgg_unregister_event_handler($event, $object_type, $callback) {
+	global $CONFIG;
+
+	if (isset($CONFIG->events[$event]) && isset($CONFIG->events[$event][$object_type])) {
+		foreach ($CONFIG->events[$event][$object_type] as $key => $event_callback) {
+			if ($event_callback == $callback) {
+				unset($CONFIG->events[$event][$object_type][$key]);
+			}
+		}
+	}
+}
+
+/**
+ * Trigger an Elgg Event and run all handler callbacks registered to that event, type.
+ *
+ * This function runs all handlers registered to $event, $object_type or
+ * the special keyword 'all' for either or both.
+ *
+ * $event is usually a verb: create, update, delete, annotation.
+ *
+ * $object_type is usually a noun: object, group, user, annotation, relationship, metadata.
+ *
+ * $object is usually an Elgg* object assciated with the event.
+ *
+ * @warning Elgg events should only be triggered by core.  Plugin authors should use
+ * {@link trigger_elgg_plugin_hook()} instead.
+ *
+ * @tip When referring to events, the preferred syntax is "event, type".
+ *
+ * @internal Only rarely should events be changed, added, or removed in core.
+ * When making changes to events, be sure to first create a ticket on Github.
+ *
+ * @internal @tip Think of $object_type as the primary namespace element, and
+ * $event as the secondary namespace.
+ *
+ * @param string $event       The event type
+ * @param string $object_type The object type
+ * @param string $object      The object involved in the event
+ *
+ * @return bool The result of running all handler callbacks.
+ * @link http://docs.elgg.org/Tutorials/Core/Events
+ * @internal @example events/emit.php Basic emitting of an Elgg event.
+ */
+function elgg_trigger_event($event, $object_type, $object = null) {
+	global $CONFIG;
+
+	$events = array();
+	if (isset($CONFIG->events[$event][$object_type])) {
+		$events[] = $CONFIG->events[$event][$object_type];
+	}
+	if (isset($CONFIG->events['all'][$object_type])) {
+		$events[] = $CONFIG->events['all'][$object_type];
+	}
+	if (isset($CONFIG->events[$event]['all'])) {
+		$events[] = $CONFIG->events[$event]['all'];
+	}
+	if (isset($CONFIG->events['all']['all'])) {
+		$events[] = $CONFIG->events['all']['all'];
+	}
+
+	$args = array($event, $object_type, $object);
+
+	foreach ($events as $callback_list) {
+		if (is_array($callback_list)) {
+			foreach ($callback_list as $callback) {
+				if (is_callable($callback) && (call_user_func_array($callback, $args) === false)) {
+					return false;
+				}
+			}
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Register a callback as a plugin hook handler.
+ *
+ * Plugin hooks allow developers to losely couple plugins and features by
+ * repsonding to and emitting {@link elgg_trigger_plugin_hook()} customizable hooks.
+ * Handler callbacks can respond to the hook, change the details of the hook, or
+ * ignore it.
+ *
+ * Multiple handlers can be registered for a plugin hook, and each callback
+ * is called in order of priority.  If the return value of a handler is not
+ * null, that value is passed to the next callback in the call stack.  When all
+ * callbacks have been run, the final value is passed back to the caller
+ * via {@link elgg_trigger_plugin_hook()}.
+ *
+ * Similar to Elgg Events, plugin hook handler callbacks are registered by passing
+ * a hook, a type, and a priority.
+ *
+ * The callback is passed 4 arguments when called: $hook, $type, $value, and $params.
+ *
+ *  - str $hook The name of the hook.
+ *  - str $type The type of hook.
+ *  - mixed $value The return value of the last handler or the default
+ *  value if no other handlers have been called.
+ *  - mixed $params An optional array of parameters.  Used to provide additional
+ *  information to plugins.
+ *
+ * @internal Plugin hooks are stored in $CONFIG->hooks as:
+ * <code>
+ * $CONFIG->hooks[$hook][$type][$priority] = $callback;
+ * </code>
+ *
+ * @tip Plugin hooks are similar to Elgg Events in that Elgg emits
+ * a plugin hook when certain actions occur, but a plugin hook allows you to alter the
+ * parameters, as well as halt execution.
+ *
+ * @tip If a priority isn't specified it is determined by the order the handler was
+ * registered relative to the event and type.  For plugins, this generally means
+ * the earlier the plugin is in the load order, the earlier the priorities are for
+ * any event handlers.
+ *
+ * @tip Like Elgg Events, $hook and $type can use the special keyword 'all'.
+ * Handler callbacks registered with $hook = all will be called for all hooks
+ * of type $type.  Similarly, handlers registered with $type = all will be
+ * called for all hooks of type $event, regardless of $object_type.  If $hook
+ * and $type both are 'all', the handler will be called for all hooks.
+ *
+ * @tip Plugin hooks are sometimes used to gather lists from plugins.  This is
+ * usually done by pushing elements into an array passed in $params.  Be sure
+ * to append to and then return $value so you don't overwrite other plugin's
+ * values.
+ *
+ * @warning Unlike Elgg Events, a handler that returns false will NOT halt the
+ * execution chain.
+ *
+ * @param string   $hook     The name of the hook
+ * @param string   $type     The type of the hook
+ * @param callable $callback The name of a valid function or an array with object and method
+ * @param int      $priority The priority - 500 is default, lower numbers called first
+ *
+ * @return bool
+ *
+ * @example hooks/register/basic.php Registering for a plugin hook and examining the variables.
+ * @example hooks/register/advanced.php Registering for a plugin hook and changing the params.
+ * @link http://docs.elgg.org/Tutorials/Plugins/Hooks
+ * @since 1.8.0
+ */
+function elgg_register_plugin_hook_handler($hook, $type, $callback, $priority = 500) {
+	global $CONFIG;
+
+	if (empty($hook) || empty($type)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->hooks)) {
+		$CONFIG->hooks = array();
+	}
+	if (!isset($CONFIG->hooks[$hook])) {
+		$CONFIG->hooks[$hook] = array();
+	}
+	if (!isset($CONFIG->hooks[$hook][$type])) {
+		$CONFIG->hooks[$hook][$type] = array();
+	}
+
+	if (!is_callable($callback, true)) {
+		return false;
+	}
+
+	$priority = max((int) $priority, 0);
+
+	while (isset($CONFIG->hooks[$hook][$type][$priority])) {
+		$priority++;
+	}
+	$CONFIG->hooks[$hook][$type][$priority] = $callback;
+	ksort($CONFIG->hooks[$hook][$type]);
+	return true;
+}
+
+/**
+ * Unregister a callback as a plugin hook.
+ *
+ * @param string   $hook        The name of the hook
+ * @param string   $entity_type The name of the type of entity (eg "user", "object" etc)
+ * @param callable $callback    The PHP callback to be removed
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_unregister_plugin_hook_handler($hook, $entity_type, $callback) {
+	global $CONFIG;
+
+	if (isset($CONFIG->hooks[$hook]) && isset($CONFIG->hooks[$hook][$entity_type])) {
+		foreach ($CONFIG->hooks[$hook][$entity_type] as $key => $hook_callback) {
+			if ($hook_callback == $callback) {
+				unset($CONFIG->hooks[$hook][$entity_type][$key]);
+			}
+		}
+	}
+}
+
+/**
+ * Trigger a Plugin Hook and run all handler callbacks registered to that hook:type.
+ *
+ * This function runs all handlers regsitered to $hook, $type or
+ * the special keyword 'all' for either or both.
+ *
+ * Use $params to send additional information to the handler callbacks.
+ *
+ * $returnvalue Is the initial value to pass to the handlers, which can
+ * then change it.  It is useful to use $returnvalue to set defaults.
+ * If no handlers are registered, $returnvalue is immediately returned.
+ *
+ * $hook is usually a verb: import, get_views, output.
+ *
+ * $type is usually a noun: user, ecml, page.
+ *
+ * @tip Like Elgg Events, $hook and $type can use the special keyword 'all'.
+ * Handler callbacks registered with $hook = all will be called for all hooks
+ * of type $type.  Similarly, handlers registered with $type = all will be
+ * called for all hooks of type $event, regardless of $object_type.  If $hook
+ * and $type both are 'all', the handler will be called for all hooks.
+ *
+ * @internal The checks for $hook and/or $type not being equal to 'all' is to
+ * prevent a plugin hook being registered with an 'all' being called more than
+ * once if the trigger occurs with an 'all'. An example in core of this is in
+ * actions.php:
+ * elgg_trigger_plugin_hook('action_gatekeeper:permissions:check', 'all', ...)
+ *
+ * @see elgg_register_plugin_hook_handler()
+ *
+ * @param string $hook        The name of the hook to trigger ("all" will
+ *                            trigger for all $types regardless of $hook value)
+ * @param string $type        The type of the hook to trigger ("all" will
+ *                            trigger for all $hooks regardless of $type value)
+ * @param mixed  $params      Additional parameters to pass to the handlers
+ * @param mixed  $returnvalue An initial return value
+ *
+ * @return mixed|null The return value of the last handler callback called
+ *
+ * @example hooks/trigger/basic.php    Trigger a hook that determins if execution
+ *                                     should continue.
+ * @example hooks/trigger/advanced.php Trigger a hook with a default value and use
+ *                                     the results to populate a menu.
+ * @example hooks/basic.php            Trigger and respond to a basic plugin hook.
+ * @link http://docs.elgg.org/Tutorials/Plugins/Hooks
+ *
+ * @since 1.8.0
+ */
+function elgg_trigger_plugin_hook($hook, $type, $params = null, $returnvalue = null) {
+	global $CONFIG;
+
+	$hooks = array();
+	if (isset($CONFIG->hooks[$hook][$type])) {
+		if ($hook != 'all' && $type != 'all') {
+			$hooks[] = $CONFIG->hooks[$hook][$type];
+		}
+	}
+	if (isset($CONFIG->hooks['all'][$type])) {
+		if ($type != 'all') {
+			$hooks[] = $CONFIG->hooks['all'][$type];
+		}
+	}
+	if (isset($CONFIG->hooks[$hook]['all'])) {
+		if ($hook != 'all') {
+			$hooks[] = $CONFIG->hooks[$hook]['all'];
+		}
+	}
+	if (isset($CONFIG->hooks['all']['all'])) {
+		$hooks[] = $CONFIG->hooks['all']['all'];
+	}
+
+	foreach ($hooks as $callback_list) {
+		if (is_array($callback_list)) {
+			foreach ($callback_list as $hookcallback) {
+				if (is_callable($hookcallback)) {
+					$args = array($hook, $type, $returnvalue, $params);
+					$temp_return_value = call_user_func_array($hookcallback, $args);
+					if (!is_null($temp_return_value)) {
+						$returnvalue = $temp_return_value;
+					}
+				}
+			}
+		}
+	}
+
+	return $returnvalue;
+}
+
+/**
+ * Intercepts, logs, and displays uncaught exceptions.
+ *
+ * @warning This function should never be called directly.
+ *
+ * @see http://www.php.net/set-exception-handler
+ *
+ * @param Exception $exception The exception being handled
+ *
+ * @return void
+ * @access private
+ */
+function _elgg_php_exception_handler($exception) {
+	$timestamp = time();
+	error_log("Exception #$timestamp: $exception");
+
+	// Wipe any existing output buffer
+	ob_end_clean();
+
+	// make sure the error isn't cached
+	header("Cache-Control: no-cache, must-revalidate", true);
+	header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', true);
+	// @note Do not send a 500 header because it is not a server error
+
+	try {
+		// we don't want the 'pagesetup', 'system' event to fire
+		global $CONFIG;
+		$CONFIG->pagesetupdone = true;
+
+		elgg_set_viewtype('failsafe');
+		if (elgg_is_admin_logged_in()) {
+			$body = elgg_view("messages/exceptions/admin_exception", array(
+				'object' => $exception,
+				'ts' => $timestamp
+			));
+		} else {
+			$body = elgg_view("messages/exceptions/exception", array(
+				'object' => $exception,
+				'ts' => $timestamp
+			));
+		}
+		echo elgg_view_page(elgg_echo('exception:title'), $body);
+	} catch (Exception $e) {
+		$timestamp = time();
+		$message = $e->getMessage();
+		echo "Fatal error in exception handler. Check log for Exception #$timestamp";
+		error_log("Exception #$timestamp : fatal error in exception handler : $message");
+	}
+}
+
+/**
+ * Intercepts catchable PHP errors.
+ *
+ * @warning This function should never be called directly.
+ *
+ * @internal
+ * For catchable fatal errors, throws an Exception with the error.
+ *
+ * For non-fatal errors, depending upon the debug settings, either
+ * log the error or ignore it.
+ *
+ * @see http://www.php.net/set-error-handler
+ *
+ * @param int    $errno    The level of the error raised
+ * @param string $errmsg   The error message
+ * @param string $filename The filename the error was raised in
+ * @param int    $linenum  The line number the error was raised at
+ * @param array  $vars     An array that points to the active symbol table where error occurred
+ *
+ * @return true
+ * @throws Exception
+ * @access private
+ * @todo Replace error_log calls with elgg_log calls.
+ */
+function _elgg_php_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
+	$error = date("Y-m-d H:i:s (T)") . ": \"$errmsg\" in file $filename (line $linenum)";
+
+	switch ($errno) {
+		case E_USER_ERROR:
+			error_log("PHP ERROR: $error");
+			register_error("ERROR: $error");
+
+			// Since this is a fatal error, we want to stop any further execution but do so gracefully.
+			throw new Exception($error);
+			break;
+
+		case E_WARNING :
+		case E_USER_WARNING :
+		case E_RECOVERABLE_ERROR: // (e.g. type hint violation)
+			
+			// check if the error wasn't suppressed by the error control operator (@)
+			if (error_reporting()) {
+				error_log("PHP WARNING: $error");
+			}
+			break;
+
+		default:
+			global $CONFIG;
+			if (isset($CONFIG->debug) && $CONFIG->debug === 'NOTICE') {
+				error_log("PHP NOTICE: $error");
+			}
+	}
+
+	return true;
+}
+
+/**
+ * Display or log a message.
+ *
+ * If $level is >= to the debug setting in {@link $CONFIG->debug}, the
+ * message will be sent to {@link elgg_dump()}.  Messages with lower
+ * priority than {@link $CONFIG->debug} are ignored.
+ *
+ * {@link elgg_dump()} outputs all levels but NOTICE to screen by default.
+ *
+ * @note No messages will be displayed unless debugging has been enabled.
+ *
+ * @param string $message User message
+ * @param string $level   NOTICE | WARNING | ERROR | DEBUG
+ *
+ * @return bool
+ * @since 1.7.0
+ * @todo This is complicated and confusing.  Using int constants for debug levels will
+ * make things easier.
+ */
+function elgg_log($message, $level = 'NOTICE') {
+	global $CONFIG;
+
+	// only log when debugging is enabled
+	if (isset($CONFIG->debug)) {
+		// debug to screen or log?
+		$to_screen = !($CONFIG->debug == 'NOTICE');
+
+		switch ($level) {
+			case 'ERROR':
+				// always report
+				elgg_dump("$level: $message", $to_screen, $level);
+				break;
+			case 'WARNING':
+			case 'DEBUG':
+				// report except if user wants only errors
+				if ($CONFIG->debug != 'ERROR') {
+					elgg_dump("$level: $message", $to_screen, $level);
+				}
+				break;
+			case 'NOTICE':
+			default:
+				// only report when lowest level is desired
+				if ($CONFIG->debug == 'NOTICE') {
+					elgg_dump("$level: $message", FALSE, $level);
+				}
+				break;
+		}
+
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Logs or displays $value.
+ *
+ * If $to_screen is true, $value is displayed to screen.  Else,
+ * it is handled by PHP's {@link error_log()} function.
+ *
+ * A {@elgg_plugin_hook debug log} is called.  If a handler returns
+ * false, it will stop the default logging method.
+ *
+ * @param mixed  $value     The value
+ * @param bool   $to_screen Display to screen?
+ * @param string $level     The debug level
+ *
+ * @return void
+ * @since 1.7.0
+ */
+function elgg_dump($value, $to_screen = TRUE, $level = 'NOTICE') {
+	global $CONFIG;
+
+	// plugin can return false to stop the default logging method
+	$params = array(
+		'level' => $level,
+		'msg' => $value,
+		'to_screen' => $to_screen,
+	);
+	if (!elgg_trigger_plugin_hook('debug', 'log', $params, true)) {
+		return;
+	}
+
+	// Do not want to write to screen before page creation has started.
+	// This is not fool-proof but probably fixes 95% of the cases when logging
+	// results in data sent to the browser before the page is begun.
+	if (!isset($CONFIG->pagesetupdone)) {
+		$to_screen = FALSE;
+	}
+
+	// Do not want to write to JS or CSS pages
+	if (elgg_in_context('js') || elgg_in_context('css')) {
+		$to_screen = FALSE;
+	}
+
+	if ($to_screen == TRUE) {
+		echo '<pre>';
+		print_r($value);
+		echo '</pre>';
+	} else {
+		error_log(print_r($value, TRUE));
+	}
+}
+
+/**
+ * Sends a notice about deprecated use of a function, view, etc.
+ *
+ * This function either displays or logs the deprecation message,
+ * depending upon the deprecation policies in {@link CODING.txt}.
+ * Logged messages are sent with the level of 'WARNING'. Only admins
+ * get visual deprecation notices. When non-admins are logged in, the
+ * notices are sent to PHP's log through elgg_dump().
+ *
+ * A user-visual message will be displayed if $dep_version is greater
+ * than 1 minor releases lower than the current Elgg version, or at all
+ * lower than the current Elgg major version.
+ *
+ * @note This will always at least log a warning.  Don't use to pre-deprecate things.
+ * This assumes we are releasing in order and deprecating according to policy.
+ *
+ * @see CODING.txt
+ *
+ * @param string $msg             Message to log / display.
+ * @param string $dep_version     Human-readable *release* version: 1.7, 1.8, ...
+ * @param int    $backtrace_level How many levels back to display the backtrace.
+ *                                Useful if calling from functions that are called
+ *                                from other places (like elgg_view()). Set to -1
+ *                                for a full backtrace.
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function elgg_deprecated_notice($msg, $dep_version, $backtrace_level = 1) {
+	// if it's a major release behind, visual and logged
+	// if it's a 1 minor release behind, visual and logged
+	// if it's for current minor release, logged.
+	// bugfixes don't matter because we are not deprecating between them
+
+	if (!$dep_version) {
+		return false;
+	}
+
+	$elgg_version = get_version(true);
+	$elgg_version_arr = explode('.', $elgg_version);
+	$elgg_major_version = (int)$elgg_version_arr[0];
+	$elgg_minor_version = (int)$elgg_version_arr[1];
+
+	$dep_major_version = (int)$dep_version;
+	$dep_minor_version = 10 * ($dep_version - $dep_major_version);
+
+	$visual = false;
+
+	if (($dep_major_version < $elgg_major_version) ||
+		($dep_minor_version < $elgg_minor_version)) {
+		$visual = true;
+	}
+
+	$msg = "Deprecated in $dep_major_version.$dep_minor_version: $msg";
+
+	if ($visual && elgg_is_admin_logged_in()) {
+		register_error($msg);
+	}
+
+	// Get a file and line number for the log. Never show this in the UI.
+	// Skip over the function that sent this notice and see who called the deprecated
+	// function itself.
+	$msg .= " Called from ";
+	$stack = array();
+	$backtrace = debug_backtrace();
+	// never show this call.
+	array_shift($backtrace);
+	$i = count($backtrace);
+
+	foreach ($backtrace as $trace) {
+		$stack[] = "[#$i] {$trace['file']}:{$trace['line']}";
+		$i--;
+
+		if ($backtrace_level > 0) {
+			if ($backtrace_level <= 1) {
+				break;
+			}
+			$backtrace_level--;
+		}
+	}
+
+	$msg .= implode("<br /> -> ", $stack);
+
+	elgg_log($msg, 'WARNING');
+
+	return true;
+}
+
+/**
+ * Returns the current page's complete URL.
+ *
+ * The current URL is assembled using the network's wwwroot and the request URI
+ * in $_SERVER as populated by the web server.  This function will include
+ * any schemes, usernames and passwords, and ports.
+ *
+ * @return string The current page URL.
+ */
+function current_page_url() {
+	$url = parse_url(elgg_get_site_url());
+
+	$page = $url['scheme'] . "://";
+
+	// user/pass
+	if ((isset($url['user'])) && ($url['user'])) {
+		$page .= $url['user'];
+	}
+	if ((isset($url['pass'])) && ($url['pass'])) {
+		$page .= ":" . $url['pass'];
+	}
+	if ((isset($url['user']) && $url['user']) ||
+		(isset($url['pass']) && $url['pass'])) {
+		$page .= "@";
+	}
+
+	$page .= $url['host'];
+
+	if ((isset($url['port'])) && ($url['port'])) {
+		$page .= ":" . $url['port'];
+	}
+
+	$page = trim($page, "/");
+
+	$page .= $_SERVER['REQUEST_URI'];
+
+	return $page;
+}
+
+/**
+ * Return the full URL of the current page.
+ *
+ * @return string The URL
+ * @todo Combine / replace with current_page_url()
+ */
+function full_url() {
+	$s = empty($_SERVER["HTTPS"]) ? '' : ($_SERVER["HTTPS"] == "on") ? "s" : "";
+	$protocol = substr(strtolower($_SERVER["SERVER_PROTOCOL"]), 0,
+		strpos(strtolower($_SERVER["SERVER_PROTOCOL"]), "/")) . $s;
+
+	$port = ($_SERVER["SERVER_PORT"] == "80" || $_SERVER["SERVER_PORT"] == "443") ?
+		"" : (":" . $_SERVER["SERVER_PORT"]);
+
+	// This is here to prevent XSS in poorly written browsers used by 80% of the population.
+	// https://github.com/Elgg/Elgg/commit/0c947e80f512cb0a482b1864fd0a6965c8a0cd4a
+	$quotes = array('\'', '"');
+	$encoded = array('%27', '%22');
+
+	return $protocol . "://" . $_SERVER['SERVER_NAME'] . $port .
+		str_replace($quotes, $encoded, $_SERVER['REQUEST_URI']);
+}
+
+/**
+ * Builds a URL from the a parts array like one returned by {@link parse_url()}.
+ *
+ * @note If only partial information is passed, a partial URL will be returned.
+ *
+ * @param array $parts       Associative array of URL components like parse_url() returns
+ * @param bool  $html_encode HTML Encode the url?
+ *
+ * @return string Full URL
+ * @since 1.7.0
+ */
+function elgg_http_build_url(array $parts, $html_encode = TRUE) {
+	// build only what's given to us.
+	$scheme = isset($parts['scheme']) ? "{$parts['scheme']}://" : '';
+	$host = isset($parts['host']) ? "{$parts['host']}" : '';
+	$port = isset($parts['port']) ? ":{$parts['port']}" : '';
+	$path = isset($parts['path']) ? "{$parts['path']}" : '';
+	$query = isset($parts['query']) ? "?{$parts['query']}" : '';
+
+	$string = $scheme . $host . $port . $path . $query;
+
+	if ($html_encode) {
+		return elgg_format_url($string);
+	} else {
+		return $string;
+	}
+}
+
+/**
+ * Adds action tokens to URL
+ *
+ * As of 1.7.0 action tokens are required on all actions.
+ * Use this function to append action tokens to a URL's GET parameters.
+ * This will preserve any existing GET parameters.
+ *
+ * @note If you are using {@elgg_view input/form} you don't need to
+ * add tokens to the action.  The form view automatically handles
+ * tokens.
+ *
+ * @param string $url         Full action URL
+ * @param bool   $html_encode HTML encode the url? (default: false)
+ *
+ * @return string URL with action tokens
+ * @since 1.7.0
+ * @link http://docs.elgg.org/Tutorials/Actions
+ */
+function elgg_add_action_tokens_to_url($url, $html_encode = FALSE) {
+	$components = parse_url(elgg_normalize_url($url));
+
+	if (isset($components['query'])) {
+		$query = elgg_parse_str($components['query']);
+	} else {
+		$query = array();
+	}
+
+	if (isset($query['__elgg_ts']) && isset($query['__elgg_token'])) {
+		return $url;
+	}
+
+	// append action tokens to the existing query
+	$query['__elgg_ts'] = time();
+	$query['__elgg_token'] = generate_action_token($query['__elgg_ts']);
+	$components['query'] = http_build_query($query);
+
+	// rebuild the full url
+	return elgg_http_build_url($components, $html_encode);
+}
+
+/**
+ * Removes an element from a URL's query string.
+ *
+ * @note You can send a partial URL string.
+ *
+ * @param string $url     Full URL
+ * @param string $element The element to remove
+ *
+ * @return string The new URL with the query element removed.
+ * @since 1.7.0
+ */
+function elgg_http_remove_url_query_element($url, $element) {
+	$url_array = parse_url($url);
+
+	if (isset($url_array['query'])) {
+		$query = elgg_parse_str($url_array['query']);
+	} else {
+		// nothing to remove. Return original URL.
+		return $url;
+	}
+
+	if (array_key_exists($element, $query)) {
+		unset($query[$element]);
+	}
+
+	$url_array['query'] = http_build_query($query);
+	$string = elgg_http_build_url($url_array, false);
+	return $string;
+}
+
+/**
+ * Adds an element or elements to a URL's query string.
+ *
+ * @param string $url      The URL
+ * @param array  $elements Key/value pairs to add to the URL
+ *
+ * @return string The new URL with the query strings added
+ * @since 1.7.0
+ */
+function elgg_http_add_url_query_elements($url, array $elements) {
+	$url_array = parse_url($url);
+
+	if (isset($url_array['query'])) {
+		$query = elgg_parse_str($url_array['query']);
+	} else {
+		$query = array();
+	}
+
+	foreach ($elements as $k => $v) {
+		$query[$k] = $v;
+	}
+
+	$url_array['query'] = http_build_query($query);
+	$string = elgg_http_build_url($url_array, false);
+
+	return $string;
+}
+
+/**
+ * Test if two URLs are functionally identical.
+ *
+ * @tip If $ignore_params is used, neither the name nor its value will be considered when comparing.
+ *
+ * @tip The order of GET params doesn't matter.
+ *
+ * @param string $url1          First URL
+ * @param string $url2          Second URL
+ * @param array  $ignore_params GET params to ignore in the comparison
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_http_url_is_identical($url1, $url2, $ignore_params = array('offset', 'limit')) {
+	// if the server portion is missing but it starts with / then add the url in.
+	// @todo use elgg_normalize_url()
+	if (elgg_substr($url1, 0, 1) == '/') {
+		$url1 = elgg_get_site_url() . ltrim($url1, '/');
+	}
+
+	if (elgg_substr($url1, 0, 1) == '/') {
+		$url2 = elgg_get_site_url() . ltrim($url2, '/');
+	}
+
+	// @todo - should probably do something with relative URLs
+
+	if ($url1 == $url2) {
+		return TRUE;
+	}
+
+	$url1_info = parse_url($url1);
+	$url2_info = parse_url($url2);
+
+	if (isset($url1_info['path'])) {
+		$url1_info['path'] = trim($url1_info['path'], '/');
+	}
+	if (isset($url2_info['path'])) {
+		$url2_info['path'] = trim($url2_info['path'], '/');
+	}
+
+	// compare basic bits
+	$parts = array('scheme', 'host', 'path');
+
+	foreach ($parts as $part) {
+		if ((isset($url1_info[$part]) && isset($url2_info[$part]))
+		&& $url1_info[$part] != $url2_info[$part]) {
+			return FALSE;
+		} elseif (isset($url1_info[$part]) && !isset($url2_info[$part])) {
+			return FALSE;
+		} elseif (!isset($url1_info[$part]) && isset($url2_info[$part])) {
+			return FALSE;
+		}
+	}
+
+	// quick compare of get params
+	if (isset($url1_info['query']) && isset($url2_info['query'])
+	&& $url1_info['query'] == $url2_info['query']) {
+		return TRUE;
+	}
+
+	// compare get params that might be out of order
+	$url1_params = array();
+	$url2_params = array();
+
+	if (isset($url1_info['query'])) {
+		if ($url1_info['query'] = html_entity_decode($url1_info['query'])) {
+			$url1_params = elgg_parse_str($url1_info['query']);
+		}
+	}
+
+	if (isset($url2_info['query'])) {
+		if ($url2_info['query'] = html_entity_decode($url2_info['query'])) {
+			$url2_params = elgg_parse_str($url2_info['query']);
+		}
+	}
+
+	// drop ignored params
+	foreach ($ignore_params as $param) {
+		if (isset($url1_params[$param])) {
+			unset($url1_params[$param]);
+		}
+		if (isset($url2_params[$param])) {
+			unset($url2_params[$param]);
+		}
+	}
+
+	// array_diff_assoc only returns the items in arr1 that aren't in arrN
+	// but not the items that ARE in arrN but NOT in arr1
+	// if arr1 is an empty array, this function will return 0 no matter what.
+	// since we only care if they're different and not how different,
+	// add the results together to get a non-zero (ie, different) result
+	$diff_count = count(array_diff_assoc($url1_params, $url2_params));
+	$diff_count += count(array_diff_assoc($url2_params, $url1_params));
+	if ($diff_count > 0) {
+		return FALSE;
+	}
+
+	return TRUE;
+}
+
+/**
+ * Checks for $array[$key] and returns its value if it exists, else
+ * returns $default.
+ *
+ * Shorthand for $value = (isset($array['key'])) ? $array['key'] : 'default';
+ *
+ * @param string $key     The key to check.
+ * @param array  $array   The array to check against.
+ * @param mixed  $default Default value to return if nothing is found.
+ * @param bool   $strict  Return array key if it's set, even if empty. If false,
+ *                        return $default if the array key is unset or empty.
+ *
+ * @return mixed
+ * @since 1.8.0
+ */
+function elgg_extract($key, array $array, $default = null, $strict = true) {
+	if (!is_array($array)) {
+		return $default;
+	}
+
+	if ($strict) {
+		return (isset($array[$key])) ? $array[$key] : $default;
+	} else {
+		return (isset($array[$key]) && !empty($array[$key])) ? $array[$key] : $default;
+	}
+}
+
+/**
+ * Sorts a 3d array by specific element.
+ *
+ * @warning Will re-index numeric indexes.
+ *
+ * @note This operates the same as the built-in sort functions.
+ * It sorts the array and returns a bool for success.
+ *
+ * Do this: elgg_sort_3d_array_by_value($my_array);
+ * Not this: $my_array = elgg_sort_3d_array_by_value($my_array);
+ *
+ * @param array  &$array     Array to sort
+ * @param string $element    Element to sort by
+ * @param int    $sort_order PHP sort order
+ *                           {@see http://us2.php.net/array_multisort}
+ * @param int    $sort_type  PHP sort type
+ *                           {@see http://us2.php.net/sort}
+ *
+ * @return bool
+ */
+function elgg_sort_3d_array_by_value(&$array, $element, $sort_order = SORT_ASC,
+$sort_type = SORT_LOCALE_STRING) {
+
+	$sort = array();
+
+	foreach ($array as $v) {
+		if (isset($v[$element])) {
+			$sort[] = strtolower($v[$element]);
+		} else {
+			$sort[] = NULL;
+		}
+	};
+
+	return array_multisort($sort, $sort_order, $sort_type, $array);
+}
+
+/**
+ * Return the state of a php.ini setting as a bool
+ *
+ * @warning Using this on ini settings that are not boolean
+ * will be inaccurate!
+ *
+ * @param string $ini_get_arg The INI setting
+ *
+ * @return bool Depending on whether it's on or off
+ */
+function ini_get_bool($ini_get_arg) {
+	$temp = strtolower(ini_get($ini_get_arg));
+
+	if ($temp == '1' || $temp == 'on' || $temp == 'true') {
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Returns a PHP INI setting in bytes.
+ *
+ * @tip Use this for arithmetic when determining if a file can be uploaded.
+ *
+ * @param string $setting The php.ini setting
+ *
+ * @return int
+ * @since 1.7.0
+ * @link http://www.php.net/manual/en/function.ini-get.php
+ */
+function elgg_get_ini_setting_in_bytes($setting) {
+	// retrieve INI setting
+	$val = ini_get($setting);
+
+	// convert INI setting when shorthand notation is used
+	$last = strtolower($val[strlen($val) - 1]);
+	switch($last) {
+		case 'g':
+			$val *= 1024;
+			// fallthrough intentional
+		case 'm':
+			$val *= 1024;
+			// fallthrough intentional
+		case 'k':
+			$val *= 1024;
+	}
+
+	// return byte value
+	return $val;
+}
+
+/**
+ * Returns true is string is not empty, false, or null.
+ *
+ * Function to be used in array_filter which returns true if $string is not null.
+ *
+ * @param string $string The string to test
+ *
+ * @return bool
+ * @todo This is used once in metadata.php.  Use a lambda function instead.
+ */
+function is_not_null($string) {
+	if (($string === '') || ($string === false) || ($string === null)) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Normalise the singular keys in an options array to plural keys.
+ *
+ * Used in elgg_get_entities*() functions to support shortcutting plural
+ * names by singular names.
+ *
+ * @param array $options   The options array. $options['keys'] = 'values';
+ * @param array $singulars A list of singular words to pluralize by adding 's'.
+ *
+ * @return array
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_normalise_plural_options_array($options, $singulars) {
+	foreach ($singulars as $singular) {
+		$plural = $singular . 's';
+
+		if (array_key_exists($singular, $options)) {
+			if ($options[$singular] === ELGG_ENTITIES_ANY_VALUE) {
+				$options[$plural] = $options[$singular];
+			} else {
+				// Test for array refs #2641
+				if (!is_array($options[$singular])) {
+					$options[$plural] = array($options[$singular]);
+				} else {
+					$options[$plural] = $options[$singular];
+				}
+			}
+		}
+
+		unset($options[$singular]);
+	}
+
+	return $options;
+}
+
+/**
+ * Emits a shutdown:system event upon PHP shutdown, but before database connections are dropped.
+ *
+ * @tip Register for the shutdown:system event to perform functions at the end of page loads.
+ *
+ * @warning Using this event to perform long-running functions is not very
+ * useful.  Servers will hold pages until processing is done before sending
+ * them out to the browser.
+ *
+ * @see http://www.php.net/register-shutdown-function
+ *
+ * @return void
+ * @see register_shutdown_hook()
+ * @access private
+ */
+function _elgg_shutdown_hook() {
+	global $START_MICROTIME;
+
+	try {
+		elgg_trigger_event('shutdown', 'system');
+
+		$time = (float)(microtime(TRUE) - $START_MICROTIME);
+		// demoted to NOTICE from DEBUG so javascript is not corrupted
+		elgg_log("Page {$_SERVER['REQUEST_URI']} generated in $time seconds", 'NOTICE');
+	} catch (Exception $e) {
+		$message = 'Error: ' . get_class($e) . ' thrown within the shutdown handler. ';
+		$message .= "Message: '{$e->getMessage()}' in file {$e->getFile()} (line {$e->getLine()})";
+		error_log($message);
+		error_log("Exception trace stack: {$e->getTraceAsString()}");
+	}
+}
+
+/**
+ * Serve javascript pages.
+ *
+ * Searches for views under js/ and outputs them with special
+ * headers for caching control.
+ *
+ * @param array $page The page array
+ *
+ * @return bool
+ * @elgg_pagehandler js
+ * @access private
+ */
+function elgg_js_page_handler($page) {
+	return elgg_cacheable_view_page_handler($page, 'js');
+}
+
+/**
+ * Serve individual views for Ajax.
+ *
+ * /ajax/view/<name of view>?<key/value params>
+ *
+ * @param array $page The page array
+ *
+ * @return bool
+ * @elgg_pagehandler ajax
+ * @access private
+ */
+function elgg_ajax_page_handler($page) {
+	if (is_array($page) && sizeof($page)) {
+		// throw away 'view' and form the view name
+		unset($page[0]);
+		$view = implode('/', $page);
+
+		$allowed_views = elgg_get_config('allowed_ajax_views');
+		if (!array_key_exists($view, $allowed_views)) {
+			header('HTTP/1.1 403 Forbidden');
+			exit;
+		}
+
+		// pull out GET parameters through filter
+		$vars = array();
+		foreach ($_GET as $name => $value) {
+			$vars[$name] = get_input($name);
+		}
+
+		if (isset($vars['guid'])) {
+			$vars['entity'] = get_entity($vars['guid']);
+		}
+
+		echo elgg_view($view, $vars);
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Serve CSS
+ *
+ * Serves CSS from the css views directory with headers for caching control
+ *
+ * @param array $page The page array
+ *
+ * @return bool
+ * @elgg_pagehandler css
+ * @access private
+ */
+function elgg_css_page_handler($page) {
+	if (!isset($page[0])) {
+		// default css
+		$page[0] = 'elgg';
+	}
+	
+	return elgg_cacheable_view_page_handler($page, 'css');
+}
+
+/**
+ * Serves a JS or CSS view with headers for caching.
+ *
+ * /<css||js>/name/of/view.<last_cache>.<css||js>
+ *
+ * @param array  $page The page array
+ * @param string $type The type: js or css
+ *
+ * @return bool
+ * @access private
+ */
+function elgg_cacheable_view_page_handler($page, $type) {
+
+	switch ($type) {
+		case 'js':
+			$content_type = 'text/javascript';
+			break;
+
+		case 'css':
+			$content_type = 'text/css';
+			break;
+
+		default:
+			return false;
+			break;
+	}
+
+	if ($page) {
+		// the view file names can have multiple dots
+		// eg: views/default/js/calendars/jquery.fullcalendar.min.php
+		// translates to the url /js/calendars/jquery.fullcalendar.min.<ts>.js
+		// and the view js/calendars/jquery.fullcalendar.min
+		// we ignore the last two dots for the ts and the ext.
+		// Additionally, the timestamp is optional.
+		$page = implode('/', $page);
+		$regex = '|(.+?)\.([\d]+\.)?\w+$|';
+		preg_match($regex, $page, $matches);
+		$view = $matches[1];
+		$return = elgg_view("$type/$view");
+
+		header("Content-type: $content_type");
+
+		// @todo should js be cached when simple cache turned off
+		//header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', strtotime("+10 days")), true);
+		//header("Pragma: public");
+		//header("Cache-Control: public");
+		//header("Content-Length: " . strlen($return));
+
+		echo $return;
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Reverses the ordering in an ORDER BY clause.  This is achived by replacing
+ * asc with desc, or appending desc to the end of the clause.
+ *
+ * This is used mostly for elgg_get_entities() and other similar functions.
+ *
+ * @param string $order_by An order by clause
+ * @access private
+ * @return string
+ * @access private
+ */
+function elgg_sql_reverse_order_by_clause($order_by) {
+	$order_by = strtolower($order_by);
+
+	if (strpos($order_by, ' asc') !== false) {
+		$return = str_replace(' asc', ' desc', $order_by);
+	} elseif (strpos($order_by, ' desc') !== false) {
+		$return = str_replace(' desc', ' asc', $order_by);
+	} else {
+		// no order specified, so default to desc since mysql defaults to asc
+		$return = $order_by . ' desc';
+	}
+
+	return $return;
+}
+
+/**
+ * Enable objects with an enable() method.
+ *
+ * Used as a callback for ElggBatch.
+ *
+ * @todo why aren't these static methods on ElggBatch?
+ *
+ * @param object $object The object to enable
+ * @return bool
+ * @access private
+ */
+function elgg_batch_enable_callback($object) {
+	// our db functions return the number of rows affected...
+	return $object->enable() ? true : false;
+}
+
+/**
+ * Disable objects with a disable() method.
+ *
+ * Used as a callback for ElggBatch.
+ *
+ * @param object $object The object to disable
+ * @return bool
+ * @access private
+ */
+function elgg_batch_disable_callback($object) {
+	// our db functions return the number of rows affected...
+	return $object->disable() ? true : false;
+}
+
+/**
+ * Delete objects with a delete() method.
+ *
+ * Used as a callback for ElggBatch.
+ *
+ * @param object $object The object to disable
+ * @return bool
+ * @access private
+ */
+function elgg_batch_delete_callback($object) {
+	// our db functions return the number of rows affected...
+	return $object->delete() ? true : false;
+}
+
+/**
+ * Checks if there are some constraints on the options array for
+ * potentially dangerous operations.
+ *
+ * @param array  $options Options array
+ * @param string $type    Options type: metadata or annotations
+ * @return bool
+ * @access private
+ */
+function elgg_is_valid_options_for_batch_operation($options, $type) {
+	if (!$options || !is_array($options)) {
+		return false;
+	}
+
+	// at least one of these is required.
+	$required = array(
+		// generic restraints
+		'guid', 'guids'
+	);
+
+	switch ($type) {
+		case 'metadata':
+			$metadata_required = array(
+				'metadata_owner_guid', 'metadata_owner_guids',
+				'metadata_name', 'metadata_names',
+				'metadata_value', 'metadata_values'
+			);
+
+			$required = array_merge($required, $metadata_required);
+			break;
+
+		case 'annotations':
+		case 'annotation':
+			$annotations_required = array(
+				'annotation_owner_guid', 'annotation_owner_guids',
+				'annotation_name', 'annotation_names',
+				'annotation_value', 'annotation_values'
+			);
+
+			$required = array_merge($required, $annotations_required);
+			break;
+
+		default:
+			return false;
+	}
+
+	foreach ($required as $key) {
+		// check that it exists and is something.
+		if (isset($options[$key]) && $options[$key]) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Intercepts the index page when Walled Garden mode is enabled.
+ *
+ * @link http://docs.elgg.org/Tutorials/WalledGarden
+ * @elgg_plugin_hook index system
+ *
+ * @param string $hook   The name of the hook
+ * @param string $type   The type of hook
+ * @param bool   $value  Has a plugin already rendered an index page?
+ * @param array  $params Array of parameters (should be empty)
+ * @return bool
+ * @access private
+ */
+function elgg_walled_garden_index($hook, $type, $value, $params) {
+	if ($value) {
+		// do not create a second index page so return
+		return;
+	}
+
+	elgg_load_css('elgg.walled_garden');
+	elgg_load_js('elgg.walled_garden');
+	
+	$content = elgg_view('core/walled_garden/login');
+
+	$params = array(
+		'content' => $content,
+		'class' => 'elgg-walledgarden-double',
+		'id' => 'elgg-walledgarden-login',
+	);
+	$body = elgg_view_layout('walled_garden', $params);
+	echo elgg_view_page('', $body, 'walled_garden');
+
+	// return true to prevent other plugins from adding a front page
+	return true;
+}
+
+/**
+ * Serve walled garden sections
+ *
+ * @param array $page Array of URL segments
+ * @return string
+ * @access private
+ */
+function _elgg_walled_garden_ajax_handler($page) {
+	$view = $page[0];
+	$params = array(
+		'content' => elgg_view("core/walled_garden/$view"),
+		'class' => 'elgg-walledgarden-single hidden',
+		'id' => str_replace('_', '-', "elgg-walledgarden-$view"),
+	);
+	echo elgg_view_layout('walled_garden', $params);
+	return true;
+}
+
+/**
+ * Checks the status of the Walled Garden and forwards to a login page
+ * if required.
+ *
+ * If the site is in Walled Garden mode, all page except those registered as
+ * plugin pages by {@elgg_hook public_pages walled_garden} will redirect to
+ * a login page.
+ *
+ * @since 1.8.0
+ * @elgg_event_handler init system
+ * @link http://docs.elgg.org/Tutorials/WalledGarden
+ * @return void
+ * @access private
+ */
+function elgg_walled_garden() {
+	global $CONFIG;
+
+	elgg_register_css('elgg.walled_garden', '/css/walled_garden.css');
+	elgg_register_js('elgg.walled_garden', '/js/walled_garden.js');
+
+	elgg_register_page_handler('walled_garden', '_elgg_walled_garden_ajax_handler');
+
+	// check for external page view
+	if (isset($CONFIG->site) && $CONFIG->site instanceof ElggSite) {
+		$CONFIG->site->checkWalledGarden();
+	}
+}
+
+/**
+ * Remove public access for walled gardens
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $accesses
+ * @return array
+ * @access private
+ */
+function _elgg_walled_garden_remove_public_access($hook, $type, $accesses) {
+	if (isset($accesses[ACCESS_PUBLIC])) {
+		unset($accesses[ACCESS_PUBLIC]);
+	}
+	return $accesses;
+}
+
+/**
+ * Boots the engine
+ *
+ * 1. sets error handlers
+ * 2. connects to database
+ * 3. verifies the installation suceeded
+ * 4. loads application configuration
+ * 5. loads i18n data
+ * 6. loads site configuration
+ *
+ * @access private
+ */
+function _elgg_engine_boot() {
+	// Register the error handlers
+	set_error_handler('_elgg_php_error_handler');
+	set_exception_handler('_elgg_php_exception_handler');
+
+	setup_db_connections();
+
+	verify_installation();
+
+	_elgg_load_application_config();
+
+	_elgg_load_site_config();
+
+	_elgg_session_boot();
+
+	_elgg_load_cache();
+
+	_elgg_load_translations();
+}
+
+/**
+ * Elgg's main init.
+ *
+ * Handles core actions for comments, the JS pagehandler, and the shutdown function.
+ *
+ * @elgg_event_handler init system
+ * @return void
+ * @access private
+ */
+function elgg_init() {
+	global $CONFIG;
+
+	elgg_register_action('comments/add');
+	elgg_register_action('comments/delete');
+
+	elgg_register_page_handler('js', 'elgg_js_page_handler');
+	elgg_register_page_handler('css', 'elgg_css_page_handler');
+	elgg_register_page_handler('ajax', 'elgg_ajax_page_handler');
+
+	elgg_register_js('elgg.autocomplete', 'js/lib/ui.autocomplete.js');
+	elgg_register_js('jquery.ui.autocomplete.html', 'vendors/jquery/jquery.ui.autocomplete.html.js');
+	elgg_register_js('elgg.userpicker', 'js/lib/ui.userpicker.js');
+	elgg_register_js('elgg.friendspicker', 'js/lib/ui.friends_picker.js');
+	elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
+	elgg_register_js('elgg.avatar_cropper', 'js/lib/ui.avatar_cropper.js');
+	elgg_register_js('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/scripts/jquery.imgareaselect.min.js');
+	elgg_register_js('elgg.ui.river', 'js/lib/ui.river.js');
+
+	elgg_register_css('jquery.imgareaselect', 'vendors/jquery/jquery.imgareaselect-0.9.8/css/imgareaselect-deprecated.css');
+	
+	// Trigger the shutdown:system event upon PHP shutdown.
+	register_shutdown_function('_elgg_shutdown_hook');
+
+	$logo_url = elgg_get_site_url() . "_graphics/elgg_toolbar_logo.gif";
+	elgg_register_menu_item('topbar', array(
+		'name' => 'elgg_logo',
+		'href' => 'http://www.elgg.org/',
+		'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" width=\"38\" height=\"20\" />",
+		'priority' => 1,
+		'link_class' => 'elgg-topbar-logo',
+	));
+	
+	// Sets a blacklist of words in the current language.
+	// This is a comma separated list in word:blacklist.
+	// @todo possibly deprecate
+	$CONFIG->wordblacklist = array();
+	$list = explode(',', elgg_echo('word:blacklist'));
+	if ($list) {
+		foreach ($list as $l) {
+			$CONFIG->wordblacklist[] = trim($l);
+		}
+	}
+}
+
+/**
+ * Adds unit tests for the general API.
+ *
+ * @param string $hook   unit_test
+ * @param string $type   system
+ * @param array  $value  array of test files
+ * @param array  $params empty
+ *
+ * @elgg_plugin_hook unit_tests system
+ * @return array
+ * @access private
+ */
+function elgg_api_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/entity_getter_functions.php';
+	$value[] = $CONFIG->path . 'engine/tests/api/helpers.php';
+	$value[] = $CONFIG->path . 'engine/tests/regression/trac_bugs.php';
+	return $value;
+}
+
+/**#@+
+ * Controls access levels on ElggEntity entities, metadata, and annotations.
+ *
+ * @warning ACCESS_DEFAULT is a place holder for the input/access view. Do not
+ * use it when saving an entity.
+ *
+ * @var int
+ */
+define('ACCESS_DEFAULT', -1);
+define('ACCESS_PRIVATE', 0);
+define('ACCESS_LOGGED_IN', 1);
+define('ACCESS_PUBLIC', 2);
+define('ACCESS_FRIENDS', -2);
+/**#@-*/
+
+/**
+ * Constant to request the value of a parameter be ignored in elgg_get_*() functions
+ *
+ * @see elgg_get_entities()
+ * @var NULL
+ * @since 1.7
+ */
+define('ELGG_ENTITIES_ANY_VALUE', NULL);
+
+/**
+ * Constant to request the value of a parameter be nothing in elgg_get_*() functions.
+ *
+ * @see elgg_get_entities()
+ * @var int 0
+ * @since 1.7
+ */
+define('ELGG_ENTITIES_NO_VALUE', 0);
+
+/**
+ * Used in calls to forward() to specify the browser should be redirected to the
+ * referring page.
+ *
+ * @see forward
+ * @var int -1
+ */
+define('REFERRER', -1);
+
+/**
+ * Alternate spelling for REFERRER.  Included because of some bad documentation
+ * in the original HTTP spec.
+ *
+ * @see forward()
+ * @link http://en.wikipedia.org/wiki/HTTP_referrer#Origin_of_the_term_referer
+ * @var int -1
+ */
+define('REFERER', -1);
+
+elgg_register_event_handler('init', 'system', 'elgg_init');
+elgg_register_event_handler('boot', 'system', '_elgg_engine_boot', 1);
+elgg_register_plugin_hook_handler('unit_test', 'system', 'elgg_api_test');
+
+elgg_register_event_handler('init', 'system', 'add_custom_menu_items', 1000);
+elgg_register_event_handler('init', 'system', 'elgg_walled_garden', 1000);
diff --git a/engine/lib/entities.php b/engine/lib/entities.php
new file mode 100644
index 000000000..4fcf1c657
--- /dev/null
+++ b/engine/lib/entities.php
@@ -0,0 +1,2590 @@
+<?php
+/**
+ * Procedural code for creating, loading, and modifying ElggEntity objects.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Entities
+ * @link http://docs.elgg.org/DataModel/Entities
+ */
+
+/**
+ * Cache entities in memory once loaded.
+ *
+ * @global array $ENTITY_CACHE
+ * @access private
+ */
+global $ENTITY_CACHE;
+$ENTITY_CACHE = array();
+
+/**
+ * GUIDs of entities banned from the entity cache (during this request)
+ *
+ * @global array $ENTITY_CACHE_DISABLED_GUIDS
+ * @access private
+ */
+global $ENTITY_CACHE_DISABLED_GUIDS;
+$ENTITY_CACHE_DISABLED_GUIDS = array();
+
+/**
+ * Cache subtypes and related class names.
+ *
+ * @global array|null $SUBTYPE_CACHE array once populated from DB, initially null
+ * @access private
+ */
+global $SUBTYPE_CACHE;
+$SUBTYPE_CACHE = null;
+
+/**
+ * Remove this entity from the entity cache and make sure it is not re-added
+ *
+ * @param int $guid The entity guid
+ *
+ * @access private
+ * @todo this is a workaround until #5604 can be implemented
+ */
+function _elgg_disable_caching_for_entity($guid) {
+	global $ENTITY_CACHE_DISABLED_GUIDS;
+
+	_elgg_invalidate_cache_for_entity($guid);
+	$ENTITY_CACHE_DISABLED_GUIDS[$guid] = true;
+}
+
+/**
+ * Allow this entity to be stored in the entity cache
+ *
+ * @param int $guid The entity guid
+ *
+ * @access private
+ */
+function _elgg_enable_caching_for_entity($guid) {
+	global $ENTITY_CACHE_DISABLED_GUIDS;
+
+	unset($ENTITY_CACHE_DISABLED_GUIDS[$guid]);
+}
+
+/**
+ * Invalidate this class's entry in the cache.
+ *
+ * @param int $guid The entity guid
+ *
+ * @return void
+ * @access private
+ */
+function _elgg_invalidate_cache_for_entity($guid) {
+	global $ENTITY_CACHE;
+
+	$guid = (int)$guid;
+
+	unset($ENTITY_CACHE[$guid]);
+
+	elgg_get_metadata_cache()->clear($guid);
+}
+
+/**
+ * Cache an entity.
+ *
+ * Stores an entity in $ENTITY_CACHE;
+ *
+ * @param ElggEntity $entity Entity to cache
+ *
+ * @return void
+ * @see _elgg_retrieve_cached_entity()
+ * @see _elgg_invalidate_cache_for_entity()
+ * @access private
+ * @todo Use an ElggCache object
+ */
+function _elgg_cache_entity(ElggEntity $entity) {
+	global $ENTITY_CACHE, $ENTITY_CACHE_DISABLED_GUIDS;
+
+	// Don't cache non-plugin entities while access control is off, otherwise they could be
+	// exposed to users who shouldn't see them when control is re-enabled.
+	if (!($entity instanceof ElggPlugin) && elgg_get_ignore_access()) {
+		return;
+	}
+
+	$guid = $entity->getGUID();
+	if (isset($ENTITY_CACHE_DISABLED_GUIDS[$guid])) {
+		return;
+	}
+
+	// Don't store too many or we'll have memory problems
+	// @todo Pick a less arbitrary limit
+	if (count($ENTITY_CACHE) > 256) {
+		$random_guid = array_rand($ENTITY_CACHE);
+
+		unset($ENTITY_CACHE[$random_guid]);
+
+		// Purge separate metadata cache. Original idea was to do in entity destructor, but that would
+		// have caused a bunch of unnecessary purges at every shutdown. Doing it this way we have no way
+		// to know that the expunged entity will be GCed (might be another reference living), but that's
+		// OK; the metadata will reload if necessary.
+		elgg_get_metadata_cache()->clear($random_guid);
+	}
+
+	$ENTITY_CACHE[$guid] = $entity;
+}
+
+/**
+ * Retrieve a entity from the cache.
+ *
+ * @param int $guid The guid
+ *
+ * @return ElggEntity|bool false if entity not cached, or not fully loaded
+ * @see _elgg_cache_entity()
+ * @see _elgg_invalidate_cache_for_entity()
+ * @access private
+ */
+function _elgg_retrieve_cached_entity($guid) {
+	global $ENTITY_CACHE;
+
+	if (isset($ENTITY_CACHE[$guid])) {
+		if ($ENTITY_CACHE[$guid]->isFullyLoaded()) {
+			return $ENTITY_CACHE[$guid];
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Return the id for a given subtype.
+ *
+ * ElggEntity objects have a type and a subtype.  Subtypes
+ * are defined upon creation and cannot be changed.
+ *
+ * Plugin authors generally don't need to use this function
+ * unless writing their own SQL queries.  Use {@link ElggEntity::getSubtype()}
+ * to return the string subtype.
+ *
+ * @warning {@link ElggEntity::subtype} returns the ID.  You probably want
+ * {@link ElggEntity::getSubtype()} instead!
+ *
+ * @internal Subtypes are stored in the entity_subtypes table.  There is a foreign
+ * key in the entities table.
+ *
+ * @param string $type    Type
+ * @param string $subtype Subtype
+ *
+ * @return int Subtype ID
+ * @link http://docs.elgg.org/DataModel/Entities/Subtypes
+ * @see get_subtype_from_id()
+ * @access private
+ */
+function get_subtype_id($type, $subtype) {
+	global $SUBTYPE_CACHE;
+
+	if (!$subtype) {
+		return false;
+	}
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+
+	// use the cache before hitting database
+	$result = _elgg_retrieve_cached_subtype($type, $subtype);
+	if ($result !== null) {
+		return $result->id;
+	}
+
+	return false;
+}
+
+/**
+ * Return string name for a given subtype ID.
+ *
+ * @param int $subtype_id Subtype ID
+ *
+ * @return string|false Subtype name, false if subtype not found
+ * @link http://docs.elgg.org/DataModel/Entities/Subtypes
+ * @see get_subtype_from_id()
+ * @access private
+ */
+function get_subtype_from_id($subtype_id) {
+	global $SUBTYPE_CACHE;
+
+	if (!$subtype_id) {
+		return false;
+	}
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+
+	if (isset($SUBTYPE_CACHE[$subtype_id])) {
+		return $SUBTYPE_CACHE[$subtype_id]->subtype;
+	}
+
+	return false;
+}
+
+/**
+ * Retrieve subtype from the cache.
+ *
+ * @param string $type
+ * @param string $subtype
+ * @return stdClass|null
+ *
+ * @access private
+ */
+function _elgg_retrieve_cached_subtype($type, $subtype) {
+	global $SUBTYPE_CACHE;
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+
+	foreach ($SUBTYPE_CACHE as $obj) {
+		if ($obj->type === $type && $obj->subtype === $subtype) {
+			return $obj;
+		}
+	}
+	return null;
+}
+
+/**
+ * Fetch all suptypes from DB to local cache.
+ *
+ * @access private
+ */
+function _elgg_populate_subtype_cache() {
+	global $CONFIG, $SUBTYPE_CACHE;
+	
+	$results = get_data("SELECT * FROM {$CONFIG->dbprefix}entity_subtypes");
+	
+	$SUBTYPE_CACHE = array();
+	foreach ($results as $row) {
+		$SUBTYPE_CACHE[$row->id] = $row;
+	}
+}
+
+/**
+ * Return the class name for a registered type and subtype.
+ *
+ * Entities can be registered to always be loaded as a certain class
+ * with add_subtype() or update_subtype(). This function returns the class
+ * name if found and NULL if not.
+ *
+ * @param string $type    The type
+ * @param string $subtype The subtype
+ *
+ * @return string|null a class name or null
+ * @see get_subtype_from_id()
+ * @see get_subtype_class_from_id()
+ * @access private
+ */
+function get_subtype_class($type, $subtype) {
+	global $SUBTYPE_CACHE;
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+	
+	// use the cache before going to the database
+	$obj = _elgg_retrieve_cached_subtype($type, $subtype);
+	if ($obj) {
+		return $obj->class;
+	}
+
+	return null;
+}
+
+/**
+ * Returns the class name for a subtype id.
+ *
+ * @param int $subtype_id The subtype id
+ *
+ * @return string|null
+ * @see get_subtype_class()
+ * @see get_subtype_from_id()
+ * @access private
+ */
+function get_subtype_class_from_id($subtype_id) {
+	global $SUBTYPE_CACHE;
+
+	if (!$subtype_id) {
+		return null;
+	}
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+	
+	if (isset($SUBTYPE_CACHE[$subtype_id])) {
+		return $SUBTYPE_CACHE[$subtype_id]->class;
+	}
+
+	return null;
+}
+
+/**
+ * Register ElggEntities with a certain type and subtype to be loaded as a specific class.
+ *
+ * By default entities are loaded as one of the 4 parent objects: site, user, object, or group.
+ * If you subclass any of these you can register the classname with add_subtype() so
+ * it will be loaded as that class automatically when retrieved from the database with
+ * {@link get_entity()}.
+ *
+ * @warning This function cannot be used to change the class for a type-subtype pair.
+ * Use update_subtype() for that.
+ *
+ * @param string $type    The type you're subtyping (site, user, object, or group)
+ * @param string $subtype The subtype
+ * @param string $class   Optional class name for the object
+ *
+ * @return int
+ * @link http://docs.elgg.org/Tutorials/Subclasses
+ * @link http://docs.elgg.org/DataModel/Entities
+ * @see update_subtype()
+ * @see remove_subtype()
+ * @see get_entity()
+ */
+function add_subtype($type, $subtype, $class = "") {
+	global $CONFIG, $SUBTYPE_CACHE;
+
+	if (!$subtype) {
+		return 0;
+	}
+
+	$id = get_subtype_id($type, $subtype);
+
+	if (!$id) {
+		// In cache we store non-SQL-escaped strings because that's what's returned by query
+		$cache_obj = (object) array(
+			'type' => $type,
+			'subtype' => $subtype,
+			'class' => $class,
+		);
+
+		$type = sanitise_string($type);
+		$subtype = sanitise_string($subtype);
+		$class = sanitise_string($class);
+
+		$id = insert_data("INSERT INTO {$CONFIG->dbprefix}entity_subtypes"
+			. " (type, subtype, class) VALUES ('$type', '$subtype', '$class')");
+		
+		// add entry to cache
+		$cache_obj->id = $id;
+		$SUBTYPE_CACHE[$id] = $cache_obj;
+	}
+
+	return $id;
+}
+
+/**
+ * Removes a registered ElggEntity type, subtype, and classname.
+ *
+ * @warning You do not want to use this function. If you want to unregister
+ * a class for a subtype, use update_subtype(). Using this function will
+ * permanently orphan all the objects created with the specified subtype.
+ *
+ * @param string $type    Type
+ * @param string $subtype Subtype
+ *
+ * @return bool
+ * @see add_subtype()
+ * @see update_subtype()
+ */
+function remove_subtype($type, $subtype) {
+	global $CONFIG;
+
+	$type = sanitise_string($type);
+	$subtype = sanitise_string($subtype);
+
+	return delete_data("DELETE FROM {$CONFIG->dbprefix}entity_subtypes"
+		. " WHERE type = '$type' AND subtype = '$subtype'");
+}
+
+/**
+ * Update a registered ElggEntity type, subtype, and class name
+ *
+ * @param string $type    Type
+ * @param string $subtype Subtype
+ * @param string $class   Class name to use when loading this entity
+ *
+ * @return bool
+ */
+function update_subtype($type, $subtype, $class = '') {
+	global $CONFIG, $SUBTYPE_CACHE;
+
+	$id = get_subtype_id($type, $subtype);
+	if (!$id) {
+		return false;
+	}
+
+	if ($SUBTYPE_CACHE === null) {
+		_elgg_populate_subtype_cache();
+	}
+
+	$unescaped_class = $class;
+
+	$type = sanitise_string($type);
+	$subtype = sanitise_string($subtype);
+	$class = sanitise_string($class);
+	
+	$success = update_data("UPDATE {$CONFIG->dbprefix}entity_subtypes
+		SET type = '$type', subtype = '$subtype', class = '$class'
+		WHERE id = $id
+	");
+
+	if ($success && isset($SUBTYPE_CACHE[$id])) {
+		$SUBTYPE_CACHE[$id]->class = $unescaped_class;
+	}
+
+	return $success;
+}
+
+/**
+ * Update an entity in the database.
+ *
+ * There are 4 basic entity types: site, user, object, and group.
+ * All entities are split between two tables: the entities table and their type table.
+ *
+ * @warning Plugin authors should never call this directly. Use ->save() instead.
+ *
+ * @param int $guid           The guid of the entity to update
+ * @param int $owner_guid     The new owner guid
+ * @param int $access_id      The new access id
+ * @param int $container_guid The new container guid
+ * @param int $time_created   The time creation timestamp
+ *
+ * @return bool
+ * @throws InvalidParameterException
+ * @access private
+ */
+function update_entity($guid, $owner_guid, $access_id, $container_guid = null, $time_created = null) {
+	global $CONFIG, $ENTITY_CACHE;
+
+	$guid = (int)$guid;
+	$owner_guid = (int)$owner_guid;
+	$access_id = (int)$access_id;
+	$container_guid = (int) $container_guid;
+	if (is_null($container_guid)) {
+		$container_guid = $owner_guid;
+	}
+	$time = time();
+
+	$entity = get_entity($guid);
+
+	if ($time_created == null) {
+		$time_created = $entity->time_created;
+	} else {
+		$time_created = (int) $time_created;
+	}
+
+	if ($access_id == ACCESS_DEFAULT) {
+		throw new InvalidParameterException('ACCESS_DEFAULT is not a valid access level. See its documentation in elgglib.h');
+	}
+
+	if ($entity && $entity->canEdit()) {
+		if (elgg_trigger_event('update', $entity->type, $entity)) {
+			$ret = update_data("UPDATE {$CONFIG->dbprefix}entities
+				set owner_guid='$owner_guid', access_id='$access_id',
+				container_guid='$container_guid', time_created='$time_created',
+				time_updated='$time' WHERE guid=$guid");
+
+			if ($entity instanceof ElggObject) {
+				update_river_access_by_object($guid, $access_id);
+			}
+
+			// If memcache is available then delete this entry from the cache
+			static $newentity_cache;
+			if ((!$newentity_cache) && (is_memcache_available())) {
+				$newentity_cache = new ElggMemcache('new_entity_cache');
+			}
+			if ($newentity_cache) {
+				$newentity_cache->delete($guid);
+			}
+
+			// Handle cases where there was no error BUT no rows were updated!
+			if ($ret === false) {
+				return false;
+			}
+
+			return true;
+		}
+	}
+}
+
+/**
+ * Determine if a given user can write to an entity container.
+ *
+ * An entity can be a container for any other entity by setting the
+ * container_guid.  container_guid can differ from owner_guid.
+ *
+ * A plugin hook container_permissions_check:$entity_type is emitted to allow granular
+ * access controls in plugins.
+ *
+ * @param int    $user_guid      The user guid, or 0 for logged in user
+ * @param int    $container_guid The container, or 0 for the current page owner.
+ * @param string $type           The type of entity we're looking to write
+ * @param string $subtype        The subtype of the entity we're looking to write
+ *
+ * @return bool
+ * @link http://docs.elgg.org/DataModel/Containers
+ */
+function can_write_to_container($user_guid = 0, $container_guid = 0, $type = 'all', $subtype = 'all') {
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+	if (!$user) {
+		$user = elgg_get_logged_in_user_entity();
+	}
+
+	$container_guid = (int)$container_guid;
+	if (!$container_guid) {
+		$container_guid = elgg_get_page_owner_guid();
+	}
+
+	$return = false;
+
+	if (!$container_guid) {
+		$return = true;
+	}
+
+	$container = get_entity($container_guid);
+
+	if ($container) {
+		// If the user can edit the container, they can also write to it
+		if ($container->canEdit($user_guid)) {
+			$return = true;
+		}
+
+		// If still not approved, see if the user is a member of the group
+		// @todo this should be moved to the groups plugin/library
+		if (!$return && $user && $container instanceof ElggGroup) {
+			/* @var ElggGroup $container */
+			if ($container->isMember($user)) {
+				$return = true;
+			}
+		}
+	}
+
+	// See if anyone else has anything to say
+	return elgg_trigger_plugin_hook(
+			'container_permissions_check',
+			$type,
+			array(
+				'container' => $container,
+				'user' => $user,
+				'subtype' => $subtype
+			),
+			$return);
+}
+
+/**
+ * Create a new entry in the entities table.
+ *
+ * Saves the base information in the entities table for the entity.  Saving
+ * the type information is handled in the calling class method.
+ *
+ * @warning Plugin authors should never call this directly.  Always use entity objects.
+ *
+ * @warning Entities must have an entry in both the entities table and their type table
+ * or they will throw an exception when loaded.
+ *
+ * @param string $type           The type of the entity (site, user, object, group).
+ * @param string $subtype        The subtype of the entity.
+ * @param int    $owner_guid     The GUID of the object's owner.
+ * @param int    $access_id      The access control group to create the entity with.
+ * @param int    $site_guid      The site to add this entity to. 0 for current.
+ * @param int    $container_guid The container GUID
+ *
+ * @return int|false The new entity's GUID, or false on failure
+ * @throws InvalidParameterException
+ * @link http://docs.elgg.org/DataModel/Entities
+ * @access private
+ */
+function create_entity($type, $subtype, $owner_guid, $access_id, $site_guid = 0,
+$container_guid = 0) {
+
+	global $CONFIG;
+
+	$type = sanitise_string($type);
+	$subtype_id = add_subtype($type, $subtype);
+	$owner_guid = (int)$owner_guid;
+	$time = time();
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+	$site_guid = (int) $site_guid;
+	if ($container_guid == 0) {
+		$container_guid = $owner_guid;
+	}
+	$access_id = (int)$access_id;
+	if ($access_id == ACCESS_DEFAULT) {
+		throw new InvalidParameterException('ACCESS_DEFAULT is not a valid access level. See its documentation in elgglib.h');
+	}
+
+	$user_guid = elgg_get_logged_in_user_guid();
+	if (!can_write_to_container($user_guid, $owner_guid, $type, $subtype)) {
+		return false;
+	}
+	if ($owner_guid != $container_guid) {
+		if (!can_write_to_container($user_guid, $container_guid, $type, $subtype)) {
+			return false;
+		}
+	}
+	if ($type == "") {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:EntityTypeNotSet'));
+	}
+
+	return insert_data("INSERT into {$CONFIG->dbprefix}entities
+		(type, subtype, owner_guid, site_guid, container_guid,
+			access_id, time_created, time_updated, last_action)
+		values
+		('$type',$subtype_id, $owner_guid, $site_guid, $container_guid,
+			$access_id, $time, $time, $time)");
+}
+
+/**
+ * Returns a database row from the entities table.
+ *
+ * @tip Use get_entity() to return the fully loaded entity.
+ *
+ * @warning This will only return results if a) it exists, b) you have access to it.
+ * see {@link get_access_sql_suffix()}.
+ *
+ * @param int $guid The GUID of the object to extract
+ *
+ * @return stdClass|false
+ * @link http://docs.elgg.org/DataModel/Entities
+ * @see entity_row_to_elggstar()
+ * @access private
+ */
+function get_entity_as_row($guid) {
+	global $CONFIG;
+
+	if (!$guid) {
+		return false;
+	}
+
+	$guid = (int) $guid;
+	$access = get_access_sql_suffix();
+
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}entities where guid=$guid and $access");
+}
+
+/**
+ * Create an Elgg* object from a given entity row.
+ *
+ * Handles loading all tables into the correct class.
+ *
+ * @param stdClass $row The row of the entry in the entities table.
+ *
+ * @return ElggEntity|false
+ * @link http://docs.elgg.org/DataModel/Entities
+ * @see get_entity_as_row()
+ * @see add_subtype()
+ * @see get_entity()
+ * @access private
+ *
+ * @throws ClassException|InstallationException
+ */
+function entity_row_to_elggstar($row) {
+	if (!($row instanceof stdClass)) {
+		return $row;
+	}
+
+	if ((!isset($row->guid)) || (!isset($row->subtype))) {
+		return $row;
+	}
+
+	$new_entity = false;
+
+	// Create a memcache cache if we can
+	static $newentity_cache;
+	if ((!$newentity_cache) && (is_memcache_available())) {
+		$newentity_cache = new ElggMemcache('new_entity_cache');
+	}
+	if ($newentity_cache) {
+		$new_entity = $newentity_cache->load($row->guid);
+	}
+	if ($new_entity) {
+		return $new_entity;
+	}
+
+	// load class for entity if one is registered
+	$classname = get_subtype_class_from_id($row->subtype);
+	if ($classname != "") {
+		if (class_exists($classname)) {
+			$new_entity = new $classname($row);
+
+			if (!($new_entity instanceof ElggEntity)) {
+				$msg = elgg_echo('ClassException:ClassnameNotClass', array($classname, 'ElggEntity'));
+				throw new ClassException($msg);
+			}
+		} else {
+			error_log(elgg_echo('ClassNotFoundException:MissingClass', array($classname)));
+		}
+	}
+
+	if (!$new_entity) {
+		//@todo Make this into a function
+		switch ($row->type) {
+			case 'object' :
+				$new_entity = new ElggObject($row);
+				break;
+			case 'user' :
+				$new_entity = new ElggUser($row);
+				break;
+			case 'group' :
+				$new_entity = new ElggGroup($row);
+				break;
+			case 'site' :
+				$new_entity = new ElggSite($row);
+				break;
+			default:
+				$msg = elgg_echo('InstallationException:TypeNotSupported', array($row->type));
+				throw new InstallationException($msg);
+		}
+	}
+
+	// Cache entity if we have a cache available
+	if (($newentity_cache) && ($new_entity)) {
+		$newentity_cache->save($new_entity->guid, $new_entity);
+	}
+
+	return $new_entity;
+}
+
+/**
+ * Loads and returns an entity object from a guid.
+ *
+ * @param int $guid The GUID of the entity
+ *
+ * @return ElggEntity The correct Elgg or custom object based upon entity type and subtype
+ * @link http://docs.elgg.org/DataModel/Entities
+ */
+function get_entity($guid) {
+	// This should not be a static local var. Notice that cache writing occurs in a completely
+	// different instance outside this function.
+	// @todo We need a single Memcache instance with a shared pool of namespace wrappers. This function would pull an instance from the pool.
+	static $shared_cache;
+
+	// We could also use: if (!(int) $guid) { return FALSE },
+	// but that evaluates to a false positive for $guid = TRUE.
+	// This is a bit slower, but more thorough.
+	if (!is_numeric($guid) || $guid === 0 || $guid === '0') {
+		return false;
+	}
+	
+	// Check local cache first
+	$new_entity = _elgg_retrieve_cached_entity($guid);
+	if ($new_entity) {
+		return $new_entity;
+	}
+
+	// Check shared memory cache, if available
+	if (null === $shared_cache) {
+		if (is_memcache_available()) {
+			$shared_cache = new ElggMemcache('new_entity_cache');
+		} else {
+			$shared_cache = false;
+		}
+	}
+
+	// until ACLs in memcache, DB query is required to determine access
+	$entity_row = get_entity_as_row($guid);
+	if (!$entity_row) {
+		return false;
+	}
+
+	if ($shared_cache) {
+		$cached_entity = $shared_cache->load($guid);
+		// @todo store ACLs in memcache https://github.com/elgg/elgg/issues/3018#issuecomment-13662617
+		if ($cached_entity) {
+			// @todo use ACL and cached entity access_id to determine if user can see it
+			return $cached_entity;
+		}
+	}
+
+	// don't let incomplete entities cause fatal exceptions
+	try {
+		$new_entity = entity_row_to_elggstar($entity_row);
+	} catch (IncompleteEntityException $e) {
+		return false;
+	}
+
+	if ($new_entity) {
+		_elgg_cache_entity($new_entity);
+	}
+	return $new_entity;
+}
+
+/**
+ * Does an entity exist?
+ *
+ * This function checks for the existence of an entity independent of access
+ * permissions. It is useful for situations when a user cannot access an entity
+ * and it must be determined whether entity has been deleted or the access level
+ * has changed.
+ *
+ * @param int $guid The GUID of the entity
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_entity_exists($guid) {
+	global $CONFIG;
+
+	$guid = sanitize_int($guid);
+
+	$query = "SELECT count(*) as total FROM {$CONFIG->dbprefix}entities WHERE guid = $guid";
+	$result = get_data_row($query);
+	if ($result->total == 0) {
+		return false;
+	} else {
+		return true;
+	}
+}
+
+/**
+ * Returns an array of entities with optional filtering.
+ *
+ * Entities are the basic unit of storage in Elgg.  This function
+ * provides the simplest way to get an array of entities.  There
+ * are many options available that can be passed to filter
+ * what sorts of entities are returned.
+ *
+ * @tip To output formatted strings of entities, use {@link elgg_list_entities()} and
+ * its cousins.
+ *
+ * @tip Plural arguments can be written as singular if only specifying a
+ * single element.  ('type' => 'object' vs 'types' => array('object')).
+ *
+ * @param array $options Array in format:
+ *
+ * 	types => NULL|STR entity type (type IN ('type1', 'type2')
+ *           Joined with subtypes by AND. See below)
+ *
+ * 	subtypes => NULL|STR entity subtype (SQL: subtype IN ('subtype1', 'subtype2))
+ *              Use ELGG_ENTITIES_NO_VALUE for no subtype.
+ *
+ * 	type_subtype_pairs => NULL|ARR (array('type' => 'subtype'))
+ *                        (type = '$type' AND subtype = '$subtype') pairs
+ *
+ *	guids => NULL|ARR Array of entity guids
+ *
+ * 	owner_guids => NULL|ARR Array of owner guids
+ *
+ * 	container_guids => NULL|ARR Array of container_guids
+ *
+ * 	site_guids => NULL (current_site)|ARR Array of site_guid
+ *
+ * 	order_by => NULL (time_created desc)|STR SQL order by clause
+ *
+ *  reverse_order_by => BOOL Reverse the default order by clause
+ *
+ * 	limit => NULL (10)|INT SQL limit clause (0 means no limit)
+ *
+ * 	offset => NULL (0)|INT SQL offset clause
+ *
+ * 	created_time_lower => NULL|INT Created time lower boundary in epoch time
+ *
+ * 	created_time_upper => NULL|INT Created time upper boundary in epoch time
+ *
+ * 	modified_time_lower => NULL|INT Modified time lower boundary in epoch time
+ *
+ * 	modified_time_upper => NULL|INT Modified time upper boundary in epoch time
+ *
+ * 	count => TRUE|FALSE return a count instead of entities
+ *
+ * 	wheres => array() Additional where clauses to AND together
+ *
+ * 	joins => array() Additional joins
+ *
+ * 	callback => string A callback function to pass each row through
+ *
+ * @return mixed If count, int. If not count, array. false on errors.
+ * @since 1.7.0
+ * @see elgg_get_entities_from_metadata()
+ * @see elgg_get_entities_from_relationship()
+ * @see elgg_get_entities_from_access_id()
+ * @see elgg_get_entities_from_annotations()
+ * @see elgg_list_entities()
+ * @link http://docs.elgg.org/DataModel/Entities/Getters
+ */
+function elgg_get_entities(array $options = array()) {
+	global $CONFIG;
+
+	$defaults = array(
+		'types'					=>	ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'				=>	ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'guids'					=>	ELGG_ENTITIES_ANY_VALUE,
+		'owner_guids'			=>	ELGG_ENTITIES_ANY_VALUE,
+		'container_guids'		=>	ELGG_ENTITIES_ANY_VALUE,
+		'site_guids'			=>	$CONFIG->site_guid,
+
+		'modified_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'modified_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'reverse_order_by'		=>	false,
+		'order_by' 				=>	'e.time_created desc',
+		'group_by'				=>	ELGG_ENTITIES_ANY_VALUE,
+		'limit'					=>	10,
+		'offset'				=>	0,
+		'count'					=>	FALSE,
+		'selects'				=>	array(),
+		'wheres'				=>	array(),
+		'joins'					=>	array(),
+
+		'callback'				=> 'entity_row_to_elggstar',
+
+		'__ElggBatch'			=> null,
+	);
+
+	$options = array_merge($defaults, $options);
+
+	// can't use helper function with type_subtype_pair because
+	// it's already an array...just need to merge it
+	if (isset($options['type_subtype_pair'])) {
+		if (isset($options['type_subtype_pairs'])) {
+			$options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'],
+				$options['type_subtype_pair']);
+		} else {
+			$options['type_subtype_pairs'] = $options['type_subtype_pair'];
+		}
+	}
+
+	$singulars = array('type', 'subtype', 'guid', 'owner_guid', 'container_guid', 'site_guid');
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	// evaluate where clauses
+	if (!is_array($options['wheres'])) {
+		$options['wheres'] = array($options['wheres']);
+	}
+
+	$wheres = $options['wheres'];
+
+	$wheres[] = elgg_get_entity_type_subtype_where_sql('e', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+
+	$wheres[] = elgg_get_guid_based_where_sql('e.guid', $options['guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.owner_guid', $options['owner_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.container_guid', $options['container_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.site_guid', $options['site_guids']);
+
+	$wheres[] = elgg_get_entity_time_where_sql('e', $options['created_time_upper'],
+		$options['created_time_lower'], $options['modified_time_upper'], $options['modified_time_lower']);
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	// evaluate join clauses
+	if (!is_array($options['joins'])) {
+		$options['joins'] = array($options['joins']);
+	}
+
+	// remove identical join clauses
+	$joins = array_unique($options['joins']);
+
+	foreach ($joins as $i => $join) {
+		if ($join === FALSE) {
+			return FALSE;
+		} elseif (empty($join)) {
+			unset($joins[$i]);
+		}
+	}
+
+	// evalutate selects
+	if ($options['selects']) {
+		$selects = '';
+		foreach ($options['selects'] as $select) {
+			$selects .= ", $select";
+		}
+	} else {
+		$selects = '';
+	}
+
+	if (!$options['count']) {
+		$query = "SELECT DISTINCT e.*{$selects} FROM {$CONFIG->dbprefix}entities e ";
+	} else {
+		$query = "SELECT count(DISTINCT e.guid) as total FROM {$CONFIG->dbprefix}entities e ";
+	}
+
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
+
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix('e');
+
+	// reverse order by
+	if ($options['reverse_order_by']) {
+		$options['order_by'] = elgg_sql_reverse_order_by_clause($options['order_by']);
+	}
+
+	if (!$options['count']) {
+		if ($options['group_by']) {
+			$query .= " GROUP BY {$options['group_by']}";
+		}
+
+		if ($options['order_by']) {
+			$query .= " ORDER BY {$options['order_by']}";
+		}
+
+		if ($options['limit']) {
+			$limit = sanitise_int($options['limit'], false);
+			$offset = sanitise_int($options['offset'], false);
+			$query .= " LIMIT $offset, $limit";
+		}
+
+		if ($options['callback'] === 'entity_row_to_elggstar') {
+			$dt = _elgg_fetch_entities_from_sql($query, $options['__ElggBatch']);
+		} else {
+			$dt = get_data($query, $options['callback']);
+		}
+
+		if ($dt) {
+			// populate entity and metadata caches
+			$guids = array();
+			foreach ($dt as $item) {
+				// A custom callback could result in items that aren't ElggEntity's, so check for them
+				if ($item instanceof ElggEntity) {
+					_elgg_cache_entity($item);
+					// plugins usually have only settings
+					if (!$item instanceof ElggPlugin) {
+						$guids[] = $item->guid;
+					}
+				}
+			}
+			// @todo Without this, recursive delete fails. See #4568
+			reset($dt);
+
+			if ($guids) {
+				elgg_get_metadata_cache()->populateFromEntities($guids);
+			}
+		}
+		return $dt;
+	} else {
+		$total = get_data_row($query);
+		return (int)$total->total;
+	}
+}
+
+/**
+ * Return entities from an SQL query generated by elgg_get_entities.
+ *
+ * @param string    $sql
+ * @param ElggBatch $batch
+ * @return ElggEntity[]
+ *
+ * @access private
+ * @throws LogicException
+ */
+function _elgg_fetch_entities_from_sql($sql, ElggBatch $batch = null) {
+	static $plugin_subtype;
+	if (null === $plugin_subtype) {
+		$plugin_subtype = get_subtype_id('object', 'plugin');
+	}
+
+	// Keys are types, values are columns that, if present, suggest that the secondary
+	// table is already JOINed
+	$types_to_optimize = array(
+		'object' => 'title',
+		'user' => 'password',
+		'group' => 'name',
+	);
+
+	$rows = get_data($sql);
+
+	// guids to look up in each type
+	$lookup_types = array();
+	// maps GUIDs to the $rows key
+	$guid_to_key = array();
+
+	if (isset($rows[0]->type, $rows[0]->subtype)
+			&& $rows[0]->type === 'object'
+			&& $rows[0]->subtype == $plugin_subtype) {
+		// Likely the entire resultset is plugins, which have already been optimized
+		// to JOIN the secondary table. In this case we allow retrieving from cache,
+		// but abandon the extra queries.
+		$types_to_optimize = array();
+	}
+
+	// First pass: use cache where possible, gather GUIDs that we're optimizing
+	foreach ($rows as $i => $row) {
+		if (empty($row->guid) || empty($row->type)) {
+			throw new LogicException('Entity row missing guid or type');
+		}
+		if ($entity = _elgg_retrieve_cached_entity($row->guid)) {
+			$rows[$i] = $entity;
+			continue;
+		}
+		if (isset($types_to_optimize[$row->type])) {
+			// check if row already looks JOINed.
+			if (isset($row->{$types_to_optimize[$row->type]})) {
+				// Row probably already contains JOINed secondary table. Don't make another query just
+				// to pull data that's already there
+				continue;
+			}
+			$lookup_types[$row->type][] = $row->guid;
+			$guid_to_key[$row->guid] = $i;
+		}
+	}
+	// Do secondary queries and merge rows
+	if ($lookup_types) {
+		$dbprefix = elgg_get_config('dbprefix');
+
+		foreach ($lookup_types as $type => $guids) {
+			$set = "(" . implode(',', $guids) . ")";
+			$sql = "SELECT * FROM {$dbprefix}{$type}s_entity WHERE guid IN $set";
+			$secondary_rows = get_data($sql);
+			if ($secondary_rows) {
+				foreach ($secondary_rows as $secondary_row) {
+					$key = $guid_to_key[$secondary_row->guid];
+					// cast to arrays to merge then cast back
+					$rows[$key] = (object)array_merge((array)$rows[$key], (array)$secondary_row);
+				}
+			}
+		}
+	}
+	// Second pass to finish conversion
+	foreach ($rows as $i => $row) {
+		if ($row instanceof ElggEntity) {
+			continue;
+		} else {
+			try {
+				$rows[$i] = entity_row_to_elggstar($row);
+			} catch (IncompleteEntityException $e) {
+				// don't let incomplete entities throw fatal errors
+				unset($rows[$i]);
+
+				// report incompletes to the batch process that spawned this query
+				if ($batch) {
+					$batch->reportIncompleteEntity($row);
+				}
+			}
+		}
+	}
+	return $rows;
+}
+
+/**
+ * Returns SQL where clause for type and subtype on main entity table
+ *
+ * @param string     $table    Entity table prefix as defined in SELECT...FROM entities $table
+ * @param NULL|array $types    Array of types or NULL if none.
+ * @param NULL|array $subtypes Array of subtypes or NULL if none
+ * @param NULL|array $pairs    Array of pairs of types and subtypes
+ *
+ * @return FALSE|string
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_type_subtype_where_sql($table, $types, $subtypes, $pairs) {
+	// subtype depends upon type.
+	if ($subtypes && !$types) {
+		elgg_log("Cannot set subtypes without type.", 'WARNING');
+		return FALSE;
+	}
+
+	// short circuit if nothing is requested
+	if (!$types && !$subtypes && !$pairs) {
+		return '';
+	}
+
+	// these are the only valid types for entities in elgg
+	$valid_types = elgg_get_config('entity_types');
+
+	// pairs override
+	$wheres = array();
+	if (!is_array($pairs)) {
+		if (!is_array($types)) {
+			$types = array($types);
+		}
+
+		if ($subtypes && !is_array($subtypes)) {
+			$subtypes = array($subtypes);
+		}
+
+		// decrementer for valid types.  Return FALSE if no valid types
+		$valid_types_count = count($types);
+		$valid_subtypes_count = 0;
+		// remove invalid types to get an accurate count of
+		// valid types for the invalid subtype detection to use
+		// below.
+		// also grab the count of ALL subtypes on valid types to decrement later on
+		// and check against.
+		//
+		// yes this is duplicating a foreach on $types.
+		foreach ($types as $type) {
+			if (!in_array($type, $valid_types)) {
+				$valid_types_count--;
+				unset($types[array_search($type, $types)]);
+			} else {
+				// do the checking (and decrementing) in the subtype section.
+				$valid_subtypes_count += count($subtypes);
+			}
+		}
+
+		// return false if nothing is valid.
+		if (!$valid_types_count) {
+			return FALSE;
+		}
+
+		// subtypes are based upon types, so we need to look at each
+		// type individually to get the right subtype id.
+		foreach ($types as $type) {
+			$subtype_ids = array();
+			if ($subtypes) {
+				foreach ($subtypes as $subtype) {
+					// check that the subtype is valid
+					if (!$subtype && ELGG_ENTITIES_NO_VALUE === $subtype) {
+						// subtype value is 0
+						$subtype_ids[] = ELGG_ENTITIES_NO_VALUE;
+					} elseif (!$subtype) {
+						// subtype is ignored.
+						// this handles ELGG_ENTITIES_ANY_VALUE, '', and anything falsy that isn't 0
+						continue;
+					} else {
+						$subtype_id = get_subtype_id($type, $subtype);
+						
+						if ($subtype_id) {
+							$subtype_ids[] = $subtype_id;
+						} else {
+							$valid_subtypes_count--;
+							elgg_log("Type-subtype '$type:$subtype' does not exist!", 'NOTICE');
+							continue;
+						}
+					}
+				}
+
+				// return false if we're all invalid subtypes in the only valid type
+				if ($valid_subtypes_count <= 0) {
+					return FALSE;
+				}
+			}
+
+			if (is_array($subtype_ids) && count($subtype_ids)) {
+				$subtype_ids_str = implode(',', $subtype_ids);
+				$wheres[] = "({$table}.type = '$type' AND {$table}.subtype IN ($subtype_ids_str))";
+			} else {
+				$wheres[] = "({$table}.type = '$type')";
+			}
+		}
+	} else {
+		// using type/subtype pairs
+		$valid_pairs_count = count($pairs);
+		$valid_pairs_subtypes_count = 0;
+
+		// same deal as above--we need to know how many valid types
+		// and subtypes we have before hitting the subtype section.
+		// also normalize the subtypes into arrays here.
+		foreach ($pairs as $paired_type => $paired_subtypes) {
+			if (!in_array($paired_type, $valid_types)) {
+				$valid_pairs_count--;
+				unset($pairs[array_search($paired_type, $pairs)]);
+			} else {
+				if ($paired_subtypes && !is_array($paired_subtypes)) {
+					$pairs[$paired_type] = array($paired_subtypes);
+				}
+				$valid_pairs_subtypes_count += count($paired_subtypes);
+			}
+		}
+
+		if ($valid_pairs_count <= 0) {
+			return FALSE;
+		}
+		foreach ($pairs as $paired_type => $paired_subtypes) {
+			// this will always be an array because of line 2027, right?
+			// no...some overly clever person can say pair => array('object' => null)
+			if (is_array($paired_subtypes)) {
+				$paired_subtype_ids = array();
+				foreach ($paired_subtypes as $paired_subtype) {
+					if (ELGG_ENTITIES_NO_VALUE === $paired_subtype
+					|| ($paired_subtype_id = get_subtype_id($paired_type, $paired_subtype))) {
+
+						$paired_subtype_ids[] = (ELGG_ENTITIES_NO_VALUE === $paired_subtype) ?
+							ELGG_ENTITIES_NO_VALUE : $paired_subtype_id;
+					} else {
+						$valid_pairs_subtypes_count--;
+						elgg_log("Type-subtype '$paired_type:$paired_subtype' does not exist!", 'NOTICE');
+						// return false if we're all invalid subtypes in the only valid type
+						continue;
+					}
+				}
+
+				// return false if there are no valid subtypes.
+				if ($valid_pairs_subtypes_count <= 0) {
+					return FALSE;
+				}
+
+
+				if ($paired_subtype_ids_str = implode(',', $paired_subtype_ids)) {
+					$wheres[] = "({$table}.type = '$paired_type'"
+						. " AND {$table}.subtype IN ($paired_subtype_ids_str))";
+				}
+			} else {
+				$wheres[] = "({$table}.type = '$paired_type')";
+			}
+		}
+	}
+
+	// pairs override the above.  return false if they don't exist.
+	if (is_array($wheres) && count($wheres)) {
+		$where = implode(' OR ', $wheres);
+		return "($where)";
+	}
+
+	return '';
+}
+
+/**
+ * Returns SQL where clause for owner and containers.
+ *
+ * @param string     $column Column name the guids should be checked against. Usually
+ *                           best to provide in table.column format.
+ * @param NULL|array $guids  Array of GUIDs.
+ *
+ * @return false|string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_guid_based_where_sql($column, $guids) {
+	// short circuit if nothing requested
+	// 0 is a valid guid
+	if (!$guids && $guids !== 0) {
+		return '';
+	}
+
+	// normalize and sanitise owners
+	if (!is_array($guids)) {
+		$guids = array($guids);
+	}
+
+	$guids_sanitized = array();
+	foreach ($guids as $guid) {
+		if ($guid !== ELGG_ENTITIES_NO_VALUE) {
+			$guid = sanitise_int($guid);
+
+			if (!$guid) {
+				return false;
+			}
+		}
+		$guids_sanitized[] = $guid;
+	}
+
+	$where = '';
+	$guid_str = implode(',', $guids_sanitized);
+
+	// implode(',', 0) returns 0.
+	if ($guid_str !== FALSE && $guid_str !== '') {
+		$where = "($column IN ($guid_str))";
+	}
+
+	return $where;
+}
+
+/**
+ * Returns SQL where clause for entity time limits.
+ *
+ * @param string   $table              Entity table prefix as defined in
+ *                                     SELECT...FROM entities $table
+ * @param NULL|int $time_created_upper Time created upper limit
+ * @param NULL|int $time_created_lower Time created lower limit
+ * @param NULL|int $time_updated_upper Time updated upper limit
+ * @param NULL|int $time_updated_lower Time updated lower limit
+ *
+ * @return FALSE|string FALSE on fail, string on success.
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_time_where_sql($table, $time_created_upper = NULL,
+$time_created_lower = NULL, $time_updated_upper = NULL, $time_updated_lower = NULL) {
+
+	$wheres = array();
+
+	// exploit PHP's loose typing (quack) to check that they are INTs and not str cast to 0
+	if ($time_created_upper && $time_created_upper == sanitise_int($time_created_upper)) {
+		$wheres[] = "{$table}.time_created <= $time_created_upper";
+	}
+
+	if ($time_created_lower && $time_created_lower == sanitise_int($time_created_lower)) {
+		$wheres[] = "{$table}.time_created >= $time_created_lower";
+	}
+
+	if ($time_updated_upper && $time_updated_upper == sanitise_int($time_updated_upper)) {
+		$wheres[] = "{$table}.time_updated <= $time_updated_upper";
+	}
+
+	if ($time_updated_lower && $time_updated_lower == sanitise_int($time_updated_lower)) {
+		$wheres[] = "{$table}.time_updated >= $time_updated_lower";
+	}
+
+	if (is_array($wheres) && count($wheres) > 0) {
+		$where_str = implode(' AND ', $wheres);
+		return "($where_str)";
+	}
+
+	return '';
+}
+
+/**
+ * Returns a string of parsed entities.
+ *
+ * Displays list of entities with formatting specified
+ * by the entity view.
+ *
+ * @tip Pagination is handled automatically.
+ *
+ * @internal This also provides the views for elgg_view_annotation().
+ *
+ * @param array $options Any options from $getter options plus:
+ *	full_view => BOOL Display full view entities
+ *	list_type => STR 'list' or 'gallery'
+ *	list_type_toggle => BOOL Display gallery / list switch
+ *	pagination => BOOL Display pagination links
+ *
+ * @param mixed $getter  The entity getter function to use to fetch the entities
+ * @param mixed $viewer  The function to use to view the entity list.
+ *
+ * @return string
+ * @since 1.7
+ * @see elgg_get_entities()
+ * @see elgg_view_entity_list()
+ * @link http://docs.elgg.org/Entities/Output
+ */
+function elgg_list_entities(array $options = array(), $getter = 'elgg_get_entities',
+	$viewer = 'elgg_view_entity_list') {
+
+	global $autofeed;
+	$autofeed = true;
+
+	$offset_key = isset($options['offset_key']) ? $options['offset_key'] : 'offset';
+
+	$defaults = array(
+		'offset' => (int) max(get_input($offset_key, 0), 0),
+		'limit' => (int) max(get_input('limit', 10), 0),
+		'full_view' => TRUE,
+		'list_type_toggle' => FALSE,
+		'pagination' => TRUE,
+	);
+
+	$options = array_merge($defaults, $options);
+
+	//backwards compatibility
+	if (isset($options['view_type_toggle'])) {
+		$options['list_type_toggle'] = $options['view_type_toggle'];
+	}
+
+	$options['count'] = TRUE;
+	$count = $getter($options);
+
+	$options['count'] = FALSE;
+	$entities = $getter($options);
+
+	$options['count'] = $count;
+
+	return $viewer($entities, $options);
+}
+
+/**
+ * Returns a list of months in which entities were updated or created.
+ *
+ * @tip Use this to generate a list of archives by month for when entities were added or updated.
+ *
+ * @todo document how to pass in array for $subtype
+ *
+ * @warning Months are returned in the form YYYYMM.
+ *
+ * @param string $type           The type of entity
+ * @param string $subtype        The subtype of entity
+ * @param int    $container_guid The container GUID that the entities belong to
+ * @param int    $site_guid      The site GUID
+ * @param string $order_by       Order_by SQL order by clause
+ *
+ * @return array|false Either an array months as YYYYMM, or false on failure
+ */
+function get_entity_dates($type = '', $subtype = '', $container_guid = 0, $site_guid = 0,
+$order_by = 'time_created') {
+
+	global $CONFIG;
+
+	$site_guid = (int) $site_guid;
+	if ($site_guid == 0) {
+		$site_guid = $CONFIG->site_guid;
+	}
+	$where = array();
+
+	if ($type != "") {
+		$type = sanitise_string($type);
+		$where[] = "type='$type'";
+	}
+
+	if (is_array($subtype)) {
+		$tempwhere = "";
+		if (sizeof($subtype)) {
+			foreach ($subtype as $typekey => $subtypearray) {
+				foreach ($subtypearray as $subtypeval) {
+					$typekey = sanitise_string($typekey);
+					if (!empty($subtypeval)) {
+						if (!$subtypeval = (int) get_subtype_id($typekey, $subtypeval)) {
+							return false;
+						}
+					} else {
+						$subtypeval = 0;
+					}
+					if (!empty($tempwhere)) {
+						$tempwhere .= " or ";
+					}
+					$tempwhere .= "(type = '{$typekey}' and subtype = {$subtypeval})";
+				}
+			}
+		}
+		if (!empty($tempwhere)) {
+			$where[] = "({$tempwhere})";
+		}
+	} else {
+		if ($subtype) {
+			if (!$subtype_id = get_subtype_id($type, $subtype)) {
+				return FALSE;
+			} else {
+				$where[] = "subtype=$subtype_id";
+			}
+		}
+	}
+
+	if ($container_guid !== 0) {
+		if (is_array($container_guid)) {
+			foreach ($container_guid as $key => $val) {
+				$container_guid[$key] = (int) $val;
+			}
+			$where[] = "container_guid in (" . implode(",", $container_guid) . ")";
+		} else {
+			$container_guid = (int) $container_guid;
+			$where[] = "container_guid = {$container_guid}";
+		}
+	}
+
+	if ($site_guid > 0) {
+		$where[] = "site_guid = {$site_guid}";
+	}
+
+	$where[] = get_access_sql_suffix();
+
+	$sql = "SELECT DISTINCT EXTRACT(YEAR_MONTH FROM FROM_UNIXTIME(time_created)) AS yearmonth
+		FROM {$CONFIG->dbprefix}entities where ";
+
+	foreach ($where as $w) {
+		$sql .= " $w and ";
+	}
+
+	$sql .= "1=1 ORDER BY $order_by";
+	if ($result = get_data($sql)) {
+		$endresult = array();
+		foreach ($result as $res) {
+			$endresult[] = $res->yearmonth;
+		}
+		return $endresult;
+	}
+	return false;
+}
+
+/**
+ * Disable an entity.
+ *
+ * Disabled entities do not show up in list or elgg_get_entity()
+ * calls, but still exist in the database.
+ *
+ * Entities are disabled by setting disabled = yes in the
+ * entities table.
+ *
+ * You can ignore the disabled field by using {@link access_show_hidden_entities()}.
+ *
+ * @note Use ElggEntity::disable() instead.
+ *
+ * @param int    $guid      The guid
+ * @param string $reason    Optional reason
+ * @param bool   $recursive Recursively disable all entities owned or contained by $guid?
+ *
+ * @return bool
+ * @see access_show_hidden_entities()
+ * @link http://docs.elgg.org/Entities
+ * @access private
+ */
+function disable_entity($guid, $reason = "", $recursive = true) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	$reason = sanitise_string($reason);
+
+	if ($entity = get_entity($guid)) {
+		if (elgg_trigger_event('disable', $entity->type, $entity)) {
+			if ($entity->canEdit()) {
+				if ($reason) {
+					create_metadata($guid, 'disable_reason', $reason, '', 0, ACCESS_PUBLIC);
+				}
+
+				if ($recursive) {
+					$hidden = access_get_show_hidden_status();
+					access_show_hidden_entities(true);
+					$ia = elgg_set_ignore_access(true);
+					
+					$sub_entities = get_data("SELECT * FROM {$CONFIG->dbprefix}entities
+						WHERE (
+						container_guid = $guid
+						OR owner_guid = $guid
+						OR site_guid = $guid
+						) AND enabled='yes'", 'entity_row_to_elggstar');
+
+					if ($sub_entities) {
+						foreach ($sub_entities as $e) {
+							add_entity_relationship($e->guid, 'disabled_with', $entity->guid);
+							$e->disable($reason);
+						}
+					}
+					access_show_hidden_entities($hidden);
+					elgg_set_ignore_access($ia);
+				}
+
+				$entity->disableMetadata();
+				$entity->disableAnnotations();
+				_elgg_invalidate_cache_for_entity($guid);
+
+				$res = update_data("UPDATE {$CONFIG->dbprefix}entities
+					SET enabled = 'no'
+					WHERE guid = $guid");
+
+				return $res;
+			}
+		}
+	}
+	return false;
+}
+
+/**
+ * Enable an entity.
+ *
+ * @warning In order to enable an entity, you must first use
+ * {@link access_show_hidden_entities()}.
+ *
+ * @param int  $guid      GUID of entity to enable
+ * @param bool $recursive Recursively enable all entities disabled with the entity?
+ *
+ * @return bool
+ */
+function enable_entity($guid, $recursive = true) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+
+	// Override access only visible entities
+	$old_access_status = access_get_show_hidden_status();
+	access_show_hidden_entities(true);
+
+	$result = false;
+	if ($entity = get_entity($guid)) {
+		if (elgg_trigger_event('enable', $entity->type, $entity)) {
+			if ($entity->canEdit()) {
+
+				$result = update_data("UPDATE {$CONFIG->dbprefix}entities
+					SET enabled = 'yes'
+					WHERE guid = $guid");
+
+				$entity->deleteMetadata('disable_reason');
+				$entity->enableMetadata();
+				$entity->enableAnnotations();
+
+				if ($recursive) {
+					$disabled_with_it = elgg_get_entities_from_relationship(array(
+						'relationship' => 'disabled_with',
+						'relationship_guid' => $entity->guid,
+						'inverse_relationship' => true,
+						'limit' => 0,
+					));
+
+					foreach ($disabled_with_it as $e) {
+						$e->enable();
+						remove_entity_relationship($e->guid, 'disabled_with', $entity->guid);
+					}
+				}
+			}
+		}
+	}
+
+	access_show_hidden_entities($old_access_status);
+	return $result;
+}
+
+/**
+ * Delete an entity.
+ *
+ * Removes an entity and its metadata, annotations, relationships, river entries,
+ * and private data.
+ *
+ * Optionally can remove entities contained and owned by $guid.
+ *
+ * @tip Use ElggEntity::delete() instead.
+ *
+ * @warning If deleting recursively, this bypasses ownership of items contained by
+ * the entity.  That means that if the container_guid = $guid, the item will be deleted
+ * regardless of who owns it.
+ *
+ * @param int  $guid      The guid of the entity to delete
+ * @param bool $recursive If true (default) then all entities which are
+ *                        owned or contained by $guid will also be deleted.
+ *
+ * @return bool
+ * @access private
+ */
+function delete_entity($guid, $recursive = true) {
+	global $CONFIG, $ENTITY_CACHE;
+
+	$guid = (int)$guid;
+	if ($entity = get_entity($guid)) {
+		if (elgg_trigger_event('delete', $entity->type, $entity)) {
+			if ($entity->canEdit()) {
+
+				// delete cache
+				if (isset($ENTITY_CACHE[$guid])) {
+					_elgg_invalidate_cache_for_entity($guid);
+				}
+				
+				// If memcache is available then delete this entry from the cache
+				static $newentity_cache;
+				if ((!$newentity_cache) && (is_memcache_available())) {
+					$newentity_cache = new ElggMemcache('new_entity_cache');
+				}
+				if ($newentity_cache) {
+					$newentity_cache->delete($guid);
+				}
+
+				// Delete contained owned and otherwise releated objects (depth first)
+				if ($recursive) {
+					// Temporary token overriding access controls
+					// @todo Do this better.
+					static $__RECURSIVE_DELETE_TOKEN;
+					// Make it slightly harder to guess
+					$__RECURSIVE_DELETE_TOKEN = md5(elgg_get_logged_in_user_guid());
+
+					$entity_disable_override = access_get_show_hidden_status();
+					access_show_hidden_entities(true);
+					$ia = elgg_set_ignore_access(true);
+
+					// @todo there was logic in the original code that ignored
+					// entities with owner or container guids of themselves.
+					// this should probably be prevented in ElggEntity instead of checked for here
+					$options = array(
+						'wheres' => array(
+							"((container_guid = $guid OR owner_guid = $guid OR site_guid = $guid)"
+							. " AND guid != $guid)"
+							),
+						'limit' => 0
+					);
+
+					$batch = new ElggBatch('elgg_get_entities', $options);
+					$batch->setIncrementOffset(false);
+
+					foreach ($batch as $e) {
+						$e->delete(true);
+					}
+
+					access_show_hidden_entities($entity_disable_override);
+					$__RECURSIVE_DELETE_TOKEN = null;
+					elgg_set_ignore_access($ia);
+				}
+
+				$entity_disable_override = access_get_show_hidden_status();
+				access_show_hidden_entities(true);
+				$ia = elgg_set_ignore_access(true);
+
+				// Now delete the entity itself
+				$entity->deleteMetadata();
+				$entity->deleteOwnedMetadata();
+				$entity->deleteAnnotations();
+				$entity->deleteOwnedAnnotations();
+				$entity->deleteRelationships();
+
+				access_show_hidden_entities($entity_disable_override);
+				elgg_set_ignore_access($ia);
+
+				elgg_delete_river(array('subject_guid' => $guid));
+				elgg_delete_river(array('object_guid' => $guid));
+				remove_all_private_settings($guid);
+
+				$res = delete_data("DELETE from {$CONFIG->dbprefix}entities where guid={$guid}");
+				if ($res) {
+					$sub_table = "";
+
+					// Where appropriate delete the sub table
+					switch ($entity->type) {
+						case 'object' :
+							$sub_table = $CONFIG->dbprefix . 'objects_entity';
+							break;
+						case 'user' :
+							$sub_table = $CONFIG->dbprefix . 'users_entity';
+							break;
+						case 'group' :
+							$sub_table = $CONFIG->dbprefix . 'groups_entity';
+							break;
+						case 'site' :
+							$sub_table = $CONFIG->dbprefix . 'sites_entity';
+							break;
+					}
+
+					if ($sub_table) {
+						delete_data("DELETE from $sub_table where guid={$guid}");
+					}
+				}
+
+				return (bool)$res;
+			}
+		}
+	}
+	return false;
+
+}
+
+/**
+ * Exports attributes generated on the fly (volatile) about an entity.
+ *
+ * @param string $hook        volatile
+ * @param string $entity_type metadata
+ * @param string $returnvalue Return value from previous hook
+ * @param array  $params      The parameters, passed 'guid' and 'varname'
+ *
+ * @return ElggMetadata|null
+ * @elgg_plugin_hook_handler volatile metadata
+ * @todo investigate more.
+ * @access private
+ * @todo document
+ */
+function volatile_data_export_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	$guid = (int)$params['guid'];
+	$variable_name = sanitise_string($params['varname']);
+
+	if (($hook == 'volatile') && ($entity_type == 'metadata')) {
+		if (($guid) && ($variable_name)) {
+			switch ($variable_name) {
+				case 'renderedentity' :
+					elgg_set_viewtype('default');
+					$view = elgg_view_entity(get_entity($guid));
+					elgg_set_viewtype();
+
+					$tmp = new ElggMetadata();
+					$tmp->type = 'volatile';
+					$tmp->name = 'renderedentity';
+					$tmp->value = $view;
+					$tmp->entity_guid = $guid;
+
+					return $tmp;
+
+				break;
+			}
+		}
+	}
+}
+
+/**
+ * Exports all attributes of an entity.
+ *
+ * @warning Only exports fields in the entity and entity type tables.
+ *
+ * @param string $hook        export
+ * @param string $entity_type all
+ * @param mixed  $returnvalue Previous hook return value
+ * @param array  $params      Parameters
+ *
+ * @elgg_event_handler export all
+ * @return mixed
+ * @access private
+ *
+ * @throws InvalidParameterException|InvalidClassException
+ */
+function export_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	// Sanity check values
+	if ((!is_array($params)) && (!isset($params['guid']))) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:GUIDNotForExport'));
+	}
+
+	if (!is_array($returnvalue)) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonArrayReturnValue'));
+	}
+
+	$guid = (int)$params['guid'];
+
+	// Get the entity
+	$entity = get_entity($guid);
+	if (!($entity instanceof ElggEntity)) {
+		$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($guid, get_class()));
+		throw new InvalidClassException($msg);
+	}
+
+	$export = $entity->export();
+
+	if (is_array($export)) {
+		foreach ($export as $e) {
+			$returnvalue[] = $e;
+		}
+	} else {
+		$returnvalue[] = $export;
+	}
+
+	return $returnvalue;
+}
+
+/**
+ * Utility function used by import_entity_plugin_hook() to
+ * process an ODDEntity into an unsaved ElggEntity.
+ *
+ * @param ODDEntity $element The OpenDD element
+ *
+ * @return ElggEntity the unsaved entity which should be populated by items.
+ * @todo Remove this.
+ * @access private
+ *
+ * @throws ClassException|InstallationException|ImportException
+ */
+function oddentity_to_elggentity(ODDEntity $element) {
+	$class = $element->getAttribute('class');
+	$subclass = $element->getAttribute('subclass');
+
+	// See if we already have imported this uuid
+	$tmp = get_entity_from_uuid($element->getAttribute('uuid'));
+
+	if (!$tmp) {
+		// Construct new class with owner from session
+		$classname = get_subtype_class($class, $subclass);
+		if ($classname) {
+			if (class_exists($classname)) {
+				$tmp = new $classname();
+
+				if (!($tmp instanceof ElggEntity)) {
+					$msg = elgg_echo('ClassException:ClassnameNotClass', array($classname, get_class()));
+					throw new ClassException($msg);
+				}
+			} else {
+				error_log(elgg_echo('ClassNotFoundException:MissingClass', array($classname)));
+			}
+		} else {
+			switch ($class) {
+				case 'object' :
+					$tmp = new ElggObject($row);
+					break;
+				case 'user' :
+					$tmp = new ElggUser($row);
+					break;
+				case 'group' :
+					$tmp = new ElggGroup($row);
+					break;
+				case 'site' :
+					$tmp = new ElggSite($row);
+					break;
+				default:
+					$msg = elgg_echo('InstallationException:TypeNotSupported', array($class));
+					throw new InstallationException($msg);
+			}
+		}
+	}
+
+	if ($tmp) {
+		if (!$tmp->import($element)) {
+			$msg = elgg_echo('ImportException:ImportFailed', array($element->getAttribute('uuid')));
+			throw new ImportException($msg);
+		}
+
+		return $tmp;
+	}
+
+	return NULL;
+}
+
+/**
+ * Import an entity.
+ *
+ * This function checks the passed XML doc (as array) to see if it is
+ * a user, if so it constructs a new elgg user and returns "true"
+ * to inform the importer that it's been handled.
+ *
+ * @param string $hook        import
+ * @param string $entity_type all
+ * @param mixed  $returnvalue Value from previous hook
+ * @param mixed  $params      Array of params
+ *
+ * @return mixed
+ * @elgg_plugin_hook_handler import all
+ * @todo document
+ * @access private
+ *
+ * @throws ImportException
+ */
+function import_entity_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	$element = $params['element'];
+
+	$tmp = null;
+
+	if ($element instanceof ODDEntity) {
+		$tmp = oddentity_to_elggentity($element);
+
+		if ($tmp) {
+			// Make sure its saved
+			if (!$tmp->save()) {
+				$msg = elgg_echo('ImportException:ProblemSaving', array($element->getAttribute('uuid')));
+				throw new ImportException($msg);
+			}
+
+			// Belts and braces
+			if (!$tmp->guid) {
+				throw new ImportException(elgg_echo('ImportException:NoGUID'));
+			}
+
+			// We have saved, so now tag
+			add_uuid_to_guid($tmp->guid, $element->getAttribute('uuid'));
+
+			return $tmp;
+		}
+	}
+}
+
+/**
+ * Returns if $user_guid is able to edit $entity_guid.
+ *
+ * @tip Can be overridden by by registering for the permissions_check
+ * plugin hook.
+ *
+ * @warning If a $user_guid is not passed it will default to the logged in user.
+ *
+ * @tip Use ElggEntity::canEdit() instead.
+ *
+ * @param int $entity_guid The GUID of the entity
+ * @param int $user_guid   The GUID of the user
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Entities/AccessControl
+ */
+function can_edit_entity($entity_guid, $user_guid = 0) {
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+	if (!$user) {
+		$user = elgg_get_logged_in_user_entity();
+	}
+
+	$return = false;
+	if ($entity = get_entity($entity_guid)) {
+
+		// Test user if possible - should default to false unless a plugin hook says otherwise
+		if ($user) {
+			if ($entity->getOwnerGUID() == $user->getGUID()) {
+				$return = true;
+			}
+			if ($entity->container_guid == $user->getGUID()) {
+				$return = true;
+			}
+			if ($entity->type == "user" && $entity->getGUID() == $user->getGUID()) {
+				$return = true;
+			}
+			if ($container_entity = get_entity($entity->container_guid)) {
+				if ($container_entity->canEdit($user->getGUID())) {
+					$return = true;
+				}
+			}
+		}
+	}
+
+	return elgg_trigger_plugin_hook('permissions_check', $entity->type,
+			array('entity' => $entity, 'user' => $user), $return);
+}
+
+/**
+ * Returns if $user_guid can edit the metadata on $entity_guid.
+ *
+ * @tip Can be overridden by by registering for the permissions_check:metadata
+ * plugin hook.
+ *
+ * @warning If a $user_guid isn't specified, the currently logged in user is used.
+ *
+ * @param int          $entity_guid The GUID of the entity
+ * @param int          $user_guid   The GUID of the user
+ * @param ElggMetadata $metadata    The metadata to specifically check (if any; default null)
+ *
+ * @return bool
+ * @see elgg_register_plugin_hook_handler()
+ */
+function can_edit_entity_metadata($entity_guid, $user_guid = 0, $metadata = null) {
+	if ($entity = get_entity($entity_guid)) {
+
+		$return = null;
+
+		if ($metadata && ($metadata->owner_guid == 0)) {
+			$return = true;
+		}
+		if (is_null($return)) {
+			$return = can_edit_entity($entity_guid, $user_guid);
+		}
+
+		if ($user_guid) {
+			$user = get_entity($user_guid);
+		} else {
+			$user = elgg_get_logged_in_user_entity();
+		}
+
+		$params = array('entity' => $entity, 'user' => $user, 'metadata' => $metadata);
+		$return = elgg_trigger_plugin_hook('permissions_check:metadata', $entity->type, $params, $return);
+		return $return;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Returns the URL for an entity.
+ *
+ * @tip Can be overridden with {@link register_entity_url_handler()}.
+ *
+ * @param int $entity_guid The GUID of the entity
+ *
+ * @return string The URL of the entity
+ * @see register_entity_url_handler()
+ */
+function get_entity_url($entity_guid) {
+	global $CONFIG;
+
+	if ($entity = get_entity($entity_guid)) {
+		$url = "";
+
+		if (isset($CONFIG->entity_url_handler[$entity->getType()][$entity->getSubType()])) {
+			$function = $CONFIG->entity_url_handler[$entity->getType()][$entity->getSubType()];
+			if (is_callable($function)) {
+				$url = call_user_func($function, $entity);
+			}
+		} elseif (isset($CONFIG->entity_url_handler[$entity->getType()]['all'])) {
+			$function = $CONFIG->entity_url_handler[$entity->getType()]['all'];
+			if (is_callable($function)) {
+				$url = call_user_func($function, $entity);
+			}
+		} elseif (isset($CONFIG->entity_url_handler['all']['all'])) {
+			$function = $CONFIG->entity_url_handler['all']['all'];
+			if (is_callable($function)) {
+				$url = call_user_func($function, $entity);
+			}
+		}
+
+		if ($url == "") {
+			$url = "view/" . $entity_guid;
+		}
+
+		return elgg_normalize_url($url);
+	}
+
+	return false;
+}
+
+/**
+ * Sets the URL handler for a particular entity type and subtype
+ *
+ * @param string $entity_type    The entity type
+ * @param string $entity_subtype The entity subtype
+ * @param string $function_name  The function to register
+ *
+ * @return bool Depending on success
+ * @see get_entity_url()
+ * @see ElggEntity::getURL()
+ * @since 1.8.0
+ */
+function elgg_register_entity_url_handler($entity_type, $entity_subtype, $function_name) {
+	global $CONFIG;
+
+	if (!is_callable($function_name, true)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->entity_url_handler)) {
+		$CONFIG->entity_url_handler = array();
+	}
+
+	if (!isset($CONFIG->entity_url_handler[$entity_type])) {
+		$CONFIG->entity_url_handler[$entity_type] = array();
+	}
+
+	$CONFIG->entity_url_handler[$entity_type][$entity_subtype] = $function_name;
+
+	return true;
+}
+
+/**
+ * Registers an entity type and subtype as a public-facing entity that should
+ * be shown in search and by {@link elgg_list_registered_entities()}.
+ *
+ * @warning Entities that aren't registered here will not show up in search.
+ *
+ * @tip Add a language string item:type:subtype to make sure the items are display properly.
+ *
+ * @param string $type    The type of entity (object, site, user, group)
+ * @param string $subtype The subtype to register (may be blank)
+ *
+ * @return bool Depending on success
+ * @see get_registered_entity_types()
+ * @link http://docs.elgg.org/Search
+ * @link http://docs.elgg.org/Tutorials/Search
+ */
+function elgg_register_entity_type($type, $subtype = null) {
+	global $CONFIG;
+
+	$type = strtolower($type);
+	if (!in_array($type, $CONFIG->entity_types)) {
+		return FALSE;
+	}
+
+	if (!isset($CONFIG->registered_entities)) {
+		$CONFIG->registered_entities = array();
+	}
+
+	if (!isset($CONFIG->registered_entities[$type])) {
+		$CONFIG->registered_entities[$type] = array();
+	}
+
+	if ($subtype) {
+		$CONFIG->registered_entities[$type][] = $subtype;
+	}
+
+	return TRUE;
+}
+
+/**
+ * Unregisters an entity type and subtype as a public-facing entity.
+ *
+ * @warning With a blank subtype, it unregisters that entity type including
+ * all subtypes. This must be called after all subtypes have been registered.
+ *
+ * @param string $type    The type of entity (object, site, user, group)
+ * @param string $subtype The subtype to register (may be blank)
+ *
+ * @return bool Depending on success
+ * @see elgg_register_entity_type()
+ */
+function unregister_entity_type($type, $subtype) {
+	global $CONFIG;
+
+	$type = strtolower($type);
+	if (!in_array($type, $CONFIG->entity_types)) {
+		return FALSE;
+	}
+
+	if (!isset($CONFIG->registered_entities)) {
+		return FALSE;
+	}
+
+	if (!isset($CONFIG->registered_entities[$type])) {
+		return FALSE;
+	}
+
+	if ($subtype) {
+		if (in_array($subtype, $CONFIG->registered_entities[$type])) {
+			$key = array_search($subtype, $CONFIG->registered_entities[$type]);
+			unset($CONFIG->registered_entities[$type][$key]);
+		} else {
+			return FALSE;
+		}
+	} else {
+		unset($CONFIG->registered_entities[$type]);
+	}
+
+	return TRUE;
+}
+
+/**
+ * Returns registered entity types and subtypes
+ *
+ * @param string $type The type of entity (object, site, user, group) or blank for all
+ *
+ * @return array|false Depending on whether entities have been registered
+ * @see elgg_register_entity_type()
+ */
+function get_registered_entity_types($type = null) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->registered_entities)) {
+		return false;
+	}
+	if ($type) {
+		$type = strtolower($type);
+	}
+	if (!empty($type) && empty($CONFIG->registered_entities[$type])) {
+		return false;
+	}
+
+	if (empty($type)) {
+		return $CONFIG->registered_entities;
+	}
+
+	return $CONFIG->registered_entities[$type];
+}
+
+/**
+ * Returns if the entity type and subtype have been registered with {@see elgg_register_entity_type()}.
+ *
+ * @param string $type    The type of entity (object, site, user, group)
+ * @param string $subtype The subtype (may be blank)
+ *
+ * @return bool Depending on whether or not the type has been registered
+ */
+function is_registered_entity_type($type, $subtype = null) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->registered_entities)) {
+		return false;
+	}
+
+	$type = strtolower($type);
+
+	// @todo registering a subtype implicitly registers the type.
+	// see #2684
+	if (!isset($CONFIG->registered_entities[$type])) {
+		return false;
+	}
+
+	if ($subtype && !in_array($subtype, $CONFIG->registered_entities[$type])) {
+		return false;
+	}
+	return true;
+}
+
+/**
+ * Page handler for generic entities view system
+ *
+ * @param array $page Page elements from pain page handler
+ *
+ * @return bool
+ * @elgg_page_handler view
+ * @access private
+ */
+function entities_page_handler($page) {
+	if (isset($page[0])) {
+		global $CONFIG;
+		set_input('guid', $page[0]);
+		include($CONFIG->path . "pages/entities/index.php");
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Returns a viewable list of entities based on the registered types.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param array $options Any elgg_get_entity() options plus:
+ *
+ * 	full_view => BOOL Display full view entities
+ *
+ * 	list_type_toggle => BOOL Display gallery / list switch
+ *
+ * 	allowed_types => TRUE|ARRAY True to show all types or an array of valid types.
+ *
+ * 	pagination => BOOL Display pagination links
+ *
+ * @return string A viewable list of entities
+ * @since 1.7.0
+ */
+function elgg_list_registered_entities(array $options = array()) {
+	global $autofeed;
+	$autofeed = true;
+
+	$defaults = array(
+		'full_view' => TRUE,
+		'allowed_types' => TRUE,
+		'list_type_toggle' => FALSE,
+		'pagination' => TRUE,
+		'offset' => 0,
+		'types' => array(),
+		'type_subtype_pairs' => array()
+	);
+
+	$options = array_merge($defaults, $options);
+
+	//backwards compatibility
+	if (isset($options['view_type_toggle'])) {
+		$options['list_type_toggle'] = $options['view_type_toggle'];
+	}
+
+	$types = get_registered_entity_types();
+
+	foreach ($types as $type => $subtype_array) {
+		if (in_array($type, $options['allowed_types']) || $options['allowed_types'] === TRUE) {
+			// you must explicitly register types to show up in here and in search for objects
+			if ($type == 'object') {
+				if (is_array($subtype_array) && count($subtype_array)) {
+					$options['type_subtype_pairs'][$type] = $subtype_array;
+				}
+			} else {
+				if (is_array($subtype_array) && count($subtype_array)) {
+					$options['type_subtype_pairs'][$type] = $subtype_array;
+				} else {
+					$options['type_subtype_pairs'][$type] = ELGG_ENTITIES_ANY_VALUE;
+				}
+			}
+		}
+	}
+
+	if (!empty($options['type_subtype_pairs'])) {
+		$count = elgg_get_entities(array_merge(array('count' => TRUE), $options));
+		$entities = elgg_get_entities($options);
+	} else {
+		$count = 0;
+		$entities = array();
+	}
+
+	$options['count'] = $count;
+	return elgg_view_entity_list($entities, $options);
+}
+
+/**
+ * Checks if $entity is an ElggEntity and optionally for type and subtype.
+ *
+ * @tip Use this function in actions and views to check that you are dealing
+ * with the correct type of entity.
+ *
+ * @param mixed  $entity  Entity
+ * @param string $type    Entity type
+ * @param string $subtype Entity subtype
+ * @param string $class   Class name
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_instanceof($entity, $type = NULL, $subtype = NULL, $class = NULL) {
+	$return = ($entity instanceof ElggEntity);
+
+	if ($type) {
+		/* @var ElggEntity $entity */
+		$return = $return && ($entity->getType() == $type);
+	}
+
+	if ($subtype) {
+		$return = $return && ($entity->getSubtype() == $subtype);
+	}
+
+	if ($class) {
+		$return = $return && ($entity instanceof $class);
+	}
+
+	return $return;
+}
+
+/**
+ * Update the last_action column in the entities table for $guid.
+ *
+ * @warning This is different to time_updated.  Time_updated is automatically set,
+ * while last_action is only set when explicitly called.
+ *
+ * @param int $guid   Entity annotation|relationship action carried out on
+ * @param int $posted Timestamp of last action
+ *
+ * @return bool
+ * @access private
+ */
+function update_entity_last_action($guid, $posted = NULL) {
+	global $CONFIG;
+	$guid = (int)$guid;
+	$posted = (int)$posted;
+
+	if (!$posted) {
+		$posted = time();
+	}
+
+	if ($guid) {
+		//now add to the river updated table
+		$query = "UPDATE {$CONFIG->dbprefix}entities SET last_action = {$posted} WHERE guid = {$guid}";
+		$result = update_data($query);
+		if ($result) {
+			return TRUE;
+		} else {
+			return FALSE;
+		}
+	} else {
+		return FALSE;
+	}
+}
+
+/**
+ * Garbage collect stub and fragments from any broken delete/create calls
+ *
+ * @return void
+ * @elgg_plugin_hook_handler gc system
+ * @access private
+ */
+function entities_gc() {
+	global $CONFIG;
+
+	$tables = array(
+		'site' => 'sites_entity',
+		'object' => 'objects_entity',
+		'group' => 'groups_entity',
+		'user' => 'users_entity'
+	);
+
+	foreach ($tables as $type => $table) {
+		delete_data("DELETE FROM {$CONFIG->dbprefix}{$table}
+			WHERE guid NOT IN (SELECT guid FROM {$CONFIG->dbprefix}entities)");
+		delete_data("DELETE FROM {$CONFIG->dbprefix}entities
+			WHERE type = '$type' AND guid NOT IN (SELECT guid FROM {$CONFIG->dbprefix}{$table})");
+	}
+}
+
+/**
+ * Runs unit tests for the entity objects.
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function entities_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/objects/entities.php';
+	return $value;
+}
+
+/**
+ * Entities init function; establishes the default entity page handler
+ *
+ * @return void
+ * @elgg_event_handler init system
+ * @access private
+ */
+function entities_init() {
+	elgg_register_page_handler('view', 'entities_page_handler');
+
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'entities_test');
+
+	elgg_register_plugin_hook_handler('gc', 'system', 'entities_gc');
+}
+
+/** Register the import hook */
+elgg_register_plugin_hook_handler("import", "all", "import_entity_plugin_hook", 0);
+
+/** Register the hook, ensuring entities are serialised first */
+elgg_register_plugin_hook_handler("export", "all", "export_entity_plugin_hook", 0);
+
+/** Hook to get certain named bits of volatile data about an entity */
+elgg_register_plugin_hook_handler('volatile', 'metadata', 'volatile_data_export_plugin_hook');
+
+/** Register init system event **/
+elgg_register_event_handler('init', 'system', 'entities_init');
+
diff --git a/engine/lib/export.php b/engine/lib/export.php
new file mode 100644
index 000000000..ecc894e63
--- /dev/null
+++ b/engine/lib/export.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Elgg Data import export functionality.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Export
+ */
+
+/**
+ * Get a UUID from a given object.
+ *
+ * @param mixed $object The object either an ElggEntity, ElggRelationship or ElggExtender
+ *
+ * @return string|false the UUID or false
+ */
+function get_uuid_from_object($object) {
+	if ($object instanceof ElggEntity) {
+		return guid_to_uuid($object->guid);
+	} else if ($object instanceof ElggExtender) {
+		$type = $object->type;
+		if ($type == 'volatile') {
+			$uuid = guid_to_uuid($object->entity_guid) . $type . "/{$object->name}/";
+		} else {
+			$uuid = guid_to_uuid($object->entity_guid) . $type . "/{$object->id}/";
+		}
+
+		return $uuid;
+	} else if ($object instanceof ElggRelationship) {
+		return guid_to_uuid($object->guid_one) . "relationship/{$object->id}/";
+	}
+
+	return false;
+}
+
+/**
+ * Generate a UUID from a given GUID.
+ *
+ * @param int $guid The GUID of an object.
+ *
+ * @return string
+ */
+function guid_to_uuid($guid) {
+	return elgg_get_site_url()  . "export/opendd/$guid/";
+}
+
+/**
+ * Test to see if a given uuid is for this domain, returning true if so.
+ *
+ * @param string $uuid A unique ID
+ *
+ * @return bool
+ */
+function is_uuid_this_domain($uuid) {
+	if (strpos($uuid, elgg_get_site_url()) === 0) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * This function attempts to retrieve a previously imported entity via its UUID.
+ *
+ * @param string $uuid A unique ID
+ *
+ * @return ElggEntity|false
+ */
+function get_entity_from_uuid($uuid) {
+	$uuid = sanitise_string($uuid);
+
+	$options = array('metadata_name' => 'import_uuid', 'metadata_value' => $uuid);
+	$entities = elgg_get_entities_from_metadata($options);
+
+	if ($entities) {
+		return $entities[0];
+	}
+
+	return false;
+}
+
+/**
+ * Tag a previously created guid with the uuid it was imported on.
+ *
+ * @param int    $guid A GUID
+ * @param string $uuid A Unique ID
+ *
+ * @return bool
+ */
+function add_uuid_to_guid($guid, $uuid) {
+	$guid = (int)$guid;
+	$uuid = sanitise_string($uuid);
+
+	$result = create_metadata($guid, "import_uuid", $uuid);
+	return (bool)$result;
+}
+
+
+$IMPORTED_DATA = array();
+$IMPORTED_OBJECT_COUNTER = 0;
+
+/**
+ * This function processes an element, passing elements to the plugin stack to see if someone will
+ * process it.
+ *
+ * If nobody processes the top level element, the sub level elements are processed.
+ *
+ * @param ODD $odd The odd element to process
+ *
+ * @return bool
+ * @access private
+ */
+function _process_element(ODD $odd) {
+	global $IMPORTED_DATA, $IMPORTED_OBJECT_COUNTER;
+
+	// See if anyone handles this element, return true if it is.
+	$to_be_serialised = null;
+	if ($odd) {
+		$handled = elgg_trigger_plugin_hook("import", "all", array("element" => $odd), $to_be_serialised);
+
+		// If not, then see if any of its sub elements are handled
+		if ($handled) {
+			// Increment validation counter
+			$IMPORTED_OBJECT_COUNTER ++;
+			// Return the constructed object
+			$IMPORTED_DATA[] = $handled;
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Exports an entity as an array
+ *
+ * @param int $guid Entity GUID
+ *
+ * @return array
+ * @throws ExportException
+ * @access private
+ */
+function exportAsArray($guid) {
+	$guid = (int)$guid;
+
+	// Trigger a hook to
+	$to_be_serialised = elgg_trigger_plugin_hook("export", "all", array("guid" => $guid), array());
+
+	// Sanity check
+	if ((!is_array($to_be_serialised)) || (count($to_be_serialised) == 0)) {
+		throw new ExportException(elgg_echo('ExportException:NoSuchEntity', array($guid)));
+	}
+
+	return $to_be_serialised;
+}
+
+/**
+ * Export a GUID.
+ *
+ * This function exports a GUID and all information related to it in an XML format.
+ *
+ * This function makes use of the "serialise" plugin hook, which is passed an array to which plugins
+ * should add data to be serialised to.
+ *
+ * @param int $guid The GUID.
+ *
+ * @return string XML
+ * @see ElggEntity for an example of its usage.
+ * @access private
+ */
+function export($guid) {
+	$odd = new ODDDocument(exportAsArray($guid));
+
+	return ODD_Export($odd);
+}
+
+/**
+ * Import an XML serialisation of an object.
+ * This will make a best attempt at importing a given xml doc.
+ *
+ * @param string $xml XML string
+ *
+ * @return bool
+ * @throws ImportException if there was a problem importing the data.
+ * @access private
+ */
+function import($xml) {
+	global $IMPORTED_DATA, $IMPORTED_OBJECT_COUNTER;
+
+	$IMPORTED_DATA = array();
+	$IMPORTED_OBJECT_COUNTER = 0;
+
+	$document = ODD_Import($xml);
+	if (!$document) {
+		throw new ImportException(elgg_echo('ImportException:NoODDElements'));
+	}
+
+	foreach ($document as $element) {
+		_process_element($element);
+	}
+
+	if ($IMPORTED_OBJECT_COUNTER != count($IMPORTED_DATA)) {
+		throw new ImportException(elgg_echo('ImportException:NotAllImported'));
+	}
+
+	return true;
+}
+
+
+/**
+ * Register the OpenDD import action
+ *
+ * @return void
+ * @access private
+ */
+function export_init() {
+	global $CONFIG;
+
+	elgg_register_action("import/opendd");
+}
+
+// Register a startup event
+elgg_register_event_handler('init', 'system', 'export_init', 100);
diff --git a/engine/lib/extender.php b/engine/lib/extender.php
new file mode 100644
index 000000000..8323bd3ce
--- /dev/null
+++ b/engine/lib/extender.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Elgg Entity Extender.
+ * This file contains ways of extending an Elgg entity in custom ways.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Extender
+ */
+
+/**
+ * Detect the value_type for a given value.
+ * Currently this is very crude.
+ *
+ * @todo Make better!
+ *
+ * @param mixed  $value      The value
+ * @param string $value_type If specified, overrides the detection.
+ *
+ * @return string
+ */
+function detect_extender_valuetype($value, $value_type = "") {
+	if ($value_type != "" && ($value_type == 'integer' || $value_type == 'text')) {
+		return $value_type;
+	}
+
+	// This is crude
+	if (is_int($value)) {
+		return 'integer';
+	}
+	// Catch floating point values which are not integer
+	if (is_numeric($value)) {
+		return 'text';
+	}
+
+	return 'text';
+}
+
+/**
+ * Utility function used by import_extender_plugin_hook() to process
+ * an ODDMetaData and add it to an entity. This function does not
+ * hit ->save() on the entity (this lets you construct in memory)
+ *
+ * @param ElggEntity  $entity  The entity to add the data to.
+ * @param ODDMetaData $element The OpenDD element
+ *
+ * @return bool
+ * @access private
+ */
+function oddmetadata_to_elggextender(ElggEntity $entity, ODDMetaData $element) {
+	// Get the type of extender (metadata, type, attribute etc)
+	$type = $element->getAttribute('type');
+	$attr_name = $element->getAttribute('name');
+	$attr_val = $element->getBody();
+
+	switch ($type) {
+		// Ignore volatile items
+		case 'volatile' :
+			break;
+		case 'annotation' :
+			$entity->annotate($attr_name, $attr_val);
+			break;
+		case 'metadata' :
+			$entity->setMetaData($attr_name, $attr_val, "", true);
+			break;
+		default : // Anything else assume attribute
+			$entity->set($attr_name, $attr_val);
+	}
+
+	// Set time if appropriate
+	$attr_time = $element->getAttribute('published');
+	if ($attr_time) {
+		$entity->set('time_updated', $attr_time);
+	}
+
+	return true;
+}
+
+/**
+ *  Handler called by trigger_plugin_hook on the "import" event.
+ *
+ * @param string $hook        volatile
+ * @param string $entity_type metadata
+ * @param string $returnvalue Return value from previous hook
+ * @param array  $params      The parameters
+ *
+ * @return null
+ * @elgg_plugin_hook_handler volatile metadata
+ * @todo investigate more.
+ * @throws ImportException
+ * @access private
+ */
+function import_extender_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	$element = $params['element'];
+
+	$tmp = NULL;
+
+	if ($element instanceof ODDMetaData) {
+		/* @var ODDMetaData $element */
+		// Recall entity
+		$entity_uuid = $element->getAttribute('entity_uuid');
+		$entity = get_entity_from_uuid($entity_uuid);
+		if (!$entity) {
+			throw new ImportException(elgg_echo('ImportException:GUIDNotFound', array($entity_uuid)));
+		}
+
+		oddmetadata_to_elggextender($entity, $element);
+
+		// Save
+		if (!$entity->save()) {
+			$attr_name = $element->getAttribute('name');
+			$msg = elgg_echo('ImportException:ProblemUpdatingMeta', array($attr_name, $entity_uuid));
+			throw new ImportException($msg);
+		}
+
+		return true;
+	}
+}
+
+/**
+ * Determines whether or not the specified user can edit the specified piece of extender
+ *
+ * @param int    $extender_id The ID of the piece of extender
+ * @param string $type        'metadata' or 'annotation'
+ * @param int    $user_guid   The GUID of the user
+ *
+ * @return bool
+ */
+function can_edit_extender($extender_id, $type, $user_guid = 0) {
+	// @todo Since Elgg 1.0, Elgg has returned false from can_edit_extender()
+	// if no user was logged in. This breaks the access override. This is a
+	// temporary work around. This function needs to be rewritten in Elgg 1.9 
+	if (!elgg_check_access_overrides($user_guid)) {
+		if (!elgg_is_logged_in()) {
+			return false;
+		}
+	}
+
+	$user_guid = (int)$user_guid;
+	$user = get_user($user_guid);
+	if (!$user) {
+		$user = elgg_get_logged_in_user_entity();
+		$user_guid = elgg_get_logged_in_user_guid();
+	}
+
+	$functionname = "elgg_get_{$type}_from_id";
+	if (is_callable($functionname)) {
+		$extender = call_user_func($functionname, $extender_id);
+	} else {
+		return false;
+	}
+
+	if (!($extender instanceof ElggExtender)) {
+		return false;
+	}
+	/* @var ElggExtender $extender */
+
+	// If the owner is the specified user, great! They can edit.
+	if ($extender->getOwnerGUID() == $user_guid) {
+		return true;
+	}
+
+	// If the user can edit the entity this is attached to, great! They can edit.
+	if (can_edit_entity($extender->entity_guid, $user_guid)) {
+		return true;
+	}
+
+	// Trigger plugin hook - note that $user may be null
+	$params = array('entity' => $extender->getEntity(), 'user' => $user);
+	return elgg_trigger_plugin_hook('permissions_check', $type, $params, false);
+}
+
+/**
+ * Sets the URL handler for a particular extender type and name.
+ * It is recommended that you do not call this directly, instead use
+ * one of the wrapper functions such as elgg_register_annotation_url_handler().
+ *
+ * @param string $extender_type Extender type ('annotation', 'metadata')
+ * @param string $extender_name The name of the extender
+ * @param string $function_name The function to register
+ *
+ * @return bool
+ */
+function elgg_register_extender_url_handler($extender_type, $extender_name, $function_name) {
+
+	global $CONFIG;
+
+	if (!is_callable($function_name, true)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->extender_url_handler)) {
+		$CONFIG->extender_url_handler = array();
+	}
+	if (!isset($CONFIG->extender_url_handler[$extender_type])) {
+		$CONFIG->extender_url_handler[$extender_type] = array();
+	}
+	$CONFIG->extender_url_handler[$extender_type][$extender_name] = $function_name;
+
+	return true;
+}
+
+/**
+ * Get the URL of a given elgg extender.
+ * Used by get_annotation_url and get_metadata_url.
+ *
+ * @param ElggExtender $extender An extender object
+ *
+ * @return string
+ */
+function get_extender_url(ElggExtender $extender) {
+	global $CONFIG;
+
+	$view = elgg_get_viewtype();
+
+	$guid = $extender->entity_guid;
+	$type = $extender->type;
+
+	$url = "";
+
+	$function = "";
+	if (isset($CONFIG->extender_url_handler[$type][$extender->name])) {
+		$function = $CONFIG->extender_url_handler[$type][$extender->name];
+	}
+
+	if (isset($CONFIG->extender_url_handler[$type]['all'])) {
+		$function = $CONFIG->extender_url_handler[$type]['all'];
+	}
+
+	if (isset($CONFIG->extender_url_handler['all']['all'])) {
+		$function = $CONFIG->extender_url_handler['all']['all'];
+	}
+
+	if (is_callable($function)) {
+		$url = call_user_func($function, $extender);
+	}
+
+	if ($url == "") {
+		$nameid = $extender->id;
+		if ($type == 'volatile') {
+			$nameid = $extender->name;
+		}
+		$url = "export/$view/$guid/$type/$nameid/";
+	}
+
+	return elgg_normalize_url($url);
+}
+
+/** Register the hook */
+elgg_register_plugin_hook_handler("import", "all", "import_extender_plugin_hook", 2);
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
new file mode 100644
index 000000000..a3c7ba439
--- /dev/null
+++ b/engine/lib/filestore.php
@@ -0,0 +1,520 @@
+<?php
+/**
+ * Elgg filestore.
+ * This file contains classes, interfaces and functions for
+ * saving and retrieving data to various file stores.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.FileStorage
+ */
+
+/**
+ * Get the size of the specified directory.
+ *
+ * @param string $dir       The full path of the directory
+ * @param int    $totalsize Add to current dir size
+ *
+ * @return int The size of the directory.
+ */
+function get_dir_size($dir, $totalsize = 0) {
+	$handle = @opendir($dir);
+	while ($file = @readdir($handle)) {
+		if (eregi("^\.{1,2}$", $file)) {
+			continue;
+		}
+		if (is_dir($dir . $file)) {
+			$totalsize = get_dir_size($dir . $file . "/", $totalsize);
+		} else {
+			$totalsize += filesize($dir . $file);
+		}
+	}
+	@closedir($handle);
+
+	return($totalsize);
+}
+
+/**
+ * Get the contents of an uploaded file.
+ * (Returns false if there was an issue.)
+ *
+ * @param string $input_name The name of the file input field on the submission form
+ *
+ * @return mixed|false The contents of the file, or false on failure.
+ */
+function get_uploaded_file($input_name) {
+	// If the file exists ...
+	if (isset($_FILES[$input_name]) && $_FILES[$input_name]['error'] == 0) {
+		return file_get_contents($_FILES[$input_name]['tmp_name']);
+	}
+	return false;
+}
+
+/**
+ * Gets the jpeg contents of the resized version of an uploaded image
+ * (Returns false if the uploaded file was not an image)
+ *
+ * @param string $input_name The name of the file input field on the submission form
+ * @param int    $maxwidth   The maximum width of the resized image
+ * @param int    $maxheight  The maximum height of the resized image
+ * @param bool   $square     If set to true, will take the smallest
+ *                           of maxwidth and maxheight and use it to set the
+ *                           dimensions on all size; the image will be cropped.
+ * @param bool   $upscale    Resize images smaller than $maxwidth x $maxheight?
+ *
+ * @return false|mixed The contents of the resized image, or false on failure
+ */
+function get_resized_image_from_uploaded_file($input_name, $maxwidth, $maxheight,
+$square = false, $upscale = false) {
+
+	// If our file exists ...
+	if (isset($_FILES[$input_name]) && $_FILES[$input_name]['error'] == 0) {
+		return get_resized_image_from_existing_file($_FILES[$input_name]['tmp_name'], $maxwidth,
+			$maxheight, $square, 0, 0, 0, 0, $upscale);
+	}
+
+	return false;
+}
+
+/**
+ * Gets the jpeg contents of the resized version of an already uploaded image
+ * (Returns false if the file was not an image)
+ *
+ * @param string $input_name The name of the file on the disk
+ * @param int    $maxwidth   The desired width of the resized image
+ * @param int    $maxheight  The desired height of the resized image
+ * @param bool   $square     If set to true, takes the smallest of maxwidth and
+ * 			                 maxheight and use it to set the dimensions on the new image.
+ *                           If no crop parameters are set, the largest square that fits
+ *                           in the image centered will be used for the resize. If square,
+ *                           the crop must be a square region.
+ * @param int    $x1         x coordinate for top, left corner
+ * @param int    $y1         y coordinate for top, left corner
+ * @param int    $x2         x coordinate for bottom, right corner
+ * @param int    $y2         y coordinate for bottom, right corner
+ * @param bool   $upscale    Resize images smaller than $maxwidth x $maxheight?
+ *
+ * @return false|mixed The contents of the resized image, or false on failure
+ */
+function get_resized_image_from_existing_file($input_name, $maxwidth, $maxheight, $square = FALSE,
+$x1 = 0, $y1 = 0, $x2 = 0, $y2 = 0, $upscale = FALSE) {
+
+	// Get the size information from the image
+	$imgsizearray = getimagesize($input_name);
+	if ($imgsizearray == FALSE) {
+		return FALSE;
+	}
+
+	$width = $imgsizearray[0];
+	$height = $imgsizearray[1];
+
+	$accepted_formats = array(
+		'image/jpeg' => 'jpeg',
+		'image/pjpeg' => 'jpeg',
+		'image/png' => 'png',
+		'image/x-png' => 'png',
+		'image/gif' => 'gif'
+	);
+
+	// make sure the function is available
+	$load_function = "imagecreatefrom" . $accepted_formats[$imgsizearray['mime']];
+	if (!is_callable($load_function)) {
+		return FALSE;
+	}
+
+	// get the parameters for resizing the image
+	$options = array(
+		'maxwidth' => $maxwidth,
+		'maxheight' => $maxheight,
+		'square' => $square,
+		'upscale' => $upscale,
+		'x1' => $x1,
+		'y1' => $y1,
+		'x2' => $x2,
+		'y2' => $y2,
+	);
+	$params = get_image_resize_parameters($width, $height, $options);
+	if ($params == FALSE) {
+		return FALSE;
+	}
+
+	// load original image
+	$original_image = $load_function($input_name);
+	if (!$original_image) {
+		return FALSE;
+	}
+
+	// allocate the new image
+	$new_image = imagecreatetruecolor($params['newwidth'], $params['newheight']);
+	if (!$new_image) {
+		return FALSE;
+	}
+
+	// color transparencies white (default is black)
+	imagefilledrectangle(
+		$new_image, 0, 0, $params['newwidth'], $params['newheight'],
+		imagecolorallocate($new_image, 255, 255, 255)
+	);
+
+	$rtn_code = imagecopyresampled(	$new_image,
+									$original_image,
+									0,
+									0,
+									$params['xoffset'],
+									$params['yoffset'],
+									$params['newwidth'],
+									$params['newheight'],
+									$params['selectionwidth'],
+									$params['selectionheight']);
+	if (!$rtn_code) {
+		return FALSE;
+	}
+
+	// grab a compressed jpeg version of the image
+	ob_start();
+	imagejpeg($new_image, NULL, 90);
+	$jpeg = ob_get_clean();
+
+	imagedestroy($new_image);
+	imagedestroy($original_image);
+
+	return $jpeg;
+}
+
+/**
+ * Calculate the parameters for resizing an image
+ *
+ * @param int   $width   Width of the original image
+ * @param int   $height  Height of the original image
+ * @param array $options See $defaults for the options
+ *
+ * @return array or FALSE
+ * @since 1.7.2
+ */
+function get_image_resize_parameters($width, $height, $options) {
+
+	$defaults = array(
+		'maxwidth' => 100,
+		'maxheight' => 100,
+
+		'square' => FALSE,
+		'upscale' => FALSE,
+
+		'x1' => 0,
+		'y1' => 0,
+		'x2' => 0,
+		'y2' => 0,
+	);
+
+	$options = array_merge($defaults, $options);
+
+	extract($options);
+
+	// crop image first?
+	$crop = TRUE;
+	if ($x1 == 0 && $y1 == 0 && $x2 == 0 && $y2 == 0) {
+		$crop = FALSE;
+	}
+
+	// how large a section of the image has been selected
+	if ($crop) {
+		$selection_width = $x2 - $x1;
+		$selection_height = $y2 - $y1;
+	} else {
+		// everything selected if no crop parameters
+		$selection_width = $width;
+		$selection_height = $height;
+	}
+
+	// determine cropping offsets
+	if ($square) {
+		// asking for a square image back
+
+		// detect case where someone is passing crop parameters that are not for a square
+		if ($crop == TRUE && $selection_width != $selection_height) {
+			return FALSE;
+		}
+
+		// size of the new square image
+		$new_width = $new_height = min($maxwidth, $maxheight);
+
+		// find largest square that fits within the selected region
+		$selection_width = $selection_height = min($selection_width, $selection_height);
+
+		// set offsets for crop
+		if ($crop) {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
+			$width = $x2 - $x1;
+			$height = $width;
+		} else {
+			// place square region in the center
+			$widthoffset = floor(($width - $selection_width) / 2);
+			$heightoffset = floor(($height - $selection_height) / 2);
+		}
+	} else {
+		// non-square new image
+		$new_width = $maxwidth;
+		$new_height = $maxheight;
+
+		// maintain aspect ratio of original image/crop
+		if (($selection_height / (float)$new_height) > ($selection_width / (float)$new_width)) {
+			$new_width = floor($new_height * $selection_width / (float)$selection_height);
+		} else {
+			$new_height = floor($new_width * $selection_height / (float)$selection_width);
+		}
+
+		// by default, use entire image
+		$widthoffset = 0;
+		$heightoffset = 0;
+
+		if ($crop) {
+			$widthoffset = $x1;
+			$heightoffset = $y1;
+		}
+	}
+
+	if (!$upscale && ($selection_height < $new_height || $selection_width < $new_width)) {
+		// we cannot upscale and selected area is too small so we decrease size of returned image
+		if ($square) {
+			$new_height = $selection_height;
+			$new_width = $selection_width;
+		} else {
+			if ($selection_height < $new_height && $selection_width < $new_width) {
+				$new_height = $selection_height;
+				$new_width = $selection_width;
+			}
+		}
+	}
+
+	$params = array(
+		'newwidth' => $new_width,
+		'newheight' => $new_height,
+		'selectionwidth' => $selection_width,
+		'selectionheight' => $selection_height,
+		'xoffset' => $widthoffset,
+		'yoffset' => $heightoffset,
+	);
+
+	return $params;
+}
+
+/**
+ * Delete an ElggFile file
+ *
+ * @param int $guid ElggFile GUID
+ *
+ * @return bool
+ */
+function file_delete($guid) {
+	if ($file = get_entity($guid)) {
+		if ($file->canEdit()) {
+			$thumbnail = $file->thumbnail;
+			$smallthumb = $file->smallthumb;
+			$largethumb = $file->largethumb;
+			if ($thumbnail) {
+				$delfile = new ElggFile();
+				$delfile->owner_guid = $file->owner_guid;
+				$delfile->setFilename($thumbnail);
+				$delfile->delete();
+			}
+			if ($smallthumb) {
+				$delfile = new ElggFile();
+				$delfile->owner_guid = $file->owner_guid;
+				$delfile->setFilename($smallthumb);
+				$delfile->delete();
+			}
+			if ($largethumb) {
+				$delfile = new ElggFile();
+				$delfile->owner_guid = $file->owner_guid;
+				$delfile->setFilename($largethumb);
+				$delfile->delete();
+			}
+
+			return $file->delete();
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Returns an overall file type from the mimetype
+ *
+ * @param string $mimetype The MIME type
+ *
+ * @return string The overall type
+ */
+function file_get_general_file_type($mimetype) {
+	switch($mimetype) {
+
+		case "application/msword":
+			return "document";
+			break;
+		case "application/pdf":
+			return "document";
+			break;
+	}
+
+	if (substr_count($mimetype, 'text/')) {
+		return "document";
+	}
+
+	if (substr_count($mimetype, 'audio/')) {
+		return "audio";
+	}
+
+	if (substr_count($mimetype, 'image/')) {
+		return "image";
+	}
+
+	if (substr_count($mimetype, 'video/')) {
+		return "video";
+	}
+
+	if (substr_count($mimetype, 'opendocument')) {
+		return "document";
+	}
+
+	return "general";
+}
+
+/**
+ * Delete a directory and all its contents
+ *
+ * @param string $directory Directory to delete
+ *
+ * @return bool
+ */
+function delete_directory($directory) {
+	// sanity check: must be a directory
+	if (!$handle = opendir($directory)) {
+		return FALSE;
+	}
+
+	// loop through all files
+	while (($file = readdir($handle)) !== FALSE) {
+		if (in_array($file, array('.', '..'))) {
+			continue;
+		}
+
+		$path = "$directory/$file";
+		if (is_dir($path)) {
+			// recurse down through directory
+			if (!delete_directory($path)) {
+				return FALSE;
+			}
+		} else {
+			// delete file
+			unlink($path);
+		}
+	}
+
+	// remove empty directory
+	closedir($handle);
+	return rmdir($directory);
+}
+
+/**
+ * Removes all user files
+ *
+ * @warning This only deletes the physical files and not their entities.
+ * This will result in FileExceptions being thrown.  Don't use this function.
+ *
+ * @param ElggUser $user And ElggUser
+ *
+ * @return void
+ */
+function clear_user_files($user) {
+	global $CONFIG;
+
+	$time_created = date('Y/m/d', (int)$user->time_created);
+	$file_path = "$CONFIG->dataroot$time_created/$user->guid";
+	if (file_exists($file_path)) {
+		delete_directory($file_path);
+	}
+}
+
+
+/// Variable holding the default datastore
+$DEFAULT_FILE_STORE = NULL;
+
+/**
+ * Return the default filestore.
+ *
+ * @return ElggFilestore
+ */
+function get_default_filestore() {
+	global $DEFAULT_FILE_STORE;
+
+	return $DEFAULT_FILE_STORE;
+}
+
+/**
+ * Set the default filestore for the system.
+ *
+ * @param ElggFilestore $filestore An ElggFilestore object.
+ *
+ * @return true
+ */
+function set_default_filestore(ElggFilestore $filestore) {
+	global $DEFAULT_FILE_STORE;
+
+	$DEFAULT_FILE_STORE = $filestore;
+
+	return true;
+}
+
+/**
+ * Register entity type objects, subtype file as
+ * ElggFile.
+ *
+ * @return void
+ * @access private
+ */
+function filestore_run_once() {
+	// Register a class
+	add_subtype("object", "file", "ElggFile");
+}
+
+/**
+ * Initialise the file modules.
+ * Listens to system init and configures the default filestore
+ *
+ * @return void
+ * @access private
+ */
+function filestore_init() {
+	global $CONFIG;
+
+	// Now register a default filestore
+	if (isset($CONFIG->dataroot)) {
+		set_default_filestore(new ElggDiskFilestore($CONFIG->dataroot));
+	}
+	
+	// Now run this stuff, but only once
+	run_function_once("filestore_run_once");
+}
+
+/**
+ * Unit tests for files
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function filestore_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = "{$CONFIG->path}engine/tests/objects/filestore.php";
+	return $value;
+}
+
+
+// Register a startup event
+elgg_register_event_handler('init', 'system', 'filestore_init', 100);
+
+// Unit testing
+elgg_register_plugin_hook_handler('unit_test', 'system', 'filestore_test');
diff --git a/engine/lib/group.php b/engine/lib/group.php
new file mode 100644
index 000000000..6ded8a825
--- /dev/null
+++ b/engine/lib/group.php
@@ -0,0 +1,341 @@
+<?php
+/**
+ * Elgg Groups.
+ * Groups contain other entities, or rather act as a placeholder for other entities to
+ * mark any given container as their container.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Group
+ */
+
+/**
+ * Get the group entity.
+ *
+ * @param int $guid GUID for a group
+ *
+ * @return array|false
+ * @access private
+ */
+function get_group_entity_as_row($guid) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}groups_entity where guid=$guid");
+}
+
+/**
+ * Create or update the entities table for a given group.
+ * Call create_entity first.
+ *
+ * @param int    $guid        GUID
+ * @param string $name        Name
+ * @param string $description Description
+ *
+ * @return bool
+ * @access private
+ */
+function create_group_entity($guid, $name, $description) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	$name = sanitise_string($name);
+	$description = sanitise_string($description);
+
+	$row = get_entity_as_row($guid);
+
+	if ($row) {
+		// Exists and you have access to it
+		$exists = get_data_row("SELECT guid from {$CONFIG->dbprefix}groups_entity WHERE guid = {$guid}");
+		if ($exists) {
+			$query = "UPDATE {$CONFIG->dbprefix}groups_entity set"
+				. " name='$name', description='$description' where guid=$guid";
+			$result = update_data($query);
+			if ($result != false) {
+				// Update succeeded, continue
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('update', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+				}
+			}
+		} else {
+			// Update failed, attempt an insert.
+			$query = "INSERT into {$CONFIG->dbprefix}groups_entity"
+				. " (guid, name, description) values ($guid, '$name', '$description')";
+
+			$result = insert_data($query);
+			if ($result !== false) {
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('create', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Add an object to the given group.
+ *
+ * @param int $group_guid  The group to add the object to.
+ * @param int $object_guid The guid of the elgg object (must be ElggObject or a child thereof)
+ *
+ * @return bool
+ * @throws InvalidClassException
+ */
+function add_object_to_group($group_guid, $object_guid) {
+	$group_guid = (int)$group_guid;
+	$object_guid = (int)$object_guid;
+
+	$group = get_entity($group_guid);
+	$object = get_entity($object_guid);
+
+	if ((!$group) || (!$object)) {
+		return false;
+	}
+
+	if (!($group instanceof ElggGroup)) {
+		$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($group_guid, 'ElggGroup'));
+		throw new InvalidClassException($msg);
+	}
+
+	if (!($object instanceof ElggObject)) {
+		$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($object_guid, 'ElggObject'));
+		throw new InvalidClassException($msg);
+	}
+
+	$object->container_guid = $group_guid;
+	return $object->save();
+}
+
+/**
+ * Remove an object from the given group.
+ *
+ * @param int $group_guid  The group to remove the object from
+ * @param int $object_guid The object to remove
+ *
+ * @return bool
+ * @throws InvalidClassException
+ */
+function remove_object_from_group($group_guid, $object_guid) {
+	$group_guid = (int)$group_guid;
+	$object_guid = (int)$object_guid;
+
+	$group = get_entity($group_guid);
+	$object = get_entity($object_guid);
+
+	if ((!$group) || (!$object)) {
+		return false;
+	}
+
+	if (!($group instanceof ElggGroup)) {
+		$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($group_guid, 'ElggGroup'));
+		throw new InvalidClassException($msg);
+	}
+
+	if (!($object instanceof ElggObject)) {
+		$msg = elgg_echo('InvalidClassException:NotValidElggStar', array($object_guid, 'ElggObject'));
+		throw new InvalidClassException($msg);
+	}
+
+	$object->container_guid = $object->owner_guid;
+	return $object->save();
+}
+
+/**
+ * Return a list of this group's members.
+ *
+ * @param int  $group_guid The ID of the container/group.
+ * @param int  $limit      The limit
+ * @param int  $offset     The offset
+ * @param int  $site_guid  The site
+ * @param bool $count      Return the users (false) or the count of them (true)
+ *
+ * @return mixed
+ */
+function get_group_members($group_guid, $limit = 10, $offset = 0, $site_guid = 0, $count = false) {
+
+	// in 1.7 0 means "not set."  rewrite to make sense.
+	if (!$site_guid) {
+		$site_guid = ELGG_ENTITIES_ANY_VALUE;
+	}
+
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'member',
+		'relationship_guid' => $group_guid,
+		'inverse_relationship' => TRUE,
+		'type' => 'user',
+		'limit' => $limit,
+		'offset' => $offset,
+		'count' => $count,
+		'site_guid' => $site_guid
+	));
+}
+
+/**
+ * Return whether a given user is a member of the group or not.
+ *
+ * @param int $group_guid The group ID
+ * @param int $user_guid  The user guid
+ *
+ * @return bool
+ */
+function is_group_member($group_guid, $user_guid) {
+	$object = check_entity_relationship($user_guid, 'member', $group_guid);
+	if ($object) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Join a user to a group.
+ *
+ * @param int $group_guid The group GUID.
+ * @param int $user_guid  The user GUID.
+ *
+ * @return bool
+ */
+function join_group($group_guid, $user_guid) {
+	$result = add_entity_relationship($user_guid, 'member', $group_guid);
+
+	if ($result) {
+		$params = array('group' => get_entity($group_guid), 'user' => get_entity($user_guid));
+		elgg_trigger_event('join', 'group', $params);
+	}
+
+	return $result;
+}
+
+/**
+ * Remove a user from a group.
+ *
+ * @param int $group_guid The group.
+ * @param int $user_guid  The user.
+ *
+ * @return bool
+ */
+function leave_group($group_guid, $user_guid) {
+	// event needs to be triggered while user is still member of group to have access to group acl
+	$params = array('group' => get_entity($group_guid), 'user' => get_entity($user_guid));
+
+	elgg_trigger_event('leave', 'group', $params);
+	$result = remove_entity_relationship($user_guid, 'member', $group_guid);
+	return $result;
+}
+
+/**
+ * Return all groups a user is a member of.
+ *
+ * @param int $user_guid GUID of user
+ *
+ * @return array|false
+ */
+function get_users_membership($user_guid) {
+	$options = array(
+		'type' => 'group',
+		'relationship' => 'member',
+		'relationship_guid' => $user_guid,
+		'inverse_relationship' => false,
+		'limit' => false,
+	);
+	return elgg_get_entities_from_relationship($options);
+}
+
+/**
+ * May the current user access item(s) on this page? If the page owner is a group,
+ * membership, visibility, and logged in status are taken into account.
+ *
+ * @param boolean $forward If set to true (default), will forward the page;
+ *                         if set to false, will return true or false.
+ *
+ * @return bool If $forward is set to false.
+ */
+function group_gatekeeper($forward = true) {
+
+	$page_owner_guid = elgg_get_page_owner_guid();
+	if (!$page_owner_guid) {
+		return true;
+	}
+	$visibility = ElggGroupItemVisibility::factory($page_owner_guid);
+
+	if (!$visibility->shouldHideItems) {
+		return true;
+	}
+	if ($forward) {
+		// only forward to group if user can see it
+		$group = get_entity($page_owner_guid);
+		$forward_url = $group ? $group->getURL() : '';
+
+		if (!elgg_is_logged_in()) {
+			$_SESSION['last_forward_from'] = current_page_url();
+			$forward_reason = 'login';
+		} else {
+			$forward_reason = 'member';
+		}
+
+		register_error(elgg_echo($visibility->reasonHidden));
+		forward($forward_url, $forward_reason);
+	}
+
+	return false;
+}
+
+/**
+ * Adds a group tool option
+ *
+ * @see remove_group_tool_option().
+ *
+ * @param string $name       Name of the group tool option
+ * @param string $label      Used for the group edit form
+ * @param bool   $default_on True if this option should be active by default
+ *
+ * @return void
+ * @since 1.5.0
+ */
+function add_group_tool_option($name, $label, $default_on = true) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->group_tool_options)) {
+		$CONFIG->group_tool_options = array();
+	}
+
+	$group_tool_option = new stdClass;
+
+	$group_tool_option->name = $name;
+	$group_tool_option->label = $label;
+	$group_tool_option->default_on = $default_on;
+
+	$CONFIG->group_tool_options[] = $group_tool_option;
+}
+
+/**
+ * Removes a group tool option based on name
+ *
+ * @see add_group_tool_option()
+ *
+ * @param string $name Name of the group tool option
+ *
+ * @return void
+ * @since 1.7.5
+ */
+function remove_group_tool_option($name) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->group_tool_options)) {
+		return;
+	}
+
+	foreach ($CONFIG->group_tool_options as $i => $option) {
+		if ($option->name == $name) {
+			unset($CONFIG->group_tool_options[$i]);
+		}
+	}
+}
diff --git a/engine/lib/input.php b/engine/lib/input.php
new file mode 100644
index 000000000..80b0b8766
--- /dev/null
+++ b/engine/lib/input.php
@@ -0,0 +1,520 @@
+<?php
+/**
+ * Parameter input functions.
+ * This file contains functions for getting input from get/post variables.
+ *
+ * @package Elgg.Core
+ * @subpackage Input
+ */
+
+/**
+ * Get some input from variables passed submitted through GET or POST.
+ *
+ * If using any data obtained from get_input() in a web page, please be aware that
+ * it is a possible vector for a reflected XSS attack. If you are expecting an
+ * integer, cast it to an int. If it is a string, escape quotes.
+ *
+ * Note: this function does not handle nested arrays (ex: form input of param[m][n])
+ * because of the filtering done in htmlawed from the filter_tags call.
+ * @todo Is this ^ still true?
+ *
+ * @param string $variable      The variable name we want.
+ * @param mixed  $default       A default value for the variable if it is not found.
+ * @param bool   $filter_result If true, then the result is filtered for bad tags.
+ *
+ * @return mixed
+ */
+function get_input($variable, $default = NULL, $filter_result = TRUE) {
+
+	global $CONFIG;
+
+	$result = $default;
+
+	elgg_push_context('input');
+
+	if (isset($CONFIG->input[$variable])) {
+		$result = $CONFIG->input[$variable];
+
+		if ($filter_result) {
+			$result = filter_tags($result);
+		}
+	} elseif (isset($_REQUEST[$variable])) {
+		if (is_array($_REQUEST[$variable])) {
+			$result = $_REQUEST[$variable];
+		} else {
+			$result = trim($_REQUEST[$variable]);
+		}
+
+		if ($filter_result) {
+			$result = filter_tags($result);
+		}
+	}
+
+	elgg_pop_context();
+
+	return $result;
+}
+
+/**
+ * Sets an input value that may later be retrieved by get_input
+ *
+ * Note: this function does not handle nested arrays (ex: form input of param[m][n])
+ *
+ * @param string          $variable The name of the variable
+ * @param string|string[] $value    The value of the variable
+ *
+ * @return void
+ */
+function set_input($variable, $value) {
+	global $CONFIG;
+	if (!isset($CONFIG->input)) {
+		$CONFIG->input = array();
+	}
+
+	if (is_array($value)) {
+		array_walk_recursive($value, create_function('&$v, $k', '$v = trim($v);'));
+		$CONFIG->input[trim($variable)] = $value;
+	} else {
+		$CONFIG->input[trim($variable)] = trim($value);
+	}
+}
+
+/**
+ * Filter tags from a given string based on registered hooks.
+ *
+ * @param mixed $var Anything that does not include an object (strings, ints, arrays)
+ *					 This includes multi-dimensional arrays.
+ *
+ * @return mixed The filtered result - everything will be strings
+ */
+function filter_tags($var) {
+	return elgg_trigger_plugin_hook('validate', 'input', null, $var);
+}
+
+/**
+ * Validates an email address.
+ *
+ * @param string $address Email address.
+ *
+ * @return bool
+ */
+function is_email_address($address) {
+	return filter_var($address, FILTER_VALIDATE_EMAIL) === $address;
+}
+
+/**
+ * Load all the REQUEST variables into the sticky form cache
+ *
+ * Call this from an action when you want all your submitted variables
+ * available if the submission fails validation and is sent back to the form
+ *
+ * @param string $form_name Name of the sticky form
+ *
+ * @return void
+ * @link http://docs.elgg.org/Tutorials/UI/StickyForms
+ * @since 1.8.0
+ */
+function elgg_make_sticky_form($form_name) {
+
+	elgg_clear_sticky_form($form_name);
+
+	if (!isset($_SESSION['sticky_forms'])) {
+		$_SESSION['sticky_forms'] = array();
+	}
+	$_SESSION['sticky_forms'][$form_name] = array();
+
+	foreach ($_REQUEST as $key => $var) {
+		// will go through XSS filtering on the get function
+		$_SESSION['sticky_forms'][$form_name][$key] = $var;
+	}
+}
+
+/**
+ * Clear the sticky form cache
+ *
+ * Call this if validation is successful in the action handler or
+ * when they sticky values have been used to repopulate the form
+ * after a validation error.
+ *
+ * @param string $form_name Form namespace
+ *
+ * @return void
+ * @link http://docs.elgg.org/Tutorials/UI/StickyForms
+ * @since 1.8.0
+ */
+function elgg_clear_sticky_form($form_name) {
+	unset($_SESSION['sticky_forms'][$form_name]);
+}
+
+/**
+ * Has this form been made sticky?
+ *
+ * @param string $form_name Form namespace
+ *
+ * @return boolean
+ * @link http://docs.elgg.org/Tutorials/UI/StickyForms
+ * @since 1.8.0
+ */
+function elgg_is_sticky_form($form_name) {
+	return isset($_SESSION['sticky_forms'][$form_name]);
+}
+
+/**
+ * Get a specific sticky variable
+ *
+ * @param string  $form_name     The name of the form
+ * @param string  $variable      The name of the variable
+ * @param mixed   $default       Default value if the variable does not exist in sticky cache
+ * @param boolean $filter_result Filter for bad input if true
+ *
+ * @return mixed
+ *
+ * @todo should this filter the default value?
+ * @link http://docs.elgg.org/Tutorials/UI/StickyForms
+ * @since 1.8.0
+ */
+function elgg_get_sticky_value($form_name, $variable = '', $default = NULL, $filter_result = true) {
+	if (isset($_SESSION['sticky_forms'][$form_name][$variable])) {
+		$value = $_SESSION['sticky_forms'][$form_name][$variable];
+		if ($filter_result) {
+			// XSS filter result
+			$value = filter_tags($value);
+		}
+		return $value;
+	}
+	return $default;
+}
+
+/**
+ * Get all the values in a sticky form in an array
+ *
+ * @param string $form_name     The name of the form
+ * @param bool   $filter_result Filter for bad input if true
+ *
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_sticky_values($form_name, $filter_result = true) {
+	if (!isset($_SESSION['sticky_forms'][$form_name])) {
+		return array();
+	}
+
+	$values = $_SESSION['sticky_forms'][$form_name];
+	if ($filter_result) {
+		foreach ($values as $key => $value) {
+			// XSS filter result
+			$values[$key] = filter_tags($value);
+		}
+	}
+	return $values;
+}
+
+/**
+ * Clear a specific sticky variable
+ *
+ * @param string $form_name The name of the form
+ * @param string $variable  The name of the variable to clear
+ *
+ * @return void
+ * @link http://docs.elgg.org/Tutorials/UI/StickyForms
+ * @since 1.8.0
+ */
+function elgg_clear_sticky_value($form_name, $variable) {
+	unset($_SESSION['sticky_forms'][$form_name][$variable]);
+}
+
+/**
+ * Page handler for autocomplete endpoint.
+ *
+ * @todo split this into functions/objects, this is way too big
+ *
+ * /livesearch?q=<query>
+ *
+ * Other options include:
+ *     match_on	   string all or array(groups|users|friends)
+ *     match_owner int    0/1
+ *     limit       int    default is 10
+ *
+ * @param array $page
+ * @return string JSON string is returned and then exit
+ * @access private
+ */
+function input_livesearch_page_handler($page) {
+	global $CONFIG;
+
+	// only return results to logged in users.
+	if (!$user = elgg_get_logged_in_user_entity()) {
+		exit;
+	}
+
+	if (!$q = get_input('term', get_input('q'))) {
+		exit;
+	}
+
+	$q = sanitise_string($q);
+
+	// replace mysql vars with escaped strings
+	$q = str_replace(array('_', '%'), array('\_', '\%'), $q);
+
+	$match_on = get_input('match_on', 'all');
+
+	if (!is_array($match_on)) {
+		$match_on = array($match_on);
+	}
+
+	// all = users and groups
+	if (in_array('all', $match_on)) {
+		$match_on = array('users', 'groups');
+	}
+
+	if (get_input('match_owner', false)) {
+		$owner_where = 'AND e.owner_guid = ' . $user->getGUID();
+	} else {
+		$owner_where = '';
+	}
+
+	$limit = sanitise_int(get_input('limit', 10));
+
+	// grab a list of entities and send them in json.
+	$results = array();
+	foreach ($match_on as $match_type) {
+		switch ($match_type) {
+			case 'users':
+				$query = "SELECT * FROM {$CONFIG->dbprefix}users_entity as ue, {$CONFIG->dbprefix}entities as e
+					WHERE e.guid = ue.guid
+						AND e.enabled = 'yes'
+						AND ue.banned = 'no'
+						AND (ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')
+					LIMIT $limit
+				";
+
+				if ($entities = get_data($query)) {
+					foreach ($entities as $entity) {
+						// @todo use elgg_get_entities (don't query in a loop!)
+						$entity = get_entity($entity->guid);
+						/* @var ElggUser $entity */
+						if (!$entity) {
+							continue;
+						}
+
+						if (in_array('groups', $match_on)) {
+							$value = $entity->guid;
+						} else {
+							$value = $entity->username;
+						}
+
+						$output = elgg_view_list_item($entity, array(
+							'use_hover' => false,
+							'class' => 'elgg-autocomplete-item',
+						));
+
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'use_hover' => false,
+						));
+
+						$result = array(
+							'type' => 'user',
+							'name' => $entity->name,
+							'desc' => $entity->username,
+							'guid' => $entity->guid,
+							'label' => $output,
+							'value' => $value,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
+						);
+						$results[$entity->name . rand(1, 100)] = $result;
+					}
+				}
+				break;
+
+			case 'groups':
+				// don't return results if groups aren't enabled.
+				if (!elgg_is_active_plugin('groups')) {
+					continue;
+				}
+				$query = "SELECT * FROM {$CONFIG->dbprefix}groups_entity as ge, {$CONFIG->dbprefix}entities as e
+					WHERE e.guid = ge.guid
+						AND e.enabled = 'yes'
+						$owner_where
+						AND (ge.name LIKE '$q%' OR ge.name LIKE '% $q%' OR ge.description LIKE '% $q%')
+					LIMIT $limit
+				";
+				if ($entities = get_data($query)) {
+					foreach ($entities as $entity) {
+						// @todo use elgg_get_entities (don't query in a loop!)
+						$entity = get_entity($entity->guid);
+						/* @var ElggGroup $entity */
+						if (!$entity) {
+							continue;
+						}
+
+						$output = elgg_view_list_item($entity, array(
+							'use_hover' => false,
+							'class' => 'elgg-autocomplete-item',
+						));
+
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'use_hover' => false,
+						));
+
+						$result = array(
+							'type' => 'group',
+							'name' => $entity->name,
+							'desc' => strip_tags($entity->description),
+							'guid' => $entity->guid,
+							'label' => $output,
+							'value' => $entity->guid,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
+						);
+
+						$results[$entity->name . rand(1, 100)] = $result;
+					}
+				}
+				break;
+
+			case 'friends':
+				$query = "SELECT * FROM
+						{$CONFIG->dbprefix}users_entity as ue,
+						{$CONFIG->dbprefix}entity_relationships as er,
+						{$CONFIG->dbprefix}entities as e
+					WHERE er.relationship = 'friend'
+						AND er.guid_one = {$user->getGUID()}
+						AND er.guid_two = ue.guid
+						AND e.guid = ue.guid
+						AND e.enabled = 'yes'
+						AND ue.banned = 'no'
+						AND (ue.name LIKE '$q%' OR ue.name LIKE '% $q%' OR ue.username LIKE '$q%')
+					LIMIT $limit
+				";
+
+				if ($entities = get_data($query)) {
+					foreach ($entities as $entity) {
+						// @todo use elgg_get_entities (don't query in a loop!)
+						$entity = get_entity($entity->guid);
+						/* @var ElggUser $entity */
+						if (!$entity) {
+							continue;
+						}
+
+						$output = elgg_view_list_item($entity, array(
+							'use_hover' => false,
+							'class' => 'elgg-autocomplete-item',
+						));
+
+						$icon = elgg_view_entity_icon($entity, 'tiny', array(
+							'use_hover' => false,
+						));
+
+						$result = array(
+							'type' => 'user',
+							'name' => $entity->name,
+							'desc' => $entity->username,
+							'guid' => $entity->guid,
+							'label' => $output,
+							'value' => $entity->username,
+							'icon' => $icon,
+							'url' => $entity->getURL(),
+						);
+						$results[$entity->name . rand(1, 100)] = $result;
+					}
+				}
+				break;
+
+			default:
+				header("HTTP/1.0 400 Bad Request", true);
+				echo "livesearch: unknown match_on of $match_type";
+				exit;
+				break;
+		}
+	}
+
+	ksort($results);
+	header("Content-Type: application/json");
+	echo json_encode(array_values($results));
+	exit;
+}
+
+/**
+ * Register input functions and sanitize input
+ *
+ * @return void
+ * @access private
+ */
+function input_init() {
+	// register an endpoint for live search / autocomplete.
+	elgg_register_page_handler('livesearch', 'input_livesearch_page_handler');
+
+	if (ini_get_bool('magic_quotes_gpc')) {
+
+		/**
+		 * do keys as well, cos array_map ignores them
+		 *
+		 * @param array $array Array of values
+		 *
+		 * @return array Sanitized array
+		 */
+		function stripslashes_arraykeys($array) {
+			if (is_array($array)) {
+				$array2 = array();
+				foreach ($array as $key => $data) {
+					if ($key != stripslashes($key)) {
+						$array2[stripslashes($key)] = $data;
+					} else {
+						$array2[$key] = $data;
+					}
+				}
+				return $array2;
+			} else {
+				return $array;
+			}
+		}
+
+		/**
+		 * Strip slashes on everything
+		 *
+		 * @param mixed $value The value to remove slashes from
+		 *
+		 * @return mixed
+		 */
+		function stripslashes_deep($value) {
+			if (is_array($value)) {
+				$value = stripslashes_arraykeys($value);
+				$value = array_map('stripslashes_deep', $value);
+			} else {
+				$value = stripslashes($value);
+			}
+			return $value;
+		}
+
+		$_POST = stripslashes_arraykeys($_POST);
+		$_GET = stripslashes_arraykeys($_GET);
+		$_COOKIE = stripslashes_arraykeys($_COOKIE);
+		$_REQUEST = stripslashes_arraykeys($_REQUEST);
+
+		$_POST = array_map('stripslashes_deep', $_POST);
+		$_GET = array_map('stripslashes_deep', $_GET);
+		$_COOKIE = array_map('stripslashes_deep', $_COOKIE);
+		$_REQUEST = array_map('stripslashes_deep', $_REQUEST);
+		if (!empty($_SERVER['REQUEST_URI'])) {
+			$_SERVER['REQUEST_URI'] = stripslashes($_SERVER['REQUEST_URI']);
+		}
+		if (!empty($_SERVER['QUERY_STRING'])) {
+			$_SERVER['QUERY_STRING'] = stripslashes($_SERVER['QUERY_STRING']);
+		}
+		if (!empty($_SERVER['HTTP_REFERER'])) {
+			$_SERVER['HTTP_REFERER'] = stripslashes($_SERVER['HTTP_REFERER']);
+		}
+		if (!empty($_SERVER['PATH_INFO'])) {
+			$_SERVER['PATH_INFO'] = stripslashes($_SERVER['PATH_INFO']);
+		}
+		if (!empty($_SERVER['PHP_SELF'])) {
+			$_SERVER['PHP_SELF'] = stripslashes($_SERVER['PHP_SELF']);
+		}
+		if (!empty($_SERVER['PATH_TRANSLATED'])) {
+			$_SERVER['PATH_TRANSLATED'] = stripslashes($_SERVER['PATH_TRANSLATED']);
+		}
+	}
+}
+
+elgg_register_event_handler('init', 'system', 'input_init');
diff --git a/engine/lib/languages.php b/engine/lib/languages.php
new file mode 100644
index 000000000..61ba91ddb
--- /dev/null
+++ b/engine/lib/languages.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * Elgg language module
+ * Functions to manage language and translations.
+ *
+ * @package Elgg.Core
+ * @subpackage Languages
+ */
+
+/**
+ * Given a message key, returns an appropriately translated full-text string
+ *
+ * @param string $message_key The short message code
+ * @param array  $args        An array of arguments to pass through vsprintf().
+ * @param string $language    Optionally, the standard language code
+ *                            (defaults to site/user default, then English)
+ *
+ * @return string Either the translated string, the English string,
+ * or the original language string.
+ */
+function elgg_echo($message_key, $args = array(), $language = "") {
+	global $CONFIG;
+
+	static $CURRENT_LANGUAGE;
+
+	// old param order is deprecated
+	if (!is_array($args)) {
+		elgg_deprecated_notice(
+			'As of Elgg 1.8, the 2nd arg to elgg_echo() is an array of string replacements and the 3rd arg is the language.',
+			1.8
+		);
+
+		$language = $args;
+		$args = array();
+	}
+
+	if (!isset($CONFIG->translations)) {
+		// this means we probably had an exception before translations were initialized
+		register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
+	}
+
+	if (!$CURRENT_LANGUAGE) {
+		$CURRENT_LANGUAGE = get_language();
+	}
+	if (!$language) {
+		$language = $CURRENT_LANGUAGE;
+	}
+
+	if (isset($CONFIG->translations[$language][$message_key])) {
+		$string = $CONFIG->translations[$language][$message_key];
+	} else if (isset($CONFIG->translations["en"][$message_key])) {
+		$string = $CONFIG->translations["en"][$message_key];
+		$lang = $CONFIG->translations["en"][$language];
+		elgg_log(sprintf('Missing %s translation for "%s" language key', $lang, $message_key), 'NOTICE');
+	} else {
+		$string = $message_key;
+		elgg_log(sprintf('Missing English translation for "%s" language key', $message_key), 'NOTICE');
+	}
+
+	// only pass through if we have arguments to allow backward compatibility
+	// with manual sprintf() calls.
+	if ($args) {
+		$string = vsprintf($string, $args);
+	}
+
+	return $string;
+}
+
+/**
+ * Add a translation.
+ *
+ * Translations are arrays in the Zend Translation array format, eg:
+ *
+ *	$english = array('message1' => 'message1', 'message2' => 'message2');
+ *  $german = array('message1' => 'Nachricht1','message2' => 'Nachricht2');
+ *
+ * @param string $country_code   Standard country code (eg 'en', 'nl', 'es')
+ * @param array  $language_array Formatted array of strings
+ *
+ * @return bool Depending on success
+ */
+function add_translation($country_code, $language_array) {
+	global $CONFIG;
+	if (!isset($CONFIG->translations)) {
+		$CONFIG->translations = array();
+	}
+
+	$country_code = strtolower($country_code);
+	$country_code = trim($country_code);
+	if (is_array($language_array) && sizeof($language_array) > 0 && $country_code != "") {
+		if (!isset($CONFIG->translations[$country_code])) {
+			$CONFIG->translations[$country_code] = $language_array;
+		} else {
+			$CONFIG->translations[$country_code] = $language_array + $CONFIG->translations[$country_code];
+		}
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Detect the current language being used by the current site or logged in user.
+ *
+ * @return string The language code for the site/user or "en" if not set
+ */
+function get_current_language() {
+	$language = get_language();
+
+	if (!$language) {
+		$language = 'en';
+	}
+
+	return $language;
+}
+
+/**
+ * Gets the current language in use by the system or user.
+ *
+ * @return string The language code (eg "en") or false if not set
+ */
+function get_language() {
+	global $CONFIG;
+
+	$user = elgg_get_logged_in_user_entity();
+	$language = false;
+
+	if (($user) && ($user->language)) {
+		$language = $user->language;
+	}
+
+	if ((!$language) && (isset($CONFIG->language)) && ($CONFIG->language)) {
+		$language = $CONFIG->language;
+	}
+
+	if ($language) {
+		return $language;
+	}
+
+	return false;
+}
+
+/**
+ * @access private
+ */
+function _elgg_load_translations() {
+	global $CONFIG;
+
+	if ($CONFIG->system_cache_enabled) {
+		$loaded = true;
+		$languages = array_unique(array('en', get_current_language()));
+		foreach ($languages as $language) {
+			$data = elgg_load_system_cache("$language.lang");
+			if ($data) {
+				add_translation($language, unserialize($data));
+			} else {
+				$loaded = false;
+			}
+		}
+
+		if ($loaded) {
+			$CONFIG->i18n_loaded_from_cache = true;
+			// this is here to force 
+			$CONFIG->language_paths[dirname(dirname(dirname(__FILE__))) . "/languages/"] = true;
+			return;
+		}
+	}
+
+	// load core translations from languages directory
+	register_translations(dirname(dirname(dirname(__FILE__))) . "/languages/");
+}
+
+
+
+/**
+ * When given a full path, finds translation files and loads them
+ *
+ * @param string $path     Full path
+ * @param bool   $load_all If true all languages are loaded, if
+ *                         false only the current language + en are loaded
+ *
+ * @return bool success
+ */
+function register_translations($path, $load_all = false) {
+	global $CONFIG;
+
+	$path = sanitise_filepath($path);
+
+	// Make a note of this path just incase we need to register this language later
+	if (!isset($CONFIG->language_paths)) {
+		$CONFIG->language_paths = array();
+	}
+	$CONFIG->language_paths[$path] = true;
+
+	// Get the current language based on site defaults and user preference
+	$current_language = get_current_language();
+	elgg_log("Translations loaded from: $path");
+
+	// only load these files unless $load_all is true.
+	$load_language_files = array(
+		'en.php',
+		"$current_language.php"
+	);
+
+	$load_language_files = array_unique($load_language_files);
+
+	$handle = opendir($path);
+	if (!$handle) {
+		elgg_log("Could not open language path: $path", 'ERROR');
+		return false;
+	}
+
+	$return = true;
+	while (false !== ($language = readdir($handle))) {
+		// ignore bad files
+		if (substr($language, 0, 1) == '.' || substr($language, -4) !== '.php') {
+			continue;
+		}
+
+		if (in_array($language, $load_language_files) || $load_all) {
+			if (!include_once($path . $language)) {
+				$return = false;
+				continue;
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Reload all translations from all registered paths.
+ *
+ * This is only called by functions which need to know all possible translations.
+ *
+ * @todo Better on demand loading based on language_paths array
+ *
+ * @return void
+ */
+function reload_all_translations() {
+	global $CONFIG;
+
+	static $LANG_RELOAD_ALL_RUN;
+	if ($LANG_RELOAD_ALL_RUN) {
+		return;
+	}
+
+	if ($CONFIG->i18n_loaded_from_cache) {
+		$cache = elgg_get_system_cache();
+		$cache_dir = $cache->getVariable("cache_path");
+		$filenames = elgg_get_file_list($cache_dir, array(), array(), array(".lang"));
+		foreach ($filenames as $filename) {
+			if (preg_match('/([a-z]+)\.[^.]+$/', $filename, $matches)) {
+				$language = $matches[1];
+				$data = elgg_load_system_cache("$language.lang");
+				if ($data) {
+					add_translation($language, unserialize($data));
+				}
+			}
+		}
+	} else {
+		foreach ($CONFIG->language_paths as $path => $dummy) {
+			register_translations($path, true);
+		}
+	}
+
+	$LANG_RELOAD_ALL_RUN = true;
+}
+
+/**
+ * Return an array of installed translations as an associative
+ * array "two letter code" => "native language name".
+ *
+ * @return array
+ */
+function get_installed_translations() {
+	global $CONFIG;
+
+	// Ensure that all possible translations are loaded
+	reload_all_translations();
+
+	$installed = array();
+
+	foreach ($CONFIG->translations as $k => $v) {
+		$installed[$k] = elgg_echo($k, array(), $k);
+		if (elgg_is_admin_logged_in()) {
+			$completeness = get_language_completeness($k);
+			if (($completeness < 100) && ($k != 'en')) {
+				$installed[$k] .= " (" . $completeness . "% " . elgg_echo('complete') . ")";
+			}
+		}
+	}
+
+	return $installed;
+}
+
+/**
+ * Return the level of completeness for a given language code (compared to english)
+ *
+ * @param string $language Language
+ *
+ * @return int
+ */
+function get_language_completeness($language) {
+	global $CONFIG;
+
+	// Ensure that all possible translations are loaded
+	reload_all_translations();
+
+	$language = sanitise_string($language);
+
+	$en = count($CONFIG->translations['en']);
+
+	$missing = get_missing_language_keys($language);
+	if ($missing) {
+		$missing = count($missing);
+	} else {
+		$missing = 0;
+	}
+
+	//$lang = count($CONFIG->translations[$language]);
+	$lang = $en - $missing;
+
+	return round(($lang / $en) * 100, 2);
+}
+
+/**
+ * Return the translation keys missing from a given language,
+ * or those that are identical to the english version.
+ *
+ * @param string $language The language
+ *
+ * @return mixed
+ */
+function get_missing_language_keys($language) {
+	global $CONFIG;
+
+	// Ensure that all possible translations are loaded
+	reload_all_translations();
+
+	$missing = array();
+
+	foreach ($CONFIG->translations['en'] as $k => $v) {
+		if ((!isset($CONFIG->translations[$language][$k]))
+		|| ($CONFIG->translations[$language][$k] == $CONFIG->translations['en'][$k])) {
+			$missing[] = $k;
+		}
+	}
+
+	if (count($missing)) {
+		return $missing;
+	}
+
+	return false;
+}
diff --git a/engine/lib/location.php b/engine/lib/location.php
new file mode 100644
index 000000000..1534c7d7b
--- /dev/null
+++ b/engine/lib/location.php
@@ -0,0 +1,157 @@
+<?php
+/**
+ * Elgg geo-location tagging library.
+ *
+ * @package Elgg.Core
+ * @subpackage Location
+ */
+
+/**
+ * Encode a location into a latitude and longitude, caching the result.
+ *
+ * Works by triggering the 'geocode' 'location' plugin
+ * hook, and requires a geocoding plugin to be installed.
+ *
+ * @param string $location The location, e.g. "London", or "24 Foobar Street, Gotham City"
+ * @return string|false
+ */
+function elgg_geocode_location($location) {
+	global $CONFIG;
+
+	if (is_array($location)) {
+		return false;
+	}
+
+	$location = sanitise_string($location);
+
+	// Look for cached version
+	$query = "SELECT * from {$CONFIG->dbprefix}geocode_cache WHERE location='$location'";
+	$cached_location = get_data_row($query);
+
+	if ($cached_location) {
+		return array('lat' => $cached_location->lat, 'long' => $cached_location->long);
+	}
+
+	// Trigger geocode event if not cached
+	$return = false;
+	$return = elgg_trigger_plugin_hook('geocode', 'location', array('location' => $location), $return);
+
+	// If returned, cache and return value
+	if (($return) && (is_array($return))) {
+		$lat = (float)$return['lat'];
+		$long = (float)$return['long'];
+
+		// Put into cache at the end of the page since we don't really care that much
+		$query = "INSERT DELAYED INTO {$CONFIG->dbprefix}geocode_cache "
+			. " (location, lat, `long`) VALUES ('$location', '{$lat}', '{$long}')"
+			. " ON DUPLICATE KEY UPDATE lat='{$lat}', `long`='{$long}'";
+		execute_delayed_write_query($query);
+	}
+
+	return $return;
+}
+
+/**
+ * Return entities within a given geographic area.
+ *
+ * Also accepts all options available to elgg_get_entities().
+ *
+ * @see elgg_get_entities
+ *
+ * @param array $options Array in format:
+ *
+ * 	latitude => FLOAT Latitude of the location
+ *
+ * 	longitude => FLOAT Longitude of the location
+ *
+ *  distance => FLOAT/ARR (
+ *						latitude => float,
+ *						longitude => float,
+ *					)
+ *					The distance in degrees that determines the search box. A
+ *					single float will result in a square in degrees.
+ * @warning The Earth is round.
+ *
+ * @see ElggEntity::setLatLong()
+ *
+ * @return mixed If count, int. If not count, array. false on errors.
+ * @since 1.8.0
+ */
+function elgg_get_entities_from_location(array $options = array()) {
+
+	global $CONFIG;
+	
+	if (!isset($options['latitude']) || !isset($options['longitude']) ||
+		!isset($options['distance'])) {
+		return false;
+	}
+
+	if (!is_array($options['distance'])) {
+		$lat_distance = (float)$options['distance'];
+		$long_distance = (float)$options['distance'];
+	} else {
+		$lat_distance = (float)$options['distance']['latitude'];
+		$long_distance = (float)$options['distance']['longitude'];
+	}
+
+	$lat = (float)$options['latitude'];
+	$long = (float)$options['longitude'];
+	$lat_min = $lat - $lat_distance;
+	$lat_max = $lat + $lat_distance;
+	$long_min = $long - $long_distance;
+	$long_max = $long + $long_distance;
+
+	$wheres = array();
+	$wheres[] = "lat_name.string='geo:lat'";
+	$wheres[] = "lat_value.string >= $lat_min";
+	$wheres[] = "lat_value.string <= $lat_max";
+	$wheres[] = "lon_name.string='geo:long'";
+	$wheres[] = "lon_value.string >= $long_min";
+	$wheres[] = "lon_value.string <= $long_max";
+
+	$joins = array();
+	$joins[] = "JOIN {$CONFIG->dbprefix}metadata lat on e.guid=lat.entity_guid";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings lat_name on lat.name_id=lat_name.id";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings lat_value on lat.value_id=lat_value.id";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metadata lon on e.guid=lon.entity_guid";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings lon_name on lon.name_id=lon_name.id";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings lon_value on lon.value_id=lon_value.id";
+
+	// merge wheres to pass to get_entities()
+	if (isset($options['wheres']) && !is_array($options['wheres'])) {
+		$options['wheres'] = array($options['wheres']);
+	} elseif (!isset($options['wheres'])) {
+		$options['wheres'] = array();
+	}
+	$options['wheres'] = array_merge($options['wheres'], $wheres);
+
+	// merge joins to pass to get_entities()
+	if (isset($options['joins']) && !is_array($options['joins'])) {
+		$options['joins'] = array($options['joins']);
+	} elseif (!isset($options['joins'])) {
+		$options['joins'] = array();
+	}
+	$options['joins'] = array_merge($options['joins'], $joins);
+
+	return elgg_get_entities_from_relationship($options);
+}
+
+/**
+ * Returns a viewable list of entities from location
+ *
+ * @param array $options Options array
+ *
+ * @see elgg_list_entities()
+ * @see elgg_get_entities_from_location()
+ *
+ * @return string The viewable list of entities
+ * @since 1.8.0
+ */
+function elgg_list_entities_from_location(array $options = array()) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_location');
+}
+
+// Some distances in degrees (approximate)
+// @todo huh? see warning on elgg_get_entities_from_location()
+define("MILE", 0.01515);
+define("KILOMETER", 0.00932);
diff --git a/engine/lib/mb_wrapper.php b/engine/lib/mb_wrapper.php
new file mode 100644
index 000000000..68fa69005
--- /dev/null
+++ b/engine/lib/mb_wrapper.php
@@ -0,0 +1,233 @@
+<?php
+
+// if mb functions are available, set internal encoding to UTF8
+if (is_callable('mb_internal_encoding')) {
+	mb_internal_encoding("UTF-8");
+	ini_set("mbstring.internal_encoding", 'UTF-8');
+}
+
+/**
+ * Parses a string using mb_parse_str() if available.
+ * NOTE: This differs from parse_str() by returning the results
+ * instead of placing them in the local scope!
+ *
+ * @param string $str The string
+ *
+ * @return array
+ * @since 1.7.0
+ */
+function elgg_parse_str($str) {
+	if (is_callable('mb_parse_str')) {
+		mb_parse_str($str, $results);
+	} else {
+		parse_str($str, $results);
+	}
+
+	return $results;
+}
+
+
+
+/**
+ * Wrapper function for mb_split(). Falls back to split() if
+ * mb_split() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_split() {
+	$args = func_get_args();
+	if (is_callable('mb_split')) {
+		return call_user_func_array('mb_split', $args);
+	}
+	return call_user_func_array('split', $args);
+}
+
+/**
+ * Wrapper function for mb_stristr(). Falls back to stristr() if
+ * mb_stristr() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_stristr() {
+	$args = func_get_args();
+	if (is_callable('mb_stristr')) {
+		return call_user_func_array('mb_stristr', $args);
+	}
+	return call_user_func_array('stristr', $args);
+}
+
+/**
+ * Wrapper function for mb_strlen(). Falls back to strlen() if
+ * mb_strlen() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_strlen() {
+	$args = func_get_args();
+	if (is_callable('mb_strlen')) {
+		return call_user_func_array('mb_strlen', $args);
+	}
+	return call_user_func_array('strlen', $args);
+}
+
+/**
+ * Wrapper function for mb_strpos(). Falls back to strpos() if
+ * mb_strpos() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_strpos() {
+	$args = func_get_args();
+	if (is_callable('mb_strpos')) {
+		return call_user_func_array('mb_strpos', $args);
+	}
+	return call_user_func_array('strpos', $args);
+}
+
+/**
+ * Wrapper function for mb_strrchr(). Falls back to strrchr() if
+ * mb_strrchr() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_strrchr() {
+	$args = func_get_args();
+	if (is_callable('mb_strrchr')) {
+		return call_user_func_array('mb_strrchr', $args);
+	}
+	return call_user_func_array('strrchr', $args);
+}
+
+/**
+ * Wrapper function for mb_strripos(). Falls back to strripos() if
+ * mb_strripos() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return int
+ * @since 1.7.0
+ */
+function elgg_strripos() {
+	$args = func_get_args();
+	if (is_callable('mb_strripos')) {
+		return call_user_func_array('mb_strripos', $args);
+	}
+	return call_user_func_array('strripos', $args);
+}
+
+/**
+ * Wrapper function for mb_strrpos(). Falls back to strrpos() if
+ * mb_strrpos() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return int
+ * @since 1.7.0
+ */
+function elgg_strrpos() {
+	$args = func_get_args();
+	if (is_callable('mb_strrpos')) {
+		return call_user_func_array('mb_strrpos', $args);
+	}
+	return call_user_func_array('strrpos', $args);
+}
+
+/**
+ * Wrapper function for mb_strstr(). Falls back to strstr() if
+ * mb_strstr() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function elgg_strstr() {
+	$args = func_get_args();
+	if (is_callable('mb_strstr')) {
+		return call_user_func_array('mb_strstr', $args);
+	}
+	return call_user_func_array('strstr', $args);
+}
+
+/**
+ * Wrapper function for mb_strtolower(). Falls back to strtolower() if
+ * mb_strtolower() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_strtolower() {
+	$args = func_get_args();
+	if (is_callable('mb_strtolower')) {
+		return call_user_func_array('mb_strtolower', $args);
+	}
+	return call_user_func_array('strtolower', $args);
+}
+
+/**
+ * Wrapper function for mb_strtoupper(). Falls back to strtoupper() if
+ * mb_strtoupper() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_strtoupper() {
+	$args = func_get_args();
+	if (is_callable('mb_strtoupper')) {
+		return call_user_func_array('mb_strtoupper', $args);
+	}
+	return call_user_func_array('strtoupper', $args);
+}
+
+/**
+ * Wrapper function for mb_substr_count(). Falls back to substr_count() if
+ * mb_substr_count() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return int
+ * @since 1.7.0
+ */
+function elgg_substr_count() {
+	$args = func_get_args();
+	if (is_callable('mb_substr_count')) {
+		return call_user_func_array('mb_substr_count', $args);
+	}
+	return call_user_func_array('substr_count', $args);
+}
+
+/**
+ * Wrapper function for mb_substr(). Falls back to substr() if
+ * mb_substr() isn't available.  Parameters are passed to the
+ * wrapped function in the same order they are passed to this
+ * function.
+ *
+ * @return string
+ * @since 1.7.0
+ */
+function elgg_substr() {
+	$args = func_get_args();
+	if (is_callable('mb_substr')) {
+		return call_user_func_array('mb_substr', $args);
+	}
+	return call_user_func_array('substr', $args);
+}
diff --git a/engine/lib/memcache.php b/engine/lib/memcache.php
new file mode 100644
index 000000000..79b87e850
--- /dev/null
+++ b/engine/lib/memcache.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Elgg memcache support.
+ *
+ * Requires php5-memcache to work.
+ *
+ * @package Elgg.Core
+ * @subpackage Cache.Memcache
+ */
+
+/**
+ * Return true if memcache is available and configured.
+ *
+ * @return bool
+ */
+function is_memcache_available() {
+	global $CONFIG;
+
+	static $memcache_available;
+
+	if ((!isset($CONFIG->memcache)) || (!$CONFIG->memcache)) {
+		return false;
+	}
+
+	// If we haven't set variable to something
+	if (($memcache_available !== true) && ($memcache_available !== false)) {
+		try {
+			$tmp = new ElggMemcache();
+			// No exception thrown so we have memcache available
+			$memcache_available = true;
+		} catch (Exception $e) {
+			$memcache_available = false;
+		}
+	}
+
+	return $memcache_available;
+}
+
+/**
+ * Invalidate an entity in memcache
+ *
+ * @param int $entity_guid The GUID of the entity to invalidate
+ *
+ * @return void
+ * @access private
+ */
+function _elgg_invalidate_memcache_for_entity($entity_guid) {
+	static $newentity_cache;
+	
+	if ((!$newentity_cache) && (is_memcache_available())) {
+		$newentity_cache = new ElggMemcache('new_entity_cache');
+	}
+	
+	if ($newentity_cache) {
+		$newentity_cache->delete($entity_guid);
+	}
+}
+\ No newline at end of file
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
new file mode 100644
index 000000000..fdb1b85f6
--- /dev/null
+++ b/engine/lib/metadata.php
@@ -0,0 +1,978 @@
+<?php
+/**
+ * Elgg metadata
+ * Functions to manage entity metadata.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Metadata
+ */
+
+/**
+ * Convert a database row to a new ElggMetadata
+ *
+ * @param stdClass $row An object from the database
+ *
+ * @return stdClass|ElggMetadata
+ * @access private
+ */
+function row_to_elggmetadata($row) {
+	if (!($row instanceof stdClass)) {
+		return $row;
+	}
+
+	return new ElggMetadata($row);
+}
+
+/**
+ * Get a specific metadata object by its id.
+ * If you want multiple metadata objects, use
+ * {@link elgg_get_metadata()}.
+ *
+ * @param int $id The id of the metadata object being retrieved.
+ *
+ * @return ElggMetadata|false  FALSE if not found
+ */
+function elgg_get_metadata_from_id($id) {
+	return elgg_get_metastring_based_object_from_id($id, 'metadata');
+}
+
+/**
+ * Deletes metadata using its ID.
+ *
+ * @param int $id The metadata ID to delete.
+ * @return bool
+ */
+function elgg_delete_metadata_by_id($id) {
+	$metadata = elgg_get_metadata_from_id($id);
+	if (!$metadata) {
+		return false;
+	}
+	return $metadata->delete();
+}
+
+/**
+ * Create a new metadata object, or update an existing one.
+ *
+ * Metadata can be an array by setting allow_multiple to TRUE, but it is an
+ * indexed array with no control over the indexing.
+ *
+ * @param int    $entity_guid    The entity to attach the metadata to
+ * @param string $name           Name of the metadata
+ * @param string $value          Value of the metadata
+ * @param string $value_type     'text', 'integer', or '' for automatic detection
+ * @param int    $owner_guid     GUID of entity that owns the metadata
+ * @param int    $access_id      Default is ACCESS_PRIVATE
+ * @param bool   $allow_multiple Allow multiple values for one key. Default is FALSE
+ *
+ * @return int|false id of metadata or FALSE if failure
+ */
+function create_metadata($entity_guid, $name, $value, $value_type = '', $owner_guid = 0,
+	$access_id = ACCESS_PRIVATE, $allow_multiple = false) {
+
+	global $CONFIG;
+
+	$entity_guid = (int)$entity_guid;
+	// name and value are encoded in add_metastring()
+	//$name = sanitise_string(trim($name));
+	//$value = sanitise_string(trim($value));
+	$value_type = detect_extender_valuetype($value, sanitise_string(trim($value_type)));
+	$time = time();
+	$owner_guid = (int)$owner_guid;
+	$allow_multiple = (boolean)$allow_multiple;
+
+	if (!isset($value)) {
+		return FALSE;
+	}
+
+	if ($owner_guid == 0) {
+		$owner_guid = elgg_get_logged_in_user_guid();
+	}
+
+	$access_id = (int)$access_id;
+
+	$query = "SELECT * from {$CONFIG->dbprefix}metadata"
+		. " WHERE entity_guid = $entity_guid and name_id=" . add_metastring($name) . " limit 1";
+
+	$existing = get_data_row($query);
+	if ($existing && !$allow_multiple) {
+		$id = (int)$existing->id;
+		$result = update_metadata($id, $name, $value, $value_type, $owner_guid, $access_id);
+
+		if (!$result) {
+			return false;
+		}
+	} else {
+		// Support boolean types
+		if (is_bool($value)) {
+			$value = (int) $value;
+		}
+
+		// Add the metastrings
+		$value_id = add_metastring($value);
+		if (!$value_id) {
+			return false;
+		}
+
+		$name_id = add_metastring($name);
+		if (!$name_id) {
+			return false;
+		}
+
+		// If ok then add it
+		$query = "INSERT into {$CONFIG->dbprefix}metadata"
+			. " (entity_guid, name_id, value_id, value_type, owner_guid, time_created, access_id)"
+			. " VALUES ($entity_guid, '$name_id','$value_id','$value_type', $owner_guid, $time, $access_id)";
+
+		$id = insert_data($query);
+
+		if ($id !== false) {
+			$obj = elgg_get_metadata_from_id($id);
+			if (elgg_trigger_event('create', 'metadata', $obj)) {
+
+				elgg_get_metadata_cache()->save($entity_guid, $name, $value, $allow_multiple);
+
+				return $id;
+			} else {
+				elgg_delete_metadata_by_id($id);
+			}
+		}
+	}
+
+	return $id;
+}
+
+/**
+ * Update a specific piece of metadata.
+ *
+ * @param int    $id         ID of the metadata to update
+ * @param string $name       Metadata name
+ * @param string $value      Metadata value
+ * @param string $value_type Value type
+ * @param int    $owner_guid Owner guid
+ * @param int    $access_id  Access ID
+ *
+ * @return bool
+ */
+function update_metadata($id, $name, $value, $value_type, $owner_guid, $access_id) {
+	global $CONFIG;
+
+	$id = (int)$id;
+
+	if (!$md = elgg_get_metadata_from_id($id)) {
+		return false;
+	}
+	if (!$md->canEdit()) {
+		return false;
+	}
+
+	// If memcached then we invalidate the cache for this entry
+	static $metabyname_memcache;
+	if ((!$metabyname_memcache) && (is_memcache_available())) {
+		$metabyname_memcache = new ElggMemcache('metabyname_memcache');
+	}
+
+	if ($metabyname_memcache) {
+		// @todo fix memcache (name_id is not a property of ElggMetadata)
+		$metabyname_memcache->delete("{$md->entity_guid}:{$md->name_id}");
+	}
+
+	$value_type = detect_extender_valuetype($value, sanitise_string(trim($value_type)));
+
+	$owner_guid = (int)$owner_guid;
+	if ($owner_guid == 0) {
+		$owner_guid = elgg_get_logged_in_user_guid();
+	}
+
+	$access_id = (int)$access_id;
+
+	// Support boolean types (as integers)
+	if (is_bool($value)) {
+		$value = (int) $value;
+	}
+
+	// Add the metastring
+	$value_id = add_metastring($value);
+	if (!$value_id) {
+		return false;
+	}
+
+	$name_id = add_metastring($name);
+	if (!$name_id) {
+		return false;
+	}
+
+	// If ok then add it
+	$query = "UPDATE {$CONFIG->dbprefix}metadata"
+		. " set name_id='$name_id', value_id='$value_id', value_type='$value_type', access_id=$access_id,"
+		. " owner_guid=$owner_guid where id=$id";
+
+	$result = update_data($query);
+	if ($result !== false) {
+
+		elgg_get_metadata_cache()->save($md->entity_guid, $name, $value);
+
+		// @todo this event tells you the metadata has been updated, but does not
+		// let you do anything about it. What is needed is a plugin hook before
+		// the update that passes old and new values.
+		$obj = elgg_get_metadata_from_id($id);
+		elgg_trigger_event('update', 'metadata', $obj);
+	}
+
+	return $result;
+}
+
+/**
+ * This function creates metadata from an associative array of "key => value" pairs.
+ *
+ * To achieve an array for a single key, pass in the same key multiple times with
+ * allow_multiple set to TRUE. This creates an indexed array. It does not support
+ * associative arrays and there is no guarantee on the ordering in the array.
+ *
+ * @param int    $entity_guid     The entity to attach the metadata to
+ * @param array  $name_and_values Associative array - a value can be a string, number, bool
+ * @param string $value_type      'text', 'integer', or '' for automatic detection
+ * @param int    $owner_guid      GUID of entity that owns the metadata
+ * @param int    $access_id       Default is ACCESS_PRIVATE
+ * @param bool   $allow_multiple  Allow multiple values for one key. Default is FALSE
+ *
+ * @return bool
+ */
+function create_metadata_from_array($entity_guid, array $name_and_values, $value_type, $owner_guid,
+$access_id = ACCESS_PRIVATE, $allow_multiple = false) {
+
+	foreach ($name_and_values as $k => $v) {
+		$result = create_metadata($entity_guid, $k, $v, $value_type, $owner_guid,
+			$access_id, $allow_multiple);
+		if (!$result) {
+			return false;
+		}
+	}
+	return true;
+}
+
+/**
+ * Returns metadata.  Accepts all elgg_get_entities() options for entity
+ * restraints.
+ *
+ * @see elgg_get_entities
+ *
+ * @warning 1.7's find_metadata() didn't support limits and returned all metadata.
+ *          This function defaults to a limit of 25. There is probably not a reason
+ *          for you to return all metadata unless you're exporting an entity,
+ *          have other restraints in place, or are doing something horribly
+ *          wrong in your code.
+ *
+ * @param array $options Array in format:
+ *
+ * metadata_names               => NULL|ARR metadata names
+ * metadata_values              => NULL|ARR metadata values
+ * metadata_ids                 => NULL|ARR metadata ids
+ * metadata_case_sensitive      => BOOL Overall Case sensitive
+ * metadata_owner_guids         => NULL|ARR guids for metadata owners
+ * metadata_created_time_lower  => INT Lower limit for created time.
+ * metadata_created_time_upper  => INT Upper limit for created time.
+ * metadata_calculation         => STR Perform the MySQL function on the metadata values returned.
+ *                                   The "metadata_calculation" option causes this function to
+ *                                   return the result of performing a mathematical calculation on
+ *                                   all metadata that match the query instead of returning
+ *                                   ElggMetadata objects.
+ *
+ * @return ElggMetadata[]|mixed
+ * @since 1.8.0
+ */
+function elgg_get_metadata(array $options = array()) {
+
+	// @todo remove support for count shortcut - see #4393
+	// support shortcut of 'count' => true for 'metadata_calculation' => 'count'
+	if (isset($options['count']) && $options['count']) {
+		$options['metadata_calculation'] = 'count';
+		unset($options['count']);
+	}
+
+	$options['metastring_type'] = 'metadata';
+	return elgg_get_metastring_based_objects($options);
+}
+
+/**
+ * Deletes metadata based on $options.
+ *
+ * @warning Unlike elgg_get_metadata() this will not accept an empty options array!
+ *          This requires at least one constraint: metadata_owner_guid(s),
+ *          metadata_name(s), metadata_value(s), or guid(s) must be set.
+ *
+ * @param array $options An options array. {@see elgg_get_metadata()}
+ * @return bool|null true on success, false on failure, null if no metadata to delete.
+ * @since 1.8.0
+ */
+function elgg_delete_metadata(array $options) {
+	if (!elgg_is_valid_options_for_batch_operation($options, 'metadata')) {
+		return false;
+	}
+	$options['metastring_type'] = 'metadata';
+	$result = elgg_batch_metastring_based_objects($options, 'elgg_batch_delete_callback', false);
+
+	// This moved last in case an object's constructor sets metadata. Currently the batch
+	// delete process has to create the entity to delete its metadata. See #5214
+	elgg_get_metadata_cache()->invalidateByOptions('delete', $options);
+
+	return $result;
+}
+
+/**
+ * Disables metadata based on $options.
+ *
+ * @warning Unlike elgg_get_metadata() this will not accept an empty options array!
+ *
+ * @param array $options An options array. {@See elgg_get_metadata()}
+ * @return bool|null true on success, false on failure, null if no metadata disabled.
+ * @since 1.8.0
+ */
+function elgg_disable_metadata(array $options) {
+	if (!elgg_is_valid_options_for_batch_operation($options, 'metadata')) {
+		return false;
+	}
+
+	elgg_get_metadata_cache()->invalidateByOptions('disable', $options);
+	
+	// if we can see hidden (disabled) we need to use the offset
+	// otherwise we risk an infinite loop if there are more than 50
+	$inc_offset = access_get_show_hidden_status();
+
+	$options['metastring_type'] = 'metadata';
+	return elgg_batch_metastring_based_objects($options, 'elgg_batch_disable_callback', $inc_offset);
+}
+
+/**
+ * Enables metadata based on $options.
+ *
+ * @warning Unlike elgg_get_metadata() this will not accept an empty options array!
+ *
+ * @warning In order to enable metadata, you must first use
+ * {@link access_show_hidden_entities()}.
+ *
+ * @param array $options An options array. {@See elgg_get_metadata()}
+ * @return bool|null true on success, false on failure, null if no metadata enabled.
+ * @since 1.8.0
+ */
+function elgg_enable_metadata(array $options) {
+	if (!$options || !is_array($options)) {
+		return false;
+	}
+
+	elgg_get_metadata_cache()->invalidateByOptions('enable', $options);
+
+	$options['metastring_type'] = 'metadata';
+	return elgg_batch_metastring_based_objects($options, 'elgg_batch_enable_callback');
+}
+
+/**
+ * ElggEntities interfaces
+ */
+
+/**
+ * Returns entities based upon metadata.  Also accepts all
+ * options available to elgg_get_entities().  Supports
+ * the singular option shortcut.
+ *
+ * @note Using metadata_names and metadata_values results in a
+ * "names IN (...) AND values IN (...)" clause.  This is subtly
+ * differently than default multiple metadata_name_value_pairs, which use
+ * "(name = value) AND (name = value)" clauses.
+ *
+ * When in doubt, use name_value_pairs.
+ *
+ * To ask for entities that do not have a metadata value, use a custom
+ * where clause like this:
+ *
+ * 	$options['wheres'][] = "NOT EXISTS (
+ *			SELECT 1 FROM {$dbprefix}metadata md
+ *			WHERE md.entity_guid = e.guid
+ *				AND md.name_id = $name_metastring_id
+ *				AND md.value_id = $value_metastring_id)";
+ *
+ * Note the metadata name and value has been denormalized in the above example.
+ *
+ * @see elgg_get_entities
+ *
+ * @param array $options Array in format:
+ *
+ * 	metadata_names => NULL|ARR metadata names
+ *
+ * 	metadata_values => NULL|ARR metadata values
+ *
+ * 	metadata_name_value_pairs => NULL|ARR (
+ *                                         name => 'name',
+ *                                         value => 'value',
+ *                                         'operand' => '=',
+ *                                         'case_sensitive' => TRUE
+ *                                        )
+ *                               Currently if multiple values are sent via
+ *                               an array (value => array('value1', 'value2')
+ *                               the pair's operand will be forced to "IN".
+ *                               If passing "IN" as the operand and a string as the value, 
+ *                               the value must be a properly quoted and escaped string.
+ *
+ * 	metadata_name_value_pairs_operator => NULL|STR The operator to use for combining
+ *                                        (name = value) OPERATOR (name = value); default AND
+ *
+ * 	metadata_case_sensitive => BOOL Overall Case sensitive
+ *
+ *  order_by_metadata => NULL|ARR array(
+ *                                      'name' => 'metadata_text1',
+ *                                      'direction' => ASC|DESC,
+ *                                      'as' => text|integer
+ *                                     )
+ *                                Also supports array('name' => 'metadata_text1')
+ *
+ *  metadata_owner_guids => NULL|ARR guids for metadata owners
+ *
+ * @return ElggEntity[]|mixed If count, int. If not count, array. false on errors.
+ * @since 1.7.0
+ */
+function elgg_get_entities_from_metadata(array $options = array()) {
+	$defaults = array(
+		'metadata_names'                     => ELGG_ENTITIES_ANY_VALUE,
+		'metadata_values'                    => ELGG_ENTITIES_ANY_VALUE,
+		'metadata_name_value_pairs'          => ELGG_ENTITIES_ANY_VALUE,
+
+		'metadata_name_value_pairs_operator' => 'AND',
+		'metadata_case_sensitive'            => TRUE,
+		'order_by_metadata'                  => array(),
+
+		'metadata_owner_guids'               => ELGG_ENTITIES_ANY_VALUE,
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('metadata_name', 'metadata_value',
+		'metadata_name_value_pair', 'metadata_owner_guid');
+
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	if (!$options = elgg_entities_get_metastrings_options('metadata', $options)) {
+		return FALSE;
+	}
+
+	return elgg_get_entities($options);
+}
+
+/**
+ * Returns metadata name and value SQL where for entities.
+ * NB: $names and $values are not paired. Use $pairs for this.
+ * Pairs default to '=' operand.
+ *
+ * This function is reused for annotations because the tables are
+ * exactly the same.
+ *
+ * @param string     $e_table           Entities table name
+ * @param string     $n_table           Normalized metastrings table name (Where entities,
+ *                                    values, and names are joined. annotations / metadata)
+ * @param array|null $names             Array of names
+ * @param array|null $values            Array of values
+ * @param array|null $pairs             Array of names / values / operands
+ * @param string     $pair_operator     ("AND" or "OR") Operator to use to join the where clauses for pairs
+ * @param bool       $case_sensitive    Case sensitive metadata names?
+ * @param array|null $order_by_metadata Array of names / direction
+ * @param array|null $owner_guids       Array of owner GUIDs
+ *
+ * @return false|array False on fail, array('joins', 'wheres')
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_metadata_where_sql($e_table, $n_table, $names = NULL, $values = NULL,
+$pairs = NULL, $pair_operator = 'AND', $case_sensitive = TRUE, $order_by_metadata = NULL,
+$owner_guids = NULL) {
+
+	global $CONFIG;
+
+	// short circuit if nothing requested
+	// 0 is a valid (if not ill-conceived) metadata name.
+	// 0 is also a valid metadata value for FALSE, NULL, or 0
+	// 0 is also a valid(ish) owner_guid
+	if ((!$names && $names !== 0)
+		&& (!$values && $values !== 0)
+		&& (!$pairs && $pairs !== 0)
+		&& (!$owner_guids && $owner_guids !== 0)
+		&& !$order_by_metadata) {
+		return '';
+	}
+
+	// join counter for incremental joins.
+	$i = 1;
+
+	// binary forces byte-to-byte comparision of strings, making
+	// it case- and diacritical-mark- sensitive.
+	// only supported on values.
+	$binary = ($case_sensitive) ? ' BINARY ' : '';
+
+	$access = get_access_sql_suffix('n_table');
+
+	$return = array (
+		'joins' => array (),
+		'wheres' => array(),
+		'orders' => array()
+	);
+
+	// will always want to join these tables if pulling metastrings.
+	$return['joins'][] = "JOIN {$CONFIG->dbprefix}{$n_table} n_table on
+		{$e_table}.guid = n_table.entity_guid";
+
+	$wheres = array();
+
+	// get names wheres and joins
+	$names_where = '';
+	if ($names !== NULL) {
+		if (!is_array($names)) {
+			$names = array($names);
+		}
+
+		$sanitised_names = array();
+		foreach ($names as $name) {
+			// normalise to 0.
+			if (!$name) {
+				$name = '0';
+			}
+			$sanitised_names[] = '\'' . sanitise_string($name) . '\'';
+		}
+
+		if ($names_str = implode(',', $sanitised_names)) {
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msn on n_table.name_id = msn.id";
+			$names_where = "(msn.string IN ($names_str))";
+		}
+	}
+
+	// get values wheres and joins
+	$values_where = '';
+	if ($values !== NULL) {
+		if (!is_array($values)) {
+			$values = array($values);
+		}
+
+		$sanitised_values = array();
+		foreach ($values as $value) {
+			// normalize to 0
+			if (!$value) {
+				$value = 0;
+			}
+			$sanitised_values[] = '\'' . sanitise_string($value) . '\'';
+		}
+
+		if ($values_str = implode(',', $sanitised_values)) {
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msv on n_table.value_id = msv.id";
+			$values_where = "({$binary}msv.string IN ($values_str))";
+		}
+	}
+
+	if ($names_where && $values_where) {
+		$wheres[] = "($names_where AND $values_where AND $access)";
+	} elseif ($names_where) {
+		$wheres[] = "($names_where AND $access)";
+	} elseif ($values_where) {
+		$wheres[] = "($values_where AND $access)";
+	}
+
+	// add pairs
+	// pairs must be in arrays.
+	if (is_array($pairs)) {
+		// check if this is an array of pairs or just a single pair.
+		if (isset($pairs['name']) || isset($pairs['value'])) {
+			$pairs = array($pairs);
+		}
+
+		$pair_wheres = array();
+
+		// @todo when the pairs are > 3 should probably split the query up to
+		// denormalize the strings table.
+
+		foreach ($pairs as $index => $pair) {
+			// @todo move this elsewhere?
+			// support shortcut 'n' => 'v' method.
+			if (!is_array($pair)) {
+				$pair = array(
+					'name' => $index,
+					'value' => $pair
+				);
+			}
+
+			// must have at least a name and value
+			if (!isset($pair['name']) || !isset($pair['value'])) {
+				// @todo should probably return false.
+				continue;
+			}
+
+			// case sensitivity can be specified per pair.
+			// default to higher level setting.
+			if (isset($pair['case_sensitive'])) {
+				$pair_binary = ($pair['case_sensitive']) ? ' BINARY ' : '';
+			} else {
+				$pair_binary = $binary;
+			}
+
+			if (isset($pair['operand'])) {
+				$operand = sanitise_string($pair['operand']);
+			} else {
+				$operand = ' = ';
+			}
+
+			// for comparing
+			$trimmed_operand = trim(strtolower($operand));
+
+			$access = get_access_sql_suffix("n_table{$i}");
+			// if the value is an int, don't quote it because str '15' < str '5'
+			// if the operand is IN don't quote it because quoting should be done already.
+			if (is_numeric($pair['value'])) {
+				$value = sanitise_string($pair['value']);
+			} else if (is_bool($pair['value'])) {
+				$value = (int) $pair['value'];
+			} else if (is_array($pair['value'])) {
+				$values_array = array();
+
+				foreach ($pair['value'] as $pair_value) {
+					if (is_numeric($pair_value)) {
+						$values_array[] = sanitise_string($pair_value);
+					} else {
+						$values_array[] = "'" . sanitise_string($pair_value) . "'";
+					}
+				}
+
+				if ($values_array) {
+					$value = '(' . implode(', ', $values_array) . ')';
+				}
+
+				// @todo allow support for non IN operands with array of values.
+				// will have to do more silly joins.
+				$operand = 'IN';
+			} else if ($trimmed_operand == 'in') {
+				$value = "({$pair['value']})";
+			} else {
+				$value = "'" . sanitise_string($pair['value']) . "'";
+			}
+
+			$name = sanitise_string($pair['name']);
+
+			// @todo The multiple joins are only needed when the operator is AND
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}{$n_table} n_table{$i}
+				on {$e_table}.guid = n_table{$i}.entity_guid";
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msn{$i}
+				on n_table{$i}.name_id = msn{$i}.id";
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msv{$i}
+				on n_table{$i}.value_id = msv{$i}.id";
+
+			$pair_wheres[] = "(msn{$i}.string = '$name' AND {$pair_binary}msv{$i}.string
+				$operand $value AND $access)";
+
+			$i++;
+		}
+
+		if ($where = implode(" $pair_operator ", $pair_wheres)) {
+			$wheres[] = "($where)";
+		}
+	}
+
+	// add owner_guids
+	if ($owner_guids) {
+		if (is_array($owner_guids)) {
+			$sanitised = array_map('sanitise_int', $owner_guids);
+			$owner_str = implode(',', $sanitised);
+		} else {
+			$owner_str = sanitise_int($owner_guids);
+		}
+
+		$wheres[] = "(n_table.owner_guid IN ($owner_str))";
+	}
+
+	if ($where = implode(' AND ', $wheres)) {
+		$return['wheres'][] = "($where)";
+	}
+
+	if (is_array($order_by_metadata)) {
+		if ((count($order_by_metadata) > 0) && !isset($order_by_metadata[0])) {
+			// singleton, so fix
+			$order_by_metadata = array($order_by_metadata);
+		}
+		foreach ($order_by_metadata as $order_by) {
+			if (is_array($order_by) && isset($order_by['name'])) {
+				$name = sanitise_string($order_by['name']);
+				if (isset($order_by['direction'])) {
+					$direction = sanitise_string($order_by['direction']);
+				} else {
+					$direction = 'ASC';
+				}
+				$return['joins'][] = "JOIN {$CONFIG->dbprefix}{$n_table} n_table{$i}
+					on {$e_table}.guid = n_table{$i}.entity_guid";
+				$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msn{$i}
+					on n_table{$i}.name_id = msn{$i}.id";
+				$return['joins'][] = "JOIN {$CONFIG->dbprefix}metastrings msv{$i}
+					on n_table{$i}.value_id = msv{$i}.id";
+
+				$access = get_access_sql_suffix("n_table{$i}");
+
+				$return['wheres'][] = "(msn{$i}.string = '$name' AND $access)";
+				if (isset($order_by['as']) && $order_by['as'] == 'integer') {
+					$return['orders'][] = "CAST(msv{$i}.string AS SIGNED) $direction";
+				} else {
+					$return['orders'][] = "msv{$i}.string $direction";
+				}
+				$i++;
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Returns a list of entities filtered by provided metadata.
+ *
+ * @see elgg_get_entities_from_metadata
+ *
+ * @param array $options Options array
+ *
+ * @return array
+ * @since 1.7.0
+ */
+function elgg_list_entities_from_metadata($options) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_metadata');
+}
+
+/**
+ * Other functions
+ */
+
+/**
+ * Handler called by trigger_plugin_hook on the "export" event.
+ *
+ * @param string $hook        export
+ * @param string $entity_type all
+ * @param mixed  $returnvalue Value returned from previous hook
+ * @param mixed  $params      Params
+ *
+ * @return array
+ * @access private
+ *
+ * @throws InvalidParameterException
+ */
+function export_metadata_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	// Sanity check values
+	if ((!is_array($params)) && (!isset($params['guid']))) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:GUIDNotForExport'));
+	}
+
+	if (!is_array($returnvalue)) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonArrayReturnValue'));
+	}
+
+	$result = elgg_get_metadata(array(
+		'guid' => (int)$params['guid'],
+		'limit' => 0,
+	));
+
+	if ($result) {
+		/* @var ElggMetadata[] $result */
+		foreach ($result as $r) {
+			$returnvalue[] = $r->export();
+		}
+	}
+
+	return $returnvalue;
+}
+
+/**
+ * Takes in a comma-separated string and returns an array of tags
+ * which have been trimmed
+ *
+ * @param string $string Comma-separated tag string
+ *
+ * @return array|false An array of strings, or false on failure
+ */
+function string_to_tag_array($string) {
+	if (is_string($string)) {
+		$ar = explode(",", $string);
+		$ar = array_map('trim', $ar);
+		$ar = array_filter($ar, 'is_not_null');
+		$ar = array_map('strip_tags', $ar);
+		return $ar;
+	}
+	return false;
+}
+
+/**
+ * Takes a metadata array (which has all kinds of properties)
+ * and turns it into a simple array of strings
+ *
+ * @param array $array Metadata array
+ *
+ * @return array Array of strings
+ */
+function metadata_array_to_values($array) {
+	$valuearray = array();
+
+	if (is_array($array)) {
+		foreach ($array as $element) {
+			$valuearray[] = $element->value;
+		}
+	}
+
+	return $valuearray;
+}
+
+/**
+ * Get the URL for this metadata
+ *
+ * By default this links to the export handler in the current view.
+ *
+ * @param int $id Metadata ID
+ *
+ * @return mixed
+ */
+function get_metadata_url($id) {
+	$id = (int)$id;
+
+	if ($extender = elgg_get_metadata_from_id($id)) {
+		return get_extender_url($extender);
+	}
+	return false;
+}
+
+/**
+ * Mark entities with a particular type and subtype as having access permissions
+ * that can be changed independently from their parent entity
+ *
+ * @param string $type    The type - object, user, etc
+ * @param string $subtype The subtype; all subtypes by default
+ *
+ * @return void
+ */
+function register_metadata_as_independent($type, $subtype = '*') {
+	global $CONFIG;
+	if (!isset($CONFIG->independents)) {
+		$CONFIG->independents = array();
+	}
+	$CONFIG->independents[$type][$subtype] = true;
+}
+
+/**
+ * Determines whether entities of a given type and subtype should not change
+ * their metadata in line with their parent entity
+ *
+ * @param string $type    The type - object, user, etc
+ * @param string $subtype The entity subtype
+ *
+ * @return bool
+ */
+function is_metadata_independent($type, $subtype) {
+	global $CONFIG;
+	if (empty($CONFIG->independents)) {
+		return false;
+	}
+	if (!empty($CONFIG->independents[$type][$subtype])
+		|| !empty($CONFIG->independents[$type]['*'])) {
+			return true;
+		}
+	return false;
+}
+
+/**
+ * When an entity is updated, resets the access ID on all of its child metadata
+ *
+ * @param string     $event       The name of the event
+ * @param string     $object_type The type of object
+ * @param ElggEntity $object      The entity itself
+ *
+ * @return true
+ */
+function metadata_update($event, $object_type, $object) {
+	if ($object instanceof ElggEntity) {
+		if (!is_metadata_independent($object->getType(), $object->getSubtype())) {
+			$db_prefix = elgg_get_config('dbprefix');
+			$access_id = (int) $object->access_id;
+			$guid = (int) $object->getGUID();
+			$query = "update {$db_prefix}metadata set access_id = {$access_id} where entity_guid = {$guid}";
+			update_data($query);
+		}
+	}
+	return true;
+}
+
+/**
+ * Register a metadata url handler.
+ *
+ * @param string $extender_name The name, default 'all'.
+ * @param string $function      The function name.
+ *
+ * @return bool
+ */
+function elgg_register_metadata_url_handler($extender_name, $function) {
+	return elgg_register_extender_url_handler('metadata', $extender_name, $function);
+}
+
+/**
+ * Get the global metadata cache instance
+ *
+ * @return ElggVolatileMetadataCache
+ *
+ * @access private
+ */
+function elgg_get_metadata_cache() {
+	global $CONFIG;
+	if (empty($CONFIG->local_metadata_cache)) {
+		$CONFIG->local_metadata_cache = new ElggVolatileMetadataCache();
+	}
+	return $CONFIG->local_metadata_cache;
+}
+
+/**
+ * Invalidate the metadata cache based on options passed to various *_metadata functions
+ *
+ * @param string $action  Action performed on metadata. "delete", "disable", or "enable"
+ * @param array  $options Options passed to elgg_(delete|disable|enable)_metadata
+ * @return void
+ */
+function elgg_invalidate_metadata_cache($action, array $options) {
+	// remove as little as possible, optimizing for common cases
+	$cache = elgg_get_metadata_cache();
+	if (empty($options['guid'])) {
+		// safest to clear everything unless we want to make this even more complex :(
+		$cache->flush();
+	} else {
+		if (empty($options['metadata_name'])) {
+			// safest to clear the whole entity
+			$cache->clear($options['guid']);
+		} else {
+			switch ($action) {
+				case 'delete':
+					$cache->markEmpty($options['guid'], $options['metadata_name']);
+					break;
+				default:
+					$cache->markUnknown($options['guid'], $options['metadata_name']);
+			}
+		}
+	}
+}
+
+/** Register the hook */
+elgg_register_plugin_hook_handler("export", "all", "export_metadata_plugin_hook", 2);
+
+/** Call a function whenever an entity is updated **/
+elgg_register_event_handler('update', 'all', 'metadata_update');
+
+// unit testing
+elgg_register_plugin_hook_handler('unit_test', 'system', 'metadata_test');
+
+/**
+ * Metadata unit test
+ *
+ * @param string $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of other tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function metadata_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/metadata.php';
+	$value[] = $CONFIG->path . 'engine/tests/api/metadata_cache.php';
+	return $value;
+}
diff --git a/engine/lib/metastrings.php b/engine/lib/metastrings.php
new file mode 100644
index 000000000..57d876c06
--- /dev/null
+++ b/engine/lib/metastrings.php
@@ -0,0 +1,903 @@
+<?php
+/**
+ * Elgg metastrngs
+ * Functions to manage object metastrings.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.MetaStrings
+ */
+
+/** Cache metastrings for a page */
+global $METASTRINGS_CACHE;
+$METASTRINGS_CACHE = array();
+
+/** Keep a record of strings we know don't exist */
+global $METASTRINGS_DEADNAME_CACHE;
+$METASTRINGS_DEADNAME_CACHE = array();
+
+
+
+/**
+ * Return the meta string id for a given tag, or false.
+ *
+ * @param string $string         The value to store
+ * @param bool   $case_sensitive Do we want to make the query case sensitive?
+ *                               If not there may be more than one result
+ *
+ * @return int|array|false meta   string id, array of ids or false if none found
+ */
+function get_metastring_id($string, $case_sensitive = TRUE) {
+	global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
+
+	$string = sanitise_string($string);
+
+	// caching doesn't work for case insensitive searches
+	if ($case_sensitive) {
+		$result = array_search($string, $METASTRINGS_CACHE, true);
+
+		if ($result !== false) {
+			elgg_log("** Returning id for string:$string from cache.");
+			return $result;
+		}
+
+		// See if we have previously looked for this and found nothing
+		if (in_array($string, $METASTRINGS_DEADNAME_CACHE, true)) {
+			return false;
+		}
+
+		// Experimental memcache
+		$msfc = null;
+		static $metastrings_memcache;
+		if ((!$metastrings_memcache) && (is_memcache_available())) {
+			$metastrings_memcache = new ElggMemcache('metastrings_memcache');
+		}
+		if ($metastrings_memcache) {
+			$msfc = $metastrings_memcache->load($string);
+		}
+		if ($msfc) {
+			return $msfc;
+		}
+	}
+
+	// Case sensitive
+	if ($case_sensitive) {
+		$query = "SELECT * from {$CONFIG->dbprefix}metastrings where string= BINARY '$string' limit 1";
+	} else {
+		$query = "SELECT * from {$CONFIG->dbprefix}metastrings where string = '$string'";
+	}
+
+	$row = FALSE;
+	$metaStrings = get_data($query);
+	if (is_array($metaStrings)) {
+		if (sizeof($metaStrings) > 1) {
+			$ids = array();
+			foreach ($metaStrings as $metaString) {
+				$ids[] = $metaString->id;
+			}
+			return $ids;
+		} else if (isset($metaStrings[0])) {
+			$row = $metaStrings[0];
+		}
+	}
+
+	if ($row) {
+		$METASTRINGS_CACHE[$row->id] = $row->string; // Cache it
+
+		// Attempt to memcache it if memcache is available
+		if ($metastrings_memcache) {
+			$metastrings_memcache->save($row->string, $row->id);
+		}
+
+		elgg_log("** Cacheing string '{$row->string}'");
+
+		return $row->id;
+	} else {
+		$METASTRINGS_DEADNAME_CACHE[$string] = $string;
+	}
+
+	return false;
+}
+
+/**
+ * When given an ID, returns the corresponding metastring
+ *
+ * @param int $id Metastring ID
+ *
+ * @return string Metastring
+ */
+function get_metastring($id) {
+	global $CONFIG, $METASTRINGS_CACHE;
+
+	$id = (int) $id;
+
+	if (isset($METASTRINGS_CACHE[$id])) {
+		elgg_log("** Returning string for id:$id from cache.");
+
+		return $METASTRINGS_CACHE[$id];
+	}
+
+	$row = get_data_row("SELECT * from {$CONFIG->dbprefix}metastrings where id='$id' limit 1");
+	if ($row) {
+		$METASTRINGS_CACHE[$id] = $row->string; // Cache it
+		elgg_log("** Cacheing string '{$row->string}'");
+
+		return $row->string;
+	}
+
+	return false;
+}
+
+/**
+ * Add a metastring.
+ * It returns the id of the tag, whether by creating it or updating it.
+ *
+ * @param string $string         The value (whatever that is) to be stored
+ * @param bool   $case_sensitive Do we want to make the query case sensitive?
+ *
+ * @return mixed Integer tag or false.
+ */
+function add_metastring($string, $case_sensitive = true) {
+	global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
+
+	$sanstring = sanitise_string($string);
+
+	$id = get_metastring_id($string, $case_sensitive);
+	if ($id) {
+		return $id;
+	}
+
+	$result = insert_data("INSERT into {$CONFIG->dbprefix}metastrings (string) values ('$sanstring')");
+	if ($result) {
+		$METASTRINGS_CACHE[$result] = $string;
+		if (isset($METASTRINGS_DEADNAME_CACHE[$string])) {
+			unset($METASTRINGS_DEADNAME_CACHE[$string]);
+		}
+	}
+
+	return $result;
+}
+
+/**
+ * Delete any orphaned entries in metastrings. This is run by the garbage collector.
+ *
+ * @return bool
+ * @access private
+ */
+function delete_orphaned_metastrings() {
+	global $CONFIG;
+
+	// If memcache is enabled then we need to flush it of deleted values
+	if (is_memcache_available()) {
+		$select_query = "
+		SELECT *
+		from {$CONFIG->dbprefix}metastrings where
+		(
+			(id not in (select name_id from {$CONFIG->dbprefix}metadata)) AND
+			(id not in (select value_id from {$CONFIG->dbprefix}metadata)) AND
+			(id not in (select name_id from {$CONFIG->dbprefix}annotations)) AND
+			(id not in (select value_id from {$CONFIG->dbprefix}annotations))
+		)";
+
+		$dead = get_data($select_query);
+		if ($dead) {
+			static $metastrings_memcache;
+			if (!$metastrings_memcache) {
+				$metastrings_memcache = new ElggMemcache('metastrings_memcache');
+			}
+
+			foreach ($dead as $d) {
+				$metastrings_memcache->delete($d->string);
+			}
+		}
+	}
+
+	$query = "
+		DELETE
+		from {$CONFIG->dbprefix}metastrings where
+		(
+			(id not in (select name_id from {$CONFIG->dbprefix}metadata)) AND
+			(id not in (select value_id from {$CONFIG->dbprefix}metadata)) AND
+			(id not in (select name_id from {$CONFIG->dbprefix}annotations)) AND
+			(id not in (select value_id from {$CONFIG->dbprefix}annotations))
+		)";
+
+	return delete_data($query);
+}
+
+/**
+ * Returns an array of either ElggAnnotation or ElggMetadata objects.
+ * Accepts all elgg_get_entities() options for entity restraints.
+ *
+ * @see elgg_get_entities
+ *
+ * @param array $options Array in format:
+ *
+ * 	metastring_names              => NULL|ARR metastring names
+ *
+ * 	metastring_values             => NULL|ARR metastring values
+ *
+ * 	metastring_ids                => NULL|ARR metastring ids
+ *
+ * 	metastring_case_sensitive     => BOOL     Overall Case sensitive
+ *
+ *  metastring_owner_guids        => NULL|ARR Guids for metadata owners
+ *
+ *  metastring_created_time_lower => INT      Lower limit for created time.
+ *
+ *  metastring_created_time_upper => INT      Upper limit for created time.
+ *
+ *  metastring_calculation        => STR      Perform the MySQL function on the metastring values
+ *                                            returned.
+ *                                            This differs from egef_annotation_calculation in that
+ *                                            it returns only the calculation of all annotation values.
+ *                                            You can sum, avg, count, etc. egef_annotation_calculation()
+ *                                            returns ElggEntities ordered by a calculation on their
+ *                                            annotation values.
+ *
+ *  metastring_type               => STR      metadata or annotation(s)
+ *
+ * @return mixed
+ * @access private
+ */
+function elgg_get_metastring_based_objects($options) {
+	$options = elgg_normalize_metastrings_options($options);
+
+	switch ($options['metastring_type']) {
+		case 'metadata':
+			$type = 'metadata';
+			$callback = 'row_to_elggmetadata';
+			break;
+
+		case 'annotations':
+		case 'annotation':
+			$type = 'annotations';
+			$callback = 'row_to_elggannotation';
+			break;
+
+		default:
+			return false;
+	}
+
+	$defaults = array(
+		// entities
+		'types'					=>	ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'				=>	ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'guids'					=>	ELGG_ENTITIES_ANY_VALUE,
+		'owner_guids'			=>	ELGG_ENTITIES_ANY_VALUE,
+		'container_guids'		=>	ELGG_ENTITIES_ANY_VALUE,
+		'site_guids'			=>	get_config('site_guid'),
+
+		'modified_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'modified_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		// options are normalized to the plural in case we ever add support for them.
+		'metastring_names'							=>	ELGG_ENTITIES_ANY_VALUE,
+		'metastring_values'							=>	ELGG_ENTITIES_ANY_VALUE,
+		//'metastring_name_value_pairs'				=>	ELGG_ENTITIES_ANY_VALUE,
+		//'metastring_name_value_pairs_operator'	=>	'AND',
+
+		'metastring_case_sensitive' 				=>	TRUE,
+		//'order_by_metastring'						=>	array(),
+		'metastring_calculation'					=>	ELGG_ENTITIES_NO_VALUE,
+
+		'metastring_created_time_lower'				=>	ELGG_ENTITIES_ANY_VALUE,
+		'metastring_created_time_upper'				=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'metastring_owner_guids'					=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'metastring_ids'							=>	ELGG_ENTITIES_ANY_VALUE,
+
+		// sql
+		'order_by'	=>	'n_table.time_created asc',
+		'limit'		=>	10,
+		'offset'	=>	0,
+		'count'		=>	FALSE,
+		'selects'	=>	array(),
+		'wheres'	=>	array(),
+		'joins'		=>	array(),
+
+		'callback'	=> $callback
+	);
+
+	// @todo Ignore site_guid right now because of #2910
+	$options['site_guid'] = ELGG_ENTITIES_ANY_VALUE;
+
+	$options = array_merge($defaults, $options);
+
+	// can't use helper function with type_subtype_pair because
+	// it's already an array...just need to merge it
+	if (isset($options['type_subtype_pair'])) {
+		if (isset($options['type_subtype_pairs'])) {
+			$options['type_subtype_pairs'] = array_merge($options['type_subtype_pairs'],
+				$options['type_subtype_pair']);
+		} else {
+			$options['type_subtype_pairs'] = $options['type_subtype_pair'];
+		}
+	}
+
+	$singulars = array(
+		'type', 'subtype', 'type_subtype_pair',
+		'guid', 'owner_guid', 'container_guid', 'site_guid',
+		'metastring_name', 'metastring_value',
+		'metastring_owner_guid', 'metastring_id',
+		'select', 'where', 'join'
+	);
+
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	if (!$options) {
+		return false;
+	}
+
+	$db_prefix = elgg_get_config('dbprefix');
+
+	// evaluate where clauses
+	if (!is_array($options['wheres'])) {
+		$options['wheres'] = array($options['wheres']);
+	}
+
+	$wheres = $options['wheres'];
+
+	// entities
+	$wheres[] = elgg_get_entity_type_subtype_where_sql('e', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+
+	$wheres[] = elgg_get_guid_based_where_sql('e.guid', $options['guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.owner_guid', $options['owner_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.container_guid', $options['container_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.site_guid', $options['site_guids']);
+
+	$wheres[] = elgg_get_entity_time_where_sql('e', $options['created_time_upper'],
+		$options['created_time_lower'], $options['modified_time_upper'], $options['modified_time_lower']);
+
+
+	$wheres[] = elgg_get_entity_time_where_sql('n_table', $options['metastring_created_time_upper'],
+		$options['metastring_created_time_lower'], null, null);
+
+	$wheres[] = elgg_get_guid_based_where_sql('n_table.owner_guid',
+		$options['metastring_owner_guids']);
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	// evaluate join clauses
+	if (!is_array($options['joins'])) {
+		$options['joins'] = array($options['joins']);
+	}
+
+	$joins = $options['joins'];
+	$joins[] = "JOIN {$db_prefix}entities e ON n_table.entity_guid = e.guid";
+
+	// evaluate selects
+	if (!is_array($options['selects'])) {
+		$options['selects'] = array($options['selects']);
+	}
+
+	$selects = $options['selects'];
+
+	// For performance reasons we don't want the joins required for metadata / annotations
+	// unless we're going through one of their callbacks.
+	// this means we expect the functions passing different callbacks to pass their required joins.
+	// If we're doing a calculation
+	$custom_callback = ($options['callback'] == 'row_to_elggmetadata'
+						|| $options['callback'] == 'row_to_elggannotation');
+	$is_calculation = $options['metastring_calculation'] ? true : false;
+	
+	if ($custom_callback || $is_calculation) {
+		$joins[] = "JOIN {$db_prefix}metastrings n on n_table.name_id = n.id";
+		$joins[] = "JOIN {$db_prefix}metastrings v on n_table.value_id = v.id";
+
+		$selects[] = 'n.string as name';
+		$selects[] = 'v.string as value';
+	}
+
+	foreach ($joins as $i => $join) {
+		if ($join === FALSE) {
+			return FALSE;
+		} elseif (empty($join)) {
+			unset($joins[$i]);
+		}
+	}
+
+	// metastrings
+	$metastring_clauses = elgg_get_metastring_sql('n_table', $options['metastring_names'],
+		$options['metastring_values'], null, $options['metastring_ids'],
+		$options['metastring_case_sensitive']);
+
+	if ($metastring_clauses) {
+		$wheres = array_merge($wheres, $metastring_clauses['wheres']);
+		$joins = array_merge($joins, $metastring_clauses['joins']);
+	} else {
+		$wheres[] = get_access_sql_suffix('n_table');
+	}
+
+	if ($options['metastring_calculation'] === ELGG_ENTITIES_NO_VALUE && !$options['count']) {
+		$selects = array_unique($selects);
+		// evalutate selects
+		$select_str = '';
+		if ($selects) {
+			foreach ($selects as $select) {
+				$select_str .= ", $select";
+			}
+		}
+
+		$query = "SELECT DISTINCT n_table.*{$select_str} FROM {$db_prefix}$type n_table";
+	} elseif ($options['count']) {
+		// count is over the entities
+		$query = "SELECT count(DISTINCT e.guid) as calculation FROM {$db_prefix}$type n_table";
+	} else {
+		$query = "SELECT {$options['metastring_calculation']}(v.string) as calculation FROM {$db_prefix}$type n_table";
+	}
+
+	// remove identical join clauses
+	$joins = array_unique($joins);
+
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
+
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix('e');
+
+	// reverse order by
+	if (isset($options['reverse_order_by']) && $options['reverse_order_by']) {
+		$options['order_by'] = elgg_sql_reverse_order_by_clause($options['order_by'],
+			$defaults['order_by']);
+	}
+
+	if ($options['metastring_calculation'] === ELGG_ENTITIES_NO_VALUE && !$options['count']) {
+		if (isset($options['group_by'])) {
+			$options['group_by'] = sanitise_string($options['group_by']);
+			$query .= " GROUP BY {$options['group_by']}";
+		}
+
+		if (isset($options['order_by']) && $options['order_by']) {
+			$options['order_by'] = sanitise_string($options['order_by']);
+			$query .= " ORDER BY {$options['order_by']}, n_table.id";
+		}
+
+		if ($options['limit']) {
+			$limit = sanitise_int($options['limit']);
+			$offset = sanitise_int($options['offset'], false);
+			$query .= " LIMIT $offset, $limit";
+		}
+
+		$dt = get_data($query, $options['callback']);
+		return $dt;
+	} else {
+		$result = get_data_row($query);
+		return $result->calculation;
+	}
+}
+
+/**
+ * Returns an array of joins and wheres for use in metastrings.
+ *
+ * @note The $pairs is reserved for name/value pairs if we want to implement those.
+ *
+ * @param string $table          The annotation or metadata table name or alias
+ * @param array  $names          An array of names
+ * @param array  $values         An array of values
+ * @param array  $pairs          Name / value pairs. Not currently used.
+ * @param array  $ids            Metastring IDs
+ * @param bool   $case_sensitive Should name and values be case sensitive?
+ *
+ * @return array
+ * @access private
+ */
+function elgg_get_metastring_sql($table, $names = null, $values = null,
+	$pairs = null, $ids = null, $case_sensitive = false) {
+
+	if ((!$names && $names !== 0)
+		&& (!$values && $values !== 0)
+		&& !$ids
+		&& (!$pairs && $pairs !== 0)) {
+
+		return array();
+	}
+
+	$db_prefix = elgg_get_config('dbprefix');
+
+	// binary forces byte-to-byte comparision of strings, making
+	// it case- and diacritical-mark- sensitive.
+	// only supported on values.
+	$binary = ($case_sensitive) ? ' BINARY ' : '';
+
+	$return = array (
+		'joins' => array (),
+		'wheres' => array()
+	);
+
+	$wheres = array();
+
+	// get names wheres and joins
+	$names_where = '';
+	if ($names !== NULL) {
+		if (!is_array($names)) {
+			$names = array($names);
+		}
+
+		$sanitised_names = array();
+		foreach ($names as $name) {
+			// normalise to 0.
+			if (!$name) {
+				$name = '0';
+			}
+			$sanitised_names[] = '\'' . sanitise_string($name) . '\'';
+		}
+
+		if ($names_str = implode(',', $sanitised_names)) {
+			$return['joins'][] = "JOIN {$db_prefix}metastrings msn on $table.name_id = msn.id";
+			$names_where = "(msn.string IN ($names_str))";
+		}
+	}
+
+	// get values wheres and joins
+	$values_where = '';
+	if ($values !== NULL) {
+		if (!is_array($values)) {
+			$values = array($values);
+		}
+
+		$sanitised_values = array();
+		foreach ($values as $value) {
+			// normalize to 0
+			if (!$value) {
+				$value = 0;
+			}
+			$sanitised_values[] = '\'' . sanitise_string($value) . '\'';
+		}
+
+		if ($values_str = implode(',', $sanitised_values)) {
+			$return['joins'][] = "JOIN {$db_prefix}metastrings msv on $table.value_id = msv.id";
+			$values_where = "({$binary}msv.string IN ($values_str))";
+		}
+	}
+
+	if ($ids !== NULL) {
+		if (!is_array($ids)) {
+			$ids = array($ids);
+		}
+
+		$ids_str = implode(',', $ids);
+
+		if ($ids_str) {
+			$wheres[] = "n_table.id IN ($ids_str)";
+		}
+	}
+
+	if ($names_where && $values_where) {
+		$wheres[] = "($names_where AND $values_where)";
+	} elseif ($names_where) {
+		$wheres[] = $names_where;
+	} elseif ($values_where) {
+		$wheres[] = $values_where;
+	}
+
+	$wheres[] = get_access_sql_suffix($table);
+
+	if ($where = implode(' AND ', $wheres)) {
+		$return['wheres'][] = "($where)";
+	}
+
+	return $return;
+}
+
+/**
+ * Normalizes metadata / annotation option names to their corresponding metastrings name.
+ *
+ * @param array $options An options array
+ * @since 1.8.0
+ * @return array
+ * @access private
+ */
+function elgg_normalize_metastrings_options(array $options = array()) {
+
+	// support either metastrings_type or metastring_type
+	// because I've made this mistake many times and hunting it down is a pain...
+	$type = elgg_extract('metastring_type', $options, null);
+	$type = elgg_extract('metastrings_type', $options, $type);
+
+	$options['metastring_type'] = $type;
+
+	// support annotation_ and annotations_ because they're way too easy to confuse
+	$prefixes = array('metadata_', 'annotation_', 'annotations_');
+
+	// map the metadata_* options to metastring_* options
+	$map = array(
+		'names'					=>	'metastring_names',
+		'values'				=>	'metastring_values',
+		'case_sensitive'		=>	'metastring_case_sensitive',
+		'owner_guids'			=>	'metastring_owner_guids',
+		'created_time_lower'	=>	'metastring_created_time_lower',
+		'created_time_upper'	=>	'metastring_created_time_upper',
+		'calculation'			=>	'metastring_calculation',
+		'ids'					=>	'metastring_ids'
+	);
+
+	foreach ($prefixes as $prefix) {
+		$singulars = array("{$prefix}name", "{$prefix}value", "{$prefix}owner_guid", "{$prefix}id");
+		$options = elgg_normalise_plural_options_array($options, $singulars);
+
+		foreach ($map as $specific => $normalized) {
+			$key = $prefix . $specific;
+			if (isset($options[$key])) {
+				$options[$normalized] = $options[$key];
+			}
+		}
+	}
+
+	return $options;
+}
+
+/**
+ * Enables or disables a metastrings-based object by its id.
+ *
+ * @warning To enable disabled metastrings you must first use
+ * {@link access_show_hidden_entities()}.
+ *
+ * @param int    $id      The object's ID
+ * @param string $enabled Value to set to: yes or no
+ * @param string $type    The type of table to use: metadata or annotations
+ *
+ * @return bool
+ * @throws InvalidParameterException
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_metastring_based_object_enabled_by_id($id, $enabled, $type) {
+	$id = (int)$id;
+	$db_prefix = elgg_get_config('dbprefix');
+
+	$object = elgg_get_metastring_based_object_from_id($id, $type);
+
+	switch($type) {
+		case 'annotation':
+		case 'annotations':
+			$table = "{$db_prefix}annotations";
+			break;
+
+		case 'metadata':
+			$table = "{$db_prefix}metadata";
+			break;
+	}
+
+	if ($enabled === 'yes' || $enabled === 1 || $enabled === true) {
+		$enabled = 'yes';
+		$event = 'enable';
+	} elseif ($enabled === 'no' || $enabled === 0 || $enabled === false) {
+		$enabled = 'no';
+		$event = 'disable';
+	} else {
+		return false;
+	}
+
+	$return = false;
+
+	if ($object) {
+		// don't set it if it's already set.
+		if ($object->enabled == $enabled) {
+			$return = false;
+		} elseif ($object->canEdit() && (elgg_trigger_event($event, $type, $object))) {
+			$return = update_data("UPDATE $table SET enabled = '$enabled' where id = $id");
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Runs metastrings-based objects found using $options through $callback
+ *
+ * @warning Unlike elgg_get_metastring_based_objects() this will not accept an
+ * empty options array!
+ *
+ * @warning This returns null on no ops.
+ *
+ * @param array  $options    An options array. {@See elgg_get_metastring_based_objects()}
+ * @param string $callback   The callback to pass each result through
+ * @param bool   $inc_offset Increment the offset? Pass false for callbacks that delete / disable
+ *
+ * @return bool|null true on success, false on failure, null if no objects are found.
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_batch_metastring_based_objects(array $options, $callback, $inc_offset = true) {
+	if (!$options || !is_array($options)) {
+		return false;
+	}
+
+	$batch = new ElggBatch('elgg_get_metastring_based_objects', $options, $callback, 50, $inc_offset);
+	return $batch->callbackResult;
+}
+
+/**
+ * Returns a singular metastring-based object by its ID.
+ *
+ * @param int    $id   The metastring-based object's ID
+ * @param string $type The type: annotation or metadata
+ * @return ElggMetadata|ElggAnnotation
+ *
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_metastring_based_object_from_id($id, $type) {
+	$id = (int)$id;
+	if (!$id) {
+		return false;
+	}
+
+	$options = array(
+		'metastring_type' => $type,
+		'metastring_id' => $id
+	);
+
+	$obj = elgg_get_metastring_based_objects($options);
+
+	if ($obj && count($obj) == 1) {
+		return $obj[0];
+	}
+
+	return false;
+}
+
+/**
+ * Deletes a metastring-based object by its id
+ *
+ * @param int    $id   The object's ID
+ * @param string $type The object's metastring type: annotation or metadata
+ * @return bool
+ *
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_delete_metastring_based_object_by_id($id, $type) {
+	$id = (int)$id;
+	$db_prefix = elgg_get_config('dbprefix');
+
+	switch ($type) {
+		case 'annotation':
+		case 'annotations':
+			$type = 'annotations';
+			break;
+
+		case 'metadata':
+			$type = 'metadata';
+			break;
+
+		default:
+			return false;
+	}
+
+	$obj = elgg_get_metastring_based_object_from_id($id, $type);
+	$table = $db_prefix . $type;
+
+	if ($obj) {
+		// Tidy up if memcache is enabled.
+		// @todo only metadata is supported
+		if ($type == 'metadata') {
+			static $metabyname_memcache;
+			if ((!$metabyname_memcache) && (is_memcache_available())) {
+				$metabyname_memcache = new ElggMemcache('metabyname_memcache');
+			}
+
+			if ($metabyname_memcache) {
+				// @todo why name_id? is that even populated?
+				$metabyname_memcache->delete("{$obj->entity_guid}:{$obj->name_id}");
+			}
+		}
+
+		if (($obj->canEdit()) && (elgg_trigger_event('delete', $type, $obj))) {
+			return (bool)delete_data("DELETE from $table where id=$id");
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Entities interface helpers
+ */
+
+/**
+ * Returns options to pass to elgg_get_entities() for metastrings operations.
+ *
+ * @param string $type    Metastring type: annotations or metadata
+ * @param array  $options Options
+ *
+ * @return array
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_entities_get_metastrings_options($type, $options) {
+	$valid_types = array('metadata', 'annotation');
+	if (!in_array($type, $valid_types)) {
+		return FALSE;
+	}
+
+	// the options for annotations are singular (annotation_name) but the table
+	// is plural (elgg_annotations) so rewrite for the table name.
+	$n_table = ($type == 'annotation') ? 'annotations' : $type;
+
+	$singulars = array("{$type}_name", "{$type}_value",
+		"{$type}_name_value_pair", "{$type}_owner_guid");
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$clauses = elgg_get_entity_metadata_where_sql('e', $n_table, $options["{$type}_names"],
+		$options["{$type}_values"], $options["{$type}_name_value_pairs"],
+		$options["{$type}_name_value_pairs_operator"], $options["{$type}_case_sensitive"],
+		$options["order_by_{$type}"], $options["{$type}_owner_guids"]);
+
+	if ($clauses) {
+		// merge wheres to pass to get_entities()
+		if (isset($options['wheres']) && !is_array($options['wheres'])) {
+			$options['wheres'] = array($options['wheres']);
+		} elseif (!isset($options['wheres'])) {
+			$options['wheres'] = array();
+		}
+
+		$options['wheres'] = array_merge($options['wheres'], $clauses['wheres']);
+
+		// merge joins to pass to get_entities()
+		if (isset($options['joins']) && !is_array($options['joins'])) {
+			$options['joins'] = array($options['joins']);
+		} elseif (!isset($options['joins'])) {
+			$options['joins'] = array();
+		}
+
+		$options['joins'] = array_merge($options['joins'], $clauses['joins']);
+
+		if ($clauses['orders']) {
+			$order_by_metadata = implode(", ", $clauses['orders']);
+			if (isset($options['order_by']) && $options['order_by']) {
+				$options['order_by'] = "$order_by_metadata, {$options['order_by']}";
+			} else {
+				$options['order_by'] = "$order_by_metadata, e.time_created DESC";
+			}
+		}
+	}
+
+	return $options;
+}
+
+// unit testing
+elgg_register_plugin_hook_handler('unit_test', 'system', 'metastrings_test');
+
+/**
+ * Metadata unit test
+ *
+ * @param string $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of other tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function metastrings_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/metastrings.php';
+	return $value;
+}
diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
new file mode 100644
index 000000000..ab9cc05e8
--- /dev/null
+++ b/engine/lib/navigation.php
@@ -0,0 +1,527 @@
+<?php
+/**
+ * Elgg navigation library
+ * Functions for managing menus and other navigational elements
+ *
+ * Breadcrumbs
+ * Elgg uses a breadcrumb stack. The page handlers (controllers in MVC terms)
+ * push the breadcrumb links onto the stack. @see elgg_push_breadcrumb()
+ *
+ *
+ * Pagination
+ * Automatically handled by Elgg when using elgg_list_entities* functions.
+ * @see elgg_list_entities()
+ *
+ *
+ * Tabs
+ * @see navigation/tabs view
+ *
+ *
+ * Menus
+ * Elgg uses a single interface to manage its menus. Menu items are added with
+ * {@link elgg_register_menu_item()}. This is generally used for menus that
+ * appear only once per page. For dynamic menus (such as the hover
+ * menu for user's avatar), a plugin hook is emitted when the menu is being
+ * created. The hook is 'register', 'menu:<menu_name>'. For more details on this,
+ * @see elgg_view_menu().
+ *
+ * Menus supported by the Elgg core
+ * Standard menus:
+ *     site   Site navigation shown on every page.
+ *     page   Page menu usually shown in a sidebar. Uses Elgg's context.
+ *     topbar Topbar menu shown on every page. The default has two sections.
+ *     footer Like the topbar but in the footer.
+ *     extras Links about content on the page. The RSS link is added to this.
+ *
+ * Dynamic menus (also called just-in-time menus):
+ *     user_hover  Avatar hover menu. The user entity is passed as a parameter.
+ *     entity      The set of links shown in the summary of an entity.
+ *     river       Links shown on river items.
+ *     owner_block Links shown for a user or group in their owner block.
+ *     filter      The tab filter for content (all, mine, friends)
+ *     title       The buttons shown next to a content title.
+ *     long-text   The links shown above the input/longtext view.
+ *
+ * @package Elgg.Core
+ * @subpackage Navigation
+ */
+
+/**
+ * Register an item for an Elgg menu
+ *
+ * @warning Generally you should not use this in response to the plugin hook:
+ * 'register', 'menu:<menu_name>'. If you do, you may end up with many incorrect
+ * links on a dynamic menu.
+ *
+ * @warning A menu item's name must be unique per menu. If more than one menu
+ * item with the same name are registered, the last menu item takes priority.
+ *
+ * @see elgg_view_menu() for the plugin hooks available for modifying a menu as
+ * it is being rendered.
+ *
+ * @param string $menu_name The name of the menu: site, page, userhover,
+ *                          userprofile, groupprofile, or any custom menu
+ * @param mixed  $menu_item A ElggMenuItem object or an array of options in format:
+ *                          name        => STR  Menu item identifier (required)
+ *                          text        => STR  Menu item display text (required)
+ *                          href        => STR  Menu item URL (required) (false for non-links.
+ *                                              @warning If you disable the href the <a> tag will
+ *                                              not appear, so the link_class will not apply. If you
+ *                                              put <a> tags in manually through the 'text' option
+ *                                              the default CSS selector .elgg-menu-$menu > li > a
+ *                                              may affect formatting. Wrap in a <span> if it does.)
+ *                          contexts    => ARR  Page context strings
+ *                          section     => STR  Menu section identifier
+ *                          title       => STR  Menu item tooltip
+ *                          selected    => BOOL Is this menu item currently selected
+ *                          parent_name => STR  Identifier of the parent menu item
+ *                          link_class  => STR  A class or classes for the <a> tag
+ *                          item_class  => STR  A class or classes for the <li> tag
+ *
+ *                          Additional options that the view output/url takes can be
+ *							passed in the array. If the 'confirm' key is passed, the
+ *							menu link uses the 'output/confirmlink' view. Custom
+ *							options can be added by using the 'data' key with the
+ *							value being an associative array.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_menu_item($menu_name, $menu_item) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->menus[$menu_name])) {
+		$CONFIG->menus[$menu_name] = array();
+	}
+
+	if (is_array($menu_item)) {
+		$item = ElggMenuItem::factory($menu_item);
+		if (!$item) {
+			elgg_log("Unable to add menu item '{$menu_item['name']}' to '$menu_name' menu", 'WARNING');
+			elgg_log(print_r($menu_item, true), 'DEBUG');
+			return false;
+		}
+	} else {
+		$item = $menu_item;
+	}
+
+	$CONFIG->menus[$menu_name][] = $item;
+	return true;
+}
+
+/**
+ * Remove an item from a menu
+ *
+ * @param string $menu_name The name of the menu
+ * @param string $item_name The unique identifier for this menu item
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unregister_menu_item($menu_name, $item_name) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->menus[$menu_name])) {
+		return false;
+	}
+
+	foreach ($CONFIG->menus[$menu_name] as $index => $menu_object) {
+		/* @var ElggMenuItem $menu_object */
+		if ($menu_object->getName() == $item_name) {
+			unset($CONFIG->menus[$menu_name][$index]);
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Check if a menu item has been registered
+ *
+ * @param string $menu_name The name of the menu
+ * @param string $item_name The unique identifier for this menu item
+ * 
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_is_menu_item_registered($menu_name, $item_name) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->menus[$menu_name])) {
+		return false;
+	}
+
+	foreach ($CONFIG->menus[$menu_name] as $menu_object) {
+		/* @var ElggMenuItem $menu_object */
+		if ($menu_object->getName() == $item_name) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Convenience function for registering a button to title menu
+ *
+ * The URL must be $handler/$name/$guid where $guid is the guid of the page owner.
+ * The label of the button is "$handler:$name" so that must be defined in a
+ * language file.
+ *
+ * This is used primarily to support adding an add content button
+ *
+ * @param string $handler The handler to use or null to autodetect from context
+ * @param string $name    Name of the button
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_register_title_button($handler = null, $name = 'add') {
+	if (elgg_is_logged_in()) {
+
+		if (!$handler) {
+			$handler = elgg_get_context();
+		}
+
+		$owner = elgg_get_page_owner_entity();
+		if (!$owner) {
+			// no owns the page so this is probably an all site list page
+			$owner = elgg_get_logged_in_user_entity();
+		}
+		if ($owner && $owner->canWriteToContainer()) {
+			$guid = $owner->getGUID();
+			elgg_register_menu_item('title', array(
+				'name' => $name,
+				'href' => "$handler/$name/$guid",
+				'text' => elgg_echo("$handler:$name"),
+				'link_class' => 'elgg-button elgg-button-action',
+			));
+		}
+	}
+}
+
+/**
+ * Adds a breadcrumb to the breadcrumbs stack.
+ *
+ * @param string $title The title to display
+ * @param string $link  Optional. The link for the title.
+ *
+ * @return void
+ * @since 1.8.0
+ *
+ * @link http://docs.elgg.org/Tutorials/UI/Breadcrumbs
+ */
+function elgg_push_breadcrumb($title, $link = NULL) {
+	global $CONFIG;
+	if (!isset($CONFIG->breadcrumbs)) {
+		$CONFIG->breadcrumbs = array();
+	}
+
+	// avoid key collisions.
+	$CONFIG->breadcrumbs[] = array('title' => elgg_get_excerpt($title, 100), 'link' => $link);
+}
+
+/**
+ * Removes last breadcrumb entry.
+ *
+ * @return array popped item.
+ * @since 1.8.0
+ * @link http://docs.elgg.org/Tutorials/UI/Breadcrumbs
+ */
+function elgg_pop_breadcrumb() {
+	global $CONFIG;
+
+	if (is_array($CONFIG->breadcrumbs)) {
+		return array_pop($CONFIG->breadcrumbs);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Returns all breadcrumbs as an array of array('title' => 'Readable Title', 'link' => 'URL')
+ *
+ * @return array Breadcrumbs
+ * @since 1.8.0
+ * @link http://docs.elgg.org/Tutorials/UI/Breadcrumbs
+ */
+function elgg_get_breadcrumbs() {
+	global $CONFIG;
+
+	if (isset($CONFIG->breadcrumbs) && is_array($CONFIG->breadcrumbs)) {
+		return $CONFIG->breadcrumbs;
+	}
+
+	return array();
+}
+
+/**
+ * Set up the site menu
+ *
+ * Handles default, featured, and custom menu items
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $return Menu array
+ * @param array $params
+ * @return array
+ * @access private
+ */
+function elgg_site_menu_setup($hook, $type, $return, $params) {
+
+	$featured_menu_names = elgg_get_config('site_featured_menu_names');
+	$custom_menu_items = elgg_get_config('site_custom_menu_items');
+	if ($featured_menu_names || $custom_menu_items) {
+		// we have featured or custom menu items
+
+		$registered = $return['default'];
+
+		// set up featured menu items
+		$featured = array();
+		foreach ($featured_menu_names as $name) {
+			foreach ($registered as $index => $item) {
+				if ($item->getName() == $name) {
+					$featured[] = $item;
+					unset($registered[$index]);
+				}
+			}
+		}
+
+		// add custom menu items
+		$n = 1;
+		foreach ($custom_menu_items as $title => $url) {
+			$item = new ElggMenuItem("custom$n", $title, $url);
+			$featured[] = $item;
+			$n++;
+		}
+
+		$return['default'] = $featured;
+		if (count($registered) > 0) {
+			$return['more'] = $registered;
+		}
+	} else {
+		// no featured menu items set
+		$max_display_items = 5;
+
+		// the first n are shown, rest added to more list
+		// if only one item on more menu, stick it with the rest
+		$num_menu_items = count($return['default']);
+		if ($num_menu_items > ($max_display_items + 1)) {
+			$return['more'] = array_splice($return['default'], $max_display_items);
+		}
+	}
+	
+	// check if we have anything selected
+	$selected = false;
+	foreach ($return as $section) {
+		foreach ($section as $item) {
+			if ($item->getSelected()) {
+				$selected = true;
+				break 2;
+			}
+		}
+	}
+	
+	if (!$selected) {
+		// nothing selected, match name to context or match url
+		$current_url = current_page_url();
+		foreach ($return as $section_name => $section) {
+			foreach ($section as $key => $item) {
+				// only highlight internal links
+				if (strpos($item->getHref(), elgg_get_site_url()) === 0) {
+					if ($item->getName() == elgg_get_context()) {
+						$return[$section_name][$key]->setSelected(true);
+						break 2;
+					}
+					if ($item->getHref() == $current_url) {
+						$return[$section_name][$key]->setSelected(true);
+						break 2;
+					}
+				}
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Add the comment and like links to river actions menu
+ * @access private
+ */
+function elgg_river_menu_setup($hook, $type, $return, $params) {
+	if (elgg_is_logged_in()) {
+		$item = $params['item'];
+		/* @var ElggRiverItem $item */
+		$object = $item->getObjectEntity();
+		// comments and non-objects cannot be commented on or liked
+		if (!elgg_in_context('widgets') && $item->annotation_id == 0) {
+			// comments
+			if ($object->canComment()) {
+				$options = array(
+					'name' => 'comment',
+					'href' => "#comments-add-$object->guid",
+					'text' => elgg_view_icon('speech-bubble'),
+					'title' => elgg_echo('comment:this'),
+					'rel' => 'toggle',
+					'priority' => 50,
+				);
+				$return[] = ElggMenuItem::factory($options);
+			}
+		}
+		
+		if (elgg_is_admin_logged_in()) {
+			$options = array(
+				'name' => 'delete',
+				'href' => elgg_add_action_tokens_to_url("action/river/delete?id=$item->id"),
+				'text' => elgg_view_icon('delete'),
+				'title' => elgg_echo('delete'),
+				'confirm' => elgg_echo('deleteconfirm'),
+				'priority' => 200,
+			);
+			$return[] = ElggMenuItem::factory($options);
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Entity menu is list of links and info on any entity
+ * @access private
+ */
+function elgg_entity_menu_setup($hook, $type, $return, $params) {
+	if (elgg_in_context('widgets')) {
+		return $return;
+	}
+	
+	$entity = $params['entity'];
+	/* @var ElggEntity $entity */
+	$handler = elgg_extract('handler', $params, false);
+
+	// access
+	$access = elgg_view('output/access', array('entity' => $entity));
+	$options = array(
+		'name' => 'access',
+		'text' => $access,
+		'href' => false,
+		'priority' => 100,
+	);
+	$return[] = ElggMenuItem::factory($options);
+
+	if ($entity->canEdit() && $handler) {
+		// edit link
+		$options = array(
+			'name' => 'edit',
+			'text' => elgg_echo('edit'),
+			'title' => elgg_echo('edit:this'),
+			'href' => "$handler/edit/{$entity->getGUID()}",
+			'priority' => 200,
+		);
+		$return[] = ElggMenuItem::factory($options);
+
+		// delete link
+		$options = array(
+			'name' => 'delete',
+			'text' => elgg_view_icon('delete'),
+			'title' => elgg_echo('delete:this'),
+			'href' => "action/$handler/delete?guid={$entity->getGUID()}",
+			'confirm' => elgg_echo('deleteconfirm'),
+			'priority' => 300,
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
+	return $return;
+}
+
+/**
+ * Widget menu is a set of widget controls
+ * @access private
+ */
+function elgg_widget_menu_setup($hook, $type, $return, $params) {
+
+	$widget = $params['entity'];
+	/* @var ElggWidget $widget */
+	$show_edit = elgg_extract('show_edit', $params, true);
+
+	$collapse = array(
+		'name' => 'collapse',
+		'text' => ' ',
+		'href' => "#elgg-widget-content-$widget->guid",
+		'class' => 'elgg-widget-collapse-button',
+		'rel' => 'toggle',
+		'priority' => 1
+	);
+	$return[] = ElggMenuItem::factory($collapse);
+
+	if ($widget->canEdit()) {
+		$delete = array(
+			'name' => 'delete',
+			'text' => elgg_view_icon('delete-alt'),
+			'title' => elgg_echo('widget:delete', array($widget->getTitle())),
+			'href' => "action/widgets/delete?widget_guid=$widget->guid",
+			'is_action' => true,
+			'class' => 'elgg-widget-delete-button',
+			'id' => "elgg-widget-delete-button-$widget->guid",
+			'priority' => 900
+		);
+		$return[] = ElggMenuItem::factory($delete);
+
+		if ($show_edit) {
+			$edit = array(
+				'name' => 'settings',
+				'text' => elgg_view_icon('settings-alt'),
+				'title' => elgg_echo('widget:edit'),
+				'href' => "#widget-edit-$widget->guid",
+				'class' => "elgg-widget-edit-button",
+				'rel' => 'toggle',
+				'priority' => 800,
+			);
+			$return[] = ElggMenuItem::factory($edit);
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Adds a delete link to "generic_comment" annotations
+ * @access private
+ */
+function elgg_annotation_menu_setup($hook, $type, $return, $params) {
+	$annotation = $params['annotation'];
+	/* @var ElggAnnotation $annotation */
+
+	if ($annotation->name == 'generic_comment' && $annotation->canEdit()) {
+		$url = elgg_http_add_url_query_elements('action/comments/delete', array(
+			'annotation_id' => $annotation->id,
+		));
+
+		$options = array(
+			'name' => 'delete',
+			'href' => $url,
+			'text' => "<span class=\"elgg-icon elgg-icon-delete\"></span>",
+			'confirm' => elgg_echo('deleteconfirm'),
+			'encode_text' => false
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
+	return $return;
+}
+
+
+/**
+ * Navigation initialization
+ * @access private
+ */
+function elgg_nav_init() {
+	elgg_register_plugin_hook_handler('prepare', 'menu:site', 'elgg_site_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:river', 'elgg_river_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'elgg_entity_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:widget', 'elgg_widget_menu_setup');
+	elgg_register_plugin_hook_handler('register', 'menu:annotation', 'elgg_annotation_menu_setup');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_nav_init');
diff --git a/engine/lib/notification.php b/engine/lib/notification.php
new file mode 100644
index 000000000..be0c359d4
--- /dev/null
+++ b/engine/lib/notification.php
@@ -0,0 +1,536 @@
+<?php
+/**
+ * Notifications
+ * This file contains classes and functions which allow plugins to register and send notifications.
+ *
+ * There are notification methods which are provided out of the box
+ * (see notification_init() ). Each method is identified by a string, e.g. "email".
+ *
+ * To register an event use register_notification_handler() and pass the method name and a
+ * handler function.
+ *
+ * To send a notification call notify() passing it the method you wish to use combined with a
+ * number of method specific addressing parameters.
+ *
+ * Catch NotificationException to trap errors.
+ *
+ * @package Elgg.Core
+ * @subpackage Notifications
+ */
+
+/** Notification handlers */
+global $NOTIFICATION_HANDLERS;
+$NOTIFICATION_HANDLERS = array();
+
+/**
+ * This function registers a handler for a given notification type (eg "email")
+ *
+ * @param string $method  The method
+ * @param string $handler The handler function, in the format
+ *                        "handler(ElggEntity $from, ElggUser $to, $subject,
+ *                        $message, array $params = NULL)". This function should
+ *                        return false on failure, and true/a tracking message ID on success.
+ * @param array  $params  An associated array of other parameters for this handler
+ *                        defining some properties eg. supported msg length or rich text support.
+ *
+ * @return bool
+ */
+function register_notification_handler($method, $handler, $params = NULL) {
+	global $NOTIFICATION_HANDLERS;
+
+	if (is_callable($handler, true)) {
+		$NOTIFICATION_HANDLERS[$method] = new stdClass;
+
+		$NOTIFICATION_HANDLERS[$method]->handler = $handler;
+		if ($params) {
+			foreach ($params as $k => $v) {
+				$NOTIFICATION_HANDLERS[$method]->$k = $v;
+			}
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * This function unregisters a handler for a given notification type (eg "email")
+ *
+ * @param string $method The method
+ *
+ * @return void
+ * @since 1.7.1
+ */
+function unregister_notification_handler($method) {
+	global $NOTIFICATION_HANDLERS;
+
+	if (isset($NOTIFICATION_HANDLERS[$method])) {
+		unset($NOTIFICATION_HANDLERS[$method]);
+	}
+}
+
+/**
+ * Notify a user via their preferences.
+ *
+ * @param mixed  $to               Either a guid or an array of guid's to notify.
+ * @param int    $from             GUID of the sender, which may be a user, site or object.
+ * @param string $subject          Message subject.
+ * @param string $message          Message body.
+ * @param array  $params           Misc additional parameters specific to various methods.
+ * @param mixed  $methods_override A string, or an array of strings specifying the delivery
+ *                                 methods to use - or leave blank for delivery using the
+ *                                 user's chosen delivery methods.
+ *
+ * @return array Compound array of each delivery user/delivery method's success or failure.
+ * @throws NotificationException
+ */
+function notify_user($to, $from, $subject, $message, array $params = NULL, $methods_override = "") {
+	global $NOTIFICATION_HANDLERS;
+
+	// Sanitise
+	if (!is_array($to)) {
+		$to = array((int)$to);
+	}
+	$from = (int)$from;
+	//$subject = sanitise_string($subject);
+
+	// Get notification methods
+	if (($methods_override) && (!is_array($methods_override))) {
+		$methods_override = array($methods_override);
+	}
+
+	$result = array();
+
+	foreach ($to as $guid) {
+		// Results for a user are...
+		$result[$guid] = array();
+
+		if ($guid) { // Is the guid > 0?
+			// Are we overriding delivery?
+			$methods = $methods_override;
+			if (!$methods) {
+				$tmp = get_user_notification_settings($guid);
+				$methods = array();
+				// $tmp may be false. don't cast
+				if (is_object($tmp)) {
+					foreach ($tmp as $k => $v) {
+						// Add method if method is turned on for user!
+						if ($v) {
+							$methods[] = $k;
+						}
+					}
+				}
+			}
+
+			if ($methods) {
+				// Deliver
+				foreach ($methods as $method) {
+
+					if (!isset($NOTIFICATION_HANDLERS[$method])) {
+						continue;
+					}
+
+					// Extract method details from list
+					$details = $NOTIFICATION_HANDLERS[$method];
+					$handler = $details->handler;
+					/* @var callable $handler */
+
+					if ((!$NOTIFICATION_HANDLERS[$method]) || (!$handler) || (!is_callable($handler))) {
+						error_log(elgg_echo('NotificationException:NoHandlerFound', array($method)));
+					}
+
+					elgg_log("Sending message to $guid using $method");
+
+					// Trigger handler and retrieve result.
+					try {
+						$result[$guid][$method] = call_user_func($handler,
+							$from ? get_entity($from) : NULL, 	// From entity
+							get_entity($guid), 					// To entity
+							$subject,							// The subject
+							$message, 			// Message
+							$params								// Params
+						);
+					} catch (Exception $e) {
+						error_log($e->getMessage());
+					}
+
+				}
+			}
+		}
+	}
+
+	return $result;
+}
+
+/**
+ * Get the notification settings for a given user.
+ *
+ * @param int $user_guid The user id
+ *
+ * @return stdClass|false
+ */
+function get_user_notification_settings($user_guid = 0) {
+	$user_guid = (int)$user_guid;
+
+	if ($user_guid == 0) {
+		$user_guid = elgg_get_logged_in_user_guid();
+	}
+
+	// @todo: there should be a better way now that metadata is cached. E.g. just query for MD names, then
+	// query user object directly
+	$all_metadata = elgg_get_metadata(array(
+		'guid' => $user_guid,
+		'limit' => 0
+	));
+	if ($all_metadata) {
+		$prefix = "notification:method:";
+		$return = new stdClass;
+
+		foreach ($all_metadata as $meta) {
+			$name = substr($meta->name, strlen($prefix));
+			$value = $meta->value;
+
+			if (strpos($meta->name, $prefix) === 0) {
+				$return->$name = $value;
+			}
+		}
+
+		return $return;
+	}
+
+	return false;
+}
+
+/**
+ * Set a user notification pref.
+ *
+ * @param int    $user_guid The user id.
+ * @param string $method    The delivery method (eg. email)
+ * @param bool   $value     On(true) or off(false).
+ *
+ * @return bool
+ */
+function set_user_notification_setting($user_guid, $method, $value) {
+	$user_guid = (int)$user_guid;
+	$method = sanitise_string($method);
+
+	$user = get_entity($user_guid);
+	if (!$user) {
+		$user = elgg_get_logged_in_user_entity();
+	}
+
+	if (($user) && ($user instanceof ElggUser)) {
+		$prefix = "notification:method:$method";
+		$user->$prefix = $value;
+		$user->save();
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Send a notification via email.
+ *
+ * @param ElggEntity $from    The from user/site/object
+ * @param ElggUser   $to      To which user?
+ * @param string     $subject The subject of the message.
+ * @param string     $message The message body
+ * @param array      $params  Optional parameters (none taken in this instance)
+ *
+ * @return bool
+ * @throws NotificationException
+ * @access private
+ */
+function email_notify_handler(ElggEntity $from, ElggUser $to, $subject, $message,
+array $params = NULL) {
+
+	global $CONFIG;
+
+	if (!$from) {
+		$msg = elgg_echo('NotificationException:MissingParameter', array('from'));
+		throw new NotificationException($msg);
+	}
+
+	if (!$to) {
+		$msg = elgg_echo('NotificationException:MissingParameter', array('to'));
+		throw new NotificationException($msg);
+	}
+
+	if ($to->email == "") {
+		$msg = elgg_echo('NotificationException:NoEmailAddress', array($to->guid));
+		throw new NotificationException($msg);
+	}
+
+	// To
+	$to = $to->email;
+
+	// From
+	$site = elgg_get_site_entity();
+	// If there's an email address, use it - but only if its not from a user.
+	if (!($from instanceof ElggUser) && $from->email) {
+		$from = $from->email;
+	} else if ($site && $site->email) {
+		// Use email address of current site if we cannot use sender's email
+		$from = $site->email;
+	} else {
+		// If all else fails, use the domain of the site.
+		$from = 'noreply@' . get_site_domain($CONFIG->site_guid);
+	}
+
+	return elgg_send_email($from, $to, $subject, $message);
+}
+
+/**
+ * Send an email to any email address
+ *
+ * @param string $from    Email address or string: "name <email>"
+ * @param string $to      Email address or string: "name <email>"
+ * @param string $subject The subject of the message
+ * @param string $body    The message body
+ * @param array  $params  Optional parameters (none used in this function)
+ *
+ * @return bool
+ * @throws NotificationException
+ * @since 1.7.2
+ */
+function elgg_send_email($from, $to, $subject, $body, array $params = NULL) {
+	global $CONFIG;
+
+	if (!$from) {
+		$msg = elgg_echo('NotificationException:MissingParameter', array('from'));
+		throw new NotificationException($msg);
+	}
+
+	if (!$to) {
+		$msg = elgg_echo('NotificationException:MissingParameter', array('to'));
+		throw new NotificationException($msg);
+	}
+
+	// return TRUE/FALSE to stop elgg_send_email() from sending
+	$mail_params = array(
+							'to' => $to,
+							'from' => $from,
+							'subject' => $subject,
+							'body' => $body,
+							'params' => $params
+					);
+
+	$result = elgg_trigger_plugin_hook('email', 'system', $mail_params, NULL);
+	if ($result !== NULL) {
+		return $result;
+	}
+
+	$header_eol = "\r\n";
+	if (isset($CONFIG->broken_mta) && $CONFIG->broken_mta) {
+		// Allow non-RFC 2822 mail headers to support some broken MTAs
+		$header_eol = "\n";
+	}
+
+	// Windows is somewhat broken, so we use just address for to and from
+	if (strtolower(substr(PHP_OS, 0, 3)) == 'win') {
+		// strip name from to and from
+		if (strpos($to, '<')) {
+			preg_match('/<(.*)>/', $to, $matches);
+			$to = $matches[1];
+		}
+		if (strpos($from, '<')) {
+			preg_match('/<(.*)>/', $from, $matches);
+			$from = $matches[1];
+		}
+	}
+
+	$headers = "From: $from{$header_eol}"
+		. "Content-Type: text/plain; charset=UTF-8; format=flowed{$header_eol}"
+		. "MIME-Version: 1.0{$header_eol}"
+		. "Content-Transfer-Encoding: 8bit{$header_eol}";
+
+
+	// Sanitise subject by stripping line endings
+	$subject = preg_replace("/(\r\n|\r|\n)/", " ", $subject);
+	// this is because Elgg encodes everything and matches what is done with body
+	$subject = html_entity_decode($subject, ENT_COMPAT, 'UTF-8'); // Decode any html entities
+	if (is_callable('mb_encode_mimeheader')) {
+		$subject = mb_encode_mimeheader($subject, "UTF-8", "B");
+	}
+
+	// Format message
+	$body = html_entity_decode($body, ENT_COMPAT, 'UTF-8'); // Decode any html entities
+	$body = elgg_strip_tags($body); // Strip tags from message
+	$body = preg_replace("/(\r\n|\r)/", "\n", $body); // Convert to unix line endings in body
+	$body = preg_replace("/^From/", ">From", $body); // Change lines starting with From to >From
+
+	return mail($to, $subject, wordwrap($body), $headers);
+}
+
+/**
+ * Correctly initialise notifications and register the email handler.
+ *
+ * @return void
+ * @access private
+ */
+function notification_init() {
+	// Register a notification handler for the default email method
+	register_notification_handler("email", "email_notify_handler");
+
+	// Add settings view to user settings & register action
+	elgg_extend_view('forms/account/settings', 'core/settings/account/notifications');
+
+	elgg_register_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
+}
+
+/**
+ * Includes the action to save user notifications
+ *
+ * @return void
+ * @todo why can't this call action(...)?
+ * @access private
+ */
+function notification_user_settings_save() {
+	global $CONFIG;
+	//@todo Wha??
+	include($CONFIG->path . "actions/notifications/settings/usersettings/save.php");
+}
+
+/**
+ * Register an entity type and subtype to be eligible for notifications
+ *
+ * @param string $entity_type    The type of entity
+ * @param string $object_subtype Its subtype
+ * @param string $language_name  Its localized notification string (eg "New blog post")
+ *
+ * @return void
+ */
+function register_notification_object($entity_type, $object_subtype, $language_name) {
+	global $CONFIG;
+
+	if ($entity_type == '') {
+		$entity_type = '__BLANK__';
+	}
+	if ($object_subtype == '') {
+		$object_subtype = '__BLANK__';
+	}
+
+	if (!isset($CONFIG->register_objects)) {
+		$CONFIG->register_objects = array();
+	}
+
+	if (!isset($CONFIG->register_objects[$entity_type])) {
+		$CONFIG->register_objects[$entity_type] = array();
+	}
+
+	$CONFIG->register_objects[$entity_type][$object_subtype] = $language_name;
+}
+
+/**
+ * Establish a 'notify' relationship between the user and a content author
+ *
+ * @param int $user_guid   The GUID of the user who wants to follow a user's content
+ * @param int $author_guid The GUID of the user whose content the user wants to follow
+ *
+ * @return bool Depending on success
+ */
+function register_notification_interest($user_guid, $author_guid) {
+	return add_entity_relationship($user_guid, 'notify', $author_guid);
+}
+
+/**
+ * Remove a 'notify' relationship between the user and a content author
+ *
+ * @param int $user_guid   The GUID of the user who is following a user's content
+ * @param int $author_guid The GUID of the user whose content the user wants to unfollow
+ *
+ * @return bool Depending on success
+ */
+function remove_notification_interest($user_guid, $author_guid) {
+	return remove_entity_relationship($user_guid, 'notify', $author_guid);
+}
+
+/**
+ * Automatically triggered notification on 'create' events that looks at registered
+ * objects and attempts to send notifications to anybody who's interested
+ *
+ * @see register_notification_object
+ *
+ * @param string $event       create
+ * @param string $object_type mixed
+ * @param mixed  $object      The object created
+ *
+ * @return bool
+ * @access private
+ */
+function object_notifications($event, $object_type, $object) {
+	// We only want to trigger notification events for ElggEntities
+	if ($object instanceof ElggEntity) {
+		/* @var ElggEntity $object */
+
+		// Get config data
+		global $CONFIG, $SESSION, $NOTIFICATION_HANDLERS;
+
+		$hookresult = elgg_trigger_plugin_hook('object:notifications', $object_type, array(
+			'event' => $event,
+			'object_type' => $object_type,
+			'object' => $object,
+		), false);
+		if ($hookresult === true) {
+			return true;
+		}
+
+		// Have we registered notifications for this type of entity?
+		$object_type = $object->getType();
+		if (empty($object_type)) {
+			$object_type = '__BLANK__';
+		}
+
+		$object_subtype = $object->getSubtype();
+		if (empty($object_subtype)) {
+			$object_subtype = '__BLANK__';
+		}
+
+		if (isset($CONFIG->register_objects[$object_type][$object_subtype])) {
+			$subject = $CONFIG->register_objects[$object_type][$object_subtype];
+			$string = $subject . ": " . $object->getURL();
+
+			// Get users interested in content from this person and notify them
+			// (Person defined by container_guid so we can also subscribe to groups if we want)
+			foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
+				$interested_users = elgg_get_entities_from_relationship(array(
+					'site_guids' => ELGG_ENTITIES_ANY_VALUE,
+					'relationship' => 'notify' . $method,
+					'relationship_guid' => $object->container_guid,
+					'inverse_relationship' => TRUE,
+					'type' => 'user',
+					'limit' => false
+				));
+				/* @var ElggUser[] $interested_users */
+
+				if ($interested_users && is_array($interested_users)) {
+					foreach ($interested_users as $user) {
+						if ($user instanceof ElggUser && !$user->isBanned()) {
+							if (($user->guid != $SESSION['user']->guid) && has_access_to_entity($object, $user)
+							&& $object->access_id != ACCESS_PRIVATE) {
+								$body = elgg_trigger_plugin_hook('notify:entity:message', $object->getType(), array(
+									'entity' => $object,
+									'to_entity' => $user,
+									'method' => $method), $string);
+								if (empty($body) && $body !== false) {
+									$body = $string;
+								}
+								if ($body !== false) {
+									notify_user($user->guid, $object->container_guid, $subject, $body,
+										null, array($method));
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// Register a startup event
+elgg_register_event_handler('init', 'system', 'notification_init', 0);
+elgg_register_event_handler('create', 'object', 'object_notifications');
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
new file mode 100644
index 000000000..ff3cc733f
--- /dev/null
+++ b/engine/lib/objects.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Elgg objects
+ * Functions to manage multiple or single objects in an Elgg install
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Return the object specific details of a object by a row.
+ *
+ * @param int $guid The guid to retreive
+ *
+ * @return bool
+ * @access private
+ */
+function get_object_entity_as_row($guid) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}objects_entity where guid=$guid");
+}
+
+/**
+ * Create or update the extras table for a given object.
+ * Call create_entity first.
+ *
+ * @param int    $guid        The guid of the entity you're creating (as obtained by create_entity)
+ * @param string $title       The title of the object
+ * @param string $description The object's description
+ *
+ * @return bool
+ * @access private
+ */
+function create_object_entity($guid, $title, $description) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	$title = sanitise_string($title);
+	$description = sanitise_string($description);
+
+	$row = get_entity_as_row($guid);
+
+	if ($row) {
+		// Core entities row exists and we have access to it
+		$query = "SELECT guid from {$CONFIG->dbprefix}objects_entity where guid = {$guid}";
+		if ($exists = get_data_row($query)) {
+			$query = "UPDATE {$CONFIG->dbprefix}objects_entity
+				set title='$title', description='$description' where guid=$guid";
+
+			$result = update_data($query);
+			if ($result != false) {
+				// Update succeeded, continue
+				$entity = get_entity($guid);
+				elgg_trigger_event('update', $entity->type, $entity);
+				return $guid;
+			}
+		} else {
+			// Update failed, attempt an insert.
+			$query = "INSERT into {$CONFIG->dbprefix}objects_entity
+				(guid, title, description) values ($guid, '$title','$description')";
+
+			$result = insert_data($query);
+			if ($result !== false) {
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('create', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Get the sites this object is part of
+ *
+ * @param int $object_guid The object's GUID
+ * @param int $limit       Number of results to return
+ * @param int $offset      Any indexing offset
+ *
+ * @return false|array On success, an array of ElggSites
+ */
+function get_object_sites($object_guid, $limit = 10, $offset = 0) {
+	$object_guid = (int)$object_guid;
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'member_of_site',
+		'relationship_guid' => $object_guid,
+		'type' => 'site',
+		'limit' => $limit,
+		'offset' => $offset,
+	));
+}
+
+/**
+ * Runs unit tests for ElggObject
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function objects_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = "{$CONFIG->path}engine/tests/objects/objects.php";
+	return $value;
+}
+
+elgg_register_event_handler('init', 'system', 'objects_init', 0);
+elgg_register_plugin_hook_handler('unit_test', 'system', 'objects_test');
diff --git a/engine/lib/opendd.php b/engine/lib/opendd.php
new file mode 100644
index 000000000..7d635a295
--- /dev/null
+++ b/engine/lib/opendd.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * OpenDD PHP Library.
+ *
+ * @package Elgg.Core
+ * @subpackage ODD
+ * @version 0.4
+ */
+
+// @codingStandardsIgnoreStart
+
+/**
+ * Attempt to construct an ODD object out of a XmlElement or sub-elements.
+ *
+ * @param XmlElement $element The element(s)
+ *
+ * @return mixed An ODD object if the element can be handled, or false.
+ * @access private
+ */
+function ODD_factory (XmlElement $element) {
+	$name = $element->name;
+	$odd = false;
+
+	switch ($name) {
+		case 'entity' :
+			$odd = new ODDEntity("", "", "");
+			break;
+		case 'metadata' :
+			$odd = new ODDMetaData("", "", "", "");
+			break;
+		case 'relationship' :
+			$odd = new ODDRelationship("", "", "");
+			break;
+	}
+
+	// Now populate values
+	if ($odd) {
+		// Attributes
+		foreach ($element->attributes as $k => $v) {
+			$odd->setAttribute($k, $v);
+		}
+
+		// Body
+		$body = $element->content;
+		$a = stripos($body, "<![CDATA");
+		$b = strripos($body, "]]>");
+		if (($body) && ($a !== false) && ($b !== false)) {
+			$body = substr($body, $a + 8, $b - ($a + 8));
+		}
+
+		$odd->setBody($body);
+	}
+
+	return $odd;
+}
+
+/**
+ * Import an ODD document.
+ *
+ * @param string $xml The XML ODD.
+ *
+ * @return ODDDocument
+ * @access private
+ */
+function ODD_Import($xml) {
+	// Parse XML to an array
+	$elements = xml_to_object($xml);
+
+	// Sanity check 1, was this actually XML?
+	if ((!$elements) || (!$elements->children)) {
+		return false;
+	}
+
+	// Create ODDDocument
+	$document = new ODDDocument();
+
+	// Itterate through array of elements and construct ODD document
+	$cnt = 0;
+
+	foreach ($elements->children as $child) {
+		$odd = ODD_factory($child);
+
+		if ($odd) {
+			$document->addElement($odd);
+			$cnt++;
+		}
+	}
+
+	// Check that we actually found something
+	if ($cnt == 0) {
+		return false;
+	}
+
+	return $document;
+}
+
+/**
+ * Export an ODD Document.
+ *
+ * @param ODDDocument $document The Document.
+ *
+ * @return string
+ * @access private
+ */
+function ODD_Export(ODDDocument $document) {
+	return "$document";
+}
+
+// @codingStandardsIgnoreEnd
diff --git a/engine/lib/output.php b/engine/lib/output.php
new file mode 100644
index 000000000..de4f911fb
--- /dev/null
+++ b/engine/lib/output.php
@@ -0,0 +1,469 @@
+<?php
+/**
+ * Output functions
+ * Processing text for output such as pulling out URLs and extracting excerpts
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Takes a string and turns any URLs into formatted links
+ *
+ * @param string $text The input string
+ *
+ * @return string The output string with formatted links
+ */
+function parse_urls($text) {
+
+	// URI specification: http://www.ietf.org/rfc/rfc3986.txt
+	// This varies from the specification in the following ways:
+	//  * Supports non-ascii characters
+	//  * Does not allow parentheses and single quotes
+	//  * Cuts off commas, exclamation points, and periods off as last character
+
+	// @todo this causes problems with <attr = "val">
+	// must be in <attr="val"> format (no space).
+	// By default htmlawed rewrites tags to this format.
+	// if PHP supported conditional negative lookbehinds we could use this:
+	// $r = preg_replace_callback('/(?<!=)(?<![ ])?(?<!["\'])((ht|f)tps?:\/\/[^\s\r\n\t<>"\'\!\(\),]+)/i',
+	$r = preg_replace_callback('/(?<![=\/"\'])((ht|f)tps?:\/\/[^\s\r\n\t<>"\']+)/i',
+	create_function(
+		'$matches',
+		'
+			$url = $matches[1];
+			$punc = "";
+			$last = substr($url, -1, 1);
+			if (in_array($last, array(".", "!", ",", "(", ")"))) {
+				$punc = $last;
+				$url = rtrim($url, ".!,()");
+			}
+			$urltext = str_replace("/", "/<wbr />", $url);
+			return "<a href=\"$url\" rel=\"nofollow\">$urltext</a>$punc";
+		'
+	), $text);
+
+	return $r;
+}
+
+/**
+ * Create paragraphs from text with line spacing
+ *
+ * @param string $pee The string
+ * @deprecated Use elgg_autop instead
+ * @todo Add deprecation warning in 1.9
+ *
+ * @return string
+ **/
+function autop($pee) {
+	return elgg_autop($pee);
+}
+
+/**
+ * Create paragraphs from text with line spacing
+ *
+ * @param string $string The string
+ *
+ * @return string
+ **/
+function elgg_autop($string) {
+	return ElggAutoP::getInstance()->process($string);
+}
+
+/**
+ * Returns an excerpt.
+ * Will return up to n chars stopping at the nearest space.
+ * If no spaces are found (like in Japanese) will crop off at the
+ * n char mark. Adds ... if any text was chopped.
+ *
+ * @param string $text      The full text to excerpt
+ * @param int    $num_chars Return a string up to $num_chars long
+ *
+ * @return string
+ * @since 1.7.2
+ */
+function elgg_get_excerpt($text, $num_chars = 250) {
+	$text = trim(elgg_strip_tags($text));
+	$string_length = elgg_strlen($text);
+
+	if ($string_length <= $num_chars) {
+		return $text;
+	}
+
+	// handle cases
+	$excerpt = elgg_substr($text, 0, $num_chars);
+	$space = elgg_strrpos($excerpt, ' ', 0);
+
+	// don't crop if can't find a space.
+	if ($space === FALSE) {
+		$space = $num_chars;
+	}
+	$excerpt = trim(elgg_substr($excerpt, 0, $space));
+
+	if ($string_length != elgg_strlen($excerpt)) {
+		$excerpt .= '...';
+	}
+
+	return $excerpt;
+}
+
+/**
+ * Handles formatting of ampersands in urls
+ *
+ * @param string $url The URL
+ *
+ * @return string
+ * @since 1.7.1
+ */
+function elgg_format_url($url) {
+	return preg_replace('/&(?!amp;)/', '&amp;', $url);
+}
+
+/**
+ * Converts an associative array into a string of well-formed attributes
+ *
+ * @note usually for HTML, but could be useful for XML too...
+ *
+ * @param array $attrs An associative array of attr => val pairs
+ *
+ * @return string HTML attributes to be inserted into a tag (e.g., <tag $attrs>)
+ */
+function elgg_format_attributes(array $attrs) {
+	$attrs = elgg_clean_vars($attrs);
+	$attributes = array();
+
+	if (isset($attrs['js'])) {
+		//@todo deprecated notice?
+
+		if (!empty($attrs['js'])) {
+			$attributes[] = $attrs['js'];
+		}
+
+		unset($attrs['js']);
+	}
+
+	foreach ($attrs as $attr => $val) {
+		$attr = strtolower($attr);
+
+		if ($val === TRUE) {
+			$val = $attr; //e.g. checked => TRUE ==> checked="checked"
+		}
+
+		// ignore $vars['entity'] => ElggEntity stuff
+		if ($val !== NULL && $val !== false && (is_array($val) || !is_object($val))) {
+
+			// allow $vars['class'] => array('one', 'two');
+			// @todo what about $vars['style']? Needs to be semi-colon separated...
+			if (is_array($val)) {
+				$val = implode(' ', $val);
+			}
+
+			$val = htmlspecialchars($val, ENT_QUOTES, 'UTF-8', false);
+			$attributes[] = "$attr=\"$val\"";
+		}
+	}
+
+	return implode(' ', $attributes);
+}
+
+/**
+ * Preps an associative array for use in {@link elgg_format_attributes()}.
+ *
+ * Removes all the junk that {@link elgg_view()} puts into $vars.
+ * Maintains backward compatibility with attributes like 'internalname' and 'internalid'
+ *
+ * @note This function is called automatically by elgg_format_attributes(). No need to
+ *       call it yourself before using elgg_format_attributes().
+ *
+ * @param array $vars The raw $vars array with all it's dirtiness (config, url, etc.)
+ *
+ * @return array The array, ready to be used in elgg_format_attributes().
+ * @access private
+ */
+function elgg_clean_vars(array $vars = array()) {
+	unset($vars['config']);
+	unset($vars['url']);
+	unset($vars['user']);
+
+	// backwards compatibility code
+	if (isset($vars['internalname'])) {
+		$vars['name'] = $vars['internalname'];
+		unset($vars['internalname']);
+	}
+
+	if (isset($vars['internalid'])) {
+		$vars['id'] = $vars['internalid'];
+		unset($vars['internalid']);
+	}
+
+	if (isset($vars['__ignoreInternalid'])) {
+		unset($vars['__ignoreInternalid']);
+	}
+
+	if (isset($vars['__ignoreInternalname'])) {
+		unset($vars['__ignoreInternalname']);
+	}
+
+	return $vars;
+}
+
+/**
+ * Converts shorthand urls to absolute urls.
+ *
+ * If the url is already absolute or protocol-relative, no change is made.
+ *
+ * @example
+ * elgg_normalize_url('');                   // 'http://my.site.com/'
+ * elgg_normalize_url('dashboard');          // 'http://my.site.com/dashboard'
+ * elgg_normalize_url('http://google.com/'); // no change
+ * elgg_normalize_url('//google.com/');      // no change
+ *
+ * @param string $url The URL to normalize
+ *
+ * @return string The absolute url
+ */
+function elgg_normalize_url($url) {
+	// see https://bugs.php.net/bug.php?id=51192
+	// from the bookmarks save action.
+	$php_5_2_13_and_below = version_compare(PHP_VERSION, '5.2.14', '<');
+	$php_5_3_0_to_5_3_2 = version_compare(PHP_VERSION, '5.3.0', '>=') &&
+			version_compare(PHP_VERSION, '5.3.3', '<');
+
+	if ($php_5_2_13_and_below || $php_5_3_0_to_5_3_2) {
+		$tmp_address = str_replace("-", "", $url);
+		$validated = filter_var($tmp_address, FILTER_VALIDATE_URL);
+	} else {
+		$validated = filter_var($url, FILTER_VALIDATE_URL);
+	}
+
+	// work around for handling absoluate IRIs (RFC 3987) - see #4190
+	if (!$validated && (strpos($url, 'http:') === 0) || (strpos($url, 'https:') === 0)) {
+		$validated = true;
+	}
+
+	if ($validated) {
+		// all normal URLs including mailto:
+		return $url;
+
+	} elseif (preg_match("#^(\#|\?|//)#i", $url)) {
+		// '//example.com' (Shortcut for protocol.)
+		// '?query=test', #target
+		return $url;
+	
+	} elseif (stripos($url, 'javascript:') === 0 || stripos($url, 'mailto:') === 0) {
+		// 'javascript:' and 'mailto:'
+		// Not covered in FILTER_VALIDATE_URL
+		return $url;
+
+	} elseif (preg_match("#^[^/]*\.php(\?.*)?$#i", $url)) {
+		// 'install.php', 'install.php?step=step'
+		return elgg_get_site_url() . $url;
+
+	} elseif (preg_match("#^[^/]*\.#i", $url)) {
+		// 'example.com', 'example.com/subpage'
+		return "http://$url";
+
+	} else {
+		// 'page/handler', 'mod/plugin/file.php'
+
+		// trim off any leading / because the site URL is stored
+		// with a trailing /
+		return elgg_get_site_url() . ltrim($url, '/');
+	}
+}
+
+/**
+ * When given a title, returns a version suitable for inclusion in a URL
+ *
+ * @param string $title The title
+ *
+ * @return string The optimised title
+ * @since 1.7.2
+ */
+function elgg_get_friendly_title($title) {
+
+	// return a URL friendly title to short circuit normal title formatting
+	$params = array('title' => $title);
+	$result = elgg_trigger_plugin_hook('format', 'friendly:title', $params, NULL);
+	if ($result) {
+		return $result;
+	}
+
+	// titles are often stored HTML encoded
+	$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
+	
+	$title = ElggTranslit::urlize($title);
+
+	return $title;
+}
+
+/**
+ * Formats a UNIX timestamp in a friendly way (eg "less than a minute ago")
+ *
+ * @see elgg_view_friendly_time()
+ *
+ * @param int $time A UNIX epoch timestamp
+ *
+ * @return string The friendly time string
+ * @since 1.7.2
+ */
+function elgg_get_friendly_time($time) {
+
+	// return a time string to short circuit normal time formatting
+	$params = array('time' => $time);
+	$result = elgg_trigger_plugin_hook('format', 'friendly:time', $params, NULL);
+	if ($result) {
+		return $result;
+	}
+
+	$diff = time() - (int)$time;
+
+	$minute = 60;
+	$hour = $minute * 60;
+	$day = $hour * 24;
+
+	if ($diff < $minute) {
+			return elgg_echo("friendlytime:justnow");
+	} else if ($diff < $hour) {
+		$diff = round($diff / $minute);
+		if ($diff == 0) {
+			$diff = 1;
+		}
+
+		if ($diff > 1) {
+			return elgg_echo("friendlytime:minutes", array($diff));
+		} else {
+			return elgg_echo("friendlytime:minutes:singular", array($diff));
+		}
+	} else if ($diff < $day) {
+		$diff = round($diff / $hour);
+		if ($diff == 0) {
+			$diff = 1;
+		}
+
+		if ($diff > 1) {
+			return elgg_echo("friendlytime:hours", array($diff));
+		} else {
+			return elgg_echo("friendlytime:hours:singular", array($diff));
+		}
+	} else {
+		$diff = round($diff / $day);
+		if ($diff == 0) {
+			$diff = 1;
+		}
+
+		if ($diff > 1) {
+			return elgg_echo("friendlytime:days", array($diff));
+		} else {
+			return elgg_echo("friendlytime:days:singular", array($diff));
+		}
+	}
+}
+
+/**
+ * Strip tags and offer plugins the chance.
+ * Plugins register for output:strip_tags plugin hook.
+ * Original string included in $params['original_string']
+ *
+ * @param string $string Formatted string
+ *
+ * @return string String run through strip_tags() and any plugin hooks.
+ */
+function elgg_strip_tags($string) {
+	$params['original_string'] = $string;
+
+	$string = strip_tags($string);
+	$string = elgg_trigger_plugin_hook('format', 'strip_tags', $params, $string);
+
+	return $string;
+}
+
+/**
+ * Apply html_entity_decode() to a string while re-entitising HTML
+ * special char entities to prevent them from being decoded back to their
+ * unsafe original forms.
+ *
+ * This relies on html_entity_decode() not translating entities when
+ * doing so leaves behind another entity, e.g. &amp;gt; if decoded would
+ * create &gt; which is another entity itself. This seems to escape the
+ * usual behaviour where any two paired entities creating a HTML tag are
+ * usually decoded, i.e. a lone &gt; is not decoded, but &lt;foo&gt; would
+ * be decoded to <foo> since it creates a full tag.
+ *
+ * Note: This function is poorly explained in the manual - which is really
+ * bad given its potential for misuse on user input already escaped elsewhere.
+ * Stackoverflow is littered with advice to use this function in the precise
+ * way that would lead to user input being capable of injecting arbitrary HTML.
+ *
+ * @param string $string
+ *
+ * @return string
+ *
+ * @author Pádraic Brady
+ * @copyright Copyright (c) 2010 Pádraic Brady (http://blog.astrumfutura.com)
+ * @license Released under dual-license GPL2/MIT by explicit permission of Pádraic Brady
+ *
+ * @access private
+ */
+function _elgg_html_decode($string) {
+	$string = str_replace(
+		array('&gt;', '&lt;', '&amp;', '&quot;', '&#039;'),
+		array('&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'),
+		$string
+	);
+	$string = html_entity_decode($string, ENT_NOQUOTES, 'UTF-8');
+	$string = str_replace(
+		array('&amp;gt;', '&amp;lt;', '&amp;amp;', '&amp;quot;', '&amp;#039;'),
+		array('&gt;', '&lt;', '&amp;', '&quot;', '&#039;'),
+		$string
+	);
+	return $string;
+}
+
+/**
+ * Prepares query string for output to prevent CSRF attacks.
+ * 
+ * @param string $string
+ * @return string
+ *
+ * @access private
+ */
+function _elgg_get_display_query($string) {
+	//encode <,>,&, quotes and characters above 127
+	if (function_exists('mb_convert_encoding')) {
+		$display_query = mb_convert_encoding($string, 'HTML-ENTITIES', 'UTF-8');
+	} else {
+		// if no mbstring extension, we just strip characters
+		$display_query = preg_replace("/[^\x01-\x7F]/", "", $string);
+	}
+	return htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
+}
+
+/**
+ * Unit tests for Output
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function output_unit_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/output.php';
+	return $value;
+}
+
+/**
+ * Initialise the Output subsystem.
+ *
+ * @return void
+ * @access private
+ */
+function output_init() {
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'output_unit_test');
+}
+
+elgg_register_event_handler('init', 'system', 'output_init');
diff --git a/engine/lib/pagehandler.php b/engine/lib/pagehandler.php
new file mode 100644
index 000000000..0cf99b6fe
--- /dev/null
+++ b/engine/lib/pagehandler.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Elgg page handler functions
+ *
+ * @package Elgg.Core
+ * @subpackage Routing
+ */
+
+/**
+ * Routes the request to a registered page handler
+ *
+ * This function sets the context based on the handler name (first segment of the
+ * URL). It also triggers a plugin hook 'route', $handler so that plugins can
+ * modify the routing or handle a request.
+ *
+ * @param string $handler The name of the handler type (eg 'blog')
+ * @param array  $page    The parameters to the page, as an array (exploded by '/' slashes)
+ *
+ * @return bool
+ * @access private
+ */
+function page_handler($handler, $page) {
+	global $CONFIG;
+
+	elgg_set_context($handler);
+
+	$page = explode('/', $page);
+	// remove empty array element when page url ends in a / (see #1480)
+	if ($page[count($page) - 1] === '') {
+		array_pop($page);
+	}
+
+	// return false to stop processing the request (because you handled it)
+	// return a new $request array if you want to route the request differently
+	$request = array(
+		'handler' => $handler,
+		'segments' => $page,
+	);
+	$request = elgg_trigger_plugin_hook('route', $handler, null, $request);
+	if ($request === false) {
+		return true;
+	}
+
+	$handler = $request['handler'];
+	$page = $request['segments'];
+
+	$result = false;
+	if (isset($CONFIG->pagehandler)
+			&& !empty($handler)
+			&& isset($CONFIG->pagehandler[$handler])
+			&& is_callable($CONFIG->pagehandler[$handler])) {
+		$function = $CONFIG->pagehandler[$handler];
+		$result = call_user_func($function, $page, $handler);
+	}
+
+	return $result || headers_sent();
+}
+
+/**
+ * Registers a page handler for a particular identifier
+ *
+ * For example, you can register a function called 'blog_page_handler' for handler type 'blog'
+ * For all URLs  http://yoururl/blog/*, the blog_page_handler() function will be called.
+ * The part of the URL marked with * above will be exploded on '/' characters and passed as an
+ * array to that function.
+ * For example, the URL http://yoururl/blog/username/friends/ would result in the call:
+ * blog_page_handler(array('username','friends'), blog);
+ *
+ * A request to register a page handler with the same identifier as previously registered
+ * handler will replace the previous one.
+ *
+ * The context is set to the page handler identifier before the registered
+ * page handler function is called. For the above example, the context is set to 'blog'.
+ *
+ * Page handlers should return true to indicate that they handled the request.
+ * Requests not handled are forwarded to the front page with a reason of 404.
+ * Plugins can register for the 'forward', '404' plugin hook. @see forward()
+ *
+ * @param string $handler  The page type to handle
+ * @param string $function Your function name
+ *
+ * @return bool Depending on success
+ */
+function elgg_register_page_handler($handler, $function) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->pagehandler)) {
+		$CONFIG->pagehandler = array();
+	}
+	if (is_callable($function, true)) {
+		$CONFIG->pagehandler[$handler] = $function;
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Unregister a page handler for an identifier
+ *
+ * Note: to replace a page handler, call elgg_register_page_handler()
+ *
+ * @param string $handler The page type identifier
+ *
+ * @since 1.7.2
+ * @return void
+ */
+function elgg_unregister_page_handler($handler) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->pagehandler)) {
+		return;
+	}
+
+	unset($CONFIG->pagehandler[$handler]);
+}
+
+/**
+ * Serve an error page
+ *
+ * @todo not sending status codes yet
+ *
+ * @param string $hook   The name of the hook
+ * @param string $type   The type of the hook
+ * @param bool   $result The current value of the hook
+ * @param array  $params Parameters related to the hook
+ * @return void
+ */
+function elgg_error_page_handler($hook, $type, $result, $params) {
+	if (elgg_view_exists("errors/$type")) {
+		$content = elgg_view("errors/$type", $params);
+	} else {
+		$content = elgg_view("errors/default", $params);
+	}
+	$body = elgg_view_layout('error', array('content' => $content));
+	echo elgg_view_page('', $body, 'error');
+	exit;
+}
+
+/**
+ * Initializes the page handler/routing system
+ *
+ * @return void
+ * @access private
+ */
+function page_handler_init() {
+	elgg_register_plugin_hook_handler('forward', '404', 'elgg_error_page_handler');
+}
+
+elgg_register_event_handler('init', 'system', 'page_handler_init');
diff --git a/engine/lib/pageowner.php b/engine/lib/pageowner.php
new file mode 100644
index 000000000..4aaffc160
--- /dev/null
+++ b/engine/lib/pageowner.php
@@ -0,0 +1,297 @@
+<?php
+/**
+ * Elgg page owner library
+ * Contains functions for managing page ownership and context
+ *
+ * @package Elgg.Core
+ * @subpackage PageOwner
+ */
+
+/**
+ * Gets the guid of the entity that owns the current page.
+ *
+ * @param int $guid Optional parameter used by elgg_set_page_owner_guid().
+ *
+ * @return int The current page owner guid (0 if none).
+ * @since 1.8.0
+ */
+function elgg_get_page_owner_guid($guid = 0) {
+	static $page_owner_guid;
+
+	if ($guid) {
+		$page_owner_guid = $guid;
+	}
+
+	if (isset($page_owner_guid)) {
+		return $page_owner_guid;
+	}
+
+	// return guid of page owner entity
+	$guid = elgg_trigger_plugin_hook('page_owner', 'system', NULL, 0);
+
+	if ($guid) {
+		$page_owner_guid = $guid;
+	}
+
+	return $guid;
+}
+
+/**
+ * Gets the owner entity for the current page.
+ *
+ * @note Access is disabled when getting the page owner entity.
+ *
+ * @return ElggUser|ElggGroup|false The current page owner or false if none.
+ *
+ * @since 1.8.0
+ */
+function elgg_get_page_owner_entity() {
+	$guid = elgg_get_page_owner_guid();
+	if ($guid > 0) {
+		$ia = elgg_set_ignore_access(true);
+		$owner = get_entity($guid);
+		elgg_set_ignore_access($ia);
+
+		return $owner;
+	}
+
+	return false;
+}
+
+/**
+ * Set the guid of the entity that owns this page
+ *
+ * @param int $guid The guid of the page owner
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_set_page_owner_guid($guid) {
+	elgg_get_page_owner_guid($guid);
+}
+
+/**
+ * Sets the page owner based on request
+ *
+ * Tries to figure out the page owner by looking at the URL or a request
+ * parameter. The request parameters used are 'username' and 'owner_guid'. If
+ * the page request is going through the page handling system, this function
+ * attempts to figure out the owner if the url fits the patterns of:
+ *   <handler>/owner/<username>
+ *   <handler>/friends/<username>
+ *   <handler>/view/<entity guid>
+ *   <handler>/add/<container guid>
+ *   <handler>/edit/<entity guid>
+ *   <handler>/group/<group guid>
+ *
+ * @note Access is disabled while finding the page owner for the group gatekeeper functions.
+ *
+ *
+ * @param string $hook        'page_owner'
+ * @param string $entity_type 'system'
+ * @param int    $returnvalue Previous function's return value
+ * @param array  $params      no parameters
+ *
+ * @return int GUID
+ * @access private
+ */
+function default_page_owner_handler($hook, $entity_type, $returnvalue, $params) {
+
+	if ($returnvalue) {
+		return $returnvalue;
+	}
+
+	$ia = elgg_set_ignore_access(true);
+
+	$username = get_input("username");
+	if ($username) {
+		// @todo using a username of group:<guid> is deprecated
+		if (substr_count($username, 'group:')) {
+			preg_match('/group\:([0-9]+)/i', $username, $matches);
+			$guid = $matches[1];
+			if ($entity = get_entity($guid)) {
+				elgg_set_ignore_access($ia);
+				return $entity->getGUID();
+			}
+		}
+
+		if ($user = get_user_by_username($username)) {
+			elgg_set_ignore_access($ia);
+			return $user->getGUID();
+		}
+	}
+
+	$owner = get_input("owner_guid");
+	if ($owner) {
+		if ($user = get_entity($owner)) {
+			elgg_set_ignore_access($ia);
+			return $user->getGUID();
+		}
+	}
+
+	// ignore root and query
+	$uri = current_page_url();
+	$path = str_replace(elgg_get_site_url(), '', $uri);
+	$path = trim($path, "/");
+	if (strpos($path, "?")) {
+		$path = substr($path, 0, strpos($path, "?"));
+	}
+
+	// @todo feels hacky
+	if (get_input('page', FALSE)) {
+		$segments = explode('/', $path);
+		if (isset($segments[1]) && isset($segments[2])) {
+			switch ($segments[1]) {
+				case 'owner':
+				case 'friends':
+					$user = get_user_by_username(urldecode($segments[2]));
+					if ($user) {
+						elgg_set_ignore_access($ia);
+						return $user->getGUID();
+					}
+					break;
+				case 'view':
+				case 'edit':
+					$entity = get_entity($segments[2]);
+					if ($entity) {
+						elgg_set_ignore_access($ia);
+						return $entity->getContainerGUID();
+					}
+					break;
+				case 'add':
+				case 'group':
+					$entity = get_entity($segments[2]);
+					if ($entity) {
+						elgg_set_ignore_access($ia);
+						return $entity->getGUID();
+					}
+					break;
+			}
+		}
+	}
+
+	elgg_set_ignore_access($ia);
+}
+
+/**
+ * Sets the page context
+ *
+ * Views can modify their output based on the local context. You may want to
+ * display a list of blogs on a blog page or in a small widget. The rendered
+ * output could be different for those two contexts ('blog' vs 'widget').
+ *
+ * Pages that pass through the page handling system set the context to the
+ * first string after the root url. Example: http://example.org/elgg/bookmarks/ 
+ * results in the initial context being set to 'bookmarks'.
+ *
+ * The context is a stack so that for a widget on a profile, the context stack
+ * may contain first 'profile' and then 'widget'.
+ *
+ * If no context was been set, the default context returned is 'main'.
+ *
+ * @warning The context is not available until the page_handler runs (after
+ * the 'init, system' event processing has completed).
+ *
+ * @param string $context The context of the page
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_set_context($context) {
+	global $CONFIG;
+
+	$context = trim($context);
+
+	if (empty($context)) {
+		return false;
+	}
+
+	$context = strtolower($context);
+
+	array_pop($CONFIG->context);
+	array_push($CONFIG->context, $context);
+
+	return true;
+}
+
+/**
+ * Get the current context.
+ *
+ * Since context is a stack, this is equivalent to a peek.
+ *
+ * @return string|NULL
+ * @since 1.8.0
+ */
+function elgg_get_context() {
+	global $CONFIG;
+
+	if (!$CONFIG->context) {
+		return null;
+	}
+
+	return $CONFIG->context[count($CONFIG->context) - 1];
+}
+
+/**
+ * Push a context onto the top of the stack
+ *
+ * @param string $context The context string to add to the context stack
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_push_context($context) {
+	global $CONFIG;
+
+	array_push($CONFIG->context, $context);
+}
+
+/**
+ * Removes and returns the top context string from the stack
+ *
+ * @return string|NULL
+ * @since 1.8.0
+ */
+function elgg_pop_context() {
+	global $CONFIG;
+
+	return array_pop($CONFIG->context);
+}
+
+/**
+ * Check if this context exists anywhere in the stack
+ *
+ * This is useful for situations with more than one element in the stack. For
+ * example, a widget has a context of 'widget'. If a widget view needs to render
+ * itself differently based on being on the dashboard or profile pages, it
+ * can check the stack.
+ *
+ * @param string $context The context string to check for
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_in_context($context) {
+	global $CONFIG;
+
+	return in_array($context, $CONFIG->context);
+}
+
+/**
+ * Initializes the page owner functions
+ *
+ * @note This is on the 'boot, system' event so that the context is set up quickly.
+ *
+ * @return void
+ * @access private
+ */
+function page_owner_boot() {
+	
+	elgg_register_plugin_hook_handler('page_owner', 'system', 'default_page_owner_handler');
+
+	// Bootstrap the context stack by setting its first entry to the handler.
+	// This is the first segment of the URL and the handler is set by the rewrite rules.
+	// @todo this does not work for actions
+	$handler = get_input('handler', FALSE);
+	if ($handler) {
+		elgg_set_context($handler);
+	}
+}
+
+elgg_register_event_handler('boot', 'system', 'page_owner_boot');
diff --git a/engine/lib/pam.php b/engine/lib/pam.php
new file mode 100644
index 000000000..1c9c3bfe1
--- /dev/null
+++ b/engine/lib/pam.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Elgg Simple PAM library
+ * Contains functions for managing authentication.
+ * This is not a full implementation of PAM. It supports a single facility
+ * (authentication) and allows multiple policies (user authentication is the
+ * default). There are two control flags possible for each module: sufficient
+ * or required. The entire chain for a policy is processed (or until a
+ * required module fails). A module fails by returning false or throwing an
+ * exception. The order that modules are processed is determined by the order
+ * they are registered. For an example of a PAM, see pam_auth_userpass() in
+ * sessions.php.
+ *
+ * For more information on PAMs see:
+ * http://www.freebsd.org/doc/en/articles/pam/index.html
+ *
+ * @see ElggPAM
+ *
+ * @package Elgg.Core
+ * @subpackage Authentication.PAM
+ */
+
+global $_PAM_HANDLERS;
+$_PAM_HANDLERS = array();
+
+/**
+ * Register a PAM handler.
+ *
+ * A PAM handler should return true if the authentication attempt passed. For a
+ * failure, return false or throw an exception. Returning nothing indicates that
+ * the handler wants to be skipped.
+ *
+ * Note, $handler must be string callback (not an array/Closure).
+ *
+ * @param string $handler    Callable global handler function in the format ()
+ * 		                     pam_handler($credentials = NULL);
+ * @param string $importance The importance - "sufficient" (default) or "required"
+ * @param string $policy     The policy type, default is "user"
+ *
+ * @return bool
+ */
+function register_pam_handler($handler, $importance = "sufficient", $policy = "user") {
+	global $_PAM_HANDLERS;
+
+	// setup array for this type of pam if not already set
+	if (!isset($_PAM_HANDLERS[$policy])) {
+		$_PAM_HANDLERS[$policy] = array();
+	}
+
+	// @todo remove requirement that $handle be a global function
+	if (is_string($handler) && is_callable($handler, true)) {
+		$_PAM_HANDLERS[$policy][$handler] = new stdClass;
+
+		$_PAM_HANDLERS[$policy][$handler]->handler = $handler;
+		$_PAM_HANDLERS[$policy][$handler]->importance = strtolower($importance);
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Unregisters a PAM handler.
+ *
+ * @param string $handler The PAM handler function name
+ * @param string $policy  The policy type, default is "user"
+ *
+ * @return void
+ * @since 1.7.0
+ */
+function unregister_pam_handler($handler, $policy = "user") {
+	global $_PAM_HANDLERS;
+
+	unset($_PAM_HANDLERS[$policy][$handler]);
+}
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
new file mode 100644
index 000000000..d5d3db466
--- /dev/null
+++ b/engine/lib/plugins.php
@@ -0,0 +1,1179 @@
+<?php
+/**
+ * Elgg plugins library
+ * Contains functions for managing plugins
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins
+ */
+
+/**
+ * Tells ElggPlugin::start() to include the start.php file.
+ */
+define('ELGG_PLUGIN_INCLUDE_START', 1);
+
+/**
+ * Tells ElggPlugin::start() to automatically register the plugin's views.
+ */
+define('ELGG_PLUGIN_REGISTER_VIEWS', 2);
+
+/**
+ * Tells ElggPlugin::start() to automatically register the plugin's languages.
+ */
+define('ELGG_PLUGIN_REGISTER_LANGUAGES', 4);
+
+/**
+ * Tells ElggPlugin::start() to automatically register the plugin's classes.
+ */
+define('ELGG_PLUGIN_REGISTER_CLASSES', 8);
+
+/**
+ * Prefix for plugin setting names
+ *
+ * @todo Can't namespace these because many plugins directly call
+ * private settings via $entity->$name.
+ */
+//define('ELGG_PLUGIN_SETTING_PREFIX', 'plugin:setting:');
+
+/**
+ * Prefix for plugin user setting names
+ */
+define('ELGG_PLUGIN_USER_SETTING_PREFIX', 'plugin:user_setting:');
+
+/**
+ * Internal settings prefix
+ *
+ * @todo This could be resolved by promoting ElggPlugin to a 5th type.
+ */
+define('ELGG_PLUGIN_INTERNAL_PREFIX', 'elgg:internal:');
+
+
+/**
+ * Returns a list of plugin IDs (dir names) from a dir.
+ *
+ * @param string $dir A dir to scan for plugins. Defaults to config's plugins_path.
+ *
+ * @return array
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_plugin_ids_in_dir($dir = null) {
+	if (!$dir) {
+		$dir = elgg_get_plugins_path();
+	}
+
+	$plugin_ids = array();
+	$handle = opendir($dir);
+
+	if ($handle) {
+		while ($plugin_id = readdir($handle)) {
+			// must be directory and not begin with a .
+			if (substr($plugin_id, 0, 1) !== '.' && is_dir($dir . $plugin_id)) {
+				$plugin_ids[] = $plugin_id;
+			}
+		}
+	}
+
+	sort($plugin_ids);
+
+	return $plugin_ids;
+}
+
+/**
+ * Discovers plugins in the plugins_path setting and creates ElggPlugin
+ * entities for them if they don't exist.  If there are plugins with entities
+ * but not actual files, will disable the ElggPlugin entities and mark as inactive.
+ * The ElggPlugin object holds config data, so don't delete.
+ *
+ * @todo Crappy name?
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_generate_plugin_entities() {
+	// @todo $site unused, can remove?
+	$site = get_config('site');
+
+	$dir = elgg_get_plugins_path();
+	$db_prefix = elgg_get_config('dbprefix');
+
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'plugin',
+		'selects' => array('plugin_oe.*'),
+		'joins' => array("JOIN {$db_prefix}objects_entity plugin_oe on plugin_oe.guid = e.guid"),
+		'limit' => ELGG_ENTITIES_NO_VALUE
+	);
+
+	$old_ia = elgg_set_ignore_access(true);
+	$old_access = access_get_show_hidden_status();
+	access_show_hidden_entities(true);
+	$known_plugins = elgg_get_entities_from_relationship($options);
+	/* @var ElggPlugin[] $known_plugins */
+
+	if (!$known_plugins) {
+		$known_plugins = array();
+	}
+
+	// map paths to indexes
+	$id_map = array();
+	foreach ($known_plugins as $i => $plugin) {
+		// if the ID is wrong, delete the plugin because we can never load it.
+		$id = $plugin->getID();
+		if (!$id) {
+			$plugin->delete();
+			unset($known_plugins[$i]);
+			continue;
+		}
+		$id_map[$plugin->getID()] = $i;
+	}
+
+	$physical_plugins = elgg_get_plugin_ids_in_dir($dir);
+
+	if (!$physical_plugins) {
+		return false;
+	}
+
+	// check real plugins against known ones
+	foreach ($physical_plugins as $plugin_id) {
+		// is this already in the db?
+		if (array_key_exists($plugin_id, $id_map)) {
+			$index = $id_map[$plugin_id];
+			$plugin = $known_plugins[$index];
+			// was this plugin deleted and its entity disabled?
+			if (!$plugin->isEnabled()) {
+				$plugin->enable();
+				$plugin->deactivate();
+				$plugin->setPriority('last');
+			}
+
+			// remove from the list of plugins to disable
+			unset($known_plugins[$index]);
+		} else {
+			// add new plugins
+			// priority is force to last in save() if not set.
+			$plugin = new ElggPlugin($plugin_id);
+			$plugin->save();
+		}
+	}
+
+	// everything remaining in $known_plugins needs to be disabled
+	// because they are entities, but their dirs were removed.
+	// don't delete the entities because they hold settings.
+	foreach ($known_plugins as $plugin) {
+		if ($plugin->isActive()) {
+			$plugin->deactivate();
+		}
+		// remove the priority.
+		$name = elgg_namespace_plugin_private_setting('internal', 'priority');
+		remove_private_setting($plugin->guid, $name);
+		$plugin->disable();
+	}
+
+	access_show_hidden_entities($old_access);
+	elgg_set_ignore_access($old_ia);
+
+	elgg_reindex_plugin_priorities();
+
+	return true;
+}
+
+/**
+ * Cache a reference to this plugin by its ID
+ * 
+ * @param ElggPlugin $plugin
+ * 
+ * @access private
+ */
+function _elgg_cache_plugin_by_id(ElggPlugin $plugin) {
+	$map = (array) elgg_get_config('plugins_by_id_map');
+	$map[$plugin->getID()] = $plugin;
+	elgg_set_config('plugins_by_id_map', $map);
+}
+
+/**
+ * Returns an ElggPlugin object with the path $path.
+ *
+ * @param string $plugin_id The id (dir name) of the plugin. NOT the guid.
+ * @return ElggPlugin|false
+ * @since 1.8.0
+ */
+function elgg_get_plugin_from_id($plugin_id) {
+	$map = (array) elgg_get_config('plugins_by_id_map');
+	if (isset($map[$plugin_id])) {
+		return $map[$plugin_id];
+	}
+
+	$plugin_id = sanitize_string($plugin_id);
+	$db_prefix = get_config('dbprefix');
+
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'plugin',
+		'joins' => array("JOIN {$db_prefix}objects_entity oe on oe.guid = e.guid"),
+		'selects' => array("oe.title", "oe.description"),
+		'wheres' => array("oe.title = '$plugin_id'"),
+		'limit' => 1
+	);
+
+	$plugins = elgg_get_entities($options);
+
+	if ($plugins) {
+		return $plugins[0];
+	}
+
+	return false;
+}
+
+/**
+ * Returns if a plugin exists in the system.
+ *
+ * @warning This checks only plugins that are registered in the system!
+ * If the plugin cache is outdated, be sure to regenerate it with
+ * {@link elgg_generate_plugin_objects()} first.
+ *
+ * @param string $id The plugin ID.
+ * @since 1.8.0
+ * @return bool
+ */
+function elgg_plugin_exists($id) {
+	$plugin = elgg_get_plugin_from_id($id);
+
+	return ($plugin) ? true : false;
+}
+
+/**
+ * Returns the highest priority of the plugins
+ *
+ * @return int
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_max_plugin_priority() {
+	$db_prefix = get_config('dbprefix');
+	$priority = elgg_namespace_plugin_private_setting('internal', 'priority');
+	$plugin_subtype = get_subtype_id('object', 'plugin');
+
+	$q = "SELECT MAX(CAST(ps.value AS unsigned)) as max
+		FROM {$db_prefix}entities e, {$db_prefix}private_settings ps
+		WHERE ps.name = '$priority'
+		AND ps.entity_guid = e.guid
+		AND e.type = 'object' and e.subtype = $plugin_subtype";
+
+	$data = get_data($q);
+	if ($data) {
+		$max = $data[0]->max;
+	} else {
+		$max = 1;
+	}
+
+	// can't have a priority of 0.
+	return ($max) ? $max : 1;
+}
+
+/**
+ * Returns if a plugin is active for a current site.
+ *
+ * @param string $plugin_id The plugin ID
+ * @param int    $site_guid The site guid
+ * @since 1.8.0
+ * @return bool
+ */
+function elgg_is_active_plugin($plugin_id, $site_guid = null) {
+	if ($site_guid) {
+		$site = get_entity($site_guid);
+	} else {
+		$site = elgg_get_site_entity();
+	}
+
+	if (!($site instanceof ElggSite)) {
+		return false;
+	}
+
+	$plugin = elgg_get_plugin_from_id($plugin_id);
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->isActive($site->guid);
+}
+
+/**
+ * Loads all active plugins in the order specified in the tool admin panel.
+ *
+ * @note This is called on every page load. If a plugin is active and problematic, it
+ * will be disabled and a visible error emitted. This does not check the deps system because
+ * that was too slow.
+ *
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_load_plugins() {
+	$plugins_path = elgg_get_plugins_path();
+	$start_flags = ELGG_PLUGIN_INCLUDE_START |
+					ELGG_PLUGIN_REGISTER_VIEWS |
+					ELGG_PLUGIN_REGISTER_LANGUAGES |
+					ELGG_PLUGIN_REGISTER_CLASSES;
+
+	if (!$plugins_path) {
+		return false;
+	}
+
+	// temporary disable all plugins if there is a file called 'disabled' in the plugin dir
+	if (file_exists("$plugins_path/disabled")) {
+		if (elgg_is_admin_logged_in() && elgg_in_context('admin')) {
+			system_message(elgg_echo('plugins:disabled'));
+		}
+		return false;
+	}
+
+	if (elgg_get_config('system_cache_loaded')) {
+		$start_flags = $start_flags & ~ELGG_PLUGIN_REGISTER_VIEWS;
+	}
+
+	if (elgg_get_config('i18n_loaded_from_cache')) {
+		$start_flags = $start_flags & ~ELGG_PLUGIN_REGISTER_LANGUAGES;
+	}
+
+	$return = true;
+	$plugins = elgg_get_plugins('active');
+	if ($plugins) {
+		foreach ($plugins as $plugin) {
+			try {
+				$plugin->start($start_flags);
+			} catch (Exception $e) {
+				$plugin->deactivate();
+				$msg = elgg_echo('PluginException:CannotStart',
+								array($plugin->getID(), $plugin->guid, $e->getMessage()));
+				elgg_add_admin_notice('cannot_start' . $plugin->getID(), $msg);
+				$return = false;
+
+				continue;
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Returns an ordered list of plugins
+ *
+ * @param string $status      The status of the plugins. active, inactive, or all.
+ * @param mixed  $site_guid   Optional site guid
+ * @return ElggPlugin[]
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_plugins($status = 'active', $site_guid = null) {
+	$db_prefix = get_config('dbprefix');
+	$priority = elgg_namespace_plugin_private_setting('internal', 'priority');
+
+	if (!$site_guid) {
+		$site = get_config('site');
+		$site_guid = $site->guid;
+	}
+
+	// grab plugins
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'plugin',
+		'limit' => ELGG_ENTITIES_NO_VALUE,
+		'selects' => array('plugin_oe.*'),
+		'joins' => array(
+			"JOIN {$db_prefix}private_settings ps on ps.entity_guid = e.guid",
+			"JOIN {$db_prefix}objects_entity plugin_oe on plugin_oe.guid = e.guid"
+			),
+		'wheres' => array("ps.name = '$priority'"),
+		'order_by' => "CAST(ps.value as unsigned), e.guid"
+	);
+
+	switch ($status) {
+		case 'active':
+			$options['relationship'] = 'active_plugin';
+			$options['relationship_guid'] = $site_guid;
+			$options['inverse_relationship'] = true;
+			break;
+
+		case 'inactive':
+			$options['wheres'][] = "NOT EXISTS (
+					SELECT 1 FROM {$db_prefix}entity_relationships active_er
+					WHERE active_er.guid_one = e.guid
+						AND active_er.relationship = 'active_plugin'
+						AND active_er.guid_two = $site_guid)";
+			break;
+
+		case 'all':
+		default:
+			break;
+	}
+
+	$old_ia = elgg_set_ignore_access(true);
+	$plugins = elgg_get_entities_from_relationship($options);
+	elgg_set_ignore_access($old_ia);
+
+	return $plugins;
+}
+
+/**
+ * Reorder plugins to an order specified by the array.
+ * Plugins not included in this array will be appended to the end.
+ *
+ * @note This doesn't use the ElggPlugin->setPriority() method because
+ *       all plugins are being changed and we don't want it to automatically
+ *       reorder plugins.
+ *
+ * @param array $order An array of plugin ids in the order to set them
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_plugin_priorities(array $order) {
+	$name = elgg_namespace_plugin_private_setting('internal', 'priority');
+
+	$plugins = elgg_get_plugins('any');
+	if (!$plugins) {
+		return false;
+	}
+
+	$return = true;
+
+	// reindex to get standard counting. no need to increment by 10.
+	// though we do start with 1
+	$order = array_values($order);
+
+	$missing_plugins = array();
+	foreach ($plugins as $plugin) {
+		$plugin_id = $plugin->getID();
+
+		if (!in_array($plugin_id, $order)) {
+			$missing_plugins[] = $plugin;
+			continue;
+		}
+
+		$priority = array_search($plugin_id, $order) + 1;
+
+		if (!$plugin->set($name, $priority)) {
+			$return = false;
+			break;
+		}
+	}
+
+	// set the missing plugins' priorities
+	if ($return && $missing_plugins) {
+		if (!isset($priority)) {
+			$priority = 0;
+		}
+		foreach ($missing_plugins as $plugin) {
+			$priority++;
+			if (!$plugin->set($name, $priority)) {
+				$return = false;
+				break;
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Reindexes all plugin priorities starting at 1.
+ *
+ * @todo Can this be done in a single sql command?
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_reindex_plugin_priorities() {
+	return elgg_set_plugin_priorities(array());
+}
+
+/**
+ * Namespaces a string to be used as a private setting for a plugin.
+ *
+ * @param string $type The type of value: user_setting or internal.
+ * @param string $name The name to namespace.
+ * @param string $id   The plugin's ID to namespace with.  Required for user_setting.
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_namespace_plugin_private_setting($type, $name, $id = null) {
+	switch ($type) {
+		// commented out because it breaks $plugin->$name access to variables
+		//case 'setting':
+		//	$name = ELGG_PLUGIN_SETTING_PREFIX . $name;
+		//	break;
+
+		case 'user_setting':
+			if (!$id) {
+				$id = elgg_get_calling_plugin_id();
+			}
+			$name = ELGG_PLUGIN_USER_SETTING_PREFIX . "$id:$name";
+			break;
+
+		case 'internal':
+			$name = ELGG_PLUGIN_INTERNAL_PREFIX . $name;
+			break;
+	}
+
+	return $name;
+}
+
+/**
+ * Get the name of the most recent plugin to be called in the
+ * call stack (or the plugin that owns the current page, if any).
+ *
+ * i.e., if the last plugin was in /mod/foobar/, this would return foo_bar.
+ *
+ * @param boolean $mainfilename If set to true, this will instead determine the
+ *                              context from the main script filename called by
+ *                              the browser. Default = false.
+ *
+ * @return string|false Plugin name, or false if no plugin name was called
+ * @since 1.8.0
+ * @access private
+ *
+ * @todo get rid of this
+ */
+function elgg_get_calling_plugin_id($mainfilename = false) {
+	if (!$mainfilename) {
+		if ($backtrace = debug_backtrace()) {
+			foreach ($backtrace as $step) {
+				$file = $step['file'];
+				$file = str_replace("\\", "/", $file);
+				$file = str_replace("//", "/", $file);
+				if (preg_match("/mod\/([a-zA-Z0-9\-\_]*)\/start\.php$/", $file, $matches)) {
+					return $matches[1];
+				}
+			}
+		}
+	} else {
+		//@todo this is a hack -- plugins do not have to match their page handler names!
+		if ($handler = get_input('handler', FALSE)) {
+			return $handler;
+		} else {
+			$file = $_SERVER["SCRIPT_NAME"];
+			$file = str_replace("\\", "/", $file);
+			$file = str_replace("//", "/", $file);
+			if (preg_match("/mod\/([a-zA-Z0-9\-\_]*)\//", $file, $matches)) {
+				return $matches[1];
+			}
+		}
+	}
+	return false;
+}
+
+/**
+ * Returns an array of all provides from all active plugins.
+ *
+ * Array in the form array(
+ * 	'provide_type' => array(
+ * 		'provided_name' => array(
+ * 			'version' => '1.8',
+ * 			'provided_by' => 'provider_plugin_id'
+ *  	)
+ *  )
+ * )
+ *
+ * @param string $type The type of provides to return
+ * @param string $name A specific provided name to return. Requires $provide_type.
+ *
+ * @return array
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_plugins_provides($type = null, $name = null) {
+	static $provides = null;
+	$active_plugins = elgg_get_plugins('active');
+
+	if (!isset($provides)) {
+		$provides = array();
+
+		foreach ($active_plugins as $plugin) {
+			$plugin_provides = array();
+			$manifest = $plugin->getManifest();
+			if ($manifest instanceof ElggPluginManifest) {
+				$plugin_provides = $plugin->getManifest()->getProvides();
+			}
+			if ($plugin_provides) {
+				foreach ($plugin_provides as $provided) {
+					$provides[$provided['type']][$provided['name']] = array(
+						'version' => $provided['version'],
+						'provided_by' => $plugin->getID()
+					);
+				}
+			}
+		}
+	}
+
+	if ($type && $name) {
+		if (isset($provides[$type][$name])) {
+			return $provides[$type][$name];
+		} else {
+			return false;
+		}
+	} elseif ($type) {
+		if (isset($provides[$type])) {
+			return $provides[$type];
+		} else {
+			return false;
+		}
+	}
+
+	return $provides;
+}
+
+/**
+ * Checks if a plugin is currently providing $type and $name, and optionally
+ * checking a version.
+ *
+ * @param string $type       The type of the provide
+ * @param string $name       The name of the provide
+ * @param string $version    A version to check against
+ * @param string $comparison The comparison operator to use in version_compare()
+ *
+ * @return array An array in the form array(
+ * 	'status' => bool Does the provide exist?,
+ * 	'value' => string The version provided
+ * )
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_check_plugins_provides($type, $name, $version = null, $comparison = 'ge') {
+	$provided = elgg_get_plugins_provides($type, $name);
+	if (!$provided) {
+		return array(
+			'status' => false,
+			'version' => ''
+		);
+	}
+
+	if ($version) {
+		$status = version_compare($provided['version'], $version, $comparison);
+	} else {
+		$status = true;
+	}
+
+	return array(
+		'status' => $status,
+		'value' => $provided['version']
+	);
+}
+
+/**
+ * Returns an array of parsed strings for a dependency in the
+ * format: array(
+ * 	'type'			=>	requires, conflicts, or provides.
+ * 	'name'			=>	The name of the requirement / conflict
+ * 	'value'			=>	A string representing the expected value: <1, >=3, !=enabled
+ * 	'local_value'	=>	The current value, ("Not installed")
+ * 	'comment'		=>	Free form text to help resovle the problem ("Enable / Search for plugin <link>")
+ * )
+ *
+ * @param array $dep An ElggPluginPackage dependency array
+ * @return array
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_plugin_dependency_strings($dep) {
+	$dep_system = elgg_extract('type', $dep);
+	$info = elgg_extract('dep', $dep);
+	$type = elgg_extract('type', $info);
+
+	if (!$dep_system || !$info || !$type) {
+		return false;
+	}
+
+	// rewrite some of these to be more readable
+	switch($info['comparison']) {
+		case 'lt':
+			$comparison = '<';
+			break;
+		case 'gt':
+			$comparison = '>';
+			break;
+		case 'ge':
+			$comparison = '>=';
+			break;
+		case 'le':
+			$comparison = '<=';
+			break;
+		default;
+			$comparison = $info['comparison'];
+			break;
+	}
+
+	/*
+	'requires'	'plugin oauth_lib'	<1.3	1.3		'downgrade'
+	'requires'	'php setting bob'	>3		3		'change it'
+	'conflicts'	'php setting'		>3		4		'change it'
+	'conflicted''plugin profile'	any		1.8		'disable profile'
+	'provides'	'plugin oauth_lib'	1.3		--		--
+	'priority'	'before blog'		--		after	'move it'
+	*/
+	$strings = array();
+	$strings['type'] = elgg_echo('ElggPlugin:Dependencies:' . ucwords($dep_system));
+
+	switch ($type) {
+		case 'elgg_version':
+		case 'elgg_release':
+			// 'Elgg Version'
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Elgg');
+			$strings['expected_value'] = "$comparison {$info['version']}";
+			$strings['local_value'] = $dep['value'];
+			$strings['comment'] = '';
+			break;
+
+		case 'php_extension':
+			// PHP Extension %s [version]
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:PhpExtension', array($info['name']));
+			if ($info['version']) {
+				$strings['expected_value'] = "$comparison {$info['version']}";
+				$strings['local_value'] = $dep['value'];
+			} else {
+				$strings['expected_value'] = '';
+				$strings['local_value'] = '';
+			}
+			$strings['comment'] = '';
+			break;
+
+		case 'php_ini':
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:PhpIni', array($info['name']));
+			$strings['expected_value'] = "$comparison {$info['value']}";
+			$strings['local_value'] = $dep['value'];
+			$strings['comment'] = '';
+			break;
+
+		case 'plugin':
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Plugin', array($info['name']));
+			$expected = $info['version'] ? "$comparison {$info['version']}" : elgg_echo('any');
+			$strings['expected_value'] = $expected;
+			$strings['local_value'] = $dep['value'] ? $dep['value'] : '--';
+			$strings['comment'] = '';
+			break;
+
+		case 'priority':
+			$expected_priority = ucwords($info['priority']);
+			$real_priority = ucwords($dep['value']);
+			$strings['name'] = elgg_echo('ElggPlugin:Dependencies:Priority');
+			$strings['expected_value'] = elgg_echo("ElggPlugin:Dependencies:Priority:$expected_priority", array($info['plugin']));
+			$strings['local_value'] = elgg_echo("ElggPlugin:Dependencies:Priority:$real_priority", array($info['plugin']));
+			$strings['comment'] = '';
+			break;
+	}
+
+	if ($dep['type'] == 'suggests') {
+		if ($dep['status']) {
+			$strings['comment'] = elgg_echo('ok');
+		} else {
+			$strings['comment'] = elgg_echo('ElggPlugin:Dependencies:Suggests:Unsatisfied');
+		}
+	} else {
+		if ($dep['status']) {
+			$strings['comment'] = elgg_echo('ok');
+		} else {
+			$strings['comment'] = elgg_echo('error');
+		}
+	}
+
+	return $strings;
+}
+
+/**
+ * Returns the ElggPlugin entity of the last plugin called.
+ *
+ * @return mixed ElggPlugin or false
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_calling_plugin_entity() {
+	$plugin_id = elgg_get_calling_plugin_id();
+
+	if ($plugin_id) {
+		return elgg_get_plugin_from_id($plugin_id);
+	}
+
+	return false;
+}
+
+/**
+ * Returns an array of all plugin settings for a user.
+ *
+ * @param mixed  $user_guid  The user GUID or null for the currently logged in user.
+ * @param string $plugin_id  The plugin ID
+ * @param bool   $return_obj Return settings as an object? This can be used to in reusable
+ *                           views where the settings are passed as $vars['entity'].
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_all_plugin_user_settings($user_guid = null, $plugin_id = null, $return_obj = false) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin instanceof ElggPlugin) {
+		return false;
+	}
+
+	$settings = $plugin->getAllUserSettings($user_guid);
+
+	if ($settings && $return_obj) {
+		$return = new stdClass;
+
+		foreach ($settings as $k => $v) {
+			$return->$k = $v;
+		}
+
+		return $return;
+	} else {
+		return $settings;
+	}
+}
+
+/**
+ * Set a user specific setting for a plugin.
+ *
+ * @param string $name      The name - note, can't be "title".
+ * @param mixed  $value     The value.
+ * @param int    $user_guid Optional user.
+ * @param string $plugin_id Optional plugin name, if not specified then it
+ *                          is detected from where you are calling from.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_set_plugin_user_setting($name, $value, $user_guid = null, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->setUserSetting($name, $value, $user_guid);
+}
+
+/**
+ * Unsets a user-specific plugin setting
+ *
+ * @param string $name      Name of the setting
+ * @param int    $user_guid Defaults to logged in user
+ * @param string $plugin_id Defaults to contextual plugin name
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unset_plugin_user_setting($name, $user_guid = null, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->unsetUserSetting($name, $user_guid);
+}
+
+/**
+ * Get a user specific setting for a plugin.
+ *
+ * @param string $name      The name of the setting.
+ * @param int    $user_guid Guid of owning user
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          it is detected from where you are calling.
+ *
+ * @return mixed
+ * @since 1.8.0
+ */
+function elgg_get_plugin_user_setting($name, $user_guid = null, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->getUserSetting($name, $user_guid);
+}
+
+/**
+ * Set a setting for a plugin.
+ *
+ * @param string $name      The name of the setting - note, can't be "title".
+ * @param mixed  $value     The value.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_set_plugin_setting($name, $value, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->setSetting($name, $value);
+}
+
+/**
+ * Get setting for a plugin.
+ *
+ * @param string $name      The name of the setting.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @return mixed
+ * @since 1.8.0
+ * @todo make $plugin_id required in future version
+ */
+function elgg_get_plugin_setting($name, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->getSetting($name);
+}
+
+/**
+ * Unsets a plugin setting.
+ *
+ * @param string $name      The name of the setting.
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unset_plugin_setting($name, $plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->unsetSetting($name);
+}
+
+/**
+ * Unsets all plugin settings for a plugin.
+ *
+ * @param string $plugin_id Optional plugin name, if not specified
+ *                          then it is detected from where you are calling from.
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_unset_all_plugin_settings($plugin_id = null) {
+	if ($plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+	} else {
+		$plugin = elgg_get_calling_plugin_entity();
+	}
+
+	if (!$plugin) {
+		return false;
+	}
+
+	return $plugin->unsetAllSettings();
+}
+
+/**
+ * Returns entities based upon plugin settings.
+ * Takes all the options for {@see elgg_get_entities_from_private_settings()}
+ * in addition to the ones below.
+ *
+ * @param array $options Array in the format:
+ *
+ * 	plugin_id => NULL|STR The plugin id. Defaults to calling plugin
+ *
+ * 	plugin_user_setting_names => NULL|ARR private setting names
+ *
+ * 	plugin_user_setting_values => NULL|ARR metadata values
+ *
+ * 	plugin_user_setting_name_value_pairs => NULL|ARR (
+ *                                         name => 'name',
+ *                                         value => 'value',
+ *                                         'operand' => '=',
+ *                                        )
+ * 	                             Currently if multiple values are sent via
+ *                               an array (value => array('value1', 'value2')
+ *                               the pair's operand will be forced to "IN".
+ *
+ * 	plugin_user_setting_name_value_pairs_operator => NULL|STR The operator to use for combining
+ *                                        (name = value) OPERATOR (name = value); default AND
+ *
+ * @return mixed int If count, int. If not count, array. false on errors.
+ */
+function elgg_get_entities_from_plugin_user_settings(array $options = array()) {
+	// if they're passing it don't bother
+	if (!isset($options['plugin_id'])) {
+		$options['plugin_id'] = elgg_get_calling_plugin_id();
+	}
+
+	$singulars = array('plugin_user_setting_name', 'plugin_user_setting_value',
+		'plugin_user_setting_name_value_pair');
+
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	// rewrite plugin_user_setting_name_* to the right PS ones.
+	$map = array(
+		'plugin_user_setting_names' => 'private_setting_names',
+		'plugin_user_setting_values' => 'private_setting_values',
+		'plugin_user_setting_name_value_pairs' => 'private_setting_name_value_pairs',
+		'plugin_user_setting_name_value_pairs_operator' => 'private_setting_name_value_pairs_operator'
+	);
+
+	foreach ($map as $plugin => $private) {
+		if (!isset($options[$plugin])) {
+			continue;
+		}
+
+		if (isset($options[$private])) {
+			if (!is_array($options[$private])) {
+				$options[$private] = array($options[$private]);
+			}
+
+			$options[$private] = array_merge($options[$private], $options[$plugin]);
+		} else {
+			$options[$private] = $options[$plugin];
+		}
+	}
+
+
+	$plugin_id = $options['plugin_id'];
+	$prefix = elgg_namespace_plugin_private_setting('user_setting', '', $plugin_id);
+	$options['private_setting_name_prefix'] = $prefix;
+
+	return elgg_get_entities_from_private_settings($options);
+}
+
+/**
+ * Register object, plugin entities as ElggPlugin classes
+ *
+ * @return void
+ * @access private
+ */
+function plugin_run_once() {
+	add_subtype("object", "plugin", "ElggPlugin");
+}
+
+/**
+ * Runs unit tests for the entity objects.
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function plugins_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/plugins.php';
+	return $value;
+}
+
+/**
+ * Checks on deactivate plugin event if disabling it won't create unmet dependencies and blocks disable in such case.
+ *
+ * @param string $event  deactivate
+ * @param string $type   plugin
+ * @param array  $params Parameters array containing entry with ELggPlugin instance under 'plugin_entity' key
+ * @return bool  false to block plugin deactivation action
+ *
+ * @access private
+ */
+function _plugins_deactivate_dependency_check($event, $type, $params) {
+	$plugin_id = $params['plugin_entity']->getManifest()->getPluginID();
+	$plugin_name = $params['plugin_entity']->getManifest()->getName();
+
+	$active_plugins = elgg_get_plugins();
+
+	$dependents = array();
+	foreach ($active_plugins as $plugin) {
+		$manifest = $plugin->getManifest();
+		$requires = $manifest->getRequires();
+
+		foreach ($requires as $required) {
+			if ($required['type'] == 'plugin' && $required['name'] == $plugin_id) {
+				// there are active dependents
+				$dependents[$manifest->getPluginID()] = $plugin;
+			}
+		}
+	}
+
+	if ($dependents) {
+		$list = '<ul>';
+		// construct error message and prevent disabling
+		foreach ($dependents as $dependent) {
+			$list .= '<li>' . $dependent->getManifest()->getName() . '</li>';
+		}
+		$list .= '</ul>';
+
+		register_error(elgg_echo('ElggPlugin:Dependencies:ActiveDependent', array($plugin_name, $list)));
+
+		return false;
+	}
+}
+
+/**
+ * Initialize the plugin system
+ * Listens to system init and registers actions
+ *
+ * @return void
+ * @access private
+ */
+function plugin_init() {
+	run_function_once("plugin_run_once");
+
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'plugins_test');
+	
+	// note - plugins are booted by the time this handler is registered
+	// deactivation due to error may have already occurred
+	elgg_register_event_handler('deactivate', 'plugin', '_plugins_deactivate_dependency_check');
+
+	elgg_register_action("plugins/settings/save", '', 'admin');
+	elgg_register_action("plugins/usersettings/save");
+
+	elgg_register_action('admin/plugins/activate', '', 'admin');
+	elgg_register_action('admin/plugins/deactivate', '', 'admin');
+	elgg_register_action('admin/plugins/activate_all', '', 'admin');
+	elgg_register_action('admin/plugins/deactivate_all', '', 'admin');
+
+	elgg_register_action('admin/plugins/set_priority', '', 'admin');
+
+	elgg_register_library('elgg:markdown', elgg_get_root_path() . 'vendors/markdown/markdown.php');
+}
+
+elgg_register_event_handler('init', 'system', 'plugin_init');
diff --git a/engine/lib/private_settings.php b/engine/lib/private_settings.php
new file mode 100644
index 000000000..7541f7b3b
--- /dev/null
+++ b/engine/lib/private_settings.php
@@ -0,0 +1,414 @@
+<?php
+/**
+ * Private settings for entities
+ * Private settings provide metadata like storage of settings for plugins
+ * and users.
+ *
+ * @package Elgg.Core
+ * @subpackage PrivateSettings
+ */
+
+/**
+ * Returns entities based upon private settings.  Also accepts all
+ * options available to elgg_get_entities().  Supports
+ * the singular option shortcut.
+ *
+ * @see elgg_get_entities
+ *
+ * @param array $options Array in format:
+ *
+ * 	private_setting_names => NULL|ARR private setting names
+ *
+ * 	private_setting_values => NULL|ARR metadata values
+ *
+ * 	private_setting_name_value_pairs => NULL|ARR (
+ *                                         name => 'name',
+ *                                         value => 'value',
+ *                                         'operand' => '=',
+ *                                        )
+ * 	                             Currently if multiple values are sent via
+ *                               an array (value => array('value1', 'value2')
+ *                               the pair's operand will be forced to "IN".
+ *
+ * 	private_setting_name_value_pairs_operator => NULL|STR The operator to use for combining
+ *                                        (name = value) OPERATOR (name = value); default AND
+ *
+ *  private_setting_name_prefix => STR A prefix to apply to all private settings. Used to
+ *                                     namespace plugin user settings or by plugins to namespace
+ *                                     their own settings.
+ *
+ *
+ * @return mixed int If count, int. If not count, array. false on errors.
+ * @since 1.8.0
+ */
+function elgg_get_entities_from_private_settings(array $options = array()) {
+	$defaults = array(
+		'private_setting_names'                     =>	ELGG_ENTITIES_ANY_VALUE,
+		'private_setting_values'                    =>	ELGG_ENTITIES_ANY_VALUE,
+		'private_setting_name_value_pairs'          =>	ELGG_ENTITIES_ANY_VALUE,
+		'private_setting_name_value_pairs_operator' => 'AND',
+		'private_setting_name_prefix'				=> '',
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('private_setting_name', 'private_setting_value',
+		'private_setting_name_value_pair');
+
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$clauses = elgg_get_entity_private_settings_where_sql('e', $options['private_setting_names'],
+		$options['private_setting_values'], $options['private_setting_name_value_pairs'],
+		$options['private_setting_name_value_pairs_operator'], $options['private_setting_name_prefix']);
+
+	if ($clauses) {
+		// merge wheres to pass to get_entities()
+		if (isset($options['wheres']) && !is_array($options['wheres'])) {
+			$options['wheres'] = array($options['wheres']);
+		} elseif (!isset($options['wheres'])) {
+			$options['wheres'] = array();
+		}
+
+		$options['wheres'] = array_merge($options['wheres'], $clauses['wheres']);
+
+		// merge joins to pass to get_entities()
+		if (isset($options['joins']) && !is_array($options['joins'])) {
+			$options['joins'] = array($options['joins']);
+		} elseif (!isset($options['joins'])) {
+			$options['joins'] = array();
+		}
+
+		$options['joins'] = array_merge($options['joins'], $clauses['joins']);
+	}
+
+	return elgg_get_entities($options);
+}
+
+/**
+ * Returns private setting name and value SQL where/join clauses for entities.
+ *
+ * @param string     $table         Entities table name
+ * @param array|null $names         Array of names
+ * @param array|null $values        Array of values
+ * @param array|null $pairs         Array of names / values / operands
+ * @param string     $pair_operator Operator for joining pairs where clauses
+ * @param string     $name_prefix   A string to prefix all names with
+ * @return array
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_entity_private_settings_where_sql($table, $names = NULL, $values = NULL,
+$pairs = NULL, $pair_operator = 'AND', $name_prefix = '') {
+
+	global $CONFIG;
+
+	// @todo short circuit test
+
+	$return = array (
+		'joins' => array (),
+		'wheres' => array(),
+	);
+
+	$return['joins'][] = "JOIN {$CONFIG->dbprefix}private_settings ps on
+		{$table}.guid = ps.entity_guid";
+
+	$wheres = array();
+
+	// get names wheres
+	$names_where = '';
+	if ($names !== NULL) {
+		if (!is_array($names)) {
+			$names = array($names);
+		}
+
+		$sanitised_names = array();
+		foreach ($names as $name) {
+			$name = $name_prefix . $name;
+			$sanitised_names[] = '\'' . sanitise_string($name) . '\'';
+		}
+
+		$names_str = implode(',', $sanitised_names);
+		if ($names_str) {
+			$names_where = "(ps.name IN ($names_str))";
+		}
+	}
+
+	// get values wheres
+	$values_where = '';
+	if ($values !== NULL) {
+		if (!is_array($values)) {
+			$values = array($values);
+		}
+
+		$sanitised_values = array();
+		foreach ($values as $value) {
+			// normalize to 0
+			if (!$value) {
+				$value = 0;
+			}
+			$sanitised_values[] = '\'' . sanitise_string($value) . '\'';
+		}
+
+		$values_str = implode(',', $sanitised_values);
+		if ($values_str) {
+			$values_where = "(ps.value IN ($values_str))";
+		}
+	}
+
+	if ($names_where && $values_where) {
+		$wheres[] = "($names_where AND $values_where)";
+	} elseif ($names_where) {
+		$wheres[] = "($names_where)";
+	} elseif ($values_where) {
+		$wheres[] = "($values_where)";
+	}
+
+	// add pairs which must be in arrays.
+	if (is_array($pairs)) {
+		// join counter for incremental joins in pairs
+		$i = 1;
+
+		// check if this is an array of pairs or just a single pair.
+		if (isset($pairs['name']) || isset($pairs['value'])) {
+			$pairs = array($pairs);
+		}
+
+		$pair_wheres = array();
+
+		foreach ($pairs as $index => $pair) {
+			// @todo move this elsewhere?
+			// support shortcut 'n' => 'v' method.
+			if (!is_array($pair)) {
+				$pair = array(
+					'name' => $index,
+					'value' => $pair
+				);
+			}
+
+			// must have at least a name and value
+			if (!isset($pair['name']) || !isset($pair['value'])) {
+				// @todo should probably return false.
+				continue;
+			}
+
+			if (isset($pair['operand'])) {
+				$operand = sanitise_string($pair['operand']);
+			} else {
+				$operand = ' = ';
+			}
+
+			// for comparing
+			$trimmed_operand = trim(strtolower($operand));
+
+			// if the value is an int, don't quote it because str '15' < str '5'
+			// if the operand is IN don't quote it because quoting should be done already.
+			if (is_numeric($pair['value'])) {
+				$value = sanitise_string($pair['value']);
+			} else if (is_array($pair['value'])) {
+				$values_array = array();
+
+				foreach ($pair['value'] as $pair_value) {
+					if (is_numeric($pair_value)) {
+						$values_array[] = sanitise_string($pair_value);
+					} else {
+						$values_array[] = "'" . sanitise_string($pair_value) . "'";
+					}
+				}
+
+				if ($values_array) {
+					$value = '(' . implode(', ', $values_array) . ')';
+				}
+
+				// @todo allow support for non IN operands with array of values.
+				// will have to do more silly joins.
+				$operand = 'IN';
+			} else if ($trimmed_operand == 'in') {
+				$value = "({$pair['value']})";
+			} else {
+				$value = "'" . sanitise_string($pair['value']) . "'";
+			}
+
+			$name = sanitise_string($name_prefix . $pair['name']);
+
+			// @todo The multiple joins are only needed when the operator is AND
+			$return['joins'][] = "JOIN {$CONFIG->dbprefix}private_settings ps{$i}
+				on {$table}.guid = ps{$i}.entity_guid";
+
+			$pair_wheres[] = "(ps{$i}.name = '$name' AND ps{$i}.value
+				$operand $value)";
+
+			$i++;
+		}
+
+		$where = implode(" $pair_operator ", $pair_wheres);
+		if ($where) {
+			$wheres[] = "($where)";
+		}
+	}
+
+	$where = implode(' AND ', $wheres);
+	if ($where) {
+		$return['wheres'][] = "($where)";
+	}
+
+	return $return;
+}
+
+/**
+ * Gets a private setting for an entity.
+ *
+ * Plugin authors can set private data on entities.  By default
+ * private data will not be searched or exported.
+ *
+ * @internal Private data is used to store settings for plugins
+ * and user settings.
+ *
+ * @param int    $entity_guid The entity GUID
+ * @param string $name        The name of the setting
+ *
+ * @return mixed The setting value, or false on failure
+ * @see set_private_setting()
+ * @see get_all_private_settings()
+ * @see remove_private_setting()
+ * @see remove_all_private_settings()
+ * @link http://docs.elgg.org/DataModel/Entities/PrivateSettings
+ */
+function get_private_setting($entity_guid, $name) {
+	global $CONFIG;
+	$entity_guid = (int) $entity_guid;
+	$name = sanitise_string($name);
+
+	$entity = get_entity($entity_guid);
+	if (!$entity instanceof ElggEntity) {
+		return false;
+	}
+
+	$query = "SELECT value from {$CONFIG->dbprefix}private_settings
+		where name = '{$name}' and entity_guid = {$entity_guid}";
+	$setting = get_data_row($query);
+
+	if ($setting) {
+		return $setting->value;
+	}
+	return false;
+}
+
+/**
+ * Return an array of all private settings.
+ *
+ * @param int $entity_guid The entity GUID
+ *
+ * @return array|false
+ * @see set_private_setting()
+ * @see get_private_settings()
+ * @see remove_private_setting()
+ * @see remove_all_private_settings()
+ * @link http://docs.elgg.org/DataModel/Entities/PrivateSettings
+ */
+function get_all_private_settings($entity_guid) {
+	global $CONFIG;
+
+	$entity_guid = (int) $entity_guid;
+	$entity = get_entity($entity_guid);
+	if (!$entity instanceof ElggEntity) {
+		return false;
+	}
+
+	$query = "SELECT * from {$CONFIG->dbprefix}private_settings where entity_guid = {$entity_guid}";
+	$result = get_data($query);
+	if ($result) {
+		$return = array();
+		foreach ($result as $r) {
+			$return[$r->name] = $r->value;
+		}
+
+		return $return;
+	}
+
+	return false;
+}
+
+/**
+ * Sets a private setting for an entity.
+ *
+ * @param int    $entity_guid The entity GUID
+ * @param string $name        The name of the setting
+ * @param string $value       The value of the setting
+ *
+ * @return bool
+ * @see get_private_setting()
+ * @see get_all_private_settings()
+ * @see remove_private_setting()
+ * @see remove_all_private_settings()
+ * @link http://docs.elgg.org/DataModel/Entities/PrivateSettings
+ */
+function set_private_setting($entity_guid, $name, $value) {
+	global $CONFIG;
+
+	$entity_guid = (int) $entity_guid;
+	$name = sanitise_string($name);
+	$value = sanitise_string($value);
+
+	$result = insert_data("INSERT into {$CONFIG->dbprefix}private_settings
+		(entity_guid, name, value) VALUES
+		($entity_guid, '$name', '$value')
+		ON DUPLICATE KEY UPDATE value='$value'");
+
+	return $result !== false;
+}
+
+/**
+ * Deletes a private setting for an entity.
+ *
+ * @param int    $entity_guid The Entity GUID
+ * @param string $name        The name of the setting
+ *
+ * @return bool
+ * @see get_private_setting()
+ * @see get_all_private_settings()
+ * @see set_private_setting()
+ * @see remove_all_private_settings()
+ * @link http://docs.elgg.org/DataModel/Entities/PrivateSettings
+ */
+function remove_private_setting($entity_guid, $name) {
+	global $CONFIG;
+
+	$entity_guid = (int) $entity_guid;
+
+	$entity = get_entity($entity_guid);
+	if (!$entity instanceof ElggEntity) {
+		return false;
+	}
+
+	$name = sanitise_string($name);
+
+	return delete_data("DELETE from {$CONFIG->dbprefix}private_settings
+		WHERE name = '{$name}'
+		AND entity_guid = {$entity_guid}");
+}
+
+/**
+ * Deletes all private settings for an entity.
+ *
+ * @param int $entity_guid The Entity GUID
+ *
+ * @return bool
+ * @see get_private_setting()
+ * @see get_all_private_settings()
+ * @see set_private_setting()
+ * @see remove_private_settings()
+ * @link http://docs.elgg.org/DataModel/Entities/PrivateSettings
+ */
+function remove_all_private_settings($entity_guid) {
+	global $CONFIG;
+
+	$entity_guid = (int) $entity_guid;
+
+	$entity = get_entity($entity_guid);
+	if (!$entity instanceof ElggEntity) {
+		return false;
+	}
+
+	return delete_data("DELETE from {$CONFIG->dbprefix}private_settings
+		WHERE entity_guid = {$entity_guid}");
+}
diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
new file mode 100644
index 000000000..b0cd627fc
--- /dev/null
+++ b/engine/lib/relationships.php
@@ -0,0 +1,643 @@
+<?php
+/**
+ * Elgg relationships.
+ * Stub containing relationship functions, making import and export easier.
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Relationship
+ */
+
+/**
+ * Convert a database row to a new ElggRelationship
+ *
+ * @param stdClass $row Database row from the relationship table
+ *
+ * @return ElggRelationship|stdClass
+ * @access private
+ */
+function row_to_elggrelationship($row) {
+	if (!($row instanceof stdClass)) {
+		return $row;
+	}
+
+	return new ElggRelationship($row);
+}
+
+/**
+ * Return a relationship.
+ *
+ * @param int $id The ID of a relationship
+ *
+ * @return ElggRelationship|false
+ */
+function get_relationship($id) {
+	global $CONFIG;
+
+	$id = (int)$id;
+
+	$query = "SELECT * from {$CONFIG->dbprefix}entity_relationships where id=$id";
+	return row_to_elggrelationship(get_data_row($query));
+}
+
+/**
+ * Delete a specific relationship.
+ *
+ * @param int $id The relationship ID
+ *
+ * @return bool
+ */
+function delete_relationship($id) {
+	global $CONFIG;
+
+	$id = (int)$id;
+
+	$relationship = get_relationship($id);
+
+	if (elgg_trigger_event('delete', 'relationship', $relationship)) {
+		return delete_data("delete from {$CONFIG->dbprefix}entity_relationships where id=$id");
+	}
+
+	return FALSE;
+}
+
+/**
+ * Define an arbitrary relationship between two entities.
+ * This relationship could be a friendship, a group membership or a site membership.
+ *
+ * This function lets you make the statement "$guid_one is a $relationship of $guid_two".
+ *
+ * @param int    $guid_one     First GUID
+ * @param string $relationship Relationship name
+ * @param int    $guid_two     Second GUID
+ *
+ * @return bool
+ */
+function add_entity_relationship($guid_one, $relationship, $guid_two) {
+	global $CONFIG;
+
+	$guid_one = (int)$guid_one;
+	$relationship = sanitise_string($relationship);
+	$guid_two = (int)$guid_two;
+	$time = time();
+
+	// Check for duplicates
+	if (check_entity_relationship($guid_one, $relationship, $guid_two)) {
+		return false;
+	}
+
+	$result = insert_data("INSERT into {$CONFIG->dbprefix}entity_relationships
+		(guid_one, relationship, guid_two, time_created)
+		values ($guid_one, '$relationship', $guid_two, $time)");
+
+	if ($result !== false) {
+		$obj = get_relationship($result);
+		if (elgg_trigger_event('create', $relationship, $obj)) {
+			return true;
+		} else {
+			delete_relationship($result);
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Determine if a relationship between two entities exists
+ * and returns the relationship object if it does
+ *
+ * @param int    $guid_one     The GUID of the entity "owning" the relationship
+ * @param string $relationship The type of relationship
+ * @param int    $guid_two     The GUID of the entity the relationship is with
+ *
+ * @return ElggRelationship|false Depending on success
+ */
+function check_entity_relationship($guid_one, $relationship, $guid_two) {
+	global $CONFIG;
+
+	$guid_one = (int)$guid_one;
+	$relationship = sanitise_string($relationship);
+	$guid_two = (int)$guid_two;
+
+	$query = "SELECT * FROM {$CONFIG->dbprefix}entity_relationships
+		WHERE guid_one=$guid_one
+			AND relationship='$relationship'
+			AND guid_two=$guid_two limit 1";
+
+	$row = row_to_elggrelationship(get_data_row($query));
+	if ($row) {
+		return $row;
+	}
+
+	return false;
+}
+
+/**
+ * Remove an arbitrary relationship between two entities.
+ *
+ * @param int    $guid_one     First GUID
+ * @param string $relationship Relationship name
+ * @param int    $guid_two     Second GUID
+ *
+ * @return bool
+ */
+function remove_entity_relationship($guid_one, $relationship, $guid_two) {
+	global $CONFIG;
+
+	$guid_one = (int)$guid_one;
+	$relationship = sanitise_string($relationship);
+	$guid_two = (int)$guid_two;
+
+	$obj = check_entity_relationship($guid_one, $relationship, $guid_two);
+	if ($obj == false) {
+		return false;
+	}
+
+	if (elgg_trigger_event('delete', $relationship, $obj)) {
+		$query = "DELETE from {$CONFIG->dbprefix}entity_relationships
+			where guid_one=$guid_one
+			and relationship='$relationship'
+			and guid_two=$guid_two";
+
+		return (bool)delete_data($query);
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Removes all arbitrary relationships originating from a particular entity
+ *
+ * @param int    $guid_one     The GUID of the entity
+ * @param string $relationship The name of the relationship (optional)
+ * @param bool   $inverse      Whether we're deleting inverse relationships (default false)
+ * @param string $type         The type of entity to the delete to (defaults to all)
+ *
+ * @return bool Depending on success
+ */
+function remove_entity_relationships($guid_one, $relationship = "", $inverse = false, $type = '') {
+	global $CONFIG;
+
+	$guid_one = (int) $guid_one;
+
+	if (!empty($relationship)) {
+		$relationship = sanitise_string($relationship);
+		$where = "and er.relationship='$relationship'";
+	} else {
+		$where = "";
+	}
+
+	if (!empty($type)) {
+		$type = sanitise_string($type);
+		if (!$inverse) {
+			$join = " join {$CONFIG->dbprefix}entities e on e.guid = er.guid_two ";
+		} else {
+			$join = " join {$CONFIG->dbprefix}entities e on e.guid = er.guid_one ";
+			$where .= " and ";
+		}
+		$where .= " and e.type = '{$type}' ";
+	} else {
+		$join = "";
+	}
+
+	if (!$inverse) {
+		$sql = "DELETE er from {$CONFIG->dbprefix}entity_relationships as er
+			{$join}
+			where guid_one={$guid_one} {$where}";
+
+		return delete_data($sql);
+	} else {
+		$sql = "DELETE er from {$CONFIG->dbprefix}entity_relationships as er
+			{$join} where
+			guid_two={$guid_one} {$where}";
+
+		return delete_data($sql);
+	}
+}
+
+/**
+ * Get all the relationships for a given guid.
+ *
+ * @param int  $guid                 The GUID of the relationship owner
+ * @param bool $inverse_relationship Inverse relationship owners?
+ *
+ * @return ElggRelationship[]
+ */
+function get_entity_relationships($guid, $inverse_relationship = FALSE) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+
+	$where = ($inverse_relationship ? "guid_two='$guid'" : "guid_one='$guid'");
+
+	$query = "SELECT * from {$CONFIG->dbprefix}entity_relationships where {$where}";
+
+	return get_data($query, "row_to_elggrelationship");
+}
+
+/**
+ * Return entities matching a given query joining against a relationship.
+ * Also accepts all options available to elgg_get_entities() and
+ * elgg_get_entities_from_metadata().
+ *
+ * To ask for entities that do not have a particulat relationship to an entity,
+ * use a custom where clause like the following:
+ *
+ * 	$options['wheres'][] = "NOT EXISTS (
+ *			SELECT 1 FROM {$db_prefix}entity_relationships
+ *				WHERE guid_one = e.guid
+ *				AND relationship = '$relationship'
+ *		)";
+ *
+ * @see elgg_get_entities
+ * @see elgg_get_entities_from_metadata
+ *
+ * @param array $options Array in format:
+ *
+ * 	relationship => NULL|STR relationship
+ *
+ * 	relationship_guid => NULL|INT Guid of relationship to test
+ *
+ * 	inverse_relationship => BOOL Inverse the relationship
+ *
+ * @return ElggEntity[]|mixed If count, int. If not count, array. false on errors.
+ * @since 1.7.0
+ */
+function elgg_get_entities_from_relationship($options) {
+	$defaults = array(
+		'relationship' => NULL,
+		'relationship_guid' => NULL,
+		'inverse_relationship' => FALSE
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$clauses = elgg_get_entity_relationship_where_sql('e.guid', $options['relationship'],
+		$options['relationship_guid'], $options['inverse_relationship']);
+
+	if ($clauses) {
+		// merge wheres to pass to get_entities()
+		if (isset($options['wheres']) && !is_array($options['wheres'])) {
+			$options['wheres'] = array($options['wheres']);
+		} elseif (!isset($options['wheres'])) {
+			$options['wheres'] = array();
+		}
+
+		$options['wheres'] = array_merge($options['wheres'], $clauses['wheres']);
+
+		// merge joins to pass to get_entities()
+		if (isset($options['joins']) && !is_array($options['joins'])) {
+			$options['joins'] = array($options['joins']);
+		} elseif (!isset($options['joins'])) {
+			$options['joins'] = array();
+		}
+
+		$options['joins'] = array_merge($options['joins'], $clauses['joins']);
+
+		if (isset($options['selects']) && !is_array($options['selects'])) {
+			$options['selects'] = array($options['selects']);
+		} elseif (!isset($options['selects'])) {
+			$options['selects'] = array();
+		}
+
+		$select = array('r.id');
+
+		$options['selects'] = array_merge($options['selects'], $select);
+	}
+
+	return elgg_get_entities_from_metadata($options);
+}
+
+/**
+ * Returns sql appropriate for relationship joins and wheres
+ *
+ * @todo add support for multiple relationships and guids.
+ *
+ * @param string $column               Column name the guid should be checked against.
+ *                                     Provide in table.column format.
+ * @param string $relationship         Relationship string
+ * @param int    $relationship_guid    Entity guid to check
+ * @param bool $inverse_relationship Inverse relationship check?
+ *
+ * @return mixed
+ * @since 1.7.0
+ * @access private
+ */
+function elgg_get_entity_relationship_where_sql($column, $relationship = NULL,
+$relationship_guid = NULL, $inverse_relationship = FALSE) {
+
+	if ($relationship == NULL && $relationship_guid == NULL) {
+		return '';
+	}
+
+	global $CONFIG;
+
+	$wheres = array();
+	$joins = array();
+
+	if ($inverse_relationship) {
+		$joins[] = "JOIN {$CONFIG->dbprefix}entity_relationships r on r.guid_one = $column";
+	} else {
+		$joins[] = "JOIN {$CONFIG->dbprefix}entity_relationships r on r.guid_two = $column";
+	}
+
+	if ($relationship) {
+		$wheres[] = "r.relationship = '" . sanitise_string($relationship) . "'";
+	}
+
+	if ($relationship_guid) {
+		if ($inverse_relationship) {
+			$wheres[] = "r.guid_two = '$relationship_guid'";
+		} else {
+			$wheres[] = "r.guid_one = '$relationship_guid'";
+		}
+	}
+
+	if ($where_str = implode(' AND ', $wheres)) {
+
+		return array('wheres' => array("($where_str)"), 'joins' => $joins);
+	}
+
+	return '';
+}
+
+/**
+ * Returns a viewable list of entities by relationship
+ *
+ * @param array $options Options array for retrieval of entities
+ *
+ * @see elgg_list_entities()
+ * @see elgg_get_entities_from_relationship()
+ *
+ * @return string The viewable list of entities
+ */
+function elgg_list_entities_from_relationship(array $options = array()) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_relationship');
+}
+
+/**
+ * Gets the number of entities by a the number of entities related to them in a particular way.
+ * This is a good way to get out the users with the most friends, or the groups with the
+ * most members.
+ *
+ * @param array $options An options array compatible with
+ *                       elgg_get_entities_from_relationship()
+ * @return ElggEntity[]|mixed int If count, int. If not count, array. false on errors.
+ * @since 1.8.0
+ */
+function elgg_get_entities_from_relationship_count(array $options = array()) {
+	$options['selects'][] = "COUNT(e.guid) as total";
+	$options['group_by'] = 'r.guid_two';
+	$options['order_by'] = 'total desc';
+	return elgg_get_entities_from_relationship($options);
+}
+
+/**
+ * Returns a list of entities by relationship count
+ *
+ * @see elgg_get_entities_from_relationship_count()
+ *
+ * @param array $options Options array
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_list_entities_from_relationship_count($options) {
+	return elgg_list_entities($options, 'elgg_get_entities_from_relationship_count');
+}
+
+/**
+ * Sets the URL handler for a particular relationship type
+ *
+ * @param string $relationship_type The relationship type.
+ * @param string $function_name     The function to register
+ *
+ * @return bool Depending on success
+ */
+function elgg_register_relationship_url_handler($relationship_type, $function_name) {
+	global $CONFIG;
+
+	if (!is_callable($function_name, true)) {
+		return false;
+	}
+
+	if (!isset($CONFIG->relationship_url_handler)) {
+		$CONFIG->relationship_url_handler = array();
+	}
+
+	$CONFIG->relationship_url_handler[$relationship_type] = $function_name;
+
+	return true;
+}
+
+/**
+ * Get the url for a given relationship.
+ *
+ * @param int $id Relationship ID
+ *
+ * @return string
+ */
+function get_relationship_url($id) {
+	global $CONFIG;
+
+	$id = (int)$id;
+
+	if ($relationship = get_relationship($id)) {
+		$view = elgg_get_viewtype();
+
+		$guid = $relationship->guid_one;
+		$type = $relationship->relationship;
+
+		$url = "";
+
+		$function = "";
+		if (isset($CONFIG->relationship_url_handler[$type])) {
+			$function = $CONFIG->relationship_url_handler[$type];
+		}
+		if (isset($CONFIG->relationship_url_handler['all'])) {
+			$function = $CONFIG->relationship_url_handler['all'];
+		}
+
+		if (is_callable($function)) {
+			$url = call_user_func($function, $relationship);
+		}
+
+		if ($url == "") {
+			$nameid = $relationship->id;
+
+			$url = elgg_get_site_url()  . "export/$view/$guid/relationship/$nameid/";
+		}
+
+		return $url;
+	}
+
+	return false;
+}
+
+/**** HELPER FUNCTIONS FOR RELATIONSHIPS OF TYPE 'ATTACHED' ****/
+// @todo what is this?
+
+/**
+ * Function to determine if the object trying to attach to other, has already done so
+ *
+ * @param int $guid_one This is the target object
+ * @param int $guid_two This is the object trying to attach to $guid_one
+ *
+ * @return bool
+ * @access private
+ */
+function already_attached($guid_one, $guid_two) {
+	if ($attached = check_entity_relationship($guid_one, "attached", $guid_two)) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Function to get all objects attached to a particular object
+ *
+ * @param int    $guid Entity GUID
+ * @param string $type The type of object to return e.g. 'file', 'friend_of' etc
+ *
+ * @return ElggEntity[]
+ * @access private
+ */
+function get_attachments($guid, $type = "") {
+	$options = array(
+					'relationship' => 'attached',
+					'relationship_guid' => $guid,
+					'inverse_relationship' => false,
+					'type' => $type,
+					'subtypes' => '',
+					'owner_guid' => 0,
+					'order_by' => 'time_created desc',
+					'limit' => 10,
+					'offset' => 0,
+					'count' => false,
+					'site_guid' => 0
+				);
+	$attached = elgg_get_entities_from_relationship($options);
+	return $attached;
+}
+
+/**
+ * Function to remove a particular attachment between two objects
+ *
+ * @param int $guid_one This is the target object
+ * @param int $guid_two This is the object to remove from $guid_one
+ *
+ * @return void
+ * @access private
+ */
+function remove_attachment($guid_one, $guid_two) {
+	if (already_attached($guid_one, $guid_two)) {
+		remove_entity_relationship($guid_one, "attached", $guid_two);
+	}
+}
+
+/**
+ * Function to start the process of attaching one object to another
+ *
+ * @param int $guid_one This is the target object
+ * @param int $guid_two This is the object trying to attach to $guid_one
+ *
+ * @return true|void
+ * @access private
+ */
+function make_attachment($guid_one, $guid_two) {
+	if (!(already_attached($guid_one, $guid_two))) {
+		if (add_entity_relationship($guid_one, "attached", $guid_two)) {
+			return true;
+		}
+	}
+}
+
+/**
+ * Handler called by trigger_plugin_hook on the "import" event.
+ *
+ * @param string $hook        import
+ * @param string $entity_type all
+ * @param mixed  $returnvalue Value from previous hook
+ * @param mixed  $params      Array of params
+ *
+ * @return mixed
+ * @access private
+ */
+function import_relationship_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	$element = $params['element'];
+
+	$tmp = NULL;
+
+	if ($element instanceof ODDRelationship) {
+		$tmp = new ElggRelationship();
+		$tmp->import($element);
+	}
+	return $tmp;
+}
+
+/**
+ * Handler called by trigger_plugin_hook on the "export" event.
+ *
+ * @param string $hook        export
+ * @param string $entity_type all
+ * @param mixed  $returnvalue Previous hook return value
+ * @param array  $params      Parameters
+ *
+ * @elgg_event_handler export all
+ * @return mixed
+ * @throws InvalidParameterException
+ * @access private
+ */
+function export_relationship_plugin_hook($hook, $entity_type, $returnvalue, $params) {
+	// Sanity check values
+	if ((!is_array($params)) && (!isset($params['guid']))) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:GUIDNotForExport'));
+	}
+
+	if (!is_array($returnvalue)) {
+		throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonArrayReturnValue'));
+	}
+
+	$guid = (int)$params['guid'];
+
+	$result = get_entity_relationships($guid);
+
+	if ($result) {
+		foreach ($result as $r) {
+			$returnvalue[] = $r->export();
+		}
+	}
+
+	return $returnvalue;
+}
+
+/**
+ * Notify user that someone has friended them
+ *
+ * @param string $event  Event name
+ * @param string $type   Object type
+ * @param mixed  $object Object
+ *
+ * @return bool
+ * @access private
+ */
+function relationship_notification_hook($event, $type, $object) {
+	/* @var ElggRelationship $object */
+	$user_one = get_entity($object->guid_one);
+	/* @var ElggUser $user_one */
+
+	return notify_user($object->guid_two,
+			$object->guid_one,
+			elgg_echo('friend:newfriend:subject', array($user_one->name)),
+			elgg_echo("friend:newfriend:body", array($user_one->name, $user_one->getURL()))
+	);
+}
+
+// Register the import hook
+elgg_register_plugin_hook_handler("import", "all", "import_relationship_plugin_hook", 3);
+
+// Register the hook, ensuring entities are serialised first
+elgg_register_plugin_hook_handler("export", "all", "export_relationship_plugin_hook", 3);
+
+// Register event to listen to some events
+elgg_register_event_handler('create', 'friend', 'relationship_notification_hook');
diff --git a/engine/lib/river.php b/engine/lib/river.php
new file mode 100644
index 000000000..e92040eb7
--- /dev/null
+++ b/engine/lib/river.php
@@ -0,0 +1,703 @@
+<?php
+/**
+ * Elgg river.
+ * Activity stream functions.
+ *
+ * @package Elgg.Core
+ * @subpackage SocialModel.River
+ */
+
+/**
+ * Adds an item to the river.
+ *
+ * @param string $view          The view that will handle the river item (must exist)
+ * @param string $action_type   An arbitrary string to define the action (eg 'comment', 'create')
+ * @param int    $subject_guid  The GUID of the entity doing the action
+ * @param int    $object_guid   The GUID of the entity being acted upon
+ * @param int    $access_id     The access ID of the river item (default: same as the object)
+ * @param int    $posted        The UNIX epoch timestamp of the river item (default: now)
+ * @param int    $annotation_id The annotation ID associated with this river entry
+ *
+ * @return int/bool River ID or false on failure
+ */
+function add_to_river($view, $action_type, $subject_guid, $object_guid, $access_id = "",
+$posted = 0, $annotation_id = 0) {
+
+	global $CONFIG;
+
+	// use default viewtype for when called from web services api
+	if (!elgg_view_exists($view, 'default')) {
+		return false;
+	}
+	if (!($subject = get_entity($subject_guid))) {
+		return false;
+	}
+	if (!($object = get_entity($object_guid))) {
+		return false;
+	}
+	if (empty($action_type)) {
+		return false;
+	}
+	if ($posted == 0) {
+		$posted = time();
+	}
+	if ($access_id === "") {
+		$access_id = $object->access_id;
+	}
+	$type = $object->getType();
+	$subtype = $object->getSubtype();
+
+	$view = sanitise_string($view);
+	$action_type = sanitise_string($action_type);
+	$subject_guid = sanitise_int($subject_guid);
+	$object_guid = sanitise_int($object_guid);
+	$access_id = sanitise_int($access_id);
+	$posted = sanitise_int($posted);
+	$annotation_id = sanitise_int($annotation_id);
+
+	$values = array(
+		'type' => $type,
+		'subtype' => $subtype,
+		'action_type' => $action_type,
+		'access_id' => $access_id,
+		'view' => $view,
+		'subject_guid' => $subject_guid,
+		'object_guid' => $object_guid,
+		'annotation_id' => $annotation_id,
+		'posted' => $posted,
+	);
+
+	// return false to stop insert
+	$values = elgg_trigger_plugin_hook('creating', 'river', null, $values);
+	if ($values == false) {
+		// inserting did not fail - it was just prevented
+		return true;
+	}
+
+	extract($values);
+
+	// Attempt to save river item; return success status
+	$id = insert_data("insert into {$CONFIG->dbprefix}river " .
+		" set type = '$type', " .
+		" subtype = '$subtype', " .
+		" action_type = '$action_type', " .
+		" access_id = $access_id, " .
+		" view = '$view', " .
+		" subject_guid = $subject_guid, " .
+		" object_guid = $object_guid, " .
+		" annotation_id = $annotation_id, " .
+		" posted = $posted");
+
+	// update the entities which had the action carried out on it
+	// @todo shouldn't this be down elsewhere? Like when an annotation is saved?
+	if ($id) {
+		update_entity_last_action($object_guid, $posted);
+		
+		$river_items = elgg_get_river(array('id' => $id));
+		if ($river_items) {
+			elgg_trigger_event('created', 'river', $river_items[0]);
+		}
+		return $id;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Delete river items
+ *
+ * @warning not checking access (should we?)
+ *
+ * @param array $options Parameters:
+ *   ids                  => INT|ARR River item id(s)
+ *   subject_guids        => INT|ARR Subject guid(s)
+ *   object_guids         => INT|ARR Object guid(s)
+ *   annotation_ids       => INT|ARR The identifier of the annotation(s)
+ *   action_types         => STR|ARR The river action type(s) identifier
+ *   views                => STR|ARR River view(s)
+ *
+ *   types                => STR|ARR Entity type string(s)
+ *   subtypes             => STR|ARR Entity subtype string(s)
+ *   type_subtype_pairs   => ARR     Array of type => subtype pairs where subtype
+ *                                   can be an array of subtype strings
+ *
+ *   posted_time_lower    => INT     The lower bound on the time posted
+ *   posted_time_upper    => INT     The upper bound on the time posted
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_delete_river(array $options = array()) {
+	global $CONFIG;
+
+	$defaults = array(
+		'ids'                  => ELGG_ENTITIES_ANY_VALUE,
+
+		'subject_guids'	       => ELGG_ENTITIES_ANY_VALUE,
+		'object_guids'         => ELGG_ENTITIES_ANY_VALUE,
+		'annotation_ids'       => ELGG_ENTITIES_ANY_VALUE,
+
+		'views'                => ELGG_ENTITIES_ANY_VALUE,
+		'action_types'         => ELGG_ENTITIES_ANY_VALUE,
+
+		'types'	               => ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'             => ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'   => ELGG_ENTITIES_ANY_VALUE,
+
+		'posted_time_lower'	   => ELGG_ENTITIES_ANY_VALUE,
+		'posted_time_upper'	   => ELGG_ENTITIES_ANY_VALUE,
+
+		'wheres'               => array(),
+		'joins'                => array(),
+
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('id', 'subject_guid', 'object_guid', 'annotation_id', 'action_type', 'view', 'type', 'subtype');
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$wheres = $options['wheres'];
+
+	$wheres[] = elgg_get_guid_based_where_sql('rv.id', $options['ids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.subject_guid', $options['subject_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.object_guid', $options['object_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.annotation_id', $options['annotation_ids']);
+	$wheres[] = elgg_river_get_action_where_sql($options['action_types']);
+	$wheres[] = elgg_river_get_view_where_sql($options['views']);
+	$wheres[] = elgg_get_river_type_subtype_where_sql('rv', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+
+	if ($options['posted_time_lower'] && is_int($options['posted_time_lower'])) {
+		$wheres[] = "rv.posted >= {$options['posted_time_lower']}";
+	}
+
+	if ($options['posted_time_upper'] && is_int($options['posted_time_upper'])) {
+		$wheres[] = "rv.posted <= {$options['posted_time_upper']}";
+	}
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	$query = "DELETE rv.* FROM {$CONFIG->dbprefix}river rv ";
+
+	// remove identical join clauses
+	$joins = array_unique($options['joins']);
+	
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
+
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+	$query .= "1=1";
+
+	return delete_data($query);
+}
+
+/**
+ * Get river items
+ *
+ * @note If using types and subtypes in a query, they are joined with an AND.
+ *
+ * @param array $options Parameters:
+ *   ids                  => INT|ARR River item id(s)
+ *   subject_guids        => INT|ARR Subject guid(s)
+ *   object_guids         => INT|ARR Object guid(s)
+ *   annotation_ids       => INT|ARR The identifier of the annotation(s)
+ *   action_types         => STR|ARR The river action type(s) identifier
+ *   posted_time_lower    => INT     The lower bound on the time posted
+ *   posted_time_upper    => INT     The upper bound on the time posted
+ *
+ *   types                => STR|ARR Entity type string(s)
+ *   subtypes             => STR|ARR Entity subtype string(s)
+ *   type_subtype_pairs   => ARR     Array of type => subtype pairs where subtype
+ *                                   can be an array of subtype strings
+ *
+ *   relationship         => STR     Relationship identifier
+ *   relationship_guid    => INT|ARR Entity guid(s)
+ *   inverse_relationship => BOOL    Subject or object of the relationship (false)
+ *
+ * 	 limit                => INT     Number to show per page (20)
+ *   offset               => INT     Offset in list (0)
+ *   count                => BOOL    Count the river items? (false)
+ *   order_by             => STR     Order by clause (rv.posted desc)
+ *   group_by             => STR     Group by clause
+ *
+ * @return array|int
+ * @since 1.8.0
+ */
+function elgg_get_river(array $options = array()) {
+	global $CONFIG;
+
+	$defaults = array(
+		'ids'                  => ELGG_ENTITIES_ANY_VALUE,
+
+		'subject_guids'	       => ELGG_ENTITIES_ANY_VALUE,
+		'object_guids'         => ELGG_ENTITIES_ANY_VALUE,
+		'annotation_ids'       => ELGG_ENTITIES_ANY_VALUE,
+		'action_types'         => ELGG_ENTITIES_ANY_VALUE,
+
+		'relationship'         => NULL,
+		'relationship_guid'    => NULL,
+		'inverse_relationship' => FALSE,
+
+		'types'	               => ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'             => ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'   => ELGG_ENTITIES_ANY_VALUE,
+
+		'posted_time_lower'	   => ELGG_ENTITIES_ANY_VALUE,
+		'posted_time_upper'	   => ELGG_ENTITIES_ANY_VALUE,
+
+		'limit'                => 20,
+		'offset'               => 0,
+		'count'                => FALSE,
+
+		'order_by'             => 'rv.posted desc',
+		'group_by'             => ELGG_ENTITIES_ANY_VALUE,
+
+		'wheres'               => array(),
+		'joins'                => array(),
+	);
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('id', 'subject_guid', 'object_guid', 'annotation_id', 'action_type', 'type', 'subtype');
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$wheres = $options['wheres'];
+
+	$wheres[] = elgg_get_guid_based_where_sql('rv.id', $options['ids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.subject_guid', $options['subject_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.object_guid', $options['object_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('rv.annotation_id', $options['annotation_ids']);
+	$wheres[] = elgg_river_get_action_where_sql($options['action_types']);
+	$wheres[] = elgg_get_river_type_subtype_where_sql('rv', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+
+	if ($options['posted_time_lower'] && is_int($options['posted_time_lower'])) {
+		$wheres[] = "rv.posted >= {$options['posted_time_lower']}";
+	}
+
+	if ($options['posted_time_upper'] && is_int($options['posted_time_upper'])) {
+		$wheres[] = "rv.posted <= {$options['posted_time_upper']}";
+	}
+
+	$joins = $options['joins'];
+
+	if ($options['relationship_guid']) {
+		$clauses = elgg_get_entity_relationship_where_sql(
+				'rv.subject_guid',
+				$options['relationship'],
+				$options['relationship_guid'],
+				$options['inverse_relationship']);
+		if ($clauses) {
+			$wheres = array_merge($wheres, $clauses['wheres']);
+			$joins = array_merge($joins, $clauses['joins']);
+		}
+	}
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	if (!$options['count']) {
+		$query = "SELECT DISTINCT rv.* FROM {$CONFIG->dbprefix}river rv ";
+	} else {
+		$query = "SELECT count(DISTINCT rv.id) as total FROM {$CONFIG->dbprefix}river rv ";
+	}
+
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
+
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+
+	$query .= elgg_river_get_access_sql();
+
+	if (!$options['count']) {
+		$options['group_by'] = sanitise_string($options['group_by']);
+		if ($options['group_by']) {
+			$query .= " GROUP BY {$options['group_by']}";
+		}
+
+		$options['order_by'] = sanitise_string($options['order_by']);
+		$query .= " ORDER BY {$options['order_by']}";
+
+		if ($options['limit']) {
+			$limit = sanitise_int($options['limit']);
+			$offset = sanitise_int($options['offset'], false);
+			$query .= " LIMIT $offset, $limit";
+		}
+
+		$river_items = get_data($query, 'elgg_row_to_elgg_river_item');
+		_elgg_prefetch_river_entities($river_items);
+
+		return $river_items;
+	} else {
+		$total = get_data_row($query);
+		return (int)$total->total;
+	}
+}
+
+/**
+ * Prefetch entities that will be displayed in the river.
+ *
+ * @param ElggRiverItem[] $river_items
+ * @access private
+ */
+function _elgg_prefetch_river_entities(array $river_items) {
+	// prefetch objects and subjects
+	$guids = array();
+	foreach ($river_items as $item) {
+		if ($item->subject_guid && !_elgg_retrieve_cached_entity($item->subject_guid)) {
+			$guids[$item->subject_guid] = true;
+		}
+		if ($item->object_guid && !_elgg_retrieve_cached_entity($item->object_guid)) {
+			$guids[$item->object_guid] = true;
+		}
+	}
+	if ($guids) {
+		// avoid creating oversized query
+		// @todo how to better handle this?
+		$guids = array_slice($guids, 0, 300, true);
+		// return value unneeded, just priming cache
+		elgg_get_entities(array(
+			'guids' => array_keys($guids),
+			'limit' => 0,
+		));
+	}
+
+	// prefetch object containers
+	$guids = array();
+	foreach ($river_items as $item) {
+		$object = $item->getObjectEntity();
+		if ($object->container_guid && !_elgg_retrieve_cached_entity($object->container_guid)) {
+			$guids[$object->container_guid] = true;
+		}
+	}
+	if ($guids) {
+		$guids = array_slice($guids, 0, 300, true);
+		elgg_get_entities(array(
+			'guids' => array_keys($guids),
+			'limit' => 0,
+		));
+	}
+}
+
+/**
+ * List river items
+ *
+ * @param array $options Any options from elgg_get_river() plus:
+ * 	 pagination => BOOL Display pagination links (true)
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_list_river(array $options = array()) {
+	global $autofeed;
+	$autofeed = true;
+
+	$defaults = array(
+		'offset'     => (int) max(get_input('offset', 0), 0),
+		'limit'      => (int) max(get_input('limit', 20), 0),
+		'pagination' => TRUE,
+		'list_class' => 'elgg-list-river elgg-river', // @todo remove elgg-river in Elgg 1.9
+	);
+	
+	$options = array_merge($defaults, $options);
+	
+	if (!$options["limit"] && !$options["offset"]) {
+		// no need for pagination if listing is unlimited
+		$options["pagination"] = false;
+	}
+
+	$options['count'] = TRUE;
+	$count = elgg_get_river($options);
+
+	$options['count'] = FALSE;
+	$items = elgg_get_river($options);
+
+	$options['count'] = $count;
+	$options['items'] = $items;
+	
+	return elgg_view('page/components/list', $options);
+}
+
+/**
+ * Convert a database row to a new ElggRiverItem
+ *
+ * @param stdClass $row Database row from the river table
+ *
+ * @return ElggRiverItem
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_row_to_elgg_river_item($row) {
+	if (!($row instanceof stdClass)) {
+		return NULL;
+	}
+
+	return new ElggRiverItem($row);
+}
+
+/**
+ * Get the river's access where clause
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_river_get_access_sql() {
+	// rewrite default access where clause to work with river table
+	return str_replace("and enabled='yes'", '',
+		str_replace('owner_guid', 'rv.subject_guid',
+		str_replace('access_id', 'rv.access_id', get_access_sql_suffix())));
+}
+
+/**
+ * Returns SQL where clause for type and subtype on river table
+ *
+ * @internal This is a simplified version of elgg_get_entity_type_subtype_where_sql()
+ * which could be used for all queries once the subtypes have been denormalized.
+ *
+ * @param string     $table    'rv'
+ * @param NULL|array $types    Array of types or NULL if none.
+ * @param NULL|array $subtypes Array of subtypes or NULL if none
+ * @param NULL|array $pairs    Array of pairs of types and subtypes
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_river_type_subtype_where_sql($table, $types, $subtypes, $pairs) {
+	// short circuit if nothing is requested
+	if (!$types && !$subtypes && !$pairs) {
+		return '';
+	}
+
+	$wheres = array();
+	$types_wheres = array();
+	$subtypes_wheres = array();
+
+	// if no pairs, use types and subtypes
+	if (!is_array($pairs)) {
+		if ($types) {
+			if (!is_array($types)) {
+				$types = array($types);
+			}
+			foreach ($types as $type) {
+				$type = sanitise_string($type);
+				$types_wheres[] = "({$table}.type = '$type')";
+			}
+		}
+
+		if ($subtypes) {
+			if (!is_array($subtypes)) {
+				$subtypes = array($subtypes);
+			}
+			foreach ($subtypes as $subtype) {
+				$subtype = sanitise_string($subtype);
+				$subtypes_wheres[] = "({$table}.subtype = '$subtype')";
+			}
+		}
+
+		if (is_array($types_wheres) && count($types_wheres)) {
+			$types_wheres = array(implode(' OR ', $types_wheres));
+		}
+
+		if (is_array($subtypes_wheres) && count($subtypes_wheres)) {
+			$subtypes_wheres = array('(' . implode(' OR ', $subtypes_wheres) . ')');
+		}
+
+		$wheres = array(implode(' AND ', array_merge($types_wheres, $subtypes_wheres)));
+
+	} else {
+		// using type/subtype pairs
+		foreach ($pairs as $paired_type => $paired_subtypes) {
+			$paired_type = sanitise_string($paired_type);
+			if (is_array($paired_subtypes)) {
+				$paired_subtypes = array_map('sanitise_string', $paired_subtypes);
+				$paired_subtype_str = implode("','", $paired_subtypes);
+				if ($paired_subtype_str) {
+					$wheres[] = "({$table}.type = '$paired_type'"
+						. " AND {$table}.subtype IN ('$paired_subtype_str'))";
+				}
+			} else {
+				$paired_subtype = sanitise_string($paired_subtypes);
+				$wheres[] = "({$table}.type = '$paired_type'"
+					. " AND {$table}.subtype = '$paired_subtype')";
+			}
+		}
+	}
+
+	if (is_array($wheres) && count($wheres)) {
+		$where = implode(' OR ', $wheres);
+		return "($where)";
+	}
+
+	return '';
+}
+
+/**
+ * Get the where clause based on river action type strings
+ *
+ * @param array $types Array of action type strings
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_river_get_action_where_sql($types) {
+	if (!$types) {
+		return '';
+	}
+
+	if (!is_array($types)) {
+		$types = sanitise_string($types);
+		return "(rv.action_type = '$types')";
+	}
+
+	// sanitize types array
+	$types_sanitized = array();
+	foreach ($types as $type) {
+		$types_sanitized[] = sanitise_string($type);
+	}
+
+	$type_str = implode("','", $types_sanitized);
+	return "(rv.action_type IN ('$type_str'))";
+}
+
+/**
+ * Get the where clause based on river view strings
+ *
+ * @param array $views Array of view strings
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_river_get_view_where_sql($views) {
+	if (!$views) {
+		return '';
+	}
+
+	if (!is_array($views)) {
+		$views = sanitise_string($views);
+		return "(rv.view = '$views')";
+	}
+
+	// sanitize views array
+	$views_sanitized = array();
+	foreach ($views as $view) {
+		$views_sanitized[] = sanitise_string($view);
+	}
+
+	$view_str = implode("','", $views_sanitized);
+	return "(rv.view IN ('$view_str'))";
+}
+
+/**
+ * Sets the access ID on river items for a particular object
+ *
+ * @param int $object_guid The GUID of the entity
+ * @param int $access_id   The access ID
+ *
+ * @return bool Depending on success
+ */
+function update_river_access_by_object($object_guid, $access_id) {
+	// Sanitise
+	$object_guid = (int) $object_guid;
+	$access_id = (int) $access_id;
+
+	// Load config
+	global $CONFIG;
+
+	// Remove
+	$query = "update {$CONFIG->dbprefix}river
+		set access_id = {$access_id}
+		where object_guid = {$object_guid}";
+	return update_data($query);
+}
+
+/**
+ * Page handler for activity
+ *
+ * @param array $page
+ * @return bool
+ * @access private
+ */
+function elgg_river_page_handler($page) {
+	global $CONFIG;
+
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+
+	// make a URL segment available in page handler script
+	$page_type = elgg_extract(0, $page, 'all');
+	$page_type = preg_replace('[\W]', '', $page_type);
+	if ($page_type == 'owner') {
+		$page_type = 'mine';
+	}
+	set_input('page_type', $page_type);
+
+	require_once("{$CONFIG->path}pages/river.php");
+	return true;
+}
+
+/**
+ * Register river unit tests
+ * @access private
+ */
+function elgg_river_test($hook, $type, $value) {
+	global $CONFIG;
+	$value[] = $CONFIG->path . 'engine/tests/api/river.php';
+	return $value;
+}
+
+/**
+ * Initialize river library
+ * @access private
+ */
+function elgg_river_init() {
+	elgg_register_page_handler('activity', 'elgg_river_page_handler');
+	$item = new ElggMenuItem('activity', elgg_echo('activity'), 'activity');
+	elgg_register_menu_item('site', $item);
+	
+	elgg_register_widget_type('river_widget', elgg_echo('river:widget:title'), elgg_echo('river:widget:description'));
+
+	elgg_register_action('river/delete', '', 'admin');
+
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'elgg_river_test');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_river_init');
diff --git a/engine/lib/sessions.php b/engine/lib/sessions.php
new file mode 100644
index 000000000..e3d5ce9cd
--- /dev/null
+++ b/engine/lib/sessions.php
@@ -0,0 +1,656 @@
+<?php
+
+/**
+ * Elgg session management
+ * Functions to manage logins
+ *
+ * @package Elgg.Core
+ * @subpackage Session
+ */
+
+/** Elgg magic session */
+global $SESSION;
+
+/**
+ * Return the current logged in user, or NULL if no user is logged in.
+ *
+ * If no user can be found in the current session, a plugin
+ * hook - 'session:get' 'user' to give plugin authors another
+ * way to provide user details to the ACL system without touching the session.
+ *
+ * @return ElggUser
+ */
+function elgg_get_logged_in_user_entity() {
+	global $SESSION;
+
+	if (isset($SESSION)) {
+		return $SESSION['user'];
+	}
+
+	return NULL;
+}
+
+/**
+ * Return the current logged in user by id.
+ *
+ * @see elgg_get_logged_in_user_entity()
+ * @return int
+ */
+function elgg_get_logged_in_user_guid() {
+	$user = elgg_get_logged_in_user_entity();
+	if ($user) {
+		return $user->guid;
+	}
+
+	return 0;
+}
+
+/**
+ * Returns whether or not the user is currently logged in
+ *
+ * @return bool
+ */
+function elgg_is_logged_in() {
+	$user = elgg_get_logged_in_user_entity();
+
+	if ((isset($user)) && ($user instanceof ElggUser) && ($user->guid > 0)) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Returns whether or not the user is currently logged in and that they are an admin user.
+ *
+ * @return bool
+ */
+function elgg_is_admin_logged_in() {
+	$user = elgg_get_logged_in_user_entity();
+
+	if ((elgg_is_logged_in()) && $user->isAdmin()) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Check if the given user has full access.
+ *
+ * @todo: Will always return full access if the user is an admin.
+ *
+ * @param int $user_guid The user to check
+ *
+ * @return bool
+ * @since 1.7.1
+ */
+function elgg_is_admin_user($user_guid) {
+	global $CONFIG;
+
+	$user_guid = (int)$user_guid;
+
+	// cannot use magic metadata here because of recursion
+
+	// must support the old way of getting admin from metadata
+	// in order to run the upgrade to move it into the users table.
+	$version = (int) datalist_get('version');
+
+	if ($version < 2010040201) {
+		$admin = get_metastring_id('admin');
+		$yes = get_metastring_id('yes');
+		$one = get_metastring_id('1');
+
+		$query = "SELECT * FROM {$CONFIG->dbprefix}users_entity as e,
+			{$CONFIG->dbprefix}metadata as md
+			WHERE (
+				md.name_id = '$admin'
+				AND md.value_id IN ('$yes', '$one')
+				AND e.guid = md.entity_guid
+				AND e.guid = {$user_guid}
+				AND e.banned = 'no'
+			)";
+	} else {
+		$query = "SELECT * FROM {$CONFIG->dbprefix}users_entity as e
+			WHERE (
+				e.guid = {$user_guid}
+				AND e.admin = 'yes'
+			)";
+	}
+
+	// normalizing the results from get_data()
+	// See #1242
+	$info = get_data($query);
+	if (!((is_array($info) && count($info) < 1) || $info === FALSE)) {
+		return TRUE;
+	}
+	return FALSE;
+}
+
+/**
+ * Perform user authentication with a given username and password.
+ *
+ * @warning This returns an error message on failure. Use the identical operator to check
+ * for access: if (true === elgg_authenticate()) { ... }.
+ *
+ *
+ * @see login
+ *
+ * @param string $username The username
+ * @param string $password The password
+ *
+ * @return true|string True or an error message on failure
+ * @access private
+ */
+function elgg_authenticate($username, $password) {
+	$pam = new ElggPAM('user');
+	$credentials = array('username' => $username, 'password' => $password);
+	$result = $pam->authenticate($credentials);
+	if (!$result) {
+		return $pam->getFailureMessage();
+	}
+	return true;
+}
+
+/**
+ * Hook into the PAM system which accepts a username and password and attempts to authenticate
+ * it against a known user.
+ *
+ * @param array $credentials Associated array of credentials passed to
+ *                           Elgg's PAM system. This function expects
+ *                           'username' and 'password' (cleartext).
+ *
+ * @return bool
+ * @throws LoginException
+ * @access private
+ */
+function pam_auth_userpass(array $credentials = array()) {
+
+	if (!isset($credentials['username']) || !isset($credentials['password'])) {
+		return false;
+	}
+
+	$user = get_user_by_username($credentials['username']);
+	if (!$user) {
+		throw new LoginException(elgg_echo('LoginException:UsernameFailure'));
+	}
+
+	if (check_rate_limit_exceeded($user->guid)) {
+		throw new LoginException(elgg_echo('LoginException:AccountLocked'));
+	}
+
+	if ($user->password !== generate_user_password($user, $credentials['password'])) {
+		log_login_failure($user->guid);
+		throw new LoginException(elgg_echo('LoginException:PasswordFailure'));
+	}
+
+	return true;
+}
+
+/**
+ * Log a failed login for $user_guid
+ *
+ * @param int $user_guid User GUID
+ *
+ * @return bool
+ */
+function log_login_failure($user_guid) {
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+
+	if (($user_guid) && ($user) && ($user instanceof ElggUser)) {
+		$fails = (int)$user->getPrivateSetting("login_failures");
+		$fails++;
+
+		$user->setPrivateSetting("login_failures", $fails);
+		$user->setPrivateSetting("login_failure_$fails", time());
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Resets the fail login count for $user_guid
+ *
+ * @param int $user_guid User GUID
+ *
+ * @return bool true on success (success = user has no logged failed attempts)
+ */
+function reset_login_failure_count($user_guid) {
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+
+	if (($user_guid) && ($user) && ($user instanceof ElggUser)) {
+		$fails = (int)$user->getPrivateSetting("login_failures");
+
+		if ($fails) {
+			for ($n = 1; $n <= $fails; $n++) {
+				$user->removePrivateSetting("login_failure_$n");
+			}
+
+			$user->removePrivateSetting("login_failures");
+
+			return true;
+		}
+
+		// nothing to reset
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Checks if the rate limit of failed logins has been exceeded for $user_guid.
+ *
+ * @param int $user_guid User GUID
+ *
+ * @return bool on exceeded limit.
+ */
+function check_rate_limit_exceeded($user_guid) {
+	// 5 failures in 5 minutes causes temporary block on logins
+	$limit = 5;
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+
+	if (($user_guid) && ($user) && ($user instanceof ElggUser)) {
+		$fails = (int)$user->getPrivateSetting("login_failures");
+		if ($fails >= $limit) {
+			$cnt = 0;
+			$time = time();
+			for ($n = $fails; $n > 0; $n--) {
+				$f = $user->getPrivateSetting("login_failure_$n");
+				if ($f > $time - (60 * 5)) {
+					$cnt++;
+				}
+
+				if ($cnt == $limit) {
+					// Limit reached
+					return true;
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Logs in a specified ElggUser. For standard registration, use in conjunction
+ * with elgg_authenticate.
+ *
+ * @see elgg_authenticate
+ *
+ * @param ElggUser $user       A valid Elgg user object
+ * @param boolean  $persistent Should this be a persistent login?
+ *
+ * @return true or throws exception
+ * @throws LoginException
+ */
+function login(ElggUser $user, $persistent = false) {
+	// User is banned, return false.
+	if ($user->isBanned()) {
+		throw new LoginException(elgg_echo('LoginException:BannedUser'));
+	}
+
+	$_SESSION['user'] = $user;
+	$_SESSION['guid'] = $user->getGUID();
+	$_SESSION['id'] = $_SESSION['guid'];
+	$_SESSION['username'] = $user->username;
+	$_SESSION['name'] = $user->name;
+
+	// if remember me checked, set cookie with token and store token on user
+	if (($persistent)) {
+		$code = (md5($user->name . $user->username . time() . rand()));
+		$_SESSION['code'] = $code;
+		$user->code = md5($code);
+		setcookie("elggperm", $code, (time() + (86400 * 30)), "/");
+	}
+
+	if (!$user->save() || !elgg_trigger_event('login', 'user', $user)) {
+		unset($_SESSION['username']);
+		unset($_SESSION['name']);
+		unset($_SESSION['code']);
+		unset($_SESSION['guid']);
+		unset($_SESSION['id']);
+		unset($_SESSION['user']);
+		setcookie("elggperm", "", (time() - (86400 * 30)), "/");
+		throw new LoginException(elgg_echo('LoginException:Unknown'));
+	}
+
+	// Users privilege has been elevated, so change the session id (prevents session fixation)
+	session_regenerate_id();
+
+	// Update statistics
+	set_last_login($_SESSION['guid']);
+	reset_login_failure_count($user->guid); // Reset any previous failed login attempts
+
+	// if memcache is enabled, invalidate the user in memcache @see https://github.com/Elgg/Elgg/issues/3143
+	if (is_memcache_available()) {
+		// this needs to happen with a shutdown function because of the timing with set_last_login()
+		register_shutdown_function("_elgg_invalidate_memcache_for_entity", $_SESSION['guid']);
+	}
+	
+	return true;
+}
+
+/**
+ * Log the current user out
+ *
+ * @return bool
+ */
+function logout() {
+	if (isset($_SESSION['user'])) {
+		if (!elgg_trigger_event('logout', 'user', $_SESSION['user'])) {
+			return false;
+		}
+		$_SESSION['user']->code = "";
+		$_SESSION['user']->save();
+	}
+
+	unset($_SESSION['username']);
+	unset($_SESSION['name']);
+	unset($_SESSION['code']);
+	unset($_SESSION['guid']);
+	unset($_SESSION['id']);
+	unset($_SESSION['user']);
+
+	setcookie("elggperm", "", (time() - (86400 * 30)), "/");
+
+	// pass along any messages
+	$old_msg = $_SESSION['msg'];
+
+	session_destroy();
+
+	// starting a default session to store any post-logout messages.
+	_elgg_session_boot(NULL, NULL, NULL);
+	$_SESSION['msg'] = $old_msg;
+
+	return TRUE;
+}
+
+/**
+ * Initialises the system session and potentially logs the user in
+ *
+ * This function looks for:
+ *
+ * 1. $_SESSION['id'] - if not present, we're logged out, and this is set to 0
+ * 2. The cookie 'elggperm' - if present, checks it for an authentication
+ * token, validates it, and potentially logs the user in
+ *
+ * @uses $_SESSION
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_session_boot() {
+	global $DB_PREFIX, $CONFIG;
+
+	// Use database for sessions
+	// HACK to allow access to prefix after object destruction
+	$DB_PREFIX = $CONFIG->dbprefix;
+	if ((!isset($CONFIG->use_file_sessions))) {
+		session_set_save_handler("_elgg_session_open",
+			"_elgg_session_close",
+			"_elgg_session_read",
+			"_elgg_session_write",
+			"_elgg_session_destroy",
+			"_elgg_session_gc");
+	}
+
+	session_name('Elgg');
+	session_start();
+
+	// Generate a simple token (private from potentially public session id)
+	if (!isset($_SESSION['__elgg_session'])) {
+		$_SESSION['__elgg_session'] = md5(microtime() . rand());
+	}
+
+	// test whether we have a user session
+	if (empty($_SESSION['guid'])) {
+
+		// clear session variables before checking cookie
+		unset($_SESSION['user']);
+		unset($_SESSION['id']);
+		unset($_SESSION['guid']);
+		unset($_SESSION['code']);
+
+		// is there a remember me cookie
+		if (isset($_COOKIE['elggperm'])) {
+			// we have a cookie, so try to log the user in
+			$code = $_COOKIE['elggperm'];
+			$code = md5($code);
+			if ($user = get_user_by_code($code)) {
+				// we have a user, log him in
+				$_SESSION['user'] = $user;
+				$_SESSION['id'] = $user->getGUID();
+				$_SESSION['guid'] = $_SESSION['id'];
+				$_SESSION['code'] = $_COOKIE['elggperm'];
+			}
+		}
+	} else {
+		// we have a session and we have already checked the fingerprint
+		// reload the user object from database in case it has changed during the session
+		if ($user = get_user($_SESSION['guid'])) {
+			$_SESSION['user'] = $user;
+			$_SESSION['id'] = $user->getGUID();
+			$_SESSION['guid'] = $_SESSION['id'];
+		} else {
+			// user must have been deleted with a session active
+			unset($_SESSION['user']);
+			unset($_SESSION['id']);
+			unset($_SESSION['guid']);
+			unset($_SESSION['code']);
+		}
+	}
+
+	if (isset($_SESSION['guid'])) {
+		set_last_action($_SESSION['guid']);
+	}
+
+	elgg_register_action('login', '', 'public');
+	elgg_register_action('logout');
+
+	// Register a default PAM handler
+	register_pam_handler('pam_auth_userpass');
+
+	// Initialise the magic session
+	global $SESSION;
+	$SESSION = new ElggSession();
+
+	// Finally we ensure that a user who has been banned with an open session is kicked.
+	if ((isset($_SESSION['user'])) && ($_SESSION['user']->isBanned())) {
+		session_destroy();
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Used at the top of a page to mark it as logged in users only.
+ *
+ * @return void
+ */
+function gatekeeper() {
+	if (!elgg_is_logged_in()) {
+		$_SESSION['last_forward_from'] = current_page_url();
+		register_error(elgg_echo('loggedinrequired'));
+		forward('', 'login');
+	}
+}
+
+/**
+ * Used at the top of a page to mark it as logged in admin or siteadmin only.
+ *
+ * @return void
+ */
+function admin_gatekeeper() {
+	gatekeeper();
+
+	if (!elgg_is_admin_logged_in()) {
+		$_SESSION['last_forward_from'] = current_page_url();
+		register_error(elgg_echo('adminrequired'));
+		forward('', 'admin');
+	}
+}
+
+/**
+ * Handles opening a session in the DB
+ *
+ * @param string $save_path    The path to save the sessions
+ * @param string $session_name The name of the session
+ *
+ * @return true
+ * @todo Document
+ * @access private
+ */
+function _elgg_session_open($save_path, $session_name) {
+	global $sess_save_path;
+	$sess_save_path = $save_path;
+
+	return true;
+}
+
+/**
+ * Closes a session
+ *
+ * @todo implement
+ * @todo document
+ *
+ * @return true
+ * @access private
+ */
+function _elgg_session_close() {
+	return true;
+}
+
+/**
+ * Read the session data from DB failing back to file.
+ *
+ * @param string $id The session ID
+ *
+ * @return string
+ * @access private
+ */
+function _elgg_session_read($id) {
+	global $DB_PREFIX;
+
+	$id = sanitise_string($id);
+
+	try {
+		$result = get_data_row("SELECT * from {$DB_PREFIX}users_sessions where session='$id'");
+
+		if ($result) {
+			return (string)$result->data;
+		}
+
+	} catch (DatabaseException $e) {
+
+		// Fall back to file store in this case, since this likely means
+		// that the database hasn't been upgraded
+		global $sess_save_path;
+
+		$sess_file = "$sess_save_path/sess_$id";
+		return (string) @file_get_contents($sess_file);
+	}
+
+	return '';
+}
+
+/**
+ * Write session data to the DB falling back to file.
+ *
+ * @param string $id        The session ID
+ * @param mixed  $sess_data Session data
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_session_write($id, $sess_data) {
+	global $DB_PREFIX;
+
+	$id = sanitise_string($id);
+	$time = time();
+
+	try {
+		$sess_data_sanitised = sanitise_string($sess_data);
+
+		$q = "REPLACE INTO {$DB_PREFIX}users_sessions
+			(session, ts, data) VALUES
+			('$id', '$time', '$sess_data_sanitised')";
+
+		if (insert_data($q) !== false) {
+			return true;
+		}
+	} catch (DatabaseException $e) {
+		// Fall back to file store in this case, since this likely means
+		// that the database hasn't been upgraded
+		global $sess_save_path;
+
+		$sess_file = "$sess_save_path/sess_$id";
+		if ($fp = @fopen($sess_file, "w")) {
+			$return = fwrite($fp, $sess_data);
+			fclose($fp);
+			return $return;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Destroy a DB session, falling back to file.
+ *
+ * @param string $id Session ID
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_session_destroy($id) {
+	global $DB_PREFIX;
+
+	$id = sanitise_string($id);
+
+	try {
+		return (bool)delete_data("DELETE from {$DB_PREFIX}users_sessions where session='$id'");
+	} catch (DatabaseException $e) {
+		// Fall back to file store in this case, since this likely means that
+		// the database hasn't been upgraded
+		global $sess_save_path;
+
+		$sess_file = "$sess_save_path/sess_$id";
+		return @unlink($sess_file);
+	}
+}
+
+/**
+ * Perform garbage collection on session table / files
+ *
+ * @param int $maxlifetime Max age of a session
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_session_gc($maxlifetime) {
+	global $DB_PREFIX;
+
+	$life = time() - $maxlifetime;
+
+	try {
+		return (bool)delete_data("DELETE from {$DB_PREFIX}users_sessions where ts<'$life'");
+	} catch (DatabaseException $e) {
+		// Fall back to file store in this case, since this likely means that the database
+		// hasn't been upgraded
+		global $sess_save_path;
+
+		foreach (glob("$sess_save_path/sess_*") as $filename) {
+			if (filemtime($filename) < $life) {
+				@unlink($filename);
+			}
+		}
+	}
+
+	return true;
+}
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
new file mode 100644
index 000000000..3de0eccc2
--- /dev/null
+++ b/engine/lib/sites.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * Elgg sites
+ * Functions to manage multiple or single sites in an Elgg install
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.Site
+ */
+
+/**
+ * Get an ElggSite entity (default is current site)
+ *
+ * @param int $site_guid Optional. Site GUID.
+ *
+ * @return ElggSite
+ * @since 1.8.0
+ */
+function elgg_get_site_entity($site_guid = 0) {
+	global $CONFIG;
+
+	$result = false;
+	
+	if ($site_guid == 0) {
+		$site = $CONFIG->site;
+	} else {
+		$site = get_entity($site_guid);
+	}
+	
+	if ($site instanceof ElggSite) {
+		$result = $site;
+	}
+
+	return $result;
+}
+
+/**
+ * Return the site specific details of a site by a row.
+ *
+ * @param int $guid The site GUID
+ *
+ * @return mixed
+ * @access private
+ */
+function get_site_entity_as_row($guid) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}sites_entity where guid=$guid");
+}
+
+/**
+ * Create or update the entities table for a given site.
+ * Call create_entity first.
+ *
+ * @param int    $guid        Site GUID
+ * @param string $name        Site name
+ * @param string $description Site Description
+ * @param string $url         URL of the site
+ *
+ * @return bool
+ * @access private
+ */
+function create_site_entity($guid, $name, $description, $url) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	$name = sanitise_string($name);
+	$description = sanitise_string($description);
+	$url = sanitise_string($url);
+
+	$row = get_entity_as_row($guid);
+
+	if ($row) {
+		// Exists and you have access to it
+		$query = "SELECT guid from {$CONFIG->dbprefix}sites_entity where guid = {$guid}";
+		if ($exists = get_data_row($query)) {
+			$query = "UPDATE {$CONFIG->dbprefix}sites_entity
+				set name='$name', description='$description', url='$url' where guid=$guid";
+			$result = update_data($query);
+
+			if ($result != false) {
+				// Update succeeded, continue
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('update', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+					//delete_entity($guid);
+				}
+			}
+		} else {
+			// Update failed, attempt an insert.
+			$query = "INSERT into {$CONFIG->dbprefix}sites_entity
+				(guid, name, description, url) values ($guid, '$name', '$description', '$url')";
+			$result = insert_data($query);
+
+			if ($result !== false) {
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('create', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+					//delete_entity($guid);
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Add a user to a site.
+ *
+ * @param int $site_guid Site guid
+ * @param int $user_guid User guid
+ *
+ * @return bool
+ */
+function add_site_user($site_guid, $user_guid) {
+	$site_guid = (int)$site_guid;
+	$user_guid = (int)$user_guid;
+
+	return add_entity_relationship($user_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Remove a user from a site.
+ *
+ * @param int $site_guid Site GUID
+ * @param int $user_guid User GUID
+ *
+ * @return bool
+ */
+function remove_site_user($site_guid, $user_guid) {
+	$site_guid = (int)$site_guid;
+	$user_guid = (int)$user_guid;
+
+	return remove_entity_relationship($user_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Add an object to a site.
+ *
+ * @param int $site_guid   Site GUID
+ * @param int $object_guid Object GUID
+ *
+ * @return mixed
+ */
+function add_site_object($site_guid, $object_guid) {
+	$site_guid = (int)$site_guid;
+	$object_guid = (int)$object_guid;
+
+	return add_entity_relationship($object_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Remove an object from a site.
+ *
+ * @param int $site_guid   Site GUID
+ * @param int $object_guid Object GUID
+ *
+ * @return bool
+ */
+function remove_site_object($site_guid, $object_guid) {
+	$site_guid = (int)$site_guid;
+	$object_guid = (int)$object_guid;
+
+	return remove_entity_relationship($object_guid, "member_of_site", $site_guid);
+}
+
+/**
+ * Get the objects belonging to a site.
+ *
+ * @param int    $site_guid Site GUID
+ * @param string $subtype   Subtype
+ * @param int    $limit     Limit
+ * @param int    $offset    Offset
+ *
+ * @return mixed
+ */
+function get_site_objects($site_guid, $subtype = "", $limit = 10, $offset = 0) {
+	$site_guid = (int)$site_guid;
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'member_of_site',
+		'relationship_guid' => $site_guid,
+		'inverse_relationship' => TRUE,
+		'type' => 'object',
+		'subtype' => $subtype,
+		'limit' => $limit,
+		'offset' => $offset
+	));
+}
+
+/**
+ * Return the site via a url.
+ *
+ * @param string $url The URL of a site
+ *
+ * @return mixed
+ */
+function get_site_by_url($url) {
+	global $CONFIG;
+
+	$url = sanitise_string($url);
+
+	$row = get_data_row("SELECT * from {$CONFIG->dbprefix}sites_entity where url='$url'");
+
+	if ($row) {
+		return get_entity($row->guid);
+	}
+
+	return false;
+}
+
+/**
+ * Retrieve a site and return the domain portion of its url.
+ *
+ * @param int $guid ElggSite GUID
+ *
+ * @return string
+ */
+function get_site_domain($guid) {
+	$guid = (int)$guid;
+
+	$site = get_entity($guid);
+	if ($site instanceof ElggSite) {
+		$breakdown = parse_url($site->url);
+		return $breakdown['host'];
+	}
+
+	return false;
+}
+
+/**
+ * Unit tests for sites
+ *
+ * @param string $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function sites_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = "{$CONFIG->path}engine/tests/objects/sites.php";
+	return $value;
+}
+
+// Register with unit test
+elgg_register_plugin_hook_handler('unit_test', 'system', 'sites_test');
diff --git a/engine/lib/statistics.php b/engine/lib/statistics.php
new file mode 100644
index 000000000..4cb0bb0b8
--- /dev/null
+++ b/engine/lib/statistics.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * Elgg statistics library.
+ *
+ * This file contains a number of functions for obtaining statistics about the running system.
+ * These statistics are mainly used by the administration pages, and is also where the basic
+ * views for statistics are added.
+ *
+ * @package Elgg.Core
+ * @subpackage Statistics
+ */
+
+/**
+ * Return an array reporting the number of various entities in the system.
+ *
+ * @param int $owner_guid Optional owner of the statistics
+ *
+ * @return array
+ */
+function get_entity_statistics($owner_guid = 0) {
+	global $CONFIG;
+
+	$entity_stats = array();
+	$owner_guid = (int)$owner_guid;
+
+	$query = "SELECT distinct e.type,s.subtype,e.subtype as subtype_id
+		from {$CONFIG->dbprefix}entities e left
+		join {$CONFIG->dbprefix}entity_subtypes s on e.subtype=s.id";
+
+	$owner_query = "";
+	if ($owner_guid) {
+		$query .= " where owner_guid=$owner_guid";
+		$owner_query = "and owner_guid=$owner_guid ";
+	}
+
+	// Get a list of major types
+
+	$types = get_data($query);
+	foreach ($types as $type) {
+		// assume there are subtypes for now
+		if (!is_array($entity_stats[$type->type])) {
+			$entity_stats[$type->type] = array();
+		}
+
+		$query = "SELECT count(*) as count
+			from {$CONFIG->dbprefix}entities where type='{$type->type}' $owner_query";
+
+		if ($type->subtype) {
+			$query .= " and subtype={$type->subtype_id}";
+		}
+
+		$subtype_cnt = get_data_row($query);
+
+		if ($type->subtype) {
+			$entity_stats[$type->type][$type->subtype] = $subtype_cnt->count;
+		} else {
+			$entity_stats[$type->type]['__base__'] = $subtype_cnt->count;
+		}
+	}
+
+	return $entity_stats;
+}
+
+/**
+ * Return the number of users registered in the system.
+ *
+ * @param bool $show_deactivated Count not enabled users?
+ *
+ * @return int
+ */
+function get_number_users($show_deactivated = false) {
+	global $CONFIG;
+
+	$access = "";
+
+	if (!$show_deactivated) {
+		$access = "and " . get_access_sql_suffix();
+	}
+
+	$query = "SELECT count(*) as count
+		from {$CONFIG->dbprefix}entities where type='user' $access";
+
+	$result = get_data_row($query);
+
+	if ($result) {
+		return $result->count;
+	}
+
+	return false;
+}
+
+/**
+ * Return a list of how many users are currently online, rendered as a view.
+ *
+ * @return string
+  */
+function get_online_users() {
+	$limit = max(0, (int) get_input("limit", 10));
+	$offset = max(0, (int) get_input("offset", 0));
+	
+	$count = find_active_users(600, $limit, $offset, true);
+	$objects = find_active_users(600, $limit, $offset);
+
+	if ($objects) {
+		return elgg_view_entity_list($objects, array(
+			'count' => $count,
+			'limit' => $limit,
+			'offset' => $offset
+		));
+	}
+	return '';
+}
+
+/**
+ * Initialise the statistics admin page.
+ *
+ * @return void
+ * @access private
+ */
+function statistics_init() {
+	elgg_extend_view('core/settings/statistics', 'core/settings/statistics/online');
+	elgg_extend_view('core/settings/statistics', 'core/settings/statistics/numentities');
+}
+
+/// Register init function
+elgg_register_event_handler('init', 'system', 'statistics_init');
diff --git a/engine/lib/system_log.php b/engine/lib/system_log.php
new file mode 100644
index 000000000..84302632e
--- /dev/null
+++ b/engine/lib/system_log.php
@@ -0,0 +1,311 @@
+<?php
+/**
+ * Elgg system log.
+ * Listens to events and writes crud events into the system log database.
+ *
+ * @package Elgg.Core
+ * @subpackage Logging
+ */
+
+/**
+ * Retrieve the system log based on a number of parameters.
+ *
+ * @todo too many args, and the first arg is too confusing
+ *
+ * @param int|array $by_user    The guid(s) of the user(s) who initiated the event.
+ *                              Use 0 for unowned entries. Anything else falsey means anyone.
+ * @param string    $event      The event you are searching on.
+ * @param string    $class      The class of object it effects.
+ * @param string    $type       The type
+ * @param string    $subtype    The subtype.
+ * @param int       $limit      Maximum number of responses to return.
+ * @param int       $offset     Offset of where to start.
+ * @param bool      $count      Return count or not
+ * @param int       $timebefore Lower time limit
+ * @param int       $timeafter  Upper time limit
+ * @param int       $object_id  GUID of an object
+ * @param string    $ip_address The IP address.
+ * @return mixed
+ */
+function get_system_log($by_user = "", $event = "", $class = "", $type = "", $subtype = "", $limit = 10,
+						$offset = 0, $count = false, $timebefore = 0, $timeafter = 0, $object_id = 0,
+						$ip_address = "") {
+
+	global $CONFIG;
+
+	$by_user_orig = $by_user;
+	if (is_array($by_user) && sizeof($by_user) > 0) {
+		foreach ($by_user as $key => $val) {
+			$by_user[$key] = (int) $val;
+		}
+	} else {
+		$by_user = (int)$by_user;
+	}
+	
+	$event = sanitise_string($event);
+	$class = sanitise_string($class);
+	$type = sanitise_string($type);
+	$subtype = sanitise_string($subtype);
+	$ip_address = sanitise_string($ip_address);
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	$where = array();
+
+	if ($by_user_orig !== "" && $by_user_orig !== false && $by_user_orig !== null) {
+		if (is_int($by_user)) {
+			$where[] = "performed_by_guid=$by_user";
+		} else if (is_array($by_user)) {
+			$where [] = "performed_by_guid in (" . implode(",", $by_user) . ")";
+		}
+	}
+	if ($event != "") {
+		$where[] = "event='$event'";
+	}
+	if ($class !== "") {
+		$where[] = "object_class='$class'";
+	}
+	if ($type != "") {
+		$where[] = "object_type='$type'";
+	}
+	if ($subtype !== "") {
+		$where[] = "object_subtype='$subtype'";
+	}
+
+	if ($timebefore) {
+		$where[] = "time_created < " . ((int) $timebefore);
+	}
+	if ($timeafter) {
+		$where[] = "time_created > " . ((int) $timeafter);
+	}
+	if ($object_id) {
+		$where[] = "object_id = " . ((int) $object_id);
+	}
+	if ($ip_address) {
+		$where[] = "ip_address = '$ip_address'";
+	}
+
+	$select = "*";
+	if ($count) {
+		$select = "count(*) as count";
+	}
+	$query = "SELECT $select from {$CONFIG->dbprefix}system_log where 1 ";
+	foreach ($where as $w) {
+		$query .= " and $w";
+	}
+
+	if (!$count) {
+		$query .= " order by time_created desc";
+		$query .= " limit $offset, $limit"; // Add order and limit
+	}
+
+	if ($count) {
+		$numrows = get_data_row($query);
+		if ($numrows) {
+			return $numrows->count;
+		}
+	} else {
+		return get_data($query);
+	}
+
+	return false;
+}
+
+/**
+ * Return a specific log entry.
+ *
+ * @param int $entry_id The log entry
+ *
+ * @return mixed
+ */
+function get_log_entry($entry_id) {
+	global $CONFIG;
+
+	$entry_id = (int)$entry_id;
+
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}system_log where id=$entry_id");
+}
+
+/**
+ * Return the object referred to by a given log entry
+ *
+ * @param int $entry_id The log entry
+ *
+ * @return mixed
+ */
+function get_object_from_log_entry($entry_id) {
+	$entry = get_log_entry($entry_id);
+
+	if ($entry) {
+		$class = $entry->object_class;
+		// surround with try/catch because object could be disabled
+		try {
+			$object = new $class($entry->object_id);
+		} catch (Exception $e) {
+			
+		}
+		if ($object) {
+			return $object;
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Log a system event related to a specific object.
+ *
+ * This is called by the event system and should not be called directly.
+ *
+ * @param object $object The object you're talking about.
+ * @param string $event  The event being logged
+ * @return void
+ */
+function system_log($object, $event) {
+	global $CONFIG;
+	static $log_cache;
+	static $cache_size = 0;
+
+	if ($object instanceof Loggable) {
+
+		/* @var ElggEntity|ElggExtender $object */
+		if (datalist_get('version') < 2012012000) {
+			// this is a site that doesn't have the ip_address column yet
+			return;
+		}
+
+		// reset cache if it has grown too large
+		if (!is_array($log_cache) || $cache_size > 500) {
+			$log_cache = array();
+			$cache_size = 0;
+		}
+
+		// Has loggable interface, extract the necessary information and store
+		$object_id = (int)$object->getSystemLogID();
+		$object_class = $object->getClassName();
+		$object_type = $object->getType();
+		$object_subtype = $object->getSubtype();
+		$event = sanitise_string($event);
+		$time = time();
+
+		if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$ip_address = array_pop(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR']));
+		} elseif (!empty($_SERVER['HTTP_X_REAL_IP'])) {
+			$ip_address = array_pop(explode(',', $_SERVER['HTTP_X_REAL_IP']));
+		} else {
+			$ip_address = $_SERVER['REMOTE_ADDR'];
+		}
+		$ip_address = sanitise_string($ip_address);
+
+		$performed_by = elgg_get_logged_in_user_guid();
+
+		if (isset($object->access_id)) {
+			$access_id = $object->access_id;
+		} else {
+			$access_id = ACCESS_PUBLIC;
+		}
+		if (isset($object->enabled)) {
+			$enabled = $object->enabled;
+		} else {
+			$enabled = 'yes';
+		}
+
+		if (isset($object->owner_guid)) {
+			$owner_guid = $object->owner_guid;
+		} else {
+			$owner_guid = 0;
+		}
+
+		// Create log if we haven't already created it
+		if (!isset($log_cache[$time][$object_id][$event])) {
+			$query = "INSERT DELAYED into {$CONFIG->dbprefix}system_log
+				(object_id, object_class, object_type, object_subtype, event,
+				performed_by_guid, owner_guid, access_id, enabled, time_created, ip_address)
+			VALUES
+				('$object_id','$object_class','$object_type', '$object_subtype', '$event',
+				$performed_by, $owner_guid, $access_id, '$enabled', '$time', '$ip_address')";
+
+			insert_data($query);
+
+			$log_cache[$time][$object_id][$event] = true;
+			$cache_size += 1;
+		}
+	}
+}
+
+/**
+ * This function creates an archive copy of the system log.
+ *
+ * @param int $offset An offset in seconds from now to archive (useful for log rotation)
+ *
+ * @return bool
+ */
+function archive_log($offset = 0) {
+	global $CONFIG;
+
+	$offset = (int)$offset;
+	$now = time(); // Take a snapshot of now
+
+	$ts = $now - $offset;
+
+	// create table
+	$query = "CREATE TABLE {$CONFIG->dbprefix}system_log_$now as
+		SELECT * from {$CONFIG->dbprefix}system_log WHERE time_created<$ts";
+
+	if (!update_data($query)) {
+		return false;
+	}
+
+	// delete
+	// Don't delete on time since we are running in a concurrent environment
+	if (delete_data("DELETE from {$CONFIG->dbprefix}system_log WHERE time_created<$ts") === false) {
+		return false;
+	}
+
+	// alter table to engine
+	if (!update_data("ALTER TABLE {$CONFIG->dbprefix}system_log_$now engine=archive")) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Default system log handler, allows plugins to override, extend or disable logging.
+ *
+ * @param string   $event       Event name
+ * @param string   $object_type Object type
+ * @param Loggable $object      Object to log
+ *
+ * @return true
+ */
+function system_log_default_logger($event, $object_type, $object) {
+	system_log($object['object'], $object['event']);
+
+	return true;
+}
+
+/**
+ * System log listener.
+ * This function listens to all events in the system and logs anything appropriate.
+ *
+ * @param String   $event       Event name
+ * @param String   $object_type Type of object
+ * @param Loggable $object      Object to log
+ *
+ * @return true
+ * @access private
+ */
+function system_log_listener($event, $object_type, $object) {
+	if (($object_type != 'systemlog') && ($event != 'log')) {
+		elgg_trigger_event('log', 'systemlog', array('object' => $object, 'event' => $event));
+	}
+
+	return true;
+}
+
+/** Register event to listen to all events **/
+elgg_register_event_handler('all', 'all', 'system_log_listener', 400);
+
+/** Register a default system log handler */
+elgg_register_event_handler('log', 'systemlog', 'system_log_default_logger', 999);
diff --git a/engine/lib/tags.php b/engine/lib/tags.php
new file mode 100644
index 000000000..586a9b9e4
--- /dev/null
+++ b/engine/lib/tags.php
@@ -0,0 +1,354 @@
+<?php
+/**
+ * Elgg tags
+ * Functions for managing tags and tag clouds.
+ *
+ * @package Elgg.Core
+ * @subpackage Tags
+ */
+
+/**
+ * The algorithm working out the size of font based on the number of tags.
+ * This is quick and dirty.
+ *
+ * @param int $min            Min size
+ * @param int $max            Max size
+ * @param int $number_of_tags The number of tags
+ * @param int $buckets        The number of buckets
+ *
+ * @return int
+ * @access private
+ */
+function calculate_tag_size($min, $max, $number_of_tags, $buckets = 6) {
+	$delta = (($max - $min) / $buckets);
+	$thresholds = array();
+
+	for ($n = 1; $n <= $buckets; $n++) {
+		$thresholds[$n - 1] = ($min + $n) * $delta;
+	}
+
+	// Correction
+	if ($thresholds[$buckets - 1] > $max) {
+		$thresholds[$buckets - 1] = $max;
+	}
+
+	$size = 0;
+	for ($n = 0; $n < count($thresholds); $n++) {
+		if ($number_of_tags >= $thresholds[$n]) {
+			$size = $n;
+		}
+	}
+
+	return $size;
+}
+
+/**
+ * This function generates an array of tags with a weighting.
+ *
+ * @param array $tags    The array of tags.
+ * @param int   $buckets The number of buckets
+ *
+ * @return array An associated array of tags with a weighting, this can then be mapped to a display class.
+ * @access private
+ */
+function generate_tag_cloud(array $tags, $buckets = 6) {
+	$cloud = array();
+
+	$min = 65535;
+	$max = 0;
+
+	foreach ($tags as $tag) {
+		$cloud[$tag]++;
+
+		if ($cloud[$tag] > $max) {
+			$max = $cloud[$tag];
+		}
+
+		if ($cloud[$tag] < $min) {
+			$min = $cloud[$tag];
+		}
+	}
+
+	foreach ($cloud as $k => $v) {
+		$cloud[$k] = calculate_tag_size($min, $max, $v, $buckets);
+	}
+
+	return $cloud;
+}
+
+/**
+ * Get popular tags and their frequencies
+ *
+ * Supports similar arguments as elgg_get_entities()
+ *
+ * @param array $options Array in format:
+ *
+ * 	threshold => INT minimum tag count
+ *
+ * 	tag_names => array() metadata tag names - must be registered tags
+ *
+ * 	limit => INT number of tags to return
+ *
+ *  types => NULL|STR entity type (SQL: type = '$type')
+ *
+ * 	subtypes => NULL|STR entity subtype (SQL: subtype = '$subtype')
+ *
+ * 	type_subtype_pairs => NULL|ARR (array('type' => 'subtype'))
+ *  (SQL: type = '$type' AND subtype = '$subtype') pairs
+ *
+ * 	owner_guids => NULL|INT entity guid
+ *
+ * 	container_guids => NULL|INT container_guid
+ *
+ * 	site_guids => NULL (current_site)|INT site_guid
+ *
+ * 	created_time_lower => NULL|INT Created time lower boundary in epoch time
+ *
+ * 	created_time_upper => NULL|INT Created time upper boundary in epoch time
+ *
+ * 	modified_time_lower => NULL|INT Modified time lower boundary in epoch time
+ *
+ * 	modified_time_upper => NULL|INT Modified time upper boundary in epoch time
+ *
+ * 	wheres => array() Additional where clauses to AND together
+ *
+ * 	joins => array() Additional joins
+ *
+ * @return 	object[]|false If no tags or error, false
+ * 						   otherwise, array of objects with ->tag and ->total values
+ * @since 1.7.1
+ */
+function elgg_get_tags(array $options = array()) {
+	global $CONFIG;
+
+	$defaults = array(
+		'threshold'				=>	1,
+		'tag_names'				=>	array(),
+		'limit'					=>	10,
+
+		'types'					=>	ELGG_ENTITIES_ANY_VALUE,
+		'subtypes'				=>	ELGG_ENTITIES_ANY_VALUE,
+		'type_subtype_pairs'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'owner_guids'			=>	ELGG_ENTITIES_ANY_VALUE,
+		'container_guids'		=>	ELGG_ENTITIES_ANY_VALUE,
+		'site_guids'			=>	$CONFIG->site_guid,
+
+		'modified_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'modified_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_lower'	=>	ELGG_ENTITIES_ANY_VALUE,
+		'created_time_upper'	=>	ELGG_ENTITIES_ANY_VALUE,
+
+		'joins'					=>	array(),
+		'wheres'				=>	array(),
+	);
+
+
+	$options = array_merge($defaults, $options);
+
+	$singulars = array('type', 'subtype', 'owner_guid', 'container_guid', 'site_guid', 'tag_name');
+	$options = elgg_normalise_plural_options_array($options, $singulars);
+
+	$registered_tags = elgg_get_registered_tag_metadata_names();
+
+	if (!is_array($options['tag_names'])) {
+		return false;
+	}
+
+	// empty array so use all registered tag names
+	if (count($options['tag_names']) == 0) {
+		$options['tag_names'] = $registered_tags;
+	}
+
+	$diff = array_diff($options['tag_names'], $registered_tags);
+	if (count($diff) > 0) {
+		elgg_deprecated_notice('Tag metadata names must be registered by elgg_register_tag_metadata_name()', 1.7);
+		// return false;
+	}
+
+
+	$wheres = $options['wheres'];
+
+	// catch for tags that were spaces
+	$wheres[] = "msv.string != ''";
+
+	$sanitised_tags = array();
+	foreach ($options['tag_names'] as $tag) {
+		$sanitised_tags[] = '"' . sanitise_string($tag) . '"';
+	}
+	$tags_in = implode(',', $sanitised_tags);
+	$wheres[] = "(msn.string IN ($tags_in))";
+
+	$wheres[] = elgg_get_entity_type_subtype_where_sql('e', $options['types'],
+		$options['subtypes'], $options['type_subtype_pairs']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.site_guid', $options['site_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.owner_guid', $options['owner_guids']);
+	$wheres[] = elgg_get_guid_based_where_sql('e.container_guid', $options['container_guids']);
+	$wheres[] = elgg_get_entity_time_where_sql('e', $options['created_time_upper'],
+		$options['created_time_lower'], $options['modified_time_upper'], $options['modified_time_lower']);
+
+	// see if any functions failed
+	// remove empty strings on successful functions
+	foreach ($wheres as $i => $where) {
+		if ($where === FALSE) {
+			return FALSE;
+		} elseif (empty($where)) {
+			unset($wheres[$i]);
+		}
+	}
+
+	// remove identical where clauses
+	$wheres = array_unique($wheres);
+
+	$joins = $options['joins'];
+
+	$joins[] = "JOIN {$CONFIG->dbprefix}metadata md on md.entity_guid = e.guid";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings msv on msv.id = md.value_id";
+	$joins[] = "JOIN {$CONFIG->dbprefix}metastrings msn on md.name_id = msn.id";
+
+	// remove identical join clauses
+	$joins = array_unique($joins);
+
+	foreach ($joins as $i => $join) {
+		if ($join === FALSE) {
+			return FALSE;
+		} elseif (empty($join)) {
+			unset($joins[$i]);
+		}
+	}
+
+
+	$query  = "SELECT msv.string as tag, count(msv.id) as total ";
+	$query .= "FROM {$CONFIG->dbprefix}entities e ";
+
+	// add joins
+	foreach ($joins as $j) {
+		$query .= " $j ";
+	}
+
+	// add wheres
+	$query .= ' WHERE ';
+
+	foreach ($wheres as $w) {
+		$query .= " $w AND ";
+	}
+
+	// Add access controls
+	$query .= get_access_sql_suffix('e');
+
+	$threshold = sanitise_int($options['threshold']);
+	$query .= " GROUP BY msv.string HAVING total >= {$threshold} ";
+	$query .= " ORDER BY total DESC ";
+
+	$limit = sanitise_int($options['limit']);
+	$query .= " LIMIT {$limit} ";
+
+	return get_data($query);
+}
+
+/**
+ * Returns viewable tagcloud
+ *
+ * @see elgg_get_tags
+ *
+ * @param array $options Any elgg_get_tags() options except:
+ *
+ * 	type => must be single entity type
+ *
+ * 	subtype => must be single entity subtype
+ *
+ * @return string
+ * @since 1.7.1
+ */
+function elgg_view_tagcloud(array $options = array()) {
+
+	$type = $subtype = '';
+	if (isset($options['type'])) {
+		$type = $options['type'];
+	}
+	if (isset($options['subtype'])) {
+		$subtype = $options['subtype'];
+	}
+
+	$tag_data = elgg_get_tags($options);
+	return elgg_view("output/tagcloud", array(
+		'value' => $tag_data,
+		'type' => $type,
+		'subtype' => $subtype,
+	));
+}
+
+/**
+ * Registers a metadata name as containing tags for an entity.
+ * This is required if you are using a non-standard metadata name
+ * for your tags.
+ *
+ * @param string $name Tag name
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function elgg_register_tag_metadata_name($name) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->registered_tag_metadata_names)) {
+		$CONFIG->registered_tag_metadata_names = array();
+	}
+
+	if (!in_array($name, $CONFIG->registered_tag_metadata_names)) {
+		$CONFIG->registered_tag_metadata_names[] = $name;
+	}
+
+	return TRUE;
+}
+
+/**
+ * Returns an array of valid metadata names for tags.
+ *
+ * @return array
+ * @since 1.7.0
+ */
+function elgg_get_registered_tag_metadata_names() {
+	global $CONFIG;
+
+	$names = (isset($CONFIG->registered_tag_metadata_names))
+		? $CONFIG->registered_tag_metadata_names : array();
+
+	return $names;
+}
+
+/**
+ * Page hander for tags
+ *
+ * @param array $page Page array
+ *
+ * @return bool
+ * @access private
+ */
+function elgg_tagcloud_page_handler($page) {
+
+	$title = elgg_view_title(elgg_echo('tags:site_cloud'));
+	$options = array(
+		'threshold' => 0,
+		'limit' => 100,
+		'tag_name' => 'tags',
+	);
+	$tags = elgg_view_tagcloud($options);
+	$content = $title . $tags;
+	$body = elgg_view_layout('one_sidebar', array('content' => $content));
+
+	echo elgg_view_page(elgg_echo('tags:site_cloud'), $body);
+	return true;
+}
+
+/**
+ * @access private
+ */
+function elgg_tags_init() {
+	// register the standard tags metadata name
+	elgg_register_tag_metadata_name('tags');
+	
+	elgg_register_page_handler('tags', 'elgg_tagcloud_page_handler');
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_tags_init');
+\ No newline at end of file
diff --git a/engine/lib/upgrade.php b/engine/lib/upgrade.php
new file mode 100644
index 000000000..158ec9ec1
--- /dev/null
+++ b/engine/lib/upgrade.php
@@ -0,0 +1,365 @@
+<?php
+/**
+ * Elgg upgrade library.
+ * Contains code for handling versioning and upgrades.
+ *
+ * @package Elgg.Core
+ * @subpackage Upgrade
+ */
+
+/**
+ * Run any php upgrade scripts which are required
+ *
+ * @param int  $version Version upgrading from.
+ * @param bool $quiet   Suppress errors.  Don't use this.
+ *
+ * @return bool
+ * @access private
+ */
+function upgrade_code($version, $quiet = FALSE) {
+	// do not remove - upgrade scripts depend on this
+	global $CONFIG;
+	
+	$version = (int) $version;
+	$upgrade_path = elgg_get_config('path') . 'engine/lib/upgrades/';
+	$processed_upgrades = elgg_get_processed_upgrades();
+
+	// upgrading from 1.7 to 1.8. Need to bootstrap.
+	if (!$processed_upgrades) {
+		elgg_upgrade_bootstrap_17_to_18();
+
+		// grab accurate processed upgrades
+		$processed_upgrades = elgg_get_processed_upgrades();
+	}
+
+	$upgrade_files = elgg_get_upgrade_files($upgrade_path);
+
+	if ($upgrade_files === false) {
+		return false;
+	}
+
+	$upgrades = elgg_get_unprocessed_upgrades($upgrade_files, $processed_upgrades);
+
+	// Sort and execute
+	sort($upgrades);
+
+	foreach ($upgrades as $upgrade) {
+		$upgrade_version = elgg_get_upgrade_file_version($upgrade);
+		$success = true;
+
+		// hide all errors.
+		if ($quiet) {
+			// hide include errors as well as any exceptions that might happen
+			try {
+				if (!@include("$upgrade_path/$upgrade")) {
+					$success = false;
+					error_log("Could not include $upgrade_path/$upgrade");
+				}
+			} catch (Exception $e) {
+				$success = false;
+				error_log($e->getmessage());
+			}
+		} else {
+			if (!include("$upgrade_path/$upgrade")) {
+				$success = false;
+				error_log("Could not include $upgrade_path/$upgrade");
+			}
+		}
+
+		if ($success) {
+			// incrementally set upgrade so we know where to start if something fails.
+			$processed_upgrades[] = $upgrade;
+
+			// don't set the version to a lower number in instances where an upgrade
+			// has been merged from a lower version of Elgg
+			if ($upgrade_version > $version) {
+				datalist_set('version', $upgrade_version);
+			}
+
+			elgg_set_processed_upgrades($processed_upgrades);
+		} else {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Saves the processed upgrades to a dataset.
+ *
+ * @param array $processed_upgrades An array of processed upgrade filenames
+ *                                  (not the path, just the file)
+ * @return bool
+ * @access private
+ */
+function elgg_set_processed_upgrades(array $processed_upgrades) {
+	$processed_upgrades = array_unique($processed_upgrades);
+	return datalist_set('processed_upgrades', serialize($processed_upgrades));
+}
+
+/**
+ * Gets a list of processes upgrades
+ *
+ * @return mixed Array of processed upgrade filenames or false
+ * @access private
+ */
+function elgg_get_processed_upgrades() {
+	$upgrades = datalist_get('processed_upgrades');
+	$unserialized = unserialize($upgrades);
+	return $unserialized;
+}
+
+/**
+ * Returns the version of the upgrade filename.
+ *
+ * @param string $filename The upgrade filename. No full path.
+ * @return int|false
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_get_upgrade_file_version($filename) {
+	preg_match('/^([0-9]{10})([\.a-z0-9-_]+)?\.(php)$/i', $filename, $matches);
+
+	if (isset($matches[1])) {
+		return (int) $matches[1];
+	}
+
+	return false;
+}
+
+/**
+ * Returns a list of upgrade files relative to the $upgrade_path dir.
+ *
+ * @param string $upgrade_path The up
+ * @return array|false
+ * @access private
+ */
+function elgg_get_upgrade_files($upgrade_path = null) {
+	if (!$upgrade_path) {
+		$upgrade_path = elgg_get_config('path') . 'engine/lib/upgrades/';
+	}
+	$upgrade_path = sanitise_filepath($upgrade_path);
+	$handle = opendir($upgrade_path);
+
+	if (!$handle) {
+		return false;
+	}
+
+	$upgrade_files = array();
+
+	while ($upgrade_file = readdir($handle)) {
+		// make sure this is a wellformed upgrade.
+		if (is_dir($upgrade_path . '$upgrade_file')) {
+			continue;
+		}
+		$upgrade_version = elgg_get_upgrade_file_version($upgrade_file);
+		if (!$upgrade_version) {
+			continue;
+		}
+		$upgrade_files[] = $upgrade_file;
+	}
+
+	sort($upgrade_files);
+
+	return $upgrade_files;
+}
+
+/**
+ * Get the current Elgg version information
+ *
+ * @param bool $humanreadable Whether to return a human readable version (default: false)
+ *
+ * @return string|false Depending on success
+ */
+function get_version($humanreadable = false) {
+	global $CONFIG;
+
+	static $version, $release;
+
+	if (isset($CONFIG->path)) {
+		if (!isset($version) || !isset($release)) {
+			if (!include($CONFIG->path . "version.php")) {
+				return false;
+			}
+		}
+		return (!$humanreadable) ? $version : $release;
+	}
+
+	return false;
+}
+
+/**
+ * Checks if any upgrades need to be run.
+ *
+ * @param null|array $upgrade_files      Optional upgrade files
+ * @param null|array $processed_upgrades Optional processed upgrades
+ *
+ * @return array
+ * @access private
+ */
+function elgg_get_unprocessed_upgrades($upgrade_files = null, $processed_upgrades = null) {
+	if ($upgrade_files === null) {
+		$upgrade_files = elgg_get_upgrade_files();
+	}
+
+	if ($processed_upgrades === null) {
+		$processed_upgrades = unserialize(datalist_get('processed_upgrades'));
+		if (!is_array($processed_upgrades)) {
+			$processed_upgrades = array();
+		}
+	}
+
+	$unprocessed = array_diff($upgrade_files, $processed_upgrades);
+	return $unprocessed;
+}
+
+/**
+ * Determines whether or not the database needs to be upgraded.
+ *
+ * @return bool Depending on whether or not the db version matches the code version
+ * @access private
+ */
+function version_upgrade_check() {
+	$dbversion = (int) datalist_get('version');
+	$version = get_version();
+
+	if ($version > $dbversion) {
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Upgrades Elgg Database and code
+ *
+ * @return bool
+ * @access private
+ */
+function version_upgrade() {
+	// It's possible large upgrades could exceed the max execution time.
+	set_time_limit(0);
+
+	$dbversion = (int) datalist_get('version');
+
+	// No version number? Oh snap...this is an upgrade from a clean installation < 1.7.
+	// Run all upgrades without error reporting and hope for the best.
+	// See https://github.com/elgg/elgg/issues/1432 for more.
+	$quiet = !$dbversion;
+
+	// Note: Database upgrades are deprecated as of 1.8.  Use code upgrades.  See #1433
+	if (db_upgrade($dbversion, '', $quiet)) {
+		system_message(elgg_echo('upgrade:db'));
+	}
+
+	if (upgrade_code($dbversion, $quiet)) {
+		system_message(elgg_echo('upgrade:core'));
+
+		// Now we trigger an event to give the option for plugins to do something
+		$upgrade_details = new stdClass;
+		$upgrade_details->from = $dbversion;
+		$upgrade_details->to = get_version();
+
+		elgg_trigger_event('upgrade', 'upgrade', $upgrade_details);
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Boot straps into 1.8 upgrade system from 1.7
+ *
+ * This runs all the 1.7 upgrades, then sets the processed_upgrades to all existing 1.7 upgrades.
+ * Control is then passed back to the main upgrade function which detects and runs the
+ * 1.8 upgrades, regardless of filename convention.
+ *
+ * @return bool
+ * @access private
+ */
+function elgg_upgrade_bootstrap_17_to_18() {
+	$db_version = (int) datalist_get('version');
+
+	// the 1.8 upgrades before the upgrade system change that are interspersed with 1.7 upgrades.
+	$upgrades_18 = array(
+		'2010111501.php',
+		'2010121601.php',
+		'2010121602.php',
+		'2010121701.php',
+		'2010123101.php',
+		'2011010101.php',
+	);
+
+	$upgrade_files = elgg_get_upgrade_files();
+	$processed_upgrades = array();
+
+	foreach ($upgrade_files as $upgrade_file) {
+		// ignore if not in 1.7 format or if it's a 1.8 upgrade
+		if (in_array($upgrade_file, $upgrades_18) || !preg_match("/[0-9]{10}\.php/", $upgrade_file)) {
+			continue;
+		}
+
+		$upgrade_version = elgg_get_upgrade_file_version($upgrade_file);
+
+		// this has already been run in a previous 1.7.X -> 1.7.X upgrade
+		if ($upgrade_version < $db_version) {
+			$processed_upgrades[] = $upgrade_file;
+		}
+	}
+
+	return elgg_set_processed_upgrades($processed_upgrades);
+}
+
+/**
+ * Creates a table {prefix}upgrade_lock that is used as a mutex for upgrades.
+ *
+ * @see _elgg_upgrade_lock()
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_upgrade_lock() {
+	global $CONFIG;
+	
+	if (!_elgg_upgrade_is_locked()) {
+		// lock it
+		insert_data("create table {$CONFIG->dbprefix}upgrade_lock (id INT)");
+		elgg_log('Locked for upgrade.', 'NOTICE');
+		return true;
+	}
+	
+	elgg_log('Cannot lock for upgrade: already locked.', 'WARNING');
+	return false;
+}
+
+/**
+ * Unlocks upgrade.
+ *
+ * @see _elgg_upgrade_lock()
+ *
+ * @access private
+ */
+function _elgg_upgrade_unlock() {
+	global $CONFIG;
+	delete_data("drop table {$CONFIG->dbprefix}upgrade_lock");
+	elgg_log('Upgrade unlocked.', 'NOTICE');
+}
+
+/**
+ * Checks if upgrade is locked
+ *
+ * @return bool
+ * @access private
+ */
+function _elgg_upgrade_is_locked() {
+	global $CONFIG;
+
+	$is_locked = count(get_data("show tables like '{$CONFIG->dbprefix}upgrade_lock'"));
+
+	// @todo why?
+	_elgg_invalidate_query_cache();
+
+	return $is_locked;
+}
diff --git a/engine/lib/upgrades/2008100701.php b/engine/lib/upgrades/2008100701.php
new file mode 100644
index 000000000..b8d4dfdbc
--- /dev/null
+++ b/engine/lib/upgrades/2008100701.php
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * Because Elgg now has a plugable account activation process we need to activate
+ * the email account activation plugin for existing installs.
+ */
+enable_plugin('uservalidationbyemail', $CONFIG->site->guid);
diff --git a/engine/lib/upgrades/2008101303.php b/engine/lib/upgrades/2008101303.php
new file mode 100644
index 000000000..69e44e3a0
--- /dev/null
+++ b/engine/lib/upgrades/2008101303.php
@@ -0,0 +1,9 @@
+<?php
+
+// Upgrade to solve login issue
+
+if ($users = get_entities_from_metadata('validated_email', '', 'user', '', 0, 9999)) {
+	foreach ($users as $user) {
+		set_user_validation_status($user->guid, true, 'email');
+	}
+}
diff --git a/engine/lib/upgrades/2009022701.php b/engine/lib/upgrades/2009022701.php
new file mode 100644
index 000000000..54083a34d
--- /dev/null
+++ b/engine/lib/upgrades/2009022701.php
@@ -0,0 +1,7 @@
+<?php
+global $CONFIG;
+
+/**
+ * Disable update client since this has now been removed.
+ */
+disable_plugin('updateclient', $CONFIG->site->guid);
diff --git a/engine/lib/upgrades/2009041701.php b/engine/lib/upgrades/2009041701.php
new file mode 100644
index 000000000..7b31a3bc9
--- /dev/null
+++ b/engine/lib/upgrades/2009041701.php
@@ -0,0 +1,8 @@
+<?php
+
+global $CONFIG;
+
+/**
+ * Elgg now has kses tag filtering built as a plugin. This needs to be enabled.
+ */
+enable_plugin('kses', $CONFIG->site->guid);
diff --git a/engine/lib/upgrades/2009070101.php b/engine/lib/upgrades/2009070101.php
new file mode 100644
index 000000000..d0eae9b91
--- /dev/null
+++ b/engine/lib/upgrades/2009070101.php
@@ -0,0 +1,9 @@
+<?php
+
+global $CONFIG;
+
+/**
+ * Kses appears to be a dead project so we are deprecating it in favour of htmlawed.
+ */
+disable_plugin('kses', $CONFIG->site->guid);
+enable_plugin('htmlawed', $CONFIG->site->guid);
diff --git a/engine/lib/upgrades/2009102801.php b/engine/lib/upgrades/2009102801.php
new file mode 100644
index 000000000..3ad113fb2
--- /dev/null
+++ b/engine/lib/upgrades/2009102801.php
@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Move user's data directories from using username to registration date
+ */
+
+/**
+ * Generates a file matrix like Elgg 1.0 did
+ *
+ * @param string $username Username of user
+ *
+ * @return string File matrix path
+ */
+function file_matrix_1_0($username) {
+	$matrix = "";
+
+	$len = strlen($username);
+	if ($len > 5) {
+		$len = 5;
+	}
+
+	for ($n = 0; $n < $len; $n++) {
+		if (ctype_alnum($username[$n])) {
+			$matrix .= $username[$n] . "/";
+		}
+	}
+
+	return $matrix . $username . "/";
+}
+
+
+/**
+ * Generate a file matrix like Elgg 1.1, 1.2 and 1.5
+ *
+ * @param string $filename The filename
+ *
+ * @return string
+ */
+function file_matrix_1_1($filename) {
+	$matrix = "";
+
+	$name = $filename;
+	$filename = mb_str_split($filename);
+	if (!$filename) {
+		return false;
+	}
+
+	$len = count($filename);
+	if ($len > 5) {
+		$len = 5;
+	}
+
+	for ($n = 0; $n < $len; $n++) {
+		$matrix .= $filename[$n] . "/";
+	}
+
+	return $matrix . $name . "/";
+}
+
+/**
+ * Handle splitting multibyte strings
+ *
+ * @param string $string  String to split.
+ * @param string $charset Charset to use.
+ *
+ * @return array|false
+ */
+function mb_str_split($string, $charset = 'UTF8') {
+	if (is_callable('mb_substr')) {
+		$length = mb_strlen($string);
+		$array = array();
+
+		while ($length) {
+			$array[] = mb_substr($string, 0, 1, $charset);
+			$string = mb_substr($string, 1, $length, $charset);
+
+			$length = mb_strlen($string);
+		}
+
+		return $array;
+	} else {
+		return str_split($string);
+	}
+
+	return false;
+}
+
+
+/**
+ * 1.6 style file matrix
+ *
+ * @param string $filename The filename
+ *
+ * @return string
+ */
+function file_matrix_1_6($filename) {
+	$invalid_fs_chars = '*\'\\/"!$%^&*.%(){}[]#~?<>;|¬`@-+=';
+
+	$matrix = "";
+
+	$name = $filename;
+	$filename = mb_str_split($filename);
+	if (!$filename) {
+		return false;
+	}
+
+	$len = count($filename);
+	if ($len > 5) {
+		$len = 5;
+	}
+
+	for ($n = 0; $n < $len; $n++) {
+
+		// Prevent a matrix being formed with unsafe characters
+		$char = $filename[$n];
+		if (strpos($invalid_fs_chars, $char) !== false) {
+			$char = '_';
+		}
+
+		$matrix .= $char . "/";
+	}
+
+	return $matrix . $name . "/";
+}
+
+
+/**
+ * Scans a directory and moves any files from $from to $to
+ * preserving structure and handling existing paths.
+ * Will no overwrite files in $to.
+ *
+ * TRAILING SLASHES REQUIRED.
+ *
+ * @param string $from       From dir.
+ * @param string $to         To dir.
+ * @param bool   $move       True to move, false to copy.
+ * @param string $preference to|from If file collisions, which dir has preference.
+ *
+ * @return bool
+ */
+function merge_directories($from, $to, $move = false, $preference = 'to') {
+	if (!$entries = scandir($from)) {
+		return false;
+	}
+
+	// character filtering needs to be elsewhere.
+	if (!is_dir($to)) {
+		mkdir($to, 0700, true);
+	}
+
+	if ($move === true) {
+		$f = 'rename';
+	} else {
+		$f = 'copy';
+	}
+
+	foreach ($entries as $entry) {
+		if ($entry == '.' || $entry == '..') {
+			continue;
+		}
+
+		$from_path = $from . $entry;
+		$to_path = $to . $entry;
+
+		// check to see if the path exists and is a dir, if so, recurse.
+		if (is_dir($from_path) && is_dir($to_path)) {
+			$from_path .= '/';
+			$to_path .= '/';
+			merge_directories($from_path, $to_path, $move, $preference);
+
+			// since it's a dir that already exists we don't need to move it
+			continue;
+		}
+
+		// only move if target doesn't exist or if preference is for the from dir
+		if (!file_exists($to_path) || $preference == 'from') {
+
+			if ($f($from_path, $to_path)) {
+				//elgg_dump("Moved/Copied $from_path to $to_path");
+			}
+		} else {
+			//elgg_dump("Ignoring $from_path -> $to_path");
+		}
+	}
+}
+
+/**
+ * Create a 1.7 style user file matrix based upon date.
+ *
+ * @param int $guid Guid of owner
+ *
+ * @return string File matrix path
+ */
+function user_file_matrix($guid) {
+	// lookup the entity
+	$user = get_entity($guid);
+	if ($user->type != 'user') {
+		// only to be used for user directories
+		return FALSE;
+	}
+
+	$time_created = date('Y/m/d', $user->time_created);
+	return "$time_created/$user->guid/";
+}
+
+global $ENTITY_CACHE, $CONFIG;
+/**
+ * Upgrade file locations
+ */
+$users = mysql_query("SELECT guid, username
+	FROM {$CONFIG->dbprefix}users_entity WHERE username != ''");
+while ($user = mysql_fetch_object($users)) {
+	$ENTITY_CACHE = array();
+	_elgg_invalidate_query_cache();
+
+	$to = $CONFIG->dataroot . user_file_matrix($user->guid);
+	foreach (array('1_0', '1_1', '1_6') as $version) {
+		$function = "file_matrix_$version";
+		$from = $CONFIG->dataroot . $function($user->username);
+		merge_directories($from, $to, $move = TRUE, $preference = 'from');
+	}
+}
diff --git a/engine/lib/upgrades/2010010501.php b/engine/lib/upgrades/2010010501.php
new file mode 100644
index 000000000..1e83caa55
--- /dev/null
+++ b/engine/lib/upgrades/2010010501.php
@@ -0,0 +1,8 @@
+<?php
+
+global $CONFIG;
+
+/**
+ * Enable the search plugin
+ */	
+enable_plugin('search', $CONFIG->site->guid);
diff --git a/engine/lib/upgrades/2010033101.php b/engine/lib/upgrades/2010033101.php
new file mode 100644
index 000000000..4779295fd
--- /dev/null
+++ b/engine/lib/upgrades/2010033101.php
@@ -0,0 +1,70 @@
+<?php
+
+/**
+ * Conditional upgrade for UTF8 as described in https://github.com/elgg/elgg/issues/1928
+ */
+
+// get_version() returns the code version.
+// we want the DB version.
+$dbversion = (int) datalist_get('version');
+
+// 2009100701 was the utf8 upgrade for 1.7.
+// if we've already upgraded, don't try again.
+if ($dbversion < 2009100701) {
+	// if the default client connection is utf8 there is no reason
+	// to run this upgrade because the strings are already stored correctly.
+
+	// start a new link to the DB to see what its defaults are.
+	$link = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, TRUE);
+	mysql_select_db($CONFIG->dbname, $link);
+
+	$q = "SHOW VARIABLES LIKE 'character_set_client'";
+	$r = mysql_query($q);
+	$client = mysql_fetch_assoc($r);
+
+	$q = "SHOW VARIABLES LIKE 'character_set_connection'";
+	$r = mysql_query($q);
+	$connection = mysql_fetch_assoc($r);
+
+	// only run upgrade if not already talking utf8.
+	if ($client['Value'] != 'utf8' && $connection['Value'] != 'utf8') {
+		$qs = array();
+		$qs[] = "SET NAMES utf8";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}metastrings DISABLE KEYS";
+		$qs[] = "REPLACE INTO {$CONFIG->dbprefix}metastrings (id, string)
+			SELECT id, unhex(hex(convert(string using latin1)))
+			FROM {$CONFIG->dbprefix}metastrings";
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}metastrings ENABLE KEYS";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}groups_entity DISABLE KEYS";
+		$qs[] = "REPLACE INTO {$CONFIG->dbprefix}groups_entity (guid, name, description)
+			SELECT guid, unhex(hex(convert(name using latin1))),
+				unhex(hex(convert(description using latin1)))
+			FROM {$CONFIG->dbprefix}groups_entity";
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}groups_entity ENABLE KEYS";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}objects_entity DISABLE KEYS";
+		$qs[] = "REPLACE INTO {$CONFIG->dbprefix}objects_entity (guid, title, description)
+			SELECT guid, unhex(hex(convert(title using latin1))),
+				unhex(hex(convert(description using latin1)))
+			FROM {$CONFIG->dbprefix}objects_entity";
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}objects_entity ENABLE KEYS";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity DISABLE KEYS";
+		$qs[] = "REPLACE INTO {$CONFIG->dbprefix}users_entity
+			(guid, name, username, password, salt, email, language, code,
+			banned, last_action, prev_last_action, last_login, prev_last_login)
+				SELECT guid, unhex(hex(convert(name using latin1))),
+					username, password, salt, email, language, code,
+					banned, last_action, prev_last_action, last_login, prev_last_login
+				FROM {$CONFIG->dbprefix}users_entity";
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity ENABLE KEYS";
+
+		foreach ($qs as $q) {
+			if (!update_data($q)) {
+				throw new Exception('Couldn\'t execute upgrade query: ' . $q);
+			}
+		}
+	}
+}
diff --git a/engine/lib/upgrades/2010040201.php b/engine/lib/upgrades/2010040201.php
new file mode 100644
index 000000000..789bf5dfc
--- /dev/null
+++ b/engine/lib/upgrades/2010040201.php
@@ -0,0 +1,41 @@
+<?php
+
+/**
+ * Pull admin metadata setting into users_entity table column
+ */
+
+$siteadmin = get_metastring_id('siteadmin');
+$admin = get_metastring_id('admin');
+$yes = get_metastring_id('yes');
+$one = get_metastring_id('1');
+
+$qs = array();
+
+$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity DISABLE KEYS";
+
+$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity
+	ADD admin ENUM('yes', 'no') NOT NULL DEFAULT 'no' AFTER `banned`";
+
+$qs[] = "UPDATE {$CONFIG->dbprefix}users_entity SET admin = 'yes' where guid IN (select x.guid FROM(
+SELECT * FROM {$CONFIG->dbprefix}users_entity as e,
+	{$CONFIG->dbprefix}metadata as md
+	WHERE (
+		md.name_id IN ('$admin', '$siteadmin')
+		AND md.value_id IN ('$yes', '$one')
+		AND e.guid = md.entity_guid
+		AND e.banned = 'no'
+	)) as x)";
+
+$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity ADD KEY admin (admin)";
+
+$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity ENABLE KEYS";
+
+$qs[] = "DELETE FROM {$CONFIG->dbprefix}metadata
+	WHERE (
+		name_id IN ('$admin', '$siteadmin')
+		AND value_id IN ('$yes', '$one')
+	)";
+
+foreach ($qs as $q) {
+	update_data($q);
+}
diff --git a/engine/lib/upgrades/2010052601.php b/engine/lib/upgrades/2010052601.php
new file mode 100644
index 000000000..a9cca6dc5
--- /dev/null
+++ b/engine/lib/upgrades/2010052601.php
@@ -0,0 +1,27 @@
+<?php
+
+// Upgrade to fix encoding issues on group data: #1963
+
+elgg_set_ignore_access(TRUE);
+
+$params = array('type' => 'group',
+				'limit' => 0);
+$groups = elgg_get_entities($params);
+if ($groups) {
+	foreach ($groups as $group) {
+		$group->name = _elgg_html_decode($group->name);
+		$group->description = _elgg_html_decode($group->description);
+		$group->briefdescription = _elgg_html_decode($group->briefdescription);
+		$group->website = _elgg_html_decode($group->website);
+		if ($group->interests) {
+			$tags = $group->interests;
+			foreach ($tags as $index => $tag) {
+				$tags[$index] = _elgg_html_decode($tag);
+			}
+			$group->interests = $tags;
+		}
+
+		$group->save();
+	}
+}
+elgg_set_ignore_access(FALSE);
diff --git a/engine/lib/upgrades/2010060101.php b/engine/lib/upgrades/2010060101.php
new file mode 100644
index 000000000..bb7f7c1a6
--- /dev/null
+++ b/engine/lib/upgrades/2010060101.php
@@ -0,0 +1,16 @@
+<?php
+
+/**
+ * Clears old simplecache variables out of database
+ */
+
+$query = "DELETE FROM {$CONFIG->dbprefix}datalists WHERE name LIKE 'simplecache%'";
+
+delete_data($query);
+
+if ($CONFIG->simplecache_enabled) {
+	datalist_set('simplecache_enabled', 1);
+	elgg_regenerate_simplecache();
+} else {
+	datalist_set('simplecache_enabled', 0);
+}
diff --git a/engine/lib/upgrades/2010060401.php b/engine/lib/upgrades/2010060401.php
new file mode 100644
index 000000000..6d628b8eb
--- /dev/null
+++ b/engine/lib/upgrades/2010060401.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * Get each user's notify* relationships and confirm that they have a friend
+ * or member relationship depending on type. This fixes the notify relationships
+ * that were not updated to due to #1837
+ */
+
+$count = 0;
+
+$user_guids = mysql_query("SELECT guid FROM {$CONFIG->dbprefix}users_entity");
+while ($user = mysql_fetch_object($user_guids)) {
+
+	$query = "SELECT * FROM {$CONFIG->dbprefix}entity_relationships
+		WHERE guid_one=$user->guid AND relationship LIKE 'notify%'";
+	$relationships = mysql_query($query);
+	if (mysql_num_rows($relationships) == 0) {
+		// no notify relationships for this user
+		continue;
+	}
+
+	while ($obj = mysql_fetch_object($relationships)) {
+		$query = "SELECT type FROM {$CONFIG->dbprefix}entities WHERE guid=$obj->guid_two";
+		$results = mysql_query($query);
+		if (mysql_num_rows($results) == 0) {
+			// entity doesn't exist - shouldn't be possible
+			continue;
+		}
+
+		$entity = mysql_fetch_object($results);
+
+		switch ($entity->type) {
+			case 'user':
+				$relationship_type = 'friend';
+				break;
+			case 'group':
+				$relationship_type = 'member';
+				break;
+		}
+
+		if (isset($relationship_type)) {
+				$query = "SELECT * FROM {$CONFIG->dbprefix}entity_relationships
+							WHERE guid_one=$user->guid AND relationship='$relationship_type'
+							AND guid_two=$obj->guid_two";
+				$results = mysql_query($query);
+
+			if (mysql_num_rows($results) == 0) {
+				$query = "DELETE FROM {$CONFIG->dbprefix}entity_relationships WHERE id=$obj->id";
+				mysql_query($query);
+				$count++;
+			}
+		}
+	}
+
+}
+
+if (is_callable('error_log')) {
+	error_log("Deleted $count notify relationships in upgrade");
+}
diff --git a/engine/lib/upgrades/2010061501.php b/engine/lib/upgrades/2010061501.php
new file mode 100644
index 000000000..744c28fd5
--- /dev/null
+++ b/engine/lib/upgrades/2010061501.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * utf8 database conversion and file merging for usernames with multibyte chars
+ *
+ */
+
+
+// check that we need to do the utf8 conversion
+// C&P logic from 2010033101
+$dbversion = (int) datalist_get('version');
+
+if ($dbversion < 2009100701) {
+	// start a new link to the DB to see what its defaults are.
+	$link = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, TRUE);
+	mysql_select_db($CONFIG->dbname, $link);
+
+	$q = "SHOW VARIABLES LIKE 'character_set_client'";
+	$r = mysql_query($q);
+	$client = mysql_fetch_assoc($r);
+
+	$q = "SHOW VARIABLES LIKE 'character_set_connection'";
+	$r = mysql_query($q);
+	$connection = mysql_fetch_assoc($r);
+
+	// only run upgrade if not already talking utf8
+	if ($client['Value'] != 'utf8' && $connection['Value'] != 'utf8') {
+		$qs = array();
+		$qs[] = "SET NAMES utf8";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity DISABLE KEYS";
+		$qs[] = "REPLACE INTO {$CONFIG->dbprefix}users_entity
+			(guid, name, username, password, salt, email, language, code,
+			banned, admin, last_action, prev_last_action, last_login, prev_last_login)
+
+			SELECT guid, name, unhex(hex(convert(username using latin1))),
+				password, salt, email, language, code,
+				banned, admin, last_action, prev_last_action, last_login, prev_last_login
+			FROM {$CONFIG->dbprefix}users_entity";
+
+		$qs[] = "ALTER TABLE {$CONFIG->dbprefix}users_entity ENABLE KEYS";
+
+		foreach ($qs as $q) {
+			if (!update_data($q)) {
+				throw new Exception('Couldn\'t execute upgrade query: ' . $q);
+			}
+		}
+
+		global $ENTITY_CACHE;
+
+		/**
+			Upgrade file locations
+		 */
+		// new connection to force into utf8 mode to get the old name
+		$link = mysql_connect($CONFIG->dbhost, $CONFIG->dbuser, $CONFIG->dbpass, TRUE);
+		mysql_select_db($CONFIG->dbname, $link);
+
+		// must be the first command
+		mysql_query("SET NAMES utf8");
+
+		$users = mysql_query("SELECT guid, username FROM {$CONFIG->dbprefix}users_entity
+			WHERE username != ''", $link);
+		while ($user = mysql_fetch_object($users)) {
+			$ENTITY_CACHE = array();
+			_elgg_invalidate_query_cache();
+
+
+			$to = $CONFIG->dataroot . user_file_matrix($user->guid);
+			foreach (array('1_0', '1_1', '1_6') as $version) {
+				$function = "file_matrix_$version";
+				$from = $CONFIG->dataroot . $function($user->username);
+				merge_directories($from, $to, $move = TRUE, $preference = 'from');
+			}
+		}
+	}
+}
diff --git a/engine/lib/upgrades/2010062301.php b/engine/lib/upgrades/2010062301.php
new file mode 100644
index 000000000..f679fa46d
--- /dev/null
+++ b/engine/lib/upgrades/2010062301.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Change ownership of group ACLs to group entity
+ */
+
+elgg_set_ignore_access(TRUE);
+
+$params = array('type' => 'group',
+				'limit' => 0);
+$groups = elgg_get_entities($params);
+if ($groups) {
+	foreach ($groups as $group) {
+		$acl = $group->group_acl;
+
+		try {
+			$query = "UPDATE {$CONFIG->dbprefix}access_collections
+				SET owner_guid = $group->guid WHERE id = $acl";
+			update_data($query);
+		} catch (Exception $e) {
+			// no acl so create one
+			$ac_name = elgg_echo('groups:group') . ": " . $group->name;
+			$group_acl = create_access_collection($ac_name, $group->guid);
+			if ($group_acl) {
+				create_metadata($group->guid, 'group_acl', $group_acl, 'integer', $group->owner_guid);
+				$object->group_acl = $group_id;
+			}
+		}
+
+	}
+}
+elgg_set_ignore_access(FALSE);
+
diff --git a/engine/lib/upgrades/2010062302.php b/engine/lib/upgrades/2010062302.php
new file mode 100644
index 000000000..fe33e12ea
--- /dev/null
+++ b/engine/lib/upgrades/2010062302.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Make sure that everyone who belongs to a group is a member of the group's access collection
+ */
+
+
+elgg_set_ignore_access(TRUE);
+
+$params = array('type' => 'group', 'limit' => 0);
+$groups = elgg_get_entities($params);
+if ($groups) {
+	foreach ($groups as $group) {
+		$acl = $group->group_acl;
+
+		$query = "SELECT u.guid FROM {$CONFIG->dbprefix}users_entity u
+			JOIN {$CONFIG->dbprefix}entity_relationships r
+				ON u.guid = r.guid_one AND r.relationship = 'member' AND r.guid_two = $group->guid
+			LEFT JOIN {$CONFIG->dbprefix}access_collection_membership a
+				ON u.guid = a.user_guid AND a.access_collection_id = $acl
+				WHERE a.user_guid IS NULL";
+
+		$results = get_data($query);
+		if ($results != FALSE) {
+			foreach ($results as $user) {
+				$insert = "INSERT INTO {$CONFIG->dbprefix}access_collection_membership
+							(user_guid, access_collection_id) VALUES ($user->guid, $acl)";
+				insert_data($insert);
+			}
+		}
+	}
+}
+elgg_set_ignore_access(FALSE);
diff --git a/engine/lib/upgrades/2010070301.php b/engine/lib/upgrades/2010070301.php
new file mode 100644
index 000000000..af5c80419
--- /dev/null
+++ b/engine/lib/upgrades/2010070301.php
@@ -0,0 +1,9 @@
+<?php
+
+/**
+ * Group join river view has been renamed
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river SET view='river/relationship/member/create'
+			WHERE view='river/group/create' AND action_type='join'";
+update_data($query);
diff --git a/engine/lib/upgrades/2010071001.php b/engine/lib/upgrades/2010071001.php
new file mode 100644
index 000000000..5594493a8
--- /dev/null
+++ b/engine/lib/upgrades/2010071001.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ *	Change profile image names to use guid rather than username
+ */
+
+/**
+ * Need the same function to generate a user matrix, but can't call it
+ * the same thing as the previous update.
+ *
+ * @param int $guid User guid.
+ *
+ * @return string File matrix
+ */
+function user_file_matrix_2010071001($guid) {
+	// lookup the entity
+	$user = get_entity($guid);
+	if ($user->type != 'user') {
+		// only to be used for user directories
+		return FALSE;
+	}
+
+	if (!$user->time_created) {
+		// no idea where this user has its files
+		return FALSE;
+	}
+
+	$time_created = date('Y/m/d', $user->time_created);
+	return "$time_created/$user->guid/";
+}
+
+$sizes = array('large', 'medium', 'small', 'tiny', 'master', 'topbar');
+
+global $ENTITY_CACHE, $CONFIG;
+$users = mysql_query("SELECT guid, username FROM {$CONFIG->dbprefix}users_entity
+	WHERE username != ''");
+while ($user = mysql_fetch_object($users)) {
+	$ENTITY_CACHE = array();
+	_elgg_invalidate_query_cache();
+
+	$user_directory = user_file_matrix_2010071001($user->guid);
+	if (!$user_directory) {
+		continue;
+	}
+	$profile_directory = $CONFIG->dataroot . $user_directory . "profile/";
+	if (!file_exists($profile_directory)) {
+		continue;
+	}
+
+	foreach ($sizes as $size) {
+		$old_filename = "$profile_directory{$user->username}{$size}.jpg";
+		$new_filename = "$profile_directory{$user->guid}{$size}.jpg";
+		if (file_exists($old_filename)) {
+			if (!rename($old_filename, $new_filename)) {
+				error_log("Failed to rename profile photo for $user->username");
+			}
+		}
+	}
+}
diff --git a/engine/lib/upgrades/2010071002.php b/engine/lib/upgrades/2010071002.php
new file mode 100644
index 000000000..52aa15ef5
--- /dev/null
+++ b/engine/lib/upgrades/2010071002.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Update the notifications based on all friends and access collections
+ */
+
+// loop through all users checking collections and notifications
+global $ENTITY_CACHE, $CONFIG;
+global $NOTIFICATION_HANDLERS;
+$users = mysql_query("SELECT guid, username FROM {$CONFIG->dbprefix}users_entity
+	WHERE username != ''");
+while ($user = mysql_fetch_object($users)) {
+	$ENTITY_CACHE = array();
+	_elgg_invalidate_query_cache();
+
+	$user = get_entity($user->guid);
+	foreach ($NOTIFICATION_HANDLERS as $method => $foo) {
+		$notify = "notify$method";
+		$metaname = "collections_notifications_preferences_$method";
+		$collections_preferences = $user->$metaname;
+		if (!$collections_preferences) {
+			continue;
+		}
+		if (!is_array($collections_preferences)) {
+			$collections_preferences = array($collections_preferences);
+		}
+		foreach ($collections_preferences as $collection_id) {
+			// check the all friends notifications
+			if ($collection_id == -1) {
+				$options = array(
+					'relationship' => 'friend',
+					'relationship_guid' => $user->guid,
+					'limit' => 0
+				);
+				$friends = elgg_get_entities_from_relationship($options);
+				foreach ($friends as $friend) {
+					if (!check_entity_relationship($user->guid, $notify, $friend->guid)) {
+						add_entity_relationship($user->guid, $notify, $friend->guid);
+					}
+				}
+			} else {
+				$members = get_members_of_access_collection($collection_id, TRUE);
+				foreach ($members as $member) {
+					if (!check_entity_relationship($user->guid, $notify, $members)) {
+						add_entity_relationship($user->guid, $notify, $member);
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/engine/lib/upgrades/2010111501.php b/engine/lib/upgrades/2010111501.php
new file mode 100644
index 000000000..15e4a7d35
--- /dev/null
+++ b/engine/lib/upgrades/2010111501.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Set validation metadata on unvalidated users to false rather than 
+ * not existing. This is needed because of the change in how validation is
+ * being handled.
+ */
+
+// turn off system log because of all the metadata this can create
+elgg_unregister_event_handler('all', 'all', 'system_log_listener');
+elgg_unregister_event_handler('log', 'systemlog', 'system_log_default_logger');
+
+$ia = elgg_set_ignore_access(TRUE);
+$hidden_entities = access_get_show_hidden_status();
+access_show_hidden_entities(TRUE);
+
+$validated_id = get_metastring_id('validated');
+$one_id = get_metastring_id(1);
+
+$query = "SELECT guid FROM {$CONFIG->dbprefix}entities e
+			WHERE e.type = 'user' AND e.enabled = 'no' AND
+			NOT EXISTS (
+				SELECT 1 FROM {$CONFIG->dbprefix}metadata md
+				WHERE md.entity_guid = e.guid
+				AND md.name_id = $validated_id
+				AND md.value_id = $one_id)";
+
+$user_guids = mysql_query($query);
+while ($user_guid = mysql_fetch_object($user_guids)) {
+	create_metadata($user_guid->guid, 'validated', false, '', 0, ACCESS_PUBLIC, false);
+}
+
+access_show_hidden_entities($hidden_entities);
+elgg_set_ignore_access($ia);
diff --git a/engine/lib/upgrades/2010121601.php b/engine/lib/upgrades/2010121601.php
new file mode 100644
index 000000000..ad7d26adb
--- /dev/null
+++ b/engine/lib/upgrades/2010121601.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Create friends river view has been changed
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river 
+			SET view='river/relationship/friend/create', action_type='create'
+			WHERE view='friends/river/create' AND action_type='friend'";
+update_data($query);
diff --git a/engine/lib/upgrades/2010121602.php b/engine/lib/upgrades/2010121602.php
new file mode 100644
index 000000000..5b0996b5e
--- /dev/null
+++ b/engine/lib/upgrades/2010121602.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Create comment river view has been changed
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river
+			SET view='river/annotation/generic_comment/create'
+			WHERE view='annotation/annotate' AND action_type='comment'";
+update_data($query);
+
diff --git a/engine/lib/upgrades/2010121701.php b/engine/lib/upgrades/2010121701.php
new file mode 100644
index 000000000..375654bac
--- /dev/null
+++ b/engine/lib/upgrades/2010121701.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Create group forum topic river view has been changed
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river
+			SET view='river/object/groupforumtopic/create'
+			WHERE view='river/forum/topic/create' AND action_type='create'";
+update_data($query);
+
diff --git a/engine/lib/upgrades/2010123101.php b/engine/lib/upgrades/2010123101.php
new file mode 100644
index 000000000..f4befd1a8
--- /dev/null
+++ b/engine/lib/upgrades/2010123101.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Set default access for older sites
+ */
+
+$access = elgg_get_config('default_access');
+if ($access == false) {
+	elgg_save_config('default_access', ACCESS_LOGGED_IN);
+}
diff --git a/engine/lib/upgrades/2011010101.php b/engine/lib/upgrades/2011010101.php
new file mode 100644
index 000000000..f4411ee20
--- /dev/null
+++ b/engine/lib/upgrades/2011010101.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Migrate plugins to the new system using ElggPlugin and private settings
+ */
+
+$old_ia = elgg_set_ignore_access(true);
+
+$site = get_config('site');
+$old_plugin_order = unserialize($site->pluginorder);
+$old_enabled_plugins = $site->enabled_plugins;
+
+$db_prefix = get_config('dbprefix');
+$plugin_subtype_id = get_subtype_id('object', 'plugin');
+
+// easy one first: make sure the the site owns all plugin entities.
+$q = "UPDATE {$db_prefix}entities e
+	SET owner_guid = $site->guid, container_guid = $site->guid
+	WHERE e.type = 'object' AND e.subtype = $plugin_subtype_id";
+
+$r = update_data($q);
+
+// rewrite all plugin:setting:* to ELGG_PLUGIN_USER_SETTING_PREFIX . *
+$q = "UPDATE {$db_prefix}private_settings
+	SET name = replace(name, 'plugin:settings:', '" . ELGG_PLUGIN_USER_SETTING_PREFIX . "')
+	WHERE name LIKE 'plugin:settings:%'";
+
+$r = update_data($q);
+
+// grab current plugin GUIDs to add a temp priority
+$q = "SELECT * FROM {$db_prefix}entities e
+	JOIN {$db_prefix}objects_entity oe ON e.guid = oe.guid
+	WHERE e.type = 'object' AND e.subtype = $plugin_subtype_id";
+
+$plugins = get_data($q);
+
+foreach ($plugins as $plugin) {
+	$priority = elgg_namespace_plugin_private_setting('internal', 'priority');
+	set_private_setting($plugin->guid, $priority, 0);
+}
+
+// force regenerating plugin entities
+elgg_generate_plugin_entities();
+
+// set the priorities for all plugins
+// this function rewrites it to a normal index so use the current one.
+elgg_set_plugin_priorities($old_plugin_order);
+
+// add relationships for enabled plugins
+if ($old_enabled_plugins) {
+	// they might only have one plugin enabled.
+	if (!is_array($old_enabled_plugins)) {
+		$old_enabled_plugins = array($old_enabled_plugins);
+	}
+
+	// sometimes there were problems and you'd get 1000s of enabled plugins.
+	$old_enabled_plugins = array_unique($old_enabled_plugins);
+
+	foreach ($old_enabled_plugins as $plugin_id) {
+		$plugin = elgg_get_plugin_from_id($plugin_id);
+
+		if ($plugin) {
+			$plugin->activate();
+		}
+	}
+}
+
+// invalidate caches
+elgg_invalidate_simplecache();
+elgg_reset_system_cache();
+
+// clean up.
+remove_metadata($site->guid, 'pluginorder');
+remove_metadata($site->guid, 'enabled_plugins');
+
+elgg_set_ignore_access($old_id);
+
+/**
+ * @hack
+ *
+ * We stop the upgrade at this point because plugins weren't given the chance to
+ * load due to the new plugin code introduced with Elgg 1.8. Instead, we manually
+ * set the version and start the upgrade process again.
+ *
+ * The variables from upgrade_code() are available because this script was included
+ */
+if ($upgrade_version > $version) {
+	datalist_set('version', $upgrade_version);
+}
+
+// add ourselves to the processed_upgrades.
+$processed_upgrades[] = '2011010101.php';
+
+$processed_upgrades = array_unique($processed_upgrades);
+elgg_set_processed_upgrades($processed_upgrades);
+
+_elgg_upgrade_unlock();
+
+forward('upgrade.php');
diff --git a/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php b/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php
new file mode 100644
index 000000000..40b2c71d5
--- /dev/null
+++ b/engine/lib/upgrades/2011021800-1.8_svn-goodbye_walled_garden-083121a656d06894.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011021800
+ * goodbye_walled_garden
+ *
+ * Removes the Walled Garden plugin in favor of new system settings
+ */
+
+global $CONFIG;
+
+$access = elgg_set_ignore_access(TRUE);
+
+if (elgg_is_active_plugin('walledgarden')) {
+	disable_plugin('walledgarden');
+	set_config('allow_registration', FALSE);
+	set_config('walled_garden', TRUE);
+} else {
+	set_config('allow_registration', TRUE);
+	set_config('walled_garden', FALSE);
+}
+
+// this was for people who manually set the config option
+$disable_registration = elgg_get_config('disable_registration');
+if ($disable_registration !== null) {
+	$allow_registration = !$disable_registration;
+	elgg_save_config('allow_registration', $allow_registration);
+
+	$site = elgg_get_site_entity();
+	$query = "DELETE FROM {$CONFIG->dbprefix}config
+				WHERE name = 'disable_registration' AND site_guid = $site->guid";
+	delete_data($query);
+}
+
+elgg_set_ignore_access($access);
diff --git a/engine/lib/upgrades/2011022000-1.8_svn-custom_profile_fields-390ac967b0bb5665.php b/engine/lib/upgrades/2011022000-1.8_svn-custom_profile_fields-390ac967b0bb5665.php
new file mode 100644
index 000000000..7561b84ba
--- /dev/null
+++ b/engine/lib/upgrades/2011022000-1.8_svn-custom_profile_fields-390ac967b0bb5665.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Elgg 2011010401 upgrade 00
+ * custom_profile_fields
+ *
+ * Migrate 1.7 style custom profile fields to 1.8
+ */
+
+$plugin = elgg_get_plugin_from_id('profile');
+
+// plugin not installed
+if (!$plugin) {
+	return true;
+}
+
+$settings = $plugin->getAllSettings();
+// no fields to migrate
+if (!$settings['user_defined_fields']) {
+	return true;
+}
+
+$order = array();
+$remove_settings = array();
+
+// make sure we have a name and type
+foreach ($settings as $k => $v) {
+	if (!preg_match('/admin_defined_profile_([0-9]+)/i', $k, $matches)) {
+		continue;
+	}
+
+	$i = $matches[1];
+	$type_name = "admin_defined_profile_type_$i";
+	$type = elgg_extract($type_name, $settings, null);
+
+	if ($type) {
+		// field name
+		elgg_save_config($k, $v);
+		// field value
+		elgg_save_config($type_name, $type);
+
+		$order[] = $i;
+		$remove_settings[] = $k;
+		$remove_settings[] = $type_name;
+	}
+}
+
+if ($order) {
+	// these will always need to be in order, but there might be gaps
+	ksort($order);
+
+	$order_str = implode(',', $order);
+	elgg_save_config('profile_custom_fields', $order_str);
+
+	foreach ($remove_settings as $name) {
+		$plugin->unsetSetting($name);
+	}
+
+	$plugin->unsetSetting('user_defined_fields');
+}
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2011030700-1.8_svn-blog_status_metadata-4645225d7b440876.php b/engine/lib/upgrades/2011030700-1.8_svn-blog_status_metadata-4645225d7b440876.php
new file mode 100644
index 000000000..fe2af9928
--- /dev/null
+++ b/engine/lib/upgrades/2011030700-1.8_svn-blog_status_metadata-4645225d7b440876.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011030700
+ * blog_status_metadata
+ *
+ * Add a "status" metadata entry to every blog entity because in 1.8 you can have status = draft or
+ * status = published
+ */
+$ia = elgg_set_ignore_access(true);
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'limit' => 0,
+);
+$batch = new ElggBatch('elgg_get_entities', $options);
+
+foreach ($batch as $entity) {
+	if (!$entity->status) {
+		// create metadata owned by the original owner
+		create_metadata($entity->getGUID(), 'status', 'published', '', $entity->owner_guid,
+			$entity->access_id);
+	}
+}
+elgg_set_ignore_access($ia);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php b/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php
new file mode 100644
index 000000000..df60892a6
--- /dev/null
+++ b/engine/lib/upgrades/2011031300-1.8_svn-twitter_api-12b832a5a7a3e1bd.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011031300
+ * twitter_api
+ *
+ * Updates the database for twitterservice to twitter_api changes.
+ */
+
+
+$ia = elgg_set_ignore_access(true);
+
+// make sure we have updated plugins
+elgg_generate_plugin_entities();
+
+$show_hidden = access_get_show_hidden_status();
+access_show_hidden_entities(true);
+
+$db_prefix = elgg_get_config('dbprefix');
+$site_guid = elgg_get_site_entity()->getGUID();
+$old = elgg_get_plugin_from_id('twitterservice');
+$new = elgg_get_plugin_from_id('twitter_api');
+$has_settings = false;
+
+// if not loaded, don't bother.
+if (!$old || !$new) {
+	return true;
+}
+
+$settings = array('consumer_key', 'consumer_secret', 'sign_on', 'new_users');
+
+foreach ($settings as $setting) {
+	$value = $old->getSetting($setting);
+	if ($value) {
+		$has_settings = true;
+		$new->setSetting($setting, $value);
+	}
+}
+
+// update the user settings
+$q = "UPDATE {$db_prefix}private_settings
+	SET name = replace(name, 'twitterservice', 'twitter_api')
+	WHERE name like '%twitterservice%'";
+
+update_data($q);
+
+// if there were settings, emit a notice to re-enable twitter_api
+if ($has_settings) {
+	elgg_add_admin_notice('twitter_api:disabled', elgg_echo('update:twitter_api:deactivated'));
+}
+
+$old->delete();
+
+access_show_hidden_entities($show_hidden);
+elgg_set_ignore_access($ia);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2011031600-1.8_svn-datalist_grows_up-0b8aec5a55cc1e1c.php b/engine/lib/upgrades/2011031600-1.8_svn-datalist_grows_up-0b8aec5a55cc1e1c.php
new file mode 100644
index 000000000..379244b36
--- /dev/null
+++ b/engine/lib/upgrades/2011031600-1.8_svn-datalist_grows_up-0b8aec5a55cc1e1c.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011031600
+ * datalist_grows_up
+ *
+ * Ups the varchar to 256 for the datalist and config table.
+ *
+ * Keeping it as a varchar because of the trailing whitespace trimming it apparently does:
+ * http://dev.mysql.com/doc/refman/5.0/en/char.html
+ */
+
+$db_prefix = elgg_get_config('dbprefix');
+
+$q = "ALTER TABLE {$db_prefix}datalists CHANGE name name VARCHAR(255)";
+update_data($q);
+
+$q = "ALTER TABLE {$db_prefix}config CHANGE name name VARCHAR(255)";
+update_data($q);
diff --git a/engine/lib/upgrades/2011032000-1.8_svn-widgets_arent_plugins-61836261fa280a5c.php b/engine/lib/upgrades/2011032000-1.8_svn-widgets_arent_plugins-61836261fa280a5c.php
new file mode 100644
index 000000000..a20970d79
--- /dev/null
+++ b/engine/lib/upgrades/2011032000-1.8_svn-widgets_arent_plugins-61836261fa280a5c.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011031800
+ * widgets_arent_plugins
+ *
+ * At some point in Elgg's history subtype widget was registered with class ElggPlugin.
+ * Fix that.
+ */
+
+update_subtype('object', 'widget', 'ElggWidget');
diff --git a/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php b/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php
new file mode 100644
index 000000000..592adb403
--- /dev/null
+++ b/engine/lib/upgrades/2011032200-1.8_svn-admins_like_widgets-7f19d2783c1680d3.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Elgg 1.8-svn upgrade 2011032200
+ * admins_like_widgets
+ *
+ * Give current admins widgets for those pre-1.8
+ */
+
+$admins = elgg_get_admins(array('limit' => 0));
+foreach ($admins as $admin) {
+	// call the admin handler for the make_admin event
+	elgg_add_admin_widgets('make_admin', 'user', $admin);
+}
diff --git a/engine/lib/upgrades/2011052801.php b/engine/lib/upgrades/2011052801.php
new file mode 100644
index 000000000..b5a8e1018
--- /dev/null
+++ b/engine/lib/upgrades/2011052801.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Make sure all users have the relationship member_of_site
+ */
+global $ENTITY_CACHE;
+$db_prefix = get_config('dbprefix');
+
+$limit = 100;
+
+$q = "SELECT e.* FROM {$db_prefix}entities e
+	WHERE e.type = 'user' AND e.guid NOT IN (
+		SELECT guid_one FROM {$db_prefix}entity_relationships
+			WHERE guid_two = 1 AND relationship = 'member_of_site'
+		)
+	LIMIT $limit";
+
+$users = get_data($q);
+
+while ($users) {
+	$ENTITY_CACHE = array();
+	_elgg_invalidate_query_cache();
+
+	// do manually to not trigger any events because these aren't new users.
+	foreach ($users as $user) {
+		$rel_q = "INSERT INTO {$db_prefix}entity_relationships VALUES (
+			'',
+			'$user->guid',
+			'member_of_site',
+			'$user->site_guid',
+			'$user->time_created'
+		)";
+
+		insert_data($rel_q);
+	}
+
+	// every time we run this query we've just reduced the rows it returns by $limit
+	// so don't pass an offset.
+	$q = "SELECT e.* FROM {$db_prefix}entities e
+		WHERE e.type = 'user' AND e.guid NOT IN (
+			SELECT guid_one FROM {$db_prefix}entity_relationships
+				WHERE guid_two = 1 AND relationship = 'member_of_site'
+			)
+		LIMIT $limit";
+
+	$users = get_data($q);
+}
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php b/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php
new file mode 100644
index 000000000..41ab29998
--- /dev/null
+++ b/engine/lib/upgrades/2011061200-1.8b1-sites_need_a_site_guid-6d9dcbf46c0826cc.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg 1.8b1 upgrade 2011061200
+ * sites_need_a_site_guid
+ *
+ * Sites did not have a site guid. This causes problems with getting
+ * metadata on site objects since we default to the current site.
+ */
+
+global $CONFIG;
+
+$ia = elgg_set_ignore_access(true);
+$access_status = access_get_show_hidden_status();
+access_show_hidden_entities(true);
+
+$options = array(
+	'type' => 'site',
+	'site_guid' => 0,
+	'limit' => 0,
+);
+$batch = new ElggBatch('elgg_get_entities', $options);
+
+foreach ($batch as $entity) {
+	if (!$entity->site_guid) {
+		update_data("UPDATE {$CONFIG->dbprefix}entities SET site_guid=$entity->guid
+				WHERE guid=$entity->guid");
+	}
+}
+
+access_show_hidden_entities($access_status);
+elgg_set_ignore_access($ia);
diff --git a/engine/lib/upgrades/2011092500-1.8.0.1-forum_reply_river_view-5758ce8d86ac56ce.php b/engine/lib/upgrades/2011092500-1.8.0.1-forum_reply_river_view-5758ce8d86ac56ce.php
new file mode 100644
index 000000000..3a9200b51
--- /dev/null
+++ b/engine/lib/upgrades/2011092500-1.8.0.1-forum_reply_river_view-5758ce8d86ac56ce.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Elgg 1.8.0.1 upgrade 2011092500
+ * forum_reply_river_view
+ *
+ * The forum reply river view is in a new location in Elgg 1.8
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river SET view='river/annotation/group_topic_post/reply',
+			action_type='reply'
+			WHERE view='river/forum/create' AND action_type='create'";
+update_data($query);
diff --git a/engine/lib/upgrades/2011123100-1.8.2-fix_friend_river-b17e7ff8345c2269.php b/engine/lib/upgrades/2011123100-1.8.2-fix_friend_river-b17e7ff8345c2269.php
new file mode 100644
index 000000000..4dc43cd32
--- /dev/null
+++ b/engine/lib/upgrades/2011123100-1.8.2-fix_friend_river-b17e7ff8345c2269.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Elgg 1.8.2 upgrade 2011123100
+ * fix_friend_river
+ *
+ * Action type was incorrect due to previoud friends river upgrade
+ */
+
+$query = "UPDATE {$CONFIG->dbprefix}river
+			SET action_type='friend'
+			WHERE view='river/relationship/friend/create' AND action_type='create'";
+update_data($query);
diff --git a/engine/lib/upgrades/2011123101-1.8.2-fix_blog_status-b14c2a0e7b9e7d55.php b/engine/lib/upgrades/2011123101-1.8.2-fix_blog_status-b14c2a0e7b9e7d55.php
new file mode 100644
index 000000000..e351c6ac9
--- /dev/null
+++ b/engine/lib/upgrades/2011123101-1.8.2-fix_blog_status-b14c2a0e7b9e7d55.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg 1.8.2 upgrade 2011123101
+ * fix_blog_status
+ *
+ * Most blog posts did not have their status properly set with 1.8 upgrade so we run
+ * the blog status upgrade again
+ */
+
+$ia = elgg_set_ignore_access(true);
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'limit' => 0,
+);
+$batch = new ElggBatch('elgg_get_entities', $options);
+
+foreach ($batch as $entity) {
+	if (!$entity->status) {
+		// create metadata owned by the original owner
+		create_metadata($entity->getGUID(), 'status', 'published', '', $entity->owner_guid,
+			$entity->access_id);
+	}
+}
+elgg_set_ignore_access($ia);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2012012000-1.8.3-ip_in_syslog-87fe0f068cf62428.php b/engine/lib/upgrades/2012012000-1.8.3-ip_in_syslog-87fe0f068cf62428.php
new file mode 100644
index 000000000..b9514e156
--- /dev/null
+++ b/engine/lib/upgrades/2012012000-1.8.3-ip_in_syslog-87fe0f068cf62428.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Elgg 1.8.3 upgrade 2012012000
+ * ip_in_syslog
+ *
+ * Adds a field for an IP address in the system log table
+ */
+
+$db_prefix = elgg_get_config('dbprefix');
+$q = "ALTER TABLE {$db_prefix}system_log ADD ip_address VARCHAR(15) NOT NULL AFTER time_created";
+
+update_data($q);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2012012100-1.8.3-system_cache-93100e7d55a24a11.php b/engine/lib/upgrades/2012012100-1.8.3-system_cache-93100e7d55a24a11.php
new file mode 100644
index 000000000..3a9aae2a1
--- /dev/null
+++ b/engine/lib/upgrades/2012012100-1.8.3-system_cache-93100e7d55a24a11.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Elgg 1.8.3 upgrade 2012012100
+ * system_cache
+ *
+ * Convert viewpath cache to system cache
+ */
+
+$value = datalist_get('viewpath_cache_enabled');
+datalist_set('system_cache_enabled', $value);
+
+$query = "DELETE FROM {$CONFIG->dbprefix}datalists WHERE name='viewpath_cache_enabled'";
+delete_data($query);
diff --git a/engine/lib/upgrades/2012041800-1.8.3-dont_filter_passwords-c0ca4a18b38ae2bc.php b/engine/lib/upgrades/2012041800-1.8.3-dont_filter_passwords-c0ca4a18b38ae2bc.php
new file mode 100644
index 000000000..b82ffbebf
--- /dev/null
+++ b/engine/lib/upgrades/2012041800-1.8.3-dont_filter_passwords-c0ca4a18b38ae2bc.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Elgg 1.8.3 upgrade 2012041800
+ * dont_filter_passwords
+ *
+ * Add admin notice that password handling has changed and if 
+ * users can't login to have them reset their passwords.
+ */
+elgg_add_admin_notice('dont_filter_passwords', 'Password handling has been updated to be more secure and flexible. '
+	. 'This change may prevent a small number of users from logging in with their existing passwords. '
+	. 'If a user is unable to log in, please advise him or her to reset their password, or reset it as an admin user.');
diff --git a/engine/lib/upgrades/2012041801-1.8.3-multiple_user_tokens-852225f7fd89f6c5.php b/engine/lib/upgrades/2012041801-1.8.3-multiple_user_tokens-852225f7fd89f6c5.php
new file mode 100644
index 000000000..780038c32
--- /dev/null
+++ b/engine/lib/upgrades/2012041801-1.8.3-multiple_user_tokens-852225f7fd89f6c5.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Elgg 1.8.3 upgrade 2012041801
+ * multiple_user_tokens
+ *
+ * Fixes https://github.com/elgg/elgg/issues/4291
+ * Removes the unique index on users_apisessions for user_guid and site_guid
+ */
+
+$db_prefix = elgg_get_config('dbprefix');
+$q = "ALTER TABLE {$db_prefix}users_apisessions DROP INDEX user_guid,
+	ADD INDEX user_guid (user_guid, site_guid)";
+update_data($q);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2013030600-1.8.13-update_user_location-8999eb8bf1bdd9a3.php b/engine/lib/upgrades/2013030600-1.8.13-update_user_location-8999eb8bf1bdd9a3.php
new file mode 100644
index 000000000..8eccf05e2
--- /dev/null
+++ b/engine/lib/upgrades/2013030600-1.8.13-update_user_location-8999eb8bf1bdd9a3.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg 1.8.14 upgrade 2013030600
+ * update_user_location
+ *
+ * Before Elgg 1.8, a location like "London, England" would be stored as an array.
+ * This script turns that back into a string.
+ */
+
+$ia = elgg_set_ignore_access(true);
+$options = array(
+	'type' => 'user',
+	'limit' => 0,
+);
+$batch = new ElggBatch('elgg_get_entities', $options);
+
+foreach ($batch as $entity) {
+	_elgg_invalidate_query_cache();
+	
+	if (is_array($entity->location)) {
+		$entity->location = implode(', ', $entity->location);
+	}
+}
+elgg_set_ignore_access($ia);
diff --git a/engine/lib/upgrades/2013051700-1.8.15-add_missing_group_index-52a63a3a3ffaced2.php b/engine/lib/upgrades/2013051700-1.8.15-add_missing_group_index-52a63a3a3ffaced2.php
new file mode 100644
index 000000000..ee99bdbc8
--- /dev/null
+++ b/engine/lib/upgrades/2013051700-1.8.15-add_missing_group_index-52a63a3a3ffaced2.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg 1.8.15 upgrade 2013051700
+ * add_missing_group_index
+ *
+ * Some Elgg sites are missing the groups_entity full text index on name and
+ * description. This checks if it exists and adds it if it does not.
+ */
+
+$db_prefix = elgg_get_config('dbprefix');
+
+$full_text_index_exists = false;
+$results = get_data("SHOW INDEX FROM {$db_prefix}groups_entity");
+if ($results) {
+	foreach ($results as $result) {
+		if ($result->Index_type === 'FULLTEXT') {
+			$full_text_index_exists = true;
+		}
+	}
+}
+
+if ($full_text_index_exists == false) {
+	$query = "ALTER TABLE {$db_prefix}groups_entity 
+		ADD FULLTEXT name_2 (name, description)";
+	if (!update_data($query)) {
+		elgg_log("Failed to add full text index to groups_entity table", 'ERROR');
+	}
+}
diff --git a/engine/lib/upgrades/2013052900-1.8.15-ipv6_in_syslog-f5c2cc0196e9e731.php b/engine/lib/upgrades/2013052900-1.8.15-ipv6_in_syslog-f5c2cc0196e9e731.php
new file mode 100644
index 000000000..d333a6cd2
--- /dev/null
+++ b/engine/lib/upgrades/2013052900-1.8.15-ipv6_in_syslog-f5c2cc0196e9e731.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Elgg 1.8.15 upgrade 2013052900
+ * ipv6_in_syslog
+ *
+ * Upgrade the ip column in system_log to be able to store ipv6 addresses
+ */
+
+$db_prefix = elgg_get_config('dbprefix');
+$q = "ALTER TABLE {$db_prefix}system_log MODIFY COLUMN ip_address varchar(46) NOT NULL";
+
+update_data($q);
+\ No newline at end of file
diff --git a/engine/lib/upgrades/2013060900-1.8.15-site_secret-404fc165cf9e0ac9.php b/engine/lib/upgrades/2013060900-1.8.15-site_secret-404fc165cf9e0ac9.php
new file mode 100644
index 000000000..538d74dd6
--- /dev/null
+++ b/engine/lib/upgrades/2013060900-1.8.15-site_secret-404fc165cf9e0ac9.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Elgg 1.8.15 upgrade 2013060900
+ * site_secret
+ *
+ * Description
+ */
+
+$strength = _elgg_get_site_secret_strength();
+
+if ($strength !== 'strong') {
+	// a new key is needed immediately
+	register_translations(elgg_get_root_path() . 'languages/');
+
+	elgg_add_admin_notice('weak_site_key', elgg_echo("upgrade:site_secret_warning:$strength"));
+}
diff --git a/engine/lib/upgrades/create_upgrade.php b/engine/lib/upgrades/create_upgrade.php
new file mode 100644
index 000000000..b34f31b7e
--- /dev/null
+++ b/engine/lib/upgrades/create_upgrade.php
@@ -0,0 +1,152 @@
+<?php
+/**
+ * Creates an upgrade file for Elgg.
+ *
+ * Run this from the command line:
+ * 	php create_upgrade.php upgrade_name
+ */
+
+error_reporting(E_NOTICE);
+
+// only allow from the command line.
+if (php_sapi_name() != 'cli') {
+	die('Upgrades can only be created from the command line.');
+}
+
+if (count($argv) < 2) {
+	elgg_create_upgrade_show_usage('No upgrade name.');
+}
+
+$name = $argv[1];
+
+if (strlen($name) > 24) {
+	elgg_create_upgrade_show_usage('Upgrade names cannot be longer than 24 characters.');
+}
+
+require_once '../../../version.php';
+require_once '../elgglib.php';
+$upgrade_path = dirname(__FILE__);
+
+$upgrade_name = strtolower($name);
+$upgrade_name = str_replace(array(' ', '-'), '_', $upgrade_name);
+$upgrade_release = str_replace(array(' ', '-'), '_', $release);
+$time = time();
+$upgrade_rnd = substr(md5($time), 0, 16);
+$upgrade_date = date('Ymd', $time);
+
+// determine the inc count
+$upgrade_inc = 0;
+$files = elgg_get_file_list($upgrade_path);
+sort($files);
+
+foreach ($files as $filename) {
+	$filename = basename($filename);
+	$date = (int)substr($filename, 0, 8);
+	$inc = (int)substr($filename, 8, 2);
+
+	if ($upgrade_date == $date) {
+		if ($inc >= $upgrade_inc) {
+			$upgrade_inc = $inc + 1;
+		}
+	}
+}
+
+// zero-pad
+// if there are more than 10 upgrades in a day, someone needs talking to.
+if ($upgrade_inc < 10) {
+	$upgrade_inc = "0$upgrade_inc";
+}
+
+$upgrade_version = $upgrade_date . $upgrade_inc;
+
+// make filename
+if (substr($release, 0, 3) == '1.7') {
+	// 1.7 upgrades are YYYYMMDDXX
+	$upgrade_name = $upgrade_version . '.php';
+} else {
+	// 1.8+ upgrades are YYYYMMDDXX-release-friendly_name-rnd
+	$upgrade_name = $upgrade_version . "-$upgrade_release-$name-$upgrade_rnd.php";
+}
+
+$upgrade_file = $upgrade_path . '/' . $upgrade_name;
+
+if (is_file($upgrade_file)) {
+	elgg_create_upgrade_show_usage("Upgrade file $upgrade_file already exists. This script has failed you.");
+}
+
+$upgrade_code = <<<___UPGRADE
+<?php
+/**
+ * Elgg $release upgrade $upgrade_version
+ * $name
+ *
+ * Description
+ */
+
+// upgrade code here.
+
+___UPGRADE;
+
+$h = fopen($upgrade_file, 'wb');
+
+if (!$h) {
+	die("Could not open file $upgrade_file");
+}
+
+if (!fwrite($h, $upgrade_code)) {
+	die("Could not write to $upgrade_file");
+} else {
+	elgg_set_version_dot_php_version($upgrade_version);
+	echo <<<___MSG
+
+Created upgrade file and updated version.php.
+
+Upgrade file: $upgrade_name
+Version:      $upgrade_version
+
+___MSG;
+}
+
+fclose($h);
+
+
+function elgg_set_version_dot_php_version($version) {
+	$file = '../../../version.php';
+	$h = fopen($file, 'r+b');
+
+	if (!$h) {
+		return false;
+	}
+
+	$out = '';
+
+	while (($line = fgets($h)) !== false) {
+		$find = "/\\\$version[ ]?=[ ]?[0-9]{10};/";
+		$replace = "\$version = $version;";
+		$out .= preg_replace($find, $replace, $line);
+	}
+
+	rewind($h);
+
+	fwrite($h, $out);
+	fclose($h);
+	return true;
+}
+
+/**
+ * Shows the usage for the create_upgrade script and dies().
+ *
+ * @param string $msg Optional message to display
+ * @return void
+ */
+function elgg_create_upgrade_show_usage($msg = '') {
+	$text = <<<___MSG
+$msg
+
+Example:
+	php create_upgrade.php my_upgrade
+
+___MSG;
+
+	die($text);
+}
diff --git a/engine/lib/user_settings.php b/engine/lib/user_settings.php
new file mode 100644
index 000000000..0e36dc46d
--- /dev/null
+++ b/engine/lib/user_settings.php
@@ -0,0 +1,360 @@
+<?php
+/**
+ * Elgg user settings functions.
+ * Functions for adding and manipulating options on the user settings panel.
+ *
+ * @package Elgg.Core
+ * @subpackage Settings.User
+ */
+
+/**
+ * Saves user settings.
+ *
+ * @todo this assumes settings are coming in on a GET/POST request
+ *
+ * @note This is a handler for the 'usersettings:save', 'user' plugin hook
+ *
+ * @return void
+ * @access private
+ */
+function users_settings_save() {
+	elgg_set_user_language();
+	elgg_set_user_password();
+	elgg_set_user_default_access();
+	elgg_set_user_name();
+	elgg_set_user_email();
+}
+
+/**
+ * Set a user's password
+ * 
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_user_password() {
+	$current_password = get_input('current_password', null, false);
+	$password = get_input('password', null, false);
+	$password2 = get_input('password2', null, false);
+	$user_guid = get_input('guid');
+
+	if (!$user_guid) {
+		$user = elgg_get_logged_in_user_entity();
+	} else {
+		$user = get_entity($user_guid);
+	}
+
+	if ($user && $password) {
+		// let admin user change anyone's password without knowing it except his own.
+		if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
+			$credentials = array(
+				'username' => $user->username,
+				'password' => $current_password
+			);
+
+			try {
+				pam_auth_userpass($credentials);
+			} catch (LoginException $e) {
+				register_error(elgg_echo('LoginException:ChangePasswordFailure'));
+				return false;
+			}
+		}
+
+		try {
+			$result = validate_password($password);
+		} catch (RegistrationException $e) {
+			register_error($e->getMessage());
+			return false;
+		}
+
+		if ($result) {
+			if ($password == $password2) {
+				$user->salt = generate_random_cleartext_password(); // Reset the salt
+				$user->password = generate_user_password($user, $password);
+				if ($user->save()) {
+					system_message(elgg_echo('user:password:success'));
+					return true;
+				} else {
+					register_error(elgg_echo('user:password:fail'));
+				}
+			} else {
+				register_error(elgg_echo('user:password:fail:notsame'));
+			}
+		} else {
+			register_error(elgg_echo('user:password:fail:tooshort'));
+		}
+	} else {
+		// no change
+		return null;
+	}
+	
+	return false;
+}
+
+/**
+ * Set a user's display name
+ * 
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_user_name() {
+	$name = strip_tags(get_input('name'));
+	$user_id = get_input('guid');
+
+	if (!$user_id) {
+		$user = elgg_get_logged_in_user_entity();
+	} else {
+		$user = get_entity($user_id);
+	}
+
+	if (elgg_strlen($name) > 50) {
+		register_error(elgg_echo('user:name:fail'));
+		return false;
+	}
+
+	if (($user) && ($user->canEdit()) && ($name)) {
+		if ($name != $user->name) {
+			$user->name = $name;
+			if ($user->save()) {
+				system_message(elgg_echo('user:name:success'));
+				return true;
+			} else {
+				register_error(elgg_echo('user:name:fail'));
+			}
+		} else {
+			// no change
+			return null;
+		}
+	} else {
+		register_error(elgg_echo('user:name:fail'));
+	}
+	return false;
+}
+
+/**
+ * Set a user's language
+ * 
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_user_language() {
+	$language = get_input('language');
+	$user_id = get_input('guid');
+
+	if (!$user_id) {
+		$user = elgg_get_logged_in_user_entity();
+	} else {
+		$user = get_entity($user_id);
+	}
+
+	if (($user) && ($language)) {
+		if (strcmp($language, $user->language) != 0) {
+			$user->language = $language;
+			if ($user->save()) {
+				system_message(elgg_echo('user:language:success'));
+				return true;
+			} else {
+				register_error(elgg_echo('user:language:fail'));
+			}
+		} else {
+			// no change
+			return null;
+		}
+	} else {
+		register_error(elgg_echo('user:language:fail'));
+	}
+	return false;
+}
+
+/**
+ * Set a user's email address
+ *
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_user_email() {
+	$email = get_input('email');
+	$user_id = get_input('guid');
+
+	if (!$user_id) {
+		$user = elgg_get_logged_in_user_entity();
+	} else {
+		$user = get_entity($user_id);
+	}
+
+	if (!is_email_address($email)) {
+		register_error(elgg_echo('email:save:fail'));
+		return false;
+	}
+
+	if ($user) {
+		if (strcmp($email, $user->email) != 0) {
+			if (!get_user_by_email($email)) {
+				if ($user->email != $email) {
+
+					$user->email = $email;
+					if ($user->save()) {
+						system_message(elgg_echo('email:save:success'));
+						return true;
+					} else {
+						register_error(elgg_echo('email:save:fail'));
+					}
+				}
+			} else {
+				register_error(elgg_echo('registration:dupeemail'));
+			}
+		} else {
+			// no change
+			return null;
+		}
+	} else {
+		register_error(elgg_echo('email:save:fail'));
+	}
+	return false;
+}
+
+/**
+ * Set a user's default access level
+ *
+ * @return bool
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_set_user_default_access() {
+
+	if (!elgg_get_config('allow_user_default_access')) {
+		return false;
+	}
+
+	$default_access = get_input('default_access');
+	$user_id = get_input('guid');
+
+	if (!$user_id) {
+		$user = elgg_get_logged_in_user_entity();
+	} else {
+		$user = get_entity($user_id);
+	}
+
+	if ($user) {
+		$current_default_access = $user->getPrivateSetting('elgg_default_access');
+		if ($default_access !== $current_default_access) {
+			if ($user->setPrivateSetting('elgg_default_access', $default_access)) {
+				system_message(elgg_echo('user:default_access:success'));
+				return true;
+			} else {
+				register_error(elgg_echo('user:default_access:fail'));
+			}
+		} else {
+			// no change
+			return null;
+		}
+	} else {
+		register_error(elgg_echo('user:default_access:fail'));
+	}
+
+	return false;
+}
+
+/**
+ * Set up the menu for user settings
+ *
+ * @return void
+ * @access private
+ */
+function usersettings_pagesetup() {
+	$user = elgg_get_page_owner_entity();
+
+	if ($user && elgg_get_context() == "settings") {
+		$params = array(
+			'name' => '1_account',
+			'text' => elgg_echo('usersettings:user:opt:linktext'),
+			'href' => "settings/user/{$user->username}",
+		);
+		elgg_register_menu_item('page', $params);
+		$params = array(
+			'name' => '1_plugins',
+			'text' => elgg_echo('usersettings:plugins:opt:linktext'),
+			'href' => "settings/plugins/{$user->username}",
+		);
+		elgg_register_menu_item('page', $params);
+		$params = array(
+			'name' => '1_statistics',
+			'text' => elgg_echo('usersettings:statistics:opt:linktext'),
+			'href' => "settings/statistics/{$user->username}",
+		);
+		elgg_register_menu_item('page', $params);
+	}
+}
+
+/**
+ * Page handler for user settings
+ *
+ * @param array $page Pages array
+ *
+ * @return bool
+ * @access private
+ */
+function usersettings_page_handler($page) {
+	global $CONFIG;
+
+	if (!isset($page[0])) {
+		$page[0] = 'user';
+	}
+
+	if (isset($page[1])) {
+		$user = get_user_by_username($page[1]);
+		elgg_set_page_owner_guid($user->guid);
+	} else {
+		$user = elgg_get_logged_in_user_entity();
+		elgg_set_page_owner_guid($user->guid);
+	}
+
+	elgg_push_breadcrumb(elgg_echo('settings'), "settings/user/$user->username");
+
+	switch ($page[0]) {
+		case 'statistics':
+			elgg_push_breadcrumb(elgg_echo('usersettings:statistics:opt:linktext'));
+			$path = $CONFIG->path . "pages/settings/statistics.php";
+			break;
+		case 'plugins':
+			elgg_push_breadcrumb(elgg_echo('usersettings:plugins:opt:linktext'));
+			$path = $CONFIG->path . "pages/settings/tools.php";
+			break;
+		case 'user':
+			$path = $CONFIG->path . "pages/settings/account.php";
+			break;
+	}
+
+	if (isset($path)) {
+		require $path;
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Initialize the user settings library
+ *
+ * @return void
+ * @access private
+ */
+function usersettings_init() {
+	elgg_register_page_handler('settings', 'usersettings_page_handler');
+
+	elgg_register_plugin_hook_handler('usersettings:save', 'user', 'users_settings_save');
+
+	elgg_register_action("usersettings/save");
+
+	// extend the account settings form
+	elgg_extend_view('forms/account/settings', 'core/settings/account/name', 100);
+	elgg_extend_view('forms/account/settings', 'core/settings/account/password', 100);
+	elgg_extend_view('forms/account/settings', 'core/settings/account/email', 100);
+	elgg_extend_view('forms/account/settings', 'core/settings/account/language', 100);
+	elgg_extend_view('forms/account/settings', 'core/settings/account/default_access', 100);
+}
+
+elgg_register_event_handler('init', 'system', 'usersettings_init');
+elgg_register_event_handler('pagesetup', 'system', 'usersettings_pagesetup');
diff --git a/engine/lib/users.php b/engine/lib/users.php
new file mode 100644
index 000000000..a8fb9121c
--- /dev/null
+++ b/engine/lib/users.php
@@ -0,0 +1,1611 @@
+<?php
+/**
+ * Elgg users
+ * Functions to manage multiple or single users in an Elgg install
+ *
+ * @package Elgg.Core
+ * @subpackage DataModel.User
+ */
+
+/// Map a username to a cached GUID
+global $USERNAME_TO_GUID_MAP_CACHE;
+$USERNAME_TO_GUID_MAP_CACHE = array();
+
+/// Map a user code to a cached GUID
+global $CODE_TO_GUID_MAP_CACHE;
+$CODE_TO_GUID_MAP_CACHE = array();
+
+/**
+ * Return the user specific details of a user by a row.
+ *
+ * @param int $guid The ElggUser guid
+ *
+ * @return mixed
+ * @access private
+ */
+function get_user_entity_as_row($guid) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	return get_data_row("SELECT * from {$CONFIG->dbprefix}users_entity where guid=$guid");
+}
+
+/**
+ * Create or update the entities table for a given user.
+ * Call create_entity first.
+ *
+ * @param int    $guid     The user's GUID
+ * @param string $name     The user's display name
+ * @param string $username The username
+ * @param string $password The password
+ * @param string $salt     A salt for the password
+ * @param string $email    The user's email address
+ * @param string $language The user's default language
+ * @param string $code     A code
+ *
+ * @return bool
+ * @access private
+ */
+function create_user_entity($guid, $name, $username, $password, $salt, $email, $language, $code) {
+	global $CONFIG;
+
+	$guid = (int)$guid;
+	$name = sanitise_string($name);
+	$username = sanitise_string($username);
+	$password = sanitise_string($password);
+	$salt = sanitise_string($salt);
+	$email = sanitise_string($email);
+	$language = sanitise_string($language);
+	$code = sanitise_string($code);
+
+	$row = get_entity_as_row($guid);
+	if ($row) {
+		// Exists and you have access to it
+		$query = "SELECT guid from {$CONFIG->dbprefix}users_entity where guid = {$guid}";
+		if ($exists = get_data_row($query)) {
+			$query = "UPDATE {$CONFIG->dbprefix}users_entity
+				SET name='$name', username='$username', password='$password', salt='$salt',
+				email='$email', language='$language', code='$code'
+				WHERE guid = $guid";
+
+			$result = update_data($query);
+			if ($result != false) {
+				// Update succeeded, continue
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('update', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+				}
+			}
+		} else {
+			// Exists query failed, attempt an insert.
+			$query = "INSERT into {$CONFIG->dbprefix}users_entity
+				(guid, name, username, password, salt, email, language, code)
+				values ($guid, '$name', '$username', '$password', '$salt', '$email', '$language', '$code')";
+
+			$result = insert_data($query);
+			if ($result !== false) {
+				$entity = get_entity($guid);
+				if (elgg_trigger_event('create', $entity->type, $entity)) {
+					return $guid;
+				} else {
+					$entity->delete();
+				}
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Disables all of a user's entities
+ *
+ * @param int $owner_guid The owner GUID
+ *
+ * @return bool Depending on success
+ */
+function disable_user_entities($owner_guid) {
+	global $CONFIG;
+	$owner_guid = (int) $owner_guid;
+	if ($entity = get_entity($owner_guid)) {
+		if (elgg_trigger_event('disable', $entity->type, $entity)) {
+			if ($entity->canEdit()) {
+				$query = "UPDATE {$CONFIG->dbprefix}entities
+					set enabled='no' where owner_guid={$owner_guid}
+					or container_guid = {$owner_guid}";
+
+				$res = update_data($query);
+				return $res;
+			}
+		}
+	}
+
+	return false;
+}
+
+/**
+ * Ban a user
+ *
+ * @param int    $user_guid The user guid
+ * @param string $reason    A reason
+ *
+ * @return bool
+ */
+function ban_user($user_guid, $reason = "") {
+	global $CONFIG;
+
+	$user_guid = (int)$user_guid;
+
+	$user = get_entity($user_guid);
+
+	if (($user) && ($user->canEdit()) && ($user instanceof ElggUser)) {
+		if (elgg_trigger_event('ban', 'user', $user)) {
+			// Add reason
+			if ($reason) {
+				create_metadata($user_guid, 'ban_reason', $reason, '', 0, ACCESS_PUBLIC);
+			}
+
+			// clear "remember me" cookie code so user cannot login in using it
+			$user->code = "";
+			$user->save();
+
+			// invalidate memcache for this user
+			static $newentity_cache;
+			if ((!$newentity_cache) && (is_memcache_available())) {
+				$newentity_cache = new ElggMemcache('new_entity_cache');
+			}
+
+			if ($newentity_cache) {
+				$newentity_cache->delete($user_guid);
+			}
+
+			// Set ban flag
+			$query = "UPDATE {$CONFIG->dbprefix}users_entity set banned='yes' where guid=$user_guid";
+			return update_data($query);
+		}
+
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Unban a user.
+ *
+ * @param int $user_guid Unban a user.
+ *
+ * @return bool
+ */
+function unban_user($user_guid) {
+	global $CONFIG;
+
+	$user_guid = (int)$user_guid;
+
+	$user = get_entity($user_guid);
+
+	if (($user) && ($user->canEdit()) && ($user instanceof ElggUser)) {
+		if (elgg_trigger_event('unban', 'user', $user)) {
+			create_metadata($user_guid, 'ban_reason', '', '', 0, ACCESS_PUBLIC);
+
+			// invalidate memcache for this user
+			static $newentity_cache;
+			if ((!$newentity_cache) && (is_memcache_available())) {
+				$newentity_cache = new ElggMemcache('new_entity_cache');
+			}
+
+			if ($newentity_cache) {
+				$newentity_cache->delete($user_guid);
+			}
+
+
+			$query = "UPDATE {$CONFIG->dbprefix}users_entity set banned='no' where guid=$user_guid";
+			return update_data($query);
+		}
+
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Makes user $guid an admin.
+ *
+ * @param int $user_guid User guid
+ *
+ * @return bool
+ */
+function make_user_admin($user_guid) {
+	global $CONFIG;
+
+	$user = get_entity((int)$user_guid);
+
+	if (($user) && ($user instanceof ElggUser) && ($user->canEdit())) {
+		if (elgg_trigger_event('make_admin', 'user', $user)) {
+
+			// invalidate memcache for this user
+			static $newentity_cache;
+			if ((!$newentity_cache) && (is_memcache_available())) {
+				$newentity_cache = new ElggMemcache('new_entity_cache');
+			}
+
+			if ($newentity_cache) {
+				$newentity_cache->delete($user_guid);
+			}
+
+			$r = update_data("UPDATE {$CONFIG->dbprefix}users_entity set admin='yes' where guid=$user_guid");
+			_elgg_invalidate_cache_for_entity($user_guid);
+			return $r;
+		}
+
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Removes user $guid's admin flag.
+ *
+ * @param int $user_guid User GUID
+ *
+ * @return bool
+ */
+function remove_user_admin($user_guid) {
+	global $CONFIG;
+
+	$user = get_entity((int)$user_guid);
+
+	if (($user) && ($user instanceof ElggUser) && ($user->canEdit())) {
+		if (elgg_trigger_event('remove_admin', 'user', $user)) {
+
+			// invalidate memcache for this user
+			static $newentity_cache;
+			if ((!$newentity_cache) && (is_memcache_available())) {
+				$newentity_cache = new ElggMemcache('new_entity_cache');
+			}
+
+			if ($newentity_cache) {
+				$newentity_cache->delete($user_guid);
+			}
+
+			$r = update_data("UPDATE {$CONFIG->dbprefix}users_entity set admin='no' where guid=$user_guid");
+			_elgg_invalidate_cache_for_entity($user_guid);
+			return $r;
+		}
+
+		return FALSE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Get the sites this user is part of
+ *
+ * @param int $user_guid The user's GUID
+ * @param int $limit     Number of results to return
+ * @param int $offset    Any indexing offset
+ *
+ * @return ElggSite[]|false On success, an array of ElggSites
+ */
+function get_user_sites($user_guid, $limit = 10, $offset = 0) {
+	$user_guid = (int)$user_guid;
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+
+	return elgg_get_entities_from_relationship(array(
+		'site_guids' => ELGG_ENTITIES_ANY_VALUE,
+		'relationship' => 'member_of_site',
+		'relationship_guid' => $user_guid,
+		'inverse_relationship' => FALSE,
+		'type' => 'site',
+		'limit' => $limit,
+		'offset' => $offset,
+	));
+}
+
+/**
+ * Adds a user to another user's friends list.
+ *
+ * @param int $user_guid   The GUID of the friending user
+ * @param int $friend_guid The GUID of the user to friend
+ *
+ * @return bool Depending on success
+ */
+function user_add_friend($user_guid, $friend_guid) {
+	$user_guid = (int) $user_guid;
+	$friend_guid = (int) $friend_guid;
+	if ($user_guid == $friend_guid) {
+		return false;
+	}
+	if (!$friend = get_entity($friend_guid)) {
+		return false;
+	}
+	if (!$user = get_entity($user_guid)) {
+		return false;
+	}
+	if ((!($user instanceof ElggUser)) || (!($friend instanceof ElggUser))) {
+		return false;
+	}
+	return add_entity_relationship($user_guid, "friend", $friend_guid);
+}
+
+/**
+ * Removes a user from another user's friends list.
+ *
+ * @param int $user_guid   The GUID of the friending user
+ * @param int $friend_guid The GUID of the user on the friends list
+ *
+ * @return bool Depending on success
+ */
+function user_remove_friend($user_guid, $friend_guid) {
+	$user_guid = (int) $user_guid;
+	$friend_guid = (int) $friend_guid;
+
+	// perform cleanup for access lists.
+	$collections = get_user_access_collections($user_guid);
+	if ($collections) {
+		foreach ($collections as $collection) {
+			remove_user_from_access_collection($friend_guid, $collection->id);
+		}
+	}
+
+	return remove_entity_relationship($user_guid, "friend", $friend_guid);
+}
+
+/**
+ * Determines whether or not a user is another user's friend.
+ *
+ * @param int $user_guid   The GUID of the user
+ * @param int $friend_guid The GUID of the friend
+ *
+ * @return bool
+ */
+function user_is_friend($user_guid, $friend_guid) {
+	return check_entity_relationship($user_guid, "friend", $friend_guid) !== false;
+}
+
+/**
+ * Obtains a given user's friends
+ *
+ * @param int    $user_guid The user's GUID
+ * @param string $subtype   The subtype of users, if any
+ * @param int    $limit     Number of results to return (default 10)
+ * @param int    $offset    Indexing offset, if any
+ *
+ * @return ElggUser[]|false Either an array of ElggUsers or false, depending on success
+ */
+function get_user_friends($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $limit = 10,
+$offset = 0) {
+
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'friend',
+		'relationship_guid' => $user_guid,
+		'type' => 'user',
+		'subtype' => $subtype,
+		'limit' => $limit,
+		'offset' => $offset
+	));
+}
+
+/**
+ * Obtains the people who have made a given user a friend
+ *
+ * @param int    $user_guid The user's GUID
+ * @param string $subtype   The subtype of users, if any
+ * @param int    $limit     Number of results to return (default 10)
+ * @param int    $offset    Indexing offset, if any
+ *
+ * @return ElggUser[]|false Either an array of ElggUsers or false, depending on success
+ */
+function get_user_friends_of($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $limit = 10,
+$offset = 0) {
+
+	return elgg_get_entities_from_relationship(array(
+		'relationship' => 'friend',
+		'relationship_guid' => $user_guid,
+		'inverse_relationship' => TRUE,
+		'type' => 'user',
+		'subtype' => $subtype,
+		'limit' => $limit,
+		'offset' => $offset
+	));
+}
+
+/**
+ * Obtains a list of objects owned by a user's friends
+ *
+ * @param int    $user_guid The GUID of the user to get the friends of
+ * @param string $subtype   Optionally, the subtype of objects
+ * @param int    $limit     The number of results to return (default 10)
+ * @param int    $offset    Indexing offset, if any
+ * @param int    $timelower The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper The latest time the entity can have been created. Default: all
+ *
+ * @return ElggObject[]|false An array of ElggObjects or false, depending on success
+ */
+function get_user_friends_objects($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE, $limit = 10,
+$offset = 0, $timelower = 0, $timeupper = 0) {
+
+	if ($friends = get_user_friends($user_guid, "", 999999, 0)) {
+		$friendguids = array();
+		foreach ($friends as $friend) {
+			$friendguids[] = $friend->getGUID();
+		}
+		return elgg_get_entities(array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'owner_guids' => $friendguids,
+			'limit' => $limit,
+			'offset' => $offset,
+			'container_guids' => $friendguids,
+			'created_time_lower' => $timelower,
+			'created_time_upper' => $timeupper
+		));
+	}
+	return FALSE;
+}
+
+/**
+ * Counts the number of objects owned by a user's friends
+ *
+ * @param int    $user_guid The GUID of the user to get the friends of
+ * @param string $subtype   Optionally, the subtype of objects
+ * @param int    $timelower The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper The latest time the entity can have been created. Default: all
+ *
+ * @return int The number of objects
+ */
+function count_user_friends_objects($user_guid, $subtype = ELGG_ENTITIES_ANY_VALUE,
+$timelower = 0, $timeupper = 0) {
+
+	if ($friends = get_user_friends($user_guid, "", 999999, 0)) {
+		$friendguids = array();
+		foreach ($friends as $friend) {
+			$friendguids[] = $friend->getGUID();
+		}
+		return elgg_get_entities(array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'owner_guids' => $friendguids,
+			'count' => TRUE,
+			'container_guids' => $friendguids,
+			'created_time_lower' => $timelower,
+			'created_time_upper' => $timeupper
+		));
+	}
+	return 0;
+}
+
+/**
+ * Displays a list of a user's friends' objects of a particular subtype, with navigation.
+ *
+ * @see elgg_view_entity_list
+ *
+ * @param int    $user_guid      The GUID of the user
+ * @param string $subtype        The object subtype
+ * @param int    $limit          The number of entities to display on a page
+ * @param bool   $full_view      Whether or not to display the full view (default: true)
+ * @param bool   $listtypetoggle Whether or not to allow you to flip to gallery mode (default: true)
+ * @param bool   $pagination     Whether to display pagination (default: true)
+ * @param int    $timelower      The earliest time the entity can have been created. Default: all
+ * @param int    $timeupper      The latest time the entity can have been created. Default: all
+ *
+ * @return string
+ */
+function list_user_friends_objects($user_guid, $subtype = "", $limit = 10, $full_view = true,
+$listtypetoggle = true, $pagination = true, $timelower = 0, $timeupper = 0) {
+
+	$offset = (int)get_input('offset');
+	$limit = (int)$limit;
+	$count = (int)count_user_friends_objects($user_guid, $subtype, $timelower, $timeupper);
+
+	$entities = get_user_friends_objects($user_guid, $subtype, $limit, $offset,
+		$timelower, $timeupper);
+
+	return elgg_view_entity_list($entities, array(
+		'count' => $count,
+		'offset' => $offset,
+		'limit' => $limit,
+		'full_view' => $full_view,
+		'list_type_toggle' => $listtypetoggle,
+		'pagination' => $pagination,
+	));
+}
+
+/**
+ * Get a user object from a GUID.
+ *
+ * This function returns an ElggUser from a given GUID.
+ *
+ * @param int $guid The GUID
+ *
+ * @return ElggUser|false
+ */
+function get_user($guid) {
+	// Fixes "Exception thrown without stack frame" when db_select fails
+	if (!empty($guid)) {
+		$result = get_entity($guid);
+	}
+
+	if ((!empty($result)) && (!($result instanceof ElggUser))) {
+		return false;
+	}
+
+	if (!empty($result)) {
+		return $result;
+	}
+
+	return false;
+}
+
+/**
+ * Get user by username
+ *
+ * @param string $username The user's username
+ *
+ * @return ElggUser|false Depending on success
+ */
+function get_user_by_username($username) {
+	global $CONFIG, $USERNAME_TO_GUID_MAP_CACHE;
+
+	// Fixes #6052. Username is frequently sniffed from the path info, which,
+	// unlike $_GET, is not URL decoded. If the username was not URL encoded,
+	// this is harmless.
+	$username = rawurldecode($username);
+
+	$username = sanitise_string($username);
+	$access = get_access_sql_suffix('e');
+
+	// Caching
+	if ((isset($USERNAME_TO_GUID_MAP_CACHE[$username]))
+			&& (_elgg_retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]))) {
+		return _elgg_retrieve_cached_entity($USERNAME_TO_GUID_MAP_CACHE[$username]);
+	}
+
+	$query = "SELECT e.* from {$CONFIG->dbprefix}users_entity u
+		join {$CONFIG->dbprefix}entities e on e.guid=u.guid
+		where u.username='$username' and $access ";
+
+	$entity = get_data_row($query, 'entity_row_to_elggstar');
+	if ($entity) {
+		$USERNAME_TO_GUID_MAP_CACHE[$username] = $entity->guid;
+	} else {
+		$entity = false;
+	}
+
+	return $entity;
+}
+
+/**
+ * Get user by session code
+ *
+ * @param string $code The session code
+ *
+ * @return ElggUser|false Depending on success
+ */
+function get_user_by_code($code) {
+	global $CONFIG, $CODE_TO_GUID_MAP_CACHE;
+
+	$code = sanitise_string($code);
+
+	$access = get_access_sql_suffix('e');
+
+	// Caching
+	if ((isset($CODE_TO_GUID_MAP_CACHE[$code]))
+	&& (_elgg_retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]))) {
+
+		return _elgg_retrieve_cached_entity($CODE_TO_GUID_MAP_CACHE[$code]);
+	}
+
+	$query = "SELECT e.* from {$CONFIG->dbprefix}users_entity u
+		join {$CONFIG->dbprefix}entities e on e.guid=u.guid
+		where u.code='$code' and $access";
+
+	$entity = get_data_row($query, 'entity_row_to_elggstar');
+	if ($entity) {
+		$CODE_TO_GUID_MAP_CACHE[$code] = $entity->guid;
+	}
+
+	return $entity;
+}
+
+/**
+ * Get an array of users from an email address
+ *
+ * @param string $email Email address.
+ *
+ * @return array
+ */
+function get_user_by_email($email) {
+	global $CONFIG;
+
+	$email = sanitise_string($email);
+
+	$access = get_access_sql_suffix('e');
+
+	$query = "SELECT e.* from {$CONFIG->dbprefix}entities e
+		join {$CONFIG->dbprefix}users_entity u on e.guid=u.guid
+		where email='$email' and $access";
+
+	return get_data($query, 'entity_row_to_elggstar');
+}
+
+/**
+ * A function that returns a maximum of $limit users who have done something within the last
+ * $seconds seconds or the total count of active users.
+ *
+ * @param int  $seconds Number of seconds (default 600 = 10min)
+ * @param int  $limit   Limit, default 10.
+ * @param int  $offset  Offset, default 0.
+ * @param bool $count   Count, default false.
+ *
+ * @return mixed
+ */
+function find_active_users($seconds = 600, $limit = 10, $offset = 0, $count = false) {
+	$seconds = (int)$seconds;
+	$limit = (int)$limit;
+	$offset = (int)$offset;
+	$params = array('seconds' => $seconds, 'limit' => $limit, 'offset' => $offset, 'count' => $count);
+	$data = elgg_trigger_plugin_hook('find_active_users', 'system', $params, NULL);
+	if (!$data) {
+		global $CONFIG;
+
+		$time = time() - $seconds;
+
+		$data = elgg_get_entities(array(
+			'type' => 'user', 
+			'limit' => $limit,
+			'offset' => $offset,
+			'count' => $count,
+			'joins' => array("join {$CONFIG->dbprefix}users_entity u on e.guid = u.guid"),
+			'wheres' => array("u.last_action >= {$time}"),
+			'order_by' => "u.last_action desc"
+		));
+	}
+	return $data;
+}
+
+/**
+ * Generate and send a password request email to a given user's registered email address.
+ *
+ * @param int $user_guid User GUID
+ *
+ * @return bool
+ */
+function send_new_password_request($user_guid) {
+	$user_guid = (int)$user_guid;
+
+	$user = get_entity($user_guid);
+	if ($user instanceof ElggUser) {
+		// generate code
+		$code = generate_random_cleartext_password();
+		$user->setPrivateSetting('passwd_conf_code', $code);
+
+		// generate link
+		$link = elgg_get_site_url() . "resetpassword?u=$user_guid&c=$code";
+
+		// generate email
+		$email = elgg_echo('email:resetreq:body', array($user->name, $_SERVER['REMOTE_ADDR'], $link));
+
+		return notify_user($user->guid, elgg_get_site_entity()->guid,
+			elgg_echo('email:resetreq:subject'), $email, array(), 'email');
+	}
+
+	return false;
+}
+
+/**
+ * Low level function to reset a given user's password.
+ *
+ * This can only be called from execute_new_password_request().
+ *
+ * @param int    $user_guid The user.
+ * @param string $password  Text (which will then be converted into a hash and stored)
+ *
+ * @return bool
+ */
+function force_user_password_reset($user_guid, $password) {
+	$user = get_entity($user_guid);
+	if ($user instanceof ElggUser) {
+		$ia = elgg_set_ignore_access();
+
+		$user->salt = generate_random_cleartext_password();
+		$hash = generate_user_password($user, $password);		
+		$user->password = $hash;
+		$result = (bool)$user->save();
+
+		elgg_set_ignore_access($ia);
+
+		return $result;
+	}
+
+	return false;
+}
+
+/**
+ * Validate and execute a password reset for a user.
+ *
+ * @param int    $user_guid The user id
+ * @param string $conf_code Confirmation code as sent in the request email.
+ *
+ * @return mixed
+ */
+function execute_new_password_request($user_guid, $conf_code) {
+	global $CONFIG;
+
+	$user_guid = (int)$user_guid;
+	$user = get_entity($user_guid);
+
+	if ($user instanceof ElggUser) {
+		$saved_code = $user->getPrivateSetting('passwd_conf_code');
+
+		if ($saved_code && $saved_code == $conf_code) {
+			$password = generate_random_cleartext_password();
+
+			if (force_user_password_reset($user_guid, $password)) {
+				remove_private_setting($user_guid, 'passwd_conf_code');
+				// clean the logins failures
+				reset_login_failure_count($user_guid);
+				
+				$email = elgg_echo('email:resetpassword:body', array($user->name, $password));
+
+				return notify_user($user->guid, $CONFIG->site->guid,
+					elgg_echo('email:resetpassword:subject'), $email, array(), 'email');
+			}
+		}
+	}
+
+	return FALSE;
+}
+
+/**
+ * Simple function that will generate a random clear text password
+ * suitable for feeding into generate_user_password().
+ *
+ * @see generate_user_password
+ *
+ * @return string
+ */
+function generate_random_cleartext_password() {
+	return substr(md5(microtime() . rand()), 0, 8);
+}
+
+/**
+ * Generate a password for a user, currently uses MD5.
+ *
+ * @param ElggUser $user     The user this is being generated for.
+ * @param string   $password Password in clear text
+ *
+ * @return string
+ */
+function generate_user_password(ElggUser $user, $password) {
+	return md5($password . $user->salt);
+}
+
+/**
+ * Simple function which ensures that a username contains only valid characters.
+ *
+ * This should only permit chars that are valid on the file system as well.
+ *
+ * @param string $username Username
+ *
+ * @return bool
+ * @throws RegistrationException on invalid
+ */
+function validate_username($username) {
+	global $CONFIG;
+
+	// Basic, check length
+	if (!isset($CONFIG->minusername)) {
+		$CONFIG->minusername = 4;
+	}
+
+	if (strlen($username) < $CONFIG->minusername) {
+		$msg = elgg_echo('registration:usernametooshort', array($CONFIG->minusername));
+		throw new RegistrationException($msg);
+	}
+	
+	// username in the database has a limit of 128 characters
+	if (strlen($username) > 128) {
+		$msg = elgg_echo('registration:usernametoolong', array(128));
+		throw new RegistrationException($msg);
+	}
+
+	// Blacklist for bad characters (partially nicked from mediawiki)
+	$blacklist = '/[' .
+		'\x{0080}-\x{009f}' . // iso-8859-1 control chars
+		'\x{00a0}' .          // non-breaking space
+		'\x{2000}-\x{200f}' . // various whitespace
+		'\x{2028}-\x{202f}' . // breaks and control chars
+		'\x{3000}' .          // ideographic space
+		'\x{e000}-\x{f8ff}' . // private use
+		']/u';
+
+	if (
+		preg_match($blacklist, $username)
+	) {
+		// @todo error message needs work
+		throw new RegistrationException(elgg_echo('registration:invalidchars'));
+	}
+
+	// Belts and braces
+	// @todo Tidy into main unicode
+	$blacklist2 = '\'/\\"*& ?#%^(){}[]~?<>;|¬`@-+=';
+
+	for ($n = 0; $n < strlen($blacklist2); $n++) {
+		if (strpos($username, $blacklist2[$n]) !== false) {
+			$msg = elgg_echo('registration:invalidchars', array($blacklist2[$n], $blacklist2));
+			$msg = htmlspecialchars($msg, ENT_QUOTES, 'UTF-8');
+			throw new RegistrationException($msg);
+		}
+	}
+
+	$result = true;
+	return elgg_trigger_plugin_hook('registeruser:validate:username', 'all',
+		array('username' => $username), $result);
+}
+
+/**
+ * Simple validation of a password.
+ *
+ * @param string $password Clear text password
+ *
+ * @return bool
+ * @throws RegistrationException on invalid
+ */
+function validate_password($password) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->min_password_length)) {
+		$CONFIG->min_password_length = 6;
+	}
+
+	if (strlen($password) < $CONFIG->min_password_length) {
+		$msg = elgg_echo('registration:passwordtooshort', array($CONFIG->min_password_length));
+		throw new RegistrationException($msg);
+	}
+
+	$result = true;
+	return elgg_trigger_plugin_hook('registeruser:validate:password', 'all',
+		array('password' => $password), $result);
+}
+
+/**
+ * Simple validation of a email.
+ *
+ * @param string $address Email address
+ *
+ * @throws RegistrationException on invalid
+ * @return bool
+ */
+function validate_email_address($address) {
+	if (!is_email_address($address)) {
+		throw new RegistrationException(elgg_echo('registration:notemail'));
+	}
+
+	// Got here, so lets try a hook (defaulting to ok)
+	$result = true;
+	return elgg_trigger_plugin_hook('registeruser:validate:email', 'all',
+		array('email' => $address), $result);
+}
+
+/**
+ * Registers a user, returning false if the username already exists
+ *
+ * @param string $username              The username of the new user
+ * @param string $password              The password
+ * @param string $name                  The user's display name
+ * @param string $email                 Their email address
+ * @param bool   $allow_multiple_emails Allow the same email address to be
+ *                                      registered multiple times?
+ * @param int    $friend_guid           GUID of a user to friend once fully registered
+ * @param string $invitecode            An invite code from a friend
+ *
+ * @return int|false The new user's GUID; false on failure
+ * @throws RegistrationException
+ */
+function register_user($username, $password, $name, $email,
+$allow_multiple_emails = false, $friend_guid = 0, $invitecode = '') {
+
+	// no need to trim password.
+	$username = trim($username);
+	$name = trim(strip_tags($name));
+	$email = trim($email);
+
+	// A little sanity checking
+	if (empty($username)
+	|| empty($password)
+	|| empty($name)
+	|| empty($email)) {
+		return false;
+	}
+
+	// Make sure a user with conflicting details hasn't registered and been disabled
+	$access_status = access_get_show_hidden_status();
+	access_show_hidden_entities(true);
+
+	if (!validate_email_address($email)) {
+		throw new RegistrationException(elgg_echo('registration:emailnotvalid'));
+	}
+
+	if (!validate_password($password)) {
+		throw new RegistrationException(elgg_echo('registration:passwordnotvalid'));
+	}
+
+	if (!validate_username($username)) {
+		throw new RegistrationException(elgg_echo('registration:usernamenotvalid'));
+	}
+
+	if ($user = get_user_by_username($username)) {
+		throw new RegistrationException(elgg_echo('registration:userexists'));
+	}
+
+	if ((!$allow_multiple_emails) && (get_user_by_email($email))) {
+		throw new RegistrationException(elgg_echo('registration:dupeemail'));
+	}
+
+	access_show_hidden_entities($access_status);
+
+	// Create user
+	$user = new ElggUser();
+	$user->username = $username;
+	$user->email = $email;
+	$user->name = $name;
+	$user->access_id = ACCESS_PUBLIC;
+	$user->salt = generate_random_cleartext_password(); // Note salt generated before password!
+	$user->password = generate_user_password($user, $password);
+	$user->owner_guid = 0; // Users aren't owned by anyone, even if they are admin created.
+	$user->container_guid = 0; // Users aren't contained by anyone, even if they are admin created.
+	$user->language = get_current_language();
+	$user->save();
+
+	// If $friend_guid has been set, make mutual friends
+	if ($friend_guid) {
+		if ($friend_user = get_user($friend_guid)) {
+			if ($invitecode == generate_invite_code($friend_user->username)) {
+				$user->addFriend($friend_guid);
+				$friend_user->addFriend($user->guid);
+
+				// @todo Should this be in addFriend?
+				add_to_river('river/relationship/friend/create', 'friend', $user->getGUID(), $friend_guid);
+				add_to_river('river/relationship/friend/create', 'friend', $friend_guid, $user->getGUID());
+			}
+		}
+	}
+
+	// Turn on email notifications by default
+	set_user_notification_setting($user->getGUID(), 'email', true);
+
+	return $user->getGUID();
+}
+
+/**
+ * Generates a unique invite code for a user
+ *
+ * @param string $username The username of the user sending the invitation
+ *
+ * @return string Invite code
+ */
+function generate_invite_code($username) {
+	$secret = datalist_get('__site_secret__');
+	return md5($username . $secret);
+}
+
+/**
+ * Set the validation status for a user.
+ *
+ * @param int    $user_guid The user's GUID
+ * @param bool   $status    Validated (true) or unvalidated (false)
+ * @param string $method    Optional method to say how a user was validated
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_set_user_validation_status($user_guid, $status, $method = '') {
+	$result1 = create_metadata($user_guid, 'validated', $status, '', 0, ACCESS_PUBLIC, false);
+	$result2 = create_metadata($user_guid, 'validated_method', $method, '', 0, ACCESS_PUBLIC, false);
+	if ($result1 && $result2) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
+/**
+ * Gets the validation status of a user.
+ *
+ * @param int $user_guid The user's GUID
+ * @return bool|null Null means status was not set for this user.
+ * @since 1.8.0
+ */
+function elgg_get_user_validation_status($user_guid) {
+	$md = elgg_get_metadata(array(
+		'guid' => $user_guid,
+		'metadata_name' => 'validated'
+	));
+	if ($md == false) {
+		return null;
+	}
+
+	if ($md[0]->value) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Adds collection submenu items
+ *
+ * @return void
+ * @access private
+ */
+function collections_submenu_items() {
+
+	$user = elgg_get_logged_in_user_entity();
+
+	elgg_register_menu_item('page', array(
+		'name' => 'friends:view:collections',
+		'text' => elgg_echo('friends:collections'),
+		'href' => "collections/$user->username",
+	));
+}
+
+/**
+ * Page handler for friends-related pages
+ *
+ * @param array  $segments URL segments
+ * @param string $handler  The first segment in URL used for routing
+ *
+ * @return bool
+ * @access private
+ */
+function friends_page_handler($segments, $handler) {
+	elgg_set_context('friends');
+	
+	if (isset($segments[0]) && $user = get_user_by_username($segments[0])) {
+		elgg_set_page_owner_guid($user->getGUID());
+	}
+	if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+		collections_submenu_items();
+	}
+
+	switch ($handler) {
+		case 'friends':
+			require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php");
+			break;
+		case 'friendsof':
+			require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php");
+			break;
+		default:
+			return false;
+	}
+	return true;
+}
+
+/**
+ * Page handler for friends collections
+ *
+ * @param array $page_elements Page elements
+ *
+ * @return bool
+ * @access private
+ */
+function collections_page_handler($page_elements) {
+	gatekeeper();
+	elgg_set_context('friends');
+	$base = elgg_get_config('path');
+	if (isset($page_elements[0])) {
+		if ($page_elements[0] == "add") {
+			elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+			collections_submenu_items();
+			require_once "{$base}pages/friends/collections/add.php";
+			return true;
+		} else {
+			$user = get_user_by_username($page_elements[0]);
+			if ($user) {
+				elgg_set_page_owner_guid($user->getGUID());
+				if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) {
+					collections_submenu_items();
+				}
+				require_once "{$base}pages/friends/collections/view.php";
+				return true;
+			}
+		}
+	}
+	return false;
+}
+
+/**
+ * Page handler for account related pages
+ *
+ * @param array  $page_elements Page elements
+ * @param string $handler The handler string
+ *
+ * @return bool
+ * @access private
+ */
+function elgg_user_account_page_handler($page_elements, $handler) {
+
+	$base_dir = elgg_get_root_path() . 'pages/account';
+	switch ($handler) {
+		case 'login':
+			require_once("$base_dir/login.php");
+			break;
+		case 'forgotpassword':
+			require_once("$base_dir/forgotten_password.php");
+			break;
+		case 'resetpassword':
+			require_once("$base_dir/reset_password.php");
+			break;
+		case 'register':
+			require_once("$base_dir/register.php");
+			break;
+		default:
+			return false;
+	}
+	return true;
+}
+
+/**
+ * Sets the last action time of the given user to right now.
+ *
+ * @param int $user_guid The user GUID
+ *
+ * @return void
+ */
+function set_last_action($user_guid) {
+	$user_guid = (int) $user_guid;
+	global $CONFIG;
+	$time = time();
+
+	$query = "UPDATE {$CONFIG->dbprefix}users_entity
+		set prev_last_action = last_action,
+		last_action = {$time} where guid = {$user_guid}";
+
+	execute_delayed_write_query($query);
+}
+
+/**
+ * Sets the last logon time of the given user to right now.
+ *
+ * @param int $user_guid The user GUID
+ *
+ * @return void
+ */
+function set_last_login($user_guid) {
+	$user_guid = (int) $user_guid;
+	global $CONFIG;
+	$time = time();
+
+	$query = "UPDATE {$CONFIG->dbprefix}users_entity
+		set prev_last_login = last_login, last_login = {$time} where guid = {$user_guid}";
+
+	execute_delayed_write_query($query);
+}
+
+/**
+ * Creates a relationship between this site and the user.
+ *
+ * @param string   $event       create
+ * @param string   $object_type user
+ * @param ElggUser $object      User object
+ *
+ * @return void
+ * @access private
+ */
+function user_create_hook_add_site_relationship($event, $object_type, $object) {
+	add_entity_relationship($object->getGUID(), 'member_of_site', elgg_get_site_entity()->guid);
+}
+
+/**
+ * Serves the user's avatar
+ *
+ * @param string $hook
+ * @param string $entity_type
+ * @param string $returnvalue
+ * @param array  $params
+ * @return string
+ * @access private
+ */
+function user_avatar_hook($hook, $entity_type, $returnvalue, $params) {
+	$user = $params['entity'];
+	$size = $params['size'];
+
+	if (isset($user->icontime)) {
+		return "avatar/view/$user->username/$size/$user->icontime";
+	} else {
+		return "_graphics/icons/user/default{$size}.gif";
+	}
+}
+
+/**
+ * Setup the default user hover menu
+ * @access private
+ */
+function elgg_user_hover_menu($hook, $type, $return, $params) {
+	$user = $params['entity'];
+	/* @var ElggUser $user */
+
+	if (elgg_is_logged_in()) {
+		if (elgg_get_logged_in_user_guid() != $user->guid) {
+			if ($user->isFriend()) {
+				$url = "action/friends/remove?friend={$user->guid}";
+				$text = elgg_echo('friend:remove');
+				$name = 'remove_friend';
+			} else {
+				$url = "action/friends/add?friend={$user->guid}";
+				$text = elgg_echo('friend:add');
+				$name = 'add_friend';
+			}
+			$url = elgg_add_action_tokens_to_url($url);
+			$item = new ElggMenuItem($name, $text, $url);
+			$item->setSection('action');
+			$return[] = $item;
+		} else {
+			$url = "profile/$user->username/edit";
+			$item = new ElggMenuItem('profile:edit', elgg_echo('profile:edit'), $url);
+			$item->setSection('action');
+			$return[] = $item;
+
+			$url = "avatar/edit/$user->username";
+			$item = new ElggMenuItem('avatar:edit', elgg_echo('avatar:edit'), $url);
+			$item->setSection('action');
+			$return[] = $item;
+		}
+	}
+
+	// prevent admins from banning or deleting themselves
+	if (elgg_get_logged_in_user_guid() == $user->guid) {
+		return $return;
+	}
+
+	if (elgg_is_admin_logged_in()) {
+		$actions = array();
+		if (!$user->isBanned()) {
+			$actions[] = 'ban';
+		} else {
+			$actions[] = 'unban';
+		}
+		$actions[] = 'delete';
+		$actions[] = 'resetpassword';
+		if (!$user->isAdmin()) {
+			$actions[] = 'makeadmin';
+		} else {
+			$actions[] = 'removeadmin';
+		}
+
+		foreach ($actions as $action) {
+			$url = "action/admin/user/$action?guid={$user->guid}";
+			$url = elgg_add_action_tokens_to_url($url);
+			$item = new ElggMenuItem($action, elgg_echo($action), $url);
+			$item->setSection('admin');
+			$item->setLinkClass('elgg-requires-confirmation');
+
+			$return[] = $item;
+		}
+
+		$url = "profile/$user->username/edit";
+		$item = new ElggMenuItem('profile:edit', elgg_echo('profile:edit'), $url);
+		$item->setSection('admin');
+		$return[] = $item;
+
+		$url = "settings/user/$user->username";
+		$item = new ElggMenuItem('settings:edit', elgg_echo('settings:edit'), $url);
+		$item->setSection('admin');
+		$return[] = $item;
+	}
+
+	return $return;
+}
+
+/**
+ * Setup the menu shown with an entity
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array $return
+ * @param array $params
+ * @return array
+ *
+ * @access private
+ */
+function elgg_users_setup_entity_menu($hook, $type, $return, $params) {
+	if (elgg_in_context('widgets')) {
+		return $return;
+	}
+
+	$entity = $params['entity'];
+	if (!elgg_instanceof($entity, 'user')) {
+		return $return;
+	}
+	/* @var ElggUser $entity */
+
+	if ($entity->isBanned()) {
+		$banned = elgg_echo('banned');
+		$options = array(
+			'name' => 'banned',
+			'text' => "<span>$banned</span>",
+			'href' => false,
+			'priority' => 0,
+		);
+		$return = array(ElggMenuItem::factory($options));
+	} else {
+		$return = array();
+		if (isset($entity->location)) {
+			$location = htmlspecialchars($entity->location, ENT_QUOTES, 'UTF-8', false);
+			$options = array(
+				'name' => 'location',
+				'text' => "<span>$location</span>",
+				'href' => false,
+				'priority' => 150,
+			);
+			$return[] = ElggMenuItem::factory($options);
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * This function loads a set of default fields into the profile, then triggers a hook letting other plugins to edit
+ * add and delete fields.
+ *
+ * Note: This is a secondary system:init call and is run at a super low priority to guarantee that it is called after all
+ * other plugins have initialised.
+ * @access private
+ */
+function elgg_profile_fields_setup() {
+	global $CONFIG;
+
+	$profile_defaults = array (
+		'description' => 'longtext',
+		'briefdescription' => 'text',
+		'location' => 'location',
+		'interests' => 'tags',
+		'skills' => 'tags',
+		'contactemail' => 'email',
+		'phone' => 'text',
+		'mobile' => 'text',
+		'website' => 'url',
+		'twitter' => 'text'
+	);
+
+	$loaded_defaults = array();
+	if ($fieldlist = elgg_get_config('profile_custom_fields')) {
+		if (!empty($fieldlist)) {
+			$fieldlistarray = explode(',', $fieldlist);
+			foreach ($fieldlistarray as $listitem) {
+				if ($translation = elgg_get_config("admin_defined_profile_{$listitem}")) {
+					$type = elgg_get_config("admin_defined_profile_type_{$listitem}");
+					$loaded_defaults["admin_defined_profile_{$listitem}"] = $type;
+					add_translation(get_current_language(), array("profile:admin_defined_profile_{$listitem}" => $translation));
+				}
+			}
+		}
+	}
+
+	if (count($loaded_defaults)) {
+		$CONFIG->profile_using_custom = true;
+		$profile_defaults = $loaded_defaults;
+	}
+
+	$CONFIG->profile_fields = elgg_trigger_plugin_hook('profile:fields', 'profile', NULL, $profile_defaults);
+
+	// register any tag metadata names
+	foreach ($CONFIG->profile_fields as $name => $type) {
+		if ($type == 'tags' || $type == 'location' || $type == 'tag') {
+			elgg_register_tag_metadata_name($name);
+			// register a tag name translation
+			add_translation(get_current_language(), array("tag_names:$name" => elgg_echo("profile:$name")));
+		}
+	}
+}
+
+/**
+ * Avatar page handler
+ *
+ * /avatar/edit/<username>
+ * /avatar/view/<username>/<size>/<icontime>
+ *
+ * @param array $page
+ * @return bool
+ * @access private
+ */
+function elgg_avatar_page_handler($page) {
+	global $CONFIG;
+
+	$user = get_user_by_username($page[1]);
+	if ($user) {
+		elgg_set_page_owner_guid($user->getGUID());
+	}
+
+	if ($page[0] == 'edit') {
+		require_once("{$CONFIG->path}pages/avatar/edit.php");
+		return true;
+	} else {
+		set_input('size', $page[2]);
+		require_once("{$CONFIG->path}pages/avatar/view.php");
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Profile page handler
+ *
+ * @param array $page
+ * @return bool
+ * @access private
+ */
+function elgg_profile_page_handler($page) {
+	global $CONFIG;
+
+	$user = get_user_by_username($page[0]);
+	elgg_set_page_owner_guid($user->guid);
+
+	if ($page[1] == 'edit') {
+		require_once("{$CONFIG->path}pages/profile/edit.php");
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Sets up user-related menu items
+ *
+ * @return void
+ * @access private
+ */
+function users_pagesetup() {
+
+	$owner = elgg_get_page_owner_entity();
+	$viewer = elgg_get_logged_in_user_entity();
+
+	if ($owner) {
+		$params = array(
+			'name' => 'friends',
+			'text' => elgg_echo('friends'),
+			'href' => 'friends/' . $owner->username,
+			'contexts' => array('friends')
+		);
+		elgg_register_menu_item('page', $params);
+
+		$params = array(
+			'name' => 'friends:of',
+			'text' => elgg_echo('friends:of'),
+			'href' => 'friendsof/' . $owner->username,
+			'contexts' => array('friends')
+		);
+		elgg_register_menu_item('page', $params);
+		
+		elgg_register_menu_item('page', array(
+			'name' => 'edit_avatar',
+			'href' => "avatar/edit/{$owner->username}",
+			'text' => elgg_echo('avatar:edit'),
+			'contexts' => array('profile_edit'),
+		));
+
+		elgg_register_menu_item('page', array(
+			'name' => 'edit_profile',
+			'href' => "profile/{$owner->username}/edit",
+			'text' => elgg_echo('profile:edit'),
+			'contexts' => array('profile_edit'),
+		));
+	}
+
+	// topbar
+	if ($viewer) {
+		elgg_register_menu_item('topbar', array(
+			'name' => 'profile',
+			'href' => $viewer->getURL(),
+			'text' => elgg_view('output/img', array(
+				'src' => $viewer->getIconURL('topbar'),
+				'alt' => $viewer->name,
+				'title' => elgg_echo('profile'),
+				'class' => 'elgg-border-plain elgg-transition',
+			)),
+			'priority' => 100,
+			'link_class' => 'elgg-topbar-avatar',
+		));
+
+		elgg_register_menu_item('topbar', array(
+			'name' => 'friends',
+			'href' => "friends/{$viewer->username}",
+			'text' => elgg_view_icon('users'),
+			'title' => elgg_echo('friends'),
+			'priority' => 300,
+		));
+
+		elgg_register_menu_item('topbar', array(
+			'name' => 'usersettings',
+			'href' => "settings/user/{$viewer->username}",
+			'text' => elgg_view_icon('settings') . elgg_echo('settings'),
+			'priority' => 500,
+			'section' => 'alt',
+		));
+
+		elgg_register_menu_item('topbar', array(
+			'name' => 'logout',
+			'href' => "action/logout",
+			'text' => elgg_echo('logout'),
+			'is_action' => TRUE,
+			'priority' => 1000,
+			'section' => 'alt',
+		));
+	}
+}
+
+/**
+ * Users initialisation function, which establishes the page handler
+ *
+ * @return void
+ * @access private
+ */
+function users_init() {
+
+	elgg_register_page_handler('friends', 'friends_page_handler');
+	elgg_register_page_handler('friendsof', 'friends_page_handler');
+	elgg_register_page_handler('register', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('forgotpassword', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('resetpassword', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('login', 'elgg_user_account_page_handler');
+	elgg_register_page_handler('avatar', 'elgg_avatar_page_handler');
+	elgg_register_page_handler('profile', 'elgg_profile_page_handler');
+	elgg_register_page_handler('collections', 'collections_page_handler');
+
+	elgg_register_plugin_hook_handler('register', 'menu:user_hover', 'elgg_user_hover_menu');
+
+	elgg_register_action('register', '', 'public');
+	elgg_register_action('useradd', '', 'admin');
+	elgg_register_action('friends/add');
+	elgg_register_action('friends/remove');
+	elgg_register_action('avatar/upload');
+	elgg_register_action('avatar/crop');
+	elgg_register_action('avatar/remove');
+	elgg_register_action('profile/edit');
+
+	elgg_register_action('friends/collections/add');
+	elgg_register_action('friends/collections/delete');
+	elgg_register_action('friends/collections/edit');
+
+	elgg_register_plugin_hook_handler('entity:icon:url', 'user', 'user_avatar_hook');
+
+	elgg_register_action('user/passwordreset', '', 'public');
+	elgg_register_action('user/requestnewpassword', '', 'public');
+
+	elgg_register_widget_type('friends', elgg_echo('friends'), elgg_echo('friends:widget:description'));
+
+	// Register the user type
+	elgg_register_entity_type('user', '');
+
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'elgg_users_setup_entity_menu', 501);
+
+	elgg_register_event_handler('create', 'user', 'user_create_hook_add_site_relationship');
+}
+
+/**
+ * Runs unit tests for ElggObject
+ *
+ * @param string $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function users_test($hook, $type, $value, $params) {
+	global $CONFIG;
+	$value[] = "{$CONFIG->path}engine/tests/objects/users.php";
+	return $value;
+}
+
+elgg_register_event_handler('init', 'system', 'users_init', 0);
+elgg_register_event_handler('init', 'system', 'elgg_profile_fields_setup', 10000); // Ensure this runs after other plugins
+elgg_register_event_handler('pagesetup', 'system', 'users_pagesetup', 0);
+elgg_register_plugin_hook_handler('unit_test', 'system', 'users_test');
diff --git a/engine/lib/views.php b/engine/lib/views.php
new file mode 100644
index 000000000..1142461fe
--- /dev/null
+++ b/engine/lib/views.php
@@ -0,0 +1,1665 @@
+<?php
+/**
+ * Elgg's view system.
+ *
+ * The view system is the primary templating engine in Elgg and renders
+ * all output.  Views are short, parameterised PHP scripts for displaying
+ * output that can be regsitered, overridden, or extended.  The view type
+ * determines the output format and location of the files that renders the view.
+ *
+ * Elgg uses a two step process to render full output: first
+ * content-specific elements are rendered, then the resulting
+ * content is inserted into a layout and displayed.  This makes it
+ * easy to maintain a consistent look on all pages.
+ *
+ * A view corresponds to a single file on the filesystem and the views
+ * name is its directory structure.  A file in
+ * <code>mod/plugins/views/default/myplugin/example.php</code>
+ * is called by saying (with the default viewtype):
+ * <code>echo elgg_view('myplugin/example');</code>
+ *
+ * View names that are registered later override those that are
+ * registered earlier.  For plugins this corresponds directly
+ * to their load order: views in plugins lower in the list override
+ * those higher in the list.
+ *
+ * Plugin views belong in the views/ directory under an appropriate
+ * viewtype.  Views are automatically registered.
+ *
+ * Views can be embedded-you can call a view from within a view.
+ * Views can also be prepended or extended by any other view.
+ *
+ * Any view can extend any other view if registered with
+ * {@link elgg_extend_view()}.
+ *
+ * View types are set by passing $_REQUEST['view'].  The view type
+ * 'default' is a standard HTML view.  Types can be defined on the fly
+ * and you can get the current view type with {@link get_current_view()}.
+ *
+ * @internal Plugin views are autoregistered before their init functions
+ * are called, so the init order doesn't affect views.
+ *
+ * @internal The file that determines the output of the view is the last
+ * registered by {@link elgg_set_view_location()}.
+ *
+ * @package Elgg.Core
+ * @subpackage Views
+ * @link http://docs.elgg.org/Views
+ */
+
+/**
+ * The view type override.
+ *
+ * @global string $CURRENT_SYSTEM_VIEWTYPE
+ * @see elgg_set_viewtype()
+ */
+global $CURRENT_SYSTEM_VIEWTYPE;
+$CURRENT_SYSTEM_VIEWTYPE = "";
+
+/**
+ * Manually set the viewtype.
+ *
+ * View types are detected automatically.  This function allows
+ * you to force subsequent views to use a different viewtype.
+ *
+ * @tip Call elgg_set_viewtype() with no parameter to reset.
+ *
+ * @param string $viewtype The view type, e.g. 'rss', or 'default'.
+ *
+ * @return bool
+ * @link http://docs.elgg.org/Views/Viewtype
+ * @example views/viewtype.php
+ */
+function elgg_set_viewtype($viewtype = "") {
+	global $CURRENT_SYSTEM_VIEWTYPE;
+
+	$CURRENT_SYSTEM_VIEWTYPE = $viewtype;
+
+	return true;
+}
+
+/**
+ * Return the current view type.
+ *
+ * View types are automatically detected and can be set with $_REQUEST['view']
+ * or {@link elgg_set_viewtype()}.
+ *
+ * @internal View type is determined in this order:
+ *  - $CURRENT_SYSTEM_VIEWTYPE Any overrides by {@link elgg_set_viewtype()}
+ *  - $CONFIG->view  The default view as saved in the DB.
+ *  - $_SESSION['view']
+ *
+ * @return string The view.
+ * @see elgg_set_viewtype()
+ * @link http://docs.elgg.org/Views
+ * @todo This function's sessions stuff needs rewritten, removed, or explained.
+ */
+function elgg_get_viewtype() {
+	global $CURRENT_SYSTEM_VIEWTYPE, $CONFIG;
+
+	if ($CURRENT_SYSTEM_VIEWTYPE != "") {
+		return $CURRENT_SYSTEM_VIEWTYPE;
+	}
+
+	$viewtype = get_input('view', '', false);
+	if (is_string($viewtype) && $viewtype !== '') {
+		// only word characters allowed.
+		if (!preg_match('/\W/', $viewtype)) {
+			return $viewtype;
+		}
+	}
+
+	if (!empty($CONFIG->view)) {
+		return $CONFIG->view;
+	}
+
+	return 'default';
+}
+
+/**
+ * Register a view type as valid.
+ *
+ * @param string $view_type The view type to register
+ * @return bool
+ */
+function elgg_register_viewtype($view_type) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->view_types) || !is_array($CONFIG->view_types)) {
+		$CONFIG->view_types = array();
+	}
+
+	if (!in_array($view_type, $CONFIG->view_types)) {
+		$CONFIG->view_types[] = $view_type;
+	}
+
+	return true;
+}
+
+/**
+ * Checks if $view_type is valid on this installation.
+ *
+ * @param string $view_type View type
+ *
+ * @return bool
+ * @since 1.7.2
+ * @access private
+ */
+function elgg_is_valid_view_type($view_type) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->view_types) || !is_array($CONFIG->view_types)) {
+		return FALSE;
+	}
+
+	return in_array($view_type, $CONFIG->view_types);
+}
+
+/**
+ * Register a viewtype to fall back to a default view if a view isn't
+ * found for that viewtype.
+ *
+ * @tip This is useful for alternate html viewtypes (such as for mobile devices).
+ *
+ * @param string $viewtype The viewtype to register
+ *
+ * @return void
+ * @since 1.7.2
+ * @example views/viewtype_fallback.php Fallback from mobile to default.
+ */
+function elgg_register_viewtype_fallback($viewtype) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->viewtype)) {
+		$CONFIG->viewtype = new stdClass;
+	}
+
+	if (!isset($CONFIG->viewtype->fallback)) {
+		$CONFIG->viewtype->fallback = array();
+	}
+
+	$CONFIG->viewtype->fallback[] = $viewtype;
+}
+
+/**
+ * Checks if a viewtype falls back to default.
+ *
+ * @param string $viewtype Viewtype
+ *
+ * @return boolean
+ * @since 1.7.2
+ */
+function elgg_does_viewtype_fallback($viewtype) {
+	global $CONFIG;
+
+	if (isset($CONFIG->viewtype) && isset($CONFIG->viewtype->fallback)) {
+		return in_array($viewtype, $CONFIG->viewtype->fallback);
+	}
+
+	return FALSE;
+}
+
+/**
+ * Register a view to be available for ajax calls
+ *
+ * @param string $view The view name
+ * @return void
+ * @since 1.8.3
+ */
+function elgg_register_ajax_view($view) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->allowed_ajax_views)) {
+		$CONFIG->allowed_ajax_views = array();
+	}
+
+	$CONFIG->allowed_ajax_views[$view] = true;
+}
+
+/**
+ * Unregister a view for ajax calls
+ *
+ * @param string $view The view name
+ * @return void
+ * @since 1.8.3
+ */
+function elgg_unregister_ajax_view($view) {
+	global $CONFIG;
+
+	if (isset($CONFIG->allowed_ajax_views[$view])) {
+		unset($CONFIG->allowed_ajax_views[$view]);
+	}
+}
+
+/**
+ * Returns the file location for a view.
+ *
+ * @warning This doesn't check if the file exists, but only
+ * constructs (or extracts) the path and returns it.
+ *
+ * @param string $view     The view.
+ * @param string $viewtype The viewtype
+ *
+ * @return string
+ */
+function elgg_get_view_location($view, $viewtype = '') {
+	global $CONFIG;
+
+	if (empty($viewtype)) {
+		$viewtype = elgg_get_viewtype();
+	}
+
+	if (!isset($CONFIG->views->locations[$viewtype][$view])) {
+		if (!isset($CONFIG->viewpath)) {
+			return dirname(dirname(dirname(__FILE__))) . "/views/";
+		} else {
+			return $CONFIG->viewpath;
+		}
+	} else {
+		return $CONFIG->views->locations[$viewtype][$view];
+	}
+}
+
+/**
+ * Set an alternative base location for a view.
+ *
+ * Views are expected to be in plugin_name/views/.  This function can
+ * be used to change that location.
+ *
+ * @internal Core view locations are stored in $CONFIG->viewpath.
+ *
+ * @tip This is useful to optionally register views in a plugin.
+ *
+ * @param string $view     The name of the view
+ * @param string $location The base location path
+ * @param string $viewtype The view type
+ *
+ * @return void
+ */
+function elgg_set_view_location($view, $location, $viewtype = '') {
+	global $CONFIG;
+
+	if (empty($viewtype)) {
+		$viewtype = 'default';
+	}
+
+	if (!isset($CONFIG->views)) {
+		$CONFIG->views = new stdClass;
+	}
+
+	if (!isset($CONFIG->views->locations)) {
+		$CONFIG->views->locations = array($viewtype => array($view => $location));
+
+	} else if (!isset($CONFIG->views->locations[$viewtype])) {
+		$CONFIG->views->locations[$viewtype] = array($view => $location);
+
+	} else {
+		$CONFIG->views->locations[$viewtype][$view] = $location;
+	}
+}
+
+/**
+ * Returns whether the specified view exists
+ *
+ * @note If $recurse is true, also checks if a view exists only as an extension.
+ *
+ * @param string $view     The view name
+ * @param string $viewtype If set, forces the viewtype
+ * @param bool   $recurse  If false, do not check extensions
+ *
+ * @return bool
+ */
+function elgg_view_exists($view, $viewtype = '', $recurse = true) {
+	global $CONFIG;
+
+	// Detect view type
+	if (empty($viewtype)) {
+		$viewtype = elgg_get_viewtype();
+	}
+
+	if (!isset($CONFIG->views->locations[$viewtype][$view])) {
+		if (!isset($CONFIG->viewpath)) {
+			$location = dirname(dirname(dirname(__FILE__))) . "/views/";
+		} else {
+			$location = $CONFIG->viewpath;
+		}
+	} else {
+		$location = $CONFIG->views->locations[$viewtype][$view];
+	}
+
+	if (file_exists("{$location}{$viewtype}/{$view}.php")) {
+		return true;
+	}
+
+	// If we got here then check whether this exists as an extension
+	// We optionally recursively check whether the extended view exists also for the viewtype
+	if ($recurse && isset($CONFIG->views->extensions[$view])) {
+		foreach ($CONFIG->views->extensions[$view] as $view_extension) {
+			// do not recursively check to stay away from infinite loops
+			if (elgg_view_exists($view_extension, $viewtype, false)) {
+				return true;
+			}
+		}
+	}
+
+	// Now check if the default view exists if the view is registered as a fallback
+	if ($viewtype != 'default' && elgg_does_viewtype_fallback($viewtype)) {
+		return elgg_view_exists($view, 'default');
+	}
+
+	return false;
+}
+
+/**
+ * Return a parsed view.
+ *
+ * Views are rendered by a template handler and returned as strings.
+ *
+ * Views are called with a special $vars variable set,
+ * which includes any variables passed as the second parameter.
+ * For backward compatbility, the following variables are also set but we
+ * recommend that you do not use them:
+ *  - $vars['config'] The $CONFIG global. (Use {@link elgg_get_config()} instead).
+ *  - $vars['url'] The site URL. (use {@link elgg_get_site_url()} instead).
+ *  - $vars['user'] The logged in user. (use {@link elgg_get_logged_in_user_entity()} instead).
+ *
+ * Custom template handlers can be set with {@link set_template_handler()}.
+ *
+ * The output of views can be intercepted by registering for the
+ * view, $view_name plugin hook.
+ *
+ * @warning Any variables in $_SESSION will override passed vars
+ * upon name collision.  See https://github.com/Elgg/Elgg/issues/2124
+ *
+ * @param string  $view     The name and location of the view to use
+ * @param array   $vars     Variables to pass to the view.
+ * @param boolean $bypass   If set to true, elgg_view will bypass any specified
+ *                          alternative template handler; by default, it will
+ *                          hand off to this if requested (see set_template_handler)
+ * @param boolean $ignored  This argument is ignored and will be removed eventually
+ * @param string  $viewtype If set, forces the viewtype for the elgg_view call to be
+ *                          this value (default: standard detection)
+ *
+ * @return string The parsed view
+ * @see set_template_handler()
+ * @example views/elgg_view.php
+ * @link http://docs.elgg.org/View
+ */
+function elgg_view($view, $vars = array(), $bypass = false, $ignored = false, $viewtype = '') {
+	global $CONFIG;
+
+	if (!is_string($view) || !is_string($viewtype)) {
+		elgg_log("View and Viewtype in views must be a strings: $view", 'NOTICE');
+		return '';
+	}
+	// basic checking for bad paths
+	if (strpos($view, '..') !== false) {
+		return '';
+	}
+
+	if (!is_array($vars)) {
+		elgg_log("Vars in views must be an array: $view", 'ERROR');
+		$vars = array();
+	}
+
+	// Get the current viewtype
+	if ($viewtype === '') {
+		$viewtype = elgg_get_viewtype();
+	} elseif (preg_match('/\W/', $viewtype)) {
+		// Viewtypes can only be alphanumeric
+		return '';
+	}
+
+	$view_orig = $view;
+
+	// Trigger the pagesetup event
+	if (!isset($CONFIG->pagesetupdone) && $CONFIG->boot_complete) {
+		$CONFIG->pagesetupdone = true;
+		elgg_trigger_event('pagesetup', 'system');
+	}
+
+	// @warning - plugin authors: do not expect user, config, and url to be
+	// set by elgg_view() in the future. Instead, use elgg_get_logged_in_user_entity(),
+	// elgg_get_config(), and elgg_get_site_url() in your views.
+	if (!isset($vars['user'])) {
+		$vars['user'] = elgg_get_logged_in_user_entity();
+	}
+	if (!isset($vars['config'])) {
+		$vars['config'] = $CONFIG;
+	}
+	if (!isset($vars['url'])) {
+		$vars['url'] = elgg_get_site_url();
+	}
+
+	// full_view is the new preferred key for full view on entities @see elgg_view_entity()
+	// check if full_view is set because that means we've already rewritten it and this is
+	// coming from another view passing $vars directly.
+	if (isset($vars['full']) && !isset($vars['full_view'])) {
+		elgg_deprecated_notice("Use \$vars['full_view'] instead of \$vars['full']", 1.8, 2);
+		$vars['full_view'] = $vars['full'];
+	}
+	if (isset($vars['full_view'])) {
+		$vars['full'] = $vars['full_view'];
+	}
+
+	// internalname => name (1.8)
+	if (isset($vars['internalname']) && !isset($vars['__ignoreInternalname']) && !isset($vars['name'])) {
+		elgg_deprecated_notice('You should pass $vars[\'name\'] now instead of $vars[\'internalname\']', 1.8, 2);
+		$vars['name'] = $vars['internalname'];
+	} elseif (isset($vars['name'])) {
+		if (!isset($vars['internalname'])) {
+			$vars['__ignoreInternalname'] = '';
+		}
+		$vars['internalname'] = $vars['name'];
+	}
+
+	// internalid => id (1.8)
+	if (isset($vars['internalid']) && !isset($vars['__ignoreInternalid']) && !isset($vars['name'])) {
+		elgg_deprecated_notice('You should pass $vars[\'id\'] now instead of $vars[\'internalid\']', 1.8, 2);
+		$vars['id'] = $vars['internalid'];
+	} elseif (isset($vars['id'])) {
+		if (!isset($vars['internalid'])) {
+			$vars['__ignoreInternalid'] = '';
+		}
+		$vars['internalid'] = $vars['id'];
+	}
+
+	// If it's been requested, pass off to a template handler instead
+	if ($bypass == false && isset($CONFIG->template_handler) && !empty($CONFIG->template_handler)) {
+		$template_handler = $CONFIG->template_handler;
+		if (is_callable($template_handler)) {
+			return call_user_func($template_handler, $view, $vars);
+		}
+	}
+
+	// Set up any extensions to the requested view
+	if (isset($CONFIG->views->extensions[$view])) {
+		$viewlist = $CONFIG->views->extensions[$view];
+	} else {
+		$viewlist = array(500 => $view);
+	}
+
+	// Start the output buffer, find the requested view file, and execute it
+	ob_start();
+
+	foreach ($viewlist as $priority => $view) {
+
+		$view_location = elgg_get_view_location($view, $viewtype);
+		$view_file = "$view_location$viewtype/$view.php";
+
+		// try to include view
+		if (!file_exists($view_file) || !include($view_file)) {
+			// requested view does not exist
+			$error = "$viewtype/$view view does not exist.";
+
+			// attempt to load default view
+			if ($viewtype !== 'default' && elgg_does_viewtype_fallback($viewtype)) {
+
+				$default_location = elgg_get_view_location($view, 'default');
+				$default_view_file = "{$default_location}default/$view.php";
+
+				if (file_exists($default_view_file) && include($default_view_file)) {
+					// default view found
+					$error .= " Using default/$view instead.";
+				} else {
+					// no view found at all
+					$error = "Neither $viewtype/$view nor default/$view view exists.";
+				}
+			}
+
+			// log warning
+			elgg_log($error, 'NOTICE');
+		}
+	}
+
+	// Save the output buffer into the $content variable
+	$content = ob_get_clean();
+
+	// Plugin hook
+	$params = array('view' => $view_orig, 'vars' => $vars, 'viewtype' => $viewtype);
+	$content = elgg_trigger_plugin_hook('view', $view_orig, $params, $content);
+
+	// backward compatibility with less granular hook will be gone in 2.0
+	$content_tmp = elgg_trigger_plugin_hook('display', 'view', $params, $content);
+
+	if ($content_tmp !== $content) {
+		$content = $content_tmp;
+		elgg_deprecated_notice('The display:view plugin hook is deprecated by view:view_name', 1.8);
+	}
+
+	return $content;
+}
+
+/**
+ * Extends a view with another view.
+ *
+ * The output of any view can be prepended or appended to any other view.
+ *
+ * The default action is to append a view.  If the priority is less than 500,
+ * the output of the extended view will be appended to the original view.
+ *
+ * Priority can be specified and affects the order in which extensions
+ * are appended or prepended.
+ *
+ * @internal View extensions are stored in
+ * $CONFIG->views->extensions[$view][$priority] = $view_extension
+ *
+ * @param string $view           The view to extend.
+ * @param string $view_extension This view is added to $view
+ * @param int    $priority       The priority, from 0 to 1000,
+ *                               to add at (lowest numbers displayed first)
+ *
+ * @return void
+ * @since 1.7.0
+ * @link http://docs.elgg.org/Views/Extend
+ * @example views/extend.php
+ */
+function elgg_extend_view($view, $view_extension, $priority = 501) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->views)) {
+		$CONFIG->views = (object) array(
+			'extensions' => array(),
+		);
+		$CONFIG->views->extensions[$view][500] = (string)$view;
+	} else {
+		if (!isset($CONFIG->views->extensions[$view])) {
+			$CONFIG->views->extensions[$view][500] = (string)$view;
+		}
+	}
+
+	// raise priority until it doesn't match one already registered
+	while (isset($CONFIG->views->extensions[$view][$priority])) {
+		$priority++;
+	}
+
+	$CONFIG->views->extensions[$view][$priority] = (string)$view_extension;
+	ksort($CONFIG->views->extensions[$view]);
+}
+
+/**
+ * Unextends a view.
+ *
+ * @param string $view           The view that was extended.
+ * @param string $view_extension This view that was added to $view
+ *
+ * @return bool
+ * @since 1.7.2
+ */
+function elgg_unextend_view($view, $view_extension) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->views->extensions[$view])) {
+		return FALSE;
+	}
+
+	$priority = array_search($view_extension, $CONFIG->views->extensions[$view]);
+	if ($priority === FALSE) {
+		return FALSE;
+	}
+
+	unset($CONFIG->views->extensions[$view][$priority]);
+
+	return TRUE;
+}
+
+/**
+ * Assembles and outputs a full page.
+ *
+ * A "page" in Elgg is determined by the current view type and
+ * can be HTML for a browser, RSS for a feed reader, or
+ * Javascript, PHP and a number of other formats.
+ *
+ * @param string $title      Title
+ * @param string $body       Body
+ * @param string $page_shell Optional page shell to use. See page/shells view directory
+ * @param array  $vars       Optional vars array to pass to the page
+ *                           shell. Automatically adds title, body, and sysmessages
+ *
+ * @return string The contents of the page
+ * @since  1.8
+ */
+function elgg_view_page($title, $body, $page_shell = 'default', $vars = array()) {
+
+	$messages = null;
+	if (count_messages()) {
+		// get messages - try for errors first
+		$messages = system_messages(NULL, "error");
+		if (count($messages["error"]) == 0) {
+			// no errors so grab rest of messages
+			$messages = system_messages(null, "");
+		} else {
+			// we have errors - clear out remaining messages
+			system_messages(null, "");
+		}
+	}
+
+	$vars['title'] = $title;
+	$vars['body'] = $body;
+	$vars['sysmessages'] = $messages;
+
+	$vars = elgg_trigger_plugin_hook('output:before', 'page', null, $vars);
+	
+	// check for deprecated view
+	if ($page_shell == 'default' && elgg_view_exists('pageshells/pageshell')) {
+		elgg_deprecated_notice("pageshells/pageshell is deprecated by page/$page_shell", 1.8);
+		$output = elgg_view('pageshells/pageshell', $vars);
+	} else {
+		$output = elgg_view("page/$page_shell", $vars);
+	}
+
+	$vars['page_shell'] = $page_shell;
+
+	// Allow plugins to mod output
+	return elgg_trigger_plugin_hook('output', 'page', $vars, $output);
+}
+
+/**
+ * Displays a layout with optional parameters.
+ *
+ * Layouts provide consistent organization of pages and other blocks of content.
+ * There are a few default layouts in core:
+ *  - admin                   A special layout for the admin area.
+ *  - one_column              A single content column.
+ *  - one_sidebar             A content column with sidebar.
+ *  - two_sidebar             A content column with two sidebars.
+ *  - widgets                 A widget canvas.
+ *
+ * The layout views take the form page/layouts/$layout_name
+ * See the individual layouts for what options are supported. The three most
+ * common layouts have these parameters:
+ * one_column
+ *     content => string
+ * one_sidebar
+ *     content => string
+ *     sidebar => string (optional)
+ * content
+ *     content => string
+ *     sidebar => string (optional)
+ *     buttons => string (override the default add button)
+ *     title   => string (override the default title)
+ *     filter_context => string (selected content filter)
+ *     See the content layout view for more parameters
+ *
+ * @param string $layout_name The name of the view in page/layouts/.
+ * @param array  $vars        Associative array of parameters for the layout view
+ *
+ * @return string The layout
+ */
+function elgg_view_layout($layout_name, $vars = array()) {
+
+	if (is_string($vars) || $vars === null) {
+		elgg_deprecated_notice("The use of unlimited optional string arguments in elgg_view_layout() was deprecated in favor of an options array", 1.8);
+		$arg = 1;
+		$param_array = array();
+		while ($arg < func_num_args()) {
+			$param_array['area' . $arg] = func_get_arg($arg);
+			$arg++;
+		}
+	} else {
+		$param_array = $vars;
+	}
+
+	$params = elgg_trigger_plugin_hook('output:before', 'layout', null, $param_array);
+
+	// check deprecated location
+	if (elgg_view_exists("canvas/layouts/$layout_name")) {
+		elgg_deprecated_notice("canvas/layouts/$layout_name is deprecated by page/layouts/$layout_name", 1.8);
+		$output = elgg_view("canvas/layouts/$layout_name", $params);
+	} elseif (elgg_view_exists("page/layouts/$layout_name")) {
+		$output = elgg_view("page/layouts/$layout_name", $params);
+	} else {
+		$output = elgg_view("page/layouts/default", $params);
+	}
+
+	return elgg_trigger_plugin_hook('output:after', 'layout', $params, $output);
+}
+
+/**
+ * Render a menu
+ *
+ * @see elgg_register_menu_item() for documentation on adding menu items and
+ * navigation.php for information on the different menus available.
+ *
+ * This function triggers a 'register', 'menu:<menu name>' plugin hook that enables
+ * plugins to add menu items just before a menu is rendered. This is used by
+ * dynamic menus (menus that change based on some input such as the user hover
+ * menu). Using elgg_register_menu_item() in response to the hook can cause
+ * incorrect links to show up. See the blog plugin's blog_owner_block_menu()
+ * for an example of using this plugin hook.
+ *
+ * An additional hook is the 'prepare', 'menu:<menu name>' which enables plugins
+ * to modify the structure of the menu (sort it, remove items, set variables on
+ * the menu items).
+ *
+ * elgg_view_menu() uses views in navigation/menu
+ *
+ * @param string $menu_name The name of the menu
+ * @param array  $vars      An associative array of display options for the menu.
+ *                          Options include:
+ *                              sort_by => string or php callback
+ *                                  string options: 'name', 'priority', 'title' (default),
+ *                                  'register' (registration order) or a
+ *                                  php callback (a compare function for usort)
+ *                              handler: string the page handler to build action URLs
+ *                              entity: ElggEntity to use to build action URLs
+ *                              class: string the class for the entire menu.
+ *                              show_section_headers: bool show headers before menu sections.
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_view_menu($menu_name, array $vars = array()) {
+	global $CONFIG;
+
+	$vars['name'] = $menu_name;
+
+	$sort_by = elgg_extract('sort_by', $vars, 'text');
+
+	if (isset($CONFIG->menus[$menu_name])) {
+		$menu = $CONFIG->menus[$menu_name];
+	} else {
+		$menu = array();
+	}
+
+	// Give plugins a chance to add menu items just before creation.
+	// This supports dynamic menus (example: user_hover).
+	$menu = elgg_trigger_plugin_hook('register', "menu:$menu_name", $vars, $menu);
+
+	$builder = new ElggMenuBuilder($menu);
+	$vars['menu'] = $builder->getMenu($sort_by);
+	$vars['selected_item'] = $builder->getSelected();
+
+	// Let plugins modify the menu
+	$vars['menu'] = elgg_trigger_plugin_hook('prepare', "menu:$menu_name", $vars, $vars['menu']);
+
+	if (elgg_view_exists("navigation/menu/$menu_name")) {
+		return elgg_view("navigation/menu/$menu_name", $vars);
+	} else {
+		return elgg_view("navigation/menu/default", $vars);
+	}
+}
+
+/**
+ * Returns a string of a rendered entity.
+ *
+ * Entity views are either determined by setting the view property on the entity
+ * or by having a view named after the entity $type/$subtype.  Entities that have
+ * neither a view property nor a defined $type/$subtype view will fall back to
+ * using the $type/default view.
+ *
+ * The entity view is called with the following in $vars:
+ *  - ElggEntity 'entity' The entity being viewed
+ *
+ * Other common view $vars paramters:
+ *  - bool 'full_view' Whether to show a full or condensed view.
+ *
+ * @tip This function can automatically appends annotations to entities if in full
+ * view and a handler is registered for the entity:annotate.  See https://github.com/Elgg/Elgg/issues/964 and
+ * {@link elgg_view_entity_annotations()}.
+ *
+ * @param ElggEntity $entity The entity to display
+ * @param array      $vars   Array of variables to pass to the entity view.
+ *                           In Elgg 1.7 and earlier it was the boolean $full_view
+ * @param boolean    $bypass If false, will not pass to a custom template handler.
+ *                           {@see set_template_handler()}
+ * @param boolean    $debug  Complain if views are missing
+ *
+ * @return string HTML to display or false
+ * @link http://docs.elgg.org/Views/Entity
+ * @link http://docs.elgg.org/Entities
+ * @todo The annotation hook might be better as a generic plugin hook to append content.
+ */
+function elgg_view_entity(ElggEntity $entity, $vars = array(), $bypass = true, $debug = false) {
+
+	// No point continuing if entity is null
+	if (!$entity || !($entity instanceof ElggEntity)) {
+		return false;
+	}
+
+	global $autofeed;
+	$autofeed = true;
+
+	$defaults = array(
+		'full_view' => false,
+	);
+
+	if (is_array($vars)) {
+		$vars = array_merge($defaults, $vars);
+	} else {
+		elgg_deprecated_notice("Update your use of elgg_view_entity()", 1.8);
+		$vars = array(
+			'full_view' => $vars,
+		);
+	}
+
+	$vars['entity'] = $entity;
+
+
+	// if this entity has a view defined, use it
+	$view = $entity->view;
+	if (is_string($view)) {
+		return elgg_view($view, $vars, $bypass, $debug);
+	}
+
+	$entity_type = $entity->getType();
+
+	$subtype = $entity->getSubtype();
+	if (empty($subtype)) {
+		$subtype = 'default';
+	}
+
+	$contents = '';
+	if (elgg_view_exists("$entity_type/$subtype")) {
+		$contents = elgg_view("$entity_type/$subtype", $vars, $bypass, $debug);
+	}
+	if (empty($contents)) {
+		$contents = elgg_view("$entity_type/default", $vars, $bypass, $debug);
+	}
+
+	// Marcus Povey 20090616 : Speculative and low impact approach for fixing #964
+	if ($vars['full_view']) {
+		$annotations = elgg_view_entity_annotations($entity, $vars['full_view']);
+
+		if ($annotations) {
+			$contents .= $annotations;
+		}
+	}
+	return $contents;
+}
+
+/**
+ * View the icon of an entity
+ *
+ * Entity views are determined by having a view named after the entity $type/$subtype.
+ * Entities that do not have a defined icon/$type/$subtype view will fall back to using
+ * the icon/$type/default view.
+ *
+ * @param ElggEntity $entity The entity to display
+ * @param string     $size   The size: tiny, small, medium, large
+ * @param array      $vars   An array of variables to pass to the view. Some possible
+ *                           variables are img_class and link_class. See the
+ *                           specific icon view for more parameters.
+ *
+ * @return string HTML to display or false
+ */
+function elgg_view_entity_icon(ElggEntity $entity, $size = 'medium', $vars = array()) {
+
+	// No point continuing if entity is null
+	if (!$entity || !($entity instanceof ElggEntity)) {
+		return false;
+	}
+
+	$vars['entity'] = $entity;
+	$vars['size'] = $size;
+
+	$entity_type = $entity->getType();
+
+	$subtype = $entity->getSubtype();
+	if (empty($subtype)) {
+		$subtype = 'default';
+	}
+
+	$contents = '';
+	if (elgg_view_exists("icon/$entity_type/$subtype")) {
+		$contents = elgg_view("icon/$entity_type/$subtype", $vars);
+	}
+	if (empty($contents)) {
+		$contents = elgg_view("icon/$entity_type/default", $vars);
+	}
+	if (empty($contents)) {
+		$contents = elgg_view("icon/default", $vars);
+	}
+
+	return $contents;
+}
+
+/**
+ * Returns a string of a rendered annotation.
+ *
+ * Annotation views are expected to be in annotation/$annotation_name.
+ * If a view is not found for $annotation_name, the default annotation/default
+ * will be used.
+ *
+ * @warning annotation/default is not currently defined in core.
+ *
+ * The annotation view is called with the following in $vars:
+ *  - ElggEntity 'annotation' The annotation being viewed.
+ *
+ * @param ElggAnnotation $annotation The annotation to display
+ * @param array          $vars       Variable array for view.
+ * @param bool           $bypass     If false, will not pass to a custom
+ *                                   template handler. {@see set_template_handler()}
+ * @param bool           $debug      Complain if views are missing
+ *
+ * @return string/false Rendered annotation
+ */
+function elgg_view_annotation(ElggAnnotation $annotation, array $vars = array(), $bypass = true, $debug = false) {
+	global $autofeed;
+	$autofeed = true;
+
+	$defaults = array(
+		'full_view' => true,
+	);
+
+	$vars = array_merge($defaults, $vars);
+	$vars['annotation'] = $annotation;
+
+	// @todo setting the view on an annotation is not advertised anywhere
+	// do we want to keep this?
+	$view = $annotation->view;
+	if (is_string($view)) {
+		return elgg_view($view, $vars, $bypass, $debug);
+	}
+
+	$name = $annotation->name;
+	if (empty($name)) {
+		return false;
+	}
+
+	if (elgg_view_exists("annotation/$name")) {
+		return elgg_view("annotation/$name", $vars, $bypass, $debug);
+	} else {
+		return elgg_view("annotation/default", $vars, $bypass, $debug);
+	}
+}
+
+/**
+ * Returns a rendered list of entities with pagination. This function should be
+ * called by wrapper functions.
+ *
+ * @see elgg_list_entities()
+ * @see list_user_friends_objects()
+ * @see elgg_list_entities_from_metadata()
+ * @see elgg_list_entities_from_relationships()
+ * @see elgg_list_entities_from_annotations()
+ *
+ * @param array $entities Array of entities
+ * @param array $vars     Display variables
+ *		'count'            The total number of entities across all pages
+ *		'offset'           The current indexing offset
+ *		'limit'            The number of entities to display per page
+ *		'full_view'        Display the full view of the entities?
+ *		'list_class'       CSS class applied to the list
+ *		'item_class'       CSS class applied to the list items
+ *		'pagination'       Display pagination?
+ *		'list_type'        List type: 'list' (default), 'gallery'
+ *		'list_type_toggle' Display the list type toggle?
+ *
+ * @return string The rendered list of entities
+ * @access private
+ */
+function elgg_view_entity_list($entities, $vars = array(), $offset = 0, $limit = 10, $full_view = true,
+$list_type_toggle = true, $pagination = true) {
+
+	if (!$vars["limit"] && !$vars["offset"]) {
+		// no need for pagination if listing is unlimited
+		$vars["pagination"] = false;
+	}
+		
+	if (!is_int($offset)) {
+		$offset = (int)get_input('offset', 0);
+	}
+
+	// list type can be passed as request parameter
+	$list_type = get_input('list_type', 'list');
+	if (get_input('listtype')) {
+		elgg_deprecated_notice("'listtype' has been deprecated by 'list_type' for lists", 1.8);
+		$list_type = get_input('listtype');
+	}
+
+	if (is_array($vars)) {
+		// new function
+		$defaults = array(
+			'items' => $entities,
+			'list_class' => 'elgg-list-entity',
+			'full_view' => true,
+			'pagination' => true,
+			'list_type' => $list_type,
+			'list_type_toggle' => false,
+			'offset' => $offset,
+		);
+
+		$vars = array_merge($defaults, $vars);
+
+	} else {
+		// old function parameters
+		elgg_deprecated_notice("Please update your use of elgg_view_entity_list()", 1.8);
+
+		$vars = array(
+			'items' => $entities,
+			'count' => (int) $vars, // the old count parameter
+			'offset' => $offset,
+			'limit' => (int) $limit,
+			'full_view' => $full_view,
+			'pagination' => $pagination,
+			'list_type' => $list_type,
+			'list_type_toggle' => $list_type_toggle,
+			'list_class' => 'elgg-list-entity',
+		);
+	}
+
+	if ($vars['list_type'] != 'list') {
+		return elgg_view('page/components/gallery', $vars);
+	} else {
+		return elgg_view('page/components/list', $vars);
+	}
+}
+
+/**
+ * Returns a rendered list of annotations, plus pagination. This function
+ * should be called by wrapper functions.
+ *
+ * @param array $annotations Array of annotations
+ * @param array $vars        Display variables
+ *		'count'      The total number of annotations across all pages
+ *		'offset'     The current indexing offset
+ *		'limit'      The number of annotations to display per page
+ *		'full_view'  Display the full view of the annotation?
+ *		'list_class' CSS Class applied to the list
+ *		'offset_key' The url parameter key used for offset
+ *
+ * @return string The list of annotations
+ * @access private
+ */
+function elgg_view_annotation_list($annotations, array $vars = array()) {
+	$defaults = array(
+		'items' => $annotations,
+		'list_class' => 'elgg-list-annotation elgg-annotation-list', // @todo remove elgg-annotation-list in Elgg 1.9
+		'full_view' => true,
+		'offset_key' => 'annoff',
+	);
+	
+	$vars = array_merge($defaults, $vars);
+	
+	if (!$vars["limit"] && !$vars["offset"]) {
+		// no need for pagination if listing is unlimited
+		$vars["pagination"] = false;
+	}
+
+	return elgg_view('page/components/list', $vars);
+}
+
+/**
+ * Display a plugin-specified rendered list of annotations for an entity.
+ *
+ * This displays the output of functions registered to the entity:annotation,
+ * $entity_type plugin hook.
+ *
+ * This is called automatically by the framework from {@link elgg_view_entity()}
+ *
+ * @param ElggEntity $entity    Entity
+ * @param bool       $full_view Display full view?
+ *
+ * @return mixed string or false on failure
+ * @todo Change the hook name.
+ */
+function elgg_view_entity_annotations(ElggEntity $entity, $full_view = true) {
+	if (!($entity instanceof ElggEntity)) {
+		return false;
+	}
+
+	$entity_type = $entity->getType();
+
+	$annotations = elgg_trigger_plugin_hook('entity:annotate', $entity_type,
+		array(
+			'entity' => $entity,
+			'full_view' => $full_view,
+		)
+	);
+
+	return $annotations;
+}
+
+/**
+ * Renders a title.
+ *
+ * This is a shortcut for {@elgg_view page/elements/title}.
+ *
+ * @param string $title The page title
+ * @param array  $vars  View variables (was submenu be displayed? (deprecated))
+ *
+ * @return string The HTML (etc)
+ */
+function elgg_view_title($title, $vars = array()) {
+	if (!is_array($vars)) {
+		elgg_deprecated_notice('setting $submenu in elgg_view_title() is deprecated', 1.8);
+		$vars = array('submenu' => $vars);
+	}
+
+	$vars['title'] = $title;
+
+	return elgg_view('page/elements/title', $vars);
+}
+
+/**
+ * Displays a UNIX timestamp in a friendly way
+ *
+ * @see elgg_get_friendly_time()
+ *
+ * @param int $time A UNIX epoch timestamp
+ *
+ * @return string The friendly time HTML
+ * @since 1.7.2
+ */
+function elgg_view_friendly_time($time) {
+	return elgg_view('output/friendlytime', array('time' => $time));
+}
+
+
+/**
+ * Returns rendered comments and a comment form for an entity.
+ *
+ * @tip Plugins can override the output by registering a handler
+ * for the comments, $entity_type hook.  The handler is responsible
+ * for formatting the comments and the add comment form.
+ *
+ * @param ElggEntity $entity      The entity to view comments of
+ * @param bool       $add_comment Include a form to add comments?
+ * @param array      $vars        Variables to pass to comment view
+ *
+ * @return string|false Rendered comments or false on failure
+ * @link http://docs.elgg.org/Entities/Comments
+ * @link http://docs.elgg.org/Annotations/Comments
+ */
+function elgg_view_comments($entity, $add_comment = true, array $vars = array()) {
+	if (!($entity instanceof ElggEntity)) {
+		return false;
+	}
+
+	$vars['entity'] = $entity;
+	$vars['show_add_form'] = $add_comment;
+	$vars['class'] = elgg_extract('class', $vars, "{$entity->getSubtype()}-comments");
+
+	$output = elgg_trigger_plugin_hook('comments', $entity->getType(), $vars, false);
+	if ($output) {
+		return $output;
+	} else {
+		return elgg_view('page/elements/comments', $vars);
+	}
+}
+
+/**
+ * Wrapper function for the image block display pattern.
+ *
+ * Fixed width media on the side (image, icon, flash, etc.).
+ * Descriptive content filling the rest of the column.
+ *
+ * This is a shortcut for {@elgg_view page/components/image_block}.
+ *
+ * @param string $image The icon and other information
+ * @param string $body  Description content
+ * @param array  $vars  Additional parameters for the view
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_view_image_block($image, $body, $vars = array()) {
+	$vars['image'] = $image;
+	$vars['body'] = $body;
+	return elgg_view('page/components/image_block', $vars);
+}
+
+/**
+ * Wrapper function for the module display pattern.
+ *
+ * Box with header, body, footer
+ *
+ * This is a shortcut for {@elgg_view page/components/module}.
+ *
+ * @param string $type  The type of module (main, info, popup, aside, etc.)
+ * @param string $title A title to put in the header
+ * @param string $body  Content of the module
+ * @param array  $vars  Additional parameters for the module
+ *
+ * @return string
+ * @since 1.8.0
+ */
+function elgg_view_module($type, $title, $body, array $vars = array()) {
+	$vars['class'] = elgg_extract('class', $vars, '') . " elgg-module-$type";
+	$vars['title'] = $title;
+	$vars['body'] = $body;
+	return elgg_view('page/components/module', $vars);
+}
+
+/**
+ * Renders a human-readable representation of a river item
+ *
+ * @param ElggRiverItem $item A river item object
+ * @param array         $vars An array of variables for the view
+ *
+ * @return string returns empty string if could not be rendered
+ */
+function elgg_view_river_item($item, array $vars = array()) {
+	if (!($item instanceof ElggRiverItem)) {
+		return '';
+	}
+	// checking default viewtype since some viewtypes do not have unique views per item (rss)
+	$view = $item->getView();
+	if (!$view || !elgg_view_exists($view, 'default')) {
+		return '';
+	}
+
+	$subject = $item->getSubjectEntity();
+	$object = $item->getObjectEntity();
+	if (!$subject || !$object) {
+		// subject is disabled or subject/object deleted
+		return '';
+	}
+
+	// @todo this needs to be cleaned up
+	// Don't hide objects in closed groups that a user can see.
+	// see https://github.com/elgg/elgg/issues/4789
+	//	else {
+	//		// hide based on object's container
+	//		$visibility = ElggGroupItemVisibility::factory($object->container_guid);
+	//		if ($visibility->shouldHideItems) {
+	//			return '';
+	//		}
+	//	}
+
+	$vars['item'] = $item;
+
+	return elgg_view('river/item', $vars);
+}
+
+/**
+ * Convenience function for generating a form from a view in a standard location.
+ *
+ * This function assumes that the body of the form is located at "forms/$action" and
+ * sets the action by default to "action/$action".  Automatically wraps the forms/$action
+ * view with a <form> tag and inserts the anti-csrf security tokens.
+ *
+ * @tip This automatically appends elgg-form-action-name to the form's class. It replaces any
+ * slashes with dashes (blog/save becomes elgg-form-blog-save)
+ *
+ * @example
+ * <code>echo elgg_view_form('login');</code>
+ *
+ * This would assume a "login" form body to be at "forms/login" and would set the action
+ * of the form to "http://yoursite.com/action/login".
+ *
+ * If elgg_view('forms/login') is:
+ * <input type="text" name="username" />
+ * <input type="password" name="password" />
+ *
+ * Then elgg_view_form('login') generates:
+ * <form action="http://yoursite.com/action/login" method="post">
+ *     ...security tokens...
+ *     <input type="text" name="username" />
+ *     <input type="password" name="password" />
+ * </form>
+ *
+ * @param string $action    The name of the action. An action name does not include
+ *                          the leading "action/". For example, "login" is an action name.
+ * @param array  $form_vars $vars environment passed to the "input/form" view
+ * @param array  $body_vars $vars environment passed to the "forms/$action" view
+ *
+ * @return string The complete form
+ */
+function elgg_view_form($action, $form_vars = array(), $body_vars = array()) {
+	global $CONFIG;
+
+	$defaults = array(
+		'action' => $CONFIG->wwwroot . "action/$action",
+		'body' => elgg_view("forms/$action", $body_vars)
+	);
+
+	$form_class = 'elgg-form-' . preg_replace('/[^a-z0-9]/i', '-', $action);
+
+	// append elgg-form class to any class options set
+	if (isset($form_vars['class'])) {
+		$form_vars['class'] = $form_vars['class'] . " $form_class";
+	} else {
+		$form_vars['class'] = $form_class;
+	}
+
+	return elgg_view('input/form', array_merge($defaults, $form_vars));
+}
+
+/**
+ * View an item in a list
+ *
+ * @param ElggEntity|ElggAnnotation $item
+ * @param array  $vars Additional parameters for the rendering
+ *
+ * @return string
+ * @since 1.8.0
+ * @access private
+ */
+function elgg_view_list_item($item, array $vars = array()) {
+	global $CONFIG;
+
+	$type = $item->getType();
+	if (in_array($type, $CONFIG->entity_types)) {
+		return elgg_view_entity($item, $vars);
+	} else if ($type == 'annotation') {
+		return elgg_view_annotation($item, $vars);
+	} else if ($type == 'river') {
+		return elgg_view_river_item($item, $vars);
+	}
+
+	return '';
+}
+
+/**
+ * View one of the elgg sprite icons
+ *
+ * Shorthand for <span class="elgg-icon elgg-icon-$name"></span>
+ *
+ * @param string $name  The specific icon to display
+ * @param string $class Additional class: float, float-alt, or custom class
+ *
+ * @return string The html for displaying an icon
+ */
+function elgg_view_icon($name, $class = '') {
+	// @todo deprecate boolean in Elgg 1.9
+	if ($class === true) {
+		$class = 'float';
+	}
+	return "<span class=\"elgg-icon elgg-icon-$name $class\"></span>";
+}
+
+/**
+ * Displays a user's access collections, using the core/friends/collections view
+ *
+ * @param int $owner_guid The GUID of the owning user
+ *
+ * @return string A formatted rendition of the collections
+ * @todo Move to the friends/collection.php page.
+ * @access private
+ */
+function elgg_view_access_collections($owner_guid) {
+	if ($collections = get_user_access_collections($owner_guid)) {
+		foreach ($collections as $key => $collection) {
+			$collections[$key]->members = get_members_of_access_collection($collection->id, true);
+			$collections[$key]->entities = get_user_friends($owner_guid, "", 9999);
+		}
+	}
+
+	return elgg_view('core/friends/collections', array('collections' => $collections));
+}
+
+/**
+ * Registers a function to handle templates.
+ *
+ * Alternative template handlers can be registered to handle
+ * all output functions.  By default, {@link elgg_view()} will
+ * simply include the view file.  If an alternate template handler
+ * is registered, the view name and passed $vars will be passed to the
+ * registered function, which is then responsible for generating and returning
+ * output.
+ *
+ * Template handlers need to accept two arguments: string $view_name and array
+ * $vars.
+ *
+ * @warning This is experimental.
+ *
+ * @param string $function_name The name of the function to pass to.
+ *
+ * @return bool
+ * @see elgg_view()
+ * @link http://docs.elgg.org/Views/TemplateHandlers
+ */
+function set_template_handler($function_name) {
+	global $CONFIG;
+
+	if (is_callable($function_name)) {
+		$CONFIG->template_handler = $function_name;
+		return true;
+	}
+	return false;
+}
+
+/**
+ * Returns the name of views for in a directory.
+ *
+ * Use this to get all namespaced views under the first element.
+ *
+ * @param string $dir  The main directory that holds the views. (mod/profile/views/)
+ * @param string $base The root name of the view to use, without the viewtype. (profile)
+ *
+ * @return array
+ * @since 1.7.0
+ * @todo Why isn't this used anywhere else but in elgg_view_tree()?
+ * Seems like a useful function for autodiscovery.
+ * @access private
+ */
+function elgg_get_views($dir, $base) {
+	$return = array();
+	if (file_exists($dir) && is_dir($dir)) {
+		if ($handle = opendir($dir)) {
+			while ($view = readdir($handle)) {
+				if (!in_array($view, array('.', '..', '.svn', 'CVS'))) {
+					if (is_dir($dir . '/' . $view)) {
+						if ($val = elgg_get_views($dir . '/' . $view, $base . '/' . $view)) {
+							$return = array_merge($return, $val);
+						}
+					} else {
+						$view = str_replace('.php', '', $view);
+						$return[] = $base . '/' . $view;
+					}
+				}
+			}
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Returns all views below a partial view.
+ *
+ * Settings $view_root = 'profile' will show all available views under
+ * the "profile" namespace.
+ *
+ * @param string $view_root The root view
+ * @param string $viewtype  Optionally specify a view type
+ *                          other than the current one.
+ *
+ * @return array A list of view names underneath that root view
+ * @todo This is used once in the deprecated get_activity_stream_data() function.
+ * @access private
+ */
+function elgg_view_tree($view_root, $viewtype = "") {
+	global $CONFIG;
+	static $treecache = array();
+
+	// Get viewtype
+	if (!$viewtype) {
+		$viewtype = elgg_get_viewtype();
+	}
+
+	// A little light internal caching
+	if (!empty($treecache[$view_root])) {
+		return $treecache[$view_root];
+	}
+
+	// Examine $CONFIG->views->locations
+	if (isset($CONFIG->views->locations[$viewtype])) {
+		foreach ($CONFIG->views->locations[$viewtype] as $view => $path) {
+			$pos = strpos($view, $view_root);
+			if ($pos === 0) {
+				$treecache[$view_root][] = $view;
+			}
+		}
+	}
+
+	// Now examine core
+	$location = $CONFIG->viewpath;
+	$viewtype = elgg_get_viewtype();
+	$root = $location . $viewtype . '/' . $view_root;
+
+	if (file_exists($root) && is_dir($root)) {
+		$val = elgg_get_views($root, $view_root);
+		if (!is_array($treecache[$view_root])) {
+			$treecache[$view_root] = array();
+		}
+		$treecache[$view_root] = array_merge($treecache[$view_root], $val);
+	}
+
+	return $treecache[$view_root];
+}
+
+/**
+ * Auto-registers views from a location.
+ *
+ * @note Views in plugin/views/ are automatically registered for active plugins.
+ * Plugin authors would only need to call this if optionally including
+ * an entire views structure.
+ *
+ * @param string $view_base          Optional The base of the view name without the view type.
+ * @param string $folder             Required The folder to begin looking in
+ * @param string $base_location_path The base views directory to use with elgg_set_view_location()
+ * @param string $viewtype           The type of view we're looking at (default, rss, etc)
+ *
+ * @return bool returns false if folder can't be read
+ * @since 1.7.0
+ * @see elgg_set_view_location()
+ * @todo This seems overly complicated.
+ * @access private
+ */
+function autoregister_views($view_base, $folder, $base_location_path, $viewtype) {
+	if ($handle = opendir($folder)) {
+		while ($view = readdir($handle)) {
+			if (!in_array($view, array('.', '..', '.svn', 'CVS')) && !is_dir($folder . "/" . $view)) {
+				// this includes png files because some icons are stored within view directories.
+				// See commit [1705]
+				if ((substr_count($view, ".php") > 0) || (substr_count($view, ".png") > 0)) {
+					if (!empty($view_base)) {
+						$view_base_new = $view_base . "/";
+					} else {
+						$view_base_new = "";
+					}
+
+					elgg_set_view_location($view_base_new . str_replace('.php', '', $view),
+						$base_location_path, $viewtype);
+				}
+			} else if (!in_array($view, array('.', '..', '.svn', 'CVS')) && is_dir($folder . "/" . $view)) {
+				if (!empty($view_base)) {
+					$view_base_new = $view_base . "/";
+				} else {
+					$view_base_new = "";
+				}
+				autoregister_views($view_base_new . $view, $folder . "/" . $view,
+					$base_location_path, $viewtype);
+			}
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/**
+ * Add the rss link to the extras when if needed
+ *
+ * @return void
+ * @access private
+ */
+function elgg_views_add_rss_link() {
+	global $autofeed;
+	if (isset($autofeed) && $autofeed == true) {
+		$url = current_page_url();
+		if (substr_count($url, '?')) {
+			$url .= "&view=rss";
+		} else {
+			$url .= "?view=rss";
+		}
+
+		$url = elgg_format_url($url);
+		elgg_register_menu_item('extras', array(
+			'name' => 'rss',
+			'text' => elgg_view_icon('rss'),
+			'href' => $url,
+			'title' => elgg_echo('feed:rss'),
+		));
+	}
+}
+
+/**
+ * Registers deprecated views to avoid making some pages from older plugins
+ * completely empty.
+ *
+ * @access private
+ */
+function elgg_views_handle_deprecated_views() {
+	$location = elgg_get_view_location('page_elements/contentwrapper');
+	if ($location === "/var/www/views/") {
+		elgg_extend_view('page_elements/contentwrapper', 'page/elements/wrapper');
+	}
+}
+
+/**
+ * Initialize viewtypes on system boot event
+ * This ensures simplecache is cleared during upgrades. See #2252
+ *
+ * @return void
+ * @access private
+ * @elgg_event_handler boot system
+ */
+function elgg_views_boot() {
+	global $CONFIG;
+
+	elgg_register_simplecache_view('css/ie');
+	elgg_register_simplecache_view('css/ie6');
+	elgg_register_simplecache_view('css/ie7');
+
+	elgg_register_js('jquery', '/vendors/jquery/jquery-1.6.4.min.js', 'head');
+	elgg_register_js('jquery-ui', '/vendors/jquery/jquery-ui-1.8.16.min.js', 'head');
+	elgg_register_js('jquery.form', '/vendors/jquery/jquery.form.js');
+
+	elgg_register_simplecache_view('js/elgg');
+	$elgg_js_url = elgg_get_simplecache_url('js', 'elgg');
+	elgg_register_js('elgg', $elgg_js_url, 'head');
+
+	elgg_load_js('jquery');
+	elgg_load_js('jquery-ui');
+	elgg_load_js('elgg');
+
+	elgg_register_simplecache_view('js/lightbox');
+	$lightbox_js_url = elgg_get_simplecache_url('js', 'lightbox');
+	elgg_register_js('lightbox', $lightbox_js_url);
+
+	elgg_register_simplecache_view('css/lightbox');
+	$lightbox_css_url = elgg_get_simplecache_url('css', 'lightbox');
+	elgg_register_css('lightbox', $lightbox_css_url);
+
+	elgg_register_simplecache_view('css/elgg');
+	$elgg_css_url = elgg_get_simplecache_url('css', 'elgg');
+	elgg_register_css('elgg', $elgg_css_url);
+
+	elgg_load_css('elgg');
+
+	elgg_register_ajax_view('js/languages');
+
+	elgg_register_plugin_hook_handler('output:before', 'layout', 'elgg_views_add_rss_link');
+
+	// discover the built-in view types
+	// @todo the cache is loaded in load_plugins() but we need to know view_types earlier
+	$view_path = $CONFIG->viewpath;
+
+	$views = scandir($view_path);
+
+	foreach ($views as $view) {
+		if ($view[0] !== '.' && is_dir($view_path . $view)) {
+			elgg_register_viewtype($view);
+		}
+	}
+
+	// set default icon sizes - can be overridden in settings.php or with plugin
+	if (!isset($CONFIG->icon_sizes)) {
+		$icon_sizes = array(
+			'topbar' => array('w' => 16, 'h' => 16, 'square' => TRUE, 'upscale' => TRUE),
+			'tiny' => array('w' => 25, 'h' => 25, 'square' => TRUE, 'upscale' => TRUE),
+			'small' => array('w' => 40, 'h' => 40, 'square' => TRUE, 'upscale' => TRUE),
+			'medium' => array('w' => 100, 'h' => 100, 'square' => TRUE, 'upscale' => TRUE),
+			'large' => array('w' => 200, 'h' => 200, 'square' => FALSE, 'upscale' => FALSE),
+			'master' => array('w' => 550, 'h' => 550, 'square' => FALSE, 'upscale' => FALSE),
+		);
+		elgg_set_config('icon_sizes', $icon_sizes);
+	}
+}
+
+elgg_register_event_handler('boot', 'system', 'elgg_views_boot');
+elgg_register_event_handler('init', 'system', 'elgg_views_handle_deprecated_views');
diff --git a/engine/lib/web_services.php b/engine/lib/web_services.php
new file mode 100644
index 000000000..51cad6f39
--- /dev/null
+++ b/engine/lib/web_services.php
@@ -0,0 +1,1454 @@
+<?php
+/**
+ * Elgg web services API
+ * Functions and objects for exposing custom web services.
+ *
+ * @package    Elgg.Core
+ * @subpackage WebServicesAPI
+ */
+
+// Primary Services API Server functions
+
+/**
+ * A global array holding API methods.
+ * The structure of this is
+ * 	$API_METHODS = array (
+ * 		$method => array (
+ * 			"description" => "Some human readable description"
+ * 			"function" = 'my_function_callback'
+ * 			"parameters" = array (
+ * 				"variable" = array ( // the order should be the same as the function callback
+ * 					type => 'int' | 'bool' | 'float' | 'string'
+ * 					required => true (default) | false
+ *					default => value // optional
+ * 				)
+ * 			)
+ * 			"call_method" = 'GET' | 'POST'
+ * 			"require_api_auth" => true | false (default)
+ * 			"require_user_auth" => true | false (default)
+ * 		)
+ *  )
+ */
+global $API_METHODS;
+$API_METHODS = array();
+
+/**
+ * Expose a function as a services api call.
+ *
+ * Limitations: Currently cannot expose functions which expect objects.
+ * It also cannot handle arrays of bools or arrays of arrays.
+ * Also, input will be filtered to protect against XSS attacks through the API.
+ *
+ * @param string $method            The api name to expose - for example "myapi.dosomething"
+ * @param string $function          Your function callback.
+ * @param array  $parameters        (optional) List of parameters in the same order as in
+ *                                  your function. Default values may be set for parameters which
+ *                                  allow REST api users flexibility in what parameters are passed.
+ *                                  Generally, optional parameters should be after required
+ *                                  parameters.
+ *
+ *                                  This array should be in the format
+ *                                    "variable" = array (
+ *                                  					type => 'int' | 'bool' | 'float' | 'string' | 'array'
+ *                                  					required => true (default) | false
+ *                                  					default => value (optional)
+ *                                  	 )
+ * @param string $description       (optional) human readable description of the function.
+ * @param string $call_method       (optional) Define what http method must be used for
+ *                                  this function. Default: GET
+ * @param bool   $require_api_auth  (optional) (default is false) Does this method
+ *                                  require API authorization? (example: API key)
+ * @param bool   $require_user_auth (optional) (default is false) Does this method
+ *                                  require user authorization?
+ *
+ * @return bool
+ */
+function expose_function($method, $function, array $parameters = NULL, $description = "",
+$call_method = "GET", $require_api_auth = false, $require_user_auth = false) {
+
+	global $API_METHODS;
+
+	if (($method == "") || ($function == "")) {
+		$msg = elgg_echo('InvalidParameterException:APIMethodOrFunctionNotSet');
+		throw new InvalidParameterException($msg);
+	}
+
+	// does not check whether this method has already been exposed - good idea?
+	$API_METHODS[$method] = array();
+
+	$API_METHODS[$method]["description"] = $description;
+
+	// does not check whether callable - done in execute_method()
+	$API_METHODS[$method]["function"] = $function;
+
+	if ($parameters != NULL) {
+		if (!is_array($parameters)) {
+			$msg = elgg_echo('InvalidParameterException:APIParametersArrayStructure', array($method));
+			throw new InvalidParameterException($msg);
+		}
+
+		// catch common mistake of not setting up param array correctly
+		$first = current($parameters);
+		if (!is_array($first)) {
+			$msg = elgg_echo('InvalidParameterException:APIParametersArrayStructure', array($method));
+			throw new InvalidParameterException($msg);
+		}
+	}
+
+	if ($parameters != NULL) {
+		// ensure the required flag is set correctly in default case for each parameter
+		foreach ($parameters as $key => $value) {
+			// check if 'required' was specified - if not, make it true
+			if (!array_key_exists('required', $value)) {
+				$parameters[$key]['required'] = true;
+			}
+		}
+
+		$API_METHODS[$method]["parameters"] = $parameters;
+	}
+
+	$call_method = strtoupper($call_method);
+	switch ($call_method) {
+		case 'POST' :
+			$API_METHODS[$method]["call_method"] = 'POST';
+			break;
+		case 'GET' :
+			$API_METHODS[$method]["call_method"] = 'GET';
+			break;
+		default :
+			$msg = elgg_echo('InvalidParameterException:UnrecognisedHttpMethod',
+			array($call_method, $method));
+
+			throw new InvalidParameterException($msg);
+	}
+
+	$API_METHODS[$method]["require_api_auth"] = $require_api_auth;
+
+	$API_METHODS[$method]["require_user_auth"] = $require_user_auth;
+
+	return true;
+}
+
+/**
+ * Unregister an API method
+ *
+ * @param string $method The api name that was exposed
+ *
+ * @since 1.7.0
+ *
+ * @return void
+ */
+function unexpose_function($method) {
+	global $API_METHODS;
+
+	if (isset($API_METHODS[$method])) {
+		unset($API_METHODS[$method]);
+	}
+}
+
+/**
+ * Check that the method call has the proper API and user authentication
+ *
+ * @param string $method The api name that was exposed
+ *
+ * @return true or throws an exception
+ * @throws APIException
+ * @since 1.7.0
+ * @access private
+ */
+function authenticate_method($method) {
+	global $API_METHODS;
+
+	// method must be exposed
+	if (!isset($API_METHODS[$method])) {
+		throw new APIException(elgg_echo('APIException:MethodCallNotImplemented', array($method)));
+	}
+
+	// check API authentication if required
+	if ($API_METHODS[$method]["require_api_auth"] == true) {
+		$api_pam = new ElggPAM('api');
+		if ($api_pam->authenticate() !== true) {
+			throw new APIException(elgg_echo('APIException:APIAuthenticationFailed'));
+		}
+	}
+
+	$user_pam = new ElggPAM('user');
+	$user_auth_result = $user_pam->authenticate(array());
+
+	// check if user authentication is required
+	if ($API_METHODS[$method]["require_user_auth"] == true) {
+		if ($user_auth_result == false) {
+			throw new APIException($user_pam->getFailureMessage(), ErrorResult::$RESULT_FAIL_AUTHTOKEN);
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Executes a method.
+ * A method is a function which you have previously exposed using expose_function.
+ *
+ * @param string $method Method, e.g. "foo.bar"
+ *
+ * @return GenericResult The result of the execution.
+ * @throws APIException, CallException
+ * @access private
+ */
+function execute_method($method) {
+	global $API_METHODS, $CONFIG;
+
+	// method must be exposed
+	if (!isset($API_METHODS[$method])) {
+		$msg = elgg_echo('APIException:MethodCallNotImplemented', array($method));
+		throw new APIException($msg);
+	}
+
+	// function must be callable
+	if (!(isset($API_METHODS[$method]["function"]))
+	|| !(is_callable($API_METHODS[$method]["function"]))) {
+
+		$msg = elgg_echo('APIException:FunctionDoesNotExist', array($method));
+		throw new APIException($msg);
+	}
+
+	// check http call method
+	if (strcmp(get_call_method(), $API_METHODS[$method]["call_method"]) != 0) {
+		$msg = elgg_echo('CallException:InvalidCallMethod', array($method,
+		$API_METHODS[$method]["call_method"]));
+
+		throw new CallException($msg);
+	}
+
+	$parameters = get_parameters_for_method($method);
+
+	if (verify_parameters($method, $parameters) == false) {
+		// if verify_parameters fails, it throws exception which is not caught here
+	}
+
+	$serialised_parameters = serialise_parameters($method, $parameters);
+
+	// Execute function: Construct function and calling parameters
+	$function = $API_METHODS[$method]["function"];
+	$serialised_parameters = trim($serialised_parameters, ", ");
+
+	// @todo document why we cannot use call_user_func_array here
+	$result = eval("return $function($serialised_parameters);");
+
+	// Sanity check result
+	// If this function returns an api result itself, just return it
+	if ($result instanceof GenericResult) {
+		return $result;
+	}
+
+	if ($result === false) {
+		$msg = elgg_echo('APIException:FunctionParseError', array($function, $serialised_parameters));
+		throw new APIException($msg);
+	}
+
+	if ($result === NULL) {
+		// If no value
+		$msg = elgg_echo('APIException:FunctionNoReturn', array($function, $serialised_parameters));
+		throw new APIException($msg);
+	}
+
+	// Otherwise assume that the call was successful and return it as a success object.
+	return SuccessResult::getInstance($result);
+}
+
+/**
+ * Get the request method.
+ *
+ * @return string HTTP request method
+ * @access private
+ */
+function get_call_method() {
+	return $_SERVER['REQUEST_METHOD'];
+}
+
+/**
+ * This function analyses all expected parameters for a given method
+ *
+ * This function sanitizes the input parameters and returns them in
+ * an associated array.
+ *
+ * @param string $method The method
+ *
+ * @return array containing parameters as key => value
+ * @access private
+ */
+function get_parameters_for_method($method) {
+	global $API_METHODS;
+
+	$sanitised = array();
+
+	// if there are parameters, sanitize them
+	if (isset($API_METHODS[$method]['parameters'])) {
+		foreach ($API_METHODS[$method]['parameters'] as $k => $v) {
+			$param = get_input($k); // Make things go through the sanitiser
+			if ($param !== '' && $param !== null) {
+				$sanitised[$k] = $param;
+			} else {
+				// parameter wasn't passed so check for default
+				if (isset($v['default'])) {
+					$sanitised[$k] = $v['default'];
+				}
+			}
+		}
+	}
+
+	return $sanitised;
+}
+
+/**
+ * Get POST data
+ * Since this is called through a handler, we need to manually get the post data
+ *
+ * @return POST data as string encoded as multipart/form-data
+ * @access private
+ */
+function get_post_data() {
+
+	$postdata = file_get_contents('php://input');
+
+	return $postdata;
+}
+
+/**
+ * Verify that the required parameters are present
+ *
+ * @param string $method     Method name
+ * @param array  $parameters List of expected parameters
+ *
+ * @return true on success or exception
+ * @throws APIException
+ * @since 1.7.0
+ * @access private
+ */
+function verify_parameters($method, $parameters) {
+	global $API_METHODS;
+
+	// are there any parameters for this method
+	if (!(isset($API_METHODS[$method]["parameters"]))) {
+		return true; // no so return
+	}
+
+	// check that the parameters were registered correctly and all required ones are there
+	foreach ($API_METHODS[$method]['parameters'] as $key => $value) {
+		// this tests the expose structure: must be array to describe parameter and type must be defined
+		if (!is_array($value) || !isset($value['type'])) {
+
+			$msg = elgg_echo('APIException:InvalidParameter', array($key, $method));
+			throw new APIException($msg);
+		}
+
+		// Check that the variable is present in the request if required
+		if ($value['required'] && !array_key_exists($key, $parameters)) {
+			$msg = elgg_echo('APIException:MissingParameterInMethod', array($key, $method));
+			throw new APIException($msg);
+		}
+	}
+
+	return true;
+}
+
+/**
+ * Serialize an array of parameters for an API method call
+ *
+ * @param string $method     API method name
+ * @param array  $parameters Array of parameters
+ *
+ * @return string or exception
+ * @throws APIException
+ * @since 1.7.0
+ * @access private
+ */
+function serialise_parameters($method, $parameters) {
+	global $API_METHODS;
+
+	// are there any parameters for this method
+	if (!(isset($API_METHODS[$method]["parameters"]))) {
+		return ''; // if not, return
+	}
+
+	$serialised_parameters = "";
+	foreach ($API_METHODS[$method]['parameters'] as $key => $value) {
+
+		// avoid warning on parameters that are not required and not present
+		if (!isset($parameters[$key])) {
+			continue;
+		}
+
+		// Set variables casting to type.
+		switch (strtolower($value['type']))
+		{
+			case 'int':
+			case 'integer' :
+				$serialised_parameters .= "," . (int)trim($parameters[$key]);
+				break;
+			case 'bool':
+			case 'boolean':
+				// change word false to boolean false
+				if (strcasecmp(trim($parameters[$key]), "false") == 0) {
+					$serialised_parameters .= ',false';
+				} else if ($parameters[$key] == 0) {
+					$serialised_parameters .= ',false';
+				} else {
+					$serialised_parameters .= ',true';
+				}
+
+				break;
+			case 'string':
+				$serialised_parameters .= ",'" . addcslashes(trim($parameters[$key]), "'") . "'";
+				break;
+			case 'float':
+				$serialised_parameters .= "," . (float)trim($parameters[$key]);
+				break;
+			case 'array':
+				// we can handle an array of strings, maybe ints, definitely not booleans or other arrays
+				if (!is_array($parameters[$key])) {
+					$msg = elgg_echo('APIException:ParameterNotArray', array($key));
+					throw new APIException($msg);
+				}
+
+				$array = "array(";
+
+				foreach ($parameters[$key] as $k => $v) {
+					$k = sanitise_string($k);
+					$v = sanitise_string($v);
+
+					$array .= "'$k'=>'$v',";
+				}
+
+				$array = trim($array, ",");
+
+				$array .= ")";
+				$array = ",$array";
+
+				$serialised_parameters .= $array;
+				break;
+			default:
+				$msg = elgg_echo('APIException:UnrecognisedTypeCast', array($value['type'], $key, $method));
+				throw new APIException($msg);
+		}
+	}
+
+	return $serialised_parameters;
+}
+
+// API authorization handlers /////////////////////////////////////////////////////////////////////
+
+/**
+ * PAM: Confirm that the call includes a valid API key
+ *
+ * @return true if good API key - otherwise throws exception
+ *
+ * @return mixed
+ * @throws APIException
+ * @since 1.7.0
+ * @access private
+ */
+function api_auth_key() {
+	global $CONFIG;
+
+	// check that an API key is present
+	$api_key = get_input('api_key');
+	if ($api_key == "") {
+		throw new APIException(elgg_echo('APIException:MissingAPIKey'));
+	}
+
+	// check that it is active
+	$api_user = get_api_user($CONFIG->site_id, $api_key);
+	if (!$api_user) {
+		// key is not active or does not exist
+		throw new APIException(elgg_echo('APIException:BadAPIKey'));
+	}
+
+	// can be used for keeping stats
+	// plugin can also return false to fail this authentication method
+	return elgg_trigger_plugin_hook('api_key', 'use', $api_key, true);
+}
+
+
+/**
+ * PAM: Confirm the HMAC signature
+ *
+ * @return true if success - otherwise throws exception
+ *
+ * @throws SecurityException
+ * @since 1.7.0
+ * @access private
+ */
+function api_auth_hmac() {
+	global $CONFIG;
+
+	// Get api header
+	$api_header = get_and_validate_api_headers();
+
+	// Pull API user details
+	$api_user = get_api_user($CONFIG->site_id, $api_header->api_key);
+
+	if (!$api_user) {
+		throw new SecurityException(elgg_echo('SecurityException:InvalidAPIKey'),
+		ErrorResult::$RESULT_FAIL_APIKEY_INVALID);
+	}
+
+	// Get the secret key
+	$secret_key = $api_user->secret;
+
+	// get the query string
+	$query = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], '?') + 1);
+
+	// calculate expected HMAC
+	$hmac = calculate_hmac(	$api_header->hmac_algo,
+							$api_header->time,
+							$api_header->nonce,
+							$api_header->api_key,
+							$secret_key,
+							$query,
+							$api_header->method == 'POST' ? $api_header->posthash : "");
+
+
+	if ($api_header->hmac !== $hmac) {
+		throw new SecurityException("HMAC is invalid.  {$api_header->hmac} != [calc]$hmac");
+	}
+
+	// Now make sure this is not a replay
+	if (cache_hmac_check_replay($hmac)) {
+		throw new SecurityException(elgg_echo('SecurityException:DupePacket'));
+	}
+
+	// Validate post data
+	if ($api_header->method == "POST") {
+		$postdata = get_post_data();
+		$calculated_posthash = calculate_posthash($postdata, $api_header->posthash_algo);
+
+		if (strcmp($api_header->posthash, $calculated_posthash) != 0) {
+			$msg = elgg_echo('SecurityException:InvalidPostHash',
+			array($calculated_posthash, $api_header->posthash));
+
+			throw new SecurityException($msg);
+		}
+	}
+
+	return true;
+}
+
+// HMAC /////////////////////////////////////////////////////////////////////
+
+/**
+ * This function looks at the super-global variable $_SERVER and extracts the various
+ * header variables needed for the HMAC PAM
+ *
+ * @return stdClass Containing all the values.
+ * @throws APIException Detailing any error.
+ * @access private
+ */
+function get_and_validate_api_headers() {
+	$result = new stdClass;
+
+	$result->method = get_call_method();
+	// Only allow these methods
+	if (($result->method != "GET") && ($result->method != "POST")) {
+		throw new APIException(elgg_echo('APIException:NotGetOrPost'));
+	}
+
+	$result->api_key = $_SERVER['HTTP_X_ELGG_APIKEY'];
+	if ($result->api_key == "") {
+		throw new APIException(elgg_echo('APIException:MissingAPIKey'));
+	}
+
+	$result->hmac = $_SERVER['HTTP_X_ELGG_HMAC'];
+	if ($result->hmac == "") {
+		throw new APIException(elgg_echo('APIException:MissingHmac'));
+	}
+
+	$result->hmac_algo = $_SERVER['HTTP_X_ELGG_HMAC_ALGO'];
+	if ($result->hmac_algo == "") {
+		throw new APIException(elgg_echo('APIException:MissingHmacAlgo'));
+	}
+
+	$result->time = $_SERVER['HTTP_X_ELGG_TIME'];
+	if ($result->time == "") {
+		throw new APIException(elgg_echo('APIException:MissingTime'));
+	}
+
+	// Must have been sent within 25 hour period.
+	// 25 hours is more than enough to handle server clock drift.
+	// This values determines how long the HMAC cache needs to store previous
+	// signatures. Heavy use of HMAC is better handled with a shorter sig lifetime.
+	// See cache_hmac_check_replay()
+	if (($result->time < (time() - 90000)) || ($result->time > (time() + 90000))) {
+		throw new APIException(elgg_echo('APIException:TemporalDrift'));
+	}
+
+	$result->nonce = $_SERVER['HTTP_X_ELGG_NONCE'];
+	if ($result->nonce == "") {
+		throw new APIException(elgg_echo('APIException:MissingNonce'));
+	}
+
+	if ($result->method == "POST") {
+		$result->posthash = $_SERVER['HTTP_X_ELGG_POSTHASH'];
+		if ($result->posthash == "") {
+			throw new APIException(elgg_echo('APIException:MissingPOSTHash'));
+		}
+
+		$result->posthash_algo = $_SERVER['HTTP_X_ELGG_POSTHASH_ALGO'];
+		if ($result->posthash_algo == "") {
+			throw new APIException(elgg_echo('APIException:MissingPOSTAlgo'));
+		}
+
+		$result->content_type = $_SERVER['CONTENT_TYPE'];
+		if ($result->content_type == "") {
+			throw new APIException(elgg_echo('APIException:MissingContentType'));
+		}
+	}
+
+	return $result;
+}
+
+/**
+ * Map various algorithms to their PHP equivs.
+ * This also gives us an easy way to disable algorithms.
+ *
+ * @param string $algo The algorithm
+ *
+ * @return string The php algorithm
+ * @throws APIException if an algorithm is not supported.
+ * @access private
+ */
+function map_api_hash($algo) {
+	$algo = strtolower(sanitise_string($algo));
+	$supported_algos = array(
+		"md5" => "md5",	// @todo Consider phasing this out
+		"sha" => "sha1", // alias for sha1
+		"sha1" => "sha1",
+		"sha256" => "sha256"
+	);
+
+	if (array_key_exists($algo, $supported_algos)) {
+		return $supported_algos[$algo];
+	}
+
+	throw new APIException(elgg_echo('APIException:AlgorithmNotSupported', array($algo)));
+}
+
+/**
+ * Calculate the HMAC for the http request.
+ * This function signs an api request using the information provided. The signature returned
+ * has been base64 encoded and then url encoded.
+ *
+ * @param string $algo          The HMAC algorithm used
+ * @param string $time          String representation of unix time
+ * @param string $nonce         Nonce
+ * @param string $api_key       Your api key
+ * @param string $secret_key    Your private key
+ * @param string $get_variables URLEncoded string representation of the get variable parameters,
+ *                              eg "method=user&guid=2"
+ * @param string $post_hash     Optional sha1 hash of the post data.
+ *
+ * @return string The HMAC signature
+ * @access private
+ */
+function calculate_hmac($algo, $time, $nonce, $api_key, $secret_key,
+$get_variables, $post_hash = "") {
+
+	global $CONFIG;
+
+	elgg_log("HMAC Parts: $algo, $time, $api_key, $secret_key, $get_variables, $post_hash");
+
+	$ctx = hash_init(map_api_hash($algo), HASH_HMAC, $secret_key);
+
+	hash_update($ctx, trim($time));
+	hash_update($ctx, trim($nonce));
+	hash_update($ctx, trim($api_key));
+	hash_update($ctx, trim($get_variables));
+	if (trim($post_hash) != "") {
+		hash_update($ctx, trim($post_hash));
+	}
+
+	return urlencode(base64_encode(hash_final($ctx, true)));
+}
+
+/**
+ * Calculate a hash for some post data.
+ *
+ * @todo Work out how to handle really large bits of data.
+ *
+ * @param string $postdata The post data.
+ * @param string $algo     The algorithm used.
+ *
+ * @return string The hash.
+ * @access private
+ */
+function calculate_posthash($postdata, $algo) {
+	$ctx = hash_init(map_api_hash($algo));
+
+	hash_update($ctx, $postdata);
+
+	return hash_final($ctx);
+}
+
+/**
+ * This function will do two things. Firstly it verifies that a HMAC signature
+ * hasn't been seen before, and secondly it will add the given hmac to the cache.
+ *
+ * @param string $hmac The hmac string.
+ *
+ * @return bool True if replay detected, false if not.
+ * @access private
+ */
+function cache_hmac_check_replay($hmac) {
+	// cache lifetime is 25 hours (this should be related to the time drift
+	// allowed in get_and_validate_headers
+	$cache = new ElggHMACCache(90000);
+
+	if (!$cache->load($hmac)) {
+		$cache->save($hmac, $hmac);
+
+		return false;
+	}
+
+	return true;
+}
+
+// API key functions /////////////////////////////////////////////////////////////////////
+
+/**
+ * Generate a new API user for a site, returning a new keypair on success.
+ *
+ * @param int $site_guid The GUID of the site. (default is current site)
+ *
+ * @return stdClass object or false
+ */
+function create_api_user($site_guid) {
+	global $CONFIG;
+
+	if (!isset($site_guid)) {
+		$site_guid = $CONFIG->site_id;
+	}
+
+	$site_guid = (int)$site_guid;
+
+	$public = sha1(rand() . $site_guid . microtime());
+	$secret = sha1(rand() . $site_guid . microtime() . $public);
+
+	$insert = insert_data("INSERT into {$CONFIG->dbprefix}api_users
+		(site_guid, api_key, secret) values
+		($site_guid, '$public', '$secret')");
+
+	if ($insert) {
+		return get_api_user($site_guid, $public);
+	}
+
+	return false;
+}
+
+/**
+ * Find an API User's details based on the provided public api key.
+ * These users are not users in the traditional sense.
+ *
+ * @param int    $site_guid The GUID of the site.
+ * @param string $api_key   The API Key
+ *
+ * @return mixed stdClass representing the database row or false.
+ */
+function get_api_user($site_guid, $api_key) {
+	global $CONFIG;
+
+	$api_key = sanitise_string($api_key);
+	$site_guid = (int)$site_guid;
+
+	$query = "SELECT * from {$CONFIG->dbprefix}api_users"
+	. " where api_key='$api_key' and site_guid=$site_guid and active=1";
+
+	return get_data_row($query);
+}
+
+/**
+ * Revoke an api user key.
+ *
+ * @param int    $site_guid The GUID of the site.
+ * @param string $api_key   The API Key (public).
+ *
+ * @return bool
+ */
+function remove_api_user($site_guid, $api_key) {
+	global $CONFIG;
+
+	$keypair = get_api_user($site_guid, $api_key);
+	if ($keypair) {
+		return delete_data("DELETE from {$CONFIG->dbprefix}api_users where id={$keypair->id}");
+	}
+
+	return false;
+}
+
+
+// User Authorization functions
+
+/**
+ * Check the user token
+ * This examines whether an authentication token is present and returns true if
+ * it is present and is valid. The user gets logged in so with the current
+ * session code of Elgg, that user will be logged out of all other sessions.
+ *
+ * @return bool
+ * @access private
+ */
+function pam_auth_usertoken() {
+	global $CONFIG;
+
+	$token = get_input('auth_token');
+	if (!$token) {
+		return false;
+	}
+
+	$validated_userid = validate_user_token($token, $CONFIG->site_id);
+
+	if ($validated_userid) {
+		$u = get_entity($validated_userid);
+
+		// Could we get the user?
+		if (!$u) {
+			return false;
+		}
+
+		// Not an elgg user
+		if ((!$u instanceof ElggUser)) {
+			return false;
+		}
+
+		// User is banned
+		if ($u->isBanned()) {
+			return false;
+		}
+
+		// Fail if we couldn't log the user in
+		if (!login($u)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * See if the user has a valid login sesson
+ *
+ * @return bool
+ * @access private
+ */
+function pam_auth_session() {
+	return elgg_is_logged_in();
+}
+
+// user token functions
+
+/**
+ * Obtain a token for a user.
+ *
+ * @param string $username The username
+ * @param int    $expire   Minutes until token expires (default is 60 minutes)
+ *
+ * @return bool
+ */
+function create_user_token($username, $expire = 60) {
+	global $CONFIG;
+
+	$site_guid = $CONFIG->site_id;
+	$user = get_user_by_username($username);
+	$time = time();
+	$time += 60 * $expire;
+	$token = md5(rand() . microtime() . $username . $time . $site_guid);
+
+	if (!$user) {
+		return false;
+	}
+
+	if (insert_data("INSERT into {$CONFIG->dbprefix}users_apisessions
+				(user_guid, site_guid, token, expires) values
+				({$user->guid}, $site_guid, '$token', '$time')
+				on duplicate key update token='$token', expires='$time'")) {
+		return $token;
+	}
+
+	return false;
+}
+
+/**
+ * Get all tokens attached to a user
+ *
+ * @param int $user_guid The user GUID
+ * @param int $site_guid The ID of the site (default is current site)
+ *
+ * @return false if none available or array of stdClass objects
+ * 		(see users_apisessions schema for available variables in objects)
+ * @since 1.7.0
+ */
+function get_user_tokens($user_guid, $site_guid) {
+	global $CONFIG;
+
+	if (!isset($site_guid)) {
+		$site_guid = $CONFIG->site_id;
+	}
+
+	$site_guid = (int)$site_guid;
+	$user_guid = (int)$user_guid;
+
+	$tokens = get_data("SELECT * from {$CONFIG->dbprefix}users_apisessions
+		where user_guid=$user_guid and site_guid=$site_guid");
+
+	return $tokens;
+}
+
+/**
+ * Validate a token against a given site.
+ *
+ * A token registered with one site can not be used from a
+ * different apikey(site), so be aware of this during development.
+ *
+ * @param string $token     The Token.
+ * @param int    $site_guid The ID of the site (default is current site)
+ *
+ * @return mixed The user id attached to the token if not expired or false.
+ */
+function validate_user_token($token, $site_guid) {
+	global $CONFIG;
+
+	if (!isset($site_guid)) {
+		$site_guid = $CONFIG->site_id;
+	}
+
+	$site_guid = (int)$site_guid;
+	$token = sanitise_string($token);
+
+	$time = time();
+
+	$user = get_data_row("SELECT * from {$CONFIG->dbprefix}users_apisessions
+		where token='$token' and site_guid=$site_guid and $time < expires");
+
+	if ($user) {
+		return $user->user_guid;
+	}
+
+	return false;
+}
+
+/**
+ * Remove user token
+ *
+ * @param string $token     The toekn
+ * @param int    $site_guid The ID of the site (default is current site)
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function remove_user_token($token, $site_guid) {
+	global $CONFIG;
+
+	if (!isset($site_guid)) {
+		$site_guid = $CONFIG->site_id;
+	}
+
+	$site_guid = (int)$site_guid;
+	$token = sanitise_string($token);
+
+	return delete_data("DELETE from {$CONFIG->dbprefix}users_apisessions
+		where site_guid=$site_guid and token='$token'");
+}
+
+/**
+ * Remove expired tokens
+ *
+ * @return bool
+ * @since 1.7.0
+ */
+function remove_expired_user_tokens() {
+	global $CONFIG;
+
+	$site_guid = $CONFIG->site_id;
+
+	$time = time();
+
+	return delete_data("DELETE from {$CONFIG->dbprefix}users_apisessions
+		where site_guid=$site_guid and expires < $time");
+}
+
+// Client api functions
+
+/**
+ * Utility function to serialise a header array into its text representation.
+ *
+ * @param array $headers The array of headers "key" => "value"
+ *
+ * @return string
+ * @access private
+ */
+function serialise_api_headers(array $headers) {
+	$headers_str = "";
+
+	foreach ($headers as $k => $v) {
+		$headers_str .= trim($k) . ": " . trim($v) . "\r\n";
+	}
+
+	return trim($headers_str);
+}
+
+/**
+ * Send a raw API call to an elgg api endpoint.
+ *
+ * @param array  $keys         The api keys.
+ * @param string $url          URL of the endpoint.
+ * @param array  $call         Associated array of "variable" => "value"
+ * @param string $method       GET or POST
+ * @param string $post_data    The post data
+ * @param string $content_type The content type
+ *
+ * @return string
+ */
+function send_api_call(array $keys, $url, array $call, $method = 'GET', $post_data = '',
+$content_type = 'application/octet-stream') {
+
+	global $CONFIG;
+
+	$headers = array();
+	$encoded_params = array();
+
+	$method = strtoupper($method);
+	switch (strtoupper($method)) {
+		case 'GET' :
+		case 'POST' :
+			break;
+		default:
+			$msg = elgg_echo('NotImplementedException:CallMethodNotImplemented', array($method));
+			throw new NotImplementedException($msg);
+	}
+
+	// Time
+	$time = time();
+
+	// Nonce
+	$nonce = uniqid('');
+
+	// URL encode all the parameters
+	foreach ($call as $k => $v) {
+		$encoded_params[] = urlencode($k) . '=' . urlencode($v);
+	}
+
+	$params = implode('&', $encoded_params);
+
+	// Put together the query string
+	$url = $url . "?" . $params;
+
+	// Construct headers
+	$posthash = "";
+	if ($method == 'POST') {
+		$posthash = calculate_posthash($post_data, 'md5');
+	}
+
+	if ((isset($keys['public'])) && (isset($keys['private']))) {
+		$headers['X-Elgg-apikey'] = $keys['public'];
+		$headers['X-Elgg-time'] = $time;
+		$headers['X-Elgg-nonce'] = $nonce;
+		$headers['X-Elgg-hmac-algo'] = 'sha1';
+		$headers['X-Elgg-hmac'] = calculate_hmac('sha1',
+			$time,
+			$nonce,
+			$keys['public'],
+			$keys['private'],
+			$params,
+			$posthash
+		);
+	}
+	if ($method == 'POST') {
+		$headers['X-Elgg-posthash'] = $posthash;
+		$headers['X-Elgg-posthash-algo'] = 'md5';
+
+		$headers['Content-type'] = $content_type;
+		$headers['Content-Length'] = strlen($post_data);
+	}
+
+	// Opt array
+	$http_opts = array(
+		'method' => $method,
+		'header' => serialise_api_headers($headers)
+	);
+	if ($method == 'POST') {
+		$http_opts['content'] = $post_data;
+	}
+
+	$opts = array('http' => $http_opts);
+
+	// Send context
+	$context = stream_context_create($opts);
+
+	// Send the query and get the result and decode.
+	elgg_log("APICALL: $url");
+	$results = file_get_contents($url, false, $context);
+
+	return $results;
+}
+
+/**
+ * Send a GET call
+ *
+ * @param string $url  URL of the endpoint.
+ * @param array  $call Associated array of "variable" => "value"
+ * @param array  $keys The keys dependant on chosen authentication method
+ *
+ * @return string
+ */
+function send_api_get_call($url, array $call, array $keys) {
+	return send_api_call($keys, $url, $call);
+}
+
+/**
+ * Send a GET call
+ *
+ * @param string $url          URL of the endpoint.
+ * @param array  $call         Associated array of "variable" => "value"
+ * @param array  $keys         The keys dependant on chosen authentication method
+ * @param string $post_data    The post data
+ * @param string $content_type The content type
+ *
+ * @return string
+ */
+function send_api_post_call($url, array $call, array $keys, $post_data,
+$content_type = 'application/octet-stream') {
+
+	return send_api_call($keys, $url, $call, 'POST', $post_data, $content_type);
+}
+
+/**
+ * Return a key array suitable for the API client using the standard
+ * authentication method based on api-keys and secret keys.
+ *
+ * @param string $secret_key Your secret key
+ * @param string $api_key    Your api key
+ *
+ * @return array
+ */
+function get_standard_api_key_array($secret_key, $api_key) {
+	return array('public' => $api_key, 'private' => $secret_key);
+}
+
+// System functions
+
+/**
+ * Simple api to return a list of all api's installed on the system.
+ *
+ * @return array
+ * @access private
+ */
+function list_all_apis() {
+	global $API_METHODS;
+
+	// sort first
+	ksort($API_METHODS);
+
+	return $API_METHODS;
+}
+
+/**
+ * The auth.gettoken API.
+ * This API call lets a user log in, returning an authentication token which can be used
+ * to authenticate a user for a period of time. It is passed in future calls as the parameter
+ * auth_token.
+ *
+ * @param string $username Username
+ * @param string $password Clear text password
+ *
+ * @return string Token string or exception
+ * @throws SecurityException
+ * @access private
+ */
+function auth_gettoken($username, $password) {
+	// check if username is an email address
+	if (is_email_address($username)) {
+		$users = get_user_by_email($username);
+			
+		// check if we have a unique user
+		if (is_array($users) && (count($users) == 1)) {
+			$username = $users[0]->username;
+		}
+	}
+	
+	// validate username and password
+	if (true === elgg_authenticate($username, $password)) {
+		$token = create_user_token($username);
+		if ($token) {
+			return $token;
+		}
+	}
+
+	throw new SecurityException(elgg_echo('SecurityException:authenticationfailed'));
+}
+
+// Error handler functions
+
+/** Define a global array of errors */
+$ERRORS = array();
+
+/**
+ * API PHP Error handler function.
+ * This function acts as a wrapper to catch and report PHP error messages.
+ *
+ * @see http://uk3.php.net/set-error-handler
+ *
+ * @param int    $errno    Error number
+ * @param string $errmsg   Human readable message
+ * @param string $filename Filename
+ * @param int    $linenum  Line number
+ * @param array  $vars     Vars
+ *
+ * @return void
+ * @access private
+ *
+ * @throws Exception
+ */
+function _php_api_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
+	global $ERRORS;
+
+	$error = date("Y-m-d H:i:s (T)") . ": \"" . $errmsg . "\" in file "
+	. $filename . " (line " . $linenum . ")";
+
+	switch ($errno) {
+		case E_USER_ERROR:
+			error_log("ERROR: " . $error);
+			$ERRORS[] = "ERROR: " . $error;
+
+			// Since this is a fatal error, we want to stop any further execution but do so gracefully.
+			throw new Exception("ERROR: " . $error);
+			break;
+
+		case E_WARNING :
+		case E_USER_WARNING :
+			error_log("WARNING: " . $error);
+			$ERRORS[] = "WARNING: " . $error;
+			break;
+
+		default:
+			error_log("DEBUG: " . $error);
+			$ERRORS[] = "DEBUG: " . $error;
+	}
+}
+
+/**
+ * API PHP Exception handler.
+ * This is a generic exception handler for PHP exceptions. This will catch any
+ * uncaught exception, end API execution and return the result to the requestor
+ * as an ErrorResult in the requested format.
+ *
+ * @param Exception $exception Exception
+ *
+ * @return void
+ * @access private
+ */
+function _php_api_exception_handler($exception) {
+
+	error_log("*** FATAL EXCEPTION (API) *** : " . $exception);
+
+	$code   = $exception->getCode() == 0 ? ErrorResult::$RESULT_FAIL : $exception->getCode();
+	$result = new ErrorResult($exception->getMessage(), $code, NULL);
+
+	echo elgg_view_page($exception->getMessage(), elgg_view("api/output", array("result" => $result)));
+}
+
+
+// Services handler
+
+/**
+ * Services handler - turns request over to the registered handler
+ * If no handler is found, this returns a 404 error
+ *
+ * @param string $handler Handler name
+ * @param array  $request Request string
+ *
+ * @return void
+ * @access private
+ */
+function service_handler($handler, $request) {
+	global $CONFIG;
+
+	elgg_set_context('api');
+
+	$request = explode('/', $request);
+
+	// after the handler, the first identifier is response format
+	// ex) http://example.org/services/api/rest/json/?method=test
+	$response_format = array_shift($request);
+	// Which view - xml, json, ...
+	if ($response_format && elgg_is_valid_view_type($response_format)) {
+		elgg_set_viewtype($response_format);
+	} else {
+		// default to json
+		elgg_set_viewtype("json");
+	}
+
+	if (!isset($CONFIG->servicehandler) || empty($handler)) {
+		// no handlers set or bad url
+		header("HTTP/1.0 404 Not Found");
+		exit;
+	} else if (isset($CONFIG->servicehandler[$handler]) && is_callable($CONFIG->servicehandler[$handler])) {
+		$function = $CONFIG->servicehandler[$handler];
+		call_user_func($function, $request, $handler);
+	} else {
+		// no handler for this web service
+		header("HTTP/1.0 404 Not Found");
+		exit;
+	}
+}
+
+/**
+ * Registers a web services handler
+ *
+ * @param string $handler  Web services type
+ * @param string $function Your function name
+ *
+ * @return bool Depending on success
+ * @since 1.7.0
+ */
+function register_service_handler($handler, $function) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->servicehandler)) {
+		$CONFIG->servicehandler = array();
+	}
+	if (is_callable($function, true)) {
+		$CONFIG->servicehandler[$handler] = $function;
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Remove a web service
+ * To replace a web service handler, register the desired handler over the old on
+ * with register_service_handler().
+ *
+ * @param string $handler web services type
+ *
+ * @return void
+ * @since 1.7.0
+ */
+function unregister_service_handler($handler) {
+	global $CONFIG;
+
+	if (isset($CONFIG->servicehandler, $CONFIG->servicehandler[$handler])) {
+		unset($CONFIG->servicehandler[$handler]);
+	}
+}
+
+/**
+ * REST API handler
+ *
+ * @return void
+ * @access private
+ *
+ * @throws SecurityException|APIException
+ */
+function rest_handler() {
+	global $CONFIG;
+
+	// Register the error handler
+	error_reporting(E_ALL);
+	set_error_handler('_php_api_error_handler');
+
+	// Register a default exception handler
+	set_exception_handler('_php_api_exception_handler');
+
+	// Check to see if the api is available
+	if ((isset($CONFIG->disable_api)) && ($CONFIG->disable_api == true)) {
+		throw new SecurityException(elgg_echo('SecurityException:APIAccessDenied'));
+	}
+
+	// plugins should return true to control what API and user authentication handlers are registered
+	if (elgg_trigger_plugin_hook('rest', 'init', null, false) == false) {
+		// for testing from a web browser, you can use the session PAM
+		// do not use for production sites!!
+		//register_pam_handler('pam_auth_session');
+
+		// user token can also be used for user authentication
+		register_pam_handler('pam_auth_usertoken');
+
+		// simple API key check
+		register_pam_handler('api_auth_key', "sufficient", "api");
+		// hmac
+		register_pam_handler('api_auth_hmac', "sufficient", "api");
+	}
+
+	// Get parameter variables
+	$method = get_input('method');
+	$result = null;
+
+	// this will throw an exception if authentication fails
+	authenticate_method($method);
+
+	$result = execute_method($method);
+
+
+	if (!($result instanceof GenericResult)) {
+		throw new APIException(elgg_echo('APIException:ApiResultUnknown'));
+	}
+
+	// Output the result
+	echo elgg_view_page($method, elgg_view("api/output", array("result" => $result)));
+}
+
+// Initialization
+
+/**
+ * Unit tests for API
+ *
+ * @param string  $hook   unit_test
+ * @param string $type   system
+ * @param mixed  $value  Array of tests
+ * @param mixed  $params Params
+ *
+ * @return array
+ * @access private
+ */
+function api_unit_test($hook, $type, $value, $params) {
+	global $CONFIG;
+
+	$value[] = $CONFIG->path . 'engine/tests/services/api.php';
+	return $value;
+}
+
+/**
+ * Initialise the API subsystem.
+ *
+ * @return void
+ * @access private
+ */
+function api_init() {
+	// Register a page handler, so we can have nice URLs
+	register_service_handler('rest', 'rest_handler');
+
+	elgg_register_plugin_hook_handler('unit_test', 'system', 'api_unit_test');
+
+	// expose the list of api methods
+	expose_function("system.api.list", "list_all_apis", NULL,
+	elgg_echo("system.api.list"), "GET", false, false);
+
+	// The authentication token api
+	expose_function(
+		"auth.gettoken",
+		"auth_gettoken",
+		array(
+			'username' => array ('type' => 'string'),
+			'password' => array ('type' => 'string'),
+		),
+		elgg_echo('auth.gettoken'),
+		'POST',
+		false,
+		false
+	);
+}
+
+
+elgg_register_event_handler('init', 'system', 'api_init');
diff --git a/engine/lib/widgets.php b/engine/lib/widgets.php
new file mode 100644
index 000000000..86b3e8219
--- /dev/null
+++ b/engine/lib/widgets.php
@@ -0,0 +1,420 @@
+<?php
+/**
+ * Elgg widgets library.
+ * Contains code for handling widgets.
+ *
+ * @package Elgg.Core
+ * @subpackage Widgets
+ */
+
+/**
+ * Get widgets for a particular context
+ *
+ * The widgets are ordered for display and grouped in columns.
+ * $widgets = elgg_get_widgets(elgg_get_logged_in_user_guid(), 'dashboard');
+ * $first_column_widgets = $widgets[1];
+ *
+ * @param int    $user_guid The owner user GUID
+ * @param string $context   The context (profile, dashboard, etc)
+ *
+ * @return array An 2D array of ElggWidget objects
+ * @since 1.8.0
+ */
+function elgg_get_widgets($user_guid, $context) {
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'widget',
+		'owner_guid' => $user_guid,
+		'private_setting_name' => 'context',
+		'private_setting_value' => $context,
+		'limit' => 0
+	);
+	$widgets = elgg_get_entities_from_private_settings($options);
+	if (!$widgets) {
+		return array();
+	}
+
+	$sorted_widgets = array();
+	foreach ($widgets as $widget) {
+		if (!isset($sorted_widgets[(int)$widget->column])) {
+			$sorted_widgets[(int)$widget->column] = array();
+		}
+		$sorted_widgets[(int)$widget->column][$widget->order] = $widget;
+	}
+
+	foreach ($sorted_widgets as $col => $widgets) {
+		ksort($sorted_widgets[$col]);
+	}
+
+	return $sorted_widgets;
+}
+
+/**
+ * Create a new widget instance
+ *
+ * @param int    $owner_guid GUID of entity that owns this widget
+ * @param string $handler    The handler for this widget
+ * @param string $context    The context for this widget
+ * @param int    $access_id  If not specified, it is set to the default access level
+ *
+ * @return int|false Widget GUID or false on failure
+ * @since 1.8.0
+ */
+function elgg_create_widget($owner_guid, $handler, $context, $access_id = null) {
+	if (empty($owner_guid) || empty($handler) || !elgg_is_widget_type($handler)) {
+		return false;
+	}
+
+	$owner = get_entity($owner_guid);
+	if (!$owner) {
+		return false;
+	}
+
+	$widget = new ElggWidget;
+	$widget->owner_guid = $owner_guid;
+	$widget->container_guid = $owner_guid; // @todo - will this work for group widgets
+	if (isset($access_id)) {
+		$widget->access_id = $access_id;
+	} else {
+		$widget->access_id = get_default_access();
+	}
+
+	if (!$widget->save()) {
+		return false;
+	}
+
+	// private settings cannot be set until ElggWidget saved
+	$widget->handler = $handler;
+	$widget->context = $context;
+
+	return $widget->getGUID();
+}
+
+/**
+ * Can the user edit the widget layout
+ *
+ * Triggers a 'permissions_check', 'widget_layout' plugin hook
+ *
+ * @param string $context   The widget context
+ * @param int    $user_guid The GUID of the user (0 for logged in user)
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_can_edit_widget_layout($context, $user_guid = 0) {
+
+	$user = get_entity((int)$user_guid);
+	if (!$user) {
+		$user = elgg_get_logged_in_user_entity();
+	}
+
+	$return = false;
+	if (elgg_is_admin_logged_in()) {
+		$return = true;
+	}
+	if (elgg_get_page_owner_guid() == $user->guid) {
+		$return = true;
+	}
+
+	$params = array(
+		'user' => $user,
+		'context' => $context,
+		'page_owner' => elgg_get_page_owner_entity()
+	);
+	return elgg_trigger_plugin_hook('permissions_check', 'widget_layout', $params, $return);
+}
+
+/**
+ * Regsiter a widget type
+ *
+ * This should be called by plugins in their init function.
+ *
+ * @param string $handler     The identifier for the widget handler
+ * @param string $name        The name of the widget type
+ * @param string $description A description for the widget type
+ * @param string $context     A comma-separated list of contexts where this
+ *                            widget is allowed (default: 'all')
+ * @param bool   $multiple    Whether or not multiple instances of this widget
+ *                            are allowed in a single layout (default: false)
+ *
+ * @return bool
+ * @since 1.8.0
+ */
+function elgg_register_widget_type($handler, $name, $description, $context = "all", $multiple = false) {
+
+	if (!$handler || !$name) {
+		return false;
+	}
+
+	global $CONFIG;
+
+	if (!isset($CONFIG->widgets)) {
+		$CONFIG->widgets = new stdClass;
+	}
+	if (!isset($CONFIG->widgets->handlers)) {
+		$CONFIG->widgets->handlers = array();
+	}
+
+	$handlerobj = new stdClass;
+	$handlerobj->name = $name;
+	$handlerobj->description = $description;
+	$handlerobj->context = is_array($context) ? $context : explode(",", $context);
+	$handlerobj->multiple = $multiple;
+
+	$CONFIG->widgets->handlers[$handler] = $handlerobj;
+
+	return true;
+}
+
+/**
+ * Remove a widget type
+ *
+ * @param string $handler The identifier for the widget
+ *
+ * @return void
+ * @since 1.8.0
+ */
+function elgg_unregister_widget_type($handler) {
+	global $CONFIG;
+
+	if (!isset($CONFIG->widgets)) {
+		return;
+	}
+
+	if (!isset($CONFIG->widgets->handlers)) {
+		return;
+	}
+
+	if (isset($CONFIG->widgets->handlers[$handler])) {
+		unset($CONFIG->widgets->handlers[$handler]);
+	}
+}
+
+/**
+ * Has a widget type with the specified handler been registered
+ *
+ * @param string $handler The widget handler identifying string
+ *
+ * @return bool Whether or not that widget type exists
+ * @since 1.8.0
+ */
+function elgg_is_widget_type($handler) {
+	global $CONFIG;
+
+	if (!empty($CONFIG->widgets) &&
+		!empty($CONFIG->widgets->handlers) &&
+		is_array($CONFIG->widgets->handlers) &&
+		array_key_exists($handler, $CONFIG->widgets->handlers)) {
+
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Get the widget types for a context
+ *
+ * The widget types are stdClass objects.
+ *
+ * @param string $context The widget context or empty string for current context
+ * @param bool   $exact   Only return widgets registered for this context (false)
+ *
+ * @return array
+ * @since 1.8.0
+ */
+function elgg_get_widget_types($context = "", $exact = false) {
+	global $CONFIG;
+
+	if (empty($CONFIG->widgets) ||
+		empty($CONFIG->widgets->handlers) ||
+		!is_array($CONFIG->widgets->handlers)) {
+		// no widgets
+		return array();
+	}
+
+	if (!$context) {
+		$context = elgg_get_context();
+	}
+
+	$widgets = array();
+	foreach ($CONFIG->widgets->handlers as $key => $handler) {
+		if ($exact) {
+			if (in_array($context, $handler->context)) {
+				$widgets[$key] = $handler;
+			}
+		} else {
+			if (in_array('all', $handler->context) || in_array($context, $handler->context)) {
+				$widgets[$key] = $handler;
+			}
+		}
+	}
+
+	return $widgets;
+}
+
+/**
+ * Regsiter entity of object, widget as ElggWidget objects
+ *
+ * @return void
+ * @access private
+ */
+function elgg_widget_run_once() {
+	add_subtype("object", "widget", "ElggWidget");
+}
+
+/**
+ * Function to initialize widgets functionality
+ *
+ * @return void
+ * @access private
+ */
+function elgg_widgets_init() {
+	elgg_register_action('widgets/save');
+	elgg_register_action('widgets/add');
+	elgg_register_action('widgets/move');
+	elgg_register_action('widgets/delete');
+	elgg_register_action('widgets/upgrade', '', 'admin');
+
+	run_function_once("elgg_widget_run_once");
+}
+
+/**
+ * Gets a list of events to create default widgets for and
+ * register menu items for default widgets with the admin section.
+ *
+ * A plugin that wants to register a new context for default widgets should
+ * register for the plugin hook 'get_list', 'default_widgets'. The handler 
+ * can register the new type of default widgets by adding an associate array to
+ * the return value array like this:
+ * array(
+ *     'name' => elgg_echo('profile'),
+ *     'widget_context' => 'profile',
+ *     'widget_columns' => 3,
+ *
+ *     'event' => 'create',
+ *     'entity_type' => 'user',
+ *     'entity_subtype' => ELGG_ENTITIES_ANY_VALUE,
+ * );
+ *
+ * The first set of keys define information about the new type of default
+ * widgets and the second set determine what event triggers the creation of the
+ * new widgets.
+ *
+ * @return void
+ * @access private
+ */
+function elgg_default_widgets_init() {
+	global $CONFIG;
+	$default_widgets = elgg_trigger_plugin_hook('get_list', 'default_widgets', null, array());
+
+	$CONFIG->default_widget_info = $default_widgets;
+
+	if ($default_widgets) {
+		elgg_register_admin_menu_item('configure', 'default_widgets', 'appearance');
+
+		// override permissions for creating widget on logged out / just created entities
+		elgg_register_plugin_hook_handler('container_permissions_check', 'object', 'elgg_default_widgets_permissions_override');
+
+		// only register the callback once per event
+		$events = array();
+		foreach ($default_widgets as $info) {
+			$events[$info['event'] . ',' . $info['entity_type']] = $info;
+		}
+		foreach ($events as $info) {
+			elgg_register_event_handler($info['event'], $info['entity_type'], 'elgg_create_default_widgets');
+		}
+	}
+}
+
+/**
+ * Creates default widgets
+ *
+ * This plugin hook handler is registered for events based on what kinds of
+ * default widgets have been registered. See elgg_default_widgets_init() for
+ * information on registering new default widget contexts.
+ *
+ * @param string $event  The event
+ * @param string $type   The type of object
+ * @param ElggEntity $entity The entity being created
+ * @return void
+ * @access private
+ */
+function elgg_create_default_widgets($event, $type, $entity) {
+	$default_widget_info = elgg_get_config('default_widget_info');
+
+	if (!$default_widget_info || !$entity) {
+		return;
+	}
+
+	$type = $entity->getType();
+	$subtype = $entity->getSubtype();
+
+	// event is already guaranteed by the hook registration.
+	// need to check subtype and type.
+	foreach ($default_widget_info as $info) {
+		if ($info['entity_type'] == $type) {
+			if ($info['entity_subtype'] == ELGG_ENTITIES_ANY_VALUE || $info['entity_subtype'] == $subtype) {
+
+				// need to be able to access everything
+				$old_ia = elgg_set_ignore_access(true);
+				elgg_push_context('create_default_widgets');
+
+				// pull in by widget context with widget owners as the site
+				// not using elgg_get_widgets() because it sorts by columns and we don't care right now.
+				$options = array(
+					'type' => 'object',
+					'subtype' => 'widget',
+					'owner_guid' => elgg_get_site_entity()->guid,
+					'private_setting_name' => 'context',
+					'private_setting_value' => $info['widget_context'],
+					'limit' => 0
+				);
+
+				$widgets = elgg_get_entities_from_private_settings($options);
+				/* @var ElggWidget[] $widgets */
+
+				foreach ($widgets as $widget) {
+					// change the container and owner
+					$new_widget = clone $widget;
+					$new_widget->container_guid = $entity->guid;
+					$new_widget->owner_guid = $entity->guid;
+
+					// pull in settings
+					$settings = get_all_private_settings($widget->guid);
+
+					foreach ($settings as $name => $value) {
+						$new_widget->$name = $value;
+					}
+
+					$new_widget->save();
+				}
+
+				elgg_set_ignore_access($old_ia);
+				elgg_pop_context();
+			}
+		}
+	}
+}
+
+/**
+ * Overrides permissions checks when creating widgets for logged out users.
+ *
+ * @param string $hook   The permissions hook.
+ * @param string $type   The type of entity being created.
+ * @param string $return Value
+ * @param mixed  $params Params
+ * @return true|null
+ * @access private
+ */
+function elgg_default_widgets_permissions_override($hook, $type, $return, $params) {
+	if ($type == 'object' && $params['subtype'] == 'widget') {
+		return elgg_in_context('create_default_widgets') ? true : null;
+	}
+
+	return null;
+}
+
+elgg_register_event_handler('init', 'system', 'elgg_widgets_init');
+// register default widget hooks from plugins
+elgg_register_event_handler('ready', 'system', 'elgg_default_widgets_init');
diff --git a/engine/lib/xml-rpc.php b/engine/lib/xml-rpc.php
new file mode 100644
index 000000000..bfe1a8645
--- /dev/null
+++ b/engine/lib/xml-rpc.php
@@ -0,0 +1,203 @@
+<?php
+/**
+ * Elgg XML-RPC library.
+ * Contains functions and classes to handle XML-RPC services, currently only server only.
+ *
+ * @package Elgg.Core
+ * @subpackage XMLRPC
+ */
+
+/**
+ * parse XMLRPCCall parameters
+ *
+ * Convert an XMLRPCCall result array into native data types
+ *
+ * @param array $parameters An array of params
+ *
+ * @return array
+ * @access private
+ */
+function xmlrpc_parse_params($parameters) {
+	$result = array();
+
+	foreach ($parameters as $parameter) {
+		$result[] = xmlrpc_scalar_value($parameter);
+	}
+
+	return $result;
+}
+
+/**
+ * Extract the scalar value of an XMLObject type result array
+ *
+ * @param XMLObject $object And object
+ *
+ * @return mixed
+ * @access private
+ */
+function xmlrpc_scalar_value($object) {
+	if ($object->name == 'param') {
+		$object = $object->children[0]->children[0];
+	}
+
+	switch ($object->name) {
+		case 'string':
+			return $object->content;
+
+		case 'array':
+			foreach ($object->children[0]->children as $child) {
+				$value[] = xmlrpc_scalar_value($child);
+			}
+			return $value;
+
+		case 'struct':
+			foreach ($object->children as $child) {
+				if (isset($child->children[1]->children[0])) {
+					$value[$child->children[0]->content] = xmlrpc_scalar_value($child->children[1]->children[0]);
+				} else {
+					$value[$child->children[0]->content] = $child->children[1]->content;
+				}
+			}
+			return $value;
+
+		case 'boolean':
+			return (boolean) $object->content;
+
+		case 'i4':
+		case 'int':
+			return (int) $object->content;
+
+		case 'double':
+			return (double) $object->content;
+
+		case 'dateTime.iso8601':
+			return (int) strtotime($object->content);
+
+		case 'base64':
+			return base64_decode($object->content);
+
+		case 'value':
+			return xmlrpc_scalar_value($object->children[0]);
+
+		default:
+			// @todo unsupported, throw an error
+			return false;
+	}
+}
+
+// Functions for adding handlers //////////////////////////////////////////////////////////
+
+/** XML-RPC Handlers */
+global $XML_RPC_HANDLERS;
+$XML_RPC_HANDLERS = array();
+
+/**
+ * Register a method handler for a given XML-RPC method.
+ *
+ * @param string $method  Method parameter.
+ * @param string $handler The handler function. This function accepts
+ *                        one XMLRPCCall object and must return a XMLRPCResponse object.
+ *
+ * @return bool
+ */
+function register_xmlrpc_handler($method, $handler) {
+	global $XML_RPC_HANDLERS;
+
+	$XML_RPC_HANDLERS[$method] = $handler;
+}
+
+/**
+ * Trigger a method call and pass the relevant parameters to the funciton.
+ *
+ * @param XMLRPCCall $parameters The call and parameters.
+ *
+ * @return XMLRPCCall
+ * @access private
+ */
+function trigger_xmlrpc_handler(XMLRPCCall $parameters) {
+	global $XML_RPC_HANDLERS;
+
+	// Go through and see if we have a handler
+	if (isset($XML_RPC_HANDLERS[$parameters->getMethodName()])) {
+		$handler = $XML_RPC_HANDLERS[$parameters->getMethodName()];
+		$result  = $handler($parameters);
+
+		if (!($result instanceof XMLRPCResponse)) {
+			$msg = elgg_echo('InvalidParameterException:UnexpectedReturnFormat',
+				array($parameters->getMethodName()));
+			throw new InvalidParameterException($msg);
+		}
+
+		// Result in right format, return it.
+		return $result;
+	}
+
+	// if no handler then throw exception
+	$msg = elgg_echo('NotImplementedException:XMLRPCMethodNotImplemented',
+		array($parameters->getMethodName()));
+	throw new NotImplementedException($msg);
+}
+
+/**
+ * PHP Error handler function.
+ * This function acts as a wrapper to catch and report PHP error messages.
+ *
+ * @see http://uk3.php.net/set-error-handler
+ *
+ * @param int    $errno    Error number
+ * @param string $errmsg   Human readable message
+ * @param string $filename Filename
+ * @param int    $linenum  Line number
+ * @param array  $vars     Vars
+ *
+ * @return void
+ * @access private
+ */
+function _php_xmlrpc_error_handler($errno, $errmsg, $filename, $linenum, $vars) {
+	$error = date("Y-m-d H:i:s (T)") . ": \"" . $errmsg . "\" in file "
+		. $filename . " (line " . $linenum . ")";
+
+	switch ($errno) {
+		case E_USER_ERROR:
+				error_log("ERROR: " . $error);
+
+				// Since this is a fatal error, we want to stop any further execution but do so gracefully.
+				throw new Exception("ERROR: " . $error);
+			break;
+
+		case E_WARNING :
+		case E_USER_WARNING :
+				error_log("WARNING: " . $error);
+			break;
+
+		default:
+			error_log("DEBUG: " . $error);
+	}
+}
+
+/**
+ * PHP Exception handler for XMLRPC.
+ *
+ * @param Exception $exception The exception
+ *
+ * @return void
+ * @access private
+ */
+function _php_xmlrpc_exception_handler($exception) {
+
+	error_log("*** FATAL EXCEPTION (XML-RPC) *** : " . $exception);
+
+	$code = $exception->getCode();
+
+	if ($code == 0) {
+		$code = -32400;
+	}
+
+	$result = new XMLRPCErrorResponse($exception->getMessage(), $code);
+
+	$vars = array('result' => $result);
+
+	$content = elgg_view("xml-rpc/output", $vars);
+
+	echo elgg_view_page($exception->getMessage(), $content);
+}
diff --git a/engine/lib/xml.php b/engine/lib/xml.php
new file mode 100644
index 000000000..497459d83
--- /dev/null
+++ b/engine/lib/xml.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Elgg XML library.
+ * Contains functions for generating and parsing XML.
+ *
+ * @package Elgg.Core
+ * @subpackage XML
+ */
+
+/**
+ * This function serialises an object recursively into an XML representation.
+ *
+ * The function attempts to call $data->export() which expects a stdClass in return,
+ * otherwise it will attempt to get the object variables using get_object_vars (which
+ * will only return public variables!)
+ *
+ * @param mixed  $data The object to serialise.
+ * @param string $name The name?
+ * @param int    $n    Level, only used for recursion.
+ *
+ * @return string The serialised XML output.
+ */
+function serialise_object_to_xml($data, $name = "", $n = 0) {
+	$classname = ($name == "" ? get_class($data) : $name);
+
+	$vars = method_exists($data, "export") ? get_object_vars($data->export()) : get_object_vars($data);
+
+	$output = "";
+
+	if (($n == 0) || ( is_object($data) && !($data instanceof stdClass))) {
+		$output = "<$classname>";
+	}
+
+	foreach ($vars as $key => $value) {
+		$output .= "<$key type=\"" . gettype($value) . "\">";
+
+		if (is_object($value)) {
+			$output .= serialise_object_to_xml($value, $key, $n + 1);
+		} else if (is_array($value)) {
+			$output .= serialise_array_to_xml($value, $n + 1);
+		} else if (gettype($value) == "boolean") {
+			$output .= $value ? "true" : "false";
+		} else {
+			$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
+		}
+
+		$output .= "</$key>\n";
+	}
+
+	if (($n == 0) || (is_object($data) && !($data instanceof stdClass))) {
+		$output .= "</$classname>\n";
+	}
+
+	return $output;
+}
+
+/**
+ * Serialise an array.
+ *
+ * @param array $data The data to serialize
+ * @param int   $n    Used for recursion
+ *
+ * @return string
+ */
+function serialise_array_to_xml(array $data, $n = 0) {
+	$output = "";
+
+	if ($n == 0) {
+		$output = "<array>\n";
+	}
+
+	foreach ($data as $key => $value) {
+		$item = "array_item";
+
+		if (is_numeric($key)) {
+			$output .= "<$item name=\"$key\" type=\"" . gettype($value) . "\">";
+		} else {
+			$item = $key;
+			$output .= "<$item type=\"" . gettype($value) . "\">";
+		}
+
+		if (is_object($value)) {
+			$output .= serialise_object_to_xml($value, "", $n + 1);
+		} else if (is_array($value)) {
+			$output .= serialise_array_to_xml($value, $n + 1);
+		} else if (gettype($value) == "boolean") {
+			$output .= $value ? "true" : "false";
+		} else {
+			$output .= htmlspecialchars($value, ENT_NOQUOTES, 'UTF-8');
+		}
+
+		$output .= "</$item>\n";
+	}
+
+	if ($n == 0) {
+		$output .= "</array>\n";
+	}
+
+	return $output;
+}
+
+/**
+ * Parse an XML file into an object.
+ *
+ * @param string $xml The XML
+ *
+ * @return ElggXMLElement
+ */
+function xml_to_object($xml) {
+	return new ElggXMLElement($xml);
+}
diff --git a/engine/schema/mysql.sql b/engine/schema/mysql.sql
new file mode 100644
index 000000000..4714b71bb
--- /dev/null
+++ b/engine/schema/mysql.sql
@@ -0,0 +1,454 @@
+-- MySQL dump 10.13  Distrib 5.1.37, for debian-linux-gnu (i486)
+--
+-- Host: localhost    Database: elgg
+-- ------------------------------------------------------
+-- Server version	5.1.37-1ubuntu5
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `prefix_access_collection_membership`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_access_collection_membership` (
+  `user_guid` int(11) NOT NULL,
+  `access_collection_id` int(11) NOT NULL,
+  PRIMARY KEY (`user_guid`,`access_collection_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_access_collections`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_access_collections` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` text NOT NULL,
+  `owner_guid` bigint(20) unsigned NOT NULL,
+  `site_guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  KEY `owner_guid` (`owner_guid`),
+  KEY `site_guid` (`site_guid`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_annotations`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_annotations` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `entity_guid` bigint(20) unsigned NOT NULL,
+  `name_id` int(11) NOT NULL,
+  `value_id` int(11) NOT NULL,
+  `value_type` enum('integer','text') NOT NULL,
+  `owner_guid` bigint(20) unsigned NOT NULL,
+  `access_id` int(11) NOT NULL,
+  `time_created` int(11) NOT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  PRIMARY KEY (`id`),
+  KEY `entity_guid` (`entity_guid`),
+  KEY `name_id` (`name_id`),
+  KEY `value_id` (`value_id`),
+  KEY `owner_guid` (`owner_guid`),
+  KEY `access_id` (`access_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_api_users`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_api_users` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `site_guid` bigint(20) unsigned DEFAULT NULL,
+  `api_key` varchar(40) DEFAULT NULL,
+  `secret` varchar(40) NOT NULL,
+  `active` int(1) DEFAULT '1',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `api_key` (`api_key`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_config`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_config` (
+  `name` varchar(255) NOT NULL,
+  `value` text NOT NULL,
+  `site_guid` int(11) NOT NULL,
+  PRIMARY KEY (`name`,`site_guid`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_datalists`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_datalists` (
+  `name` varchar(255) NOT NULL,
+  `value` text NOT NULL,
+  PRIMARY KEY (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_entities`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_entities` (
+  `guid` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
+  `type` enum('object','user','group','site') NOT NULL,
+  `subtype` int(11) DEFAULT NULL,
+  `owner_guid` bigint(20) unsigned NOT NULL,
+  `site_guid` bigint(20) unsigned NOT NULL,
+  `container_guid` bigint(20) unsigned NOT NULL,
+  `access_id` int(11) NOT NULL,
+  `time_created` int(11) NOT NULL,
+  `time_updated` int(11) NOT NULL,
+  `last_action` int(11) NOT NULL DEFAULT '0',
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  PRIMARY KEY (`guid`),
+  KEY `type` (`type`),
+  KEY `subtype` (`subtype`),
+  KEY `owner_guid` (`owner_guid`),
+  KEY `site_guid` (`site_guid`),
+  KEY `container_guid` (`container_guid`),
+  KEY `access_id` (`access_id`),
+  KEY `time_created` (`time_created`),
+  KEY `time_updated` (`time_updated`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_entity_relationships`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_entity_relationships` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `guid_one` bigint(20) unsigned NOT NULL,
+  `relationship` varchar(50) NOT NULL,
+  `guid_two` bigint(20) unsigned NOT NULL,
+  `time_created` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `guid_one` (`guid_one`,`relationship`,`guid_two`),
+  KEY `relationship` (`relationship`),
+  KEY `guid_two` (`guid_two`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_entity_subtypes`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_entity_subtypes` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` enum('object','user','group','site') NOT NULL,
+  `subtype` varchar(50) NOT NULL,
+  `class` varchar(50) NOT NULL DEFAULT '',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `type` (`type`,`subtype`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_geocode_cache`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_geocode_cache` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `location` varchar(128) DEFAULT NULL,
+  `lat` varchar(20) DEFAULT NULL,
+  `long` varchar(20) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `location` (`location`)
+) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_groups_entity`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_groups_entity` (
+  `guid` bigint(20) unsigned NOT NULL,
+  `name` text NOT NULL,
+  `description` text NOT NULL,
+  PRIMARY KEY (`guid`),
+  KEY `name` (`name`(50)),
+  KEY `description` (`description`(50)),
+  FULLTEXT KEY `name_2` (`name`,`description`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_hmac_cache`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_hmac_cache` (
+  `hmac` varchar(255) NOT NULL,
+  `ts` int(11) NOT NULL,
+  PRIMARY KEY (`hmac`),
+  KEY `ts` (`ts`)
+) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_metadata`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_metadata` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `entity_guid` bigint(20) unsigned NOT NULL,
+  `name_id` int(11) NOT NULL,
+  `value_id` int(11) NOT NULL,
+  `value_type` enum('integer','text') NOT NULL,
+  `owner_guid` bigint(20) unsigned NOT NULL,
+  `access_id` int(11) NOT NULL,
+  `time_created` int(11) NOT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  PRIMARY KEY (`id`),
+  KEY `entity_guid` (`entity_guid`),
+  KEY `name_id` (`name_id`),
+  KEY `value_id` (`value_id`),
+  KEY `owner_guid` (`owner_guid`),
+  KEY `access_id` (`access_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_metastrings`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_metastrings` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `string` text NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `string` (`string`(50))
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_objects_entity`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_objects_entity` (
+  `guid` bigint(20) unsigned NOT NULL,
+  `title` text NOT NULL,
+  `description` text NOT NULL,
+  PRIMARY KEY (`guid`),
+  FULLTEXT KEY `title` (`title`,`description`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_private_settings`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_private_settings` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `entity_guid` int(11) NOT NULL,
+  `name` varchar(128) NOT NULL,
+  `value` text NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `entity_guid` (`entity_guid`,`name`),
+  KEY `name` (`name`),
+  KEY `value` (`value`(50))
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_river`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_river` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `type` varchar(8) NOT NULL,
+  `subtype` varchar(32) NOT NULL,
+  `action_type` varchar(32) NOT NULL,
+  `access_id` int(11) NOT NULL,
+  `view` text NOT NULL,
+  `subject_guid` int(11) NOT NULL,
+  `object_guid` int(11) NOT NULL,
+  `annotation_id` int(11) NOT NULL,
+  `posted` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `type` (`type`),
+  KEY `action_type` (`action_type`),
+  KEY `access_id` (`access_id`),
+  KEY `subject_guid` (`subject_guid`),
+  KEY `object_guid` (`object_guid`),
+  KEY `annotation_id` (`annotation_id`),
+  KEY `posted` (`posted`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_sites_entity`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_sites_entity` (
+  `guid` bigint(20) unsigned NOT NULL,
+  `name` text NOT NULL,
+  `description` text NOT NULL,
+  `url` varchar(255) NOT NULL,
+  PRIMARY KEY (`guid`),
+  UNIQUE KEY `url` (`url`),
+  FULLTEXT KEY `name` (`name`,`description`,`url`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_system_log`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_system_log` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `object_id` int(11) NOT NULL,
+  `object_class` varchar(50) NOT NULL,
+  `object_type` varchar(50) NOT NULL,
+  `object_subtype` varchar(50) NOT NULL,
+  `event` varchar(50) NOT NULL,
+  `performed_by_guid` int(11) NOT NULL,
+  `owner_guid` int(11) NOT NULL,
+  `access_id` int(11) NOT NULL,
+  `enabled` enum('yes','no') NOT NULL DEFAULT 'yes',
+  `time_created` int(11) NOT NULL,
+  `ip_address` varchar(46) NOT NULL,
+  PRIMARY KEY (`id`),
+  KEY `object_id` (`object_id`),
+  KEY `object_class` (`object_class`),
+  KEY `object_type` (`object_type`),
+  KEY `object_subtype` (`object_subtype`),
+  KEY `event` (`event`),
+  KEY `performed_by_guid` (`performed_by_guid`),
+  KEY `access_id` (`access_id`),
+  KEY `time_created` (`time_created`),
+  KEY `river_key` (`object_type`,`object_subtype`,`event`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_users_apisessions`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_users_apisessions` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `user_guid` bigint(20) unsigned NOT NULL,
+  `site_guid` bigint(20) unsigned NOT NULL,
+  `token` varchar(40) DEFAULT NULL,
+  `expires` int(11) NOT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `user_guid` (`user_guid`,`site_guid`),
+  KEY `token` (`token`)
+) ENGINE=MEMORY DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_users_entity`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_users_entity` (
+  `guid` bigint(20) unsigned NOT NULL,
+  `name` text NOT NULL,
+  `username` varchar(128) NOT NULL DEFAULT '',
+  `password` varchar(32) NOT NULL DEFAULT '',
+  `salt` varchar(8) NOT NULL DEFAULT '',
+  `email` text NOT NULL,
+  `language` varchar(6) NOT NULL DEFAULT '',
+  `code` varchar(32) NOT NULL DEFAULT '',
+  `banned` enum('yes','no') NOT NULL DEFAULT 'no',
+  `admin` enum('yes','no') NOT NULL DEFAULT 'no',
+  `last_action` int(11) NOT NULL DEFAULT '0',
+  `prev_last_action` int(11) NOT NULL DEFAULT '0',
+  `last_login` int(11) NOT NULL DEFAULT '0',
+  `prev_last_login` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`),
+  UNIQUE KEY `username` (`username`),
+  KEY `password` (`password`),
+  KEY `email` (`email`(50)),
+  KEY `code` (`code`),
+  KEY `last_action` (`last_action`),
+  KEY `last_login` (`last_login`),
+  KEY `admin` (`admin`),
+  FULLTEXT KEY `name` (`name`),
+  FULLTEXT KEY `name_2` (`name`,`username`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `prefix_users_sessions`
+--
+
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `prefix_users_sessions` (
+  `session` varchar(255) NOT NULL,
+  `ts` int(11) unsigned NOT NULL DEFAULT '0',
+  `data` mediumblob,
+  PRIMARY KEY (`session`),
+  KEY `ts` (`ts`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2010-01-29 14:28:11
diff --git a/engine/schema/upgrades/2008092301.sql b/engine/schema/upgrades/2008092301.sql
new file mode 100644
index 000000000..2ae52e0c9
--- /dev/null
+++ b/engine/schema/upgrades/2008092301.sql
@@ -0,0 +1,100 @@
+--- Ensure default character set is UTF8
+
+ALTER TABLE `prefix_config` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_entities` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_entity_subtypes` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_entity_relationships` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_access_collections` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_access_collection_membership` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_objects_entity` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_sites_entity` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_users_entity` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_groups_entity` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_annotations` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_metadata` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_metastrings` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_api_users` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_users_apisessions` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_datalists` DEFAULT CHARACTER SET utf8;
+ALTER TABLE `prefix_system_log` DEFAULT CHARACTER SET utf8;
+
+-- Drop keys to avoid errors (grr)
+
+ALTER TABLE `prefix_entities` DROP KEY `type`;
+ALTER TABLE `prefix_entities` DROP KEY `subtype`;
+ALTER TABLE `prefix_entities` DROP KEY `owner_guid`;
+ALTER TABLE `prefix_entities` DROP KEY `container_guid`;
+ALTER TABLE `prefix_entities` DROP KEY `access_id`;
+ALTER TABLE `prefix_entities` DROP KEY `time_created`;
+ALTER TABLE `prefix_entities` DROP KEY `time_updated`;
+
+ALTER TABLE `prefix_users_entity` DROP  KEY `email`;
+ALTER TABLE `prefix_users_entity` DROP  KEY `code`;
+
+ALTER TABLE `prefix_annotations` DROP KEY `entity_guid`;
+ALTER TABLE `prefix_annotations` DROP KEY `name_id`;
+ALTER TABLE `prefix_annotations` DROP KEY `value_id`;
+ALTER TABLE `prefix_annotations` DROP KEY `owner_guid`;
+ALTER TABLE `prefix_annotations` DROP KEY `access_id`;
+
+ALTER TABLE `prefix_metadata` DROP KEY `entity_guid`;
+ALTER TABLE `prefix_metadata` DROP KEY `name_id`;
+ALTER TABLE `prefix_metadata` DROP KEY `value_id`;
+ALTER TABLE `prefix_metadata` DROP KEY `owner_guid`;
+ALTER TABLE `prefix_metadata` DROP KEY `access_id`;
+
+ALTER TABLE `prefix_users_apisessions` DROP KEY `token`;
+
+ALTER TABLE `prefix_system_log` DROP KEY `object_id`;
+ALTER TABLE `prefix_system_log` DROP KEY `object_class`;
+ALTER TABLE `prefix_system_log` DROP KEY `event`;
+ALTER TABLE `prefix_system_log` DROP KEY `performed_by_guid`;
+ALTER TABLE `prefix_system_log` DROP KEY `time_created`;
+
+-- New keys
+
+ALTER TABLE `prefix_entities` ADD KEY `type` (`type`);
+ALTER TABLE `prefix_entities` ADD KEY `subtype` (`subtype`);
+ALTER TABLE `prefix_entities` ADD KEY `owner_guid` (`owner_guid`);
+ALTER TABLE `prefix_entities` ADD KEY `container_guid` (`container_guid`);
+ALTER TABLE `prefix_entities` ADD KEY `access_id` (`access_id`);
+ALTER TABLE `prefix_entities` ADD KEY `time_created` (`time_created`);
+ALTER TABLE `prefix_entities` ADD KEY `time_updated` (`time_updated`);
+
+ALTER TABLE `prefix_users_entity` ADD  KEY `email` (`email`(50));
+ALTER TABLE `prefix_users_entity` ADD  KEY `code` (`code`(50));
+
+ALTER TABLE `prefix_annotations` ADD KEY `entity_guid` (`entity_guid`);
+ALTER TABLE `prefix_annotations` ADD KEY `name_id` (`name_id`);
+ALTER TABLE `prefix_annotations` ADD KEY `value_id` (`value_id`);
+ALTER TABLE `prefix_annotations` ADD KEY `owner_guid` (`owner_guid`);
+ALTER TABLE `prefix_annotations` ADD KEY `access_id` (`access_id`);
+
+ALTER TABLE `prefix_metadata` ADD KEY `entity_guid` (`entity_guid`);
+ALTER TABLE `prefix_metadata` ADD KEY `name_id` (`name_id`);
+ALTER TABLE `prefix_metadata` ADD KEY `value_id` (`value_id`);
+ALTER TABLE `prefix_metadata` ADD KEY `owner_guid` (`owner_guid`);
+ALTER TABLE `prefix_metadata` ADD KEY `access_id` (`access_id`);
+
+ALTER TABLE `prefix_metastrings` DROP KEY `string`;
+ALTER TABLE `prefix_metastrings` ADD KEY `string` (`string`(50));
+
+ALTER TABLE `prefix_users_apisessions` ADD KEY `token` (`token`);
+
+ALTER TABLE `prefix_system_log` ADD KEY `object_id` (`object_id`);
+ALTER TABLE `prefix_system_log` ADD KEY `object_class` (`object_class`);
+ALTER TABLE `prefix_system_log` ADD KEY `event` (`event`);
+ALTER TABLE `prefix_system_log` ADD KEY `performed_by_guid` (`performed_by_guid`);
+ALTER TABLE `prefix_system_log` ADD KEY `time_created` (`time_created`);
+
+DROP TABLE `prefix_privileged_paths`;
+
+-- HMAC Cache protecting against Replay attacks
+
+CREATE TABLE IF NOT EXISTS `prefix_hmac_cache` (
+	`hmac` varchar(255) NOT NULL,
+	`ts` int(11) NOT NULL,
+
+	PRIMARY KEY  (`hmac`),
+	KEY `ts` (`ts`)
+) ENGINE=MEMORY;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008100601.sql b/engine/schema/upgrades/2008100601.sql
new file mode 100644
index 000000000..d02dd9f6c
--- /dev/null
+++ b/engine/schema/upgrades/2008100601.sql
@@ -0,0 +1,14 @@
+ALTER TABLE `prefix_system_log` ADD COLUMN `object_type` varchar(50) NOT NULL AFTER `object_class`;
+ALTER TABLE `prefix_system_log` ADD COLUMN `object_subtype` varchar(50) NOT NULL AFTER `object_type`;
+ALTER TABLE `prefix_system_log` MODIFY  `object_event` varchar(50) NOT NULL;
+ALTER TABLE `prefix_system_log` MODIFY  `object_class` varchar(50) NOT NULL;
+
+
+ALTER TABLE `prefix_system_log` DROP KEY `object_type`;
+ALTER TABLE `prefix_system_log` DROP KEY `object_subtype`;
+ALTER TABLE `prefix_system_log` DROP KEY `river_key`;
+
+ALTER TABLE `prefix_system_log` ADD KEY `object_type` (`object_type`);
+ALTER TABLE `prefix_system_log` ADD KEY `object_subtype` (`object_subtype`);
+
+ALTER TABLE `prefix_system_log` ADD KEY `river_key` (`object_type`, `object_subtype`, `event`);
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008101601.sql b/engine/schema/upgrades/2008101601.sql
new file mode 100644
index 000000000..cd10eb024
--- /dev/null
+++ b/engine/schema/upgrades/2008101601.sql
@@ -0,0 +1,11 @@
+ALTER TABLE `prefix_system_log` ADD COLUMN `access_id` int(11) NOT NULL AFTER `performed_by_guid`;
+ALTER TABLE `prefix_system_log` ADD COLUMN `enabled` enum ('yes', 'no') NOT NULL default 'yes' AFTER `access_id`;
+
+ALTER TABLE `prefix_system_log` DROP KEY `access_id`;
+ALTER TABLE `prefix_system_log` ADD KEY `access_id` (`access_id`);
+
+ALTER TABLE `prefix_system_log` DROP KEY `enabled`;
+ALTER TABLE `prefix_system_log` ADD KEY `enabled` (`enabled`);
+
+ALTER TABLE `prefix_system_log` DROP KEY `river_key`;
+ALTER TABLE `prefix_system_log` ADD KEY `river_key` (`object_type`, `object_subtype`, `event`, `access_id`, `enabled`);
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008101701.sql b/engine/schema/upgrades/2008101701.sql
new file mode 100644
index 000000000..3e6fc9653
--- /dev/null
+++ b/engine/schema/upgrades/2008101701.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `prefix_system_log` ADD COLUMN `owner_guid` int(11) NOT NULL AFTER `performed_by_guid`;
+
+ALTER TABLE `prefix_system_log` DROP KEY `owner_guid`;
+ALTER TABLE `prefix_system_log` ADD KEY `owner_guid` (`owner_guid`);
+
+ALTER TABLE `prefix_system_log` DROP KEY `river_key`;
+ALTER TABLE `prefix_system_log` ADD KEY `river_key` (`object_type`, `object_subtype`, `event`, `access_id`);
diff --git a/engine/schema/upgrades/2008102101.sql b/engine/schema/upgrades/2008102101.sql
new file mode 100644
index 000000000..544f28d2f
--- /dev/null
+++ b/engine/schema/upgrades/2008102101.sql
@@ -0,0 +1,9 @@
+
+CREATE TABLE  IF NOT EXISTS `prefix_users_sessions` (
+	`session` varchar(255) NOT NULL,
+ 	`ts` int(11) unsigned NOT NULL default '0',
+	`data` mediumblob,
+	
+	PRIMARY KEY `session` (`session`),
+	KEY `ts` (`ts`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008110301.sql b/engine/schema/upgrades/2008110301.sql
new file mode 100644
index 000000000..8fd0539d2
--- /dev/null
+++ b/engine/schema/upgrades/2008110301.sql
@@ -0,0 +1,17 @@
+
+-- Based on slow query table feedback
+ALTER TABLE `prefix_entity_relationships` DROP KEY `relationship`;
+ALTER TABLE `prefix_entity_relationships` ADD KEY `relationship` (`relationship`);
+
+ALTER TABLE `prefix_entity_relationships` DROP KEY `guid_two`;
+ALTER TABLE `prefix_entity_relationships` ADD KEY `guid_two` (`guid_two`);
+
+-- The following seemed to have been missed off upgrade
+ALTER TABLE `prefix_users_entity` DROP KEY `code`;
+ALTER TABLE `prefix_users_entity` ADD KEY `code` (`code`);
+
+-- Access collections missing keys
+ALTER TABLE `prefix_access_collections` DROP KEY `site_guid`;
+ALTER TABLE `prefix_access_collections` ADD KEY `site_guid` (`site_guid`);
+ALTER TABLE `prefix_access_collections` DROP KEY `owner_guid`;
+ALTER TABLE `prefix_access_collections` ADD KEY `owner_guid` (`owner_guid`);
diff --git a/engine/schema/upgrades/2008110601.sql b/engine/schema/upgrades/2008110601.sql
new file mode 100644
index 000000000..ddd80a91b
--- /dev/null
+++ b/engine/schema/upgrades/2008110601.sql
@@ -0,0 +1,3 @@
+-- Alter datalists to have a primary key
+ALTER TABLE `prefix_datalists` DROP KEY `name`;
+ALTER TABLE `prefix_datalists` ADD PRIMARY KEY `name` (`name`);
diff --git a/engine/schema/upgrades/2008111901.sql b/engine/schema/upgrades/2008111901.sql
new file mode 100644
index 000000000..617678bb6
--- /dev/null
+++ b/engine/schema/upgrades/2008111901.sql
@@ -0,0 +1,8 @@
+CREATE TABLE  IF NOT EXISTS `prefix_private_settings` (
+	`id` INT NOT NULL auto_increment,
+	`entity_guid` INT NOT NULL ,
+	`name` VARCHAR( 128 ) NOT NULL ,
+	`value` TEXT NOT NULL ,
+	PRIMARY KEY ( `id` ) ,
+	UNIQUE KEY ( `entity_guid` , `name` )
+) ENGINE = MYISAM  DEFAULT CHARSET=utf8;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008112001.sql b/engine/schema/upgrades/2008112001.sql
new file mode 100644
index 000000000..9159e6c6f
--- /dev/null
+++ b/engine/schema/upgrades/2008112001.sql
@@ -0,0 +1,24 @@
+-- Move plugin settings to private store
+INSERT INTO `prefix_private_settings` (entity_guid, name, `value`) 
+ SELECT e.guid as guid, name_string.string as name, value_string.string as `value` FROM `prefix_entities` e 
+	JOIN `prefix_metadata` name_val ON e.guid=name_val.entity_guid
+	JOIN `prefix_metastrings` name_string ON name_val.name_id = name_string.id
+	JOIN `prefix_metastrings` value_string ON name_val.value_id = value_string.id
+ WHERE
+	e.type='object' AND
+	e.subtype in (SELECT id from `prefix_entity_subtypes` WHERE subtype='plugin' and type='object');
+
+-- Delete previous settings
+CREATE TEMPORARY TABLE __upgrade_2008112001_1 (
+ SELECT distinct meta.id as id from `prefix_metadata` meta 
+	JOIN `prefix_private_settings` settings ON meta.entity_guid = settings.entity_guid
+	JOIN `prefix_entities` e ON e.guid = meta.entity_guid
+	JOIN `prefix_entity_subtypes` subtypes ON subtypes.id = e.subtype
+ WHERE
+	e.type='object' AND
+	subtypes.subtype = 'plugin'
+);
+
+DELETE FROM `prefix_metadata` WHERE id in (SELECT id from __upgrade_2008112001_1);
+
+DROP TABLE __upgrade_2008112001_1;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008112002.sql b/engine/schema/upgrades/2008112002.sql
new file mode 100644
index 000000000..cdd308fe0
--- /dev/null
+++ b/engine/schema/upgrades/2008112002.sql
@@ -0,0 +1,29 @@
+-- Move user plugins settings to new data store
+INSERT INTO `prefix_private_settings` (entity_guid, name, `value`) 
+ SELECT e.guid as guid, name_string.string as name, value_string.string as value FROM `prefix_entities` e 
+	JOIN `prefix_metadata` name_val ON e.guid=name_val.entity_guid
+	JOIN `prefix_metastrings` name_string ON name_val.name_id = name_string.id
+	JOIN `prefix_metastrings` value_string ON name_val.value_id = value_string.id
+ WHERE
+	e.type='user' AND
+	name_string.string like 'plugin:settings:%';
+
+-- Delete previous settings
+CREATE TEMPORARY TABLE __upgrade_2008112002_1 (
+ SELECT distinct meta.id as id from `prefix_metadata` meta
+	JOIN `prefix_private_settings` settings ON meta.entity_guid = settings.entity_guid
+
+	JOIN `prefix_entities` e ON e.guid = meta.entity_guid
+	JOIN `prefix_metadata` name_val ON e.guid=name_val.entity_guid
+
+	JOIN `prefix_metastrings` name_string ON name_val.name_id = name_string.id
+	JOIN `prefix_metastrings` value_string ON name_val.value_id = value_string.id
+ WHERE
+	e.type='user' AND
+	name_string.string like 'plugin:settings:%' AND
+	meta.name_id = name_string.id
+);
+
+DELETE FROM `prefix_metadata` WHERE id in (SELECT id from __upgrade_2008112002_1);
+
+DROP TABLE __upgrade_2008112002_1;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008112501.sql b/engine/schema/upgrades/2008112501.sql
new file mode 100644
index 000000000..41e41f93e
--- /dev/null
+++ b/engine/schema/upgrades/2008112501.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS `prefix_geocode_cache` (
+	id     int(11)     auto_increment,
+	location varchar(128),
+	`lat`    varchar(20),
+	`long`   varchar(20),
+	
+	PRIMARY KEY (`id`),
+    KEY `location` (`location`)
+	
+) ENGINE=MEMORY;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008112601.sql b/engine/schema/upgrades/2008112601.sql
new file mode 100644
index 000000000..9ca9657de
--- /dev/null
+++ b/engine/schema/upgrades/2008112601.sql
@@ -0,0 +1,27 @@
+-- We now are using a extended class to handle this
+UPDATE `prefix_entity_subtypes` SET class='ElggPlugin' where type='object' and subtype='widget';
+
+-- Move widget settings to private store
+INSERT INTO `prefix_private_settings` (entity_guid, name, `value`) 
+ SELECT e.guid as guid, name_string.string as name, value_string.string as `value` FROM `prefix_entities` e 
+	JOIN `prefix_metadata` name_val ON e.guid=name_val.entity_guid
+	JOIN `prefix_metastrings` name_string ON name_val.name_id = name_string.id
+	JOIN `prefix_metastrings` value_string ON name_val.value_id = value_string.id
+ WHERE
+	e.type='object' AND
+	e.subtype in (SELECT id from `prefix_entity_subtypes` WHERE subtype='widget' and type='object');
+
+-- Delete previous settings
+CREATE TEMPORARY TABLE __upgrade_2008112601 (
+ SELECT distinct meta.id as id from `prefix_metadata` meta 
+	JOIN `prefix_private_settings` settings ON meta.entity_guid = settings.entity_guid
+	JOIN `prefix_entities` e ON e.guid = meta.entity_guid
+	JOIN `prefix_entity_subtypes` subtypes ON subtypes.id = e.subtype
+ WHERE
+	e.type='object' AND
+	subtypes.subtype = 'widget'
+);
+
+DELETE FROM `prefix_metadata` WHERE id in (SELECT id from __upgrade_2008112601);
+
+DROP TABLE __upgrade_2008112001;
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2008120501.sql b/engine/schema/upgrades/2008120501.sql
new file mode 100644
index 000000000..dd44b96b0
--- /dev/null
+++ b/engine/schema/upgrades/2008120501.sql
@@ -0,0 +1,9 @@
+-- Modify field length in private settings (for people who upgraded while #611 present)
+ALTER TABLE `prefix_private_settings` MODIFY  `name` varchar(128) NOT NULL;
+
+-- While we're at it, add some more keys
+ALTER TABLE `prefix_private_settings` DROP KEY `name`;
+ALTER TABLE `prefix_private_settings` ADD KEY `name` (`name`);
+
+ALTER TABLE `prefix_private_settings` DROP KEY `value`;
+ALTER TABLE `prefix_private_settings` ADD KEY `value` (`value` (50));
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2009010801.sql b/engine/schema/upgrades/2009010801.sql
new file mode 100644
index 000000000..1e7c020e8
--- /dev/null
+++ b/engine/schema/upgrades/2009010801.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `prefix_users_entity` DROP KEY `last_action`;
+ALTER TABLE `prefix_users_entity` ADD KEY `last_action` (`last_action`);
+
+ALTER TABLE `prefix_users_entity` DROP KEY `last_login`;
+ALTER TABLE `prefix_users_entity` ADD KEY `last_login` (`last_login`);
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2009010901.sql b/engine/schema/upgrades/2009010901.sql
new file mode 100644
index 000000000..29eb68f29
--- /dev/null
+++ b/engine/schema/upgrades/2009010901.sql
@@ -0,0 +1,3 @@
+-- Add banned column refs #668
+ALTER TABLE `prefix_users_entity` ADD COLUMN `banned` enum ('yes', 'no') NOT NULL default 'no' AFTER `code`;
+
diff --git a/engine/schema/upgrades/2009021201.sql b/engine/schema/upgrades/2009021201.sql
new file mode 100644
index 000000000..e3edf66ba
--- /dev/null
+++ b/engine/schema/upgrades/2009021201.sql
@@ -0,0 +1,19 @@
+-- River
+ CREATE TABLE IF NOT EXISTS `prefix_river` (
+	`id` INT NOT NULL AUTO_INCREMENT ,
+	`type` VARCHAR( 8 ) NOT NULL ,
+	`subtype` VARCHAR( 32 ) NOT NULL ,
+	`action_type` VARCHAR( 32 ) NOT NULL ,
+	`access_id` INT NOT NULL ,
+	`view` TEXT NOT NULL ,
+	`subject_guid` INT NOT NULL ,
+	`object_guid` INT NOT NULL ,
+	`posted` INT NOT NULL ,
+	PRIMARY KEY ( `id` ) ,
+	KEY `type` (`type`),
+	KEY `action_type` (`action_type`),
+	KEY `access_id` (`access_id`),
+	KEY `subject_guid` (`subject_guid`),
+	KEY `object_guid` (`object_guid`),
+	KEY `posted` (`posted`)
+) ENGINE = MYISAM DEFAULT CHARSET=utf8; 
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2009021301.sql b/engine/schema/upgrades/2009021301.sql
new file mode 100644
index 000000000..efec52b93
--- /dev/null
+++ b/engine/schema/upgrades/2009021301.sql
@@ -0,0 +1,2 @@
+-- Changing the ACLs on existing groups
+UPDATE `prefix_entities` SET access_id=2 WHERE type='group';
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2009051401.sql b/engine/schema/upgrades/2009051401.sql
new file mode 100644
index 000000000..57348968e
--- /dev/null
+++ b/engine/schema/upgrades/2009051401.sql
@@ -0,0 +1,5 @@
+-- Fix error in geocode cache table
+DELETE FROM `prefix_geocode_cache`;
+
+ALTER TABLE `prefix_geocode_cache` DROP KEY `location`;
+ALTER TABLE `prefix_geocode_cache` ADD UNIQUE KEY `location` (`location`);
diff --git a/engine/schema/upgrades/2009052201.sql b/engine/schema/upgrades/2009052201.sql
new file mode 100644
index 000000000..b825f9936
--- /dev/null
+++ b/engine/schema/upgrades/2009052201.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `prefix_groups_entity` DROP KEY `name`;
+ALTER TABLE `prefix_groups_entity` ADD KEY `name` (`name`(50));
+
+ALTER TABLE `prefix_groups_entity` DROP KEY `description`;
+ALTER TABLE `prefix_groups_entity` ADD KEY `description` (`description`(50));
diff --git a/engine/schema/upgrades/2009091901.sql b/engine/schema/upgrades/2009091901.sql
new file mode 100644
index 000000000..074d042c3
--- /dev/null
+++ b/engine/schema/upgrades/2009091901.sql
@@ -0,0 +1,3 @@
+-- add an additional column to the river table
+ALTER TABLE `prefix_river` ADD COLUMN `annotation_id` int(11) NOT NULL AFTER `object_guid`;
+ALTER TABLE `prefix_river` ADD KEY `annotation_id` (`annotation_id`);
+\ No newline at end of file
diff --git a/engine/schema/upgrades/2009100701.sql b/engine/schema/upgrades/2009100701.sql
new file mode 100644
index 000000000..74249e901
--- /dev/null
+++ b/engine/schema/upgrades/2009100701.sql
@@ -0,0 +1,2 @@
+-- Previously was the UTF8 migration that is now in code at engine/lib/upgrades/2010033101.php
+-- Keeping this file to force an overwrite and to avoid confusion with missing migrations.
diff --git a/engine/schema/upgrades/2010012901.sql b/engine/schema/upgrades/2010012901.sql
new file mode 100644
index 000000000..fe5cb6849
--- /dev/null
+++ b/engine/schema/upgrades/2010012901.sql
@@ -0,0 +1 @@
+ALTER TABLE `prefix_entities` ADD `last_action` INT( 11 ) NOT NULL AFTER `time_updated` 
diff --git a/engine/schema/upgrades/2010030101.sql b/engine/schema/upgrades/2010030101.sql
new file mode 100644
index 000000000..cc7af98c9
--- /dev/null
+++ b/engine/schema/upgrades/2010030101.sql
@@ -0,0 +1 @@
+ALTER TABLE `prefix_entities` CHANGE `last_action` `last_action` INT( 11 ) NOT NULL DEFAULT '0'
diff --git a/engine/schema/upgrades/2010062401.sql b/engine/schema/upgrades/2010062401.sql
new file mode 100644
index 000000000..fbb49bfcf
--- /dev/null
+++ b/engine/schema/upgrades/2010062401.sql
@@ -0,0 +1 @@
+ALTER TABLE `prefix_entity_relationships` ADD COLUMN `time_created` int(11) NOT NULL AFTER `guid_two`;
+\ No newline at end of file
diff --git a/engine/settings.example.php b/engine/settings.example.php
new file mode 100644
index 000000000..3b139d710
--- /dev/null
+++ b/engine/settings.example.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Defines database credentials.
+ *
+ * Most of Elgg's configuration is stored in the database.  This file contains the
+ * credentials to connect to the database, as well as a few optional configuration
+ * values.
+ *
+ * The Elgg installation attempts to populate this file with the correct settings
+ * and then rename it to settings.php.
+ *
+ * @todo Turn this into something we handle more automatically.
+ * @package Elgg.Core
+ * @subpackage Configuration
+ */
+
+global $CONFIG;
+if (!isset($CONFIG)) {
+	$CONFIG = new stdClass;
+}
+
+/*
+ * Standard configuration
+ *
+ * You will use the same database connection for reads and writes.
+ * This is the easiest configuration, and will suit 99.99% of setups. However, if you're
+ * running a really popular site, you'll probably want to spread out your database connections
+ * and implement database replication.  That's beyond the scope of this configuration file
+ * to explain, but if you know you need it, skip past this section.
+ */
+
+/**
+ * The database username
+ *
+ * @global string $CONFIG->dbuser
+ * @name $CONFIG->dbuser
+ */
+$CONFIG->dbuser = '{{dbuser}}';
+
+/**
+ * The database password
+ *
+ * @global string $CONFIG->dbpass
+ */
+$CONFIG->dbpass = '{{dbpassword}}';
+
+/**
+ * The database name
+ *
+ * @global string $CONFIG->dbname
+ */
+$CONFIG->dbname = '{{dbname}}';
+
+/**
+ * The database host.
+ *
+ * For most installations, this is 'localhost'
+ *
+ * @global string $CONFIG->dbhost
+ */
+$CONFIG->dbhost = '{{dbhost}}';
+
+/**
+ * The database prefix
+ *
+ * This prefix will be appended to all Elgg tables.  If you're sharing
+ * a database with other applications, use a database prefix to namespace tables
+ * in order to avoid table name collisions.
+ *
+ * @global string $CONFIG->dbprefix
+ */
+$CONFIG->dbprefix = '{{dbprefix}}';
+
+
+/**
+ * Memcache setup (optional)
+ * This is where you may optionally set up memcache.
+ *
+ * Requirements:
+ * 	1) One or more memcache servers (http://www.danga.com/memcached/)
+ *  2) PHP memcache wrapper (http://uk.php.net/manual/en/memcache.setup.php)
+ *
+ * Note: Multiple server support is only available on server 1.2.1
+ * or higher with PECL library > 2.0.0
+ */
+//$CONFIG->memcache = true;
+//
+//$CONFIG->memcache_servers = array (
+//	array('server1', 11211),
+//	array('server2', 11211)
+//);
+
+
+/**
+ * Use non-standard headers for broken MTAs.
+ *
+ * The default header EOL for headers is \r\n.  This causes problems
+ * on some broken MTAs.  Setting this to TRUE will cause Elgg to use
+ * \n, which will fix some problems sending email on broken MTAs.
+ *
+ * @global bool $CONFIG->broken_mta
+ */
+$CONFIG->broken_mta = FALSE;
+
+/**
+ * Disable the database query cache
+ *
+ * Elgg stores each query and its results in a query cache.
+ * On large sites or long-running scripts, this cache can grow to be
+ * large.  To disable query caching, set this to TRUE.
+ *
+ * @global bool $CONFIG->db_disable_query_cache
+ */
+$CONFIG->db_disable_query_cache = FALSE;
+
+/**
+ * Minimum password length
+ *
+ * This value is used when validating a user's password during registration.
+ *
+ * @global int $CONFIG->min_password_length
+ */
+$CONFIG->min_password_length = 6;
diff --git a/engine/start.php b/engine/start.php
new file mode 100644
index 000000000..55b8ffa5b
--- /dev/null
+++ b/engine/start.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Bootstraps the Elgg engine.
+ *
+ * This file loads the full Elgg engine, checks the installation
+ * state, and triggers a series of events to finish booting Elgg:
+ * 	- {@elgg_event boot system}
+ * 	- {@elgg_event init system}
+ * 	- {@elgg_event ready system}
+ *
+ * If Elgg is fully uninstalled, the browser will be redirected to an
+ * installation page.
+ *
+ * @see install.php
+ * @package Elgg.Core
+ * @subpackage Core
+ */
+
+/*
+ * No settings means a fresh install
+ */
+if (!file_exists(dirname(__FILE__) . '/settings.php')) {
+	header("Location: install.php");
+	exit;
+}
+
+/**
+ * The time with microseconds when the Elgg engine was started.
+ *
+ * @global float
+ */
+global $START_MICROTIME;
+$START_MICROTIME = microtime(true);
+
+/**
+ * Configuration values.
+ *
+ * The $CONFIG global contains configuration values required
+ * for running Elgg as defined in the settings.php file.
+ *
+ * Plugin authors are encouraged to use elgg_get_config() instead of accessing
+ * the global directly.
+ *
+ * @see elgg_get_config()
+ * @see engine/settings.php
+ * @global stdClass $CONFIG
+ */
+global $CONFIG;
+if (!isset($CONFIG)) {
+	$CONFIG = new stdClass;
+}
+$CONFIG->boot_complete = false;
+
+$lib_dir = dirname(__FILE__) . '/lib/';
+
+// Load the bootstrapping library
+$path = $lib_dir . 'elgglib.php';
+if (!include_once($path)) {
+	echo "Could not load file '$path'. Please check your Elgg installation for all required files.";
+	exit;
+}
+
+// Load the system settings
+if (!include_once(dirname(__FILE__) . "/settings.php")) {
+	$msg = 'Elgg could not load the settings file. It does not exist or there is a file permissions issue.';
+	throw new InstallationException($msg);
+}
+
+
+// load the rest of the library files from engine/lib/
+$lib_files = array(
+	'access.php', 'actions.php', 'admin.php', 'annotations.php', 'cache.php',
+	'calendar.php', 'configuration.php', 'cron.php', 'database.php',
+	'entities.php', 'export.php', 'extender.php', 'filestore.php', 'group.php',
+	'input.php', 'languages.php', 'location.php', 'mb_wrapper.php',
+	'memcache.php', 'metadata.php', 'metastrings.php', 'navigation.php',
+	'notification.php', 'objects.php', 'opendd.php', 'output.php',
+	'pagehandler.php', 'pageowner.php', 'pam.php', 'plugins.php',
+	'private_settings.php', 'relationships.php', 'river.php', 'sessions.php',
+	'sites.php', 'statistics.php', 'system_log.php', 'tags.php',
+	'user_settings.php', 'users.php', 'upgrade.php', 'views.php',
+	'web_services.php', 'widgets.php', 'xml.php', 'xml-rpc.php',
+	
+	// backward compatibility
+	'deprecated-1.7.php', 'deprecated-1.8.php',
+);
+
+foreach ($lib_files as $file) {
+	$file = $lib_dir . $file;
+	elgg_log("Loading $file...");
+	if (!include_once($file)) {
+		$msg = "Could not load $file";
+		throw new InstallationException($msg);
+	}
+}
+
+// Connect to database, load language files, load configuration, init session
+// Plugins can't use this event because they haven't been loaded yet.
+elgg_trigger_event('boot', 'system');
+
+// Load the plugins that are active
+elgg_load_plugins();
+
+// @todo move loading plugins into a single boot function that replaces 'boot', 'system' event
+// and then move this code in there.
+// This validates the view type - first opportunity to do it is after plugins load.
+$view_type = elgg_get_viewtype();
+if (!elgg_is_valid_view_type($view_type)) {
+	elgg_set_viewtype('default');
+}
+
+// @todo deprecate as plugins can use 'init', 'system' event
+elgg_trigger_event('plugins_boot', 'system');
+
+// Complete the boot process for both engine and plugins
+elgg_trigger_event('init', 'system');
+
+$CONFIG->boot_complete = true;
+
+// System loaded and ready
+elgg_trigger_event('ready', 'system');
diff --git a/engine/tests/api/access_collections.php b/engine/tests/api/access_collections.php
new file mode 100644
index 000000000..4acfae596
--- /dev/null
+++ b/engine/tests/api/access_collections.php
@@ -0,0 +1,290 @@
+<?php
+/**
+ * Access Collections tests
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreAccessCollectionsTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		$this->dbPrefix = get_config("dbprefix");
+
+		$user = new ElggUser();
+		$user->username = 'test_user_' . rand();
+		$user->email = 'fake_email@fake.com' . rand();
+		$user->name = 'fake user';
+		$user->access_id = ACCESS_PUBLIC;
+		$user->salt = generate_random_cleartext_password();
+		$user->password = generate_user_password($user, rand());
+		$user->owner_guid = 0;
+		$user->container_guid = 0;
+		$user->save();
+
+		$this->user = $user;
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all __destruct() code should go above here
+		$this->user->delete();
+		parent::__destruct();
+	}
+
+	public function testCreateGetDeleteACL() {
+		
+		$acl_name = 'test access collection';
+		$acl_id = create_access_collection($acl_name);
+
+		$this->assertTrue(is_int($acl_id));
+
+		$q = "SELECT * FROM {$this->dbPrefix}access_collections WHERE id = $acl_id";
+		$acl = get_data_row($q);
+
+		$this->assertEqual($acl->id, $acl_id);
+
+		if ($acl) {
+			$this->assertEqual($acl->name, $acl_name);
+
+			$result = delete_access_collection($acl_id);
+			$this->assertTrue($result);
+
+			$q = "SELECT * FROM {$this->dbPrefix}access_collections WHERE id = $acl_id";
+			$data = get_data($q);
+			$this->assertIdentical(array(), $data);
+		}
+	}
+
+	public function testAddRemoveUserToACL() {
+		$acl_id = create_access_collection('test acl');
+
+		$result = add_user_to_access_collection($this->user->guid, $acl_id);
+		$this->assertTrue($result);
+
+		if ($result) {
+			$result = remove_user_from_access_collection($this->user->guid, $acl_id);
+			$this->assertIdentical(true, $result);
+		}
+
+		delete_access_collection($acl_id);
+	}
+
+	public function testUpdateACL() {
+		// another fake user to test with
+		$user = new ElggUser();
+		$user->username = 'test_user_' . rand();
+		$user->email = 'fake_email@fake.com' . rand();
+		$user->name = 'fake user';
+		$user->access_id = ACCESS_PUBLIC;
+		$user->salt = generate_random_cleartext_password();
+		$user->password = generate_user_password($user, rand());
+		$user->owner_guid = 0;
+		$user->container_guid = 0;
+		$user->save();
+
+		$acl_id = create_access_collection('test acl');
+
+		$member_lists = array(
+			// adding
+			array(
+				$this->user->guid,
+				$user->guid
+			),
+			// removing one, keeping one.
+			array(
+				$user->guid
+			),
+			// removing one, adding one
+			array(
+				$this->user->guid,
+			),
+			// removing all.
+			array()
+		);
+
+		foreach ($member_lists as $members) {
+			$result = update_access_collection($acl_id, $members);
+			$this->assertTrue($result);
+
+			if ($result) {
+				$q = "SELECT * FROM {$this->dbPrefix}access_collection_membership
+					WHERE access_collection_id = $acl_id";
+				$data = get_data($q);
+
+				if (count($members) == 0) {
+					$this->assertFalse($data);
+				} else {
+					$this->assertEqual(count($members), count($data));
+				}
+				foreach ($data as $row) {
+					$this->assertTrue(in_array($row->user_guid, $members));
+				}
+			}
+		}
+
+		delete_access_collection($acl_id);
+		$user->delete();
+	}
+
+	public function testCanEditACL() {
+		$acl_id = create_access_collection('test acl', $this->user->guid);
+
+		// should be true since it's the owner
+		$result = can_edit_access_collection($acl_id, $this->user->guid);
+		$this->assertTrue($result);
+
+		// should be true since IA is on.
+		$ia = elgg_set_ignore_access(true);
+		$result = can_edit_access_collection($acl_id);
+		$this->assertTrue($result);
+		elgg_set_ignore_access($ia);
+
+		// should be false since IA is off
+		$ia = elgg_set_ignore_access(false);
+		$result = can_edit_access_collection($acl_id);
+		$this->assertFalse($result);
+		elgg_set_ignore_access($ia);
+
+		delete_access_collection($acl_id);
+	}
+
+	public function testCanEditACLHook() {
+		// if only we supported closures!
+		global $acl_test_info;
+
+		$acl_id = create_access_collection('test acl');
+
+		$acl_test_info = array(
+			'acl_id' => $acl_id,
+			'user' => $this->user
+		);
+		
+		function test_acl_access_hook($hook, $type, $value, $params) {
+			global $acl_test_info;
+			if ($params['user_id'] == $acl_test_info['user']->guid) {
+				$acl = get_access_collection($acl_test_info['acl_id']);
+				$value[$acl->id] = $acl->name;
+			}
+
+			return $value;
+		}
+
+		elgg_register_plugin_hook_handler('access:collections:write', 'all', 'test_acl_access_hook');
+
+		// enable security since we usually run as admin
+		$ia = elgg_set_ignore_access(false);
+		$result = can_edit_access_collection($acl_id, $this->user->guid);
+		$this->assertTrue($result);
+		$ia = elgg_set_ignore_access($ia);
+
+		elgg_unregister_plugin_hook_handler('access:collections:write', 'all', 'test_acl_access_hook');
+
+		delete_access_collection($acl_id);
+	}
+
+	// groups interface
+	// only runs if the groups plugin is enabled because implementation is split between
+	// core and the plugin.
+	public function testCreateDeleteGroupACL() {
+		if (!elgg_is_active_plugin('groups')) {
+			return;
+		}
+		
+		$group = new ElggGroup();
+		$group->name = 'Test group';
+		$group->save();
+		$acl = get_access_collection($group->group_acl);
+
+		// ACLs are owned by groups
+		$this->assertEqual($acl->owner_guid, $group->guid);
+
+		// removing group and acl
+		$this->assertTrue($group->delete());
+		
+		$acl = get_access_collection($group->group_acl);
+		$this->assertFalse($acl);
+
+		$group->delete();
+	}
+
+	public function testJoinLeaveGroupACL() {
+		if (!elgg_is_active_plugin('groups')) {
+			return;
+		}
+
+		$group = new ElggGroup();
+		$group->name = 'Test group';
+		$group->save();
+
+		$result = $group->join($this->user);
+		$this->assertTrue($result);
+
+		// disable security since we run as admin
+		$ia = elgg_set_ignore_access(false);
+
+		// need to set the page owner to emulate being in a group context.
+		// this is kinda hacky.
+		elgg_set_page_owner_guid($group->getGUID());
+
+		if ($result) {
+			$can_edit = can_edit_access_collection($group->group_acl, $this->user->guid);
+			$this->assertTrue($can_edit);
+		}
+
+		$result = $group->leave($this->user);
+		$this->assertTrue($result);
+
+		if ($result) {
+			$can_edit = can_edit_access_collection($group->group_acl, $this->user->guid);
+			$this->assertFalse($can_edit);
+		}
+
+		 elgg_set_ignore_access($ia);
+
+		$group->delete();
+	}
+
+	public function testAccessCaching() {
+		// create a new user to check against
+		$user = new ElggUser();
+		$user->username = 'access_test_user';
+		$user->save();
+
+		foreach (array('get_access_list', 'get_access_array') as $func) {
+			$cache = _elgg_get_access_cache();
+			$cache->clear();
+
+			// admin users run tests, so disable access
+			elgg_set_ignore_access(true);
+			$access = $func($user->getGUID());
+
+			elgg_set_ignore_access(false);
+			$access2 = $func($user->getGUID());
+			$this->assertNotEqual($access, $access2, "Access test for $func");
+		}
+
+		$user->delete();	
+	}
+}
diff --git a/engine/tests/api/annotations.php b/engine/tests/api/annotations.php
new file mode 100644
index 000000000..c0b0687cc
--- /dev/null
+++ b/engine/tests/api/annotations.php
@@ -0,0 +1,150 @@
+<?php
+/**
+ * Elgg Test annotation api
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreAnnotationAPITest extends ElggCoreUnitTest {
+	protected $metastrings;
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->object = new ElggObject();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+
+		unset($this->object);
+	}
+
+	public function testElggGetAnnotationsCount() {
+		$this->object->title = 'Annotation Unit Test';
+		$this->object->save();
+
+		$guid = $this->object->getGUID();
+		create_annotation($guid, 'tested', 'tested1', 'text', 0, ACCESS_PUBLIC);
+		create_annotation($guid, 'tested', 'tested2', 'text', 0, ACCESS_PUBLIC);
+
+		$count = (int)elgg_get_annotations(array(
+			'annotation_names' => array('tested'),
+			'guid' => $guid,
+			'count' => true,
+		));
+
+		$this->assertIdentical($count, 2);
+
+		$this->object->delete();
+	}
+
+	public function testElggDeleteAnnotations() {
+		$e = new ElggObject();
+		$e->save();
+
+		for ($i=0; $i<30; $i++) {
+			$e->annotate('test_annotation', rand(0,10000));
+		}
+
+		$options = array(
+			'guid' => $e->getGUID(),
+			'limit' => 0
+		);
+
+		$annotations = elgg_get_annotations($options);
+		$this->assertIdentical(30, count($annotations));
+
+		$this->assertTrue(elgg_delete_annotations($options));
+
+		$annotations = elgg_get_annotations($options);
+		$this->assertTrue(empty($annotations));
+
+		// nothing to delete so null returned
+		$this->assertNull(elgg_delete_annotations($options));
+
+		$this->assertTrue($e->delete());
+	}
+
+	public function testElggDisableAnnotations() {
+		$e = new ElggObject();
+		$e->save();
+
+		for ($i=0; $i<30; $i++) {
+			$e->annotate('test_annotation', rand(0,10000));
+		}
+
+		$options = array(
+			'guid' => $e->getGUID(),
+			'limit' => 0
+		);
+
+		$this->assertTrue(elgg_disable_annotations($options));
+
+		$annotations = elgg_get_annotations($options);
+		$this->assertTrue(empty($annotations));
+
+		access_show_hidden_entities(true);
+		$annotations = elgg_get_annotations($options);
+		$this->assertIdentical(30, count($annotations));
+		access_show_hidden_entities(false);
+
+		$this->assertTrue($e->delete());
+	}
+
+	public function testElggEnableAnnotations() {
+		$e = new ElggObject();
+		$e->save();
+
+		for ($i=0; $i<30; $i++) {
+			$e->annotate('test_annotation', rand(0,10000));
+		}
+
+		$options = array(
+			'guid' => $e->getGUID(),
+			'limit' => 0
+		);
+
+		$this->assertTrue(elgg_disable_annotations($options));
+
+		// cannot see any annotations so returns null
+		$this->assertNull(elgg_enable_annotations($options));
+
+		access_show_hidden_entities(true);
+		$this->assertTrue(elgg_enable_annotations($options));
+		access_show_hidden_entities(false);
+
+		$annotations = elgg_get_annotations($options);
+		$this->assertIdentical(30, count($annotations));
+
+		$this->assertTrue($e->delete());
+	}
+
+	public function testElggAnnotationExists() {
+		$e = new ElggObject();
+		$e->save();
+		$guid = $e->getGUID();
+
+		$this->assertFalse(elgg_annotation_exists($guid, 'test_annotation'));
+
+		$e->annotate('test_annotation', rand(0, 10000));
+		$this->assertTrue(elgg_annotation_exists($guid, 'test_annotation'));
+		// this metastring should always exist but an annotation of this name should not
+		$this->assertFalse(elgg_annotation_exists($guid, 'email'));
+
+		$options = array(
+			'guid' => $guid,
+			'limit' => 0
+		);
+		$this->assertTrue(elgg_disable_annotations($options));
+		$this->assertTrue(elgg_annotation_exists($guid, 'test_annotation'));
+
+		$this->assertTrue($e->delete());
+		$this->assertFalse(elgg_annotation_exists($guid, 'test_annotation'));
+	}
+}
diff --git a/engine/tests/api/entity_getter_functions.php b/engine/tests/api/entity_getter_functions.php
new file mode 100644
index 000000000..fef9dc0c5
--- /dev/null
+++ b/engine/tests/api/entity_getter_functions.php
@@ -0,0 +1,2884 @@
+<?php
+
+/**
+ * Elgg Test Entity Getter Functions
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreEntityGetterFunctionsTest extends ElggCoreUnitTest {
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		elgg_set_ignore_access(TRUE);
+		$this->entities = array();
+		$this->subtypes = array(
+			'object' => array(),
+			'user' => array(),
+			'group' => array(),
+			//'site'	=> array()
+		);
+
+		// sites are a bit wonky.  Don't use them just now.
+		$this->types = array('object', 'user', 'group');
+
+		// create some fun objects to play with.
+		// 5 with random subtypes
+		for ($i=0; $i<5; $i++) {
+			$subtype = 'test_object_subtype_' . rand();
+			$e = new ElggObject();
+			$e->subtype = $subtype;
+			$e->save();
+
+			$this->entities[] = $e;
+			$this->subtypes['object'][] = $subtype;
+		}
+
+		// and users
+		for ($i=0; $i<5; $i++) {
+			$subtype = "test_user_subtype_" . rand();
+			$e = new ElggUser();
+			$e->username = "test_user_" . rand();
+			$e->subtype = $subtype;
+			$e->save();
+
+			$this->entities[] = $e;
+			$this->subtypes['user'][] = $subtype;
+		}
+
+		// and groups
+		for ($i=0; $i<5; $i++) {
+			$subtype = "test_group_subtype_" . rand();
+			$e = new ElggGroup();
+			$e->subtype = $subtype;
+			$e->save();
+
+			$this->entities[] = $e;
+			$this->subtypes['group'][] = $subtype;
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function setUp() {
+		return TRUE;
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		return TRUE;
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		global $CONFIG;
+
+		$this->swallowErrors();
+		foreach ($this->entities as $e) {
+			$e->delete();
+		}
+
+		// manually remove subtype entries since there is no way
+		// to using the API.
+		$subtype_arr = array();
+		foreach ($this->subtypes as $type => $subtypes) {
+			foreach ($subtypes as $subtype) {
+				$subtype_arr[] = "'$subtype'";
+			}
+		}
+
+		$subtype_str = implode(',', $subtype_arr);
+		$q = "DELETE FROM {$CONFIG->dbprefix}entity_subtypes WHERE subtype IN ($subtype_str)";
+		delete_data($q);
+
+		parent::__destruct();
+	}
+
+
+	/*************************************************
+	 * Helpers for getting random types and subtypes *
+	 *************************************************/
+
+	/**
+	 * Get a random valid subtype
+	 *
+	 * @param int $num
+	 * @return array
+	 */
+	public function getRandomValidTypes($num = 1) {
+		$r = array();
+
+		for ($i=1; $i<=$num; $i++) {
+			do {
+				$t = $this->types[array_rand($this->types)];
+			} while (in_array($t, $r) && count($r) < count($this->types));
+
+			$r[] = $t;
+		}
+
+		shuffle($r);
+		return $r;
+	}
+
+	/**
+	 * Get a random valid subtype (that we just created)
+	 *
+	 * @param array $type Type of objects to return valid subtypes for.
+	 * @param int $num of subtypes.
+	 *
+	 * @return array
+	 */
+	public function getRandomValidSubtypes(array $types, $num = 1) {
+		$r = array();
+
+		for ($i=1; $i<=$num; $i++) {
+			do {
+				// make sure at least one subtype of each type is returned.
+				if ($i-1 < count($types)) {
+					$type = $types[$i-1];
+				} else {
+					$type = $types[array_rand($types)];
+				}
+
+				$k = array_rand($this->subtypes[$type]);
+				$t = $this->subtypes[$type][$k];
+			} while (in_array($t, $r));
+
+			$r[] = $t;
+		}
+
+		shuffle($r);
+		return $r;
+	}
+
+	/**
+	 * Return an array of invalid strings for type or subtypes.
+	 *
+	 * @param int $num
+	 * @return arr
+	 */
+	public function getRandomInvalids($num = 1) {
+		$r = array();
+
+		for ($i=1; $i<=$num; $i++) {
+			$r[] = 'random_invalid_' . rand();
+		}
+
+		return $r;
+	}
+
+	/**
+	 * Get a mix of valid and invalid types
+	 *
+	 * @param int $num
+	 * @return array
+	 */
+	public function getRandomMixedTypes($num = 2) {
+		$have_valid = $have_invalid = false;
+		$r = array();
+
+		// need at least one of each type.
+		$valid_n = rand(1, $num-1);
+		$r = array_merge($r, $this->getRandomValidTypes($valid_n));
+		$r = array_merge($r, $this->getRandomInvalids($num - $valid_n));
+
+		shuffle($r);
+		return $r;
+	}
+
+	/**
+	 * Get random mix of valid and invalid subtypes for types given.
+	 *
+	 * @param array $types
+	 * @param int   $num
+	 * @return array
+	 */
+	public function getRandomMixedSubtypes(array $types, $num = 2) {
+		$types_c = count($types);
+		$r = array();
+
+		// this can be more efficient but I'm very sleepy...
+
+		// want at least one of valid and invalid of each type sent.
+		for ($i=0; $i < $types_c && $num > 0; $i++) {
+			// make sure we have a valid and invalid for each type
+			if (true) {
+				$type = $types[$i];
+				$r = array_merge($r, $this->getRandomValidSubtypes(array($type), 1));
+				$r = array_merge($r, $this->getRandomInvalids(1));
+
+				$num -= 2;
+			}
+		}
+
+		if ($num > 0) {
+			$valid_n = rand(1, $num);
+			$r = array_merge($r, $this->getRandomValidSubtypes($types, $valid_n));
+			$r = array_merge($r, $this->getRandomInvalids($num - $valid_n));
+		}
+
+		//shuffle($r);
+		return $r;
+	}
+
+	/**
+	 * Creates random annotations on $entity
+	 *
+	 * @param ElggEntity $entity
+	 * @param int        $max
+	 */
+	public function createRandomAnnotations($entity, $max = 1) {
+		$annotations = array();
+		for ($i=0; $i<$max; $i++) {
+			$name = 'test_annotation_name_' . rand();
+			$value = rand();
+			$id = create_annotation($entity->getGUID(), $name, $value, 'integer', $entity->getGUID());
+			$annotations[] = elgg_get_annotation_from_id($id);
+		}
+
+		return $annotations;
+	}
+
+
+	/***********************************
+	 * TYPE TESTS
+	 ***********************************
+	 * check for getting a valid type in all ways we can.
+	 * note that these aren't wonderful tests as there will be
+	 * existing entities so we can't test against the ones we just created.
+	 * So these just test that some are returned and match the type(s) requested.
+	 * It could definitely be the case that the first 10 entities retrieved are all
+	 * objects.  Maybe best to limit to 4 and group by type.
+	 */
+	public function testElggAPIGettersValidTypeUsingType() {
+		$type_arr = $this->getRandomValidTypes();
+		$type = $type_arr[0];
+		$options = array(
+			'type' => $type,
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// should only ever return one object because of group by
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $type_arr));
+		}
+	}
+
+	public function testElggAPIGettersValidTypeUsingTypesAsString() {
+		$type_arr = $this->getRandomValidTypes();
+		$type = $type_arr[0];
+		$options = array(
+			'types' => $type,
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// should only ever return one object because of group by
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $type_arr));
+		}
+	}
+
+	public function testElggAPIGettersValidTypeUsingTypesAsArray() {
+		$type_arr = $this->getRandomValidTypes();
+		$type = $type_arr[0];
+		$options = array(
+			'types' => $type_arr,
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// should only ever return one object because of group by
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $type_arr));
+		}
+	}
+
+	public function testElggAPIGettersValidTypeUsingTypesAsArrayPlural() {
+		$num = 2;
+		$types = $this->getRandomValidTypes($num);
+		$options = array(
+			'types' => $types,
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// one of object and one of group
+		$this->assertIdentical(count($es), $num);
+
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+		}
+	}
+
+
+
+	/*
+	 * Test mixed valid and invalid types.
+	 */
+
+
+	public function testElggAPIGettersValidAndInvalidTypes() {
+		//@todo replace this with $this->getRandomMixedTypes().
+		$t = $this->getRandomValidTypes();
+		$valid = $t[0];
+
+		$t = $this->getRandomInvalids();
+		$invalid = $t[0];
+		$options = array(
+			'types' => array($invalid, $valid),
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// should only ever return one object because of group by
+		$this->assertIdentical(count($es), 1);
+		$this->assertIdentical($es[0]->getType(), $valid);
+	}
+
+	public function testElggAPIGettersValidAndInvalidTypesPlural() {
+		$valid_num = 2;
+		$invalid_num = 3;
+		$valid = $this->getRandomValidTypes($valid_num);
+		$invalid = $this->getRandomInvalids($invalid_num);
+
+		$types = array();
+		foreach ($valid as $t) {
+			$types[] = $t;
+		}
+
+		foreach ($invalid as $t) {
+			$types[] = $t;
+		}
+
+		shuffle($types);
+		$options = array(
+			'types' => $types,
+			'group_by' => 'e.type'
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// should only ever return one object because of group by
+		$this->assertIdentical(count($es), $valid_num);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $valid));
+		}
+	}
+
+
+
+	/**************************************
+	 * SUBTYPE TESTS
+	 **************************************
+	 *
+	 * Here we can use the subtypes we created to test more finely.
+	 * Subtypes are bound to types, so we must pass a type.
+	 * This is where the fun logic starts.
+	 */
+
+	public function testElggAPIGettersValidSubtypeUsingSubtypeSingularType() {
+		$types = $this->getRandomValidTypes();
+		$subtypes = $this->getRandomValidSubtypes($types);
+		$subtype = $subtypes[0];
+
+		$options = array(
+			'types' => $types,
+			'subtype' => $subtype
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+	public function testElggAPIGettersValidSubtypeUsingSubtypesAsStringSingularType() {
+		$types = $this->getRandomValidTypes();
+		$subtypes = $this->getRandomValidSubtypes($types);
+		$subtype = $subtypes[0];
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtype
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+	public function testElggAPIGettersValidSubtypeUsingSubtypesAsArraySingularType() {
+		$types = $this->getRandomValidTypes();
+		$subtypes = $this->getRandomValidSubtypes($types);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), 1);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+	public function testElggAPIGettersValidSubtypeUsingPluralSubtypesSingularType() {
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes();
+		$subtypes = $this->getRandomValidSubtypes($types, $subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), $subtype_num);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+
+	/*
+	Because we're looking for type OR subtype (sorta)
+	it's possible that we've pulled in entities that aren't
+	of the subtype we've requested.
+	THIS COMBINATION MAKES LITTLE SENSE.
+	There is no mechanism in elgg to retrieve a subtype without a type, so
+	this combo gets trimmed down to only including subtypes that are valid to
+	each particular type.
+	FOR THE LOVE OF ALL GOOD PLEASE JUST USE TYPE_SUBTYPE_PAIRS!
+	 */
+	public function testElggAPIGettersValidSubtypeUsingPluralSubtypesPluralTypes() {
+		$type_num = 2;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomValidSubtypes($types, $subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// this will unset all invalid subtypes for each type that that only
+		// one entity exists of each.
+		$this->assertIdentical(count($es), $subtype_num);
+		foreach ($es as $e) {
+			// entities must at least be in the type.
+			$this->assertTrue(in_array($e->getType(), $types));
+
+			// test that this is a valid subtype for the entity type.
+			$this->assertTrue(in_array($e->getSubtype(), $this->subtypes[$e->getType()]));
+		}
+	}
+
+	/*
+	 * This combination will remove all invalid subtypes for this type.
+	 */
+	public function testElggAPIGettersValidSubtypeUsingPluralMixedSubtypesSingleType() {
+		$type_num = 1;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+
+
+		//@todo replace this with $this->getRandomMixedSubtypes()
+		// we want this to return an invalid subtype for the returned type.
+		$subtype_types = $types;
+		$i = 1;
+		while ($i <= $subtype_num) {
+			$type = $this->types[$i-1];
+
+			if (!in_array($type, $subtype_types)) {
+				$subtype_types[] = $type;
+			}
+			$i++;
+		}
+
+		$subtypes = $this->getRandomValidSubtypes($subtype_types, $type_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		// this will unset all invalid subtypes for each type that that only
+		// one entity exists of each.
+		$this->assertIdentical(count($es), $type_num);
+		foreach ($es as $e) {
+			// entities must at least be in the type.
+			$this->assertTrue(in_array($e->getType(), $types));
+
+			// test that this is a valid subtype for the entity type.
+			$this->assertTrue(in_array($e->getSubtype(), $this->subtypes[$e->getType()]));
+		}
+	}
+
+
+	/***************************
+	 * TYPE_SUBTYPE_PAIRS
+	 ***************************/
+
+	/**
+	 * Valid type, valid subtype pairs
+	 */
+	public function testElggAPIGettersTSPValidTypeValidSubtype() {
+		$type_num = 1;
+		$subtype_num = 1;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomValidSubtypes($types, $subtype_num);
+
+		$pair = array($types[0] => $subtypes[0]);
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), $type_num);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+	/**
+	 * Valid type, multiple valid subtypes
+	 */
+	public function testElggAPIGettersTSPValidTypeValidPluralSubtype() {
+		$type_num = 1;
+		$subtype_num = 3;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomValidSubtypes($types, $subtype_num);
+
+		$pair = array($types[0] => $subtypes);
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), $subtype_num);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $subtypes));
+		}
+	}
+
+	/**
+	 * Valid type, both valid and invalid subtypes
+	 */
+	public function testElggAPIGettersTSPValidTypeMixedPluralSubtype() {
+		$type_num = 1;
+		$valid_subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$valid = $this->getRandomValidSubtypes($types, $valid_subtype_num);
+		$invalid = $this->getRandomInvalids();
+
+		$subtypes = array_merge($valid, $invalid);
+		shuffle($subtypes);
+
+		$pair = array($types[0] => $subtypes);
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertIsA($es, 'array');
+
+		$this->assertIdentical(count($es), $valid_subtype_num);
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->getType(), $types));
+			$this->assertTrue(in_array($e->getSubtype(), $valid));
+		}
+	}
+
+
+	/****************************
+	 * FALSE-RETURNING TESTS
+	 ****************************
+	 * The original bug corrected returned
+	 * all entities when invalid subtypes were passed.
+	 * Because there's a huge numer of combinations that
+	 * return entities, I'm only writing tests for
+	 * things that should return false.
+	 *
+	 * I'm leaving the above in case anyone is inspired to
+	 * write out the rest of the possible combinations
+	 */
+
+
+	/**
+	 * Test invalid types with singular 'type'.
+	 */
+	public function testElggApiGettersInvalidTypeUsingType() {
+		$type_arr = $this->getRandomInvalids();
+		$type = $type_arr[0];
+
+		$options = array(
+			'type' => $type
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	/**
+	 * Test invalid types with plural 'types'.
+	 */
+	public function testElggApiGettersInvalidTypeUsingTypesAsString() {
+		$type_arr = $this->getRandomInvalids();
+		$type = $type_arr[0];
+
+		$options = array(
+			'types' => $type
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	/**
+	 * Test invalid types with plural 'types' and an array of a single type
+	 */
+	public function testElggApiGettersInvalidTypeUsingTypesAsArray() {
+		$type_arr = $this->getRandomInvalids(1);
+
+		$options = array(
+			'types' => $type_arr
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	/**
+	 * Test invalid types with plural 'types' and an array of a two types
+	 */
+	public function testElggApiGettersInvalidTypes() {
+		$type_arr = $this->getRandomInvalids(2);
+
+		$options = array(
+			'types' => $type_arr
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersInvalidSubtypeValidType() {
+		$type_num = 1;
+		$subtype_num = 1;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersInvalidSubtypeValidTypes() {
+		$type_num = 2;
+		$subtype_num = 1;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersInvalidSubtypesValidType() {
+		$type_num = 1;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersInvalidSubtypesValidTypes() {
+		$type_num = 2;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$options = array(
+			'types' => $types,
+			'subtypes' => $subtypes
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersTSPInvalidType() {
+		$type_num = 1;
+		$types = $this->getRandomInvalids($type_num);
+
+		$pair = array();
+
+		foreach ($types as $type) {
+			$pair[$type] = NULL;
+		}
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersTSPInvalidTypes() {
+		$type_num = 2;
+		$types = $this->getRandomInvalids($type_num);
+
+		$pair = array();
+		foreach ($types as $type) {
+			$pair[$type] = NULL;
+		}
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersTSPValidTypeInvalidSubtype() {
+		$type_num = 1;
+		$subtype_num = 1;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$pair = array($types[0] => $subtypes[0]);
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersTSPValidTypeInvalidSubtypes() {
+		$type_num = 1;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$pair = array($types[0] => array($subtypes[0], $subtypes[0]));
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+	public function testElggApiGettersTSPValidTypesInvalidSubtypes() {
+		$type_num = 2;
+		$subtype_num = 2;
+		$types = $this->getRandomValidTypes($type_num);
+		$subtypes = $this->getRandomInvalids($subtype_num);
+
+		$pair = array();
+		foreach ($types as $type) {
+			$pair[$type] = $subtypes;
+		}
+
+		$options = array(
+			'type_subtype_pairs' => $pair
+		);
+
+		$es = elgg_get_entities($options);
+		$this->assertFalse($es);
+	}
+
+
+
+
+
+
+	public function testElggApiGettersEntityNoSubtype() {
+		// create an entity we can later delete.
+		// order by guid and limit by 1 should == this entity.
+
+		$e = new ElggObject();
+		$e->save();
+
+		$options = array(
+			'type' => 'object',
+			'limit' => 1,
+			'order_by' => 'guid desc'
+		);
+
+		// grab ourself again to fill out attributes.
+		$e = get_entity($e->getGUID());
+
+		$entities = elgg_get_entities($options);
+
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertIdentical($e->getGUID(), $entity->getGUID());
+		}
+
+		$e->delete();
+	}
+
+	public function testElggApiGettersEntityNoValueSubtypeNotSet() {
+		// create an entity we can later delete.
+		// order by time created and limit by 1 should == this entity.
+
+		$e = new ElggObject();
+		$e->save();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => ELGG_ENTITIES_NO_VALUE,
+			'limit' => 1,
+			'order_by' => 'guid desc'
+		);
+
+		// grab ourself again to fill out attributes.
+		$e = get_entity($e->getGUID());
+
+		$entities = elgg_get_entities($options);
+
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertIdentical($e->getGUID(), $entity->getGUID());
+		}
+
+		$e->delete();
+	}
+
+	public function testElggApiGettersEntityNoValueSubtypeSet() {
+		global $CONFIG;
+		// create an entity we can later delete.
+		// order by time created and limit by 1 should == this entity.
+
+		$subtype = 'subtype_' . rand();
+
+		$e_subtype = new ElggObject();
+		$e_subtype->subtype = $subtype;
+		$e_subtype->save();
+
+		$e = new ElggObject();
+		$e->save();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => ELGG_ENTITIES_NO_VALUE,
+			'limit' => 1,
+			'order_by' => 'guid desc'
+		);
+
+		// grab ourself again to fill out attributes.
+		$e = get_entity($e->getGUID());
+
+		$entities = elgg_get_entities($options);
+
+		$this->assertEqual(count($entities), 1);
+
+		// this entity should NOT be the entity we just created
+		// and should have no subtype
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->subtype_id, 0);
+		}
+
+		$e_subtype->delete();
+		$e->delete();
+
+		$q = "DELETE FROM {$CONFIG->dbprefix}entity_subtypes WHERE subtype = '$subtype'";
+		delete_data($q);
+	}
+
+
+
+	/************
+	 * METADATA
+	 ************/
+
+	//names
+
+	function testElggApiGettersEntityMetadataNameValidSingle() {
+		// create a new entity with a subtype we know
+		// use an existing type so it will clean up automatically
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name' => $md_name
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $e->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+		}
+
+		$e->delete();
+	}
+
+	function testElggApiGettersEntityMetadataNameValidMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_names = array();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_names[] = $md_name;
+		$e_guids = array();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_names[] = $md_name;
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_names' => $md_names
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 2);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $e_guids));
+			$entity->delete();
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNameInvalidSingle() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$md_invalid_name = 'test_metadata_name_' . rand();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name' => $md_invalid_name
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		$e->delete();
+	}
+
+	function testElggApiGettersEntityMetadataNameInvalidMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$md_invalid_names = array();
+		$md_invalid_names[] = 'test_metadata_name_' . rand();
+		$md_invalid_names[] = 'test_metadata_name_' . rand();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_names' => $md_invalid_names
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		$e->delete();
+	}
+
+
+	function testElggApiGettersEntityMetadataNameMixedMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_names = array();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_names[] = $md_name;
+		$e_guids = array();
+
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->save();
+		$e_guids[] = $valid->getGUID();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		// add a random invalid name.
+		$md_names[] = 'test_metadata_name_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_names' => $md_names
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+		}
+
+		foreach ($e_guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+
+	// values
+	function testElggApiGettersEntityMetadataValueValidSingle() {
+		// create a new entity with a subtype we know
+		// use an existing type so it will clean up automatically
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_value' => $md_value
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $e->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+		}
+
+		$e->delete();
+	}
+
+	function testElggApiGettersEntityMetadataValueValidMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_values = array();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_values[] = $md_value;
+		$e_guids = array();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_values[] = $md_value;
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_values' => $md_values
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 2);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $e_guids));
+			$entity->delete();
+		}
+	}
+
+	function testElggApiGettersEntityMetadataValueInvalidSingle() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$md_invalid_value = 'test_metadata_value_' . rand();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_value' => $md_invalid_value
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		$e->delete();
+	}
+
+	function testElggApiGettersEntityMetadataValueInvalidMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+
+		$md_invalid_values = array();
+		$md_invalid_values[] = 'test_metadata_value_' . rand();
+		$md_invalid_values[] = 'test_metadata_value_' . rand();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_values' => $md_invalid_values
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		$e->delete();
+	}
+
+
+	function testElggApiGettersEntityMetadataValueMixedMultiple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_values = array();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$md_values[] = $md_value;
+		$e_guids = array();
+
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->save();
+		$e_guids[] = $valid->getGUID();
+
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		// add a random invalid value.
+		$md_values[] = 'test_metadata_value_' . rand();
+
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $md_value;
+		$e->save();
+		$e_guids[] = $e->getGUID();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_values' => $md_values
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+		}
+
+		foreach ($e_guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+
+	// name_value_pairs
+
+
+	function testElggApiGettersEntityMetadataNVPValidNValidVEquals() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$guids = array();
+
+		// our target
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(array(
+				'name' => $md_name,
+				'value' => $md_value
+			))
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNVPValidNValidVEqualsTriple() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$md_name2 = 'test_metadata_name_' . rand();
+		$md_value2 = 'test_metadata_value_' . rand();
+
+		$md_name3 = 'test_metadata_name_' . rand();
+		$md_value3 = 'test_metadata_value_' . rand();
+
+		$guids = array();
+
+		// our target
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->$md_name2 = $md_value2;
+		$valid->$md_name3 = $md_value3;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$invalid_md_name2 = 'test_metadata_name_' . rand();
+		$invalid_md_name3 = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->$invalid_md_name2 = $md_value2;
+		$e->$invalid_md_name3 = $md_value3;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->$md_name2 = $invalid_md_value;
+		$e->$md_name3 = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(
+				array(
+					'name' => $md_name,
+					'value' => $md_value
+				),
+				array(
+					'name' => $md_name2,
+					'value' => $md_value2
+				),
+				array(
+					'name' => $md_name3,
+					'value' => $md_value3
+				)
+			)
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNVPValidNValidVEqualsDouble() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$md_name2 = 'test_metadata_name_' . rand();
+		$md_value2 = 'test_metadata_value_' . rand();
+
+		$guids = array();
+
+		// our target
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->$md_name2 = $md_value2;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$invalid_md_name2 = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->$invalid_md_name2 = $md_value2;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->$md_name2 = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(
+				array(
+					'name' => $md_name,
+					'value' => $md_value
+				),
+				array(
+					'name' => $md_name2,
+					'value' => $md_value2
+				)
+			)
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	// this keeps locking up my database...
+	function xtestElggApiGettersEntityMetadataNVPValidNValidVEqualsStupid() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+
+		$md_name2 = 'test_metadata_name_' . rand();
+		$md_value2 = 'test_metadata_value_' . rand();
+
+		$md_name3 = 'test_metadata_name_' . rand();
+		$md_value3 = 'test_metadata_value_' . rand();
+
+		$md_name3 = 'test_metadata_name_' . rand();
+		$md_value3 = 'test_metadata_value_' . rand();
+
+		$md_name4 = 'test_metadata_name_' . rand();
+		$md_value4 = 'test_metadata_value_' . rand();
+
+		$md_name5 = 'test_metadata_name_' . rand();
+		$md_value5 = 'test_metadata_value_' . rand();
+
+		$guids = array();
+
+		// our target
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->$md_name2 = $md_value2;
+		$valid->$md_name3 = $md_value3;
+		$valid->$md_name4 = $md_value4;
+		$valid->$md_name5 = $md_value5;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->$md_name2 = $md_value2;
+		$e->$md_name3 = $md_value3;
+		$e->$md_name4 = $md_value4;
+		$e->$md_name5 = $md_value5;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->$md_name2 = $invalid_md_value;
+		$e->$md_name3 = $invalid_md_value;
+		$e->$md_name4 = $invalid_md_value;
+		$e->$md_name5 = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(
+				array(
+					'name' => $md_name,
+					'value' => $md_value
+				),
+				array(
+					'name' => $md_name2,
+					'value' => $md_value2
+				),
+				array(
+					'name' => $md_name3,
+					'value' => $md_value3
+				),
+				array(
+					'name' => $md_name4,
+					'value' => $md_value4
+				),
+				array(
+					'name' => $md_name5,
+					'value' => $md_value5
+				),
+			)
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 1);
+
+		foreach ($entities as $entity) {
+			$this->assertEqual($entity->getGUID(), $valid->getGUID());
+			$this->assertEqual($entity->$md_name, $md_value);
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	/**
+	 * Name value pair with valid name and invalid value
+	 */
+	function testElggApiGettersEntityMetadataNVPValidNInvalidV() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$guids = array();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(array(
+				'name' => $md_name,
+				'value' => 'test_metadata_value_' . rand()
+			))
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	/**
+	 * Name value pair with invalid name and valid value
+	 */
+	function testElggApiGettersEntityMetadataNVPInvalidNValidV() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$guids = array();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_invalid_names = array();
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(array(
+				'name' => 'test_metadata_name_' . rand(),
+				'value' => $md_value
+			))
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIdentical(array(), $entities);
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+
+	function testElggApiGettersEntityMetadataNVPValidNValidVOperandIn() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$guids = array();
+		$valid_guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid->getGUID();
+
+		$md_name2 = 'test_metadata_name_' . rand();
+		$md_value2 = 'test_metadata_value_' . rand();
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->$md_name2 = $md_value2;
+		$valid2->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid2->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_valid_values = "'$md_value', '$md_value2'";
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(
+				array(
+					'name' => $md_name,
+					'value' => $md_valid_values,
+					'operand' => 'IN'
+				),
+				array(
+					'name' => $md_name2,
+					'value' => $md_valid_values,
+					'operand' => 'IN'
+				),
+			),
+			'metadata_name_value_pairs_operator' => 'OR'
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 2);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $valid_guids));
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNVPValidNValidVPlural() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$md_value = 'test_metadata_value_' . rand();
+		$guids = array();
+		$valid_guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = $md_value;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid->getGUID();
+
+		$md_name2 = 'test_metadata_name_' . rand();
+		$md_value2 = 'test_metadata_value_' . rand();
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->$md_name2 = $md_value2;
+		$valid2->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid2->getGUID();
+
+		// make some bad ones
+		$invalid_md_name = 'test_metadata_name_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$invalid_md_name = $md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$invalid_md_value = 'test_metadata_value_' . rand();
+		$e = new ElggObject();
+		$e->subtype = $subtype;
+		$e->$md_name = $invalid_md_value;
+		$e->save();
+		$guids[] = $e->getGUID();
+
+		$md_valid_values = array($md_value, $md_value2);
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name_value_pairs' => array(
+				array(
+					'name' => $md_name,
+					'value' => $md_valid_values,
+					'operand' => 'IN'
+				),
+				array(
+					'name' => $md_name2,
+					'value' => $md_valid_values,
+					'operand' => 'IN'
+				),
+			),
+			'metadata_name_value_pairs_operator' => 'OR'
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 2);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $valid_guids));
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNVPOrderByMDText() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$guids = array();
+		$valid_guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = 1;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid->getGUID();
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->$md_name = 2;
+		$valid2->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid2->getGUID();
+
+		$valid3 = new ElggObject();
+		$valid3->subtype = $subtype;
+		$valid3->$md_name = 3;
+		$valid3->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid3->getGUID();
+
+		$md_valid_values = array(1, 2, 3);
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			//'metadata_name' => $md_name,
+			'order_by_metadata' => array('name' => $md_name, 'as' => 'integer')
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 3);
+
+		$i = 1;
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $valid_guids));
+			$this->assertEqual($entity->$md_name, $i);
+			$i++;
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	function testElggApiGettersEntityMetadataNVPOrderByMDString() {
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$md_name = 'test_metadata_name_' . rand();
+		$guids = array();
+		$valid_guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->$md_name = 'a';
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid->getGUID();
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->$md_name = 'b';
+		$valid2->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid2->getGUID();
+
+		$valid3 = new ElggObject();
+		$valid3->subtype = $subtype;
+		$valid3->$md_name = 'c';
+		$valid3->save();
+		$guids[] = $valid->getGUID();
+		$valid_guids[] = $valid3->getGUID();
+
+		$md_valid_values = array('a', 'b', 'c');
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'metadata_name' => $md_name,
+			'order_by_metadata' => array('name' => $md_name, 'as' => 'text')
+		);
+
+		$entities = elgg_get_entities_from_metadata($options);
+
+		$this->assertIsa($entities, 'array');
+		$this->assertEqual(count($entities), 3);
+
+		$alpha = array('a', 'b', 'c');
+
+		$i = 0;
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $valid_guids));
+			$this->assertEqual($entity->$md_name, $alpha[$i]);
+			$i++;
+			$entity->delete();
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	/**
+	 * Annotations
+	 */
+	public function testElggApiGettersEntitiesFromAnnotation() {
+
+		// grab a few different users to annotation
+		// there will always be at least 2 here because of the construct.
+		$users = elgg_get_entities(array('type' => 'user', 'limit' => 2));
+
+		// create some test annotations
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$annotation_name = 'test_annotation_name_' . rand();
+		$annotation_value = rand(1000, 9999);
+		$annotation_name2 = 'test_annotation_name_' . rand();
+		$annotation_value2 = rand(1000, 9999);
+		$guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		create_annotation($valid->getGUID(), $annotation_name, $annotation_value, 'integer', $users[0]->getGUID());
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->save();
+		$guids[] = $valid2->getGUID();
+		create_annotation($valid2->getGUID(), $annotation_name2, $annotation_value2, 'integer', $users[1]->getGUID());
+
+		$options = array(
+			'annotation_owner_guid' => $users[0]->getGUID(),
+			'annotation_name' => $annotation_name
+		);
+
+		$entities = elgg_get_entities_from_annotations($options);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $guids));
+			$annotations = $entity->getAnnotations($annotation_name);
+			$this->assertEqual(count($annotations), 1);
+
+			$this->assertEqual($annotations[0]->name, $annotation_name);
+			$this->assertEqual($annotations[0]->value, $annotation_value);
+			$this->assertEqual($annotations[0]->owner_guid, $users[0]->getGUID());
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	// Make sure metadata doesn't affect getting entities by relationship.  See #2274
+	public function testElggApiGettersEntityRelationshipWithMetadata() {
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		add_entity_relationship($guids[0], 'test', $guids[1]);
+
+		$options = array(
+			'relationship' => 'test',
+			'relationship_guid' => $guids[0]
+		);
+
+		$es = elgg_get_entities_from_relationship($options);
+		$this->assertTrue(is_array($es));
+		$this->assertIdentical(count($es), 1);
+
+		foreach ($es as $e) {
+			$this->assertEqual($guids[1], $e->guid);
+		}
+
+		foreach ($guids as $guid) {
+			$e = get_entity($guid);
+			$e->delete();
+		}
+	}
+
+	public function testElggApiGettersEntityRelationshipWithOutMetadata() {
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		add_entity_relationship($guids[0], 'test', $guids[1]);
+
+		$options = array(
+			'relationship' => 'test',
+			'relationship_guid' => $guids[0]
+		);
+
+		$es = elgg_get_entities_from_relationship($options);
+		$this->assertTrue(is_array($es));
+		$this->assertIdentical(count($es), 1);
+
+		foreach ($es as $e) {
+			$this->assertEqual($guids[1], $e->guid);
+		}
+
+		foreach ($guids as $guid) {
+			$e = get_entity($guid);
+			$e->delete();
+		}
+	}
+
+	public function testElggApiGettersEntityRelationshipWithMetadataIncludingRealMetadata() {
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		add_entity_relationship($guids[0], 'test', $guids[1]);
+
+		$options = array(
+			'relationship' => 'test',
+			'relationship_guid' => $guids[0],
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+		);
+
+		$es = elgg_get_entities_from_relationship($options);
+		$this->assertTrue(is_array($es));
+		$this->assertIdentical(count($es), 1);
+
+		foreach ($es as $e) {
+			$this->assertEqual($guids[1], $e->guid);
+		}
+
+		foreach ($guids as $guid) {
+			$e = get_entity($guid);
+			$e->delete();
+		}
+	}
+
+	public function testElggApiGettersEntityRelationshipWithMetadataIncludingFakeMetadata() {
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		add_entity_relationship($guids[0], 'test', $guids[1]);
+
+		$options = array(
+			'relationship' => 'test',
+			'relationship_guid' => $guids[0],
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'invalid',
+		);
+
+		$es = elgg_get_entities_from_relationship($options);
+
+		$this->assertTrue(empty($es));
+
+		foreach ($guids as $guid) {
+			$e = get_entity($guid);
+			$e->delete();
+		}
+	}
+
+	public function testElggApiGettersEntitySiteSingular() {
+		global $CONFIG;
+
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		// luckily this is never checked.
+		$obj1->site_guid = 2;
+		$obj1->save();
+		$guids[] = $obj1->guid;
+		$right_guid = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->site_guid = $CONFIG->site->guid;
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		$options = array(
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+			'site_guid' => 2
+		);
+
+		$es = elgg_get_entities_from_metadata($options);
+		$this->assertTrue(is_array($es));
+		$this->assertEqual(1, count($es));
+		$this->assertEqual($right_guid, $es[0]->guid);
+
+		foreach ($guids as $guid) {
+			get_entity($guid)->delete();
+		}
+	}
+
+	public function testElggApiGettersEntitySiteSingularAny() {
+		global $CONFIG;
+
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		// luckily this is never checked.
+		$obj1->site_guid = 2;
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->site_guid = $CONFIG->site->guid;
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		$options = array(
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+			'site_guid' => ELGG_ENTITIES_ANY_VALUE,
+			'limit' => 2,
+			'order_by' => 'e.guid DESC'
+		);
+
+		$es = elgg_get_entities_from_metadata($options);
+		$this->assertTrue(is_array($es));
+		$this->assertEqual(2, count($es));
+
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->guid, $guids));
+		}
+
+		foreach ($guids as $guid) {
+			get_entity($guid)->delete();
+		}
+	}
+
+	public function testElggApiGettersEntitySitePlural() {
+		global $CONFIG;
+
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		// luckily this is never checked.
+		$obj1->site_guid = 2;
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->site_guid = $CONFIG->site->guid;
+		$obj2->save();
+		$guids[] = $obj2->guid;
+
+		$options = array(
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+			'site_guids' => array($CONFIG->site->guid, 2),
+			'limit' => 2,
+			'order_by' => 'e.guid DESC'
+		);
+
+		$es = elgg_get_entities_from_metadata($options);
+		$this->assertTrue(is_array($es));
+		$this->assertEqual(2, count($es));
+
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->guid, $guids));
+		}
+
+		foreach ($guids as $guid) {
+			get_entity($guid)->delete();
+		}
+	}
+
+	public function testElggApiGettersEntitySitePluralSomeInvalid() {
+		global $CONFIG;
+
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		// luckily this is never checked.
+		$obj1->site_guid = 2;
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->save();
+		$guids[] = $obj2->guid;
+		$right_guid = $obj2->guid;
+
+		$options = array(
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+			// just created the first entity so nothing will be "sited" by it.
+			'site_guids' => array($CONFIG->site->guid, $guids[0]),
+			'limit' => 2,
+			'order_by' => 'e.guid DESC'
+		);
+
+		$es = elgg_get_entities_from_metadata($options);
+
+		$this->assertTrue(is_array($es));
+		$this->assertEqual(1, count($es));
+		$this->assertEqual($es[0]->guid, $right_guid);
+
+		foreach ($guids as $guid) {
+			get_entity($guid)->delete();
+		}
+	}
+
+	public function testElggApiGettersEntitySitePluralAllInvalid() {
+		global $CONFIG;
+
+		$guids = array();
+
+		$obj1 = new ElggObject();
+		$obj1->test_md = 'test';
+		// luckily this is never checked.
+		$obj1->site_guid = 2;
+		$obj1->save();
+		$guids[] = $obj1->guid;
+
+		$obj2 = new ElggObject();
+		$obj2->test_md = 'test';
+		$obj2->save();
+		$guids[] = $obj2->guid;
+		$right_guid = $obj2->guid;
+
+		$options = array(
+			'metadata_name' => 'test_md',
+			'metadata_value' => 'test',
+			// just created the first entity so nothing will be "sited" by it.
+			'site_guids' => array($guids[0], $guids[1]),
+			'limit' => 2,
+			'order_by' => 'e.guid DESC'
+		);
+
+		$es = elgg_get_entities_from_metadata($options);
+
+		$this->assertTrue(empty($es));
+
+		foreach ($guids as $guid) {
+			get_entity($guid)->delete();
+		}
+	}
+
+	/**
+	 * Private settings
+	 */
+	public function testElggApiGettersEntitiesFromPrivateSettings() {
+
+		// create some test private settings
+		$setting_name = 'test_setting_name_' . rand();
+		$setting_value = rand(1000, 9999);
+		$setting_name2 = 'test_setting_name_' . rand();
+		$setting_value2 = rand(1000, 9999);
+
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$guids = array();
+
+		// our targets
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		set_private_setting($valid->getGUID(), $setting_name, $setting_value);
+		set_private_setting($valid->getGUID(), $setting_name2, $setting_value2);
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->save();
+		$guids[] = $valid2->getGUID();
+		set_private_setting($valid2->getGUID(), $setting_name, $setting_value);
+		set_private_setting($valid2->getGUID(), $setting_name2, $setting_value2);
+
+		// simple test with name
+		$options = array(
+			'private_setting_name' => $setting_name
+		);
+
+		$entities = elgg_get_entities_from_private_settings($options);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $guids));
+			$value = get_private_setting($entity->getGUID(), $setting_name);
+			$this->assertEqual($value, $setting_value);
+		}
+
+		// simple test with value
+		$options = array(
+			'private_setting_value' => $setting_value
+		);
+
+		$entities = elgg_get_entities_from_private_settings($options);
+
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $guids));
+			$value = get_private_setting($entity->getGUID(), $setting_name);
+			$this->assertEqual($value, $setting_value);
+		}
+
+		// test pairs
+		$options = array(
+			'type' => 'object',
+			'subtype' => $subtype,
+			'private_setting_name_value_pairs' => array(
+				array(
+					'name' => $setting_name,
+					'value' => $setting_value
+				),
+				array(
+					'name' => $setting_name2,
+					'value' => $setting_value2
+				)
+			)
+		);
+
+		$entities = elgg_get_entities_from_private_settings($options);
+		$this->assertEqual(2, count($entities));
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $guids));
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+	/**
+	 * Location
+	 */
+	public function testElggApiGettersEntitiesFromLocation() {
+
+		// a test location that is out of this world
+		$lat = 500;
+		$long = 500;
+		$delta = 5;
+
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$subtype = $subtypes[0];
+		$guids = array();
+
+		// our objects
+		$valid = new ElggObject();
+		$valid->subtype = $subtype;
+		$valid->save();
+		$guids[] = $valid->getGUID();
+		$valid->setLatLong($lat, $long);
+
+		$valid2 = new ElggObject();
+		$valid2->subtype = $subtype;
+		$valid2->save();
+		$guids[] = $valid2->getGUID();
+		$valid2->setLatLong($lat + 2 * $delta, $long + 2 * $delta);
+
+		// limit to first object
+		$options = array(
+			'latitude' => $lat,
+			'longitude' => $long,
+			'distance' => $delta
+		);
+
+		//global $CONFIG;
+		//$CONFIG->debug = 'NOTICE';
+		$entities = elgg_get_entities_from_location($options);
+		//unset($CONFIG->debug);
+
+		$this->assertEqual(1, count($entities));
+		$this->assertEqual($entities[0]->getGUID(), $valid->getGUID());
+
+		// get both objects
+		$options = array(
+			'latitude' => $lat,
+			'longitude' => $long,
+			'distance' => array('latitude' => 2 * $delta, 'longitude' => 2 * $delta)
+		);
+
+		$entities = elgg_get_entities_from_location($options);
+
+		$this->assertEqual(2, count($entities));
+		foreach ($entities as $entity) {
+			$this->assertTrue(in_array($entity->getGUID(), $guids));
+		}
+
+		foreach ($guids as $guid) {
+			if ($e = get_entity($guid)) {
+				$e->delete();
+			}
+		}
+	}
+
+
+	public function testElggGetEntitiesFromRelationshipCount() {
+		$entities = $this->entities;
+		$relationships = array();
+		$count = count($entities);
+		$max = $count - 1;
+		$relationship_name = 'test_relationship_' . rand(0, 1000);
+
+		for ($i = 0; $i < $count; $i++) {
+			do {
+				$popular_entity = $entities[array_rand($entities)];
+			} while (array_key_exists($popular_entity->guid, $relationships));
+
+			$relationships[$popular_entity->guid] = array();
+
+			for ($c = 0; $c < $max; $c++) {
+				do {
+					$fan_entity = $entities[array_rand($entities)];
+				} while ($fan_entity->guid == $popular_entity->guid || in_array($fan_entity->guid, $relationships[$popular_entity->guid]));
+
+				$relationships[$popular_entity->guid][] = $fan_entity->guid;
+				add_entity_relationship($fan_entity->guid, $relationship_name, $popular_entity->guid);
+			}
+
+			$max--;
+		}
+
+		$options = array(
+			'relationship' => $relationship_name,
+			'limit' => $count
+		);
+
+		$entities = elgg_get_entities_from_relationship_count($options);
+
+		foreach ($entities as $e) {
+			$options = array(
+				'relationship' => $relationship_name,
+				'limit' => 100,
+				'relationship_guid' => $e->guid,
+				'inverse_relationship' => true
+			);
+
+			$fan_entities = elgg_get_entities_from_relationship($options);
+
+			$this->assertEqual(count($fan_entities), count($relationships[$e->guid]));
+
+			foreach ($fan_entities as $fan_entity) {
+				$this->assertTrue(in_array($fan_entity->guid, $relationships[$e->guid]));
+				$this->assertNotIdentical(false, check_entity_relationship($fan_entity->guid, $relationship_name, $e->guid));
+			}
+		}
+	}
+
+	public function testElggGetEntitiesByGuidSingular() {
+		foreach ($this->entities as $e) {
+			$options = array(
+				'guid' => $e->guid
+			);
+			$es = elgg_get_entities($options);
+
+			$this->assertEqual(count($es), 1);
+			$this->assertEqual($es[0]->guid, $e->guid);
+		}
+	}
+
+	public function testElggGetEntitiesByGuidPlural() {
+		$guids = array();
+
+		foreach ($this->entities as $e) {
+			$guids[] = $e->guid;
+		}
+
+		$options = array(
+			'guids' => $guids,
+			'limit' => 100
+		);
+
+		$es = elgg_get_entities($options);
+
+		$this->assertEqual(count($es), count($this->entities));
+
+		foreach ($es as $e) {
+			$this->assertTrue(in_array($e->guid, $guids));
+		}
+	}
+
+	public function testElggGetEntitiesFromAnnotationsCalculateX() {
+		$types = array(
+		'sum',
+		'avg',
+		'min',
+		'max'
+		);
+
+		foreach ($types as $type) {
+			$subtypes = $this->getRandomValidSubtypes(array('object'), 5);
+			$name = 'test_annotation_' . rand(0, 9999);
+			$values = array();
+			$options = array(
+				'type' => 'object',
+				'subtypes' => $subtypes,
+				'limit' => 5
+			);
+
+			$es = elgg_get_entities($options);
+
+			foreach ($es as $e) {
+				$value = rand(0,9999);
+				$e->annotate($name, $value);
+
+				$value2 = rand(0,9999);
+				$e->annotate($name, $value2);
+
+				switch ($type) {
+					case 'sum':
+						$calc_value = $value + $value2;
+						break;
+
+					case 'avg':
+						$calc_value = ($value + $value2) / 2;
+						break;
+
+					case 'min':
+						$calc_value = min(array($value, $value2));
+						break;
+
+					case 'max':
+						$calc_value = max(array($value, $value2));
+						break;
+				}
+
+				$values[$e->guid] = $calc_value;
+			}
+
+			arsort($values);
+			$order = array_keys($values);
+
+			$options = array(
+				'type' => 'object',
+				'subtypes' => $subtypes,
+				'limit' => 5,
+				'annotation_name' => $name,
+				'calculation' => $type
+			);
+
+			$es = elgg_get_entities_from_annotation_calculation($options);
+
+			foreach ($es as $i => $e) {
+				$value = 0;
+				$as = $e->getAnnotations($name);
+				// should only ever be 2
+				$this->assertEqual(2, count($as));
+
+				$value = $as[0]->value;
+				$value2 = $as[1]->value;
+
+				switch ($type) {
+					case 'sum':
+						$calc_value = $value + $value2;
+						break;
+
+					case 'avg':
+						$calc_value = ($value + $value2) / 2;
+						break;
+
+					case 'min':
+						$calc_value = min(array($value, $value2));
+						break;
+
+					case 'max':
+						$calc_value = max(array($value, $value2));
+						break;
+				}
+
+				$this->assertEqual($e->guid, $order[$i]);
+				$this->assertEqual($values[$e->guid], $calc_value);
+			}
+		}
+	}
+
+	public function testElggGetEntitiesFromAnnotationCalculationCount() {
+		// add two annotations with a unique name to an entity
+		// then count the number of entities with that annotation name
+
+		$subtypes = $this->getRandomValidSubtypes(array('object'), 1);
+		$name = 'test_annotation_' . rand(0, 9999);
+		$values = array();
+		$options = array(
+			'type' => 'object',
+			'subtypes' => $subtypes,
+			'limit' => 1
+		);
+		$es = elgg_get_entities($options);
+		$entity = $es[0];
+		$value = rand(0, 9999);
+		$entity->annotate($name, $value);
+		$value = rand(0, 9999);
+		$entity->annotate($name, $value);
+
+		$options = array(
+			'type' => 'object',
+			'subtypes' => $subtypes,
+			'annotation_name' => $name,
+			'calculation' => 'count',
+			'count' => true,
+		);
+		$count = elgg_get_entities_from_annotation_calculation($options);
+		$this->assertEqual(1, $count);
+	}
+
+	public function testElggGetAnnotationsAnnotationNames() {
+		$options = array('annotation_names' => array());
+		$a_e_map = array();
+
+		// create test annotations on a few entities.
+		for ($i=0; $i<3; $i++) {
+			do {
+				$e = $this->entities[array_rand($this->entities)];
+			} while(in_array($e->guid, $a_e_map));
+			$annotations = $this->createRandomAnnotations($e);
+
+			foreach($annotations as $a) {
+				$options['annotation_names'][] = $a->name;
+				$a_e_map[$a->id] = $e->guid;
+			}
+		}
+
+		$as = elgg_get_annotations($options);
+
+		$this->assertEqual(count($a_e_map), count($as));
+
+		foreach ($as as $a) {
+			$this->assertEqual($a_e_map[$a->id], $a->entity_guid);
+		}
+	}
+
+	public function testElggGetAnnotationsAnnotationValues() {
+		$options = array('annotation_values' => array());
+		$a_e_map = array();
+
+		// create test annotations on a few entities.
+		for ($i=0; $i<3; $i++) {
+			do {
+				$e = $this->entities[array_rand($this->entities)];
+			} while(in_array($e->guid, $a_e_map));
+			$annotations = $this->createRandomAnnotations($e);
+
+			foreach($annotations as $a) {
+				$options['annotation_values'][] = $a->value;
+				$a_e_map[$a->id] = $e->guid;
+			}
+		}
+
+		$as = elgg_get_annotations($options);
+
+		$this->assertEqual(count($a_e_map), count($as));
+
+		foreach ($as as $a) {
+			$this->assertEqual($a_e_map[$a->id], $a->entity_guid);
+		}
+	}
+
+	public function testElggGetAnnotationsAnnotationOwnerGuids() {
+		$options = array('annotation_owner_guids' => array());
+		$a_e_map = array();
+
+		// create test annotations on a single entity
+		for ($i=0; $i<3; $i++) {
+			do {
+				$e = $this->entities[array_rand($this->entities)];
+			} while(in_array($e->guid, $a_e_map));
+
+			// remove annotations left over from previous tests.
+			elgg_delete_annotations(array('annotation_owner_guid' => $e->guid));
+			$annotations = $this->createRandomAnnotations($e);
+
+			foreach($annotations as $a) {
+				$options['annotation_owner_guids'][] = $e->guid;
+				$a_e_map[$a->id] = $e->guid;
+			}
+		}
+
+		$as = elgg_get_annotations($options);
+		$this->assertEqual(count($a_e_map), count($as));
+
+		foreach ($as as $a) {
+			$this->assertEqual($a_e_map[$a->id], $a->owner_guid);
+		}
+	}
+
+	public function testElggGetEntitiesBadWheres() {
+		$options = array(
+			'container_guid' => 'abc'
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertFalse($entities);
+	}
+
+	public function testEGEEmptySubtypePlurality() {
+		$options = array(
+			'type' => 'user',
+			'subtypes' => ''
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertTrue(is_array($entities));
+
+		$options = array(
+			'type' => 'user',
+			'subtype' => ''
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertTrue(is_array($entities));
+
+		$options = array(
+			'type' => 'user',
+			'subtype' => array('')
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertTrue(is_array($entities));
+
+		$options = array(
+			'type' => 'user',
+			'subtypes' => array('')
+		);
+
+		$entities = elgg_get_entities($options);
+		$this->assertTrue(is_array($entities));
+	}
+}
diff --git a/engine/tests/api/helpers.php b/engine/tests/api/helpers.php
new file mode 100644
index 000000000..414fb4145
--- /dev/null
+++ b/engine/tests/api/helpers.php
@@ -0,0 +1,705 @@
+<?php
+/**
+ * Elgg Test helper functions
+ *
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreHelpersTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+
+		global $CONFIG;
+		unset($CONFIG->externals);
+		unset($CONFIG->externals_map);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all __destruct() code should go above here
+		parent::__destruct();
+	}
+
+	/**
+	 * Test elgg_instanceof()
+	 */
+	public function testElggInstanceOf() {
+		$entity = new ElggObject();
+		$entity->subtype = 'test_subtype';
+		$entity->save();
+
+		$this->assertTrue(elgg_instanceof($entity));
+		$this->assertTrue(elgg_instanceof($entity, 'object'));
+		$this->assertTrue(elgg_instanceof($entity, 'object', 'test_subtype'));
+
+		$this->assertFalse(elgg_instanceof($entity, 'object', 'invalid_subtype'));
+		$this->assertFalse(elgg_instanceof($entity, 'user', 'test_subtype'));
+
+		$entity->delete();
+
+		$bad_entity = FALSE;
+		$this->assertFalse(elgg_instanceof($bad_entity));
+		$this->assertFalse(elgg_instanceof($bad_entity, 'object'));
+		$this->assertFalse(elgg_instanceof($bad_entity, 'object', 'test_subtype'));
+
+		remove_subtype('object', 'test_subtype');
+	}
+
+	/**
+	 * Test elgg_normalize_url()
+	 */
+	public function testElggNormalizeURL() {
+		$conversions = array(
+			'http://example.com' => 'http://example.com',
+			'https://example.com' => 'https://example.com',
+			'http://example-time.com' => 'http://example-time.com',
+
+			'//example.com' => '//example.com',
+			'ftp://example.com/file' => 'ftp://example.com/file',
+			'mailto:brett@elgg.org' => 'mailto:brett@elgg.org',
+			'javascript:alert("test")' => 'javascript:alert("test")',
+			'app://endpoint' => 'app://endpoint',
+
+			'example.com' => 'http://example.com',
+			'example.com/subpage' => 'http://example.com/subpage',
+
+			'page/handler' =>                	elgg_get_site_url() . 'page/handler',
+			'page/handler?p=v&p2=v2' =>      	elgg_get_site_url() . 'page/handler?p=v&p2=v2',
+			'mod/plugin/file.php' =>            elgg_get_site_url() . 'mod/plugin/file.php',
+			'mod/plugin/file.php?p=v&p2=v2' =>  elgg_get_site_url() . 'mod/plugin/file.php?p=v&p2=v2',
+			'rootfile.php' =>                   elgg_get_site_url() . 'rootfile.php',
+			'rootfile.php?p=v&p2=v2' =>         elgg_get_site_url() . 'rootfile.php?p=v&p2=v2',
+
+			'/page/handler' =>               	elgg_get_site_url() . 'page/handler',
+			'/page/handler?p=v&p2=v2' =>     	elgg_get_site_url() . 'page/handler?p=v&p2=v2',
+			'/mod/plugin/file.php' =>           elgg_get_site_url() . 'mod/plugin/file.php',
+			'/mod/plugin/file.php?p=v&p2=v2' => elgg_get_site_url() . 'mod/plugin/file.php?p=v&p2=v2',
+			'/rootfile.php' =>                  elgg_get_site_url() . 'rootfile.php',
+			'/rootfile.php?p=v&p2=v2' =>        elgg_get_site_url() . 'rootfile.php?p=v&p2=v2',
+		);
+
+		foreach ($conversions as $input => $output) {
+			$this->assertIdentical($output, elgg_normalize_url($input));
+		}
+	}
+
+
+	/**
+	 * Test elgg_register_js()
+	 */
+	public function testElggRegisterJS() {
+		global $CONFIG;
+
+		// specify name
+		$result = elgg_register_js('key', 'http://test1.com', 'footer');
+		$this->assertTrue($result);
+		$this->assertTrue(isset($CONFIG->externals_map['js']['key']));
+
+		$item = $CONFIG->externals_map['js']['key'];
+		$this->assertTrue($CONFIG->externals['js']->contains($item));
+
+		$priority = $CONFIG->externals['js']->getPriority($item);
+		$this->assertTrue($priority !== false);
+
+		$item = $CONFIG->externals['js']->getElement($priority);
+		$this->assertIdentical('http://test1.com', $item->url);
+
+		// send a bad url
+		$result = elgg_register_js('bad', null);
+		$this->assertFalse($result);
+	}
+
+	/**
+	 * Test elgg_register_css()
+	 */
+	public function testElggRegisterCSS() {
+		global $CONFIG;
+		
+		// specify name
+		$result = elgg_register_css('key', 'http://test1.com');
+		$this->assertTrue($result);
+		$this->assertTrue(isset($CONFIG->externals_map['css']['key']));
+
+		$item = $CONFIG->externals_map['css']['key'];
+		$this->assertTrue($CONFIG->externals['css']->contains($item));
+
+		$priority = $CONFIG->externals['css']->getPriority($item);
+		$this->assertTrue($priority !== false);
+
+		$item = $CONFIG->externals['css']->getElement($priority);
+		$this->assertIdentical('http://test1.com', $item->url);
+	}
+
+	/**
+	 * Test elgg_unregister_js()
+	 */
+	public function testElggUnregisterJS() {
+		global $CONFIG;
+
+		$base = trim(elgg_get_site_url(), "/");
+
+		$urls = array('id1' => "$base/urla", 'id2' => "$base/urlb", 'id3' => "$base/urlc");
+		
+		foreach ($urls as $id => $url) {
+			elgg_register_js($id, $url);
+		}
+
+		$result = elgg_unregister_js('id1');
+		$this->assertTrue($result);
+
+		$js = $CONFIG->externals['js'];
+		$elements = $js->getElements();
+		$this->assertFalse(isset($CONFIG->externals_map['js']['id1']));
+		
+		foreach ($elements as $element) {
+			if (isset($element->name)) {
+				$this->assertFalse($element->name == 'id1');
+			}
+		}
+
+		$result = elgg_unregister_js('id1');
+		$this->assertFalse($result);
+
+		$result = elgg_unregister_js('', 'does_not_exist');
+		$this->assertFalse($result);
+
+		$result = elgg_unregister_js('id2');
+		$elements = $js->getElements();
+
+		$this->assertFalse(isset($CONFIG->externals_map['js']['id2']));
+		foreach ($elements as $element) {
+			if (isset($element->name)) {
+				$this->assertFalse($element->name == 'id2');
+			}
+		}
+
+		$this->assertTrue(isset($CONFIG->externals_map['js']['id3']));
+
+		$priority = $CONFIG->externals['js']->getPriority($CONFIG->externals_map['js']['id3']);
+		$this->assertTrue($priority !== false);
+
+		$item = $CONFIG->externals['js']->getElement($priority);
+		$this->assertIdentical($urls['id3'], $item->url);
+	}
+
+	/**
+	 * Test elgg_load_js()
+	 */
+	public function testElggLoadJS() {
+		global $CONFIG;
+
+		// load before register
+		elgg_load_js('key');
+		$result = elgg_register_js('key', 'http://test1.com', 'footer');
+		$this->assertTrue($result);
+		
+		$js_urls = elgg_get_loaded_js('footer');
+		$this->assertIdentical(array(500 => 'http://test1.com'), $js_urls);
+	}
+
+	/**
+	 * Test elgg_get_loaded_js()
+	 */
+	public function testElggGetJS() {
+		global $CONFIG;
+
+		$base = trim(elgg_get_site_url(), "/");
+
+		$urls = array(
+			'id1' => "$base/urla",
+			'id2' => "$base/urlb",
+			'id3' => "$base/urlc"
+		);
+		
+		foreach ($urls as $id => $url) {
+			elgg_register_js($id, $url);
+			elgg_load_js($id);
+		}
+
+		$js_urls = elgg_get_loaded_js('head');
+
+		$this->assertIdentical($js_urls[500], $urls['id1']);
+		$this->assertIdentical($js_urls[501], $urls['id2']);
+		$this->assertIdentical($js_urls[502], $urls['id3']);
+
+		$js_urls = elgg_get_loaded_js('footer');
+		$this->assertIdentical(array(), $js_urls);
+	}
+
+	// test ElggPriorityList
+	public function testElggPriorityListAdd() {
+		$pl = new ElggPriorityList();
+		$elements = array(
+			'Test value',
+			'Test value 2',
+			'Test value 3'
+		);
+
+		shuffle($elements);
+
+		foreach ($elements as $element) {
+			$this->assertTrue($pl->add($element) !== false);
+		}
+
+		$test_elements = $pl->getElements();
+
+		$this->assertTrue(is_array($test_elements));
+
+		foreach ($test_elements as $i => $element) {
+			// should be in the array
+			$this->assertTrue(in_array($element, $elements));
+
+			// should be the only element, so priority 0
+			$this->assertEqual($i, array_search($element, $elements));
+		}
+	}
+
+	public function testElggPriorityListAddWithPriority() {
+		$pl = new ElggPriorityList();
+
+		$elements = array(
+			10 => 'Test Element 10',
+			5 => 'Test Element 5',
+			0 => 'Test Element 0',
+			100 => 'Test Element 100',
+			-1 => 'Test Element -1',
+			-5 => 'Test Element -5'
+		);
+
+		foreach ($elements as $priority => $element) {
+			$pl->add($element, $priority);
+		}
+
+		$test_elements = $pl->getElements();
+
+		// should be sorted by priority
+		$elements_sorted = array(
+			-5 => 'Test Element -5',
+			-1 => 'Test Element -1',
+			0 => 'Test Element 0',
+			5 => 'Test Element 5',
+			10 => 'Test Element 10',
+			100 => 'Test Element 100',
+		);
+
+		$this->assertIdentical($elements_sorted, $test_elements);
+
+		foreach ($test_elements as $priority => $element) {
+			$this->assertIdentical($elements[$priority], $element);
+		}
+	}
+
+	public function testElggPriorityListGetNextPriority() {
+		$pl = new ElggPriorityList();
+
+		$elements = array(
+			2 => 'Test Element',
+			0 => 'Test Element 2',
+			-2 => 'Test Element 3',
+		);
+
+		foreach ($elements as $priority => $element) {
+			$pl->add($element, $priority);
+		}
+
+		// we're not specifying a priority so it should be the next consecutive to 0.
+		$this->assertEqual(1, $pl->getNextPriority());
+
+		// add another one at priority 1
+		$pl->add('Test Element 1');
+
+		// next consecutive to 0 is now 3.
+		$this->assertEqual(3, $pl->getNextPriority());
+	}
+
+	public function testElggPriorityListRemove() {
+		$pl = new ElggPriorityList();
+
+		$elements = array();
+		for ($i=0; $i<3; $i++) {
+			$element = new stdClass();
+			$element->name = "Test Element $i";
+			$element->someAttribute = rand(0, 9999);
+			$elements[] = $element;
+			$pl->add($element);
+		}
+
+		$pl->remove($elements[1]);
+
+		$test_elements = $pl->getElements();
+
+		// make sure it's gone.
+		$this->assertEqual(2, count($test_elements));
+		$this->assertIdentical($elements[0], $test_elements[0]);
+		$this->assertIdentical($elements[2], $test_elements[2]);
+	}
+
+	public function testElggPriorityListMove() {
+		$pl = new ElggPriorityList();
+
+		$elements = array(
+			-5 => 'Test Element -5',
+			0 => 'Test Element 0',
+			5 => 'Test Element 5',
+		);
+
+		foreach ($elements as $priority => $element) {
+			$pl->add($element, $priority);
+		}
+
+		$this->assertEqual($pl->move($elements[-5], 10), 10);
+		
+		// check it's at the new place
+		$this->assertIdentical($elements[-5], $pl->getElement(10));
+
+		// check it's not at the old
+		$this->assertFalse($pl->getElement(-5));
+	}
+
+	public function testElggPriorityListConstructor() {
+		$elements = array(
+			10 => 'Test Element 10',
+			5 => 'Test Element 5',
+			0 => 'Test Element 0',
+			100 => 'Test Element 100',
+			-1 => 'Test Element -1',
+			-5 => 'Test Element -5'
+		);
+
+		$pl = new ElggPriorityList($elements);
+		$test_elements = $pl->getElements();
+
+		$elements_sorted = array(
+			-5 => 'Test Element -5',
+			-1 => 'Test Element -1',
+			0 => 'Test Element 0',
+			5 => 'Test Element 5',
+			10 => 'Test Element 10',
+			100 => 'Test Element 100',
+		);
+
+		$this->assertIdentical($elements_sorted, $test_elements);
+	}
+
+	public function testElggPriorityListGetPriority() {
+		$pl = new ElggPriorityList();
+
+		$elements = array(
+			'Test element 0',
+			'Test element 1',
+			'Test element 2',
+		);
+
+		foreach ($elements as $element) {
+			$pl->add($element);
+		}
+
+		$this->assertIdentical(0, $pl->getPriority($elements[0]));
+		$this->assertIdentical(1, $pl->getPriority($elements[1]));
+		$this->assertIdentical(2, $pl->getPriority($elements[2]));
+	}
+
+	public function testElggPriorityListGetElement() {
+		$pl = new ElggPriorityList();
+		$priorities = array();
+
+		$elements = array(
+			'Test element 0',
+			'Test element 1',
+			'Test element 2',
+		);
+
+		foreach ($elements as $element) {
+			$priorities[] = $pl->add($element);
+		}
+
+		$this->assertIdentical($elements[0], $pl->getElement($priorities[0]));
+		$this->assertIdentical($elements[1], $pl->getElement($priorities[1]));
+		$this->assertIdentical($elements[2], $pl->getElement($priorities[2]));
+	}
+
+	public function testElggPriorityListPriorityCollision() {
+		$pl = new ElggPriorityList();
+		
+		$elements = array(
+			5 => 'Test element 5',
+			6 => 'Test element 6',
+			0 => 'Test element 0',
+		);
+
+		foreach ($elements as $priority => $element) {
+			$pl->add($element, $priority);
+		}
+
+		// add at a colliding priority
+		$pl->add('Colliding element', 5);
+
+		// should float to the top closest to 5, so 7
+		$this->assertEqual(7, $pl->getPriority('Colliding element'));
+	}
+
+	public function testElggPriorityListIterator() {
+		$elements = array(
+			-5 => 'Test element -5',
+			0 => 'Test element 0',
+			5 => 'Test element 5'
+		);
+		
+		$pl = new ElggPriorityList($elements);
+
+		foreach ($pl as $priority => $element) {
+			$this->assertIdentical($elements[$priority], $element);
+		}
+	}
+
+	public function testElggPriorityListCountable() {
+		$pl = new ElggPriorityList();
+
+		$this->assertEqual(0, count($pl));
+
+		$pl->add('Test element 0');
+		$this->assertEqual(1, count($pl));
+
+		$pl->add('Test element 1');
+		$this->assertEqual(2, count($pl));
+
+		$pl->add('Test element 2');
+		$this->assertEqual(3, count($pl));
+	}
+
+	public function testElggPriorityListUserSort() {
+		$elements = array(
+			'A',
+			'B',
+			'C',
+			'D',
+			'E',
+		);
+
+		$elements_sorted_string = $elements;
+
+		shuffle($elements);
+		$pl = new ElggPriorityList($elements);
+
+		// will sort by priority
+		$test_elements = $pl->getElements();
+		$this->assertIdentical($elements, $test_elements);
+
+		function test_sort($elements) {
+			sort($elements, SORT_LOCALE_STRING);
+			return $elements;
+		}
+
+		// force a new sort using our function
+		$pl->sort('test_sort');
+		$test_elements = $pl->getElements();
+
+		$this->assertIdentical($elements_sorted_string, $test_elements);
+	}
+
+	// see https://github.com/elgg/elgg/issues/4288
+	public function testElggBatchIncOffset() {
+		// normal increment
+		$options = array(
+			'offset' => 0,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$j = 0;
+		foreach ($batch as $e) {
+			$offset = floor($j / 5) * 5;
+			$this->assertEqual($offset, $e['offset']);
+			$this->assertEqual($j + 1, $e['index']);
+			$j++;
+		}
+
+		$this->assertEqual(11, $j);
+
+		// no increment, 0 start
+		ElggCoreHelpersTest::elgg_batch_callback_test(array(), true);
+		$options = array(
+			'offset' => 0,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$batch->setIncrementOffset(false);
+
+		$j = 0;
+		foreach ($batch as $e) {
+			$this->assertEqual(0, $e['offset']);
+			// should always be the same 5
+			$this->assertEqual($e['index'], $j + 1 - (floor($j / 5) * 5));
+			$j++;
+		}
+		$this->assertEqual(11, $j);
+
+		// no increment, 3 start
+		ElggCoreHelpersTest::elgg_batch_callback_test(array(), true);
+		$options = array(
+			'offset' => 3,
+			'limit' => 11
+		);
+		$batch = new ElggBatch(array('ElggCoreHelpersTest', 'elgg_batch_callback_test'), $options,
+				null, 5);
+		$batch->setIncrementOffset(false);
+
+		$j = 0;
+		foreach ($batch as $e) {
+			$this->assertEqual(3, $e['offset']);
+			// same 5 results
+			$this->assertEqual($e['index'], $j + 4 - (floor($j / 5) * 5));
+			$j++;
+		}
+
+		$this->assertEqual(11, $j);
+	}
+
+	public function testElggBatchReadHandlesBrokenEntities() {
+		$num_test_entities = 8;
+		$guids = array();
+		for ($i = $num_test_entities; $i > 0; $i--) {
+			$entity = new ElggObject();
+			$entity->type = 'object';
+			$entity->subtype = 'test_5357_subtype';
+			$entity->access_id = ACCESS_PUBLIC;
+			$entity->save();
+			$guids[] = $entity->guid;
+			_elgg_invalidate_cache_for_entity($entity->guid);
+		}
+
+		// break entities such that the first fetch has one incomplete
+		// and the second and third fetches have only incompletes!
+		$db_prefix = elgg_get_config('dbprefix');
+		delete_data("
+			DELETE FROM {$db_prefix}objects_entity
+			WHERE guid IN ({$guids[1]}, {$guids[2]}, {$guids[3]}, {$guids[4]}, {$guids[5]})
+		");
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => 'test_5357_subtype',
+			'order_by' => 'e.guid',
+		);
+
+		$entities_visited = array();
+		$batch = new ElggBatch('elgg_get_entities', $options, null, 2);
+		/* @var ElggEntity[] $batch */
+		foreach ($batch as $entity) {
+			$entities_visited[] = $entity->guid;
+		}
+
+		// The broken entities should not have been visited
+		$this->assertEqual($entities_visited, array($guids[0], $guids[6], $guids[7]));
+
+		// cleanup (including leftovers from previous tests)
+		$entity_rows = elgg_get_entities(array_merge($options, array(
+			'callback' => '',
+			'limit' => false,
+		)));
+		$guids = array();
+		foreach ($entity_rows as $row) {
+			$guids[] = $row->guid;
+		}
+		delete_data("DELETE FROM {$db_prefix}entities WHERE guid IN (" . implode(',', $guids) . ")");
+		delete_data("DELETE FROM {$db_prefix}objects_entity WHERE guid IN (" . implode(',', $guids) . ")");
+	}
+
+	public function testElggBatchDeleteHandlesBrokenEntities() {
+		$num_test_entities = 8;
+		$guids = array();
+		for ($i = $num_test_entities; $i > 0; $i--) {
+			$entity = new ElggObject();
+			$entity->type = 'object';
+			$entity->subtype = 'test_5357_subtype';
+			$entity->access_id = ACCESS_PUBLIC;
+			$entity->save();
+			$guids[] = $entity->guid;
+			_elgg_invalidate_cache_for_entity($entity->guid);
+		}
+
+		// break entities such that the first fetch has one incomplete
+		// and the second and third fetches have only incompletes!
+		$db_prefix = elgg_get_config('dbprefix');
+		delete_data("
+			DELETE FROM {$db_prefix}objects_entity
+			WHERE guid IN ({$guids[1]}, {$guids[2]}, {$guids[3]}, {$guids[4]}, {$guids[5]})
+		");
+
+		$options = array(
+			'type' => 'object',
+			'subtype' => 'test_5357_subtype',
+			'order_by' => 'e.guid',
+		);
+
+		$entities_visited = array();
+		$batch = new ElggBatch('elgg_get_entities', $options, null, 2, false);
+		/* @var ElggEntity[] $batch */
+		foreach ($batch as $entity) {
+			$entities_visited[] = $entity->guid;
+			$entity->delete();
+		}
+
+		// The broken entities should not have been visited
+		$this->assertEqual($entities_visited, array($guids[0], $guids[6], $guids[7]));
+
+		// cleanup (including leftovers from previous tests)
+		$entity_rows = elgg_get_entities(array_merge($options, array(
+			'callback' => '',
+			'limit' => false,
+		)));
+		$guids = array();
+		foreach ($entity_rows as $row) {
+			$guids[] = $row->guid;
+		}
+		delete_data("DELETE FROM {$db_prefix}entities WHERE guid IN (" . implode(',', $guids) . ")");
+		delete_data("DELETE FROM {$db_prefix}objects_entity WHERE guid IN (" . implode(',', $guids) . ")");
+	}
+
+	static function elgg_batch_callback_test($options, $reset = false) {
+		static $count = 1;
+
+		if ($reset) {
+			$count = 1;
+			return true;
+		}
+
+		if ($count > 20) {
+			return false;
+		}
+
+		for ($j = 0; ($options['limit'] < 5) ? $j < $options['limit'] : $j < 5; $j++) {
+			$return[] = array(
+				'offset' => $options['offset'],
+				'limit' => $options['limit'],
+				'count' => $count++,
+				'index' => 1 + $options['offset'] + $j
+			);
+		}
+
+		return $return;
+	}
+}
+\ No newline at end of file
diff --git a/engine/tests/api/metadata.php b/engine/tests/api/metadata.php
new file mode 100644
index 000000000..d23510c6a
--- /dev/null
+++ b/engine/tests/api/metadata.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Elgg Test metadata API
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreMetadataAPITest extends ElggCoreUnitTest {
+	protected $metastrings;
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->metastrings = array();
+		$this->object = new ElggObject();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+
+		unset($this->object);
+	}
+
+	public function testGetMetastringById() {
+		foreach (array('metaUnitTest', 'metaunittest', 'METAUNITTEST') as $string) {
+			// since there is no guarantee that metastrings are garbage collected
+			// between unit test runs, we delete before testing
+			$this->delete_metastrings($string);
+			$this->create_metastring($string);
+		}
+
+		// lookup metastring id
+		$cs_ids = get_metastring_id('metaUnitTest', TRUE);
+		$this->assertEqual($cs_ids, $this->metastrings['metaUnitTest']);
+
+		// lookup all metastrings, ignoring case
+		$cs_ids = get_metastring_id('metaUnitTest', FALSE);
+		$this->assertEqual(count($cs_ids), 3);
+		$this->assertEqual(count($cs_ids), count($this->metastrings));
+		foreach ($cs_ids as $string )
+		{
+			$this->assertTrue(in_array($string, $this->metastrings));
+		}
+	}
+
+	public function testElggGetEntitiesFromMetadata() {
+		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
+		$METASTRINGS_CACHE = $METASTRINGS_DEADNAME_CACHE = array();
+
+		$this->object->title = 'Meta Unit Test';
+		$this->object->save();
+		$this->create_metastring('metaUnitTest');
+		$this->create_metastring('tested');
+
+		// create_metadata returns id of metadata on success
+		$this->assertNotEqual(false, create_metadata($this->object->guid, 'metaUnitTest', 'tested'));
+
+		// check value with improper case
+		$options = array('metadata_names' => 'metaUnitTest', 'metadata_values' => 'Tested', 'limit' => 10, 'metadata_case_sensitive' => TRUE);
+		$this->assertIdentical(array(), elgg_get_entities_from_metadata($options));
+
+		// compare forced case with ignored case
+		$options = array('metadata_names' => 'metaUnitTest', 'metadata_values' => 'tested', 'limit' => 10, 'metadata_case_sensitive' => TRUE);
+		$case_true = elgg_get_entities_from_metadata($options);
+		$this->assertIsA($case_true, 'array');
+
+		$options = array('metadata_names' => 'metaUnitTest', 'metadata_values' => 'Tested', 'limit' => 10, 'metadata_case_sensitive' => FALSE);
+		$case_false = elgg_get_entities_from_metadata($options);
+		$this->assertIsA($case_false, 'array');
+
+		$this->assertIdentical($case_true, $case_false);
+
+		// clean up
+		$this->object->delete();
+	}
+
+	public function testElggGetMetadataCount() {
+		$this->object->title = 'Meta Unit Test';
+		$this->object->save();
+
+		$guid = $this->object->getGUID();
+		create_metadata($guid, 'tested', 'tested1', 'text', 0, ACCESS_PUBLIC, true);
+		create_metadata($guid, 'tested', 'tested2', 'text', 0, ACCESS_PUBLIC, true);
+
+		$count = (int)elgg_get_metadata(array(
+			'metadata_names' => array('tested'),
+			'guid' => $guid,
+			'count' => true,
+		));
+
+		$this->assertIdentical($count, 2);
+
+		$this->object->delete();
+	}
+
+	public function testElggDeleteMetadata() {
+		$e = new ElggObject();
+		$e->save();
+
+		for ($i = 0; $i < 30; $i++) {
+			$name = "test_metadata$i";
+			$e->$name = rand(0, 10000);
+		}
+
+		$options = array(
+			'guid' => $e->getGUID(),
+			'limit' => 0,
+		);
+
+		$md = elgg_get_metadata($options);
+		$this->assertIdentical(30, count($md));
+
+		$this->assertTrue(elgg_delete_metadata($options));
+
+		$md = elgg_get_metadata($options);
+		$this->assertTrue(empty($md));
+
+		$e->delete();
+	}
+
+	/**
+	 * https://github.com/Elgg/Elgg/issues/4867
+	 */
+	public function testElggGetEntityMetadataWhereSqlWithFalseValue() {
+		$pair = array('name' => 'test' , 'value' => false);
+		$result = elgg_get_entity_metadata_where_sql('e', 'metadata', null, null, $pair);
+		$where = preg_replace( '/\s+/', ' ', $result['wheres'][0]);
+		$this->assertTrue(strpos($where, "msn1.string = 'test' AND BINARY msv1.string = 0") > 0);
+
+		$result = elgg_get_entity_metadata_where_sql('e', 'metadata', array('test'), array(false));
+		$where = preg_replace( '/\s+/', ' ', $result['wheres'][0]);
+		$this->assertTrue(strpos($where, "msn.string IN ('test')) AND ( BINARY msv.string IN ('0')"));
+	}
+
+	// Make sure metadata with multiple values is correctly deleted when re-written
+	// by another user
+	// https://github.com/elgg/elgg/issues/2776
+	public function test_elgg_metadata_multiple_values() {
+		$u1 = new ElggUser();
+		$u1->username = rand();
+		$u1->save();
+
+		$u2 = new ElggUser();
+		$u2->username = rand();
+		$u2->save();
+
+		$obj = new ElggObject();
+		$obj->owner_guid = $u1->guid;
+		$obj->container_guid = $u1->guid;
+		$obj->access_id = ACCESS_PUBLIC;
+		$obj->save();
+
+		$md_values = array(
+			'one',
+			'two',
+			'three'
+		);
+
+		// need to fake different logins.
+		// good times without mocking.
+		$original_user = elgg_get_logged_in_user_entity();
+		$_SESSION['user'] = $u1;
+		
+		elgg_set_ignore_access(false);
+
+		// add metadata as one user
+		$obj->test = $md_values;
+
+		// check only these md exists
+		$db_prefix = elgg_get_config('dbprefix');
+		$q = "SELECT * FROM {$db_prefix}metadata WHERE entity_guid = $obj->guid";
+		$data = get_data($q);
+
+		$this->assertEqual(count($md_values), count($data));
+		foreach ($data as $md_row) {
+			$md = elgg_get_metadata_from_id($md_row->id);
+			$this->assertTrue(in_array($md->value, $md_values));
+			$this->assertEqual('test', $md->name);
+		}
+
+		// add md w/ same name as a different user
+		$_SESSION['user'] = $u2;
+		$md_values2 = array(
+			'four',
+			'five',
+			'six',
+			'seven'
+		);
+
+		$obj->test = $md_values2;
+
+		$q = "SELECT * FROM {$db_prefix}metadata WHERE entity_guid = $obj->guid";
+		$data = get_data($q);
+
+		$this->assertEqual(count($md_values2), count($data));
+		foreach ($data as $md_row) {
+			$md = elgg_get_metadata_from_id($md_row->id);
+			$this->assertTrue(in_array($md->value, $md_values2));
+			$this->assertEqual('test', $md->name);
+		}
+
+		$_SESSION['user'] = $original_user;
+
+		$obj->delete();
+		$u1->delete();
+		$u2->delete();
+	}
+
+	protected function delete_metastrings($string) {
+		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
+		$METASTRINGS_CACHE = $METASTRINGS_DEADNAME_CACHE = array();
+
+		$string = sanitise_string($string);
+		mysql_query("DELETE FROM {$CONFIG->dbprefix}metastrings WHERE string = BINARY '$string'");
+	}
+
+	protected function create_metastring($string) {
+		global $CONFIG, $METASTRINGS_CACHE, $METASTRINGS_DEADNAME_CACHE;
+		$METASTRINGS_CACHE = $METASTRINGS_DEADNAME_CACHE = array();
+
+		$string = sanitise_string($string);
+		mysql_query("INSERT INTO {$CONFIG->dbprefix}metastrings (string) VALUES ('$string')");
+		$this->metastrings[$string] = mysql_insert_id();
+	}
+}
diff --git a/engine/tests/api/metadata_cache.php b/engine/tests/api/metadata_cache.php
new file mode 100644
index 000000000..7fb328169
--- /dev/null
+++ b/engine/tests/api/metadata_cache.php
@@ -0,0 +1,176 @@
+<?php
+/**
+ * Elgg Test metadata cache
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreMetadataCacheTest extends ElggCoreUnitTest {
+
+	/**
+	 * @var ElggVolatileMetadataCache
+	 */
+	protected $cache;
+
+	/**
+	 * @var ElggObject
+	 */
+	protected $obj1;
+
+	/**
+	 * @var int
+	 */
+	protected $guid1;
+
+	/**
+	 * @var ElggObject
+	 */
+	protected $obj2;
+
+	/**
+	 * @var int
+	 */
+	protected $guid2;
+
+	protected $name = 'test';
+	protected $value = 'test';
+	protected $ignoreAccess;
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->ignoreAccess = elgg_set_ignore_access(false);
+
+		$this->cache = elgg_get_metadata_cache();
+
+		$this->obj1 = new ElggObject();
+		$this->obj1->save();
+		$this->guid1 = $this->obj1->guid;
+
+		$this->obj2 = new ElggObject();
+		$this->obj2->save();
+		$this->guid2 = $this->obj2->guid;
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		$this->obj1->delete();
+		$this->obj2->delete();
+
+		elgg_set_ignore_access($this->ignoreAccess);
+	}
+
+	public function testBasicApi() {
+		// test de-coupled instance
+		$cache = new ElggVolatileMetadataCache();
+		$cache->setIgnoreAccess(false);
+		$guid = 1;
+
+		$this->assertFalse($cache->isKnown($guid, $this->name));
+
+		$cache->markEmpty($guid, $this->name);
+		$this->assertTrue($cache->isKnown($guid, $this->name));
+		$this->assertNull($cache->load($guid, $this->name));
+
+		$cache->markUnknown($guid, $this->name);
+		$this->assertFalse($cache->isKnown($guid, $this->name));
+
+		$cache->save($guid, $this->name, $this->value);
+		$this->assertIdentical($cache->load($guid, $this->name), $this->value);
+
+		$cache->save($guid, $this->name, 1, true);
+		$this->assertIdentical($cache->load($guid, $this->name), array($this->value, 1));
+
+		$cache->clear($guid);
+		$this->assertFalse($cache->isKnown($guid, $this->name));
+	}
+
+	public function testReadsAreCached() {
+		// test that reads fill cache
+		$this->obj1->setMetaData($this->name, $this->value);
+		$this->cache->flush();
+
+		$this->obj1->getMetaData($this->name);
+		$this->assertIdentical($this->cache->load($this->guid1, $this->name), $this->value);
+	}
+
+	public function testWritesAreCached() {
+		// delete should mark cache as known to be empty
+		$this->obj1->deleteMetadata($this->name);
+		$this->assertTrue($this->cache->isKnown($this->guid1, $this->name));
+		$this->assertNull($this->cache->load($this->guid1, $this->name));
+
+		// without name, delete should invalidate the entire entity
+		$this->cache->save($this->guid1, $this->name, $this->value);
+		elgg_delete_metadata(array(
+			'guid' => $this->guid1,
+		));
+		$this->assertFalse($this->cache->isKnown($this->guid1, $this->name));
+
+		// test set
+		$this->obj1->setMetaData($this->name, $this->value);
+		$this->assertIdentical($this->cache->load($this->guid1, $this->name), $this->value);
+
+		// test set multiple
+		$this->obj1->setMetaData($this->name, 1, 'integer', true);
+		$this->assertIdentical($this->cache->load($this->guid1, $this->name), array($this->value, 1));
+
+		// writes when access is ignore should invalidate
+		$tmp_ignore = elgg_set_ignore_access(true);
+		$this->obj1->setMetaData($this->name, $this->value);
+		$this->assertFalse($this->cache->isKnown($this->guid1, $this->name));
+		elgg_set_ignore_access($tmp_ignore);
+	}
+
+	public function testDisableAndEnable() {
+		// both should mark cache unknown
+		$this->obj1->setMetaData($this->name, $this->value);
+		$this->obj1->disableMetadata($this->name);
+		$this->assertFalse($this->cache->isKnown($this->guid1, $this->name));
+
+		$this->cache->save($this->guid1, $this->name, $this->value);
+		$this->obj1->enableMetadata($this->name);
+		$this->assertFalse($this->cache->isKnown($this->guid1, $this->name));
+	}
+
+	public function testPopulateFromEntities() {
+		// test populating cache from set of entities
+		$this->obj1->setMetaData($this->name, $this->value);
+		$this->obj1->setMetaData($this->name, 4, 'integer', true);
+		$this->obj1->setMetaData("{$this->name}-2", "{$this->value}-2");
+		$this->obj2->setMetaData($this->name, $this->value);
+
+		$this->cache->flush();
+		$this->cache->populateFromEntities(array($this->guid1, $this->guid2));
+
+		$expected = array();
+		$expected[$this->name][] = $this->value;
+		$expected[$this->name][] = 4;
+		$expected["{$this->name}-2"] = "{$this->value}-2";
+		$this->assertIdentical($this->cache->loadAll($this->guid1), $expected);
+
+		$expected = array();
+		$expected[$this->name] = $this->value;
+		$this->assertIdentical($this->cache->loadAll($this->guid2), $expected);
+	}
+
+	public function testFilterHeavyEntities() {
+		$big_str = str_repeat('-', 5000);
+		$this->obj2->setMetaData($this->name, array($big_str, $big_str));
+
+		$guids = array($this->guid1, $this->guid2);
+		$expected = array($this->guid1);
+		$actual = $this->cache->filterMetadataHeavyEntities($guids, 6000);
+		$this->assertIdentical($actual, $expected);
+	}
+
+	public function testCreateMetadataInvalidates() {
+		$this->obj1->foo = 1;
+		create_metadata($this->guid1, 'foo', 2, '', elgg_get_logged_in_user_guid(), ACCESS_FRIENDS);
+
+		$this->assertEqual($this->obj1->foo, 2);
+	}
+}
diff --git a/engine/tests/api/metastrings.php b/engine/tests/api/metastrings.php
new file mode 100644
index 000000000..5efdab972
--- /dev/null
+++ b/engine/tests/api/metastrings.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Elgg Metastrings test
+ *
+ * @package Elgg.Core
+ * @subpackage Metastrings.Test
+ */
+class ElggCoreMetastringsTest extends ElggCoreUnitTest {
+
+	public $metastringTypes = array('metadata', 'annotations');
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		$this->metastrings = array();
+		$this->object = new ElggObject();
+		$this->object->save();
+	}
+
+	public function createAnnotations($max = 1) {
+		$annotations = array();
+		for ($i=0; $i<$max; $i++) {
+			$name = 'test_annotation_name' . rand();
+			$value = 'test_annotation_value' . rand();
+			$id = create_annotation($this->object->guid, $name, $value);
+			$annotations[] = $id;
+		}
+
+		return $annotations;
+	}
+
+	public function createMetadata($max = 1) {
+		$metadata = array();
+		for ($i=0; $i<$max; $i++) {
+			$name = 'test_metadata_name' . rand();
+			$value = 'test_metadata_value' . rand();
+			$id = create_metadata($this->object->guid, $name, $value);
+			$metadata[] = $id;
+		}
+
+		return $metadata;
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		access_show_hidden_entities(true);
+		elgg_delete_annotations(array(
+			'guid' => $this->object->guid,
+		));
+		access_show_hidden_entities(false);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		$this->object->delete();
+
+		parent::__destruct();
+	}
+
+	public function testDeleteByID() {
+		$db_prefix = elgg_get_config('dbprefix');
+		$annotations = $this->createAnnotations(1);
+		$metadata = $this->createMetadata(1);
+
+		foreach ($this->metastringTypes as $type) {
+			$id = ${$type}[0];
+			$table = $db_prefix . $type;
+			$q = "SELECT * FROM $table WHERE id = $id";
+			$test = get_data($q);
+
+			$this->assertEqual($test[0]->id, $id);
+			$this->assertIdentical(true, elgg_delete_metastring_based_object_by_id($id, $type));
+			$this->assertIdentical(array(), get_data($q));
+		}
+	}
+
+	public function testGetMetastringObjectFromID() {
+		$db_prefix = elgg_get_config('dbprefix');
+		$annotations = $this->createAnnotations(1);
+		$metadata = $this->createMetadata(1);
+
+		foreach ($this->metastringTypes as $type) {
+			$id = ${$type}[0];
+			$test = elgg_get_metastring_based_object_from_id($id, $type);
+
+			$this->assertEqual($id, $test->id);
+		}
+	}
+
+	public function testGetMetastringObjectFromIDWithDisabledAnnotation() {
+		$name = 'test_annotation_name' . rand();
+		$value = 'test_annotation_value' . rand();
+		$id = create_annotation($this->object->guid, $name, $value);
+		$annotation = elgg_get_annotation_from_id($id);
+		$this->assertTrue($annotation->disable());
+
+		$test = elgg_get_metastring_based_object_from_id($id, 'annotation');
+		$this->assertEqual(false, $test);
+	}
+
+	public function testGetMetastringBasedObjectWithDisabledAnnotation() {
+		$name = 'test_annotation_name' . rand();
+		$value = 'test_annotation_value' . rand();
+		$id = create_annotation($this->object->guid, $name, $value);
+		$annotation = elgg_get_annotation_from_id($id);
+		$this->assertTrue($annotation->disable());
+
+		$test = elgg_get_metastring_based_objects(array(
+			'metastring_type' => 'annotations',
+			'guid' => $this->object->guid,
+		));
+		$this->assertEqual(array(), $test);
+	}
+
+	public function testEnableDisableByID() {
+		$db_prefix = elgg_get_config('dbprefix');
+		$annotations = $this->createAnnotations(1);
+		$metadata = $this->createMetadata(1);
+
+		foreach ($this->metastringTypes as $type) {
+			$id = ${$type}[0];
+			$table = $db_prefix . $type;
+			$q = "SELECT * FROM $table WHERE id = $id";
+			$test = get_data($q);
+
+			// disable
+			$this->assertEqual($test[0]->enabled, 'yes');
+			$this->assertTrue(elgg_set_metastring_based_object_enabled_by_id($id, 'no', $type));
+
+			$test = get_data($q);
+			$this->assertEqual($test[0]->enabled, 'no');
+
+			// enable
+			$ashe = access_get_show_hidden_status();
+			access_show_hidden_entities(true);
+			$this->assertTrue(elgg_set_metastring_based_object_enabled_by_id($id, 'yes', $type));
+
+			$test = get_data($q);
+			$this->assertEqual($test[0]->enabled, 'yes');
+
+			access_show_hidden_entities($ashe);
+		}
+	}
+
+	public function testKeepMeFromDeletingEverything() {
+		foreach ($this->metastringTypes as $type) {
+			$required = array(
+				'guid', 'guids'
+			);
+
+			switch ($type) {
+				case 'metadata':
+					$metadata_required = array(
+						'metadata_owner_guid', 'metadata_owner_guids',
+						'metadata_name', 'metadata_names',
+						'metadata_value', 'metadata_values'
+					);
+
+					$required = array_merge($required, $metadata_required);
+					break;
+
+				case 'annotations':
+					$annotations_required = array(
+						'annotation_owner_guid', 'annotation_owner_guids',
+						'annotation_name', 'annotation_names',
+						'annotation_value', 'annotation_values'
+					);
+
+					$required = array_merge($required, $annotations_required);
+					break;
+			}
+
+			$options = array();
+			$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type));
+
+			// limit alone isn't valid:
+			$options = array('limit' => 10);
+			$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type));
+
+			foreach ($required as $key) {
+				$options = array();
+
+				$options[$key] = ELGG_ENTITIES_ANY_VALUE;
+				$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = ELGG_ENTITIES_ANY_VALUE");
+
+				$options[$key] = ELGG_ENTITIES_NO_VALUE;
+				$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = ELGG_ENTITIES_NO_VALUE");
+
+				$options[$key] = false;
+				$this->assertFalse(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = bool false");
+
+				$options[$key] = true;
+				$this->assertTrue(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = bool true");
+
+				$options[$key] = 'test';
+				$this->assertTrue(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = 'test'");
+
+				$options[$key] = array('test');
+				$this->assertTrue(elgg_is_valid_options_for_batch_operation($options, $type), "Sent $key = array('test')");
+			}
+		}
+	}
+}
diff --git a/engine/tests/api/output.php b/engine/tests/api/output.php
new file mode 100644
index 000000000..c3d5aa8c6
--- /dev/null
+++ b/engine/tests/api/output.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Test case for ElggAutoP functionality.
+ */
+class ElggCoreOutputAutoPTest extends ElggCoreUnitTest {
+
+	/**
+	 * @var ElggAutoP
+	 */
+	protected $_autop;
+
+	public function setUp() {
+		$this->_autop = new ElggAutoP();
+	}
+	
+	public function testDomRoundtrip() {
+		$d = dir(dirname(dirname(__FILE__)) . '/test_files/output/autop');
+		$in = file_get_contents($d->path . "/domdoc_in.html");
+		$exp = file_get_contents($d->path . "/domdoc_exp.html");
+		$exp = $this->flattenString($exp);
+
+		$doc = new DOMDocument();
+		libxml_use_internal_errors(true);
+		$doc->loadHTML("<html><meta http-equiv='content-type' content='text/html; charset=utf-8'><body>"
+				. $in . '</body></html>');
+		$serialized = $doc->saveHTML();
+		list(,$out) = explode('<body>', $serialized, 2);
+		list($out) = explode('</body>', $out, 2);
+		$out = $this->flattenString($out);
+
+		$this->assertEqual($exp, $out, "DOMDocument's parsing/serialization roundtrip");
+	}
+
+	public function testProcess() {
+		$data = $this->provider();
+		foreach ($data as $row) {
+			list($test, $in, $exp) = $row;
+			$exp = $this->flattenString($exp);
+			$out = $this->_autop->process($in);
+			$out = $this->flattenString($out);
+			
+			$this->assertEqual($exp, $out, "Equality case {$test}");
+		}
+	}
+
+	public function provider() {
+		$d = dir(dirname(dirname(__FILE__)) . '/test_files/output/autop');
+		$tests = array();
+		while (false !== ($entry = $d->read())) {
+			if (preg_match('/^([a-z\\-]+)\.in\.html$/i', $entry, $m)) {
+				$tests[] = $m[1];
+			}
+		}
+
+		$data = array();
+		foreach ($tests as $test) {
+			$data[] = array(
+				$test,
+				file_get_contents($d->path . '/' . "{$test}.in.html"),
+				file_get_contents($d->path . '/' . "{$test}.exp.html"),
+			);
+		}
+		return $data;
+	}
+
+	/**
+	 * Different versions of PHP return different whitespace between tags.
+	 * Removing all line breaks normalizes that.
+	 */
+	public function flattenString($string) {
+		$r = preg_replace('/[\n\r]+/', '', $string);
+		return $r;
+	}
+}
+\ No newline at end of file
diff --git a/engine/tests/api/plugins.php b/engine/tests/api/plugins.php
new file mode 100644
index 000000000..d0f111c48
--- /dev/null
+++ b/engine/tests/api/plugins.php
@@ -0,0 +1,299 @@
+<?php
+/**
+ * Elgg Plugins Test
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Test
+ */
+class ElggCorePluginsAPITest extends ElggCoreUnitTest {
+	// 1.8 manifest object
+	var $manifest18;
+
+	// 1.8 package at test_files/plugin_18/
+	var $package18;
+
+	// 1.7 manifest object
+	var $manifest17;
+
+	// 1.7 package at test_files/plugin_17/
+	var $package17;
+
+	public function __construct() {
+		parent::__construct();
+
+		$this->manifest18 = new ElggPluginManifest(get_config('path') . 'engine/tests/test_files/plugin_18/manifest.xml', 'plugin_test_18');
+		$this->manifest17 = new ElggPluginManifest(get_config('path') . 'engine/tests/test_files/plugin_17/manifest.xml', 'plugin_test_17');
+
+		$this->package18 = new ElggPluginPackage(get_config('path') . 'engine/tests/test_files/plugin_18');
+		$this->package17 = new ElggPluginPackage(get_config('path') . 'engine/tests/test_files/plugin_17');
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+	}
+
+	// generic tests
+	public function testElggPluginManifestFromString() {
+		$manifest_file = file_get_contents(get_config('path') . 'engine/tests/test_files/plugin_17/manifest.xml');
+		$manifest = new ElggPluginManifest($manifest_file);
+
+		$this->assertIsA($manifest, 'ElggPluginManifest');
+	}
+
+	public function testElggPluginManifestFromFile() {
+		$file = get_config('path') . 'engine/tests/test_files/plugin_17/manifest.xml';
+		$manifest = new ElggPluginManifest($file);
+
+		$this->assertIsA($manifest, 'ElggPluginManifest');
+	}
+
+	public function testElggPluginManifestFromXMLEntity() {
+		$xml = xml_to_object($manifest_file = file_get_contents(get_config('path') . 'engine/tests/test_files/plugin_17/manifest.xml'));
+		$manifest = new ElggPluginManifest($xml);
+
+		$this->assertIsA($manifest, 'ElggPluginManifest');
+	}
+
+	// exact manifest values
+	// 1.8 interface
+	public function testElggPluginManifest18() {
+		$manifest_array = array(
+			'name' => 'Test Manifest',
+			'author' => 'Anyone',
+			'version' => '1.0',
+			'blurb' => 'A concise description.',
+			'description' => 'A longer, more interesting description.',
+			'website' => 'http://www.elgg.org/',
+			'repository' => 'https://github.com/Elgg/Elgg',
+			'bugtracker' => 'https://github.com/elgg/elgg/issues',
+			'donations' => 'http://elgg.org/supporter.php',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
+
+			'requires' => array(
+				array('type' => 'elgg_version', 'version' => '3009030802', 'comparison' => 'lt'),
+				array('type' => 'elgg_release', 'version' => '1.8-svn'),
+				array('type' => 'php_extension', 'name' => 'gd'),
+				array('type' => 'php_ini', 'name' => 'short_open_tag', 'value' => 'off'),
+				array('type' => 'php_extension', 'name' => 'made_up', 'version' => '1.0'),
+				array('type' => 'plugin', 'name' => 'fake_plugin', 'version' => '1.0'),
+				array('type' => 'plugin', 'name' => 'profile', 'version' => '1.0'),
+				array('type' => 'plugin', 'name' => 'profile_api', 'version' => '1.3', 'comparison' => 'lt'),
+				array('type' => 'priority', 'priority' => 'after', 'plugin' => 'profile'),
+			),
+
+			'screenshot' => array(
+				array('description' => 'Fun things to do 1', 'path' => 'graphics/plugin_ss1.png'),
+				array('description' => 'Fun things to do 2', 'path' => 'graphics/plugin_ss2.png'),
+			),
+
+			'category' => array(
+				'Admin', 'ServiceAPI'
+			),
+
+			'conflicts' => array(
+				array('type' => 'plugin', 'name' => 'profile_api', 'version' => '1.0')
+			),
+
+			'provides' => array(
+				array('type' => 'plugin', 'name' => 'profile_api', 'version' => '1.3'),
+				array('type' => 'php_extension', 'name' => 'big_math', 'version' => '1.0')
+			),
+
+			'suggests' => array(
+				array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => '1.0'),
+			),
+
+			// string because we are reading from a file
+			'activate_on_install' => 'true',
+		);
+
+		$this->assertIdentical($this->manifest18->getManifest(), $manifest_array);
+	}
+
+	public function testElggPluginManifest17() {
+		$manifest_array = array(
+			'author' => 'Anyone',
+			'version' => '1.0',
+			'description' => 'A 1.7-style manifest.',
+			'website' => 'http://www.elgg.org/',
+			'copyright' => '(C) Elgg Foundation 2011',
+			'license' => 'GNU General Public License version 2',
+			'elgg_version' => '2009030702',
+			'name' => 'Plugin Test 17',
+		);
+
+		$this->assertIdentical($this->manifest17->getManifest(), $manifest_array);
+	}
+
+
+	public function testElggPluginManifestGetApiVersion() {
+		$this->assertEqual($this->manifest18->getApiVersion(), 1.8);
+		$this->assertEqual($this->manifest17->getApiVersion(), 1.7);
+	}
+
+	public function testElggPluginManifestGetPluginID() {
+		$this->assertEqual($this->manifest18->getPluginID(), 'plugin_test_18');
+		$this->assertEqual($this->manifest17->getPluginID(), 'plugin_test_17');
+	}
+
+
+	// normalized attributes
+	public function testElggPluginManifestGetName() {
+		$this->assertEqual($this->manifest18->getName(), 'Test Manifest');
+		$this->assertEqual($this->manifest17->getName(), 'Plugin Test 17');
+	}
+
+	public function testElggPluginManifestGetAuthor() {
+		$this->assertEqual($this->manifest18->getAuthor(), 'Anyone');
+		$this->assertEqual($this->manifest17->getAuthor(), 'Anyone');
+	}
+
+	public function testElggPluginManifestGetVersion() {
+		$this->assertEqual($this->manifest18->getVersion(), 1.0);
+		$this->assertEqual($this->manifest17->getVersion(), 1.0);
+	}
+
+	public function testElggPluginManifestGetBlurb() {
+		$this->assertEqual($this->manifest18->getBlurb(), 'A concise description.');
+		$this->assertEqual($this->manifest17->getBlurb(), 'A 1.7-style manifest.');
+	}
+
+	public function testElggPluginManifestGetWebsite() {
+		$this->assertEqual($this->manifest18->getWebsite(), 'http://www.elgg.org/');
+		$this->assertEqual($this->manifest17->getWebsite(), 'http://www.elgg.org/');
+	}
+	
+	public function testElggPluginManifestGetRepository() {
+		$this->assertEqual($this->manifest18->getRepositoryURL(), 'https://github.com/Elgg/Elgg');
+		$this->assertEqual($this->manifest17->getRepositoryURL(), '');
+	}
+	
+		public function testElggPluginManifestGetBugtracker() {
+		$this->assertEqual($this->manifest18->getBugTrackerURL(), 'https://github.com/elgg/elgg/issues');
+		$this->assertEqual($this->manifest17->getBugTrackerURL(), '');
+	}
+	
+		public function testElggPluginManifestGetDonationsPage() {
+		$this->assertEqual($this->manifest18->getDonationsPageURL(), 'http://elgg.org/supporter.php');
+		$this->assertEqual($this->manifest17->getDonationsPageURL(), '');
+	}
+
+	public function testElggPluginManifestGetCopyright() {
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
+		$this->assertEqual($this->manifest18->getCopyright(), '(C) Elgg Foundation 2011');
+	}
+
+	public function testElggPluginManifestGetLicense() {
+		$this->assertEqual($this->manifest18->getLicense(), 'GNU General Public License version 2');
+		$this->assertEqual($this->manifest17->getLicense(), 'GNU General Public License version 2');
+	}
+
+
+	public function testElggPluginManifestGetRequires() {
+		$requires = array(
+			array('type' => 'elgg_version', 'version' => '3009030802', 'comparison' => 'lt'),
+			array('type' => 'elgg_release', 'version' => '1.8-svn', 'comparison' => 'ge'),
+			array('type' => 'php_extension', 'name' => 'gd', 'version' => '', 'comparison' => '='),
+			array('type' => 'php_ini', 'name' => 'short_open_tag', 'value' => 0, 'comparison' => '='),
+			array('type' => 'php_extension', 'name' => 'made_up', 'version' => '1.0', 'comparison' => '='),
+			array('type' => 'plugin', 'name' => 'fake_plugin', 'version' => '1.0', 'comparison' => 'ge'),
+			array('type' => 'plugin', 'name' => 'profile', 'version' => '1.0', 'comparison' => 'ge'),
+			array('type' => 'plugin', 'name' => 'profile_api', 'version' => '1.3', 'comparison' => 'lt'),
+			array('type' => 'priority', 'priority' => 'after', 'plugin' => 'profile'),
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getRequires(), $requires);
+
+		$requires = array(
+			array('type' => 'elgg_version', 'version' => '2009030702', 'comparison' => 'ge')
+		);
+
+		$this->assertIdentical($this->package17->getManifest()->getRequires(), $requires);
+	}
+
+	public function testElggPluginManifestGetSuggests() {
+		$suggests = array(
+			array('type' => 'plugin', 'name' => 'facebook_connect', 'version' => '1.0', 'comparison' => 'ge'),
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getSuggests(), $suggests);
+
+		$suggests = array();
+
+		$this->assertIdentical($this->package17->getManifest()->getSuggests(), $suggests);
+	}
+
+	public function testElggPluginManifestGetDescription() {
+		$this->assertEqual($this->package18->getManifest()->getDescription(), 'A longer, more interesting description.');
+		$this->assertEqual($this->package17->getManifest()->getDescription(), 'A 1.7-style manifest.');
+	}
+
+	public function testElggPluginManifestGetCategories() {
+		$categories = array(
+			'Admin', 'ServiceAPI'
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getCategories(), $categories);
+		$this->assertIdentical($this->package17->getManifest()->getCategories(), array());
+	}
+
+	public function testElggPluginManifestGetScreenshots() {
+		$screenshots = array(
+			array('description' => 'Fun things to do 1', 'path' => 'graphics/plugin_ss1.png'),
+			array('description' => 'Fun things to do 2', 'path' => 'graphics/plugin_ss2.png'),
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getScreenshots(), $screenshots);
+		$this->assertIdentical($this->package17->getManifest()->getScreenshots(), array());
+	}
+
+	public function testElggPluginManifestGetProvides() {
+		$provides = array(
+			array('type' => 'plugin', 'name' => 'profile_api', 'version' => '1.3'),
+			array('type' => 'php_extension', 'name' => 'big_math', 'version' => '1.0'),
+			array('type' => 'plugin', 'name' => 'plugin_18', 'version' => '1.0')
+		);
+
+		$this->assertIdentical($this->package18->getManifest()->getProvides(), $provides);
+
+
+		$provides = array(
+			array('type' => 'plugin', 'name' => 'plugin_17', 'version' => '1.0')
+		);
+
+		$this->assertIdentical($this->package17->getManifest()->getProvides(), $provides);
+	}
+
+	public function testElggPluginManifestGetConflicts() {
+		$conflicts = array(
+			array(
+				'type' => 'plugin',
+				'name' => 'profile_api',
+				'version' => '1.0',
+				'comparison' => '='
+			)
+		);
+
+		$this->assertIdentical($this->manifest18->getConflicts(), $conflicts);
+		$this->assertIdentical($this->manifest17->getConflicts(), array());
+	}
+
+	public function testElggPluginManifestGetActivateOnInstall() {
+		$this->assertIdentical($this->manifest18->getActivateOnInstall(), true);
+	}
+
+	// ElggPluginPackage
+	public function testElggPluginPackageDetectIDFromPath() {
+		$this->assertEqual($this->package18->getID(), 'plugin_18');
+	}
+
+	public function testElggPluginPackageDetectIDFromPluginID() {
+		$package = new ElggPluginPackage('profile');
+		$this->assertEqual($package->getID(), 'profile');
+	}
+}
diff --git a/engine/tests/api/river.php b/engine/tests/api/river.php
new file mode 100644
index 000000000..6931b9f41
--- /dev/null
+++ b/engine/tests/api/river.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Elgg Test river api
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreRiverAPITest extends ElggCoreUnitTest {
+
+	public function testElggTypeSubtypeWhereSQL() {
+		$types = array('object');
+		$subtypes = array('blog');
+		$result = elgg_get_river_type_subtype_where_sql('rv', $types, $subtypes, null);
+		$this->assertIdentical($result, "((rv.type = 'object') AND ((rv.subtype = 'blog')))");
+
+		$types = array('object');
+		$subtypes = array('blog', 'file');
+		$result = elgg_get_river_type_subtype_where_sql('rv', $types, $subtypes, null);
+		$this->assertIdentical($result, "((rv.type = 'object') AND ((rv.subtype = 'blog') OR (rv.subtype = 'file')))");
+	}
+}
diff --git a/engine/tests/elgg_unit_test.php b/engine/tests/elgg_unit_test.php
new file mode 100644
index 000000000..70f8788a0
--- /dev/null
+++ b/engine/tests/elgg_unit_test.php
@@ -0,0 +1,29 @@
+<?php
+
+/**
+ * Elgg Core Unit Tester
+ *
+ * This class is to be extended by all Elgg unit tests. As such, any method here
+ * will be available to the tests.
+ */
+abstract class ElggCoreUnitTest extends UnitTestCase
+{
+	/**
+	 * Class constructor.
+	 *
+	 * A simple wrapper to call the parent constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	/**
+	 * Class destructor.
+	 *
+	 * The parent does not provide a destructor, so including an explicit one here.
+	 */
+	public function __destruct()
+	{
+	}
+}
diff --git a/engine/tests/objects/entities.php b/engine/tests/objects/entities.php
new file mode 100644
index 000000000..bac72079e
--- /dev/null
+++ b/engine/tests/objects/entities.php
@@ -0,0 +1,423 @@
+<?php
+/**
+ * Elgg Test ElggEntities
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreEntityTest extends ElggCoreUnitTest {
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->entity = new ElggEntityTest();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		$this->swallowErrors();
+		unset($this->entity);
+	}
+
+	/**
+	 * Tests the protected attributes
+	 */
+	public function testElggEntityAttributes() {
+		$test_attributes = array();
+		$test_attributes['guid'] = NULL;
+		$test_attributes['type'] = NULL;
+		$test_attributes['subtype'] = NULL;
+		$test_attributes['owner_guid'] = elgg_get_logged_in_user_guid();
+		$test_attributes['container_guid'] = elgg_get_logged_in_user_guid();
+		$test_attributes['site_guid'] = NULL;
+		$test_attributes['access_id'] = ACCESS_PRIVATE;
+		$test_attributes['time_created'] = NULL;
+		$test_attributes['time_updated'] = NULL;
+		$test_attributes['last_action'] = NULL;
+		$test_attributes['enabled'] = 'yes';
+		$test_attributes['tables_split'] = 1;
+		$test_attributes['tables_loaded'] = 0;
+		ksort($test_attributes);
+
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $test_attributes);
+	}
+
+	public function testElggEntityGetAndSetBaseAttributes() {
+		// explicitly set and get access_id
+		$this->assertIdentical($this->entity->get('access_id'), ACCESS_PRIVATE);
+		$this->assertTrue($this->entity->set('access_id', ACCESS_PUBLIC));
+		$this->assertIdentical($this->entity->get('access_id'), ACCESS_PUBLIC);
+
+		// check internal attributes array
+		$attributes = $this->entity->expose_attributes();
+		$this->assertIdentical($attributes['access_id'], ACCESS_PUBLIC);
+
+		// implicitly set and get access_id
+		$this->entity->access_id = ACCESS_PRIVATE;
+		$this->assertIdentical($this->entity->access_id, ACCESS_PRIVATE);
+
+		// unset access_id
+		unset($this->entity->access_id);
+		$this->assertIdentical($this->entity->access_id, '');
+
+		// unable to directly set guid
+		$this->assertFalse($this->entity->set('guid', 'error'));
+		$this->entity->guid = 'error';
+		$this->assertNotEqual($this->entity->guid, 'error');
+
+		// fail on non-attribute
+		$this->assertNull($this->entity->get('non_existent'));
+
+		// consider helper methods
+		$this->assertIdentical($this->entity->getGUID(), $this->entity->guid );
+		$this->assertIdentical($this->entity->getType(), $this->entity->type );
+		$this->assertIdentical($this->entity->getSubtype(), $this->entity->subtype );
+		$this->assertIdentical($this->entity->getOwnerGUID(), $this->entity->owner_guid );
+		$this->assertIdentical($this->entity->getAccessID(), $this->entity->access_id );
+		$this->assertIdentical($this->entity->getTimeCreated(), $this->entity->time_created );
+		$this->assertIdentical($this->entity->getTimeUpdated(), $this->entity->time_updated );
+	}
+
+	public function testElggEntityGetAndSetMetaData() {
+		// ensure metadata not set
+		$this->assertNull($this->entity->get('non_existent'));
+		$this->assertFalse(isset($this->entity->non_existent));
+
+		// create metadata
+		$this->entity->existent = 'testing';
+		$this->assertIdentical($this->entity->existent, 'testing');
+
+		// check metadata set
+		$this->assertTrue(isset($this->entity->existent));
+		$this->assertIdentical($this->entity->getMetaData('existent'), 'testing');
+
+		// check internal metadata array
+		$metadata = $this->entity->expose_metadata();
+		$this->assertIdentical($metadata['existent'], array('testing'));
+	}
+
+	public function testElggEnityGetAndSetAnnotations() {
+		$this->assertFalse(array_key_exists('non_existent', $this->entity->expose_annotations()));
+		$this->assertIdentical($this->entity->getAnnotations('non_existent'), array());
+
+		// set and check temp annotation
+		$this->assertTrue($this->entity->annotate('non_existent', 'testing'));
+		$this->assertIdentical($this->entity->getAnnotations('non_existent'), array('testing'));
+		$this->assertTrue(array_key_exists('non_existent', $this->entity->expose_annotations()));
+
+		// save entity and check for annotation
+		$this->entity->subtype = 'testing';
+		$this->save_entity();
+		$this->assertFalse(array_key_exists('non_existent', $this->entity->expose_annotations()));
+		$annotations = $this->entity->getAnnotations('non_existent');
+		$this->assertIsA($annotations[0], 'ElggAnnotation');
+		$this->assertIdentical($annotations[0]->name, 'non_existent');
+		$this->assertEqual($this->entity->countAnnotations('non_existent'), 1);
+
+		$this->assertIdentical($annotations, elgg_get_annotations(array('guid' => $this->entity->getGUID())));
+		$this->assertIdentical($annotations, elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site')));
+		$this->assertIdentical($annotations, elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site', 'subtype' => 'testing')));
+		$this->assertIdentical(FALSE, elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site', 'subtype' => 'fail')));
+
+		//  clear annotation
+		$this->assertTrue($this->entity->deleteAnnotations());
+		$this->assertEqual($this->entity->countAnnotations('non_existent'), 0);
+
+		$this->assertIdentical(array(), elgg_get_annotations(array('guid' => $this->entity->getGUID())));
+		$this->assertIdentical(array(), elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site')));
+		$this->assertIdentical(array(), elgg_get_annotations(array('guid' => $this->entity->getGUID(), 'type' => 'site', 'subtype' => 'testing')));
+
+		// clean up
+		$this->assertTrue($this->entity->delete());
+		remove_subtype('site', 'testing');
+	}
+
+	public function testElggEntityCache() {
+		global $ENTITY_CACHE;
+		$this->assertIsA($ENTITY_CACHE, 'array');
+	}
+
+	public function testElggEntitySaveAndDelete() {
+		global $ENTITY_CACHE;
+
+		// unable to delete with no guid
+		$this->assertFalse($this->entity->delete());
+
+		// error on save
+		try {
+			$this->entity->save();
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('InvalidParameterException:EntityTypeNotSet'));
+		}
+
+		// set elements
+		$this->entity->type = 'site';
+		$this->entity->non_existent = 'testing';
+
+		// save
+		$this->AssertEqual($this->entity->getGUID(), 0);
+		$guid = $this->entity->save();
+		$this->AssertNotEqual($guid, 0);
+
+		// check guid
+		$this->AssertEqual($this->entity->getGUID(), $guid);
+		$attributes = $this->entity->expose_attributes();
+		$this->AssertEqual($attributes['guid'], $guid);
+		$this->AssertIdentical($ENTITY_CACHE[$guid], $this->entity);
+
+		// check metadata
+		$metadata = $this->entity->expose_metadata();
+		$this->AssertFalse(in_array('non_existent', $metadata));
+		$this->AssertEqual($this->entity->get('non_existent'), 'testing');
+
+		// clean up with delete
+		$this->assertIdentical(true, $this->entity->delete());
+	}
+
+	public function testElggEntityDisableAndEnable() {
+		global $CONFIG;
+
+		// ensure enabled
+		$this->assertTrue($this->entity->isEnabled());
+
+		// false on disable because it's not saved yet.
+		$this->assertFalse($this->entity->disable());
+
+		// save and disable
+		$this->save_entity();
+
+		// add annotations and metadata to check if they're disabled.
+		$annotation_id = create_annotation($this->entity->guid, 'test_annotation_' . rand(), 'test_value_' . rand());
+		$metadata_id = create_metadata($this->entity->guid, 'test_metadata_' . rand(), 'test_value_' . rand());
+
+		$this->assertTrue($this->entity->disable());
+
+		// ensure disabled by comparing directly with database
+		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$this->entity->guid}'");
+		$this->assertIdentical($entity->enabled, 'no');
+
+		$annotation = get_data_row("SELECT * FROM {$CONFIG->dbprefix}annotations WHERE id = '$annotation_id'");
+		$this->assertIdentical($annotation->enabled, 'no');
+
+		$metadata = get_data_row("SELECT * FROM {$CONFIG->dbprefix}metadata WHERE id = '$metadata_id'");
+		$this->assertIdentical($metadata->enabled, 'no');
+
+		// re-enable for deletion to work
+		$this->assertTrue($this->entity->enable());
+
+		// check enabled
+		// check annotations and metadata enabled.
+		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$this->entity->guid}'");
+		$this->assertIdentical($entity->enabled, 'yes');
+
+		$annotation = get_data_row("SELECT * FROM {$CONFIG->dbprefix}annotations WHERE id = '$annotation_id'");
+		$this->assertIdentical($annotation->enabled, 'yes');
+
+		$metadata = get_data_row("SELECT * FROM {$CONFIG->dbprefix}metadata WHERE id = '$metadata_id'");
+		$this->assertIdentical($metadata->enabled, 'yes');
+
+		$this->assertTrue($this->entity->delete());
+	}
+
+	public function testElggEntityRecursiveDisableAndEnable() {
+		global $CONFIG;
+
+		$this->save_entity();
+		$obj1 = new ElggObject();
+		$obj1->container_guid = $this->entity->getGUID();
+		$obj1->save();
+		$obj2 = new ElggObject();
+		$obj2->container_guid = $this->entity->getGUID();
+		$obj2->save();
+
+		// disable $obj2 before disabling the container
+		$this->assertTrue($obj2->disable());
+
+		// disable entities container by $this->entity
+		$this->assertTrue($this->entity->disable());
+		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$obj1->guid}'");
+		$this->assertIdentical($entity->enabled, 'no');
+
+		// enable entities that were disabled with the container (but not $obj2)
+		$this->assertTrue($this->entity->enable());
+		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$obj1->guid}'");
+		$this->assertIdentical($entity->enabled, 'yes');
+		$entity = get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid = '{$obj2->guid}'");
+		$this->assertIdentical($entity->enabled, 'no');
+
+		// cleanup
+		$this->assertTrue($obj2->enable());
+		$this->assertTrue($obj2->delete());
+		$this->assertTrue($obj1->delete());
+		$this->assertTrue($this->entity->delete());
+	}
+
+	public function testElggEntityMetadata() {
+		// let's delete a non-existent metadata
+		$this->assertFalse($this->entity->deleteMetadata('important'));
+
+		// let's add the metadata
+		$this->entity->important = 'indeed!';
+		$this->assertIdentical('indeed!', $this->entity->important);
+		$this->entity->less_important = 'true, too!';
+		$this->assertIdentical('true, too!', $this->entity->less_important);
+		$this->save_entity();
+
+		// test deleting incorrectly
+		// @link https://github.com/elgg/elgg/issues/2273
+		$this->assertNull($this->entity->deleteMetadata('impotent'));
+		$this->assertEqual($this->entity->important, 'indeed!');
+
+		// get rid of one metadata
+		$this->assertEqual($this->entity->important, 'indeed!');
+		$this->assertTrue($this->entity->deleteMetadata('important'));
+		$this->assertNull($this->entity->important);
+
+		// get rid of all metadata
+		$this->assertTrue($this->entity->deleteMetadata());
+		$this->assertNull($this->entity->less_important);
+
+		// clean up database
+		$this->assertTrue($this->entity->delete());
+	}
+
+	public function testElggEntityExportables() {
+		$exportables = array(
+			'guid',
+			'type',
+			'subtype',
+			'time_created',
+			'time_updated',
+			'container_guid',
+			'owner_guid',
+			'site_guid'
+		);
+
+		$this->assertIdentical($exportables, $this->entity->getExportableValues());
+	}
+
+	public function testElggEntityMultipleMetadata() {
+		foreach (array(false, true) as $save) {
+			if ($save) {
+				$this->save_entity();
+			}
+			$md = array('brett', 'bryan', 'brad');
+			$name = 'test_md_' . rand();
+
+			$this->entity->$name = $md;
+
+			$this->assertEqual($md, $this->entity->$name);
+
+			if ($save) {
+				$this->assertTrue($this->entity->delete());
+			}
+		}
+	}
+
+	public function testElggEntitySingleElementArrayMetadata() {
+		foreach (array(false, true) as $save) {
+			if ($save) {
+				$this->save_entity();
+			}
+			$md = array('test');
+			$name = 'test_md_' . rand();
+
+			$this->entity->$name = $md;
+
+			$this->assertEqual($md[0], $this->entity->$name);
+
+			if ($save) {
+				$this->assertTrue($this->entity->delete());
+			}
+		}
+	}
+
+	public function testElggEntityAppendMetadata() {
+		foreach (array(false, true) as $save) {
+			if ($save) {
+				$this->save_entity();
+			}
+			$md = 'test';
+			$name = 'test_md_' . rand();
+
+			$this->entity->$name = $md;
+			$this->entity->setMetaData($name, 'test2', '', true);
+
+			$this->assertEqual(array('test', 'test2'), $this->entity->$name);
+
+			if ($save) {
+				$this->assertTrue($this->entity->delete());
+			}
+		}
+	}
+
+	public function testElggEntitySingleElementArrayAppendMetadata() {
+		foreach (array(false, true) as $save) {
+			if ($save) {
+				$this->save_entity();
+			}
+			$md = 'test';
+			$name = 'test_md_' . rand();
+
+			$this->entity->$name = $md;
+			$this->entity->setMetaData($name, array('test2'), '', true);
+
+			$this->assertEqual(array('test', 'test2'), $this->entity->$name);
+
+			if ($save) {
+				$this->assertTrue($this->entity->delete());
+			}
+		}
+	}
+
+	public function testElggEntityArrayAppendMetadata() {
+		foreach (array(false, true) as $save) {
+			if ($save) {
+				$this->save_entity();
+			}
+			$md = array('brett', 'bryan', 'brad');
+			$md2 = array('test1', 'test2', 'test3');
+			$name = 'test_md_' . rand();
+
+			$this->entity->$name = $md;
+			$this->entity->setMetaData($name, $md2, '', true);
+
+			$this->assertEqual(array_merge($md, $md2), $this->entity->$name);
+
+			if ($save) {
+				$this->assertTrue($this->entity->delete());
+			}
+		}
+	}
+
+	protected function save_entity($type='site') {
+		$this->entity->type = $type;
+		$this->assertNotEqual($this->entity->save(), 0);
+	}
+}
+
+// ElggEntity is an abstract class with no abstact methods.
+class ElggEntityTest extends ElggEntity {
+	public function __construct() {
+		$this->initializeAttributes();
+	}
+
+	public function expose_attributes() {
+		return $this->attributes;
+	}
+
+	public function expose_metadata() {
+		return $this->temp_metadata;
+	}
+
+	public function expose_annotations() {
+		return $this->temp_annotations;
+	}
+}
diff --git a/engine/tests/objects/filestore.php b/engine/tests/objects/filestore.php
new file mode 100644
index 000000000..9732f0af4
--- /dev/null
+++ b/engine/tests/objects/filestore.php
@@ -0,0 +1,100 @@
+<?php
+/**
+ * Elgg Test Skeleton
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreFilestoreTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+		
+		// all code should come after here
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->filestore = new ElggDiskFilestoreTest();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+		
+		unset($this->filestore);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all code should go above here
+		parent::__destruct();
+	}
+
+	public function testFileMatrix() {
+		global $CONFIG;
+		
+		// create a test user
+		$user = $this->createTestUser();
+		$created = date('Y/m/d', $user->time_created);
+		
+		// check matrix with guid
+		$guid_dir = $this->filestore->makeFileMatrix($user->guid);
+		$this->assertIdentical($guid_dir, "$created/$user->guid/");
+		
+		// clean up user
+		$user->delete();
+	}
+	
+	public function testFilenameOnFilestore() {
+		global $CONFIG;
+		
+		// create a user to own the file
+		$user = $this->createTestUser();
+		$created = date('Y/m/d', $user->time_created);
+		
+		// setup a test file
+		$file = new ElggFile();
+		$file->owner_guid = $user->guid;
+		$file->setFilename('testing/filestore.txt');
+		$file->open('write');
+		$file->write('Testing!');
+		$this->assertTrue($file->close());
+		
+		// ensure filename and path is expected
+		$filename = $file->getFilenameOnFilestore($file);
+		$filepath = "$CONFIG->dataroot$created/$user->guid/testing/filestore.txt";
+		$this->assertIdentical($filename, $filepath);
+		$this->assertTrue(file_exists($filepath));
+		
+		// ensure file removed on user delete
+		$user->delete();
+		$this->assertFalse(file_exists($filepath));
+	}
+
+
+	protected function createTestUser($username = 'fileTest') {
+		$user = new ElggUser();
+		$user->username = $username;
+		$guid = $user->save();
+		
+		// load user to have access to creation time
+		return get_entity($guid);
+	}
+}
+
+class ElggDiskFilestoreTest extends ElggDiskFilestore {
+	public function makeFileMatrix($guid) {
+		return parent::makeFileMatrix($guid);
+	}
+}
diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
new file mode 100644
index 000000000..263ab2414
--- /dev/null
+++ b/engine/tests/objects/objects.php
@@ -0,0 +1,306 @@
+<?php
+/**
+ * Elgg Test ElggObject
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreObjectTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->entity = new ElggObjectTest();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		$this->swallowErrors();
+		unset($this->entity);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		parent::__destruct();
+	}
+
+	public function testElggObjectConstructor() {
+		$attributes = array();
+		$attributes['guid'] = NULL;
+		$attributes['type'] = 'object';
+		$attributes['subtype'] = NULL;
+		$attributes['owner_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['container_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['site_guid'] = NULL;
+		$attributes['access_id'] = ACCESS_PRIVATE;
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
+		$attributes['enabled'] = 'yes';
+		$attributes['tables_split'] = 2;
+		$attributes['tables_loaded'] = 0;
+		$attributes['title'] = NULL;
+		$attributes['description'] = NULL;
+		ksort($attributes);
+
+		$entity_attributes = $this->entity->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
+	}
+
+	public function testElggObjectSave() {
+		// new object
+		$this->AssertEqual($this->entity->getGUID(), 0);
+		$guid = $this->entity->save();
+		$this->AssertNotEqual($guid, 0);
+
+		$entity_row = $this->get_entity_row($guid);
+		$this->assertIsA($entity_row, 'stdClass');
+
+		// update existing object
+		$this->entity->title = 'testing';
+		$this->entity->description = 'ElggObject';
+		$this->assertEqual($this->entity->save(), $guid);
+
+		$object_row = $this->get_object_row($guid);
+		$this->assertIsA($object_row, 'stdClass');
+		$this->assertIdentical($object_row->title, 'testing');
+		$this->assertIdentical($object_row->description, 'ElggObject');
+
+		// clean up
+		$this->entity->delete();
+	}
+
+	public function testElggObjectLoad() {
+		// fail on wrong type
+		try {
+			$error = new ElggObjectTest(elgg_get_logged_in_user_guid());
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidClassException');
+			$message = sprintf(elgg_echo('InvalidClassException:NotValidElggStar'), elgg_get_logged_in_user_guid(), 'ElggObject');
+			$this->assertIdentical($e->getMessage(), $message);
+		}
+	}
+
+	public function testElggObjectConstructorByGUID() {
+		$guid = $this->entity->save();
+
+		// load a new object using guid
+		$entity = new ElggObjectTest($guid);
+		$this->assertIdentical($this->entity, $entity);
+
+		// clean up
+		$this->entity->delete();
+	}
+
+	public function testElggObjectClone() {
+		$this->entity->title = 'testing';
+		$this->entity->description = 'ElggObject';
+		$this->entity->var1 = "test";
+		$this->entity->var2 = 1;
+		$this->entity->var3 = true;
+		$this->entity->save();
+
+		// add tag array
+		$tag_string = 'tag1, tag2, tag3';
+		$tagarray = string_to_tag_array($tag_string);
+		$this->entity->tags = $tagarray;
+
+		// a cloned ElggEntity has the guid reset
+		$object = clone $this->entity;
+		$this->assertIdentical(0, (int)$object->guid);
+
+		// make sure attributes were copied over
+		$this->assertIdentical($object->title, 'testing');
+		$this->assertIdentical($object->description, 'ElggObject');
+
+		$guid = $object->save();
+		$this->assertTrue($guid !== 0);
+		$this->assertTrue($guid !== $this->entity->guid);
+
+		// test that metadata was transfered
+		$this->assertIdentical($this->entity->var1, $object->var1);
+		$this->assertIdentical($this->entity->var2, $object->var2);
+		$this->assertIdentical($this->entity->var3, $object->var3);
+		$this->assertIdentical($this->entity->tags, $object->tags);
+
+		// clean up
+		$object->delete();
+		$this->entity->delete();
+	}
+
+	public function testElggObjectContainer() {
+		$this->assertEqual($this->entity->getContainerGUID(), elgg_get_logged_in_user_guid());
+
+		// create and save to group
+		$group = new ElggGroup();
+		$guid = $group->save();
+		$this->assertTrue($this->entity->setContainerGUID($guid));
+
+		// check container
+		$this->assertEqual($this->entity->getContainerGUID(), $guid);
+		$this->assertIdentical($group, $this->entity->getContainerEntity());
+
+		// clean up
+		$group->delete();
+	}
+
+	public function testElggObjectExportables() {
+		$exportables = array(
+			'guid',
+			'type',
+			'subtype',
+			'time_created',
+			'time_updated',
+			'container_guid',
+			'owner_guid',
+			'site_guid',
+			'title',
+			'description'
+		);
+
+		$this->assertIdentical($exportables, $this->entity->getExportableValues());
+	}
+
+	public function xtestElggObjectAccessOverrides() {
+		// set entity to private access with no owner.
+		$entity = $this->entity;
+		$entity->access_id = ACCESS_PRIVATE;
+		$entity->owner_guid = 0;
+		$this->assertTrue($entity->save());
+		$guid = $entity->getGUID();
+
+		var_dump($guid);
+		// try to grab entity
+		$entity = false;
+		$entity = get_entity($guid);
+		var_dump($entity);
+		$this->assertFalse($entity);
+
+		$old = elgg_set_ignore_access(true);
+	}
+
+	// see https://github.com/elgg/elgg/issues/1196
+	public function testElggEntityRecursiveDisableWhenLoggedOut() {
+		$e1 = new ElggObject();
+		$e1->access_id = ACCESS_PUBLIC;
+		$e1->owner_guid = 0;
+		$e1->container_guid = 0;
+		$e1->save();
+		$guid1 = $e1->getGUID();
+
+		$e2 = new ElggObject();
+		$e2->container_guid = $guid1;
+		$e2->access_id = ACCESS_PUBLIC;
+		$e2->owner_guid = 0;
+		$e2->save();
+		$guid2 = $e2->getGUID();
+
+		// fake being logged out
+		$user = $_SESSION['user'];
+		unset($_SESSION['user']);
+		$ia = elgg_set_ignore_access(true);
+
+		$this->assertTrue(disable_entity($guid1, null, true));
+
+		// "log in" original user
+		$_SESSION['user'] = $user;
+		elgg_set_ignore_access($ia);
+
+		$this->assertFalse(get_entity($guid1));
+		$this->assertFalse(get_entity($guid2));
+
+		$db_prefix = get_config('dbprefix');
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $guid1";
+		$r = get_data_row($q);
+		$this->assertEqual('no', $r->enabled);
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $guid2";
+		$r = get_data_row($q);
+		$this->assertEqual('no', $r->enabled);
+
+		access_show_hidden_entities(true);
+		delete_entity($guid1);
+		delete_entity($guid2);
+		access_show_hidden_entities(false);
+	}
+
+	public function testElggRecursiveDelete() {
+		$types = array('ElggGroup', 'ElggObject', 'ElggUser', 'ElggSite');
+		$db_prefix = elgg_get_config('dbprefix');
+
+		foreach ($types as $type) {
+			$parent = new $type();
+			$this->assertTrue($parent->save());
+			
+			$child = new ElggObject();
+			$child->container_guid = $parent->guid;
+			$this->assertTrue($child->save());
+
+			$grandchild = new ElggObject();
+			$grandchild->container_guid = $child->guid;
+			$this->assertTrue($grandchild->save());
+
+			$this->assertTrue($parent->delete(true));
+
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $parent->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
+
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $child->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
+
+			$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $grandchild->guid";
+			$r = get_data($q);
+			$this->assertFalse($r);
+		}
+
+		// object that owns itself
+		// can't check container_guid because of infinite loops in can_edit_entity()
+		$obj = new ElggObject();
+		$obj->save();
+		$obj->owner_guid = $obj->guid;
+		$obj->save();
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $obj->guid";
+		$r = get_data_row($q);
+		$this->assertEqual($obj->guid, $r->owner_guid);
+
+		$this->assertTrue($obj->delete(true));
+
+		$q = "SELECT * FROM {$db_prefix}entities WHERE guid = $obj->guid";
+		$r = get_data_row($q);
+		$this->assertFalse($r);
+	}
+
+	protected function get_object_row($guid) {
+		global $CONFIG;
+		return get_data_row("SELECT * FROM {$CONFIG->dbprefix}objects_entity WHERE guid='$guid'");
+	}
+
+	protected function get_entity_row($guid) {
+		global $CONFIG;
+		return get_data_row("SELECT * FROM {$CONFIG->dbprefix}entities WHERE guid='$guid'");
+	}
+}
+
+class ElggObjectTest extends ElggObject {
+	public function expose_attributes() {
+		return $this->attributes;
+	}
+}
diff --git a/engine/tests/objects/sites.php b/engine/tests/objects/sites.php
new file mode 100644
index 000000000..a01a661e3
--- /dev/null
+++ b/engine/tests/objects/sites.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Elgg Test ElggSite
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreSiteTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->site = new ElggSiteTest();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		$this->swallowErrors();
+		unset($this->site);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		parent::__destruct();
+	}
+
+	public function testElggSiteConstructor() {
+		$attributes = array();
+		$attributes['guid'] = NULL;
+		$attributes['type'] = 'site';
+		$attributes['subtype'] = NULL;
+		$attributes['owner_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['container_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['site_guid'] = NULL;
+		$attributes['access_id'] = ACCESS_PRIVATE;
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
+		$attributes['enabled'] = 'yes';
+		$attributes['tables_split'] = 2;
+		$attributes['tables_loaded'] = 0;
+		$attributes['name'] = NULL;
+		$attributes['description'] = NULL;
+		$attributes['url'] = NULL;
+		ksort($attributes);
+
+		$entity_attributes = $this->site->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
+	}
+
+	public function testElggSiteSaveAndDelete() {
+		$guid = $this->site->save();
+		$this->assertIsA($guid, 'int');
+		$this->assertTrue($guid > 0);
+		$this->assertIdentical(true, $this->site->delete());
+	}
+}
+
+class ElggSiteTest extends ElggSite {
+	public function expose_attributes() {
+		return $this->attributes;
+	}
+}
diff --git a/engine/tests/objects/users.php b/engine/tests/objects/users.php
new file mode 100644
index 000000000..8a1033ac4
--- /dev/null
+++ b/engine/tests/objects/users.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * Elgg Test ElggUser
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreUserTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+
+		// all code should come after here
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+		$this->user = new ElggUserTest();
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+
+		unset($this->user);
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all code should go above here
+		parent::__destruct();
+	}
+
+	public function testElggUserConstructor() {
+		$attributes = array();
+		$attributes['guid'] = NULL;
+		$attributes['type'] = 'user';
+		$attributes['subtype'] = NULL;
+		$attributes['owner_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['container_guid'] = elgg_get_logged_in_user_guid();
+		$attributes['site_guid'] = NULL;
+		$attributes['access_id'] = ACCESS_PRIVATE;
+		$attributes['time_created'] = NULL;
+		$attributes['time_updated'] = NULL;
+		$attributes['last_action'] = NULL;
+		$attributes['enabled'] = 'yes';
+		$attributes['tables_split'] = 2;
+		$attributes['tables_loaded'] = 0;
+		$attributes['name'] = NULL;
+		$attributes['username'] = NULL;
+		$attributes['password'] = NULL;
+		$attributes['salt'] = NULL;
+		$attributes['email'] = NULL;
+		$attributes['language'] = NULL;
+		$attributes['code'] = NULL;
+		$attributes['banned'] = 'no';
+		$attributes['admin'] = 'no';
+		$attributes['prev_last_action'] = NULL;
+		$attributes['last_login'] = NULL;
+		$attributes['prev_last_login'] = NULL;
+		ksort($attributes);
+
+		$entity_attributes = $this->user->expose_attributes();
+		ksort($entity_attributes);
+
+		$this->assertIdentical($entity_attributes, $attributes);
+	}
+
+	public function testElggUserLoad() {
+		// new object
+		$object = new ElggObject();
+		$this->AssertEqual($object->getGUID(), 0);
+		$guid = $object->save();
+		$this->AssertNotEqual($guid, 0);
+
+		// fail on wrong type
+		try {
+			$error = new ElggUserTest($guid);
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidClassException');
+			$message = sprintf(elgg_echo('InvalidClassException:NotValidElggStar'), $guid, 'ElggUser');
+			$this->assertIdentical($e->getMessage(), $message);
+		}
+
+		// clean up
+		$object->delete();
+	}
+
+	public function testElggUserConstructorByGuid() {
+		$user = new ElggUser(elgg_get_logged_in_user_guid());
+		$this->assertIdentical($user, $_SESSION['user']);
+
+		// fail with garbage
+		try {
+			$error = new ElggUserTest(array('invalid'));
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$message = sprintf(elgg_echo('InvalidParameterException:UnrecognisedValue'));
+			$this->assertIdentical($e->getMessage(), $message);
+		}
+	}
+
+	public function testElggUserConstructorByDbRow() {
+		$row = $this->fetchUser(elgg_get_logged_in_user_guid());
+		$user = new ElggUser($row);
+		$this->assertIdentical($user, $_SESSION['user']);
+	}
+
+	public function testElggUserConstructorByUsername() {
+		$row = $this->fetchUser(elgg_get_logged_in_user_guid());
+		$user = new ElggUser($row->username);
+		$this->assertIdentical($user, $_SESSION['user']);
+	}
+
+	public function testElggUserSave() {
+		// new object
+		$this->AssertEqual($this->user->getGUID(), 0);
+		$guid = $this->user->save();
+		$this->AssertNotEqual($guid, 0);
+
+		// clean up
+		$this->user->delete();
+	}
+
+	public function testElggUserDelete() {
+		$guid = $this->user->save();
+
+		// delete object
+		$this->assertIdentical(true, $this->user->delete());
+
+		// check GUID not in database
+		$this->assertFalse($this->fetchUser($guid));
+	}
+
+	public function testElggUserNameCache() {
+		// issue https://github.com/elgg/elgg/issues/1305
+
+		// very unlikely a user would have this username
+		$name = (string)time();
+		$this->user->username = $name;
+
+		$guid = $this->user->save();
+
+		$user = get_user_by_username($name);
+		$user->delete();
+		$user = get_user_by_username($name);
+		$this->assertFalse($user);
+	}
+
+	public function testGetUserByUsernameAcceptsUrlEncoded() {
+		$username = (string)time();
+		$this->user->username = $username;
+		$guid = $this->user->save();
+
+		// percent encode first letter
+		$first_letter = $username[0];
+		$first_letter = str_pad('%' . dechex(ord($first_letter)), 2, '0', STR_PAD_LEFT);
+		$username =   $first_letter . substr($username, 1);
+
+		$user = get_user_by_username($username);
+		$this->assertTrue((bool) $user);
+		$this->assertEqual($guid, $user->guid);
+
+		$this->user->delete();
+	}
+
+	public function testElggUserMakeAdmin() {
+		global $CONFIG;
+
+		// need to save user to have a guid
+		$guid = $this->user->save();
+
+		$this->assertTrue($this->user->makeAdmin());
+
+		$q = "SELECT admin FROM {$CONFIG->dbprefix}users_entity WHERE guid = $guid";
+		$r = mysql_query($q);
+
+		$admin = mysql_fetch_assoc($r);
+		$this->assertEqual($admin['admin'], 'yes');
+
+		$this->user->delete();
+	}
+
+	public function testElggUserRemoveAdmin() {
+		global $CONFIG;
+
+		// need to save user to have a guid
+		$guid = $this->user->save();
+
+		$this->assertTrue($this->user->removeAdmin());
+
+		$q = "SELECT admin FROM {$CONFIG->dbprefix}users_entity WHERE guid = $guid";
+		$r = mysql_query($q);
+
+		$admin = mysql_fetch_assoc($r);
+		$this->assertEqual($admin['admin'], 'no');
+
+		$this->user->delete();
+	}
+
+	public function testElggUserIsAdmin() {
+		// need to grab a real user with a guid and everything.
+		$guid = $this->user->save();
+
+		$this->assertTrue($this->user->makeAdmin());
+
+		// this is testing the function, not the SQL.
+		// that's been tested above.
+		$this->assertTrue($this->user->isAdmin());
+
+		$this->user->delete();
+	}
+
+	public function testElggUserIsNotAdmin() {
+		// need to grab a real user with a guid and everything.
+		$guid = $this->user->save();
+
+		$this->assertTrue($this->user->removeAdmin());
+
+		// this is testing the function, not the SQL.
+		// that's been tested above.
+		$this->assertFalse($this->user->isAdmin());
+
+		$this->user->delete();
+	}
+
+	protected function fetchUser($guid) {
+		global $CONFIG;
+
+		return get_data_row("SELECT * FROM {$CONFIG->dbprefix}users_entity WHERE guid = '$guid'");
+	}
+}
+
+class ElggUserTest extends ElggUser {
+	public function expose_attributes() {
+		return $this->attributes;
+	}
+}
diff --git a/engine/tests/regression/trac_bugs.php b/engine/tests/regression/trac_bugs.php
new file mode 100644
index 000000000..689275661
--- /dev/null
+++ b/engine/tests/regression/trac_bugs.php
@@ -0,0 +1,405 @@
+<?php
+/**
+ * Elgg Regression Tests -- GitHub Bugfixes
+ * Any bugfixes from GitHub that require testing belong here.
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreRegressionBugsTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		$this->ia = elgg_set_ignore_access(TRUE);
+		parent::__construct();
+
+		// all __construct() code should come after here
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		elgg_set_ignore_access($this->ia);
+		// all __destruct() code should go above here
+		parent::__destruct();
+	}
+
+	/**
+	 * #1558
+	 */
+	public function testElggObjectDeleteAnnotations() {
+		$this->entity = new ElggObject();
+		$guid = $this->entity->save();
+
+		$this->entity->annotate('test', 'hello', ACCESS_PUBLIC);
+
+		$this->entity->deleteAnnotations('does not exist');
+
+		$num = $this->entity->countAnnotations('test');
+
+		//$this->assertIdentical($num, 1);
+		$this->assertEqual($num, 1);
+
+		// clean up
+		$this->entity->delete();
+	}
+
+	/**
+	 * #2063 - get_resized_image_from_existing_file() fails asked for image larger than selection and not scaling an image up
+	 * Test get_image_resize_parameters().
+	 */
+	public function testElggResizeImage() {
+		$orig_width = 100;
+		$orig_height = 150;
+
+		// test against selection > max
+		$options = array(
+			'maxwidth' => 50,
+			'maxheight' => 50,
+			'square' => TRUE,
+			'upscale' => FALSE,
+
+			'x1' => 25,
+			'y1' => 75,
+			'x2' => 100,
+			'y2' => 150
+		);
+
+		// should get back the same x/y offset == x1, y1 and an image of 50x50
+		$params = get_image_resize_parameters($orig_width, $orig_height, $options);
+
+		$this->assertEqual($params['newwidth'], $options['maxwidth']);
+		$this->assertEqual($params['newheight'], $options['maxheight']);
+		$this->assertEqual($params['xoffset'], $options['x1']);
+		$this->assertEqual($params['yoffset'], $options['y1']);
+
+		// test against selection < max
+		$options = array(
+			'maxwidth' => 50,
+			'maxheight' => 50,
+			'square' => TRUE,
+			'upscale' => FALSE,
+
+			'x1' => 75,
+			'y1' => 125,
+			'x2' => 100,
+			'y2' => 150
+		);
+		
+		// should get back the same x/y offset == x1, y1 and an image of 25x25 because no upscale
+		$params = get_image_resize_parameters($orig_width, $orig_height, $options);
+
+		$this->assertEqual($params['newwidth'], 25);
+		$this->assertEqual($params['newheight'], 25);
+		$this->assertEqual($params['xoffset'], $options['x1']);
+		$this->assertEqual($params['yoffset'], $options['y1']);
+	}
+
+	// #3722 Check canEdit() works for contains regardless of groups
+	function test_can_write_to_container() {
+		$user = new ElggUser();
+		$user->username = 'test_user_' . rand();
+		$user->name = 'test_user_name_' . rand();
+		$user->email = 'test@user.net';
+		$user->container_guid = 0;
+		$user->owner_guid = 0;
+		$user->save();
+
+		$object = new ElggObject();
+		$object->save();
+
+		$group = new ElggGroup();
+		$group->save();
+		
+		// disable access overrides because we're admin.
+		$ia = elgg_set_ignore_access(false);
+
+		$this->assertFalse(can_write_to_container($user->guid, $object->guid));
+		
+		global $elgg_test_user;
+		$elgg_test_user = $user;
+
+		// register hook to allow access
+		function can_write_to_container_test_hook($hook, $type, $value, $params) {
+			global $elgg_test_user;
+
+			if ($params['user']->getGUID() == $elgg_test_user->getGUID()) {
+				return true;
+			}
+		}
+		
+		elgg_register_plugin_hook_handler('container_permissions_check', 'all', 'can_write_to_container_test_hook');
+		$this->assertTrue(can_write_to_container($user->guid, $object->guid));
+		elgg_unregister_plugin_hook_handler('container_permissions_check', 'all', 'can_write_to_container_test_hook');
+
+		$this->assertFalse(can_write_to_container($user->guid, $group->guid));
+		$group->join($user);
+		$this->assertTrue(can_write_to_container($user->guid, $group->guid));
+
+		elgg_set_ignore_access($ia);
+
+		$user->delete();
+		$object->delete();
+		$group->delete();
+	}
+
+	function test_db_shutdown_links() {
+		global $DB_DELAYED_QUERIES, $test_results;
+		$DB_DELAYED_QUERIES = array();
+
+		function test_delayed_results($results) {
+			global $test_results;
+			$test_results = $results;
+		}
+
+		$q = 'SELECT 1 as test';
+
+		$links = array('read', 'write', get_db_link('read'), get_db_link('write'));
+
+		foreach ($links as $link) {
+			$DB_DELAYED_QUERIES = array();
+
+			$result = execute_delayed_query($q, $link, 'test_delayed_results');
+
+			$this->assertTrue($result, "Failed with link = $link");
+			$this->assertEqual(count($DB_DELAYED_QUERIES), 1);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['q'], $q);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['l'], $link);
+			$this->assertEqual($DB_DELAYED_QUERIES[0]['h'], 'test_delayed_results');
+
+			db_delayedexecution_shutdown_hook();
+
+			$num_rows = mysql_num_rows($test_results);
+			$this->assertEqual($num_rows, 1);
+			$row = mysql_fetch_assoc($test_results);
+			$this->assertEqual($row['test'], 1);
+		}
+
+		// test bad case
+		$DB_DELAYED_QUERIES = array();
+		$result = execute_delayed_query($q, 'not_a_link', 'test_delayed_results');
+		$this->assertFalse($result);
+		$this->assertEqual(array(), $DB_DELAYED_QUERIES);
+	}
+
+	/**
+	 * https://github.com/elgg/elgg/issues/3210 - Don't remove -s in friendly titles
+	 * https://github.com/elgg/elgg/issues/2276 - improve char encoding
+	 */
+	public function test_friendly_title() {
+		$cases = array(
+			// acid test
+			"B&N > Amazon, OK? <bold> 'hey!' $34"
+			=> "bn-amazon-ok-bold-hey-34",
+
+			// hyphen, underscore and ASCII whitespace replaced by separator,
+			// other non-alphanumeric ASCII removed
+			"a-a_a a\na\ra\ta\va!a\"a#a\$a%aa'a(a)a*a+a,a.a/a:a;a=a?a@a[a\\a]a^a`a{a|a}a~a"
+			=> "a-a-a-a-a-a-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
+			
+			// separators trimmed
+			"-_ hello _-"
+			=> "hello",
+
+			// accents removed, lower case, other multibyte chars are URL encoded
+			"I\xC3\xB1t\xC3\xABrn\xC3\xA2ti\xC3\xB4n\xC3\xA0liz\xC3\xA6ti\xC3\xB8n, AND \xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E"
+				// Iñtërnâtiônàlizætiøn, AND 日本語
+			=> 'internationalizaetion-and-%E6%97%A5%E6%9C%AC%E8%AA%9E',
+		);
+
+		// where available, string is converted to NFC before transliteration
+		if (ElggTranslit::hasNormalizerSupport()) {
+			$form_d = "A\xCC\x8A"; // A followed by 'COMBINING RING ABOVE' (U+030A)
+			$cases[$form_d] = "a";
+		}
+
+		foreach ($cases as $case => $expected) {
+			$friendly_title = elgg_get_friendly_title($case);
+			$this->assertIdentical($expected, $friendly_title);
+		}
+	}
+
+	/**
+	 * Test #5369 -- parse_urls()
+	 * https://github.com/Elgg/Elgg/issues/5369
+	 */
+	public function test_parse_urls() {
+
+		$cases = array(
+			'no.link.here' =>
+				'no.link.here',
+			'simple link http://example.org test' =>
+				'simple link <a href="http://example.org" rel="nofollow">http:/<wbr />/<wbr />example.org</a> test',
+			'non-ascii http://ñew.org/ test' =>
+				'non-ascii <a href="http://ñew.org/" rel="nofollow">http:/<wbr />/<wbr />ñew.org/<wbr /></a> test',
+
+			// section 2.1
+			'percent encoded http://example.org/a%20b test' =>
+				'percent encoded <a href="http://example.org/a%20b" rel="nofollow">http:/<wbr />/<wbr />example.org/<wbr />a%20b</a> test',
+			// section 2.2: skipping single quote and parenthese
+			'reserved characters http://example.org/:/?#[]@!$&*+,;= test' =>
+				'reserved characters <a href="http://example.org/:/?#[]@!$&*+,;=" rel="nofollow">http:/<wbr />/<wbr />example.org/<wbr />:/<wbr />?#[]@!$&*+,;=</a> test',
+			// section 2.3
+			'unreserved characters http://example.org/a1-._~ test' =>
+				'unreserved characters <a href="http://example.org/a1-._~" rel="nofollow">http:/<wbr />/<wbr />example.org/<wbr />a1-._~</a> test',
+
+			'parameters http://example.org/?val[]=1&val[]=2 test' =>
+				'parameters <a href="http://example.org/?val[]=1&val[]=2" rel="nofollow">http:/<wbr />/<wbr />example.org/<wbr />?val[]=1&val[]=2</a> test',
+			'port http://example.org:80/ test' =>
+				'port <a href="http://example.org:80/" rel="nofollow">http:/<wbr />/<wbr />example.org:80/<wbr /></a> test',
+
+			'parentheses (http://www.google.com) test' =>
+				'parentheses (<a href="http://www.google.com" rel="nofollow">http:/<wbr />/<wbr />www.google.com</a>) test',
+			'comma http://elgg.org, test' =>
+				'comma <a href="http://elgg.org" rel="nofollow">http:/<wbr />/<wbr />elgg.org</a>, test',
+			'period http://elgg.org. test' =>
+				'period <a href="http://elgg.org" rel="nofollow">http:/<wbr />/<wbr />elgg.org</a>. test',
+			'exclamation http://elgg.org! test' =>
+				'exclamation <a href="http://elgg.org" rel="nofollow">http:/<wbr />/<wbr />elgg.org</a>! test',
+
+			'already anchor <a href="http://twitter.com/">twitter</a> test' =>
+				'already anchor <a href="http://twitter.com/">twitter</a> test',
+
+			'ssl https://example.org/ test' =>
+				'ssl <a href="https://example.org/" rel="nofollow">https:/<wbr />/<wbr />example.org/<wbr /></a> test',
+			'ftp ftp://example.org/ test' =>
+				'ftp <a href="ftp://example.org/" rel="nofollow">ftp:/<wbr />/<wbr />example.org/<wbr /></a> test',
+
+			'web archive anchor <a href="http://web.archive.org/web/20000229040250/http://www.google.com/">google</a>' =>
+				'web archive anchor <a href="http://web.archive.org/web/20000229040250/http://www.google.com/">google</a>',
+
+			'single quotes already anchor <a href=\'http://www.yahoo.com\'>yahoo</a>' =>
+				'single quotes already anchor <a href=\'http://www.yahoo.com\'>yahoo</a>',
+
+			'unquoted already anchor <a href=http://www.yahoo.com>yahoo</a>' =>
+				'unquoted already anchor <a href=http://www.yahoo.com>yahoo</a>',
+
+			'parens in uri http://thedailywtf.com/Articles/A-(Long-Overdue)-BuildMaster-Introduction.aspx' =>
+				'parens in uri <a href="http://thedailywtf.com/Articles/A-(Long-Overdue)-BuildMaster-Introduction.aspx" rel="nofollow">http:/<wbr />/<wbr />thedailywtf.com/<wbr />Articles/<wbr />A-(Long-Overdue)-BuildMaster-Introduction.aspx</a>'
+		);
+		foreach ($cases as $input => $output) {
+			$this->assertEqual($output, parse_urls($input));
+		}
+	}
+	
+	/**
+	 * Ensure additional select columns do not end up in entity attributes.
+	 *
+	 * https://github.com/Elgg/Elgg/issues/5538
+	 */
+	public function test_extra_columns_dont_appear_in_attributes() {
+		global $ENTITY_CACHE;
+
+		// may not have groups in DB - let's create one
+		$group = new ElggGroup();
+		$group->name = 'test_group';
+		$group->access_id = ACCESS_PUBLIC;
+		$this->assertTrue($group->save() !== false);
+		
+		// entity cache interferes with our test
+		$ENTITY_CACHE = array();
+		
+		foreach (array('site', 'user', 'group', 'object') as $type) {
+			$entities = elgg_get_entities(array(
+				'type' => $type,
+				'selects' => array('1 as _nonexistent_test_column'),
+				'limit' => 1,
+			));
+			if (!$this->assertTrue($entities, "Query for '$type' did not return an entity.")) {
+				continue;
+			}
+			$entity = $entities[0];
+			$this->assertNull($entity->_nonexistent_test_column, "Additional select columns are leaking to attributes for '$type'");
+		}
+		
+		$group->delete();
+	}
+
+	/**
+	 * Ensure that ElggBatch doesn't go into infinite loop when disabling annotations recursively when show hidden is enabled.
+	 *
+	 * https://github.com/Elgg/Elgg/issues/5952
+	 */
+	public function test_disabling_annotations_infinite_loop() {
+
+		//let's have some entity
+		$group = new ElggGroup();
+		$group->name = 'test_group';
+		$group->access_id = ACCESS_PUBLIC;
+		$this->assertTrue($group->save() !== false);
+
+		$total = 51;
+		//add some annotations
+		for ($cnt = 0; $cnt < $total; $cnt++) {
+			$group->annotate('test_annotation', 'value_' . $total);
+		}
+
+		//disable them
+		$show_hidden = access_get_show_hidden_status();
+		access_show_hidden_entities(true);
+		$options = array(
+			'guid' => $group->guid,
+			'limit' => $total, //using strict limit to avoid real infinite loop and just see ElggBatch limiting on it before finishing the work
+		);
+		elgg_disable_annotations($options);
+		access_show_hidden_entities($show_hidden);
+
+		//confirm all being disabled
+		$annotations = $group->getAnnotations(array(
+			'limit' => $total,
+		));
+		foreach ($annotations as $annotation) {
+			$this->assertTrue($annotation->enabled == 'no');
+		}
+
+		//delete group and annotations
+		$group->delete();
+	}
+
+	public function test_ElggXMLElement_does_not_load_external_entities() {
+		$elLast = libxml_disable_entity_loader(false);
+
+		// build payload that should trigger loading of external entity
+		$payload = file_get_contents(dirname(dirname(__FILE__)) . '/test_files/xxe/request.xml');
+		$path = realpath(dirname(dirname(__FILE__)) . '/test_files/xxe/external_entity.txt');
+		$path = str_replace('\\', '/', $path);
+		if ($path[0] != '/') {
+			$path = '/' . $path;
+		}
+		$path = 'file://' . $path;
+		$payload = sprintf($payload, $path);
+
+		// make sure we can actually this in this environment
+		$element = new SimpleXMLElement($payload);
+		$can_load_entity = preg_match('/secret/', (string)$element->methodName);
+
+		$this->skipUnless($can_load_entity, "XXE vulnerability cannot be tested on this system");
+
+		if ($can_load_entity) {
+			$el = new ElggXMLElement($payload);
+			$chidren = $el->getChildren();
+			$content = $chidren[0]->getContent();
+			$this->assertNoPattern('/secret/', $content);
+		}
+
+		libxml_disable_entity_loader($elLast);
+	}
+}
diff --git a/engine/tests/services/api.php b/engine/tests/services/api.php
new file mode 100644
index 000000000..3d07c0bbb
--- /dev/null
+++ b/engine/tests/services/api.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Elgg Test Services - General API and REST
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreServicesApiTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		global $API_METHODS;
+		$this->swallowErrors();
+		$API_METHODS = array();
+	}
+	
+// expose_function
+	public function testExposeFunctionNoMethod() {
+		try {
+			@expose_function();
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('InvalidParameterException:APIMethodOrFunctionNotSet'));
+		}
+	}
+	
+	public function testExposeFunctionNoFunction() {
+		try {
+			@expose_function('test');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('InvalidParameterException:APIMethodOrFunctionNotSet'));
+		}
+	}
+	
+	public function testExposeFunctionBadParameters() {
+		try {
+			@expose_function('test', 'test', 'BAD');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('InvalidParameterException:APIParametersArrayStructure'), 'test'));
+		}
+	}
+	
+	public function testExposeFunctionParametersBadArray() {
+		try {
+			expose_function('test', 'test', array('param1' => 'string'));
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('InvalidParameterException:APIParametersArrayStructure'), 'test'));
+		}
+	}
+	
+	public function testExposeFunctionBadHttpMethod() {
+		try {
+			@expose_function('test', 'test', null, '', 'BAD');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'InvalidParameterException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('InvalidParameterException:UnrecognisedHttpMethod'), 'BAD', 'test'));
+		}
+	}
+	
+	public function testExposeFunctionSuccess() {
+		global $API_METHODS;
+		// this is a general test but also tests specifically for setting 'required' correctly
+		$parameters = array('param1' => array('type' => 'int', 'required' => true), 
+							'param2' => array('type' => 'bool'),
+							'param3' => array('type' => 'string', 'required' => false), );
+		
+		$this->assertTrue(expose_function('test', 'foo', $parameters));
+		
+		$parameters = array('param1' => array('type' => 'int', 'required' => true), 
+							'param2' => array('type' => 'bool', 'required' => true),
+							'param3' => array('type' => 'string', 'required' => false), );
+		$method['description'] = '';
+		$method['function'] = 'foo';
+		$method['parameters'] = $parameters;
+		$method['call_method'] = 'GET'; 
+		$method['require_api_auth'] = false;
+		$method['require_user_auth'] = false;
+
+		$this->assertIdentical($method, $API_METHODS['test']);
+	}
+
+// unexpose_function
+	public function testUnexposeFunction() {
+		global $API_METHODS;
+		
+		$this->registerFunction();
+		
+		unexpose_function('test');
+		$this->assertIdentical(array(), $API_METHODS);
+	} 
+
+// authenticate_method
+	public function testAuthenticateMethodNotImplemented() {
+		try {
+			authenticate_method('BAD');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('APIException:MethodCallNotImplemented'), 'BAD'));
+		}				
+	}
+	
+	public function testAuthenticateMethodApiAuth() {
+		$this->registerFunction(true);
+		try {
+			authenticate_method('test');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('APIException:APIAuthenticationFailed'));
+		}				
+	}
+	
+	public function testAuthenticateMethodUserAuth() {
+		$this->registerFunction(false, true);
+		try {
+			authenticate_method('test');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+		}				
+	}
+	
+	public function testAuthenticateMethod() {
+		$this->registerFunction(false, false);
+		// anonymous with no user authentication
+		$this->assertTrue(authenticate_method('test'));
+	}
+	
+// execute_method
+	public function testExecuteMethodNotImplemented() {
+		try {
+			execute_method('BAD');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('APIException:MethodCallNotImplemented'), 'BAD'));
+		}				
+	}
+
+	public function testExecuteMethodNonCallable() {
+		expose_function('test', 'foo');
+		
+		try {
+			execute_method('test');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('APIException:FunctionDoesNotExist'), 'test'));
+		}				
+	}
+
+	public function testExecuteMethodWrongMethod() {
+		$this->registerFunction();
+		
+		try {
+			// GET when it should be a POST
+			execute_method('test');
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'CallException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('CallException:InvalidCallMethod'), 'test', 'POST'));
+		}						
+	}
+
+// verify parameters
+	public function testVerifyParametersTypeNotSet() {
+		$params = array('param1' => array('required' => true));
+		expose_function('test', 'elgg_echo', $params);
+		
+		try {
+			verify_parameters('test', array());
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('APIException:InvalidParameter'), 'param1', 'test'));
+		}						
+	}
+	
+	public function testVerifyParametersMissing() {
+		$params = array('param1' => array('type' => 'int', 'required' => true));
+		expose_function('test', 'elgg_echo', $params);
+		
+		try {
+			verify_parameters('test', array());
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), sprintf(elgg_echo('APIException:MissingParameterInMethod'), 'param1', 'test'));
+		}						
+	}
+	
+	public function testVerifyParameters() {
+		$this->registerFunction();
+		
+		$parameters = array('param1' => 0);
+		$this->assertTrue(verify_parameters('test', $parameters));
+	}
+	
+	public function testSerialiseParameters() {
+		
+		// int and bool
+		$this->registerFunction();
+		$parameters = array('param1' => 1, 'param2' => 0);
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ',1,false');
+		
+		// string
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => 'testing');
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",'testing'");
+
+		// test string with " in it
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => 'test"ing');
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ',\'test"ing\'');
+		
+		// test string with ' in it
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => 'test\'ing');
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",'test\'ing'");
+		
+		// test string with \ in it
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => 'test\ing');
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",'test\\ing'"); 
+		
+		// test string with \' in it
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => "test\'ing");
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",'test\\\\'ing'"); // test\\'ing
+		
+		// test string reported by twall in #1364
+		$this->registerFunction(false, false, array('param1' => array('type' => 'string')));
+		$parameters = array('param1' => '{"html":"<div><img src=\\"http://foo.com\\"/>Blah Blah</div>"}');
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",'{\"html\":\"<div><img src=\\\"http://foo.com\\\"/>Blah Blah</div>\"}'");
+		
+		// float
+		$this->registerFunction(false, false, array('param1' => array('type' => 'float')));
+		$parameters = array('param1' => 2.5);
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ',2.5');
+
+		// indexed array of strings
+		$this->registerFunction(false, false, array('param1' => array('type' => 'array')));
+		$parameters = array('param1' => array('one', 'two'));
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",array('0'=>'one','1'=>'two')");
+
+		// associative array of strings
+		$this->registerFunction(false, false, array('param1' => array('type' => 'array')));
+		$parameters = array('param1' => array('first' => 'one', 'second' => 'two'));
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",array('first'=>'one','second'=>'two')");
+
+		// indexed array of strings
+		$this->registerFunction(false, false, array('param1' => array('type' => 'array')));
+		$parameters = array('param1' => array(1, 2));
+		$s = serialise_parameters('test', $parameters);
+		$this->assertIdentical($s, ",array('0'=>'1','1'=>'2')");
+
+		// test unknown type
+		$this->registerFunction(false, false, array('param1' => array('type' => 'bad')));
+		$parameters = array('param1' => 'test');
+		$this->expectException('APIException');
+		$s = serialise_parameters('test', $parameters);
+	}
+	
+// api key methods
+	//public function testApiAuthenticate() {
+	//	$this->assertFalse(pam_authenticate(null, "api"));
+	//}
+	
+	public function testApiAuthKeyNoKey() {
+		try {
+			api_auth_key();
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('APIException:MissingAPIKey'));
+		}
+	}
+
+	public function testApiAuthKeyBadKey() {
+		global $CONFIG;
+		
+		$CONFIG->input['api_key'] = 'BAD';
+		try {
+			api_auth_key();
+			$this->assertTrue(FALSE);
+		} catch (Exception $e) {
+			$this->assertIsA($e, 'APIException');
+			$this->assertIdentical($e->getMessage(), elgg_echo('APIException:BadAPIKey'));
+		}
+	}
+	
+	protected function registerFunction($api_auth = false, $user_auth = false, $params = null) {
+		$parameters = array('param1' => array('type' => 'int', 'required' => true),
+							'param2' => array('type' => 'bool', 'required' => false), );
+		
+		if ($params == null) {
+			$params = $parameters;
+		}
+
+		expose_function('test', 'elgg_echo', $params, '', 'POST', $api_auth, $user_auth);
+	}
+	
+}
diff --git a/engine/tests/suite.php b/engine/tests/suite.php
new file mode 100644
index 000000000..4203bc5d6
--- /dev/null
+++ b/engine/tests/suite.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Runs unit tests.
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+
+
+require_once(dirname( __FILE__ ) . '/../start.php');
+
+admin_gatekeeper();
+
+$vendor_path = "$CONFIG->path/vendors/simpletest";
+$test_path = "$CONFIG->path/engine/tests";
+
+require_once("$vendor_path/unit_tester.php");
+require_once("$vendor_path/mock_objects.php");
+require_once("$vendor_path/reporter.php");
+require_once("$test_path/elgg_unit_test.php");
+
+// turn off system log
+elgg_unregister_event_handler('all', 'all', 'system_log_listener');
+elgg_unregister_event_handler('log', 'systemlog', 'system_log_default_logger');
+
+// Disable maximum execution time.
+// Tests take a while...
+set_time_limit(0);
+
+$suite = new TestSuite('Elgg Core Unit Tests');
+
+// emit a hook to pull in all tests
+$test_files = elgg_trigger_plugin_hook('unit_test', 'system', null, array());
+foreach ($test_files as $file) {
+	$suite->addTestFile($file);
+}
+
+// Only run tests in debug mode.
+if (!isset($CONFIG->debug)) {
+	exit ('The site must be in debug mode to run unit tests.');
+}
+
+if (TextReporter::inCli()) {
+	// In CLI error codes are returned: 0 is success
+	elgg_set_ignore_access(TRUE);
+	exit ($suite->Run(new TextReporter()) ? 0 : 1 );
+}
+
+// Ensure that only logged-in users can see this page
+//admin_gatekeeper();
+$old = elgg_set_ignore_access(TRUE);
+$suite->Run(new HtmlReporter('utf-8'));
+elgg_set_ignore_access($old);
diff --git a/engine/tests/test_files/output/autop/block-a.exp.norun.html b/engine/tests/test_files/output/autop/block-a.exp.norun.html
new file mode 100644
index 000000000..addf29dec
--- /dev/null
+++ b/engine/tests/test_files/output/autop/block-a.exp.norun.html
@@ -0,0 +1,6 @@
+
+<p>HTML5 allows A to contain block-level content</p>
+<a href="foo"><h3>A treated as block</h3>
+<p>Read more</p>
+</a>
+<p><a href="foo">A treated as<br />    inline</a></p>
diff --git a/engine/tests/test_files/output/autop/block-a.in.norun.html b/engine/tests/test_files/output/autop/block-a.in.norun.html
new file mode 100644
index 000000000..fc2dac43a
--- /dev/null
+++ b/engine/tests/test_files/output/autop/block-a.in.norun.html
@@ -0,0 +1,9 @@
+HTML5 allows A to contain block-level content
+<a href="foo">
+
+    <h3>A treated as block</h3>
+
+    Read more
+</a>
+<a href="foo">A treated as
+    inline</a>
diff --git a/engine/tests/test_files/output/autop/domdoc_exp.html b/engine/tests/test_files/output/autop/domdoc_exp.html
new file mode 100644
index 000000000..8480c1083
--- /dev/null
+++ b/engine/tests/test_files/output/autop/domdoc_exp.html
@@ -0,0 +1,46 @@
+›
+ 
+Vietnamese - Tiếng Việt
+
+<h1>h1</h1>
+<p>Paragraph <a href="http://google.com/">link</a> <strong>Bold</strong> <em>italic</em> <em><strong>bolditalic</strong></em> <span style="background-color: #ffff00; "></span></p>
+<h2>h2</h2>
+<p>Paragraph <span style="font-size: xx-small;">size1</span> <span style="font-size: x-small;">size2</span> <span style="font-size: medium;">size4</span></p>
+<h3>h3</h3>
+<p>Paragraph <span style="text-decoration: underline;">underline</span> <span style="text-decoration: line-through;">strikethrough</span> <span style="color: #ff0000;">color</span> <span style="background-color: #ffff00; ">background</span></p>
+<blockquote>
+    <p>Blockquoted paragraph</p>
+</blockquote>
+<p>Paragraph following blockquote</p>
+<ul><li>Unordered</li>
+    <li>List</li>
+</ul><p>Paragraph between lists</p>
+<ol><li>Ordered</li>
+    <li>List</li>
+</ol><p>Paragraph between lists</p>
+<ul><li>OL list</li>
+    <li>nested<ol><li>inside a</li>
+            <li>UL list</li>
+        </ol></li>
+</ul><p>Paragraph between lists</p>
+<table border="0"><tbody><tr><td>Table with</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>border=0</td>
+        </tr></tbody></table><p>Paragraph</p>
+<ol><li>UL list</li>
+    <li>nested
+        <ul><li>inside a</li>
+            <li>OL list</li>
+        </ul></li>
+</ol><p>Paragraph between tables</p>
+<table border="1" cellpadding="5"><tbody><tr><td>Table with border=1</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>cellpadding = 5</td>
+        </tr></tbody></table><p>Paragraph between tables</p>
+<table border="2"><tbody><tr><td>Table with</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>border=2</td>
+        </tr></tbody></table>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/domdoc_in.html b/engine/tests/test_files/output/autop/domdoc_in.html
new file mode 100644
index 000000000..4c465b435
--- /dev/null
+++ b/engine/tests/test_files/output/autop/domdoc_in.html
@@ -0,0 +1,80 @@
+&#8250;
+&nbsp;
+Vietnamese - Tiếng Việt
+
+<h1>h1</h1>
+<p>Paragraph <a href="http://google.com/">link</a> <strong>Bold</strong> <em>italic</em> <em><strong>bolditalic</strong></em>&nbsp;<span style="background-color: #ffff00; "></span></p>
+<h2>h2</h2>
+<p>Paragraph <span style="font-size: xx-small;">size1</span> <span style="font-size: x-small;">size2</span> <span style="font-size: medium;">size4</span></p>
+<h3>h3</h3>
+<p>Paragraph <span style="text-decoration: underline;">underline</span> <span style="text-decoration: line-through;">strikethrough</span> <span style="color: #ff0000;">color</span> <span style="background-color: #ffff00; ">background</span></p>
+<blockquote>
+    <p>Blockquoted paragraph</p>
+</blockquote>
+<p>Paragraph following blockquote</p>
+<ul>
+    <li>Unordered</li>
+    <li>List</li>
+</ul>
+<p>Paragraph between lists</p>
+<ol>
+    <li>Ordered</li>
+    <li>List</li>
+</ol>
+<p>Paragraph between lists</p>
+<ul>
+    <li>OL list</li>
+    <li>nested<ol>
+            <li>inside a</li>
+            <li>UL list</li>
+        </ol></li>
+</ul>
+<p>Paragraph between lists</p>
+<table border="0">
+    <tbody>
+        <tr>
+            <td>Table with</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>border=0</td>
+        </tr>
+    </tbody>
+</table>
+<p>Paragraph</p>
+<ol>
+    <li>UL list</li>
+    <li>nested
+        <ul>
+            <li>inside a</li>
+            <li>OL list</li>
+        </ul>
+    </li>
+</ol>
+<p>Paragraph between tables</p>
+<table border="1" cellpadding="5">
+    <tbody>
+        <tr>
+            <td>Table with border=1</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>cellpadding = 5</td>
+        </tr>
+    </tbody>
+</table>
+<p>Paragraph between tables</p>
+<table border="2">
+    <tbody>
+        <tr>
+            <td>Table with</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>border=2</td>
+        </tr>
+    </tbody>
+</table>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/typical-post.exp.html b/engine/tests/test_files/output/autop/typical-post.exp.html
new file mode 100644
index 000000000..f9d75a114
--- /dev/null
+++ b/engine/tests/test_files/output/autop/typical-post.exp.html
@@ -0,0 +1,84 @@
+<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2>
+<p><img class="alignright size-thumbnail wp-image-905" title="Surest Things mixing session in Adobe Audition" src="http://www.mrclay.org/wp-content/uploads/2010/09/surestThings_audition-150x150.png" alt="screenshot of Audition mixing session" width="150" height="150">Vivamus enim ante, <em>mattis eget imperdiet nec, pharetra vel velit.</em> Sed at euismod nibh. Praesent lacus tellus, <a href="http://google.com/">posuere et convallis</a> a, <strong>mollis et tellus. Suspendisse potenti</strong>. Phasellus tincidunt dignissim est eget mattis. Vestibulum lacinia <del>condimentum tellus, non vestibulum erat dapibus</del> quis. Aliquam arcu nibh, viverra adipiscing eleifend quis, pretium vitae ipsum.</p>
+
+<p>Curabitur turpis ante, <span style="color: #993300;">congue ac dapibus quis, vehicula ac orci.</span> Nunc luctus neque non massa porta sed pharetra ante accumsan. <a href="http://google.com/">Nam suscipit</a> risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor.</p>
+<h3>Donec at massa ante, sagittis fermentum urna.</h3><blockquote>
+<p>Mauris volutpat est id massa volutpat lacinia. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In in nisl mauris. In aliquet pretium nisl, vel convallis neque cursus vitae. Curabitur id mauris in urna gravida ornare.</p>
+
+<p>[caption id="attachment_719" align="alignleft" width="150" caption="Ibanez AGB140 Bass"]<img class="size-thumbnail wp-image-719" title="Ibanez AGB140 Bass" src="http://www.mrclay.org/wp-content/uploads/2010/04/agb140-e1271773766573-150x150.jpg" alt="Ibanez AGB140 Bass" width="150" height="150">[/caption]</p>
+
+<p>Aenean <a href="http://google.com/">aliquet cursus purus sed gravida. Cras auctor euismod justo, ac dictum purus facilisis dignissim.</a> Quisque facilisis porta sem, ac suscipit quam molestie nec. Pellentesque quis hendrerit enim. Vivamus tempor erat diam. Sed eu felis nunc. Cras posuere lorem commodo turpis mollis sagittis. Mauris lobortis nunc felis.</p>
+
+<p>Maecenas elit lorem, varius sed condimentum ac, cursus et magna. Nam ut massa id augue consectetur porttitor eleifend in nunc. Curabitur cursus varius dictum. Vestibulum vel justo et neque tempus placerat a vel sapien.</p>
+</blockquote>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim ante, mattis eget imperdiet nec, <a href="http://google.com/">pharetra </a>vel velit. Sed at euismod nibh. Praesent lacus tellus, posuere et convallis a, mollis et tellus.</p>
+<pre><code>&lt;?php
+class DataTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     */
+    public function testAdd($a, $b, $c)
+    {
+        $this-&gt;assertEquals($c, $a + $b);
+    }
+
+    public function provider()
+    {
+        return array(
+          array(0, 0, 0),
+          array(0, 1, 1),
+          array(1, 0, 1),
+          array(1, 1, 3)
+        );
+    }
+}</code></pre><ul><li>Suspendisse potenti. Phasellus tincidunt dignissim est eget mattis.</li>
+	<li>Vestibulum lacinia condimentum tellus, non vestibulum erat dapibus quis.</li>
+	<li>Aliquam arcu nibh, <a href="http://google.com/">viverra</a> adipiscing eleifend quis, pretium vitae ipsum.</li>
+	<li>Curabitur turpis ante, congue ac <a href="http://google.com/">dapibus quis</a>, vehicula ac orci.</li>
+</ul>
+<p>Nunc luctus neque non massa porta sed pharetra ante accumsan. Nam suscipit risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor. Donec at massa ante, sagittis fermentum urna.</p>
+
+<p><object width="480" height="390"><param name="movie" value="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US"><param name="allowFullScreen" value="true"><param name="allowscriptaccess" value="always"><embed type="application/x-shockwave-flash" width="480" height="390" src="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" allowfullscreen="true" allowscriptaccess="always"></embed></object></p>
+<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2>
+<p><img class="alignright size-thumbnail wp-image-905" title="Surest Things mixing session in Adobe Audition" src="http://www.mrclay.org/wp-content/uploads/2010/09/surestThings_audition-150x150.png" alt="screenshot of Audition mixing session" width="150" height="150">Vivamus enim ante, <em>mattis eget imperdiet nec, pharetra vel velit.</em> Sed at euismod nibh. Praesent lacus tellus, <a href="http://google.com/">posuere et convallis</a> a, <strong>mollis et tellus. Suspendisse potenti</strong>. Phasellus tincidunt dignissim est eget mattis. Vestibulum lacinia <del>condimentum tellus, non vestibulum erat dapibus</del> quis. Aliquam arcu nibh, viverra adipiscing eleifend quis, pretium vitae ipsum.</p>
+
+<p>Curabitur turpis ante, <span style="color: #993300;">congue ac dapibus quis, vehicula ac orci.</span> Nunc luctus neque non massa porta sed pharetra ante accumsan. <a href="http://google.com/">Nam suscipit</a> risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor.</p>
+<h3>Donec at massa ante, sagittis fermentum urna.</h3><blockquote>
+<p>Mauris volutpat est id massa volutpat lacinia. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In in nisl mauris. In aliquet pretium nisl, vel convallis neque cursus vitae. Curabitur id mauris in urna gravida ornare.</p>
+
+<p>[caption id="attachment_719" align="alignleft" width="150" caption="Ibanez AGB140 Bass"]<img class="size-thumbnail wp-image-719" title="Ibanez AGB140 Bass" src="http://www.mrclay.org/wp-content/uploads/2010/04/agb140-e1271773766573-150x150.jpg" alt="Ibanez AGB140 Bass" width="150" height="150">[/caption]</p>
+
+<p>Aenean <a href="http://google.com/">aliquet cursus purus sed gravida. Cras auctor euismod justo, ac dictum purus facilisis dignissim.</a> Quisque facilisis porta sem, ac suscipit quam molestie nec. Pellentesque quis hendrerit enim. Vivamus tempor erat diam. Sed eu felis nunc. Cras posuere lorem commodo turpis mollis sagittis. Mauris lobortis nunc felis.</p>
+
+<p>Maecenas elit lorem, varius sed condimentum ac, cursus et magna. Nam ut massa id augue consectetur porttitor eleifend in nunc. Curabitur cursus varius dictum. Vestibulum vel justo et neque tempus placerat a vel sapien.</p>
+</blockquote>
+<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim ante, mattis eget imperdiet nec, <a href="http://google.com/">pharetra </a>vel velit. Sed at euismod nibh. Praesent lacus tellus, posuere et convallis a, mollis et tellus.</p>
+<pre><code>&lt;?php
+class DataTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     */
+    public function testAdd($a, $b, $c)
+    {
+        $this-&gt;assertEquals($c, $a + $b);
+    }
+
+    public function provider()
+    {
+        return array(
+          array(0, 0, 0),
+          array(0, 1, 1),
+          array(1, 0, 1),
+          array(1, 1, 3)
+        );
+    }
+}</code></pre><ul><li>Suspendisse potenti. Phasellus tincidunt dignissim est eget mattis.</li>
+	<li>Vestibulum lacinia condimentum tellus, non vestibulum erat dapibus quis.</li>
+	<li>Aliquam arcu nibh, <a href="http://google.com/">viverra</a> adipiscing eleifend quis, pretium vitae ipsum.</li>
+	<li>Curabitur turpis ante, congue ac <a href="http://google.com/">dapibus quis</a>, vehicula ac orci.</li>
+</ul>
+<p>Nunc luctus neque non massa porta sed pharetra ante accumsan. Nam suscipit risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor. Donec at massa ante, sagittis fermentum urna.</p>
+
+<p><object width="480" height="390"><param name="movie" value="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US"><param name="allowFullScreen" value="true"><param name="allowscriptaccess" value="always"><embed type="application/x-shockwave-flash" width="480" height="390" src="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" allowfullscreen="true" allowscriptaccess="always"></embed></object></p>
diff --git a/engine/tests/test_files/output/autop/typical-post.in.html b/engine/tests/test_files/output/autop/typical-post.in.html
new file mode 100644
index 000000000..6e4984cc4
--- /dev/null
+++ b/engine/tests/test_files/output/autop/typical-post.in.html
@@ -0,0 +1,89 @@
+<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2>
+<img class="alignright size-thumbnail wp-image-905" title="Surest Things mixing session in Adobe Audition" src="http://www.mrclay.org/wp-content/uploads/2010/09/surestThings_audition-150x150.png" alt="screenshot of Audition mixing session" width="150" height="150" />Vivamus enim ante, <em>mattis eget imperdiet nec, pharetra vel velit.</em> Sed at euismod nibh. Praesent lacus tellus, <a href="http://google.com/">posuere et convallis</a> a, <strong>mollis et tellus. Suspendisse potenti</strong>. Phasellus tincidunt dignissim est eget mattis. Vestibulum lacinia <del>condimentum tellus, non vestibulum erat dapibus</del> quis. Aliquam arcu nibh, viverra adipiscing eleifend quis, pretium vitae ipsum.
+
+Curabitur turpis ante, <span style="color: #993300;">congue ac dapibus quis, vehicula ac orci.</span> Nunc luctus neque non massa porta sed pharetra ante accumsan. <a href="http://google.com/">Nam suscipit</a> risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor.
+<h3>Donec at massa ante, sagittis fermentum urna.</h3>
+<blockquote>Mauris volutpat est id massa volutpat lacinia. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In in nisl mauris. In aliquet pretium nisl, vel convallis neque cursus vitae. Curabitur id mauris in urna gravida ornare.
+
+[caption id="attachment_719" align="alignleft" width="150" caption="Ibanez AGB140 Bass"]<img class="size-thumbnail wp-image-719" title="Ibanez AGB140 Bass" src="http://www.mrclay.org/wp-content/uploads/2010/04/agb140-e1271773766573-150x150.jpg" alt="Ibanez AGB140 Bass" width="150" height="150" />[/caption]
+
+Aenean <a href="http://google.com/">aliquet cursus purus sed gravida. Cras auctor euismod justo, ac dictum purus facilisis dignissim.</a> Quisque facilisis porta sem, ac suscipit quam molestie nec. Pellentesque quis hendrerit enim. Vivamus tempor erat diam. Sed eu felis nunc. Cras posuere lorem commodo turpis mollis sagittis. Mauris lobortis nunc felis.
+
+Maecenas elit lorem, varius sed condimentum ac, cursus et magna. Nam ut massa id augue consectetur porttitor eleifend in nunc. Curabitur cursus varius dictum. Vestibulum vel justo et neque tempus placerat a vel sapien.</blockquote>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim ante, mattis eget imperdiet nec, <a href="http://google.com/">pharetra </a>vel velit. Sed at euismod nibh. Praesent lacus tellus, posuere et convallis a, mollis et tellus.
+
+<pre><code>&lt;?php
+class DataTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     */
+    public function testAdd($a, $b, $c)
+    {
+        $this-&gt;assertEquals($c, $a + $b);
+    }
+
+    public function provider()
+    {
+        return array(
+          array(0, 0, 0),
+          array(0, 1, 1),
+          array(1, 0, 1),
+          array(1, 1, 3)
+        );
+    }
+}</code></pre>
+<ul>
+	<li>Suspendisse potenti. Phasellus tincidunt dignissim est eget mattis.</li>
+	<li>Vestibulum lacinia condimentum tellus, non vestibulum erat dapibus quis.</li>
+	<li>Aliquam arcu nibh, <a href="http://google.com/">viverra</a> adipiscing eleifend quis, pretium vitae ipsum.</li>
+	<li>Curabitur turpis ante, congue ac <a href="http://google.com/">dapibus quis</a>, vehicula ac orci.</li>
+</ul>
+Nunc luctus neque non massa porta sed pharetra ante accumsan. Nam suscipit risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor. Donec at massa ante, sagittis fermentum urna.
+
+<object width="480" height="390"><param name="movie" value="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" /><param name="allowFullScreen" value="true" /><param name="allowscriptaccess" value="always" /><embed type="application/x-shockwave-flash" width="480" height="390" src="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" allowfullscreen="true" allowscriptaccess="always"></embed></object>
+
+<h2>Lorem ipsum dolor sit amet, consectetur adipiscing elit.</h2>
+<img class="alignright size-thumbnail wp-image-905" title="Surest Things mixing session in Adobe Audition" src="http://www.mrclay.org/wp-content/uploads/2010/09/surestThings_audition-150x150.png" alt="screenshot of Audition mixing session" width="150" height="150" />Vivamus enim ante, <em>mattis eget imperdiet nec, pharetra vel velit.</em> Sed at euismod nibh. Praesent lacus tellus, <a href="http://google.com/">posuere et convallis</a> a, <strong>mollis et tellus. Suspendisse potenti</strong>. Phasellus tincidunt dignissim est eget mattis. Vestibulum lacinia <del>condimentum tellus, non vestibulum erat dapibus</del> quis. Aliquam arcu nibh, viverra adipiscing eleifend quis, pretium vitae ipsum.
+
+Curabitur turpis ante, <span style="color: #993300;">congue ac dapibus quis, vehicula ac orci.</span> Nunc luctus neque non massa porta sed pharetra ante accumsan. <a href="http://google.com/">Nam suscipit</a> risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor.
+<h3>Donec at massa ante, sagittis fermentum urna.</h3>
+<blockquote>Mauris volutpat est id massa volutpat lacinia. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In in nisl mauris. In aliquet pretium nisl, vel convallis neque cursus vitae. Curabitur id mauris in urna gravida ornare.
+
+[caption id="attachment_719" align="alignleft" width="150" caption="Ibanez AGB140 Bass"]<img class="size-thumbnail wp-image-719" title="Ibanez AGB140 Bass" src="http://www.mrclay.org/wp-content/uploads/2010/04/agb140-e1271773766573-150x150.jpg" alt="Ibanez AGB140 Bass" width="150" height="150" />[/caption]
+
+Aenean <a href="http://google.com/">aliquet cursus purus sed gravida. Cras auctor euismod justo, ac dictum purus facilisis dignissim.</a> Quisque facilisis porta sem, ac suscipit quam molestie nec. Pellentesque quis hendrerit enim. Vivamus tempor erat diam. Sed eu felis nunc. Cras posuere lorem commodo turpis mollis sagittis. Mauris lobortis nunc felis.
+
+Maecenas elit lorem, varius sed condimentum ac, cursus et magna. Nam ut massa id augue consectetur porttitor eleifend in nunc. Curabitur cursus varius dictum. Vestibulum vel justo et neque tempus placerat a vel sapien.</blockquote>
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus enim ante, mattis eget imperdiet nec, <a href="http://google.com/">pharetra </a>vel velit. Sed at euismod nibh. Praesent lacus tellus, posuere et convallis a, mollis et tellus.
+
+<pre><code>&lt;?php
+class DataTest extends PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider provider
+     */
+    public function testAdd($a, $b, $c)
+    {
+        $this-&gt;assertEquals($c, $a + $b);
+    }
+
+    public function provider()
+    {
+        return array(
+          array(0, 0, 0),
+          array(0, 1, 1),
+          array(1, 0, 1),
+          array(1, 1, 3)
+        );
+    }
+}</code></pre>
+<ul>
+	<li>Suspendisse potenti. Phasellus tincidunt dignissim est eget mattis.</li>
+	<li>Vestibulum lacinia condimentum tellus, non vestibulum erat dapibus quis.</li>
+	<li>Aliquam arcu nibh, <a href="http://google.com/">viverra</a> adipiscing eleifend quis, pretium vitae ipsum.</li>
+	<li>Curabitur turpis ante, congue ac <a href="http://google.com/">dapibus quis</a>, vehicula ac orci.</li>
+</ul>
+Nunc luctus neque non massa porta sed pharetra ante accumsan. Nam suscipit risus quis libero convallis viverra. Ut at arcu enim, vel pharetra dolor. Donec at massa ante, sagittis fermentum urna.
+
+<object width="480" height="390"><param name="movie" value="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" /><param name="allowFullScreen" value="true" /><param name="allowscriptaccess" value="always" /><embed type="application/x-shockwave-flash" width="480" height="390" src="http://www.youtube.com/v/zW9YOMaVTFI?fs=1&amp;hl=en_US" allowfullscreen="true" allowscriptaccess="always"></embed></object>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/wp-welcome.exp.html b/engine/tests/test_files/output/autop/wp-welcome.exp.html
new file mode 100644
index 000000000..2f612e3dd
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wp-welcome.exp.html
@@ -0,0 +1,22 @@
+
+<p>Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.</p>
+
+<p>First things first:</p>
+<ul><li><a href="%1%24s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
+</ul>
+<p>As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.<br />When a new version is released, <a href="%2%24s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.<br />Upgrading is a couple of clicks!</p>
+
+<p>Then you can start enjoying the WordPress experience:</p>
+<ul><li>Edit your personal information at <a href="%3%24s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
+    <li>Start publishing at <a href="%4%24s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5%24s" title="Create a new page">Pages &#8250; Add New</a></li>
+    <li>Browse and install plugins at <a href="%6%24s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
+    <li>Browse and install themes at <a href="%7%24s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
+    <li>Modify and prettify your website&#8217;s links at <a href="%8%24s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
+    <li>Import content from another system or WordPress site at <a href="%9%24s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
+    <li>Find answers to your questions at the <a href="%10%24s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
+</ul>
+<p>To keep this post for reference, <a href="%11%24s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.</p>
+
+<p>Thank you for selecting WordPress.  We wish you happy publishing!</p>
+
+<p>PS.  Not yet subscribed for update notifications?  <a href="%1%24s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a></p>
diff --git a/engine/tests/test_files/output/autop/wp-welcome.in.html b/engine/tests/test_files/output/autop/wp-welcome.in.html
new file mode 100644
index 000000000..338ede73f
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wp-welcome.in.html
@@ -0,0 +1,25 @@
+Welcome to WordPress!  This post contains important information.  After you read it, you can make it private to hide it from visitors but still have the information handy for future reference.
+
+First things first:
+<ul>
+    <li><a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Subscribe to the WordPress mailing list for release notifications</a></li>
+</ul>
+As a subscriber, you will receive an email every time an update is available (and only then).  This will make it easier to keep your site up to date, and secure from evildoers.
+When a new version is released, <a href="%2$s" title="If you are already logged in, this will take you directly to the Dashboard">log in to the Dashboard</a> and follow the instructions.
+Upgrading is a couple of clicks!
+
+Then you can start enjoying the WordPress experience:
+<ul>
+    <li>Edit your personal information at <a href="%3$s" title="Edit settings like your password, your display name and your contact information">Users &#8250; Your Profile</a></li>
+    <li>Start publishing at <a href="%4$s" title="Create a new post">Posts &#8250; Add New</a> and at <a href="%5$s" title="Create a new page">Pages &#8250; Add New</a></li>
+    <li>Browse and install plugins at <a href="%6$s" title="Browse and install plugins at the official WordPress repository directly from your Dashboard">Plugins &#8250; Add New</a></li>
+    <li>Browse and install themes at <a href="%7$s" title="Browse and install themes at the official WordPress repository directly from your Dashboard">Appearance &#8250; Add New Themes</a></li>
+    <li>Modify and prettify your website&#8217;s links at <a href="%8$s" title="For example, select a link structure like: http://example.com/1999/12/post-name">Settings &#8250; Permalinks</a></li>
+    <li>Import content from another system or WordPress site at <a href="%9$s" title="WordPress comes with importers for the most common publishing systems">Tools &#8250; Import</a></li>
+    <li>Find answers to your questions at the <a href="%10$s" title="The official WordPress documentation, maintained by the WordPress community">WordPress Codex</a></li>
+</ul>
+To keep this post for reference, <a href="%11$s" title="Click to edit the content and settings of this post">click to edit it</a>, go to the Publish box and change its Visibility from Public to Private.
+
+Thank you for selecting WordPress.  We wish you happy publishing!
+
+PS.  Not yet subscribed for update notifications?  <a href="%1$s" title="Subscribe to the WordPress mailing list for Release Notifications">Do it now!</a>
diff --git a/engine/tests/test_files/output/autop/wpautop-fails.exp.html b/engine/tests/test_files/output/autop/wpautop-fails.exp.html
new file mode 100644
index 000000000..d018db4ff
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wpautop-fails.exp.html
@@ -0,0 +1,31 @@
+
+<p>paragraph</p>
+
+<p>paragraph</p>
+<div class="whatever"><blockquote>
+<p>paragraph</p>
+</blockquote>
+<p>line</p>
+</div>
+<p>paragraph</p>
+<ul><li>line</li>
+<li>paragraph
+
+paragraph</li>
+</ul>
+<p>paragraph<br />line<br />line</p>
+<pre>Honor
+this whitespace
+</pre>
+<p>paragraph</p>
+<style><!--
+Do not alter!
+--></style>
+<p>paragraph <!-- do not alter --></p>
+<dl><dt>term</dt> <dd>paragraph
+
+<a href="xx"> <img src="yy"></a>
+
+paragraph</dd> </dl><div><a href="xx"> <img src="yy"></a></div>
+<p>Hello <a href="link"><br /><br />World</a></p>
+<p id="abc">Paragraph</p><div>Line</div>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/wpautop-fails.in.html b/engine/tests/test_files/output/autop/wpautop-fails.in.html
new file mode 100644
index 000000000..9aa24be59
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wpautop-fails.in.html
@@ -0,0 +1,41 @@
+
+paragraph
+
+paragraph    <div class="whatever"><blockquote>
+    paragraph
+  </blockquote>
+  line
+</div>
+
+paragraph
+<ul>
+<li>line</li>
+<li>paragraph
+
+paragraph</li>
+</ul>
+paragraph
+line<br>    
+  line
+<pre>Honor
+this whitespace
+</pre>
+paragraph
+<style><!--
+Do not alter!
+--></style>
+paragraph <!-- do not alter -->
+<dl> <dt>term</dt> <dd>paragraph
+
+<a href="xx"> <img src="yy" /> </a>
+
+paragraph</dd> </dl>
+<div><a href="xx"> <img src="yy" /> </a></div>
+
+Hello <a href="link">
+
+World</a>
+
+<p id="abc">Paragraph</p>
+
+<div>Line</div>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/wysiwyg-test.exp.html b/engine/tests/test_files/output/autop/wysiwyg-test.exp.html
new file mode 100644
index 000000000..1f23d6154
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wysiwyg-test.exp.html
@@ -0,0 +1,51 @@
+
+<p>&nbps;<br />&#8820;</p>
+<h1>h1</h1>
+<p>Paragraph <a href="http://google.com/">link</a> <strong>Bold</strong> <em>italic</em> <em><strong>bolditalic</strong></em>&nbsp;<span style="background-color: #ffff00; "></span></p>
+<h2>h2</h2>
+<p>Paragraph <span style="font-size: xx-small;">size1</span> <span style="font-size: x-small;">size2</span> <span style="font-size: medium;">size4</span></p>
+<h3>h3</h3>
+<p>Paragraph <span style="text-decoration: underline;">underline</span> <span style="text-decoration: line-through;">strikethrough</span> <span style="color: #ff0000;">color</span> <span style="background-color: #ffff00; ">background</span></p>
+<blockquote>
+<p>Blockquoted paragraph</p>
+</blockquote>
+<p>Paragraph following blockquote</p>
+<ul><li>Unordered</li>
+    <li>List</li>
+</ul>
+<p>Paragraph between lists</p>
+<ol><li>Ordered</li>
+    <li>List</li>
+</ol>
+<p>Paragraph between lists</p>
+<ul><li>OL list</li>
+    <li>nested
+        <ol><li>inside a</li>
+            <li>UL list</li>
+        </ol></li>
+</ul>
+<p>Paragraph between lists</p>
+<table border="0"><tbody><tr></tr><tr><td>Table with</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>border=0</td>
+        </tr></tbody></table>
+<p>Paragraph</p>
+<ol><li>UL list</li>
+    <li>nested
+        <ul><li>inside a</li>
+            <li>OL list</li>
+        </ul></li>
+</ol>
+<p>Paragraph between tables</p>
+<table border="1" cellpadding="5"><tbody><tr><td>Table with border=1</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>cellpadding = 5</td>
+        </tr></tbody></table>
+<p>Paragraph between tables</p>
+<table border="2"><tbody><tr><td>Table with</td>
+            <td></td>
+        </tr><tr><td></td>
+            <td>border=2</td>
+        </tr></tbody></table>
+\ No newline at end of file
diff --git a/engine/tests/test_files/output/autop/wysiwyg-test.in.html b/engine/tests/test_files/output/autop/wysiwyg-test.in.html
new file mode 100644
index 000000000..733b0e2ec
--- /dev/null
+++ b/engine/tests/test_files/output/autop/wysiwyg-test.in.html
@@ -0,0 +1,79 @@
+&nbps;
+&#8820;
+<h1>h1</h1>
+Paragraph <a href="http://google.com/">link</a> <strong>Bold</strong> <em>italic</em> <em><strong>bolditalic</strong></em>&nbsp;<span style="background-color: #ffff00; "></span>
+<h2>h2</h2>
+Paragraph <span style="font-size: xx-small;">size1</span> <span style="font-size: x-small;">size2</span> <span style="font-size: medium;">size4</span>
+<h3>h3</h3>
+Paragraph <span style="text-decoration: underline;">underline</span> <span style="text-decoration: line-through;">strikethrough</span> <span style="color: #ff0000;">color</span> <span style="background-color: #ffff00; ">background</span>
+<blockquote>Blockquoted paragraph</blockquote>
+Paragraph following blockquote
+<ul>
+    <li>Unordered</li>
+    <li>List</li>
+</ul>
+Paragraph between lists
+<ol>
+    <li>Ordered</li>
+    <li>List</li>
+</ol>
+Paragraph between lists
+<ul>
+    <li>OL list</li>
+    <li>nested
+        <ol>
+            <li>inside a</li>
+            <li>UL list</li>
+        </ol></li>
+</ul>
+Paragraph between lists
+<table border="0">
+    <tbody>
+        <tr>
+        </tr>
+        <tr>
+            <td>Table with</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>border=0</td>
+        </tr>
+    </tbody>
+</table>
+Paragraph
+<ol>
+    <li>UL list</li>
+    <li>nested
+        <ul>
+            <li>inside a</li>
+            <li>OL list</li>
+        </ul>
+    </li>
+</ol>
+Paragraph between tables
+<table border="1" cellpadding="5">
+    <tbody>
+        <tr>
+            <td>Table with border=1</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>cellpadding = 5</td>
+        </tr>
+    </tbody>
+</table>
+Paragraph between tables
+<table border="2">
+    <tbody>
+        <tr>
+            <td>Table with</td>
+            <td></td>
+        </tr>
+        <tr>
+            <td></td>
+            <td>border=2</td>
+        </tr>
+    </tbody>
+</table>
+\ No newline at end of file
diff --git a/engine/tests/test_files/plugin_17/manifest.xml b/engine/tests/test_files/plugin_17/manifest.xml
new file mode 100644
index 000000000..706734265
--- /dev/null
+++ b/engine/tests/test_files/plugin_17/manifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest>
+	<field key="author" value="Anyone" />
+	<field key="version" value="1.0" />
+	<field key="description" value="A 1.7-style manifest." />
+	<field key="website" value="http://www.elgg.org/" />
+	<field key="copyright" value="(C) Elgg Foundation 2011" />
+	<field key="license" value="GNU General Public License version 2" />
+	<field key="elgg_version" value="2009030702" />
+</plugin_manifest>
+\ No newline at end of file
diff --git a/engine/tests/test_files/plugin_17/start.php b/engine/tests/test_files/plugin_17/start.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/engine/tests/test_files/plugin_17/start.php
diff --git a/engine/tests/test_files/plugin_18/manifest.xml b/engine/tests/test_files/plugin_18/manifest.xml
new file mode 100644
index 000000000..c8b407511
--- /dev/null
+++ b/engine/tests/test_files/plugin_18/manifest.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Test Manifest</name>
+	<author>Anyone</author>
+	<version>1.0</version>
+	<blurb>A concise description.</blurb>
+	<description>A longer, more interesting description.</description>
+	<website>http://www.elgg.org/</website>
+	<repository>https://github.com/Elgg/Elgg</repository>
+	<bugtracker>https://github.com/elgg/elgg/issues</bugtracker>
+	<donations>http://elgg.org/supporter.php</donations>
+	<copyright>(C) Elgg Foundation 2011</copyright>
+	<license>GNU General Public License version 2</license>
+
+	<requires>
+		<type>elgg_version</type>
+		<version>3009030802</version>
+		<comparison>lt</comparison>
+	</requires>
+
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8-svn</version>
+	</requires>
+
+	<screenshot>
+		<description>Fun things to do 1</description>
+		<path>graphics/plugin_ss1.png</path>
+	</screenshot>
+
+	<screenshot>
+		<description>Fun things to do 2</description>
+		<path>graphics/plugin_ss2.png</path>
+	</screenshot>
+
+	<category>Admin</category>
+
+	<category>ServiceAPI</category>
+
+	<requires>
+		<type>php_extension</type>
+		<name>gd</name>
+	</requires>
+
+	<requires>
+		<type>php_ini</type>
+		<name>short_open_tag</name>
+		<value>off</value>
+	</requires>
+
+	<requires>
+		<type>php_extension</type>
+		<name>made_up</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>fake_plugin</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>profile</name>
+		<version>1.0</version>
+	</requires>
+
+	<requires>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.3</version>
+		<comparison>lt</comparison>
+	</requires>
+
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>profile</plugin>
+	</requires>
+
+	<conflicts>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.0</version>
+	</conflicts>
+
+	<provides>
+		<type>plugin</type>
+		<name>profile_api</name>
+		<version>1.3</version>
+	</provides>
+
+	<provides>
+		<type>php_extension</type>
+		<name>big_math</name>
+		<version>1.0</version>
+	</provides>
+
+	<suggests>
+		<type>plugin</type>
+		<name>facebook_connect</name>
+		<version>1.0</version>
+	</suggests>
+
+	<activate_on_install>true</activate_on_install>
+
+</plugin_manifest>
diff --git a/engine/tests/test_files/plugin_18/start.php b/engine/tests/test_files/plugin_18/start.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/engine/tests/test_files/plugin_18/start.php
diff --git a/engine/tests/test_files/xxe/external_entity.txt b/engine/tests/test_files/xxe/external_entity.txt
new file mode 100644
index 000000000..536aca34d
--- /dev/null
+++ b/engine/tests/test_files/xxe/external_entity.txt
@@ -0,0 +1 @@
+secret
+\ No newline at end of file
diff --git a/engine/tests/test_files/xxe/request.xml b/engine/tests/test_files/xxe/request.xml
new file mode 100644
index 000000000..4390f9db2
--- /dev/null
+++ b/engine/tests/test_files/xxe/request.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0"?>
+<!DOCTYPE foo [
+<!ELEMENT methodName ANY >
+<!ENTITY xxe SYSTEM "%s" >
+]>
+<methodCall>
+    <methodName>test&xxe;test</methodName>
+</methodCall>
diff --git a/engine/tests/test_skeleton.php b/engine/tests/test_skeleton.php
new file mode 100644
index 000000000..5a5de89bb
--- /dev/null
+++ b/engine/tests/test_skeleton.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Elgg Test Skeleton
+ *
+ * Plugin authors: copy this file to your plugin's test directory. Register an Elgg
+ * plugin hook and function similar to:
+ *
+ * elgg_register_plugin_hook_handler('unit_test', 'system', 'my_new_unit_test');
+ *
+ * function my_new_unit_test($hook, $type, $value, $params) {
+ *   $value[] = "path/to/my/unit_test.php";
+ *   return $value;
+ * }
+ *
+ * @package Elgg
+ * @subpackage Test
+ */
+class ElggCoreSkeletonTest extends ElggCoreUnitTest {
+
+	/**
+	 * Called before each test object.
+	 */
+	public function __construct() {
+		parent::__construct();
+		
+		// all __construct() code should come after here
+	}
+
+	/**
+	 * Called before each test method.
+	 */
+	public function setUp() {
+
+	}
+
+	/**
+	 * Called after each test method.
+	 */
+	public function tearDown() {
+		// do not allow SimpleTest to interpret Elgg notices as exceptions
+		$this->swallowErrors();
+	}
+
+	/**
+	 * Called after each test object.
+	 */
+	public function __destruct() {
+		// all __destruct() code should go above here
+		parent::__destruct();
+	}
+
+	public function testFailure() {
+		$this->assertTrue(FALSE);
+	}
+}
diff --git a/gpl-plugins b/gpl-plugins
new file mode 100644
index 000000000..925ca6ec2
--- /dev/null
+++ b/gpl-plugins
@@ -0,0 +1,20 @@
+videolist
+dokuwiki
+friendrequest
+opensearch
+identica
+languages
+registrationterms
+custom_index_widgets
+river_privacy
+habitorio_theme
+lightpics
+colorbox
+event_calendar
+openid_client
+openid_server
+openid_api
+beechat
+simplepie
+profile_widgets
+html5
diff --git a/htaccess_dist b/htaccess_dist
new file mode 100644
index 000000000..44d129475
--- /dev/null
+++ b/htaccess_dist
@@ -0,0 +1,155 @@
+# Elgg htaccess directives
+
+<Files "htaccess_dist">
+	order allow,deny
+	deny from all
+</Files>
+
+# Don't allow listing directories
+Options -Indexes
+
+# Follow symbolic links
+Options +FollowSymLinks
+
+# Default handler
+DirectoryIndex index.php
+
+
+############################
+# BROWSER CACHING
+
+# The expires module controls the Expires and Cache-Control headers. Elgg sets
+# these for dynamically generated files so this is just for static files.
+<IfModule mod_expires.c>
+	ExpiresActive On
+	ExpiresDefault "access plus 1 year"
+</IfModule>
+
+# Conditional requests are controlled through Last-Modified and ETag headers.
+# Elgg sets these on dynamically generated cacheable files so this is just for
+# static files. Note: Apache sends Last-Modified by default on static files so
+# I don't think we need to be sending ETag for these files.
+<FilesMatch "\.(jpg|jpeg|gif|png|mp3|flv|mov|avi|3pg|html|htm|swf|js|css|ico)$">
+	FileETag MTime Size
+</FilesMatch>
+
+
+############################
+# PHP SETTINGS
+<IfModule mod_php5.c>
+	# limit the maximum memory consumed by the php script to 64 MB
+	php_value memory_limit 64M
+	# register_globals is deprecated as of PHP 5.3.0 - disable it for security reasons.
+	php_value register_globals 0
+	# post_max_size is the maximum size of ALL the data that is POST'ed to php at a time (8 MB)
+	php_value post_max_size 8388608
+	# upload_max_filesize is the maximum size of a single uploaded file (5 MB)
+	php_value upload_max_filesize 5242880
+	# on development servers, set to 1 to display errors. Set to 0 on production servers.
+	php_value display_errors 0
+</IfModule>
+
+
+############################
+# COMPRESSION
+
+# Turn on mod_gzip if available
+<IfModule mod_gzip.c>
+	mod_gzip_on yes
+	mod_gzip_dechunk yes
+	mod_gzip_keep_workfiles No
+	mod_gzip_minimum_file_size 1000
+	mod_gzip_maximum_file_size 1000000
+	mod_gzip_maximum_inmem_size 1000000
+	mod_gzip_item_include mime ^text/.*
+	mod_gzip_item_include mime ^application/javascript$
+	mod_gzip_item_include mime ^application/x-javascript$
+	# Exclude old browsers and images since IE has trouble with this
+	mod_gzip_item_exclude reqheader "User-Agent: .*Mozilla/4\..*\["
+	mod_gzip_item_exclude mime ^image/.*
+</IfModule>
+
+## Apache2 deflate support if available
+##
+## Important note: mod_headers is required for correct functioning across proxies.
+##
+<IfModule mod_deflate.c>
+	AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css text/javascript application/javascript application/x-javascript
+	BrowserMatch ^Mozilla/4 gzip-only-text/html
+	BrowserMatch ^Mozilla/4\.[0678] no-gzip
+	BrowserMatch \bMSIE !no-gzip
+
+<IfModule mod_headers.c>
+	Header append Vary User-Agent env=!dont-vary
+</IfModule>
+
+	# The following is to disable compression for actions. The reason being is that these
+	# may offer direct downloads which (since the initial request comes in as text/html and headers
+	# get changed in the script) get double compressed and become unusable when downloaded by IE.
+	SetEnvIfNoCase Request_URI action\/* no-gzip dont-vary
+	SetEnvIfNoCase Request_URI actions\/* no-gzip dont-vary
+
+</IfModule>
+
+
+############################
+# REWRITE RULES
+
+<IfModule mod_rewrite.c>
+
+RewriteEngine on
+
+# If Elgg is in a subdirectory on your site, you might need to add a RewriteBase line
+# containing the path from your site root to elgg's root. e.g. If your site is
+# http://example.com/ and Elgg is in http://example.com/sites/elgg/, you might need
+#
+#RewriteBase /sites/elgg/
+#
+# here, only without the # in front.
+#
+# If you're not running Elgg in a subdirectory on your site, but still getting lots
+# of 404 errors beyond the front page, you could instead try:
+#
+#RewriteBase /
+
+
+# If your users receive the message "Sorry, logging in from a different domain is not permitted"
+# you must make sure your login form is served from the same hostname as your site pages.
+# See http://docs.elgg.org/wiki/Login_token_mismatch_error for more info.
+#
+# If you must add RewriteRules to change hostname, add them directly below (above all the others)
+
+
+# In for backwards compatibility
+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)$ engine/handlers/page_handler.php?handler=$1&%{QUERY_STRING} [L]
+RewriteRule ^pg\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/page_handler.php?handler=$1&page=$2&%{QUERY_STRING} [L]
+RewriteRule ^tag\/(.+)\/?$ engine/handlers/page_handler.php?handler=search&page=$1 [L]
+
+
+RewriteRule ^action\/([A-Za-z0-9\_\-\/]+)$ engine/handlers/action_handler.php?action=$1&%{QUERY_STRING} [L]
+
+RewriteRule ^cache\/(.*)$ engine/handlers/cache_handler.php?request=$1&%{QUERY_STRING} [L]
+
+RewriteRule ^services\/api\/([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/service_handler.php?handler=$1&request=$2&%{QUERY_STRING} [L]
+
+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/?$ engine/handlers/export_handler.php?view=$1&guid=$2 [L]
+RewriteRule ^export\/([A-Za-z]+)\/([0-9]+)\/([A-Za-z]+)\/([A-Za-z0-9\_]+)\/$ engine/handlers/export_handler.php?view=$1&guid=$2&type=$3&idname=$4 [L]
+
+RewriteRule xml-rpc.php engine/handlers/xml-rpc_handler.php [L]
+RewriteRule mt/mt-xmlrpc.cgi engine/handlers/xml-rpc_handler.php [L]
+
+
+# rule for rewrite module test during install - can be removed after installation
+RewriteRule ^rewrite.php$ install.php [L]
+
+# Everything else that isn't a file gets routed through the page handler
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([A-Za-z0-9\_\-]+)$ engine/handlers/page_handler.php?handler=$1 [QSA,L]
+
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^([A-Za-z0-9\_\-]+)\/(.*)$ engine/handlers/page_handler.php?handler=$1&page=$2 [QSA,L]
+
+
+</IfModule>
diff --git a/index.php b/index.php
new file mode 100644
index 000000000..708e38ec9
--- /dev/null
+++ b/index.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Elgg index page for web-based applications
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Start the Elgg engine
+ */
+require_once(dirname(__FILE__) . "/engine/start.php");
+
+elgg_set_context('main');
+
+// allow plugins to override the front page (return true to stop this front page code)
+if (elgg_trigger_plugin_hook('index', 'system', null, FALSE) != FALSE) {
+	exit;
+}
+
+if (elgg_is_logged_in()) {
+	forward('activity');
+}
+
+
+$content = elgg_view_title(elgg_echo('content:latest'));
+$content .= elgg_list_river();
+
+$login_box = elgg_view('core/account/login_box');
+
+$params = array(
+		'content' => $content,
+		'sidebar' => $login_box
+);
+$body = elgg_view_layout('one_sidebar', $params);
+echo elgg_view_page(null, $body);
diff --git a/install.php b/install.php
new file mode 100644
index 000000000..a93298216
--- /dev/null
+++ b/install.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Elgg install script
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// check for PHP 4 before we do anything else
+if (version_compare(PHP_VERSION, '5.0.0', '<')) {
+	echo "Your server's version of PHP (" . PHP_VERSION . ") is too old to run Elgg.\n";
+	exit;
+}
+
+require_once(dirname(__FILE__) . "/install/ElggInstaller.php");
+
+$installer = new ElggInstaller();
+
+$step = get_input('step', 'welcome');
+$installer->run($step);
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
new file mode 100644
index 000000000..78cdde90f
--- /dev/null
+++ b/install/ElggInstaller.php
@@ -0,0 +1,1575 @@
+<?php
+
+/**
+ * Elgg Installer.
+ * Controller for installing Elgg. Supports both web-based on CLI installation.
+ *
+ * This controller steps the user through the install process. The method for
+ * each step handles both the GET and POST requests. There is no XSS/CSRF protection
+ * on the POST processing since the installer is only run once by the administrator.
+ *
+ * The installation process can be resumed by hitting the first page. The installer
+ * will try to figure out where to pick up again.
+ *
+ * All the logic for the installation process is in this class, but it depends on
+ * the core libraries. To do this, we selectively load a subset of the core libraries
+ * for the first few steps and then load the entire engine once the database and
+ * site settings are configured. In addition, this controller does its own session
+ * handling until the database is setup.
+ *
+ * There is an aborted attempt in the code at creating the data directory for
+ * users as a subdirectory of Elgg's root. The idea was to protect this directory
+ * through a .htaccess file. The problem is that a malicious user can upload a
+ * .htaccess of his own that overrides the protection for his user directory. The
+ * best solution is server level configuration that turns off AllowOverride for the
+ * data directory. See ticket #3453 for discussion on this.
+ *
+ * @package    Elgg.Core
+ * @subpackage Installer
+ */
+class ElggInstaller {
+
+	protected $steps = array(
+		'welcome',
+		'requirements',
+		'database',
+		'settings',
+		'admin',
+		'complete',
+		);
+
+	protected $status = array(
+		'config' => FALSE,
+		'database' => FALSE,
+		'settings' => FALSE,
+		'admin' => FALSE,
+	);
+
+	protected $isAction = FALSE;
+
+	protected $autoLogin = TRUE;
+
+	/**
+	 * Constructor bootstraps the Elgg engine
+	 */
+	public function __construct() {
+		// load ElggRewriteTester as we depend on it
+		require_once(dirname(__FILE__) . "/ElggRewriteTester.php");
+
+		$this->isAction = $_SERVER['REQUEST_METHOD'] === 'POST';
+
+		$this->bootstrapConfig();
+
+		$this->bootstrapEngine();
+
+		elgg_set_viewtype('installation');
+
+		set_error_handler('_elgg_php_error_handler');
+		set_exception_handler('_elgg_php_exception_handler');
+
+		register_translations(dirname(__FILE__) . '/languages/', TRUE);
+	}
+
+	/**
+	 * Dispatches a request to one of the step controllers
+	 *
+	 * @param string $step The installation step to run
+	 *
+	 * @return void
+	 */
+	public function run($step) {
+
+		// check if this is a URL rewrite test coming in
+		$this->processRewriteTest();
+
+		if (!in_array($step, $this->getSteps())) {
+			$msg = elgg_echo('InstallationException:UnknownStep', array($step));
+			throw new InstallationException($msg);
+		}
+
+		$this->setInstallStatus();
+
+		$this->checkInstallCompletion($step);
+
+		// check if this is an install being resumed
+		$this->resumeInstall($step);
+
+		$this->finishBootstraping($step);
+
+		$params = $this->getPostVariables();
+		$this->$step($params);
+	}
+
+	/**
+	 * Set the auto login flag
+	 *
+	 * @param bool $flag Auto login
+	 *
+	 * @return void
+	 */
+	public function setAutoLogin(bool $flag) {
+		$this->autoLogin = $value;
+	}
+
+	/**
+	 * A batch install of Elgg
+	 *
+	 * All required parameters must be passed in as an associative array. See
+	 * $requiredParams for a list of them. This creates the necessary files,
+	 * loads the database, configures the site settings, and creates the admin
+	 * account. If it fails, an exception is thrown. It does not check any of
+	 * the requirements as the multiple step web installer does.
+	 *
+	 * If the settings.php file exists, it will use that rather than the parameters
+	 * passed to this function.
+	 *
+	 * @param array $params         Array of key value pairs
+	 * @param bool  $createHtaccess Should .htaccess be created
+	 *
+	 * @return void
+	 * @throws InstallationException
+	 */
+	public function batchInstall(array $params, $createHtaccess = FALSE) {
+		global $CONFIG;
+
+		restore_error_handler();
+		restore_exception_handler();
+
+		$defaults = array(
+			'dbhost' => 'localhost',
+			'dbprefix' => 'elgg_',
+			'path' => $CONFIG->path,
+			'language' => 'en',
+			'siteaccess' => ACCESS_PUBLIC,
+		);
+		$params = array_merge($defaults, $params);
+
+		$requiredParams = array(
+			'dbuser',
+			'dbpassword',
+			'dbname',
+			'sitename',
+			'wwwroot',
+			'dataroot',
+			'displayname',
+			'email',
+			'username',
+			'password',
+		);
+		foreach ($requiredParams as $key) {
+			if (empty($params[$key])) {
+				$msg = elgg_echo('install:error:requiredfield', array($key));
+				throw new InstallationException($msg);
+			}
+		}
+
+		// password is passed in once
+		$params['password1'] = $params['password2'] = $params['password'];
+
+		if ($createHtaccess) {
+			$rewriteTester = new ElggRewriteTester();
+			if (!$rewriteTester->createHtaccess($CONFIG->path)) {
+				throw new InstallationException(elgg_echo('install:error:htaccess'));
+			}
+		}
+
+		$this->setInstallStatus();
+
+		if (!$this->status['config']) {
+			if (!$this->createSettingsFile($params)) {
+				throw new InstallationException(elgg_echo('install:error:settings'));
+			}
+		}
+
+		if (!$this->connectToDatabase()) {
+			throw new InstallationException(elgg_echo('install:error:databasesettings'));
+		}
+
+		if (!$this->status['database']) {
+			if (!$this->installDatabase()) {
+				throw new InstallationException(elgg_echo('install:error:cannotloadtables'));
+			}
+		}
+
+		// load remaining core libraries
+		$this->finishBootstraping('settings');
+
+		if (!$this->saveSiteSettings($params)) {
+			throw new InstallationException(elgg_echo('install:error:savesitesettings'));
+		}
+
+		if (!$this->createAdminAccount($params)) {
+			throw new InstallationException(elgg_echo('install:admin:cannot_create'));
+		}
+	}
+
+	/**
+	 * Renders the data passed by a controller
+	 *
+	 * @param string $step The current step
+	 * @param array  $vars Array of vars to pass to the view
+	 *
+	 * @return void
+	 */
+	protected function render($step, $vars = array()) {
+
+		$vars['next_step'] = $this->getNextStep($step);
+
+		$title = elgg_echo("install:$step");
+		$body = elgg_view("install/pages/$step", $vars);
+		echo elgg_view_page(
+				$title,
+				$body,
+				'default',
+				array(
+					'step' => $step,
+					'steps' => $this->getSteps(),
+					)
+				);
+		exit;
+	}
+
+	/**
+	 * Step controllers
+	 */
+
+	/**
+	 * Welcome controller
+	 *
+	 * @param array $vars Not used
+	 *
+	 * @return void
+	 */
+	protected function welcome($vars) {
+		$this->render('welcome');
+	}
+
+	/**
+	 * Requirements controller
+	 *
+	 * Checks version of php, libraries, permissions, and rewrite rules
+	 *
+	 * @param array $vars Vars
+	 *
+	 * @return void
+	 */
+	protected function requirements($vars) {
+
+		$report = array();
+
+		// check PHP parameters and libraries
+		$this->checkPHP($report);
+
+		// check URL rewriting
+		$this->checkRewriteRules($report);
+
+		// check for existence of settings file
+		if ($this->checkSettingsFile($report) != TRUE) {
+			// no file, so check permissions on engine directory
+			$this->checkEngineDir($report);
+		}
+
+		// check the database later
+		$report['database'] = array(array(
+			'severity' => 'info',
+			'message' => elgg_echo('install:check:database')
+		));
+
+		// any failures?
+		$numFailures = $this->countNumConditions($report, 'failure');
+
+		// any warnings
+		$numWarnings = $this->countNumConditions($report, 'warning');
+
+
+		$params = array(
+			'report' => $report,
+			'num_failures' => $numFailures,
+			'num_warnings' => $numWarnings,
+		);
+
+		$this->render('requirements', $params);
+	}
+
+	/**
+	 * Database set up controller
+	 *
+	 * Creates the settings.php file and creates the database tables
+	 *
+	 * @param array $submissionVars Submitted form variables
+	 *
+	 * @return void
+	 */
+	protected function database($submissionVars) {
+
+		$formVars = array(
+			'dbuser' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'dbpassword' => array(
+				'type' => 'password',
+				'value' => '',
+				'required' => FALSE,
+				),
+			'dbname' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'dbhost' => array(
+				'type' => 'text',
+				'value' => 'localhost',
+				'required' => TRUE,
+				),
+			'dbprefix' => array(
+				'type' => 'text',
+				'value' => 'elgg_',
+				'required' => TRUE,
+				),
+		);
+
+		if ($this->checkSettingsFile()) {
+			// user manually created settings file so we fake out action test
+			$this->isAction = TRUE;
+		}
+
+		if ($this->isAction) {
+			do {
+				// only create settings file if it doesn't exist
+				if (!$this->checkSettingsFile()) {
+					if (!$this->validateDatabaseVars($submissionVars, $formVars)) {
+						// error so we break out of action and serve same page
+						break;
+					}
+
+					if (!$this->createSettingsFile($submissionVars)) {
+						break;
+					}
+				}
+
+				// check db version and connect
+				if (!$this->connectToDatabase()) {
+					break;
+				}
+
+				if (!$this->installDatabase()) {
+					break;
+				}
+
+				system_message(elgg_echo('install:success:database'));
+
+				$this->continueToNextStep('database');
+			} while (FALSE);  // PHP doesn't support breaking out of if statements
+		}
+
+		$formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+		$params = array('variables' => $formVars,);
+
+		if ($this->checkSettingsFile()) {
+			// settings file exists and we're here so failed to create database
+			$params['failure'] = TRUE;
+		}
+
+		$this->render('database', $params);
+	}
+
+	/**
+	 * Site settings controller
+	 *
+	 * Sets the site name, URL, data directory, etc.
+	 *
+	 * @param array $submissionVars Submitted vars
+	 *
+	 * @return void
+	 */
+	protected function settings($submissionVars) {
+		global $CONFIG;
+
+		$formVars = array(
+			'sitename' => array(
+				'type' => 'text',
+				'value' => 'My New Community',
+				'required' => TRUE,
+				),
+			'siteemail' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => FALSE,
+				),
+			'wwwroot' => array(
+				'type' => 'text',
+				'value' => elgg_get_site_url(),
+				'required' => TRUE,
+				),
+			'path' => array(
+				'type' => 'text',
+				'value' => $CONFIG->path,
+				'required' => TRUE,
+				),
+			'dataroot' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'siteaccess' => array(
+				'type' => 'access',
+				'value' =>  ACCESS_PUBLIC,
+				'required' => TRUE,
+				),
+		);
+
+		// if Apache, we give user option of having Elgg create data directory
+		//if (ElggRewriteTester::guessWebServer() == 'apache') {
+		//	$formVars['dataroot']['type'] = 'combo';
+		//	$CONFIG->translations['en']['install:settings:help:dataroot'] =
+		//			$CONFIG->translations['en']['install:settings:help:dataroot:apache'];
+		//}
+
+		if ($this->isAction) {
+			do {
+				//if (!$this->createDataDirectory($submissionVars, $formVars)) {
+				//	break;
+				//}
+
+				if (!$this->validateSettingsVars($submissionVars, $formVars)) {
+					break;
+				}
+
+				if (!$this->saveSiteSettings($submissionVars)) {
+					break;
+				}
+
+				system_message(elgg_echo('install:success:settings'));
+
+				$this->continueToNextStep('settings');
+
+			} while (FALSE);  // PHP doesn't support breaking out of if statements
+		}
+
+		$formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+		$this->render('settings', array('variables' => $formVars));
+	}
+
+	/**
+	 * Admin account controller
+	 *
+	 * Creates an admin user account
+	 *
+	 * @param array $submissionVars Submitted vars
+	 *
+	 * @return void
+	 */
+	protected function admin($submissionVars) {
+		$formVars = array(
+			'displayname' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'email' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'username' => array(
+				'type' => 'text',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'password1' => array(
+				'type' => 'password',
+				'value' => '',
+				'required' => TRUE,
+				),
+			'password2' => array(
+				'type' => 'password',
+				'value' => '',
+				'required' => TRUE,
+				),
+		);
+		
+		if ($this->isAction) {
+			do {
+				if (!$this->validateAdminVars($submissionVars, $formVars)) {
+					break;
+				}
+
+				if (!$this->createAdminAccount($submissionVars, $this->autoLogin)) {
+					break;
+				}
+
+				system_message(elgg_echo('install:success:admin'));
+
+				$this->continueToNextStep('admin');
+
+			} while (FALSE);  // PHP doesn't support breaking out of if statements
+		}
+
+		// bit of a hack to get the password help to show right number of characters
+		global $CONFIG;
+		$lang = get_current_language();
+		$CONFIG->translations[$lang]['install:admin:help:password1'] =
+				sprintf($CONFIG->translations[$lang]['install:admin:help:password1'],
+				$CONFIG->min_password_length);
+
+		$formVars = $this->makeFormSticky($formVars, $submissionVars);
+
+		$this->render('admin', array('variables' => $formVars));
+	}
+
+	/**
+	 * Controller for last step
+	 *
+	 * @return void
+	 */
+	protected function complete() {
+
+		$params = array();
+		if ($this->autoLogin) {
+			$params['destination'] = 'admin';
+		} else {
+			$params['destination'] = 'index.php';
+		}
+
+		$this->render('complete', $params);
+	}
+
+	/**
+	 * Step management
+	 */
+
+	/**
+	 * Get an array of steps
+	 *
+	 * @return array
+	 */
+	protected function getSteps() {
+		return $this->steps;
+	}
+
+	/**
+	 * Forwards the browser to the next step
+	 *
+	 * @param string $currentStep Current installation step
+	 *
+	 * @return void
+	 */
+	protected function continueToNextStep($currentStep) {
+		$this->isAction = FALSE;
+		forward($this->getNextStepUrl($currentStep));
+	}
+
+	/**
+	 * Get the next step as a string
+	 *
+	 * @param string $currentStep Current installation step
+	 *
+	 * @return string
+	 */
+	protected function getNextStep($currentStep) {
+		$index = 1 + array_search($currentStep, $this->steps);
+		if (isset($this->steps[$index])) {
+			return $this->steps[$index];
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * Get the URL of the next step
+	 *
+	 * @param string $currentStep Current installation step
+	 *
+	 * @return string
+	 */
+	protected function getNextStepUrl($currentStep) {
+		global $CONFIG;
+		$nextStep = $this->getNextStep($currentStep);
+		return elgg_get_site_url() . "install.php?step=$nextStep";
+	}
+
+	/**
+	 * Check the different install steps for completion
+	 *
+	 * @return void
+	 */
+	protected function setInstallStatus() {
+		global $CONFIG;
+
+		if (!is_readable("{$CONFIG->path}engine/settings.php")) {
+			return;
+		}
+
+		$this->loadSettingsFile();
+
+		$this->status['config'] = TRUE;
+
+		// must be able to connect to database to jump install steps
+		$dbSettingsPass = $this->checkDatabaseSettings(
+				$CONFIG->dbuser,
+				$CONFIG->dbpass,
+				$CONFIG->dbname,
+				$CONFIG->dbhost
+				);
+		if ($dbSettingsPass == FALSE) {
+			return;
+		}
+
+		if (!include_once("{$CONFIG->path}engine/lib/database.php")) {
+			$msg = elgg_echo('InstallationException:MissingLibrary', array('database.php'));
+			throw new InstallationException($msg);
+		}
+
+		// check that the config table has been created
+		$query = "show tables";
+		$result = get_data($query);
+		if ($result) {
+			foreach ($result as $table) {
+				$table = (array) $table;
+				if (in_array("{$CONFIG->dbprefix}config", $table)) {
+					$this->status['database'] = TRUE;
+				}
+			}
+			if ($this->status['database'] == FALSE) {
+				return;
+			}
+		} else {
+			// no tables
+			return;
+		}
+
+		// check that the config table has entries
+		$query = "SELECT COUNT(*) AS total FROM {$CONFIG->dbprefix}config";
+		$result = get_data($query);
+		if ($result && $result[0]->total > 0) {
+			$this->status['settings'] = TRUE;
+		} else {
+			return;
+		}
+
+		// check that the users entity table has an entry
+		$query = "SELECT COUNT(*) AS total FROM {$CONFIG->dbprefix}users_entity";
+		$result = get_data($query);
+		if ($result && $result[0]->total > 0) {
+			$this->status['admin'] = TRUE;
+		} else {
+			return;
+		}
+	}
+
+	/**
+	 * Security check to ensure the installer cannot be run after installation
+	 * has finished. If this is detected, the viewer is sent to the front page.
+	 *
+	 * @param string $step Installation step to check against
+	 *
+	 * @return void
+	 */
+	protected function checkInstallCompletion($step) {
+		if ($step != 'complete') {
+			if (!in_array(FALSE, $this->status)) {
+				// install complete but someone is trying to view an install page
+				forward();
+			}
+		}
+	}
+
+	/**
+	 * Check if this is a case of a install being resumed and figure
+	 * out where to continue from. Returns the best guess on the step.
+	 *
+	 * @param string $step Installation step to resume from
+	 *
+	 * @return string
+	 */
+	protected function resumeInstall($step) {
+		global $CONFIG;
+
+		// only do a resume from the first step
+		if ($step !== 'welcome') {
+			return;
+		}
+
+		if ($this->status['database'] == FALSE) {
+			return;
+		}
+
+		if ($this->status['settings'] == FALSE) {
+			forward("install.php?step=settings");
+		}
+
+		if ($this->status['admin'] == FALSE) {
+			forward("install.php?step=admin");
+		}
+
+		// everything appears to be set up
+		forward("install.php?step=complete");
+	}
+
+	/**
+	 * Bootstraping
+	 */
+
+	/**
+	 * Load the essential libraries of the engine
+	 *
+	 * @return void
+	 */
+	protected function bootstrapEngine() {
+		global $CONFIG;
+
+		$lib_dir = $CONFIG->path . 'engine/lib/';
+
+		// bootstrapping with required files in a required order
+		$required_files = array(
+			'elgglib.php', 'views.php', 'access.php', 'system_log.php', 'export.php', 
+			'configuration.php', 'sessions.php', 'languages.php', 'pageowner.php',
+			'input.php', 'cache.php', 'output.php',
+		);
+
+		foreach ($required_files as $file) {
+			$path = $lib_dir . $file;
+			if (!include($path)) {
+				echo "Could not load file '$path'. "
+					. 'Please check your Elgg installation for all required files.';
+				exit;
+			}
+		}
+	}
+
+	/**
+	 * Load remaining engine libraries and complete bootstraping (see start.php)
+	 *
+	 * @param string $step Which step to boot strap for. Required because
+	 *                     boot strapping is different until the DB is populated.
+	 *
+	 * @return void
+	 */
+	protected function finishBootstraping($step) {
+
+		$dbIndex = array_search('database', $this->getSteps());
+		$settingsIndex = array_search('settings', $this->getSteps());
+		$adminIndex = array_search('admin', $this->getSteps());
+		$completeIndex = array_search('complete', $this->getSteps());
+		$stepIndex = array_search($step, $this->getSteps());
+
+		// To log in the user, we need to use the Elgg core session handling.
+		// Otherwise, use default php session handling
+		$useElggSession = ($stepIndex == $adminIndex && $this->isAction) ||
+				$stepIndex == $completeIndex;
+		if (!$useElggSession) {
+			session_name('Elgg_install');
+			session_start();
+			elgg_unregister_event_handler('boot', 'system', 'session_init');
+		}
+
+		if ($stepIndex > $dbIndex) {
+			// once the database has been created, load rest of engine
+			global $CONFIG;
+			$lib_dir = $CONFIG->path . 'engine/lib/';
+
+			$this->loadSettingsFile();
+
+			$lib_files = array(
+				// these want to be loaded first apparently?
+				'database.php', 'actions.php',
+
+				'admin.php', 'annotations.php',
+				'calendar.php', 'cron.php', 'entities.php',
+				'extender.php', 'filestore.php', 'group.php',
+				'location.php', 'mb_wrapper.php',
+				'memcache.php', 'metadata.php', 'metastrings.php',
+				'navigation.php', 'notification.php',
+				'objects.php', 'opendd.php', 'pagehandler.php',
+				'pam.php', 'plugins.php',
+				'private_settings.php', 'relationships.php', 'river.php',
+				'sites.php', 'statistics.php', 'tags.php', 'user_settings.php',
+				'users.php', 'upgrade.php', 'web_services.php',
+				'widgets.php', 'xml.php', 'xml-rpc.php',
+				'deprecated-1.7.php', 'deprecated-1.8.php',
+			);
+
+			foreach ($lib_files as $file) {
+				$path = $lib_dir . $file;
+				if (!include_once($path)) {
+					$msg = elgg_echo('InstallationException:MissingLibrary', array($file));
+					throw new InstallationException($msg);
+				}
+			}
+
+			setup_db_connections();
+			register_translations(dirname(dirname(__FILE__)) . "/languages/");
+
+			if ($stepIndex > $settingsIndex) {
+				$CONFIG->site_guid = (int) datalist_get('default_site');
+				$CONFIG->site_id = $CONFIG->site_guid;
+				$CONFIG->site = get_entity($CONFIG->site_guid);
+				$CONFIG->dataroot = datalist_get('dataroot');
+				_elgg_session_boot(NULL, NULL, NULL);
+			}
+
+			elgg_trigger_event('init', 'system');
+		}
+	}
+
+	/**
+	 * Set up configuration variables
+	 *
+	 * @return void
+	 */
+	protected function bootstrapConfig() {
+		global $CONFIG;
+		if (!isset($CONFIG)) {
+			$CONFIG = new stdClass;
+		}
+
+		$CONFIG->wwwroot = $this->getBaseUrl();
+		$CONFIG->url = $CONFIG->wwwroot;
+		$CONFIG->path = dirname(dirname(__FILE__)) . '/';
+		$CONFIG->viewpath =	$CONFIG->path . 'views/';
+		$CONFIG->pluginspath = $CONFIG->path . 'mod/';
+		$CONFIG->context = array();
+		$CONFIG->entity_types = array('group', 'object', 'site', 'user');
+	}
+
+	/**
+	 * Get the best guess at the base URL
+	 *
+	 * @note Cannot use current_page_url() because it depends on $CONFIG->wwwroot
+	 * @todo Should this be a core function?
+	 *
+	 * @return string
+	 */
+	protected function getBaseUrl() {
+		$protocol = 'http';
+		if (!empty($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == "on") {
+			$protocol = 'https';
+		}
+		$port = ':' . $_SERVER["SERVER_PORT"];
+		if ($port == ':80' || $port == ':443') {
+			$port = '';
+		}
+		$uri = $_SERVER['REQUEST_URI'];
+		$cutoff = strpos($uri, 'install.php');
+		$uri = substr($uri, 0, $cutoff);
+
+		$url = "$protocol://{$_SERVER['SERVER_NAME']}$port{$uri}";
+		return $url;
+	}
+
+	/**
+	 * Load settings.php
+	 *
+	 * @return void
+	 * @throws InstallationException
+	 */
+	protected function loadSettingsFile() {
+		global $CONFIG;
+
+		if (!include_once("{$CONFIG->path}engine/settings.php")) {
+			$msg = elgg_echo('InstallationException:CannotLoadSettings');
+			throw new InstallationException($msg);
+		}
+	}
+
+	/**
+	 * Action handling methods
+	 */
+
+	/**
+	 * Return an associative array of post variables
+	 * (could be selective based on expected variables)
+	 *
+	 * Does not filter as person installing the site should not be attempting
+	 * XSS attacks. If filtering is added, it should not be done for passwords.
+	 *
+	 * @return array
+	 */
+	protected function getPostVariables() {
+		$vars = array();
+		foreach ($_POST as $k => $v) {
+			$vars[$k] = $v;
+		}
+		return $vars;
+	}
+
+	/**
+	 * If form is reshown, remember previously submitted variables
+	 *
+	 * @param array $formVars       Vars int he form
+	 * @param array $submissionVars Submitted vars
+	 *
+	 * @return array
+	 */
+	protected function makeFormSticky($formVars, $submissionVars) {
+		foreach ($submissionVars as $field => $value) {
+			$formVars[$field]['value'] = $value;
+		}
+		return $formVars;
+	}
+
+	/**
+	 * Requirement checks support methods
+	 */
+
+	/**
+	 * Check that the engine dir is writable
+	 *
+	 * @param array &$report The requirements report object
+	 *
+	 * @return bool
+	 */
+	protected function checkEngineDir(&$report) {
+		global $CONFIG;
+
+		$writable = is_writable("{$CONFIG->path}engine");
+		if (!$writable) {
+			$report['settings'] = array(
+				array(
+					'severity' => 'failure',
+					'message' => elgg_echo('install:check:enginedir'),
+				)
+			);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Check that the settings file exists
+	 *
+	 * @param array &$report The requirements report array
+	 *
+	 * @return bool
+	 */
+	protected function checkSettingsFile(&$report = array()) {
+		global $CONFIG;
+
+		if (!file_exists("{$CONFIG->path}engine/settings.php")) {
+			return FALSE;
+		}
+
+		if (!is_readable("{$CONFIG->path}engine/settings.php")) {
+			$report['settings'] = array(
+				array(
+					'severity' => 'failure',
+					'message' => elgg_echo('install:check:readsettings'),
+				)
+			);
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Check version of PHP, extensions, and variables
+	 *
+	 * @param array &$report The requirements report array
+	 *
+	 * @return void
+	 */
+	protected function checkPHP(&$report) {
+		$phpReport = array();
+
+		$elgg_php_version = '5.2.0';
+		if (version_compare(PHP_VERSION, $elgg_php_version, '<')) {
+			$phpReport[] = array(
+				'severity' => 'failure',
+				'message' => elgg_echo('install:check:php:version', array($elgg_php_version, PHP_VERSION))
+			);
+		}
+
+		$this->checkPhpExtensions($phpReport);
+
+		$this->checkPhpDirectives($phpReport);
+
+		if (count($phpReport) == 0) {
+			$phpReport[] = array(
+				'severity' => 'pass',
+				'message' => elgg_echo('install:check:php:success')
+			);
+		}
+
+		$report['php'] = $phpReport;
+	}
+
+	/**
+	 * Check the server's PHP extensions
+	 *
+	 * @param array &$phpReport The PHP requirements report array
+	 *
+	 * @return void
+	 */
+	protected function checkPhpExtensions(&$phpReport) {
+		$extensions = get_loaded_extensions();
+		$requiredExtensions = array(
+			'mysql',
+			'json',
+			'xml',
+			'gd',
+		);
+		foreach ($requiredExtensions as $extension) {
+			if (!in_array($extension, $extensions)) {
+				$phpReport[] = array(
+					'severity' => 'failure',
+					'message' => elgg_echo('install:check:php:extension', array($extension))
+				);
+			}
+		}
+
+		$recommendedExtensions = array(
+			'mbstring',
+		);
+		foreach ($recommendedExtensions as $extension) {
+			if (!in_array($extension, $extensions)) {
+				$phpReport[] = array(
+					'severity' => 'warning',
+					'message' => elgg_echo('install:check:php:extension:recommend', array($extension))
+				);
+			}
+		}
+	}
+
+	/**
+	 * Check PHP parameters
+	 *
+	 * @param array &$phpReport The PHP requirements report array
+	 *
+	 * @return void
+	 */
+	protected function checkPhpDirectives(&$phpReport) {
+		if (ini_get('open_basedir')) {
+			$phpReport[] = array(
+				'severity' => 'warning',
+				'message' => elgg_echo("install:check:php:open_basedir")
+			);
+		}
+
+		if (ini_get('safe_mode')) {
+			$phpReport[] = array(
+				'severity' => 'warning',
+				'message' => elgg_echo("install:check:php:safe_mode")
+			);
+		}
+
+		if (ini_get('arg_separator.output') !== '&') {
+			$separator = htmlspecialchars(ini_get('arg_separator.output'));
+			$msg = elgg_echo("install:check:php:arg_separator", array($separator));
+			$phpReport[] = array(
+				'severity' => 'failure',
+				'message' => $msg,
+			);
+		}
+
+		if (ini_get('register_globals')) {
+			$phpReport[] = array(
+				'severity' => 'failure',
+				'message' => elgg_echo("install:check:php:register_globals")
+			);
+		}
+
+		if (ini_get('session.auto_start')) {
+			$phpReport[] = array(
+				'severity' => 'failure',
+				'message' => elgg_echo("install:check:php:session.auto_start")
+			);
+		}
+	}
+
+	/**
+	 * Confirm that the rewrite rules are firing
+	 *
+	 * @param array &$report The requirements report array
+	 *
+	 * @return void
+	 */
+	protected function checkRewriteRules(&$report) {
+		global $CONFIG;
+
+		$tester = new ElggRewriteTester();
+		$url = elgg_get_site_url() . "rewrite.php";
+		$report['rewrite'] = array($tester->run($url, $CONFIG->path));
+	}
+
+	/**
+	 * Check if the request is coming from the URL rewrite test on the
+	 * requirements page.
+	 *
+	 * @return void
+	 */
+	protected function processRewriteTest() {
+		if (strpos($_SERVER['REQUEST_URI'], 'rewrite.php') !== FALSE) {
+			echo 'success';
+			exit;
+		}
+	}
+
+	/**
+	 * Count the number of failures in the requirements report
+	 *
+	 * @param array  $report    The requirements report array
+	 * @param string $condition 'failure' or 'warning'
+	 *
+	 * @return int
+	 */
+	protected function countNumConditions($report, $condition) {
+		$count = 0;
+		foreach ($report as $category => $checks) {
+			foreach ($checks as $check) {
+				if ($check['severity'] === $condition) {
+					$count++;
+				}
+			}
+		}
+
+		return $count;
+	}
+
+
+	/**
+	 * Database support methods
+	 */
+
+	/**
+	 * Validate the variables for the database step
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param array $formVars       Vars in the form
+	 *
+	 * @return bool
+	 */
+	protected function validateDatabaseVars($submissionVars, $formVars) {
+
+		foreach ($formVars as $field => $info) {
+			if ($info['required'] == TRUE && !$submissionVars[$field]) {
+				$name = elgg_echo("install:database:label:$field");
+				register_error(elgg_echo('install:error:requiredfield', array($name)));
+				return FALSE;
+			}
+		}
+
+		// according to postgres documentation: SQL identifiers and key words must
+		// begin with a letter (a-z, but also letters with diacritical marks and
+		// non-Latin letters) or an underscore (_). Subsequent characters in an
+		// identifier or key word can be letters, underscores, digits (0-9), or dollar signs ($).
+		// Refs #4994
+		if (!preg_match("/^[a-zA-Z_][\w]*$/", $submissionVars['dbprefix'])) {
+			register_error(elgg_echo('install:error:database_prefix'));
+			return FALSE;
+		}
+
+		return $this->checkDatabaseSettings(
+					$submissionVars['dbuser'],
+					$submissionVars['dbpassword'],
+					$submissionVars['dbname'],
+					$submissionVars['dbhost']
+				);
+	}
+
+	/**
+	 * Confirm the settings for the database
+	 *
+	 * @param string $user     Username
+	 * @param string $password Password
+	 * @param string $dbname   Database name
+	 * @param string $host     Host
+	 *
+	 * @return bool
+	 */
+	protected function checkDatabaseSettings($user, $password, $dbname, $host) {
+		$mysql_dblink = mysql_connect($host, $user, $password, true);
+		if ($mysql_dblink == FALSE) {
+			register_error(elgg_echo('install:error:databasesettings'));
+			return $FALSE;
+		}
+
+		$result = mysql_select_db($dbname, $mysql_dblink);
+
+		// check MySQL version - must be 5.0 or >
+		$required_version = 5.0;
+		$version = mysql_get_server_info();
+		$points = explode('.', $version);
+		if ($points[0] < $required_version) {
+			register_error(elgg_echo('install:error:oldmysql', array($version)));
+			return FALSE;
+		}
+
+		mysql_close($mysql_dblink);
+
+		if (!$result) {
+			register_error(elgg_echo('install:error:nodatabase', array($dbname)));
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Writes the settings file to the engine directory
+	 *
+	 * @param array $params Array of inputted params from the user
+	 *
+	 * @return bool
+	 */
+	protected function createSettingsFile($params) {
+		global $CONFIG;
+
+		$templateFile = "{$CONFIG->path}engine/settings.example.php";
+		$template = file_get_contents($templateFile);
+		if (!$template) {
+			register_error(elgg_echo('install:error:readsettingsphp'));
+			return FALSE;
+		}
+
+		foreach ($params as $k => $v) {
+			$template = str_replace("{{" . $k . "}}", $v, $template);
+		}
+
+		$settingsFilename = "{$CONFIG->path}engine/settings.php";
+		$result = file_put_contents($settingsFilename, $template);
+		if (!$result) {
+			register_error(elgg_echo('install:error:writesettingphp'));
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Bootstrap database connection before entire engine is available
+	 *
+	 * @return bool
+	 */
+	protected function connectToDatabase() {
+		global $CONFIG;
+
+		if (!include_once("{$CONFIG->path}engine/settings.php")) {
+			register_error(elgg_echo('InstallationException:CannotLoadSettings'));
+			return FALSE;
+		}
+
+		if (!include_once("{$CONFIG->path}engine/lib/database.php")) {
+			$msg = elgg_echo('InstallationException:MissingLibrary', array('database.php'));
+			register_error($msg);
+			return FALSE;
+		}
+
+		try  {
+			setup_db_connections();
+		} catch (Exception $e) {
+			register_error($e->getMessage());
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Create the database tables
+	 *
+	 * @return bool
+	 */
+	protected function installDatabase() {
+		global $CONFIG;
+
+		try {
+			run_sql_script("{$CONFIG->path}engine/schema/mysql.sql");
+		} catch (Exception $e) {
+			$msg = $e->getMessage();
+			if (strpos($msg, 'already exists')) {
+				$msg = elgg_echo('install:error:tables_exist');
+			}
+			register_error($msg);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Site settings support methods
+	 */
+
+	/**
+	 * Create the data directory if requested
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param array $formVars       Variables in the form
+	 * @return bool
+	 */
+	protected function createDataDirectory(&$submissionVars, $formVars) {
+		// did the user have option of Elgg creating the data directory
+		if ($formVars['dataroot']['type'] != 'combo') {
+			return TRUE;
+		}
+
+		// did the user select the option
+		if ($submissionVars['dataroot'] != 'dataroot-checkbox') {
+			return TRUE;
+		}
+
+		$dir = sanitise_filepath($submissionVars['path']) . 'data';
+		if (file_exists($dir) || mkdir($dir, 0700)) {
+			$submissionVars['dataroot'] = $dir;
+			if (!file_exists("$dir/.htaccess")) {
+				$htaccess = "Order Deny,Allow\nDeny from All\n";
+				if (!file_put_contents("$dir/.htaccess", $htaccess)) {
+					return FALSE;
+				}
+			}
+			return TRUE;
+		}
+
+		return FALSE;
+	}
+
+	/**
+	 * Validate the site settings form variables
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param array $formVars       Vars in the form
+	 *
+	 * @return bool
+	 */
+	protected function validateSettingsVars($submissionVars, $formVars) {
+		global $CONFIG;
+
+		foreach ($formVars as $field => $info) {
+			$submissionVars[$field] = trim($submissionVars[$field]);
+			if ($info['required'] == TRUE && $submissionVars[$field] === '') {
+				$name = elgg_echo("install:settings:label:$field");
+				register_error(elgg_echo('install:error:requiredfield', array($name)));
+				return FALSE;
+			}
+		}
+
+		// check that data root is absolute path
+		if (stripos(PHP_OS, 'win') === 0) {
+			if (strpos($submissionVars['dataroot'], ':') !== 1) {
+				$msg = elgg_echo('install:error:relative_path', array($submissionVars['dataroot']));
+				register_error($msg);
+				return FALSE;
+			}
+		} else {
+			if (strpos($submissionVars['dataroot'], '/') !== 0) {
+				$msg = elgg_echo('install:error:relative_path', array($submissionVars['dataroot']));
+				register_error($msg);
+				return FALSE;
+			}
+		}
+
+		// check that data root exists
+		if (!file_exists($submissionVars['dataroot'])) {
+			$msg = elgg_echo('install:error:datadirectoryexists', array($submissionVars['dataroot']));
+			register_error($msg);
+			return FALSE;
+		}
+
+		// check that data root is writable
+		if (!is_writable($submissionVars['dataroot'])) {
+			$msg = elgg_echo('install:error:writedatadirectory', array($submissionVars['dataroot']));
+			register_error($msg);
+			return FALSE;
+		}
+
+		if (!isset($CONFIG->data_dir_override) || !$CONFIG->data_dir_override) {
+			// check that data root is not subdirectory of Elgg root
+			if (stripos($submissionVars['dataroot'], $submissionVars['path']) === 0) {
+				$msg = elgg_echo('install:error:locationdatadirectory', array($submissionVars['dataroot']));
+				register_error($msg);
+				return FALSE;
+			}
+		}
+
+		// check that email address is email address
+		if ($submissionVars['siteemail'] && !is_email_address($submissionVars['siteemail'])) {
+			$msg = elgg_echo('install:error:emailaddress', array($submissionVars['siteemail']));
+			register_error($msg);
+			return FALSE;
+		}
+
+		// @todo check that url is a url
+		// @note filter_var cannot be used because it doesn't work on international urls
+
+		return TRUE;
+	}
+
+	/**
+	 * Initialize the site including site entity, plugins, and configuration
+	 *
+	 * @param array $submissionVars Submitted vars
+	 *
+	 * @return bool
+	 */
+	protected function saveSiteSettings($submissionVars) {
+		global $CONFIG;
+
+		// ensure that file path, data path, and www root end in /
+		$submissionVars['path'] = sanitise_filepath($submissionVars['path']);
+		$submissionVars['dataroot'] = sanitise_filepath($submissionVars['dataroot']);
+		$submissionVars['wwwroot'] = sanitise_filepath($submissionVars['wwwroot']);
+
+		$site = new ElggSite();
+		$site->name = strip_tags($submissionVars['sitename']);
+		$site->url = $submissionVars['wwwroot'];
+		$site->access_id = ACCESS_PUBLIC;
+		$site->email = $submissionVars['siteemail'];
+		$guid = $site->save();
+
+		if (!$guid) {
+			register_error(elgg_echo('install:error:createsite'));
+			return FALSE;
+		}
+
+		// bootstrap site info
+		$CONFIG->site_guid = $guid;
+		$CONFIG->site = $site;
+
+		datalist_set('installed', time());
+		datalist_set('path', $submissionVars['path']);
+		datalist_set('dataroot', $submissionVars['dataroot']);
+		datalist_set('default_site', $site->getGUID());
+		datalist_set('version', get_version());
+		datalist_set('simplecache_enabled', 1);
+		datalist_set('system_cache_enabled', 1);
+
+		// new installations have run all the upgrades
+		$upgrades = elgg_get_upgrade_files($submissionVars['path'] . 'engine/lib/upgrades/');
+		datalist_set('processed_upgrades', serialize($upgrades));
+
+		set_config('view', 'default', $site->getGUID());
+		set_config('language', 'en', $site->getGUID());
+		set_config('default_access', $submissionVars['siteaccess'], $site->getGUID());
+		set_config('allow_registration', TRUE, $site->getGUID());
+		set_config('walled_garden', FALSE, $site->getGUID());
+		set_config('allow_user_default_access', '', $site->getGUID());
+
+		$this->enablePlugins();
+
+		return TRUE;
+	}
+
+	/**
+	 * Enable a set of default plugins
+	 *
+	 * @return void
+	 */
+	protected function enablePlugins() {
+		elgg_generate_plugin_entities();
+		$plugins = elgg_get_plugins('any');
+		foreach ($plugins as $plugin) {
+			if ($plugin->getManifest()) {
+				if ($plugin->getManifest()->getActivateOnInstall()) {
+					$plugin->activate();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Admin account support methods
+	 */
+
+	/**
+	 * Validate account form variables
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param array $formVars       Form vars
+	 *
+	 * @return bool
+	 */
+	protected function validateAdminVars($submissionVars, $formVars) {
+
+		foreach ($formVars as $field => $info) {
+			if ($info['required'] == TRUE && !$submissionVars[$field]) {
+				$name = elgg_echo("install:admin:label:$field");
+				register_error(elgg_echo('install:error:requiredfield', array($name)));
+				return FALSE;
+			}
+		}
+
+		if ($submissionVars['password1'] !== $submissionVars['password2']) {
+			register_error(elgg_echo('install:admin:password:mismatch'));
+			return FALSE;
+		}
+
+		if (trim($submissionVars['password1']) == "") {
+			register_error(elgg_echo('install:admin:password:empty'));
+			return FALSE;
+		}
+
+		$minLength = get_config('min_password_length');
+		if (strlen($submissionVars['password1']) < $minLength) {
+			register_error(elgg_echo('install:admin:password:tooshort'));
+			return FALSE;
+		}
+
+		// check that email address is email address
+		if ($submissionVars['email'] && !is_email_address($submissionVars['email'])) {
+			$msg = elgg_echo('install:error:emailaddress', array($submissionVars['email']));
+			register_error($msg);
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Create a user account for the admin
+	 *
+	 * @param array $submissionVars Submitted vars
+	 * @param bool  $login          Login in the admin user?
+	 *
+	 * @return bool
+	 */
+	protected function createAdminAccount($submissionVars, $login = FALSE) {
+		global $CONFIG;
+
+		try {
+			$guid = register_user(
+					$submissionVars['username'],
+					$submissionVars['password1'],
+					$submissionVars['displayname'],
+					$submissionVars['email']
+					);
+		} catch (Exception $e) {
+			register_error($e->getMessage());
+			return false;
+		}
+
+		if (!$guid) {
+			register_error(elgg_echo('install:admin:cannot_create'));
+			return false;
+		}
+
+		$user = get_entity($guid);
+		if (!$user) {
+			register_error(elgg_echo('install:error:loadadmin'));
+			return false;
+		}
+
+		elgg_set_ignore_access(TRUE);
+		if ($user->makeAdmin() == FALSE) {
+			register_error(elgg_echo('install:error:adminaccess'));
+		} else {
+			datalist_set('admin_registered', 1);
+		}
+		elgg_set_ignore_access(false);
+
+		// add validation data to satisfy user validation plugins
+		create_metadata($guid, 'validated', TRUE, '', 0, ACCESS_PUBLIC);
+		create_metadata($guid, 'validated_method', 'admin_user', '', 0, ACCESS_PUBLIC);
+
+		if ($login) {
+			if (login($user) == FALSE) {
+				register_error(elgg_echo('install:error:adminlogin'));
+			}
+		}
+
+		return TRUE;
+	}
+}
diff --git a/install/ElggRewriteTester.php b/install/ElggRewriteTester.php
new file mode 100644
index 000000000..ab68da2b7
--- /dev/null
+++ b/install/ElggRewriteTester.php
@@ -0,0 +1,199 @@
+<?php
+
+/**
+ * Elgg RewriteTester.
+ * Test if URL rewriting is working.
+ *
+ * @package    Elgg.Core
+ * @subpackage Installer
+ */
+class ElggRewriteTester {
+	protected $webserver;
+	protected $serverSupportsRemoteRead;
+	protected $rewriteTestPassed;
+	protected $htaccessIssue;
+
+	/**
+	 * Set the webserver as unknown.
+	 */
+	public function __construct() {
+		$this->webserver = 'unknown';
+	}
+
+	/**
+	 * Run the rewrite test and return a status array
+	 *
+	 * @param string $url  URL of rewrite test
+	 * @param string $path Root directory of Elgg with trailing slash
+	 *
+	 * @return array
+	 */
+	public function run($url, $path) {
+
+		$this->webserver = ElggRewriteTester::guessWebServer();
+
+		$this->rewriteTestPassed = $this->runRewriteTest($url);
+
+		if ($this->rewriteTestPassed == FALSE) {
+			if ($this->webserver == 'apache' || $this->webserver == 'unknown') {
+				if ($this->createHtaccess($path)) {
+					$this->rewriteTestPassed = $this->runRewriteTest($url);
+				}
+			}
+		}
+
+		return $this->returnStatus($url);
+	}
+
+	/**
+	 * Guess the web server from $_SERVER['SERVER_SOFTWARE']
+	 *
+	 * @return string
+	 */
+	public static function guessWebServer() {
+		$serverString = strtolower($_SERVER['SERVER_SOFTWARE']);
+		$possibleServers = array('apache', 'nginx', 'lighttpd', 'iis');
+		foreach ($possibleServers as $server) {
+			if (strpos($serverString, $server) !== FALSE) {
+				return $server;
+			}
+		}
+		return 'unknown';
+	}
+
+	/**
+	 * Hit the rewrite test URL to determine if the rewrite rules are working
+	 *
+	 * @param string $url Rewrite test URL
+	 *
+	 * @return bool
+	 */
+	protected function runRewriteTest($url) {
+
+		$this->serverSupportsRemoteRead = TRUE;
+
+		if (function_exists('curl_init')) {
+			// try curl if installed
+			$ch = curl_init();
+			curl_setopt($ch, CURLOPT_URL, $url);
+			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+			curl_setopt($ch, CURLOPT_TIMEOUT, 10);
+			curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+			$response = curl_exec($ch);
+			curl_close($ch);
+			return $response === 'success';
+		} else if (ini_get('allow_url_fopen')) {
+			// use file_get_contents as fallback
+			$response = file_get_contents($url);
+			return $response === 'success';
+		} else {
+			$this->serverSupportsRemoteRead = FALSE;
+			return FALSE;
+		}
+	}
+
+	/**
+	 * Create Elgg's .htaccess file or confirm that it exists
+	 *
+	 * @param string $path Elgg's root directory with trailing slash
+	 *
+	 * @return bool
+	 */
+	public function createHtaccess($path) {
+		$filename = "{$path}.htaccess";
+		if (file_exists($filename)) {
+			// check that this is the Elgg .htaccess
+			$data = file_get_contents($filename);
+			if ($data === FALSE) {
+				// don't have permission to read the file
+				$this->htaccessIssue = 'read_permission';
+				return FALSE;
+			}
+			if (strpos($data, 'Elgg') === FALSE) {
+				$this->htaccessIssue = 'non_elgg_htaccess';
+				return FALSE;
+			} else {
+				// check if this is an old Elgg htaccess
+				if (strpos($data, 'RewriteRule ^rewrite.php$ install.php') == FALSE) {
+					$this->htaccessIssue = 'old_elgg_htaccess';
+					return FALSE;
+				}
+				return TRUE;
+			}
+		}
+
+		if (!is_writable($path)) {
+			$this->htaccessIssue = 'write_permission';
+			return FALSE;
+		}
+
+		// create the .htaccess file
+		$result = copy("{$path}htaccess_dist", $filename);
+		if (!$result) {
+			$this->htaccessIssue = 'cannot_copy';
+			return FALSE;
+		}
+
+		return TRUE;
+	}
+
+	/**
+	 * Create the status array required by the ElggInstaller
+	 *
+	 * @param string $url Rewrite test URL
+	 *
+	 * @return array
+	 */
+	protected function returnStatus($url) {
+		if ($this->rewriteTestPassed) {
+			return array(
+				'severity' => 'pass',
+				'message' => elgg_echo('install:check:rewrite:success'),
+			);
+		}
+
+		if ($this->serverSupportsRemoteRead == FALSE) {
+			$msg = elgg_echo('install:warning:rewrite:unknown', array($url));
+			$msg .= elgg_view('install/js_rewrite_check', array('url' => $url));
+			
+			return array(
+				'severity' => 'warning',
+				'message' => $msg,
+			);
+		}
+
+		if ($this->webserver == 'apache') {
+			$serverString = elgg_echo('install:error:rewrite:apache');
+			$msg = "$serverString\n\n";
+			if (!isset($this->htaccessIssue)) {
+				$msg .= elgg_echo('install:error:rewrite:allowoverride');
+				$msg .= elgg_view('install/js_rewrite_check', array('url' => $url));
+			
+				return array(
+					'severity' => 'failure',
+					'message' => $msg,
+				);
+			}
+			$msg .= elgg_echo("install:error:rewrite:htaccess:{$this->htaccessIssue}");
+			return array(
+				'severity' => 'failure',
+				'message' => $msg,
+			);
+		}
+
+		if ($this->webserver != 'unknown') {
+			$serverString = elgg_echo("install:error:rewrite:{$this->webserver}");
+			$msg = "$serverString\n\n";
+			$msg .= elgg_echo("install:error:rewrite:altserver");
+			return array(
+				'severity' => 'failure',
+				'message' => $msg,
+			);
+		}
+
+		return array(
+			'severity' => 'failure',
+			'message' => elgg_echo('install:error:rewrite:unknown'),
+		);
+	}
+}
+\ No newline at end of file
diff --git a/install/cli/sample_installer.php b/install/cli/sample_installer.php
new file mode 100644
index 000000000..a51f9aae4
--- /dev/null
+++ b/install/cli/sample_installer.php
@@ -0,0 +1,67 @@
+<?php
+
+/**
+ * Sample cli installer script
+ */
+
+// change to true to run this script. Change back to false when done.
+$enabled = false;
+
+// none of the following may be empty
+$params = array(
+	// database parameters
+	'dbuser' => '',
+	'dbpassword' => '',
+	'dbname' => '',
+
+	// site settings
+	'sitename' => '',
+	'siteemail' => '',
+	'wwwroot' => '',
+	'dataroot' => '',
+
+	// admin account
+	'displayname' => '',
+	'email' => '',
+	'username' => '',
+	'password' => '',
+);
+
+
+// Do not edit below this line. //////////////////////////////
+
+
+if (!$enabled) {
+	echo "To enable this script, change \$enabled to true.\n";
+	echo "You *must* disable this script after a successful installation.\n";
+	exit;
+}
+
+if (PHP_SAPI !== 'cli') {
+	echo "You must use the command line to run this script.";
+	exit;
+}
+
+require_once(dirname(dirname(__FILE__)) . "/ElggInstaller.php");
+
+$installer = new ElggInstaller();
+
+// install and create the .htaccess file
+$installer->batchInstall($params, TRUE);
+
+// at this point installation has completed (otherwise an exception halted execution).
+// try to rewrite the script to disable it.
+if (is_writable(__FILE__)) {
+	$code = file_get_contents(__FILE__);
+	if (preg_match('~\\$enabled\\s*=\\s*(true|1)\\s*;~i', $code)) {
+		// looks safe to rewrite
+		$code = preg_replace('~\\$enabled\\s*=\\s*(true|1)\\s*;~i', '$enabled = false;', $code);
+		file_put_contents(__FILE__, $code);
+
+		echo "\nNote: This script has been disabled for your safety.\n";
+		exit;
+	}
+}
+
+echo "\nWarning: You *must* disable this script by setting \$enabled = false;.\n";
+echo "Leaving this script enabled could endanger your installation.\n";
diff --git a/install/css/install.css b/install/css/install.css
new file mode 100644
index 000000000..e7290c130
--- /dev/null
+++ b/install/css/install.css
@@ -0,0 +1,295 @@
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+
+body {
+	color: #333333;
+	background: #4690d6;
+	font-size: 80%;
+	font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif;
+	text-align: left;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: bold;
+}
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; }
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.0em; }
+h5 { font-size: 0.9em; }
+h6 { font-size: 0.8em; }
+
+a {
+	color: #4690d6;
+	text-decoration: none;
+}
+
+a:hover {
+	color: #0054a7;
+	text-decoration: underline;
+}
+
+p {
+	margin: 0px 0px 15px 0;
+}
+
+img {
+	border: none;
+}
+
+h2 {
+	border-bottom: 1px solid #555555;
+	margin-bottom: 20px;
+}
+
+ul {
+	list-style: none;
+}
+
+.elgg-page {
+	width: 880px;
+	margin: auto;
+	margin-top: 20px;
+}
+.elgg-page-header {
+	border-right: 1px solid #666666;
+	padding: 15px 50px 10px;
+	background: white;
+}
+.elgg-page-body {
+	border-bottom: 1px solid #666666;
+	border-right: 1px solid #666666;
+	padding: 0 40px 5px;
+	background: white;
+}
+
+.elgg-page-body:after,
+.elgg-page-header:after {
+	display: block;
+	content: '.';
+	line-height: 0;
+	height: 0;
+	visibility: hidden;
+	clear: both;
+}
+
+.elgg-sidebar {
+	float: left;
+	width: 250px;
+}
+.elgg-body {
+	overflow: hidden;
+	min-height: 320px;
+	padding-bottom: 10px;
+	position: relative;
+}
+.elgg-page-footer {
+	width: 800px;
+	height: 20px;
+	clear: both;
+	padding: 10px 20px 0 20px;
+	margin: auto;
+	margin-bottom: 40px;
+}
+
+.elgg-install-nav {
+	width: 100%;
+	text-align: right;
+	position: absolute;
+	bottom: 0px;
+}
+
+.elgg-page-footer a {
+	color: white;
+}
+
+.elgg-page-footer li {
+	float: left;
+	list-style: none;
+	margin-right: 20px;
+}
+
+.elgg-sidebar ol {
+	padding-left: 30px;
+}
+
+.elgg-sidebar li {
+	font-size: 1.2em;
+	margin-bottom: 5px;
+}
+
+.past {
+	text-decoration: line-through;
+}
+.present {
+	font-weight: bold;
+}
+
+.future {
+	color: #cccccc;
+}
+
+h3 {
+	margin: 15px 0 5px;
+}
+
+form > div {
+	margin-bottom: 15px;
+}
+label {
+	font-weight: bold;
+	color: #333333;
+	font-size: 140%;
+}
+.elgg-combo-label {
+	font-size: 120%;
+}
+input[type="text"],
+input[type="password"]  {
+	font: 120% Arial, Helvetica, sans-serif;
+	padding: 5px;
+	border: 1px solid #cccccc;
+	color: #666666;
+	width: 96%;
+}
+.database-settings input[type="text"],
+.database-settings input[type="password"] {
+	width: 220px;
+}
+input[type="password"]:focus, input[type="text"]:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color: #333333;
+}
+input[type="submit"] {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #fff;
+	background: #4690d6;
+	border: 4px solid #4690d6;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	
+	width: auto;
+	height: 35px;
+	padding: 2px 6px;
+	margin: 10px 0;
+	cursor: pointer;
+	float: right;
+}
+input[type="submit"]:hover {
+	background: #0054a7;
+	border: 4px solid #0054a7;
+}
+select {
+	display: block;
+	padding: 5px;
+}
+
+.install-help {
+	font-size: 90%;
+}
+
+.elgg-require-database {
+	padding-bottom: 50px;
+}
+
+.elgg-install-nav a {
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 16px;
+	font-weight: bold;
+	color: #ffffff;
+	background: #4690d6;
+	border: 4px solid #4690d6;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	
+	padding: 2px 9px;
+	margin: 10px;
+	cursor: pointer;
+	float: right;
+}
+
+.elgg-install-nav a:hover {
+	text-decoration: none;
+	background: #0054a7;
+	border: 4px solid #0054a7;
+}
+.elgg-install-nav .elgg-state-disabled,
+.elgg-install-nav .elgg-state-disabled:hover {
+	background: #555555;
+	border-color: #555555;
+	cursor: default;
+}
+
+.elgg-system-messages li {
+	padding: 3px 10px 3px 10px;
+	margin-bottom: 20px;
+}
+
+.elgg-state-success {
+	border: 1px solid #00cc00;
+	background: #ccffcc;
+}
+
+.elgg-state-error {
+	border: 1px solid #D3322A;
+	background: #F7DAD8;
+}
+
+.elgg-state-warning {
+	border: 1px solid #ded0a9;
+	background: #FEF5AA;
+}
+
+.elgg-body li {
+	margin-top: 5px;
+	padding: 5px;
+}
+
+.pass {
+	border: 1px solid #00cc00;
+	background: #ccffcc;
+}
+
+.warning {
+	border: 1px solid #ded0a9;
+	background: #FEF5AA;
+}
+
+.failure {
+	border: 1px solid #D3322A;
+	background: #F7DAD8;
+}
+
+.info {
+	border: 1px solid #aaaaaa;
+	background: #ffffff;
+}
+
+.messages {
+	padding: 3px 10px 3px 10px;
+	margin: 20px 0px 10px 0px;
+	width: 95%;
+}
+\ No newline at end of file
diff --git a/install/js/install.js b/install/js/install.js
new file mode 100644
index 000000000..37e5b0dc3
--- /dev/null
+++ b/install/js/install.js
@@ -0,0 +1,42 @@
+
+$(function() {
+	// prevent double-submission of forms
+	$('form').submit(function() {
+		if ($(this).data('submitted')) {
+			return false;
+		}
+		$(this).data('submitted', true);
+		return true;
+	});
+
+	// toggle the disable attribute of text box based on checkbox
+	$('.elgg-combo-checkbox').click(function() {
+		if ($(this).is(':checked')) {
+			$(this).prev().attr('disabled', true);
+			$(this).prev().val('');
+		} else {
+			$(this).prev().attr('disabled', false);
+		}
+	});
+});
+
+elgg = {
+	installer: {}
+};
+
+/**
+ * Check the rewrite address for "success" and then allows the installation to proceed.
+ */
+elgg.installer.rewriteTest = function(url, success_msg, nextURL) {
+	$.ajax(url, {
+		success: function(data, status, xhr) {
+			if (data == 'success') {
+				$('.elgg-require-rewrite li').attr('class', 'pass');
+				$('.elgg-require-rewrite li').html('<p>' + success_msg + '</p>');
+				$('.elgg-install-nav a.elgg-state-disabled')
+					.removeClass('elgg-state-disabled')
+					.attr('href', nextURL);
+			}
+		}
+	});
+}
diff --git a/install/languages/en.php b/install/languages/en.php
new file mode 100644
index 000000000..531379b1e
--- /dev/null
+++ b/install/languages/en.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Installer English Language
+ *
+ * @package ElggLanguage
+ * @subpackage Installer
+ */
+
+$english = array(
+	'install:title' => 'Elgg Install',
+	'install:welcome' => 'Welcome',
+	'install:requirements' => 'Requirements check',
+	'install:database' => 'Database installation',
+	'install:settings' => 'Configure site',
+	'install:admin' => 'Create admin account',
+	'install:complete' => 'Finished',
+
+	'install:next' => 'Next',
+	'install:refresh' => 'Refresh',
+
+	'install:welcome:instructions' => "Installing Elgg has 6 simple steps and reading this welcome is the first one!
+
+If you haven't already, read through the installation instructions included with Elgg (or click the instructions link at the bottom of the page).
+
+If you are ready to proceed, click the Next button.",
+	'install:requirements:instructions:success' => "Your server passed the requirement checks.",
+	'install:requirements:instructions:failure' => "Your server failed the requirements check. After you have fixed the below issues, refresh this page. Check the troubleshooting links at the bottom of this page if you need further assistance.",
+	'install:requirements:instructions:warning' => "Your server passed the requirements check, but there is at least one warning. We recommend that you check the install troubleshooting page for more details.",
+
+	'install:require:php' => 'PHP',
+	'install:require:rewrite' => 'Web server',
+	'install:require:settings' => 'Settings file',
+	'install:require:database' => 'Database',
+
+	'install:check:root' => 'Your web server does not have permission to create an .htaccess file in the root directory of Elgg. You have two choices:
+
+		1. Change the permissions on the root directory
+
+		2. Copy the file htaccess_dist to .htaccess',
+
+	'install:check:php:version' => 'Elgg requires PHP %s or above. This server is using version %s.',
+	'install:check:php:extension' => 'Elgg requires the PHP extension %s.',
+	'install:check:php:extension:recommend' => 'It is recommended that the PHP extension %s is installed.',
+	'install:check:php:open_basedir' => 'The open_basedir PHP directive may prevent Elgg from saving files to its data directory.',
+	'install:check:php:safe_mode' => 'Running PHP in safe mode is not recommened and may cause problems with Elgg.',
+	'install:check:php:arg_separator' => 'arg_separator.output must be & for Elgg to work and your server\'s value is %s',
+	'install:check:php:register_globals' => 'Register globals must be turned off.',
+	'install:check:php:session.auto_start' => "session.auto_start must be off for Elgg to work. Either change the configuration of your server or add this directive to Elgg's .htaccess file.",
+
+	'install:check:enginedir' => 'Your web server does not have permission to create the settings.php file in the engine directory. You have two choices:
+
+		1. Change the permissions on the engine directory
+
+		2. Copy the file settings.example.php to settings.php and follow the instructions in it for setting your database parameters.',
+	'install:check:readsettings' => 'A settings file exists in the engine directory, but the web server cannot read it. You can delete the file or change the read permissions on it.',
+
+	'install:check:php:success' => "Your server's PHP satisfies all of Elgg's requirements.",
+	'install:check:rewrite:success' => 'The test of the rewrite rules was successful.',
+	'install:check:database' => 'The database requirements are checked when Elgg loads its database.',
+
+	'install:database:instructions' => "If you haven't already created a database for Elgg, do that now. Then fill in the values below to initialize the Elgg database.",
+	'install:database:error' => 'There was an error creating the Elgg database and installation cannot continue. Review the message above and correct any problems. If you need more help, visit the Install troubleshooting link below or post to the Elgg community forums.',
+
+	'install:database:label:dbuser' =>  'Database Username',
+	'install:database:label:dbpassword' => 'Database Password',
+	'install:database:label:dbname' => 'Database Name',
+	'install:database:label:dbhost' => 'Database Host',
+	'install:database:label:dbprefix' => 'Database Table Prefix',
+
+	'install:database:help:dbuser' => 'User that has full privileges to the MySQL database that you created for Elgg',
+	'install:database:help:dbpassword' => 'Password for the above database user account',
+	'install:database:help:dbname' => 'Name of the Elgg database',
+	'install:database:help:dbhost' => 'Hostname of the MySQL server (usually localhost)',
+	'install:database:help:dbprefix' => "The prefix given to all of Elgg's tables (usually elgg_)",
+
+	'install:settings:instructions' => 'We need some information about the site as we configure Elgg. If you haven\'t <a href="http://docs.elgg.org/wiki/Data_directory" target="_blank">created a data directory</a> for Elgg, you need to do so now.',
+
+	'install:settings:label:sitename' => 'Site Name',
+	'install:settings:label:siteemail' => 'Site Email Address',
+	'install:settings:label:wwwroot' => 'Site URL',
+	'install:settings:label:path' => 'Elgg Install Directory',
+	'install:settings:label:dataroot' => 'Data Directory',
+	'install:settings:label:language' => 'Site Language',
+	'install:settings:label:siteaccess' => 'Default Site Access',
+	'install:label:combo:dataroot' => 'Elgg creates data directory',
+
+	'install:settings:help:sitename' => 'The name of your new Elgg site',
+	'install:settings:help:siteemail' => 'Email address used by Elgg for communication with users',
+	'install:settings:help:wwwroot' => 'The address of the site (Elgg usually guesses this correctly)',
+	'install:settings:help:path' => 'The directory where you put the Elgg code (Elgg usually guesses this correctly)',
+	'install:settings:help:dataroot' => 'The directory that you created for Elgg to save files (the permissions on this directory are checked when you click Next). It must be an absolute path.',
+	'install:settings:help:dataroot:apache' => 'You have the option of Elgg creating the data directory or entering the directory that you already created for storing user files (the permissions on this directory are checked when you click Next)',
+	'install:settings:help:language' => 'The default language for the site',
+	'install:settings:help:siteaccess' => 'The default access level for new user created content',
+
+	'install:admin:instructions' => "It is now time to create an administrator's account.",
+
+	'install:admin:label:displayname' => 'Display Name',
+	'install:admin:label:email' => 'Email Address',
+	'install:admin:label:username' => 'Username',
+	'install:admin:label:password1' => 'Password',
+	'install:admin:label:password2' => 'Password Again',
+
+	'install:admin:help:displayname' => 'The name that is displayed on the site for this account',
+	'install:admin:help:email' => '',
+	'install:admin:help:username' => 'Account username used for logging in',
+	'install:admin:help:password1' => "Account password must be at least %u characters long",
+	'install:admin:help:password2' => 'Retype password to confirm',
+
+	'install:admin:password:mismatch' => 'Password must match.',
+	'install:admin:password:empty' => 'Password cannot be empty.',
+	'install:admin:password:tooshort' => 'Your password was too short',
+	'install:admin:cannot_create' => 'Unable to create an admin account.',
+
+	'install:complete:instructions' => 'Your Elgg site is now ready to be used. Click the button below to be taken to your site.',
+	'install:complete:gotosite' => 'Go to site',
+
+	'InstallationException:UnknownStep' => '%s is an unknown installation step.',
+
+	'install:success:database' => 'Database has been installed.',
+	'install:success:settings' => 'Site settings have been saved.',
+	'install:success:admin' => 'Admin account has been created.',
+
+	'install:error:htaccess' => 'Unable to create an .htaccess',
+	'install:error:settings' => 'Unable to create the settings file',
+	'install:error:databasesettings' => 'Unable to connect to the database with these settings.',
+	'install:error:database_prefix' => 'Invalid characters in database prefix',
+	'install:error:oldmysql' => 'MySQL must be version 5.0 or above. Your server is using %s.',
+	'install:error:nodatabase' => 'Unable to use database %s. It may not exist.',
+	'install:error:cannotloadtables' => 'Cannot load the database tables',
+	'install:error:tables_exist' => 'There are already Elgg tables in the database. You need to either drop those tables or restart the installer and we will attempt to use them. To restart the installer, remove \'?step=database\' from the URL in your browser\'s address bar and press Enter.',
+	'install:error:readsettingsphp' => 'Unable to read engine/settings.example.php',
+	'install:error:writesettingphp' => 'Unable to write engine/settings.php',
+	'install:error:requiredfield' => '%s is required',
+	'install:error:relative_path' => 'We don\'t think "%s" is an absolute path for your data directory',
+	'install:error:datadirectoryexists' => 'Your data directory %s does not exist.',
+	'install:error:writedatadirectory' => 'Your data directory %s is not writable by the web server.',
+	'install:error:locationdatadirectory' => 'Your data directory %s must be outside of your install path for security.',
+	'install:error:emailaddress' => '%s is not a valid email address',
+	'install:error:createsite' => 'Unable to create the site.',
+	'install:error:savesitesettings' => 'Unable to save site settings',
+	'install:error:loadadmin' => 'Unable to load admin user.',
+	'install:error:adminaccess' => 'Unable to give new user account admin privileges.',
+	'install:error:adminlogin' => 'Unable to login the new admin user automatically.',
+	'install:error:rewrite:apache' => 'We think your server is running the Apache web server.',
+	'install:error:rewrite:nginx' => 'We think your server is running the Nginx web server.',
+	'install:error:rewrite:lighttpd' => 'We think your server is running the Lighttpd web server.',
+	'install:error:rewrite:iis' => 'We think your server is running the IIS web server.',
+	'install:error:rewrite:allowoverride' => "The rewrite test failed and the most likely cause is that AllowOverride is not set to All for Elgg's directory. This prevents Apache from processing the .htaccess file which contains the rewrite rules.
+				\n\nA less likely cause is Apache is configured with an alias for your Elgg directory and you need to set the RewriteBase in your .htaccess. There are further instructions in the .htaccess file in your Elgg directory.",
+	'install:error:rewrite:htaccess:write_permission' => 'Your web server does not have permission to create the .htaccess file in Elgg\'s directory. You need to manually copy htaccess_dist to .htaccess or change the permissions on the directory.',
+	'install:error:rewrite:htaccess:read_permission' => 'There is an .htaccess file in Elgg\'s directory, but your web server does not have permission to read it.',
+	'install:error:rewrite:htaccess:non_elgg_htaccess' => 'There is an .htaccess file in Elgg\'s directory that was not not created by Elgg. Please remove it.',
+	'install:error:rewrite:htaccess:old_elgg_htaccess' => 'There appears to be an old Elgg .htaccess file in Elgg\'s directory. It does not contain the rewrite rule for testing the web server.',
+	'install:error:rewrite:htaccess:cannot_copy' => 'A unknown error occurred while creating the .htaccess file. You need to manually copy htaccess_dist to .htaccess in Elgg\'s directory.',
+	'install:error:rewrite:altserver' => 'The rewrite rules test failed. You need to configure your web server with Elgg\'s rewrite rules and try again.',
+	'install:error:rewrite:unknown' => 'Oof. We couldn\'t figure out what kind of web server is running on your server and it failed the rewrite rules. We cannot offer any specific advice. Please check the troubleshooting link.',
+	'install:warning:rewrite:unknown' => 'Your server does not support automatic testing of the rewrite rules and your browser does not support checking via JavaScript. You can continue the installation, but you may experience problems with your site. You can manually test the rewrite rules by clicking this link: <a href="%s" target="_blank">test</a>. You will see the word success if the rules are working.',
+);
+
+add_translation("en", $english);
diff --git a/js/classes/ElggEntity.js b/js/classes/ElggEntity.js
new file mode 100644
index 000000000..9461a463f
--- /dev/null
+++ b/js/classes/ElggEntity.js
@@ -0,0 +1,20 @@
+/**
+ * Create a new ElggEntity
+ * 
+ * @class Represents an ElggEntity
+ * @property {number} guid
+ * @property {string} type
+ * @property {string} subtype
+ * @property {number} owner_guid
+ * @property {number} site_guid
+ * @property {number} container_guid
+ * @property {number} access_id
+ * @property {number} time_created
+ * @property {number} time_updated
+ * @property {number} last_action
+ * @property {string} enabled
+ * 
+ */
+elgg.ElggEntity = function(o) {
+	$.extend(this, o);
+};
+\ No newline at end of file
diff --git a/js/classes/ElggPriorityList.js b/js/classes/ElggPriorityList.js
new file mode 100644
index 000000000..b4cec5044
--- /dev/null
+++ b/js/classes/ElggPriorityList.js
@@ -0,0 +1,92 @@
+/**
+ * Priority lists allow you to create an indexed list that can be iterated through in a specific
+ * order.
+ */
+elgg.ElggPriorityList = function() {
+	this.length = 0;
+	this.priorities_ = [];
+};
+
+/**
+ * Inserts an element into the priority list at the priority specified.
+ *
+ * @param {Object} obj          The object to insert
+ * @param {Number} opt_priority An optional priority to insert at.
+ * 
+ * @return {Void}
+ */
+elgg.ElggPriorityList.prototype.insert = function(obj, opt_priority) {
+	var priority = 500;
+	if (arguments.length == 2 && opt_priority != undefined) {
+		priority = parseInt(opt_priority, 10);
+	}
+
+	priority = Math.max(priority, 0);
+
+	if (elgg.isUndefined(this.priorities_[priority])) {
+		this.priorities_[priority] = [];
+	}
+
+	this.priorities_[priority].push(obj);
+	this.length++;
+};
+
+/**
+ * Iterates through each element in order.
+ *
+ * Unlike every, this ignores the return value of the callback.
+ *
+ * @param {Function} callback The callback function to pass each element through. See
+ *                            Array.prototype.every() for details.
+ * @return {Object}
+ */
+elgg.ElggPriorityList.prototype.forEach = function(callback) {
+	elgg.assertTypeOf('function', callback);
+
+	var index = 0;
+
+	this.priorities_.forEach(function(elems) {
+		elems.forEach(function(elem) {
+			callback(elem, index++);
+		});
+	});
+
+	return this;
+};
+
+/**
+ * Iterates through each element in order.
+ *
+ * Unlike forEach, this returns the value of the callback and will break on false.
+ *
+ * @param {Function} callback The callback function to pass each element through. See
+ *                            Array.prototype.every() for details.
+ * @return {Object}
+ */
+elgg.ElggPriorityList.prototype.every = function(callback) {
+	elgg.assertTypeOf('function', callback);
+
+	var index = 0;
+
+	return this.priorities_.every(function(elems) {
+		return elems.every(function(elem) {
+			return callback(elem, index++);
+		});
+	});
+};
+
+/**
+ * Removes an element from the priority list
+ *
+ * @param {Object} obj The object to remove.
+ * @return {Void}
+ */
+elgg.ElggPriorityList.prototype.remove = function(obj) {
+	this.priorities_.forEach(function(elems) {
+		var index;
+		while ((index = elems.indexOf(obj)) !== -1) {
+			elems.splice(index, 1);
+			this.length--;
+		}
+	});
+};
+\ No newline at end of file
diff --git a/js/classes/ElggUser.js b/js/classes/ElggUser.js
new file mode 100644
index 000000000..b8a976fba
--- /dev/null
+++ b/js/classes/ElggUser.js
@@ -0,0 +1,28 @@
+/**
+ * Create a new ElggUser
+ *
+ * @param {Object} o
+ * @extends ElggEntity
+ * @class Represents an ElggUser
+ * @property {string} name
+ * @property {string} username
+ * @property {string} language
+ * @property {boolean} admin
+ */
+elgg.ElggUser = function(o) {
+	elgg.ElggEntity.call(this, o);
+};
+
+elgg.inherit(elgg.ElggUser, elgg.ElggEntity);
+
+/**
+ * Is this user an admin?
+ *
+ * @warning The admin state of the user should be checked on the server for any
+ * actions taken that require admin privileges.
+ *
+ * @return {boolean}
+ */
+elgg.ElggUser.prototype.isAdmin = function() {
+	return this.admin;
+};
+\ No newline at end of file
diff --git a/js/lib/ajax.js b/js/lib/ajax.js
new file mode 100644
index 000000000..b3f39cc42
--- /dev/null
+++ b/js/lib/ajax.js
@@ -0,0 +1,242 @@
+/*globals elgg, $*/
+elgg.provide('elgg.ajax');
+
+/**
+ * @author Evan Winslow
+ * Provides a bunch of useful shortcut functions for making ajax calls
+ */
+
+/**
+ * Wrapper function for jQuery.ajax which ensures that the url being called
+ * is relative to the elgg site root.
+ *
+ * You would most likely use elgg.get or elgg.post, rather than this function
+ *
+ * @param {string} url Optionally specify the url as the first argument
+ * @param {Object} options Optional. {@see jQuery#ajax}
+ * @return {XmlHttpRequest}
+ */
+elgg.ajax = function(url, options) {
+	options = elgg.ajax.handleOptions(url, options);
+
+	options.url = elgg.normalize_url(options.url);
+	return $.ajax(options);
+};
+/**
+ * @const
+ */
+elgg.ajax.SUCCESS = 0;
+
+/**
+ * @const
+ */
+elgg.ajax.ERROR = -1;
+
+/**
+ * Handle optional arguments and return the resulting options object
+ *
+ * @param url
+ * @param options
+ * @return {Object}
+ * @private
+ */
+elgg.ajax.handleOptions = function(url, options) {
+	var data_only = true,
+		data,
+		member;
+
+	//elgg.ajax('example/file.php', {...});
+	if (elgg.isString(url)) {
+		options = options || {};
+
+	//elgg.ajax({...});
+	} else {
+		options = url || {};
+		url = options.url;
+	}
+
+	//elgg.ajax('example/file.php', function() {...});
+	if (elgg.isFunction(options)) {
+		data_only = false;
+		options = {success: options};
+	}
+
+	//elgg.ajax('example/file.php', {data:{...}});
+	if (options.data) {
+		data_only = false;
+	} else {
+		for (member in options) {
+			//elgg.ajax('example/file.php', {callback:function(){...}});
+			if (elgg.isFunction(options[member])) {
+				data_only = false;
+			}
+		}
+	}
+
+	//elgg.ajax('example/file.php', {notdata:notfunc});
+	if (data_only) {
+		data = options;
+		options = {data: data};
+	}
+
+	if (url) {
+		options.url = url;
+	}
+
+	return options;
+};
+
+/**
+ * Wrapper function for elgg.ajax which forces the request type to 'get.'
+ *
+ * @param {string} url Optionally specify the url as the first argument
+ * @param {Object} options {@see jQuery#ajax}
+ * @return {XmlHttpRequest}
+ */
+elgg.get = function(url, options) {
+	options = elgg.ajax.handleOptions(url, options);
+
+	options.type = 'get';
+	return elgg.ajax(options);
+};
+
+/**
+ * Wrapper function for elgg.get which forces the dataType to 'json.'
+ *
+ * @param {string} url Optionally specify the url as the first argument
+ * @param {Object} options {@see jQuery#ajax}
+ * @return {XmlHttpRequest}
+ */
+elgg.getJSON = function(url, options) {
+	options = elgg.ajax.handleOptions(url, options);
+
+	options.dataType = 'json';
+	return elgg.get(options);
+};
+
+/**
+ * Wrapper function for elgg.ajax which forces the request type to 'post.'
+ *
+ * @param {string} url Optionally specify the url as the first argument
+ * @param {Object} options {@see jQuery#ajax}
+ * @return {XmlHttpRequest}
+ */
+elgg.post = function(url, options) {
+	options = elgg.ajax.handleOptions(url, options);
+
+	options.type = 'post';
+	return elgg.ajax(options);
+};
+
+/**
+ * Perform an action via ajax
+ *
+ * @example Usage 1:
+ * At its simplest, only the action name is required (and anything more than the
+ * action name will be invalid).
+ * <pre>
+ * elgg.action('name/of/action');
+ * </pre>
+ *
+ * The action can be relative to the current site ('name/of/action') or
+ * the full URL of the action ('http://elgg.org/action/name/of/action').
+ *
+ * @example Usage 2:
+ * If you want to pass some data along with it, use the second parameter
+ * <pre>
+ * elgg.action('friend/add', { friend: some_guid });
+ * </pre>
+ *
+ * @example Usage 3:
+ * Of course, you will have no control over what happens when the request
+ * completes if you do it like that, so there's also the most verbose method
+ * <pre>
+ * elgg.action('friend/add', {
+ *     data: {
+ *         friend: some_guid
+ *     },
+ *     success: function(json) {
+ *         //do something
+ *     },
+ * }
+ * </pre>
+ * You can pass any of your favorite $.ajax arguments into this second parameter.
+ *
+ * @note If you intend to use the second field in the "verbose" way, you must
+ * specify a callback method or the data parameter.  If you do not, elgg.action
+ * will think you mean to send the second parameter as data.
+ *
+ * @note You do not have to add security tokens to this request.  Elgg does that
+ * for you automatically.
+ *
+ * @see jQuery.ajax
+ *
+ * @param {String} action The action to call.
+ * @param {Object} options
+ * @return {XMLHttpRequest}
+ */
+elgg.action = function(action, options) {
+	elgg.assertTypeOf('string', action);
+
+	// support shortcut and full URLs
+	// this will mangle URLs that aren't elgg actions.
+	// Use post, get, or ajax for those.
+	if (action.indexOf('action/') < 0) {
+		action = 'action/' + action;
+	}
+
+	options = elgg.ajax.handleOptions(action, options);
+
+	// This is a misuse of elgg.security.addToken() because it is not always a
+	// full query string with a ?. As such we need a special check for the tokens.
+	if (!elgg.isString(options.data) || options.data.indexOf('__elgg_ts') == -1) {
+		options.data = elgg.security.addToken(options.data);
+	}
+	options.dataType = 'json';
+
+	//Always display system messages after actions
+	var custom_success = options.success || elgg.nullFunction;
+	options.success = function(json, two, three, four) {
+		if (json && json.system_messages) {
+			elgg.register_error(json.system_messages.error);
+			elgg.system_message(json.system_messages.success);
+		}
+
+		custom_success(json, two, three, four);
+	};
+
+	return elgg.post(options);
+};
+
+/**
+ * Make an API call
+ *
+ * @example Usage:
+ * <pre>
+ * elgg.api('system.api.list', {
+ *     success: function(data) {
+ *         console.log(data);
+ *     }
+ * });
+ * </pre>
+ *
+ * @param {String} method The API method to be called
+ * @param {Object} options {@see jQuery#ajax}
+ * @return {XmlHttpRequest}
+ */
+elgg.api = function (method, options) {
+	elgg.assertTypeOf('string', method);
+
+	var defaults = {
+		dataType: 'json',
+		data: {}
+	};
+
+	options = elgg.ajax.handleOptions(method, options);
+	options = $.extend(defaults, options);
+
+	options.url = 'services/api/rest/' + options.dataType + '/';
+	options.data.method = method;
+
+	return elgg.ajax(options);
+};
diff --git a/js/lib/configuration.js b/js/lib/configuration.js
new file mode 100644
index 000000000..6e221c957
--- /dev/null
+++ b/js/lib/configuration.js
@@ -0,0 +1,10 @@
+elgg.provide('elgg.config');
+
+/**
+ * Returns the current site URL
+ *
+ * @return {String} The site URL.
+ */
+elgg.get_site_url = function() {
+	return elgg.config.wwwroot;
+};
+\ No newline at end of file
diff --git a/js/lib/elgglib.js b/js/lib/elgglib.js
new file mode 100644
index 000000000..a8e187f1d
--- /dev/null
+++ b/js/lib/elgglib.js
@@ -0,0 +1,563 @@
+/**
+ * @namespace Singleton object for holding the Elgg javascript library
+ */
+var elgg = elgg || {};
+
+/**
+ * Pointer to the global context
+ *
+ * @see elgg.require
+ * @see elgg.provide
+ */
+elgg.global = this;
+
+/**
+ * Convenience reference to an empty function.
+ *
+ * Save memory by not generating multiple empty functions.
+ */
+elgg.nullFunction = function() {};
+
+/**
+ * This forces an inheriting class to implement the method or
+ * it will throw an error.
+ *
+ * @example
+ * AbstractClass.prototype.toBeImplemented = elgg.abstractMethod;
+ */
+elgg.abstractMethod = function() {
+	throw new Error("Oops... you forgot to implement an abstract method!");
+};
+
+/**
+ * Merges two or more objects together and returns the result.
+ */
+elgg.extend = jQuery.extend;
+
+/**
+ * Check if the value is an array.
+ *
+ * No sense in reinventing the wheel!
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isArray = jQuery.isArray;
+
+/**
+ * Check if the value is a function.
+ *
+ * No sense in reinventing the wheel!
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isFunction = jQuery.isFunction;
+
+/**
+ * Check if the value is a "plain" object (i.e., created by {} or new Object())
+ *
+ * No sense in reinventing the wheel!
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isPlainObject = jQuery.isPlainObject;
+
+/**
+ * Check if the value is a string
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isString = function(val) {
+	return typeof val === 'string';
+};
+
+/**
+ * Check if the value is a number
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isNumber = function(val) {
+	return typeof val === 'number';
+};
+
+/**
+ * Check if the value is an object
+ *
+ * @note This returns true for functions and arrays!  If you want to return true only
+ * for "plain" objects (created using {} or new Object()) use elgg.isPlainObject.
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isObject = function(val) {
+	return typeof val === 'object';
+};
+
+/**
+ * Check if the value is undefined
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isUndefined = function(val) {
+	return val === undefined;
+};
+
+/**
+ * Check if the value is null
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isNull = function(val) {
+	return val === null;
+};
+
+/**
+ * Check if the value is either null or undefined
+ *
+ * @param {*} val
+ *
+ * @return boolean
+ */
+elgg.isNullOrUndefined = function(val) {
+	return val == null;
+};
+
+/**
+ * Throw an exception of the type doesn't match
+ *
+ * @todo Might be more appropriate for debug mode only?
+ */
+elgg.assertTypeOf = function(type, val) {
+	if (typeof val !== type) {
+		throw new TypeError("Expecting param of " +
+							arguments.caller + "to be a(n) " + type + "." +
+							"  Was actually a(n) " + typeof val + ".");
+	}
+};
+
+/**
+ * Throw an error if the required package isn't present
+ *
+ * @param {String} pkg The required package (e.g., 'elgg.package')
+ */
+elgg.require = function(pkg) {
+	elgg.assertTypeOf('string', pkg);
+
+	var parts = pkg.split('.'),
+		cur = elgg.global,
+		part, i;
+
+	for (i = 0; i < parts.length; i += 1) {
+		part = parts[i];
+		cur = cur[part];
+		if (elgg.isUndefined(cur)) {
+			throw new Error("Missing package: " + pkg);
+		}
+	}
+};
+
+/**
+ * Generate the skeleton for a package.
+ *
+ * <pre>
+ * elgg.provide('elgg.package.subpackage');
+ * </pre>
+ *
+ * is equivalent to
+ *
+ * <pre>
+ * elgg = elgg || {};
+ * elgg.package = elgg.package || {};
+ * elgg.package.subpackage = elgg.package.subpackage || {};
+ * </pre>
+ *
+ * @example elgg.provide('elgg.config.translations')
+ *
+ * @param {string} pkg The package name.
+ */
+elgg.provide = function(pkg, opt_context) {
+	elgg.assertTypeOf('string', pkg);
+
+	var parts = pkg.split('.'),
+		context = opt_context || elgg.global,
+		part, i;
+
+
+	for (i = 0; i < parts.length; i += 1) {
+		part = parts[i];
+		context[part] = context[part] || {};
+		context = context[part];
+	}
+};
+
+/**
+ * Inherit the prototype methods from one constructor into another.
+ *
+ * @example
+ * <pre>
+ * function ParentClass(a, b) { }
+ *
+ * ParentClass.prototype.foo = function(a) { alert(a); }
+ *
+ * function ChildClass(a, b, c) {
+ *     //equivalent of parent::__construct(a, b); in PHP
+ *     ParentClass.call(this, a, b);
+ * }
+ *
+ * elgg.inherit(ChildClass, ParentClass);
+ *
+ * var child = new ChildClass('a', 'b', 'see');
+ * child.foo('boo!'); // alert('boo!');
+ * </pre>
+ *
+ * @param {Function} Child Child class constructor.
+ * @param {Function} Parent Parent class constructor.
+ */
+elgg.inherit = function(Child, Parent) {
+	Child.prototype = new Parent();
+	Child.prototype.constructor = Child;
+};
+
+/**
+ * Converts shorthand urls to absolute urls.
+ *
+ * If the url is already absolute or protocol-relative, no change is made.
+ *
+ * elgg.normalize_url('');                   // 'http://my.site.com/'
+ * elgg.normalize_url('dashboard');          // 'http://my.site.com/dashboard'
+ * elgg.normalize_url('http://google.com/'); // no change
+ * elgg.normalize_url('//google.com/');      // no change
+ *
+ * @param {String} url The url to normalize
+ * @return {String} The extended url
+ * @private
+ */
+elgg.normalize_url = function(url) {
+	url = url || '';
+	elgg.assertTypeOf('string', url);
+
+	validated = (function(url) {
+		url = elgg.parse_url(url);
+		if (url.scheme){
+			url.scheme = url.scheme.toLowerCase();
+		}
+		if (url.scheme == 'http' || url.scheme == 'https') {
+			if (!url.host) {
+				return false;
+			}
+			/* hostname labels may contain only alphanumeric characters, dots and hypens. */
+			if (!(new RegExp("^([a-zA-Z0-9][a-zA-Z0-9\\-\\.]*)$", "i")).test(url.host) || url.host.charAt(-1) == '.') {
+				return false;
+			}
+		}
+		/* some schemas allow the host to be empty */
+		if (!url.scheme || !url.host && url.scheme != 'mailto' && url.scheme != 'news' && url.scheme != 'file') {
+			return false;
+		}
+		return true;
+	})(url);
+
+	// all normal URLs including mailto:
+	if (validated) {		
+		return url;
+	}
+
+	// '//example.com' (Shortcut for protocol.)
+	// '?query=test', #target
+	else if ((new RegExp("^(\\#|\\?|//)", "i")).test(url)) {
+		return url;
+	}
+
+	// 'javascript:'
+	else if (url.indexOf('javascript:') === 0 || url.indexOf('mailto:') === 0 ) {
+		return url;
+	}
+
+	// watch those double escapes in JS.
+
+	// 'install.php', 'install.php?step=step'
+	else if ((new RegExp("^[^\/]*\\.php(\\?.*)?$", "i")).test(url)) {
+		return elgg.config.wwwroot + url.ltrim('/');
+	}
+
+	// 'example.com', 'example.com/subpage'
+	else if ((new RegExp("^[^/]*\\.", "i")).test(url)) {
+		return 'http://' + url;
+	}
+
+	// 'page/handler', 'mod/plugin/file.php'
+	else {
+		// trim off any leading / because the site URL is stored
+		// with a trailing /
+		return elgg.config.wwwroot + url.ltrim('/');
+	}
+};
+
+/**
+ * Displays system messages via javascript rather than php.
+ *
+ * @param {String} msgs The message we want to display
+ * @param {Number} delay The amount of time to display the message in milliseconds. Defaults to 6 seconds.
+ * @param {String} type The type of message (typically 'error' or 'message')
+ * @private
+ */
+elgg.system_messages = function(msgs, delay, type) {
+	if (elgg.isUndefined(msgs)) {
+		return;
+	}
+
+	var classes = ['elgg-message'],
+		messages_html = [],
+		appendMessage = function(msg) {
+			messages_html.push('<li class="' + classes.join(' ') + '"><p>' + msg + '</p></li>');
+		},
+		systemMessages = $('ul.elgg-system-messages'),
+		i;
+
+	//validate delay.  Must be a positive integer.
+	delay = parseInt(delay || 6000, 10);
+	if (isNaN(delay) || delay <= 0) {
+		delay = 6000;
+	}
+
+	//Handle non-arrays
+	if (!elgg.isArray(msgs)) {
+		msgs = [msgs];
+	}
+
+	if (type === 'error') {
+		classes.push('elgg-state-error');
+	} else {
+		classes.push('elgg-state-success');
+	}
+
+	msgs.forEach(appendMessage);
+
+	if (type != 'error') {
+		$(messages_html.join('')).appendTo(systemMessages)
+			.animate({opacity: '1.0'}, delay).fadeOut('slow');
+	} else {
+		$(messages_html.join('')).appendTo(systemMessages);
+	}
+};
+
+/**
+ * Wrapper function for system_messages. Specifies "messages" as the type of message
+ * @param {String} msgs  The message to display
+ * @param {Number} delay How long to display the message (milliseconds)
+ */
+elgg.system_message = function(msgs, delay) {
+	elgg.system_messages(msgs, delay, "message");
+};
+
+/**
+ * Wrapper function for system_messages.  Specifies "errors" as the type of message
+ * @param {String} errors The error message to display
+ * @param {Number} delay  How long to dispaly the error message (milliseconds)
+ */
+elgg.register_error = function(errors, delay) {
+	elgg.system_messages(errors, delay, "error");
+};
+
+/**
+ * Meant to mimic the php forward() function by simply redirecting the
+ * user to another page.
+ *
+ * @param {String} url The url to forward to
+ */
+elgg.forward = function(url) {
+	location.href = elgg.normalize_url(url);
+};
+
+/**
+ * Parse a URL into its parts. Mimicks http://php.net/parse_url
+ *
+ * @param {String} url       The URL to parse
+ * @param {Int}    component A component to return
+ * @param {Bool}   expand    Expand the query into an object? Else it's a string.
+ *
+ * @return {Object} The parsed URL
+ */
+elgg.parse_url = function(url, component, expand) {
+	// Adapted from http://blog.stevenlevithan.com/archives/parseuri
+	// which was release under the MIT
+	// It was modified to fix mailto: and javascript: support.
+	var
+	expand = expand || false,
+	component = component || false,
+	
+	re_str =
+		// scheme (and user@ testing)
+		'^(?:(?![^:@]+:[^:@/]*@)([^:/?#.]+):)?(?://)?'
+		// possibly a user[:password]@
+		+ '((?:(([^:@]*)(?::([^:@]*))?)?@)?'
+		// host and port
+		+ '([^:/?#]*)(?::(\\d*))?)'
+		// path
+		+ '(((/(?:[^?#](?![^?#/]*\\.[^?#/.]+(?:[?#]|$)))*/?)?([^?#/]*))'
+		// query string
+		+ '(?:\\?([^#]*))?'
+		// fragment
+		+ '(?:#(.*))?)',
+	keys = {
+			1: "scheme",
+			4: "user",
+			5: "pass",
+			6: "host",
+			7: "port",
+			9: "path",
+			12: "query",
+			13: "fragment"
+	},
+	results = {};
+
+	if (url.indexOf('mailto:') === 0) {
+		results['scheme'] = 'mailto';
+		results['path'] = url.replace('mailto:', '');
+		return results;
+	}
+
+	if (url.indexOf('javascript:') === 0) {
+		results['scheme'] = 'javascript';
+		results['path'] = url.replace('javascript:', '');
+		return results;
+	}
+
+	var re = new RegExp(re_str);
+	var matches = re.exec(url);
+
+	for (var i in keys) {
+		if (matches[i]) {
+			results[keys[i]] = matches[i];
+		}
+	}
+
+	if (expand && typeof(results['query']) != 'undefined') {
+		results['query'] = elgg.parse_str(results['query']);
+	}
+
+	if (component) {
+		if (typeof(results[component]) != 'undefined') {
+			return results[component];
+		} else {
+			return false;
+		}
+	}
+	return results;
+};
+
+/**
+ * Returns an object with key/values of the parsed query string.
+ *
+ * @param  {String} string The string to parse
+ * @return {Object} The parsed object string
+ */
+elgg.parse_str = function(string) {
+	var params = {};
+	var result,
+		key,
+		value,
+		re = /([^&=]+)=?([^&]*)/g;
+
+	while (result = re.exec(string)) {
+		key = decodeURIComponent(result[1].replace(/\+/g, ' '));
+		value = decodeURIComponent(result[2].replace(/\+/g, ' '));
+		params[key] = value;
+	}
+	
+	return params;
+};
+
+/**
+ * Returns a jQuery selector from a URL's fragement.  Defaults to expecting an ID.
+ *
+ * Examples:
+ *  http://elgg.org/download.php returns ''
+ *	http://elgg.org/download.php#id returns #id
+ *	http://elgg.org/download.php#.class-name return .class-name
+ *	http://elgg.org/download.php#a.class-name return a.class-name
+ *
+ * @param {String} url The URL
+ * @return {String} The selector
+ */
+elgg.getSelectorFromUrlFragment = function(url) {
+	var fragment = url.split('#')[1];
+
+	if (fragment) {
+		// this is a .class or a tag.class
+		if (fragment.indexOf('.') > -1) {
+			return fragment;
+		}
+
+		// this is an id
+		else {
+			return '#' + fragment;
+		}
+	}
+	return '';
+};
+
+/**
+ * Adds child to object[parent] array.
+ *
+ * @param {Object} object The object to add to
+ * @param {String} parent The parent array to add to.
+ * @param {Mixed}  value  The value
+ */
+elgg.push_to_object_array = function(object, parent, value) {
+	elgg.assertTypeOf('object', object);
+	elgg.assertTypeOf('string', parent);
+
+	if (!(object[parent] instanceof Array)) {
+		object[parent] = []
+	}
+
+	if ($.inArray(value, object[parent]) < 0) {
+		return object[parent].push(value);
+	}
+
+	return false;
+};
+
+/**
+ * Tests if object[parent] contains child
+ *
+ * @param {Object} object The object to add to
+ * @param {String} parent The parent array to add to.
+ * @param {Mixed}  value  The value
+ */
+elgg.is_in_object_array = function(object, parent, value) {
+	elgg.assertTypeOf('object', object);
+	elgg.assertTypeOf('string', parent);
+
+	return typeof(object[parent]) != 'undefined' && $.inArray(value, object[parent]) >= 0;
+};
+
+/**
+ * Triggers the init hook when the library is ready
+ *
+ * Current requirements:
+ * - DOM is ready
+ * - languages loaded
+ *
+ */
+elgg.initWhenReady = function() {
+	if (elgg.config.languageReady && elgg.config.domReady) {
+		elgg.trigger_hook('init', 'system');
+		elgg.trigger_hook('ready', 'system');
+	}
+};
diff --git a/js/lib/hooks.js b/js/lib/hooks.js
new file mode 100644
index 000000000..5e1808e22
--- /dev/null
+++ b/js/lib/hooks.js
@@ -0,0 +1,173 @@
+/*
+ * Javascript hook interface
+ */
+
+elgg.provide('elgg.config.hooks');
+elgg.provide('elgg.config.instant_hooks');
+elgg.provide('elgg.config.triggered_hooks');
+
+/**
+ * Registers a hook handler with the event system.
+ *
+ * The special keyword "all" can be used for either the name or the type or both
+ * and means to call that handler for all of those hooks.
+ *
+ * Note that handlers registering for instant hooks will be executed immediately if the instant
+ * hook has been previously triggered.
+ *
+ * @param {String}   name     Name of the plugin hook to register for
+ * @param {String}   type     Type of the event to register for
+ * @param {Function} handler  Handle to call
+ * @param {Number}   priority Priority to call the event handler
+ * @return {Bool}
+ */
+elgg.register_hook_handler = function(name, type, handler, priority) {
+	elgg.assertTypeOf('string', name);
+	elgg.assertTypeOf('string', type);
+	elgg.assertTypeOf('function', handler);
+
+	if (!name || !type) {
+		return false;
+	}
+
+	var priorities =  elgg.config.hooks;
+
+	elgg.provide(name + '.' + type, priorities);
+
+	if (!(priorities[name][type] instanceof elgg.ElggPriorityList)) {
+		priorities[name][type] = new elgg.ElggPriorityList();
+	}
+
+	// call if instant and already triggered.
+	if (elgg.is_instant_hook(name, type) && elgg.is_triggered_hook(name, type)) {
+		handler(name, type, null, null);
+	}
+
+	return priorities[name][type].insert(handler, priority);
+};
+
+/**
+ * Emits a hook.
+ *
+ * Loops through all registered hooks and calls the handler functions in order.
+ * Every handler function will always be called, regardless of the return value.
+ *
+ * @warning Handlers take the same 4 arguments in the same order as when calling this function.
+ * This is different from the PHP version!
+ *
+ * @note Instant hooks do not support params or values.
+ *
+ * Hooks are called in this order:
+ *	specifically registered (event_name and event_type match)
+ *	all names, specific type
+ *	specific name, all types
+ *	all names, all types
+ *
+ * @param {String} name   Name of the hook to emit
+ * @param {String} type   Type of the hook to emit
+ * @param {Object} params Optional parameters to pass to the handlers
+ * @param {Object} value  Initial value of the return. Can be mangled by handlers
+ *
+ * @return {Bool}
+ */
+elgg.trigger_hook = function(name, type, params, value) {
+	elgg.assertTypeOf('string', name);
+	elgg.assertTypeOf('string', type);
+
+	// mark as triggered
+	elgg.set_triggered_hook(name, type);
+
+	// default to true if unpassed
+	value = value || true;
+
+	var hooks = elgg.config.hooks,
+		tempReturnValue = null,
+		returnValue = value,
+		callHookHandler = function(handler) {
+			tempReturnValue = handler(name, type, params, value);
+		};
+
+	elgg.provide(name + '.' + type, hooks);
+	elgg.provide('all.' + type, hooks);
+	elgg.provide(name + '.all', hooks);
+	elgg.provide('all.all', hooks);
+
+	var hooksList = [];
+	
+	if (name != 'all' && type != 'all') {
+		hooksList.push(hooks[name][type]);
+	}
+
+	if (type != 'all') {
+		hooksList.push(hooks['all'][type]);
+	}
+
+	if (name != 'all') {
+		hooksList.push(hooks[name]['all']);
+	}
+
+	hooksList.push(hooks['all']['all']);
+
+	hooksList.every(function(handlers) {
+		if (handlers instanceof elgg.ElggPriorityList) {
+			handlers.forEach(callHookHandler);
+		}
+		return true;
+	});
+
+	return (tempReturnValue != null) ? tempReturnValue : returnValue;
+};
+
+/**
+ * Registers a hook as an instant hook.
+ *
+ * After being trigger once, registration of a handler to an instant hook will cause the
+ * handle to be executed immediately.
+ *
+ * @note Instant hooks must be triggered without params or defaults. Any params or default
+ * passed will *not* be passed to handlers executed upon registration.
+ *
+ * @param {String} name The hook name.
+ * @param {String} type The hook type.
+ * @return {Int}
+ */
+elgg.register_instant_hook = function(name, type) {
+	elgg.assertTypeOf('string', name);
+	elgg.assertTypeOf('string', type);
+
+	return elgg.push_to_object_array(elgg.config.instant_hooks, name, type);
+};
+
+/**
+ * Is this hook registered as an instant hook?
+ *
+ * @param {String} name The hook name.
+ * @param {String} type The hook type.
+ */
+elgg.is_instant_hook = function(name, type) {
+	return elgg.is_in_object_array(elgg.config.instant_hooks, name, type);
+};
+
+/**
+ * Records that a hook has been triggered.
+ *
+ * @param {String} name The hook name.
+ * @param {String} type The hook type.
+ */
+elgg.set_triggered_hook = function(name, type) {
+	return elgg.push_to_object_array(elgg.config.triggered_hooks, name, type);
+};
+
+/**
+ * Has this hook been triggered yet?
+ *
+ * @param {String} name The hook name.
+ * @param {String} type The hook type.
+ */
+elgg.is_triggered_hook = function(name, type) {
+	return elgg.is_in_object_array(elgg.config.triggered_hooks, name, type);
+};
+
+elgg.register_instant_hook('init', 'system');
+elgg.register_instant_hook('ready', 'system');
+elgg.register_instant_hook('boot', 'system');
diff --git a/js/lib/languages.js b/js/lib/languages.js
new file mode 100644
index 000000000..d218cbc4f
--- /dev/null
+++ b/js/lib/languages.js
@@ -0,0 +1,96 @@
+/*globals vsprintf*/
+/**
+ * Provides language-related functionality
+ */
+elgg.provide('elgg.config.translations');
+
+// default language - required by unit tests
+elgg.config.language = 'en';
+
+/**
+ * Analagous to the php version.  Merges translations for a
+ * given language into the current translations map.
+ */
+elgg.add_translation = function(lang, translations) {
+	elgg.provide('elgg.config.translations.' + lang);
+
+	elgg.extend(elgg.config.translations[lang], translations);
+};
+
+/**
+ * Load the translations for the given language.
+ *
+ * If no language is specified, the default language is used.
+ * @param {string} language
+ * @return {XMLHttpRequest}
+ */
+elgg.reload_all_translations = function(language) {
+	var lang = language || elgg.get_language();
+
+	var url, options;
+	url = 'ajax/view/js/languages';
+	options = {data: {language: lang}};
+    if (elgg.config.simplecache_enabled) {
+        options.data.lc = elgg.config.lastcache;
+    }
+
+	options['success'] = function(json) {
+		elgg.add_translation(lang, json);
+		elgg.config.languageReady = true;
+		elgg.initWhenReady();
+	};
+
+	elgg.getJSON(url, options);
+};
+
+/**
+ * Get the current language
+ * @return {String}
+ */
+elgg.get_language = function() {
+	var user = elgg.get_logged_in_user_entity();
+
+	if (user && user.language) {
+		return user.language;
+	}
+
+	return elgg.config.language;
+};
+
+/**
+ * Translates a string
+ *
+ * @param {String} key      The string to translate
+ * @param {Array}  argv     vsprintf support
+ * @param {String} language The language to display it in
+ *
+ * @return {String} The translation
+ */
+elgg.echo = function(key, argv, language) {
+	//elgg.echo('str', 'en')
+	if (elgg.isString(argv)) {
+		language = argv;
+		argv = [];
+	}
+
+	//elgg.echo('str', [...], 'en')
+	var translations = elgg.config.translations,
+		dlang = elgg.get_language(),
+		map;
+
+	language = language || dlang;
+	argv = argv || [];
+
+	map = translations[language] || translations[dlang];
+	if (map && map[key]) {
+		return vsprintf(map[key], argv);
+	}
+
+	return key;
+};
+
+elgg.config.translations.init = function() {
+	elgg.reload_all_translations();
+};
+
+elgg.register_hook_handler('boot', 'system', elgg.config.translations.init);
+\ No newline at end of file
diff --git a/js/lib/pageowner.js b/js/lib/pageowner.js
new file mode 100644
index 000000000..c695c41c3
--- /dev/null
+++ b/js/lib/pageowner.js
@@ -0,0 +1,18 @@
+/**
+ * Provides page owner and context functions
+ *
+ * @todo This is a stub. Page owners can't be fully implemented until
+ * the 4 types are finished.
+ */
+
+/**
+ * @return {number} The GUID of the page owner entity or 0 for no owner
+ */
+elgg.get_page_owner_guid = function() {
+	if (elgg.page_owner !== undefined) {
+		return elgg.page_owner.guid;
+	} else {
+		return 0;
+	}
+};
+
diff --git a/js/lib/prototypes.js b/js/lib/prototypes.js
new file mode 100644
index 000000000..cb6184097
--- /dev/null
+++ b/js/lib/prototypes.js
@@ -0,0 +1,66 @@
+/**
+ * Interates through each element of an array and calls a callback function.
+ * The callback should accept the following arguments:
+ *	element - The current element
+ *	index	- The current index
+ *
+ * This is different to Array.forEach in that if the callback returns false, the loop returns
+ * immediately without processing the remaining elements.
+ *
+ *	@param {Function} callback
+ *	@return {Bool}
+ */
+if (!Array.prototype.every) {
+	Array.prototype.every = function(callback) {
+		var len = this.length, i;
+
+		for (i = 0; i < len; i++) {
+			if (i in this && !callback.call(null, this[i], i)) {
+				return false;
+			}
+		}
+
+		return true;
+	};
+}
+
+/**
+ * Interates through each element of an array and calls callback a function.
+ * The callback should accept the following arguments:
+ *	element - The current element
+ *	index	- The current index
+ *
+ * This is different to Array.every in that the callback's return value is ignored and every
+ * element of the array will be parsed.
+ *
+ *	@param {Function} callback
+ *	@return {Void}
+ */
+if (!Array.prototype.forEach) {
+	Array.prototype.forEach = function(callback) {
+		var len = this.length, i;
+
+		for (i = 0; i < len; i++) {
+			if (i in this) {
+				callback.call(null, this[i], i);
+			}
+		}
+	};
+}
+
+/**
+ * Left trim
+ *
+ * Removes a character from the left side of a string.
+ * @param {String} str The character to remove
+ * @return {String}
+ */
+if (!String.prototype.ltrim) {
+	String.prototype.ltrim = function(str) {
+		if (this.indexOf(str) === 0) {
+			return this.substring(str.length);
+		} else {
+			return this;
+		}
+	};
+}
+\ No newline at end of file
diff --git a/js/lib/security.js b/js/lib/security.js
new file mode 100644
index 000000000..9c12f8586
--- /dev/null
+++ b/js/lib/security.js
@@ -0,0 +1,107 @@
+/**
+ * Hold security-related data here
+ */
+elgg.provide('elgg.security');
+
+elgg.security.token = {};
+
+elgg.security.tokenRefreshFailed = false;
+
+elgg.security.tokenRefreshTimer = null;
+
+/**
+ * Sets the currently active security token and updates all forms and links on the current page.
+ *
+ * @param {Object} json The json representation of a token containing __elgg_ts and __elgg_token
+ * @return {Void}
+ */
+elgg.security.setToken = function(json) {	
+	//update the convenience object
+	elgg.security.token = json;
+
+	//also update all forms
+	$('[name=__elgg_ts]').val(json.__elgg_ts);
+	$('[name=__elgg_token]').val(json.__elgg_token);
+
+	// also update all links that contain tokens and time stamps
+	$('[href*="__elgg_ts"][href*="__elgg_token"]').each(function() {
+		this.href = this.href
+			.replace(/__elgg_ts=\d*/, '__elgg_ts=' + json.__elgg_ts)
+			.replace(/__elgg_token=[0-9a-f]*/, '__elgg_token=' + json.__elgg_token);
+	});
+};
+
+/**
+ * Security tokens time out so we refresh those every so often.
+ * 
+ * @private
+ */
+elgg.security.refreshToken = function() {
+	elgg.action('security/refreshtoken', function(data) {
+		if (data && data.output.__elgg_ts && data.output.__elgg_token) {
+			elgg.security.setToken(data.output);
+		} else {
+			clearInterval(elgg.security.tokenRefreshTimer);
+		}
+	});
+};
+
+
+/**
+ * Add elgg action tokens to an object, URL, or query string (with a ?).
+ *
+ * @param {Object|string} data
+ * @return {Object} The new data object including action tokens
+ * @private
+ */
+elgg.security.addToken = function(data) {
+
+	// 'http://example.com?data=sofar'
+	if (elgg.isString(data)) {
+		// is this a full URL, relative URL, or just the query string?
+		var parts = elgg.parse_url(data),
+			args = {},
+			base = '';
+		
+		if (parts['host'] == undefined) {
+			if (data.indexOf('?') === 0) {
+				// query string
+				base = '?';
+				args = elgg.parse_str(parts['query']);
+			}
+		} else {
+			// full or relative URL
+
+			if (parts['query'] != undefined) {
+				// with query string
+				args = elgg.parse_str(parts['query']);
+			}
+			var split = data.split('?');
+			base = split[0] + '?';
+		}
+		args["__elgg_ts"] = elgg.security.token.__elgg_ts;
+		args["__elgg_token"] = elgg.security.token.__elgg_token;
+
+		return base + jQuery.param(args);
+	}
+
+	// no input!  acts like a getter
+	if (elgg.isUndefined(data)) {
+		return elgg.security.token;
+	}
+
+	// {...}
+	if (elgg.isPlainObject(data)) {
+		return elgg.extend(data, elgg.security.token);
+	}
+
+	// oops, don't recognize that!
+	throw new TypeError("elgg.security.addToken not implemented for " + (typeof data) + "s");
+};
+
+elgg.security.init = function() {
+	// elgg.security.interval is set in the js/elgg PHP view.
+	elgg.security.tokenRefreshTimer = setInterval(elgg.security.refreshToken, elgg.security.interval);
+};
+
+elgg.register_hook_handler('boot', 'system', elgg.security.init);
+\ No newline at end of file
diff --git a/js/lib/session.js b/js/lib/session.js
new file mode 100644
index 000000000..a8d52733c
--- /dev/null
+++ b/js/lib/session.js
@@ -0,0 +1,123 @@
+/**
+ * Provides session methods.
+ */
+elgg.provide('elgg.session');
+
+/**
+ * Helper function for setting cookies
+ * @param {string} name
+ * @param {string} value
+ * @param {Object} options
+ * 
+ *  {number|Date} options[expires]
+ * 	{string} options[path]
+ * 	{string} options[domain]
+ * 	{boolean} options[secure]
+ * 
+ * @return {string|undefined} The value of the cookie, if only name is specified. Undefined if no value set
+ */
+elgg.session.cookie = function(name, value, options) {
+	var cookies = [], cookie = [], i = 0, date, valid = true;
+	
+	//elgg.session.cookie()
+	if (elgg.isUndefined(name)) {
+		return document.cookie;
+	}
+	
+	//elgg.session.cookie(name)
+	if (elgg.isUndefined(value)) {
+		if (document.cookie && document.cookie !== '') {
+			cookies = document.cookie.split(';');
+			for (i = 0; i < cookies.length; i += 1) {
+				cookie = jQuery.trim(cookies[i]).split('=');
+				if (cookie[0] === name) {
+					return decodeURIComponent(cookie[1]);
+				}
+			}
+		}
+		return undefined;
+	}
+	
+	// elgg.session.cookie(name, value[, opts])
+	options = options || {};
+	
+	if (elgg.isNull(value)) {
+		value = '';
+		options.expires = -1;
+	}
+	
+	cookies.push(name + '=' + value);
+
+    if (options.expires) {
+        if (elgg.isNumber(options.expires)) {
+            date = new Date();
+            date.setTime(date.getTime() + (options.expires * 24 * 60 * 60 * 1000));
+        } else if (options.expires.toUTCString) {
+            date = options.expires;
+        }
+
+        if (date) {
+            cookies.push('expires=' + date.toUTCString());
+        }
+    }
+	
+	// CAUTION: Needed to parenthesize options.path and options.domain
+	// in the following expressions, otherwise they evaluate to undefined
+	// in the packed version for some reason.
+	if (options.path) {
+		cookies.push('path=' + (options.path));
+	}
+
+	if (options.domain) {
+		cookies.push('domain=' + (options.domain));
+	}
+	
+	if (options.secure) {
+		cookies.push('secure');
+	}
+	
+	document.cookie = cookies.join('; ');
+};
+
+/**
+ * Returns the object of the user logged in.
+ *
+ * @return {ElggUser} The logged in user
+ */
+elgg.get_logged_in_user_entity = function() {
+	return elgg.session.user;
+};
+
+/**
+ * Returns the GUID of the logged in user or 0.
+ *
+ * @return {number} The GUID of the logged in user
+ */
+elgg.get_logged_in_user_guid = function() {
+	var user = elgg.get_logged_in_user_entity();
+	return user ? user.guid : 0;
+};
+
+/**
+ * Returns if a user is logged in.
+ *
+ * @return {boolean} Whether there is a user logged in
+ */
+elgg.is_logged_in = function() {
+	return (elgg.get_logged_in_user_entity() instanceof elgg.ElggUser);
+};
+
+/**
+ * Returns if the currently logged in user is an admin.
+ *
+ * @return {boolean} Whether there is an admin logged in
+ */
+elgg.is_admin_logged_in = function() {
+	var user = elgg.get_logged_in_user_entity();
+	return (user instanceof elgg.ElggUser) && user.isAdmin();
+};
+
+/**
+ * @deprecated Use elgg.session.cookie instead
+ */
+jQuery.cookie = elgg.session.cookie;
+\ No newline at end of file
diff --git a/js/lib/ui.autocomplete.js b/js/lib/ui.autocomplete.js
new file mode 100644
index 000000000..46d72d146
--- /dev/null
+++ b/js/lib/ui.autocomplete.js
@@ -0,0 +1,14 @@
+/**
+ * 
+ */
+elgg.provide('elgg.autocomplete');
+
+elgg.autocomplete.init = function() {
+	$('.elgg-input-autocomplete').autocomplete({
+		source: elgg.autocomplete.url, //gets set by input/autocomplete view
+		minLength: 2,
+		html: "html"
+	})
+};
+
+elgg.register_hook_handler('init', 'system', elgg.autocomplete.init);
+\ No newline at end of file
diff --git a/js/lib/ui.avatar_cropper.js b/js/lib/ui.avatar_cropper.js
new file mode 100644
index 000000000..fc32a0832
--- /dev/null
+++ b/js/lib/ui.avatar_cropper.js
@@ -0,0 +1,76 @@
+/**
+ * Avatar cropping
+ */
+
+elgg.provide('elgg.avatarCropper');
+
+/**
+ * Register the avatar cropper.
+ *
+ * If the hidden inputs have the coordinates from a previous cropping, begin
+ * the selection and preview with that displayed.
+ */
+elgg.avatarCropper.init = function() {
+	var params = {
+		selectionOpacity: 0,
+		aspectRatio: '1:1',
+		onSelectEnd: elgg.avatarCropper.selectChange,
+		onSelectChange: elgg.avatarCropper.preview
+	};
+
+	if ($('input[name=x2]').val()) {
+		params.x1 = $('input[name=x1]').val();
+		params.x2 = $('input[name=x2]').val();
+		params.y1 = $('input[name=y1]').val();
+		params.y2 = $('input[name=y2]').val();
+	}
+
+	$('#user-avatar-cropper').imgAreaSelect(params);
+
+	if ($('input[name=x2]').val()) {
+		var ias = $('#user-avatar-cropper').imgAreaSelect({instance: true});
+		var selection = ias.getSelection();
+		elgg.avatarCropper.preview($('#user-avatar-cropper'), selection);
+	}
+};
+
+/**
+ * Handler for changing select area.
+ *
+ * @param {Object} reference to the image
+ * @param {Object} imgareaselect selection object
+ * @return void
+ */
+elgg.avatarCropper.preview = function(img, selection) {
+	// catch for the first click on the image
+	if (selection.width == 0 || selection.height == 0) {
+		return;
+	}
+
+	var origWidth = $("#user-avatar-cropper").width();
+	var origHeight = $("#user-avatar-cropper").height();
+	var scaleX = 100 / selection.width;
+	var scaleY = 100 / selection.height;
+	$('#user-avatar-preview > img').css({
+		width: Math.round(scaleX * origWidth) + 'px',
+		height: Math.round(scaleY * origHeight) + 'px',
+		marginLeft: '-' + Math.round(scaleX * selection.x1) + 'px',
+		marginTop: '-' + Math.round(scaleY * selection.y1) + 'px'
+	});
+};
+
+/**
+ * Handler for updating the form inputs after select ends
+ *
+ * @param {Object} reference to the image
+ * @param {Object} imgareaselect selection object
+ * @return void
+ */
+elgg.avatarCropper.selectChange = function(img, selection) {
+	$('input[name=x1]').val(selection.x1);
+	$('input[name=x2]').val(selection.x2);
+	$('input[name=y1]').val(selection.y1);
+	$('input[name=y2]').val(selection.y2);
+};
+
+elgg.register_hook_handler('init', 'system', elgg.avatarCropper.init);
+\ No newline at end of file
diff --git a/js/lib/ui.friends_picker.js b/js/lib/ui.friends_picker.js
new file mode 100644
index 000000000..9257c40fc
--- /dev/null
+++ b/js/lib/ui.friends_picker.js
@@ -0,0 +1,91 @@
+/*
+	elgg friendsPicker plugin
+	adapted from Niall Doherty's excellent Coda-Slider - http://www.ndoherty.com/coda-slider
+ */
+
+
+jQuery.fn.friendsPicker = function(iterator) {
+
+	var settings; 
+	settings = $.extend({ easeFunc: "easeOutExpo", easeTime: 1000, toolTip: false }, settings);
+
+	return this.each(function() {
+
+		var container = $(this);
+		container.addClass("friends-picker");
+		// set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 
+		var panelWidth = 730;
+
+		// count the panels in the container
+		var panelCount = container.find("div.panel").size();
+		// calculate the width of all the panels lined up end-to-end
+		var friendsPicker_containerWidth = panelWidth*panelCount;
+		// specify width for the friendsPicker_container
+		container.find("div.friends-picker-container").css("width" , friendsPicker_containerWidth);
+
+		// global variables for container.each function below
+		var friendsPickerNavigationWidth = 0;
+		var currentPanel = 1;
+
+		// generate appropriate nav for each container
+		container.each(function(i) {
+			// generate Left and Right arrows
+			$(this).before("<div class='friends-picker-navigation-l' id='friends-picker-navigation-l" + iterator + "'><a href='#'>Left</a><\/div>");
+			$(this).after("<div class='friends-picker-navigation-r' id='friends-picker-navigation-r" + iterator + "'><a href='#'>Right</a><\/div>");
+
+			// generate a-z tabs
+			$(this).before("<div class='friends-picker-navigation' id='friends-picker-navigation" + iterator + "'><ul><\/ul><\/div>");
+			$(this).find("div.panel").each(function(individualTabItemNumber) {
+				$("div#friends-picker-navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");		
+			});
+
+			// tabs navigation
+			$("div#friends-picker-navigation" + iterator + " a").each(function(individualTabItemNumber) {
+				// calc friendsPickerNavigationWidth by summing width of each li
+				friendsPickerNavigationWidth += $(this).parent().width();
+				// set-up individual tab clicks
+				$(this).bind("click", function() {
+					$(this).addClass("current").parent().parent().find("a").not($(this)).removeClass("current"); 
+					var distanceToMoveFriendsPicker_container = - (panelWidth*individualTabItemNumber);
+					currentPanel = individualTabItemNumber + 1;
+					$(this).parent().parent().parent().next().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				});
+			});
+
+			// Right arow click function
+			$("div#friends-picker-navigation-r" + iterator + " a").click(function() {
+				if (currentPanel == panelCount) {
+					var distanceToMoveFriendsPicker_container = 0;
+					currentPanel = 1; 
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
+				} else {
+					var distanceToMoveFriendsPicker_container = - (panelWidth*currentPanel);
+					currentPanel += 1;
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
+				};
+				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				return false;
+			});
+
+			// Left arrow click function
+			$("div#friends-picker-navigation-l" + iterator + " a").click(function() {
+				if (currentPanel == 1) {
+					var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));
+					currentPanel = panelCount;
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
+				} else {
+					currentPanel -= 1;
+					var distanceToMoveFriendsPicker_container = - (panelWidth*(currentPanel - 1));
+					$(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
+				};
+				$(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+				return false;
+			});
+
+			// apply 'current' class to currently selected tab link
+			$("div#friends-picker-navigation" + iterator + " a:eq(0)").addClass("current");
+		});
+
+		$("div#friends-picker-navigation" + iterator).append("<br />");		
+	});
+};
+\ No newline at end of file
diff --git a/js/lib/ui.js b/js/lib/ui.js
new file mode 100644
index 000000000..413078b4f
--- /dev/null
+++ b/js/lib/ui.js
@@ -0,0 +1,293 @@
+elgg.provide('elgg.ui');
+
+elgg.ui.init = function () {
+	// add user hover menus
+	elgg.ui.initHoverMenu();
+
+	//if the user clicks a system message, make it disappear
+	$('.elgg-system-messages li').live('click', function() {
+		$(this).stop().fadeOut('fast');
+	});
+
+	$('.elgg-system-messages li').animate({opacity: 0.9}, 6000);
+	$('.elgg-system-messages li.elgg-state-success').fadeOut('slow');
+
+	$('[rel=toggle]').live('click', elgg.ui.toggles);
+
+	$('[rel=popup]').live('click', elgg.ui.popupOpen);
+
+	$('.elgg-menu-page .elgg-menu-parent').live('click', elgg.ui.toggleMenu);
+
+	$('.elgg-requires-confirmation').live('click', elgg.ui.requiresConfirmation);
+
+	$('.elgg-autofocus').focus();
+};
+
+/**
+ * Toggles an element based on clicking a separate element
+ *
+ * Use rel="toggle" on the toggler element
+ * Set the href to target the item you want to toggle (<a rel="toggle" href="#id-of-target">)
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.toggles = function(event) {
+	event.preventDefault();
+
+	// @todo might want to switch this to elgg.getSelectorFromUrlFragment().
+	var target = $(this).toggleClass('elgg-state-active').attr('href');
+
+	$(target).slideToggle('medium');
+};
+
+/**
+ * Pops up an element based on clicking a separate element
+ *
+ * Set the rel="popup" on the popper and set the href to target the
+ * item you want to toggle (<a rel="popup" href="#id-of-target">)
+ *
+ * This function emits the getOptions, ui.popup hook that plugins can register for to provide custom
+ * positioning for elements.  The handler is passed the following params:
+ *	targetSelector: The selector used to find the popup
+ *	target:         The popup jQuery element as found by the selector
+ *	source:         The jquery element whose click event initiated a popup.
+ *
+ * The return value of the function is used as the options object to .position().
+ * Handles can also return false to abort the default behvior and override it with their own.
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.popupOpen = function(event) {
+	event.preventDefault();
+	event.stopPropagation();
+
+	var target = elgg.getSelectorFromUrlFragment($(this).toggleClass('elgg-state-active').attr('href'));
+	var $target = $(target);
+
+	// emit a hook to allow plugins to position and control popups
+	var params = {
+		targetSelector: target,
+		target: $target,
+		source: $(this)
+	};
+
+	var options = {
+		my: 'center top',
+		at: 'center bottom',
+		of: $(this),
+		collision: 'fit fit'
+	}
+
+	options = elgg.trigger_hook('getOptions', 'ui.popup', params, options);
+
+	// allow plugins to cancel event
+	if (!options) {
+		return;
+	}
+
+	// hide if already open
+	if ($target.is(':visible')) {
+		$target.fadeOut();
+		$('body').die('click', elgg.ui.popupClose);
+		return;
+	}
+
+	$target.appendTo('body')
+		.fadeIn()
+		.position(options);
+
+	$('body')
+		.die('click', elgg.ui.popupClose)
+		.live('click', elgg.ui.popupClose);
+};
+
+/**
+ * Catches clicks that aren't in a popup and closes all popups.
+ */
+elgg.ui.popupClose = function(event) {
+	$eventTarget = $(event.target);
+	var inTarget = false;
+	var $popups = $('[rel=popup]');
+
+	// if the click event target isn't in a popup target, fade all of them out.
+	$popups.each(function(i, e) {
+		var target = elgg.getSelectorFromUrlFragment($(e).attr('href')) + ':visible';
+		var $target = $(target);
+
+		if (!$target.is(':visible')) {
+			return;
+		}
+
+		// didn't click inside the target
+		if ($eventTarget.closest(target).length > 0) {
+			inTarget = true;
+			return false;
+		}
+	});
+
+	if (!inTarget) {
+		$popups.each(function(i, e) {
+			var $e = $(e);
+			var $target = $(elgg.getSelectorFromUrlFragment($e.attr('href')) + ':visible');
+			if ($target.length > 0) {
+				$target.fadeOut();
+				$e.removeClass('elgg-state-active');
+			}
+		});
+
+		$('body').die('click', elgg.ui.popClose);
+	}
+};
+
+/**
+ * Toggles a child menu when the parent is clicked
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.toggleMenu = function(event) {
+	$(this).siblings().slideToggle('medium');
+	$(this).toggleClass('elgg-menu-closed elgg-menu-opened');
+	event.preventDefault();
+};
+
+/**
+ * Initialize the hover menu
+ *
+ * @param {Object} parent
+ * @return void
+ */
+elgg.ui.initHoverMenu = function(parent) {
+	if (!parent) {
+		parent = document;
+	}
+
+	// avatar image menu link
+	$(parent).find(".elgg-avatar").live('mouseover', function() {
+		$(this).children(".elgg-icon-hover-menu").show();
+	})
+	.live('mouseout', function() {
+		$(this).children(".elgg-icon-hover-menu").hide();
+	});
+
+
+	// avatar contextual menu
+	$(".elgg-avatar > .elgg-icon-hover-menu").live('click', function(e) {
+		// check if we've attached the menu to this element already
+		var $hovermenu = $(this).data('hovermenu') || null;
+
+		if (!$hovermenu) {
+			$hovermenu = $(this).parent().find(".elgg-menu-hover");
+			$(this).data('hovermenu', $hovermenu);
+		}
+
+		// close hovermenu if arrow is clicked & menu already open
+		if ($hovermenu.css('display') == "block") {
+			$hovermenu.fadeOut();
+		} else {
+			$avatar = $(this).closest(".elgg-avatar");
+
+			// @todo Use jQuery-ui position library instead -- much simpler
+			var offset = $avatar.offset();
+			var top = $avatar.height() + offset.top + 'px';
+			var left = $avatar.width() - 15 + offset.left + 'px';
+
+			$hovermenu.appendTo('body')
+					.css('position', 'absolute')
+					.css("top", top)
+					.css("left", left)
+					.fadeIn('normal');
+		}
+
+		// hide any other open hover menus
+		$(".elgg-menu-hover:visible").not($hovermenu).fadeOut();
+	});
+
+	// hide avatar menu when user clicks elsewhere
+	$(document).click(function(event) {
+		if ($(event.target).parents(".elgg-avatar").length == 0) {
+			$(".elgg-menu-hover").fadeOut();
+		}
+	});
+};
+
+/**
+ * Calls a confirm() and prevents default if denied.
+ *
+ * @param {Object} e
+ * @return void
+ */
+elgg.ui.requiresConfirmation = function(e) {
+	var confirmText = $(this).attr('rel') || elgg.echo('question:areyousure');
+	if (!confirm(confirmText)) {
+		e.preventDefault();
+	}
+};
+
+/**
+ * Repositions the login popup
+ *
+ * @param {String} hook    'getOptions'
+ * @param {String} type    'ui.popup'
+ * @param {Object} params  An array of info about the target and source.
+ * @param {Object} options Options to pass to
+ *
+ * @return {Object}
+ */
+elgg.ui.loginHandler = function(hook, type, params, options) {
+	if (params.target.attr('id') == 'login-dropdown-box') {
+		options.my = 'right top';
+		options.at = 'right bottom';
+		return options;
+	}
+	return null;
+};
+
+/**
+ * Initialize the date picker
+ *
+ * Uses the class .elgg-input-date as the selector.
+ *
+ * If the class .elgg-input-timestamp is set on the input element, the onSelect
+ * method converts the date text to a unix timestamp in seconds. That value is
+ * stored in a hidden element indicated by the id on the input field.
+ *
+ * @return void
+ */
+elgg.ui.initDatePicker = function() {
+	var loadDatePicker = function() {
+		$('.elgg-input-date').datepicker({
+			// ISO-8601
+			dateFormat: 'yy-mm-dd',
+			onSelect: function(dateText) {
+				if ($(this).is('.elgg-input-timestamp')) {
+					// convert to unix timestamp
+					var dateParts = dateText.split("-");
+					var timestamp = Date.UTC(dateParts[0], dateParts[1] - 1, dateParts[2]);
+					timestamp = timestamp / 1000;
+
+					var id = $(this).attr('id');
+					$('input[name="' + id + '"]').val(timestamp);
+				}
+			}
+		});
+	};
+	
+	if ($('.elgg-input-date').length && elgg.get_language() == 'en') {
+		loadDatePicker();
+	} else if ($('.elgg-input-date').length) {
+		elgg.get({
+			url: elgg.config.wwwroot + 'vendors/jquery/i18n/jquery.ui.datepicker-'+ elgg.get_language() +'.js',
+			dataType: "script",
+			cache: true,
+			success: loadDatePicker,
+			error: loadDatePicker // english language is already loaded.
+		});
+	}
+};
+
+elgg.register_hook_handler('init', 'system', elgg.ui.init);
+elgg.register_hook_handler('init', 'system', elgg.ui.initDatePicker);
+elgg.register_hook_handler('getOptions', 'ui.popup', elgg.ui.loginHandler);
diff --git a/js/lib/ui.river.js b/js/lib/ui.river.js
new file mode 100644
index 000000000..c103fabb3
--- /dev/null
+++ b/js/lib/ui.river.js
@@ -0,0 +1,14 @@
+elgg.provide('elgg.ui.river');
+
+elgg.ui.river.init = function() {
+	$('#elgg-river-selector').change(function() {
+		var url = window.location.href;
+		if (window.location.search.length) {
+			url = url.substring(0, url.indexOf('?'));
+		}
+		url += '?' + $(this).val();
+		elgg.forward(url);
+	});
+};
+
+elgg.register_hook_handler('init', 'system', elgg.ui.river.init);
+\ No newline at end of file
diff --git a/js/lib/ui.userpicker.js b/js/lib/ui.userpicker.js
new file mode 100644
index 000000000..669b84cdb
--- /dev/null
+++ b/js/lib/ui.userpicker.js
@@ -0,0 +1,117 @@
+elgg.provide('elgg.userpicker');
+
+/**
+ * Userpicker initialization
+ *
+ * The userpicker is an autocomplete library for selecting multiple users or
+ * friends. It works in concert with the view input/userpicker.
+ *
+ * @return void
+ */
+elgg.userpicker.init = function() {
+	
+	// binding autocomplete.
+	// doing this as an each so we can pass this to functions.
+	$('.elgg-input-user-picker').each(function() {
+
+		$(this).autocomplete({
+			source: function(request, response) {
+
+				var params = elgg.userpicker.getSearchParams(this);
+				
+				elgg.get('livesearch', {
+					data: params,
+					dataType: 'json',
+					success: function(data) {
+						response(data);
+					}
+				});
+			},
+			minLength: 2,
+			html: "html",
+			select: elgg.userpicker.addUser
+		})
+	});
+
+	$('.elgg-userpicker-remove').live('click', elgg.userpicker.removeUser);
+};
+
+/**
+ * Adds a user to the select user list
+ *
+ * elgg.userpicker.userList is defined in the input/userpicker view
+ *
+ * @param {Object} event
+ * @param {Object} ui    The object returned by the autocomplete endpoint
+ * @return void
+ */
+elgg.userpicker.addUser = function(event, ui) {
+	var info = ui.item;
+
+	// do not allow users to be added multiple times
+	if (!(info.guid in elgg.userpicker.userList)) {
+		elgg.userpicker.userList[info.guid] = true;
+		var users = $(this).siblings('.elgg-user-picker-list');
+		var li = '<input type="hidden" name="members[]" value="' + info.guid + '" />';
+		li += elgg.userpicker.viewUser(info);
+		$('<li>').html(li).appendTo(users);
+	}
+
+	$(this).val('');
+	event.preventDefault();
+};
+
+/**
+ * Remove a user from the selected user list
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.userpicker.removeUser = function(event) {
+	var item = $(this).closest('.elgg-user-picker-list > li');
+	
+	var guid = item.find('[name="members[]"]').val();
+	delete elgg.userpicker.userList[guid];
+
+	item.remove();
+	event.preventDefault();
+};
+
+/**
+ * Render the list item for insertion into the selected user list
+ *
+ * The html in this method has to remain synced with the input/userpicker view
+ *
+ * @param {Object} info  The object returned by the autocomplete endpoint
+ * @return string
+ */
+elgg.userpicker.viewUser = function(info) {
+
+	var deleteLink = "<a href='#' class='elgg-userpicker-remove'>X</a>";
+
+	var html = "<div class='elgg-image-block'>";
+	html += "<div class='elgg-image'>" + info.icon + "</div>";
+	html += "<div class='elgg-image-alt'>" + deleteLink + "</div>";
+	html += "<div class='elgg-body'>" + info.name + "</div>";
+	html += "</div>";
+	
+	return html;
+};
+
+/**
+ * Get the parameters to use for autocomplete
+ *
+ * This grabs the value of the friends checkbox.
+ *
+ * @param {Object} obj  Object for the autocomplete callback
+ * @return Object
+ */
+elgg.userpicker.getSearchParams = function(obj) {
+	if (obj.element.parent('.elgg-user-picker').find('input[name=match_on]').attr('checked')) {
+		return {'match_on[]': 'friends', 'term' : obj.term};
+	} else {
+		return {'match_on[]': 'users', 'term' : obj.term};
+	}
+};
+
+elgg.register_hook_handler('init', 'system', elgg.userpicker.init);
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
new file mode 100644
index 000000000..26020bb4b
--- /dev/null
+++ b/js/lib/ui.widgets.js
@@ -0,0 +1,209 @@
+elgg.provide('elgg.ui.widgets');
+
+/**
+ * Widgets initialization
+ *
+ * @return void
+ */
+elgg.ui.widgets.init = function() {
+
+	// widget layout?
+	if ($(".elgg-widgets").length == 0) {
+		return;
+	}
+
+	$(".elgg-widgets").sortable({
+		items:                'div.elgg-module-widget.elgg-state-draggable',
+		connectWith:          '.elgg-widgets',
+		handle:               '.elgg-widget-handle',
+		forcePlaceholderSize: true,
+		placeholder:          'elgg-widget-placeholder',
+		opacity:              0.8,
+		revert:               500,
+		stop:                 elgg.ui.widgets.move
+	});
+
+	$('.elgg-widgets-add-panel li.elgg-state-available').click(elgg.ui.widgets.add);
+
+	$('a.elgg-widget-delete-button').live('click', elgg.ui.widgets.remove);
+	$('.elgg-widget-edit > form ').live('submit', elgg.ui.widgets.saveSettings);
+	$('a.elgg-widget-collapse-button').live('click', elgg.ui.widgets.collapseToggle);
+
+	elgg.ui.widgets.setMinHeight(".elgg-widgets");
+};
+
+/**
+ * Adds a new widget
+ *
+ * Makes Ajax call to persist new widget and inserts the widget html
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.widgets.add = function(event) {
+	// elgg-widget-type-<type>
+	var type = $(this).attr('id');
+	type = type.substr(type.indexOf('elgg-widget-type-') + "elgg-widget-type-".length);
+
+	// if multiple instances not allow, disable this widget type add button
+	var multiple = $(this).attr('class').indexOf('elgg-widget-multiple') != -1;
+	if (multiple == false) {
+		$(this).addClass('elgg-state-unavailable');
+		$(this).removeClass('elgg-state-available');
+		$(this).unbind('click', elgg.ui.widgets.add);
+	}
+
+	elgg.action('widgets/add', {
+		data: {
+			handler: type,
+			owner_guid: elgg.get_page_owner_guid(),
+			context: $("input[name='widget_context']").val(),
+			show_access: $("input[name='show_access']").val(),
+			default_widgets: $("input[name='default_widgets']").val() || 0
+		},
+		success: function(json) {
+			$('#elgg-widget-col-1').prepend(json.output);
+		}
+	});
+	event.preventDefault();
+};
+
+/**
+ * Persist the widget's new position
+ *
+ * @param {Object} event
+ * @param {Object} ui
+ *
+ * @return void
+ */
+elgg.ui.widgets.move = function(event, ui) {
+
+	// elgg-widget-<guid>
+	var guidString = ui.item.attr('id');
+	guidString = guidString.substr(guidString.indexOf('elgg-widget-') + "elgg-widget-".length);
+
+	// elgg-widget-col-<column>
+	var col = ui.item.parent().attr('id');
+	col = col.substr(col.indexOf('elgg-widget-col-') + "elgg-widget-col-".length);
+
+	elgg.action('widgets/move', {
+		data: {
+			widget_guid: guidString,
+			column: col,
+			position: ui.item.index()
+		}
+	});
+
+	// @hack fixes jquery-ui/opera bug where draggable elements jump
+	ui.item.css('top', 0);
+	ui.item.css('left', 0);
+};
+
+/**
+ * Removes a widget from the layout
+ *
+ * Event callback the uses Ajax to delete the widget and removes its HTML
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.widgets.remove = function(event) {
+	if (confirm(elgg.echo('deleteconfirm')) == false) {
+		event.preventDefault();
+		return;
+	}
+	
+	var $widget = $(this).closest('.elgg-module-widget');
+
+	// if widget type is single instance type, enable the add buton
+	var type = $widget.attr('class');
+	// elgg-widget-instance-<type>
+	type = type.substr(type.indexOf('elgg-widget-instance-') + "elgg-widget-instance-".length);
+	$button = $('#elgg-widget-type-' + type);
+	var multiple = $button.attr('class').indexOf('elgg-widget-multiple') != -1;
+	if (multiple == false) {
+		$button.addClass('elgg-state-available');
+		$button.removeClass('elgg-state-unavailable');
+		$button.unbind('click', elgg.ui.widgets.add); // make sure we don't bind twice
+		$button.click(elgg.ui.widgets.add);
+	}
+
+	$widget.remove();
+
+	// delete the widget through ajax
+	elgg.action($(this).attr('href'));
+
+	event.preventDefault();
+};
+
+/**
+ * Toggle the collapse state of the widget
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.widgets.collapseToggle = function(event) {
+	$(this).toggleClass('elgg-widget-collapsed');
+	$(this).parent().parent().find('.elgg-body').slideToggle('medium');
+	event.preventDefault();
+};
+
+/**
+ * Save a widget's settings
+ *
+ * Uses Ajax to save the settings and updates the HTML.
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.ui.widgets.saveSettings = function(event) {
+	$(this).parent().slideToggle('medium');
+	var $widgetContent = $(this).parent().parent().children('.elgg-widget-content');
+
+	// stick the ajax loader in there
+	var $loader = $('#elgg-widget-loader').clone();
+	$loader.attr('id', '#elgg-widget-active-loader');
+	$loader.removeClass('hidden');
+	$widgetContent.html($loader);
+
+	var default_widgets = $("input[name='default_widgets']").val() || 0;
+	if (default_widgets) {
+		$(this).append('<input type="hidden" name="default_widgets" value="1">');
+	}
+
+	elgg.action('widgets/save', {
+		data: $(this).serialize(),
+		success: function(json) {
+			$widgetContent.html(json.output);
+		}
+	});
+	event.preventDefault();
+};
+
+/**
+ * Set the min-height so that all widget column bottoms are the same
+ *
+ * This addresses the issue of trying to drag a widget into a column that does
+ * not have any widgets or many fewer widgets than other columns.
+ *
+ * @param {String} selector
+ * @return void
+ */
+elgg.ui.widgets.setMinHeight = function(selector) {
+	var maxBottom = 0;
+	$(selector).each(function() {
+		var bottom = parseInt($(this).offset().top + $(this).height());
+		if (bottom > maxBottom) {
+			maxBottom = bottom;
+		}
+	})
+	$(selector).each(function() {
+		var bottom = parseInt($(this).offset().top + $(this).height());
+		if (bottom < maxBottom) {
+			var newMinHeight = parseInt($(this).height() + (maxBottom - bottom));
+			$(this).css('min-height', newMinHeight + 'px');
+		}
+	})
+};
+
+elgg.register_hook_handler('init', 'system', elgg.ui.widgets.init);
diff --git a/js/tests/ElggAjaxOptionsTest.js b/js/tests/ElggAjaxOptionsTest.js
new file mode 100644
index 000000000..a6b40d439
--- /dev/null
+++ b/js/tests/ElggAjaxOptionsTest.js
@@ -0,0 +1,61 @@
+/**
+ * Tests elgg.ajax.handleOptions() with all of the possible valid inputs
+ */
+ElggAjaxOptionsTest = TestCase("ElggAjaxOptionsTest");
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsNoArgs = function() {
+	assertNotUndefined(elgg.ajax.handleOptions());
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsUrl = function() {
+	var url = 'url',
+		result = elgg.ajax.handleOptions(url);
+	
+	assertEquals(url, result.url);
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsDataOnly = function() {
+	var options = {},
+		result = elgg.ajax.handleOptions(options);
+	
+	assertEquals(options, result.data);
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsOptions = function() {
+	var options = {data:{arg:1}},
+		result = elgg.ajax.handleOptions(options);
+	
+	assertEquals(options, result);
+	
+	function func() {}
+	options = {success: func};
+	result = elgg.ajax.handleOptions(options);
+	
+	assertEquals(options, result);
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsUrlThenDataOnly = function() {
+	var url = 'url',
+		options = {arg:1},
+		result = elgg.ajax.handleOptions(url, options);
+	
+	assertEquals(url, result.url);
+	assertEquals(options, result.data);
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsUrlThenSuccessOnly = function() {
+	var url = 'url',
+	result = elgg.ajax.handleOptions(url, elgg.nullFunction);
+	
+	assertEquals(url, result.url);
+	assertEquals(elgg.nullFunction, result.success);
+};
+
+ElggAjaxOptionsTest.prototype.testHandleOptionsAcceptsUrlThenOptions = function() {
+	var url = 'url',
+	options = {data:{arg:1}},
+	result = elgg.ajax.handleOptions(url, options);
+	
+	assertEquals(url, result.url);
+	assertEquals(options.data, result.data);
+};
+\ No newline at end of file
diff --git a/js/tests/ElggAjaxTest.js b/js/tests/ElggAjaxTest.js
new file mode 100644
index 000000000..a683415fc
--- /dev/null
+++ b/js/tests/ElggAjaxTest.js
@@ -0,0 +1,59 @@
+/**
+ * Makes sure that each of the helper ajax functions ends up calling $.ajax
+ * with the right options.
+ */
+ElggAjaxTest = TestCase("ElggAjaxTest");
+
+ElggAjaxTest.prototype.setUp = function() {
+	
+	this.wwwroot = elgg.config.wwwroot;
+	this.ajax = $.ajax;
+	
+	elgg.config.wwwroot = 'http://www.elgg.org/';
+	
+	$.ajax = function(options) {
+		return options;
+	};
+};
+
+ElggAjaxTest.prototype.tearDown = function() {
+	$.ajax = this.ajax;
+	elgg.config.wwwroot = this.wwwroot;
+};
+
+ElggAjaxTest.prototype.testElggAjax = function() {
+	assertEquals(elgg.config.wwwroot, elgg.ajax().url);
+};
+
+ElggAjaxTest.prototype.testElggGet = function() {
+	assertEquals('get', elgg.get().type);
+};
+
+ElggAjaxTest.prototype.testElggGetJSON = function() {
+	assertEquals('json', elgg.getJSON().dataType);
+};
+
+ElggAjaxTest.prototype.testElggPost = function() {
+	assertEquals('post', elgg.post().type);
+};
+
+ElggAjaxTest.prototype.testElggAction = function() {
+	assertException(function() { elgg.action(); });
+	assertException(function() { elgg.action({}); });
+	
+	var result = elgg.action('action');
+	assertEquals('post', result.type);
+	assertEquals('json', result.dataType);
+	assertEquals(elgg.config.wwwroot + 'action/action', result.url);
+	assertEquals(elgg.security.token.__elgg_ts, result.data.__elgg_ts);
+};
+
+ElggAjaxTest.prototype.testElggAPI = function() {
+	assertException(function() { elgg.api(); });
+	assertException(function() { elgg.api({}); });
+	
+	var result = elgg.api('method');
+	assertEquals('json', result.dataType);
+	assertEquals('method', result.data.method);
+	assertEquals(elgg.config.wwwroot + 'services/api/rest/json/', result.url);
+};
diff --git a/js/tests/ElggHooksTest.js b/js/tests/ElggHooksTest.js
new file mode 100644
index 000000000..e7a2440e7
--- /dev/null
+++ b/js/tests/ElggHooksTest.js
@@ -0,0 +1,28 @@
+ElggHooksTest = TestCase("ElggHooksTest");
+
+ElggHooksTest.prototype.setUp = function() {
+	elgg.config.hooks = {};
+	elgg.provide('elgg.config.hooks.all.all');
+};
+
+ElggHooksTest.prototype.testHookHandlersMustBeFunctions = function () {
+	assertException(function() { elgg.register_hook_handler('str', 'str', 'oops'); });
+};
+
+ElggHooksTest.prototype.testReturnValueDefaultsToTrue = function () {
+	assertTrue(elgg.trigger_hook('fee', 'fum'));
+
+	elgg.register_hook_handler('fee', 'fum', elgg.nullFunction);
+	assertTrue(elgg.trigger_hook('fee', 'fum'));
+};
+
+ElggHooksTest.prototype.testCanGlomHooksWithAll = function () {
+	elgg.register_hook_handler('all', 'bar', elgg.abstractMethod);
+	assertException("all,bar", function() { elgg.trigger_hook('foo', 'bar'); });
+
+	elgg.register_hook_handler('foo', 'all', elgg.abstractMethod);
+	assertException("foo,all", function() { elgg.trigger_hook('foo', 'baz'); });
+
+	elgg.register_hook_handler('all', 'all', elgg.abstractMethod);
+	assertException("all,all", function() { elgg.trigger_hook('pinky', 'winky'); });
+};
+\ No newline at end of file
diff --git a/js/tests/ElggLanguagesTest.js b/js/tests/ElggLanguagesTest.js
new file mode 100644
index 000000000..9186ff5bb
--- /dev/null
+++ b/js/tests/ElggLanguagesTest.js
@@ -0,0 +1,45 @@
+ElggLanguagesTest = TestCase("ElggLanguagesTest");
+
+ElggLanguagesTest.prototype.setUp = function() {
+	this.ajax = $.ajax;
+	
+	//Immediately execute some dummy "returned" javascript instead of sending
+	//an actual ajax request
+	$.ajax = function(settings) {
+		var lang = settings.data.language;
+		elgg.config.translations[lang] = {'language':lang};
+	};
+};
+
+ElggLanguagesTest.prototype.tearDown = function() {
+	$.ajax = this.ajax;
+	
+	//clear translations
+	elgg.config.translations['en'] = undefined;
+	elgg.config.translations['aa'] = undefined;
+};
+
+ElggLanguagesTest.prototype.testLoadTranslations = function() {
+	assertUndefined(elgg.config.translations['en']);
+	assertUndefined(elgg.config.translations['aa']);
+	
+	elgg.reload_all_translations();
+	elgg.reload_all_translations('aa');
+	
+	assertNotUndefined(elgg.config.translations['en']['language']);
+	assertNotUndefined(elgg.config.translations['aa']['language']);
+};
+
+ElggLanguagesTest.prototype.testElggEchoTranslates = function() {
+	elgg.reload_all_translations('en');
+	elgg.reload_all_translations('aa');
+	
+	assertEquals('en', elgg.echo('language'));
+	assertEquals('aa', elgg.echo('language', 'aa'));
+};
+
+ElggLanguagesTest.prototype.testElggEchoFallsBackToDefaultLanguage = function() {
+	elgg.reload_all_translations('en');
+	assertEquals('en', elgg.echo('language', 'aa'));
+};
+
diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js
new file mode 100644
index 000000000..bd39e7fb3
--- /dev/null
+++ b/js/tests/ElggLibTest.js
@@ -0,0 +1,140 @@
+/**
+ * Test basic elgg library functions
+ */
+ElggLibTest = TestCase("ElggLibTest");
+
+ElggLibTest.prototype.testGlobal = function() {
+	assertTrue(window === elgg.global);
+};
+
+ElggLibTest.prototype.testAssertTypeOf = function() {
+	[//Valid inputs
+	    ['string', ''],
+        ['object', {}],
+        ['boolean', true],
+        ['boolean', false],
+        ['undefined', undefined],
+        ['number', 0],
+        ['function', elgg.nullFunction]
+    ].forEach(function(args) {
+		assertNoException(function() {
+			elgg.assertTypeOf.apply(undefined, args);
+		});
+	});
+
+	[//Invalid inputs
+        ['function', {}],
+        ['object', elgg.nullFunction]
+    ].forEach(function() {
+		assertException(function(args) {
+			elgg.assertTypeOf.apply(undefined, args);
+		});
+	});
+};
+
+ElggLibTest.prototype.testProvideDoesntClobber = function() {
+	elgg.provide('foo.bar.baz');
+
+	foo.bar.baz.oof = "test";
+
+	elgg.provide('foo.bar.baz');
+
+	assertEquals("test", foo.bar.baz.oof);
+};
+
+/**
+ * Try requiring bogus input
+ */
+ElggLibTest.prototype.testRequire = function () {
+	assertException(function(){ elgg.require(''); });
+	assertException(function(){ elgg.require('garbage'); });
+	assertException(function(){ elgg.require('gar.ba.ge'); });
+
+	assertNoException(function(){
+		elgg.require('jQuery');
+		elgg.require('elgg');
+		elgg.require('elgg.config');
+		elgg.require('elgg.security');
+	});
+};
+
+ElggLibTest.prototype.testInherit = function () {
+	function Base() {}
+	function Child() {}
+
+	elgg.inherit(Child, Base);
+
+	assertInstanceOf(Base, new Child());
+	assertEquals(Child, Child.prototype.constructor);
+};
+
+ElggLibTest.prototype.testNormalizeUrl = function() {
+	elgg.config.wwwroot = "http://elgg.org/";
+
+	[
+		['', elgg.config.wwwroot],
+		['test', elgg.config.wwwroot + 'test'],
+		['http://example.com', 'http://example.com'],
+		['https://example.com', 'https://example.com'],
+		['http://example-time.com', 'http://example-time.com'],
+		['//example.com', '//example.com'],
+		['mod/my_plugin/graphics/image.jpg', elgg.config.wwwroot + 'mod/my_plugin/graphics/image.jpg'],
+
+		['ftp://example.com/file', 'ftp://example.com/file'],
+		['mailto:brett@elgg.org', 'mailto:brett@elgg.org'],
+		['javascript:alert("test")', 'javascript:alert("test")'],
+		['app://endpoint', 'app://endpoint'],
+
+		['example.com', 'http://example.com'],
+		['example.com/subpage', 'http://example.com/subpage'],
+
+		['page/handler', elgg.config.wwwroot + 'page/handler'],
+		['page/handler?p=v&p2=v2', elgg.config.wwwroot + 'page/handler?p=v&p2=v2'],
+		['mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php'],
+		['mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2'],
+		['rootfile.php', elgg.config.wwwroot + 'rootfile.php'],
+		['rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2'],
+
+		['/page/handler', elgg.config.wwwroot + 'page/handler'],
+		['/page/handler?p=v&p2=v2', elgg.config.wwwroot + 'page/handler?p=v&p2=v2'],
+		['/mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php'],
+		['/mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2'],
+		['/rootfile.php', elgg.config.wwwroot + 'rootfile.php'],
+		['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2']
+
+	].forEach(function(args) {
+		assertEquals(args[1], elgg.normalize_url(args[0]));
+	});
+};
+
+ElggLibTest.prototype.testParseUrl = function() {
+
+	[
+		["http://www.elgg.org/test/", {'scheme': 'http', 'host': 'www.elgg.org', 'path': '/test/'}],
+		["https://www.elgg.org/test/", {'scheme': 'https', 'host': 'www.elgg.org', 'path': '/test/'}],
+		["ftp://www.elgg.org/test/", {'scheme': 'ftp', 'host': 'www.elgg.org', 'path': '/test/'}],
+		["http://elgg.org/test?val1=one&val2=two", {'scheme': 'http', 'host': 'elgg.org', 'path': '/test', 'query': 'val1=one&val2=two'}],
+		["http://elgg.org:8080/", {'scheme': 'http', 'host': 'elgg.org', 'port': 8080, 'path': '/'}],
+		["http://elgg.org/test#there", {'scheme': 'http', 'host': 'elgg.org', 'path': '/test', 'fragment': 'there'}],
+		
+		["test?val=one", {'host': 'test', 'query': 'val=one'}],
+		["?val=one", {'query': 'val=one'}],
+
+		["mailto:joe@elgg.org", {'scheme': 'mailto', 'path': 'joe@elgg.org'}],
+		["javascript:load()", {'scheme': 'javascript', 'path': 'load()'}]
+
+	].forEach(function(args) {
+		assertEquals(args[1], elgg.parse_url(args[0]));
+	});
+};
+
+ElggLibTest.prototype.testParseStr = function() {
+
+	[
+		["A+%2B+B=A+%2B+B", {"A + B": "A + B"}]
+
+	].forEach(function(args) {
+		assertEquals(args[1], elgg.parse_str(args[0]));
+	});
+};
+
diff --git a/js/tests/ElggPriorityListTest.js b/js/tests/ElggPriorityListTest.js
new file mode 100644
index 000000000..2329a8490
--- /dev/null
+++ b/js/tests/ElggPriorityListTest.js
@@ -0,0 +1,47 @@
+ElggPriorityListTest = TestCase("ElggPriorityListTest");
+
+ElggPriorityListTest.prototype.setUp = function() {
+	this.list = new elgg.ElggPriorityList();
+};
+
+ElggPriorityListTest.prototype.tearDown = function() {
+	this.list = null;
+};
+
+ElggPriorityListTest.prototype.testInsert = function() {
+	this.list.insert('foo');
+
+	assertEquals('foo', this.list.priorities_[500][0]);
+
+	this.list.insert('bar', 501);
+
+	assertEquals('bar', this.list.priorities_[501][0]);
+};
+
+ElggPriorityListTest.prototype.testInsertRespectsPriority = function() {
+	var values = [5, 4, 3, 2, 1, 0];
+
+	for (var i in values) {
+		this.list.insert(values[i], values[i]);
+	}
+
+	this.list.forEach(function(elem, idx) {
+		assertEquals(elem, idx);
+	})
+};
+
+ElggPriorityListTest.prototype.testInsertHandlesDuplicatePriorities = function() {
+	values = [0, 1, 2, 3, 4, 5, 6, 7, 8 , 9];
+
+	for (var i in values) {
+		this.list.insert(values[i], values[i]/3);
+	}
+
+	this.list.forEach(function(elem, idx) {
+		assertEquals(elem, idx);
+	});
+};
+
+ElggPriorityListTest.prototype.testEveryDefaultsToTrue = function() {
+	assertTrue(this.list.every(function() {}));
+};
+\ No newline at end of file
diff --git a/js/tests/ElggSecurityTest.js b/js/tests/ElggSecurityTest.js
new file mode 100644
index 000000000..107c0adbd
--- /dev/null
+++ b/js/tests/ElggSecurityTest.js
@@ -0,0 +1,75 @@
+ElggSecurityTest = TestCase("ElggSecurityTest");
+
+ElggSecurityTest.prototype.setUp = function() {
+	//fill with fake, but reasonable, values for testing
+	this.ts = elgg.security.token.__elgg_ts = 12345;
+	this.token = elgg.security.token.__elgg_token = 'abcdef';
+};
+
+ElggSecurityTest.prototype.testAddTokenAcceptsUndefined = function() {
+	var input,
+		expected = {
+			__elgg_ts: this.ts,
+			__elgg_token: this.token
+		};
+	
+	assertEquals(expected, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testAddTokenAcceptsObject = function() {
+	var input = {},
+		expected = {
+			__elgg_ts: this.ts,
+			__elgg_token: this.token
+		};
+	
+	assertEquals(expected, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testAddTokenAcceptsRelativeUrl = function() {
+	var input,
+		str = "__elgg_ts=" + this.ts + "&__elgg_token=" + this.token;
+
+	input = "test";
+	assertEquals(input + '?' + str, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testAddTokenAcceptsFullUrl = function() {
+	var input,
+		str = "__elgg_ts=" + this.ts + "&__elgg_token=" + this.token;
+
+	input = "http://elgg.org/";
+	assertEquals(input + '?' + str, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testAddTokenAcceptsQueryString = function() {
+	var input,
+		str = "__elgg_ts=" + this.ts + "&__elgg_token=" + this.token;
+
+	input = "?data=sofar";
+	assertEquals(input + '&' + str, elgg.security.addToken(input));
+
+	input = "test?data=sofar";
+	assertEquals(input + '&' + str, elgg.security.addToken(input));
+
+	input = "http://elgg.org/?data=sofar";
+	assertEquals(input + '&' + str, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testAddTokenAlreadyAdded = function() {
+	var input,
+		str = "__elgg_ts=" + this.ts + "&__elgg_token=" + this.token;
+
+	input = "http://elgg.org/?" + str + "&data=sofar";
+	assertEquals(input, elgg.security.addToken(input));
+};
+
+ElggSecurityTest.prototype.testSetTokenSetsElggSecurityToken = function() {
+	var json = {
+		__elgg_ts: 4567,
+		__elgg_token: 'abcdef'
+	};
+	
+	elgg.security.setToken(json);
+	assertEquals(json, elgg.security.token);
+};
diff --git a/js/tests/ElggSessionTest.js b/js/tests/ElggSessionTest.js
new file mode 100644
index 000000000..5ff8ca13e
--- /dev/null
+++ b/js/tests/ElggSessionTest.js
@@ -0,0 +1,36 @@
+ElggSessionTest = TestCase("ElggSessionTest");
+
+ElggSessionTest.prototype.testGetCookie = function() {
+	assertEquals(document.cookie, elgg.session.cookie());
+};
+
+ElggSessionTest.prototype.testGetCookieKey = function() {
+	document.cookie = "name=value";
+	assertEquals('value', elgg.session.cookie('name'));
+	
+	document.cookie = "name=value2";
+	assertEquals('value2', elgg.session.cookie('name'));
+	
+	document.cookie = "name=value";
+	document.cookie = "name2=value2";
+	assertEquals('value', elgg.session.cookie('name'));
+	assertEquals('value2', elgg.session.cookie('name2'));
+};
+
+ElggSessionTest.prototype.testSetCookieKey = function() {
+	elgg.session.cookie('name', 'value');
+	assertEquals('value', elgg.session.cookie('name'));
+
+	elgg.session.cookie('name', 'value2');
+	assertEquals('value2', elgg.session.cookie('name'));
+	
+	elgg.session.cookie('name', 'value');
+	elgg.session.cookie('name2', 'value2');
+	assertEquals('value', elgg.session.cookie('name'));
+	assertEquals('value2', elgg.session.cookie('name2'));
+	
+	elgg.session.cookie('name', null);
+	elgg.session.cookie('name2', null);
+	assertUndefined(elgg.session.cookie('name'));
+	assertUndefined(elgg.session.cookie('name2'));
+};
+\ No newline at end of file
diff --git a/js/tests/README b/js/tests/README
new file mode 100644
index 000000000..f43c0c89d
--- /dev/null
+++ b/js/tests/README
@@ -0,0 +1,25 @@
+Elgg JavaScript Unit Tests
+--------------------------
+
+Introduction
+============
+Elgg uses js-test-driver to run its unit tests. Instructions on obtaining,
+configuring, and using it are at http://code.google.com/p/js-test-driver/. It
+supports running the test in multiple browsers and debugging using web browser
+based debuggers. Visit its wiki at the Google Code site for more information.
+
+
+Sample Usage
+============
+ 1. Put jar file in the base directory of Elgg
+ 2. Run the server: java -jar JsTestDriver-1.3.5.jar --port 4224
+ 3. Point a web browser at http://localhost:4224
+ 4. Click "Capture this browser"
+ 5. Run the tests: java -jar JsTestDriver-1.3.5.jar --config js/tests/jsTestDriver.conf --basePath . --tests all
+
+
+Configuration Hints
+===================
+ * The port when running the server must be the same as listed in the 
+   configuration file. If that port is being used, change the configuration file.
+ * The basePath must be the base directory of Elgg.
+\ No newline at end of file
diff --git a/js/tests/jsTestDriver.conf b/js/tests/jsTestDriver.conf
new file mode 100644
index 000000000..cc0b5d373
--- /dev/null
+++ b/js/tests/jsTestDriver.conf
@@ -0,0 +1,10 @@
+server: http://localhost:4224
+
+load:
+ - vendors/jquery/jquery-1.6.4.min.js
+ - vendors/sprintf.js
+ - js/lib/elgglib.js
+ - js/lib/hooks.js
+ - js/classes/*.js
+ - js/lib/*.js
+ - js/tests/*.js
+\ No newline at end of file
diff --git a/languages/en.php b/languages/en.php
index c2f17f6bb..07407d1e1 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -1,18 +1,1386 @@
 <?php
 /**
- * English 
+ * Core English Language
+ *
+ * @package Elgg.Core
+ * @subpackage Languages.English
  */
 
 $english = array(
-				 // Plugin user settings options
-				 'landing:mode:opt:custom'     => 'A Custom Page',
-				 'landing:mode:opt:dashboard'  => 'Your Dashboard',
-				 'landing:mode:opt:default'    => 'Site Default',
-				 'landing:mode:opt:profile'    => 'Your Profile',
-				 // Plugin user settings labels
-				 'landing:settings:choose_option'  => 'Choose landing destination',
-				 'landing:settings:custom_url_tip' => 'If you chose "A Custom Page", enter the path to the page, e.g.: "/g/lorea"',
-				 'landing:settings:select_url'     => 'Choose the default page where you want to go after you log in from the front page:',
+/**
+ * Sites
+ */
+
+	'item:site' => 'Sites',
+
+/**
+ * Sessions
+ */
+
+	'login' => "Log in",
+	'loginok' => "You have been logged in.",
+	'loginerror' => "We couldn't log you in. Please check your credentials and try again.",
+	'login:empty' => "Username/email and password are required.",
+	'login:baduser' => "Unable to load your user account.",
+	'auth:nopams' => "Internal error. No user authentication method installed.",
+
+	'logout' => "Log out",
+	'logoutok' => "You have been logged out.",
+	'logouterror' => "We couldn't log you out. Please try again.",
+
+	'loggedinrequired' => "You must be logged in to view that page.",
+	'adminrequired' => "You must be an administrator to view that page.",
+	'membershiprequired' => "You must be a member of this group to view that page.",
+
+
+/**
+ * Errors
+ */
+	'exception:title' => "Fatal Error.",
+	'exception:contact_admin' => 'An unrecoverable error has occurred and has been logged. Contact the site administrator with the following information:',
+
+	'actionundefined' => "The requested action (%s) was not defined in the system.",
+	'actionnotfound' => "The action file for %s was not found.",
+	'actionloggedout' => "Sorry, you cannot perform this action while logged out.",
+	'actionunauthorized' => 'You are unauthorized to perform this action',
+
+	'InstallationException:SiteNotInstalled' => 'Unable to handle this request. This site '
+		. ' is not configured or the database is down.',
+	'InstallationException:MissingLibrary' => 'Could not load %s',
+	'InstallationException:CannotLoadSettings' => 'Elgg could not load the settings file. It does not exist or there is a file permissions issue.',
+
+	'SecurityException:Codeblock' => "Denied access to execute privileged code block",
+	'DatabaseException:WrongCredentials' => "Elgg couldn't connect to the database using the given credentials. Check the settings file.",
+	'DatabaseException:NoConnect' => "Elgg couldn't select the database '%s', please check that the database is created and you have access to it.",
+	'SecurityException:FunctionDenied' => "Access to privileged function '%s' is denied.",
+	'DatabaseException:DBSetupIssues' => "There were a number of issues: ",
+	'DatabaseException:ScriptNotFound' => "Elgg couldn't find the requested database script at %s.",
+	'DatabaseException:InvalidQuery' => "Invalid query",
+	'DatabaseException:InvalidDBLink' => "Connection to database was lost.",
+
+	'IOException:FailedToLoadGUID' => "Failed to load new %s from GUID:%d",
+	'InvalidParameterException:NonElggObject' => "Passing a non-ElggObject to an ElggObject constructor!",
+	'InvalidParameterException:UnrecognisedValue' => "Unrecognised value passed to constuctor.",
+
+	'InvalidClassException:NotValidElggStar' => "GUID:%d is not a valid %s",
+
+	'PluginException:MisconfiguredPlugin' => "%s (guid: %s) is a misconfigured plugin. It has been disabled. Please search the Elgg wiki for possible causes (http://docs.elgg.org/wiki/).",
+	'PluginException:CannotStart' => '%s (guid: %s) cannot start and has been deactivated.  Reason: %s',
+	'PluginException:InvalidID' => "%s is an invalid plugin ID.",
+	'PluginException:InvalidPath' => "%s is an invalid plugin path.",
+	'PluginException:InvalidManifest' => 'Invalid manifest file for plugin %s',
+	'PluginException:InvalidPlugin' => '%s is not a valid plugin.',
+	'PluginException:InvalidPlugin:Details' => '%s is not a valid plugin: %s',
+	'PluginException:NullInstantiated' => 'ElggPlugin cannot be null instantiated. You must pass a GUID, a plugin ID, or a full path.',
+
+	'ElggPlugin:MissingID' => 'Missing plugin ID (guid %s)',
+	'ElggPlugin:NoPluginPackagePackage' => 'Missing ElggPluginPackage for plugin ID %s (guid %s)',
+
+	'ElggPluginPackage:InvalidPlugin:MissingFile' => 'The required file "%s" is missing.',
+	'ElggPluginPackage:InvalidPlugin:InvalidDependency' => 'Its manifest contains an invalid dependency type "%s".',
+	'ElggPluginPackage:InvalidPlugin:InvalidProvides' => 'Its manifest contains an invalid provides type "%s".',
+	'ElggPluginPackage:InvalidPlugin:CircularDep' => 'There is an invalid %s dependency "%s" in plugin %s.  Plugins cannot conflict with or require something they provide!',
+
+	'ElggPlugin:Exception:CannotIncludeFile' => 'Cannot include %s for plugin %s (guid: %s) at %s.',
+	'ElggPlugin:Exception:CannotRegisterViews' => 'Cannot open views dir for plugin %s (guid: %s) at %s.',
+	'ElggPlugin:Exception:CannotRegisterLanguages' => 'Cannot register languages for plugin %s (guid: %s) at %s.',
+	'ElggPlugin:Exception:NoID' => 'No ID for plugin guid %s!',
+
+	'PluginException:ParserError' => 'Error parsing manifest with API version %s in plugin %s.',
+	'PluginException:NoAvailableParser' => 'Cannot find a parser for manifest API version %s in plugin %s.',
+	'PluginException:ParserErrorMissingRequiredAttribute' => "Missing required '%s' attribute in manifest for plugin %s.",
+
+	'ElggPlugin:Dependencies:Requires' => 'Requires',
+	'ElggPlugin:Dependencies:Suggests' => 'Suggests',
+	'ElggPlugin:Dependencies:Conflicts' => 'Conflicts',
+	'ElggPlugin:Dependencies:Conflicted' => 'Conflicted',
+	'ElggPlugin:Dependencies:Provides' => 'Provides',
+	'ElggPlugin:Dependencies:Priority' => 'Priority',
+
+	'ElggPlugin:Dependencies:Elgg' => 'Elgg version',
+	'ElggPlugin:Dependencies:PhpExtension' => 'PHP extension: %s',
+	'ElggPlugin:Dependencies:PhpIni' => 'PHP ini setting: %s',
+	'ElggPlugin:Dependencies:Plugin' => 'Plugin: %s',
+	'ElggPlugin:Dependencies:Priority:After' => 'After %s',
+	'ElggPlugin:Dependencies:Priority:Before' => 'Before %s',
+	'ElggPlugin:Dependencies:Priority:Uninstalled' => '%s is not installed',
+	'ElggPlugin:Dependencies:Suggests:Unsatisfied' => 'Missing',
+	
+	'ElggPlugin:Dependencies:ActiveDependent' => 'There are other plugins that list %s as a dependency.  You must disable the following plugins before disabling this one: %s',
+
+	'ElggPlugin:InvalidAndDeactivated' => '%s is an invalid plugin and has been deactivated.',
+
+	'InvalidParameterException:NonElggUser' => "Passing a non-ElggUser to an ElggUser constructor!",
+
+	'InvalidParameterException:NonElggSite' => "Passing a non-ElggSite to an ElggSite constructor!",
+
+	'InvalidParameterException:NonElggGroup' => "Passing a non-ElggGroup to an ElggGroup constructor!",
+
+	'IOException:UnableToSaveNew' => "Unable to save new %s",
+
+	'InvalidParameterException:GUIDNotForExport' => "GUID has not been specified during export, this should never happen.",
+	'InvalidParameterException:NonArrayReturnValue' => "Entity serialisation function passed a non-array returnvalue parameter",
+
+	'ConfigurationException:NoCachePath' => "Cache path set to nothing!",
+	'IOException:NotDirectory' => "%s is not a directory.",
+
+	'IOException:BaseEntitySaveFailed' => "Unable to save new object's base entity information!",
+	'InvalidParameterException:UnexpectedODDClass' => "import() passed an unexpected ODD class",
+	'InvalidParameterException:EntityTypeNotSet' => "Entity type must be set.",
+
+	'ClassException:ClassnameNotClass' => "%s is not a %s.",
+	'ClassNotFoundException:MissingClass' => "Class '%s' was not found, missing plugin?",
+	'InstallationException:TypeNotSupported' => "Type %s is not supported. This indicates an error in your installation, most likely caused by an incomplete upgrade.",
+
+	'ImportException:ImportFailed' => "Could not import element %d",
+	'ImportException:ProblemSaving' => "There was a problem saving %s",
+	'ImportException:NoGUID' => "New entity created but has no GUID, this should not happen.",
+
+	'ImportException:GUIDNotFound' => "Entity '%d' could not be found.",
+	'ImportException:ProblemUpdatingMeta' => "There was a problem updating '%s' on entity '%d'",
+
+	'ExportException:NoSuchEntity' => "No such entity GUID:%d",
+
+	'ImportException:NoODDElements' => "No OpenDD elements found in import data, import failed.",
+	'ImportException:NotAllImported' => "Not all elements were imported.",
+
+	'InvalidParameterException:UnrecognisedFileMode' => "Unrecognised file mode '%s'",
+	'InvalidParameterException:MissingOwner' => "File %s (file guid:%d) (owner guid:%d) is missing an owner!",
+	'IOException:CouldNotMake' => "Could not make %s",
+	'IOException:MissingFileName' => "You must specify a name before opening a file.",
+	'ClassNotFoundException:NotFoundNotSavedWithFile' => "Unable to load filestore class %s for file %u",
+	'NotificationException:NoNotificationMethod' => "No notification method specified.",
+	'NotificationException:NoHandlerFound' => "No handler found for '%s' or it was not callable.",
+	'NotificationException:ErrorNotifyingGuid' => "There was an error while notifying %d",
+	'NotificationException:NoEmailAddress' => "Could not get the email address for GUID:%d",
+	'NotificationException:MissingParameter' => "Missing a required parameter, '%s'",
+
+	'DatabaseException:WhereSetNonQuery' => "Where set contains non WhereQueryComponent",
+	'DatabaseException:SelectFieldsMissing' => "Fields missing on a select style query",
+	'DatabaseException:UnspecifiedQueryType' => "Unrecognised or unspecified query type.",
+	'DatabaseException:NoTablesSpecified' => "No tables specified for query.",
+	'DatabaseException:NoACL' => "No access control was provided on query",
+
+	'InvalidParameterException:NoEntityFound' => "No entity found, it either doesn't exist or you don't have access to it.",
+
+	'InvalidParameterException:GUIDNotFound' => "GUID:%s could not be found, or you can not access it.",
+	'InvalidParameterException:IdNotExistForGUID' => "Sorry, '%s' does not exist for guid:%d",
+	'InvalidParameterException:CanNotExportType' => "Sorry, I don't know how to export '%s'",
+	'InvalidParameterException:NoDataFound' => "Could not find any data.",
+	'InvalidParameterException:DoesNotBelong' => "Does not belong to entity.",
+	'InvalidParameterException:DoesNotBelongOrRefer' => "Does not belong to entity or refer to entity.",
+	'InvalidParameterException:MissingParameter' => "Missing parameter, you need to provide a GUID.",
+	'InvalidParameterException:LibraryNotRegistered' => '%s is not a registered library',
+	'InvalidParameterException:LibraryNotFound' => 'Could not load the %s library from %s',
+
+	'APIException:ApiResultUnknown' => "API Result is of an unknown type, this should never happen.",
+	'ConfigurationException:NoSiteID' => "No site ID has been specified.",
+	'SecurityException:APIAccessDenied' => "Sorry, API access has been disabled by the administrator.",
+	'SecurityException:NoAuthMethods' => "No authentication methods were found that could authenticate this API request.",
+	'SecurityException:ForwardFailedToRedirect' => 'Redirect could not be issued due to headers already being sent. Halting execution for security. Output started in file %s at line %d. Search http://docs.elgg.org/ for more information.',
+	'InvalidParameterException:APIMethodOrFunctionNotSet' => "Method or function not set in call in expose_method()",
+	'InvalidParameterException:APIParametersArrayStructure' => "Parameters array structure is incorrect for call to expose method '%s'",
+	'InvalidParameterException:UnrecognisedHttpMethod' => "Unrecognised http method %s for api method '%s'",
+	'APIException:MissingParameterInMethod' => "Missing parameter %s in method %s",
+	'APIException:ParameterNotArray' => "%s does not appear to be an array.",
+	'APIException:UnrecognisedTypeCast' => "Unrecognised type in cast %s for variable '%s' in method '%s'",
+	'APIException:InvalidParameter' => "Invalid parameter found for '%s' in method '%s'.",
+	'APIException:FunctionParseError' => "%s(%s) has a parsing error.",
+	'APIException:FunctionNoReturn' => "%s(%s) returned no value.",
+	'APIException:APIAuthenticationFailed' => "Method call failed the API Authentication",
+	'APIException:UserAuthenticationFailed' => "Method call failed the User Authentication",
+	'SecurityException:AuthTokenExpired' => "Authentication token either missing, invalid or expired.",
+	'CallException:InvalidCallMethod' => "%s must be called using '%s'",
+	'APIException:MethodCallNotImplemented' => "Method call '%s' has not been implemented.",
+	'APIException:FunctionDoesNotExist' => "Function for method '%s' is not callable",
+	'APIException:AlgorithmNotSupported' => "Algorithm '%s' is not supported or has been disabled.",
+	'ConfigurationException:CacheDirNotSet' => "Cache directory 'cache_path' not set.",
+	'APIException:NotGetOrPost' => "Request method must be GET or POST",
+	'APIException:MissingAPIKey' => "Missing API key",
+	'APIException:BadAPIKey' => "Bad API key",
+	'APIException:MissingHmac' => "Missing X-Elgg-hmac header",
+	'APIException:MissingHmacAlgo' => "Missing X-Elgg-hmac-algo header",
+	'APIException:MissingTime' => "Missing X-Elgg-time header",
+	'APIException:MissingNonce' => "Missing X-Elgg-nonce header",
+	'APIException:TemporalDrift' => "X-Elgg-time is too far in the past or future. Epoch fail.",
+	'APIException:NoQueryString' => "No data on the query string",
+	'APIException:MissingPOSTHash' => "Missing X-Elgg-posthash header",
+	'APIException:MissingPOSTAlgo' => "Missing X-Elgg-posthash_algo header",
+	'APIException:MissingContentType' => "Missing content type for post data",
+	'SecurityException:InvalidPostHash' => "POST data hash is invalid - Expected %s but got %s.",
+	'SecurityException:DupePacket' => "Packet signature already seen.",
+	'SecurityException:InvalidAPIKey' => "Invalid or missing API Key.",
+	'NotImplementedException:CallMethodNotImplemented' => "Call method '%s' is currently not supported.",
+
+	'NotImplementedException:XMLRPCMethodNotImplemented' => "XML-RPC method call '%s' not implemented.",
+	'InvalidParameterException:UnexpectedReturnFormat' => "Call to method '%s' returned an unexpected result.",
+	'CallException:NotRPCCall' => "Call does not appear to be a valid XML-RPC call",
+
+	'PluginException:NoPluginName' => "The plugin name could not be found",
+
+	'SecurityException:authenticationfailed' => "User could not be authenticated",
+
+	'CronException:unknownperiod' => '%s is not a recognised period.',
+
+	'SecurityException:deletedisablecurrentsite' => 'You can not delete or disable the site you are currently viewing!',
+
+	'RegistrationException:EmptyPassword' => 'The password fields cannot be empty',
+	'RegistrationException:PasswordMismatch' => 'Passwords must match',
+	'LoginException:BannedUser' => 'You have been banned from this site and cannot log in',
+	'LoginException:UsernameFailure' => 'We could not log you in. Please check your username/email and password.',
+	'LoginException:PasswordFailure' => 'We could not log you in. Please check your username/email and password.',
+	'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
+	'LoginException:ChangePasswordFailure' => 'Failed current password check.',
+	'LoginException:Unknown' => 'We could not log you in due to an unknown error.',
+
+	'deprecatedfunction' => 'Warning: This code uses the deprecated function \'%s\' and is not compatible with this version of Elgg',
+
+	'pageownerunavailable' => 'Warning: The page owner %d is not accessible!',
+	'viewfailure' => 'There was an internal failure in the view %s',
+	'changebookmark' => 'Please change your bookmark for this page',
+	'noaccess' => 'You need to login to view this content or the content has been removed or you do not have permission to view it.',
+	'error:missing_data' => 'There was some data missing in your request',
+
+	'error:default' => 'Oops...something went wrong.',
+	'error:404' => 'Sorry. We could not find the page that you requested.',
+
+/**
+ * API
+ */
+	'system.api.list' => "List all available API calls on the system.",
+	'auth.gettoken' => "This API call lets a user obtain a user authentication token which can be used for authenticating future API calls. Pass it as the parameter auth_token",
+
+/**
+ * User details
+ */
+
+	'name' => "Display name",
+	'email' => "Email address",
+	'username' => "Username",
+	'loginusername' => "Username or email",
+	'password' => "Password",
+	'passwordagain' => "Password (again for verification)",
+	'admin_option' => "Make this user an admin?",
+
+/**
+ * Access
+ */
+
+	'PRIVATE' => "Private",
+	'LOGGED_IN' => "Logged in users",
+	'PUBLIC' => "Public",
+	'access:friends:label' => "Friends",
+	'access' => "Access",
+	'access:limited:label' => "Limited",
+	'access:help' => "The access level",
+
+/**
+ * Dashboard and widgets
+ */
+
+	'dashboard' => "Dashboard",
+	'dashboard:nowidgets' => "Your dashboard lets you track the activity and content on this site that matters to you.",
+
+	'widgets:add' => 'Add widgets',
+	'widgets:add:description' => "Click on any widget button below to add it to the page.",
+	'widgets:position:fixed' => '(Fixed position on page)',
+	'widget:unavailable' => 'You have already added this widget',
+	'widget:numbertodisplay' => 'Number of items to display',
+
+	'widget:delete' => 'Remove %s',
+	'widget:edit' => 'Customize this widget',
+
+	'widgets' => "Widgets",
+	'widget' => "Widget",
+	'item:object:widget' => "Widgets",
+	'widgets:save:success' => "The widget was successfully saved.",
+	'widgets:save:failure' => "We could not save your widget.",
+	'widgets:add:success' => "The widget was successfully added.",
+	'widgets:add:failure' => "We could not add your widget.",
+	'widgets:move:failure' => "We could not store the new widget position.",
+	'widgets:remove:failure' => "Unable to remove this widget",
+
+/**
+ * Groups
+ */
+
+	'group' => "Group",
+	'item:group' => "Groups",
+
+/**
+ * Users
+ */
+
+	'user' => "User",
+	'item:user' => "Users",
+
+/**
+ * Friends
+ */
+
+	'friends' => "Friends",
+	'friends:yours' => "Your friends",
+	'friends:owned' => "%s's friends",
+	'friend:add' => "Add friend",
+	'friend:remove' => "Remove friend",
+
+	'friends:add:successful' => "You have successfully added %s as a friend.",
+	'friends:add:failure' => "We couldn't add %s as a friend.",
+
+	'friends:remove:successful' => "You have successfully removed %s from your friends.",
+	'friends:remove:failure' => "We couldn't remove %s from your friends.",
+
+	'friends:none' => "No friends yet.",
+	'friends:none:you' => "You don't have any friends yet.",
+
+	'friends:none:found' => "No friends were found.",
+
+	'friends:of:none' => "Nobody has added this user as a friend yet.",
+	'friends:of:none:you' => "Nobody has added you as a friend yet. Start adding content and fill in your profile to let people find you!",
+
+	'friends:of:owned' => "People who have made %s a friend",
+
+	'friends:of' => "Friends of",
+	'friends:collections' => "Friend collections",
+	'collections:add' => "New collection",
+	'friends:collections:add' => "New friends collection",
+	'friends:addfriends' => "Select friends",
+	'friends:collectionname' => "Collection name",
+	'friends:collectionfriends' => "Friends in collection",
+	'friends:collectionedit' => "Edit this collection",
+	'friends:nocollections' => "You do not have any collections yet.",
+	'friends:collectiondeleted' => "Your collection has been deleted.",
+	'friends:collectiondeletefailed' => "We were unable to delete the collection. Either you don't have permission, or some other problem has occurred.",
+	'friends:collectionadded' => "Your collection was successfully created",
+	'friends:nocollectionname' => "You need to give your collection a name before it can be created.",
+	'friends:collections:members' => "Collection members",
+	'friends:collections:edit' => "Edit collection",
+	'friends:collections:edited' => "Saved collection",
+	'friends:collection:edit_failed' => 'Could not save collection.',
+
+	'friendspicker:chararray' => 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+
+	'avatar' => 'Avatar',
+	'avatar:noaccess' => "You're not allowed to edit this user's avatar",
+	'avatar:create' => 'Create your avatar',
+	'avatar:edit' => 'Edit avatar',
+	'avatar:preview' => 'Preview',
+	'avatar:upload' => 'Upload a new avatar',
+	'avatar:current' => 'Current avatar',
+	'avatar:remove' => 'Remove your avatar and set the default icon',
+	'avatar:crop:title' => 'Avatar cropping tool',
+	'avatar:upload:instructions' => "Your avatar is displayed throughout the site. You can change it as often as you'd like. (File formats accepted: GIF, JPG or PNG)",
+	'avatar:create:instructions' => 'Click and drag a square below to match how you want your avatar cropped. A preview will appear in the box on the right. When you are happy with the preview, click \'Create your avatar\'. This cropped version will be used throughout the site as your avatar.',
+	'avatar:upload:success' => 'Avatar successfully uploaded',
+	'avatar:upload:fail' => 'Avatar upload failed',
+	'avatar:resize:fail' => 'Resize of the avatar failed',
+	'avatar:crop:success' => 'Cropping the avatar succeeded',
+	'avatar:crop:fail' => 'Avatar cropping failed',
+	'avatar:remove:success' => 'Removing the avatar succeeded',
+	'avatar:remove:fail' => 'Avatar remove failed',
+
+	'profile:edit' => 'Edit profile',
+	'profile:aboutme' => "About me",
+	'profile:description' => "About me",
+	'profile:briefdescription' => "Brief description",
+	'profile:location' => "Location",
+	'profile:skills' => "Skills",
+	'profile:interests' => "Interests",
+	'profile:contactemail' => "Contact email",
+	'profile:phone' => "Telephone",
+	'profile:mobile' => "Mobile phone",
+	'profile:website' => "Website",
+	'profile:twitter' => "Twitter username",
+	'profile:saved' => "Your profile was successfully saved.",
+
+	'profile:field:text' => 'Short text',
+	'profile:field:longtext' => 'Large text area',
+	'profile:field:tags' => 'Tags',
+	'profile:field:url' => 'Web address',
+	'profile:field:email' => 'Email address',
+	'profile:field:location' => 'Location',
+	'profile:field:date' => 'Date',
+
+	'admin:appearance:profile_fields' => 'Edit Profile Fields',
+	'profile:edit:default' => 'Edit profile fields',
+	'profile:label' => "Profile label",
+	'profile:type' => "Profile type",
+	'profile:editdefault:delete:fail' => 'Removed default profile item field failed',
+	'profile:editdefault:delete:success' => 'Profile field deleted',
+	'profile:defaultprofile:reset' => 'Profile fields reset to the system default',
+	'profile:resetdefault' => 'Reset profile fields to system defaults',
+	'profile:resetdefault:confirm' => 'Are you sure you want to delete your custom profile fields?',
+	'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will lose any information already entered into custom fields on profile pages.",
+	'profile:editdefault:success' => 'New profile field added',
+	'profile:editdefault:fail' => 'Default profile could not be saved',
+	'profile:field_too_long' => 'Cannot save your profile information because the "%s" section is too long.',
+	'profile:noaccess' => "You do not have permission to edit this profile.",
+
+
+/**
+ * Feeds
+ */
+	'feed:rss' => 'RSS feed for this page',
+/**
+ * Links
+ */
+	'link:view' => 'view link',
+	'link:view:all' => 'View all',
+
+
+/**
+ * River
+ */
+	'river' => "River",
+	'river:friend:user:default' => "%s is now a friend with %s",
+	'river:update:user:avatar' => '%s has a new avatar',
+	'river:update:user:profile' => '%s has updated their profile',
+	'river:noaccess' => 'You do not have permission to view this item.',
+	'river:posted:generic' => '%s posted',
+	'riveritem:single:user' => 'a user',
+	'riveritem:plural:user' => 'some users',
+	'river:ingroup' => 'in the group %s',
+	'river:none' => 'No activity',
+	'river:update' => 'Update for %s',
+	'river:delete:success' => 'River item has been deleted',
+	'river:delete:fail' => 'River item could not be deleted',
+
+	'river:widget:title' => "Activity",
+	'river:widget:description' => "Display latest activity",
+	'river:widget:type' => "Type of activity",
+	'river:widgets:friends' => 'Friends activity',
+	'river:widgets:all' => 'All site activity',
+
+/**
+ * Notifications
+ */
+	'notifications:usersettings' => "Notification settings",
+	'notifications:methods' => "Select your notification methods.",
+	'notification:method:email' => 'Email',
+
+	'notifications:usersettings:save:ok' => "Your notification settings were successfully saved.",
+	'notifications:usersettings:save:fail' => "There was a problem saving your notification settings.",
+
+	'user.notification.get' => 'Return the notification settings for a given user.',
+	'user.notification.set' => 'Set the notification settings for a given user.',
+/**
+ * Search
+ */
+
+	'search' => "Search",
+	'searchtitle' => "Search: %s",
+	'users:searchtitle' => "Searching for users: %s",
+	'groups:searchtitle' => "Searching for groups: %s",
+	'advancedsearchtitle' => "%s with results matching %s",
+	'notfound' => "No results found.",
+	'next' => "Next",
+	'previous' => "Previous",
+
+	'viewtype:change' => "Change list type",
+	'viewtype:list' => "List view",
+	'viewtype:gallery' => "Gallery",
+
+	'tag:search:startblurb' => "Items with tags matching '%s':",
+
+	'user:search:startblurb' => "Users matching '%s':",
+	'user:search:finishblurb' => "To view more, click here.",
+
+	'group:search:startblurb' => "Groups matching '%s':",
+	'group:search:finishblurb' => "To view more, click here.",
+	'search:go' => 'Go',
+	'userpicker:only_friends' => 'Only friends',
+
+/**
+ * Account
+ */
+
+	'account' => "Account",
+	'settings' => "Settings",
+	'tools' => "Tools",
+	'settings:edit' => 'Edit settings',
+
+	'register' => "Register",
+	'registerok' => "You have successfully registered for %s.",
+	'registerbad' => "Your registration was unsuccessful because of an unknown error.",
+	'registerdisabled' => "Registration has been disabled by the system administrator",
+	'register:fields' => 'All fields are required',
+
+	'registration:notemail' => 'The email address you provided does not appear to be a valid email address.',
+	'registration:userexists' => 'That username already exists',
+	'registration:usernametooshort' => 'Your username must be a minimum of %u characters long.',
+	'registration:usernametoolong' => 'Your username is too long. It can have a maximum of %u characters.',
+	'registration:passwordtooshort' => 'The password must be a minimum of %u characters long.',
+	'registration:dupeemail' => 'This email address has already been registered.',
+	'registration:invalidchars' => 'Sorry, your username contains the character %s which is invalid. The following characters are invalid: %s',
+	'registration:emailnotvalid' => 'Sorry, the email address you entered is invalid on this system',
+	'registration:passwordnotvalid' => 'Sorry, the password you entered is invalid on this system',
+	'registration:usernamenotvalid' => 'Sorry, the username you entered is invalid on this system',
+
+	'adduser' => "Add User",
+	'adduser:ok' => "You have successfully added a new user.",
+	'adduser:bad' => "The new user could not be created.",
+
+	'user:set:name' => "Account name settings",
+	'user:name:label' => "My display name",
+	'user:name:success' => "Successfully changed your name on the system.",
+	'user:name:fail' => "Could not change your name on the system.  Please make sure your name isn't too long and try again.",
+
+	'user:set:password' => "Account password",
+	'user:current_password:label' => 'Current password',
+	'user:password:label' => "Your new password",
+	'user:password2:label' => "Your new password again",
+	'user:password:success' => "Password changed",
+	'user:password:fail' => "Could not change your password on the system.",
+	'user:password:fail:notsame' => "The two passwords are not the same!",
+	'user:password:fail:tooshort' => "Password is too short!",
+	'user:password:fail:incorrect_current_password' => 'The current password entered is incorrect.',
+	'user:resetpassword:unknown_user' => 'Invalid user.',
+	'user:resetpassword:reset_password_confirm' => 'Resetting your password will email a new password to your registered email address.',
+
+	'user:set:language' => "Language settings",
+	'user:language:label' => "Your language",
+	'user:language:success' => "Your language settings have been updated.",
+	'user:language:fail' => "Your language settings could not be saved.",
+
+	'user:username:notfound' => 'Username %s not found.',
+
+	'user:password:lost' => 'Lost password',
+	'user:password:resetreq:success' => 'Successfully requested a new password, email sent',
+	'user:password:resetreq:fail' => 'Could not request a new password.',
+
+	'user:password:text' => 'To request a new password, enter your username or email address below and click the Request button.',
+
+	'user:persistent' => 'Remember me',
+
+	'walled_garden:welcome' => 'Welcome to',
+
+/**
+ * Administration
+ */
+	'menu:page:header:administer' => 'Administer',
+	'menu:page:header:configure' => 'Configure',
+	'menu:page:header:develop' => 'Develop',
+	'menu:page:header:default' => 'Other',
+
+	'admin:view_site' => 'View site',
+	'admin:loggedin' => 'Logged in as %s',
+	'admin:menu' => 'Menu',
+
+	'admin:configuration:success' => "Your settings have been saved.",
+	'admin:configuration:fail' => "Your settings could not be saved.",
+	'admin:configuration:dataroot:relative_path' => 'Cannot set "%s" as the dataroot because it is not an absolute path.',
+
+	'admin:unknown_section' => 'Invalid Admin Section.',
+
+	'admin' => "Administration",
+	'admin:description' => "The admin panel allows you to control all aspects of the system, from user management to how plugins behave. Choose an option below to get started.",
+
+	'admin:statistics' => "Statistics",
+	'admin:statistics:overview' => 'Overview',
+	'admin:statistics:server' => 'Server Info',
+
+	'admin:appearance' => 'Appearance',
+	'admin:administer_utilities' => 'Utilities',
+	'admin:develop_utilities' => 'Utilities',
+
+	'admin:users' => "Users",
+	'admin:users:online' => 'Currently Online',
+	'admin:users:newest' => 'Newest',
+	'admin:users:admins' => 'Administrators',
+	'admin:users:add' => 'Add New User',
+	'admin:users:description' => "This admin panel allows you to control user settings for your site. Choose an option below to get started.",
+	'admin:users:adduser:label' => "Click here to add a new user...",
+	'admin:users:opt:linktext' => "Configure users...",
+	'admin:users:opt:description' => "Configure users and account information. ",
+	'admin:users:find' => 'Find',
+
+	'admin:settings' => 'Settings',
+	'admin:settings:basic' => 'Basic Settings',
+	'admin:settings:advanced' => 'Advanced Settings',
+	'admin:settings:advanced/site_secret' => 'Site Secret',
+	'admin:site:description' => "This admin panel allows you to control global settings for your site. Choose an option below to get started.",
+	'admin:settings:advanced:site_secret' => 'Site Secret',
+	'admin:site:opt:linktext' => "Configure site...",
+	'admin:site:access:warning' => "Changing the access setting only affects the permissions on content created in the future.",
+
+	'admin:site:secret:intro' => 'Elgg uses a key to create security tokens for various purposes.',
+	'admin:site:secret_regenerated' => "Your site secret has been regenerated.",
+	'admin:site:secret:regenerate' => "Regenerate site secret",
+	'admin:site:secret:regenerate:help' => "Note: This may inconvenience some users by invalidating tokens used in \"remember me\" cookies, e-mail validation requests, invitation codes, etc.",
+	'site_secret:current_strength' => 'Key Strength',
+	'site_secret:strength:weak' => "Weak",
+	'site_secret:strength_msg:weak' => "We strongly recommend that you regenerate your site secret.",
+	'site_secret:strength:moderate' => "Moderate",
+	'site_secret:strength_msg:moderate' => "We recommend you regenerate your site secret for the best site security.",
+	'site_secret:strength:strong' => "Strong",
+	'site_secret:strength_msg:strong' => "&#x2713; Your site secret is sufficiently strong.",
+
+	'admin:dashboard' => 'Dashboard',
+	'admin:widget:online_users' => 'Online users',
+	'admin:widget:online_users:help' => 'Lists the users currently on the site',
+	'admin:widget:new_users' => 'New users',
+	'admin:widget:new_users:help' => 'Lists the newest users',
+	'admin:widget:content_stats' => 'Content statistics',
+	'admin:widget:content_stats:help' => 'Keep track of the content created by your users',
+	'widget:content_stats:type' => 'Content type',
+	'widget:content_stats:number' => 'Number',
+
+	'admin:widget:admin_welcome' => 'Welcome',
+	'admin:widget:admin_welcome:help' => "A short introduction to Elgg's admin area",
+	'admin:widget:admin_welcome:intro' =>
+'Welcome to Elgg! Right now you are looking at the administration dashboard. It\'s useful for tracking what\'s happening on the site.',
+
+	'admin:widget:admin_welcome:admin_overview' =>
+"Navigation for the administration area is provided by the menu to the right. It is organized into"
+. " three sections:
+	<dl>
+		<dt>Administer</dt><dd>Everyday tasks like monitoring reported content, checking who is online, and viewing statistics.</dd>
+		<dt>Configure</dt><dd>Occasional tasks like setting the site name or activating a plugin.</dd>
+		<dt>Develop</dt><dd>For developers who are building plugins or designing themes. (Requires a developer plugin.)</dd>
+	</dl>
+	",
+
+	// argh, this is ugly
+	'admin:widget:admin_welcome:outro' => '<br />Be sure to check out the resources available through the footer links and thank you for using Elgg!',
+
+	'admin:widget:control_panel' => 'Control panel',
+	'admin:widget:control_panel:help' => "Provides easy access to common controls",
+
+	'admin:cache:flush' => 'Flush the caches',
+	'admin:cache:flushed' => "The site's caches have been flushed",
+
+	'admin:footer:faq' => 'Administration FAQ',
+	'admin:footer:manual' => 'Administration Manual',
+	'admin:footer:community_forums' => 'Elgg Community Forums',
+	'admin:footer:blog' => 'Elgg Blog',
+
+	'admin:plugins:category:all' => 'All plugins',
+	'admin:plugins:category:active' => 'Active plugins',
+	'admin:plugins:category:inactive' => 'Inactive plugins',
+	'admin:plugins:category:admin' => 'Admin',
+	'admin:plugins:category:bundled' => 'Bundled',
+	'admin:plugins:category:nonbundled' => 'Non-bundled',
+	'admin:plugins:category:content' => 'Content',
+	'admin:plugins:category:development' => 'Development',
+	'admin:plugins:category:enhancement' => 'Enhancements',
+	'admin:plugins:category:api' => 'Service/API',
+	'admin:plugins:category:communication' => 'Communication',
+	'admin:plugins:category:security' => 'Security and Spam',
+	'admin:plugins:category:social' => 'Social',
+	'admin:plugins:category:multimedia' => 'Multimedia',
+	'admin:plugins:category:theme' => 'Themes',
+	'admin:plugins:category:widget' => 'Widgets',
+	'admin:plugins:category:utility' => 'Utilities',
+
+	'admin:plugins:sort:priority' => 'Priority',
+	'admin:plugins:sort:alpha' => 'Alphabetical',
+	'admin:plugins:sort:date' => 'Newest',
+
+	'admin:plugins:markdown:unknown_plugin' => 'Unknown plugin.',
+	'admin:plugins:markdown:unknown_file' => 'Unknown file.',
+
+
+	'admin:notices:could_not_delete' => 'Could not delete notice.',
+	'item:object:admin_notice' => 'Admin notice',
+
+	'admin:options' => 'Admin options',
+
+
+/**
+ * Plugins
+ */
+	'plugins:disabled' => 'Plugins are not being loaded because a file named "disabled" is in the mod directory.',
+	'plugins:settings:save:ok' => "Settings for the %s plugin were saved successfully.",
+	'plugins:settings:save:fail' => "There was a problem saving settings for the %s plugin.",
+	'plugins:usersettings:save:ok' => "User settings for the %s plugin were saved successfully.",
+	'plugins:usersettings:save:fail' => "There was a problem saving  user settings for the %s plugin.",
+	'item:object:plugin' => 'Plugins',
+
+	'admin:plugins' => "Plugins",
+	'admin:plugins:activate_all' => 'Activate All',
+	'admin:plugins:deactivate_all' => 'Deactivate All',
+	'admin:plugins:activate' => 'Activate',
+	'admin:plugins:deactivate' => 'Deactivate',
+	'admin:plugins:description' => "This admin panel allows you to control and configure tools installed on your site.",
+	'admin:plugins:opt:linktext' => "Configure tools...",
+	'admin:plugins:opt:description' => "Configure the tools installed on the site. ",
+	'admin:plugins:label:author' => "Author",
+	'admin:plugins:label:copyright' => "Copyright",
+	'admin:plugins:label:categories' => 'Categories',
+	'admin:plugins:label:licence' => "License",
+	'admin:plugins:label:website' => "URL",
+	'admin:plugins:label:repository' => "Code",
+	'admin:plugins:label:bugtracker' => "Report issue",
+	'admin:plugins:label:donate' => "Donate",
+	'admin:plugins:label:moreinfo' => 'more info',
+	'admin:plugins:label:version' => 'Version',
+	'admin:plugins:label:location' => 'Location',
+	'admin:plugins:label:dependencies' => 'Dependencies',
+
+	'admin:plugins:warning:elgg_version_unknown' => 'This plugin uses a legacy manifest file and does not specify a compatible Elgg version. It probably will not work!',
+	'admin:plugins:warning:unmet_dependencies' => 'This plugin has unmet dependencies and cannot be activated. Check dependencies under more info.',
+	'admin:plugins:warning:invalid' => 'This plugin is invalid: %s',
+	'admin:plugins:warning:invalid:check_docs' => 'Check <a href="http://docs.elgg.org/Invalid_Plugin">the Elgg documentation</a> for troubleshooting tips.',
+	'admin:plugins:cannot_activate' => 'cannot activate',
+
+	'admin:plugins:set_priority:yes' => "Reordered %s.",
+	'admin:plugins:set_priority:no' => "Could not reorder %s.",
+	'admin:plugins:set_priority:no_with_msg' => "Could not reorder %s. Error: %s",
+	'admin:plugins:deactivate:yes' => "Deactivated %s.",
+	'admin:plugins:deactivate:no' => "Could not deactivate %s.",
+	'admin:plugins:deactivate:no_with_msg' => "Could not deactivate %s. Error: %s",
+	'admin:plugins:activate:yes' => "Activated %s.",
+	'admin:plugins:activate:no' => "Could not activate %s.",
+	'admin:plugins:activate:no_with_msg' => "Could not activate %s. Error: %s",
+	'admin:plugins:categories:all' => 'All categories',
+	'admin:plugins:plugin_website' => 'Plugin website',
+	'admin:plugins:author' => '%s',
+	'admin:plugins:version' => 'Version %s',
+	'admin:plugin_settings' => 'Plugin Settings',
+	'admin:plugins:warning:unmet_dependencies_active' => 'This plugin is active but has unmet dependencies. You may encounter problems. See "more info" below for details.',
+
+	'admin:plugins:dependencies:type' => 'Type',
+	'admin:plugins:dependencies:name' => 'Name',
+	'admin:plugins:dependencies:expected_value' => 'Expected Value',
+	'admin:plugins:dependencies:local_value' => 'Actual value',
+	'admin:plugins:dependencies:comment' => 'Comment',
+
+	'admin:statistics:description' => "This is an overview of statistics on your site. If you need more detailed statistics, a professional administration feature is available.",
+	'admin:statistics:opt:description' => "View statistical information about users and objects on your site.",
+	'admin:statistics:opt:linktext' => "View statistics...",
+	'admin:statistics:label:basic' => "Basic site statistics",
+	'admin:statistics:label:numentities' => "Entities on site",
+	'admin:statistics:label:numusers' => "Number of users",
+	'admin:statistics:label:numonline' => "Number of users online",
+	'admin:statistics:label:onlineusers' => "Users online now",
+	'admin:statistics:label:admins'=>"Admins",
+	'admin:statistics:label:version' => "Elgg version",
+	'admin:statistics:label:version:release' => "Release",
+	'admin:statistics:label:version:version' => "Version",
+
+	'admin:server:label:php' => 'PHP',
+	'admin:server:label:web_server' => 'Web Server',
+	'admin:server:label:server' => 'Server',
+	'admin:server:label:log_location' => 'Log Location',
+	'admin:server:label:php_version' => 'PHP version',
+	'admin:server:label:php_ini' => 'PHP ini file location',
+	'admin:server:label:php_log' => 'PHP Log',
+	'admin:server:label:mem_avail' => 'Memory available',
+	'admin:server:label:mem_used' => 'Memory used',
+	'admin:server:error_log' => "Web server's error log",
+	'admin:server:label:post_max_size' => 'POST maximum size',
+	'admin:server:label:upload_max_filesize' => 'Upload maximum size',
+	'admin:server:warning:post_max_too_small' => '(Note: post_max_size must be larger than this value to support uploads of this size)',
+
+	'admin:user:label:search' => "Find users:",
+	'admin:user:label:searchbutton' => "Search",
+
+	'admin:user:ban:no' => "Can not ban user",
+	'admin:user:ban:yes' => "User banned.",
+	'admin:user:self:ban:no' => "You cannot ban yourself",
+	'admin:user:unban:no' => "Can not unban user",
+	'admin:user:unban:yes' => "User unbanned.",
+	'admin:user:delete:no' => "Can not delete user",
+	'admin:user:delete:yes' => "The user %s has been deleted",
+	'admin:user:self:delete:no' => "You cannot delete yourself",
+
+	'admin:user:resetpassword:yes' => "Password reset, user notified.",
+	'admin:user:resetpassword:no' => "Password could not be reset.",
+
+	'admin:user:makeadmin:yes' => "User is now an admin.",
+	'admin:user:makeadmin:no' => "We could not make this user an admin.",
+
+	'admin:user:removeadmin:yes' => "User is no longer an admin.",
+	'admin:user:removeadmin:no' => "We could not remove administrator privileges from this user.",
+	'admin:user:self:removeadmin:no' => "You cannot remove your own administrator privileges.",
+
+	'admin:appearance:menu_items' => 'Menu Items',
+	'admin:menu_items:configure' => 'Configure main menu items',
+	'admin:menu_items:description' => 'Select which menu items you want to show as featured links.  Unused items will be added as "More" at the end of the list.',
+	'admin:menu_items:hide_toolbar_entries' => 'Remove links from tool bar menu?',
+	'admin:menu_items:saved' => 'Menu items saved.',
+	'admin:add_menu_item' => 'Add a custom menu item',
+	'admin:add_menu_item:description' => 'Fill out the Display name and URL to add custom items to your navigation menu.',
+
+	'admin:appearance:default_widgets' => 'Default Widgets',
+	'admin:default_widgets:unknown_type' => 'Unknown widget type',
+	'admin:default_widgets:instructions' => 'Add, remove, position, and configure default widgets for the selected widget page.'
+		. '  These changes will only affect new users on the site.',
+
+/**
+ * User settings
+ */
+	'usersettings:description' => "The user settings panel allows you to control all your personal settings, from user management to how plugins behave. Choose an option below to get started.",
+
+	'usersettings:statistics' => "Your statistics",
+	'usersettings:statistics:opt:description' => "View statistical information about users and objects on your site.",
+	'usersettings:statistics:opt:linktext' => "Account statistics",
+
+	'usersettings:user' => "Your settings",
+	'usersettings:user:opt:description' => "This allows you to control user settings.",
+	'usersettings:user:opt:linktext' => "Change your settings",
+
+	'usersettings:plugins' => "Tools",
+	'usersettings:plugins:opt:description' => "Configure settings (if any) for your active tools.",
+	'usersettings:plugins:opt:linktext' => "Configure your tools",
+
+	'usersettings:plugins:description' => "This panel allows you to control and configure the personal settings for the tools installed by your system administrator.",
+	'usersettings:statistics:label:numentities' => "Your content",
+
+	'usersettings:statistics:yourdetails' => "Your details",
+	'usersettings:statistics:label:name' => "Full name",
+	'usersettings:statistics:label:email' => "Email",
+	'usersettings:statistics:label:membersince' => "Member since",
+	'usersettings:statistics:label:lastlogin' => "Last logged in",
+
+/**
+ * Activity river
+ */
+	'river:all' => 'All Site Activity',
+	'river:mine' => 'My Activity',
+	'river:friends' => 'Friends Activity',
+	'river:select' => 'Show %s',
+	'river:comments:more' => '+%u more',
+	'river:generic_comment' => 'commented on %s %s',
+
+	'friends:widget:description' => "Displays some of your friends.",
+	'friends:num_display' => "Number of friends to display",
+	'friends:icon_size' => "Icon size",
+	'friends:tiny' => "tiny",
+	'friends:small' => "small",
+
+/**
+ * Generic action words
+ */
+
+	'save' => "Save",
+	'reset' => 'Reset',
+	'publish' => "Publish",
+	'cancel' => "Cancel",
+	'saving' => "Saving ...",
+	'update' => "Update",
+	'preview' => "Preview",
+	'edit' => "Edit",
+	'delete' => "Delete",
+	'accept' => "Accept",
+	'load' => "Load",
+	'upload' => "Upload",
+	'ban' => "Ban",
+	'unban' => "Unban",
+	'banned' => "Banned",
+	'enable' => "Enable",
+	'disable' => "Disable",
+	'request' => "Request",
+	'complete' => "Complete",
+	'open' => 'Open',
+	'close' => 'Close',
+	'reply' => "Reply",
+	'more' => 'More',
+	'comments' => 'Comments',
+	'import' => 'Import',
+	'export' => 'Export',
+	'untitled' => 'Untitled',
+	'help' => 'Help',
+	'send' => 'Send',
+	'post' => 'Post',
+	'submit' => 'Submit',
+	'comment' => 'Comment',
+	'upgrade' => 'Upgrade',
+	'sort' => 'Sort',
+	'filter' => 'Filter',
+	'new' => 'New',
+	'add' => 'Add',
+	'create' => 'Create',
+	'remove' => 'Remove',
+	'revert' => 'Revert',
+
+	'site' => 'Site',
+	'activity' => 'Activity',
+	'members' => 'Members',
+
+	'up' => 'Up',
+	'down' => 'Down',
+	'top' => 'Top',
+	'bottom' => 'Bottom',
+	'back' => 'Back',
+
+	'invite' => "Invite",
+
+	'resetpassword' => "Reset password",
+	'makeadmin' => "Make admin",
+	'removeadmin' => "Remove admin",
+
+	'option:yes' => "Yes",
+	'option:no' => "No",
+
+	'unknown' => 'Unknown',
+
+	'active' => 'Active',
+	'total' => 'Total',
+
+	'learnmore' => "Click here to learn more.",
+	'unknown_error' => 'Unknown error',
+
+	'content' => "content",
+	'content:latest' => 'Latest activity',
+	'content:latest:blurb' => 'Alternatively, click here to view the latest content from across the site.',
+
+	'link:text' => 'view link',
+/**
+ * Generic questions
+ */
+
+	'question:areyousure' => 'Are you sure?',
+
+/**
+ * Generic data words
+ */
+
+	'title' => "Title",
+	'description' => "Description",
+	'tags' => "Tags",
+	'spotlight' => "Spotlight",
+	'all' => "All",
+	'mine' => "Mine",
+
+	'by' => 'by',
+	'none' => 'none',
+
+	'annotations' => "Annotations",
+	'relationships' => "Relationships",
+	'metadata' => "Metadata",
+	'tagcloud' => "Tag cloud",
+	'tagcloud:allsitetags' => "All site tags",
+
+	'on' => 'On',
+	'off' => 'Off',
+
+/**
+ * Entity actions
+ */
+	'edit:this' => 'Edit this',
+	'delete:this' => 'Delete this',
+	'comment:this' => 'Comment on this',
+
+/**
+ * Input / output strings
+ */
+
+	'deleteconfirm' => "Are you sure you want to delete this item?",
+	'deleteconfirm:plural' => "Are you sure you want to delete these items?",
+	'fileexists' => "A file has already been uploaded. To replace it, select it below:",
+
+/**
+ * User add
+ */
+
+	'useradd:subject' => 'User account created',
+	'useradd:body' => '
+%s,
+
+A user account has been created for you at %s. To log in, visit:
+
+%s
+
+And log in with these user credentials:
+
+Username: %s
+Password: %s
+
+Once you have logged in, we highly recommend that you change your password.
+',
+
+/**
+ * System messages
+ **/
+
+	'systemmessages:dismiss' => "click to dismiss",
+
+
+/**
+ * Import / export
+ */
+	'importsuccess' => "Import of data was successful",
+	'importfail' => "OpenDD import of data failed.",
+
+/**
+ * Time
+ */
+
+	'friendlytime:justnow' => "just now",
+	'friendlytime:minutes' => "%s minutes ago",
+	'friendlytime:minutes:singular' => "a minute ago",
+	'friendlytime:hours' => "%s hours ago",
+	'friendlytime:hours:singular' => "an hour ago",
+	'friendlytime:days' => "%s days ago",
+	'friendlytime:days:singular' => "yesterday",
+	'friendlytime:date_format' => 'j F Y @ g:ia',
+
+	'date:month:01' => 'January %s',
+	'date:month:02' => 'February %s',
+	'date:month:03' => 'March %s',
+	'date:month:04' => 'April %s',
+	'date:month:05' => 'May %s',
+	'date:month:06' => 'June %s',
+	'date:month:07' => 'July %s',
+	'date:month:08' => 'August %s',
+	'date:month:09' => 'September %s',
+	'date:month:10' => 'October %s',
+	'date:month:11' => 'November %s',
+	'date:month:12' => 'December %s',
+
+
+/**
+ * System settings
+ */
+
+	'installation:sitename' => "The name of your site:",
+	'installation:sitedescription' => "Short description of your site (optional):",
+	'installation:wwwroot' => "The site URL:",
+	'installation:path' => "The full path of the Elgg installation:",
+	'installation:dataroot' => "The full path of the data directory:",
+	'installation:dataroot:warning' => "You must create this directory manually. It should be in a different directory to your Elgg installation.",
+	'installation:sitepermissions' => "The default access permissions:",
+	'installation:language' => "The default language for your site:",
+	'installation:debug' => "Debug mode provides extra information which can be used to diagnose faults. However, it can slow your system down so should only be used if you are having problems:",
+	'installation:debug:none' => 'Turn off debug mode (recommended)',
+	'installation:debug:error' => 'Display only critical errors',
+	'installation:debug:warning' => 'Display errors and warnings',
+	'installation:debug:notice' => 'Log all errors, warnings and notices',
+
+	// Walled Garden support
+	'installation:registration:description' => 'User registration is enabled by default. Turn this off if you do not want new users to be able to register on their own.',
+	'installation:registration:label' => 'Allow new users to register',
+	'installation:walled_garden:description' => 'Enable the site to run as a private network. This will not allow non logged-in users to view any site pages other than those specifically marked as public.',
+	'installation:walled_garden:label' => 'Restrict pages to logged-in users',
+
+	'installation:httpslogin' => "Enable this to have user logins performed over HTTPS. You will need to have https enabled on your server for this to work.",
+	'installation:httpslogin:label' => "Enable HTTPS logins",
+	'installation:view' => "Enter the view which will be used as the default for your site or leave this blank for the default view (if in doubt, leave as default):",
+
+	'installation:siteemail' => "Site email address (used when sending system emails):",
+
+	'installation:disableapi' => "Elgg provides an API for building web services so that remote applications can interact with your site.",
+	'installation:disableapi:label' => "Enable Elgg's web services API",
+
+	'installation:allow_user_default_access:description' => "If checked, individual users will be allowed to set their own default access level that can over-ride the system default access level.",
+	'installation:allow_user_default_access:label' => "Allow user default access",
+
+	'installation:simplecache:description' => "The simple cache increases performance by caching static content including some CSS and JavaScript files. Normally you will want this on.",
+	'installation:simplecache:label' => "Use simple cache (recommended)",
+
+	'installation:systemcache:description' => "The system cache decreases the loading time of the Elgg engine by caching data to files.",
+	'installation:systemcache:label' => "Use system cache (recommended)",
+
+	'upgrading' => 'Upgrading...',
+	'upgrade:db' => 'Your database was upgraded.',
+	'upgrade:core' => 'Your Elgg installation was upgraded.',
+	'upgrade:unlock' => 'Unlock upgrade',
+	'upgrade:unlock:confirm' => "The database is locked for another upgrade. Running concurrent upgrades is dangerous. You should only continue if you know there is not another upgrade running. Unlock?",
+	'upgrade:locked' => "Cannot upgrade. Another upgrade is running. To clear the upgrade lock, visit the Admin section.",
+	'upgrade:unlock:success' => "Upgrade unlocked successfully.",
+	'upgrade:unable_to_upgrade' => 'Unable to upgrade.',
+	'upgrade:unable_to_upgrade_info' =>
+		'This installation cannot be upgraded because legacy views
+		were detected in the Elgg core views directory. These views have been deprecated and need to be
+		removed for Elgg to function correctly. If you have not made changes to Elgg core, you can
+		simply delete the views directory and replace it with the one from the latest
+		package of Elgg downloaded from <a href="http://elgg.org">elgg.org</a>.<br /><br />
+
+		If you need detailed instructions, please visit the <a href="http://docs.elgg.org/wiki/Upgrading_Elgg">
+		Upgrading Elgg documentation</a>.  If you require assistance, please post to the
+		<a href="http://community.elgg.org/pg/groups/discussion/">Community Support Forums</a>.',
+
+	'update:twitter_api:deactivated' => 'Twitter API (previously Twitter Service) was deactivated during the upgrade. Please activate it manually if required.',
+	'update:oauth_api:deactivated' => 'OAuth API (previously OAuth Lib) was deactivated during the upgrade.  Please activate it manually if required.',
+	'upgrade:site_secret_warning:moderate' => "You are encouraged to regenerate your site key to improve system security. See Configure &gt; Settings &gt; Site Secret",
+	'upgrade:site_secret_warning:weak' => "You are strongly encouraged to regenerate your site key to improve system security. See Configure &gt; Settings &gt; Site Secret",
+
+	'deprecated:function' => '%s() was deprecated by %s()',
+
+/**
+ * Welcome
+ */
+
+	'welcome' => "Welcome",
+	'welcome:user' => 'Welcome %s',
+
+/**
+ * Emails
+ */
+	'email:settings' => "Email settings",
+	'email:address:label' => "Your email address",
+
+	'email:save:success' => "New email address saved.",
+	'email:save:fail' => "Your new email address could not be saved.",
+
+	'friend:newfriend:subject' => "%s has made you a friend!",
+	'friend:newfriend:body' => "%s has made you a friend!
+
+To view their profile, click here:
+
+%s
+
+You cannot reply to this email.",
+
+
+
+	'email:resetpassword:subject' => "Password reset!",
+	'email:resetpassword:body' => "Hi %s,
+
+Your password has been reset to: %s",
+
+
+	'email:resetreq:subject' => "Request for new password.",
+	'email:resetreq:body' => "Hi %s,
+
+Somebody (from the IP address %s) has requested a new password for their account.
+
+If you requested this, click on the link below. Otherwise ignore this email.
+
+%s
+",
+
+/**
+ * user default access
+ */
+
+	'default_access:settings' => "Your default access level",
+	'default_access:label' => "Default access",
+	'user:default_access:success' => "Your new default access level was saved.",
+	'user:default_access:failure' => "Your new default access level could not be saved.",
+
+/**
+ * XML-RPC
+ */
+	'xmlrpc:noinputdata'	=>	"Input data missing",
+
+/**
+ * Comments
+ */
+
+	'comments:count' => "%s comments",
+
+	'river:comment:object:default' => '%s commented on %s',
+
+	'generic_comments:add' => "Leave a comment",
+	'generic_comments:post' => "Post comment",
+	'generic_comments:text' => "Comment",
+	'generic_comments:latest' => "Latest comments",
+	'generic_comment:posted' => "Your comment was successfully posted.",
+	'generic_comment:deleted' => "The comment was successfully deleted.",
+	'generic_comment:blank' => "Sorry, you need to actually put something in your comment before we can save it.",
+	'generic_comment:notfound' => "Sorry, we could not find the specified item.",
+	'generic_comment:notdeleted' => "Sorry, we could not delete this comment.",
+	'generic_comment:failure' => "An unexpected error occurred when adding your comment.",
+	'generic_comment:none' => 'No comments',
+	'generic_comment:title' => 'Comment by %s',
+	'generic_comment:on' => '%s on %s',
+
+	'generic_comment:email:subject' => 'You have a new comment!',
+	'generic_comment:email:body' => "You have a new comment on your item \"%s\" from %s. It reads:
+
+
+%s
+
+
+To reply or view the original item, click here:
+
+%s
+
+To view %s's profile, click here:
+
+%s
+
+You cannot reply to this email.",
+
+/**
+ * Entities
+ */
+	'byline' => 'By %s',
+	'entity:default:strapline' => 'Created %s by %s',
+	'entity:default:missingsupport:popup' => 'This entity cannot be displayed correctly. This may be because it requires support provided by a plugin that is no longer installed.',
+
+	'entity:delete:success' => 'Entity %s has been deleted',
+	'entity:delete:fail' => 'Entity %s could not be deleted',
+
+
+/**
+ * Action gatekeeper
+ */
+	'actiongatekeeper:missingfields' => 'Form is missing __token or __ts fields',
+	'actiongatekeeper:tokeninvalid' => "The page you were using had expired. Please try again.",
+	'actiongatekeeper:timeerror' => 'The page you were using has expired. Please refresh and try again.',
+	'actiongatekeeper:pluginprevents' => 'A extension has prevented this form from being submitted.',
+	'actiongatekeeper:uploadexceeded' => 'The size of file(s) uploaded exceeded the limit set by your site administrator',
+	'actiongatekeeper:crosssitelogin' => "Sorry, logging in from a different domain is not permitted. Please try again.",
+
+
+/**
+ * Word blacklists
+ */
+	'word:blacklist' => 'and, the, then, but, she, his, her, him, one, not, also, about, now, hence, however, still, likewise, otherwise, therefore, conversely, rather, consequently, furthermore, nevertheless, instead, meanwhile, accordingly, this, seems, what, whom, whose, whoever, whomever',
+
+/**
+ * Tag labels
+ */
+
+	'tag_names:tags' => 'Tags',
+	'tags:site_cloud' => 'Site Tag Cloud',
+
+/**
+ * Javascript
+ */
+
+	'js:security:token_refresh_failed' => 'Failed to contact %s. You may experience problems saving content. Please refresh this page.',
+	'js:security:token_refreshed' => 'Connection to %s restored!',
+
+/**
+ * Languages according to ISO 639-1
+ */
+	"aa" => "Afar",
+	"ab" => "Abkhazian",
+	"af" => "Afrikaans",
+	"am" => "Amharic",
+	"ar" => "Arabic",
+	"as" => "Assamese",
+	"ay" => "Aymara",
+	"az" => "Azerbaijani",
+	"ba" => "Bashkir",
+	"be" => "Byelorussian",
+	"bg" => "Bulgarian",
+	"bh" => "Bihari",
+	"bi" => "Bislama",
+	"bn" => "Bengali; Bangla",
+	"bo" => "Tibetan",
+	"br" => "Breton",
+	"ca" => "Catalan",
+	"co" => "Corsican",
+	"cs" => "Czech",
+	"cy" => "Welsh",
+	"da" => "Danish",
+	"de" => "German",
+	"dz" => "Bhutani",
+	"el" => "Greek",
+	"en" => "English",
+	"eo" => "Esperanto",
+	"es" => "Spanish",
+	"et" => "Estonian",
+	"eu" => "Basque",
+	"fa" => "Persian",
+	"fi" => "Finnish",
+	"fj" => "Fiji",
+	"fo" => "Faeroese",
+	"fr" => "French",
+	"fy" => "Frisian",
+	"ga" => "Irish",
+	"gd" => "Scots / Gaelic",
+	"gl" => "Galician",
+	"gn" => "Guarani",
+	"gu" => "Gujarati",
+	"he" => "Hebrew",
+	"ha" => "Hausa",
+	"hi" => "Hindi",
+	"hr" => "Croatian",
+	"hu" => "Hungarian",
+	"hy" => "Armenian",
+	"ia" => "Interlingua",
+	"id" => "Indonesian",
+	"ie" => "Interlingue",
+	"ik" => "Inupiak",
+	//"in" => "Indonesian",
+	"is" => "Icelandic",
+	"it" => "Italian",
+	"iu" => "Inuktitut",
+	"iw" => "Hebrew (obsolete)",
+	"ja" => "Japanese",
+	"ji" => "Yiddish (obsolete)",
+	"jw" => "Javanese",
+	"ka" => "Georgian",
+	"kk" => "Kazakh",
+	"kl" => "Greenlandic",
+	"km" => "Cambodian",
+	"kn" => "Kannada",
+	"ko" => "Korean",
+	"ks" => "Kashmiri",
+	"ku" => "Kurdish",
+	"ky" => "Kirghiz",
+	"la" => "Latin",
+	"ln" => "Lingala",
+	"lo" => "Laothian",
+	"lt" => "Lithuanian",
+	"lv" => "Latvian/Lettish",
+	"mg" => "Malagasy",
+	"mi" => "Maori",
+	"mk" => "Macedonian",
+	"ml" => "Malayalam",
+	"mn" => "Mongolian",
+	"mo" => "Moldavian",
+	"mr" => "Marathi",
+	"ms" => "Malay",
+	"mt" => "Maltese",
+	"my" => "Burmese",
+	"na" => "Nauru",
+	"ne" => "Nepali",
+	"nl" => "Dutch",
+	"no" => "Norwegian",
+	"oc" => "Occitan",
+	"om" => "(Afan) Oromo",
+	"or" => "Oriya",
+	"pa" => "Punjabi",
+	"pl" => "Polish",
+	"ps" => "Pashto / Pushto",
+	"pt" => "Portuguese",
+	"qu" => "Quechua",
+	"rm" => "Rhaeto-Romance",
+	"rn" => "Kirundi",
+	"ro" => "Romanian",
+	"ru" => "Russian",
+	"rw" => "Kinyarwanda",
+	"sa" => "Sanskrit",
+	"sd" => "Sindhi",
+	"sg" => "Sangro",
+	"sh" => "Serbo-Croatian",
+	"si" => "Singhalese",
+	"sk" => "Slovak",
+	"sl" => "Slovenian",
+	"sm" => "Samoan",
+	"sn" => "Shona",
+	"so" => "Somali",
+	"sq" => "Albanian",
+	"sr" => "Serbian",
+	"ss" => "Siswati",
+	"st" => "Sesotho",
+	"su" => "Sundanese",
+	"sv" => "Swedish",
+	"sw" => "Swahili",
+	"ta" => "Tamil",
+	"te" => "Tegulu",
+	"tg" => "Tajik",
+	"th" => "Thai",
+	"ti" => "Tigrinya",
+	"tk" => "Turkmen",
+	"tl" => "Tagalog",
+	"tn" => "Setswana",
+	"to" => "Tonga",
+	"tr" => "Turkish",
+	"ts" => "Tsonga",
+	"tt" => "Tatar",
+	"tw" => "Twi",
+	"ug" => "Uigur",
+	"uk" => "Ukrainian",
+	"ur" => "Urdu",
+	"uz" => "Uzbek",
+	"vi" => "Vietnamese",
+	"vo" => "Volapuk",
+	"wo" => "Wolof",
+	"xh" => "Xhosa",
+	//"y" => "Yiddish",
+	"yi" => "Yiddish",
+	"yo" => "Yoruba",
+	"za" => "Zuang",
+	"zh" => "Chinese",
+	"zu" => "Zulu",
 );
 
-add_translation('en', $english);
-\ No newline at end of file
+add_translation("en",$english);
diff --git a/mod/basic_theme/graphics/elgg_sprites.png b/mod/basic_theme/graphics/elgg_sprites.png
new file mode 100644
index 000000000..d30df93e2
--- /dev/null
+++ b/mod/basic_theme/graphics/elgg_sprites.png
diff --git a/mod/basic_theme/manifest.xml b/mod/basic_theme/manifest.xml
new file mode 100644
index 000000000..f2b97aebf
--- /dev/null
+++ b/mod/basic_theme/manifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Basic Theme</name>
+	<author>Lorea developers</author>
+	<version>1.0</version>
+	<category>theme</category>
+	<description>
+		Elgg's core basic theme. Ready for fork and modify.
+	</description>
+	<website>https://lorea.org</website>
+	<copyright>(C) 2011-2012 Lorea</copyright>
+	<license>GNU Affero General Public License, version 3</license>
+	
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>groups</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>messageboard</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>messages</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>profile</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>search</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>thewire</plugin>
+	</requires>
+	
+	<suggests>
+		<type>plugin</type>
+		<name>profile</name>
+		<version>1.8</version>
+	</suggests>
+</plugin_manifest>
diff --git a/mod/basic_theme/start.php b/mod/basic_theme/start.php
new file mode 100644
index 000000000..c14609b21
--- /dev/null
+++ b/mod/basic_theme/start.php
@@ -0,0 +1,14 @@
+<?php
+
+elgg_register_event_handler('init', 'system', 'basic_theme_init');
+
+function basic_theme_init() {
+	// Override Elgg logo item
+	elgg_register_menu_item('topbar', array(
+		'name' => 'elgg_logo',
+		'text' => elgg_get_site_entity()->name,
+		'href' => elgg_get_site_url(),
+		'priority' => 0,
+	));
+	
+}
diff --git a/mod/basic_theme/views/default/css/admin.php b/mod/basic_theme/views/default/css/admin.php
new file mode 100644
index 000000000..e3205ca4e
--- /dev/null
+++ b/mod/basic_theme/views/default/css/admin.php
@@ -0,0 +1,1443 @@
+<?php
+/**
+ * Elgg Admin CSS
+ *
+ * This is a distinct theme from the theme of the site. There are dependencies
+ * on the HTML created by the views in Elgg core.
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+?>
+
+/* ***************************************
+	RESET CSS
+*************************************** */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+<?php // force vertical scroll bar ?>
+html, body {
+	height: 100%;
+	margin-bottom: 1px;
+}
+img {
+	border-width: 0;
+	border-color: transparent;
+}
+:focus {
+	outline: 0 none;
+}
+ol, ul {
+	list-style: none;
+}
+em, i {
+	font-style: italic;
+}
+ins {
+	text-decoration: none;
+}
+del {
+	text-decoration:line-through;
+}
+strong, b {
+	font-weight: bold;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+caption, th, td {
+	text-align: left;
+	font-weight: normal;
+	vertical-align: top;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: "";
+}
+blockquote, q {
+	quotes: "" "";
+}
+
+/* ***************************************
+	BASICS
+*************************************** */
+body {
+	background-color: #eee;
+	font-size: 80%;
+	line-height: 1.4em;
+	font-family: "Lucida Grande",Arial,Tahoma,Verdana,sans-serif;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-weight: bold;
+	line-height: auto;
+	color: #666;
+}
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; line-height: 1.1em; }
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.0em; }
+h5 { font-size: 0.9em; }
+h6 { font-size: 0.8em; }
+
+a {
+	color: #333;
+	text-decoration: none;
+}
+a:hover {
+	color: black;
+	text-decoration: underline;
+}
+pre, code {
+	background-color: #EEE;
+	border: 1px solid #DDD;
+	color: #444;
+	font-family: Monaco, "Courier New", Courier, monospace;
+	font-size: 13px;
+	overflow: auto;
+	margin: 15px 0;
+	padding: 5px;
+}
+blockquote {
+	background: #EBF5FF;
+}
+p {
+	margin-bottom: 15px;
+}
+
+.clearfloat {
+	clear: both;
+}
+
+/* Clearfix! */
+.elgg-grid:after,
+.clearfix:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+.elgg-body {
+	width: auto;
+	word-wrap: break-word;
+	overflow: hidden;
+}
+.elgg-body:after {
+	display: block;
+	visibility: hidden;
+	height: 0 !important;
+	line-height: 0;
+	overflow: hidden;
+	font-size: xx-large;
+	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
+}
+
+/* ***************************************
+	PAGE WRAPPER
+*************************************** */
+.elgg-page > .elgg-inner {
+	margin: 0 auto;
+	padding: 20px 40px 0;
+	min-width: 800px;
+	max-width: 1600px;
+}
+
+/* ***************************************
+	HEADER
+*************************************** */
+.elgg-page-header {
+	background-color: #111;
+	border: 1px solid #999;
+	padding: 20px 20px;
+}
+.elgg-heading-site {
+	font-size: 1.8em;
+	float: left;
+}
+.elgg-heading-site a {
+	color: #ffffff;
+	text-decoration: none;
+}
+.elgg-heading-site a:hover {
+	color: white;
+	text-decoration: none;
+}
+.elgg-menu-user {
+	float: right;
+	margin-top: 5px;
+}
+.elgg-menu-user, .elgg-menu-user a {
+	color: #999999;
+}
+.elgg-menu-user a {
+	text-decoration: underline;
+}
+.elgg-menu-user a:hover {
+	color: white;
+}
+.elgg-menu-user li {
+	display: inline;
+}
+.elgg-menu-user li:after {
+	content: "|";
+	display: inline-block;
+	font-weight: normal;
+	margin-left: 8px;
+	margin-right: 4px;
+}
+.elgg-menu-user li:last-child:after {
+	content: "";
+}
+
+/* ***************************************
+	MESSAGES
+*************************************** */
+.elgg-page-messages {
+	padding: 20px 0 0;
+	width: 500px;
+	margin-bottom: -10px;
+}
+.elgg-system-messages p {
+	margin: 0;
+}
+.elgg-message {
+	padding: 10px;
+	margin-bottom: 10px;
+	border: 2px solid #ddd;
+	cursor: pointer;
+}
+.elgg-message.elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-message.elgg-state-success {
+	background: #e6efc2;
+	color: #264409;
+	border-color: #c6d880;
+}
+
+.elgg-admin-notices {
+	padding-bottom: 15px;
+}
+.elgg-admin-notices p {
+	background-color: #BDE5F8;
+	color: black;
+	border: 1px solid blue;
+	font-weight: bold;
+	padding: 3px 0px 3px 10px;
+
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.elgg-admin-notices a.elgg-admin-notice {
+	float: right;
+	text-decoration: none;
+}
+
+.elgg-admin-notices a {
+	text-decoration: underline;
+}
+
+/* ***************************************
+	BODY
+*************************************** */
+.elgg-page-body {
+	padding: 20px 0;
+}
+.elgg-main {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	padding: 20px;
+	position: relative;
+	min-height: 400px;
+}
+.elgg-sidebar {
+	width: 210px;
+	float: right;
+	margin-left: 30px;
+}
+.elgg-main > .elgg-head {
+	margin-bottom: 10px;
+}
+.elgg-main h2 {
+	color: #333333;
+}
+<?php // elgg-layout gets clearfix ?>
+.elgg-layout:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;
+}
+
+/* ***************************************
+	FOOTER
+*************************************** */
+.elgg-page-footer {
+	background-color: #111;
+	border: 1px solid #999;
+	padding: 10px 20px;
+	margin-bottom: 10px;
+}
+.elgg-page-footer a {
+	color: #ddd;
+	font-weight: bold;
+	text-decoration: none;
+}
+.elgg-page-footer a:hover {
+	text-decoration: underline;
+}
+
+/* ***************************************
+	MODULES
+*************************************** */
+.elgg-module {
+	overflow: hidden;
+}
+.elgg-module-main {
+	background-color: #fff;
+	border: 1px solid #ccc;
+	padding: 10px;
+}
+.elgg-module-main > .elgg-head {
+	margin-bottom: 5px;
+}
+.elgg-module-info > .elgg-head {
+	margin-bottom: 10px;
+}
+.elgg-module-inline {
+	margin: 20px 0;
+}
+.elgg-module-inline > .elgg-head {
+	background-color: #999;
+	color: white;
+	padding: 5px;
+	margin-bottom: 10px;
+	
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.elgg-module-inline > .elgg-head h3 {
+	color: white;
+}
+
+/* ***************************************
+	TABLE
+*************************************** */
+.elgg-table {
+	width: 100%;
+	border-top: 1px solid #ccc;
+}
+.elgg-table td, .elgg-table th {
+	background: white;
+	border: 1px solid #ccc;
+}
+.elgg-table th {
+	background-color: #ddd;
+}
+.elgg-table .alt td {
+	background: #eee;
+}
+.elgg-table td {
+	padding: 4px 8px;
+	border-bottom: 1px solid #ccc;
+}
+.elgg-table-alt {
+	width: 100%;
+	border-top: 1px solid #ccc;
+}
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, th {
+	padding: 2px 4px;
+	border-bottom: 1px solid #ccc;
+}
+.elgg-table-alt td:first-child {
+	width: 200px;
+}
+.elgg-table-alt tr:hover {
+	background: #E4E4E4;
+}
+
+/* ***************************************
+	LISTS AND IMAGE BLOCK
+*************************************** */
+.elgg-image-block {
+	padding: 3px 0;
+}
+.elgg-image-block .elgg-image {
+	float: left;
+	margin-right: 5px;
+}
+.elgg-image-block .elgg-image-alt {
+	float: right;
+	margin-left: 5px;
+}
+.elgg-item {
+	margin: 3px;
+}
+.elgg-list-simple li {
+	margin-bottom: 5px;
+}
+.elgg-list-distinct {
+	border-top: 1px dotted #CCCCCC;
+	margin: 5px 0;
+	clear: both;
+}
+.elgg-list-distinct > li {
+	border-bottom: 1px dotted #CCCCCC;
+}
+
+/* ***************************************
+	FORMS AND INPUT
+*************************************** */
+label {
+	font-weight: bold;
+	color: #333333;
+	font-size: 110%;
+}
+fieldset > div {
+	margin-bottom: 15px;
+}
+fieldset > div:last-child {
+	margin-bottom: 0;
+}
+input {
+	font: 120% Arial, Helvetica, sans-serif;
+	padding: 5px;
+	border: 1px solid #ccc;
+	color: #666;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+/* default elgg core input field classes */
+.elgg-input-text,
+.elgg-input-tags,
+.elgg-input-url,
+.elgg-input-plaintext {
+	width: 98%;
+}
+textarea {
+	height: 100px;
+}
+.elgg-input-thin {
+	width: 400px;
+}
+.elgg-input-natural {
+	width: auto;
+}
+
+.elgg-button {
+	font-size: 14px;
+	font-weight: bold;
+	text-decoration: none;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+
+	width: auto;
+	padding: 2px 4px;
+	cursor: pointer;
+	outline: none;
+}
+a.elgg-button {
+	padding: 3px 6px;
+}
+
+.elgg-button + .elgg-button {
+	margin-left: 5px;
+}
+
+.elgg-button-submit,
+.elgg-button-action {
+	color: white;
+	border: 1px solid #333;
+	background-color: #333;
+	text-shadow: 1px 1px 0px black;
+}
+.elgg-button-submit:hover,
+.elgg-button-action:hover {
+	color: white;
+	background-color: #000;
+	text-decoration: none;
+}
+.elgg-button-submit.elgg-state-disabled,
+.elgg-button-action.elgg-state-disabled {
+	color: #999;
+	cursor: default;
+}
+
+.elgg-button-cancel {
+	color: #333;
+	background-color: #999;
+	border: 1px solid #999;
+}
+.elgg-button-cancel:hover {
+	color: #222;
+	background-color: #666;
+	text-decoration: none;
+}
+
+.elgg-form-useradd input[type=text],
+.elgg-form-useradd input[type=password] {
+	width: 300px;
+}
+
+.elgg-form-settings {
+	max-width: 800px;
+}
+
+/* **************************************
+     DATE PICKER
+*************************************** */
+.ui-datepicker {
+	margin-top: 3px;
+	padding: 3px 3px 0;
+	border: 1px solid #ccc;
+	background-color: white;
+}
+.ui-datepicker-header {
+	padding: 2px 0;
+	border: 1px solid #ccc;
+	background-color: #eee;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+    position: absolute;
+    top: 9px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+    left: 6px;
+}
+.ui-datepicker-next {
+    right: 6px;
+}
+.ui-datepicker-title {
+    line-height: 1.8em;
+    margin: 0 30px;
+    text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin-bottom: 2px;
+}
+.ui-datepicker th {
+	border: none;
+    font-weight: bold;
+    padding: 5px 6px;
+    text-align: center;
+}
+.ui-datepicker td {
+	padding: 1px;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    display: block;
+    padding: 2px;
+	line-height: 1.2em;
+    text-align: right;
+    text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+    color: #555;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+    color: #333;
+	background: #ccc;
+}
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+    border: 1px solid #999;
+    color: #333;
+	background: #ddd;
+}
+
+/* ***************************************
+	PAGINATION
+*************************************** */
+.elgg-pagination {
+	margin: 10px 0;
+	display: block;
+	text-align: center;
+}
+.elgg-pagination li {
+	display: inline;
+	margin: 0 6px 0 0;
+	text-align: center;
+}
+.elgg-pagination a, .elgg-pagination span {
+	padding: 2px 6px;
+	color: #333;
+	border: 1px solid #333;
+	font-size: 12px;
+	text-decoration: none;
+}
+.elgg-pagination a:hover {
+	background: #333;
+	color: white;
+	text-decoration: none;
+}
+.elgg-pagination .elgg-state-disabled span {
+	color: #CCC;
+	border-color: #CCC;
+}
+.elgg-pagination .elgg-state-selected span {
+	color: #000;
+	border-color: #ccc;
+}
+
+/* ***************************************
+	TABS
+*************************************** */
+.elgg-tabs {
+	margin-bottom: 5px;
+	border-bottom: 1px solid #ccc;
+	display: table;
+	width: 100%;
+}
+.elgg-tabs li {
+	float: left;
+	border: 1px solid #ccc;
+	border-bottom-width: 0;
+	background: #eee;
+	margin: 0 0 0 10px;
+}
+.elgg-tabs a {
+	text-decoration: none;
+	display: block;
+	padding: 3px 10px 0 10px;
+	text-align: center;
+	height: 21px;
+	color: #999;
+}
+.elgg-tabs a:hover {
+	background: #dedede;
+	color:#333;
+}
+.elgg-tabs .elgg-state-selected {
+	border-color: #ccc;
+	background: white;
+}
+.elgg-tabs .elgg-state-selected a {
+	position: relative;
+	top: 2px;
+	background: white;
+}
+
+/* ***************************************
+	SIDEBAR MENU
+*************************************** */
+.elgg-admin-sidebar-menu a {
+	border: 1px solid red;
+	display: block;
+	padding: 5px;
+	color: #333;
+	cursor: pointer;
+	text-decoration: none;
+	margin-bottom: 2px;
+	border: 1px solid #CCC;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.elgg-admin-sidebar-menu a:hover {
+	text-decoration: none;
+	background: black;
+	color: white;
+	border: 1px solid black;
+}
+.elgg-admin-sidebar-menu li.elgg-state-selected > a {
+	background-color: #BBB;
+}
+.elgg-admin-sidebar-menu .elgg-menu-closed:before {
+	content: "\25B8";
+	padding-right: 4px;
+}
+.elgg-admin-sidebar-menu .elgg-menu-opened:before {
+	content: "\25BE";
+	padding-right: 4px;
+}
+.elgg-admin-sidebar-menu .elgg-child-menu {
+	display: none;
+	padding-left: 30px;
+}
+.elgg-admin-sidebar-menu li.elgg-state-selected > ul {
+	display: block;
+}
+.elgg-admin-sidebar-menu h2 {
+	padding-bottom: 5px;
+}
+.elgg-admin-sidebar-menu ul.elgg-menu-page {
+	padding-bottom: 15px;
+}
+
+/* ***************************************
+	TITLE MENU
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
+}
+
+/* ***************************************
+	FOOTER MENU
+*************************************** */
+.elgg-menu-footer {
+	color: gray;
+}
+.elgg-menu-footer li {
+	float: left;
+}
+.elgg-menu-footer li:after {
+	content: "\007C";
+	display: inline-block;
+	padding: 0 4px 0 4px;
+	font-weight: normal;
+}
+.elgg-menu-footer li:last-child:after {
+	content: "";
+}
+
+/* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+/* ***************************************
+	HOVER MENU
+*************************************** */
+.elgg-menu-hover {
+	display: none;
+	position: absolute;
+	z-index: 10000;
+
+	width: 165px;
+	border: solid 1px #E5E5E5;
+	border-color: #E5E5E5 #999 #999 #E5E5E5;
+	background-color: #FFF;
+
+	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+}
+.elgg-menu-hover > li {
+	border-bottom: 1px solid #ddd;
+}
+.elgg-menu-hover > li:last-child {
+	border-bottom: none;
+}
+.elgg-menu-hover .elgg-heading-basic {
+	display: block;
+}
+.elgg-menu-hover a {
+	display: block;
+	padding: 2px 8px;
+	font-size: 92%;
+}
+.elgg-menu-hover a:hover {
+	background: #ccc;
+	text-decoration: none;
+}
+.elgg-menu-hover-admin a {
+	color: red;
+}
+.elgg-menu-hover-admin a:hover {
+	color: white;
+	background-color: red;
+}
+
+/* ***************************************
+	ENTITY MENU
+*************************************** */
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, elgg-menu-annotation {
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+	color: #666;
+	line-height: 16px;
+	height: 16px;
+}
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
+	margin-left: 15px;
+}
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	color: #aaa;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
+}
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
+}
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
+
+/* ***************************************
+	MORE MENUS
+*************************************** */
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a {
+	display: inline-block;
+	vertical-align: middle;
+}
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after {
+	content: '.';
+}
+.elgg-menu > li:last-child::after {
+	display: none;
+}
+.elgg-menu-admin-footer a {
+	color: #eee;
+}
+.elgg-menu-admin-footer > li {
+	padding-right: 25px;
+}
+.elgg-menu-longtext {
+	float: right;
+}
+.elgg-menu-metadata {
+	list-style-type: none;
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+}
+.elgg-menu-metadata > li {
+	float: left;
+	margin-left: 15px;
+}
+.elgg-menu-metadata, .elgg-menu-metadata a {
+	color: #aaa;
+}
+
+/* ***************************************
+	WIDGETS
+*************************************** */
+.elgg-widgets {
+	float: right;
+	min-height: 30px;
+}
+.elgg-widget-add-control {
+	text-align: right;
+	margin: 5px 5px 15px;
+}
+.elgg-widgets-add-panel {
+	padding: 10px;
+	margin: 0 5px 15px;
+	background: #eee;
+	border: 1px solid #ccc;
+}
+.elgg-widgets-add-panel ul {
+	padding: 0;
+	margin: 0;
+}
+.elgg-widgets-add-panel li {
+	float: left;
+	margin: 2px 10px;
+	list-style: none;
+	width: 200px;
+	padding: 4px;
+	background-color: #eee;
+	border: 1px solid #ccc;
+	font-weight: bold;
+}
+.elgg-widgets-add-panel li a {
+	display: block;
+}
+.elgg-widget-single.elgg-state-available {
+	color: #333;
+	cursor: pointer;
+}
+.elgg-widget-single.elgg-state-available:hover {
+	border-color: #aaa;
+}
+.elgg-widget-single.elgg-state-unavailable {
+	color: #888;
+}
+
+.elgg-module-widget {
+	background-color: #dedede;
+	padding: 1px;
+	margin: 0 5px 15px;
+	position: relative;
+}
+.elgg-module-widget:hover {
+	background-color: #ccc;
+}
+.elgg-module-widget > .elgg-head {
+	background-color: #f5f5f5;
+	height: 26px;
+	overflow: hidden;
+}
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
+	cursor: move;
+}
+.elgg-module-widget > .elgg-head h3 {
+	float: left;
+	padding: 4px 45px 0 20px;
+	color: #333;
+}
+
+.elgg-widget-collapse-button {
+	color: #c5c5c5;
+	text-decoration: none;
+}
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
+}
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
+}
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
+}
+.elgg-module-widget > .elgg-body {
+	border-top: 1px solid #dedede;
+	background-color: white;
+	width: 100%;
+	overflow: hidden;
+}
+.elgg-widget-edit {
+	display: none;
+	width: 96%;
+	padding: 2%;
+	border-bottom: 1px solid #dedede;
+}
+.elgg-widget-content {
+	padding: 10px;
+}
+.elgg-widget-placeholder {
+	border: 2px dashed #dedede;
+	margin-bottom: 15px;
+}
+
+/* ***************************************
+	GRID
+*************************************** */
+.elgg-grid {}
+.elgg-col {
+	float: left;
+}
+.elgg-col-1of1 {
+	float: none;
+}
+.elgg-col-1of2 {
+	width: 50%;
+}
+.elgg-col-1of3 {
+	width: 33.33%;
+}
+.elgg-col-2of3 {
+	width: 66.66%;
+}
+.elgg-col-1of4 {
+	width: 25%;
+}
+.elgg-col-3of4 {
+	width: 75%;
+}
+.elgg-col-1of5 {
+	width: 20%;
+}
+.elgg-col-2of5 {
+	width: 40%;
+}
+.elgg-col-3of5 {
+	width: 60%;
+}
+.elgg-col-4of5 {
+	width: 80%;
+}
+.elgg-col-1of6 {
+	width: 16.66%;
+}
+.elgg-col-5of6 {
+	width: 83.33%;
+}
+
+/* ***************************************
+	ICONS
+*************************************** */
+.elgg-icon {
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/admin_sprites.png) no-repeat left;
+	width: 16px;
+	height: 16px;
+	display: inline-block;
+	margin: 0 2px;
+}
+.elgg-icon-delete:hover,
+.elgg-icon-delete-alt:hover {
+	background-position: 0 -0px;
+}
+.elgg-icon-delete,
+.elgg-icon-delete-alt {
+	background-position: 0 -18px;
+}
+.elgg-icon-drag-arrow:hover {
+	background-position: 0 -36px;
+}
+.elgg-icon-drag-arrow {
+	background-position: 0 -54px;
+}
+.elgg-icon-hover-menu:hover {
+	background-position: 0 -72px;
+}
+.elgg-icon-hover-menu {
+	background-position: 0 -90px;
+}
+.elgg-icon-settings-alt:hover {
+	background-position: 0 -108px;
+}
+.elgg-icon-settings-alt {
+	background-position: 0 -126px;
+}
+
+.elgg-ajax-loader {
+	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
+	min-height: 33px;
+	min-width: 33px;
+}
+
+/* ***************************************
+	AVATAR ICONS
+*************************************** */
+.elgg-avatar {
+	position: relative;
+	display: inline-block;
+}
+.elgg-avatar > a > img {
+	display: block;
+}
+.elgg-avatar-tiny > a > img {
+	width: 25px;
+	height: 25px;
+	
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 25px;
+	-khtml-background-size: 25px;
+	-moz-background-size: 25px;
+	-o-background-size: 25px;
+	background-size: 25px;
+}
+.elgg-avatar-small > a > img {
+	width: 40px;
+	height: 40px;
+	
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 40px;
+	-khtml-background-size: 40px;
+	-moz-background-size: 40px;
+	-o-background-size: 40px;
+	background-size: 40px;
+}
+.elgg-avatar-medium > a > img {
+	width: 100px;
+	height: 100px;
+}
+.elgg-avatar-large > a > img {
+	width: 200px;
+	height: 200px;
+}
+.elgg-avatar > .elgg-icon-hover-menu {
+	display: none;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	margin: 0;
+	cursor: pointer;
+}
+.elgg-avatar {
+	position: relative;
+}
+.elgg-avatar > a > img {
+	display: block;
+}
+.elgg-avatar-tiny > a > img {
+	width: 25px;
+	height: 25px;
+
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 25px;
+	-khtml-background-size: 25px;
+	-moz-background-size: 25px;
+	-o-background-size: 25px;
+	background-size: 25px;
+}
+.elgg-avatar-small > a > img {
+	width: 40px;
+	height: 40px;
+
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 40px;
+	-khtml-background-size: 40px;
+	-moz-background-size: 40px;
+	-o-background-size: 40px;
+	background-size: 40px;
+}
+.elgg-avatar-medium > a > img {
+	width: 100px;
+	height: 100px;
+}
+.elgg-avatar-large > a > img {
+	width: 200px;
+	height: 200px;
+}
+
+/* ***************************************
+	PLUGINS
+**************************************** */
+.elgg-plugin {
+	border: 1px solid #999;
+	margin: 0 0 5px;
+	padding: 0 7px 4px 10px;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.elgg-plugin.elgg-state-draggable > .elgg-image-block .elgg-head {
+	cursor: move;
+}
+.elgg-plugin p {
+	margin: 0;
+}
+.elgg-plugin h3 {
+	color: black;
+	padding-bottom: 10px;
+}
+.elgg-plugin-settings {
+	font-weight: normal;
+	font-size: 0.9em;
+}
+.elgg-plugin-screenshot {
+	display: inline;
+}
+.elgg-plugin-screenshot img {
+	border: 1px solid #999;
+}
+.elgg-plugin-screenshot-lightbox {
+	display: block;
+	position: absolute;
+	width: 99%;
+	text-align: center;
+	background-color: white;
+	border: 1px solid #999;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.elgg-plugin-screenshot-lightbox h2 {
+	color: black;
+}
+.elgg-plugin.elgg-state-active {
+	background: white;
+}
+.elgg-plugin.elgg-state-inactive {
+	background: #dedede;
+}
+.elgg-plugin .elgg-state-error {
+	background: #fbe3e4;
+	color: #8a1f11;
+	border-color: #fbc2c4;
+	font-weight: bold;
+}
+.elgg-plugin .elgg-state-warning {
+	background: #fbedb5;
+	color: #000000;
+	border-color: #fbe58b;
+	font-weight: bold;
+}
+.elgg-plugin-more {
+	background-color: #eee;
+
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+
+	padding: 5px 10px;
+	margin: 4px 0;
+}
+ul.elgg-plugin-categories, ul.elgg-plugin-categories > li {
+	display: inline;
+}
+.elgg-plugin-category-bundled {
+	border-width: 2px;
+	border-color: #DAA520;
+}
+
+/****************************************
+	MARKDOWN
+****************************************/
+.elgg-markdown {
+	margin: 15px;
+}
+.elgg-markdown h1,
+.elgg-markdown h2,
+.elgg-markdown h3,
+.elgg-markdown h4,
+.elgg-markdown h5,
+.elgg-markdown h6 {
+	margin: 1em 0 1em -15px;
+	color: #333;
+}
+.elgg-markdown ol {
+	list-style: decimal;
+	padding-left: 2em;
+}
+.elgg-markdown ul {
+	list-style: disc;
+	padding-left: 2em;
+}
+.elgg-markdown p {
+	margin: 15px 0;
+}
+
+/* ***************************************
+	MISC
+*************************************** */
+.elgg-content-thin {
+	max-width: 600px;
+}
+
+.elgg-subtext {
+	color: #666;
+	font-size: 85%;
+	line-height: 1.2em;
+	font-style: italic;
+	margin-bottom: 5px;
+}
+
+.elgg-longtext-control {
+	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
+}
+
+table.mceLayout {
+	width:100% !important;
+}
+
+.elgg-output dt {
+	font-weight: bold;
+}
+.elgg-output dd {
+	margin: 0 0 1em 2em;
+}
+
+/* ***************************************
+	HELPERS
+*************************************** */
+.hidden {
+	display: none;
+}
+.centered {
+	margin: 0 auto;
+}
+.center {
+	text-align: center;
+}
+.float {
+	float: left;
+}
+.float-alt {
+	float: right;
+}
+.elgg-toggle {
+	cursor: pointer;
+}
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+.elgg-transition:hover {
+	opacity: .7;
+}
+
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
+}
+
+/* ***************************************
+	SPACING (from OOCSS)
+*************************************** */
+.pan{padding:0}
+.pas{padding:5px}
+.pam{padding:10px}
+.pal{padding:20px}
+.ptn{padding-top:0}
+.pts{padding-top:5px}
+.ptm{padding-top:10px}
+.ptl{padding-top:20px}
+.prn{padding-right:0}
+.prs{padding-right:5px}
+.prm{padding-right:10px}
+.prl{padding-right:20px}
+.pbn{padding-bottom:0}
+.pbs{padding-bottom:5px}
+.pbm{padding-bottom:10px}
+.pbl{padding-bottom:20px}
+.pln{padding-left:0}
+.pls{padding-left:5px}
+.plm{padding-left:10px}
+.pll{padding-left:20px}
+.phn{padding-left:0;padding-right:0}
+.phs{padding-left:5px;padding-right:5px}
+.phm{padding-left:10px;padding-right:10px}
+.phl{padding-left:20px;padding-right:20px}
+.pvn{padding-top:0;padding-bottom:0}
+.pvs{padding-top:5px;padding-bottom:5px}
+.pvm{padding-top:10px;padding-bottom:10px}
+.pvl{padding-top:20px;padding-bottom:20px}
+.man{margin:0}
+.mas{margin:5px}
+.mam{margin:10px}
+.mal{margin:20px}
+.mtn{margin-top:0}
+.mts{margin-top:5px}
+.mtm{margin-top:10px}
+.mtl{margin-top:20px}
+.mrn{margin-right:0}
+.mrs{margin-right:5px}
+.mrm{margin-right:10px}
+.mrl{margin-right:20px}
+.mbn{margin-bottom:0}
+.mbs{margin-bottom:5px}
+.mbm{margin-bottom:10px}
+.mbl{margin-bottom:20px}
+.mln{margin-left:0}
+.mls{margin-left:5px}
+.mlm{margin-left:10px}
+.mll{margin-left:20px}
+.mhn{margin-left:0;margin-right:0}
+.mhs{margin-left:5px;margin-right:5px}
+.mhm{margin-left:10px;margin-right:10px}
+.mhl{margin-left:20px;margin-right:20px}
+.mvn{margin-top:0;margin-bottom:0}
+.mvs{margin-top:5px;margin-bottom:5px}
+.mvm{margin-top:10px;margin-bottom:10px}
+.mvl{margin-top:20px;margin-bottom:20px}
diff --git a/mod/basic_theme/views/default/css/elements/OOCSS_LICENSE b/mod/basic_theme/views/default/css/elements/OOCSS_LICENSE
new file mode 100644
index 000000000..c09c45873
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/OOCSS_LICENSE
@@ -0,0 +1,30 @@
+Software License Agreement (BSD License)
+
+Copyright (c) 2009, Nicole Sullivan.
+All rights reserved.
+
+Redistribution and use of this software in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above
+  copyright notice, this list of conditions and the
+  following disclaimer.
+
+* Redistributions in binary form must reproduce the above
+  copyright notice, this list of conditions and the
+  following disclaimer in the documentation and/or other
+  materials provided with the distribution.
+
+* Neither the name of Nicole Sullivan nor the names of its
+  contributors may be used to endorse or promote products
+  derived from this software without specific prior
+  written permission of Nicole Sullivan.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/elements/buttons.php b/mod/basic_theme/views/default/css/elements/buttons.php
new file mode 100644
index 000000000..e9c99cf96
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/buttons.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * CSS buttons
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* **************************
+	BUTTONS
+************************** */
+
+/* Base */
+.elgg-button {
+	font-size: 14px;
+	font-weight: bold;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+
+	width: auto;
+	padding: 2px 4px;
+	cursor: pointer;
+	outline: none;
+	
+	-webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+	-moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+	box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+}
+a.elgg-button {
+	padding: 3px 6px;
+}
+
+/* Submit: This button should convey, "you're about to take some definitive action" */
+.elgg-button-submit {
+	color: white;
+	text-shadow: 1px 1px 0px black;
+	text-decoration: none;
+	border: 1px solid #4690d6;
+	background: #4690d6 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+}
+
+.elgg-button-submit:hover {
+	border-color: #0054a7;
+	text-decoration: none;
+	color: white;
+	background: #0054a7 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+}
+
+.elgg-button-submit.elgg-state-disabled {
+	background: #999;
+	border-color: #999;
+	cursor: default;
+}
+
+/* Cancel: This button should convey a negative but easily reversible action (e.g., turning off a plugin) */
+.elgg-button-cancel {
+	color: #333;
+	background: #ddd url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+	border: 1px solid #999;
+}
+.elgg-button-cancel:hover {
+	color: #444;
+	background-color: #999;
+	background-position: left 10px;
+	text-decoration: none;
+}
+
+/* Action: This button should convey a normal, inconsequential action, such as clicking a link */
+.elgg-button-action {
+	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 0;
+	border:1px solid #999;
+	color: #333;
+	padding: 2px 15px;
+	text-align: center;
+	font-weight: bold;
+	text-decoration: none;
+	text-shadow: 0 1px 0 white;
+	cursor: pointer;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+
+.elgg-button-action:hover,
+.elgg-button-action:focus {
+	background: #ccc url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif) repeat-x 0 -15px;
+	color: #111;
+	text-decoration: none;
+	border: 1px solid #999;
+}
+
+/* Delete: This button should convey "be careful before you click me" */
+.elgg-button-delete {
+	color: #bbb;
+	text-decoration: none;
+	border: 1px solid #333;
+	background: #555 url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png) repeat-x left 10px;
+	text-shadow: 1px 1px 0px black;
+}
+.elgg-button-delete:hover {
+	color: #999;
+	background-color: #333;
+	background-position: left 10px;
+	text-decoration: none;
+}
+
+.elgg-button-dropdown {
+	padding:3px 6px;
+	text-decoration:none;
+	display:block;
+	font-weight:bold;
+	position:relative;
+	margin-left:0;
+	color: white;
+	border:1px solid #71B9F7;
+	
+	-webkit-border-radius:4px;
+	-moz-border-radius:4px;
+	border-radius:4px;
+	
+	-webkit-box-shadow: 0 0 0;
+	-moz-box-shadow: 0 0 0;
+	box-shadow: 0 0 0;
+	
+	/*background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
+	background-position:-150px -51px;
+	background-repeat:no-repeat;*/
+}
+
+.elgg-button-dropdown:after {
+	content: " \25BC ";
+	font-size:smaller;
+}
+
+.elgg-button-dropdown:hover {
+	background-color:#71B9F7;
+	text-decoration:none;
+}
+
+.elgg-button-dropdown.elgg-state-active {
+	background: #ccc;
+	outline: none;
+	color: #333;
+	border:1px solid #ccc;
+	
+	-webkit-border-radius:4px 4px 0 0;
+	-moz-border-radius:4px 4px 0 0;
+	border-radius:4px 4px 0 0;
+}
diff --git a/mod/basic_theme/views/default/css/elements/components.php b/mod/basic_theme/views/default/css/elements/components.php
new file mode 100644
index 000000000..7fe535d57
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/components.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Layout Object CSS
+ *
+ * Image blocks, lists, tables, gallery, messages
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	Image Block
+*************************************** */
+.elgg-image-block {
+	padding: 3px 0;
+}
+.elgg-image-block .elgg-image {
+	float: left;
+	margin-right: 5px;
+}
+.elgg-image-block .elgg-image-alt {
+	float: right;
+	margin-left: 5px;
+}
+
+/* ***************************************
+	List
+*************************************** */
+.elgg-list {
+	border-top: 1px dotted #CCCCCC;
+	margin: 5px 0;
+	clear: both;
+}
+.elgg-list > li {
+	border-bottom: 1px dotted #CCCCCC;
+}
+
+.elgg-item .elgg-subtext {
+	margin-bottom: 5px;
+}
+.elgg-item .elgg-content {
+	margin: 10px 5px;
+}
+
+/* ***************************************
+	Gallery
+*************************************** */
+.elgg-gallery {
+	border: none;
+	margin-right: auto;
+	margin-left: auto;
+}
+.elgg-gallery td {
+	padding: 5px;
+}
+.elgg-gallery-fluid > li {
+	float: left;
+}
+.elgg-gallery-users > li {
+	margin: 0 2px;
+}
+
+/* ***************************************
+	Tables
+*************************************** */
+.elgg-table {
+	width: 100%;
+	border-top: 1px solid #ccc;
+}
+.elgg-table td, .elgg-table th {
+	padding: 4px 8px;
+	border: 1px solid #ccc;
+}
+.elgg-table th {
+	background-color: #ddd;
+}
+.elgg-table tr:nth-child(odd), .elgg-table tr.odd {
+	background-color: #fff;
+}
+.elgg-table tr:nth-child(even), .elgg-table tr.even {
+	background-color: #f0f0f0;
+}
+.elgg-table-alt {
+	width: 100%;
+	border-top: 1px solid #ccc;
+}
+.elgg-table-alt th {
+	background-color: #eee;
+	font-weight: bold;
+}
+.elgg-table-alt td, .elgg-table-alt th {
+	padding: 2px 4px 2px 4px;
+	border-bottom: 1px solid #ccc;
+}
+.elgg-table-alt td:first-child {
+	width: 200px;
+}
+.elgg-table-alt tr:hover {
+	background: #E4E4E4;
+}
+
+/* ***************************************
+	Owner Block
+*************************************** */
+.elgg-owner-block {
+	margin-bottom: 20px;
+}
+
+/* ***************************************
+	Messages
+*************************************** */
+.elgg-message {
+	color: white;
+	font-weight: bold;
+	display: block;
+	padding: 3px 10px;
+	cursor: pointer;
+	opacity: 0.9;
+	
+	-webkit-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.elgg-state-success {
+	background-color: black;
+}
+.elgg-state-error {
+	background-color: red;
+}
+.elgg-state-notice {
+	background-color: #4690D6;
+}
+
+/* ***************************************
+	River
+*************************************** */
+.elgg-list-river {
+	border-top: 1px solid #CCC;
+}
+.elgg-list-river > li {
+	border-bottom: 1px solid #CCC;
+}
+.elgg-river-item {
+	padding: 7px 0;
+}
+.elgg-river-item .elgg-pict {
+	margin-right: 20px;
+}
+.elgg-river-timestamp {
+	color: #666;
+	font-size: 85%;
+	font-style: italic;
+	line-height: 1.2em;
+}
+
+.elgg-river-attachments,
+.elgg-river-message,
+.elgg-river-content {
+	border-left: 1px solid #CCC;
+	font-size: 85%;
+	line-height: 1.5em;
+	margin: 8px 0 5px 0;
+	padding-left: 5px;
+}
+.elgg-river-attachments .elgg-avatar,
+.elgg-river-attachments .elgg-icon {
+	float: left;
+}
+.elgg-river-layout .elgg-input-dropdown {
+	float: right;
+	margin: 10px 0;
+}
+
+.elgg-river-comments-tab {
+	display: block;
+	background-color: #EEE;
+	color: #4690D6;
+	margin-top: 5px;
+	width: auto;
+	float: right;
+	font-size: 85%;
+	padding: 1px 7px;
+	
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+
+<?php //@todo components.php ?>
+.elgg-river-comments {
+	margin: 0;
+	border-top: none;
+}
+.elgg-river-comments li:first-child {
+	-webkit-border-radius: 5px 0 0;
+	-moz-border-radius: 5px 0 0;
+	border-radius: 5px 0 0;
+}
+.elgg-river-comments li:last-child {
+	-webkit-border-radius: 0 0 5px 5px;
+	-moz-border-radius-bottomleft: 0 0 5px 5px;
+	border-radius-bottomleft: 0 0 5px 5px;
+}
+.elgg-river-comments li {
+	background-color: #EEE;
+	border-bottom: none;
+	padding: 4px;
+	margin-bottom: 2px;
+}
+.elgg-river-comments .elgg-media {
+	padding: 0;
+}
+.elgg-river-more {
+	background-color: #EEE;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	
+	padding: 2px 4px;
+	font-size: 85%;
+	margin-bottom: 2px;
+}
+
+<?php //@todo location-dependent styles ?>
+.elgg-river-item form {
+	background-color: #EEE;
+	padding: 4px;
+	
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	border-radius: 5px;
+	
+	height: 30px;
+}
+.elgg-river-item input[type=text] {
+	width: 80%;
+}
+.elgg-river-item input[type=submit] {
+	margin: 0 0 0 10px;
+}
+
+
+/* **************************************
+	Comments (from elgg_view_comments)
+************************************** */
+.elgg-comments {
+	margin-top: 25px;
+}
+.elgg-comments > form {
+	margin-top: 15px;
+}
+
+/* ***************************************
+	Image-related
+*************************************** */
+.elgg-photo {
+	border: 1px solid #ccc;
+	padding: 3px;
+	background-color: white;
+}
+
+/* ***************************************
+	Tags
+*************************************** */
+.elgg-tags {
+	font-size: 85%;
+}
+.elgg-tags > li {
+	float:left;
+	margin-right: 5px;
+}
+.elgg-tags li.elgg-tag:after {
+	content: ",";
+}
+.elgg-tags li.elgg-tag:last-child:after {
+	content: "";
+}
+.elgg-tagcloud {
+	text-align: justify;
+}
diff --git a/mod/basic_theme/views/default/css/elements/core.php b/mod/basic_theme/views/default/css/elements/core.php
new file mode 100644
index 000000000..74f21ee59
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/core.php
@@ -0,0 +1,117 @@
+<?php
+/**
+ * Core CSS
+ * 
+ * This file holds all the complicated/hacky stuff that you really
+ * shouldn't touch or override unless you're sure you know what you're doing.
+ * 
+ * Provides classes that implement cross-browser support for the following features:
+ *   * clearfix
+ *   * fluid-width content area that doesn't wrap around floats
+ *   * menu's with separators
+ *   * inline-block
+ *   * horizontal menus
+ *   * fluid gallery without using tables
+ */
+?>
+
+/* Clearfix */
+.clearfix:after,
+.elgg-grid:after,
+.elgg-layout:after,
+.elgg-inner:after,
+.elgg-page-header:after,
+.elgg-page-footer:after,
+.elgg-head:after,
+.elgg-foot:after,
+.elgg-col:after,
+.elgg-image-block:after {
+	content: ".";
+	display: block;
+	height: 0;
+	clear: both;
+	visibility: hidden;	
+}
+
+/* Fluid width container that does not wrap floats */
+.elgg-body,
+.elgg-col-last {
+	display: block;
+	width: auto;
+	word-wrap: break-word;
+	overflow: hidden;
+	
+	/* IE 6, 7 */
+	zoom:1;
+	*overflow:visible;
+}
+
+<?php
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+
+//@todo isn't this only needed if we use display:table-cell?
+?>
+.elgg-body:after,
+.elgg-col-last:after {
+	display: block;
+	visibility: hidden;
+	height: 0 !important;
+	line-height: 0;
+	overflow: hidden;
+	
+	/* Stretch to fill up available space */
+	font-size: xx-large;
+	content: " x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x x ";
+}
+
+/* ***************************************
+ * MENUS
+ *
+ * To add separators to a menu:
+ * .elgg-menu-$menu > li:after {content: '|'; background: ...;}
+ *************************************** */
+/* Enabled nesting of dropdown/flyout menus */
+.elgg-menu > li { position: relative; }
+
+.elgg-menu > li:last-child::after {
+	display: none;
+}
+
+/* Maximize click target */
+.elgg-menu > li > a { display: block }
+
+/* Horizontal menus w/ separator support */
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span {
+	vertical-align: middle;
+}
+
+/* Allow inline image blocks in horizontal menus */
+.elgg-menu-hz .elgg-body:after { content: '.'; }
+
+<?php //@todo This isn't going to work as-is.  Needs testing ?>
+/* Inline block */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span {
+	/* Google says do this, but why? */
+	position: relative;
+
+	display: inline-block;
+}
diff --git a/mod/basic_theme/views/default/css/elements/forms.php b/mod/basic_theme/views/default/css/elements/forms.php
new file mode 100644
index 000000000..81db81747
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/forms.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * CSS form/input elements
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	Form Elements
+*************************************** */
+fieldset > div {
+	margin-bottom: 15px;
+}
+fieldset > div:last-child {
+	margin-bottom: 0;
+}
+.elgg-form-alt > fieldset > .elgg-foot {
+	border-top: 1px solid #CCC;
+	padding: 10px 0;
+}
+
+label {
+	font-weight: bold;
+	color: #333;
+	font-size: 110%;
+}
+
+input, textarea {
+	border: 1px solid #ccc;
+	color: #666;
+	font: 120% Arial, Helvetica, sans-serif;
+	padding: 5px;
+	width: 100%;	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+input[type=text]:focus, textarea:focus {
+	border: solid 1px #4690d6;
+	background: #e4ecf5;
+	color:#333;
+}
+
+textarea {
+	height: 200px;
+}
+
+
+.elgg-longtext-control {
+	float: right;
+	margin-left: 14px;
+	font-size: 80%;
+	cursor: pointer;
+}
+
+
+.elgg-input-access {
+	margin:5px 0 0 0;
+}
+
+input[type="checkbox"],
+input[type="radio"] {
+	margin:0 3px 0 0;
+	padding:0;
+	border:none;
+	width:auto;
+}
+.elgg-input-checkboxes.elgg-horizontal li,
+.elgg-input-radios.elgg-horizontal li {
+	display: inline;
+	padding-right: 10px;
+}
+
+.elgg-form-login, .elgg-form-account {
+	max-width: 450px;
+}
+
+/* ***************************************
+	FRIENDS PICKER
+*************************************** */
+.friends-picker-main-wrapper {
+	margin-bottom: 15px;
+}
+.friends-picker-container h3 {
+	font-size:4em !important;
+	text-align: left;
+	margin:10px 0 20px !important;
+	color:#999 !important;
+	background: none !important;
+	padding:0 !important;
+}
+.friends-picker .friends-picker-container .panel ul {
+	text-align: left;
+	margin: 0;
+	padding:0;
+}
+.friends-picker-wrapper {
+	margin: 0;
+	padding:0;
+	position: relative;
+	width: 100%;
+}
+.friends-picker {
+	position: relative;
+	overflow: hidden;
+	margin: 0;
+	padding:0;
+	width: 730px;
+	height: auto;
+	background-color: #dedede;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+}
+.friendspicker-savebuttons {
+	background: white;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	margin:0 10px 10px;
+}
+.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS  */
+	position: relative;
+	left: 0;
+	top: 0;
+	width: 100%;
+	list-style-type: none;
+}
+.friends-picker .friends-picker-container .panel {
+	float:left;
+	height: 100%;
+	position: relative;
+	width: 730px;
+	margin: 0;
+	padding:0;
+}
+.friends-picker .friends-picker-container .panel .wrapper {
+	margin: 0;
+	padding:4px 10px 10px 10px;
+	min-height: 230px;
+}
+.friends-picker-navigation {
+	margin: 0 0 10px;
+	padding:0 0 10px;
+	border-bottom:1px solid #ccc;
+}
+.friends-picker-navigation ul {
+	list-style: none;
+	padding-left: 0;
+}
+.friends-picker-navigation ul li {
+	float: left;
+	margin:0;
+	background:white;
+}
+.friends-picker-navigation a {
+	font-weight: bold;
+	text-align: center;
+	background: white;
+	color: #999;
+	text-decoration: none;
+	display: block;
+	padding: 0;
+	width:20px;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+.tabHasContent {
+	background: white;
+	color:#333 !important;
+}
+.friends-picker-navigation li a:hover {
+	background: #333;
+	color:white !important;
+}
+.friends-picker-navigation li a.current {
+	background: #4690D6;
+	color:white !important;
+}
+.friends-picker-navigation-l, .friends-picker-navigation-r {
+	position: absolute;
+	top: 46px;
+	text-indent: -9000em;
+}
+.friends-picker-navigation-l a, .friends-picker-navigation-r a {
+	display: block;
+	height: 40px;
+	width: 40px;
+}
+.friends-picker-navigation-l {
+	right: 48px;
+	z-index:1;
+}
+.friends-picker-navigation-r {
+	right: 0;
+	z-index:1;
+}
+.friends-picker-navigation-l {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top;
+}
+.friends-picker-navigation-r {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top;
+}
+.friends-picker-navigation-l:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px;
+}
+.friends-picker-navigation-r:hover {
+	background: url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px;
+}
+.friendspicker-savebuttons .elgg-button-submit,
+.friendspicker-savebuttons .elgg-button-cancel {
+	margin:5px 20px 5px 5px;
+}
+.friendspicker-members-table {
+	background: #dedede;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	margin:10px 0 0;
+	padding:10px 10px 0;
+}
+
+/* ***************************************
+	AUTOCOMPLETE
+*************************************** */
+<?php //autocomplete will expand to fullscreen without max-width ?>
+.ui-autocomplete {
+	position: absolute;
+	cursor: default;
+}
+.elgg-autocomplete-item .elgg-body {
+	max-width: 600px;
+}
+.ui-autocomplete {
+	background-color: white;
+	border: 1px solid #ccc;
+	overflow: hidden;
+
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item {
+	padding: 0px 4px;
+	
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+}
+.ui-autocomplete .ui-menu-item:hover {
+	background-color: #eee;
+}
+.ui-autocomplete a:hover {
+	text-decoration: none;
+	color: #4690D6;
+}
+
+/* ***************************************
+	USER PICKER
+*************************************** */
+.elgg-user-picker-list li:first-child {
+	border-top: 1px dotted #ccc;
+	margin-top: 5px;
+}
+.elgg-user-picker-list > li {
+	border-bottom: 1px dotted #ccc;
+}
+
+/* ***************************************
+      DATE PICKER
+**************************************** */
+.ui-datepicker {
+	display: none;
+
+	margin-top: 3px;
+	width: 208px;
+	background-color: white;
+	border: 1px solid #0054A7;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	overflow: hidden;
+
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.ui-datepicker-inline {
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+
+.ui-datepicker-header {
+	position: relative;
+	background: #4690D6;
+	color: white;
+	padding: 2px 0;
+	border-bottom: 1px solid #0054A7;
+}
+.ui-datepicker-header a {
+	color: white;
+}
+.ui-datepicker-prev, .ui-datepicker-next {
+    position: absolute;
+    top: 5px;
+	cursor: pointer;
+}
+.ui-datepicker-prev {
+    left: 6px;
+}
+.ui-datepicker-next {
+    right: 6px;
+}
+.ui-datepicker-title {
+    line-height: 1.8em;
+    margin: 0 30px;
+    text-align: center;
+	font-weight: bold;
+}
+.ui-datepicker-calendar {
+	margin: 4px;
+}
+.ui-datepicker th {
+	color: #0054A7;
+	border: none;
+    font-weight: bold;
+    padding: 5px 6px;
+    text-align: center;
+}
+.ui-datepicker td {
+	padding: 1px;
+}
+.ui-datepicker td span, .ui-datepicker td a {
+    display: block;
+    padding: 2px;
+	line-height: 1.2em;
+    text-align: right;
+    text-decoration: none;
+}
+.ui-datepicker-calendar .ui-state-default {
+	border: 1px solid #ccc;
+    color: #4690D6;;
+	background: #fafafa;
+}
+.ui-datepicker-calendar .ui-state-hover {
+	border: 1px solid #aaa;
+    color: #0054A7;
+	background: #eee;
+}
+.ui-datepicker-calendar .ui-state-active,
+.ui-datepicker-calendar .ui-state-active.ui-state-hover {
+	font-weight: bold;
+    border: 1px solid #0054A7;
+    color: #0054A7;
+	background: #E4ECF5;
+}
diff --git a/mod/basic_theme/views/default/css/elements/grid.php b/mod/basic_theme/views/default/css/elements/grid.php
new file mode 100644
index 000000000..fdbaf4aca
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/grid.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * CSS grid
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ * 
+ * To work around subpixel rounding discrepancies, apply .elgg-col-last to
+ * the last column (@todo we need broswer-specific test cases for this).
+ */
+?>
+
+/* ***************************************
+	GRID
+*************************************** */
+.elgg-col {
+	float: left;
+}
+.elgg-col-1of1 {
+	float: none;
+}
+.elgg-col-1of2 {
+	width: 50%;
+}
+.elgg-col-1of3 {
+	width: 33.33%;
+}
+.elgg-col-2of3 {
+	width: 66.66%;
+}
+.elgg-col-1of4 {
+	width: 25%;
+}
+.elgg-col-3of4 {
+	width: 75%;
+}
+.elgg-col-1of5 {
+	width: 20%;
+}
+.elgg-col-2of5 {
+	width: 40%;
+}
+.elgg-col-3of5 {
+	width: 60%;
+}
+.elgg-col-4of5 {
+	width: 80%;
+}
+.elgg-col-1of6 {
+	width: 16.66%;
+}
+.elgg-col-5of6 {
+	width: 83.33%;
+}
diff --git a/mod/basic_theme/views/default/css/elements/helpers.php b/mod/basic_theme/views/default/css/elements/helpers.php
new file mode 100644
index 000000000..e9a9e0a30
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/helpers.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Helpers CSS
+ *
+ * Contains generic elements that can be used throughout the site.
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+.clearfloat { 
+	clear: both;
+}
+
+.hidden {
+	display: none;
+}
+
+.centered {
+	margin: 0 auto;
+}
+
+.center {
+	text-align: center;
+}
+
+.float {
+	float: left;
+}
+
+.float-alt {
+	float: right;
+}
+
+.link {
+	cursor: pointer;
+}
+
+.elgg-discover .elgg-discoverable {
+	display: none;
+}
+
+.elgg-discover:hover .elgg-discoverable {
+	display: block;
+}
+
+.elgg-transition:hover {
+	opacity: .7;
+}
+
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {
+	border: 1px solid #eeeeee;
+}
+.elgg-border-transition {
+	border: 1px solid #eeeeee;
+}
+.elgg-divide-top {
+	border-top: 1px solid #CCCCCC;
+}
+.elgg-divide-bottom {
+	border-bottom: 1px solid #CCCCCC;
+}
+.elgg-divide-left {
+	border-left: 1px solid #CCCCCC;
+}
+.elgg-divide-right {
+	border-right: 1px solid #CCCCCC;
+}
+
+/* ***************************************
+	Spacing (from OOCSS)
+*************************************** */
+<?php
+/**
+ * Spacing classes
+ * Should be used to modify the default spacing between objects (not between nodes of the same object)
+ * Please use judiciously. You want to be using defaults most of the time, these are exceptions!
+ * <type><location><size>
+ * <type>: m = margin, p = padding
+ * <location>: a = all, t = top, r = right, b = bottom, l = left, h = horizontal, v = vertical
+ * <size>: n = none, s = small, m = medium, l = large
+ */
+
+$none = '0';
+$small = '5px';
+$medium = '10px';
+$large = '20px';
+
+echo <<<CSS
+/* Padding */
+.pan{padding:$none}
+.prn, .phn{padding-right:$none}
+.pln, .phn{padding-left:$none}
+.ptn, .pvn{padding-top:$none}
+.pbn, .pvn{padding-bottom:$none}
+
+.pas{padding:$small}
+.prs, .phs{padding-right:$small}
+.pls, .phs{padding-left:$small}
+.pts, .pvs{padding-top:$small}
+.pbs, .pvs{padding-bottom:$small}
+
+.pam{padding:$medium}
+.prm, .phm{padding-right:$medium}
+.plm, .phm{padding-left:$medium}
+.ptm, .pvm{padding-top:$medium}
+.pbm, .pvm{padding-bottom:$medium}
+
+.pal{padding:$large}
+.prl, .phl{padding-right:$large}
+.pll, .phl{padding-left:$large}
+.ptl, .pvl{padding-top:$large}
+.pbl, .pvl{padding-bottom:$large}
+
+/* Margin */
+.man{margin:$none}
+.mrn, .mhn{margin-right:$none}
+.mln, .mhn{margin-left:$none}
+.mtn, .mvn{margin-top:$none}
+.mbn, .mvn{margin-bottom:$none}
+
+.mas{margin:$small}
+.mrs, .mhs{margin-right:$small}
+.mls, .mhs{margin-left:$small}
+.mts, .mvs{margin-top:$small}
+.mbs, .mvs{margin-bottom:$small}
+
+.mam{margin:$medium}
+.mrm, .mhm{margin-right:$medium}
+.mlm, .mhm{margin-left:$medium}
+.mtm, .mvm{margin-top:$medium}
+.mbm, .mvm{margin-bottom:$medium}
+
+.mal{margin:$large}
+.mrl, .mhl{margin-right:$large}
+.mll, .mhl{margin-left:$large}
+.mtl, .mvl{margin-top:$large}
+.mbl, .mvl{margin-bottom:$large}
+CSS;
+?>
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/elements/icons.php b/mod/basic_theme/views/default/css/elements/icons.php
new file mode 100644
index 000000000..f7c789e33
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/icons.php
@@ -0,0 +1,348 @@
+<?php
+/**
+ * Elgg icons
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+?>
+
+/* ***************************************
+	ICONS
+*************************************** */
+
+.elgg-icon {
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left;
+	width: 16px;
+	height: 16px;
+	margin: 0 2px;
+}
+.elgg-icon-arrow-left {
+	background-position: 0 -0px;
+}
+.elgg-icon-arrow-right {
+	background-position: 0 -18px;
+}
+.elgg-icon-arrow-two-head {
+	background-position: 0 -36px;
+}
+.elgg-icon-attention:hover {
+	background-position: 0 -54px;
+}
+.elgg-icon-attention {
+	background-position: 0 -72px;
+}
+.elgg-icon-calendar {
+	background-position: 0 -90px;
+}
+.elgg-icon-cell-phone {
+	background-position: 0 -108px;
+}
+.elgg-icon-checkmark:hover {
+	background-position: 0 -126px;
+}
+.elgg-icon-checkmark {
+	background-position: 0 -144px;
+}
+.elgg-icon-clip:hover {
+	background-position: 0 -162px;
+}
+.elgg-icon-clip {
+	background-position: 0 -180px;
+}
+.elgg-icon-cursor-drag-arrow {
+	background-position: 0 -198px;
+}
+.elgg-icon-delete-alt:hover {
+	background-position: 0 -216px;
+}
+.elgg-icon-delete-alt {
+	background-position: 0 -234px;
+}
+.elgg-icon-delete:hover {
+	background-position: 0 -252px;
+}
+.elgg-icon-delete {
+	background-position: 0 -270px;
+}
+.elgg-icon-download:hover {
+	background-position: 0 -288px;
+}
+.elgg-icon-download {
+	background-position: 0 -306px;
+}
+.elgg-icon-eye {
+	background-position: 0 -324px;
+}
+.elgg-icon-facebook {
+	background-position: 0 -342px;
+}
+.elgg-icon-grid:hover {
+	background-position: 0 -360px;
+}
+.elgg-icon-grid {
+	background-position: 0 -378px;
+}
+.elgg-icon-home:hover {
+	background-position: 0 -396px;
+}
+.elgg-icon-home {
+	background-position: 0 -414px;
+}
+.elgg-icon-hover-menu:hover {
+	background-position: 0 -432px;
+}
+.elgg-icon-hover-menu {
+	background-position: 0 -450px;
+}
+.elgg-icon-info:hover {
+	background-position: 0 -468px;
+}
+.elgg-icon-info {
+	background-position: 0 -486px;
+}
+.elgg-icon-link:hover {
+	background-position: 0 -504px;
+}
+.elgg-icon-link {
+	background-position: 0 -522px;
+}
+.elgg-icon-list {
+	background-position: 0 -540px;
+}
+.elgg-icon-lock-closed {
+	background-position: 0 -558px;
+}
+.elgg-icon-lock-open {
+	background-position: 0 -576px;
+}
+.elgg-icon-mail-alt:hover {
+	background-position: 0 -594px;
+}
+.elgg-icon-mail-alt {
+	background-position: 0 -612px;
+}
+.elgg-icon-mail:hover {
+	background-position: 0 -630px;
+}
+.elgg-icon-mail {
+	background-position: 0 -648px;
+}
+.elgg-icon-photo {
+	background-position: 0 -666px;
+}
+.elgg-icon-print-alt {
+	background-position: 0 -684px;
+}
+.elgg-icon-print {
+	background-position: 0 -702px;
+}
+.elgg-icon-push-pin-alt {
+	background-position: 0 -720px;
+}
+.elgg-icon-push-pin {
+	background-position: 0 -738px;
+}
+.elgg-icon-redo {
+	background-position: 0 -756px;
+}
+.elgg-icon-refresh:hover {
+	background-position: 0 -774px;
+}
+.elgg-icon-refresh {
+	background-position: 0 -792px;
+}
+.elgg-icon-round-arrow-left {
+	background-position: 0 -810px;
+}
+.elgg-icon-round-arrow-right {
+	background-position: 0 -828px;
+}
+.elgg-icon-round-checkmark {
+	background-position: 0 -846px;
+}
+.elgg-icon-round-minus {
+	background-position: 0 -864px;
+}
+.elgg-icon-round-plus {
+	background-position: 0 -882px;
+}
+.elgg-icon-rss {
+	background-position: 0 -900px;
+}
+.elgg-icon-search-focus {
+	background-position: 0 -918px;
+}
+.elgg-icon-search {
+	background-position: 0 -936px;
+}
+.elgg-icon-settings-alt:hover {
+	background-position: 0 -954px;
+}
+.elgg-icon-settings-alt {
+	background-position: 0 -972px;
+}
+.elgg-icon-settings {
+	background-position: 0 -990px;
+}
+.elgg-icon-share:hover {
+	background-position: 0 -1008px;
+}
+.elgg-icon-share {
+	background-position: 0 -1026px;
+}
+.elgg-icon-shop-cart:hover {
+	background-position: 0 -1044px;
+}
+.elgg-icon-shop-cart {
+	background-position: 0 -1062px;
+}
+.elgg-icon-speech-bubble-alt:hover {
+	background-position: 0 -1080px;
+}
+.elgg-icon-speech-bubble-alt {
+	background-position: 0 -1098px;
+}
+.elgg-icon-speech-bubble:hover {
+	background-position: 0 -1116px;
+}
+.elgg-icon-speech-bubble {
+	background-position: 0 -1134px;
+}
+.elgg-icon-star-alt {
+	background-position: 0 -1152px;
+}
+.elgg-icon-star-empty:hover {
+	background-position: 0 -1170px;
+}
+.elgg-icon-star-empty {
+	background-position: 0 -1188px;
+}
+.elgg-icon-star:hover {
+	background-position: 0 -1206px;
+}
+.elgg-icon-star {
+	background-position: 0 -1224px;
+}
+.elgg-icon-tag:hover {
+	background-position: 0 -1242px;
+}
+.elgg-icon-tag {
+	background-position: 0 -1260px;
+}
+.elgg-icon-thumbs-down-alt:hover {
+	background-position: 0 -1278px;
+}
+.elgg-icon-thumbs-down:hover,
+.elgg-icon-thumbs-down-alt {
+	background-position: 0 -1296px;
+}
+.elgg-icon-thumbs-down {
+	background-position: 0 -1314px;
+}
+.elgg-icon-thumbs-up-alt:hover {
+	background-position: 0 -1332px;
+}
+.elgg-icon-thumbs-up:hover,
+.elgg-icon-thumbs-up-alt {
+	background-position: 0 -1350px;
+}
+.elgg-icon-thumbs-up {
+	background-position: 0 -1368px;
+}
+.elgg-icon-trash {
+	background-position: 0 -1386px;
+}
+.elgg-icon-twitter {
+	background-position: 0 -1404px;
+}
+.elgg-icon-undo {
+	background-position: 0 -1422px;
+}
+.elgg-icon-user:hover {
+	background-position: 0 -1440px;
+}
+.elgg-icon-user {
+	background-position: 0 -1458px;
+}
+.elgg-icon-users:hover {
+	background-position: 0 -1476px;
+}
+.elgg-icon-users {
+	background-position: 0 -1494px;
+}
+.elgg-icon-video {
+	background-position: 0 -1512px;
+}
+
+
+.elgg-avatar > .elgg-icon-hover-menu {
+	display: none;
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	margin: 0;
+	cursor: pointer;
+}
+
+.elgg-ajax-loader {
+	background: white url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif) no-repeat center center;
+	min-height: 33px;
+	min-width: 33px;
+}
+
+/* ***************************************
+	AVATAR ICONS
+*************************************** */
+.elgg-avatar {
+	position: relative;
+	display: inline-block;
+}
+.elgg-avatar > a > img {
+	display: block;
+}
+.elgg-avatar-tiny > a > img {
+	width: 25px;
+	height: 25px;
+	
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 25px;
+	-khtml-background-size: 25px;
+	-moz-background-size: 25px;
+	-o-background-size: 25px;
+	background-size: 25px;
+}
+.elgg-avatar-small > a > img {
+	width: 40px;
+	height: 40px;
+	
+	/* remove the border-radius if you don't want rounded avatars in supported browsers */
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
+	
+	-moz-background-clip:  border;
+	background-clip:  border;
+
+	-webkit-background-size: 40px;
+	-khtml-background-size: 40px;
+	-moz-background-size: 40px;
+	-o-background-size: 40px;
+	background-size: 40px;
+}
+.elgg-avatar-medium > a > img {
+	width: 100px;
+	height: 100px;
+}
+.elgg-avatar-large > a > img {
+	width: 200px;
+	height: 200px;
+}
diff --git a/mod/basic_theme/views/default/css/elements/layout.php b/mod/basic_theme/views/default/css/elements/layout.php
new file mode 100644
index 000000000..25a2bffb7
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/layout.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Page Layout
+ *
+ * Contains CSS for the page shell and page layout
+ *
+ * Default layout: 990px wide, centered. Used in default page shell
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	PAGE LAYOUT
+*************************************** */
+/***** DEFAULT LAYOUT ******/
+<?php // the width is on the page rather than topbar to handle small viewports ?>
+.elgg-page-default {
+	min-width: 998px;
+}
+.elgg-page-default .elgg-page-header > .elgg-inner {
+	width: 990px;
+	margin: 0 auto;
+	height: 90px;
+}
+.elgg-page-default .elgg-page-body > .elgg-inner {
+	width: 990px;
+	margin: 0 auto;
+}
+.elgg-page-default .elgg-page-footer > .elgg-inner {
+	width: 990px;
+	margin: 0 auto;
+	padding: 5px 0;
+	border-top: 1px solid #DEDEDE;
+}
+
+/***** TOPBAR ******/
+.elgg-page-topbar {
+	background: #333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
+	border-bottom: 1px solid #000000;
+	position: relative;
+	height: 24px;
+	z-index: 9000;
+}
+.elgg-page-topbar > .elgg-inner {
+	padding: 0 10px;
+}
+
+/***** PAGE MESSAGES ******/
+.elgg-system-messages {
+	position: fixed;
+	top: 24px;
+	right: 20px;
+	max-width: 500px;
+	z-index: 2000;
+}
+.elgg-system-messages li {
+	margin-top: 10px;
+}
+.elgg-system-messages li p {
+	margin: 0;
+}
+
+/***** PAGE HEADER ******/
+.elgg-page-header {
+	position: relative;
+	background: #4690D6 url(<?php echo elgg_get_site_url(); ?>_graphics/header_shadow.png) repeat-x bottom left;
+}
+.elgg-page-header > .elgg-inner {
+	position: relative;
+}
+
+/***** PAGE BODY LAYOUT ******/
+.elgg-layout {
+	min-height: 360px;
+}
+.elgg-layout-one-sidebar {
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif) repeat-y right top;
+}
+.elgg-layout-two-sidebar {
+	background: transparent url(<?php echo elgg_get_site_url(); ?>_graphics/two_sidebar_background.gif) repeat-y right top;
+}
+.elgg-layout-error {
+	margin-top: 20px;
+}
+.elgg-sidebar {
+	position: relative;
+	padding: 20px 10px;
+	float: right;
+	width: 210px;
+	margin: 0 0 0 10px;
+}
+.elgg-sidebar-alt {
+	position: relative;
+	padding: 20px 10px;
+	float: left;
+	width: 160px;
+	margin: 0 10px 0 0;
+}
+.elgg-main {
+	position: relative;
+	min-height: 360px;
+	padding: 10px;
+}
+.elgg-main > .elgg-head {
+	padding-bottom: 3px;
+	border-bottom: 1px solid #CCCCCC;
+	margin-bottom: 10px;
+}
+
+/***** PAGE FOOTER ******/
+.elgg-page-footer {
+	position: relative;
+}
+.elgg-page-footer {
+	color: #999;
+}
+.elgg-page-footer a:hover {
+	color: #666;
+}
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/elements/misc.php b/mod/basic_theme/views/default/css/elements/misc.php
new file mode 100644
index 000000000..d9622d34a
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/misc.php
@@ -0,0 +1,62 @@
+/* ***************************************
+	MISC
+*************************************** */
+#login-dropdown {
+	position: absolute;
+	top:10px;
+	right:0;
+	z-index: 100;
+}
+
+/* ***************************************
+	AVATAR UPLOADING & CROPPING
+*************************************** */
+
+#current-user-avatar {
+	border-right:1px solid #ccc;
+}
+#avatar-croppingtool {
+	border-top: 1px solid #ccc;
+}
+#user-avatar-cropper {
+	float: left;
+}
+#user-avatar-preview {
+	float: left;
+	position: relative;
+	overflow: hidden;
+	width: 100px;
+	height: 100px;
+}
+
+/* ***************************************
+	FRIENDS COLLECTIONS
+*************************************** */
+
+#friends_collections_accordian li {
+	color: #666;
+}
+#friends_collections_accordian li h2 {
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	background: none repeat scroll 0 0 #4690D6;
+	color: white;
+	cursor: pointer;
+	font-size: 1.2em;
+	margin: 10px 0;
+	padding: 4px 2px 4px 6px;
+}
+#friends_collections_accordian li h2:hover {
+	background-color: #333;
+}
+#friends_collections_accordian .friends_collections_controls {
+	float: right;
+	font-size: 70%;
+}
+#friends_collections_accordian .friends-picker-main-wrapper {
+	background: none repeat scroll 0 0 white;
+	display: none;
+	padding: 0;
+}
diff --git a/mod/basic_theme/views/default/css/elements/modules.php b/mod/basic_theme/views/default/css/elements/modules.php
new file mode 100644
index 000000000..74092c774
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/modules.php
@@ -0,0 +1,194 @@
+/* ***************************************
+	Modules
+*************************************** */
+.elgg-module {
+	overflow: hidden;
+	margin-bottom: 20px;
+}
+
+/* Aside */
+.elgg-module-aside .elgg-head {
+	border-bottom: 1px solid #CCC;
+	
+	margin-bottom: 5px;
+	padding-bottom: 5px;
+}
+
+/* Info */
+.elgg-module-info > .elgg-head {
+	background: #e4e4e4;
+	padding: 5px;
+	margin-bottom: 10px;
+	
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+}
+.elgg-module-info > .elgg-head * {
+	color: #333;
+}
+
+/* Popup */
+.elgg-module-popup {
+	background-color: white;
+	border: 1px solid #ccc;
+	
+	z-index: 9999;
+	margin-bottom: 0;
+	padding: 5px;
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+	
+	-webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	-moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+	box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
+}
+.elgg-module-popup > .elgg-head {
+	margin-bottom: 5px;
+}
+.elgg-module-popup > .elgg-head * {
+	color: #0054A7;
+}
+
+/* Dropdown */
+.elgg-module-dropdown {
+	background-color:white;
+	border:5px solid #CCC;
+	
+	-webkit-border-radius: 5px 0 5px 5px;
+	-moz-border-radius: 5px 0 5px 5px;
+	border-radius: 5px 0 5px 5px;
+	
+	display:none;
+	
+	width: 210px;
+	padding: 12px;
+	margin-right: 0px;
+	z-index:100;
+	
+	-webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+	-moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+	box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
+	
+	position:absolute;
+	right: 0px;
+	top: 100%;
+}
+
+/* Featured */
+.elgg-module-featured {
+	border: 1px solid #4690D6;
+	
+	-webkit-border-radius: 6px;
+	-moz-border-radius: 6px;
+	border-radius: 6px;
+}
+.elgg-module-featured > .elgg-head {
+	padding: 5px;
+	background-color: #4690D6;
+}
+.elgg-module-featured > .elgg-head * {
+	color: white;
+}
+.elgg-module-featured > .elgg-body {
+	padding: 10px;
+}
+
+/* ***************************************
+	Widgets
+*************************************** */
+.elgg-widgets {
+	float: right;
+	min-height: 30px;
+}
+.elgg-widget-add-control {
+	text-align: right;
+	margin: 5px 5px 15px;
+}
+.elgg-widgets-add-panel {
+	padding: 10px;
+	margin: 0 5px 15px;
+	background: #dedede;
+	border: 2px solid #ccc;
+}
+<?php //@todo location-dependent style: make an extension of elgg-gallery ?>
+.elgg-widgets-add-panel li {
+	float: left;
+	margin: 2px 10px;
+	width: 200px;
+	padding: 4px;
+	background-color: #ccc;
+	border: 2px solid #b0b0b0;
+	font-weight: bold;
+}
+.elgg-widgets-add-panel li a {
+	display: block;
+}
+.elgg-widgets-add-panel .elgg-state-available {
+	color: #333;
+	cursor: pointer;
+}
+.elgg-widgets-add-panel .elgg-state-available:hover {
+	background-color: #bcbcbc;
+}
+.elgg-widgets-add-panel .elgg-state-unavailable {
+	color: #888;
+}
+
+.elgg-module-widget {
+	background-color: #dedede;
+	padding: 2px;
+	margin: 0 5px 15px;
+	position: relative;
+}
+.elgg-module-widget:hover {
+	background-color: #ccc;
+}
+.elgg-module-widget > .elgg-head {
+	background-color: #eeeeee;
+	height: 26px;
+	overflow: hidden;
+}
+.elgg-module-widget > .elgg-head h3 {
+	float: left;
+	padding: 4px 45px 0 20px;
+	color: #666;
+}
+.elgg-module-widget.elgg-state-draggable .elgg-widget-handle {
+	cursor: move;
+}
+a.elgg-widget-collapse-button {
+	color: #c5c5c5;
+}
+a.elgg-widget-collapse-button:hover,
+a.elgg-widget-collapsed:hover {
+	color: #9d9d9d;
+	text-decoration: none;
+}
+a.elgg-widget-collapse-button:before {
+	content: "\25BC";
+}
+a.elgg-widget-collapsed:before {
+	content: "\25BA";
+}
+.elgg-module-widget > .elgg-body {
+	background-color: white;
+	width: 100%;
+	overflow: hidden;
+	border-top: 2px solid #dedede;
+}
+.elgg-widget-edit {
+	display: none;
+	width: 96%;
+	padding: 2%;
+	border-bottom: 2px solid #dedede;
+	background-color: #f9f9f9;
+}
+.elgg-widget-content {
+	padding: 10px;
+}
+.elgg-widget-placeholder {
+	border: 2px dashed #dedede;
+	margin-bottom: 15px;
+}
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/elements/navigation.php b/mod/basic_theme/views/default/css/elements/navigation.php
new file mode 100644
index 000000000..62f370069
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/navigation.php
@@ -0,0 +1,559 @@
+<?php
+/**
+ * Navigation
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	PAGINATION
+*************************************** */
+.elgg-pagination {
+	margin: 10px 0;
+	display: block;
+	text-align: center;
+}
+.elgg-pagination li {
+	display: inline;
+	margin: 0 6px 0 0;
+	text-align: center;
+}
+.elgg-pagination a, .elgg-pagination span {
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+	
+	padding: 2px 6px;
+	color: #4690d6;
+	border: 1px solid #4690d6;
+	font-size: 12px;
+}
+.elgg-pagination a:hover {
+	background: #4690d6;
+	color: white;
+	text-decoration: none;
+}
+.elgg-pagination .elgg-state-disabled span {
+	color: #CCCCCC;
+	border-color: #CCCCCC;
+}
+.elgg-pagination .elgg-state-selected span {
+	color: #555555;
+	border-color: #555555;
+}
+
+/* ***************************************
+	TABS
+*************************************** */
+.elgg-tabs {
+	margin-bottom: 5px;
+	border-bottom: 2px solid #cccccc;
+	display: table;
+	width: 100%;
+}
+.elgg-tabs li {
+	float: left;
+	border: 2px solid #ccc;
+	border-bottom: 0;
+	background: #eee;
+	margin: 0 0 0 10px;
+	
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.elgg-tabs a {
+	text-decoration: none;
+	display: block;
+	padding: 3px 10px 0 10px;
+	text-align: center;
+	height: 21px;
+	color: #999;
+}
+.elgg-tabs a:hover {
+	background: #dedede;
+	color: #4690D6;
+}
+.elgg-tabs .elgg-state-selected {
+	border-color: #ccc;
+	background: white;
+}
+.elgg-tabs .elgg-state-selected a {
+	position: relative;
+	top: 2px;
+	background: white;
+}
+
+/* ***************************************
+	BREADCRUMBS
+*************************************** */
+.elgg-breadcrumbs {
+	font-size: 80%;
+	font-weight: bold;
+	line-height: 1.2em;
+	color: #bababa;
+}
+.elgg-breadcrumbs > li {
+	display: inline-block;
+}
+.elgg-breadcrumbs > li:after {
+	content: "\003E";
+	padding: 0 4px;
+	font-weight: normal;
+}
+.elgg-breadcrumbs > li > a {
+	display: inline-block;
+	color: #999;
+}
+.elgg-breadcrumbs > li > a:hover {
+	color: #0054a7;
+	text-decoration: underline;
+}
+
+.elgg-main .elgg-breadcrumbs {
+	position: relative;
+	top: -6px;
+	left: 0;
+}
+
+/* ***************************************
+	TOPBAR MENU
+*************************************** */
+.elgg-menu-topbar {
+	float: left;
+}
+
+.elgg-menu-topbar > li {
+	float: left;
+}
+
+.elgg-menu-topbar > li > a {
+	padding-top: 2px;
+	color: #eee;
+	margin: 1px 15px 0;
+}
+
+.elgg-menu-topbar > li > a:hover {
+	color: #4690D6;
+	text-decoration: none;
+}
+
+.elgg-menu-topbar-alt {
+	float: right;
+}
+
+.elgg-menu-topbar .elgg-icon {
+	vertical-align: middle;
+	margin-top: -1px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-logo {
+	margin-top: 0;
+	padding-left: 5px;
+	width: 38px;
+	height: 20px;
+}
+
+.elgg-menu-topbar > li > a.elgg-topbar-avatar {
+	width: 18px;
+	height: 18px;
+}
+
+/* ***************************************
+	SITE MENU
+*************************************** */
+.elgg-menu-site {
+	z-index: 1;
+}
+
+.elgg-menu-site > li > a {
+	font-weight: bold;
+	padding: 3px 13px 0px 13px;
+	height: 20px;
+}
+
+.elgg-menu-site > li > a:hover {
+	text-decoration: none;
+}
+
+.elgg-menu-site-default {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	height: 23px;
+}
+
+.elgg-menu-site-default > li {
+	float: left;
+	margin-right: 1px;
+}
+
+.elgg-menu-site-default > li > a {
+	color: white;
+}
+
+.elgg-menu-site > li > ul {
+	display: none;
+	background-color: white;
+}
+
+.elgg-menu-site > li:hover > ul {
+	display: block;
+}
+
+.elgg-menu-site-default > .elgg-state-selected > a,
+.elgg-menu-site-default > li:hover > a {
+	background: white;
+	color: #555;
+
+	-webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+	box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
+
+	-webkit-border-radius: 4px 4px 0 0;
+	-moz-border-radius: 4px 4px 0 0;
+	border-radius: 4px 4px 0 0;
+}
+
+.elgg-menu-site-more {
+	position: relative;
+	left: -1px;
+	width: 100%;
+	min-width: 150px;
+	border: 1px solid #999;
+	border-top: 0;
+
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+
+	-webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+	-moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+	box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
+}
+
+.elgg-menu-site-more > li > a {
+	background-color: white;
+	color: #555;
+
+	-webkit-border-radius: 0;
+	-moz-border-radius: 0;
+	border-radius: 0;
+
+	-webkit-box-shadow: none;
+	-moz-box-shadow: none;
+	box-shadow: none;
+}
+
+.elgg-menu-site-more > li > a:hover {
+	background: #4690D6;
+	color: white;
+}
+
+.elgg-menu-site-more > li:last-child > a,
+.elgg-menu-site-more > li:last-child > a:hover {
+	-webkit-border-radius: 0 0 4px 4px;
+	-moz-border-radius: 0 0 4px 4px;
+	border-radius: 0 0 4px 4px;
+}
+
+.elgg-more > a:before {
+	content: "\25BC";
+	font-size: smaller;
+	margin-right: 4px;
+}
+
+/* ***************************************
+	TITLE
+*************************************** */
+.elgg-menu-title {
+	float: right;
+}
+
+.elgg-menu-title > li {
+	display: inline-block;
+	margin-left: 4px;
+}
+
+/* ***************************************
+	FILTER MENU
+*************************************** */
+.elgg-menu-filter {
+	margin-bottom: 5px;
+	border-bottom: 2px solid #ccc;
+	display: table;
+	width: 100%;
+}
+.elgg-menu-filter > li {
+	float: left;
+	border: 2px solid #ccc;
+	border-bottom: 0;
+	background: #eee;
+	margin: 0 0 0 10px;
+	
+	-webkit-border-radius: 5px 5px 0 0;
+	-moz-border-radius: 5px 5px 0 0;
+	border-radius: 5px 5px 0 0;
+}
+.elgg-menu-filter > li:hover {
+	background: #dedede;
+}
+.elgg-menu-filter > li > a {
+	text-decoration: none;
+	display: block;
+	padding: 3px 10px 0;
+	text-align: center;
+	height: 21px;
+	color: #999;
+}
+.elgg-menu-filter > li > a:hover {
+	background: #dedede;
+	color: #4690D6;
+}
+.elgg-menu-filter > .elgg-state-selected {
+	border-color: #ccc;
+	background: white;
+}
+.elgg-menu-filter > .elgg-state-selected > a {
+	position: relative;
+	top: 2px;
+	background: white;
+}
+
+/* ***************************************
+	PAGE MENU
+*************************************** */
+.elgg-menu-page {
+	margin-bottom: 15px;
+}
+
+.elgg-menu-page a {
+	display: block;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	background-color: white;
+	margin: 0 0 3px;
+	padding: 2px 4px 2px 8px;
+}
+.elgg-menu-page a:hover {
+	background-color: #0054A7;
+	color: white;
+	text-decoration: none;
+}
+.elgg-menu-page li.elgg-state-selected > a {
+	background-color: #4690D6;
+	color: white;
+}
+.elgg-menu-page .elgg-child-menu {
+	display: none;
+	margin-left: 15px;
+}
+.elgg-menu-page .elgg-menu-closed:before, .elgg-menu-opened:before {
+	display: inline-block;
+	padding-right: 4px;
+}
+.elgg-menu-page .elgg-menu-closed:before {
+	content: "\002B";
+}
+.elgg-menu-page .elgg-menu-opened:before {
+	content: "\002D";
+}
+
+/* ***************************************
+	HOVER MENU
+*************************************** */
+.elgg-menu-hover {
+	display: none;
+	position: absolute;
+	z-index: 10000;
+
+	overflow: hidden;
+
+	min-width: 165px;
+	max-width: 250px;
+	border: solid 1px;
+	border-color: #E5E5E5 #999 #999 #E5E5E5;
+	background-color: #FFF;
+	
+	-webkit-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	-moz-box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+	box-shadow: 2px 2px 6px rgba(0, 0, 0, 0.50);
+}
+.elgg-menu-hover > li {
+	border-bottom: 1px solid #ddd;
+}
+.elgg-menu-hover > li:last-child {
+	border-bottom: none;
+}
+.elgg-menu-hover .elgg-heading-basic {
+	display: block;
+}
+.elgg-menu-hover a {
+	padding: 2px 8px;
+	font-size: 92%;
+}
+.elgg-menu-hover a:hover {
+	background: #ccc;
+	text-decoration: none;
+}
+.elgg-menu-hover-admin a {
+	color: red;
+}
+.elgg-menu-hover-admin a:hover {
+	color: white;
+	background-color: red;
+}
+
+/* ***************************************
+	SITE FOOTER
+*************************************** */
+.elgg-menu-footer > li,
+.elgg-menu-footer > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-footer > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+.elgg-menu-footer-default {
+	float: right;
+}
+
+.elgg-menu-footer-alt {
+	float: left;
+}
+
+/* ***************************************
+	GENERAL MENU
+*************************************** */
+.elgg-menu-general > li,
+.elgg-menu-general > li > a {
+	display: inline-block;
+	color: #999;
+}
+
+.elgg-menu-general > li:after {
+	content: "\007C";
+	padding: 0 4px;
+}
+
+/* ***************************************
+	ENTITY AND ANNOTATION
+*************************************** */
+<?php // height depends on line height/font size ?>
+.elgg-menu-entity, elgg-menu-annotation {
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+	color: #aaa;
+	line-height: 16px;
+	height: 16px;
+}
+.elgg-menu-entity > li, .elgg-menu-annotation > li {
+	margin-left: 15px;
+}
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	color: #aaa;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-entity > li > a, .elgg-menu-annotation > li > a {
+	display: block;
+}
+.elgg-menu-entity > li > span, .elgg-menu-annotation > li > span {
+	vertical-align: baseline;
+}
+
+/* ***************************************
+	OWNER BLOCK
+*************************************** */
+.elgg-menu-owner-block li a {
+	display: block;
+	
+	-webkit-border-radius: 8px;
+	-moz-border-radius: 8px;
+	border-radius: 8px;
+	
+	background-color: white;
+	margin: 3px 0 5px 0;
+	padding: 2px 4px 2px 8px;
+}
+.elgg-menu-owner-block li a:hover {
+	background-color: #0054A7;
+	color: white;
+	text-decoration: none;
+}
+.elgg-menu-owner-block li.elgg-state-selected > a {
+	background-color: #4690D6;
+	color: white;
+}
+
+/* ***************************************
+	LONGTEXT
+*************************************** */
+.elgg-menu-longtext {
+	float: right;
+}
+
+/* ***************************************
+	RIVER
+*************************************** */
+.elgg-menu-river {
+	float: right;
+	margin-left: 15px;
+	font-size: 90%;
+	color: #aaa;
+	line-height: 16px;
+	height: 16px;
+}
+.elgg-menu-river > li {
+	display: inline-block;
+	margin-left: 5px;
+}
+.elgg-menu-river > li > a {
+	color: #aaa;
+	height: 16px;
+}
+<?php // need to override .elgg-menu-hz ?>
+.elgg-menu-river > li > a {
+	display: block;
+}
+.elgg-menu-river > li > span {
+	vertical-align: baseline;
+}
+
+/* ***************************************
+	SIDEBAR EXTRAS (rss, bookmark, etc)
+*************************************** */
+.elgg-menu-extras {
+	margin-bottom: 15px;
+}
+
+/* ***************************************
+	WIDGET MENU
+*************************************** */
+.elgg-menu-widget > li {
+	position: absolute;
+	top: 4px;
+	display: inline-block;
+	width: 18px;
+	height: 18px;
+	padding: 2px 2px 0 0;
+}
+
+.elgg-menu-widget > .elgg-menu-item-collapse {
+	left: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-delete {
+	right: 5px;
+}
+.elgg-menu-widget > .elgg-menu-item-settings {
+	right: 25px;
+}
diff --git a/mod/basic_theme/views/default/css/elements/reset.php b/mod/basic_theme/views/default/css/elements/reset.php
new file mode 100644
index 000000000..44bf2fac9
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/reset.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * CSS reset
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	RESET CSS
+*************************************** */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+body {
+	background-color: white;
+}
+<?php // force vertical scroll bar ?>
+html, body {
+	height: 100%;
+	margin-bottom: 1px;
+}
+img {
+	border-width:0;
+	border-color:transparent;
+}
+:focus {
+	outline: 0 none;
+}
+ol, ul {
+	list-style: none;
+}
+em, i {
+	font-style:italic;
+}
+ins {
+	text-decoration:none;
+}
+del {
+	text-decoration:line-through;
+}
+strong, b {
+	font-weight:bold;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
+caption, th, td {
+	text-align: left;
+	font-weight: normal;
+	vertical-align: top;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: "";
+}
+blockquote, q {
+	quotes: "" "";
+}
+a {
+	text-decoration: none;
+}
diff --git a/mod/basic_theme/views/default/css/elements/typography.php b/mod/basic_theme/views/default/css/elements/typography.php
new file mode 100644
index 000000000..d93b28d2c
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elements/typography.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * CSS typography
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+
+/* ***************************************
+	Typography
+*************************************** */
+body {
+	font-size: 80%;
+	line-height: 1.4em;
+	font-family: "Lucida Grande", Arial, Tahoma, Verdana, sans-serif;
+}
+
+a {
+	color: #4690D6;
+}
+
+a:hover,
+a.selected { <?php //@todo remove .selected ?>
+	color: #555555;
+	text-decoration: underline;
+}
+
+p {
+	margin-bottom: 15px;
+}
+
+p:last-child {
+	margin-bottom: 0;
+}
+
+pre, code {
+	font-family: Monaco, "Courier New", Courier, monospace;
+	font-size: 12px;
+	
+	background:#EBF5FF;
+	color:#000000;
+	overflow:auto;
+
+	overflow-x: auto; /* Use horizontal scroller if needed; for Firefox 2, not needed in Firefox 3 */
+
+	white-space: pre-wrap;
+	word-wrap: break-word; /* IE 5.5-7 */
+	
+}
+
+pre {
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	line-height:1.3em;
+}
+
+code {
+	padding:2px 3px;
+}
+
+.elgg-monospace {
+	font-family: Monaco, "Courier New", Courier, monospace;
+}
+
+blockquote {
+	line-height: 1.3em;
+	padding:3px 15px;
+	margin:0px 0 15px 0;
+	background:#EBF5FF;
+	border:none;
+	
+	-webkit-border-radius: 4px;
+	-moz-border-radius: 4px;
+	border-radius: 4px;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	font-weight: bold;
+	color: #0054A7;
+}
+
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; line-height: 1.1em; padding-bottom:5px}
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.0em; }
+h5 { font-size: 0.9em; }
+h6 { font-size: 0.8em; }
+
+.elgg-heading-site, .elgg-heading-site:hover {
+	font-size: 2em;
+	line-height: 1.4em;
+	color: white;
+	font-style: italic;
+	font-family: Georgia, times, serif;
+	text-shadow: 1px 2px 4px #333333;
+	text-decoration: none;
+}
+
+.elgg-heading-main {
+	float: left;
+	max-width: 530px;
+	margin-right: 10px;
+}
+.elgg-heading-basic {
+	color: #0054A7;
+	font-size: 1.2em;
+	font-weight: bold;
+}
+
+.elgg-subtext {
+	color: #666666;
+	font-size: 85%;
+	line-height: 1.2em;
+	font-style: italic;
+}
+
+.elgg-text-help {
+	display: block;
+	font-size: 85%;
+	font-style: italic;
+}
+
+.elgg-quiet {
+	color: #666;
+}
+
+.elgg-loud {
+	color: #0054A7;
+}
+
+/* ***************************************
+	USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output {
+	margin-top: 10px;
+}
+
+.elgg-output dt { font-weight: bold }
+.elgg-output dd { margin: 0 0 1em 1em }
+
+.elgg-output ul, .elgg-output ol {
+	margin: 0 1.5em 1.5em 0;
+	padding-left: 1.5em;
+}
+.elgg-output ul {
+	list-style-type: disc;
+}
+.elgg-output ol {
+	list-style-type: decimal;
+}
+.elgg-output table {
+	border: 1px solid #ccc;
+}
+.elgg-output table td {
+	border: 1px solid #ccc;
+	padding: 3px 5px;
+}
+.elgg-output img {
+	max-width: 100%;
+}
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/elgg.php b/mod/basic_theme/views/default/css/elgg.php
new file mode 100644
index 000000000..4960e6ade
--- /dev/null
+++ b/mod/basic_theme/views/default/css/elgg.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Elgg primary CSS view
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+/* 
+ * Colors:
+ *  #4690D6 - elgg light blue
+ *  #0054A7 - elgg dark blue
+ *  #e4ecf5 - elgg very light blue
+ */
+
+// check if there is a theme overriding the old css view and use it, if it exists
+$old_css_view = elgg_get_view_location('css');
+if ($old_css_view != elgg_get_config('viewpath')) {
+	echo elgg_view('css', $vars);
+	return true;
+}
+
+
+/*******************************************************************************
+
+Base CSS
+ * CSS reset
+ * core
+ * helpers (moved to end to have a higher priority)
+ * grid
+
+*******************************************************************************/
+echo elgg_view('css/elements/reset', $vars);
+echo elgg_view('css/elements/core', $vars);
+echo elgg_view('css/elements/grid', $vars);
+
+
+/*******************************************************************************
+
+Skin CSS
+ * typography     - fonts, line spacing
+ * forms          - forms, inputs
+ * buttons        - action, cancel, delete, submit, dropdown, special
+ * navigation     - menus, breadcrumbs, pagination
+ * icons          - icons, sprites, graphics
+ * modules        - modules, widgets
+ * layout_objects - lists, content blocks, notifications, avatars
+ * layout         - page layout
+ * misc           - to be removed/redone
+
+*******************************************************************************/
+echo elgg_view('css/elements/typography', $vars);
+echo elgg_view('css/elements/forms', $vars);
+echo elgg_view('css/elements/buttons', $vars);
+echo elgg_view('css/elements/icons', $vars);
+echo elgg_view('css/elements/navigation', $vars);
+echo elgg_view('css/elements/modules', $vars);
+echo elgg_view('css/elements/components', $vars);
+echo elgg_view('css/elements/layout', $vars);
+echo elgg_view('css/elements/misc', $vars);
+
+
+// included last to have higher priority
+echo elgg_view('css/elements/helpers', $vars);
+
+
+// in case plugins are still extending the old 'css' view, display it
+echo elgg_view('css', $vars);
diff --git a/mod/basic_theme/views/default/css/ie.php b/mod/basic_theme/views/default/css/ie.php
new file mode 100644
index 000000000..4bddd4d55
--- /dev/null
+++ b/mod/basic_theme/views/default/css/ie.php
@@ -0,0 +1,8 @@
+/**
+ * CSS for IE8 and above
+ */
+
+/* ie8 does not like shrink wrapping this div with inline-block */
+.elgg-avatar {
+	display: block;
+}
diff --git a/mod/basic_theme/views/default/css/ie6.php b/mod/basic_theme/views/default/css/ie6.php
new file mode 100644
index 000000000..cf49d33f2
--- /dev/null
+++ b/mod/basic_theme/views/default/css/ie6.php
@@ -0,0 +1,12 @@
+/**
+ * CSS for IE6
+ */
+
+* {zoom: 1;} /* trigger hasLayout in IE */
+
+/* main nav drop-down */
+#elgg-header {z-index:1;}
+
+/* @todo check this one */
+.elgg-button-delete a { background-position-y: 2px; }
+.elgg-button-delete a:hover { background-position-y: -14px; }
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/ie7.php b/mod/basic_theme/views/default/css/ie7.php
new file mode 100644
index 000000000..db0125b4b
--- /dev/null
+++ b/mod/basic_theme/views/default/css/ie7.php
@@ -0,0 +1,65 @@
+/**
+ * CSS for IE7
+ */
+
+/* trigger hasLayout in IE */
+* {
+	zoom: 1;
+}
+
+/* site menu drop-down z-index fix for IE7 */
+.elgg-page-header {
+    z-index: 1;
+}
+
+/* inline-block fixes */
+.elgg-gallery > li,
+.elgg-button,
+.elgg-icon,
+.elgg-menu-hz > li,
+.elgg-menu-hz > li:after,
+.elgg-menu-hz > li > a,
+.elgg-menu-hz > li > span,
+.elgg-breadcrumbs > li,
+.elgg-menu-footer > li > a,
+.elgg-menu-footer li,
+.elgg-menu-general > li > a,
+.elgg-menu-general li {
+	display: inline;
+}
+
+/* IE7 does not support :after */
+.elgg-breadcrumbs > li > a {
+	display: inline;
+	padding-right: 4px;
+	margin-right: 4px;
+	border-right: 1px solid #bababa;
+}
+.elgg-menu-footer li,
+.elgg-menu-user li,
+.elgg-menu-general li {
+	padding-left: 4px;
+	padding-right: 4px;
+}
+
+/* longtext menu would not display horizontally without this */
+.elgg-menu-longtext {
+	width: 100%;
+}
+.elgg-menu-longtext li {
+	width: 100px;
+	float: right;
+}
+
+.elgg-avatar {
+	display: inline;
+}
+
+.elgg-body-walledgarden .elgg-col-1of2 {
+	width: 255px;
+}
+
+.elgg-module-walledgarden > .elgg-head,
+.elgg-module-walledgarden > .elgg-foot {
+	width: 530px;
+}
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/lightbox.php b/mod/basic_theme/views/default/css/lightbox.php
new file mode 100644
index 000000000..7d5917cc3
--- /dev/null
+++ b/mod/basic_theme/views/default/css/lightbox.php
@@ -0,0 +1,371 @@
+<?php
+/**
+ * Fancybox lightbox CSS.
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package    Elgg.Core
+ * @subpackage UI
+ */
+
+$jquery_path = elgg_get_site_url() . 'vendors/jquery/';
+?>
+
+/*
+ * FancyBox - jQuery Plugin
+ * Simple and fancy lightbox alternative
+ *
+ * Examples and documentation at: http://fancybox.net
+ *
+ * Copyright (c) 2008 - 2010 Janis Skarnelis
+ * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+ *
+ * Version: 1.3.4 (11/11/2010)
+ * Requires: jQuery v1.3+
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+
+#fancybox-loading {
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 40px;
+	height: 40px;
+	margin-top: -20px;
+	margin-left: -20px;
+	cursor: pointer;
+	overflow: hidden;
+	z-index: 1104;
+	display: none;
+}
+
+#fancybox-loading div {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 40px;
+	height: 480px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+}
+
+#fancybox-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 1100;
+	display: none;
+}
+
+#fancybox-tmp {
+	padding: 0;
+	margin: 0;
+	border: 0;
+	overflow: auto;
+	display: none;
+}
+
+#fancybox-wrap {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding: 20px;
+	z-index: 1101;
+	outline: none;
+	display: none;
+}
+
+#fancybox-outer {
+	position: relative;
+	width: 100%;
+	height: 100%;
+	background: #fff;
+}
+
+#fancybox-content {
+	width: 0;
+	height: 0;
+	padding: 0;
+	outline: none;
+	position: relative;
+	overflow: hidden;
+	z-index: 1102;
+	border: 0px solid #fff;
+}
+
+#fancybox-hide-sel-frame {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
+	background: transparent;
+	z-index: 1101;
+}
+
+#fancybox-close {
+	position: absolute;
+	top: -15px;
+	right: -15px;
+	width: 30px;
+	height: 30px;
+	background: transparent url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px 0px;
+	cursor: pointer;
+	z-index: 1103;
+	display: none;
+}
+
+#fancybox-error {
+	color: #444;
+	font: normal 12px/20px Arial;
+	padding: 14px;
+	margin: 0;
+}
+
+#fancybox-img {
+	width: 100%;
+	height: 100%;
+	padding: 0;
+	margin: 0;
+	border: none;
+	outline: none;
+	line-height: 0;
+	vertical-align: top;
+}
+
+#fancybox-frame {
+	width: 100%;
+	height: 100%;
+	border: none;
+	display: block;
+}
+
+#fancybox-left, #fancybox-right {
+	position: absolute;
+	bottom: 0px;
+	height: 100%;
+	width: 35%;
+	cursor: pointer;
+	outline: none;
+	background: transparent url('<?php echo $jquery_path; ?>fancybox/blank.gif');
+	z-index: 1102;
+	display: none;
+}
+
+#fancybox-left {
+	left: 0px;
+}
+
+#fancybox-right {
+	right: 0px;
+}
+
+#fancybox-left-ico, #fancybox-right-ico {
+	position: absolute;
+	top: 50%;
+	left: -9999px;
+	width: 30px;
+	height: 30px;
+	margin-top: -15px;
+	cursor: pointer;
+	z-index: 1102;
+	display: block;
+}
+
+#fancybox-left-ico {
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -30px;
+}
+
+#fancybox-right-ico {
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -60px;
+}
+
+#fancybox-left:hover, #fancybox-right:hover {
+	visibility: visible; /* IE6 */
+}
+
+#fancybox-left:hover span {
+	left: 20px;
+}
+
+#fancybox-right:hover span {
+	left: auto;
+	right: 20px;
+}
+
+.fancybox-bg {
+	position: absolute;
+	padding: 0;
+	margin: 0;
+	border: 0;
+	width: 20px;
+	height: 20px;
+	z-index: 1001;
+}
+
+#fancybox-bg-n {
+	top: -20px;
+	left: 0;
+	width: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+}
+
+#fancybox-bg-ne {
+	top: -20px;
+	right: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -162px;
+}
+
+#fancybox-bg-e {
+	top: 0;
+	right: -20px;
+	height: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+	background-position: -20px 0px;
+}
+
+#fancybox-bg-se {
+	bottom: -20px;
+	right: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -182px;
+}
+
+#fancybox-bg-s {
+	bottom: -20px;
+	left: 0;
+	width: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png');
+	background-position: 0px -20px;
+}
+
+#fancybox-bg-sw {
+	bottom: -20px;
+	left: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -142px;
+}
+
+#fancybox-bg-w {
+	top: 0;
+	left: -20px;
+	height: 100%;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox-y.png');
+}
+
+#fancybox-bg-nw {
+	top: -20px;
+	left: -20px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancybox.png');
+	background-position: -40px -122px;
+}
+
+#fancybox-title {
+	font-family: Helvetica;
+	font-size: 12px;
+	z-index: 1102;
+}
+
+.fancybox-title-inside {
+	padding-bottom: 10px;
+	text-align: center;
+	color: #333;
+	background: #fff;
+	position: relative;
+}
+
+.fancybox-title-outside {
+	padding-top: 10px;
+	color: #fff;
+}
+
+.fancybox-title-over {
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	color: #FFF;
+	text-align: left;
+}
+
+#fancybox-title-over {
+	padding: 10px;
+	background-image: url('<?php echo $jquery_path; ?>fancybox/fancy_title_over.png');
+	display: block;
+}
+
+.fancybox-title-float {
+	position: absolute;
+	left: 0;
+	bottom: -20px;
+	height: 32px;
+}
+
+#fancybox-title-float-wrap {
+	border: none;
+	border-collapse: collapse;
+	width: auto;
+}
+
+#fancybox-title-float-wrap td {
+	border: none;
+	white-space: nowrap;
+}
+
+#fancybox-title-float-left {
+	padding: 0 0 0 15px;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -40px -90px no-repeat;
+}
+
+#fancybox-title-float-main {
+	color: #FFF;
+	line-height: 29px;
+	font-weight: bold;
+	padding: 0 0 3px 0;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox-x.png') 0px -40px;
+}
+
+#fancybox-title-float-right {
+	padding: 0 0 0 15px;
+	background: url('<?php echo $jquery_path; ?>fancybox/fancybox.png') -55px -90px no-repeat;
+}
+
+/* IE6 */
+
+.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_close.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_nav_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; }
+.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_left.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_main.png', sizingMethod='scale'); }
+.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_title_right.png', sizingMethod='scale'); }
+
+.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame {
+	height: expression(this.parentNode.clientHeight + "px");
+}
+
+#fancybox-loading.fancybox-ie6 {
+	position: absolute; margin-top: 0;
+	top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px');
+}
+
+#fancybox-loading.fancybox-ie6 div	{ background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_loading.png', sizingMethod='scale'); }
+
+/* IE6, IE7, IE8 */
+.fancybox-ie .fancybox-bg { background: transparent !important; }
+
+.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_n.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_ne.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_e.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_se.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_s.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_sw.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_w.png', sizingMethod='scale'); }
+.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='<?php echo $jquery_path; ?>fancybox/fancy_shadow_nw.png', sizingMethod='scale'); }
+\ No newline at end of file
diff --git a/mod/basic_theme/views/default/css/walled_garden.php b/mod/basic_theme/views/default/css/walled_garden.php
new file mode 100644
index 000000000..f6f7f97dc
--- /dev/null
+++ b/mod/basic_theme/views/default/css/walled_garden.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Walled garden CSS
+ */
+
+$url = elgg_get_site_url();
+
+?>
+.elgg-body-walledgarden {
+	margin: 100px auto 0 auto;
+	position: relative;
+	width: 530px;
+}
+.elgg-module-walledgarden {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.elgg-module-walledgarden > .elgg-head {
+	height: 17px;
+}
+.elgg-module-walledgarden > .elgg-body {
+	padding: 0 10px;
+}
+.elgg-module-walledgarden > .elgg-foot {
+	height: 17px;
+}
+.elgg-walledgarden-double > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-double > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-double > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-single > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_bottom.png) no-repeat left top;
+}
+
+.elgg-col > .elgg-inner {
+	margin: 0 0 0 5px;
+}
+.elgg-col:first-child > .elgg-inner {
+	margin: 0 5px 0 0;
+}
+.elgg-col > .elgg-inner {
+	padding: 0 8px;
+}
+
+.elgg-walledgarden-single > .elgg-body {
+	padding: 0 18px;
+}
+
+.elgg-module-walledgarden-login {
+	margin: 0;
+}
+.elgg-body-walledgarden h3 {
+	font-size: 1.5em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
+}
+
+.elgg-heading-walledgarden {
+	margin-top: 60px;
+	line-height: 1.1em;
+}
+
+h1, h2, h3, h4, h5, h6 {
+	color: #666;
+}
+
+a {
+	color: #999;
+}
+\ No newline at end of file
diff --git a/mod/beechat/README b/mod/beechat/README
new file mode 100644
index 000000000..5ff3f8467
--- /dev/null
+++ b/mod/beechat/README
@@ -0,0 +1,23 @@
+Beechat the first XMPP chat for Elgg
+====================================
+
+Beechat is a facebook like chat for elgg using the XMPP protocol. It requires the XMPP serveur ejabberd. 
+
+Installation
+------------
+
+French Documentation
+
+http://github.com/beechannels/beechat/wikis/guide-dinstallation
+
+English Documentation
+
+http://github.com/beechannels/beechat/wikis/setup-guide
+
+Feedback
+--------
+
+We are relying on the [GitHub issues tracker][issues] linked from above for
+feedback. File bugs or other issues [here][issues].
+
+[issues]: http://github.com/beechannels/beechat/issues
diff --git a/mod/beechat/actions/get_connection.php b/mod/beechat/actions/get_connection.php
new file mode 100644
index 000000000..a31174179
--- /dev/null
+++ b/mod/beechat/actions/get_connection.php
@@ -0,0 +1,21 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+	 
+	header('Content-type: application/json');
+	gatekeeper();
+	
+	global $SESSION;
+	
+	if ($SESSION->offsetExists('beechat_conn'))
+	  echo $SESSION->offsetGet('beechat_conn');
+	
+	exit();
+?>
diff --git a/mod/beechat/actions/get_details.php b/mod/beechat/actions/get_details.php
new file mode 100644
index 000000000..4944fc4a9
--- /dev/null
+++ b/mod/beechat/actions/get_details.php
@@ -0,0 +1,21 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+	
+	gatekeeper();
+	header('Content-type: application/json');
+	$user = $_SESSION['user'];
+	$t = array('username' => $user->username,
+		   'password' => $user->password);
+	
+	echo json_encode($t);
+	
+	exit();
+?>
diff --git a/mod/beechat/actions/get_icons.php b/mod/beechat/actions/get_icons.php
new file mode 100644
index 000000000..33d447e2e
--- /dev/null
+++ b/mod/beechat/actions/get_icons.php
@@ -0,0 +1,52 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+	header('Content-type: application/json');
+	gatekeeper();
+	global $CONFIG;
+
+	if (!empty($_POST['beechat_roster_items_usernames']))
+	{
+		$rosterItemsUsernames = explode(',', $_POST['beechat_roster_items_usernames']);
+		/*foreach ($rosterItemsUsernames as $rosterItem)
+		{
+		}*/
+		$userFriendsEntities = $_SESSION['user']->getFriends('', 0, 0);
+		
+		$res = array();
+		foreach ($rosterItemsUsernames as $value)
+		{
+			$found = false;
+			$splitjid = explode('@', $value);
+			$jid_name = $splitjid[0];
+			$jid_host = $splitjid[1];
+			foreach ($userFriendsEntities as $friend)
+			{
+				if ((strtolower($friend->username) == strtolower($jid_name) && $jid_host == elgg_get_plugin_setting("domain", "beechat")))
+				{
+					$res[$value] = array('small' => $friend->getIcon('small'), 'tiny' => $friend->getIcon('tiny'));
+					$found = true;
+					break;
+				}
+			}
+			if (!$found) {
+				$base = $CONFIG->wwwroot."mod/profile/graphics/default";
+				$res[$value] = array('small' => $base."small.gif", 'tiny' => $base."tiny.gif");
+			}
+		}
+		echo json_encode($res);
+	}
+	else
+		echo json_encode(null);
+
+	exit();
+
+?>
diff --git a/mod/beechat/actions/get_state.php b/mod/beechat/actions/get_state.php
new file mode 100644
index 000000000..6cfd2f725
--- /dev/null
+++ b/mod/beechat/actions/get_state.php
@@ -0,0 +1,21 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+	 
+	header('Content-type: application/json');
+	gatekeeper();
+	
+	global $SESSION;
+	
+	if ($SESSION->offsetExists('beechat_state'))
+	  echo $SESSION->offsetGet('beechat_state');
+	
+	exit();
+?>
diff --git a/mod/beechat/actions/get_statuses.php b/mod/beechat/actions/get_statuses.php
new file mode 100644
index 000000000..6f7620beb
--- /dev/null
+++ b/mod/beechat/actions/get_statuses.php
@@ -0,0 +1,41 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+	header('Content-type: application/json');
+	gatekeeper();
+	$usernames = get_input('beechat_roster_items_usernames');
+	if (!empty($usernames))
+	{
+		$iconSize = 'small';
+		$rosterItemsUsernames = explode(',', $usernames);
+		$userFriendsEntities = $_SESSION['user']->getFriends('', 1000000000, 0);
+		
+		$res = array();
+		foreach ($rosterItemsUsernames as $value)
+		{
+			foreach ($userFriendsEntities as $friend)
+			{
+				if (strtolower($friend->username) == strtolower($value))
+				{
+					$status = get_entities_from_metadata("state", "current", "object", "status", $friend->get('guid'));
+					$res[$value] = ($status != false) ? $status[0]->description : '';
+					break;
+				}
+			}
+		}
+		echo json_encode($res);
+	}
+	else
+		echo json_encode(null);
+
+	exit();
+
+?>
diff --git a/mod/beechat/actions/join_groupchat.php b/mod/beechat/actions/join_groupchat.php
new file mode 100644
index 000000000..c694d7957
--- /dev/null
+++ b/mod/beechat/actions/join_groupchat.php
@@ -0,0 +1,15 @@
+<?php
+
+$user = elgg_get_logged_in_user_entity();
+$group = get_entity(get_input('group_guid'));
+
+if ($user && $group) {
+	if (!check_entity_relationship($user->guid, 'groupchat', $group->guid)) {
+		error_log("joinen ok");
+		add_entity_relationship($user->guid, 'groupchat', $group->guid);
+}
+}
+echo "OK";
+error_log("join ok");
+
+?>
diff --git a/mod/beechat/actions/leave_groupchat.php b/mod/beechat/actions/leave_groupchat.php
new file mode 100644
index 000000000..e04ab8846
--- /dev/null
+++ b/mod/beechat/actions/leave_groupchat.php
@@ -0,0 +1,12 @@
+<?php
+
+$user = elgg_get_logged_in_user_entity();
+$group = get_entity(get_input('group_guid'));
+
+if ($user && $group) {
+	if (check_entity_relationship($user->guid, 'groupchat', $group->guid))
+		remove_entity_relationship($user->guid, 'groupchat', $group->guid);
+}
+error_log("leave ok");
+echo "OK";
+?>
diff --git a/mod/beechat/actions/save_state.php b/mod/beechat/actions/save_state.php
new file mode 100644
index 000000000..f8a61c580
--- /dev/null
+++ b/mod/beechat/actions/save_state.php
@@ -0,0 +1,29 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+//	gatekeeper();
+	
+	if (elgg_is_logged_in())
+	{
+		
+		global $SESSION;
+		
+		if (!empty($_POST['beechat_state']))
+		{
+			$SESSION->offsetSet('beechat_state', $_POST['beechat_state']);
+		} 
+		elseif (!empty($_POST['beechat_conn']))
+		{
+			$SESSION->offsetSet('beechat_conn', get_input('beechat_conn'));
+		}
+	}		
+	exit();
+?>
diff --git a/mod/beechat/classes/BeechatSync.php b/mod/beechat/classes/BeechatSync.php
new file mode 100644
index 000000000..e0a2f90b8
--- /dev/null
+++ b/mod/beechat/classes/BeechatSync.php
@@ -0,0 +1,37 @@
+<?php
+
+class BeechatSync {
+        static function onFriendCreate($event, $object_type, $relationship) {
+		if ($relationship->relationship == 'friendrequest') {
+			elgg_load_library('elgg:beechat');
+                        $friend = get_entity($relationship->guid_two);
+                        // create friend request
+			ejabberd_friend_request(elgg_get_logged_in_user_entity(), $friend);
+		}
+	}
+        static function onFriendDelete($event, $object_type, $relationship) {
+		if ($relationship->relationship == 'friendrequest') {
+			elgg_load_library('elgg:beechat');
+                        $subject = get_entity($relationship->guid_two);
+			// here friend is guid_one because is the one initiating
+                        $friend = get_entity($relationship->guid_one);
+                        $friends = $friend->isFriendsWith($subject->guid);
+                        if ($friends) {
+                                // accept friend request
+                		ejabberd_friend_accept(elgg_get_logged_in_user_entity(), $friend);
+                        } else {
+                                // decline friend request
+				ejabberd_friend_deny(elgg_get_logged_in_user_entity(), $friend);
+                        }
+                }
+                elseif ($relationship->relationship == 'friend') {
+			elgg_load_library('elgg:beechat');
+                        $subject = get_entity($relationship->guid_one);
+                        $friend = get_entity($relationship->guid_two);
+                        // delete friendship
+			ejabberd_friend_remove(elgg_get_logged_in_user_entity(), $friend);
+                }
+
+	}
+
+}
diff --git a/mod/beechat/disablechat.php b/mod/beechat/disablechat.php
new file mode 100644
index 000000000..490fb327b
--- /dev/null
+++ b/mod/beechat/disablechat.php
@@ -0,0 +1,8 @@
+<?php
+        require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	if (elgg_is_logged_in()) {
+		elgg_get_logged_in_user_entity()->chatenabled = false;
+		system_message(elgg_echo("beechat:disabled"));
+	}
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/mod/beechat/enablechat.php b/mod/beechat/enablechat.php
new file mode 100644
index 000000000..5d3de7e2a
--- /dev/null
+++ b/mod/beechat/enablechat.php
@@ -0,0 +1,8 @@
+<?php
+        require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+	if (elgg_is_logged_in()) {
+		elgg_get_logged_in_user_entity()->chatenabled = true;
+		system_message(elgg_echo("beechat:enabled"));
+	}
+	forward($_SERVER['HTTP_REFERER']);
+?>
diff --git a/mod/beechat/graphics/icons/bullet_arrow_down.png b/mod/beechat/graphics/icons/bullet_arrow_down.png
new file mode 100644
index 000000000..9b23c06d7
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_arrow_down.png
diff --git a/mod/beechat/graphics/icons/bullet_arrow_up.png b/mod/beechat/graphics/icons/bullet_arrow_up.png
new file mode 100644
index 000000000..24df0f421
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_arrow_up.png
diff --git a/mod/beechat/graphics/icons/bullet_black.png b/mod/beechat/graphics/icons/bullet_black.png
new file mode 100644
index 000000000..57619706d
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_black.png
diff --git a/mod/beechat/graphics/icons/bullet_blue.png b/mod/beechat/graphics/icons/bullet_blue.png
new file mode 100644
index 000000000..a7651ec8a
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_blue.png
diff --git a/mod/beechat/graphics/icons/bullet_delete.png b/mod/beechat/graphics/icons/bullet_delete.png
new file mode 100644
index 000000000..bd6271b24
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_delete.png
diff --git a/mod/beechat/graphics/icons/bullet_error.png b/mod/beechat/graphics/icons/bullet_error.png
new file mode 100644
index 000000000..bca2b491f
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_error.png
diff --git a/mod/beechat/graphics/icons/bullet_green.png b/mod/beechat/graphics/icons/bullet_green.png
new file mode 100644
index 000000000..058ad261f
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_green.png
diff --git a/mod/beechat/graphics/icons/bullet_orange.png b/mod/beechat/graphics/icons/bullet_orange.png
new file mode 100644
index 000000000..fa63024e5
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_orange.png
diff --git a/mod/beechat/graphics/icons/bullet_pink.png b/mod/beechat/graphics/icons/bullet_pink.png
new file mode 100644
index 000000000..0c9f73e3f
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_pink.png
diff --git a/mod/beechat/graphics/icons/bullet_purple.png b/mod/beechat/graphics/icons/bullet_purple.png
new file mode 100644
index 000000000..52ba5036b
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_purple.png
diff --git a/mod/beechat/graphics/icons/bullet_red.png b/mod/beechat/graphics/icons/bullet_red.png
new file mode 100644
index 000000000..0cd803115
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_red.png
diff --git a/mod/beechat/graphics/icons/bullet_star.png b/mod/beechat/graphics/icons/bullet_star.png
new file mode 100644
index 000000000..fab774a32
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_star.png
diff --git a/mod/beechat/graphics/icons/bullet_white.png b/mod/beechat/graphics/icons/bullet_white.png
new file mode 100644
index 000000000..a9af8d44b
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_white.png
diff --git a/mod/beechat/graphics/icons/bullet_yellow.png b/mod/beechat/graphics/icons/bullet_yellow.png
new file mode 100644
index 000000000..6469cea7e
--- /dev/null
+++ b/mod/beechat/graphics/icons/bullet_yellow.png
diff --git a/mod/beechat/graphics/icons/chat_icon.png b/mod/beechat/graphics/icons/chat_icon.png
new file mode 100644
index 000000000..0e6d844bd
--- /dev/null
+++ b/mod/beechat/graphics/icons/chat_icon.png
diff --git a/mod/beechat/graphics/icons/cog_edit.png b/mod/beechat/graphics/icons/cog_edit.png
new file mode 100644
index 000000000..47b75a456
--- /dev/null
+++ b/mod/beechat/graphics/icons/cog_edit.png
diff --git a/mod/beechat/graphics/icons/comment_edit.png b/mod/beechat/graphics/icons/comment_edit.png
new file mode 100644
index 000000000..73db110df
--- /dev/null
+++ b/mod/beechat/graphics/icons/comment_edit.png
diff --git a/mod/beechat/graphics/icons/emoticon_evilgrin.png b/mod/beechat/graphics/icons/emoticon_evilgrin.png
new file mode 100644
index 000000000..817bd509b
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_evilgrin.png
diff --git a/mod/beechat/graphics/icons/emoticon_grin.png b/mod/beechat/graphics/icons/emoticon_grin.png
new file mode 100644
index 000000000..fc60c5e1c
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_grin.png
diff --git a/mod/beechat/graphics/icons/emoticon_happy.png b/mod/beechat/graphics/icons/emoticon_happy.png
new file mode 100644
index 000000000..6b7336e17
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_happy.png
diff --git a/mod/beechat/graphics/icons/emoticon_smile.png b/mod/beechat/graphics/icons/emoticon_smile.png
new file mode 100644
index 000000000..ade431851
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_smile.png
diff --git a/mod/beechat/graphics/icons/emoticon_surprised.png b/mod/beechat/graphics/icons/emoticon_surprised.png
new file mode 100644
index 000000000..4520cfc55
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_surprised.png
diff --git a/mod/beechat/graphics/icons/emoticon_tongue.png b/mod/beechat/graphics/icons/emoticon_tongue.png
new file mode 100644
index 000000000..ecafd2ffc
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_tongue.png
diff --git a/mod/beechat/graphics/icons/emoticon_unhappy.png b/mod/beechat/graphics/icons/emoticon_unhappy.png
new file mode 100644
index 000000000..fd5d030ef
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_unhappy.png
diff --git a/mod/beechat/graphics/icons/emoticon_waii.png b/mod/beechat/graphics/icons/emoticon_waii.png
new file mode 100644
index 000000000..458f93611
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_waii.png
diff --git a/mod/beechat/graphics/icons/emoticon_wink.png b/mod/beechat/graphics/icons/emoticon_wink.png
new file mode 100644
index 000000000..a631949b5
--- /dev/null
+++ b/mod/beechat/graphics/icons/emoticon_wink.png
diff --git a/mod/beechat/graphics/icons/heart.png b/mod/beechat/graphics/icons/heart.png
new file mode 100644
index 000000000..d9ee53e59
--- /dev/null
+++ b/mod/beechat/graphics/icons/heart.png
diff --git a/mod/beechat/graphics/icons/house.png b/mod/beechat/graphics/icons/house.png
new file mode 100644
index 000000000..fed62219f
--- /dev/null
+++ b/mod/beechat/graphics/icons/house.png
diff --git a/mod/beechat/graphics/icons/muc_icon.png b/mod/beechat/graphics/icons/muc_icon.png
new file mode 100644
index 000000000..efdd60f12
--- /dev/null
+++ b/mod/beechat/graphics/icons/muc_icon.png
diff --git a/mod/beechat/graphics/icons/notification_pink.png b/mod/beechat/graphics/icons/notification_pink.png
new file mode 100644
index 000000000..f40c184f9
--- /dev/null
+++ b/mod/beechat/graphics/icons/notification_pink.png
diff --git a/mod/beechat/graphics/icons/pointer.png b/mod/beechat/graphics/icons/pointer.png
new file mode 100644
index 000000000..4e50a0f9a
--- /dev/null
+++ b/mod/beechat/graphics/icons/pointer.png
diff --git a/mod/beechat/graphics/icons/resultset_next.png b/mod/beechat/graphics/icons/resultset_next.png
new file mode 100644
index 000000000..e252606d3
--- /dev/null
+++ b/mod/beechat/graphics/icons/resultset_next.png
diff --git a/mod/beechat/graphics/icons/resultset_previous.png b/mod/beechat/graphics/icons/resultset_previous.png
new file mode 100644
index 000000000..18f9cc109
--- /dev/null
+++ b/mod/beechat/graphics/icons/resultset_previous.png
diff --git a/mod/beechat/graphics/icons/statuses.png b/mod/beechat/graphics/icons/statuses.png
new file mode 100644
index 000000000..e409f61a9
--- /dev/null
+++ b/mod/beechat/graphics/icons/statuses.png
diff --git a/mod/beechat/graphics/icons/vcard.png b/mod/beechat/graphics/icons/vcard.png
new file mode 100644
index 000000000..c02f315d2
--- /dev/null
+++ b/mod/beechat/graphics/icons/vcard.png
diff --git a/mod/beechat/languages/en.php b/mod/beechat/languages/en.php
new file mode 100644
index 000000000..38f03be98
--- /dev/null
+++ b/mod/beechat/languages/en.php
@@ -0,0 +1,45 @@
+<?php
+
+$en_array = array(
+		  'beechat:icons:home' => 'Home',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Available',
+		  'beechat:availability:dnd' => 'Do not disturb',
+		  'beechat:availability:away' => 'Away',
+		  'beechat:availability:xa' => 'Extended away',
+		  'beechat:availability:offline' => 'Offline',
+
+		  'beechat:connection:state:offline' => 'Offline',
+		  'beechat:connection:state:connecting' => 'Connecting...',
+		  'beechat:connection:state:authenticating' => 'Authenticating...',
+		  'beechat:connection:state:online' => 'Online',
+		  'beechat:connection:state:failed' => 'Failed',
+		  'beechat:connection:state:disconnecting' => 'Disconnecting...',
+
+		  'beechat:chat:self' => 'Me',
+		  'beechat:chat:composing' => ' is typing.',
+
+		  'beechat:box:minimize' => 'Minimize',
+		  'beechat:box:close' => 'Close',
+		  'beechat:box:showhide' => 'Show/Hide this chat window',
+		  'beechat:enabled' => 'Chat enabled',
+		  'beechat:disabled' => 'Chat disabled',
+		  'beechat:enablechat' => 'Enable chat',
+		  'beechat:disablechat' => 'Disable chat',
+		  'beechat:domain' => 'Chat domain',
+		  'beechat:groupdomain' => 'MUC domain',
+		  'beechat:chatroom' => 'Group chat',
+		  'beechat:dbname' => 'Database name',
+		  'beechat:dbhost' => 'Database host',
+		  'beechat:dbuser' => 'Database user',
+		  'beechat:dbuser' => 'notification:method:xmpp',
+		  'notification:method:xmpp' => 'Xmpp/Jabber',
+		  'beechat:dbpassword' => 'Database password',
+		  'beechat:xmlrpcip' => 'Ejabberd IP'
+		  );
+
+add_translation('en', $en_array);
+
+?>
diff --git a/mod/beechat/languages/es.php b/mod/beechat/languages/es.php
new file mode 100644
index 000000000..78f009ce9
--- /dev/null
+++ b/mod/beechat/languages/es.php
@@ -0,0 +1,43 @@
+<?php
+
+$es_array = array(
+		  'beechat:icons:home' => 'Home',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Disponible',
+		  'beechat:availability:dnd' => 'No molestar',
+		  'beechat:availability:away' => 'Fuera',
+		  'beechat:availability:xa' => 'Fuera bastante tiempo',
+		  'beechat:availability:offline' => 'Desconectado',
+
+		  'beechat:connection:state:offline' => 'Desconectado',
+		  'beechat:connection:state:connecting' => 'Conectando...',
+		  'beechat:connection:state:authenticating' => 'Iniciando...',
+		  'beechat:connection:state:online' => 'Conectado',
+		  'beechat:connection:state:failed' => 'Fallo',
+		  'beechat:connection:state:disconnecting' => 'Desconectando...',
+
+		  'beechat:chat:self' => 'Yo',
+		  'beechat:chat:composing' => ' esta escribiendo.',
+
+		  'beechat:box:minimize' => 'Minimizar',
+		  'beechat:box:close' => 'Cerrar',
+		  'beechat:box:showhide' => 'Mostrar/Ocultar esta ventana de chat',
+		  'beechat:enabled' => 'Chat activado',
+		  'beechat:disabled' => 'Chat desactivado',
+		  'beechat:enablechat' => 'Activar chat',
+		  'beechat:disablechat' => 'Desactivar chat',
+		  'beechat:domain' => 'Dominio Chat',
+		  'beechat:groupdomain' => 'Dominio MUC',
+		  'beechat:chatroom' => 'Chat del grupo',
+		  'beechat:dbname' => 'Database name',
+		  'beechat:dbhost' => 'Database host',
+		  'beechat:dbuser' => 'Database user',
+		  'beechat:dbpassword' => 'Database password',
+		  'beechat:xmlrpcip' => 'Ejabberd IP'
+		  );
+
+add_translation('es', $es_array);
+
+?>
diff --git a/mod/beechat/languages/fr.php b/mod/beechat/languages/fr.php
new file mode 100644
index 000000000..58b0eac3a
--- /dev/null
+++ b/mod/beechat/languages/fr.php
@@ -0,0 +1,32 @@
+<?php
+
+$fr_array = array(
+		  'beechat:icons:home' => 'Accueil',
+
+		  'beechat:contacts:button' => 'Chat',
+
+		  'beechat:availability:available' => 'Disponible',
+		  'beechat:availability:dnd' => 'Ne pas déranger',
+		  'beechat:availability:away' => 'Absent',
+		  'beechat:availability:xa' => 'Absence prolongée',
+		  'beechat:availability:offline' => 'Hors ligne',
+
+		  'beechat:connection:state:offline' => 'Hors ligne',
+		  'beechat:connection:state:connecting' => 'Connexion...',
+		  'beechat:connection:state:authenticating' => 'Authentification...',
+		  'beechat:connection:state:online' => 'En ligne',
+		  'beechat:connection:state:failed' => 'Échec',
+		  'beechat:connection:state:disconnecting' => 'Déconnexion...',
+
+		  'beechat:chat:self' => 'Moi',
+		  'beechat:chat:composing' => ' est en train d\'écrire.',
+
+		  'beechat:box:minimize' => 'Diminuer',
+		  'beechat:box:close' => 'Fermer',
+		  'beechat:box:showhide' => 'Montrer/Cacher cette fenêtre de chat'
+
+		  );
+
+add_translation('fr', $fr_array);
+
+?>
diff --git a/mod/beechat/lib/beechat.php b/mod/beechat/lib/beechat.php
new file mode 100644
index 000000000..bf002d648
--- /dev/null
+++ b/mod/beechat/lib/beechat.php
@@ -0,0 +1,250 @@
+<?
+/*
+	allow_change_subj
+        allow_private_messages
+        allow_query_users
+        allow_user_invites
+        anonymous
+        logging
+        max_users
+        members_by_default
+        members_only
+        moderated
+        password
+        password_protected
+        persistent
+        public
+        public_list
+        title
+
+muc_room_set_affiliation struct[{name, String}, {service, String},
+                                {jid, String}, {affiliation, Affiliation}]  Integer
+
+
+*/
+	//$request = xmlrpc_encode_request('muc_online_rooms', "global", (array('encoding' => 'utf-8')));
+
+
+function ejabberd_xmlrpc_send($request)
+{
+	$context = stream_context_create(array('http' => array(
+	    'method' => "POST",
+	    'header' => "User-Agent: XMLRPC::Client mod_xmlrpc\r\n" .
+			"Content-Type: text/xml\r\n" .
+			"Content-Length: ".strlen($request),
+	    'content' => $request
+	)));
+
+	$file = file_get_contents("http://".elgg_get_plugin_setting("xmlrpcip", "beechat").":4560/RPC2", false, $context);
+
+	$response = xmlrpc_decode($file);
+	if (is_array($response) && xmlrpc_is_fault($response)) {
+	    trigger_error("xmlrpc: $response[faultString] ($response[faultCode])");
+	} else {
+	//    print_r($response);
+	}
+}
+
+function ejabberd_xmlrpc_command($command, $params)
+{
+	//error_log("send xmlrpc: ".$command);
+	$request = xmlrpc_encode_request($command, $params, (array('encoding' => 'utf-8')));
+        return ejabberd_xmlrpc_send($request);
+}
+
+function xmpp_escape($name) {
+	// http://xmpp.org/extensions/xep-0106.html#escaping
+	$name = str_replace(' ', '\\20', $name);
+	$name = str_replace('"', '\\22', $name);
+	$name = str_replace('&', '\\26', $name);
+	$name = str_replace("'", '\\27', $name);
+	$name = str_replace('/', '\\2f', $name);
+	$name = str_replace(';', '\\3a', $name);
+	$name = str_replace('<', '\\3c', $name);
+	$name = str_replace('>', '\\3e', $name);
+	$name = str_replace('@', '\\40', $name);
+	$name = str_replace('\\', '\\5c', $name);
+	return $name;
+}
+
+class EjabberdMucRoom {
+	function __construct($group) {
+		$this->group = $group;
+	}
+	function setOption($name, $value) {
+		$group = $this->group;
+		$param=array("name"=>elgg_get_friendly_title($group->name),
+			"service"=>elgg_get_plugin_setting("groupdomain", "beechat"),
+			"option"=>$name,
+			"value"=>$value);
+		ejabberd_xmlrpc_command('muc_room_change_option', $param);
+	}
+	function addMember($member) {
+		//"outcast" | "none" | "member" | "admin" | "owner"
+		$group = $this->group;
+		if ($member->guid === $group->owner_guid)
+			$affiliation = "owner";
+		elseif ($group->canEdit($member->guid))
+			$affiliation = "admin";
+		else
+			$affiliation = "member";
+		$this->setAffiliation($member, $affiliation);
+	}
+
+	function setAffiliation($member, $affiliation) {
+		$group = $this->group;
+		$param = array("name" => elgg_get_friendly_title($group->name),
+			"service" => elgg_get_plugin_setting("groupdomain", "beechat"),
+			"jid" => xmpp_escape($member->username) . '@' . elgg_get_plugin_setting("domain", "beechat"),
+			"affiliation" => $affiliation);
+		ejabberd_xmlrpc_command('muc_room_set_affiliation', $param);
+		//echo "set affiliation ".$member->username."<br/>";
+	}
+}
+
+function ejabberd_create_group($group)
+{
+	//echo "creating " . $group->name . "<br/>";
+	// create room
+	$param=array("name"=>elgg_get_friendly_title($group->name),
+			"service"=>elgg_get_plugin_setting("groupdomain", "beechat"),
+			"server"=>elgg_get_plugin_setting("domain", "beechat"));
+	ejabberd_xmlrpc_command('create_muc_room', $param);
+
+	// persistency
+
+	$room = new EjabberdMucRoom($group);
+	$room->setOption("persistent", true);
+	$room->setOption("title", $group->name);
+	// open to public?
+	if ($group->isPublicMembership()) {
+		$room->setOption("members_only", false);
+	}
+	else
+		$room->setOption("members_only", true);
+
+	if ($group->access_id === ACCESS_PUBLIC) {
+		$room->setOption("public_list", true);
+		$room->setOption("public", true);
+	}
+	else {
+		$room->setOption("public_list", false);
+		$room->setOption("public", false);
+	}
+	$members = $group->getMembers(0);
+	foreach($members as $member) {
+		$room->addMember($member);
+	}
+	$room->addMember(get_entity($group->owner_guid));
+}
+
+function ejabberd_destroy_group($group)
+{
+	$param=array("name"=>elgg_get_friendly_title($group->name),
+			"service"=>elgg_get_plugin_setting("groupdomain", "beechat"),
+			"server"=>elgg_get_plugin_setting("domain", "beechat"));
+	ejabberd_xmlrpc_command('delete_muc_room', $param);
+}
+
+function ejabberd_getjid($user, $do_external=false)
+{
+	if ($user->foreign || ($do_external && $user->alias && get_plugin_usersetting("usealias", $user->guid,"openid_client"))) {
+		if ($user->foreign)
+			$webid = $user->webid;
+		else
+			$webid = $user->alias;
+		if (strpos($webid, 'http') === 0) {
+			// http or https addresses
+			$hostparts = parse_url($webid);
+                        $urlparts = explode('/', $webid);
+			$host = $hostparts['host'];
+			$username = $urlparts[count($urlparts)-1];
+		} else {
+			if (strpos($webid, ':') > 0) {
+				$webidparts = explode(':', $webid);
+				$hostparts = explode('@',$webidparts[1]);
+			} else {
+				$hostparts = explode('@',$webid);
+			}
+			$username = $hostparts[0];
+			$host = $hostparts[1];
+		}
+	}
+	else {
+		$username = $user->username;
+		$host = elgg_get_plugin_setting("domain", "beechat");
+	}
+	return xmpp_escape($username) . '@' . $host;
+}
+
+function ejabberd_friend_command($user, $friend, $command, $is_out) // $user adds $friend
+{
+	error_log(" * ".$friend->username."->".ejabberd_getjid($user)." ".$command);
+	if ($friend->foreign) {
+         	error_log(" * beechat: friend is foreign!");       
+		return;
+	}
+	$param = array("user" => elgg_get_friendly_title($friend->username),
+			"server" => elgg_get_plugin_setting("domain", "beechat"),
+	 		"from" => ejabberd_getjid($user),
+			"subs" => $command);
+	if ($is_out) {
+		error_log("out");
+		ejabberd_xmlrpc_command('send_roster_request_out', $param);
+	}
+	else {
+		$param['reason'] = 'unknown';
+		ejabberd_xmlrpc_command('send_roster_request_in', $param);
+	}
+}
+
+
+function ejabberd_friend_request($user, $friend) // $user adds $friend
+{
+	error_log('ejabberd_friend_request');
+	ejabberd_friend_command($friend, $user, 'subscribe', true); // out:$user : $friend
+	error_log('ejabberd_friend_requested');
+}
+function ejabberd_friend_accept($user, $friend) // $user adds $friend
+{
+	error_log('ejabberd_friend_accept');
+	ejabberd_friend_command($friend, $user, 'subscribed', true);
+	// following might be needed to have symmetry (and important for remote)
+        if ($friend->foreign) {
+            // following is needed for xmpp nodes
+	    ejabberd_friend_command($friend, $user, 'subscribe', true);
+	}
+	// ejabberd_friend_command($friend, $user, 'subscribed', false);
+	// following can't be faked
+        if (!$friend->foreign)
+	    ejabberd_friend_command($user, $friend, 'subscribed', true);
+	error_log('ejabberd_friend_accepted');
+}
+function ejabberd_friend_deny($user, $friend) // $user adds $friend
+{
+	error_log('ejabberd_friedeny');
+	ejabberd_friend_command($friend, $user, 'unsubscribed', true);
+}
+function ejabberd_friend_remove($user, $friend) // $user adds $friend
+{
+	error_log('ejabberd_friend_remove');
+        if ($friend->foreign) {
+		ejabberd_friend_command($friend, $user, 'unsubscribed', true);
+		ejabberd_friend_command($friend, $user, 'unsubscribed', false);
+	}
+	else
+		ejabberd_friend_command($friend, $user, 'unsubscribed', false);
+        if (!$friend->foreign)
+		ejabberd_friend_command($user, $friend, 'unsubscribed', false);
+	error_log('ejabberd_friend_removed');
+}
+
+/*function ejabberd_send_chat($from, $to, $body) { // $user adds $friend
+	$param = array("body"=>$body,
+			"from"=>$from,
+			"to"=>$to);
+	ejabberd_xmlrpc_command('send_chat_message', $param);
+}*/
+
+
+?>
diff --git a/mod/beechat/manifest.xml b/mod/beechat/manifest.xml
new file mode 100644
index 000000000..ad948fdb4
--- /dev/null
+++ b/mod/beechat/manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Beechat</name>
+	<author>Beechannels + Lorea dev</author>
+	<version>1.8.0</version>
+	<category>widget</category>
+	<description>XMPP chat for Elgg.</description>
+	<website>https://lorea.org</website>
+	<copyright>(C) Beechanels 2009, Lorea 2009-2013</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/beechat/migrate.php b/mod/beechat/migrate.php
new file mode 100644
index 000000000..20bee7973
--- /dev/null
+++ b/mod/beechat/migrate.php
@@ -0,0 +1,88 @@
+<?php
+require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
+
+global $CONFIG;
+admin_gatekeeper();
+
+// It's possible large upgrades could exceed the max execution time.
+set_time_limit(0);
+
+// get ejabberd db settings from elgg.
+$domain = elgg_get_plugin_setting("domain", "beechat");
+$dbname = elgg_get_plugin_setting("dbname", "beechat");
+$dbhost = elgg_get_plugin_setting("dbhost", "beechat");
+$dbuser = elgg_get_plugin_setting("dbuser", "beechat");
+$dbpassword = elgg_get_plugin_setting("dbpassword", "beechat");
+
+$jabber_domain = $domain;
+ 
+$dbh_elgg = null;
+$dbh_ejabberd = null;
+ 
+$dsn_elgg = 'mysql:dbname='.$CONFIG->dbname.';host='.$CONFIG->dbhost;
+$dsn_ejabberd = 'mysql:dbname='.$dbname.';host='.$dbhost;
+
+$dbprefix = $CONFIG->dbprefix;
+ 
+$user = $dbuser;
+$password = $dbpassword;
+ 
+$relationship_type = 'friend';
+
+$counter = 0;
+
+try {
+  $dbh_elgg = new PDO($dsn_elgg, $CONFIG->dbuser, $CONFIG->dbpass);
+ 
+  $sql = 'SELECT guid, name, username FROM '.$dbprefix.'users_entity';
+  $sth = $dbh_elgg->prepare($sql);
+  $sth->execute();
+ 
+  $users = array();
+  while ($row = $sth->fetch(PDO::FETCH_ASSOC))
+    $users[$row['guid']] = $row;
+
+  $sql  = 'SELECT guid_one, guid_two FROM '.$dbprefix.'entity_relationships ';
+  $sql .= 'WHERE relationship = ?;';
+  $sth = $dbh_elgg->prepare($sql);
+ 
+  $sth->bindParam(1, $relationship_type);
+  $sth->execute();
+ 
+  $dbh_ejabberd = new PDO($dsn_ejabberd, $user, $password);
+  $dbh_ejabberd->beginTransaction();
+ 
+  while ($row = $sth->fetch(PDO::FETCH_ASSOC)) {
+    $sql = 'INSERT INTO rosterusers (username, jid, nick, subscription, ask, server, type) VALUES (?, ?, ?, ?, ?, ?, ?);';
+    $sth_ejabberd = $dbh_ejabberd->prepare($sql);
+ 
+ 
+    $username = $users[$row['guid_one']]['username'];
+    $jid = $users[$row['guid_two']]['username'] . '@' . $jabber_domain;
+    $nick = $users[$row['guid_two']]['name'];
+    $subscription = 'B';
+    $ask = 'N';
+    $server = 'N';
+    $type = 'item';
+ 
+    $sth_ejabberd->execute(array($username, $jid, $nick, $subscription, $ask, $server, $type));
+
+    $counter += 1;
+    if ($counter % 1000 == 0) {
+       //error_log( $username . ' registered ' . $jid . ' as a friend in his roster.' . "\n");
+	error_log("importing relations into jabber: $counter");
+    }
+  }
+ 
+  $dbh_ejabberd->commit();
+ 
+  $dbh_elgg = null;
+  $dbh_ejabberd = null;
+} catch (PDOException $e) {
+  if ($dbh_ejabberd != null)
+    $dbh_ejabberd->rollBack();
+  echo $e->getMessage();
+}
+?>
+ 
+
diff --git a/mod/beechat/migrategroups.php b/mod/beechat/migrategroups.php
new file mode 100644
index 000000000..4e3ef3f2b
--- /dev/null
+++ b/mod/beechat/migrategroups.php
@@ -0,0 +1,18 @@
+<?
+require_once(dirname(__FILE__) . "/lib.php");
+
+admin_gatekeeper();
+
+// groups disabled for now
+exit();
+
+$groups = elgg_get_entities(array('types'=>'group','limit'=>0));
+elgg_set_ignore_access(true);
+foreach($groups as $group) {
+	echo "migrating " . $group->name . "<br/>";
+	ejabberd_create_group($group);
+}
+echo "done!";
+elgg_set_ignore_access(false);
+
+?>
diff --git a/mod/beechat/sounds/newmessage.wav b/mod/beechat/sounds/newmessage.wav
new file mode 100644
index 000000000..58cccd0e6
--- /dev/null
+++ b/mod/beechat/sounds/newmessage.wav
diff --git a/mod/beechat/start.php b/mod/beechat/start.php
new file mode 100644
index 000000000..4e4e4bb40
--- /dev/null
+++ b/mod/beechat/start.php
@@ -0,0 +1,184 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+	GLOBAL $CONFIG;
+	
+	function beechat_create_group($event, $object_type, $object)
+	{
+		elgg_load_library('elgg:beechat');
+		ejabberd_create_group($object);
+	}
+
+	function beechat_delete_group($event, $object_type, $object)
+	{
+		elgg_load_library('elgg:beechat');
+		ejabberd_destroy_group($object);
+	}
+
+	function beechat_member_add($event, $object_type, $object)
+        {
+		if ($object->relationship === "member") {
+			elgg_load_library('elgg:beechat');
+			$user = get_entity($object->guid_one);
+			$group = get_entity($object->guid_two);
+			$room = new EjabberdMucRoom($group);
+			$room->addMember($user);
+		}
+        }
+
+	function beechat_member_delete($event, $object_type, $object)
+        {
+		if ($object->relationship === "member") {
+			elgg_load_library('elgg:beechat');
+			$user = get_entity($object->guid_one);
+			$group = get_entity($object->guid_two);
+			$room = new EjabberdMucRoom($group);
+			$room->setAffiliation($user, "none");
+		}
+        }
+
+	function beechat_init()
+	{
+		$pluginspath = elgg_get_plugins_path();
+		elgg_register_library('elgg:beechat', $pluginspath . 'beechat/lib/beechat.php');
+
+		elgg_register_event_handler('pagesetup', 'system', 'beechat_pagesetup');
+		// group actions disabled for now
+		/*if (elgg_get_plugin_setting("groupdomain", "beechat")) {
+			register_elgg_event_handler('create', 'group', 'beechat_create_group');
+			register_elgg_event_handler('delete', 'group', 'beechat_delete_group');
+		}
+		register_elgg_event_handler('create', 'member', 'beechat_member_add');
+		register_elgg_event_handler('delete', 'relationship', 'beechat_member_delete');*/
+
+
+		$actions_path = $pluginspath . 'beechat/actions/';
+		//elgg_register_action('beechat/join_groupchat', $actions_path . 'join_groupchat.php');
+		//elgg_register_action('beechat/leave_groupchat', $actions_path . 'leave_groupchat.php');
+		elgg_register_action('beechat/get_statuses', $actions_path . 'get_statuses.php');
+		elgg_register_action('beechat/get_icons', $actions_path . 'get_icons.php');
+		elgg_register_action('beechat/get_details', $actions_path . 'get_details.php');
+		elgg_register_action('beechat/get_connection', $actions_path . 'get_connection.php');
+		elgg_register_action('beechat/get_state', $actions_path . 'get_state.php');
+		elgg_register_action('beechat/save_state', $actions_path . 'save_state.php');
+
+		/*register_elgg_event_handler('create', 'friendrequest', 'beechat_xmpp_add_friendx');
+		#register_plugin_hook('action', 'friends/add', 'beechat_xmpp_add_friend', 1000);
+		register_plugin_hook('river_update', 'river_update', 'beechat_xmpp_approve_friendx');
+		register_plugin_hook('river_update_foreign', 'river_update', 'beechat_xmpp_approve_friendx');
+		#register_plugin_hook('action', 'friendrequest/approve', 'beechat_xmpp_approve_friend', 1000);
+
+
+		register_plugin_hook('action', 'friendrequest/decline', 'beechat_xmpp_decline_friend', 1000);
+		register_plugin_hook('action', 'friends/remove', 'beechat_xmpp_remove_friend', 1000);*/
+
+		// new friend sync
+		elgg_register_event_handler('delete', 'friend', array('BeechatSync', 'onFriendDelete'));
+	        //elgg_register_event_handler('create', 'friendrequest', array('BeechatSync', 'onFriendCreate'));
+        	elgg_register_event_handler('delete', 'friendrequest', array('BeechatSync', 'onFriendDelete'));
+
+
+	
+		elgg_extend_view('js/initialise_elgg', 'js/json2.js');
+		elgg_extend_view('js/initialise_elgg', 'js/jquery.cookie.min.js');
+		elgg_extend_view('js/initialise_elgg', 'js/jquery.scrollTo-min.js');
+		elgg_extend_view('js/initialise_elgg', 'js/jquery.serialScroll-min.js');
+		elgg_extend_view('js/initialise_elgg', 'js/b64.js');
+		elgg_extend_view('js/initialise_elgg', 'js/sha1.js');
+		elgg_extend_view('js/initialise_elgg', 'js/md5.js');
+		elgg_extend_view('js/initialise_elgg', 'js/strophe.min.js');
+		elgg_extend_view('js/initialise_elgg', 'js/strophe.muc.js');
+		elgg_extend_view('js/initialise_elgg', 'js/jquery.tools.min.js');
+		elgg_extend_view('css', 'beechat/screen.css');
+		elgg_extend_view('js/initialise_elgg', 'beechat/beechat.js');
+		elgg_extend_view('page/elements/head', 'beechat/beechat.userjs');
+		
+		elgg_extend_view('page/elements/foot', 'beechat/beechat');
+
+		$domain = elgg_get_plugin_setting("domain", "beechat");
+		//$group_domain = elgg_get_plugin_setting("groupdomain", "beechat");
+		/*$dbname = elgg_get_plugin_setting("dbname", "beechat");
+		$dbhost = elgg_get_plugin_setting("dbhost", "beechat");
+		$dbuser = elgg_get_plugin_setting("dbuser", "beechat");
+		$dbpassword = elgg_get_plugin_setting("dbpassword", "beechat");*/
+
+		global $CONFIG;
+		$CONFIG->chatsettings['domain'] = $domain;
+		//$CONFIG->chatsettings['groupdomain'] = $group_domain;
+
+		register_notification_handler('xmpp', 'beechat_notifications');
+	//	register_plugin_hook('notify:entity:message','object','beechat_notifications_msg');
+	}
+
+	function beechat_notifications($from, $to, $subject, $topic, $params = array()) {
+		ejabberd_send_chat($to, "<div>".$topic."</div>");
+	}
+
+
+	function beechat_friendly_title($title) {
+		// need this because otherwise seems elgg
+		// gets in some problem trying to call the view
+		//$title = iconv('UTF-8', 'ASCII//TRANSLIT', $title);
+		$title = preg_replace("/[^\w ]/","",$title);
+		$title = str_replace(" ","-",$title);
+		$title = str_replace("--","-",$title);
+		$title = trim($title);
+		$title = strtolower($title);
+		return $title;
+	}
+
+	function beechat_pagesetup()
+	{
+		global $CONFIG;
+		/*if (elgg_get_context() == 'group_profile' && elgg_is_logged_in()) {
+			if (elgg_get_plugin_setting("groupdomain", "beechat")) {
+				$user = elgg_get_logged_in_user_entity();
+				$group = elgg_get_page_owner_entity();
+				if (!$group || !($group instanceof ElggGroup))
+					return;
+				if ($user->chatenabled && elgg_get_plugin_setting("groupdomain", "beechat")) {
+					if ($group->isPublicMembership() || $group->isMember($user)) {
+						$item = new ElggMenuItem('chatroom', elgg_echo('beechat:chatroom'), "javascript:g_beechat_user.joinRoom('".beechat_friendly_title($group->name)."@".$CONFIG->chatsettings['groupdomain']."', '".$group->guid."')");
+						elgg_register_menu_item('page', 'item');
+					}
+				}
+			}
+		}
+		else*/if (elgg_get_context() == 'settings' && elgg_is_logged_in()) {
+			$is_enabled = elgg_get_logged_in_user_entity()->chatenabled;
+			$action = $is_enabled ? 'disable' : 'enable';
+			elgg_register_menu_item('page', array(
+				'name' => 'beechat',
+				'text'=> elgg_echo("beechat:{$action}chat"),
+				'href' => $CONFIG->wwwroot . "mod/beechat/{$action}chat.php",
+			));
+		}
+	}
+
+
+	function ejabberd_send_chat($user, $body) { // $user adds $friend
+		$from = 'notify@'.elgg_get_plugin_setting("domain", "beechat").'/net';
+		if ($user->alias) {
+			
+		}
+		elgg_load_library('elgg:beechat');
+		$to = ejabberd_getjid($user, true);
+                //xmlrpc_set_type(&$body, "base64"); 
+		$param = array("body" => $body,
+				"from" => $from,
+				"to" => $to);
+		ejabberd_xmlrpc_command('send_html_message', $param);
+	}
+
+
+
+
+elgg_register_event_handler('init', 'system', 'beechat_init');
diff --git a/mod/beechat/views/default/beechat/beechat.js.php b/mod/beechat/views/default/beechat/beechat.js.php
new file mode 100644
index 000000000..09f4e8852
--- /dev/null
+++ b/mod/beechat/views/default/beechat/beechat.js.php
@@ -0,0 +1,2498 @@
+/**
+ * Beechat
+ * 
+ * @package beechat
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Beechannels <contact@beechannels.com>
+ * @copyright Beechannels 2007-2010
+ * @link http://beechannels.com/
+ */ 
+
+/** Globals
+ *
+ */
+g_beechat_user = null;
+g_beechat_roster_items = null;
+g_beechat_rooms = new Array();
+
+function debugXMPP(msg) {
+	try {
+		//console.log(msg)
+	}
+		catch (err) {
+	}
+	//$('#layout_footer').html($('#layout_footer').html()+'<br/>'+msg);
+}
+
+/** Class: BeeChat
+ *  An object container for all BeeChat mod functions
+ *
+ */
+BeeChat = {
+    BOSH_SERVICE: '/http-bind/',
+    DOMAIN: '<?php echo $vars['config']->chatsettings['domain'] ?>',
+    RESOURCE: 'beebac',
+    INACTIVITY_PERIOD_LENGTH: 60,
+
+    NS: {
+	CHAT_STATES: 'http://jabber.org/protocol/chatstates'
+    },
+
+    Message: {
+	Types: {
+	    NORMAL: 'normal',
+	    CHAT: 'chat',
+	    GROUPCHAT: 'groupchat',
+	    HEADLINE: 'headline',
+	    ERROR: 'error'
+	},
+
+	ChatStates: {
+	    COMPOSING: 'composing',
+	    PAUSED: 'paused',
+	    ACTIVE: 'active',
+	    INACTIVE: 'inactive',
+	    GONE: 'gone'
+	}
+    },
+
+    IQ: {
+	Types: {
+	    GET: 'get',
+	    RESULT: 'result',
+	    SET: 'set',
+	    ERROR: 'error'
+	}
+    },
+
+    Presence: {
+	Types: {
+	    UNAVAILABLE: 'unavailable',
+	    SUBSCRIBE: 'subscribe',
+	    SUBSCRIBED: 'subscribed',
+	    UNSUBSCRIBE: 'unsubscribe',
+	    UNSUBSCRIBED: 'unsubscribed',
+	    PROBE: 'probe',
+	    ERROR: 'error'
+	},
+
+	ChildElements: {
+	    SHOW: 'show',
+	    STATUS: 'status',
+	    PRIORITY: 'priority'
+	},
+
+	ShowElements: {
+	    CHAT: 'chat',
+	    DND: 'dnd',
+	    AWAY: 'away',
+	    XA: 'xa'
+	}
+    },
+
+    Roster: {
+	DEFAULT_GROUP: 'Contacts'
+    },
+
+
+    Events: {
+	Identifiers: {
+	    UPDATE_CONNECTION_STATE: 0,
+	    UPDATE_ROSTER: 1,
+	    RECV_PRESENCE: 2,
+	    RECV_CHAT_MESSAGE: 3
+	},
+	Messages: {
+	    ConnectionStates: {
+		CONNECTING: "<?php echo elgg_echo('beechat:connection:state:connecting'); ?>",
+		AUTHENTICATING: "<?php echo elgg_echo('beechat:connection:state:authenticating'); ?>",
+		FAILED: "<?php echo elgg_echo('beechat:connection:state:failed'); ?>",
+		DISCONNECTING: "<?php echo elgg_echo('beechat:connection:state:disconnecting'); ?>",
+		OFFLINE: "<?php echo elgg_echo('beechat:connection:state:offline'); ?>",
+		ONLINE: "<?php echo elgg_echo('beechat:connection:state:online'); ?>"
+	    }
+	}
+    }
+};
+
+
+/** Class: BeeChat.Core
+ *  An object container for all BeeChat Core functions
+ *
+ */
+BeeChat.Core = {
+    ReferenceTables: {
+	AvailabilityRates: {
+	    AVAILABLE: 0,
+	    ONLINE: 0,
+	    CHAT: 0,
+	    DND: 1,
+	    AWAY: 2,
+	    XA: 3,
+	    UNAVAILABLE: 10,
+	    OFFLINE: 10
+	}
+    }
+};
+
+
+/** Class: BeeChat.Core.User
+ *  Create a BeeChat.Core.User object
+ *
+ *  Parameters:
+ *    (String) jid - The user's jabber id
+ *
+ *  Returns:
+ *    A new BeeChat.Core.User.
+ */
+BeeChat.Core.User = function(jid)
+{
+    if (!(this instanceof arguments.callee))
+	return new BeeChat.Core.User(jid);
+
+    /** Private members
+     *
+     */
+    var _connection = null;
+    var _attached = false;
+    var _initialized = false;
+    var _jid = null;
+    var _roster = null;
+    var _msgTemp = [];
+    var _funcs = [];
+
+    /** Constructor
+     *
+     */
+    this.init = function(jid)
+    {
+	_jid = jid;
+	_roster = new BeeChat.Core.Roster();
+    }
+
+    /** Accessors
+     *
+     */
+    this.getConnection = function()
+    {
+	return _connection;
+    }
+
+    this.getJid = function()
+    {
+	return _jid;
+    }
+
+    this.getRoster = function()
+    {
+	return _roster;
+    }
+
+    this.isAttached = function()
+    {
+	return _attached;
+    }
+
+    this.isInitialized = function()
+    {
+	return _initialized;
+    }
+
+    /** Mutators
+     *
+     */
+    this.setInitialized = function(isInitialized)
+    {
+	_initialized = isInitialized;
+    }
+
+    /** Function: addObserver
+     *  Add an observer for a specified type of event
+     *
+     *  Parameters:
+     *    (BeeChat.Events.Identifiers) eventType - The type of event to observer
+     *    (Object) pFunc - A function to call when the event will be triggered
+     */
+    this.addObserver = function(eventType, pFunc)
+    {
+	if (jQuery.inArray(pFunc, _funcs) == -1) {
+	    if (!_funcs[eventType])
+		_funcs[eventType] = [];
+	    _funcs[eventType].push(pFunc);
+	}
+    }
+
+    /** Function: removeObserver
+     *  Remove an observer
+     *
+     *  Parameters:
+     *    (Object) pFunc - The registered function
+     */
+    this.removeObserver = function(pFunc)
+    {
+	var index = null;
+
+	for (var key in _funcs) {
+	    if (typeof _funcs[key] != 'object')
+		continue;
+	    if ((index = jQuery.inArray(pFunc, _funcs[key])) != -1)
+		_funcs.splice(index, 1);
+	}
+    }
+
+    /** Function: connect
+     *  Connect the user to the BOSH service
+     *
+     *  Parameters:
+     *    (String) password - The user's password
+     *
+     */
+    this.connect = function(password)
+    {
+	debugXMPP('connect');
+	if (_connection == null)
+	    _connection = new Strophe.Connection(BeeChat.BOSH_SERVICE);
+	_connection.connect(_jid, password, _onConnect);
+    }
+
+    /** Function: attach
+     *  Attach user's connection to an existing XMPP session
+     *
+     *  Parameters:
+     *    (String) sid - The SID of the existing XMPP session
+     *    (String) rid - The RID of the existing XMPP session
+     */
+    this.attach = function(sid, rid)
+    {
+	if (_connection == null) {
+	    _connection = new Strophe.Connection(BeeChat.BOSH_SERVICE);
+	}
+	_connection.attach(_jid, sid, rid, _onConnect);
+	_attached = true;
+	_onConnect(Strophe.Status.CONNECTED);
+    }
+
+    /** Function: disconnect
+     *  Disconnect the user from the BOSH service
+     *
+     */
+    this.disconnect = function()
+    {
+	debugXMPP('disconnect');
+	if (_connection != null) {
+	    _connection.disconnect();
+	    _connection = null;
+	}
+    }
+
+    /** Function: requestSessionPause
+     *  Request a session pause to the server connection manager
+     *
+     */
+    this.requestSessionPause = function()
+    {
+	var req = $build('body', {
+		rid: _connection.rid,
+		sid: _connection.sid,
+		pause: BeeChat.INACTIVITY_PERIOD_LENGTH,
+		xmlns: Strophe.NS.HTTPBIND
+	    });
+
+	_attached = false;
+	_connection.send(req.tree());
+    }
+
+    /** Function: requestRoster
+     *  Request a new roster to the server
+     *
+     */
+    this.requestRoster = function()
+    {
+	var req = $iq({from: _jid, type: BeeChat.IQ.Types.GET})
+	.c('query', {xmlns: Strophe.NS.ROSTER});
+
+	_connection.send(req.tree());
+    }
+
+    /** Function: sendInitialPresence
+     *  Send initial presence to the server in order to signal availability for communications
+     *
+     */
+    this.sendInitialPresence = function()
+    {
+	_connection.send($pres().tree());
+	_initialized = true;
+    }
+
+    /** Function: sendChatMessage
+     *  Send a chat message to the server
+     *
+     *  Parameters:
+     *    (String) addressee - The addressee of the chat message
+     *    (String) msg - The chat message
+     *
+     */
+    this.sendChatMessage = function(addressee, msg, msgtype)
+    {
+	if (msgtype == null)
+		msgtype = BeeChat.Message.Types.CHAT;
+	var req = $msg({
+		type: msgtype,
+		to: addressee,
+		from: _connection.jid
+	    }).c('body').t(msg).up().c(BeeChat.Message.ChatStates.ACTIVE, {xmlns: BeeChat.NS.CHAT_STATES});
+
+	_connection.send(req.tree());
+    }
+
+    /** Function: sendChatStateMessage
+     *  Send a chat state message to the server
+     *
+     *  Parameters:
+     *    (String) addressee - The addressee of the chat state message
+     *    (BeeChat.Message.ChatsState) state - The chat state that will be send
+     *
+     */
+    this.sendChatStateMessage = function(addressee, state)
+    {
+	var req = $msg({
+		type: BeeChat.Message.Types.CHAT,
+		to: addressee,
+		from: _connection.jid
+	    }).c(state, {xmlns: BeeChat.NS.CHAT_STATES});
+
+	_connection.send(req.tree());
+    }
+
+    /** Function: sendPresenceAvailabiliy
+     *  Send a detailed presence stanza to the server
+     *
+     *  Parameters:
+     *    (BeeChat.Presence.ShowElements) availability - The availability status
+     *    (String) details - Detailed status information
+     *
+     */
+    this.sendPresenceAvailability = function(availability, details)
+    {
+	var req = $pres()
+	.c(BeeChat.Presence.ChildElements.SHOW).t(availability).up()
+	.c(BeeChat.Presence.ChildElements.STATUS).t(details).up()
+	.c(BeeChat.Presence.ChildElements.PRIORITY).t('1');
+
+	_connection.send(req.tree());
+    }
+
+    /** PrivateFunction: _fire
+     *  Triggers registered funcs of registered observers for a specified type of event
+     *
+     */
+    function _fire(eventType, data, scope)
+    {
+	if (_funcs[eventType] != undefined) {
+	    for (var i = 0; i < _funcs[eventType].length; i++)
+		_funcs[eventType][i].call((scope || window), data);
+	}
+    }
+    this.joinRoom = function(roomname, room_guid) {
+	    var roomJid = roomname;
+	    _connection['muc'].join(roomJid, BeeChat.UI.Resources.Strings.ChatMessages.SELF, false, false, '');
+	    if (!(roomJid in g_beechat_rooms)) {
+		    g_beechat_rooms[roomJid] = room_guid;
+		    $.ajax({
+			url: BeeChat.UI.addActionTokens('<?php echo $vars['url'] . "action/beechat/join_groupchat?group_guid="; ?>'+room_guid, '&'),
+			async: true   });
+	    }
+
+
+    }
+
+    this.reconnectRooms = function() {
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children().each(function() {
+		if (roomJid in g_beechat_rooms)
+			delete g_beechat_rooms[roomJid];
+		var contactBareJid = $(this).attr('bareJid');
+		var isroom = ($(this).attr('isroom')=='true')?true:false;
+		if (isroom) {
+		    _connection['muc'].join(contactBareJid, BeeChat.UI.Resources.Strings.ChatMessages.SELF, false, false, '');
+		}
+	});
+    }
+
+    this.leaveRoom = function(roomJid) {
+	    if (roomJid in g_beechat_rooms) {
+			$.ajax({
+				url: BeeChat.UI.addActionTokens('<?php echo $vars['url'] . "action/beechat/leave_groupchat?group_guid="; ?>'+g_beechat_rooms[roomJid], '&'),
+				async: true   });
+
+	    }
+	    _connection['muc'].leave(roomJid, BeeChat.UI.Resources.Strings.ChatMessages.SELF, function(){});
+    }
+
+    /** PrivateFunction: _onConnect
+     *  Connection state manager
+     *
+     *  Parameters:
+     *    (Strophe.Status) status - A Strophe connection status constant
+     *
+     */
+    function _onConnect(status)
+    {
+	var msg = null;
+
+	if (status == Strophe.Status.CONNECTING) 
+{
+	    msg = BeeChat.Events.Messages.ConnectionStates.CONNECTING;
+	}
+	else if (status == Strophe.Status.AUTHENTICATING) {
+	    msg = BeeChat.Events.Messages.ConnectionStates.AUTHENTICATING;
+	}
+	else if (status == Strophe.Status.AUTHFAIL)
+	    msg = BeeChat.Events.Messages.ConnectionStates.FAILED;
+ 	else if (status == Strophe.Status.CONNFAIL)
+	    msg = BeeChat.Events.Messages.ConnectionStates.FAILED;
+ 	else if (status == Strophe.Status.DISCONNECTING)
+	    msg = BeeChat.Events.Messages.ConnectionStates.DISCONNECTING;
+ 	else if (status == Strophe.Status.DISCONNECTED)
+	    msg = BeeChat.Events.Messages.ConnectionStates.OFFLINE;
+ 	else if (status == Strophe.Status.CONNECTED) {
+	    msg = BeeChat.Events.Messages.ConnectionStates.ONLINE;
+	    _connection.addHandler(_onIQResult, null, 'iq', BeeChat.IQ.Types.RESULT, null, null);
+	    _connection.addHandler(_onPresence, null, 'presence', null, null, null);
+	    _connection.addHandler(_onMessageChat, null, 'message', BeeChat.Message.Types.CHAT, null, null);
+	    _connection.addHandler(_onMessageChatRoom, null, 'message', BeeChat.Message.Types.GROUPCHAT, null, null);
+	}
+
+	_fire(BeeChat.Events.Identifiers.UPDATE_CONNECTION_STATE, msg);
+    }
+
+    /** PrivateFunction: _onIQResult
+     *  Manage received IQ stanza of 'result' type
+     *
+     *  Parameters:
+     *    (XMLElement) iq - The iq stanza received
+     *
+     */
+    function _onIQResult(iq)
+    {
+	_roster.updateFromIQResult(iq);
+	_fire(BeeChat.Events.Identifiers.UPDATE_ROSTER, _roster.getItems());
+
+	return true;
+    }
+
+    /** PrivateFunction: _onPresence
+     *  Manage received presence stanza
+     *
+     *  Parameters:
+     *    (XMLElement) presence - The presence stanza received
+     *
+     */
+    function _onPresence(presence)
+    {
+	var xquery = presence.getElementsByTagName("x");
+	debugXMPP('_onPresence'+xquery);
+	if (xquery.length > 0)
+	{
+	    //Ignore MUC user protocol
+	    for (var i = 0; i < xquery.length; i++)
+	    {
+		var xmlns = xquery[i].getAttribute("xmlns");
+		if (xmlns && xmlns.match(Strophe.NS.MUC + '#user'))
+		{
+			var contactBareJid = $(presence).attr('from').split('/')[0];
+			var userNick = $(presence).attr('from').split('/')[1];
+			var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+			if ($(presence).attr('type') != 'unavailable') {
+				BeeChat.UI.ChatBoxes.updateRoster(contactBareJid, userNick, presence);
+			}
+			else {
+				if (chatBoxElm.length) {
+					BeeChat.UI.ChatBoxes.updateRoster(contactBareJid, userNick, presence);
+				}
+			}
+			return true;
+		}
+	
+		if (xmlns && xmlns.match(Strophe.NS.MUC))
+		{
+			var contactBareJid = $(presence).attr('from').split('/')[0];
+			var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+
+		        if ($(presence).attr('type') != 'unavailable' && $(presence).attr('type') != 'error') {
+				if (chatBoxElm.length == 0) {
+					    BeeChat.UI.ScrollBoxes.add(contactBareJid);
+				}
+			}
+			return true;
+		}
+
+	     }
+	}
+
+	if (Strophe.getBareJidFromJid($(presence).attr('from')).toLowerCase() != Strophe.getBareJidFromJid(_jid).toLowerCase()) {
+	    _roster.updateFromPresence(presence);
+	}
+	_fire(BeeChat.Events.Identifiers.RECV_PRESENCE, _roster.getOnlineItems());
+	return true;
+    }
+
+    /** PrivateFunction: _onMessageChat
+     *  Manage received message stanza of 'chat' type
+     *
+     *  Parameters:
+     *    (XMLElement) message - The message stanza received
+     *
+     */
+    function _onMessageChatRoom(message)
+    {
+	var roomJid = $(message).attr('from').split('/');
+	
+//	BeeChat.UI.ChatBoxes.updateChatState($(message).attr('from'), message);
+	BeeChat.UI.ChatBoxes.update(roomJid[0], roomJid[1], Strophe.getText($(message).find('body')[0]), true);
+
+        return true;
+    }
+
+    function _onMessageChat(message)
+    {
+	var data = {
+	    contactBareJid: Strophe.getBareJidFromJid($(message).attr('from')),
+	    msg: message
+	};
+	_msgTemp.push(data);
+	//alert("message");
+	if (_initialized == true) {
+	    for (var key in _msgTemp) {
+		if (typeof _msgTemp[key] != 'object')
+		    continue;
+		_fire(BeeChat.Events.Identifiers.RECV_CHAT_MESSAGE, _msgTemp[key]);
+		_msgTemp.shift();
+	    }
+	}
+
+	return true;
+    }
+
+    this.init(jid);
+};
+
+
+/** Constructor: BeeChat.Core.Roster
+ *  Create a BeeChat.Core.Roster object
+ *
+ *  Parameters:
+ *    (Object) items - The roster's items in object notation
+ *
+ *  Returns:
+ *    A new BeeChat.Core.Roster.
+ */
+BeeChat.Core.Roster = function()
+{
+    if (!(this instanceof arguments.callee))
+	return new BeeChat.Core.Roster();
+
+    /** Private members
+     *
+     */
+    _items = null;
+
+
+    /** Constructor
+     *
+     */
+    this.init = function()
+    {
+	_items = (arguments.length > 0) ? arguments[0] : {};
+    }
+
+    /** Accessors
+     *
+     */
+    this.getItems = function()
+    {
+	return _items;
+    }
+
+    /** Mutators
+     *
+     */
+    this.setItems = function(items)
+    {
+	for (var key in items) {
+	    _items[key] = new BeeChat.Core.RosterItem(items[key]);
+		var contactBareJid = items[key].bareJid;
+		var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+		var status = items[key].status;
+                        /*if (status != 'unavailable' && status != 'error') {
+                                if (chatBoxElm.length == 0) {
+                                            BeeChat.UI.ScrollBoxes.add(contactBareJid);
+                                }
+			}*/
+
+	}
+    }
+
+    this.setIcons = function(icons)
+    {
+	if (_items) {
+	    for (var key in icons) {
+	        if (_items[key]) {
+	            _items[key].icon_small = icons[key].small;
+	            _items[key].icon_tiny = icons[key].tiny;
+		}
+	    }
+	}
+    }
+
+    this.setStatuses = function(statuses)
+    {
+	if (_items) {
+	    for (var key in statuses)  {
+		if (_items[key]) {
+		    _items[key].status = statuses[key];
+		}
+	    }
+	}
+    }
+
+    /** Function: updateFromIQResult
+     *  Update the roster items from an IQ result stanza
+     *
+     *  Parameters:
+     *    (XMLElement) iq - The IQ result stanza
+     */
+    this.updateFromIQResult = function(iq)
+    {
+	$(iq).find('item').each(function() {
+		var attr = {
+		    bareJid: Strophe.getBareJidFromJid($(this).attr('jid')).toLowerCase(),
+		    name: $(this).attr('name'),
+		    subscription: $(this).attr('subscription'),
+		    groups: [],
+		    presences: {}
+		};
+
+		$(this).find('group').each(function() {
+			attr['groups'].push($(this).text());
+		    });
+
+		if (attr['groups'].length == 0)
+		    attr['groups'].push(BeeChat.Roster.DEFAULT_GROUP);
+
+		if (!_items[attr.bareJid])
+		    _items[attr.bareJid] = new BeeChat.Core.RosterItem(attr);
+		else {
+		    _items[attr.bareJid].bareJid = attr.bareJid;
+		    _items[attr.bareJid].name = attr.name;
+		    _items[attr.bareJid].subscription = attr.subscription;
+		    _items[attr.bareJid].groups = attr.groups;
+		}
+	    });
+    }
+
+    /** Function: updateFromPresence
+     *  Update the roster items from a presence stanza
+     *
+     *  Parameters:
+     *    (XMLElement) presence - The presence stanza
+     *
+     *  Returns:
+     *    (String) The bare jid of the roster item who updated his presence
+     */
+    this.updateFromPresence = function(presence)
+    {
+	var jid = $(presence).attr('from').toLowerCase();
+	var attr = {
+	    bareJid: Strophe.getBareJidFromJid(jid),
+	    name: null,
+	    subscription: null,
+	    groups: null,
+	    presences: {}
+	};
+
+	attr.presences[jid] = {};
+	attr.presences[jid].type = (!$(presence).attr('type')) ? 'available' : $(presence).attr('type');
+	//alert($(presence).attr('from')+presence.toString());
+	//alert("presencetype"+attr.presences[jid].type);
+
+	if (attr.presences[jid].type == 'available') {
+	    $(presence).children().each(function() {
+		    if (this.tagName == BeeChat.Presence.ChildElements.SHOW)
+			attr.presences[jid].show = $(this).text();
+		    if (this.tagName == BeeChat.Presence.ChildElements.STATUS)
+			attr.presences[jid].status = $(this).text();
+		});
+
+	    if (!attr.presences[jid].show)
+		attr.presences[jid].show = 'chat';
+	} else {
+	    attr.presences[jid].show = 'offline';
+	}
+
+	if (!_items[attr.bareJid])
+	    _items[attr.bareJid] = new BeeChat.Core.RosterItem(attr);
+	else
+	    _items[attr.bareJid].presences[jid] = attr.presences[jid];
+    }
+
+    /** Function: getOnlineItems
+     *
+     *
+     */
+    this.getOnlineItems = function()
+    {
+	var sortedOnlineBareJid = [];
+	var sortedOnlineItems = {};
+
+	for (var key in _items) {
+	    if (typeof _items[key] != 'object')
+		continue;
+
+	    var pres = _items[key].getStrongestPresence();
+
+	    if (pres != null && pres.type == 'available') {
+		sortedOnlineBareJid.push(key);
+	    }
+	}
+
+	if (sortedOnlineBareJid.length > 1) {
+	    sortedOnlineBareJid.sort();
+	    sortedOnlineBareJid.sort(statusSort);
+	}
+
+	for (var key in sortedOnlineBareJid) {
+	    sortedOnlineItems[sortedOnlineBareJid[key]] = _items[sortedOnlineBareJid[key]];
+	}
+
+	return (sortedOnlineItems);
+    }
+
+    /** Function: getSizeOnlineItems
+     *  Return the number of available items
+     *
+     *  Returns:
+     *    (int) The number of available items
+     */
+    this.getSizeOnlineItems = function()
+    {
+	var n = 0;
+
+	for (var key in _items) {
+	    if (typeof _items[key] != 'object')
+		continue;
+
+	    var pres = _items[key].getStrongestPresence();
+
+	    if (pres != null && pres.type == 'available')
+		++n;
+	}
+	return (n);
+    }
+
+    /** Function: getItemsUsernamesAsList
+     *
+     */
+    this.getItemsUsernamesAsList = function()
+    {
+	var data = '';
+
+	for (var key in _items) {
+	    if (typeof _items[key] != 'object')
+		continue;
+	    data = data + Strophe.getBareJidFromJid(key) + ',';
+	  //  data = data + Strophe.getNodeFromJid(key) + ',';
+	}
+
+	return (data);
+    }
+
+    /** PrivateFunction: statusSort
+     *
+     */
+    function statusSort(x, y)
+    {
+	var xPres = _items[x].getStrongestPresence();
+	var yPres = _items[y].getStrongestPresence();
+
+	if (xPres != null && yPres != null)
+	    return (BeeChat.Core.Roster.Utils.comparePresences(xPres, yPres));
+	return (0);
+    }
+
+    this.init();
+};
+
+BeeChat.Core.Roster.Utils = {
+
+    /** Function: comparePresences
+     *  Compare the two presences x and y
+     *
+     *  Parameters:
+     *    (Object) xPres - The x presence in object notation
+     *    (Object) yPres - The y presence in object notation
+     *
+     *  Returns:
+     *    0 if presence are equal, 1 if x > y, -1 if y > x
+     *
+     *  Note:
+     *    Presences are tagged in the following order:
+     *      ONLINE < DND < AWAY < XA < OFFLINE
+     *
+     */
+    comparePresences: function(xPres, yPres)
+    {
+	var xRate = 0;
+	var yRate = 0;
+
+	if (xPres.type == 'unavailable')
+	    xRate += BeeChat.Core.ReferenceTables.AvailabilityRates[xPres.type.toUpperCase()];
+	if (yPres.type == 'unavailable')
+	    yRate += BeeChat.Core.ReferenceTables.AvailabilityRates[yPres.type.toUpperCase()];
+
+	if (xPres.show != null)
+	    xRate += BeeChat.Core.ReferenceTables.AvailabilityRates[xPres.show.toUpperCase()];
+	if (yPres.show != null)
+	    yRate =+ BeeChat.Core.ReferenceTables.AvailabilityRates[yPres.show.toUpperCase()];
+
+	if (xRate > yRate)
+	    return (1);
+	else if (xRate == yRate)
+	    return (0);
+	return (-1);
+    }
+};
+
+
+/** Constructor: BeeChat.Core.RosterItem
+ *  Create a BeeChat.Core.RosterItem object
+ *
+ *  Parameters:
+ *    (Object) attr - The RosterItem's attributes in object notation
+ *
+ *  Returns:
+ *    A new BeeChat.Core.RosterItem.
+ */
+BeeChat.Core.RosterItem = function()
+{
+    this.bareJid = (arguments.length > 0) ? arguments[0].bareJid : null;
+    this.name = (arguments.length > 0) ? arguments[0].name : null;
+    this.subscription = (arguments.length > 0) ? arguments[0].subscription : null;
+    this.groups = (arguments.length > 0) ? arguments[0].groups : null;
+    this.presences = (arguments.length > 0) ? arguments[0].presences : null;
+    this.icon_small = (arguments.length > 0) ? arguments[0].icon_small : null;
+    this.icon_tiny = (arguments.length > 0) ? arguments[0].icon_tiny : null;
+    this.status = (arguments.length > 0) ? arguments[0].status : null;
+};
+BeeChat.Core.RosterItem.prototype = {
+    /** Function: getStrongestPresence
+     *  Return the strongest presence of the RosterItem
+     *
+     */
+    getStrongestPresence: function()
+    {
+	var res = null;
+
+	for (var key in this.presences) {
+	    if (typeof this.presences[key] != 'object')
+		continue;
+	    if (res == null)
+		res = this.presences[key];
+	    else
+		if (BeeChat.Core.Roster.Utils.comparePresences(this.presences[key], res) == -1)
+		    res = this.presences[key];
+	}
+	return (res);
+    }
+};
+
+
+/** Class: BeeChat.UI
+ *  An object container for all BeeChat UI functions
+ *
+ */
+BeeChat.UI = {
+    HAS_FOCUS: true,
+
+    Resources: {
+	Paths: {
+	    ICONS: '<?php echo $vars['config']->url; ?>mod/beechat/graphics/icons/',
+	    MEMBER_PROFILE: '<?php echo $vars['url']; ?>profile/'
+	},
+
+	Sounds: {
+	    NEW_MESSAGE: 'beechat_sounds_new_message'
+	},
+
+	/*
+	Cookies: {
+	    DOMAIN: 'beechannels.com',
+	    FILENAME_CONN: 'beechat_conn'
+	},
+	*/
+
+	Emoticons: {
+    	    FILENAME_SMILE: 'emoticon_smile.png',
+	    FILENAME_UNHAPPY: 'emoticon_unhappy.png',
+	    FILENAME_GRIN: 'emoticon_grin.png',
+	    FILENAME_EVILGRIN: 'emoticon_evilgrin.png',
+	    FILENAME_SURPRISED: 'emoticon_surprised.png',
+	    FILENAME_TONGUE: 'emoticon_tongue.png',
+	    FILENAME_WINK: 'emoticon_wink.png'
+	},
+
+	Strings: {
+	    Availability: {
+		AVAILABLE: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		CHAT: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		ONLINE: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		DND: "<?php echo elgg_echo('beechat:availability:dnd'); ?>",
+		AWAY: "<?php echo elgg_echo('beechat:availability:away'); ?>",
+		XA:"<?php echo elgg_echo('beechat:availability:xa'); ?>",
+		OFFLINE: "<?php echo elgg_echo('beechat:availability:offline'); ?>"
+	    },
+
+	    Contacts: {
+		BUTTON: "<?php echo elgg_echo('beechat:contacts:button'); ?>"
+	    },
+
+	    ChatMessages: {
+		SELF: "<?php echo $_SESSION['user']->name; ?>",
+		COMPOSING: "<?php echo elgg_echo('beechat:chat:composing'); ?>"
+	    },
+
+	    Box: {
+		MINIMIZE: "<?php echo elgg_echo('beechat:box:minimize'); ?>",
+		CLOSE: "<?php echo elgg_echo('beechat:box:close'); ?>",
+		SHOWHIDE: "<?php echo elgg_echo('beechat:box:showhide'); ?>"
+	    }
+	},
+
+	StyleClasses: {
+	    Availability: {
+		Left: {
+		    ONLINE: 'beechat_left_availability_chat',
+		    DND: 'beechat_left_availability_dnd',
+		    AWAY: 'beechat_left_availability_away',
+		    XA: 'beechat_left_availability_xa',
+		    OFFLINE: 'beechat_left_availability_offline',
+		    ROOM: 'beechat_left_availability_room'
+		},
+
+		Right: {
+		    ONLINE: 'beechat_right_availability_chat',
+		    DND: 'beechat_right_availability_dnd',
+		    AWAY: 'beechat_right_availability_away',
+		    XA: 'beechat_right_availability_xa',
+		    OFFLINE: 'beechat_right_availability_offline',
+		    ROOM: 'beechat_right_availability_room'
+		},
+
+		Control: {
+		    UP: 'beechat_availability_switcher_control_up',
+		    DOWN: 'beechat_availability_switcher_control_down'
+		}
+	    },
+
+	    ChatBox: {
+		MAIN: 'beechat_chatbox',
+		MAINROOM: 'beechat_chatbox_room',
+		TOP: 'beechat_chatbox_top',
+		SUBTOP: 'beechat_chatbox_subtop',
+		TOP_ICON: 'beechat_chatbox_top_icon',
+		TOP_CONTROLS: 'beechat_chatbox_top_controls',
+		CONTENT: 'beechat_chatbox_content',
+		INPUT: 'beechat_chatbox_input',
+		BOTTOM: 'beechat_chatbox_bottom',
+		CONTROL: 'beechat_chatbox_control',
+		STATE: 'beechat_chatbox_state',
+		MESSAGE: 'beechat_chatbox_message',
+		MESSAGE_SENDER: 'beechat_chatbox_message_sender',
+		MESSAGE_DATE: 'beechat_chatbox_message_date',
+		CHATROOM: 'beechat_chatbox_chatroom',
+		ROOMROSTER: 'beechat_chatbox_roomroster',
+		ROSTER_ITEM: 'beechat_chatbox_roomrosteritem'
+	    },
+
+	    ScrollBox: {
+		SELECTED: 'beechat_scrollbox_selected'
+	    },
+
+	    BOX_CONTROL: 'beechat_box_control',
+	    LABEL: 'beechat_label',
+	    UNREAD_COUNT: 'beechat_unread_count'
+	},
+
+	Elements: {
+	    ID_DIV_BAR: 'beechat',
+	    ID_DIV_BAR_CENTER: 'beechat_center',
+	    ID_DIV_BAR_RIGHT: 'beechat_right',
+
+	    ID_TOOLTIP_TRIGGER: 'beechat_tooltip_trigger',
+
+	    ID_SPAN_CONTACTS_BUTTON: 'beechat_contacts_button',
+	    ID_SPAN_CLOSE_BOX: 'beechat_box_control_close',
+
+	    ID_DIV_CONTACTS: 'beechat_contacts',
+	    ID_DIV_CONTACTS_CONTROLS: 'beechat_contacts_controls',
+	    ID_SPAN_CONTACTS_CONTROL_MINIMIZE: 'beechat_contacts_control_minimize',
+	    ID_DIV_CONTACTS_CONTENT: 'beechat_contacts_content',
+	    ID_UL_CONTACTS_LIST: 'beechat_contacts_list',
+
+	    ID_DIV_AVAILABILITY_SWITCHER: 'beechat_availability_switcher',
+	    ID_SPAN_AVAILABILITY_SWITCHER_CONTROL: 'beechat_availability_switcher_control',
+	    ID_SPAN_CURRENT_AVAILABILITY: 'beechat_current_availability',
+	    ID_UL_AVAILABILITY_SWITCHER_LIST: 'beechat_availability_switcher_list',
+
+	    ID_DIV_CHATBOXES: 'beechat_chatboxes',
+
+	    ID_DIV_SCROLLBOXES: 'beechat_scrollboxes'
+	}
+    },
+
+
+    /** Function: initialize
+     *  Initialize the BeeChat UI
+     *
+     */
+    initialize: function(ts, token)
+    {
+	this.ts = ts;
+	this.token = token;
+	$('#' + BeeChat.UI.Resources.Elements.ID_TOOLTIP_TRIGGER).tooltip({
+		offset: [-3, 8],
+		effect: 'fade'
+	    });
+
+	$('#accountlinks').find('li').filter('[class=last]').bind('click', function() {
+		if (g_beechat_user != null)
+		    g_beechat_user.disconnect();
+	    });
+
+	BeeChat.UI.AvailabilitySwitcher.initialize(BeeChat.Presence.ShowElements.CHAT);
+	BeeChat.UI.ContactsList.initialize();
+	BeeChat.UI.ScrollBoxes.initialize();
+	BeeChat.UI.loadConnection();
+    },
+
+    /** Function: getUserDetails
+     *  Retrieve user details
+     *
+     *  Returns:
+     *    User details in object notation.
+     *
+     */
+    addActionTokens: function(url_string, sep)
+    {
+	if (sep == null)
+		sep = "?";
+	return url_string + sep + "__elgg_ts="+this.ts + "&__elgg_token=" + this.token;
+    },
+
+    getUserDetails: function(cb_func)
+    {
+	var json = null;
+	var self = this;
+
+	$.ajax({
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_details"; ?>'),
+		async: true,
+		dataType: 'json',
+		success: function(data) {
+			cb_func(data);
+		}
+	    });
+
+	return (json);
+    },
+
+    /** Function: connect
+     *  Create the user and connect him to the BOSH service
+     *
+     *  Parameters:
+     *    (Object) conn - Running connection informations in object notation
+     */
+    connect: function()
+    {
+	var conn = (arguments.length > 0) ? arguments[0] : null;
+	var userDetails = {
+	    jid: (conn != null) ? conn.jid : null,
+	    password: null
+	}
+	var self = this;
+	//alert("connect");
+	if (conn == null || (conn != null && conn.attached)) {
+	    BeeChat.UI.getUserDetails(function(retrievedUserDetails) {
+	    	userDetails.jid = retrievedUserDetails.username + '@' + BeeChat.DOMAIN + '/' + BeeChat.RESOURCE;
+	    	userDetails.password = retrievedUserDetails.password;
+		self.connect_end(conn, userDetails)
+	    });
+	}
+	else
+	        this.connect_end(conn, userDetails)
+    },
+
+    connect_end: function(conn, userDetails)
+    {
+	g_beechat_user = new BeeChat.Core.User(userDetails.jid);
+	g_beechat_user.addObserver(BeeChat.Events.Identifiers.UPDATE_CONNECTION_STATE, BeeChat.UI.updateConnectionStatus);
+	g_beechat_user.addObserver(BeeChat.Events.Identifiers.UPDATE_ROSTER, BeeChat.UI.onRosterUpdate);
+	g_beechat_user.addObserver(BeeChat.Events.Identifiers.RECV_PRESENCE, BeeChat.UI.ContactsList.update);
+	g_beechat_user.addObserver(BeeChat.Events.Identifiers.RECV_CHAT_MESSAGE, BeeChat.UI.onChatMessage);
+
+	if (conn == null || (conn != null && conn.attached))
+	    g_beechat_user.connect(userDetails.password);
+	else
+	    g_beechat_user.attach(conn.sid, conn.rid);
+    },
+ 
+    /** Function: disconnect
+     *  Terminate the user's XMPP session
+     *
+     */
+    disconnect: function()
+    {
+	g_beechat_user.disconnect();
+    },
+
+    /** Function: updateConnectionStatus
+     *
+     */
+    updateConnectionStatus: function(connStatusMsg)
+    {
+	BeeChat.UI.ContactsList.updateButtonText(connStatusMsg);
+	if (connStatusMsg == BeeChat.Events.Messages.ConnectionStates.ONLINE) {
+	    if (!g_beechat_user.isAttached()) {
+		debugXMPP("not attached");
+		BeeChat.UI.ScrollBoxes.isOpened = true;
+		g_beechat_user.requestRoster();
+		g_beechat_user.reconnectRooms();
+		//BeeChat.UI.ContactsList.toggleDisplay();
+		$('#' + BeeChat.UI.Resources.Elements.ID_UL_CONTACTS_LIST).show();
+		$('.' + BeeChat.UI.Resources.StyleClasses.ChatBox.INPUT + '>textarea').removeAttr('disabled');
+		for (room_idx in g_user_rooms) {
+			var room = g_user_rooms[room_idx];
+			var chatBox = BeeChat.UI.ChatBoxes.getChatBoxElm(room[0]);
+			if (chatBox.length == 0) {
+				g_beechat_user.joinRoom(room[0], room[1])
+			}
+		}
+
+	    }
+	    if (g_beechat_user.isAttached()) {
+		debugXMPP("attached");
+		BeeChat.UI.loadState();
+	    }
+
+
+	    $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).attr('class', 'online');
+	    BeeChat.UI.saveConnection();
+	}
+	else if (connStatusMsg == BeeChat.Events.Messages.ConnectionStates.OFFLINE) {
+	    var contactsBoxElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CONTACTS);
+
+	    if (!contactsBoxElm.is(':hidden'))
+		BeeChat.UI.ContactsList.toggleDisplay();
+
+	    $('#' + BeeChat.UI.Resources.Elements.ID_UL_CONTACTS_LIST).empty();
+	    BeeChat.UI.AvailabilitySwitcher.initialize(BeeChat.Presence.ShowElements.CHAT);
+	    BeeChat.UI.ContactsList.updateButtonText(BeeChat.UI.Resources.Strings.Contacts.BUTTON);
+	    $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).attr('class', 'offline');
+	    $('.' + BeeChat.UI.Resources.StyleClasses.ChatBox.INPUT + '>textarea').attr('disabled', 'true');
+	    $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children().hide();
+	    $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES).find('ul').children()
+	    .attr('class', BeeChat.UI.Resources.StyleClasses.LABEL + ' ' + BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[BeeChat.Presence.Types.UNAVAILABLE.toUpperCase()]);
+	    g_beechat_user = null;
+	    BeeChat.UI.saveConnection();
+	}
+    },
+
+    /** Function: saveConnection
+     *  Save connection informations (non sensible data) in $_SESSION.
+     *
+     */
+    saveConnection: function()
+    {
+	var conn = null;
+
+	if (g_beechat_user != null) {
+	    var userConn = g_beechat_user.getConnection();
+
+	    conn = {
+		'jid': userConn.jid,
+		'sid': userConn.sid,
+		'rid': userConn.rid,
+		'attached': g_beechat_user.isAttached()
+	    };
+	}
+	var self = this;
+
+	$.ajax({
+		type: 'POST',
+		async: false,
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/save_state"; ?>'),
+		data: { beechat_conn: JSON.stringify(conn) }
+	    });
+
+	/*
+	$.cookie(BeeChat.UI.Resources.Cookies.FILENAME_CONN, null);
+	$.cookie(BeeChat.UI.Resources.Cookies.FILENAME_CONN, JSON.stringify(conn), {path: '/', domain: BeeChat.UI.Resources.Cookies.DOMAIN});
+	*/
+    },
+
+    /** Function: loadConnection
+     *  Check if a connection already exists. In the case that a connection exists,
+     *  this function triggers the connection process.
+     *
+     */
+    loadConnection: function()
+    {
+	var self = this;
+	$.ajax({
+		type: 'GET',
+		async: false,
+		cache: false,
+		dataType: 'json',
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_connection"; ?>'),
+		success: function(conn) {
+		    if (conn != null) {
+			if (conn.attached)
+			    BeeChat.UI.connect();
+			else
+			    BeeChat.UI.connect(conn);
+			}
+		},
+		error: function() {
+		    BeeChat.UI.connect();
+		}
+	    });
+
+	/*
+	var conn = JSON.parse($.cookie(BeeChat.UI.Resources.Cookies.FILENAME_CONN));
+
+	if (conn != null) {
+	    if (conn.attached)
+		BeeChat.UI.connect();
+	    else
+		BeeChat.UI.connect(conn);
+	} else
+	    BeeChat.UI.connect();
+	*/
+    },
+
+    /** Function: saveState
+     *  Save app state in $_SESSION
+     *
+     */
+    saveState: function()
+    {
+	var self = this;
+	var currentAvailabilityClass = $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CURRENT_AVAILABILITY).attr('class');
+	var currentAvailability = currentAvailabilityClass.substr(currentAvailabilityClass.lastIndexOf('_') + 1);
+
+	var data = {
+	    availability: currentAvailability,
+	    contacts: g_beechat_roster_items,
+	    chats: {},
+	    contacts_list: {
+		minimized: $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CONTACTS).is(':hidden')
+	    }
+	};
+
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children().each(function() {
+		var contactBareJid = $(this).attr('bareJid');
+		//var contactBareJid = $(this).data('bareJid');
+		var isroom = ($(this).attr('isroom') == 'true');
+		if (isroom)
+			var roster = $(this).find('div').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.ROOMROSTER + ']');
+		var html_content = $(this).children().filter('[bareJid="' + contactBareJid + '"]').html();
+		data.chats[contactBareJid] = {
+		    'html_content': escape(html_content),
+		    'roster_content': isroom?escape(roster.html()):'',
+		    'isroom': $(this).attr('isroom'),
+		    'group_guid': (contactBareJid in g_beechat_rooms)?g_beechat_rooms[contactBareJid]:0,
+		    'minimized': $(this).is(':hidden'),
+		    'unread': BeeChat.UI.UnreadCountBox.getElm(contactBareJid).text()
+		};
+	    });
+
+	$.ajax({
+		type: 'POST',
+		async: false,
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/save_state"; ?>'),
+		data: { beechat_state: JSON.stringify(data) }
+	    });
+    },
+
+    /** Function: loadState
+     *  Load app state from $_SESSION
+     *
+     */
+    loadState: function()
+    {
+	var self = this;
+	$.ajax({
+		type: 'GET',
+		async: true,
+		cache: false,
+		dataType: 'json',
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_state"; ?>'),
+		error: function() {
+			alert('error getting state');
+		},
+		success: function(json) {
+		    debugXMPP('loadState');
+		    BeeChat.UI.AvailabilitySwitcher.initialize(json.availability);
+
+		    if (!json.contacts_list.minimized) {
+			$('#' + BeeChat.UI.Resources.Elements.ID_DIV_CONTACTS).show();
+			BeeChat.UI.ContactsList.showedStyle();
+		    }
+
+		    g_beechat_user.getRoster().setItems(json.contacts);
+                    self.loadRosterItemsIcons(false);
+                    self.loadRosterItemsStatuses(false);
+		    g_beechat_roster_items = g_beechat_user.getRoster().getItems();
+		    BeeChat.UI.ContactsList.update(g_beechat_user.getRoster().getOnlineItems())
+		    g_beechat_user.setInitialized(true);
+
+		    var scrollBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES);
+		    var scrollBoxElmToShow = null;
+
+		    // Load saved chats
+		    for (var key in json.chats) {
+			var isroom = (json.chats[key].isroom == 'true');
+			if (isroom)
+				BeeChat.UI.ScrollBoxes.addRoom(key);
+			else
+				BeeChat.UI.ScrollBoxes.add(key);
+
+			var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(key);
+			debugXMPP("load chat " + key);
+			chatBoxElm.hide();
+
+			if (!json.chats[key].minimized) {
+			    scrollBoxElmToShow = BeeChat.UI.ScrollBoxes.getScrollBoxElm(key);
+			}
+
+			var chatBoxContentElm = chatBoxElm.children().filter('[bareJid="' + key + '"]');
+
+			chatBoxContentElm.append(unescape(json.chats[key].html_content));
+			chatBoxContentElm.attr({scrollTop: chatBoxContentElm.attr('scrollHeight')});
+			if (isroom) {
+				g_beechat_rooms[key] = json.chats[key].room_guid;
+				var rosterElm = chatBoxElm.find('div').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.ROOMROSTER + ']');
+				rosterElm.append(unescape(json.chats[key].roster_content));
+			}
+
+			BeeChat.UI.UnreadCountBox.update(key, json.chats[key].unread);
+		    }
+		    if (scrollBoxElmToShow != null)
+			scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElmToShow));
+		    else
+			scrollBoxesElm.trigger('goto', 0);
+
+		   // g_beechat_user.sendPresenceAvailability(json.availability, '');
+		    BeeChat.UI.ScrollBoxes.isInitialized = true;
+		    BeeChat.UI.ScrollBoxes.isOpened = true;
+
+			  for (var key in json.chats) {
+					if (json.chats[key].minimized) {
+						BeeChat.UI.ChatBoxes.getChatBoxElm(key).hide();
+						BeeChat.UI.ScrollBoxes.unselect(key);
+					}
+					else {
+						BeeChat.UI.ChatBoxes.getChatBoxElm(key).show();
+						BeeChat.UI.ScrollBoxes.select(key);
+					}
+				}
+		    for (room_idx in g_user_rooms) {
+			var room = g_user_rooms[room_idx];
+			var chatBox = BeeChat.UI.ChatBoxes.getChatBoxElm(room[0]);
+			if (chatBox.length == 0) {
+				g_beechat_user.joinRoom(room[0], room[1])
+			}
+		    }
+
+		},
+		error: function() {
+		    BeeChat.UI.ContactsList.initialize();
+		}
+	    });
+    },
+
+    /** Function: loadRosterItemsIcons
+     *
+     */
+    loadRosterItemsIcons: function(is_async, cb)
+    {
+	var data = g_beechat_user.getRoster().getItemsUsernamesAsList();
+	var self = this;
+
+	$.ajax({
+		type: 'POST',
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_icons"; ?>'),
+		async: is_async,
+		cache: false,
+		data: {'beechat_roster_items_usernames': data},
+		dataType: 'json',
+		success: function(json) {
+		    g_beechat_user.getRoster().setIcons(json);
+		    g_beechat_roster_items = g_beechat_user.getRoster().getItems();
+
+		    BeeChat.UI.ContactsList.update(g_beechat_user.getRoster().getOnlineItems())
+		    if (cb) {
+			cb();
+		    }
+		}
+	    });
+    },
+
+    /** Function: loadRosterItemsStatuses
+     *
+     */
+    loadRosterItemsStatuses: function(is_async, cb)
+    {
+	var data = g_beechat_user.getRoster().getItemsUsernamesAsList();
+//alert(data)
+	var self = this;
+	$.ajax({
+		type: 'POST',
+		url: self.addActionTokens('<?php echo $vars['url'] . "action/beechat/get_statuses"; ?>'),
+		async: true, // force
+		cache: false,
+		data: {'beechat_roster_items_usernames': data},
+		dataType: 'json',
+		success: function(json) {
+		    g_beechat_user.getRoster().setStatuses(json);
+		    g_beechat_roster_items = g_beechat_user.getRoster().getItems();
+		    BeeChat.UI.ContactsList.update(g_beechat_user.getRoster().getOnlineItems())
+		    if (cb) {
+			cb();
+		    }
+		}
+	    });
+    },
+
+    /** Function: onRosterUpdate
+     *  Notified by core on a roster update
+     *
+     */
+    onRosterUpdate: function(rosterItems)
+    {
+	g_beechat_roster_items = rosterItems;
+		//alert("get roster");
+	if (!g_beechat_user.isInitialized()) {
+		//alert("load roster" + rosterItems.length);
+	    BeeChat.UI.loadRosterItemsStatuses(true,
+				function() { BeeChat.UI.loadRosterItemsIcons(true,
+				function() {g_beechat_user.sendInitialPresence();}); });
+	    //BeeChat.UI.loadRosterItemsIcons(false);
+	    //g_beechat_user.sendInitialPresence();
+	}
+    },
+
+    /** Function: onChatMessage
+     *
+     */
+    onChatMessage: function(data)
+    {
+	if ($(data.msg).find('body').length == 0) {
+	    BeeChat.UI.ChatBoxes.updateChatState(data.contactBareJid, data.msg);
+	}
+	else {
+	    BeeChat.UI.ChatBoxes.update(data.contactBareJid, BeeChat.UI.Utils.getContactName(data.contactBareJid), Strophe.getText($(data.msg).find('body')[0]));
+	}
+    }
+};
+
+
+/** Class: BeeChat.UI.Resources.ReferenceTables
+ *  An object container for all reference tables
+ *
+ */
+BeeChat.UI.Resources.ReferenceTables = {
+    Styles: {
+	Availability: {
+	    Left: {
+		AVAILABLE: BeeChat.UI.Resources.StyleClasses.Availability.Left.ONLINE,
+		CHAT: BeeChat.UI.Resources.StyleClasses.Availability.Left.ONLINE,
+		DND: BeeChat.UI.Resources.StyleClasses.Availability.Left.DND,
+		AWAY: BeeChat.UI.Resources.StyleClasses.Availability.Left.AWAY,
+		XA: BeeChat.UI.Resources.StyleClasses.Availability.Left.XA,
+		UNAVAILABLE: BeeChat.UI.Resources.StyleClasses.Availability.Left.OFFLINE,
+		OFFLINE: BeeChat.UI.Resources.StyleClasses.Availability.Left.OFFLINE,
+		ROOM: BeeChat.UI.Resources.StyleClasses.Availability.Left.ROOM
+	    },
+
+	    Right: {
+		AVAILABLE: BeeChat.UI.Resources.StyleClasses.Availability.Right.ONLINE,
+		CHAT: BeeChat.UI.Resources.StyleClasses.Availability.Right.ONLINE,
+		DND: BeeChat.UI.Resources.StyleClasses.Availability.Right.DND,
+		AWAY: BeeChat.UI.Resources.StyleClasses.Availability.Right.AWAY,
+		XA: BeeChat.UI.Resources.StyleClasses.Availability.Right.XA,
+		UNAVAILABLE: BeeChat.UI.Resources.StyleClasses.Availability.Right.OFFLINE,
+		OFFLINE: BeeChat.UI.Resources.StyleClasses.Availability.Right.OFFLINE,
+		ROOM: BeeChat.UI.Resources.StyleClasses.Availability.Right.ROOM
+	    }
+	}
+    }
+};
+
+
+/** Class: BeeChat.UI.ContactsList
+ *  An object container for all ContactsList functions
+ *
+ */
+BeeChat.UI.ContactsList = {
+    /** Function: initialize
+     *  Initialize the contacts list by binding elements
+     *
+     */
+    initialize: function()
+    {
+		$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_CONTROL_MINIMIZE).unbind('click').bind('click', BeeChat.UI.ContactsList.toggleDisplay);
+	$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).unbind('click').bind('click', function() {
+		if (g_beechat_user == null)
+		    BeeChat.UI.connect();
+		else
+		    BeeChat.UI.ContactsList.toggleDisplay();
+	    });
+    },
+
+    /** Function: update
+     *  Update the contacts list content
+     *
+     *  Parameters:
+     *    (Object)(BeeChat.Core.RosterItem) onlineRosterItems - A hash of RosterItems in object notation
+     *
+     */
+    update: function(onlineRosterItems)
+    {
+	var contactsListElm = $('#' + BeeChat.UI.Resources.Elements.ID_UL_CONTACTS_LIST);
+
+	contactsListElm.children().each(function() {
+		var contactBareJid = $(this).attr('bareJid');
+
+		if (g_beechat_roster_items != null) {
+		    if ($.inArray(contactBareJid, onlineRosterItems) == -1) {
+			BeeChat.UI.ScrollBoxes.updateAvailability(contactBareJid);
+			$(this).remove();
+		    }
+		}
+	    });
+
+	for (var key in onlineRosterItems) {
+	    if (typeof onlineRosterItems[key] != 'object')
+		continue;
+
+	    var contactElm = contactsListElm.find('li').filter('[bareJid="' + key + '"]');
+
+	    if (contactElm.length == 0) {
+		contactElm = $('<li></li>')
+		    .attr('bareJid', key)
+		    .append($('<img />')
+			    .attr('src', g_beechat_roster_items[key].icon_tiny))
+		    .append(BeeChat.UI.Utils.getTruncatedContactName(key, 25))
+		    .appendTo(contactsListElm)
+		    .bind('click', function() {
+					if (!BeeChat.UI.ChatBoxes.getChatBoxElm($(this).attr('bareJid')).is(':visible')) {
+						BeeChat.UI.ContactsList.toggleDisplay();
+					}
+
+			    BeeChat.UI.ScrollBoxes.add($(this).attr('bareJid'), false, true);
+			});
+	    }
+
+	    BeeChat.UI.ContactsList.updateContactAvailability(contactElm, key);
+	}
+
+	BeeChat.UI.ContactsList.updateButtonText(BeeChat.UI.Resources.Strings.Contacts.BUTTON + ' (<strong>' + g_beechat_user.getRoster().getSizeOnlineItems() + '</strong>)');
+    },
+
+    /** Function: updateContactAvailability
+     *
+     */
+    updateContactAvailability: function(contactElm, contactBareJid)
+    {
+	// Update from contactsList
+	contactElm.attr('class', BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Right[g_beechat_roster_items[contactBareJid].getStrongestPresence().show.toUpperCase()]);
+
+	// Update from scrollBoxes
+	BeeChat.UI.ScrollBoxes.updateAvailability(contactBareJid);
+    },
+
+    /** Function: updateButtonText
+     *
+     *
+     */
+    updateButtonText: function(msg)
+    {
+	$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).html(msg);
+    },
+
+    /** Function: toggleDisplay
+     *  Toggle the contacts box display (hide | show)
+     *
+     */
+    toggleDisplay: function()
+    {
+	var contactsBoxElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CONTACTS);
+
+	contactsBoxElm.toggle();
+	if (contactsBoxElm.is(':hidden')) {
+	    BeeChat.UI.ContactsList.hiddenStyle();
+	} else {
+	    BeeChat.UI.ContactsList.showedStyle();
+	}
+	$('#' + BeeChat.UI.Resources.Elements.ID_UL_AVAILABILITY_SWITCHER_LIST).hide();
+    },
+
+    /** Function: hiddenStyle
+     *
+     */
+    hiddenStyle: function()
+    {
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_BAR_RIGHT).css({'border-left': '1px solid #BBBBBB', 'border-right': '1px solid #BBBBBB', 'background-color': '#DDDDDD'});
+    },
+
+    /** Function: showedStyle
+     *
+     */
+    showedStyle: function()
+    {
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_BAR_RIGHT).css({'border-left': '1px solid #666666', 'border-right': '1px solid #666666', 'background-color': 'white'});
+    }
+};
+
+
+/** Class: BeeChat.UI.AvailabilitySwitcher
+ *  An object container for all AvailabilitySwitcher functions
+ *
+ */
+BeeChat.UI.AvailabilitySwitcher = {
+    /** Function: initialize
+     *  Initialize the availability switcher by setting the current user's availability
+     *  and binding actions
+     *
+     */
+    initialize: function(availability)
+    {
+		$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CURRENT_AVAILABILITY).unbind('click').bind('click', BeeChat.UI.AvailabilitySwitcher.toggleListDisplay);
+		
+		$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_AVAILABILITY_SWITCHER_CONTROL).unbind('click').bind('click', BeeChat.UI.AvailabilitySwitcher.toggleListDisplay);
+		
+		$('#' + BeeChat.UI.Resources.Elements.ID_UL_AVAILABILITY_SWITCHER_LIST).find('li').each(function() {
+		$(this).unbind('click').bind('click', function() {
+			var availabilityClass = $(this).attr('class');
+			var availability = availabilityClass.substr(availabilityClass.lastIndexOf('_') + 1);
+
+			if (availability == 'offline')
+			    BeeChat.UI.disconnect();
+			else {
+			    g_beechat_user.sendPresenceAvailability(availability, '');
+			    BeeChat.UI.AvailabilitySwitcher.update(availability);
+			    $('#' + BeeChat.UI.Resources.Elements.ID_UL_AVAILABILITY_SWITCHER_LIST).hide('slow');
+			    $('#' + BeeChat.UI.Resources.Elements.ID_UL_CONTACTS_LIST).show('slow');
+			}
+		    });
+	    });
+	BeeChat.UI.AvailabilitySwitcher.update(availability);
+    },
+
+    /** Function: update
+     *  Update the current user's availability
+     *
+     *  Parameters:
+     *    (BeeChat.Presence.ShowElements) availability - The current user's availability
+     */
+    update: function(availability)
+    {
+	var upperCasedAvailability = availability.toUpperCase();
+
+	$('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CURRENT_AVAILABILITY)
+	.attr('class', BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[upperCasedAvailability])
+	.text(BeeChat.UI.Resources.Strings.Availability[upperCasedAvailability]);
+
+	if (availability == 'chat')
+	    $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).attr('class', 'online');
+	else if (availability == 'xa' || availability == 'away')
+	    $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).attr('class', 'away');
+	else if (availability == 'dnd')
+	    $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_CONTACTS_BUTTON).attr('class', 'dnd');
+    },
+
+    /** Function: switchControlClass
+     *
+     */
+    switchControlClass: function()
+    {
+	var switcherControlElm = $('#' + BeeChat.UI.Resources.Elements.ID_SPAN_AVAILABILITY_SWITCHER_CONTROL);
+
+	if (switcherControlElm.attr('class') == BeeChat.UI.Resources.StyleClasses.Availability.Control.UP)
+	    switcherControlElm.attr('class', BeeChat.UI.Resources.StyleClasses.Availability.Control.DOWN);
+	else
+	    switcherControlElm.attr('class', BeeChat.UI.Resources.StyleClasses.Availability.Control.UP);
+    },
+
+    /** Function: toggleListDisplay
+     *
+     */
+    toggleListDisplay: function()
+    {
+		BeeChat.UI.AvailabilitySwitcher.switchControlClass();
+		$('#' + BeeChat.UI.Resources.Elements.ID_UL_CONTACTS_LIST).toggle('slow');
+		$('#' + BeeChat.UI.Resources.Elements.ID_UL_AVAILABILITY_SWITCHER_LIST).toggle('slow');
+    }
+};
+
+
+/** Class: BeeChat.UI.ScrollBoxes
+ *  An object container for all ScrollBoxes related functions
+ *
+ */
+BeeChat.UI.ScrollBoxes = {
+    isInitialized: false,
+    isOpened: false,
+
+    /** Function: initialize
+     *
+     */
+    initialize: function() {
+	var $prev = $('#beechat_center_prev'),
+	$next = $('#beechat_center_next');
+
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_BAR_CENTER).serialScroll({
+		    target: '#beechat_scrollboxes',
+		    items: 'li',
+		    prev: '#beechat_center_prev',
+		    next: '#beechat_center_next',
+		    axys: 'x',
+		    start: 2,
+		    step: -1,
+		    interval: 0,
+		    duration: 0,
+		    cycle: false,
+		    force: true,
+		    jump: true,
+		    lock: true,
+		    lazy: true,
+		    constant: true,
+
+		    onBefore: function(e, elem, $pane, $items, pos) {
+		      $next.add($prev).hide();
+		      $prev.add($next).hide();
+		      if (pos != 0) {
+			  $next.show();
+		      }
+		      if (pos != $items.length - 1)
+			  $prev.show();
+		    },
+
+		    onAfter: function(elem) {
+		    	BeeChat.UI.ChatBoxes.takeStand($(elem).attr('bareJid'));
+			BeeChat.UI.ScrollBoxes.isInitialized = true;
+		    }
+	    });
+    },
+
+    /** Function: add
+     *  Add a scrollbox to the scrollboxes bar
+     *
+     */
+    addRoom: function(contactBareJid)
+    {
+	debugXMPP('addRoom' + contactBareJid);
+        BeeChat.UI.ScrollBoxes.add(contactBareJid, true);
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+	scrollBoxElm.attr('class', BeeChat.UI.Resources.StyleClasses.Availability.Left.ROOM);
+    },
+
+    add: function(contactBareJid, isroom)
+    {
+	var scrollBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES);
+	var scrollBoxElm = scrollBoxesElm.find('ul').children().filter('[bareJid="' + contactBareJid + '"]');
+	debugXMPP("add " + contactBareJid + " " + scrollBoxElm.length);
+	if (scrollBoxElm.length == 0) {
+	    var availClass = null;
+            var pres = null;
+            if (g_beechat_roster_items != undefined)
+	        pres = g_beechat_roster_items[contactBareJid] != null ? g_beechat_roster_items[contactBareJid].getStrongestPresence() : null;
+
+	    if (pres != null)
+		availClass = BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[pres.show.toUpperCase()];
+	    else
+		availClass = BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[BeeChat.Presence.Types.UNAVAILABLE.toUpperCase()];
+
+	    scrollBoxElm = $('<li></li>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.LABEL + ' ' + availClass)
+		.attr('bareJid', contactBareJid)
+		.attr('isroom', isroom?'true':'false')
+		.attr('title', BeeChat.UI.Resources.Strings.Box.SHOWHIDE)
+		.text(BeeChat.UI.Utils.getTruncatedContactName(contactBareJid, 11))
+		.append($('<span></span>')
+			.attr('class', BeeChat.UI.Resources.StyleClasses.BOX_CONTROL)
+			.attr('id', BeeChat.UI.Resources.Elements.ID_SPAN_CLOSE_BOX)
+			.text('X')
+			.attr('title', BeeChat.UI.Resources.Strings.Box.CLOSE)
+			.bind('click', function() {
+				if (isroom)
+					g_beechat_user.leaveRoom(contactBareJid);
+				var scrollBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES);
+
+				BeeChat.UI.ChatBoxes.remove($(this).parent().attr('bareJid'));
+				BeeChat.UI.UnreadCountBox.remove($(this).parent().attr('bareJid'));
+				scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(BeeChat.UI.ScrollBoxes.getSelectedScrollBoxElm()));
+	    			BeeChat.UI.saveState();
+			    }));
+
+	    scrollBoxesElm.find('ul').append(scrollBoxElm);
+	    BeeChat.UI.ChatBoxes.add(contactBareJid, isroom);
+	    if (arguments.length == 3 && arguments[2])
+		scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElm));
+	    if (!isroom) {
+		    BeeChat.UI.loadRosterItemsStatuses(true, function () { BeeChat.UI.loadRosterItemsIcons(true); });
+	    }
+	} else {
+	    scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElm));
+	}
+    },
+
+    /** Function: remove
+     *
+     */
+    remove: function(contactBareJid)
+    {
+	BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid).remove();
+    },
+
+    /** Function: unselect
+     *
+     */
+    unselect: function(contactBareJid)
+    {
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+	scrollBoxElm.attr('class', (scrollBoxElm.attr('class')).replace(/beechat_scrollbox_selected/, ''));
+    },
+
+    /** Function: select
+     *
+     */
+    select: function(contactBareJid)
+    {
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+	var scrollBoxElmClasses = scrollBoxElm.attr('class');
+
+	if (scrollBoxElmClasses.search(/beechat_scrollbox_selected/) == -1)
+	    scrollBoxElm.attr('class', scrollBoxElmClasses + ' ' + BeeChat.UI.Resources.StyleClasses.ScrollBox.SELECTED);
+    },
+
+    /** Function: updateAvailability
+     *
+     */
+    updateAvailability: function(contactBareJid)
+    {
+	var pres = g_beechat_roster_items[contactBareJid].getStrongestPresence();
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+	var scrollBoxElmClasses = scrollBoxElm.attr('class');
+	var updatedAvailability = null;
+
+	if (pres != null)
+	    updatedAvailability = BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[pres.show.toUpperCase()];
+	else
+	    updatedAvailability = BeeChat.UI.Resources.ReferenceTables.Styles.Availability.Left[BeeChat.Presence.Types.UNAVAILABLE.toUpperCase()];
+
+	if (scrollBoxElmClasses == undefined || scrollBoxElmClasses.search(/(beechat_left_availability_)/g) == -1) {
+	    scrollBoxElm.attr('class', BeeChat.UI.Resources.StyleClasses.LABEL + ' ' + updatedAvailability);
+	} else {
+	    updatedAvailability = updatedAvailability.replace(/(beechat_left_availability)/g, '');
+
+	    scrollBoxElmClasses = scrollBoxElmClasses.replace(/(_chat)/g, updatedAvailability);
+	    scrollBoxElmClasses = scrollBoxElmClasses.replace(/(_dnd)/g, updatedAvailability);
+	    scrollBoxElmClasses = scrollBoxElmClasses.replace(/(_away)/g, updatedAvailability);
+	    scrollBoxElmClasses = scrollBoxElmClasses.replace(/(_xa)/g, updatedAvailability);
+	    scrollBoxElmClasses = scrollBoxElmClasses.replace(/(_offline)/g, updatedAvailability);
+
+	    scrollBoxElm.attr('class', scrollBoxElmClasses);
+	}
+    },
+
+    /** Function: getSelectedScrollBoxElm
+     *
+     */
+    getSelectedScrollBoxElm: function(contactBareJid)
+    {
+	var elm = undefined;
+
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES).find('ul').children().each(function() {
+		if ($(this).attr('class').search(/beechat_scrollbox_selected/) != -1)
+		    elm = $(this);
+	    });
+
+	return (elm);
+    },
+
+    /** Function: getScrollBoxElm
+     *
+     */
+    getScrollBoxElm: function(contactBareJid)
+    {
+	return $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES).find('ul').children().filter('[bareJid="' + contactBareJid + '"]');
+    }
+};
+
+
+/** Class: BeeChat.UI.ChatBoxes
+ *  An object container for all ChatBoxes related functions
+ *
+ */
+BeeChat.UI.ChatBoxes = {
+    dateLastComposing: {},
+    lastTimedPauses: {},
+
+    /** Function: add
+     *
+     */
+    add: function(contactBareJid, isroom)
+    {
+	var chatBoxes = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES);
+
+	if ($(chatBoxes).children().filter('[bareJid="' + contactBareJid + '"]').length == 0) {
+		debugXMPP("create chatbox " + contactBareJid);
+	    var chatBox = $('<div></div>')
+		.attr('class', isroom ? BeeChat.UI.Resources.StyleClasses.ChatBox.MAIN : BeeChat.UI.Resources.StyleClasses.ChatBox.MAIN)
+		.attr('bareJid', contactBareJid)
+		.attr('isroom', isroom ? 'true' : 'false')
+		.hide();
+
+	    var chatBoxTop = $('<div></div>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.TOP);
+	    if (!isroom)
+		chatBoxTop.append($('<a></a>')
+			.attr('href', BeeChat.UI.Resources.Paths.MEMBER_PROFILE + Strophe.getNodeFromJid(contactBareJid))
+			.append($('<img />')
+				.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.TOP_ICON)
+				.attr('src', (g_beechat_roster_items != null && g_beechat_roster_items[contactBareJid] != undefined)?g_beechat_roster_items[contactBareJid].icon_small:'')))
+	    chatBoxTop.append($('<span></span>')
+			.attr('class', BeeChat.UI.Resources.StyleClasses.LABEL)
+			.html(isroom?BeeChat.UI.Utils.getTruncatedContactName(contactBareJid).split('@')[0]:'<a href="' + BeeChat.UI.Resources.Paths.MEMBER_PROFILE + Strophe.getNodeFromJid(contactBareJid) + '">' + BeeChat.UI.Utils.getTruncatedContactName(contactBareJid) + '</a>'))
+		.append($('<div></div>')
+			.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.TOP_CONTROLS)
+			.append($('<span></span>')
+				.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.CONTROL)
+				.attr('id', BeeChat.UI.Resources.Elements.ID_SPAN_CLOSE_BOX)
+				.text('X')
+				.attr('title', BeeChat.UI.Resources.Strings.Box.CLOSE)
+				.bind('click', function() {
+					if (isroom)
+						g_beechat_user.leaveRoom(contactBareJid);
+					BeeChat.UI.ChatBoxes.remove(contactBareJid);
+				    }))
+			.append($('<span></span>')
+				.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.CONTROL)
+				.attr('id', BeeChat.UI.Resources.Elements.ID_SPAN_CLOSE_BOX)
+				.text('_')
+				.attr('title', BeeChat.UI.Resources.Strings.Box.MINIMIZE)
+				.css({'font-size': '1.6em', 'position': 'relative', 'line-height': '4px'})
+				.bind('click', function() {
+					BeeChat.UI.ScrollBoxes.unselect($(this).parent().parent().parent().attr('bareJid'));
+					$(this).parent().parent().parent().fadeOut('slow');
+				    })));
+
+	    var chatBoxSubTop = $('<div></div>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.SUBTOP)
+		.append(BeeChat.UI.Utils.getTruncatedContactStatus((g_beechat_roster_items != null && g_beechat_roster_items[contactBareJid] != undefined && g_beechat_roster_items[contactBareJid].status != undefined) ? g_beechat_roster_items[contactBareJid].status : ''));
+
+	    var chatBoxContent = $('<div></div>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.CONTENT)
+		.attr('bareJid', contactBareJid);
+
+	    var chatBoxInput = $('<div></div>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.INPUT)
+		.append($('<textarea></textarea>')
+			.attr('bareJid', contactBareJid)
+			.bind('keypress', isroom?BeeChat.UI.ChatBoxes.onRoomTypingMessage:BeeChat.UI.ChatBoxes.onTypingMessage)
+			.bind('keyup', function(e) {
+				if ((e.keyCode ? e.keyCode : e.which) == 13)
+				    $(this).attr('value', '');
+			    }));
+
+	    var chatBoxBottom = $('<div></div>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.BOTTOM)
+		.append($('<span></span>')
+			.append($('<span></span>')));
+	    if (isroom) {
+		//var chatBoxBox = $('<div></div>')
+		//	.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.CHATROOM)
+		var chatBoxRoster = $('<div></div>')
+			.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.ROOMROSTER)
+	        //chatBoxBox.append(chatBoxTop).append(chatBoxSubTop).append(chatBoxContent).append(chatBoxInput).append(chatBoxBottom)
+		//chatBox.append(chatBoxRoster).append(chatBoxBox).appendTo(chatBoxes);
+	        chatBox.append(chatBoxTop).append(chatBoxSubTop).append(chatBoxContent).append(chatBoxInput).append(chatBoxBottom).append(chatBoxRoster).appendTo(chatBoxes);
+	    }
+	    else
+	        chatBox.append(chatBoxTop).append(chatBoxSubTop).append(chatBoxContent).append(chatBoxInput).append(chatBoxBottom).appendTo(chatBoxes);
+	}
+	else {
+		/*debugXMPP("show chatbox " + contactBareJid);
+		var chatBox = $(chatBoxes).children().filter('[bareJid="' + contactBareJid + '"]');
+		chatBox.show();*/
+	}
+    },
+
+    /** Function: takeStand
+     *
+     */
+    takeStand: function(contactBareJid)
+    {
+	var chatBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children();
+	var chatBoxElm = chatBoxesElm.filter('[bareJid="' + contactBareJid + '"]');
+	var chatBoxContentElm = chatBoxElm.children().filter('[bareJid="' + contactBareJid + '"]');
+	var scrollBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES);
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+
+	if (!chatBoxElm.is(':hidden')) {
+	    BeeChat.UI.ScrollBoxes.unselect(contactBareJid);
+	    chatBoxElm.hide();
+	} else {
+	    // Hide all other chatboxes
+	    $.each(chatBoxesElm.filter('[bareJid!="' + contactBareJid + '"]'), function() {
+		    BeeChat.UI.ScrollBoxes.unselect($(this).attr('bareJid'));
+		    $(this).hide();
+		});
+	    // Add selected scrollbox style
+	    BeeChat.UI.ScrollBoxes.select(contactBareJid);
+	    // Remove UnreadCountBox
+	    BeeChat.UI.UnreadCountBox.remove(contactBareJid);
+	    // Position the chatbox
+	    var pos = scrollBoxElm.position().left - (chatBoxElm.width() - scrollBoxElm.width()) + 24;
+	    chatBoxElm.css({'left': pos});
+	    if (!BeeChat.UI.ScrollBoxes.isOpened)
+			return;
+	    chatBoxElm.show().css({'left': pos});
+	    // Scroll down the content of the chatbox
+	    chatBoxContentElm.attr({scrollTop: chatBoxContentElm.attr('scrollHeight')});
+	    // Focus textarea
+	    chatBoxElm.children().filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.INPUT + ']').find('textarea').focus();
+	}
+    },
+
+    /** Function: onTypingMessage
+     *
+     */
+    onRoomTypingMessage: function(e) {
+        BeeChat.UI.ChatBoxes._onTypingMessage(e, true, this);
+    },
+
+    onTypingMessage: function(e) {
+        BeeChat.UI.ChatBoxes._onTypingMessage(e, false, this);
+    },
+
+    _onTypingMessage: function(e, isroom, self)
+    {
+	var keyCode = (e.keyCode) ? e.keyCode : e.which;
+	var contactBareJid = $(self).attr('bareJid');
+
+	var msgtype = BeeChat.Message.Types.CHAT;
+	if (isroom)
+ 		msgtype = BeeChat.Message.Types.GROUPCHAT;
+
+	if (keyCode == 13 && $(self).val() != '') {
+	    g_beechat_user.sendChatMessage(contactBareJid, jQuery.trim($(self).val()), msgtype);
+	    if (!isroom)
+	    	BeeChat.UI.ChatBoxes.update(contactBareJid, BeeChat.UI.Utils.truncateString(BeeChat.UI.Resources.Strings.ChatMessages.SELF, 24), $(self).val(), isroom);
+	    clearTimeout(BeeChat.UI.ChatBoxes.lastTimedPauses[contactBareJid]);
+	    BeeChat.UI.ChatBoxes.lastTimedPauses[contactBareJid] = null;
+	} else {
+	    var nowTime = new Date().getTime();
+
+	    if (BeeChat.UI.ChatBoxes.dateLastComposing[contactBareJid] == null || BeeChat.UI.ChatBoxes.dateLastComposing[contactBareJid] + 2000 < nowTime) {
+		BeeChat.UI.ChatBoxes.dateLastComposing[contactBareJid] = nowTime;
+		g_beechat_user.sendChatStateMessage(contactBareJid, BeeChat.Message.ChatStates.COMPOSING);
+	    }
+
+	    clearTimeout(BeeChat.UI.ChatBoxes.lastTimedPauses[contactBareJid]);
+	    BeeChat.UI.ChatBoxes.lastTimedPauses[contactBareJid] = setTimeout('g_beechat_user.sendChatStateMessage(\'' + contactBareJid + '\', BeeChat.Message.ChatStates.PAUSED)', 2000);
+
+	    var chatBoxTextAreaElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid).children().filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.INPUT + ']').find('textarea');
+	    chatBoxTextAreaElm.attr({scrollTop: chatBoxTextAreaElm.attr('scrollHeight')});
+	}
+    },
+
+    updateRoster: function(contactBareJid, fromName, presence)
+    {
+	var availability = $(presence).attr('type');
+	var item = $(presence).find('item');
+	var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+
+	if (chatBoxElm.length == 0) {
+	    	BeeChat.UI.ScrollBoxes.add(contactBareJid);
+	    	//BeeChat.UI.ScrollBoxes.addRoom(contactBareJid);
+	    chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+	}
+
+	//var chatBoxContentElm = chatBoxElm.children().filter('[bareJid="' + contactBareJid + '"]');
+
+	var roster = chatBoxElm.find('div').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.ROOMROSTER + ']');
+	if (availability == 'unavailable') {
+		roster.find('div').filter('[contactName='+fromName+']').remove();
+	}
+	else {
+		var hasName = roster.find('div').filter('[contactName='+fromName+']');
+		if (hasName.length == 0) {
+			roster.append($('<div>' + fromName + '</div>')
+				.attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.ROSTER_ITEM)
+				.attr('title', item.attr('affiliation') + '/' + item.attr('role'))
+				.attr('contactName', fromName))
+		}
+	}
+    },
+
+
+    /** Function: update
+     *
+     */
+    update: function(contactBareJid, fromName, msg, isroom)
+    {
+	var chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+	debugXMPP(contactBareJid + " " + msg + " " + chatBoxElm.length);
+	if (chatBoxElm.length == 0) {
+            if (isroom) {
+	    	BeeChat.UI.ScrollBoxes.addRoom(contactBareJid);
+	        BeeChat.UI.ChatBoxes.show(contactBareJid);
+	        BeeChat.UI.ChatBoxes.takeStand(contactBareJid);
+		}
+	    else {
+	    	BeeChat.UI.ScrollBoxes.add(contactBareJid,false,true);
+	//        BeeChat.UI.ChatBoxes.show(contactBareJid);
+	        BeeChat.UI.ChatBoxes.takeStand(contactBareJid);
+		}
+	    chatBoxElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid);
+	}
+
+	var chatBoxContentElm = chatBoxElm.children().filter('[bareJid="' + contactBareJid + '"]');
+
+	chatBoxContentElm.find('p').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.STATE + ']').remove();
+
+	var chatBoxLastMessageElm = $(chatBoxContentElm).find('div').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.MESSAGE + ']').filter(':last');
+
+	if (chatBoxLastMessageElm && chatBoxLastMessageElm.find('span').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.MESSAGE_SENDER + ']').text() == fromName) {
+	    chatBoxLastMessageElm.append('<p>' + BeeChat.UI.Utils.getPrintableChatMessage(msg) + '</p>');
+	} else {
+	    chatBoxContentElm.append($('<div></div>')
+				     .attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.MESSAGE)
+				     .append($('<span></span>')
+					     .attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.MESSAGE_SENDER)
+					     .text(fromName))
+				     .append($('<span></span>')
+					     .attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.MESSAGE_DATE)
+					     .text(BeeChat.UI.Utils.getNowFormattedTime()))
+				     .append('<p>' + BeeChat.UI.Utils.getPrintableChatMessage(msg) + '</p>'));
+	}
+
+	chatBoxContentElm.attr({scrollTop: chatBoxContentElm.attr('scrollHeight')});
+
+	var scrollBoxesElm = $('#' + BeeChat.UI.Resources.Elements.ID_DIV_SCROLLBOXES);
+	var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid);
+
+	if (BeeChat.UI.ScrollBoxes.isInitialized == false) {
+	    scrollBoxesElm.trigger('goto', scrollBoxesElm.find('ul').children().index(scrollBoxElm));
+	}
+
+        debugXMPP("about to update number!");
+	if (chatBoxElm.is(':hidden')) {
+	    debugXMPP("update number!");
+	    BeeChat.UI.UnreadCountBox.update(contactBareJid);
+//	    if (BeeChat.UI.HAS_FOCUS)
+//		document.getElementById(BeeChat.UI.Resources.Sounds.NEW_MESSAGE).Play();
+	}
+
+//	if (!BeeChat.UI.HAS_FOCUS)
+//	    document.getElementById(BeeChat.UI.Resources.Sounds.NEW_MESSAGE).Play();
+    },
+
+    /** Function: updateChatState
+     *
+     */
+    updateChatState: function(contactBareJid, msg)
+    {
+	var chatBoxContentElm = BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid).children().filter('[bareJid="' + contactBareJid + '"]');
+
+	$(msg).children().each(function() {
+		if (this.tagName == BeeChat.Message.ChatStates.COMPOSING) {
+		    if (chatBoxContentElm.find('p').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.STATE + ']').length == 0) {
+			$('<p></p>')
+			    .attr('class', BeeChat.UI.Resources.StyleClasses.ChatBox.STATE)
+			    .html(BeeChat.UI.Utils.getContactName(contactBareJid) + BeeChat.UI.Resources.Strings.ChatMessages.COMPOSING + "</br />")
+			    .appendTo(chatBoxContentElm);
+		    }
+		} else if (this.tagName == BeeChat.Message.ChatStates.PAUSED) {
+		    chatBoxContentElm.find('p').filter('[class=' + BeeChat.UI.Resources.StyleClasses.ChatBox.STATE + ']').remove();
+		}
+	    });
+	chatBoxContentElm.attr({scrollTop: chatBoxContentElm.attr('scrollHeight')});
+    },
+
+    /** Function: remove
+     *
+     */
+    remove: function(contactBareJid)
+    {
+	BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid).remove();
+	BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid).remove();
+    },
+
+    /** Function: show
+     *
+     */
+    show: function(contactBareJid)
+    {
+	BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid).show();
+    },
+
+    /** Function: hide
+     *
+     */
+    hide: function(contactBareJid)
+    {
+	BeeChat.UI.ChatBoxes.getChatBoxElm(contactBareJid).hide();
+    },
+
+    /** Function: getChatBoxElm
+     *
+     */
+    getChatBoxElm: function(contactBareJid)
+    {
+	return $('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children().filter('[bareJid="' + contactBareJid + '"]');
+    }
+};
+
+BeeChat.UI.UnreadCountBox = {
+    /** Function: add
+     *
+     */
+    add: function(contactBareJid)
+    {
+	BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid)
+	.append($('<span></span>')
+		.attr('class', BeeChat.UI.Resources.StyleClasses.UNREAD_COUNT));
+    },
+
+    /** Function: remove
+     *
+     */
+    remove: function(contactBareJid)
+    {
+	BeeChat.UI.UnreadCountBox.getElm(contactBareJid).remove();
+    },
+
+    /** Function: update
+     *
+     */
+    update: function(contactBareJid)
+    {
+	if (arguments.length > 1 && !arguments[1])
+	    return;
+
+	var unreadCountBoxElm = BeeChat.UI.UnreadCountBox.getElm(contactBareJid);
+	if (unreadCountBoxElm.length == 0) {
+	    BeeChat.UI.UnreadCountBox.add(contactBareJid);
+	    unreadCountBoxElm = BeeChat.UI.UnreadCountBox.getElm(contactBareJid);
+	}
+	if (arguments.length == 1) {
+	    var unreadCount = unreadCountBoxElm.text();
+	    unreadCountBoxElm.text(++unreadCount);
+	} else
+	    unreadCountBoxElm.text(arguments[1]);
+    },
+
+    /** Function: getElm
+     *
+     */
+    getElm: function(contactBareJid)
+    {
+	return BeeChat.UI.ScrollBoxes.getScrollBoxElm(contactBareJid).find('span').filter('[class=' + BeeChat.UI.Resources.StyleClasses.UNREAD_COUNT +' ]');
+    }
+};
+
+/** Class: BeeChat.UI.Utils
+ *  An object container for all UI utilities functions
+ *
+ */
+BeeChat.UI.Utils = {
+    /** Function: getTruncatedContactName
+     *
+     */
+    getTruncatedContactName: function(bareJid)
+    {
+	return (BeeChat.UI.Utils.truncateString(BeeChat.UI.Utils.getContactName(bareJid), (arguments.length == 2) ? arguments[1] : 21));
+    },
+
+    /** Function: getTruncatedContactStatus
+     *
+     */
+    getTruncatedContactStatus: function(contactStatus)
+    {
+	return (BeeChat.UI.Utils.truncateString(contactStatus, (arguments.length == 2 ? arguments[1] : 50)));
+    },
+
+    /** Function: getContactName
+     *
+     */
+    getContactName: function(bareJid)
+    {
+	var contactName = bareJid;
+
+	if (g_beechat_roster_items != null && g_beechat_roster_items[bareJid])
+	    contactName = g_beechat_roster_items[bareJid].name;
+	// no contact name so we show bareJid
+	if (!contactName || contactName == '')
+		contactName = bareJid;
+
+	return (contactName);
+    },
+
+    /** Function: getPrintableChatMessage
+     *
+     */
+    getPrintableChatMessage: function(msg)
+    {
+	var val = new String;
+	val = $('<div>' + msg + '</div>');
+	msg = val.text();
+
+	msg = jQuery.trim(msg);
+	msg = BeeChat.UI.Utils.replaceLinks(msg);
+	msg = BeeChat.UI.Utils.replaceSmileys(msg);
+
+	return msg;
+    },
+
+    /** Function: getNowFormattedTime
+     *
+     */
+    getNowFormattedTime: function()
+    {
+	var date = new Date();
+
+	var hours = date.getHours();
+	var minutes = date.getMinutes();
+	var seconds = date.getSeconds();
+
+	if (hours < 10)
+	    hours = '0' + hours;
+	if (minutes < 10)
+	    minutes = '0' + minutes;
+	if (seconds < 10)
+	    seconds = '0' + seconds;
+	return (hours + ':' + minutes + ':' + seconds);
+    },
+
+
+    /** Function: replaceSmileys
+     *  Replace smileys founded in a string to beautiful icons :)
+     *
+     *  Parameters:
+     *    (String) str - The string containing smileys
+     *
+     */
+    replaceSmileys: function(str)
+    {
+	str = str.replace(/(;\))/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_WINK + '" />');
+	str = str.replace(/(:\))/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_SMILE + '" />');
+	str = str.replace(/(:\()/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_UNHAPPY + '" />');
+	str = str.replace(/(:D)/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_GRIN + '" />');
+	str = str.replace(/(:o)/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_SURPRISED + '" />');
+	str = str.replace(/(xD)/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_EVILGRIN + '" />');
+	str = str.replace(/(:p)/gi, '<img src="' + BeeChat.UI.Resources.Paths.ICONS + BeeChat.UI.Resources.Emoticons.FILENAME_TONGUE + '" />');
+
+	return (str);
+    },
+
+    /** Function: replaceLinks
+     *  Transform links founded in a string to clickable links
+     *
+     *  Parameters:
+     *    (String) str - The string where will be replaced links
+     */
+    replaceLinks: function(str)
+    {
+	var xpr =
+	/((ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi;
+
+	return (str.replace(xpr, '<a href="$1" target="_blank">$1</a>'));
+    },
+
+    /** Function: truncateString
+     *  Truncate a string at a specified length
+     *
+     *  Parameters:
+     *    (String) str - The string to truncate
+     *    (int) len - The maximum length of str
+     */
+    truncateString: function(str, len)
+    {
+	if (str != null && str.length > len)
+	    return ((str.substr(0, len) + '...'));
+	return (str);
+    }
+};
+
+
+/** Executed when the DOM is ready
+ *
+ */
+function init_beechat(ts, token) {
+	if (typeof document.body.style.maxHeight === "undefined") { // IE6
+	    return;
+	}
+
+	BeeChat.UI.initialize(ts, token);
+}
+
+/** Window resizing
+ *
+ */
+$(window).resize(function() {
+	if (typeof document.body.style.maxHeight === "undefined") { // IE6
+	    return;
+	}
+
+	$('#' + BeeChat.UI.Resources.Elements.ID_DIV_CHATBOXES).children().each(function() {
+		var scrollBoxElm = BeeChat.UI.ScrollBoxes.getScrollBoxElm($(this).attr('bareJid'));
+		var pos = scrollBoxElm.position().left - ($(this).width() - scrollBoxElm.width()) + 24;
+
+		$(this).css({'left': pos});
+	    });
+});
+
+
+/** Executed when the page is unloaded
+ *
+ */
+$(window).unload(function() {
+	if (typeof document.body.style.maxHeight === "undefined") { // IE6
+	    return;
+	}
+
+	if (!$('#beechat').length)
+		return;
+
+	if (g_beechat_user != null) {
+	    g_beechat_user.requestSessionPause();
+	    BeeChat.UI.saveState();
+	}
+
+	BeeChat.UI.saveConnection();
+    });
+
+
+/** Check whether the BeeChat tab is active or not
+ *
+ */
+$(window).bind('blur', function() {
+	BeeChat.UI.HAS_FOCUS = false;
+    });
+
+$(window).bind('focus', function() {
+	BeeChat.UI.HAS_FOCUS = true;
+    });
diff --git a/mod/beechat/views/default/beechat/beechat.php b/mod/beechat/views/default/beechat/beechat.php
new file mode 100644
index 000000000..397d35f74
--- /dev/null
+++ b/mod/beechat/views/default/beechat/beechat.php
@@ -0,0 +1,84 @@
+<?php
+	/**
+	 * Beechat
+	 * 
+	 * @package beechat
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Beechannels <contact@beechannels.com>
+	 * @copyright Beechannels 2007-2010
+	 * @link http://beechannels.com/
+	 */
+
+if (elgg_is_logged_in() && elgg_get_logged_in_user_entity()->chatenabled && elgg_get_context() != 'admin') {
+?>	 
+<div id="beechat">
+  <div id="beechat_left">
+    <a id="beechat_tooltip_trigger" href="<?php echo $vars['url']; ?>"><img src="<?php echo $vars['config']->wwwroot; ?>favicon.ico" /></a>
+    <div class="tooltip tooltipchat">
+      <h3><?php echo elgg_echo('beechat:icons:home'); ?></h3>
+    </div>
+  </div>
+  <div id="beechat_center">
+    <span id="beechat_center_prev" class="prev"></span>
+    <div id="beechat_scrollboxes"><ul></ul></div>
+    <span id="beechat_center_next" class="next"></span>
+  </div>
+  <div id="beechat_right">
+    <span id="beechat_contacts_button" class="offline">
+      <?php echo elgg_echo('beechat:contacts:button'); ?>
+    </span>
+  </div>
+  <div id="beechat_contacts">
+    <div id="beechat_contacts_top">
+      <span class="beechat_label"><?php echo elgg_echo('beechat:contacts:button'); ?></span>
+      <div id="beechat_contacts_controls">
+	<span id="beechat_contacts_control_minimize" class="beechat_control" title="<?php echo elgg_echo('beechat:box:minimize'); ?>">_</span>
+      </div>
+      <br clear="all" />
+    </div>
+    <div id="beechat_availability_switcher">
+      <span id="beechat_current_availability"></span>
+      <span class="beechat_availability_switcher_control_down" id="beechat_availability_switcher_control"></span>
+    </div>
+    <div id="beechat_contacts_content">
+      <ul id="beechat_contacts_list"></ul>
+      <ul id="beechat_availability_switcher_list">
+	<li class="beechat_left_availability_chat"><?php echo elgg_echo('beechat:availability:available'); ?></li>
+	<li class="beechat_left_availability_dnd"><?php echo elgg_echo('beechat:availability:dnd'); ?></li>
+	<li class="beechat_left_availability_away"><?php echo elgg_echo('beechat:availability:away'); ?></li>
+	<li class="beechat_left_availability_xa"><?php echo elgg_echo('beechat:availability:xa'); ?></li>
+	<li class="beechat_left_availability_offline"><?php echo elgg_echo('beechat:availability:offline'); ?></li>
+      </ul>
+    </div>
+    <div id="beechat_contacts_bottom">
+      <span id="beechat_contacts_bottom_bar"></span>
+    </div>
+  </div>
+  <div id="beechat_chatboxes"></div>
+</div>
+<!-- SOUNDS -->
+<!--
+<embed src="<?php echo $vars['config']->staticurl; ?>mod/beechat/sounds/newmessage.wav" autostart=false width=0 height=0
+       id="beechat_sounds_new_message"
+       enablejavascript="true" />
+-->
+
+<?php
+        $ts = time();
+        $token = generate_action_token($ts);
+?>
+
+<script>
+	$(function () {
+		var e = document.createElement('script');
+		e.async = true;
+		e.type = 'text/javascript';
+                e.text = 'init_beechat("<?php echo $ts; ?>","<?php echo $token; ?>");';
+                document.getElementById('beechat').appendChild(e);
+
+	})
+</script>       
+
+<?php
+ }
+?>
diff --git a/mod/beechat/views/default/beechat/beechat.userjs.php b/mod/beechat/views/default/beechat/beechat.userjs.php
new file mode 100644
index 000000000..ed59b683f
--- /dev/null
+++ b/mod/beechat/views/default/beechat/beechat.userjs.php
@@ -0,0 +1,54 @@
+<script type="text/javascript">
+BeeChat.Events.Messages = {
+	    ConnectionStates: {
+		CONNECTING: "<?php echo elgg_echo('beechat:connection:state:connecting'); ?>",
+		AUTHENTICATING: "<?php echo elgg_echo('beechat:connection:state:authenticating'); ?>",
+		FAILED: "<?php echo elgg_echo('beechat:connection:state:failed'); ?>",
+		DISCONNECTING: "<?php echo elgg_echo('beechat:connection:state:disconnecting'); ?>",
+		OFFLINE: "<?php echo elgg_echo('beechat:connection:state:offline'); ?>",
+		ONLINE: "<?php echo elgg_echo('beechat:connection:state:online'); ?>"
+	    }
+	}
+
+BeeChat.UI.Resources.Strings = {
+	    Availability: {
+		AVAILABLE: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		CHAT: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		ONLINE: "<?php echo elgg_echo('beechat:availability:available'); ?>",
+		DND: "<?php echo elgg_echo('beechat:availability:dnd'); ?>",
+		AWAY: "<?php echo elgg_echo('beechat:availability:away'); ?>",
+		XA:"<?php echo elgg_echo('beechat:availability:xa'); ?>",
+		OFFLINE: "<?php echo elgg_echo('beechat:availability:offline'); ?>"
+	    },
+
+	    Contacts: {
+		BUTTON: "<?php echo elgg_echo('beechat:contacts:button'); ?>"
+	    },
+
+	    ChatMessages: {
+		SELF: "<?php echo $_SESSION['user']->name; ?>",
+		COMPOSING: "<?php echo elgg_echo('beechat:chat:composing'); ?>"
+	    },
+
+	    Box: {
+		MINIMIZE: "<?php echo elgg_echo('beechat:box:minimize'); ?>",
+		CLOSE: "<?php echo elgg_echo('beechat:box:close'); ?>",
+		SHOWHIDE: "<?php echo elgg_echo('beechat:box:showhide'); ?>"
+	    }
+	}
+g_user_rooms = new Array();
+<?php
+if (elgg_is_logged_in()) {
+	$user = elgg_get_logged_in_user_entity();
+	$chatrooms = elgg_get_entities_from_relationship(array('relationship' => 'groupchat',
+								'relationship_guid' => $user->guid,
+								'inverse_relationship' => false,
+								'limit' => 0));
+	if (!empty($chatrooms)) {
+	  foreach($chatrooms as $chatroom) {
+	    echo "g_user_rooms.push(['".beechat_friendly_title($chatroom->name)."@".elgg_get_plugin_setting("groupdomain", "beechat")."', '".$chatroom->guid."']);";
+	  }
+	}
+}
+?>
+</script>
diff --git a/mod/beechat/views/default/beechat/screen.css.php b/mod/beechat/views/default/beechat/screen.css.php
new file mode 100644
index 000000000..930e60089
--- /dev/null
+++ b/mod/beechat/views/default/beechat/screen.css.php
@@ -0,0 +1,672 @@
+<?php
+   global $CONFIG;
+   $url = $CONFIG->wwwroot;
+
+?>
+/**
+ * Beechat
+ *
+ * @package beechat
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Beechannels <contact@beechannels.com>
+ * @copyright Beechannels 2007-2010
+ * @link http://beechannels.com/
+ */
+
+div#beechat {
+    display: block !important;
+    display: none;
+    position: fixed;
+    left: 1%;
+    right: 1%;
+    bottom: 0;
+    margin: 0;
+    padding: 0;
+    height: 20px;
+    z-index: 999;
+
+    font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+    font-size: 0.9em;
+    color: #222222;
+    background-color: #DDDDDD;
+    border-top: 1px solid #BBBBBB;
+    border-left: 1px solid #BBBBBB;
+}
+div#beechat a img {
+    border: none;
+}
+div#beechat a {
+    text-decoration: none;
+}
+div#beechat img {
+    vertical-align: middle;
+}
+div#beechat a:hover {
+    text-decoration: underline;
+}
+.beechat_control {
+    cursor: pointer;
+    color: #CCCCFF;
+    font-size: 1.6em;
+}
+.beechat_control:hover {
+    color: white;
+}
+.beechat_box_control {
+    cursor: pointer;
+    color: #888888;
+    font-size: 1em;
+}
+.beechat_box_control:hover {
+    color: #222222;
+}
+.beechat_chatbox_control {
+    cursor: pointer;
+    color: #CCCCFF;
+    font-size: 1.6em;
+}
+.beechat_chatbox_control:hover {
+    color: white;
+}
+.beechat_label {
+    font-weight: bold;
+    font-size: 1.1em;
+}
+
+/*
+** -
+** left side
+** -
+*/
+div#beechat_left {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 116px;
+    height: 18px;
+    margin: 0;
+    padding: 1px 2px;
+}
+
+
+/*
+** -
+** right side
+** -
+*/
+div#beechat_right {
+    position: absolute;
+    top: 0;
+    right: 0;
+    width: 220px;
+    height: 20px;
+    margin: 0;
+    padding: 0 0 0 0;
+
+    border-left: 1px solid #BBBBBB;
+    border-right: 1px solid #BBBBBB;
+}
+div#beechat_contacts {
+    position: absolute;
+    right: 0px;
+    bottom: 0;
+    width: 222px;
+    height: 240px;
+    margin: 0 auto 20px auto;
+    padding: 0;
+    display: none;
+
+    background-color: white;
+}
+div#beechat_contacts_top {
+    color: white;
+    background-color: #193C60;
+    width: 220px;
+    height: 32px;
+
+    border-top: 1px solid #0B2C4F;
+    border-left: 1px solid #0B2C4F;
+    border-right: 1px solid #0B2C4F;
+}
+div#beechat_contacts_top .beechat_label {
+    float: left;
+    height: 20px;
+    padding: 6px;
+}
+div#beechat_contacts_controls {
+    margin: 0;
+    padding: 0;
+}
+div#beechat_contacts_controls span#beechat_contacts_control_minimize {
+    position: relative;
+    top: -7px;
+    float: right;
+    display: block;
+    width: 20px;
+    height: 20px;
+    padding: 2px;
+
+    font-size: 1.6em;
+    font-weight: bold;
+    text-align: center;
+}
+span#beechat_contacts_button {
+    display: block;
+    width: 190px;
+    padding: 2px 6px 0 24px;
+    height: 18px;
+    cursor: pointer;
+    font-size: 1.1em;
+    font-weight: normal;
+
+    background-image: url('<?php echo $url; ?>mod/beechat/graphics/icons/statuses.png');
+}
+span#beechat_contacts_button.online {
+    background-position: 4px -750px;
+    background-repeat: no-repeat;
+}
+span#beechat_contacts_button.dnd {
+    background-position: 4px -796px;
+    background-repeat: no-repeat;
+}
+span#beechat_contacts_button.away {
+    background-position: 4px -842px;
+    background-repeat: no-repeat;
+}
+span#beechat_contacts_button.offline {
+    background-position: 4px -888px;
+    background-repeat: no-repeat;
+}
+span#beechat_contacts_button:hover {
+    background-color: white;
+}
+div#beechat_availability_switcher {
+    width: 218px;
+    height: 24px;
+    margin: 0;
+    padding: 0 0 0 2px;
+
+    background-color: #EEEEEE;
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    border-bottom: 1px solid #BBBBBB;
+}
+span#beechat_current_availability {
+    float: left;
+    padding: 4px 4px 4px 22px;
+
+    font-weight: bold;
+    cursor: pointer;
+}
+span#beechat_current_availability:hover {
+    text-decoration: underline;
+}
+span#beechat_availability_switcher_control {
+    float: right;
+    width: 24px;
+    height: 20px;
+    cursor: pointer;
+}
+span.beechat_availability_switcher_control_up {
+    background: no-repeat 50% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_arrow_up.png');
+}
+span.beechat_availability_switcher_control_down {
+    background: no-repeat 50% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_arrow_down.png');
+}
+ul#beechat_availability_switcher_list {
+    display: none;
+    padding:0;
+    margin:0;
+    list-style:none;
+}
+ul#beechat_availability_switcher_list li {
+    margin: 0;
+    padding: 4px 4px 4px 24px;
+
+    cursor: pointer;
+}
+ul#beechat_availability_switcher_list li:hover {
+    background-color: #EEEEEE;
+}
+div#beechat_contacts_content {
+    width: 220px;
+    height: 164px;
+    overflow: auto;
+
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    background-color: white;
+}
+ul#beechat_contacts_list {
+    background-color: white;
+    padding:0;
+    margin:0;
+    list-style:none;
+}
+ul#beechat_contacts_list li img {
+    margin: 0 4px 0 0;
+    width: 25px;
+    height: 25px;
+}
+ul#beechat_contacts_list li {
+    margin: 0;
+    padding: 4px 4px 4px 6px;
+
+    cursor: pointer;
+    color: #333;
+}
+ul#beechat_contacts_list li:hover {
+    background-color: #F5F6F8;
+    color: #333;
+}
+div#beechat_contacts_bottom {
+    width: 220px;
+    height: 18px;
+
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+}
+span#beechat_contacts_bottom_bar {
+    position: absolute;
+    display: block;
+    bottom: 0;
+    width: 210px;
+    height: 1px;
+
+    background-color: #BBBBBB;
+    margin: auto 4px;
+}
+
+
+/*
+** -
+** center area
+** -
+*/
+div#beechat_center {
+    float: right;
+    display: block;
+    width: 586px;
+    height: 20px;
+    margin: 0 220px 0 100px;
+    *margin: 0 312px 0 100px;
+    padding: 0;
+}
+div#beechat_center .next, div#beechat_center .prev {
+    display: none;
+
+    border-left: 1px solid #BBBBBB;
+    cursor: pointer;
+}
+div#beechat_center .next {
+    position: absolute;
+    right: 220px;
+    width: 24px;
+    height: 20px;
+
+    background: no-repeat 50% url("<?php echo $url; ?>mod/beechat/graphics/icons/resultset_next.png");
+}
+div#beechat_center .prev {
+    position: absolute;
+    right: 872px;
+    width: 24px;
+    height: 20px;
+
+    background: no-repeat 50% url("<?php echo $url; ?>mod/beechat/graphics/icons/resultset_previous.png");
+}
+div#beechat_scrollboxes {
+    float: right;
+    overflow: hidden;
+    width: 628px;
+    height: 21px;
+    margin: 0 24px 0 24px;
+    text-align: left;
+}
+div#beechat_scrollboxes ul {
+    width: 200000em;
+    list-style: none;
+    padding:0;
+    margin:0;
+}
+div#beechat_scrollboxes ul li {
+    float: right;
+    display: block;
+    width: 130px;
+    height: 20px;
+    padding: 1px 0 0 22px;
+
+    cursor: pointer;
+    border-left: 1px solid #BBBBBB;
+}
+div#beechat_scrollboxes ul li:hover {
+    color: #000000;
+    background-color: white;
+}
+div#beechat_scrollboxes ul li.beechat_scrollbox_selected {
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    background-color: white;
+}
+div#beechat_scrollboxes ul li span.beechat_unread_count {
+    float: right;
+    display: block;
+    width: 16px;
+    height: 14px;
+    padding-top: 2px;
+    margin: 0 6px 0 0;
+
+    text-align: center;
+    font-size: 0.7em;
+    color: white;
+    background: no-repeat 0% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/notification_pink.png');
+}
+div#beechat_scrollboxes ul li span#beechat_box_control_close {
+    float: right;
+    width: auto;
+    padding: 1px 4px;
+    height: 20px;
+}
+
+/*
+** --
+** availability classes
+** --
+*/
+.beechat_left_availability_chat {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_green.png');
+}
+.beechat_left_availability_dnd {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_delete.png');
+}
+.beechat_left_availability_away {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_orange.png');
+}
+.beechat_left_availability_xa {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_red.png');
+}
+.beechat_left_availability_offline {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_black.png');
+}
+.beechat_left_availability_room {
+    background: no-repeat 2% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/muc_icon.png');
+}
+
+
+
+.beechat_right_availability_chat {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_green.png');
+}
+.beechat_right_availability_dnd {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_delete.png');
+}
+.beechat_right_availability_away {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_orange.png');
+}
+.beechat_right_availability_xa {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_red.png');
+}
+.beechat_right_availability_offline {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/bullet_black.png');
+}
+.beechat_right_availability_room {
+    background: no-repeat 96% 50% url('<?php echo $url; ?>mod/beechat/graphics/icons/muc_icon.png');
+}
+
+/*
+** --
+** tooltips
+** --
+*/
+div.tooltip.tooltipchat {
+    display: none;
+    padding: 4px;
+    width: auto;
+    background: transparent no-repeat left bottom url('<?php echo $url; ?>mod/beechat/graphics/icons/pointer.png');
+}
+div.tooltip.tooltipchat h3 {
+    margin: 0;
+    padding: 4px;
+
+    font-weight: normal;
+    font-size: 0.9em;
+    color: white;
+    background-color: #222222;
+}
+
+
+/*
+** --
+** chatboxes
+** --
+*/
+div.beechat_chatbox {
+    position: absolute;
+    width: 240px;
+    height: 300px;
+    bottom: 25px;
+    margin: 0;
+    padding: 0;
+
+    background-color: #DDDDDD;
+}
+div.beechat_chatbox a {
+    color: white;
+}
+div.beechat_chatbox a:hover {
+    text-decoration: underline;
+}
+div.beechat_chatbox_roomroster {
+    position: absolute;
+    width: 100px;
+    height: 276px;
+    left: -101px;
+    bottom: -2px;
+    margin: 0;
+    padding: 0;
+    overflow: auto;
+
+    border: 1px solid #4B6C8F;
+
+    background-color: #EEEEEE;
+}
+div.beechat_chatbox_roomrosteritem {
+    background-color: #FFFFFF;
+    margin: 3px;
+    padding-left: 2px;
+}
+div.beechat_chatbox_chatroom {
+    position: absolute;
+    width: 240px;
+    height: 300px;
+    left: 100px;
+    bottom: 0px;
+    margin: 0;
+    padding: 0;
+
+    background-color: #DDDDDD;
+}
+div.beechat_chatbox_chatroom a {
+    color: white;
+}
+div.beechat_chatbox_chatroom a:hover {
+    text-decoration: underline;
+}
+
+div.beechat_chatbox_room {
+    position: absolute;
+    width: 340px;
+    height: 300px;
+    bottom: 25px;
+    margin: 0;
+    padding: 0;
+
+    background-color: #DDDDDD;
+}
+div.beechat_chatbox_room a {
+    color: white;
+}
+div.beechat_chatbox_room a:hover {
+    text-decoration: underline;
+}
+div.beechat_chatbox_top {
+    width: 238px;
+    height: 24px;
+    margin: 0;
+    padding: 0;
+
+    font-size: 0.9em;
+    color: white;
+    background-color: #193C60;
+    border-top: 1px solid #0B2C4F;
+    border-left: 1px solid #0B2C4F;
+    border-right: 1px solid #0B2C4F;
+}
+div.beechat_chatbox_top .beechat_chatbox_top_icon {
+    position: absolute;
+    top: 4px;
+    left: 4px;
+    z-index: 2;
+
+    width: 50px;
+    height: 50px;
+}
+div.beechat_chatbox_top .beechat_label {
+    float: left;
+    height: 13px;
+    padding: 4px 6px 6px 6px;
+
+    margin-left: 54px;
+}
+div.beechat_chatbox_top_controls {
+    margin: 0;
+    padding: 0;
+}
+div.beechat_chatbox_top_controls .beechat_chatbox_control {
+    float: right;
+    display: block;
+    width: 20px;
+    height: 19px;
+    padding: 2px;
+    margin: 0;
+
+    font-size: 1.2em;
+    font-weight: bold;
+    text-align: center;
+}
+div.beechat_chatbox_subtop {
+    width: 172px;
+    height: 30px;
+    padding: 2px 6px 2px 60px;
+
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    border-bottom: 1px solid #CCCCCC;
+    background-color: #DDDDDD;
+}
+div.beechat_chatbox_content {
+    width: 238px;
+    height: 202px;
+    margin: 0;
+    padding: 0;
+    overflow: auto;
+
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    background-color: white;
+}
+div.beechat_chatbox_content div.beechat_chatbox_message {
+    width: auto;
+    height: auto;
+    margin: 0;
+    padding: 2px;
+    border-top: 1px solid #DDDDDD;
+}
+div.beechat_chatbox_message span.beechat_chatbox_message_sender {
+    position: relative;
+    top: 0;
+    left: 6px;
+    font-weight: bold;
+    font-size: 1em;
+}
+div.beechat_chatbox_message span.beechat_chatbox_message_date {
+    float: right;
+    margin: 0 6px 0 0;
+}
+div.beechat_chatbox_content a {
+    color: #003399;
+}
+div.beechat_chatbox_content a:hover {
+    text-decoration: underline;
+}
+div.beechat_chatbox_content p {
+    margin: 0;
+    padding: 2px 6px;
+}
+div.beechat_chatbox_content p.beechat_chatbox_state {
+    font-size: 1em;
+    color: #888888;
+}
+div.beechat_chatbox_input {
+    width: 238px;
+    height: 40px;
+    margin: 0;
+    padding: 0;
+
+    border-top: 2px solid #BBBBBB;
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    background-color: #DDDDDD;
+}
+div.beechat_chatbox_input textarea {
+    width: 204px;
+    height: 32px;
+    max-width: 240px;
+    max-height: 40px;
+    padding: 4px 4px 4px 30px;
+    margin: auto;
+    overflow: hidden;
+    vertical-align: top;
+    resize: none;
+
+    font-size: 1em;
+    font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+    outline: none;
+    border: none;
+    background: white no-repeat 4px 3px url('<?php echo $url; ?>mod/beechat/graphics/icons/chat_icon.png');
+}
+div.beechat_chatbox_input textarea:focus {
+    outline: none;
+    border: none;
+    background-color: white;
+}
+div.beechat_chatbox_bottom {
+    position: absolute;
+    width: 238px;
+    height: 1px;
+
+    background-color: white;
+    border-left: 1px solid #666666;
+    border-right: 1px solid #666666;
+    border-bottom: 1px solid #666666;
+    z-index: 2;
+}
+div.beechat_chatbox_bottom span {
+    position: absolute;
+    display: block;
+    right: 0;
+    top: 0;
+    width: 152px;
+    height: 1px;
+
+    border-bottom: 1px solid white;
+}
+div.beechat_chatbox_bottom span span {
+    position: absolute;
+    display: block;
+    width: 146px;
+    height: 1px;
+    right: 4px;
+    top: 0;
+
+    border-bottom: 1px solid #BBBBBB;
+}
diff --git a/mod/beechat/views/default/js/b64.js.php b/mod/beechat/views/default/js/b64.js.php
new file mode 100644
index 000000000..201bdbd7c
--- /dev/null
+++ b/mod/beechat/views/default/js/b64.js.php
@@ -0,0 +1,74 @@
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+
+var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+/**
+ * Encodes a string in base64
+ * @param {String} input The string to encode in base64.
+ */
+function encode64(input) {
+   var output = "";
+   var chr1, chr2, chr3;
+   var enc1, enc2, enc3, enc4;
+   var i = 0;
+
+   do {
+      chr1 = input.charCodeAt(i++);
+      chr2 = input.charCodeAt(i++);
+      chr3 = input.charCodeAt(i++);
+
+      enc1 = chr1 >> 2;
+      enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+      enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+      enc4 = chr3 & 63;
+
+      if (isNaN(chr2)) {
+         enc3 = enc4 = 64;
+      } else if (isNaN(chr3)) {
+         enc4 = 64;
+      }
+
+      output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) +
+         keyStr.charAt(enc3) + keyStr.charAt(enc4);
+   } while (i < input.length);
+
+   return output;
+}
+
+/**
+ * Decodes a base64 string.
+ * @param {String} input The string to decode.
+ */
+function decode64(input) {
+   var output = "";
+   var chr1, chr2, chr3;
+   var enc1, enc2, enc3, enc4;
+   var i = 0;
+
+   // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+   input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+   do {
+      enc1 = keyStr.indexOf(input.charAt(i++));
+      enc2 = keyStr.indexOf(input.charAt(i++));
+      enc3 = keyStr.indexOf(input.charAt(i++));
+      enc4 = keyStr.indexOf(input.charAt(i++));
+
+      chr1 = (enc1 << 2) | (enc2 >> 4);
+      chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+      chr3 = ((enc3 & 3) << 6) | enc4;
+
+      output = output + String.fromCharCode(chr1);
+
+      if (enc3 != 64) {
+         output = output + String.fromCharCode(chr2);
+      }
+      if (enc4 != 64) {
+         output = output + String.fromCharCode(chr3);
+      }
+   } while (i < input.length);
+
+   return output;
+}
diff --git a/mod/beechat/views/default/js/jquery.cookie.min.js.php b/mod/beechat/views/default/js/jquery.cookie.min.js.php
new file mode 100644
index 000000000..cb09af984
--- /dev/null
+++ b/mod/beechat/views/default/js/jquery.cookie.min.js.php
@@ -0,0 +1,10 @@
+/**
+ * Cookie plugin
+ *
+ * Copyright (c) 2006 Klaus Hartl (stilbuero.de)
+ * Dual licensed under the MIT and GPL licenses:
+ * http://www.opensource.org/licenses/mit-license.php
+ * http://www.gnu.org/licenses/gpl.html
+ *
+ */
+jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options=$.extend({},options);options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/jquery.localscroll-1.2.7-min.js.php b/mod/beechat/views/default/js/jquery.localscroll-1.2.7-min.js.php
new file mode 100644
index 000000000..fa583a451
--- /dev/null
+++ b/mod/beechat/views/default/js/jquery.localscroll-1.2.7-min.js.php
@@ -0,0 +1,9 @@
+/**
+ * jQuery.LocalScroll - Animated scrolling navigation, using anchors.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 3/11/2009
+ * @author Ariel Flesler
+ * @version 1.2.7
+ **/
+;(function($){var l=location.href.replace(/#.*/,'');var g=$.localScroll=function(a){$('body').localScroll(a)};g.defaults={duration:1e3,axis:'y',event:'click',stop:true,target:window,reset:true};g.hash=function(a){if(location.hash){a=$.extend({},g.defaults,a);a.hash=false;if(a.reset){var e=a.duration;delete a.duration;$(a.target).scrollTo(0,a);a.duration=e}i(0,location,a)}};$.fn.localScroll=function(b){b=$.extend({},g.defaults,b);return b.lazy?this.bind(b.event,function(a){var e=$([a.target,a.target.parentNode]).filter(d)[0];if(e)i(a,e,b)}):this.find('a,area').filter(d).bind(b.event,function(a){i(a,this,b)}).end().end();function d(){return!!this.href&&!!this.hash&&this.href.replace(this.hash,'')==l&&(!b.filter||$(this).is(b.filter))}};function i(a,e,b){var d=e.hash.slice(1),f=document.getElementById(d)||document.getElementsByName(d)[0];if(!f)return;if(a)a.preventDefault();var h=$(b.target);if(b.lock&&h.is(':animated')||b.onBefore&&b.onBefore.call(b,a,f,h)===false)return;if(b.stop)h.stop(true);if(b.hash){var j=f.id==d?'id':'name',k=$('<a> </a>').attr(j,d).css({position:'absolute',top:$(window).scrollTop(),left:$(window).scrollLeft()});f[j]='';$('body').prepend(k);location=e.hash;k.remove();f[j]=d}h.scrollTo(f,b).trigger('notify.serialScroll',[f])}})(jQuery);
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/jquery.scrollTo-min.js.php b/mod/beechat/views/default/js/jquery.scrollTo-min.js.php
new file mode 100755
index 000000000..5e7877810
--- /dev/null
+++ b/mod/beechat/views/default/js/jquery.scrollTo-min.js.php
@@ -0,0 +1,11 @@
+/**
+ * jQuery.ScrollTo - Easy element scrolling using jQuery.
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 5/25/2009
+ * @author Ariel Flesler
+ * @version 1.4.2
+ *
+ * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
+ */
+;(function(d){var k=d.scrollTo=function(a,i,e){d(window).scrollTo(a,i,e)};k.defaults={axis:'xy',duration:parseFloat(d.fn.jquery)>=1.3?0:1};k.window=function(a){return d(window)._scrollable()};d.fn._scrollable=function(){return this.map(function(){var a=this,i=!a.nodeName||d.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!i)return a;var e=(a.contentWindow||a).document||a.ownerDocument||a;return d.browser.safari||e.compatMode=='BackCompat'?e.body:e.documentElement})};d.fn.scrollTo=function(n,j,b){if(typeof j=='object'){b=j;j=0}if(typeof b=='function')b={onAfter:b};if(n=='max')n=9e9;b=d.extend({},k.defaults,b);j=j||b.speed||b.duration;b.queue=b.queue&&b.axis.length>1;if(b.queue)j/=2;b.offset=p(b.offset);b.over=p(b.over);return this._scrollable().each(function(){var q=this,r=d(q),f=n,s,g={},u=r.is('html,body');switch(typeof f){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(f)){f=p(f);break}f=d(f,this);case'object':if(f.is||f.style)s=(f=d(f)).offset()}d.each(b.axis.split(''),function(a,i){var e=i=='x'?'Left':'Top',h=e.toLowerCase(),c='scroll'+e,l=q[c],m=k.max(q,i);if(s){g[c]=s[h]+(u?0:l-r.offset()[h]);if(b.margin){g[c]-=parseInt(f.css('margin'+e))||0;g[c]-=parseInt(f.css('border'+e+'Width'))||0}g[c]+=b.offset[h]||0;if(b.over[h])g[c]+=f[i=='x'?'width':'height']()*b.over[h]}else{var o=f[h];g[c]=o.slice&&o.slice(-1)=='%'?parseFloat(o)/100*m:o}if(/^\d+$/.test(g[c]))g[c]=g[c]<=0?0:Math.min(g[c],m);if(!a&&b.queue){if(l!=g[c])t(b.onAfterFirst);delete g[c]}});t(b.onAfter);function t(a){r.animate(g,j,b.easing,a&&function(){a.call(this,n,b)})}}).end()};k.max=function(a,i){var e=i=='x'?'Width':'Height',h='scroll'+e;if(!d(a).is('html,body'))return a[h]-d(a)[e.toLowerCase()]();var c='client'+e,l=a.ownerDocument.documentElement,m=a.ownerDocument.body;return Math.max(l[h],m[h])-Math.min(l[c],m[c])};function p(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/jquery.serialScroll-min.js.php b/mod/beechat/views/default/js/jquery.serialScroll-min.js.php
new file mode 100755
index 000000000..d716124f9
--- /dev/null
+++ b/mod/beechat/views/default/js/jquery.serialScroll-min.js.php
@@ -0,0 +1,10 @@
+/*
+ * jQuery.SerialScroll - Animated scrolling of series
+ * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * Date: 06/14/2009
+ * @author Ariel Flesler
+ * @version 1.2.2
+ * http://flesler.blogspot.com/2008/02/jqueryserialscroll.html
+ */
+;(function(a){var b=a.serialScroll=function(c){return a(window).serialScroll(c)};b.defaults={duration:1e3,axis:"x",event:"click",start:0,step:1,lock:!0,cycle:!0,constant:!0};a.fn.serialScroll=function(c){return this.each(function(){var t=a.extend({},b.defaults,c),s=t.event,i=t.step,r=t.lazy,e=t.target?this:document,u=a(t.target||this,e),p=u[0],m=t.items,h=t.start,g=t.interval,k=t.navigation,l;if(!r){m=d()}if(t.force){f({},h)}a(t.prev||[],e).bind(s,-i,q);a(t.next||[],e).bind(s,i,q);if(!p.ssbound){u.bind("prev.serialScroll",-i,q).bind("next.serialScroll",i,q).bind("goto.serialScroll",f)}if(g){u.bind("start.serialScroll",function(v){if(!g){o();g=!0;n()}}).bind("stop.serialScroll",function(){o();g=!1})}u.bind("notify.serialScroll",function(x,w){var v=j(w);if(v>-1){h=v}});p.ssbound=!0;if(t.jump){(r?u:d()).bind(s,function(v){f(v,j(v.target))})}if(k){k=a(k,e).bind(s,function(v){v.data=Math.round(d().length/k.length)*k.index(this);f(v,this)})}function q(v){v.data+=h;f(v,this)}function f(B,z){if(!isNaN(z)){B.data=z;z=p}var C=B.data,v,D=B.type,A=t.exclude?d().slice(0,-t.exclude):d(),y=A.length,w=A[C],x=t.duration;if(D){B.preventDefault()}if(g){o();l=setTimeout(n,t.interval)}if(!w){v=C<0?0:y-1;if(h!=v){C=v}else{if(!t.cycle){return}else{C=y-v-1}}w=A[C]}if(!w||t.lock&&u.is(":animated")||D&&t.onBefore&&t.onBefore(B,w,u,d(),C)===!1){return}if(t.stop){u.queue("fx",[]).stop()}if(t.constant){x=Math.abs(x/i*(h-C))}u.scrollTo(w,x,t).trigger("notify.serialScroll",[C])}function n(){u.trigger("next.serialScroll")}function o(){clearTimeout(l)}function d(){return a(m,p)}function j(w){if(!isNaN(w)){return w}var x=d(),v;while((v=x.index(w))==-1&&w!=p){w=w.parentNode}return v}})}})(jQuery);
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/jquery.tools.min.js.php b/mod/beechat/views/default/js/jquery.tools.min.js.php
new file mode 100644
index 000000000..1574af45b
--- /dev/null
+++ b/mod/beechat/views/default/js/jquery.tools.min.js.php
@@ -0,0 +1,49 @@
+/*
+ * jQuery Tools 1.2.2 - The missing UI library for the Web
+ * 
+ * [tabs, tabs.slideshow, tooltip, tooltip.slide, tooltip.dynamic, scrollable, scrollable.autoscroll, scrollable.navigator, overlay]
+ * 
+ * NO COPYRIGHTS OR LICENSES. DO WHAT YOU LIKE.
+ * 
+ * http://flowplayer.org/tools/
+ * 
+ * File generated: Mon Jun 07 08:32:38 GMT 2010
+ */
+(function(c){function p(d,a,b){var e=this,l=d.add(this),h=d.find(b.tabs),j=a.jquery?a:d.children(a),i;h.length||(h=d.children());j.length||(j=d.parent().find(a));j.length||(j=c(a));c.extend(this,{click:function(f,g){var k=h.eq(f);if(typeof f=="string"&&f.replace("#","")){k=h.filter("[href*="+f.replace("#","")+"]");f=Math.max(h.index(k),0)}if(b.rotate){var n=h.length-1;if(f<0)return e.click(n,g);if(f>n)return e.click(0,g)}if(!k.length){if(i>=0)return e;f=b.initialIndex;k=h.eq(f)}if(f===i)return e;
+g=g||c.Event();g.type="onBeforeClick";l.trigger(g,[f]);if(!g.isDefaultPrevented()){o[b.effect].call(e,f,function(){g.type="onClick";l.trigger(g,[f])});i=f;h.removeClass(b.current);k.addClass(b.current);return e}},getConf:function(){return b},getTabs:function(){return h},getPanes:function(){return j},getCurrentPane:function(){return j.eq(i)},getCurrentTab:function(){return h.eq(i)},getIndex:function(){return i},next:function(){return e.click(i+1)},prev:function(){return e.click(i-1)}});c.each("onBeforeClick,onClick".split(","),
+function(f,g){c.isFunction(b[g])&&c(e).bind(g,b[g]);e[g]=function(k){c(e).bind(g,k);return e}});if(b.history&&c.fn.history){c.tools.history.init(h);b.event="history"}h.each(function(f){c(this).bind(b.event,function(g){e.click(f,g);return g.preventDefault()})});j.find("a[href^=#]").click(function(f){e.click(c(this).attr("href"),f)});if(location.hash)e.click(location.hash);else if(b.initialIndex===0||b.initialIndex>0)e.click(b.initialIndex)}c.tools=c.tools||{version:"1.2.2"};c.tools.tabs={conf:{tabs:"a",
+current:"current",onBeforeClick:null,onClick:null,effect:"default",initialIndex:0,event:"click",rotate:false,history:false},addEffect:function(d,a){o[d]=a}};var o={"default":function(d,a){this.getPanes().hide().eq(d).show();a.call()},fade:function(d,a){var b=this.getConf(),e=b.fadeOutSpeed,l=this.getPanes();e?l.fadeOut(e):l.hide();l.eq(d).fadeIn(b.fadeInSpeed,a)},slide:function(d,a){this.getPanes().slideUp(200);this.getPanes().eq(d).slideDown(400,a)},ajax:function(d,a){this.getPanes().eq(0).load(this.getTabs().eq(d).attr("href"),
+a)}},m;c.tools.tabs.addEffect("horizontal",function(d,a){m||(m=this.getPanes().eq(0).width());this.getCurrentPane().animate({width:0},function(){c(this).hide()});this.getPanes().eq(d).animate({width:m},function(){c(this).show();a.call()})});c.fn.tabs=function(d,a){var b=this.data("tabs");if(b)return b;if(c.isFunction(a))a={onBeforeClick:a};a=c.extend({},c.tools.tabs.conf,a);this.each(function(){b=new p(c(this),d,a);c(this).data("tabs",b)});return a.api?b:this}})(jQuery);
+(function(d){function r(g,a){function p(f){var e=d(f);return e.length<2?e:g.parent().find(f)}var c=this,j=g.add(this),b=g.data("tabs"),h,l,m,n=false,o=p(a.next).click(function(){b.next()}),k=p(a.prev).click(function(){b.prev()});d.extend(c,{getTabs:function(){return b},getConf:function(){return a},play:function(){if(!h){var f=d.Event("onBeforePlay");j.trigger(f);if(f.isDefaultPrevented())return c;n=false;h=setInterval(b.next,a.interval);j.trigger("onPlay");b.next()}},pause:function(){if(!h)return c;
+var f=d.Event("onBeforePause");j.trigger(f);if(f.isDefaultPrevented())return c;h=clearInterval(h);m=clearInterval(m);j.trigger("onPause")},stop:function(){c.pause();n=true}});d.each("onBeforePlay,onPlay,onBeforePause,onPause".split(","),function(f,e){d.isFunction(a[e])&&c.bind(e,a[e]);c[e]=function(s){return c.bind(e,s)}});if(a.autopause){var t=b.getTabs().add(o).add(k).add(b.getPanes());t.hover(function(){c.pause();l=clearInterval(l)},function(){n||(l=setTimeout(c.play,a.interval))})}if(a.autoplay)m=
+setTimeout(c.play,a.interval);else c.stop();a.clickable&&b.getPanes().click(function(){b.next()});if(!b.getConf().rotate){var i=a.disabledClass;b.getIndex()||k.addClass(i);b.onBeforeClick(function(f,e){if(e){k.removeClass(i);e==b.getTabs().length-1?o.addClass(i):o.removeClass(i)}else k.addClass(i)})}}var q;q=d.tools.tabs.slideshow={conf:{next:".forward",prev:".backward",disabledClass:"disabled",autoplay:false,autopause:true,interval:3E3,clickable:true,api:false}};d.fn.slideshow=function(g){var a=
+this.data("slideshow");if(a)return a;g=d.extend({},q.conf,g);this.each(function(){a=new r(d(this),g);d(this).data("slideshow",a)});return g.api?a:this}})(jQuery);
+(function(f){function p(a,b,c){var h=c.relative?a.position().top:a.offset().top,e=c.relative?a.position().left:a.offset().left,i=c.position[0];h-=b.outerHeight()-c.offset[0];e+=a.outerWidth()+c.offset[1];var j=b.outerHeight()+a.outerHeight();if(i=="center")h+=j/2;if(i=="bottom")h+=j;i=c.position[1];a=b.outerWidth()+a.outerWidth();if(i=="center")e-=a/2;if(i=="left")e-=a;return{top:h,left:e}}function t(a,b){var c=this,h=a.add(c),e,i=0,j=0,m=a.attr("title"),q=n[b.effect],k,r=a.is(":input"),u=r&&a.is(":checkbox, :radio, select, :button"),
+s=a.attr("type"),l=b.events[s]||b.events[r?u?"widget":"input":"def"];if(!q)throw'Nonexistent effect "'+b.effect+'"';l=l.split(/,\s*/);if(l.length!=2)throw"Tooltip: bad events configuration for "+s;a.bind(l[0],function(d){if(b.predelay){clearTimeout(i);j=setTimeout(function(){c.show(d)},b.predelay)}else c.show(d)}).bind(l[1],function(d){if(b.delay){clearTimeout(j);i=setTimeout(function(){c.hide(d)},b.delay)}else c.hide(d)});if(m&&b.cancelDefault){a.removeAttr("title");a.data("title",m)}f.extend(c,
+{show:function(d){if(!e){if(m)e=f(b.layout).addClass(b.tipClass).appendTo(document.body).hide().append(m);else if(b.tip)e=f(b.tip).eq(0);else{e=a.next();e.length||(e=a.parent().next())}if(!e.length)throw"Cannot find tooltip for "+a;}if(c.isShown())return c;e.stop(true,true);var g=p(a,e,b);d=d||f.Event();d.type="onBeforeShow";h.trigger(d,[g]);if(d.isDefaultPrevented())return c;g=p(a,e,b);e.css({position:"absolute",top:g.top,left:g.left});k=true;q[0].call(c,function(){d.type="onShow";k="full";h.trigger(d)});
+g=b.events.tooltip.split(/,\s*/);e.bind(g[0],function(){clearTimeout(i);clearTimeout(j)});g[1]&&!a.is("input:not(:checkbox, :radio), textarea")&&e.bind(g[1],function(o){o.relatedTarget!=a[0]&&a.trigger(l[1].split(" ")[0])});return c},hide:function(d){if(!e||!c.isShown())return c;d=d||f.Event();d.type="onBeforeHide";h.trigger(d);if(!d.isDefaultPrevented()){k=false;n[b.effect][1].call(c,function(){d.type="onHide";k=false;h.trigger(d)});return c}},isShown:function(d){return d?k=="full":k},getConf:function(){return b},
+getTip:function(){return e},getTrigger:function(){return a}});f.each("onHide,onBeforeShow,onShow,onBeforeHide".split(","),function(d,g){f.isFunction(b[g])&&f(c).bind(g,b[g]);c[g]=function(o){f(c).bind(g,o);return c}})}f.tools=f.tools||{version:"1.2.2"};f.tools.tooltip={conf:{effect:"toggle",fadeOutSpeed:"fast",predelay:0,delay:30,opacity:1,tip:0,position:["top","center"],offset:[0,0],relative:false,cancelDefault:true,events:{def:"mouseenter,mouseleave",input:"focus,blur",widget:"focus mouseenter,blur mouseleave",
+tooltip:"mouseenter,mouseleave"},layout:"<div/>",tipClass:"tooltip"},addEffect:function(a,b,c){n[a]=[b,c]}};var n={toggle:[function(a){var b=this.getConf(),c=this.getTip();b=b.opacity;b<1&&c.css({opacity:b});c.show();a.call()},function(a){this.getTip().hide();a.call()}],fade:[function(a){var b=this.getConf();this.getTip().fadeTo(b.fadeInSpeed,b.opacity,a)},function(a){this.getTip().fadeOut(this.getConf().fadeOutSpeed,a)}]};f.fn.tooltip=function(a){var b=this.data("tooltip");if(b)return b;a=f.extend(true,
+{},f.tools.tooltip.conf,a);if(typeof a.position=="string")a.position=a.position.split(/,?\s/);this.each(function(){b=new t(f(this),a);f(this).data("tooltip",b)});return a.api?b:this}})(jQuery);
+(function(d){var i=d.tools.tooltip;d.extend(i.conf,{direction:"up",bounce:false,slideOffset:10,slideInSpeed:200,slideOutSpeed:200,slideFade:!d.browser.msie});var e={up:["-","top"],down:["+","top"],left:["-","left"],right:["+","left"]};i.addEffect("slide",function(g){var a=this.getConf(),f=this.getTip(),b=a.slideFade?{opacity:a.opacity}:{},c=e[a.direction]||e.up;b[c[1]]=c[0]+"="+a.slideOffset;a.slideFade&&f.css({opacity:0});f.show().animate(b,a.slideInSpeed,g)},function(g){var a=this.getConf(),f=a.slideOffset,
+b=a.slideFade?{opacity:0}:{},c=e[a.direction]||e.up,h=""+c[0];if(a.bounce)h=h=="+"?"-":"+";b[c[1]]=h+"="+f;this.getTip().animate(b,a.slideOutSpeed,function(){d(this).hide();g.call()})})})(jQuery);
+(function(g){function j(a){var c=g(window),d=c.width()+c.scrollLeft(),h=c.height()+c.scrollTop();return[a.offset().top<=c.scrollTop(),d<=a.offset().left+a.width(),h<=a.offset().top+a.height(),c.scrollLeft()>=a.offset().left]}function k(a){for(var c=a.length;c--;)if(a[c])return false;return true}var i=g.tools.tooltip;i.dynamic={conf:{classNames:"top right bottom left"}};g.fn.dynamic=function(a){if(typeof a=="number")a={speed:a};a=g.extend({},i.dynamic.conf,a);var c=a.classNames.split(/\s/),d;this.each(function(){var h=
+g(this).tooltip().onBeforeShow(function(e,f){e=this.getTip();var b=this.getConf();d||(d=[b.position[0],b.position[1],b.offset[0],b.offset[1],g.extend({},b)]);g.extend(b,d[4]);b.position=[d[0],d[1]];b.offset=[d[2],d[3]];e.css({visibility:"hidden",position:"absolute",top:f.top,left:f.left}).show();f=j(e);if(!k(f)){if(f[2]){g.extend(b,a.top);b.position[0]="top";e.addClass(c[0])}if(f[3]){g.extend(b,a.right);b.position[1]="right";e.addClass(c[1])}if(f[0]){g.extend(b,a.bottom);b.position[0]="bottom";e.addClass(c[2])}if(f[1]){g.extend(b,
+a.left);b.position[1]="left";e.addClass(c[3])}if(f[0]||f[2])b.offset[0]*=-1;if(f[1]||f[3])b.offset[1]*=-1}e.css({visibility:"visible"}).hide()});h.onBeforeShow(function(){var e=this.getConf();this.getTip();setTimeout(function(){e.position=[d[0],d[1]];e.offset=[d[2],d[3]]},0)});h.onHide(function(){var e=this.getTip();e.removeClass(a.classNames)});ret=h});return a.api?ret:this}})(jQuery);
+(function(e){function n(f,c){var a=e(c);return a.length<2?a:f.parent().find(c)}function t(f,c){var a=this,l=f.add(a),g=f.children(),k=0,m=c.vertical;j||(j=a);if(g.length>1)g=e(c.items,f);e.extend(a,{getConf:function(){return c},getIndex:function(){return k},getSize:function(){return a.getItems().size()},getNaviButtons:function(){return o.add(p)},getRoot:function(){return f},getItemWrap:function(){return g},getItems:function(){return g.children(c.item).not("."+c.clonedClass)},move:function(b,d){return a.seekTo(k+
+b,d)},next:function(b){return a.move(1,b)},prev:function(b){return a.move(-1,b)},begin:function(b){return a.seekTo(0,b)},end:function(b){return a.seekTo(a.getSize()-1,b)},focus:function(){return j=a},addItem:function(b){b=e(b);if(c.circular){e(".cloned:last").before(b);e(".cloned:first").replaceWith(b.clone().addClass(c.clonedClass))}else g.append(b);l.trigger("onAddItem",[b]);return a},seekTo:function(b,d,h){if(c.circular&&b===0&&k==-1&&d!==0)return a;if(!c.circular&&b<0||b>a.getSize()||b<-1)return a;
+var i=b;if(b.jquery)b=a.getItems().index(b);else i=a.getItems().eq(b);var q=e.Event("onBeforeSeek");if(!h){l.trigger(q,[b,d]);if(q.isDefaultPrevented()||!i.length)return a}i=m?{top:-i.position().top}:{left:-i.position().left};k=b;j=a;if(d===undefined)d=c.speed;g.animate(i,d,c.easing,h||function(){l.trigger("onSeek",[b])});return a}});e.each(["onBeforeSeek","onSeek","onAddItem"],function(b,d){e.isFunction(c[d])&&e(a).bind(d,c[d]);a[d]=function(h){e(a).bind(d,h);return a}});if(c.circular){var r=a.getItems().slice(-1).clone().prependTo(g),
+s=a.getItems().eq(1).clone().appendTo(g);r.add(s).addClass(c.clonedClass);a.onBeforeSeek(function(b,d,h){if(!b.isDefaultPrevented())if(d==-1){a.seekTo(r,h,function(){a.end(0)});return b.preventDefault()}else d==a.getSize()&&a.seekTo(s,h,function(){a.begin(0)})});a.seekTo(0,0)}var o=n(f,c.prev).click(function(){a.prev()}),p=n(f,c.next).click(function(){a.next()});!c.circular&&a.getSize()>1&&a.onBeforeSeek(function(b,d){o.toggleClass(c.disabledClass,d<=0);p.toggleClass(c.disabledClass,d>=a.getSize()-
+1)});c.mousewheel&&e.fn.mousewheel&&f.mousewheel(function(b,d){if(c.mousewheel){a.move(d<0?1:-1,c.wheelSpeed||50);return false}});c.keyboard&&e(document).bind("keydown.scrollable",function(b){if(!(!c.keyboard||b.altKey||b.ctrlKey||e(b.target).is(":input")))if(!(c.keyboard!="static"&&j!=a)){var d=b.keyCode;if(m&&(d==38||d==40)){a.move(d==38?-1:1);return b.preventDefault()}if(!m&&(d==37||d==39)){a.move(d==37?-1:1);return b.preventDefault()}}});e(a).trigger("onBeforeSeek",[c.initialIndex])}e.tools=e.tools||
+{version:"1.2.2"};e.tools.scrollable={conf:{activeClass:"active",circular:false,clonedClass:"cloned",disabledClass:"disabled",easing:"swing",initialIndex:0,item:null,items:".items",keyboard:true,mousewheel:false,next:".next",prev:".prev",speed:400,vertical:false,wheelSpeed:0}};var j;e.fn.scrollable=function(f){var c=this.data("scrollable");if(c)return c;f=e.extend({},e.tools.scrollable.conf,f);this.each(function(){c=new t(e(this),f);e(this).data("scrollable",c)});return f.api?c:this}})(jQuery);
+(function(c){var g=c.tools.scrollable;g.autoscroll={conf:{autoplay:true,interval:3E3,autopause:true}};c.fn.autoscroll=function(d){if(typeof d=="number")d={interval:d};var b=c.extend({},g.autoscroll.conf,d),h;this.each(function(){var a=c(this).data("scrollable");if(a)h=a;var e,i,f=true;a.play=function(){if(!e){f=false;e=setInterval(function(){a.next()},b.interval);a.next()}};a.pause=function(){e=clearInterval(e)};a.stop=function(){a.pause();f=true};b.autopause&&a.getRoot().add(a.getNaviButtons()).hover(function(){a.pause();
+clearInterval(i)},function(){f||(i=setTimeout(a.play,b.interval))});b.autoplay&&setTimeout(a.play,b.interval)});return b.api?h:this}})(jQuery);
+(function(d){function p(c,g){var h=d(g);return h.length<2?h:c.parent().find(g)}var m=d.tools.scrollable;m.navigator={conf:{navi:".navi",naviItem:null,activeClass:"active",indexed:false,idPrefix:null,history:false}};d.fn.navigator=function(c){if(typeof c=="string")c={navi:c};c=d.extend({},m.navigator.conf,c);var g;this.each(function(){function h(a,b,i){e.seekTo(b);if(j){if(location.hash)location.hash=a.attr("href").replace("#","")}else return i.preventDefault()}function f(){return k.find(c.naviItem||
+"> *")}function n(a){var b=d("<"+(c.naviItem||"a")+"/>").click(function(i){h(d(this),a,i)}).attr("href","#"+a);a===0&&b.addClass(l);c.indexed&&b.text(a+1);c.idPrefix&&b.attr("id",c.idPrefix+a);return b.appendTo(k)}function o(a,b){a=f().eq(b.replace("#",""));a.length||(a=f().filter("[href="+b+"]"));a.click()}var e=d(this).data("scrollable"),k=p(e.getRoot(),c.navi),q=e.getNaviButtons(),l=c.activeClass,j=c.history&&d.fn.history;if(e)g=e;e.getNaviButtons=function(){return q.add(k)};f().length?f().each(function(a){d(this).click(function(b){h(d(this),
+a,b)})}):d.each(e.getItems(),function(a){n(a)});e.onBeforeSeek(function(a,b){var i=f().eq(b);!a.isDefaultPrevented()&&i.length&&f().removeClass(l).eq(b).addClass(l)});e.onAddItem(function(a,b){b=n(e.getItems().index(b));j&&b.history(o)});j&&f().history(o)});return c.api?g:this}})(jQuery);
+(function(a){function t(d,b){var c=this,i=d.add(c),o=a(window),k,f,m,g=a.tools.expose&&(b.mask||b.expose),n=Math.random().toString().slice(10);if(g){if(typeof g=="string")g={color:g};g.closeOnClick=g.closeOnEsc=false}var p=b.target||d.attr("rel");f=p?a(p):d;if(!f.length)throw"Could not find Overlay: "+p;d&&d.index(f)==-1&&d.click(function(e){c.load(e);return e.preventDefault()});a.extend(c,{load:function(e){if(c.isOpened())return c;var h=q[b.effect];if(!h)throw'Overlay: cannot find effect : "'+b.effect+
+'"';b.oneInstance&&a.each(s,function(){this.close(e)});e=e||a.Event();e.type="onBeforeLoad";i.trigger(e);if(e.isDefaultPrevented())return c;m=true;g&&a(f).expose(g);var j=b.top,r=b.left,u=f.outerWidth({margin:true}),v=f.outerHeight({margin:true});if(typeof j=="string")j=j=="center"?Math.max((o.height()-v)/2,0):parseInt(j,10)/100*o.height();if(r=="center")r=Math.max((o.width()-u)/2,0);h[0].call(c,{top:j,left:r},function(){if(m){e.type="onLoad";i.trigger(e)}});g&&b.closeOnClick&&a.mask.getMask().one("click",
+c.close);b.closeOnClick&&a(document).bind("click."+n,function(l){a(l.target).parents(f).length||c.close(l)});b.closeOnEsc&&a(document).bind("keydown."+n,function(l){l.keyCode==27&&c.close(l)});return c},close:function(e){if(!c.isOpened())return c;e=e||a.Event();e.type="onBeforeClose";i.trigger(e);if(!e.isDefaultPrevented()){m=false;q[b.effect][1].call(c,function(){e.type="onClose";i.trigger(e)});a(document).unbind("click."+n).unbind("keydown."+n);g&&a.mask.close();return c}},getOverlay:function(){return f},
+getTrigger:function(){return d},getClosers:function(){return k},isOpened:function(){return m},getConf:function(){return b}});a.each("onBeforeLoad,onStart,onLoad,onBeforeClose,onClose".split(","),function(e,h){a.isFunction(b[h])&&a(c).bind(h,b[h]);c[h]=function(j){a(c).bind(h,j);return c}});k=f.find(b.close||".close");if(!k.length&&!b.close){k=a('<div class="close"></div>');f.prepend(k)}k.click(function(e){c.close(e)});b.load&&c.load()}a.tools=a.tools||{version:"1.2.2"};a.tools.overlay={addEffect:function(d,
+b,c){q[d]=[b,c]},conf:{close:null,closeOnClick:true,closeOnEsc:true,closeSpeed:"fast",effect:"default",fixed:!a.browser.msie||a.browser.version>6,left:"center",load:false,mask:null,oneInstance:true,speed:"normal",target:null,top:"10%"}};var s=[],q={};a.tools.overlay.addEffect("default",function(d,b){var c=this.getConf(),i=a(window);if(!c.fixed){d.top+=i.scrollTop();d.left+=i.scrollLeft()}d.position=c.fixed?"fixed":"absolute";this.getOverlay().css(d).fadeIn(c.speed,b)},function(d){this.getOverlay().fadeOut(this.getConf().closeSpeed,
+d)});a.fn.overlay=function(d){var b=this.data("overlay");if(b)return b;if(a.isFunction(d))d={onBeforeLoad:d};d=a.extend(true,{},a.tools.overlay.conf,d);this.each(function(){b=new t(a(this),d);s.push(b);a(this).data("overlay",b)});return d.api?b:this}})(jQuery);
diff --git a/mod/beechat/views/default/js/json2.js.php b/mod/beechat/views/default/js/json2.js.php
new file mode 100644
index 000000000..7ae503202
--- /dev/null
+++ b/mod/beechat/views/default/js/json2.js.php
@@ -0,0 +1,476 @@
+/*
+    http://www.JSON.org/json2.js
+    2009-06-29
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or '&nbsp;'),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the object holding the key.
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+*/
+
+/*jslint evil: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON = JSON || {};
+
+(function () {
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function (key) {
+
+            return isFinite(this.valueOf()) ?
+                   this.getUTCFullYear()   + '-' +
+                 f(this.getUTCMonth() + 1) + '-' +
+                 f(this.getUTCDate())      + 'T' +
+                 f(this.getUTCHours())     + ':' +
+                 f(this.getUTCMinutes())   + ':' +
+                 f(this.getUTCSeconds())   + 'Z' : null;
+        };
+
+        String.prototype.toJSON =
+        Number.prototype.toJSON =
+        Boolean.prototype.toJSON = function (key) {
+            return this.valueOf();
+        };
+    }
+
+    var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+        gap,
+        indent,
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        },
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ?
+            '"' + string.replace(escapable, function (a) {
+                var c = meta[a];
+                return typeof c === 'string' ? c :
+                    '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+            }) + '"' :
+            '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0 ? '[]' :
+                    gap ? '[\n' + gap +
+                            partial.join(',\n' + gap) + '\n' +
+                                mind + ']' :
+                          '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    k = rep[i];
+                    if (typeof k === 'string') {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0 ? '{}' :
+                gap ? '{\n' + gap + partial.join(',\n' + gap) + '\n' +
+                        mind + '}' : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                     typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/.
+test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
+replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
+replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function' ?
+                    walk({'': j}, '') : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());
diff --git a/mod/beechat/views/default/js/md5.js.php b/mod/beechat/views/default/js/md5.js.php
new file mode 100644
index 000000000..4284f62bb
--- /dev/null
+++ b/mod/beechat/views/default/js/md5.js.php
@@ -0,0 +1,261 @@
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
+function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
+function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
+function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
+function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
+function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length
+ */
+function core_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  var olda, oldb, oldc, oldd;
+  for(var i = 0; i < x.length; i += 16)
+  {
+    olda = a;
+    oldb = b;
+    oldc = c;
+    oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return [a, b, c, d];
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data
+ */
+function core_hmac_md5(key, data)
+{
+  var bkey = str2binl(key);
+  if(bkey.length > 16) { bkey = core_md5(bkey, key.length * chrsz); }
+
+  var ipad = new Array(16), opad = new Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
+  return core_md5(opad.concat(hash), 512 + 128);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert a string to an array of little-endian words
+ * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+ */
+function str2binl(str)
+{
+  var bin = [];
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+  {
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+  }
+  return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+  {
+    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i++)
+  {
+    str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
+           hex_tab.charAt((binarray[i>>2] >> ((i%4)*8  )) & 0xF);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  var triplet, j;
+  for(var i = 0; i < binarray.length * 4; i += 3)
+  {
+    triplet = (((binarray[i   >> 2] >> 8 * ( i   %4)) & 0xFF) << 16) |
+              (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 ) |
+              ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
+    for(j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > binarray.length * 32) { str += b64pad; }
+      else { str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); }
+    }
+  }
+  return str;
+}
diff --git a/mod/beechat/views/default/js/sha1.js.php b/mod/beechat/views/default/js/sha1.js.php
new file mode 100644
index 000000000..db3bf0544
--- /dev/null
+++ b/mod/beechat/views/default/js/sha1.js.php
@@ -0,0 +1,207 @@
+/*
+ * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
+ * in FIPS PUB 180-1
+ * Version 2.1a Copyright Paul Johnston 2000 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for details.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));}
+function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));}
+function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));}
+function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));}
+function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));}
+function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));}
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function sha1_vm_test()
+{
+  return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
+}
+
+/*
+ * Calculate the SHA-1 of an array of big-endian words, and a bit length
+ */
+function core_sha1(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << (24 - len % 32);
+  x[((len + 64 >> 9) << 4) + 15] = len;
+
+  var w = new Array(80);
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+  var e = -1009589776;
+
+  var i, j, t, olda, oldb, oldc, oldd, olde;
+  for (i = 0; i < x.length; i += 16)
+  {
+    olda = a;
+    oldb = b;
+    oldc = c;
+    oldd = d;
+    olde = e;
+
+    for (j = 0; j < 80; j++)
+    {
+      if (j < 16) { w[j] = x[i + j]; }
+      else { w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1); }
+      t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)),
+                       safe_add(safe_add(e, w[j]), sha1_kt(j)));
+      e = d;
+      d = c;
+      c = rol(b, 30);
+      b = a;
+      a = t;
+    }
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+    e = safe_add(e, olde);
+  }
+  return [a, b, c, d, e];
+}
+
+/*
+ * Perform the appropriate triplet combination function for the current
+ * iteration
+ */
+function sha1_ft(t, b, c, d)
+{
+  if (t < 20) { return (b & c) | ((~b) & d); }
+  if (t < 40) { return b ^ c ^ d; }
+  if (t < 60) { return (b & c) | (b & d) | (c & d); }
+  return b ^ c ^ d;
+}
+
+/*
+ * Determine the appropriate additive constant for the current iteration
+ */
+function sha1_kt(t)
+{
+  return (t < 20) ?  1518500249 : (t < 40) ?  1859775393 :
+         (t < 60) ? -1894007588 : -899497514;
+}
+
+/*
+ * Calculate the HMAC-SHA1 of a key and some data
+ */
+function core_hmac_sha1(key, data)
+{
+  var bkey = str2binb(key);
+  if (bkey.length > 16) { bkey = core_sha1(bkey, key.length * chrsz); }
+
+  var ipad = new Array(16), opad = new Array(16);
+  for (var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz);
+  return core_sha1(opad.concat(hash), 512 + 160);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert an 8-bit or 16-bit string to an array of big-endian words
+ * In 8-bit function, characters >255 have their hi-byte silently ignored.
+ */
+function str2binb(str)
+{
+  var bin = [];
+  var mask = (1 << chrsz) - 1;
+  for (var i = 0; i < str.length * chrsz; i += chrsz)
+  {
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
+  }
+  return bin;
+}
+
+/*
+ * Convert an array of big-endian words to a string
+ */
+function binb2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for (var i = 0; i < bin.length * 32; i += chrsz)
+  {
+    str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a hex string.
+ */
+function binb2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  for (var i = 0; i < binarray.length * 4; i++)
+  {
+    str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
+           hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8  )) & 0xF);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a base-64 string
+ */
+function binb2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  var triplet, j;
+  for (var i = 0; i < binarray.length * 4; i += 3)
+  {
+    triplet = (((binarray[i   >> 2] >> 8 * (3 -  i   %4)) & 0xFF) << 16) |
+              (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 ) |
+               ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF);
+    for (j = 0; j < 4; j++)
+    {
+      if (i * 8 + j * 6 > binarray.length * 32) { str += b64pad; }
+      else { str += tab.charAt((triplet >> 6*(3-j)) & 0x3F); }
+    }
+  }
+  return str;
+}
diff --git a/mod/beechat/views/default/js/strophe.min.js.php b/mod/beechat/views/default/js/strophe.min.js.php
new file mode 100644
index 000000000..f0eb17906
--- /dev/null
+++ b/mod/beechat/views/default/js/strophe.min.js.php
@@ -0,0 +1 @@
+var Base64=(function(){var keyStr="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";var obj={encode:function(input){var output="";var chr1,chr2,chr3;var enc1,enc2,enc3,enc4;var i=0;do{chr1=input.charCodeAt(i++);chr2=input.charCodeAt(i++);chr3=input.charCodeAt(i++);enc1=chr1>>2;enc2=((chr1&3)<<4)|(chr2>>4);enc3=((chr2&15)<<2)|(chr3>>6);enc4=chr3&63;if(isNaN(chr2)){enc3=enc4=64}else{if(isNaN(chr3)){enc4=64}}output=output+keyStr.charAt(enc1)+keyStr.charAt(enc2)+keyStr.charAt(enc3)+keyStr.charAt(enc4)}while(i<input.length);return output},decode:function(input){var output="";var chr1,chr2,chr3;var enc1,enc2,enc3,enc4;var i=0;input=input.replace(/[^A-Za-z0-9\+\/\=]/g,"");do{enc1=keyStr.indexOf(input.charAt(i++));enc2=keyStr.indexOf(input.charAt(i++));enc3=keyStr.indexOf(input.charAt(i++));enc4=keyStr.indexOf(input.charAt(i++));chr1=(enc1<<2)|(enc2>>4);chr2=((enc2&15)<<4)|(enc3>>2);chr3=((enc3&3)<<6)|enc4;output=output+String.fromCharCode(chr1);if(enc3!=64){output=output+String.fromCharCode(chr2)}if(enc4!=64){output=output+String.fromCharCode(chr3)}}while(i<input.length);return output}};return obj})();var MD5=(function(){var hexcase=0;var b64pad="";var chrsz=8;var safe_add=function(x,y){var lsw=(x&65535)+(y&65535);var msw=(x>>16)+(y>>16)+(lsw>>16);return(msw<<16)|(lsw&65535)};var bit_rol=function(num,cnt){return(num<<cnt)|(num>>>(32-cnt))};var str2binl=function(str){var bin=[];var mask=(1<<chrsz)-1;for(var i=0;i<str.length*chrsz;i+=chrsz){bin[i>>5]|=(str.charCodeAt(i/chrsz)&mask)<<(i%32)}return bin};var binl2str=function(bin){var str="";var mask=(1<<chrsz)-1;for(var i=0;i<bin.length*32;i+=chrsz){str+=String.fromCharCode((bin[i>>5]>>>(i%32))&mask)}return str};var binl2hex=function(binarray){var hex_tab=hexcase?"0123456789ABCDEF":"0123456789abcdef";var str="";for(var i=0;i<binarray.length*4;i++){str+=hex_tab.charAt((binarray[i>>2]>>((i%4)*8+4))&15)+hex_tab.charAt((binarray[i>>2]>>((i%4)*8))&15)}return str};var binl2b64=function(binarray){var tab="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var str="";var triplet,j;for(var i=0;i<binarray.length*4;i+=3){triplet=(((binarray[i>>2]>>8*(i%4))&255)<<16)|(((binarray[i+1>>2]>>8*((i+1)%4))&255)<<8)|((binarray[i+2>>2]>>8*((i+2)%4))&255);for(j=0;j<4;j++){if(i*8+j*6>binarray.length*32){str+=b64pad}else{str+=tab.charAt((triplet>>6*(3-j))&63)}}}return str};var md5_cmn=function(q,a,b,x,s,t){return safe_add(bit_rol(safe_add(safe_add(a,q),safe_add(x,t)),s),b)};var md5_ff=function(a,b,c,d,x,s,t){return md5_cmn((b&c)|((~b)&d),a,b,x,s,t)};var md5_gg=function(a,b,c,d,x,s,t){return md5_cmn((b&d)|(c&(~d)),a,b,x,s,t)};var md5_hh=function(a,b,c,d,x,s,t){return md5_cmn(b^c^d,a,b,x,s,t)};var md5_ii=function(a,b,c,d,x,s,t){return md5_cmn(c^(b|(~d)),a,b,x,s,t)};var core_md5=function(x,len){x[len>>5]|=128<<((len)%32);x[(((len+64)>>>9)<<4)+14]=len;var a=1732584193;var b=-271733879;var c=-1732584194;var d=271733878;var olda,oldb,oldc,oldd;for(var i=0;i<x.length;i+=16){olda=a;oldb=b;oldc=c;oldd=d;a=md5_ff(a,b,c,d,x[i+0],7,-680876936);d=md5_ff(d,a,b,c,x[i+1],12,-389564586);c=md5_ff(c,d,a,b,x[i+2],17,606105819);b=md5_ff(b,c,d,a,x[i+3],22,-1044525330);a=md5_ff(a,b,c,d,x[i+4],7,-176418897);d=md5_ff(d,a,b,c,x[i+5],12,1200080426);c=md5_ff(c,d,a,b,x[i+6],17,-1473231341);b=md5_ff(b,c,d,a,x[i+7],22,-45705983);a=md5_ff(a,b,c,d,x[i+8],7,1770035416);d=md5_ff(d,a,b,c,x[i+9],12,-1958414417);c=md5_ff(c,d,a,b,x[i+10],17,-42063);b=md5_ff(b,c,d,a,x[i+11],22,-1990404162);a=md5_ff(a,b,c,d,x[i+12],7,1804603682);d=md5_ff(d,a,b,c,x[i+13],12,-40341101);c=md5_ff(c,d,a,b,x[i+14],17,-1502002290);b=md5_ff(b,c,d,a,x[i+15],22,1236535329);a=md5_gg(a,b,c,d,x[i+1],5,-165796510);d=md5_gg(d,a,b,c,x[i+6],9,-1069501632);c=md5_gg(c,d,a,b,x[i+11],14,643717713);b=md5_gg(b,c,d,a,x[i+0],20,-373897302);a=md5_gg(a,b,c,d,x[i+5],5,-701558691);d=md5_gg(d,a,b,c,x[i+10],9,38016083);c=md5_gg(c,d,a,b,x[i+15],14,-660478335);b=md5_gg(b,c,d,a,x[i+4],20,-405537848);a=md5_gg(a,b,c,d,x[i+9],5,568446438);d=md5_gg(d,a,b,c,x[i+14],9,-1019803690);c=md5_gg(c,d,a,b,x[i+3],14,-187363961);b=md5_gg(b,c,d,a,x[i+8],20,1163531501);a=md5_gg(a,b,c,d,x[i+13],5,-1444681467);d=md5_gg(d,a,b,c,x[i+2],9,-51403784);c=md5_gg(c,d,a,b,x[i+7],14,1735328473);b=md5_gg(b,c,d,a,x[i+12],20,-1926607734);a=md5_hh(a,b,c,d,x[i+5],4,-378558);d=md5_hh(d,a,b,c,x[i+8],11,-2022574463);c=md5_hh(c,d,a,b,x[i+11],16,1839030562);b=md5_hh(b,c,d,a,x[i+14],23,-35309556);a=md5_hh(a,b,c,d,x[i+1],4,-1530992060);d=md5_hh(d,a,b,c,x[i+4],11,1272893353);c=md5_hh(c,d,a,b,x[i+7],16,-155497632);b=md5_hh(b,c,d,a,x[i+10],23,-1094730640);a=md5_hh(a,b,c,d,x[i+13],4,681279174);d=md5_hh(d,a,b,c,x[i+0],11,-358537222);c=md5_hh(c,d,a,b,x[i+3],16,-722521979);b=md5_hh(b,c,d,a,x[i+6],23,76029189);a=md5_hh(a,b,c,d,x[i+9],4,-640364487);d=md5_hh(d,a,b,c,x[i+12],11,-421815835);c=md5_hh(c,d,a,b,x[i+15],16,530742520);b=md5_hh(b,c,d,a,x[i+2],23,-995338651);a=md5_ii(a,b,c,d,x[i+0],6,-198630844);d=md5_ii(d,a,b,c,x[i+7],10,1126891415);c=md5_ii(c,d,a,b,x[i+14],15,-1416354905);b=md5_ii(b,c,d,a,x[i+5],21,-57434055);a=md5_ii(a,b,c,d,x[i+12],6,1700485571);d=md5_ii(d,a,b,c,x[i+3],10,-1894986606);c=md5_ii(c,d,a,b,x[i+10],15,-1051523);b=md5_ii(b,c,d,a,x[i+1],21,-2054922799);a=md5_ii(a,b,c,d,x[i+8],6,1873313359);d=md5_ii(d,a,b,c,x[i+15],10,-30611744);c=md5_ii(c,d,a,b,x[i+6],15,-1560198380);b=md5_ii(b,c,d,a,x[i+13],21,1309151649);a=md5_ii(a,b,c,d,x[i+4],6,-145523070);d=md5_ii(d,a,b,c,x[i+11],10,-1120210379);c=md5_ii(c,d,a,b,x[i+2],15,718787259);b=md5_ii(b,c,d,a,x[i+9],21,-343485551);a=safe_add(a,olda);b=safe_add(b,oldb);c=safe_add(c,oldc);d=safe_add(d,oldd)}return[a,b,c,d]};var core_hmac_md5=function(key,data){var bkey=str2binl(key);if(bkey.length>16){bkey=core_md5(bkey,key.length*chrsz)}var ipad=new Array(16),opad=new Array(16);for(var i=0;i<16;i++){ipad[i]=bkey[i]^909522486;opad[i]=bkey[i]^1549556828}var hash=core_md5(ipad.concat(str2binl(data)),512+data.length*chrsz);return core_md5(opad.concat(hash),512+128)};var obj={hexdigest:function(s){return binl2hex(core_md5(str2binl(s),s.length*chrsz))},b64digest:function(s){return binl2b64(core_md5(str2binl(s),s.length*chrsz))},hash:function(s){return binl2str(core_md5(str2binl(s),s.length*chrsz))},hmac_hexdigest:function(key,data){return binl2hex(core_hmac_md5(key,data))},hmac_b64digest:function(key,data){return binl2b64(core_hmac_md5(key,data))},hmac_hash:function(key,data){return binl2str(core_hmac_md5(key,data))},test:function(){return MD5.hexdigest("abc")==="900150983cd24fb0d6963f7d28e17f72"}};return obj})();if(!Function.prototype.bind){Function.prototype.bind=function(obj){var func=this;return function(){return func.apply(obj,arguments)}}}if(!Function.prototype.prependArg){Function.prototype.prependArg=function(arg){var func=this;return function(){var newargs=[arg];for(var i=0;i<arguments.length;i++){newargs.push(arguments[i])}return func.apply(this,newargs)}}}if(!Array.prototype.indexOf){Array.prototype.indexOf=function(elt){var len=this.length;var from=Number(arguments[1])||0;from=(from<0)?Math.ceil(from):Math.floor(from);if(from<0){from+=len}for(;from<len;from++){if(from in this&&this[from]===elt){return from}}return -1}}(function(callback){var Strophe;function $build(name,attrs){return new Strophe.Builder(name,attrs)}function $msg(attrs){return new Strophe.Builder("message",attrs)}function $iq(attrs){return new Strophe.Builder("iq",attrs)}function $pres(attrs){return new Strophe.Builder("presence",attrs)}Strophe={VERSION:"1.0.1",NS:{HTTPBIND:"http://jabber.org/protocol/httpbind",BOSH:"urn:xmpp:xbosh",CLIENT:"jabber:client",AUTH:"jabber:iq:auth",ROSTER:"jabber:iq:roster",PROFILE:"jabber:iq:profile",DISCO_INFO:"http://jabber.org/protocol/disco#info",DISCO_ITEMS:"http://jabber.org/protocol/disco#items",MUC:"http://jabber.org/protocol/muc",SASL:"urn:ietf:params:xml:ns:xmpp-sasl",STREAM:"http://etherx.jabber.org/streams",BIND:"urn:ietf:params:xml:ns:xmpp-bind",SESSION:"urn:ietf:params:xml:ns:xmpp-session",VERSION:"jabber:iq:version",STANZAS:"urn:ietf:params:xml:ns:xmpp-stanzas"},addNamespace:function(name,value){Strophe.NS[name]=value},Status:{ERROR:0,CONNECTING:1,CONNFAIL:2,AUTHENTICATING:3,AUTHFAIL:4,CONNECTED:5,DISCONNECTED:6,DISCONNECTING:7,ATTACHED:8},LogLevel:{DEBUG:0,INFO:1,WARN:2,ERROR:3,FATAL:4},ElementType:{NORMAL:1,TEXT:3},TIMEOUT:1.1,SECONDARY_TIMEOUT:0.1,forEachChild:function(elem,elemName,func){var i,childNode;for(i=0;i<elem.childNodes.length;i++){childNode=elem.childNodes[i];if(childNode.nodeType==Strophe.ElementType.NORMAL&&(!elemName||this.isTagEqual(childNode,elemName))){func(childNode)}}},isTagEqual:function(el,name){return el.tagName.toLowerCase()==name.toLowerCase()},_xmlGenerator:null,_makeGenerator:function(){var doc;if(window.ActiveXObject){doc=new ActiveXObject("Microsoft.XMLDOM");doc.appendChild(doc.createElement("strophe"))}else{doc=document.implementation.createDocument("jabber:client","strophe",null)}return doc},xmlElement:function(name){if(!name){return null}var node=null;if(!Strophe._xmlGenerator){Strophe._xmlGenerator=Strophe._makeGenerator()}node=Strophe._xmlGenerator.createElement(name);var a,i,k;for(a=1;a<arguments.length;a++){if(!arguments[a]){continue}if(typeof(arguments[a])=="string"||typeof(arguments[a])=="number"){node.appendChild(Strophe.xmlTextNode(arguments[a]))}else{if(typeof(arguments[a])=="object"&&typeof(arguments[a].sort)=="function"){for(i=0;i<arguments[a].length;i++){if(typeof(arguments[a][i])=="object"&&typeof(arguments[a][i].sort)=="function"){node.setAttribute(arguments[a][i][0],arguments[a][i][1])}}}else{if(typeof(arguments[a])=="object"){for(k in arguments[a]){if(arguments[a].hasOwnProperty(k)){node.setAttribute(k,arguments[a][k])}}}}}}return node},xmlescape:function(text){text=text.replace(/\&/g,"&amp;");text=text.replace(/</g,"&lt;");text=text.replace(/>/g,"&gt;");return text},xmlTextNode:function(text){text=Strophe.xmlescape(text);if(!Strophe._xmlGenerator){Strophe._xmlGenerator=Strophe._makeGenerator()}return Strophe._xmlGenerator.createTextNode(text)},getText:function(elem){if(!elem){return null}var str="";if(elem.childNodes.length===0&&elem.nodeType==Strophe.ElementType.TEXT){str+=elem.nodeValue}for(var i=0;i<elem.childNodes.length;i++){if(elem.childNodes[i].nodeType==Strophe.ElementType.TEXT){str+=elem.childNodes[i].nodeValue}}return str},copyElement:function(elem){var i,el;if(elem.nodeType==Strophe.ElementType.NORMAL){el=Strophe.xmlElement(elem.tagName);for(i=0;i<elem.attributes.length;i++){el.setAttribute(elem.attributes[i].nodeName.toLowerCase(),elem.attributes[i].value)}for(i=0;i<elem.childNodes.length;i++){el.appendChild(Strophe.copyElement(elem.childNodes[i]))}}else{if(elem.nodeType==Strophe.ElementType.TEXT){el=Strophe.xmlTextNode(elem.nodeValue)}}return el},escapeNode:function(node){return node.replace(/^\s+|\s+$/g,"").replace(/\\/g,"\\5c").replace(/ /g,"\\20").replace(/\"/g,"\\22").replace(/\&/g,"\\26").replace(/\'/g,"\\27").replace(/\//g,"\\2f").replace(/:/g,"\\3a").replace(/</g,"\\3c").replace(/>/g,"\\3e").replace(/@/g,"\\40")},unescapeNode:function(node){return node.replace(/\\20/g," ").replace(/\\22/g,'"').replace(/\\26/g,"&").replace(/\\27/g,"'").replace(/\\2f/g,"/").replace(/\\3a/g,":").replace(/\\3c/g,"<").replace(/\\3e/g,">").replace(/\\40/g,"@").replace(/\\5c/g,"\\")},getNodeFromJid:function(jid){if(jid.indexOf("@")<0){return null}return jid.split("@")[0]},getDomainFromJid:function(jid){var bare=Strophe.getBareJidFromJid(jid);if(bare.indexOf("@")<0){return bare}else{var parts=bare.split("@");parts.splice(0,1);return parts.join("@")}},getResourceFromJid:function(jid){var s=jid.split("/");if(s.length<2){return null}s.splice(0,1);return s.join("/")},getBareJidFromJid:function(jid){return jid.split("/")[0]},log:function(level,msg){return},debug:function(msg){this.log(this.LogLevel.DEBUG,msg)},info:function(msg){this.log(this.LogLevel.INFO,msg)},warn:function(msg){this.log(this.LogLevel.WARN,msg)},error:function(msg){this.log(this.LogLevel.ERROR,msg)},fatal:function(msg){this.log(this.LogLevel.FATAL,msg)},serialize:function(elem){var result;if(!elem){return null}if(typeof(elem.tree)==="function"){elem=elem.tree()}var nodeName=elem.nodeName;var i,child;if(elem.getAttribute("_realname")){nodeName=elem.getAttribute("_realname")}result="<"+nodeName;for(i=0;i<elem.attributes.length;i++){if(elem.attributes[i].nodeName!="_realname"){result+=" "+elem.attributes[i].nodeName.toLowerCase()+"='"+elem.attributes[i].value.replace("&","&amp;").replace("'","&apos;").replace("<","&lt;")+"'"}}if(elem.childNodes.length>0){result+=">";for(i=0;i<elem.childNodes.length;i++){child=elem.childNodes[i];if(child.nodeType==Strophe.ElementType.NORMAL){result+=Strophe.serialize(child)}else{if(child.nodeType==Strophe.ElementType.TEXT){result+=child.nodeValue}}}result+="</"+nodeName+">"}else{result+="/>"}return result},_requestId:0,_connectionPlugins:{},addConnectionPlugin:function(name,ptype){Strophe._connectionPlugins[name]=ptype}};Strophe.Builder=function(name,attrs){if(name=="presence"||name=="message"||name=="iq"){if(attrs&&!attrs.xmlns){attrs.xmlns=Strophe.NS.CLIENT}else{if(!attrs){attrs={xmlns:Strophe.NS.CLIENT}}}}this.nodeTree=Strophe.xmlElement(name,attrs);this.node=this.nodeTree};Strophe.Builder.prototype={tree:function(){return this.nodeTree},toString:function(){return Strophe.serialize(this.nodeTree)},up:function(){this.node=this.node.parentNode;return this},attrs:function(moreattrs){for(var k in moreattrs){if(moreattrs.hasOwnProperty(k)){this.node.setAttribute(k,moreattrs[k])}}return this},c:function(name,attrs){var child=Strophe.xmlElement(name,attrs);this.node.appendChild(child);this.node=child;return this},cnode:function(elem){this.node.appendChild(elem);this.node=elem;return this},t:function(text){var child=Strophe.xmlTextNode(text);this.node.appendChild(child);return this}};Strophe.Handler=function(handler,ns,name,type,id,from,options){this.handler=handler;this.ns=ns;this.name=name;this.type=type;this.id=id;this.options=options||{matchbare:false};if(!this.options.matchBare){this.options.matchBare=false}if(this.options.matchBare){this.from=Strophe.getBareJidFromJid(from)}else{this.from=from}this.user=true};Strophe.Handler.prototype={isMatch:function(elem){var nsMatch;var from=null;if(this.options.matchBare){from=Strophe.getBareJidFromJid(elem.getAttribute("from"))}else{from=elem.getAttribute("from")}nsMatch=false;if(!this.ns){nsMatch=true}else{var self=this;Strophe.forEachChild(elem,null,function(elem){if(elem.getAttribute("xmlns")==self.ns){nsMatch=true}});nsMatch=nsMatch||elem.getAttribute("xmlns")==this.ns}if(nsMatch&&(!this.name||Strophe.isTagEqual(elem,this.name))&&(!this.type||elem.getAttribute("type")===this.type)&&(!this.id||elem.getAttribute("id")===this.id)&&(!this.from||from===this.from)){return true}return false},run:function(elem){var result=null;try{result=this.handler(elem)}catch(e){if(e.sourceURL){Strophe.fatal("error: "+this.handler+" "+e.sourceURL+":"+e.line+" - "+e.name+": "+e.message)}else{if(e.fileName){if(typeof(console)!="undefined"){console.trace();console.error(this.handler," - error - ",e,e.message)}Strophe.fatal("error: "+this.handler+" "+e.fileName+":"+e.lineNumber+" - "+e.name+": "+e.message)}else{Strophe.fatal("error: "+this.handler)}}throw e}return result},toString:function(){return"{Handler: "+this.handler+"("+this.name+","+this.id+","+this.ns+")}"}};Strophe.TimedHandler=function(period,handler){this.period=period;this.handler=handler;this.lastCalled=new Date().getTime();this.user=true};Strophe.TimedHandler.prototype={run:function(){this.lastCalled=new Date().getTime();return this.handler()},reset:function(){this.lastCalled=new Date().getTime()},toString:function(){return"{TimedHandler: "+this.handler+"("+this.period+")}"}};Strophe.Request=function(elem,func,rid,sends){this.id=++Strophe._requestId;this.xmlData=elem;this.data=Strophe.serialize(elem);this.origFunc=func;this.func=func;this.rid=rid;this.date=NaN;this.sends=sends||0;this.abort=false;this.dead=null;this.age=function(){if(!this.date){return 0}var now=new Date();return(now-this.date)/1000};this.timeDead=function(){if(!this.dead){return 0}var now=new Date();return(now-this.dead)/1000};this.xhr=this._newXHR()};Strophe.Request.prototype={getResponse:function(){var node=null;if(this.xhr.responseXML&&this.xhr.responseXML.documentElement){node=this.xhr.responseXML.documentElement;if(node.tagName=="parsererror"){Strophe.error("invalid response received");Strophe.error("responseText: "+this.xhr.responseText);Strophe.error("responseXML: "+Strophe.serialize(this.xhr.responseXML));throw"parsererror"}}else{if(this.xhr.responseText){Strophe.error("invalid response received");Strophe.error("responseText: "+this.xhr.responseText);Strophe.error("responseXML: "+Strophe.serialize(this.xhr.responseXML))}}return node},_newXHR:function(){var xhr=null;if(window.XMLHttpRequest){xhr=new XMLHttpRequest();if(xhr.overrideMimeType){xhr.overrideMimeType("text/xml")}}else{if(window.ActiveXObject){xhr=new ActiveXObject("Microsoft.XMLHTTP")}}xhr.onreadystatechange=this.func.prependArg(this);return xhr}};Strophe.Connection=function(service){this.service=service;this.jid="";this.rid=Math.floor(Math.random()*4294967295);this.sid=null;this.streamId=null;this.do_session=false;this.do_bind=false;this.timedHandlers=[];this.handlers=[];this.removeTimeds=[];this.removeHandlers=[];this.addTimeds=[];this.addHandlers=[];this._idleTimeout=null;this._disconnectTimeout=null;this.authenticated=false;this.disconnecting=false;this.connected=false;this.errors=0;this.paused=false;this.hold=1;this.wait=60;this.window=5;this._data=[];this._requests=[];this._uniqueId=Math.round(Math.random()*10000);this._sasl_success_handler=null;this._sasl_failure_handler=null;this._sasl_challenge_handler=null;this._idleTimeout=setTimeout(this._onIdle.bind(this),100);for(var k in Strophe._connectionPlugins){if(Strophe._connectionPlugins.hasOwnProperty(k)){var ptype=Strophe._connectionPlugins[k];var F=function(){};F.prototype=ptype;this[k]=new F();this[k].init(this)}}};Strophe.Connection.prototype={reset:function(){this.rid=Math.floor(Math.random()*4294967295);this.sid=null;this.streamId=null;this.do_session=false;this.do_bind=false;this.timedHandlers=[];this.handlers=[];this.removeTimeds=[];this.removeHandlers=[];this.addTimeds=[];this.addHandlers=[];this.authenticated=false;this.disconnecting=false;this.connected=false;this.errors=0;this._requests=[];this._uniqueId=Math.round(Math.random()*10000)},pause:function(){this.paused=true},resume:function(){this.paused=false},getUniqueId:function(suffix){if(typeof(suffix)=="string"||typeof(suffix)=="number"){return ++this._uniqueId+":"+suffix}else{return ++this._uniqueId+""}},connect:function(jid,pass,callback,wait,hold){this.jid=jid;this.pass=pass;this.connect_callback=callback;this.disconnecting=false;this.connected=false;this.authenticated=false;this.errors=0;this.wait=wait||this.wait;this.hold=hold||this.hold;this.domain=Strophe.getDomainFromJid(this.jid);var body=this._buildBody().attrs({to:this.domain,"xml:lang":"en",wait:this.wait,hold:this.hold,content:"text/xml; charset=utf-8",ver:"1.6","xmpp:version":"1.0","xmlns:xmpp":Strophe.NS.BOSH});this._changeConnectStatus(Strophe.Status.CONNECTING,null);this._requests.push(new Strophe.Request(body.tree(),this._onRequestStateChange.bind(this).prependArg(this._connect_cb.bind(this)),body.tree().getAttribute("rid")));this._throttledRequestHandler()},attach:function(jid,sid,rid,callback,wait,hold,wind){this.jid=jid;this.sid=sid;this.rid=rid;this.connect_callback=callback;this.domain=Strophe.getDomainFromJid(this.jid);this.authenticated=true;this.connected=true;this.wait=wait||this.wait;this.hold=hold||this.hold;this.window=wind||this.window;this._changeConnectStatus(Strophe.Status.ATTACHED,null)},xmlInput:function(elem){return},xmlOutput:function(elem){return},rawInput:function(data){return},rawOutput:function(data){return},send:function(elem){if(elem===null){return}if(typeof(elem.sort)==="function"){for(var i=0;i<elem.length;i++){this._queueData(elem[i])}}else{if(typeof(elem.tree)==="function"){this._queueData(elem.tree())}else{this._queueData(elem)}}this._throttledRequestHandler();clearTimeout(this._idleTimeout);this._idleTimeout=setTimeout(this._onIdle.bind(this),100)},flush:function(){clearTimeout(this._idleTimeout);this._onIdle()},sendIQ:function(elem,callback,errback,timeout){var timeoutHandler=null;var that=this;if(typeof(elem.tree)==="function"){elem=elem.tree()}var id=elem.getAttribute("id");if(!id){id=this.getUniqueId("sendIQ");elem.setAttribute("id",id)}var handler=this.addHandler(function(stanza){if(timeoutHandler){that.deleteTimedHandler(timeoutHandler)}var iqtype=stanza.getAttribute("type");if(iqtype==="result"){if(callback){callback(stanza)}}else{if(iqtype==="error"){if(errback){errback(stanza)}}else{throw {name:"StropheError",message:"Got bad IQ type of "+iqtype}}}},null,"iq",null,id);if(timeout){timeoutHandler=this.addTimedHandler(timeout,function(){that.deleteHandler(handler);if(errback){errback(null)}return false})}this.send(elem);return id},_queueData:function(element){if(element===null||!element.tagName||!element.childNodes){throw {name:"StropheError",message:"Cannot queue non-DOMElement."}}this._data.push(element)},_sendRestart:function(){this._data.push("restart");this._throttledRequestHandler();clearTimeout(this._idleTimeout);this._idleTimeout=setTimeout(this._onIdle.bind(this),100)},addTimedHandler:function(period,handler){var thand=new Strophe.TimedHandler(period,handler);this.addTimeds.push(thand);return thand},deleteTimedHandler:function(handRef){this.removeTimeds.push(handRef)},addHandler:function(handler,ns,name,type,id,from,options){var hand=new Strophe.Handler(handler,ns,name,type,id,from,options);this.addHandlers.push(hand);return hand},deleteHandler:function(handRef){this.removeHandlers.push(handRef)},disconnect:function(reason){this._changeConnectStatus(Strophe.Status.DISCONNECTING,reason);Strophe.info("Disconnect was called because: "+reason);if(this.connected){this._disconnectTimeout=this._addSysTimedHandler(3000,this._onDisconnectTimeout.bind(this));this._sendTerminate()}},_changeConnectStatus:function(status,condition){for(var k in Strophe._connectionPlugins){if(Strophe._connectionPlugins.hasOwnProperty(k)){var plugin=this[k];if(plugin.statusChanged){try{plugin.statusChanged(status,condition)}catch(err){Strophe.error(""+k+" plugin caused an exception changing status: "+err)}}}}if(this.connect_callback){try{this.connect_callback(status,condition)}catch(e){Strophe.error("User connection callback caused an exception: "+e)}}},_buildBody:function(){var bodyWrap=$build("body",{rid:this.rid++,xmlns:Strophe.NS.HTTPBIND});if(this.sid!==null){bodyWrap.attrs({sid:this.sid})}return bodyWrap},_removeRequest:function(req){Strophe.debug("removing request");var i;for(i=this._requests.length-1;i>=0;i--){if(req==this._requests[i]){this._requests.splice(i,1)}}req.xhr.onreadystatechange=function(){};this._throttledRequestHandler()},_restartRequest:function(i){var req=this._requests[i];if(req.dead===null){req.dead=new Date()}this._processRequest(i)},_processRequest:function(i){var req=this._requests[i];var reqStatus=-1;try{if(req.xhr.readyState==4){reqStatus=req.xhr.status}}catch(e){Strophe.error("caught an error in _requests["+i+"], reqStatus: "+reqStatus)}if(typeof(reqStatus)=="undefined"){reqStatus=-1}var time_elapsed=req.age();var primaryTimeout=(!isNaN(time_elapsed)&&time_elapsed>Math.floor(Strophe.TIMEOUT*this.wait));var secondaryTimeout=(req.dead!==null&&req.timeDead()>Math.floor(Strophe.SECONDARY_TIMEOUT*this.wait));var requestCompletedWithServerError=(req.xhr.readyState==4&&(reqStatus<1||reqStatus>=500));if(primaryTimeout||secondaryTimeout||requestCompletedWithServerError){if(secondaryTimeout){Strophe.error("Request "+this._requests[i].id+" timed out (secondary), restarting")}req.abort=true;req.xhr.abort();req.xhr.onreadystatechange=function(){};this._requests[i]=new Strophe.Request(req.xmlData,req.origFunc,req.rid,req.sends);req=this._requests[i]}if(req.xhr.readyState===0){Strophe.debug("request id "+req.id+"."+req.sends+" posting");req.date=new Date();try{req.xhr.open("POST",this.service,true)}catch(e2){Strophe.error("XHR open failed.");if(!this.connected){this._changeConnectStatus(Strophe.Status.CONNFAIL,"bad-service")}this.disconnect();return}var sendFunc=function(){req.xhr.send(req.data)};if(req.sends>1){var backoff=Math.pow(req.sends,3)*1000;setTimeout(sendFunc,backoff)}else{sendFunc()}req.sends++;this.xmlOutput(req.xmlData);this.rawOutput(req.data)}else{Strophe.debug("_processRequest: "+(i===0?"first":"second")+" request has readyState of "+req.xhr.readyState)}},_throttledRequestHandler:function(){if(!this._requests){Strophe.debug("_throttledRequestHandler called with undefined requests")}else{Strophe.debug("_throttledRequestHandler called with "+this._requests.length+" requests")}if(!this._requests||this._requests.length===0){return}if(this._requests.length>0){this._processRequest(0)}if(this._requests.length>1&&Math.abs(this._requests[0].rid-this._requests[1].rid)<this.window-1){this._processRequest(1)}},_onRequestStateChange:function(func,req){Strophe.debug("request id "+req.id+"."+req.sends+" state changed to "+req.xhr.readyState);if(req.abort){req.abort=false;return}var reqStatus;if(req.xhr.readyState==4){reqStatus=0;try{reqStatus=req.xhr.status}catch(e){}if(typeof(reqStatus)=="undefined"){reqStatus=0}if(this.disconnecting){if(reqStatus>=400){this._hitError(reqStatus);return}}var reqIs0=(this._requests[0]==req);var reqIs1=(this._requests[1]==req);if((reqStatus>0&&reqStatus<500)||req.sends>5){this._removeRequest(req);Strophe.debug("request id "+req.id+" should now be removed")}if(reqStatus==200){if(reqIs1||(reqIs0&&this._requests.length>0&&this._requests[0].age()>Math.floor(Strophe.SECONDARY_TIMEOUT*this.wait))){this._restartRequest(0)}Strophe.debug("request id "+req.id+"."+req.sends+" got 200");func(req);this.errors=0}else{Strophe.error("request id "+req.id+"."+req.sends+" error "+reqStatus+" happened");if(reqStatus===0||(reqStatus>=400&&reqStatus<600)||reqStatus>=12000){this._hitError(reqStatus);if(reqStatus>=400&&reqStatus<500){this._changeConnectStatus(Strophe.Status.DISCONNECTING,null);this._doDisconnect()}}}if(!((reqStatus>0&&reqStatus<10000)||req.sends>5)){this._throttledRequestHandler()}}},_hitError:function(reqStatus){this.errors++;Strophe.warn("request errored, status: "+reqStatus+", number of errors: "+this.errors);if(this.errors>4){this._onDisconnectTimeout()}},_doDisconnect:function(){Strophe.info("_doDisconnect was called");this.authenticated=false;this.disconnecting=false;this.sid=null;this.streamId=null;this.rid=Math.floor(Math.random()*4294967295);if(this.connected){this._changeConnectStatus(Strophe.Status.DISCONNECTED,null);this.connected=false}this.handlers=[];this.timedHandlers=[];this.removeTimeds=[];this.removeHandlers=[];this.addTimeds=[];this.addHandlers=[]},_dataRecv:function(req){try{var elem=req.getResponse()}catch(e){if(e!="parsererror"){throw e}this.disconnect("strophe-parsererror")}if(elem===null){return}this.xmlInput(elem);this.rawInput(Strophe.serialize(elem));var i,hand;while(this.removeHandlers.length>0){hand=this.removeHandlers.pop();i=this.handlers.indexOf(hand);if(i>=0){this.handlers.splice(i,1)}}while(this.addHandlers.length>0){this.handlers.push(this.addHandlers.pop())}if(this.disconnecting&&this._requests.length===0){this.deleteTimedHandler(this._disconnectTimeout);this._disconnectTimeout=null;this._doDisconnect();return}var typ=elem.getAttribute("type");var cond,conflict;if(typ!==null&&typ=="terminate"){cond=elem.getAttribute("condition");conflict=elem.getElementsByTagName("conflict");if(cond!==null){if(cond=="remote-stream-error"&&conflict.length>0){cond="conflict"}this._changeConnectStatus(Strophe.Status.CONNFAIL,cond)}else{this._changeConnectStatus(Strophe.Status.CONNFAIL,"unknown")}this.disconnect();return}var self=this;Strophe.forEachChild(elem,null,function(child){var i,newList;newList=self.handlers;self.handlers=[];for(i=0;i<newList.length;i++){var hand=newList[i];if(hand.isMatch(child)&&(self.authenticated||!hand.user)){if(hand.run(child)){self.handlers.push(hand)}}else{self.handlers.push(hand)}}})},_sendTerminate:function(){Strophe.info("_sendTerminate was called");var body=this._buildBody().attrs({type:"terminate"});if(this.authenticated){body.c("presence",{xmlns:Strophe.NS.CLIENT,type:"unavailable"})}this.disconnecting=true;var req=new Strophe.Request(body.tree(),this._onRequestStateChange.bind(this).prependArg(this._dataRecv.bind(this)),body.tree().getAttribute("rid"));this._requests.push(req);this._throttledRequestHandler()},_connect_cb:function(req){Strophe.info("_connect_cb was called");this.connected=true;var bodyWrap=req.getResponse();if(!bodyWrap){return}this.xmlInput(bodyWrap);this.rawInput(Strophe.serialize(bodyWrap));var typ=bodyWrap.getAttribute("type");var cond,conflict;if(typ!==null&&typ=="terminate"){cond=bodyWrap.getAttribute("condition");conflict=bodyWrap.getElementsByTagName("conflict");if(cond!==null){if(cond=="remote-stream-error"&&conflict.length>0){cond="conflict"}this._changeConnectStatus(Strophe.Status.CONNFAIL,cond)}else{this._changeConnectStatus(Strophe.Status.CONNFAIL,"unknown")}return}if(!this.sid){this.sid=bodyWrap.getAttribute("sid")}if(!this.stream_id){this.stream_id=bodyWrap.getAttribute("authid")}var wind=bodyWrap.getAttribute("requests");if(wind){this.window=parseInt(wind,10)}var hold=bodyWrap.getAttribute("hold");if(hold){this.hold=parseInt(hold,10)}var wait=bodyWrap.getAttribute("wait");if(wait){this.wait=parseInt(wait,10)}var do_sasl_plain=false;var do_sasl_digest_md5=false;var do_sasl_anonymous=false;var mechanisms=bodyWrap.getElementsByTagName("mechanism");var i,mech,auth_str,hashed_auth_str;if(mechanisms.length>0){for(i=0;i<mechanisms.length;i++){mech=Strophe.getText(mechanisms[i]);if(mech=="DIGEST-MD5"){do_sasl_digest_md5=true}else{if(mech=="PLAIN"){do_sasl_plain=true}else{if(mech=="ANONYMOUS"){do_sasl_anonymous=true}}}}}else{var body=this._buildBody();this._requests.push(new Strophe.Request(body.tree(),this._onRequestStateChange.bind(this).prependArg(this._connect_cb.bind(this)),body.tree().getAttribute("rid")));this._throttledRequestHandler();return}if(Strophe.getNodeFromJid(this.jid)===null&&do_sasl_anonymous){this._changeConnectStatus(Strophe.Status.AUTHENTICATING,null);this._sasl_success_handler=this._addSysHandler(this._sasl_success_cb.bind(this),null,"success",null,null);this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null);this.send($build("auth",{xmlns:Strophe.NS.SASL,mechanism:"ANONYMOUS"}).tree())}else{if(Strophe.getNodeFromJid(this.jid)===null){this._changeConnectStatus(Strophe.Status.CONNFAIL,"x-strophe-bad-non-anon-jid");this.disconnect()}else{if(do_sasl_digest_md5){this._changeConnectStatus(Strophe.Status.AUTHENTICATING,null);this._sasl_challenge_handler=this._addSysHandler(this._sasl_challenge1_cb.bind(this),null,"challenge",null,null);this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null);this.send($build("auth",{xmlns:Strophe.NS.SASL,mechanism:"DIGEST-MD5"}).tree())}else{if(do_sasl_plain){auth_str=Strophe.getBareJidFromJid(this.jid);auth_str=auth_str+"\u0000";auth_str=auth_str+Strophe.getNodeFromJid(this.jid);auth_str=auth_str+"\u0000";auth_str=auth_str+this.pass;this._changeConnectStatus(Strophe.Status.AUTHENTICATING,null);this._sasl_success_handler=this._addSysHandler(this._sasl_success_cb.bind(this),null,"success",null,null);this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null);hashed_auth_str=Base64.encode(auth_str);this.send($build("auth",{xmlns:Strophe.NS.SASL,mechanism:"PLAIN"}).t(hashed_auth_str).tree())}else{this._changeConnectStatus(Strophe.Status.AUTHENTICATING,null);this._addSysHandler(this._auth1_cb.bind(this),null,null,null,"_auth_1");this.send($iq({type:"get",to:this.domain,id:"_auth_1"}).c("query",{xmlns:Strophe.NS.AUTH}).c("username",{}).t(Strophe.getNodeFromJid(this.jid)).tree())}}}}},_sasl_challenge1_cb:function(elem){var attribMatch=/([a-z]+)=("[^"]+"|[^,"]+)(?:,|$)/;var challenge=Base64.decode(Strophe.getText(elem));var cnonce=MD5.hexdigest(Math.random()*1234567890);var realm="";var host=null;var nonce="";var qop="";var matches;this.deleteHandler(this._sasl_failure_handler);while(challenge.match(attribMatch)){matches=challenge.match(attribMatch);challenge=challenge.replace(matches[0],"");matches[2]=matches[2].replace(/^"(.+)"$/,"$1");switch(matches[1]){case"realm":realm=matches[2];break;case"nonce":nonce=matches[2];break;case"qop":qop=matches[2];break;case"host":host=matches[2];break}}var digest_uri="xmpp/"+this.domain;if(host!==null){digest_uri=digest_uri+"/"+host}var A1=MD5.hash(Strophe.getNodeFromJid(this.jid)+":"+realm+":"+this.pass)+":"+nonce+":"+cnonce;var A2="AUTHENTICATE:"+digest_uri;var responseText="";responseText+="username="+this._quote(Strophe.getNodeFromJid(this.jid))+",";responseText+="realm="+this._quote(realm)+",";responseText+="nonce="+this._quote(nonce)+",";responseText+="cnonce="+this._quote(cnonce)+",";responseText+='nc="00000001",';responseText+='qop="auth",';responseText+="digest-uri="+this._quote(digest_uri)+",";responseText+="response="+this._quote(MD5.hexdigest(MD5.hexdigest(A1)+":"+nonce+":00000001:"+cnonce+":auth:"+MD5.hexdigest(A2)))+",";responseText+='charset="utf-8"';this._sasl_challenge_handler=this._addSysHandler(this._sasl_challenge2_cb.bind(this),null,"challenge",null,null);this._sasl_success_handler=this._addSysHandler(this._sasl_success_cb.bind(this),null,"success",null,null);this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null);this.send($build("response",{xmlns:Strophe.NS.SASL}).t(Base64.encode(responseText)).tree());return false},_quote:function(str){return'"'+str.replace(/\\/g,"\\\\").replace(/"/g,'\\"')+'"'},_sasl_challenge2_cb:function(elem){this.deleteHandler(this._sasl_success_handler);this.deleteHandler(this._sasl_failure_handler);this._sasl_success_handler=this._addSysHandler(this._sasl_success_cb.bind(this),null,"success",null,null);this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null);this.send($build("response",{xmlns:Strophe.NS.SASL}).tree());return false},_auth1_cb:function(elem){var iq=$iq({type:"set",id:"_auth_2"}).c("query",{xmlns:Strophe.NS.AUTH}).c("username",{}).t(Strophe.getNodeFromJid(this.jid)).up().c("password").t(this.pass);if(!Strophe.getResourceFromJid(this.jid)){this.jid=Strophe.getBareJidFromJid(this.jid)+"/strophe"}iq.up().c("resource",{}).t(Strophe.getResourceFromJid(this.jid));this._addSysHandler(this._auth2_cb.bind(this),null,null,null,"_auth_2");this.send(iq.tree());return false},_sasl_success_cb:function(elem){Strophe.info("SASL authentication succeeded.");this.deleteHandler(this._sasl_failure_handler);this._sasl_failure_handler=null;if(this._sasl_challenge_handler){this.deleteHandler(this._sasl_challenge_handler);this._sasl_challenge_handler=null}this._addSysHandler(this._sasl_auth1_cb.bind(this),null,"stream:features",null,null);this._sendRestart();return false},_sasl_auth1_cb:function(elem){var i,child;for(i=0;i<elem.childNodes.length;i++){child=elem.childNodes[i];if(child.nodeName=="bind"){this.do_bind=true}if(child.nodeName=="session"){this.do_session=true}}if(!this.do_bind){this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);return false}else{this._addSysHandler(this._sasl_bind_cb.bind(this),null,null,null,"_bind_auth_2");var resource=Strophe.getResourceFromJid(this.jid);if(resource){this.send($iq({type:"set",id:"_bind_auth_2"}).c("bind",{xmlns:Strophe.NS.BIND}).c("resource",{}).t(resource).tree())}else{this.send($iq({type:"set",id:"_bind_auth_2"}).c("bind",{xmlns:Strophe.NS.BIND}).tree())}}return false},_sasl_bind_cb:function(elem){if(elem.getAttribute("type")=="error"){Strophe.info("SASL binding failed.");this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);return false}var bind=elem.getElementsByTagName("bind");var jidNode;if(bind.length>0){jidNode=bind[0].getElementsByTagName("jid");if(jidNode.length>0){this.jid=Strophe.getText(jidNode[0]);if(this.do_session){this._addSysHandler(this._sasl_session_cb.bind(this),null,null,null,"_session_auth_2");this.send($iq({type:"set",id:"_session_auth_2"}).c("session",{xmlns:Strophe.NS.SESSION}).tree())}else{this.authenticated=true;this._changeConnectStatus(Strophe.Status.CONNECTED,null)}}}else{Strophe.info("SASL binding failed.");this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);return false}},_sasl_session_cb:function(elem){if(elem.getAttribute("type")=="result"){this.authenticated=true;this._changeConnectStatus(Strophe.Status.CONNECTED,null)}else{if(elem.getAttribute("type")=="error"){Strophe.info("Session creation failed.");this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);return false}}return false},_sasl_failure_cb:function(elem){if(this._sasl_success_handler){this.deleteHandler(this._sasl_success_handler);this._sasl_success_handler=null}if(this._sasl_challenge_handler){this.deleteHandler(this._sasl_challenge_handler);this._sasl_challenge_handler=null}this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);return false},_auth2_cb:function(elem){if(elem.getAttribute("type")=="result"){this.authenticated=true;this._changeConnectStatus(Strophe.Status.CONNECTED,null)}else{if(elem.getAttribute("type")=="error"){this._changeConnectStatus(Strophe.Status.AUTHFAIL,null);this.disconnect()}}return false},_addSysTimedHandler:function(period,handler){var thand=new Strophe.TimedHandler(period,handler);thand.user=false;this.addTimeds.push(thand);return thand},_addSysHandler:function(handler,ns,name,type,id){var hand=new Strophe.Handler(handler,ns,name,type,id);hand.user=false;this.addHandlers.push(hand);return hand},_onDisconnectTimeout:function(){Strophe.info("_onDisconnectTimeout was called");var req;while(this._requests.length>0){req=this._requests.pop();req.abort=true;req.xhr.abort();req.xhr.onreadystatechange=function(){}}this._doDisconnect();return false},_onIdle:function(){var i,thand,since,newList;while(this.removeTimeds.length>0){thand=this.removeTimeds.pop();i=this.timedHandlers.indexOf(thand);if(i>=0){this.timedHandlers.splice(i,1)}}while(this.addTimeds.length>0){this.timedHandlers.push(this.addTimeds.pop())}var now=new Date().getTime();newList=[];for(i=0;i<this.timedHandlers.length;i++){thand=this.timedHandlers[i];if(this.authenticated||!thand.user){since=thand.lastCalled+thand.period;if(since-now<=0){if(thand.run()){newList.push(thand)}}else{newList.push(thand)}}}this.timedHandlers=newList;var body,time_elapsed;if(this.authenticated&&this._requests.length===0&&this._data.length===0&&!this.disconnecting){Strophe.info("no requests during idle cycle, sending blank request");this._data.push(null)}if(this._requests.length<2&&this._data.length>0&&!this.paused){body=this._buildBody();for(i=0;i<this._data.length;i++){if(this._data[i]!==null){if(this._data[i]==="restart"){body.attrs({to:this.domain,"xml:lang":"en","xmpp:restart":"true","xmlns:xmpp":Strophe.NS.BOSH})}else{body.cnode(this._data[i]).up()}}}delete this._data;this._data=[];this._requests.push(new Strophe.Request(body.tree(),this._onRequestStateChange.bind(this).prependArg(this._dataRecv.bind(this)),body.tree().getAttribute("rid")));this._processRequest(this._requests.length-1)}if(this._requests.length>0){time_elapsed=this._requests[0].age();if(this._requests[0].dead!==null){if(this._requests[0].timeDead()>Math.floor(Strophe.SECONDARY_TIMEOUT*this.wait)){this._throttledRequestHandler()}}if(time_elapsed>Math.floor(Strophe.TIMEOUT*this.wait)){Strophe.warn("Request "+this._requests[0].id+" timed out, over "+Math.floor(Strophe.TIMEOUT*this.wait)+" seconds since last activity");this._throttledRequestHandler()}}clearTimeout(this._idleTimeout);this._idleTimeout=setTimeout(this._onIdle.bind(this),100)}};if(callback){callback(Strophe,$build,$msg,$iq,$pres)}})(function(){window.Strophe=arguments[0];window.$build=arguments[1];window.$msg=arguments[2];window.$iq=arguments[3];window.$pres=arguments[4]});
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/strophe.muc.js b/mod/beechat/views/default/js/strophe.muc.js
new file mode 100644
index 000000000..954ca8730
--- /dev/null
+++ b/mod/beechat/views/default/js/strophe.muc.js
@@ -0,0 +1,300 @@
+/*
+Plugin to implement the MUC extension. http://xmpp.org/extensions/xep-0045.html
+*/
+/* jslint configuration: */
+/* global document, window, setTimeout, clearTimeout, console,
+    XMLHttpRequest, ActiveXObject,
+    Base64, MD5,
+    Strophe, $build, $msg, $iq, $pres 
+*/
+
+Strophe.addConnectionPlugin('muc', {
+    _connection: null,
+    // The plugin must have the init function
+    /***Function
+    Initialize the MUC plugin. Sets the correct connection object and
+    extends the namesace.
+    */
+    init: function(conn) {
+        this._connection = conn;
+        /* extend name space 
+         *  NS.MUC - XMPP Multi-user chat namespace
+         *              from XEP 45.  
+         *
+         */
+        Strophe.addNamespace('MUC_OWNER', Strophe.NS.MUC+"#owner");
+        Strophe.addNamespace('MUC_ADMIN', Strophe.NS.MUC+"#admin");
+    },
+    /***Function
+    Join a multi-user chat room
+    Parameters:
+    (String) room - The multi-user chat room to join.
+    (String) nick - The nickname to use in the chat room. Optional
+    (Function) msg_handler_cb - The function call to handle messages from the
+    specified chat room.
+    (Function) pres_handler_cb - The function call back to handle presence
+    in the chat room.
+    (String) password - The optional password to use. (password protected
+    rooms only)
+    */
+    join: function(room, nick, msg_handler_cb, pres_handler_cb, password) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var msg = $pres({from: this._connection.jid,
+                         to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        if (password)
+        {
+            var password_elem = Strophe.xmlElement("password", 
+                                                   [],
+                                                   password);
+            msg.cnode(password_elem);
+        }
+        if (msg_handler_cb)
+        {
+            this._connection.addHandler(function(stanza) {
+                var from = stanza.getAttribute('from');
+                var roomname = from.split("/");
+                // filter on room name
+                if (roomname.length > 1 && roomname[0] == room)
+                {
+                    return msg_handler_cb(stanza);
+                }
+                else
+                {
+                    return true;
+                }
+            },
+                                        null,
+                                        "message",
+                                        null,
+                                        null,
+                                        null);
+        }
+        if (pres_handler_cb)
+        {
+            this._connection.addHandler(function(stanza) {
+                var xquery = stanza.getElementsByTagName("x");
+                if (xquery.length > 0)
+                {
+                    //Handle only MUC user protocol
+                    for (var i = 0; i < xquery.length; i++)
+                    {
+                        var xmlns = xquery[i].getAttribute("xmlns");
+                        
+                        if (xmlns && xmlns.match(Strophe.NS.MUC))
+                        {
+                            return pres_handler_cb(stanza);
+                        }
+                    }
+                }
+                return true;                
+            },
+                                        null,
+                                        "presence",
+                                        null,
+                                        null,
+                                        null);
+        }
+        this._connection.send(msg);
+    },
+    /***Function
+    Leave a multi-user chat room
+    Parameters:
+    (String) room - The multi-user chat room to leave.
+    (String) nick - The nick name used in the room.
+    (Function) handler_cb - Optional function to handle the successful leave.
+    Returns:
+    iqid - The unique id for the room leave.
+    */
+    leave: function(room, nick, handler_cb) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var presenceid = this._connection.getUniqueId();
+        var presence = $pres({type: "unavailable",
+                              id: presenceid,
+                              from: this._connection.jid,
+                              to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        this._connection.addHandler(handler_cb,
+                                    null,
+                                    "presence",
+                                    null,
+                                    presenceid,
+                                    null);
+        this._connection.send(presence);
+        return presenceid;
+    },
+    /***Function
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) nick - The nick name used in the chat room.
+    (String) message - The message to send to the room.
+    Returns:
+    msgiq - the unique id used to send the message
+    */
+    message: function(room, nick, message) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var msgid = this._connection.getUniqueId();
+        var msg = $msg({to: room_nick,
+                        from: this._connection.jid,
+                        type: "groupchat",
+                        id: msgid}).c("body",
+                                      {xmlns: Strophe.NS.CLIENT}).t(message);
+        msg.up().c("x", {xmlns: "jabber:x:event"}).c("composing");
+        this._connection.send(msg);
+        return msgid;
+    },
+    /***Function
+    Start a room configuration.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to send the configuration request
+    */
+    configure: function(room) {
+        //send iq to start room configuration
+        var config = $iq({to:room,
+                          type: "get"}).c("query",
+                                          {xmlns: Strophe.NS.MUC_OWNER});
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                               function(){},
+                               function(){});
+    },
+    /***Function
+    Cancel the room configuration
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to cancel the configuration.
+    */
+    cancelConfigure: function(room) {
+        //send iq to start room configuration
+        var config = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data", type: "cancel"});
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                                       function(){},
+                                       function(){});
+    },
+    /***Function
+    Save a room configuration.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (Array) configarray - an array of form elements used to configure the room.
+    Returns:
+    id - the unique id used to save the configuration.
+    */
+    saveConfiguration: function(room, configarray) {
+        var config = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data", type: "submit"});
+        for (var i = 0; i >= configarray.length; i++) {
+            config.cnode(configarray[i]);
+        }
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                                       function(){},
+                                       function(){});        
+    },
+    /***Function
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to create the chat room.
+    */
+    createInstantRoom: function(room) {
+        var roomiq = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data",
+                     type: "submit"});
+        return this._connection.sendIQ(roomiq.tree(),
+                                       function() {},
+                                       function() {});
+    },
+    /***
+     Set the topic of the chat room.
+     Parameters:
+     (String) room - The multi-user chat room name.
+     (String) topic - Topic message.
+     */
+    setTopic: function(room, topic) {
+        var msg = $msg({to: room,
+                        from: this._connection.jid,
+                        type: "groupchat"})
+            .c("subject", {xmlns: "jabber:client"}).t(topic);
+        this._connection.send(msg.tree());
+    },
+    /***Function
+    Changes the role and affiliation of a member of a MUC room.
+    The modification can only be done by a room moderator. An error will be
+    returned if the user doesn't have permission.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) nick - The nick name of the user to modify.
+    (String) role - The new role of the user.
+    (String) affiliation - The new affiliation of the user.
+    (String) reason - The reason for the change.
+    Returns:
+    iq - the id of the mode change request.
+    */
+    modifyUser: function(room, nick, role, affiliation, reason) {
+        var item_attrs = {nick: Strophe.escapeNode(nick)};
+        if (role !== null)
+        {
+            item_attrs.role = role;
+        }
+        if (affiliation !== null)
+        {
+            item_attrs.affiliation = affiliation;
+        }
+        var item = $build("item", item_attrs);
+        if (reason !== null)
+        {
+            item.cnode(Strophe.xmlElement("reason", reason));
+        }
+        var roomiq = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER}).cnode(item.tree());
+        return this._connection.sendIQ(roomiq.tree(),
+                                       function() {},
+                                       function() {});
+    },
+    /***Function
+    Change the current users nick name.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) user - The new nick name.
+    */
+    changeNick: function(room, user) {
+        var room_nick = this.test_append_nick(room, user);
+        var presence = $pres({from: this._connection.jid,
+                              to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        this._connection.send(presence.tree());
+    },
+    /***Function
+    List all chat room available on a server.
+    Parameters:
+    (String) server - name of chat server.
+    (String) handle_cb - Function to call for room list return.
+    */
+    listRooms: function(server, handle_cb) {
+        var iq = $iq({to: server,
+                      from: this._connection.jid,
+                      type: "get"})
+            .c("query",{xmlns: Strophe.NS.DISCO_ITEMS});        
+        this._connection.sendIQ(iq, handle_cb, function(){});        
+    },
+    test_append_nick: function(room, nick) {
+        var room_nick = room;
+        if (nick) 
+        {
+            room_nick += "/" + Strophe.escapeNode(nick); 
+        }
+        return room_nick;
+    }
+});
+\ No newline at end of file
diff --git a/mod/beechat/views/default/js/strophe.muc.js.php b/mod/beechat/views/default/js/strophe.muc.js.php
new file mode 100644
index 000000000..e10750d02
--- /dev/null
+++ b/mod/beechat/views/default/js/strophe.muc.js.php
@@ -0,0 +1,300 @@
+/*
+Plugin to implement the MUC extension. http://xmpp.org/extensions/xep-0045.html
+*/
+/* jslint configuration: */
+/* global document, window, setTimeout, clearTimeout, console,
+    XMLHttpRequest, ActiveXObject,
+    Base64, MD5,
+    Strophe, $build, $msg, $iq, $pres 
+*/
+
+Strophe.addConnectionPlugin('muc', {
+    _connection: null,
+    // The plugin must have the init function
+    /***Function
+    Initialize the MUC plugin. Sets the correct connection object and
+    extends the namesace.
+    */
+    init: function(conn) {
+        this._connection = conn;
+        /* extend name space 
+         *  NS.MUC - XMPP Multi-user chat namespace
+         *              from XEP 45.  
+         *
+         */
+        Strophe.addNamespace('MUC_OWNER', Strophe.NS.MUC+"#owner");
+        Strophe.addNamespace('MUC_ADMIN', Strophe.NS.MUC+"#admin");
+    },
+    /***Function
+    Join a multi-user chat room
+    Parameters:
+    (String) room - The multi-user chat room to join.
+    (String) nick - The nickname to use in the chat room. Optional
+    (Function) msg_handler_cb - The function call to handle messages from the
+    specified chat room.
+    (Function) pres_handler_cb - The function call back to handle presence
+    in the chat room.
+    (String) password - The optional password to use. (password protected
+    rooms only)
+    */
+    join: function(room, nick, msg_handler_cb, pres_handler_cb, password) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var msg = $pres({from: this._connection.jid,
+                         to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        if (password)
+        {
+            var password_elem = Strophe.xmlElement("password", 
+                                                   [],
+                                                   password);
+            msg.cnode(password_elem);
+        }
+        if (msg_handler_cb)
+        {
+            this._connection.addHandler(function(stanza) {
+                var from = stanza.getAttribute('from');
+                var roomname = from.split("/");
+                // filter on room name
+                if (roomname.length > 1 && roomname[0] == room)
+                {
+                    return msg_handler_cb(stanza);
+                }
+                else
+                {
+                    return true;
+                }
+            },
+                                        null,
+                                        "message",
+                                        null,
+                                        null,
+                                        null);
+        }
+        if (pres_handler_cb)
+        {
+            this._connection.addHandler(function(stanza) {
+                var xquery = stanza.getElementsByTagName("x");
+                if (xquery.length > 0)
+                {
+                    //Handle only MUC user protocol
+                    for (var i = 0; i < xquery.length; i++)
+                    {
+                        var xmlns = xquery[i].getAttribute("xmlns");
+                        
+                        if (xmlns && xmlns.match(Strophe.NS.MUC))
+                        {
+                            return pres_handler_cb(stanza);
+                        }
+                    }
+                }
+                return true;                
+            },
+                                        null,
+                                        "presence",
+                                        null,
+                                        null,
+                                        null);
+        }
+        this._connection.send(msg);
+    },
+    /***Function
+    Leave a multi-user chat room
+    Parameters:
+    (String) room - The multi-user chat room to leave.
+    (String) nick - The nick name used in the room.
+    (Function) handler_cb - Optional function to handle the successful leave.
+    Returns:
+    iqid - The unique id for the room leave.
+    */
+    leave: function(room, nick, handler_cb) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var presenceid = this._connection.getUniqueId();
+        var presence = $pres({type: "unavailable",
+                              id: presenceid,
+                              from: this._connection.jid,
+                              to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        this._connection.addHandler(handler_cb,
+                                    null,
+                                    "presence",
+                                    null,
+                                    presenceid,
+                                    null);
+        this._connection.send(presence);
+        return presenceid;
+    },
+    /***Function
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) nick - The nick name used in the chat room.
+    (String) message - The message to send to the room.
+    Returns:
+    msgiq - the unique id used to send the message
+    */
+    message: function(room, nick, message) {
+        var room_nick = this.test_append_nick(room, nick);        
+        var msgid = this._connection.getUniqueId();
+        var msg = $msg({to: room_nick,
+                        from: this._connection.jid,
+                        type: "groupchat",
+                        id: msgid}).c("body",
+                                      {xmlns: Strophe.NS.CLIENT}).t(message);
+        msg.up().c("x", {xmlns: "jabber:x:event"}).c("composing");
+        this._connection.send(msg);
+        return msgid;
+    },
+    /***Function
+    Start a room configuration.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to send the configuration request
+    */
+    configure: function(room) {
+        //send iq to start room configuration
+        var config = $iq({to:room,
+                          type: "get"}).c("query",
+                                          {xmlns: Strophe.NS.MUC_OWNER});
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                               function(){},
+                               function(){});
+    },
+    /***Function
+    Cancel the room configuration
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to cancel the configuration.
+    */
+    cancelConfigure: function(room) {
+        //send iq to start room configuration
+        var config = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data", type: "cancel"});
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                                       function(){},
+                                       function(){});
+    },
+    /***Function
+    Save a room configuration.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (Array) configarray - an array of form elements used to configure the room.
+    Returns:
+    id - the unique id used to save the configuration.
+    */
+    saveConfiguration: function(room, configarray) {
+        var config = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data", type: "submit"});
+        for (var i = 0; i >= configarray.length; i++) {
+            config.cnode(configarray[i]);
+        }
+        var stanza = config.tree();
+        return this._connection.sendIQ(stanza,
+                                       function(){},
+                                       function(){});        
+    },
+    /***Function
+    Parameters:
+    (String) room - The multi-user chat room name.
+    Returns:
+    id - the unique id used to create the chat room.
+    */
+    createInstantRoom: function(room) {
+        var roomiq = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER})
+            .c("x", {xmlns: "jabber:x:data",
+                     type: "submit"});
+        return this._connection.sendIQ(roomiq.tree(),
+                                       function() {},
+                                       function() {});
+    },
+    /***
+     Set the topic of the chat room.
+     Parameters:
+     (String) room - The multi-user chat room name.
+     (String) topic - Topic message.
+     */
+    setTopic: function(room, topic) {
+        var msg = $msg({to: room,
+                        from: this._connection.jid,
+                        type: "groupchat"})
+            .c("subject", {xmlns: "jabber:client"}).t(topic);
+        this._connection.send(msg.tree());
+    },
+    /***Function
+    Changes the role and affiliation of a member of a MUC room.
+    The modification can only be done by a room moderator. An error will be
+    returned if the user doesn't have permission.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) nick - The nick name of the user to modify.
+    (String) role - The new role of the user.
+    (String) affiliation - The new affiliation of the user.
+    (String) reason - The reason for the change.
+    Returns:
+    iq - the id of the mode change request.
+    */
+    modifyUser: function(room, nick, role, affiliation, reason) {
+        var item_attrs = {nick: Strophe.escapeNode(nick)};
+        if (role !== null)
+        {
+            item_attrs.role = role;
+        }
+        if (affiliation !== null)
+        {
+            item_attrs.affiliation = affiliation;
+        }
+        var item = $build("item", item_attrs);
+        if (reason !== null)
+        {
+            item.cnode(Strophe.xmlElement("reason", reason));
+        }
+        var roomiq = $iq({to: room,
+                          type: "set"})
+            .c("query", {xmlns: Strophe.NS.MUC_OWNER}).cnode(item.tree());
+        return this._connection.sendIQ(roomiq.tree(),
+                                       function() {},
+                                       function() {});
+    },
+    /***Function
+    Change the current users nick name.
+    Parameters:
+    (String) room - The multi-user chat room name.
+    (String) user - The new nick name.
+    */
+    changeNick: function(room, user) {
+        var room_nick = this.test_append_nick(room, user);
+        var presence = $pres({from: this._connection.jid,
+                              to: room_nick})
+            .c("x",{xmlns: Strophe.NS.MUC});
+        this._connection.send(presence.tree());
+    },
+    /***Function
+    List all chat room available on a server.
+    Parameters:
+    (String) server - name of chat server.
+    (String) handle_cb - Function to call for room list return.
+    */
+    listRooms: function(server, handle_cb) {
+        var iq = $iq({to: server,
+                      from: this._connection.jid,
+                      type: "get"})
+            .c("query",{xmlns: Strophe.NS.DISCO_ITEMS});        
+        this._connection.sendIQ(iq, handle_cb, function(){});        
+    },
+    test_append_nick: function(room, nick) {
+        var room_nick = room;
+        if (nick) 
+        {
+            room_nick += "/" + Strophe.escapeNode(nick); 
+        }
+        return room_nick;
+    }
+});
diff --git a/mod/beechat/views/default/settings/beechat/edit.php b/mod/beechat/views/default/settings/beechat/edit.php
new file mode 100755
index 000000000..ec4ab08de
--- /dev/null
+++ b/mod/beechat/views/default/settings/beechat/edit.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ *	Barter Plugin
+ *	@package Barters
+ **/
+	$domain = elgg_get_plugin_setting("domain", "beechat");
+	//$group_domain = elgg_get_plugin_setting("groupdomain", "beechat");
+	$xmlrpc_ip = elgg_get_plugin_setting("xmlrpcip", "beechat");
+	$dbname = elgg_get_plugin_setting("dbname", "beechat");
+	$dbhost = elgg_get_plugin_setting("dbhost", "beechat");
+	$dbuser = elgg_get_plugin_setting("dbuser", "beechat");
+	$dbpassword = elgg_get_plugin_setting("dbpassword", "beechat");
+?>
+<p>
+	<?php echo elgg_echo('beechat:domain'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[domain]','value' => $domain)); ?>
+	<!--<?php echo elgg_echo('beechat:groupdomain'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[groupdomain]','value' => $group_domain)); ?>-->
+	<?php echo elgg_echo('beechat:xmlrpcip'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[xmlrpcip]','value' => $xmlrpc_ip)); ?>
+	<?php echo elgg_echo('beechat:dbname'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[dbname]','value' => $dbname)); ?>
+	<?php echo elgg_echo('beechat:dbhost'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[dbhost]','value' => $dbhost)); ?>
+	<?php echo elgg_echo('beechat:dbuser'); ?>
+	<?php echo elgg_view('input/text', array('internalname' => 'params[dbuser]','value' => $dbuser)); ?>
+	<?php echo elgg_echo('beechat:dbpassword'); ?>
+	<?php echo elgg_view('input/password', array('internalname' => 'params[dbpassword]','value' => $dbpassword)); ?>
+
+</p>
+
diff --git a/mod/blog/actions/blog/auto_save_revision.php b/mod/blog/actions/blog/auto_save_revision.php
new file mode 100644
index 000000000..e33edfaab
--- /dev/null
+++ b/mod/blog/actions/blog/auto_save_revision.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Action called by AJAX periodic auto saving when editing.
+ *
+ * @package Blog
+ */
+
+$guid = get_input('guid');
+$user = elgg_get_logged_in_user_entity();
+$title = htmlspecialchars(get_input('title', '', false), ENT_QUOTES, 'UTF-8');
+$description = get_input('description');
+$excerpt = get_input('excerpt');
+
+// because get_input() doesn't use the default if the input is ''
+if (empty($excerpt)) {
+	$excerpt = $description;
+}
+
+// store errors to pass along
+$error = FALSE;
+
+if ($title && $description) {
+
+	if ($guid) {
+		$entity = get_entity($guid);
+		if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+			$blog = $entity;
+		} else {
+			$error = elgg_echo('blog:error:post_not_found');
+		}
+	} else {
+		$blog = new ElggBlog();
+		$blog->subtype = 'blog';
+
+		// force draft and private for autosaves.
+		$blog->status = 'unsaved_draft';
+		$blog->access_id = ACCESS_PRIVATE;
+		$blog->title = $title;
+		$blog->description = $description;
+		$blog->excerpt = elgg_get_excerpt($excerpt);
+
+		// mark this as a brand new post so we can work out the
+		// river / revision logic in the real save action.
+		$blog->new_post = TRUE;
+
+		if (!$blog->save()) {
+			$error = elgg_echo('blog:error:cannot_save');
+		}
+	}
+
+	// creat draft annotation
+	if (!$error) {
+		// annotations don't have a "time_updated" so
+		// we have to delete everything or the times are wrong.
+
+		// don't save if nothing changed
+		if ($auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1)) {
+			$auto_save = $auto_save_annotations[0];
+		} else {
+			$auto_save == FALSE;
+		}
+
+		if (!$auto_save) {
+			$annotation_id = $blog->annotate('blog_auto_save', $description);
+		} elseif ($auto_save instanceof ElggAnnotation && $auto_save->value != $description) {
+			$blog->deleteAnnotations('blog_auto_save');
+			$annotation_id = $blog->annotate('blog_auto_save', $description);
+		} elseif ($auto_save instanceof ElggAnnotation && $auto_save->value == $description) {
+			// this isn't an error because we have an up to date annotation.
+			$annotation_id = $auto_save->id;
+		}
+
+		if (!$annotation_id) {
+			$error = elgg_echo('blog:error:cannot_auto_save');
+		}
+	}
+} else {
+	$error = elgg_echo('blog:error:missing:description');
+}
+
+if ($error) {
+	$json = array('success' => FALSE, 'message' => $error);
+	echo json_encode($json);
+} else {
+	$msg = elgg_echo('blog:message:saved');
+	$json = array('success' => TRUE, 'message' => $msg, 'guid' => $blog->getGUID());
+	echo json_encode($json);
+}
+exit;
diff --git a/mod/blog/actions/blog/delete.php b/mod/blog/actions/blog/delete.php
new file mode 100644
index 000000000..ca4eb8a7f
--- /dev/null
+++ b/mod/blog/actions/blog/delete.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Delete blog entity
+ *
+ * @package Blog
+ */
+
+$blog_guid = get_input('guid');
+$blog = get_entity($blog_guid);
+
+if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+	$container = get_entity($blog->container_guid);
+	if ($blog->delete()) {
+		system_message(elgg_echo('blog:message:deleted_post'));
+		if (elgg_instanceof($container, 'group')) {
+			forward("blog/group/$container->guid/all");
+		} else {
+			forward("blog/owner/$container->username");
+		}
+	} else {
+		register_error(elgg_echo('blog:error:cannot_delete_post'));
+	}
+} else {
+	register_error(elgg_echo('blog:error:post_not_found'));
+}
+
+forward(REFERER);
+\ No newline at end of file
diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
new file mode 100644
index 000000000..82a9e6c51
--- /dev/null
+++ b/mod/blog/actions/blog/save.php
@@ -0,0 +1,182 @@
+<?php
+/**
+ * Save blog entity
+ *
+ * Can be called by clicking save button or preview button. If preview button,
+ * we automatically save as draft. The preview button is only available for
+ * non-published drafts.
+ *
+ * Drafts are saved with the access set to private.
+ *
+ * @package Blog
+ */
+
+// start a new sticky form session in case of failure
+elgg_make_sticky_form('blog');
+
+// save or preview
+$save = (bool)get_input('save');
+
+// store errors to pass along
+$error = FALSE;
+$error_forward_url = REFERER;
+$user = elgg_get_logged_in_user_entity();
+
+// edit or create a new entity
+$guid = get_input('guid');
+
+if ($guid) {
+	$entity = get_entity($guid);
+	if (elgg_instanceof($entity, 'object', 'blog') && $entity->canEdit()) {
+		$blog = $entity;
+	} else {
+		register_error(elgg_echo('blog:error:post_not_found'));
+		forward(get_input('forward', REFERER));
+	}
+
+	// save some data for revisions once we save the new edit
+	$revision_text = $blog->description;
+	$new_post = $blog->new_post;
+} else {
+	$blog = new ElggBlog();
+	$blog->subtype = 'blog';
+	$new_post = TRUE;
+}
+
+// set the previous status for the hooks to update the time_created and river entries
+$old_status = $blog->status;
+
+// set defaults and required values.
+$values = array(
+	'title' => '',
+	'description' => '',
+	'status' => 'draft',
+	'access_id' => ACCESS_DEFAULT,
+	'comments_on' => 'On',
+	'excerpt' => '',
+	'tags' => '',
+	'container_guid' => (int)get_input('container_guid'),
+);
+
+// fail if a required entity isn't set
+$required = array('title', 'description');
+
+// load from POST and do sanity and access checking
+foreach ($values as $name => $default) {
+	if ($name === 'title') {
+		$value = htmlspecialchars(get_input('title', $default, false), ENT_QUOTES, 'UTF-8');
+	} else {
+		$value = get_input($name, $default);
+	}
+
+	if (in_array($name, $required) && empty($value)) {
+		$error = elgg_echo("blog:error:missing:$name");
+	}
+
+	if ($error) {
+		break;
+	}
+
+	switch ($name) {
+		case 'tags':
+			$values[$name] = string_to_tag_array($value);
+			break;
+
+		case 'excerpt':
+			if ($value) {
+				$values[$name] = elgg_get_excerpt($value);
+			}
+			break;
+
+		case 'container_guid':
+			// this can't be empty or saving the base entity fails
+			if (!empty($value)) {
+				if (can_write_to_container($user->getGUID(), $value)) {
+					$values[$name] = $value;
+				} else {
+					$error = elgg_echo("blog:error:cannot_write_to_container");
+				}
+			} else {
+				unset($values[$name]);
+			}
+			break;
+
+		default:
+			$values[$name] = $value;
+			break;
+	}
+}
+
+// if preview, force status to be draft
+if ($save == false) {
+	$values['status'] = 'draft';
+}
+
+// if draft, set access to private and cache the future access
+if ($values['status'] == 'draft') {
+	$values['future_access'] = $values['access_id'];
+	$values['access_id'] = ACCESS_PRIVATE;
+}
+
+// assign values to the entity, stopping on error.
+if (!$error) {
+	foreach ($values as $name => $value) {
+		$blog->$name = $value;
+	}
+}
+
+// only try to save base entity if no errors
+if (!$error) {
+	if ($blog->save()) {
+		// remove sticky form entries
+		elgg_clear_sticky_form('blog');
+
+		// remove autosave draft if exists
+		$blog->deleteAnnotations('blog_auto_save');
+
+		// no longer a brand new post.
+		$blog->deleteMetadata('new_post');
+
+		// if this was an edit, create a revision annotation
+		if (!$new_post && $revision_text) {
+			$blog->annotate('blog_revision', $revision_text);
+		}
+
+		system_message(elgg_echo('blog:message:saved'));
+
+		$status = $blog->status;
+
+		// add to river if changing status or published, regardless of new post
+		// because we remove it for drafts.
+		if (($new_post || $old_status == 'draft') && $status == 'published') {
+			add_to_river('river/object/blog/create', 'create', $blog->owner_guid, $blog->getGUID());
+
+			// we only want notifications sent when post published
+			register_notification_object('object', 'blog', elgg_echo('blog:newpost'));
+			elgg_trigger_event('publish', 'object', $blog);
+
+			// reset the creation time for posts that move from draft to published
+			if ($guid) {
+				$blog->time_created = time();
+				$blog->save();
+			}
+		} elseif ($old_status == 'published' && $status == 'draft') {
+			elgg_delete_river(array(
+				'object_guid' => $blog->guid,
+				'action_type' => 'create',
+			));
+		}
+
+		if ($blog->status == 'published' || $save == false) {
+			forward($blog->getURL());
+		} else {
+			forward("blog/edit/$blog->guid");
+		}
+	} else {
+		register_error(elgg_echo('blog:error:cannot_save'));
+		forward($error_forward_url);
+	}
+} else {
+	register_error($error);
+	forward($error_forward_url);
+}
diff --git a/mod/blog/activate.php b/mod/blog/activate.php
new file mode 100644
index 000000000..a90525291
--- /dev/null
+++ b/mod/blog/activate.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Register the ElggBlog class for the object/blog subtype
+ */
+
+if (get_subtype_id('object', 'blog')) {
+	update_subtype('object', 'blog', 'ElggBlog');
+} else {
+	add_subtype('object', 'blog', 'ElggBlog');
+}
diff --git a/mod/blog/classes/ElggBlog.php b/mod/blog/classes/ElggBlog.php
new file mode 100644
index 000000000..8d4401c57
--- /dev/null
+++ b/mod/blog/classes/ElggBlog.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Extended class to override the time_created
+ * 
+ * @property string $status      The published status of the blog post (published, draft)
+ * @property string $comments_on Whether commenting is allowed (Off, On)
+ * @property string $excerpt     An excerpt of the blog post used when displaying the post
+ */
+class ElggBlog extends ElggObject {
+
+	/**
+	 * Set subtype to blog.
+	 */
+	protected function initializeAttributes() {
+		parent::initializeAttributes();
+
+		$this->attributes['subtype'] = "blog";
+	}
+
+	/**
+	 * Can a user comment on this blog?
+	 *
+	 * @see ElggObject::canComment()
+	 *
+	 * @param int $user_guid User guid (default is logged in user)
+	 * @return bool
+	 * @since 1.8.0
+	 */
+	public function canComment($user_guid = 0) {
+		$result = parent::canComment($user_guid);
+		if ($result == false) {
+			return $result;
+		}
+
+		if ($this->comments_on == 'Off') {
+			return false;
+		}
+		
+		return true;
+	}
+
+}
+\ No newline at end of file
diff --git a/mod/blog/deactivate.php b/mod/blog/deactivate.php
new file mode 100644
index 000000000..4a275fa94
--- /dev/null
+++ b/mod/blog/deactivate.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Deregister the ElggBlog class
+ */
+
+update_subtype('object', 'blog');
diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
new file mode 100644
index 000000000..5248a6f51
--- /dev/null
+++ b/mod/blog/languages/en.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Blog English language file.
+ *
+ */
+
+$english = array(
+	'blog' => 'Blogs',
+	'blog:blogs' => 'Blogs',
+	'blog:revisions' => 'Revisions',
+	'blog:archives' => 'Archives',
+	'blog:blog' => 'Blog',
+	'item:object:blog' => 'Blogs',
+
+	'blog:title:user_blogs' => '%s\'s blogs',
+	'blog:title:all_blogs' => 'All site blogs',
+	'blog:title:friends' => 'Friends\' blogs',
+
+	'blog:group' => 'Group blog',
+	'blog:enableblog' => 'Enable group blog',
+	'blog:write' => 'Write a blog post',
+
+	// Editing
+	'blog:add' => 'Add blog post',
+	'blog:edit' => 'Edit blog post',
+	'blog:excerpt' => 'Excerpt',
+	'blog:body' => 'Body',
+	'blog:save_status' => 'Last saved: ',
+	'blog:never' => 'Never',
+
+	// Statuses
+	'blog:status' => 'Status',
+	'blog:status:draft' => 'Draft',
+	'blog:status:published' => 'Published',
+	'blog:status:unsaved_draft' => 'Unsaved Draft',
+
+	'blog:revision' => 'Revision',
+	'blog:auto_saved_revision' => 'Auto Saved Revision',
+
+	// messages
+	'blog:message:saved' => 'Blog post saved.',
+	'blog:error:cannot_save' => 'Cannot save blog post.',
+	'blog:error:cannot_write_to_container' => 'Insufficient access to save blog to group.',
+	'blog:messages:warning:draft' => 'There is an unsaved draft of this post!',
+	'blog:edit_revision_notice' => '(Old version)',
+	'blog:message:deleted_post' => 'Blog post deleted.',
+	'blog:error:cannot_delete_post' => 'Cannot delete blog post.',
+	'blog:none' => 'No blog posts',
+	'blog:error:missing:title' => 'Please enter a blog title!',
+	'blog:error:missing:description' => 'Please enter the body of your blog!',
+	'blog:error:cannot_edit_post' => 'This post may not exist or you may not have permissions to edit it.',
+	'blog:error:revision_not_found' => 'Cannot find this revision.',
+
+	// river
+	'river:create:object:blog' => '%s published a blog post %s',
+	'river:comment:object:blog' => '%s commented on the blog %s',
+
+	// notifications
+	'blog:newpost' => 'A new blog post',
+	'blog:notification' =>
+'
+%s made a new blog post.
+
+%s
+%s
+
+View and comment on the new blog post:
+%s
+',
+
+	// widget
+	'blog:widget:description' => 'Display your latest blog posts',
+	'blog:moreblogs' => 'More blog posts',
+	'blog:numbertodisplay' => 'Number of blog posts to display',
+	'blog:noblogs' => 'No blog posts'
+);
+
+add_translation('en', $english);
diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
new file mode 100644
index 000000000..9753f27a8
--- /dev/null
+++ b/mod/blog/lib/blog.php
@@ -0,0 +1,478 @@
+<?php
+/**
+ * Blog helper functions
+ *
+ * @package Blog
+ */
+
+
+/**
+ * Get page components to view a blog post.
+ *
+ * @param int $guid GUID of a blog entity.
+ * @return array
+ */
+function blog_get_page_content_read($guid = NULL) {
+
+	$return = array();
+
+	$blog = get_entity($guid);
+
+	// no header or tabs for viewing an individual blog
+	$return['filter'] = '';
+
+	if (!elgg_instanceof($blog, 'object', 'blog')) {
+		register_error(elgg_echo('noaccess'));
+		$_SESSION['last_forward_from'] = current_page_url();
+		forward('');
+	}
+
+	$return['title'] = $blog->title;
+
+	$container = $blog->getContainerEntity();
+	$crumbs_title = $container->name;
+	if (elgg_instanceof($container, 'group')) {
+		elgg_push_breadcrumb($crumbs_title, "blog/group/$container->guid/all");
+	} else {
+		elgg_push_breadcrumb($crumbs_title, "blog/owner/$container->username");
+	}
+
+	elgg_push_breadcrumb($blog->title);
+	$return['content'] = elgg_view_entity($blog, array('full_view' => true));
+	// check to see if we should allow comments
+	if ($blog->comments_on != 'Off' && $blog->status == 'published') {
+		$return['content'] .= elgg_view_comments($blog);
+	}
+
+	return $return;
+}
+
+/**
+ * Get page components to list a user's or all blogs.
+ *
+ * @param int $container_guid The GUID of the page owner or NULL for all blogs
+ * @return array
+ */
+function blog_get_page_content_list($container_guid = NULL) {
+
+	$return = array();
+
+	$return['filter_context'] = $container_guid ? 'mine' : 'all';
+
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'full_view' => false,
+	);
+
+	$current_user = elgg_get_logged_in_user_entity();
+
+	if ($container_guid) {
+		// access check for closed groups
+		group_gatekeeper();
+
+		$options['container_guid'] = $container_guid;
+		$container = get_entity($container_guid);
+		if (!$container) {
+
+		}
+		$return['title'] = elgg_echo('blog:title:user_blogs', array($container->name));
+
+		$crumbs_title = $container->name;
+		elgg_push_breadcrumb($crumbs_title);
+
+		if ($current_user && ($container_guid == $current_user->guid)) {
+			$return['filter_context'] = 'mine';
+		} else if (elgg_instanceof($container, 'group')) {
+			$return['filter'] = false;
+		} else {
+			// do not show button or select a tab when viewing someone else's posts
+			$return['filter_context'] = 'none';
+		}
+	} else {
+		$return['filter_context'] = 'all';
+		$return['title'] = elgg_echo('blog:title:all_blogs');
+		elgg_pop_breadcrumb();
+		elgg_push_breadcrumb(elgg_echo('blog:blogs'));
+	}
+
+	elgg_register_title_button();
+
+	// show all posts for admin or users looking at their own blogs
+	// show only published posts for other users.
+	$show_only_published = true;
+	if ($current_user) {
+		if (($current_user->guid == $container_guid) || $current_user->isAdmin()) {
+			$show_only_published = false;
+		}
+	}
+	if ($show_only_published) {
+		$options['metadata_name_value_pairs'] = array(
+			array('name' => 'status', 'value' => 'published'),
+		);
+	}
+
+	$list = elgg_list_entities_from_metadata($options);
+	if (!$list) {
+		$return['content'] = elgg_echo('blog:none');
+	} else {
+		$return['content'] = $list;
+	}
+
+	return $return;
+}
+
+/**
+ * Get page components to list of the user's friends' posts.
+ *
+ * @param int $user_guid
+ * @return array
+ */
+function blog_get_page_content_friends($user_guid) {
+
+	$user = get_user($user_guid);
+	if (!$user) {
+		forward('blog/all');
+	}
+
+	$return = array();
+
+	$return['filter_context'] = 'friends';
+	$return['title'] = elgg_echo('blog:title:friends');
+
+	$crumbs_title = $user->name;
+	elgg_push_breadcrumb($crumbs_title, "blog/owner/{$user->username}");
+	elgg_push_breadcrumb(elgg_echo('friends'));
+
+	elgg_register_title_button();
+
+	if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
+		$return['content'] .= elgg_echo('friends:none:you');
+		return $return;
+	} else {
+		$options = array(
+			'type' => 'object',
+			'subtype' => 'blog',
+			'full_view' => FALSE,
+		);
+
+		foreach ($friends as $friend) {
+			$options['container_guids'][] = $friend->getGUID();
+		}
+
+		// admin / owners can see any posts
+		// everyone else can only see published posts
+		$show_only_published = true;
+		$current_user = elgg_get_logged_in_user_entity();
+		if ($current_user) {
+			if (($user_guid == $current_user->guid) || $current_user->isAdmin()) {
+				$show_only_published = false;
+			}
+		}
+		if ($show_only_published) {
+			$options['metadata_name_value_pairs'][] = array(
+				array('name' => 'status', 'value' => 'published')
+			);
+		}
+
+		$list = elgg_list_entities_from_metadata($options);
+		if (!$list) {
+			$return['content'] = elgg_echo('blog:none');
+		} else {
+			$return['content'] = $list;
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Get page components to show blogs with publish dates between $lower and $upper
+ *
+ * @param int $owner_guid The GUID of the owner of this page
+ * @param int $lower      Unix timestamp
+ * @param int $upper      Unix timestamp
+ * @return array
+ */
+function blog_get_page_content_archive($owner_guid, $lower = 0, $upper = 0) {
+
+	$now = time();
+
+	$owner = get_entity($owner_guid);
+	elgg_set_page_owner_guid($owner_guid);
+
+	$crumbs_title = $owner->name;
+	if (elgg_instanceof($owner, 'user')) {
+		$url = "blog/owner/{$owner->username}";
+	} else {
+		$url = "blog/group/$owner->guid/all";
+	}
+	elgg_push_breadcrumb($crumbs_title, $url);
+	elgg_push_breadcrumb(elgg_echo('blog:archives'));
+
+	if ($lower) {
+		$lower = (int)$lower;
+	}
+
+	if ($upper) {
+		$upper = (int)$upper;
+	}
+
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'full_view' => FALSE,
+	);
+
+	if ($owner_guid) {
+		$options['container_guid'] = $owner_guid;
+	}
+
+	// admin / owners can see any posts
+	// everyone else can only see published posts
+	if (!(elgg_is_admin_logged_in() || (elgg_is_logged_in() && $owner_guid == elgg_get_logged_in_user_guid()))) {
+		if ($upper > $now) {
+			$upper = $now;
+		}
+
+		$options['metadata_name_value_pairs'] = array(
+			array('name' => 'status', 'value' => 'published')
+		);
+	}
+
+	if ($lower) {
+		$options['created_time_lower'] = $lower;
+	}
+
+	if ($upper) {
+		$options['created_time_upper'] = $upper;
+	}
+
+	$list = elgg_list_entities_from_metadata($options);
+	if (!$list) {
+		$content = elgg_echo('blog:none');
+	} else {
+		$content = $list;
+	}
+
+	$title = elgg_echo('date:month:' . date('m', $lower), array(date('Y', $lower)));
+
+	return array(
+		'content' => $content,
+		'title' => $title,
+		'filter' => '',
+	);
+}
+
+/**
+ * Get page components to edit/create a blog post.
+ *
+ * @param string  $page     'edit' or 'new'
+ * @param int     $guid     GUID of blog post or container
+ * @param int     $revision Annotation id for revision to edit (optional)
+ * @return array
+ */
+function blog_get_page_content_edit($page, $guid = 0, $revision = NULL) {
+
+	elgg_load_js('elgg.blog');
+
+	$return = array(
+		'filter' => '',
+	);
+
+	$vars = array();
+	$vars['id'] = 'blog-post-edit';
+	$vars['class'] = 'elgg-form-alt';
+
+	$sidebar = '';
+	if ($page == 'edit') {
+		$blog = get_entity((int)$guid);
+
+		$title = elgg_echo('blog:edit');
+
+		if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+			$vars['entity'] = $blog;
+
+			$title .= ": \"$blog->title\"";
+
+			if ($revision) {
+				$revision = elgg_get_annotation_from_id((int)$revision);
+				$vars['revision'] = $revision;
+				$title .= ' ' . elgg_echo('blog:edit_revision_notice');
+
+				if (!$revision || !($revision->entity_guid == $guid)) {
+					$content = elgg_echo('blog:error:revision_not_found');
+					$return['content'] = $content;
+					$return['title'] = $title;
+					return $return;
+				}
+			}
+
+			$body_vars = blog_prepare_form_vars($blog, $revision);
+
+			elgg_push_breadcrumb($blog->title, $blog->getURL());
+			elgg_push_breadcrumb(elgg_echo('edit'));
+			
+			elgg_load_js('elgg.blog');
+
+			$content = elgg_view_form('blog/save', $vars, $body_vars);
+			$sidebar = elgg_view('blog/sidebar/revisions', $vars);
+		} else {
+			$content = elgg_echo('blog:error:cannot_edit_post');
+		}
+	} else {
+		elgg_push_breadcrumb(elgg_echo('blog:add'));
+		$body_vars = blog_prepare_form_vars(null);
+
+		$title = elgg_echo('blog:add');
+		$content = elgg_view_form('blog/save', $vars, $body_vars);
+	}
+
+	$return['title'] = $title;
+	$return['content'] = $content;
+	$return['sidebar'] = $sidebar;
+	return $return;	
+}
+
+/**
+ * Pull together blog variables for the save form
+ *
+ * @param ElggBlog       $post
+ * @param ElggAnnotation $revision
+ * @return array
+ */
+function blog_prepare_form_vars($post = NULL, $revision = NULL) {
+
+	// input names => defaults
+	$values = array(
+		'title' => NULL,
+		'description' => NULL,
+		'status' => 'published',
+		'access_id' => ACCESS_DEFAULT,
+		'comments_on' => 'On',
+		'excerpt' => NULL,
+		'tags' => NULL,
+		'container_guid' => NULL,
+		'guid' => NULL,
+		'draft_warning' => '',
+	);
+
+	if ($post) {
+		foreach (array_keys($values) as $field) {
+			if (isset($post->$field)) {
+				$values[$field] = $post->$field;
+			}
+		}
+
+		if ($post->status == 'draft') {
+			$values['access_id'] = $post->future_access;
+		}
+	}
+
+	if (elgg_is_sticky_form('blog')) {
+		$sticky_values = elgg_get_sticky_values('blog');
+		foreach ($sticky_values as $key => $value) {
+			$values[$key] = $value;
+		}
+	}
+	
+	elgg_clear_sticky_form('blog');
+
+	if (!$post) {
+		return $values;
+	}
+
+	// load the revision annotation if requested
+	if ($revision instanceof ElggAnnotation && $revision->entity_guid == $post->getGUID()) {
+		$values['revision'] = $revision;
+		$values['description'] = $revision->value;
+	}
+
+	// display a notice if there's an autosaved annotation
+	// and we're not editing it.
+	if ($auto_save_annotations = $post->getAnnotations('blog_auto_save', 1)) {
+		$auto_save = $auto_save_annotations[0];
+	} else {
+		$auto_save = false;
+	}
+
+	if ($auto_save && $auto_save->id != $revision->id) {
+		$values['draft_warning'] = elgg_echo('blog:messages:warning:draft');
+	}
+
+	return $values;
+}
+
+/**
+ * Forward to the new style of URLs
+ * 
+ * Pre-1.7.5
+ * Group blogs page: /blog/group:<container_guid>/
+ * Group blog view:  /blog/group:<container_guid>/read/<guid>/<title>
+ * 1.7.5-1.8
+ * Group blogs page: /blog/owner/group:<container_guid>/
+ * Group blog view:  /blog/read/<guid>
+ * 
+ *
+ * @param string $page
+ */
+function blog_url_forwarder($page) {
+
+	$viewtype = elgg_get_viewtype();
+	$qs = ($viewtype === 'default') ? "" : "?view=$viewtype";
+
+	$url = "blog/all";
+
+	// easier to work with & no notices
+	$page = array_pad($page, 4, "");
+
+	// group usernames
+	if (preg_match('~/group\:([0-9]+)/~', "/{$page[0]}/{$page[1]}/", $matches)) {
+		$guid = $matches[1];
+		$entity = get_entity($guid);
+		if (elgg_instanceof($entity, 'group')) {
+			if (!empty($page[2])) {
+				$url = "blog/view/$page[2]/";
+			} else {
+				$url = "blog/group/$guid/all";
+			}
+			register_error(elgg_echo("changebookmark"));
+			forward($url . $qs);
+		}
+	}
+
+	if (empty($page[0])) {
+		return;
+	}
+
+	// user usernames
+	$user = get_user_by_username($page[0]);
+	if (!$user) {
+		return;
+	}
+
+	if (empty($page[1])) {
+		$page[1] = 'owner';
+	}
+
+	switch ($page[1]) {
+		case "read":
+			$url = "blog/view/{$page[2]}/{$page[3]}";
+			break;
+		case "archive":
+			$url = "blog/archive/{$page[0]}/{$page[2]}/{$page[3]}";
+			break;
+		case "friends":
+			$url = "blog/friends/{$page[0]}";
+			break;
+		case "new":
+			$url = "blog/add/$user->guid";
+			break;
+		case "owner":
+			$url = "blog/owner/{$page[0]}";
+			break;
+	}
+
+	register_error(elgg_echo("changebookmark"));
+	forward($url . $qs);
+}
diff --git a/mod/blog/manifest.xml b/mod/blog/manifest.xml
new file mode 100644
index 000000000..29ee1bfc8
--- /dev/null
+++ b/mod/blog/manifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Blog</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>content</category>
+	<category>widget</category>
+	<blurb>Blog plugin</blurb>
+	<description>Adds simple blogging capabilities to your Elgg installation.</description>
+	<website>http://elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<activate_on_install>true</activate_on_install>
+</plugin_manifest>
diff --git a/mod/blog/start.php b/mod/blog/start.php
new file mode 100644
index 000000000..e724b91c2
--- /dev/null
+++ b/mod/blog/start.php
@@ -0,0 +1,302 @@
+<?php
+/**
+ * Blogs
+ *
+ * @package Blog
+ *
+ * @todo
+ * - Either drop support for "publish date" or duplicate more entity getter
+ * functions to work with a non-standard time_created.
+ * - Pingbacks
+ * - Notifications
+ * - River entry for posts saved as drafts and later published
+ */
+
+elgg_register_event_handler('init', 'system', 'blog_init');
+
+/**
+ * Init blog plugin.
+ */
+function blog_init() {
+
+	elgg_register_library('elgg:blog', elgg_get_plugins_path() . 'blog/lib/blog.php');
+
+	// add a site navigation item
+	$item = new ElggMenuItem('blog', elgg_echo('blog:blogs'), 'blog/all');
+	elgg_register_menu_item('site', $item);
+
+	elgg_register_event_handler('upgrade', 'upgrade', 'blog_run_upgrades');
+
+	// add to the main css
+	elgg_extend_view('css/elgg', 'blog/css');
+
+	// register the blog's JavaScript
+	$blog_js = elgg_get_simplecache_url('js', 'blog/save_draft');
+	elgg_register_simplecache_view('js/blog/save_draft');
+	elgg_register_js('elgg.blog', $blog_js);
+
+	// routing of urls
+	elgg_register_page_handler('blog', 'blog_page_handler');
+
+	// override the default url to view a blog object
+	elgg_register_entity_url_handler('object', 'blog', 'blog_url_handler');
+
+	// notifications - need to register for unique event because of draft/published status
+	elgg_register_event_handler('publish', 'object', 'object_notifications');
+	elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'blog_notify_message');
+
+	// add blog link to
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'blog_owner_block_menu');
+
+	// pingbacks
+	//elgg_register_event_handler('create', 'object', 'blog_incoming_ping');
+	//elgg_register_plugin_hook_handler('pingback:object:subtypes', 'object', 'blog_pingback_subtypes');
+
+	// Register for search.
+	elgg_register_entity_type('object', 'blog');
+
+	// Add group option
+	add_group_tool_option('blog', elgg_echo('blog:enableblog'), true);
+	elgg_extend_view('groups/tool_latest', 'blog/group_module');
+
+	// add a blog widget
+	elgg_register_widget_type('blog', elgg_echo('blog'), elgg_echo('blog:widget:description'));
+
+	// register actions
+	$action_path = elgg_get_plugins_path() . 'blog/actions/blog';
+	elgg_register_action('blog/save', "$action_path/save.php");
+	elgg_register_action('blog/auto_save_revision', "$action_path/auto_save_revision.php");
+	elgg_register_action('blog/delete', "$action_path/delete.php");
+
+	// entity menu
+	elgg_register_plugin_hook_handler('register', 'menu:entity', 'blog_entity_menu_setup');
+
+	// ecml
+	elgg_register_plugin_hook_handler('get_views', 'ecml', 'blog_ecml_views_hook');
+}
+
+/**
+ * Dispatches blog pages.
+ * URLs take the form of
+ *  All blogs:       blog/all
+ *  User's blogs:    blog/owner/<username>
+ *  Friends' blog:   blog/friends/<username>
+ *  User's archives: blog/archives/<username>/<time_start>/<time_stop>
+ *  Blog post:       blog/view/<guid>/<title>
+ *  New post:        blog/add/<guid>
+ *  Edit post:       blog/edit/<guid>/<revision>
+ *  Preview post:    blog/preview/<guid>
+ *  Group blog:      blog/group/<guid>/all
+ *
+ * Title is ignored
+ *
+ * @todo no archives for all blogs or friends
+ *
+ * @param array $page
+ * @return bool
+ */
+function blog_page_handler($page) {
+
+	elgg_load_library('elgg:blog');
+
+	// forward to correct URL for blog pages pre-1.8
+	blog_url_forwarder($page);
+
+	// push all blogs breadcrumb
+	elgg_push_breadcrumb(elgg_echo('blog:blogs'), "blog/all");
+
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
+	$page_type = $page[0];
+	switch ($page_type) {
+		case 'owner':
+			$user = get_user_by_username($page[1]);
+			if (!$user) {
+				forward('', '404');
+			}
+			$params = blog_get_page_content_list($user->guid);
+			break;
+		case 'friends':
+			$user = get_user_by_username($page[1]);
+			if (!$user) {
+				forward('', '404');
+			}
+			$params = blog_get_page_content_friends($user->guid);
+			break;
+		case 'archive':
+			$user = get_user_by_username($page[1]);
+			if (!$user) {
+				forward('', '404');
+			}
+			$params = blog_get_page_content_archive($user->guid, $page[2], $page[3]);
+			break;
+		case 'view':
+			$params = blog_get_page_content_read($page[1]);
+			break;
+		case 'read': // Elgg 1.7 compatibility
+			register_error(elgg_echo("changebookmark"));
+			forward("blog/view/{$page[1]}");
+			break;
+		case 'add':
+			gatekeeper();
+			$params = blog_get_page_content_edit($page_type, $page[1]);
+			break;
+		case 'edit':
+			gatekeeper();
+			$params = blog_get_page_content_edit($page_type, $page[1], $page[2]);
+			break;
+		case 'group':
+			$group = get_entity($page[1]);
+			if (!elgg_instanceof($group, 'group')) {
+				forward('', '404');
+			}
+			if (!isset($page[2]) || $page[2] == 'all') {
+				$params = blog_get_page_content_list($page[1]);
+			} else {
+				$params = blog_get_page_content_archive($page[1], $page[3], $page[4]);
+			}
+			break;
+		case 'all':
+			$params = blog_get_page_content_list();
+			break;
+		default:
+			return false;
+	}
+
+	if (isset($params['sidebar'])) {
+		$params['sidebar'] .= elgg_view('blog/sidebar', array('page' => $page_type));
+	} else {
+		$params['sidebar'] = elgg_view('blog/sidebar', array('page' => $page_type));
+	}
+
+	$body = elgg_view_layout('content', $params);
+
+	echo elgg_view_page($params['title'], $body);
+	return true;
+}
+
+/**
+ * Format and return the URL for blogs.
+ *
+ * @param ElggObject $entity Blog object
+ * @return string URL of blog.
+ */
+function blog_url_handler($entity) {
+	if (!$entity->getOwnerEntity()) {
+		// default to a standard view if no owner.
+		return FALSE;
+	}
+
+	$friendly_title = elgg_get_friendly_title($entity->title);
+
+	return "blog/view/{$entity->guid}/$friendly_title";
+}
+
+/**
+ * Add a menu item to an ownerblock
+ */
+function blog_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "blog/owner/{$params['entity']->username}";
+		$item = new ElggMenuItem('blog', elgg_echo('blog'), $url);
+		$return[] = $item;
+	} else {
+		if ($params['entity']->blog_enable != "no") {
+			$url = "blog/group/{$params['entity']->guid}/all";
+			$item = new ElggMenuItem('blog', elgg_echo('blog:group'), $url);
+			$return[] = $item;
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Add particular blog links/info to entity menu
+ */
+function blog_entity_menu_setup($hook, $type, $return, $params) {
+	if (elgg_in_context('widgets')) {
+		return $return;
+	}
+
+	$entity = $params['entity'];
+	$handler = elgg_extract('handler', $params, false);
+	if ($handler != 'blog') {
+		return $return;
+	}
+
+	if ($entity->status != 'published') {
+		// draft status replaces access
+		foreach ($return as $index => $item) {
+			if ($item->getName() == 'access') {
+				unset($return[$index]);
+			}
+		}
+
+		$status_text = elgg_echo("blog:status:{$entity->status}");
+		$options = array(
+			'name' => 'published_status',
+			'text' => "<span>$status_text</span>",
+			'href' => false,
+			'priority' => 150,
+		);
+		$return[] = ElggMenuItem::factory($options);
+	}
+
+	return $return;
+}
+
+/**
+ * Set the notification message body
+ * 
+ * @param string $hook    Hook name
+ * @param string $type    Hook type
+ * @param string $message The current message body
+ * @param array  $params  Parameters about the blog posted
+ * @return string
+ */
+function blog_notify_message($hook, $type, $message, $params) {
+	$entity = $params['entity'];
+	$to_entity = $params['to_entity'];
+	$method = $params['method'];
+	if (elgg_instanceof($entity, 'object', 'blog')) {
+		$descr = $entity->excerpt;
+		$title = $entity->title;
+		$owner = $entity->getOwnerEntity();
+		return elgg_echo('blog:notification', array(
+			$owner->name,
+			$title,
+			$descr,
+			$entity->getURL()
+		));
+	}
+	return null;
+}
+
+/**
+ * Register blogs with ECML.
+ */
+function blog_ecml_views_hook($hook, $entity_type, $return_value, $params) {
+	$return_value['object/blog'] = elgg_echo('blog:blogs');
+
+	return $return_value;
+}
+
+/**
+ * Upgrade from 1.7 to 1.8.
+ */
+function blog_run_upgrades($event, $type, $details) {
+	$blog_upgrade_version = elgg_get_plugin_setting('upgrade_version', 'blogs');
+
+	if (!$blog_upgrade_version) {
+		 // When upgrading, check if the ElggBlog class has been registered as this
+		 // was added in Elgg 1.8
+		if (!update_subtype('object', 'blog', 'ElggBlog')) {
+			add_subtype('object', 'blog', 'ElggBlog');
+		}
+
+		elgg_set_plugin_setting('upgrade_version', 1, 'blogs');
+	}
+}
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
new file mode 100644
index 000000000..12ac4df2a
--- /dev/null
+++ b/mod/blog/views/default/blog/css.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Blog CSS
+ *
+ * @package Blog
+*/
+?>
+
+/* Blog Plugin */
+
+/* force tinymce input height for a more useful editing / blog creation area */
+form#blog-post-edit #description_parent #description_ifr {
+	height:400px !important;
+}
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
new file mode 100644
index 000000000..6082cdafd
--- /dev/null
+++ b/mod/blog/views/default/blog/group_module.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Group blog module
+ */
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->blog_enable == "no") {
+	return true;
+}
+
+$all_link = elgg_view('output/url', array(
+	'href' => "blog/group/$group->guid/all",
+	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
+));
+
+elgg_push_context('widgets');
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'metadata_name_value_pairs' => array('name' => 'status', 'value' => 'published'),
+	'limit' => 6,
+	'full_view' => false,
+	'pagination' => false,
+);
+$content = elgg_list_entities_from_metadata($options);
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('blog:none') . '</p>';
+}
+
+$new_link = elgg_view('output/url', array(
+	'href' => "blog/add/$group->guid",
+	'text' => elgg_echo('blog:write'),
+	'is_trusted' => true,
+));
+
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('blog:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/blog/views/default/blog/sidebar.php b/mod/blog/views/default/blog/sidebar.php
new file mode 100644
index 000000000..0ae2b431c
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Blog sidebar
+ *
+ * @package Blog
+ */
+
+// fetch & display latest comments
+if ($vars['page'] == 'all') {
+	echo elgg_view('page/elements/comments_block', array(
+		'subtypes' => 'blog',
+	));
+} elseif ($vars['page'] == 'owner') {
+	echo elgg_view('page/elements/comments_block', array(
+		'subtypes' => 'blog',
+		'owner_guid' => elgg_get_page_owner_guid(),
+	));
+}
+
+// only users can have archives at present
+if ($vars['page'] == 'owner' || $vars['page'] == 'group') {
+	echo elgg_view('blog/sidebar/archives', $vars);
+}
+
+if ($vars['page'] != 'friends') {
+	echo elgg_view('page/elements/tagcloud_block', array(
+		'subtypes' => 'blog',
+		'owner_guid' => elgg_get_page_owner_guid(),
+	));
+}
diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
new file mode 100644
index 000000000..6529887d4
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Blog archives
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+
+if (!$page_owner) {
+	return true;
+}
+
+if (elgg_instanceof($page_owner, 'user')) {
+	$url_segment = 'blog/archive/' . $page_owner->username;
+} else {
+	$url_segment = 'blog/group/' . $page_owner->getGUID() . '/archive';
+}
+
+// This is a limitation of the URL schema.
+if ($page_owner && $vars['page'] != 'friends') {
+	$dates = array_reverse(get_entity_dates('object', 'blog', $page_owner->getGUID()));
+	
+	if ($dates) {
+		$title = elgg_echo('blog:archives');
+		$content = '<ul class="blog-archives">';
+		foreach ($dates as $date) {
+			$timestamplow = mktime(0, 0, 0, substr($date,4,2) , 1, substr($date, 0, 4));
+			$timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4));
+
+			$link = elgg_get_site_url() . $url_segment . '/' . $timestamplow . '/' . $timestamphigh;
+			$month = elgg_echo('date:month:' . substr($date, 4, 2), array(substr($date, 0, 4)));
+			$content .= "<li><a href=\"$link\" title=\"$month\">$month</a></li>";
+		}
+		$content .= '</ul>';
+
+		echo elgg_view_module('aside', $title, $content);
+	}
+}
diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
new file mode 100644
index 000000000..cd2e7f3d8
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Blog sidebar menu showing revisions
+ *
+ * @package Blog
+ */
+
+//If editing a post, show the previous revisions and drafts.
+$blog = elgg_extract('entity', $vars, FALSE);
+
+if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+	$owner = $blog->getOwnerEntity();
+	$revisions = array();
+
+	$auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1);
+	if ($auto_save_annotations) {
+		$revisions[] = $auto_save_annotations[0];
+	}
+
+	// count(FALSE) == 1!  AHHH!!!
+	$saved_revisions = $blog->getAnnotations('blog_revision', 10, 0, 'time_created DESC');
+	if ($saved_revisions) {
+		$revision_count = count($saved_revisions);
+	} else {
+		$revision_count = 0;
+	}
+
+	$revisions = array_merge($revisions, $saved_revisions);
+
+	if ($revisions) {
+		$title = elgg_echo('blog:revisions');
+
+		$n = count($revisions);
+		$body = '<ul class="blog-revisions">';
+
+		$load_base_url = "blog/edit/{$blog->getGUID()}";
+
+		// show the "published revision"
+		if ($blog->status == 'published') {
+			$load = elgg_view('output/url', array(
+				'href' => $load_base_url,
+				'text' => elgg_echo('blog:status:published'),
+				'is_trusted' => true,
+			));
+
+			$time = "<span class='elgg-subtext'>"
+				. elgg_view_friendly_time($blog->time_created) . "</span>";
+
+			$body .= "<li>$load : $time</li>";
+		}
+
+		foreach ($revisions as $revision) {
+			$time = "<span class='elgg-subtext'>"
+				. elgg_view_friendly_time($revision->time_created) . "</span>";
+
+			if ($revision->name == 'blog_auto_save') {
+				$revision_lang = elgg_echo('blog:auto_saved_revision');
+			} else {
+				$revision_lang = elgg_echo('blog:revision') . " $n";
+			}
+			$load = elgg_view('output/url', array(
+				'href' => "$load_base_url/$revision->id",
+				'text' => $revision_lang,
+				'is_trusted' => true,
+			));
+
+			$text = "$load: $time";
+			$class = 'class="auto-saved"';
+
+			$n--;
+
+			$body .= "<li $class>$text</li>";
+		}
+
+		$body .= '</ul>';
+
+		echo elgg_view_module('aside', $title, $body);
+	}
+}
+\ No newline at end of file
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
new file mode 100644
index 000000000..f825acca1
--- /dev/null
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Edit blog form
+ *
+ * @package Blog
+ */
+
+$blog = get_entity($vars['guid']);
+$vars['entity'] = $blog;
+
+$draft_warning = $vars['draft_warning'];
+if ($draft_warning) {
+	$draft_warning = '<span class="mbm elgg-text-help">' . $draft_warning . '</span>';
+}
+
+$action_buttons = '';
+$delete_link = '';
+$preview_button = '';
+
+if ($vars['guid']) {
+	// add a delete button if editing
+	$delete_url = "action/blog/delete?guid={$vars['guid']}";
+	$delete_link = elgg_view('output/confirmlink', array(
+		'href' => $delete_url,
+		'text' => elgg_echo('delete'),
+		'class' => 'elgg-button elgg-button-delete float-alt'
+	));
+}
+
+// published blogs do not get the preview button
+if (!$vars['guid'] || ($blog && $blog->status != 'published')) {
+	$preview_button = elgg_view('input/submit', array(
+		'value' => elgg_echo('preview'),
+		'name' => 'preview',
+		'class' => 'mls',
+	));
+}
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+	'name' => 'save',
+));
+$action_buttons = $save_button . $preview_button . $delete_link;
+
+$title_label = elgg_echo('title');
+$title_input = elgg_view('input/text', array(
+	'name' => 'title',
+	'id' => 'blog_title',
+	'value' => $vars['title']
+));
+
+$excerpt_label = elgg_echo('blog:excerpt');
+$excerpt_input = elgg_view('input/text', array(
+	'name' => 'excerpt',
+	'id' => 'blog_excerpt',
+	'value' => _elgg_html_decode($vars['excerpt'])
+));
+
+$body_label = elgg_echo('blog:body');
+$body_input = elgg_view('input/longtext', array(
+	'name' => 'description',
+	'id' => 'blog_description',
+	'value' => $vars['description']
+));
+
+$save_status = elgg_echo('blog:save_status');
+if ($vars['guid']) {
+	$entity = get_entity($vars['guid']);
+	$saved = date('F j, Y @ H:i', $entity->time_created);
+} else {
+	$saved = elgg_echo('blog:never');
+}
+
+$status_label = elgg_echo('blog:status');
+$status_input = elgg_view('input/dropdown', array(
+	'name' => 'status',
+	'id' => 'blog_status',
+	'value' => $vars['status'],
+	'options_values' => array(
+		'draft' => elgg_echo('blog:status:draft'),
+		'published' => elgg_echo('blog:status:published')
+	)
+));
+
+$comments_label = elgg_echo('comments');
+$comments_input = elgg_view('input/dropdown', array(
+	'name' => 'comments_on',
+	'id' => 'blog_comments_on',
+	'value' => $vars['comments_on'],
+	'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off'))
+));
+
+$tags_label = elgg_echo('tags');
+$tags_input = elgg_view('input/tags', array(
+	'name' => 'tags',
+	'id' => 'blog_tags',
+	'value' => $vars['tags']
+));
+
+$access_label = elgg_echo('access');
+$access_input = elgg_view('input/access', array(
+	'name' => 'access_id',
+	'id' => 'blog_access_id',
+	'value' => $vars['access_id']
+));
+
+$categories_input = elgg_view('input/categories', $vars);
+
+// hidden inputs
+$container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid()));
+$guid_input = elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['guid']));
+
+
+echo <<<___HTML
+
+$draft_warning
+
+<div>
+	<label for="blog_title">$title_label</label>
+	$title_input
+</div>
+
+<div>
+	<label for="blog_excerpt">$excerpt_label</label>
+	$excerpt_input
+</div>
+
+<div>
+	<label for="blog_description">$body_label</label>
+	$body_input
+</div>
+
+<div>
+	<label for="blog_tags">$tags_label</label>
+	$tags_input
+</div>
+
+$categories_input
+
+<div>
+	<label for="blog_comments_on">$comments_label</label>
+	$comments_input
+</div>
+
+<div>
+	<label for="blog_access_id">$access_label</label>
+	$access_input
+</div>
+
+<div>
+	<label for="blog_status">$status_label</label>
+	$status_input
+</div>
+
+<div class="elgg-foot">
+	<div class="elgg-subtext mbm">
+	$save_status <span class="blog-save-status-time">$saved</span>
+	</div>
+
+	$guid_input
+	$container_guid_input
+
+	$action_buttons
+</div>
+
+___HTML;
diff --git a/mod/blog/views/default/js/blog/save_draft.php b/mod/blog/views/default/js/blog/save_draft.php
new file mode 100644
index 000000000..8cd07ff5d
--- /dev/null
+++ b/mod/blog/views/default/js/blog/save_draft.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Save draft through ajax
+ *
+ * @package Blog
+ */
+?>
+elgg.provide('elgg.blog');
+
+/*
+ * Attempt to save and update the input with the guid.
+ */
+elgg.blog.saveDraftCallback = function(data, textStatus, XHR) {
+	if (textStatus == 'success' && data.success == true) {
+		var form = $('form[id=blog-post-edit]');
+
+		// update the guid input element for new posts that now have a guid
+		form.find('input[name=guid]').val(data.guid);
+
+		oldDescription = form.find('textarea[name=description]').val();
+
+		var d = new Date();
+		var mins = d.getMinutes() + '';
+		if (mins.length == 1) {
+			mins = '0' + mins;
+		}
+		$(".blog-save-status-time").html(d.toLocaleDateString() + " @ " + d.getHours() + ":" + mins);
+	} else {
+		$(".blog-save-status-time").html(elgg.echo('error'));
+	}
+};
+
+elgg.blog.saveDraft = function() {
+	if (typeof(tinyMCE) != 'undefined') {
+		tinyMCE.triggerSave();
+	}
+
+	// only save on changed content
+	var form = $('form[id=blog-post-edit]');
+	var description = form.find('textarea[name=description]').val();
+	var title = form.find('input[name=title]').val();
+
+	if (!(description && title) || (description == oldDescription)) {
+		return false;
+	}
+
+	var draftURL = elgg.config.wwwroot + "action/blog/auto_save_revision";
+	var postData = form.serializeArray();
+
+	// force draft status
+	$(postData).each(function(i, e) {
+		if (e.name == 'status') {
+			e.value = 'draft';
+		}
+	});
+
+	$.post(draftURL, postData, elgg.blog.saveDraftCallback, 'json');
+};
+
+elgg.blog.init = function() {
+	// get a copy of the body to compare for auto save
+	oldDescription = $('form[id=blog-post-edit]').find('textarea[name=description]').val();
+	
+	setInterval(elgg.blog.saveDraft, 60000);
+};
+
+elgg.register_hook_handler('init', 'system', elgg.blog.init);
+\ No newline at end of file
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
new file mode 100644
index 000000000..4403a6006
--- /dev/null
+++ b/mod/blog/views/default/object/blog.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * View for blog objects
+ *
+ * @package Blog
+ */
+
+$full = elgg_extract('full_view', $vars, FALSE);
+$blog = elgg_extract('entity', $vars, FALSE);
+
+if (!$blog) {
+	return TRUE;
+}
+
+$owner = $blog->getOwnerEntity();
+$container = $blog->getContainerEntity();
+$categories = elgg_view('output/categories', $vars);
+$excerpt = $blog->excerpt;
+if (!$excerpt) {
+	$excerpt = elgg_get_excerpt($blog->description);
+}
+
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
+$owner_link = elgg_view('output/url', array(
+	'href' => "blog/owner/$owner->username",
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+$author_text = elgg_echo('byline', array($owner_link));
+$date = elgg_view_friendly_time($blog->time_created);
+
+// The "on" status changes for comments, so best to check for !Off
+if ($blog->comments_on != 'Off') {
+	$comments_count = $blog->countComments();
+	//only display if there are commments
+	if ($comments_count != 0) {
+		$text = elgg_echo("comments") . " ($comments_count)";
+		$comments_link = elgg_view('output/url', array(
+			'href' => $blog->getURL() . '#blog-comments',
+			'text' => $text,
+			'is_trusted' => true,
+		));
+	} else {
+		$comments_link = '';
+	}
+} else {
+	$comments_link = '';
+}
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
+	'handler' => 'blog',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+$subtitle = "$author_text $date $comments_link $categories";
+
+// do not show the metadata and controls in widget view
+if (elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if ($full) {
+
+	$body = elgg_view('output/longtext', array(
+		'value' => $blog->description,
+		'class' => 'blog-post',
+	));
+
+	$params = array(
+		'entity' => $blog,
+		'title' => false,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+	);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
+
+	echo elgg_view('object/elements/full', array(
+		'summary' => $summary,
+		'icon' => $owner_icon,
+		'body' => $body,
+	));
+
+} else {
+	// brief view
+
+	$params = array(
+		'entity' => $blog,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+		'content' => $excerpt,
+	);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
+
+	echo elgg_view_image_block($owner_icon, $list_body);
+}
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
new file mode 100644
index 000000000..b808f1bdc
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Blog river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+$excerpt = $object->excerpt ? $object->excerpt : $object->description;
+$excerpt = strip_tags($excerpt);
+$excerpt = elgg_get_excerpt($excerpt);
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
diff --git a/mod/blog/views/default/widgets/blog/content.php b/mod/blog/views/default/widgets/blog/content.php
new file mode 100644
index 000000000..330171662
--- /dev/null
+++ b/mod/blog/views/default/widgets/blog/content.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * User blog widget display view
+ */
+
+$num = $vars['entity']->num_display;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $num,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$blog_url = "blog/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $blog_url,
+		'text' => elgg_echo('blog:moreblogs'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('blog:noblogs');
+}
diff --git a/mod/blog/views/default/widgets/blog/edit.php b/mod/blog/views/default/widgets/blog/edit.php
new file mode 100644
index 000000000..30c3b2e73
--- /dev/null
+++ b/mod/blog/views/default/widgets/blog/edit.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * User blog widget edit view
+ */
+
+// set default value
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 4;
+}
+
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
+
+?>
+<div>
+	<?php echo elgg_echo('blog:numbertodisplay'); ?>:
+	<?php echo $dropdown; ?>
+</div>
diff --git a/mod/bookmarks/actions/bookmarks/delete.php b/mod/bookmarks/actions/bookmarks/delete.php
new file mode 100644
index 000000000..2e9f41438
--- /dev/null
+++ b/mod/bookmarks/actions/bookmarks/delete.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Delete a bookmark
+ *
+ * @package Bookmarks
+ */
+
+$guid = get_input('guid');
+$bookmark = get_entity($guid);
+
+if (elgg_instanceof($bookmark, 'object', 'bookmarks') && $bookmark->canEdit()) {
+	$container = $bookmark->getContainerEntity();
+	if ($bookmark->delete()) {
+		system_message(elgg_echo("bookmarks:delete:success"));
+		if (elgg_instanceof($container, 'group')) {
+			forward("bookmarks/group/$container->guid/all");
+		} else {
+			forward("bookmarks/owner/$container->username");
+		}
+	}
+}
+
+register_error(elgg_echo("bookmarks:delete:failed"));
+forward(REFERER);
diff --git a/mod/bookmarks/actions/bookmarks/save.php b/mod/bookmarks/actions/bookmarks/save.php
new file mode 100644
index 000000000..46090b115
--- /dev/null
+++ b/mod/bookmarks/actions/bookmarks/save.php
@@ -0,0 +1,90 @@
+<?php
+/**
+* Elgg bookmarks save action
+*
+* @package Bookmarks
+*/
+
+$title = htmlspecialchars(get_input('title', '', false), ENT_QUOTES, 'UTF-8');
+$description = get_input('description');
+$address = get_input('address');
+$access_id = get_input('access_id');
+$tags = get_input('tags');
+$guid = get_input('guid');
+$share = get_input('share');
+$container_guid = get_input('container_guid', elgg_get_logged_in_user_guid());
+
+elgg_make_sticky_form('bookmarks');
+
+// don't use elgg_normalize_url() because we don't want
+// relative links resolved to this site.
+if ($address && !preg_match("#^((ht|f)tps?:)?//#i", $address)) {
+	$address = "http://$address";
+}
+
+if (!$title || !$address) {
+	register_error(elgg_echo('bookmarks:save:failed'));
+	forward(REFERER);
+}
+
+// see https://bugs.php.net/bug.php?id=51192
+$php_5_2_13_and_below = version_compare(PHP_VERSION, '5.2.14', '<');
+$php_5_3_0_to_5_3_2 = version_compare(PHP_VERSION, '5.3.0', '>=') &&
+		version_compare(PHP_VERSION, '5.3.3', '<');
+
+$validated = false;
+if ($php_5_2_13_and_below || $php_5_3_0_to_5_3_2) {
+	$tmp_address = str_replace("-", "", $address);
+	$validated = filter_var($tmp_address, FILTER_VALIDATE_URL);
+} else {
+	$validated = filter_var($address, FILTER_VALIDATE_URL);
+}
+if (!$validated) {
+	register_error(elgg_echo('bookmarks:save:failed'));
+	forward(REFERER);
+}
+
+if ($guid == 0) {
+	$bookmark = new ElggObject;
+	$bookmark->subtype = "bookmarks";
+	$bookmark->container_guid = (int)get_input('container_guid', $_SESSION['user']->getGUID());
+	$new = true;
+} else {
+	$bookmark = get_entity($guid);
+	if (!$bookmark->canEdit()) {
+		system_message(elgg_echo('bookmarks:save:failed'));
+		forward(REFERRER);
+	}
+}
+
+$tagarray = string_to_tag_array($tags);
+
+$bookmark->title = $title;
+$bookmark->address = $address;
+$bookmark->description = $description;
+$bookmark->access_id = $access_id;
+$bookmark->tags = $tagarray;
+
+if ($bookmark->save()) {
+
+	elgg_clear_sticky_form('bookmarks');
+
+	// @todo
+	if (is_array($shares) && sizeof($shares) > 0) {
+		foreach($shares as $share) {
+			$share = (int) $share;
+			add_entity_relationship($bookmark->getGUID(), 'share', $share);
+		}
+	}
+	system_message(elgg_echo('bookmarks:save:success'));
+
+	//add to river only if new
+	if ($new) {
+		add_to_river('river/object/bookmarks/create','create', elgg_get_logged_in_user_guid(), $bookmark->getGUID());
+	}
+
+	forward($bookmark->getURL());
+} else {
+	register_error(elgg_echo('bookmarks:save:failed'));
+	forward("bookmarks");
+}
diff --git a/mod/bookmarks/graphics/bookmark.gif b/mod/bookmarks/graphics/bookmark.gif
new file mode 100644
index 000000000..55c5e3e15
--- /dev/null
+++ b/mod/bookmarks/graphics/bookmark.gif
diff --git a/mod/bookmarks/graphics/bookmarklet.gif b/mod/bookmarks/graphics/bookmarklet.gif
new file mode 100644
index 000000000..45b24709b
--- /dev/null
+++ b/mod/bookmarks/graphics/bookmarklet.gif
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
new file mode 100644
index 000000000..970b39415
--- /dev/null
+++ b/mod/bookmarks/languages/en.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Bookmarks English language file
+ */
+
+$english = array(
+
+	/**
+	 * Menu items and titles
+	 */
+	'bookmarks' => "Bookmarks",
+	'bookmarks:add' => "Add a bookmark",
+	'bookmarks:edit' => "Edit bookmark",
+	'bookmarks:owner' => "%s's bookmarks",
+	'bookmarks:friends' => "Friends' bookmarks",
+	'bookmarks:everyone' => "All site bookmarks",
+	'bookmarks:this' => "Bookmark this page",
+	'bookmarks:this:group' => "Bookmark in %s",
+	'bookmarks:bookmarklet' => "Get bookmarklet",
+	'bookmarks:bookmarklet:group' => "Get group bookmarklet",
+	'bookmarks:inbox' => "Bookmarks inbox",
+	'bookmarks:morebookmarks' => "More bookmarks",
+	'bookmarks:more' => "More",
+	'bookmarks:with' => "Share with",
+	'bookmarks:new' => "A new bookmark",
+	'bookmarks:address' => "Address of the bookmark",
+	'bookmarks:none' => 'No bookmarks',
+
+	'bookmarks:notification' =>
+'%s added a new bookmark:
+
+%s - %s
+%s
+
+View and comment on the new bookmark:
+%s
+',
+
+	'bookmarks:delete:confirm' => "Are you sure you want to delete this resource?",
+
+	'bookmarks:numbertodisplay' => 'Number of bookmarks to display',
+
+	'bookmarks:shared' => "Bookmarked",
+	'bookmarks:visit' => "Visit resource",
+	'bookmarks:recent' => "Recent bookmarks",
+
+	'river:create:object:bookmarks' => '%s bookmarked %s',
+	'river:comment:object:bookmarks' => '%s commented on a bookmark %s',
+	'bookmarks:river:annotate' => 'a comment on this bookmark',
+	'bookmarks:river:item' => 'an item',
+
+	'item:object:bookmarks' => 'Bookmarks',
+
+	'bookmarks:group' => 'Group bookmarks',
+	'bookmarks:enablebookmarks' => 'Enable group bookmarks',
+	'bookmarks:nogroup' => 'This group does not have any bookmarks yet',
+	'bookmarks:more' => 'More bookmarks',
+
+	'bookmarks:no_title' => 'No title',
+
+	/**
+	 * Widget and bookmarklet
+	 */
+	'bookmarks:widget:description' => "Display your latest bookmarks.",
+
+	'bookmarks:bookmarklet:description' =>
+			"The bookmarks bookmarklet allows you to share any resource you find on the web with your friends, or just bookmark it for yourself. To use it, simply drag the following button to your browser's links bar:",
+
+	'bookmarks:bookmarklet:descriptionie' =>
+			"If you are using Internet Explorer, you will need to right click on the bookmarklet icon, select 'add to favorites', and then the Links bar.",
+
+	'bookmarks:bookmarklet:description:conclusion' =>
+			"You can then save any page you visit by clicking it at any time.",
+
+	/**
+	 * Status messages
+	 */
+
+	'bookmarks:save:success' => "Your item was successfully bookmarked.",
+	'bookmarks:delete:success' => "Your bookmark was deleted.",
+
+	/**
+	 * Error messages
+	 */
+
+	'bookmarks:save:failed' => "Your bookmark could not be saved. Make sure you've entered a title and address and then try again.",
+	'bookmarks:save:invalid' => "The address of the bookmark is invalid and could not be saved.",
+	'bookmarks:delete:failed' => "Your bookmark could not be deleted. Please try again.",
+);
+
+add_translation('en', $english);
+\ No newline at end of file
diff --git a/mod/bookmarks/lib/bookmarks.php b/mod/bookmarks/lib/bookmarks.php
new file mode 100644
index 000000000..9a9dff18c
--- /dev/null
+++ b/mod/bookmarks/lib/bookmarks.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Bookmarks helper functions
+ *
+ * @package Bookmarks
+ */
+
+/**
+ * Prepare the add/edit form variables
+ *
+ * @param ElggObject $bookmark A bookmark object.
+ * @return array
+ */
+function bookmarks_prepare_form_vars($bookmark = null) {
+	// input names => defaults
+	$values = array(
+		'title' => get_input('title', ''), // bookmarklet support
+		'address' => get_input('address', ''),
+		'description' => '',
+		'access_id' => ACCESS_DEFAULT,
+		'tags' => '',
+		'shares' => array(),
+		'container_guid' => elgg_get_page_owner_guid(),
+		'guid' => null,
+		'entity' => $bookmark,
+	);
+
+	if ($bookmark) {
+		foreach (array_keys($values) as $field) {
+			if (isset($bookmark->$field)) {
+				$values[$field] = $bookmark->$field;
+			}
+		}
+	}
+
+	if (elgg_is_sticky_form('bookmarks')) {
+		$sticky_values = elgg_get_sticky_values('bookmarks');
+		foreach ($sticky_values as $key => $value) {
+			$values[$key] = $value;
+		}
+	}
+
+	elgg_clear_sticky_form('bookmarks');
+
+	return $values;
+}
diff --git a/mod/bookmarks/manifest.xml b/mod/bookmarks/manifest.xml
new file mode 100644
index 000000000..b95af87f8
--- /dev/null
+++ b/mod/bookmarks/manifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Bookmarks</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>content</category>
+	<category>widget</category>
+	<blurb>Add and comment on bookmarks.</blurb>
+	<description>Adds the ability for users to bookmark internal and external sites.  Other users can then comment on the bookmarks.</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<activate_on_install>true</activate_on_install>
+</plugin_manifest>
diff --git a/mod/bookmarks/pages/bookmarks/add.php b/mod/bookmarks/pages/bookmarks/add.php
new file mode 100644
index 000000000..d80d4a4bc
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/add.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Add bookmark page
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('bookmarks:add');
+elgg_push_breadcrumb($title);
+
+$vars = bookmarks_prepare_form_vars();
+$content = elgg_view_form('bookmarks/save', array(), $vars);
+
+$body = elgg_view_layout('content', array(
+	'filter' => '',
+	'content' => $content,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/all.php b/mod/bookmarks/pages/bookmarks/all.php
new file mode 100644
index 000000000..5c6011ad9
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package ElggBookmarks
+ */
+
+elgg_pop_breadcrumb();
+elgg_push_breadcrumb(elgg_echo('bookmarks'));
+
+elgg_register_title_button();
+
+$content = elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'full_view' => false,
+	'view_toggle_type' => false,
+));
+
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$title = elgg_echo('bookmarks:everyone');
+
+$body = elgg_view_layout('content', array(
+	'filter_context' => 'all',
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/bookmarklet.php b/mod/bookmarks/pages/bookmarks/bookmarklet.php
new file mode 100644
index 000000000..99866e385
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/bookmarklet.php
@@ -0,0 +1,36 @@
+<?php
+/**
+* Elgg bookmarks plugin bookmarklet page
+*
+* @package Bookmarks
+*/
+
+gatekeeper();
+
+$container_guid = get_input('container_guid');
+$container = get_entity($container_guid);
+$page_owner = $container;
+
+if (elgg_instanceof($container, 'object')) {
+	$page_owner = $container->getContainerEntity();
+}
+
+elgg_set_page_owner_guid($page_owner->getGUID());
+
+$title = elgg_echo('bookmarks:bookmarklet');
+
+if ($page_owner instanceof ElggGroup) {
+	elgg_push_breadcrumb($page_owner->name, $page_owner->getURL());
+}
+
+elgg_push_breadcrumb($title);
+
+$content = elgg_view("bookmarks/bookmarklet");
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => false
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/edit.php b/mod/bookmarks/pages/bookmarks/edit.php
new file mode 100644
index 000000000..93b143c36
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/edit.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Add bookmark page
+ *
+ * @package ElggBookmarks
+ */
+
+$bookmark_guid = get_input('guid');
+$bookmark = get_entity($bookmark_guid);
+
+if (!elgg_instanceof($bookmark, 'object', 'bookmarks') || !$bookmark->canEdit()) {
+	register_error(elgg_echo('bookmarks:unknown_bookmark'));
+	forward(REFERRER);
+}
+
+$page_owner = elgg_get_page_owner_entity();
+
+$title = elgg_echo('bookmarks:edit');
+elgg_push_breadcrumb($title);
+
+$vars = bookmarks_prepare_form_vars($bookmark);
+$content = elgg_view_form('bookmarks/save', array(), $vars);
+
+$body = elgg_view_layout('content', array(
+	'filter' => '',
+	'content' => $content,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/friends.php b/mod/bookmarks/pages/bookmarks/friends.php
new file mode 100644
index 000000000..173996346
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/friends.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Elgg bookmarks plugin friends page
+ *
+ * @package ElggBookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
+
+elgg_push_breadcrumb($page_owner->name, "bookmarks/owner/$page_owner->username");
+elgg_push_breadcrumb(elgg_echo('friends'));
+
+elgg_register_title_button();
+
+$title = elgg_echo('bookmarks:friends');
+
+$content = list_user_friends_objects($page_owner->guid, 'bookmarks', 10, false);
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$params = array(
+	'filter_context' => 'friends',
+	'content' => $content,
+	'title' => $title,
+);
+
+$body = elgg_view_layout('content', $params);
+
+echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/pages/bookmarks/owner.php b/mod/bookmarks/pages/bookmarks/owner.php
new file mode 100644
index 000000000..b7b907916
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/owner.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * Elgg bookmarks plugin everyone page
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+if (!$page_owner) {
+	forward('', '404');
+}
+
+elgg_push_breadcrumb($page_owner->name);
+
+elgg_register_title_button();
+
+$content .= elgg_list_entities(array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => $page_owner->guid,
+	'full_view' => false,
+	'view_toggle_type' => false
+));
+
+if (!$content) {
+	$content = elgg_echo('bookmarks:none');
+}
+
+$title = elgg_echo('bookmarks:owner', array($page_owner->name));
+
+$filter_context = '';
+if ($page_owner->getGUID() == elgg_get_logged_in_user_guid()) {
+	$filter_context = 'mine';
+}
+
+$vars = array(
+	'filter_context' => $filter_context,
+	'content' => $content,
+	'title' => $title,
+	'sidebar' => elgg_view('bookmarks/sidebar'),
+);
+
+// don't show filter if out of filter context
+if ($page_owner instanceof ElggGroup) {
+	$vars['filter'] = false;
+}
+
+$body = elgg_view_layout('content', $vars);
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/bookmarks/pages/bookmarks/view.php b/mod/bookmarks/pages/bookmarks/view.php
new file mode 100644
index 000000000..70a6a5bfe
--- /dev/null
+++ b/mod/bookmarks/pages/bookmarks/view.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * View a bookmark
+ *
+ * @package ElggBookmarks
+ */
+
+$bookmark = get_entity(get_input('guid'));
+if (!$bookmark) {
+	register_error(elgg_echo('noaccess'));
+	$_SESSION['last_forward_from'] = current_page_url();
+	forward('');
+}
+
+$page_owner = elgg_get_page_owner_entity();
+
+$crumbs_title = $page_owner->name;
+
+if (elgg_instanceof($page_owner, 'group')) {
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/group/$page_owner->guid/all");
+} else {
+	elgg_push_breadcrumb($crumbs_title, "bookmarks/owner/$page_owner->username");
+}
+
+$title = $bookmark->title;
+
+elgg_push_breadcrumb($title);
+
+$content = elgg_view_entity($bookmark, array('full_view' => true));
+$content .= elgg_view_comments($bookmark);
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
new file mode 100644
index 000000000..caea43587
--- /dev/null
+++ b/mod/bookmarks/start.php
@@ -0,0 +1,316 @@
+<?php
+/**
+ * Elgg Bookmarks plugin
+ *
+ * @package ElggBookmarks
+ */
+
+elgg_register_event_handler('init', 'system', 'bookmarks_init');
+
+/**
+ * Bookmark init
+ */
+function bookmarks_init() {
+
+	$root = dirname(__FILE__);
+	elgg_register_library('elgg:bookmarks', "$root/lib/bookmarks.php");
+
+	// actions
+	$action_path = "$root/actions/bookmarks";
+	elgg_register_action('bookmarks/save', "$action_path/save.php");
+	elgg_register_action('bookmarks/delete', "$action_path/delete.php");
+	elgg_register_action('bookmarks/share', "$action_path/share.php");
+
+	// menus
+	elgg_register_menu_item('site', array(
+		'name' => 'bookmarks',
+		'text' => elgg_echo('bookmarks'),
+		'href' => 'bookmarks/all'
+	));
+
+	elgg_register_plugin_hook_handler('register', 'menu:page', 'bookmarks_page_menu');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'bookmarks_owner_block_menu');
+
+	elgg_register_page_handler('bookmarks', 'bookmarks_page_handler');
+
+	elgg_extend_view('css/elgg', 'bookmarks/css');
+	elgg_extend_view('js/elgg', 'bookmarks/js');
+
+	elgg_register_widget_type('bookmarks', elgg_echo('bookmarks'), elgg_echo('bookmarks:widget:description'));
+
+	if (elgg_is_logged_in()) {
+		$user_guid = elgg_get_logged_in_user_guid();
+		$address = urlencode(current_page_url());
+
+		elgg_register_menu_item('extras', array(
+			'name' => 'bookmark',
+			'text' => elgg_view_icon('push-pin-alt'),
+			'href' => "bookmarks/add/$user_guid?address=$address",
+			'title' => elgg_echo('bookmarks:this'),
+			'rel' => 'nofollow',
+		));
+	}
+	// Register granular notification for this type
+	register_notification_object('object', 'bookmarks', elgg_echo('bookmarks:new'));
+
+	// Listen to notification events and supply a more useful message
+	elgg_register_plugin_hook_handler('notify:entity:message', 'object', 'bookmarks_notify_message');
+
+	// Register bookmarks view for ecml parsing
+	elgg_register_plugin_hook_handler('get_views', 'ecml', 'bookmarks_ecml_views_hook');
+
+	// Register a URL handler for bookmarks
+	elgg_register_entity_url_handler('object', 'bookmarks', 'bookmark_url');
+
+	// Register entity type for search
+	elgg_register_entity_type('object', 'bookmarks');
+
+	// Groups
+	add_group_tool_option('bookmarks', elgg_echo('bookmarks:enablebookmarks'), true);
+	elgg_extend_view('groups/tool_latest', 'bookmarks/group_module');
+}
+
+/**
+ * Dispatcher for bookmarks.
+ *
+ * URLs take the form of
+ *  All bookmarks:        bookmarks/all
+ *  User's bookmarks:     bookmarks/owner/<username>
+ *  Friends' bookmarks:   bookmarks/friends/<username>
+ *  View bookmark:        bookmarks/view/<guid>/<title>
+ *  New bookmark:         bookmarks/add/<guid> (container: user, group, parent)
+ *  Edit bookmark:        bookmarks/edit/<guid>
+ *  Group bookmarks:      bookmarks/group/<guid>/all
+ *  Bookmarklet:          bookmarks/bookmarklet/<guid> (user)
+ *
+ * Title is ignored
+ *
+ * @param array $page
+ * @return bool
+ */
+function bookmarks_page_handler($page) {
+
+	elgg_load_library('elgg:bookmarks');
+
+	if (!isset($page[0])) {
+		$page[0] = 'all';
+	}
+
+	elgg_push_breadcrumb(elgg_echo('bookmarks'), 'bookmarks/all');
+
+	// old group usernames
+	if (substr_count($page[0], 'group:')) {
+		preg_match('/group\:([0-9]+)/i', $page[0], $matches);
+		$guid = $matches[1];
+		if ($entity = get_entity($guid)) {
+			bookmarks_url_forwarder($page);
+		}
+	}
+
+	// user usernames
+	$user = get_user_by_username($page[0]);
+	if ($user) {
+		bookmarks_url_forwarder($page);
+	}
+
+	$pages = dirname(__FILE__) . '/pages/bookmarks';
+
+	switch ($page[0]) {
+		case "all":
+			include "$pages/all.php";
+			break;
+
+		case "owner":
+			include "$pages/owner.php";
+			break;
+
+		case "friends":
+			include "$pages/friends.php";
+			break;
+
+		case "view":
+			set_input('guid', $page[1]);
+			include "$pages/view.php";
+			break;
+		case 'read': // Elgg 1.7 compatibility
+			register_error(elgg_echo("changebookmark"));
+			forward("bookmarks/view/{$page[1]}");
+			break;
+
+		case "add":
+			gatekeeper();
+			include "$pages/add.php";
+			break;
+
+		case "edit":
+			gatekeeper();
+			set_input('guid', $page[1]);
+			include "$pages/edit.php";
+			break;
+
+		case 'group':
+			group_gatekeeper();
+			include "$pages/owner.php";
+			break;
+
+		case "bookmarklet":
+			set_input('container_guid', $page[1]);
+			include "$pages/bookmarklet.php";
+			break;
+
+		default:
+			return false;
+	}
+
+	elgg_pop_context();
+	return true;
+}
+
+/**
+ * Forward to the new style of URLs
+ *
+ * @param string $page
+ */
+function bookmarks_url_forwarder($page) {
+	global $CONFIG;
+
+	if (!isset($page[1])) {
+		$page[1] = 'items';
+	}
+
+	switch ($page[1]) {
+		case "read":
+			$url = "{$CONFIG->wwwroot}bookmarks/view/{$page[2]}/{$page[3]}";
+			break;
+		case "inbox":
+			$url = "{$CONFIG->wwwroot}bookmarks/inbox/{$page[0]}";
+			break;
+		case "friends":
+			$url = "{$CONFIG->wwwroot}bookmarks/friends/{$page[0]}";
+			break;
+		case "add":
+			$url = "{$CONFIG->wwwroot}bookmarks/add/{$page[0]}";
+			break;
+		case "items":
+			$url = "{$CONFIG->wwwroot}bookmarks/owner/{$page[0]}";
+			break;
+		case "bookmarklet":
+			$url = "{$CONFIG->wwwroot}bookmarks/bookmarklet/{$page[0]}";
+			break;
+	}
+
+	register_error(elgg_echo("changebookmark"));
+	forward($url);
+}
+
+/**
+ * Populates the ->getUrl() method for bookmarked objects
+ *
+ * @param ElggEntity $entity The bookmarked object
+ * @return string bookmarked item URL
+ */
+function bookmark_url($entity) {
+	global $CONFIG;
+
+	$title = $entity->title;
+	$title = elgg_get_friendly_title($title);
+	return $CONFIG->url . "bookmarks/view/" . $entity->getGUID() . "/" . $title;
+}
+
+/**
+ * Add a menu item to an ownerblock
+ * 
+ * @param string $hook
+ * @param string $type
+ * @param array  $return
+ * @param array  $params
+ */
+function bookmarks_owner_block_menu($hook, $type, $return, $params) {
+	if (elgg_instanceof($params['entity'], 'user')) {
+		$url = "bookmarks/owner/{$params['entity']->username}";
+		$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks'), $url);
+		$return[] = $item;
+	} else {
+		if ($params['entity']->bookmarks_enable != 'no') {
+			$url = "bookmarks/group/{$params['entity']->guid}/all";
+			$item = new ElggMenuItem('bookmarks', elgg_echo('bookmarks:group'), $url);
+			$return[] = $item;
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Returns the body of a notification message
+ *
+ * @param string $hook
+ * @param string $entity_type
+ * @param string $returnvalue
+ * @param array  $params
+ */
+function bookmarks_notify_message($hook, $entity_type, $returnvalue, $params) {
+	$entity = $params['entity'];
+	$to_entity = $params['to_entity'];
+	$method = $params['method'];
+	if (($entity instanceof ElggEntity) && ($entity->getSubtype() == 'bookmarks')) {
+		$descr = $entity->description;
+		$title = $entity->title;
+		$owner = $entity->getOwnerEntity();
+
+		return elgg_echo('bookmarks:notification', array(
+			$owner->name,
+			$title,
+			$entity->address,
+			$descr,
+			$entity->getURL()
+		));
+	}
+	return null;
+}
+
+/**
+ * Add a page menu menu.
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array  $return
+ * @param array  $params
+ */
+function bookmarks_page_menu($hook, $type, $return, $params) {
+	if (elgg_is_logged_in()) {
+		// only show bookmarklet in bookmark pages
+		if (elgg_in_context('bookmarks')) {
+			$page_owner = elgg_get_page_owner_entity();
+			if (!$page_owner) {
+				$page_owner = elgg_get_logged_in_user_entity();
+			}
+
+			if ($page_owner instanceof ElggGroup) {
+				if (!$page_owner->isMember()) {
+					return $return;
+				}
+				$title = elgg_echo('bookmarks:bookmarklet:group');
+			} else {
+				$title = elgg_echo('bookmarks:bookmarklet');
+			}
+
+			$return[] = new ElggMenuItem('bookmarklet', $title, 'bookmarks/bookmarklet/' . $page_owner->getGUID());
+		}
+	}
+
+	return $return;
+}
+
+/**
+ * Return bookmarks views to parse for ecml
+ *
+ * @param string $hook
+ * @param string $type
+ * @param array  $return
+ * @param array  $params
+ */
+function bookmarks_ecml_views_hook($hook, $type, $return, $params) {
+	$return['object/bookmarks'] = elgg_echo('item:object:bookmarks');
+	return $return;
+}
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
new file mode 100644
index 000000000..b3e9737fe
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Bookmarklet
+ *
+ * @package Bookmarks
+ */
+
+$page_owner = elgg_get_page_owner_entity();
+
+if ($page_owner instanceof ElggGroup) {
+	$title = elgg_echo("bookmarks:this:group", array($page_owner->name));
+} else {
+	$title = elgg_echo("bookmarks:this");
+}
+
+$guid = $page_owner->getGUID();
+
+if (!$name && ($user = elgg_get_logged_in_user_entity())) {
+	$name = $user->username;
+}
+
+$url = elgg_get_site_url();
+$img = elgg_view('output/img', array(
+	'src' => 'mod/bookmarks/graphics/bookmarklet.gif',
+	'alt' => $title,
+));
+$bookmarklet = "<a href=\"javascript:location.href='{$url}bookmarks/add/$guid?address='"
+	. "+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">"
+	. $img . "</a>";
+
+?>
+<p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p>
+<p><?php echo $bookmarklet; ?></p>
+<p><?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?></p>
+<p><?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?></p>
diff --git a/mod/bookmarks/views/default/bookmarks/css.php b/mod/bookmarks/views/default/bookmarks/css.php
new file mode 100644
index 000000000..0d734c847
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/css.php
@@ -0,0 +1,3 @@
+.elgg-icon-bookmark {
+	background: transparent url(<?php echo elgg_get_site_url();?>mod/bookmarks/graphics/bookmark.gif);
+}
+\ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
new file mode 100644
index 000000000..60a727819
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * List most recent bookmarks on group profile page
+ *
+ * @package Bookmarks
+ */
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->bookmarks_enable == "no") {
+	return true;
+}
+
+$all_link = elgg_view('output/url', array(
+	'href' => "bookmarks/group/$group->guid/all",
+	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
+));
+
+elgg_push_context('widgets');
+$options = array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'limit' => 6,
+	'full_view' => false,
+	'pagination' => false,
+);
+$content = elgg_list_entities($options);
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('bookmarks:none') . '</p>';
+}
+
+$new_link = elgg_view('output/url', array(
+	'href' => "bookmarks/add/$group->guid",
+	'text' => elgg_echo('bookmarks:add'),
+	'is_trusted' => true,
+));
+
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('bookmarks:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/bookmarks/views/default/bookmarks/js.php b/mod/bookmarks/views/default/bookmarks/js.php
new file mode 100644
index 000000000..c36823c09
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/js.php
@@ -0,0 +1,12 @@
+
+elgg.provide('elgg.bookmarks');
+
+elgg.bookmarks.init = function() {
+	// append the title to the url
+	var title = document.title;
+	var e = $('a.elgg-bookmark-page');
+	var link = e.attr('href') + '&title=' + encodeURIComponent(title);
+	e.attr('href', link);
+};
+
+elgg.register_hook_handler('init', 'system', elgg.bookmarks.init);
diff --git a/mod/bookmarks/views/default/bookmarks/sidebar.php b/mod/bookmarks/views/default/bookmarks/sidebar.php
new file mode 100644
index 000000000..811284ef3
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/sidebar.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Bookmarks sidebar
+ */
+
+echo elgg_view('page/elements/comments_block', array(
+	'subtypes' => 'bookmarks',
+	'owner_guid' => elgg_get_page_owner_guid(),
+));
+
+echo elgg_view('page/elements/tagcloud_block', array(
+	'subtypes' => 'bookmarks',
+	'owner_guid' => elgg_get_page_owner_guid(),
+));
diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php
new file mode 100644
index 000000000..7d064a55b
--- /dev/null
+++ b/mod/bookmarks/views/default/forms/bookmarks/save.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Edit / add a bookmark
+ *
+ * @package Bookmarks
+ */
+
+// once elgg_view stops throwing all sorts of junk into $vars, we can use extract()
+$title = elgg_extract('title', $vars, '');
+$desc = elgg_extract('description', $vars, '');
+$address = elgg_extract('address', $vars, '');
+$tags = elgg_extract('tags', $vars, '');
+$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT);
+$container_guid = elgg_extract('container_guid', $vars);
+$guid = elgg_extract('guid', $vars, null);
+$shares = elgg_extract('shares', $vars, array());
+
+?>
+<div>
+	<label><?php echo elgg_echo('title'); ?></label><br />
+	<?php echo elgg_view('input/text', array('name' => 'title', 'value' => $title)); ?>
+</div>
+<div>
+	<label><?php echo elgg_echo('bookmarks:address'); ?></label><br />
+	<?php echo elgg_view('input/text', array('name' => 'address', 'value' => $address)); ?>
+</div>
+<div>
+	<label><?php echo elgg_echo('description'); ?></label>
+	<?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $desc)); ?>
+</div>
+<div>
+	<label><?php echo elgg_echo('tags'); ?></label>
+	<?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags)); ?>
+</div>
+<?php
+
+$categories = elgg_view('input/categories', $vars);
+if ($categories) {
+	echo $categories;
+}
+
+?>
+<div>
+	<label><?php echo elgg_echo('access'); ?></label><br />
+	<?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?>
+</div>
+<div class="elgg-foot">
+<?php
+
+echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
+
+if ($guid) {
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $guid));
+}
+
+echo elgg_view('input/submit', array('value' => elgg_echo("save")));
+
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
new file mode 100644
index 000000000..83bae2b13
--- /dev/null
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -0,0 +1,127 @@
+<?php
+/**
+ * Elgg bookmark view
+ *
+ * @package ElggBookmarks
+ */
+
+$full = elgg_extract('full_view', $vars, FALSE);
+$bookmark = elgg_extract('entity', $vars, FALSE);
+
+if (!$bookmark) {
+	return;
+}
+
+$owner = $bookmark->getOwnerEntity();
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
+$container = $bookmark->getContainerEntity();
+$categories = elgg_view('output/categories', $vars);
+
+$link = elgg_view('output/url', array('href' => $bookmark->address));
+$description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl'));
+
+$owner_link = elgg_view('output/url', array(
+	'href' => "bookmarks/owner/$owner->username",
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+$author_text = elgg_echo('byline', array($owner_link));
+
+$date = elgg_view_friendly_time($bookmark->time_created);
+
+$comments_count = $bookmark->countComments();
+//only display if there are commments
+if ($comments_count != 0) {
+	$text = elgg_echo("comments") . " ($comments_count)";
+	$comments_link = elgg_view('output/url', array(
+		'href' => $bookmark->getURL() . '#comments',
+		'text' => $text,
+		'is_trusted' => true,
+	));
+} else {
+	$comments_link = '';
+}
+
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
+	'handler' => 'bookmarks',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
+
+$subtitle = "$author_text $date $comments_link $categories";
+
+// do not show the metadata and controls in widget view
+if (elgg_in_context('widgets')) {
+	$metadata = '';
+}
+
+if ($full && !elgg_in_context('gallery')) {
+
+	$params = array(
+		'entity' => $bookmark,
+		'title' => false,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+	);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
+
+	$bookmark_icon = elgg_view_icon('push-pin-alt');
+	$body = <<<HTML
+<div class="bookmark elgg-content mts">
+	$bookmark_icon<span class="elgg-heading-basic mbs">$link</span>
+	$description
+</div>
+HTML;
+
+	echo elgg_view('object/elements/full', array(
+		'entity' => $bookmark,
+		'icon' => $owner_icon,
+		'summary' => $summary,
+		'body' => $body,
+	));
+
+} elseif (elgg_in_context('gallery')) {
+	echo <<<HTML
+<div class="bookmarks-gallery-item">
+	<h3>$bookmark->title</h3>
+	<p class='subtitle'>$owner_link $date</p>
+</div>
+HTML;
+} else {
+	// brief view
+	$url = $bookmark->address;
+	$display_text = $url;
+	$excerpt = elgg_get_excerpt($bookmark->description);
+	if ($excerpt) {
+		$excerpt = " - $excerpt";
+	}
+
+	if (strlen($url) > 25) {
+		$bits = parse_url($url);
+		if (isset($bits['host'])) {
+			$display_text = $bits['host'];
+		} else {
+			$display_text = elgg_get_excerpt($url, 100);
+		}
+	}
+
+	$link = elgg_view('output/url', array(
+		'href' => $bookmark->address,
+		'text' => $display_text,
+	));
+
+	$content = elgg_view_icon('push-pin-alt') . "$link{$excerpt}";
+
+	$params = array(
+		'entity' => $bookmark,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+		'content' => $content,
+	);
+	$params = $params + $vars;
+	$body = elgg_view('object/elements/summary', $params);
+	
+	echo elgg_view_image_block($owner_icon, $body);
+}
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
new file mode 100644
index 000000000..388f54ac9
--- /dev/null
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * New bookmarks river entry
+ *
+ * @package Bookmarks
+ */
+
+$object = $vars['item']->getObjectEntity();
+$excerpt = elgg_get_excerpt($object->description);
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+	'attachments' => elgg_view('output/url', array('href' => $object->address)),
+));
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/content.php b/mod/bookmarks/views/default/widgets/bookmarks/content.php
new file mode 100644
index 000000000..0b85017fc
--- /dev/null
+++ b/mod/bookmarks/views/default/widgets/bookmarks/content.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Elgg bookmarks widget
+ *
+ * @package Bookmarks
+ */
+
+$max = (int) $vars['entity']->num_display;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $max,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$url = "bookmarks/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $url,
+		'text' => elgg_echo('bookmarks:more'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('bookmarks:none');
+}
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/edit.php b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
new file mode 100644
index 000000000..ed9c7fd88
--- /dev/null
+++ b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Elgg bookmark widget edit view
+ *
+ * @package Bookmarks
+ */
+
+// set default value
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 4;
+}
+
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
+
+?>
+<div>
+	<?php echo elgg_echo('bookmarks:numbertodisplay'); ?>:
+	<?php echo $dropdown; ?>
+</div>
diff --git a/mod/bookmarks/views/rss/object/bookmarks.php b/mod/bookmarks/views/rss/object/bookmarks.php
new file mode 100644
index 000000000..1abda4710
--- /dev/null
+++ b/mod/bookmarks/views/rss/object/bookmarks.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Bookmark RSS object view
+ *
+ * @package ElggBookmarks
+ */
+
+$title = $vars['entity']->title;
+if (empty($title)) {
+	$title = strip_tags($vars['entity']->description);
+	$title = elgg_get_excerpt($title, 32);
+}
+
+$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8');
+$pubdate = date('r', $vars['entity']->getTimeCreated());
+
+$url_text = elgg_echo('bookmarks:address');
+$link = elgg_view('output/url', array('href' => $vars['entity']->address));
+$description = $vars['entity']->description . "<p>$url_text: $link</p>";
+
+$creator = elgg_view('page/components/creator', $vars);
+$georss = elgg_view('page/components/georss', $vars);
+$extension = elgg_view('extensions/item');
+
+$item = <<<__HTML
+<item>
+	<guid isPermaLink="true">$permalink</guid>
+	<pubDate>$pubdate</pubDate>
+	<link>$permalink</link>
+	<title><![CDATA[$title]]></title>
+	<description><![CDATA[$description]]></description>
+	$creator$georss$extension
+</item>
+
+__HTML;
+
+echo $item;
diff --git a/mod/bulk_user_admin/actions/bulk_user_admin/delete.php b/mod/bulk_user_admin/actions/bulk_user_admin/delete.php
new file mode 100644
index 000000000..0d7a7e7df
--- /dev/null
+++ b/mod/bulk_user_admin/actions/bulk_user_admin/delete.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Bulk delete users
+ */
+
+$guids = get_input('bulk_user_admin_guids');
+$errors = array();
+
+foreach ($guids as $guid) {
+	$user = get_entity($guid);
+
+	if (!$user instanceof ElggUser) {
+		$errors[] = "$guid is not a user.";
+		continue;
+	}
+
+	if (!$user->delete()) {
+		$errors[] = "Could not delete $user->name ($user->username).";
+	}
+}
+
+if ($errors) {
+	foreach ($errors as $error) {
+		register_error($error);
+	}
+} else {
+	system_message("Users deleted.");
+}
+
+forward(REFERER);
diff --git a/mod/bulk_user_admin/actions/bulk_user_admin/delete_by_domain.php b/mod/bulk_user_admin/actions/bulk_user_admin/delete_by_domain.php
new file mode 100644
index 000000000..c51076936
--- /dev/null
+++ b/mod/bulk_user_admin/actions/bulk_user_admin/delete_by_domain.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Bulk delete users by email
+ */
+
+$domain = get_input('domain');
+
+$errors = array();
+
+$options = array(
+	'limit' => 50,
+	'offset' => 0,
+);
+
+$users = bulk_user_admin_get_users_by_email_domain($domain, $options);
+
+while ($users) {
+	foreach ($users as $user) {
+		if (!$user->delete()) {
+			$errors[] = "Could not delete $user->name ($user->username).";
+		}
+	}
+
+	$options['offset'] = $options['offset'] + $options['limit'];
+	$users = bulk_user_admin_get_users_by_email_domain($domain, $options);
+}
+
+if ($errors) {
+	foreach ($errors as $error) {
+		register_error($error);
+	}
+} else {
+	system_message("Users deleted.");
+}
+
+forward(REFERER);
diff --git a/mod/bulk_user_admin/languages/en.php b/mod/bulk_user_admin/languages/en.php
new file mode 100644
index 000000000..d29b8398d
--- /dev/null
+++ b/mod/bulk_user_admin/languages/en.php
@@ -0,0 +1,9 @@
+<?php
+
+$english = array(
+	'admin:users:email_domain_stats' => "User Email Domain Stats",
+);
+					
+	add_translation("en",$english);
+
+?>
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/manifest.xml b/mod/bulk_user_admin/manifest.xml
new file mode 100644
index 000000000..1d0679acb
--- /dev/null
+++ b/mod/bulk_user_admin/manifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Bulk User Admin</name>
+	<author>Brett Profitt</author>
+	<version>1.8</version>
+	<description>Delete users in bulk</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>(C) Brett Profitt 2011</copyright>
+	<license>GNU Public License version 2</license>
+ 
+	<!-- All plugins must require either elgg_version or elgg_release. -->
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	
+	<category>admin</category>
+</plugin_manifest>
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/readme.md b/mod/bulk_user_admin/readme.md
new file mode 100644
index 000000000..39f41cd8d
--- /dev/null
+++ b/mod/bulk_user_admin/readme.md
@@ -0,0 +1,11 @@
+Bulk user Admin
+===============
+
+(C) 2011 Brett Profitt
+GPL 2
+
+About
+=====
+Adds ability to bulk delete users from the admin section.
+
+Adds menu to display users by domain and the most common domains registered.
diff --git a/mod/bulk_user_admin/start.php b/mod/bulk_user_admin/start.php
new file mode 100644
index 000000000..2af97b23e
--- /dev/null
+++ b/mod/bulk_user_admin/start.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Allow bulk delete operations
+ */
+
+/**
+ * Init
+ */
+function bulk_user_admin_init() {
+	elgg_register_event_handler('pagesetup', 'system', 'bulk_user_admin_admin_page_setup');
+
+	elgg_extend_view('admin/user_opt/search', 'bulk_user_admin/search_by_domain');
+	elgg_extend_view('css/admin', 'bulk_user_admin/css');
+
+	elgg_register_action('bulk_user_admin/delete', dirname(__FILE__) . '/actions/bulk_user_admin/delete.php', 'admin');
+	elgg_register_action('bulk_user_admin/delete_by_domain', dirname(__FILE__) . '/actions/bulk_user_admin/delete_by_domain.php', 'admin');
+
+}
+
+function bulk_user_admin_get_users_by_email_domain($domain, $options = array()) {
+	$domain = sanitise_string($domain);
+	$db_prefix = elgg_get_config('dbprefix');
+	
+	$where = "ue.email LIKE '%@$domain'";
+	if (!isset($options['wheres'])) {
+		$options['wheres'] = array($where);
+	} else {
+		if (!is_array($options['wheres'])) {
+			$options['wheres'] = array($options['wheres']);
+		}
+		$options['wheres'][] = $where;
+	}
+
+	$join = "JOIN {$db_prefix}users_entity ue on e.guid = ue.guid";
+	if (!isset($options['joins'])) {
+		$options['joins'] = array($join);
+	} else {
+		if (!is_array($options['joins'])) {
+			$options['joins'] = array($options['joins']);
+		}
+		$options['joins'][] = $join;
+	}
+
+	$options['type'] = 'user';
+
+	return elgg_get_entities($options);
+}
+
+/**
+ * Sets up admin menu. Triggered on pagesetup.
+ */
+function bulk_user_admin_admin_page_setup() {
+	if (elgg_get_context() == 'admin' && elgg_is_admin_logged_in()) {
+	    elgg_register_admin_menu_item('administer', 'email_domain_stats', 'users');
+	}
+}
+
+function bulk_user_admin_get_email_domain_stats() {
+	$db_prefix = elgg_get_config('dbprefix');
+	$q = "SELECT email, substring_index(email, '@', -1) as domain, count(*) as count
+		FROM {$db_prefix}users_entity ue
+		JOIN {$db_prefix}entities e ON ue.guid = e.guid
+		WHERE e.enabled = 'yes'
+		group by domain order by count desc, domain asc;";
+		
+	return get_data($q);
+}
+
+elgg_register_event_handler('init', 'system', 'bulk_user_admin_init');
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/views/default/admin/user.php b/mod/bulk_user_admin/views/default/admin/user.php
new file mode 100644
index 000000000..c63f091ec
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/admin/user.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * Display a list of users to delete in bulk.
+ *
+ * Also used to show the search by domain results
+ */
+
+// Are we performing a search
+$limit = get_input('limit', 10);
+$offset = get_input('offset', 0);
+$domain = get_input('domain');
+
+$context = elgg_get_context();
+
+if (!$domain) {
+	$title = elgg_echo('admin:user');
+} else {
+	$title = "Users in the domain $domain";
+}
+
+elgg_set_context('search');
+
+$options = array(
+	'type' => 'user',
+	'limit' => $limit,
+	'offset' => $offset,
+	'full_view' => false
+);
+
+if ($domain) {
+	$users = bulk_user_admin_get_users_by_email_domain($domain, $options);
+	$options['count'] = true;
+	$users_count = bulk_user_admin_get_users_by_email_domain($domain, $options);
+} else {
+	$users = elgg_get_entities($options);
+	$options['count'] = true;
+	$users_count = elgg_get_entities($options);
+}
+
+$pagination = elgg_view('navigation/pagination', array(
+	'baseurl' => current_page_url(),
+	'offset' => $offset,
+	'count' => $users_count
+));
+
+$form_body = '';
+foreach ($users as $user) {
+	$form_body .= elgg_view('bulk_user_admin/user', array('entity' => $user));
+}
+
+$delete_button = elgg_view('input/submit', array(
+	'value' => 'Delete checked',
+));
+
+$form_body .= $delete_button;
+
+$site = elgg_get_config('site');
+
+$checked_form = elgg_view('input/form', array(
+	'action' =>  $site->url . 'action/bulk_user_admin/delete',
+	'body' => $form_body
+));
+
+
+$domain_form = '';
+
+if ($domain) {
+	$delete_button = "<br /><br />" . elgg_view('input/submit', array(
+		'value' => 'Delete all in domain',
+	));
+
+	$hidden = elgg_view('input/hidden', array(
+		'name' => 'domain',
+		'value' => $domain
+	));
+
+	$form_body = $delete_button . $hidden;
+
+	$domain_form = elgg_view('input/form', array(
+		'action' =>  $site->url . 'action/bulk_user_admin/delete_by_domain',
+		'body' => $form_body
+	));
+
+}
+
+$summary = "<div>$users_count user(s) found</div>";
+
+if ($domain) {
+	$summary .= '<br />';
+	$summary .= elgg_view('output/url', array(
+		'href' => elgg_http_remove_url_query_element(current_page_url(), 'domain'),
+		'text' => 'All users'
+	));
+}
+
+elgg_set_context('admin');
+
+echo $title . $summary . $pagination . $checked_form . $domain_form . $pagination;
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/views/default/admin/users/email_domain_stats.php b/mod/bulk_user_admin/views/default/admin/users/email_domain_stats.php
new file mode 100644
index 000000000..0caa50331
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/admin/users/email_domain_stats.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Shows a list of email domains on the site and how many users have are part of the domain.
+ */
+
+$title = 'Email domain stats';
+
+$domain_list = elgg_view('bulk_user_admin/email_domain_stats', array(
+	'domains' => bulk_user_admin_get_email_domain_stats()
+));
+
+echo $title . $domain_list;
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/views/default/bulk_user_admin/css.php b/mod/bulk_user_admin/views/default/bulk_user_admin/css.php
new file mode 100644
index 000000000..3254c1700
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/bulk_user_admin/css.php
@@ -0,0 +1,26 @@
+
+table.bulk_user_admin_email_domains {
+	width: 300px;
+}
+
+table.bulk_user_admin_email_domains th {
+	text-align: center;
+	font-weight: bold;
+	font-size: 125%;
+}
+
+table.bulk_user_admin_email_domains td {
+	padding: 3px;
+}
+
+table.bulk_user_admin_email_domains td.center {
+	text-align: center;
+}
+
+table.bulk_user_admin_email_domains tr.odd {
+	background-color: #fff;
+}
+
+table.bulk_user_admin_email_domains tr.even {
+	background-color: #dedede;
+}
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/views/default/bulk_user_admin/email_domain_stats.php b/mod/bulk_user_admin/views/default/bulk_user_admin/email_domain_stats.php
new file mode 100644
index 000000000..3936eb0ea
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/bulk_user_admin/email_domain_stats.php
@@ -0,0 +1,49 @@
+<?php
+
+$domains = $vars['domains'];
+
+?>
+<table class="bulk_user_admin_email_domains">
+	<tr>
+		<th>Domain</th>
+		<th>Registered users</th>
+	</tr>
+<?php
+
+
+$i = 0;
+foreach ($domains as $domain_info) {
+	if (!$domain_info->domain) {
+		continue;
+	}
+
+	$domain = elgg_view('output/url', array(
+		'text' => $domain_info->domain,
+		'href' => $domain_info->domain
+	));
+
+	$url = elgg_http_add_url_query_elements($vars['url'] . 'admin/user', array('domain' => $domain_info->domain));
+
+	// can't use $_GET variables in admin
+	// otherwise admin_page_handler() tries to call the view: view/name?variable=value
+	// which clearly doesn't work
+	// so we'll pass the domain via post
+	$users = '<form id="domain:' . $domain_info->domain . '" action="' . elgg_get_site_url() . 'admin/user" method="post">';
+	$users .= elgg_view('input/hidden', array('name' => 'domain', 'value' => $domain_info->domain));
+	$users .= '</form>';
+	$users .= '<a href="javascript:document.forms[\'domain:' . $domain_info->domain . '\'].submit();">' . $domain_info->count . '</a>';
+
+	$class = ($i % 2) ? 'odd' : 'even';
+
+	echo <<<___HTML
+	<tr class="$class">
+		<td>$domain</td>
+		<td class="center">$users</td>
+	</tr>
+___HTML;
+	
+	$i++;
+}
+
+?>
+</table>
+\ No newline at end of file
diff --git a/mod/bulk_user_admin/views/default/bulk_user_admin/search_by_domain.php b/mod/bulk_user_admin/views/default/bulk_user_admin/search_by_domain.php
new file mode 100644
index 000000000..5c65a3903
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/bulk_user_admin/search_by_domain.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Search by email domain
+ */
+?>
+<div id="search-box">
+	<form action="<?php echo current_page_url() ?>" method="get">
+	<b>Search by email domain</b>
+	<?php
+
+		echo elgg_view('input/text', array('name' => 'domain'));
+
+	?>
+	<input type="submit" value="Search by domain" />
+	</form>
+</div>
diff --git a/mod/bulk_user_admin/views/default/bulk_user_admin/user.php b/mod/bulk_user_admin/views/default/bulk_user_admin/user.php
new file mode 100644
index 000000000..d05d92fd3
--- /dev/null
+++ b/mod/bulk_user_admin/views/default/bulk_user_admin/user.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Show a user for bulk actions. Includes a checkbox on the left.
+ */
+if($vars['entity'] instanceof ElggUser){
+$icon =	elgg_view_entity_icon($vars['entity'], 'small');
+
+$banned = $vars['entity']->isBanned();
+$user = $vars['entity'];
+
+$checkbox = "<input type=\"checkbox\" name=\"bulk_user_admin_guids[]\" value=\"$user->guid\">";
+$first_login = elgg_view_friendly_time($user->time_created);
+$last_login = elgg_view_friendly_time($user->last_login);
+$last_action = elgg_view_friendly_time($user->last_action);
+$objects = elgg_get_entities(array(
+	'owner_guid' => $user->guid,
+	'count' => true
+));
+
+$db_prefix = elgg_get_config('dbprefix');
+
+$q = "SELECT COUNT(id) as count FROM {$db_prefix}annotations WHERE owner_guid = $user->guid";
+$data = get_data($q);
+$annotations = (int) $data[0]->count;
+
+$q = "SELECT COUNT(id) as count FROM {$db_prefix}metadata WHERE owner_guid = $user->guid";
+$data = get_data($q);
+$metadata = (int) $data[0]->count;
+
+// the CSS for classless <label> is really, really annoying.
+$info = <<<___HTML
+<label style="font-size: inherit; font-weight: inherit; color: inherit;">
+<p>$checkbox $user->name | $user->username | $user->email | $user->guid </p>
+<p>Last login: $last_login | First login: $first_login | Last action: $last_action</p>
+<p>Objects: $objects | Annotations: $annotations | Metadata: $metadata</p>
+___HTML;
+
+if ($banned) {
+	$info .= '<div id="profile_banned">';
+	$info .= elgg_echo('profile:banned');
+	$info .= '<br />';
+	$info .= $user->ban_reason;
+	$info .= '</div>';
+}
+
+$info .= '</label>';
+
+echo elgg_view('page/components/image_block', array('image' => $icon, 'body' => $info));
+}
+\ No newline at end of file
diff --git a/mod/categories/activate.php b/mod/categories/activate.php
new file mode 100644
index 000000000..80159d089
--- /dev/null
+++ b/mod/categories/activate.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Prompt the user to add categories after activating
+ */
+
+//categories_admin_notice_no_categories
+$site = get_config('site');
+if (!$site->categories) {
+	$message = elgg_echo('categories:on_activate_reminder', array(elgg_normalize_url('admin/plugin_settings/categories')));
+	elgg_add_admin_notice('categories_admin_notice_no_categories', $message);
+}
+\ No newline at end of file
diff --git a/mod/categories/deactivate.php b/mod/categories/deactivate.php
new file mode 100644
index 000000000..e15e2c6e9
--- /dev/null
+++ b/mod/categories/deactivate.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Remove admin notice to populate categories.
+ */
+
+elgg_delete_admin_notice('categories_admin_notice_no_categories');
diff --git a/mod/categories/languages/en.php b/mod/categories/languages/en.php
new file mode 100644
index 000000000..422fe81a4
--- /dev/null
+++ b/mod/categories/languages/en.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Categories English language file
+ */
+
+$english = array(
+	'categories' => 'Categories',
+	'categories:settings' => 'Set site categories',
+	'categories:explanation' => 'To set some predefined site-wide categories that will be used throughout your system, enter them below, separated with commas. Compatible tools will then display them when the user creates or edits content.',
+	'categories:save:success' => 'Site categories were successfully saved.',
+	'categories:results' => "Results for the site category: %s",
+	'categories:on_activate_reminder' => "Site-wide Categories won't work until you add categories. <a href=\"%s\">Add categories now.</a>",
+);
+
+add_translation("en", $english);
+\ No newline at end of file
diff --git a/mod/categories/manifest.xml b/mod/categories/manifest.xml
new file mode 100644
index 000000000..4a6bd0864
--- /dev/null
+++ b/mod/categories/manifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Site-wide Categories</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>enhancement</category>
+	<blurb>Add site-wide categories</blurb>
+	<description>Site-wide Categories lets administrators define categories that users across the site can add content to.</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/categories/pages/categories/listing.php b/mod/categories/pages/categories/listing.php
new file mode 100644
index 000000000..d51e6c19e
--- /dev/null
+++ b/mod/categories/pages/categories/listing.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * List entities by category
+ *
+ * @package ElggCategories
+ */
+
+$limit = get_input("limit", 10);
+$offset = get_input("offset", 0);
+$category = get_input("category");
+$owner_guid = get_input("owner_guid", ELGG_ENTITIES_ANY_VALUE);
+$subtype = get_input("subtype", ELGG_ENTITIES_ANY_VALUE);
+$type = get_input("type", 'object');
+
+$params = array(
+	'metadata_name' => 'universal_categories',
+	'metadata_value' => $category,
+	'type' => $type,
+	'subtype' => $subtype,
+	'owner_guid' => $owner_guid,
+	'limit' => $limit,
+	'full_view' => FALSE,
+	'metadata_case_sensitive' => FALSE,
+);
+$objects = elgg_list_entities_from_metadata($params);
+
+$title = elgg_echo('categories:results', array($category));
+
+$content = elgg_view_title($title);
+$content .= $objects;
+
+$body = elgg_view_layout('content', array(
+	'content' => $content,
+	'title' => $title,
+	'filter' => '',
+	'header' => '',
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/categories/readme.txt b/mod/categories/readme.txt
new file mode 100644
index 000000000..48d07fe8f
--- /dev/null
+++ b/mod/categories/readme.txt
@@ -0,0 +1,25 @@
+Site-wide categories
+--------------------
+
+NOTES FOR DEVELOPERS:
+
+If you're not a programmer, don't worry! All the main Elgg tools
+are already adapted to use categories, and a growing number of
+third party Elgg tools use it too.
+
+
+This plugin uses views and events hooks to allow you to easily add
+site-wide categories across Elgg tools.
+
+This is a two-line addition to any plugin.
+
+In your edit/create form:
+
+	echo elgg_view('input/categories', $vars);
+
+In your object view:
+
+	echo elgg_view('output/categories', $vars);
+	
+Note that in both cases, $vars['entity'] MUST be populated with
+the entity the categories apply to, if it exists.
+\ No newline at end of file
diff --git a/mod/categories/start.php b/mod/categories/start.php
new file mode 100644
index 000000000..0aacf11e7
--- /dev/null
+++ b/mod/categories/start.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Elgg categories plugin
+ *
+ * @package ElggCategories
+ */
+
+elgg_register_event_handler('init', 'system', 'categories_init');
+
+/**
+ * Initialise categories plugin
+ *
+ */
+function categories_init() {
+
+	elgg_extend_view('css/elgg', 'categories/css');
+
+	elgg_register_page_handler('categories', 'categories_page_handler');
+
+	elgg_register_event_handler('update', 'all', 'categories_save');
+	elgg_register_event_handler('create', 'all', 'categories_save');
+
+	// To keep the category plugins in the settings area and because we have to do special stuff,
+	// handle saving ourself.
+	elgg_register_plugin_hook_handler('action', 'plugins/settings/save', 'categories_save_site_categories');
+}
+
+
+/**
+ * Category page handler
+ * @return bool
+ */
+function categories_page_handler() {
+	include(dirname(__FILE__) . "/pages/categories/listing.php");
+	return true;
+}
+
+/**
+ * Save categories to object upon save / edit
+ *
+ */
+function categories_save($event, $object_type, $object) {
+	if ($object instanceof ElggEntity) {
+		$marker = get_input('universal_category_marker');
+
+		if ($marker == 'on') {
+			$categories = get_input('universal_categories_list');
+
+			if (empty($categories)) {
+				$categories = array();
+			}
+
+			$object->universal_categories = $categories;
+		}
+	}
+	return TRUE;
+}
+
+/**
+ * Saves the site categories.
+ *
+ * @param type $hook
+ * @param type $type
+ * @param type $value
+ * @param type $params
+ */
+function categories_save_site_categories($hook, $type, $value, $params) {
+	$plugin_id = get_input('plugin_id');
+	if ($plugin_id != 'categories') {
+		return $value;
+	}
+
+	$categories = get_input('categories');
+	$categories = string_to_tag_array($categories);
+
+	$site = elgg_get_site_entity();
+	$site->categories = $categories;
+	system_message(elgg_echo("categories:save:success"));
+
+	elgg_delete_admin_notice('categories_admin_notice_no_categories');
+
+	forward(REFERER);
+}
+\ No newline at end of file
diff --git a/mod/categories/views/default/categories.php b/mod/categories/views/default/categories.php
new file mode 100644
index 000000000..8577ef01b
--- /dev/null
+++ b/mod/categories/views/default/categories.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Categories input view
+ *
+ * @package ElggCategories
+ *
+ * @deprecated 1.8
+ */
+
+elgg_deprecated_notice("Use input/categories instead of categories", 1.8);
+
+echo elgg_view('input/categories', $vars);
diff --git a/mod/categories/views/default/categories/css.php b/mod/categories/views/default/categories/css.php
new file mode 100644
index 000000000..5f38e2867
--- /dev/null
+++ b/mod/categories/views/default/categories/css.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Categories CSS extender
+ *
+ * @package Categories
+ */
+?>
+
+.categories li label {
+	font-size: 100%;
+	line-height: 1.2em;
+}
diff --git a/mod/categories/views/default/categories/view.php b/mod/categories/views/default/categories/view.php
new file mode 100644
index 000000000..6d1f7c1bb
--- /dev/null
+++ b/mod/categories/views/default/categories/view.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * @deprecated 1.8
+ */
+
+elgg_deprecated_notice("Use output/categories instead of categories/view", 1.8);
+
+echo elgg_view('output/categories', $vars);
diff --git a/mod/categories/views/default/input/categories.php b/mod/categories/views/default/input/categories.php
new file mode 100644
index 000000000..b543cde45
--- /dev/null
+++ b/mod/categories/views/default/input/categories.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Categories input view
+ *
+ * @package ElggCategories
+ *
+ * @uses $vars['entity'] The entity being edited or created
+ */
+
+if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+	$selected_categories = $vars['entity']->universal_categories;
+}
+
+// use sticky values if set
+if (isset($vars['universal_categories_list'])) {
+	$selected_categories = $vars['universal_categories_list'];
+}
+
+$categories = elgg_get_site_entity()->categories;
+if (empty($categories)) {
+	$categories = array();
+}
+if (empty($selected_categories)) {
+	$selected_categories = array();
+}
+
+if (!empty($categories)) {
+	if (!is_array($categories)) {
+		$categories = array($categories);
+	}
+
+	// checkboxes want Label => value, so in our case we need category => category
+	$categories = array_flip($categories);
+	array_walk($categories, create_function('&$v, $k', '$v = $k;'));
+
+	?>
+
+<div class="categories">
+	<label><?php echo elgg_echo('categories'); ?></label><br />
+	<?php
+		echo elgg_view('input/checkboxes', array(
+			'options' => $categories,
+			'value' => $selected_categories,
+			'name' => 'universal_categories_list',
+			'align' => 'horizontal',
+		));
+
+	?>
+	<input type="hidden" name="universal_category_marker" value="on" />
+</div>
+
+	<?php
+
+} else {
+	echo '<input type="hidden" name="universal_category_marker" value="on" />';
+}
diff --git a/mod/categories/views/default/output/categories.php b/mod/categories/views/default/output/categories.php
new file mode 100644
index 000000000..4b3a3fb6a
--- /dev/null
+++ b/mod/categories/views/default/output/categories.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * View categories on an entity
+ *
+ * @uses $vars['entity']
+ */
+
+$linkstr = '';
+if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) {
+
+	$categories = $vars['entity']->universal_categories;
+	if (!empty($categories)) {
+		if (!is_array($categories)) {
+			$categories = array($categories);
+		}
+		foreach($categories as $category) {
+			$link = elgg_get_site_url() . 'categories/list?category=' . urlencode($category);
+			if (!empty($linkstr)) {
+				$linkstr .= ', ';
+			}
+			$linkstr .= '<a href="'.$link.'">' . $category . '</a>';
+		}
+	}
+
+}
+
+if ($linkstr) {
+	echo '<p class="elgg-output-categories">' . elgg_echo('categories') . ": $linkstr</p>";
+}
diff --git a/mod/categories/views/default/plugins/categories/settings.php b/mod/categories/views/default/plugins/categories/settings.php
new file mode 100644
index 000000000..3802da95a
--- /dev/null
+++ b/mod/categories/views/default/plugins/categories/settings.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Administrator sets the categories for the site
+ *
+ * @package ElggCategories
+ */
+
+// Get site categories
+$site = elgg_get_site_entity();
+$categories = $site->categories;
+
+if (empty($categories)) {
+	$categories = array();
+}
+
+?>
+<div>
+	<p><?php echo elgg_echo('categories:explanation'); ?></p>
+<?php
+	echo elgg_view('input/tags', array('value' => $categories, 'name' => 'categories'));
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/colorbox/COPYING b/mod/colorbox/COPYING
new file mode 100644
index 000000000..dba13ed2d
--- /dev/null
+++ b/mod/colorbox/COPYING
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
diff --git a/mod/colorbox/languages/ca.php b/mod/colorbox/languages/ca.php
new file mode 100644
index 000000000..214d327aa
--- /dev/null
+++ b/mod/colorbox/languages/ca.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Colorbox -- Translation strings for Catalan
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$catalan = array(
+	"js:lightbox:current" => "imatge %s de %s",
+);
+
+add_translation("ca", $catalan);
diff --git a/mod/colorbox/languages/en.php b/mod/colorbox/languages/en.php
new file mode 100644
index 000000000..70bab4e05
--- /dev/null
+++ b/mod/colorbox/languages/en.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Colorbox -- Translation strings for English
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$english = array(
+	"js:lightbox:current" => "image %s of %s",
+);
+
+add_translation("en", $english);
diff --git a/mod/colorbox/languages/es.php b/mod/colorbox/languages/es.php
new file mode 100644
index 000000000..e49d0db47
--- /dev/null
+++ b/mod/colorbox/languages/es.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Colorbox -- Translation strings for Spanish
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$spanish = array(
+	"js:lightbox:current" => "imagen %s de %s",
+);
+
+add_translation("es", $spanish);
diff --git a/mod/colorbox/manifest.xml b/mod/colorbox/manifest.xml
new file mode 100644
index 000000000..ec5f22e90
--- /dev/null
+++ b/mod/colorbox/manifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Colorbox</name>
+	<author>Lorea developers</author>
+	<version>1.8.0</version>
+	<category>lorea</category>
+	<category>enhancement</category>
+	<category>multimedia</category>
+	<description>Elgg lightbox replacement for Fancybox. Colorbox is the default Elgg lightbox in 1.9.</description>
+	<website>https://lorea.org/plugin/colorbox</website>
+	<copyright>Copyright 2012 Lorea Faeries &lt;federation@lorea.org&gt;</copyright>
+	<repository>https://gitorious.org/lorea/colorbox</repository>
+        <donations>https://lorea.org/support</donations>
+	<license>GNU Affero General Public License version 3, or later</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>embed</plugin>
+	</requires>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.9</version>
+		<comparison>lt</comparison>
+	</requires>
+</plugin_manifest>
diff --git a/mod/colorbox/start.php b/mod/colorbox/start.php
new file mode 100644
index 000000000..b19b2efcf
--- /dev/null
+++ b/mod/colorbox/start.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Colorbox -- A lightweight, customizable lightbox plugin for jQuery
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ * @homepage       https://lorea.org/plugin/colorbox
+ * @copyright      2011-2012 Lorea Faeries <federation@lorea.org>
+ * @license        COPYING, http://www.gnu.org/licenses/agpl
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+elgg_register_event_handler('init', 'system', 'colorbox_init');
+
+/**
+ * Initialize the colorbox plugin.
+ *
+ */
+function colorbox_init() {
+	
+}
diff --git a/mod/colorbox/vendors/jquery/colorbox/README.md b/mod/colorbox/vendors/jquery/colorbox/README.md
new file mode 100644
index 000000000..2a53feac8
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/README.md
@@ -0,0 +1,318 @@
+## About ColorBox:
+A customizable lightbox plugin for jQuery.  See the [project page](http://jacklmoore.com/colorbox/) for documentation and a demonstration, and the [FAQ](http://jacklmoore.com/colorbox/faq/) for solutions and examples to common issues.  Released under the [MIT license](http://www.opensource.org/licenses/mit-license.php).
+
+## Changelog:
+
+### Version 1.3.19 - December 08 2011
+Files Changed:jquery.colorbox.js/jquery.colorbox-min.js, colorbox.css (all)
+
+* Fixed bug related to using the 'fixed' property.
+* Optimized the setup procedure to be more efficient.
+* Removed $.colorbox.init() as it will no longer be needed (will self-init when called).
+* Removed use of $.browser.
+
+### Version 1.3.18 - October 07 2011
+Files Changed:jquery.colorbox.js/jquery.colorbox-min.js, colorbox.css (all) and example 1's controls.png
+
+* Fixed a regression where Flash content displayed in ColorBox would be reloaded if the browser window was resized.
+* Added safety check to make sure that ColorBox's markup is only added to the DOM a single time, even if $.colorbox.init() is called multiple times.  This will allow site owners to manually initialize ColorBox if they need it before the DOM has finished loading.
+* Updated the example index.html files to be HTML5 compliant.
+* Changed the slideshow behavior so that it immediately moves to the next slide when the slideshow is started.
+* Minor regex bugfix to allow automatic detection of image URLs that include fragments.
+
+### Version 1.3.17 - May 11 2011
+Files Changed:jquery.colorbox.js/jquery.colorbox-min.js
+
+* Added properties "top", "bottom", "left" and "right" to specify a position relative to the viewport, rather than using the default centering.
+* Added property "data" to specify GET or POST data when using Ajax.  ColorBox's ajax functionality is handled by jQuery's .load() method, so the data property works the same way as it does with .load().
+* Added property "fixed" which can provide fixed positioning for ColorBox, rather than absolute positioning.  This will allow ColorBox to remain in a fixed position within the visitors viewport, despite scrolling.  IE6 support for this was not added, it will continue to use the default absolute positioning.
+* Fixed ClearType problem with IE7.
+* Minor fixes.
+
+### Version 1.3.16 - March 01 2011
+Files Changed:jquery.colorbox.js/jquery.colorbox-min.js, colorbox.css (all) and example 4 background png files
+
+* Better IE related transparency workarounds.  IE7 and up now uses the same background image sprite as other browsers.
+* Added error handling for broken image links. A message will be displayed telling the user that the image could not be loaded.
+* Added new property: 'fastIframe' and set it to true by default.  Setting to fastIframe:false will delay the loading graphic removal and onComplete event until iframe has completely loaded.
+* Ability to redefine $.colorbox.close (or prev, or next) at any time.
+
+### Version 1.3.15 - October 27 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Minor fixes for specific cases.
+
+### Version 1.3.14 - October 27 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* In IE6, closing an iframe when using HTTPS no longer generates a security warning.
+
+### Version 1.3.13 - October 22 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Changed the index.html example files to use YouTube's new embedded link format.
+* By default, ColorBox returns focus to the element it was launched from once it closes.  This can now be disabled by setting the 'returnFocus' property to false.  Focus was causing problems for some users who had their anchor elements inside animated containers.
+* Minor bug fix involved in using a combination of slideshow and non-slideshow content.
+
+### Version 1.3.12 - October 20 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Minor bug fix involved in preloading images when using a function as a value for the href property.
+
+### Version 1.3.11 - October 19 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed the slideshow functionality that broke with 1.3.10
+* The slideshow now respects the loop property.
+
+### Version 1.3.10 - October 16 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed compatibility with jQuery 1.4.3
+* The 'open' property now accepts a function as a value, like all of the other properties.
+* Preloading now loads the correct href for images when using a dynamic (function) value for the href property.
+* Fixed bug in Safari 3 for Win where ColorBox centered on the document, rather than the visitor's viewport.
+* May have fixed an issue in Opera 10.6+ where ColorBox would rarely/randomly freeze up while switching between photos in a group.
+* Some functionality better encapsulated & minor performance improvements.
+
+### Version 1.3.9 - July 7 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js/ all colorbox.css (the core styles)
+
+* Fixed a problem where iframed youtube videos would cause a security alert in IE.
+* More code is event driven now, making the source easier to grasp.
+* Removed some unnecessary style from the core CSS.
+
+### Version 1.3.8 - June 21 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed a bug in Chrome where it would sometimes render photos at 0 by 0 width and height (behavior introduced in recent update to Chrome).
+* Fixed a bug where the onClosed callback would fire twice (only affected 1.3.7).
+* Fixed a bug in IE7 that existed with some iframed websites that use JS to reposition the viewport caused ColorBox to move out of position.
+* Abstracted the identifiers (HTML ids & classes, and JS plugin name, method, and events) so that the plugin can be easily rebranded.
+* Small changes to improve either code readability or compression.
+
+### Version 1.3.7 - June 13 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js/index.html
+
+* $.colorbox can now be used for direct calls and accessing public methods. Example: $.colorbox.close();
+* Resize now accepts 'width', 'innerWidth', 'height' and 'innerHeight'. Example: $.colorbox.resize({width:"100%"})
+* Added option (loop:false) to disable looping in a group.
+* Added options (escKey:false, arrowKey:false) to disable esc-key and arrow-key bindings.
+* Added method for removing ColorBox from a document: $.colorbox.remove();
+* Fixed a bug where iframed URLs would be truncated if they contained an unencoded apostrophe.
+* Now uses the exact href specified on an anchor, rather than the version returned by 'this.href'. This was causing "#example" to be normalized to "http://domain/#example" which interfered with how some users were setting up links to inline content.
+* Changed example documents over to HTML5.
+
+### Version 1.3.6 - Jan 13 2010
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Small change to make ColorBox compatible with jQuery 1.4
+
+### Version 1.3.5 - December 15 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed a bug introduced in 1.3.4 with IE7's display of example 2 and 3, and auto-width in Opera.
+* Fixed a bug introduced in 1.3.4 where colorbox could not be launched by triggering an element's click event through JavaScript.
+* Minor refinements.
+
+### Version 1.3.4 - December 5 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Event delegation is now used for elements that ColorBox is assigned to, rather than individual click events.
+* Additional callbacks have been added to represent other stages of ColorBox's lifecycle. Available callbacks, in order of their execution: onOpen, onLoad, onComplete, onCleanup, onClosed These take place at the same time as the event hooks, but will be better suited than the hooks for targeting specific instances of ColorBox.
+* Ajax content is now immediately added to the DOM to be more compatible if that content contains script tags.
+* Focus is now returned to the calling element on closing.
+* Fixed a bug where maxHeight and maxWidth did not work for non-photo content.
+* Direct calls no longer need 'open:true', it is assumed.  Example: `$.fn.colorbox({html:'<p>Hi</p>'});`
+
+### Version 1.3.3 - November 7 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Changed $.fn.colorbox.element() to return a jQuery object rather the DOM element.
+* jQuery.colorbox-min.js is compressed with Google's Closure Compiler rather than YUI Compressor.
+
+### Version 1.3.2 - October 27 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Added 'innerWidth' and 'innerHeight' options to allow people to easily set the size dimensions for ColorBox, without having to anticipate the size of the borders and buttons.
+* Renamed 'scrollbars' option to 'scrolling' to be in keeping with the existing HTML attribute. The option now also applies to iframes.
+* Bug fix: In Safari, positioning occassionally incorrect when using '100%' dimensions.
+* Bug fix: In IE6, the background overlay is briefly not full size when first viewing.
+* Bug fix: In Firefox, opening ColorBox causes a split second shift with a small minority of webpage layouts.
+* Simplified code in a few areas.
+
+### Version 1.3.1 - September 16 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js/colorbox.css/colorbox-ie.css(removed)
+
+* Removed the IE-only stylesheets and conditional comments for example styles 1 & 4.  All CSS is handled by a single CSS file for all examples.
+* Removed user-agent sniffing from the js and replaced it with feature detection.  This will allow correct rendering for visitors masking their agent type.
+
+### Version 1.3.0 - September 15 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js/colorbox.css
+
+* Added $.fn.colorbox.resize() method to allow ColorBox to resize it's height if it's contents change.
+* Added 'scrollbars' option to allow users to turn off scrollbars when using the resize() method.
+* Renamed the 'resize' option to be less ambiguous.  It's now 'scalePhotos'.
+* Renamed the 'cbox_close' event to be less ambiguous.  It's now 'cbox_cleanup'.  It is the first thing to happen in the close method while the 'cbox_closed' event is the last to happen.
+* Fixed a bug with the slideshow mouseover graphics that appeared after ColorBox is opened a 2nd time.
+* Fixed a bug where ClearType may not work in IE6&7 if using the fade transition.
+* Minor code optimizations to increase compression.
+
+### Version 1.2.9 - August 7 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Minor change to enable use with $.getScript();
+* Minor change to the timing of the 'cbox_load' event so that it is more useful.
+* Added a direct link to a YouTube video to the examples.
+
+### Version 1.2.8 - August 5 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed a bug with the overlay in IE6
+* Fixed a bug where left & right keypress events might be prematurely unbound.
+
+### Version 1.2.7 - July 31 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js, example stylesheets and background images (core styles have not changed and the updates will not affect existing user themes / old example themes)
+
+* Code cleanup and reduction, better organization and documentation in the full source.
+* Added ability to use functions in place of static values for ColorBox's options (thanks Ken!).
+* Added an option for straight HTML.  Example: `$.fn.colorbox({html:'<p>Howdy</p>', open:true})`
+* Added an event for the beginning of the closing process.  This is in addition to the event that already existed for when ColorBox had completely closed.  'cbox_close' and 'cbox_closed' respectively.
+* Fixed a minor bug in IE6 that would cause a brief content shift in the parent document when opening ColorBox.
+* Fixed a minor bug in IE6 that would reveal select elements that had a hidden visibility after closing ColorBox.
+* The 'esc' key is unbound now when ColorBox is not open, to avoid any potential conflicts.
+* Used background sprites for examples 1 & 4.  Put IE-only (non-sprite) background images in a separate folder.
+* Example themes 1, 3, & 4 received slight visual tweaks.
+* Optimized pngs for smaller file size.
+* Added slices, grid, and correct sizing to the Adobe Illustrator file, all theme files are now export ready!
+
+### Version 1.2.6 - July 15 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Fixed a bug with fixed width/height images in Opera 9.64.
+* Fixed a bug with trying to set a value for rel during a direct call to ColorBox. Example: `$.fn.colorbox({rel:'foo', open:true});`
+* Changed how href/rel/title settings are determined to avoid users having to manually update ColorBox settings if they use JavaScript to update any of those attributes, after ColorBox has been defined.
+* Fixed a FF3 bug where the back button was disabled after closing an iframe.
+
+### Version 1.2.5 - June 23 2009
+Files Changed: jquery.colorbox.js/jquery.colorbox-min.js
+
+* Changed the point at which iframe srcs are set (to eliminate the need to refresh the iframe once it has been added to the DOM).
+* Removed unnecessary return values for a very slight code reduction.
+
+### Version 1.2.4 - June 9 2009
+Files Changed: jquery.colorbox.js, jquery.colorbox-min.js
+
+* Fixed an issue where ColorBox may not close completely if it is closed during a transition animation.
+* Minor code reduction.
+
+### Version 1.2.3 - June 4 2009
+* Fixed a png transparency stacking issue in IE.
+* More accurate Ajax auto-sizing if the user was depending on the #cboxLoadedContent ID for CSS styling.
+* Added a public function for returning the current html element that ColorBox is associated with. Example use: var that = $.fn.colorbox.element();
+* Added bicubic scaling for resized images in the original IE7.
+* Removed the IE6 stylesheet and png files from Example 3.  It now uses the same png file for the controls that the rest of the browsers use (an alpha transparency PNG8).  This example now only has 2 graphics files and 1 stylesheet.
+
+### Version 1.2.2 - May 28 2009
+* Fixed an issue with the 'resize' option.
+
+### Version 1.2.1 - May 28 2009
+* Note: If you are upgrading, update your jquery.colorbox.js and colorbox.css files.
+* Added photo resizing.
+* Added a maximum width and maximum height. Example: {height:800, maxHeight:'100%'}, would allow the box to be a maximum potential height of 800px, instead of a fixed height of 800px.  With maxHeight of 100% the height of ColorBox cannot exceed the height of the browser window.
+* Added 'rel' setting to add the ability to set an alternative rel for any ColorBox call.  This allows the user to group any combination of elements together for a gallery, or to override an existing rel. attribute so those element are not grouped together, without having to alter their rel in the HTML.
+* Added a 'photo' setting to force ColorBox to display a link as a photo.  Use this when automatic photo detection fails (such as using a url like 'photo.php' instead of 'photo.jpg', 'photo.jpg#1', or 'photo.jpg?pic=1')
+* Removed the need to ever create disposable elements to call colorbox on.  ColorBox can now be called directly, without being associated with any existing element, by using the following format:
+  `$.fn.colorbox({open:true, href:'yourLink.xxx'});`
+* ColorBox settings are now persistent and unique for each element.  This allows for extremely flexible options for individual elements.  You could use this to create a gallery in which each page in the gallery has different settings.  One could be a photo with a fade transition, next could be an inline element with an elastic transition with a set width and height, etc.
+* For user callbacks, 'this' now refers to the element colorbox was opened from.
+* Fixed a minor grouping issue with IE6, when transition type is set to 'none'.
+* Added an Adobe Illustrator file that contains the borders and buttons used in the various examples.
+
+### Version 1.2 - May 13 2009
+* Added a slideshow feature.
+* Added re-positioning on browser resize.  If the browser is resized, ColorBox will recenter itself onscreen.
+* Added hooks for key events: cbox_open, cbox_load, cbox_complete, cbox_closed.
+* Fixed an IE transparency-stacking problem, where transparent PNGs would show through to the background overlay.
+* Fixed an IE iframe issue where the ifame might shift up and to the left under certain circumstances.
+* Fixed an IE6 bug where the loading overlay was not at full height.
+* Removed the delay in switching between same-sized gallery content when using transitions.
+* Changed how iframes are loaded to make it more compatible with iframed pages that use DOM dependent JavaScript.
+* Changed how the JS is structured to be better organized and increase compression.  Increased documentation.
+* Changed CSS :hover states to a .hover class.  This sidesteps a minor IE8 bug with css hover states and allows easier access to hover state user styles from the JavaScript.
+* Changed: elements added to the DOM have new ID's.  The naming is more consistent and less likely to cause conflicts with existing website stylesheets.  All stylesheets have been updated.
+* Changed the behavior for prev/next links so that ColorBox does not get hung up on broken links.  A visitor can now skip through broken or long-loading links by clicking prev/next buttons.
+* Changed the naming of variables in the parameter map to be more concise and intuitive.
+* Removed colorbox.css.  Combined the colorbox.css styles with jquery.colorbox.js: the css file was not large enough to warrant being a separate file.
+
+### Version 1.1.6 - April 28 2009
+* Prevented the default action of the next & previous anchors and the left and right keys for gallery mode.
+* Fixed a bug where the title element was being added back to the DOM when closing ColorBox while using inline content.
+* Fixed a bug where IE7 would crash for example 2.
+* Smaller filesize: removed a small amount of unused code and rewrote the HTML injection with less syntax.
+* Added a public method for closing ColorBox: $.fn.colorbox.close().  This will allow iframe users to add an event to close ColorBox without having to create an additional function.
+
+### Version 1.1.5 - April 11 2009
+* Fixed minor issues with exiting ColorBox.
+ 
+### Version 1.1.4 - April 08 2009
+* Fixed a bug in the fade transition where ColorBox not close completely if instructed to close during the fade-in portion of the transition.
+
+### Version 1.1.3 - April 06 2009
+* Fixed an IE6&7 issue with using ColorBox to display animated GIFs.
+
+### Version 1.1.2 - April 05 2009
+* Added ability to change content when ColorBox is already open.
+* Added vertical photo centering now works for all browsers (this feature previously excluded IE6&7).
+* Added namespacing to the esc-key keydown event for people who want to disable it: "keydown.colorClose"
+* Added 'title' setting to add the ability to set an alternative title for any ColorBox call.
+* Fixed rollover navigation issue with IE8. (Added JS-based rollover state due to a browser-bug.)
+* Fixed an overflow issue for when the fixed width/height is smaller than the size of a photo.
+* Fixed a bug in the fade transition where the border would still come up if ColorBox was closed mid-transition.
+* Switch from JSMin to Yui Compressor for minification.  Minified code now under 7KB.
+
+### Version 1.1.1 - March 31 2009
+* More robust image detection regex.  Now detects image file types with url fragments and/or query strings.
+* Added 'nofollow' exception to rel grouping.
+* Changed how images are loaded into the DOM to prevent premature size calculation by ColorBox.
+* Added timestamp to iframe name to prevent caching - this was a problem in some browsers if the user had multiple iframes and the visitor left the page and came back, or if they refreshed the page.
+
+### Version 1.1.0 - March 21 2009
+* Animation is now much smoother and less resource intensive.
+* Added support for % sizing.
+* Callback option added.
+* Inline content now preserves JavaScript events, and changes made while ColorBox is open are also preserved.
+* Added 'href' setting to add the ability to set an alternative href for any anchor, or to assign the ColorBox event to non-anchors. 
+  Example: $('button').colorbox({'href':'process.php'})
+  Example: $('a[href='http://msn.com']).colorbox({'href':'http://google.com', iframe:true});
+* Photos are now horizontally centered if they are smaller than the lightbox size.  Also vertically centered for browsers newer than IE7.
+* Buttons in the examples are now included in the 'protected zone'.  The lightbox will never expand it's borders or buttons beyond an accessible area of the screen.
+* Keypress events don't queue up by holding down the arrow keys.
+* Added option to close ColorBox by clicking on the background overlay.
+* Added 'none' transition setting.
+* Changed 'contentIframe' and 'contentInline' to 'inline' and 'iframe'.  Removed 'contentAjax' because it  is automatically assumed for non-image file types.
+* Changed 'contentWidth' and 'contentHeight' to 'fixedWidth' and 'fixedHeight'.  These sizes now reflect  the total size of the lightbox, not just the inner content.  This is so users can accurately anticipate  % sizes without fear of creating scrollbars.
+* Clicking on a photo will now switch to the next photo in a set.
+* Loading.gif is more stable in it's position.
+* Added a minified version.
+* Code passes JSLint.
+
+### Version 1.0.5 - March 11 2009
+* Redo: Fixed a bug where IE would cut off the bottom portion of a photo, if the photo was larger than the document dimensions.
+
+### Version 1.0.4 - March 10 2009
+* Added an option to allow users to automatically open the lightbox. Example usage: $(".colorbox").colorbox({open:true});
+* Fixed a bug where IE would cut off the bottom portion of a photo, if the photo was larger than the document dimensions.
+
+### Version 1.0.3 - March 09 2009
+* Fixed vertical centering for Safari 3.0.x.
+
+### Version 1.0.2 - March 06 2009
+* Corrected a typo.
+* Changed the content-type check so that it does not assume all links to photos should actually display photos. This allows for Ajax/inline/and iframe calls on anchors linking to picture file types.
+
+### Version 1.0.1 - March 05 2009
+* Fixed keydown events (esc, left arrow, right arrow) for Webkit browsers.
+
+### Version 1.0 - March 03 2009
+* First release
diff --git a/mod/colorbox/vendors/jquery/colorbox/colorbox.ai b/mod/colorbox/vendors/jquery/colorbox/colorbox.ai
new file mode 100644
index 000000000..1b51881af
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/colorbox.ai
@@ -0,0 +1,1811 @@
+%PDF-1.4
+%����
+1 0 obj
+<</Metadata 2 0 R/Pages 3 0 R/Type/Catalog>>
+endobj
+2 0 obj
+<</Length 48282/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?>
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 4.2.2-c063 53.351735, 2008/07/22-18:11:12        ">
+   <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+      <rdf:Description rdf:about=""
+            xmlns:dc="http://purl.org/dc/elements/1.1/">
+         <dc:format>application/vnd.adobe.illustrator</dc:format>
+         <dc:title>
+            <rdf:Alt>
+               <rdf:li xml:lang="x-default">colorbox</rdf:li>
+            </rdf:Alt>
+         </dc:title>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:xmp="http://ns.adobe.com/xap/1.0/"
+            xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/">
+         <xmp:CreatorTool>Adobe Illustrator CS4</xmp:CreatorTool>
+         <xmp:CreateDate>2009-05-27T04:22:39-04:00</xmp:CreateDate>
+         <xmp:ModifyDate>2009-07-30T21:43:35-05:00</xmp:ModifyDate>
+         <xmp:MetadataDate>2009-07-30T21:43:35-05:00</xmp:MetadataDate>
+         <xmp:Thumbnails>
+            <rdf:Alt>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpGImg:width>208</xmpGImg:width>
+                  <xmpGImg:height>256</xmpGImg:height>
+                  <xmpGImg:format>JPEG</xmpGImg:format>
+                  <xmpGImg:image>/9j/4AAQSkZJRgABAgEBLAEsAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABABLAAAAAEA&#xA;AQEsAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK&#xA;DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f&#xA;Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAADQAwER&#xA;AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA&#xA;AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB&#xA;UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE&#xA;1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ&#xA;qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy&#xA;obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp&#xA;0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo&#xA;+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7&#xA;FXYq7FXYq7FXYq7FXnn5b+fNd85T6us6W9jHpkiRL6KOzOzl9zzagACdMVZt9U1D/lt/5Jr/AFxV&#xA;gf5ZfmZrHmfzJrei39vBGNIaSNbiEODIYpjFUqzNStK4q9JxV2KuxV2KuxV2KuxV2KuxV2KvG/Pf&#xA;5jfmBY/mDL5Z8twpdMyRNb2/pKzktEHf4jTYbmpxVQ/xJ/zkV/1Y1/4G3/6qYqh9G/ND8zYvPml+&#xA;WvMdtHZSXcsXqwtEgYwyEjkjKSCDQioPXFXueKvBB+aX5r6n5k1HSdAtI717OSX4EiT4Y0fiCzOV&#xA;H44qmH+JP+civ+rGv/A2/wD1UxVd5F/Nbzde6/qVh5lMVnHpcEj3aNGIzG0TANyPgBiqbeU/z18v&#xA;eZdcl0izkZZ2kZLEPEw9aONOTS1pRQTUKCa+OKqdh+fvlm882Dy+kzAycYoLkxsFN16jRtbsCOuy&#xA;lWFVNaVr1VRfnv8AN5/Jt9AmpWLvp1zbyPBexFWrcx7iEx1BFV/aO340VR+r/mFqWj+Sl8x6lYGG&#xA;aOOGS808MrPH6jKHVW2VivLbpX2xVMtC8622vaLFq+lzLPaTKxRuJHxLUMpBoQQRirDfIf5y6x5n&#xA;1DSrWaxhtl1HT7i/dkZmKmC7a2CCoHXjyriqH/5x3/vvNf8AzFQ/rmxV7Lirwb8hv/JkedP+M9z/&#xA;ANRhxV7zirsVdirsVdirsVdirsVdirsVeNSf+tKx/wDMKf8AqDOKvZcVeHfmF/60T5T/AOYO0/6i&#xA;7nFXuOKvDvyS/wDJleb/AJN/1EHFXuOKvCPKoB/O/wA3AioLSgg/OPFWbeXvLflPTby/m0e1gjnl&#xA;n5XRjCnhLxHJVP7O1KqPn1OKtQ+W/KaebH1VLaAa4LZVQhVBWIu9XVRtyZmYM3XtiqC8x+VvI2q6&#xA;79Y19I7m7WzkRbe5c+mkBPxyIhPFH/yx8W3XbFVeXQvK8/km20meQyeX1jgQPJI3xRqylQ7k1AOw&#xA;O+2Kp/bWdpb2iWtpEkNsiCOKKIBVVQOICgbAAbDFWE+SPKfkrTL7TZ9Eu7i4ltrCeCzEtaNbPdM8&#xA;jtVE3EzFR0+XfFVH/nHf++81/wDMVD+ubFXsuKvBvyG/8mR50/4z3P8A1GHFXvOKuxV2KuxV2Kux&#xA;V2KuxV2KuxV4tfgH/nISYHcfUl/6h1xV6LwT+Ufdil5J5sAH/OQPlWgp/o1r0/5ibjFD3/FXg/5T&#xA;gHzt5xqK/vk6/wDGWbFXqnBP5R92KXlnlqJJPzo80xNUI8AU8SVNDFCNitCD7jFDLfL3kW10fUZL&#xA;xLiWQh2MKsduDClHH7RB74qttvIVnD5iGrfWZSqfvEj5GplZmJJbrwoR8Pfvttiqt5q8pyeYJ4Vl&#xA;uBDawRuU4oDJ6zbAlj+xtuBT5+CqM1DRrrUPLf6LnlRJ5I40mljWiAggsVTbw2GKo3SNNg0uwgso&#xA;Gd4oBRWkYsx+k/qG2KpD5W8sajpU1k9y0TC3spraT02J+OS5MwIqo24/jiqS/wDOO/8Afea/+YqH&#xA;9c2KvZcVeDfkN/5Mjzp/xnuf+ow4q95xV2KuxV2KuxV2KuxV2KuxV2KvA/OPmPTvL356y6jqJZbM&#xA;W0cUsiKXKc4AAxUbkA9ab4qyL/ldX5a/9XZv+kW7/wCqWKsFm8z6R5m/PLy5qGkO81lALa19Z0aM&#xA;O6yySEqrgNQeqBuBvXtvir6UxV81eTfOmheWPPHmY6zI8EF5MwjnVHkUNFK54ssYZvi57bYqzv8A&#xA;5XV+Wv8A1dm/6Rbv/qlirFfy41m11v8ANXXtVtAwtbqImHmKMVT04wxHblwrir2LFLsVdirsVdir&#xA;sVeef847/wB95r/5iof1zYoey4q8G/Ib/wAmR50/4z3P/UYcVe84q7FXYq7FXYq7FXYq7FXYq7FU&#xA;p1Dyj5X1G6a7v9Ktbq6cAPNNEjuQooKkiuwGKob/AJV95G/6sNh/0jx/0xVVtfJPlC0uY7m10azg&#xA;uIWDxSxworKw6EEDY4qnWKpHN5F8mTSvLLollJLISzu0EZJYmpJNMVWf8q+8jf8AVhsP+keP+mKo&#xA;rT/KfljTpjNYaXa2sxHEyQxIjFT2qoGKph9Utv8AfS/dirvqlt/vpfuxV31S2/30v3Yq76pbf76X&#xA;7sVd9Utv99L92Ku+qW3++l+7FXj/APzjwQLjzUhNGNzCwU9aVl3pir2XFXg35DD/AJCN5zb9lprk&#xA;q3Yj62emKvecVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVSyfy1oU2&#xA;5soUbpySNUNPCoGKqH+D9B/5ZhiqN03RdK0xOFhaRWwIofSRUJHvxAxVG4q7FXYq7FXYq7FXYq7F&#xA;XYqg9H1jTdZ0u11XTLhLqwvI1mt54yCrI4qP7R2xVL/OHm6x8qaNca1qNrdTabaL6l3NaRiYxJWh&#xA;ZkDB+I7kKaDc7Yq84/6Gu/Kj0DcV1P0AokMv1GTgELcA3KtKc/hr47Yq9J8pea7PzTo1vrNha3UG&#xA;nXiCW0lu41iMsbfZdU5F+LdQSBUbjbFUdrOs6ZoulXWq6pcJa2FlG01zPIaKqIKn5nwHfFUZirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir8t7NtVW2nltHmS3gCvcNGzKq8mCK&#xA;TQjck0xV9Tf84pyar5v/AC088eUtS1CZ7GaM2dq8hMpgXULeaOXhyPTYNx6Vr44qxf8A6Fe/OhtP&#xA;Hllv0WNHEwYXv1iSgYOT6/GnPdTTjx+iu+Kss/5y2utV8sfl/wCTPLWnX80diA1vcshMbTixgiSI&#xA;vxPT4i3HpX5DFXyrdvqzW0El28z209XgaRmZGKEoSKkioNRir9SMVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVfnX5S85aNpmjNFND6bwAGSJAC0xJA5DkRU+IJxV71/wA4TyrN&#xA;a+dJUHFZLq0dR4BhOR0xV9NYq+ZP+c25FjsvJsjCqpdXbMPYLCcVeC+YvOOiXnl4WyQCea4B9KNw&#xA;AYCCRzPGtG8ADv32xV+iuKuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KvhDQ&#xA;P+cTvzc1nSbbU1gsrGO6jWWKC7uCk3BxyUskaScag9CajuMVfSX/ADjl+TmsflroGpx61cwz6nqs&#xA;8ckkVsWeKOOFWVBzZULMeZJ28MVeu4q8h/5yN/JzWfzK0HS49EuoYNS0qeR0iuSyRSRzqqv8aq5D&#xA;LwUjanXFXzb5h/5xQ/NzRdJudTaCzv4rSNpZobOcvNwQcmKo6R8qDsu57DFX3hirsVdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdir4I0T/nKf8AOHSNKttMi1CC5htIxFFLc26SS8FF&#xA;FDPsWoNqnfxxV9Mf843fnBrf5j+XtSbXIYk1TSZ445Li3UokscysyEoSeLDgwNNumKvX8VePf85J&#xA;fnDrv5ceX9LbQoIX1LVp5I1uLhS6RRwKrOQgK1di60rt12xV80a7/wA5S/m/rGkXWlzahb28F5G0&#xA;M0ltbpHL6bijBX+LjUbVG/hir74xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2K&#xA;uxV8lfkx+Uv5Sa1+Wlxd6peLeXGprGupX/NIZbF0kST6vGZAwiPNQGcirg7fCcVZD/zhpbW1sfPd&#xA;tauZLaC/t44HJDFo09dVNRQGoHbFX0pir5q/5zNt7e5/wLb3LcLea+uI5nqFojegGNTsNjiqTfnD&#xA;+T/5PaP+U8OoWF/Hp+oaajrpV7zWaTUHaR5DbycKeqxZyA4HwAb/AAjFX1dirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdir8vLF9eSxu7exFx9Sv1WO8jiDmOUROJEDgCh4uoI8M&#xA;VfRv/OPmm+ffKv5QeePN1gq6dLEgvbFb+BnjuYtPhlkn+Csb7g8UcNTlXFV7f85FfnGvkL/GBuNH&#xA;+r8liFl9RufW9RpjHUn1eAi4rX1a0LfB9rFW/wDnI7SPPnmL8qfJPmbUE/SVwVa61L6hAVhthfQx&#xA;yRfADJJxAXizs1OVOlaYq+br+XX3sbS2vvrP1HT1eOyilDiOISyGVwgIoOTsSfHFX6h4q7FXYq7F&#xA;XYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYqhNI0nT9I0y10vToEtrGzjWG3gjAVVRBQA&#xA;AUGKq91bW91bS2tzGs1vOjRTROKq6OOLKw7gg0xV45H/AM4lflEmofWfT1BrblU6cbtvq5Tlz9I/&#xA;D6vDlvTnir2SCCG3gjggRYoYlCRRoAqqqiiqoHQAYqhtY0jTtZ0q70rUoFubC9iaC5gcAqyOKEb/&#xA;AIYqjMVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsV&#xA;dirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVd&#xA;irsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi&#xA;rsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirs&#xA;VdirsVdirsVdirqitO/hirsVcSBudsVdirSujEhWBI60NaYq3irsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVdirsVdiq2WP1Inj5MnNSvNDRlqKVB33GKpL5U8sy6DbzwyahPf8ArSM49diQlXZv&#xA;hBrQtyq57nfFVlj5WmtvM9zrbalczJPHwWzd6otWZuO/7CcvgHY1xVT82eU5tdmtJI7sWwtg/JeD&#xA;MJQzI3pycXSsZ4bjFU21vTm1LSLuwWT0muomiEtK8eQpWm3TFVawtTaWUFqZpLgwoqGeU8pH4inJ&#xA;j3JxVJvKflmfQ2vDJOswuW5LxBFP3ssm9f8AjLirIMVdirsVdirsVdirsVdirsVdirsVdirsVdir&#xA;sVdirsVdirsVU7o3ItpTaqj3QRjAkrFIzJT4Q7KHIWvUhT8sVYV+VN9+a93pt8fzEsbOyu0uHFj9&#xA;UapaMyyVDgM6hUHERnqVoWq1TiqjomofnBJ+Z+p2urafYxeREgrYXUTn1i3qSek37RaRlH71DRVH&#xA;EjeoZVT/ADT1L807S90lPI9s1xayrINZcQwStDF6sIEsHrSwhp1Vn4Rn4WFSegxVlPnWbzFD5S1e&#xA;Xy2nq6+lrI2lx0VuVwF/dij/AA7t44qi9Bk1qTRbF9cihg1hoUOoRWrM8KzcfjEbMAeNf9s9cVYT&#xA;+UepfmTevrI86JOoikA0717eO3BT61dL8PppHy/crD1r2Pc4q9FxV2KuxV2KuxV2KuxV2KuxV2Ku&#xA;xV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2Kux&#xA;V2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxVQmmkDiOIcpCK09vE4qome+hHO&#xA;ZF9MHcqa0riqMRgyhh3xVvFXYq7FXYq7FXYq7FVOW5ghkhjkfi9w5ihG/wAThGkI/wCAjY4q3PPF&#xA;bwSTzNwiiUvI57KoqTt7YqlekebvLusXLWum3q3M6IZGRVcUQEKT8SgdWGKppJNDEAZHVAenIgV+&#xA;/FWzJGE9QsAlK86ilPGuKujlikFY3VwNiVIIr9GKtLPA7lFkVnFaqCCduu2KpTqnnLyxpdwba/1G&#xA;KG4H2ovidl7/ABBA1PpxVB/8rJ8kf9XWP/gJf+aMVTzTtSsNStVurC4S5t2NBJGaio6g+B9sVS1f&#xA;OnlhtT/Ra36m/wDVNv6HF6+qG4la8adffFU7xV2KuxV2KuxVBqf9ytP+KW/4kuKrtV/4583yH6xi&#xA;qpZ/7zp8hiqtirsVdirsVdirsVdiqFvbH6zc2E3Ph9SnafjSvPlBLDxrUU/vq19sVUfMP/HA1P8A&#xA;5hJ/+TbYq8l/JT/lKrr/AJgZP+T0WKvSPM/6aEMg0uWK3vXdfSmncRp6QQ1XkUk35e21a+2Kooi4&#xA;FoZEAjFWMRk+JFkMYCu1APh9Tlv71xVC6IuuNYn9IzQ3V6FkEklqCE4FgY4+RJ5OFrvXb8SqttDr&#xA;bapcrNc2sun8h+joIUYTxkFd5KmihRy5Cn9MVeIaDpF75m8wpZ+uFuLx3kmuJKt0Bd2I7nFWXa/+&#xA;TtzpmkXWoQamt0bWNpXhaH0qogqxDc33A36Yqj/yMkflrMfI8ALdgvap9QVxVjdt/wCTYP8A22ZP&#xA;+ohsVe9Yq7FVK5mEMTOe2KqKQ3MirJ63HkAeIWvXfrXFVS3lYu8TmrxkAn5iuKqKf8dX/ni3/Elx&#xA;Vdqv/HPm+Q/WMVVbP/eZPkMVVsVdirsVdirsVdirsVQ9zexW81pC4YteSmCIrSgYRSTVapG3GI/T&#xA;iqH8w/8AHA1P/mEn/wCTbYq8l/JT/lKrr/mBk/5PRYq9G83+ZH0Wyku/q0t2ElWJbWBpFkasZcuP&#xA;TSRiB37AVPtlmLHxmrphOXCLR0uozLZSSAPP6aPIFg+KSULEsojj2WrNyoNq5ADemV7IHy55jn1P&#xA;ShffU7mxEglCw3gIb92VHqry+P0zy/a8NttzPJDhNXaISsWssfMc82vX2miwvofqFC19Op+rzfEg&#xA;4KT8PJ/UqnHw+jDLHUQbG6BOzVPGPJ2uxeX/ADJb6hcxNJFDzSaNaBwHUoaVpuK9MqZvQPM35t6B&#xA;eaDfWVjDcPcXcLwL6iKiKJFKsxIZjsDttiqF/Iz+91n/AFbf9cmKsdtv/JsH/tsyf9RDYq96xV2K&#xA;oe+hMtuyDqRiqHi1KKONIpI5A6gKaCo2264qq2il5pZypUSEEA9aAU/hiq1P+Or/AM8W/wCJLiq7&#xA;Vf8AjnzfIfrGKqtn/vMnyGKq2KuxV2KuxV2KuxV2Koe5soria0mcsGs5TPEFpQsYpIaNUHbjKfpx&#xA;VdeWsd3Zz2khIjuI3icrQMFdSppWu++Ksd8r/l5ovlvUJL6xmuZJZIjAyztGy8WZWqOKIa1Qd8VZ&#xA;HJbRSPzNVelOSMVJHgeJFcVd9Vg9IRcfgB5ChIIbx5V5V964q2ltChY0LFxRi5Lkjw+Inb2xVYll&#xA;AjKRyITdFZ2ZR8gSRirFta/Kvytqt9JeuJ7WaYl5hbOqqzHqxV1cAn2xVL/+VKeVf+Wq+/5GQ/8A&#xA;VLFWV+XvLOkeX7RrbTYiiueUsjHlI5HQs3t2HTFUmT8s9Bj8wnXhcXX1v6y15wLx+n6jOXIp6fLj&#xA;U/zYqyWXUbWI0dwDiqn+l7L/AH4MVd+l7L/fgxVb+k9PrXmMVXDVrEdHGKoe0vbe41grGwYiBj9H&#xA;NcVROsMF02dj0AH6xiqrYsGtYyOlBiqvirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdiqnc&#xA;kiFyOtDiqG0tFayR3UF3LFiRufiIxVF+lF/Iv3DFXelF/Iv3DFXelF/Iv3DFXelF/Iv3DFUPLA0c&#xA;3rwopfiVI6VBNeo+WKqMxuruMwPCscbbOeXKo8OgxVU0tStvw7KSo+QNMVRmKuxV2KuxV2KuxV2K&#xA;uxV2KuxV2KuxV2KuxV2KuxV2KtMoZSD0OKoJrGdaiCZo1JrxFCPxxVr6nf8A/LW/3D+mKu+p3/8A&#xA;y1v9w/pirvqd/wD8tb/cP6Yq76nf/wDLW/3D+mKu+p3/APy1v9w/piraWl6D8VyxHyAxVFwxLEgU&#xA;dsVf/9k=</xmpGImg:image>
+               </rdf:li>
+            </rdf:Alt>
+         </xmp:Thumbnails>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/"
+            xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"
+            xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#">
+         <xmpMM:RenditionClass>default</xmpMM:RenditionClass>
+         <xmpMM:OriginalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</xmpMM:OriginalDocumentID>
+         <xmpMM:DocumentID>xmp.did:8BC7D877974ADE11BCECCFF09938C3CC</xmpMM:DocumentID>
+         <xmpMM:InstanceID>uuid:30267148-672c-4d34-8534-e8cce420f815</xmpMM:InstanceID>
+         <xmpMM:History>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/pdf to &lt;unknown&gt;</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:D47F11740720681191099C3B601C4548</stEvt:instanceID>
+                  <stEvt:when>2008-04-17T14:19:21+05:30</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/pdf to &lt;unknown&gt;</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/pdf to &lt;unknown&gt;</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:FD7F11740720681197C1BF14D1759E83</stEvt:instanceID>
+                  <stEvt:when>2008-05-16T17:01:20-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:F77F117407206811BC18AC99CBA78E83</stEvt:instanceID>
+                  <stEvt:when>2008-05-19T18:10:15-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/vnd.adobe.illustrator to application/vnd.adobe.illustrator</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:FB7F117407206811B628E3BF27C8C41B</stEvt:instanceID>
+                  <stEvt:when>2008-05-22T14:26:44-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/vnd.adobe.illustrator to application/vnd.adobe.illustrator</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:08C3BD25102DDD1181B594070CEB88D9</stEvt:instanceID>
+                  <stEvt:when>2008-05-28T16:51:46-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/vnd.adobe.illustrator to application/vnd.adobe.illustrator</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:F77F11740720681192B0DFFC927805D7</stEvt:instanceID>
+                  <stEvt:when>2008-05-30T21:26:38-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/vnd.adobe.illustrator to application/vnd.adobe.illustrator</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:F87F11740720681192B0DFFC927805D7</stEvt:instanceID>
+                  <stEvt:when>2008-05-30T21:27-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>converted</stEvt:action>
+                  <stEvt:params>from application/vnd.adobe.illustrator to application/vnd.adobe.illustrator</stEvt:params>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:F97F1174072068119098B097FDA39BEF</stEvt:instanceID>
+                  <stEvt:when>2008-06-02T13:26:10-07:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>
+                     <rdf:Bag>
+                        <rdf:li>/</rdf:li>
+                     </rdf:Bag>
+                  </stEvt:changed>
+               </rdf:li>
+               <rdf:li rdf:parseType="Resource">
+                  <stEvt:action>saved</stEvt:action>
+                  <stEvt:instanceID>xmp.iid:8BC7D877974ADE11BCECCFF09938C3CC</stEvt:instanceID>
+                  <stEvt:when>2009-05-27T04:22:07-04:00</stEvt:when>
+                  <stEvt:softwareAgent>Adobe Illustrator CS4</stEvt:softwareAgent>
+                  <stEvt:changed>/</stEvt:changed>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpMM:History>
+         <xmpMM:DerivedFrom rdf:parseType="Resource">
+            <stRef:instanceID>uuid:32300939-b1c4-8440-b812-b255b7b0d326</stRef:instanceID>
+            <stRef:documentID>xmp.did:F97F1174072068119098B097FDA39BEF</stRef:documentID>
+            <stRef:originalDocumentID>uuid:65E6390686CF11DBA6E2D887CEACB407</stRef:originalDocumentID>
+            <stRef:renditionClass>proof:pdf</stRef:renditionClass>
+         </xmpMM:DerivedFrom>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/">
+         <illustrator:StartupProfile>Web</illustrator:StartupProfile>
+         <illustrator:Type>Document</illustrator:Type>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/"
+            xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#"
+            xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/">
+         <xmpTPg:NPages>1</xmpTPg:NPages>
+         <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency>
+         <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint>
+         <xmpTPg:MaxPageSize rdf:parseType="Resource">
+            <stDim:w>1024.000000</stDim:w>
+            <stDim:h>768.000000</stDim:h>
+            <stDim:unit>Pixels</stDim:unit>
+         </xmpTPg:MaxPageSize>
+         <xmpTPg:PlateNames>
+            <rdf:Seq>
+               <rdf:li>Cyan</rdf:li>
+               <rdf:li>Magenta</rdf:li>
+               <rdf:li>Yellow</rdf:li>
+               <rdf:li>Black</rdf:li>
+            </rdf:Seq>
+         </xmpTPg:PlateNames>
+         <xmpTPg:SwatchGroups>
+            <rdf:Seq>
+               <rdf:li rdf:parseType="Resource">
+                  <xmpG:groupName>Default Swatch Group</xmpG:groupName>
+                  <xmpG:groupType>0</xmpG:groupType>
+                  <xmpG:Colorants>
+                     <rdf:Seq>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>White</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>Black</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Red</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Yellow</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Green</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Cyan</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>255</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Blue</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>RGB Magenta</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>255</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=193 G=39 B=45</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>193</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>45</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=28 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>28</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=241 G=90 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>241</xmpG:red>
+                           <xmpG:green>90</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=247 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>247</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=251 G=176 B=59</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>251</xmpG:red>
+                           <xmpG:green>176</xmpG:green>
+                           <xmpG:blue>59</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=252 G=238 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>252</xmpG:red>
+                           <xmpG:green>238</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=217 G=224 B=33</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>217</xmpG:red>
+                           <xmpG:green>224</xmpG:green>
+                           <xmpG:blue>33</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=198 B=63</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>198</xmpG:green>
+                           <xmpG:blue>63</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=57 G=181 B=74</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>57</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>74</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=146 B=69</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>146</xmpG:green>
+                           <xmpG:blue>69</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=104 B=55</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>104</xmpG:green>
+                           <xmpG:blue>55</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=34 G=181 B=115</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>34</xmpG:red>
+                           <xmpG:green>181</xmpG:green>
+                           <xmpG:blue>115</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=169 B=157</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>157</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=41 G=171 B=226</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>41</xmpG:red>
+                           <xmpG:green>171</xmpG:green>
+                           <xmpG:blue>226</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=113 B=188</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>113</xmpG:green>
+                           <xmpG:blue>188</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=46 G=49 B=146</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>46</xmpG:red>
+                           <xmpG:green>49</xmpG:green>
+                           <xmpG:blue>146</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=27 G=20 B=100</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>27</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>100</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=45 B=145</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>45</xmpG:green>
+                           <xmpG:blue>145</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=147 G=39 B=143</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>147</xmpG:red>
+                           <xmpG:green>39</xmpG:green>
+                           <xmpG:blue>143</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=158 G=0 B=93</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>158</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>93</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=212 G=20 B=90</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>212</xmpG:red>
+                           <xmpG:green>20</xmpG:green>
+                           <xmpG:blue>90</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=237 G=30 B=121</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>237</xmpG:red>
+                           <xmpG:green>30</xmpG:green>
+                           <xmpG:blue>121</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=199 G=178 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>199</xmpG:red>
+                           <xmpG:green>178</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=134 B=117</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>134</xmpG:green>
+                           <xmpG:blue>117</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=115 G=99 B=87</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>115</xmpG:red>
+                           <xmpG:green>99</xmpG:green>
+                           <xmpG:blue>87</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=83 G=71 B=65</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>83</xmpG:red>
+                           <xmpG:green>71</xmpG:green>
+                           <xmpG:blue>65</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=198 G=156 B=109</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>198</xmpG:red>
+                           <xmpG:green>156</xmpG:green>
+                           <xmpG:blue>109</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=166 G=124 B=82</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>166</xmpG:red>
+                           <xmpG:green>124</xmpG:green>
+                           <xmpG:blue>82</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=140 G=98 B=57</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>140</xmpG:red>
+                           <xmpG:green>98</xmpG:green>
+                           <xmpG:blue>57</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=117 G=76 B=36</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>117</xmpG:red>
+                           <xmpG:green>76</xmpG:green>
+                           <xmpG:blue>36</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=96 G=56 B=19</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>96</xmpG:red>
+                           <xmpG:green>56</xmpG:green>
+                           <xmpG:blue>19</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=66 G=33 B=11</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>66</xmpG:red>
+                           <xmpG:green>33</xmpG:green>
+                           <xmpG:blue>11</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=0 G=0 B=0</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>0</xmpG:red>
+                           <xmpG:green>0</xmpG:green>
+                           <xmpG:blue>0</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=26 G=26 B=26</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>26</xmpG:red>
+                           <xmpG:green>26</xmpG:green>
+                           <xmpG:blue>26</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=51 G=51 B=51</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>51</xmpG:red>
+                           <xmpG:green>51</xmpG:green>
+                           <xmpG:blue>51</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=77 G=77 B=77</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>77</xmpG:red>
+                           <xmpG:green>77</xmpG:green>
+                           <xmpG:blue>77</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=102 G=102 B=102</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>102</xmpG:red>
+                           <xmpG:green>102</xmpG:green>
+                           <xmpG:blue>102</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=128 G=128 B=128</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>128</xmpG:red>
+                           <xmpG:green>128</xmpG:green>
+                           <xmpG:blue>128</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=153 G=153 B=153</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>153</xmpG:red>
+                           <xmpG:green>153</xmpG:green>
+                           <xmpG:blue>153</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=179 G=179 B=179</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>179</xmpG:red>
+                           <xmpG:green>179</xmpG:green>
+                           <xmpG:blue>179</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=204 G=204 B=204</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>204</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>204</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=230 G=230 B=230</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>230</xmpG:red>
+                           <xmpG:green>230</xmpG:green>
+                           <xmpG:blue>230</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=242 G=242 B=242</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>242</xmpG:red>
+                           <xmpG:green>242</xmpG:green>
+                           <xmpG:blue>242</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=63 G=169 B=245</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>63</xmpG:red>
+                           <xmpG:green>169</xmpG:green>
+                           <xmpG:blue>245</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=122 G=201 B=67</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>122</xmpG:red>
+                           <xmpG:green>201</xmpG:green>
+                           <xmpG:blue>67</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=147 B=30</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>147</xmpG:green>
+                           <xmpG:blue>30</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=29 B=37</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>29</xmpG:green>
+                           <xmpG:blue>37</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=255 G=123 B=172</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>255</xmpG:red>
+                           <xmpG:green>123</xmpG:green>
+                           <xmpG:blue>172</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=189 G=204 B=212</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>189</xmpG:red>
+                           <xmpG:green>204</xmpG:green>
+                           <xmpG:blue>212</xmpG:blue>
+                        </rdf:li>
+                        <rdf:li rdf:parseType="Resource">
+                           <xmpG:swatchName>R=138 G=138 B=138 1</xmpG:swatchName>
+                           <xmpG:mode>RGB</xmpG:mode>
+                           <xmpG:type>PROCESS</xmpG:type>
+                           <xmpG:red>138</xmpG:red>
+                           <xmpG:green>138</xmpG:green>
+                           <xmpG:blue>138</xmpG:blue>
+                        </rdf:li>
+                     </rdf:Seq>
+                  </xmpG:Colorants>
+               </rdf:li>
+            </rdf:Seq>
+         </xmpTPg:SwatchGroups>
+      </rdf:Description>
+      <rdf:Description rdf:about=""
+            xmlns:pdf="http://ns.adobe.com/pdf/1.3/">
+         <pdf:Producer>Adobe PDF library 9.00</pdf:Producer>
+      </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                                                                                                    
+                           
+<?xpacket end="w"?>
+endstream
+endobj
+3 0 obj
+<</Count 1/Kids[155 0 R]/Type/Pages>>
+endobj
+155 0 obj
+<</ArtBox[0.0 73.0 508.0 701.0]/BleedBox[0.0 0.0 1024.0 768.0]/Contents 156 0 R/Group 157 0 R/LastModified(D:20090730214335-05'00')/MediaBox[0.0 0.0 1024.0 768.0]/Parent 3 0 R/PieceInfo<</Illustrator 158 0 R>>/Resources<</ColorSpace<</DefaultRGB 159 0 R>>/XObject<</Fm0 160 0 R>>>>/Thumb 161 0 R/TrimBox[0.0 0.0 1024.0 768.0]/Type/Page>>
+endobj
+156 0 obj
+<</Filter/FlateDecode/Length 130>>stream
+H���-�0�a�S����'	�Ƌv��������,$���<�=��FC�b����8A��-��F�{�(V(�\E���3>�����IGIykF���S><H�朗7)d��5�?�L��3������`
+endstream
+endobj
+157 0 obj
+<</CS 162 0 R/I false/K false/S/Transparency>>
+endobj
+161 0 obj
+<</BitsPerComponent 8/ColorSpace 163 0 R/Filter[/ASCII85Decode/FlateDecode]/Height 79/Length 284/Width 106>>stream
+8;Z\ui<k5l%"j!.(Yn<rGVB89DS9W38A;imV+n")c,d,Cr$jiKcnTe_@#q%%4(.C8
+HN;BSQ0K3*YFS=EP`>nRqnec:hag&4%a](-!f93L:A4D\h\gZ/n@lX;HcTPGfEHCj
+Q%6lr1C^ia9#<W0(GV,aU!d`IC%Y0XNP6><b7'6om5]6K!.0N/D61*)F/P7m\Pl,G
+gpGL0adN#/Z594=1XIk%(grE!EB@RojEgmQOd52KE0$6o\NS1_@3+<#Mt:Yj;B;Fb
+IK^@:(iq@&!<@UeLT(~>
+endstream
+endobj
+163 0 obj
+[/Indexed/DeviceRGB 255 164 0 R]
+endobj
+164 0 obj
+<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0
+b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup`
+E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn
+6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1
+VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH<
+PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O(
+l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
+endstream
+endobj
+160 0 obj
+<</BBox[-103.108 71.3223 103.108 -71.3213]/Length 854/Matrix[1.0 0.0 0.0 1.0 0.0 0.0]/Resources<</ColorSpace<</CS0 165 0 R>>/ExtGState<</GS0 166 0 R>>/Font<</T1_0 154 0 R>>/ProcSet[/PDF/Text]>>/Subtype/Form>>stream
+BT
+/CS0 cs 0 0 0  scn
+/GS0 gs
+/T1_0 1 Tf
+0 Tc 0 Tw 0  Ts 100  Tz 0 Tr 12 0 0 -12 -103.0967 -61.2773 Tm
+[(T)7(his is an A)12(dobe\256 I)-10(llustr)5(a)4(t)6(or\256 F)26(ile tha)4(t w)4(as)]TJ
+0 -1.2 TD
+[(sa)8(v)10(ed without PDF C)11(on)4(t)6(en)4(t)3(.)]TJ
+0 -1.2 TD
+[(T)71(o P)5(lac)6(e or open this \037le in other)]TJ
+0 -1.2 TD
+[(applica)4(tions)11(, it should be r)10(e)-28(-sa)8(v)10(ed fr)10(om)]TJ
+0 -1.2 TD
+[(A)12(dobe I)-10(llustr)5(a)4(t)6(or with the ")3(C)3(r)10(ea)4(t)6(e PDF)]TJ
+0 -1.2 TD
+[(C)11(ompa)4(tible F)26(ile" option tur)-4(ned on. )41(T)7(his)]TJ
+T*
+[(option is in the I)-10(llustr)5(a)4(t)6(or Na)4(tiv)10(e F)31(or)-4(ma)4(t)]TJ
+0 -1.2 TD
+[(Options dialog bo)14(x, which appears when)]TJ
+0 -1.2 TD
+[(sa)8(ving an A)12(dobe I)-10(llustr)5(a)4(t)6(or \037le using the)]TJ
+0 -1.2 TD
+[(S)-3(a)8(v)10(e A)6(s c)6(ommand)10(.)]TJ
+ET
+
+endstream
+endobj
+154 0 obj
+<</BaseFont/OUPLQW+MyriadPro-Regular/Encoding 167 0 R/FirstChar 31/FontDescriptor 168 0 R/LastChar 174/Subtype/Type1/Type/Font/Widths[523 212 0 337 0 0 0 0 0 0 0 0 0 207 307 207 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 612 0 580 666 0 487 0 0 239 0 0 0 0 658 689 532 0 0 493 497 0 0 0 0 0 0 0 0 0 0 0 0 482 569 448 564 501 292 559 555 234 0 0 236 834 555 549 569 0 327 396 331 551 481 736 463 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 419]>>
+endobj
+167 0 obj
+<</BaseEncoding/WinAnsiEncoding/Differences[31/f_i]/Type/Encoding>>
+endobj
+168 0 obj
+<</Ascent 952/CapHeight 674/CharSet(/f_i/space/quotedbl/comma/hyphen/period/A/C/D/F/I/N/O/P/S/T/a/b/c/d/e/f/g/h/i/l/m/n/o/p/r/s/t/u/v/w/x/registered)/Descent -250/Flags 32/FontBBox[-157 -250 1126 952]/FontFamily(Myriad Pro)/FontFile3 169 0 R/FontName/OUPLQW+MyriadPro-Regular/FontStretch/Normal/FontWeight 400/ItalicAngle 0/StemV 88/Type/FontDescriptor/XHeight 484>>
+endobj
+169 0 obj
+<</Filter/FlateDecode/Length 3130/Subtype/Type1C>>stream
+H�|TyPw�ffz �$��D���#hD�[-�o!b(/�a��@e0��E
+D%"�g�C	�Ed=��
+1�M�}�?�l[[��������{�}�����q|�����W��<�U�
+ou�������@�1�r���l!��
+٣����{������g�|6c����O��߫Z�c�he�˗;��Ӵt��9,]�tZ:��(���2�C�2B#�)�RGG��J��lMx�lB#S+5Ju�����U���,���·��ّ|�:'g'[�ev��v/SidJ�6D���
+�~�g�0��4��0����/1l�	�c��!�R?�a6F=1o,��ʰ���
+���d�I�Ʉ`�@!���!� :A��N"�8+�����z�^0�0s6�2����VsQjz��	��M�t!�:�=�J@j��*�V�$C�(0S9�)bϴ�o\3eԐђ�:	Z�����at�H����&�
+� 5X���qWA�e�1��>��0Ι�<ȤR�n�v������ݻ��D
+x��m��o�Kh��#��v܃:y�<������1�E[l�!/UXFV#���m
+�Y�E~��>�h�
+��,��<�r�$������-�(��.��m��T�=�9��}��Y�>s1�����g�t��U�&��AV���n��Y� �@הQ����.�����ۈ�c�*�.wH�W�~�^�h1C֗��.��Y��F�:�Y-��
+L��U�~O�F�]^>g/(Irq,��>��gi�^C���k ����Bc!�fvYT p�l�졉�5�-Z����ZΜ��/oȿN���sWH���+c�Vd&]ߴ������,�L��&!R���j�.
+��MZRjt$H��ޫ,m���_��䞮O˹�Bx���8T>#aE&���C�!�l<9"�$<�Z��h��dր���h����/���ON���;u:�TVs����gz�iٗH��n�M{<�����'��������g��	�S�&~M/Z����<���D]1{�[��ٝ�O#��Gт�`�u�0�<+i��+��l�3�8��c3@���:&�b5�̬"�ټX
+��i{~)�$!x63���'(&}�����hg�1̅��H	����_�r�
+L��i	��?� ٻbd[��!��������eh1���Ԕ��௤��hh�g���ZS5��_�]�O���"5��8�1�x��ø�Q�o���eb����Ci�hIW��+�x���;��6�cs-r��ve��}���,�*�LT��aɡB�SN	�X�U����s�|��Ilg�F.>ޗ�\�S�:.�|do���uAL�V��e�
+[`l��h��'M�8���7°2���RVA��
+endstream
+endobj
+166 0 obj
+<</AIS false/BM/Normal/CA 1.0/OP false/OPM 1/SA true/SMask/None/Type/ExtGState/ca 1.0/op false>>
+endobj
+165 0 obj
+[/ICCBased 170 0 R]
+endobj
+170 0 obj
+<</Filter/FlateDecode/Length 2574/N 3>>stream
+H���yTSw�oɞ����c
+[���5la�QIBH�ADED���2�mtFOE�.�c��}���0��8�׎�8G�Ng�����9�w���߽���
+ 
+�V��)g�B�0�i�W��8#�8wթ��8_�٥ʨQ����Q�j@�&�A)/��g�>'K��
+�x������-
+�ꇆ��n���Q�t�}MA�0�al������S�x	��k�&�^���>�0|>_�'��,�G!"F$H:R��!z��F�Qd?r9�\A&�G���rQ��h������E��]�a�4z�Bg�����E#H	�*B=��0H�I��p�p�0MxJ$�D1��D, V���ĭ����KĻ�Y�dE�"E��I2���E�B�G��t�4MzN�����r!YK� ���?%_&�#���(��0J:EAi��Q�(�()ӔWT6U@���P+���!�~��m���D�e�Դ�!��h�Ӧh/��']B/����ҏӿ�?a0n�hF!��X���8����܌k�c&5S�����6�l��Ia�2c�K�M�A�!�E�#��ƒ�d�V��(�k��e���l
+����}�}�C�q�9
+N'��)�].�u�J�r�
+��w�G�	xR^���[�oƜch�g�`>b���$���*~� �:����E���b��~���,m,�-��ݖ,�Y��¬�*�6X�[ݱF�=�3�뭷Y��~dó	���t���i�z�f�6�~`{�v���.�Ng����#{�}�}��������j������c1X6���fm���;'_9	�r�:�8�q�:��˜�O:ϸ8������u��Jq���nv=���M����m����R 4	�
+n�3ܣ�k�Gݯz=��[=��=�<�=G</z�^�^j��^��	ޡ�Z�Q�B�0FX'�+������t���<�u�-���{���_�_�ߘ�-G�,�}���/���Hh8�m�W�2p[����AiA��N�#8$X�?�A�KHI�{!7�<q��W�y(!46�-���a�a���a�W��	��@�@�`l���YĎ��H,�$����(�(Y�h�7��ъ���b<b*b��<�����~�L&Y&9��%�u�M�s�s��NpJP%�M�IJlN<�DHJIڐtCj'�KwKg�C��%�N��d��|�ꙪO=��%�mL���u�v�x:H��oL��!Ȩ��C&13#s$�/Y����������=�Osbs�rn��sO�1��v�=ˏ��ϟ\�h٢���#��¼����oZ<]T�Ut}�`IÒsK��V-���Y,+>TB(�/�S�,]6*�-���W:#��7�*���e��^YDY�}U�j��AyT�`�#�D=���"�b{ų���+�ʯ:�!kJ4G�m��t�}uC�%���K7YV��fF���Y�.�=b��?S��ƕƩ�Ⱥ����y���
+چ���k�5%4��m�7�lqlio�Z�lG+�Z�z�͹��mzy��]�����?u�u�w|�"űN���wW&���e֥ﺱ*|����j��5k��yݭ���ǯg��^y�kEk�����l�D_p߶������7Dm����o꿻1m��l�{��Mś�
+n�L�l�<9��O
+�����z���p���g���_���X���Q���K���F���Aǿ�=ȼ�:ɹ�8ʷ�6˶�5̵�5͵�6ζ�7ϸ�9к�<Ѿ�?���D���I���N���U���\���d���l���v��ۀ�܊�ݖ�ޢ�)߯�6��D���S���c���s����
+����2��F���[���p������(��@���X���r������4���P���m��������8���W���w����)���K���m��
+endstream
+endobj
+159 0 obj
+[/ICCBased 171 0 R]
+endobj
+171 0 obj
+<</Length 3144/N 3>>stream
+
+
+
+'
+=
+T
+j
+�
+�
+�
+�
+�
+�"9Qi������*C\u�����
+&
+@
+Z
+t
+�
+�
+�
+�
+�.Id����	%A^z����	&Ca~����1Om����&Ed����#Cc����'Ij����4Vx���&Il����Ae����@e���� Ek���*Qw���;c���*R{���Gp���@j���>i���  A l � � �!!H!u!�!�!�"'"U"�"�"�#
+#8#f#�#�#�$$M$|$�$�%	%8%h%�%�%�&'&W&�&�&�''I'z'�'�(
+(?(q(�(�))8)k)�)�**5*h*�*�++6+i+�+�,,9,n,�,�--A-v-�-�..L.�.�.�/$/Z/�/�/�050l0�0�11J1�1�1�2*2c2�2�3
+3F33�3�4+4e4�4�55M5�5�5�676r6�6�7$7`7�7�88P8�8�99B99�9�:6:t:�:�;-;k;�;�<'<e<�<�="=a=�=�> >`>�>�?!?a?�?�@#@d@�@�A)AjA�A�B0BrB�B�C:C}C�DDGD�D�EEUE�E�F"FgF�F�G5G{G�HHKH�H�IIcI�I�J7J}J�KKSK�K�L*LrL�MMJM�M�N%NnN�O
+�k�͂0����W�������G����r�ׇ;����i�Ή3�����d�ʋ0�����c�ʍ1�����f�Ώ6����n�֑?����z��M��� �����_�ɖ4���
+�u���L���$�����h�՛B��������d�Ҟ@��������i�ءG���&����v��V�ǥ8��������n��R�ĩ7�������u��\�ЭD���-������
+�����z���p���g���_���X���Q���K���F���Aǿ�=ȼ�:ɹ�8ʷ�6˶�5̵�5͵�6ζ�7ϸ�9к�<Ѿ�?���D���I���N���U���\���d���l���v��ۀ�܊�ݖ�ޢ�)߯�6��D���S���c���s����
+����2��F���[���p������(��@���X���r������4���P���m��������8���W���w����)���K���m��
+endstream
+endobj
+158 0 obj
+<</LastModified(D:20090730214335-05'00')/Private 172 0 R>>
+endobj
+172 0 obj
+<</AIMetaData 173 0 R/AIPrivateData1 174 0 R/AIPrivateData10 175 0 R/AIPrivateData11 176 0 R/AIPrivateData12 177 0 R/AIPrivateData13 178 0 R/AIPrivateData14 179 0 R/AIPrivateData15 180 0 R/AIPrivateData16 181 0 R/AIPrivateData2 182 0 R/AIPrivateData3 183 0 R/AIPrivateData4 184 0 R/AIPrivateData5 185 0 R/AIPrivateData6 186 0 R/AIPrivateData7 187 0 R/AIPrivateData8 188 0 R/AIPrivateData9 189 0 R/ContainerVersion 9/CreatorVersion 14/NumBlock 16/RoundtripVersion 11>>
+endobj
+173 0 obj
+<</Length 894>>stream
+%!PS-Adobe-3.0 
+%%Creator: Adobe Illustrator(R) 11.0
+%%AI8_CreatorVersion: 14.0.0
+%%For: (Administrator) ()
+%%Title: (colorbox.ai)
+%%CreationDate: 7/30/2009 9:43 PM
+%%Canvassize: 16383
+%%BoundingBox: 0 73 508 701
+%%HiResBoundingBox: 0 73 508 701
+%%DocumentProcessColors: Cyan Magenta Yellow Black
+%AI5_FileFormat 7.0
+%AI3_ColorUsage: Color
+%AI7_ImageSettings: 0
+%%RGBProcessColor: 0 0 0 ([Registration])
+%AI3_TemplateBox: 512.5 383.5 512.5 383.5
+%AI3_TileBox: 116 78 908 690
+%AI3_DocumentPreview: None
+%AI5_ArtSize: 14400 14400
+%AI5_RulerUnits: 6
+%AI9_ColorModel: 1
+%AI5_ArtFlags: 0 0 0 1 0 0 1 0 0
+%AI5_TargetResolution: 800
+%AI5_NumLayers: 1
+%AI9_OpenToView: 93.25 700 8 1780 1006 18 0 0 45 111 1 0 1 1 1 0 1
+%AI5_OpenViewLayers: 7
+%%PageOrigin:0 0
+%AI7_GridSettings: 100 4 100 4 1 0 0.8 0.8 0.8 0.9 0.9 0.9
+%AI9_Flatten: 1
+%AI12_CMSettings: 00.MS
+%%EndComments
+
+endstream
+endobj
+174 0 obj
+<</Length 6746>>stream
+%%BoundingBox: 0 73 508 701
+%%HiResBoundingBox: 0 73 508 701
+%AI7_Thumbnail: 104 128 8
+%%BeginData: 6616 Hex Bytes
+%0000330000660000990000CC0033000033330033660033990033CC0033FF
+%0066000066330066660066990066CC0066FF009900009933009966009999
+%0099CC0099FF00CC0000CC3300CC6600CC9900CCCC00CCFF00FF3300FF66
+%00FF9900FFCC3300003300333300663300993300CC3300FF333300333333
+%3333663333993333CC3333FF3366003366333366663366993366CC3366FF
+%3399003399333399663399993399CC3399FF33CC0033CC3333CC6633CC99
+%33CCCC33CCFF33FF0033FF3333FF6633FF9933FFCC33FFFF660000660033
+%6600666600996600CC6600FF6633006633336633666633996633CC6633FF
+%6666006666336666666666996666CC6666FF669900669933669966669999
+%6699CC6699FF66CC0066CC3366CC6666CC9966CCCC66CCFF66FF0066FF33
+%66FF6666FF9966FFCC66FFFF9900009900339900669900999900CC9900FF
+%9933009933339933669933999933CC9933FF996600996633996666996699
+%9966CC9966FF9999009999339999669999999999CC9999FF99CC0099CC33
+%99CC6699CC9999CCCC99CCFF99FF0099FF3399FF6699FF9999FFCC99FFFF
+%CC0000CC0033CC0066CC0099CC00CCCC00FFCC3300CC3333CC3366CC3399
+%CC33CCCC33FFCC6600CC6633CC6666CC6699CC66CCCC66FFCC9900CC9933
+%CC9966CC9999CC99CCCC99FFCCCC00CCCC33CCCC66CCCC99CCCCCCCCCCFF
+%CCFF00CCFF33CCFF66CCFF99CCFFCCCCFFFFFF0033FF0066FF0099FF00CC
+%FF3300FF3333FF3366FF3399FF33CCFF33FFFF6600FF6633FF6666FF6699
+%FF66CCFF66FFFF9900FF9933FF9966FF9999FF99CCFF99FFFFCC00FFCC33
+%FFCC66FFCC99FFCCCCFFCCFFFFFF33FFFF66FFFF99FFFFCC110000001100
+%000011111111220000002200000022222222440000004400000044444444
+%550000005500000055555555770000007700000077777777880000008800
+%000088888888AA000000AA000000AAAAAAAABB000000BB000000BBBBBBBB
+%DD000000DD000000DDDDDDDDEE000000EE000000EEEEEEEE0000000000FF
+%00FF0000FFFFFF0000FF00FFFFFF00FFFFFF
+%524C45FDA0FFA8A8A8FFA8FFA8A87DA8A8FD5DFF5227FD06FF7D27A8FD5D
+%FF5252FD06FF52277DFD5DFF5252FD06FF7D27A8FD2AFF7D527D527D527D
+%527D52A8FD04FF7D7D527D527D527D527D7DFFFFFFA8FFA8FFA8FFA8FFA8
+%FFA8FFA8FFFFFFA8FFA8A8A8FF5252FD06FF5227A8FD2AFF522727522752
+%27522752A8FD04FF7D2752275227522752277DFFA852A8A8FF527DA8FF7D
+%52527DFFA852A8CAFFA8525252A85252FD06FF7D27A8FD2AFF5227A8A8FF
+%A8A8A85227A8FD04FF52277DFFA8FFA8FF7D277DA8F82727A85227F87DA8
+%A827F87DFFA82727A8A8A8275252FF5252FD06FF5227A8FD2AFF5252FD06
+%FF7D27A8FD04FF7D27A8FD06FF277DA87D52A8A8A85252A8FF7D52527DFF
+%FF277DA8FFA8525252FF7D52FD06FF7D27A8FD2AFF5252FD06FF7D27A8FD
+%04FF5227A8FD05FF7D277DFFA8A8A8FFA8A8A8FFA8A8A8FF7DFFA8A8A8FF
+%A8A87DA87DFF5252FD06FF5227A8FD2AFF5252FD06FF7D27A8FD04FF7D27
+%A8FD05FFA8277DFFFFA8FFA8FFA8FFA8FFA8FFFFFFA8FFFFFFA8FFA8FFA8
+%FFA85252FD06FF7D27A8FD2AFF5227FFFFFFA8FFFF7DF8A8FD04FF7D277D
+%FFFFFFA8FF7D277DFFA8A8A8FFA8A87DFFA8A87DA87DFFA8A8A8FFA8FF7D
+%7D7DFF5252A8FD05FF52277DFD2AFF527DA8FFA8FFA8FF7D27A8FD04FF7D
+%27A8FFFFA8FFFFA827A8A87D52A8CAA8527DA8FFA87D52A8A8FF527DA8FF
+%A87D7DA8FF5252FD06FF7D27A8FD2AFF5252FFA8FFA8FFFF7DF8A8FD04FF
+%7D27A8FFA8FFA8FFA8277DFF7D7D7DFFA87D7DFFA8A8527D7DFFA87D7DFF
+%A8FF527D7DFF5252FD06FF5227A8FD2AFF5252A8FFA8FFA8FF7D27A8FD04
+%FF7D27A8A8FFA8FFA8A8277DFFFFA8FFA8FFA8FFA8FFFD04A8CAFFA8FFA8
+%FFFD05A85252FD06FF7D27A8FD2AFF5252FFA8FFA8FFA87D27A8FD04FF52
+%27A8FFA8FFA8FF7D277DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8
+%FFA8FFA8FF5252FD06FF5227A8FD2AFF5252A8FFA8FFA8FF7D27A8FD04FF
+%7D27A8A8FFA8FFA8A8277DFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8
+%FFA8FFA8FFA87D52FD06FF7D27A8FD2AFF5252FFA8FFA8FFFF7D27A8FD04
+%FF5252A8FFA8FFA8FFA8527DFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8
+%FFA8FFA8FFA8FF5252FD06FF5227A8FD2AFF5252A8FFA8FFA8FF5227A8FD
+%04FF7D277DA8FFA8FFA87D277DFFFFA8FFA8FFA8FFA8FFA8FFA8FFA8FFA8
+%FFA8FFA8FFA8FFA85252FD06FF7D27A8FD2AFF52FD0927A8FD04FF52FD09
+%2752FFA8CAA8FFA8CAA8FFA8CAA8FFA8CAA8FFA8CAA8FFA8CAA8FF5252A8
+%FD05FF52277DFD2AFF7DA87D7D7DA87D7D7DA8A8FD04FFA87DA87D7D7DA8
+%7D7D7DA8FD19FF5252FD06FF7D27A8FD5DFF5252FD06FF5227A8FD5DFF52
+%52FD06FF7D27A8FD5DFF5252A8FFA8FFFFFF5227A8FD5EFFFD09A8FD62FF
+%A8FFA8FDFCFFFDD3FFA87DA87DA87DA8A8FD5AFF52FD05FFA827F827F8F8
+%27FFFFFFA8FFFF7DA8FD53FFF8F82727277DFF52F85252F87DFFA8FD0427
+%F8FD54FFFD05F827FF7DF827F8F87DFF27FD05F8A8FD53FFFD05F827FFFF
+%7D272752FFFF27FD05F8FD54FFF8F827F8F827A8FD07FFF8F8F827F8F8A8
+%FD53FFF8277D522727FD08FF27F8525252F8FD54FFF852277DF827FD08FF
+%F8F852525227A8FD53FFF8275227F827FD08FF27F8275227F8FD54FFFD05
+%F827FD08FFF8F8F827F8F8A8FD53FFFD05F827FD08FF27FD05F8FD54FFFD
+%05F827FD08FF27FD05F8A8FD53FFF827525252A8FD09FFFD0452F8FD54FF
+%7DFD05FFA8FD0CFFA8A8FD53FFA8FD12FF7DFD54FFF827275227A8FD08FF
+%A852272727F8A8FD53FFFD05F827FD08FF27FD05F8FD54FFFD05F827FD08
+%FFFD06F8A8FD53FFF8F852F8F827FD08FF27F82752F8F8FD54FFF87DFF7D
+%F827FD08FFF8277DFF52F8A8FD53FF52FFFFFF52F8FD08FF2727FFFFFF52
+%FD54FFF87DA8A8F827A8FD07FFF8277DFF5227A8FD53FFF8F852F8F827FD
+%08FF27F82752F8F8FD54FFFD05F8277D525252275252A8FD05F827A8FD53
+%FFFD05F827FF27F85252F852FF27FD05F8FD54FFF8272727F8A8FF76F87D
+%52F87DFF7D27F827F8F8A8FD53FF7DFD06FFA827F8F8F8FD07FF52FD5CFF
+%A87D7DA8FDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFCFFFDFC
+%FFFDFCFFFDFCFFFDFCFFFD80FFA8FD07FFA8FD53FF7DA8FFFFFF7DA8FFFF
+%FF7D7DFFFFFF7DA8FFFFFFA87DFD52FF52A8FFFFA87D7DFFFFFF7D7DFFFF
+%FF7D7DFFFFFF7D7DFD67FFA8FDFCFFFD26FF277DFFFFA82752FFFFFF2752
+%FFFFFF7D7DFFFFFF2752A8FD50FFA8F827FFFFA8F852FFFFFF2727FFFFFF
+%277DFFFFFF5227FD52FFA8FD09FFA8A8A8FD07FF7DA8FDFCFFFDFCFFFDA2
+%FFA8FFA8FD64FFA8FFA8FFA8FD62FFA8FD05FFA8FD66FFA8FD62FFA8FD04
+%FFA8A8FD60FFA8FD05FFA8FD22FFA8FD04FFA8527D7DFFFFFFA8FFA8FFFF
+%FFA8FFFFFFA8FFA8FFFFA8527D7D7D527D7DFFFFFFA87D52A8FD16FFA8FD
+%05FFA8FD21FFA8FD04FFA87D52A8FFFFA9FD0EFFA8527D527D527D527D7D
+%FFFFA8527DA8FD15FFA8FD05FFA8FD22FFA8FD04FFA852527DFFFFFFA87D
+%A8FFA8FF52A8A8FFA87DA8FF527D527D527D527D527DA8FF7D5252A8FD0C
+%FFA8FFA8FFA8FD05FFA8FD05FFA8FD26FFA87D52A8FFFFFFA97DFFFFFFA8
+%A8A8FFA8FF7DFFA87D527DA8FFFFFF7D7D52FFFFA8527DA8FD0BFFA8FD09
+%FFA8FD05FFA8FD27FFA852527DFFFFFFA8FFA8FFCFFFA8FFFFFFA8FFA8FF
+%52527DFD04FFA8527DA8FF7D5252A8FD0BFFA8A8FFFFFFA8FD05FFA8FD04
+%FFA8A8FD26FFA87D52A8FD04FFA8FD09FFA8FFFF7D527DFD04FFA87D7DFF
+%FFA8527DA8FD0BFFA8FD05FFA8FD09FFA8FD27FFA852527DFFFFFFA8FFA8
+%FFA8FD05FFA8FFCFFF527D7DFD04FFA8527DA8FF7D5252A8FD0BFFA8A8FD
+%09FFA8FD04FFA8A8FD26FFA87D52A8FFFFCFAF53FFA8FFA85AA8FFFFAF53
+%A9FF7D527D7DA8A8A8527D52FFFFA8527DA8FD0DFFA8FFFFFFA8FFFFFFA8
+%FD05FFA8FD22FF7DFD04FFA852527DFFFFFF847EA8FFA8A953A9A8FFA85A
+%A8FFFD07527D527DA8FF7D5252A8FD0CFFA8A8A8FFA8FD05FFA8FD05FFA8
+%FD21FFA8FD04FFA85252A8FD0AFFA8FD06FFA8527D527D527D527D7DFFFF
+%A8527DA8FD15FFA8FD05FFA8FD22FFA8FD05FF7DA8A8FD13FF7DA87DA87D
+%A8A8FFFFFFA8A87DFD17FFA8FD05FFA8FD60FFA8FD05FFA8FD4CFFA8FFA8
+%A8A8FFA8A8A8FFA8A8A8FFA8A8A8FFFD05A8FD04FFA8A8FD60FFA8FD05FF
+%A8FD4CFFA8FD15FFA8FFFFFFA8FFA8FD62FFA8FFA8FFFFFFA8FD4AFFA8FD
+%19FFA8FFA8FD4CFFA8FD68FFA8FFA8A8A8FFA8A8A8FFA8A8A8FFA8A8A8FF
+%A8A8A8FFA8A8A8FDD4FFFF
+%%EndData
+
+endstream
+endobj
+175 0 obj
+<</Filter[/FlateDecode]/Length 15093>>stream
+H��Wiw�����y��o�xY��$�my�ı;/{ZvC��Q���S�
+�VV��|�����VUW�2�ci��Y�x$e4�1;�L�&������zN5,z�W�U�S���`uk
+����!�=NV�(��!�6[�K�ϯTJ�RrO�t�~�T��a�
+Q�����$\���.�,B��T���"T��Z��f�N��lyM�n����^�4
+�$�~�7���9�[�u����AA�Ʌ\��
+�Y�L�F�^I�`��	��
+hI*� U�b���(���G|=����R�fs�oz`���#�j��Ý��U6���9X&�t>4�xG���}�pa�:¬�l���U�t���N/ܴ�����?B��
+�_�0�/$��1��I2?:YN"��t�n���M1��H�D�_p�3��|�6��
+����iB�d-�l~'�)����-R�Jd�M�b�����zDHG����vV��7X�����-���M�bqr?ҫ�����`�9�tD�Z\7��[P�r��I��HC}g�ٙ���!:�}���6�tǐ.�M�����rSQ���D�bp,�A\1ob&�3lc.=��
+��^>�,I�z������L�(ݘ0<�å��u?V�#��Tlj�ީ��Y�\'��΢�����$��e���Jl�%B�^Þp��-���L�w:gȴ-�K���u
+�7w�+�p'���v"x%�������KuЦ���߅��3l!s��Ω5�|F���;��ߔ�
+����%f�����Z�9b�!�v��a�ѾN���.�
+�EUD�!`{�h�9CC1k�X�wO޻WG�y�����ܥ��c~��P��l9���i�:�+��f�K����.f�E�o-ʸ��v:��
+����)��vK� ���ۦ&5
+�)#>���b��U�EeU�Ϝd������iy�l<�l���S3��H�F�ךc]u'S��''�
+��>#��]����0����ܧD�jJ?�9�:��l.�^���>j���BMz'��i�\�0���{S��%
+��j9X�PYIv��(fcK>mt���_6xTL���1IH0+~�Y����J,�,������,�ufJdK��CT�ULu����+45fV�K�L�6���Qm�F ?�J75�����a��?�i��Ѱ��}3�uwO��2	N��g�1�md���'�e��|�e3x�v�k|x�]! p|�B��h-~WńD�E���Gxf��C�1�88 ��]�w�
+�� ���0��#������q�8�b��
+����^�i�Ń~����w�nu�2�V?��}����th����5��9��p��Ƨ�/�Z��U�BJ��a�2��a��ȧ����>���m\�����
+��5������j���b��x�4�9��l�u5�2S�>����7+Ϸ>m���U�����lex�����K߬�[��Պ���L_�t�8�*d���6�|�[���.�ǥ���\S8�|_*�ꆱ��}�[4�=ы�]�_֫t=Y��^�Z���� *aRQ�Dk�:�\m����$ ����>����
+X;���\�9.�
+y�/�b
+���k�����Ƹ��M����Kv�U�jĺ��)9�i����f�g�7���i�������{����s-�?��ҹt�ϭ;��mxʚǡ���z�zs0���nu�nY1�h��Ո�ݴ��dGJ��9d,գcy'6,��<.`��Zݿt���M�t9���\O�gĮ
+�. ;�
+��\��d�'���b�s����`t.A�m���6�f��jaw�'�� C��AF�?��d�v����M�3}P�>���H�ө����@�g�N����(o��{��3�j�4-�`�7W"��c%e��
+5%ӧ�h�\�����|V���
+ͥ�<2�H��y��
+�f���V��j��m{�� k�:�8jk�&8kA�5�Br~�6e��f��"P�v��>1BX<ƹhE���_w�<��=i�^��*j�,Ԉ8���T�$�WH4�hl��A�{��(V������;�ES����2L�{���"#����i���Ý�!��9�|�̻�������jX���?�#�2�]l�
+�,�[
+��k9v�M�(2�����rDgd��,��"���#43ӪǾ�Ѓ��ax�����1V���h�0��L�M4 ݅����е^q�0ZLx~�[c�q*�aatt�1@.��>B��A
+܆qq�@�67ӭ�x�Cr�Aؓ�t[l��H#���d�,=e9�вC胈��>Z�o�w�h����+��
+�t#1�BY��P������z(�;�o�3��
+\;7�(u�],g�òԳ/݄�i�J�[D��q'���[�=W��"���2���l����fQ�e���j����ed��?��m
+�"��=�[nV@����K�K�����
+kx*y�����:�c�F�Νo:w��S
+�0&�^ܖ��3�F��S'H�YlHd��Z��1�����Ņ�I�JH�Ĉ�{��9E�g'�,i��A�i���8{XNRy��ct<Mh�x�Lt��	 �ȷ�h��
+�I���(rG�3I5gb܌�XD��*j����b2��,�P��x���K�k�b$�KC1�@�arN	�3��
+a�_��"ة�F
+�1Ɖ{�b]���J�r�{ɓ�,$�T�e�s�Jh�s,�3�%n,���pK�Qx40Ѓ		r�"��HYl�/4tT�𡗳"���n�7/����H�X��hϔK{-O�Y���9j1�&r���eG"t�+g��%,�D@oa3��lm�`��l���a�I�1Ƶ�3�LxK&����3)yK�C��Ր�l�M��=B��Pb�����[�H\"�9]h��i\���G0j�x�V���qP
+�&0`�2е�O,
+�G��lMB4~b ~�.H��p��颊��
+��zm�G�O���Y^�=���o;n��ܢ��,QS�4'ϩ�y0�'�-���@��C-��"��"|g���Z�a��b/�KR���E�D��%�/�[[ÿ_D��\���h�K]֬�8��ǈD�1~��r7=�T���2om�Kg"�ᒫD>�Dq �2�BE� `q#�e��e�@����oͤ��O��������護����T�wv�=KȞ�ag��c5�ە���u�?��}�5uc^��;�˱q���F��ZI�K�@+O�Mn���p�(�FВs鰇2������@�Ȫ�b6M���Zt���p����1�櫵!S"�����v��R���E1L�6����hb
+�;�S%i�=>��IK4DI���A\��"/N��6pH�^���
+.�����E"�TR�h �Un2C��XGL���uĽ������B"�?6"��hH����g���9�|�v�d��\:U��sy���xq��#���d�T� i�s&
+��S�̒���K���:ї�9�s>5(mD�K�T�,�M���E/={���2U��w�/}ށ��gB�A�v� �vR+'��H&r�3��WwDUw��;P���u�����F���}��ͧ�}9>6��1�����?A#�`R�����_iЎ>RQg4��HF�)�������)�4ro`�����kKNX����b����r��Qa�z� ���ƣ6��Ke`I|���>H�
+�J}�1l���D�6��ryV��hR��$T.x�/*�[�zv��|�)
+�^���ࣼ�hnNy����<���Q�<#CX�/N���g'իIc8�q�ac�U��>o��4	��}��m���x�v���_����N��ٸ#��2wZ�i+{���=7�������.>���R��|�и�z8O�K��3����=O�+9��ƾїL�[(��<�=tJ��oa8�}*���w�wx7��]�
+}����������b}�/��}kK������:/1e��b�E�h���z���mo#��{c��6w����0w�'��(_�O7�p���SAhVomV^wׅ����A��Z��E$�R���ʽb�p~NÃ,�ߗZCiX���~ٞ�Y{�ہ�Ї��f��nC��S�L_�=�Z[Mm��l����Y����X��&��j6q�L�9,~g���n�W�n+�0���j��w/�%���Z�<fk��M+T�_�ݳѮ`�4Nj�:�A�nlh-��� �\�C}]Xm�-�0
+4� �	���gk<ȅ� ������q��Wgc�@�-6�F��
+X0�أ�h4�4�(��owAAX�򅻸��M{3�5��ڵMOA����֗<Uq
+��{��`qZN�������/�C�8�՟Wki������X�~ﶡ�2a8�2m8i�Fk��������wTF��l
+�F��
+OMz�g�ߒcB��iV���#T((NP�}ý�$O�>�/h厊����j��у��*�dZ��V��~�>��T�&�����O��{�X�����v
+7����܇V\�9О�I�Y�ܸ�����if!�G�����<�8��l�Ww ����w1�(��
+
+q���Ʊ!'u�MK��A�7q�ښ�V��]�rJy_���
+^5�2O�c��-b#��dWF
+�;g�p#��g��t�� 1e�!������xl,��֤?[��U�.��=��~`5��yZ�Ϙ�<�t�و�sN��`���py�~!,k7��/�دp)�/Y�6f�����%l��C�N'`�S6��ay�q:I83
+,���᝾<���,�W����0k�8��U�C�Vx��s�p�e�����'|��1U(E��v�:�q`�ӭ�~��,����ѵ�8�jih��#C���44�V�f�tnh07c��e�Q�����s3��mh���$/�gx
+�u��u�hL��Ѐ�n��2wϸ����`�6�f��
+6H$n�YF�ch`���Z�j�����WA��vc��ѱ��L��F�7�*$g���_V4,Cx:��@�O�dzߌ���0��g�Oֽ!Gސ�x:I�C�=Ǔ�}���N;��_VL�'�-�~�B�m��I|٘B�7��Ȍ�%�ȭ���ΰ����4$K/+,��)<�
+�����k�Ƶ�dș�⻀g�?���VX�����q��x���.����x^
+m�2L,��α����0^�#b	��$����W@L4����sa*U��}h
+3��,y`�J��(����`���47���O�����BzTz�B�t#�F��\G��˥X�A�Mkm)��#a~�B܀�(+��2��ŻbG�w�&�zL�T�H�p������.�ח�_9M\'���oZ�6�[9�|+��	��ԁ?#�#%c���
+�>���%L�-��-S��M�^�]�M5���Nz���>�&�Lg��yU1�1����m�	�4-]�'�/�Ѫ}#��u��)~+[�nڪ̈́�'���M�?��
+�'��9��W�����`_��x:{o��Aʷ��U�I��Wŧ���*e� �b�4|���nX�=��_5[6r�=�n��Y��t�������u�:Ɂc��.���F���& M��hMB�S��fʕ�lk��$�V@�����P,�]4���,�fS��3Huv���h�P�i
+a�
+��`���9R�ٸ�z����V���ރ;�V@�ÏX�ۗL"Tb"�[p��U��|���Ǵ���
+u��w�'~Z�P��C7�3�����_�b�p�i�T�Vj�MƩ.���� ���@tq���7�u.Qz��1;W�f���5��L9^en��[�r��.�iQ[+�����l�HN<oJu߆>���
+PB��?�O�Wm���������f�P�]TR��,]_V��훨�$�W�co ��G_�#�We+n2�[���٫^6&j\~^�(;(��%h�n���[�i��%H�Q�Z��fI��2�j�A�q�a$���
+-;���a|[fGЪ~l�	RH���0��Lq;O�������5v�ƽ�
+?�<�U�0���"i�+K��߼�����$��%�(+�S��$r����&P���3 P�(
+b��
+(��FS1�ݷn=Z��Û�uN̍0�5��@Nå��ʔ�5�2\���_���xM^zn��D
+��ί��V�'ۢN�B��]Ա)1�����t��/�
+endstream
+endobj
+176 0 obj
+<</Filter[/FlateDecode]/Length 17828>>stream
+H��WYW��}�k���!B2� �ai@ڡ���UUB�P_j�m<��{��,�$�_�h�(�EZ������ՋH57��d/}�p;�M���
+�1��u6����
+n��8�F��
+VC���<���{�,Y��w�eZc����lW�~��;���X����6���@�D�����N�}�GƘ���ҫ�7{�K�Y>�(fN�x�D�d��_$�4v ����@�o\������ᣦ�I�Z�
+�����1P��1�S�l��M����[C�g3��l@/���z-s��X e��ͅ�!3l��b1���M�V��{��"HQ@Kj�U@�0�Z�BX"��}����2�A��
+L"��`�h�!���5i��I�o�I�ך���hOg�����c̟��j7m�i�pp����{����[ơh��hl`�[͋o��ܘYT�U.��Ux�A��lV~�wΰ�>+�㲲����K�V>�u�|�,�}�ʦ4uɁ��p6pYٔ�Z��$�	:�������e��&
+U����I<V6�;�4KV΅h[V�����d4��1��*3��~<�����Q�͒adO#�C�G�Ť���Jk.��{���l�!1.�a��6�X�z���s�i�5��	���`Q�?���9{�ȅb&�P�#���4����C�1�%@�l�S����K�Q_��>Q��pT��2�5�hl��U-����'8Ku�ez���Tqù#�ݵ��$�T[�
+�J���@�
+	����)�I��.���W�5�4L��S����m
+��\��n�IL�h�Z��o��5�&�S�l-�/���Z���	
+��f��lk�������y7�H�aTi�'S�srݏ�j��{��Rn>(B�M����Q��ϐ>�u���3�����rzь�s�t��F�^G.��Э���%�7�k��t��k�-7�Y��l������sk��Ս��iD`]�fj�]9GD#0����`u�z�Z4�\�:c�	�ڱl�0�����"�~S>��װ:
+��� m�N�憞�֬ݘ�\��qi7�ܒS�(DE��(���m�X��A����)�s�k,K����<^k��p��ʊ���+y�&+��N1��΁�<4���X�����|�H�L}c;�̲�[-�龱ڽ��A����
+�S�;�o�ɕ����K^��&�К�F�F*3a�Fk�	24�t����L�{��_��y��b
+tP:.���F#W���Pʵ[�T�HpF�O|FA�-S���=mW(�'�m�l�%0�?^-�~���୎$ʉ�;P�r��X�ֵđ �,L@@D�{ @t�뀺�#��vw�t��N�O��ݡ���S�~�׹��Ƈj�t.����n}�N�t�l^����m���P̧Y�ԢL�휹��E��Ϭ���Ǳ��Q�I�al����Z0QhD�FZ裨<uq�#�L���"y�qڦ�<z��=-�lo4S����+C��w��WY��a
+��W˕`�4rmPSH����R-Sx�P�kh���ۅJ��M���䭮�N���x�"��P�oK�B�
+F���#�n( okM5��oAM&"�
+�����(�,kg�Z
+��Qw?�g/OHC��52��6GV�|���$¦�tG��5��U`tC%/~߰�]�N�V��!}�{-�V�����=�s�f<���b$��[ 6b��^h5P΁*���z
+ih�m4��0���F��ŷvL�
+m
+_㵕aH�[���qn�|4N�� ���T��d�V�GE�y���z�L�����o��t�g�M>*�'�6^ʌ��'A�X/8���y�X�8ZGG%I�d��)�#gC~s��F�5a�NS��7�Å࡫E>���H�#��sT0������/�I ,�n��.���~�Up�N�:Wj�ͅ���j��ܶ�%T�
+5��e��'�U���u�]w�
+�R �<�o}9����DI�W��:���)�L)�>_[���r�$��z��f�
+ǝm���M|1���#��<;����|�~l4����ȏ��"�={�w������F����VH���y�K�
+��ʳ�,9���=
+OH��7iju�f�
+w7`(Ph�&ލ��F���s�zc���8sU����b�Ȍ>.Ͻ�u�V�C�@Ģ��/�h`^��g�,�-��	)�4k�E�h�?��3ÍU��iY���}L��)b޳�\�9����ų�K�!Z�_����i-�J v��J}U���_���L�Ґy��$_B��Ap����i~`�b��/��-�,��(`ѥ���˔/����"Y�>/\)���(U'�r�7�7BG��ŘM���q���7D���&�m��ʭi�M����72��Ɏ�j3d�@Q<��^�pk�ɓ�	��~��W)2��;�v��P��P���m�P���k\n$�ul�s�:HO�@!���	a,R��s���;��䣘�p��4[��(��^g���.�۞����@��ބ�U
+#�\��L��Fd��j�4�p6�Z[N��q�t
+J���d@���:�\�zw��W�.3�7���MӢY�J��.����P��X�\��uش��Rw���*�K���B
+ҘѴϬ��i'���Y�������GP;Ґ�7>v����A�>�~z+�uRu�7�z�t�)*������d�Q7Hc��c<�����8Ij��4[����%�Y��x��)�Y�C
+X�(K��*��� �<�E�^�k��,Ll���/�7�~~��6=���%<�xG�&�&/��æ�b6��~�;�@$�K���Æ�%��2�>4g<�[�������ʀ+��s�p��+�ۨ�zI+��9�l�/빕I�VR
+�<��U�Wu��Y��:	6��@��3{��ewӣ����}&��T��,�0��E�?i�4�R�{E�!��0r�L��� �F	�$R��
+�AL�й�0��Cئ��k��ܯ���=44�*D.=tc
+Ms�Xy]���Pl���C��"(�����,W+��.n|�D뗪�>B�-5�7x0y6M�U&��/i0�K�ƳU�V�I�ɲ9�H��{3]��X�+�p�$X��
+�b?��%$�tX�l��C�o` ���(E�;r:l��Y�6u��[-q�	rCvs�XҀ2�l�ƽ���xoJ�[ӂ
+��Зgn��H�� 7W\�&����Nk;{����ȄG��.��c�H��
+�"V�s��}||[
+ѳH�/�Ũ��6����	���f��~�=�K�ױ��?�^���hݕYА��b�=An��n����>D�Ϳ���L���Q속������kk�#��$nRB˫jV�w{��-�R��a���-��g�\�4;5�����ܫ	y
+nk8"?�9�����
+����^Ы���ڲ[e��[���S?!B���c�H:t���������l���z�b��Ǻ�LL��ot*�g����k�
+����e3Q[�V��gpe�k������∗w4w���v}Ӹ�����e�=h��r%����$�UL� �
+~����h��g�) �}���3�����[���່�B����4��&�̎�ݰ�ـ���M�F40H"Ȍ�V�k
+h?��\�����
+
+�{"�rAG�&-�R@(�V���u��;���+_P����>��O�tՠ�mA�
+�-��|1���`ek�X
+Z��/X��Mn�����;���f�;
+�@Bͱ��P8V�Y.��G���7�l�<��}��'+�=$�]ce��v�d��׬}5�����r��>���ؚ�X։&�7�M^����1���f��)�b������6V͘#铴�	xf7+no1�����*�
+�(ճiq�l��*��?�w����Z����_�\{4Tr��D魅�{�����ȡ�װ�#��Š�w䟄d�K�*uk��g&��@;��]���M�PC�"y'i�t�IH���-���K���I���-��P�0&)�j&�+�{�=�����/z�f�ih�Zo'�
+}:+oƺ6G�ow���&T�У����pht�6�Sx��<�2�`�8�%�&��;���t��[����Z��kn��߷��E�U���AC��8���9��A�+����b��S+���Db�Z̔���m}�V���l @��A�W	���<�|�{9����
+m�Ҥ?g��{�C.H_J�7�3�f{�j��2��<����ӫ��4L׋�/����%*[h]��B�ܬ�}`x(�s^�ct��u�ӈ
+
+�i�{ �\y@�ş@��,��g�*�l*�Ti�>w%�|�����h��r�@�Y��v���nt�ō�+��諹#�o"��ʺ�&�:�\�+0#��1��˖;$:� g��Kq�L�*:�z���H�RJ�ܮ������A�b�
+_�v�u=@�\1����9��>������\	���G�
+����6����zָȢ�~o�l*��s�
+ǖ��w��d�V���;ON�E:}�זs�95W4�\��
+G��)~�J-a:�c{!{P�zo$0�ў�A$��/��睡_*�Ò}�މ+Ʒ���3vq#Օ�&Y�Yl&
+�/b��y��4�]�Y%l���*�����ӊ��'���K.��P�U��4�8Tb�(�k)|�Ɵ�R�B���q?Mđ�n5J ���c�±�6tI�}��T����pή�p
+�]�Lg�
+��E4b���@|g��/�d��&rlz�Sյ��?]C}�HOO3q��Q�%?�R�*f������)ˤ8j�6�4�B4�cCXx�-�,"��j=h�N�x����9l�='V���!�i�(�1wy����*�K�ϥ�?��R�����i���e�&��Iȶ+�t��%!S)?9��%�lC3-5�Z
+1o�����
+M���k4�5~�t.��I�SW�YG�%W�$�V�sa��|���R*U�ù�;���JH�(��Ϡ5�<E6c�{�l\14ǟ�ڨn��
+3C������a6��
+a�o��x$���>�Jz�q�'�SS�����υ$/-�!������f���^N���K/���,���}�"!��>�@nlO��pxi������c�JL�d��CO�޸`!�
+w2�י\���vE�Kd��q��>){��
+�~X�͎�E�i��_�V$f`
+��wh��Y{W�=q赲���TjK�QZ�z���
+�
+�0(\����-Z�B;
+��i��z���&����)]�oT���)�&�	�ɟ(z�T�a�^f�<+�j*�d��ɸ?�藱X�����B�o	m=��g���4�)�=�&�U͉�Cb�[����a��}���s*\0���a΢���#��&OpF��;y�3Yʄ��(���j�CƉ�pe��I���K�~�u���֞.�ya��h]���~Tɨ��b�\�����2���G��� u�>�)���lv�e�����Z[�6tiG�c�&�%����Cg<��dKƄ�$�;�9�p�n�wN��
+��w&�F^]0��}L诼OT�����E2n�cu�Qg�@��.�
+�73dxK&~8�Y���ifՖ6�zݸ�Yr6�D�ʉ�ΐ)YyLs��Ԗ��K�2tG�d�V8��7��F�h�?�;�:Iu��tnC�*�\[
+אj����Q���`58����mɍ#=���Y���wF}s���qA]ŰUd�n�Dmi3�\g�5���l|&0��N��-���z�b�q�������^
+�n@�����&�~R���>!��}"���xi��L�s�������؜¥�3��v�8]Q>*߫�e�y��>X��@l�(y����L`�2oh�7{��%��Ѫ��Æ�@�#g�P��7���^4�ڱD{uD�EN�{9�-'4x<��i��PN(�1-�8�c�ܹ*B��ͩa~vU�C9!�y$������i����.�:wsj�sB��FZ��R^�H��aN桴ɉ;���OQ���I�cZ����z#-�פ
+�[��_�ȆT���չ������o���ܴ{t��0/��M�f��U-�y
+o����Ȳ3.v����I�D%f%�P�C��
+AB���z�'��\��]	�d��(��o����_K��M�`͌��W��0AE�~ZW��0���A+�x���!��J���Q�B����U�l�@�S*�~�Չ��l���.�W�:�j0�Ea~��_@�
+W�B�Za�ӷ�E�Ow)+	a��{�Z~��a��J�[��|�
+��qu���8kݧ�Bkg2���*�[��ULb��E}}n�#�+T�ҝs�5q+Y����7X�7{��ò'��=N����c��m��*���@��?To�7�dY|ڣ�R,��.�>J�og\A���o(�zĽɲ�_�@w<��
+�74��+\]V��
+��lk�3�X�F��zA��1�F�ߥ�[��)���!e�j����S
+������u��k@�����3�v(R��w��p�X�-��qC��F/lDY��v����oB�9W������ʚe���D��]@EqDv�Ql�m7�]#����oho�̝��̋�teV��sN�^q�j��`������ƕc9��ߛ9�A�_A�3�]ʲ��;��$k��q���<�_�9l\���6ku.?7��VC�fc������K��V������=�z�|�j�w�%��ѣ��W7�IhMf��\�;��-�O�k?�,�#��݇�d~�$�>��.�?	-��)e���g�Q��@����q��,���>;����т0�g�hq{l�D�v��p��@�T�DT�D
+��QqU!�<S��r3ֆq�ũJ��T]�'$p1�\*���_Ek���c�H`E��HI�������7�b�8��ː�=�#lv���Z��a� ���H.b8��C
+@v0�dp���:����-]ce���%+3�I��P�M�
+a�	�l�V��G��t�C�TTƣ�3��<K���X�5{p��A
+z�
+[t��m�9�\R���f6�
+��Aȍ��3#�j�Y�)�FK͞r5u��
+O��"U2[�4k!Po�|5����e`SLr;�ǔ�֮8(��,��IJ=~��[g-M[��li�!b���D�n98>�,�����l�k@b	L6Oٸ��1W<�(�BƢ�:6��K��$�����e�-�^�=�$��d������6����Js���z��9�Su>�NQ�LZ.aF�'�.l[�?�v{zt]��N��t��#�n�˹wM���g3V�\/��^�^K�1��b���E�vė�Ů�������J�u7�T{�oڕF�}��6{y��h��r%/��!
+ѝS�J��⏹�Z.�MՍ��6�8�C�\�U?R��}8��{���:����Ta=��V0��
+H+��3��*�b�\���h��q�{'�)�C�������fIՏC�6 �[ĭ��XRa`���-��"�MDz�K7��<��N��9�,�2�"}��@�b�֒in�r(D�� �A���t�x�8�cc.�B�Y�
+a���f�6��R].L�#"������%u��b���i�h�N�,*��l��c�|X�侂
+��K�va���BO� �V߮����Gԉ|UΧń�7��Ň!���������?�l����nv�u��f#��#y�IG*
+;{D�Q���a@�:�P_������Z�*m�����5�Q_�VLt_K�m
+�^)�)�u|nÓ:��u�]c���B j"������/Ru�\)�FȪb�j%���ԭ�2�:��p�MM�>�������Էd�N|�/k�X=.f�����/��/a��4�ӝz4M���,���ܞ�����'�PH������B���~��°T\�
+�A`�lu�ѭ9e���^���*A���*b�b�K좉=�]1v������r��x����ٙ�ж�����?8$��M�<��S�Ȳ�
+2y�cR�����Ȫ��1�P̍�MR�����	���O
+[D��ώ6�cغx�3�-�-_��q���Z~;o�9]���Jc�,�c+�:���J4����9����Y>�V�0t�ϱ��x8���J47���9�C���|��Ĳ��Y>�V�0�����ӌ��sl%Cg�[�����|��D
+m�,�c+1�9����G��|�m屵B���K$��n��z��VD]]�>
+��]ˁ��Y0.
+j��Ł�ǵ��Mo�!k&W
+��Xx�½V�w*�/�-:1�&��q���"3��)��J�Zn0��?�vcZ�P��cz`��.��8zjՄhͱ�W �@�$��]����E��D�l�E5�mZ����R7���JߚN~|�c��-K�0���F3/|�1���TپDRF;��;Rbn���8��Ö��!���NO٫��I5�>T��lQ2>ܑHreA���N���䩿b�M�	�&3`Wi�ZxmG,~59p%]u�z�YK���gr����2$E�L�h@?��)F���!:@��/���rE�g��N�+ԣ<���C��>�j8ttCPN�LO����d�[�qaW�9O֚	�6��遤,Ӷ0(P�8˶%(�u��5�Ss���e5k����t�;����ּ<çyy���'�
+G�������
+Ne;=��d/OY�=�w�0����HTlM��:���!�س�l�1�~�An�FΤ�fTf���U�>`jJ�*	�Q��m�'�c2��*NJ,��s'|���YC�ַ�'�A�	,����a��dE(�c/����/��CuT��7�MA1FH&�Y�Hn{��
+�����S\�PQ
+��0|��
+[��rx
+/�N�*\�&��o��VL��J��2c]��ہ��d���f��Y�Z,�`V�*A���L�b3�?,1S��ԛx���y�Z
+PlĊ"a����Ķ
+�.9��qZ��ÜH����a��$n@S����$}t� 9�Ċ.�������}؛��0P���in�l)/��E�%��)"��w�Y�)��@ߜy=�uM�����~�i�x5�y�G
+�ܶ�i}cA����)��MU[U^/m�N�΃�.�{u=���^7�[״S�=��~��+����$��cZ��˘��/��a�p�)��m���x�i���ڻ���u�x���
+����:�D�����6?M�9�2�kc�ND�ߡ@�w���#
+��I�`
+���2���h7}u���B077|l���5�ck�M��MqѾ�_[��{}l������ÛM�$���o�o��h߉q��i��}���a��.L���L�\�mĂ�y{X�`�G��A�b�^H
+x���j˴�^a���?���?t�Loij�W�x��/[|�.��:q@�u?���Tr���A��3�º��
+�ݎ`���[�|g23s��0���յ�:�C�o������'B�3�OCC�ih��M��f��|�h��gέ�/�\��-ioIKK�
+��iT��N~�BڱSz�W��� LM�j<^�'�E��>B �c�Pe�SrN�֢pJ�>�����P�K.D��=�4�Z\�Bϊ%Vrk��lБm��g�K-�0ZL��K6�)���7��W
+H4�[�h����H�{E�Sd���pr��M�+$�zK��c8��N�[�U6�\Di�aNɺ�����f��W��4+�ㅋ�����W�*�b
+��hH�~���D��8��d#1J���H�x�UQ�����%����q(�������3b�����F��5?���5�_�F��V���FA/�ﰇȭ?�Qv]��ʯ޺h�4�A>/QfK��0N��J�_"��7!�o��1*ח���Z%й�@�9�[�U�΋q<
+���.�p_�lS?
+-���	_О��޺R��H���A��P[Z6ڍ�Z�E�����v$���,�"�ї>k��C��}O�;���V�Me+��2Q֥��I=����5�ʖ�T����,�k��gp�((���L0�S�z%A�x��v�*/]�a�k%�����Ë:>H�"3pT���:�Z�2�Thz�8�/z+f󻶲�z{?G(�ascds�[R��䗹������7r���h,xBM$o�4P*�����ey�g6�g)G&
+@o�j����',�څ>�]�*
+	��1�ֱSBm�D�IƎ���V�~#�CMr
+Mr�Pv�h�����`���*_�2���P)W^��
+cU�S'=��GLZ&�<�g[���tP��S,B�����6�ϢIhSp��9-��z.��0��ҹԓ_�r�N�SΙKs�O)�IAK"�����`�5褿��/@t�������B�E3��	e��<�Vz}
+Z��$��V��&]*vMU�Ǩ����+��i���ҍ^�!f�c�,�.Ƿxɀ)J�������e�M�Z�I�����2⦀����z3�q�w���|$r����k �Ҕmpo��.7A�B�����f��1ړ�ys{8�dO=�]��D��:�*��塩���M��	,�U�j�>1Cu�SE�-ҋ5����EP��qdh�v̇NSn5ZZ������J��a��
+w_ ��b/�pLb�?�tU�g	�8�EB��gXd�������7����
+?7�[8.g��ǁ΀�Y�F;�=s�ߐ4M�7�e�;�}
+)��ei��x�G��$Aga�M�<���2w-)�e��(2�
+endstream
+endobj
+177 0 obj
+<</Filter[/FlateDecode]/Length 8499>>stream
+H��W]o\�}���2P���h�$(l��QE!(��:XI� #�����{���n�"Q��{�3Ι�k�T�;aev*�L�:�(�T9�0o��>�?>zq�����/�/>��^�&�;�8>�������/x�2�wY���)�NP��d��LQ|��z+V*c�wl��>�m
+�!+�P�����?-~��_�C�.��S�0cV�	CLL�:��R�$�bg�?�����_֯�6J�i
+���6
+�	�*	�!�L�^88�n�⠔��\�7�D�&~|��=aAI��<O@ݝ�a-�͈i
+�,�B�8��C��V�lV�z�:%��=k���Ѝ�� ����
+r'�=�ka�!�B:�tq�
+�70� +���� �T�P��YdCJ3o�H��r_Gt��A7sg��ڦ��lu��ei�HP5}���r5�{*�f���T,X�|�R���\�+g�&)����������/�>_�>m^�_��B�R�%T1h�?�-D�H��=�9	�r4h]��� �>ajd�����"��,�
+ڀ�<�)	���ˁ�# ^���������"��^�B�+�~{}��������D��9������xwÿ�d�߉�ӫ����O����������F[��	zć�]��!sn�'��Ą��Z������
+ԣ��j�A����^��M}��/Z|��P+Yivo�*���.+��t���6�2��*#^P��|�v����s)3�)L):.�ZF�mk
+rI�4��aٖ�H�x��2�e�;?"�è�*��b1l�U(�� =-¨H������z�n�ώn��5"�ø�Q�i*��m
+�i��"�bة��! (rl݅�U��� ��O�Ġ+لeˠъA�ŀ@��'1Ri��0�Ũ[h5JÁ�`�G%w8���5����5R���1I
+y*��퐧\8l��E��X��Ho7N)W������sO����,�5�$0���Z��V8 ��`G�/�5��.���B�=	�VH
+�*��b8S-��5>}iJ7�
+G�yL��3"�]���S�q�b��eM�3x?E��&>H�l�����2�tE��Α�A�x���F>H�0]�)�)�c��*������+Ç(v-��3����N.�����!���I���ux>_�破��Hh�q�u*����Y=tFn��h�8O�.���ǚ]�5��RUZƨ~�
+��^g��\���S�0�V=B�vzV,��R�W
+��7y�R��d6����T$�0j�B�%��(�J����=�����0^��i�a�B����o�菸~e%h��?��~��o����*���4F�Y;=Xd�"����CdB�+Ba� ���X�ă�v�{��g���t�:y%�f��xT&�E'��p&�E'V��pF��	w#y^'܃�e'�}$�����ߵ�{`��F�TFz}C7�T���2.oT��v��MR{�R�:��e$0$e
+h���F����0������P�t�6	P�\�S�F�Q��`W�a莦�iWC�܍S��PQ:��TC�0pcb��񏑨@�5Α蝛Ǧ<
+����Z��i�
+��W�����e� �P�oB�
+Ov5恁�l�<0���#`���L���@?9u��md����L�j$�s��u�[����86]^X�Ib���yP
+���1cl-�z =�F�3t�rH���H�q4,l_�����U����M��Vϱm�EQQڀ$嚋�g[D�����`�M�*�w�Qp���:��t�\`r
+d�{��g�HL��0Z�Y��X�P]M��w���>��ǥ��k|��ý_`7��r<8υ��2BT[S�|ڢ
+t�J
+��ƘVZ�?Ƥi���Ѵ8�(����>g�}�3�^�3����|����^{�������sO��e,����%>��!C���0��#&4��:
+ְ[���g�B>���B��D*D�{Dx�F!c�}5��e5
+�������YI𴃄����AA�	���IT�}@$.�4DYK'`M��\V79; !>��ic��\���<P=>	|�������8TY�����#�
+[+�;8�"m8�ܠ�+�H,}�?�R[��3�
+CmM�LM4-�XF*㊣Y+Sjz�+�S�����
+~GRJ[vI¨-;�
+�;
+Kk�*+�Ŷ�8Hl_mZ�k�)7�FRl,դؘ^��g�Wj���JcݘTI*M�� �[ �^Ǉ�M2fEm77�܂���,�ٓ���O���-���d��[�#T��$
+��K���Mn)�P5'��[ʩ��n�{άvvo/���t/��(�4^�(��i�v��x=���[ϤX�m�m��۞bQ��7o7����-���0Ro�*E���ԥ@�p���P�=HWbZ�j�q�P�f`�@F$䬋H�E�Siik0�E*Q���Hwe
+u�,3��8�D��P'`-���o��:EìI6%�lz.�����O'`��6'�����='`]W9��0�ˀ�1���?��Q� !���<��ˡ�q��2%�B`�
+�C�B5A�B�p**��D��g����g�Z:L9� <o`L�@'����RP9�1lI4Äq
+qʃ�&��<�
+�E�Z/�?��V;?=����
+�������n�ɲ�}r��h�9�S�ۼP���<RjDl��ܞ���曋��Uq)Y5%�!�%�f�dU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\JVťdU\n&2�D<�
+Y�td��X)Y����7#�!��y2ߤ�Y�/�F���̔�X>sɭY>?�vq�G��[�h$
+wvv.��CgV
+Vwuu��6�����NGgWϢ���������%�{�A'UXؽh��=��|pphhh�'
+��q;}��O{�x:��NpwY��N����^��Ѝ�|r��2��d�@I��������; wS��TM�l�ZI��T����ES�EXL���U�^,_�R�G�(6B1��]vz�Զ	��x�79�I����:�S�
+��b�T��s���|�$�'�#e"��<�⮤��+�����ȓҫ<9>���H�7�
+z.9���3�KI��>�A�WI�u�����R�>7C���W6
+�T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T��T�<,r�AJ<,㨳����y�S='�>�Q'�<��ȃU�t��騂=1�3Ά���)c-O9��C8��N���8�
+���
+ƚC0�z�R�FQORTC(��'LF}����`��[,�mV��]�Z--�T��P]��`�57Y::.��8�
+ �.Gg���\k(��ӛ���v��'�F4D��pO7goo6��:yc]S�#�	#�)QL�����Mu�� Uze���������U
+s�3S�i�?h�P&�� ;��01=�����հ���0?=!���F����[:�c��kٕյ�
+�k�+�k��XwgK�A���HZ=��|������M
+;�[�׳�B��Bu��k�VWxdjae���^.wKE.��{cseaj$�j�j�ԫ�k�662:����{{?���"�߿����83aۨ�ꂣ��ES�Kk�{�w�i8������4��rֆr�8���������A>���<'j�����\���O���|��F��8P�h����֝J�;��#=�i�������������������w���#�����C�厨8���������A>���<'F5��������݃{���m�-ͦ�T�Y\�ڽ����Q������Z]���mT����Z]ᑩ����{��-����͕���������1���8z�����ͭ흛v��6�g�'���4�A�����;����]Y][�а�����6��uw��$G��h����������rV��������:	}U�a�,�`���������anvfj2-���$;tƺ�vG0FFS��V!���!:ڛ����D�&ss����	G��
+�h$����ۛ�&�4
+8����d��t�X��<*�����&s�A�D���jl���Y��v@hk��4Ru&Cu�
+�t�'��c��:���ѱ�Ίý�L�$�$a��P^�_�$�I"J$�С�H�M���
+�E�{u���>&�6�B�*�C*'I��߲��LQ�3�%�3�m��`
+endstream
+endobj
+178 0 obj
+<</Filter[/FlateDecode]/Length 15049>>stream
+H��}l�U����6�%,_�4-l�;�-�]�v]:0ۊe)w]e]����bd��3��2��1,3G�� ��@��p��5? K`��@�����wY����������y���1����1��F�����7#�����?R��cMYaXgN
+��T4\Q�����0Z��S+Qӄ�BIQ�T�b���P[B$LZ�#�9B��pMh�%�)JD��I�x1�!A��U��
+�Tx�����~\�hQ�b)��} 1#�	�$(�@^�$?0m�-�51�z�U	
+�d�XK��dM�\�H-XNh�xc���5%e#�B7T��U~vc��Dp.MjBkZB�^�X����6�*s"k����5"���Hj�
+if)	RÔ+(Snwu��R��
+)&�
+��,R�Hδ[�eQ/�A�W��I��8D�_��$`���!��$RL,%	���v�@"ʦ�4B��Zx�q�j,,ʆ愩.����H��q��v\������H�N;��'�W�m����Ӫ���I$X	1�c�t7ʜ���tU����lRB
+�`���X6�+$�$�XC��@>�|����@���D���0�*�� �x���`�v�w	c�䴡�mViP�mmoSE�/���x�~<܆�Lâ0a)�pwAs)���b�WI\���U�}�
+�X�]��[�]��k�w��U޵ʻ�gy�1��wf�r|nr�t}f������v9r����}xچ���!96095ѝ�VNl��^W����Ao��6���p����H(
+z�ƨ�usˆ?���?������IO�B��8i:�(���zw!9ooj[pş��n6�z�b�|�9�~��v����
+t�{�y�������c�����?|��A���H����Ͻ���/���}�7�k���M~����z��?�|�ءݷu:\�8��W޺�����'�����Ë��>�ԫ���ι~|��(q����z�����~��?����ͬ_��x]���ϟ=w��'��㳋�(+�:~��3�utuY�0	N6�����C��o�}Ǘ�M����{�5��kp��8��	^��k����v�jz+Z����ɐ��f<��*������繱X�״X�r�Ω�kxrz���F:4�ŉ���I�}S��vMNok�����-S��xՐC����V���l������=p��am1��[�����' �N�w�0u��=��Be��&Pq��pbTB}�UT��C��^M�����@3FE��Ʋ�>/I�J�e��Q6��/
+	�p� F��
+�Tq�&T�N��Q
+{6\�����N����$q�&���^�0�bIG�]+=�W<���ǌ�"k��]',��R�`�cՎ<�[m}k���4�]
+�'V��AYhw!�{��.C=�lT���cjF|�����`����H���CeHf(��{�?��EB���r�f�I�0��V�b0Y�6;�Oc�����Ksm��f�~ٞ�V˻����(u`����vAnIE�[e]�����u�v������V�*�ZE\��kq��"�clE��\�����������۱�����r�<���+��
+O�Crl`rj�;ݭ��69��>;71��l/G�
+_V�%,E��Pa�7`�] �ݗ����IO�B��8i:�(���zw!)����W���G��k�:ͧ��֮\2����F��+G������%��k�:~�ԉo��t��3<�ԯ~��K���C���G�~���|��[��yt߭78����y��{��ޟ~y���=�@J��~���>�x��O~c�3N������˻���g�������7��kG��7_{��K�ۮZLo��Џ����G�]^Y��~��{;�k����HWܵ�s}��p��Z����l�z�|�_|� VMoEsp&�o��&Dϫ
+w)�`A\X޶�LH3�?�{R�|i�	+�m!��d��Ng�tҴ]�QQWJպЅ�`]��h��bAWR7���<��s�9��)�
+.$���������繯e,������D�6��~P%�;��G���7�����G�/Σ�[O�_�i�a|��q���֥y����6�����|���afp�A�cU=��|�=߮AޟΞ3���PE��K�/F�l��GN�\������֮>zj{g���8CV̝tu/A�P��~8;�A�z!���B�\tǝR�@b����8RD�B��	�H�I��Y��J� 8f��eѺ,��r�Ǎ�L�m-q,4�ID�w�p4@GCEߨmHߨ�D���
+���Y��
+���ј��N���C�d`�~`��G���?%�y��>:E����5Ƀ@p��5��a�g;у��۰�q>b=�L�h�������Apt(Y�tH=�E=r�=b	���D��IT�\^�q�q#��=B&9�CD�Vt�B�j�{U[�j##��:�}��W��*�?/�sYN)^!B�T�W�De��Q�sT0&�˲�&���c:&��_�aL�w�c?N$o��«�֛���R�����Xd6I�/"�;a�`C��&5cD~�>D~k�ɹ#�հ���+�ܷ޵�#��+�q��1��8�J��^9��7�#Kϫ�{T
+�qh�d`H`��+�a?��ԮT�F�C��"��, Gj�e��P㯗���8��@��rHCb�/y��A7����3���ZzY-�U�):���ŧ=�j����]������k�q��"n��V\�
+gPwx	�JC*j�c	Hr&I�P)���9�g�H)8�n���s�|�2ۖшx���Յ�J��Mj��Jv^��%/�i�u-׾�E@6G����!�c�[t��g{�w�85��ȿ��M�j��x�yD?��(�0mht�dCCk��C���"�z�N4�rd�ֲ!*hb�N$$�H���E�9x��\�D��+�-IM`8W2�^�"H9�V�ʤ��
+}�
+k��sba�dC=�_cэ*$�-���(+	��%�aarA�)1�*���&��2�V�	*�3+`� ���!
+�L8lL�!
+���ډ�7&i�F����@oB}����ȵ�ꉀ�=ZZGs���mۄ�c�l��Q�5Y?($.c�:b�4�=��׬N�<�ƿ8���U����*������L
+���(JLSR}<�J�<~U�
+"d����`�3�������C��|��3�p�p?��E�b�[rG�i��q0�oO֘R���@�Ȫ!�h����id���tA0Q+���?�#!TŒ^V��މx8��W䙦�,����k��,� k4�j�e�,e+ҟ�M�2�����5���z@^$�@�b�\����cT2�d��*�zF�U����*��v�n�"����J��wí��5�4Q' I?އ��Fr�}6��E�I��&[5_i��_/+)";q"iq�R�J��%/K�A7����E
+�P��B��j��jM�y�cj�iO�m��:nW�l�y�iFYƺR�b��]ф*��sH��r,I�bK�P)���9�g�H)H��{���+̱�U��W)/�[](��ޤ�>��a�.X�B�F]ׂp�ˋ�"f<A�-����!�c�[t�ɻ�� ���x���P����y.
+�"J�
+�n���VS~����E��� �I�AX�ȋ$��r�D���&�P�D����\gU�y�����^�0�kk)ۼ��';�IT����Tj[VY�ީ
+�dY���{U�C��>աZ �f��b����<�΃I�%��/�����k�0S�i�6(:��̙8�03��؛@iPR[��[}��IK|m���'S�X_����}��q�}]���1a�3�|��Zk{�o�]��GBݳ���z�d*�raC�v����"��1��?� �{�$s�FӴб&S"�+�^�<���@k�t�	���yR�������7]NYG�Q��0-�d�xH]q-r?!�~�����5v�1G�^�<ƻK_���S����%S���T��]�"p�1�β
+ҙ>���s��,��%�����8�R�\Ļ�j�L)���){z�(�k����L�W�B�Z�J/��ai��%����"6��`���Io��4-4��R�k�k������a�cS�=D1�Z���N���!K�B�w���`Q�W7v�qf��o�i+Zϴ�5�v�}�d��ڬ4�1��t�(FJ�?�4+\��7lXax_���9�P�"���Ⱦ�gzH�g�M�BÚL����O�RJǤٗ�3/9ImBB��:JA�h)��g���[@�8! ,�DG"�D�%0P2�
+��;v[�B����$���n{wQ诫^~�]�,���.�ٶ�١�[lssg���@�5י��Y�vYl����~�Ə<;�~�_���DsOg��+~��>ڙzltv�=��bn/G`���#�{�)�@m{2���
+��=
+�ZBT/V:熴��ib�j�P(�����=�+KХ2K汪�r��5f@3�:�hL�
+f� k%JKI�'�H�"���!�h>E�H]�\%��ف����!)��?x �8����
+���Pt�s'�5�"�@��A��6�~l�h��.P��ZF�ʒ�OH�좇C\�~�����#<�Q���$�<�I0��YE6��Q�M�ai
+N���L'��Ԁ�����RR�K�g)�pJ����ג�O�ti���S��y�K�M�K�UƊ���-U��T?���鲛�~�EZ�%'ӕ^��uDo�}r1��,���ϱH+��p2�t�(k
+D�.k��0A�
+fr��X�y�EK����0���@��}K��m<�O'��*�o���&@`����(���q��ng�ϛK�R�J�޵��n^s����j-�>�l7���p��3S_k��Yxv�[%e���n	��;��z�\�h���_�x��7_|�M��/\>����^zv\�P����Q����'O�8|������V�oٻ��������޳z㖍kzoQ�U�/۷Z7n������QB�����̎�3�%}����S��jd	�bdj���733�ǐ����t����v{{���8�t,��c�&΁���̙�x���B�͚�nQ��MMOe�	�
+���l0k�F�>�����O��Ѐ��TfG�j�
+�`?���P�8����A7T.
+��4��9���
+�6L9?�@�1]0�!P��dP���UD
+���@� �����Er���i'�T��,���Be)A/��D��N�u�
+ms�09��~�Ѓ �d�RAA^۵R+X!�
+0�t5i��T5i%���Y:J�*�����k�ʹ�{R�\�� t����Z�]�6�����F�YGW@Gk�T���q%�dخ�E)���.�x�J;�Wd-/dᅤ@�+��+,pEh�M�< eW<R�}�.��6��А�*Bْױ%lQ&�g_�"�HBx-��4��w��~���Nm�3�^�1Beb��arf,&Y	K�/�	|/r[�t�h��d�v�¸�iT�B�\[A���(�[F`5s��[ �r��-z�6��zg9�X�"@Jr�BG3�BA�� әO�K`�~�
+[{��\]�>U�o�TA@[��tH`DXC1�������@\�(��Je�3�aBi�sY@��W+G�aJ��Z@޴�6�0H�{� �9^�����߭�����X�W�2�j��D�SאM�a�zc�8�8#RWQ�u��l0>�����CZ�ǖ�D8�S�r�d����U5$iMP��!��!DU��
+���T5(%�%�R�(�ВmE�DH	R�*��������
+U���N�����}����=�EP�I��X$aG��`�"D9#y���h�*�1��Pź�1 �$�N�
+ԥ;
+b;+FW^r6�7v$�͉�^"�3RP�&�����n8P�*}U�J_U���W�����U7��6S�,���S��̼�"����N5ڀ�9<HJ�����z����d��\�&��M��ra1x[�a��� %���l��z#�*��m�o:�P�Տ����K�-uҐ�|9�ⅾ�b�P��e�����J7�C�W-E�{{�`]���ܘȠ���#?~r0�6�.���g~v���~e�6>��W����7N�艝[�]�r��}?}�����_�Z<vp����w���W������Ʃ#�3'�5}��~�}t��_�7L$|׽��?���^���������F�ƻ[��|��勯�th����X��Ҽ���3��}�;�[Im�1��<�ßyrsv��������%���o�[�ԃ˾�ӻ+��j���J�-0N�J�%2�7�0�q7d�����5@����z��SS�^C���0�E{K�f�'	�1Y��.�&�xgq6�m��o�W��Q���
+�I��6�9�W;�j�À7<B���[�>O���]D?:s�\�so�x
+��9TiJ]���ƹ�"��$0��qi(�4��`0y+c\^ǒ!
+��e�7�c������e���
+
+T�`+�v[cM���{���d7�ʓ�?	א�-�iጟ�N@P�n���T�X8י��+�&r�^�_�^�V'���S�H_p�*έ1�.O!���H�<���S���
+_[���fQ�V�p�ذ0����W�O<�O��j�Ԗ�����w�:�#ڈ�`U7g�=J�[D�#md�p�b�r[,G��m"�c�^D����e6�?��&y�m},���1�]�uĦ@ӛ���fOe�
+������1���0�X� �E1c,݂B��"�YU��Sr8v���4�`ώ�Lp��mzb��rL����n�"�F
+B1�$��GA�TU��R.Ψ*��6���G�d!B�֙�٘I��J2���*�C)U��L�\�؆k6�;*��M�D�V|�2����
+�[�*OUy��SU�����Su��m3���X�8U���{-���Tá
+x�Ã�.<M੮�7�.NZ�U{a�Xڔ�-f��
+��3o_���gׯ�����.�nں����}��?.��·k]�1���G~�����=���p�z�k载���˿=u����*Zx�٧w�ԧ��2V.m��7l|��>.[��ݳԓ��Y
+����8���&^��ڍ�F���F<z
+�#k��8�^s��Ԥ��_,�,�g���c����I�wL�����,�Y��o�4�[�U�b�/A��TF �1�1��1���j\큸��G�7��h��I�&?G
+��<X���������]���y��6��#ڊ̛撟�vC���P�DT��^C�G,+PCلB��'�	8f�ʤo1@j)�%wG�YБ���Ӹ8�RkD��)�$;��Ŕ	��Bp�&b��m�q�?���x��B�!�I
+0�Bo��Z�m�o:�P�Ց��Z��#Җ:ivk-^H�]~+m�m�WBW6ԭZ��w
+��.AE~��\|���m�\�Բ��F_\<��tw�F�t�������]:�����z�6
+�=t�܅�]�z��ѽ���(�/;�_��.ƪ�
+�3	�BJZ�တ ���2w�J�j�	�;za��a(C�V�D��IM
+���b��RҧR+�L4����>�!1�JM+���93M%Է�39��7����׷{����{�/W~�����倾��k���;�~u����N�u	�����7���|����!��=t�ԓ/���?���O���}l�4���O~~酧�6��f��O�;�̓��]�mCgz⋼iq����w7�����'g{r���f������:1���z{�W@s�nÇ��4�a�Z|�P#�ˋ�}���E�`w���h�xhlj:�,������݉M��{td�xڿ�����"��f?��	,��� |;y���ˊхPD�o��{�I��������OO��Eo_ߖN��WvON���",TZ4N:)��ª
+�iJI��B�L���ti�F�z���Bz���Gf��*�"�t�עDF�u�2�'����m����a��Y"�빀��3�T0��Zx�Q�&�(�MF:�E�mU�]�.	fb��CL,VUY1T���Պ���؍W��:0
+���4:�RQF��;�C�ں�똢S���R�Ӂ*�GZ�_z��@eKSz���h�;In���X�g�bF�7�;���.�$c!x��Jml�"d��A^	��
+c`��iϬUQ��@�ฎ-�`d)���p͑���T�,�g�����r�A��p
+��2GӐ1��F$��'
+"��[x�¼	�.!CEC����Hc=�yţY�D�2�P1�1f}B@�oPV~
+J�	ˣ��w���q��)] 3
+o_��1��l��������{/�|�0��jH\5���6�ʇJ�:�*w�{�/&h�S�^�\���tLi|F�ƈHl�RU�m�kNE1,T�
+U�]�-�V�
+�=V�����p?}VR��6<���(���8K
+���㋂�"�N�Q&�L������_k���
+}�#�=��J�^¤Bf�?�
+�xt"V�D�����
+V�]�����=8���c��Q7l:���H\dj��?�m���S�y�6O��)�<e��l���G�V
+��25���Lw''F�N�s��!���|Ç�q��
+��矰�L���O\~�����?^���u\����_^�ݕ�O���uX��s��.<��3�/<��S�7��n��>~v�3v���Fw`����M?2�zz�Б��}[g��whh���;����N�bS�����Ė%>���Q�EK�O�"L����.����4��6|��Hؼ�E/T���Ӹ�������w�;qhl��L<465�p��x����ā&��=:�<��G
+T�X��r��������v����Y�e��B���7S�Az��ָ�ihd��47�Biws�����5��g/�:�B�2���Ǉ���2
+}��*��h���J3 �����yP��
+M��0��,;�k�I��8i@ᕰDi�Oe4y� �4T~FL����� �YI|�<j��\^��b���b�.&��?����T�"��fb��)���Ћ)R�Ӄ
+;=��"ü�^~�LQC�\��(
+�WY+�Q�0"?!���`#?�J��4?�\�Glb�����g1y(�iJָ�
+��	6U))B<�@���'$������N%-��fOC�L)(�4�n�����PO'�z:�Ѯ$?���[{.g~(��k4����	#[�2U���2������Ф�#P�^k�K`�3Q|�EQ����n�1B���
+/���B�;����`2+�ϖG-h��[�c���ǀ7���e�S����>����l����Ǣ�ԋ��f.Csu��M�g���Fvx��LVy��n�r�ܘ���?I�bH�ӕ1�R�^B��ZO�rk^�`�1Q~�Cɡ��e��f[%���.��LQ���9�5?'0��gۛ~k���[�a7��x��p�ߕ�!���[t�`nQ�U1nT$hPU:�C��X�UJ�����J�h���	����e�lv�(ܵ����m���˦i��0i�ƅiM�n����̌?�Na ���{���1G����=�P��lR��nvsSfx>�W���4���iW��?!�'83���~͟�j׭�}rvyZ�`�N�뀆����Q�Pۅ1mE
+����⫈�LJ�έ�����B�v��?�R꥚+�΋LL�Ą%�I���e���Yr�P&1玥�Q���J��;悻�s��	�fs���8�Rn���sK�h��,��J�+c�Z�&�r�S�.((
+�_�Χ}�[��a��/��' C��t��U��P�[���T�����s?�h��E�1<����q��]E�J�t�y���ꮱ�I�3�;Xw�]��#g�x������'�
+��㵂���/kԄ��N
+��8+�kt��q�������5.�BK�Mt�@�2� +�a+�F8�?�FA���/dC��
+endstream
+endobj
+179 0 obj
+<</Filter[/FlateDecode]/Length 5613>>stream
+H��}LSWǧP�����-���-خ��7JyQ�*�DEHS+/JZP|��e��6<�F��M��%�12�q$0�$�24�D����9�����T)�{>M�{�{�s����%�=��r�����Ӥ���c�-�-��w��[]&co�֝� y�}�v�������9��	����hpM�x9�P1!|�h�J����N�R����-.��%4:����l��f�LP��b2��JG�,��|��尘���Q�h���}��1
+��2�ml�<0tstl||l����垶ƣ�3��"չ�`1(4� Q&e���g;/
+��ޙ�|�`r������γ�Vsv�R�C��fU`Z�RMڮ����
+�޽?����GS��];�~��xW�F&6�Z��Eg��b3rˎ5u�^�y���'O���>yx����M��r3bÂl��cq�`:}~yݙ�+��SO��=�l��������3u��z]&`#�*O/��+���4ZN6w�
+�M>z���/�|�����p_w�I�13>R��A�K?�2+�[z���?x<���_�x>�����՞��J��ݪ��е�pi�]K�����u�Jq��t����Ƶ;��wQ��خ=\|���s�	�����7�R\|#zϵ������+��XN��-�i�*3��nEq�^c=;Ͷ�"+�d�H5�(��J�ƶ�/y4@��^s`��q	�&>�GPD���k0�Z��g�
+y�&Z��U*�J
+��XЯV���`�2z��h*b�1j��9X��w*GS��ڛ�Sko��Uj]6{�Q�(Duu3M\;c�>�>��S9�j�v�|��Ev���ʰ�=ı��l�J+-�*�T��G�8�/����Z!��8b��Ĕˉ�T�Üa�dAǬ��U>@���8�&���*f���*�aQ9U�ҊXa�&Z����:����"롢BSf��}�M�g����T`�:e�}v����m�o$5�gĮ!�dz�Eq�㔢��
+��@�|�VS`*�S(��L;����-Y|
+���H�Z��OHL��F�uZ�"R�pY`s�K�$��`�A��(M���t}�!+k���2d��S7�i�d�AB�A�̷	�P�/X��Oٚ��'�h�g6�wf�>�1oON�֔xu�$؏�B������(W,��&�w�
+K�+������Cn��Y+�KM�;�I�(I�����e�/%����)�v�+�<�a�ɏ>n8�F>��d퇇*K��ޖ+
+8 �9�I,%���M��[d9R�����Z����6��Z�5�iC�K�ެmD�?�E,�L��T�7X��l�[l;~��֯:�����.\t����}���U�秎ۊ�6�d�����98������.��~r�㛋������e�^e�������8�I��p��8y�?��F���}����l��xck��~��ƭ[�Ź��Enݺ���O?\�jm<n1e'��A>ld6r�.E�2��ih������د�ݽwo�Mܻw��_�~�1�����Ps`O�.B$�#w��!
+�������h�����C��'&�cj�ۘ����ɉ��C�����bܖ�џˤQ�"p�Ph(o�D����{P���yl�IHBB !"IH@D@�+>�`1<� D
+�gŢ�N��Q�^���@}L�vt��s��Su��ڇکS�[��p-���=�y�ꑍ��/3a��|����g7g��w>u�[��w{~���O����������S�wm���%-!B.B���%��P�3gW��p�g����s�����Q��@�o�{�t޸z�ӽ�����W+x�a�JMb�yQ�ֶ��cwO_��?�M��<��������O�mm\d�J�(=-����DmʞW����]���_z�>��%�>����o/}v`�;u�M�J	�ɝ�"�%��Sl]����/���7
+1:��������K�mo;v����������}�����ڶ�[Z�?W��!v�����좚U�[�8{��77nQ�� ��n|s����Z7��)�N�
+�����q�="�(�Sf�-mj�s���s�\�F��͵u�v���sg���ܴ�l�C�R"@�;7�B��K�1W��7��9�qƵ�M���]��G�[��۫�9)q*9�J����1��Tۛ6�������(�>�w��&{uI~�A���x=#&ج�UZSfAI�m��M�-;w��C��ٞݻv�4oZ��VUR�iҪ�`���x�uN�T�'g����V�i���o��mhZ��VSV����G*�C�����D2L���s�-XXc]b�o����(j��-��,\0�07݄�1���x�B��L&�/
+UO0�d��2�/]`��Q�Ų�t~�yVANF�a�:4H��S�$'���
+�AJU4nHN���Ν���O!yy3r��2R�
+x�J$p�ϩtL&���C#4�x�1)yb�$JI���d��k5��@����J�5g�9<a�L��G�51�Z�J�jcc4�pL.�8l��0I�&A�B�T�Pb�aaa�ʅbJE�L*�Q�5����1��'���4 ���T*��a3��_nOM���pQ�/
+l��*,��N�X\VY��m*�/���-��(ͭ\Y�hU�l�-�[[1�)>�1\;1�%��\o8����<���2�y�^YUmu-n0Y�Y�;�)��tF,O��cz���&�����F�?F,�X��dc���8PUE�$�$,>N������I�m����zZy�Fl�U_��+�==xO
+�`$��{	I��^H�[z�/��zW���6���cƨ����C�3���32�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<�!<c��5���	�m4��'
+_+��Ƅ�k"��1a�u���7&�(��zޒ|!=�%_B�JO�і�w=�W��
+UGU�m���̢z%����3�3�h���
+q��DG������__2��yDH�c0�,���b2D���BD
+��F8\�G�r��E$���F�e0��������
+���a��y~@$)�5�qRFN~�sQ�yNaA��TS|�*$P�C�~�ňR6*���b�)�3f�[P�VMm���JK�켩�ڈ�@!�fx#J�8�b|�!5����ֶ|u�ڵ�o���[����4�V���,�bd)�'
+
+�6��α���lشe�m[�7�۸���<#=1&<X�C<�9J�K��I�s+��~w�G{��}�q����l޸fie��ɺ(L��Yd�Q���k��f�/iܴc�Nvt�<~�ྏ6��U̙�<a|���#�%!j]Z��uoo�k�ю��p�҅����{�����B$|R�=,&�?04Ɣ�?����O[�a���.^�|���û7.��Q��a��$!���##�[<�R*v�q�
+��}��՛w�ݻ{���c{�/�ؘ�gg�*-�B'�����SPri��ۏ��~����ϟ=�w���+gv��;��ˊ�r�u��OTN��5,��w��}���{��ͻwo_=����
+���3���5�D����ymK����IK��p�ɫw?���Փ��l]2�>'��R[(��t��b򛦮�y�����>}����w/�_=�sŴ��XokEq$]��WԵ�+l��j���^}������_?�zt����3Z��|l�%�A��- ��g�_�6k��37�����_?�}z���}kg�'���)Ip��ҷ�K(阽n��[O�~�����_�?�}z���u�;J�l��t�"YY��?��cP�md]��X?��4��N_�]�]�s�8�ٻ/?~����Ǘw�n�?�~ngiH�$V]I��s��� �C��������@@WY��
+Xu��F����.�5�kTר�� �
+endstream
+endobj
+180 0 obj
+<</Filter[/FlateDecode]/Length 9111>>stream
+H��W{PT��^����d/��{��q�R��vUZ`Ԛh��>Қ�L�I�1m��G:�m��:�N3h��X�1>ZGi�3��;���.`Bf2��pav����}�s���n]�����p����?~����kN?�cC{]ya����Ȱ�C�|�!C��Eƥ�)(,�D
+�Q��A� ��:vʊ:u�A�mر�OT�WD�<~ܣ��?�n۰P]fTדP�*j��}G;��޺��ѣ�wn]��<���67A�ZP����YS��׿��f��Σ�^_�w�M)�J��
+B�Sf׶��߽�ѹ�n޾�������7���载��k]X6�F�bS2�Kk��������|��>|p���Ϟ<��mk[jJ'ә���
+	��K�����,]�v���;�ڽ{כ;^yi��˼�J�¹TJI�@)!F'�Ț L-��nl{��7m޲e�K/�]��T_=�%�����4g���c�����Ɩ�V�Y����M�j�J����kv�9��ǧdd��Sf�~v�Bϒ�66~���^PU6�P��e��CV&W��0[t|J��<V*��ty��y��T>S2s���3R�mafW�3�`�2��¤�\3f͘6u��9Y�)	1��!W��n��%��g��s�/J�(`��0>+cDr|tdx�p�+�ٰ�dTL|Rڨ�Y��sr���r�g���G$'��m*Ȃ�a��������3F���52-%)>����
+#��R�)��!����pH��B��1��ח@�@~5�7xeg�h�Lw��v[�,�-�Y�ׂ�������mev[���RΥvC����ű�nԿj7��X��^i�aI�A�)��iY��&�L�Y,c
+Kͳ�
+�EE+�&P���2b�HG��0\+0��n���d*'�����g�8[����
+�fw�Jj"�M"��Pv��&��Z�U��
+��9�"��fxX+ı�,�E5�)
+�#��� �t���xQ ���ʱ�H,�V/�	bDb� ��eQe�q�4�D9P���Y_��T�󻉲��yJ��bx	C��"���-q�h�N.������萛�28 �d�A�E�?���<K4��J�X�Ӱ�
+i��
+!IL:X2�P̫#��X#6k��zeT��������\�(�!D���D,�=�s��%F2��
+Z:N��4{�,%Y$NZ�@ڣ�%P�Y��q&3����&�rȜ�y�ӈa���S�1t��
+3�y�U�p�L��K��]��Fs0�[1��T�Eh,K��H�Mh��hY���jg�:X�+eʁș���@EIL���n�QƔC��J��~�<%10kr�꿎K�@]����-"�����0��2���[�k�x=*K�W��
+��q�nQ�r�9��Zܞo���E��&���>��ҿ��[p��
+�=Ih�/Ȗ@��l�@Fo�t,�b
+�"Dő��<!h�'T	ߌ��Ǎ:�U(�'�W�J�g$�r��:����]���;��wpF��r;i%�Z2���<��Gc���R�����bUh�����+�3*M8�T��̐����B�&�]ɱA�`��9!H��oY�0˒Lp-��yZ`�6��%��Y�Q��
+L�26)A�,�	�ae �'k��Q4dE��ނ>Eʤ��0�������)S�
+�+S�CpWUs��	zl��2�x���AU���ae��L_�
+Ewp05�b"�Ւ�#��Q�&�P�~�2!1�%	�"�8�ɞ�+\�9��?$3�����If�#��:+�)V��f���҇rM������I��V��Eu�6&LjX�#[a�T@�yT���N"샀)2W!җ�G]�
+j`���a�W�
+��Ӓ���p��mSme����:J��+mCGY�B����|�B�����s�Zj񥶡��Tp!�C��涵�v��-��ZG�s3�Ƽo�tT(�r���ڶ�U�P�4%>$�TGI3�j�騭P��8�
+���:��3%>c�f_�o���Q�]�"Qx
+)���52����AH�s>�kN�R7��Ï�Z�vZ
+oD��b�~Е'��
+�R�n�.M ћ�z����1����K4�yVK�g��$�A��2-�Z��Ç�b�RuCM��fr*oD_(�LN����TSNU��81:=�d�_��S	�*~fn�(�¶]��eU�N�D,�T+;�kd2	*|������O��O'A�jL_aG{`���e����Q�,FD��Ѱ
+A�DB��Ҫ�R��
+���?TPI�iь|��T��M��x19��âԠ�j���-ԡ�o@P!��ʹ��ة xAE>H
+{zE��Pw'4��Pr! �N'���K*6:|v��K�h�j��Jj!�B�߾TUT)��^Q���,�+*�]���8sG/��N*mK��T�	�'�ZL\�	�-Ĺ
+j�&�����0���U-p1�$Jyn��伦�b������9U9!P�i�V�!�X ��6`z
+����)Au��O�S��ԯ�>������!�TH���[����9 5�U�x�%�i����Da��*zbī��z��#���nzD�:߽��[O\�(��ɋs�PX����E"a��O�mg�#"f�xqވ�Z�h0��%��W1��ތݫ�U���0�|��S��[�*�SS�"?W}ܜ��n��L��Q��5cG��iV��5	���/�
+D~�#�Ɣ`�N�I(��2��r�1�Hd��|jPȘ��0�N��a�}��VjHMMhP,k�w8Em>Y}����i�rR�d>y
+��,<E,Q��E�5�)��5�<T����j��5��F�����tංƸePx��\�Ӿ�Pw'$
+�|�-�4XNgs�m��m]��CE^}�Z|��*[�+-�(��V���:��Z+�ZA5����B��]r���Z�ּ�z[��>��?�?�P���Y��p��!mў�:§na�Y��'��̇~��0ð�Ͱ��,�C�`%��ߧZ�����1����u�긧���0�����~ �/�j�EFl�N<y�Rx"�4�v���0��:
+�,u�i�5'|J����X�X�f�OٰSF�Τ
+��3�]JK7,�č��m3B���p8��߽��"]@p8�>l��.:X�������l븳���nJp8,>a
+�Y*���6��p�ڸ�m�Bq�>�9w��'��	�$��t�K��c��P���8�q��pXkUα�`�Uq��
+��3��:�RaF
+�u:2b]6�b��)�\B�̏'/F�]B�%kZe���O��j�c=��oN�|��� U��9tV
+�{��A�s4Y>J����=G'��	��S��]�q4
+�~���bt�i�	��S��6M��j�v<A�,��'I�x��P�Q�2���,��<���;?���ɢo�div��9ԡƇ���c�z�k�o����$��_H��h;����E͑�H��������1{���z��ԥRߣ��5r�1�� �xr�Η��O�z��-��n[�)���2�\]�f�f6���qx[�K����1l>�/ۧq$Z�=�[66C��
+̆#���N�����>y�zطn�)����JS	���c�����t^�׃�%��ӭ?�{|v�Z`��<�-k�oi���E�6�>���6s���7?��^]�����������_�u4�g��i<�O���˿>���~�9=��/o^_]�?���z���@2��O��}�^��~1�Ă�`�p��9>��~�06�������Hq�?�2~�y�/t���{���x�ӈ��w�^��^�~����8����g������z�t���o>��?_;z�G<1!���E=�z�����mc��� �������ν�u�4@���͐%Vv�H%�i�=Cr�K[��~$2�	 ���Ù�ٳsV�z��<� �6�	&߾t�#Қ.��ŨĂ�sIm;��v\Sv��%��f3]���h{�sǴ�
+�~�Q����qD��� r��w�rTb��A$��
+�kUoO�7�ը��Ho�Z�;O�4���_��V�Qy�����x�������A�����h~�j���>n�6�^�9���G��O*SE��ª�Lj������զ����ӕ�_�{!����B
+;w�4����,CG7�֣T��Ru��vj��LR��Q�x��08�m?���ޭ�v��^tE��xu��R�㳐:ҝ\��yUg�eT�Q�%�cØqR�]�v�QYFe�eT�QYF=֫YF�Q����V��G��O������)t��B���5��niU�s��"���[ӟ�{�ĺ�Xٳ�yb�'��&˼�����.˻ϑ�1no@�&뻬�Hd}��]�wY�=W}�����_?i)����@H7맬��~��5�I{+���)�Ù��~��)맬���~�<��O�hb���T�|T?�����'���Ojo����Le�t �;�Z��s}f�u�����u�cJ�����:��;먬����:���(V����l��I�"J*�'uT���PRb/%��WR�iγ�:ڝ�֫m�^n���Z*k�ϒܱr�;a]�RYJ���T�RYJe)�L����V��bb���Z�R�H[��7V
+/i�,3pVJh)�
+@ė�J5�3��ʌ�7�6P5ѫ8�E �"��h�=�y\$=��}:��f�f\�Ġ�Q��� S��@D��#42<&h_�kZ�q�
+�E�
+$�3Mh+�#�V,X����c��z������~�F'�"��5�}x�z�zА{񖐨��C�s(Cs�@�\��Ӗ��0�Z(�*�����Y�l9]%�:m9���o����j&hK�mD-�ʹ
+Qa.;�v���o�t��xN!�̀z$M;?z�)��y;4%�'��vҔ����oGҶL!1�*߼&@���<�p>~8�C���;C|��֎���a��1�A�B\�3�����sto���� �SL���-F'���8��zGU)7�Y����$���%zݜ���Ǉ�ш�5��]N,J�S��~x9���M�$m��1f"EAo����ؚ��Ms[�
+$'/�ъr�P[�L�3^ =�n����8�'�#F�|�dZ���4�%AN���~=���X�%�E��S�pC�|��I��C����2�)(���n&j�G\���Q?Q�'�a���=�֌��_���_V�՗K�֧�\W7��m�|u�o7��u�F�P,�"@�0��ߜ�x�o����|}�ny3����她|YPy�8��ª{�ǧ�5�L�j�p���
+�[��|�
+y���{�_ϫ}2�g����r�W�-v��n[m�瓺�>��]�,�u��DU��>���V}J~�u���OZ��wx�j1����1q�����֫m�^n	|�`�ň�o_:�iM�ۋ�bTb������֋j;�);��ڇj��.��c�=�䎭�W8�	FY��[��9Fۃ�q����Q�5v�ԓ7��U�=Y�,V�K�"��j�z�<
+Ҽ��~�v[�G噚D�O�����c�>&���ף�ͪ����=�|{��|T����>��M����2�}3�O��W��	mLe��^H�zu����D0��?��:����{��(���Tݰ��p���-��#��Sa%�:O ����]Q=R���jz7�8�xT���[��z\б݂N�]�N����+:�����Z�݁���j]ϫ�gA�]t�%���_.�mA
+7���F��F���{T�ޣR���Qy�veţģģ^�������c�QDJDj:�E�D�D�D�ިH�9�]�م�',N���+	p8�$����V衊���*:N��res�}�V���Rz"]�C����<��7	D�8q��%�H!$��V�*��P��E\բok�����-����ڵV
+r�e��s����\5�JB1������B�*w��O��aCm�w>0�N���c>F�c~5�}\��5ʹwC�߾C�r�ε:f�S_i̻���x��C9/^0�FyCS����)};��]t���������_�{�x`n�Q�/��vⓍ�
+endstream
+endobj
+181 0 obj
+<</Filter[/FlateDecode]/Length 2284>>stream
+H��W}l�o��I.$$9>R�6���_G�!�p�i�܋}8�.;_�T�P'1P�	���6UZ�:�H�J���j+$�TU�B���P+�R����;ߝ�.�p�-1��"����y����s���#���
+�7�,LV�qW���#"Y���|��g5��rQ�Gb�Sz�Č�y�������}q�G|�](ȅ���P��E�����%9`�Z�1�"k�md�W��^����9����ܾhi��ں��z����fْ�P�U)��U,�^��Ʌ�8�V0��qMmU��Z(FX�J+���6�;;���������iղʲ��C
+,����M��zB;v&h�Q�N��'{��UUPI�!E����u!�����G�h1|���d���j���E+�����o?96����c�
+�k��[�2�,]�Ts���S��`�ܙ����p����e�5a���6�^<:��?�l���S�?:��k����
++_z��ľ�նc��>���J*uM�ԕ/�?:}�@�f��^"D��k���C�����/���7UH�����3'����*���uxgb���Ϯ\���m
+n}s��Թ��D'���G�&�S�[�����[������K�E���J߾�}���N_�89~�QEԻ�>��M���b��ތ0#�30#̈!����33�
+�r���%�`�z� �����>?�EQ'A�Q8��!N���u;q��{�ɋ��!�p�#|D�6���V�p��$���l&�#g�mn��
+˙�Lf��$�iJ6�H�E��Պ��߱l"�*�D; [d#`G#ܻ]�n�,�s1�&�!xo{����,x��BrViu�U�T�UV�vP�Aߪ�@�"l,)^;�p`�c�L��^�a�6���Q�I�v"L
+����$��"�-�P(�l�2U���fh؃���=�w�P?ߡ�=F>Ǖ�K (��/�����E��1m#�Q�{F#g�M��Q����W��8���m���41?��$Q��k֎"t:IQ�ª(_i������x_��hg�2���q�=�YD<��-���˷�A�O���O�b~�_o ����pp�Po�`�݋!�?Px#P�_؟���_S��b�6)8��s.����Rdv�S�h?'��&���"\�h�%�^��͚�D���#���������жx,L���P�5��9ю"!�xI�a�F�IH�"�<`K����iv$�Lr��N&B�gՌ�k�ۀ��D��$��A���(幧�������EYI��nh�ʖ4��n2>(�wd|�3T�G�	�
+<_�t��r��c�x2qU��*��6�(��s�d�Pa���RG�Q�3֔���RZ�J&ɨ�~�}�8�"��0����(����"e߼(���qC�	~yQ�=vS,�Ǣ����yQ��V�^(U�}dx�nt�P�J��(����ϰ/�G�w^��H�W���T<�M��ړm�ACEjC��R���"?����s;�V�#$G6')�����.���^�΍��syAF�
+5��)u��\���R��Օ�V�^n��H��⯀BɃ(��ݠ�w2
+�Q �w�P@:�YD��`��ʓ���ǰ�5%�)�L	�@�s�����{�gJ(SB���mJ(SB�ʔP��
+n��=�V:$�(������,�S,d�&��L�4Ñ5
+endstream
+endobj
+182 0 obj
+<</Filter[/FlateDecode]/Length 16119>>stream
+H��Wko���.@�a�!@�!�r��E>S�İ�]�B`,�a+�%e7��=w�/��#ޤM��@5Cޙ{:�x.���+w��t��E���n���f'��f�nh���b���$��O�T4������3nW3z�e��)��}���<���r�,�xU/��}��,/��m!&��XV?���s���t�٩y$�>�U�/< |7pi2�7բ�����cƙr�����ſ�����'��jsST볦�*V��N�:f��b��5Vr��b��e�2��'�	O�yV.(y���2*�'�ܼ�n�� ��ͼ���`�X�q�6����[��h��弸������/���%�1*xy��:�����cB�LLCW_wG�->�ů��M]�Na����rG2����fY4�r���fN[UO�E������27�!�k��e�\k��^nֆ2���ln~�?�h7y{[T��O�ڝ9��Y��
+ �s����!=h+�V����X�A:ي�?�=�6�uYw�S��M���LvW�d�����'���uQuG�<>��N/hߴZ��
+�2ԅ�+�`Y_������V31��Κ�"�����ϖ,�n���I���N^Z߽l�+<�޾�Gq�����Ŧ\p�ۣGD�-�*o�Y8b���'��8��ae�{�ؤ�
+x ��0�Q��Ue��Fn�D"�a�aBH�a�� T>h-C7�Br�iT':֑�CZ�
+��,����
+�m}c��lk�;�7�cߌlkll�+[߷ޯ�����]Hwl,FvvMQ0X�ڻ�t�e�i7����}ţ��g��=��p�Ʊh_ޱ�Q�� �g"P�(:�m�R�h�fp�D��6ט���3�i
+C�Bj	�!��3¤�������(�0����2yLL1q�ߠP�@B�ԕH�����C�ܗ��ڝ�+�|�������a�Ǫ-�%4v�~��g[���@%
+v����u��Ľ�8���E�sq��z\*��ͽ�"568��
+븱�nmt߰�������~���m������b�N�W�{wuz��iH$d,:�jq�^;��j=���/��K��
+���W�yw%D��Ɏ>��K��t�T��٧��'˧��Q�y:�DZ%F3����Mn�H��|�9�@�,֒ş9Io{1�_LDdV>RO�m���0�$>�22���o�^�(���
+<��S�����Lf�O�g��a
+qF<%\8�]�E�ؔ+WUѹ���7z����s�o?���j�;��t{����̀
+��E�`�"�4ծPw�PѢE�
+�l�<	�s8�?s"��
+�Nl�{
+|_�k�k�k
+��(�u
+�A������_,
+.z��jR����[�.��j�Mt���:�]��H�)�n���{���5ȅ/91���ӑya���U����"��Ogy�D)4	��G#ʷy7ݛ�M��n_��U�p���ן��U�_�|�����-�>J���F���F�\�V������Œ h�Ί�.�Q���ە���ӿ������~�}=�YKc~yǔ�0��*�w*�iͼ���˟�ݯ��OF����~@����A�
+�}�^v��`���I�$�X�+춹��,3��z��Ӯ���=�Q0x��h�i��,.	�
+�ө�ie��K�(JH�0a�g����_`�߾��#����?YO|��:RW�w���Y`��ƨ/�����;? �
+�ż���)�5E��c�K���󞲌��2��g�;�[��f��ݮ�ur����&�>4
+���TME7�)�*ix�vM�MZ��X�Ԧ�ӡ-�1�gk�̷u�Ł���T�R_)�VJV����¯�q�~v���5)[-ě7��8l5����*���p�
+��e]�.�=�ߺ٥����U\yVZP'Uh5�"h� j5�R,�u>J�%��w�S̉M�b�q�d��l}*F��O܊�?����>�)�z�n:�Ʊ���1�}��k׳tl]��+�TZ����\�����7�9G��Ŧ��+V�>��N�KR��C�h
+K��G&v��ɩ7ys��>�N��S�9����O�H�}�uV��z�4��~^�4�u^J28����~R�S��M�4��R�Py�������'�"� ��,�'��b�`�@Ʉ�k$��4S�ba`@�p{����}3Y��+�h�(��3U9�,���u�6�o��4�eN��>5xk��M���7��ŧ�f�;��8�
+΅���-`��.���[v�zJ��s��M4�{��7t�:����ʶnY�Zt�����?��iJ�4%M�b�R����6����(�P�
+�i�T#=5�U����e��Ժ�4�\y5��!ǻ���Qn9�Eg�Xq�5�m�Q-��>��)����3i�
+pwt��_�wI��@KP�-e���}�r�W�{�uĽu��d�Y�7�[2����oOП�?��[��q�]�������+y��e��ˡ��{Ѧg��߿9�[���/zƇ����40�ӋTU<W�HVCd���UU�R��/�W�'�b{��yh'R֠�5)i-�����:���o��3,u'W��6UR�办j��d�0�x�,5�������G&<�M"��nk(l��Q�K�=�i��fϻ�h�h�ᡦ_i@���DW��.p�U������(Oz3o��i2pp.ZC��7y=�{j+�g�ve�Ϊ�xܪ���a�����]�N'�XV���U��P-�~��{t��O�l�4��/�"Y��I]'�����6I�����Z��*��?6A��.)����[%����;�=�AwQsR���(����=��{�ݵ�����^N�E�!���Pط=K�͠O �u�����o�gӗu�Ug�3�����9�N׶K�,6o}�h��&ɚ����is�f�'�jۢo��OXl��t�|=7�s+`�����gx5=Z�~�i��v���*W�SvO
+ٸw��;�5���9J�'�Y���3�f��r0�Q�)�9U�^��.��2�+oY�ڝ�z�*NO�穞���OGOM�-�Rq��#���"�Z�M�E��"�bBi��&��nPZ����#R�l��"�R-�Z��b&�$��4�4���Ù}�dڤV���g�&|v����=��N�������h��k�j�ڬDl[ߠ|�~+SH�E�:J^���*��]��d:�껽�z?������:?t������׫���x�*�^W��Y@��>5j�z�5�*GM��ӭ�[
+�2��:u<^�~������ٯ���+�7�����F��5;�H��H6YF�c4�t
+�R���g/�̕�3e�d��|�:W�N��ST&S5d��1�>GQ�a����
+/ð
+��Ǝ�z�����PKDtt�N/�(+.��<��I�؀
+C\$lK��1�Q.`9����n0�1��A+�E?����-�̿s�A�,�cLpz��<�1���S)�¡)���eI385${0@�fs7X��
+V���FSc,)���u��Z�}Qï��B�,����
+��q6q{�f"w�
+��w��契�,�ʃ���	^�U[{tkl�3}��Ub#�a	�%,KL܄/�"�p�H��/�>`0�a;0\5`xk���x��WㅓHW��Q�Z㛑��$�E	j�h���
+������X�V�@��9��a
+�N�����q� [b�[@YC�� �`�2_S@<�ڴA\-ģs_9��E��Kg�-g�X�8����ӈ(x���ш	:GDÃ�x�#�(&�!��!�{�h�h�����b��0⨰L�P�EƲC���8��W|��1W���Gu|\"�mpr��1��	7{�L
+5g�������ޔ�ek�]	���a�K�;�D ��1M�+x&���䢂�]��D.�l�׈��+0jE�9�t@_���c!"
+<�@e:0������6J���h�@u�P�v�k��B;1
+8r����p1A�8��
+o�x��&�
+!𳄇�������&	��RMa�
+��HK�P5W���/�J�hy�d��#�CO!Q�s�i�Ա�,Ʉ?�0��S�&6�V0���
+?;�.L/^X;H���ⓤ�&f��Y���|Ä�N@���!I�I�Y0tYGD��V�4Z�9�vj�ߺ��ߧs�r�턥��ٝ�)ߝr^9}�����ث^c��w�+�����=��~ˊ�w_^���t?��]�f6������:��x��������:���<
+yp���t���t���t���t���t���t��#JJJJ'J/�=�<f)=)])})�)�)ݩ氢[�;ƞ�k�;�ޱ{�f=d�Gv���y��eO�U���eo�]��f��e���F'8�$t�=g�ga�,n�~7	�A���������T+���B-���k�VX��ҽT+�R����X+����ޖn����;ۺ�{�]�t��=�}Ǌ������!a�x�;*2�˅����,��5�6\��`�F-� � �K/z�Ŋ����w����[�iמ~�]`ƣ�y�۬�j�c�u��g�G�6��
+����r]j+��4ov"t.?v#Wf'n���P�.FVp��$��H�����r��"�M��LG��$��R;D��X�I��\�r�q4qb�y�Z7�m4mmw �	D6Wi΀�H}�@R!)�Ԙ�72��y�0a�t��㈁�Tm�0s����eY�C�8�*�Z���Q�&�+gs�����<S�%,��OT~��}uj�B�J�nb����P�(���|�
+O��"5VD�#f
+�@��m*��%�*kt
+[�	�>�t���#�[��.��U�JŻ�"�٨�-�6�]3E�#zF�/�u�Qo�ܫ	�^�SK:�[:u��߭�d�R���Su9��J΋��W^Kw��IrS�
+l�1�
+�ᠣJ����0HtdV��Àѵ��{�ƗV�Y��j3�7�/��O�p��Ɔ_3�y|S�7U}S�?��"Dĝ�w>���#�r܋����Y������g�Q��؟X��'�~���F�FPi#�d��N����:	��,Dj���{	�f@x��7�u�bƀ$��j�Y'D1H�P-8M9�Q�;�͍n!m� v�7A��`�,H�Ҙ�t�
+26f[�A�9F��~����+Qt߀��7f6
+Q%q�6�>���[4t#�bz����wXEJ�ew�N0+�H`8�,U�{��\P�#��n�1�'�N�l�{^��
+fL���L��	:�������6�sz���D�p��(s�H��L��l"	�$�e�����kLu+W^
+��:�'"��<d"��D�"�K���Ų�B� '.}�ߑ1��0+m�cO�$Σ|l�S�|	q'+10�q�gg��\0�^��Mq.��f��m�dW��Gǻ���a�P�e��#�:頝����i�X��x�ӊ����i�!r�D��<���fa��	�05C���^F��
+����Ą1L����$+�p��30$��2����rz@(ݺ��yU!�[YQ�5�/�*��=HwH�����0�/�����}q�w��;�⨎�Ff��ь�F6P���T2��eV(uF�#�P1�H�[j�Ё�W��F�`�;==j�TC�j�V�#3��@7{z��ن��t�{t�4��@�=t�����e&-�z��k�.�r�¡��(�.�h�5C�]1t���B�]-X,���r�ꍉڢ�����
+ʂRZT��yTw&�Lܙ�3�ML4�Oዬ��c�֜�x��>��l�Gj�������������9�6������7O�_��9Wr�{�=V�)�_��H
+���*�:i��VR�T/���p�vm��.��#>��uF��+����<��]��>~R�z5�j7z~�j:�����6N���*�]���J�1]�?Lu'���y����~��~x\9{}\�9n�q�G��K6�'[	���Z�;Cʠ�$���ѓ@�H�f"�,��!����YxL9.xpr��NF���bdt����"��h��vc�apt�Fǔ�Gu �����-I�,�u��6���C%z ��cE7��K��L D=���ࢌ�8px|,#��8x&�b%q
+q����#�q��
+q���P:�c	�49C"iM<m�mfbY�y�H�AV�^'�?��j^�;J��)�sM��E��8���=|���ˀO�ߌ���%~a�
+���%���g\tx����t�{d�����K
+@�Ѵ�W5dTlT3�����x��`����h�(�q�!���{�9[�k���mk�aG�0�N[hmp�v+v��G� �4��-���ĝ������:Yg�zUݙ�3qg���71ќ?<�/�F�G��$�+y��c��Gw ݇t7�0\ѥ�I7(ݦ�n%�5n]i����c�� ����^R��
+'$4��j�A�X$�M���JFf#ӑ�X	��A��~eD)�&N��Bz-HJ����=%{6 �rŕ�#%7���IҔ2�QQp�	N��r/9�-���H�[���rۋ6)#k͡�e/����n�S��t��j?�:����{�u7���.� �X�|�b�7G8x~a��UOH�p�N�]a�����;Px�P�#I��FD��e��bk��Sn8�޳�B+\Ѧ�)QPp�$L������x�ӕ�yGC/4��7�g6�g�g��e�����Tl�W*���+^L�o���5)`B=!rQRq�Jo��'F�>&��p�$�1�� &��TPɬ	4�C<�\�y�na��Vf����銮�t�����陧S�:3�O/]0t V��=��57�;�0V;�Z]7VY7VWj+�U��J���+�<=�r�]%�u��Jn���Ԛ�m��I/���__�bf����<��;j�E�*�YxLC�,usԯ���z���BQ��T��3s�.xz��Dg�g�E��u�Σ��Z&��Pf��,jrt��ߞ�z?�8(�
+Z�p����G�b&���0��-�vh�C��t?�
+_�pO����_>>~y�'}^>}~͟�v�忯��zy>J�M��zz���<Ux���G֔(���K���(�B�� U���� GYHR�}��*ʀ(��܄�Isg!O���
+�n2E���Yv�$��s_-���Hp��>�l�\R�t�#Md�#J���v�a0J�,W��d222��jmVi�ְ��WC4���4���4��p`�FFJU$ՅRRQ��_z��aH��ն�V��g)c���$��B7��姿f��W�b�XMF!їfF7R�F�|H����a�hTGA}��"�=�x�p��"�3���1!�$�]k�x��"9
+{/�D-
+UE���"~%,1��0U�׼
+x5�砧39��f��,��
+;��|&���n3��+�{��ݾo��~�	�?Êsf�/��w����7+A��	�s-�v�mF�S֟�X�H��0�F���͂���5���M��1�܎�+h&`=ѝ}j1X5 ���vC?�hل��-:_���V(h�����`�(ไ̲a���B	�2
+�#Qё�#�H#�a��j`Ŏ#;��Ĕ�R'�&�k-���*#�)x`���"G=����N�8+=���;��(Ţ��zooX��G���P+�Գ
+��%��3����	�Q?�7'�7>��?�;g�
+$��`��>S�o}'�Z҃6O:�	SHhot�&v�-	�l����������fx}~%�����D2�g�;�����t���nT�.�m��I��/g��?��k���u�v�K&���].̈́�
+�6�����
+����B1Mp��b�a
+���Mt��S�q����YPb�l�)��rZ�'v
+cm��[�o���]�mLu �t���~��BV#3#�
+R���&�/�嶣6E����_����hr��O��۱	`�}i�X�*����>{��Dm�
+۶b.k�"}3�=����b�l���Pĉ.Imu܁���'�p�Iѕ)�D�G:u �{�vK�n8&[z���=�����߷�����3��6�D.D�!�ʋ��h8raa�LpI$aIӓ8-��p4+���6�ȦHF�N���:�d�8��<��"�̀����R�;�}��oU�Z��j\o���o����Ssj�U���T���R�7�����zW��uY��
+�K�'9m�N:4(��ph��z����?�ُU���x,��S��݋5c�ǰ�G������wб/￺�ь��9���'�U��e/�9�mw=՘��$�I8
+��˜��|�1u���[��k��&���V������r#��6�!8���?��f0[u��o;�j�<��'Xx�<���=�[΢�c.T+J��%	�I��B�IGl�Z�*=�~B_OZ��Q�I���E�$2�g�%���ѩ����-Mj�b:����$�X��Q)��dJ:ݼEf��JZu[�z�g[�T��!���p�
+j(V�T��p6
+!�	gp6մh��d�tVK�쩬�V�K����r�Y(Y����W(	�)ee�lY���pNRɻ7�g�RI�E�gk�ʎ��e$6g�eŋH-;�2��˙�]��l���Q����͙�^ټ�͖b���|$�'B�VKg�&k7�I�3а�+Ǆ�h۲�:�<�G`�<V���j��xx�?������ky{�5�8�5�W�o?;�=�~0c��>��Z�~>�������ûq��y���g̳d��Z�)�N'-�충Hd�,�Y�,Q,���0k�Ao(:�E0+`ѿ"~Y���e�ˊP&�+bW���\�,q��Y�<�mvh!��)a�Fe�Ng��l��X-�Z���l!� �1h׊9-���o�
+��n���[�-�����p�x�_2�EɼW�r���5f�?�O��Ǿ���,u=�ّs����.	��C	�c���R��J�v�t�]��#H�Q��P8H+G
+���Ɲs���#y;���c,��9�#GܨC�4��0g�A�7̩
+�tn�u
+endstream
+endobj
+183 0 obj
+<</Filter[/FlateDecode]/Length 17413>>stream
+H��mk$���/�w�7��~~0!���cl��0� R�Bn��΄|����{wVZ݃�$�Ҏz5=]տ�WUTQG���O�>Ƙ�c���K"�I&�T2�%�|�)�'��JZҚjYe�u60�}v9��Zr͵�"a��b�]�%�bɅ���e]Ģ`f�0�XZ�B�Z%LW[Mu5�R-���U��[���0�~?�~7��g���f1@<�f�1��ǆ۝z��&�۴��3�ܵ<c�f�-���6�\EEX��rH!�|p�tPA�W_���>����y��^y�b�����]r��s���r�	���b�M6Xo���Xm��V ��,���$�`��3�Xc�6�H#�]t�IG��N[m��JK-�cRTVIE�WNYe�VJI%�:�pXy�{����/^�/͛����Լj~5�طi��F�ؼl~O�������>���s�Z!���{���"�b0��q�h�h��@D�b��p�|q���/8!�tB��ť��1J9|�Ap諨����^�f5[1��崻��<��7m]!��1*-"�x#T䉤䛨��O)b�n��޵y�8]ק�F����������o�o�o�o�H���ߏ�o�~��_���w}h�/�ݹQ���|��q�j)��s`3�K"�"�J,[*��H�2�$3��^��״��x"��@c$+����
+�4ȡ��Ċ����F���,R�[��Q�=$'qc��
+y����{S!	���P�����C۳�X�Of���=7?��"�\PÐ��"������ԘKV���y�2�Ј�:��`
+�hV+�V�Ƅ���Q[��VAX2Y�G~%xࣃ��*x
+&�a+bP��x��p&Ή¹8Gg���%D/���A�?��y_��g���ie��Ȁ��neZ#�� ܁t�ȧ����i@�q6�ipju8�_����&>�	3_\�nKť�H���t�h�|#�6�D!�A+���b�����iwq���7�6*4=��M3~l���|�ޖ��/�w���o�}����ݿ�#���~?ƾ���y��~}{3���9����0��o8zT���f1ۿo��Eθ3ӧ�5o�i�4J�q�6�-��_�l+�{�{Q���ʪVTQI�����T@����$n
+�%h
+"5��T���1����T���A(?+?b�F��"d�
+�Q
+�^����",��
+#��.O�=d,A�PkA�j]!sX>��ʝ���24"�Iyu��!��W}�-�4z
+��y��;,��A����q�p��o�S	��8�qH��!�C �D��L�H���hRy�!�C0�d��9����b���h]� �#C�Qv�31d:���x�8~��dj%��>�彭�a6���!8#��2�'�i8/��K�QNY�Z_�v�,D� E��-,G��;���/���A��ˆ{=��^>�{�;�&N��)�<A P���ߢ�"*���`!�vPw�̠zp�sOQU���|�T~?��_�������
+�1��*4�2{�����JȀ�N�BH�%�UH����X�����F@h
+R�A�Z�x�3
+QjI`���
+�݂�y�<
+�R%Y}\z�Q3�
+�k�����j&�}�
+|^j��3|�T�g��H��8�If`����l_*�:ȥ�\�}��w�~ד�PLҍ�e�ED:]�@Q�J8W�	{5��'hu�7��^^�ιM~S.�˅�'�;�B{;�̻�����-bm��	Y�w��O�������ϟ�����%}�)=�0����w?�?���~����Y��M5�c��:
+^<Ɓ��x��b2�In���Z�']o��4͒^��@���\g���Wg	���W�w�S�B3���m�6�6?S�W
+e��e��C�%�ab���򰃙����A@�Ī<s`}�܊s[E:c��!�`@������	����@�q7�/9H9����`V��m:XJrZN-���NΛ�����6p�
+bLʑ��L&D��Π�X#n�a&�Qˢ[�:�6t��f Z��n�����(�����:���K�g9���,y�Sf�{��N
+��EP�#gkRp�X��f�BPJ�0��R����AL�~���R
+J��0[���ǁ�
+��㉝ �G{��s취���t�n���WաW������m�ˎcy1�5��]*`Α�1����5G)��I1G-G"F�ш�=�Rs0v�̑|e�;�ȿ������C����Dc�y�<-�W���[
+����-4rp���yl��ً�j��,��[�
+-�M��α�J`-zYĔ����
+����k4�(�~U�P�XP|�
+�+p,��Y�����6�6���c�������]5i�� �J*���m��<��U�̦��ŋ$!�� 1�W��`_=JV��aa���NkY[4z��'
+�/[�>��d2��dn-���L
+���-�$�~`�59e3���gw�� ��!���)�����*��e7p��}$��9w��x� �{�:��������f� ]�\/Ha7� Oy���l��N�§k�Ƣ�R�hm��2��^�=t�N���`�G�E��M%�|P8%��Zg�ύmn"��C�n���<>t]��qx�����Nb"�6�?aН�����0�[ʆ#"Ƞ�,�Б3`��v�,�����*��lGK������Do��Xsi~��`�}��6�\,����k�`x�>�w��}�c{��-.�{�l�A�tk����]H�'�q�SF�.>Wiw�!r
+ȶv�~����e<��=�J6k,$7�'�i6�o��\7�\�P�{S��*`'������6��×ZJQ4��`��ATeC�0-
+���+Aܕ�%~h��ڵ����*����Ṽ!�b@z!(�$��~cm��Q&���c;R��+�n��O|�=��6e[���O�My2�����f�ء���h_�ᷰ&�A�����;{>bTO���!|����q3�~m��`���m��KFP�&��Y�~���X�g]6��G䲶ËD��xc�J��VF��OrN*,�/�Q[�s�}.ۛiĒF�=[�3
+��A����ܺ�=��1�g+�c��bl.qj�
+��6��8�Bޡ+����jz��O�.�Z۔�v=��{�mw;��9k����՘��a�M�Ɠ�ڤ�e����-�5��u�b�γ�x��D�X5�&���Bm������,5U�NކGd��0#�J�U��;�����` _�p��x�P7� ֲ�m���R�kG�:�έ֋(}P�<f��t:]���:�~)܅�w.io��_%��y�s��ˈ!:~$#,����W�\u�5S���m<9���1k���b;l�����#�@�р�,>M�����հxK����%��TV}ˠz�E�҅_�
+}e�$=��Ͻ�&%�B��͘�a��9)�p�q#��.��_Nh������/�M����q$��c��änF��R?����#�u
+>c{�5${]���iP�kU�C�2��n���5[��w�2�K��k��>���Y3���4�v|7R[#H�m�*Z��
+�ׯYehF(���%�{�)?�l."Y����y;.�/�����qCߑ���H �d�3�?��>�ݪU�THU!���э"�}���sovAHh9��z<��9��ȡ9���5C�<'�j*���%r�y?(�J&��jy�� GJ�h�5�-Ԥ+���h �5.;3>g��w�v标�2\?}Nrc�o1�3ū�s�Ԏ����
+�E#�°f�TN��S��&sɬ�1i#K�n96��Fs�``�A���8�ˉ+q#~.v4�*��5�E��
+qz���5^zs�ܝ��(;��b�o(F_��v���42��d#���$��%o��V��x�r%o*I��$ө�n]�ٙ�A�QaI�dt�r��[7-yG
+X�FjA4,�{#�0]�ٽ.G1��&�5#@_2&�F�U3����:=$nw��Y*vl��J2�m�����X�טz�}
+��A�Kr0�I��3a렳�F�B�^nq��B^4��6O���9.��L�Q2�I��s��>�@�Ū-J��XN���p��]�{}K�S�֧�P��V���
+4�^x�I�G��{�1p�fWi�S
+�%!�Z�%RO刐SD�r�͵;M'�0k��ڶ5�i��ة#���l�_�l�1��aq��cf���P]���"
+^-}�Q�`��)^Lu��LPL}�8;��ףx��,m�o�MN�
+��0~���-_A��
+^���Rxy�.|n��:��Sø
+(W-կ����4U�>�L���1g��Ǵ������t��Ң�n�N#�<l��M� iY?�9��%����������C����x�T:[r�Λ�x5��h�&9���b���vYB<v�{�3x{.�t
+{�d�x�..��������dǄχ���a��k��_?�x���7w��w�����{򧧗��������˓�޽�p��׷o�K���Ӈ맗߬S/�x��ox�����4{�-��OϬjb���-vY��o�;l$�[l���,يj�9"\���ċ߷�`�_���jG�趁��|�
+�d�$�
+�8RYp����
+���*�J�@Ҩ�4A�qd,]��
+�QV�-�3�D��0��NR��2�`�\H���,�l�Eڗ
+�$!.C�`�ϴ?�f�]]���6��	��`X@�:I��Eȷ=��qX�AU4��_�s>>B@�8�=%c0\��A�A�+'�B݈�|䠠�,	�`+-Ҿt0�)��A��')sbqѹe�e�-�?�Ad�(2<��o��s��6h��e�u�?)���{GL�߽�<�M)��tP0�G5�g>X!Z��by
+�m���KS�E��l�8��m�dc���el+\Ә�8���b0��I5��\�Vvr���t>ƕ�S�h���
+曾w�H��I!̚sǴ��`�l��ƒ��������@{��w��{������s��^�s��k�u�Ƨ���ƺ&��Xq8�ES$�};taïK}���U@��#�q�zX�uPr�CR�O���➗L뙃���$���@���DƤ�#$N��0��^�F�8OW�E?#��CϮ`�p}�]K2��l41�8�fU�M�:(_�����E����@p�|=h!YK6�$M_I8{i�����w�h`�V�b̹��ܳ��,�U7��O�xv�X���w'� �,�4ǐ
+��n�AS9M݅,{]׭�h#�s0��DC�XX��-YRP�D�|c�W�/Lcvy;l��w�.�S�"b`����'�kLM3��Ɗg��YR5˳��I���-��Ѯ`H4Ҽh����}��UZ^mڕ��LbM�Cc����H���U����[K�[_�����
+}a&
+�iqwS�W�����0N6[�)r���r��]Q֗Z�8]��߷�;�LO!�6��?�i��Ǝ�R���+��~��o98��ϯ�������?�����������c�����Ҫ��͂�,�Ӕ�+���ŷ�3b��J�c(�`���'�ҟ�@y�Ql���[Aٖ���F
+O8�Ҝ���L�O���H�c}��GCJu�fMlZ?K%���f
+�n����
+��`"+�ld�qZ^la�9(h"K�1�Ksڷ�\A���U|�Z���9& l�S+ME�(4��r�g0@8���
+�I�ƭ��`�w�����������2�}����4���>�K�8�|�vI7�5���(�R�ܔ��P��i8�
+��`+��%��B�Ƀg9((9X�1�K�/>��r�O{M�T_�a_x; e_�S��t���25=��n�O�
+�V8����ci1�M]d�B��@����a�ʋ�������s��䴬QW�&��������P~J֒����D�պ���$�k$�؉�c^���:J)/NwF�8�I�YYB3��d������-���߹���7/�����ZHi�FW�Ѿ���=�u�"����ƫ�
+��{뼍�c��{7_�-�{��:�XH��E�0-���3=sPP,�Jsڷ�3�*�;�C[����
+�&��7r���v��e�=ʛ9�g0>��Z%ap�G��z�B0���x
+
+���o��[�O��p�2Wy���qx��Ea��G��~�GmFP�㯍zWx岞��IvD��ՕV5V��/�g
+
+�o�9�[�.�H#բ�`�5)��V�{�V��e��ѪI\��(4�k��
+�
+�*��:xR�!SU�٨}=Xy��rH����`��`�,��*|r���S��T�Xq�f0�h���5��q���4�y�+��X���:(9��܏M�v�~� ���	�`/-оt��2Z����jw�/�s�,"���BGaJP
+,�~�L��͋�A���BR��J�����R�4�|C�W�/>���/����UO+�Q�ps��\�c�
+���J]WpG
+�\��L\��Ny~=H�'��e��X�1�s�[��8����vTv�!sc����)��:(����un����؝��?{X����Pm�Ax䠠I,	�`/-оt��Fr�
+b0~n��i�H\j�G5ʽJyT3�$VK�q��C����|�CV��z���RiW���n�����'�A��-����B++�r���Ύ4uc�
+��]-���R�K�H���+��^:m��R�0�S�J}�Jz�d�95IO���^�S)�+�D�q�˽K6�Auêl�y��m�]��A��+m-=n�<V���ZS�Ç'3 �[������e�E9�F�SЯ�;P;�/�Q\;���A�I�0Z����1lb�Кr���C�w~� HxJ��(�P��U�}�{ R���E�i
+�8#e)l+U[�B�
+Z��NG2
+��M��ԄY��w�[�|§��.쁺6�7�!������a�m���Dk�'ro�j�d��P��Fk kЯ!8��T�+�h�Fү)4Y�+����Ãq���/�*E3Y�4v��&הط�[�C%����o�+&$�����d��F�ۮ���������"�J�/�y��`�9*9�����	#��bp��ʘCw�!nH��<:])�w����7S>vz��������ՕZW�tw�ɼ!�
+C�gp�{�d�R��Q;��]�;P���⪯����AlU�'*��s�]��d슭5G{��`�y;�MpC�d�U�L�b���`���:��Qz>�?m�q�#���W�_qn��w4[Y�+�f���3A�9V	�U�ނ�ǭ�}�C���$� �������ϰp��5���۪�h.��M��v�֚�=|x2�G���\<��-�[��r~�Y��8f���r�P�z)���A�A�1���s�40h.ףط���O�{Ha�Z4�����z �(�9
+�E�G�
+>"\��wl�t�񙂸�.
+Tw�|f}��.)l��f0A&Qy-�uL��W
+2�
+vŮ5�=}x.��o]b�OO�
+}�b2F��)�)���&G�J3V���@-G�z9R�A̸���j0�uŮ-#==x0�X�e�r�<nK�lpow��k�tm,�wbP
+YN�g��^6Z�uX`�:��z��T�Y�/�����sItp��d���b�1ܣ�v�I�Ss�Z|ŭ�N���@V`�T��GH�ڋ��������b}���Hɤ��+pjC\H��8#�M�j��co~Ё�[Ԭ�1B�d�5�5�g;]�����6
+��"�[k�����Lz?��������N�Ò�b����e��t�����
+�
+��c�OJ��2�����XWlm9�Ã�譯�&���2�q i��(��:,�gj�5�7rŵ�~�xk0�[��h�GmT�[k�v���Dz��vq��A��KΝ� �#L�W��Ĭ˸&<������Fv����_gP�^���F{R�Àg��O�џ4��Vᓒ��.|:<cc��/S{��0vݹ�]zR���6L�\��J�]4��:p	��DNu2(-�BZ5�	I��䆵О>�n��b'�k�\�����8���0�4M�rU{��\��8m-�cX{�J�@֠�
+>�q-�0���TwY�/�Δ�t�����"&��#?��8v��a,�4M��5ۣ��d��b��c��Ww�>c�i���JPf���3�Ӆ'�'�d�j3�N�9�ň\q���↽ցj1�e]��
+OWZN	6d4���:W�O�T�Y�/�Ό�p���	T�lQ��|Ds& ���q�j�q/�:P=Ƣ��b�xh�u kP������KH�40�&�`Wl���Ã�x�9����,8R	��&�<��W�I�-�Bs 7xi��qIά�:�5�U 9ɽ����\nT�E�+�Ό�p�:��6�B���xZ�,s�
+��$�֊�]H[1��y��M{�I��T&�GP��w��
+ȶ�����b*������6���ٯb~�/Z�c�x������>[`Lo�Z���84{�&�Sd.�b��/t?���N�2Iϰ�
+K���"Kgq#���@��-:�L�ѲCfϺ�
+endstream
+endobj
+184 0 obj
+<</Filter[/FlateDecode]/Length 5796>>stream
+H��WK�]G�[�8$[��y?`e�
+"HI�w�J��g,�,�艹��3'�\���v�V���#�Г?޼}��75���r	�w9O;��r�ΚZ�`w-���R��a0�v������^��d
+�Ap���J���|�408�`
+6�)��0���3w��j�;Swe|����9$|�-EORM����siŘR*�ܹ�+ܢ��1��t(;����c�����������9sBÈ�J!u �%W.E�����f��7yܰ����P!��T����Sv�����f�s)��j�%�V�pB\fks-|�\ϕA��7�27���
+Ԇ�N�˸�1�਄���?�M��N�b�
+��b��R\�����Z7N��/w�y�p��ַ�gP�e�l�2��f��֕��J��!�po�Yb:
+�!\W*�F;�?_6�L�M��֗���p�R"2՞��i_���г��X��\q�\�hd
+�Ap���bay�M��bѫ�&��zw�{ �]2�Q�z��Kh_i<�j/ͷ�'��cc��V��z������{zyR����b.�
+���Ox�Ǖ-?�]�ꯗv��mʋ���#A�T1�U�uYq*�/f��l�Yh�¤�r�)߂c�m���а�͂��J��a4���&XS3�7�
+�i'�T1�4uYpHiR�e�G��Q4�֒�E���,�(�qm�̪+X�gLhǕe�U�I`py�ۇ	ք�ͅG.������w]=V<� �*�����H�2���{��=��*84(��[�R������nj��]���!���@����#�u�v{�qLy�j�fV/ȸұ�vhN+���[�6>�.[����qs
+'��_����SC5�yK�/����-� �{��G��Y�#�
+��_�y%d���]�qS���rM��eho<f%o�A۲V�nZ]ȍE`���p�ـ��P{ۂq��]i-84�`\�AC��܁���"�kj����#WBkh���fӁB�@E\z]�����4��J0�r95������a1(^�τ�*��i`P]f�&ئ�ho><r%��+�uY��@;=
+��Q�{�=(pyT����r�hd
+�/Eګ�R%
+u���2Y��`����\��6���r�-�F?��๹�e�(�S�Up����k��>��ւ$a(\q*Ǖ�r�E�j4�\\�l��.���W��է�_�����~x����[�^����շ�?�����ŷ?������x���?����w_>�{y�zD���Q��c~G���+��?�9����p�I;�G��p�ҧ�����7��:N cT�T�Q6���n�q,(P��58`�ok��d
+�pm3�fǓ8�����Z��8�9��E�Z�c��Z�j�߾w��4Z���1��=-C�w�g���b=��4F�y7��f:�Ӹ� A�`�
+o%Ӡ![^�XJ2�":��gGȔc��dJ���LM�o7�k)�;M�~���ft�N�5����i���cAsh�QL��D�U�V�^ ��	���ZJ)��RC�lO�c%�3�n������Ց�mV�Lˆ���DɾO'����`��l~��ɾqa��z�)�Q8p��y��#8�Kv�~���^P�a�<8g���	"�:�C`�|s�f�lz�֕0�?���8����IoVq���iqw-�"�4�C���_�'rrM��\!hc�#�g�y˓|�
+sf.�+��p�!�]������n0���y�ơHivC}��v�g�qxP;SmއA�Qã��3���xV���a�R3�7�j.cx��3�_)n�� �ޠ�J�o��{�a���;���2��k����3�;�K:0.��˚z��M�����6W{��&���QQ����<�;v��oy9��$��ff|�����OG��<I��F�H��;�ޝ]~e�2#bo�|7�W?����$������&g����������d�����B�z{h=��q�Ղq��9��s� �瓙}�<�	b�B	<����?qu�a��ڌ�|�{S��ՠ%a�����Ī&��EfN�	|�4�-
+U��)�l�`PV���k���ɧ�	Kb2�Qh�`ɂl���w�Hh�3�D]�T��\��r�R�V�[�k����k�h����k��rk@�(R�0"�	�&*�a3Μ�p&�_m����ธ*����TL�k�
+�H@%�v�*�}�e=:�D��n�m@��D:� �w����a��1y���b���������H��4؁���	��LdT]Zk��8��*^����=1��VE)��u){���L�9��n���^Av3�z
+�'�LB����M^��&g�3.�?��4Wh�&�̸M��������P��2�����Bp�,2��k��Xۃ8�4;��$��:��y�������@���9�H���#��ʩJp[�ȩ�2��3)�埄Tcndh�k��$&;�41�7!��5�2��������s!�X0q�Rڐݒ�]������N�~�=4�%Ę�Т{������h! ^�Z6�2�R@����$	a���-�kL���;[a��:bat��1[o[6���I
+g����H|o�����*���<�2�8��h[p�f*��F�(�j���s��\3S;Uvp� �- 3rʸn����uA�}���rt" Z3:O�Y֧1��JH��Gl�}i�[=���#��͘�	#,��s��r�,���Վ8����=z�o�l�_b֟M�������B@�dF�ԸS��<J$��7Ta9���~w  Z��!�M��1,)�΃1l[�Ȯw��"	�nO��
+eq'E��9��X`8�0[��S��	�u�X"��G�� 얬(F��H!,"����9ܠflg����?~�4�=���(R�(����ܼ� ���GLz�Q�tU�maIH	0daH]���B�:������u�&D�)%|�0��As�w���k�P\[�;`�Į�A�@�Ġ��.�(�yl�H�@v!h��
+&��S"ᶾ�
+����Bw  Z��!�M��1,)�΃1l[ᖻ~Bt�R�GL#6�_O�s��i�g���\�����[���.�d����x�S�<e
+�?��wl�2�69˟qQ�O>�Ɣ3�zƲ�����IB�1�vhk՚
+-�H��4؁e>̫�D$ �����V!��8ƛu�k�]��w����N�:]�t���Q�w�u�[�\�5Ȋ�S�N՞�jݲ�-k��u��+�6!:M)�#��lЉ�
+R�aIIv�el�[n�j��6z�6:��q]um�����
+�#��{{�
+���
+�f�"�_
+K��S�g,�[�b�X�
+�]	��q߫K[�$�(ae���[�F�HH�
+c_7���0���
+ʷ�q֪�����?4�{=��ؼ6����f��%F^6��8)!�F�� !�ƨ֪��Bk�d���|�#4�=��E�&�rD�s���>�$z���ۭtU�ma��`$���!U�v\oq݅Zu ��*O߽��L����$&�3�lN�y�l�U�a�uG3�^���9lfIU8�%%�yD��V�?�	�iJ	�g�m
+@v���_H�D�$������#
+�"��M/u]��Qj+�#�D	̪}jYN7�j�
+x�I�1@�#��Z���a��1y���b������-�ے�^�[5�֚�H$U�f����$µ�̢}�����9��.��W=��P�
+�XF#uƵZ���:iؾ���?�� a��W��ۮ���cu`��� ���jI�ؿf�Ń�2���lmje�L\BB�L�y�P�Y��n���:����S�mcv�i��9"-�j�qp�ʡ�A��7x��9e��������?�f�M�/^�P8x�U#ӳ$�E�Ւ
+}
+endstream
+endobj
+185 0 obj
+<</Filter[/FlateDecode]/Length 4444>>stream
+H��_oܶ���;��@Ա׎� �d{k#�cش��\�Z1�
+E�O>�����d_Z�Nݡ�z	����?�p�g��;Q����?�Z�n�����x���҆��$��[�k����{��~Y��nrQ����������R�ۢK��J%y@��b))��U'���Wՙv&2q�hf��9��cXQx�
+�n��񉸔�:@Ԗ��}�=v�Γ�����L���8��E���$R��ڌ�4��؀���f��YV��F�i���-0M�
+��a�Vj*�����FSr��R��e�	��*����MY"к��/�fV,�%0|R��N�2��yP
+*�`nݳ��
+
+����ן�����t�Z0
+�����ow��|��2�"k%U��p�*�N
+�ME�&���6�n��۴4�i�Flˣ[5���ys4ҍ!�e}�c��q���G@��m�Z�0��ִ��^�2�n��
+-��rd��
+�:z�I�M.�ː�������H�V�&L%��x�E���4
+�|j!]p�1����g�NJ<���"7Ex�{
+��!��
+n�ۍ��⢜��US�ӱo��\��8�9���f��,�ZFG�`��`CGq�D
+�̼TQa0u�n
+@�0��F��&�
+���Ow�i����#2��"qG�k^��Ȅz�����ܸB�d��-#���bY��,��|-���Ŋ�+dү�d����A7Ό�Ċ��,$2g���6ɩ�.	yT��u���l����vSi��H����b�|��]�67ls�67ls���\L���9ls��ͥ��Q�Y�������^�\�9�l�:�ֹa�ֹ8׹��Z� ���sۣ
+X�0��W����!�u��6a�[f�S��L&�qfʇ\�O��a�f'V��񉸔�:��5�ā����L����ԇ#��	�a@R'���}�4-Dh.�i/A�km?Ty�^f(S��Ǌ��JUW���}7S,�2�Z~dr�Hw�n��<7J@�S�z��܀;r���T���[�6V?\�i�Z�=�j���7W�r��)G%�^��Ʌe.X�&Ν�x��En
+�
+�}2�B���CX9��l
+j��k$�'w˘����Ǒ�����B5!��Ch����p�(��t2�P|���
+�p۔l(�ɺ�w[�Ŧ8Ђ����Rgu2u��N ~WBҖ�5
+��hm
+^��OÌF����:Fq�EK
+endstream
+endobj
+186 0 obj
+<</Filter[/FlateDecode]/Length 17759>>stream
+H�lWɎ7�?��Cm.p'��=�ɀO��iy;H����'r#��lKr+�E&s��<F��%?�V�j��z|<;�O�$f�,�e��I���z������y@;��x<�hU���SL�3�^���Fgn=�	�L-�qgN��Z����
+�ZˊJ[>��x93n>L&
+�
+�k�١Xj�q��vb����I@8ࡘxMzW=S!v��4*
+ߥ$�I�g'4�)4�+�WA�`����0��*���9��6F�g.�W
+1�P(n��&�EI����+�0L\\��	HsM�f�ψ��G40#?z�u���+.w0X��-bQ�m�
+~l\Ȋ��т����������#��۟�G<���۷�_�r����_������X��# ���J���,=# Q��?��x>J����G���+���9*���|�����=??�w8�
+p&��٦F4f;>}�_�������Q�j�b��Qc��'� .��^=3IN��h4� ]u4�}�BM�+��Ƙ��X��u)V�m�6�/�h'��~7�Q��yA_�h9f+�����Nf<�uQG�ա�JJ�܄�]�wob0L����O@TH+`�nF�T�̰��bނGj�Ȥ��'w96�G���Nd#��_<����I��N�lĵ�����Р��7l�*0v�Tސ��S��
+Ph'���J>Pr���4�����]
+���mI8v �-���dȌ�$?]A�ldL�N6Q*g`���/�(z�~H�6��#�F��Zm0w�� sp�.`y0�uS
+��<�'җ3�#�^�ڗ��H�lJH
+V�\�2|X-�ywePy�
+)�c�x3�
+�vS=9j�	;��z?)����(�4'D0}���	�%,���9q8,9��	ʠ�~X��@�:�x�
+�y3i�.3p�(=�i$��UL���W薠��ݔ^���Z����nX0$�*(���D *9��1�+��J*���_*
+0�xq%Qf��ZII��75O�,(�2B]u�8)�l�Uy2�J��I/-�e�j��۫�3pL��f<۫r�ފ�1-O�c�� 9qs��W����YC[&pPS9
+ �8^.eeG��-"�~�/��#��g��Lp�Ox�)�m�ܶ�w���n������a�Ǘ�C����z�
+���^���y��W*��Y�^Ӑ�o�7@��3�L��,8�L��Λ��po@�I){uk�sB�{__A��<q=q2�^/T�����IU�'�9�����N�4��u��f@'���+]B��sh���T���m
+H�T�G��V��l�2����!���wS)�T��&}��Ԧ�7��]k��N�'�j��؞�m�}�﯊�������_��
+G8>}y>����ǧ�3���
+,/���D�$$��\Hxɒ�,1(��r-Z���l`֙�:��J���$l�x�vSc�����"���*�;Ƈ��B4����Y�A�
+�<dU�cV��,�j�(-�����4Ӝ�S4U�1̃�t"Ԅ�W�U݊.:��f�O'��� E_�(e�a`վ
+����?����-���DO�q�C���s3��A�����!>T�
+�E"��ow��tU4��8dO������CV�ʱ�'���d��� �ҿd���\9#�^	E��yd|9u[�|�C�E�9m���u�]p�q����9�q�^'�S����;Hx�ƨ���)Gԝ����
+��&� t\Z�~p��L��|!�����=�/?||��.�������Zn/�n��?-�d9�=�s��$j1_�d+��.$-���w�1᧞�)r;
+	�k�Z4�\�2�%��,|N������&���	B�}���j�������~��/kф��}�H:��^}x{��������������%����=j���5������?��r���r�pu}����}E?^�pZF(���U���[���o{�]�������>>������z}����^@=�w���7�'/�rF���<��w�c~�7��W�>/a�v��g�\��5��x��h�E�c�ȴA��p.󇿠pv��p����@�O�ũ��զ's.����88l@���PE�`��+��������;Z�	��Y����
+�T
+y�Xv��yyEn_
+�DP>�	��7u'C�Z���}@����<m{
+�K�W�vub�[&�����L�s���E8r~)̝�V�3�����O��z�WG��Y]=��SIu��U�ܸ}��QFcOgT���
+<�CA�����8?B6:*�_�'g��ɂ�RCI`g(�L�,��iޱ��i�������*x��cK5v~��~A��7�E1�h��7N7�/%`*���R�U��\\N`3��:ȴ�T��p1�Q�'��b���:=�z@[
+Ϲ-�TW�3lTYy)�1%�q�����q�㛌U+�.��qA�a0H�reI���-&-(�K
+� �,Ǯ5J�x�e���'h;�<^��s/��|D)L�x�_��K�BШC�)N��äaa@�����&Sc�*��u��?��U�`��حe@�z~�^�E�7F��k�`��"D�ks��'d�DF�Y!�-�8>]��eFȊ
+�!`����Ae?a����1�@bc�yr���=g���r�o)���`��f��v��`
+�̾����i��4c��-�
+�ئ�D��j%�OdUJ��,A���[P/�x%�=k�S��!��� ��v
+:In�8���8�~�þUo��ܮ�P��<��5����2�Hɱ��alFVjr�Ӌ,�z�
+˴L�Ƞ�|�IE� qyz��:���j7
+)+�ޒfH����ϩ���-D�|�ٮ:����!L���c�@c\�a���V"PGx՟3�5 ]t
+\Έ����`��S0��@o���ڇ�t!%Gn�&�p~�w��A���<T���\�=�+~�+ȹ?-�u�2��3�((��@�WЦ�"����b�Ί�`�]�p�<�y)���%;�`�Hß��pWPⴴT�P����NŽ�5��5ND8�9�V�>�FD1�?�Gfߠ�c3�N�@(�<��q�%�L�K-m�3&������6@�'%��aSPz��Բ��B.SeH�`�}���f��'X�UF�H�w�/31f�P����ʈ�&3
+����Xg�Ղ
+��;���.߾DH^2�[�`�aT�`�r����W�
+�Z�$;oi�K��"D	�Ds�(�O"%d�^�7J͝[��Y���]rU=��;���6�'
+a?��x��/�����x�y�)� �������Wo�
+Q�Al�\�	63l���-�b��sxٶ=�j��l�l��m4"�b2���%/.n��1�Ǯz������6C�����$��<o��ݝ9��a�7]�}�^��H��������e�T�)��0������G2ڲp�(�q�G��)O�L��I����X����'zw�ç�����-?��2�%Ll�YI�D��#NeN���˧�bG˓d"�:���|yX+��y�= ��b�5\��j)�,5w��7lb��3����Oۆ���
+� 0��@G�0���M��c��5�ZD�*�=��`R���#��.L7�`߸+
+�)�c	u��Ek�:=��/e[���VQkOŃ���i�9��v����wJUlm\	>�L����Oa�8��g��q�*��(�v���ն���#b�n��ӈ����6S�s�r�5���B��W�ĵp\6�{�m`��g��0$�x.x��\��"�Z�0n��ѢC���
+�i�~{j��%8���؇�~r�{|��A�t�����ɑD�k�Zk^�0�<�<a�c^aj�;ʠ×����2��֢��x8�L~Z���'rk<���a���I��z���4<n��0z�~��`��?�%���M�,�@ԋR�F��uR�7�Ϣ?�Q
+�8wF�χ��f5���a���+��=�Ө�x�M����f��.���=���.S�rs���L_�d�l
+���ǰQ}�!��J�R��ni$z�AM}Z��꺑x+��!ہm��K�?^���o���}�����Gz|���m<������_��%ۋ���JN2O
+��F㬳�ld:+�
+�YKM�&�4I��K���.���C$���9l�ra��u�����:�즔B0���
+ܡ�;����K����ѓ��1�A+b�Q���_b���*�e7]iY޲���1B8���W����b虿%&`���,䵊�
+2����d�R]A��!r���<�-����>�%�iq�R��ܕ�܋9O�� -�i�џ��KX�\�����y�j�}BD���/�~р���Z\DV̔,W@���wM�"d����qzr%I��ŇL�p����:N�^40�Q�I8(J��E݁������z�x�����@͕�8.؏�����ݯ��g��E��qQD��K'��dy^�\���1
+����?�W�ȩ,M��
+#���D��9{��a�@�Q��f�C�(ణ*	��)^�f
+P�5`�(���U�Hr��p��{8$�̽�rU�6d��Y�C��f*"�w}Wjiyn
+'h<L̨�	7}�mL����ϹP��2�zV-�0�"�εn��h�A&j
+����K}!gb�؊W�F�j���ŵ��A��*Jކ�eri2��eA
+�D`�U��9(�M���ͣ.�<��C��zs����^��F7_0�C<X~l~$ze�1�$!Ѫ�T:��B��)��J���Ĳ�3ni������
+Ro��3�!����Đ��9�	�Z��PV��r�#���$!�&��L]0<윢��v���pC�@lP�v�e�\C=hI�2}�ͥ$��@�����v�U�Tiv�H�����ń<}̯#BT��r�Qh�<+{H�n����v�\%)'ov��=[Fۏ�w�ִ�T��I��4�VDP�PA�sMn��i�����o��Q�P���R���P�C�4�I{M�'!��j��a��j�X'`{�E��M�-�p͓k5���҃z�<�
+:%
+àhZ�'��?��8�-�$���rZ��7�	�XL+Yu5k�7Z]�L-B�e-@��j��>��e;N�D-Ѭ�1�m
+C߰�L�ى����ͮ蜧�)+mz��&I�`Gӏ%x��TF%��"/�&��Ѱ1*w{R�\K�aP
+�>��X�-�+M�c�����!g���g�>�4�HD럯K��[�:����@Ks�V-�bds�����������ق��I�FiYc�2J�r�7�,B����z�X;��ty���ö�X����/�p�i�[��||�7?�xyw������������G��D?N�T��������ۋ7�o��V`����U��f��/��g'fzIg��Ԓ�ۏ��${
+^�@7��V���(@��X�
+��`�����
+��������L8��k��Z�Dm@��$5A8��HO'�K�
+% ����~)��%��2��f��}XI��3G ��
+��e{�YQ#�x�3��;�d_�w<�$xŪ�G֜���f
+�h�V�b|V��E�ld�\u��M�
+[�1�vu�V���ϡ���q�6��8wl��)؅_b���
+k��C��'�md�Xs���1�i�s�0�&�83#A�z�;fӭ����^s����aC|�c�`�K���1�q���x��`��l�:��/�r��*4'��1��CŰ>�[�1�nu>;��e0�ߺ6ħ;�f�ĸ93�>l��lfM�ѹ�2�~�JV�[D���c0k@sOe����W���A�e0�ߺ6ħ;�f�ĸ93��>l������[M#PISc�آ�y��F�Y��TP��@,�t�F�]�`rt��x��<�u����\���HJԲ���l� �{��Q K�ڌ[	�l2������������ 5U6X��m��]�u�K���,6�z�J����
+�0p�Z
+a��4<�_���"b����f�ێ��[#VL�y�k<��]N��~�\�2�ְ
+�1|��Kyx���_j�ܟs��,�8[�G��B�h�Ӝ����0h�Hx�Maw���Y�L8u��Uudbk�4�@�j�B$8�l�GS���B2x�d4�i2������Ɖ&���Y���
+�h��g�U�p��!Δ�U��F:H�B�}4�ۅBC\����C)�;e>�9�&���ԥ��p�s+
+���Uf���Z����<�,!��f���kv0�����f�KF�|���7��#�S��������w������o��?��@{��b����r��������W��d�=4�S�o�w;:r0��+���ͣ
+�xZ�
+YW��$9x�Wжs��+������i-�����.Z�ґP��{s#L�ٴ%��x�>��"��Q��-�~�(2d�4�X����b�ӻ�Z��ط����IY���\��=�iPZ�D�V�Vt=�nJ�%5�A��F�����Z&���n�� ɴL%��{�c�j�{^�i�˧t��,��B��+��Z�uL��D�?����cLı�x���8�&��󽶋[��lڨ���IR�9�}���$r)!�8���h~�`�e�B��YK�W6�%�:C=�3��%냋���n�]9,�}$�2Z�y�ڏ�`���1C���-
+��-@�N"�V0i�}R&���
+��B����:����c��VE_Z��|��7�Pulta��i��c�%
+�|�B��`��;˔9�r��l�Bi��g5�����g�������y��ѿkM�6鏓��ϊ
+�P9�����O��/_NW5�}������#�#����מ��`�����yA�V��pv^��n3h�Vm� 1�[�`*��%�����/��6�$����/4��åi{
+�׀� d�k9IA(~����O53$%Ò��7���]}�����I���9g
+N=j۬��1}�d���K��[��ޜd�N"�d
+��I3�\(W�;&}�I�!����
+���]�א�5�s_�q���^E[�s�Xd�5|7�E����ΐ2��ըlf�l�`i��B�e����Q%�$t'�M.4�jF��Ѽfy�u�B�фd����.��s�&�$u{����\L��~V
+m����#	�CAOtv�L:�ɝ�EB+˥�'�%
+�`V�Z 
+"���
+������V]<~U�C
+�t���s܅E��
+�P���YcW���#O@Wn:�͓ؿ*ǡ8Lƃn�����Q����=�w|����E9_T$�꾲}f���Iļ��k{�4��^���!�=k����F����)汾���������r�b� ��@F��a@�P���
+��1��-K��*�;��>��lڳ��u����^�z�`v��;0�0H �'��k����Õj����Du�$��b���(�h����M��VC�j�l���d���1�Jg1�W�0��ؓ�[�.���:���z��ڍ���{��[z�b��
+�]T̰�z�P�����˷?�SL1��_W���p����%�9�x�����ru���30���u�Y�p���Ba���f������2��ɦ�����mwҝ��w���*�݇�Zd��K;�/��O��;�����;떘��lĆ�
+�jM�D��8�����[�����52Eś¨	pz]�"Qm���xM�*�t����]w�xM�� S�Q�#�S��rq1_[9j+*�:o�Oh�B�A��\7��
+/Rj�O�� C���Qct�j�.e�A�c
+�.hE�q���8w�9 ��fڹP��wL�\�2H�3A$��S
+��ޯ!�k�6���7+Ƚ����Ʊ��k�n�f�c�5�!eͫQ��H٪����e�2��Qu�$�'�M.4�jF��Ѽfy�u�B��g����.��s�&�$u{��Ψ�\L��~V!m���#�CFOTtv�L*:�ɝ�EG+˥ݧ�%
+�`V�Zp
+Z���x���9�,&�Gv�{�J.4vę�՜݄l�95o�j1u32��f��32�#>5�4�d���iS��q����ȇ�M]����晛i7��v����v�c��=����r�p�ٗ�GP9��T��r�#��Aš�ژz	R2"PbPT-M4f�$��v�<����lu(���VD>�XA��v�\�\=V&�.�a�'�D���VL�"
+Z�����������75��!9Wg̈́u/c;;`'Zz|��:V���?�
+�첏�H�_]2S�AP2���P
++��#��`Xyu$�#�I�H*GR9��?�TP4�Ӄ�TV�������򚗐�JM�PW8F��LȪ��2���/���~Nw���();y�U��?�� B��G�:0W�we���e'��e��D�B�$�a�`oj�tu|k�	�՜	aE�(V�D��S?�ެ�$pa��Cbi1���h�$�[+�J]q1=Y֎�z�z���ԏ�.fnu��=���"{�8����c]�����v�A;��s}����a�o��с��C/�#X
+%&���v��PQbڡB�M��1��&��G��f0��q����=f&D��:�$H�d���ޫm7��~A�a^HA��{w%O"�8Nd ��`�zE8xh:6�>���o3�+S��왞�꺞�f
+P7��/:����o��K:��fL$��lFyj0�0����
+M�y�M��=9�o�ʓ�}�)��VZ��[��6
+¼�H~�$"i�{�B�>�����#�I�g�$m��G�A��Ab��ohg�[O\-tzH��_a�\�*�PH�����G�Β?���M��lh�Bz�i�i�C��]
+��>�0�����X�2�Hڑ�w4��6�a9�q�8��¹�<Y��Ǩ�<�9����r����뼷��)��2��qy���ƥ�[Xm\��g��'�p�m8�Qt��"b�h�[�'.l7+<p�R��=�I+'���z��D9��d�t����_���4��a4Y�aC�uN��TڭA����v:� ���mc���Ơ���a�
+����~ŭU�t�ة[�����|�A~�o��+���ם�٨\8J�9����w"x����(1��(`���:���=w����u�}�n�m���2��sMq�i&�
+,�-O<V�Guly�o,�8\Ư3e�����,&ۿ�j0�jD�
+iGQ���&�p���>�eǰ�dQ1��4�]AN�hHu�V����YU�ۡ(��L��2ɹ騕���s�[j�^�u��.�&a]�6�_�K7=��7�;2���+w�&�}&�EAM���| R�9/�L|�	x%�
+�|�KJ|ej��7�
+��~&G��
+3g+�%66d@��B�Վ�s`��Z�k�������[e+�,5���h�LG&�c������3}�γ���.���!�Э`
+j�&g�SM�懈"ʜ��n���P�/X��M��c1QQ�9֮�amGa����	#�n�{��גl8�`�d�F�F�	���g߽|u������������Gƞ�
+\$8��uA8!�X5��i�8���8���փ����:��Z�$G�Ġ7�"���ZuU��A�*��
+H:�`�6���3-��ߜ�+�2o���(��!閡��]� �%��v��F;g4I�D�3�q �i����	�-����TS>���s�d�6	�K/� E�R�澮8�|-��&�&pɏkoO�dv-Ƭ"�M��#Iw�Jm�fy�%x�34l���������yw�����K�jyyvww=�����򋟮�]�(��V�L�����ScgM����C?3il�����|syq��f�/��$��^_�/��/�1ؾ��z����#��WM��^^�_O���H��F���=	����E�xiI�ܱ�"�����D�-R��D���4���l_�C��2M<�T�
+���ԝx4�hEw��]�W��f�w�Zˏ�vy��;H讙�9[k�6��
+[��Z��@IY�/O�v���}��b�R�-����������%!2f�-ms�W<�s���Ba�@�C�LY���Y������6a��L1��|����~�AD�Ь�Q��q��8��}�P��H(
+���ɛj�8�fu	��+���ĘdX7P"�1 C��K�BT11���2NoAͩ�͗DseӋ�-�SI1�IF�}�a��
+>�L/n�;��^W�
+��ū��$b?N����U�_���
+�����%�y�Áy����4*(ᏸ���a<��KΝ �ң����q�N��ӆ+�R"�(�5��
+DL���p\I#ڂIu�2���(�:����*��0��`EK�$!.�0 ō���{c]s�)L8|n|	��pb�V��T��������EH�/u�ww�0x��!����Ʉ�9	�a7�`�A��L^S���!
+�`
+endstream
+endobj
+187 0 obj
+<</Filter[/FlateDecode]/Length 14501>>stream
+H��W�n�}'���a�^���r&��2L ���ـ��,�}N�e�g��h�b��ٞ꺞�"�LgIj�Nj�ĻÃ�6vd�c�t��
+�N��p��Q�0���@�7�w�8�g	���1}V�w�S�<c�t�S�4����h�@1|�||~Ϣl��?���nN϶�7��n�y�o�ķ�iqz�Gg��}�ۭ����e��}x�eu,��3R��6�����������r�k9��E]��ֿ�s����3�Y�t'�W�RGNz�\��B����j~�~�ۮ?�'#���~�X]-���ǻ����o��"�;��� ��cq�3^���qy��p�����=V�����8��O��C)�8G�;<�tx���/��#?��~{b�x�7�߄��?�)�__��cK��w�S���u�-�Ź%;��q6��)��E��4��WRp2b$��}��w�7b$1�Tp���=�<�՜,h$�	�[vS�3�;������j)���z�d1渜�{;euȯ�vR����,���ymfw���,���b/H��Iz��g��g��+���?lv���f���9[_��^�]�-v~���>��j�"�������E��RW����͠�8��=��}��/������U7�Z�����x��5!XI^��E�(�m�s��.��b��3	T���������X��q}6��>C4�=�+����5���|�r��3��|��^��ʇcq";)���c`���Ϊ@a/8�v
+�央/�v��չAj�Ԉ���.X2
+y
+�Z�AR�Н���&8���L�\�ʁk�罉�ZW۠��U0{����/���>��.8��M,��d_=vwz�#��<:Ǚ�BM�"�G�7x�k/�7i0������q��^��q*$*�3'��ҋV�ÐF�(��[?>�� q
+,5ҡ�Y�A��pc� v�/l���zG�S��Xu��N#���q��Ep����3�R����]v�Mi��Ϩ3h:�k�"�iir���b$�Ǫ�J�1���Ȝ�X�
+	������F�^#B��f��ԗ�oo��q��:�R���
+��a��鴭Q�:���`q�U��IΫ`��`��h�*L�`ѡH�qB�[��H,�����:T�KQ�=ܛ֊���k��b���N}����9������w��a��0&g�R�QA�dI2�D��Ӝ��Wx��at>�����¢2j�c?��R�D��&�T��"���n,��y�5b���ʸ��R�Ւ��&|6c]�t�Ä�u������#��h$�|�����0L����UB��Q��T��بP�"aз9�܋�z�U�
+����S^��Z���^�
+�cG������
+�?މ���l���p����t����J\/sB�?��S
+�����X\�����̻4»�YbB�\�^�q�3H]L۝�蠊r9a �D��4s^%��ಌ�h�1�Æ*&Ut�yvQ�1D_n#�� ESL�d��)�b�����Ôf*�v�Db��:�.���ҒɊ��׵Gv���x��A:�d��.�U0���:1Y2>�2L�P�tWՏ�H�YZBΡɦ����ߴ�ACv9⦡�CI\�_��N��H8�5��YЦC��%�.��$���x�O����h04�T�=#@i�8���;���2E�����Ox���nO<��I+�X�����K݇�ʺ�Q/�<ɗ��#�W��?��[)$+�\�����*p���Mi��*b�C�b��K\C��$r�/�N�"�2�01o�L�\�=���5�@e��U�T�28����)ߦcb6��^��.�H�$�U��T�YՁGB`<3�2�]b�4��AN%�<71WɊ�>�c�b2* k�@���6�i���U�b�mDA�C����H*I%=�HpXH0,�`l�q<�`0&�>�>ԭ�{ٽ�c&��Zu�T��q2��j5\��w���V��Ƌ�xZ���ĺ�uqAʴ��9
+0�F�ٔn�:�x�rsः��#��ba�uޛp_dO�*v�k��)�d�Ep�N���]
+S4v��w�\8)��eC�h�;Z۰P��*Je톚I�Z��������yu��1�̄T-�
+����7�v5��R1*�d��%#�
+����$u��UF�D
+8�@G�
++�g���
+���
+��z��g�ʢ(EF�
+��q����Y��FpqMNtrwlA�t��
+��Ċ\\{�����Q��dF�a
+�N�^�c���.LX���	?5욊zJg`��}���3NFg����!,)3[pO.�@g
+�]'j�Q/~.4؋!dPL�6^���@!�T]�\w��
+l �B�"�T�y�[!��%��p	���������>�}���݄=�VσJ�%�)��
+Ȓ$�� U�؛p��|J����~{��\�!���'60+���b!�:L�XX@e_�45���S�q�RtUǴ�ˤ�DԈp���{c0�	-�m�
+~/}YQ\�,%
+'�(�/�WF}fs�b6�}��dǢ�
+��]���K�oǌ5��������s3����?/��+?��b@����S��
+����8_����!4��d,Y�;Y�M/#�n���q�2��j��^��]J?��~����D�1(��h�j���\�8?j��f#�b��W�p���2���a����Z��u��W(���f�]<ٷ(7��{��?Oŗ��tL�բ"�,��x��`a�
+R�Xʧ��Y;�&RA
+�#\[r�M
+� �z
+?A���!-��!��<!8�$`g� 㑝�����0�����j�;��-�}�nU�C�:�Z�8���f�j�s5���<��c0�`-+��$AU��^��#��ܥ�4�4�R3ו��	��c�>��c6���׳��D\�VBm6��B�*�{4�H�+�G5�Sh���2��-��si�����2���e�v�.I�h0�
+h5�Ĩ��$c?�f�d�oՐ��3�h�k��s������
+�.QР�i��ZP�	/��C��6j��M�4-�t�v�p�+XQ�da�5�dieI����f*F!c	\�7J�g^�����T�L��n����.�O�Kn��V�BV1���ю�x]�7��㞀�Ιz�BE����{ 5�r�Y��8�B�Ġԥ_1�B`���۰Q(�j?_��!����X^f�}n�R�jd֮ CUta��!?��w)��&�h4��O- V�V���1�o;j�X�b#V��gʪ��/�HI��z@�Na7La��E7"��k�����u��"ع*�	3�����|�7���e1��ӭ�>���9NQ��@j��Lm�BnN#3@��
+���&�)�[�Fʨ
+MYxq:t�2i-N�����5�"�V`�"��^$�]��`D*�
+=VQNp�(�5	�1W8c)Ռ�U��W2�&���>���ik�B��P+^!ܟQ�:���U�f��l�@d�.+G0>5��t�6��M�z�g��87�S�m
+�W*.Zf�׵ �ϐ�����gb/s�ԩ$�E�q���*k#P����X@�
+��~��"/��R\�E���$�umM������|��L�Xӆq!L��������n*@�
+���qb����$/3��}ԽFxZ��@��$����Y3����&z��mօ���t��<�3��Up%�*�h���
+�u��	�Y�����>��U^y���]���J��>��U��6��6���y]ض̆¬s��E��E�;e:���R����ˍLk�{DSJ�0rzU��-�1���S�I�%�
+M��5�q��`��
+�� ���^��}J̑r��U���O!5�I�ٽ�;��aP�Z�Ȉ�5�R��ߔp
+�)MɎ��݊1�)e
+B۶h5QPB(�B�P,��J�	7�˄s[�Ҳ����z@Iэ��	�1L(t���b�sB6
+f�j��L/ 9f�[��
+��b+8��]�F��h^2n�ub��L��3�9|1S}_<]�@_�ьI��'��a�
+�e��R�F�#�~"��+M����A-��2�����$�)��8�p�؛VIM���Ke�CH"91�>�"o4Wļ5G)r��!C�U�i0F�6��rS�	�)7���A�#�����kaha�fau@���Fb����N*��XoU/��4ς���U�{n�d����
+ �G������d���<͙�0����o@7\Y��$I���D@JrS�C���!C	Y�q]��.�@��<����v"2�9@����_~~��G1�e&��8&�ҽG��~Y��F�A��mA�|us���~8r��v�7gOcx����z�����p���7�W�ɳ���&,gr��/
+
+�A�/JdkHQ��i�CJ�if�Pw��m	˟��/l�,e�~��?��.�Y;�C�9�[
+�W�%�di�o�N�n~�]�������)�'r�,�[1�����{�x���p�W:��tu}���0&���/!�$���:Ez��B����&3z�1b�s�4�-��
+�̬;�) I�/:�bF���(X�F��gd��Ls5��i�:/ҕs�Kz�[p�u�u����@PcNv0�9n�K��(�N��Z�4x>#E���jC����Ƨ@�m����n�C/ ����Q�BeVc��.���y�d'��eǖ@�}�ny�����
+���3kf!z�*#��P�i���Dq\Sw��
+�u#N�=�8⾒�ƳR��������j��@�!�C�b�!Md�N�%,ը��sn�����,�b�qbőX�B���1p�֔&q_&���12���G����<��߯~|	�z��n��i��p���V�rN~����D��1t����f���4������fu�zvs���uR����t�-�v�5���m}H�O˫Q�P�
+*�;V���L�a�]ъ�
+	ԳS_XQ5q7Q/��R����m�L��i�R�`~��
+a��j�'�m�h3}uuuv�;_��9;�Cvx�U�"�0��M�A
+��Ԋ&������7�pY	���1���u
+5Ym.����ص1abJ���Y��tl&r�n��k%�W��p8�a�DS�9 
+��~���4h���C�kL݃���.e�����]M=�ߵ��!
+&�HR *���!��
+vh\^��	t&2�j�	�hj��"H���xZ������|)
+s[]E`���gG���ӣc0%��}����t7���p��)~�ƌ
+ar2��뮰"�fu ��{ �
+?b
+���u�ϥ�4pg�������f�#��6�O~��oE�*Y9�V3V�[��q��܈6n���|w���|���ٻ����|7���	�e����~�l�
+��y�z�"D�q�ʇ��@W���5�]���}�+~6�
+d.�;��!W=�\u�tA.��򣐋�\�Q��O�\���=^��W��Bj��<���1�?�X�s2�n�'=����vP��`,�0��ߺ��[�\�����v�ߝϋ����N
+Z{ѝ��A$3hG<4���³��,"U_�@>�5Т�R
+�r��'��8=��'�;�AC`g�������e�R䃃S�>8�\�	�IxK��$�C���,��HV�����{]*SS��!nkX�B"��֒Z�+c�|� �7�l=v/.��0S3�8�O�֥2Y#�{�
+'�~��0���萉�NL�Ќ�ZL�j���vVc�>���l�����
+���a�b�ս�'�Ql����ތ�S7�����8�;'�h	8����p+[g�����H�h�>f��+����n^|z:���Y�_���v~Aڙ�AW!{��Bީ0bf=ؗ�
+�����D:��$
+(�I>�\���U5���Z5%�.蠖FL��M�8%ӡ1�Y�}���Qv۶υ�I�Ke�J��0��0�r0IEʋ�5Ő�K��:bʮ���ڋ���e�3�Ev�er����:�lf��~3%����W�h /�
+�|�ԤI�`��d;`q�lqt��fޔm�N4�����4 ם��I�H]�\{�~ɡ�At�$���8M�x�������n�R�,˘u&�c��@%���XV�&���:~�[7�|kµ9)�Rײ��Hz�8yx&�g-�SOS�t��j���I�u�j��~�MĎ���5�ڔ�C��Z��S���b��UvJA����`�K&׼N��^0�碚�w���a8^.�C��g�J{�Ƶ����2@L�Z^?�]�t^�M0(03[M�:�!+ɴ����K^�l��q��W$/yy���|���CT�9�g�]�����+����N��x:���@}�}W��v�_pje��gB�
+�/�
+����RJ�&�1��2s�끤BO� N-q�[�oe���zF�@C�x�Mu-􂵒�]�/J�r����پ2��wA�*�6�����iCuY!�4�TAe|MҶ/�!ŭhA7�3�
+���.ʬG5���=���>$-n4�*,t1'}�`>��]f(��C"�3=�s�+fj����������>A��W��AEh']7��d��@������c�jz7�Q<
+�,'CsZ6ᕊ[�Z�sϐ��R}i�o�]7���������Rڞ����qd�����h	���^\1� �V��{w�-�Ս����L�A2;O&3���H<�;�H	*$_�PB,ǥ�:�f��s���I�9��W�kw�K����f/��a�%�6]��J��!�jA��.�m\�\�.�
+jIl�
+
+f��zd��eॐ�z����{-��G�G�(�%0�k	tK`�����z�Q���V��jCk���U��ЙB���гn	�.�q�,j�6�W�(ί��ؑTJhl��)f����Qq>S�we
+���~�=��9y��.j���]��[�xQ�7w���ޭ���O>��a6J�Qr��[؍���z�qb�����N�ƃBi��Ƥ�]N�ɇ(����ig;�^��U4�����hP=N����$�����e�F}�Z8�c�]��8ʗNf§�26��5:f��f��ga�=�{�F�yc�W�Q6H�sb�]�c�q�ON^��F��U���$ΐ�Gy�~���^q�@L���Gs"��R������Qj�7�0t���AH��G��9���|���|��k�{qn#����VD9��sr����c�Ɯݓs6�>>7��]�HW���9N�[�#���Q�@�q�=bb�z�,����m7�dvs�v��^wT#Ĺ���,!^�9 
+-�'}]�)�4�\��3u{b�NW��:��;�(�>��[/����׉�����~�&;d�#�C~��}����|��*��hD��qF3�%��f����1�vO;ʣ���O[�[?��
+W<�'q�e|���:ui�����x�B�[;�
+i�#������]I>�?��d��w�*)��:�B^��d��Ԏ^�%1�	��;����X�q���b��
+��NP�y����/>ū4^��y'hN�#@蛾M�0�:@c2��\���ph�o T�Sw�= �����xh�P�B�M!e�g${h�_>|�f���b��*7��q�d��9o���z/��Y���	~p|=?[��!��,��鎉Am�v�u/M�1[�0(v[ܞYe�x��W�[��8B�e�pt9]��5��3�7��G"�[e�{�X�0�M(>σ)Ć)�
+SX��t���y5�8*6;^g��G�������3��ªy�\H'�(�L_Q�#���<PιU��t��m(����N�.���`�
+v�m��=O�M�U���B��
+��];u�t��J.8_fn1��t�[�eA��QhOm
+���;�C�/��&<O�@�Ǚb
+*�/�߇()s��]�����."�nPCfV.gXg8˿O�R�@���E����!FA�)n�3W��i���V6��6EmSԞd����c�1O�7�
+olx�I򆯨VQ=��@�ʹV\!e�tq{
+�8`����W,���+�u�/�L���0��%��\RӋRS���#����<����,�$�t��-�A�ΐz�h�;%�JK�M�AZu-
+�-{x`8��srB�b��~	^Ox�ۀ
+�9��
+���e�b�X�W,
+endstream
+endobj
+188 0 obj
+<</Filter[/FlateDecode]/Length 6788>>stream
+H��WkO�����/�@��~?���/���F��#˺v��x��v�OU����.�#ɍ̊e��>]}��T5�����gb�����4{�޾�l�
+����ooM����1��b;�Uu�^W�.����c6y����1��MK��&�b�����l�O�[;��I�~�k��E���;s6�f���������ǽbq�`��٢�)��}I��
+�l��h���6��e�)֛�����E���ļh.h������,"��KJ<���O�z�C�o��0^\U���4/�_V�4Q�EWqI�K��WHh�%<.�N�?xH��k� Mmv�?�~}V����_ѐ��__-��,�G���i	�vXTeۖQtO�o���#X�j�Y~�K}�	I�_lo�J����m�/�'�E)T��=CP�{�m֯9z1eG�|XeE�rl`�F@�e�����*P���JgIX��z�|ዦ,�~�.(7�WH�Bȗ�a���bX�����\g��7}�VO���biC�xf�ru�w��/�3h�@�
+Ή$
+����/#A�:,�Q����18%�R�
+W�(ܤ����	�1����qd��� ��Xp�H��O"9�?tL�W���B���֤��{�TgL�&颩���n�jQ�q��Gi�y{0���c�@"Q#-n���h��C�zgqh��y
+�G AT"����ZКH���X[��y���Hx^b;咊�)�(�P�磀7�L�]���Rz�
+=H6��+%Ǽ�}��u0�,
+�ں�2�Kk����t�,=�'�"���7�{A*ql�'O�3�cI`x�0R'���AF)�NRȨNV*���,��e�74+	����jV�}��a�e%K���
+���� ZR��Ag͊K�d�����oyO�4�
+��LtcNI��s�26��2i��?˶P�Rލ�96/(��<sd3P�k�**+�  X\��~��L��,ׂp�C�ࠃ�>M��9M���z4�ߚ��E1�*�?,��}mT@,ZI;ʱϰ�
+5
+�
+�7�6
+l=��V���)t��n�|��׆�|L��g�^�o��oH8��0���B
+�[.Ml���+A����K-��0��!Vc�C
+�2����=ntqY�hUs�����x��<fS?�S��Rg"�}xŶ�z�����
+Fj���i�%�U~�8�����_HZ���3%��gξ��Ʉ�����/?�(�<��>�d�7~�D��M*���.�;.�g�d���=�$����$��jF�4-����N��ʻZ+�G!�����{y������c(y��@4�z�o�r�����j�������;�*�E��3�=�"7A|�|�6�OY����G%ۤy*��W_�(��7����^���u�ֵ�Y�vD�����B��U,��
+�"£̝��b�����4�x9��\�eCV��k�?W��2aD�w�R�xS�N�n��S碌2	�h�W�;t��99���U������3���U~�>�����
+��cȄ3"��}���sy��_�z�U�rA�H)��F����g%.����3o�W]'i(򊔪��`������G���q�,��%"���j��յ[R���� {A��J��d�ǋO�B���
+BP���g�˄�y�.2?3�T~V4
+��{�x��J{�E�o�����(܈�t(��VdK���&�jx=��K�T�\��8n,q�r��:�\<��h�Q��[Ό�6��4]н�gw��{d�+���'v��v�D�~FUh��6���Y=/$]9�(s��R�md�b�D1̀i)��Z�vI(c�Q���}��Z�_6]�����
+��]2
+� �=����
+� �=����
+	_>
+5
+��쥆�a.I�T7�8M9
+Pkc.��u4�(�r�2�ͨ�r��-�A�ͯ4��V�7�Ȼ'v��v�D�~FUh��6���Y=/$]9�(w��R�
+���4�b��R3ĵ��P� ��W��/��l8��/�%!���d
+�f�뻤
+H@w�T.Hb��KA�DDv�i饠�h��6+-
+��t2�'#�slmW�`k`�UZ��nD
+S:PV#��B·PC���8{��j�K<Ǎ� NS��Zǘ�gx
+5
+�|��8o�)z��gw��{d�+ͽ��2���z�]!���Q$��D6B:uV�IWE0��#���Fs�J�$�aLKQώ�KB�ȎJ`��_j!�ٰt]_�K.B*\��]B
+H@{�T.Hb��KA�DDv�i饠�h��6+-
+���7M'C甮�X�`k`�UZ��nD
+S:PV#��B·PC���8{��j�K<Ǎ� NS��Zǘ�gx
+5
+��x�8o�)z��gw��{d�+ͽ��2��=��j�AH$�gT��l3���N���BҕC�2��H,���օ �I�����!�}y�%��AdG%
+0��/��l��/�%!C��]B
+
+�f2��8������J�
+qjQ�n�����B��'���$ʅ<ru�j��5�;�g��+^��x��ȎI�r�<��ȑ0��aK��\�x�<
+Bl��$z�m$��|B`�J*\�[��Y�]߃{)��%2��
+���d�{�n�q6�$@�q�����P����G!N-*�y����W���{u�D��G����_7�;�g��+^��x��ȎI�r�<��ȑ0���X�`S��w�OFS�y�(�m����g�ef��|Bh�Jd�2��2"<�h�
+endstream
+endobj
+189 0 obj
+<</Filter[/FlateDecode]/Length 3958>>stream
+H��Qo�8����0@q@�E�4I�ۧ�6)\���vPd:
+*K�$���?��m�ĉh4m��0���6"E��;�_�X����?����/�v:��[�)R��{��}^����NgV/��5X3��e��?@|����j{�ҿ�������������_�Kn�J2���?�x�g_8�,��7�~ךm����D��ebGm���Q�L�c�Sf���2�
+x��������d)�^��f1��	�B����W"�I�b�F�L+�!�����P���^,�����\��5�Y�w�Pzi�Sp�[�]o�j%�Z��2cA�`[֮�ڀ��l7ˬ���F�-�7�P�)~
+�Fbt��윌��rw�z�ih���.%^4�8�$²yc��b�b�<2"��io0�S���5�l`���� ��$M@nx��|�y�7���	�?I2���U���N��9�5�����qZ����:���W����		�y��csARL�S���?@L��M�*�U4��D[��}dT7��Xi�^ADc�^���ނv��W�����`O�I�h�)���(�<Y
+�ןc~L�*�N*��4+�o�ϴ�p�(
+�r�݋eX��]c�a�gE���Z�[�~���j
+zʌ�e�	lY$Ų˳!�,��6O
+�l�B���i(���u��s2.��M�Ѧ��"�M01m'*�7���,�+��##R�.A��C�8�YJ_���A
+W���Ɍ$��#�����J��
+"�����;X����}�Ş\��ѶS3�WQy�@�?���&U�TV3iV�ȟi��8Q^�&�14�� �:�7׻ưè!Ί
+���c~LC+�-��4+�o�ϴq�(�h���D\�ތB'մ��R�
+�!��ɸx(�;�G���J��+P0N�زy0��߱[9p
+czam��{��aO����Ԋ�S�j&͊��3�@� ��?�1��C��7�й/e�p��윌��r��z�ih�-)�V^��,��(�����ó��Yw�]e[9�ʁV�r�����r��������׭�k�@+Z9�ʁV�r�������`؏���h�@�Z=��V�z�������bp�rz࢕���
+�k�����X(���)���-z�p�J�=e��&�r�:�
+�jφp�̪�<m4زyC[!�
+AW~5ao0����ENH��l`���
+W���Ɍ$��#�򮯟�ezv�r����nD��� ����K��r`rMjM�Na�/,�^ou9��R
+��*��iS+C�4g)�g��/���v���N��9�5������Z��ٶ�������		U�y�sIRL_S���Z<BF��]�r�rMf���p��d��ڠ�"���%���������}蜍����.��7�δ���
+ՖG�XI�W�g~L3�gVa��k�/����(��;��ZݫeX=��M�@�
+d���d��}Xn-�ހ�q[�Z�%�,�vi��7/}W��[7���3<�j#1�QP��R�Q�nގ6����)|h��h�Qͼ3�B�\�u��w��t�\�Ʃ*s�BU�����z!�9�s�
+���2ZJ�3����KlY$����n^��J
+�n�B�gx48�Fb���읥ݼm+a5R��$�Ѷ��yg�,3���*2"��� �
+�SU��n ��B�s��& �yD�|��� ۀn�D����X�����Ho;���sLk����3�y�muE�����.����璤����?N%�x��މ�����X�-��>3��4M�A�E47K(�qoA��e�������%���Ipv�0�!u�m�8�����rouy싕z-z��4�Xpj�+���G�B+�!���f�/nK���qG蔞��]ʾ�9DA�;K�Gy�y;�<6V��TX��b��ͣQ��}����� �(=Қ'5�����w ��4�W�(�z$���T<ʗ��[.�Ys�.�(��#�h)�̌[��\b�j��wл=;���B�Ui����;Bx��'y���.
+Yfp��UdDJ�%
+�Ar���]��$u�:
+@��� �0T���'�
+endstream
+endobj
+162 0 obj
+[/ICCBased 170 0 R]
+endobj
+190 0 obj
+<</CreationDate(D:20090527042239-04'00')/Creator(Adobe Illustrator CS4)/ModDate(D:20090730214335-05'00')/Producer(Adobe PDF library 9.00)/Title(colorbox)>>
+endobj
+xref
+0 191
+0000000004 65535 f
+0000000016 00000 n
+0000000076 00000 n
+0000048436 00000 n
+0000000005 00000 f
+0000000006 00000 f
+0000000007 00000 f
+0000000008 00000 f
+0000000009 00000 f
+0000000010 00000 f
+0000000011 00000 f
+0000000012 00000 f
+0000000013 00000 f
+0000000014 00000 f
+0000000015 00000 f
+0000000016 00000 f
+0000000017 00000 f
+0000000018 00000 f
+0000000019 00000 f
+0000000020 00000 f
+0000000021 00000 f
+0000000022 00000 f
+0000000023 00000 f
+0000000024 00000 f
+0000000025 00000 f
+0000000026 00000 f
+0000000027 00000 f
+0000000028 00000 f
+0000000029 00000 f
+0000000030 00000 f
+0000000031 00000 f
+0000000032 00000 f
+0000000033 00000 f
+0000000034 00000 f
+0000000035 00000 f
+0000000036 00000 f
+0000000037 00000 f
+0000000038 00000 f
+0000000039 00000 f
+0000000040 00000 f
+0000000041 00000 f
+0000000042 00000 f
+0000000043 00000 f
+0000000044 00000 f
+0000000045 00000 f
+0000000046 00000 f
+0000000047 00000 f
+0000000048 00000 f
+0000000049 00000 f
+0000000050 00000 f
+0000000051 00000 f
+0000000052 00000 f
+0000000053 00000 f
+0000000054 00000 f
+0000000055 00000 f
+0000000056 00000 f
+0000000057 00000 f
+0000000058 00000 f
+0000000059 00000 f
+0000000060 00000 f
+0000000061 00000 f
+0000000062 00000 f
+0000000063 00000 f
+0000000064 00000 f
+0000000065 00000 f
+0000000066 00000 f
+0000000067 00000 f
+0000000068 00000 f
+0000000069 00000 f
+0000000070 00000 f
+0000000071 00000 f
+0000000072 00000 f
+0000000073 00000 f
+0000000074 00000 f
+0000000075 00000 f
+0000000076 00000 f
+0000000077 00000 f
+0000000078 00000 f
+0000000079 00000 f
+0000000080 00000 f
+0000000081 00000 f
+0000000082 00000 f
+0000000083 00000 f
+0000000084 00000 f
+0000000085 00000 f
+0000000086 00000 f
+0000000087 00000 f
+0000000088 00000 f
+0000000089 00000 f
+0000000090 00000 f
+0000000091 00000 f
+0000000092 00000 f
+0000000093 00000 f
+0000000094 00000 f
+0000000095 00000 f
+0000000096 00000 f
+0000000097 00000 f
+0000000098 00000 f
+0000000099 00000 f
+0000000100 00000 f
+0000000101 00000 f
+0000000102 00000 f
+0000000103 00000 f
+0000000104 00000 f
+0000000105 00000 f
+0000000106 00000 f
+0000000107 00000 f
+0000000108 00000 f
+0000000109 00000 f
+0000000110 00000 f
+0000000111 00000 f
+0000000112 00000 f
+0000000113 00000 f
+0000000114 00000 f
+0000000115 00000 f
+0000000117 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000000000 00000 f
+0000051202 00000 n
+0000048489 00000 n
+0000048844 00000 n
+0000049045 00000 n
+0000061445 00000 n
+0000058207 00000 n
+0000050103 00000 n
+0000049109 00000 n
+0000231123 00000 n
+0000049538 00000 n
+0000049588 00000 n
+0000055520 00000 n
+0000055406 00000 n
+0000051720 00000 n
+0000051805 00000 n
+0000052189 00000 n
+0000055557 00000 n
+0000058244 00000 n
+0000061521 00000 n
+0000062006 00000 n
+0000062952 00000 n
+0000069751 00000 n
+0000084919 00000 n
+0000102822 00000 n
+0000111395 00000 n
+0000126519 00000 n
+0000132206 00000 n
+0000141391 00000 n
+0000143749 00000 n
+0000159943 00000 n
+0000177431 00000 n
+0000183301 00000 n
+0000187819 00000 n
+0000205653 00000 n
+0000220229 00000 n
+0000227091 00000 n
+0000231160 00000 n
+trailer
+<</Size 191/Root 1 0 R/Info 190 0 R/ID[<7EB5FF43BD08164184F35B8300F050C9><E617EB833E197F43BC059F7255614CEE>]>>
+startxref
+231333
+%%EOF
diff --git a/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js b/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js
new file mode 100644
index 000000000..9db7adf75
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js
@@ -0,0 +1,4 @@
+// ColorBox v1.3.19.3 - jQuery lightbox plugin
+// (c) 2011 Jack Moore - jacklmoore.com
+// License: http://www.opensource.org/licenses/mit-license.php
+(function(a,b,c){function Z(c,d,e){var g=b.createElement(c);return d&&(g.id=f+d),e&&(g.style.cssText=e),a(g)}function $(a){var b=y.length,c=(Q+a)%b;return c<0?b+c:c}function _(a,b){return Math.round((/%/.test(a)?(b==="x"?z.width():z.height())/100:1)*parseInt(a,10))}function ab(a){return K.photo||/\.(gif|png|jpe?g|bmp|ico)((#|\?).*)?$/i.test(a)}function bb(){var b,c=a.data(P,e);c==null?(K=a.extend({},d),console&&console.log&&console.log("Error: cboxElement missing settings object")):K=a.extend({},c);for(b in K)a.isFunction(K[b])&&b.slice(0,2)!=="on"&&(K[b]=K[b].call(P));K.rel=K.rel||P.rel||"nofollow",K.href=K.href||a(P).attr("href"),K.title=K.title||P.title,typeof K.href=="string"&&(K.href=a.trim(K.href))}function cb(b,c){a.event.trigger(b),c&&c.call(P)}function db(){var a,b=f+"Slideshow_",c="click."+f,d,e,g;K.slideshow&&y[1]?(d=function(){F.text(K.slideshowStop).unbind(c).bind(j,function(){if(K.loop||y[Q+1])a=setTimeout(W.next,K.slideshowSpeed)}).bind(i,function(){clearTimeout(a)}).one(c+" "+k,e),r.removeClass(b+"off").addClass(b+"on"),a=setTimeout(W.next,K.slideshowSpeed)},e=function(){clearTimeout(a),F.text(K.slideshowStart).unbind([j,i,k,c].join(" ")).one(c,function(){W.next(),d()}),r.removeClass(b+"on").addClass(b+"off")},K.slideshowAuto?d():e()):r.removeClass(b+"off "+b+"on")}function eb(b){U||(P=b,bb(),y=a(P),Q=0,K.rel!=="nofollow"&&(y=a("."+g).filter(function(){var b=a.data(this,e),c;return b&&(c=b.rel||this.rel),c===K.rel}),Q=y.index(P),Q===-1&&(y=y.add(P),Q=y.length-1)),S||(S=T=!0,r.show(),K.returnFocus&&a(P).blur().one(l,function(){a(this).focus()}),q.css({opacity:+K.opacity,cursor:K.overlayClose?"pointer":"auto"}).show(),K.w=_(K.initialWidth,"x"),K.h=_(K.initialHeight,"y"),W.position(),o&&z.bind("resize."+p+" scroll."+p,function(){q.css({width:z.width(),height:z.height(),top:z.scrollTop(),left:z.scrollLeft()})}).trigger("resize."+p),cb(h,K.onOpen),J.add(D).hide(),I.html(K.close).show()),W.load(!0))}function fb(){!r&&b.body&&(Y=!1,z=a(c),r=Z(X).attr({id:e,"class":n?f+(o?"IE6":"IE"):""}).hide(),q=Z(X,"Overlay",o?"position:absolute":"").hide(),s=Z(X,"Wrapper"),t=Z(X,"Content").append(A=Z(X,"LoadedContent","width:0; height:0; overflow:hidden"),C=Z(X,"LoadingOverlay").add(Z(X,"LoadingGraphic")),D=Z(X,"Title"),E=Z(X,"Current"),G=Z(X,"Next"),H=Z(X,"Previous"),F=Z(X,"Slideshow").bind(h,db),I=Z(X,"Close")),s.append(Z(X).append(Z(X,"TopLeft"),u=Z(X,"TopCenter"),Z(X,"TopRight")),Z(X,!1,"clear:left").append(v=Z(X,"MiddleLeft"),t,w=Z(X,"MiddleRight")),Z(X,!1,"clear:left").append(Z(X,"BottomLeft"),x=Z(X,"BottomCenter"),Z(X,"BottomRight"))).find("div div").css({"float":"left"}),B=Z(X,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),J=G.add(H).add(E).add(F),a(b.body).append(q,r.append(s,B)))}function gb(){return r?(Y||(Y=!0,L=u.height()+x.height()+t.outerHeight(!0)-t.height(),M=v.width()+w.width()+t.outerWidth(!0)-t.width(),N=A.outerHeight(!0),O=A.outerWidth(!0),r.css({"padding-bottom":L,"padding-right":M}),G.click(function(){W.next()}),H.click(function(){W.prev()}),I.click(function(){W.close()}),q.click(function(){K.overlayClose&&W.close()}),a(b).bind("keydown."+f,function(a){var b=a.keyCode;S&&K.escKey&&b===27&&(a.preventDefault(),W.close()),S&&K.arrowKey&&y[1]&&(b===37?(a.preventDefault(),H.click()):b===39&&(a.preventDefault(),G.click()))}),a("."+g,b).live("click",function(a){a.which>1||a.shiftKey||a.altKey||a.metaKey||(a.preventDefault(),eb(this))})),!0):!1}var d={transition:"elastic",speed:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",xhrError:"This content failed to load.",imgError:"This image failed to load.",open:!1,returnFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:undefined},e="colorbox",f="cbox",g=f+"Element",h=f+"_open",i=f+"_load",j=f+"_complete",k=f+"_cleanup",l=f+"_closed",m=f+"_purge",n=!a.support.opacity&&!a.support.style,o=n&&!c.XMLHttpRequest,p=f+"_IE6",q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X="div",Y;if(a.colorbox)return;a(fb),W=a.fn[e]=a[e]=function(b,c){var f=this;b=b||{},fb();if(gb()){if(!f[0]){if(f.selector)return f;f=a("<a/>"),b.open=!0}c&&(b.onComplete=c),f.each(function(){a.data(this,e,a.extend({},a.data(this,e)||d,b))}).addClass(g),(a.isFunction(b.open)&&b.open.call(f)||b.open)&&eb(f[0])}return f},W.position=function(a,b){function i(a){u[0].style.width=x[0].style.width=t[0].style.width=a.style.width,t[0].style.height=v[0].style.height=w[0].style.height=a.style.height}var c=0,d=0,e=r.offset(),g,h;z.unbind("resize."+f),r.css({top:-9e4,left:-9e4}),g=z.scrollTop(),h=z.scrollLeft(),K.fixed&&!o?(e.top-=g,e.left-=h,r.css({position:"fixed"})):(c=g,d=h,r.css({position:"absolute"})),K.right!==!1?d+=Math.max(z.width()-K.w-O-M-_(K.right,"x"),0):K.left!==!1?d+=_(K.left,"x"):d+=Math.round(Math.max(z.width()-K.w-O-M,0)/2),K.bottom!==!1?c+=Math.max(z.height()-K.h-N-L-_(K.bottom,"y"),0):K.top!==!1?c+=_(K.top,"y"):c+=Math.round(Math.max(z.height()-K.h-N-L,0)/2),r.css({top:e.top,left:e.left}),a=r.width()===K.w+O&&r.height()===K.h+N?0:a||0,s[0].style.width=s[0].style.height="9999px",r.dequeue().animate({width:K.w+O,height:K.h+N,top:c,left:d},{duration:a,complete:function(){i(this),T=!1,s[0].style.width=K.w+O+M+"px",s[0].style.height=K.h+N+L+"px",K.reposition&&setTimeout(function(){z.bind("resize."+f,W.position)},1),b&&b()},step:function(){i(this)}})},W.resize=function(a){S&&(a=a||{},a.width&&(K.w=_(a.width,"x")-O-M),a.innerWidth&&(K.w=_(a.innerWidth,"x")),A.css({width:K.w}),a.height&&(K.h=_(a.height,"y")-N-L),a.innerHeight&&(K.h=_(a.innerHeight,"y")),!a.innerHeight&&!a.height&&(A.css({height:"auto"}),K.h=A.height()),A.css({height:K.h}),W.position(K.transition==="none"?0:K.speed))},W.prep=function(b){function g(){return K.w=K.w||A.width(),K.w=K.mw&&K.mw<K.w?K.mw:K.w,K.w}function h(){return K.h=K.h||A.height(),K.h=K.mh&&K.mh<K.h?K.mh:K.h,K.h}if(!S)return;var c,d=K.transition==="none"?0:K.speed;A.remove(),A=Z(X,"LoadedContent").append(b),A.hide().appendTo(B.show()).css({width:g(),overflow:K.scrolling?"auto":"hidden"}).css({height:h()}).prependTo(t),B.hide(),a(R).css({"float":"none"}),o&&a("select").not(r.find("select")).filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one(k,function(){this.style.visibility="inherit"}),c=function(){function s(){n&&r[0].style.removeAttribute("filter")}var b,c,g=y.length,h,i="frameBorder",k="allowTransparency",l,o,p,q;if(!S)return;l=function(){clearTimeout(V),C.hide(),cb(j,K.onComplete)},n&&R&&A.fadeIn(100),D.html(K.title).add(A).show();if(g>1){typeof K.current=="string"&&E.html(K.current.replace("{current}",Q+1).replace("{total}",g)).show(),G[K.loop||Q<g-1?"show":"hide"]().html(K.next),H[K.loop||Q?"show":"hide"]().html(K.previous),K.slideshow&&F.show();if(K.preloading){b=[$(-1),$(1)];while(c=y[b.pop()])q=a.data(c,e),q&&q.href?(o=q.href,a.isFunction(o)&&(o=o.call(c))):o=c.href,ab(o)&&(p=new Image,p.src=o)}}else J.hide();K.iframe?(h=Z("iframe")[0],i in h&&(h[i]=0),k in h&&(h[k]="true"),h.name=f+ +(new Date),K.fastIframe?l():a(h).one("load",l),h.src=K.href,K.scrolling||(h.scrolling="no"),a(h).addClass(f+"Iframe").appendTo(A).one(m,function(){h.src="//about:blank"})):l(),K.transition==="fade"?r.fadeTo(d,1,s):s()},K.transition==="fade"?r.fadeTo(d,0,function(){W.position(0,c)}):W.position(d,c)},W.load=function(b){var c,d,e=W.prep;T=!0,R=!1,P=y[Q],b||bb(),cb(m),cb(i,K.onLoad),K.h=K.height?_(K.height,"y")-N-L:K.innerHeight&&_(K.innerHeight,"y"),K.w=K.width?_(K.width,"x")-O-M:K.innerWidth&&_(K.innerWidth,"x"),K.mw=K.w,K.mh=K.h,K.maxWidth&&(K.mw=_(K.maxWidth,"x")-O-M,K.mw=K.w&&K.w<K.mw?K.w:K.mw),K.maxHeight&&(K.mh=_(K.maxHeight,"y")-N-L,K.mh=K.h&&K.h<K.mh?K.h:K.mh),c=K.href,V=setTimeout(function(){C.show()},100),K.inline?(Z(X).hide().insertBefore(a(c)[0]).one(m,function(){a(this).replaceWith(A.children())}),e(a(c))):K.iframe?e(" "):K.html?e(K.html):ab(c)?(a(R=new Image).addClass(f+"Photo").error(function(){K.title=!1,e(Z(X,"Error").html(K.imgError))}).load(function(){var a;R.onload=null,K.scalePhotos&&(d=function(){R.height-=R.height*a,R.width-=R.width*a},K.mw&&R.width>K.mw&&(a=(R.width-K.mw)/R.width,d()),K.mh&&R.height>K.mh&&(a=(R.height-K.mh)/R.height,d())),K.h&&(R.style.marginTop=Math.max(K.h-R.height,0)/2+"px"),y[1]&&(K.loop||y[Q+1])&&(R.style.cursor="pointer",R.onclick=function(){W.next()}),n&&(R.style.msInterpolationMode="bicubic"),setTimeout(function(){e(R)},1)}),setTimeout(function(){R.src=c},1)):c&&B.load(c,K.data,function(b,c,d){e(c==="error"?Z(X,"Error").html(K.xhrError):a(this).contents())})},W.next=function(){!T&&y[1]&&(K.loop||y[Q+1])&&(Q=$(1),W.load())},W.prev=function(){!T&&y[1]&&(K.loop||Q)&&(Q=$(-1),W.load())},W.close=function(){S&&!U&&(U=!0,S=!1,cb(k,K.onCleanup),z.unbind("."+f+" ."+p),q.fadeTo(200,0),r.stop().fadeTo(300,0,function(){r.add(q).css({opacity:1,cursor:"auto"}).hide(),cb(m),A.remove(),setTimeout(function(){U=!1,cb(l,K.onClosed)},1)}))},W.remove=function(){a([]).add(r).add(q).remove(),r=null,a("."+g).removeData(e).removeClass(g).die()},W.element=function(){return a(P)},W.settings=d})(jQuery,document,this);
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox.js b/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox.js
new file mode 100644
index 000000000..28673a45d
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox.js
@@ -0,0 +1,926 @@
+// ColorBox v1.3.19.3 - jQuery lightbox plugin
+// (c) 2011 Jack Moore - jacklmoore.com
+// License: http://www.opensource.org/licenses/mit-license.php
+(function ($, document, window) {
+	var
+	// Default settings object.	
+	// See http://jacklmoore.com/colorbox for details.
+	defaults = {
+		transition: "elastic",
+		speed: 300,
+		width: false,
+		initialWidth: "600",
+		innerWidth: false,
+		maxWidth: false,
+		height: false,
+		initialHeight: "450",
+		innerHeight: false,
+		maxHeight: false,
+		scalePhotos: true,
+		scrolling: true,
+		inline: false,
+		html: false,
+		iframe: false,
+		fastIframe: true,
+		photo: false,
+		href: false,
+		title: false,
+		rel: false,
+		opacity: 0.9,
+		preloading: true,
+
+		current: "image {current} of {total}",
+		previous: "previous",
+		next: "next",
+		close: "close",
+		xhrError: "This content failed to load.",
+		imgError: "This image failed to load.",
+
+		open: false,
+		returnFocus: true,
+		reposition: true,
+		loop: true,
+		slideshow: false,
+		slideshowAuto: true,
+		slideshowSpeed: 2500,
+		slideshowStart: "start slideshow",
+		slideshowStop: "stop slideshow",
+		onOpen: false,
+		onLoad: false,
+		onComplete: false,
+		onCleanup: false,
+		onClosed: false,
+		overlayClose: true,		
+		escKey: true,
+		arrowKey: true,
+		top: false,
+		bottom: false,
+		left: false,
+		right: false,
+		fixed: false,
+		data: undefined
+	},
+	
+	// Abstracting the HTML and event identifiers for easy rebranding
+	colorbox = 'colorbox',
+	prefix = 'cbox',
+	boxElement = prefix + 'Element',
+	
+	// Events	
+	event_open = prefix + '_open',
+	event_load = prefix + '_load',
+	event_complete = prefix + '_complete',
+	event_cleanup = prefix + '_cleanup',
+	event_closed = prefix + '_closed',
+	event_purge = prefix + '_purge',
+	
+	// Special Handling for IE
+	isIE = !$.support.opacity && !$.support.style, // IE7 & IE8
+	isIE6 = isIE && !window.XMLHttpRequest, // IE6
+	event_ie6 = prefix + '_IE6',
+
+	// Cached jQuery Object Variables
+	$overlay,
+	$box,
+	$wrap,
+	$content,
+	$topBorder,
+	$leftBorder,
+	$rightBorder,
+	$bottomBorder,
+	$related,
+	$window,
+	$loaded,
+	$loadingBay,
+	$loadingOverlay,
+	$title,
+	$current,
+	$slideshow,
+	$next,
+	$prev,
+	$close,
+	$groupControls,
+	
+	// Variables for cached values or use across multiple functions
+	settings,
+	interfaceHeight,
+	interfaceWidth,
+	loadedHeight,
+	loadedWidth,
+	element,
+	index,
+	photo,
+	open,
+	active,
+	closing,
+	loadingTimer,
+	publicMethod,
+	div = "div",
+	init;
+
+	// ****************
+	// HELPER FUNCTIONS
+	// ****************
+	
+	// Convience function for creating new jQuery objects
+	function $tag(tag, id, css) {
+		var element = document.createElement(tag);
+
+		if (id) {
+			element.id = prefix + id;
+		}
+
+		if (css) {
+			element.style.cssText = css;
+		}
+
+		return $(element);
+	}
+
+	// Determine the next and previous members in a group.
+	function getIndex(increment) {
+		var 
+		max = $related.length, 
+		newIndex = (index + increment) % max;
+		
+		return (newIndex < 0) ? max + newIndex : newIndex;
+	}
+
+	// Convert '%' and 'px' values to integers
+	function setSize(size, dimension) {
+		return Math.round((/%/.test(size) ? ((dimension === 'x' ? $window.width() : $window.height()) / 100) : 1) * parseInt(size, 10));
+	}
+	
+	// Checks an href to see if it is a photo.
+	// There is a force photo option (photo: true) for hrefs that cannot be matched by this regex.
+	function isImage(url) {
+		return settings.photo || /\.(gif|png|jpe?g|bmp|ico)((#|\?).*)?$/i.test(url);
+	}
+	
+	// Assigns function results to their respective properties
+	function makeSettings() {
+		var i,
+			data = $.data(element, colorbox);
+		
+		if (data == null) {
+			settings = $.extend({}, defaults);
+			if (console && console.log) {
+				console.log('Error: cboxElement missing settings object')
+			}
+		} else {
+			settings = $.extend({}, data);    		
+		}
+		
+		for (i in settings) {
+			if ($.isFunction(settings[i]) && i.slice(0, 2) !== 'on') { // checks to make sure the function isn't one of the callbacks, they will be handled at the appropriate time.
+				settings[i] = settings[i].call(element);
+			}
+		}
+		
+		settings.rel = settings.rel || element.rel || 'nofollow';
+		settings.href = settings.href || $(element).attr('href');
+		settings.title = settings.title || element.title;
+		
+		if (typeof settings.href === "string") {
+			settings.href = $.trim(settings.href);
+		}
+	}
+
+	function trigger(event, callback) {
+		$.event.trigger(event);
+		if (callback) {
+			callback.call(element);
+		}
+	}
+
+	// Slideshow functionality
+	function slideshow() {
+		var
+		timeOut,
+		className = prefix + "Slideshow_",
+		click = "click." + prefix,
+		start,
+		stop,
+		clear;
+		
+		if (settings.slideshow && $related[1]) {
+			start = function () {
+				$slideshow
+					.text(settings.slideshowStop)
+					.unbind(click)
+					.bind(event_complete, function () {
+						if (settings.loop || $related[index + 1]) {
+							timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
+						}
+					})
+					.bind(event_load, function () {
+						clearTimeout(timeOut);
+					})
+					.one(click + ' ' + event_cleanup, stop);
+				$box.removeClass(className + "off").addClass(className + "on");
+				timeOut = setTimeout(publicMethod.next, settings.slideshowSpeed);
+			};
+			
+			stop = function () {
+				clearTimeout(timeOut);
+				$slideshow
+					.text(settings.slideshowStart)
+					.unbind([event_complete, event_load, event_cleanup, click].join(' '))
+					.one(click, function () {
+						publicMethod.next();
+						start();
+					});
+				$box.removeClass(className + "on").addClass(className + "off");
+			};
+			
+			if (settings.slideshowAuto) {
+				start();
+			} else {
+				stop();
+			}
+		} else {
+			$box.removeClass(className + "off " + className + "on");
+		}
+	}
+
+	function launch(target) {
+		if (!closing) {
+			
+			element = target;
+			
+			makeSettings();
+			
+			$related = $(element);
+			
+			index = 0;
+			
+			if (settings.rel !== 'nofollow') {
+				$related = $('.' + boxElement).filter(function () {
+					var data = $.data(this, colorbox), 
+						relRelated;
+
+					if (data) {
+						relRelated =  data.rel || this.rel;
+					}
+					
+					return (relRelated === settings.rel);
+				});
+				index = $related.index(element);
+				
+				// Check direct calls to ColorBox.
+				if (index === -1) {
+					$related = $related.add(element);
+					index = $related.length - 1;
+				}
+			}
+			
+			if (!open) {
+				open = active = true; // Prevents the page-change action from queuing up if the visitor holds down the left or right keys.
+				
+				$box.show();
+				
+				if (settings.returnFocus) {
+					$(element).blur().one(event_closed, function () {
+						$(this).focus();
+					});
+				}
+				
+				// +settings.opacity avoids a problem in IE when using non-zero-prefixed-string-values, like '.5'
+				$overlay.css({"opacity": +settings.opacity, "cursor": settings.overlayClose ? "pointer" : "auto"}).show();
+				
+				// Opens inital empty ColorBox prior to content being loaded.
+				settings.w = setSize(settings.initialWidth, 'x');
+				settings.h = setSize(settings.initialHeight, 'y');
+				publicMethod.position();
+				
+				if (isIE6) {
+					$window.bind('resize.' + event_ie6 + ' scroll.' + event_ie6, function () {
+						$overlay.css({width: $window.width(), height: $window.height(), top: $window.scrollTop(), left: $window.scrollLeft()});
+					}).trigger('resize.' + event_ie6);
+				}
+				
+				trigger(event_open, settings.onOpen);
+				
+				$groupControls.add($title).hide();
+				
+				$close.html(settings.close).show();
+			}
+			
+			publicMethod.load(true);
+		}
+	}
+
+	// ColorBox's markup needs to be added to the DOM prior to being called
+	// so that the browser will go ahead and load the CSS background images.
+	function appendHTML() {
+		if (!$box && document.body) {
+			init = false;
+
+			$window = $(window);
+			$box = $tag(div).attr({id: colorbox, 'class': isIE ? prefix + (isIE6 ? 'IE6' : 'IE') : ''}).hide();
+			$overlay = $tag(div, "Overlay", isIE6 ? 'position:absolute' : '').hide();
+			$wrap = $tag(div, "Wrapper");
+			$content = $tag(div, "Content").append(
+				$loaded = $tag(div, "LoadedContent", 'width:0; height:0; overflow:hidden'),
+				$loadingOverlay = $tag(div, "LoadingOverlay").add($tag(div, "LoadingGraphic")),
+				$title = $tag(div, "Title"),
+				$current = $tag(div, "Current"),
+				$next = $tag(div, "Next"),
+				$prev = $tag(div, "Previous"),
+				$slideshow = $tag(div, "Slideshow").bind(event_open, slideshow),
+				$close = $tag(div, "Close")
+			);
+			
+			$wrap.append( // The 3x3 Grid that makes up ColorBox
+				$tag(div).append(
+					$tag(div, "TopLeft"),
+					$topBorder = $tag(div, "TopCenter"),
+					$tag(div, "TopRight")
+				),
+				$tag(div, false, 'clear:left').append(
+					$leftBorder = $tag(div, "MiddleLeft"),
+					$content,
+					$rightBorder = $tag(div, "MiddleRight")
+				),
+				$tag(div, false, 'clear:left').append(
+					$tag(div, "BottomLeft"),
+					$bottomBorder = $tag(div, "BottomCenter"),
+					$tag(div, "BottomRight")
+				)
+			).find('div div').css({'float': 'left'});
+			
+			$loadingBay = $tag(div, false, 'position:absolute; width:9999px; visibility:hidden; display:none');
+			
+			$groupControls = $next.add($prev).add($current).add($slideshow);
+
+			$(document.body).append($overlay, $box.append($wrap, $loadingBay));
+		}
+	}
+
+	// Add ColorBox's event bindings
+	function addBindings() {
+		if ($box) {
+			if (!init) {
+				init = true;
+
+				// Cache values needed for size calculations
+				interfaceHeight = $topBorder.height() + $bottomBorder.height() + $content.outerHeight(true) - $content.height();//Subtraction needed for IE6
+				interfaceWidth = $leftBorder.width() + $rightBorder.width() + $content.outerWidth(true) - $content.width();
+				loadedHeight = $loaded.outerHeight(true);
+				loadedWidth = $loaded.outerWidth(true);
+				
+				// Setting padding to remove the need to do size conversions during the animation step.
+				$box.css({"padding-bottom": interfaceHeight, "padding-right": interfaceWidth});
+
+				// Anonymous functions here keep the public method from being cached, thereby allowing them to be redefined on the fly.
+				$next.click(function () {
+					publicMethod.next();
+				});
+				$prev.click(function () {
+					publicMethod.prev();
+				});
+				$close.click(function () {
+					publicMethod.close();
+				});
+				$overlay.click(function () {
+					if (settings.overlayClose) {
+						publicMethod.close();
+					}
+				});
+				
+				// Key Bindings
+				$(document).bind('keydown.' + prefix, function (e) {
+					var key = e.keyCode;
+					if (open && settings.escKey && key === 27) {
+						e.preventDefault();
+						publicMethod.close();
+					}
+					if (open && settings.arrowKey && $related[1]) {
+						if (key === 37) {
+							e.preventDefault();
+							$prev.click();
+						} else if (key === 39) {
+							e.preventDefault();
+							$next.click();
+						}
+					}
+				});
+
+				$('.' + boxElement, document).live('click', function (e) {
+					// ignore non-left-mouse-clicks and clicks modified with ctrl / command, shift, or alt.
+					// See: http://jacklmoore.com/notes/click-events/
+					if (!(e.which > 1 || e.shiftKey || e.altKey || e.metaKey)) {
+						e.preventDefault();
+						launch(this);
+					}
+				});
+			}
+			return true;
+		}
+		return false;
+	}
+
+	// Don't do anything if ColorBox already exists.
+	if ($.colorbox) {
+		return;
+	}
+
+	// Append the HTML when the DOM loads
+	$(appendHTML);
+
+
+	// ****************
+	// PUBLIC FUNCTIONS
+	// Usage format: $.fn.colorbox.close();
+	// Usage from within an iframe: parent.$.fn.colorbox.close();
+	// ****************
+	
+	publicMethod = $.fn[colorbox] = $[colorbox] = function (options, callback) {
+		var $this = this;
+		
+		options = options || {};
+		
+		appendHTML();
+
+		if (addBindings()) {
+			if (!$this[0]) {
+				if ($this.selector) { // if a selector was given and it didn't match any elements, go ahead and exit.
+					return $this;
+				}
+				// if no selector was given (ie. $.colorbox()), create a temporary element to work with
+				$this = $('<a/>');
+				options.open = true; // assume an immediate open
+			}
+			
+			if (callback) {
+				options.onComplete = callback;
+			}
+			
+			$this.each(function () {
+				$.data(this, colorbox, $.extend({}, $.data(this, colorbox) || defaults, options));
+			}).addClass(boxElement);
+			
+			if (($.isFunction(options.open) && options.open.call($this)) || options.open) {
+				launch($this[0]);
+			}
+		}
+		
+		return $this;
+	};
+
+	publicMethod.position = function (speed, loadedCallback) {
+		var 
+		top = 0, 
+		left = 0, 
+		offset = $box.offset(),
+		scrollTop, 
+		scrollLeft;
+		
+		$window.unbind('resize.' + prefix);
+
+		// remove the modal so that it doesn't influence the document width/height        
+		$box.css({top: -9e4, left: -9e4});
+
+		scrollTop = $window.scrollTop();
+		scrollLeft = $window.scrollLeft();
+
+		if (settings.fixed && !isIE6) {
+			offset.top -= scrollTop;
+			offset.left -= scrollLeft;
+			$box.css({position: 'fixed'});
+		} else {
+			top = scrollTop;
+			left = scrollLeft;
+			$box.css({position: 'absolute'});
+		}
+
+		// keeps the top and left positions within the browser's viewport.
+		if (settings.right !== false) {
+			left += Math.max($window.width() - settings.w - loadedWidth - interfaceWidth - setSize(settings.right, 'x'), 0);
+		} else if (settings.left !== false) {
+			left += setSize(settings.left, 'x');
+		} else {
+			left += Math.round(Math.max($window.width() - settings.w - loadedWidth - interfaceWidth, 0) / 2);
+		}
+		
+		if (settings.bottom !== false) {
+			top += Math.max($window.height() - settings.h - loadedHeight - interfaceHeight - setSize(settings.bottom, 'y'), 0);
+		} else if (settings.top !== false) {
+			top += setSize(settings.top, 'y');
+		} else {
+			top += Math.round(Math.max($window.height() - settings.h - loadedHeight - interfaceHeight, 0) / 2);
+		}
+
+		$box.css({top: offset.top, left: offset.left});
+
+		// setting the speed to 0 to reduce the delay between same-sized content.
+		speed = ($box.width() === settings.w + loadedWidth && $box.height() === settings.h + loadedHeight) ? 0 : speed || 0;
+		
+		// this gives the wrapper plenty of breathing room so it's floated contents can move around smoothly,
+		// but it has to be shrank down around the size of div#colorbox when it's done.  If not,
+		// it can invoke an obscure IE bug when using iframes.
+		$wrap[0].style.width = $wrap[0].style.height = "9999px";
+		
+		function modalDimensions(that) {
+			$topBorder[0].style.width = $bottomBorder[0].style.width = $content[0].style.width = that.style.width;
+			$content[0].style.height = $leftBorder[0].style.height = $rightBorder[0].style.height = that.style.height;
+		}
+		
+		$box.dequeue().animate({width: settings.w + loadedWidth, height: settings.h + loadedHeight, top: top, left: left}, {
+			duration: speed,
+			complete: function () {
+				modalDimensions(this);
+				
+				active = false;
+				
+				// shrink the wrapper down to exactly the size of colorbox to avoid a bug in IE's iframe implementation.
+				$wrap[0].style.width = (settings.w + loadedWidth + interfaceWidth) + "px";
+				$wrap[0].style.height = (settings.h + loadedHeight + interfaceHeight) + "px";
+				
+				if (settings.reposition) {
+					setTimeout(function () {  // small delay before binding onresize due to an IE8 bug.
+						$window.bind('resize.' + prefix, publicMethod.position);
+					}, 1);
+				}
+
+				if (loadedCallback) {
+					loadedCallback();
+				}
+			},
+			step: function () {
+				modalDimensions(this);
+			}
+		});
+	};
+
+	publicMethod.resize = function (options) {
+		if (open) {
+			options = options || {};
+			
+			if (options.width) {
+				settings.w = setSize(options.width, 'x') - loadedWidth - interfaceWidth;
+			}
+			if (options.innerWidth) {
+				settings.w = setSize(options.innerWidth, 'x');
+			}
+			$loaded.css({width: settings.w});
+			
+			if (options.height) {
+				settings.h = setSize(options.height, 'y') - loadedHeight - interfaceHeight;
+			}
+			if (options.innerHeight) {
+				settings.h = setSize(options.innerHeight, 'y');
+			}
+			if (!options.innerHeight && !options.height) {
+				$loaded.css({height: "auto"});
+				settings.h = $loaded.height();
+			}
+			$loaded.css({height: settings.h});
+			
+			publicMethod.position(settings.transition === "none" ? 0 : settings.speed);
+		}
+	};
+
+	publicMethod.prep = function (object) {
+		if (!open) {
+			return;
+		}
+		
+		var callback, speed = settings.transition === "none" ? 0 : settings.speed;
+		
+		$loaded.remove();
+		$loaded = $tag(div, 'LoadedContent').append(object);
+		
+		function getWidth() {
+			settings.w = settings.w || $loaded.width();
+			settings.w = settings.mw && settings.mw < settings.w ? settings.mw : settings.w;
+			return settings.w;
+		}
+		function getHeight() {
+			settings.h = settings.h || $loaded.height();
+			settings.h = settings.mh && settings.mh < settings.h ? settings.mh : settings.h;
+			return settings.h;
+		}
+		
+		$loaded.hide()
+		.appendTo($loadingBay.show())// content has to be appended to the DOM for accurate size calculations.
+		.css({width: getWidth(), overflow: settings.scrolling ? 'auto' : 'hidden'})
+		.css({height: getHeight()})// sets the height independently from the width in case the new width influences the value of height.
+		.prependTo($content);
+		
+		$loadingBay.hide();
+		
+		// floating the IMG removes the bottom line-height and fixed a problem where IE miscalculates the width of the parent element as 100% of the document width.
+		//$(photo).css({'float': 'none', marginLeft: 'auto', marginRight: 'auto'});
+		
+		$(photo).css({'float': 'none'});
+		
+		// Hides SELECT elements in IE6 because they would otherwise sit on top of the overlay.
+		if (isIE6) {
+			$('select').not($box.find('select')).filter(function () {
+				return this.style.visibility !== 'hidden';
+			}).css({'visibility': 'hidden'}).one(event_cleanup, function () {
+				this.style.visibility = 'inherit';
+			});
+		}
+		
+		callback = function () {
+			var preload, 
+				i, 
+				total = $related.length, 
+				iframe, 
+				frameBorder = 'frameBorder', 
+				allowTransparency = 'allowTransparency', 
+				complete, 
+				src, 
+				img, 
+				data;
+			
+			if (!open) {
+				return;
+			}
+			
+			function removeFilter() {
+				if (isIE) {
+					$box[0].style.removeAttribute('filter');
+				}
+			}
+			
+			complete = function () {
+				clearTimeout(loadingTimer);
+				$loadingOverlay.hide();
+				trigger(event_complete, settings.onComplete);
+			};
+			
+			if (isIE) {
+				//This fadeIn helps the bicubic resampling to kick-in.
+				if (photo) {
+					$loaded.fadeIn(100);
+				}
+			}
+			
+			$title.html(settings.title).add($loaded).show();
+			
+			if (total > 1) { // handle grouping
+				if (typeof settings.current === "string") {
+					$current.html(settings.current.replace('{current}', index + 1).replace('{total}', total)).show();
+				}
+				
+				$next[(settings.loop || index < total - 1) ? "show" : "hide"]().html(settings.next);
+				$prev[(settings.loop || index) ? "show" : "hide"]().html(settings.previous);
+				
+				if (settings.slideshow) {
+					$slideshow.show();
+				}
+				
+				// Preloads images within a rel group
+				if (settings.preloading) {
+					preload = [
+						getIndex(-1),
+						getIndex(1)
+					];
+					while (i = $related[preload.pop()]) {
+						data = $.data(i, colorbox);
+						
+						if (data && data.href) {
+							src = data.href;
+							if ($.isFunction(src)) {
+								src = src.call(i);
+							}
+						} else {
+							src = i.href;
+						}
+
+						if (isImage(src)) {
+							img = new Image();
+							img.src = src;
+						}
+					}
+				}
+			} else {
+				$groupControls.hide();
+			}
+			
+			if (settings.iframe) {
+				iframe = $tag('iframe')[0];
+				
+				if (frameBorder in iframe) {
+					iframe[frameBorder] = 0;
+				}
+				if (allowTransparency in iframe) {
+					iframe[allowTransparency] = "true";
+				}
+				// give the iframe a unique name to prevent caching
+				iframe.name = prefix + (+new Date());
+				if (settings.fastIframe) {
+					complete();
+				} else {
+					$(iframe).one('load', complete);
+				}
+				iframe.src = settings.href;
+				if (!settings.scrolling) {
+					iframe.scrolling = "no";
+				}
+				$(iframe).addClass(prefix + 'Iframe').appendTo($loaded).one(event_purge, function () {
+					iframe.src = "//about:blank";
+				});
+			} else {
+				complete();
+			}
+			
+			if (settings.transition === 'fade') {
+				$box.fadeTo(speed, 1, removeFilter);
+			} else {
+				removeFilter();
+			}
+		};
+		
+		if (settings.transition === 'fade') {
+			$box.fadeTo(speed, 0, function () {
+				publicMethod.position(0, callback);
+			});
+		} else {
+			publicMethod.position(speed, callback);
+		}
+	};
+
+	publicMethod.load = function (launched) {
+		var href, setResize, prep = publicMethod.prep;
+		
+		active = true;
+		
+		photo = false;
+		
+		element = $related[index];
+		
+		if (!launched) {
+			makeSettings();
+		}
+		
+		trigger(event_purge);
+		
+		trigger(event_load, settings.onLoad);
+		
+		settings.h = settings.height ?
+				setSize(settings.height, 'y') - loadedHeight - interfaceHeight :
+				settings.innerHeight && setSize(settings.innerHeight, 'y');
+		
+		settings.w = settings.width ?
+				setSize(settings.width, 'x') - loadedWidth - interfaceWidth :
+				settings.innerWidth && setSize(settings.innerWidth, 'x');
+		
+		// Sets the minimum dimensions for use in image scaling
+		settings.mw = settings.w;
+		settings.mh = settings.h;
+		
+		// Re-evaluate the minimum width and height based on maxWidth and maxHeight values.
+		// If the width or height exceed the maxWidth or maxHeight, use the maximum values instead.
+		if (settings.maxWidth) {
+			settings.mw = setSize(settings.maxWidth, 'x') - loadedWidth - interfaceWidth;
+			settings.mw = settings.w && settings.w < settings.mw ? settings.w : settings.mw;
+		}
+		if (settings.maxHeight) {
+			settings.mh = setSize(settings.maxHeight, 'y') - loadedHeight - interfaceHeight;
+			settings.mh = settings.h && settings.h < settings.mh ? settings.h : settings.mh;
+		}
+		
+		href = settings.href;
+		
+		loadingTimer = setTimeout(function () {
+			$loadingOverlay.show();
+		}, 100);
+		
+		if (settings.inline) {
+			// Inserts an empty placeholder where inline content is being pulled from.
+			// An event is bound to put inline content back when ColorBox closes or loads new content.
+			$tag(div).hide().insertBefore($(href)[0]).one(event_purge, function () {
+				$(this).replaceWith($loaded.children());
+			});
+			prep($(href));
+		} else if (settings.iframe) {
+			// IFrame element won't be added to the DOM until it is ready to be displayed,
+			// to avoid problems with DOM-ready JS that might be trying to run in that iframe.
+			prep(" ");
+		} else if (settings.html) {
+			prep(settings.html);
+		} else if (isImage(href)) {
+			$(photo = new Image())
+			.addClass(prefix + 'Photo')
+			.error(function () {
+				settings.title = false;
+				prep($tag(div, 'Error').html(settings.imgError));
+			})
+			.load(function () {
+				var percent;
+				photo.onload = null; //stops animated gifs from firing the onload repeatedly.
+				
+				if (settings.scalePhotos) {
+					setResize = function () {
+						photo.height -= photo.height * percent;
+						photo.width -= photo.width * percent;	
+					};
+					if (settings.mw && photo.width > settings.mw) {
+						percent = (photo.width - settings.mw) / photo.width;
+						setResize();
+					}
+					if (settings.mh && photo.height > settings.mh) {
+						percent = (photo.height - settings.mh) / photo.height;
+						setResize();
+					}
+				}
+				
+				if (settings.h) {
+					photo.style.marginTop = Math.max(settings.h - photo.height, 0) / 2 + 'px';
+				}
+				
+				if ($related[1] && (settings.loop || $related[index + 1])) {
+					photo.style.cursor = 'pointer';
+					photo.onclick = function () {
+						publicMethod.next();
+					};
+				}
+				
+				if (isIE) {
+					photo.style.msInterpolationMode = 'bicubic';
+				}
+				
+				setTimeout(function () { // A pause because Chrome will sometimes report a 0 by 0 size otherwise.
+					prep(photo);
+				}, 1);
+			});
+			
+			setTimeout(function () { // A pause because Opera 10.6+ will sometimes not run the onload function otherwise.
+				photo.src = href;
+			}, 1);
+		} else if (href) {
+			$loadingBay.load(href, settings.data, function (data, status, xhr) {
+				prep(status === 'error' ? $tag(div, 'Error').html(settings.xhrError) : $(this).contents());
+			});
+		}
+	};
+		
+	// Navigates to the next page/image in a set.
+	publicMethod.next = function () {
+		if (!active && $related[1] && (settings.loop || $related[index + 1])) {
+			index = getIndex(1);
+			publicMethod.load();
+		}
+	};
+	
+	publicMethod.prev = function () {
+		if (!active && $related[1] && (settings.loop || index)) {
+			index = getIndex(-1);
+			publicMethod.load();
+		}
+	};
+
+	// Note: to use this within an iframe use the following format: parent.$.fn.colorbox.close();
+	publicMethod.close = function () {
+		if (open && !closing) {
+			
+			closing = true;
+			
+			open = false;
+			
+			trigger(event_cleanup, settings.onCleanup);
+			
+			$window.unbind('.' + prefix + ' .' + event_ie6);
+			
+			$overlay.fadeTo(200, 0);
+			
+			$box.stop().fadeTo(300, 0, function () {
+				 
+				$box.add($overlay).css({'opacity': 1, cursor: 'auto'}).hide();
+				
+				trigger(event_purge);
+				
+				$loaded.remove();
+				
+				setTimeout(function () {
+					closing = false;
+					trigger(event_closed, settings.onClosed);
+				}, 1);
+			});
+		}
+	};
+
+	// Removes changes ColorBox made to the document, but does not remove the plugin
+	// from jQuery.
+	publicMethod.remove = function () {
+		$([]).add($box).add($overlay).remove();
+		$box = null;
+		$('.' + boxElement)
+			.removeData(colorbox)
+			.removeClass(boxElement)
+			.die();
+	};
+
+	// A method for fetching the current element ColorBox is referencing.
+	// returns a jQuery object.
+	publicMethod.element = function () {
+		return $(element);
+	};
+
+	publicMethod.settings = defaults;
+
+}(jQuery, document, this));
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/ajax.html b/mod/colorbox/vendors/jquery/colorbox/content/ajax.html
new file mode 100644
index 000000000..e772638ad
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/ajax.html
@@ -0,0 +1,11 @@
+<div id='homer' style="background:url(../content/homer.jpg) right center no-repeat #ececec; height:135px; width:280px; padding:30px 10px;">
+    <strong>Homer</strong><br/>
+    <em>\noun\</em><br/>
+    <strong>1.</strong> American bonehead<br/>
+    <strong>2. Pull a Homer-</strong><br/>
+    to succeed despite<br/>
+    idiocy
+</div>
+<script>
+    $('#homer strong').css({color:'red'});
+</script>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/flash.html b/mod/colorbox/vendors/jquery/colorbox/content/flash.html
new file mode 100644
index 000000000..c83f7c44f
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/flash.html
@@ -0,0 +1,8 @@
+<div style="width:504px; height:412px; overflow:hidden;">
+	<object>
+	    <param name="allowfullscreen" value="true" /><param name="wmode" value="opaque" />
+	    <param name="allowscriptaccess" value="always" />
+	    <param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=2285902&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" />
+	    <embed src="http://vimeo.com/moogaloop.swf?clip_id=2285902&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=00ADEF&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" wmode="opaque" allowscriptaccess="always" width="504" height="412"></embed>
+	</object>
+</div>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/homer.jpg b/mod/colorbox/vendors/jquery/colorbox/content/homer.jpg
new file mode 100644
index 000000000..87ec76c99
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/homer.jpg
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/marylou.jpg b/mod/colorbox/vendors/jquery/colorbox/content/marylou.jpg
new file mode 100644
index 000000000..4c717d276
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/marylou.jpg
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/ohoopee1.jpg b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee1.jpg
new file mode 100644
index 000000000..aae19a3e6
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee1.jpg
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/ohoopee2.jpg b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee2.jpg
new file mode 100644
index 000000000..206894489
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee2.jpg
diff --git a/mod/colorbox/vendors/jquery/colorbox/content/ohoopee3.jpg b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee3.jpg
new file mode 100644
index 000000000..4d64d2400
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/content/ohoopee3.jpg
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/colorbox.css b/mod/colorbox/vendors/jquery/colorbox/example1/colorbox.css
new file mode 100644
index 000000000..397fe3dca
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/colorbox.css
@@ -0,0 +1,86 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:url(images/overlay.png) repeat 0 0;}
+#colorbox{}
+    #cboxTopLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px 0;}
+    #cboxTopRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px 0;}
+    #cboxBottomLeft{width:21px; height:21px; background:url(images/controls.png) no-repeat -101px -29px;}
+    #cboxBottomRight{width:21px; height:21px; background:url(images/controls.png) no-repeat -130px -29px;}
+    #cboxMiddleLeft{width:21px; background:url(images/controls.png) left top repeat-y;}
+    #cboxMiddleRight{width:21px; background:url(images/controls.png) right top repeat-y;}
+    #cboxTopCenter{height:21px; background:url(images/border.png) 0 0 repeat-x;}
+    #cboxBottomCenter{height:21px; background:url(images/border.png) 0 -29px repeat-x;}
+    #cboxContent{background:#fff; overflow:hidden;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:28px;}
+        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
+        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
+        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
+        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(images/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:-75px -25px;}
+        #cboxNext{position:absolute; bottom:0; left:27px; background:url(images/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:-50px -25px;}
+        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+        #cboxClose{position:absolute; bottom:0; right:0; background:url(images/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:-25px -25px;}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
+}
+
+/*
+  The following provides PNG transparency support for IE6
+  Feel free to remove this and the /ie6/ directory if you have dropped IE6 support.
+*/
+.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}
+.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}
+.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}
+.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}
+.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}
+.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}
+.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}
+.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}
+
+.cboxIE6 #cboxTopLeft,
+.cboxIE6 #cboxTopCenter,
+.cboxIE6 #cboxTopRight,
+.cboxIE6 #cboxBottomLeft,
+.cboxIE6 #cboxBottomCenter,
+.cboxIE6 #cboxBottomRight,
+.cboxIE6 #cboxMiddleLeft,
+.cboxIE6 #cboxMiddleRight {
+    _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
+}
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/border.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/border.png
new file mode 100644
index 000000000..f463a10d8
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/border.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/controls.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/controls.png
new file mode 100644
index 000000000..dcfd6fb9f
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/controls.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomCenter.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomCenter.png
new file mode 100644
index 000000000..0d4475edf
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomCenter.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomLeft.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomLeft.png
new file mode 100644
index 000000000..2775eba89
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomRight.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomRight.png
new file mode 100644
index 000000000..f7f51379c
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderBottomRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleLeft.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleLeft.png
new file mode 100644
index 000000000..a2d63d156
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleRight.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleRight.png
new file mode 100644
index 000000000..fd7c3e849
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderMiddleRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopCenter.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopCenter.png
new file mode 100644
index 000000000..2937a9cf9
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopCenter.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopLeft.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopLeft.png
new file mode 100644
index 000000000..f9d458b5b
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopRight.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopRight.png
new file mode 100644
index 000000000..74b8583cf
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/ie6/borderTopRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/loading.gif b/mod/colorbox/vendors/jquery/colorbox/example1/images/loading.gif
new file mode 100644
index 000000000..b4695d811
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/loading.gif
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/loading_background.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/loading_background.png
new file mode 100644
index 000000000..6ae83e697
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/loading_background.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/images/overlay.png b/mod/colorbox/vendors/jquery/colorbox/example1/images/overlay.png
new file mode 100644
index 000000000..53ea98f70
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/images/overlay.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example1/index.html b/mod/colorbox/vendors/jquery/colorbox/example1/index.html
new file mode 100644
index 000000000..44fcca860
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example1/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>ColorBox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+		<script src="../colorbox/jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the ColorBox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:425, innerHeight:344});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>ColorBox Demonstration</h1>
+		
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='ajax' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='iframe' href="http://threadless.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/flash.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example2/colorbox.css b/mod/colorbox/vendors/jquery/colorbox/example2/colorbox.css
new file mode 100644
index 000000000..fa42bf2f9
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example2/colorbox.css
@@ -0,0 +1,43 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#fff;}
+#colorbox{}
+    #cboxContent{margin-top:32px; overflow:visible;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{background:#000; padding:1px;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+        #cboxLoadingOverlay{background:#000;}
+        #cboxTitle{position:absolute; top:-22px; left:0; color:#000;}
+        #cboxCurrent{position:absolute; top:-22px; right:205px; text-indent:-9999px;}
+        #cboxSlideshow, #cboxPrevious, #cboxNext, #cboxClose{text-indent:-9999px; width:20px; height:20px; position:absolute; top:-20px; background:url(images/controls.png) no-repeat 0 0;}
+        #cboxPrevious{background-position:0px 0px; right:44px;}
+        #cboxPrevious:hover{background-position:0px -25px;}
+        #cboxNext{background-position:-25px 0px; right:22px;}
+        #cboxNext:hover{background-position:-25px -25px;}
+        #cboxClose{background-position:-50px 0px; right:0;}
+        #cboxClose:hover{background-position:-50px -25px;}
+        .cboxSlideshow_on #cboxPrevious, .cboxSlideshow_off #cboxPrevious{right:66px;}
+        .cboxSlideshow_on #cboxSlideshow{background-position:-75px -25px; right:44px;}
+        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-100px -25px;}
+        .cboxSlideshow_off #cboxSlideshow{background-position:-100px 0px; right:44px;}
+        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-75px -25px;}
diff --git a/mod/colorbox/vendors/jquery/colorbox/example2/images/controls.png b/mod/colorbox/vendors/jquery/colorbox/example2/images/controls.png
new file mode 100644
index 000000000..8569b57f1
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example2/images/controls.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example2/images/loading.gif b/mod/colorbox/vendors/jquery/colorbox/example2/images/loading.gif
new file mode 100644
index 000000000..19c67bbd0
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example2/images/loading.gif
diff --git a/mod/colorbox/vendors/jquery/colorbox/example2/index.html b/mod/colorbox/vendors/jquery/colorbox/example2/index.html
new file mode 100644
index 000000000..44fcca860
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example2/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>ColorBox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+		<script src="../colorbox/jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the ColorBox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:425, innerHeight:344});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>ColorBox Demonstration</h1>
+		
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='ajax' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='iframe' href="http://threadless.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/flash.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example3/colorbox.css b/mod/colorbox/vendors/jquery/colorbox/example3/colorbox.css
new file mode 100644
index 000000000..36cc9ef42
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example3/colorbox.css
@@ -0,0 +1,38 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width: none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000;}
+#colorbox{}
+    #cboxContent{margin-top:20px;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{border:5px solid #000; background:#fff;}
+        #cboxTitle{position:absolute; top:-20px; left:0; color:#ccc;}
+        #cboxCurrent{position:absolute; top:-20px; right:0px; color:#ccc;}
+        #cboxSlideshow{position:absolute; top:-20px; right:90px; color:#fff;}
+        #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top left; width:28px; height:65px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:bottom left;}
+        #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:url(images/controls.png) no-repeat top right; width:28px; height:65px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:bottom right;}
+        #cboxLoadingOverlay{background:#000;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+        #cboxClose{position:absolute; top:5px; right:5px; display:block; background:url(images/controls.png) no-repeat top center; width:38px; height:19px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:bottom center;}
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example3/images/controls.png b/mod/colorbox/vendors/jquery/colorbox/example3/images/controls.png
new file mode 100644
index 000000000..e1e97982a
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example3/images/controls.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example3/images/loading.gif b/mod/colorbox/vendors/jquery/colorbox/example3/images/loading.gif
new file mode 100644
index 000000000..19c67bbd0
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example3/images/loading.gif
diff --git a/mod/colorbox/vendors/jquery/colorbox/example3/index.html b/mod/colorbox/vendors/jquery/colorbox/example3/index.html
new file mode 100644
index 000000000..44fcca860
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example3/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>ColorBox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+		<script src="../colorbox/jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the ColorBox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:425, innerHeight:344});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>ColorBox Demonstration</h1>
+		
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='ajax' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='iframe' href="http://threadless.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/flash.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/colorbox.css b/mod/colorbox/vendors/jquery/colorbox/example4/colorbox.css
new file mode 100644
index 000000000..bc5ef3e3d
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/colorbox.css
@@ -0,0 +1,82 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#fff;}
+#colorbox{}
+    #cboxTopLeft{width:25px; height:25px; background:url(images/border1.png) no-repeat 0 0;}
+    #cboxTopCenter{height:25px; background:url(images/border1.png) repeat-x 0 -50px;}
+    #cboxTopRight{width:25px; height:25px; background:url(images/border1.png) no-repeat -25px 0;}
+    #cboxBottomLeft{width:25px; height:25px; background:url(images/border1.png) no-repeat 0 -25px;}
+    #cboxBottomCenter{height:25px; background:url(images/border1.png) repeat-x 0 -75px;}
+    #cboxBottomRight{width:25px; height:25px; background:url(images/border1.png) no-repeat -25px -25px;}
+    #cboxMiddleLeft{width:25px; background:url(images/border2.png) repeat-y 0 0;}
+    #cboxMiddleRight{width:25px; background:url(images/border2.png) repeat-y -25px 0;}
+    #cboxContent{background:#fff; overflow:hidden;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:20px;}
+        #cboxTitle{position:absolute; bottom:0px; left:0; text-align:center; width:100%; color:#999;}
+        #cboxCurrent{position:absolute; bottom:0px; left:100px; color:#999;}
+        #cboxSlideshow{position:absolute; bottom:0px; right:42px; color:#444;}
+        #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
+        #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
+        #cboxLoadingOverlay{background:#fff url(images/loading.gif) no-repeat 5px 5px;}
+        #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
+}
+
+/*
+  The following provides PNG transparency support for IE6
+  Feel free to remove this and the /ie6/ directory if you have dropped IE6 support.
+*/
+.cboxIE6 #cboxTopLeft{background:url(images/ie6/borderTopLeft.png);}
+.cboxIE6 #cboxTopCenter{background:url(images/ie6/borderTopCenter.png);}
+.cboxIE6 #cboxTopRight{background:url(images/ie6/borderTopRight.png);}
+.cboxIE6 #cboxBottomLeft{background:url(images/ie6/borderBottomLeft.png);}
+.cboxIE6 #cboxBottomCenter{background:url(images/ie6/borderBottomCenter.png);}
+.cboxIE6 #cboxBottomRight{background:url(images/ie6/borderBottomRight.png);}
+.cboxIE6 #cboxMiddleLeft{background:url(images/ie6/borderMiddleLeft.png);}
+.cboxIE6 #cboxMiddleRight{background:url(images/ie6/borderMiddleRight.png);}
+
+.cboxIE6 #cboxTopLeft,
+.cboxIE6 #cboxTopCenter,
+.cboxIE6 #cboxTopRight,
+.cboxIE6 #cboxBottomLeft,
+.cboxIE6 #cboxBottomCenter,
+.cboxIE6 #cboxBottomRight,
+.cboxIE6 #cboxMiddleLeft,
+.cboxIE6 #cboxMiddleRight {
+    _behavior: expression(this.src = this.src ? this.src : this.currentStyle.backgroundImage.split('"')[1], this.style.background = "none", this.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src=" + this.src + ", sizingMethod='scale')");
+}
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/border1.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/border1.png
new file mode 100644
index 000000000..0ddc70405
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/border1.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/border2.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/border2.png
new file mode 100644
index 000000000..aa62a0b72
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/border2.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomCenter.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomCenter.png
new file mode 100644
index 000000000..12e0e9ac0
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomCenter.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomLeft.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomLeft.png
new file mode 100644
index 000000000..b7a474ae0
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomRight.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomRight.png
new file mode 100644
index 000000000..6b6cb159b
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderBottomRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleLeft.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleLeft.png
new file mode 100644
index 000000000..8d0eb739d
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleRight.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleRight.png
new file mode 100644
index 000000000..d65509e30
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderMiddleRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopCenter.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopCenter.png
new file mode 100644
index 000000000..35d8da2d0
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopCenter.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopLeft.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopLeft.png
new file mode 100644
index 000000000..ae9bda040
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopLeft.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopRight.png b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopRight.png
new file mode 100644
index 000000000..0d8868399
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/ie6/borderTopRight.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/images/loading.gif b/mod/colorbox/vendors/jquery/colorbox/example4/images/loading.gif
new file mode 100644
index 000000000..602ce3c3a
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/images/loading.gif
diff --git a/mod/colorbox/vendors/jquery/colorbox/example4/index.html b/mod/colorbox/vendors/jquery/colorbox/example4/index.html
new file mode 100644
index 000000000..44fcca860
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example4/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>ColorBox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+		<script src="../colorbox/jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the ColorBox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:425, innerHeight:344});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>ColorBox Demonstration</h1>
+		
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='ajax' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='iframe' href="http://threadless.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/flash.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/colorbox.css b/mod/colorbox/vendors/jquery/colorbox/example5/colorbox.css
new file mode 100644
index 000000000..91301a9b1
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/colorbox.css
@@ -0,0 +1,52 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width:none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+#colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000;}
+#colorbox{}
+    #cboxTopLeft{width:14px; height:14px; background:url(images/controls.png) no-repeat 0 0;}
+    #cboxTopCenter{height:14px; background:url(images/border.png) repeat-x top left;}
+    #cboxTopRight{width:14px; height:14px; background:url(images/controls.png) no-repeat -36px 0;}
+    #cboxBottomLeft{width:14px; height:43px; background:url(images/controls.png) no-repeat 0 -32px;}
+    #cboxBottomCenter{height:43px; background:url(images/border.png) repeat-x bottom left;}
+    #cboxBottomRight{width:14px; height:43px; background:url(images/controls.png) no-repeat -36px -32px;}
+    #cboxMiddleLeft{width:14px; background:url(images/controls.png) repeat-y -175px 0;}
+    #cboxMiddleRight{width:14px; background:url(images/controls.png) repeat-y -211px 0;}
+    #cboxContent{background:#fff; overflow:visible;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:5px;}
+        #cboxLoadingOverlay{background:url(images/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(images/loading.gif) no-repeat center center;}
+        #cboxTitle{position:absolute; bottom:-25px; left:0; text-align:center; width:100%; font-weight:bold; color:#7C7C7C;}
+        #cboxCurrent{position:absolute; bottom:-25px; left:58px; font-weight:bold; color:#7C7C7C;}
+        
+        #cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{position:absolute; bottom:-29px; background:url(images/controls.png) no-repeat 0px 0px; width:23px; height:23px; text-indent:-9999px;}
+        #cboxPrevious{left:0px; background-position: -51px -25px;}
+        #cboxPrevious:hover{background-position:-51px 0px;}
+        #cboxNext{left:27px; background-position:-75px -25px;}
+        #cboxNext:hover{background-position:-75px 0px;}
+        #cboxClose{right:0; background-position:-100px -25px;}
+        #cboxClose:hover{background-position:-100px 0px;}
+        
+        .cboxSlideshow_on #cboxSlideshow{background-position:-125px 0px; right:27px;}
+        .cboxSlideshow_on #cboxSlideshow:hover{background-position:-150px 0px;}
+        .cboxSlideshow_off #cboxSlideshow{background-position:-150px -25px; right:27px;}
+        .cboxSlideshow_off #cboxSlideshow:hover{background-position:-125px 0px;}
+\ No newline at end of file
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/images/border.png b/mod/colorbox/vendors/jquery/colorbox/example5/images/border.png
new file mode 100644
index 000000000..df13bb6da
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/images/border.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/images/controls.png b/mod/colorbox/vendors/jquery/colorbox/example5/images/controls.png
new file mode 100644
index 000000000..65cfd1dc9
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/images/controls.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/images/loading.gif b/mod/colorbox/vendors/jquery/colorbox/example5/images/loading.gif
new file mode 100644
index 000000000..b4695d811
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/images/loading.gif
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/images/loading_background.png b/mod/colorbox/vendors/jquery/colorbox/example5/images/loading_background.png
new file mode 100644
index 000000000..9de11f467
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/images/loading_background.png
diff --git a/mod/colorbox/vendors/jquery/colorbox/example5/index.html b/mod/colorbox/vendors/jquery/colorbox/example5/index.html
new file mode 100644
index 000000000..44fcca860
--- /dev/null
+++ b/mod/colorbox/vendors/jquery/colorbox/example5/index.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<meta charset='utf-8'/>
+		<title>ColorBox Examples</title>
+		<style>
+			body{font:12px/1.2 Verdana, sans-serif; padding:0 10px;}
+			a:link, a:visited{text-decoration:none; color:#416CE5; border-bottom:1px solid #416CE5;}
+			h2{font-size:13px; margin:15px 0 0 0;}
+		</style>
+		<link rel="stylesheet" href="colorbox.css" />
+		<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
+		<script src="../colorbox/jquery.colorbox.js"></script>
+		<script>
+			$(document).ready(function(){
+				//Examples of how to assign the ColorBox event to elements
+				$(".group1").colorbox({rel:'group1'});
+				$(".group2").colorbox({rel:'group2', transition:"fade"});
+				$(".group3").colorbox({rel:'group3', transition:"none", width:"75%", height:"75%"});
+				$(".group4").colorbox({rel:'group4', slideshow:true});
+				$(".ajax").colorbox();
+				$(".youtube").colorbox({iframe:true, innerWidth:425, innerHeight:344});
+				$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
+				$(".inline").colorbox({inline:true, width:"50%"});
+				$(".callbacks").colorbox({
+					onOpen:function(){ alert('onOpen: colorbox is about to open'); },
+					onLoad:function(){ alert('onLoad: colorbox has started to load the targeted content'); },
+					onComplete:function(){ alert('onComplete: colorbox has displayed the loaded content'); },
+					onCleanup:function(){ alert('onCleanup: colorbox has begun the close process'); },
+					onClosed:function(){ alert('onClosed: colorbox has completely closed'); }
+				});
+				
+				//Example of preserving a JavaScript event for inline calls.
+				$("#click").click(function(){ 
+					$('#click').css({"background-color":"#f00", "color":"#fff", "cursor":"inherit"}).text("Open this window again and this message will still be here.");
+					return false;
+				});
+			});
+		</script>
+	</head>
+	<body>
+		<h1>ColorBox Demonstration</h1>
+		
+		<h2>Elastic Transition</h2>
+		<p><a class="group1" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group1" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group1" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Fade Transition</h2>
+		<p><a class="group2" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee">Grouped Photo 1</a></p>
+		<p><a class="group2" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group2" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>No Transition + fixed width and height (75% of screen size)</h2>
+		<p><a class="group3" href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group3" href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group3" href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Slideshow</h2>
+		<p><a class="group4"  href="../content/ohoopee1.jpg" title="Me and my grandfather on the Ohoopee.">Grouped Photo 1</a></p>
+		<p><a class="group4"  href="../content/ohoopee2.jpg" title="On the Ohoopee as a child">Grouped Photo 2</a></p>
+		<p><a class="group4"  href="../content/ohoopee3.jpg" title="On the Ohoopee as an adult">Grouped Photo 3</a></p>
+		
+		<h2>Other Content Types</h2>
+		<p><a class='ajax' href="../content/ajax.html" title="Homer Defined">Outside HTML (Ajax)</a></p>
+		<p><a class='ajax' href="../content/flash.html" title="Royksopp: Remind Me">Flash / Video (Ajax/Embedded)</a></p>
+		<p><a class='youtube' href="http://www.youtube.com/embed/617ANIA5Rqs?rel=0&amp;wmode=transparent" title="The Knife: We Share Our Mother's Health">Flash / Video (Iframe/Direct Link To YouTube)</a></p>
+		<p><a class='iframe' href="http://threadless.com">Outside Webpage (Iframe)</a></p>
+		<p><a class='inline' href="#inline_content">Inline HTML</a></p>
+		
+		<h2>Demonstration of using callbacks</h2>
+		<p><a class='callbacks' href="../content/marylou.jpg" title="Marylou on Cumberland Island">Example with alerts</a>. Callbacks and event-hooks allow users to extend functionality without having to rewrite parts of the plugin.</p>
+		
+		<!-- This contains the hidden content for inline calls -->
+		<div style='display:none'>
+			<div id='inline_content' style='padding:10px; background:#fff;'>
+			<p><strong>This content comes from a hidden element on this page.</strong></p>
+			<p>The inline option preserves bound JavaScript events and changes, and it puts the content back where it came from when it is closed.</p>
+			<p><a id="click" href="#" style='padding:5px; background:#ccc;'>Click me, it will be preserved!</a></p>
+			
+			<p><strong>If you try to open a new ColorBox while it is already open, it will update itself with the new content.</strong></p>
+			<p>Updating Content Example:<br />
+			<a class="ajax" href="../content/flash.html">Click here to load new content</a></p>
+			</div>
+		</div>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/colorbox/views/default/css/lightbox.php b/mod/colorbox/views/default/css/lightbox.php
new file mode 100644
index 000000000..e18c02bf8
--- /dev/null
+++ b/mod/colorbox/views/default/css/lightbox.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Colorbox -- Stylesheet
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$jquery_path = elgg_get_site_url() . 'mod/colorbox/vendors/jquery/';
+?>
+
+/*
+ * ColorBox - jQuery Plugin
+ * A lightweight customizable lightbox plugin for jQuery
+ *
+ */
+
+ /*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+body > #colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block; max-width: none;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+body > #colorbox, #cboxContent, #cboxLoadedContent{box-sizing:content-box;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:#000;}
+body > #colorbox{}
+    #cboxContent{margin-top:20px;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{border:5px solid #000; background:#fff;}
+        #cboxTitle{position:absolute; top:-20px; left:0; color:#ccc;}
+        #cboxCurrent{position:absolute; top:-20px; right:0px; color:#ccc;}
+        #cboxSlideshow{position:absolute; top:-20px; right:90px; color:#fff;}
+        #cboxPrevious{position:absolute; top:50%; left:5px; margin-top:-32px; background:url(<?php echo $jquery_path; ?>colorbox/example3/images/controls.png) no-repeat top left; width:28px; height:65px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:bottom left;}
+        #cboxNext{position:absolute; top:50%; right:5px; margin-top:-32px; background:url(<?php echo $jquery_path; ?>colorbox/example3/images/controls.png) no-repeat top right; width:28px; height:65px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:bottom right;}
+        #cboxLoadingOverlay{background:#000;}
+        #cboxLoadingGraphic{background:url(<?php echo $jquery_path; ?>colorbox/example3/images/loading.gif) no-repeat center center;}
+        #cboxClose{position:absolute; top:5px; right:5px; display:block; background:url(<?php echo $jquery_path; ?>colorbox/example3/images/controls.png) no-repeat top center; width:38px; height:19px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:bottom center;}
diff --git a/mod/colorbox/views/default/js/embed/embed.php b/mod/colorbox/views/default/js/embed/embed.php
new file mode 100644
index 000000000..ada6653a8
--- /dev/null
+++ b/mod/colorbox/views/default/js/embed/embed.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * Colorbox -- Javascript
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ * @override mod/embed/views/default/js/embed/embed.php
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+?>
+
+elgg.provide('elgg.embed');
+
+elgg.embed.init = function() {
+
+	// inserts the embed content into the textarea
+	$(".embed-item").live('click', elgg.embed.insert);
+
+	// caches the current textarea id
+	$(".embed-control").live('click', function() {
+		elgg.embed.textAreaId = /embed-control-(\S)+/.exec($(this).attr('class'))[1];
+	});
+
+	// special pagination helper for lightbox
+	$('.embed-wrapper .elgg-pagination a').live('click', elgg.embed.forward);
+
+	$('.embed-section').live('click', elgg.embed.forward);
+
+	$('.elgg-form-embed').live('submit', elgg.embed.submit);
+};
+
+/**
+ * Inserts data attached to an embed list item in textarea
+ *
+ * @todo generalize lightbox closing
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.embed.insert = function(event) {
+	var textAreaId = elgg.embed.textAreaId;
+	var textArea = $('#' + textAreaId);
+
+	// generalize this based on a css class attached to what should be inserted
+	var content = ' ' + $(this).find(".embed-insert").parent().html() + ' ';
+
+	// this is a temporary work-around for #3971
+	if (content.indexOf('thumbnail.php') != -1) {
+		content = content.replace('size=small', 'size=medium');
+	}
+
+	textArea.val(textArea.val() + content);
+	textArea.focus();
+	
+<?php
+// See the TinyMCE plugin for an example of this view
+echo elgg_view('embed/custom_insert_js');
+?>
+
+	elgg.ui.lightbox.close();
+
+	event.preventDefault();
+};
+
+/**
+ * Submit an upload form through Ajax
+ *
+ * Requires the jQuery Form Plugin. Because files cannot be uploaded with
+ * XMLHttpRequest, the plugin uses an invisible iframe. This results in the
+ * the X-Requested-With header not being set. To work around this, we are
+ * sending the header as a POST variable and Elgg's code checks for it in
+ * elgg_is_xhr().
+ *
+ * @param {Object} event
+ * @return bool
+ */
+elgg.embed.submit = function(event) {
+	$('.embed-wrapper .elgg-form-file-upload').hide();
+	$('.embed-throbber').show();
+	
+	$(this).ajaxSubmit({
+		dataType : 'json',
+		data     : { 'X-Requested-With' : 'XMLHttpRequest'},
+		success  : function(response) {
+			if (response) {
+				if (response.system_messages) {
+					elgg.register_error(response.system_messages.error);
+					elgg.system_message(response.system_messages.success);
+				}
+				if (response.status >= 0) {
+					var forward = $('input[name=embed_forward]').val();
+					var url = elgg.normalize_url('embed/tab/' + forward);
+					url = elgg.embed.addContainerGUID(url);
+					$('.embed-wrapper').parent().load(url);
+				} else {
+					// incorrect response, presumably an error has been displayed
+					$('.embed-throbber').hide();
+					$('.embed-wrapper .elgg-form-file-upload').show();
+				}
+			}
+
+			// ie 7 and 8 have a null response because of the use of an iFrame
+			// so just show the list after upload.
+			// http://jquery.malsup.com/form/#file-upload claims you can wrap JSON
+			// in a textarea, but a quick test didn't work, and that is fairly
+			// intrusive to the rest of the ajax system.
+			else if (response === undefined && $.browser.msie) {
+				var forward = $('input[name=embed_forward]').val();
+				var url = elgg.normalize_url('embed/tab/' + forward);
+				url = elgg.embed.addContainerGUID(url);
+				$('.embed-wrapper').parent().load(url);
+			}
+		},
+		error    : function(xhr, status) {
+			// @todo nothing for now
+		}
+	});
+
+	// this was bubbling up the DOM causing a submission
+	event.preventDefault();
+	event.stopPropagation();
+};
+
+/**
+ * Loads content within the lightbox
+ *
+ * @param {Object} event
+ * @return void
+ */
+elgg.embed.forward = function(event) {
+	// make sure container guid is passed
+	var url = $(this).attr('href');
+	url = elgg.embed.addContainerGUID(url);
+
+	$('.embed-wrapper').parent().load(url);
+	event.preventDefault();
+};
+
+/**
+ * Adds the container guid to a URL
+ *
+ * @param {string} url
+ * @return string
+ */
+elgg.embed.addContainerGUID = function(url) {
+	if (url.indexOf('container_guid=') == -1) {
+		var guid = $('input[name=embed_container_guid]').val();
+		return url + '?container_guid=' + guid;
+	} else {
+		return url;
+	}
+};
+
+elgg.register_hook_handler('init', 'system', elgg.embed.init);
diff --git a/mod/colorbox/views/default/js/lightbox.php b/mod/colorbox/views/default/js/lightbox.php
new file mode 100644
index 000000000..732092e2b
--- /dev/null
+++ b/mod/colorbox/views/default/js/lightbox.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Colorbox -- Stylesheet
+ *
+ * Used as a view because we need to pass a full URL to AlphaImageLoader.
+ *
+ * @package        Lorea
+ * @subpackage     Colorbox
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Usage
+ * Apply the class elgg-lightbox to links.
+ *
+ * Advanced Usage
+ * Elgg is distributed with the Colorbox jQuery library. Please go to
+ * http://www.jacklmoore.com/colorbox for more information on the options of this lightbox.
+ *
+ * Overriding
+ * In a plugin, override this view and override the registration for the
+ * lightbox JavaScript and CSS (@see elgg_views_boot()).
+ *
+ * @todo add support for passing options: $('#myplugin-lightbox').elgg.ui.lightbox(options);
+ */
+
+?>
+
+/**
+ * Lightbox initialization
+ */
+
+elgg.provide('elgg.ui.lightbox');
+
+elgg.ui.lightbox.init = function() {
+
+	$.extend($.colorbox.settings, {
+		current: elgg.echo('js:lightbox:current', ['{current}', '{total}']),
+		previous: elgg.echo('previous'),
+		next: elgg.echo('next'),
+		close: elgg.echo('close'),
+		xhrError: elgg.echo('error:default'),
+		imgError: elgg.echo('error:default'),
+	});
+
+	$(".elgg-lightbox").colorbox();
+	$(".elgg-lightbox-photo").colorbox({photo: true});
+	var n = 0;
+	$(".elgg-lightbox-gallery").each(function() {
+		$(this).find(".elgg-lightbox, .elgg-lightbox-photo")
+		.addClass("elgg-lightbox-" + n)
+		.colorbox({
+			rel: "elgg-lightbox-" + n++,
+		});
+	});
+}
+
+elgg.ui.lightbox.close = function() {
+	$.colorbox.close();
+}
+
+elgg.register_hook_handler('init', 'system', elgg.ui.lightbox.init);
+
+<?php
+
+$js_path = elgg_get_plugins_path();
+$js_path = "{$js_path}colorbox/vendors/jquery/colorbox/colorbox/jquery.colorbox-min.js";
+include $js_path;
diff --git a/mod/cool_theme/_graphics/ajax_loader.gif b/mod/cool_theme/_graphics/ajax_loader.gif
new file mode 100644
index 000000000..521a291d7
--- /dev/null
+++ b/mod/cool_theme/_graphics/ajax_loader.gif
diff --git a/mod/cool_theme/_graphics/ajax_loader_bw.gif b/mod/cool_theme/_graphics/ajax_loader_bw.gif
new file mode 100644
index 000000000..521a291d7
--- /dev/null
+++ b/mod/cool_theme/_graphics/ajax_loader_bw.gif
diff --git a/mod/cool_theme/_graphics/elgg_sprites.png b/mod/cool_theme/_graphics/elgg_sprites.png
new file mode 100644
index 000000000..c87c1b0cd
--- /dev/null
+++ b/mod/cool_theme/_graphics/elgg_sprites.png
diff --git a/mod/cool_theme/_graphics/favicon.ico b/mod/cool_theme/_graphics/favicon.ico
new file mode 100644
index 000000000..495a0ca5a
--- /dev/null
+++ b/mod/cool_theme/_graphics/favicon.ico
diff --git a/mod/cool_theme/documentation/documention.html b/mod/cool_theme/documentation/documention.html
new file mode 100644
index 000000000..77538e578
--- /dev/null
+++ b/mod/cool_theme/documentation/documention.html
@@ -0,0 +1,12 @@
+<HTML><HEAD><TITLE>Documentation</TITLE>
+<META NAME="Description" CONTENT="WISB documentation for Elgg developers">
+</HEAD>
+<FRAMESET rows="100%,*" frameborder=no border=0>
+<FRAME SRC="http://developers.wisb.me/elgg/">
+<FRAME SRC="" scrolling="No" noresize>
+</FRAMESET>
+<NOFRAME>
+<BODY>
+</BODY>
+</NOFRAME>
+</HTML>
+\ No newline at end of file
diff --git a/mod/cool_theme/languages/en.php b/mod/cool_theme/languages/en.php
new file mode 100644
index 000000000..6e25bf14f
--- /dev/null
+++ b/mod/cool_theme/languages/en.php
@@ -0,0 +1,50 @@
+<?php
+add_translation('en', array(
+	'annotation:group_topic_post:value:placeholder' => 'Leave a reply...',
+	'annotation:generic_comment:value:placeholder' => 'Leave a comment...',
+	
+	'composer:object:thewire' => "Status",
+	'composer:object:bookmarks' => "Bookmark",
+	'composer:object:blog' => "Blog",
+	'composer:annotation:messageboard' => "Post",
+	'composer:object:file' => 'File',
+	'composer:prompt' => 'Share',
+
+	'file:river:create' => 'uploaded a file',
+	'files' => 'Files',
+	
+	'friend:user:add' => "Add %s as Friend",
+	
+	'groups:add' => 'Create Group...',
+	'thanks' => 'Thanks',
+	'thanks_body' => 'Special thanks to all the Elgg staff!<br /><br/><ul><li><a href="http://community.elgg.org/profile/ewinslow">Evan Winslow</a></li><br /><li><a href="http://community.elgg.org/profile/Beck24">Matt Beckett</a></li><br /></li><a href="http://community.elgg.org">All the Elgg community</a></li><br /><br /><li><a href="../">And you of course because you downloaded my theme :-)</a></li></ul>',
+	'home' => 'Home',
+	'WISB:footer_wisb' => 'WISB',
+	'WISB:footer_developers' => 'Developers',
+	'WISB:footer_wisblog' => 'WISBlog',
+	'newsfeed' => 'News Feed',
+	
+	'profile:wall' => "Board",
+	'profile:info' => "Info",
+	'profile:activity:none' => "No activity to display",
+	
+	'likes:likethis' => 'Like',
+	'likes:remove' => 'Unlike',
+	
+	'notifications:personal' => "Notifications",
+	
+	'pages:river:create' => 'created a page',
+
+	'river:comment:object:thewire' => '',
+	'river:comments:all' => 'View all %d comments',
+	'river:messageboard:group:default' => '',
+	'river:replies:all' => 'View all %d replies',
+	'river:to' => '%s &#x25B6 %s',
+	
+	'rss:subscribe' => 'Subscribe via RSS',
+
+	'see:all' => 'See all',
+	
+	'settings:user' => 'Account Settings',
+	
+));
diff --git a/mod/cool_theme/languages/es.php b/mod/cool_theme/languages/es.php
new file mode 100644
index 000000000..41960388f
--- /dev/null
+++ b/mod/cool_theme/languages/es.php
@@ -0,0 +1,47 @@
+<?php
+add_translation('es', array(
+    'annotation:group_topic_post:value:placeholder' => 'Responder...',
+    'annotation:generic_comment:value:placeholder' => 'Comentar...',
+    
+    'composer:object:thewire' => "Estado",
+    'composer:object:bookmarks' => "Favoritos",
+    'composer:object:blog' => "Blog",
+    'composer:annotation:messageboard' => "Post",
+    'composer:object:file' => 'Archivo',
+    'composer:prompt' => 'Accion',
+
+    'file:river:create' => 'Archivo subido',
+    'files' => 'Archivos',
+    
+    'friend:user:add' => "Agregar %s como Amigo",
+    
+    'groups:add' => 'Crear Grupo...',
+    
+    'home' => 'Inicio',
+    
+    'newsfeed' => 'Noticias RSS',
+    
+    'profile:wall' => "Muro",
+    'profile:info' => "Info",
+    'profile:activity:none' => "No hay actividad para mostrar",
+    
+    'likes:likethis' => 'Me gusta',
+    'likes:remove' => 'Quitar Me gusta',
+    
+    'notifications:personal' => "Notificaciones",
+    
+    'pages:river:create' => 'Página creada',
+
+    'river:comment:object:thewire' => '',
+    'river:comments:all' => 'Ver todos %d los comentarios',
+    'river:messageboard:group:default' => '',
+    'river:replies:all' => 'Ver todas %d las respuestas',
+    'river:to' => '%s &#x25B6 %s',
+    
+    'rss:subscribe' => 'Subscribete via RSS',
+
+    'see:all' => 'Ver todo',
+    
+    'settings:user' => 'Configuracion de la cuenta',
+    
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/languages/fr.php b/mod/cool_theme/languages/fr.php
new file mode 100644
index 000000000..a1fd4a173
--- /dev/null
+++ b/mod/cool_theme/languages/fr.php
@@ -0,0 +1,36 @@
+<?php
+add_translation('fr', array(
+	'annotation:group_topic_post:value:placeholder' => 'Laisser une réponse...',
+	'annotation:generic_comment:value:placeholder' => 'Laisser un commentaire...',
+	'composer:object:thewire' => "Statut",
+	'composer:object:bookmarks' => "Lien",
+	'composer:object:blog' => "Blog",
+	'composer:annotation:messageboard' => "Post",
+	'composer:object:file' => 'Fichier',
+	'composer:prompt' => 'Partager',
+	'friend:user:add' => "Ajouter %s à mes amis",
+	'file:river:create' => 'a envoyé un fichier',
+	'file:group' => "Fichiers",
+	'bookmarks:group' => 'Liens',
+	'blog:group' => "Blog",
+	'pages:group' => 'Pages',
+	'questions:group' => "Questions",
+	'discussion:group' => 'Discussion',
+	'groups:activity' => "Activité",
+	'profile:wall' => "Mur",
+	'profile:info' => "Info",
+	'pages:river:create' => 'a créé une page',
+	'composer:prompt' => 'Partager',
+	'likes:likethis' => "J'aime",
+	'likes:remove' => "Je n'aime plus",
+	'river:comments:all' => 'Afficher les %d commentaires',
+	'pages:river:create' => 'a créé une page',
+	'newsfeed' => 'Fil d\'actualité',
+	'friend:user:add' => "Ajouter %s à mes amis",
+	'river:to' => '%s &#x25B6 %s',
+	'files' => 'Fichiers',
+	'river:comment:object:thewire' => '',
+	'groups:add' => 'Créer un groupe...',
+	'home' => 'Accueil',
+	'see:all' => 'Voir tous',
+));
diff --git a/mod/cool_theme/manifest.xml b/mod/cool_theme/manifest.xml
new file mode 100644
index 000000000..32f3ad287
--- /dev/null
+++ b/mod/cool_theme/manifest.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Ultimate Cool Theme</name>
+	<author>Stan Larroque</author>
+	<version>2.1</version>
+	<category>theme</category>
+	<description>
+		I just made my best for this cool theme. Keep an eye on http://github.com/WISB for further stuff.
+	</description>
+	<website>https://developers.wisb.me/elgg/</website>
+	<copyright>(C) 2012 Stan Larroque</copyright>
+	<license>GNU Public License version 2</license>
+	
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8.3</version>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>groups</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>messageboard</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>messages</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>profile</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>search</plugin>
+	</requires>
+	<requires>
+		<type>priority</type>
+		<priority>after</priority>
+		<plugin>thewire</plugin>
+	</requires>
+	
+	<suggests>
+		<type>plugin</type>
+		<name>profile</name>
+		<version>1.8</version>
+	</suggests>
+</plugin_manifest>
diff --git a/mod/cool_theme/pages/credits.php b/mod/cool_theme/pages/credits.php
new file mode 100644
index 000000000..507211f0e
--- /dev/null
+++ b/mod/cool_theme/pages/credits.php
@@ -0,0 +1,15 @@
+<?php
+gatekeeper();
+
+$user = elgg_get_logged_in_user_entity();
+
+elgg_set_page_owner_guid($user->guid);
+
+$title = elgg_echo('thanks');
+elgg_set_page_owner_guid(1);
+$content = elgg_view_layout('two_sidebar', array(
+	'title' => $title,
+	'content' => elgg_echo('thanks_body'),
+));
+
+echo elgg_view_page($title, $content);
+\ No newline at end of file
diff --git a/mod/cool_theme/pages/dashboard.php b/mod/cool_theme/pages/dashboard.php
new file mode 100644
index 000000000..12bfeca64
--- /dev/null
+++ b/mod/cool_theme/pages/dashboard.php
@@ -0,0 +1,29 @@
+<?php
+gatekeeper();
+
+$user = elgg_get_logged_in_user_entity();
+
+elgg_set_page_owner_guid($user->guid);
+
+$title = elgg_echo('newsfeed');
+
+$composer = elgg_view('page/elements/composer', array('entity' => $user));
+
+
+$db_prefix = elgg_get_config('dbprefix');
+$activity = elgg_list_river(array(
+	'joins' => array("JOIN {$db_prefix}entities object ON object.guid = rv.object_guid"),
+	'wheres' => array("
+		rv.subject_guid = $user->guid
+		OR rv.subject_guid IN (SELECT guid_two FROM {$db_prefix}entity_relationships WHERE guid_one=$user->guid AND relationship='follower')
+		OR rv.subject_guid IN (SELECT guid_one FROM {$db_prefix}entity_relationships WHERE guid_two=$user->guid AND relationship='friend')
+	"),
+));
+
+elgg_set_page_owner_guid(1);
+$content = elgg_view_layout('two_sidebar', array(
+	'title' => $title,
+	'content' => $composer . $activity,
+));
+
+echo elgg_view_page($title, $content);
+\ No newline at end of file
diff --git a/mod/cool_theme/pages/groups/info.php b/mod/cool_theme/pages/groups/info.php
new file mode 100644
index 000000000..cdf84d052
--- /dev/null
+++ b/mod/cool_theme/pages/groups/info.php
@@ -0,0 +1,27 @@
+<?php
+// turn this into a core function
+global $autofeed;
+$autofeed = true;
+
+$group = elgg_get_page_owner_entity();
+if (!$group instanceof ElggGroup) {
+	forward('groups/all');
+}
+
+elgg_load_library('elgg:groups');
+groups_register_profile_buttons($group);
+
+$content = elgg_view('groups/profile/layout', array('entity' => $group));
+if (group_gatekeeper(false)) {
+	$sidebar = elgg_view('groups/sidebar/members', array('entity' => $group));
+} else {
+	$sidebar = '';
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'content' => $content,
+	'sidebar_alt' => $sidebar,
+	'title' => $group->name,
+));
+
+echo elgg_view_page($group->name, $body);
+\ No newline at end of file
diff --git a/mod/cool_theme/pages/groups/wall.php b/mod/cool_theme/pages/groups/wall.php
new file mode 100644
index 000000000..9a273e262
--- /dev/null
+++ b/mod/cool_theme/pages/groups/wall.php
@@ -0,0 +1,35 @@
+<?php
+
+$group = elgg_get_page_owner_entity();
+
+if (!$group || !elgg_instanceof($group, 'group')) {
+	register_error(elgg_echo('groups:notfound'));
+	forward();
+}
+
+elgg_load_library('elgg:groups');
+groups_register_profile_buttons($group);
+
+$title = $group->name;
+
+$composer = '';
+if (elgg_is_logged_in()) {
+	$composer = elgg_view('page/elements/composer', array('entity' => $group));
+}
+
+$db_prefix = elgg_get_config('dbprefix');
+$activity = elgg_list_river(array(
+	'joins' => array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"),
+	'wheres' => array("e.container_guid = $group->guid OR rv.object_guid = $group->guid"),
+));
+
+if (!$activity) {
+	$activity = elgg_view('output/longtext', array('value' => elgg_echo('group:activity:none')));
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'title' => $title,
+	'content' => $composer . $activity,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/cool_theme/pages/profile/info.php b/mod/cool_theme/pages/profile/info.php
new file mode 100644
index 000000000..9dc40c4c7
--- /dev/null
+++ b/mod/cool_theme/pages/profile/info.php
@@ -0,0 +1,9 @@
+<?php
+$user = elgg_get_page_owner_entity();
+
+$body = elgg_view_layout('two_sidebar', array(
+	'title' => $user->name,
+	'content' => elgg_view('profile/details'),
+));
+
+echo elgg_view_page($title, $body);
+\ No newline at end of file
diff --git a/mod/cool_theme/pages/profile/wall.php b/mod/cool_theme/pages/profile/wall.php
new file mode 100644
index 000000000..48d3b8646
--- /dev/null
+++ b/mod/cool_theme/pages/profile/wall.php
@@ -0,0 +1,32 @@
+<?php
+
+$user = elgg_get_page_owner_entity();
+
+if (!$user || !elgg_instanceof($user, 'user')) {
+	register_error(elgg_echo('profile:notfound'));
+	forward();
+}
+
+$title = $user->name;
+
+$composer = '';
+if (elgg_is_logged_in()) {
+	$composer = elgg_view('page/elements/composer', array('entity' => $user));
+}
+
+$db_prefix = elgg_get_config('dbprefix');
+$activity = elgg_list_river(array(
+	'joins' => array("JOIN {$db_prefix}entities e ON e.guid = rv.object_guid"),
+	'wheres' => array("e.container_guid = $user->guid OR rv.object_guid = $user->guid")
+));
+
+if (!$activity) {
+	$activity = elgg_view('output/longtext', array('value' => elgg_echo('profile:activity:none')));
+}
+
+$body = elgg_view_layout('two_sidebar', array(
+	'content' => $composer . $activity,
+	'title' => $title,
+));
+
+echo elgg_view_page($title, $body);
diff --git a/mod/cool_theme/readme.md b/mod/cool_theme/readme.md
new file mode 100644
index 000000000..2e64f94e5
--- /dev/null
+++ b/mod/cool_theme/readme.md
@@ -0,0 +1,8 @@
+Upgrade from cool_theme 1.0 :
+-------------
+
+1. Deactivate your cool_theme version
+2. Delete it from your server
+3. Upload this version to your mod/ directory
+4. Activate cool_theme...
+Easy :-)
+\ No newline at end of file
diff --git a/mod/cool_theme/screenshot.png b/mod/cool_theme/screenshot.png
new file mode 100644
index 000000000..efcadc7c7
--- /dev/null
+++ b/mod/cool_theme/screenshot.png
diff --git a/mod/cool_theme/start.php b/mod/cool_theme/start.php
new file mode 100644
index 000000000..b3876fa0d
--- /dev/null
+++ b/mod/cool_theme/start.php
@@ -0,0 +1,676 @@
+<?php
+
+function cool_theme_init() {
+	/**
+	 * Customize pages
+	 */
+	elgg_register_plugin_hook_handler('index', 'system', 'facebook_theme_index_handler');
+	elgg_register_page_handler('profile', 'facebook_theme_profile_page_handler');
+	elgg_register_page_handler('dashboard', 'facebook_theme_dashboard_handler');
+	elgg_register_page_handler('thanks', 'cool_theme_credits_handler');
+	elgg_register_event_handler('pagesetup', 'system', 'friends_hack_pagesetup_handler');
+
+
+	
+	//What a hack!  Overriding groups page handler without blowing away other plugins doing the same
+	global $CONFIG, $facebook_theme_original_groups_page_handler;
+	$facebook_theme_original_groups_page_handler = $CONFIG->pagehandler['groups'];
+	elgg_register_page_handler('groups', 'facebook_theme_groups_page_handler');
+	
+	elgg_register_ajax_view('thewire/composer');
+	elgg_register_ajax_view('messageboard/composer');
+	elgg_register_ajax_view('blog/composer');
+	elgg_register_ajax_view('file/composer');
+	elgg_register_ajax_view('bookmarks/composer');
+	
+	/**
+	 * Customize menus
+	 */
+	elgg_unregister_plugin_hook_handler('register', 'menu:river', 'likes_river_menu_setup');
+	elgg_unregister_plugin_hook_handler('register', 'menu:river', 'elgg_river_menu_setup');
+	
+	elgg_register_plugin_hook_handler('register', 'menu:river', 'facebook_theme_river_menu_handler');
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'facebook_theme_owner_block_menu_handler', 600);
+	elgg_register_plugin_hook_handler('register', 'menu:composer', 'facebook_theme_composer_menu_handler');
+	
+	elgg_register_event_handler('pagesetup', 'system', 'facebook_theme_pagesetup_handler', 1000);
+	
+	/**
+	 * Customize permissions
+	 */
+	elgg_register_plugin_hook_handler('permissions_check:annotate', 'all', 'facebook_theme_annotation_permissions_handler');
+	elgg_register_plugin_hook_handler('container_permissions_check', 'all', 'facebook_theme_container_permissions_handler');
+	
+	/**
+	 * Miscellaneous customizations
+	 */
+	//Small "correction" to groups profile -- brief description makes more sense to come first!
+	elgg_register_plugin_hook_handler('profile:fields', 'group', 'facebook_theme_group_profile_fields', 1);
+		
+	//@todo report some of the extra patterns to be included in Elgg core
+	elgg_extend_view('css/elgg', 'cool_theme/css');
+	elgg_extend_view('js/elgg', 'js/topbar');
+	
+	//Likes summary bar -- "You, John, and 3 others like this"
+	if (elgg_is_active_plugin('likes')) {
+		elgg_extend_view('river/elements/responses', 'likes/river_footer', 1);
+	}
+	
+	elgg_extend_view('river/elements/responses', 'discussion/river_footer');
+	
+	//Elgg only includes the search bar in the header by default,
+	//but we usually don't show the header when the user is logged in
+	if (elgg_is_active_plugin('search')) {
+		elgg_extend_view('page/elements/topbar', 'search/search_box');
+		elgg_unextend_view('page/elements/header', 'search/search_box');
+		
+		if (!elgg_is_logged_in()) {
+			elgg_unextend_view('page/elements/header', 'search/header');
+		}
+	}
+}
+function friends_hack_pagesetup_handler() {
+elgg_unregister_menu_item('topbar', 'friends');
+
+}
+function facebook_theme_groups_page_handler($segments, $handle) {
+	$pages_dir = dirname(__FILE__) . '/pages';
+
+	switch ($segments[0]) {
+		case 'profile':
+			elgg_set_page_owner_guid($segments[1]);
+			require_once "$pages_dir/groups/wall.php";
+			break;
+			
+		case 'info':
+			elgg_set_page_owner_guid($segments[1]);
+			require_once "$pages_dir/groups/info.php";
+			break;
+			
+		case 'discussion':
+			elgg_set_page_owner_guid($segments[1]);
+			require_once "$pages_dir/groups/discussion.php";
+			break;
+			
+		default:
+			global $facebook_theme_original_groups_page_handler;
+			return call_user_func($facebook_theme_original_groups_page_handler, $segments, $handle);
+	}
+	return true;
+}
+
+function facebook_theme_pagesetup_handler() {
+	$owner = elgg_get_page_owner_entity();
+
+	if (elgg_is_logged_in()) {
+		$user = elgg_get_logged_in_user_entity();
+		elgg_register_menu_item('page', array(
+			'name' => 'news',
+			'text' => elgg_view_icon('newsfeed') . elgg_echo('newsfeed'),
+			'href' => '/dashboard',
+			'priority' => 100,
+			'contexts' => array('dashboard'),
+		));
+		if (elgg_is_active_plugin('message')) {
+			elgg_register_menu_item('page', array(
+				'name' => 'Inbox',
+				'text' => elgg_view_icon('messages') . elgg_echo('Inbox'),
+				'href' => "/messages/",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		elgg_register_menu_item('page', array(
+			'name' => 'friends',
+			'text' => elgg_view_icon('friends') . elgg_echo('friends'),
+			'href' => "/friends/$user->username",
+			'priority' => 500,
+			'contexts' => array('dashboard'),
+		));
+	
+		if ($owner instanceof ElggUser && $owner->guid != $user->guid) {
+			
+			if (check_entity_relationship($user->guid, 'friend', $owner->guid)) {
+				elgg_register_menu_item('extras', array(
+					'name' => 'removefriend',
+					'text' => elgg_echo('friend:remove'),
+					'href' => "/action/friends/remove?friend=$owner->guid",
+					'is_action' => TRUE,
+					'contexts' => array('profile'),
+				));
+			} else {
+				elgg_register_menu_item('title', array(
+					'name' => 'addfriend',
+					'text' => elgg_view_icon('addfriend') . elgg_echo('friend:add'),
+					'href' => "/action/friends/add?friend=$owner->guid",
+					'is_action' => TRUE,
+					'link_class' => 'elgg-button elgg-button-special',
+					'contexts' => array('profile'),
+					'priority' => 1,
+				));
+			}
+			
+			if (elgg_is_active_plugin('messages')) {
+				elgg_register_menu_item('title', array(
+					'name' => 'message',
+					'text' => elgg_view_icon('messages') . elgg_echo('messages:message'),
+					'href' => "/messages/compose?send_to=$owner->guid",
+					'link_class' => 'elgg-button elgg-button-action',
+					'contexts' => array('profile'),
+				));
+			}
+		}
+		
+		if ($owner->guid == $user->guid) {
+			elgg_register_menu_item('title', array(
+				'name' => 'editprofile',
+				'href' => "/profile/$user->username/edit",
+				'text' => elgg_echo('profile:edit'),
+				'link_class' => 'elgg-button elgg-button-action',
+				'contexts' => array('profile'),
+			));
+		}
+		
+		if (elgg_is_active_plugin('groups')) {
+			$groups = $user->getGroups('', 4);
+			
+			foreach ($groups as $group) {
+				elgg_register_menu_item('page', array(
+					'section' => 'groups',
+					'name' => "group-$group->guid",
+					'text' => elgg_view_icon('users') . $group->name,
+					'href' => $group->getURL(),
+					'contexts' => array('dashboard'),
+				));
+			}
+			
+			elgg_register_menu_item('page', array(
+				'name' => 'groups-add',
+				'section' => 'groups',
+				'text' => elgg_view_icon('addgroup') . elgg_echo('groups:add'),
+				'href' => "/groups/add",
+				'contexts' => array('dashboard'),
+				'priority' => 499,
+			));
+			
+			elgg_register_menu_item('page', array(
+				'section' => 'groups',
+				'name' => 'groups',
+				'text' => elgg_echo('see:all'),
+				'href' => "/groups/member/$user->username",
+				'contexts' => array('dashboard'),
+				'priority' => 500,
+			));
+		}
+		
+		if (elgg_is_active_plugin('tidypics')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',	
+				'name' => 'photos',
+				'text' => elgg_view_icon('photo') . elgg_echo("photos"),
+				'href' => "/photos/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		if (elgg_is_active_plugin('bookmarks')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',
+				'name' => 'bookmarks',
+				'text' => elgg_view_icon('push-pin') . elgg_echo('bookmarks'),	
+				'href' => "/bookmarks/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		if (elgg_is_active_plugin('blog')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',	
+				'name' => 'blog',
+				'text' => elgg_view_icon('speech-bubble-alt') . elgg_echo('blog'),
+				'href' => "/blog/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		if (elgg_is_active_plugin('pages')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',	
+				'name' => 'pages',
+				'text' => elgg_view_icon('list') . elgg_echo('pages'),
+				'href' => "/pages/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		if (elgg_is_active_plugin('file')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',	
+				'name' => 'files',
+				'text' => elgg_view_icon('clip') . elgg_echo('files'),
+				'href' => "/file/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+
+		if (elgg_is_active_plugin('thewire')) {
+			elgg_register_menu_item('page', array(
+				'section' => 'more',
+				'name' => 'thewire',
+				'text' => elgg_view_icon('share') . elgg_echo('thewire'),
+				'href' => "/thewire/friends/$user->username",
+				'contexts' => array('dashboard'),
+			));
+		}
+		
+		$address = urlencode(current_page_url());
+		
+		if (elgg_is_active_plugin('bookmarks')) {
+			elgg_register_menu_item('extras', array(
+				'name' => 'bookmark',
+				'text' => elgg_view_icon('link') . elgg_echo('bookmarks:this'),
+				'href' => "bookmarks/add/$user->guid?address=$address",
+				'title' => elgg_echo('bookmarks:this'),
+				'rel' => 'nofollow',
+			));
+		}
+		
+		if (elgg_is_active_plugin('reportedcontent')) {
+			elgg_unregister_menu_item('footer', 'report_this');
+		
+			$href = "javascript:elgg.forward('reportedcontent/add'";
+			$href .= "+'?address='+encodeURIComponent(location.href)";
+			$href .= "+'&title='+encodeURIComponent(document.title));";
+				
+			elgg_register_menu_item('extras', array(
+				'name' => 'report_this',
+				'href' => $href,
+				'text' => elgg_view_icon('report-this') . elgg_echo('reportedcontent:this'),
+				'title' => elgg_echo('reportedcontent:this:tooltip'),
+				'priority' => 500,
+			));
+		}
+		
+		/**
+		 * TOPBAR customizations
+		 */
+		//Want our logo present, not Elgg's
+		$site = elgg_get_site_entity();
+		elgg_unregister_menu_item('topbar', 'elgg_logo');
+		elgg_register_menu_item('topbar', array(
+			'href' => '/',
+			'name' => 'logo',
+			'priority' => 1,
+			'text' => "<h1 id=\"facebook-topbar-logo\">$site->name</h1>",
+		));
+	
+		elgg_register_menu_item('topbar', array(
+			'href' => '/dashboard',
+			'name' => 'home',
+			'priority' => 2,
+			'section' => 'alt',
+			'text' => elgg_echo('home'),
+		));
+		
+		if (elgg_is_active_plugin('profile')) {
+			elgg_unregister_menu_item('topbar', 'profile');
+			elgg_register_menu_item('topbar', array(
+				'name' => 'profile',
+				'section' => 'alt',
+				'text' => "<img src=\"{$user->getIconURL('topbar')}\" class=\"elgg-icon elgg-inline-block\" alt=\"$user->name\"/>" . $user->name,
+				'href' => "/profile/$user->username",
+				'priority' => 1,
+			));
+		}
+		
+		elgg_register_menu_item('topbar', array(
+			'href' => "#",
+			'name' => 'account',
+			'priority' => 1000,
+			'section' => 'alt',
+			'text' => '',
+			'data-toggle' => 'dropdown',
+		));
+
+		elgg_unregister_menu_item('topbar', 'usersettings');
+		elgg_register_menu_item('topbar', array(
+			'href' => "/settings/user/$user->username",
+			'name' => 'usersettings',
+			'parent_name' => 'account',
+			'section' => 'alt',
+			'text' => elgg_echo('settings:user'),
+		));
+		
+		if (elgg_is_active_plugin('notifications')) {
+			elgg_register_menu_item('topbar', array(
+				'href' => "/notifications/personal",
+				'name' => 'notifications',
+				'parent_name' => 'account',
+				'section' => 'alt',
+				'text' => elgg_echo('notifications:personal'),
+			));
+		}
+		
+		elgg_unregister_menu_item('topbar', 'logout');
+		elgg_register_menu_item('topbar', array(
+			'href' => '/action/logout',
+			'is_action' => TRUE,
+			'name' => 'logout',
+			'parent_name' => 'account',
+			'priority' => 1000, //want this to be at the bottom of the list no matter what
+			'section' => 'alt',
+			'text' => elgg_echo('logout'),
+		));
+	}
+	
+}
+
+function facebook_theme_dashboard_handler() {
+	require_once dirname(__FILE__) . '/pages/dashboard.php';
+	return true;
+}
+function cool_theme_credits_handler() {
+	require_once dirname(__FILE__) . '/pages/credits.php';
+	return true;
+}
+function facebook_theme_index_handler() {
+	if (elgg_is_logged_in()) {
+		forward('/dashboard');
+	}
+}
+
+function facebook_theme_container_permissions_handler($hook, $type, $result, $params) {
+	$container = $params['container'];
+	$subtype = $params['subtype'];
+	
+	if ($container instanceof ElggGroup) {
+		if ($subtype == 'thewire') {
+			return false;
+		}
+	}
+}
+
+function facebook_theme_annotation_permissions_handler($hook, $type, $result, $params) {
+	$entity = $params['entity'];
+	$user = $params['user'];
+	$annotation_name = $params['annotation_name'];
+	
+	//Users should not be able to post on their own message board
+	if ($annotation_name == 'messageboard' && $user->guid == $entity->guid) {
+		return false;
+	}
+	
+	//No "commenting" on users, must use messageboard
+	if ($annotation_name == 'generic_comment' && $entity instanceof ElggUser) {
+		return false;
+	}
+	
+	//No "commenting" on forum topics, must use special "reply" annotation
+	if ($annotation_name == 'generic_comment' && elgg_instanceof($entity, 'object', 'groupforumtopic')) {
+		return false;
+	}
+	
+	//Definitely should be able to "like" a forum topic!
+	if ($annotation_name == 'likes' && elgg_instanceof($entity, 'object', 'groupforumtopic')) {
+		return true;
+	}
+	
+	if ($annotation_name == 'group_topic_post' && !elgg_instanceof($entity, 'object', 'groupforumtopic')) {
+		return false;
+	}
+}
+
+/**
+ * Adds menu items to the "composer" at the top of the "wall".  Need to also add
+ * the forms that these items point to.
+ * 
+ * @todo Get the composer concept integrated into core
+ */
+function facebook_theme_composer_menu_handler($hook, $type, $items, $params) {
+    $entity = $params['entity'];
+
+    $pageowner = elgg_get_page_owner_entity();
+
+    if (elgg_is_active_plugin('thewire') && $entity->canWriteToContainer(0, 'object', 'thewire') && $pageowner->username == $_SESSION['user']->username) {
+        $items[] = ElggMenuItem::factory(array(
+            'name' => 'thewire',
+            'href' => "/ajax/view/thewire/composer?container_guid=$entity->guid",
+            'text' => elgg_view_icon('share') . elgg_echo("composer:object:thewire"),
+            'priority' => 100,
+        ));
+
+		
+		//trigger any javascript loads that we might need
+		elgg_view('thewire/composer');
+	}
+	
+	if (elgg_is_active_plugin('messageboard') && $entity->canAnnotate(0, 'messageboard')) {
+		$items[] = ElggMenuItem::factory(array(
+			'name' => 'messageboard',
+			'href' => "/ajax/view/messageboard/composer?entity_guid=$entity->guid",
+			'text' => elgg_view_icon('speech-bubble-alt') . elgg_echo("composer:annotation:messageboard"),
+			'priority' => 200,
+		));
+		
+		//trigger any javascript loads that we might need
+		elgg_view('messageboard/composer');
+	}
+	
+	if (elgg_is_active_plugin('bookmarks') && $entity->canWriteToContainer(0, 'object', 'bookmarks')) {
+		$items[] = ElggMenuItem::factory(array(
+			'name' => 'bookmarks',
+			'href' => "/ajax/view/bookmarks/composer?container_guid=$entity->guid",
+			'text' => elgg_view_icon('push-pin') . elgg_echo("composer:object:bookmarks"),
+			'priority' => 300,
+		));
+		
+		//trigger any javascript loads that we might need
+		elgg_view('bookmarks/composer');
+	}
+	
+	if (elgg_is_active_plugin('blog') && $entity->canWriteToContainer(0, 'object', 'blog')) {
+		$items[] = ElggMenuItem::factory(array(
+			'name' => 'blog',
+			'href' => "/ajax/view/blog/composer?container_guid=$entity->guid",
+			'text' => elgg_view_icon('speech-bubble') . elgg_echo("composer:object:blog"),
+			'priority' => 600,
+		));
+		
+		//trigger any javascript loads that we might need
+		elgg_view('blog/composer');
+	}
+	
+	if (elgg_is_active_plugin('file') && $entity->canWriteToContainer(0, 'object', 'file')) {
+		$items[] = ElggMenuItem::factory(array(
+			'name' => 'file',
+			'href' => "/ajax/view/file/composer?container_guid=$entity->guid",
+			'text' => elgg_view_icon('clip') . elgg_echo("composer:object:file"),
+			'priority' => 700,
+		));
+		
+		//trigger any javascript loads that we might need
+		elgg_view('file/composer');
+	}
+	
+	return $items;
+}
+
+function facebook_theme_group_profile_fields($hook, $type, $fields, $params) {
+	return array(
+		'briefdescription' => 'text',
+		'description' => 'longtext',
+		'interests' => 'tags',
+	);
+}
+
+function facebook_theme_owner_block_menu_handler($hook, $type, $items, $params) {
+	$owner = elgg_get_page_owner_entity();
+	
+	if ($owner instanceof ElggGroup) {
+		$items['info'] = ElggMenuItem::factory(array(
+			'name' => 'info', 
+			'text' => elgg_view_icon('info') . elgg_echo('profile:info'), 
+			'href' => "/groups/info/$owner->guid/" . elgg_get_friendly_title($owner->name),
+			'priority' => 2,
+		));
+		
+		$items['profile'] = ElggMenuItem::factory(array(
+			'name' => 'profile',
+			'text' => elgg_view_icon('userwall') . elgg_echo('profile:wall'),
+			'href' => "/groups/profile/$owner->guid/" . elgg_get_friendly_title($owner->name),
+			'priority' => 1,
+		));
+	}
+	
+	if ($owner instanceof ElggUser) {
+		$items['info'] = ElggMenuItem::factory(array(
+			'name' => 'info', 
+			'text' => elgg_view_icon('info') . elgg_echo('profile:info'), 
+			'href' => "/profile/$owner->username/info",
+			'priority' => 2,
+		));
+		
+		$items['profile'] = ElggMenuItem::factory(array(
+			'name' => 'profile',
+			'text' => elgg_view_icon('userwall') . elgg_echo('profile:wall'),
+			'href' => "/profile/$owner->username",
+			'priority' => 1,
+		));
+		
+		$items['friends'] = ElggMenuItem::factory(array(
+			'name' => 'friends',	
+			'text' => elgg_view_icon('friends') . elgg_echo('friends'),
+			'href' => "/friends/$owner->username"
+		));
+	}
+	$top_level_pages = elgg_get_entities(array(
+		'type' => 'object',
+		'subtype' => 'page_top',
+		'container_guid' => $owner->guid,
+		'limit' => 0,
+	));
+	
+	foreach ($top_level_pages as $page) {
+		$items["pages-$page->guid"] = ElggMenuItem::factory(array(
+			'name' => "pages-$page->guid",
+			'href' => $page->getURL(),
+			'text' => elgg_view_icon('page') . elgg_view('output/text', array('value' => $page->title)),
+		));
+	}
+	
+	return $items;
+	
+}
+
+function facebook_theme_river_menu_handler($hook, $type, $items, $params) {
+	$item = $params['item'];
+
+	$object = $item->getObjectEntity();
+	if (!elgg_in_context('widgets') && !$item->annotation_id && $object instanceof ElggEntity) {
+		if (elgg_is_active_plugin('likes') && $object->canAnnotate(0, 'likes')) {
+			if (!elgg_annotation_exists($object->getGUID(), 'likes')) {
+				$options = array(
+					'name' => 'like',
+					'href' => "action/likes/add?guid={$object->guid}",
+					'text' => elgg_echo('likes:likethis'),
+					'is_action' => true,
+					'priority' => 100,
+				);
+			} else {
+				$options = array(
+					'name' => 'like',
+					'href' => "action/likes/delete?guid={$object->guid}",
+					'text' => elgg_echo('likes:remove'),
+					'is_action' => true,
+					'priority' => 100,
+				);
+			}
+			
+			$items[] = ElggMenuItem::factory($options);
+		}
+		
+		if ($object->canAnnotate(0, 'generic_comment')) {
+			$items[] = ElggMenuItem::factory(array(
+				'name' => 'comment',
+				'href' => "#comments-add-$object->guid",
+				'text' => elgg_echo('comment'),
+				'title' => elgg_echo('comment:this'),
+				'rel' => "toggle",
+				'priority' => 50,
+			));
+		}
+		
+		if ($object instanceof ElggUser && !$object->isFriend() && $owner->guid != $user->guid) {
+			$items[] = ElggMenuItem::factory(array(
+				'name' => 'addfriend',
+				'href' => "/action/friends/add?friend=$object->guid",
+				'text' => elgg_view_icon('addfriend') . elgg_echo('friend:user:add', array($object->name)),
+				'is_action' => TRUE,
+			));
+		}
+		if (elgg_instanceof($object, 'object', 'groupforumtopic')) {
+			$items[] = ElggMenuItem::factory(array(
+				'name' => 'reply',
+				'href' => "#groups-reply-$object->guid",
+				'title' => elgg_echo('reply:this'),
+				'text' => elgg_echo('reply'),
+			));
+		}
+	}
+
+	return $items;
+}
+
+/**
+ * Profile page handler
+ *
+ * @param array $page Array of page elements, forwarded by the page handling mechanism
+ */
+function facebook_theme_profile_page_handler($page) {
+	if (isset($page[0])) {
+		$username = $page[0];
+		$user = get_user_by_username($username);
+		elgg_set_page_owner_guid($user->guid);
+	}
+
+	// short circuit if invalid or banned username
+	if (!$user || ($user->isBanned() && !elgg_is_admin_logged_in())) {
+		register_error(elgg_echo('profile:notfound'));
+		forward();
+	}
+
+	$action = NULL;
+	if (isset($page[1])) {
+		$action = $page[1];
+	}
+
+	switch ($action) {
+		case 'edit':
+			// use for the core profile edit page
+			global $CONFIG;
+			global $autofeed;
+			$autofeed = false;
+			require $CONFIG->path . 'pages/profile/edit.php';
+			break;
+		
+		case 'info':
+			require dirname(__FILE__) . '/pages/profile/info.php';
+			break;
+			
+		case 'wall':
+			require dirname(__FILE__) . '/pages/profile/wall.php';
+			break;
+			
+		default:
+			if (elgg_is_logged_in()) {
+				require dirname(__FILE__) . '/pages/profile/wall.php';
+			} else {
+				require dirname(__FILE__) . '/pages/profile/info.php';
+			}
+			break;
+	}
+	
+	return true;
+}
+
+elgg_register_event_handler('init', 'system', 'cool_theme_init');
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/annotation/generic_comment.php b/mod/cool_theme/views/default/annotation/generic_comment.php
new file mode 100644
index 000000000..d15ae2325
--- /dev/null
+++ b/mod/cool_theme/views/default/annotation/generic_comment.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * Elgg generic comment view
+ *
+ * @uses $vars['annotation']    ElggAnnotation object
+ * @uses $vars['full']          Display fill view or brief view
+ */
+
+if (!isset($vars['annotation'])) {
+	return true;
+}
+
+$full_view = elgg_extract('full', $vars, true);
+
+$comment = $vars['annotation'];
+
+$entity = get_entity($comment->entity_guid);
+$commenter = get_user($comment->owner_guid);
+if (!$entity || !$commenter) {
+	return true;
+}
+
+$friendlytime = elgg_view_friendly_time($comment->time_created);
+
+$commenter_icon = elgg_view_entity_icon($commenter, 'tiny');
+$commenter_link = "<a href=\"{$commenter->getURL()}\" class=\"elgg-river-subject\">$commenter->name</a>";
+
+$entity_title = $entity->title ? $entity->title : elgg_echo('untitled');
+$entity_link = "<a href=\"{$entity->getURL()}\">$entity_title</a>";
+
+if ($full_view) {
+
+	$delete_button = '';
+	if ($comment->canEdit()) {
+		$url = "action/comments/delete?annotation_id=$comment->id";
+		$delete_button = elgg_view("output/confirmlink", array(
+			'href' => $url,
+			'class' => 'right',
+			'text' => elgg_view_icon('delete'),
+			'confirm' => elgg_echo('deleteconfirm'),
+			'text_encode' => false,
+		));
+	}
+
+	$comment_text = elgg_view("output/longtext", array("value" => $comment->value));
+
+	$body = <<<HTML
+$delete_button
+$commenter_link
+$comment_text
+<span class="elgg-subtext">
+	$friendlytime
+</span>
+HTML;
+
+	echo elgg_view_image_block($commenter_icon, $body);
+
+} else {
+	// brief view
+
+	//@todo need link to actual comment!
+
+	$on = elgg_echo('on');
+
+	$body = <<<HTML
+<span class="elgg-subtext">
+	$commenter_link $on $entity_link ($friendlytime)
+</span>
+HTML;
+
+	echo elgg_view_image_block($commenter_icon, $body);
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/blog/composer.php b/mod/cool_theme/views/default/blog/composer.php
new file mode 100644
index 000000000..135e70015
--- /dev/null
+++ b/mod/cool_theme/views/default/blog/composer.php
@@ -0,0 +1,10 @@
+<?php
+elgg_load_library('elgg:blog');
+$body_vars = blog_prepare_form_vars();
+
+//hack! Elgg engine should take care of this, or blog/save form should be coded better
+if (elgg_is_xhr() && isset($vars['container_guid'])) {
+	elgg_set_page_owner_guid($vars['container_guid']);
+}
+
+echo elgg_view_form('blog/save', array(), array_merge($body_vars, $vars));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/bookmarks/composer.php b/mod/cool_theme/views/default/bookmarks/composer.php
new file mode 100644
index 000000000..52dfa69ca
--- /dev/null
+++ b/mod/cool_theme/views/default/bookmarks/composer.php
@@ -0,0 +1,3 @@
+<?php
+elgg_load_library('elgg:bookmarks');
+echo elgg_view_form('bookmarks/save', array(), $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/cool_theme/css.php b/mod/cool_theme/views/default/cool_theme/css.php
new file mode 100644
index 000000000..f0757aa00
--- /dev/null
+++ b/mod/cool_theme/views/default/cool_theme/css.php
@@ -0,0 +1,11 @@
+<?php 
+/**
+ * Fixes/tweaks
+ */
+
+?>
+/* <style>
+/**/
+.elgg-icon{vertical-align:middle;} dl,dt,dd{margin:0;padding:0;}.elgg-profile{display:block;}.elgg-profile > dt{float:left;width:120px;font-weight:700;color:#999;padding:10px 0;}.elgg-profile > dd{padding:10px 0 10px 120px;}.elgg-profile > dd ~ dd{border-top:1px solid #E9E9E9;}.elgg-profile > dd + dd{padding-left:0;margin-left:120px;} img{max-width:100%;}#groups-tools > .elgg-module{width:229px;}#facebook-topbar-logo{margin-top:-4px;font-size:20px;color:#FFF;text-shadow:0 0 1px #AAA;width:100px;text-align:center;}#facebook-header-logo a{color:#FFF;text-decoration:none;font-size:2.5em;}.elgg-form-small input,.elgg-form-small textarea{font-size:11px;}.elgg-image-block-small > .elgg-image{margin-right:5px;}.ui-tabs-hide{display:none;}.elgg-composer{border-top:1px solid #CCC;padding-top:6px;margin-top:7px;}.elgg-composer > h4{height:22px;display:inline-block;vertical-align:baseline;color:gray;}.elgg-composer > .ui-tabs-panel{margin-top:5px;border:1px solid #B4BBCD;padding:10px;}.messageboard-input{margin-bottom:5px;height:60px;}.elgg-attachment-description{margin-top:5px;}#thewire-form-composer #thewire-textarea{margin-top:0;}#facebook-header-login{bottom:25px;position:absolute;right:0;}#facebook-header-login label{color:#FFF;display:block;font-weight:400;padding:2px 2px 4px;}#facebook-header-login .elgg-foot > label{bottom:-16px;color:#98A9CA;cursor:pointer;left:0;position:absolute;}#facebook-header-login div{display:inline-block;margin-bottom:3px;padding-right:10px;}#facebook-header-login .elgg-input-text,#facebook-header-login .elgg-input-password{color:#000;font-size:11px;width:150px;border-color:#1D2A5B;margin:0;padding:3px 3px 4px;}#facebook-header-login .elgg-menu{position:absolute;margin-left:-160px;}#facebook-header-login .elgg-menu > li{display:inline-block;margin-right:10px;}#facebook-header-login .elgg-menu > li > a{color:#98A9CA;display:inline;}#facebook-header-login .elgg-menu > li > a:hover{text-decoration:underline;}#facebook-header-login .elgg-button-submit{position:relative;top:10px;} input[type=checkbox]{vertical-align:bottom;}.label-edit-head{  max-width: 490px;height: 100%;background-color: #eeeeee;background-repeat: repeat-x;background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%);background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee));background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 );background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);border: 1px solid #e5e5e5;-webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px;margin-bottom: 5px;padding: 5px 8px;}
+.ui-autocomplete{background-color: #FFF;border: 1px solid #555;max-width:490px;}
+.elgg-autocomplete-item{border-top: 1px solid #E9E9E9;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/core/account/login_box.php b/mod/cool_theme/views/default/core/account/login_box.php
new file mode 100644
index 000000000..f39113653
--- /dev/null
+++ b/mod/cool_theme/views/default/core/account/login_box.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Elgg login box
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['module'] The module name. Default: aside
+ */
+
+$module = elgg_extract('module', $vars, 'aside');
+
+$login_url = elgg_get_site_url();
+if (elgg_get_config('https_login')) {
+	$login_url = str_replace("http:", "https:", $login_url);
+}
+
+$title = elgg_echo('login');
+$body = elgg_view_form('login', array('action' => "{$login_url}action/login"));
+
+echo elgg_view_module($module, $title, $body);
diff --git a/mod/cool_theme/views/default/core/account/login_dropdown.php b/mod/cool_theme/views/default/core/account/login_dropdown.php
new file mode 100644
index 000000000..e90cbf106
--- /dev/null
+++ b/mod/cool_theme/views/default/core/account/login_dropdown.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg drop-down login form
+ */
+
+if (elgg_is_logged_in()) {
+	return true;
+}
+
+$login_url = elgg_get_site_url();
+if (elgg_get_config('https_login')) {
+	$login_url = str_replace("http:", "https:", elgg_get_site_url());
+}
+
+$body = elgg_view_form('login', array('action' => "{$login_url}action/login"), array('returntoreferer' => TRUE));
+?>
+<div id="login-dropdown">
+	<?php 
+		echo elgg_view('output/url', array(
+			'href' => 'login#login-dropdown-box',
+			'rel' => 'popup',
+			'class' => 'elgg-button elgg-button-dropdown',
+			'text' => elgg_echo('login'),
+		)); 
+		echo elgg_view_module('dropdown', '', $body, array('id' => 'login-dropdown-box')); 
+	?>
+</div>
diff --git a/mod/cool_theme/views/default/core/settings/account.php b/mod/cool_theme/views/default/core/settings/account.php
new file mode 100644
index 000000000..0c3792ece
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Account settings form wrapper
+ * 
+ * @package Elgg
+ * @subpackage Core
+ */
+
+echo elgg_view_form('usersettings/save', array('class' => 'elgg-form-alt'));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/core/settings/account/default_access.php b/mod/cool_theme/views/default/core/settings/account/default_access.php
new file mode 100644
index 000000000..690f2714a
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/default_access.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Provide a way of setting your default access
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+if (elgg_get_config('allow_user_default_access')) {
+	$user = elgg_get_page_owner_entity();
+
+	if ($user) {
+		if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
+			$default_access = elgg_get_config('default_access');
+		}
+
+		$title = elgg_echo('default_access:settings');
+		$content = elgg_echo('default_access:label') . ': ';
+		$content .= elgg_view('input/access', array(
+			'name' => 'default_access',
+			'value' => $default_access,
+		));
+
+		echo elgg_view_module('info', $title, $content);
+	}
+}
diff --git a/mod/cool_theme/views/default/core/settings/account/email.php b/mod/cool_theme/views/default/core/settings/account/email.php
new file mode 100644
index 000000000..bb809958d
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/email.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Provide a way of setting your email
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$user = elgg_get_page_owner_entity();
+
+if ($user) {
+	$title = elgg_echo('email:settings');
+	$content = elgg_echo('email:address:label') . ' :<br /> ';
+	$content .= elgg_view('input/email', array(
+		'name' => 'email',
+		'value' => $user->email,
+	));
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/mod/cool_theme/views/default/core/settings/account/language.php b/mod/cool_theme/views/default/core/settings/account/language.php
new file mode 100644
index 000000000..b36057422
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/language.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Provide a way of setting your language prefs
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$user = elgg_get_page_owner_entity();
+
+if ($user) {
+	$title = elgg_echo('user:set:language');
+	$content = elgg_echo('user:language:label') . ': ';
+	$content .= elgg_view("input/dropdown", array(
+		'name' => 'language',
+		'value' => $user->language,
+		'options_values' => get_installed_translations()
+	));
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/mod/cool_theme/views/default/core/settings/account/name.php b/mod/cool_theme/views/default/core/settings/account/name.php
new file mode 100644
index 000000000..af1b9a1a7
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/name.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Provide a way of setting your full name.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$user = elgg_get_page_owner_entity();
+if ($user) {
+	$title = elgg_echo('user:name:label');
+	$content = elgg_echo('name') . ' :<br />';
+	$content .= elgg_view('input/text', array(
+		'name' => 'name',
+		'value' => $user->name,
+	));
+	echo elgg_view_module('info', $title, $content);
+
+	// need the user's guid to make sure the correct user gets updated
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid));
+}
diff --git a/mod/cool_theme/views/default/core/settings/account/notifications.php b/mod/cool_theme/views/default/core/settings/account/notifications.php
new file mode 100644
index 000000000..c212b3886
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/notifications.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * User settings for notifications.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+global $NOTIFICATION_HANDLERS;
+$notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
+
+$title = elgg_echo('notifications:usersettings');
+
+$rows = '';
+
+// Loop through options
+foreach ($NOTIFICATION_HANDLERS as $k => $v) {
+
+	if ($notification_settings->$k) {
+		$val = "yes";
+	} else {
+		$val = "no";
+	}
+
+	$radio = elgg_view('input/radio', array(
+		'name' => "method[$k]",
+		'value' => $val,
+		'options' => array(
+			elgg_echo('option:yes') => 'yes',
+			elgg_echo('option:no') => 'no'
+		),
+	));
+
+	$cells = '<td class="prm pbl">' . elgg_echo("notification:method:$k") . ': </td>';
+	$cells .= "<td>$radio</td>";
+
+	$rows .= "<tr>$cells</tr>";
+}
+
+
+$content = elgg_echo('notifications:methods');
+$content .= "<table>$rows</table>";
+
+echo elgg_view_module('info', $title, $content);
diff --git a/mod/cool_theme/views/default/core/settings/account/password.php b/mod/cool_theme/views/default/core/settings/account/password.php
new file mode 100644
index 000000000..f17f605c1
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/account/password.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Provide a way of setting your password
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+$user = elgg_get_page_owner_entity();
+
+if ($user) {
+	$title = elgg_echo('user:set:password');
+
+	// only make the admin user enter current password for changing his own password.
+	$admin = '';
+	if (!elgg_is_admin_logged_in() || elgg_is_admin_logged_in() && $user->guid == elgg_get_logged_in_user_guid()) {
+		$admin .= elgg_echo('user:current_password:label') . ' :<br />';
+		$admin .= elgg_view('input/password', array('name' => 'current_password', 'placeholder' => '&#149;&#149;&#149;&#149;&#149;&#149;'));
+		$admin = "<p>$admin</p>";
+	}
+
+	$password = elgg_echo('user:password:label') . ' :<br />';
+	$password .= elgg_view('input/password', array('name' => 'password', 'placeholder' => '&#149;&#149;&#149;&#149;&#149;&#149;'));
+	$password = "<p>$password</p>";
+
+	$password2 = elgg_echo('user:password2:label') . ' :<br />';
+	$password2 .= elgg_view('input/password', array('name' => 'password2', 'placeholder' => '&#149;&#149;&#149;&#149;&#149;&#149;'));
+	$password2 = "<p>$password2</p>";
+
+	$content = $admin . $password . $password2;
+
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/mod/cool_theme/views/default/core/settings/statistics.php b/mod/cool_theme/views/default/core/settings/statistics.php
new file mode 100644
index 000000000..1d7a5b052
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/statistics.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * User statitsics
+ *
+ * Blank view that can be extended
+ */
diff --git a/mod/cool_theme/views/default/core/settings/statistics/numentities.php b/mod/cool_theme/views/default/core/settings/statistics/numentities.php
new file mode 100644
index 000000000..ce1705a2e
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/statistics/numentities.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Elgg statistics screen
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+// Get entity statistics
+$entity_stats = get_entity_statistics(elgg_get_logged_in_user_guid());
+
+if ($entity_stats) {
+	$rows = '';
+	foreach ($entity_stats as $k => $entry) {
+		foreach ($entry as $a => $b) {
+
+			// This function controls the alternating class
+			$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
+
+			if ($a == "__base__") {
+				$a = elgg_echo("item:{$k}");
+				if (empty($a)) {
+					$a = $k;
+				}
+			} else {
+				$a = elgg_echo("item:{$k}:{$a}");
+				if (empty($a)) {
+					$a = "$k $a";
+				}
+			}
+			$rows .= <<< END
+				<tr class="{$even_odd}">
+					<td class="column-one"><b>{$a}:</b></td>
+					<td>{$b}</td>
+				</tr>
+END;
+		}
+	}
+
+	$title = elgg_echo('usersettings:statistics:label:numentities');
+	$content = "<table class=\"elgg-table-alt\">$rows</table>";
+
+	echo elgg_view_module('info', $title, $content);
+}
diff --git a/mod/cool_theme/views/default/core/settings/statistics/online.php b/mod/cool_theme/views/default/core/settings/statistics/online.php
new file mode 100644
index 000000000..ce7ff35fb
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/statistics/online.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Statistics about this user.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$user = elgg_get_logged_in_user_entity();
+
+$logged_in = 0;
+$log = get_system_log($user->guid, "login", "", 'user', '', 1);
+
+if ($log) {
+	$logged_in = $log[0]->time_created;
+}
+
+$label_name = elgg_echo('usersettings:statistics:label:name');
+$label_email = elgg_echo('usersettings:statistics:label:email');
+$label_member_since = elgg_echo('usersettings:statistics:label:membersince');
+$label_last_login = elgg_echo('usersettings:statistics:label:lastlogin');
+
+$time_created = date("r", $user->time_created);
+$last_login = date("r", $logged_in);
+
+$title = elgg_echo('usersettings:statistics:yourdetails');
+
+$content = <<<__HTML
+<table class="elgg-table-alt">
+	<tr class="odd">
+		<td class="column-one">$label_name</td>
+		<td>$user->name</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_email</td>
+		<td>$user->email</td>
+	</tr>
+	<tr class="odd">
+		<td class="column-one">$label_member_since</td>
+		<td>$time_created</td>
+	</tr>
+	<tr class="even">
+		<td class="column-one">$label_last_login</td>
+		<td>$last_login</td>
+	</tr>
+</table>
+__HTML;
+
+echo elgg_view_module('info', $title, $content);
diff --git a/mod/cool_theme/views/default/core/settings/tools.php b/mod/cool_theme/views/default/core/settings/tools.php
new file mode 100644
index 000000000..195db1d61
--- /dev/null
+++ b/mod/cool_theme/views/default/core/settings/tools.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Elgg plugin specific user settings.
+ *
+ * @uses array $vars['installed_plugins'] An array of plugins as returned by elgg_get_plugins()
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
+ */
+
+// Description of what's going on
+echo elgg_view('output/longtext', array(
+	'value' => elgg_echo("usersettings:plugins:description"),
+	'class' => 'user-settings mtn mbm',
+));
+
+// Get the installed plugins
+$installed_plugins = $vars['installed_plugins'];
+$count = count($installed_plugins);
+
+
+// Display all plugins' usersettings forms
+foreach ($installed_plugins as $plugin) {
+	$plugin_id = $plugin->getID();
+	if ($plugin->isActive()) {
+		if (elgg_view_exists("usersettings/$plugin_id/edit") 
+			|| elgg_view_exists("plugins/$plugin_id/usersettings")) {
+	
+			$title = $plugin->getManifest()->getName();
+			$body = elgg_view_form('plugins/usersettings/save', array(), array('entity' => $plugin));
+			echo elgg_view_module('info', $title, $body);
+		}
+	}
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/core/walled_garden/login.php b/mod/cool_theme/views/default/core/walled_garden/login.php
new file mode 100644
index 000000000..34126e411
--- /dev/null
+++ b/mod/cool_theme/views/default/core/walled_garden/login.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Walled garden login
+ */
+
+$title = elgg_get_site_entity()->name;
+
+/**
+$welcome = elgg_echo('walled_garden:welcome');
+ */
+$welcome .=  $title;
+
+ 
+$menu = elgg_view_menu('walled_garden', array(
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-general elgg-menu-hz',
+));
+
+$login_box = elgg_view('core/account/login_box', array('module' => 'walledgarden-login'));
+
+$content = <<<HTML
+
+<div class="elgg-col elgg-col-1of2">
+	<div class="elgg-inner">
+		<h1 class="elgg-heading-walledgarden">$welcome</h1><br />
+		A message you can edit in cool_theme/views/default/core/walled_garden/login.php :-).<br />
+	</div>
+</div>
+<div class="elgg-col elgg-col-1of2">
+	<div class="elgg-inner">$login_box</div>
+</div>
+HTML;
+
+echo elgg_view_module('walledgarden', '', $content, array(
+	'class' => 'elgg-walledgarden-double',
+	'header' => ' ',
+	'footer' => ' ',
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/buttons.php b/mod/cool_theme/views/default/css/elements/buttons.php
new file mode 100644
index 000000000..81f26950e
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/buttons.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * CSS buttons
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* <style>
+/* **************************
+	BUTTONS
+************************** */
+.elgg-button + .elgg-button {margin-left: 4px;}.elgg-button{display: inline-block;*display: inline;*zoom: 1;padding: 4px 10px 4px;margin-bottom: 0;font-size: 13px;line-height: 18px;color: #333333;text-align: center;vertical-align: middle;background-color: #f5f5f5;background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);background-image: -ms-linear-gradient(top, #ffffff, #e6e6e6);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);background-image: linear-gradient(top, #ffffff, #e6e6e6);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color: #e6e6e6 #e6e6e6 #bfbfbf;border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter: progid:dximagetransform.microsoft.gradient(enabled=false);border: 1px solid #cccccc;border-bottom-color: #b3b3b3;-webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px;-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);cursor: pointer;*margin-left: .3em;width:auto}.elgg-button:hover {color: #333333;text-decoration: none;background-color: #e6e6e6;background-position: 0 -15px;-webkit-transition: background-position 0.1s linear;-moz-transition: background-position 0.1s linear;-ms-transition: background-position 0.1s linear;-o-transition: background-position 0.1s linear;transition: background-position 0.1s linear;}.elgg-button:active{background:#ddd;border-bottom-color:#999;box-shadow:none;-webkit-box-shadow:none;-moz-box-shadow:none;}.elgg-button.elgg-state-disabled{background:#F2F2F2;color:#B8B8B8;cursor:default;box-shadow:none;-webkit-box-shadow:none;-moz-box-shadow:none;border-color:#C8C8C8;}.elgg-button-submit{  background-color: #0074cc;background-image: -moz-linear-gradient(top, #0088cc, #0055cc);background-image: -ms-linear-gradient(top, #0088cc, #0055cc);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image: -webkit-linear-gradient(top, #0088cc, #0055cc);background-image: -o-linear-gradient(top, #0088cc, #0055cc);background-image: linear-gradient(top, #0088cc, #0055cc);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color: #0055cc #0055cc #003580;border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter: progid:dximagetransform.microsoft.gradient(enabled=false);}.elgg-button-submit:active{background-color: #0055cc;}.elgg-button-submit:hover{background-color: #0055cc;}.elgg-button-submit.elgg-state-disabled{background:#ADBAD4;border-color:#94A2BF;}.elgg-button-delete{color: white;background-color: #da4f49;background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);background-image: linear-gradient(top, #ee5f5b, #bd362f);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color: #bd362f #bd362f #802420;border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter: progid:dximagetransform.microsoft.gradient(enabled=false);}.elgg-button-delete:hover {background-color: #bd362f;}.elgg-button-delete:active {background-color: #942a25 \9;}.elgg-button-delete.elgg-state-disabled{background:#999;border-color:#888;}.elgg-button-special{  background-color: #5bb75b;background-image: -moz-linear-gradient(top, #62c462, #51a351);background-image: -ms-linear-gradient(top, #62c462, #51a351);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image: -webkit-linear-gradient(top, #62c462, #51a351);background-image: -o-linear-gradient(top, #62c462, #51a351);background-image: linear-gradient(top, #62c462, #51a351);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color: #51a351 #51a351 #387038;border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter: progid:dximagetransform.microsoft.gradient(enabled=false);}.elgg-button-special:hover,.elgg-button-special:active,{background-color: #51a351;}.elgg-button-special:active,{background-color: #408140 \9;}.elgg-button-special.elgg-state-disabled{background:#B4D3A7;border-color:#9DB791;}.elgg-button-dropdown{color:#FFF;border:1px solid #71B9F7;}.elgg-button-dropdown:after{content:" \25BC ";font-size:smaller;}.elgg-button-dropdown:hover{background-color:#71B9F7;}.elgg-button-dropdown.elgg-state-active{background:#ccc;color:#333;border:1px solid #ccc;}.elgg-button-large{font-size:13px;line-height:19px;}.elgg-button-submit, .elgg-button-submit:hover, .elgg-button-delete, .elgg-button-delete:hover, .elgg-button-special, .elgg-button-special:hover {text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);color: white;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/chrome.php b/mod/cool_theme/views/default/css/elements/chrome.php
new file mode 100644
index 000000000..be2ea4fc8
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/chrome.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Visual styling
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* <style>
+/**/
+.elgg-quiet {color: #666;}.elgg-loud {color: #0054A7;}
+/* ***************************************
+	BORDERS AND SEPARATORS
+*************************************** */
+.elgg-border-plain {border: 1px solid #eeeeee;}.elgg-divide-top {border-top: 1px solid #CCCCCC;}.elgg-divide-bottom {border-bottom: 1px solid #CCCCCC;}.elgg-divide-left {border-left: 1px solid #CCCCCC;}.elgg-divide-right {border-right: 1px solid #CCCCCC;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/components.php b/mod/cool_theme/views/default/css/elements/components.php
new file mode 100644
index 000000000..5669d3c71
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/components.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * Layout Object CSS
+ *
+ * Image blocks, lists, tables, gallery, messages
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+/**
+ * elgg-body fills the space available to it.
+ * It uses hidden text to expand itself. The combination of auto width, overflow
+ * hidden, and the hidden text creates this effect.
+ *
+ * This allows us to float fixed width divs to either side of an .elgg-body div
+ * without having to specify the body div's width.
+ *
+ * @todo check what happens with long <pre> tags or large images
+ * @todo Move this to its own file -- it is very complicated and should not have to be overridden.
+ */
+?>
+/* <style>
+/* ***************************************
+	Image Block
+*************************************** */
+.elgg-image-block .elgg-image {float: left;margin-right: 10px;}.elgg-image-block .elgg-image-alt {float: right;margin-left: 5px;}
+/* ***************************************
+	List
+*************************************** */
+.elgg-list{clear:both;}.elgg-list > li{border-bottom:1px solid #E9E9E9;padding:5px 0;}.elgg-list > li:last-child{border-bottom:0;}.elgg-list-item .elgg-subtext{margin-bottom:5px;}.elgg-list-content{margin:10px 5px;}
+/* ***************************************
+	Gallery
+*************************************** */
+.elgg-gallery {border: none;margin-right: auto;margin-left: auto;}.elgg-gallery td {padding: 5px;}.elgg-gallery-fluid li {float: left;}
+/* ***************************************
+	Tables
+*************************************** */
+.elgg-table td,.elgg-table th{border:1px solid #ccc;padding:4px 8px;}.elgg-table th{background-color:#ddd;}.elgg-table tr:nth-child(odd),.elgg-table tr.odd{background-color:#fff;}.elgg-table tr:nth-child(even),.elgg-table tr.even{background-color:#f0f0f0;}.elgg-table-alt td{border-bottom:1px solid #ccc;padding:2px 4px;}.elgg-table-alt td:first-child{width:200px;}.elgg-table-alt tr:hover{background:#E4E4E4;}.elgg-table,.elgg-table-alt{width:100%;border-top:1px solid #ccc;}
+/* ***************************************
+	Owner Block
+*************************************** */
+.elgg-owner-block {margin-bottom: 20px;}
+/* ***************************************
+	Messages
+*************************************** */
+.elgg-message{color:#FFF;font-weight:700;display:block;cursor:pointer;opacity:0.9;-webkit-box-shadow:0 2px 5px rgba(0,0,0,0.45);-moz-box-shadow:0 2px 5px rgba(0,0,0,0.45);box-shadow:0 2px 5px rgba(0,0,0,0.45);-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;padding:3px 10px;}.elgg-state-success{background-color:#000;}.elgg-state-error{background-color:red;}.elgg-state-notice{background-color:#4690D6;}
+/* ***************************************
+	River
+*************************************** */
+.elgg-river > li{border-bottom:1px solid #E9E9E9;padding:10px 35px 10px 0;}.elgg-river-item{padding:7px 0;}.elgg-river-timestamp{color:#888;margin-top:3px;display:inline-block;}.elgg-river-summary{font-weight:400;font-size:11px;color:gray;}.elgg-river-subject,.elgg-river-target{font-weight:700;}.elgg-river-message,.elgg-river-attachments{background-color:#f2f2f2;margin-top:5px;margin-bottom:5px;min-height:10px;border:1px solid rgba(0,0,0,0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);box-shadow:inset 0 1px 1px rgba(0,0,0,0.05);padding:10px;}.elgg-river-responses{position:relative;padding-top:5px;}.elgg-river-responses:before{width:0;height:0;font-size:0;line-height:0;display:block;clear:both;content:" ";border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #E9E9E9;position:absolute;top:0;left:15px;}.elgg-river-responses > div,.elgg-river-responses > form,.elgg-river-responses > ul > li {background-color: #E9E9E9;border-bottom: 1px solid #E9E9E9;margin-bottom: 2px;padding: 4px;}
+<?php //@todo location-dependent styles ?>
+.elgg-river-layout .elgg-input-dropdown {float: right;margin: 10px 0;}.elgg-river-comments {margin: 0;border-top: none;}.elgg-river-more {background-color: #EEE;-webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;padding: 2px 4px;font-size: 85%;margin-bottom: 2px;}
+/* ***************************************
+	Tags
+*************************************** */
+.elgg-tags {display: inline;font-size: 85%;}.elgg-tags li {display: inline;margin-right: 5px;}.elgg-tags li:after {content: ",";}.elgg-tags li:last-child:after {content: "";}.elgg-tagcloud {text-align: justify;}
+/* MISCELLANEOUS */
+.elgg-photo {border: 1px solid #ccc;padding: 3px;background-color: white;}.elgg-comments {margin-top: 25px;}.elgg-comments > form {margin-top: 15px;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/forms.php b/mod/cool_theme/views/default/css/elements/forms.php
new file mode 100644
index 000000000..8b3967a94
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/forms.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * CSS form/input elements
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* <style>
+/* ***************************************
+	Form Elements
+*************************************** */
+fieldset>div{margin-bottom:15px}fieldset>div:last-child{margin-bottom:0}label{font-weight:bold;}input,textarea{max-width: 490px;font-family:"Lucida Grande",Tahoma,Verdana,Arial,sans-serif;border:1px solid #cacaca;padding:.5em;width:100%;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition: border linear 0.2s, box-shadow linear 0.2s;-moz-transition: border linear 0.2s, box-shadow linear 0.2s;-ms-transition: border linear 0.2s, box-shadow linear 0.2s;-o-transition: border linear 0.2s, box-shadow linear 0.2s;transition: border linear 0.2s, box-shadow linear 0.2s;}input:focus,textarea:focus {border-color: rgba(82,168,236,.8);-webkit-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);-moz-box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);box-shadow: inset 0 1px 3px rgba(0,0,0,.1), 0 0 8px rgba(82,168,236,.6);outline: 0;}textarea{height:200px}.elgg-longtext-control{float:right;margin-left:14px;font-size:80%;cursor:pointer}.elgg-input-access{margin:5px 0 0 0}input[type="checkbox"],input[type="radio"]{margin:0 3px 0 0;padding:0;border:0;width:auto}.elgg-input-checkboxes.elgg-horizontal li,.elgg-input-radio.elgg-horizontal li{display:inline;padding-right:10px}.ui-datepicker{background:white;border-bottom:2px solid #293e6c}.ui-datepicker-header{text-align:center;background:#6d84b7;color:white;font-weight:bold;padding:3px 3px 4px;vertical-align:center;border:1px solid #3a589b;border-width:0 1px}.ui-datepicker-next,.ui-datepicker-prev{text-decoration:none;color:white;width:14.2857%}.ui-datepicker-next{padding-right:3px;float:right}.ui-datepicker-prev{padding-left:3px;float:left}.ui-datepicker-calendar{width:100%;border-collapse:separate;border:1px solid #777;border-width:0 1px}.ui-datepicker-calendar th{background:#f2f2f2;border-bottom:1px solid #BBB;font-size:9px;font-weight:bold;padding:3px 2px;text-align:center}.ui-datepicker-calendar td{padding:0}.ui-datepicker-calendar a{display:block;margin:1px;padding:4px;border:1px solid white;color:#666;cursor:pointer;text-align:center;text-decoration:none}.ui-datepicker-calendar .ui-datepicker-current-day>a{font-weight:bold;background:#DDD}.ui-datepicker-calendar .ui-state-hover{color:#3b5998;border-color:#bec8dd;background-color:#dfe4ee}
+/* ***************************************
+	FRIENDS PICKER
+*************************************** */
+.friends-picker-container h3{font-size:4em!important;text-align:left;margin:10px 0 20px!important;color:#999!important;background:none!important;padding:0!important}.friends-picker .friends-picker-container .panel ul{text-align:left;margin:0;padding:0}.friends-picker-wrapper{margin:0;padding:0;position:relative;width:100%}.friends-picker{position:relative;overflow:hidden;margin:0;padding:0;width:730px;height:auto;background-color:#dedede;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px}.friendspicker-savebuttons{background:white;-webkit-border-radius:8px;-moz-border-radius:8px;border-radius:8px;margin:0 10px 10px}.friends-picker .friends-picker-container{position:relative;left:0;top:0;width:100%;list-style-type:none}.friends-picker .friends-picker-container .panel{float:left;height:100%;position:relative;width:730px;margin:0;padding:0}.friends-picker .friends-picker-container .panel .wrapper{margin:0;padding:4px 10px 10px 10px;min-height:230px}.friends-picker-navigation{margin:0 0 10px;padding:0 0 10px;border-bottom:1px solid #ccc}.friends-picker-navigation ul{list-style:none;padding-left:0}.friends-picker-navigation ul li{float:left;margin:0;background:white}.friends-picker-navigation a{font-weight:bold;text-align:center;background:white;color:#999;text-decoration:none;display:block;padding:0;width:20px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.tabHasContent{background:white;color:#333!important}.friends-picker-navigation li a:hover{background:#333;color:white!important}.friends-picker-navigation li a.current{background:#4690d6;color:white!important}.friends-picker-navigation-l,.friends-picker-navigation-r{position:absolute;top:46px;text-indent:-9000em}.friends-picker-navigation-l a,.friends-picker-navigation-r a{display:block;height:40px;width:40px}.friends-picker-navigation-l{right:48px;z-index:1}.friends-picker-navigation-r{right:0;z-index:1}.friends-picker-navigation-l{background:url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left top}.friends-picker-navigation-r{background:url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px top}.friends-picker-navigation-l:hover{background:url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat left -44px}.friends-picker-navigation-r:hover{background:url("<?php echo elgg_get_site_url(); ?>_graphics/friendspicker.png") no-repeat -60px -44px}.friendspicker-savebuttons .elgg-button-submit,.friendspicker-savebuttons .elgg-button-cancel{margin:5px 20px 5px 5px}.friendspicker-members-table {background: #dedede;-webkit-border-radius: 8px;-moz-border-radius: 8px;border-radius: 8px;margin:10px 0 0;padding:10px 10px 0;}
+/* ***************************************
+	USER PICKER
+*************************************** */
+.user-picker .user-picker-entry {clear:both;height:25px;padding:5px;margin-top:5px;border-bottom:1px solid #cccccc;}.user-picker-entry .elgg-button-delete {margin-right:10px;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/icons.php b/mod/cool_theme/views/default/css/elements/icons.php
new file mode 100644
index 000000000..bbf48696c
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/icons.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg icons
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+
+?>
+/* <style>
+/* ***************************************
+	ICONS
+*************************************** */
+.elgg-icon {background: transparent url(<?php echo elgg_get_site_url(); ?>mod/WISB/_graphics/elgg_sprites.png) no-repeat left;width: 16px;height: 16px;margin: 0 2px;}.elgg-icon-arrow-left{background-position:0 0;}.elgg-icon-arrow-right{background-position:0 -18px;}.elgg-icon-arrow-two-head{background-position:0 -36px;}.elgg-icon-attention{background-position:0 -54px;}.elgg-icon-userwall{background-position:0 -72px;}.elgg-icon-calendar{background-position:0 -90px;}.elgg-icon-cell-phone{background-position:0 -108px;}.elgg-icon-checkmark:hover{background-position:0 -126px;}.elgg-icon-checkmark{background-position:0 -144px;}.elgg-icon-clip:hover{background-position:0 -162px;}.elgg-icon-clip{background-position:0 -180px;}.elgg-icon-cursor-drag-arrow{background-position:0 -198px;}.elgg-icon-delete-alt:hover{background-position:0 -216px;}.elgg-icon-delete-alt{background-position:0 -234px;}.elgg-icon-delete:hover{background-position:0 -252px;}.elgg-icon-delete{background-position:0 -270px;}.elgg-icon-download:hover{background-position:0 -288px;}.elgg-icon-download{background-position:0 -306px;}.elgg-icon-eye{background-position:0 -324px;}.elgg-icon-chat{background-position:0 -342px;}.elgg-icon-grid:hover{background-position:0 -360px;}.elgg-icon-grid{background-position:0 -378px;}.elgg-icon-home:hover{background-position:0 -396px;}.elgg-icon-home{background-position:0 -414px;}.elgg-icon-hover-menu:hover{background-position:0 -432px;}.elgg-icon-hover-menu{background-position:0 -450px;}.elgg-icon-info{background-position:0 -468px;}.elgg-icon-addfriend{background-position:0 -486px;}.elgg-icon-link:hover{background-position:0 -504px;}.elgg-icon-link{background-position:0 -522px;}.elgg-icon-list{background-position:0 -540px;}.elgg-icon-lock-closed{background-position:0 -558px;}.elgg-icon-lock-open{background-position:0 -576px;}.elgg-icon-mail-alt:hover{background-position:0 -594px;}.elgg-icon-mail-alt{background-position:0 -612px;}.elgg-icon-messages{background-position:0 -648px;}.elgg-icon-photo{background-position:0 -666px;}.elgg-icon-print-alt{background-position:0 -684px;}.elgg-icon-print{background-position:0 -702px;}.elgg-icon-push-pin{background-position:0 -720px;}.elgg-icon-newsfeed{background-position:0 -738px;}.elgg-icon-redo{background-position:0 -756px;}.elgg-icon-refresh:hover{background-position:0 -774px;}.elgg-icon-refresh{background-position:0 -792px;}.elgg-icon-round-arrow-left{background-position:0 -810px;}.elgg-icon-round-arrow-right{background-position:0 -828px;}.elgg-icon-round-checkmark{background-position:0 -846px;}.elgg-icon-round-minus{background-position:0 -864px;}.elgg-icon-round-plus{background-position:0 -882px;}.elgg-icon-rss{background-position:0 -900px;}.elgg-icon-search-focus{background-position:0 -918px;}.elgg-icon-search{background-position:0 -936px;}.elgg-icon-settings-alt:hover{background-position:0 -954px;}.elgg-icon-settings-alt{background-position:0 -972px;}.elgg-icon-settings{background-position:0 -990px;}.elgg-icon-share{background-position:0 -1008px;}.elgg-icon-addgroup{background-position:0 -1026px;}.elgg-icon-shop-cart:hover{background-position:0 -1044px;}.elgg-icon-shop-cart{background-position:0 -1062px;}.elgg-icon-speech-bubble-alt:hover{background-position:0 -1080px;}.elgg-icon-speech-bubble-alt{background-position:0 -1098px;}.elgg-icon-speech-bubble:hover{background-position:0 -1116px;}.elgg-icon-speech-bubble{background-position:0 -1134px;}.elgg-icon-star-alt{background-position:0 -1152px;}.elgg-icon-star-empty:hover{background-position:0 -1170px;}.elgg-icon-star-empty{background-position:0 -1188px;}.elgg-icon-star:hover{background-position:0 -1206px;}.elgg-icon-star{background-position:0 -1224px;}.elgg-icon-tag:hover{background-position:0 -1242px;}.elgg-icon-tag{background-position:0 -1260px;}.elgg-icon-thumbs-down-alt:hover{background-position:0 -1278px;}.elgg-icon-thumbs-down:hover,.elgg-icon-thumbs-down-alt{background-position:0 -1296px;}.elgg-icon-thumbs-down{background-position:0 -1314px;}.elgg-icon-thumbs-up-alt:hover{background-position:0 -1332px;}.elgg-icon-thumbs-up:hover,.elgg-icon-thumbs-up-alt{background-position:0 -1350px;}.elgg-icon-thumbs-up{background-position:0 -1368px;}.elgg-icon-trash{background-position:0 -1386px;}.elgg-icon-twitter{background-position:0 -1404px;}.elgg-icon-undo{background-position:0 -1422px;}.elgg-icon-user:hover{background-position:0 -1440px;}.elgg-icon-user{background-position:0 -1458px;}.elgg-icon-users{background-position:0 -1476px;}.elgg-icon-friends{background-position:0 -1494px;}.elgg-icon-video{background-position:0 -1512px;}.elgg-avatar > .elgg-icon-hover-menu{display:none;position:absolute;right:0;bottom:0;cursor:pointer;margin:0;}.elgg-icon-mail:hover,.elgg-icon-mail{background-position:0 -630px;}.elgg-ajax-loader {background: white url(<?php echo elgg_get_site_url(); ?>mod/WISB/_graphics/ajax_loader_bw.gif) no-repeat center center;min-height: 33px;min-width: 33px;}
+/* ***************************************
+	AVATAR ICONS
+*************************************** */
+.elgg-avatar{position:relative;display:inline-block;}.elgg-avatar-tiny > a > img{width:25px;height:25px;}.elgg-avatar-small > a > img{width:40px;height:40px;}.elgg-avatar-medium > a > img{width:100px;height:100px;}.elgg-avatar-large > a > img{width:200px;height:180px;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/layout.php b/mod/cool_theme/views/default/css/elements/layout.php
new file mode 100644
index 000000000..cb9e8caa3
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/layout.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Page Layout
+ *
+ * Contains CSS for the page shell and page layout
+ *
+ * Default layout: 981px wide, centered. Used in default page shell
+ *
+ */
+?>
+/* <style>
+/* ***************************************
+	PAGE LAYOUT
+*************************************** */
+/***** DEFAULT LAYOUT ******/
+.elgg-page-default .elgg-page-header > .elgg-inner {width: 981px;margin: 0 auto;height: 90px;}.elgg-page-default .elgg-page-body > .elgg-inner {width: 981px;margin: 0 auto;}.elgg-page-footer {width: 981px;margin: 0 auto;}.elgg-page-default .elgg-page-footer > .elgg-inner {margin-left: 181px;padding: 8px;}.elgg-page-footer > .elgg-inner:after {display:block;content: '.';clear:both;visibility:hidden;height:0;}
+/***** TOPBAR ******/
+.elgg-page-topbar {position: fixed;right: 0;left: 0;z-index: 1030;margin-bottom: 0;padding-left: 20px;padding-right: 20px;background-color: #2c2c2c;background-image: -moz-linear-gradient(top, #333333, #222222);background-image: -ms-linear-gradient(top, #333333, #222222);background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image: -webkit-linear-gradient(top, #333333, #222222);background-image: -o-linear-gradient(top, #333333, #222222);background-image: linear-gradient(top, #333333, #222222);background-repeat: repeat-x;filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);}.elgg-page-topbar > .elgg-inner {padding-top: 6px;width: 981px;margin: 0 auto;position: relative;}.elgg-page-topbar ~ .elgg-page-body {padding-top: 38px;}
+/***** PAGE MESSAGES ******/
+.elgg-system-messages {position: fixed;top: 24px;right: 20px;max-width: 500px;z-index: 1000;}.elgg-system-messages li {margin-top: 10px;}.elgg-system-messages li p {margin: 0;}
+/***** PAGE HEADER ******/
+.elgg-page-header {position: relative;background: #3D3D3D;}.elgg-page-header > .elgg-inner {position: relative;}
+/***** PAGE BODY LAYOUT ******/
+.elgg-layout {min-height: 360px;}.elgg-layout-one-column {padding: 10px 0;}.elgg-sidebar {position: relative;padding: 20px 0;float: left;width: 181px;min-height: 360px;}.elgg-sidebar-alt {position: relative;float: right;width: 244px;margin-left: 20px;min-height: 360px;}.elgg-main {position: relative;min-height: 360px;}.elgg-layout-two-sidebar > .elgg-body,.elgg-layout-one-sidebar > .elgg-body {border: 1px solid #B3B3B3;border-top: 0;padding: 15px 20px;}.elgg-layout > .elgg-body > .elgg-head {padding-bottom: 3px;margin-bottom: 10px;}
+/***** PAGE FOOTER ******/
+.elgg-page-footer {position: relative;color: #999;}.elgg-page-footer a:hover {color: #666;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/modules.php b/mod/cool_theme/views/default/css/elements/modules.php
new file mode 100644
index 000000000..6182083b9
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/modules.php
@@ -0,0 +1,12 @@
+/* <style>
+/* ***************************************
+	Modules
+*************************************** */
+/* Info */
+.elgg-module-info > .elgg-head {max-width: 490px;height: 100%;background-color: #eeeeee;background-repeat: repeat-x;background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%);background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee));background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 );background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%);border: 1px solid #e5e5e5;-webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px;margin-bottom: 5px;padding: 5px 8px;}.elgg-module-aside {margin-bottom: 15px;}.elgg-module-aside > .elgg-head {background-color: #F2F2F2;border-bottom: none;border-top: solid 1px #E2E2E2;padding: 4px 5px 5px;margin-bottom: 5px;}.elgg-module-aside > .elgg-head > h3 {font-size: 1em;}.elgg-module-aside > .elgg-body {padding: 0 5px;}.elgg-module-popup {background-color: white;z-index: 9999;margin-bottom: 0;box-shadow: 0 0 0 5px rgba(82, 82, 82, 0.7);border-radius: 3px;}.elgg-module-popup > .elgg-head, .elgg-module-popup > a > .elgg-head {background: #E9E9E9;border: 1px solid #555;border-bottom: none;font-size: 10px;font-weight: bold;margin: 0;padding: 5px 10px;}.elgg-module-popup > .elgg-head > h3{color: white;}.elgg-module-popup > .elgg-body {background: white;border: 1px solid #555;border-top: 0;padding: 10px;}.elgg-module-popup > .elgg-foot {margin-top: -1px;border: 1px solid #3B5998;border-top-color: #CCC;background: #F2F2F2;padding: 8px 10px;text-align:right;}.elgg-module-dropdown {background-color: white;border: 1px solid #333;border-bottom: 2px solid #293E6A;z-index:100;}.elgg-module-dropdown > .elgg-body {padding: 8px;}.elgg-module-dropdown > .elgg-head {margin: 7px 8px 0;border-bottom: 1px solid #AAA;padding-bottom: .5em;}.elgg-module-dropdown > .elgg-foot {text-align: center;}.elgg-module-featured {background-color: #F2F2F2;border: 1px solid #CCC;padding: 10px;margin-bottom: 20px;}.elgg-module-featured > .elgg-head {margin-bottom: 10px;}
+/* ***************************************
+	Widgets
+*************************************** */
+.elgg-widgets {float: right;min-height: 30px;}.elgg-widget-add-control {text-align: right;margin: 5px 5px 15px;}.elgg-widgets-add-panel {padding: 10px;margin: 0 5px 15px;background: #dedede;border: 2px solid #ccc;}
+<?php //@todo location-dependent style: make an extension of elgg-gallery ?>
+.elgg-widgets-add-panel li {float: left;margin: 2px 10px;width: 200px;padding: 4px;background-color: #ccc;border: 2px solid #b0b0b0;font-weight: bold;}.elgg-widgets-add-panel li a {display: block;}.elgg-widgets-add-panel .elgg-state-available {color: #333;cursor: pointer;}.elgg-widgets-add-panel .elgg-state-available:hover {background-color: #bcbcbc;}.elgg-widgets-add-panel .elgg-state-unavailable {color: #888;}.elgg-module-widget {background-color: #dedede;padding: 2px;margin: 0 5px 15px;position: relative;}.elgg-module-widget:hover {background-color: #ccc;}.elgg-module-widget > .elgg-head {background-color: #dedede;height: 30px;line-height: 30px;overflow: hidden;}.elgg-module-widget > .elgg-head h3 {float: left;padding: 0 45px 0 20px;color: #333;}.elgg-module-widget.elgg-state-draggable > .elgg-head {cursor: move;}.elgg-module-widget > .elgg-head a {position: absolute;top: 5px;display: inline-block;width: 18px;height: 18px;padding: 2px 2px 0 0;border: 1px solid transparent;}a.elgg-widget-collapse-button {left: 5px;background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;}a.elgg-widget-collapsed {background-position: 0px -365px;}a.elgg-widget-delete-button {right: 5px;}a.elgg-widget-edit-button {right: 25px;}a.elgg-widget-edit-button:hover, a.elgg-widget-delete-button:hover {border: 1px solid #ccc;}.elgg-module-widget > .elgg-body {background-color: white;width: 100%;overflow: hidden;}.elgg-widget-edit {display: none;width: 96%;padding: 2%;border-bottom: 2px solid #dedede;}.elgg-widget-content {padding: 10px;}.elgg-widget-placeholder {border: 2px dashed #dedede;margin-bottom: 15px;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/navigation.php b/mod/cool_theme/views/default/css/elements/navigation.php
new file mode 100644
index 000000000..0bd90c02a
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/navigation.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Navigation
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* <style>
+/* ***************************************
+	PAGINATION
+*************************************** */
+.elgg-menu > li > a:hover,.elgg-menu > li > a{text-decoration:none;}.elgg-menu-owner-block li > a > .elgg-icon,.elgg-menu-extras li > a > .elgg-icon,.elgg-menu-page li > a > .elgg-icon,.elgg-menu-composer li > a > .elgg-icon{margin-left:-20px;margin-right:4px;}.elgg-pagination{display:block;border:1px solid #CCC;background:#F7F7F7;text-align:center;border-width:1px 0;}.elgg-pagination > li{display:inline-block;}.elgg-pagination > li > a,.elgg-pagination > li > span{font-size:13px;font-weight:700;text-align:center;display:block;margin:3px 11px 0 0;padding:3px 4px 4px;}.elgg-pagination > li > a:hover{background:#3B5998;color:#FFF;text-decoration:none;}.elgg-pagination > .elgg-state-selected > span{border-bottom:2px solid #3B3B3B;}
+/* ***************************************
+	TABS
+*************************************** */
+.elgg-tabs{border-bottom:1px solid #D8DFEA;display:block;width:100%;padding-left:15px;}.elgg-tabs > li{display:inline-block;background:#D8DFEA;border:1px solid #D8DFEA;border-bottom:0;margin:2px 2px -1px 0;}.elgg-tabs > :hover{background:#627AAD;border:1px solid #627AAD;border-bottom:0;}.elgg-tabs > li > a{font-size:13px;font-weight:700;text-align:center;display:block;padding:3px 11px 4px;}.elgg-tabs > :hover > a{color:#FFF;text-decoration:none;}.elgg-tabs > .elgg-state-selected{border:1px solid #D8DFEA;border-bottom:0;margin-top:0;}.elgg-tabs > .elgg-state-selected > a,.elgg-tabs > .elgg-state-selected:hover > a{background:#FFF;color:#333;padding:5px 10px 4px;}
+/* ***************************************
+	BREADCRUMBS
+*************************************** */
+.elgg-breadcrumbs{font-size:80%;font-weight:700;line-height:1.2em;color:#bababa;}.elgg-breadcrumbs > li{display:inline-block;}.elgg-breadcrumbs > li:after{content:"\003E";font-weight:400;padding:0 4px;}.elgg-breadcrumbs > li > a{display:inline-block;color:#999;}.elgg-breadcrumbs > li > a:hover{color:#0054a7;text-decoration:underline;}
+/* ***************************************
+	TOPBAR MENU
+*************************************** */
+.elgg-menu-topbar{float:left;}.elgg-menu-topbar > li{float:left;position:relative;}.elgg-menu-topbar > li > a{color:#FFF;display:block;font-weight:700;height:24px;}.elgg-menu-topbar-default > li > a{margin:0 1px;padding:8px 4px 0;}.elgg-menu-topbar-alt{float:right;margin-right:1px;}.elgg-menu-topbar-alt > li > a{padding:8px 7px 0;}.elgg-menu-topbar .elgg-menu-parent:after{content:" \25BC ";font-size:smaller;}.elgg-menu-topbar .elgg-child-menu{background:#FFF;border:1px solid #333;border-bottom:2px solid #3D3D3D;margin-right:-1px;margin-top:-1px;min-width:200px;position:absolute;right:0;top:100%;display:none;z-index:1;padding:4px 0;}.elgg-menu-topbar .elgg-child-menu.elgg-state-active{display:block;}.elgg-menu-topbar .elgg-child-menu > li > a{border-bottom:1px solid #FFF;border-top:1px solid #FFF;color:#333;display:block;font-weight:400;height:18px;line-height:18px;white-space:nowrap;padding:0 22px;}.elgg-menu-topbar .elgg-child-menu > li > a:hover{background:#5B5B5B;border-bottom:1px solid #3D3D3D;border-top:1px solid #3D3D3D;color:#FFF;text-decoration:none;}.elgg-menu-topbar > li > .elgg-menu-opened,.elgg-menu-topbar > li > .elgg-menu-opened:hover{background:#FFF;border:1px solid #333;border-bottom:0;color:#333;position:relative;z-index:2;margin:-1px -1px 0;}.elgg-menu-topbar-default > li > a:hover,.elgg-menu-topbar-alt > li > a:hover{background:#5B5B5B;}
+/* ***************************************
+	SITE MENU
+*************************************** */
+.elgg-menu-site:after{content:'.';clear:both;display:block;height:0;line-height:0;}.elgg-menu-site{background:#ECEFF5;}.elgg-menu-site > li{float:left;}.elgg-menu-site > li > a{padding:8px 10px;}.elgg-menu-site > li > a:hover{background:#FFF;}
+/* ***************************************
+	TITLE
+*************************************** */
+.elgg-menu-title {float: right;}.elgg-menu-title > li {display: inline-block;margin-left: 4px;}
+/* ***************************************
+	FILTER MENU
+*************************************** */
+.elgg-menu-filter{display:table;;padding-left:10px;}
+.elgg-menu-filter:after{content:'.';display: table;clear:both;visibility:hidden;height:0;line-height:0;}
+.elgg-menu-filter > li{float: left;padding-top: 5px;padding-bottom: 5px;padding-right: 12px;
+padding-left: 12px;
+margin-right: 2px;
+line-height: 14px;}
+.elgg-menu-filter > .elgg-state-selected, .elgg-menu-filter > li > a{padding-top: 5px;padding-bottom: 5px;margin-top: 2px;margin-bottom: 2px;-webkit-border-radius: 5px;-moz-border-radius: 5px;border-radius: 5px;color:#08C;}
+.elgg-menu-filter > .elgg-state-selected{color: white;background-color: #08C;}
+.elgg-menu-filter .elgg-state-selected a{color: white;background-color: #08C;}
+/* ***************************************
+	PAGE MENU
+*************************************** */
+.elgg-menu-page{border-bottom:1px solid #EEE;margin-bottom:7px;padding-bottom:7px;}.elgg-menu-page li > a{display:block;color:#333;margin-bottom:1px;padding:3px 8px 3px 26px;}.elgg-menu-page li > a:hover{background-color:#EEE;}.elgg-menu-page li.elgg-state-selected > a{background-color:#E9E9E9;font-weight:700;}.elgg-menu-page .elgg-child-menu{display:none;margin-left:15px;}.elgg-menu-page .elgg-menu-closed:before,.elgg-menu-page .elgg-menu-opened:before{display:inline-block;padding-right:4px;}.elgg-menu-page .elgg-menu-closed:before{content:"\002B";}.elgg-menu-page .elgg-menu-opened:before{content:"\002D";}
+/* ***************************************
+	HOVER MENU
+*************************************** */
+.elgg-menu-hover{display:none;position:absolute;z-index:10000;width:165px;border:solid 1px;background-color:#FFF;-webkit-box-shadow:2px 2px 6px rgba(0,0,0,0.50);-moz-box-shadow:2px 2px 6px rgba(0,0,0,0.50);box-shadow:2px 2px 6px rgba(0,0,0,0.50);border-color:#E5E5E5 #999 #999 #E5E5E5;}.elgg-menu-hover > li{border-bottom:1px solid #ddd;}.elgg-menu-hover > li:last-child{border-bottom:none;}.elgg-menu-hover .elgg-heading-basic{display:block;}.elgg-menu-hover a{font-size:92%;padding:2px 8px;}.elgg-menu-hover a:hover{background:#ccc;}.elgg-menu-hover-admin a{color:red;}.elgg-menu-hover-admin a:hover{color:#FFF;background-color:red;}
+/* ***************************************
+	FOOTER
+*************************************** */
+.elgg-menu-footer > li,.elgg-menu-footer > li > a {color:#999;display: inline-block;}.elgg-menu-footer > li:after {content: " \00B7 ";padding: 0 4px;}.elgg-menu-footer-default {float:right;}.elgg-menu-footer-alt {float: left;}
+/* ***************************************
+	ENTITY
+*************************************** */
+.elgg-menu-entity{float:right;margin-left:15px;font-size:90%;color:#aaa;}.elgg-menu-entity > li{display:inline-block;margin-left:15px;}.elgg-menu-entity > li > a{color:#aaa;}
+/* ***************************************
+	OWNER BLOCK
+*************************************** */
+.elgg-menu-owner-block li > a{border-bottom:1px solid #D8DFEA;padding:3px 8px 3px 26px;}.elgg-menu-owner-block li > a:hover{background-color:#EEE;color:0;}.elgg-menu-owner-block .elgg-state-selected > a{background-color:#E9E9E9;}.elgg-menu-owner-block .elgg-menu > li > a{padding-left:44px;}
+/* ***************************************
+	LONGTEXT
+*************************************** */
+.elgg-menu-longtext {float: right;}
+/* ***************************************
+	RIVER
+*************************************** */
+.elgg-menu-river{color:#888;display:inline-block;margin:3px 0 0 -3px;}.elgg-menu-river > li{display:inline;}.elgg-menu-river > li:before{content:" \00B7 ";display:inline-block;margin:0 3px;} .elgg-menu-river > li > a{color:#3D3D3D;display:inline;}.elgg-menu-river > li > a:hover{text-decoration:underline;}
+/* ***************************************
+	SIDEBAR EXTRAS (rss, bookmark, etc)
+*************************************** */
+.elgg-menu-extras > li > a {padding: 3px 8px 3px 26px;}.elgg-menu-extras > li > a:hover {text-decoration:underline;}
+/* ***************************************
+    COMPOSER
+*************************************** */
+.elgg-menu-composer{display:inline-block;height:22px;}.elgg-menu-composer > li{font-weight:700;margin-left:10px;}.elgg-menu-composer > li > a{line-height:16px;padding-left:20px;}.elgg-menu-composer > li > a:hover{text-decoration:underline;}.elgg-menu-composer > li.ui-state-active > a{cursor:default;color:#000;text-decoration:none;}.elgg-menu-composer > .ui-state-active > a:before,.elgg-menu-composer > .ui-state-active > a:after{position:absolute;display:block;content:" ";height:0;width:0;left:0;border-style:solid;border-width:8px;}.elgg-menu-composer > .ui-state-active > a:before{top:11px;border-color:transparent transparent #B4BBCD;}.elgg-menu-composer > .ui-state-active > a:after{top:12px;border-color:transparent transparent #FFF;}
+/* ***************************************
+    SCROLLBAR
+*************************************** */
+::-webkit-scrollbar{width:10px;height:10px;}::-webkit-scrollbar-track-piece{background-color:#EEE;-webkit-border-radius:0;-webkit-border-bottom-right-radius:8px;-webkit-border-bottom-left-radius:8px;}::-webkit-scrollbar-thumb:vertical{height:50px;background-color:#999;-webkit-border-radius:8px;}::-webkit-scrollbar-thumb:horizontal{width:50px;background-color:#999;-webkit-border-radius:8px;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/elements/typography.php b/mod/cool_theme/views/default/css/elements/typography.php
new file mode 100644
index 000000000..459b33710
--- /dev/null
+++ b/mod/cool_theme/views/default/css/elements/typography.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * CSS typography
+ *
+ * @package Elgg.Core
+ * @subpackage UI
+ */
+?>
+/* <style>
+/* ***************************************
+	Typography
+*************************************** */
+body{font-size:11px;font-family:"Lucida Grande", Tahoma, Verdana, Arial, sans-serif;color:#3D3D3D;}a{color:#3D3D3D;cursor:pointer;}pre,code{font-family:Monaco, "Courier New", Courier, monospace;font-size:12px;background:#EBF5FF;color:#000;overflow:auto;overflow-x:auto;white-space:pre-wrap;word-wrap:break-word;}blockquote{line-height:1.3em;background:#EBF5FF;border:none;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;margin:0 0 15px;padding:3px 15px;}h1,h2,h3,h4,h5,h6{font-weight:700;color:#3D3D3D;}h1{font-size:1.8em;}h2{font-size:1.5em;line-height:1.1em;padding-bottom:5px;}h3{font-size:1.2em;}h4{font-size:1em;}h5{font-size:.9em;}h6{font-size:.8em;}a:hover{text-decoration:underline;}p{margin-bottom:15px;}p:last-child{margin-bottom:0;}dt{font-weight:700;}dd{margin:0 0 1em 1em;}pre,code {padding: 0 3px 2px;font-family: Menlo, Monaco, "Courier New", monospace;font-size: 12px;color: #333333;-webkit-border-radius: 3px;-moz-border-radius: 3px;border-radius: 3px;}code{padding: 2px 4px;color: #d14;background-color: #f7f7f9;border: 1px solid #e1e1e8;}pre{display: block;padding: 8.5px;margin: 0 0 9px;font-size: 12.025px;line-height: 18px;background-color: #f5f5f5;border: 1px solid #ccc;border: 1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius: 4px;-moz-border-radius: 4px;border-radius: 4px;white-space: pre;white-space: pre-wrap;word-break: break-all;word-wrap: break-word;}.elgg-monospace{font-family:Monaco, "Courier New", Courier, monospace;}.elgg-heading-site,.elgg-heading-site:hover{font-size:2em;line-height:1.4em;color:#FFF;text-shadow:0 0 1px #627AAD;text-decoration:none;}.elgg-heading-main{float:left;max-width:530px;margin-right:10px;}.elgg-heading-basic{color:#0054A7;font-size:1.2em;font-weight:700;}.elgg-subtext{color:#666;}
+/* ***************************************
+	USER INPUT DISPLAY RESET
+*************************************** */
+.elgg-output ul,ol{padding-left:1.5em;margin:0 1.5em 1.5em 0;}.elgg-output ul{list-style-type:disc;}.elgg-output ol{list-style-type:decimal;}.elgg-output table{border:1px solid #ccc;}.elgg-output table td{border:1px solid #ccc;padding:3px 5px;}.elgg-output img{max-width:100%;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/css/walled_garden.php b/mod/cool_theme/views/default/css/walled_garden.php
new file mode 100644
index 000000000..e38d29f7a
--- /dev/null
+++ b/mod/cool_theme/views/default/css/walled_garden.php
@@ -0,0 +1,74 @@
+<?php
+/**
+ * Walled garden CSS
+ */
+
+$url = elgg_get_site_url();
+
+?>
+.elgg-body-walledgarden {
+	margin: 100px auto 0 auto;
+	position: relative;
+	width: 530px;
+}
+.elgg-module-walledgarden {
+	position: absolute;
+	top: 0;
+	left: 0;
+}
+.elgg-module-walledgarden > .elgg-head {
+	height: 17px;
+}
+.elgg-module-walledgarden > .elgg-body {
+	padding: 0 10px;
+}
+.elgg-module-walledgarden > .elgg-foot {
+	height: 17px;
+}
+.elgg-walledgarden-double > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-double > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-double > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/two_column_bottom.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-head {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_top.png) no-repeat left top;
+}
+.elgg-walledgarden-single > .elgg-body {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_middle.png) repeat-y left top;
+}
+.elgg-walledgarden-single > .elgg-foot {
+	background: url(<?php echo $url; ?>_graphics/walled_garden/one_column_bottom.png) no-repeat left top;
+}
+
+.elgg-col > .elgg-inner {
+	margin: 0 0 0 5px;
+}
+.elgg-col:first-child > .elgg-inner {
+	margin: 0 5px 0 0;
+}
+.elgg-col > .elgg-inner {
+	padding: 0 8px;
+}
+
+.elgg-walledgarden-single > .elgg-body > .elgg-inner {
+	padding: 0 8px;
+}
+
+.elgg-module-walledgarden-login {
+	margin: 0;
+}
+.elgg-body-walledgarden h3 {
+	font-size: 1.5em;
+	line-height: 1.1em;
+	padding-bottom: 5px;
+}
+
+.elgg-heading-walledgarden {
+	color: #666666;
+	margin-top: 20px;
+	line-height: 1.1em;
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/discussion/river_footer.php b/mod/cool_theme/views/default/discussion/river_footer.php
new file mode 100644
index 000000000..65605026b
--- /dev/null
+++ b/mod/cool_theme/views/default/discussion/river_footer.php
@@ -0,0 +1,51 @@
+<?php
+
+$item = $vars['item'];
+
+if ($item->action_type !== 'create') {
+	return true;
+}
+
+$object = $vars['item']->getObjectEntity();
+
+$replies_options = array(
+	'guid' => $object->getGUID(),
+	'annotation_name' => 'group_topic_post',
+	'limit' => 3,
+	'order_by' => 'n_table.time_created desc'
+);
+
+$replies = elgg_get_annotations($replies_options);
+
+if ($replies) {
+	// why is this reversing it? because we're asking for the 3 latest
+	// replies by sorting desc and limiting by 3, but we want to display
+	// these replies with the latest at the bottom.
+	$replies = array_reverse($replies);
+
+	$replies_options['count'] = TRUE;
+	
+	$reply_count = elgg_get_annotations($replies_options); 
+	
+	// If greater that 3 replies, link to the rest of them
+	if ($reply_count > count($replies)) {
+		$link = elgg_view('output/url', array(
+			'href' => $object->getURL(),
+			'text' => elgg_echo('river:replies:all', array($reply_count)),
+		));
+		
+		echo elgg_view_image_block(elgg_view_icon('speech-bubble-alt'), $link, array('class' => 'elgg-river-participation'));
+	}
+	
+	// Display the latest
+	echo elgg_view_annotation_list($replies, array('list_class' => 'elgg-river-replies', 'item_class' => 'elgg-river-participation'));
+
+}
+
+
+if ($object->canAnnotate(0, 'group_topic_post')) {
+	// inline reply form
+	$form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'elgg-form-small elgg-river-participation');
+	$body_vars = array('entity' => $object, 'inline' => true);
+	echo elgg_view_form('discussion/reply/save', $form_vars, $body_vars);
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/file/composer.php b/mod/cool_theme/views/default/file/composer.php
new file mode 100644
index 000000000..461171fde
--- /dev/null
+++ b/mod/cool_theme/views/default/file/composer.php
@@ -0,0 +1,8 @@
+<?php
+elgg_load_library('elgg:file');
+$form_vars = array(
+	'enctype' => 'multipart/form-data', 
+);
+$body_vars = file_prepare_form_vars();
+
+echo elgg_view_form('file/upload', $form_vars, array_merge($body_vars, $vars));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/forms/comments/add.php b/mod/cool_theme/views/default/forms/comments/add.php
new file mode 100644
index 000000000..55341ea46
--- /dev/null
+++ b/mod/cool_theme/views/default/forms/comments/add.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Elgg comments add form
+ *
+ * @package Elgg
+ *
+ * @uses ElggEntity $vars['entity'] The entity to comment on
+ * @uses bool       $vars['inline'] Show a single line version of the form?
+ */
+
+
+if (isset($vars['entity']) && elgg_is_logged_in()) {
+	
+	$inline = elgg_extract('inline', $vars, false);
+	
+	if ($inline) {
+		echo elgg_view('input/text', array(
+			'name' => 'generic_comment', 
+			'placeholder' => elgg_echo('annotation:generic_comment:value:placeholder'),
+		));
+		echo elgg_view('input/submit', array(
+			'value' => elgg_echo('comment'), 
+			'class' => 'hidden',
+		));
+	} else {
+?>
+		<div>
+			<label><?php echo elgg_echo("generic_comments:add"); ?></label>
+			<?php echo elgg_view('input/longtext', array('name' => 'generic_comment')); ?>
+		</div>
+<?php
+		echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+	}
+	
+	echo elgg_view('input/hidden', array(
+		'name' => 'entity_guid',
+		'value' => $vars['entity']->getGUID()
+	));
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/forms/discussion/reply/save.php b/mod/cool_theme/views/default/forms/discussion/reply/save.php
new file mode 100644
index 000000000..5fb94d488
--- /dev/null
+++ b/mod/cool_theme/views/default/forms/discussion/reply/save.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Discussion topic reply form bofy
+ *
+ * @uses $vars['entity'] A discussion topic object
+ * @uses $vars['inline'] Display a shortened form?
+ */
+
+if (isset($vars['entity']) && elgg_is_logged_in()) {
+	$inline = elgg_extract('inline', $vars, false);
+
+	if ($inline) {
+		echo elgg_view('input/text', array('name' => 'group_topic_post', 'placeholder' => elgg_echo('annotation:group_topic_post:value:placeholder')));
+		echo elgg_view('input/submit', array('value' => elgg_echo('reply'), 'class' => 'hidden'));
+	} else {
+?>
+	<div>
+		<label><?php echo elgg_echo("reply"); ?></label>
+		<?php echo elgg_view('input/longtext', array('name' => 'group_topic_post')); ?>
+	</div>
+<?php
+		echo elgg_view('input/submit', array('value' => elgg_echo('reply')));
+	}
+	echo elgg_view('input/hidden', array(
+		'name' => 'entity_guid',
+		'value' => $vars['entity']->getGUID(),
+	));
+}
diff --git a/mod/cool_theme/views/default/forms/profile/edit.php b/mod/cool_theme/views/default/forms/profile/edit.php
new file mode 100644
index 000000000..46b77a95b
--- /dev/null
+++ b/mod/cool_theme/views/default/forms/profile/edit.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Edit profile form
+ *
+ * @uses vars['entity']
+ */
+
+?>
+
+<div class="elgg-module  elgg-module-info"><div class="elgg-head">
+	<h3><?php echo elgg_echo('user:name:label'); ?></h3></div>
+	<?php echo elgg_view('input/text', array('name' => 'name', 'value' => $vars['entity']->name)); ?>
+</div>
+<?php
+
+$profile_fields = elgg_get_config('profile_fields');
+if (is_array($profile_fields) && count($profile_fields) > 0) {
+	foreach ($profile_fields as $shortname => $valtype) {
+		$metadata = elgg_get_metadata(array(
+			'guid' => $vars['entity']->guid,
+			'metadata_name' => $shortname
+		));
+		if ($metadata) {
+			if (is_array($metadata)) {
+				$value = '';
+				foreach ($metadata as $md) {
+					if (!empty($value)) {
+						$value .= ', ';
+					}
+					$value .= $md->value;
+					$access_id = $md->access_id;
+				}
+			} else {
+				$value = $metadata->value;
+				$access_id = $metadata->access_id;
+			}
+		} else {
+			$value = '';
+			$access_id = ACCESS_DEFAULT;
+		}
+
+?>
+<div class="elgg-module  elgg-module-info"><div class="elgg-head">
+	<h3><?php echo elgg_echo("profile:{$shortname}") ?></h3>
+	<?php
+		$params = array(
+			'name' => $shortname,
+			'value' => $value,
+		);
+		echo elgg_view("input/{$valtype}", $params);
+		$params = array(
+			'name' => "accesslevel[$shortname]",
+			'value' => $access_id,
+		);
+		echo elgg_view('input/access', $params);
+	?>
+</div>
+<?php
+	}
+}
+?>
+<div class="elgg-foot">
+<?php
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['entity']->guid));
+	echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+?>
+</div>
diff --git a/mod/cool_theme/views/default/forms/profile/fields/add.php b/mod/cool_theme/views/default/forms/profile/fields/add.php
new file mode 100644
index 000000000..1ea9c57a9
--- /dev/null
+++ b/mod/cool_theme/views/default/forms/profile/fields/add.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Add a new field to the set of custom profile fields
+ */
+
+$label_text = elgg_echo('profile:label');
+$type_text = elgg_echo('profile:type');
+
+$label_control = elgg_view('input/text', array('name' => 'label'));
+$type_control = elgg_view('input/dropdown', array('name' => 'type', 'options_values' => array(
+	'text' => elgg_echo('profile:field:text'),
+	'longtext' => elgg_echo('profile:field:longtext'),
+	'tags' => elgg_echo('profile:field:tags'),
+	'url' => elgg_echo('profile:field:url'),
+	'email' => elgg_echo('profile:field:email'),
+	'location' => elgg_echo('profile:field:location'),
+	'date' => elgg_echo('profile:field:date'),
+)));
+
+$submit_control = elgg_view('input/submit', array('name' => elgg_echo('add'), 'value' => elgg_echo('add')));
+
+$formbody = <<< END
+		<div>$label_text: $label_control</div>
+		<div class="elgg-foot">$type_text: $type_control
+		$submit_control</div>
+END;
+
+echo autop(elgg_echo('profile:explainchangefields'));
+echo $formbody;
diff --git a/mod/cool_theme/views/default/forms/profile/fields/reset.php b/mod/cool_theme/views/default/forms/profile/fields/reset.php
new file mode 100644
index 000000000..c0bb1b7f4
--- /dev/null
+++ b/mod/cool_theme/views/default/forms/profile/fields/reset.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Reset profile fields form
+ */
+
+echo '<div class="elgg-foot">';
+$params = array(
+	'value' => elgg_echo('profile:resetdefault'),
+	'class' => 'elgg-button-cancel',
+);
+echo elgg_view('input/submit', $params);
+echo '</div>';
diff --git a/mod/cool_theme/views/default/group/default/river.php b/mod/cool_theme/views/default/group/default/river.php
new file mode 100644
index 000000000..e87331fec
--- /dev/null
+++ b/mod/cool_theme/views/default/group/default/river.php
@@ -0,0 +1,23 @@
+<?php
+
+$group = $vars['entity'];
+
+$image = elgg_view_entity_icon($group, 'tiny');
+
+$title = elgg_view('output/url', array(
+	'href' => $group->getURL(), 
+	'text' => $group->name, 
+	'encode_text' => true,
+));
+
+
+$subtitle = elgg_view('output/text', array('value' => $group->briefdescription));
+
+$description = elgg_get_excerpt($group->description, 350);
+
+echo elgg_view('river/elements/attachment', array(
+	'icon' => $image,
+	'title' => $title,
+	'subtitle' => $subtitle,
+	'description' => $description,
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/groups/profile/fields.php b/mod/cool_theme/views/default/groups/profile/fields.php
new file mode 100644
index 000000000..6a666cfb7
--- /dev/null
+++ b/mod/cool_theme/views/default/groups/profile/fields.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Group profile fields
+ */
+
+$group = $vars['entity'];
+
+$profile_fields = elgg_get_config('group');
+
+echo "<dl class=\"elgg-profile\">";
+if (is_array($profile_fields) && count($profile_fields) > 0) {
+
+	foreach ($profile_fields as $key => $valtype) {
+		// do not show the name
+		if ($key == 'name') {
+			continue;
+		}
+
+		$value = $group->$key;
+		if (empty($value)) {
+			continue;
+		}
+
+		$options = array('value' => $group->$key);
+		if ($valtype == 'tags') {
+			$options['tag_names'] = $key;
+		}
+
+		echo "<dt>";
+		echo elgg_echo("groups:$key");
+		echo "</dt><dd>";
+		echo elgg_view("output/$valtype", $options);
+		echo "</dd>";
+	}
+}
+echo "</dl>";
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/groups/profile/profile_block.php b/mod/cool_theme/views/default/groups/profile/profile_block.php
new file mode 100644
index 000000000..9dcad2715
--- /dev/null
+++ b/mod/cool_theme/views/default/groups/profile/profile_block.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Group profile
+ *
+ * Icon and profile fields
+ *
+ * @uses $vars['group']
+ */
+
+if (!isset($vars['entity']) || !$vars['entity']) {
+	echo elgg_echo('groups:notfound');
+	return true;
+}
+
+$group = $vars['entity'];
+$owner = $group->getOwnerEntity();
+
+$profile_fields = elgg_get_config('group');
+
+?>
+<div class="groups-profile clearfix">
+	<div class="groups-profile-fields elgg-body">
+		<p>
+			<b><?php echo elgg_echo("groups:owner"); ?>: </b>
+			<?php
+				echo elgg_view('output/url', array(
+					'text' => $owner->name,
+					'value' => $owner->getURL(),
+				));
+			?>
+		</p>
+		<p>
+		<?php
+			echo elgg_echo('groups:members') . ": " . $group->getMembers(0, 0, TRUE);
+		?>
+		</p>
+<?php
+if (is_array($profile_fields) && count($profile_fields) > 0) {
+
+	$even_odd = 'odd';
+	foreach ($profile_fields as $key => $valtype) {
+		// do not show the name
+		if ($key == 'name') {
+			continue;
+		}
+
+		$value = $group->$key;
+		if (empty($value)) {
+			continue;
+		}
+
+		$options = array('value' => $group->$key);
+		if ($valtype == 'tags') {
+			$options['tag_names'] = $key;
+		}
+
+		echo "<p class=\"{$even_odd}\">";
+		echo "<b>";
+		echo elgg_echo("groups:$key");
+		echo ": </b>";
+		echo elgg_view("output/$valtype", $options);
+		echo "</p>";
+
+		$even_odd = ($even_odd == 'even') ? 'odd' : 'even';
+	}
+}
+?>
+	</div>
+</div>
diff --git a/mod/cool_theme/views/default/groups/profile/stats.php b/mod/cool_theme/views/default/groups/profile/stats.php
new file mode 100644
index 000000000..9289cbab9
--- /dev/null
+++ b/mod/cool_theme/views/default/groups/profile/stats.php
@@ -0,0 +1,19 @@
+<?php 
+
+$group = $vars['entity'];
+$owner = $group->getOwnerEntity();
+
+?>
+<dl class="elgg-profile">
+	<dt><?php echo elgg_echo("groups:owner"); ?></dt>
+	<dd>
+		<?php
+			echo elgg_view('output/url', array(
+				'text' => $owner->name,
+				'value' => $owner->getURL(),
+			));
+		?>
+	</dd>
+	<dt><?php echo elgg_echo('groups:members'); ?></dt>
+	<dd><?php echo $group->getMembers(0, 0, TRUE); ?></dd>
+</dl>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/groups/profile/summary.php b/mod/cool_theme/views/default/groups/profile/summary.php
new file mode 100644
index 000000000..8b4c0fadf
--- /dev/null
+++ b/mod/cool_theme/views/default/groups/profile/summary.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Group profile summary
+ *
+ * Icon and profile fields
+ *
+ * @uses $vars['group']
+ */
+
+if (!isset($vars['entity']) || !$vars['entity']) {
+	echo elgg_echo('groups:notfound');
+	return true;
+}
+
+echo elgg_view_module('info', 'Info', elgg_view('groups/profile/fields', $vars));
+
+echo elgg_view_module('info', 'Stats', elgg_view('groups/profile/stats', $vars));
diff --git a/mod/cool_theme/views/default/input/access.php b/mod/cool_theme/views/default/input/access.php
new file mode 100644
index 000000000..137eea288
--- /dev/null
+++ b/mod/cool_theme/views/default/input/access.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Elgg access level input
+ * Displays a dropdown input field
+ *
+ * @uses $vars['value']          The current value, if any
+ * @uses $vars['options_values'] Array of value => label pairs (overrides default)
+ * @uses $vars['name']           The name of the input field
+ * @uses $vars['entity']         Optional. The entity for this access control (uses access_id)
+ * @uses $vars['class']          Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-access {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-access";
+}
+
+$defaults = array(
+	'disabled' => false,
+	'value' => get_default_access(),
+	'options_values' => get_write_access_array(),
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->access_id;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+if ($vars['value'] == ACCESS_DEFAULT) {
+	$vars['value'] = get_default_access();
+}
+
+if (is_array($vars['options_values']) && sizeof($vars['options_values']) > 0) {
+	echo elgg_view('input/dropdown', $vars);
+}
diff --git a/mod/cool_theme/views/default/input/autocomplete.php b/mod/cool_theme/views/default/input/autocomplete.php
new file mode 100644
index 000000000..e58eb1ae8
--- /dev/null
+++ b/mod/cool_theme/views/default/input/autocomplete.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Displays an autocomplete text input.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @todo This currently only works for ONE AUTOCOMPLETE TEXT FIELD on a page.
+ *
+ * @uses $vars['value']       Current value for the text input
+ * @uses $vars['match_on']    Array | str What to match on. all|array(groups|users|friends)
+ * @uses $vars['match_owner'] Bool.  Match only entities that are owned by logged in user.
+ * @uses $vars['class']       Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-autocomplete {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-autocomplete";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+$params = array();
+if (isset($vars['match_on'])) {
+	$params['match_on'] = $vars['match_on'];
+	unset($vars['match_on']);
+}
+if (isset($vars['match_owner'])) {
+	$params['match_owner'] = $vars['match_owner'];
+	unset($vars['match_owner']);
+}
+$ac_url_params = http_build_query($params);
+
+elgg_load_js('elgg.autocomplete');
+elgg_load_js('jquery.ui.autocomplete.html');
+
+?>
+
+<script type="text/javascript">
+elgg.provide('elgg.autocomplete');
+elgg.autocomplete.url = "<?php echo elgg_get_site_url() . 'livesearch?' . $ac_url_params; ?>";
+</script> 
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
diff --git a/mod/cool_theme/views/default/input/button.php b/mod/cool_theme/views/default/input/button.php
new file mode 100644
index 000000000..9957fdc54
--- /dev/null
+++ b/mod/cool_theme/views/default/input/button.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Create a input button
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['src']   Src of an image
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-button {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-button";
+}
+
+$defaults = array(
+	'type' => 'button',
+);
+
+$vars = array_merge($defaults, $vars);
+
+switch ($vars['type']) {
+	case 'button':
+	case 'reset':
+	case 'submit':
+	case 'image':
+		break;
+	default:
+		$vars['type'] = 'button';
+		break;
+}
+
+// blank src if trying to access an offsite image. @todo why?
+if (isset($vars['src']) && strpos($vars['src'], elgg_get_site_url()) === false) {
+	$vars['src'] = "";
+}
+?>
+<input <?php echo elgg_format_attributes($vars); ?> />
diff --git a/mod/cool_theme/views/default/input/calendar.php b/mod/cool_theme/views/default/input/calendar.php
new file mode 100644
index 000000000..52c84ff82
--- /dev/null
+++ b/mod/cool_theme/views/default/input/calendar.php
@@ -0,0 +1,6 @@
+<?php
+// @deprecated Use input/date instead.
+
+elgg_deprecated_notice('view: input/calendar is deprecated by input/date', 1.8);
+
+echo elgg_view('input/datepicker', $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/captcha.php b/mod/cool_theme/views/default/input/captcha.php
new file mode 100644
index 000000000..1c2e22aaa
--- /dev/null
+++ b/mod/cool_theme/views/default/input/captcha.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * This view provides a hook for third parties to provide a CAPTCHA.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+?>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/checkbox.php b/mod/cool_theme/views/default/input/checkbox.php
new file mode 100644
index 000000000..3dc75c6c3
--- /dev/null
+++ b/mod/cool_theme/views/default/input/checkbox.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Elgg checkbox input
+ * Displays a checkbox input tag
+ * 
+ * @package Elgg
+ * @subpackage Core
+ *
+ *
+ * Pass input tag attributes as key value pairs. For a list of allowable
+ * attributes, see http://www.w3schools.com/tags/tag_input.asp
+ * 
+ * @uses $vars['default'] The default value to submit if not checked.
+ *                        Optional, defaults to 0. Set to false for no default.
+ * @uses $vars['class']   Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-checkbox {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-checkbox";
+}
+
+$defaults = array(
+	'default' => 0,
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+$default = $vars['default'];
+unset($vars['default']);
+
+if (isset($vars['name']) && $default !== false) {
+	echo "<input type=\"hidden\" name=\"{$vars['name']}\" value=\"$default\"/>";
+}
+
+?>
+<input type="checkbox" <?php echo elgg_format_attributes($vars); ?> />
diff --git a/mod/cool_theme/views/default/input/checkboxes.php b/mod/cool_theme/views/default/input/checkboxes.php
new file mode 100644
index 000000000..db4b06949
--- /dev/null
+++ b/mod/cool_theme/views/default/input/checkboxes.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * Elgg checkbox input
+ * Displays a checkbox input field
+ *
+ * @note This also includes a hidden input with the same name as the checkboxes
+ * to make sure something is sent to the server.  The default value is 0.
+ * If using JS, be specific to avoid selecting the hidden default value:
+ * 	$('input[type=checkbox][name=name]')
+ * 
+ * @warning Passing integers as labels does not currently work due to a
+ * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
+ * the labels must be character codes: 1 would be &#0049;
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses string $vars['name']     The name of the input fields
+ *                                (Forced to an array by appending [])
+ * @uses array  $vars['options']  An array of strings representing the
+ *                                label => option for the each checkbox field
+ * @uses string $vars['default']  The default value to send if nothing is checked.
+ *                                Optional, defaults to 0. Set to FALSE for no default.
+ * @uses bool   $vars['disabled'] Make all input elements disabled. Optional.
+ * @uses string $vars['value']    The current value. Single value or array. Optional.
+ * @uses string $vars['class']    Additional class of the list. Optional.
+ * @uses string $vars['align']    'horizontal' or 'vertical' Default: 'vertical'
+ *
+ */
+
+$defaults = array(
+	'align' => 'vertical',
+	'value' => array(),
+	'default' => 0,
+	'disabled' => false,
+	'options' => array(),
+	'name' => '',
+);
+
+$vars = array_merge($defaults, $vars);
+
+$class = "elgg-input-checkboxes elgg-{$vars['align']}";
+if (isset($vars['class'])) {
+	$class .= " {$vars['class']}";
+	unset($vars['class']);
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+	unset($vars['id']);
+}
+
+if (is_array($vars['value'])) {
+	$values = array_map('elgg_strtolower', $vars['value']);
+} else {
+	$values = array(elgg_strtolower($vars['value']));
+}
+
+$input_vars = $vars;
+$input_vars['default'] = false;
+if ($vars['name']) {
+	$input_vars['name'] = "{$vars['name']}[]";
+}
+unset($input_vars['align']);
+unset($input_vars['options']);
+
+if (count($vars['options']) > 0) {
+	// include a default value so if nothing is checked 0 will be passed.
+	if ($vars['name'] && $vars['default'] !== false) {
+		echo "<input type=\"hidden\" name=\"{$vars['name']}\" value=\"{$vars['default']}\" />";
+	}
+
+	echo "<ul class=\"$class\" $id>";
+	foreach ($vars['options'] as $label => $value) {
+		// @deprecated 1.8 Remove in 1.9
+		if (is_integer($label)) {
+			elgg_deprecated_notice('$vars[\'options\'] must be an associative array in input/checkboxes', 1.8);
+			$label = $value;
+		}
+
+		$input_vars['checked'] = in_array(elgg_strtolower($value), $values);
+		$input_vars['value']   = $value;
+		
+		$input = elgg_view('input/checkbox', $input_vars);
+
+		echo "<li><label>$input$label</label></li>";
+	}
+	echo '</ul>';
+}
diff --git a/mod/cool_theme/views/default/input/date.php b/mod/cool_theme/views/default/input/date.php
new file mode 100644
index 000000000..828ce5520
--- /dev/null
+++ b/mod/cool_theme/views/default/input/date.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Elgg date input
+ * Displays a text field with a popup date picker.
+ *
+ * The elgg.ui JavaScript library initializes the jQueryUI datepicker based
+ * on the CSS class .elgg-input-date. It uses the ISO 8601 standard for date
+ * representation: yyyy-mm-dd.
+ *
+ * Unix timestamps are supported by setting the 'timestamp' parameter to true.
+ * The date is still displayed to the user in a text format but is submitted as
+ * a unix timestamp in seconds.
+ *
+ * @uses $vars['value']     The current value, if any (as a unix timestamp)
+ * @uses $vars['class']     Additional CSS class
+ * @uses $vars['timestamp'] Store as a Unix timestamp in seconds. Default = false
+ *                          Note: you cannot use an id with the timestamp option.
+ */
+
+//@todo popup_calendar deprecated in 1.8.  Remove in 2.0
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-date popup_calendar {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-date popup_calendar";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+	'timestamp' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+$timestamp = $vars['timestamp'];
+unset($vars['timestamp']);
+
+if ($timestamp) {
+	echo elgg_view('input/hidden', array(
+		'name' => $vars['name'],
+		'value' => $vars['value'],
+	));
+
+	$vars['class'] = "{$vars['class']} elgg-input-timestamp";
+	$vars['id'] = $vars['name'];
+	unset($vars['name']);
+	unset($vars['internalname']);
+}
+
+// convert timestamps to text for display
+if (is_numeric($vars['value'])) {
+	$vars['value'] = gmdate('Y-m-d', $vars['value']);
+}
+
+$attributes = elgg_format_attributes($vars);
+echo "<input type=\"text\" $attributes />";
diff --git a/mod/cool_theme/views/default/input/datepicker.php b/mod/cool_theme/views/default/input/datepicker.php
new file mode 100644
index 000000000..8955e6e53
--- /dev/null
+++ b/mod/cool_theme/views/default/input/datepicker.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * @deprecated use input/date instead
+ */
+elgg_deprecated_notice('input/datepicker was deprecated in favor of input/date', 1.8);
+echo elgg_view('input/date', $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/dropdown.php b/mod/cool_theme/views/default/input/dropdown.php
new file mode 100644
index 000000000..9f07874f1
--- /dev/null
+++ b/mod/cool_theme/views/default/input/dropdown.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Elgg dropdown input
+ * Displays a dropdown (select) input field
+ *
+ * @warning Default values of FALSE or NULL will match '' (empty string) but not 0.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value']          The current value, if any
+ * @uses $vars['options']        An array of strings representing the options for the dropdown field
+ * @uses $vars['options_values'] An associative array of "value" => "option"
+ *                               where "value" is the name and "option" is
+ * 								 the value displayed on the button. Replaces
+ *                               $vars['options'] when defined.
+ * @uses $vars['class']          Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-dropdown {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-dropdown";
+}
+
+$defaults = array(
+	'disabled' => false,
+	'value' => '',
+	'options_values' => array(),
+	'options' => array(),
+);
+
+$vars = array_merge($defaults, $vars);
+
+$options_values = $vars['options_values'];
+unset($vars['options_values']);
+
+$options = $vars['options'];
+unset($vars['options']);
+
+$value = $vars['value'];
+unset($vars['value']);
+
+?>
+<select <?php echo elgg_format_attributes($vars); ?>>
+<?php
+
+if ($options_values) {
+	foreach ($options_values as $opt_value => $option) {
+
+		$option_attrs = elgg_format_attributes(array(
+			'value' => $opt_value,
+			'selected' => (string)$opt_value == (string)$value,
+		));
+
+		echo "<option $option_attrs>$option</option>";
+	}
+} else {
+	if (is_array($options)) {
+		foreach ($options as $option) {
+
+			$option_attrs = elgg_format_attributes(array(
+				'selected' => (string)$option == (string)$value
+			));
+
+			echo "<option $option_attrs>$option</option>";
+		}
+	}
+}
+?>
+</select>
diff --git a/mod/cool_theme/views/default/input/email.php b/mod/cool_theme/views/default/input/email.php
new file mode 100644
index 000000000..190fb88c6
--- /dev/null
+++ b/mod/cool_theme/views/default/input/email.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Elgg email input
+ * Displays an email input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-email {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-email";
+}
+
+$defaults = array(
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+?>
+
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/file.php b/mod/cool_theme/views/default/input/file.php
new file mode 100644
index 000000000..452fe72b9
--- /dev/null
+++ b/mod/cool_theme/views/default/input/file.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg file input
+ * Displays a file input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The current value if any
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (!empty($vars['value'])) {
+	echo elgg_echo('fileexists') . "<br />";
+}
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-file {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-file";
+}
+
+$defaults = array(
+	'disabled' => false,
+	'size' => 30,
+);
+
+$attrs = array_merge($defaults, $vars);
+
+?>
+<input type="file" <?php echo elgg_format_attributes($attrs); ?> />
diff --git a/mod/cool_theme/views/default/input/form.php b/mod/cool_theme/views/default/input/form.php
new file mode 100644
index 000000000..df30133b3
--- /dev/null
+++ b/mod/cool_theme/views/default/input/form.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Create a form for data submission.
+ * Use this view for forms as it provides protection against CSRF attacks.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['body'] The body of the form (made up of other input/xxx views and html
+ * @uses $vars['action'] The action URL of the form
+ * @uses $vars['method'] The submit method: post (default) or get
+ * @uses $vars['enctype'] Set to 'multipart/form-data' if uploading a file
+ * @uses $vars['disable_security'] turn off CSRF security by setting to true
+ * @uses $vars['class'] Additional class for the form
+ */
+
+$defaults = array(
+	'method' => "post",
+	'disable_security' => FALSE,
+);
+
+$vars = array_merge($defaults, $vars);
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-form {$vars['class']}";
+} else {
+	$vars['class'] = 'elgg-form';
+}
+
+$vars['action'] = elgg_normalize_url($vars['action']);
+$vars['method'] = strtolower($vars['method']);
+
+$body = $vars['body'];
+unset($vars['body']);
+
+// Generate a security header
+if (!$vars['disable_security']) {
+	$body = elgg_view('input/securitytoken') . $body;
+}
+unset($vars['disable_security']);
+
+$attributes = elgg_format_attributes($vars);
+
+echo "<form $attributes><fieldset>$body</fieldset></form>";
diff --git a/mod/cool_theme/views/default/input/friendspicker.php b/mod/cool_theme/views/default/input/friendspicker.php
new file mode 100644
index 000000000..40708c890
--- /dev/null
+++ b/mod/cool_theme/views/default/input/friendspicker.php
@@ -0,0 +1,319 @@
+<?php
+/**
+ * Elgg friends picker
+ * Lists the friends picker
+ *
+ * @warning Below is the ugliest code in Elgg. It needs to be rewritten or removed
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['entities'] The array of ElggUser objects
+ * @uses $vars['name']
+ * @uses $vars['value']
+ * @uses $vars['highlight']
+ * @uses $vars['callback']
+ */
+
+elgg_load_js('elgg.friendspicker');
+elgg_load_js('jquery.easing');
+
+
+$chararray = elgg_echo('friendspicker:chararray');
+
+// Initialise name
+if (!isset($vars['name'])) {
+	$name = "friend";
+} else {
+	$name = $vars['name'];
+}
+
+// Are we highlighting default or all?
+if (empty($vars['highlight'])) {
+	$vars['highlight'] = 'default';
+}
+if ($vars['highlight'] != 'all') {
+	$vars['highlight'] = 'default';
+}
+
+// Initialise values
+if (!isset($vars['value'])) {
+	$vars['value'] = array();
+} else {
+	if (!is_array($vars['value'])) {
+		$vars['value'] = (int) $vars['value'];
+		$vars['value'] = array($vars['value']);
+	}
+}
+
+// Initialise whether we're calling back or not
+if (isset($vars['callback'])) {
+	$callback = $vars['callback'];
+} else {
+	$callback = false;
+}
+
+// We need to count the number of friends pickers on the page.
+if (!isset($vars['friendspicker'])) {
+	global $friendspicker;
+	if (!isset($friendspicker)) {
+		$friendspicker = 0;
+	}
+	$friendspicker++;
+} else {
+	$friendspicker = $vars['friendspicker'];
+}
+
+$users = array();
+$activeletters = array();
+
+// Are we displaying form tags and submit buttons?
+// (If we've been given a target, then yes! Otherwise, no.)
+if (isset($vars['formtarget'])) {
+	$formtarget = $vars['formtarget'];
+} else {
+	$formtarget = false;
+}
+
+// Sort users by letter
+if (is_array($vars['entities']) && sizeof($vars['entities'])) {
+	foreach($vars['entities'] as $user) {
+		$letter = elgg_strtoupper(elgg_substr($user->name, 0, 1));
+
+		if (!elgg_substr_count($chararray, $letter)) {
+			$letter = "*";
+		}
+		if (!isset($users[$letter])) {
+			$users[$letter] = array();
+		}
+		$users[$letter][$user->guid] = $user;
+	}
+}
+
+// sort users in letters alphabetically
+foreach ($users as $letter => $letter_users) {
+	usort($letter_users, create_function('$a, $b', '
+		return strcasecmp($a->name, $b->name);
+	'));
+	$users[$letter] = $letter_users;
+}
+
+if (!$callback) {
+	?>
+
+	<div class="friends-picker-main-wrapper">
+
+	<?php
+
+	if (isset($vars['content'])) {
+		echo $vars['content'];
+	}
+	?>
+
+	<div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
+
+	<?php
+}
+
+if (!isset($vars['replacement'])) {
+	if ($formtarget) {
+?>
+<?php //@todo JS 1.8: no ?>
+<script language="text/javascript">
+	$(function() { // onload...do
+		$('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
+			var inputs = [];
+			$(':input', this).each(function() {
+				if (this.type != 'checkbox' || (this.type == 'checkbox' && this.checked != false)) {
+					inputs.push(this.name + '=' + escape(this.value));
+				}
+			});
+			jQuery.ajax({
+				type: "POST",
+				data: inputs.join('&'),
+				url: this.action,
+				success: function(){
+					$('a.collectionmembers<?php echo $friendspicker; ?>').click();
+				}
+
+			});
+			return false;
+		})
+	})
+
+	</script>
+
+<!-- Collection members form -->
+<form id="collectionMembersForm<?php echo $friendspicker; ?>" action="<?php echo $formtarget; ?>" method="post"> <!-- action="" method=""> -->
+
+<?php
+		echo elgg_view('input/securitytoken');
+		echo elgg_view('input/hidden', array(
+			'name' => 'collection_id',
+			'value' => $vars['collection_id'],
+		));
+	}
+?>
+
+<div class="friends-picker-wrapper">
+<div id="friends-picker<?php echo $friendspicker; ?>">
+	<div class="friends-picker-container">
+<?php
+
+// Initialise letters
+	$chararray .= "*";
+	$letter = elgg_substr($chararray, 0, 1);
+	$letpos = 0;
+	while (1 == 1) {
+		?>
+		<div class="panel" title="<?php	echo $letter; ?>">
+			<div class="wrapper">
+				<h3><?php echo $letter; ?></h3>
+		<?php
+
+		if (isset($users[$letter])) {
+			ksort($users[$letter]);
+
+			echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
+			$col = 0;
+
+			foreach($users[$letter] as $friend) {
+				if ($col == 0) {
+					echo "<tr>";
+				}
+
+				//echo "<p>" . $user->name . "</p>";
+				$label = elgg_view_entity_icon($friend, 'tiny', array('use_hover' => false));
+				$options[$label] = $friend->getGUID();
+
+				if ($vars['highlight'] == 'all' && !in_array($letter,$activeletters)) {
+					$activeletters[] = $letter;
+				}
+
+
+				if (in_array($friend->getGUID(),$vars['value'])) {
+					$checked = "checked = \"checked\"";
+					if (!in_array($letter,$activeletters) && $vars['highlight'] == 'default') {
+						$activeletters[] = $letter;
+					}
+				} else {
+					$checked = "";
+				}
+				?>
+
+				<td>
+
+					<input type="checkbox" <?php echo $checked; ?> name="<?php echo $name; ?>[]" value="<?php echo $options[$label]; ?>" />
+
+				</td>
+
+				<td>
+
+					<div style="width: 25px; margin-bottom: 15px;">
+				<?php
+					echo $label;
+				?>
+					</div>
+				</td>
+				<td style="width: 200px; padding: 5px;">
+					<?php echo $friend->name; ?>
+				</td>
+				<?php
+				$col++;
+				if ($col == 3){
+					echo "</tr>";
+					$col = 0;
+				}
+			}
+			if ($col < 3) {
+				echo "</tr>";
+			}
+
+			echo "</table>";
+		}
+
+?>
+
+			</div>
+		</div>
+<?php
+
+			$substr = elgg_substr($chararray, elgg_strlen($chararray) - 1, 1);
+			if ($letter == $substr) {
+				break;
+			}
+			//$letter++;
+			$letpos++;
+			$letter = elgg_substr($chararray, $letpos, 1);
+		}
+
+?>
+	</div>
+
+<?php
+
+if ($formtarget) {
+
+	if (isset($vars['formcontents']))
+		echo $vars['formcontents'];
+
+?>
+	<div class="clearfix"></div>
+	<div class="friendspicker-savebuttons">
+		<input type="submit" class="elgg-button elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" />
+		<input type="button" class="elgg-button elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
+	<br /></div>
+	</form>
+
+<?php
+
+}
+
+?>
+
+</div>
+</div>
+
+<?php
+} else {
+	echo $vars['replacement'];
+}
+if (!$callback) {
+
+?>
+
+</div>
+</div>
+
+
+<?php
+
+}
+
+if (!isset($vars['replacement'])) {
+?>
+<?php //@todo JS 1.8: no ?>
+<script type="text/javascript">
+	// initialise picker
+	$("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+</script>
+<script type="text/javascript">
+$(document).ready(function () {
+// manually add class to corresponding tab for panels that have content
+<?php
+if (sizeof($activeletters) > 0)
+	//$chararray = elgg_echo('friendspicker:chararray');
+	foreach($activeletters as $letter) {
+		$tab = elgg_strpos($chararray, $letter) + 1;
+?>
+$("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+<?php
+	}
+
+?>
+});
+</script>
+
+<?php
+
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/hidden.php b/mod/cool_theme/views/default/input/hidden.php
new file mode 100644
index 000000000..9c2fc6c08
--- /dev/null
+++ b/mod/cool_theme/views/default/input/hidden.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Create a hidden data field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The current value, if any
+ */
+
+?>
+<input type="hidden" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/location.php b/mod/cool_theme/views/default/input/location.php
new file mode 100644
index 000000000..4cf05c72a
--- /dev/null
+++ b/mod/cool_theme/views/default/input/location.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Location input field
+ *
+ * @uses $vars['entity'] The ElggEntity that has a location
+ * @uses $vars['value']  The default value for the location
+ * @uses $vars['class']  Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-location {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-location";
+}
+
+$defaults = array(
+	'disabled' => false,
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->location;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+echo elgg_view('input/tag', $vars);
diff --git a/mod/cool_theme/views/default/input/longtext.php b/mod/cool_theme/views/default/input/longtext.php
new file mode 100644
index 000000000..2b1462635
--- /dev/null
+++ b/mod/cool_theme/views/default/input/longtext.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Elgg long text input
+ * Displays a long text input field that can use WYSIWYG editor
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value']    The current value, if any - will be html encoded
+ * @uses $vars['disabled'] Is the input field disabled?
+ * @uses $vars['class']    Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-longtext {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-longtext";
+}
+
+$defaults = array(
+	'value' => '',
+	'id' => 'elgg-input-' . rand(), //@todo make this more robust
+);
+
+$vars = array_merge($defaults, $vars);
+
+$value = $vars['value'];
+unset($vars['value']);
+
+echo elgg_view_menu('longtext', array(
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+	'id' => $vars['id'],
+));
+
+?>
+
+<textarea <?php echo elgg_format_attributes($vars); ?>>
+<?php echo htmlspecialchars($value, ENT_QUOTES, 'UTF-8', false); ?>
+</textarea>
diff --git a/mod/cool_theme/views/default/input/password.php b/mod/cool_theme/views/default/input/password.php
new file mode 100644
index 000000000..45f2b20a6
--- /dev/null
+++ b/mod/cool_theme/views/default/input/password.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Elgg password input
+ * Displays a password input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] The current value, if any
+ * @uses $vars['name']  The name of the input field
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-password {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-password";
+}
+
+$defaults = array(
+	'disabled' => false,
+	'value' => '',
+);
+
+$attrs = array_merge($defaults, $vars);
+?>
+
+<input type="password" <?php echo elgg_format_attributes($attrs); ?> />
diff --git a/mod/cool_theme/views/default/input/plaintext.php b/mod/cool_theme/views/default/input/plaintext.php
new file mode 100644
index 000000000..cd0aaafcf
--- /dev/null
+++ b/mod/cool_theme/views/default/input/plaintext.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Elgg long text input (plaintext)
+ * Displays a long text input field that should not be overridden by wysiwyg editors.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value']    The current value, if any
+ * @uses $vars['name']     The name of the input field
+ * @uses $vars['class']    Additional CSS class
+ * @uses $vars['disabled']
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-plaintext {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-plaintext";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+$value = $vars['value'];
+unset($vars['value']);
+
+?>
+
+<textarea <?php echo elgg_format_attributes($vars); ?>>
+<?php echo htmlspecialchars($value, ENT_QUOTES, 'UTF-8', false); ?>
+</textarea>
diff --git a/mod/cool_theme/views/default/input/pulldown.php b/mod/cool_theme/views/default/input/pulldown.php
new file mode 100644
index 000000000..705329691
--- /dev/null
+++ b/mod/cool_theme/views/default/input/pulldown.php
@@ -0,0 +1,9 @@
+<?php
+/**
+ * Deprecated pulldown input view - use 'input/dropdown' instead.
+ *
+ * @deprecated 1.8
+ */
+
+elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8);
+echo elgg_view('input/dropdown', $vars);
diff --git a/mod/cool_theme/views/default/input/radio.php b/mod/cool_theme/views/default/input/radio.php
new file mode 100644
index 000000000..ef860a773
--- /dev/null
+++ b/mod/cool_theme/views/default/input/radio.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Elgg radio input
+ * Displays a radio input field
+ *
+ * @warning Passing integers as labels does not currently work due to a
+ * deprecated hack that will be removed in Elgg 1.9. To use integer labels,
+ * the labels must be character codes: 1 would be &#0049;
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value']    The current value, if any
+ * @uses $vars['name']     The name of the input field
+ * @uses $vars['options']  An array of strings representing the options for the
+ *                         radio field as "label" => option
+ * @uses $vars['class']    Additional class of the list. Optional.
+ * @uses $vars['align']    'horizontal' or 'vertical' Default: 'vertical'
+ */
+
+$defaults = array(
+	'align' => 'vertical',
+	'value' => array(),
+	'disabled' => false,
+	'options' => array(),
+	'name' => '',
+);
+
+$vars = array_merge($defaults, $vars);
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+	unset($vars['id']);
+}
+
+$class = "elgg-input-radios elgg-{$vars['align']}";
+if (isset($vars['class'])) {
+	$class .= " {$vars['class']}";
+	unset($vars['class']);
+}
+unset($vars['align']);
+$vars['class'] = 'elgg-input-radio';
+
+if (is_array($vars['value'])) {
+	$vars['value'] = array_map('elgg_strtolower', $vars['value']);
+} else {
+	$vars['value'] = array(elgg_strtolower($vars['value']));
+}
+
+$options = $vars['options'];
+unset($vars['options']);
+
+$value = $vars['value'];
+unset($vars['value']);
+
+if ($options && count($options) > 0) {
+	echo "<ul class=\"$class\" $id>";
+	foreach ($options as $label => $option) {
+
+		$vars['checked'] = in_array(elgg_strtolower($option), $value);
+		$vars['value'] = $option;
+
+		$attributes = elgg_format_attributes($vars);
+
+		// handle indexed array where label is not specified
+		// @deprecated 1.8 Remove in 1.9
+		if (is_integer($label)) {
+			elgg_deprecated_notice('$vars[\'options\'] must be an associative array in input/radio', 1.8);
+			$label = $option;
+		}
+
+		echo "<li><label><input type=\"radio\" $attributes />$label</label></li>";
+	}
+	echo '</ul>';
+}
diff --git a/mod/cool_theme/views/default/input/reset.php b/mod/cool_theme/views/default/input/reset.php
new file mode 100644
index 000000000..082da8669
--- /dev/null
+++ b/mod/cool_theme/views/default/input/reset.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Create a reset input button
+ *
+ * @package Elgg
+ * @subpackage Core
+ * 
+ * @uses $vars['class'] CSS class that replaces elgg-button-cancel
+ */
+
+$vars['type'] = 'reset';
+$vars['class'] = elgg_extract('class', $vars, 'elgg-button-cancel');
+
+echo elgg_view('input/button', $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/securitytoken.php b/mod/cool_theme/views/default/input/securitytoken.php
new file mode 100644
index 000000000..75410848a
--- /dev/null
+++ b/mod/cool_theme/views/default/input/securitytoken.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * CSRF security token view for use with secure forms.
+ *
+ * It is still recommended that you use input/form.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+$ts = time();
+$token = generate_action_token($ts);
+
+echo elgg_view('input/hidden', array('name' => '__elgg_token', 'value' => $token));
+echo elgg_view('input/hidden', array('name' => '__elgg_ts', 'value' => $ts));
diff --git a/mod/cool_theme/views/default/input/submit.php b/mod/cool_theme/views/default/input/submit.php
new file mode 100644
index 000000000..df369b3b4
--- /dev/null
+++ b/mod/cool_theme/views/default/input/submit.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Create a submit input button
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['class'] CSS class that replaces elgg-button-submit
+ */
+
+$vars['type'] = 'submit';
+$vars['class'] = elgg_extract('class', $vars, 'elgg-button-submit');
+
+echo elgg_view('input/button', $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/tag.php b/mod/cool_theme/views/default/input/tag.php
new file mode 100644
index 000000000..8893a18ff
--- /dev/null
+++ b/mod/cool_theme/views/default/input/tag.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Elgg tag input
+ *
+ * Accepts a single tag value
+ *
+ * @uses $vars['value'] The default value for the tag
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-tag {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-tag";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+?>
+
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/tags.php b/mod/cool_theme/views/default/input/tags.php
new file mode 100644
index 000000000..261cf9f97
--- /dev/null
+++ b/mod/cool_theme/views/default/input/tags.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Elgg tag input
+ * Displays a tag input field
+ *
+ * @uses $vars['disabled']
+ * @uses $vars['class']    Additional CSS class
+ * @uses $vars['value']    Array of tags or a string
+ * @uses $vars['entity']   Optional. Entity whose tags are being displayed (metadata ->tags)
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-tags {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-tags";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+if (isset($vars['entity'])) {
+	$defaults['value'] = $vars['entity']->tags;
+	unset($vars['entity']);
+}
+
+$vars = array_merge($defaults, $vars);
+
+if (is_array($vars['value'])) {
+	$tags = array();
+
+	foreach ($vars['value'] as $tag) {
+		if (is_string($tag)) {
+			$tags[] = $tag;
+		} else {
+			$tags[] = $tag->value;
+		}
+	}
+
+	$vars['value'] = implode(", ", $tags);
+}
+
+?>
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/text.php b/mod/cool_theme/views/default/input/text.php
new file mode 100644
index 000000000..707a50179
--- /dev/null
+++ b/mod/cool_theme/views/default/input/text.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg text input
+ * Displays a text input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-text {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-text";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+?>
+
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/url.php b/mod/cool_theme/views/default/input/url.php
new file mode 100644
index 000000000..e97a316d8
--- /dev/null
+++ b/mod/cool_theme/views/default/input/url.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Elgg URL input
+ * Displays a URL input field
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['class'] Additional CSS class
+ */
+
+if (isset($vars['class'])) {
+	$vars['class'] = "elgg-input-url {$vars['class']}";
+} else {
+	$vars['class'] = "elgg-input-url";
+}
+
+$defaults = array(
+	'value' => '',
+	'disabled' => false,
+);
+
+$vars = array_merge($defaults, $vars);
+
+?>
+
+<input type="text" <?php echo elgg_format_attributes($vars); ?> />
diff --git a/mod/cool_theme/views/default/input/urlshortener.php b/mod/cool_theme/views/default/input/urlshortener.php
new file mode 100644
index 000000000..ecfb02efa
--- /dev/null
+++ b/mod/cool_theme/views/default/input/urlshortener.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * This view provides a hook for third parties to provide a URL shortener.
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+?>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/input/userpicker.php b/mod/cool_theme/views/default/input/userpicker.php
new file mode 100644
index 000000000..91a397e37
--- /dev/null
+++ b/mod/cool_theme/views/default/input/userpicker.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * User Picker.  Sends an array of user guids.
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['value'] Array of user guids for already selected users or null
+ *
+ * The name of the hidden fields is members[]
+ *
+ * @warning Only a single input/userpicker is supported per web page.
+ *
+ * Defaults to lazy load user lists in alphabetical order. User needs
+ * to type two characters before seeing the user popup list.
+ *
+ * As users are selected they move down to a "users" box.
+ * When this happens, a hidden input is created with the
+ * name of members[] and a value of the GUID.
+ */
+
+elgg_load_js('elgg.userpicker');
+elgg_load_js('jquery.ui.autocomplete.html');
+
+function user_picker_add_user($user_id) {
+	$user = get_entity($user_id);
+	if (!$user || !($user instanceof ElggUser)) {
+		return false;
+	}
+	
+	$icon = elgg_view_entity_icon($user, 'tiny', array('use_hover' => false));
+
+	// this html must be synced with the userpicker.js library
+	$code = '<li><div class="elgg-image-block">';
+	$code .= "<div class='elgg-image'>$icon</div>";
+	$code .= "<div class='elgg-image-alt'><a href='#' class='elgg-userpicker-remove'>X</a></div>";
+	$code .= "<div class='elgg-body'>" . $user->name . "</div>";
+	$code .= "</div>";
+	$code .= "<input type=\"hidden\" name=\"members[]\" value=\"$user_id\">";
+	$code .= '</li>';
+	
+	return $code;
+}
+
+// loop over all values and prepare them so that "in" will work in javascript
+$values = array();
+if (!is_array($vars['value'])) {
+	$vars['value'] = array($vars['value']);
+}
+foreach ($vars['value'] as $value) {
+	$values[$value] = TRUE;
+}
+
+// convert the values to a json-encoded list
+$json_values = json_encode($values);
+
+// create an HTML list of users
+$user_list = '';
+foreach ($vars['value'] as $user_id) {
+	$user_list .= user_picker_add_user($user_id);
+}
+
+?>
+<div class="elgg-user-picker">
+	<input type="text" class="elgg-input-user-picker" size="30"/>
+	<input type="checkbox" name="match_on" value="true" />
+	<label><?php echo elgg_echo('userpicker:only_friends'); ?></label>
+	<ul class="elgg-user-picker-list"><?php echo $user_list; ?></ul>
+</div>
+<script type="text/javascript">
+	// @todo grab the values in the init function rather than using inline JS
+	elgg.userpicker.userList = <?php echo $json_values ?>;
+</script>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/js/tobar2.php b/mod/cool_theme/views/default/js/tobar2.php
new file mode 100644
index 000000000..454a9684b
--- /dev/null
+++ b/mod/cool_theme/views/default/js/tobar2.php
@@ -0,0 +1,100 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.0.4
+ * http://twitter.github.com/bootstrap/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle="dropdown"]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , selector
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      selector = $this.attr('data-target')
+
+      if (!selector) {
+        selector = $this.attr('href')
+        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      }
+
+      $parent = $(selector)
+      $parent.length || ($parent = $this.parent())
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) $parent.toggleClass('open')
+
+      return false
+    }
+
+  }
+
+  function clearMenus() {
+    $(toggle).parent().removeClass('open')
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(function () {
+    $('html').on('click.dropdown.data-api', clearMenus)
+    $('body')
+      .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+      .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+  })
+
+}(window.jQuery);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/js/topbar.php b/mod/cool_theme/views/default/js/topbar.php
new file mode 100644
index 000000000..763d0fc7a
--- /dev/null
+++ b/mod/cool_theme/views/default/js/topbar.php
@@ -0,0 +1,3 @@
+elgg.provide('elgg.topbar');
+elgg.topbar.init = function() {$('.elgg-menu-topbar .elgg-menu-parent').live('click', function(event) {$(this).toggleClass('elgg-menu-opened elgg-menu-closed').siblings().toggleClass('elgg-state-active');return false;});$('body').live('click', function(event) {$('.elgg-menu-topbar .elgg-child-menu.elgg-state-active').each(function() {if ($(this).has(event.target).length == 0 && !$(this).is(event.target)) {$(this).removeClass('elgg-state-active').siblings().removeClass('elgg-menu-opened').addClass('elgg-menu-closed');}});});};
+elgg.register_hook_handler('init', 'system', elgg.topbar.init);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/likes/river_footer.php b/mod/cool_theme/views/default/likes/river_footer.php
new file mode 100644
index 000000000..84f942692
--- /dev/null
+++ b/mod/cool_theme/views/default/likes/river_footer.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Elgg likes display
+ *
+ * @uses $vars['entity']
+ */
+
+if (!$vars['item'] instanceof ElggRiverItem || $vars['item']->annotation_id) {
+	return true;
+}
+
+$object = $vars['item']->getObjectEntity();
+
+$num_of_likes = $object->countAnnotations('likes');
+
+if ($num_of_likes == 0) {
+	return true;
+}
+
+$guid = $object->guid;
+
+$likes_button = elgg_view_icon('thumbs-up');
+
+// check to see if the user has already liked this
+if (elgg_is_logged_in() && $object->canAnnotate(0, 'likes')) {
+	if (!elgg_annotation_exists($guid, 'likes')) {
+		$likes_button = elgg_view('output/url', array(
+			'href' => "action/likes/add?guid={$guid}",
+			'text' => elgg_view_icon('thumbs-up'),
+			'title' => elgg_echo('likes:likethis'),
+			'is_action' => true,
+		));
+	} else {
+		$likes = elgg_get_annotations(array(
+			'guid' => $guid,
+			'annotation_name' => 'likes',
+			'owner_guid' => elgg_get_logged_in_user_guid()
+		));
+
+		$likes_button = elgg_view('output/url', array(
+			'href' => "action/likes/delete?annotation_id={$likes[0]->id}",
+			'text' => elgg_view_icon('thumbs-up-alt'),
+			'title' => elgg_echo('likes:remove'),
+			'is_action' => true,
+		));
+	}
+}
+
+// display the number of likes
+if ($num_of_likes == 1) {
+	$likes_string = elgg_echo('likes:userlikedthis', array($num_of_likes));
+} else {
+	$likes_string = elgg_echo('likes:userslikedthis', array($num_of_likes));
+}
+
+$likes_string = elgg_view('output/url', array(
+	'text' => $likes_string,
+	'title' => elgg_echo('likes:see'),
+	'rel' => 'popup',
+	'href' => "#likes-$guid"
+));
+
+$likes_list = elgg_list_annotations(array('guid' => $guid, 'annotation_name' => 'likes', 'limit' => 99));
+
+$likes_module = elgg_view_module('popup', 'Likes', $likes_list, array('class' => 'hidden elgg-likes-list', 'id' => "likes-$guid"));
+
+$vars['image'] = $likes_button;
+$vars['body'] = $likes_string . $likes_module;
+$vars['class'] = 'elgg-river-participation';
+
+echo elgg_view('page/components/image_block', $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/messageboard/composer.php b/mod/cool_theme/views/default/messageboard/composer.php
new file mode 100644
index 000000000..49fa91a53
--- /dev/null
+++ b/mod/cool_theme/views/default/messageboard/composer.php
@@ -0,0 +1,6 @@
+<?php
+//hack! Elgg engine should take care of this, or blog/save form should be coded better
+if (elgg_is_xhr() && isset($vars['entity_guid'])) {
+	elgg_set_page_owner_guid($vars['entity_guid']);
+}
+echo elgg_view_form('messageboard/add', array(), $vars);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/object/blog/river.php b/mod/cool_theme/views/default/object/blog/river.php
new file mode 100644
index 000000000..59d5245ea
--- /dev/null
+++ b/mod/cool_theme/views/default/object/blog/river.php
@@ -0,0 +1,17 @@
+<?php
+
+$blog = $vars['entity'];
+
+$title = elgg_view('output/url', array(
+	'text' => $blog->title,
+	'href' => $blog->getURL(),
+	'encode_text' => true,
+));
+
+$description = elgg_get_excerpt($blog->description, 350);
+
+echo elgg_view('river/elements/attachment', array(
+	'title' => $title,
+	'description' => $description,
+	'image' => elgg_view_entity_icon($blog->getOwnerEntity(), 'tiny'),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/object/bookmarks/river.php b/mod/cool_theme/views/default/object/bookmarks/river.php
new file mode 100644
index 000000000..543998446
--- /dev/null
+++ b/mod/cool_theme/views/default/object/bookmarks/river.php
@@ -0,0 +1,19 @@
+<?php
+
+$link = $vars['entity'];
+
+$title = elgg_view('output/url', array(
+	'text' => $link->title,
+	'href' => $link->getURL(),
+	'encode_text' => true,
+));
+
+$subtitle = elgg_view('output/url', array('value' => $link->address));
+
+$description = elgg_get_excerpt($link->description, 350);
+
+echo elgg_view('river/elements/attachment', array(
+	'title' => $title,
+	'subtitle' => $subtitle,
+	'description' => $description,
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/object/file/river.php b/mod/cool_theme/views/default/object/file/river.php
new file mode 100644
index 000000000..e767567d5
--- /dev/null
+++ b/mod/cool_theme/views/default/object/file/river.php
@@ -0,0 +1,17 @@
+<?php
+
+$file = $vars['entity'];
+
+$title = elgg_view('output/url', array(
+	'text' => $file->title,
+	'href' => $file->getURL(),
+	'encode_text' => true,
+));
+
+$description = elgg_get_excerpt($file->description, 350);
+
+echo elgg_view('river/elements/attachment', array(
+	'image' => elgg_view_entity_icon($file, 'small'),
+	'title' => $title,
+	'description' => $description,
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/object/groupforumtopic/river.php b/mod/cool_theme/views/default/object/groupforumtopic/river.php
new file mode 100644
index 000000000..f062793ec
--- /dev/null
+++ b/mod/cool_theme/views/default/object/groupforumtopic/river.php
@@ -0,0 +1,17 @@
+<?php
+
+$groupforumtopic = $vars['entity'];
+
+$title = elgg_view('output/url', array(
+	'text' => $groupforumtopic->title,
+	'href' => $groupforumtopic->getURL(),
+	'encode_text' => true,
+));
+
+$description = elgg_get_excerpt($groupforumtopic->description, 350);
+
+echo elgg_view('river/elements/attachment', array(
+	'image' => elgg_view_entity_icon($groupforumtopic->getOwnerEntity(), 'tiny'),
+	'title' => $title,
+	'description' => $description,
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/object/page/river.php b/mod/cool_theme/views/default/object/page/river.php
new file mode 100644
index 000000000..cfd93d658
--- /dev/null
+++ b/mod/cool_theme/views/default/object/page/river.php
@@ -0,0 +1,15 @@
+<?php
+
+$page = $vars['entity'];
+
+$icon = elgg_view_entity_icon($page, 'tiny');
+
+echo elgg_view('river/elements/attachment', array(
+	'image' => $icon,
+	'title' => elgg_view('output/url', array(
+		'href' => $page->getURL(), 
+		'text' => $page->title,
+		'encode_text' => true,
+	)),
+	'description' => elgg_get_excerpt($page->description, 1000),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/components/gallery.php b/mod/cool_theme/views/default/page/components/gallery.php
new file mode 100644
index 000000000..e8b3f477e
--- /dev/null
+++ b/mod/cool_theme/views/default/page/components/gallery.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Gallery view
+ *
+ * Implemented as an unorder list
+ *
+ * @uses $vars['items']         Array of ElggEntity or ElggAnnotation objects
+ * @uses $vars['offset']        Index of the first list item in complete list
+ * @uses $vars['limit']         Number of items per page
+ * @uses $vars['count']         Number of items in the complete list
+ * @uses $vars['pagination']    Show pagination? (default: true)
+ * @uses $vars['position']      Position of the pagination: before, after, or both
+ * @uses $vars['full_view']     Show the full view of the items (default: false)
+ * @uses $vars['gallery_class'] Additional CSS class for the <ul> element
+ * @uses $vars['item_class']    Additional CSS class for the <li> elements
+ */
+
+$items = $vars['items'];
+if (!is_array($items) || sizeof($items) == 0) {
+	return true;
+}
+
+elgg_push_context('gallery');
+
+$offset = $vars['offset'];
+$limit = $vars['limit'];
+$count = $vars['count'];
+$pagination = elgg_extract('pagination', $vars, true);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
+
+$gallery_class = 'elgg-gallery';
+if (isset($vars['gallery_class'])) {
+	$gallery_class = "$gallery_class {$vars['gallery_class']}";
+}
+
+$item_class = 'elgg-item';
+if (isset($vars['item_class'])) {
+	$item_class = "$item_class {$vars['item_class']}";
+}
+
+$nav = '';
+if ($pagination && $count) {
+	$nav .= elgg_view('navigation/pagination', array(
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+		'offset_key' => $offset_key,
+	));
+}
+
+if ($position == 'before' || $position == 'both') {
+	echo $nav;
+}
+
+?>
+<ul class="<?php echo $gallery_class; ?>">
+	<?php
+		foreach ($items as $item) {
+			if (elgg_instanceof($item)) {
+			$id = "elgg-{$item->getType()}-{$item->getGUID()}";
+			} else {
+				$id = "item-{$item->getType()}-{$item->id}";
+			}
+			echo "<li id=\"$id\" class=\"$item_class\">";
+			echo elgg_view_list_item($item, $vars);
+			echo "</li>";
+		}
+	?>
+</ul>
+
+<?php
+if ($position == 'after' || $position == 'both') {
+	echo $nav;
+}
+
+elgg_pop_context();
diff --git a/mod/cool_theme/views/default/page/components/image_block.php b/mod/cool_theme/views/default/page/components/image_block.php
new file mode 100644
index 000000000..a7f480aef
--- /dev/null
+++ b/mod/cool_theme/views/default/page/components/image_block.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Elgg image block pattern
+ *
+ * Common pattern where there is an image, icon, media object to the left
+ * and a descriptive block of text to the right.
+ * 
+ * ---------------------------------------------------------------
+ * |          |                                      |    alt    |
+ * |  image   |               body                   |   image   |
+ * |  block   |               block                  |   block   |
+ * |          |                                      | (optional)|
+ * ---------------------------------------------------------------
+ *
+ * @uses $vars['body']        HTML content of the body block
+ * @uses $vars['image']       HTML content of the image block
+ * @uses $vars['image_alt']   HTML content of the alternate image block
+ * @uses $vars['class']       Optional additional class for media element
+ * @uses $vars['id']          Optional id for the media element
+ */
+
+$body = elgg_extract('body', $vars, '');
+$image = elgg_extract('image', $vars, '');
+$alt_image = elgg_extract('image_alt', $vars, '');
+
+$class = 'elgg-image-block';
+$additional_class = elgg_extract('class', $vars, '');
+if ($additional_class) {
+	$class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+}
+
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if ($image) {
+	$image = "<div class=\"elgg-image\">$image</div>";
+}
+
+if ($alt_image) {
+	$alt_image = "<div class=\"elgg-image-alt\">$alt_image</div>";
+}
+
+echo <<<HTML
+<div class="$class clearfix" $id>
+	$image$alt_image$body
+</div>
+HTML;
diff --git a/mod/cool_theme/views/default/page/components/list.php b/mod/cool_theme/views/default/page/components/list.php
new file mode 100644
index 000000000..5ddf82b63
--- /dev/null
+++ b/mod/cool_theme/views/default/page/components/list.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * View a list of items
+ *
+ * @package Elgg
+ *
+ * @uses $vars['items']       Array of ElggEntity or ElggAnnotation objects
+ * @uses $vars['offset']      Index of the first list item in complete list
+ * @uses $vars['limit']       Number of items per page. Only used as input to pagination.
+ * @uses $vars['count']       Number of items in the complete list
+ * @uses $vars['base_url']    Base URL of list (optional)
+ * @uses $vars['pagination']  Show pagination? (default: true)
+ * @uses $vars['position']    Position of the pagination: before, after, or both
+ * @uses $vars['full_view']   Show the full view of the items (default: false)
+ * @uses $vars['list_class']  Additional CSS class for the <ul> element
+ * @uses $vars['item_class']  Additional CSS class for the <li> elements
+ */
+
+$items = $vars['items'];
+$offset = elgg_extract('offset', $vars);
+$limit = elgg_extract('limit', $vars);
+$count = elgg_extract('count', $vars);
+$base_url = elgg_extract('base_url', $vars, '');
+$pagination = elgg_extract('pagination', $vars, true);
+$offset_key = elgg_extract('offset_key', $vars, 'offset');
+$position = elgg_extract('position', $vars, 'after');
+
+$list_class = 'elgg-list';
+if (isset($vars['list_class'])) {
+	$list_class = "$list_class {$vars['list_class']}";
+}
+
+$item_class = 'elgg-item';
+if (isset($vars['item_class'])) {
+	$item_class = "$item_class {$vars['item_class']}";
+}
+
+$html = "";
+$nav = "";
+
+if ($pagination && $count) {
+	$nav .= elgg_view('navigation/pagination', array(
+		'base_url' => $base_url,
+		'offset' => $offset,
+		'count' => $count,
+		'limit' => $limit,
+		'offset_key' => $offset_key,
+	));
+}
+
+if (is_array($items) && count($items) > 0) {
+    $html .= "<ul class=\"$list_class\">";
+    foreach ($items as $item) {
+        if($item->action_type != 'comment') {
+            if (elgg_instanceof($item)) {
+                $id = "elgg-{$item->getType()}-{$item->getGUID()}";
+            } else {
+                $id = "item-{$item->getType()}-{$item->id}";
+            }
+            $html .= "<li id=\"$id\" class=\"$item_class\">";
+            $html .= elgg_view_list_item($item, $vars);
+            $html .= '</li>';
+        }
+    }
+    $html .= '</ul>';
+}
+if ($position == 'before' || $position == 'both') {
+	$html = $nav . $html;
+}
+
+if ($position == 'after' || $position == 'both') {
+	$html .= $nav;
+}
+
+echo $html;
diff --git a/mod/cool_theme/views/default/page/components/module.php b/mod/cool_theme/views/default/page/components/module.php
new file mode 100644
index 000000000..7e1eaff20
--- /dev/null
+++ b/mod/cool_theme/views/default/page/components/module.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Elgg module element
+ *
+ * @uses $vars['title']        Optional title text (do not pass header with this option)
+ * @uses $vars['header']       Optional HTML content of the header
+ * @uses $vars['body']         HTML content of the body
+ * @uses $vars['footer']       Optional HTML content of the footer
+ * @uses $vars['class']        Optional additional class for module
+ * @uses $vars['id']           Optional id for module
+ * @uses $vars['show_inner']   Optional flag to leave out inner div (default: false)
+ */
+
+$title = elgg_extract('title', $vars, '');
+$header = elgg_extract('header', $vars, '');
+$body = elgg_extract('body', $vars, '');
+$footer = elgg_extract('footer', $vars, '');
+$show_inner = elgg_extract('show_inner', $vars, false);
+
+$class = 'elgg-module';
+$additional_class = elgg_extract('class', $vars, '');
+if ($additional_class) {
+	$class = "$class $additional_class";
+}
+
+$id = '';
+if (isset($vars['id'])) {
+	$id = "id=\"{$vars['id']}\"";
+}
+
+if (isset($vars['header'])) {
+	$header = "<div class=\"elgg-head\">$header</div>";
+} elseif ($title) {
+	$header = "<div class=\"elgg-head\"><h3>$title</h3></div>";
+}
+
+$body = "<div class=\"elgg-body\">$body</div>";
+
+if ($footer) {
+	$footer = "<div class=\"elgg-foot\">$footer</div>";
+}
+
+$contents = $header . $body . $footer;
+if ($show_inner) {
+	$contents = "<div class=\"elgg-inner\">$contents</div>";
+}
+
+echo "<div class=\"$class\" $id>$contents</div>";
diff --git a/mod/cool_theme/views/default/page/components/summary.php b/mod/cool_theme/views/default/page/components/summary.php
new file mode 100644
index 000000000..ea61a6e4b
--- /dev/null
+++ b/mod/cool_theme/views/default/page/components/summary.php
@@ -0,0 +1,4 @@
+<?php
+
+// Deprecated in favor of type/elements/summary
+echo elgg_view('object/elements/summary', $vars);
diff --git a/mod/cool_theme/views/default/page/default.php b/mod/cool_theme/views/default/page/default.php
new file mode 100644
index 000000000..1cc7a32a1
--- /dev/null
+++ b/mod/cool_theme/views/default/page/default.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Elgg pageshell
+ * The standard HTML page shell that everything else fits into
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// backward compatability support for plugins that are not using the new approach
+// of routing through admin. See reportedcontent plugin for a simple example.
+if (elgg_get_context() == 'admin') {
+	elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
+	elgg_admin_add_plugin_settings_menu();
+	elgg_unregister_css('elgg');
+	echo elgg_view('page/shells/admin', $vars);
+	return true;
+}
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+?>
+<!DOCTYPE html>
+	<html xml:lang="en" lang="en">
+	<head>
+		<?php echo elgg_view('page/elements/head', $vars); ?>
+	</head>
+	<?php flush() ?>
+	<body>
+		<div class="elgg-page elgg-page-default">
+			<div class="elgg-page-messages">
+				<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
+			</div>
+			<?php if (elgg_is_logged_in()): ?>
+			<div class="elgg-page-topbar">
+				<div class="elgg-inner">
+					<?php echo elgg_view('page/elements/topbar', $vars); ?>
+				</div>
+			</div>
+			<?php else: ?>
+			<div class="elgg-page-header">
+				<div class="elgg-inner">
+					<?php echo elgg_view('page/elements/header', $vars); ?>
+				</div>
+			</div>
+			<?php endif; ?>
+			<div class="elgg-page-body">
+				<div class="elgg-inner">
+					<?php echo elgg_view('page/elements/body', $vars); ?>
+				</div>
+			</div>
+			<div class="elgg-page-footer">
+				<div class="elgg-inner">
+					<?php echo elgg_view('page/elements/footer', $vars); ?>
+				</div>
+			</div>
+		</div>
+		<?php
+
+echo elgg_view('footer/analytics');
+$js = elgg_get_loaded_js('footer');
+foreach ($js as $script) { ?>
+<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php
+}
+
+?>
+	</body>
+</html>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/composer.php b/mod/cool_theme/views/default/page/elements/composer.php
new file mode 100644
index 000000000..3c92b4e7b
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/composer.php
@@ -0,0 +1,7 @@
+<div class="elgg-composer"><h4><?php echo elgg_echo('composer:prompt'); ?> :</h4><?php 
+		echo elgg_view_menu('composer', array(
+			'entity' => elgg_get_page_owner_entity(),
+			'class' => 'elgg-menu-hz',
+			'sort_by' => 'priority',
+		));
+	?></div><script>$('.elgg-composer').tabs({spinner: '',panelTemplate: '<div><div class="elgg-ajax-loader"></div></div>'});</script>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/footer.php b/mod/cool_theme/views/default/page/elements/footer.php
new file mode 100644
index 000000000..5469e0f36
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/footer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
+
+$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
+
+echo '<div class="mts clearfloat float-alt">';
+echo elgg_view('output/url', array(
+	'href' => 'http://blog.wisb.me',
+	'text' => elgg_echo('WISB:footer_wisblog'),
+	'class' => '',
+	'is_trusted' => true,
+));
+echo (' · ');
+echo elgg_view('output/url', array(
+	'href' => 'http://developers.wisb.me',
+	'text' => elgg_echo('WISB:footer_developers'),
+	'class' => '',
+	'is_trusted' => true,
+));
+echo (' · ');
+echo elgg_view('output/url', array(
+	'href' => 'http://www.wisb.me',
+	'text' => elgg_echo('WISB:footer_wisb'),
+	'class' => '',
+	'is_trusted' => true,
+));
+echo '</div>';
diff --git a/mod/cool_theme/views/default/page/elements/head.php b/mod/cool_theme/views/default/page/elements/head.php
new file mode 100644
index 000000000..859326bbe
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/head.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * The standard HTML head
+ *
+ * @uses $vars['title'] The page title
+ */
+
+// Set title
+if (empty($vars['title'])) {
+	$title = elgg_get_config('sitename');
+} else {
+	$title = elgg_get_config('sitename') . " · " . $vars['title'];
+}
+
+global $autofeed;
+if (isset($autofeed) && $autofeed == true) {
+	$url = full_url();
+	if (substr_count($url,'?')) {
+		$url .= "&view=rss";
+	} else {
+		$url .= "?view=rss";
+	}
+	$url = elgg_format_url($url);
+	$feedref = <<<END
+
+	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
+
+END;
+} else {
+	$feedref = "";
+}
+
+$js = elgg_get_loaded_js('head');
+$css = elgg_get_loaded_css();
+
+$version = get_version();
+$release = get_version(true);
+?>
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<title><?php echo $title; ?></title>
+<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
+<?php foreach ($css as $link) { ?>
+	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
+<?php } ?>
+<?php
+	$ie_url = elgg_get_simplecache_url('css', 'ie');
+	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
+?>
+<!--[if gt IE 7]>
+	<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
+<![endif]-->
+<!--[if IE 7]>
+	<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
+<![endif]-->
+<?php foreach ($js as $script) { ?>
+	<script type="text/javascript" src="<?php echo $script; ?>"></script>
+<?php } ?>
+<script type="text/javascript">
+<?php echo elgg_view('js/initialize_elgg'); ?>
+</script>
+<?php
+echo $feedref;
+
+$metatags = elgg_view('metatags', $vars);
+if ($metatags) {
+	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
+	echo $metatags;
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/header.php b/mod/cool_theme/views/default/page/elements/header.php
new file mode 100644
index 000000000..45fb91da8
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/header.php
@@ -0,0 +1,12 @@
+<?php
+
+$site = elgg_get_site_entity();
+
+echo "<h1 id=\"facebook-header-logo\">";
+echo elgg_view('output/url', array(
+	'href' => '/',
+	'text' => $site->name,
+));
+echo "</h1>";
+
+echo elgg_view_form('login', array('id' => 'facebook-header-login'));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/owner_block.php b/mod/cool_theme/views/default/page/elements/owner_block.php
new file mode 100644
index 000000000..cee13ebff
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/owner_block.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg owner block
+ * Displays page ownership information
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ */
+
+elgg_push_context('owner_block');
+
+// groups and other users get owner block
+$owner = elgg_get_page_owner_entity();
+if ($owner instanceof ElggGroup || $owner instanceof ElggUser) {
+
+	$header = elgg_view_entity_icon($owner, 'large');
+
+	$body = elgg_view_menu('owner_block', array('entity' => $owner, 'sort_by' => 'priority'));
+
+	$body .= elgg_view('page/elements/owner_block/extend', $vars);
+
+	echo elgg_view('page/components/module', array(
+		'header' => $header,
+		'body' => $body,
+		'class' => 'elgg-owner-block',
+	));
+}
+
+elgg_pop_context();
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/shortcut_icon.php b/mod/cool_theme/views/default/page/elements/shortcut_icon.php
new file mode 100644
index 000000000..74ab4f629
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/shortcut_icon.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Displays the default shortcut icon
+ */
+?>
+<link rel="SHORTCUT ICON" href="<?php echo elgg_get_site_url(); ?>mod/cool_theme/_graphics/favicon.ico" />
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/sidebar.php b/mod/cool_theme/views/default/page/elements/sidebar.php
new file mode 100644
index 000000000..3bd8abb8e
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/sidebar.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Elgg sidebar contents
+ *
+ * @uses $vars['sidebar'] Optional content that is displayed at the bottom of sidebar
+ */
+
+echo elgg_view('page/elements/owner_block', $vars);
+
+echo elgg_view_menu('page', array('sort_by' => 'priority'));
+
+// optional 'sidebar' parameter
+if (isset($vars['sidebar'])) {
+	echo $vars['sidebar'];
+}
+
+// @todo deprecated so remove in Elgg 2.0
+// optional second parameter of elgg_view_layout
+if (isset($vars['area2'])) {
+	echo $vars['area2'];
+}
+
+// @todo deprecated so remove in Elgg 2.0
+// optional third parameter of elgg_view_layout
+if (isset($vars['area3'])) {
+	echo $vars['area3'];
+}
+
+echo elgg_view_menu('extras', array(
+	'sort_by' => 'priority',
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/sidebar_alt.php b/mod/cool_theme/views/default/page/elements/sidebar_alt.php
new file mode 100644
index 000000000..5d1f54947
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/sidebar_alt.php
@@ -0,0 +1,12 @@
+<?php
+
+
+$homepage = "/dashboard";
+$currentpage = $_SERVER['REQUEST_URI'];
+if($homepage==$currentpage) {
+echo "<strong><a href=\"../thanks\">Thanks</a></strong><br />
+edit the sidebar for the dashboard in /mod/cool_theme/views/default/page/elements/sidebar_alt.php<br />
+and enjoy";
+}
+
+?>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/elements/title.php b/mod/cool_theme/views/default/page/elements/title.php
new file mode 100644
index 000000000..77260212e
--- /dev/null
+++ b/mod/cool_theme/views/default/page/elements/title.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Elgg title element
+ *
+ * @uses $vars['title'] The page title
+ * @uses $vars['class'] Optional class for heading
+ */
+
+if (isset($vars['header'])) {
+	echo $vars['header'];
+	return true;
+}
+
+$class = '';
+if (isset($vars['class'])) {
+	$class = " class=\"{$vars['class']}\"";
+}
+
+echo elgg_view_menu('title', array('sort_by' => 'priority'));
+echo "<h1{$class}>{$vars['title']}</h1>";
+echo elgg_view('navigation/breadcrumbs');
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/layouts/content.php b/mod/cool_theme/views/default/page/layouts/content.php
new file mode 100644
index 000000000..ea27ab7f2
--- /dev/null
+++ b/mod/cool_theme/views/default/page/layouts/content.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Main content area layout
+ *
+ * @uses $vars['content']        HTML of main content area
+ * @uses $vars['sidebar']        HTML of the sidebar
+ * @uses $vars['header']         HTML of the content area header (override)
+ * @uses $vars['nav']            HTML of the content area nav (override)
+ * @uses $vars['footer']         HTML of the content area footer
+ * @uses $vars['filter']         HTML of the content area filter (override)
+ * @uses $vars['title']          Title text (override)
+ * @uses $vars['context']        Page context (override)
+ * @uses $vars['buttons']        Content header buttons (override)
+ * @uses $vars['filter_context'] Filter context: everyone, friends, mine
+ * @uses $vars['class']          Additional class to apply to layout
+ */
+
+// navigation defaults to breadcrumbs
+$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
+
+// allow page handlers to override the default filter
+if (isset($vars['filter'])) {
+	$vars['filter_override'] = $vars['filter'];
+}
+$filter = elgg_view('page/layouts/content/filter', $vars);
+
+// the all important content
+$content = elgg_extract('content', $vars, '');
+
+// optional footer for main content area
+$footer_content = elgg_extract('footer', $vars, '');
+$params = $vars;
+$params['content'] = $footer_content;
+$footer = elgg_view('page/layouts/content/footer', $params);
+
+$params = array(
+	'title' => $vars['title'],
+	'content' => $filter . $content . $footer,
+	'sidebar' => elgg_extract('sidebar_alt', $vars, ''),
+	'sidebar_alt' => elgg_extract('sidebar', $vars, ''),
+);
+if (isset($vars['class'])) {
+	$params['class'] = $vars['class'];
+}
+echo elgg_view_layout('two_sidebar', $params);
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/page/layouts/content/sidebar_alt.php b/mod/cool_theme/views/default/page/layouts/content/sidebar_alt.php
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/cool_theme/views/default/page/layouts/content/sidebar_alt.php
diff --git a/mod/cool_theme/views/default/page/layouts/two_sidebar.php b/mod/cool_theme/views/default/page/layouts/two_sidebar.php
new file mode 100644
index 000000000..817b02dc6
--- /dev/null
+++ b/mod/cool_theme/views/default/page/layouts/two_sidebar.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Elgg 2 sidebar layout
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['content'] The content string for the main column
+ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
+ * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
+ * @uses $vars['class']   Additional class to apply to layout
+ */
+
+$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
+if (isset($vars['class'])) {
+	$class = "$class {$vars['class']}";
+}
+?>
+
+<div class="<?php echo $class; ?>">
+	<div class="elgg-sidebar">
+		<?php echo elgg_view('page/elements/sidebar', $vars); ?>
+	</div>
+	<div class="elgg-body">
+		<div class="elgg-head">
+			<?php echo elgg_view('page/elements/title', $vars); ?>
+		</div>
+		<?php 
+			// allow page handlers to override the default header
+		?>
+		<div class="elgg-sidebar-alt">
+			<?php echo elgg_view('page/elements/sidebar_alt', $vars); ?>
+		</div>
+		<div class="elgg-body elgg-main">
+			<?php
+				// @todo deprecated so remove in Elgg 2.0
+				if (isset($vars['area1'])) {
+					echo $vars['area1'];
+				}
+				if (isset($vars['content'])) {
+					echo $vars['content'];
+				}
+			?>
+		</div>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/profile/details.php b/mod/cool_theme/views/default/profile/details.php
new file mode 100644
index 000000000..6ad73688f
--- /dev/null
+++ b/mod/cool_theme/views/default/profile/details.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Elgg user display (details)
+ * @uses $vars['entity'] The user entity
+ */
+
+$user = elgg_get_page_owner_entity();
+
+$profile_fields = elgg_get_config('profile_fields');
+
+echo "<dl class=\"elgg-profile\">";
+if (is_array($profile_fields) && sizeof($profile_fields) > 0) {
+	foreach ($profile_fields as $shortname => $valtype) {
+		if ($shortname == "description") {
+			// skip about me and put at bottom
+			continue;
+		}
+		$value = $user->$shortname;
+		if (!empty($value)) {
+?>
+			<dt><?php echo elgg_echo("profile:{$shortname}"); ?></dt>
+			<dd><?php echo elgg_view("output/{$valtype}", array('value' => $user->$shortname)); ?></dd>
+<?php
+		}
+	}
+}
+
+if (!elgg_get_config('profile_custom_fields')) {
+	if ($user->isBanned()) {
+		echo "</dl><p class='profile-banned-user'>";
+		echo elgg_echo('banned');
+		echo "</p>";
+	} else {
+		if ($user->description) {
+			echo "<dt>" . elgg_echo("profile:aboutme") . "</dt>";
+			echo "<dd>";
+			echo elgg_view('output/longtext', array('value' => $user->description));
+			echo "</dd></dl>";
+		}
+	}
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/elements/attachment.php b/mod/cool_theme/views/default/river/elements/attachment.php
new file mode 100644
index 000000000..d5c0aab99
--- /dev/null
+++ b/mod/cool_theme/views/default/river/elements/attachment.php
@@ -0,0 +1,25 @@
+<?php
+
+$title = '';
+$subtitle = false;
+$image = false;
+$description = false;
+
+extract($vars, EXTR_IF_EXISTS);
+
+$body = "<h4 class=\"elgg-attachment-title\">$title</h4>";
+
+if ($subtitle) {
+	$body .= "<div class=\"elgg-attachment-subtitle\">$subtitle</div>";
+}
+
+if ($description) {
+	$body .= "<div class=\"elgg-attachment-description\">$description</div>";
+}
+
+
+if ($image) {
+	echo elgg_view_image_block($image, $body);
+} else {
+	echo $body;
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/elements/body.php b/mod/cool_theme/views/default/river/elements/body.php
new file mode 100644
index 000000000..56d7a09e9
--- /dev/null
+++ b/mod/cool_theme/views/default/river/elements/body.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * Body of river item
+ *
+ * @uses $vars['item']        ElggRiverItem
+ * @uses $vars['summary']     Alternate summary (the short text summary of action)
+ * @uses $vars['message']     Optional message (usually excerpt of text)
+ * @uses $vars['attachments'] Optional attachments (displaying icons or other non-text data)
+ * @uses $vars['responses']   Alternate respones (comments, replies, etc.)
+ */
+
+$item = $vars['item'];
+
+$menu = elgg_view_menu('river', array(
+	'item' => $item,
+	'sort_by' => 'priority',
+));
+
+// river item header
+if($item->action_type != 'comment') {
+$timestamp = elgg_get_friendly_time($item->getPostedTime());
+
+$summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item'])));
+if ($summary === false) {
+	$subject = $item->getSubjectEntity();
+	$summary = elgg_view('output/url', array(
+		'href' => $subject->getURL(),
+		'text' => $subject->name,
+		'class' => 'elgg-river-subject',
+	));
+}
+
+$message = elgg_extract('message', $vars, false);
+if ($message !== false) {
+	$message = "<div class=\"elgg-river-message\">$message</div>";
+}
+
+$attachments = elgg_extract('attachments', $vars, false);
+if ($attachments !== false) {
+	$attachments = "<div class=\"elgg-river-attachments\">$attachments</div>";
+}
+
+$responses = elgg_view('river/elements/responses', $vars);
+if ($responses) {
+	$responses = "<div class=\"elgg-river-responses\">$responses</div>";
+}
+
+$group_string = '';
+$object = $item->getObjectEntity();
+$container = $object->getContainerEntity();
+if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) {
+	$group_link = elgg_view('output/url', array(
+		'href' => $container->getURL(),
+		'text' => $container->name,
+	));
+	$group_string = elgg_echo('river:ingroup', array($group_link));
+}
+
+echo <<<RIVER
+<div class="elgg-river-summary">$summary $group_string</div>
+$message
+$attachments
+<span class="elgg-river-timestamp">$timestamp</span>
+$menu
+$responses
+RIVER;
+
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/elements/responses.php b/mod/cool_theme/views/default/river/elements/responses.php
new file mode 100644
index 000000000..432296737
--- /dev/null
+++ b/mod/cool_theme/views/default/river/elements/responses.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * River item footer
+ */
+
+$item = $vars['item'];
+$object = $item->getObjectEntity();
+
+// annotations do not have comments
+if (!$object || $item->annotation_id) {
+	return true;
+}
+
+
+$comment_count = $object->countComments();
+
+$comments = elgg_get_annotations(array(
+	'guid' => $object->getGUID(),
+	'annotation_name' => 'generic_comment',
+	'limit' => 3,
+	'order_by' => 'n_table.time_created desc'
+));
+
+if ($comments) {
+	// why is this reversing it? because we're asking for the 3 latest
+	// comments by sorting desc and limiting by 3, but we want to display
+	// these comments with the latest at the bottom.
+	$comments = array_reverse($comments);
+
+	if ($comment_count > count($comments)) {
+		$link = elgg_view('output/url', array(
+			'href' => $object->getURL(),
+			'text' => elgg_echo('river:comments:all', array($comment_count)),
+		));
+		
+		echo elgg_view_image_block(elgg_view_icon('speech-bubble-alt'), $link, array('class' => 'elgg-river-participation'));
+	}
+	
+	echo elgg_view_annotation_list($comments, array('list_class' => 'elgg-river-comments', 'item_class' => 'elgg-river-participation'));
+
+}
+
+if ($object->canAnnotate(0, 'generic_comment')) {
+	// inline comment form
+	echo elgg_view_form('comments/add', array(
+		'id' => "comments-add-{$object->getGUID()}",
+		'class' => 'elgg-river-participation elgg-form-small',
+	), array('entity' => $object, 'inline' => true));
+}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/group/create.php b/mod/cool_theme/views/default/river/group/create.php
new file mode 100644
index 000000000..6beaf2d7d
--- /dev/null
+++ b/mod/cool_theme/views/default/river/group/create.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Group creation river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-actor-name',
+	'encode_text' => true,
+));
+
+$group_link = elgg_view('output/url', array(
+	'href' => $object->getURL(),
+	'text' => $object->name,
+	'encode_text' => true,
+));
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('group/default/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/object/blog/create.php b/mod/cool_theme/views/default/river/object/blog/create.php
new file mode 100644
index 000000000..2d08a7d86
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/blog/create.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Blog river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('object/blog/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/object/bookmarks/create.php b/mod/cool_theme/views/default/river/object/bookmarks/create.php
new file mode 100644
index 000000000..b4170b8ec
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/bookmarks/create.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * New bookmarks river entry
+ *
+ * @package Bookmarks
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('object/bookmarks/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/object/file/create.php b/mod/cool_theme/views/default/river/object/file/create.php
new file mode 100644
index 000000000..99af38ace
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/file/create.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * New file river entry
+ *
+ * @package File
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('object/file/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/object/groupforumtopic/create.php b/mod/cool_theme/views/default/river/object/groupforumtopic/create.php
new file mode 100644
index 000000000..291585698
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/groupforumtopic/create.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Group discussion topic river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('object/groupforumtopic/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/object/messageboard/create.php b/mod/cool_theme/views/default/river/object/messageboard/create.php
new file mode 100644
index 000000000..7d586450d
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/messageboard/create.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Post comment river view
+ */
+$object = $vars['item']->getObjectEntity();
+$comment = $vars['item']->getAnnotation();
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => elgg_get_excerpt($comment->value),
+));
diff --git a/mod/cool_theme/views/default/river/object/page/create.php b/mod/cool_theme/views/default/river/object/page/create.php
new file mode 100644
index 000000000..1f1ab4801
--- /dev/null
+++ b/mod/cool_theme/views/default/river/object/page/create.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Page river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+
+echo elgg_view('river/item', array(
+	'item' => $vars['item'],
+	'attachments' => elgg_view('object/page/river', array('entity' => $object)),
+));
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/river/user/default/profileiconupdate.php b/mod/cool_theme/views/default/river/user/default/profileiconupdate.php
new file mode 100644
index 000000000..255d660ca
--- /dev/null
+++ b/mod/cool_theme/views/default/river/user/default/profileiconupdate.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Update avatar river view
+ */
+
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$string = elgg_echo('river:update:user:avatar', array($subject_link));
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'summary' => $string,
+	'attachments' => elgg_view_entity_icon($subject, 'medium', array(
+		'use_hover' => false,
+		'use_link' => false,
+	)),
+));
diff --git a/mod/cool_theme/views/default/river/user/default/profileupdate.php b/mod/cool_theme/views/default/river/user/default/profileupdate.php
new file mode 100644
index 000000000..ce72970d6
--- /dev/null
+++ b/mod/cool_theme/views/default/river/user/default/profileupdate.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Update profile river view
+ */
+
+$subject = $vars['item']->getSubjectEntity();
+
+$subject_link = elgg_view('output/url', array(
+	'href' => $subject->getURL(),
+	'text' => $subject->name,
+	'class' => 'elgg-river-subject',
+	'is_trusted' => true,
+));
+
+$string = elgg_echo('river:update:user:profile', array($subject_link));
+
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'summary' => $string,
+));
diff --git a/mod/cool_theme/views/default/search/css.php b/mod/cool_theme/views/default/search/css.php
new file mode 100644
index 000000000..3e0c5f379
--- /dev/null
+++ b/mod/cool_theme/views/default/search/css.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Elgg Search css
+ * 
+ */
+?>
+/* <style>
+/**********************************
+Search plugin
+***********************************/
+.elgg-search {width: 330px;background: white url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 335px -934px;border: 1px solid #AAA;border-radius: 1px;height: 20px;padding: 0 23px 0 0;}.elgg-search .search-input {padding: 1px 0 1px 3px;margin: 2px 0 2px 2px;outline: none;font-size: 11px;border: 0;border-right: 1px solid #e9e9e9;}.elgg-search input[type=submit] {display: none;}.elgg-search .search-input:focus {background-position: 2px -700px;}.elgg-page-header .elgg-search {bottom: 5px;position: absolute;right: 0;border-color: black;}.elgg-page-topbar .elgg-search {margin: 4px 0 4px 181px;position: relative;}.search-list li {padding: 5px 0 0;}.search-heading-category {margin-top: 20px;color: #666666;}.search-highlight {background-color: #bbdaf7;}.search-highlight-color1 {background-color: #bbdaf7;}.search-highlight-color2 {background-color: #A0FFFF;}.search-highlight-color3 {background-color: #FDFFC3;}.search-highlight-color4 {background-color: #ccc;}.search-highlight-color5 {background-color: #4690d6;}
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/search/entity.php b/mod/cool_theme/views/default/search/entity.php
new file mode 100644
index 000000000..287ce4512
--- /dev/null
+++ b/mod/cool_theme/views/default/search/entity.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Default view for an entity returned in a search
+ *
+ * Display largely controlled by a set of overrideable volatile data:
+ *   - search_icon (defaults to entity icon)
+ *   - search_matched_title 
+ *   - search_matched_description
+ *   - search_matched_extra
+ *   - search_url (defaults to entity->getURL())
+ *   - search_time (defaults to entity->time_updated or entity->time_created)
+ *
+ * @uses $vars['entity'] Entity returned in a search
+ */
+
+$entity = $vars['entity'];
+
+$icon = $entity->getVolatileData('search_icon');
+if (!$icon) {
+	// display the entity's owner by default if available.
+	// @todo allow an option to switch to displaying the entity's icon instead.
+	$type = $entity->getType();
+	if ($type == 'user' || $type == 'group') {
+		$icon = elgg_view_entity_icon($entity, 'small');
+	} elseif ($owner = $entity->getOwnerEntity()) {
+		$icon = elgg_view_entity_icon($owner, 'small');
+	} else {
+		// display a generic icon if no owner, though there will probably be
+		// other problems if the owner can't be found.
+		$icon = elgg_view_entity($entity, 'small');
+	}
+}
+
+$title = $entity->getVolatileData('search_matched_title');
+$description = $entity->getVolatileData('search_matched_description');
+$extra_info = $entity->getVolatileData('search_matched_extra');
+$url = $entity->getVolatileData('search_url');
+
+if (!$url) {
+	$url = $entity->getURL();
+}
+
+$title = "<a href=\"$url\">$title</a>";
+$time = $entity->getVolatileData('search_time');
+if (!$time) {
+	$tc = $entity->time_created;
+	$tu = $entity->time_updated;
+	$time = elgg_view_friendly_time(($tu > $tc) ? $tu : $tc);
+}
+
+$body = "<p class=\"mbn\">$title</p>$description";
+if ($extra_info) {
+	$body .= "<p class=\"elgg-subtext\">$extra_info</p>";
+}
+$body .= "<p class=\"elgg-subtext\">$time</p>";
+
+echo elgg_view_image_block($icon, $body);
diff --git a/mod/cool_theme/views/default/search/search_box.php b/mod/cool_theme/views/default/search/search_box.php
new file mode 100644
index 000000000..36cceef4a
--- /dev/null
+++ b/mod/cool_theme/views/default/search/search_box.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Search box
+ *
+ * @uses $vars['value'] Current search query
+ *
+ * @todo Move javascript into something that extends elgg.js
+ */
+
+$value = '';
+if (array_key_exists('value', $vars)) {
+	$value = $vars['value'];
+} elseif ($value = get_input('q', get_input('tag', NULL))) {
+	$value = $value;
+}
+
+// @todo - why the strip slashes?
+$value = stripslashes($value);
+
+// @todo - create function for sanitization of strings for display in 1.8
+// encode <,>,&, quotes and characters above 127
+$display_query = mb_convert_encoding($value, 'HTML-ENTITIES', 'UTF-8');
+$display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
+
+
+?>
+<form class="elgg-search" action="<?php echo elgg_get_site_url(); ?>search" method="get"><fieldset><input type="text" size="21" name="q" placeholder="<?php echo elgg_echo('search'); ?>" class="search-input" value="<?php echo $value; ?>"/><input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" /></fieldset></form>
+\ No newline at end of file
diff --git a/mod/cool_theme/views/default/thewire/composer.php b/mod/cool_theme/views/default/thewire/composer.php
new file mode 100644
index 000000000..a6cdcdd2a
--- /dev/null
+++ b/mod/cool_theme/views/default/thewire/composer.php
@@ -0,0 +1,2 @@
+<?php
+echo elgg_view_form('thewire/add');
+\ No newline at end of file
diff --git a/mod/curatedgroups/languages/ca.php b/mod/curatedgroups/languages/ca.php
new file mode 100644
index 000000000..c7513aad1
--- /dev/null
+++ b/mod/curatedgroups/languages/ca.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Curated Groups -- Translation strings for Catalan
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This file is part of the CuratedGroups plugin for Elgg.
+ *
+ * CuratedGroups is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * CuratedGroups is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$catalan = array(
+	"curatedgroups:message" => "Tan sols es poden crear grups oficials. Si estàs intentant crear un grup oficial contacta amb els administradors.",
+	"curatedgroups:settings:message" => "Escriu un missatge personalitzat per mostrar quan s'estigui intentant crear un grup. Si no s'especifica, s'utilizarà un missatge per defecte internacionalitzable",
+	"curatedgroups:settings:creators" => "Escriu una llista de noms d'usuari separats per comes que podràn crear grups"
+);
+
+add_translation("ca", $catalan);
diff --git a/mod/curatedgroups/languages/en.php b/mod/curatedgroups/languages/en.php
new file mode 100755
index 000000000..88990a42d
--- /dev/null
+++ b/mod/curatedgroups/languages/en.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Curated Groups -- Translation strings for English
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This file is part of the CuratedGroups plugin for Elgg.
+ *
+ * CuratedGroups is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * CuratedGroups is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$english = array(
+	"curatedgroups:message" => "Only official groups are allowed. If you're trying to create an official group please contact the admins.",
+	"curatedgroups:settings:message" => "Write a personalized message to show when trying to create a group. If not defined a default internationalizable one will be shown",
+	"curatedgroups:settings:creators" => "Write a comma separated list of usernames that will be allowed to create groups"
+);
+
+add_translation("en",$english);
diff --git a/mod/curatedgroups/languages/es.php b/mod/curatedgroups/languages/es.php
new file mode 100755
index 000000000..7c44cf812
--- /dev/null
+++ b/mod/curatedgroups/languages/es.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * Curated Groups -- Translation strings for Spanish
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This file is part of the CuratedGroups plugin for Elgg.
+ *
+ * CuratedGroups is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * CuratedGroups is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+$spanish = array(
+	"curatedgroups:message" => "Solo se pueden crear grupos oficiales. Si est&aacute; tratando de crear un grupo oficial contacta con las administradoras.",
+	"curatedgroups:settings:message" => "Escribe un mensaje personalizado que mostrar cuando se esté intentando crear un grupo. Si no se especifica se utilizará un mensaje por defecto internacionalizable",
+	"curatedgroups:settings:creators" => "Escribe una lista de nombres de usuario separados por comas que podrán crear grupos"
+);
+
+add_translation("es", $spanish);
diff --git a/mod/curatedgroups/manifest.xml b/mod/curatedgroups/manifest.xml
new file mode 100755
index 000000000..8bef940e9
--- /dev/null
+++ b/mod/curatedgroups/manifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Curated Groups</name>
+	<author>Lorea developers</author>
+	<version>1.1</version>
+	<category>lorea</category>
+	<category>groups</category>
+	<description>Limit group creation to administrators.</description>
+	<website>https://lorea.org/plugin/curatedgroups</website>
+	<repository>https://gitorious.org/lorea/curatedgroups</repository>
+	<donations>https://lorea.org/support</donations>
+	<license>GNU Affero GeneralPublic License version 3 or later</license>
+	<requires>
+		<type>elgg_version</type>
+		<version>2011061200</version>
+	</requires>
+	<admin_interface>advanced</admin_interface>
+</plugin_manifest>
diff --git a/mod/curatedgroups/start.php b/mod/curatedgroups/start.php
new file mode 100644
index 000000000..e4bca1ff7
--- /dev/null
+++ b/mod/curatedgroups/start.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Curated Groups -- Limit group creation to administrators
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ * @homepage       http://lorea.org/plugin/curatedgroups
+ * @copyright      2011-2012 Lorea Faeries <federation@lorea.org>
+ * @license        COPYING, http://www.gnu.org/licenses/agpl
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Elgg Curated Groups plugin
+ *
+ * @package ElggCuratedGroups
+ */
+elgg_register_event_handler('init','system','curatedgroups_init');
+
+function curatedgroups_init(){
+}
+
+?>
diff --git a/mod/curatedgroups/views/default/forms/groups/edit.php b/mod/curatedgroups/views/default/forms/groups/edit.php
new file mode 100644
index 000000000..72b017832
--- /dev/null
+++ b/mod/curatedgroups/views/default/forms/groups/edit.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Curated Groups -- Form
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This file is part of the CuratedGroups plugin for Elgg.
+ *
+ * CuratedGroups is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * CuratedGroups is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+	$creator=false;
+	// check if user is admin
+	if (isadminloggedin()) $creator=true;
+
+	// check if user is one of the specified group creators
+	if (!$creator) {
+		$creators_text = str_replace(' ', '', elgg_get_plugin_setting("creators", "curatedgroups"));
+		$creators = explode(",", $creators_text);
+		if (!empty($creators)) {
+			if (in_array(elgg_get_logged_in_user_entity()->username, $creators)) {
+				$creator = true;
+			// Compatibility with CuratedGroups 1.0
+			} elseif (in_array(elgg_get_logged_in_user_guid(), $creators)) {
+				$creator = true;
+			}
+		}
+	}
+
+	// check if user is admin of the current group (for editing an
+	// existing group)
+	if (!$creator && isset($vars['entity'])) {
+                if ($vars['entity']->canEdit())
+			$creator = true;
+        }
+
+	// check if user is admin of the parent group if defined (for
+	// subgroups)
+	if (!$creator) {
+		$parent_guid = (int)get_input("parent", 0);
+		if (!empty($parent_guid)) {
+			$parent = get_entity($parent_guid);
+			if ($parent->canEdit())
+				$creator = true;
+		}
+	}
+
+	// show group creation form if we're a creator, otherwise show the not
+	// allowed message
+	if ($creator) {
+		if (elgg_is_active_plugin("subgroups"))
+			include elgg_get_plugins_path() . "subgroups/views/default/forms/groups/edit.php";
+		else
+			include elgg_get_plugins_path() . "groups/views/default/forms/groups/edit.php";
+	}
+	else {
+		$message = elgg_get_plugin_setting("message", "curatedgroups");
+		if (empty($message))
+			$message = elgg_echo("curatedgroups:message");
+		echo $message;
+	}
+?>
diff --git a/mod/curatedgroups/views/default/settings/curatedgroups/edit.php b/mod/curatedgroups/views/default/settings/curatedgroups/edit.php
new file mode 100644
index 000000000..9c383b258
--- /dev/null
+++ b/mod/curatedgroups/views/default/settings/curatedgroups/edit.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Curated Groups -- Plugin settings
+ *
+ * @package        Lorea
+ * @subpackage     CuratedGroups
+ *
+ * Copyright 2011-2012 Lorea Faeries <federation@lorea.org>
+ *
+ * This file is part of the CuratedGroups plugin for Elgg.
+ *
+ * CuratedGroups is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * CuratedGroups is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+?>
+<p>
+	<?php echo elgg_echo('curatedgroups:settings:message'); ?>:
+	<?php
+		echo elgg_view('input/text', array('name' => 'params[message]', 'value' => $vars['entity']->message));
+	?>
+</p>
+
+<p>
+	<?php echo elgg_echo('curatedgroups:settings:creators'); ?>:
+	<?php
+		echo elgg_view('input/text', array('name' => 'params[creators]', 'value' => $vars['entity']->creators));
+	?>
+</p>
diff --git a/mod/custom_index/index.php b/mod/custom_index/index.php
new file mode 100644
index 000000000..43cab9723
--- /dev/null
+++ b/mod/custom_index/index.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Elgg custom index page
+ * 
+ */
+
+elgg_push_context('front');
+
+elgg_push_context('widgets');
+
+$list_params = array(
+	'type' => 'object',
+	'limit' => 4,
+	'full_view' => false,
+	'view_type_toggle' => false,
+	'pagination' => false,
+);
+
+//grab the latest 4 blog posts
+$list_params['subtype'] = 'blog';
+$blogs = elgg_list_entities($list_params);
+
+//grab the latest bookmarks
+$list_params['subtype'] = 'bookmarks';
+$bookmarks = elgg_list_entities($list_params);
+
+//grab the latest thewire
+$list_params['subtype'] = 'thewire';
+$thewire = elgg_list_entities($list_params);
+
+//grab the latest files
+$list_params['subtype'] = 'file';
+$files = elgg_list_entities($list_params);
+
+//get the newest members who have an avatar
+$newest_members = elgg_list_entities_from_metadata(array(
+	'metadata_names' => 'icontime',
+	'type' => 'user',
+	'limit' => 10,
+	'full_view' => false,
+	'pagination' => false,
+	'list_type' => 'gallery',
+	'gallery_class' => 'elgg-gallery-users',
+	'size' => 'small',
+));
+
+//newest groups
+$list_params['type'] = 'group';
+unset($list_params['subtype']);
+$groups = elgg_list_entities($list_params);
+
+//grab the login form
+$login = elgg_view("core/account/login_box");
+
+elgg_pop_context();
+
+// lay out the content
+$params = array(
+	'blogs' => $blogs,
+	'bookmarks' => $bookmarks,
+	'files' => $files,
+	'groups' => $groups,
+	'login' => $login,
+	'members' => $newest_members,
+	'thewire' => $thewire,
+);
+$body = elgg_view_layout('custom_index', $params);
+
+// no RSS feed with a "widget" front page
+global $autofeed;
+$autofeed = FALSE;
+
+echo elgg_view_page('', $body);
diff --git a/mod/custom_index/languages/en.php b/mod/custom_index/languages/en.php
new file mode 100644
index 000000000..071ff81e5
--- /dev/null
+++ b/mod/custom_index/languages/en.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Custom Index English language file
+ */
+
+$english = array(	
+	'custom:bookmarks' => "Latest bookmarks",
+	'custom:groups' => "Latest groups",
+	'custom:files' => "Latest files",
+	'custom:blogs' => "Latest blog posts",
+	'custom:members' => "Newest members",
+);
+					
+add_translation("en", $english);
diff --git a/mod/custom_index/manifest.xml b/mod/custom_index/manifest.xml
new file mode 100644
index 000000000..80187efbc
--- /dev/null
+++ b/mod/custom_index/manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Custom Index</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<description>A demonstration of how to create a front page plugin.</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/custom_index/start.php b/mod/custom_index/start.php
new file mode 100644
index 000000000..48d03f27b
--- /dev/null
+++ b/mod/custom_index/start.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Elgg demo custom index page plugin
+ * 
+ */
+
+elgg_register_event_handler('init', 'system', 'custom_index_init');
+
+function custom_index_init() {
+
+	// Extend system CSS with our own styles
+	elgg_extend_view('css/elgg', 'custom_index/css');
+
+	// Replace the default index page
+	elgg_register_plugin_hook_handler('index', 'system', 'custom_index');
+}
+
+function custom_index($hook, $type, $return, $params) {
+	if ($return == true) {
+		// another hook has already replaced the front page
+		return $return;
+	}
+
+	if (!include_once(dirname(__FILE__) . "/index.php")) {
+		return false;
+	}
+
+	// return true to signify that we have handled the front page
+	return true;
+}
diff --git a/mod/custom_index/views/default/custom_index/css.php b/mod/custom_index/views/default/custom_index/css.php
new file mode 100644
index 000000000..4c780a905
--- /dev/null
+++ b/mod/custom_index/views/default/custom_index/css.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Custom Index CSS
+ *
+ */
+?>
+
+/*******************************
+	Custom Index
+********************************/
+.custom-index {
+	padding: 10px 0;
+}
+.elgg-module-highlight {
+	-webkit-box-shadow: 1px 1px 5px #CCC;
+	-moz-box-shadow: 1px 1px 5px #CCC;
+	box-shadow: 1px 1px 5px #CCC;
+}
+.elgg-module-highlight:hover {
+	-webkit-box-shadow: 1px 1px 6px #AAA;
+	-moz-box-shadow: 1px 1px 6px #AAA;
+	box-shadow: 1px 1px 6px #AAA;
+}
diff --git a/mod/custom_index/views/default/page/layouts/custom_index.php b/mod/custom_index/views/default/page/layouts/custom_index.php
new file mode 100644
index 000000000..4f79754b9
--- /dev/null
+++ b/mod/custom_index/views/default/page/layouts/custom_index.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Elgg custom index layout
+ * 
+ * You can edit the layout of this page with your own layout and style. 
+ * Whatever you put in this view will appear on the front page of your site.
+ * 
+ */
+
+$mod_params = array('class' => 'elgg-module-highlight');
+
+?>
+
+<div class="custom-index elgg-main elgg-grid clearfix">
+	<div class="elgg-col elgg-col-1of2">
+		<div class="elgg-inner pvm prl">
+<?php
+// left column
+
+// Top box for login or welcome message
+if (elgg_is_logged_in()) {
+	$top_box = "<h2>" . elgg_echo("welcome") . " ";
+	$top_box .= elgg_get_logged_in_user_entity()->name;
+	$top_box .= "</h2>";
+} else {
+	$top_box = $vars['login'];
+}
+echo elgg_view_module('featured',  '', $top_box, $mod_params);
+
+// a view for plugins to extend
+echo elgg_view("index/lefthandside");
+
+// the wire
+if (elgg_is_active_plugin('thewire')) {
+  echo elgg_view_module('thewire', elgg_echo("thewire"), $vars['thewire'], $mod_params);
+}
+
+// files
+if (elgg_is_active_plugin('file')) {
+	echo elgg_view_module('featured',  elgg_echo("custom:files"), $vars['files'], $mod_params);
+}
+
+// groups
+if (elgg_is_active_plugin('groups')) {
+	echo elgg_view_module('featured',  elgg_echo("custom:groups"), $vars['groups'], $mod_params);
+}
+?>
+		</div>
+	</div>
+	<div class="elgg-col elgg-col-1of2">
+		<div class="elgg-inner pvm">
+<?php
+// right column
+
+// a view for plugins to extend
+echo elgg_view("index/righthandside");
+
+// members
+//echo elgg_view_module('featured',  elgg_echo("custom:members"), $vars['members'], $mod_params);
+
+// groups
+if (elgg_is_active_plugin('blog')) {
+	echo elgg_view_module('featured',  elgg_echo("custom:blogs"), $vars['blogs'], $mod_params);
+}
+
+// files
+if (elgg_is_active_plugin('bookmarks')) {
+	echo elgg_view_module('featured',  elgg_echo("custom:bookmarks"), $vars['bookmarks'], $mod_params);
+}
+?>
+		</div>
+	</div>
+</div>
diff --git a/mod/custom_index_widgets/index.php b/mod/custom_index_widgets/index.php
new file mode 100644
index 000000000..dac0db036
--- /dev/null
+++ b/mod/custom_index_widgets/index.php
@@ -0,0 +1,66 @@
+<?php
+
+	elgg_set_context('custom_index_widgets');
+	elgg_set_page_owner_guid(elgg_get_config('site_guid'));
+	
+	$widgettypes = elgg_get_widget_types(); 
+
+	$page_owner = elgg_get_page_owner_guid();
+	$ciw_layout = elgg_get_plugin_setting("ciw_layout", "custom_index_widgets");
+	$ciw_showdashboard = elgg_get_plugin_setting("ciw_showdashboard", "custom_index_widgets");
+
+	$customwidgets = elgg_get_widgets($page_owner, elgg_get_context()); 
+	$area1widgets = isset($customwidgets[1]) ? $customwidgets[1] : FALSE;
+	$area2widgets = isset($customwidgets[2]) ? $customwidgets[2] : FALSE;
+	$area3widgets = isset($customwidgets[3]) ? $customwidgets[3] : FALSE;
+	/*
+	$area1widgets = elgg_get_widgets($page_owner,elgg_get_context(),1);
+	$area2widgets = elgg_get_widgets($page_owner,elgg_get_context(),2);
+	$area3widgets = elgg_get_widgets($page_owner,elgg_get_context(),3);
+	*/
+	
+	if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
+		
+		if (isset($vars['area3'])) $vars['area1'] = $vars['area3'];
+		if (isset($vars['area4'])) $vars['area2'] = $vars['area4'];
+	}
+	
+	$leftcolumn_widgets_view = custom_index_build_columns($area1widgets,$widgettypes);
+	$middlecolumn_widgets_view = custom_index_build_columns($area2widgets,$widgettypes);
+	$rightcolumn_widgets_view = custom_index_build_columns($area3widgets,$widgettypes);
+	
+		
+  	$content =  elgg_view_layout($ciw_layout, array('area1' => $leftcolumn_widgets_view,'area2' => $middlecolumn_widgets_view,'area3' => $rightcolumn_widgets_view, 'layoutmode' => 'index_mode') );
+	
+  	if (elgg_is_logged_in() && $ciw_showdashboard=="yes"){
+    
+		$user_guid = elgg_get_logged_in_user_guid();
+		elgg_set_page_owner_guid($user_guid);
+    	elgg_set_context('dashboard');
+		
+		
+		$dashboardwidgets = elgg_get_widgets($user_guid, elgg_get_context()); 
+		$area1widgets = isset($dashboardwidgets[1]) ? $dashboardwidgets[1] : FALSE;
+		$area2widgets = isset($dashboardwidgets[2]) ? $dashboardwidgets[2] : FALSE;
+		$area3widgets = isset($dashboardwidgets[3]) ? $dashboardwidgets[3] : FALSE;
+		/*
+    	$area1widgets = elgg_get_widgets($user_guid,elgg_get_context(),1);
+		$area2widgets = elgg_get_widgets($user_guid,elgg_get_context(),2);
+		$area3widgets = elgg_get_widgets($user_guid,elgg_get_context(),3);
+		*/
+		if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
+			
+			if (isset($vars['area3'])) $vars['area1'] = $vars['area3'];
+			if (isset($vars['area4'])) $vars['area2'] = $vars['area4'];
+			
+		}
+		
+		$leftcolumn_widgets_view = custom_index_build_columns($area1widgets,$widgettypes);
+		$middlecolumn_widgets_view = custom_index_build_columns($area2widgets,$widgettypes);
+		$rightcolumn_widgets_view = custom_index_build_columns($area3widgets,$widgettypes);
+		
+		$content  .= elgg_view_layout($ciw_layout, array('area1' => $leftcolumn_widgets_view,'area2' => $middlecolumn_widgets_view,'area3' => $rightcolumn_widgets_view, 'layoutmode' => 'index_mode') );
+    }
+	
+	echo elgg_view_page('Index', $content);
+?>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/languages/de.php b/mod/custom_index_widgets/languages/de.php
new file mode 100644
index 000000000..808b2fade
--- /dev/null
+++ b/mod/custom_index_widgets/languages/de.php
@@ -0,0 +1,78 @@
+	<?php
+
+    $german = array(
+
+       
+        'custom_index_widgets:latest_bookmarks_index' => "Neueste Lesezeichen",
+        'custom_index_widgets:latest_groups_index' => "Neueste Gruppen",
+        'custom_index_widgets:latest_files_index' => "Neueste Dateien",
+        'custom_index_widgets:latest_blogs_index' => "Neueste Blogeintr&auml;ge",
+        'custom_index_widgets:latest_members_index' => "Neueste Mitglieder",
+        'custom_index_widgets:nofiles' => "Keine Dateien gefunden",
+        'custom_index_widgets:nogroups' => "Keine Gruppen gefunden",   
+        'custom_index_widgets:latest_news_index' => "Neueste Nachrichten",
+        'custom_index_widgets:latest_pages_index' => "Neueste Seiten",
+        'custom_index_widgets:latest_events_index' => 'Eingehende Events',
+        'custom_index_widgets:latest_wire_index' => 'Neuester Wire-Beitrag',
+        'custom_index_widgets:inline_content_index' => 'Eigenes HTML',
+        'custom_index_widgets:html_content' => 'Ihr Text',
+        'custom_index_widgets:latest_generic_index'=>"Generischer Inhalt",
+        'custom_index_widgets:latest_tasks_index'=>"Neueste Aufgaben",
+        'custom_index_widgets:latest_activity_index' => 'Aktivit&auml;ten',
+        'custom_index_widgets:cloud_generic_index'=>"Tag Cloud",
+        'custom_index_widgets:widget_subtype'=>"Widget-Subtyp",
+        'custom_index_widgets:metadata_name' => "Metadaten",
+        'custom_index_widgets:threshold'=> "Thresold",
+        'custom_index_widgets:latest_izap_videos_index' => 'Neueste Videos',
+		'custom_index_widgets:display_avatar' => 'Avatar',
+       
+        'custom_index_widgets:rich_media_index' => "Multimedia Inhalte",
+        'custom_index_widgets:widget_video_width' => "Breite (Nur Zahl, ohne px oder %)",
+        'custom_index_widgets:widget_video_height' => "H&ouml;he (Nur Zahl, ohne px oder %)",
+        'custom_index_widgets:widget_video_url' => "URL",
+        'custom_index_widgets:widget_video_caption' => "&Uuml;berschrift",
+       
+        'custom_index_widgets:layout' => "Layout",
+       
+        'custom_index_widgets:index_2rmsb' => '2 Spalten, [Mittelbreit, Schmal] - [Big]',
+        'custom_index_widgets:index_2rsmb' => '2 Spalten, [Schmal, Mittelbreit] - [Big]',
+        'custom_index_widgets:index_2rhhb' => '2 Spalten, [Halbe Breite, Halbe Breite] - [Big]',
+        'custom_index_widgets:index_1rsss' => '1 Spalte, [Schmal, Schmal, Schmal]',
+        'custom_index_widgets:index_2rbhh' => '2 Spalten, [Big] -[Halbe Breite, Halbe Breite]',
+        'custom_index_widgets:index_2rbsm' => '2 Spalten, [Big] -[Schmal, Mittelbreit]',
+        'custom_index_widgets:index_2rbms' => '2 Spalten, [Big] -[Mittelbreit, Schmal]',
+       
+        'custom_index_widgets:area1' => 'Widgets Zone 1',
+        'custom_index_widgets:area2' => 'Widgets Zone 2',
+        'custom_index_widgets:area3' => 'Widgets Zone 3',
+       
+        'custom_index_widgets:admin:notfound' => 'Seite nicht gefunden',
+        'custom_index_widgets:index' => "Widgets aktiv auf Index",
+        'custom_index_widgets:num_items' => "Einzahl Module",
+        'custom_index_widgets:reset' => "Zonen auf Standard setzen",
+       
+        'custom_index_widgets:pleaselogin' => "Anmelden f&uuml;r alle Details ...",
+       
+        'custom_index_widgets:widget_title' => "Widget-Titel &uuml;berschreiben (auf index-Seite anstelle des Standardtitels des Widgets)",
+        'custom_index_widgets:context_mode' => "Layout-Stil",
+        'custom_index_widgets:context_list' => "Liste",
+        'custom_index_widgets:context_detail' => "Details",
+       
+        'custom_index_widgets:login_style'=>"Login-Position",
+        'custom_index_widgets:inlayout'=>"Im Layout",
+        'custom_index_widgets:topbar'=>"Top-Leiste",
+        'custom_index_widgets:widget_all_groups' => "Alle Gruppen",
+        
+		"custom_index_widgets:showdashboard"=>"End index with dashboard",
+        "custom_index_widgets:showdashboard_yes"=>"Ya",
+		"custom_index_widgets:showdashboard_no"=>"Nein",
+		
+		"custom_index_widgets:guest_only" => "Guest only",
+		"custom_index_widgets:box_style" => "Box Style",
+		"custom_index_widgets:social_share_index" => "Social Share",
+		"custom_index_widgets:login_index"=>"Login",
+		"admin:appearance:custom_index_widgets" => "Index Widgets"
+   
+    );
+                   
+    add_translation("de",$german);
diff --git a/mod/custom_index_widgets/languages/en.php b/mod/custom_index_widgets/languages/en.php
new file mode 100644
index 000000000..ba9cb4859
--- /dev/null
+++ b/mod/custom_index_widgets/languages/en.php
@@ -0,0 +1,82 @@
+<?php
+
+	$english = array(
+
+		
+		'custom_index_widgets:latest_bookmarks_index' => "Latest bookmarks",
+		'custom_index_widgets:latest_groups_index' => "Latest groups",
+		'custom_index_widgets:latest_files_index' => "Latest files",
+		'custom_index_widgets:latest_blogs_index' => "Latest blog posts",
+		'custom_index_widgets:latest_members_index' => "Newest members",
+		'custom_index_widgets:nofiles' => "There are no files yet",
+		'custom_index_widgets:nogroups' => "There are no groups yet",	
+		'custom_index_widgets:latest_news_index' => "Latest news",
+		'custom_index_widgets:latest_pages_index' => "Latest pages",
+		'custom_index_widgets:latest_events_index' => 'Incomming events',
+		'custom_index_widgets:latest_wire_index' => 'Last wire posts',
+		'custom_index_widgets:inline_content_index' => 'Free html',
+		'custom_index_widgets:html_content' => 'Your text',
+		'custom_index_widgets:latest_generic_index'=>"Generic content",
+		'custom_index_widgets:latest_tasks_index'=>"Latest tasks",
+		'custom_index_widgets:latest_activity_index' => 'In the river',
+		'custom_index_widgets:cloud_generic_index'=>"Tag Cloud",
+		'custom_index_widgets:widget_subtype'=>"Entity subtype",
+		'custom_index_widgets:metadata_name' => "Metadata",
+		'custom_index_widgets:threshold'=> "Thresold",
+		'custom_index_widgets:latest_izap_videos_index' => 'Latest videos',
+		'custom_index_widgets:display_avatar' => 'Avatar',
+		
+		'custom_index_widgets:rich_media_index' => "Multimédia content",
+		'custom_index_widgets:widget_video_width' => "Width (number without px or %)",
+	    'custom_index_widgets:widget_video_height' => "Heigh (number without px or %)",
+	    'custom_index_widgets:widget_video_url' => "Url",
+	    'custom_index_widgets:widget_video_caption' => "Caption",
+		
+		'custom_index_widgets:layout' => "Layout",
+		
+		'custom_index_widgets:index_2rmsb' => '2 rows, [Medium, Small] - [Big]',
+		'custom_index_widgets:index_2rsmb' => '2 rows, [Small, Medium] - [Big]',
+		'custom_index_widgets:index_2rhhb' => '2 rows, [Half, Half] - [Big]',
+		'custom_index_widgets:index_1rsss' => '1 row, [Small, Small, Small]',
+		'custom_index_widgets:index_2rbhh' => '2 rows, [Big] -[Half, Half]',
+		'custom_index_widgets:index_2rbsm' => '2 rows, [Big] -[Small, Medium]',
+		'custom_index_widgets:index_2rbms' => '2 rows, [Big] -[Medium, Small]',
+		
+		'custom_index_widgets:area1' => 'Widgets Zone 1',
+		'custom_index_widgets:area2' => 'Widgets Zone 2',
+		'custom_index_widgets:area3' => 'Widgets Zone 3',
+		
+		'custom_index_widgets:admin:notfound' => 'Page not found',
+		'custom_index_widgets:index' => "Index widgetisation",
+		'custom_index_widgets:num_items' => "Number of items",
+		
+		'custom_index_widgets:pleaselogin' => "Please, please, login to see more...",
+		
+		'custom_index_widgets:widget_title' => "Override widget title (will be shown only on the index in replacement of widget default title)",
+		'custom_index_widgets:context_mode' => "Layout style",
+		'custom_index_widgets:context_list' => "List",
+		'custom_index_widgets:context_detail' => "Detail",
+		
+		'custom_index_widgets:login_style'=>"Login position",
+		'custom_index_widgets:inlayout'=>"In layout",
+		'custom_index_widgets:topbar'=>"Top bar",
+		'custom_index_widgets:widget_all_groups' => "All groups",
+		
+		"custom_index_widgets:showdashboard"=>"End index with dashboard",
+		"custom_index_widgets:showdashboard_yes"=>"Yes",
+		"custom_index_widgets:showdashboard_no"=>"No",
+		"custom_index_widgets:guest_only" => "Guest only",
+		"custom_index_widgets:box_style" => "Box Style",
+		"custom_index_widgets:social_share_index" => "Social Share",
+		"custom_index_widgets:login_index"=>"Login",
+		"admin:appearance:custom_index_widgets" => "Index Widgets",
+		// time limit
+		"custom_index_widgets:widget_created_time_limit" => "Time lapse",
+		"custom_index_widgets:time_limit:all" => "All time",
+		"custom_index_widgets:time_limit:day" => "Last day",
+		"custom_index_widgets:time_limit:week" => "Last week",
+		"custom_index_widgets:time_limit:month" => "Last month"
+	
+	);
+					
+	add_translation("en",$english);
diff --git a/mod/custom_index_widgets/languages/es.php b/mod/custom_index_widgets/languages/es.php
new file mode 100644
index 000000000..c8dc35633
--- /dev/null
+++ b/mod/custom_index_widgets/languages/es.php
@@ -0,0 +1,78 @@
+<?php
+
+    $spanish = array(
+
+       
+        'custom_index_widgets:latest_bookmarks_index' => "Ultimos favoritos",
+        'custom_index_widgets:latest_groups_index' => "Ultimos Grupos",
+        'custom_index_widgets:latest_files_index' => "Ultimos Archivos",
+        'custom_index_widgets:latest_blogs_index' => "Ultimos Articulos de Blogs",
+        'custom_index_widgets:latest_members_index' => "Nuevos habitantes",
+        'custom_index_widgets:nofiles' => "No hay archivos todavia",
+        'custom_index_widgets:nogroups' => "No hay frupos todavia",   
+        'custom_index_widgets:latest_news_index' => "Ultimas noticias",
+        'custom_index_widgets:latest_pages_index' => "Ultimas paginas",
+        'custom_index_widgets:latest_events_index' => 'Eventos anunciados',
+        'custom_index_widgets:latest_wire_index' => 'Ultimos post',
+        'custom_index_widgets:inline_content_index' => 'Html libre',
+        'custom_index_widgets:html_content' => 'Tu texto',
+        'custom_index_widgets:latest_generic_index'=>"Contenido generico",
+        'custom_index_widgets:latest_tasks_index'=>"Ultimas tareas",
+        'custom_index_widgets:latest_activity_index' => 'In the river',
+        'custom_index_widgets:cloud_generic_index'=>"Nube de tags",
+        'custom_index_widgets:widget_subtype'=>"Subtipo de la entidad",
+        'custom_index_widgets:metadata_name' => "Metadata",
+        'custom_index_widgets:threshold'=> "Thresold",
+        'custom_index_widgets:latest_izap_videos_index' => 'Ultimos videos',
+		'custom_index_widgets:display_avatar' => 'Avatar',
+       
+        'custom_index_widgets:rich_media_index' => "Contenido multimedia",
+        'custom_index_widgets:widget_video_width' => "Ancho (numeros sin px o %)",
+        'custom_index_widgets:widget_video_height' => "Alto (numeros sin px o %)",
+        'custom_index_widgets:widget_video_url' => "Url",
+        'custom_index_widgets:widget_video_caption' => "Caption",
+       
+        'custom_index_widgets:layout' => "Layout",
+       
+        'custom_index_widgets:index_2rmsb' => '2 rows, [Medio, Peque] - [Grande]',
+        'custom_index_widgets:index_2rsmb' => '2 rows, [Peque, Medio] - [Grande]',
+        'custom_index_widgets:index_2rhhb' => '2 rows, [Mitad, Mitad] - [Grande]',
+        'custom_index_widgets:index_1rsss' => '1 row, [Peque, Peque, Peque]',
+        'custom_index_widgets:index_2rbhh' => '2 rows, [Grande] -[Mitad, Mitad]',
+        'custom_index_widgets:index_2rbsm' => '2 rows, [Grande] -[Peque, Medio]',
+        'custom_index_widgets:index_2rbms' => '2 rows, [Grande] -[Medio, Peque]',
+       
+        'custom_index_widgets:area1' => 'Widgets Zona 1',
+        'custom_index_widgets:area2' => 'Widgets Zona 2',
+        'custom_index_widgets:area3' => 'Widgets Zona 3',
+       
+        'custom_index_widgets:admin:notfound' => 'Pagina no encontrada',
+        'custom_index_widgets:index' => "Index widgetisation",
+        'custom_index_widgets:num_items' => "Numero de items",
+        'custom_index_widgets:reset' => "Restablecer todas las zonas",
+       
+        'custom_index_widgets:pleaselogin' => "Por favor, por favor, inicie sesión para ver mas...",
+       
+        'custom_index_widgets:widget_title' => "Título del widget Override (solo se mostraran en el índice en sustitucion del título widget por defecto)",
+        'custom_index_widgets:context_mode' => "Estilo",
+        'custom_index_widgets:context_list' => "Lista",
+        'custom_index_widgets:context_detail' => "Detalle",
+       
+        'custom_index_widgets:login_style'=>"Posicion de Login",
+        'custom_index_widgets:inlayout'=>"Barra inferior",
+        'custom_index_widgets:topbar'=>"Barra superior",
+        'custom_index_widgets:widget_all_groups' => "Todos los grupos",
+		
+		"custom_index_widgets:showdashboard"=>"End index with dashboard",
+        "custom_index_widgets:showdashboard_yes"=>"Si",
+		"custom_index_widgets:showdashboard_no"=>"No",
+		"custom_index_widgets:guest_only" => "Guest only",
+		"custom_index_widgets:box_style" => "Box Style",
+		"custom_index_widgets:social_share_index" => "Social Share",
+		"custom_index_widgets:login_index"=>"Login",
+		"admin:appearance:custom_index_widgets" => "Index Widgets"
+   
+    );
+                   
+    add_translation("es",$spanish);
+    
diff --git a/mod/custom_index_widgets/languages/fr.php b/mod/custom_index_widgets/languages/fr.php
new file mode 100644
index 000000000..486500710
--- /dev/null
+++ b/mod/custom_index_widgets/languages/fr.php
@@ -0,0 +1,80 @@
+<?php
+
+	$french = array(
+	
+		'custom_index_widgets:latest_bookmarks_index' => "Derniers bookmarks",
+		'custom_index_widgets:latest_groups_index' => "Groupes les + r&eacute;cents",
+		'custom_index_widgets:latest_files_index' => "Fichiers les + r&eacute;cents",
+		'custom_index_widgets:latest_blogs_index' => "Derniers ajouts de blogs",
+		'custom_index_widgets:latest_members_index' => "Nouveaux membres",
+		'custom_index_widgets:nofiles' => "Il n'y a aucun fichier pour l'instant",
+		'custom_index_widgets:nogroups' => "Il n'y a aucun groupe pour l'instant",	
+		'custom_index_widgets:latest_news_index' => "Dernieres news",
+		'custom_index_widgets:latest_pages_index' => "Dernieres pages",
+		'custom_index_widgets:latest_events_index' => 'Prochains evenements',
+		'custom_index_widgets:latest_wire_index' => 'Derniers messages',
+		'custom_index_widgets:inline_content_index' => 'Texte libre',
+		'custom_index_widgets:html_content' => 'Votre texte',
+		'custom_index_widgets:latest_generic_index'=>"Contenu générique",
+		'custom_index_widgets:latest_tasks_index'=>"Tâches récentes",
+		'custom_index_widgets:latest_activity_index' => 'En bref',
+		'custom_index_widgets:cloud_generic_index'=>"Nuage de tags",
+		'custom_index_widgets:widget_subtype'=>"Type d'entité",
+		'custom_index_widgets:metadata_name' => "Metadata",
+		'custom_index_widgets:threshold'=> "Seuil minimal",
+		'custom_index_widgets:latest_izap_videos_index' => 'Dernières vidéos',
+		'custom_index_widgets:display_avatar' => 'Avatar',
+		
+		'custom_index_widgets:rich_media_index' => "Contenu multimédia",
+		'custom_index_widgets:widget_video_width' => "Largeur de la vidéo (chiffre sans px ni %)",
+	    'custom_index_widgets:widget_video_height' => "Hauteur de la vidéo (chiffre sans px ni %)",
+	    'custom_index_widgets:widget_video_url' => "Url de la vidéo",
+	    'custom_index_widgets:widget_video_caption' => "Légende de la vidéo",
+			
+		'custom_index_widgets:layout' => "Présentation",
+			
+		'custom_index_widgets:index_2rmsb' => '2 lignes, [Medium, Small] - [Big]',
+		'custom_index_widgets:index_2rsmb' => '2 lignes, [Small, Medium] - [Big]',
+		'custom_index_widgets:index_2rhhb' => '2 lignes, [Half, Half] - [Big]',
+		'custom_index_widgets:index_1rsss' => '1 ligne, [Small, Small, Small]',
+		'custom_index_widgets:index_1rsms' => '1 ligne, [Small, Medium, Small]',
+		
+		'custom_index_widgets:index_2rbhh' => '2 lignes, [Big] -[Half, Half]',
+		'custom_index_widgets:index_2rbsm' => '2 lignes, [Big] -[Small, Medium]',
+		'custom_index_widgets:index_2rbms' => '2 lignes, [Big] -[Medium, Small]',
+		
+		'custom_index_widgets:area1' => 'Widgets Zone 1',
+		'custom_index_widgets:area2' => 'Widgets Zone 2',
+		'custom_index_widgets:area3' => 'Widgets Zone 3',
+    
+	    'custom_index_widgets:admin:notfound' => 'Page non trouv&eacute;e',
+	    'custom_index_widgets:index' => "Configuration de l'index",
+		'custom_index_widgets:num_items' => "Nombre d'items",
+		'custom_index_widgets:reset' => "Supprimer tout les widgets",
+		
+		'custom_index_widgets:pleaselogin' => "Allez, connectez-vous quoi ...",
+		
+		'custom_index_widgets:widget_title' => "Titre de remplacement (est affiché à la place du titre du widget uniquement sur la page d'accueil)",
+		'custom_index_widgets:context_mode' => "Mode d'affichage",
+		'custom_index_widgets:context_list' => "Liste",
+		'custom_index_widgets:context_detail' => "Détail",
+		
+		'custom_index_widgets:login_style'=>"Position de la zone login",
+		'custom_index_widgets:inlayout'=>"Dans la page",
+		'custom_index_widgets:topbar'=>"Top bar",
+		
+		"custom_index_widgets:showdashboard"=>"Afficher le dashboard en fin de page",
+		"custom_index_widgets:showdashboard_yes"=>"Oui",
+		"custom_index_widgets:showdashboard_no"=>"Non",
+		
+		'custom_index_widgets:widget_all_groups' => "Tous les groupes",
+		"search:go" => "Ok",
+		"custom_index_widgets:guest_only" => "Que pour les invités",
+		"custom_index_widgets:box_style" => "Type d'affichage",
+		"custom_index_widgets:social_share_index" => "Social Share",
+		"custom_index_widgets:login_index"=>"Login",
+		"admin:appearance:custom_index_widgets" => "Index Widgets"
+		
+	);
+					
+	add_translation("fr",$french);
diff --git a/mod/custom_index_widgets/manifest.xml b/mod/custom_index_widgets/manifest.xml
new file mode 100644
index 000000000..33784b313
--- /dev/null
+++ b/mod/custom_index_widgets/manifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Custom index widgets</name>
+	<author>Fx NION, Lorea developers</author>
+	<version>1.8.0</version>
+	<category>content</category>
+	<category>widget</category>
+	<description>Customise your index, with severals layout and customisable widgets. And get fun.</description>
+	<website>https://lorea.org/</website>
+	<copyright>(C) Fx NION 2009-2011, Lorea 2012-2013</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8.3</version>
+	</requires>
+	<conflicts>
+		<type>plugin</type>
+		<name>custom_index</name>
+	</conflicts>
+	<activate_on_install>false</activate_on_install>
+</plugin_manifest>
diff --git a/mod/custom_index_widgets/start.php b/mod/custom_index_widgets/start.php
new file mode 100644
index 000000000..70a755dc2
--- /dev/null
+++ b/mod/custom_index_widgets/start.php
@@ -0,0 +1,159 @@
+<?php
+
+elgg_register_event_handler('init', 'system', 'custom_index_widgets_init');
+	 
+function custom_index_widgets_init() {
+
+	elgg_extend_view('css/elgg','custom_index_widgets/css');
+	
+	elgg_register_admin_menu_item('configure', 'custom_index_widgets', 'appearance');
+	
+	
+	$ciw_layout = elgg_get_plugin_setting("ciw_layout", "custom_index_widgets");
+	if ($ciw_layout == NULL) {
+		elgg_set_plugin_setting("ciw_layout", "index_2rmsb", "custom_index_widgets");
+	}
+		 
+	$ciw_showdashboard = elgg_get_plugin_setting("ciw_showdashboard", "custom_index_widgets");
+	if ($ciw_showdashboard == NULL) {
+		elgg_set_plugin_setting("ciw_showdashboard", "yes", "custom_index_widgets");
+	}
+	elgg_register_widget_type('latest_members_index', elgg_echo('custom_index_widgets:latest_members_index'), elgg_echo('custom_index_widgets:latest_members_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('inline_content_index', elgg_echo('custom_index_widgets:inline_content_index'), elgg_echo('custom_index_widgets:inline_content_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('rich_media_index', elgg_echo('custom_index_widgets:rich_media_index'), elgg_echo('custom_index_widgets:rich_media_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('latest_generic_index', elgg_echo('custom_index_widgets:latest_generic_index'), elgg_echo('custom_index_widgets:latest_generic_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('latest_activity_index', elgg_echo('custom_index_widgets:latest_activity_index'), elgg_echo('custom_index_widgets:latest_activity_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('cloud_generic_index', elgg_echo('custom_index_widgets:cloud_generic_index'), elgg_echo('custom_index_widgets:cloud_generic_index'), "custom_index_widgets", true);
+	elgg_register_widget_type('login_index', elgg_echo('custom_index_widgets:login_index'), elgg_echo('custom_index_widgets:login_index'), "custom_index_widgets", true);
+
+	if (elgg_is_active_plugin('groups'))	{
+		elgg_register_widget_type('latest_groups_index', elgg_echo('custom_index_widgets:latest_groups_index'), elgg_echo('custom_index_widgets:latest_groups_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('file')) {
+		elgg_register_widget_type('latest_files_index', elgg_echo('custom_index_widgets:latest_files_index'), elgg_echo('custom_index_widgets:latest_files_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('news')) {
+		elgg_register_widget_type('latest_news_index', elgg_echo('custom_index_widgets:latest_news_index'), elgg_echo('custom_index_widgets:latest_news_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('bookmarks_enhanced') or elgg_is_active_plugin('bookmarks')) {
+		elgg_register_widget_type('latest_bookmarks_index', elgg_echo('custom_index_widgets:latest_bookmarks_index'), elgg_echo('custom_index_widgets:latest_bookmarks_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('blog')) {
+		elgg_register_widget_type('latest_blogs_index', elgg_echo('custom_index_widgets:latest_blogs_index'), elgg_echo('custom_index_widgets:latest_blogs_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('pages')) {
+		elgg_register_widget_type('latest_pages_index', elgg_echo('custom_index_widgets:latest_pages_index'), elgg_echo('custom_index_widgets:latest_pages_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('event_calendar')) {
+		elgg_register_widget_type('latest_events_index', elgg_echo('custom_index_widgets:latest_events_index'), elgg_echo('custom_index_widgets:latest_events_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('tidypics')) { 
+		elgg_register_widget_type('latest_photos_index', elgg_echo("tidypics:widget:latest"), elgg_echo("tidypics:widget:latest_descr"), "custom_index_widgets", true);
+		elgg_register_widget_type('latest_album_index', elgg_echo("tidypics:widget:albums"), elgg_echo("tidypics:widget:latest_descr"), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('thewire')) {
+		elgg_register_widget_type('latest_wire_index', elgg_echo('custom_index_widgets:latest_wire_index'), elgg_echo('custom_index_widgets:latest_wire_index'), "custom_index_widgets", true);
+	}
+	
+	if (elgg_is_active_plugin('tasks')) {
+		elgg_register_widget_type('latest_tasks_index', elgg_echo('custom_index_widgets:latest_tasks_index'), elgg_echo('custom_index_widgets:latest_tasks_index'), "custom_index_widgets", true);
+	}
+	
+	if (elgg_is_active_plugin('izap_videos')) {
+		elgg_register_widget_type('latest_izap_videos_index',elgg_echo  ('custom_index_widgets:latest_izap_videos_index'), elgg_echo('custom_index_widgets:latest_izap_videos_index'), "custom_index_widgets", true);
+	}
+	if (elgg_is_active_plugin('simplepie')) {
+		elgg_register_widget_type('feed_reader_index', elgg_echo('simplepie:widget'),elgg_echo('simplepie:description'),'custom_index_widgets',	true);
+	}
+	
+	elgg_register_plugin_hook_handler('index', 'system', 'custom_index_widgets');
+	elgg_register_page_handler ('custom_index_widgets', 'custom_index_widgets_page_handler'); 
+
+}
+
+function custom_index_widgets($hook, $type, $return, $params) {
+	if ($return == true) {
+		// another hook has already replaced the front page
+		return $return;
+	}
+
+	if (!include_once(dirname(__FILE__) . "/index.php")) {
+		return false;
+	}
+
+	// return true to signify that we have handled the front page
+	return true;
+}
+
+
+function custom_index_widgets_page_handler($page) {
+	if (isset ($page [0])) {
+		switch ($page [0]) {
+			case "edit" :
+				@include (dirname ( __FILE__ ) . "/edit.php");
+				break;
+		}
+	} else {
+		register_error(elgg_echo("custom_index_widgets:admin:notfound"));
+		forward(elgg_get_site_url());
+	}
+	return true;
+}
+
+
+function custom_index_show_widget_area($areawidgets){
+	if (is_array($areawidgets) && sizeof($areawidgets) > 0) {
+		foreach($areawidgets as $widget) {
+			if ($widget instanceof ElggWidget) {
+				$vars['entity'] = $widget;
+				$handler = $widget->handler;
+				if (elgg_view_exists("widgets/$handler/content")) {
+					$content = elgg_view("widgets/$handler/content", $vars);
+				} else {
+					elgg_deprecated_notice("widgets use content as the display view", 1.8);
+					$content = elgg_view("widgets/$handler/view", $vars);
+				}
+				echo elgg_view_module('featured',  $widget->title, $content, array('class' => 'elgg-module-highlight'));
+			} else {
+				echo $widget;
+			}
+		}
+	}
+}
+
+function custom_index_build_columns($area_widget_list, $widgettypes, $build_server_side = true) {
+
+	$column_widgets_view = array();
+	$column_widgets_string = "";
+	
+	if (is_array($area_widget_list) && sizeof($area_widget_list) > 0) {
+		foreach ($area_widget_list as $widget) {
+				if ($build_server_side ) {
+					$title = $widget->widget_title;
+					if (!$title) {
+						$title = $widgettypes[$widget->handler]->name;
+						if (!$title) {
+							$title = $widget->handler;
+						}
+					}
+					$widget->title = $title;
+					
+					if (($widget->guest_only == "yes" && !elgg_is_logged_in()) || $widget->guest_only == "no" || !isset($widget->guest_only)) {
+						$column_widgets_view[] = $widget;  
+					}
+				} else {
+					if (!empty($column_widgets_string)) {
+						$column_widgets_string .= "::";
+					}
+					$column_widgets_string .= "{$widget->handler}::{$widget->getGUID()}";
+				}
+		}
+		
+		if ($build_server_side) {
+			return $column_widgets_view;
+		} else {
+			return $column_widgets_string;
+		}
+	}
+	return null;	
+}
diff --git a/mod/custom_index_widgets/views/default/admin/appearance/custom_index_widgets.php b/mod/custom_index_widgets/views/default/admin/appearance/custom_index_widgets.php
new file mode 100644
index 000000000..491c878e5
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/admin/appearance/custom_index_widgets.php
@@ -0,0 +1,56 @@
+<?php
+
+
+elgg_push_context('custom_index_widgets');
+elgg_set_page_owner_guid(elgg_get_config('site_guid'));
+
+$num_columns = elgg_extract('num_columns', $vars, 3);
+$show_add_widgets = elgg_extract('show_add_widgets', $vars, true);
+$exact_match = elgg_extract('exact_match', $vars, true);
+$show_access = elgg_extract('show_access', $vars, true);
+
+
+$owner = elgg_get_page_owner_entity(); 
+
+
+$context = elgg_get_context();
+$widget_types = elgg_get_widget_types($context, true);
+$widgets = elgg_get_widgets($owner->guid, $context);
+
+
+if (elgg_can_edit_widget_layout($context)) {
+	
+	if ($show_add_widgets) {
+		echo elgg_view('page/layouts/widgets/add_button');
+	}
+	$params = array(
+		'widgets' => $widgets,
+		'context' => $context,
+		'exact_match' => $exact_match,
+	);
+	
+	echo elgg_view('page/layouts/widgets/add_panel', $params);
+}
+
+echo $vars['content'];
+
+$widget_class = "elgg-col-1of{$num_columns}";
+for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
+	if (isset($widgets[$column_index])) {
+		$column_widgets = $widgets[$column_index];
+	} else {
+		$column_widgets = array();
+	}
+
+	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
+	if (sizeof($column_widgets) > 0) {
+		foreach ($column_widgets as $widget) {
+			if (array_key_exists($widget->handler, $widget_types)) {
+				echo elgg_view_entity($widget, array('show_access' => $show_access));
+			}
+		}
+	}
+	echo '</div>';
+}
+
+
diff --git a/mod/custom_index_widgets/views/default/custom_index_widgets/css.php b/mod/custom_index_widgets/views/default/custom_index_widgets/css.php
new file mode 100644
index 000000000..e80d28684
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/custom_index_widgets/css.php
@@ -0,0 +1,347 @@
+<?php
+	/**
+	 * Custom Index page css extender
+	 * 
+	 * @package custom_index
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider <info@elgg.com>
+	 * @copyright Curverider Ltd 2008-2009
+	 * @link http://elgg.org/
+	 */
+?>
+
+.icon_members {
+	float:left;
+	margin:2pt 5px 3px 0pt;
+}
+
+.icon_latest {
+	margin:0 auto;
+}
+#login-box{
+	width:100%;
+}
+#login-box form{
+	width:auto;
+}
+
+#login-box input[type="text"],
+#login-box input[type="password"]{
+	width: 95%;
+}
+
+#rightcolumn_widgets, 
+#leftcolumn_widgets, 
+#middlecolumn_widgets{
+	min-height: 1px;
+}
+
+
+#rightcolumn_widgets.small_edit_mode_box, 
+#leftcolumn_widgets.small_edit_mode_box, 
+#middlecolumn_widgets.small_edit_mode_box,
+#customise_page_view table tr td h2.small_edit_mode_box { 
+  margin:5px 10px 0 0;
+  width: auto;
+}
+#rightcolumn_widgets.medium_edit_mode_box, 
+#leftcolumn_widgets.medium_edit_mode_box, 
+#middlecolumn_widgets.medium_edit_mode_box,
+#customise_page_view table tr td h2.medium_edit_mode_box{
+ margin:5px 10px 0 0;
+  width: auto;
+}
+#rightcolumn_widgets.big_edit_mode_box, 
+#leftcolumn_widgets.big_edit_mode_box, 
+#middlecolumn_widgets.big_edit_mode_box,
+#customise_page_view table tr td h2.big_edit_mode_box{ 
+ margin:5px 10px 0 0;
+  width: auto;
+}
+#rightcolumn_widgets.half_edit_mode_box, 
+#leftcolumn_widgets.half_edit_mode_box, 
+#middlecolumn_widgets.half_edit_mode_box,
+#customise_page_view table tr td h2.half_edit_mode_box{ 
+  margin:5px 10px 0 0;
+  width: auto;
+}
+
+#rightcolumn_widgets.small_index_mode_box, 
+#leftcolumn_widgets.small_index_mode_box, 
+#middlecolumn_widgets.small_index_mode_box,
+#customise_page_view table tr td h2.small_index_mode_box { 
+  /*width: 312px;*/
+  width: auto;
+  padding: 0 0 5px;
+  margin-right: 10px;
+  border: 0 none;
+}
+#rightcolumn_widgets.medium_index_mode_box, 
+#leftcolumn_widgets.medium_index_mode_box, 
+#middlecolumn_widgets.medium_index_mode_box,
+#customise_page_view table tr td h2.medium_index_mode_box{
+  /*width: 608px;*/
+  width: auto;
+  padding: 0 0 5px;
+  margin-right: 10px;
+  border: 0 none;
+}
+#rightcolumn_widgets.big_index_mode_box, 
+#leftcolumn_widgets.big_index_mode_box, 
+#middlecolumn_widgets.big_index_mode_box,
+#customise_page_view table tr td h2.big_index_mode_box{ 
+  width: auto;
+  padding: 0 0 5px;
+  margin-right: 10px;
+  border: 0 none;
+}
+#rightcolumn_widgets.half_index_mode_box, 
+#leftcolumn_widgets.half_index_mode_box, 
+#middlecolumn_widgets.half_index_mode_box,
+#customise_page_view.half_index_mode_box h2{ 
+  /*width: 460px;*/
+  width: auto;
+  padding: 0 0 5px;
+  margin: 10px 3px;
+  border: 0 none;
+}
+
+table.index_mode{
+  width: 96%;
+  margin-left: 2%;
+  border: 0 none;
+}
+
+td.small {
+  width: 38%;
+}
+td.half {
+  width: 47%;
+}
+td.medium {
+  width: 57%;
+}
+td.big {
+  width: 100%;
+}
+.logintop{
+	margin:0 auto;
+	padding:0;
+	padding-top: 3px;
+	width:990px;
+}
+.logintop_links{
+	margin-left:80px;
+}
+
+.logintop_links a {
+	margin:0 0 0 2px;
+	color:#999999;
+	padding:3px;
+}
+.logintop_links a:hover {
+	color:#eeeeee;
+}
+
+#logintopform{
+	color: #BBBBBB;
+	font-size: 12px;
+}
+
+#logintopform input.logintop_input {
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	background-color:#FFFFFF;
+	border:1px solid #BBBBBB;
+	color:#999999;
+	font-size:12px;
+	font-weight:bold;
+	margin:0pt;
+	padding:2px;
+	width:180px;
+	height:12px;
+}
+#logintopform input.logintop_submit_button {
+	-webkit-border-radius: 4px; 
+	-moz-border-radius: 4px;
+	color:#333333;
+	background: #cccccc;
+	border:none;
+	font-size:12px;
+	font-weight:bold;
+	margin:0px;
+	padding:2px;
+	width:auto;
+	height:18px;
+	cursor:pointer;
+}
+#logintopform input.logintop_submit_button:hover {
+	color:#ffffff;
+	background: #4690d6;
+}
+
+/* ***************************************
+STANDARD BOXES
+*************************************** */
+.standard_box {
+	margin: 0 0 20px 0;
+	height:auto;
+
+}
+/* IE6 fix */
+* html .standard_box  {
+	height:10px;
+}
+.standard_box_header {
+	color: #4690d6;
+	padding: 5px 10px 5px 10px;
+	margin:0;
+	border-left: 1px solid white;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+	-moz-border-radius-topleft:8px;
+	-moz-border-radius-topright:8px;
+	-webkit-border-top-right-radius:8px;
+	-webkit-border-top-left-radius:8px;
+	background:#dedede;
+}
+.standard_box_header h1 {
+	color: #0054a7;
+	font-size:1.25em;
+	line-height: 1.2em;
+}
+.standard_box_content {
+	padding: 10px 0 10px 0;
+	margin:0;
+	height:auto;
+	background:#dedede;
+	-moz-border-radius-bottomleft:8px;
+	-moz-border-radius-bottomright:8px;
+	-webkit-border-bottom-right-radius:8px;
+	-webkit-border-bottom-left-radius:8px;
+	border-left: 1px solid white;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+}
+.standard_box_content .contentWrapper {
+	margin-bottom:5px;
+}
+.standard_box_editpanel {
+	display: none;
+	background: #a8a8a8;
+	padding:10px 10px 5px 10px;
+	border-left: 1px solid white;
+	border-bottom: 1px solid white;
+}
+.standard_box_editpanel p {
+	margin:0 0 5px 0;
+}
+.standard_box_header a.toggle_box_contents {
+	color: #4690d6;
+	cursor:pointer;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:20px;
+	font-weight: bold;
+	text-decoration:none;
+	float:right;
+	margin: 0;
+	margin-top: -7px;
+}
+.standard_box_header a.toggle_box_edit_panel {
+	color: #4690d6;
+	cursor:pointer;
+	font-size:9px;
+	text-transform: uppercase;
+	text-decoration:none;
+	font-weight: normal;
+	float:right;
+	margin: 3px 10px 0 0;
+}
+.standard_box_editpanel label {
+	font-weight: normal;
+	font-size: 100%;
+}
+
+
+/* ***************************************
+PLAIN BOXES
+*************************************** */
+.plain_box , .plain.collapsable_box{
+	margin: 0 0 20px 0;
+	height:auto;
+
+}
+/* IE6 fix */
+* html .plain_box , * html .plain.collapsable_box {
+	height:10px;
+}
+.plain_box_header , .plain.collapsable_box_header{
+	color: #4690d6;
+	padding: 5px 10px 5px 10px;
+	margin:0;
+	border-left: 1px solid #cccccc;
+	border-right: 1px solid #cccccc;
+	border-top: 1px solid #cccccc;
+	-moz-border-radius-topleft:8px;
+	-moz-border-radius-topright:8px;
+	-webkit-border-top-right-radius:8px;
+	-webkit-border-top-left-radius:8px;
+	background:transparent;
+}
+.plain_box_header h1, .plain.collapsable_box_header h1 {
+	color: #0054a7;
+	font-size:1.25em;
+	line-height: 1.2em;
+}
+.plain_box_content, .plain.collapsable_box_content {
+	padding: 10px 0 10px 0;
+	margin:0;
+	height:auto;
+	-moz-border-radius-bottomleft:8px;
+	-moz-border-radius-bottomright:8px;
+	-webkit-border-bottom-right-radius:8px;
+	-webkit-border-bottom-left-radius:8px;
+	border-left: 1px solid #cccccc;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+	background:transparent;
+	
+}
+.plain_box_content .contentWrapper , .plain.collapsable_box_content .contentWrapper{
+	margin-bottom:5px;
+}
+.plain_box_editpanel .plain.collapsable_box_editpanel{
+	display: none;
+	background: #a8a8a8;
+	padding:10px 10px 5px 10px;
+	border-left: 1px solid white;
+	border-bottom: 1px solid white;
+}
+.plain_box_editpanel p , .plain.collapsable_box_editpanel{
+	margin:0 0 5px 0;
+}
+.plain_box_header a.toggle_box_contents , .plain.collapsable_box_header a.toggle_box_contents{
+	color: #4690d6;
+	cursor:pointer;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size:20px;
+	font-weight: bold;
+	text-decoration:none;
+	float:right;
+	margin: 0;
+	margin-top: -7px;
+}
+.plain_box_header a.toggle_box_edit_panel , .plain.collapsable_box_header a.toggle_box_edit_panel {
+	color: #4690d6;
+	cursor:pointer;
+	font-size:9px;
+	text-transform: uppercase;
+	text-decoration:none;
+	font-weight: normal;
+	float:right;
+	margin: 3px 10px 0 0;
+}
+.plain_box_editpanel label , .plain.collapsable_box_editpanel label{
+	font-weight: normal;
+	font-size: 100%;
+}
diff --git a/mod/custom_index_widgets/views/default/custom_index_widgets/footerlinks.php b/mod/custom_index_widgets/views/default/custom_index_widgets/footerlinks.php
new file mode 100644
index 000000000..ed92a9032
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/custom_index_widgets/footerlinks.php
@@ -0,0 +1,3 @@
+<div class="mts float-alt">
+<a href="http://fxnion.free.fr/"><img src="<?php echo elgg_get_site_url(); ?>mod/custom_index_widgets/images/fxnion_elgg_custom_index.gif" alt="Elgg Custom index by Fx Nion" title="Elgg Custom index by Fx Nion"/></a>
+</div>
diff --git a/mod/custom_index_widgets/views/default/page/layouts/edit_widgets.php b/mod/custom_index_widgets/views/default/page/layouts/edit_widgets.php
new file mode 100644
index 000000000..f61cea356
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/edit_widgets.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Elgg widgets layout
+ *
+ * @uses $vars['content']          Optional display box at the top of layout
+ * @uses $vars['num_columns']      Number of widget columns for this layout (3)
+ * @uses $vars['show_add_widgets'] Display the add widgets button and panel (true)
+ * @uses $vars['exact_match']      Widgets must match the current context (false)
+ * @uses $vars['show_access']      Show the access control (true)
+ */
+
+$num_columns = elgg_extract('num_columns', $vars, 3);
+$show_add_widgets = elgg_extract('show_add_widgets', $vars, true);
+$exact_match = elgg_extract('exact_match', $vars, false);
+$show_access = elgg_extract('show_access', $vars, true);
+
+$owner = elgg_get_page_owner_entity();
+
+$widget_types = elgg_get_widget_types();
+
+$context = elgg_get_context();
+//elgg_push_context('widgets');
+
+$widgets = elgg_get_widgets($owner->guid, $context);
+
+if (elgg_can_edit_widget_layout($context)) {
+	if ($show_add_widgets) {
+		echo elgg_view('page/layouts/widgets/add_button');
+	}
+	$params = array(
+		'widgets' => $widgets,
+		'context' => $context,
+		'exact_match' => $exact_match,
+	);
+	echo elgg_view('page/layouts/widgets/add_panel', $params);
+}
+
+echo $vars['content'];
+
+$widget_class = "elgg-col-1of{$num_columns}";
+for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
+	if (isset($widgets[$column_index])) {
+		$column_widgets = $widgets[$column_index];
+	} else {
+		$column_widgets = array();
+	}
+
+	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
+	if (sizeof($column_widgets) > 0) {
+		foreach ($column_widgets as $widget) {
+			if (array_key_exists($widget->handler, $widget_types)) {
+				echo elgg_view_entity($widget, array('show_access' => $show_access));
+			}
+		}
+	}
+	echo '</div>';
+}
+
+elgg_pop_context();
+
+echo elgg_view('graphics/ajax_loader', array('id' => 'elgg-widget-loader'));
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index.php b/mod/custom_index_widgets/views/default/page/layouts/index.php
new file mode 100644
index 000000000..a73a0d7b1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td align="left" valign="top" class="half">
+			<div id="leftcolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area1widgets) ?>
+			</div>
+        </td>
+        <td align="left" valign="top" class="half">
+			<div id="middlecolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area2widgets) ?>
+			</div>
+        </td>
+      </tr>
+	  <tr >
+	  	<td colspan="2" align="left" valign="top" class="big">
+			<div id="rightcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area3widgets) ?>
+			</div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_1rsss.php b/mod/custom_index_widgets/views/default/page/layouts/index_1rsss.php
new file mode 100644
index 000000000..0d43469e9
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_1rsss.php
@@ -0,0 +1,29 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td align="left" valign="top" class="small">
+			<div id="leftcolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area1widgets) ?>
+			</div>
+        </td>
+        <td align="left" valign="top" class="small">
+			<div id="middlecolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area2widgets) ?>
+			</div>
+        </td>
+        <td align="left" valign="top" class="small">
+			<div id="rightcolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+			<?php custom_index_show_widget_area($area3widgets) ?>
+			</div>
+        </td>
+
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rbhh.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rbhh.php
new file mode 100644
index 000000000..7f8c22437
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rbhh.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td colspan="2" align="left" valign="top" class="big">
+              <div id="leftcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" class="half">
+              <div id="middlecolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  	<td  align="left" valign="top" class="half">
+              <div id="rightcolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rbms.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rbms.php
new file mode 100644
index 000000000..fdb0cf38b
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rbms.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td colspan="2" align="left" valign="top" class="big">
+              <div id="leftcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" class="medium">
+              <div id="middlecolumn_widgets" class="medium_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  	<td  align="left" valign="top" class="small">
+              <div id="rightcolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rbsm.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rbsm.php
new file mode 100644
index 000000000..d5a81f1f5
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rbsm.php
@@ -0,0 +1,28 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td colspan="2" align="left" valign="top" class="big">
+              <div id="leftcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+      </tr>
+      <tr>
+        <td align="left" valign="top" class="small">
+              <div id="middlecolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  	<td  align="left" valign="top" class="medium">
+              <div id="rightcolumn_widgets" class="medium_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rhhb.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rhhb.php
new file mode 100644
index 000000000..ae2995ff9
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rhhb.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td align="left" valign="top" class="half">
+              <div id="leftcolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+        <td align="left" valign="top" class="half">
+              <div id="middlecolumn_widgets" class="half_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  </tr>
+      <tr>
+	  	<td colspan="2" align="left" valign="top" class="big">
+              <div id="rightcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rmsb.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rmsb.php
new file mode 100644
index 000000000..a774a4a42
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rmsb.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td align="left" valign="top" class="medium">
+              <div id="leftcolumn_widgets" class="medium_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+        <td align="left" valign="top" class="small">
+              <div id="middlecolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  </tr>
+      <tr>
+	  	<td colspan="2" align="left" valign="top" class="big">
+              <div id="rightcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/page/layouts/index_2rsmb.php b/mod/custom_index_widgets/views/default/page/layouts/index_2rsmb.php
new file mode 100644
index 000000000..72bb92d3d
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/page/layouts/index_2rsmb.php
@@ -0,0 +1,30 @@
+<?php
+		$area1widgets = $vars['area1'];
+		$area2widgets = $vars['area2'];
+		$area3widgets = $vars['area3'];
+		$layoutmode   = $vars['layoutmode']; //edit, index
+?>
+
+    <table cellspacing="10" cellpadding="10" width="100%" class="<?php echo elgg_echo($layoutmode); ?>">
+      <tr>
+        <td align="left" valign="top" class="small">
+              <div id="leftcolumn_widgets" class="small_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area1widgets) ?>
+              </div>
+        </td>
+        <td align="left" valign="top" class="medium">
+              <div id="middlecolumn_widgets" class="medium_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area2widgets) ?>
+              </div>
+        </td>
+	  </tr>
+      <tr>
+	  	<td colspan="2" align="left" valign="top" class="big">
+              <div id="rightcolumn_widgets" class="big_<?php echo elgg_echo($layoutmode); ?>_box">
+              <?php custom_index_show_widget_area($area3widgets) ?>
+              </div>
+        </td>
+      </tr>
+    </table>
+
+
diff --git a/mod/custom_index_widgets/views/default/plugins/custom_index_widgets/settings.php b/mod/custom_index_widgets/views/default/plugins/custom_index_widgets/settings.php
new file mode 100644
index 000000000..ef70eeb8d
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/plugins/custom_index_widgets/settings.php
@@ -0,0 +1,61 @@
+<?php
+	 
+?>
+<div>
+  <div class="contentWrapper">
+    <table>
+      <tr>
+  	     <td style="width:50%"><?php echo elgg_echo("custom_index_widgets:layout"); ?></td>
+  	     <td>
+  	         <?php	echo elgg_view('input/dropdown', array(
+          			'name' => 'params[ciw_layout]',
+          			'options_values' => array(
+						'index' => 'Default',
+          				'index_2rmsb' => elgg_echo('custom_index_widgets:index_2rmsb'),
+          				'index_2rsmb' => elgg_echo('custom_index_widgets:index_2rsmb'),
+          				'index_2rhhb' => elgg_echo('custom_index_widgets:index_2rhhb'),
+          				'index_2rbhh' => elgg_echo('custom_index_widgets:index_2rbhh'),
+          				
+          				'index_2rbsm' => elgg_echo('custom_index_widgets:index_2rbsm'),
+          				'index_2rbms' => elgg_echo('custom_index_widgets:index_2rbms'),
+          				
+          				'index_1rsss' => elgg_echo('custom_index_widgets:index_1rsss')
+
+          			),
+          			'value' => $vars["entity"]->ciw_layout
+          		));
+          	?>
+         </td>
+      </tr>
+	  <tr>
+	  	<td style="width:50%"><?php echo elgg_echo("custom_index_widgets:login_style"); ?></td>
+  	     <td>
+  	         <?php	echo elgg_view('input/dropdown', array(
+          			'name' => 'params[login_style]',
+          			'options_values' => array(
+          				'inlayout' => elgg_echo('custom_index_widgets:inlayout'),
+          				'topbar' => elgg_echo('custom_index_widgets:topbar'),
+        			),
+          			'value' => $vars["entity"]->login_style
+          		));
+          	?>
+         </td>
+	  </tr>
+	  <tr>
+	  	<td style="width:50%"><?php echo elgg_echo("custom_index_widgets:showdashboard"); ?></td>
+  	     <td>
+  	         <?php	echo elgg_view('input/dropdown', array(
+          			'name' => 'params[ciw_showdashboard]',
+          			'options_values' => array(
+          				'yes' => elgg_echo('custom_index_widgets:showdashboard_yes'),
+          				'no' => elgg_echo('custom_index_widgets:showdashboard_no'),
+        			),
+          			'value' => $vars["entity"]->ciw_showdashboard
+          		));
+          	?>
+         </td>
+	  </tr>
+	  
+      </table>
+    </div>
+</div>
diff --git a/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/content.php b/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/content.php
new file mode 100644
index 000000000..bee459e1d
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/content.php
@@ -0,0 +1,59 @@
+<?php
+$maintype = "object";
+$subtype = $vars["entity"]->widget_subtype;
+if (empty($subtype) || $subtype == 'All') {
+	$subtype = ELGG_ENTITIES_ANY_VALUE;
+}
+
+if ($subtype == 'user') {$maintype='user';}
+if ($subtype == 'group') {$maintype='group';}
+
+
+$num_items = $vars['entity']->num_items;
+if (!isset($num_items))
+    $num_items = 20;
+
+$created_time_limit = $vars['entity']->created_time_limit;
+if (!isset($created_time_limit)  || $created_time_limit == 'all') {
+    $created_time = ELGG_ENTITIES_ANY_VALUE;
+}
+elseif ($created_time_limit == 'day') {
+    $created_time = time()-(3600*24);
+}
+elseif ($created_time_limit == 'week') {
+    $created_time = time()-(3600*24*7);
+}
+elseif ($created_time_limit == 'month') {
+    $created_time = time()-(3600*24*30);
+}
+	
+$metadata_name = $vars['entity']->metadata_name;
+if (!isset($metadata_name)) {
+    $metadata_name = 'tags';
+} else {
+    $metadata_name = $metadata_name;
+}
+
+$threshold = $vars['entity']->threshold;
+if (!isset($threshold))
+    $threshold = 1;
+	
+$widget_group = $vars["entity"]->widget_group;
+if (empty($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+
+
+elgg_push_context('tags');
+$options = array('threshold' => $threshold,
+		'limit' => $num_items,
+		'type' => $maintype,
+		'subtype' => $subtype,
+		'tag_name' => $metadata_name,
+		'created_time_lower' => $created_time,
+		'container_guid' => $widget_group);
+
+$body = elgg_view_tagcloud($options);
+elgg_pop_context();
+
+echo $body;
+	
+?>
diff --git a/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/edit.php b/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/edit.php
new file mode 100644
index 000000000..84b2fa861
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/cloud_generic_index/edit.php
@@ -0,0 +1,120 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+
+	$created_time_limit = $vars['entity']->created_time_limit;
+	if (!isset($created_time_limit)) $created_time_limit = 'all';
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+	
+	$metadata_name = $vars['entity']->metadata_name;
+	if (!isset($metadata_name)) $metadata_name = "";
+
+	$threshold = $vars['entity']->threshold;
+	if (!isset($threshold)) $threshold = 1;
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	$widget_subtype = $vars["entity"]->widget_subtype;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_subtype'); ?>
+      : 
+      <?php
+
+	  $subtypes = get_data("SELECT subtype from {$CONFIG->dbprefix}entity_subtypes");
+      $subtype_list = array();
+	  $subtype_list['All'] = '';
+	  $subtype_list['user'] = 'user';
+	  $subtype_list['group'] = 'group';
+	  
+      if ($subtypes) {
+          foreach ($subtypes as $data) {
+              $subtype_list[$data->subtype] = $data->subtype;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_subtype]', 'options_values'=>$subtype_list, 'value'=>$widget_subtype));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_created_time_limit'); ?>
+      : 
+      <?php
+
+	  $limits = array('all', 'month', 'week', 'day');
+          $limit_list = array();
+	  foreach($limits as $limit) {
+		$limit_list[$limit] = elgg_echo("custom_index_widgets:time_limit:$limit");
+	  }
+          echo '<p>'.elgg_view('input/dropdown', array('name'=>'params[created_time_limit]', 'options_values'=>$limit_list, 'value'=>$created_time_limit))."</p>";
+      ?>
+  </p>
+
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+	  $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:threshold'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[threshold]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$thresholds));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:metadata_name'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[metadata_name]', 'value'=>$metadata_name));
+      ?>
+  </p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
diff --git a/mod/custom_index_widgets/views/default/widgets/feed_reader_index/content.php b/mod/custom_index_widgets/views/default/widgets/feed_reader_index/content.php
new file mode 100644
index 000000000..2695315d5
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/feed_reader_index/content.php
@@ -0,0 +1,8 @@
+<?php 
+  
+	include elgg_get_plugins_path() . 'simplepie/views/default/widgets/feed_reader/content.php';
+	
+	//$body = elgg_view("simplepie/widgets/feed_reader/content", $vars);
+	//echo $body;  
+  
+?>        
diff --git a/mod/custom_index_widgets/views/default/widgets/feed_reader_index/edit.php b/mod/custom_index_widgets/views/default/widgets/feed_reader_index/edit.php
new file mode 100644
index 000000000..5fc36bc54
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/feed_reader_index/edit.php
@@ -0,0 +1,5 @@
+<?php 
+  include elgg_get_plugins_path() . 'simplepie/views/default/widgets/feed_reader/edit.php';	
+  //echo elgg_view("simplepie/edit", $vars);
+?>
+
diff --git a/mod/custom_index_widgets/views/default/widgets/inline_content_index/content.php b/mod/custom_index_widgets/views/default/widgets/inline_content_index/content.php
new file mode 100644
index 000000000..6ed53f197
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/inline_content_index/content.php
@@ -0,0 +1,7 @@
+<div class="contentWrapper">
+    <?php
+    echo $vars[entity]->html_content;
+    ?>
+    <div class="clearfloat">
+    </div>
+</div>
diff --git a/mod/custom_index_widgets/views/default/widgets/inline_content_index/edit.php b/mod/custom_index_widgets/views/default/widgets/inline_content_index/edit.php
new file mode 100644
index 000000000..e5c319bf1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/inline_content_index/edit.php
@@ -0,0 +1,46 @@
+<?php 
+	$widget_title = $vars['entity']->widget_title;
+	$html_content = $vars['entity']->html_content;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_title]',                        
+			'value' => $widget_title
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:html_content'); ?>	
+<?php
+	echo elgg_view('input/longtext', array(
+			'name' => 'params[html_content]',                        
+			'value' => $html_content
+		));
+	?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_activity_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_activity_index/content.php
new file mode 100644
index 000000000..4010e0cb4
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_activity_index/content.php
@@ -0,0 +1,20 @@
+<?php 
+  
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+  
+  $widget_group = $vars["entity"]->widget_group;
+  if (!isset($widget_group)) $widget_group = 0;
+ 
+  /* 
+  $site_categories = $vars['config']->site->categories;
+  $widget_categorie = $vars['entity']->widget_categorie;
+  $widget_context_mode = $vars['entity']->widget_context_mode;
+  if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+  elgg_set_context($widget_context_mode);
+  */
+  $widget_datas = elgg_list_river(0, $widget_group, '', '', '', '', $num_items,0,0,false);
+  
+	echo $widget_datas;
+?>        
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_activity_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_activity_index/edit.php
new file mode 100644
index 000000000..622655307
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_activity_index/edit.php
@@ -0,0 +1,64 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      //$groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+	  $groups = elgg_get_entities(array('type'=>'group'));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_album_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_album_index/content.php
new file mode 100644
index 000000000..c511a775a
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_album_index/content.php
@@ -0,0 +1,64 @@
+<div class="contentWrapper"> 
+<?php
+
+	$object_type ='album';
+	
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items))
+	    $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+	if (!isset($widget_group))
+	    $widget_group = 0;
+	
+	$site_categories = $vars['config']->site->categories;
+	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode))
+	    $widget_context_mode = 'search';
+	elgg_set_context($widget_context_mode);
+
+	$owner_albums = elgg_get_entities("object", $object_type, $widget_group, "", $num_items, 0, false);
+	
+	echo '<div id="tidypics_album_widget_container">';
+	
+	if ($owner_albums) { 
+		foreach($owner_albums as $album) {
+	
+			if($album->cover)
+				$album_cover = '<img src="'.$vars['url'].'mod/tidypics/thumbnail.php?file_guid='.$album->cover.'&size=small"  class="tidypics_album_cover"  alt="' . $album->title . '"/>';
+			else
+				$album_cover = '<img src="'.$vars['url'].'mod/tidypics/graphics/empty_album.png" class="tidypics_album_cover" alt="' . $album->title . '">';
+?>
+		<div class="tidypics_album_widget_single_item">
+			<div class="tidypics_album_widget_title"><a href="<?php echo $album->getURL();?>"><?php echo $album->title;?></a></div>
+			<div class="tidypics_album_widget_timestamp"> <?php echo elgg_echo("album:created:on") . ' ' . elgg_get_friendly_time($album->time_created);?></div>
+<?php
+			//get the number of comments
+			$numcomments = $album->countComments();
+			if ($numcomments)
+				echo "<a href=\"{$album->getURL()}\">" . sprintf(elgg_echo("comments")) . " (" . $numcomments . ")</a><br>";
+?>
+			<a href="<?php echo $album->getURL();?>"><?php echo $album_cover;?></a>
+		</div>
+<?php
+		} //end of foreach loop
+
+		// bottom link to all group/user albums
+		/*if (is_null($owner->username) || empty($owner->username)) {
+			echo '<p class="profile_info_edit_buttons"><a href="' . $vars['url'] . 'pg/photos/world">' . elgg_echo('album:all') . '</a></p>';
+		} else {
+			echo '<p class="tidypics_download"><a href="' . $vars['url'] . 'pg/photos/owned/' . $owner->username . '">' . elgg_echo('album:more') . '</a></p>';
+		}*/
+
+	}
+
+	/*if (can_write_to_container(0, $owner->guid)) {
+		echo '<p class="tidypics_download"><a href=' . $CONFIG->wwwroot .'pg/photos/new/' . $owner->username . '>' . elgg_echo("album:create") . '</a></p>';
+	}*/
+
+
+	//close album_widget_container div
+	echo "</div>";
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_album_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_album_index/edit.php
new file mode 100644
index 000000000..86eaa19cc
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_album_index/edit.php
@@ -0,0 +1,64 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/content.php
new file mode 100644
index 000000000..cce94185d
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/content.php
@@ -0,0 +1,43 @@
+<?php
+$object_type = 'blog';
+
+$num_items = $vars['entity']->num_items;
+if (!isset($num_items))
+    $num_items = 10;
+
+$widget_group = $vars["entity"]->widget_group;
+if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+
+$site_categories = $vars['config']->site->categories;
+$widget_categorie = $vars['entity']->widget_categorie;
+$widget_context_mode = $vars['entity']->widget_context_mode;
+if (!isset($widget_context_mode))
+    $widget_context_mode = 'search';
+elgg_set_context($widget_context_mode);
+
+if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+echo $widget_datas;
+?>
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/edit.php
new file mode 100644
index 000000000..e89a68304
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_blogs_index/edit.php
@@ -0,0 +1,85 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+	
+  	$site_categories = $vars['config']->site->categories; 
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>  
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/content.php
new file mode 100644
index 000000000..2622a63ea
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/content.php
@@ -0,0 +1,43 @@
+<?php 
+  
+  $object_type ='bookmarks';
+  
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+  
+  $widget_group = $vars["entity"]->widget_group;
+  if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+  
+  $site_categories = $vars['config']->site->categories;
+  $widget_categorie = $vars['entity']->widget_categorie;
+  $widget_context_mode = $vars['entity']->widget_context_mode;
+  if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+  elgg_set_context($widget_context_mode);
+  
+  if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+
+echo $widget_datas;
+?>        
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/edit.php
new file mode 100644
index 000000000..1a15cea49
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_bookmarks_index/edit.php
@@ -0,0 +1,85 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_events_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_events_index/content.php
new file mode 100644
index 000000000..7c5ae40f3
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_events_index/content.php
@@ -0,0 +1,95 @@
+<?php 
+	
+	require_once($CONFIG->pluginspath.'event_calendar/models/model.php');
+	
+	if(!function_exists('getLastDayOfMonth')){
+		function getLastDayOfMonth($month,$year) {
+			return idate('d', mktime(0, 0, 0, ($month + 1), 0, $year));
+		}
+	}
+
+	$object_type ='event_calendar';
+  
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items))
+	    $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+	if (!isset($widget_group))
+	    $widget_group = 0;
+	    
+	$mode = $vars['mode']->mode;
+	if (!isset($mode))
+	    $mode = "month";
+	
+	$site_categories = $vars['config']->site->categories;
+	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode))
+	    $widget_context_mode = 'search';
+	
+	elgg_set_context($widget_context_mode);
+	
+
+	$original_start_date = date('Y-m-d');
+	$day = 60*60*24;
+	$week = 7*$day;
+	$month = 31*$day;
+	
+
+	if ($mode == "day") {
+		$start_date = $original_start_date;
+		$end_date = $start_date;
+		$start_ts = strtotime($start_date);
+		$end_ts = strtotime($end_date)+$day-1;
+	} else if ($mode == "week") {
+
+		$start_ts = strtotime($original_start_date);
+		$start_ts -= date("w",$start_ts)*$day;
+		$end_ts = $start_ts + 6*$day;
+		
+		$start_date = date('Y-m-d',$start_ts);
+		$end_date = date('Y-m-d',$end_ts);
+	} else {
+		$start_ts = strtotime($original_start_date);
+		$month = date('m',$start_ts);
+		$year = date('Y',$start_ts);
+		$start_date = $year.'-'.$month.'-1';
+		$end_date = $year.'-'.$month.'-'.getLastDayOfMonth($month,$year);
+	}
+	
+	if ($event_calendar_first_date && ($start_date < $event_calendar_first_date)) {
+		$start_date = $event_calendar_first_date;
+	}
+	
+	if ($event_calendar_last_date && ($end_date > $event_calendar_last_date)) {
+		$end_date = $event_calendar_last_date;
+	}
+	
+	$start_ts = strtotime($start_date);
+	
+	if ($mode == "day") {
+		$end_ts = strtotime($end_date)+$day-1;
+	} else if ($mode == "week") {
+		$end_ts = $start_ts + 6*$day;
+	} else {
+		$end_ts = strtotime($end_date);
+	}
+	
+	$count = event_calendar_get_events_between($start_ts,$end_ts,true,$num_items,0,$widget_group,'-');
+	$events = event_calendar_get_events_between($start_ts,$end_ts,false,$num_items,0,$widget_group,'-');
+	//$widget_datas= $event_list = elgg_view_entity_list($events, $count, 0, $num_items, false, false);
+	
+	$options = array(
+			'list_class' => 'elgg-list-entity',
+			'full_view' => FALSE,
+			'pagination' => TRUE,
+			'list_type' => 'listing',
+			'list_type_toggle' => FALSE,
+			'offset' => $vars['offset'],
+			'limit' => $vars['limit'],
+		);
+	$widget_datas = elgg_view_entity_list($events, $options);
+	echo $widget_datas;
+?>
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_events_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_events_index/edit.php
new file mode 100644
index 000000000..3aa20f574
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_events_index/edit.php
@@ -0,0 +1,96 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('event_calendar:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[mode]', 
+      				 						'options_values'=>array('day'=>elgg_echo('event_calendar:day_label'), 
+												      				 'week'=>elgg_echo('event_calendar:week_label'),
+												      				 'month'=>elgg_echo('event_calendar:month_label')),
+      				  'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_files_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_files_index/content.php
new file mode 100644
index 000000000..b726efe70
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_files_index/content.php
@@ -0,0 +1,44 @@
+<?php 
+  
+  $object_type ='file';
+  
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+  
+  $widget_group = $vars["entity"]->widget_group;
+  if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+  
+
+  $site_categories = $vars['config']->site->categories;
+  $widget_categorie = $vars['entity']->widget_categorie;
+  $widget_context_mode = $vars['entity']->widget_context_mode;
+  if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+  elgg_set_context($widget_context_mode);
+    
+  if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+  
+	echo $widget_datas;
+?>        
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_files_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_files_index/edit.php
new file mode 100644
index 000000000..5625eca44
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_files_index/edit.php
@@ -0,0 +1,86 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      //$groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+	  $groups = elgg_get_entities(array('type'=>'group'));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_generic_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_generic_index/content.php
new file mode 100644
index 000000000..941b5ebeb
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_generic_index/content.php
@@ -0,0 +1,47 @@
+<?php
+
+$object_type = $vars["entity"]->widget_subtype;
+if (!isset($object_type))
+    $object_type  = 'ELGG_ENTITIES_ANY_VALUE';
+	
+$num_items = $vars['entity']->num_items;
+if (!isset($num_items))
+    $num_items = 10;
+
+$widget_group = $vars["entity"]->widget_group;
+if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+
+$site_categories = $vars['config']->site->categories;
+$widget_categorie = $vars['entity']->widget_categorie;
+$widget_context_mode = $vars['entity']->widget_context_mode;
+if (!isset($widget_context_mode))
+    $widget_context_mode = 'search';
+elgg_set_context($widget_context_mode);
+
+if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+
+echo $widget_datas;
+?>
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_generic_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_generic_index/edit.php
new file mode 100644
index 000000000..f7584a847
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_generic_index/edit.php
@@ -0,0 +1,103 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	$widget_subtype = $vars["entity"]->widget_subtype;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_subtype'); ?>
+      : 
+      <?php
+
+	  $subtypes = get_data("SELECT subtype from {$CONFIG->dbprefix}entity_subtypes");
+      $subtype_list = array();
+      if ($subtypes) {
+          foreach ($subtypes as $data) {
+              $subtype_list[$data->subtype] = $data->subtype;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_subtype]', 'options_values'=>$subtype_list, 'value'=>$widget_subtype));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      //$groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+	  $groups = elgg_get_entities(array('type'=>'group'));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+	  
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_groups_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_groups_index/content.php
new file mode 100644
index 000000000..0557f874e
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_groups_index/content.php
@@ -0,0 +1,21 @@
+<?php
+ 
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+ 
+  $widget_context_mode = $vars['entity']->widget_context_mode;
+  if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+  elgg_set_context($widget_context_mode);
+ 
+  $widget_datas = elgg_list_entities(array(
+		'type'=>'group',
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+	
+   
+
+echo $widget_datas;
+?>       
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_groups_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_groups_index/edit.php
new file mode 100644
index 000000000..71f7d6be8
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_groups_index/edit.php
@@ -0,0 +1,63 @@
+<?php
+    $num_items = $vars['entity']->num_items;
+    if (!isset($num_items)) $num_items = 10;
+   
+    $widget_title = $vars['entity']->widget_title;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+    echo elgg_view('input/text', array(
+            'name' => 'params[widget_title]',                       
+            'value' => $widget_title
+        ));
+    ?>
+  </p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+   
+<?php
+    echo elgg_view('input/dropdown', array(
+            'name' => 'params[num_items]',
+            'options_values' => array( '1' => '1',
+                                       '3' => '3',
+                                        '5' => '5',
+                                       '8' => '8',
+                                       '10' => '10',
+                                       '12' => '12',
+                                       '15' => '15',
+                                       '20' => '20',
+                                       '30' => '30',
+                                       '40' => '40',
+                                       '50' => '50',
+                                       '100' => '100',
+                                     ),
+            'value' => $num_items
+        ));
+?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/content.php
new file mode 100644
index 000000000..22b15b37c
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/content.php
@@ -0,0 +1,50 @@
+<?php
+$object_type = 'izap_videos';
+
+$num_items = $vars['entity']->num_items;
+if (!isset($num_items))
+    $num_items = 10;
+
+$widget_group = $vars["entity"]->widget_group;
+if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+
+$site_categories = $vars['config']->site->categories;
+$widget_categorie = $vars['entity']->widget_categorie;
+$widget_context_mode = $vars['entity']->widget_context_mode;
+if (!isset($widget_context_mode))
+    $widget_context_mode = 'search';
+elgg_set_context($widget_context_mode);
+
+if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+?>
+<div class="contentWrapper">
+    <?php
+    if (isset($widget_datas)) {
+        echo $widget_datas;
+    }
+    ?>
+    <div class="clearfloat">
+    </div>
+</div>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/edit.php
new file mode 100644
index 000000000..54c41e1a9
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_izap_videos_index/edit.php
@@ -0,0 +1,86 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_members_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_members_index/content.php
new file mode 100644
index 000000000..c4f95a77d
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_members_index/content.php
@@ -0,0 +1,20 @@
+<?php 
+  
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+  $display_avatar = $vars['entity']->display_avatar;
+  if (!isset($display_avatar)) $display_avatar = 'yes';
+  
+  $widget_datas = elgg_list_entities_from_metadata(array(
+	'metadata_names' => 'icontime',
+	'types' => 'user',
+	'limit' => $num_items,
+	'full_view' => false,
+	'pagination' => false,
+	'size' => 'small',
+	));
+
+echo $widget_datas;
+?>        
+
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_members_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_members_index/edit.php
new file mode 100644
index 000000000..856d5ed0b
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_members_index/edit.php
@@ -0,0 +1,79 @@
+<?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$display_avatar = $vars['entity']->display_avatar;
+	if (!isset($display_avatar)) $display_avatar = 'yes';
+	
+	$widget_title = $vars['entity']->widget_title;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+
+
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_title]',                        
+			'value' => $widget_title
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+	
+<?php
+	echo elgg_view('input/dropdown', array(
+			'name' => 'params[num_items]',
+			'options_values' => array( 
+			                           '7' => '7',
+			                           '14' => '14',
+									   '21' => '21',
+			                           '28' => '28',
+			                           '35' => '35',
+			                           '42' => '42',
+			                           '49' => '49',
+			                           '56' => '56',
+			                           '100' => '100',
+			                         ),
+			'value' => $num_items
+		));
+?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:display_avatar'); ?>
+	
+<?php
+	echo elgg_view('input/dropdown', array(
+			'name' => 'params[display_avatar]',
+			'options_values' => array( 'yes' => 'yes',
+									   'no' => 'no',
+                                 	   
+			                         ),
+			'value' => $display_avatar
+		));
+?>
+</p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_news_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_news_index/content.php
new file mode 100644
index 000000000..8a10093b1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_news_index/content.php
@@ -0,0 +1,47 @@
+<?php 
+  
+  $object_type ='news';
+  
+  $num_items = $vars['entity']->num_items;
+	if (!isset($num_items))
+	    $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+	if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+	
+	$site_categories = $vars['config']->site->categories;
+	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode))
+	    $widget_context_mode = 'search';
+	elgg_set_context($widget_context_mode);
+  
+	if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+
+echo $widget_datas;
+?>        
+
+
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_news_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_news_index/edit.php
new file mode 100644
index 000000000..063b5ddc1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_news_index/edit.php
@@ -0,0 +1,85 @@
+<?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+    <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_pages_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_pages_index/content.php
new file mode 100644
index 000000000..cc8a46d55
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_pages_index/content.php
@@ -0,0 +1,45 @@
+<?php 
+  
+  $object_type ='page_top';
+  
+  $num_items = $vars['entity']->num_items;
+	if (!isset($num_items))
+	    $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+	if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+	
+	$site_categories = $vars['config']->site->categories;
+	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode))
+	    $widget_context_mode = 'search';
+	elgg_set_context($widget_context_mode);
+  
+	if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+
+echo $widget_datas;
+?>        
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_pages_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_pages_index/edit.php
new file mode 100644
index 000000000..a14371b02
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_pages_index/edit.php
@@ -0,0 +1,86 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      //$groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+	  $groups = elgg_get_entities(array('type'=>'group'));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+   </p>
+   <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+   </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_photos_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_photos_index/content.php
new file mode 100644
index 000000000..bb83cac40
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_photos_index/content.php
@@ -0,0 +1,25 @@
+<div class="contentWrapper"> 
+<?php
+
+	$num_items = $vars['entity']->num_items;
+  	if (!isset($num_items)) $num_items = 10;
+  
+  	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+	
+	if ($widget_group != 0){
+		$album = elgg_get_entities("object", 'album', $widget_group, "", 1, 0, false);
+		$album_guid = $album[0]->getGUID();
+		$entities = elgg_get_entities("object", "image", $album_guid, '', 999);
+		elgg_set_context('front');
+		$widgetdatas = elgg_view_entity_list($entities);
+	}else{
+		$widgetdatas = tp_get_latest_photos($num_items, 0);
+	}
+
+	echo '<div class="icon_latest">';
+	echo $widgetdatas;
+	echo '</div>';
+
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_photos_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_photos_index/edit.php
new file mode 100644
index 000000000..0ef5e53a1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_photos_index/edit.php
@@ -0,0 +1,64 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/content.php
new file mode 100644
index 000000000..1f06a0db1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/content.php
@@ -0,0 +1,45 @@
+<?php 
+  
+  $object_type ='task_top';
+  
+  $num_items = $vars['entity']->num_items;
+  if (!isset($num_items)) $num_items = 10;
+  
+  $widget_group = $vars["entity"]->widget_group;
+  if (!isset($widget_group)) $widget_group = ELGG_ENTITIES_ANY_VALUE;
+  
+  $site_categories = $vars['config']->site->categories;
+  $widget_categorie = $vars['entity']->widget_categorie;
+  $widget_context_mode = $vars['entity']->widget_context_mode;
+  if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+  elgg_set_context($widget_context_mode);
+  
+  if ($site_categories == NULL || $widget_categorie == NULL) {
+    $widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+} else {
+
+	$widget_datas = elgg_list_entities_from_metadata(array(
+		'type'=>'object',
+		'subtype'=>$object_type,
+		'container_guids' => $widget_group,
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false,
+		'metadata_name' => 'universal_categories',
+		'metadata_value' => $widget_categorie,
+		));
+}
+
+echo $widget_datas;
+?>        
+
+
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/edit.php
new file mode 100644
index 000000000..c587bc184
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_tasks_index/edit.php
@@ -0,0 +1,85 @@
+  <?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_group = $vars["entity"]->widget_group;
+  	if (!isset($widget_group)) $widget_group = 0;
+	
+  	$site_categories = $vars['config']->site->categories;
+  	$widget_categorie = $vars['entity']->widget_categorie;
+	$widget_context_mode = $vars['entity']->widget_context_mode;
+	if (!isset($widget_context_mode)) $widget_context_mode = 'search';
+	
+	$widget_title = $vars['entity']->widget_title;
+	$widget_group = $vars["entity"]->widget_group;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+  ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>
+      :
+      <?php
+      echo elgg_view('input/text', array('name'=>'params[widget_title]', 'value'=>$widget_title));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('group'); ?>
+      : 
+      <?php
+      $groups = elgg_get_entities(array("type"=>'group','limit'=>100));
+      $group_list = array();
+      $group_list[0] = elgg_echo('custom_index_widgets:widget_all_groups');
+      if ($groups) {
+          foreach ($groups as $group) {
+              $group_list[$group->getGUID()] = $group->name;
+          }
+      }
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_group]', 'options_values'=>$group_list, 'value'=>$widget_group));
+      ?>
+  </p>
+  <?php if ($site_categories != NULL) { ?>
+  <p>
+      <?php echo elgg_echo('categories'); ?>
+      : 
+      <?php
+      $categories_with_empty_choice = array_merge(array('-1'=>''), array_combine($site_categories, $site_categories));
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_categorie]', 'options_values'=>$categories_with_empty_choice, 'value'=>$widget_categorie));
+      ?>
+  </p>
+  <?php } ?>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:context_mode'); ?>
+      : 
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[widget_context_mode]', 'options_values'=>array('search'=>elgg_echo('custom_index_widgets:context_list'), 'detail'=>elgg_echo('custom_index_widgets:context_detail')), 'value'=>$widget_context_mode));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:num_items'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[num_items]', 'options_values'=>array('1'=>'1', '3'=>'3', '5'=>'5', '8'=>'8', '10'=>'10', '12'=>'12', '15'=>'15', '20'=>'20', '30'=>'30', '40'=>'40', '50'=>'50', '100'=>'100', ), 'value'=>$num_items));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_wire_index/content.php b/mod/custom_index_widgets/views/default/widgets/latest_wire_index/content.php
new file mode 100644
index 000000000..98d3b43e1
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_wire_index/content.php
@@ -0,0 +1,17 @@
+<?php 
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	elgg_set_context('search');
+ 	
+	$widget_datas = elgg_list_entities(array(
+		'type'=>'object',
+		'subtype'=>'thewire',
+		'limit'=>$num_items,
+		'full_view' => false,
+		'view_type_toggle' => false,
+		'pagination' => false));
+	
+	echo $widget_datas;
+?>
+
+
diff --git a/mod/custom_index_widgets/views/default/widgets/latest_wire_index/edit.php b/mod/custom_index_widgets/views/default/widgets/latest_wire_index/edit.php
new file mode 100644
index 000000000..d08066648
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/latest_wire_index/edit.php
@@ -0,0 +1,62 @@
+<?php
+	$num_items = $vars['entity']->num_items;
+	if (!isset($num_items)) $num_items = 10;
+	
+	$widget_title = $vars['entity']->widget_title;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_title]',                        
+			'value' => $widget_title
+		));
+	?>
+  </p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:num_items'); ?>	
+<?php
+	echo elgg_view('input/dropdown', array(
+			'name' => 'params[num_items]',
+			'options_values' => array( '1' => '1',
+									   '3' => '3',
+                                 	   '5' => '5',
+			                           '8' => '8',
+			                           '10' => '10',
+			                           '12' => '12',
+			                           '15' => '15',
+			                           '20' => '20',
+			                           '30' => '30',
+			                           '40' => '40',
+			                           '50' => '50',
+			                           '100' => '100',
+			                         ),
+			'value' => $num_items
+		));
+?>
+</p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
diff --git a/mod/custom_index_widgets/views/default/widgets/login_index/content.php b/mod/custom_index_widgets/views/default/widgets/login_index/content.php
new file mode 100644
index 000000000..1e82df544
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/login_index/content.php
@@ -0,0 +1,15 @@
+<?php 
+  
+if (elgg_is_logged_in()) {
+	$top_box = "<h2>" . elgg_echo("welcome") . " ";
+	$top_box .= elgg_get_logged_in_user_entity()->name;
+	$top_box .= "</h2>";
+} else {
+	$top_box = elgg_view("core/account/login_box");
+}
+
+echo $top_box;
+?>        
+
+
+
diff --git a/mod/custom_index_widgets/views/default/widgets/login_index/edit.php b/mod/custom_index_widgets/views/default/widgets/login_index/edit.php
new file mode 100644
index 000000000..149008323
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/login_index/edit.php
@@ -0,0 +1,27 @@
+<?php 
+	$widget_title = $vars['entity']->widget_title;
+	
+	$show_welcome = $vars['entity']->show_welcome;
+	if (!isset($show_welcome)) $show_welcome = "yes";
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_title]',                        
+			'value' => $widget_title
+		));
+	?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+</p>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/rich_media_index/content.php b/mod/custom_index_widgets/views/default/widgets/rich_media_index/content.php
new file mode 100644
index 000000000..dddc32bd7
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/rich_media_index/content.php
@@ -0,0 +1,27 @@
+<?php
+	
+	$widget_video_width = $vars['entity']->widget_video_width;
+	$widget_video_height = $vars['entity']->widget_video_height;
+	$widget_video_url = $vars['entity']->widget_video_url;
+	$widget_video_caption = $vars['entity']->widget_video_caption;
+	
+	if (!isset($widget_video_width)){
+		$widget_video_width = '250';
+	}
+	if (!isset($widget_video_height)){
+		$widget_video_height = '250';
+	}
+
+?>
+
+<div class="contentWrapper" align="center">
+	  <a id="media<?php echo $vars['entity']->getGUID();?>" class="media" href="<?php echo $widget_video_url;?>"><?php echo $widget_video_title;?></a>    <div class="clearfloat">
+    </div>
+</div>
+<?php if (isset($widget_video_url)) { ?>
+<script type="text/javascript">
+    jQuery(document).ready(function($){
+        $('#media<?php echo $vars['entity']->getGUID();?>').media({width:<?php echo $widget_video_width;?>, height:<?php echo $widget_video_height;?>, autoplay: true});
+    });
+</script>
+<?php } ?>
+\ No newline at end of file
diff --git a/mod/custom_index_widgets/views/default/widgets/rich_media_index/edit.php b/mod/custom_index_widgets/views/default/widgets/rich_media_index/edit.php
new file mode 100644
index 000000000..a3956159c
--- /dev/null
+++ b/mod/custom_index_widgets/views/default/widgets/rich_media_index/edit.php
@@ -0,0 +1,78 @@
+<?php 
+	$widget_title = $vars['entity']->widget_title;
+	$widget_video_width = $vars['entity']->widget_video_width;
+	$widget_video_height = $vars['entity']->widget_video_height;
+	$widget_video_url = $vars['entity']->widget_video_url;
+	$widget_video_title = $vars['entity']->widget_video_title;
+	
+	$guest_only = $vars['entity']->guest_only;
+	if (!isset($guest_only)) $guest_only = "no";
+	
+	$box_style = $vars['entity']->box_style;
+	if (!isset($box_style)) $box_style = "collapsable";
+	
+?>
+<p>
+  <?php echo elgg_echo('custom_index_widgets:widget_title'); ?>:
+  <?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_title]',                        
+			'value' => $widget_title
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:widget_video_caption'); ?>	
+<?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_video_caption]',                        
+			'value' => $widget_video_caption
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:widget_video_url'); ?>	
+<?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_video_url]',                        
+			'value' => $widget_video_url
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:widget_video_width'); ?>	
+<?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_video_width]',                        
+			'value' => $widget_video_width
+		));
+	?>
+</p>
+<p>
+<?php echo elgg_echo('custom_index_widgets:widget_video_height'); ?>	
+<?php
+	echo elgg_view('input/text', array(
+			'name' => 'params[widget_video_height]',                        
+			'value' => $widget_video_height
+		));
+	?>
+</p>
+<p>
+      <?php echo elgg_echo('custom_index_widgets:box_style'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[box_style]', 
+      										 'options_values'=>array('plain'=>'Plain', 'plain collapsable'=>'Plain and collapsable', 'collapsable'=>'Collapsable', 'standard' => 'No Collapsable'),
+       										 'value'=>$box_style));
+      ?>
+  </p>
+  <p>
+      <?php echo elgg_echo('custom_index_widgets:guest_only'); ?>
+      :
+      <?php
+      echo elgg_view('input/dropdown', array('name'=>'params[guest_only]', 
+      										 'options_values'=>array('yes'=>'yes', 'no'=>'no'),
+       										 'value'=>$guest_only));
+      ?>
+  </p>
+
diff --git a/mod/dashboard/languages/en.php b/mod/dashboard/languages/en.php
new file mode 100644
index 000000000..e1378f2f1
--- /dev/null
+++ b/mod/dashboard/languages/en.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * User dashboard languages
+ */
+
+$english = array(
+	'dashboard:widget:group:title' => 'Group activity',
+	'dashboard:widget:group:desc' => 'View the activity in one of your groups',
+	'dashboard:widget:group:select' => 'Select a group',
+	'dashboard:widget:group:noactivity' => 'There is no activity in this group',
+	'dashboard:widget:group:noselect' => 'Edit this widget to select a group',
+);
+
+add_translation("en", $english);
diff --git a/mod/dashboard/manifest.xml b/mod/dashboard/manifest.xml
new file mode 100644
index 000000000..cbbc1044c
--- /dev/null
+++ b/mod/dashboard/manifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>User Dashboard</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<description>A widget-based dashboard for your users</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/dashboard/start.php b/mod/dashboard/start.php
new file mode 100644
index 000000000..65007d1a8
--- /dev/null
+++ b/mod/dashboard/start.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * A user dashboard
+ */
+
+elgg_register_event_handler('init', 'system', 'dashboard_init');
+
+function dashboard_init() {
+	elgg_register_page_handler('dashboard', 'dashboard_page_handler');
+
+	elgg_extend_view('css/elgg', 'dashboard/css');
+
+	elgg_register_menu_item('topbar', array(
+		'name' => 'dashboard',
+		'href' => 'dashboard',
+		'text' => elgg_view_icon('home') . elgg_echo('dashboard'),
+		'priority' => 450,
+		'section' => 'alt',
+	));
+
+	elgg_register_widget_type(
+			'group_activity',
+			elgg_echo('dashboard:widget:group:title'),
+			elgg_echo('dashboard:widget:group:desc'),
+			'dashboard',
+			true
+	);
+
+	elgg_register_plugin_hook_handler('get_list', 'default_widgets', 'dashboard_default_widgets');
+}
+
+/**
+ * Dashboard page handler
+ * @return bool
+ */
+function dashboard_page_handler() {
+	// Ensure that only logged-in users can see this page
+	gatekeeper();
+
+	// Set context and title
+	elgg_set_context('dashboard');
+	elgg_set_page_owner_guid(elgg_get_logged_in_user_guid());
+	$title = elgg_echo('dashboard');
+
+	// wrap intro message in a div
+	$intro_message = elgg_view('dashboard/blurb');
+
+	$params = array(
+		'content' => $intro_message,
+		'num_columns' => 3,
+		'show_access' => false,
+	);
+	$widgets = elgg_view_layout('widgets', $params);
+
+	$body = elgg_view_layout('one_column', array('content' => $widgets));
+
+	echo elgg_view_page($title, $body);
+	return true;
+}
+
+
+/**
+ * Register user dashboard with default widgets
+ *
+ * @param unknown_type $hook
+ * @param unknown_type $type
+ * @param unknown_type $return
+ * @param unknown_type $params
+ * @return array
+ */
+function dashboard_default_widgets($hook, $type, $return, $params) {
+	$return[] = array(
+		'name' => elgg_echo('dashboard'),
+		'widget_context' => 'dashboard',
+		'widget_columns' => 3,
+
+		'event' => 'create',
+		'entity_type' => 'user',
+		'entity_subtype' => ELGG_ENTITIES_ANY_VALUE,
+	);
+
+	return $return;
+}
+\ No newline at end of file
diff --git a/mod/dashboard/views/default/dashboard/blurb.php b/mod/dashboard/views/default/dashboard/blurb.php
new file mode 100644
index 000000000..9293e513a
--- /dev/null
+++ b/mod/dashboard/views/default/dashboard/blurb.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Elgg dashboard blurb
+ *
+ */
+?>
+
+<div class="elgg-col elgg-col-2of3">
+<?php 
+	echo elgg_view('output/longtext', array(
+		'id' => 'dashboard-info',
+		'class' => 'elgg-inner pam mhs mtn',
+		'value' => elgg_echo("dashboard:nowidgets"),
+	));
+
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/dashboard/views/default/dashboard/css.php b/mod/dashboard/views/default/dashboard/css.php
new file mode 100644
index 000000000..f49293293
--- /dev/null
+++ b/mod/dashboard/views/default/dashboard/css.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * User dashboard CSS
+ */
+?>
+
+#dashboard-info {
+	border: 2px solid #dedede;
+	margin-bottom: 15px;
+}
diff --git a/mod/dashboard/views/default/widgets/group_activity/content.php b/mod/dashboard/views/default/widgets/group_activity/content.php
new file mode 100644
index 000000000..60a9b352c
--- /dev/null
+++ b/mod/dashboard/views/default/widgets/group_activity/content.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Group activity widget
+ */
+
+$num = (int) $vars['entity']->num_display;
+$guid = $vars['entity']->group_guid;
+
+$content = '';
+
+if ($guid) {
+	$title = get_entity($guid)->name;
+	$content = "<h3>$title</h3>";
+
+	elgg_push_context('widgets');
+	$db_prefix = elgg_get_config('dbprefix');
+	$activity = elgg_list_river(array(
+		'limit' => $num,
+		'pagination' => false,
+		'joins' => array("JOIN {$db_prefix}entities e1 ON e1.guid = rv.object_guid"),
+		'wheres' => array("(e1.container_guid = $guid)"),
+	));
+	if (!$activity) {
+		$activity = '<p>' . elgg_echo('dashboard:widget:group:noactivity') . '</p>';
+	}
+	elgg_pop_context();
+
+	$content .= $activity;
+} else {
+	// no group selected yet
+	if ($vars['entity']->canEdit()) {
+		$content = '<p>' . elgg_echo('dashboard:widget:group:noselect') . '</p>';
+	}
+}
+
+echo $content;
diff --git a/mod/dashboard/views/default/widgets/group_activity/edit.php b/mod/dashboard/views/default/widgets/group_activity/edit.php
new file mode 100644
index 000000000..4e10f6ad4
--- /dev/null
+++ b/mod/dashboard/views/default/widgets/group_activity/edit.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Group activity widget settings
+ */
+
+// once autocomplete is working use that
+$groups = elgg_get_logged_in_user_entity()->getGroups("", 0);
+$mygroups = array();
+if (!$vars['entity']->group_guid) {
+	$mygroups[0] = '';
+}
+foreach ($groups as $group) {
+	$mygroups[$group->guid] = $group->name;
+}
+$params = array(
+	'name' => 'params[group_guid]',
+	'value' => $vars['entity']->group_guid,
+	'options_values' => $mygroups,
+);
+$group_dropdown = elgg_view('input/dropdown', $params);
+?>
+<div>
+	<?php echo elgg_echo('dashboard:widget:group:select'); ?>:
+	<?php echo $group_dropdown; ?>
+</div>
+<?php
+
+// set default value for number to display
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 8;
+}
+
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(5, 8, 10, 12, 15, 20),
+);
+$num_dropdown = elgg_view('input/dropdown', $params);
+
+?>
+<div>
+	<?php echo elgg_echo('widget:numbertodisplay'); ?>:
+	<?php echo $num_dropdown; ?>
+</div>
+
diff --git a/mod/developers/actions/developers/inspect.php b/mod/developers/actions/developers/inspect.php
new file mode 100644
index 000000000..6fd9e90f9
--- /dev/null
+++ b/mod/developers/actions/developers/inspect.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * Ajax endpoint for inspection
+ *
+ */
+
+$inspect_type = get_input('inspect_type');
+$method = 'get' . str_replace(' ', '', $inspect_type);
+
+$inspector = new ElggInspector();
+if ($inspector && method_exists($inspector, $method)) {
+	$tree = $inspector->$method();
+	echo elgg_view('developers/tree', array('tree' => $tree));
+} else {
+	echo 'error';
+}
diff --git a/mod/developers/actions/developers/settings.php b/mod/developers/actions/developers/settings.php
new file mode 100644
index 000000000..7c91e2f5f
--- /dev/null
+++ b/mod/developers/actions/developers/settings.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Save the developer settings
+ */
+
+$site = elgg_get_site_entity();
+
+if (get_input('simple_cache')) {
+	elgg_enable_simplecache();
+} else {
+	elgg_disable_simplecache();
+}
+
+if (get_input('system_cache')) {
+	elgg_enable_system_cache();
+} else {
+	elgg_disable_system_cache();
+}
+
+$debug = get_input('debug_level');
+if ($debug) {
+	set_config('debug', $debug, $site->getGUID());
+} else {
+	unset_config('debug', $site->getGUID());
+}
+
+$simple_settings = array('display_errors', 'screen_log', 'show_strings',
+	'wrap_views', 'log_events',);
+foreach ($simple_settings as $setting) {
+	elgg_set_plugin_setting($setting, get_input($setting), 'developers');
+}
+
+system_message(elgg_echo('developers:settings:success'));
+
+forward(REFERER);
diff --git a/mod/developers/classes/ElggInspector.php b/mod/developers/classes/ElggInspector.php
new file mode 100644
index 000000000..e83fc6b81
--- /dev/null
+++ b/mod/developers/classes/ElggInspector.php
@@ -0,0 +1,201 @@
+<?php
+/**
+ * Inspect Elgg variables
+ *
+ */
+
+class ElggInspector {
+
+	/**
+	 * Get Elgg event information
+	 *
+	 * returns [event,type] => array(handlers)
+	 */
+	public function getEvents() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->events as $event => $types) {
+			foreach ($types as $type => $handlers) {
+				$tree[$event . ',' . $type] = array_values($handlers);
+			}
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg plugin hooks information
+	 *
+	 * returns [hook,type] => array(handlers)
+	 */
+	public function getPluginHooks() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->hooks as $hook => $types) {
+			foreach ($types as $type => $handlers) {
+				$tree[$hook . ',' . $type] = array_values($handlers);
+			}
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg view information
+	 *
+	 * returns [view] => array(view location and extensions)
+	 */
+	public function getViews() {
+		global $CONFIG;
+
+		$coreViews = $this->recurseFileTree($CONFIG->viewpath . "default/");
+
+		// remove base path and php extension
+		array_walk($coreViews, create_function('&$v,$k', 'global $CONFIG; $v = substr($v, strlen($CONFIG->viewpath . "default/"), -4);'));
+
+		// setup views array before adding extensions and plugin views
+		$views = array();
+		foreach ($coreViews as $view) {
+			$views[$view] = array($CONFIG->viewpath . "default/" . $view . ".php");
+		}
+
+		// add plugins and handle overrides
+		foreach ($CONFIG->views->locations['default'] as $view => $location) {
+			$views[$view] = array($location . $view . ".php");
+		}
+
+		// now extensions
+		foreach ($CONFIG->views->extensions as $view => $extensions) {
+			$view_list = array();
+			foreach ($extensions as $priority => $ext_view) {
+				if (isset($views[$ext_view])) {
+					$view_list[] = $views[$ext_view][0];
+				}
+			}
+			if (count($view_list) > 0) {
+				$views[$view] = $view_list;
+			}
+		}
+
+		ksort($views);
+
+		return $views;
+	}
+
+	/**
+	 * Get Elgg widget information
+	 *
+	 * returns [widget] => array(name, contexts)
+	 */
+	public function getWidgets() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->widgets->handlers as $handler => $handler_obj) {
+			$tree[$handler] = array($handler_obj->name, implode(',', array_values($handler_obj->context)));
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+
+	/**
+	 * Get Elgg actions information
+	 *
+	 * returns [action] => array(file, public, admin)
+	 */
+	public function getActions() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->actions as $action => $info) {
+			$tree[$action] = array($info['file'], ($info['public']) ? 'public' : 'logged in only', ($info['admin']) ? 'admin only' : 'non-admin');
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get simplecache information
+	 *
+	 * returns [views]
+	 */
+	public function getSimpleCache() {
+		global $CONFIG;
+
+		$tree = array();
+		foreach ($CONFIG->views->simplecache as $view) {
+			$tree[$view] = "";
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Get Elgg web services API methods
+	 *
+	 * returns [method] => array(function, parameters, call_method, api auth, user auth)
+	 */
+	public function getWebServices() {
+		global $API_METHODS;
+
+		$tree = array();
+		foreach ($API_METHODS as $method => $info) {
+			$params = implode(', ', array_keys($info['parameters']));
+			if (!$params) {
+				$params = 'none';
+			}
+			$tree[$method] = array(
+				$info['function'],
+				"params: $params",
+				$info['call_method'],
+				($info['require_api_auth']) ? 'API authentication required' : 'No API authentication required',
+			 	($info['require_user_auth']) ? 'User authentication required' : 'No user authentication required',
+			);
+		}
+
+		ksort($tree);
+
+		return $tree;
+	}
+
+	/**
+	 * Create array of all php files in directory and subdirectories
+	 *
+	 * @param $dir full path to directory to begin search
+	 * @return array of every php file in $dir or below in file tree
+	 */
+	protected function recurseFileTree($dir) {
+		$view_list = array();
+
+		$handle = opendir($dir);
+		while ($file = readdir($handle)) {
+			if ($file[0] == '.') {
+
+			} else if (is_dir($dir . $file)) {
+				$view_list = array_merge($view_list, $this->recurseFileTree($dir . $file. "/"));
+			} else {
+				$extension = strrchr(trim($file, "/"), '.');
+				if ($extension === ".php") {
+					$view_list[] = $dir . $file;
+				}
+			}
+		}
+		closedir($handle);
+
+		return $view_list;
+	}
+
+}
diff --git a/mod/developers/classes/ElggLogCache.php b/mod/developers/classes/ElggLogCache.php
new file mode 100644
index 000000000..5bd4bce28
--- /dev/null
+++ b/mod/developers/classes/ElggLogCache.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Cache logging information for later display
+ *
+ */
+
+class ElggLogCache {
+	protected $cache;
+
+	public function __construct() {
+		$this->cache = array();
+	}
+
+	/**
+	 * Insert into cache
+	 * 
+	 * @param mixed $data The log data to cache
+	 */
+	public function insert($data) {
+		$this->cache[] = $data;
+	}
+
+	/**
+	 * Insert into cache from plugin hook
+	 * 
+	 * @param string $hook
+	 * @param string $type
+	 * @param bool   $result 
+	 * @param array  $params Must have the data at $params['msg']
+	 */
+	public function insertDump($hook, $type, $result, $params) {
+		$this->insert($params['msg']);
+		return false;
+	}
+
+	/**
+	 * Get the cache
+	 *
+	 * @return array
+	 */
+	public function get() {
+		return $this->cache;
+	}
+}
diff --git a/mod/developers/languages/en.php b/mod/developers/languages/en.php
new file mode 100644
index 000000000..266b5406e
--- /dev/null
+++ b/mod/developers/languages/en.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Elgg developer tools English language file.
+ *
+ */
+
+$english = array(
+	// menu
+	'admin:develop_tools' => 'Tools',
+	'admin:develop_tools:preview' => 'Theming Sandbox',
+	'admin:develop_tools:inspect' => 'Inspect',
+	'admin:develop_tools:unit_tests' => 'Unit Tests',
+	'admin:developers' => 'Developers',
+	'admin:developers:settings' => 'Settings',
+
+	// settings
+	'elgg_dev_tools:settings:explanation' => 'Control your development and debugging settings below. Some of these settings are also available on other admin pages.',
+	'developers:label:simple_cache' => 'Use simple cache',
+	'developers:help:simple_cache' => 'Turn off this cache when developing. Otherwise, changes to your CSS and JavaScript will be ignored.',
+	'developers:label:system_cache' => 'Use system cache',
+	'developers:help:system_cache' => 'Turn this off when developing. Otherwise, changes in your plugins will not be registered.',
+	'developers:label:debug_level' => "Trace level",
+	'developers:help:debug_level' => "This controls the amount of information logged. See elgg_log() for more information.",
+	'developers:label:display_errors' => 'Display fatal PHP errors',
+	'developers:help:display_errors' => "By default, Elgg's .htaccess file supresses the display of fatal errors.",
+	'developers:label:screen_log' => "Log to the screen",
+	'developers:help:screen_log' => "This displays elgg_log() and elgg_dump() output on the web page.",
+	'developers:label:show_strings' => "Show raw translation strings",
+	'developers:help:show_strings' => "This displays the translation strings used by elgg_echo().",
+	'developers:label:wrap_views' => "Wrap views",
+	'developers:help:wrap_views' => "This wraps almost every view with HTML comments. Useful for finding the view creating particular HTML.
+									This can break non-HTML views in the default viewtype. See developers_wrap_views() for details.",
+	'developers:label:log_events' => "Log events and plugin hooks",
+	'developers:help:log_events' => "Write events and plugin hooks to the log. Warning: there are many of these per page.",
+
+	'developers:debug:off' => 'Off',
+	'developers:debug:error' => 'Error',
+	'developers:debug:warning' => 'Warning',
+	'developers:debug:notice' => 'Notice',
+	
+	// inspection
+	'developers:inspect:help' => 'Inspect configuration of the Elgg framework.',
+
+	// event logging
+	'developers:event_log_msg' => "%s: '%s, %s' in %s",
+
+	// theme preview
+	'theme_preview:general' => 'Introduction',
+	'theme_preview:breakout' => 'Break out of iframe',
+	'theme_preview:buttons' => 'Buttons',
+	'theme_preview:components' => 'Components',
+	'theme_preview:forms' => 'Forms',
+	'theme_preview:grid' => 'Grid',
+	'theme_preview:icons' => 'Icons',
+	'theme_preview:modules' => 'Modules',
+	'theme_preview:navigation' => 'Navigation',
+	'theme_preview:typography' => 'Typography',
+	'theme_preview:miscellaneous' => 'Miscellaneous',
+
+	// unit tests
+	'developers:unit_tests:description' => 'Elgg has unit and integration tests for detecting bugs in its core classes and functions.',
+	'developers:unit_tests:warning' => 'Warning: Do Not Run These Tests on a Production Site. They can corrupt your database.',
+	'developers:unit_tests:run' => 'Run',
+
+	// status messages
+	'developers:settings:success' => 'Settings saved',
+);
+
+add_translation('en', $english);
diff --git a/mod/developers/manifest.xml b/mod/developers/manifest.xml
new file mode 100644
index 000000000..23e726e2b
--- /dev/null
+++ b/mod/developers/manifest.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Elgg Developer Tools</name>
+	<author>Core developers</author>
+	<version>1.0</version>
+	<category>bundled</category>
+	<category>development</category>
+	<blurb>Developer tools for Elgg</blurb>
+	<description>A set of tools for writing plugins and themes. It is recommended that you have this plugin at the top of the plugin list.</description>
+	<website>http://www.elgg.org/</website>
+	<bugtracker>https://github.com/Elgg/Elgg/issues</bugtracker>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/developers/start.php b/mod/developers/start.php
new file mode 100644
index 000000000..94d0f652c
--- /dev/null
+++ b/mod/developers/start.php
@@ -0,0 +1,209 @@
+<?php
+/**
+ * Elgg developer tools
+ */
+
+// we want to run this as soon as possible - other plugins should not need to do this
+developers_process_settings();
+
+elgg_register_event_handler('init', 'system', 'developers_init');
+
+function developers_init() {
+	elgg_register_event_handler('pagesetup', 'system', 'developers_setup_menu');
+
+	elgg_extend_view('css/admin', 'developers/css');
+	elgg_extend_view('css/elgg', 'developers/css');
+
+	elgg_register_page_handler('theme_preview', 'developers_theme_preview_controller');
+
+	$action_base = elgg_get_plugins_path() . 'developers/actions/developers';
+	elgg_register_action('developers/settings', "$action_base/settings.php", 'admin');
+	elgg_register_action('developers/inspect', "$action_base/inspect.php", 'admin');
+
+	elgg_register_js('jquery.jstree', 'mod/developers/vendors/jsTree/jquery.jstree.js', 'footer');
+	elgg_register_css('jquery.jstree', 'mod/developers/vendors/jsTree/themes/default/style.css');
+
+	elgg_load_js('jquery.form');
+
+	elgg_register_js('elgg.dev', 'js/developers/developers.js', 'footer');
+	elgg_load_js('elgg.dev');
+}
+
+function developers_process_settings() {
+	if (elgg_get_plugin_setting('display_errors', 'developers') == 1) {
+		ini_set('display_errors', 1);
+	} else {
+		ini_set('display_errors', 0);
+	}
+
+	if (elgg_get_plugin_setting('screen_log', 'developers') == 1) {
+		$cache = new ElggLogCache();
+		elgg_set_config('log_cache', $cache);
+		elgg_register_plugin_hook_handler('debug', 'log', array($cache, 'insertDump'));
+		elgg_extend_view('page/elements/foot', 'developers/log');
+	}
+
+	if (elgg_get_plugin_setting('show_strings', 'developers') == 1) {
+		// first and last in case a plugin registers a translation in an init method
+		elgg_register_event_handler('init', 'system', 'developers_clear_strings', 1000);
+		elgg_register_event_handler('init', 'system', 'developers_clear_strings', 1);
+	}
+
+	if (elgg_get_plugin_setting('wrap_views', 'developers') == 1) {
+		elgg_register_plugin_hook_handler('view', 'all', 'developers_wrap_views');
+	}
+
+	if (elgg_get_plugin_setting('log_events', 'developers') == 1) {
+		elgg_register_event_handler('all', 'all', 'developers_log_events', 1);
+		elgg_register_plugin_hook_handler('all', 'all', 'developers_log_events', 1);
+	}
+}
+
+function developers_setup_menu() {
+	if (elgg_in_context('admin')) {
+		elgg_register_admin_menu_item('develop', 'inspect', 'develop_tools');
+		elgg_register_admin_menu_item('develop', 'preview', 'develop_tools');
+		elgg_register_admin_menu_item('develop', 'unit_tests', 'develop_tools');
+
+		elgg_register_menu_item('page', array(
+			'name' => 'dev_settings',
+			'href' => 'admin/developers/settings',
+			'text' => elgg_echo('settings'),
+			'context' => 'admin',
+			'priority' => 10,
+			'section' => 'develop'
+		));
+	}
+}
+
+/**
+ * Clear all the strings so the raw descriptor strings are displayed
+ */
+function developers_clear_strings() {
+	global $CONFIG;
+
+	$language = get_language();
+	$CONFIG->translations[$language] = array();
+	$CONFIG->translations['en'] = array();
+}
+
+/**
+ * Post-process a view to add wrapper comments to it
+ * 
+ * 1. Only process views served with the 'default' viewtype.
+ * 2. Does not wrap views that begin with js/ or css/ as they are not HTML.
+ * 3. Does not wrap views that are images (start with icon/). Is this still true?
+ * 4. Does not wrap input and output views (why?).
+ * 5. Does not wrap html head or the primary page shells
+ * 
+ * @warning this will break views in the default viewtype that return non-HTML data
+ * that do not match the above restrictions.
+ */
+function developers_wrap_views($hook, $type, $result, $params) {
+	if (elgg_get_viewtype() != "default") {
+		return;
+	}
+
+	$excluded_bases = array('css', 'js', 'input', 'output', 'embed', 'icon',);
+
+	$excluded_views = array(
+		'page/default',
+		'page/admin',
+		'page/elements/head',
+	);
+
+	$view = $params['view'];
+
+	$view_hierarchy = explode('/',$view);
+	if (in_array($view_hierarchy[0], $excluded_bases)) {
+		return;
+	}
+
+	if (in_array($view, $excluded_views)) {
+		return;
+	}
+
+	if ($result) {
+		$result = "<!-- developers:begin $view -->$result<!-- developers:end $view -->";
+	}
+
+	return $result;
+}
+
+/**
+ * Log the events and plugin hooks
+ */
+function developers_log_events($name, $type) {
+
+	// filter out some very common events
+	if ($name == 'view' || $name == 'display' || $name == 'log' || $name == 'debug') {
+		return;
+	}
+	if ($name == 'session:get' || $name == 'validate') {
+		return;
+	}
+
+	$stack = debug_backtrace();
+	if ($stack[2]['function'] == 'elgg_trigger_event') {
+		$event_type = 'Event';
+	} else {
+		$event_type = 'Plugin hook';
+	}
+	$function = $stack[3]['function'] . '()';
+	if ($function == 'require_once' || $function == 'include_once') {
+		$function = $stack[3]['file'];
+	}
+
+	$msg = elgg_echo('developers:event_log_msg', array(
+		$event_type,
+		$name,
+		$type,
+		$function,
+	));
+	elgg_dump($msg, false, 'WARNING');
+
+	unset($stack);
+}
+
+/**
+ * Serve the theme preview pages
+ *
+ * @param array $page
+ * @return bool
+ */
+function developers_theme_preview_controller($page) {
+	if (!isset($page[0])) {
+		forward('theme_preview/general');
+	}
+
+	$pages = array(
+		'buttons',
+		'components',
+		'forms',
+		'grid',
+		'icons',
+		'modules',
+		'navigation',
+		'typography',
+		'miscellaneous'
+	);
+	
+	foreach ($pages as $page_name) {
+		elgg_register_menu_item('page', array(
+			'name' => $page_name,
+			'text' => elgg_echo("theme_preview:$page_name"),
+			'href' => "theme_preview/$page_name",
+		));
+	}
+
+	$title = elgg_echo("theme_preview:{$page[0]}");
+	$body =  elgg_view("theme_preview/{$page[0]}");
+
+	$layout = elgg_view_layout('one_sidebar', array(
+		'title' => $title,
+		'content' => $body,
+	));
+	
+	echo elgg_view_page($title, $layout, 'theme_preview');
+	return true;
+}
diff --git a/mod/developers/vendors/jsTree/jquery.jstree.js b/mod/developers/vendors/jsTree/jquery.jstree.js
new file mode 100644
index 000000000..965a612f6
--- /dev/null
+++ b/mod/developers/vendors/jsTree/jquery.jstree.js
@@ -0,0 +1,4544 @@
+/*
+ * jsTree 1.0-rc3
+ * http://jstree.com/
+ *
+ * Copyright (c) 2010 Ivan Bozhanov (vakata.com)
+ *
+ * Licensed same as jquery - under the terms of either the MIT License or the GPL Version 2 License
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ *
+ * $Date: 2011-02-09 01:17:14 +0200 (ср, 09 февр 2011) $
+ * $Revision: 236 $
+ */
+
+/*jslint browser: true, onevar: true, undef: true, bitwise: true, strict: true */
+/*global window : false, clearInterval: false, clearTimeout: false, document: false, setInterval: false, setTimeout: false, jQuery: false, navigator: false, XSLTProcessor: false, DOMParser: false, XMLSerializer: false*/
+
+"use strict";
+
+// top wrapper to prevent multiple inclusion (is this OK?)
+(function () { if(jQuery && jQuery.jstree) { return; }
+	var is_ie6 = false, is_ie7 = false, is_ff2 = false;
+
+/* 
+ * jsTree core
+ */
+(function ($) {
+	// Common functions not related to jsTree 
+	// decided to move them to a `vakata` "namespace"
+	$.vakata = {};
+	// CSS related functions
+	$.vakata.css = {
+		get_css : function(rule_name, delete_flag, sheet) {
+			rule_name = rule_name.toLowerCase();
+			var css_rules = sheet.cssRules || sheet.rules,
+				j = 0;
+			do {
+				if(css_rules.length && j > css_rules.length + 5) { return false; }
+				if(css_rules[j].selectorText && css_rules[j].selectorText.toLowerCase() == rule_name) {
+					if(delete_flag === true) {
+						if(sheet.removeRule) { sheet.removeRule(j); }
+						if(sheet.deleteRule) { sheet.deleteRule(j); }
+						return true;
+					}
+					else { return css_rules[j]; }
+				}
+			}
+			while (css_rules[++j]);
+			return false;
+		},
+		add_css : function(rule_name, sheet) {
+			if($.jstree.css.get_css(rule_name, false, sheet)) { return false; }
+			if(sheet.insertRule) { sheet.insertRule(rule_name + ' { }', 0); } else { sheet.addRule(rule_name, null, 0); }
+			return $.vakata.css.get_css(rule_name);
+		},
+		remove_css : function(rule_name, sheet) { 
+			return $.vakata.css.get_css(rule_name, true, sheet); 
+		},
+		add_sheet : function(opts) {
+			var tmp = false, is_new = true;
+			if(opts.str) {
+				if(opts.title) { tmp = $("style[id='" + opts.title + "-stylesheet']")[0]; }
+				if(tmp) { is_new = false; }
+				else {
+					tmp = document.createElement("style");
+					tmp.setAttribute('type',"text/css");
+					if(opts.title) { tmp.setAttribute("id", opts.title + "-stylesheet"); }
+				}
+				if(tmp.styleSheet) {
+					if(is_new) { 
+						document.getElementsByTagName("head")[0].appendChild(tmp); 
+						tmp.styleSheet.cssText = opts.str; 
+					}
+					else {
+						tmp.styleSheet.cssText = tmp.styleSheet.cssText + " " + opts.str; 
+					}
+				}
+				else {
+					tmp.appendChild(document.createTextNode(opts.str));
+					document.getElementsByTagName("head")[0].appendChild(tmp);
+				}
+				return tmp.sheet || tmp.styleSheet;
+			}
+			if(opts.url) {
+				if(document.createStyleSheet) {
+					try { tmp = document.createStyleSheet(opts.url); } catch (e) { }
+				}
+				else {
+					tmp			= document.createElement('link');
+					tmp.rel		= 'stylesheet';
+					tmp.type	= 'text/css';
+					tmp.media	= "all";
+					tmp.href	= opts.url;
+					document.getElementsByTagName("head")[0].appendChild(tmp);
+					return tmp.styleSheet;
+				}
+			}
+		}
+	};
+
+	// private variables 
+	var instances = [],			// instance array (used by $.jstree.reference/create/focused)
+		focused_instance = -1,	// the index in the instance array of the currently focused instance
+		plugins = {},			// list of included plugins
+		prepared_move = {};		// for the move_node function
+
+	// jQuery plugin wrapper (thanks to jquery UI widget function)
+	$.fn.jstree = function (settings) {
+		var isMethodCall = (typeof settings == 'string'), // is this a method call like $().jstree("open_node")
+			args = Array.prototype.slice.call(arguments, 1), 
+			returnValue = this;
+
+		// if a method call execute the method on all selected instances
+		if(isMethodCall) {
+			if(settings.substring(0, 1) == '_') { return returnValue; }
+			this.each(function() {
+				var instance = instances[$.data(this, "jstree-instance-id")],
+					methodValue = (instance && $.isFunction(instance[settings])) ? instance[settings].apply(instance, args) : instance;
+					if(typeof methodValue !== "undefined" && (settings.indexOf("is_") === 0 || (methodValue !== true && methodValue !== false))) { returnValue = methodValue; return false; }
+			});
+		}
+		else {
+			this.each(function() {
+				// extend settings and allow for multiple hashes and $.data
+				var instance_id = $.data(this, "jstree-instance-id"),
+					a = [],
+					b = settings ? $.extend({}, true, settings) : {},
+					c = $(this), 
+					s = false, 
+					t = [];
+				a = a.concat(args);
+				if(c.data("jstree")) { a.push(c.data("jstree")); }
+				b = a.length ? $.extend.apply(null, [true, b].concat(a)) : b;
+
+				// if an instance already exists, destroy it first
+				if(typeof instance_id !== "undefined" && instances[instance_id]) { instances[instance_id].destroy(); }
+				// push a new empty object to the instances array
+				instance_id = parseInt(instances.push({}),10) - 1;
+				// store the jstree instance id to the container element
+				$.data(this, "jstree-instance-id", instance_id);
+				// clean up all plugins
+				b.plugins = $.isArray(b.plugins) ? b.plugins : $.jstree.defaults.plugins.slice();
+				b.plugins.unshift("core");
+				// only unique plugins
+				b.plugins = b.plugins.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");
+
+				// extend defaults with passed data
+				s = $.extend(true, {}, $.jstree.defaults, b);
+				s.plugins = b.plugins;
+				$.each(plugins, function (i, val) { 
+					if($.inArray(i, s.plugins) === -1) { s[i] = null; delete s[i]; } 
+					else { t.push(i); }
+				});
+				s.plugins = t;
+
+				// push the new object to the instances array (at the same time set the default classes to the container) and init
+				instances[instance_id] = new $.jstree._instance(instance_id, $(this).addClass("jstree jstree-" + instance_id), s); 
+				// init all activated plugins for this instance
+				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { instances[instance_id].data[val] = {}; });
+				$.each(instances[instance_id]._get_settings().plugins, function (i, val) { if(plugins[val]) { plugins[val].__init.apply(instances[instance_id]); } });
+				// initialize the instance
+				setTimeout(function() { instances[instance_id].init(); }, 0);
+			});
+		}
+		// return the jquery selection (or if it was a method call that returned a value - the returned value)
+		return returnValue;
+	};
+	// object to store exposed functions and objects
+	$.jstree = {
+		defaults : {
+			plugins : []
+		},
+		_focused : function () { return instances[focused_instance] || null; },
+		_reference : function (needle) { 
+			// get by instance id
+			if(instances[needle]) { return instances[needle]; }
+			// get by DOM (if still no luck - return null
+			var o = $(needle); 
+			if(!o.length && typeof needle === "string") { o = $("#" + needle); }
+			if(!o.length) { return null; }
+			return instances[o.closest(".jstree").data("jstree-instance-id")] || null; 
+		},
+		_instance : function (index, container, settings) { 
+			// for plugins to store data in
+			this.data = { core : {} };
+			this.get_settings	= function () { return $.extend(true, {}, settings); };
+			this._get_settings	= function () { return settings; };
+			this.get_index		= function () { return index; };
+			this.get_container	= function () { return container; };
+			this.get_container_ul = function () { return container.children("ul:eq(0)"); };
+			this._set_settings	= function (s) { 
+				settings = $.extend(true, {}, settings, s);
+			};
+		},
+		_fn : { },
+		plugin : function (pname, pdata) {
+			pdata = $.extend({}, {
+				__init		: $.noop, 
+				__destroy	: $.noop,
+				_fn			: {},
+				defaults	: false
+			}, pdata);
+			plugins[pname] = pdata;
+
+			$.jstree.defaults[pname] = pdata.defaults;
+			$.each(pdata._fn, function (i, val) {
+				val.plugin		= pname;
+				val.old			= $.jstree._fn[i];
+				$.jstree._fn[i] = function () {
+					var rslt,
+						func = val,
+						args = Array.prototype.slice.call(arguments),
+						evnt = new $.Event("before.jstree"),
+						rlbk = false;
+
+					if(this.data.core.locked === true && i !== "unlock" && i !== "is_locked") { return; }
+
+					// Check if function belongs to the included plugins of this instance
+					do {
+						if(func && func.plugin && $.inArray(func.plugin, this._get_settings().plugins) !== -1) { break; }
+						func = func.old;
+					} while(func);
+					if(!func) { return; }
+
+					// context and function to trigger events, then finally call the function
+					if(i.indexOf("_") === 0) {
+						rslt = func.apply(this, args);
+					}
+					else {
+						rslt = this.get_container().triggerHandler(evnt, { "func" : i, "inst" : this, "args" : args, "plugin" : func.plugin });
+						if(rslt === false) { return; }
+						if(typeof rslt !== "undefined") { args = rslt; }
+
+						rslt = func.apply(
+							$.extend({}, this, { 
+								__callback : function (data) { 
+									this.get_container().triggerHandler( i + '.jstree', { "inst" : this, "args" : args, "rslt" : data, "rlbk" : rlbk });
+								},
+								__rollback : function () { 
+									rlbk = this.get_rollback();
+									return rlbk;
+								},
+								__call_old : function (replace_arguments) {
+									return func.old.apply(this, (replace_arguments ? Array.prototype.slice.call(arguments, 1) : args ) );
+								}
+							}), args);
+					}
+
+					// return the result
+					return rslt;
+				};
+				$.jstree._fn[i].old = val.old;
+				$.jstree._fn[i].plugin = pname;
+			});
+		},
+		rollback : function (rb) {
+			if(rb) {
+				if(!$.isArray(rb)) { rb = [ rb ]; }
+				$.each(rb, function (i, val) {
+					instances[val.i].set_rollback(val.h, val.d);
+				});
+			}
+		}
+	};
+	// set the prototype for all instances
+	$.jstree._fn = $.jstree._instance.prototype = {};
+
+	// load the css when DOM is ready
+	$(function() {
+		// code is copied from jQuery ($.browser is deprecated + there is a bug in IE)
+		var u = navigator.userAgent.toLowerCase(),
+			v = (u.match( /.+?(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [0,'0'])[1],
+			css_string = '' + 
+				'.jstree ul, .jstree li { display:block; margin:0 0 0 0; padding:0 0 0 0; list-style-type:none; } ' + 
+				'.jstree li { display:block; min-height:18px; line-height:18px; white-space:nowrap; margin-left:18px; min-width:18px; } ' + 
+				'.jstree-rtl li { margin-left:0; margin-right:18px; } ' + 
+				'.jstree > ul > li { margin-left:0px; } ' + 
+				'.jstree-rtl > ul > li { margin-right:0px; } ' + 
+				'.jstree ins { display:inline-block; text-decoration:none; width:18px; height:18px; margin:0 0 0 0; padding:0; } ' + 
+				'.jstree a { display:inline-block; line-height:16px; height:16px; color:black; white-space:nowrap; text-decoration:none; padding:1px 2px; margin:0; } ' + 
+				'.jstree a:focus { outline: none; } ' + 
+				'.jstree a > ins { height:16px; width:16px; } ' + 
+				'.jstree a > .jstree-icon { margin-right:3px; } ' + 
+				'.jstree-rtl a > .jstree-icon { margin-left:3px; margin-right:0; } ' + 
+				'li.jstree-open > ul { display:block; } ' + 
+				'li.jstree-closed > ul { display:none; } ';
+		// Correct IE 6 (does not support the > CSS selector)
+		if(/msie/.test(u) && parseInt(v, 10) == 6) { 
+			is_ie6 = true;
+
+			// fix image flicker and lack of caching
+			try {
+				document.execCommand("BackgroundImageCache", false, true);
+			} catch (err) { }
+
+			css_string += '' + 
+				'.jstree li { height:18px; margin-left:0; margin-right:0; } ' + 
+				'.jstree li li { margin-left:18px; } ' + 
+				'.jstree-rtl li li { margin-left:0px; margin-right:18px; } ' + 
+				'li.jstree-open ul { display:block; } ' + 
+				'li.jstree-closed ul { display:none !important; } ' + 
+				'.jstree li a { display:inline; border-width:0 !important; padding:0px 2px !important; } ' + 
+				'.jstree li a ins { height:16px; width:16px; margin-right:3px; } ' + 
+				'.jstree-rtl li a ins { margin-right:0px; margin-left:3px; } ';
+		}
+		// Correct IE 7 (shifts anchor nodes onhover)
+		if(/msie/.test(u) && parseInt(v, 10) == 7) { 
+			is_ie7 = true;
+			css_string += '.jstree li a { border-width:0 !important; padding:0px 2px !important; } ';
+		}
+		// correct ff2 lack of display:inline-block
+		if(!/compatible/.test(u) && /mozilla/.test(u) && parseFloat(v, 10) < 1.9) {
+			is_ff2 = true;
+			css_string += '' + 
+				'.jstree ins { display:-moz-inline-box; } ' + 
+				'.jstree li { line-height:12px; } ' + // WHY??
+				'.jstree a { display:-moz-inline-box; } ' + 
+				'.jstree .jstree-no-icons .jstree-checkbox { display:-moz-inline-stack !important; } ';
+				/* this shouldn't be here as it is theme specific */
+		}
+		// the default stylesheet
+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
+	});
+
+	// core functions (open, close, create, update, delete)
+	$.jstree.plugin("core", {
+		__init : function () {
+			this.data.core.locked = false;
+			this.data.core.to_open = this.get_settings().core.initially_open;
+			this.data.core.to_load = this.get_settings().core.initially_load;
+		},
+		defaults : { 
+			html_titles	: false,
+			animation	: 500,
+			initially_open : [],
+			initially_load : [],
+			open_parents : true,
+			notify_plugins : true,
+			rtl			: false,
+			load_open	: false,
+			strings		: {
+				loading		: "Loading ...",
+				new_node	: "New node",
+				multiple_selection : "Multiple selection"
+			}
+		},
+		_fn : { 
+			init	: function () { 
+				this.set_focus(); 
+				if(this._get_settings().core.rtl) {
+					this.get_container().addClass("jstree-rtl").css("direction", "rtl");
+				}
+				this.get_container().html("<ul><li class='jstree-last jstree-leaf'><ins>&#160;</ins><a class='jstree-loading' href='#'><ins class='jstree-icon'>&#160;</ins>" + this._get_string("loading") + "</a></li></ul>");
+				this.data.core.li_height = this.get_container_ul().find("li.jstree-closed, li.jstree-leaf").eq(0).height() || 18;
+
+				this.get_container()
+					.delegate("li > ins", "click.jstree", $.proxy(function (event) {
+							var trgt = $(event.target);
+							if(trgt.is("ins") && event.pageY - trgt.offset().top < this.data.core.li_height) { this.toggle_node(trgt); }
+						}, this))
+					.bind("mousedown.jstree", $.proxy(function () { 
+							this.set_focus(); // This used to be setTimeout(set_focus,0) - why?
+						}, this))
+					.bind("dblclick.jstree", function (event) { 
+						var sel;
+						if(document.selection && document.selection.empty) { document.selection.empty(); }
+						else {
+							if(window.getSelection) {
+								sel = window.getSelection();
+								try { 
+									sel.removeAllRanges();
+									sel.collapse();
+								} catch (err) { }
+							}
+						}
+					});
+				if(this._get_settings().core.notify_plugins) {
+					this.get_container()
+						.bind("load_node.jstree", $.proxy(function (e, data) { 
+								var o = this._get_node(data.rslt.obj),
+									t = this;
+								if(o === -1) { o = this.get_container_ul(); }
+								if(!o.length) { return; }
+								o.find("li").each(function () {
+									var th = $(this);
+									if(th.data("jstree")) {
+										$.each(th.data("jstree"), function (plugin, values) {
+											if(t.data[plugin] && $.isFunction(t["_" + plugin + "_notify"])) {
+												t["_" + plugin + "_notify"].call(t, th, values);
+											}
+										});
+									}
+								});
+							}, this));
+				}
+				if(this._get_settings().core.load_open) {
+					this.get_container()
+						.bind("load_node.jstree", $.proxy(function (e, data) { 
+								var o = this._get_node(data.rslt.obj),
+									t = this;
+								if(o === -1) { o = this.get_container_ul(); }
+								if(!o.length) { return; }
+								o.find("li.jstree-open:not(:has(ul))").each(function () {
+									t.load_node(this, $.noop, $.noop);
+								});
+							}, this));
+				}
+				this.__callback();
+				this.load_node(-1, function () { this.loaded(); this.reload_nodes(); });
+			},
+			destroy	: function () { 
+				var i,
+					n = this.get_index(),
+					s = this._get_settings(),
+					_this = this;
+
+				$.each(s.plugins, function (i, val) {
+					try { plugins[val].__destroy.apply(_this); } catch(err) { }
+				});
+				this.__callback();
+				// set focus to another instance if this one is focused
+				if(this.is_focused()) { 
+					for(i in instances) { 
+						if(instances.hasOwnProperty(i) && i != n) { 
+							instances[i].set_focus(); 
+							break; 
+						} 
+					}
+				}
+				// if no other instance found
+				if(n === focused_instance) { focused_instance = -1; }
+				// remove all traces of jstree in the DOM (only the ones set using jstree*) and cleans all events
+				this.get_container()
+					.unbind(".jstree")
+					.undelegate(".jstree")
+					.removeData("jstree-instance-id")
+					.find("[class^='jstree']")
+						.andSelf()
+						.attr("class", function () { return this.className.replace(/jstree[^ ]*|$/ig,''); });
+				$(document)
+					.unbind(".jstree-" + n)
+					.undelegate(".jstree-" + n);
+				// remove the actual data
+				instances[n] = null;
+				delete instances[n];
+			},
+
+			_core_notify : function (n, data) {
+				if(data.opened) {
+					this.open_node(n, false, true);
+				}
+			},
+
+			lock : function () {
+				this.data.core.locked = true;
+				this.get_container().children("ul").addClass("jstree-locked").css("opacity","0.7");
+				this.__callback({});
+			},
+			unlock : function () {
+				this.data.core.locked = false;
+				this.get_container().children("ul").removeClass("jstree-locked").css("opacity","1");
+				this.__callback({});
+			},
+			is_locked : function () { return this.data.core.locked; },
+			save_opened : function () {
+				var _this = this;
+				this.data.core.to_open = [];
+				this.get_container_ul().find("li.jstree-open").each(function () { 
+					if(this.id) { _this.data.core.to_open.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); }
+				});
+				this.__callback(_this.data.core.to_open);
+			},
+			save_loaded : function () { },
+			reload_nodes : function (is_callback) {
+				var _this = this,
+					done = true,
+					current = [],
+					remaining = [];
+				if(!is_callback) { 
+					this.data.core.reopen = false; 
+					this.data.core.refreshing = true; 
+					this.data.core.to_open = $.map($.makeArray(this.data.core.to_open), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
+					this.data.core.to_load = $.map($.makeArray(this.data.core.to_load), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
+					if(this.data.core.to_open.length) {
+						this.data.core.to_load = this.data.core.to_load.concat(this.data.core.to_open);
+					}
+				}
+				if(this.data.core.to_load.length) {
+					$.each(this.data.core.to_load, function (i, val) {
+						if(val == "#") { return true; }
+						if($(val).length) { current.push(val); }
+						else { remaining.push(val); }
+					});
+					if(current.length) {
+						this.data.core.to_load = remaining;
+						$.each(current, function (i, val) { 
+							if(!_this._is_loaded(val)) {
+								_this.load_node(val, function () { _this.reload_nodes(true); }, function () { _this.reload_nodes(true); });
+								done = false;
+							}
+						});
+					}
+				}
+				if(this.data.core.to_open.length) {
+					$.each(this.data.core.to_open, function (i, val) {
+						_this.open_node(val, false, true); 
+					});
+				}
+				if(done) { 
+					// TODO: find a more elegant approach to syncronizing returning requests
+					if(this.data.core.reopen) { clearTimeout(this.data.core.reopen); }
+					this.data.core.reopen = setTimeout(function () { _this.__callback({}, _this); }, 50);
+					this.data.core.refreshing = false;
+					this.reopen();
+				}
+			},
+			reopen : function () {
+				var _this = this;
+				if(this.data.core.to_open.length) {
+					$.each(this.data.core.to_open, function (i, val) {
+						_this.open_node(val, false, true); 
+					});
+				}
+				this.__callback({});
+			},
+			refresh : function (obj) {
+				var _this = this;
+				this.save_opened();
+				if(!obj) { obj = -1; }
+				obj = this._get_node(obj);
+				if(!obj) { obj = -1; }
+				if(obj !== -1) { obj.children("UL").remove(); }
+				else { this.get_container_ul().empty(); }
+				this.load_node(obj, function () { _this.__callback({ "obj" : obj}); _this.reload_nodes(); });
+			},
+			// Dummy function to fire after the first load (so that there is a jstree.loaded event)
+			loaded	: function () { 
+				this.__callback(); 
+			},
+			// deal with focus
+			set_focus	: function () { 
+				if(this.is_focused()) { return; }
+				var f = $.jstree._focused();
+				if(f) { f.unset_focus(); }
+
+				this.get_container().addClass("jstree-focused"); 
+				focused_instance = this.get_index(); 
+				this.__callback();
+			},
+			is_focused	: function () { 
+				return focused_instance == this.get_index(); 
+			},
+			unset_focus	: function () {
+				if(this.is_focused()) {
+					this.get_container().removeClass("jstree-focused"); 
+					focused_instance = -1; 
+				}
+				this.__callback();
+			},
+
+			// traverse
+			_get_node		: function (obj) { 
+				var $obj = $(obj, this.get_container()); 
+				if($obj.is(".jstree") || obj == -1) { return -1; } 
+				$obj = $obj.closest("li", this.get_container()); 
+				return $obj.length ? $obj : false; 
+			},
+			_get_next		: function (obj, strict) {
+				obj = this._get_node(obj);
+				if(obj === -1) { return this.get_container().find("> ul > li:first-child"); }
+				if(!obj.length) { return false; }
+				if(strict) { return (obj.nextAll("li").size() > 0) ? obj.nextAll("li:eq(0)") : false; }
+
+				if(obj.hasClass("jstree-open")) { return obj.find("li:eq(0)"); }
+				else if(obj.nextAll("li").size() > 0) { return obj.nextAll("li:eq(0)"); }
+				else { return obj.parentsUntil(".jstree","li").next("li").eq(0); }
+			},
+			_get_prev		: function (obj, strict) {
+				obj = this._get_node(obj);
+				if(obj === -1) { return this.get_container().find("> ul > li:last-child"); }
+				if(!obj.length) { return false; }
+				if(strict) { return (obj.prevAll("li").length > 0) ? obj.prevAll("li:eq(0)") : false; }
+
+				if(obj.prev("li").length) {
+					obj = obj.prev("li").eq(0);
+					while(obj.hasClass("jstree-open")) { obj = obj.children("ul:eq(0)").children("li:last"); }
+					return obj;
+				}
+				else { var o = obj.parentsUntil(".jstree","li:eq(0)"); return o.length ? o : false; }
+			},
+			_get_parent		: function (obj) {
+				obj = this._get_node(obj);
+				if(obj == -1 || !obj.length) { return false; }
+				var o = obj.parentsUntil(".jstree", "li:eq(0)");
+				return o.length ? o : -1;
+			},
+			_get_children	: function (obj) {
+				obj = this._get_node(obj);
+				if(obj === -1) { return this.get_container().children("ul:eq(0)").children("li"); }
+				if(!obj.length) { return false; }
+				return obj.children("ul:eq(0)").children("li");
+			},
+			get_path		: function (obj, id_mode) {
+				var p = [],
+					_this = this;
+				obj = this._get_node(obj);
+				if(obj === -1 || !obj || !obj.length) { return false; }
+				obj.parentsUntil(".jstree", "li").each(function () {
+					p.push( id_mode ? this.id : _this.get_text(this) );
+				});
+				p.reverse();
+				p.push( id_mode ? obj.attr("id") : this.get_text(obj) );
+				return p;
+			},
+
+			// string functions
+			_get_string : function (key) {
+				return this._get_settings().core.strings[key] || key;
+			},
+
+			is_open		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-open"); },
+			is_closed	: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-closed"); },
+			is_leaf		: function (obj) { obj = this._get_node(obj); return obj && obj !== -1 && obj.hasClass("jstree-leaf"); },
+			correct_state	: function (obj) {
+				obj = this._get_node(obj);
+				if(!obj || obj === -1) { return false; }
+				obj.removeClass("jstree-closed jstree-open").addClass("jstree-leaf").children("ul").remove();
+				this.__callback({ "obj" : obj });
+			},
+			// open/close
+			open_node	: function (obj, callback, skip_animation) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				if(!obj.hasClass("jstree-closed")) { if(callback) { callback.call(); } return false; }
+				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,
+					t = this;
+				if(!this._is_loaded(obj)) {
+					obj.children("a").addClass("jstree-loading");
+					this.load_node(obj, function () { t.open_node(obj, callback, skip_animation); }, callback);
+				}
+				else {
+					if(this._get_settings().core.open_parents) {
+						obj.parentsUntil(".jstree",".jstree-closed").each(function () {
+							t.open_node(this, false, true);
+						});
+					}
+					if(s) { obj.children("ul").css("display","none"); }
+					obj.removeClass("jstree-closed").addClass("jstree-open").children("a").removeClass("jstree-loading");
+					if(s) { obj.children("ul").stop(true, true).slideDown(s, function () { this.style.display = ""; t.after_open(obj); }); }
+					else { t.after_open(obj); }
+					this.__callback({ "obj" : obj });
+					if(callback) { callback.call(); }
+				}
+			},
+			after_open	: function (obj) { this.__callback({ "obj" : obj }); },
+			close_node	: function (obj, skip_animation) {
+				obj = this._get_node(obj);
+				var s = skip_animation || is_ie6 ? 0 : this._get_settings().core.animation,
+					t = this;
+				if(!obj.length || !obj.hasClass("jstree-open")) { return false; }
+				if(s) { obj.children("ul").attr("style","display:block !important"); }
+				obj.removeClass("jstree-open").addClass("jstree-closed");
+				if(s) { obj.children("ul").stop(true, true).slideUp(s, function () { this.style.display = ""; t.after_close(obj); }); }
+				else { t.after_close(obj); }
+				this.__callback({ "obj" : obj });
+			},
+			after_close	: function (obj) { this.__callback({ "obj" : obj }); },
+			toggle_node	: function (obj) {
+				obj = this._get_node(obj);
+				if(obj.hasClass("jstree-closed")) { return this.open_node(obj); }
+				if(obj.hasClass("jstree-open")) { return this.close_node(obj); }
+			},
+			open_all	: function (obj, do_animation, original_obj) {
+				obj = obj ? this._get_node(obj) : -1;
+				if(!obj || obj === -1) { obj = this.get_container_ul(); }
+				if(original_obj) { 
+					obj = obj.find("li.jstree-closed");
+				}
+				else {
+					original_obj = obj;
+					if(obj.is(".jstree-closed")) { obj = obj.find("li.jstree-closed").andSelf(); }
+					else { obj = obj.find("li.jstree-closed"); }
+				}
+				var _this = this;
+				obj.each(function () { 
+					var __this = this; 
+					if(!_this._is_loaded(this)) { _this.open_node(this, function() { _this.open_all(__this, do_animation, original_obj); }, !do_animation); }
+					else { _this.open_node(this, false, !do_animation); }
+				});
+				// so that callback is fired AFTER all nodes are open
+				if(original_obj.find('li.jstree-closed').length === 0) { this.__callback({ "obj" : original_obj }); }
+			},
+			close_all	: function (obj, do_animation) {
+				var _this = this;
+				obj = obj ? this._get_node(obj) : this.get_container();
+				if(!obj || obj === -1) { obj = this.get_container_ul(); }
+				obj.find("li.jstree-open").andSelf().each(function () { _this.close_node(this, !do_animation); });
+				this.__callback({ "obj" : obj });
+			},
+			clean_node	: function (obj) {
+				obj = obj && obj != -1 ? $(obj) : this.get_container_ul();
+				obj = obj.is("li") ? obj.find("li").andSelf() : obj.find("li");
+				obj.removeClass("jstree-last")
+					.filter("li:last-child").addClass("jstree-last").end()
+					.filter(":has(li)")
+						.not(".jstree-open").removeClass("jstree-leaf").addClass("jstree-closed");
+				obj.not(".jstree-open, .jstree-closed").addClass("jstree-leaf").children("ul").remove();
+				this.__callback({ "obj" : obj });
+			},
+			// rollback
+			get_rollback : function () { 
+				this.__callback();
+				return { i : this.get_index(), h : this.get_container().children("ul").clone(true), d : this.data }; 
+			},
+			set_rollback : function (html, data) {
+				this.get_container().empty().append(html);
+				this.data = data;
+				this.__callback();
+			},
+			// Dummy functions to be overwritten by any datastore plugin included
+			load_node	: function (obj, s_call, e_call) { this.__callback({ "obj" : obj }); },
+			_is_loaded	: function (obj) { return true; },
+
+			// Basic operations: create
+			create_node	: function (obj, position, js, callback, is_loaded) {
+				obj = this._get_node(obj);
+				position = typeof position === "undefined" ? "last" : position;
+				var d = $("<li />"),
+					s = this._get_settings().core,
+					tmp;
+
+				if(obj !== -1 && !obj.length) { return false; }
+				if(!is_loaded && !this._is_loaded(obj)) { this.load_node(obj, function () { this.create_node(obj, position, js, callback, true); }); return false; }
+
+				this.__rollback();
+
+				if(typeof js === "string") { js = { "data" : js }; }
+				if(!js) { js = {}; }
+				if(js.attr) { d.attr(js.attr); }
+				if(js.metadata) { d.data(js.metadata); }
+				if(js.state) { d.addClass("jstree-" + js.state); }
+				if(!js.data) { js.data = this._get_string("new_node"); }
+				if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }
+				$.each(js.data, function (i, m) {
+					tmp = $("<a />");
+					if($.isFunction(m)) { m = m.call(this, js); }
+					if(typeof m == "string") { tmp.attr('href','#')[ s.html_titles ? "html" : "text" ](m); }
+					else {
+						if(!m.attr) { m.attr = {}; }
+						if(!m.attr.href) { m.attr.href = '#'; }
+						tmp.attr(m.attr)[ s.html_titles ? "html" : "text" ](m.title);
+						if(m.language) { tmp.addClass(m.language); }
+					}
+					tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");
+					if(m.icon) { 
+						if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }
+						else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }
+					}
+					d.append(tmp);
+				});
+				d.prepend("<ins class='jstree-icon'>&#160;</ins>");
+				if(obj === -1) {
+					obj = this.get_container();
+					if(position === "before") { position = "first"; }
+					if(position === "after") { position = "last"; }
+				}
+				switch(position) {
+					case "before": obj.before(d); tmp = this._get_parent(obj); break;
+					case "after" : obj.after(d);  tmp = this._get_parent(obj); break;
+					case "inside":
+					case "first" :
+						if(!obj.children("ul").length) { obj.append("<ul />"); }
+						obj.children("ul").prepend(d);
+						tmp = obj;
+						break;
+					case "last":
+						if(!obj.children("ul").length) { obj.append("<ul />"); }
+						obj.children("ul").append(d);
+						tmp = obj;
+						break;
+					default:
+						if(!obj.children("ul").length) { obj.append("<ul />"); }
+						if(!position) { position = 0; }
+						tmp = obj.children("ul").children("li").eq(position);
+						if(tmp.length) { tmp.before(d); }
+						else { obj.children("ul").append(d); }
+						tmp = obj;
+						break;
+				}
+				if(tmp === -1 || tmp.get(0) === this.get_container().get(0)) { tmp = -1; }
+				this.clean_node(tmp);
+				this.__callback({ "obj" : d, "parent" : tmp });
+				if(callback) { callback.call(this, d); }
+				return d;
+			},
+			// Basic operations: rename (deal with text)
+			get_text	: function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				var s = this._get_settings().core.html_titles;
+				obj = obj.children("a:eq(0)");
+				if(s) {
+					obj = obj.clone();
+					obj.children("INS").remove();
+					return obj.html();
+				}
+				else {
+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
+					return obj.nodeValue;
+				}
+			},
+			set_text	: function (obj, val) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				obj = obj.children("a:eq(0)");
+				if(this._get_settings().core.html_titles) {
+					var tmp = obj.children("INS").clone();
+					obj.html(val).prepend(tmp);
+					this.__callback({ "obj" : obj, "name" : val });
+					return true;
+				}
+				else {
+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
+					this.__callback({ "obj" : obj, "name" : val });
+					return (obj.nodeValue = val);
+				}
+			},
+			rename_node : function (obj, val) {
+				obj = this._get_node(obj);
+				this.__rollback();
+				if(obj && obj.length && this.set_text.apply(this, Array.prototype.slice.call(arguments))) { this.__callback({ "obj" : obj, "name" : val }); }
+			},
+			// Basic operations: deleting nodes
+			delete_node : function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				this.__rollback();
+				var p = this._get_parent(obj), prev = $([]), t = this;
+				obj.each(function () {
+					prev = prev.add(t._get_prev(this));
+				});
+				obj = obj.detach();
+				if(p !== -1 && p.find("> ul > li").length === 0) {
+					p.removeClass("jstree-open jstree-closed").addClass("jstree-leaf");
+				}
+				this.clean_node(p);
+				this.__callback({ "obj" : obj, "prev" : prev, "parent" : p });
+				return obj;
+			},
+			prepare_move : function (o, r, pos, cb, is_cb) {
+				var p = {};
+
+				p.ot = $.jstree._reference(o) || this;
+				p.o = p.ot._get_node(o);
+				p.r = r === - 1 ? -1 : this._get_node(r);
+				p.p = (typeof pos === "undefined" || pos === false) ? "last" : pos; // TODO: move to a setting
+				if(!is_cb && prepared_move.o && prepared_move.o[0] === p.o[0] && prepared_move.r[0] === p.r[0] && prepared_move.p === p.p) {
+					this.__callback(prepared_move);
+					if(cb) { cb.call(this, prepared_move); }
+					return;
+				}
+				p.ot = $.jstree._reference(p.o) || this;
+				p.rt = $.jstree._reference(p.r) || this; // r === -1 ? p.ot : $.jstree._reference(p.r) || this
+				if(p.r === -1 || !p.r) {
+					p.cr = -1;
+					switch(p.p) {
+						case "first":
+						case "before":
+						case "inside":
+							p.cp = 0; 
+							break;
+						case "after":
+						case "last":
+							p.cp = p.rt.get_container().find(" > ul > li").length; 
+							break;
+						default:
+							p.cp = p.p;
+							break;
+					}
+				}
+				else {
+					if(!/^(before|after)$/.test(p.p) && !this._is_loaded(p.r)) {
+						return this.load_node(p.r, function () { this.prepare_move(o, r, pos, cb, true); });
+					}
+					switch(p.p) {
+						case "before":
+							p.cp = p.r.index();
+							p.cr = p.rt._get_parent(p.r);
+							break;
+						case "after":
+							p.cp = p.r.index() + 1;
+							p.cr = p.rt._get_parent(p.r);
+							break;
+						case "inside":
+						case "first":
+							p.cp = 0;
+							p.cr = p.r;
+							break;
+						case "last":
+							p.cp = p.r.find(" > ul > li").length; 
+							p.cr = p.r;
+							break;
+						default: 
+							p.cp = p.p;
+							p.cr = p.r;
+							break;
+					}
+				}
+				p.np = p.cr == -1 ? p.rt.get_container() : p.cr;
+				p.op = p.ot._get_parent(p.o);
+				p.cop = p.o.index();
+				if(p.op === -1) { p.op = p.ot ? p.ot.get_container() : this.get_container(); }
+				if(!/^(before|after)$/.test(p.p) && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp++; }
+				//if(p.p === "before" && p.op && p.np && p.op[0] === p.np[0] && p.o.index() < p.cp) { p.cp--; }
+				p.or = p.np.find(" > ul > li:nth-child(" + (p.cp + 1) + ")");
+				prepared_move = p;
+				this.__callback(prepared_move);
+				if(cb) { cb.call(this, prepared_move); }
+			},
+			check_move : function () {
+				var obj = prepared_move, ret = true, r = obj.r === -1 ? this.get_container() : obj.r;
+				if(!obj || !obj.o || obj.or[0] === obj.o[0]) { return false; }
+				if(obj.op && obj.np && obj.op[0] === obj.np[0] && obj.cp - 1 === obj.o.index()) { return false; }
+				obj.o.each(function () { 
+					if(r.parentsUntil(".jstree", "li").andSelf().index(this) !== -1) { ret = false; return false; }
+				});
+				return ret;
+			},
+			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {
+				if(!is_prepared) { 
+					return this.prepare_move(obj, ref, position, function (p) {
+						this.move_node(p, false, false, is_copy, true, skip_check);
+					});
+				}
+				if(is_copy) { 
+					prepared_move.cy = true;
+				}
+				if(!skip_check && !this.check_move()) { return false; }
+
+				this.__rollback();
+				var o = false;
+				if(is_copy) {
+					o = obj.o.clone(true);
+					o.find("*[id]").andSelf().each(function () {
+						if(this.id) { this.id = "copy_" + this.id; }
+					});
+				}
+				else { o = obj.o; }
+
+				if(obj.or.length) { obj.or.before(o); }
+				else { 
+					if(!obj.np.children("ul").length) { $("<ul />").appendTo(obj.np); }
+					obj.np.children("ul:eq(0)").append(o); 
+				}
+
+				try { 
+					obj.ot.clean_node(obj.op);
+					obj.rt.clean_node(obj.np);
+					if(!obj.op.find("> ul > li").length) {
+						obj.op.removeClass("jstree-open jstree-closed").addClass("jstree-leaf").children("ul").remove();
+					}
+				} catch (e) { }
+
+				if(is_copy) { 
+					prepared_move.cy = true;
+					prepared_move.oc = o; 
+				}
+				this.__callback(prepared_move);
+				return prepared_move;
+			},
+			_get_move : function () { return prepared_move; }
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree ui plugin
+ * This plugins handles selecting/deselecting/hovering/dehovering nodes
+ */
+(function ($) {
+	var scrollbar_width, e1, e2;
+	$(function() {
+		if (/msie/.test(navigator.userAgent.toLowerCase())) {
+			e1 = $('<textarea cols="10" rows="2"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');
+			e2 = $('<textarea cols="10" rows="2" style="overflow: hidden;"></textarea>').css({ position: 'absolute', top: -1000, left: 0 }).appendTo('body');
+			scrollbar_width = e1.width() - e2.width();
+			e1.add(e2).remove();
+		} 
+		else {
+			e1 = $('<div />').css({ width: 100, height: 100, overflow: 'auto', position: 'absolute', top: -1000, left: 0 })
+					.prependTo('body').append('<div />').find('div').css({ width: '100%', height: 200 });
+			scrollbar_width = 100 - e1.width();
+			e1.parent().remove();
+		}
+	});
+	$.jstree.plugin("ui", {
+		__init : function () { 
+			this.data.ui.selected = $(); 
+			this.data.ui.last_selected = false; 
+			this.data.ui.hovered = null;
+			this.data.ui.to_select = this.get_settings().ui.initially_select;
+
+			this.get_container()
+				.delegate("a", "click.jstree", $.proxy(function (event) {
+						event.preventDefault();
+						event.currentTarget.blur();
+						if(!$(event.currentTarget).hasClass("jstree-loading")) {
+							this.select_node(event.currentTarget, true, event);
+						}
+					}, this))
+				.delegate("a", "mouseenter.jstree", $.proxy(function (event) {
+						if(!$(event.currentTarget).hasClass("jstree-loading")) {
+							this.hover_node(event.target);
+						}
+					}, this))
+				.delegate("a", "mouseleave.jstree", $.proxy(function (event) {
+						if(!$(event.currentTarget).hasClass("jstree-loading")) {
+							this.dehover_node(event.target);
+						}
+					}, this))
+				.bind("reopen.jstree", $.proxy(function () { 
+						this.reselect();
+					}, this))
+				.bind("get_rollback.jstree", $.proxy(function () { 
+						this.dehover_node();
+						this.save_selected();
+					}, this))
+				.bind("set_rollback.jstree", $.proxy(function () { 
+						this.reselect();
+					}, this))
+				.bind("close_node.jstree", $.proxy(function (event, data) { 
+						var s = this._get_settings().ui,
+							obj = this._get_node(data.rslt.obj),
+							clk = (obj && obj.length) ? obj.children("ul").find("a.jstree-clicked") : $(),
+							_this = this;
+						if(s.selected_parent_close === false || !clk.length) { return; }
+						clk.each(function () { 
+							_this.deselect_node(this);
+							if(s.selected_parent_close === "select_parent") { _this.select_node(obj); }
+						});
+					}, this))
+				.bind("delete_node.jstree", $.proxy(function (event, data) { 
+						var s = this._get_settings().ui.select_prev_on_delete,
+							obj = this._get_node(data.rslt.obj),
+							clk = (obj && obj.length) ? obj.find("a.jstree-clicked") : [],
+							_this = this;
+						clk.each(function () { _this.deselect_node(this); });
+						if(s && clk.length) { 
+							data.rslt.prev.each(function () { 
+								if(this.parentNode) { _this.select_node(this); return false; /* if return false is removed all prev nodes will be selected */}
+							});
+						}
+					}, this))
+				.bind("move_node.jstree", $.proxy(function (event, data) { 
+						if(data.rslt.cy) { 
+							data.rslt.oc.find("a.jstree-clicked").removeClass("jstree-clicked");
+						}
+					}, this));
+		},
+		defaults : {
+			select_limit : -1, // 0, 1, 2 ... or -1 for unlimited
+			select_multiple_modifier : "ctrl", // on, or ctrl, shift, alt
+			select_range_modifier : "shift",
+			selected_parent_close : "select_parent", // false, "deselect", "select_parent"
+			selected_parent_open : true,
+			select_prev_on_delete : true,
+			disable_selecting_children : false,
+			initially_select : []
+		},
+		_fn : { 
+			_get_node : function (obj, allow_multiple) {
+				if(typeof obj === "undefined" || obj === null) { return allow_multiple ? this.data.ui.selected : this.data.ui.last_selected; }
+				var $obj = $(obj, this.get_container()); 
+				if($obj.is(".jstree") || obj == -1) { return -1; } 
+				$obj = $obj.closest("li", this.get_container()); 
+				return $obj.length ? $obj : false; 
+			},
+			_ui_notify : function (n, data) {
+				if(data.selected) {
+					this.select_node(n, false);
+				}
+			},
+			save_selected : function () {
+				var _this = this;
+				this.data.ui.to_select = [];
+				this.data.ui.selected.each(function () { if(this.id) { _this.data.ui.to_select.push("#" + this.id.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:")); } });
+				this.__callback(this.data.ui.to_select);
+			},
+			reselect : function () {
+				var _this = this,
+					s = this.data.ui.to_select;
+				s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
+				// this.deselect_all(); WHY deselect, breaks plugin state notifier?
+				$.each(s, function (i, val) { if(val && val !== "#") { _this.select_node(val); } });
+				this.data.ui.selected = this.data.ui.selected.filter(function () { return this.parentNode; });
+				this.__callback();
+			},
+			refresh : function (obj) {
+				this.save_selected();
+				return this.__call_old();
+			},
+			hover_node : function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				//if(this.data.ui.hovered && obj.get(0) === this.data.ui.hovered.get(0)) { return; }
+				if(!obj.hasClass("jstree-hovered")) { this.dehover_node(); }
+				this.data.ui.hovered = obj.children("a").addClass("jstree-hovered").parent();
+				this._fix_scroll(obj);
+				this.__callback({ "obj" : obj });
+			},
+			dehover_node : function () {
+				var obj = this.data.ui.hovered, p;
+				if(!obj || !obj.length) { return false; }
+				p = obj.children("a").removeClass("jstree-hovered").parent();
+				if(this.data.ui.hovered[0] === p[0]) { this.data.ui.hovered = null; }
+				this.__callback({ "obj" : obj });
+			},
+			select_node : function (obj, check, e) {
+				obj = this._get_node(obj);
+				if(obj == -1 || !obj || !obj.length) { return false; }
+				var s = this._get_settings().ui,
+					is_multiple = (s.select_multiple_modifier == "on" || (s.select_multiple_modifier !== false && e && e[s.select_multiple_modifier + "Key"])),
+					is_range = (s.select_range_modifier !== false && e && e[s.select_range_modifier + "Key"] && this.data.ui.last_selected && this.data.ui.last_selected[0] !== obj[0] && this.data.ui.last_selected.parent()[0] === obj.parent()[0]),
+					is_selected = this.is_selected(obj),
+					proceed = true,
+					t = this;
+				if(check) {
+					if(s.disable_selecting_children && is_multiple && 
+						(
+							(obj.parentsUntil(".jstree","li").children("a.jstree-clicked").length) ||
+							(obj.children("ul").find("a.jstree-clicked:eq(0)").length)
+						)
+					) {
+						return false;
+					}
+					proceed = false;
+					switch(!0) {
+						case (is_range):
+							this.data.ui.last_selected.addClass("jstree-last-selected");
+							obj = obj[ obj.index() < this.data.ui.last_selected.index() ? "nextUntil" : "prevUntil" ](".jstree-last-selected").andSelf();
+							if(s.select_limit == -1 || obj.length < s.select_limit) {
+								this.data.ui.last_selected.removeClass("jstree-last-selected");
+								this.data.ui.selected.each(function () {
+									if(this !== t.data.ui.last_selected[0]) { t.deselect_node(this); }
+								});
+								is_selected = false;
+								proceed = true;
+							}
+							else {
+								proceed = false;
+							}
+							break;
+						case (is_selected && !is_multiple): 
+							this.deselect_all();
+							is_selected = false;
+							proceed = true;
+							break;
+						case (!is_selected && !is_multiple): 
+							if(s.select_limit == -1 || s.select_limit > 0) {
+								this.deselect_all();
+								proceed = true;
+							}
+							break;
+						case (is_selected && is_multiple): 
+							this.deselect_node(obj);
+							break;
+						case (!is_selected && is_multiple): 
+							if(s.select_limit == -1 || this.data.ui.selected.length + 1 <= s.select_limit) { 
+								proceed = true;
+							}
+							break;
+					}
+				}
+				if(proceed && !is_selected) {
+					if(!is_range) { this.data.ui.last_selected = obj; }
+					obj.children("a").addClass("jstree-clicked");
+					if(s.selected_parent_open) {
+						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });
+					}
+					this.data.ui.selected = this.data.ui.selected.add(obj);
+					this._fix_scroll(obj.eq(0));
+					this.__callback({ "obj" : obj, "e" : e });
+				}
+			},
+			_fix_scroll : function (obj) {
+				var c = this.get_container()[0], t;
+				if(c.scrollHeight > c.offsetHeight) {
+					obj = this._get_node(obj);
+					if(!obj || obj === -1 || !obj.length || !obj.is(":visible")) { return; }
+					t = obj.offset().top - this.get_container().offset().top;
+					if(t < 0) { 
+						c.scrollTop = c.scrollTop + t - 1; 
+					}
+					if(t + this.data.core.li_height + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0) > c.offsetHeight) { 
+						c.scrollTop = c.scrollTop + (t - c.offsetHeight + this.data.core.li_height + 1 + (c.scrollWidth > c.offsetWidth ? scrollbar_width : 0)); 
+					}
+				}
+			},
+			deselect_node : function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				if(this.is_selected(obj)) {
+					obj.children("a").removeClass("jstree-clicked");
+					this.data.ui.selected = this.data.ui.selected.not(obj);
+					if(this.data.ui.last_selected.get(0) === obj.get(0)) { this.data.ui.last_selected = this.data.ui.selected.eq(0); }
+					this.__callback({ "obj" : obj });
+				}
+			},
+			toggle_select : function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return false; }
+				if(this.is_selected(obj)) { this.deselect_node(obj); }
+				else { this.select_node(obj); }
+			},
+			is_selected : function (obj) { return this.data.ui.selected.index(this._get_node(obj)) >= 0; },
+			get_selected : function (context) { 
+				return context ? $(context).find("a.jstree-clicked").parent() : this.data.ui.selected; 
+			},
+			deselect_all : function (context) {
+				var ret = context ? $(context).find("a.jstree-clicked").parent() : this.get_container().find("a.jstree-clicked").parent();
+				ret.children("a.jstree-clicked").removeClass("jstree-clicked");
+				this.data.ui.selected = $([]);
+				this.data.ui.last_selected = false;
+				this.__callback({ "obj" : ret });
+			}
+		}
+	});
+	// include the selection plugin by default
+	$.jstree.defaults.plugins.push("ui");
+})(jQuery);
+//*/
+
+/* 
+ * jsTree CRRM plugin
+ * Handles creating/renaming/removing/moving nodes by user interaction.
+ */
+(function ($) {
+	$.jstree.plugin("crrm", { 
+		__init : function () {
+			this.get_container()
+				.bind("move_node.jstree", $.proxy(function (e, data) {
+					if(this._get_settings().crrm.move.open_onmove) {
+						var t = this;
+						data.rslt.np.parentsUntil(".jstree").andSelf().filter(".jstree-closed").each(function () {
+							t.open_node(this, false, true);
+						});
+					}
+				}, this));
+		},
+		defaults : {
+			input_width_limit : 200,
+			move : {
+				always_copy			: false, // false, true or "multitree"
+				open_onmove			: true,
+				default_position	: "last",
+				check_move			: function (m) { return true; }
+			}
+		},
+		_fn : {
+			_show_input : function (obj, callback) {
+				obj = this._get_node(obj);
+				var rtl = this._get_settings().core.rtl,
+					w = this._get_settings().crrm.input_width_limit,
+					w1 = obj.children("ins").width(),
+					w2 = obj.find("> a:visible > ins").width() * obj.find("> a:visible > ins").length,
+					t = this.get_text(obj),
+					h1 = $("<div />", { css : { "position" : "absolute", "top" : "-200px", "left" : (rtl ? "0px" : "-1000px"), "visibility" : "hidden" } }).appendTo("body"),
+					h2 = obj.css("position","relative").append(
+					$("<input />", { 
+						"value" : t,
+						"class" : "jstree-rename-input",
+						// "size" : t.length,
+						"css" : {
+							"padding" : "0",
+							"border" : "1px solid silver",
+							"position" : "absolute",
+							"left"  : (rtl ? "auto" : (w1 + w2 + 4) + "px"),
+							"right" : (rtl ? (w1 + w2 + 4) + "px" : "auto"),
+							"top" : "0px",
+							"height" : (this.data.core.li_height - 2) + "px",
+							"lineHeight" : (this.data.core.li_height - 2) + "px",
+							"width" : "150px" // will be set a bit further down
+						},
+						"blur" : $.proxy(function () {
+							var i = obj.children(".jstree-rename-input"),
+								v = i.val();
+							if(v === "") { v = t; }
+							h1.remove();
+							i.remove(); // rollback purposes
+							this.set_text(obj,t); // rollback purposes
+							this.rename_node(obj, v);
+							callback.call(this, obj, v, t);
+							obj.css("position","");
+						}, this),
+						"keyup" : function (event) {
+							var key = event.keyCode || event.which;
+							if(key == 27) { this.value = t; this.blur(); return; }
+							else if(key == 13) { this.blur(); return; }
+							else {
+								h2.width(Math.min(h1.text("pW" + this.value).width(),w));
+							}
+						},
+						"keypress" : function(event) {
+							var key = event.keyCode || event.which;
+							if(key == 13) { return false; }
+						}
+					})
+				).children(".jstree-rename-input"); 
+				this.set_text(obj, "");
+				h1.css({
+						fontFamily		: h2.css('fontFamily')		|| '',
+						fontSize		: h2.css('fontSize')		|| '',
+						fontWeight		: h2.css('fontWeight')		|| '',
+						fontStyle		: h2.css('fontStyle')		|| '',
+						fontStretch		: h2.css('fontStretch')		|| '',
+						fontVariant		: h2.css('fontVariant')		|| '',
+						letterSpacing	: h2.css('letterSpacing')	|| '',
+						wordSpacing		: h2.css('wordSpacing')		|| ''
+				});
+				h2.width(Math.min(h1.text("pW" + h2[0].value).width(),w))[0].select();
+			},
+			rename : function (obj) {
+				obj = this._get_node(obj);
+				this.__rollback();
+				var f = this.__callback;
+				this._show_input(obj, function (obj, new_name, old_name) { 
+					f.call(this, { "obj" : obj, "new_name" : new_name, "old_name" : old_name });
+				});
+			},
+			create : function (obj, position, js, callback, skip_rename) {
+				var t, _this = this;
+				obj = this._get_node(obj);
+				if(!obj) { obj = -1; }
+				this.__rollback();
+				t = this.create_node(obj, position, js, function (t) {
+					var p = this._get_parent(t),
+						pos = $(t).index();
+					if(callback) { callback.call(this, t); }
+					if(p.length && p.hasClass("jstree-closed")) { this.open_node(p, false, true); }
+					if(!skip_rename) { 
+						this._show_input(t, function (obj, new_name, old_name) { 
+							_this.__callback({ "obj" : obj, "name" : new_name, "parent" : p, "position" : pos });
+						});
+					}
+					else { _this.__callback({ "obj" : t, "name" : this.get_text(t), "parent" : p, "position" : pos }); }
+				});
+				return t;
+			},
+			remove : function (obj) {
+				obj = this._get_node(obj, true);
+				var p = this._get_parent(obj), prev = this._get_prev(obj);
+				this.__rollback();
+				obj = this.delete_node(obj);
+				if(obj !== false) { this.__callback({ "obj" : obj, "prev" : prev, "parent" : p }); }
+			},
+			check_move : function () {
+				if(!this.__call_old()) { return false; }
+				var s = this._get_settings().crrm.move;
+				if(!s.check_move.call(this, this._get_move())) { return false; }
+				return true;
+			},
+			move_node : function (obj, ref, position, is_copy, is_prepared, skip_check) {
+				var s = this._get_settings().crrm.move;
+				if(!is_prepared) { 
+					if(typeof position === "undefined") { position = s.default_position; }
+					if(position === "inside" && !s.default_position.match(/^(before|after)$/)) { position = s.default_position; }
+					return this.__call_old(true, obj, ref, position, is_copy, false, skip_check);
+				}
+				// if the move is already prepared
+				if(s.always_copy === true || (s.always_copy === "multitree" && obj.rt.get_index() !== obj.ot.get_index() )) {
+					is_copy = true;
+				}
+				this.__call_old(true, obj, ref, position, is_copy, true, skip_check);
+			},
+
+			cut : function (obj) {
+				obj = this._get_node(obj, true);
+				if(!obj || !obj.length) { return false; }
+				this.data.crrm.cp_nodes = false;
+				this.data.crrm.ct_nodes = obj;
+				this.__callback({ "obj" : obj });
+			},
+			copy : function (obj) {
+				obj = this._get_node(obj, true);
+				if(!obj || !obj.length) { return false; }
+				this.data.crrm.ct_nodes = false;
+				this.data.crrm.cp_nodes = obj;
+				this.__callback({ "obj" : obj });
+			},
+			paste : function (obj) { 
+				obj = this._get_node(obj);
+				if(!obj || !obj.length) { return false; }
+				var nodes = this.data.crrm.ct_nodes ? this.data.crrm.ct_nodes : this.data.crrm.cp_nodes;
+				if(!this.data.crrm.ct_nodes && !this.data.crrm.cp_nodes) { return false; }
+				if(this.data.crrm.ct_nodes) { this.move_node(this.data.crrm.ct_nodes, obj); this.data.crrm.ct_nodes = false; }
+				if(this.data.crrm.cp_nodes) { this.move_node(this.data.crrm.cp_nodes, obj, false, true); }
+				this.__callback({ "obj" : obj, "nodes" : nodes });
+			}
+		}
+	});
+	// include the crr plugin by default
+	// $.jstree.defaults.plugins.push("crrm");
+})(jQuery);
+//*/
+
+/* 
+ * jsTree themes plugin
+ * Handles loading and setting themes, as well as detecting path to themes, etc.
+ */
+(function ($) {
+	var themes_loaded = [];
+	// this variable stores the path to the themes folder - if left as false - it will be autodetected
+	$.jstree._themes = false;
+	$.jstree.plugin("themes", {
+		__init : function () { 
+			this.get_container()
+				.bind("init.jstree", $.proxy(function () {
+						var s = this._get_settings().themes;
+						this.data.themes.dots = s.dots; 
+						this.data.themes.icons = s.icons; 
+						this.set_theme(s.theme, s.url);
+					}, this))
+				.bind("loaded.jstree", $.proxy(function () {
+						// bound here too, as simple HTML tree's won't honor dots & icons otherwise
+						if(!this.data.themes.dots) { this.hide_dots(); }
+						else { this.show_dots(); }
+						if(!this.data.themes.icons) { this.hide_icons(); }
+						else { this.show_icons(); }
+					}, this));
+		},
+		defaults : { 
+			theme : "default", 
+			url : false,
+			dots : true,
+			icons : true
+		},
+		_fn : {
+			set_theme : function (theme_name, theme_url) {
+				if(!theme_name) { return false; }
+				if(!theme_url) { theme_url = $.jstree._themes + theme_name + '/style.css'; }
+				if($.inArray(theme_url, themes_loaded) == -1) {
+					$.vakata.css.add_sheet({ "url" : theme_url });
+					themes_loaded.push(theme_url);
+				}
+				if(this.data.themes.theme != theme_name) {
+					this.get_container().removeClass('jstree-' + this.data.themes.theme);
+					this.data.themes.theme = theme_name;
+				}
+				this.get_container().addClass('jstree-' + theme_name);
+				if(!this.data.themes.dots) { this.hide_dots(); }
+				else { this.show_dots(); }
+				if(!this.data.themes.icons) { this.hide_icons(); }
+				else { this.show_icons(); }
+				this.__callback();
+			},
+			get_theme	: function () { return this.data.themes.theme; },
+
+			show_dots	: function () { this.data.themes.dots = true; this.get_container().children("ul").removeClass("jstree-no-dots"); },
+			hide_dots	: function () { this.data.themes.dots = false; this.get_container().children("ul").addClass("jstree-no-dots"); },
+			toggle_dots	: function () { if(this.data.themes.dots) { this.hide_dots(); } else { this.show_dots(); } },
+
+			show_icons	: function () { this.data.themes.icons = true; this.get_container().children("ul").removeClass("jstree-no-icons"); },
+			hide_icons	: function () { this.data.themes.icons = false; this.get_container().children("ul").addClass("jstree-no-icons"); },
+			toggle_icons: function () { if(this.data.themes.icons) { this.hide_icons(); } else { this.show_icons(); } }
+		}
+	});
+	// autodetect themes path
+	$(function () {
+		if($.jstree._themes === false) {
+			$("script").each(function () { 
+				if(this.src.toString().match(/jquery\.jstree[^\/]*?\.js(\?.*)?$/)) { 
+					$.jstree._themes = this.src.toString().replace(/jquery\.jstree[^\/]*?\.js(\?.*)?$/, "") + 'themes/'; 
+					return false; 
+				}
+			});
+		}
+		if($.jstree._themes === false) { $.jstree._themes = "themes/"; }
+	});
+	// include the themes plugin by default
+	$.jstree.defaults.plugins.push("themes");
+})(jQuery);
+//*/
+
+/*
+ * jsTree hotkeys plugin
+ * Enables keyboard navigation for all tree instances
+ * Depends on the jstree ui & jquery hotkeys plugins
+ */
+(function ($) {
+	var bound = [];
+	function exec(i, event) {
+		var f = $.jstree._focused(), tmp;
+		if(f && f.data && f.data.hotkeys && f.data.hotkeys.enabled) { 
+			tmp = f._get_settings().hotkeys[i];
+			if(tmp) { return tmp.call(f, event); }
+		}
+	}
+	$.jstree.plugin("hotkeys", {
+		__init : function () {
+			if(typeof $.hotkeys === "undefined") { throw "jsTree hotkeys: jQuery hotkeys plugin not included."; }
+			if(!this.data.ui) { throw "jsTree hotkeys: jsTree UI plugin not included."; }
+			$.each(this._get_settings().hotkeys, function (i, v) {
+				if(v !== false && $.inArray(i, bound) == -1) {
+					$(document).bind("keydown", i, function (event) { return exec(i, event); });
+					bound.push(i);
+				}
+			});
+			this.get_container()
+				.bind("lock.jstree", $.proxy(function () {
+						if(this.data.hotkeys.enabled) { this.data.hotkeys.enabled = false; this.data.hotkeys.revert = true; }
+					}, this))
+				.bind("unlock.jstree", $.proxy(function () {
+						if(this.data.hotkeys.revert) { this.data.hotkeys.enabled = true; }
+					}, this));
+			this.enable_hotkeys();
+		},
+		defaults : {
+			"up" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_prev(o));
+				return false; 
+			},
+			"ctrl+up" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_prev(o));
+				return false; 
+			},
+			"shift+up" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_prev(o));
+				return false; 
+			},
+			"down" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_next(o));
+				return false;
+			},
+			"ctrl+down" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_next(o));
+				return false;
+			},
+			"shift+down" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected || -1;
+				this.hover_node(this._get_next(o));
+				return false;
+			},
+			"left" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o) {
+					if(o.hasClass("jstree-open")) { this.close_node(o); }
+					else { this.hover_node(this._get_prev(o)); }
+				}
+				return false;
+			},
+			"ctrl+left" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o) {
+					if(o.hasClass("jstree-open")) { this.close_node(o); }
+					else { this.hover_node(this._get_prev(o)); }
+				}
+				return false;
+			},
+			"shift+left" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o) {
+					if(o.hasClass("jstree-open")) { this.close_node(o); }
+					else { this.hover_node(this._get_prev(o)); }
+				}
+				return false;
+			},
+			"right" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o && o.length) {
+					if(o.hasClass("jstree-closed")) { this.open_node(o); }
+					else { this.hover_node(this._get_next(o)); }
+				}
+				return false;
+			},
+			"ctrl+right" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o && o.length) {
+					if(o.hasClass("jstree-closed")) { this.open_node(o); }
+					else { this.hover_node(this._get_next(o)); }
+				}
+				return false;
+			},
+			"shift+right" : function () { 
+				var o = this.data.ui.hovered || this.data.ui.last_selected;
+				if(o && o.length) {
+					if(o.hasClass("jstree-closed")) { this.open_node(o); }
+					else { this.hover_node(this._get_next(o)); }
+				}
+				return false;
+			},
+			"space" : function () { 
+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").click(); } 
+				return false; 
+			},
+			"ctrl+space" : function (event) { 
+				event.type = "click";
+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 
+				return false; 
+			},
+			"shift+space" : function (event) { 
+				event.type = "click";
+				if(this.data.ui.hovered) { this.data.ui.hovered.children("a:eq(0)").trigger(event); } 
+				return false; 
+			},
+			"f2" : function () { this.rename(this.data.ui.hovered || this.data.ui.last_selected); },
+			"del" : function () { this.remove(this.data.ui.hovered || this._get_node(null)); }
+		},
+		_fn : {
+			enable_hotkeys : function () {
+				this.data.hotkeys.enabled = true;
+			},
+			disable_hotkeys : function () {
+				this.data.hotkeys.enabled = false;
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree JSON plugin
+ * The JSON data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.
+ */
+(function ($) {
+	$.jstree.plugin("json_data", {
+		__init : function() {
+			var s = this._get_settings().json_data;
+			if(s.progressive_unload) {
+				this.get_container().bind("after_close.jstree", function (e, data) {
+					data.rslt.obj.children("ul").remove();
+				});
+			}
+		},
+		defaults : { 
+			// `data` can be a function:
+			//  * accepts two arguments - node being loaded and a callback to pass the result to
+			//  * will be executed in the current tree's scope & ajax won't be supported
+			data : false, 
+			ajax : false,
+			correct_state : true,
+			progressive_render : false,
+			progressive_unload : false
+		},
+		_fn : {
+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_json(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
+			_is_loaded : function (obj) { 
+				var s = this._get_settings().json_data;
+				obj = this._get_node(obj); 
+				return obj == -1 || !obj || (!s.ajax && !s.progressive_render && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").length > 0;
+			},
+			refresh : function (obj) {
+				obj = this._get_node(obj);
+				var s = this._get_settings().json_data;
+				if(obj && obj !== -1 && s.progressive_unload && ($.isFunction(s.data) || !!s.ajax)) {
+					obj.removeData("jstree-children");
+				}
+				return this.__call_old();
+			},
+			load_node_json : function (obj, s_call, e_call) {
+				var s = this.get_settings().json_data, d,
+					error_func = function () {},
+					success_func = function () {};
+				obj = this._get_node(obj);
+
+				if(obj && obj !== -1 && (s.progressive_render || s.progressive_unload) && !obj.is(".jstree-open, .jstree-leaf") && obj.children("ul").children("li").length === 0 && obj.data("jstree-children")) {
+					d = this._parse_json(obj.data("jstree-children"), obj);
+					if(d) {
+						obj.append(d);
+						if(!s.progressive_unload) { obj.removeData("jstree-children"); }
+					}
+					this.clean_node(obj);
+					if(s_call) { s_call.call(this); }
+					return;
+				}
+
+				if(obj && obj !== -1) {
+					if(obj.data("jstree-is-loading")) { return; }
+					else { obj.data("jstree-is-loading",true); }
+				}
+				switch(!0) {
+					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";
+					// function option added here for easier model integration (also supporting async - see callback)
+					case ($.isFunction(s.data)):
+						s.data.call(this, obj, $.proxy(function (d) {
+							d = this._parse_json(d, obj);
+							if(!d) { 
+								if(obj === -1 || !obj) {
+									if(s.correct_state) { this.get_container().children("ul").empty(); }
+								}
+								else {
+									obj.children("a.jstree-loading").removeClass("jstree-loading");
+									obj.removeData("jstree-is-loading");
+									if(s.correct_state) { this.correct_state(obj); }
+								}
+								if(e_call) { e_call.call(this); }
+							}
+							else {
+								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
+								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree-is-loading"); }
+								this.clean_node(obj);
+								if(s_call) { s_call.call(this); }
+							}
+						}, this));
+						break;
+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
+						if(!obj || obj == -1) {
+							d = this._parse_json(s.data, obj);
+							if(d) {
+								this.get_container().children("ul").empty().append(d.children());
+								this.clean_node();
+							}
+							else { 
+								if(s.correct_state) { this.get_container().children("ul").empty(); }
+							}
+						}
+						if(s_call) { s_call.call(this); }
+						break;
+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
+						error_func = function (x, t, e) {
+							var ef = this.get_settings().json_data.ajax.error; 
+							if(ef) { ef.call(this, x, t, e); }
+							if(obj != -1 && obj.length) {
+								obj.children("a.jstree-loading").removeClass("jstree-loading");
+								obj.removeData("jstree-is-loading");
+								if(t === "success" && s.correct_state) { this.correct_state(obj); }
+							}
+							else {
+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
+							}
+							if(e_call) { e_call.call(this); }
+						};
+						success_func = function (d, t, x) {
+							var sf = this.get_settings().json_data.ajax.success; 
+							if(sf) { d = sf.call(this,d,t,x) || d; }
+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "") || (!$.isArray(d) && !$.isPlainObject(d))) {
+								return error_func.call(this, x, t, "");
+							}
+							d = this._parse_json(d, obj);
+							if(d) {
+								if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
+								else { obj.append(d).children("a.jstree-loading").removeClass("jstree-loading"); obj.removeData("jstree-is-loading"); }
+								this.clean_node(obj);
+								if(s_call) { s_call.call(this); }
+							}
+							else {
+								if(obj === -1 || !obj) {
+									if(s.correct_state) { 
+										this.get_container().children("ul").empty(); 
+										if(s_call) { s_call.call(this); }
+									}
+								}
+								else {
+									obj.children("a.jstree-loading").removeClass("jstree-loading");
+									obj.removeData("jstree-is-loading");
+									if(s.correct_state) { 
+										this.correct_state(obj);
+										if(s_call) { s_call.call(this); } 
+									}
+								}
+							}
+						};
+						s.ajax.context = this;
+						s.ajax.error = error_func;
+						s.ajax.success = success_func;
+						if(!s.ajax.dataType) { s.ajax.dataType = "json"; }
+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
+						$.ajax(s.ajax);
+						break;
+				}
+			},
+			_parse_json : function (js, obj, is_callback) {
+				var d = false, 
+					p = this._get_settings(),
+					s = p.json_data,
+					t = p.core.html_titles,
+					tmp, i, j, ul1, ul2;
+
+				if(!js) { return d; }
+				if(s.progressive_unload && obj && obj !== -1) { 
+					obj.data("jstree-children", d);
+				}
+				if($.isArray(js)) {
+					d = $();
+					if(!js.length) { return false; }
+					for(i = 0, j = js.length; i < j; i++) {
+						tmp = this._parse_json(js[i], obj, true);
+						if(tmp.length) { d = d.add(tmp); }
+					}
+				}
+				else {
+					if(typeof js == "string") { js = { data : js }; }
+					if(!js.data && js.data !== "") { return d; }
+					d = $("<li />");
+					if(js.attr) { d.attr(js.attr); }
+					if(js.metadata) { d.data(js.metadata); }
+					if(js.state) { d.addClass("jstree-" + js.state); }
+					if(!$.isArray(js.data)) { tmp = js.data; js.data = []; js.data.push(tmp); }
+					$.each(js.data, function (i, m) {
+						tmp = $("<a />");
+						if($.isFunction(m)) { m = m.call(this, js); }
+						if(typeof m == "string") { tmp.attr('href','#')[ t ? "html" : "text" ](m); }
+						else {
+							if(!m.attr) { m.attr = {}; }
+							if(!m.attr.href) { m.attr.href = '#'; }
+							tmp.attr(m.attr)[ t ? "html" : "text" ](m.title);
+							if(m.language) { tmp.addClass(m.language); }
+						}
+						tmp.prepend("<ins class='jstree-icon'>&#160;</ins>");
+						if(!m.icon && js.icon) { m.icon = js.icon; }
+						if(m.icon) { 
+							if(m.icon.indexOf("/") === -1) { tmp.children("ins").addClass(m.icon); }
+							else { tmp.children("ins").css("background","url('" + m.icon + "') center center no-repeat"); }
+						}
+						d.append(tmp);
+					});
+					d.prepend("<ins class='jstree-icon'>&#160;</ins>");
+					if(js.children) { 
+						if(s.progressive_render && js.state !== "open") {
+							d.addClass("jstree-closed").data("jstree-children", js.children);
+						}
+						else {
+							if(s.progressive_unload) { d.data("jstree-children", js.children); }
+							if($.isArray(js.children) && js.children.length) {
+								tmp = this._parse_json(js.children, obj, true);
+								if(tmp.length) {
+									ul2 = $("<ul />");
+									ul2.append(tmp);
+									d.append(ul2);
+								}
+							}
+						}
+					}
+				}
+				if(!is_callback) {
+					ul1 = $("<ul />");
+					ul1.append(d);
+					d = ul1;
+				}
+				return d;
+			},
+			get_json : function (obj, li_attr, a_attr, is_callback) {
+				var result = [], 
+					s = this._get_settings(), 
+					_this = this,
+					tmp1, tmp2, li, a, t, lang;
+				obj = this._get_node(obj);
+				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }
+				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];
+				if(!is_callback && this.data.types) { li_attr.push(s.types.type_attr); }
+				a_attr = $.isArray(a_attr) ? a_attr : [ ];
+
+				obj.each(function () {
+					li = $(this);
+					tmp1 = { data : [] };
+					if(li_attr.length) { tmp1.attr = { }; }
+					$.each(li_attr, function (i, v) { 
+						tmp2 = li.attr(v); 
+						if(tmp2 && tmp2.length && tmp2.replace(/jstree[^ ]*/ig,'').length) {
+							tmp1.attr[v] = (" " + tmp2).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,""); 
+						}
+					});
+					if(li.hasClass("jstree-open")) { tmp1.state = "open"; }
+					if(li.hasClass("jstree-closed")) { tmp1.state = "closed"; }
+					if(li.data()) { tmp1.metadata = li.data(); }
+					a = li.children("a");
+					a.each(function () {
+						t = $(this);
+						if(
+							a_attr.length || 
+							$.inArray("languages", s.plugins) !== -1 || 
+							t.children("ins").get(0).style.backgroundImage.length || 
+							(t.children("ins").get(0).className && t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').length)
+						) { 
+							lang = false;
+							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {
+								$.each(s.languages, function (l, lv) {
+									if(t.hasClass(lv)) {
+										lang = lv;
+										return false;
+									}
+								});
+							}
+							tmp2 = { attr : { }, title : _this.get_text(t, lang) }; 
+							$.each(a_attr, function (k, z) {
+								tmp2.attr[z] = (" " + (t.attr(z) || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");
+							});
+							if($.inArray("languages", s.plugins) !== -1 && $.isArray(s.languages) && s.languages.length) {
+								$.each(s.languages, function (k, z) {
+									if(t.hasClass(z)) { tmp2.language = z; return true; }
+								});
+							}
+							if(t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {
+								tmp2.icon = t.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"");
+							}
+							if(t.children("ins").get(0).style.backgroundImage.length) {
+								tmp2.icon = t.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","");
+							}
+						}
+						else {
+							tmp2 = _this.get_text(t);
+						}
+						if(a.length > 1) { tmp1.data.push(tmp2); }
+						else { tmp1.data = tmp2; }
+					});
+					li = li.find("> ul > li");
+					if(li.length) { tmp1.children = _this.get_json(li, li_attr, a_attr, true); }
+					result.push(tmp1);
+				});
+				return result;
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree languages plugin
+ * Adds support for multiple language versions in one tree
+ * This basically allows for many titles coexisting in one node, but only one of them being visible at any given time
+ * This is useful for maintaining the same structure in many languages (hence the name of the plugin)
+ */
+(function ($) {
+	$.jstree.plugin("languages", {
+		__init : function () { this._load_css();  },
+		defaults : [],
+		_fn : {
+			set_lang : function (i) { 
+				var langs = this._get_settings().languages,
+					st = false,
+					selector = ".jstree-" + this.get_index() + ' a';
+				if(!$.isArray(langs) || langs.length === 0) { return false; }
+				if($.inArray(i,langs) == -1) {
+					if(!!langs[i]) { i = langs[i]; }
+					else { return false; }
+				}
+				if(i == this.data.languages.current_language) { return true; }
+				st = $.vakata.css.get_css(selector + "." + this.data.languages.current_language, false, this.data.languages.language_css);
+				if(st !== false) { st.style.display = "none"; }
+				st = $.vakata.css.get_css(selector + "." + i, false, this.data.languages.language_css);
+				if(st !== false) { st.style.display = ""; }
+				this.data.languages.current_language = i;
+				this.__callback(i);
+				return true;
+			},
+			get_lang : function () {
+				return this.data.languages.current_language;
+			},
+			_get_string : function (key, lang) {
+				var langs = this._get_settings().languages,
+					s = this._get_settings().core.strings;
+				if($.isArray(langs) && langs.length) {
+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
+				}
+				if(s[lang] && s[lang][key]) { return s[lang][key]; }
+				if(s[key]) { return s[key]; }
+				return key;
+			},
+			get_text : function (obj, lang) {
+				obj = this._get_node(obj) || this.data.ui.last_selected;
+				if(!obj.size()) { return false; }
+				var langs = this._get_settings().languages,
+					s = this._get_settings().core.html_titles;
+				if($.isArray(langs) && langs.length) {
+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
+					obj = obj.children("a." + lang);
+				}
+				else { obj = obj.children("a:eq(0)"); }
+				if(s) {
+					obj = obj.clone();
+					obj.children("INS").remove();
+					return obj.html();
+				}
+				else {
+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
+					return obj.nodeValue;
+				}
+			},
+			set_text : function (obj, val, lang) {
+				obj = this._get_node(obj) || this.data.ui.last_selected;
+				if(!obj.size()) { return false; }
+				var langs = this._get_settings().languages,
+					s = this._get_settings().core.html_titles,
+					tmp;
+				if($.isArray(langs) && langs.length) {
+					lang = (lang && $.inArray(lang,langs) != -1) ? lang : this.data.languages.current_language;
+					obj = obj.children("a." + lang);
+				}
+				else { obj = obj.children("a:eq(0)"); }
+				if(s) {
+					tmp = obj.children("INS").clone();
+					obj.html(val).prepend(tmp);
+					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });
+					return true;
+				}
+				else {
+					obj = obj.contents().filter(function() { return this.nodeType == 3; })[0];
+					this.__callback({ "obj" : obj, "name" : val, "lang" : lang });
+					return (obj.nodeValue = val);
+				}
+			},
+			_load_css : function () {
+				var langs = this._get_settings().languages,
+					str = "/* languages css */",
+					selector = ".jstree-" + this.get_index() + ' a',
+					ln;
+				if($.isArray(langs) && langs.length) {
+					this.data.languages.current_language = langs[0];
+					for(ln = 0; ln < langs.length; ln++) {
+						str += selector + "." + langs[ln] + " {";
+						if(langs[ln] != this.data.languages.current_language) { str += " display:none; "; }
+						str += " } ";
+					}
+					this.data.languages.language_css = $.vakata.css.add_sheet({ 'str' : str, 'title' : "jstree-languages" });
+				}
+			},
+			create_node : function (obj, position, js, callback) {
+				var t = this.__call_old(true, obj, position, js, function (t) {
+					var langs = this._get_settings().languages,
+						a = t.children("a"),
+						ln;
+					if($.isArray(langs) && langs.length) {
+						for(ln = 0; ln < langs.length; ln++) {
+							if(!a.is("." + langs[ln])) {
+								t.append(a.eq(0).clone().removeClass(langs.join(" ")).addClass(langs[ln]));
+							}
+						}
+						a.not("." + langs.join(", .")).remove();
+					}
+					if(callback) { callback.call(this, t); }
+				});
+				return t;
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/*
+ * jsTree cookies plugin
+ * Stores the currently opened/selected nodes in a cookie and then restores them
+ * Depends on the jquery.cookie plugin
+ */
+(function ($) {
+	$.jstree.plugin("cookies", {
+		__init : function () {
+			if(typeof $.cookie === "undefined") { throw "jsTree cookie: jQuery cookie plugin not included."; }
+
+			var s = this._get_settings().cookies,
+				tmp;
+			if(!!s.save_loaded) {
+				tmp = $.cookie(s.save_loaded);
+				if(tmp && tmp.length) { this.data.core.to_load = tmp.split(","); }
+			}
+			if(!!s.save_opened) {
+				tmp = $.cookie(s.save_opened);
+				if(tmp && tmp.length) { this.data.core.to_open = tmp.split(","); }
+			}
+			if(!!s.save_selected) {
+				tmp = $.cookie(s.save_selected);
+				if(tmp && tmp.length && this.data.ui) { this.data.ui.to_select = tmp.split(","); }
+			}
+			this.get_container()
+				.one( ( this.data.ui ? "reselect" : "reopen" ) + ".jstree", $.proxy(function () {
+					this.get_container()
+						.bind("open_node.jstree close_node.jstree select_node.jstree deselect_node.jstree", $.proxy(function (e) { 
+								if(this._get_settings().cookies.auto_save) { this.save_cookie((e.handleObj.namespace + e.handleObj.type).replace("jstree","")); }
+							}, this));
+				}, this));
+		},
+		defaults : {
+			save_loaded		: "jstree_load",
+			save_opened		: "jstree_open",
+			save_selected	: "jstree_select",
+			auto_save		: true,
+			cookie_options	: {}
+		},
+		_fn : {
+			save_cookie : function (c) {
+				if(this.data.core.refreshing) { return; }
+				var s = this._get_settings().cookies;
+				if(!c) { // if called manually and not by event
+					if(s.save_loaded) {
+						this.save_loaded();
+						$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options);
+					}
+					if(s.save_opened) {
+						this.save_opened();
+						$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options);
+					}
+					if(s.save_selected && this.data.ui) {
+						this.save_selected();
+						$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options);
+					}
+					return;
+				}
+				switch(c) {
+					case "open_node":
+					case "close_node":
+						if(!!s.save_opened) { 
+							this.save_opened(); 
+							$.cookie(s.save_opened, this.data.core.to_open.join(","), s.cookie_options); 
+						}
+						if(!!s.save_loaded) { 
+							this.save_loaded(); 
+							$.cookie(s.save_loaded, this.data.core.to_load.join(","), s.cookie_options); 
+						}
+						break;
+					case "select_node":
+					case "deselect_node":
+						if(!!s.save_selected && this.data.ui) { 
+							this.save_selected(); 
+							$.cookie(s.save_selected, this.data.ui.to_select.join(","), s.cookie_options); 
+						}
+						break;
+				}
+			}
+		}
+	});
+	// include cookies by default
+	// $.jstree.defaults.plugins.push("cookies");
+})(jQuery);
+//*/
+
+/*
+ * jsTree sort plugin
+ * Sorts items alphabetically (or using any other function)
+ */
+(function ($) {
+	$.jstree.plugin("sort", {
+		__init : function () {
+			this.get_container()
+				.bind("load_node.jstree", $.proxy(function (e, data) {
+						var obj = this._get_node(data.rslt.obj);
+						obj = obj === -1 ? this.get_container().children("ul") : obj.children("ul");
+						this.sort(obj);
+					}, this))
+				.bind("rename_node.jstree create_node.jstree create.jstree", $.proxy(function (e, data) {
+						this.sort(data.rslt.obj.parent());
+					}, this))
+				.bind("move_node.jstree", $.proxy(function (e, data) {
+						var m = data.rslt.np == -1 ? this.get_container() : data.rslt.np;
+						this.sort(m.children("ul"));
+					}, this));
+		},
+		defaults : function (a, b) { return this.get_text(a) > this.get_text(b) ? 1 : -1; },
+		_fn : {
+			sort : function (obj) {
+				var s = this._get_settings().sort,
+					t = this;
+				obj.append($.makeArray(obj.children("li")).sort($.proxy(s, t)));
+				obj.find("> li > ul").each(function() { t.sort($(this)); });
+				this.clean_node(obj);
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/*
+ * jsTree DND plugin
+ * Drag and drop plugin for moving/copying nodes
+ */
+(function ($) {
+	var o = false,
+		r = false,
+		m = false,
+		ml = false,
+		sli = false,
+		sti = false,
+		dir1 = false,
+		dir2 = false,
+		last_pos = false;
+	$.vakata.dnd = {
+		is_down : false,
+		is_drag : false,
+		helper : false,
+		scroll_spd : 10,
+		init_x : 0,
+		init_y : 0,
+		threshold : 5,
+		helper_left : 5,
+		helper_top : 10,
+		user_data : {},
+
+		drag_start : function (e, data, html) { 
+			if($.vakata.dnd.is_drag) { $.vakata.drag_stop({}); }
+			try {
+				e.currentTarget.unselectable = "on";
+				e.currentTarget.onselectstart = function() { return false; };
+				if(e.currentTarget.style) { e.currentTarget.style.MozUserSelect = "none"; }
+			} catch(err) { }
+			$.vakata.dnd.init_x = e.pageX;
+			$.vakata.dnd.init_y = e.pageY;
+			$.vakata.dnd.user_data = data;
+			$.vakata.dnd.is_down = true;
+			$.vakata.dnd.helper = $("<div id='vakata-dragged' />").html(html); //.fadeTo(10,0.25);
+			$(document).bind("mousemove", $.vakata.dnd.drag);
+			$(document).bind("mouseup", $.vakata.dnd.drag_stop);
+			return false;
+		},
+		drag : function (e) { 
+			if(!$.vakata.dnd.is_down) { return; }
+			if(!$.vakata.dnd.is_drag) {
+				if(Math.abs(e.pageX - $.vakata.dnd.init_x) > 5 || Math.abs(e.pageY - $.vakata.dnd.init_y) > 5) { 
+					$.vakata.dnd.helper.appendTo("body");
+					$.vakata.dnd.is_drag = true;
+					$(document).triggerHandler("drag_start.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
+				}
+				else { return; }
+			}
+
+			// maybe use a scrolling parent element instead of document?
+			if(e.type === "mousemove") { // thought of adding scroll in order to move the helper, but mouse poisition is n/a
+				var d = $(document), t = d.scrollTop(), l = d.scrollLeft();
+				if(e.pageY - t < 20) { 
+					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }
+					if(!sti) { dir1 = "up"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() - $.vakata.dnd.scroll_spd); }, 150); }
+				}
+				else { 
+					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }
+				}
+				if($(window).height() - (e.pageY - t) < 20) {
+					if(sti && dir1 === "up") { clearInterval(sti); sti = false; }
+					if(!sti) { dir1 = "down"; sti = setInterval(function () { $(document).scrollTop($(document).scrollTop() + $.vakata.dnd.scroll_spd); }, 150); }
+				}
+				else { 
+					if(sti && dir1 === "down") { clearInterval(sti); sti = false; }
+				}
+
+				if(e.pageX - l < 20) {
+					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }
+					if(!sli) { dir2 = "left"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() - $.vakata.dnd.scroll_spd); }, 150); }
+				}
+				else { 
+					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }
+				}
+				if($(window).width() - (e.pageX - l) < 20) {
+					if(sli && dir2 === "left") { clearInterval(sli); sli = false; }
+					if(!sli) { dir2 = "right"; sli = setInterval(function () { $(document).scrollLeft($(document).scrollLeft() + $.vakata.dnd.scroll_spd); }, 150); }
+				}
+				else { 
+					if(sli && dir2 === "right") { clearInterval(sli); sli = false; }
+				}
+			}
+
+			$.vakata.dnd.helper.css({ left : (e.pageX + $.vakata.dnd.helper_left) + "px", top : (e.pageY + $.vakata.dnd.helper_top) + "px" });
+			$(document).triggerHandler("drag.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
+		},
+		drag_stop : function (e) {
+			if(sli) { clearInterval(sli); }
+			if(sti) { clearInterval(sti); }
+			$(document).unbind("mousemove", $.vakata.dnd.drag);
+			$(document).unbind("mouseup", $.vakata.dnd.drag_stop);
+			$(document).triggerHandler("drag_stop.vakata", { "event" : e, "data" : $.vakata.dnd.user_data });
+			$.vakata.dnd.helper.remove();
+			$.vakata.dnd.init_x = 0;
+			$.vakata.dnd.init_y = 0;
+			$.vakata.dnd.user_data = {};
+			$.vakata.dnd.is_down = false;
+			$.vakata.dnd.is_drag = false;
+		}
+	};
+	$(function() {
+		var css_string = '#vakata-dragged { display:block; margin:0 0 0 0; padding:4px 4px 4px 24px; position:absolute; top:-2000px; line-height:16px; z-index:10000; } ';
+		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });
+	});
+
+	$.jstree.plugin("dnd", {
+		__init : function () {
+			this.data.dnd = {
+				active : false,
+				after : false,
+				inside : false,
+				before : false,
+				off : false,
+				prepared : false,
+				w : 0,
+				to1 : false,
+				to2 : false,
+				cof : false,
+				cw : false,
+				ch : false,
+				i1 : false,
+				i2 : false,
+				mto : false
+			};
+			this.get_container()
+				.bind("mouseenter.jstree", $.proxy(function (e) {
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							if(this.data.themes) {
+								m.attr("class", "jstree-" + this.data.themes.theme); 
+								if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
+								$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme);
+							}
+							//if($(e.currentTarget).find("> ul > li").length === 0) {
+							if(e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree
+								var tr = $.jstree._reference(e.target), dc;
+								if(tr.data.dnd.foreign) {
+									dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
+									if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {
+										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
+									}
+								}
+								else {
+									tr.prepare_move(o, tr.get_container(), "last");
+									if(tr.check_move()) {
+										$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
+									}
+								}
+							}
+						}
+					}, this))
+				.bind("mouseup.jstree", $.proxy(function (e) {
+						//if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && $(e.currentTarget).find("> ul > li").length === 0) {
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && e.currentTarget === e.target && $.vakata.dnd.user_data.obj && $($.vakata.dnd.user_data.obj).length && $($.vakata.dnd.user_data.obj).parents(".jstree:eq(0)")[0] !== e.target) { // node should not be from the same tree
+							var tr = $.jstree._reference(e.currentTarget), dc;
+							if(tr.data.dnd.foreign) {
+								dc = tr._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
+								if(dc === true || dc.inside === true || dc.before === true || dc.after === true) {
+									tr._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : tr.get_container(), is_root : true });
+								}
+							}
+							else {
+								tr.move_node(o, tr.get_container(), "last", e[tr._get_settings().dnd.copy_modifier + "Key"]);
+							}
+						}
+					}, this))
+				.bind("mouseleave.jstree", $.proxy(function (e) {
+						if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {
+							return false; 
+						}
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
+							if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
+							if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
+							if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
+							if($.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
+								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
+							}
+						}
+					}, this))
+				.bind("mousemove.jstree", $.proxy(function (e) {
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							var cnt = this.get_container()[0];
+
+							// Horizontal scroll
+							if(e.pageX + 24 > this.data.dnd.cof.left + this.data.dnd.cw) {
+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
+								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft += $.vakata.dnd.scroll_spd; }, cnt), 100);
+							}
+							else if(e.pageX - 24 < this.data.dnd.cof.left) {
+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
+								this.data.dnd.i1 = setInterval($.proxy(function () { this.scrollLeft -= $.vakata.dnd.scroll_spd; }, cnt), 100);
+							}
+							else {
+								if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
+							}
+
+							// Vertical scroll
+							if(e.pageY + 24 > this.data.dnd.cof.top + this.data.dnd.ch) {
+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
+								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop += $.vakata.dnd.scroll_spd; }, cnt), 100);
+							}
+							else if(e.pageY - 24 < this.data.dnd.cof.top) {
+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
+								this.data.dnd.i2 = setInterval($.proxy(function () { this.scrollTop -= $.vakata.dnd.scroll_spd; }, cnt), 100);
+							}
+							else {
+								if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
+							}
+
+						}
+					}, this))
+				.bind("scroll.jstree", $.proxy(function (e) { 
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && m && ml) {
+							m.hide();
+							ml.hide();
+						}
+					}, this))
+				.delegate("a", "mousedown.jstree", $.proxy(function (e) { 
+						if(e.which === 1) {
+							this.start_drag(e.currentTarget, e);
+							return false;
+						}
+					}, this))
+				.delegate("a", "mouseenter.jstree", $.proxy(function (e) { 
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							this.dnd_enter(e.currentTarget);
+						}
+					}, this))
+				.delegate("a", "mousemove.jstree", $.proxy(function (e) { 
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							if(!r || !r.length || r.children("a")[0] !== e.currentTarget) {
+								this.dnd_enter(e.currentTarget);
+							}
+							if(typeof this.data.dnd.off.top === "undefined") { this.data.dnd.off = $(e.target).offset(); }
+							this.data.dnd.w = (e.pageY - (this.data.dnd.off.top || 0)) % this.data.core.li_height;
+							if(this.data.dnd.w < 0) { this.data.dnd.w += this.data.core.li_height; }
+							this.dnd_show();
+						}
+					}, this))
+				.delegate("a", "mouseleave.jstree", $.proxy(function (e) { 
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							if(e.relatedTarget && e.relatedTarget.id && e.relatedTarget.id === "jstree-marker-line") {
+								return false; 
+							}
+								if(m) { m.hide(); }
+								if(ml) { ml.hide(); }
+							/*
+							var ec = $(e.currentTarget).closest("li"), 
+								er = $(e.relatedTarget).closest("li");
+							if(er[0] !== ec.prev()[0] && er[0] !== ec.next()[0]) {
+								if(m) { m.hide(); }
+								if(ml) { ml.hide(); }
+							}
+							*/
+							this.data.dnd.mto = setTimeout( 
+								(function (t) { return function () { t.dnd_leave(e); }; })(this),
+							0);
+						}
+					}, this))
+				.delegate("a", "mouseup.jstree", $.proxy(function (e) { 
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree) {
+							this.dnd_finish(e);
+						}
+					}, this));
+
+			$(document)
+				.bind("drag_stop.vakata", $.proxy(function () {
+						if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
+						if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
+						if(this.data.dnd.i1) { clearInterval(this.data.dnd.i1); }
+						if(this.data.dnd.i2) { clearInterval(this.data.dnd.i2); }
+						this.data.dnd.after		= false;
+						this.data.dnd.before	= false;
+						this.data.dnd.inside	= false;
+						this.data.dnd.off		= false;
+						this.data.dnd.prepared	= false;
+						this.data.dnd.w			= false;
+						this.data.dnd.to1		= false;
+						this.data.dnd.to2		= false;
+						this.data.dnd.i1		= false;
+						this.data.dnd.i2		= false;
+						this.data.dnd.active	= false;
+						this.data.dnd.foreign	= false;
+						if(m) { m.css({ "top" : "-2000px" }); }
+						if(ml) { ml.css({ "top" : "-2000px" }); }
+					}, this))
+				.bind("drag_start.vakata", $.proxy(function (e, data) {
+						if(data.data.jstree) { 
+							var et = $(data.event.target);
+							if(et.closest(".jstree").hasClass("jstree-" + this.get_index())) {
+								this.dnd_enter(et);
+							}
+						}
+					}, this));
+				/*
+				.bind("keydown.jstree-" + this.get_index() + " keyup.jstree-" + this.get_index(), $.proxy(function(e) {
+						if($.vakata.dnd.is_drag && $.vakata.dnd.user_data.jstree && !this.data.dnd.foreign) {
+							var h = $.vakata.dnd.helper.children("ins");
+							if(e[this._get_settings().dnd.copy_modifier + "Key"] && h.hasClass("jstree-ok")) {
+								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, "") + " (Copy)");
+							} 
+							else {
+								h.parent().html(h.parent().html().replace(/ \(Copy\)$/, ""));
+							}
+						}
+					}, this)); */
+
+
+
+			var s = this._get_settings().dnd;
+			if(s.drag_target) {
+				$(document)
+					.delegate(s.drag_target, "mousedown.jstree-" + this.get_index(), $.proxy(function (e) {
+						o = e.target;
+						$.vakata.dnd.drag_start(e, { jstree : true, obj : e.target }, "<ins class='jstree-icon'></ins>" + $(e.target).text() );
+						if(this.data.themes) { 
+							if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }
+							if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
+							$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 
+						}
+						$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
+						var cnt = this.get_container();
+						this.data.dnd.cof = cnt.offset();
+						this.data.dnd.cw = parseInt(cnt.width(),10);
+						this.data.dnd.ch = parseInt(cnt.height(),10);
+						this.data.dnd.foreign = true;
+						e.preventDefault();
+					}, this));
+			}
+			if(s.drop_target) {
+				$(document)
+					.delegate(s.drop_target, "mouseenter.jstree-" + this.get_index(), $.proxy(function (e) {
+							if(this.data.dnd.active && this._get_settings().dnd.drop_check.call(this, { "o" : o, "r" : $(e.target), "e" : e })) {
+								$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
+							}
+						}, this))
+					.delegate(s.drop_target, "mouseleave.jstree-" + this.get_index(), $.proxy(function (e) {
+							if(this.data.dnd.active) {
+								$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
+							}
+						}, this))
+					.delegate(s.drop_target, "mouseup.jstree-" + this.get_index(), $.proxy(function (e) {
+							if(this.data.dnd.active && $.vakata.dnd.helper.children("ins").hasClass("jstree-ok")) {
+								this._get_settings().dnd.drop_finish.call(this, { "o" : o, "r" : $(e.target), "e" : e });
+							}
+						}, this));
+			}
+		},
+		defaults : {
+			copy_modifier	: "ctrl",
+			check_timeout	: 100,
+			open_timeout	: 500,
+			drop_target		: ".jstree-drop",
+			drop_check		: function (data) { return true; },
+			drop_finish		: $.noop,
+			drag_target		: ".jstree-draggable",
+			drag_finish		: $.noop,
+			drag_check		: function (data) { return { after : false, before : false, inside : true }; }
+		},
+		_fn : {
+			dnd_prepare : function () {
+				if(!r || !r.length) { return; }
+				this.data.dnd.off = r.offset();
+				if(this._get_settings().core.rtl) {
+					this.data.dnd.off.right = this.data.dnd.off.left + r.width();
+				}
+				if(this.data.dnd.foreign) {
+					var a = this._get_settings().dnd.drag_check.call(this, { "o" : o, "r" : r });
+					this.data.dnd.after = a.after;
+					this.data.dnd.before = a.before;
+					this.data.dnd.inside = a.inside;
+					this.data.dnd.prepared = true;
+					return this.dnd_show();
+				}
+				this.prepare_move(o, r, "before");
+				this.data.dnd.before = this.check_move();
+				this.prepare_move(o, r, "after");
+				this.data.dnd.after = this.check_move();
+				if(this._is_loaded(r)) {
+					this.prepare_move(o, r, "inside");
+					this.data.dnd.inside = this.check_move();
+				}
+				else {
+					this.data.dnd.inside = false;
+				}
+				this.data.dnd.prepared = true;
+				return this.dnd_show();
+			},
+			dnd_show : function () {
+				if(!this.data.dnd.prepared) { return; }
+				var o = ["before","inside","after"],
+					r = false,
+					rtl = this._get_settings().core.rtl,
+					pos;
+				if(this.data.dnd.w < this.data.core.li_height/3) { o = ["before","inside","after"]; }
+				else if(this.data.dnd.w <= this.data.core.li_height*2/3) {
+					o = this.data.dnd.w < this.data.core.li_height/2 ? ["inside","before","after"] : ["inside","after","before"];
+				}
+				else { o = ["after","inside","before"]; }
+				$.each(o, $.proxy(function (i, val) { 
+					if(this.data.dnd[val]) {
+						$.vakata.dnd.helper.children("ins").attr("class","jstree-ok");
+						r = val;
+						return false;
+					}
+				}, this));
+				if(r === false) { $.vakata.dnd.helper.children("ins").attr("class","jstree-invalid"); }
+				
+				pos = rtl ? (this.data.dnd.off.right - 18) : (this.data.dnd.off.left + 10);
+				switch(r) {
+					case "before":
+						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top - 6) + "px" }).show();
+						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top - 1) + "px" }).show(); }
+						break;
+					case "after":
+						m.css({ "left" : pos + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 6) + "px" }).show();
+						if(ml) { ml.css({ "left" : (pos + 8) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height - 1) + "px" }).show(); }
+						break;
+					case "inside":
+						m.css({ "left" : pos + ( rtl ? -4 : 4) + "px", "top" : (this.data.dnd.off.top + this.data.core.li_height/2 - 5) + "px" }).show();
+						if(ml) { ml.hide(); }
+						break;
+					default:
+						m.hide();
+						if(ml) { ml.hide(); }
+						break;
+				}
+				last_pos = r;
+				return r;
+			},
+			dnd_open : function () {
+				this.data.dnd.to2 = false;
+				this.open_node(r, $.proxy(this.dnd_prepare,this), true);
+			},
+			dnd_finish : function (e) {
+				if(this.data.dnd.foreign) {
+					if(this.data.dnd.after || this.data.dnd.before || this.data.dnd.inside) {
+						this._get_settings().dnd.drag_finish.call(this, { "o" : o, "r" : r, "p" : last_pos });
+					}
+				}
+				else {
+					this.dnd_prepare();
+					this.move_node(o, r, last_pos, e[this._get_settings().dnd.copy_modifier + "Key"]);
+				}
+				o = false;
+				r = false;
+				m.hide();
+				if(ml) { ml.hide(); }
+			},
+			dnd_enter : function (obj) {
+				if(this.data.dnd.mto) { 
+					clearTimeout(this.data.dnd.mto);
+					this.data.dnd.mto = false;
+				}
+				var s = this._get_settings().dnd;
+				this.data.dnd.prepared = false;
+				r = this._get_node(obj);
+				if(s.check_timeout) { 
+					// do the calculations after a minimal timeout (users tend to drag quickly to the desired location)
+					if(this.data.dnd.to1) { clearTimeout(this.data.dnd.to1); }
+					this.data.dnd.to1 = setTimeout($.proxy(this.dnd_prepare, this), s.check_timeout); 
+				}
+				else { 
+					this.dnd_prepare(); 
+				}
+				if(s.open_timeout) { 
+					if(this.data.dnd.to2) { clearTimeout(this.data.dnd.to2); }
+					if(r && r.length && r.hasClass("jstree-closed")) { 
+						// if the node is closed - open it, then recalculate
+						this.data.dnd.to2 = setTimeout($.proxy(this.dnd_open, this), s.open_timeout);
+					}
+				}
+				else {
+					if(r && r.length && r.hasClass("jstree-closed")) { 
+						this.dnd_open();
+					}
+				}
+			},
+			dnd_leave : function (e) {
+				this.data.dnd.after		= false;
+				this.data.dnd.before	= false;
+				this.data.dnd.inside	= false;
+				$.vakata.dnd.helper.children("ins").attr("class","jstree-invalid");
+				m.hide();
+				if(ml) { ml.hide(); }
+				if(r && r[0] === e.target.parentNode) {
+					if(this.data.dnd.to1) {
+						clearTimeout(this.data.dnd.to1);
+						this.data.dnd.to1 = false;
+					}
+					if(this.data.dnd.to2) {
+						clearTimeout(this.data.dnd.to2);
+						this.data.dnd.to2 = false;
+					}
+				}
+			},
+			start_drag : function (obj, e) {
+				o = this._get_node(obj);
+				if(this.data.ui && this.is_selected(o)) { o = this._get_node(null, true); }
+				var dt = o.length > 1 ? this._get_string("multiple_selection") : this.get_text(o),
+					cnt = this.get_container();
+				if(!this._get_settings().core.html_titles) { dt = dt.replace(/</ig,"&lt;").replace(/>/ig,"&gt;"); }
+				$.vakata.dnd.drag_start(e, { jstree : true, obj : o }, "<ins class='jstree-icon'></ins>" + dt );
+				if(this.data.themes) { 
+					if(m) { m.attr("class", "jstree-" + this.data.themes.theme); }
+					if(ml) { ml.attr("class", "jstree-" + this.data.themes.theme); }
+					$.vakata.dnd.helper.attr("class", "jstree-dnd-helper jstree-" + this.data.themes.theme); 
+				}
+				this.data.dnd.cof = cnt.offset();
+				this.data.dnd.cw = parseInt(cnt.width(),10);
+				this.data.dnd.ch = parseInt(cnt.height(),10);
+				this.data.dnd.active = true;
+			}
+		}
+	});
+	$(function() {
+		var css_string = '' + 
+			'#vakata-dragged ins { display:block; text-decoration:none; width:16px; height:16px; margin:0 0 0 0; padding:0; position:absolute; top:4px; left:4px; ' + 
+			' -moz-border-radius:4px; border-radius:4px; -webkit-border-radius:4px; ' +
+			'} ' + 
+			'#vakata-dragged .jstree-ok { background:green; } ' + 
+			'#vakata-dragged .jstree-invalid { background:red; } ' + 
+			'#jstree-marker { padding:0; margin:0; font-size:12px; overflow:hidden; height:12px; width:8px; position:absolute; top:-30px; z-index:10001; background-repeat:no-repeat; display:none; background-color:transparent; text-shadow:1px 1px 1px white; color:black; line-height:10px; } ' + 
+			'#jstree-marker-line { padding:0; margin:0; line-height:0%; font-size:1px; overflow:hidden; height:1px; width:100px; position:absolute; top:-30px; z-index:10000; background-repeat:no-repeat; display:none; background-color:#456c43; ' + 
+			' cursor:pointer; border:1px solid #eeeeee; border-left:0; -moz-box-shadow: 0px 0px 2px #666; -webkit-box-shadow: 0px 0px 2px #666; box-shadow: 0px 0px 2px #666; ' + 
+			' -moz-border-radius:1px; border-radius:1px; -webkit-border-radius:1px; ' +
+			'}' + 
+			'';
+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
+		m = $("<div />").attr({ id : "jstree-marker" }).hide().html("&raquo;")
+			.bind("mouseleave mouseenter", function (e) { 
+				m.hide();
+				ml.hide();
+				e.preventDefault(); 
+				e.stopImmediatePropagation(); 
+				return false; 
+			})
+			.appendTo("body");
+		ml = $("<div />").attr({ id : "jstree-marker-line" }).hide()
+			.bind("mouseup", function (e) { 
+				if(r && r.length) { 
+					r.children("a").trigger(e); 
+					e.preventDefault(); 
+					e.stopImmediatePropagation(); 
+					return false; 
+				} 
+			})
+			.bind("mouseleave", function (e) { 
+				var rt = $(e.relatedTarget);
+				if(rt.is(".jstree") || rt.closest(".jstree").length === 0) {
+					if(r && r.length) { 
+						r.children("a").trigger(e); 
+						m.hide();
+						ml.hide();
+						e.preventDefault(); 
+						e.stopImmediatePropagation(); 
+						return false; 
+					}
+				}
+			})
+			.appendTo("body");
+		$(document).bind("drag_start.vakata", function (e, data) {
+			if(data.data.jstree) { m.show(); if(ml) { ml.show(); } }
+		});
+		$(document).bind("drag_stop.vakata", function (e, data) {
+			if(data.data.jstree) { m.hide(); if(ml) { ml.hide(); } }
+		});
+	});
+})(jQuery);
+//*/
+
+/*
+ * jsTree checkbox plugin
+ * Inserts checkboxes in front of every node
+ * Depends on the ui plugin
+ * DOES NOT WORK NICELY WITH MULTITREE DRAG'N'DROP
+ */
+(function ($) {
+	$.jstree.plugin("checkbox", {
+		__init : function () {
+			this.data.checkbox.noui = this._get_settings().checkbox.override_ui;
+			if(this.data.ui && this.data.checkbox.noui) {
+				this.select_node = this.deselect_node = this.deselect_all = $.noop;
+				this.get_selected = this.get_checked;
+			}
+
+			this.get_container()
+				.bind("open_node.jstree create_node.jstree clean_node.jstree refresh.jstree", $.proxy(function (e, data) { 
+						this._prepare_checkboxes(data.rslt.obj);
+					}, this))
+				.bind("loaded.jstree", $.proxy(function (e) {
+						this._prepare_checkboxes();
+					}, this))
+				.delegate( (this.data.ui && this.data.checkbox.noui ? "a" : "ins.jstree-checkbox") , "click.jstree", $.proxy(function (e) {
+						e.preventDefault();
+						if(this._get_node(e.target).hasClass("jstree-checked")) { this.uncheck_node(e.target); }
+						else { this.check_node(e.target); }
+						if(this.data.ui && this.data.checkbox.noui) {
+							this.save_selected();
+							if(this.data.cookies) { this.save_cookie("select_node"); }
+						}
+						else {
+							e.stopImmediatePropagation();
+							return false;
+						}
+					}, this));
+		},
+		defaults : {
+			override_ui : false,
+			two_state : false,
+			real_checkboxes : false,
+			checked_parent_open : true,
+			real_checkboxes_names : function (n) { return [ ("check_" + (n[0].id || Math.ceil(Math.random() * 10000))) , 1]; }
+		},
+		__destroy : function () {
+			this.get_container()
+				.find("input.jstree-real-checkbox").removeClass("jstree-real-checkbox").end()
+				.find("ins.jstree-checkbox").remove();
+		},
+		_fn : {
+			_checkbox_notify : function (n, data) {
+				if(data.checked) {
+					this.check_node(n, false);
+				}
+			},
+			_prepare_checkboxes : function (obj) {
+				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);
+				if(obj === false) { return; } // added for removing root nodes
+				var c, _this = this, t, ts = this._get_settings().checkbox.two_state, rc = this._get_settings().checkbox.real_checkboxes, rcn = this._get_settings().checkbox.real_checkboxes_names;
+				obj.each(function () {
+					t = $(this);
+					c = t.is("li") && (t.hasClass("jstree-checked") || (rc && t.children(":checked").length)) ? "jstree-checked" : "jstree-unchecked";
+					t.find("li").andSelf().each(function () {
+						var $t = $(this), nm;
+						$t.children("a" + (_this.data.languages ? "" : ":eq(0)") ).not(":has(.jstree-checkbox)").prepend("<ins class='jstree-checkbox'>&#160;</ins>").parent().not(".jstree-checked, .jstree-unchecked").addClass( ts ? "jstree-unchecked" : c );
+						if(rc) {
+							if(!$t.children(":checkbox").length) {
+								nm = rcn.call(_this, $t);
+								$t.prepend("<input type='checkbox' class='jstree-real-checkbox' id='" + nm[0] + "' name='" + nm[0] + "' value='" + nm[1] + "' />");
+							}
+							else {
+								$t.children(":checkbox").addClass("jstree-real-checkbox");
+							}
+							if(c === "jstree-checked") { 
+								$t.children(":checkbox").attr("checked","checked"); 
+							}
+						}
+						if(c === "jstree-checked" && !ts) {
+							$t.find("li").addClass("jstree-checked");
+						}
+					});
+				});
+				if(!ts) {
+					if(obj.length === 1 && obj.is("li")) { this._repair_state(obj); }
+					if(obj.is("li")) { obj.each(function () { _this._repair_state(this); }); }
+					else { obj.find("> ul > li").each(function () { _this._repair_state(this); }); }
+					obj.find(".jstree-checked").parent().parent().each(function () { _this._repair_state(this); }); 
+				}
+			},
+			change_state : function (obj, state) {
+				obj = this._get_node(obj);
+				var coll = false, rc = this._get_settings().checkbox.real_checkboxes;
+				if(!obj || obj === -1) { return false; }
+				state = (state === false || state === true) ? state : obj.hasClass("jstree-checked");
+				if(this._get_settings().checkbox.two_state) {
+					if(state) { 
+						obj.removeClass("jstree-checked").addClass("jstree-unchecked"); 
+						if(rc) { obj.children(":checkbox").removeAttr("checked"); }
+					}
+					else { 
+						obj.removeClass("jstree-unchecked").addClass("jstree-checked"); 
+						if(rc) { obj.children(":checkbox").attr("checked","checked"); }
+					}
+				}
+				else {
+					if(state) { 
+						coll = obj.find("li").andSelf();
+						if(!coll.filter(".jstree-checked, .jstree-undetermined").length) { return false; }
+						coll.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked"); 
+						if(rc) { coll.children(":checkbox").removeAttr("checked"); }
+					}
+					else { 
+						coll = obj.find("li").andSelf();
+						if(!coll.filter(".jstree-unchecked, .jstree-undetermined").length) { return false; }
+						coll.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked"); 
+						if(rc) { coll.children(":checkbox").attr("checked","checked"); }
+						if(this.data.ui) { this.data.ui.last_selected = obj; }
+						this.data.checkbox.last_selected = obj;
+					}
+					obj.parentsUntil(".jstree", "li").each(function () {
+						var $this = $(this);
+						if(state) {
+							if($this.children("ul").children("li.jstree-checked, li.jstree-undetermined").length) {
+								$this.parentsUntil(".jstree", "li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
+								if(rc) { $this.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }
+								return false;
+							}
+							else {
+								$this.removeClass("jstree-checked jstree-undetermined").addClass("jstree-unchecked");
+								if(rc) { $this.children(":checkbox").removeAttr("checked"); }
+							}
+						}
+						else {
+							if($this.children("ul").children("li.jstree-unchecked, li.jstree-undetermined").length) {
+								$this.parentsUntil(".jstree", "li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
+								if(rc) { $this.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }
+								return false;
+							}
+							else {
+								$this.removeClass("jstree-unchecked jstree-undetermined").addClass("jstree-checked");
+								if(rc) { $this.children(":checkbox").attr("checked","checked"); }
+							}
+						}
+					});
+				}
+				if(this.data.ui && this.data.checkbox.noui) { this.data.ui.selected = this.get_checked(); }
+				this.__callback(obj);
+				return true;
+			},
+			check_node : function (obj) {
+				if(this.change_state(obj, false)) { 
+					obj = this._get_node(obj);
+					if(this._get_settings().checkbox.checked_parent_open) {
+						var t = this;
+						obj.parents(".jstree-closed").each(function () { t.open_node(this, false, true); });
+					}
+					this.__callback({ "obj" : obj }); 
+				}
+			},
+			uncheck_node : function (obj) {
+				if(this.change_state(obj, true)) { this.__callback({ "obj" : this._get_node(obj) }); }
+			},
+			check_all : function () {
+				var _this = this, 
+					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");
+				coll.each(function () {
+					_this.change_state(this, false);
+				});
+				this.__callback();
+			},
+			uncheck_all : function () {
+				var _this = this,
+					coll = this._get_settings().checkbox.two_state ? this.get_container_ul().find("li") : this.get_container_ul().children("li");
+				coll.each(function () {
+					_this.change_state(this, true);
+				});
+				this.__callback();
+			},
+
+			is_checked : function(obj) {
+				obj = this._get_node(obj);
+				return obj.length ? obj.is(".jstree-checked") : false;
+			},
+			get_checked : function (obj, get_all) {
+				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);
+				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-checked") : obj.find("> ul > .jstree-checked, .jstree-undetermined > ul > .jstree-checked");
+			},
+			get_unchecked : function (obj, get_all) { 
+				obj = !obj || obj === -1 ? this.get_container() : this._get_node(obj);
+				return get_all || this._get_settings().checkbox.two_state ? obj.find(".jstree-unchecked") : obj.find("> ul > .jstree-unchecked, .jstree-undetermined > ul > .jstree-unchecked");
+			},
+
+			show_checkboxes : function () { this.get_container().children("ul").removeClass("jstree-no-checkboxes"); },
+			hide_checkboxes : function () { this.get_container().children("ul").addClass("jstree-no-checkboxes"); },
+
+			_repair_state : function (obj) {
+				obj = this._get_node(obj);
+				if(!obj.length) { return; }
+				var rc = this._get_settings().checkbox.real_checkboxes,
+					a = obj.find("> ul > .jstree-checked").length,
+					b = obj.find("> ul > .jstree-undetermined").length,
+					c = obj.find("> ul > li").length;
+				if(c === 0) { if(obj.hasClass("jstree-undetermined")) { this.change_state(obj, false); } }
+				else if(a === 0 && b === 0) { this.change_state(obj, true); }
+				else if(a === c) { this.change_state(obj, false); }
+				else { 
+					obj.parentsUntil(".jstree","li").andSelf().removeClass("jstree-checked jstree-unchecked").addClass("jstree-undetermined");
+					if(rc) { obj.parentsUntil(".jstree", "li").andSelf().children(":checkbox").removeAttr("checked"); }
+				}
+			},
+			reselect : function () {
+				if(this.data.ui && this.data.checkbox.noui) { 
+					var _this = this,
+						s = this.data.ui.to_select;
+					s = $.map($.makeArray(s), function (n) { return "#" + n.toString().replace(/^#/,"").replace(/\\\//g,"/").replace(/\//g,"\\\/").replace(/\\\./g,".").replace(/\./g,"\\.").replace(/\:/g,"\\:"); });
+					this.deselect_all();
+					$.each(s, function (i, val) { _this.check_node(val); });
+					this.__callback();
+				}
+				else { 
+					this.__call_old(); 
+				}
+			},
+			save_loaded : function () {
+				var _this = this;
+				this.data.core.to_load = [];
+				this.get_container_ul().find("li.jstree-closed.jstree-undetermined").each(function () {
+					if(this.id) { _this.data.core.to_load.push("#" + this.id); }
+				});
+			}
+		}
+	});
+	$(function() {
+		var css_string = '.jstree .jstree-real-checkbox { display:none; } ';
+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree XML plugin
+ * The XML data store. Datastores are build by overriding the `load_node` and `_is_loaded` functions.
+ */
+(function ($) {
+	$.vakata.xslt = function (xml, xsl, callback) {
+		var rs = "", xm, xs, processor, support;
+		// TODO: IE9 no XSLTProcessor, no document.recalc
+		if(document.recalc) {
+			xm = document.createElement('xml');
+			xs = document.createElement('xml');
+			xm.innerHTML = xml;
+			xs.innerHTML = xsl;
+			$("body").append(xm).append(xs);
+			setTimeout( (function (xm, xs, callback) {
+				return function () {
+					callback.call(null, xm.transformNode(xs.XMLDocument));
+					setTimeout( (function (xm, xs) { return function () { $(xm).remove(); $(xs).remove(); }; })(xm, xs), 200);
+				};
+			})(xm, xs, callback), 100);
+			return true;
+		}
+		if(typeof window.DOMParser !== "undefined" && typeof window.XMLHttpRequest !== "undefined" && typeof window.XSLTProcessor === "undefined") {
+			xml = new DOMParser().parseFromString(xml, "text/xml");
+			xsl = new DOMParser().parseFromString(xsl, "text/xml");
+			// alert(xml.transformNode());
+			// callback.call(null, new XMLSerializer().serializeToString(rs));
+			
+		}
+		if(typeof window.DOMParser !== "undefined" && typeof window.XMLHttpRequest !== "undefined" && typeof window.XSLTProcessor !== "undefined") {
+			processor = new XSLTProcessor();
+			support = $.isFunction(processor.transformDocument) ? (typeof window.XMLSerializer !== "undefined") : true;
+			if(!support) { return false; }
+			xml = new DOMParser().parseFromString(xml, "text/xml");
+			xsl = new DOMParser().parseFromString(xsl, "text/xml");
+			if($.isFunction(processor.transformDocument)) {
+				rs = document.implementation.createDocument("", "", null);
+				processor.transformDocument(xml, xsl, rs, null);
+				callback.call(null, new XMLSerializer().serializeToString(rs));
+				return true;
+			}
+			else {
+				processor.importStylesheet(xsl);
+				rs = processor.transformToFragment(xml, document);
+				callback.call(null, $("<div />").append(rs).html());
+				return true;
+			}
+		}
+		return false;
+	};
+	var xsl = {
+		'nest' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 
+			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 
+			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/html" />' + 
+			'<xsl:template match="/">' + 
+			'	<xsl:call-template name="nodes">' + 
+			'		<xsl:with-param name="node" select="/root" />' + 
+			'	</xsl:call-template>' + 
+			'</xsl:template>' + 
+			'<xsl:template name="nodes">' + 
+			'	<xsl:param name="node" />' + 
+			'	<ul>' + 
+			'	<xsl:for-each select="$node/item">' + 
+			'		<xsl:variable name="children" select="count(./item) &gt; 0" />' + 
+			'		<li>' + 
+			'			<xsl:attribute name="class">' + 
+			'				<xsl:if test="position() = last()">jstree-last </xsl:if>' + 
+			'				<xsl:choose>' + 
+			'					<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 
+			'					<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 
+			'					<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 
+			'				</xsl:choose>' + 
+			'				<xsl:value-of select="@class" />' + 
+			'			</xsl:attribute>' + 
+			'			<xsl:for-each select="@*">' + 
+			'				<xsl:if test="name() != \'class\' and name() != \'state\' and name() != \'hasChildren\'">' + 
+			'					<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
+			'				</xsl:if>' + 
+			'			</xsl:for-each>' + 
+			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 
+			'			<xsl:for-each select="content/name">' + 
+			'				<a>' + 
+			'				<xsl:attribute name="href">' + 
+			'					<xsl:choose>' + 
+			'					<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 
+			'					<xsl:otherwise>#</xsl:otherwise>' + 
+			'					</xsl:choose>' + 
+			'				</xsl:attribute>' + 
+			'				<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 
+			'				<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 
+			'				<xsl:for-each select="@*">' + 
+			'					<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 
+			'						<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
+			'					</xsl:if>' + 
+			'				</xsl:for-each>' + 
+			'					<ins>' + 
+			'						<xsl:attribute name="class">jstree-icon ' + 
+			'							<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 
+			'						</xsl:attribute>' + 
+			'						<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 
+			'						<xsl:text>&#xa0;</xsl:text>' + 
+			'					</ins>' + 
+			'					<xsl:copy-of select="./child::node()" />' + 
+			'				</a>' + 
+			'			</xsl:for-each>' + 
+			'			<xsl:if test="$children or @hasChildren"><xsl:call-template name="nodes"><xsl:with-param name="node" select="current()" /></xsl:call-template></xsl:if>' + 
+			'		</li>' + 
+			'	</xsl:for-each>' + 
+			'	</ul>' + 
+			'</xsl:template>' + 
+			'</xsl:stylesheet>',
+
+		'flat' : '<' + '?xml version="1.0" encoding="utf-8" ?>' + 
+			'<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" >' + 
+			'<xsl:output method="html" encoding="utf-8" omit-xml-declaration="yes" standalone="no" indent="no" media-type="text/xml" />' + 
+			'<xsl:template match="/">' + 
+			'	<ul>' + 
+			'	<xsl:for-each select="//item[not(@parent_id) or @parent_id=0 or not(@parent_id = //item/@id)]">' + /* the last `or` may be removed */
+			'		<xsl:call-template name="nodes">' + 
+			'			<xsl:with-param name="node" select="." />' + 
+			'			<xsl:with-param name="is_last" select="number(position() = last())" />' + 
+			'		</xsl:call-template>' + 
+			'	</xsl:for-each>' + 
+			'	</ul>' + 
+			'</xsl:template>' + 
+			'<xsl:template name="nodes">' + 
+			'	<xsl:param name="node" />' + 
+			'	<xsl:param name="is_last" />' + 
+			'	<xsl:variable name="children" select="count(//item[@parent_id=$node/attribute::id]) &gt; 0" />' + 
+			'	<li>' + 
+			'	<xsl:attribute name="class">' + 
+			'		<xsl:if test="$is_last = true()">jstree-last </xsl:if>' + 
+			'		<xsl:choose>' + 
+			'			<xsl:when test="@state = \'open\'">jstree-open </xsl:when>' + 
+			'			<xsl:when test="$children or @hasChildren or @state = \'closed\'">jstree-closed </xsl:when>' + 
+			'			<xsl:otherwise>jstree-leaf </xsl:otherwise>' + 
+			'		</xsl:choose>' + 
+			'		<xsl:value-of select="@class" />' + 
+			'	</xsl:attribute>' + 
+			'	<xsl:for-each select="@*">' + 
+			'		<xsl:if test="name() != \'parent_id\' and name() != \'hasChildren\' and name() != \'class\' and name() != \'state\'">' + 
+			'		<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
+			'		</xsl:if>' + 
+			'	</xsl:for-each>' + 
+			'	<ins class="jstree-icon"><xsl:text>&#xa0;</xsl:text></ins>' + 
+			'	<xsl:for-each select="content/name">' + 
+			'		<a>' + 
+			'		<xsl:attribute name="href">' + 
+			'			<xsl:choose>' + 
+			'			<xsl:when test="@href"><xsl:value-of select="@href" /></xsl:when>' + 
+			'			<xsl:otherwise>#</xsl:otherwise>' + 
+			'			</xsl:choose>' + 
+			'		</xsl:attribute>' + 
+			'		<xsl:attribute name="class"><xsl:value-of select="@lang" /> <xsl:value-of select="@class" /></xsl:attribute>' + 
+			'		<xsl:attribute name="style"><xsl:value-of select="@style" /></xsl:attribute>' + 
+			'		<xsl:for-each select="@*">' + 
+			'			<xsl:if test="name() != \'style\' and name() != \'class\' and name() != \'href\'">' + 
+			'				<xsl:attribute name="{name()}"><xsl:value-of select="." /></xsl:attribute>' + 
+			'			</xsl:if>' + 
+			'		</xsl:for-each>' + 
+			'			<ins>' + 
+			'				<xsl:attribute name="class">jstree-icon ' + 
+			'					<xsl:if test="string-length(attribute::icon) > 0 and not(contains(@icon,\'/\'))"><xsl:value-of select="@icon" /></xsl:if>' + 
+			'				</xsl:attribute>' + 
+			'				<xsl:if test="string-length(attribute::icon) > 0 and contains(@icon,\'/\')"><xsl:attribute name="style">background:url(<xsl:value-of select="@icon" />) center center no-repeat;</xsl:attribute></xsl:if>' + 
+			'				<xsl:text>&#xa0;</xsl:text>' + 
+			'			</ins>' + 
+			'			<xsl:copy-of select="./child::node()" />' + 
+			'		</a>' + 
+			'	</xsl:for-each>' + 
+			'	<xsl:if test="$children">' + 
+			'		<ul>' + 
+			'		<xsl:for-each select="//item[@parent_id=$node/attribute::id]">' + 
+			'			<xsl:call-template name="nodes">' + 
+			'				<xsl:with-param name="node" select="." />' + 
+			'				<xsl:with-param name="is_last" select="number(position() = last())" />' + 
+			'			</xsl:call-template>' + 
+			'		</xsl:for-each>' + 
+			'		</ul>' + 
+			'	</xsl:if>' + 
+			'	</li>' + 
+			'</xsl:template>' + 
+			'</xsl:stylesheet>'
+	},
+	escape_xml = function(string) {
+		return string
+			.toString()
+			.replace(/&/g, '&amp;')
+			.replace(/</g, '&lt;')
+			.replace(/>/g, '&gt;')
+			.replace(/"/g, '&quot;')
+			.replace(/'/g, '&apos;');
+	};
+	$.jstree.plugin("xml_data", {
+		defaults : { 
+			data : false,
+			ajax : false,
+			xsl : "flat",
+			clean_node : false,
+			correct_state : true,
+			get_skip_empty : false,
+			get_include_preamble : true
+		},
+		_fn : {
+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_xml(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
+			_is_loaded : function (obj) { 
+				var s = this._get_settings().xml_data;
+				obj = this._get_node(obj);
+				return obj == -1 || !obj || (!s.ajax && !$.isFunction(s.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;
+			},
+			load_node_xml : function (obj, s_call, e_call) {
+				var s = this.get_settings().xml_data,
+					error_func = function () {},
+					success_func = function () {};
+
+				obj = this._get_node(obj);
+				if(obj && obj !== -1) {
+					if(obj.data("jstree-is-loading")) { return; }
+					else { obj.data("jstree-is-loading",true); }
+				}
+				switch(!0) {
+					case (!s.data && !s.ajax): throw "Neither data nor ajax settings supplied.";
+					case ($.isFunction(s.data)):
+						s.data.call(this, obj, $.proxy(function (d) {
+							this.parse_xml(d, $.proxy(function (d) {
+								if(d) {
+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
+									if(d.length > 10) {
+										d = $(d);
+										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
+										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree-is-loading"); }
+										if(s.clean_node) { this.clean_node(obj); }
+										if(s_call) { s_call.call(this); }
+									}
+									else {
+										if(obj && obj !== -1) { 
+											obj.children("a.jstree-loading").removeClass("jstree-loading");
+											obj.removeData("jstree-is-loading");
+											if(s.correct_state) { 
+												this.correct_state(obj);
+												if(s_call) { s_call.call(this); } 
+											}
+										}
+										else {
+											if(s.correct_state) { 
+												this.get_container().children("ul").empty();
+												if(s_call) { s_call.call(this); } 
+											}
+										}
+									}
+								}
+							}, this));
+						}, this));
+						break;
+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
+						if(!obj || obj == -1) {
+							this.parse_xml(s.data, $.proxy(function (d) {
+								if(d) {
+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
+									if(d.length > 10) {
+										d = $(d);
+										this.get_container().children("ul").empty().append(d.children());
+										if(s.clean_node) { this.clean_node(obj); }
+										if(s_call) { s_call.call(this); }
+									}
+								}
+								else { 
+									if(s.correct_state) { 
+										this.get_container().children("ul").empty(); 
+										if(s_call) { s_call.call(this); }
+									}
+								}
+							}, this));
+						}
+						break;
+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
+						error_func = function (x, t, e) {
+							var ef = this.get_settings().xml_data.ajax.error; 
+							if(ef) { ef.call(this, x, t, e); }
+							if(obj !== -1 && obj.length) {
+								obj.children("a.jstree-loading").removeClass("jstree-loading");
+								obj.removeData("jstree-is-loading");
+								if(t === "success" && s.correct_state) { this.correct_state(obj); }
+							}
+							else {
+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
+							}
+							if(e_call) { e_call.call(this); }
+						};
+						success_func = function (d, t, x) {
+							d = x.responseText;
+							var sf = this.get_settings().xml_data.ajax.success; 
+							if(sf) { d = sf.call(this,d,t,x) || d; }
+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {
+								return error_func.call(this, x, t, "");
+							}
+							this.parse_xml(d, $.proxy(function (d) {
+								if(d) {
+									d = d.replace(/ ?xmlns="[^"]*"/ig, "");
+									if(d.length > 10) {
+										d = $(d);
+										if(obj === -1 || !obj) { this.get_container().children("ul").empty().append(d.children()); }
+										else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d); obj.removeData("jstree-is-loading"); }
+										if(s.clean_node) { this.clean_node(obj); }
+										if(s_call) { s_call.call(this); }
+									}
+									else {
+										if(obj && obj !== -1) { 
+											obj.children("a.jstree-loading").removeClass("jstree-loading");
+											obj.removeData("jstree-is-loading");
+											if(s.correct_state) { 
+												this.correct_state(obj);
+												if(s_call) { s_call.call(this); } 
+											}
+										}
+										else {
+											if(s.correct_state) { 
+												this.get_container().children("ul").empty();
+												if(s_call) { s_call.call(this); } 
+											}
+										}
+									}
+								}
+							}, this));
+						};
+						s.ajax.context = this;
+						s.ajax.error = error_func;
+						s.ajax.success = success_func;
+						if(!s.ajax.dataType) { s.ajax.dataType = "xml"; }
+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
+						$.ajax(s.ajax);
+						break;
+				}
+			},
+			parse_xml : function (xml, callback) {
+				var s = this._get_settings().xml_data;
+				$.vakata.xslt(xml, xsl[s.xsl], callback);
+			},
+			get_xml : function (tp, obj, li_attr, a_attr, is_callback) {
+				var result = "", 
+					s = this._get_settings(), 
+					_this = this,
+					tmp1, tmp2, li, a, lang;
+				if(!tp) { tp = "flat"; }
+				if(!is_callback) { is_callback = 0; }
+				obj = this._get_node(obj);
+				if(!obj || obj === -1) { obj = this.get_container().find("> ul > li"); }
+				li_attr = $.isArray(li_attr) ? li_attr : [ "id", "class" ];
+				if(!is_callback && this.data.types && $.inArray(s.types.type_attr, li_attr) === -1) { li_attr.push(s.types.type_attr); }
+
+				a_attr = $.isArray(a_attr) ? a_attr : [ ];
+
+				if(!is_callback) { 
+					if(s.xml_data.get_include_preamble) { 
+						result += '<' + '?xml version="1.0" encoding="UTF-8"?' + '>'; 
+					}
+					result += "<root>"; 
+				}
+				obj.each(function () {
+					result += "<item";
+					li = $(this);
+					$.each(li_attr, function (i, v) { 
+						var t = li.attr(v);
+						if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {
+							result += " " + v + "=\"" + escape_xml((" " + (t || "")).replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\""; 
+						}
+					});
+					if(li.hasClass("jstree-open")) { result += " state=\"open\""; }
+					if(li.hasClass("jstree-closed")) { result += " state=\"closed\""; }
+					if(tp === "flat") { result += " parent_id=\"" + escape_xml(is_callback) + "\""; }
+					result += ">";
+					result += "<content>";
+					a = li.children("a");
+					a.each(function () {
+						tmp1 = $(this);
+						lang = false;
+						result += "<name";
+						if($.inArray("languages", s.plugins) !== -1) {
+							$.each(s.languages, function (k, z) {
+								if(tmp1.hasClass(z)) { result += " lang=\"" + escape_xml(z) + "\""; lang = z; return false; }
+							});
+						}
+						if(a_attr.length) { 
+							$.each(a_attr, function (k, z) {
+								var t = tmp1.attr(z);
+								if(!s.xml_data.get_skip_empty || typeof t !== "undefined") {
+									result += " " + z + "=\"" + escape_xml((" " + t || "").replace(/ jstree[^ ]*/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + "\"";
+								}
+							});
+						}
+						if(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/^\s+$/ig,"").length) {
+							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).className.replace(/jstree[^ ]*|$/ig,'').replace(/\s+$/ig," ").replace(/^ /,"").replace(/ $/,"")) + '"';
+						}
+						if(tmp1.children("ins").get(0).style.backgroundImage.length) {
+							result += ' icon="' + escape_xml(tmp1.children("ins").get(0).style.backgroundImage.replace("url(","").replace(")","").replace(/'/ig,"").replace(/"/ig,"")) + '"';
+						}
+						result += ">";
+						result += "<![CDATA[" + _this.get_text(tmp1, lang) + "]]>";
+						result += "</name>";
+					});
+					result += "</content>";
+					tmp2 = li[0].id || true;
+					li = li.find("> ul > li");
+					if(li.length) { tmp2 = _this.get_xml(tp, li, li_attr, a_attr, tmp2); }
+					else { tmp2 = ""; }
+					if(tp == "nest") { result += tmp2; }
+					result += "</item>";
+					if(tp == "flat") { result += tmp2; }
+				});
+				if(!is_callback) { result += "</root>"; }
+				return result;
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/*
+ * jsTree search plugin
+ * Enables both sync and async search on the tree
+ * DOES NOT WORK WITH JSON PROGRESSIVE RENDER
+ */
+(function ($) {
+	$.expr[':'].jstree_contains = function(a,i,m){
+		return (a.textContent || a.innerText || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;
+	};
+	$.expr[':'].jstree_title_contains = function(a,i,m) {
+		return (a.getAttribute("title") || "").toLowerCase().indexOf(m[3].toLowerCase())>=0;
+	};
+	$.jstree.plugin("search", {
+		__init : function () {
+			this.data.search.str = "";
+			this.data.search.result = $();
+			if(this._get_settings().search.show_only_matches) {
+				this.get_container()
+					.bind("search.jstree", function (e, data) {
+						$(this).children("ul").find("li").hide().removeClass("jstree-last");
+						data.rslt.nodes.parentsUntil(".jstree").andSelf().show()
+							.filter("ul").each(function () { $(this).children("li:visible").eq(-1).addClass("jstree-last"); });
+					})
+					.bind("clear_search.jstree", function () {
+						$(this).children("ul").find("li").css("display","").end().end().jstree("clean_node", -1);
+					});
+			}
+		},
+		defaults : {
+			ajax : false,
+			search_method : "jstree_contains", // for case insensitive - jstree_contains
+			show_only_matches : false
+		},
+		_fn : {
+			search : function (str, skip_async) {
+				if($.trim(str) === "") { this.clear_search(); return; }
+				var s = this.get_settings().search, 
+					t = this,
+					error_func = function () { },
+					success_func = function () { };
+				this.data.search.str = str;
+
+				if(!skip_async && s.ajax !== false && this.get_container_ul().find("li.jstree-closed:not(:has(ul)):eq(0)").length > 0) {
+					this.search.supress_callback = true;
+					error_func = function () { };
+					success_func = function (d, t, x) {
+						var sf = this.get_settings().search.ajax.success; 
+						if(sf) { d = sf.call(this,d,t,x) || d; }
+						this.data.search.to_open = d;
+						this._search_open();
+					};
+					s.ajax.context = this;
+					s.ajax.error = error_func;
+					s.ajax.success = success_func;
+					if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, str); }
+					if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, str); }
+					if(!s.ajax.data) { s.ajax.data = { "search_string" : str }; }
+					if(!s.ajax.dataType || /^json/.exec(s.ajax.dataType)) { s.ajax.dataType = "json"; }
+					$.ajax(s.ajax);
+					return;
+				}
+				if(this.data.search.result.length) { this.clear_search(); }
+				this.data.search.result = this.get_container().find("a" + (this.data.languages ? "." + this.get_lang() : "" ) + ":" + (s.search_method) + "(" + this.data.search.str + ")");
+				this.data.search.result.addClass("jstree-search").parent().parents(".jstree-closed").each(function () {
+					t.open_node(this, false, true);
+				});
+				this.__callback({ nodes : this.data.search.result, str : str });
+			},
+			clear_search : function (str) {
+				this.data.search.result.removeClass("jstree-search");
+				this.__callback(this.data.search.result);
+				this.data.search.result = $();
+			},
+			_search_open : function (is_callback) {
+				var _this = this,
+					done = true,
+					current = [],
+					remaining = [];
+				if(this.data.search.to_open.length) {
+					$.each(this.data.search.to_open, function (i, val) {
+						if(val == "#") { return true; }
+						if($(val).length && $(val).is(".jstree-closed")) { current.push(val); }
+						else { remaining.push(val); }
+					});
+					if(current.length) {
+						this.data.search.to_open = remaining;
+						$.each(current, function (i, val) { 
+							_this.open_node(val, function () { _this._search_open(true); }); 
+						});
+						done = false;
+					}
+				}
+				if(done) { this.search(this.data.search.str, true); }
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree contextmenu plugin
+ */
+(function ($) {
+	$.vakata.context = {
+		hide_on_mouseleave : false,
+
+		cnt		: $("<div id='vakata-contextmenu' />"),
+		vis		: false,
+		tgt		: false,
+		par		: false,
+		func	: false,
+		data	: false,
+		rtl		: false,
+		show	: function (s, t, x, y, d, p, rtl) {
+			$.vakata.context.rtl = !!rtl;
+			var html = $.vakata.context.parse(s), h, w;
+			if(!html) { return; }
+			$.vakata.context.vis = true;
+			$.vakata.context.tgt = t;
+			$.vakata.context.par = p || t || null;
+			$.vakata.context.data = d || null;
+			$.vakata.context.cnt
+				.html(html)
+				.css({ "visibility" : "hidden", "display" : "block", "left" : 0, "top" : 0 });
+
+			if($.vakata.context.hide_on_mouseleave) {
+				$.vakata.context.cnt
+					.one("mouseleave", function(e) { $.vakata.context.hide(); });
+			}
+
+			h = $.vakata.context.cnt.height();
+			w = $.vakata.context.cnt.width();
+			if(x + w > $(document).width()) { 
+				x = $(document).width() - (w + 5); 
+				$.vakata.context.cnt.find("li > ul").addClass("right"); 
+			}
+			if(y + h > $(document).height()) { 
+				y = y - (h + t[0].offsetHeight); 
+				$.vakata.context.cnt.find("li > ul").addClass("bottom"); 
+			}
+
+			$.vakata.context.cnt
+				.css({ "left" : x, "top" : y })
+				.find("li:has(ul)")
+					.bind("mouseenter", function (e) { 
+						var w = $(document).width(),
+							h = $(document).height(),
+							ul = $(this).children("ul").show(); 
+						if(w !== $(document).width()) { ul.toggleClass("right"); }
+						if(h !== $(document).height()) { ul.toggleClass("bottom"); }
+					})
+					.bind("mouseleave", function (e) { 
+						$(this).children("ul").hide(); 
+					})
+					.end()
+				.css({ "visibility" : "visible" })
+				.show();
+			$(document).triggerHandler("context_show.vakata");
+		},
+		hide	: function () {
+			$.vakata.context.vis = false;
+			$.vakata.context.cnt.attr("class","").css({ "visibility" : "hidden" });
+			$(document).triggerHandler("context_hide.vakata");
+		},
+		parse	: function (s, is_callback) {
+			if(!s) { return false; }
+			var str = "",
+				tmp = false,
+				was_sep = true;
+			if(!is_callback) { $.vakata.context.func = {}; }
+			str += "<ul>";
+			$.each(s, function (i, val) {
+				if(!val) { return true; }
+				$.vakata.context.func[i] = val.action;
+				if(!was_sep && val.separator_before) {
+					str += "<li class='vakata-separator vakata-separator-before'></li>";
+				}
+				was_sep = false;
+				str += "<li class='" + (val._class || "") + (val._disabled ? " jstree-contextmenu-disabled " : "") + "'><ins ";
+				if(val.icon && val.icon.indexOf("/") === -1) { str += " class='" + val.icon + "' "; }
+				if(val.icon && val.icon.indexOf("/") !== -1) { str += " style='background:url(" + val.icon + ") center center no-repeat;' "; }
+				str += ">&#160;</ins><a href='#' rel='" + i + "'>";
+				if(val.submenu) {
+					str += "<span style='float:" + ($.vakata.context.rtl ? "left" : "right") + ";'>&raquo;</span>";
+				}
+				str += val.label + "</a>";
+				if(val.submenu) {
+					tmp = $.vakata.context.parse(val.submenu, true);
+					if(tmp) { str += tmp; }
+				}
+				str += "</li>";
+				if(val.separator_after) {
+					str += "<li class='vakata-separator vakata-separator-after'></li>";
+					was_sep = true;
+				}
+			});
+			str = str.replace(/<li class\='vakata-separator vakata-separator-after'\><\/li\>$/,"");
+			str += "</ul>";
+			$(document).triggerHandler("context_parse.vakata");
+			return str.length > 10 ? str : false;
+		},
+		exec	: function (i) {
+			if($.isFunction($.vakata.context.func[i])) {
+				// if is string - eval and call it!
+				$.vakata.context.func[i].call($.vakata.context.data, $.vakata.context.par);
+				return true;
+			}
+			else { return false; }
+		}
+	};
+	$(function () {
+		var css_string = '' + 
+			'#vakata-contextmenu { display:block; visibility:hidden; left:0; top:-200px; position:absolute; margin:0; padding:0; min-width:180px; background:#ebebeb; border:1px solid silver; z-index:10000; *width:180px; } ' + 
+			'#vakata-contextmenu ul { min-width:180px; *width:180px; } ' + 
+			'#vakata-contextmenu ul, #vakata-contextmenu li { margin:0; padding:0; list-style-type:none; display:block; } ' + 
+			'#vakata-contextmenu li { line-height:20px; min-height:20px; position:relative; padding:0px; } ' + 
+			'#vakata-contextmenu li a { padding:1px 6px; line-height:17px; display:block; text-decoration:none; margin:1px 1px 0 1px; } ' + 
+			'#vakata-contextmenu li ins { float:left; width:16px; height:16px; text-decoration:none; margin-right:2px; } ' + 
+			'#vakata-contextmenu li a:hover, #vakata-contextmenu li.vakata-hover > a { background:gray; color:white; } ' + 
+			'#vakata-contextmenu li ul { display:none; position:absolute; top:-2px; left:100%; background:#ebebeb; border:1px solid gray; } ' + 
+			'#vakata-contextmenu .right { right:100%; left:auto; } ' + 
+			'#vakata-contextmenu .bottom { bottom:-1px; top:auto; } ' + 
+			'#vakata-contextmenu li.vakata-separator { min-height:0; height:1px; line-height:1px; font-size:1px; overflow:hidden; margin:0 2px; background:silver; /* border-top:1px solid #fefefe; */ padding:0; } ';
+		$.vakata.css.add_sheet({ str : css_string, title : "vakata" });
+		$.vakata.context.cnt
+			.delegate("a","click", function (e) { e.preventDefault(); })
+			.delegate("a","mouseup", function (e) {
+				if(!$(this).parent().hasClass("jstree-contextmenu-disabled") && $.vakata.context.exec($(this).attr("rel"))) {
+					$.vakata.context.hide();
+				}
+				else { $(this).blur(); }
+			})
+			.delegate("a","mouseover", function () {
+				$.vakata.context.cnt.find(".vakata-hover").removeClass("vakata-hover");
+			})
+			.appendTo("body");
+		$(document).bind("mousedown", function (e) { if($.vakata.context.vis && !$.contains($.vakata.context.cnt[0], e.target)) { $.vakata.context.hide(); } });
+		if(typeof $.hotkeys !== "undefined") {
+			$(document)
+				.bind("keydown", "up", function (e) { 
+					if($.vakata.context.vis) { 
+						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").prevAll("li:not(.vakata-separator)").first();
+						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").last(); }
+						o.addClass("vakata-hover");
+						e.stopImmediatePropagation(); 
+						e.preventDefault();
+					} 
+				})
+				.bind("keydown", "down", function (e) { 
+					if($.vakata.context.vis) { 
+						var o = $.vakata.context.cnt.find("ul:visible").last().children(".vakata-hover").removeClass("vakata-hover").nextAll("li:not(.vakata-separator)").first();
+						if(!o.length) { o = $.vakata.context.cnt.find("ul:visible").last().children("li:not(.vakata-separator)").first(); }
+						o.addClass("vakata-hover");
+						e.stopImmediatePropagation(); 
+						e.preventDefault();
+					} 
+				})
+				.bind("keydown", "right", function (e) { 
+					if($.vakata.context.vis) { 
+						$.vakata.context.cnt.find(".vakata-hover").children("ul").show().children("li:not(.vakata-separator)").removeClass("vakata-hover").first().addClass("vakata-hover");
+						e.stopImmediatePropagation(); 
+						e.preventDefault();
+					} 
+				})
+				.bind("keydown", "left", function (e) { 
+					if($.vakata.context.vis) { 
+						$.vakata.context.cnt.find(".vakata-hover").children("ul").hide().children(".vakata-separator").removeClass("vakata-hover");
+						e.stopImmediatePropagation(); 
+						e.preventDefault();
+					} 
+				})
+				.bind("keydown", "esc", function (e) { 
+					$.vakata.context.hide(); 
+					e.preventDefault();
+				})
+				.bind("keydown", "space", function (e) { 
+					$.vakata.context.cnt.find(".vakata-hover").last().children("a").click();
+					e.preventDefault();
+				});
+		}
+	});
+
+	$.jstree.plugin("contextmenu", {
+		__init : function () {
+			this.get_container()
+				.delegate("a", "contextmenu.jstree", $.proxy(function (e) {
+						e.preventDefault();
+						if(!$(e.currentTarget).hasClass("jstree-loading")) {
+							this.show_contextmenu(e.currentTarget, e.pageX, e.pageY);
+						}
+					}, this))
+				.delegate("a", "click.jstree", $.proxy(function (e) {
+						if(this.data.contextmenu) {
+							$.vakata.context.hide();
+						}
+					}, this))
+				.bind("destroy.jstree", $.proxy(function () {
+						// TODO: move this to descruct method
+						if(this.data.contextmenu) {
+							$.vakata.context.hide();
+						}
+					}, this));
+			$(document).bind("context_hide.vakata", $.proxy(function () { this.data.contextmenu = false; }, this));
+		},
+		defaults : { 
+			select_node : false, // requires UI plugin
+			show_at_node : true,
+			items : { // Could be a function that should return an object like this one
+				"create" : {
+					"separator_before"	: false,
+					"separator_after"	: true,
+					"label"				: "Create",
+					"action"			: function (obj) { this.create(obj); }
+				},
+				"rename" : {
+					"separator_before"	: false,
+					"separator_after"	: false,
+					"label"				: "Rename",
+					"action"			: function (obj) { this.rename(obj); }
+				},
+				"remove" : {
+					"separator_before"	: false,
+					"icon"				: false,
+					"separator_after"	: false,
+					"label"				: "Delete",
+					"action"			: function (obj) { if(this.is_selected(obj)) { this.remove(); } else { this.remove(obj); } }
+				},
+				"ccp" : {
+					"separator_before"	: true,
+					"icon"				: false,
+					"separator_after"	: false,
+					"label"				: "Edit",
+					"action"			: false,
+					"submenu" : { 
+						"cut" : {
+							"separator_before"	: false,
+							"separator_after"	: false,
+							"label"				: "Cut",
+							"action"			: function (obj) { this.cut(obj); }
+						},
+						"copy" : {
+							"separator_before"	: false,
+							"icon"				: false,
+							"separator_after"	: false,
+							"label"				: "Copy",
+							"action"			: function (obj) { this.copy(obj); }
+						},
+						"paste" : {
+							"separator_before"	: false,
+							"icon"				: false,
+							"separator_after"	: false,
+							"label"				: "Paste",
+							"action"			: function (obj) { this.paste(obj); }
+						}
+					}
+				}
+			}
+		},
+		_fn : {
+			show_contextmenu : function (obj, x, y) {
+				obj = this._get_node(obj);
+				var s = this.get_settings().contextmenu,
+					a = obj.children("a:visible:eq(0)"),
+					o = false,
+					i = false;
+				if(s.select_node && this.data.ui && !this.is_selected(obj)) {
+					this.deselect_all();
+					this.select_node(obj, true);
+				}
+				if(s.show_at_node || typeof x === "undefined" || typeof y === "undefined") {
+					o = a.offset();
+					x = o.left;
+					y = o.top + this.data.core.li_height;
+				}
+				i = obj.data("jstree") && obj.data("jstree").contextmenu ? obj.data("jstree").contextmenu : s.items;
+				if($.isFunction(i)) { i = i.call(this, obj); }
+				this.data.contextmenu = true;
+				$.vakata.context.show(i, a, x, y, this, obj, this._get_settings().core.rtl);
+				if(this.data.themes) { $.vakata.context.cnt.attr("class", "jstree-" + this.data.themes.theme + "-context"); }
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree types plugin
+ * Adds support types of nodes
+ * You can set an attribute on each li node, that represents its type.
+ * According to the type setting the node may get custom icon/validation rules
+ */
+(function ($) {
+	$.jstree.plugin("types", {
+		__init : function () {
+			var s = this._get_settings().types;
+			this.data.types.attach_to = [];
+			this.get_container()
+				.bind("init.jstree", $.proxy(function () { 
+						var types = s.types, 
+							attr  = s.type_attr, 
+							icons_css = "", 
+							_this = this;
+
+						$.each(types, function (i, tp) {
+							$.each(tp, function (k, v) { 
+								if(!/^(max_depth|max_children|icon|valid_children)$/.test(k)) { _this.data.types.attach_to.push(k); }
+							});
+							if(!tp.icon) { return true; }
+							if( tp.icon.image || tp.icon.position) {
+								if(i == "default")	{ icons_css += '.jstree-' + _this.get_index() + ' a > .jstree-icon { '; }
+								else				{ icons_css += '.jstree-' + _this.get_index() + ' li[' + attr + '="' + i + '"] > a > .jstree-icon { '; }
+								if(tp.icon.image)	{ icons_css += ' background-image:url(' + tp.icon.image + '); '; }
+								if(tp.icon.position){ icons_css += ' background-position:' + tp.icon.position + '; '; }
+								else				{ icons_css += ' background-position:0 0; '; }
+								icons_css += '} ';
+							}
+						});
+						if(icons_css !== "") { $.vakata.css.add_sheet({ 'str' : icons_css, title : "jstree-types" }); }
+					}, this))
+				.bind("before.jstree", $.proxy(function (e, data) { 
+						var s, t, 
+							o = this._get_settings().types.use_data ? this._get_node(data.args[0]) : false, 
+							d = o && o !== -1 && o.length ? o.data("jstree") : false;
+						if(d && d.types && d.types[data.func] === false) { e.stopImmediatePropagation(); return false; }
+						if($.inArray(data.func, this.data.types.attach_to) !== -1) {
+							if(!data.args[0] || (!data.args[0].tagName && !data.args[0].jquery)) { return; }
+							s = this._get_settings().types.types;
+							t = this._get_type(data.args[0]);
+							if(
+								( 
+									(s[t] && typeof s[t][data.func] !== "undefined") || 
+									(s["default"] && typeof s["default"][data.func] !== "undefined") 
+								) && this._check(data.func, data.args[0]) === false
+							) {
+								e.stopImmediatePropagation();
+								return false;
+							}
+						}
+					}, this));
+			if(is_ie6) {
+				this.get_container()
+					.bind("load_node.jstree set_type.jstree", $.proxy(function (e, data) {
+							var r = data && data.rslt && data.rslt.obj && data.rslt.obj !== -1 ? this._get_node(data.rslt.obj).parent() : this.get_container_ul(),
+								c = false,
+								s = this._get_settings().types;
+							$.each(s.types, function (i, tp) {
+								if(tp.icon && (tp.icon.image || tp.icon.position)) {
+									c = i === "default" ? r.find("li > a > .jstree-icon") : r.find("li[" + s.type_attr + "='" + i + "'] > a > .jstree-icon");
+									if(tp.icon.image) { c.css("backgroundImage","url(" + tp.icon.image + ")"); }
+									c.css("backgroundPosition", tp.icon.position || "0 0");
+								}
+							});
+						}, this));
+			}
+		},
+		defaults : {
+			// defines maximum number of root nodes (-1 means unlimited, -2 means disable max_children checking)
+			max_children		: -1,
+			// defines the maximum depth of the tree (-1 means unlimited, -2 means disable max_depth checking)
+			max_depth			: -1,
+			// defines valid node types for the root nodes
+			valid_children		: "all",
+
+			// whether to use $.data
+			use_data : false, 
+			// where is the type stores (the rel attribute of the LI element)
+			type_attr : "rel",
+			// a list of types
+			types : {
+				// the default type
+				"default" : {
+					"max_children"	: -1,
+					"max_depth"		: -1,
+					"valid_children": "all"
+
+					// Bound functions - you can bind any other function here (using boolean or function)
+					//"select_node"	: true
+				}
+			}
+		},
+		_fn : {
+			_types_notify : function (n, data) {
+				if(data.type && this._get_settings().types.use_data) {
+					this.set_type(data.type, n);
+				}
+			},
+			_get_type : function (obj) {
+				obj = this._get_node(obj);
+				return (!obj || !obj.length) ? false : obj.attr(this._get_settings().types.type_attr) || "default";
+			},
+			set_type : function (str, obj) {
+				obj = this._get_node(obj);
+				var ret = (!obj.length || !str) ? false : obj.attr(this._get_settings().types.type_attr, str);
+				if(ret) { this.__callback({ obj : obj, type : str}); }
+				return ret;
+			},
+			_check : function (rule, obj, opts) {
+				obj = this._get_node(obj);
+				var v = false, t = this._get_type(obj), d = 0, _this = this, s = this._get_settings().types, data = false;
+				if(obj === -1) { 
+					if(!!s[rule]) { v = s[rule]; }
+					else { return; }
+				}
+				else {
+					if(t === false) { return; }
+					data = s.use_data ? obj.data("jstree") : false;
+					if(data && data.types && typeof data.types[rule] !== "undefined") { v = data.types[rule]; }
+					else if(!!s.types[t] && typeof s.types[t][rule] !== "undefined") { v = s.types[t][rule]; }
+					else if(!!s.types["default"] && typeof s.types["default"][rule] !== "undefined") { v = s.types["default"][rule]; }
+				}
+				if($.isFunction(v)) { v = v.call(this, obj); }
+				if(rule === "max_depth" && obj !== -1 && opts !== false && s.max_depth !== -2 && v !== 0) {
+					// also include the node itself - otherwise if root node it is not checked
+					obj.children("a:eq(0)").parentsUntil(".jstree","li").each(function (i) {
+						// check if current depth already exceeds global tree depth
+						if(s.max_depth !== -1 && s.max_depth - (i + 1) <= 0) { v = 0; return false; }
+						d = (i === 0) ? v : _this._check(rule, this, false);
+						// check if current node max depth is already matched or exceeded
+						if(d !== -1 && d - (i + 1) <= 0) { v = 0; return false; }
+						// otherwise - set the max depth to the current value minus current depth
+						if(d >= 0 && (d - (i + 1) < v || v < 0) ) { v = d - (i + 1); }
+						// if the global tree depth exists and it minus the nodes calculated so far is less than `v` or `v` is unlimited
+						if(s.max_depth >= 0 && (s.max_depth - (i + 1) < v || v < 0) ) { v = s.max_depth - (i + 1); }
+					});
+				}
+				return v;
+			},
+			check_move : function () {
+				if(!this.__call_old()) { return false; }
+				var m  = this._get_move(),
+					s  = m.rt._get_settings().types,
+					mc = m.rt._check("max_children", m.cr),
+					md = m.rt._check("max_depth", m.cr),
+					vc = m.rt._check("valid_children", m.cr),
+					ch = 0, d = 1, t;
+
+				if(vc === "none") { return false; } 
+				if($.isArray(vc) && m.ot && m.ot._get_type) {
+					m.o.each(function () {
+						if($.inArray(m.ot._get_type(this), vc) === -1) { d = false; return false; }
+					});
+					if(d === false) { return false; }
+				}
+				if(s.max_children !== -2 && mc !== -1) {
+					ch = m.cr === -1 ? this.get_container().find("> ul > li").not(m.o).length : m.cr.find("> ul > li").not(m.o).length;
+					if(ch + m.o.length > mc) { return false; }
+				}
+				if(s.max_depth !== -2 && md !== -1) {
+					d = 0;
+					if(md === 0) { return false; }
+					if(typeof m.o.d === "undefined") {
+						// TODO: deal with progressive rendering and async when checking max_depth (how to know the depth of the moved node)
+						t = m.o;
+						while(t.length > 0) {
+							t = t.find("> ul > li");
+							d ++;
+						}
+						m.o.d = d;
+					}
+					if(md - m.o.d < 0) { return false; }
+				}
+				return true;
+			},
+			create_node : function (obj, position, js, callback, is_loaded, skip_check) {
+				if(!skip_check && (is_loaded || this._is_loaded(obj))) {
+					var p  = (typeof position == "string" && position.match(/^before|after$/i) && obj !== -1) ? this._get_parent(obj) : this._get_node(obj),
+						s  = this._get_settings().types,
+						mc = this._check("max_children", p),
+						md = this._check("max_depth", p),
+						vc = this._check("valid_children", p),
+						ch;
+					if(typeof js === "string") { js = { data : js }; }
+					if(!js) { js = {}; }
+					if(vc === "none") { return false; } 
+					if($.isArray(vc)) {
+						if(!js.attr || !js.attr[s.type_attr]) { 
+							if(!js.attr) { js.attr = {}; }
+							js.attr[s.type_attr] = vc[0]; 
+						}
+						else {
+							if($.inArray(js.attr[s.type_attr], vc) === -1) { return false; }
+						}
+					}
+					if(s.max_children !== -2 && mc !== -1) {
+						ch = p === -1 ? this.get_container().find("> ul > li").length : p.find("> ul > li").length;
+						if(ch + 1 > mc) { return false; }
+					}
+					if(s.max_depth !== -2 && md !== -1 && (md - 1) < 0) { return false; }
+				}
+				return this.__call_old(true, obj, position, js, callback, is_loaded, skip_check);
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree HTML plugin
+ * The HTML data store. Datastores are build by replacing the `load_node` and `_is_loaded` functions.
+ */
+(function ($) {
+	$.jstree.plugin("html_data", {
+		__init : function () { 
+			// this used to use html() and clean the whitespace, but this way any attached data was lost
+			this.data.html_data.original_container_html = this.get_container().find(" > ul > li").clone(true);
+			// remove white space from LI node - otherwise nodes appear a bit to the right
+			this.data.html_data.original_container_html.find("li").andSelf().contents().filter(function() { return this.nodeType == 3; }).remove();
+		},
+		defaults : { 
+			data : false,
+			ajax : false,
+			correct_state : true
+		},
+		_fn : {
+			load_node : function (obj, s_call, e_call) { var _this = this; this.load_node_html(obj, function () { _this.__callback({ "obj" : _this._get_node(obj) }); s_call.call(this); }, e_call); },
+			_is_loaded : function (obj) { 
+				obj = this._get_node(obj); 
+				return obj == -1 || !obj || (!this._get_settings().html_data.ajax && !$.isFunction(this._get_settings().html_data.data)) || obj.is(".jstree-open, .jstree-leaf") || obj.children("ul").children("li").size() > 0;
+			},
+			load_node_html : function (obj, s_call, e_call) {
+				var d,
+					s = this.get_settings().html_data,
+					error_func = function () {},
+					success_func = function () {};
+				obj = this._get_node(obj);
+				if(obj && obj !== -1) {
+					if(obj.data("jstree-is-loading")) { return; }
+					else { obj.data("jstree-is-loading",true); }
+				}
+				switch(!0) {
+					case ($.isFunction(s.data)):
+						s.data.call(this, obj, $.proxy(function (d) {
+							if(d && d !== "" && d.toString && d.toString().replace(/^[\s\n]+$/,"") !== "") {
+								d = $(d);
+								if(!d.is("ul")) { d = $("<ul />").append(d); }
+								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }
+								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree-is-loading"); }
+								this.clean_node(obj);
+								if(s_call) { s_call.call(this); }
+							}
+							else {
+								if(obj && obj !== -1) {
+									obj.children("a.jstree-loading").removeClass("jstree-loading");
+									obj.removeData("jstree-is-loading");
+									if(s.correct_state) { 
+										this.correct_state(obj);
+										if(s_call) { s_call.call(this); } 
+									}
+								}
+								else {
+									if(s.correct_state) { 
+										this.get_container().children("ul").empty();
+										if(s_call) { s_call.call(this); } 
+									}
+								}
+							}
+						}, this));
+						break;
+					case (!s.data && !s.ajax):
+						if(!obj || obj == -1) {
+							this.get_container()
+								.children("ul").empty()
+								.append(this.data.html_data.original_container_html)
+								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()
+								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");
+							this.clean_node();
+						}
+						if(s_call) { s_call.call(this); }
+						break;
+					case (!!s.data && !s.ajax) || (!!s.data && !!s.ajax && (!obj || obj === -1)):
+						if(!obj || obj == -1) {
+							d = $(s.data);
+							if(!d.is("ul")) { d = $("<ul />").append(d); }
+							this.get_container()
+								.children("ul").empty().append(d.children())
+								.find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end()
+								.filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon");
+							this.clean_node();
+						}
+						if(s_call) { s_call.call(this); }
+						break;
+					case (!s.data && !!s.ajax) || (!!s.data && !!s.ajax && obj && obj !== -1):
+						obj = this._get_node(obj);
+						error_func = function (x, t, e) {
+							var ef = this.get_settings().html_data.ajax.error; 
+							if(ef) { ef.call(this, x, t, e); }
+							if(obj != -1 && obj.length) {
+								obj.children("a.jstree-loading").removeClass("jstree-loading");
+								obj.removeData("jstree-is-loading");
+								if(t === "success" && s.correct_state) { this.correct_state(obj); }
+							}
+							else {
+								if(t === "success" && s.correct_state) { this.get_container().children("ul").empty(); }
+							}
+							if(e_call) { e_call.call(this); }
+						};
+						success_func = function (d, t, x) {
+							var sf = this.get_settings().html_data.ajax.success; 
+							if(sf) { d = sf.call(this,d,t,x) || d; }
+							if(d === "" || (d && d.toString && d.toString().replace(/^[\s\n]+$/,"") === "")) {
+								return error_func.call(this, x, t, "");
+							}
+							if(d) {
+								d = $(d);
+								if(!d.is("ul")) { d = $("<ul />").append(d); }
+								if(obj == -1 || !obj) { this.get_container().children("ul").empty().append(d.children()).find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); }
+								else { obj.children("a.jstree-loading").removeClass("jstree-loading"); obj.append(d).children("ul").find("li, a").filter(function () { return !this.firstChild || !this.firstChild.tagName || this.firstChild.tagName !== "INS"; }).prepend("<ins class='jstree-icon'>&#160;</ins>").end().filter("a").children("ins:first-child").not(".jstree-icon").addClass("jstree-icon"); obj.removeData("jstree-is-loading"); }
+								this.clean_node(obj);
+								if(s_call) { s_call.call(this); }
+							}
+							else {
+								if(obj && obj !== -1) {
+									obj.children("a.jstree-loading").removeClass("jstree-loading");
+									obj.removeData("jstree-is-loading");
+									if(s.correct_state) { 
+										this.correct_state(obj);
+										if(s_call) { s_call.call(this); } 
+									}
+								}
+								else {
+									if(s.correct_state) { 
+										this.get_container().children("ul").empty();
+										if(s_call) { s_call.call(this); } 
+									}
+								}
+							}
+						};
+						s.ajax.context = this;
+						s.ajax.error = error_func;
+						s.ajax.success = success_func;
+						if(!s.ajax.dataType) { s.ajax.dataType = "html"; }
+						if($.isFunction(s.ajax.url)) { s.ajax.url = s.ajax.url.call(this, obj); }
+						if($.isFunction(s.ajax.data)) { s.ajax.data = s.ajax.data.call(this, obj); }
+						$.ajax(s.ajax);
+						break;
+				}
+			}
+		}
+	});
+	// include the HTML data plugin by default
+	$.jstree.defaults.plugins.push("html_data");
+})(jQuery);
+//*/
+
+/* 
+ * jsTree themeroller plugin
+ * Adds support for jQuery UI themes. Include this at the end of your plugins list, also make sure "themes" is not included.
+ */
+(function ($) {
+	$.jstree.plugin("themeroller", {
+		__init : function () {
+			var s = this._get_settings().themeroller;
+			this.get_container()
+				.addClass("ui-widget-content")
+				.addClass("jstree-themeroller")
+				.delegate("a","mouseenter.jstree", function (e) {
+					if(!$(e.currentTarget).hasClass("jstree-loading")) {
+						$(this).addClass(s.item_h);
+					}
+				})
+				.delegate("a","mouseleave.jstree", function () {
+					$(this).removeClass(s.item_h);
+				})
+				.bind("init.jstree", $.proxy(function (e, data) { 
+						data.inst.get_container().find("> ul > li > .jstree-loading > ins").addClass("ui-icon-refresh");
+						this._themeroller(data.inst.get_container().find("> ul > li"));
+					}, this))
+				.bind("open_node.jstree create_node.jstree", $.proxy(function (e, data) { 
+						this._themeroller(data.rslt.obj);
+					}, this))
+				.bind("loaded.jstree refresh.jstree", $.proxy(function (e) {
+						this._themeroller();
+					}, this))
+				.bind("close_node.jstree", $.proxy(function (e, data) {
+						this._themeroller(data.rslt.obj);
+					}, this))
+				.bind("delete_node.jstree", $.proxy(function (e, data) {
+						this._themeroller(data.rslt.parent);
+					}, this))
+				.bind("correct_state.jstree", $.proxy(function (e, data) {
+						data.rslt.obj
+							.children("ins.jstree-icon").removeClass(s.opened + " " + s.closed + " ui-icon").end()
+							.find("> a > ins.ui-icon")
+								.filter(function() { 
+									return this.className.toString()
+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
+										.indexOf("ui-icon-") === -1; 
+								}).removeClass(s.item_open + " " + s.item_clsd).addClass(s.item_leaf || "jstree-no-icon");
+					}, this))
+				.bind("select_node.jstree", $.proxy(function (e, data) {
+						data.rslt.obj.children("a").addClass(s.item_a);
+					}, this))
+				.bind("deselect_node.jstree deselect_all.jstree", $.proxy(function (e, data) {
+						this.get_container()
+							.find("a." + s.item_a).removeClass(s.item_a).end()
+							.find("a.jstree-clicked").addClass(s.item_a);
+					}, this))
+				.bind("dehover_node.jstree", $.proxy(function (e, data) {
+						data.rslt.obj.children("a").removeClass(s.item_h);
+					}, this))
+				.bind("hover_node.jstree", $.proxy(function (e, data) {
+						this.get_container()
+							.find("a." + s.item_h).not(data.rslt.obj).removeClass(s.item_h);
+						data.rslt.obj.children("a").addClass(s.item_h);
+					}, this))
+				.bind("move_node.jstree", $.proxy(function (e, data) {
+						this._themeroller(data.rslt.o);
+						this._themeroller(data.rslt.op);
+					}, this));
+		},
+		__destroy : function () {
+			var s = this._get_settings().themeroller,
+				c = [ "ui-icon" ];
+			$.each(s, function (i, v) {
+				v = v.split(" ");
+				if(v.length) { c = c.concat(v); }
+			});
+			this.get_container()
+				.removeClass("ui-widget-content")
+				.find("." + c.join(", .")).removeClass(c.join(" "));
+		},
+		_fn : {
+			_themeroller : function (obj) {
+				var s = this._get_settings().themeroller;
+				obj = !obj || obj == -1 ? this.get_container_ul() : this._get_node(obj).parent();
+				obj
+					.find("li.jstree-closed")
+						.children("ins.jstree-icon").removeClass(s.opened).addClass("ui-icon " + s.closed).end()
+						.children("a").addClass(s.item)
+							.children("ins.jstree-icon").addClass("ui-icon")
+								.filter(function() { 
+									return this.className.toString()
+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
+										.indexOf("ui-icon-") === -1; 
+								}).removeClass(s.item_leaf + " " + s.item_open).addClass(s.item_clsd || "jstree-no-icon")
+								.end()
+							.end()
+						.end()
+					.end()
+					.find("li.jstree-open")
+						.children("ins.jstree-icon").removeClass(s.closed).addClass("ui-icon " + s.opened).end()
+						.children("a").addClass(s.item)
+							.children("ins.jstree-icon").addClass("ui-icon")
+								.filter(function() { 
+									return this.className.toString()
+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
+										.indexOf("ui-icon-") === -1; 
+								}).removeClass(s.item_leaf + " " + s.item_clsd).addClass(s.item_open || "jstree-no-icon")
+								.end()
+							.end()
+						.end()
+					.end()
+					.find("li.jstree-leaf")
+						.children("ins.jstree-icon").removeClass(s.closed + " ui-icon " + s.opened).end()
+						.children("a").addClass(s.item)
+							.children("ins.jstree-icon").addClass("ui-icon")
+								.filter(function() { 
+									return this.className.toString()
+										.replace(s.item_clsd,"").replace(s.item_open,"").replace(s.item_leaf,"")
+										.indexOf("ui-icon-") === -1; 
+								}).removeClass(s.item_clsd + " " + s.item_open).addClass(s.item_leaf || "jstree-no-icon");
+			}
+		},
+		defaults : {
+			"opened"	: "ui-icon-triangle-1-se",
+			"closed"	: "ui-icon-triangle-1-e",
+			"item"		: "ui-state-default",
+			"item_h"	: "ui-state-hover",
+			"item_a"	: "ui-state-active",
+			"item_open"	: "ui-icon-folder-open",
+			"item_clsd"	: "ui-icon-folder-collapsed",
+			"item_leaf"	: "ui-icon-document"
+		}
+	});
+	$(function() {
+		var css_string = '' + 
+			'.jstree-themeroller .ui-icon { overflow:visible; } ' + 
+			'.jstree-themeroller a { padding:0 2px; } ' + 
+			'.jstree-themeroller .jstree-no-icon { display:none; }';
+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
+	});
+})(jQuery);
+//*/
+
+/* 
+ * jsTree unique plugin
+ * Forces different names amongst siblings (still a bit experimental)
+ * NOTE: does not check language versions (it will not be possible to have nodes with the same title, even in different languages)
+ */
+(function ($) {
+	$.jstree.plugin("unique", {
+		__init : function () {
+			this.get_container()
+				.bind("before.jstree", $.proxy(function (e, data) { 
+						var nms = [], res = true, p, t;
+						if(data.func == "move_node") {
+							// obj, ref, position, is_copy, is_prepared, skip_check
+							if(data.args[4] === true) {
+								if(data.args[0].o && data.args[0].o.length) {
+									data.args[0].o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });
+									res = this._check_unique(nms, data.args[0].np.find("> ul > li").not(data.args[0].o), "move_node");
+								}
+							}
+						}
+						if(data.func == "create_node") {
+							// obj, position, js, callback, is_loaded
+							if(data.args[4] || this._is_loaded(data.args[0])) {
+								p = this._get_node(data.args[0]);
+								if(data.args[1] && (data.args[1] === "before" || data.args[1] === "after")) {
+									p = this._get_parent(data.args[0]);
+									if(!p || p === -1) { p = this.get_container(); }
+								}
+								if(typeof data.args[2] === "string") { nms.push(data.args[2]); }
+								else if(!data.args[2] || !data.args[2].data) { nms.push(this._get_string("new_node")); }
+								else { nms.push(data.args[2].data); }
+								res = this._check_unique(nms, p.find("> ul > li"), "create_node");
+							}
+						}
+						if(data.func == "rename_node") {
+							// obj, val
+							nms.push(data.args[1]);
+							t = this._get_node(data.args[0]);
+							p = this._get_parent(t);
+							if(!p || p === -1) { p = this.get_container(); }
+							res = this._check_unique(nms, p.find("> ul > li").not(t), "rename_node");
+						}
+						if(!res) {
+							e.stopPropagation();
+							return false;
+						}
+					}, this));
+		},
+		defaults : { 
+			error_callback : $.noop
+		},
+		_fn : { 
+			_check_unique : function (nms, p, func) {
+				var cnms = [];
+				p.children("a").each(function () { cnms.push($(this).text().replace(/^\s+/g,"")); });
+				if(!cnms.length || !nms.length) { return true; }
+				cnms = cnms.sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",");
+				if((cnms.length + nms.length) != cnms.concat(nms).sort().join(",,").replace(/(,|^)([^,]+)(,,\2)+(,|$)/g,"$1$2$4").replace(/,,+/g,",").replace(/,$/,"").split(",").length) {
+					this._get_settings().unique.error_callback.call(null, nms, p, func);
+					return false;
+				}
+				return true;
+			},
+			check_move : function () {
+				if(!this.__call_old()) { return false; }
+				var p = this._get_move(), nms = [];
+				if(p.o && p.o.length) {
+					p.o.children("a").each(function () { nms.push($(this).text().replace(/^\s+/g,"")); });
+					return this._check_unique(nms, p.np.find("> ul > li").not(p.o), "check_move");
+				}
+				return true;
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+/*
+ * jsTree wholerow plugin
+ * Makes select and hover work on the entire width of the node
+ * MAY BE HEAVY IN LARGE DOM
+ */
+(function ($) {
+	$.jstree.plugin("wholerow", {
+		__init : function () {
+			if(!this.data.ui) { throw "jsTree wholerow: jsTree UI plugin not included."; }
+			this.data.wholerow.html = false;
+			this.data.wholerow.to = false;
+			this.get_container()
+				.bind("init.jstree", $.proxy(function (e, data) { 
+						this._get_settings().core.animation = 0;
+					}, this))
+				.bind("open_node.jstree create_node.jstree clean_node.jstree loaded.jstree", $.proxy(function (e, data) { 
+						this._prepare_wholerow_span( data && data.rslt && data.rslt.obj ? data.rslt.obj : -1 );
+					}, this))
+				.bind("search.jstree clear_search.jstree reopen.jstree after_open.jstree after_close.jstree create_node.jstree delete_node.jstree clean_node.jstree", $.proxy(function (e, data) { 
+						if(this.data.to) { clearTimeout(this.data.to); }
+						this.data.to = setTimeout( (function (t, o) { return function() { t._prepare_wholerow_ul(o); }; })(this,  data && data.rslt && data.rslt.obj ? data.rslt.obj : -1), 0);
+					}, this))
+				.bind("deselect_all.jstree", $.proxy(function (e, data) { 
+						this.get_container().find(" > .jstree-wholerow .jstree-clicked").removeClass("jstree-clicked " + (this.data.themeroller ? this._get_settings().themeroller.item_a : "" ));
+					}, this))
+				.bind("select_node.jstree deselect_node.jstree ", $.proxy(function (e, data) { 
+						data.rslt.obj.each(function () { 
+							var ref = data.inst.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt((($(this).offset().top - data.inst.get_container().offset().top + data.inst.get_container()[0].scrollTop) / data.inst.data.core.li_height),10)) + ")");
+							// ref.children("a")[e.type === "select_node" ? "addClass" : "removeClass"]("jstree-clicked");
+							ref.children("a").attr("class",data.rslt.obj.children("a").attr("class"));
+						});
+					}, this))
+				.bind("hover_node.jstree dehover_node.jstree", $.proxy(function (e, data) { 
+						this.get_container().find(" > .jstree-wholerow .jstree-hovered").removeClass("jstree-hovered " + (this.data.themeroller ? this._get_settings().themeroller.item_h : "" ));
+						if(e.type === "hover_node") {
+							var ref = this.get_container().find(" > .jstree-wholerow li:visible:eq(" + ( parseInt(((data.rslt.obj.offset().top - this.get_container().offset().top + this.get_container()[0].scrollTop) / this.data.core.li_height),10)) + ")");
+							// ref.children("a").addClass("jstree-hovered");
+							ref.children("a").attr("class",data.rslt.obj.children(".jstree-hovered").attr("class"));
+						}
+					}, this))
+				.delegate(".jstree-wholerow-span, ins.jstree-icon, li", "click.jstree", function (e) {
+						var n = $(e.currentTarget);
+						if(e.target.tagName === "A" || (e.target.tagName === "INS" && n.closest("li").is(".jstree-open, .jstree-closed"))) { return; }
+						n.closest("li").children("a:visible:eq(0)").click();
+						e.stopImmediatePropagation();
+					})
+				.delegate("li", "mouseover.jstree", $.proxy(function (e) {
+						e.stopImmediatePropagation();
+						if($(e.currentTarget).children(".jstree-hovered, .jstree-clicked").length) { return false; }
+						this.hover_node(e.currentTarget);
+						return false;
+					}, this))
+				.delegate("li", "mouseleave.jstree", $.proxy(function (e) {
+						if($(e.currentTarget).children("a").hasClass("jstree-hovered").length) { return; }
+						this.dehover_node(e.currentTarget);
+					}, this));
+			if(is_ie7 || is_ie6) {
+				$.vakata.css.add_sheet({ str : ".jstree-" + this.get_index() + " { position:relative; } ", title : "jstree" });
+			}
+		},
+		defaults : {
+		},
+		__destroy : function () {
+			this.get_container().children(".jstree-wholerow").remove();
+			this.get_container().find(".jstree-wholerow-span").remove();
+		},
+		_fn : {
+			_prepare_wholerow_span : function (obj) {
+				obj = !obj || obj == -1 ? this.get_container().find("> ul > li") : this._get_node(obj);
+				if(obj === false) { return; } // added for removing root nodes
+				obj.each(function () {
+					$(this).find("li").andSelf().each(function () {
+						var $t = $(this);
+						if($t.children(".jstree-wholerow-span").length) { return true; }
+						$t.prepend("<span class='jstree-wholerow-span' style='width:" + ($t.parentsUntil(".jstree","li").length * 18) + "px;'>&#160;</span>");
+					});
+				});
+			},
+			_prepare_wholerow_ul : function () {
+				var o = this.get_container().children("ul").eq(0), h = o.html();
+				o.addClass("jstree-wholerow-real");
+				if(this.data.wholerow.last_html !== h) {
+					this.data.wholerow.last_html = h;
+					this.get_container().children(".jstree-wholerow").remove();
+					this.get_container().append(
+						o.clone().removeClass("jstree-wholerow-real")
+							.wrapAll("<div class='jstree-wholerow' />").parent()
+							.width(o.parent()[0].scrollWidth)
+							.css("top", (o.height() + ( is_ie7 ? 5 : 0)) * -1 )
+							.find("li[id]").each(function () { this.removeAttribute("id"); }).end()
+					);
+				}
+			}
+		}
+	});
+	$(function() {
+		var css_string = '' + 
+			'.jstree .jstree-wholerow-real { position:relative; z-index:1; } ' + 
+			'.jstree .jstree-wholerow-real li { cursor:pointer; } ' + 
+			'.jstree .jstree-wholerow-real a { border-left-color:transparent !important; border-right-color:transparent !important; } ' + 
+			'.jstree .jstree-wholerow { position:relative; z-index:0; height:0; } ' + 
+			'.jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { width:100%; } ' + 
+			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li, .jstree .jstree-wholerow a { margin:0 !important; padding:0 !important; } ' + 
+			'.jstree .jstree-wholerow, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow li { background:transparent !important; }' + 
+			'.jstree .jstree-wholerow ins, .jstree .jstree-wholerow span, .jstree .jstree-wholerow input { display:none !important; }' + 
+			'.jstree .jstree-wholerow a, .jstree .jstree-wholerow a:hover { text-indent:-9999px; !important; width:100%; padding:0 !important; border-right-width:0px !important; border-left-width:0px !important; } ' + 
+			'.jstree .jstree-wholerow-span { position:absolute; left:0; margin:0px; padding:0; height:18px; border-width:0; padding:0; z-index:0; }';
+		if(is_ff2) {
+			css_string += '' + 
+				'.jstree .jstree-wholerow a { display:block; height:18px; margin:0; padding:0; border:0; } ' + 
+				'.jstree .jstree-wholerow-real a { border-color:transparent !important; } ';
+		}
+		if(is_ie7 || is_ie6) {
+			css_string += '' + 
+				'.jstree .jstree-wholerow, .jstree .jstree-wholerow li, .jstree .jstree-wholerow ul, .jstree .jstree-wholerow a { margin:0; padding:0; line-height:18px; } ' + 
+				'.jstree .jstree-wholerow a { display:block; height:18px; line-height:18px; overflow:hidden; } ';
+		}
+		$.vakata.css.add_sheet({ str : css_string, title : "jstree" });
+	});
+})(jQuery);
+//*/
+
+/*
+* jsTree model plugin
+* This plugin gets jstree to use a class model to retrieve data, creating great dynamism
+*/
+(function ($) {
+	var nodeInterface = ["getChildren","getChildrenCount","getAttr","getName","getProps"],
+		validateInterface = function(obj, inter) {
+			var valid = true;
+			obj = obj || {};
+			inter = [].concat(inter);
+			$.each(inter, function (i, v) {
+				if(!$.isFunction(obj[v])) { valid = false; return false; }
+			});
+			return valid;
+		};
+	$.jstree.plugin("model", {
+		__init : function () {
+			if(!this.data.json_data) { throw "jsTree model: jsTree json_data plugin not included."; }
+			this._get_settings().json_data.data = function (n, b) {
+				var obj = (n == -1) ? this._get_settings().model.object : n.data("jstree_model");
+				if(!validateInterface(obj, nodeInterface)) { return b.call(null, false); }
+				if(this._get_settings().model.async) {
+					obj.getChildren($.proxy(function (data) {
+						this.model_done(data, b);
+					}, this));
+				}
+				else {
+					this.model_done(obj.getChildren(), b);
+				}
+			};
+		},
+		defaults : {
+			object : false,
+			id_prefix : false,
+			async : false
+		},
+		_fn : {
+			model_done : function (data, callback) {
+				var ret = [], 
+					s = this._get_settings(),
+					_this = this;
+
+				if(!$.isArray(data)) { data = [data]; }
+				$.each(data, function (i, nd) {
+					var r = nd.getProps() || {};
+					r.attr = nd.getAttr() || {};
+					if(nd.getChildrenCount()) { r.state = "closed"; }
+					r.data = nd.getName();
+					if(!$.isArray(r.data)) { r.data = [r.data]; }
+					if(_this.data.types && $.isFunction(nd.getType)) {
+						r.attr[s.types.type_attr] = nd.getType();
+					}
+					if(r.attr.id && s.model.id_prefix) { r.attr.id = s.model.id_prefix + r.attr.id; }
+					if(!r.metadata) { r.metadata = { }; }
+					r.metadata.jstree_model = nd;
+					ret.push(r);
+				});
+				callback.call(null, ret);
+			}
+		}
+	});
+})(jQuery);
+//*/
+
+})();
+\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/apple/bg.jpg b/mod/developers/vendors/jsTree/themes/apple/bg.jpg
new file mode 100644
index 000000000..3aad05d8f
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/bg.jpg
diff --git a/mod/developers/vendors/jsTree/themes/apple/d.png b/mod/developers/vendors/jsTree/themes/apple/d.png
new file mode 100644
index 000000000..2463ba6df
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/d.png
diff --git a/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif b/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif
new file mode 100644
index 000000000..c0cc5fda7
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/dot_for_ie.gif
diff --git a/mod/developers/vendors/jsTree/themes/apple/style.css b/mod/developers/vendors/jsTree/themes/apple/style.css
new file mode 100644
index 000000000..db7a143e0
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/style.css
@@ -0,0 +1,61 @@
+/*
+ * jsTree apple theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-apple > ul { background:url("bg.jpg") left top repeat; }
+.jstree-apple li, 
+.jstree-apple ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-apple li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-apple li.jstree-last { background:transparent; }
+.jstree-apple .jstree-open > ins { background-position:-72px 0; }
+.jstree-apple .jstree-closed > ins { background-position:-54px 0; }
+.jstree-apple .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-apple a { border-radius:4px; -moz-border-radius:4px; -webkit-border-radius:4px; text-shadow:1px 1px 1px white; }
+.jstree-apple .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 3px 0 1px; text-shadow:1px 1px 1px silver; }
+.jstree-apple .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 3px 0 1px; }
+.jstree-apple a .jstree-icon { background-position:-56px -20px; }
+.jstree-apple a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-apple.jstree-focused { background:white; }
+
+.jstree-apple .jstree-no-dots li, 
+.jstree-apple .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-apple .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-apple .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-apple .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-apple .jstree-search { font-style:italic; }
+
+.jstree-apple .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-apple .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-apple .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-apple .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-apple .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-apple .jstree-checked > a > .checkbox:hover { background-position:-38px -37px; }
+.jstree-apple .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-apple .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-apple ins { background:transparent !important; }
+#vakata-dragged.jstree-apple .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-apple .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-apple { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
+
+.jstree-apple a.jstree-search { color:aqua; }
+.jstree-apple .jstree-locked a { color:silver; cursor:default; }
+
+#vakata-contextmenu.jstree-apple-context, 
+#vakata-contextmenu.jstree-apple-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-apple-context li { }
+#vakata-contextmenu.jstree-apple-context a { color:black; }
+#vakata-contextmenu.jstree-apple-context a:hover, 
+#vakata-contextmenu.jstree-apple-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-apple-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
+#vakata-contextmenu.jstree-apple-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-apple-context li ul { margin-left:-4px; }
+
+/* TODO: IE6 support - the `>` selectors */
+\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/apple/throbber.gif b/mod/developers/vendors/jsTree/themes/apple/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/apple/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/d.gif b/mod/developers/vendors/jsTree/themes/classic/d.gif
new file mode 100644
index 000000000..6eb0004ce
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/d.png b/mod/developers/vendors/jsTree/themes/classic/d.png
new file mode 100644
index 000000000..275daeca2
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/d.png
diff --git a/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif b/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif
new file mode 100644
index 000000000..c0cc5fda7
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/dot_for_ie.gif
diff --git a/mod/developers/vendors/jsTree/themes/classic/style.css b/mod/developers/vendors/jsTree/themes/classic/style.css
new file mode 100644
index 000000000..492856ddc
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/style.css
@@ -0,0 +1,77 @@
+/*
+ * jsTree classic theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-classic li, 
+.jstree-classic ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-classic li { background-position:-90px 0; background-repeat:repeat-y;  }
+.jstree-classic li.jstree-last { background:transparent; }
+.jstree-classic .jstree-open > ins { background-position:-72px 0; }
+.jstree-classic .jstree-closed > ins { background-position:-54px 0; }
+.jstree-classic .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-classic .jstree-hovered { background:#e7f4f9; border:1px solid #e7f4f9; padding:0 2px 0 1px; }
+.jstree-classic .jstree-clicked { background:navy; border:1px solid navy; padding:0 2px 0 1px; color:white; }
+.jstree-classic a .jstree-icon { background-position:-56px -19px; }
+.jstree-classic .jstree-open > a .jstree-icon { background-position:-56px -36px; }
+.jstree-classic a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-classic.jstree-focused { background:white; }
+
+.jstree-classic .jstree-no-dots li, 
+.jstree-classic .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-classic .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-classic .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-classic .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-classic .jstree-search { font-style:italic; }
+
+.jstree-classic .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-classic .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-classic .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-classic .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-classic .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-classic .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
+.jstree-classic .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-classic .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-classic ins { background:transparent !important; }
+#vakata-dragged.jstree-classic .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-classic .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-classic { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
+
+.jstree-classic a.jstree-search { color:aqua; }
+.jstree-classic .jstree-locked a { color:silver; cursor:default; }
+
+#vakata-contextmenu.jstree-classic-context, 
+#vakata-contextmenu.jstree-classic-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-classic-context li { }
+#vakata-contextmenu.jstree-classic-context a { color:black; }
+#vakata-contextmenu.jstree-classic-context a:hover, 
+#vakata-contextmenu.jstree-classic-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-classic-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
+#vakata-contextmenu.jstree-classic-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-classic-context li ul { margin-left:-4px; }
+
+/* IE6 BEGIN */
+.jstree-classic li, 
+.jstree-classic ins,
+#vakata-dragged.jstree-classic .jstree-invalid, 
+#vakata-dragged.jstree-classic .jstree-ok, 
+#jstree-marker.jstree-classic { _background-image:url("d.gif"); }
+.jstree-classic .jstree-open ins { _background-position:-72px 0; }
+.jstree-classic .jstree-closed ins { _background-position:-54px 0; }
+.jstree-classic .jstree-leaf ins { _background-position:-36px 0; }
+.jstree-classic .jstree-open a ins.jstree-icon { _background-position:-56px -36px; }
+.jstree-classic .jstree-closed a ins.jstree-icon { _background-position:-56px -19px; }
+.jstree-classic .jstree-leaf a ins.jstree-icon { _background-position:-56px -19px; }
+#vakata-contextmenu.jstree-classic-context ins { _display:none; }
+#vakata-contextmenu.jstree-classic-context li { _zoom:1; }
+.jstree-classic .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
+.jstree-classic .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
+.jstree-classic .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
+/* IE6 END */
+\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/classic/throbber.gif b/mod/developers/vendors/jsTree/themes/classic/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/classic/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/d.gif b/mod/developers/vendors/jsTree/themes/default-rtl/d.gif
new file mode 100644
index 000000000..d85aba049
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/d.png b/mod/developers/vendors/jsTree/themes/default-rtl/d.png
new file mode 100644
index 000000000..5179cf64e
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/d.png
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif b/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif
new file mode 100644
index 000000000..00433648c
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/dots.gif
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/style.css b/mod/developers/vendors/jsTree/themes/default-rtl/style.css
new file mode 100644
index 000000000..d51aef6cc
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/style.css
@@ -0,0 +1,84 @@
+/*
+ * jsTree default-rtl theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-default-rtl li, 
+.jstree-default-rtl ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default-rtl li { background-position:-90px 0; background-repeat:repeat-y; }
+.jstree-default-rtl li.jstree-last { background:transparent; }
+.jstree-default-rtl .jstree-open > ins { background-position:-72px 0; }
+.jstree-default-rtl .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default-rtl .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default-rtl .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
+.jstree-default-rtl .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
+.jstree-default-rtl a .jstree-icon { background-position:-56px -19px; }
+.jstree-default-rtl a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-default-rtl.jstree-focused { background:#ffffee; }
+
+.jstree-default-rtl .jstree-no-dots li, 
+.jstree-default-rtl .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default-rtl .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default-rtl .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default-rtl .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default-rtl .jstree-search { font-style:italic; }
+
+.jstree-default-rtl .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-default-rtl .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-default-rtl ins { background:transparent !important; }
+#vakata-dragged.jstree-default-rtl .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-default-rtl .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-default-rtl { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
+
+.jstree-default-rtl a.jstree-search { color:aqua; }
+.jstree-default-rtl .jstree-locked a { color:silver; cursor:default; }
+
+#vakata-contextmenu.jstree-default-rtl-context, 
+#vakata-contextmenu.jstree-default-rtl-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-default-rtl-context li { }
+#vakata-contextmenu.jstree-default-rtl-context a { color:black; }
+#vakata-contextmenu.jstree-default-rtl-context a:hover, 
+#vakata-contextmenu.jstree-default-rtl-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-default-rtl-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
+#vakata-contextmenu.jstree-default-rtl-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-default-rtl-context li ul { margin-left:-4px; }
+
+/* IE6 BEGIN */
+.jstree-default-rtl li, 
+.jstree-default-rtl ins,
+#vakata-dragged.jstree-default-rtl .jstree-invalid, 
+#vakata-dragged.jstree-default-rtl .jstree-ok, 
+#jstree-marker.jstree-default-rtl { _background-image:url("d.gif"); }
+.jstree-default-rtl .jstree-open ins { _background-position:-72px 0; }
+.jstree-default-rtl .jstree-closed ins { _background-position:-54px 0; }
+.jstree-default-rtl .jstree-leaf ins { _background-position:-36px 0; }
+.jstree-default-rtl a ins.jstree-icon { _background-position:-56px -19px; }
+#vakata-contextmenu.jstree-default-rtl-context ins { _display:none; }
+#vakata-contextmenu.jstree-default-rtl-context li { _zoom:1; }
+.jstree-default-rtl .jstree-undetermined a .jstree-checkbox { _background-position:-18px -19px; }
+.jstree-default-rtl .jstree-checked a .jstree-checkbox { _background-position:-36px -19px; }
+.jstree-default-rtl .jstree-unchecked a .jstree-checkbox { _background-position:0px -19px; }
+/* IE6 END */
+
+/* RTL part */
+.jstree-default-rtl .jstree-hovered, .jstree-default-rtl .jstree-clicked { padding:0 1px 0 2px; }
+.jstree-default-rtl li { background-image:url("dots.gif"); background-position: 100% 0px; }
+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox { background-position:-36px -19px; margin-left:2px; }
+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox { background-position:0px -19px; margin-left:2px; }
+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox { background-position:-18px -19px; margin-left:2px; }
+.jstree-default-rtl .jstree-checked > a > .jstree-checkbox:hover { background-position:-36px -37px; }
+.jstree-default-rtl .jstree-unchecked > a > .jstree-checkbox:hover { background-position:0px -37px; }
+.jstree-default-rtl .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-18px -37px; }
+\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif b/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default-rtl/throbber.gif
diff --git a/mod/developers/vendors/jsTree/themes/default/d.gif b/mod/developers/vendors/jsTree/themes/default/d.gif
new file mode 100644
index 000000000..0e958d387
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/d.gif
diff --git a/mod/developers/vendors/jsTree/themes/default/d.png b/mod/developers/vendors/jsTree/themes/default/d.png
new file mode 100644
index 000000000..8540175a0
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/d.png
diff --git a/mod/developers/vendors/jsTree/themes/default/style.css b/mod/developers/vendors/jsTree/themes/default/style.css
new file mode 100644
index 000000000..238ce1a1c
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/style.css
@@ -0,0 +1,74 @@
+/*
+ * jsTree default theme 1.0
+ * Supported features: dots/no-dots, icons/no-icons, focused, loading
+ * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search
+ */
+
+.jstree-default li, 
+.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; }
+.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; }
+.jstree-default li.jstree-last { background:transparent; }
+.jstree-default .jstree-open > ins { background-position:-72px 0; }
+.jstree-default .jstree-closed > ins { background-position:-54px 0; }
+.jstree-default .jstree-leaf > ins { background-position:-36px 0; }
+
+.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; }
+.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; }
+.jstree-default a .jstree-icon { background-position:-56px -19px; }
+.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; }
+
+.jstree-default.jstree-focused { background:#ffffee; }
+
+.jstree-default .jstree-no-dots li, 
+.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; }
+.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; }
+.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; }
+
+.jstree-default .jstree-no-icons a .jstree-icon { display:none; }
+
+.jstree-default .jstree-search { font-style:italic; }
+
+.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; }
+.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; }
+.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; }
+.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; }
+.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; }
+.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; }
+.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; }
+.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; }
+
+#vakata-dragged.jstree-default ins { background:transparent !important; }
+#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; }
+#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; }
+#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; text-indent:-100px; }
+
+.jstree-default a.jstree-search { color:aqua; }
+.jstree-default .jstree-locked a { color:silver; cursor:default; }
+
+#vakata-contextmenu.jstree-default-context, 
+#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; }
+#vakata-contextmenu.jstree-default-context li { }
+#vakata-contextmenu.jstree-default-context a { color:black; }
+#vakata-contextmenu.jstree-default-context a:hover, 
+#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; }
+#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a, 
+#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; }
+#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; }
+#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; }
+
+/* IE6 BEGIN */
+.jstree-default li, 
+.jstree-default ins,
+#vakata-dragged.jstree-default .jstree-invalid, 
+#vakata-dragged.jstree-default .jstree-ok, 
+#jstree-marker.jstree-default { _background-image:url("d.gif"); }
+.jstree-default .jstree-open ins { _background-position:-72px 0; }
+.jstree-default .jstree-closed ins { _background-position:-54px 0; }
+.jstree-default .jstree-leaf ins { _background-position:-36px 0; }
+.jstree-default a ins.jstree-icon { _background-position:-56px -19px; }
+#vakata-contextmenu.jstree-default-context ins { _display:none; }
+#vakata-contextmenu.jstree-default-context li { _zoom:1; }
+.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; }
+.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; }
+.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; }
+/* IE6 END */
+\ No newline at end of file
diff --git a/mod/developers/vendors/jsTree/themes/default/throbber.gif b/mod/developers/vendors/jsTree/themes/default/throbber.gif
new file mode 100644
index 000000000..5b33f7e54
--- /dev/null
+++ b/mod/developers/vendors/jsTree/themes/default/throbber.gif
diff --git a/mod/developers/views/default/admin/develop_tools/inspect.php b/mod/developers/views/default/admin/develop_tools/inspect.php
new file mode 100644
index 000000000..cfa3de2ea
--- /dev/null
+++ b/mod/developers/views/default/admin/develop_tools/inspect.php
@@ -0,0 +1,14 @@
+<?php
+/**
+* Inspect View
+*
+* Inspect global variables of Elgg
+*/
+
+elgg_load_js('jquery.jstree');
+elgg_load_css('jquery.jstree');
+
+echo elgg_view_form('developers/inspect', array('class' => 'developers-form-inspect'));
+
+echo '<div id="developers-inspect-results"></div>';
+echo elgg_view('graphics/ajax_loader', array('id' => 'developers-ajax-loader'));
diff --git a/mod/developers/views/default/admin/develop_tools/preview.php b/mod/developers/views/default/admin/develop_tools/preview.php
new file mode 100644
index 000000000..920047d98
--- /dev/null
+++ b/mod/developers/views/default/admin/develop_tools/preview.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * CSS Preview
+ */
+
+$url = elgg_get_site_url() . 'theme_preview';
+?>
+<iframe id="developers-iframe" src="<?php echo $url; ?>"></iframe>
+\ No newline at end of file
diff --git a/mod/developers/views/default/admin/develop_tools/unit_tests.php b/mod/developers/views/default/admin/develop_tools/unit_tests.php
new file mode 100644
index 000000000..81658e88b
--- /dev/null
+++ b/mod/developers/views/default/admin/develop_tools/unit_tests.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Elgg unit and integration tests
+ * 
+ */
+
+echo '<p>' . elgg_echo('developers:unit_tests:description') . '</p>';
+echo '<p><strong>' . elgg_echo('developers:unit_tests:warning') . '</strong></p>';
+
+// create a button to run tests
+$params = array(
+	'text' => elgg_echo('developers:unit_tests:run'),
+	'href' => 'engine/tests/suite.php',
+	'class' => 'elgg-button elgg-button-submit',
+	'is_trusted' => true,
+);
+echo '<p>' . elgg_view('output/url', $params) . '</p>';
diff --git a/mod/developers/views/default/admin/developers/settings.php b/mod/developers/views/default/admin/developers/settings.php
new file mode 100644
index 000000000..459cbabad
--- /dev/null
+++ b/mod/developers/views/default/admin/developers/settings.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Developer settings
+ */
+
+$data = array(
+	'simple_cache' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_config('simplecache_enabled') == 1,
+	),
+
+	'system_cache' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_config('system_cache_enabled') == 1,
+	),
+
+	'display_errors' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('display_errors', 'developers') == 1,
+	),
+
+	'debug_level' => array(
+		'type' => 'dropdown',
+		'value' => elgg_get_config('debug'),
+		'options_values' => array(
+			false => elgg_echo('developers:debug:off'),
+			'ERROR' => elgg_echo('developers:debug:error'),
+			'WARNING' => elgg_echo('developers:debug:warning'),
+			'NOTICE' => elgg_echo('developers:debug:notice'),
+		),
+	),
+
+	'screen_log' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('screen_log', 'developers') == 1,
+	),
+	
+	'show_strings' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('show_strings', 'developers') == 1,
+	),
+
+	'wrap_views' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('wrap_views', 'developers') == 1,
+	),
+
+	'log_events' => array(
+		'type' => 'checkbox',
+		'value' => 1,
+		'checked' => elgg_get_plugin_setting('log_events', 'developers') == 1,
+	),
+);
+
+$form_vars = array('id' => 'developer-settings-form', 'class' => 'elgg-form-settings');
+$body_vars = array('data' => $data);
+echo elgg_view_form('developers/settings', $form_vars, $body_vars);
diff --git a/mod/developers/views/default/developers/css.php b/mod/developers/views/default/developers/css.php
new file mode 100644
index 000000000..b4f59fdec
--- /dev/null
+++ b/mod/developers/views/default/developers/css.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Admin CSS for Elgg Developers plugin
+ */
+?>
+/*** Elgg Developer Tools ***/
+#developers-iframe {
+	width: 100%;
+	height: 600px;
+	border: none;
+}
+#developer-settings-form label {
+	margin-right: 5px;
+}
+.elgg-page .jstree-default.jstree-focused {
+	background-color: transparent;
+}
+.developers-log {
+	background-color: #EBF5FF;
+	border: 1px solid #999;
+	color: #666;
+	padding: 20px;
+}
+
+.developers-content-thin {
+	max-width: 600px;
+}
+\ No newline at end of file
diff --git a/mod/developers/views/default/developers/ipsum.php b/mod/developers/views/default/developers/ipsum.php
new file mode 100644
index 000000000..dd9bb278f
--- /dev/null
+++ b/mod/developers/views/default/developers/ipsum.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Lorem ipsum text
+ */
+?>
+Sed scelerisque sagittis lorem. Phasellus sodales.
+Nulla urna justo, vehicula in, suscipit nec, molestie sed, tellus.
+\ No newline at end of file
diff --git a/mod/developers/views/default/developers/log.php b/mod/developers/views/default/developers/log.php
new file mode 100644
index 000000000..98120ca98
--- /dev/null
+++ b/mod/developers/views/default/developers/log.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Logging information
+ */
+
+$cache = elgg_get_config('log_cache');
+$items = $cache->get();
+
+echo '<div class="developers-log">';
+if ($items) {
+	foreach ($items as $item) {
+		echo '<pre>';
+		print_r($item);
+		echo '</pre>';
+	}
+}
+
+echo '</div>';
+\ No newline at end of file
diff --git a/mod/developers/views/default/developers/tree.php b/mod/developers/views/default/developers/tree.php
new file mode 100644
index 000000000..a8e47333b
--- /dev/null
+++ b/mod/developers/views/default/developers/tree.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Displays a tree for inspection
+ *
+ * @uses $vars['tree']
+ */
+
+echo "<ul>";
+foreach ($vars['tree'] as $key => $arr) {
+	echo "<li><a>$key</a>";
+	echo "<ul>";
+	foreach ($arr as $value) {
+		echo "<li><a>$value</a></li>";
+	}
+	echo "</ul>";
+	echo "</li>";
+}
+echo "</ul>";
diff --git a/mod/developers/views/default/forms/developers/inspect.php b/mod/developers/views/default/forms/developers/inspect.php
new file mode 100644
index 000000000..a1b433fea
--- /dev/null
+++ b/mod/developers/views/default/forms/developers/inspect.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Configuration inspection form
+ */
+
+echo '<div>';
+echo '<p>' . elgg_echo('developers:inspect:help') . '</p>';
+
+echo elgg_view('input/dropdown', array(
+	'name' => 'inspect_type',
+	'options_values' => array(
+		'Actions' => 'Actions',
+		'Events' => 'Events',
+		'Plugin Hooks' => 'Plugin Hooks',
+		'Simple Cache' => 'Simple Cache',
+		'Views' => 'Views',
+		'Web Services' => 'Web Services',
+		'Widgets' => 'Widgets',
+	),
+));
+
+echo elgg_view('input/submit', array('value' => elgg_echo('submit')));
+echo '</div>';
diff --git a/mod/developers/views/default/forms/developers/settings.php b/mod/developers/views/default/forms/developers/settings.php
new file mode 100644
index 000000000..78e1372de
--- /dev/null
+++ b/mod/developers/views/default/forms/developers/settings.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Settings form body
+ *
+ * @uses $vars['values']
+ */
+
+echo '<p>' . elgg_echo('elgg_dev_tools:settings:explanation') . '</p>';
+
+foreach ($vars['data'] as $name => $info) {
+	echo '<div>';
+	if ($info['type'] == 'checkbox') {
+		echo '<label>';
+		echo elgg_view("input/checkbox", array(
+			'name' => $name,
+			'value' => $info['value'],
+			'checked' => $info['checked'],
+		));
+		echo elgg_echo("developers:label:$name") . '</label>';
+		echo '<span class="elgg-text-help">' . elgg_echo("developers:help:$name") . '</span>';
+	} else {
+		echo '<label>' . elgg_echo("developers:label:$name");
+		echo elgg_view("input/{$info['type']}", array(
+			'name' => $name,
+			'value' => $info['value'],
+			'options_values' => $info['options_values'],
+		));
+		echo '</label>';
+		echo '<span class="elgg-text-help">' . elgg_echo("developers:help:$name") . '</span>';
+	}
+	echo '</div>';
+}
+
+echo '<div class="elgg-foot">';
+echo elgg_view('input/submit', array('value' => elgg_echo('save')));
+echo '</div>';
diff --git a/mod/developers/views/default/js/developers/developers.php b/mod/developers/views/default/js/developers/developers.php
new file mode 100644
index 000000000..6e82295aa
--- /dev/null
+++ b/mod/developers/views/default/js/developers/developers.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Elgg developers tool JavaScript
+ */
+?>
+
+elgg.provide('elgg.dev');
+
+elgg.dev.init = function() {
+	$('.developers-form-inspect').live('submit', elgg.dev.inspectSubmit);
+};
+
+/**
+ * Submit the inspect form through Ajax
+ *
+ * Requires the jQuery Form Plugin.
+ *
+ * @param {Object} event
+ */
+elgg.dev.inspectSubmit = function(event) {
+
+	$("#developers-inspect-results").hide();
+	$("#developers-ajax-loader").show();
+	
+	$(this).ajaxSubmit({
+		dataType : 'json',
+		success  : function(response) {
+			if (response) {
+				$("#developers-inspect-results").html(response.output);
+				$("#developers-inspect-results").jstree({
+					"plugins" : [ "themes", "html_data" ],
+					"themes" : {"icons" : false}
+				}).bind("loaded.jstree", function() {
+					$("#developers-inspect-results").fadeIn();
+					$("#developers-ajax-loader").hide();
+				});
+			}
+		}
+	});
+
+	event.preventDefault();
+};
+
+elgg.register_hook_handler('init', 'system', elgg.dev.init);
+\ No newline at end of file
diff --git a/mod/developers/views/default/page/theme_preview.php b/mod/developers/views/default/page/theme_preview.php
new file mode 100644
index 000000000..ee2bc0c0f
--- /dev/null
+++ b/mod/developers/views/default/page/theme_preview.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Page shell for theme preview
+ */
+
+$elgg = elgg_get_simplecache_url('css', 'elgg');
+$ie_url = elgg_get_simplecache_url('css', 'ie');
+$ie6_url = elgg_get_simplecache_url('css', 'ie6');
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<?php echo elgg_view('page/elements/head', $vars); ?>
+</head>
+<body>
+<div class="elgg-page elgg-page-default">
+	<div class="elgg-page-messages">
+		<ul class="elgg-system-messages">
+			<li class="hidden"></li>
+		</ul>
+	</div>
+	<div class="elgg-page-header">
+		<div class="elgg-inner">
+			<h1 class="elgg-heading-site">Theme Sandbox</h1>
+			<?php
+				if (get_input("site_menu", false)) {
+					echo elgg_view_menu('site');
+				}
+			?>
+		</div>
+	</div>
+	<div class="elgg-page-body">
+		<div class="elgg-inner">
+			<?php echo elgg_view('page/elements/body', $vars); ?>
+		</div>
+	</div>
+</div>
+</body>
+</html>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/buttons.php b/mod/developers/views/default/theme_preview/buttons.php
new file mode 100644
index 000000000..718d88617
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/buttons.php
@@ -0,0 +1,41 @@
+<table class="elgg-table">
+	<thead>
+		<tr>
+			<th></th>
+			<th>Default</th>
+			<th>Disabled (.elgg-state-disabled)</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<th>Base (.elgg-button)</th>
+			<td><a href="#" class="elgg-button">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Action (.elgg-button-action)</th>
+			<td><a href="#" class="elgg-button elgg-button-action">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-action elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Cancel (.elgg-button-cancel)</th>
+			<td><a href="#" class="elgg-button elgg-button-cancel">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-cancel elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Submit (.elgg-button-submit)</th>
+			<td><a href="#" class="elgg-button elgg-button-submit">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-submit elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Special (.elgg-button-special)</th>
+			<td><a href="#" class="elgg-button elgg-button-special">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-special elgg-state-disabled">anchor</a></td>
+		</tr>
+		<tr>
+			<th>Delete (.elgg-button-delete)</th>
+			<td><a href="#" class="elgg-button elgg-button-delete">anchor</a></td>
+			<td><a href="#" class="elgg-button elgg-button-delete elgg-state-disabled">anchor</a></td>
+		</tr>
+	</tbody>
+</table>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components.php b/mod/developers/views/default/theme_preview/components.php
new file mode 100644
index 000000000..50c155b14
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * CSS Objects: list, module, image_block, table, messages
+ */
+
+$body = elgg_view('theme_preview/components/image_block');
+echo elgg_view_module('info', 'Image Block (.elgg-image-block)', $body);
+
+$body = elgg_view('theme_preview/components/list');
+echo elgg_view_module('info', 'List (.elgg-list)', $body);
+
+$body = elgg_view('theme_preview/components/table', array('class' => 'elgg-table'));
+echo elgg_view_module('info', 'Table (.elgg-table)', $body);
+
+$body = elgg_view('theme_preview/components/table', array('class' => 'elgg-table-alt'));
+echo elgg_view_module('info', 'Table Alternate (.elgg-table-alt)', $body);
+
+$body = elgg_view('theme_preview/components/tagcloud');
+echo elgg_view_module('info', 'Tag cloud (.elgg-tagcloud)', $body);
+
+$body = elgg_view('theme_preview/components/tags');
+echo elgg_view_module('info', 'Tags (.elgg-tag)', $body);
+
+$body = elgg_view('theme_preview/components/messages');
+echo elgg_view_module('info', 'Messages (.elgg-message)', $body);
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components/image_block.php b/mod/developers/views/default/theme_preview/components/image_block.php
new file mode 100644
index 000000000..ecd35ac65
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/image_block.php
@@ -0,0 +1,6 @@
+<?php
+$ipsum = elgg_view('developers/ipsum');
+
+$user = new ElggUser();
+$image = elgg_view_entity_icon($user, 'small');
+echo elgg_view_image_block($image, "$ipsum $ipsum $ipsum $ipsum $ipsum $ipsum $ipsum");
diff --git a/mod/developers/views/default/theme_preview/components/list.php b/mod/developers/views/default/theme_preview/components/list.php
new file mode 100644
index 000000000..fcb6f768a
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/list.php
@@ -0,0 +1,19 @@
+<?php
+
+$obj1 = new ElggObject();
+$obj1->title = "Object 1";
+$obj1->description = $ipsum;
+
+$obj2 = new ElggObject();
+$obj2->title = "Object 2";
+$obj2->description = $ipsum;
+
+$obj3 = new ElggObject();
+$obj3->title = "Object 3";
+$obj3->description = $ipsum;
+
+$obj4 = new ElggObject();
+$obj4->title = "Object 4";
+$obj4->description = $ipsum;
+
+echo elgg_view('page/components/list', array('items' => array($obj1, $obj2, $obj3, $obj4)));
diff --git a/mod/developers/views/default/theme_preview/components/messages.php b/mod/developers/views/default/theme_preview/components/messages.php
new file mode 100644
index 000000000..a53255291
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/messages.php
@@ -0,0 +1,5 @@
+<ul>
+	<li class="elgg-message elgg-state-success mas">Success message (.elgg-state-success)</li>
+	<li class="elgg-message elgg-state-error mas">Error message (.elgg-state-error)</li>
+	<li class="elgg-message elgg-state-notice mas">Notice message (.elgg-state-notice)</li>
+</ul>
diff --git a/mod/developers/views/default/theme_preview/components/table.php b/mod/developers/views/default/theme_preview/components/table.php
new file mode 100644
index 000000000..7d619dcea
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/table.php
@@ -0,0 +1,12 @@
+<table class="<?php echo $vars['class']; ?>">
+<?php
+	echo "<thead><tr><th>column 1</th><th>column 2</th></tr></thead>";
+	for ($i = 1; $i < 5; $i++) {
+		echo '<tr>';
+		for ($j = 1; $j < 3; $j++) {
+			echo "<td>value $j</td>";
+		}
+		echo '</tr>';
+	}
+?>
+</table>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/components/tagcloud.php b/mod/developers/views/default/theme_preview/components/tagcloud.php
new file mode 100644
index 000000000..3cbf34745
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/tagcloud.php
@@ -0,0 +1,17 @@
+<?php
+
+$tags = array(
+	(object)array('tag' => 'php', 'total' => 2),
+	(object)array('tag' => 'elgg', 'total' => 8),
+	(object)array('tag' => 'javascript', 'total' => 3),
+	(object)array('tag' => 'css', 'total' => 4),
+	(object)array('tag' => 'html', 'total' => 1),
+	(object)array('tag' => 'framework', 'total' => 4),
+	(object)array('tag' => 'social', 'total' => 3),
+	(object)array('tag' => 'web', 'total' => 7),
+	(object)array('tag' => 'code', 'total' => 2),
+);
+
+echo '<div style="width: 200px;">';
+echo elgg_view('output/tagcloud', array('value' => $tags));
+echo '</div>';
diff --git a/mod/developers/views/default/theme_preview/components/tags.php b/mod/developers/views/default/theme_preview/components/tags.php
new file mode 100644
index 000000000..04df9511a
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/components/tags.php
@@ -0,0 +1,5 @@
+<?php
+
+echo elgg_view('output/tags', array(
+	'value' => array('one', 'two', 'three', 'four', 'cinco'),
+));
diff --git a/mod/developers/views/default/theme_preview/forms.php b/mod/developers/views/default/theme_preview/forms.php
new file mode 100644
index 000000000..ffb77f3a9
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/forms.php
@@ -0,0 +1,138 @@
+<form action="#">
+	<fieldset>
+		<legend>Fieldset Legend</legend>
+		<div>
+			<label for="f1">Text input (.elgg-input-text):</label>
+			<?php echo elgg_view('input/text', array(
+					'name' => 'f1',
+					'id' => 'f1',
+					'value' => 'input text',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f2">Password input (.elgg-input-password):</label>
+			<?php echo elgg_view('input/password', array(
+					'name' => 'f2',
+					'id' => 'f2',
+					'value' => 'password',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f3">Radio input (.elgg-input-radios):</label><br />
+			<?php echo elgg_view('input/radio', array(
+					'name' => 'f3',
+					'id' => 'f3',
+					'options' => array('a (.elgg-input-radio)' => 1, 'b (.elgg-input-radio)' => 2),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f4">Checkboxes input (.elgg-input-checkboxes):</label><br />
+			<?php echo elgg_view('input/checkboxes', array(
+					'name' => 'f4',
+					'id' => 'f4',
+					'options' => array('a (.elgg-input-checkbox)' => 1, 'b (.elgg-input-checkbox)' => 2),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f5">Dropdown input (.elgg-input-dropdown):</label><br />
+			<?php echo elgg_view('input/dropdown', array(
+					'name' => 'f5',
+					'id' => 'f5',
+					'options' => array('option 1', 'option 2'),
+					));
+			?>
+		</div>
+		<div>
+			<label for="f6">Access input (.elgg-input-access):</label><br />
+			<?php echo elgg_view('input/access', array(
+					'name' => 'f6',
+					'id' => 'f6',
+					'value' => ACCESS_PUBLIC,
+					));
+			?>
+		</div>
+		<div>
+			<label for="f7">File input (.elgg-input-file):</label>
+			<?php echo elgg_view('input/file', array(
+					'name' => 'f7',
+					'id' => 'f7',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f8">URL input (.elgg-input-url):</label>
+			<?php echo elgg_view('input/url', array(
+					'name' => 'f8',
+					'id' => 'f8',
+					'value' => 'http://elgg.org/',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f9">Tags input (.elgg-input-tags):</label>
+			<?php echo elgg_view('input/tags', array(
+					'name' => 'f9',
+					'id' => 'f9',
+					'value' => 'one, two, three',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f10">Email input (.elgg-input-email):</label>
+			<?php echo elgg_view('input/email', array(
+					'name' => 'f10',
+					'id' => 'f10',
+					'value' => 'noone@elgg.org',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f11">Autocomplete input (.elgg-input-autocomplete):</label>
+			<?php echo elgg_view('input/autocomplete', array(
+					'name' => 'f11',
+					'id' => 'f11',
+					'match_on' => 'users',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f12">Date input (.elgg-input-date):</label>
+			<?php echo elgg_view('input/date', array(
+					'name' => 'f12',
+					'id' => 'f12',
+					'value' => '2012-12-31',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f13">User picker input (.elgg-user-picker):</label>
+			<?php echo elgg_view('input/userpicker', array(
+					'name' => 'f13',
+					'id' => 'f13',
+					));
+			?>
+		</div>
+		<div>
+			<label for="f15">Plain textarea input (.elgg-input-plaintext):</label>
+			<?php echo elgg_view('input/plaintext', array(
+					'name' => 'f15',
+					'id' => 'f15',
+					'value' => $ipsum,
+					));
+			?>
+		</div>
+		<div>
+			<label for="f14">Long textarea input (.elgg-input-longtext):</label>
+			<?php echo elgg_view('input/longtext', array(
+					'name' => 'f14',
+					'id' => 'f14',
+					'value' => $ipsum,
+					));
+			?>
+		</div>
+	</fieldset>
+</form>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/general.php b/mod/developers/views/default/theme_preview/general.php
new file mode 100644
index 000000000..7d98d4443
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/general.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Quick introduction to the theme sandbox
+ *
+ * @todo links to resources?
+ */
+?>
+
+<p>This theme sandbox provides a visual catalog for many of the theming elements
+	that Elgg uses. The primary css selector is listed with each theme element.
+	The preview is divided into sections that are listed in the page menu
+	(usually in the sidebar but depends on your current theme).
+</p>
+<?php
+$simple_cache = elgg_get_config('simplecache_enabled');
+$system_cache = elgg_get_config('system_cache_enabled');
+
+if ($simple_cache || $system_cache) {
+	$advanced = elgg_view('output/url', array(
+		'text' => 'Advanced Settings',
+		'href' => 'admin/settings/advanced',
+		'is_trusted' => true
+	));
+	$developers = elgg_view('output/url', array(
+		'text' => 'Developers\' Plugin Settings',
+		'href' => 'admin/developers/settings',
+		'is_trusted' => true
+	));
+	
+	$body = "Caches are enabled. Changes you make to CSS and views might not appear. It is
+	always recommended to disable caches while developing themes and plugins. To
+	disable caches, visit the $advanced or $developers pages.";
+
+	echo elgg_view_module('info', 'Warning', $body);
+}
+?>
+<p>
+<?php
+	echo elgg_view('output/url', array(
+		'text' => elgg_echo('theme_preview:breakout'),
+		'href' => current_page_url(),
+		'target' => '_parent',
+		'is_trusted' => true,
+	));
+?>
+</p>
diff --git a/mod/developers/views/default/theme_preview/grid.php b/mod/developers/views/default/theme_preview/grid.php
new file mode 100644
index 000000000..0c4cbb251
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/grid.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Grid CSS
+ */
+
+?>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of1"><div class="elgg-inner"><h3>1/1</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of2"><div class="elgg-inner"><h3>1/2</h3></div></div>
+	<div class="elgg-col elgg-col-1of2"><div class="elgg-inner"><h3>1/2</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of3"><div class="elgg-inner"><h3>1/3</h3></div></div>
+	<div class="elgg-col elgg-col-2of3"><div class="elgg-inner"><h3>2/3</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-3of4"><div class="elgg-inner"><h3>3/4</h3></div></div>
+	<div class="elgg-col elgg-col-1of4"><div class="elgg-inner"><h3>1/4</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of5"><div class="elgg-inner"><h3>1/5</h3></div></div>
+	<div class="elgg-col elgg-col-4of5"><div class="elgg-inner"><h3>4/5</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-3of5"><div class="elgg-inner"><h3>3/5</h3></div></div>
+	<div class="elgg-col elgg-col-2of5"><div class="elgg-inner"><h3>2/5</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of6"><div class="elgg-inner"><h3>1/6</h3></div></div>
+	<div class="elgg-col elgg-col-5of6"><div class="elgg-inner"><h3>5/6</h3></div></div>
+</div>
+<div class="elgg-grid">
+	<style>
+		h3 { text-align: center; }
+		.elgg-col > .elgg-inner {
+			border: 1px solid #cccccc;
+			border-radius: 5px;
+			padding: 5px;
+		}
+	</style>
+	<div class="elgg-col elgg-col-1of5">
+		<div class="elgg-inner">
+			<h3>1/5</h3>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+		</div>
+	</div>
+	<div class="elgg-col elgg-col-3of5">
+		<div class="elgg-inner clearfix">
+			<h3>3/5</h3>
+			<div class="elgg-grid">
+				<div class="elgg-col elgg-col-1of2">
+					<div class="elgg-inner">
+						<h3>1/2</h3>
+						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+					</div>
+				</div>
+				<div class="elgg-col elgg-col-1of2 elgg-col-last">
+					<div class="elgg-inner">
+						<h3>1/2</h3>
+						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+					</div>
+				</div>
+			</div>
+			<div class="elgg-grid">
+				<div class="elgg-col elgg-col-1of3">
+					<div class="elgg-inner">
+						<h3>1/3</h3>
+						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+						<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+					</div>
+				</div>
+				<div class="elgg-col elgg-col-2of3 elgg-col-last">
+					<div class="elgg-inner">
+						<h3>2/3</h3>
+						<div class="elgg-grid">
+							<div class="elgg-col elgg-col-1of2">
+								<div class="elgg-inner">
+									<h3>1/2</h3>
+									<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+								</div>
+							</div>
+							<div class="elgg-col elgg-col-1of2 elgg-col-last">
+								<div class="elgg-inner">
+									<h3>1/2</h3>
+									<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+								</div>
+							</div>
+						</div>
+						<div class="elgg-grid">
+							<div class="elgg-col elgg-col-1of1">
+								<div class="elgg-inner">
+									<h3>1</h3>
+									<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="elgg-col elgg-col-1of5 elgg-col-last">
+		<div class="elgg-inner">
+			<h3>1/5</h3>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+		</div>
+	</div>
+</div>
diff --git a/mod/developers/views/default/theme_preview/icons.php b/mod/developers/views/default/theme_preview/icons.php
new file mode 100644
index 000000000..e1684c110
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Icons CSS
+ */
+
+echo elgg_view_module('info', 'Icon Sprites (.elgg-icon)', elgg_view('theme_preview/icons/sprites'));
+
+echo elgg_view_module('info', 'Ajax Loader (.elgg-ajax-loader)', elgg_view('theme_preview/icons/loader'));
+
+echo elgg_view_module('info', 'Avatars (.elgg-avatar)', elgg_view('theme_preview/icons/avatars'));
diff --git a/mod/developers/views/default/theme_preview/icons/avatars.php b/mod/developers/views/default/theme_preview/icons/avatars.php
new file mode 100644
index 000000000..3aa1eda26
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/avatars.php
@@ -0,0 +1,36 @@
+<?php
+	$user = new ElggUser();
+	$group = new ElggGroup();
+	
+	$sizes = array('large', 'medium', 'small', 'tiny');
+?>
+<table class="elgg-table">
+	<tr>
+		<th></th>
+		<?php
+			foreach ($sizes as $size) {
+				echo "<th>$size</th>";
+			}
+		?>
+	</tr>
+	<tr>
+		<th>User</th>
+		<?php
+			foreach ($sizes as $size) {
+				echo '<td>';
+				echo elgg_view_entity_icon($user, $size, array('use_hover' => false));
+				echo '</td>';
+			}
+		?>
+	</tr>
+	<tr>
+		<th>Group</th>
+		<?php
+			foreach ($sizes as $size) {
+				echo '<td>';
+				echo elgg_view_entity_icon($group, $size, array('use_hover' => false));
+				echo '</td>';
+			}
+		?>
+	</tr>
+</table>
diff --git a/mod/developers/views/default/theme_preview/icons/loader.php b/mod/developers/views/default/theme_preview/icons/loader.php
new file mode 100644
index 000000000..e542da27c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/loader.php
@@ -0,0 +1 @@
+<?php echo elgg_view('graphics/ajax_loader', array('hidden' => false)); ?>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/icons/sprites.php b/mod/developers/views/default/theme_preview/icons/sprites.php
new file mode 100644
index 000000000..3edb0bd7c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/icons/sprites.php
@@ -0,0 +1,61 @@
+<?php 
+$icons = array(
+	'arrow-left',
+	'arrow-right',
+	'arrow-two-head',
+	'calendar',
+	'checkmark',
+	'clip',
+	'cursor-drag-arrow',
+	'delete-alt',
+	'delete',
+	'download',
+	'facebook',
+	'home',
+	'hover-menu',
+	'link',
+	'mail-alt',
+	'mail',
+	'print-alt',
+	'print',
+	'push-pin-alt',
+	'push-pin',
+	'redo',
+	'refresh',
+	'round-arrow-left',
+	'round-arrow-right',
+	'round-checkmark',
+	'round-minus',
+	'round-plus',
+	'rss',
+	'search-focus',
+	'search',
+	'settings-alt',
+	'settings',
+	'share',
+	'shop-cart',
+	'speech-bubble-alt',
+	'speech-bubble',
+	'star-alt',
+	'star-empty',
+	'star',
+	'tag',
+	'thumbs-down-alt',
+	'thumbs-down',
+	'thumbs-up-alt',
+	'thumbs-up',
+	'trash',
+	'twitter',
+	'undo',
+	'user',
+	'users',
+);
+?>
+
+<ul class="elgg-gallery">
+<?php 
+	foreach ($icons as $icon) {
+		echo "<li title=\".elgg-icon-$icon\" style=\"margin:10px\">" . elgg_view_icon($icon) . "</li>";
+	}
+?>
+</ul>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous.php b/mod/developers/views/default/theme_preview/miscellaneous.php
new file mode 100644
index 000000000..2f4ee4acd
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Miscellaneous and complex components
+ */
+
+$body = elgg_view('theme_preview/miscellaneous/lightbox');
+echo elgg_view_module('info', 'Lightbox (.elgg-lightbox)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/popup');
+echo elgg_view_module('info', 'Popup (rel=popup)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/toggle');
+echo elgg_view_module('info', 'Toggle (rel=toggle)', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/system_messages');
+echo elgg_view_module('info', 'System Messages and Errors', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/site_menu');
+echo elgg_view_module('info', 'Site Menu', $body);
+
+$body = elgg_view('theme_preview/miscellaneous/user_hover_menu');
+echo elgg_view_module('info', 'User Icon with Hover Menu', $body);
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/lightbox.php b/mod/developers/views/default/theme_preview/miscellaneous/lightbox.php
new file mode 100644
index 000000000..b673c4ee0
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/lightbox.php
@@ -0,0 +1,19 @@
+<?php
+
+elgg_load_js('lightbox');
+elgg_load_css('lightbox');
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+	'text' => 'Open lighbox',
+	'href' => "#elgg-lightbox-test",
+	'class' => 'elgg-lightbox'
+));
+
+echo $link;
+echo '<div class="hidden">';
+echo elgg_view_module('aside', 'Lightbox Test', $ipsum, array(
+	'id' => 'elgg-lightbox-test'
+));
+echo '</div>';
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/popup.php b/mod/developers/views/default/theme_preview/miscellaneous/popup.php
new file mode 100644
index 000000000..b711bb7cc
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/popup.php
@@ -0,0 +1,15 @@
+<?php
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+	'text' => 'Popup content',
+	'href' => "#elgg-popup-test",
+	'rel' => 'popup'
+));
+
+echo $link;
+echo elgg_view_module('popup', 'Popup Test', $ipsum, array(
+	'id' => 'elgg-popup-test',
+	'class' => 'hidden clearfix developers-content-thin',
+));
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/site_menu.php b/mod/developers/views/default/theme_preview/miscellaneous/site_menu.php
new file mode 100644
index 000000000..e2384b9f7
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/site_menu.php
@@ -0,0 +1,15 @@
+<?php
+
+if (!get_input('site_menu')) {
+	echo elgg_view('output/url', array(
+		'text' => 'Show Site Menu',
+		'href' => elgg_http_add_url_query_elements(current_page_url(), array('site_menu' => 1)),
+		'is_trusted' => true
+	));
+} else {
+	echo elgg_view('output/url', array(
+		'text' => 'Hide Site Menu',
+		'href' => elgg_http_remove_url_query_element(current_page_url(), 'site_menu'),
+		'is_trusted' => true
+	));
+}
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/system_messages.php b/mod/developers/views/default/theme_preview/miscellaneous/system_messages.php
new file mode 100644
index 000000000..a6663a3dc
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/system_messages.php
@@ -0,0 +1,35 @@
+<?php
+
+// can't use the ipsum because it includes html when wrapping views.
+$message = elgg_view('output/url', array(
+	'text' => 'Show system message (system_message())',
+	'is_trusted' => true,
+	'href' => '#',
+	'id' => 'developers-system-message',
+//	'onclick' => "elgg.system_message('Elgg System Message');"
+));
+
+$error = elgg_view('output/url', array(
+	'text' => 'Show error message (register_error())',
+	'is_trusted' => true,
+	'href' => '#',
+	'id' => 'developers-error-message',
+));
+
+?>
+<script type="text/javascript">
+	$(function() {
+		$('#developers-system-message').click(function() {
+			elgg.system_message('Elgg System Message');
+		})
+
+		$('#developers-error-message').click(function() {
+			elgg.register_error('Elgg Error Message');
+		})
+	});
+</script>
+
+<ul>
+	<li><?php echo $message; ?></li>
+	<li><?php echo $error; ?></li>
+</ul>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/toggle.php b/mod/developers/views/default/theme_preview/miscellaneous/toggle.php
new file mode 100644
index 000000000..abe39ddd8
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/toggle.php
@@ -0,0 +1,15 @@
+<?php
+
+$ipsum = elgg_view('developers/ipsum');
+
+$link = elgg_view('output/url', array(
+	'text' => 'Toggle content',
+	'href' => "#elgg-toggle-test",
+	'rel' => 'toggle'
+));
+
+echo $link;
+echo elgg_view_module('featured', 'Toggle Test', $ipsum, array(
+	'id' => 'elgg-toggle-test',
+	'class' => 'hidden clearfix developers-content-thin',
+));
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php b/mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php
new file mode 100644
index 000000000..45331b6e0
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/miscellaneous/user_hover_menu.php
@@ -0,0 +1,16 @@
+<?php
+
+$me = elgg_get_logged_in_user_entity();
+echo elgg_view_entity_icon($me);
+
+// show another user if available
+$users = elgg_get_entities(array(
+	'type' => 'user',
+	'wheres' => array("guid != {$me->getGUID()}"),
+	'limit' => 1
+));
+
+if (is_array($users) && count($users) > 0) {
+	echo elgg_view_entity_icon($users[0]);
+}
+
diff --git a/mod/developers/views/default/theme_preview/modules.php b/mod/developers/views/default/theme_preview/modules.php
new file mode 100644
index 000000000..c46c94296
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/modules.php
@@ -0,0 +1,6 @@
+<?php
+
+echo elgg_view_module('info', 'Modules (.elgg-module)', elgg_view('theme_preview/modules/modules'));
+
+echo elgg_view_module('info', 'Widgets (.elgg-module-widget)', elgg_view('theme_preview/modules/widgets'));
+
diff --git a/mod/developers/views/default/theme_preview/modules/modules.php b/mod/developers/views/default/theme_preview/modules/modules.php
new file mode 100644
index 000000000..04f5917b4
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/modules/modules.php
@@ -0,0 +1,23 @@
+<?php 
+
+$ipsum = elgg_view('developers/ipsum');
+
+?>
+<div class="elgg-grid">
+	<div class="elgg-col elgg-col-1of2">
+		<div class="pam">
+			<?php
+				echo elgg_view_module('aside', 'Aside (.elgg-module-aside)', $ipsum);
+				echo elgg_view_module('popup', 'Popup (.elgg-module-popup)', $ipsum);
+			?>
+		</div>
+	</div>
+	<div class="elgg-col elgg-col-1of2">
+		<div class="pam">
+			<?php
+				echo elgg_view_module('info', 'Info (.elgg-module-info)', $ipsum);
+				echo elgg_view_module('featured', 'Featured (.elgg-module-featured)', $ipsum);
+			?>
+		</div>
+	</div>
+</div>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/modules/widgets.php b/mod/developers/views/default/theme_preview/modules/widgets.php
new file mode 100644
index 000000000..8c9fd6483
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/modules/widgets.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * Widgets CSS
+ */
+
+$url = current_page_url();
+
+elgg_register_plugin_hook_handler('view', 'widgets/friends/content', 'css_widget_content');
+elgg_register_plugin_hook_handler('view', 'widgets/friends/edit', 'css_widget_content');
+elgg_register_plugin_hook_handler('permissions_check', 'all', 'css_permissions_override');
+
+function css_widget_content() {
+	return $ipsum = elgg_view('developers/ipsum');
+}
+
+function css_permissions_override() {
+	return true;
+}
+
+
+?>
+<div class="elgg-body mal">
+	<?php echo elgg_view('theme_preview/header', $vars); ?>
+<?php
+$w = array();
+for ($i=1; $i<=6; $i++) {
+	$obj = new ElggWidget();
+	$obj->handler = 'friends';
+	$obj->title = "Widget $i";
+	$w[] = $obj;
+}
+$column1 = array($w[0], $w[1]);
+$column2 = array($w[2], $w[3]);
+$column3 = array($w[4], $w[5]);
+$widgets = array(1 => $column1, 2 => $column2, 3 => $column3);
+$num_columns = 3;
+$widget_class = "elgg-col-1of{$num_columns}";
+for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
+	$column_widgets = $widgets[$column_index];
+
+	echo "<div class=\"$widget_class elgg-widgets\" id=\"elgg-widget-col-$column_index\">";
+	if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
+		foreach ($column_widgets as $widget) {
+			echo elgg_view_entity($widget);
+		}
+	}
+	echo '</div>';
+}
+?>
+</div>
+<script type="text/javascript">
+	// widgets do not have guids so we override the edit toggle and delete button
+	$(function() {
+		$('.elgg-widget-edit-button').unbind('click');
+		$('.elgg-widget-edit-button').click(function() {
+			$(this).closest('.elgg-module-widget').find('.elgg-widget-edit').slideToggle('medium');
+			return false;
+		});
+		$('.elgg-widget-delete-button').click(function() {
+			$(this).closest('.elgg-module-widget').remove();
+			return false;
+		});
+	});
+</script>
diff --git a/mod/developers/views/default/theme_preview/navigation.php b/mod/developers/views/default/theme_preview/navigation.php
new file mode 100644
index 000000000..5d3060d10
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Navigation CSS
+ */
+echo elgg_view_module('info', "Tabs (.elgg-tabs)", elgg_view('theme_preview/navigation/tabs'));
+
+echo elgg_view_module('info', "Pagination (.elgg-pagination)", elgg_view('theme_preview/navigation/pagination'));
+
+echo elgg_view_module('info', "Site Menu (.elgg-menu-site)", elgg_view('theme_preview/navigation/site'));
+
+echo elgg_view_module('info', "Breadcrumbs (.elgg-breadcrumbs)", elgg_view('theme_preview/navigation/breadcrumbs'));
+
+echo elgg_view_module('info', "Page Menu (.elgg-menu-page)", elgg_view('theme_preview/navigation/page'));
+
+echo elgg_view_module('info', "Filter Menu (.elgg-menu-filter)", elgg_view('theme_preview/navigation/filter'));
+
+echo elgg_view_module('info', "Extras Menu (.elgg-menu-extras and .elgg-menu-hz)", elgg_view('theme_preview/navigation/extras'));
+
+echo elgg_view_module('info', "Entity Menu (.elgg-menu-entity and .elgg-menu-hz)", elgg_view('theme_preview/navigation/entity'));
+
+echo elgg_view_module('info', "Owner Block Menu (.elgg-menu-owner-block)", elgg_view('theme_preview/navigation/owner_block'));
+
+echo elgg_view_module('info', "Footer Menu (.elgg-menu-footer)", elgg_view('theme_preview/navigation/footer'));
diff --git a/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
new file mode 100644
index 000000000..0439bd577
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/breadcrumbs.php
@@ -0,0 +1,10 @@
+<?php
+elgg_push_breadcrumb('First', "#");
+elgg_push_breadcrumb('Second', "#");
+elgg_push_breadcrumb('Third');
+
+echo elgg_view('navigation/breadcrumbs', array('class' => mts));
+
+elgg_pop_breadcrumb();
+elgg_pop_breadcrumb();
+elgg_pop_breadcrumb();
diff --git a/mod/developers/views/default/theme_preview/navigation/default.php b/mod/developers/views/default/theme_preview/navigation/default.php
new file mode 100644
index 000000000..6efcd8890
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/default.php
@@ -0,0 +1,11 @@
+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/entity.php b/mod/developers/views/default/theme_preview/navigation/entity.php
new file mode 100644
index 000000000..465585b00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/entity.php
@@ -0,0 +1,12 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+$params['menu']['default'][] = new ElggMenuItem(1, "Public", false);
+$params['menu']['default'][] = new ElggMenuItem(2, "Edit", "#");
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('thumbs-up'), "#");
+$params['name'] = 'entity';
+$params['class'] = 'elgg-menu-hz';
+
+echo elgg_view('navigation/menu/default', $params);
+
diff --git a/mod/developers/views/default/theme_preview/navigation/extras.php b/mod/developers/views/default/theme_preview/navigation/extras.php
new file mode 100644
index 000000000..01bc6d434
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/extras.php
@@ -0,0 +1,18 @@
+<?php
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+$params['menu']['default'][] = new ElggMenuItem(1, elgg_view_icon('push-pin-alt'), "#");
+$params['menu']['default'][] = new ElggMenuItem(2, elgg_view_icon('rss'), "#");
+$params['menu']['default'][] = new ElggMenuItem(3, elgg_view_icon('star-alt'), "#");
+$params['name'] = 'extras';
+$params['class'] = 'elgg-menu-hz';
+
+?>
+
+<div class="elgg-sidebar">
+<?php 
+	echo elgg_view('navigation/menu/default', $params);
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/filter.php b/mod/developers/views/default/theme_preview/navigation/filter.php
new file mode 100644
index 000000000..70cd31d2a
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/filter.php
@@ -0,0 +1,13 @@
+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+$params['name'] = 'filter';
+
+echo elgg_view('navigation/menu/default', $params); 
diff --git a/mod/developers/views/default/theme_preview/navigation/footer.php b/mod/developers/views/default/theme_preview/navigation/footer.php
new file mode 100644
index 000000000..92a1bb43c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/footer.php
@@ -0,0 +1,10 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['name'] = 'footer';
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/horizontal.php b/mod/developers/views/default/theme_preview/navigation/horizontal.php
new file mode 100644
index 000000000..44e04cd7c
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/horizontal.php
@@ -0,0 +1,12 @@
+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+$params['class'] = 'elgg-menu-hz';
+
+echo elgg_view('navigation/menu/default', $params);
diff --git a/mod/developers/views/default/theme_preview/navigation/owner_block.php b/mod/developers/views/default/theme_preview/navigation/owner_block.php
new file mode 100644
index 000000000..f5f203947
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/owner_block.php
@@ -0,0 +1,13 @@
+<?php
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+$params['name'] = 'owner-block';
+
+echo '<div class="elgg-sidebar">';
+echo elgg_view('navigation/menu/default', $params);
+echo '</div>';
diff --git a/mod/developers/views/default/theme_preview/navigation/page.php b/mod/developers/views/default/theme_preview/navigation/page.php
new file mode 100644
index 000000000..1da6a1fd9
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/page.php
@@ -0,0 +1,20 @@
+<?php
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+
+$m = new ElggMenuItem(10, "Child", "#");
+$m->setParent($params['menu']['default'][1]);
+$params['menu']['default'][1]->addChild($m);
+?>
+
+<div class="elgg-sidebar">
+<?php 
+	echo elgg_view('navigation/menu/page', $params);
+?>
+</div>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/pagination.php b/mod/developers/views/default/theme_preview/navigation/pagination.php
new file mode 100644
index 000000000..f5e1b632d
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/pagination.php
@@ -0,0 +1,8 @@
+<?php
+$params = array(
+	'count' => 1000,
+	'limit' => 10,
+	'offset' => 230,
+);
+
+echo elgg_view('navigation/pagination', $params);
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/navigation/site.php b/mod/developers/views/default/theme_preview/navigation/site.php
new file mode 100644
index 000000000..90bb8ff46
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/site.php
@@ -0,0 +1,18 @@
+<?php 
+
+$params = array();
+$params['menu'] = array();
+$params['menu']['default'] = array();
+for ($i=1; $i<=5; $i++) {
+	$params['menu']['default'][] = new ElggMenuItem($i, "Page $i", "#");
+}
+$params['menu']['default'][2]->setSelected(true);
+?>
+
+<div class="elgg-page-header">
+	<div class="elgg-inner">
+	<?php 
+		echo elgg_view('navigation/menu/site', $params); 
+	?>
+	</div>
+</div>
diff --git a/mod/developers/views/default/theme_preview/navigation/tabs.php b/mod/developers/views/default/theme_preview/navigation/tabs.php
new file mode 100644
index 000000000..dd282dc83
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/navigation/tabs.php
@@ -0,0 +1,10 @@
+<?php
+$params = array(
+	'tabs' => array(
+		array('title' => 'First', 'url' => "#"),
+		array('title' => 'Second', 'url' => "#", 'selected' => true),
+		array('title' => 'Third', 'url' => "#"),
+	)
+);
+
+echo elgg_view('navigation/tabs', $params);
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography.php b/mod/developers/views/default/theme_preview/typography.php
new file mode 100644
index 000000000..7a6328cf9
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * General CSS
+ */
+
+echo elgg_view_module('info', "Headings", elgg_view('theme_preview/typography/headings'));
+
+echo elgg_view_module('info', "Fonts", elgg_view('theme_preview/typography/fonts'));
+
+echo elgg_view_module('info', "Paragraph", elgg_view('theme_preview/typography/paragraph'));
+
+echo elgg_view_module('info', "Misc", elgg_view('theme_preview/typography/misc'));
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/fonts.php b/mod/developers/views/default/theme_preview/typography/fonts.php
new file mode 100644
index 000000000..dd3c53f00
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/fonts.php
@@ -0,0 +1,7 @@
+<ul>
+	<li>Lorem ipsum dolor sit amet (body)</li>
+	<li><span class="elgg-text-help" style="display: inline;">Lorem ipsum dolor sit amet</span> (.elgg-text-help)</li>
+	<li><span class="elgg-quiet">Lorem ipsum dolor sit amet</span> (.elgg-quiet)</li>
+	<li><span class="elgg-loud">Lorem ipsum dolor sit amet</span> (.elgg-loud)</li>
+	<li><span class="elgg-monospace">Lorem ipsum dolor sit amet</span> (.elgg-monospace)</li>
+</ul>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/headings.php b/mod/developers/views/default/theme_preview/typography/headings.php
new file mode 100644
index 000000000..d843853e3
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/headings.php
@@ -0,0 +1,6 @@
+<h1>Level 1 heading</h1>
+<h2>Level 2 heading</h2>
+<h3>Level 3 heading</h3>
+<h4>Level 4 heading</h4>
+<h5>Level 5 heading</h5>
+<h6>Level 6 heading</h6>
+\ No newline at end of file
diff --git a/mod/developers/views/default/theme_preview/typography/misc.php b/mod/developers/views/default/theme_preview/typography/misc.php
new file mode 100644
index 000000000..0b9fd9db7
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/misc.php
@@ -0,0 +1,16 @@
+<ul>
+	<li>I am <a href="?abc123">the a tag</a> example</li>
+	<li>I am <abbr title="test">the abbr tag</abbr> example</li>
+	<li>I am <acronym>the acronym tag</acronym> example</li>
+	<li>I am <b>the b tag</b> example</li>
+	<li>I am <code>the code tag</code> example</li>
+	<li>I am <del>the del tag</del> example</li>
+	<li>I am <em>the em tag</em> example</li>
+	<li>I am <i>the i tag</i> example</li>
+	<li>I am <strong>the strong tag</strong> example</li>
+</ul>
+<blockquote><p>Paragraph inside Blockquote: <?php echo $ipsum; ?></p></blockquote>
+<pre>
+	<strong>Preformated:</strong>Testing one row
+	and another
+</pre>
diff --git a/mod/developers/views/default/theme_preview/typography/paragraph.php b/mod/developers/views/default/theme_preview/typography/paragraph.php
new file mode 100644
index 000000000..a3a7b2cfa
--- /dev/null
+++ b/mod/developers/views/default/theme_preview/typography/paragraph.php
@@ -0,0 +1,19 @@
+<p>Lorem ipsum dolor sit amet, <a href="#" title="test link">test link</a>
+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
+mattis, massa quis luctus <strong>strong</strong>, turpis mi volutpat justo, eu
+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
+quis tellus.</p>
+
+<p>Lorem ipsum dolor sit amet, <em>emphasis</em> consectetuer
+adipiscing elit. Nullam dignissim convallis est. Quisque aliquam. Donec
+faucibus. Nunc iaculis suscipit dui. Nam sit amet sem. Aliquam libero
+nisi, imperdiet at, tincidunt nec, gravida vehicula, nisl. Praesent
+mattis, massa quis luctus fermentum, turpis mi volutpat justo, eu
+volutpat enim diam eget metus. Maecenas ornare tortor. Donec sed tellus
+eget sapien fringilla nonummy. Mauris a ante. Suspendisse quam sem,
+consequat at, commodo vitae, feugiat in, nunc. Morbi imperdiet augue
+quis tellus.</p>
+\ No newline at end of file
diff --git a/mod/diagnostics/actions/download.php b/mod/diagnostics/actions/download.php
new file mode 100644
index 000000000..97775c92e
--- /dev/null
+++ b/mod/diagnostics/actions/download.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Elgg diagnostics
+ *
+ * @package ElggDiagnostics
+ */
+
+$output = elgg_echo('diagnostics:header', array(date('r'), elgg_get_logged_in_user_entity()->name));
+$output = elgg_trigger_plugin_hook('diagnostics:report', 'system', null, $output);
+
+header("Cache-Control: public");
+header("Content-Description: File Transfer");
+header('Content-disposition: attachment; filename=elggdiagnostic.txt');
+header("Content-Type: text/plain");
+header('Content-Length: ' . strlen($output));
+
+echo $output;
+exit;
diff --git a/mod/diagnostics/languages/en.php b/mod/diagnostics/languages/en.php
new file mode 100644
index 000000000..54859941d
--- /dev/null
+++ b/mod/diagnostics/languages/en.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Elgg diagnostics language pack.
+ *
+ * @package ElggDiagnostics
+ */
+
+$english = array(
+	'admin:administer_utilities:diagnostics' => 'System Diagnostics',
+	'diagnostics' => 'System diagnostics',
+	'diagnostics:report' => 'Diagnostics Report',
+	'diagnostics:description' => 'The following diagnostic report can be useful for diagnosing problems with Elgg. The developers of Elgg may request that you attach it to a bug report.',
+	'diagnostics:download' => 'Download',
+	'diagnostics:header' => '========================================================================
+Elgg Diagnostic Report
+Generated %s by %s
+========================================================================
+
+',
+	'diagnostics:report:basic' => '
+Elgg Release %s, version %s
+
+------------------------------------------------------------------------',
+	'diagnostics:report:php' => '
+PHP info:
+%s
+------------------------------------------------------------------------',
+	'diagnostics:report:plugins' => '
+Installed plugins and details:
+
+%s
+------------------------------------------------------------------------',
+	'diagnostics:report:md5' => '
+Installed files and checksums:
+
+%s
+------------------------------------------------------------------------',
+	'diagnostics:report:globals' => '
+Global variables:
+
+%s
+------------------------------------------------------------------------',
+);
+
+add_translation("en", $english);
diff --git a/mod/diagnostics/manifest.xml b/mod/diagnostics/manifest.xml
new file mode 100644
index 000000000..21e847d22
--- /dev/null
+++ b/mod/diagnostics/manifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Diagnostics</name>
+	<author>Core developers</author>
+	<version>1.8</version>
+	<category>bundled</category>
+	<category>development</category>
+	<category>admin</category>
+	<description>Elgg diagnostics tool</description>
+	<website>http://www.elgg.org/</website>
+	<copyright>See COPYRIGHT.txt</copyright>
+	<license>GNU General Public License version 2</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+</plugin_manifest>
diff --git a/mod/diagnostics/start.php b/mod/diagnostics/start.php
new file mode 100644
index 000000000..55842800a
--- /dev/null
+++ b/mod/diagnostics/start.php
@@ -0,0 +1,140 @@
+<?php
+/**
+ * Elgg diagnostics
+ *
+ * @package ElggDiagnostics
+ */
+
+elgg_register_event_handler('init', 'system', 'diagnostics_init');
+
+/**
+ * Initialise the diagnostics tool
+ */
+function diagnostics_init() {
+
+	// Add admin menu item
+	elgg_register_admin_menu_item('administer', 'diagnostics', 'administer_utilities');
+
+	// Register some actions
+	$file = elgg_get_plugins_path() . "diagnostics/actions/download.php";
+	elgg_register_action("diagnostics/download", $file, 'admin');
+}
+
+/**
+ * Generate a basic report.
+ *
+ * @return string
+ */
+function diagnostics_basic_hook($hook, $entity_type, $returnvalue, $params) {
+
+	// Get version information
+	$version = get_version();
+	$release = get_version(true);
+
+	$returnvalue .= elgg_echo('diagnostics:report:basic', array($release, $version));
+
+	return $returnvalue;
+}
+
+/**
+ * Get some information about the plugins installed on the system.
+ *
+ * @return tring
+ */
+function diagnostics_plugins_hook($hook, $entity_type, $returnvalue, $params) {
+	// @todo this is a really bad idea because of the new plugin system
+	//$returnvalue .= elgg_echo('diagnostics:report:plugins', array(print_r(elgg_get_plugins(), true)));
+
+	return $returnvalue;
+}
+
+/**
+ * Recursively list through a directory tree producing a hash of all installed files
+ *
+ * @param starting dir $dir
+ * @param buffer $buffer
+ */
+function diagnostics_md5_dir($dir) {
+	$extensions_allowed = array('.php', '.js', '.css');
+
+	$buffer = "";
+
+	if (in_array(strrchr(trim($dir, "/"), '.'), $extensions_allowed)) {
+		$dir = rtrim($dir, "/");
+		$buffer .= md5_file($dir). "  " . $dir . "\n";
+	} else if (is_dir($dir)) {
+		$handle = opendir($dir);
+		while ($file = readdir($handle)) {
+			if (($file != '.') && ($file != '..')) {
+				$buffer .= diagnostics_md5_dir($dir . $file. "/", $buffer);
+			}
+		}
+
+		closedir($handle);
+	}
+
+	return $buffer;
+}
+
+/**
+ * Get some information about the files installed on a system.
+ *
+ * @return string
+ */
+function diagnostics_sigs_hook($hook, $entity_type, $returnvalue, $params) {
+
+	$base_dir = elgg_get_root_path();
+	$returnvalue .= elgg_echo('diagnostics:report:md5', array(diagnostics_md5_dir($base_dir)));
+
+	return $returnvalue;
+}
+
+/**
+ * Get some information about the php install
+ *
+ * @return string
+ */
+function diagnostics_phpinfo_hook($hook, $entity_type, $returnvalue, $params) {
+
+	ob_start();
+	phpinfo();
+	$phpinfo = array('phpinfo' => array());
+
+	if (preg_match_all('#(?:<h2>(?:<a name=".*?">)?(.*?)(?:</a>)?</h2>)|(?:<tr(?: class=".*?")?><t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>(?:<t[hd](?: class=".*?")?>(.*?)\s*</t[hd]>)?)?</tr>)#s', ob_get_clean(), $matches, PREG_SET_ORDER)) {
+
+		foreach ($matches as $match) {
+			if (strlen($match[1])) {
+				$phpinfo[$match[1]] = array();
+			} else if(isset($match[3])) {
+				$phpinfo[end(array_keys($phpinfo))][$match[2]] = isset($match[4]) ? array($match[3], $match[4]) : $match[3];
+			} else {
+				$phpinfo[end(array_keys($phpinfo))][] = $match[2];
+			}
+		}
+	}
+
+	$returnvalue .= elgg_echo('diagnostics:report:php', array(print_r($phpinfo, true)));
+
+	return $returnvalue;
+}
+
+/**
+ * Get global variables.
+ *
+ * @return string
+ */
+function diagnostics_globals_hook($hook, $entity_type, $returnvalue, $params) {
+	global $CONFIG;
+
+	$output = str_replace($CONFIG->dbpass, '<<DBPASS>>', print_r($GLOBALS, true));
+	$returnvalue .= elgg_echo('diagnostics:report:globals', array($output));
+
+	return $returnvalue;
+}
+
+elgg_register_plugin_hook_handler("diagnostics:report", "system", "diagnostics_basic_hook", 0); // show basics first
+elgg_register_plugin_hook_handler("diagnostics:report", "system", "diagnostics_plugins_hook", 2); // Now the plugins
+elgg_register_plugin_hook_handler("diagnostics:report", "system", "diagnostics_sigs_hook", 1); // Now the signatures
+
+elgg_register_plugin_hook_handler("diagnostics:report", "system", "diagnostics_globals_hook"); // Global variables
+elgg_register_plugin_hook_handler("diagnostics:report", "system", "diagnostics_phpinfo_hook"); // PHP info
diff --git a/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php b/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php
new file mode 100644
index 000000000..c7ff3d5fc
--- /dev/null
+++ b/mod/diagnostics/views/default/admin/administer_utilities/diagnostics.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Diagnostics admin page
+ */
+
+$diagnostics_title = elgg_echo('diagnostics:report');
+$diagnostics = '<p>' . elgg_echo('diagnostics:description') .'</p>';
+$params = array(
+	'text' => elgg_echo('diagnostics:download'),
+	'href' => 'action/diagnostics/download',
+	'class' => 'elgg-button elgg-button-submit',
+	'is_action' => true,
+	'is_trusted' => true,
+);
+$diagnostics .= '<p>' . elgg_view('output/url', $params) . '</p>';
+
+echo elgg_view_module('inline', $diagnostics_title, $diagnostics, array('class' => 'elgg-form-settings'));
diff --git a/mod/dokuwiki/AUTHORS b/mod/dokuwiki/AUTHORS
new file mode 100644
index 000000000..83b5cf583
--- /dev/null
+++ b/mod/dokuwiki/AUTHORS
@@ -0,0 +1,2 @@
+Pablo Martin <devel@lorea.cc>
+Sem      <sembrestels@n-1.cc>
diff --git a/mod/dokuwiki/COPYING b/mod/dokuwiki/COPYING
new file mode 100755
index 000000000..60549be51
--- /dev/null
+++ b/mod/dokuwiki/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/mod/dokuwiki/README b/mod/dokuwiki/README
new file mode 100644
index 000000000..40e1f52ec
--- /dev/null
+++ b/mod/dokuwiki/README
@@ -0,0 +1,31 @@
+Elgg dokuwiki integration
+------------------------
+
+Adds wikis for groups, and integrates the user and permission system of elgg.
+
+NOTES:
+------------------------
+- Although the goal is to be able to use vanilla dokuwiki with maybe some extensions,
+  at the moment we provide a slightly modified version.
+- doku.php globals are not known, and had to be redeclared.
+- $_REQUEST not defined... dont know the reason but its something of elgg. -> yes elgg is mangling it... **had to comment it on elgg core**
+- acl is hardcoded, added a getACL method on the auth class to be able to generate
+  the acl on the fly... also setACL and modified the admin plugin to be able to use the auth backend.
+- uses an 'elgg' auth module, and a special dokuwiki template.
+- dokuwiki defines the javascript $ symbol, which conflicts with elgg usage of jquery, so had to change all usage inside dokuwiki (just a few instances).
+
+LICENSE:
+-----------------------
+- elgg plugin uses GPLv2. dokuwiki and mods (all under vendors/dokuwiki) go with original license to original copyright holders.
+
+REPO:
+-----------------------
+You can follow code changes or submit tickets at: https://github.com/lorea/dokuwiki
+
+TODO:
+------------------------
+- Maybe just one big wiki for the whole site using namespaces?
+
+---
+devel@lorea.cc
+
diff --git a/mod/dokuwiki/index.php b/mod/dokuwiki/index.php
new file mode 100644
index 000000000..e4e039f51
--- /dev/null
+++ b/mod/dokuwiki/index.php
@@ -0,0 +1,17 @@
+<?php
+
+	elgg_push_breadcrumb(elgg_echo('dokuwiki'));
+	$offset = (int)get_input('offset', 0);
+	$title = elgg_echo("dokuwiki:title");
+	$content = elgg_list_entities(array('subtype'=>'dokuwiki', 'offset'=>$offset, 'types'=>'object','full_view'=>false));
+	$body = elgg_view_layout('content', array(
+		'content' => $content,
+		'title' => $title,
+		'filter' => '',
+	));
+
+	// Finally draw the page
+	echo elgg_view_page($title, $body);
+
+
+?>
diff --git a/mod/dokuwiki/languages/ca.php b/mod/dokuwiki/languages/ca.php
new file mode 100644
index 000000000..ca2c0df1e
--- /dev/null
+++ b/mod/dokuwiki/languages/ca.php
@@ -0,0 +1,18 @@
+<?php
+$language = array (
+  'dokuwiki:wiki' => 'Wiki',
+  'dokuwiki:title' => 'Wikis',
+  'item:object:dokuwiki' => 'Wikis',
+  'dokuwiki:wikifrom' => 'la wiki de %s',
+  'dokuwiki:pages' => '%s pàgines',
+  'dokuwiki:dokuwiki' => 'Wiki',
+  'dokuwiki:group' => 'Wiki del group',
+  'dokuwiki:userwiki' => 'La meva Wiki',
+  'dokuwiki:sidebar' => 'Navegació wiki',
+  'groups:enabledokuwiki' => 'Activar la wiki del grup',
+  'groups:enabledokuwiki_frontpage' => 'Mostra la pàgina d\'inici de la wiki a la pàgina principal del grup (només si la wiki està activada)',
+  'groups:enabledokuwiki_frontsidebar' => 'Mostra la barra lateral de la wiki a la pàgina principal del grup (només si la wiki està activada)',
+  'dokuwiki' => 'Wikis',
+  'dokuwiki:river:modified' => '%s ha modificat la pàgina %s el %s',
+);
+add_translation("ca", $language);
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/de.php b/mod/dokuwiki/languages/de.php
new file mode 100755
index 000000000..e951d0b41
--- /dev/null
+++ b/mod/dokuwiki/languages/de.php
@@ -0,0 +1,21 @@
+<?php
+
+// Mit dem translation browser generiert 
+
+$german = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "GruppenWiki" , 
+	 'dokuwiki:userwiki'  =>  "Mein Wiki" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "Wiki von %s" , 
+	 'dokuwiki:pages'  =>  "Seiten von %s" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'groups:enabledokuwiki'  =>  "GruppenWiki einrichten" , 
+	 'dokuwiki:river:modified'  =>  "%s hat die Seite %s im %s bearbeitet"
+); 
+
+add_translation('de', $german); 
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/en.php b/mod/dokuwiki/languages/en.php
new file mode 100755
index 000000000..20b7cb656
--- /dev/null
+++ b/mod/dokuwiki/languages/en.php
@@ -0,0 +1,32 @@
+<?php
+/**
+         * Elgg spotlight lorea
+         * 
+         * @package
+         * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+         * @author lorea
+         * @copyright lorea
+         * @link http://lorea.cc
+         */
+
+	$english = array(
+		"dokuwiki:wiki"=>'Wiki',
+		"dokuwiki:title"=>'Wikis',
+		"item:object:dokuwiki"=>'Wikis',
+		"dokuwiki:wikifrom"=>'%s wiki',
+		"dokuwiki:pages"=>'%s pages',
+		"dokuwiki:dokuwiki"=>'Wiki',
+		"dokuwiki:group"=>'Group wiki',
+		"dokuwiki:userwiki"=>'My Wiki',
+		"dokuwiki:sidebar" => 'Wiki navigation',
+		"groups:enabledokuwiki"=>'Enable group wiki',
+		"groups:enabledokuwiki_frontpage"=>'Show main wiki page in the group front page (only if wiki is enabled)',
+		"groups:enabledokuwiki_frontsidebar"=>'Show wiki sidebar in the group front page (only if wiki is enabled)',
+		"dokuwiki"=>'Wikis',
+
+		"dokuwiki:river:modified"=>'%s modified page %s on %s',
+	);
+	
+	add_translation("en",$english);
+
+?>
diff --git a/mod/dokuwiki/languages/es.php b/mod/dokuwiki/languages/es.php
new file mode 100644
index 000000000..613d79ba6
--- /dev/null
+++ b/mod/dokuwiki/languages/es.php
@@ -0,0 +1,18 @@
+<?php
+$language = array (
+  'dokuwiki:wiki' => 'Wiki',
+  'dokuwiki:title' => 'Wikis',
+  'item:object:dokuwiki' => 'Wikis',
+  'dokuwiki:wikifrom' => 'Wiki %s',
+  'dokuwiki:pages' => 'páginas %s',
+  'dokuwiki:dokuwiki' => 'Wiki',
+  'dokuwiki:group' => 'Wiki del grupo',
+  'dokuwiki:userwiki' => 'Mi wiki',
+  'dokuwiki:sidebar' => 'Navegación wiki',
+  'groups:enabledokuwiki' => 'Activar wiki del grupo',
+  'groups:enabledokuwiki_frontpage' => 'Muestra la página principal de la wiki en la página principal del grupo (sólo si la wiki está activada)',
+  'groups:enabledokuwiki_frontsidebar' => 'Muestra la barra lateral de wiki en la página principal del grupo (sólo si la wiki está activada)',
+  'dokuwiki' => 'Wikis',
+  'dokuwiki:river:modified' => '%s ha modificado la página %s en %s',
+);
+add_translation("es", $language);
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/fr.php b/mod/dokuwiki/languages/fr.php
new file mode 100644
index 000000000..dcaa14c00
--- /dev/null
+++ b/mod/dokuwiki/languages/fr.php
@@ -0,0 +1,12 @@
+<?php
+
+// Generate By translationbrowser. 
+
+$french = array( 
+	 'dokuwiki:userwiki'  =>  "Mon wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habiliter le wiki groupe"
+); 
+
+add_translation('fr', $french); 
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/gl.php b/mod/dokuwiki/languages/gl.php
new file mode 100644
index 000000000..ba67b6f32
--- /dev/null
+++ b/mod/dokuwiki/languages/gl.php
@@ -0,0 +1,23 @@
+<?php
+
+// Xerado por translationbrowser 
+
+$galician = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki do grupo" , 
+	 'dokuwiki:userwiki'  =>  "A miña Wiki" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "%s wiki" , 
+	 'dokuwiki:pages'  =>  "%s páxinas" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habilitar wiki do grupo" , 
+	 'dokuwiki:river:modified'  =>  "%s modificou a páxina %s en %s" , 
+	 'groups:enabledokuwiki_frontpage'  =>  "Amosa la wiki na portada do grupo" , 
+	 'groups:enabledokuwiki_frontsidebar'  =>  "Amosa la barra da wiki na portada do grupo"
+); 
+
+add_translation('gl', $galician); 
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/pl.php b/mod/dokuwiki/languages/pl.php
new file mode 100755
index 000000000..e43e14526
--- /dev/null
+++ b/mod/dokuwiki/languages/pl.php
@@ -0,0 +1,21 @@
+<?php
+
+// Generate By translationbrowser. 
+
+$polish = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:title'  =>  "Wiki" , 
+	 'item:object:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:wikifrom'  =>  "%s wiki" , 
+	 'dokuwiki:pages'  =>  "%s strony" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki Grupy" , 
+	 'dokuwiki:userwiki'  =>  "Twoje Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Włącz wiki grupy" , 
+	 'dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:river:modified'  =>  "%s modyfikacja strony %s na %s"
+); 
+
+add_translation('pl', $polish); 
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/languages/pt.php b/mod/dokuwiki/languages/pt.php
new file mode 100644
index 000000000..4c067cd52
--- /dev/null
+++ b/mod/dokuwiki/languages/pt.php
@@ -0,0 +1,23 @@
+<?php
+
+// Gerado pelo browser de tradução. 
+
+$portuguese = array( 
+	 'dokuwiki:wiki'  =>  "Wiki" , 
+	 'dokuwiki:title'  =>  "Wikis" , 
+	 'dokuwiki:wikifrom'  =>  "%s Wiki" , 
+	 'dokuwiki:pages'  =>  "%s páginas" , 
+	 'dokuwiki:dokuwiki'  =>  "Wiki" , 
+	 'dokuwiki:groupwiki'  =>  "Wiki" , 
+	 'dokuwiki:userwiki'  =>  "Minha Wiki" , 
+	 'groups:enabledokuwiki'  =>  "Habilitar Wiki do grupo" , 
+	 'dokuwiki'  =>  "Wikis" , 
+	 'dokuwiki:river:modified'  =>  "%s modificou a página %s em %s" , 
+	 'item:object:dokuwiki'  =>  "Wikis" , 
+	 'groups:enabledokuwiki_frontpage'  =>  "Mostrar a página wiki principal na página principal do grupo (só se a wiki estiver habilitada)" , 
+	 'groups:enabledokuwiki_frontsidebar'  =>  "Mostrar a barra lateral de wiki na página principal do grupo (só se a wiki estiver habilitada)"
+); 
+
+add_translation('pt', $portuguese); 
+
+?>
diff --git a/mod/dokuwiki/lib/dokuwiki.php b/mod/dokuwiki/lib/dokuwiki.php
new file mode 100644
index 000000000..b49e4d4ee
--- /dev/null
+++ b/mod/dokuwiki/lib/dokuwiki.php
@@ -0,0 +1,60 @@
+<?php
+
+function current_dokuwiki_entity($create = true) {
+	$page_owner = elgg_get_page_owner_guid();
+	$user = elgg_get_logged_in_user_entity();
+	//error_log($page_owner->guid);
+	//error_log($user->guid);
+	if (!$page_owner)
+		$page_owner = 0;
+	$entities = elgg_get_entities(array('types' => 'object', 'subtypes' => 'dokuwiki', 'limit' => 1, 'owner_guid' => $page_owner));
+	if ($entities) {
+		$doku = $entities[0];
+		return $doku;
+	}
+	elseif ($user && $create) {
+		elgg_set_ignore_access(true);
+		$newdoku = new ElggObject();
+		$newdoku->access_id = ACCESS_PUBLIC;
+		$newdoku->owner_guid = $page_owner;
+		$newdoku->subtype = 'dokuwiki';
+		$newdoku->container_guid = $page_owner;
+		$newdoku->save();
+		$acl = array();
+			$acl[] = "# acl.auth.php";
+			$acl[] = '# <?php exit()?\>';
+			$acl[] = "*               @ALL        0";
+			$acl[] = "*               @user        1";
+			$acl[] = "*               @member        8";
+			$acl[] = "*               @admin        16";
+			$acl[] = "*               @root        255";
+		$newdoku->wiki_acl = implode("\n", $acl)."\n";
+		elgg_set_ignore_access(false);
+		return $newdoku;
+	}
+}
+
+function dokuwiki_recurse_copy($src,$dst) {
+	$dir = opendir($src);
+	@mkdir($dst);
+	while(false !== ( $file = readdir($dir)) ) {
+	if (( $file != '.' ) && ( $file != '..' )) {
+		if ( is_dir($src . '/' . $file) ) {
+		dokuwiki_recurse_copy($src . '/' . $file,$dst . '/' . $file);
+		}
+		else {
+		copy($src . '/' . $file,$dst . '/' . $file);
+		}
+	}
+	}
+	closedir($dir);
+} 
+
+function dokuwiki_create_datafolder($path) {
+	if (is_dir($path)) // if it exists must be already created
+		return;
+	mkdir($path, 0700, true);
+	$orig = elgg_get_plugins_path().'dokuwiki/vendors/dokuwiki/data';
+	dokuwiki_recurse_copy($orig, $path);
+	
+}
diff --git a/mod/dokuwiki/manifest.xml b/mod/dokuwiki/manifest.xml
new file mode 100644
index 000000000..ed2969216
--- /dev/null
+++ b/mod/dokuwiki/manifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plugin_manifest xmlns="http://www.elgg.org/plugin_manifest/1.8">
+	<name>Dokuwiki</name>
+	<author>Lorea developers</author>
+	<version>1.8.0</version>
+	<category>content</category>
+	<description>Dokuwiki integration for Elgg</description>
+	<website>https://lorea.org/</website>
+	<copyright>(C) Lorea 2011-2013</copyright>
+	<license>GNU General Public License, version 2 or later</license>
+	<requires>
+		<type>elgg_release</type>
+		<version>1.8</version>
+	</requires>
+	<requires>
+                <type>priority</type>
+                <priority>after</priority>
+                <plugin>groups</plugin>
+        </requires>
+	<activate_on_install>true</activate_on_install>
+</plugin_manifest>
diff --git a/mod/dokuwiki/start.php b/mod/dokuwiki/start.php
new file mode 100644
index 000000000..05c7c01f2
--- /dev/null
+++ b/mod/dokuwiki/start.php
@@ -0,0 +1,168 @@
+<?php
+/**
+         * Elgg dokuwiki plugin
+         * 
+         * @package
+         * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+         * @author lorea
+         * @copyright lorea
+         * @link http://lorea.cc
+         */
+
+elgg_register_event_handler('init','system','dokuwiki_init');
+
+function dokuwiki_init(){
+	
+	elgg_register_library('elgg:dokuwiki', elgg_get_plugins_path().'dokuwiki/lib/dokuwiki.php');
+	
+	elgg_register_entity_type('object','dokuwiki');
+	elgg_register_plugin_hook_handler('entity:icon:url', 'object', 'dokuwiki_icon_hook');
+	elgg_register_entity_url_handler('object', 'dokuwiki', 'dokuwiki_url');
+
+	// add block link to
+	elgg_register_plugin_hook_handler('register', 'menu:owner_block', 'dokuwiki_owner_block_menu');
+
+	elgg_register_page_handler('dokuwiki','dokuwiki_page_handler');
+	
+	add_group_tool_option('dokuwiki',elgg_echo('groups:enabledokuwiki'),false);
+	add_group_tool_option('dokuwiki_frontsidebar',elgg_echo('groups:enabledokuwiki_frontsidebar'),false);
+	add_group_tool_option('dokuwiki_frontpage',elgg_echo('groups:enabledokuwiki_frontpage'),false);
+	
+	elgg_extend_view('groups/profile/summary','dokuwiki/grouppage');
+	elgg_extend_view('groups/tool_latest','dokuwiki/sidebar');
+	
+	// Extending CSS
+	elgg_extend_view('css/elgg', 'dokuwiki/css');
+	
+	// add a site navigation item
+	$item = new ElggMenuItem('wiki', elgg_echo('dokuwiki:title'), 'dokuwiki/all');
+	elgg_register_menu_item('site', $item);
+	
+	elgg_extend_view("page/elements/head", "dokuwiki/metatags");
+}
+
+	/**
+	 * Dispatches dokuwiki pages.
+	 * URLs take the form of
+	 *  All wikis:       dokuwiki/all
+	 *  Group wiki:      dokuwiki/<guid>
+	 *
+	 * @param array $page
+	 * @return NULL
+	 */
+	function dokuwiki_page_handler($page) {
+		
+		elgg_load_library('elgg:dokuwiki');
+		
+		if ($page[0] === "all") {
+			elgg_set_context("search");
+			include(elgg_get_plugins_path().'dokuwiki/index.php');
+			return true;
+		}
+		
+		elgg_set_context("dokuwiki");
+
+		$dokuwiki_path = elgg_get_plugins_path().'dokuwiki/vendors/dokuwiki/';
+		$doku = current_dokuwiki_entity();
+		if (!$doku) // can fail if there is no user and wiki doesnt exist
+			return false;
+		$parsed_url = parse_url(elgg_get_site_url().'dokuwiki/');
+		$url_base = $parsed_url['path'];
+		if (is_numeric($page[0])) {
+			$entity_guid = $page[0];
+			$ent = get_entity($entity_guid);
+			
+			if (($ent && $ent instanceof ElggGroup) && $ent->dokuwiki_enable !== 'yes') {
+				// wiki not activated for this group. bail out.
+				elgg_pop_context();
+				return false;
+			}
+			if ($ent && (/*$ent instanceof ElggUser ||*/ $ent instanceof ElggGroup)) {
+				elgg_set_page_owner_guid($entity_guid);
+				$data_path = elgg_get_data_path().'wikis/'.$entity_guid;
+			} else {
+				// can't see the group
+				elgg_pop_context();
+				return false;
+			}
+			$page = array_slice($page, 1); // pop first element
+			define('DOKU_REL', $url_base.$entity_guid."/");
+			define('DOKU_BASE', $url_base.$entity_guid."/");
+			define('DOKU_URL', elgg_get_site_url().'dokuwiki/'.$entity_guid."/");
+
+		}
+		else {
+			$data_path = elgg_get_data_path().'wiki';
+			define('DOKU_REL', $url_base);
+			define('DOKU_BASE', $url_base);
+			define('DOKU_URL', elgg_get_site_url().'dokuwiki/');
+		}
+		define('DOKU_INC', $dokuwiki_path);
+		define('DOKU_MEDIA', elgg_get_site_url().'mod/dokuwiki/vendors/dokuwiki/');
+		define('DOKU_CONF', $dokuwiki_path."conf/");
+
+		dokuwiki_create_datafolder($data_path);
+		define('DOKU_ELGGDATA',$data_path);
+		if (empty($page) || (count($page)==1 && $page[0] == 'acl')) {
+			$page = array('doku.php');
+		}
+		else if ((count($page)==1 && $page[0] == 'usermanager')) {
+			$page = array('doku.php');
+		}
+		else if ((count($page)==1 && $page[0] == 'plugin')) {
+			$page = array('doku.php');
+		}
+		else if ((count($page)==1 && $page[0] == 'config')) {
+			$page = array('doku.php');
+		}
+		else if ((count($page)==1 && $page[0] == 'revert')) {
+			$page = array('doku.php');
+		}
+		else if ((count($page)==1 && $page[0] == 'popularity')) {
+			$page = array('doku.php');
+		}
+		if (empty($page) || (count($page)==1 && !$page[0])) {
+			$page = array('doku.php');
+		}
+		$_SERVER['PHP_AUTH_USER'] = elgg_get_logged_in_user_entity()->username;
+		$_SERVER['PHP_AUTH_PW'] = elgg_get_logged_in_user_entity()->password;
+		if (count($page) == 1) {
+			$doku_body = elgg_view('dokuwiki/index',array('page'=>$page[0]));
+			echo $doku_body;
+		}
+		else {
+			// avoid inclusion over root
+			$dest = realpath($dokuwiki_path.implode("/",$page));
+			if (strpos($dest, $dokuwiki_path) == 0)
+				$doku_body = elgg_view('dokuwiki/index',array('page'=>implode("/",$page)));
+			echo $doku_body;
+		}
+		return true;
+	}
+
+	/**
+	 * Add a menu item to an ownerblock
+	 */
+	function dokuwiki_owner_block_menu($hook, $type, $return, $params) {
+		if (elgg_instanceof($params['entity'], 'group') && $params['entity']->dokuwiki_enable == "yes") {
+			$url = "dokuwiki/{$params['entity']->guid}/";
+			$item = new ElggMenuItem('dokuwiki', elgg_echo('dokuwiki:group'), $url);
+			$return[] = $item;
+		}
+		return $return;
+	}
+
+	function dokuwiki_icon_hook($hook, $entity_type, $returnvalue, $params) {
+		if ($hook == 'entity:icon:url' && $params['entity']->getSubtype() == 'dokuwiki') {
+			$owner = get_entity($params['entity']->container_guid);
+			if ($owner)
+				return $owner->getIcon($params['size']);
+		}
+		return $returnvalue;
+	}
+
+	function dokuwiki_url($entity) {
+		return elgg_get_site_url() . "dokuwiki/".$entity->container_guid;
+	}
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/COPYING b/mod/dokuwiki/vendors/dokuwiki/COPYING
new file mode 100644
index 000000000..d60c31a97
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/mod/dokuwiki/vendors/dokuwiki/README b/mod/dokuwiki/vendors/dokuwiki/README
new file mode 100644
index 000000000..a000bba2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/README
@@ -0,0 +1,9 @@
+All documentation for DokuWiki is available online
+at http://www.dokuwiki.org/
+
+For Installation Instructions see
+http://www.dokuwiki.org/install
+
+DokuWiki - 2004-2009 (c) Andreas Gohr <andi@splitbrain.org>
+See COPYING and file headers for license info
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/VERSION b/mod/dokuwiki/vendors/dokuwiki/VERSION
new file mode 100644
index 000000000..157cc6c56
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/VERSION
@@ -0,0 +1 @@
+2009-12-25c "Lemming"
diff --git a/mod/dokuwiki/vendors/dokuwiki/bin/dwpage.php b/mod/dokuwiki/vendors/dokuwiki/bin/dwpage.php
new file mode 100755
index 000000000..f664770bf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/bin/dwpage.php
@@ -0,0 +1,378 @@
+#!/usr/bin/php
+<?php
+#------------------------------------------------------------------------------
+if ('cli' != php_sapi_name()) die();
+
+ini_set('memory_limit','128M');
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+require_once DOKU_INC.'inc/init.php';
+require_once DOKU_INC.'inc/common.php';
+require_once DOKU_INC.'inc/cliopts.php';
+
+#------------------------------------------------------------------------------
+function usage($action) {
+    switch ( $action ) {
+        case 'checkout':
+           print "Usage: dwpage.php [opts] checkout <wiki:page> [working_file]
+
+    Checks out a file from the repository, using the wiki id and obtaining
+    a lock for the page.
+    If a working_file is specified, this is where the page is copied to.
+    Otherwise defaults to the same as the wiki page in the current
+    working directory.
+
+    EXAMPLE
+    $ ./dwpage.php checkout wiki:syntax ./new_syntax.txt
+
+    OPTIONS
+        -h, --help=<action>: get help
+        -f: force obtaining a lock for the page (generally bad idea)
+";
+        break;
+        case 'commit':
+           print "Usage: dwpage.php [opts] -m \"Msg\" commit <working_file> <wiki:page>
+
+    Checks in the working_file into the repository using the specified
+    wiki id, archiving the previous version.
+
+    EXAMPLE
+    $ ./dwpage.php -m \"Some message\" commit ./new_syntax.txt wiki:syntax
+
+    OPTIONS
+        -h, --help=<action>: get help
+        -f: force obtaining a lock for the page (generally bad idea)
+        -t, trivial: minor change
+        -m (required): Summary message describing the change
+";
+        break;
+        case 'lock':
+           print "Usage: dwpage.php [opts] lock <wiki:page>
+
+    Obtains or updates a lock for a wiki page
+
+    EXAMPLE
+    $ ./dwpage.php lock wiki:syntax
+
+    OPTIONS
+        -h, --help=<action>: get help
+        -f: force obtaining a lock for the page (generally bad idea)
+";
+        break;
+        case 'unlock':
+           print "Usage: dwpage.php [opts] unlock <wiki:page>
+
+    Removes a lock for a wiki page.
+
+    EXAMPLE
+    $ ./dwpage.php unlock wiki:syntax
+
+    OPTIONS
+        -h, --help=<action>: get help
+        -f: force obtaining a lock for the page (generally bad idea)
+";
+        break;
+        default:
+            print "Usage: dwpage.php [opts] <action>
+
+    Utility to help command line Dokuwiki page editing, allow
+    pages to be checked out for editing then committed after changes
+
+    Normal operation would be;
+
+
+
+    ACTIONS
+        checkout: see $ dwpage.php --help=checkout
+        commit: see $ dwpage.php --help=commit
+        lock: see $ dwpage.php --help=lock
+
+    OPTIONS
+        -h, --help=<action>: get help
+            e.g. $ ./dwpage.php -hcommit
+            e.g. $ ./dwpage.php --help=commit
+";
+        break;
+    }
+}
+
+#------------------------------------------------------------------------------
+function getUser() {
+    $user = getenv('USER');
+    if (empty ($username)) {
+        $user = getenv('USERNAME');
+    } else {
+        return $user;
+    }
+    if (empty ($username)) {
+        $user = 'admin';
+    }
+    return $user;
+}
+
+#------------------------------------------------------------------------------
+function getSuppliedArgument($OPTS, $short, $long) {
+    $arg = $OPTS->get($short);
+    if ( is_null($arg) ) {
+        $arg = $OPTS->get($long);
+    }
+    return $arg;
+}
+
+#------------------------------------------------------------------------------
+function obtainLock($WIKI_ID) {
+
+    global $USERNAME;
+
+    if ( !file_exists(wikiFN($WIKI_ID)) ) {
+        fwrite( STDERR, "$WIKI_ID does not yet exist\n");
+    }
+
+    $_SERVER['REMOTE_USER'] = $USERNAME;
+    if ( checklock($WIKI_ID) ) {
+        fwrite( STDERR, "Page $WIKI_ID is already locked by another user\n");
+        exit(1);
+    }
+
+    lock($WIKI_ID);
+
+    $_SERVER['REMOTE_USER'] = '_'.$USERNAME.'_';
+
+    if ( checklock($WIKI_ID) != $USERNAME ) {
+
+        fwrite( STDERR, "Unable to obtain lock for $WIKI_ID\n" );
+        exit(1);
+
+    }
+}
+
+#------------------------------------------------------------------------------
+function clearLock($WIKI_ID) {
+
+    global $USERNAME ;
+
+    if ( !file_exists(wikiFN($WIKI_ID)) ) {
+        fwrite( STDERR, "$WIKI_ID does not yet exist\n");
+    }
+
+    $_SERVER['REMOTE_USER'] = $USERNAME;
+    if ( checklock($WIKI_ID) ) {
+        fwrite( STDERR, "Page $WIKI_ID is locked by another user\n");
+        exit(1);
+    }
+
+    unlock($WIKI_ID);
+
+    if ( file_exists(wikiLockFN($WIKI_ID)) ) {
+        fwrite( STDERR, "Unable to clear lock for $WIKI_ID\n" );
+        exit(1);
+    }
+
+}
+
+#------------------------------------------------------------------------------
+function deleteLock($WIKI_ID) {
+
+    $wikiLockFN = wikiLockFN($WIKI_ID);
+
+    if ( file_exists($wikiLockFN) ) {
+        if ( !unlink($wikiLockFN) ) {
+            fwrite( STDERR, "Unable to delete $wikiLockFN\n" );
+            exit(1);
+        }
+    }
+
+}
+
+#------------------------------------------------------------------------------
+$USERNAME = getUser();
+$CWD = getcwd();
+$SYSTEM_ID = '127.0.0.1';
+
+#------------------------------------------------------------------------------
+$OPTS = Doku_Cli_Opts::getOptions(
+    __FILE__,
+    'h::fm:u:s:t',
+    array(
+        'help==',
+        'user=',
+        'system=',
+        'trivial',
+        )
+);
+
+if ( $OPTS->isError() ) {
+    print $OPTS->getMessage()."\n";
+    exit(1);
+}
+
+if ( $OPTS->has('h') or $OPTS->has('help') or !$OPTS->hasArgs() ) {
+    usage(getSuppliedArgument($OPTS,'h','help'));
+    exit(0);
+}
+
+if ( $OPTS->has('u') or $OPTS->has('user') ) {
+    $USERNAME = getSuppliedArgument($OPTS,'u','user');
+}
+
+if ( $OPTS->has('s') or $OPTS->has('system') ) {
+    $SYSTEM_ID = getSuppliedArgument($OPTS,'s','system');
+}
+
+#------------------------------------------------------------------------------
+switch ( $OPTS->arg(0) ) {
+
+    #----------------------------------------------------------------------
+    case 'checkout':
+
+        $WIKI_ID = $OPTS->arg(1);
+
+        if ( !$WIKI_ID ) {
+            fwrite( STDERR, "Wiki page ID required\n");
+            exit(1);
+        }
+
+        $WIKI_FN = wikiFN($WIKI_ID);
+
+        if ( !file_exists($WIKI_FN) ) {
+            fwrite( STDERR, "$WIKI_ID does not yet exist\n");
+            exit(1);
+        }
+
+        $TARGET_FN = $OPTS->arg(2);
+
+        if ( empty($TARGET_FN) ) {
+            $TARGET_FN = getcwd().'/'.basename($WIKI_FN);
+        }
+
+        if ( !file_exists(dirname($TARGET_FN)) ) {
+            fwrite( STDERR, "Directory ".dirname($TARGET_FN)." does not exist\n");
+            exit(1);
+        }
+
+        if ( stristr( realpath(dirname($TARGET_FN)), realpath($conf['datadir']) ) !== false ) {
+            fwrite( STDERR, "Attempt to check out file into data directory - not allowed\n");
+            exit(1);
+        }
+
+        if ( $OPTS->has('f') ) {
+            deleteLock($WIKI_ID);
+        }
+
+        obtainLock($WIKI_ID);
+
+        # Need to lock the file first?
+        if ( !copy($WIKI_FN, $TARGET_FN) ) {
+            fwrite( STDERR, "Unable to copy $WIKI_FN to $TARGET_FN\n");
+            clearLock($WIKI_ID);
+            exit(1);
+        }
+
+        print "$WIKI_ID > $TARGET_FN\n";
+        exit(0);
+
+    break;
+
+    #----------------------------------------------------------------------
+    case 'commit':
+
+        $TARGET_FN = $OPTS->arg(1);
+
+        if ( !$TARGET_FN ) {
+            fwrite( STDERR, "Target filename required\n");
+            exit(1);
+        }
+
+        if ( !file_exists($TARGET_FN) ) {
+            fwrite( STDERR, "$TARGET_FN does not exist\n");
+            exit(1);
+        }
+
+        if ( !is_readable($TARGET_FN) ) {
+            fwrite( STDERR, "Cannot read from $TARGET_FN\n");
+            exit(1);
+        }
+
+        $WIKI_ID = $OPTS->arg(2);
+
+        if ( !$WIKI_ID ) {
+            fwrite( STDERR, "Wiki page ID required\n");
+            exit(1);
+        }
+
+        if ( !$OPTS->has('m') ) {
+            fwrite( STDERR, "Summary message required\n");
+            exit(1);
+        }
+
+        if ( $OPTS->has('f') ) {
+            deleteLock($WIKI_ID);
+        }
+
+        $_SERVER['REMOTE_USER'] = $USERNAME;
+        if ( checklock($WIKI_ID) ) {
+            fwrite( STDERR, "$WIKI_ID is locked by another user\n");
+            exit(1);
+        }
+
+        obtainLock($WIKI_ID);
+
+        saveWikiText($WIKI_ID, file_get_contents($TARGET_FN), $OPTS->get('m'), $OPTS->has('t'));
+
+        clearLock($WIKI_ID);
+
+        exit(0);
+
+    break;
+
+    #----------------------------------------------------------------------
+    case 'lock':
+
+        $WIKI_ID = $OPTS->arg(1);
+
+        if ( !$WIKI_ID ) {
+            fwrite( STDERR, "Wiki page ID required\n");
+            exit(1);
+        }
+
+        if ( $OPTS->has('f') ) {
+            deleteLock($WIKI_ID);
+        }
+
+        obtainLock($WIKI_ID);
+
+        print "Locked : $WIKI_ID\n";
+        exit(0);
+
+    break;
+
+    #----------------------------------------------------------------------
+    case 'unlock':
+
+        $WIKI_ID = $OPTS->arg(1);
+
+        if ( !$WIKI_ID ) {
+            fwrite( STDERR, "Wiki page ID required\n");
+            exit(1);
+        }
+
+        if ( $OPTS->has('f') ) {
+            deleteLock($WIKI_ID);
+        } else {
+            clearLock($WIKI_ID);
+        }
+
+        print "Unlocked : $WIKI_ID\n";
+        exit(0);
+
+    break;
+
+    #----------------------------------------------------------------------
+    default:
+
+        fwrite( STDERR, "Invalid action ".$OPTS->arg(0)."\n" );
+        exit(1);
+
+    break;
+
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/bin/indexer.php b/mod/dokuwiki/vendors/dokuwiki/bin/indexer.php
new file mode 100755
index 000000000..55f3608d5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/bin/indexer.php
@@ -0,0 +1,172 @@
+#!/usr/bin/php
+<?php
+if ('cli' != php_sapi_name()) die();
+
+ini_set('memory_limit','128M');
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/search.php');
+require_once(DOKU_INC.'inc/indexer.php');
+require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/cliopts.php');
+session_write_close();
+
+// Version tag used to force rebuild on upgrade
+// Need to keep in sync with lib/exe/indexer.php
+if(!defined('INDEXER_VERSION')) define('INDEXER_VERSION', 2);
+
+// handle options
+$short_opts = 'hcuq';
+$long_opts  = array('help', 'clear', 'update', 'quiet');
+$OPTS = Doku_Cli_Opts::getOptions(__FILE__,$short_opts,$long_opts);
+if ( $OPTS->isError() ) {
+    fwrite( STDERR, $OPTS->getMessage() . "\n");
+    _usage();
+    exit(1);
+}
+$CLEAR = false;
+$QUIET = false;
+foreach ($OPTS->options as $key => $val) {
+    switch ($key) {
+        case 'h':
+        case 'help':
+            _usage();
+            exit;
+        case 'c':
+        case 'clear':
+            $CLEAR = true;
+            break;
+        case 'q':
+        case 'quiet':
+            $QUIET = true;
+            break;
+    }
+}
+
+#------------------------------------------------------------------------------
+# Action
+
+if($CLEAR) _clearindex();
+_update();
+
+
+
+#------------------------------------------------------------------------------
+
+function _usage() {
+    print "Usage: indexer.php <options>
+
+    Updates the searchindex by indexing all new or changed pages
+    when the -c option is given the index is cleared first.
+
+    OPTIONS
+        -h, --help     show this help and exit
+        -c, --clear    clear the index before updating
+        -q, --quiet    don't produce any output
+";
+}
+
+function _update(){
+    global $conf;
+
+    // upgrade to version 2
+    if (!@file_exists($conf['indexdir'].'/pageword.idx')){
+        _lock();
+        idx_upgradePageWords();
+        _unlock();
+    }
+
+    $data = array();
+    _quietecho("Searching pages... ");
+    search($data,$conf['datadir'],'search_allpages',array('skipacl' => true));
+    _quietecho(count($data)." pages found.\n");
+
+    foreach($data as $val){
+        _index($val['id']);
+    }
+}
+
+function _index($id){
+    global $CLEAR;
+
+    // if not cleared only update changed and new files
+    if(!$CLEAR){
+        $idxtag = metaFN($id,'.indexed');
+        if(@file_exists($idxtag)){
+            if(io_readFile($idxtag) >= INDEXER_VERSION){
+                $last = @filemtime(metaFN($id,'.indexed'));
+                if($last > @filemtime(wikiFN($id))) return;
+            }
+        }
+    }
+
+    _lock();
+    _quietecho("$id... ");
+    idx_addPage($id);
+    io_saveFile(metaFN($id,'.indexed'),INDEXER_VERSION);
+    _quietecho("done.\n");
+    _unlock();
+}
+
+/**
+ * lock the indexer system
+ */
+function _lock(){
+    global $conf;
+    $lock = $conf['lockdir'].'/_indexer.lock';
+    $said = false;
+    while(!@mkdir($lock, $conf['dmode'])){
+        if(time()-@filemtime($lock) > 60*5){
+            // looks like a stale lock - remove it
+            @rmdir($lock);
+        }else{
+            if($said){
+                _quietecho(".");
+            }else{
+                _quietecho("Waiting for lockfile (max. 5 min)");
+                $said = true;
+            }
+            sleep(15);
+        }
+    }
+    if($conf['dperm']) chmod($lock, $conf['dperm']);
+    if($said) _quietecho("\n");
+}
+
+/**
+ * unlock the indexer sytem
+ */
+function _unlock(){
+    global $conf;
+    $lock = $conf['lockdir'].'/_indexer.lock';
+    @rmdir($lock);
+}
+
+/**
+ * Clear all index files
+ */
+function _clearindex(){
+    global $conf;
+    _lock();
+    _quietecho("Clearing index... ");
+    io_saveFile($conf['indexdir'].'/page.idx','');
+    $dir = @opendir($conf['indexdir']);
+    if($dir!==false){
+        while(($f = readdir($dir)) !== false){
+            if(substr($f,-4)=='.idx' &&
+               (substr($f,0,1)=='i' || substr($f,0,1)=='w'))
+                @unlink($conf['indexdir']."/$f");
+        }
+    }
+    _quietecho("done.\n");
+    _unlock();
+}
+
+function _quietecho($msg) {
+    global $QUIET;
+    if(!$QUIET) echo $msg;
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/bin/wantedpages.php b/mod/dokuwiki/vendors/dokuwiki/bin/wantedpages.php
new file mode 100755
index 000000000..30171fc15
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/bin/wantedpages.php
@@ -0,0 +1,134 @@
+#!/usr/bin/php
+<?php
+if ('cli' != php_sapi_name()) die();
+
+#------------------------------------------------------------------------------
+ini_set('memory_limit','128M');
+if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/');
+require_once DOKU_INC.'inc/init.php';
+require_once DOKU_INC.'inc/common.php';
+require_once DOKU_INC.'inc/search.php';
+require_once DOKU_INC.'inc/cliopts.php';
+
+#------------------------------------------------------------------------------
+function usage() {
+    print "Usage: wantedpages.php [wiki:namespace]
+
+    Outputs a list of wanted pages (pages which have
+    internal links but do not yet exist).
+
+    If the optional [wiki:namespace] is not provided,
+    defaults to the root wiki namespace
+
+    OPTIONS
+        -h, --help get help
+";
+}
+
+#------------------------------------------------------------------------------
+define ('DW_DIR_CONTINUE',1);
+define ('DW_DIR_NS',2);
+define ('DW_DIR_PAGE',3);
+
+#------------------------------------------------------------------------------
+function dw_dir_filter($entry, $basepath) {
+    if ($entry == '.' || $entry == '..' ) {
+        return DW_DIR_CONTINUE;
+    }
+    if ( is_dir($basepath . '/' . $entry) ) {
+        if ( strpos($entry, '_') === 0 ) {
+            return DW_DIR_CONTINUE;
+        }
+        return DW_DIR_NS;
+    }
+    if ( preg_match('/\.txt$/',$entry) ) {
+        return DW_DIR_PAGE;
+    }
+    return DW_DIR_CONTINUE;
+}
+
+#------------------------------------------------------------------------------
+function dw_get_pages($dir) {
+    static $trunclen = NULL;
+    if ( !$trunclen ) {
+        global $conf;
+        $trunclen = strlen($conf['datadir'].':');
+    }
+
+    if ( !is_dir($dir) ) {
+        fwrite( STDERR, "Unable to read directory $dir\n");
+        exit(1);
+    }
+
+    $pages = array();
+    $dh = opendir($dir);
+    while ( false !== ( $entry = readdir($dh) ) ) {
+        $status = dw_dir_filter($entry, $dir);
+        if ( $status == DW_DIR_CONTINUE ) {
+            continue;
+        } else if ( $status == DW_DIR_NS ) {
+            $pages = array_merge($pages, dw_get_pages($dir . '/' . $entry));
+        } else {
+            $page = array(
+                'id'  => pathID(substr($dir.'/'.$entry,$trunclen)),
+                'file'=> $dir.'/'.$entry,
+                );
+            $pages[] = $page;
+        }
+    }
+    closedir($dh);
+    return $pages;
+}
+
+#------------------------------------------------------------------------------
+function dw_internal_links($page) {
+    global $conf;
+    $instructions = p_get_instructions(file_get_contents($page['file']));
+    $links = array();
+    $cns = getNS($page['id']);
+    $exists = false;
+    foreach($instructions as $ins){
+        if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){
+            $mid = $ins[1][0];
+            resolve_pageid($cns,$mid,$exists);
+            if ( !$exists ) {
+								list($mid) = explode('#',$mid); //record pages without hashs
+                $links[] = $mid;
+            }
+        }
+    }
+    return $links;
+}
+
+#------------------------------------------------------------------------------
+$OPTS = Doku_Cli_Opts::getOptions(__FILE__,'h',array('help'));
+
+if ( $OPTS->isError() ) {
+    fwrite( STDERR, $OPTS->getMessage() . "\n");
+    exit(1);
+}
+
+if ( $OPTS->has('h') or $OPTS->has('help') ) {
+    usage();
+    exit(0);
+}
+
+$START_DIR = $conf['datadir'];
+
+if ( $OPTS->numArgs() == 1 ) {
+    $START_DIR .= '/' . $OPTS->arg(0);
+}
+
+#------------------------------------------------------------------------------
+$WANTED_PAGES = array();
+
+foreach ( dw_get_pages($START_DIR) as $WIKI_PAGE ) {
+    $WANTED_PAGES = array_merge($WANTED_PAGES,dw_internal_links($WIKI_PAGE));
+}
+$WANTED_PAGES = array_unique($WANTED_PAGES);
+sort($WANTED_PAGES);
+
+foreach ( $WANTED_PAGES as $WANTED_PAGE ) {
+    print $WANTED_PAGE."\n";
+}
+exit(0);
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php b/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php
new file mode 100644
index 000000000..7678e918e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php
@@ -0,0 +1,24 @@
+# acl.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Editing this file by hand shouldn't be necessary. Use the ACL
+# Manager interface instead.
+#
+# If your auth backend allows special char like spaces in groups
+# or user names you need to urlencode them (only chars <128, leave
+# UTF-8 multibyte chars as is)
+#
+# none   0
+# read   1
+# edit   2
+# create 4
+# upload 8
+# delete 16
+
+*               @ALL        0
+*               @user        1
+*               @member        8
+*               @admin        255
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php.dist b/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php.dist
new file mode 100644
index 000000000..14344d778
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/acl.auth.php.dist
@@ -0,0 +1,21 @@
+# acl.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Editing this file by hand shouldn't be necessary. Use the ACL
+# Manager interface instead.
+#
+# If your auth backend allows special char like spaces in groups
+# or user names you need to urlencode them (only chars <128, leave
+# UTF-8 multibyte chars as is)
+#
+# none   0
+# read   1
+# edit   2
+# create 4
+# upload 8
+# delete 16
+
+*               @ALL        8
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/acronyms.conf b/mod/dokuwiki/vendors/dokuwiki/conf/acronyms.conf
new file mode 100644
index 000000000..13708d2df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/acronyms.conf
@@ -0,0 +1,143 @@
+# Acronyms.
+
+ACL          Access Control List
+AFAICS       As far as I can see
+AFAIK        As far as I know
+AFAIR        As far as I remember
+AJAX         Asynchronous JavaScript and XML
+AIM          AOL (America Online) Instant Messenger
+AOL          America Online
+API          Application Programming Interface
+ASAP         As soon as possible
+ASCII        American Standard Code for Information Interchange
+ASP          Active Server Pages
+BTW          By the way
+CGI          Common Gateway Interface
+CMS          Content Management System
+CSS          Cascading Style Sheets
+CVS          Concurrent Versions System
+DBA          Database Administrator
+DHCP         Dynamic Host Configuration Protocol
+DHTML        Dynamic HyperText Markup Language
+DMCA         Digital Millenium Copyright Act
+DNS          Domain Name System
+DOM          Document Object Model
+DTD          Document Type Definition
+EOF          End of file
+EOL          End of line
+EOM          End of message
+EOT          End of text
+ESMTP        Extended Simple Mail Transfer Protocol
+FAQ          Frequently Asked Questions
+FDL          GNU Free Documentation License
+FTP          File Transfer Protocol
+FOSS         Free & Open-Source Software
+FLOSS        Free/Libre and Open Source Software
+FUD          Fear, Uncertainty, and Doubt
+GB           Gigabyte
+GHz          Gigahertz
+GIF          Graphics Interchange Format
+GPL          GNU General Public License
+GUI          Graphical User Interface
+HTML         HyperText Markup Language
+HTTP         Hyper Text Transfer Protocol
+IANAL        I am not a lawyer (but)
+ICANN        Internet Corporation for Assigned Names and Numbers
+ICQ          I seek you (Instant Messenger)
+IE5          Internet Explorer 5
+IE6          Internet Explorer 6
+IE           Internet Explorer
+IIRC         If I remember correctly
+IIS          Internet Information Services
+IMAP         Internet Message Access Protocol
+IMHO         In my humble opinion
+IMO          In my opinion
+IOW          In other words
+IRC          Internet Relay Chat
+IRL          In real life
+ISO          International Organization for Standardization
+ISP          Internet Service Provider
+JDK          Java Development Kit
+JPEG         Joint Photographics Experts Group
+JPG          Joint Photographics Experts Group
+JS           JavaScript
+KISS         Keep it simple stupid
+LDAP         Lightweight Directory Access Protocol
+LGPL         GNU Lesser General Public License
+LOL          Laughing out loud
+MathML       Mathematical Markup Language
+MB           Megabyte
+MHz          Megahertz
+MIME         Multipurpose Internet Mail Extension
+MIT          Massachusetts Institute of Technology
+MML          Mathematical Markup Language
+MP3          Motion Picture Experts Group Layer 3
+MPEG         Motion Picture Experts Group
+MSDN         Microsoft Developer Network
+MS           Microsoft
+MSIE         Microsoft Internet Explorer
+NIS          Network Information Service
+NS4.7        Netscape 4.7
+NS4          Netscape 4
+NS6          Netscape 6
+NS7          Netscape 7
+OMG          Oh my God
+OPML         Outline Processor Markup Language
+OS           Operating System
+OSS          Open Source Software
+OTOH         On the other hand
+P2P          Peer to Peer
+PDA          Personal Digital Assistant
+PDF          Portable Document Format
+Perl         Practical Extraction and Report Language
+PERL         Practical Extraction and Report Language
+PHP          Hypertext Preprocessor
+PICS         Platform for Internet Content Selection
+PIN          Personal Identification Number
+PITA         Pain in the Ass
+PNG          Portable Network Graphics
+POP3         Post Office Protocol 3
+POP          Post Office Protocol
+QoS          Quality of Service
+RAID         Redundant Array of Inexpensive Disks
+RDF          Resource Description Framework
+ROTFL        Rolling on the floor laughing
+RPC          Remote Procedure Call
+RSS          Rich Site Summary
+RTFM         Read The Fine Manual
+RTF          Rich Text File
+SCSI         Small Computer System Interface
+SDK          Software Development Kit
+SGML         Standard General Markup Language
+SMIL         Synchronized Multimedia Integration Language
+SMTP         Simple Mail Transfer Protocol
+SOAP         Simple Object Access Protocol
+spec         specification
+SQL          Structured Query Language
+SSH          Secure Shell
+SSI          Server Side Includes
+SSL          Secure Sockets Layer
+SVG          Scalable Vector Graphics
+TIA          Thanks in advance
+TIFF         Tagged Image File Format
+TLD          Top Level Domain
+TOC          Table of Contents
+URI          Uniform Resource Identifier
+URL          Uniform Resource Locator
+URN          Uniform Resource Name
+VBA          Visual Basic for Applications
+VB           Visual Basic
+W3C          World Wide Web Consortium
+WAN          Wide Area Network
+WAP          Wireless Access Protocol
+WML          Wireless Markup Language
+WTF?         What the f***
+WWW          World Wide Web
+WYSIWYG      What You See Is What You Get
+XHTML        Extensible HyperText Markup Language
+XML          Extensible Markup Language
+XSD          XML (Extensible Markup Language) Schema Definition
+XSL          Extensible Stylesheet Language
+XSLT         Extensible Stylesheet Language Transformations
+XUL          XML User Interface Language
+YMMV         Your mileage may vary
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/dokuwiki.php b/mod/dokuwiki/vendors/dokuwiki/conf/dokuwiki.php
new file mode 100644
index 000000000..74d95147e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/dokuwiki.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * This is DokuWiki's Main Configuration file
+ *
+ * All the default values are kept here, you should not modify it but use
+ * a local.php file instead to override the settings from here.
+ *
+ * This is a piece of PHP code so PHP syntax applies!
+ *
+ * For help with the configuration see http://www.splitbrain.org/dokuwiki/wiki:config
+ */
+
+
+/* Datastorage and Permissions */
+
+$conf['fmode']       = 0644;              //set file creation mode
+$conf['dmode']       = 0755;              //set directory creation mode
+$conf['lang']        = 'en';              //your language
+$conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
+$conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
+$conf['savedir']     = './data';          //where to store all the files
+$conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
+
+/* Display Options */
+
+$conf['start']       = 'start';           //name of start page
+$conf['title']       = 'DokuWiki';        //what to show in the title
+$conf['template']    = 'default';         //see lib/tpl directory
+$conf['license']     = 'cc-by-nc-sa';     //see conf/license.php
+$conf['fullpath']    = 0;                 //show full path of the document or relative to datadir only? 0|1
+$conf['recent']      = 20;                //how many entries to show in recent
+$conf['breadcrumbs'] = 10;                //how many recent visited pages to show
+$conf['youarehere']  = 0;                 //show "You are here" navigation? 0|1
+$conf['typography']  = 1;                 //smartquote conversion 0=off, 1=doublequotes, 2=all quotes
+$conf['htmlok']      = 0;                 //may raw HTML be embedded? This may break layout and XHTML validity 0|1
+$conf['phpok']       = 0;                 //may PHP code be embedded? Never do this on the internet! 0|1
+$conf['dformat']     = '%Y/%m/%d %H:%M';  //dateformat accepted by PHPs strftime() function
+$conf['signature']   = ' --- //[[@MAIL@|@NAME@]] @DATE@//'; //signature see wiki:config for details
+$conf['toptoclevel'] = 1;                 //Level starting with and below to include in AutoTOC (max. 5)
+$conf['tocminheads'] = 3;                 //Minimum amount of headlines that determines if a TOC is built
+$conf['maxtoclevel'] = 3;                 //Up to which level include into AutoTOC (max. 5)
+$conf['maxseclevel'] = 3;                 //Up to which level create editable sections (max. 5)
+$conf['camelcase']   = 0;                 //Use CamelCase for linking? (I don't like it) 0|1
+$conf['deaccent']    = 1;                 //deaccented chars in pagenames (1) or romanize (2) or keep (0)?
+$conf['useheading']  = 0;                 //use the first heading in a page as its name
+$conf['refcheck']    = 1;                 //check for references before deleting media files
+$conf['refshow']     = 0;                 //how many references should be shown, 5 is a good value
+$conf['showuseras']  = 'loginname';       // 'loginname' users login name
+                                          // 'username' users full name
+                                          // 'email' e-mail address (will be obfuscated as per mailguard)
+                                          // 'email_link' e-mail address as a mailto: link (obfuscated)
+
+/* Antispam Features */
+
+$conf['usewordblock']= 1;                 //block spam based on words? 0|1
+$conf['indexdelay']  = 60*60*24*5;        //allow indexing after this time (seconds) default is 5 days
+$conf['relnofollow'] = 1;                 //use rel="nofollow" for external links?
+$conf['mailguard']   = 'hex';             //obfuscate email addresses against spam harvesters?
+                                          //valid entries are:
+                                          //  'visible' - replace @ with [at], . with [dot] and - with [dash]
+                                          //  'hex'     - use hex entities to encode the mail address
+                                          //  'none'    - do not obfuscate addresses
+$conf['iexssprotect']= 1;                 // check for JavaScript and HTML in uploaded files 0|1
+
+/* Authentication Options - read http://www.splitbrain.org/dokuwiki/wiki:acl */
+
+$conf['useacl']      = 0;                //Use Access Control Lists to restrict access?
+$conf['autopasswd']  = 1;                //autogenerate passwords and email them to user
+$conf['authtype']    = 'plain';          //which authentication backend should be used
+$conf['passcrypt']   = 'smd5';           //Used crypt method (smd5,md5,sha1,ssha,crypt,mysql,my411)
+$conf['defaultgroup']= 'user';           //Default groups new Users are added to
+$conf['superuser']   = '!!not set!!';    //The admin can be user or @group or comma separated list user1,@group1,user2
+$conf['manager']     = '!!not set!!';    //The manager can be user or @group or comma separated list user1,@group1,user2
+$conf['profileconfirm'] = 1;             //Require current password to confirm changes to user profile
+$conf['disableactions'] = '';            //comma separated list of actions to disable
+$conf['sneaky_index']   = 0;             //check for namespace read permission in index view (0|1) (1 might cause unexpected behavior)
+$conf['auth_security_timeout'] = 900;    //time (seconds) auth data is considered valid, set to 0 to recheck on every page view
+$conf['securecookie'] = 1;               //never send HTTPS cookies via HTTP
+
+$conf['xmlrpc']      = 0;                //Enable/disable XML-RPC interface
+$conf['xmlrpcuser']  = '!!not set!!';    //Restrict XML-RPC access to this groups/users
+
+/* Advanced Options */
+
+$conf['updatecheck'] = 1;                //automatically check for new releases?
+$conf['userewrite']  = 0;                //this makes nice URLs: 0: off 1: .htaccess 2: internal
+$conf['useslash']    = 0;                //use slash instead of colon? only when rewrite is on
+$conf['usedraft']    = 1;                //automatically save a draft while editing (0|1)
+$conf['sepchar']     = '_';              //word separator character in page names; may be a
+                                         //  letter, a digit, '_', '-', or '.'.
+$conf['canonical']   = 0;                //Should all URLs use full canonical http://... style?
+$conf['autoplural']  = 0;                //try (non)plural form of nonexisting files?
+$conf['compression'] = 'gz';             //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip)
+                                         //  bz2 generates smaller files, but needs more cpu-power
+$conf['cachetime']   = 60*60*24;         //maximum age for cachefile in seconds (defaults to a day)
+$conf['locktime']    = 15*60;            //maximum age for lockfiles (defaults to 15 minutes)
+$conf['fetchsize']   = 0;                //maximum size (bytes) fetch.php may download from extern, disabled by default
+$conf['notify']      = '';               //send change info to this email (leave blank for nobody)
+$conf['registernotify'] = '';            //send info about newly registered users to this email (leave blank for nobody)
+$conf['mailfrom']    = '';               //use this email when sending mails
+$conf['gzip_output'] = 0;                //use gzip content encodeing for the output xhtml (if allowed by browser)
+$conf['gdlib']       = 2;                //the GDlib version (0, 1 or 2) 2 tries to autodetect
+$conf['im_convert']  = '';               //path to ImageMagicks convert (will be used instead of GD)
+$conf['jpg_quality'] = '70';             //quality of compression when scaling jpg images (0-100)
+$conf['subscribers'] = 0;                //enable change notice subscription support
+$conf['compress']    = 1;                //Strip whitespaces and comments from Styles and JavaScript? 1|0
+$conf['hidepages']   = '';               //Regexp for pages to be skipped from RSS, Search and Recent Changes
+$conf['send404']     = 0;                //Send a HTTP 404 status for non existing pages?
+$conf['sitemap']     = 0;                //Create a google sitemap? How often? In days.
+$conf['rss_type']    = 'rss1';           //type of RSS feed to provide, by default:
+                                         //  'rss'  - RSS 0.91
+                                         //  'rss1' - RSS 1.0
+                                         //  'rss2' - RSS 2.0
+                                         //  'atom' - Atom 0.3
+                                         //  'atom1' - Atom 1.0
+$conf['rss_linkto'] = 'diff';            //what page RSS entries link to:
+                                         //  'diff'    - page showing revision differences
+                                         //  'page'    - the revised page itself
+                                         //  'rev'     - page showing all revisions
+                                         //  'current' - most recent revision of page
+$conf['rss_content'] = 'abstract';       // what to put in the items by deafult?
+                                         //  'abstract' - plain text, first paragraph or so
+                                         //  'diff'     - plain text unified diff wrapped in <pre> tags
+                                         //  'htmldiff' - diff as HTML table
+                                         //  'html'     - the full page rendered in XHTML
+$conf['rss_update'] = 5*60;              //Update the RSS feed every n seconds (defaults to 5 minutes)
+$conf['recent_days'] = 7;                //How many days of recent changes to keep. (days)
+$conf['rss_show_summary'] = 1;           //Add revision summary to title? 0|1
+$conf['broken_iua']  = 0;                //Platform with broken ignore_user_abort (IIS+CGI) 0|1
+$conf['xsendfile']   = 0;                //Use X-Sendfile (1 = lighttpd, 2 = standard)
+$conf['renderer_xhtml'] = 'xhtml';       //renderer to use for main page generation
+$conf['rememberme'] = 1;                 //Enable/disable remember me on login
+
+//Set target to use when creating links - leave empty for same window
+$conf['target']['wiki']      = '';
+$conf['target']['interwiki'] = '';
+$conf['target']['extern']    = '';
+$conf['target']['media']     = '';
+$conf['target']['windows']   = '';
+
+//Proxy setup - if your Server needs a proxy to access the web set these
+$conf['proxy']['host'] = '';
+$conf['proxy']['port'] = '';
+$conf['proxy']['user'] = '';
+$conf['proxy']['pass'] = '';
+$conf['proxy']['ssl']  = 0;
+
+/* Safemode Hack */
+
+$conf['safemodehack'] = 0;               //read http://www.dokuwiki.org/config:safemodehack !
+$conf['ftp']['host'] = 'localhost';
+$conf['ftp']['port'] = '21';
+$conf['ftp']['user'] = 'user';
+$conf['ftp']['pass'] = 'password';
+$conf['ftp']['root'] = '/home/user/htdocs';
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/entities.conf b/mod/dokuwiki/vendors/dokuwiki/conf/entities.conf
new file mode 100644
index 000000000..be9ed6d40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/entities.conf
@@ -0,0 +1,22 @@
+# Typography replacements
+#
+# Order does matter!
+#
+# You can use HTML entities here, but it is not recomended because it may break
+# non-HTML renderers. Use UTF-8 chars directly instead.
+
+<->     ↔
+->      →
+<-      ←
+<=>     ⇔
+=>      ⇒
+<=      ⇐
+>>      »
+<<      «
+---     —
+--      –
+(c)     ©
+(tm)    ™
+(r)     ®
+...     …
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/interwiki.conf b/mod/dokuwiki/vendors/dokuwiki/conf/interwiki.conf
new file mode 100644
index 000000000..0e855f626
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/interwiki.conf
@@ -0,0 +1,125 @@
+# Each URL may contain one of the placeholders {URL} or {NAME}
+# {URL}  is replaced by the URL encoded representation of the wikiname
+#        this is the right thing to do in most cases
+# {NAME} this is replaced by the wikiname as given in the document
+#        no further encoding is done
+# If no placeholder is defined the urlencoded name is appended to the URL
+
+# You can add more InterWiki shortcuts here.
+
+wp        http://en.wikipedia.org/wiki/{NAME}
+wpfr      http://fr.wikipedia.org/wiki/{NAME}
+wpde      http://de.wikipedia.org/wiki/{NAME}
+wpes      http://es.wikipedia.org/wiki/{NAME}
+wppl      http://pl.wikipedia.org/wiki/{NAME}
+wpjp      http://ja.wikipedia.org/wiki/{NAME}
+wpmeta    http://meta.wikipedia.org/wiki/{NAME}
+doku      http://www.dokuwiki.org/
+dokubug   http://bugs.splitbrain.org/index.php?do=details&amp;task_id=
+rfc       http://www.cs.ccu.edu.tw/~chm91u/rfc2html.php?in=
+man       http://man.cx/
+amazon    http://www.amazon.com/exec/obidos/ASIN/{URL}/splitbrain-20/
+amazon.de http://www.amazon.de/exec/obidos/ASIN/{URL}/splitbrain-21/
+amazon.uk http://www.amazon.co.uk/exec/obidos/ASIN/
+phpfn     http://www.php.net/{NAME}
+coral     http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY}
+freecache http://freecache.org/{NAME}
+sb        http://www.splitbrain.org/go/
+google.de http://www.google.de/search?q=
+go        http://www.google.com/search?q={URL}&amp;btnI=lucky
+
+# Standards from http://usemod.com/intermap.txt follow
+
+AbbeNormal      http://www.ourpla.net/cgi-bin/pikie.cgi?
+AcadWiki        http://xarch.tu-graz.ac.at/autocad/wiki/
+Acronym         http://www.acronymfinder.com/af-query.asp?String=exact&amp;Acronym=
+Advogato        http://www.advogato.org/
+AIWiki          http://www.ifi.unizh.ch/ailab/aiwiki/aiw.cgi?
+ALife           http://news.alife.org/wiki/index.php?
+AndStuff        http://andstuff.org/wiki.php?
+Annotation      http://bayle.stanford.edu/crit/nph-med.cgi/
+AnnotationWiki  http://www.seedwiki.com/page.cfm?wikiid=368&amp;doc=
+AwarenessWiki   http://taoriver.net/aware/
+BenefitsWiki    http://www.benefitslink.com/cgi-bin/wiki.cgi?
+BridgesWiki     http://c2.com/w2/bridges/
+C2find          http://c2.com/cgi/wiki?FindPage&amp;value=
+Cache           http://www.google.com/search?q=cache:
+CLiki           http://ww.telent.net/cliki/
+CmWiki          http://www.ourpla.net/cgi-bin/wiki.pl?
+CreationMatters http://www.ourpla.net/cgi-bin/wiki.pl?
+DejaNews        http://www.deja.com/=dnc/getdoc.xp?AN=
+DeWikiPedia     http://www.wikipedia.de/wiki.cgi?
+Dictionary      http://www.dict.org/bin/Dict?Database=*&amp;Form=Dict1&amp;Strategy=*&amp;Query=
+DiveIntoOsx     http://diveintoosx.org/
+DocBook         http://docbook.org/wiki/moin.cgi/
+DolphinWiki     http://www.object-arts.com/wiki/html/Dolphin/
+EfnetCeeWiki    http://purl.net/wiki/c/
+EfnetCppWiki    http://purl.net/wiki/cpp/
+EfnetPythonWiki http://purl.net/wiki/python/
+EfnetXmlWiki    http://purl.net/wiki/xml/
+EljWiki         http://elj.sourceforge.net/phpwiki/index.php/
+EmacsWiki       http://www.emacswiki.org/cgi-bin/wiki.pl?
+FinalEmpire     http://final-empire.sourceforge.net/cgi-bin/wiki.pl?
+Foldoc          http://www.foldoc.org/foldoc/foldoc.cgi?
+FoxWiki         http://fox.wikis.com/wc.dll?Wiki~
+FreeBSDman      http://www.FreeBSD.org/cgi/man.cgi?apropos=1&amp;query=
+Google          http://www.google.com/search?q=
+GoogleGroups    http://groups.google.com/groups?q=
+GreenCheese     http://www.greencheese.org/
+HammondWiki     http://www.dairiki.org/HammondWiki/index.php3?
+Haribeau        http://wiki.haribeau.de/cgi-bin/wiki.pl?
+IAWiki          http://www.IAwiki.net/
+IMDB            http://us.imdb.com/Title?
+JargonFile      http://sunir.org/apps/meta.pl?wiki=JargonFile&amp;redirect=
+JiniWiki        http://www.cdegroot.com/cgi-bin/jini?
+JspWiki         http://www.ecyrd.com/JSPWiki/Wiki.jsp?page=
+KmWiki          http://www.voght.com/cgi-bin/pywiki?
+KnowHow         http://www2.iro.umontreal.ca/~paquetse/cgi-bin/wiki.cgi?
+LanifexWiki     http://opt.lanifex.com/cgi-bin/wiki.pl?
+LegoWiki        http://www.object-arts.com/wiki/html/Lego-Robotics/
+LinuxWiki       http://www.linuxwiki.de/
+LugKR           http://lug-kr.sourceforge.net/cgi-bin/lugwiki.pl?
+MathSongsWiki   http://SeedWiki.com/page.cfm?wikiid=237&amp;doc=
+MbTest          http://www.usemod.com/cgi-bin/mbtest.pl?
+MeatBall        http://www.usemod.com/cgi-bin/mb.pl?
+MetaWiki        http://sunir.org/apps/meta.pl?
+MetaWikiPedia   http://meta.wikipedia.com/wiki/
+MoinMoin        http://purl.net/wiki/moin/
+MuWeb           http://www.dunstable.com/scripts/MuWebWeb?
+NetVillage      http://www.netbros.com/?
+OpenWiki        http://openwiki.com/?
+OrgPatterns     http://www.bell-labs.com/cgi-user/OrgPatterns/OrgPatterns?
+PangalacticOrg  http://www.pangalactic.org/Wiki/
+PersonalTelco   http://www.personaltelco.net/index.cgi/
+PhpWiki         http://phpwiki.sourceforge.net/phpwiki/index.php?
+Pikie           http://pikie.darktech.org/cgi/pikie?
+PPR             http://c2.com/cgi/wiki?
+PurlNet         http://purl.oclc.org/NET/
+PythonInfo      http://www.python.org/cgi-bin/moinmoin/
+PythonWiki      http://www.pythonwiki.de/
+PyWiki          http://www.voght.com/cgi-bin/pywiki?
+SeaPig          http://www.seapig.org/
+SeattleWireless http://seattlewireless.net/?
+SenseisLibrary  http://senseis.xmp.net/?
+Shakti          http://cgi.algonet.se/htbin/cgiwrap/pgd/ShaktiWiki/
+SourceForge     http://sourceforge.net/{NAME}
+Squeak          http://minnow.cc.gatech.edu/squeak/
+StrikiWiki      http://ch.twi.tudelft.nl/~mostert/striki/teststriki.pl?
+SVGWiki         http://www.protocol7.com/svg-wiki/default.asp?
+Tavi            http://tavi.sourceforge.net/index.php?
+TmNet           http://www.technomanifestos.net/?
+TMwiki          http://www.EasyTopicMaps.com/?page=
+TWiki           http://twiki.org/cgi-bin/view/{NAME}
+TwistedWiki     http://purl.net/wiki/twisted/
+Unreal          http://wiki.beyondunreal.com/wiki/
+UseMod          http://www.usemod.com/cgi-bin/wiki.pl?
+VisualWorks     http://wiki.cs.uiuc.edu/VisualWorks/
+WebDevWikiNL    http://www.promo-it.nl/WebDevWiki/index.php?page=
+WebSeitzWiki    http://webseitz.fluxent.com/wiki/
+Why             http://clublet.com/c/c/why?
+Wiki            http://c2.com/cgi/wiki?
+WikiPedia       http://www.wikipedia.com/wiki/
+WikiWorld       http://WikiWorld.com/wiki/index.php/
+YpsiEyeball     http://sknkwrks.dyndns.org:1957/writewiki/wiki.pl?
+ZWiki           http://www.zwiki.org/
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/license.php b/mod/dokuwiki/vendors/dokuwiki/conf/license.php
new file mode 100644
index 000000000..9a753baa7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/license.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * This file defines multiple available licenses you can license your
+ * wiki contents under. Do not change this file, but create a
+ * license.local.php instead.
+ */
+
+$license['cc-by'] = array(
+    'name' => 'CC Attribution 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by/3.0/',
+);
+$license['cc-by-nc'] = array(
+    'name' => 'CC Attribution-Noncommercial 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-nc/3.0/',
+);
+$license['cc-by-nc-nd'] = array(
+    'name' => 'CC Attribution-Noncommercial-No Derivative Works 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-nc-nd/3.0/',
+);
+$license['cc-by-nc-sa'] = array(
+    'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+);
+$license['cc-by-nd'] = array(
+    'name' => 'CC Attribution-No Derivative Works 3.0 Unported',
+    'url'  => 'cc-by-nd',
+);
+$license['cc-by-sa'] = array(
+    'name' => 'CC Attribution-Share Alike 3.0 Unported',
+    'url'  => 'http://creativecommons.org/licenses/by-sa/3.0/',
+);
+$license['publicdomain'] = array(
+    'name' => 'Public Domain',
+    'url'  => 'http://creativecommons.org/licenses/publicdomain/',
+);
+$license['gnufdl'] = array(
+    'name' => 'GNU Free Documentation License 1.2',
+    'url'  => 'http://www.gnu.org/licenses/fdl-1.2.html',
+);
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/local.php b/mod/dokuwiki/vendors/dokuwiki/conf/local.php
new file mode 100644
index 000000000..74334812b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/local.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * This is an example of how a local.php coul look like.
+ * Simply copy the options you want to change from dokuwiki.php
+ * to this file and change them.
+ *
+ * When using the installer, a correct local.php file be generated for
+ * you automatically.
+ */
+
+$conf['title']       = 'Elgg Wiki';        //what to show in the title
+$conf['basedir']     = '';                //absolute dir from serveroot - blank for autodetection
+$conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
+$conf['savedir']     = DOKU_ELGGDATA;          //where to store all the files
+
+$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
+$conf['disableactions'] = 'login,logout';            //comma separated list of actions to disable
+
+$conf['updatecheck'] = 0;                //automatically check for new releases?
+
+// get language from elgg directly
+$conf['lang']        = get_current_language();
+
+$conf['superuser']   = '@root';
+
+$conf['license']     = 'cc-by-sa';     //see conf/license.php
+
+$conf['pluginmanager'] = 0;
+
+$conf['plugin']['indexmenu']['skip_file']="/(sidebar)/i";
+
+//$conf['superuser']   = 'joe';
+
+/**
+ * The following options are usefull, if you use a MySQL
+ * database as autentication backend. Have a look into
+ * mysql.conf.php too and adjust the options to match
+ * your database installation.
+ */
+$conf['authtype']   = 'elgg';
+//require_once ("mysql.conf.php");
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/local.php.dist b/mod/dokuwiki/vendors/dokuwiki/conf/local.php.dist
new file mode 100644
index 000000000..4af6ea594
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/local.php.dist
@@ -0,0 +1,26 @@
+<?php
+/**
+ * This is an example of how a local.php coul look like.
+ * Simply copy the options you want to change from dokuwiki.php
+ * to this file and change them.
+ *
+ * When using the installer, a correct local.php file be generated for
+ * you automatically.
+ */
+
+
+//$conf['title']       = 'My Wiki';        //what to show in the title
+
+//$conf['useacl']      = 1;                //Use Access Control Lists to restrict access?
+//$conf['superuser']   = 'joe';
+
+/**
+ * The following options are usefull, if you use a MySQL
+ * database as autentication backend. Have a look into
+ * mysql.conf.php too and adjust the options to match
+ * your database installation.
+ */
+//$conf['authtype']   = 'mysql';
+//require_once ("mysql.conf.php");
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/mediameta.php b/mod/dokuwiki/vendors/dokuwiki/conf/mediameta.php
new file mode 100644
index 000000000..ba7117643
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/mediameta.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * This configures which meta data will be editable through
+ * the media manager. Each field of the array is an array with the
+ * following contents:
+ *   fieldname - Where data will be saved (EXIF or IPTC field)
+ *   label     - key to lookup in the $lang var, if not found printed as is
+ *   htmltype  - 'text' or 'textarea'
+ *   lookups   - array additional fields to lookup the data (EXIF or IPTC fields)
+ *
+ * The fields are not ordered continously to make inserting additional items
+ * in between simpler.
+ *
+ * This is a PHP snippet, so PHP syntax applies.
+ *
+ * Note: $fields is not a global variable and will not be available to any
+ *       other functions or templates later
+ *
+ * You may extend or overwrite this variable in a optional
+ * conf/mediameta.local.php file
+ *
+ * For a list of available EXIF/IPTC fields refer to
+ * http://www.dokuwiki.org/devel:templates:detail.php
+ */
+
+
+$fields = array(
+    10 => array('Iptc.Headline',
+                'img_title',
+                'text'),
+
+    20 => array('Iptc.Caption',
+                'img_caption',
+                'textarea',
+                array('Exif.UserComment',
+                      'Exif.TIFFImageDescription',
+                      'Exif.TIFFUserComment')),
+
+    30 => array('Iptc.Byline',
+                'img_artist',
+                'text',
+                array('Exif.TIFFArtist',
+                      'Exif.Artist',
+                      'Iptc.Credit')),
+
+    40 => array('Iptc.CopyrightNotice',
+                'img_copyr',
+                'text',
+                array('Exif.TIFFCopyright',
+                      'Exif.Copyright')),
+
+    50 => array('Iptc.Keywords',
+                'img_keywords',
+                'text',
+                array('Exif.Category')),
+);
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/mime.conf b/mod/dokuwiki/vendors/dokuwiki/conf/mime.conf
new file mode 100644
index 000000000..2e1ce6bb0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/mime.conf
@@ -0,0 +1,52 @@
+# Allowed uploadable file extensions and mimetypes are defined here.
+# To extend this file it is recommended to create a mime.local.conf
+# file. Mimetypes that should be downloadable and not be opened in the
+# should be prefixed with a !
+
+jpg     image/jpeg
+jpeg    image/jpeg
+gif     image/gif
+png     image/png
+tgz     !application/octet-stream
+tar     !application/x-gtar
+gz      !application/octet-stream
+bz2     !application/octet-stream
+zip     !application/zip
+rar     !application/rar
+pdf     application/pdf
+ps      !application/postscript
+doc     !application/msword
+xls     !application/msexcel
+ppt     !application/mspowerpoint
+rtf     !application/msword
+swf     application/x-shockwave-flash
+
+rpm     !application/octet-stream
+deb     !application/octet-stream
+
+sxw     !application/soffice
+sxc     !application/soffice
+sxi     !application/soffice
+sxd     !application/soffice
+
+odc     !application/vnd.oasis.opendocument.chart
+odf     !application/vnd.oasis.opendocument.formula
+odg     !application/vnd.oasis.opendocument.graphics
+odi     !application/vnd.oasis.opendocument.image
+odp     !application/vnd.oasis.opendocument.presentation
+ods     !application/vnd.oasis.opendocument.spreadsheet
+odt     !application/vnd.oasis.opendocument.text
+
+# You should enable HTML and Text uploads only for restricted Wikis.
+# Spammers are known to upload spam pages through unprotected Wikis.
+# Note: Enabling HTML opens Cross Site Scripting vulnerabilities
+#       through JavaScript. Only enable this with trusted users. You
+#       need to disable the iexssprotect option additionally to
+#       adding the mime type here
+#html    text/html
+#htm     text/html
+#txt     text/plain
+#conf    text/plain
+#xml     text/xml
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/msg b/mod/dokuwiki/vendors/dokuwiki/conf/msg
new file mode 100644
index 000000000..38bbb133c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/msg
@@ -0,0 +1,8 @@
+25
+The first line of this file contains a number, indicating
+which notification messages should not be displayed. This
+is the only information sent to dokuwiki.org when the
+updatecheck option is enabled. You usually don't need to
+change this number as it gets updated when you install the
+new release - but to ignore a certain message set its
+number here.
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/mysql.conf.php.example b/mod/dokuwiki/vendors/dokuwiki/conf/mysql.conf.php.example
new file mode 100644
index 000000000..bd67be82c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/mysql.conf.php.example
@@ -0,0 +1,253 @@
+<?php
+/*
+ * This is an example configuration for the mysql auth module.
+ *
+ * This SQL statements are optimized for following table structure.
+ * If you use a different one you have to change them accordingly.
+ * See comments of every statement for details.
+ *
+ * TABLE users
+ *     uid   login   pass   firstname   lastname   email
+ *	  
+ * TABLE groups
+ *     gid   name
+ *	  
+ * TABLE usergroup
+ *     uid   gid
+ * 
+ * To use this configuration you have to copy them to local.php
+ * or at least include this file in local.php.
+ */
+
+/* Options to configure database access. You need to set up this
+ * options carefully, otherwise you won't be able to access you
+ * database.
+ */
+$conf['auth']['mysql']['server']   = '';
+$conf['auth']['mysql']['user']     = '';
+$conf['auth']['mysql']['password'] = '';
+$conf['auth']['mysql']['database'] = '';
+
+/* This option enables debug messages in the mysql module. It is
+ * mostly usefull for system admins.
+ */
+$conf['auth']['mysql']['debug'] = 0;
+
+/* Normally password encryption is done by DokuWiki (recommended) but for
+ * some reasons it might be usefull to let the database do the encryption.
+ * Set 'forwardClearPass' to '1' and the cleartext password is forwarded to
+ * the database, otherwise the encrypted one.
+ */
+$conf['auth']['mysql']['forwardClearPass'] = 0;
+
+/* Multiple table operations will be protected by locks. This array tolds
+ * the module which tables to lock. If you use any aliases for table names
+ * these array must also contain these aliases. Any unamed alias will cause
+ * a warning during operation. See the example below.
+ */
+$conf['auth']['mysql']['TablesToLock']= array("users", "users AS u","groups", "groups AS g", "usergroup", "usergroup AS ug");
+
+/***********************************************************************/
+/*       Basic SQL statements for user authentication (required)       */
+/***********************************************************************/
+
+/* This statement is used to grant or deny access to the wiki. The result
+ * should be a table with exact one line containing at least the password
+ * of the user. If the result table is empty or contains more than one
+ * row, access will be denied.
+ *
+ * The module access the password as 'pass' so a alias might be necessary.
+ *
+ * Following patters will be replaced:
+ *   %{user}	user name
+ *   %{pass}	encrypted or clear text password (depends on 'encryptPass')
+ *   %{dgroup}	default group name 
+ */
+$conf['auth']['mysql']['checkPass']   = "SELECT pass
+                                         FROM usergroup AS ug
+                                         JOIN users AS u ON u.uid=ug.uid
+                                         JOIN groups AS g ON g.gid=ug.gid
+                                         WHERE login='%{user}'
+                                         AND name='%{dgroup}'";
+
+/* This statement should return a table with exact one row containing
+ * information about one user. The field needed are:
+ * 'pass'  containing the encrypted or clear text password
+ * 'name'  the user's full name
+ * 'mail'  the user's email address
+ *
+ * Keep in mind that Dokuwiki will access thise information through the
+ * names listed above so aliasses might be neseccary.
+ *
+ * Following patters will be replaced:
+ *   %{user}	user name
+ */
+$conf['auth']['mysql']['getUserInfo'] = "SELECT pass, CONCAT(firstname,' ',lastname) AS name, email AS mail
+                                         FROM users
+                                         WHERE login='%{user}'";
+
+/* This statement is used to get all groups a user is member of. The
+ * result should be a table containing all groups the given user is
+ * member of. The module access the group name as 'group' so a alias
+ * might be nessecary.
+ *
+ * Following patters will be replaced:
+ *   %{user}	user name
+ */
+$conf['auth']['mysql']['getGroups']   = "SELECT name as `group`
+                                         FROM groups g, users u, usergroup ug
+                                         WHERE u.uid = ug.uid
+                                         AND g.gid = ug.gid
+                                         AND u.login='%{user}'";
+
+/***********************************************************************/
+/*      Additional minimum SQL statements to use the user manager      */
+/***********************************************************************/
+
+/* This statement should return a table containing all user login names
+ * that meet certain filter criteria. The filter expressions will be added
+ * case dependend by the module. At the end a sort expression will be added.
+ * Important is that this list contains no double entries fo a user. Each
+ * user name is only allowed once in the table.
+ *
+ * The login name will be accessed as 'user' to a alias might be neseccary.
+ * No patterns will be replaced in this statement but following patters
+ * will be replaced in the filter expressions:
+ *   %{user}	in FilterLogin  user's login name
+ *   %{name}	in FilterName   user's full name
+ *   %{email}	in FilterEmail  user's email address
+ *   %{group}	in FilterGroup  group name
+ */
+$conf['auth']['mysql']['getUsers']    = "SELECT DISTINCT login AS user
+                                         FROM users AS u 
+                                         LEFT JOIN usergroup AS ug ON u.uid=ug.uid
+                                         LEFT JOIN groups AS g ON ug.gid=g.gid";
+$conf['auth']['mysql']['FilterLogin'] = "login LIKE '%{user}'";
+$conf['auth']['mysql']['FilterName']  = "CONCAT(firstname,' ',lastname) LIKE '%{name}'";
+$conf['auth']['mysql']['FilterEmail'] = "email LIKE '%{email}'";
+$conf['auth']['mysql']['FilterGroup'] = "name LIKE '%{group}'";
+$conf['auth']['mysql']['SortOrder']   = "ORDER BY login";
+
+/***********************************************************************/
+/*   Additional SQL statements to add new users with the user manager  */
+/***********************************************************************/
+
+/* This statement should add a user to the database. Minimum information
+ * to store are: login name, password, email address and full name.
+ *
+ * Following patterns will be replaced:
+ *   %{user}	user's login name
+ *   %{pass}	password (encrypted or clear text, depends on 'encryptPass')
+ *   %{email}	email address
+ *   %{name}	user's full name
+ */ 
+$conf['auth']['mysql']['addUser']     = "INSERT INTO users
+                                         (login, pass, email, firstname, lastname)
+                                         VALUES ('%{user}', '%{pass}', '%{email}',
+                                         SUBSTRING_INDEX('%{name}',' ', 1),
+                                         SUBSTRING_INDEX('%{name}',' ', -1))";
+
+/* This statement should add a group to the database.
+ * Following patterns will be replaced:
+ *   %{group}	group name
+ */
+$conf['auth']['mysql']['addGroup']    = "INSERT INTO groups (name)
+                                         VALUES ('%{group}')";
+
+/* This statement should connect a user to a group (a user become member
+ * of that group).
+ * Following patterns will be replaced:
+ *   %{user}	user's login name
+ *   %{uid}		id of a user dataset
+ *   %{group}	group name
+ *   %{gid}		id of a group dataset
+ */
+$conf['auth']['mysql']['addUserGroup']= "INSERT INTO usergroup (uid, gid)
+                                         VALUES ('%{uid}', '%{gid}')";
+
+/* This statement should remove a group fom the database.
+ * Following patterns will be replaced:
+ *   %{group}	group name
+ *   %{gid}		id of a group dataset
+ */
+$conf['auth']['mysql']['delGroup']    = "DELETE FROM groups
+                                         WHERE gid='%{gid}'";
+
+/* This statement should return the database index of a given user name.
+ * The module will access the index with the name 'id' so a alias might be
+ * necessary.
+ * following patters will be replaced:
+ *   %{user}	user name 
+ */
+$conf['auth']['mysql']['getUserID']   = "SELECT uid AS id
+                                         FROM users
+                                         WHERE login='%{user}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to delete users with the user manager   */
+/***********************************************************************/
+
+/* This statement should remove a user fom the database.
+ * Following patterns will be replaced:
+ *   %{user}	user's login name
+ *   %{uid}		id of a user dataset
+ */
+$conf['auth']['mysql']['delUser']     = "DELETE FROM users
+                                         WHERE uid='%{uid}'";
+
+/* This statement should remove all connections from a user to any group
+ * (a user quits membership of all groups).
+ * Following patterns will be replaced:
+ *   %{uid}		id of a user dataset
+ */
+$conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
+                                         WHERE uid='%{uid}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to modify users with the user manager   */
+/***********************************************************************/
+
+/* This statements should modify a user entry in the database. The
+ * statements UpdateLogin, UpdatePass, UpdateEmail and UpdateName will be
+ * added to updateUser on demand. Only changed parameters will be used.
+ *
+ * Following patterns will be replaced:
+ *   %{user}	user's login name
+ *   %{pass}	password (encrypted or clear text, depends on 'encryptPass')
+ *   %{email}	email address
+ *   %{name}	user's full name
+ *   %{uid}     user id that should be updated
+ */ 
+$conf['auth']['mysql']['updateUser']  = "UPDATE users SET";
+$conf['auth']['mysql']['UpdateLogin'] = "login='%{user}'";
+$conf['auth']['mysql']['UpdatePass']  = "pass='%{pass}'";
+$conf['auth']['mysql']['UpdateEmail'] = "email='%{email}'";
+$conf['auth']['mysql']['UpdateName']  = "firstname=SUBSTRING_INDEX('%{name}',' ', 1),
+                                         lastname=SUBSTRING_INDEX('%{name}',' ', -1)";
+$conf['auth']['mysql']['UpdateTarget']= "WHERE uid=%{uid}";
+
+/* This statement should remove a single connection from a user to a
+ * group (a user quits membership of that group).
+ *
+ * Following patterns will be replaced:
+ *   %{user}	user's login name
+ *   %{uid}		id of a user dataset
+ *   %{group}	group name
+ *   %{gid}		id of a group dataset
+ */
+$conf['auth']['mysql']['delUserGroup']= "DELETE FROM usergroup
+                                         WHERE uid='%{uid}'
+                                         AND gid='%{gid}'";
+
+/* This statement should return the database index of a given group name.
+ * The module will access the index with the name 'id' so a alias might
+ * be necessary.
+ *
+ * Following patters will be replaced:
+ *   %{group}	group name 
+ */
+$conf['auth']['mysql']['getGroupID']  = "SELECT gid AS id
+                                         FROM groups
+                                         WHERE name='%{group}'";
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/scheme.conf b/mod/dokuwiki/vendors/dokuwiki/conf/scheme.conf
new file mode 100644
index 000000000..88cb3c44d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/scheme.conf
@@ -0,0 +1,11 @@
+#Add URL schemes you want to be recognized as links here
+
+http
+https
+telnet
+gopher
+wais
+ftp
+ed2k
+irc
+ldap
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/smileys.conf b/mod/dokuwiki/vendors/dokuwiki/conf/smileys.conf
new file mode 100644
index 000000000..47e4537e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/smileys.conf
@@ -0,0 +1,27 @@
+# Smileys configured here will be replaced by the
+# configured images in the smiley directory
+
+8-)         icon_cool.gif
+8-O         icon_eek.gif
+8-o         icon_eek.gif
+:-(         icon_sad.gif
+:-)         icon_smile.gif
+=)          icon_smile2.gif
+:-/         icon_doubt.gif
+:-\         icon_doubt2.gif
+:-?         icon_confused.gif
+:-D         icon_biggrin.gif
+:-P         icon_razz.gif
+:-o         icon_surprised.gif
+:-O         icon_surprised.gif
+:-x         icon_silenced.gif
+:-X         icon_silenced.gif
+:-|         icon_neutral.gif
+;-)         icon_wink.gif
+^_^         icon_fun.gif
+:?:         icon_question.gif
+:!:         icon_exclaim.gif
+LOL         icon_lol.gif
+FIXME       fixme.gif
+DELETEME    delete.gif
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php b/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php
new file mode 100644
index 000000000..6576eeb5f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php
@@ -0,0 +1,10 @@
+# users.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Userfile
+#
+# Format:
+#
+# user:MD5password:Real Name:email:groups,comma,seperated
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php.dist b/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php.dist
new file mode 100644
index 000000000..6576eeb5f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/users.auth.php.dist
@@ -0,0 +1,10 @@
+# users.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Userfile
+#
+# Format:
+#
+# user:MD5password:Real Name:email:groups,comma,seperated
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/wordblock.conf b/mod/dokuwiki/vendors/dokuwiki/conf/wordblock.conf
new file mode 100644
index 000000000..da7143257
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/wordblock.conf
@@ -0,0 +1,8004 @@
+# This is the URL blacklist from the chongqed.org database
+# it is available from http://blacklist.chongqed.org/
+# You can use each line below as a regular expression
+# that can be tested against URLs on your wiki.
+# The last spammer was added on 2008-09-11 10:14:51
+
+https?:\/\/([^\/]*\.)?-com-boob-sex-sexy\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?0--sex\.com
+https?:\/\/([^\/]*\.)?0-casinos\.org
+https?:\/\/([^\/]*\.)?0-poker\.net
+https?:\/\/([^\/]*\.)?00007\.com
+https?:\/\/([^\/]*\.)?001-mature-teacher\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?007vip\.cn
+https?:\/\/([^\/]*\.)?01incest\.za\.pl
+https?:\/\/([^\/]*\.)?021boy\.com
+https?:\/\/([^\/]*\.)?027168\.com
+https?:\/\/([^\/]*\.)?02incest\.za\.pl
+https?:\/\/([^\/]*\.)?03incest\.za\.pl
+https?:\/\/([^\/]*\.)?086books\.com
+https?:\/\/([^\/]*\.)?0esy-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?0lmz-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?0sxa-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?0tdwrmq8\.org
+https?:\/\/([^\/]*\.)?0x009\.blogspot\.com
+https?:\/\/([^\/]*\.)?1-888-pokermon\.com
+https?:\/\/([^\/]*\.)?1-adipex\.us
+https?:\/\/([^\/]*\.)?1-cialis\.us
+https?:\/\/([^\/]*\.)?1-craps\.net
+https?:\/\/([^\/]*\.)?1-levitra\.us
+https?:\/\/([^\/]*\.)?1-poker-game\.com
+https?:\/\/([^\/]*\.)?1-xenical\.us
+https?:\/\/([^\/]*\.)?10-best-online-casinosx\.blogspot\.com
+https?:\/\/([^\/]*\.)?100-25-ebony-free\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?10med\.com
+https?:\/\/([^\/]*\.)?10pharm\.com
+https?:\/\/([^\/]*\.)?114418523\.blogspot\.com
+https?:\/\/([^\/]*\.)?117000\.com
+https?:\/\/([^\/]*\.)?1177888888\.com
+https?:\/\/([^\/]*\.)?123clips-com-cq03\.blogspot\.com
+https?:\/\/([^\/]*\.)?123clips-com-td\.blogspot\.com
+https?:\/\/([^\/]*\.)?123clips-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?123clips-tp5\.blogspot\.com
+https?:\/\/([^\/]*\.)?126hao\.com
+https?:\/\/([^\/]*\.)?163car\.com
+https?:\/\/([^\/]*\.)?163school\.com\.cn
+https?:\/\/([^\/]*\.)?168chinese\.com
+https?:\/\/([^\/]*\.)?168english\.com
+https?:\/\/([^\/]*\.)?168standard\.com
+https?:\/\/([^\/]*\.)?181st-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?18to19-com-dbo26u\.blogspot\.com
+https?:\/\/([^\/]*\.)?18to19-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?1avoro\.info
+https?:\/\/([^\/]*\.)?1c1garettes-777\.tripod\.com
+https?:\/\/([^\/]*\.)?1centpoker\.us
+https?:\/\/([^\/]*\.)?1clickpoker\.us
+https?:\/\/([^\/]*\.)?1dollarpoker\.us
+https?:\/\/([^\/]*\.)?1ebalo\.org
+https?:\/\/([^\/]*\.)?1freepoker\.us
+https?:\/\/([^\/]*\.)?1gogo\.awardspace\.com
+https?:\/\/([^\/]*\.)?1golod\.org
+https?:\/\/([^\/]*\.)?1i-casino\.com
+https?:\/\/([^\/]*\.)?1jolla\.org
+https?:\/\/([^\/]*\.)?1kaj-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?1min\.us
+https?:\/\/([^\/]*\.)?1onlinepoker\.us
+https?:\/\/([^\/]*\.)?1ringtones\.fateback\.com
+https?:\/\/([^\/]*\.)?1st-in-poker\.us
+https?:\/\/([^\/]*\.)?1st-phentermine\.to\.pl
+https?:\/\/([^\/]*\.)?1st-place-poker\.com
+https?:\/\/([^\/]*\.)?1st-poker\.us
+https?:\/\/([^\/]*\.)?1stpharma\.noads\.biz
+https?:\/\/([^\/]*\.)?1stpharmacy\.rmcinfo\.fr
+https?:\/\/([^\/]*\.)?1stviagra\.coz\.in
+https?:\/\/([^\/]*\.)?1whs\.com
+https?:\/\/([^\/]*\.)?2-poker\.us
+https?:\/\/([^\/]*\.)?2008-web-hosting\.com
+https?:\/\/([^\/]*\.)?2010oa\.com
+https?:\/\/([^\/]*\.)?2228888\.com
+https?:\/\/([^\/]*\.)?24ringtonevme\.blogspot\.com
+https?:\/\/([^\/]*\.)?24x7\.soliday\.org
+https?:\/\/([^\/]*\.)?2apd-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?2cpo-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?30moms-com-dd8h8y1slq\.blogspot\.com
+https?:\/\/([^\/]*\.)?30moms-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?321\.cn
+https?:\/\/([^\/]*\.)?33b\.b33r\.net
+https?:\/\/([^\/]*\.)?33orgy\.org
+https?:\/\/([^\/]*\.)?3mac\.info
+https?:\/\/([^\/]*\.)?3pic-com-ai3\.blogspot\.com
+https?:\/\/([^\/]*\.)?3pic-com-kedet\.blogspot\.com
+https?:\/\/([^\/]*\.)?40inchplus-com-b4\.blogspot\.com
+https?:\/\/([^\/]*\.)?40inchplus-com-toqof\.blogspot\.com
+https?:\/\/([^\/]*\.)?40inchplus-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?4arf-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?4erni-pes\.blogspot\.com
+https?:\/\/([^\/]*\.)?4mednew\.com
+https?:\/\/([^\/]*\.)?4mkat4\.com
+https?:\/\/([^\/]*\.)?4onlinecasino4\.blogspot\.com
+https?:\/\/([^\/]*\.)?4t7e\.info
+https?:\/\/([^\/]*\.)?4tsmiget\.forumzen\.com
+https?:\/\/([^\/]*\.)?4tsutmon\.forumzen\.com
+https?:\/\/([^\/]*\.)?4udf-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?4x2\.net
+https?:\/\/([^\/]*\.)?510sms\.blogbus\.com
+https?:\/\/([^\/]*\.)?5188job\.com
+https?:\/\/([^\/]*\.)?51lac\.com
+https?:\/\/([^\/]*\.)?51lover\.org
+https?:\/\/([^\/]*\.)?51sms\.blogbus\.com
+https?:\/\/([^\/]*\.)?51web\.cn
+https?:\/\/([^\/]*\.)?51wisdom\.com
+https?:\/\/([^\/]*\.)?51wisdom\.com\.cn
+https?:\/\/([^\/]*\.)?51wisdom\.net
+https?:\/\/([^\/]*\.)?520sms\.blogbus\.com
+https?:\/\/([^\/]*\.)?52lac\.net
+https?:\/\/([^\/]*\.)?5417\.cn
+https?:\/\/([^\/]*\.)?54epson\.com
+https?:\/\/([^\/]*\.)?55\.2myip\.com
+https?:\/\/([^\/]*\.)?5588866\.com\.cn
+https?:\/\/([^\/]*\.)?56156\.com
+https?:\/\/([^\/]*\.)?563000\.com
+https?:\/\/([^\/]*\.)?56918\.com
+https?:\/\/([^\/]*\.)?59165\.net
+https?:\/\/([^\/]*\.)?5ijipiao\.com
+https?:\/\/([^\/]*\.)?5up-net-blmpo6qr0\.blogspot\.com
+https?:\/\/([^\/]*\.)?5up-net-wr00skgzbo\.blogspot\.com
+https?:\/\/([^\/]*\.)?63\.217\.31\.49
+https?:\/\/([^\/]*\.)?6717\.com\.cn
+https?:\/\/([^\/]*\.)?69pose\.org
+https?:\/\/([^\/]*\.)?6tvju0a\.nokedem\.com
+https?:\/\/([^\/]*\.)?70678\.com
+https?:\/\/([^\/]*\.)?7171\.blogshot\.nl
+https?:\/\/([^\/]*\.)?72\.net\.cn
+https?:\/\/([^\/]*\.)?77zhong\.com
+https?:\/\/([^\/]*\.)?78\.net\.cn
+https?:\/\/([^\/]*\.)?79179\.com
+https?:\/\/([^\/]*\.)?7982257596\.blogspot\.com
+https?:\/\/([^\/]*\.)?7dftw79\.nokedem\.com
+https?:\/\/([^\/]*\.)?7j5lj\.info
+https?:\/\/([^\/]*\.)?7shg-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?7x7\.ruwe\.net
+https?:\/\/([^\/]*\.)?8-teenies\.freeinsite\.net
+https?:\/\/([^\/]*\.)?80880\.com
+https?:\/\/([^\/]*\.)?8224\.net
+https?:\/\/([^\/]*\.)?86wys\.com
+https?:\/\/([^\/]*\.)?87793798\.cn
+https?:\/\/([^\/]*\.)?888\.web\.com
+https?:\/\/([^\/]*\.)?88by88-ax4nzu\.blogspot\.com
+https?:\/\/([^\/]*\.)?88by88-com-hx06a\.blogspot\.com
+https?:\/\/([^\/]*\.)?88by88-com-nekuk\.blogspot\.com
+https?:\/\/([^\/]*\.)?88tm\.com
+https?:\/\/([^\/]*\.)?8pcg-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?8teenfiles-com-dzlvk\.blogspot\.com
+https?:\/\/([^\/]*\.)?8teenfiles-com-mj6\.blogspot\.com
+https?:\/\/([^\/]*\.)?8teenfiles-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?8thstreetlatinas-com-rw48o84iwl\.blogspot\.com
+https?:\/\/([^\/]*\.)?8vwx-adult-sites\.blogspot\.com
+https?:\/\/([^\/]*\.)?90001\.cn
+https?:\/\/([^\/]*\.)?911\.x24hr\.com
+https?:\/\/([^\/]*\.)?911w\.net
+https?:\/\/([^\/]*\.)?91yg\.com
+https?:\/\/([^\/]*\.)?96china\.com
+https?:\/\/([^\/]*\.)?96china\.net
+https?:\/\/([^\/]*\.)?96d2\.com
+https?:\/\/([^\/]*\.)?98-boot-disk-japanese-window\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?99aids\.com
+https?:\/\/([^\/]*\.)?a-blonde-babe-in-bikini\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?a-milf-video-preview\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?a-onedigitizing\.com
+https?:\/\/([^\/]*\.)?a-oneemb\.com
+https?:\/\/([^\/]*\.)?a-phentermine\.us
+https?:\/\/([^\/]*\.)?a-poker-casino\.com
+https?:\/\/([^\/]*\.)?a-porn-sex-adult-xxx\.com
+https?:\/\/([^\/]*\.)?aaeon\.com\.cn
+https?:\/\/([^\/]*\.)?aalita\.com
+https?:\/\/([^\/]*\.)?aalive\.info
+https?:\/\/([^\/]*\.)?aalop\.info
+https?:\/\/([^\/]*\.)?aamjh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?aaqqywh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ababd1\.com
+https?:\/\/([^\/]*\.)?abasti\.com
+https?:\/\/([^\/]*\.)?abbama\.com
+https?:\/\/([^\/]*\.)?abbc\.edu
+https?:\/\/([^\/]*\.)?abbleg4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?abca\.biz
+https?:\/\/([^\/]*\.)?abcink\.com
+https?:\/\/([^\/]*\.)?abijah\.phpbbx\.de
+https?:\/\/([^\/]*\.)?abijah\.romandie\.com
+https?:\/\/([^\/]*\.)?abito-da-sera\.bb22\.info
+https?:\/\/([^\/]*\.)?about-money-world\.com
+https?:\/\/([^\/]*\.)?aboutinfotech\.com
+https?:\/\/([^\/]*\.)?aboutmitsubishiparts\.cn
+https?:\/\/([^\/]*\.)?abriana\.phpbbx\.de
+https?:\/\/([^\/]*\.)?abrianna\.romandie\.com
+https?:\/\/([^\/]*\.)?absolutely-free-porn-clip-blogyvg\.blogspot\.com
+https?:\/\/([^\/]*\.)?absolutely-free-porn-clip-zone28k\.blogspot\.com
+https?:\/\/([^\/]*\.)?aburri\.com
+https?:\/\/([^\/]*\.)?academics\.smcvt\.edu
+https?:\/\/([^\/]*\.)?acantorr\.forumzen\.com
+https?:\/\/([^\/]*\.)?accounting-degree\.hotmail\.ru
+https?:\/\/([^\/]*\.)?accounting1degre\.chat\.ru
+https?:\/\/([^\/]*\.)?accredited-degre\.hotmail\.ru
+https?:\/\/([^\/]*\.)?accredited1degre\.chat\.ru
+https?:\/\/([^\/]*\.)?accredited2degre\.chat\.ru
+https?:\/\/([^\/]*\.)?acelacacel\.dl\.pl
+https?:\/\/([^\/]*\.)?acelalacel\.blogcu\.com
+https?:\/\/([^\/]*\.)?acelcocna\.lolbb\.com
+https?:\/\/([^\/]*\.)?aceldron\.lightbb\.com
+https?:\/\/([^\/]*\.)?acelgetric\.dl\.pl
+https?:\/\/([^\/]*\.)?acellibo\.dl\.pl
+https?:\/\/([^\/]*\.)?acellitroc\.xa\.pl
+https?:\/\/([^\/]*\.)?acelracer\.graphforum\.com
+https?:\/\/([^\/]*\.)?acelrel\.discutforum\.com
+https?:\/\/([^\/]*\.)?acgetvar\.iphorum\.com
+https?:\/\/([^\/]*\.)?achima\.phpbbx\.de
+https?:\/\/([^\/]*\.)?achima\.romandie\.com
+https?:\/\/([^\/]*\.)?achutsit\.forumzen\.com
+https?:\/\/([^\/]*\.)?acima\.phpbbx\.de
+https?:\/\/([^\/]*\.)?acima\.romandie\.com
+https?:\/\/([^\/]*\.)?acimah\.romandie\.com
+https?:\/\/([^\/]*\.)?aciphexbuy\.chip\.ms
+https?:\/\/([^\/]*\.)?aciphexcheap\.mysite\.de
+https?:\/\/([^\/]*\.)?aciphexcheapbuy\.cut\.by
+https?:\/\/([^\/]*\.)?aciphexgeneric\.redirect\.to
+https?:\/\/([^\/]*\.)?aciphexgenericbuy\.dive\.to
+https?:\/\/([^\/]*\.)?aclyulac\.forumzen\.com
+https?:\/\/([^\/]*\.)?acme-arts\.com
+https?:\/\/([^\/]*\.)?acmonno\.zikforum\.com
+https?:\/\/([^\/]*\.)?acne-medicinebco\.blogspot\.com
+https?:\/\/([^\/]*\.)?acololi\.winnerforum\.net
+https?:\/\/([^\/]*\.)?acouc\.zj\.pl
+https?:\/\/([^\/]*\.)?acrolrel\.blogcu\.com
+https?:\/\/([^\/]*\.)?acscuace\.forumzen\.com
+https?:\/\/([^\/]*\.)?actingland\.com
+https?:\/\/([^\/]*\.)?action-in-lesbian-lover\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?action36-kx8\.blogspot\.com
+https?:\/\/([^\/]*\.)?actonelbuy\.drop\.to
+https?:\/\/([^\/]*\.)?actonelcheap\.notrix\.ch
+https?:\/\/([^\/]*\.)?actonelcheapgeneric\.fanclub\.ms
+https?:\/\/([^\/]*\.)?actonelgeneric\.drop\.to
+https?:\/\/([^\/]*\.)?actonelonline\.drive\.to
+https?:\/\/([^\/]*\.)?acurahost\.cn
+https?:\/\/([^\/]*\.)?acuratrades\.cn
+https?:\/\/([^\/]*\.)?acxza\.szm\.sk
+https?:\/\/([^\/]*\.)?acyclovir\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ad0571\.com
+https?:\/\/([^\/]*\.)?adapturl\.com
+https?:\/\/([^\/]*\.)?adault\.adultserv\.info
+https?:\/\/([^\/]*\.)?adds1\.trafflow\.com
+https?:\/\/([^\/]*\.)?adipex-08pr\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipex-911\.coz\.in
+https?:\/\/([^\/]*\.)?adipex-buyvie\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipex-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipex-phenterminepwf\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipex-wiki\.com
+https?:\/\/([^\/]*\.)?adipex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?adipex\.edu\.tf
+https?:\/\/([^\/]*\.)?adipex\.edublogs\.org
+https?:\/\/([^\/]*\.)?adipex\.health-livening\.com
+https?:\/\/([^\/]*\.)?adipexes\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipexwoq\.blogspot\.com
+https?:\/\/([^\/]*\.)?adipexxdt\.blogspot\.com
+https?:\/\/([^\/]*\.)?adira\.phpbbx\.de
+https?:\/\/([^\/]*\.)?adira\.romandie\.com
+https?:\/\/([^\/]*\.)?adrienneee\.ifrance\.com
+https?:\/\/([^\/]*\.)?adrienneee\.xhostar\.com
+https?:\/\/([^\/]*\.)?adsenseready\.com
+https?:\/\/([^\/]*\.)?adult-clips-com-guqiax1tu\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult-clips-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult-dating-free\.sexnation\.info
+https?:\/\/([^\/]*\.)?adult-dating\.sexnation\.info
+https?:\/\/([^\/]*\.)?adult-free-fucking-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?adult-free-granny-video\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?adult-fx\.info
+https?:\/\/([^\/]*\.)?adult-list-com-wqf4ojq2uk\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult-list-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult-personals\.sexnation\.info
+https?:\/\/([^\/]*\.)?adult-porn-clip-info887\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult-sites-review\.beaffaired\.com
+https?:\/\/([^\/]*\.)?adult\.1foleks\.org
+https?:\/\/([^\/]*\.)?adult1clip\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult1movies\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult1video\.blogspot\.com
+https?:\/\/([^\/]*\.)?adult69club\.tripod\.com
+https?:\/\/([^\/]*\.)?adultbuffet-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?adultpersonalsxgj\.blogspot\.com
+https?:\/\/([^\/]*\.)?adultpersonalz\.net
+https?:\/\/([^\/]*\.)?adultsexvideo\.blogspot\.com
+https?:\/\/([^\/]*\.)?adultsitefind\.info
+https?:\/\/([^\/]*\.)?adultsiteshop\.info
+https?:\/\/([^\/]*\.)?adultsss\.cafe150\.com
+https?:\/\/([^\/]*\.)?adultsss\.freehostia\.com
+https?:\/\/([^\/]*\.)?adust\.my10gb\.com
+https?:\/\/([^\/]*\.)?advanceloanfast\.info
+https?:\/\/([^\/]*\.)?adventure-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?advice-kissing\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?adviser-financial-friendly-gay\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?adviser\.8888mb\.com
+https?:\/\/([^\/]*\.)?adwareremoval\.myinfo\.ws
+https?:\/\/([^\/]*\.)?ae\.siam\.edu
+https?:\/\/([^\/]*\.)?aebn-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?aezat\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?afdtf\.szm\.sk
+https?:\/\/([^\/]*\.)?affishe\.hostcroc\.com
+https?:\/\/([^\/]*\.)?affishe\.webmelia\.com
+https?:\/\/([^\/]*\.)?afraima\.phpbbx\.de
+https?:\/\/([^\/]*\.)?african-american-lesbian-personals\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?africanvagina-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?aftworld\.com
+https?:\/\/([^\/]*\.)?afxbmx\.info
+https?:\/\/([^\/]*\.)?agbht\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?agclore\.dl\.pl
+https?:\/\/([^\/]*\.)?agcw-com-cme2qnyzyt\.blogspot\.com
+https?:\/\/([^\/]*\.)?agcw-com-r10opb\.blogspot\.com
+https?:\/\/([^\/]*\.)?agcw-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?agentlovelette\.250free\.com
+https?:\/\/([^\/]*\.)?aghas\.info
+https?:\/\/([^\/]*\.)?agmy3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?agrrjd4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?agylavu\.org
+https?:\/\/([^\/]*\.)?ah-me-com-af7ipw\.blogspot\.com
+https?:\/\/([^\/]*\.)?ah-me-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?ah-me-t7o\.blogspot\.com
+https?:\/\/([^\/]*\.)?ahava\.phpbbx\.de
+https?:\/\/([^\/]*\.)?ahuva\.phpbbx\.de
+https?:\/\/([^\/]*\.)?aidlov\.com
+https?:\/\/([^\/]*\.)?aids-china\.com
+https?:\/\/([^\/]*\.)?aids\.ik8\.com
+https?:\/\/([^\/]*\.)?aids1\.zj\.com
+https?:\/\/([^\/]*\.)?aids333\.net
+https?:\/\/([^\/]*\.)?aikn3\.szm\.sk
+https?:\/\/([^\/]*\.)?air520\.com
+https?:\/\/([^\/]*\.)?airfarelowest\.net
+https?:\/\/([^\/]*\.)?airline-ticket-now\.com
+https?:\/\/([^\/]*\.)?airline-ticket\.globaltr\.info
+https?:\/\/([^\/]*\.)?ajneuas\.com
+https?:\/\/([^\/]*\.)?akbxb\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?akissbetweenthelegs-com-hesel\.blogspot\.com
+https?:\/\/([^\/]*\.)?akissbetweenthelegs-com-tsawya560\.blogspot\.com
+https?:\/\/([^\/]*\.)?akissbetweenthelegs-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?al-femminile\.freespase\.info
+https?:\/\/([^\/]*\.)?al4a-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?alabamamortgage-x\.com
+https?:\/\/([^\/]*\.)?alalal\.myrealboard\.com
+https?:\/\/([^\/]*\.)?alaldalli\.naturalforum\.net
+https?:\/\/([^\/]*\.)?alanthomashairsalon\.com
+https?:\/\/([^\/]*\.)?alarcit\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?alaskamortgage-x\.com
+https?:\/\/([^\/]*\.)?alba-boob-jessica-slip\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?albergo-economici-rimini\.ll33\.info
+https?:\/\/([^\/]*\.)?albergo-parigi\.freespase\.info
+https?:\/\/([^\/]*\.)?albums-proshots\.com
+https?:\/\/([^\/]*\.)?alchita\.goodforum\.net
+https?:\/\/([^\/]*\.)?alchita\.grafbb\.com
+https?:\/\/([^\/]*\.)?aldabridgeman\.site\.io
+https?:\/\/([^\/]*\.)?aldarta\.discutforum\.com
+https?:\/\/([^\/]*\.)?aldomc\.jc\.pl
+https?:\/\/([^\/]*\.)?aldronboc\.lightbb\.com
+https?:\/\/([^\/]*\.)?aleluja\.asp2\.cz
+https?:\/\/([^\/]*\.)?alerou\.su\.pl
+https?:\/\/([^\/]*\.)?aleteta\.com
+https?:\/\/([^\/]*\.)?alexaner\.etowns\.net
+https?:\/\/([^\/]*\.)?alexmovies-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?alhilalb\.forumzen\.com
+https?:\/\/([^\/]*\.)?alias\.asp2\.cz
+https?:\/\/([^\/]*\.)?aliyah\.phpbbx\.de
+https?:\/\/([^\/]*\.)?aliza\.phpbbx\.de
+https?:\/\/([^\/]*\.)?all-rnb\.com
+https?:\/\/([^\/]*\.)?all4sexonline\.biz
+https?:\/\/([^\/]*\.)?allabout-casino\.com
+https?:\/\/([^\/]*\.)?allabout-poker\.com
+https?:\/\/([^\/]*\.)?allabout-poker\.net
+https?:\/\/([^\/]*\.)?allabout\.onplex\.de
+https?:\/\/([^\/]*\.)?allaboutx\.freeasyhost\.com
+https?:\/\/([^\/]*\.)?allaboutx\.hostingclub\.de
+https?:\/\/([^\/]*\.)?allaboutx\.m5t\.de
+https?:\/\/([^\/]*\.)?allall\.org
+https?:\/\/([^\/]*\.)?allcamsguide\.info
+https?:\/\/([^\/]*\.)?allcars\.digitalzones\.com
+https?:\/\/([^\/]*\.)?allcheapchat\.info
+https?:\/\/([^\/]*\.)?alldep\.com
+https?:\/\/([^\/]*\.)?allearjah\.com
+https?:\/\/([^\/]*\.)?alledasar\.com
+https?:\/\/([^\/]*\.)?allegra\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?allegradgeneric\.sblog\.cz
+https?:\/\/([^\/]*\.)?allen-edmonds-shoes\.info
+https?:\/\/([^\/]*\.)?allergy\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?allforsale\.org
+https?:\/\/([^\/]*\.)?allgoods\.be
+https?:\/\/([^\/]*\.)?allkinds-pills\.com
+https?:\/\/([^\/]*\.)?allkoholik\.php5\.cz
+https?:\/\/([^\/]*\.)?alllb\.com
+https?:\/\/([^\/]*\.)?alllf\.com
+https?:\/\/([^\/]*\.)?alllk\.com
+https?:\/\/([^\/]*\.)?alllm\.com
+https?:\/\/([^\/]*\.)?allln\.com
+https?:\/\/([^\/]*\.)?alllp\.com
+https?:\/\/([^\/]*\.)?allnewfilm\.com
+https?:\/\/([^\/]*\.)?allprintposters\.com
+https?:\/\/([^\/]*\.)?allsitesaccess-com-awfxbo7d\.blogspot\.com
+https?:\/\/([^\/]*\.)?alltel-ringtonedyd\.blogspot\.com
+https?:\/\/([^\/]*\.)?allvids-net-k0bdg\.blogspot\.com
+https?:\/\/([^\/]*\.)?allvids-net-kd0pe5\.blogspot\.com
+https?:\/\/([^\/]*\.)?allweb2006\.info
+https?:\/\/([^\/]*\.)?almgarc\.com
+https?:\/\/([^\/]*\.)?alneja\.goodbb\.net
+https?:\/\/([^\/]*\.)?alnm5\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?alona\.phpbbx\.de
+https?:\/\/([^\/]*\.)?alonso\.stabilt\.se
+https?:\/\/([^\/]*\.)?alphabadgirls\.info
+https?:\/\/([^\/]*\.)?alprazolam-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?alprazolam-xanax\.com
+https?:\/\/([^\/]*\.)?alpy01\.republika\.pl
+https?:\/\/([^\/]*\.)?alracmon\.zikforum\.com
+https?:\/\/([^\/]*\.)?altacebuy\.page\.to
+https?:\/\/([^\/]*\.)?altacebuycheap\.gameday\.de
+https?:\/\/([^\/]*\.)?altacebuygeneric\.cut\.by
+https?:\/\/([^\/]*\.)?altacegeneric\.dive\.to
+https?:\/\/([^\/]*\.)?altacegenericcheap\.notrix\.at
+https?:\/\/([^\/]*\.)?altazel\.blogcu\.com
+https?:\/\/([^\/]*\.)?altrocvi\.jc\.pl
+https?:\/\/([^\/]*\.)?altse\.com
+https?:\/\/([^\/]*\.)?always-credit\.com
+https?:\/\/([^\/]*\.)?always-drugs\.com
+https?:\/\/([^\/]*\.)?always-medications\.com
+https?:\/\/([^\/]*\.)?alyssa-teen\.freeinsite\.net
+https?:\/\/([^\/]*\.)?amal-fucking-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-ass-free-gallery\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-atk-hairy-heather-natural\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-black-naked\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-blonde-cock\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-boob-bouncing\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-contacto-sexo\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-cum-queen\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-foto-free-nude\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-free-erotic\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-free-grannie-picture-xxx\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-free-indian-page-sex\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?amateur-free-man-naked\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-free-sex-xxx\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?amateur-fucking-milf\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-fucking-public\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-hard-com-a4w\.blogspot\.com
+https?:\/\/([^\/]*\.)?amateur-home-photo\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-index-nude\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-interracial-porn\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-man-naked\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-model-for-hire\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-nympho-wife-site\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-pages-porn\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?amateur-porn-clip-blog446\.blogspot\.com
+https?:\/\/([^\/]*\.)?amateur-porn-clip-blogqh1\.blogspot\.com
+https?:\/\/([^\/]*\.)?amateur-porn-clip-blogrv6\.blogspot\.com
+https?:\/\/([^\/]*\.)?amateur-porn-xxx\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-pussy-redhead\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?amateur-teen-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?amateur-teen-sex-movie\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?amateurcurves-com-silib\.blogspot\.com
+https?:\/\/([^\/]*\.)?amateurcurves-com-t7zh3\.blogspot\.com
+https?:\/\/([^\/]*\.)?amazingcum-com-bd7uu0\.blogspot\.com
+https?:\/\/([^\/]*\.)?ambien-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?ambien\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ambien\.conto\.pl
+https?:\/\/([^\/]*\.)?ambien\.esguay\.com
+https?:\/\/([^\/]*\.)?ambien\.fws1\.com
+https?:\/\/([^\/]*\.)?ambien\.goodpharm\.info
+https?:\/\/([^\/]*\.)?ambien\.hav\.pl
+https?:\/\/([^\/]*\.)?ambien\.presteert\.nl
+https?:\/\/([^\/]*\.)?ambien\.skocz\.net
+https?:\/\/([^\/]*\.)?ambiena\.myblogvoice\.com
+https?:\/\/([^\/]*\.)?ambienpills\.coz\.in
+https?:\/\/([^\/]*\.)?ambienrx\.weboficial\.com
+https?:\/\/([^\/]*\.)?ambiens\.ru\.tf
+https?:\/\/([^\/]*\.)?amcq8\.szm\.sk
+https?:\/\/([^\/]*\.)?amenities\.8tt\.org
+https?:\/\/([^\/]*\.)?americansrebuildingneworleans\.com
+https?:\/\/([^\/]*\.)?amicizia-incontri\.bb22\.info
+https?:\/\/([^\/]*\.)?amico-maria\.freespase\.info
+https?:\/\/([^\/]*\.)?amidnitesunset\.blogspot\.com
+https?:\/\/([^\/]*\.)?amino-vera\.blogspot\.com
+https?:\/\/([^\/]*\.)?amira\.phpbbx\.de
+https?:\/\/([^\/]*\.)?amjrs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?amoxil-500mg\.micrositehosting\.info
+https?:\/\/([^\/]*\.)?ampposo\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?amstre\.com
+https?:\/\/([^\/]*\.)?amyhunt\.com
+https?:\/\/([^\/]*\.)?amyjkb\.blogspot\.com
+https?:\/\/([^\/]*\.)?anacondasex\.info
+https?:\/\/([^\/]*\.)?anal-bareback-cum-fucking-shot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?anal-coks-fuck-huge-mega\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?anal-cum-farting\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?anal-cum-fuck\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?anal-dildo-bondage\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-ebony-free-pic\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-ebony-fucking\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-first-pic-time\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-first-time\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-free-mature-sex\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?anal-g\.com
+https?:\/\/([^\/]*\.)?anal-gang-bang-xxx\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-hard-male\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-hardcore-max-sex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?anal-painful-virgin\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?anal-self-penetration\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?anal-sex-teen-tgp\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?anal-sex-video-x-g-g\.blogspot\.com
+https?:\/\/([^\/]*\.)?anal-sex-virgin\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?anal-shemale-site\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?analsexeum\.blogspot\.com
+https?:\/\/([^\/]*\.)?anath\.phpbbx\.de
+https?:\/\/([^\/]*\.)?anbipbm\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?andrewsaluk\.com
+https?:\/\/([^\/]*\.)?andy-roddick-dick\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?angelcakez\.blogspot\.com
+https?:\/\/([^\/]*\.)?angry-sister\.blogspot\.com
+https?:\/\/([^\/]*\.)?anicke\.republika\.pl
+https?:\/\/([^\/]*\.)?anime-art-gay\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?anime-free-hardcore-info-remember\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?anime-porn-clip-blog5a7\.blogspot\.com
+https?:\/\/([^\/]*\.)?ann-angel-tpi\.blogspot\.com
+https?:\/\/([^\/]*\.)?anna-morgan\.blogspot\.com
+https?:\/\/([^\/]*\.)?annqy\.szm\.sk
+https?:\/\/([^\/]*\.)?annugel--h\.blogspot\.com
+https?:\/\/([^\/]*\.)?annuncio-lavoro-milano\.host24h\.info
+https?:\/\/([^\/]*\.)?annuncio-lavoro-segretaria\.freehostss\.info
+https?:\/\/([^\/]*\.)?annuncio-online\.heroez\.info
+https?:\/\/([^\/]*\.)?anteyi\.cn
+https?:\/\/([^\/]*\.)?anthemboy8\.blogspot\.com
+https?:\/\/([^\/]*\.)?anti-aging-skin\.hotmail\.ru
+https?:\/\/([^\/]*\.)?anti_agin_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?anti_aging_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?antidepressants\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?anus-lick-right-way\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?anw66\.blogspot\.com
+https?:\/\/([^\/]*\.)?anxiety\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?anylight4u\.com
+https?:\/\/([^\/]*\.)?aosk\.com
+https?:\/\/([^\/]*\.)?apesapoppin\.blogspot\.com
+https?:\/\/([^\/]*\.)?apextwin\.ifrance\.com
+https?:\/\/([^\/]*\.)?apextwin\.php5\.cz
+https?:\/\/([^\/]*\.)?aponte\.net
+https?:\/\/([^\/]*\.)?appartamento-roma-vacanza\.ll11\.info
+https?:\/\/([^\/]*\.)?applyforit\.ucsd\.edu
+https?:\/\/([^\/]*\.)?apxgmlp\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?arbundar\.forumzen\.com
+https?:\/\/([^\/]*\.)?arcade\.ya\.com
+https?:\/\/([^\/]*\.)?areaseo\.com
+https?:\/\/([^\/]*\.)?arent-boot-made-these-walkin\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?argentina-gay-travel\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ariella\.phpbbx\.de
+https?:\/\/([^\/]*\.)?arielle\.phpbbx\.de
+https?:\/\/([^\/]*\.)?arinastes\.com
+https?:\/\/([^\/]*\.)?aristocort\.4\.pl
+https?:\/\/([^\/]*\.)?arizonamortgage-x\.com
+https?:\/\/([^\/]*\.)?arjj2\.szm\.sk
+https?:\/\/([^\/]*\.)?arketon24\.blogspot\.com
+https?:\/\/([^\/]*\.)?armyanch\.galeon\.com
+https?:\/\/([^\/]*\.)?arosson\.com
+https?:\/\/([^\/]*\.)?arsrz\.szm\.sk
+https?:\/\/([^\/]*\.)?art-xxx\.com
+https?:\/\/([^\/]*\.)?artbennett\.net
+https?:\/\/([^\/]*\.)?arthuriacasino\.com
+https?:\/\/([^\/]*\.)?artnposter\.com
+https?:\/\/([^\/]*\.)?arwuudes\.forumzen\.com
+https?:\/\/([^\/]*\.)?arwuuzet\.forumzen\.com
+https?:\/\/([^\/]*\.)?aryls\.info
+https?:\/\/([^\/]*\.)?asaearh\.blogspot\.com
+https?:\/\/([^\/]*\.)?asaia\.blogspot\.com
+https?:\/\/([^\/]*\.)?asas3\.com
+https?:\/\/([^\/]*\.)?ascht\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?asdiaalr\.forumzen\.com
+https?:\/\/([^\/]*\.)?aselfbas\.forumzen\.com
+https?:\/\/([^\/]*\.)?asfreyl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ashkenazi\.phpbbx\.de
+https?:\/\/([^\/]*\.)?ashlee--serena\.freeinsite\.net
+https?:\/\/([^\/]*\.)?ashlee-clip-free-hand-job\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?asian-bang-gang\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?asian-cum-sucker\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?asian-download-free-porn-video\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?asian-facial\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?asian-fucking-man-woman\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?asian-girl-anal\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?asian-giving-blow-job\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?asian-mmf\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?asian-porn-clip-info6g5\.blogspot\.com
+https?:\/\/([^\/]*\.)?asian-pussysjy\.blogspot\.com
+https?:\/\/([^\/]*\.)?asian-spread-leg\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?asian-teens\.freeinsite\.net
+https?:\/\/([^\/]*\.)?asiansexpvx\.blogspot\.com
+https?:\/\/([^\/]*\.)?asjnquaq\.com
+https?:\/\/([^\/]*\.)?asnmeq\.com
+https?:\/\/([^\/]*\.)?asrendes\.forumzen\.com
+https?:\/\/([^\/]*\.)?asricrac\.forumzen\.com
+https?:\/\/([^\/]*\.)?ass-bare-screensaver-sexy\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?ass-big-black-pussy\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ass-big-free-woman\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?ass-bitch-hot\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?ass-cock-large-nice-tit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?ass-cum-gay-hole\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ass-cute-fat\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ass-day-great-its-somebodys-whop\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ass-dildo-in-man-use\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ass-free-huge-movie-phat-tit\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?ass-free-mature-photo\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?ass-free-naked\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?ass-fucked-porn-star\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ass-hit-up-yo\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?ass-hole-test\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?ass-lick-slut-that\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?ass-man-photo-rumprater-com-woman\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ass-naked-pic-woman-young\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?ass-sa\.com
+https?:\/\/([^\/]*\.)?ass-traffic-thumb\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?assfilled-cofon\.blogspot\.com
+https?:\/\/([^\/]*\.)?assfucking-video\.hereandnow0\.com
+https?:\/\/([^\/]*\.)?assicurazione-moto\.freehostss\.info
+https?:\/\/([^\/]*\.)?asslick-free\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?associate1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?assparade-com-cdr6rm3\.blogspot\.com
+https?:\/\/([^\/]*\.)?astmiv\.com
+https?:\/\/([^\/]*\.)?astsam\.com
+https?:\/\/([^\/]*\.)?aswsu-ddp\.wsu\.edu
+https?:\/\/([^\/]*\.)?atar5\.szm\.sk
+https?:\/\/([^\/]*\.)?atashi-tada\.blogspot\.com
+https?:\/\/([^\/]*\.)?atchina\.com\.cn
+https?:\/\/([^\/]*\.)?atenololhqs\.blogspot\.com
+https?:\/\/([^\/]*\.)?atetech\.com\.cn
+https?:\/\/([^\/]*\.)?athenaindia\.com
+https?:\/\/([^\/]*\.)?ativan\.hav\.pl
+https?:\/\/([^\/]*\.)?ativan1\.skocz\.net
+https?:\/\/([^\/]*\.)?ativans\.eu\.tf
+https?:\/\/([^\/]*\.)?atkmodels-com-g2mc2j\.blogspot\.com
+https?:\/\/([^\/]*\.)?atkmodels-h6\.blogspot\.com
+https?:\/\/([^\/]*\.)?atmoc\.com
+https?:\/\/([^\/]*\.)?atrapy\.pl
+https?:\/\/([^\/]*\.)?auabkc3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?audibookclub\.info
+https?:\/\/([^\/]*\.)?audition-mature-sexy-video-woman\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?audx4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?auejds\.com
+https?:\/\/([^\/]*\.)?aufx8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?augmentin\.4\.pl
+https?:\/\/([^\/]*\.)?augmentinbuy\.megapage\.de
+https?:\/\/([^\/]*\.)?augmentinbuygeneric\.playsite\.de
+https?:\/\/([^\/]*\.)?augmentincheapbuy\.mine\.at
+https?:\/\/([^\/]*\.)?augmentincheapgeneric\.vacations\.to
+https?:\/\/([^\/]*\.)?augmentingeneric\.dive\.to
+https?:\/\/([^\/]*\.)?aumkryl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?auntmia-ivmo1ckhbf\.blogspot\.com
+https?:\/\/([^\/]*\.)?auqkz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?aurar\.info
+https?:\/\/([^\/]*\.)?aurney\.blogspot\.com
+https?:\/\/([^\/]*\.)?aurora-snow-double-anal\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?auto-insurance-2007\.com
+https?:\/\/([^\/]*\.)?auto-insurance-quote\.100freemb\.com
+https?:\/\/([^\/]*\.)?auto-occasioni\.bb22\.info
+https?:\/\/([^\/]*\.)?autoere\.info
+https?:\/\/([^\/]*\.)?autoinsurancevyo\.blogspot\.com
+https?:\/\/([^\/]*\.)?automobileliberty\.cn
+https?:\/\/([^\/]*\.)?ava-devine-friend-hot-mom\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?avalonhyip\.com
+https?:\/\/([^\/]*\.)?avenue-x\.cn
+https?:\/\/([^\/]*\.)?avoidcar\.info
+https?:\/\/([^\/]*\.)?awardspace\.biz
+https?:\/\/([^\/]*\.)?awardspace\.info
+https?:\/\/([^\/]*\.)?awerda\.com
+https?:\/\/([^\/]*\.)?aweu\.cabspace\.com
+https?:\/\/([^\/]*\.)?axfa5\.szm\.sk
+https?:\/\/([^\/]*\.)?axnc0\.szm\.sk
+https?:\/\/([^\/]*\.)?axqui\.szm\.sk
+https?:\/\/([^\/]*\.)?axtu7\.szm\.sk
+https?:\/\/([^\/]*\.)?ayann\.dl\.pl
+https?:\/\/([^\/]*\.)?aynippa\.blogspot\.com
+https?:\/\/([^\/]*\.)?azn-chickadee\.blogspot\.com
+https?:\/\/([^\/]*\.)?azu-erlove\.blogspot\.com
+https?:\/\/([^\/]*\.)?azur3skye\.blogspot\.com
+https?:\/\/([^\/]*\.)?azzacash\.com
+https?:\/\/([^\/]*\.)?b-b-free-hentai-movie-j\.blogspot\.com
+https?:\/\/([^\/]*\.)?b-d-download-porn-movie-n\.blogspot\.com
+https?:\/\/([^\/]*\.)?b\.cn01\.hn\.org
+https?:\/\/([^\/]*\.)?babe-cam-filipina-web\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?babe-dutch-erotic-lingerie\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?babe-forum-picture-porn-star\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?babe-hot-mature\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?babesglamour-com-jotut\.blogspot\.com
+https?:\/\/([^\/]*\.)?babesglamour-com-mp21gz\.blogspot\.com
+https?:\/\/([^\/]*\.)?babibian\.dl\.pl
+https?:\/\/([^\/]*\.)?babooth\.ifrance\.com
+https?:\/\/([^\/]*\.)?babyhere\.net
+https?:\/\/([^\/]*\.)?bachelor1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?back-bare-cum-dripping-fucked-humiliated-pussy-wealthy-woman\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?backroom-facial-margarita\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bad-butt-byron-rub\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bad-butt-byrons-rub\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?bad-credit-home-loanksl\.blogspot\.com
+https?:\/\/([^\/]*\.)?badassteens-com-gnvrh6\.blogspot\.com
+https?:\/\/([^\/]*\.)?badassteens-com-gyhb23dyw\.blogspot\.com
+https?:\/\/([^\/]*\.)?badgirlsblog-com-dcfmx8n2p\.blogspot\.com
+https?:\/\/([^\/]*\.)?badipex\.gog\.pl
+https?:\/\/([^\/]*\.)?bahatoca\.org
+https?:\/\/([^\/]*\.)?baikal-guide\.com
+https?:\/\/([^\/]*\.)?baikal-hotel\.info
+https?:\/\/([^\/]*\.)?baikal-shop\.com
+https?:\/\/([^\/]*\.)?baikal-tour\.biz
+https?:\/\/([^\/]*\.)?baikalguide\.com
+https?:\/\/([^\/]*\.)?baikalshop\.info
+https?:\/\/([^\/]*\.)?bakadeshi\.ifrance\.com
+https?:\/\/([^\/]*\.)?bakamandy\.blogspot\.com
+https?:\/\/([^\/]*\.)?bambulka\.info
+https?:\/\/([^\/]*\.)?bamigreenhouse\.com\.cn
+https?:\/\/([^\/]*\.)?bamima\.com
+https?:\/\/([^\/]*\.)?bandaoti\.dzsc\.com
+https?:\/\/([^\/]*\.)?bang-clip-gang-gang-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?bang-gallery-gang-mature-woman\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?bang-gang-sex-tokyo\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?bank-of-america-credit-cardtja\.blogspot\.com
+https?:\/\/([^\/]*\.)?bank-of-fetish-resource\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?banns\.info
+https?:\/\/([^\/]*\.)?baqaek9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?baquma\.com
+https?:\/\/([^\/]*\.)?bareback-fuck-gay\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?barefootmaniacs-com-rpw1i1\.blogspot\.com
+https?:\/\/([^\/]*\.)?barely18-teens-com-sin\.blogspot\.com
+https?:\/\/([^\/]*\.)?barrystickets\.com
+https?:\/\/([^\/]*\.)?bartik\.asp2\.cz
+https?:\/\/([^\/]*\.)?barulena\.jconserv\.net
+https?:\/\/([^\/]*\.)?basalvar\.dl\.pl
+https?:\/\/([^\/]*\.)?basdeler\.su\.pl
+https?:\/\/([^\/]*\.)?basdombo\.dl\.pl
+https?:\/\/([^\/]*\.)?baslachi\.lightbb\.com
+https?:\/\/([^\/]*\.)?baslalhi\.myrealboard\.com
+https?:\/\/([^\/]*\.)?baslarol\.dl\.pl
+https?:\/\/([^\/]*\.)?basmonzel\.dl\.pl
+https?:\/\/([^\/]*\.)?baspaser\.zikforum\.com
+https?:\/\/([^\/]*\.)?baspasrac\.dl\.pl
+https?:\/\/([^\/]*\.)?baspasvi\.cultureforum\.net
+https?:\/\/([^\/]*\.)?basracchi\.dl\.pl
+https?:\/\/([^\/]*\.)?basteg\.com
+https?:\/\/([^\/]*\.)?bastim\.com
+https?:\/\/([^\/]*\.)?bastnecli\.frbb\.net
+https?:\/\/([^\/]*\.)?bastre\.com
+https?:\/\/([^\/]*\.)?bastru\.com
+https?:\/\/([^\/]*\.)?basuma\.com
+https?:\/\/([^\/]*\.)?bath-hardcore-teen\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bath-product\.hotmail\.ru
+https?:\/\/([^\/]*\.)?bath-product\.pochta\.ru
+https?:\/\/([^\/]*\.)?bath_product\.chat\.ru
+https?:\/\/([^\/]*\.)?bathroom-fuck\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?bbcialis\.ovp\.pl
+https?:\/\/([^\/]*\.)?bbfast\.com
+https?:\/\/([^\/]*\.)?bbndsxtg-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?bbs\.cuesta\.edu
+https?:\/\/([^\/]*\.)?bbsporn\.com
+https?:\/\/([^\/]*\.)?bbuybaliumonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?bbuycialisonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?bbuylevitraonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?bbuytram\.blogcu\.com
+https?:\/\/([^\/]*\.)?bbuytramadolonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?bbuyviagraonlin\.forumlivre\.com
+https?:\/\/([^\/]*\.)?bbw-busty\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?bbw-club-in-san-diego\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bbw-old\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bbw-porn-clip-infotir\.blogspot\.com
+https?:\/\/([^\/]*\.)?bcam8\.szm\.sk
+https?:\/\/([^\/]*\.)?bcdh\.cn
+https?:\/\/([^\/]*\.)?bcialis\.c24\.pl
+https?:\/\/([^\/]*\.)?bcxz8\.szm\.sk
+https?:\/\/([^\/]*\.)?bdsm-lesbian-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?bdsm-personals-houston\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?bdsm-toy\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bdsm-video\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bdsm-vintage\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?bdsmvideos-net-wb55nc\.blogspot\.com
+https?:\/\/([^\/]*\.)?bdsmvideos-net-wfa5qu\.blogspot\.com
+https?:\/\/([^\/]*\.)?bdsmvideos-net-wvckcgq2o\.blogspot\.com
+https?:\/\/([^\/]*\.)?beaffaired\.com
+https?:\/\/([^\/]*\.)?bear-build-gay\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bear-chubby-young\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?bear-terry\.blogspot\.com
+https?:\/\/([^\/]*\.)?beastiality-live\.com
+https?:\/\/([^\/]*\.)?beautiful-ass-pic\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?beautiful-blonde-pole-dancer\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?beautifulzdrawing\.sex-systems\.com
+https?:\/\/([^\/]*\.)?beautyass-com-e1ca\.blogspot\.com
+https?:\/\/([^\/]*\.)?becloudsiss\.thehostcity\.com
+https?:\/\/([^\/]*\.)?bedspread-king\.keckins\.be
+https?:\/\/([^\/]*\.)?begcrucial\.justfree\.com
+https?:\/\/([^\/]*\.)?beginninghouse\.com
+https?:\/\/([^\/]*\.)?begot\.info
+https?:\/\/([^\/]*\.)?beijing-door\.cn
+https?:\/\/([^\/]*\.)?beijingimpression\.com
+https?:\/\/([^\/]*\.)?bekahboo3\.blogspot\.com
+https?:\/\/([^\/]*\.)?beldam\.dns1\.us
+https?:\/\/([^\/]*\.)?bemix\.info
+https?:\/\/([^\/]*\.)?benixon\.dl\.pl
+https?:\/\/([^\/]*\.)?benoit-r86\.blogspot\.com
+https?:\/\/([^\/]*\.)?benson-g68a\.blogspot\.com
+https?:\/\/([^\/]*\.)?benz-h51\.blogspot\.com
+https?:\/\/([^\/]*\.)?beqy\.org
+https?:\/\/([^\/]*\.)?berenupa\.info
+https?:\/\/([^\/]*\.)?berkeley-mdi56f\.blogspot\.com
+https?:\/\/([^\/]*\.)?berlin-o3g\.blogspot\.com
+https?:\/\/([^\/]*\.)?bernie-b18\.blogspot\.com
+https?:\/\/([^\/]*\.)?berrycow\.blogspot\.com
+https?:\/\/([^\/]*\.)?beryl-c3\.blogspot\.com
+https?:\/\/([^\/]*\.)?best-hotels-inns\.com
+https?:\/\/([^\/]*\.)?best-porn-clip-zone0mp\.blogspot\.com
+https?:\/\/([^\/]*\.)?best2006\.info
+https?:\/\/([^\/]*\.)?best568\.com
+https?:\/\/([^\/]*\.)?bestaftor\.com
+https?:\/\/([^\/]*\.)?bestallmed\.info
+https?:\/\/([^\/]*\.)?bestbuyonlinebooks\.com
+https?:\/\/([^\/]*\.)?bestcityhal\.com
+https?:\/\/([^\/]*\.)?bestcyberfish\.com
+https?:\/\/([^\/]*\.)?bestfreegift\.com
+https?:\/\/([^\/]*\.)?bestgames-winner\.com
+https?:\/\/([^\/]*\.)?besthallet\.com
+https?:\/\/([^\/]*\.)?bestinternetexplorer\.info
+https?:\/\/([^\/]*\.)?bestlowmortgagerates\.com
+https?:\/\/([^\/]*\.)?bestmaiden\.com
+https?:\/\/([^\/]*\.)?bestmercedesbez\.info
+https?:\/\/([^\/]*\.)?bestmitsubishiparts\.info
+https?:\/\/([^\/]*\.)?bestmp3online\.com
+https?:\/\/([^\/]*\.)?bestmp3online\.net
+https?:\/\/([^\/]*\.)?bestofe\.com
+https?:\/\/([^\/]*\.)?bestonline-medication\.com
+https?:\/\/([^\/]*\.)?bestonline-shopping\.com
+https?:\/\/([^\/]*\.)?bestorlean\.com
+https?:\/\/([^\/]*\.)?bestpricebentley\.info
+https?:\/\/([^\/]*\.)?bestsellsite\.com
+https?:\/\/([^\/]*\.)?bestxxxanal-1\.tripod\.com
+https?:\/\/([^\/]*\.)?bestyourown\.info
+https?:\/\/([^\/]*\.)?beta-dg174ivc\.blogspot\.com
+https?:\/\/([^\/]*\.)?beth-t6h6\.blogspot\.com
+https?:\/\/([^\/]*\.)?bethany-ezjn\.blogspot\.com
+https?:\/\/([^\/]*\.)?betsie-w4080\.blogspot\.com
+https?:\/\/([^\/]*\.)?betsy-rgxm2e\.blogspot\.com
+https?:\/\/([^\/]*\.)?better\.ws
+https?:\/\/([^\/]*\.)?betty-gy\.blogspot\.com
+https?:\/\/([^\/]*\.)?beverly-hax82jc3md\.blogspot\.com
+https?:\/\/([^\/]*\.)?bevjy\.szm\.sk
+https?:\/\/([^\/]*\.)?beyonce-knowles-nude\.blogspot\.com
+https?:\/\/([^\/]*\.)?bfekd\.szm\.sk
+https?:\/\/([^\/]*\.)?bfgtxs4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?bfi-k5xk7bnu\.blogspot\.com
+https?:\/\/([^\/]*\.)?bfnh2\.szm\.sk
+https?:\/\/([^\/]*\.)?bfqn\.com
+https?:\/\/([^\/]*\.)?bfvsa\.szm\.sk
+https?:\/\/([^\/]*\.)?bgpkvcr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?bhncvw-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?bhqay\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?bi-britney-spears-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?bi-whales\.blogspot\.com
+https?:\/\/([^\/]*\.)?bi-xxx-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?bianca-i7yj\.blogspot\.com
+https?:\/\/([^\/]*\.)?bianpinqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?bicx7\.szm\.sk
+https?:\/\/([^\/]*\.)?bid-sohardcore-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?bidsex\.net
+https?:\/\/([^\/]*\.)?big-big-clit-tit\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?big-bitch-booty-fucked-getting\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?big-black-cock-movie-clip\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?big-black-cock-pic\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?big-black-dick-fat-long\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?big-blonde-mature-tit\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-blonde-teen-tit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-body-fuck\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?big-boob-huge-large\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?big-bouncing-boob-movie\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?big-butt-shemale\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?big-cock-gay-guy-have\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?big-cock-hard-sex\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-cum-cum-shot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?big-cum-movie-swallow-tit-xxx\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-dick-fuck-hot-love-sexy-shemale-that\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?big-ebony-free-gallery-tit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-fat-boob\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-free-lesbian-movie-online-porn\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?big-huge-gigantic-boob\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?big-leg-babes\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?big-leg-nice\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?big-okfl\.blogspot\.com
+https?:\/\/([^\/]*\.)?big-strap-on-dildo\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?big-tit-round-ass-jasmine\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?big-tit-round-ass-maria\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?big-tit-round-ass-picture\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?big-tits\.100freemb\.com
+https?:\/\/([^\/]*\.)?big-titted-bitch\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big-titts-round-ass\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?big-young-cock\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?big\.de\.com
+https?:\/\/([^\/]*\.)?bigapple\.dtdns\.net
+https?:\/\/([^\/]*\.)?bigassadventure-com-g4lvyk\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigbird-aus\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigbreastlovers-com-suqoq\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigcockteenaddiction-com-km\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigcockteenaddiction-com-kpqf40\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigdog-b14q6mwev\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigfoot-c7l\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigfreesex-com-i2csy2\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigfreesex-com-subub\.blogspot\.com
+https?:\/\/([^\/]*\.)?biggest-cock-thickest\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?biggest-dildo-fuck-world\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?biggiebestparis\.com
+https?:\/\/([^\/]*\.)?biglietti-auguri\.net
+https?:\/\/([^\/]*\.)?biglietto-augurio\.freehostss\.info
+https?:\/\/([^\/]*\.)?bigmac-detr0i6y\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigman-tycdhe62d\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigmouthfuls-com-rvl7ep\.blogspot\.com
+https?:\/\/([^\/]*\.)?bignaturals-com-w0\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigpenis\.digitalzones\.com
+https?:\/\/([^\/]*\.)?bigtitpatrol-com-bub8db06d\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigtitsfans-com-rxc3ya\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigtitsroundasses-com-b6auqkd60\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigtitsroundasses-com-redeg\.blogspot\.com
+https?:\/\/([^\/]*\.)?bigtitsroundasses-com-rj85t35x3\.blogspot\.com
+https?:\/\/([^\/]*\.)?biib4\.szm\.sk
+https?:\/\/([^\/]*\.)?bike-boot-dirt-riding\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bike-night\.grimgoe\.be
+https?:\/\/([^\/]*\.)?bikini-wax\.phpbb2\.us
+https?:\/\/([^\/]*\.)?bikinixxx-777now\.tripod\.com
+https?:\/\/([^\/]*\.)?bilbo-ea47j\.blogspot\.com
+https?:\/\/([^\/]*\.)?billy-r4negy1zwm\.blogspot\.com
+https?:\/\/([^\/]*\.)?binky-hu\.blogspot\.com
+https?:\/\/([^\/]*\.)?bio\.research\.ucsc\.edu
+https?:\/\/([^\/]*\.)?biopharmasite\.biz
+https?:\/\/([^\/]*\.)?biperq\.com
+https?:\/\/([^\/]*\.)?bird-iay2s\.blogspot\.com
+https?:\/\/([^\/]*\.)?birdie\.101freehost\.com
+https?:\/\/([^\/]*\.)?birth-control\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?bisexual-cartoon-sex\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?bisexuals-cyber-fuck-horny-lesbian-lezzies-sex\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?bisson\.onthenet\.as
+https?:\/\/([^\/]*\.)?bit-tit-lesbian\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?bitch-fat-hot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?bituka\.com
+https?:\/\/([^\/]*\.)?bivxr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?bizaffiliatecenter\.com
+https?:\/\/([^\/]*\.)?bizarre-love-triangle-lyric-by-frente\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bizarre-sex-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?bizhat\.com
+https?:\/\/([^\/]*\.)?bizhome\.org
+https?:\/\/([^\/]*\.)?bj-trj\.com
+https?:\/\/([^\/]*\.)?bjaoyunhui\.com
+https?:\/\/([^\/]*\.)?bjcee\.com
+https?:\/\/([^\/]*\.)?bjicp\.com
+https?:\/\/([^\/]*\.)?bjicp\.freewebpage\.org
+https?:\/\/([^\/]*\.)?bjicp\.net
+https?:\/\/([^\/]*\.)?bjicp\.org
+https?:\/\/([^\/]*\.)?bjjinhan\.com
+https?:\/\/([^\/]*\.)?bjlzhh\.com
+https?:\/\/([^\/]*\.)?bjocmc3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?bjqmzx\.com
+https?:\/\/([^\/]*\.)?bjrfinfo\.com
+https?:\/\/([^\/]*\.)?bjsscc\.com\.cn
+https?:\/\/([^\/]*\.)?bjtranslate\.com
+https?:\/\/([^\/]*\.)?bjwczx\.com
+https?:\/\/([^\/]*\.)?bjxiongfei\.com
+https?:\/\/([^\/]*\.)?bjxunda\.com
+https?:\/\/([^\/]*\.)?bjzktd\.com
+https?:\/\/([^\/]*\.)?bkclamcp\.t35\.com
+https?:\/\/([^\/]*\.)?bksar\.szm\.sk
+https?:\/\/([^\/]*\.)?bkzor\.szm\.sk
+https?:\/\/([^\/]*\.)?black-amateur-movie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-asian-anal\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?black-boob-sex\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?black-booty-movies-com-i0\.blogspot\.com
+https?:\/\/([^\/]*\.)?black-butt-fat-gay-man\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?black-chick-fuck\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?black-chubby-ebony\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?black-clip-free-full-porn-blog4t5\.blogspot\.com
+https?:\/\/([^\/]*\.)?black-cock-facial\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?black-cock-monster\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?black-cock-white-cunt\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?black-cum-shot-movie\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-domination-female-free-picture-teen\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?black-ebony-free-spreading-tgp\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?black-fat-boob\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?black-free-gay-man-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?black-gay-club\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?black-gay-sex-site\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?black-gay-teen-sex\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?black-hoe-hardcore-sex-gallery\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?black-hoe-that-suck-dick\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?black-jack-4u\.net
+https?:\/\/([^\/]*\.)?black-jack-black\.blogspot\.com
+https?:\/\/([^\/]*\.)?black-jacks\.us
+https?:\/\/([^\/]*\.)?black-jeweler\.org
+https?:\/\/([^\/]*\.)?black-leg-open-wide\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-lesbian-story\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?black-man-fucking-white-sluts\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-monster-boob\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-monster-cock-mpeg\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-on-blonde-sex-picture\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?black-porn-clip-news8bn\.blogspot\.com
+https?:\/\/([^\/]*\.)?black-white-boob\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?black-wide-leg-pants\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?black-woman-sucking-dick\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blackmisheru\.50webs\.org
+https?:\/\/([^\/]*\.)?blade\.host-page\.com
+https?:\/\/([^\/]*\.)?blade1\.host-page\.com
+https?:\/\/([^\/]*\.)?blade10\.host-page\.com
+https?:\/\/([^\/]*\.)?blade2\.host-page\.com
+https?:\/\/([^\/]*\.)?blade4\.host-page\.com
+https?:\/\/([^\/]*\.)?blade5\.host-page\.com
+https?:\/\/([^\/]*\.)?blade6\.host-page\.com
+https?:\/\/([^\/]*\.)?blade7\.host-page\.com
+https?:\/\/([^\/]*\.)?blade8\.host-page\.com
+https?:\/\/([^\/]*\.)?blade9\.host-page\.com
+https?:\/\/([^\/]*\.)?blagoslovenie\.rovno\.ua
+https?:\/\/([^\/]*\.)?blanca-tf50a\.blogspot\.com
+https?:\/\/([^\/]*\.)?blapt\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?blathe\.com
+https?:\/\/([^\/]*\.)?blazer-wwn\.blogspot\.com
+https?:\/\/([^\/]*\.)?blbdg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?blboys-com-wsq27\.blogspot\.com
+https?:\/\/([^\/]*\.)?blbthxw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?blendermedia\.com
+https?:\/\/([^\/]*\.)?blevitra\.ovp\.pl
+https?:\/\/([^\/]*\.)?blmurphy\.dl\.pl
+https?:\/\/([^\/]*\.)?blog-broken-leg\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?blog\.chinaz\.com
+https?:\/\/([^\/]*\.)?blog\.donews\.com
+https?:\/\/([^\/]*\.)?blog\.welover\.org
+https?:\/\/([^\/]*\.)?blog\.yam\.com
+https?:\/\/([^\/]*\.)?blog67\.fc2\.com
+https?:\/\/([^\/]*\.)?blond\.12gbfree\.com
+https?:\/\/([^\/]*\.)?blonde-bald-pussy\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?blonde-blow-job-mpeg\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?blonde-blow-job-tgp\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?blonde-boob-xxx\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blonde-color-hair-platinum\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?blonde-cunt-hair\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?blonde-dumb-not\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?blonde-firework-joke\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?blonde-lesbian-picture\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blonde-long-mature\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?blonde-model-twin\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?blonde-model-wallpaper\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?blonde-teen-bitch\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?blonde-who-fuck\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blonde-with-pink-dildo\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?blonde-xxx-trailer\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?blondie-g7hbdel\.blogspot\.com
+https?:\/\/([^\/]*\.)?blondy-zipper\.iespana\.es
+https?:\/\/([^\/]*\.)?blood-clots-cramp-leg\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?blotrer\.com
+https?:\/\/([^\/]*\.)?blow-deep-free-job-throat\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?blow-free-gallery-in-job-place-public\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blow-gagging-job-pissing-sex\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?blow-job-movie-monster\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?blow-job-video-h-g-b\.blogspot\.com
+https?:\/\/([^\/]*\.)?blowy\.info
+https?:\/\/([^\/]*\.)?blskill\.dl\.pl
+https?:\/\/([^\/]*\.)?blue-phentermine\.coz\.in
+https?:\/\/([^\/]*\.)?bluebird-ki1h06\.blogspot\.com
+https?:\/\/([^\/]*\.)?bluethumbs-com-wn7zce4\.blogspot\.com
+https?:\/\/([^\/]*\.)?blurs\.info
+https?:\/\/([^\/]*\.)?blurzed\.com
+https?:\/\/([^\/]*\.)?bmoer\.szm\.sk
+https?:\/\/([^\/]*\.)?bmoon-tech\.com
+https?:\/\/([^\/]*\.)?bmzz6\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?bnhaq\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?bnme5\.szm\.sk
+https?:\/\/([^\/]*\.)?bnsal\.szm\.sk
+https?:\/\/([^\/]*\.)?bo-wheeling\.blogspot\.com
+https?:\/\/([^\/]*\.)?boatf\.hostpresso\.com
+https?:\/\/([^\/]*\.)?bob-mh5rq0\.blogspot\.com
+https?:\/\/([^\/]*\.)?bobcat-asfz\.blogspot\.com
+https?:\/\/([^\/]*\.)?bobcat-qete\.blogspot\.com
+https?:\/\/([^\/]*\.)?boboczel\.fr-bb\.com
+https?:\/\/([^\/]*\.)?boboer\.heavenforum\.com
+https?:\/\/([^\/]*\.)?bocac\.blogcu\.com
+https?:\/\/([^\/]*\.)?bocalolo\.bbgraf\.com
+https?:\/\/([^\/]*\.)?bocbasdom\.su\.pl
+https?:\/\/([^\/]*\.)?bocbasget\.bbfr\.net
+https?:\/\/([^\/]*\.)?bocchiolo\.zj\.pl
+https?:\/\/([^\/]*\.)?bocerleto\.winnerforum\.net
+https?:\/\/([^\/]*\.)?bocletoget\.cultureforum\.net
+https?:\/\/([^\/]*\.)?bocmonel\.lolforum\.net
+https?:\/\/([^\/]*\.)?boctrocleto\.xa\.pl
+https?:\/\/([^\/]*\.)?bodelel\.goodbb\.net
+https?:\/\/([^\/]*\.)?bodsforthemods-com-txb\.blogspot\.com
+https?:\/\/([^\/]*\.)?body-jewellery-piercing-4u\.com
+https?:\/\/([^\/]*\.)?bodybuilding\.ncedly\.be
+https?:\/\/([^\/]*\.)?bof-xxxvogue-net\.blogspot\.com
+https?:\/\/([^\/]*\.)?bofuno-free-amateur-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?bogetric\.td\.pl
+https?:\/\/([^\/]*\.)?bolds\.info
+https?:\/\/([^\/]*\.)?bolgatalt\.naturalforum\.net
+https?:\/\/([^\/]*\.)?bolle-xeno\.keckins\.be
+https?:\/\/([^\/]*\.)?bologjack\.8tt\.org
+https?:\/\/([^\/]*\.)?bomb9\.szm\.sk
+https?:\/\/([^\/]*\.)?bon-rassi\.com
+https?:\/\/([^\/]*\.)?bondage\.coz\.in
+https?:\/\/([^\/]*\.)?bondagepaper-com-hzt1gq2iw\.blogspot\.com
+https?:\/\/([^\/]*\.)?bondich\.blogspot\.com
+https?:\/\/([^\/]*\.)?boneme-wn\.blogspot\.com
+https?:\/\/([^\/]*\.)?boneprone-com-g0h\.blogspot\.com
+https?:\/\/([^\/]*\.)?boner-dujo\.blogspot\.com
+https?:\/\/([^\/]*\.)?bong-cx0\.blogspot\.com
+https?:\/\/([^\/]*\.)?bong-tedo\.blogspot\.com
+https?:\/\/([^\/]*\.)?bonjour-toxi\.blogspot\.com
+https?:\/\/([^\/]*\.)?bonnie-pequ\.blogspot\.com
+https?:\/\/([^\/]*\.)?bonnie-t00pf3j6\.blogspot\.com
+https?:\/\/([^\/]*\.)?bonota\.blogcu\.com
+https?:\/\/([^\/]*\.)?bonozel\.dl\.pl
+https?:\/\/([^\/]*\.)?bontril\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?bontril\.1k\.pl
+https?:\/\/([^\/]*\.)?boob-dome-com-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?boob-free-large-natural-teen\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boob-little-monster-vicki\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?boob-little-monster-vicki\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?boob-movie-piqe\.blogspot\.com
+https?:\/\/([^\/]*\.)?boob-myspace-com-naked-site\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?boob-nude-pic-small\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boob-video-bb-bb-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?booble-com-orahxf\.blogspot\.com
+https?:\/\/([^\/]*\.)?booble-com-ouq\.blogspot\.com
+https?:\/\/([^\/]*\.)?booger-sure\.blogspot\.com
+https?:\/\/([^\/]*\.)?boogie-sexu\.blogspot\.com
+https?:\/\/([^\/]*\.)?boogie-wy64qty4x\.blogspot\.com
+https?:\/\/([^\/]*\.)?bookcq\.com
+https?:\/\/([^\/]*\.)?bookit-liwe\.blogspot\.com
+https?:\/\/([^\/]*\.)?boole\.cs\.iastate\.edu
+https?:\/\/([^\/]*\.)?boomer-hodo\.blogspot\.com
+https?:\/\/([^\/]*\.)?booster-leto\.blogspot\.com
+https?:\/\/([^\/]*\.)?boot-by-jessica-lyric-made-simpson-walking\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boot-camp-fitness-georgia-summer\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?boot-camp-for-out-of-control-teen\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?boot-cranston-shoes\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?boot-davidson-harley-riding\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?boot-disk-file\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?boot-dress-womens\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?boot-i-in-like-man-rubber\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boot-in-lancashire-maker-shoes\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boot-made-these-video-walkin-watch\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?boot-made-these-walking-who-wrote\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?boot-outlet-timberland\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?boot-riding-supplier\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?boot-these-walking\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bootsie-bihe\.blogspot\.com
+https?:\/\/([^\/]*\.)?bootsie-ku10yu\.blogspot\.com
+https?:\/\/([^\/]*\.)?booty-ebony-gallery\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?booty-ebony-info-remember-video\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?bootycollection-com-cf36tiy45\.blogspot\.com
+https?:\/\/([^\/]*\.)?bootycollection-com-rekiz\.blogspot\.com
+https?:\/\/([^\/]*\.)?boracboc\.su\.pl
+https?:\/\/([^\/]*\.)?borelco\.dl\.pl
+https?:\/\/([^\/]*\.)?borgshare\.org
+https?:\/\/([^\/]*\.)?borjone\.com
+https?:\/\/([^\/]*\.)?borncompany\.com
+https?:\/\/([^\/]*\.)?boryc\.com
+https?:\/\/([^\/]*\.)?boss-bitch-2\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?boss-coerced-fucking-into-wife\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?boss-suno\.blogspot\.com
+https?:\/\/([^\/]*\.)?boston-hardcore-site-myspace-com\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?boston-heqe\.blogspot\.com
+https?:\/\/([^\/]*\.)?bostvndaoe\.blogspot\.com
+https?:\/\/([^\/]*\.)?botaer\.dl\.pl
+https?:\/\/([^\/]*\.)?botast\.com
+https?:\/\/([^\/]*\.)?botrdar\.goodforum\.net
+https?:\/\/([^\/]*\.)?botrdar\.grafbb\.com
+https?:\/\/([^\/]*\.)?boulder-facial-plastic-surgery\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?bov-smut-house-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?bovaral\.naturalforum\.net
+https?:\/\/([^\/]*\.)?bowse\.info
+https?:\/\/([^\/]*\.)?bowtrol\.ventilacia\.yi\.org
+https?:\/\/([^\/]*\.)?bowtrolcoloncleanse\.vlocka\.yi\.org
+https?:\/\/([^\/]*\.)?boy-boy-gay-young\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?boysfirsttime-com-ele2y\.blogspot\.com
+https?:\/\/([^\/]*\.)?bphentermine\.c24\.pl
+https?:\/\/([^\/]*\.)?bphentermine\.ovp\.pl
+https?:\/\/([^\/]*\.)?bqtcfu7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?braburka\.ifrance\.com
+https?:\/\/([^\/]*\.)?bradley-fitu\.blogspot\.com
+https?:\/\/([^\/]*\.)?brahma-steel-toe-boot\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?brandi-a5tds\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandi-vuwi\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandibelle-com-mzqj8l\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandibelle-com-ti\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandon-duso\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandy-cnz56l\.blogspot\.com
+https?:\/\/([^\/]*\.)?brandy-dobu\.blogspot\.com
+https?:\/\/([^\/]*\.)?brasil-pire\.blogspot\.com
+https?:\/\/([^\/]*\.)?brat-nikodim\.blogspot\.com
+https?:\/\/([^\/]*\.)?braves-t7\.blogspot\.com
+https?:\/\/([^\/]*\.)?braves-tuku\.blogspot\.com
+https?:\/\/([^\/]*\.)?bravogirls-com-a7nbqd\.blogspot\.com
+https?:\/\/([^\/]*\.)?bravogirls-com-w12\.blogspot\.com
+https?:\/\/([^\/]*\.)?bravoteens-com-d0v\.blogspot\.com
+https?:\/\/([^\/]*\.)?bravovids-com-rouqs0py\.blogspot\.com
+https?:\/\/([^\/]*\.)?bravovids-r55rxyszt0\.blogspot\.com
+https?:\/\/([^\/]*\.)?brazil-butt-thong\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?brazil-gevo\.blogspot\.com
+https?:\/\/([^\/]*\.)?brazilian-butt-lift-plastic-surgery\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?brb\.pl
+https?:\/\/([^\/]*\.)?breana-foki\.blogspot\.com
+https?:\/\/([^\/]*\.)?breana-wvqscvo5u\.blogspot\.com
+https?:\/\/([^\/]*\.)?breanna-kiwu\.blogspot\.com
+https?:\/\/([^\/]*\.)?breanne-leri\.blogspot\.com
+https?:\/\/([^\/]*\.)?breeanna-quhu\.blogspot\.com
+https?:\/\/([^\/]*\.)?breiana-quhe\.blogspot\.com
+https?:\/\/([^\/]*\.)?brenda-i5z8n4zkb7\.blogspot\.com
+https?:\/\/([^\/]*\.)?brenda-rezo\.blogspot\.com
+https?:\/\/([^\/]*\.)?brenna-xivo\.blogspot\.com
+https?:\/\/([^\/]*\.)?brewster-opqnec8v\.blogspot\.com
+https?:\/\/([^\/]*\.)?brfq6\.szm\.sk
+https?:\/\/([^\/]*\.)?brian-bchd\.blogspot\.com
+https?:\/\/([^\/]*\.)?brianna-dc04k04ivu\.blogspot\.com
+https?:\/\/([^\/]*\.)?brianne-ejv40\.blogspot\.com
+https?:\/\/([^\/]*\.)?brick55\.5gbfree\.com
+https?:\/\/([^\/]*\.)?brickes\.8888mb\.com
+https?:\/\/([^\/]*\.)?bricktilemachine\.com\.cn
+https?:\/\/([^\/]*\.)?bridgette-rjc3pbx6\.blogspot\.com
+https?:\/\/([^\/]*\.)?brightflashes\.blogspot\.com
+https?:\/\/([^\/]*\.)?brionna-hl530r3fe\.blogspot\.com
+https?:\/\/([^\/]*\.)?brisbeck\.com
+https?:\/\/([^\/]*\.)?britney-spear-sexy-ass\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?britney-spears-0\.blogspot\.com
+https?:\/\/([^\/]*\.)?britney-spears-sex-video-t-j-g\.blogspot\.com
+https?:\/\/([^\/]*\.)?brittany-i7ekj3hll\.blogspot\.com
+https?:\/\/([^\/]*\.)?broadcaster-crazy-popular\.freehostss\.info
+https?:\/\/([^\/]*\.)?broadway-ow\.blogspot\.com
+https?:\/\/([^\/]*\.)?brokenbond\.blogspot\.com
+https?:\/\/([^\/]*\.)?bronc\.info
+https?:\/\/([^\/]*\.)?brooke-bejuzava\.blogspot\.com
+https?:\/\/([^\/]*\.)?brooklynn-du\.blogspot\.com
+https?:\/\/([^\/]*\.)?brooks-rare\.lkerfocu\.be
+https?:\/\/([^\/]*\.)?brplank\.ifrance\.com
+https?:\/\/([^\/]*\.)?brrddd\.org
+https?:\/\/([^\/]*\.)?bruce-egqva1m\.blogspot\.com
+https?:\/\/([^\/]*\.)?brunettesexwrl\.blogspot\.com
+https?:\/\/([^\/]*\.)?brush\.hostaim\.com
+https?:\/\/([^\/]*\.)?brutlag\.stanford\.edu
+https?:\/\/([^\/]*\.)?bryan-rdu\.blogspot\.com
+https?:\/\/([^\/]*\.)?bs21sa\.com
+https?:\/\/([^\/]*\.)?bsd-hd\.blogspot\.com
+https?:\/\/([^\/]*\.)?bsoma\.c24\.pl
+https?:\/\/([^\/]*\.)?bsoma\.ovp\.pl
+https?:\/\/([^\/]*\.)?bsri3\.szm\.sk
+https?:\/\/([^\/]*\.)?btipu\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?btix\.combasketball-tickets
+https?:\/\/([^\/]*\.)?btqvb\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?btramadol\.c24\.pl
+https?:\/\/([^\/]*\.)?bubba1-i2pblfp2m\.blogspot\.com
+https?:\/\/([^\/]*\.)?bublifuk\.php5\.cz
+https?:\/\/([^\/]*\.)?bucina\.asp2\.cz
+https?:\/\/([^\/]*\.)?buck-o1i5bt\.blogspot\.com
+https?:\/\/([^\/]*\.)?buddy-bqam83yt\.blogspot\.com
+https?:\/\/([^\/]*\.)?budget7i\.info
+https?:\/\/([^\/]*\.)?buff-com-es-gay-porn-site-l-s-g\.blogspot\.com
+https?:\/\/([^\/]*\.)?bug\.phil\.cmu\.edu
+https?:\/\/([^\/]*\.)?buildercareer\.us
+https?:\/\/([^\/]*\.)?bukicon-free-bisexual-s-b\.blogspot\.com
+https?:\/\/([^\/]*\.)?bukkake-cum-facial-shot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?bulldog-dc86aq4l\.blogspot\.com
+https?:\/\/([^\/]*\.)?bumast\.com
+https?:\/\/([^\/]*\.)?bumins\.com
+https?:\/\/([^\/]*\.)?bunnyteens-com-clpxyq6of\.blogspot\.com
+https?:\/\/([^\/]*\.)?bunnyteens-com-gz7\.blogspot\.com
+https?:\/\/([^\/]*\.)?bupropion-hcl\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?buruan\.dl\.pl
+https?:\/\/([^\/]*\.)?business-brokers\.lkerfocu\.be
+https?:\/\/([^\/]*\.)?business-school\.hotmail\.ru
+https?:\/\/([^\/]*\.)?business-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?business1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?business2school\.chat\.ru
+https?:\/\/([^\/]*\.)?businessitaly\.info
+https?:\/\/([^\/]*\.)?businesx\.atspace\.com
+https?:\/\/([^\/]*\.)?buspar\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?buspirone\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?busstopwhores-com-c0f\.blogspot\.com
+https?:\/\/([^\/]*\.)?busstopwhores-com-ki7\.blogspot\.com
+https?:\/\/([^\/]*\.)?busty-blonde-bomb-shell\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?busty-blonde-fuck\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?busty-escort-porn\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?busty-horny-milf\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?busty-little-girl\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?busty-mature-red-head\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?busty-sex-star\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?busty-super-girl\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?busty-thick-ebony\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?bustyadventures-com-oh518h8l\.blogspot\.com
+https?:\/\/([^\/]*\.)?bustyisland-com-au\.blogspot\.com
+https?:\/\/([^\/]*\.)?bustyisland-mdjgr6khy\.blogspot\.com
+https?:\/\/([^\/]*\.)?bustypassion-com-bpe84\.blogspot\.com
+https?:\/\/([^\/]*\.)?butalbital-apap\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?butalbital\.ru\.tf
+https?:\/\/([^\/]*\.)?butler-h3bpdq\.blogspot\.com
+https?:\/\/([^\/]*\.)?butseriouslyimprov\.com
+https?:\/\/([^\/]*\.)?butt-community-type-white\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?butt-face-fat-her-kong-love-picture-queen-sit\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?butt-fucking-teen\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?butt-girl-rate\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?buttons-iveta\.blogspot\.com
+https?:\/\/([^\/]*\.)?buwelch\.dl\.pl
+https?:\/\/([^\/]*\.)?buwu-admin\.blogspot\.com
+https?:\/\/([^\/]*\.)?buy-ambien-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-ambien\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-ativan\.fil\.ph
+https?:\/\/([^\/]*\.)?buy-bontril\.contact\.cc
+https?:\/\/([^\/]*\.)?buy-carisoprodol\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-celebrex\.bigsitecity\.com
+https?:\/\/([^\/]*\.)?buy-cialis-online\.bigsitecity\.com
+https?:\/\/([^\/]*\.)?buy-cialis\.1k\.pl
+https?:\/\/([^\/]*\.)?buy-cialis\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-cialis\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-cialis20\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-cialishhb\.blogspot\.com
+https?:\/\/([^\/]*\.)?buy-cialisklx\.blogspot\.com
+https?:\/\/([^\/]*\.)?buy-hydrocodone-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?buy-hydrocodone-gs\.net\.tc
+https?:\/\/([^\/]*\.)?buy-hydrocodone\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-hydrocodone\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-levitra\.1k\.pl
+https?:\/\/([^\/]*\.)?buy-levitra\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-lipitor\.contact\.cc
+https?:\/\/([^\/]*\.)?buy-lortab-911\.jo\.pl
+https?:\/\/([^\/]*\.)?buy-online-tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?buy-pharmacy\.blogspot\.com
+https?:\/\/([^\/]*\.)?buy-phentermine-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?buy-phentermine-gs\.net\.tc
+https?:\/\/([^\/]*\.)?buy-phentermine\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-phentermine\.health-livening\.com
+https?:\/\/([^\/]*\.)?buy-phentermine\.hem\.nu
+https?:\/\/([^\/]*\.)?buy-phentermine\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-phentermine20\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-prozac-online\.com
+https?:\/\/([^\/]*\.)?buy-soma\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-tennis-shoes\.info
+https?:\/\/([^\/]*\.)?buy-tramadol-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?buy-tramadol-gs\.net\.tc
+https?:\/\/([^\/]*\.)?buy-tramadol-online911\.jo\.pl
+https?:\/\/([^\/]*\.)?buy-tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?buy-tramadol\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-tramadol\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-tramadol20\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-ultram\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-valium\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-viagra-online\.health-livening\.com
+https?:\/\/([^\/]*\.)?buy-viagra\.esguay\.com
+https?:\/\/([^\/]*\.)?buy-viagra\.health-livening\.com
+https?:\/\/([^\/]*\.)?buy-viagra\.presteert\.nl
+https?:\/\/([^\/]*\.)?buy-viagra20\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy-xanax20\.bravehost\.com
+https?:\/\/([^\/]*\.)?buy4levitra\.blogspot\.com
+https?:\/\/([^\/]*\.)?buy4viagra\.blogspot\.com
+https?:\/\/([^\/]*\.)?buyambien\.blog\.hr
+https?:\/\/([^\/]*\.)?buyambien\.guu\.pl
+https?:\/\/([^\/]*\.)?buybuspar\.4\.pl
+https?:\/\/([^\/]*\.)?buycialisonline\.forumlivre\.com
+https?:\/\/([^\/]*\.)?buycialisonline\.sprayblog\.se
+https?:\/\/([^\/]*\.)?buycialisonline\.sulekha\.com
+https?:\/\/([^\/]*\.)?buycialispills00\.blogspot\.com
+https?:\/\/([^\/]*\.)?buycialiss\.blogsome\.com
+https?:\/\/([^\/]*\.)?buycialiss\.ovp\.pl
+https?:\/\/([^\/]*\.)?buycipro\.4\.pl
+https?:\/\/([^\/]*\.)?buyeffexor\.4\.pl
+https?:\/\/([^\/]*\.)?buyhydrocodone\.blog\.hr
+https?:\/\/([^\/]*\.)?buylevitra\.blog\.hr
+https?:\/\/([^\/]*\.)?buylevitra\.forospace\.com
+https?:\/\/([^\/]*\.)?buylevitraonlin\.forumlivre\.com
+https?:\/\/([^\/]*\.)?buylevitraonline\.sprayblog\.se
+https?:\/\/([^\/]*\.)?buymeridia\.blog\.hr
+https?:\/\/([^\/]*\.)?buyonlineorder\.com
+https?:\/\/([^\/]*\.)?buypaxil\.blog\.hr
+https?:\/\/([^\/]*\.)?buyphentermine2\.livelog\.com
+https?:\/\/([^\/]*\.)?buyphenterminee\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyphenterminez\.blog\.hr
+https?:\/\/([^\/]*\.)?buypropecia\.blog\.hr
+https?:\/\/([^\/]*\.)?buyprozac\.blog\.hr
+https?:\/\/([^\/]*\.)?buyrosebowltickets\.com
+https?:\/\/([^\/]*\.)?buysoma\.1majorhost\.com
+https?:\/\/([^\/]*\.)?buysoma\.cay\.pl
+https?:\/\/([^\/]*\.)?buysomaaonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?buysomaonline\.forospace\.com
+https?:\/\/([^\/]*\.)?buysomaonlinez\.blogsome\.com
+https?:\/\/([^\/]*\.)?buytramadolonli\.forumlivre\.com
+https?:\/\/([^\/]*\.)?buytramadolonline\.sprayblog\.se
+https?:\/\/([^\/]*\.)?buytramadolz\.jubiiblog\.de
+https?:\/\/([^\/]*\.)?buytrazodone\.eamped\.com
+https?:\/\/([^\/]*\.)?buyultram\.forospace\.com
+https?:\/\/([^\/]*\.)?buyultram\.ir\.pl
+https?:\/\/([^\/]*\.)?buyultramonline\.ir\.pl
+https?:\/\/([^\/]*\.)?buyultramxp\.cay\.pl
+https?:\/\/([^\/]*\.)?buyvalium\.one2you\.info
+https?:\/\/([^\/]*\.)?buyvaliumonline\.forumlivre\.com
+https?:\/\/([^\/]*\.)?buyvaliumonline\.jubiiblog\.de
+https?:\/\/([^\/]*\.)?buyvaliumonline\.sprayblog\.se
+https?:\/\/([^\/]*\.)?buyviagra\.seesaa\.net
+https?:\/\/([^\/]*\.)?buyviagraa\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyviagraonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyviagraonline\.sprayblog\.se
+https?:\/\/([^\/]*\.)?buyviagraxp\.cay\.pl
+https?:\/\/([^\/]*\.)?buyvicodinxp\.cay\.pl
+https?:\/\/([^\/]*\.)?buyvvalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyxanax\.5u\.com
+https?:\/\/([^\/]*\.)?buyxanaxxonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyxanaxxp\.cay\.pl
+https?:\/\/([^\/]*\.)?buyxenical\.blog\.hr
+https?:\/\/([^\/]*\.)?buyxenical\.ir\.pl
+https?:\/\/([^\/]*\.)?buyxenicalonline\.ir\.pl
+https?:\/\/([^\/]*\.)?buyxxenical\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyxxenicalonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyycelexa\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyycialis\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyymeridiaonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyyphentermine\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyysoma\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyyviagra\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyyzithromax\.ovp\.pl
+https?:\/\/([^\/]*\.)?buyzoloft\.blog\.hr
+https?:\/\/([^\/]*\.)?buyzyban\.coz\.in
+https?:\/\/([^\/]*\.)?buzerave\.com
+https?:\/\/([^\/]*\.)?bvalium\.c24\.pl
+https?:\/\/([^\/]*\.)?bvalium\.fuks\.pl
+https?:\/\/([^\/]*\.)?bvalium1\.forumup\.org
+https?:\/\/([^\/]*\.)?bviagra\.ovp\.pl
+https?:\/\/([^\/]*\.)?bviagra1\.forumup\.org
+https?:\/\/([^\/]*\.)?bvse1\.szm\.sk
+https?:\/\/([^\/]*\.)?bwmi0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?bwzf6\.szm\.sk
+https?:\/\/([^\/]*\.)?bx6\.blrf\.net
+https?:\/\/([^\/]*\.)?bxanax\.c24\.pl
+https?:\/\/([^\/]*\.)?bxanax\.gog\.pl
+https?:\/\/([^\/]*\.)?bxanax1\.forumup\.org
+https?:\/\/([^\/]*\.)?byhydrocodone\.blog\.espresso\.repubblica\.it
+https?:\/\/([^\/]*\.)?bzxs\.org\.ua
+https?:\/\/([^\/]*\.)?c-canada\.com
+https?:\/\/([^\/]*\.)?c4taldron\.uy\.pl
+https?:\/\/([^\/]*\.)?c4tcaget\.blogcu\.com
+https?:\/\/([^\/]*\.)?c4tcoli\.td\.pl
+https?:\/\/([^\/]*\.)?c4tdarrel\.dl\.pl
+https?:\/\/([^\/]*\.)?c4tdronrel\.goodforum\.net
+https?:\/\/([^\/]*\.)?c4tdronrel\.grafbb\.com
+https?:\/\/([^\/]*\.)?c4tvarcna\.dl\.pl
+https?:\/\/([^\/]*\.)?ca57sgr0h\.org
+https?:\/\/([^\/]*\.)?cable-connection\.keckins\.be
+https?:\/\/([^\/]*\.)?caboboc\.blogcu\.com
+https?:\/\/([^\/]*\.)?cacalife\.com
+https?:\/\/([^\/]*\.)?cacas\.info
+https?:\/\/([^\/]*\.)?caculall\.forumzen\.com
+https?:\/\/([^\/]*\.)?cadiucna\.forumzen\.com
+https?:\/\/([^\/]*\.)?caeserch\.com
+https?:\/\/([^\/]*\.)?cafasc\.com
+https?:\/\/([^\/]*\.)?caguyea\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cahn\.mnsu\.edu
+https?:\/\/([^\/]*\.)?caitlyn-d66tmgwi1\.blogspot\.com
+https?:\/\/([^\/]*\.)?caked\.info
+https?:\/\/([^\/]*\.)?calciatore-nudo\.hostzz\.info
+https?:\/\/([^\/]*\.)?calcio-arbitri\.com
+https?:\/\/([^\/]*\.)?calcio-watch\.com
+https?:\/\/([^\/]*\.)?calcolo-rata-finanziamento\.ll33\.info
+https?:\/\/([^\/]*\.)?calendario-vari\.freespase\.info
+https?:\/\/([^\/]*\.)?calgary-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?californiamortgage-x\.com
+https?:\/\/([^\/]*\.)?call-kelly-com-ky\.blogspot\.com
+https?:\/\/([^\/]*\.)?call-kelly-com-tnm5k7042\.blogspot\.com
+https?:\/\/([^\/]*\.)?callie-es\.blogspot\.com
+https?:\/\/([^\/]*\.)?callsecurity\.blogspot\.com
+https?:\/\/([^\/]*\.)?camaro-r21nu37q\.blogspot\.com
+https?:\/\/([^\/]*\.)?camcrush-com-eudifxp82\.blogspot\.com
+https?:\/\/([^\/]*\.)?camcrush-com-igzig\.blogspot\.com
+https?:\/\/([^\/]*\.)?camcrush-com-my1v8l4\.blogspot\.com
+https?:\/\/([^\/]*\.)?camel-cigarettes\.s5\.com
+https?:\/\/([^\/]*\.)?camelclips-com-budun\.blogspot\.com
+https?:\/\/([^\/]*\.)?camelclips-com-d3s6o2\.blogspot\.com
+https?:\/\/([^\/]*\.)?camelclips-com-h6a5l\.blogspot\.com
+https?:\/\/([^\/]*\.)?camelmenthe\.blogspot\.com
+https?:\/\/([^\/]*\.)?cameralover\.net
+https?:\/\/([^\/]*\.)?camerascams\.info
+https?:\/\/([^\/]*\.)?cameron-h184o7b\.blogspot\.com
+https?:\/\/([^\/]*\.)?camini\.freehostss\.info
+https?:\/\/([^\/]*\.)?canada-birthday\.acb\.pl
+https?:\/\/([^\/]*\.)?canadian-pharmacyfur\.blogspot\.com
+https?:\/\/([^\/]*\.)?canadian-pharmacyyof\.blogspot\.com
+https?:\/\/([^\/]*\.)?cancer-skin\.nm\.ru
+https?:\/\/([^\/]*\.)?cancer-skin\.pochta\.ru
+https?:\/\/([^\/]*\.)?cancer_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?candi-door-hot-mom-next\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?candylist-com-dib\.blogspot\.com
+https?:\/\/([^\/]*\.)?candylist-com-ip72g5\.blogspot\.com
+https?:\/\/([^\/]*\.)?canjipiao\.com
+https?:\/\/([^\/]*\.)?cantante-arabe-sexy\.hostzz\.info
+https?:\/\/([^\/]*\.)?cantor-dz1h733\.blogspot\.com
+https?:\/\/([^\/]*\.)?caorzel\.discutforum\.com
+https?:\/\/([^\/]*\.)?capasdar\.td\.pl
+https?:\/\/([^\/]*\.)?car-free-insurance-quoteqch\.blogspot\.com
+https?:\/\/([^\/]*\.)?car-insurance-\.blogspot\.com
+https?:\/\/([^\/]*\.)?car-insurance-club\.com
+https?:\/\/([^\/]*\.)?car-insurance-p4zw\.blogspot\.com
+https?:\/\/([^\/]*\.)?car-insurance-ratsvex\.blogspot\.com
+https?:\/\/([^\/]*\.)?car-loan-newdma\.blogspot\.com
+https?:\/\/([^\/]*\.)?car-loan-neweei\.blogspot\.com
+https?:\/\/([^\/]*\.)?car1home\.info
+https?:\/\/([^\/]*\.)?carabidule\.net
+https?:\/\/([^\/]*\.)?carbest2006\.info
+https?:\/\/([^\/]*\.)?cardura-rapid-heartbeat\.tlg\.pl
+https?:\/\/([^\/]*\.)?care-skin\.pochta\.ru
+https?:\/\/([^\/]*\.)?career-business\.net
+https?:\/\/([^\/]*\.)?carepharmasite\.info
+https?:\/\/([^\/]*\.)?caribxpressparts\.com
+https?:\/\/([^\/]*\.)?caricc4t\.xa\.pl
+https?:\/\/([^\/]*\.)?carinsurance-x\.com
+https?:\/\/([^\/]*\.)?carinsuranceshh\.blogspot\.com
+https?:\/\/([^\/]*\.)?carisoprodol-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?carisoprodol\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?carisoprodol\.269g\.net
+https?:\/\/([^\/]*\.)?carisoprodol\.47\.pl
+https?:\/\/([^\/]*\.)?carisoprodol\.goodpharm\.info
+https?:\/\/([^\/]*\.)?carisoprodol\.hav\.pl
+https?:\/\/([^\/]*\.)?carisoprodol\.presteert\.nl
+https?:\/\/([^\/]*\.)?carisoprodol\.seesaa\.net
+https?:\/\/([^\/]*\.)?carisoprodol\.skocz\.net
+https?:\/\/([^\/]*\.)?carisoprodolrx\.weboficial\.com
+https?:\/\/([^\/]*\.)?carisoprodols\.blogspot\.com
+https?:\/\/([^\/]*\.)?carley-m3ia3\.blogspot\.com
+https?:\/\/([^\/]*\.)?carlie-a2s405\.blogspot\.com
+https?:\/\/([^\/]*\.)?carol-txxhdpnt\.blogspot\.com
+https?:\/\/([^\/]*\.)?carolina-w2aoe4xx\.blogspot\.com
+https?:\/\/([^\/]*\.)?carolyn-gp2s5\.blogspot\.com
+https?:\/\/([^\/]*\.)?carovi\.su\.pl
+https?:\/\/([^\/]*\.)?carson-ko8z7\.blogspot\.com
+https?:\/\/([^\/]*\.)?carspoker\.u288\.com
+https?:\/\/([^\/]*\.)?cartolina-pasqua\.host24h\.info
+https?:\/\/([^\/]*\.)?cartoon-free-gallery-gay\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cartoon-porn-clip-bloghvn\.blogspot\.com
+https?:\/\/([^\/]*\.)?carxm\.info
+https?:\/\/([^\/]*\.)?casaviva\.19mb\.info
+https?:\/\/([^\/]*\.)?cascq\.szm\.sk
+https?:\/\/([^\/]*\.)?casetvar\.forumzen\.com
+https?:\/\/([^\/]*\.)?cashadvance-x\.com
+https?:\/\/([^\/]*\.)?cashing-view\.com
+https?:\/\/([^\/]*\.)?casing\.dyndns\.dk
+https?:\/\/([^\/]*\.)?casino-555\.com
+https?:\/\/([^\/]*\.)?casino-attraction\.com
+https?:\/\/([^\/]*\.)?casino-games-wiki\.com
+https?:\/\/([^\/]*\.)?casino-magyck\.mutogen\.be
+https?:\/\/([^\/]*\.)?casino-ppp\.com
+https?:\/\/([^\/]*\.)?casino-startup\.com
+https?:\/\/([^\/]*\.)?casino-theory\.com
+https?:\/\/([^\/]*\.)?casino\.requirements\.be
+https?:\/\/([^\/]*\.)?casino1\.forumup\.org
+https?:\/\/([^\/]*\.)?casinos-new\.com
+https?:\/\/([^\/]*\.)?casinostates\.com
+https?:\/\/([^\/]*\.)?casper-a3r1z2a0\.blogspot\.com
+https?:\/\/([^\/]*\.)?cassay\.net
+https?:\/\/([^\/]*\.)?casual-boots\.massioni\.be
+https?:\/\/([^\/]*\.)?catch-c-teens\.blogspot\.com
+https?:\/\/([^\/]*\.)?catherine-tu75h6w\.blogspot\.com
+https?:\/\/([^\/]*\.)?catrelet\.forumzen\.com
+https?:\/\/([^\/]*\.)?cats-wjbreb7e\.blogspot\.com
+https?:\/\/([^\/]*\.)?cayuga-g2legvldk2\.blogspot\.com
+https?:\/\/([^\/]*\.)?cazelmon\.lolforum\.net
+https?:\/\/([^\/]*\.)?cazelolo\.dl\.pl
+https?:\/\/([^\/]*\.)?cbbi\.cn
+https?:\/\/([^\/]*\.)?cbhi8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cbkf0\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?cbwgkm8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cc5f\.dnyp\.com
+https?:\/\/([^\/]*\.)?ccak1\.szm\.sk
+https?:\/\/([^\/]*\.)?ccal\.cultureforum\.net
+https?:\/\/([^\/]*\.)?ccclfak\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ccheapcelexa\.ovp\.pl
+https?:\/\/([^\/]*\.)?ccheapvaliumonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ccline\.info
+https?:\/\/([^\/]*\.)?ccnarac\.uy\.pl
+https?:\/\/([^\/]*\.)?ccobhv7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cdq\.dzsbcn\.com
+https?:\/\/([^\/]*\.)?cdsmart\.info
+https?:\/\/([^\/]*\.)?cdzhs\.szm\.sk
+https?:\/\/([^\/]*\.)?ceasius\.blogspot\.com
+https?:\/\/([^\/]*\.)?cecily-koj\.blogspot\.com
+https?:\/\/([^\/]*\.)?ceclor\.tlg\.pl
+https?:\/\/([^\/]*\.)?celeb-filipina-movie-site\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?celebrex-911\.coz\.in
+https?:\/\/([^\/]*\.)?celebrex-celecoxib-200mg\.tlg\.pl
+https?:\/\/([^\/]*\.)?celebrex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?celebrity-sex-video-n-q-x\.blogspot\.com
+https?:\/\/([^\/]*\.)?celebrity-sex-video\.0800-porn\.com
+https?:\/\/([^\/]*\.)?celebrityprofiler\.com
+https?:\/\/([^\/]*\.)?celelt\.dl\.pl
+https?:\/\/([^\/]*\.)?celeste-mi8q701\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexa\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?celexa\.269g\.net
+https?:\/\/([^\/]*\.)?celexafcy\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexaodt\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexavby\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexavcc\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexazer\.blogspot\.com
+https?:\/\/([^\/]*\.)?celexxaonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?celine-ajha0vxo6\.blogspot\.com
+https?:\/\/([^\/]*\.)?celtic-frost-ringtonedbg\.blogspot\.com
+https?:\/\/([^\/]*\.)?celtic-frost-ringtonepxe\.blogspot\.com
+https?:\/\/([^\/]*\.)?celtic-ring\.boom\.ru
+https?:\/\/([^\/]*\.)?celtic1ring\.chat\.ru
+https?:\/\/([^\/]*\.)?cemast\.com
+https?:\/\/([^\/]*\.)?center-csy73nq1\.blogspot\.com
+https?:\/\/([^\/]*\.)?century-21\.co\.jp
+https?:\/\/([^\/]*\.)?cephalexin\.dynalias\.net
+https?:\/\/([^\/]*\.)?cephalexin\.kicks-ass\.net
+https?:\/\/([^\/]*\.)?cephalexinvyp\.blogspot\.com
+https?:\/\/([^\/]*\.)?ceremi\.com
+https?:\/\/([^\/]*\.)?cerveza\.republika\.pl
+https?:\/\/([^\/]*\.)?cetki\.blogspot\.com
+https?:\/\/([^\/]*\.)?cetuna\.com
+https?:\/\/([^\/]*\.)?cfhc2\.szm\.sk
+https?:\/\/([^\/]*\.)?cfi-tp\.blogspot\.com
+https?:\/\/([^\/]*\.)?cgj-wmkd0p54ap\.blogspot\.com
+https?:\/\/([^\/]*\.)?chain\.webmelia\.com
+https?:\/\/([^\/]*\.)?champion-ghdm2p\.blogspot\.com
+https?:\/\/([^\/]*\.)?chancec-i0\.blogspot\.com
+https?:\/\/([^\/]*\.)?chandler-ozbi2l\.blogspot\.com
+https?:\/\/([^\/]*\.)?chanel-ag2w\.blogspot\.com
+https?:\/\/([^\/]*\.)?charity-eu\.blogspot\.com
+https?:\/\/([^\/]*\.)?charles-rp7s\.blogspot\.com
+https?:\/\/([^\/]*\.)?charlie-gl3ig\.blogspot\.com
+https?:\/\/([^\/]*\.)?charming-kbatna2k\.blogspot\.com
+https?:\/\/([^\/]*\.)?charvis-mj35\.blogspot\.com
+https?:\/\/([^\/]*\.)?chase-online-bankingdir\.blogspot\.com
+https?:\/\/([^\/]*\.)?chasehunt\.com
+https?:\/\/([^\/]*\.)?chasity-oy2mgww10\.blogspot\.com
+https?:\/\/([^\/]*\.)?chat-a7gdn35u\.blogspot\.com
+https?:\/\/([^\/]*\.)?chat-gay-ohio-room\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?chat\.infty\.net
+https?:\/\/([^\/]*\.)?chatelaine-free-lipstick\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?chatou\.dzsc\.com
+https?:\/\/([^\/]*\.)?chatsky\.cn
+https?:\/\/([^\/]*\.)?chaucer\.umuc\.edu
+https?:\/\/([^\/]*\.)?chayse-c0z2untnw\.blogspot\.com
+https?:\/\/([^\/]*\.)?chazuo\.dzsc\.com
+https?:\/\/([^\/]*\.)?chazz-d86hk\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheap-cialis\.presteert\.nl
+https?:\/\/([^\/]*\.)?cheap-hydrocodone\.presteert\.nl
+https?:\/\/([^\/]*\.)?cheap-phentermine\.cheapills\.info
+https?:\/\/([^\/]*\.)?cheap-phentermine\.esguay\.com
+https?:\/\/([^\/]*\.)?cheap-phentermine\.health-livening\.com
+https?:\/\/([^\/]*\.)?cheap-phentermine\.presteert\.nl
+https?:\/\/([^\/]*\.)?cheap-rocky-boot\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?cheap-soma-online\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheap-tramadol-onlin\.zikforum\.com
+https?:\/\/([^\/]*\.)?cheap-tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?cheap-tramadol\.cheapills\.info
+https?:\/\/([^\/]*\.)?cheap-tramadol\.presteert\.nl
+https?:\/\/([^\/]*\.)?cheap-trashy-lingerie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cheap-travel-deal\.globaltr\.info
+https?:\/\/([^\/]*\.)?cheap-valium\.cheapills\.info
+https?:\/\/([^\/]*\.)?cheap-viagra\.health-livening\.com
+https?:\/\/([^\/]*\.)?cheap-viagra\.presteert\.nl
+https?:\/\/([^\/]*\.)?cheap-xanax\.us\.tf
+https?:\/\/([^\/]*\.)?cheapcialiss\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapest-pills\.org
+https?:\/\/([^\/]*\.)?cheapest-viagra-source\.com
+https?:\/\/([^\/]*\.)?cheapestlakerstickets\.com
+https?:\/\/([^\/]*\.)?cheaplakertickets\.com
+https?:\/\/([^\/]*\.)?cheappcialis\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapphentermine\.livelog\.com
+https?:\/\/([^\/]*\.)?cheapphenterminee\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapphntermine\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheappvalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheappviagra\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapsuperbowltickets\.com
+https?:\/\/([^\/]*\.)?cheaptramadol\.forospace\.com
+https?:\/\/([^\/]*\.)?cheaptramadols\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheaptramadolz\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapvaliumm\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapvvalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapxanaxx\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheapxxanax\.ovp\.pl
+https?:\/\/([^\/]*\.)?cheater-t3si78zbf\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheats-e2p3o7nhm\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheaviagra\.blogsome\.com
+https?:\/\/([^\/]*\.)?checkers-wn88\.blogspot\.com
+https?:\/\/([^\/]*\.)?checkproxy\.com
+https?:\/\/([^\/]*\.)?cheerleader-child-photo\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cheerleader-dolphin\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cheerleader-gallery-naughty\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?cheerleader-upskirt-picture\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?cheese-ratzl\.blogspot\.com
+https?:\/\/([^\/]*\.)?chellam-g2w\.blogspot\.com
+https?:\/\/([^\/]*\.)?chelsey-kifs\.blogspot\.com
+https?:\/\/([^\/]*\.)?chem-iv1c82\.blogspot\.com
+https?:\/\/([^\/]*\.)?chemistry-mrrx5e\.blogspot\.com
+https?:\/\/([^\/]*\.)?chemistry\.org\.ua
+https?:\/\/([^\/]*\.)?cheng-o08if\.blogspot\.com
+https?:\/\/([^\/]*\.)?chenglong\.com\.cn
+https?:\/\/([^\/]*\.)?cher-aorxm1s3j7\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheryl-b8\.blogspot\.com
+https?:\/\/([^\/]*\.)?chess-cy\.blogspot\.com
+https?:\/\/([^\/]*\.)?chester1-tfkfl51eb\.blogspot\.com
+https?:\/\/([^\/]*\.)?chevroletcam\.cn
+https?:\/\/([^\/]*\.)?chevy-ekv8ph\.blogspot\.com
+https?:\/\/([^\/]*\.)?chevy1-wwok0ww55\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheyanne-rnriiwno6l\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheyenne-g3l5fa87\.blogspot\.com
+https?:\/\/([^\/]*\.)?cheyne-hm7aik5u\.blogspot\.com
+https?:\/\/([^\/]*\.)?chfielde\.ifrance\.com
+https?:\/\/([^\/]*\.)?chic-ks\.blogspot\.com
+https?:\/\/([^\/]*\.)?chicago-kou3c7e58\.blogspot\.com
+https?:\/\/([^\/]*\.)?chick-gay-kissing\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?chicken-i66t8z76\.blogspot\.com
+https?:\/\/([^\/]*\.)?chico-myg8bv\.blogspot\.com
+https?:\/\/([^\/]*\.)?chidneuer\.frbb\.net
+https?:\/\/([^\/]*\.)?chidronrac\.ephpbb\.com
+https?:\/\/([^\/]*\.)?chidronrec\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?chiefs-oob\.blogspot\.com
+https?:\/\/([^\/]*\.)?chilacna\.td\.pl
+https?:\/\/([^\/]*\.)?child-leg-pain\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?chilton-b82sebrrue\.blogspot\.com
+https?:\/\/([^\/]*\.)?chimp-cu4gvwsceg\.blogspot\.com
+https?:\/\/([^\/]*\.)?china--magnet\.com
+https?:\/\/([^\/]*\.)?china-dwcuzqft6\.blogspot\.com
+https?:\/\/([^\/]*\.)?china-made-door\.com\.cn
+https?:\/\/([^\/]*\.)?china01\.52blog\.net
+https?:\/\/([^\/]*\.)?china02\.52blog\.net
+https?:\/\/([^\/]*\.)?china1\.52blog\.net
+https?:\/\/([^\/]*\.)?china1\.yculblog\.com
+https?:\/\/([^\/]*\.)?china2\.52blog\.net
+https?:\/\/([^\/]*\.)?china2\.yculblog\.com
+https?:\/\/([^\/]*\.)?china3\.yculblog\.com
+https?:\/\/([^\/]*\.)?chinacarcenter\.net
+https?:\/\/([^\/]*\.)?chinacid\.com
+https?:\/\/([^\/]*\.)?chinafoo\.com
+https?:\/\/([^\/]*\.)?chinafurnace\.net
+https?:\/\/([^\/]*\.)?chinakj\.net
+https?:\/\/([^\/]*\.)?chinalhcz\.com
+https?:\/\/([^\/]*\.)?chinaprojectors\.com
+https?:\/\/([^\/]*\.)?chinatranslation\.net
+https?:\/\/([^\/]*\.)?chinayoujiu\.com
+https?:\/\/([^\/]*\.)?chinese-google\.com
+https?:\/\/([^\/]*\.)?chineseaids\.com
+https?:\/\/([^\/]*\.)?chineseaids\.net
+https?:\/\/([^\/]*\.)?chinesezhouyi\.com
+https?:\/\/([^\/]*\.)?chip-thz\.blogspot\.com
+https?:\/\/([^\/]*\.)?chipper-eusa\.blogspot\.com
+https?:\/\/([^\/]*\.)?chippewa-work-boot\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?chiquita-wqok0t741\.blogspot\.com
+https?:\/\/([^\/]*\.)?chiricc4t\.zj\.pl
+https?:\/\/([^\/]*\.)?chiricdel\.fr-bb\.com
+https?:\/\/([^\/]*\.)?chitr\.discutforum\.com
+https?:\/\/([^\/]*\.)?chizelc\.goodforum\.net
+https?:\/\/([^\/]*\.)?chizelc\.grafbb\.com
+https?:\/\/([^\/]*\.)?chizelno\.cultureforum\.net
+https?:\/\/([^\/]*\.)?chkawai\.cn
+https?:\/\/([^\/]*\.)?chocolat-g4\.blogspot\.com
+https?:\/\/([^\/]*\.)?chocolate\.my10gb\.com
+https?:\/\/([^\/]*\.)?chongdianqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?chops-hg47n04tvi\.blogspot\.com
+https?:\/\/([^\/]*\.)?choudoufu\.com
+https?:\/\/([^\/]*\.)?chris-ks6u6dj\.blogspot\.com
+https?:\/\/([^\/]*\.)?chrissy-oyo8z\.blogspot\.com
+https?:\/\/([^\/]*\.)?christ-acczbi1t\.blogspot\.com
+https?:\/\/([^\/]*\.)?christen-bttdc0kn\.blogspot\.com
+https?:\/\/([^\/]*\.)?christeta\.com
+https?:\/\/([^\/]*\.)?christia-ccf2e6\.blogspot\.com
+https?:\/\/([^\/]*\.)?christiaan-dvb\.blogspot\.com
+https?:\/\/([^\/]*\.)?christianj-t3e1j3\.blogspot\.com
+https?:\/\/([^\/]*\.)?christin-ee1qjx\.blogspot\.com
+https?:\/\/([^\/]*\.)?christina-aguilera-pic\.blogspot\.com
+https?:\/\/([^\/]*\.)?christina-wf\.blogspot\.com
+https?:\/\/([^\/]*\.)?christine-rgosvndiqw\.blogspot\.com
+https?:\/\/([^\/]*\.)?christoffe-g4e\.blogspot\.com
+https?:\/\/([^\/]*\.)?christop-hqhff\.blogspot\.com
+https?:\/\/([^\/]*\.)?christy-kflb274n\.blogspot\.com
+https?:\/\/([^\/]*\.)?chrome-it8j\.blogspot\.com
+https?:\/\/([^\/]*\.)?chrykne\.info
+https?:\/\/([^\/]*\.)?chrystian-mgxw3jyfb1\.blogspot\.com
+https?:\/\/([^\/]*\.)?chuanganqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?chubby-bear-pic\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?chubby-chick\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?chubby-cum\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?chubby-teens-tus\.blogspot\.com
+https?:\/\/([^\/]*\.)?chuck-oh\.blogspot\.com
+https?:\/\/([^\/]*\.)?chucky-aklnscme\.blogspot\.com
+https?:\/\/([^\/]*\.)?chulyt\.com
+https?:\/\/([^\/]*\.)?church-b0w4\.blogspot\.com
+https?:\/\/([^\/]*\.)?chuvak-org\.blogspot\.com
+https?:\/\/([^\/]*\.)?chvpqa7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?chyna-c2\.blogspot\.com
+https?:\/\/([^\/]*\.)?ci-video-pornograficos-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?cialis-for-sale\.com
+https?:\/\/([^\/]*\.)?cialis-ok-1\.blogspot\.com
+https?:\/\/([^\/]*\.)?cialis-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?cialis-pharma\.tripod\.com
+https?:\/\/([^\/]*\.)?cialis-soft-tabs\.com
+https?:\/\/([^\/]*\.)?cialis\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?cialis\.esguay\.com
+https?:\/\/([^\/]*\.)?cialis\.fws1\.com
+https?:\/\/([^\/]*\.)?cialis\.goodpharm\.info
+https?:\/\/([^\/]*\.)?cialis\.page\.tl
+https?:\/\/([^\/]*\.)?cialis\.presteert\.nl
+https?:\/\/([^\/]*\.)?cialis\.rx4\.org
+https?:\/\/([^\/]*\.)?cialis\.seesaa\.net
+https?:\/\/([^\/]*\.)?cialis\.skocz\.net
+https?:\/\/([^\/]*\.)?cialises\.us\.tf
+https?:\/\/([^\/]*\.)?cialisjiq\.blogspot\.com
+https?:\/\/([^\/]*\.)?cialispills\.blog\.hr
+https?:\/\/([^\/]*\.)?cialisrx\.weboficial\.com
+https?:\/\/([^\/]*\.)?cialisx\.host-page\.com
+https?:\/\/([^\/]*\.)?ciara-d0\.blogspot\.com
+https?:\/\/([^\/]*\.)?cierra-t1f0hy\.blogspot\.com
+https?:\/\/([^\/]*\.)?cigar-ekelo\.blogspot\.com
+https?:\/\/([^\/]*\.)?cigarettes-smoking-online\.com
+https?:\/\/([^\/]*\.)?cigarettes\.4\.pl
+https?:\/\/([^\/]*\.)?cilmer\.com
+https?:\/\/([^\/]*\.)?cinast\.com
+https?:\/\/([^\/]*\.)?cincydj\.ifrance\.com
+https?:\/\/([^\/]*\.)?cinder-w6\.blogspot\.com
+https?:\/\/([^\/]*\.)?cindi-ruo8\.blogspot\.com
+https?:\/\/([^\/]*\.)?cindy-gdhs2i21u6\.blogspot\.com
+https?:\/\/([^\/]*\.)?cinem4\.com
+https?:\/\/([^\/]*\.)?cingularringtones\.269g\.net
+https?:\/\/([^\/]*\.)?ciplactin\.tlg\.pl
+https?:\/\/([^\/]*\.)?ciprobuy\.hop\.to
+https?:\/\/([^\/]*\.)?ciprobuycheap\.firstpage\.de
+https?:\/\/([^\/]*\.)?ciprobuygeneric\.move\.to
+https?:\/\/([^\/]*\.)?ciprocheap\.dive\.to
+https?:\/\/([^\/]*\.)?ciprofloxacin\.xwiki\.com
+https?:\/\/([^\/]*\.)?ciprogeneric\.i\.am
+https?:\/\/([^\/]*\.)?citdokcna\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?citeccit\.forumculture\.net
+https?:\/\/([^\/]*\.)?citpocit\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?civisi\.com
+https?:\/\/([^\/]*\.)?cixingcailiao\.dzsc\.com
+https?:\/\/([^\/]*\.)?cjhx6\.szm\.sk
+https?:\/\/([^\/]*\.)?ckalv\.szm\.sk
+https?:\/\/([^\/]*\.)?ckfhhw4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ckqabl1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?claca\.blogcu\.com
+https?:\/\/([^\/]*\.)?claire-k6kkha\.blogspot\.com
+https?:\/\/([^\/]*\.)?clancy-i1ib\.blogspot\.com
+https?:\/\/([^\/]*\.)?clara-mj6ts\.blogspot\.com
+https?:\/\/([^\/]*\.)?clarissa-o14r\.blogspot\.com
+https?:\/\/([^\/]*\.)?clark-asa0i3mfvr\.blogspot\.com
+https?:\/\/([^\/]*\.)?classic-porn-clip-zoneykt\.blogspot\.com
+https?:\/\/([^\/]*\.)?claude-blw\.blogspot\.com
+https?:\/\/([^\/]*\.)?claudia-c7ut8jj4\.blogspot\.com
+https?:\/\/([^\/]*\.)?clay-e-facial-mask-vitamin\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cleaner-ddiggwqy1t\.blogspot\.com
+https?:\/\/([^\/]*\.)?clearmp3\.net
+https?:\/\/([^\/]*\.)?clerk\.lir\.dk
+https?:\/\/([^\/]*\.)?cletoac\.lolbb\.com
+https?:\/\/([^\/]*\.)?cleveland-txjimr\.blogspot\.com
+https?:\/\/([^\/]*\.)?clickhere2\.net
+https?:\/\/([^\/]*\.)?clior\.graphforum\.com
+https?:\/\/([^\/]*\.)?clip-ebony-lesbian-porn\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?clip-ebony-porn\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?clip-free-hand-job-movie-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?clip-free-porn-psp-newsy66\.blogspot\.com
+https?:\/\/([^\/]*\.)?clip-hentai\.dreamsuit\.net
+https?:\/\/([^\/]*\.)?clip-hunter-porn-blogctv\.blogspot\.com
+https?:\/\/([^\/]*\.)?clip-hunter-porn-zone8y6\.blogspot\.com
+https?:\/\/([^\/]*\.)?clip-malay-porn-newsgrq\.blogspot\.com
+https?:\/\/([^\/]*\.)?clip-malay-porn-zone1w3\.blogspot\.com
+https?:\/\/([^\/]*\.)?clipgalaxy-com-i4z645\.blogspot\.com
+https?:\/\/([^\/]*\.)?clipgalaxy-com-io8ncz\.blogspot\.com
+https?:\/\/([^\/]*\.)?clipper-e2buyg\.blogspot\.com
+https?:\/\/([^\/]*\.)?clirol\.dl\.pl
+https?:\/\/([^\/]*\.)?clit-huge-real\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?cllivers\.dl\.pl
+https?:\/\/([^\/]*\.)?clobetasol-propionate\.tlg\.pl
+https?:\/\/([^\/]*\.)?cloclo-w046r\.blogspot\.com
+https?:\/\/([^\/]*\.)?clonazepam\.us\.tf
+https?:\/\/([^\/]*\.)?clonazepamscz\.blogspot\.com
+https?:\/\/([^\/]*\.)?clonazepamuej\.blogspot\.com
+https?:\/\/([^\/]*\.)?clonsex\.info
+https?:\/\/([^\/]*\.)?closeout-womens-rain-boot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?clothes-newborns\.loretic\.be
+https?:\/\/([^\/]*\.)?cloudydayshadow\.blogspot\.com
+https?:\/\/([^\/]*\.)?clover-rs04\.blogspot\.com
+https?:\/\/([^\/]*\.)?clowns-gloi\.blogspot\.com
+https?:\/\/([^\/]*\.)?clu\.cn
+https?:\/\/([^\/]*\.)?clumsy-hl0fwl1k\.blogspot\.com
+https?:\/\/([^\/]*\.)?cluster-k4ovd06ibi\.blogspot\.com
+https?:\/\/([^\/]*\.)?clwilbur\.ifrance\.com
+https?:\/\/([^\/]*\.)?clyaod2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cmauq\.com
+https?:\/\/([^\/]*\.)?cmnanwe\.com
+https?:\/\/([^\/]*\.)?cmsrt\.szm\.sk
+https?:\/\/([^\/]*\.)?cmubroadway\.blogspot\.com
+https?:\/\/([^\/]*\.)?cnaalget\.graphforum\.com
+https?:\/\/([^\/]*\.)?cnaalget\.highforum\.net
+https?:\/\/([^\/]*\.)?cnac4t-or\.bbgraf\.com
+https?:\/\/([^\/]*\.)?cnadel6or6\.dl\.pl
+https?:\/\/([^\/]*\.)?cnaeltbo\.discutforum\.com
+https?:\/\/([^\/]*\.)?cnaeltdron\.bb-fr\.com
+https?:\/\/([^\/]*\.)?cnapasou\.graphforum\.com
+https?:\/\/([^\/]*\.)?cnatral\.xa\.pl
+https?:\/\/([^\/]*\.)?cnbess\.com
+https?:\/\/([^\/]*\.)?cnbf2\.szm\.sk
+https?:\/\/([^\/]*\.)?cncarcenter\.com
+https?:\/\/([^\/]*\.)?cnfibernet\.com\.cn
+https?:\/\/([^\/]*\.)?cnmarketingresearch\.com
+https?:\/\/([^\/]*\.)?cnplayhome\.cn
+https?:\/\/([^\/]*\.)?cnticket\.net
+https?:\/\/([^\/]*\.)?co-alf\.blogspot\.com
+https?:\/\/([^\/]*\.)?co-video-de-sexo-gratis-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?co6or6bo\.dl\.pl
+https?:\/\/([^\/]*\.)?coacdar\.bbfr\.net
+https?:\/\/([^\/]*\.)?coachescorner\.com
+https?:\/\/([^\/]*\.)?cock-and-ball-punishment\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cock-deep-huge-throat\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cock-love-teen\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?cock-petite-sucker\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?cock-roaches-picture\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?cock-sexy-sucker\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?cock-story-sucker\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cocnacna\.dl\.pl
+https?:\/\/([^\/]*\.)?cocoel\.lightbb\.com
+https?:\/\/([^\/]*\.)?coconel\.frbb\.net
+https?:\/\/([^\/]*\.)?codarget\.dl\.pl
+https?:\/\/([^\/]*\.)?codigodor\.blogspot\.com
+https?:\/\/([^\/]*\.)?coiqen\.com
+https?:\/\/([^\/]*\.)?cold-hard-bitch-lyric\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?college-fucking-video-free\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?college1-degree\.boom\.ru
+https?:\/\/([^\/]*\.)?college1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?college1degree1p\.chat\.ru
+https?:\/\/([^\/]*\.)?colodom\.frbb\.net
+https?:\/\/([^\/]*\.)?colorado\.edu
+https?:\/\/([^\/]*\.)?coloradomortgage-x\.com
+https?:\/\/([^\/]*\.)?com-dick-fick-n-suck\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?comic-fetish-info-remember\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?comic-hardcore-info-remember-sex\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?comicvmarriage\.spycams777\.com
+https?:\/\/([^\/]*\.)?commercialleaseonline\.info
+https?:\/\/([^\/]*\.)?communicationagency\.com
+https?:\/\/([^\/]*\.)?comontr\.bb-fr\.com
+https?:\/\/([^\/]*\.)?companyforyou\.com
+https?:\/\/([^\/]*\.)?competitio\.ifrance\.com
+https?:\/\/([^\/]*\.)?computer-desk\.fromru\.com
+https?:\/\/([^\/]*\.)?computer1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?computerxchange\.com
+https?:\/\/([^\/]*\.)?comradealtmer\.blogspot\.com
+https?:\/\/([^\/]*\.)?condition-skin\.newmail\.ru
+https?:\/\/([^\/]*\.)?condition_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?condom-delivered-free-free-uk\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?condom-picture-penis\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?connecticutmortgage-x\.com
+https?:\/\/([^\/]*\.)?conor2k\.007webpro\.com
+https?:\/\/([^\/]*\.)?consistmay\.tripod\.com
+https?:\/\/([^\/]*\.)?consolidation-loan-studentqdl\.blogspot\.com
+https?:\/\/([^\/]*\.)?consultanthub\.com
+https?:\/\/([^\/]*\.)?cooking-crazy\.com
+https?:\/\/([^\/]*\.)?cool-mp3\.biz
+https?:\/\/([^\/]*\.)?coolhost\.biz
+https?:\/\/([^\/]*\.)?copasleto\.zj\.pl
+https?:\/\/([^\/]*\.)?copyok\.net
+https?:\/\/([^\/]*\.)?coricidin\.tlg\.pl
+https?:\/\/([^\/]*\.)?cornut\.ipupdater\.com
+https?:\/\/([^\/]*\.)?coro-aaliyah\.blogspot\.com
+https?:\/\/([^\/]*\.)?corporategifts-guide\.com
+https?:\/\/([^\/]*\.)?corsv\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?cortech\.cn
+https?:\/\/([^\/]*\.)?cositbo\.bbgraf\.com
+https?:\/\/([^\/]*\.)?cosmiboe\.forumzen\.com
+https?:\/\/([^\/]*\.)?cosmicray\.umd\.edu
+https?:\/\/([^\/]*\.)?coswishe\.dl\.pl
+https?:\/\/([^\/]*\.)?cotton-gloves\.loretic\.be
+https?:\/\/([^\/]*\.)?counciloflight\.com
+https?:\/\/([^\/]*\.)?couple-fucking-photo\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?couple-kissing-pic\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?couponmountain\.com
+https?:\/\/([^\/]*\.)?courses\.csusm\.edu
+https?:\/\/([^\/]*\.)?courtinfroggie\.blogspot\.com
+https?:\/\/([^\/]*\.)?covarou\.su\.pl
+https?:\/\/([^\/]*\.)?cowei\.net
+https?:\/\/([^\/]*\.)?cowlist-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?cozaar\.4\.pl
+https?:\/\/([^\/]*\.)?cozaarbuy\.hello\.to
+https?:\/\/([^\/]*\.)?cozaarcheap\.mysite\.de
+https?:\/\/([^\/]*\.)?cozaarcheapgeneric\.warp9\.to
+https?:\/\/([^\/]*\.)?cozaargeneric\.everything\.at
+https?:\/\/([^\/]*\.)?cozaargenericcheap\.dive\.to
+https?:\/\/([^\/]*\.)?cpayscom\.xwiki\.com
+https?:\/\/([^\/]*\.)?cpkna\.szm\.sk
+https?:\/\/([^\/]*\.)?cpsyy\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?cpyngke\.com
+https?:\/\/([^\/]*\.)?cqbhn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cqfmz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cqjbjx1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cr4ix7\.com
+https?:\/\/([^\/]*\.)?crabs\.isgre\.at
+https?:\/\/([^\/]*\.)?cramp-hand-leg\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?crashdome\.info
+https?:\/\/([^\/]*\.)?crazyvirgin\.info
+https?:\/\/([^\/]*\.)?crbackus\.dl\.pl
+https?:\/\/([^\/]*\.)?crcather\.dl\.pl
+https?:\/\/([^\/]*\.)?cream-facial-pie\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cream-hairy-mature-movie-pie-pussy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?creampie\.coz\.in
+https?:\/\/([^\/]*\.)?creating-a-boot-cd\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?credit-dreams\.com
+https?:\/\/([^\/]*\.)?creditcards-x\.com
+https?:\/\/([^\/]*\.)?credoninc\.com
+https?:\/\/([^\/]*\.)?crestor-rx\.one2you\.info
+https?:\/\/([^\/]*\.)?crestor\.dynalias\.net
+https?:\/\/([^\/]*\.)?criminal-j-degre\.boom\.ru
+https?:\/\/([^\/]*\.)?crimson-teens\.freeinsite\.net
+https?:\/\/([^\/]*\.)?cristal-fenix\.isuisse\.com
+https?:\/\/([^\/]*\.)?crookedscud\.myfreewebs\.net
+https?:\/\/([^\/]*\.)?crossed-leg-gallery\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?crossed-leg-short-skirt-stocking-top\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?crrenee\.dl\.pl
+https?:\/\/([^\/]*\.)?crsundke\.dl\.pl
+https?:\/\/([^\/]*\.)?cruise-guide\.org
+https?:\/\/([^\/]*\.)?cruise-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?crzvh\.szm\.sk
+https?:\/\/([^\/]*\.)?cscla\.net
+https?:\/\/([^\/]*\.)?cscserver\.cc\.edu
+https?:\/\/([^\/]*\.)?csitdom\.bbgraf\.com
+https?:\/\/([^\/]*\.)?csmwui11\.com
+https?:\/\/([^\/]*\.)?csosandbox\.clemson\.edu
+https?:\/\/([^\/]*\.)?ctdq0\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ctl\.csudh\.edu
+https?:\/\/([^\/]*\.)?ctusxc4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?cubaka\.yi\.org
+https?:\/\/([^\/]*\.)?cufgq\.szm\.sk
+https?:\/\/([^\/]*\.)?cuicui\.monblog\.ch
+https?:\/\/([^\/]*\.)?cuiugcg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?culinary-school\.newmail\.ru
+https?:\/\/([^\/]*\.)?culinary1school\.chat\.ru
+https?:\/\/([^\/]*\.)?cum-drenched-pantie\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-drink-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-dvd-face-private-private-rip-vcd\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?cum-ebony-face\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?cum-face-asian\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?cum-face-pic\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-face-picture\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-facial-messy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?cum-facial-video-free-clip\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cum-filled-pussy-picture\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-kiss-lick-shoes-suck-worship\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cum-mouth-ebony\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cum-nurse-sex-shot\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?cum-se-face-sex\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?cum-shot-movie\.dreamsuit\.net
+https?:\/\/([^\/]*\.)?cum-swallow-vids\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?cuola\.goodforum\.net
+https?:\/\/([^\/]*\.)?cut-xmeup-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?cute-ebony-girl\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?cute-girldzy\.blogspot\.com
+https?:\/\/([^\/]*\.)?cutgetolo\.zikforum\.com
+https?:\/\/([^\/]*\.)?cutvili\.winnerforum\.net
+https?:\/\/([^\/]*\.)?cvep2\.szm\.sk
+https?:\/\/([^\/]*\.)?cvipm\.com
+https?:\/\/([^\/]*\.)?cxolt\.szm\.sk
+https?:\/\/([^\/]*\.)?cyberlinx\.us
+https?:\/\/([^\/]*\.)?cycleworldsuzuki\.info
+https?:\/\/([^\/]*\.)?cyclobenzaprine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?cysrf\.szm\.sk
+https?:\/\/([^\/]*\.)?cytonrok\.forumculture\.net
+https?:\/\/([^\/]*\.)?czelvar\.su\.pl
+https?:\/\/([^\/]*\.)?czis0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?d-z-free-lesbian-movie-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?daddy-bear-gay\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?daddy-long-leg-venom\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?daily-porn-clip-news0we\.blogspot\.com
+https?:\/\/([^\/]*\.)?dailybasis-com-cky8ax\.blogspot\.com
+https?:\/\/([^\/]*\.)?dami3\.com
+https?:\/\/([^\/]*\.)?danazol\.4\.pl
+https?:\/\/([^\/]*\.)?dance-instruction\.lkerfocu\.be
+https?:\/\/([^\/]*\.)?danga4ka\.blogspot\.com
+https?:\/\/([^\/]*\.)?dansmovies-com-mu2ywho24d\.blogspot\.com
+https?:\/\/([^\/]*\.)?daractr\.goodbb\.net
+https?:\/\/([^\/]*\.)?darboboc\.dl\.pl
+https?:\/\/([^\/]*\.)?darboctroc\.dl\.pl
+https?:\/\/([^\/]*\.)?darcnaec\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?darcoca\.dl\.pl
+https?:\/\/([^\/]*\.)?dardomcna\.blogcu\.com
+https?:\/\/([^\/]*\.)?dardomdom\.darkbb\.com
+https?:\/\/([^\/]*\.)?dardomzel\.blogcu\.com
+https?:\/\/([^\/]*\.)?dare-poker\.com
+https?:\/\/([^\/]*\.)?darelttr\.dl\.pl
+https?:\/\/([^\/]*\.)?dargetou\.darkbb\.com
+https?:\/\/([^\/]*\.)?darladom\.td\.pl
+https?:\/\/([^\/]*\.)?darlala\.winnerforum\.net
+https?:\/\/([^\/]*\.)?darlina-a1vds\.blogspot\.com
+https?:\/\/([^\/]*\.)?darlina-akp4\.blogspot\.com
+https?:\/\/([^\/]*\.)?darlina-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?darlina-tcifizmx\.blogspot\.com
+https?:\/\/([^\/]*\.)?darmonrol\.zj\.pl
+https?:\/\/([^\/]*\.)?darricer\.fr-bb\.com
+https?:\/\/([^\/]*\.)?darzeltroc\.dl\.pl
+https?:\/\/([^\/]*\.)?dasepluv\.dl\.pl
+https?:\/\/([^\/]*\.)?dashulya\.blogspot\.com
+https?:\/\/([^\/]*\.)?dastino\.republika\.pl
+https?:\/\/([^\/]*\.)?data-mining\.massioni\.be
+https?:\/\/([^\/]*\.)?datangid\.com
+https?:\/\/([^\/]*\.)?datasol\.org
+https?:\/\/([^\/]*\.)?dating-advice\.sexnation\.info
+https?:\/\/([^\/]*\.)?dating-direct\.sexnation\.info
+https?:\/\/([^\/]*\.)?dating\.sexnation\.info
+https?:\/\/([^\/]*\.)?dave-hollister-ringtoneezm\.blogspot\.com
+https?:\/\/([^\/]*\.)?dave-hollister-ringtonefoi\.blogspot\.com
+https?:\/\/([^\/]*\.)?dave-hollister-ringtonewqs\.blogspot\.com
+https?:\/\/([^\/]*\.)?davejackson\.com
+https?:\/\/([^\/]*\.)?davte\.info
+https?:\/\/([^\/]*\.)?dawsonanddadrealty\.com
+https?:\/\/([^\/]*\.)?dayzve4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dbxbqb7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dc-escort-gay\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?dcuoo\.szm\.sk
+https?:\/\/([^\/]*\.)?dcx\.org\.ua
+https?:\/\/([^\/]*\.)?ddfz1\.szm\.sk
+https?:\/\/([^\/]*\.)?ddlive\.info
+https?:\/\/([^\/]*\.)?ddovj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ddpb6\.szm\.sk
+https?:\/\/([^\/]*\.)?de-foto-gay-gratis-negros\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?dead-sea-product\.com
+https?:\/\/([^\/]*\.)?deadsex\.info
+https?:\/\/([^\/]*\.)?deadums\.blogspot\.com
+https?:\/\/([^\/]*\.)?debk6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?debt-consolidation-care\.com
+https?:\/\/([^\/]*\.)?debt-consolidation\.dd\.vg
+https?:\/\/([^\/]*\.)?debtconsolidation-today\.com
+https?:\/\/([^\/]*\.)?deepthroat\.coz\.in
+https?:\/\/([^\/]*\.)?deerdeji\.forumzen\.com
+https?:\/\/([^\/]*\.)?defacialize-com-td32\.blogspot\.com
+https?:\/\/([^\/]*\.)?defi-adrian\.blogspot\.com
+https?:\/\/([^\/]*\.)?degree-program\.hotmail\.ru
+https?:\/\/([^\/]*\.)?degree2program\.chat\.ru
+https?:\/\/([^\/]*\.)?dejablu503\.50webs\.org
+https?:\/\/([^\/]*\.)?dela88\.com
+https?:\/\/([^\/]*\.)?delacmon\.discutforum\.com
+https?:\/\/([^\/]*\.)?delawaremortgage-x\.com
+https?:\/\/([^\/]*\.)?delbocer\.dl\.pl
+https?:\/\/([^\/]*\.)?delcnacna\.lolbb\.com
+https?:\/\/([^\/]*\.)?delletopas\.su\.pl
+https?:\/\/([^\/]*\.)?delliric\.dl\.pl
+https?:\/\/([^\/]*\.)?delordel\.blogcu\.com
+https?:\/\/([^\/]*\.)?delricchi\.goodforum\.net
+https?:\/\/([^\/]*\.)?delricchi\.grafbb\.com
+https?:\/\/([^\/]*\.)?delricou\.dl\.pl
+https?:\/\/([^\/]*\.)?delserch\.com
+https?:\/\/([^\/]*\.)?deltasone\.4\.pl
+https?:\/\/([^\/]*\.)?deltnecca\.goodbb\.net
+https?:\/\/([^\/]*\.)?delzelleto\.dl\.pl
+https?:\/\/([^\/]*\.)?demingpower\.com
+https?:\/\/([^\/]*\.)?denocel\.blogcu\.com
+https?:\/\/([^\/]*\.)?dental-guide\.org
+https?:\/\/([^\/]*\.)?dental\.gulfcoast\.edu
+https?:\/\/([^\/]*\.)?dentalplans-x\.com
+https?:\/\/([^\/]*\.)?deomnoou\.jconserv\.net
+https?:\/\/([^\/]*\.)?depamu\.com
+https?:\/\/([^\/]*\.)?depstore\.milan\.jp
+https?:\/\/([^\/]*\.)?derast\.com
+https?:\/\/([^\/]*\.)?derimc\.com
+https?:\/\/([^\/]*\.)?description\.hostonmars\.com
+https?:\/\/([^\/]*\.)?desent\.8tt\.org
+https?:\/\/([^\/]*\.)?design4italy\.org
+https?:\/\/([^\/]*\.)?designatchina\.com
+https?:\/\/([^\/]*\.)?designer-purses\.blogspot\.com
+https?:\/\/([^\/]*\.)?desk-teen-d\.blogspot\.com
+https?:\/\/([^\/]*\.)?desyrel\.4\.pl
+https?:\/\/([^\/]*\.)?detriot\.dtdns\.net
+https?:\/\/([^\/]*\.)?deutschland-heute\.de\.tl
+https?:\/\/([^\/]*\.)?devine-friend-hot-mom\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?dewall\.info
+https?:\/\/([^\/]*\.)?dg\.188info\.com
+https?:\/\/([^\/]*\.)?dgvy5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dial3\.szm\.sk
+https?:\/\/([^\/]*\.)?diamond73\.50webs\.com
+https?:\/\/([^\/]*\.)?dianchi\.dzsc\.com
+https?:\/\/([^\/]*\.)?diandongji\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianganqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianluban\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianre\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianrong\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianweiqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianyuan\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianziguan\.dzsc\.com
+https?:\/\/([^\/]*\.)?dianzu\.dzsc\.com
+https?:\/\/([^\/]*\.)?diazepam\.47\.pl
+https?:\/\/([^\/]*\.)?diazepam\.skocz\.net
+https?:\/\/([^\/]*\.)?diazepam2\.forospace\.com
+https?:\/\/([^\/]*\.)?diazepams\.ru\.tf
+https?:\/\/([^\/]*\.)?dick-butkus-football-player\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?dick-donkey-sucking-woman\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?dick-fat-in-pussy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?dick-head-john-kerry\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?dick-hot-man-video\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?dicks-sporting-goods-web-site\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?didrex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?didrex\.int\.tf
+https?:\/\/([^\/]*\.)?diebart\.asp2\.cz
+https?:\/\/([^\/]*\.)?diesite\.com
+https?:\/\/([^\/]*\.)?diet-pills-phentermine-pill-buy-cheap-online\.com
+https?:\/\/([^\/]*\.)?diet-pills911\.com
+https?:\/\/([^\/]*\.)?diffusersudan\.org
+https?:\/\/([^\/]*\.)?diflucanbuycheap\.top\.ms
+https?:\/\/([^\/]*\.)?diflucancheapbuy\.drop\.to
+https?:\/\/([^\/]*\.)?diflucancheapgeneric\.notrix\.net
+https?:\/\/([^\/]*\.)?diflucangeneric\.hey\.to
+https?:\/\/([^\/]*\.)?diflucangenericbuy\.hp\.ms
+https?:\/\/([^\/]*\.)?digilander\.libero\.it
+https?:\/\/([^\/]*\.)?digital-glamour\.com
+https?:\/\/([^\/]*\.)?digitalpoimt\.com
+https?:\/\/([^\/]*\.)?dildo-extreme-free-movie\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?dildo-in-guys-ass\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?dilhbi7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dionysios-r\.blogspot\.com
+https?:\/\/([^\/]*\.)?dir\.opank\.com
+https?:\/\/([^\/]*\.)?dirare\.com
+https?:\/\/([^\/]*\.)?directonlineguide\.com
+https?:\/\/([^\/]*\.)?dirty-blonde-teen\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?dirty-ru-lenta\.blogspot\.com
+https?:\/\/([^\/]*\.)?dirtyrhino-com-iy5ps48s\.blogspot\.com
+https?:\/\/([^\/]*\.)?dirtyrhino-com-rjrotse3\.blogspot\.com
+https?:\/\/([^\/]*\.)?discasegeta\.0moola\.com
+https?:\/\/([^\/]*\.)?discontinued-chanel-lipstick\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?discount-femina-lingerie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?discount-phentermine\.health-livening\.com
+https?:\/\/([^\/]*\.)?discount-phentermine\.presteert\.nl
+https?:\/\/([^\/]*\.)?discounted-medications\.com
+https?:\/\/([^\/]*\.)?discountphentermine\.livelog\.com
+https?:\/\/([^\/]*\.)?discussions\.csbsju\.edu
+https?:\/\/([^\/]*\.)?dissected-voice\.blogspot\.com
+https?:\/\/([^\/]*\.)?diuvw\.szm\.sk
+https?:\/\/([^\/]*\.)?diva-58\.site\.voila\.fr
+https?:\/\/([^\/]*\.)?divtab\.com
+https?:\/\/([^\/]*\.)?dixe-alayna\.blogspot\.com
+https?:\/\/([^\/]*\.)?dixiecuties-com-av\.blogspot\.com
+https?:\/\/([^\/]*\.)?dixiecuties-com-wpf1g2a\.blogspot\.com
+https?:\/\/([^\/]*\.)?dka2e\.nokedem\.com
+https?:\/\/([^\/]*\.)?dlaners\.blogspot\.com
+https?:\/\/([^\/]*\.)?dljs5\.szm\.sk
+https?:\/\/([^\/]*\.)?dltz4\.szm\.sk
+https?:\/\/([^\/]*\.)?dlwlh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dlzgn\.szm\.sk
+https?:\/\/([^\/]*\.)?dm-cqsf\.cn
+https?:\/\/([^\/]*\.)?dm-soft\.com
+https?:\/\/([^\/]*\.)?dmnft\.net
+https?:\/\/([^\/]*\.)?dnk-design\.com
+https?:\/\/([^\/]*\.)?do-ali\.blogspot\.com
+https?:\/\/([^\/]*\.)?do-hot-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?doctorpinkerton\.ifrance\.com
+https?:\/\/([^\/]*\.)?doenertreff\.de
+https?:\/\/([^\/]*\.)?dogdead\.50webs\.com
+https?:\/\/([^\/]*\.)?dogider-big-tit-round-a-p\.blogspot\.com
+https?:\/\/([^\/]*\.)?dogzilla30\.blogspot\.com
+https?:\/\/([^\/]*\.)?dohr\.joolo\.com
+https?:\/\/([^\/]*\.)?dokrichi\.forumculture\.net
+https?:\/\/([^\/]*\.)?dokuno-porn-clip\.blogspot\.com
+https?:\/\/([^\/]*\.)?dollmovies-com-e7lqyhq\.blogspot\.com
+https?:\/\/([^\/]*\.)?dom-or-dron\.jc\.pl
+https?:\/\/([^\/]*\.)?domdronno\.xa\.pl
+https?:\/\/([^\/]*\.)?dome-ebony-foot-herbies\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?domelc4t\.dl\.pl
+https?:\/\/([^\/]*\.)?domest1co\.info
+https?:\/\/([^\/]*\.)?domestic0\.info
+https?:\/\/([^\/]*\.)?domnoor\.blogcu\.com
+https?:\/\/([^\/]*\.)?domorca\.darkbb\.com
+https?:\/\/([^\/]*\.)?dompasvi\.alkablog\.com
+https?:\/\/([^\/]*\.)?domrelou\.discutfree\.com
+https?:\/\/([^\/]*\.)?domtadom\.blogcu\.com
+https?:\/\/([^\/]*\.)?domtael\.dl\.pl
+https?:\/\/([^\/]*\.)?don-search\.com
+https?:\/\/([^\/]*\.)?dong-sheng\.com
+https?:\/\/([^\/]*\.)?dono-alaska\.blogspot\.com
+https?:\/\/([^\/]*\.)?doodlepets\.net
+https?:\/\/([^\/]*\.)?doormat\.ncedly\.be
+https?:\/\/([^\/]*\.)?dorank\.com
+https?:\/\/([^\/]*\.)?dorintop\.9999mb\.com
+https?:\/\/([^\/]*\.)?dotbusinessbroker\.info
+https?:\/\/([^\/]*\.)?dottorstranamore\.com
+https?:\/\/([^\/]*\.)?dotwirelessinternet\.info
+https?:\/\/([^\/]*\.)?double-anal-insertion\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?doubledrilled-com-ru\.blogspot\.com
+https?:\/\/([^\/]*\.)?douglasgenetic\.org
+https?:\/\/([^\/]*\.)?download-fisting-free-movie-pussy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?download-free-porn-clip-zone186\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-porn-movie-bb-bb-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-ringtonebso\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-ringtonekdw\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-ringtonekfb\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-ringtoneoug\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-free-ringtonesasd\.blogspot\.com
+https?:\/\/([^\/]*\.)?download-ringtonevnr\.blogspot\.com
+https?:\/\/([^\/]*\.)?downloadfreeringtonengp\.blogspot\.com
+https?:\/\/([^\/]*\.)?downsms\.blogbus\.com
+https?:\/\/([^\/]*\.)?dpfanatics-com-t7nqv\.blogspot\.com
+https?:\/\/([^\/]*\.)?dqezl\.szm\.sk
+https?:\/\/([^\/]*\.)?draghi\.ll11\.info
+https?:\/\/([^\/]*\.)?dragonballxxx-gratis\.19mb\.info
+https?:\/\/([^\/]*\.)?dragonmovies-dd2bm5sn\.blogspot\.com
+https?:\/\/([^\/]*\.)?dragonmovies-rwng8vm7j\.blogspot\.com
+https?:\/\/([^\/]*\.)?drbizzaro-com-r5\.blogspot\.com
+https?:\/\/([^\/]*\.)?drdos\.50webs\.org
+https?:\/\/([^\/]*\.)?dreamathk\.com
+https?:\/\/([^\/]*\.)?dreamatsh\.com
+https?:\/\/([^\/]*\.)?dreamhk\.org
+https?:\/\/([^\/]*\.)?dress-jacket\.haemati\.be
+https?:\/\/([^\/]*\.)?drithle\.com
+https?:\/\/([^\/]*\.)?driving-school\.hotmail\.ru
+https?:\/\/([^\/]*\.)?driving2school\.chat\.ru
+https?:\/\/([^\/]*\.)?dronaceldar\.darkbb\.com
+https?:\/\/([^\/]*\.)?dronc4tta\.blogcu\.com
+https?:\/\/([^\/]*\.)?droncaca\.blogcu\.com
+https?:\/\/([^\/]*\.)?dronchitr\.blogcu\.com
+https?:\/\/([^\/]*\.)?drondomrac\.bb-fr\.com
+https?:\/\/([^\/]*\.)?drondrontr\.zikforum\.com
+https?:\/\/([^\/]*\.)?dronladar\.discutfree\.com
+https?:\/\/([^\/]*\.)?dronladar\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?dronrelco\.td\.pl
+https?:\/\/([^\/]*\.)?drownedmagenta\.50webs\.org
+https?:\/\/([^\/]*\.)?drug\.prtime\.ru
+https?:\/\/([^\/]*\.)?drunkgirls\.coz\.in
+https?:\/\/([^\/]*\.)?dry-skin\.boom\.ru
+https?:\/\/([^\/]*\.)?dry1skin\.chat\.ru
+https?:\/\/([^\/]*\.)?dscw0\.szm\.sk
+https?:\/\/([^\/]*\.)?dtmpdpxmsu-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?du-alice\.blogspot\.com
+https?:\/\/([^\/]*\.)?duaroti\.50webs\.com
+https?:\/\/([^\/]*\.)?dub-dom-adu\.blogspot\.com
+https?:\/\/([^\/]*\.)?duckyporn-ifl4u28p\.blogspot\.com
+https?:\/\/([^\/]*\.)?ducpjo3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dudoctor\.com
+https?:\/\/([^\/]*\.)?dudubilz\.dl\.pl
+https?:\/\/([^\/]*\.)?dumtrric\.forumzen\.com
+https?:\/\/([^\/]*\.)?duncemoney\.com
+https?:\/\/([^\/]*\.)?dunham-hiking-boot\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?dup-xxxfolder-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?dupiwu\.com
+https?:\/\/([^\/]*\.)?duptv\.szm\.sk
+https?:\/\/([^\/]*\.)?dushen\.net\.cn
+https?:\/\/([^\/]*\.)?dusts\.info
+https?:\/\/([^\/]*\.)?dutbm\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?duxbd\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?duxfhgz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dvd-vergini-economici-r\.host24h\.info
+https?:\/\/([^\/]*\.)?dvdunwritten\.toplog\.nl
+https?:\/\/([^\/]*\.)?dwaeaz-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?dwsyv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?dxjyb\.szm\.sk
+https?:\/\/([^\/]*\.)?dykzozqlpt-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?dzb\.com\.cn
+https?:\/\/([^\/]*\.)?dzgzm\.cn
+https?:\/\/([^\/]*\.)?dzjp\.left-page\.com
+https?:\/\/([^\/]*\.)?dzjp\.zxvo\.com
+https?:\/\/([^\/]*\.)?dzsb\.com
+https?:\/\/([^\/]*\.)?dzsc\.com
+https?:\/\/([^\/]*\.)?e-dishnetworks\.com
+https?:\/\/([^\/]*\.)?e-fanyi\.org
+https?:\/\/([^\/]*\.)?e-holdem\.net
+https?:\/\/([^\/]*\.)?e\.kth\.se
+https?:\/\/([^\/]*\.)?e16\.info
+https?:\/\/([^\/]*\.)?e93\.iitalia\.com
+https?:\/\/([^\/]*\.)?eaby2\.szm\.sk
+https?:\/\/([^\/]*\.)?eacome\.com
+https?:\/\/([^\/]*\.)?eafg6\.szm\.sk
+https?:\/\/([^\/]*\.)?eaglechief\.com
+https?:\/\/([^\/]*\.)?eamon-fuck-it-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?eappf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?earticlesonline\.com
+https?:\/\/([^\/]*\.)?easy-furniture\.org
+https?:\/\/([^\/]*\.)?easygals-com-h4\.blogspot\.com
+https?:\/\/([^\/]*\.)?easypic-com-if7pnmrbxd\.blogspot\.com
+https?:\/\/([^\/]*\.)?easypornstars-com-b8k4y\.blogspot\.com
+https?:\/\/([^\/]*\.)?easypornstars-com-subut\.blogspot\.com
+https?:\/\/([^\/]*\.)?easysail\.net\.cn
+https?:\/\/([^\/]*\.)?eating-free-lesbian-pussy\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?eating-lesbian-pussy\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?ebackground-checks\.com
+https?:\/\/([^\/]*\.)?ebdoc\.com
+https?:\/\/([^\/]*\.)?ebnjj\.info
+https?:\/\/([^\/]*\.)?ebony-free-woman\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ebony-fuck-tit\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ebony-horny-hot-woman\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?ebony-hot-outdoor\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?ebony-info-photo-remember-sexy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?ebony-info-remember-tit\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?ebony-party-sex\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ebony-porn-trailer\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?ebony-sex-com\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?ebony-teen-pic\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?ebony-teen-tgp\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?ebonyblack-net-gf\.blogspot\.com
+https?:\/\/([^\/]*\.)?ebonyblack-net-m3dy7kn\.blogspot\.com
+https?:\/\/([^\/]*\.)?ebonybooty\.wehostporno\.com
+https?:\/\/([^\/]*\.)?ebusiness-cards\.org
+https?:\/\/([^\/]*\.)?ecar-rentals\.com
+https?:\/\/([^\/]*\.)?eccellente\.info
+https?:\/\/([^\/]*\.)?ececu\.com
+https?:\/\/([^\/]*\.)?echayka\.com
+https?:\/\/([^\/]*\.)?eclexion\.net
+https?:\/\/([^\/]*\.)?eclissi-di-luna\.host24h\.info
+https?:\/\/([^\/]*\.)?ecomm1\.csug\.rochester\.edu
+https?:\/\/([^\/]*\.)?econtact-lens\.com
+https?:\/\/([^\/]*\.)?ed2k\.net\.ua
+https?:\/\/([^\/]*\.)?edasim\.com
+https?:\/\/([^\/]*\.)?eddiereva\.com
+https?:\/\/([^\/]*\.)?edetrali\.jconserv\.net
+https?:\/\/([^\/]*\.)?edomerna\.jconserv\.net
+https?:\/\/([^\/]*\.)?edonline\.ua\.edu
+https?:\/\/([^\/]*\.)?edqlzct\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?education\.beta\.edgewood\.edu
+https?:\/\/([^\/]*\.)?education\.uncc\.edu
+https?:\/\/([^\/]*\.)?education1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?ee3\.be
+https?:\/\/([^\/]*\.)?eelive\.info
+https?:\/\/([^\/]*\.)?eenxn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ees\.ufl\.edu
+https?:\/\/([^\/]*\.)?eesg8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?eeshq\.com
+https?:\/\/([^\/]*\.)?eetop\.info
+https?:\/\/([^\/]*\.)?eevjgn7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?effexor-xr\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?effexor\.b0ne\.com
+https?:\/\/([^\/]*\.)?egciz\.szm\.sk
+https?:\/\/([^\/]*\.)?egnadn-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?egnpgno\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?egoldhyip\.athost\.net
+https?:\/\/([^\/]*\.)?egoldhyip\.sitesfree\.com
+https?:\/\/([^\/]*\.)?egunteronline\.com
+https?:\/\/([^\/]*\.)?eightalya\.blogspot\.com
+https?:\/\/([^\/]*\.)?eighty-8088\.blogspot\.com
+https?:\/\/([^\/]*\.)?eijy7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ejeesf2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ejreoonster\.blogspot\.com
+https?:\/\/([^\/]*\.)?ejvyd\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ejyt9\.szm\.sk
+https?:\/\/([^\/]*\.)?ekajl\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ekjms\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ekttsaj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ekviceaia\.blogspot\.com
+https?:\/\/([^\/]*\.)?ekxkfyz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?el-ladies-com-m4ayb\.blogspot\.com
+https?:\/\/([^\/]*\.)?elacelal\.informe\.com
+https?:\/\/([^\/]*\.)?elbasbo\.dl\.pl
+https?:\/\/([^\/]*\.)?elbocboc\.bbgraf\.com
+https?:\/\/([^\/]*\.)?elbows-at\.blogspot\.com
+https?:\/\/([^\/]*\.)?elbtoy\.realpornstar\.net
+https?:\/\/([^\/]*\.)?elcnaac\.cultureforum\.net
+https?:\/\/([^\/]*\.)?electric-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?electric1scooter\.chat\.ru
+https?:\/\/([^\/]*\.)?electricscooterland\.com
+https?:\/\/([^\/]*\.)?elephantlist-com-hozhkwuac6\.blogspot\.com
+https?:\/\/([^\/]*\.)?elephantlist-com-kedi0pfbp\.blogspot\.com
+https?:\/\/([^\/]*\.)?elerc4t\.blogcu\.com
+https?:\/\/([^\/]*\.)?eleven-heaven0a\.blogspot\.com
+https?:\/\/([^\/]*\.)?elevtenl\.blogspot\.com
+https?:\/\/([^\/]*\.)?elishacuthbertfansite\.com
+https?:\/\/([^\/]*\.)?eliteclips-com-c0hwm3fji\.blogspot\.com
+https?:\/\/([^\/]*\.)?eliteclips-com-k5hkm6yi\.blogspot\.com
+https?:\/\/([^\/]*\.)?eliteclips-com-kzjz30a5k4\.blogspot\.com
+https?:\/\/([^\/]*\.)?elixirium\.ifrance\.com
+https?:\/\/([^\/]*\.)?eloloac\.bbgraf\.com
+https?:\/\/([^\/]*\.)?eloudar\.discutforum\.com
+https?:\/\/([^\/]*\.)?elovejob\.info
+https?:\/\/([^\/]*\.)?elpos\.szm\.sk
+https?:\/\/([^\/]*\.)?eltalchi\.bbfr\.net
+https?:\/\/([^\/]*\.)?eltalli\.zj\.pl
+https?:\/\/([^\/]*\.)?eltbuzel\.forumzen\.com
+https?:\/\/([^\/]*\.)?eltcer\.winnerforum\.net
+https?:\/\/([^\/]*\.)?eltgetric\.uy\.pl
+https?:\/\/([^\/]*\.)?eltrelboc\.bbfr\.net
+https?:\/\/([^\/]*\.)?eltrical\.uy\.pl
+https?:\/\/([^\/]*\.)?eltroboc\.lolforum\.net
+https?:\/\/([^\/]*\.)?eltrolpas\.winnerforum\.net
+https?:\/\/([^\/]*\.)?elttaacel\.heavenforum\.com
+https?:\/\/([^\/]*\.)?elttaacel\.highforum\.net
+https?:\/\/([^\/]*\.)?elttrocpas\.discutforum\.com
+https?:\/\/([^\/]*\.)?elwg0\.szm\.sk
+https?:\/\/([^\/]*\.)?elysium-ringtonebub\.blogspot\.com
+https?:\/\/([^\/]*\.)?elysium-ringtonemzb\.blogspot\.com
+https?:\/\/([^\/]*\.)?elzelchi\.cultureforum\.net
+https?:\/\/([^\/]*\.)?emails\.ncedly\.be
+https?:\/\/([^\/]*\.)?emea-consulting\.net
+https?:\/\/([^\/]*\.)?emily\.slyip\.com
+https?:\/\/([^\/]*\.)?eminem-suck-my-dick\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?eminem-veyb\.blogspot\.com
+https?:\/\/([^\/]*\.)?eminen-lyric-ass-like-that\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?empire-holdem\.com
+https?:\/\/([^\/]*\.)?empire-holdem\.net
+https?:\/\/([^\/]*\.)?empire-holdem\.us
+https?:\/\/([^\/]*\.)?empire-poker\.black-poker\.com
+https?:\/\/([^\/]*\.)?empirepoker\.u288\.com
+https?:\/\/([^\/]*\.)?emxk0\.szm\.sk
+https?:\/\/([^\/]*\.)?ena-free-show\.net
+https?:\/\/([^\/]*\.)?enchanted1312\.blogspot\.com
+https?:\/\/([^\/]*\.)?end14april\.ifrance\.com
+https?:\/\/([^\/]*\.)?enema-fetish-free-picture\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?energo\.us
+https?:\/\/([^\/]*\.)?enetdrugsonline\.org
+https?:\/\/([^\/]*\.)?enfoldrevel\.epinoy\.com
+https?:\/\/([^\/]*\.)?engineerin2degre\.chat\.ru
+https?:\/\/([^\/]*\.)?engs\.info
+https?:\/\/([^\/]*\.)?enpresse\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?enteworld\.com
+https?:\/\/([^\/]*\.)?eoglu\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?eour8\.szm\.sk
+https?:\/\/([^\/]*\.)?ephedra\.269g\.net
+https?:\/\/([^\/]*\.)?ephedraproduct\.seesaa\.net
+https?:\/\/([^\/]*\.)?epiqq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?epointer\.freewebpage\.org
+https?:\/\/([^\/]*\.)?eprom-dresses\.com
+https?:\/\/([^\/]*\.)?epxxw\.szm\.sk
+https?:\/\/([^\/]*\.)?erasser\.8tt\.org
+https?:\/\/([^\/]*\.)?erbocco\.discutforum\.com
+https?:\/\/([^\/]*\.)?erc4tget\.blogcu\.com
+https?:\/\/([^\/]*\.)?erdomrol\.heavenforum\.com
+https?:\/\/([^\/]*\.)?erdomrol\.highforum\.net
+https?:\/\/([^\/]*\.)?ereaa\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?erealtystore\.com
+https?:\/\/([^\/]*\.)?erelleta\.forumzen\.com
+https?:\/\/([^\/]*\.)?eremat\.com
+https?:\/\/([^\/]*\.)?erjiguan\.dzsc\.com
+https?:\/\/([^\/]*\.)?erlitroc\.xa\.pl
+https?:\/\/([^\/]*\.)?ernvmf7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?erotic-gay-male-sex-story\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?erotic-story-fem-dom\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?ertral\.alkablog\.com
+https?:\/\/([^\/]*\.)?erw1r\.info
+https?:\/\/([^\/]*\.)?escher\.isis\.vanderbilt\.edu
+https?:\/\/([^\/]*\.)?eseo\.cn
+https?:\/\/([^\/]*\.)?esgic\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?eshilzet\.forumzen\.com
+https?:\/\/([^\/]*\.)?esino\.info
+https?:\/\/([^\/]*\.)?esiti-gara\.hostzz\.info
+https?:\/\/([^\/]*\.)?esjpd\.szm\.sk
+https?:\/\/([^\/]*\.)?esmpa\.com
+https?:\/\/([^\/]*\.)?esportswave\.com
+https?:\/\/([^\/]*\.)?esraj\.com
+https?:\/\/([^\/]*\.)?esseiwer\.dl\.pl
+https?:\/\/([^\/]*\.)?estarcollector\.blogspot\.com
+https?:\/\/([^\/]*\.)?etac4\.szm\.sk
+https?:\/\/([^\/]*\.)?etcoq\.szm\.sk
+https?:\/\/([^\/]*\.)?etgelcca\.forumzen\.com
+https?:\/\/([^\/]*\.)?ethnicpassion-com-db5\.blogspot\.com
+https?:\/\/([^\/]*\.)?ethnicpassion-com-ik80lyfnd\.blogspot\.com
+https?:\/\/([^\/]*\.)?ethnicpassion-com-iqa3gt\.blogspot\.com
+https?:\/\/([^\/]*\.)?ethnicpassion-com-itw\.blogspot\.com
+https?:\/\/([^\/]*\.)?etjhechi\.forumzen\.com
+https?:\/\/([^\/]*\.)?etjhetrd\.forumzen\.com
+https?:\/\/([^\/]*\.)?etkrudom\.forumzen\.com
+https?:\/\/([^\/]*\.)?etlitvir\.forumzen\.com
+https?:\/\/([^\/]*\.)?etlurlir\.forumzen\.com
+https?:\/\/([^\/]*\.)?etmuhlie\.forumzen\.com
+https?:\/\/([^\/]*\.)?etnuidet\.forumzen\.com
+https?:\/\/([^\/]*\.)?etofas\.com
+https?:\/\/([^\/]*\.)?etrart\.com
+https?:\/\/([^\/]*\.)?etrewlia\.forumzen\.com
+https?:\/\/([^\/]*\.)?etshalir\.forumzen\.com
+https?:\/\/([^\/]*\.)?ettamlet\.forumzen\.com
+https?:\/\/([^\/]*\.)?ettimera\.forumzen\.com
+https?:\/\/([^\/]*\.)?etwhiett\.forumzen\.com
+https?:\/\/([^\/]*\.)?etwhiolo\.forumzen\.com
+https?:\/\/([^\/]*\.)?etzvg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?etzyrpk\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?eubaspro\.com
+https?:\/\/([^\/]*\.)?eudrayv\.blogspot\.com
+https?:\/\/([^\/]*\.)?eueyniqott-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?euomtrna\.jconserv\.net
+https?:\/\/([^\/]*\.)?eurosexparties-com-jezun\.blogspot\.com
+https?:\/\/([^\/]*\.)?eurosexparties-com-mmnl2m\.blogspot\.com
+https?:\/\/([^\/]*\.)?eva-irina\.isuisse\.com
+https?:\/\/([^\/]*\.)?evamiee\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?eveqx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?everywhere-com-tpovy8exl\.blogspot\.com
+https?:\/\/([^\/]*\.)?evfegl9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?evhp2\.szm\.sk
+https?:\/\/([^\/]*\.)?evil-gummiworm\.blogspot\.com
+https?:\/\/([^\/]*\.)?ewdnqb4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?exchange-lingerie-link-womens\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?exciting-casino\.com
+https?:\/\/([^\/]*\.)?exhuq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?extrarx\.kvkb\.com
+https?:\/\/([^\/]*\.)?extremeapril-com-adsm\.blogspot\.com
+https?:\/\/([^\/]*\.)?extremeapril-com-woje\.blogspot\.com
+https?:\/\/([^\/]*\.)?extremeapril-dhx1z\.blogspot\.com
+https?:\/\/([^\/]*\.)?ez\.asn\.und\.edu
+https?:\/\/([^\/]*\.)?ezjor\.com
+https?:\/\/([^\/]*\.)?ezkes\.com
+https?:\/\/([^\/]*\.)?ezxwc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?f-download-free-sex-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?f-z-a\.com
+https?:\/\/([^\/]*\.)?faadney\.dl\.pl
+https?:\/\/([^\/]*\.)?fabrizio-corona\.freehostss\.info
+https?:\/\/([^\/]*\.)?face-lick-lickable-licker-tongue\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?facial-abuse--com\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?facial-hair-remover\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?facial-paralysis-treatment\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?facial-plastic-surgery-manhattan\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?facial-whore\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?faculty\.etsu\.edu
+https?:\/\/([^\/]*\.)?faculty\.hope\.edu
+https?:\/\/([^\/]*\.)?faculty\.oxy\.edu
+https?:\/\/([^\/]*\.)?faculty\.ugf\.edu
+https?:\/\/([^\/]*\.)?faculty\.whatcom\.ctc\.edu
+https?:\/\/([^\/]*\.)?facweb\.cs\.depaul\.edu
+https?:\/\/([^\/]*\.)?fadianji\.dzsc\.com
+https?:\/\/([^\/]*\.)?fagin\.info
+https?:\/\/([^\/]*\.)?fairy\.8888mb\.com
+https?:\/\/([^\/]*\.)?faleake\.dl\.pl
+https?:\/\/([^\/]*\.)?falling-anvil\.blogspot\.com
+https?:\/\/([^\/]*\.)?family-viagra\.com
+https?:\/\/([^\/]*\.)?famouspornstars-com-o020ss18d8\.blogspot\.com
+https?:\/\/([^\/]*\.)?famvir\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?fangdaqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?fantasticnudes-com-bol80a\.blogspot\.com
+https?:\/\/([^\/]*\.)?fantasticnudes-com-by8gook\.blogspot\.com
+https?:\/\/([^\/]*\.)?fantasticnudes-com-qic\.blogspot\.com
+https?:\/\/([^\/]*\.)?fantasticnudes-com-r60\.blogspot\.com
+https?:\/\/([^\/]*\.)?fantasy-hand-job-teen\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?farmius\.org
+https?:\/\/([^\/]*\.)?fascination\.my10gb\.com
+https?:\/\/([^\/]*\.)?fasnty\.com
+https?:\/\/([^\/]*\.)?fasoft\.com\.cn
+https?:\/\/([^\/]*\.)?fast-loaneqh\.blogspot\.com
+https?:\/\/([^\/]*\.)?fastmovers\.org
+https?:\/\/([^\/]*\.)?fat-banging\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?fat-blonde-woman\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?fat-fuck-video\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?fat-porn-clip-infoecm\.blogspot\.com
+https?:\/\/([^\/]*\.)?fat-porn-clip-infomyi\.blogspot\.com
+https?:\/\/([^\/]*\.)?fat-tgp-com-ee\.blogspot\.com
+https?:\/\/([^\/]*\.)?fat-tgp-com-g654ywug\.blogspot\.com
+https?:\/\/([^\/]*\.)?fatfucks-com-kdy41nn4fr\.blogspot\.com
+https?:\/\/([^\/]*\.)?fatfucks-com-t232q4\.blogspot\.com
+https?:\/\/([^\/]*\.)?fatfucks-com-tf0v115rm\.blogspot\.com
+https?:\/\/([^\/]*\.)?fatfucks-com-thr8\.blogspot\.com
+https?:\/\/([^\/]*\.)?fathut-com-db66nw2a\.blogspot\.com
+https?:\/\/([^\/]*\.)?fathut-com-hqloar2t8\.blogspot\.com
+https?:\/\/([^\/]*\.)?fattythumbs-com-el24t2\.blogspot\.com
+https?:\/\/([^\/]*\.)?fattythumbs-com-iq1\.blogspot\.com
+https?:\/\/([^\/]*\.)?fau75\.blogspot\.com
+https?:\/\/([^\/]*\.)?favorite-casino\.com
+https?:\/\/([^\/]*\.)?fawninglace\.freehostingz\.com
+https?:\/\/([^\/]*\.)?fbcjr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fbugy\.szm\.sk
+https?:\/\/([^\/]*\.)?fcpx5\.szm\.sk
+https?:\/\/([^\/]*\.)?fcuml\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fcup3\.szm\.sk
+https?:\/\/([^\/]*\.)?fdjcz\.sunp\.com
+https?:\/\/([^\/]*\.)?fdxyp\.szm\.sk
+https?:\/\/([^\/]*\.)?fe-algebra\.blogspot\.com
+https?:\/\/([^\/]*\.)?fe-whateve\.blogspot\.com
+https?:\/\/([^\/]*\.)?fedems\.com
+https?:\/\/([^\/]*\.)?feeltime\.cn
+https?:\/\/([^\/]*\.)?feeltime\.com
+https?:\/\/([^\/]*\.)?fehpks4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?feidenfurniture\.com
+https?:\/\/([^\/]*\.)?fejwh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fem-dom-art-and-drawing\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?female-ass-worship\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?female-condom-sex\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?female-v\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?femdog\.blogspot\.com
+https?:\/\/([^\/]*\.)?feq-tugjobs-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?ferda111\.php5\.cz
+https?:\/\/([^\/]*\.)?ferer\.superprovider\.de
+https?:\/\/([^\/]*\.)?feretuc\.forumculture\.net
+https?:\/\/([^\/]*\.)?ferrarimaser\.info
+https?:\/\/([^\/]*\.)?fest-frat-fuck\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fetish-club-in-ipswitch-uk\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?fetish-hardcore-lesbian-more\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?fetish-heel-high-in-nylon-pretty-toe\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fetish-pantie-white\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?fetus-free-sex-video-l\.blogspot\.com
+https?:\/\/([^\/]*\.)?ffhi7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fflive\.info
+https?:\/\/([^\/]*\.)?fge-teens-links-0\.blogspot\.com
+https?:\/\/([^\/]*\.)?fghrf\.8888mb\.com
+https?:\/\/([^\/]*\.)?fgvan\.info
+https?:\/\/([^\/]*\.)?fgvzq\.szm\.sk
+https?:\/\/([^\/]*\.)?fhbi5\.szm\.sk
+https?:\/\/([^\/]*\.)?fhmms\.szm\.sk
+https?:\/\/([^\/]*\.)?fhwl-com-dy1tbi5l\.blogspot\.com
+https?:\/\/([^\/]*\.)?fhwl-com-mn8ni\.blogspot\.com
+https?:\/\/([^\/]*\.)?fhwl-com-wc\.blogspot\.com
+https?:\/\/([^\/]*\.)?fhwl-com-wgrog\.blogspot\.com
+https?:\/\/([^\/]*\.)?fibiger\.org
+https?:\/\/([^\/]*\.)?fifa2007it\.org
+https?:\/\/([^\/]*\.)?fihqquj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?filipina-lesbian-teen\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?fillchill\.mybbland\.com
+https?:\/\/([^\/]*\.)?film-da-scaricare\.host24h\.info
+https?:\/\/([^\/]*\.)?finalteens-com-c6o0080y\.blogspot\.com
+https?:\/\/([^\/]*\.)?finalteens-com-kpngsoxf\.blogspot\.com
+https?:\/\/([^\/]*\.)?finanziamento-on-line\.19mb\.info
+https?:\/\/([^\/]*\.)?finanziamento-personale\.hostzz\.info
+https?:\/\/([^\/]*\.)?finanziamento-treviso\.host24h\.info
+https?:\/\/([^\/]*\.)?findbabychick\.info
+https?:\/\/([^\/]*\.)?findbabygirl\.info
+https?:\/\/([^\/]*\.)?findvic\.com
+https?:\/\/([^\/]*\.)?fine-lingerie-online-sexy\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?finger-fuck-clip\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fioricet\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?fioricet\.47\.pl
+https?:\/\/([^\/]*\.)?fioricet\.edu\.tf
+https?:\/\/([^\/]*\.)?fioricet\.hav\.pl
+https?:\/\/([^\/]*\.)?fioricet\.skocz\.net
+https?:\/\/([^\/]*\.)?fioricetrx\.weboficial\.com
+https?:\/\/([^\/]*\.)?fioricets\.blogspot\.com
+https?:\/\/([^\/]*\.)?firejedi\.blogspot\.com
+https?:\/\/([^\/]*\.)?first-free-fuck-time-video\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?first-lesbian-experience-story\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?first-lesbian-video-xxx\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?first-porn\.futureblog\.org
+https?:\/\/([^\/]*\.)?firstchristianbank\.info
+https?:\/\/([^\/]*\.)?firstdrugstorezone\.info
+https?:\/\/([^\/]*\.)?firstfriends\.us
+https?:\/\/([^\/]*\.)?firsthorizonmtg\.com
+https?:\/\/([^\/]*\.)?firstnightcharleston\.com
+https?:\/\/([^\/]*\.)?firsttimeauditions-com-asq5m\.blogspot\.com
+https?:\/\/([^\/]*\.)?firsttimeauditions-com-gxs\.blogspot\.com
+https?:\/\/([^\/]*\.)?fishdor\.joolo\.com
+https?:\/\/([^\/]*\.)?fishing-rod\.247ihost\.com
+https?:\/\/([^\/]*\.)?fishing-rod\.hostpresso\.com
+https?:\/\/([^\/]*\.)?fishing-rod\.joolo\.com
+https?:\/\/([^\/]*\.)?fishins\.247ihost\.com
+https?:\/\/([^\/]*\.)?fishman\.freewebhosting360\.com
+https?:\/\/([^\/]*\.)?fishmpegs-com-oet5\.blogspot\.com
+https?:\/\/([^\/]*\.)?fishmpegs-com-r5\.blogspot\.com
+https?:\/\/([^\/]*\.)?fishmpegs-com-r87f7ui\.blogspot\.com
+https?:\/\/([^\/]*\.)?fisting-gay-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?fisting-group-sex\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fisting-lesbian-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?fisting-lesson-maya\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?fistinglessons-com-dmskwfs\.blogspot\.com
+https?:\/\/([^\/]*\.)?fistinglessons-com-i03p\.blogspot\.com
+https?:\/\/([^\/]*\.)?fitofarm\.com
+https?:\/\/([^\/]*\.)?fitvzj-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?fjp\.left-page\.com
+https?:\/\/([^\/]*\.)?fjp\.zxvo\.com
+https?:\/\/([^\/]*\.)?fkcvlna\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fkvvp\.szm\.sk
+https?:\/\/([^\/]*\.)?flandra\.php5\.cz
+https?:\/\/([^\/]*\.)?flawformed\.hostonmars\.com
+https?:\/\/([^\/]*\.)?flexeril\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?flextra\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?flkkmex\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fllood\.blogspot\.com
+https?:\/\/([^\/]*\.)?fllwlv6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?flnet\.org
+https?:\/\/([^\/]*\.)?flonase\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?flooring-guide\.org
+https?:\/\/([^\/]*\.)?floridamortgage-x\.com
+https?:\/\/([^\/]*\.)?floridian-love\.blogspot\.com
+https?:\/\/([^\/]*\.)?flower\.hostonmars\.com
+https?:\/\/([^\/]*\.)?flowerdive\.info
+https?:\/\/([^\/]*\.)?flqcjnw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fluffy\.hostcroc\.com
+https?:\/\/([^\/]*\.)?fluoxetine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?fnhtgggv\.t35\.com
+https?:\/\/([^\/]*\.)?fnxsj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?foecedh3artbrat\.blogspot\.com
+https?:\/\/([^\/]*\.)?foedu-de-solnil\.blogspot\.com
+https?:\/\/([^\/]*\.)?folast\.com
+https?:\/\/([^\/]*\.)?folcan\.my10gb\.com
+https?:\/\/([^\/]*\.)?fondi-italiano\.hostzz\.info
+https?:\/\/([^\/]*\.)?for-whorevideos-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?forbestcare\.info
+https?:\/\/([^\/]*\.)?forensic1nursing\.chat\.ru
+https?:\/\/([^\/]*\.)?forex\.fasthost\.pl
+https?:\/\/([^\/]*\.)?fork-hief\.ibelgique\.com
+https?:\/\/([^\/]*\.)?formulam\.net
+https?:\/\/([^\/]*\.)?fortune-slots\.com
+https?:\/\/([^\/]*\.)?forum\.kharkiv\.edu
+https?:\/\/([^\/]*\.)?fos-sologals-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?foto-sabrina-ferilli\.host24h\.info
+https?:\/\/([^\/]*\.)?foxeykie\.iespana\.es
+https?:\/\/([^\/]*\.)?fozq6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fpa7kctb\.t35\.com
+https?:\/\/([^\/]*\.)?fqred\.com
+https?:\/\/([^\/]*\.)?fragolla\.blogspot\.com
+https?:\/\/([^\/]*\.)?frbarber\.dl\.pl
+https?:\/\/([^\/]*\.)?frbracco\.dl\.pl
+https?:\/\/([^\/]*\.)?freakthumbs-com-bp\.blogspot\.com
+https?:\/\/([^\/]*\.)?freakthumbs-com-hcmkk\.blogspot\.com
+https?:\/\/([^\/]*\.)?frebnet\.com
+https?:\/\/([^\/]*\.)?fredd0\.info
+https?:\/\/([^\/]*\.)?free-access\.freeinsite\.net
+https?:\/\/([^\/]*\.)?free-adult-porn-clip-info43c\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-adult-porn-clip-infopqk\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-amateur-hardcore-pic\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-amateur-submitted-photo\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-amateur-video-e2843\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-anal-blonde-sex-pic\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-anal-porn-clip\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-anal-xxx-clip\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-anime-porn-clip-info6tn\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-anime-porn-clips-newsyby\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-asian-lesbian-sex-video\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-bbw-porn-clip-blog4wm\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-big-ass-porn\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-big-boob-porn-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-big-boob\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-bizarre-insertion-pic\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-bizarre-porn-pic\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-black-amateur\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-black-porn-clip-blogo7t\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-black-porn-movie-kebi\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-black-porn-video-clip-newsjqj\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-busty-asian-movie\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-busty-blonde-pic\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-busty-porn-movie\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-busty-redhead-pic\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-butt-fucking-video\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-cartoon-porn-clip-zoneikt\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-cartoon-porn-clip-zonewpm\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-celebrity-porn-clip-infowuz\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-celebrity-porn-video-bo\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-chubby-girl-pic\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-cock-sucking-slut-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-college-fuck-fest-gallery\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-cum-blow-job-gallery\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-cum-in-mouth-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-cum-swap-video\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-ebony-porn-clip-zonek7c\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-ebony-porn-clip-zonelcy\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-ebony-pussy-pic\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-ebony-sex-video-di\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-fat-porn-clip-infotno\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-fem-dom-thumb\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-female-orgasm-video-bb-bb-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-filipina-sex-movie\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-first-time-lesbian-sex-story\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-fisting-mpeg\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-fisting-sex-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-fucking-bitch\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-fucking-gallery-hardcore\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-fucking-sex-porn-site\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-full-length-porn-mov-bb-bb-w\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gang-bang-sample\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-gay-hunk-male-movie-muscled-stud-video\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-gay-muscle\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-gay-picture-sex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-gay-porn-clips-info35a\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-porn-movie-clip-bloglor\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-porn-movie-p-d-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-porn-video-clip-newsa83\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-porn-video-p-v-p\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-porn-web-site\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-gay-sex-movie-bb-bb-s\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-gay-sex-teen-trailer\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-gay-trailer\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-granny-lesbian\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-granny-movie-old\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-granny-pic-woman\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-group-lesbian-preview-sex-video\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-hand-job-movie-bb-bb-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-hand-job-video-clip-bb-bb-c\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-hardcore-movie-gallery-xxx\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-hardcore-porn-clip-blog07a\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-hardcore-porn-clip-blogi4k\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-hardcore-porn-star-picture\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-hardcore-sex-mpeg\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-heel-high-leg-pic-stilettos-stocking\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-homemade-porn-clip-news22n\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-homemade-porn-clip-news7ro\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-hot-blonde-nude-pic\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-hot-leg-nude-wallpaper-woman\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-hot-mom\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-hot-web-cam-video-h-s-f\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-huge-black-gay-cock\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-in-lesbian-movie-nylons\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-indian-porn-clip-infok6x\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-interracial-sex-video-ko\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-latin-ass\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-lesbian-cam-chat\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-lesbian-clip-zuxi\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-lesbian-hentai-movie\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-lesbian-licking-pic\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-lesbian-mature-sex-video-young\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-lesbian-movie-gjqvl\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-lesbian-porn-clips-blogagm\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-lesbian-porn-video-clip-newsidt\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-lesbian-video-a7e8t\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-lesbian-xxx-picture\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-long-porn-clip-info2fo\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-long-porn-clip-info7pr\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-long-porn-movie-clip-blogxn2\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-long-porn-movie-clip-zoneq4f\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-long-porn-video-wi\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-male-bisexual-porn\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-mature-porn-clip-zone5bz\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-mature-sex-clip\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-mature-sex-story\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-mature-thumbnail-post\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?free-milf-porn-clip-zonenqn\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-milf-video-bb-bb-n\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-mmf-bisex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-naked-mature-lady\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?free-nude-bitch\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-nude-blonde-gallery\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-older-woman-fucking\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-online-poker-000\.biz
+https?:\/\/([^\/]*\.)?free-orgasm-clip-supi\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-paris-hilton-porn-clip-infolah\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-personal-gay-links-tommys-favorite\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-pic-of-big-dicks\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-pic-of-busty-babes\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-pic-of-woman-kissing\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-picture-hardcore-anal\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-picture-hardcore-anal\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-picture-huge-clit\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?free-porn-chwd\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clip-nep\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clip-trailer-infog42\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clip-zoneil5\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clip-zonek61\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clip-zoneu7t\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-clips-newsid3\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-movie-to0r5\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-movie-zet\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-psp-video-po\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-sample-clip-infodwd\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-sample-clip-newsb26\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-sex-clip-zoneavj\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-star-movie-bb-bb-h\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-star-video-clip-blog81e\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-clip-info7km\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-clip-infoixk\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-clip-sample-newsw3t\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-clips-infooem\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-porn-clip-blogiep\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-porn-clip-zonepqd\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn-video-puz\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-porn\.xa\.pl
+https?:\/\/([^\/]*\.)?free-pussy-fucking-movie\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?free-ringtones\.269g\.net
+https?:\/\/([^\/]*\.)?free-ringtones\.aqhhhh\.info
+https?:\/\/([^\/]*\.)?free-ringtoneten\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sex-clip-ceb\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sex-movie-pow\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sex-video-clip-kog\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sex-video-hup\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sex-video\.hostithere\.org
+https?:\/\/([^\/]*\.)?free-sexy-leg-video\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-shemale-fucking-woman-movie\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?free-shemale-movie-w-r-s\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-skin\.newmail\.ru
+https?:\/\/([^\/]*\.)?free-skin\.pochta\.ru
+https?:\/\/([^\/]*\.)?free-spase\.info
+https?:\/\/([^\/]*\.)?free-sprint-ringtoneija\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-sprint-ringtonesrha\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-t-mobile-ringtonehvh\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-teen-movie-cock-sucking\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?free-teen-porn-clip-blogpmw\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-teen-porn-clip-infohxv\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-teen-porn-video-clip-newsi5v\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-teens-porn-com-wod\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-video-sex-chat-ki\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-xxx-amateur-web-cam\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free-xxx-porn-clip-infoibv\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-xxx-porn-video-clip-infopij\.blogspot\.com
+https?:\/\/([^\/]*\.)?free-young-lesbian-movie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?free2peek-com-c1iicr\.blogspot\.com
+https?:\/\/([^\/]*\.)?free2peek-com-co8g24x0ee\.blogspot\.com
+https?:\/\/([^\/]*\.)?free2peek-com-gi6v\.blogspot\.com
+https?:\/\/([^\/]*\.)?free_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?freebigmovies-com-b25i040z\.blogspot\.com
+https?:\/\/([^\/]*\.)?freebigmovies-com-bxf440\.blogspot\.com
+https?:\/\/([^\/]*\.)?freebigmovies-com-rst\.blogspot\.com
+https?:\/\/([^\/]*\.)?freebloger\.com
+https?:\/\/([^\/]*\.)?freecooktop\.info
+https?:\/\/([^\/]*\.)?freedirectoryv\.com
+https?:\/\/([^\/]*\.)?freeforumbuilder\.com
+https?:\/\/([^\/]*\.)?freegonzo-com-du\.blogspot\.com
+https?:\/\/([^\/]*\.)?freegonzo-com-e8n\.blogspot\.com
+https?:\/\/([^\/]*\.)?freegonzo-com-og5mpk\.blogspot\.com
+https?:\/\/([^\/]*\.)?freegonzo-od5evmn\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeheaven-com-ap22\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeheaven-com-w1kx4ymi\.blogspot\.com
+https?:\/\/([^\/]*\.)?freehost\.ag
+https?:\/\/([^\/]*\.)?freehugemovies-com-dr\.blogspot\.com
+https?:\/\/([^\/]*\.)?freehugemovies-com-hi3\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeinsite\.net
+https?:\/\/([^\/]*\.)?freeinternetplus\.info
+https?:\/\/([^\/]*\.)?freenextelringtonesupf\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeones-com-amrmdwb\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeones-com-m1fc\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeones-com-mb70w6\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeones-com-mqdm\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeones-com-tfirm5smvh\.blogspot\.com
+https?:\/\/([^\/]*\.)?freepaintballgun\.com
+https?:\/\/([^\/]*\.)?freepicseries-com-kb1\.blogspot\.com
+https?:\/\/([^\/]*\.)?freepicseries-com-tfct6n\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeportalnow\.com
+https?:\/\/([^\/]*\.)?freeringtonedgf\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeringtones\.seesaa\.net
+https?:\/\/([^\/]*\.)?freeringtonesptl\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeringtoness\.fr\.funpic\.de
+https?:\/\/([^\/]*\.)?frees--123clips-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--8teenfiles-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--africanvagina-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--ah-me-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--akissbetweenthelegs-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--allsitesaccess-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--amateurcurves-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--asssupply-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--atkmodels-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--auntmia-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--bigtitspalace-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--boneme-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--bootycollection-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--bustyadventures-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--camcrush-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--camelclips-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--caughtnude-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--celebrityscandal-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--cliphunter-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--cowlist-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--dirtydaughter-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--easygals-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--ebonyblack-net\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--el-ladies-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--eurosexparties-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--fuckingfreemovies-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--gallfree-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--girlfur-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--grannyplanet-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--greentits-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--hanksgalleries-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--hereistheporn-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--hornybanana-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--idealbabes-net\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--indianpassion-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?frees--ispycameltoe-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?freespaces\.com
+https?:\/\/([^\/]*\.)?freesprintringtoneenx\.blogspot\.com
+https?:\/\/([^\/]*\.)?freesprintringtoneswkd\.blogspot\.com
+https?:\/\/([^\/]*\.)?freestyman\.com
+https?:\/\/([^\/]*\.)?freetmobileringtonekaw\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeverizonringtonevol\.blogspot\.com
+https?:\/\/([^\/]*\.)?freewebsitehosting\.net
+https?:\/\/([^\/]*\.)?freexmovies-com-i1xi8s\.blogspot\.com
+https?:\/\/([^\/]*\.)?freexmovies-com-ojxc1k\.blogspot\.com
+https?:\/\/([^\/]*\.)?freeyaho\.com
+https?:\/\/([^\/]*\.)?french-kissing-my-sister\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?french-kissing\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?french-lick-child-family-entertainment\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?french-tickler-condom\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?french168\.com
+https?:\/\/([^\/]*\.)?frenchcum-btb\.blogspot\.com
+https?:\/\/([^\/]*\.)?frenchcum-com-mzqj8hpm\.blogspot\.com
+https?:\/\/([^\/]*\.)?frenchcum-com-w07ua1w7z\.blogspot\.com
+https?:\/\/([^\/]*\.)?fresh-sex\.futureblog\.org
+https?:\/\/([^\/]*\.)?friendsgrabber\.com
+https?:\/\/([^\/]*\.)?fripcn9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?frog-sexgtw\.blogspot\.com
+https?:\/\/([^\/]*\.)?frog-sexlfe\.blogspot\.com
+https?:\/\/([^\/]*\.)?frogm\.info
+https?:\/\/([^\/]*\.)?frogsex-com-ev4zmddt\.blogspot\.com
+https?:\/\/([^\/]*\.)?frogsex-com-ivtcaqfsx\.blogspot\.com
+https?:\/\/([^\/]*\.)?frogsex-gnle04e\.blogspot\.com
+https?:\/\/([^\/]*\.)?frt3\.org\.ua
+https?:\/\/([^\/]*\.)?fsxhl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fsyflower\.com
+https?:\/\/([^\/]*\.)?ft568\.com
+https?:\/\/([^\/]*\.)?ftffo\.szm\.sk
+https?:\/\/([^\/]*\.)?fthaop1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ftntg\.szm\.sk
+https?:\/\/([^\/]*\.)?fu-alexus\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuck-gallery-picture\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?fuck-her-in-mouth\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fuck-lesbian-pussy\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?fuck-pussy-suck-swallow\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?fuck-sexy-slut\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?fuck-the-maidens\.info
+https?:\/\/([^\/]*\.)?fuckfromass\.info
+https?:\/\/([^\/]*\.)?fucking-hardcore-japanese-slut\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?fucking-lesbian-licking-pussy\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?fucking-machine-thumbnail\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?fucking-preity-sucking-zinta\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?fucking-teen-party\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?fuckingfreemovies-com-gvps\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckingfreemovies-com-gy2\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckingfreemovies-com-qogog\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckingmachines-com-b4glo\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckingmachines-com-h3\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckingmachines-com-hqrbqh4\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckk-com-ot8wc\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckk-com-r6\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuckk-com-rw5485\.blogspot\.com
+https?:\/\/([^\/]*\.)?fucksakes-com-ks7uskz64\.blogspot\.com
+https?:\/\/([^\/]*\.)?fufpyl5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?funberry-com-meft\.blogspot\.com
+https?:\/\/([^\/]*\.)?funberry-com-mkjvxl\.blogspot\.com
+https?:\/\/([^\/]*\.)?funberry-com-tz8\.blogspot\.com
+https?:\/\/([^\/]*\.)?funkall\.us
+https?:\/\/([^\/]*\.)?funny-stuff\.3ae6ucb\.info
+https?:\/\/([^\/]*\.)?funpelv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fuohcbq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?furama\.dtdns\.net
+https?:\/\/([^\/]*\.)?furrysoap\.ifrance\.com
+https?:\/\/([^\/]*\.)?fuvo-aimee\.blogspot\.com
+https?:\/\/([^\/]*\.)?fuyinj\.ebloggy\.com
+https?:\/\/([^\/]*\.)?fvinc\.4t\.com
+https?:\/\/([^\/]*\.)?fvjz5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fwbhexo\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fweroze\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fwvsp\.szm\.sk
+https?:\/\/([^\/]*\.)?fx120\.com
+https?:\/\/([^\/]*\.)?fx120\.net
+https?:\/\/([^\/]*\.)?fxxb5\.szm\.sk
+https?:\/\/([^\/]*\.)?fyisy\.szm\.sk
+https?:\/\/([^\/]*\.)?fylfw\.szm\.sk
+https?:\/\/([^\/]*\.)?fyyvb\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?fzdlcfzh-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?g-maste\.com
+https?:\/\/([^\/]*\.)?g2c2rtc\.info
+https?:\/\/([^\/]*\.)?g3eros\.info
+https?:\/\/([^\/]*\.)?g76\.be
+https?:\/\/([^\/]*\.)?gadkj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gaeq2\.szm\.sk
+https?:\/\/([^\/]*\.)?gafdyq9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gagase\.com
+https?:\/\/([^\/]*\.)?gailc\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?galleries4free-com-e1ew\.blogspot\.com
+https?:\/\/([^\/]*\.)?galleries4free-com-o8\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallery-jenna-jameson-blonde\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gallery-kissing-woman-woman\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gallery-lesson-milf\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?gallery-lingerie-see-teen-thru\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?gallery-mature-stocking\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?gallfree-com-b0uf2q0\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallfree-com-ra5f1d7\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallfree-com-teruq\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallview-com-a2wqsk\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallview-com-ahasx\.blogspot\.com
+https?:\/\/([^\/]*\.)?gallview-com-wa6froqpl\.blogspot\.com
+https?:\/\/([^\/]*\.)?gambling-online-theory\.com
+https?:\/\/([^\/]*\.)?gamenase\.com
+https?:\/\/([^\/]*\.)?gamez4less\.com
+https?:\/\/([^\/]*\.)?gang-bang-free-pic-gallery\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gangsheng\.home4u\.china\.com
+https?:\/\/([^\/]*\.)?gaping-ass-sex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gaqx6\.szm\.sk
+https?:\/\/([^\/]*\.)?garid\.biz
+https?:\/\/([^\/]*\.)?garlic\.hostonmars\.com
+https?:\/\/([^\/]*\.)?garter\.nocostwebhosting\.com
+https?:\/\/([^\/]*\.)?gastrointestinal\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?gastrw\.com
+https?:\/\/([^\/]*\.)?gatalgat\.myrealboard\.com
+https?:\/\/([^\/]*\.)?gatloral\.myrealboard\.com
+https?:\/\/([^\/]*\.)?gatx10258\.blogspot\.com
+https?:\/\/([^\/]*\.)?gay-bareback-story\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?gay-big-cock-video-clip\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gay-black-blow-job\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-blonde-twinks\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gay-cum-eater\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-gang-bang-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?gay-girl-kissing\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?gay-girl-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-hispanic-man-naked\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-hot-latinos\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-huge-thick-cock\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-hunk-sex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-man-hardcore\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gay-man-man-sex\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-man-mature-old-picture\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?gay-man-naked-wrestling\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?gay-marriage-benefit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-photo-personals\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?gay-porn-clip-zonehyx\.blogspot\.com
+https?:\/\/([^\/]*\.)?gay-porn-video-clip-news8dd\.blogspot\.com
+https?:\/\/([^\/]*\.)?gay-pride-week-in-florida\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-sex-video-on-demand\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?gay-teen-man\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-teen-sex-clip\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-themed-movie\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?gay-twinks-fucking\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gay-web-cam-site\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gay-woman-chat-rooms\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?gazwc\.szm\.sk
+https?:\/\/([^\/]*\.)?gbapc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gbd-amy\.hostithere\.org
+https?:\/\/([^\/]*\.)?gbtw1\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?gbvgxus\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gceaq\.szm\.sk
+https?:\/\/([^\/]*\.)?gcqqkhx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gd-r\.com
+https?:\/\/([^\/]*\.)?gdfea\.szm\.sk
+https?:\/\/([^\/]*\.)?geb0cs\.nokedem\.com
+https?:\/\/([^\/]*\.)?gebu-aeh\.blogspot\.com
+https?:\/\/([^\/]*\.)?geddesvicente\.info
+https?:\/\/([^\/]*\.)?geflamio\.dl\.pl
+https?:\/\/([^\/]*\.)?genaholincorporated\.com
+https?:\/\/([^\/]*\.)?generic-paxil\.contact\.cc
+https?:\/\/([^\/]*\.)?genericbuy\.o-f\.com
+https?:\/\/([^\/]*\.)?genoux\.dnsrd\.com
+https?:\/\/([^\/]*\.)?georgiamortgage-x\.com
+https?:\/\/([^\/]*\.)?germani4\.blogspot\.com
+https?:\/\/([^\/]*\.)?gesrju\.com
+https?:\/\/([^\/]*\.)?get6or6li\.dl\.pl
+https?:\/\/([^\/]*\.)?getaer\.forumculture\.net
+https?:\/\/([^\/]*\.)?getbankruptcylaw\.info
+https?:\/\/([^\/]*\.)?getdeerelt\.forumzen\.com
+https?:\/\/([^\/]*\.)?getdelsit\.zj\.pl
+https?:\/\/([^\/]*\.)?getdomsit\.blogcu\.com
+https?:\/\/([^\/]*\.)?getfemon\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?getgetvi\.lolbb\.com
+https?:\/\/([^\/]*\.)?gethelp24x7\.net
+https?:\/\/([^\/]*\.)?getkuric\.blogcu\.com
+https?:\/\/([^\/]*\.)?getletovi\.winnerforum\.net
+https?:\/\/([^\/]*\.)?getlimon\.discutfree\.com
+https?:\/\/([^\/]*\.)?getowson\.dl\.pl
+https?:\/\/([^\/]*\.)?gettaer\.ephpbb\.com
+https?:\/\/([^\/]*\.)?getzelvi\.goodbb\.net
+https?:\/\/([^\/]*\.)?gezu-alaina\.blogspot\.com
+https?:\/\/([^\/]*\.)?gfd69\.tripod\.com
+https?:\/\/([^\/]*\.)?gg0\.be
+https?:\/\/([^\/]*\.)?ggfix\.com
+https?:\/\/([^\/]*\.)?gglive\.info
+https?:\/\/([^\/]*\.)?gguu\.com
+https?:\/\/([^\/]*\.)?ggww\.dtdns\.net
+https?:\/\/([^\/]*\.)?ggzhm\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ghhdh\.szm\.sk
+https?:\/\/([^\/]*\.)?ghiacci0\.info
+https?:\/\/([^\/]*\.)?ghnakjwcjp-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?ghrvu\.szm\.sk
+https?:\/\/([^\/]*\.)?ghvd7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?giant-cock-shemale\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?giant-dick-sucking\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?giant-dildo-in-pussy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gifo-administrator\.blogspot\.com
+https?:\/\/([^\/]*\.)?gigablast\.republika\.pl
+https?:\/\/([^\/]*\.)?gigagalleries-com-c1ylawg\.blogspot\.com
+https?:\/\/([^\/]*\.)?gigagalleries-com-cn4\.blogspot\.com
+https?:\/\/([^\/]*\.)?gigagalleries-com-gd0a\.blogspot\.com
+https?:\/\/([^\/]*\.)?gigavids-com-wcmck\.blogspot\.com
+https?:\/\/([^\/]*\.)?gimps\.info
+https?:\/\/([^\/]*\.)?giochi-java\.heroez\.info
+https?:\/\/([^\/]*\.)?gioco-avventura-vari\.bb22\.info
+https?:\/\/([^\/]*\.)?gioco-online-picchiaduro\.nnme\.info
+https?:\/\/([^\/]*\.)?gipolit\.asp2\.cz
+https?:\/\/([^\/]*\.)?girl-butt-in-tight-jeans\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?girl-guy-kissing\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?girl-kissing-video-bb-bb-j\.blogspot\.com
+https?:\/\/([^\/]*\.)?girl-playing-with-dildo\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?girl-showing-there-boob\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?girl-with-big-dildo\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?girlfur-com-ga\.blogspot\.com
+https?:\/\/([^\/]*\.)?girlfur-com-pisij\.blogspot\.com
+https?:\/\/([^\/]*\.)?gisogenu\.org
+https?:\/\/([^\/]*\.)?give-me-baby\.info
+https?:\/\/([^\/]*\.)?gjjf\.com
+https?:\/\/([^\/]*\.)?gjjp\.left-page\.com
+https?:\/\/([^\/]*\.)?gjjp\.zxvo\.com
+https?:\/\/([^\/]*\.)?gjqgec8\.info
+https?:\/\/([^\/]*\.)?gkjxcs1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gkwzrz8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?glamouronline\.info
+https?:\/\/([^\/]*\.)?glebo\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo1\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo2\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo3\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo4\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo5\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo6\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo7\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo8\.host-page\.com
+https?:\/\/([^\/]*\.)?glebo9\.host-page\.com
+https?:\/\/([^\/]*\.)?glmv6\.szm\.sk
+https?:\/\/([^\/]*\.)?globalbartertrade\.info
+https?:\/\/([^\/]*\.)?globalflights\.org
+https?:\/\/([^\/]*\.)?globalrecreationguide\.com
+https?:\/\/([^\/]*\.)?globegarment\.com\.cn
+https?:\/\/([^\/]*\.)?glodgreen\.info
+https?:\/\/([^\/]*\.)?gloryhole\.coz\.in
+https?:\/\/([^\/]*\.)?glovebox\.freewebpage\.org
+https?:\/\/([^\/]*\.)?gloveboxes\.cn
+https?:\/\/([^\/]*\.)?gloveboxes\.com\.cn
+https?:\/\/([^\/]*\.)?glover\.host-page\.com
+https?:\/\/([^\/]*\.)?glover1\.host-page\.com
+https?:\/\/([^\/]*\.)?glover2\.host-page\.com
+https?:\/\/([^\/]*\.)?glover3\.host-page\.com
+https?:\/\/([^\/]*\.)?glover4\.host-page\.com
+https?:\/\/([^\/]*\.)?glover5\.host-page\.com
+https?:\/\/([^\/]*\.)?glover6\.host-page\.com
+https?:\/\/([^\/]*\.)?glover7\.host-page\.com
+https?:\/\/([^\/]*\.)?glover8\.host-page\.com
+https?:\/\/([^\/]*\.)?glover9\.host-page\.com
+https?:\/\/([^\/]*\.)?gmldsb\.com
+https?:\/\/([^\/]*\.)?gnsgs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?go-ansna\.ibelgique\.com
+https?:\/\/([^\/]*\.)?goaie\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?goatlist-com-dk15cne\.blogspot\.com
+https?:\/\/([^\/]*\.)?goatlist-com-hi\.blogspot\.com
+https?:\/\/([^\/]*\.)?goatlist-com-o5\.blogspot\.com
+https?:\/\/([^\/]*\.)?gobabo\.nocostwebhosting\.com
+https?:\/\/([^\/]*\.)?gobald\.dtdns\.net
+https?:\/\/([^\/]*\.)?gobu4\.szm\.sk
+https?:\/\/([^\/]*\.)?gogllefr\.125mb\.com
+https?:\/\/([^\/]*\.)?gokletvi\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?goko-adeline\.blogspot\.com
+https?:\/\/([^\/]*\.)?gold-watch\.grimgoe\.be
+https?:\/\/([^\/]*\.)?gold\.fathippohosting\.com
+https?:\/\/([^\/]*\.)?goldsexcity\.info
+https?:\/\/([^\/]*\.)?goldshop\.freehostia\.com
+https?:\/\/([^\/]*\.)?golenord\.dl\.pl
+https?:\/\/([^\/]*\.)?goler-sor1z\.blogspot\.com
+https?:\/\/([^\/]*\.)?golfhq\.org
+https?:\/\/([^\/]*\.)?golfshoot\.com
+https?:\/\/([^\/]*\.)?gololed\.blogspot\.com
+https?:\/\/([^\/]*\.)?gomy0\.szm\.sk
+https?:\/\/([^\/]*\.)?gonzo-movies-com-ez\.blogspot\.com
+https?:\/\/([^\/]*\.)?gonzo-movies-rkk5jq\.blogspot\.com
+https?:\/\/([^\/]*\.)?good568\.com
+https?:\/\/([^\/]*\.)?goodhealthjobs\.info
+https?:\/\/([^\/]*\.)?goodticket\.org
+https?:\/\/([^\/]*\.)?google-pharmacy\.com
+https?:\/\/([^\/]*\.)?google110\.yculblog\.com
+https?:\/\/([^\/]*\.)?googlepaiming\.ebloggy\.com
+https?:\/\/([^\/]*\.)?googletosh\.org
+https?:\/\/([^\/]*\.)?goporn\.info
+https?:\/\/([^\/]*\.)?gopremen\.dl\.pl
+https?:\/\/([^\/]*\.)?gor-richards-realm-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?gorillalinks-com-t77\.blogspot\.com
+https?:\/\/([^\/]*\.)?gorillashaman\.blogspot\.com
+https?:\/\/([^\/]*\.)?gorlum\.t35\.com
+https?:\/\/([^\/]*\.)?gorunger\.com
+https?:\/\/([^\/]*\.)?goxzk\.szm\.sk
+https?:\/\/([^\/]*\.)?gpdmr\.szm\.sk
+https?:\/\/([^\/]*\.)?gphv0\.szm\.sk
+https?:\/\/([^\/]*\.)?gplea\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gqnzzlu\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?graduate-schools\.hotmail\.ru
+https?:\/\/([^\/]*\.)?graduate1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?graduate2schools\.chat\.ru
+https?:\/\/([^\/]*\.)?graf\.pp\.ru
+https?:\/\/([^\/]*\.)?grammatica-inglese\.bb11\.info
+https?:\/\/([^\/]*\.)?gran-roques\.forumhst\.info
+https?:\/\/([^\/]*\.)?granny-boy-free-pic\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?granny-movie-thumb\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?grannyorgies-com-o1w34\.blogspot\.com
+https?:\/\/([^\/]*\.)?grannyorgies-com-ormpubp\.blogspot\.com
+https?:\/\/([^\/]*\.)?grannyorgies-com-r2on\.blogspot\.com
+https?:\/\/([^\/]*\.)?grannypictures-com-a2w1\.blogspot\.com
+https?:\/\/([^\/]*\.)?grannypictures-com-ak6273j85t\.blogspot\.com
+https?:\/\/([^\/]*\.)?grannyplanet-com-k1bea\.blogspot\.com
+https?:\/\/([^\/]*\.)?great-ass-gallery\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?greataftorless\.com
+https?:\/\/([^\/]*\.)?greatbmwclub\.cn
+https?:\/\/([^\/]*\.)?greatbmwparts\.cn
+https?:\/\/([^\/]*\.)?greatbudgetinn\.info
+https?:\/\/([^\/]*\.)?greathal\.com
+https?:\/\/([^\/]*\.)?greatinsurancedirect\.info
+https?:\/\/([^\/]*\.)?greatmercedescar\.info
+https?:\/\/([^\/]*\.)?greatpsychology\.info
+https?:\/\/([^\/]*\.)?greatusainternet\.info
+https?:\/\/([^\/]*\.)?green-gradens\.org
+https?:\/\/([^\/]*\.)?green-tea-300\.co\.nr
+https?:\/\/([^\/]*\.)?green-tea\.co\.nr
+https?:\/\/([^\/]*\.)?greentits-com-kr3h3787pt\.blogspot\.com
+https?:\/\/([^\/]*\.)?greentits-com-t8xf3x5\.blogspot\.com
+https?:\/\/([^\/]*\.)?greentits-com-tr242sh16\.blogspot\.com
+https?:\/\/([^\/]*\.)?greet\.ipupdater\.net
+https?:\/\/([^\/]*\.)?grgul\.szm\.sk
+https?:\/\/([^\/]*\.)?griev\.ipupdater\.com
+https?:\/\/([^\/]*\.)?griffeylaw\.com
+https?:\/\/([^\/]*\.)?grimasa\.republika\.pl
+https?:\/\/([^\/]*\.)?groovybus-com-cv8ry83\.blogspot\.com
+https?:\/\/([^\/]*\.)?groovybus-com-gy1258kur3\.blogspot\.com
+https?:\/\/([^\/]*\.)?groupforums\.com
+https?:\/\/([^\/]*\.)?groups-msn-com-masturbating-site-woman\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?groups\.ku\.edu
+https?:\/\/([^\/]*\.)?grrualca\.jconserv\.net
+https?:\/\/([^\/]*\.)?gsaxz\.szm\.sk
+https?:\/\/([^\/]*\.)?gsebook\.org
+https?:\/\/([^\/]*\.)?gsloi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gsuyfy2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gsxez\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gu-amateur-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?guangdianyuanjian\.dzsc\.com
+https?:\/\/([^\/]*\.)?gudtk\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?guess76\.blogspot\.com
+https?:\/\/([^\/]*\.)?guilty-until-proven-innocent\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?gumaxxx-com-e3748i87g\.blogspot\.com
+https?:\/\/([^\/]*\.)?gumaxxx-com-ow774pk74m\.blogspot\.com
+https?:\/\/([^\/]*\.)?gumybear\.php5\.cz
+https?:\/\/([^\/]*\.)?gunterdirect\.com
+https?:\/\/([^\/]*\.)?gunterlawoffice\.com
+https?:\/\/([^\/]*\.)?guruful\.stabilt\.se
+https?:\/\/([^\/]*\.)?guys-butt-fucking\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?gvfefn3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gwebsearch\.org
+https?:\/\/([^\/]*\.)?gwjsx\.szm\.sk
+https?:\/\/([^\/]*\.)?gxrd3\.szm\.sk
+https?:\/\/([^\/]*\.)?gyig3\.szm\.sk
+https?:\/\/([^\/]*\.)?gym-equipments\.org
+https?:\/\/([^\/]*\.)?gyzvpxl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gzmayz6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?gzvwa\.szm\.sk
+https?:\/\/([^\/]*\.)?h0vutok\.nokedem\.com
+https?:\/\/([^\/]*\.)?h15\.ru
+https?:\/\/([^\/]*\.)?h3as88dw\.info
+https?:\/\/([^\/]*\.)?habromjw\.dl\.pl
+https?:\/\/([^\/]*\.)?haemcurio\.0moola\.com
+https?:\/\/([^\/]*\.)?hahas\.info
+https?:\/\/([^\/]*\.)?hairy-ass-hole\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?hairy-chubby-gallery\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?hairy-leg-pic-woman\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hairy-milf-movie\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?hairydivas-com-hg2gvyc\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairydivas-t150c5gmf8\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairyerotica-com-i4fl2x\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairypinktacos-com-djl\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairypinktacos-com-hlnfq3rea2\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairypussypost-com-mk0ymrj\.blogspot\.com
+https?:\/\/([^\/]*\.)?hairypussypost-com-w6\.blogspot\.com
+https?:\/\/([^\/]*\.)?hal\.engr\.smu\.edu
+https?:\/\/([^\/]*\.)?halloween2006\.info
+https?:\/\/([^\/]*\.)?halx8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hamalo\.com
+https?:\/\/([^\/]*\.)?hamas2007\.republika\.pl
+https?:\/\/([^\/]*\.)?hand-job-movie-x-x-d\.blogspot\.com
+https?:\/\/([^\/]*\.)?hand-stained-xx\.blogspot\.com
+https?:\/\/([^\/]*\.)?hangzhau\.cn
+https?:\/\/([^\/]*\.)?hanksgalleries-com-b73flku8\.blogspot\.com
+https?:\/\/([^\/]*\.)?hanksgalleries-com-rtuvbgdl\.blogspot\.com
+https?:\/\/([^\/]*\.)?hanry\.stabilt\.se
+https?:\/\/([^\/]*\.)?haole\.cn
+https?:\/\/([^\/]*\.)?happy-pharma\.com
+https?:\/\/([^\/]*\.)?hard-disk-esterno\.hostzz\.info
+https?:\/\/([^\/]*\.)?hard-disk-esterno\.ll11\.info
+https?:\/\/([^\/]*\.)?hardbabes-com-e061obbg\.blogspot\.com
+https?:\/\/([^\/]*\.)?hardbabes-com-e588iqk\.blogspot\.com
+https?:\/\/([^\/]*\.)?hardcore-amateur-thumbnail\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hardcore-asian-anal\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?hardcore-dancing-site-myspace-com\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hardcore-free-porn-xx\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?hardcore-lesbian-pussy-eating\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hardcore-mature-sex-young\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?hardcore-porn-clip-info73q\.blogspot\.com
+https?:\/\/([^\/]*\.)?hardcore-sex-black-on-white\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?hardcore-xxx-video\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hardcoregangstas\.hrable\.dtdns\.net
+https?:\/\/([^\/]*\.)?hardhut-com-ao8renz\.blogspot\.com
+https?:\/\/([^\/]*\.)?hardhut-com-tgi\.blogspot\.com
+https?:\/\/([^\/]*\.)?hardhut-com-wb8m8\.blogspot\.com
+https?:\/\/([^\/]*\.)?hargd\.szm\.sk
+https?:\/\/([^\/]*\.)?harley-davidson-womens-boot\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?harted\.hostpresso\.com
+https?:\/\/([^\/]*\.)?haungsanok\.com
+https?:\/\/([^\/]*\.)?hawaiimortgage-x\.com
+https?:\/\/([^\/]*\.)?hawbij4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hawkesnest\.com
+https?:\/\/([^\/]*\.)?hazell-keeley-sex-video-bb-bb-f\.blogspot\.com
+https?:\/\/([^\/]*\.)?hbyfq\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?hcgs\.unh\.edu
+https?:\/\/([^\/]*\.)?hclt-events\.blogspot\.com
+https?:\/\/([^\/]*\.)?hdbj\.com\.cn
+https?:\/\/([^\/]*\.)?hdchina\.com
+https?:\/\/([^\/]*\.)?hdlwc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hdndeuw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?he-wells\.blogspot\.com
+https?:\/\/([^\/]*\.)?he-wendy\.blogspot\.com
+https?:\/\/([^\/]*\.)?head-masturbating-shower-woman\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?health-insurance-0\.blogspot\.com
+https?:\/\/([^\/]*\.)?health-insurance-save\.com
+https?:\/\/([^\/]*\.)?health-jack\.com
+https?:\/\/([^\/]*\.)?healthinsurance-x\.com
+https?:\/\/([^\/]*\.)?healthprocare\.info
+https?:\/\/([^\/]*\.)?hebei-railings\.cn
+https?:\/\/([^\/]*\.)?hecarabi\.info
+https?:\/\/([^\/]*\.)?hefo-adrianna\.blogspot\.com
+https?:\/\/([^\/]*\.)?hek-tshirthell-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?hellim\.3x\.ro
+https?:\/\/([^\/]*\.)?heloween\.php5\.cz
+https?:\/\/([^\/]*\.)?hemilton\.stabilt\.se
+https?:\/\/([^\/]*\.)?hengxinbanjia\.com
+https?:\/\/([^\/]*\.)?her-first-anal-fucking\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?her-first-cum\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?her-first-lesbian-sex-kylie\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?her-first-small-dick\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?her-sweet-ass\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?here\.com\.cn
+https?:\/\/([^\/]*\.)?hereandnow0\.com
+https?:\/\/([^\/]*\.)?hereistheporn-com-abg\.blogspot\.com
+https?:\/\/([^\/]*\.)?hereistheporn-com-wxu4\.blogspot\.com
+https?:\/\/([^\/]*\.)?herpes\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?herufip\.info
+https?:\/\/([^\/]*\.)?heschlos\.dl\.pl
+https?:\/\/([^\/]*\.)?hevo-alannah\.blogspot\.com
+https?:\/\/([^\/]*\.)?hexingqc\.com
+https?:\/\/([^\/]*\.)?hfpm\.com
+https?:\/\/([^\/]*\.)?hfsflm0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hfslink\.com
+https?:\/\/([^\/]*\.)?hgdpy\.szm\.sk
+https?:\/\/([^\/]*\.)?hgh\.rx4\.org
+https?:\/\/([^\/]*\.)?hgqz5\.szm\.sk
+https?:\/\/([^\/]*\.)?hguldxxe-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?hgyxs\.szm\.sk
+https?:\/\/([^\/]*\.)?hhcoh\.szm\.sk
+https?:\/\/([^\/]*\.)?hhlive\.info
+https?:\/\/([^\/]*\.)?hhpump\.com
+https?:\/\/([^\/]*\.)?hiadadar\.forumzen\.com
+https?:\/\/([^\/]*\.)?higarret\.forumzen\.com
+https?:\/\/([^\/]*\.)?high-heel-western-boot\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?high-school-diploma\.hotmail\.ru
+https?:\/\/([^\/]*\.)?high1school4dipl\.chat\.ru
+https?:\/\/([^\/]*\.)?highclassblogs\.com
+https?:\/\/([^\/]*\.)?hilarykallin\.50webs\.org
+https?:\/\/([^\/]*\.)?hilipa\.com
+https?:\/\/([^\/]*\.)?hilipy\.com
+https?:\/\/([^\/]*\.)?hillery\.republika\.pl
+https?:\/\/([^\/]*\.)?himd4\.szm\.sk
+https?:\/\/([^\/]*\.)?himp3\.biz
+https?:\/\/([^\/]*\.)?hinn8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hioctane-com-dlmv6g7y\.blogspot\.com
+https?:\/\/([^\/]*\.)?hioctane-com-dq4opea\.blogspot\.com
+https?:\/\/([^\/]*\.)?hioctane-com-h0un\.blogspot\.com
+https?:\/\/([^\/]*\.)?hioctane-com-toxuz\.blogspot\.com
+https?:\/\/([^\/]*\.)?hipoldlady\.com
+https?:\/\/([^\/]*\.)?hirudaco\.forumzen\.com
+https?:\/\/([^\/]*\.)?his13lessings\.blogspot\.com
+https?:\/\/([^\/]*\.)?history-of-condom\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?hisyma\.dl\.pl
+https?:\/\/([^\/]*\.)?hitm4n\.blogspot\.com
+https?:\/\/([^\/]*\.)?hiv123\.com
+https?:\/\/([^\/]*\.)?hiv987\.zj\.com
+https?:\/\/([^\/]*\.)?hjia\.ebloggy\.com
+https?:\/\/([^\/]*\.)?hjolmed\.com
+https?:\/\/([^\/]*\.)?hkcompanyforyou\.cn
+https?:\/\/([^\/]*\.)?hkfeng\.com
+https?:\/\/([^\/]*\.)?hkwei\.com\.cn
+https?:\/\/([^\/]*\.)?hlemizd\.republika\.pl
+https?:\/\/([^\/]*\.)?hlusky\.republika\.pl
+https?:\/\/([^\/]*\.)?hlxn6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hmppbw-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?hnxsv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ho-big-clip-tit-video-hox\.blogspot\.com
+https?:\/\/([^\/]*\.)?hobaysin\.ifrance\.com
+https?:\/\/([^\/]*\.)?hocohn\.dl\.pl
+https?:\/\/([^\/]*\.)?hohoo\.cn
+https?:\/\/([^\/]*\.)?hold-em-play\.com
+https?:\/\/([^\/]*\.)?hold-em-play\.net
+https?:\/\/([^\/]*\.)?hold-em-winner\.us
+https?:\/\/([^\/]*\.)?home-made-porn-clip-blogt7y\.blogspot\.com
+https?:\/\/([^\/]*\.)?home-mortgages\.bigsitecity\.com
+https?:\/\/([^\/]*\.)?home-sauna\.boom\.ru
+https?:\/\/([^\/]*\.)?home-secure\.org
+https?:\/\/([^\/]*\.)?home-sex-video-t1ux7\.blogspot\.com
+https?:\/\/([^\/]*\.)?home-spire\.com
+https?:\/\/([^\/]*\.)?home\.graffiti\.net
+https?:\/\/([^\/]*\.)?home\.sailormoon\.com
+https?:\/\/([^\/]*\.)?home2-school\.boom\.ru
+https?:\/\/([^\/]*\.)?homeequitylineofcredit-x\.com
+https?:\/\/([^\/]*\.)?homeequitylineofcreditlenders\.com
+https?:\/\/([^\/]*\.)?homeequityloan-now\.com
+https?:\/\/([^\/]*\.)?homeequityloans-now\.com
+https?:\/\/([^\/]*\.)?homeequityloans-x\.com
+https?:\/\/([^\/]*\.)?homefinance-x\.com
+https?:\/\/([^\/]*\.)?homeloan-now\.com
+https?:\/\/([^\/]*\.)?homeloanlogic\.com
+https?:\/\/([^\/]*\.)?homeloans-now\.com
+https?:\/\/([^\/]*\.)?homemade-mature-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?homemade-porn-clip-infoywx\.blogspot\.com
+https?:\/\/([^\/]*\.)?homesafterbankruptcy\.info
+https?:\/\/([^\/]*\.)?homesbysellers\.com
+https?:\/\/([^\/]*\.)?homesbysellers\.net
+https?:\/\/([^\/]*\.)?homesexvideo\.org
+https?:\/\/([^\/]*\.)?hometowngirls\.be
+https?:\/\/([^\/]*\.)?hometwat-com-hrmml\.blogspot\.com
+https?:\/\/([^\/]*\.)?homos\.php5\.cz
+https?:\/\/([^\/]*\.)?homunkulus\.info
+https?:\/\/([^\/]*\.)?homunkulus\.republika\.pl
+https?:\/\/([^\/]*\.)?homy\.etowns\.net
+https?:\/\/([^\/]*\.)?honba\.republika\.pl
+https?:\/\/([^\/]*\.)?honey99\.cn
+https?:\/\/([^\/]*\.)?honey99\.com
+https?:\/\/([^\/]*\.)?hongjianlaw\.com
+https?:\/\/([^\/]*\.)?hongqi120\.com
+https?:\/\/([^\/]*\.)?hoodia\.269g\.net
+https?:\/\/([^\/]*\.)?hoodiadiet\.269g\.net
+https?:\/\/([^\/]*\.)?hopemarry\.com
+https?:\/\/([^\/]*\.)?horizondrugs\.zaclona\.yi\.org
+https?:\/\/([^\/]*\.)?hornina\.net
+https?:\/\/([^\/]*\.)?horny-butt-sex\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?horny-grannysex-bipiw\.blogspot\.com
+https?:\/\/([^\/]*\.)?horny-hailey\.hostithere\.org
+https?:\/\/([^\/]*\.)?hornybanana-com-mg\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornybanana-com-to0b\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornycrocodile-com-c37c85\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornycrocodile-com-gmb5ev\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornycrocodile-com-gv3x3oxt\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornyduck-com-esta\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornyduck-com-oix7y2v\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornykaren-com-b16sk5\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornykaren-com-bl4rw4\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornykaren-com-rg034\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornyspanishflies-com-c0cx6a3bo\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornyspanishflies-com-ks5856vf77\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornytiger-com-d3\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornytiger-com-il0x678fwr\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornywolf-com-m27\.blogspot\.com
+https?:\/\/([^\/]*\.)?hornywolf-com-tqwaj\.blogspot\.com
+https?:\/\/([^\/]*\.)?hospitalonline\.cn
+https?:\/\/([^\/]*\.)?host-page\.com
+https?:\/\/([^\/]*\.)?hosting1999\.com
+https?:\/\/([^\/]*\.)?hosting41\.com
+https?:\/\/([^\/]*\.)?hot-anal-sex-com\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hot-asian-cock\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?hot-ass-anal\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?hot-blonde-babe-gallery\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?hot-brazilian-ass\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?hot-bubble-butt-girl\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?hot-cheerleader-getting-fucked\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?hot-dating-chat\.ifastnet\.com
+https?:\/\/([^\/]*\.)?hot-latino-ass\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?hot-mature-sex-uk-woman\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?hot-mature-xxx\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?hot-mom-site-myspace-com\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?hot-nude-blonde-chick\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?hot-pussy-tit-ass\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?hot-sex-video-bb-bb-v\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotbigmovies-com-cd\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotbigmovies-com-k62que75im\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotchina\.org
+https?:\/\/([^\/]*\.)?hotel-centro-benessere\.host24h\.info
+https?:\/\/([^\/]*\.)?hotel-offerta\.nnme\.info
+https?:\/\/([^\/]*\.)?hotel-shop\.info
+https?:\/\/([^\/]*\.)?hotelsaccommodations\.info
+https?:\/\/([^\/]*\.)?hotfunhouse-com-pevuv\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotfunhouse-com-r5530\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotgirlsplayroom-com-dl0q21\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotgirlsplayroom-com-isnkeded\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotmoko\.info
+https?:\/\/([^\/]*\.)?hotorange-net-ms\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotpapai-com-hoc3g\.blogspot\.com
+https?:\/\/([^\/]*\.)?hotty-x\.com
+https?:\/\/([^\/]*\.)?hottystop-com-a252gugtk\.blogspot\.com
+https?:\/\/([^\/]*\.)?hottystop-com-grn\.blogspot\.com
+https?:\/\/([^\/]*\.)?house-15\.jeepsyc\.be
+https?:\/\/([^\/]*\.)?houses-bahamas\.ligamic\.be
+https?:\/\/([^\/]*\.)?housewifeaction-com-evv\.blogspot\.com
+https?:\/\/([^\/]*\.)?housewifeaction-com-o6z0yrnat\.blogspot\.com
+https?:\/\/([^\/]*\.)?housewifeaction-com-ob85\.blogspot\.com
+https?:\/\/([^\/]*\.)?hovadko\.isuisse\.com
+https?:\/\/([^\/]*\.)?hovass\.com
+https?:\/\/([^\/]*\.)?hovi-albatross\.blogspot\.com
+https?:\/\/([^\/]*\.)?how-to-catch-a-cheating-spouse\.com
+https?:\/\/([^\/]*\.)?how-to-make-a-boot-disk-on-win-xp\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?how-to-make-a-boot-disk\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?how-to-make-a-cock-ring\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?hppr7\.szm\.sk
+https?:\/\/([^\/]*\.)?hpua6\.szm\.sk
+https?:\/\/([^\/]*\.)?hpwe6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hq-casino\.org
+https?:\/\/([^\/]*\.)?hq-teens-com-aq\.blogspot\.com
+https?:\/\/([^\/]*\.)?hq-teens-com-w2opp2\.blogspot\.com
+https?:\/\/([^\/]*\.)?hq\.left-page\.com
+https?:\/\/([^\/]*\.)?hqgal-com-eu7gbk1o\.blogspot\.com
+https?:\/\/([^\/]*\.)?hqgal-com-ilxpxi0\.blogspot\.com
+https?:\/\/([^\/]*\.)?hqmovs-com-k31h4x37df\.blogspot\.com
+https?:\/\/([^\/]*\.)?hqmovs-com-tiou81\.blogspot\.com
+https?:\/\/([^\/]*\.)?hqmovs-com-ts5\.blogspot\.com
+https?:\/\/([^\/]*\.)?hrable\.ostabil\.nu
+https?:\/\/([^\/]*\.)?hrhbchj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hromotlk\.asp2\.cz
+https?:\/\/([^\/]*\.)?hrusky\.dtdns\.net
+https?:\/\/([^\/]*\.)?hscrza1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ht120\.com
+https?:\/\/([^\/]*\.)?htejj\.szm\.sk
+https?:\/\/([^\/]*\.)?huaeq\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?huapatossu\.blogspot\.com
+https?:\/\/([^\/]*\.)?huataix\.net
+https?:\/\/([^\/]*\.)?hubo-aileen\.blogspot\.com
+https?:\/\/([^\/]*\.)?huem-polbu\.netfirms\.com
+https?:\/\/([^\/]*\.)?huge-cock-shemale\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?huge-dick-anal\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?huge-dildo-fucking\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?huge-mexican-ass\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?huge-sexy-boob\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?huge-white-dick\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?hulio\.asp2\.cz
+https?:\/\/([^\/]*\.)?hulks\.info
+https?:\/\/([^\/]*\.)?hummerworldusa\.info
+https?:\/\/([^\/]*\.)?hupa4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hurvinek\.isuisse\.com
+https?:\/\/([^\/]*\.)?huspinina\.com
+https?:\/\/([^\/]*\.)?hutwistina\.com
+https?:\/\/([^\/]*\.)?huynani\.mpage\.jp
+https?:\/\/([^\/]*\.)?hvebjr2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hver5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hvlnb\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?hwantiig-yg\.blogspot\.com
+https?:\/\/([^\/]*\.)?hwcw4\.szm\.sk
+https?:\/\/([^\/]*\.)?hwhhw\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?hwkxt\.szm\.sk
+https?:\/\/([^\/]*\.)?hxbqpz3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?hxlll\.net
+https?:\/\/([^\/]*\.)?hydrochloride-tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?hydrocodone-911\.coz\.in
+https?:\/\/([^\/]*\.)?hydrocodone-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?hydrocodone-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?hydrocodone-gs\.net\.tc
+https?:\/\/([^\/]*\.)?hydrocodone-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?hydrocodone\.cheapills\.info
+https?:\/\/([^\/]*\.)?hydrocodone\.conto\.pl
+https?:\/\/([^\/]*\.)?hydrocodone\.esguay\.com
+https?:\/\/([^\/]*\.)?hydrocodone\.fws1\.com
+https?:\/\/([^\/]*\.)?hydrocodone\.guu\.pl
+https?:\/\/([^\/]*\.)?hydrocodone\.presteert\.nl
+https?:\/\/([^\/]*\.)?hydrocodone\.slyip\.net
+https?:\/\/([^\/]*\.)?hydrocodonebxs\.blogspot\.com
+https?:\/\/([^\/]*\.)?hydrocodoneq\.phpbbx\.de
+https?:\/\/([^\/]*\.)?hydrocodonerx\.weboficial\.com
+https?:\/\/([^\/]*\.)?hyip\.fanforum\.cc
+https?:\/\/([^\/]*\.)?hz7\.org
+https?:\/\/([^\/]*\.)?hzkap\.szm\.sk
+https?:\/\/([^\/]*\.)?hzmeitai\.com
+https?:\/\/([^\/]*\.)?hzui8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?i-truepoker\.com
+https?:\/\/([^\/]*\.)?iactive\.com\.cn
+https?:\/\/([^\/]*\.)?iapon\.galeon\.com
+https?:\/\/([^\/]*\.)?ibizababes-com-tr\.blogspot\.com
+https?:\/\/([^\/]*\.)?ic37\.com
+https?:\/\/([^\/]*\.)?icdufetc\.forumzen\.com
+https?:\/\/([^\/]*\.)?ickaboo\.com
+https?:\/\/([^\/]*\.)?icnfr\.szm\.sk
+https?:\/\/([^\/]*\.)?ict\.188info\.com
+https?:\/\/([^\/]*\.)?idahomortgage-x\.com
+https?:\/\/([^\/]*\.)?idc2008\.cn
+https?:\/\/([^\/]*\.)?idealbabes-net-r5x1puaah0\.blogspot\.com
+https?:\/\/([^\/]*\.)?iditarodhumor\.info
+https?:\/\/([^\/]*\.)?iehf\.blogspot\.com
+https?:\/\/([^\/]*\.)?iehffy8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?iehzup8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ifdbx\.szm\.sk
+https?:\/\/([^\/]*\.)?ifmnqm6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ifyj2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ihavenourl\.com
+https?:\/\/([^\/]*\.)?ihomebroker\.com
+https?:\/\/([^\/]*\.)?ihrd\.blogspot\.com
+https?:\/\/([^\/]*\.)?iiak2\.szm\.sk
+https?:\/\/([^\/]*\.)?iio91\.net
+https?:\/\/([^\/]*\.)?iisqvkk\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?iitop\.info
+https?:\/\/([^\/]*\.)?ikoxf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?il4unu\.com
+https?:\/\/([^\/]*\.)?ilflz\.szm\.sk
+https?:\/\/([^\/]*\.)?ilfwvf2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?illcom\.com
+https?:\/\/([^\/]*\.)?illinoismortgage-x\.com
+https?:\/\/([^\/]*\.)?ilove-movies-com-w5nx\.blogspot\.com
+https?:\/\/([^\/]*\.)?ilove-movies-com-wrde\.blogspot\.com
+https?:\/\/([^\/]*\.)?iloveubaby\.info
+https?:\/\/([^\/]*\.)?iltbl\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?im-really-cool\.blogspot\.com
+https?:\/\/([^\/]*\.)?imitrex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?imitrexinjections\.sblog\.cz
+https?:\/\/([^\/]*\.)?immagine-sfondo-hello-kitty\.i111i\.info
+https?:\/\/([^\/]*\.)?imposingimo\.com
+https?:\/\/([^\/]*\.)?impossiblemale61\.blogspot\.com
+https?:\/\/([^\/]*\.)?imteen\.attacke\.ch
+https?:\/\/([^\/]*\.)?incontri-amore\.19mb\.info
+https?:\/\/([^\/]*\.)?incontri-amore\.you-bizz\.info
+https?:\/\/([^\/]*\.)?indian-porn-clip-zone5j4\.blogspot\.com
+https?:\/\/([^\/]*\.)?indian-porn-video-zo\.blogspot\.com
+https?:\/\/([^\/]*\.)?indian-sex-fuck\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?indianamortgage-x\.com
+https?:\/\/([^\/]*\.)?indienudes-com-h4owj60\.blogspot\.com
+https?:\/\/([^\/]*\.)?infinitemonies\.com
+https?:\/\/([^\/]*\.)?infinitieyewear\.info
+https?:\/\/([^\/]*\.)?infinitims\.info
+https?:\/\/([^\/]*\.)?infinitipianeta\.info
+https?:\/\/([^\/]*\.)?infoarena\.info
+https?:\/\/([^\/]*\.)?infospm\.21publish\.de
+https?:\/\/([^\/]*\.)?infty\.net
+https?:\/\/([^\/]*\.)?injecfu\.com
+https?:\/\/([^\/]*\.)?injxx\.szm\.sk
+https?:\/\/([^\/]*\.)?innocent-ass\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?innocent-busty-teen\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?innocent-eve-pic\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?innocentdream-com-da\.blogspot\.com
+https?:\/\/([^\/]*\.)?inqygjz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?inrhqi3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?insidethecloset\.com
+https?:\/\/([^\/]*\.)?inspectorgalleries-com-k5\.blogspot\.com
+https?:\/\/([^\/]*\.)?insurance-leader\.com
+https?:\/\/([^\/]*\.)?insurance-top\.com
+https?:\/\/([^\/]*\.)?insurance\.topforyou\.net
+https?:\/\/([^\/]*\.)?internal-ass-cum-shot\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?international-dating\.sexnation\.info
+https?:\/\/([^\/]*\.)?interracial-gang-bang-crew\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?interracial-gay-anal-sex\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?interracial-lesbian-domination\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?interracial-teen-fucking\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?interracialpicsuux\.blogspot\.com
+https?:\/\/([^\/]*\.)?intersea-fdn\.com
+https?:\/\/([^\/]*\.)?inthevip-com-bc1b0kb0\.blogspot\.com
+https?:\/\/([^\/]*\.)?inthevip-com-bvw\.blogspot\.com
+https?:\/\/([^\/]*\.)?inthevip-com-rso\.blogspot\.com
+https?:\/\/([^\/]*\.)?intll\.com
+https?:\/\/([^\/]*\.)?intra\.som\.umass\.edu
+https?:\/\/([^\/]*\.)?intranet\.education\.umn\.edu
+https?:\/\/([^\/]*\.)?invest1\.org\.ua
+https?:\/\/([^\/]*\.)?ioauaq0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ionamin\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ionizatorit\.info
+https?:\/\/([^\/]*\.)?iowamortgage-x\.com
+https?:\/\/([^\/]*\.)?ipeddle\.com
+https?:\/\/([^\/]*\.)?ipha4\.szm\.sk
+https?:\/\/([^\/]*\.)?ipod-application\.info
+https?:\/\/([^\/]*\.)?ipokea\.com
+https?:\/\/([^\/]*\.)?iqzyk\.szm\.sk
+https?:\/\/([^\/]*\.)?iradorame\.site\.voila\.fr
+https?:\/\/([^\/]*\.)?ircv6\.szm\.sk
+https?:\/\/([^\/]*\.)?irenefah-gijul\.blogspot\.com
+https?:\/\/([^\/]*\.)?irishlover\.info
+https?:\/\/([^\/]*\.)?iron-island\.blogspot\.com
+https?:\/\/([^\/]*\.)?ironing-boards\.haemati\.be
+https?:\/\/([^\/]*\.)?irqs8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?isceby0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?islands-tour\.globaltr\.info
+https?:\/\/([^\/]*\.)?isoway-yoga\.com
+https?:\/\/([^\/]*\.)?ispycameltoe-com-cugh6n\.blogspot\.com
+https?:\/\/([^\/]*\.)?ispycameltoe-com-g4s2f7vevs\.blogspot\.com
+https?:\/\/([^\/]*\.)?italiagame\.org
+https?:\/\/([^\/]*\.)?italianosito\.info
+https?:\/\/([^\/]*\.)?italika\.info
+https?:\/\/([^\/]*\.)?italizzhot\.info
+https?:\/\/([^\/]*\.)?italoman\.info
+https?:\/\/([^\/]*\.)?italytraffic\.info
+https?:\/\/([^\/]*\.)?itchy-skin\.nm\.ru
+https?:\/\/([^\/]*\.)?itchy_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?itcweb\.ecsu\.edu
+https?:\/\/([^\/]*\.)?itdk0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?item4u\.com
+https?:\/\/([^\/]*\.)?itgeecna\.forumzen\.com
+https?:\/\/([^\/]*\.)?itp\.nyu\.edu
+https?:\/\/([^\/]*\.)?itpvewa\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?itsum\.com\.cn
+https?:\/\/([^\/]*\.)?ityh1\.szm\.sk
+https?:\/\/([^\/]*\.)?iugfsvv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?iuzjbpu\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ivana-fuck-a-lot\.hoffer\.ipupdater\.com
+https?:\/\/([^\/]*\.)?ivoyt\.blogspot\.com
+https?:\/\/([^\/]*\.)?ivs\.com\.cn
+https?:\/\/([^\/]*\.)?iwahigux\.info
+https?:\/\/([^\/]*\.)?iwantmature-com-mme\.blogspot\.com
+https?:\/\/([^\/]*\.)?iwuy8\.szm\.sk
+https?:\/\/([^\/]*\.)?ixiixi-com-guy\.blogspot\.com
+https?:\/\/([^\/]*\.)?ixllvdi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ixnl4\.szm\.sk
+https?:\/\/([^\/]*\.)?ixth4\.szm\.sk
+https?:\/\/([^\/]*\.)?izizyu-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?izui7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ja-rule-ringtonezad\.blogspot\.com
+https?:\/\/([^\/]*\.)?jablicko\.yi\.org
+https?:\/\/([^\/]*\.)?jablonec\.republika\.pl
+https?:\/\/([^\/]*\.)?jadelrel\.goodbb\.net
+https?:\/\/([^\/]*\.)?jagast\.com
+https?:\/\/([^\/]*\.)?jahmpf3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jaja-jak-globusy\.com
+https?:\/\/([^\/]*\.)?jajpip5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jamies-galleries-com-dr7itf8c\.blogspot\.com
+https?:\/\/([^\/]*\.)?jamm\.host-page\.com
+https?:\/\/([^\/]*\.)?janelolo\.fr-bb\.com
+https?:\/\/([^\/]*\.)?janet-jackson-boob-picture\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?janisy\.republika\.pl
+https?:\/\/([^\/]*\.)?jantiq\.com
+https?:\/\/([^\/]*\.)?jaoqmw1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?japan-girl-sex\.com
+https?:\/\/([^\/]*\.)?japan-whores-com-e28dwa2vvb\.blogspot\.com
+https?:\/\/([^\/]*\.)?japan-whores-com-elay3rzsu\.blogspot\.com
+https?:\/\/([^\/]*\.)?japanese-geisha-girl\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?japanese-teacher-fuck\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?japanese158\.com
+https?:\/\/([^\/]*\.)?japanshanye\.com
+https?:\/\/([^\/]*\.)?jarella\.goodbb\.net
+https?:\/\/([^\/]*\.)?jasara-com-t6fn6k8\.blogspot\.com
+https?:\/\/([^\/]*\.)?jasara-com-two5\.blogspot\.com
+https?:\/\/([^\/]*\.)?jasara-com-wibeh\.blogspot\.com
+https?:\/\/([^\/]*\.)?jastim\.com
+https?:\/\/([^\/]*\.)?jbixc\.szm\.sk
+https?:\/\/([^\/]*\.)?jblt7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jcbbxb0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jdmz\.com\.cn
+https?:\/\/([^\/]*\.)?jeanniexong\.blogspot\.com
+https?:\/\/([^\/]*\.)?jebmd\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?jed-two-lips-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?jeffrorocks21\.blogspot\.com
+https?:\/\/([^\/]*\.)?jelatko\.republika\.pl
+https?:\/\/([^\/]*\.)?jelito\.stabilt\.se
+https?:\/\/([^\/]*\.)?jennifer-lopez-music-photo\.blogspot\.com
+https?:\/\/([^\/]*\.)?jennifer-lopez-ringtoneqnf\.blogspot\.com
+https?:\/\/([^\/]*\.)?jennysbookmarks-com-kcr\.blogspot\.com
+https?:\/\/([^\/]*\.)?jessica-alba-jly9\.blogspot\.com
+https?:\/\/([^\/]*\.)?jessiethebestie\.blogspot\.com
+https?:\/\/([^\/]*\.)?jesuisleflet\.blogspot\.com
+https?:\/\/([^\/]*\.)?jet-cold-hard-bitch-album-version-lyric\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?jetoo\.cn
+https?:\/\/([^\/]*\.)?jeun\.fr
+https?:\/\/([^\/]*\.)?jewels667\.blogspot\.com
+https?:\/\/([^\/]*\.)?jezgy\.szm\.sk
+https?:\/\/([^\/]*\.)?jfmr\.com
+https?:\/\/([^\/]*\.)?jgeqhqa\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jhrxa\.szm\.sk
+https?:\/\/([^\/]*\.)?jhsy0\.szm\.sk
+https?:\/\/([^\/]*\.)?jiahuajipiao\.com
+https?:\/\/([^\/]*\.)?jiaju88\.com
+https?:\/\/([^\/]*\.)?jianfei\.cc
+https?:\/\/([^\/]*\.)?jianzhi168\.com
+https?:\/\/([^\/]*\.)?jiaza\.szm\.sk
+https?:\/\/([^\/]*\.)?jiboki-free-lesbian-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?jichengdianlu\.dzsc\.com
+https?:\/\/([^\/]*\.)?jidianqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?jieyan\.com\.cn
+https?:\/\/([^\/]*\.)?jiguang\.org
+https?:\/\/([^\/]*\.)?jijijo\.com
+https?:\/\/([^\/]*\.)?jimbo\.php5\.cz
+https?:\/\/([^\/]*\.)?jimmccarthy\.org\.uk
+https?:\/\/([^\/]*\.)?jimmini\.blogspot\.com
+https?:\/\/([^\/]*\.)?jinchengjipiao\.com
+https?:\/\/([^\/]*\.)?jinghuigift\.com
+https?:\/\/([^\/]*\.)?jingzhi-life\.com
+https?:\/\/([^\/]*\.)?jipiao\.51mp4mp3\.com
+https?:\/\/([^\/]*\.)?jipiaoweb\.co
+https?:\/\/([^\/]*\.)?jipiaoweb\.com
+https?:\/\/([^\/]*\.)?jiuwu\.com
+https?:\/\/([^\/]*\.)?jizzhut-com-oq4zf\.blogspot\.com
+https?:\/\/([^\/]*\.)?jizzonline-com-a3h52c1\.blogspot\.com
+https?:\/\/([^\/]*\.)?jizzonline-cz0h5y1nm\.blogspot\.com
+https?:\/\/([^\/]*\.)?jjfchljumf-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?jjuwt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jkpotv-free-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?jlhtj\.szm\.sk
+https?:\/\/([^\/]*\.)?jlibhe9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jmjx7\.szm\.sk
+https?:\/\/([^\/]*\.)?jnbxqy5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jnk713\.ifrance\.com
+https?:\/\/([^\/]*\.)?jnxx3\.szm\.sk
+https?:\/\/([^\/]*\.)?jobecraf\.dl\.pl
+https?:\/\/([^\/]*\.)?jobruler\.com
+https?:\/\/([^\/]*\.)?jocdy\.szm\.sk
+https?:\/\/([^\/]*\.)?jodofiv-free-fat-ass-mo-t\.blogspot\.com
+https?:\/\/([^\/]*\.)?johatch\.ifrance\.com
+https?:\/\/([^\/]*\.)?joia\.com
+https?:\/\/([^\/]*\.)?jointroompia\.com
+https?:\/\/([^\/]*\.)?jokerupot\.blogspot\.com
+https?:\/\/([^\/]*\.)?jon-a-ross\.blogspot\.com
+https?:\/\/([^\/]*\.)?jonn22\.com
+https?:\/\/([^\/]*\.)?jonsmovies-com-b23k3tx4h\.blogspot\.com
+https?:\/\/([^\/]*\.)?joperan\.org
+https?:\/\/([^\/]*\.)?journal\.eepis-its\.edu
+https?:\/\/([^\/]*\.)?joycclx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jozin\.php5\.cz
+https?:\/\/([^\/]*\.)?jp\.zxvo\.com
+https?:\/\/([^\/]*\.)?jpeghunter-com-h6rb6\.blogspot\.com
+https?:\/\/([^\/]*\.)?jpeghunter-com-hsa0g47vew\.blogspot\.com
+https?:\/\/([^\/]*\.)?jpha9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jplm\.cn
+https?:\/\/([^\/]*\.)?jptrip\.org
+https?:\/\/([^\/]*\.)?jqri2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?jrcreations\.com
+https?:\/\/([^\/]*\.)?jrqzje5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jsjgdpg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jsyuanyang\.com
+https?:\/\/([^\/]*\.)?jtdh\.fuwuqituoguan\.com
+https?:\/\/([^\/]*\.)?jtgq3\.szm\.sk
+https?:\/\/([^\/]*\.)?jtoph\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?jtut6\.szm\.sk
+https?:\/\/([^\/]*\.)?ju-alexis\.blogspot\.com
+https?:\/\/([^\/]*\.)?ju-free-porn-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?juanyuancailiao\.dzsc\.com
+https?:\/\/([^\/]*\.)?juggcrew-com-r4xwgs\.blogspot\.com
+https?:\/\/([^\/]*\.)?jugni\.50webs\.org
+https?:\/\/([^\/]*\.)?juicygals-com-c8o\.blogspot\.com
+https?:\/\/([^\/]*\.)?juliatalbot\.50webs\.org
+https?:\/\/([^\/]*\.)?julietsold\.info
+https?:\/\/([^\/]*\.)?jumasd\.com
+https?:\/\/([^\/]*\.)?jumtan\.com
+https?:\/\/([^\/]*\.)?junenanney\.site\.io
+https?:\/\/([^\/]*\.)?junky\.phpbb2\.us
+https?:\/\/([^\/]*\.)?junyuan\.com\.cn
+https?:\/\/([^\/]*\.)?jupka97\.blogspot\.com
+https?:\/\/([^\/]*\.)?juruortr\.jconserv\.net
+https?:\/\/([^\/]*\.)?juse-active\.blogspot\.com
+https?:\/\/([^\/]*\.)?justanotherebel\.blogspot\.com
+https?:\/\/([^\/]*\.)?justkor\.com
+https?:\/\/([^\/]*\.)?juyi6\.szm\.sk
+https?:\/\/([^\/]*\.)?jwfj8\.szm\.sk
+https?:\/\/([^\/]*\.)?jwk\.cn
+https?:\/\/([^\/]*\.)?jxxfl\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?jytpn\.szm\.sk
+https?:\/\/([^\/]*\.)?jzllteva-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?jzoqn\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?k-teens-more\.blogspot\.com
+https?:\/\/([^\/]*\.)?k98you\.info
+https?:\/\/([^\/]*\.)?kabierac\.blogspot\.com
+https?:\/\/([^\/]*\.)?kaejsi\.com
+https?:\/\/([^\/]*\.)?kaiguan\.dzsc\.com
+https?:\/\/([^\/]*\.)?kaimitech\.com
+https?:\/\/([^\/]*\.)?kaizokukitsune\.blogspot\.com
+https?:\/\/([^\/]*\.)?kakaloo\.dtdns\.net
+https?:\/\/([^\/]*\.)?kalbongzig64\.blogspot\.com
+https?:\/\/([^\/]*\.)?kamachair\.info
+https?:\/\/([^\/]*\.)?kansasmortgage-x\.com
+https?:\/\/([^\/]*\.)?kaopowh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kardashian\.6\.forumer\.com
+https?:\/\/([^\/]*\.)?karwee\.com\.tw
+https?:\/\/([^\/]*\.)?katal0g\.ru
+https?:\/\/([^\/]*\.)?kates-playground-cjs61770aq\.blogspot\.com
+https?:\/\/([^\/]*\.)?kates-playground-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?katie-fey-m8inou71nk\.blogspot\.com
+https?:\/\/([^\/]*\.)?katie-fey\.hostithere\.org
+https?:\/\/([^\/]*\.)?katsmovies-com-a4k0cr\.blogspot\.com
+https?:\/\/([^\/]*\.)?kc-generator\.com
+https?:\/\/([^\/]*\.)?kc\.vanderbilt\.edu
+https?:\/\/([^\/]*\.)?kchaiguang\.com
+https?:\/\/([^\/]*\.)?kdmj1\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?kedew-free-porn-movie-c\.blogspot\.com
+https?:\/\/([^\/]*\.)?kedrp\.szm\.sk
+https?:\/\/([^\/]*\.)?keflexbuy\.easy\.to
+https?:\/\/([^\/]*\.)?keflexbuycheap\.everything\.at
+https?:\/\/([^\/]*\.)?keflexcheap\.notrix\.at
+https?:\/\/([^\/]*\.)?keflexcheapgeneric\.drop\.to
+https?:\/\/([^\/]*\.)?keflexgeneric\.firstpage\.de
+https?:\/\/([^\/]*\.)?kelley\.iu\.edu
+https?:\/\/([^\/]*\.)?kellyfind-com-i1\.blogspot\.com
+https?:\/\/([^\/]*\.)?kellyslovespells\.com
+https?:\/\/([^\/]*\.)?kelvinova\.com
+https?:\/\/([^\/]*\.)?kenji-no-sorata\.blogspot\.com
+https?:\/\/([^\/]*\.)?kentuckymortgage-x\.com
+https?:\/\/([^\/]*\.)?kenwoodexcelon\.com
+https?:\/\/([^\/]*\.)?keps\.info
+https?:\/\/([^\/]*\.)?kesdirect\.com
+https?:\/\/([^\/]*\.)?keshome\.com
+https?:\/\/([^\/]*\.)?kewl-links\.com
+https?:\/\/([^\/]*\.)?keysplus\.com
+https?:\/\/([^\/]*\.)?keyword\.net\.cn
+https?:\/\/([^\/]*\.)?kfwd7\.szm\.sk
+https?:\/\/([^\/]*\.)?kgbsearch\.org
+https?:\/\/([^\/]*\.)?khawkslaxfan51\.blogspot\.com
+https?:\/\/([^\/]*\.)?khlnbo3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ki-westly\.blogspot\.com
+https?:\/\/([^\/]*\.)?kiboric\.net
+https?:\/\/([^\/]*\.)?kicfmaudio\.com
+https?:\/\/([^\/]*\.)?kicklikegirls\.info
+https?:\/\/([^\/]*\.)?kijub-free-porn-video-v\.blogspot\.com
+https?:\/\/([^\/]*\.)?kingdom\.webmelia\.com
+https?:\/\/([^\/]*\.)?kingofpics-com-beib6jsm5d\.blogspot\.com
+https?:\/\/([^\/]*\.)?kingofpics-com-c8f1bag\.blogspot\.com
+https?:\/\/([^\/]*\.)?kipredinstitute\.org
+https?:\/\/([^\/]*\.)?kiqi-airplane\.blogspot\.com
+https?:\/\/([^\/]*\.)?kirsten-dunst-boob-slip\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?kiska2\.com
+https?:\/\/([^\/]*\.)?kissing-foot\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?kissing-her-ass\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?kitchen-apron\.keckins\.be
+https?:\/\/([^\/]*\.)?kitchenrebuilding\.com
+https?:\/\/([^\/]*\.)?kiudcb0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kjbz0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kjor4\.szm\.sk
+https?:\/\/([^\/]*\.)?kkkpd\.szm\.sk
+https?:\/\/([^\/]*\.)?kkvalve\.com\.cn
+https?:\/\/([^\/]*\.)?klacim\.yi\.org
+https?:\/\/([^\/]*\.)?klasik111\.php5\.cz
+https?:\/\/([^\/]*\.)?kleinerachel\.blogspot\.com
+https?:\/\/([^\/]*\.)?klohy\.info
+https?:\/\/([^\/]*\.)?kmxab\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?knkbact\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?knzfpca\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ko-paris-hilton-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?koberec\.com
+https?:\/\/([^\/]*\.)?koled-porn-video-z\.blogspot\.com
+https?:\/\/([^\/]*\.)?kom4um\.com
+https?:\/\/([^\/]*\.)?koncatina\.dtdns\.net
+https?:\/\/([^\/]*\.)?konstantine01\.blogspot\.com
+https?:\/\/([^\/]*\.)?kordirect\.com
+https?:\/\/([^\/]*\.)?kos123\.dtdns\.net
+https?:\/\/([^\/]*\.)?kostya\.cabspace\.com
+https?:\/\/([^\/]*\.)?kpdsvd9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kpqf2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kpzq6\.szm\.sk
+https?:\/\/([^\/]*\.)?krakatoa\.slyip\.com
+https?:\/\/([^\/]*\.)?krakon\.republika\.pl
+https?:\/\/([^\/]*\.)?krasnota\.flnet\.org
+https?:\/\/([^\/]*\.)?krbd2\.szm\.sk
+https?:\/\/([^\/]*\.)?kreco\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ksbj5\.szm\.sk
+https?:\/\/([^\/]*\.)?ksiegagosci\.info
+https?:\/\/([^\/]*\.)?ktbug1373\.blogspot\.com
+https?:\/\/([^\/]*\.)?ktrv2\.szm\.sk
+https?:\/\/([^\/]*\.)?ku-whatnot\.blogspot\.com
+https?:\/\/([^\/]*\.)?kucitok\.forumculture\.net
+https?:\/\/([^\/]*\.)?kulhain\.blogspot\.com
+https?:\/\/([^\/]*\.)?kunshalawyer\.com
+https?:\/\/([^\/]*\.)?kvehuj8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kvywc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kwscx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kwvi\.com
+https?:\/\/([^\/]*\.)?kybel\.fetftp\.nu
+https?:\/\/([^\/]*\.)?kybele\.psych\.cornell\.edu
+https?:\/\/([^\/]*\.)?kyjcz\.sunp\.com
+https?:\/\/([^\/]*\.)?kymnruw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?kymyn\.info
+https?:\/\/([^\/]*\.)?l-paris-hilton-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?l\.0s48\.info
+https?:\/\/([^\/]*\.)?l1ttleblacky\.blogspot\.com
+https?:\/\/([^\/]*\.)?la-ringtones\.com
+https?:\/\/([^\/]*\.)?laaceler\.blogcu\.com
+https?:\/\/([^\/]*\.)?labelprinter\.printer\.net\.cn
+https?:\/\/([^\/]*\.)?labladar\.forumzen\.com
+https?:\/\/([^\/]*\.)?lacchi\.lolforum\.net
+https?:\/\/([^\/]*\.)?laconia4\.info
+https?:\/\/([^\/]*\.)?ladylike\.hostcroc\.com
+https?:\/\/([^\/]*\.)?lake-baikal\.info
+https?:\/\/([^\/]*\.)?laked\.info
+https?:\/\/([^\/]*\.)?lalisit\.heavenforum\.com
+https?:\/\/([^\/]*\.)?lalisit\.highforum\.net
+https?:\/\/([^\/]*\.)?lamalinks-com-ceefq\.blogspot\.com
+https?:\/\/([^\/]*\.)?lamisilbuy\.drive\.to
+https?:\/\/([^\/]*\.)?lamisilbuygeneric\.dive\.to
+https?:\/\/([^\/]*\.)?lamisilcheap\.drink\.to
+https?:\/\/([^\/]*\.)?lamisilgeneric\.drop\.to
+https?:\/\/([^\/]*\.)?lamisilgenericcheap\.dive\.to
+https?:\/\/([^\/]*\.)?lanasbigboobs-com-mxm7\.blogspot\.com
+https?:\/\/([^\/]*\.)?lanasbigboobs-com-repif\.blogspot\.com
+https?:\/\/([^\/]*\.)?laorer\.ephpbb\.com
+https?:\/\/([^\/]*\.)?lapelcna\.forumzen\.com
+https?:\/\/([^\/]*\.)?lapoer\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?large-lingerie-naughty-woman\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?las-vegas-gay-night-club\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?las-vegas-house\.nm\.ru
+https?:\/\/([^\/]*\.)?laser-drilled-diamonds\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?laser-wave\.com
+https?:\/\/([^\/]*\.)?laskai\.com
+https?:\/\/([^\/]*\.)?lasmercedessite\.info
+https?:\/\/([^\/]*\.)?lassie\.webmelia\.com
+https?:\/\/([^\/]*\.)?last-minute-travel\.ebem\.info
+https?:\/\/([^\/]*\.)?latex-ass\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?latex-dress\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?latex-foam-mattress-toppers\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?latex-mistress\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?latex-sluts\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?latex-swim-wear\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?latin\.hostaim\.com
+https?:\/\/([^\/]*\.)?latina-porn-clip-blog11q\.blogspot\.com
+https?:\/\/([^\/]*\.)?latina-porn-clip-blogden\.blogspot\.com
+https?:\/\/([^\/]*\.)?latinata\.galeon\.com
+https?:\/\/([^\/]*\.)?latoarril\.myrealboard\.com
+https?:\/\/([^\/]*\.)?laus-rmore\.blogspot\.com
+https?:\/\/([^\/]*\.)?lavemi\.com
+https?:\/\/([^\/]*\.)?lavender-dove\.blogspot\.com
+https?:\/\/([^\/]*\.)?lavor0\.info
+https?:\/\/([^\/]*\.)?law-school\.hotmail\.ru
+https?:\/\/([^\/]*\.)?law1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?law2school\.chat\.ru
+https?:\/\/([^\/]*\.)?lawrencegillies\.blogspot\.com
+https?:\/\/([^\/]*\.)?lawyer\.ebloggy\.com
+https?:\/\/([^\/]*\.)?laynamarya\.blogspot\.com
+https?:\/\/([^\/]*\.)?laythekatcom\.pupava\.dtdns\.net
+https?:\/\/([^\/]*\.)?lbgetm9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lbrnrme\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lczjunf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ldrdf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?le-alma\.blogspot\.com
+https?:\/\/([^\/]*\.)?le-big-free-movie-porn-cek\.blogspot\.com
+https?:\/\/([^\/]*\.)?leadora\.blogspot\.com
+https?:\/\/([^\/]*\.)?leannrae85\.blogspot\.com
+https?:\/\/([^\/]*\.)?lebu-adidas\.blogspot\.com
+https?:\/\/([^\/]*\.)?ledego\.com
+https?:\/\/([^\/]*\.)?ledgiest\.xhostar\.com
+https?:\/\/([^\/]*\.)?ledkrx\.com
+https?:\/\/([^\/]*\.)?ledled\.nease\.net
+https?:\/\/([^\/]*\.)?leebuc\.forumzen\.com
+https?:\/\/([^\/]*\.)?leeticarus\.blogspot\.com
+https?:\/\/([^\/]*\.)?leetvilt\.jconserv\.net
+https?:\/\/([^\/]*\.)?left-leg-numbness\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?leg-exercise\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?leg-in-stocking\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?leg-in-tan-pantie-hose\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?leg-neurontin-restless-syndrome\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?leg-preteen-spread\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?leg-shaved-spread\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?leisure-suit-larry-magna-cum-laude-nudity-patch\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?leisure-suit-larry-magna-cum-laude-uncut-and-uncensored\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?leo-the-bastet\.site\.voila\.fr
+https?:\/\/([^\/]*\.)?leopard-lady\.blogspot\.com
+https?:\/\/([^\/]*\.)?leroyhotel\.com
+https?:\/\/([^\/]*\.)?lesbian-anal-porn\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?lesbian-fisting-dvd\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lesbian-fucking-eachother\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?lesbian-girl-scout\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?lesbian-group-masturbation\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lesbian-oral-sex\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?lesbian-personals-ads\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?lesbian-personals-yahoo\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?lesbian-porn-clip-blog6e5\.blogspot\.com
+https?:\/\/([^\/]*\.)?lesbian-sex-teen\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?lesbian-sharing-dildo\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lesbian-tit-bondage\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lesbian-web-chat-and-cam\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?lesbians\.coz\.in
+https?:\/\/([^\/]*\.)?letoacel-or\.xa\.pl
+https?:\/\/([^\/]*\.)?letobocpas\.frbb\.net
+https?:\/\/([^\/]*\.)?letocvi\.goodbb\.net
+https?:\/\/([^\/]*\.)?letomon\.graphforum\.com
+https?:\/\/([^\/]*\.)?letorelpas\.xa\.pl
+https?:\/\/([^\/]*\.)?lettera-di-presentazione\.zoom4x\.info
+https?:\/\/([^\/]*\.)?lettersof-love\.blogspot\.com
+https?:\/\/([^\/]*\.)?levitra\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?levitra\.rx4\.org
+https?:\/\/([^\/]*\.)?levitra\.seesaa\.net
+https?:\/\/([^\/]*\.)?levitra\.skocz\.net
+https?:\/\/([^\/]*\.)?levitraejv\.blogspot\.com
+https?:\/\/([^\/]*\.)?levitras\.eu\.tf
+https?:\/\/([^\/]*\.)?levitraxpb\.blogspot\.com
+https?:\/\/([^\/]*\.)?lex-interracial\.hoffer\.ipupdater\.com
+https?:\/\/([^\/]*\.)?lexapro\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?lexaprobuyonline\.buzznet\.com
+https?:\/\/([^\/]*\.)?lexpov-com\.cornut\.ipupdater\.com
+https?:\/\/([^\/]*\.)?leyeager\.ifrance\.com
+https?:\/\/([^\/]*\.)?lezbomovies-com-dp3256w4cb\.blogspot\.com
+https?:\/\/([^\/]*\.)?lezbomovies-com-duvuv\.blogspot\.com
+https?:\/\/([^\/]*\.)?lezbomovies-com-dw7q2s6l\.blogspot\.com
+https?:\/\/([^\/]*\.)?lf-pm\.com
+https?:\/\/([^\/]*\.)?lfamas\.com
+https?:\/\/([^\/]*\.)?lhbtx\.szm\.sk
+https?:\/\/([^\/]*\.)?lhnzkp9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?li-adult-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?li6or6olo\.dl\.pl
+https?:\/\/([^\/]*\.)?lianjieqi\.dzsc\.com
+https?:\/\/([^\/]*\.)?liaozhi\.org
+https?:\/\/([^\/]*\.)?libasac\.ephpbb\.com
+https?:\/\/([^\/]*\.)?libertyliga\.com
+https?:\/\/([^\/]*\.)?library\.cshl\.edu
+https?:\/\/([^\/]*\.)?libraryofthumbs-com-oyz1qboq\.blogspot\.com
+https?:\/\/([^\/]*\.)?licecile\.dl\.pl
+https?:\/\/([^\/]*\.)?licnarol\.dl\.pl
+https?:\/\/([^\/]*\.)?lidaror\.blogcu\.com
+https?:\/\/([^\/]*\.)?lidiarac\.forumzen\.com
+https?:\/\/([^\/]*\.)?lidomca\.graphforum\.com
+https?:\/\/([^\/]*\.)?lidomca\.highforum\.net
+https?:\/\/([^\/]*\.)?lidompas\.td\.pl
+https?:\/\/([^\/]*\.)?lidomta\.frbb\.net
+https?:\/\/([^\/]*\.)?lidupett\.forumzen\.com
+https?:\/\/([^\/]*\.)?lifeinsurance-x\.com
+https?:\/\/([^\/]*\.)?lifewave\.com
+https?:\/\/([^\/]*\.)?ligettr\.dl\.pl
+https?:\/\/([^\/]*\.)?light365\.com
+https?:\/\/([^\/]*\.)?lightspeed-state\.hostithere\.org
+https?:\/\/([^\/]*\.)?lihach\.com
+https?:\/\/([^\/]*\.)?lijoho-video-porn-gratis\.blogspot\.com
+https?:\/\/([^\/]*\.)?likozrut\.stabilt\.se
+https?:\/\/([^\/]*\.)?lilaleemcrightrealty\.com
+https?:\/\/([^\/]*\.)?lilaliko\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?lile\.asp2\.cz
+https?:\/\/([^\/]*\.)?lilett\.blogspot\.com
+https?:\/\/([^\/]*\.)?lilhaq\.blogspot\.com
+https?:\/\/([^\/]*\.)?lilo-n\.blogspot\.com
+https?:\/\/([^\/]*\.)?lilotu\.com
+https?:\/\/([^\/]*\.)?linarcbo\.forumzen\.com
+https?:\/\/([^\/]*\.)?lincweb\.cacs\.louisiana\.edu
+https?:\/\/([^\/]*\.)?lindsaylife\.com
+https?:\/\/([^\/]*\.)?lineance-facial-hair-removal-cream\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?linefreeinternet\.info
+https?:\/\/([^\/]*\.)?linemd\.com
+https?:\/\/([^\/]*\.)?lingerie-babes-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?lingerie-girl-pic\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lingerie-guide\.org
+https?:\/\/([^\/]*\.)?lingerie-sex-photo\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?lingerie-videos-com-wcu8\.blogspot\.com
+https?:\/\/([^\/]*\.)?lingshengdown\.com
+https?:\/\/([^\/]*\.)?lingua-francese\.host24h\.info
+https?:\/\/([^\/]*\.)?link-o-rama-com-t5xhd\.blogspot\.com
+https?:\/\/([^\/]*\.)?link-o-rama-com-toz5x8i2ez\.blogspot\.com
+https?:\/\/([^\/]*\.)?linserch\.com
+https?:\/\/([^\/]*\.)?lioral\.dl\.pl
+https?:\/\/([^\/]*\.)?lioumon\.lolforum\.net
+https?:\/\/([^\/]*\.)?lipitor\.skocz\.net
+https?:\/\/([^\/]*\.)?lipstick-love\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?lipstick-mac\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?lipus\.org
+https?:\/\/([^\/]*\.)?lirolbo\.goodforum\.net
+https?:\/\/([^\/]*\.)?lirolbo\.grafbb\.com
+https?:\/\/([^\/]*\.)?lisinopril\.no-ip\.info
+https?:\/\/([^\/]*\.)?list\.eng\.utah\.edu
+https?:\/\/([^\/]*\.)?listinna772\.galeon\.com
+https?:\/\/([^\/]*\.)?listpharm\.com
+https?:\/\/([^\/]*\.)?lists\.gatech\.edu
+https?:\/\/([^\/]*\.)?litaacel\.lolforum\.net
+https?:\/\/([^\/]*\.)?litadal\.myrealboard\.com
+https?:\/\/([^\/]*\.)?litayj0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?literotica-com-t3yx\.blogspot\.com
+https?:\/\/([^\/]*\.)?literotica-com-tkncy\.blogspot\.com
+https?:\/\/([^\/]*\.)?litrget\.jc\.pl
+https?:\/\/([^\/]*\.)?little-april-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?little-april-masturbating-movie\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?little-dicks-bay\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?little-teen-fuck\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?littledevildoubt\.com
+https?:\/\/([^\/]*\.)?littlesunshine\.50webs\.org
+https?:\/\/([^\/]*\.)?litumdet\.forumzen\.com
+https?:\/\/([^\/]*\.)?liupy\.110mb\.com
+https?:\/\/([^\/]*\.)?live-gay-video-chat\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?live-jasmine-cams\.com
+https?:\/\/([^\/]*\.)?livejasmin-com-abc\.blogspot\.com
+https?:\/\/([^\/]*\.)?livejasmin-com-abz\.blogspot\.com
+https?:\/\/([^\/]*\.)?livejasmin-com-aky\.blogspot\.com
+https?:\/\/([^\/]*\.)?livejasmin-com-qujef\.blogspot\.com
+https?:\/\/([^\/]*\.)?livescore\.esguay\.com
+https?:\/\/([^\/]*\.)?livescore\.ven\.bz
+https?:\/\/([^\/]*\.)?livesupportpal\.com
+https?:\/\/([^\/]*\.)?liviral\.myrealboard\.com
+https?:\/\/([^\/]*\.)?lixin642\.com
+https?:\/\/([^\/]*\.)?liymcc0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lizardofoz\.com
+https?:\/\/([^\/]*\.)?lizas\.asp2\.cz
+https?:\/\/([^\/]*\.)?lizscottrawson\.com
+https?:\/\/([^\/]*\.)?lkrzfkg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ll-four-sterto\.blogspot\.com
+https?:\/\/([^\/]*\.)?llillith\.blogspot\.com
+https?:\/\/([^\/]*\.)?lll1l\.info
+https?:\/\/([^\/]*\.)?llline\.info
+https?:\/\/([^\/]*\.)?llpcoil\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?llsky\.net
+https?:\/\/([^\/]*\.)?lm4nmu\.com
+https?:\/\/([^\/]*\.)?lmyzm\.szm\.sk
+https?:\/\/([^\/]*\.)?lnalpas\.myrealboard\.com
+https?:\/\/([^\/]*\.)?lnki9\.szm\.sk
+https?:\/\/([^\/]*\.)?lnqfa\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?lnqixlz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?loan-unsecuredcxp\.blogspot\.com
+https?:\/\/([^\/]*\.)?loans-insurance\.net
+https?:\/\/([^\/]*\.)?lodge\.webmelia\.com
+https?:\/\/([^\/]*\.)?lodita-com-dya6s22zu\.blogspot\.com
+https?:\/\/([^\/]*\.)?lodita-com-dz\.blogspot\.com
+https?:\/\/([^\/]*\.)?loestrin\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?logast\.com
+https?:\/\/([^\/]*\.)?logowap\.com
+https?:\/\/([^\/]*\.)?lojlo\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lojunbas\.forumzen\.com
+https?:\/\/([^\/]*\.)?lola-providence\.blogspot\.com
+https?:\/\/([^\/]*\.)?lolabear1121\.blogspot\.com
+https?:\/\/([^\/]*\.)?lolaparris\.freetzi\.com
+https?:\/\/([^\/]*\.)?loliti-com-c5m8mt\.blogspot\.com
+https?:\/\/([^\/]*\.)?lolovi\.naturalforum\.net
+https?:\/\/([^\/]*\.)?lomsts\.com
+https?:\/\/([^\/]*\.)?londra-ristorante\.freehostss\.info
+https?:\/\/([^\/]*\.)?lonely-wolf-com-rjqlm1d6\.blogspot\.com
+https?:\/\/([^\/]*\.)?long-porn-clip-info67s\.blogspot\.com
+https?:\/\/([^\/]*\.)?long-porn-clip-infosm4\.blogspot\.com
+https?:\/\/([^\/]*\.)?longestlist-com-b6\.blogspot\.com
+https?:\/\/([^\/]*\.)?longestlist-com-b683g4ik\.blogspot\.com
+https?:\/\/([^\/]*\.)?longestlist-hb\.blogspot\.com
+https?:\/\/([^\/]*\.)?longestlist-hohen\.blogspot\.com
+https?:\/\/([^\/]*\.)?longonline\.net
+https?:\/\/([^\/]*\.)?longvideos-net-gq78qyba\.blogspot\.com
+https?:\/\/([^\/]*\.)?longxiong\.ebloggy\.com
+https?:\/\/([^\/]*\.)?lony\.info
+https?:\/\/([^\/]*\.)?look-at-his-dick\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lookcity\.com
+https?:\/\/([^\/]*\.)?lopata\.snusk\.nu
+https?:\/\/([^\/]*\.)?lopressorhct\.sblog\.cz
+https?:\/\/([^\/]*\.)?lorazepams\.ru\.tf
+https?:\/\/([^\/]*\.)?lortab-911\.coz\.in
+https?:\/\/([^\/]*\.)?lortab\.xwiki\.com
+https?:\/\/([^\/]*\.)?losangelestickets\.org
+https?:\/\/([^\/]*\.)?lotausch\.ifrance\.com
+https?:\/\/([^\/]*\.)?loudmp3\.net
+https?:\/\/([^\/]*\.)?louisianamortgage-x\.com
+https?:\/\/([^\/]*\.)?lovefuckk-com-eg7gx\.blogspot\.com
+https?:\/\/([^\/]*\.)?lovefuckk-com-et2x2g1sk\.blogspot\.com
+https?:\/\/([^\/]*\.)?lovefuckk-com-setos\.blogspot\.com
+https?:\/\/([^\/]*\.)?lovegirlsonline\.info
+https?:\/\/([^\/]*\.)?lovejuliet3\.blogspot\.com
+https?:\/\/([^\/]*\.)?lovetgp-com-d74h1ed3o\.blogspot\.com
+https?:\/\/([^\/]*\.)?lowbudgetsuccess\.info
+https?:\/\/([^\/]*\.)?lqsbjau\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lrff5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lriwaq-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?lrlep\.szm\.sk
+https?:\/\/([^\/]*\.)?ltfl5\.szm\.sk
+https?:\/\/([^\/]*\.)?ltntp\.szm\.sk
+https?:\/\/([^\/]*\.)?lu-porn-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?lucking\.com\.cn
+https?:\/\/([^\/]*\.)?lucqt\.szm\.sk
+https?:\/\/([^\/]*\.)?luridess\.125mb\.com
+https?:\/\/([^\/]*\.)?lusi-ada\.blogspot\.com
+https?:\/\/([^\/]*\.)?lustjob\.info
+https?:\/\/([^\/]*\.)?lustwork\.info
+https?:\/\/([^\/]*\.)?lusvqm-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?lutaltli\.naturalforum\.net
+https?:\/\/([^\/]*\.)?lutrilar\.naturalforum\.net
+https?:\/\/([^\/]*\.)?lutzalvi\.naturalforum\.net
+https?:\/\/([^\/]*\.)?lvanrts\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lvsi\.ebloggy\.com
+https?:\/\/([^\/]*\.)?lwdf2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lwkmewp\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lycosss\.com
+https?:\/\/([^\/]*\.)?lyganbaili\.com
+https?:\/\/([^\/]*\.)?lyhbs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?lying-facial-expression\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?lyndawyllie\.com
+https?:\/\/([^\/]*\.)?lzouv\.szm\.sk
+https?:\/\/([^\/]*\.)?m-i-a-s-m-a\.blogspot\.com
+https?:\/\/([^\/]*\.)?m-sr\.net
+https?:\/\/([^\/]*\.)?m-teens-000\.blogspot\.com
+https?:\/\/([^\/]*\.)?m\.domaindlx\.com
+https?:\/\/([^\/]*\.)?m2mvc\.com
+https?:\/\/([^\/]*\.)?machi-neko\.blogspot\.com
+https?:\/\/([^\/]*\.)?mackenzie-kayne\.hostingtree\.org
+https?:\/\/([^\/]*\.)?macromob\.com
+https?:\/\/([^\/]*\.)?madesukadana\.com
+https?:\/\/([^\/]*\.)?madthumbs-com-hcq1m1\.blogspot\.com
+https?:\/\/([^\/]*\.)?mafy69\.blogspot\.com
+https?:\/\/([^\/]*\.)?magical-casino\.com
+https?:\/\/([^\/]*\.)?magneticwoman88\.blogspot\.com
+https?:\/\/([^\/]*\.)?maidenpeace\.com
+https?:\/\/([^\/]*\.)?main\.g2\.bx\.psu\.edu
+https?:\/\/([^\/]*\.)?mainemortgage-x\.com
+https?:\/\/([^\/]*\.)?maitybaba\.blogspot\.com
+https?:\/\/([^\/]*\.)?makaky\.dtdns\.net
+https?:\/\/([^\/]*\.)?makblxn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?make-my-dick-hard\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?makemoneyfast\.us
+https?:\/\/([^\/]*\.)?makeup\.ifreehosts\.net
+https?:\/\/([^\/]*\.)?male-hairy-leg\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?malinka\.b0b\.org
+https?:\/\/([^\/]*\.)?mama-rachelbeth\.blogspot\.com
+https?:\/\/([^\/]*\.)?mamaswarm\.sultryserver\.com
+https?:\/\/([^\/]*\.)?man-caught-wearing-womens-lingerie\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?man-ring\.boom\.ru
+https?:\/\/([^\/]*\.)?man-rings\.boom\.ru
+https?:\/\/([^\/]*\.)?man-skin\.nightmail\.ru
+https?:\/\/([^\/]*\.)?man-skin\.nm\.ru
+https?:\/\/([^\/]*\.)?man-woman-fucking-video-clip\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?man_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?managementproperty\.us
+https?:\/\/([^\/]*\.)?manka-kapak\.blogspot\.com
+https?:\/\/([^\/]*\.)?manoke\.cn
+https?:\/\/([^\/]*\.)?map4um\.com
+https?:\/\/([^\/]*\.)?mapas6\.com
+https?:\/\/([^\/]*\.)?maradona\.stabilt\.se
+https?:\/\/([^\/]*\.)?marhula\.weedns\.com
+https?:\/\/([^\/]*\.)?marinol\.xwiki\.com
+https?:\/\/([^\/]*\.)?mario-lopez-gayfgg\.blogspot\.com
+https?:\/\/([^\/]*\.)?marketing1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?marklar\.republika\.pl
+https?:\/\/([^\/]*\.)?marti-adp\.iespana\.es
+https?:\/\/([^\/]*\.)?marucollet\.jp
+https?:\/\/([^\/]*\.)?maryannec\.com
+https?:\/\/([^\/]*\.)?marylandmortgage-x\.com
+https?:\/\/([^\/]*\.)?masfac\.com
+https?:\/\/([^\/]*\.)?masiki\.110mb\.com
+https?:\/\/([^\/]*\.)?masiti\.com
+https?:\/\/([^\/]*\.)?massachusetts-hs\.newmail\.ru
+https?:\/\/([^\/]*\.)?massachusettsmortgage-x\.com
+https?:\/\/([^\/]*\.)?mast3t\.com
+https?:\/\/([^\/]*\.)?master-z-great\.blogspot\.com
+https?:\/\/([^\/]*\.)?master1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?master2005degree\.chat\.ru
+https?:\/\/([^\/]*\.)?masterboat\.ru
+https?:\/\/([^\/]*\.)?mastun\.com
+https?:\/\/([^\/]*\.)?masturbating-shemale-video\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?masturbation-techniques1\.notlong\.com
+https?:\/\/([^\/]*\.)?masvit\.com
+https?:\/\/([^\/]*\.)?matching-mom-and-baby-outfit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?matrac\.loopback\.nu
+https?:\/\/([^\/]*\.)?mattsvids-com-aqjt\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-bitches-com-ccvi3l\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-black-female\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?mature-blonde-fuck\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?mature-blonde-movie\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?mature-blonde-toying\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?mature-british-granny\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?mature-clip\.babubi\.net
+https?:\/\/([^\/]*\.)?mature-for-you-com-mt66\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-gang-bang\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature-gay-black\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature-gay-man-gallery\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?mature-man-photo\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?mature-man-picture\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?mature-milf-milfmuffin-com\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature-nl-kss7\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-pantie-upskirt\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature-pic-post\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?mature-porn-clip-newsj8c\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-porn-clip-zone5s0\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-porn-movie-sihu\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-porn-video-ku\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-post-com-iecsmld78\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-redhead\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?mature-secret-com-r6t85u5\.blogspot\.com
+https?:\/\/([^\/]*\.)?mature-sex-orgy\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?mature-sex-thumb\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature-throat-fuck\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?mature-wife-in-pantie-hose\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?mature-woman-vs-young\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?mature\.coz\.in
+https?:\/\/([^\/]*\.)?matureandyoung-com-bgf1\.blogspot\.com
+https?:\/\/([^\/]*\.)?maturedaily-net-oipq5\.blogspot\.com
+https?:\/\/([^\/]*\.)?maturedaily-net-oywdf7pj0\.blogspot\.com
+https?:\/\/([^\/]*\.)?maturehit-com-w8\.blogspot\.com
+https?:\/\/([^\/]*\.)?maturehit-com-zifid\.blogspot\.com
+https?:\/\/([^\/]*\.)?maximumsearch\.net
+https?:\/\/([^\/]*\.)?maybachexelero\.org
+https?:\/\/([^\/]*\.)?mayphyoe\.blogspot\.com
+https?:\/\/([^\/]*\.)?maypopmusic\.cn
+https?:\/\/([^\/]*\.)?mazda-6\.keckins\.be
+https?:\/\/([^\/]*\.)?mazdamaindealer\.cn
+https?:\/\/([^\/]*\.)?mazecreatorhosting\.net
+https?:\/\/([^\/]*\.)?mba1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?mbiu1\.szm\.sk
+https?:\/\/([^\/]*\.)?mbkxs\.szm\.sk
+https?:\/\/([^\/]*\.)?mbsz0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mcfontai\.dl\.pl
+https?:\/\/([^\/]*\.)?mciicvn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mckeithl\.ifrance\.com
+https?:\/\/([^\/]*\.)?mcynwst\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mdfo2\.szm\.sk
+https?:\/\/([^\/]*\.)?mdna8\.szm\.sk
+https?:\/\/([^\/]*\.)?mdoq5\.szm\.sk
+https?:\/\/([^\/]*\.)?meadelante\.blogspot\.com
+https?:\/\/([^\/]*\.)?med-ph\.com
+https?:\/\/([^\/]*\.)?medbig\.com
+https?:\/\/([^\/]*\.)?medgarsting\.info
+https?:\/\/([^\/]*\.)?medhls\.com
+https?:\/\/([^\/]*\.)?medic\.kilu\.de
+https?:\/\/([^\/]*\.)?medication-cheap\.com
+https?:\/\/([^\/]*\.)?meds-today\.com
+https?:\/\/([^\/]*\.)?megadyneinc\.com
+https?:\/\/([^\/]*\.)?megan-qt-cjg\.blogspot\.com
+https?:\/\/([^\/]*\.)?megaupkoad\.com
+https?:\/\/([^\/]*\.)?meindies\.com
+https?:\/\/([^\/]*\.)?melatrol\.podstavec\.yi\.org
+https?:\/\/([^\/]*\.)?melissa-doll\.cornut\.ipupdater\.com
+https?:\/\/([^\/]*\.)?melsner\.blogspot\.com
+https?:\/\/([^\/]*\.)?mens\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?menshealth\.110mb\.com
+https?:\/\/([^\/]*\.)?meoqwzr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?meridasexo\.com
+https?:\/\/([^\/]*\.)?meridia\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?meridia\.edu\.tf
+https?:\/\/([^\/]*\.)?meridia\.hav\.pl
+https?:\/\/([^\/]*\.)?meridia\.skocz\.net
+https?:\/\/([^\/]*\.)?meridiager\.queroumforum\.com
+https?:\/\/([^\/]*\.)?meryland\.dtdns\.net
+https?:\/\/([^\/]*\.)?mesothelioma-lawyer-help\.org
+https?:\/\/([^\/]*\.)?meweb\.ecn\.purdue\.edu
+https?:\/\/([^\/]*\.)?mewqsd\.org
+https?:\/\/([^\/]*\.)?mgnzupi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mi-kkiechang\.ifrance\.com
+https?:\/\/([^\/]*\.)?mia-movies-com-g2g1\.blogspot\.com
+https?:\/\/([^\/]*\.)?mia-movies-e86q7ic4y7\.blogspot\.com
+https?:\/\/([^\/]*\.)?miami-cose-fare\.hostzz\.info
+https?:\/\/([^\/]*\.)?michelepug\.org
+https?:\/\/([^\/]*\.)?michiganmortgage-x\.com
+https?:\/\/([^\/]*\.)?midaslubbock\.com
+https?:\/\/([^\/]*\.)?midnis\.com
+https?:\/\/([^\/]*\.)?migree\.com
+https?:\/\/([^\/]*\.)?mihaso\.com
+https?:\/\/([^\/]*\.)?mikeinbrazil-com-k1s8higm1o\.blogspot\.com
+https?:\/\/([^\/]*\.)?mikeinbrazil-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?mikesapartment-com-iwb02e1v\.blogspot\.com
+https?:\/\/([^\/]*\.)?mikesapartment-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?mikewsd\.org
+https?:\/\/([^\/]*\.)?miks1\.szm\.sk
+https?:\/\/([^\/]*\.)?miku-thu-vilu\.110mb\.com
+https?:\/\/([^\/]*\.)?mildew\.789mb\.com
+https?:\/\/([^\/]*\.)?milf-blow-job-gallery\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?milf-busty-fucking\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?milf-hunter-kate\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?milf-mature-big-tit\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?milf-tgp-wife\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?milfhunter-com-h2a7q51\.blogspot\.com
+https?:\/\/([^\/]*\.)?milflessons-com-bh6\.blogspot\.com
+https?:\/\/([^\/]*\.)?milfnextdoor-bk23v2p4\.blogspot\.com
+https?:\/\/([^\/]*\.)?milfnextdoor-w3ii\.blogspot\.com
+https?:\/\/([^\/]*\.)?milkmanbook-com-o7\.blogspot\.com
+https?:\/\/([^\/]*\.)?milkmanbook-com-rrup5f\.blogspot\.com
+https?:\/\/([^\/]*\.)?milkmanbook-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?milkmanbook-ods016\.blogspot\.com
+https?:\/\/([^\/]*\.)?milton-twins-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?mimija\.com
+https?:\/\/([^\/]*\.)?miniurl\.pl
+https?:\/\/([^\/]*\.)?minnesotamortgage-x\.com
+https?:\/\/([^\/]*\.)?minzec\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?missensign\.blogspot\.com
+https?:\/\/([^\/]*\.)?mississippimortgage-x\.com
+https?:\/\/([^\/]*\.)?missourimortgage-x\.com
+https?:\/\/([^\/]*\.)?mitsubishicarhire\.cn
+https?:\/\/([^\/]*\.)?mj-net\.jp
+https?:\/\/([^\/]*\.)?mj\.left-page\.com
+https?:\/\/([^\/]*\.)?mjlvan4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mjqnxn1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mjspb\.szm\.sk
+https?:\/\/([^\/]*\.)?mkia3\.szm\.sk
+https?:\/\/([^\/]*\.)?mkiss47346\.blogspot\.com
+https?:\/\/([^\/]*\.)?mksahf-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?mkzvni8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mlgta\.szm\.sk
+https?:\/\/([^\/]*\.)?mlm-business-leader\.com
+https?:\/\/([^\/]*\.)?mlvej\.szm\.sk
+https?:\/\/([^\/]*\.)?mmm100-com-aj\.blogspot\.com
+https?:\/\/([^\/]*\.)?mmm100-com-cisec\.blogspot\.com
+https?:\/\/([^\/]*\.)?mmm100-com-tql1xojt\.blogspot\.com
+https?:\/\/([^\/]*\.)?mnsp\.cn
+https?:\/\/([^\/]*\.)?mobfiller\.com
+https?:\/\/([^\/]*\.)?mobic\.sytes\.net
+https?:\/\/([^\/]*\.)?mobile-phone-dealoft\.blogspot\.com
+https?:\/\/([^\/]*\.)?mobile-phone-shopmgl\.blogspot\.com
+https?:\/\/([^\/]*\.)?mobile-phonegsn\.blogspot\.com
+https?:\/\/([^\/]*\.)?mobilefamilydental\.com
+https?:\/\/([^\/]*\.)?mobilewallpaperkre\.blogspot\.com
+https?:\/\/([^\/]*\.)?mobility-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?mobility2scooter\.chat\.ru
+https?:\/\/([^\/]*\.)?mobprofile\.com
+https?:\/\/([^\/]*\.)?modelsgroup-com-wrx\.blogspot\.com
+https?:\/\/([^\/]*\.)?modelsgroup-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?modlang\.boisestate\.edu
+https?:\/\/([^\/]*\.)?moju\.net\.cn
+https?:\/\/([^\/]*\.)?mol-ch\.com
+https?:\/\/([^\/]*\.)?mom-and-son-song\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?mom-music-video\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?mom-n-son\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?mom-vs-young\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?mommia-com-h32\.blogspot\.com
+https?:\/\/([^\/]*\.)?mommia-com-hvr6wy\.blogspot\.com
+https?:\/\/([^\/]*\.)?mommia-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?moms-teaching-teens-ceb\.blogspot\.com
+https?:\/\/([^\/]*\.)?monbocchi\.zikforum\.com
+https?:\/\/([^\/]*\.)?moncnamon\.ephpbb\.com
+https?:\/\/([^\/]*\.)?moncnamon\.forumculture\.net
+https?:\/\/([^\/]*\.)?monctr\.cultureforum\.net
+https?:\/\/([^\/]*\.)?mondelacel\.dl\.pl
+https?:\/\/([^\/]*\.)?monelal\.discutfree\.com
+https?:\/\/([^\/]*\.)?moneta-algeria\.hostzz\.info
+https?:\/\/([^\/]*\.)?monjco\.blogcu\.com
+https?:\/\/([^\/]*\.)?monletochi\.bbgraf\.com
+https?:\/\/([^\/]*\.)?monokal\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?monorget\.lolbb\.com
+https?:\/\/([^\/]*\.)?monpasrel\.dl\.pl
+https?:\/\/([^\/]*\.)?monster-cock-movie-big\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?monstersofcock-com-rvdurm2\.blogspot\.com
+https?:\/\/([^\/]*\.)?montana-flugsport\.com
+https?:\/\/([^\/]*\.)?montanamortgage-x\.com
+https?:\/\/([^\/]*\.)?montessori-spielzeug\.com
+https?:\/\/([^\/]*\.)?moody-immortal2\.blogspot\.com
+https?:\/\/([^\/]*\.)?morekes\.com
+https?:\/\/([^\/]*\.)?moremoms-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?moremoms-rj8f2r\.blogspot\.com
+https?:\/\/([^\/]*\.)?mortgage-911\.net
+https?:\/\/([^\/]*\.)?mortgagebrokers-x\.com
+https?:\/\/([^\/]*\.)?mortgagecompanies-x\.com
+https?:\/\/([^\/]*\.)?mortgagelenders-x\.com
+https?:\/\/([^\/]*\.)?mortgageloan-x\.com
+https?:\/\/([^\/]*\.)?mortgageloans-x\.com
+https?:\/\/([^\/]*\.)?mortgagerates-x\.com
+https?:\/\/([^\/]*\.)?mortgagerefinance-x\.com
+https?:\/\/([^\/]*\.)?mortgagerefinancing-x\.com
+https?:\/\/([^\/]*\.)?mortgages-411\.com
+https?:\/\/([^\/]*\.)?mortgagesnrefinance\.com
+https?:\/\/([^\/]*\.)?mosquito-ringtoneaee\.blogspot\.com
+https?:\/\/([^\/]*\.)?mosquitoringtonewmf\.blogspot\.com
+https?:\/\/([^\/]*\.)?mothershope\.com
+https?:\/\/([^\/]*\.)?mothrinventor\.blogspot\.com
+https?:\/\/([^\/]*\.)?motnolado\.org
+https?:\/\/([^\/]*\.)?motor-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?motorized-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?motorizedscooter\.chat\.ru
+https?:\/\/([^\/]*\.)?motorolaringtonesfreeucq\.blogspot\.com
+https?:\/\/([^\/]*\.)?motorolaringtoneskvp\.blogspot\.com
+https?:\/\/([^\/]*\.)?motorolaringtonesym\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviegalleries-com-gl8\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviepost-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviepost-h4s2iin\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviesarena-com-r42rng0\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviesarena-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviesgold-com-ig86ukjw\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviesgold-com-k0\.blogspot\.com
+https?:\/\/([^\/]*\.)?movieshark-d0vdon27\.blogspot\.com
+https?:\/\/([^\/]*\.)?moviesparade-com-a3hxnn6\.blogspot\.com
+https?:\/\/([^\/]*\.)?movietitan-com-i6shde\.blogspot\.com
+https?:\/\/([^\/]*\.)?movietitan-o6i14o0\.blogspot\.com
+https?:\/\/([^\/]*\.)?mozzarell\.republika\.pl
+https?:\/\/([^\/]*\.)?mp3ringtonerxw\.blogspot\.com
+https?:\/\/([^\/]*\.)?mp3sunrise\.com
+https?:\/\/([^\/]*\.)?mpdtbq8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mpeghunter-com-cyc0bec7k\.blogspot\.com
+https?:\/\/([^\/]*\.)?mqirai4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mrako4\.com
+https?:\/\/([^\/]*\.)?mrchewsasianbeaver-bwhmc0sk\.blogspot\.com
+https?:\/\/([^\/]*\.)?mrchewsasianbeaver-com-omazvpr\.blogspot\.com
+https?:\/\/([^\/]*\.)?mrntf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mrs-vette-hot-mom\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?mrwolfy49\.blogspot\.com
+https?:\/\/([^\/]*\.)?ms-dos-boot-disk\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?mster6\.com
+https?:\/\/([^\/]*\.)?mtaa5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mthelen\.250free\.com
+https?:\/\/([^\/]*\.)?muecst9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mughalbank\.com
+https?:\/\/([^\/]*\.)?mumms\.info
+https?:\/\/([^\/]*\.)?murdersoul\.blogspot\.com
+https?:\/\/([^\/]*\.)?murku-gunush\.110mb\.com
+https?:\/\/([^\/]*\.)?mus1ca\.info
+https?:\/\/([^\/]*\.)?muscle-pain-leg-cause\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?muscle-relaxers\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?music\.spacepur\.de
+https?:\/\/([^\/]*\.)?musicguild\.bc\.edu
+https?:\/\/([^\/]*\.)?mutantalias\.blogspot\.com
+https?:\/\/([^\/]*\.)?muwn9\.szm\.sk
+https?:\/\/([^\/]*\.)?muzyr\.szm\.sk
+https?:\/\/([^\/]*\.)?mvoht\.szm\.sk
+https?:\/\/([^\/]*\.)?mvsyonh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mwqbg\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?mwwkps6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mxmva\.szm\.sk
+https?:\/\/([^\/]*\.)?mxqwnn2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?my-cashadvance\.com
+https?:\/\/([^\/]*\.)?my-first-sex-teacherlbp\.blogspot\.com
+https?:\/\/([^\/]*\.)?my-friends-hot-mom-free-pic\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?my-friends-hot-mom-lesbian\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?my-friends-hot-mom-mrs-lee\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?my-host-space\.com
+https?:\/\/([^\/]*\.)?my-land\.bravehost\.com
+https?:\/\/([^\/]*\.)?my-mortgagerates\.com
+https?:\/\/([^\/]*\.)?my-summit\.com
+https?:\/\/([^\/]*\.)?my-teensex-wikes\.blogspot\.com
+https?:\/\/([^\/]*\.)?myfgj\.info
+https?:\/\/([^\/]*\.)?myhost\.gb\.com
+https?:\/\/([^\/]*\.)?mymitsubishiparts\.cn
+https?:\/\/([^\/]*\.)?mymr\.net
+https?:\/\/([^\/]*\.)?mynet-poker\.com
+https?:\/\/([^\/]*\.)?myprintworks\.com
+https?:\/\/([^\/]*\.)?myrotunda\.com
+https?:\/\/([^\/]*\.)?mysecretmovies-com-tul73\.blogspot\.com
+https?:\/\/([^\/]*\.)?myseo\.com\.cn
+https?:\/\/([^\/]*\.)?myshcompany\.com
+https?:\/\/([^\/]*\.)?mysmetrix\.asp2\.cz
+https?:\/\/([^\/]*\.)?myspace-myspace-my\.blogspot\.com
+https?:\/\/([^\/]*\.)?myteepo-3\.blogspot\.com
+https?:\/\/([^\/]*\.)?myts\.vip\.sina\.com
+https?:\/\/([^\/]*\.)?mywaybackwhen\.blogspot\.com
+https?:\/\/([^\/]*\.)?mzaxl\.szm\.sk
+https?:\/\/([^\/]*\.)?mzayxt2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mzlurz8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?mzwbifn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?n-free-porn-video-sample\.blogspot\.com
+https?:\/\/([^\/]*\.)?n-free-video-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?na-hummer\.jot\.com
+https?:\/\/([^\/]*\.)?naacpncnetwork\.org
+https?:\/\/([^\/]*\.)?naarttrl\.forumzen\.com
+https?:\/\/([^\/]*\.)?naffpqh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?naomiserge\.info
+https?:\/\/([^\/]*\.)?napalerd\.forumzen\.com
+https?:\/\/([^\/]*\.)?napas5\.com
+https?:\/\/([^\/]*\.)?naprosyn500mg\.sblog\.cz
+https?:\/\/([^\/]*\.)?naproxen\.zapto\.org
+https?:\/\/([^\/]*\.)?naqowp1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nariclet\.forumzen\.com
+https?:\/\/([^\/]*\.)?nas7fk\.com
+https?:\/\/([^\/]*\.)?nasacort\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?nasonex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?nastyalien-com-dk0wnd58i\.blogspot\.com
+https?:\/\/([^\/]*\.)?nastyalien-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?nastyrat-b7\.blogspot\.com
+https?:\/\/([^\/]*\.)?nastyrat-com-b8mu31h87m\.blogspot\.com
+https?:\/\/([^\/]*\.)?nastyrat-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?natskam\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?natural-skin\.nm\.ru
+https?:\/\/([^\/]*\.)?natural-tit-cum\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?natural_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?naughty-com-wdk\.blogspot\.com
+https?:\/\/([^\/]*\.)?naughty-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?navse\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nbay2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nbikkpb\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nbmhvbv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nbxc3\.szm\.sk
+https?:\/\/([^\/]*\.)?nchqqi4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ncpx5\.szm\.sk
+https?:\/\/([^\/]*\.)?ncwash\.com
+https?:\/\/([^\/]*\.)?nd-tli\.com
+https?:\/\/([^\/]*\.)?ndarj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ndnwrby\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nebraskamortgage-x\.com
+https?:\/\/([^\/]*\.)?nedneutr\.goodbb\.net
+https?:\/\/([^\/]*\.)?nedpbi3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?need-site\.com
+https?:\/\/([^\/]*\.)?nefariouswraith\.blogspot\.com
+https?:\/\/([^\/]*\.)?negozio-strumento-musicale\.19mb\.info
+https?:\/\/([^\/]*\.)?nejqssk\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?neko-adg\.blogspot\.com
+https?:\/\/([^\/]*\.)?nekoo\.cn
+https?:\/\/([^\/]*\.)?nekostar3\.blogspot\.com
+https?:\/\/([^\/]*\.)?nelaidla\.ifrance\.com
+https?:\/\/([^\/]*\.)?nelcala\.fr-bb\.com
+https?:\/\/([^\/]*\.)?nelior\.goodbb\.net
+https?:\/\/([^\/]*\.)?neri-albany\.blogspot\.com
+https?:\/\/([^\/]*\.)?neroj\.szm\.sk
+https?:\/\/([^\/]*\.)?nerve\.zyns\.com
+https?:\/\/([^\/]*\.)?net0551\.com
+https?:\/\/([^\/]*\.)?netbank\.cn
+https?:\/\/([^\/]*\.)?nethams\.pp\.ru
+https?:\/\/([^\/]*\.)?netinternetbanking\.info
+https?:\/\/([^\/]*\.)?netteak\.pp\.ru
+https?:\/\/([^\/]*\.)?nettyre\.pp\.ru
+https?:\/\/([^\/]*\.)?neux9\.szm\.sk
+https?:\/\/([^\/]*\.)?nevadamortgage-x\.com
+https?:\/\/([^\/]*\.)?nevados-hiking-boot\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?nevulo-teen-sex-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?new-ringtonesou\.blogspot\.com
+https?:\/\/([^\/]*\.)?new-watches\.fasthost\.tv
+https?:\/\/([^\/]*\.)?newae\.info
+https?:\/\/([^\/]*\.)?newaf\.info
+https?:\/\/([^\/]*\.)?newah\.info
+https?:\/\/([^\/]*\.)?newai\.info
+https?:\/\/([^\/]*\.)?newaq\.info
+https?:\/\/([^\/]*\.)?newar\.info
+https?:\/\/([^\/]*\.)?newau\.info
+https?:\/\/([^\/]*\.)?newbabyface\.net
+https?:\/\/([^\/]*\.)?newboyu\.com
+https?:\/\/([^\/]*\.)?newdietpills\.bravehost\.com
+https?:\/\/([^\/]*\.)?newgals-com-ean\.blogspot\.com
+https?:\/\/([^\/]*\.)?newhampshiremortgage-x\.com
+https?:\/\/([^\/]*\.)?newjerseymortgage-x\.com
+https?:\/\/([^\/]*\.)?newmexicomortgage-x\.com
+https?:\/\/([^\/]*\.)?newnewsonline\.info
+https?:\/\/([^\/]*\.)?newob\.info
+https?:\/\/([^\/]*\.)?newoc\.info
+https?:\/\/([^\/]*\.)?newom\.info
+https?:\/\/([^\/]*\.)?newov\.info
+https?:\/\/([^\/]*\.)?newox\.info
+https?:\/\/([^\/]*\.)?newoz\.info
+https?:\/\/([^\/]*\.)?news\.101freehost\.com
+https?:\/\/([^\/]*\.)?news\.engin\.brown\.edu
+https?:\/\/([^\/]*\.)?newwesthonda\.info
+https?:\/\/([^\/]*\.)?newworldmen\.com
+https?:\/\/([^\/]*\.)?newyorkmortgage-x\.com
+https?:\/\/([^\/]*\.)?nexium\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?nexiumbuy\.on\.to
+https?:\/\/([^\/]*\.)?nexiumbuygeneric\.snap\.to
+https?:\/\/([^\/]*\.)?nexiumcheap\.notrix\.ch
+https?:\/\/([^\/]*\.)?nexiumcheapbuy\.notrix\.de
+https?:\/\/([^\/]*\.)?nexiumgeneric\.dive\.to
+https?:\/\/([^\/]*\.)?nexxx-com-r138wgeob5\.blogspot\.com
+https?:\/\/([^\/]*\.)?nexxx-kc113s775\.blogspot\.com
+https?:\/\/([^\/]*\.)?nfbwx\.szm\.sk
+https?:\/\/([^\/]*\.)?nffnj\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nfl-cheerleader-outfit\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?nfme8\.szm\.sk
+https?:\/\/([^\/]*\.)?nfpg4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nfyxtime\.com
+https?:\/\/([^\/]*\.)?nggleb0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nginju3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nhqkyun\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nibko\.info
+https?:\/\/([^\/]*\.)?nice-asian-ass-and-sex\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?nice-boob-picture\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?niche-porn-sites\.org
+https?:\/\/([^\/]*\.)?nickdarula\.com
+https?:\/\/([^\/]*\.)?nicwan\.com
+https?:\/\/([^\/]*\.)?nidarim\.com
+https?:\/\/([^\/]*\.)?niebn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nifedipine-solubility\.tlg\.pl
+https?:\/\/([^\/]*\.)?nifjv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?niharpe\.dl\.pl
+https?:\/\/([^\/]*\.)?nihosi\.com
+https?:\/\/([^\/]*\.)?nika-ru\.blogspot\.com
+https?:\/\/([^\/]*\.)?nikkie-cole\.blogspot\.com
+https?:\/\/([^\/]*\.)?nimast\.com
+https?:\/\/([^\/]*\.)?nimit-zood\.ibelgique\.com
+https?:\/\/([^\/]*\.)?ninenailteen\.blogspot\.com
+https?:\/\/([^\/]*\.)?ninjasidestep\.com
+https?:\/\/([^\/]*\.)?ninostarto\.blogspot\.com
+https?:\/\/([^\/]*\.)?ninuni\.com
+https?:\/\/([^\/]*\.)?nipples-puffy-teenage\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?nipverify\.icspace\.net
+https?:\/\/([^\/]*\.)?nissan-240sx\.newmail\.ru
+https?:\/\/([^\/]*\.)?nissan-dealer\.newmail\.ru
+https?:\/\/([^\/]*\.)?nissan-frontier\.nm\.ru
+https?:\/\/([^\/]*\.)?nissan-motor\.nm\.ru
+https?:\/\/([^\/]*\.)?nissan-murano\.newmail\.ru
+https?:\/\/([^\/]*\.)?nissan-part\.nightmail\.ru
+https?:\/\/([^\/]*\.)?nissan-pathfinder\.hotmail\.ru
+https?:\/\/([^\/]*\.)?nissan-sentra\.hotmail\.ru
+https?:\/\/([^\/]*\.)?nissan-titan\.hotmail\.ru
+https?:\/\/([^\/]*\.)?nissan-truck\.hotmail\.ru
+https?:\/\/([^\/]*\.)?nissan-xterra\.hotmail\.ru
+https?:\/\/([^\/]*\.)?nissan_240sx\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_dealer\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_frontier\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_motor\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_murano1\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_part\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_pathfind\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_sentra\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_titan\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_truck\.chat\.ru
+https?:\/\/([^\/]*\.)?nissan_xterra\.chat\.ru
+https?:\/\/([^\/]*\.)?nixve\.blogspot\.com
+https?:\/\/([^\/]*\.)?njfc\.nease\.net
+https?:\/\/([^\/]*\.)?njhk\.jiuwu\.com
+https?:\/\/([^\/]*\.)?njhk\.yushantang\.com
+https?:\/\/([^\/]*\.)?njuta78\.125mb\.com
+https?:\/\/([^\/]*\.)?njzthvq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nkkqq\.szm\.sk
+https?:\/\/([^\/]*\.)?nkxow\.szm\.sk
+https?:\/\/([^\/]*\.)?nkzzm\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nlexc\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nmagiietending\.blogspot\.com
+https?:\/\/([^\/]*\.)?nmwj5\.szm\.sk
+https?:\/\/([^\/]*\.)?nnline\.info
+https?:\/\/([^\/]*\.)?no-deposit-casino-bonus\.any\.pl
+https?:\/\/([^\/]*\.)?no-faxing-payday--loan\.blogspot\.com
+https?:\/\/([^\/]*\.)?no-free-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?no1babes-com-juquj\.blogspot\.com
+https?:\/\/([^\/]*\.)?noalzel\.blogcu\.com
+https?:\/\/([^\/]*\.)?nobocli\.bbfr\.net
+https?:\/\/([^\/]*\.)?nobullhardcore-com-i7mpf5i83t\.blogspot\.com
+https?:\/\/([^\/]*\.)?nodb0\.szm\.sk
+https?:\/\/([^\/]*\.)?noelchi\.td\.pl
+https?:\/\/([^\/]*\.)?noeldar\.td\.pl
+https?:\/\/([^\/]*\.)?nofatonline\.com
+https?:\/\/([^\/]*\.)?nolamon\.naturalforum\.net
+https?:\/\/([^\/]*\.)?noletoolo\.dl\.pl
+https?:\/\/([^\/]*\.)?nomote4\.blogspot\.com
+https?:\/\/([^\/]*\.)?nopasrol\.myrealboard\.com
+https?:\/\/([^\/]*\.)?nord9maedchen73\.blogspot\.com
+https?:\/\/([^\/]*\.)?nordette\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?norflex100mg\.sblog\.cz
+https?:\/\/([^\/]*\.)?normanburke\.blogspot\.com
+https?:\/\/([^\/]*\.)?noro-alanis\.blogspot\.com
+https?:\/\/([^\/]*\.)?northcarolinamortgage-x\.com
+https?:\/\/([^\/]*\.)?northdakotamortgage-x\.com
+https?:\/\/([^\/]*\.)?norvasc\.coz\.in
+https?:\/\/([^\/]*\.)?norwichwriters\.org
+https?:\/\/([^\/]*\.)?noscudom\.forumzen\.com
+https?:\/\/([^\/]*\.)?noseypets\.com
+https?:\/\/([^\/]*\.)?nostawnevets53\.blogspot\.com
+https?:\/\/([^\/]*\.)?not-another-teen-movie-ddw5x\.blogspot\.com
+https?:\/\/([^\/]*\.)?notelymphatic\.org
+https?:\/\/([^\/]*\.)?notereport\.info
+https?:\/\/([^\/]*\.)?notrocli\.zj\.pl
+https?:\/\/([^\/]*\.)?novanasa\.php5\.cz
+https?:\/\/([^\/]*\.)?novar\.darkbb\.com
+https?:\/\/([^\/]*\.)?noviac\.jc\.pl
+https?:\/\/([^\/]*\.)?nox-teeniefiles-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?npchwp9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nqfahsc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nqkt4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nqllo\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nqlp7\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nqod6\.szm\.sk
+https?:\/\/([^\/]*\.)?nqquc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nqyz6\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?nsstc\.uah\.edu
+https?:\/\/([^\/]*\.)?nsxslk5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nthfind\.com
+https?:\/\/([^\/]*\.)?nu-alicia\.blogspot\.com
+https?:\/\/([^\/]*\.)?nucs2\.szm\.sk
+https?:\/\/([^\/]*\.)?nuddxy-free-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?nude-ass-video\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?nude-lingerie-model-photo\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?nude-little-ass\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?nude-teacher\.com
+https?:\/\/([^\/]*\.)?nudecelebritypictures-c6ob080\.blogspot\.com
+https?:\/\/([^\/]*\.)?nudecelebritypictures-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?nudecelebritypictures-nu-hqb65kdn\.blogspot\.com
+https?:\/\/([^\/]*\.)?nudestarz-com-xurig\.blogspot\.com
+https?:\/\/([^\/]*\.)?nudistlog-com-oygsrji75\.blogspot\.com
+https?:\/\/([^\/]*\.)?nugo-aerobics\.blogspot\.com
+https?:\/\/([^\/]*\.)?nuje9\.szm\.sk
+https?:\/\/([^\/]*\.)?numbness-in-right-leg\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?numimb\.com
+https?:\/\/([^\/]*\.)?numr2\.szm\.sk
+https?:\/\/([^\/]*\.)?nunikal\.stabilt\.se
+https?:\/\/([^\/]*\.)?nuqfz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nurglesnymphs-com-nuxow\.blogspot\.com
+https?:\/\/([^\/]*\.)?nurs-employment\.boom\.ru
+https?:\/\/([^\/]*\.)?nurs2employment\.chat\.ru
+https?:\/\/([^\/]*\.)?nurse-fucking-video\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?nursi2-education\.boom\.ru
+https?:\/\/([^\/]*\.)?nursin-education\.boom\.ru
+https?:\/\/([^\/]*\.)?nursin2education\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing-career\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-college\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-degree\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-degree\.fromru\.com
+https?:\/\/([^\/]*\.)?nursing-degree\.pochta\.ru
+https?:\/\/([^\/]*\.)?nursing-home\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-home\.land\.ru
+https?:\/\/([^\/]*\.)?nursing-home\.pochta\.ru
+https?:\/\/([^\/]*\.)?nursing-job\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-job\.land\.ru
+https?:\/\/([^\/]*\.)?nursing-job\.pochta\.ru
+https?:\/\/([^\/]*\.)?nursing-school\.fromru\.com
+https?:\/\/([^\/]*\.)?nursing-school\.pochta\.ru
+https?:\/\/([^\/]*\.)?nursing-scrubs\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing-uniform\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing2-school\.boom\.ru
+https?:\/\/([^\/]*\.)?nursing2college\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing2school\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing2scrubs\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing4career\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing4degree\.chat\.ru
+https?:\/\/([^\/]*\.)?nursing4job\.chat\.ru
+https?:\/\/([^\/]*\.)?nursingeducation\.chat\.ru
+https?:\/\/([^\/]*\.)?nutramigen-lipil\.leg4is\.be
+https?:\/\/([^\/]*\.)?nvdwc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nwxnv\.szm\.sk
+https?:\/\/([^\/]*\.)?nxbbyhc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nxnmwlh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?nxsq0\.szm\.sk
+https?:\/\/([^\/]*\.)?o-medic\.tripod\.com
+https?:\/\/([^\/]*\.)?o8\.aus\.cc
+https?:\/\/([^\/]*\.)?oa18\.cc
+https?:\/\/([^\/]*\.)?oa2010\.com
+https?:\/\/([^\/]*\.)?oalink\.cn
+https?:\/\/([^\/]*\.)?obesity-check\.com
+https?:\/\/([^\/]*\.)?obosra\.com
+https?:\/\/([^\/]*\.)?obrazok\.dtdns\.net
+https?:\/\/([^\/]*\.)?obsque\.cn
+https?:\/\/([^\/]*\.)?ocapk\.szm\.sk
+https?:\/\/([^\/]*\.)?oceshdes\.forumzen\.com
+https?:\/\/([^\/]*\.)?ockulpas\.forumzen\.com
+https?:\/\/([^\/]*\.)?ocleelia\.forumzen\.com
+https?:\/\/([^\/]*\.)?ocscrtro\.forumzen\.com
+https?:\/\/([^\/]*\.)?oczt4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?odfxci8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?odmi1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?odqw4\.szm\.sk
+https?:\/\/([^\/]*\.)?oechnxln\.tripod\.com
+https?:\/\/([^\/]*\.)?oecx6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?oeqls\.szm\.sk
+https?:\/\/([^\/]*\.)?offerta-volo-madrid\.19mb\.info
+https?:\/\/([^\/]*\.)?officialkes\.com
+https?:\/\/([^\/]*\.)?ogooch\.ifrance\.com
+https?:\/\/([^\/]*\.)?ogzx4\.szm\.sk
+https?:\/\/([^\/]*\.)?ohgood-com-dv8l\.blogspot\.com
+https?:\/\/([^\/]*\.)?ohgood-com-isxvi72\.blogspot\.com
+https?:\/\/([^\/]*\.)?ohgood-com-rv0\.blogspot\.com
+https?:\/\/([^\/]*\.)?ohiomortgage-x\.com
+https?:\/\/([^\/]*\.)?ohmybaby\.net
+https?:\/\/([^\/]*\.)?oilpaintingkingdom\.com
+https?:\/\/([^\/]*\.)?oily-skin\.newmail\.ru
+https?:\/\/([^\/]*\.)?oily_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?oip\.org\.ua
+https?:\/\/([^\/]*\.)?oirwt\.szm\.sk
+https?:\/\/([^\/]*\.)?ojdo0\.szm\.sk
+https?:\/\/([^\/]*\.)?ojdx7\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?okayhotels\.com
+https?:\/\/([^\/]*\.)?okcompany\.org
+https?:\/\/([^\/]*\.)?oklahomamortgage-x\.com
+https?:\/\/([^\/]*\.)?okrentcar\.org
+https?:\/\/([^\/]*\.)?old-lady-fuck\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?old-lady-suck-dick\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?old69-com-mdt71k\.blogspot\.com
+https?:\/\/([^\/]*\.)?old69-k40bqc\.blogspot\.com
+https?:\/\/([^\/]*\.)?older-mature-tgp\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?oldon\.info
+https?:\/\/([^\/]*\.)?oldp9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?oldreboc\.forumzen\.com
+https?:\/\/([^\/]*\.)?olijanko\.republika\.pl
+https?:\/\/([^\/]*\.)?olml2\.szm\.sk
+https?:\/\/([^\/]*\.)?olnnt\.szm\.sk
+https?:\/\/([^\/]*\.)?olocnamon\.cultureforum\.net
+https?:\/\/([^\/]*\.)?olocobo\.goodforum\.net
+https?:\/\/([^\/]*\.)?olocobo\.grafbb\.com
+https?:\/\/([^\/]*\.)?olodarelt\.heavenforum\.com
+https?:\/\/([^\/]*\.)?olodarelt\.highforum\.net
+https?:\/\/([^\/]*\.)?olodronric\.su\.pl
+https?:\/\/([^\/]*\.)?olodronro\.blogcu\.com
+https?:\/\/([^\/]*\.)?oloolovi\.ephpbb\.com
+https?:\/\/([^\/]*\.)?oloorrac\.blogcu\.com
+https?:\/\/([^\/]*\.)?olorelrel\.blogcu\.com
+https?:\/\/([^\/]*\.)?olorodom\.blogcu\.com
+https?:\/\/([^\/]*\.)?oltcha\.blogspot\.com
+https?:\/\/([^\/]*\.)?olyelzet\.forumzen\.com
+https?:\/\/([^\/]*\.)?omchades\.forumzen\.com
+https?:\/\/([^\/]*\.)?omega\.spb\.ru
+https?:\/\/([^\/]*\.)?omxmlvf\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?on-poteen-1-2\.blogspot\.com
+https?:\/\/([^\/]*\.)?onac2\.szm\.sk
+https?:\/\/([^\/]*\.)?one2you\.biz
+https?:\/\/([^\/]*\.)?one2you\.info
+https?:\/\/([^\/]*\.)?onfew\.szm\.sk
+https?:\/\/([^\/]*\.)?onlin-nurs-degre\.boom\.ru
+https?:\/\/([^\/]*\.)?online-blackjack-site\.com
+https?:\/\/([^\/]*\.)?online-casino-l\.blogspot\.com
+https?:\/\/([^\/]*\.)?online-casino-wiki\.com
+https?:\/\/([^\/]*\.)?online-casinos-city\.com
+https?:\/\/([^\/]*\.)?online-casinos-discovered\.com
+https?:\/\/([^\/]*\.)?online-degree-4you\.com
+https?:\/\/([^\/]*\.)?online-gambling-b\.blogspot\.com
+https?:\/\/([^\/]*\.)?online-games24x7\.com
+https?:\/\/([^\/]*\.)?online-medications24x7\.com
+https?:\/\/([^\/]*\.)?online-pharm\.zmail\.ru
+https?:\/\/([^\/]*\.)?online-pharmacy-24x7\.net
+https?:\/\/([^\/]*\.)?online-pharmacy-4u\.net
+https?:\/\/([^\/]*\.)?online-poker-game\.blogspot\.com
+https?:\/\/([^\/]*\.)?online-poker-online-poker\.net
+https?:\/\/([^\/]*\.)?online-poker\.black-poker\.com
+https?:\/\/([^\/]*\.)?online-poker\.dd\.vg
+https?:\/\/([^\/]*\.)?online-prozac\.boom\.ru
+https?:\/\/([^\/]*\.)?online-shop-24x7\.com
+https?:\/\/([^\/]*\.)?online-tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?online1-degree\.boom\.ru
+https?:\/\/([^\/]*\.)?online1course\.chat\.ru
+https?:\/\/([^\/]*\.)?online1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?online3course\.chat\.ru
+https?:\/\/([^\/]*\.)?online4nursing\.chat\.ru
+https?:\/\/([^\/]*\.)?onlineglass\.siteburg\.com
+https?:\/\/([^\/]*\.)?onlinepharmacy-4u\.net
+https?:\/\/([^\/]*\.)?onlinepharmacy2004\.net
+https?:\/\/([^\/]*\.)?onlinesexcity\.info
+https?:\/\/([^\/]*\.)?only-ringtone\.com
+https?:\/\/([^\/]*\.)?only4game\.com
+https?:\/\/([^\/]*\.)?onlycuties-com\.jalovica\.dtdns\.net
+https?:\/\/([^\/]*\.)?onlymovies-com-e1tez\.blogspot\.com
+https?:\/\/([^\/]*\.)?onlymovies-com-eczm1w\.blogspot\.com
+https?:\/\/([^\/]*\.)?onlyteenstgp-com-rmn\.blogspot\.com
+https?:\/\/([^\/]*\.)?onlyteenstgp-com-rrcamwws3\.blogspot\.com
+https?:\/\/([^\/]*\.)?onlyteenstgp-we\.blogspot\.com
+https?:\/\/([^\/]*\.)?onmycrew\.blogspot\.com
+https?:\/\/([^\/]*\.)?onrueetd\.forumzen\.com
+https?:\/\/([^\/]*\.)?oogqj\.szm\.sk
+https?:\/\/([^\/]*\.)?oohsexy-com-hob8e5y8r\.blogspot\.com
+https?:\/\/([^\/]*\.)?oohsexy-com-hpemrnff\.blogspot\.com
+https?:\/\/([^\/]*\.)?oohsexy\.com
+https?:\/\/([^\/]*\.)?oohsexy000\.blogspot\.com
+https?:\/\/([^\/]*\.)?ooline\.info
+https?:\/\/([^\/]*\.)?oolive\.info
+https?:\/\/([^\/]*\.)?oonk1\.szm\.sk
+https?:\/\/([^\/]*\.)?ooooi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ootop\.info
+https?:\/\/([^\/]*\.)?ooyy2\.szm\.sk
+https?:\/\/([^\/]*\.)?opastr\.com
+https?:\/\/([^\/]*\.)?oping\.info
+https?:\/\/([^\/]*\.)?opiytr\.com
+https?:\/\/([^\/]*\.)?opkr1\.szm\.sk
+https?:\/\/([^\/]*\.)?optbblx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?optfzj5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?opyfsen\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?oqaknky\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?oqfwt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?or-drondron\.xa\.pl
+https?:\/\/([^\/]*\.)?orabc\.info
+https?:\/\/([^\/]*\.)?oracelta\.lolforum\.net
+https?:\/\/([^\/]*\.)?orasta\.com
+https?:\/\/([^\/]*\.)?orbasolo\.dl\.pl
+https?:\/\/([^\/]*\.)?orcnaac\.discutfree\.com
+https?:\/\/([^\/]*\.)?orcoc\.lolbb\.com
+https?:\/\/([^\/]*\.)?orcore\.graphforum\.com
+https?:\/\/([^\/]*\.)?orddercelexa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orddercialisonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordderlevitra\.ovp\.pl
+https?:\/\/([^\/]*\.)?orddertramadolonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orddervalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?orddervaliumonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordderviagra\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordderviagraonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordderzithromax\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordeertramadol\.ovp\.pl
+https?:\/\/([^\/]*\.)?order-blue-phentermine\.coz\.in
+https?:\/\/([^\/]*\.)?order-ritalin-online\.contact\.cc
+https?:\/\/([^\/]*\.)?order-viagra\.health-livening\.com
+https?:\/\/([^\/]*\.)?orderacyclovirr\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderadipexx\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderalbenzaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderalprazolamm\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderambienn\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderamoxicillinn\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderativann\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderccialiss\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordercelexaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderciaalisonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordercialisonline\.jubiiblog\.de
+https?:\/\/([^\/]*\.)?ordercialiss\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordercializ\.blogcu\.com
+https?:\/\/([^\/]*\.)?ordercializ\.spotbb\.com
+https?:\/\/([^\/]*\.)?ordercymbaltaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderhydrocodonee\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderlevitraa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderllevitra\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordermeridiaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderphentermin\.phpbbx\.de
+https?:\/\/([^\/]*\.)?orderphenterminee\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderpropeciaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrcialisonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrlevitra\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrtramadoll\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrtramadolonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrvalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrviagraa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderrviagraonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordersoma\.blogsome\.com
+https?:\/\/([^\/]*\.)?ordersomaa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderssoma\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordertramadoll\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordertramadollonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderultramm\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordervaliumm\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderviagraa\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderviagraaonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?ordervvalium\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderxanaxx\.ovp\.pl
+https?:\/\/([^\/]*\.)?orderxenicalonline\.ir\.pl
+https?:\/\/([^\/]*\.)?orecchino\.7god\.info
+https?:\/\/([^\/]*\.)?orecchino\.freespase\.info
+https?:\/\/([^\/]*\.)?oregonmortgage-x\.com
+https?:\/\/([^\/]*\.)?orgetacel\.discutforum\.com
+https?:\/\/([^\/]*\.)?orgeter\.cultureforum\.net
+https?:\/\/([^\/]*\.)?orgs\.indianatech\.edu
+https?:\/\/([^\/]*\.)?orletovar\.zikforum\.com
+https?:\/\/([^\/]*\.)?ormme\.com
+https?:\/\/([^\/]*\.)?ornildom\.forumzen\.com
+https?:\/\/([^\/]*\.)?orrdercialisonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orrdertramadolonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?orsaverc\.forumzen\.com
+https?:\/\/([^\/]*\.)?ortar\.com
+https?:\/\/([^\/]*\.)?ortho-tri-cyclen\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ortrocrol\.heavenforum\.com
+https?:\/\/([^\/]*\.)?ortrocrol\.highforum\.net
+https?:\/\/([^\/]*\.)?orvict\.ephpbb\.com
+https?:\/\/([^\/]*\.)?oryc0\.szm\.sk
+https?:\/\/([^\/]*\.)?orzeldron\.lightbb\.com
+https?:\/\/([^\/]*\.)?osakabondage\.info
+https?:\/\/([^\/]*\.)?osfi5\.szm\.sk
+https?:\/\/([^\/]*\.)?osthtp1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?otqsc\.szm\.sk
+https?:\/\/([^\/]*\.)?oudomdar\.dl\.pl
+https?:\/\/([^\/]*\.)?oudomolo\.lolbb\.com
+https?:\/\/([^\/]*\.)?oudronc4t\.blogcu\.com
+https?:\/\/([^\/]*\.)?ouerco\.lightbb\.com
+https?:\/\/([^\/]*\.)?oufienoc\.forumzen\.com
+https?:\/\/([^\/]*\.)?ouglova\.blogspot\.com
+https?:\/\/([^\/]*\.)?ouhymtro\.forumzen\.com
+https?:\/\/([^\/]*\.)?ouor\.lightbb\.com
+https?:\/\/([^\/]*\.)?ouorrac\.bbfr\.net
+https?:\/\/([^\/]*\.)?ouracdron\.discutfree\.com
+https?:\/\/([^\/]*\.)?ourolal\.discutfree\.com
+https?:\/\/([^\/]*\.)?outrocvar\.zj\.pl
+https?:\/\/([^\/]*\.)?outward-dev\.com
+https?:\/\/([^\/]*\.)?ouvier\.zj\.pl
+https?:\/\/([^\/]*\.)?overseas-adventure-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?ovparnel\.dl\.pl
+https?:\/\/([^\/]*\.)?ovpn2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ovrie\.szm\.sk
+https?:\/\/([^\/]*\.)?ovu\.edu
+https?:\/\/([^\/]*\.)?owll1\.szm\.sk
+https?:\/\/([^\/]*\.)?oxpass-com-g5\.blogspot\.com
+https?:\/\/([^\/]*\.)?oxpass-com-gt71a0\.blogspot\.com
+https?:\/\/([^\/]*\.)?oxpass-com-hurol\.blogspot\.com
+https?:\/\/([^\/]*\.)?oyspa\.szm\.sk
+https?:\/\/([^\/]*\.)?oz6soqa\.nokedem\.com
+https?:\/\/([^\/]*\.)?ozbk9\.szm\.sk
+https?:\/\/([^\/]*\.)?ozgzm\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ozxz5\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ozyexk2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?p-free-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?p-n-lesbian-sex-video-d\.blogspot\.com
+https?:\/\/([^\/]*\.)?p-teens-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?p-vi\.com
+https?:\/\/([^\/]*\.)?p1v\.org
+https?:\/\/([^\/]*\.)?p2l\.info
+https?:\/\/([^\/]*\.)?pa19\.com
+https?:\/\/([^\/]*\.)?pacfic-poker\.mutogen\.be
+https?:\/\/([^\/]*\.)?pacficpoker\.xwiki\.com
+https?:\/\/([^\/]*\.)?pacific-poker\.black-poker\.com
+https?:\/\/([^\/]*\.)?paddedapex\.org
+https?:\/\/([^\/]*\.)?paeecpx\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pafyawv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pain-medications\.us
+https?:\/\/([^\/]*\.)?pain-relief\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?pain-relief\.2x4\.ru
+https?:\/\/([^\/]*\.)?pain-relief\.fromru\.com
+https?:\/\/([^\/]*\.)?pain-relief\.newmail\.ru
+https?:\/\/([^\/]*\.)?pain_relief\.chat\.ru
+https?:\/\/([^\/]*\.)?paisi\.com
+https?:\/\/([^\/]*\.)?paisidesign\.com
+https?:\/\/([^\/]*\.)?pam\.freehostia\.com
+https?:\/\/([^\/]*\.)?pamlicohouse\.com
+https?:\/\/([^\/]*\.)?panama2cruise\.boom\.ru
+https?:\/\/([^\/]*\.)?panama2cruise\.chat\.ru
+https?:\/\/([^\/]*\.)?panamacruise1\.boom\.ru
+https?:\/\/([^\/]*\.)?panamacruise1\.chat\.ru
+https?:\/\/([^\/]*\.)?pandamovies-com-g6lz762n76\.blogspot\.com
+https?:\/\/([^\/]*\.)?pandamovies-com-tq32\.blogspot\.com
+https?:\/\/([^\/]*\.)?pandamovies-o4me7xqq0f\.blogspot\.com
+https?:\/\/([^\/]*\.)?panshan888\.com
+https?:\/\/([^\/]*\.)?panss\.org
+https?:\/\/([^\/]*\.)?panthersjaguar\.info
+https?:\/\/([^\/]*\.)?panty-ass-com-w1\.blogspot\.com
+https?:\/\/([^\/]*\.)?panty-ass-com-w8\.blogspot\.com
+https?:\/\/([^\/]*\.)?pantybuns-com-a6ejgve\.blogspot\.com
+https?:\/\/([^\/]*\.)?pantybuns-com-axeoa77ze5\.blogspot\.com
+https?:\/\/([^\/]*\.)?pantybuns-com-tl0\.blogspot\.com
+https?:\/\/([^\/]*\.)?pantyhose-face\.pupava\.dtdns\.net
+https?:\/\/([^\/]*\.)?pantyhose-net\.com
+https?:\/\/([^\/]*\.)?paola-e-chiara\.host24h\.info
+https?:\/\/([^\/]*\.)?paper--shredder\.boom\.ru
+https?:\/\/([^\/]*\.)?paper-s\.boom\.ru
+https?:\/\/([^\/]*\.)?paper1-shredder\.boom\.ru
+https?:\/\/([^\/]*\.)?paper1shredder\.chat\.ru
+https?:\/\/([^\/]*\.)?paper5shredder\.chat\.ru
+https?:\/\/([^\/]*\.)?paperbox\.freephpwebhosting\.net
+https?:\/\/([^\/]*\.)?paperroom\.blogspot\.com
+https?:\/\/([^\/]*\.)?papr-shredder\.boom\.ru
+https?:\/\/([^\/]*\.)?paradisenudes-com-o71a\.blogspot\.com
+https?:\/\/([^\/]*\.)?paradisenudes-com-os\.blogspot\.com
+https?:\/\/([^\/]*\.)?paralegal1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?parench\.ifrance\.com
+https?:\/\/([^\/]*\.)?parigi-appartamento-vacanza\.zoom10x\.info
+https?:\/\/([^\/]*\.)?paris-hilton-huxik\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-lukuv\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-nude-tape\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-pijid\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-pojic\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-porn\.0800-porn\.com
+https?:\/\/([^\/]*\.)?paris-hilton-sex-tape-xxx\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-sex-video-gf5m5\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-sex-video-sez\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-socog\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris-hilton-xidig\.blogspot\.com
+https?:\/\/([^\/]*\.)?paris\.php5\.cz
+https?:\/\/([^\/]*\.)?parishilton-paris-hilton\.blogspot\.com
+https?:\/\/([^\/]*\.)?parishilton-paris\.blogspot\.com
+https?:\/\/([^\/]*\.)?parnvf8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?partei-deutsches-reich\.de
+https?:\/\/([^\/]*\.)?parties-supply\.jeepsyc\.be
+https?:\/\/([^\/]*\.)?party-poker\.black-poker\.com
+https?:\/\/([^\/]*\.)?pasacvi\.zikforum\.com
+https?:\/\/([^\/]*\.)?paschiel\.blogcu\.com
+https?:\/\/([^\/]*\.)?pasdronli\.winnerforum\.net
+https?:\/\/([^\/]*\.)?pashkak0marov\.blogspot\.com
+https?:\/\/([^\/]*\.)?paslibo\.myrealboard\.com
+https?:\/\/([^\/]*\.)?pasoloro\.graphforum\.com
+https?:\/\/([^\/]*\.)?pasoloro\.highforum\.net
+https?:\/\/([^\/]*\.)?pasracco\.blogcu\.com
+https?:\/\/([^\/]*\.)?pasrodron\.xa\.pl
+https?:\/\/([^\/]*\.)?passaf\.com
+https?:\/\/([^\/]*\.)?pastmagic\.blogspot\.com
+https?:\/\/([^\/]*\.)?pasviric\.td\.pl
+https?:\/\/([^\/]*\.)?patsytestis\.0moola\.com
+https?:\/\/([^\/]*\.)?pattywhack91\.ibelgique\.com
+https?:\/\/([^\/]*\.)?paulino\.greekboston\.com
+https?:\/\/([^\/]*\.)?paulino\.idilis\.ro
+https?:\/\/([^\/]*\.)?paxil-cr\.contact\.cc
+https?:\/\/([^\/]*\.)?paxil-without-prescription\.contact\.cc
+https?:\/\/([^\/]*\.)?paxil\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?paxil\.forospace\.com
+https?:\/\/([^\/]*\.)?paxilonline\.zoomshare\.com
+https?:\/\/([^\/]*\.)?payday-loan\.de\.com
+https?:\/\/([^\/]*\.)?payday-loans-4us\.com
+https?:\/\/([^\/]*\.)?payday-loans-ooo\.blogspot\.com
+https?:\/\/([^\/]*\.)?paydayloans-guide\.com
+https?:\/\/([^\/]*\.)?paydayloans-x\.com
+https?:\/\/([^\/]*\.)?pcb2002\.home4u\.china\.com
+https?:\/\/([^\/]*\.)?pcgzt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pdslnw6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?peace-weasel\.blogspot\.com
+https?:\/\/([^\/]*\.)?peacedoorball\.blogspot\.com
+https?:\/\/([^\/]*\.)?pearlibuttons\.blogspot\.com
+https?:\/\/([^\/]*\.)?pebwgu0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pecilu-free-sex-video-clip\.blogspot\.com
+https?:\/\/([^\/]*\.)?pee-4a\.com
+https?:\/\/([^\/]*\.)?peetliel\.jconserv\.net
+https?:\/\/([^\/]*\.)?pefi-albert\.blogspot\.com
+https?:\/\/([^\/]*\.)?pelnp\.szm\.sk
+https?:\/\/([^\/]*\.)?pendant\.hostcroc\.com
+https?:\/\/([^\/]*\.)?pennsylvaniamortgage-x\.com
+https?:\/\/([^\/]*\.)?people\.msoe\.edu
+https?:\/\/([^\/]*\.)?percocet-without-prescription\.contact\.cc
+https?:\/\/([^\/]*\.)?percocet\.xwiki\.com
+https?:\/\/([^\/]*\.)?perfect-boob\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?permanentmagnet\.com
+https?:\/\/([^\/]*\.)?persiankitty-com-kcfsibt01d\.blogspot\.com
+https?:\/\/([^\/]*\.)?persiankitty-com-ksa6l1a\.blogspot\.com
+https?:\/\/([^\/]*\.)?personales\.ciudad\.com\.ar
+https?:\/\/([^\/]*\.)?personalserotic\.com
+https?:\/\/([^\/]*\.)?petite-mature-blonde\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?petite-teen-ass\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?petiteteenager-com-cm8ku8w\.blogspot\.com
+https?:\/\/([^\/]*\.)?petiteteenager-com-md6\.blogspot\.com
+https?:\/\/([^\/]*\.)?petiteteenager-com-mns4n5a4\.blogspot\.com
+https?:\/\/([^\/]*\.)?petiteteenager-g687rhasjq\.blogspot\.com
+https?:\/\/([^\/]*\.)?peuct\.szm\.sk
+https?:\/\/([^\/]*\.)?pfes7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pffl4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pgbnjja\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pharm1\.info
+https?:\/\/([^\/]*\.)?pharmacies\.in\.ua
+https?:\/\/([^\/]*\.)?pharmacy-experts\.org
+https?:\/\/([^\/]*\.)?pharmacy-x\.ru\.ru
+https?:\/\/([^\/]*\.)?pharmacy\.sovuennir\.be
+https?:\/\/([^\/]*\.)?pharmacy\.t28\.net
+https?:\/\/([^\/]*\.)?pharmacy05\.com
+https?:\/\/([^\/]*\.)?pharmacybuy1\.angelcities\.com
+https?:\/\/([^\/]*\.)?pharmaduk\.xshorturl\.com
+https?:\/\/([^\/]*\.)?phendimetrazine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?phendimetrazinenx\.u\.yuku\.com
+https?:\/\/([^\/]*\.)?phentermine--mine\.blogspot\.com
+https?:\/\/([^\/]*\.)?phentermine-911\.bee\.pl
+https?:\/\/([^\/]*\.)?phentermine-911\.coz\.in
+https?:\/\/([^\/]*\.)?phentermine-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?phentermine-choise\.ebloggy\.com
+https?:\/\/([^\/]*\.)?phentermine-forum\.tripod\.com
+https?:\/\/([^\/]*\.)?phentermine-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?phentermine-gs\.net\.tc
+https?:\/\/([^\/]*\.)?phentermine-hcl\.org
+https?:\/\/([^\/]*\.)?phentermine-online\.cheapills\.info
+https?:\/\/([^\/]*\.)?phentermine-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?phentermine-pharmacy\.fws1\.com
+https?:\/\/([^\/]*\.)?phentermine-support\.com
+https?:\/\/([^\/]*\.)?phentermine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?phentermine\.acbox\.com
+https?:\/\/([^\/]*\.)?phentermine\.acbox\.net
+https?:\/\/([^\/]*\.)?phentermine\.arkadasi\.com
+https?:\/\/([^\/]*\.)?phentermine\.asistani\.com
+https?:\/\/([^\/]*\.)?phentermine\.bz
+https?:\/\/([^\/]*\.)?phentermine\.clubpage\.net
+https?:\/\/([^\/]*\.)?phentermine\.esguay\.com
+https?:\/\/([^\/]*\.)?phentermine\.flygande-apor\.com
+https?:\/\/([^\/]*\.)?phentermine\.goodpharm\.info
+https?:\/\/([^\/]*\.)?phentermine\.gotgeeks\.com
+https?:\/\/([^\/]*\.)?phentermine\.hallonsaft\.info
+https?:\/\/([^\/]*\.)?phentermine\.health-livening\.com
+https?:\/\/([^\/]*\.)?phentermine\.on-4\.com
+https?:\/\/([^\/]*\.)?phentermine\.ontspant\.nl
+https?:\/\/([^\/]*\.)?phentermine\.presteert\.nl
+https?:\/\/([^\/]*\.)?phentermine\.skocz\.net
+https?:\/\/([^\/]*\.)?phentermine\.su\.pl
+https?:\/\/([^\/]*\.)?phentermine\.tv
+https?:\/\/([^\/]*\.)?phentermine\.websiam\.net
+https?:\/\/([^\/]*\.)?phentermine2\.freewebsites\.com
+https?:\/\/([^\/]*\.)?phentermine7x\.forumup\.org
+https?:\/\/([^\/]*\.)?phenterminec\.phpbbx\.de
+https?:\/\/([^\/]*\.)?phentermineonline\.ds4a\.com
+https?:\/\/([^\/]*\.)?phentermineonline\.livelog\.com
+https?:\/\/([^\/]*\.)?phentermineq\.host-page\.com
+https?:\/\/([^\/]*\.)?phentermines\.int\.tf
+https?:\/\/([^\/]*\.)?phoenixbrngbrt\.blogspot\.com
+https?:\/\/([^\/]*\.)?phol8\.szm\.sk
+https?:\/\/([^\/]*\.)?phone-service\.newmail\.ru
+https?:\/\/([^\/]*\.)?phones-gsm\.haemati\.be
+https?:\/\/([^\/]*\.)?photo-of-girl-boob\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?photospacefree\.com
+https?:\/\/([^\/]*\.)?phots\.info
+https?:\/\/([^\/]*\.)?phpbbx\.de
+https?:\/\/([^\/]*\.)?phun-org-i08kd\.blogspot\.com
+https?:\/\/([^\/]*\.)?phun-org-ingg0\.blogspot\.com
+https?:\/\/([^\/]*\.)?pi-allyson\.blogspot\.com
+https?:\/\/([^\/]*\.)?pichunter-com-bkfwk\.blogspot\.com
+https?:\/\/([^\/]*\.)?pichunter-com-bzf\.blogspot\.com
+https?:\/\/([^\/]*\.)?pichunter-com-hmmcyoud8\.blogspot\.com
+https?:\/\/([^\/]*\.)?pichunter-com-kesip\.blogspot\.com
+https?:\/\/([^\/]*\.)?picpost-com-e3xqsc6a\.blogspot\.com
+https?:\/\/([^\/]*\.)?picpost-com-eu7refa3s5\.blogspot\.com
+https?:\/\/([^\/]*\.)?picture-cast-on-broken-leg\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?picture-of-gay-guys-fucking\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?picture-of-used-condom\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?picture\.8tt\.org
+https?:\/\/([^\/]*\.)?pictureheaven-com-ri7hn\.blogspot\.com
+https?:\/\/([^\/]*\.)?pictureheaven-com-rw\.blogspot\.com
+https?:\/\/([^\/]*\.)?pictures-free-org-wl0nj\.blogspot\.com
+https?:\/\/([^\/]*\.)?pictures-free-org-wmmkv2w\.blogspot\.com
+https?:\/\/([^\/]*\.)?piggy-soldier\.blogspot\.com
+https?:\/\/([^\/]*\.)?pigtime\.net\.ru
+https?:\/\/([^\/]*\.)?pigxxx-com-ctjj1\.blogspot\.com
+https?:\/\/([^\/]*\.)?pigxxx-com-ge1omxgp20\.blogspot\.com
+https?:\/\/([^\/]*\.)?pigxxx-com-geo8asd1i\.blogspot\.com
+https?:\/\/([^\/]*\.)?pigxxx-com-nevew\.blogspot\.com
+https?:\/\/([^\/]*\.)?pijjyh-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?pillalli\.info
+https?:\/\/([^\/]*\.)?pillnext\.com
+https?:\/\/([^\/]*\.)?pillow\.2x4\.ru
+https?:\/\/([^\/]*\.)?pills-catalog\.com
+https?:\/\/([^\/]*\.)?pills-pharmacy\.us
+https?:\/\/([^\/]*\.)?pills\.007webpro\.com
+https?:\/\/([^\/]*\.)?pills\.siemprelisto\.net
+https?:\/\/([^\/]*\.)?pills1\.org
+https?:\/\/([^\/]*\.)?pillsz\.com
+https?:\/\/([^\/]*\.)?pimpmyblackteen-com-t6ijmwbu\.blogspot\.com
+https?:\/\/([^\/]*\.)?pimpmyblackteen-com-t7d432c\.blogspot\.com
+https?:\/\/([^\/]*\.)?pindosam\.com
+https?:\/\/([^\/]*\.)?pine\.hostonmars\.com
+https?:\/\/([^\/]*\.)?pinkpornstars-com-da3njbu\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkpornstars-com-dnjx\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkpornstars-com-drm\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkworld-com-c84agv\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkworld-com-ci8e6\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkworld-com-ge4k4kmsd\.blogspot\.com
+https?:\/\/([^\/]*\.)?pinkworld-com-kp7s8i5\.blogspot\.com
+https?:\/\/([^\/]*\.)?pino-daniele\.19mb\.info
+https?:\/\/([^\/]*\.)?pinoyteens\.net
+https?:\/\/([^\/]*\.)?piomchel\.jconserv\.net
+https?:\/\/([^\/]*\.)?pisces\.8tt\.org
+https?:\/\/([^\/]*\.)?pitch\.101freehost\.com
+https?:\/\/([^\/]*\.)?pizda4\.com
+https?:\/\/([^\/]*\.)?pizza-hut\.hotmail\.ru
+https?:\/\/([^\/]*\.)?pjim6\.szm\.sk
+https?:\/\/([^\/]*\.)?pjju3\.szm\.sk
+https?:\/\/([^\/]*\.)?pjmykz8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pjryskur-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?pjuibhe\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pkufl\.szm\.sk
+https?:\/\/([^\/]*\.)?place\.sex-jet\.net
+https?:\/\/([^\/]*\.)?planetaacura\.info
+https?:\/\/([^\/]*\.)?planetwatt\.republika\.pl
+https?:\/\/([^\/]*\.)?plastictec\.net
+https?:\/\/([^\/]*\.)?plavix\.coz\.in
+https?:\/\/([^\/]*\.)?plavixbuy\.gameday\.de
+https?:\/\/([^\/]*\.)?plavixbuycheap\.dive\.to
+https?:\/\/([^\/]*\.)?plavixcheap\.hey\.to
+https?:\/\/([^\/]*\.)?plavixcheapgeneric\.go\.to
+https?:\/\/([^\/]*\.)?plavixgeneric\.change\.to
+https?:\/\/([^\/]*\.)?play-777\.com
+https?:\/\/([^\/]*\.)?play-online-casino\.de\.com
+https?:\/\/([^\/]*\.)?play-online-poker\.newmail\.ru
+https?:\/\/([^\/]*\.)?play-station-2-boot-disk\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?playandwinit777\.net
+https?:\/\/([^\/]*\.)?pleasebangmywife-com-i8zdgo1\.blogspot\.com
+https?:\/\/([^\/]*\.)?pleasebangmywife-com-iq\.blogspot\.com
+https?:\/\/([^\/]*\.)?pleasebangmywife-com-koguq\.blogspot\.com
+https?:\/\/([^\/]*\.)?pleasure\.hostonmars\.com
+https?:\/\/([^\/]*\.)?ploob\.blox\.pl
+https?:\/\/([^\/]*\.)?plugkblow\.pornomagnat\.net
+https?:\/\/([^\/]*\.)?plumper69-com-on3664rg\.blogspot\.com
+https?:\/\/([^\/]*\.)?plumper69-com-os4\.blogspot\.com
+https?:\/\/([^\/]*\.)?plumper69-com-sokis\.blogspot\.com
+https?:\/\/([^\/]*\.)?plxn1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pmrd2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pmyk8\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?po-alora\.blogspot\.com
+https?:\/\/([^\/]*\.)?pobpa\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?pocmlaq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?podnos\.stabilt\.se
+https?:\/\/([^\/]*\.)?poeller\.dl\.pl
+https?:\/\/([^\/]*\.)?pogeh\.szm\.sk
+https?:\/\/([^\/]*\.)?pohuym\.jo\.pl
+https?:\/\/([^\/]*\.)?pointyou\.info
+https?:\/\/([^\/]*\.)?poker-0\.com
+https?:\/\/([^\/]*\.)?poker-24x7\.com
+https?:\/\/([^\/]*\.)?poker-4all\.com
+https?:\/\/([^\/]*\.)?poker-7\.com
+https?:\/\/([^\/]*\.)?poker-boulevard\.com
+https?:\/\/([^\/]*\.)?poker-check\.com
+https?:\/\/([^\/]*\.)?poker-new\.com
+https?:\/\/([^\/]*\.)?poker-party-a\.com
+https?:\/\/([^\/]*\.)?poker-places-4u\.net
+https?:\/\/([^\/]*\.)?poker-places\.net
+https?:\/\/([^\/]*\.)?poker-pro\.us
+https?:\/\/([^\/]*\.)?poker-stadium\.com
+https?:\/\/([^\/]*\.)?poker-sys\.com
+https?:\/\/([^\/]*\.)?poker-unique\.com
+https?:\/\/([^\/]*\.)?poker-valley\.com
+https?:\/\/([^\/]*\.)?poker\.black-poker\.com
+https?:\/\/([^\/]*\.)?poker\.land\.ru
+https?:\/\/([^\/]*\.)?poker1table\.chat\.ru
+https?:\/\/([^\/]*\.)?pokera\.web\.com
+https?:\/\/([^\/]*\.)?pokermaniab\.atspace\.com
+https?:\/\/([^\/]*\.)?polex\.com\.cn
+https?:\/\/([^\/]*\.)?police-motorcycle-boot\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?police\.site\.io
+https?:\/\/([^\/]*\.)?polonka\.php5\.cz
+https?:\/\/([^\/]*\.)?polott\.org
+https?:\/\/([^\/]*\.)?polyphonic-ringtoneslsh\.blogspot\.com
+https?:\/\/([^\/]*\.)?polysorb\.myoco\.be
+https?:\/\/([^\/]*\.)?polyurethane-condom\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?pool-table\.hotmail\.ru
+https?:\/\/([^\/]*\.)?poopoovi\.forumculture\.net
+https?:\/\/([^\/]*\.)?pop\.egi\.biz
+https?:\/\/([^\/]*\.)?porn-clip-blog5jc\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-clip-boj\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-clip-om16o\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-movie-clips-blogk8p\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-movie-rj8a7\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-movie-ted\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-movie\.hostingtree\.org
+https?:\/\/([^\/]*\.)?porn-samples\.com
+https?:\/\/([^\/]*\.)?porn-star-clip-info0n0\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-star-movie-clip-newsigj\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-star-video-clip-zone44f\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-teacher\.com
+https?:\/\/([^\/]*\.)?porn-teen-pic\.com
+https?:\/\/([^\/]*\.)?porn-video-clip-bb-bb-f\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-video-clip-gallery-zonehp1\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-video-clips-news5v2\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn-video-jef\.blogspot\.com
+https?:\/\/([^\/]*\.)?porn1clip\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornaccess-com-k58\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornaccess-com-kkd1zvcobi\.blogspot\.com
+https?:\/\/([^\/]*\.)?porndirectory-com-m544ar5z47\.blogspot\.com
+https?:\/\/([^\/]*\.)?porndirectory-com-miyza\.blogspot\.com
+https?:\/\/([^\/]*\.)?porneskimo-com-hizrd2on\.blogspot\.com
+https?:\/\/([^\/]*\.)?porneskimo-com-hr1frq8hrr\.blogspot\.com
+https?:\/\/([^\/]*\.)?porneskimo-d4p5\.blogspot\.com
+https?:\/\/([^\/]*\.)?porneskimo-diheh\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornfreeusa\.info
+https?:\/\/([^\/]*\.)?pornno-com-cdtkjmj\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornno-com-cz5dknpwc\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornogames4\.com
+https?:\/\/([^\/]*\.)?pornoho-com-d7f\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornoho-com-db2ge0p\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstar-com-be1mbdy0l1\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstar-com-bsrzs22gn\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstar-com-nuvor\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstar-dz8j\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarbook-com-ag3477t\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarbook-com-agrpd\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarfinder-net-wp2lsr0\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarfinder-net-wuag8\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstargals-com-tj\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstargals-com-tk7hoxv36\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstars\.hostingtree\.org
+https?:\/\/([^\/]*\.)?pornstarvid-com-dinif\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarvid-com-h5\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornstarvid-com-h8xe\.blogspot\.com
+https?:\/\/([^\/]*\.)?pornweek-com\.isabel\.dtdns\.net
+https?:\/\/([^\/]*\.)?portal777\.com
+https?:\/\/([^\/]*\.)?portalrate\.info
+https?:\/\/([^\/]*\.)?portcityhonda\.info
+https?:\/\/([^\/]*\.)?portly\.byinter\.net
+https?:\/\/([^\/]*\.)?porzo-com-dsmefbsl\.blogspot\.com
+https?:\/\/([^\/]*\.)?porzo-com-gxo\.blogspot\.com
+https?:\/\/([^\/]*\.)?poshlo\.com
+https?:\/\/([^\/]*\.)?postdream\.org
+https?:\/\/([^\/]*\.)?potulnik\.php5\.cz
+https?:\/\/([^\/]*\.)?povicyt\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?powerlevelingweb\.com
+https?:\/\/([^\/]*\.)?pozorvostoka\.250free\.com
+https?:\/\/([^\/]*\.)?pp-shredd\.boom\.ru
+https?:\/\/([^\/]*\.)?pppsp\.szm\.sk
+https?:\/\/([^\/]*\.)?ppuhldv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pqis2\.szm\.sk
+https?:\/\/([^\/]*\.)?prakashcommunication\.com
+https?:\/\/([^\/]*\.)?prama\.info
+https?:\/\/([^\/]*\.)?prasut\.com
+https?:\/\/([^\/]*\.)?prearnha\.dl\.pl
+https?:\/\/([^\/]*\.)?prednisone\.3d-game\.com
+https?:\/\/([^\/]*\.)?prenotazione-albergo-rimini\.host24h\.info
+https?:\/\/([^\/]*\.)?prestito-taranto\.robzz\.info
+https?:\/\/([^\/]*\.)?prettyhair24-7\.blogspot\.com
+https?:\/\/([^\/]*\.)?prettyhotbabes-com-r2lu08uojn\.blogspot\.com
+https?:\/\/([^\/]*\.)?prettyhotbabes-com-rkgrt\.blogspot\.com
+https?:\/\/([^\/]*\.)?prettymob\.com
+https?:\/\/([^\/]*\.)?prevacid\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?price-top\.com
+https?:\/\/([^\/]*\.)?price100\.info
+https?:\/\/([^\/]*\.)?prilosec\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?prilosecbuycheap\.turn\.to
+https?:\/\/([^\/]*\.)?prilosecbuygeneric\.redirect\.to
+https?:\/\/([^\/]*\.)?priloseccheap\.turn\.to
+https?:\/\/([^\/]*\.)?priloseccheapgeneric\.redirect\.to
+https?:\/\/([^\/]*\.)?prilosecgeneric\.come\.to
+https?:\/\/([^\/]*\.)?primer\.fidosoft\.de
+https?:\/\/([^\/]*\.)?primojerky\.cn
+https?:\/\/([^\/]*\.)?primonona\.info
+https?:\/\/([^\/]*\.)?princesscruises\.chat\.ru
+https?:\/\/([^\/]*\.)?princesskariboo\.blogspot\.com
+https?:\/\/([^\/]*\.)?printer\.net\.cn
+https?:\/\/([^\/]*\.)?printingok\.net
+https?:\/\/([^\/]*\.)?private-porn-clip-newsmzm\.blogspot\.com
+https?:\/\/([^\/]*\.)?proactive-facial-product\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?problem-skin\.nm\.ru
+https?:\/\/([^\/]*\.)?problem_skin\.chat\.ru
+https?:\/\/([^\/]*\.)?prodotti-cosmetico\.nnme\.info
+https?:\/\/([^\/]*\.)?projectvoyeur-com-ec15a\.blogspot\.com
+https?:\/\/([^\/]*\.)?projectvoyeur-com-eq2w\.blogspot\.com
+https?:\/\/([^\/]*\.)?projectvoyeur-com-eyyd4q\.blogspot\.com
+https?:\/\/([^\/]*\.)?projectvoyeur-t3j\.blogspot\.com
+https?:\/\/([^\/]*\.)?prom\.createforum\.us
+https?:\/\/([^\/]*\.)?propecia\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?propecia\.esguay\.com
+https?:\/\/([^\/]*\.)?propecia\.skocz\.net
+https?:\/\/([^\/]*\.)?protonixbuy\.stick\.by
+https?:\/\/([^\/]*\.)?protonixbuycheap\.redirect\.to
+https?:\/\/([^\/]*\.)?protonixcheap\.connect\.to
+https?:\/\/([^\/]*\.)?protonixcheapgeneric\.soft-ware\.de
+https?:\/\/([^\/]*\.)?protonixgenericbuy\.cut\.by
+https?:\/\/([^\/]*\.)?provigilweight\.sblog\.cz
+https?:\/\/([^\/]*\.)?prozac\.rx4\.org
+https?:\/\/([^\/]*\.)?prsl4\.szm\.sk
+https?:\/\/([^\/]*\.)?prznic\.dtdns\.net
+https?:\/\/([^\/]*\.)?psfc\.mit\.edu
+https?:\/\/([^\/]*\.)?psmorrison\.blogspot\.com
+https?:\/\/([^\/]*\.)?psnuni\.com
+https?:\/\/([^\/]*\.)?psrq4\.szm\.sk
+https?:\/\/([^\/]*\.)?psychology-degre\.boom\.ru
+https?:\/\/([^\/]*\.)?psychology1degre\.chat\.ru
+https?:\/\/([^\/]*\.)?pszdc\.szm\.sk
+https?:\/\/([^\/]*\.)?ptpm9\.szm\.sk
+https?:\/\/([^\/]*\.)?ptrip\.net
+https?:\/\/([^\/]*\.)?pttqt\.szm\.sk
+https?:\/\/([^\/]*\.)?publicinvasion-com-bhtum2\.blogspot\.com
+https?:\/\/([^\/]*\.)?publicinvasion-com-bj\.blogspot\.com
+https?:\/\/([^\/]*\.)?publicinvasion-com-furok\.blogspot\.com
+https?:\/\/([^\/]*\.)?publicsaftor\.com
+https?:\/\/([^\/]*\.)?pued-com-maxu1g7\.blogspot\.com
+https?:\/\/([^\/]*\.)?pued-com-mf3\.blogspot\.com
+https?:\/\/([^\/]*\.)?pued-com-r0078gie\.blogspot\.com
+https?:\/\/([^\/]*\.)?pued-ox5y12mn7s\.blogspot\.com
+https?:\/\/([^\/]*\.)?puffybet\.sultryserver\.com
+https?:\/\/([^\/]*\.)?pulaskiterm\.info
+https?:\/\/([^\/]*\.)?pulse-squad\.com
+https?:\/\/([^\/]*\.)?pumpthatass-com-a78juz38f2\.blogspot\.com
+https?:\/\/([^\/]*\.)?pumpthatass-com-a7ouybe\.blogspot\.com
+https?:\/\/([^\/]*\.)?pumpthatass-com-xudeb\.blogspot\.com
+https?:\/\/([^\/]*\.)?punguinodoom\.110mb\.com
+https?:\/\/([^\/]*\.)?punjqm0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?punk-ass-bitch-wheatus\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?puppykibble-com-o7\.blogspot\.com
+https?:\/\/([^\/]*\.)?puppykibble-com-oh0w2te3k\.blogspot\.com
+https?:\/\/([^\/]*\.)?puppykibble-com-oqm7hu8d\.blogspot\.com
+https?:\/\/([^\/]*\.)?purextc-com-i8\.blogspot\.com
+https?:\/\/([^\/]*\.)?purextc-com-iy\.blogspot\.com
+https?:\/\/([^\/]*\.)?pussy-ass-bitch\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?pussy-org-kjsb51la\.blogspot\.com
+https?:\/\/([^\/]*\.)?pussy-org-km5\.blogspot\.com
+https?:\/\/([^\/]*\.)?putsta\.com
+https?:\/\/([^\/]*\.)?pvfws\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pvqoa\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pvsiwi7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pvudt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pvzj1\.szm\.sk
+https?:\/\/([^\/]*\.)?pwqx0\.szm\.sk
+https?:\/\/([^\/]*\.)?pymiw\.szm\.sk
+https?:\/\/([^\/]*\.)?pyr0lys1s\.blogspot\.com
+https?:\/\/([^\/]*\.)?pyrebi\.blogspot\.com
+https?:\/\/([^\/]*\.)?pyujxu0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?pzch0\.szm\.sk
+https?:\/\/([^\/]*\.)?pzek6\.szm\.sk
+https?:\/\/([^\/]*\.)?pzif1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?q-n-homemade-sex-video-z\.blogspot\.com
+https?:\/\/([^\/]*\.)?qbzmbwz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qctbue2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qdhr9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qdojv\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?qe-hentai-sex-video-sun\.blogspot\.com
+https?:\/\/([^\/]*\.)?qek-wetplace-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?qfoo7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qgre5\.szm\.sk
+https?:\/\/([^\/]*\.)?qgtdivl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qhiqu\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?qhprfm6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qhyvt\.szm\.sk
+https?:\/\/([^\/]*\.)?qietingqi\.ebloggy\.com
+https?:\/\/([^\/]*\.)?qingpao\.com
+https?:\/\/([^\/]*\.)?qinjq\.szm\.sk
+https?:\/\/([^\/]*\.)?qiqiu\.org
+https?:\/\/([^\/]*\.)?qite-alanna\.blogspot\.com
+https?:\/\/([^\/]*\.)?qjok9\.szm\.sk
+https?:\/\/([^\/]*\.)?qjt230\.com
+https?:\/\/([^\/]*\.)?qjvkvcd\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qklb4\.szm\.sk
+https?:\/\/([^\/]*\.)?qklhtf0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qknfl\.szm\.sk
+https?:\/\/([^\/]*\.)?qknpl\.info
+https?:\/\/([^\/]*\.)?qkpple2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qlpkce6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qltx2\.szm\.sk
+https?:\/\/([^\/]*\.)?qmjrpuo\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qnax1\.szm\.sk
+https?:\/\/([^\/]*\.)?qo-video-porn-gratis-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?qoclick\.com
+https?:\/\/([^\/]*\.)?qoeg6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qojodeh-bdsm-post-video-f\.blogspot\.com
+https?:\/\/([^\/]*\.)?qosmwx9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qpdoc\.com
+https?:\/\/([^\/]*\.)?qqdaj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qqer6\.szm\.sk
+https?:\/\/([^\/]*\.)?qqnbon4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qqwgp\.szm\.sk
+https?:\/\/([^\/]*\.)?qrvkof5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qsc7\.org\.ua
+https?:\/\/([^\/]*\.)?qsskk\.info
+https?:\/\/([^\/]*\.)?qtru3\.szm\.sk
+https?:\/\/([^\/]*\.)?qu-free-latina-sex-vide-wiv\.blogspot\.com
+https?:\/\/([^\/]*\.)?quails\.ipupdater\.us
+https?:\/\/([^\/]*\.)?quandugift\.com
+https?:\/\/([^\/]*\.)?queryguild\.com
+https?:\/\/([^\/]*\.)?quqob\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qutgmzbuje-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?qvewr\.szm\.sk
+https?:\/\/([^\/]*\.)?qvrzi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qvulp\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qwhhmaj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qwrn6\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?qxmk2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?qyda0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qyf99\.com
+https?:\/\/([^\/]*\.)?qypv5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qz\.informs\.com
+https?:\/\/([^\/]*\.)?qzjeqcv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?qzrhj\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?r-t-free-porn-video-clip-c\.blogspot\.com
+https?:\/\/([^\/]*\.)?racelleto\.dl\.pl
+https?:\/\/([^\/]*\.)?racer\.graphforum\.com
+https?:\/\/([^\/]*\.)?racerboc\.ephpbb\.com
+https?:\/\/([^\/]*\.)?rachel-hunter-as-stacys-mom\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?racnelelt\.fr-bb\.com
+https?:\/\/([^\/]*\.)?racoloboc\.graphforum\.com
+https?:\/\/([^\/]*\.)?racoloboc\.highforum\.net
+https?:\/\/([^\/]*\.)?racoloor\.dl\.pl
+https?:\/\/([^\/]*\.)?racrella\.dl\.pl
+https?:\/\/([^\/]*\.)?racsitli\.dl\.pl
+https?:\/\/([^\/]*\.)?ractrcna\.bb-fr\.com
+https?:\/\/([^\/]*\.)?racviget\.blogcu\.com
+https?:\/\/([^\/]*\.)?raezey\.blogspot\.com
+https?:\/\/([^\/]*\.)?raged\.info
+https?:\/\/([^\/]*\.)?rajzhze\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ramandrom\.com
+https?:\/\/([^\/]*\.)?randomlogik\.blogspot\.com
+https?:\/\/([^\/]*\.)?rappture\.blogspot\.com
+https?:\/\/([^\/]*\.)?raruzeol\.jconserv\.net
+https?:\/\/([^\/]*\.)?rate-boob-pic\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?ratonhteroad\.blogspot\.com
+https?:\/\/([^\/]*\.)?rawpussy-b0q\.blogspot\.com
+https?:\/\/([^\/]*\.)?rawpussy-com-t3l\.blogspot\.com
+https?:\/\/([^\/]*\.)?rawpussy-com-tawon6x\.blogspot\.com
+https?:\/\/([^\/]*\.)?raxm2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?razor-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?razor2scooter\.chat\.ru
+https?:\/\/([^\/]*\.)?rboub\.szm\.sk
+https?:\/\/([^\/]*\.)?rdavisinc\.com
+https?:\/\/([^\/]*\.)?re-advertising\.boom\.ru
+https?:\/\/([^\/]*\.)?re\.rutan\.org
+https?:\/\/([^\/]*\.)?readworld\.com
+https?:\/\/([^\/]*\.)?real-gay-sex-story\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?real-ringtoneserd\.blogspot\.com
+https?:\/\/([^\/]*\.)?realitsen\.info
+https?:\/\/([^\/]*\.)?realitypassplus-com-e34pddwt1\.blogspot\.com
+https?:\/\/([^\/]*\.)?realitypassplus-com-e7y\.blogspot\.com
+https?:\/\/([^\/]*\.)?realityporn\.coz\.in
+https?:\/\/([^\/]*\.)?realtimewatches\.info
+https?:\/\/([^\/]*\.)?realtors-x\.com
+https?:\/\/([^\/]*\.)?reboteen5\.blogspot\.com
+https?:\/\/([^\/]*\.)?rebuildsanmateohighschool\.org
+https?:\/\/([^\/]*\.)?recipe4you\.info
+https?:\/\/([^\/]*\.)?recupero-dati-hard-disk\.ll11\.info
+https?:\/\/([^\/]*\.)?redder\.my-wifi\.info
+https?:\/\/([^\/]*\.)?redfxo\.blogspot\.com
+https?:\/\/([^\/]*\.)?redsex4\.info
+https?:\/\/([^\/]*\.)?redtcyw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?reductildrug\.coz\.in
+https?:\/\/([^\/]*\.)?redway-org-d8u\.blogspot\.com
+https?:\/\/([^\/]*\.)?redway-org-dtxz0863\.blogspot\.com
+https?:\/\/([^\/]*\.)?redway-rla\.blogspot\.com
+https?:\/\/([^\/]*\.)?reeringtonesptl\.blogspot\.com
+https?:\/\/([^\/]*\.)?refinance-x\.com
+https?:\/\/([^\/]*\.)?reggdr\.org
+https?:\/\/([^\/]*\.)?regsh\.com
+https?:\/\/([^\/]*\.)?reiw9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rejoicing\.gigsweb\.com
+https?:\/\/([^\/]*\.)?rekara\.com
+https?:\/\/([^\/]*\.)?relagen\.orkan\.yi\.org
+https?:\/\/([^\/]*\.)?relalract\.lolforum\.net
+https?:\/\/([^\/]*\.)?relcadron\.bbgraf\.com
+https?:\/\/([^\/]*\.)?relcoli\.lightbb\.com
+https?:\/\/([^\/]*\.)?relics\.hackers-unite\.info
+https?:\/\/([^\/]*\.)?relmonric\.lolforum\.net
+https?:\/\/([^\/]*\.)?reloading-software\.lycan\.be
+https?:\/\/([^\/]*\.)?relsitelt\.darkbb\.com
+https?:\/\/([^\/]*\.)?relsitrel\.xa\.pl
+https?:\/\/([^\/]*\.)?reltaro\.lolbb\.com
+https?:\/\/([^\/]*\.)?remiza\.dtdns\.net
+https?:\/\/([^\/]*\.)?renova\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?rentbuscompany\.net
+https?:\/\/([^\/]*\.)?rentcarcenter\.com
+https?:\/\/([^\/]*\.)?rentcarok\.org
+https?:\/\/([^\/]*\.)?replacement-batteries\.loretic\.be
+https?:\/\/([^\/]*\.)?repq7\.szm\.sk
+https?:\/\/([^\/]*\.)?rerdiq4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?reshall\.iweb\.bsu\.edu
+https?:\/\/([^\/]*\.)?responderpal\.com
+https?:\/\/([^\/]*\.)?restless-leg--com\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?restless-leg-syndrome-com\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?retin-a\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?retirement1comm\.chat\.ru
+https?:\/\/([^\/]*\.)?returboc\.forumculture\.net
+https?:\/\/([^\/]*\.)?revitolantiaging\.com
+https?:\/\/([^\/]*\.)?rfjn0\.szm\.sk
+https?:\/\/([^\/]*\.)?rgvlg\.szm\.sk
+https?:\/\/([^\/]*\.)?rhdhh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rhinotickets\.com
+https?:\/\/([^\/]*\.)?rhn45\.nokedem\.com
+https?:\/\/([^\/]*\.)?rhodeislandmortgage-x\.com
+https?:\/\/([^\/]*\.)?rhooh\.flnet\.org
+https?:\/\/([^\/]*\.)?ri-hardcore-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?ricacelco\.dl\.pl
+https?:\/\/([^\/]*\.)?ricaldneu\.fr-bb\.com
+https?:\/\/([^\/]*\.)?riceltleto\.dl\.pl
+https?:\/\/([^\/]*\.)?ricetta-cucina\.host24h\.info
+https?:\/\/([^\/]*\.)?rich-r\.blogspot\.com
+https?:\/\/([^\/]*\.)?richards-realm-com-c4h\.blogspot\.com
+https?:\/\/([^\/]*\.)?richards-realm-com-cs\.blogspot\.com
+https?:\/\/([^\/]*\.)?riclarol\.dl\.pl
+https?:\/\/([^\/]*\.)?ricostruzione-unghia\.hostzz\.info
+https?:\/\/([^\/]*\.)?ricrelnel\.frbb\.net
+https?:\/\/([^\/]*\.)?rictaget\.uy\.pl
+https?:\/\/([^\/]*\.)?rictrocvar\.zikforum\.com
+https?:\/\/([^\/]*\.)?riczelur\.forumzen\.com
+https?:\/\/([^\/]*\.)?ridiaulctions\.blogspot\.com
+https?:\/\/([^\/]*\.)?right-leg-swelling\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?rigour\.info
+https?:\/\/([^\/]*\.)?rijulina\.dl\.pl
+https?:\/\/([^\/]*\.)?ring-tonecti\.blogspot\.com
+https?:\/\/([^\/]*\.)?ring2man\.chat\.ru
+https?:\/\/([^\/]*\.)?ring4man\.chat\.ru
+https?:\/\/([^\/]*\.)?ring4tel\.com
+https?:\/\/([^\/]*\.)?ringg\.info
+https?:\/\/([^\/]*\.)?ringtones-4phone\.com
+https?:\/\/([^\/]*\.)?ringtones-dir\.com
+https?:\/\/([^\/]*\.)?ringtones-dir\.net
+https?:\/\/([^\/]*\.)?ringtones-for-a-samsungtwt\.blogspot\.com
+https?:\/\/([^\/]*\.)?ringtones-rate\.com
+https?:\/\/([^\/]*\.)?ringtones\.blogharbor\.com
+https?:\/\/([^\/]*\.)?ringts\.269g\.net
+https?:\/\/([^\/]*\.)?risajno\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?risque-sexy-plus-size-lingerie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?rit\.edu
+https?:\/\/([^\/]*\.)?ritalin-without-prescription\.contact\.cc
+https?:\/\/([^\/]*\.)?ritalin\.myvnc\.com
+https?:\/\/([^\/]*\.)?river-road-motorcycle-boot\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?river\.greatfreehosting\.com
+https?:\/\/([^\/]*\.)?rivotril\.int\.tf
+https?:\/\/([^\/]*\.)?rm-ast-pants\.blogspot\.com
+https?:\/\/([^\/]*\.)?rmsq9\.szm\.sk
+https?:\/\/([^\/]*\.)?rmuuur3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rndk1\.szm\.sk
+https?:\/\/([^\/]*\.)?rnmg6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ro-westin\.blogspot\.com
+https?:\/\/([^\/]*\.)?robotqueen\.250free\.com
+https?:\/\/([^\/]*\.)?rochili\.alkablog\.com
+https?:\/\/([^\/]*\.)?rodar6or6\.dl\.pl
+https?:\/\/([^\/]*\.)?rodvww7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rogetou\.dl\.pl
+https?:\/\/([^\/]*\.)?rojeracr\.forumzen\.com
+https?:\/\/([^\/]*\.)?roketplanet\.weedns\.com
+https?:\/\/([^\/]*\.)?rokminric\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?rokzecdok\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?rolccna\.dl\.pl
+https?:\/\/([^\/]*\.)?rolcnac\.td\.pl
+https?:\/\/([^\/]*\.)?rolex\.heberg-forum\.net
+https?:\/\/([^\/]*\.)?rolexreplica\.269g\.net
+https?:\/\/([^\/]*\.)?rolica\.blogcu\.com
+https?:\/\/([^\/]*\.)?rollaolo\.blogcu\.com
+https?:\/\/([^\/]*\.)?rollatobas\.naturalforum\.net
+https?:\/\/([^\/]*\.)?rolracboc\.bb-fr\.com
+https?:\/\/([^\/]*\.)?roltrsit\.bbfr\.net
+https?:\/\/([^\/]*\.)?rom\.dl\.pl
+https?:\/\/([^\/]*\.)?romahotel\.org
+https?:\/\/([^\/]*\.)?romandie\.com
+https?:\/\/([^\/]*\.)?romanticmaui\.net
+https?:\/\/([^\/]*\.)?room-house\.jeepsyc\.be
+https?:\/\/([^\/]*\.)?root\.dns\.bz
+https?:\/\/([^\/]*\.)?roouvar\.dl\.pl
+https?:\/\/([^\/]*\.)?roricdom\.lightbb\.com
+https?:\/\/([^\/]*\.)?roseofgold52\.50webs\.com
+https?:\/\/([^\/]*\.)?rotl\.info
+https?:\/\/([^\/]*\.)?rotrocrol\.darkbb\.com
+https?:\/\/([^\/]*\.)?roundandbrown-com-bkb03g0hi\.blogspot\.com
+https?:\/\/([^\/]*\.)?roundandbrown-com-kp04\.blogspot\.com
+https?:\/\/([^\/]*\.)?roundandbrown-com-wqzj337l\.blogspot\.com
+https?:\/\/([^\/]*\.)?roundandbrown-com-wus56c\.blogspot\.com
+https?:\/\/([^\/]*\.)?routan\.org
+https?:\/\/([^\/]*\.)?roxyobsessed7\.blogspot\.com
+https?:\/\/([^\/]*\.)?rphqj\.szm\.sk
+https?:\/\/([^\/]*\.)?rqhdnj4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rqpwn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rrefr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rrgr4\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?rrlive\.info
+https?:\/\/([^\/]*\.)?rrsfmw7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rseo7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?rshu2\.szm\.sk
+https?:\/\/([^\/]*\.)?rsmy8\.szm\.sk
+https?:\/\/([^\/]*\.)?rthl0\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?rtugwoy\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ruanjian\.cwrjcn\.com
+https?:\/\/([^\/]*\.)?rucowdena\.ifrance\.com
+https?:\/\/([^\/]*\.)?rudecomputing\.com
+https?:\/\/([^\/]*\.)?rudu-adam\.blogspot\.com
+https?:\/\/([^\/]*\.)?ruimingwei\.com\.cn
+https?:\/\/([^\/]*\.)?rulurbuc\.forumzen\.com
+https?:\/\/([^\/]*\.)?runutr\.forumzen\.com
+https?:\/\/([^\/]*\.)?russiannudesgirlszxa\.blogspot\.com
+https?:\/\/([^\/]*\.)?russiapreteen\.com
+https?:\/\/([^\/]*\.)?russiavista\.sitiasp\.it
+https?:\/\/([^\/]*\.)?rwfe5\.szm\.sk
+https?:\/\/([^\/]*\.)?rxdate\.net
+https?:\/\/([^\/]*\.)?rxdfh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ryehfpz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ryhgsb\.com
+https?:\/\/([^\/]*\.)?ryryj\.szm\.sk
+https?:\/\/([^\/]*\.)?ryu-jounetsu\.blogspot\.com
+https?:\/\/([^\/]*\.)?rzwj8\.szm\.sk
+https?:\/\/([^\/]*\.)?s-r-free-porn-movie-clip-x\.blogspot\.com
+https?:\/\/([^\/]*\.)?s1xbucksamonkey\.blogspot\.com
+https?:\/\/([^\/]*\.)?s32\.bilsay\.com
+https?:\/\/([^\/]*\.)?saaaaa\.52blog\.net
+https?:\/\/([^\/]*\.)?safety-product\.hotmail\.ru
+https?:\/\/([^\/]*\.)?safety-product\.pochta\.ru
+https?:\/\/([^\/]*\.)?safety_product\.chat\.ru
+https?:\/\/([^\/]*\.)?sahezzz\.blogspot\.com
+https?:\/\/([^\/]*\.)?saibon\.com\.cn
+https?:\/\/([^\/]*\.)?sakura-watanuki\.blogspot\.com
+https?:\/\/([^\/]*\.)?salewroughtiron\.cn
+https?:\/\/([^\/]*\.)?sample-porn-clip-newst1x\.blogspot\.com
+https?:\/\/([^\/]*\.)?sample-porn-clip-zoneapa\.blogspot\.com
+https?:\/\/([^\/]*\.)?samsung-ringtonedta\.blogspot\.com
+https?:\/\/([^\/]*\.)?sand-stars\.blogspot\.com
+https?:\/\/([^\/]*\.)?sandra-teen-model-qux\.blogspot\.com
+https?:\/\/([^\/]*\.)?sangrandy\.com
+https?:\/\/([^\/]*\.)?sanhy\.com
+https?:\/\/([^\/]*\.)?sanpaulo\.flnet\.org
+https?:\/\/([^\/]*\.)?santjhon\.php5\.cz
+https?:\/\/([^\/]*\.)?sapphiceroticacom\.klose\.ipupdater\.com
+https?:\/\/([^\/]*\.)?sapphicparadise-com-r00asy\.blogspot\.com
+https?:\/\/([^\/]*\.)?sarobo\.com
+https?:\/\/([^\/]*\.)?satellite-tv\.hotmail\.ru
+https?:\/\/([^\/]*\.)?sauna-eq\.boom\.ru
+https?:\/\/([^\/]*\.)?sauna-heater\.boom\.ru
+https?:\/\/([^\/]*\.)?sauna-kit\.boom\.ru
+https?:\/\/([^\/]*\.)?sauna-room\.boom\.ru
+https?:\/\/([^\/]*\.)?saunaguide\.org
+https?:\/\/([^\/]*\.)?save-on-auto-insurance\.info
+https?:\/\/([^\/]*\.)?saved\.ddns\.info
+https?:\/\/([^\/]*\.)?sbarzn3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?scanthenet\.com
+https?:\/\/([^\/]*\.)?scat-fetish-story\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?school-driving\.info
+https?:\/\/([^\/]*\.)?school-girl-butt\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?school2home\.chat\.ru
+https?:\/\/([^\/]*\.)?sciensezero\.republika\.pl
+https?:\/\/([^\/]*\.)?scnh6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?scooter11\.chat\.ru
+https?:\/\/([^\/]*\.)?scooter2\.hotmail\.ru
+https?:\/\/([^\/]*\.)?screwedupmovies-com-a5wj\.blogspot\.com
+https?:\/\/([^\/]*\.)?screwedupmovies-com-ax\.blogspot\.com
+https?:\/\/([^\/]*\.)?scripts-cert\.mit\.edu
+https?:\/\/([^\/]*\.)?scscj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sdao7\.szm\.sk
+https?:\/\/([^\/]*\.)?sdfr0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sdfsfssss\.com
+https?:\/\/([^\/]*\.)?se4u\.net
+https?:\/\/([^\/]*\.)?seafordmed\.info
+https?:\/\/([^\/]*\.)?seainsurancegroup\.info
+https?:\/\/([^\/]*\.)?search4sex\.us
+https?:\/\/([^\/]*\.)?searchbigtits-com-apxd1hwatd\.blogspot\.com
+https?:\/\/([^\/]*\.)?searchbigtits-com-obraj\.blogspot\.com
+https?:\/\/([^\/]*\.)?searcheng\.com
+https?:\/\/([^\/]*\.)?searcheon\.com
+https?:\/\/([^\/]*\.)?searchgalleries-com-i7\.blogspot\.com
+https?:\/\/([^\/]*\.)?searchgalleries-com-ib2bi6on5\.blogspot\.com
+https?:\/\/([^\/]*\.)?searchgals-com-gu1810j\.blogspot\.com
+https?:\/\/([^\/]*\.)?searcholdies-com-msa\.blogspot\.com
+https?:\/\/([^\/]*\.)?searchsuperhit\.com
+https?:\/\/([^\/]*\.)?searchvids-com-h47g8mf\.blogspot\.com
+https?:\/\/([^\/]*\.)?seasonale\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?secure-network\.info
+https?:\/\/([^\/]*\.)?seeallhomes\.com
+https?:\/\/([^\/]*\.)?seeallnatural\.com
+https?:\/\/([^\/]*\.)?seeallsite\.com
+https?:\/\/([^\/]*\.)?seecomplete\.com
+https?:\/\/([^\/]*\.)?seehersquirt-com-k0\.blogspot\.com
+https?:\/\/([^\/]*\.)?seehersquirt-com-k3\.blogspot\.com
+https?:\/\/([^\/]*\.)?seekcounty\.com
+https?:\/\/([^\/]*\.)?seeyo\.info
+https?:\/\/([^\/]*\.)?segbqj1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sege-addison\.blogspot\.com
+https?:\/\/([^\/]*\.)?seho-aiyana\.blogspot\.com
+https?:\/\/([^\/]*\.)?sekapad\.info
+https?:\/\/([^\/]*\.)?sekbad\.info
+https?:\/\/([^\/]*\.)?selfbuying\.com
+https?:\/\/([^\/]*\.)?semarqua\.dl\.pl
+https?:\/\/([^\/]*\.)?senapier\.dl\.pl
+https?:\/\/([^\/]*\.)?send-flowers\.acb\.pl
+https?:\/\/([^\/]*\.)?sendon\.net\.cn
+https?:\/\/([^\/]*\.)?senlu\.com
+https?:\/\/([^\/]*\.)?sensorscity\.marshall\.edu
+https?:\/\/([^\/]*\.)?seo\.ohsu\.edu
+https?:\/\/([^\/]*\.)?seo88\.com
+https?:\/\/([^\/]*\.)?seomdahi\.jconserv\.net
+https?:\/\/([^\/]*\.)?seozone\.net
+https?:\/\/([^\/]*\.)?seranton\.blogspot\.com
+https?:\/\/([^\/]*\.)?sercheng\.com
+https?:\/\/([^\/]*\.)?serchlid\.com
+https?:\/\/([^\/]*\.)?serious-skin\.boom\.ru
+https?:\/\/([^\/]*\.)?serts\.blogshot\.nl
+https?:\/\/([^\/]*\.)?servemp3\.com
+https?:\/\/([^\/]*\.)?serversolutions\.us
+https?:\/\/([^\/]*\.)?servitch\.com
+https?:\/\/([^\/]*\.)?ses1\.info
+https?:\/\/([^\/]*\.)?sestrenish\.biografi\.org
+https?:\/\/([^\/]*\.)?setara\.dl\.pl
+https?:\/\/([^\/]*\.)?seventeenlive-com-bado3i\.blogspot\.com
+https?:\/\/([^\/]*\.)?seventeenlive-com-bmg\.blogspot\.com
+https?:\/\/([^\/]*\.)?seventeenlive-com-h4dw652dzl\.blogspot\.com
+https?:\/\/([^\/]*\.)?severnfollow\.info
+https?:\/\/([^\/]*\.)?sevtentoe\.blogspot\.com
+https?:\/\/([^\/]*\.)?sewingmachinesusa\.com
+https?:\/\/([^\/]*\.)?sex--x\.com
+https?:\/\/([^\/]*\.)?sex-clip-ce872\.blogspot\.com
+https?:\/\/([^\/]*\.)?sex-dating\.sexnation\.info
+https?:\/\/([^\/]*\.)?sex-movie-e8qbm\.blogspot\.com
+https?:\/\/([^\/]*\.)?sex-movie-qig\.blogspot\.com
+https?:\/\/([^\/]*\.)?sex-video-clip-haq3r\.blogspot\.com
+https?:\/\/([^\/]*\.)?sex-video-juz\.blogspot\.com
+https?:\/\/([^\/]*\.)?sex-without-condom\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?sex-woman-only-fuck\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?sex-xxx-free\.100freemb\.com
+https?:\/\/([^\/]*\.)?sex\.yeahost\.com
+https?:\/\/([^\/]*\.)?sex1movie\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexadultdating\.com
+https?:\/\/([^\/]*\.)?sexape-bpb0\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexape-com-chdaj7\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexape-com-cz4z44iud3\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexape-com-kw7623jxvd\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexape-com-qipil\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexape-mte7jm\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexdirectory-com-tbt0\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexegirls\.net
+https?:\/\/([^\/]*\.)?sexgrannies-com-d17v0sa\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexgrannies-com-dvg3lh0\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexmaxx-com-w2aoe7q\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexmaxx-com-w7\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexmaxx-com-wy23e2588\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexmaxx-kvhilzx76\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexnemo-com-joxud\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexnemo-com-r7iv5\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexnemo-com-rpj18ot\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexo-anal-teen\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?sexoasis-a00r68ac\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexoasis-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexoasis-hkz6z4fmr6\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-com-e2zci5\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-com-ew426c7qej\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-com-itvux\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-com-r6fjn1dz\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean-ibf53b\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexocean000\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexy-ass-and-leg\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?sexy-blonde-big-tit\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?sexy-busty-hot\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?sexy-knee-high-boot\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?sexy-leg-xxx\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?sexy-lesbian-having-sex\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?sexy-models-net-g13hqljr0\.blogspot\.com
+https?:\/\/([^\/]*\.)?sexy-teacher\.net
+https?:\/\/([^\/]*\.)?sexy\.dastish\.org
+https?:\/\/([^\/]*\.)?sexyst\.info
+https?:\/\/([^\/]*\.)?sfjo7\.szm\.sk
+https?:\/\/([^\/]*\.)?sftic\.szm\.sk
+https?:\/\/([^\/]*\.)?sfzone\.cn
+https?:\/\/([^\/]*\.)?sgkr3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?shaffelrecords\.com
+https?:\/\/([^\/]*\.)?shahang\.net
+https?:\/\/([^\/]*\.)?shakira-pa3t\.blogspot\.com
+https?:\/\/([^\/]*\.)?shakirafortner\.hostingweb\.us
+https?:\/\/([^\/]*\.)?shampoo\.moistri\.be
+https?:\/\/([^\/]*\.)?shavedgoat-com-hlfai1dvfb\.blogspot\.com
+https?:\/\/([^\/]*\.)?shbuscenter\.com
+https?:\/\/([^\/]*\.)?shcarcenter\.com
+https?:\/\/([^\/]*\.)?shdianjiang\.cn
+https?:\/\/([^\/]*\.)?sheji\.paim123\.com
+https?:\/\/([^\/]*\.)?shemale-action\.net
+https?:\/\/([^\/]*\.)?shemale-ebony-fuck\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?shemale-fuck-guys-com\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?shemale-no-cock\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?shemalefuckguy\.isabel\.dtdns\.net
+https?:\/\/([^\/]*\.)?shemales\.coz\.in
+https?:\/\/([^\/]*\.)?shemp-com-k1yng8\.blogspot\.com
+https?:\/\/([^\/]*\.)?shemp-com-kcutd\.blogspot\.com
+https?:\/\/([^\/]*\.)?shemp-com-zuhig\.blogspot\.com
+https?:\/\/([^\/]*\.)?shenzhenjp\.com
+https?:\/\/([^\/]*\.)?shesexy-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy-com-i1xf\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy-com-rugok\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy-com-w0dffbvzz\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy-gogub\.blogspot\.com
+https?:\/\/([^\/]*\.)?shesexy000\.blogspot\.com
+https?:\/\/([^\/]*\.)?shetelel\.jconserv\.net
+https?:\/\/([^\/]*\.)?shexpo2010\.com
+https?:\/\/([^\/]*\.)?shijiren\.com
+https?:\/\/([^\/]*\.)?shinylights\.org
+https?:\/\/([^\/]*\.)?shipeng\.net
+https?:\/\/([^\/]*\.)?shmoorge\.tripod\.com
+https?:\/\/([^\/]*\.)?shoesnike\.cn
+https?:\/\/([^\/]*\.)?shoesorder\.biz
+https?:\/\/([^\/]*\.)?shoesshop\.biz
+https?:\/\/([^\/]*\.)?shop24x7\.net
+https?:\/\/([^\/]*\.)?short-porn-clip-news8rj\.blogspot\.com
+https?:\/\/([^\/]*\.)?shoujicaixin\.com
+https?:\/\/([^\/]*\.)?shplaycenter\.cn
+https?:\/\/([^\/]*\.)?shredder-4paper\.boom\.ru
+https?:\/\/([^\/]*\.)?shredder-paper\.boom\.ru
+https?:\/\/([^\/]*\.)?shredder\.boom\.ru
+https?:\/\/([^\/]*\.)?shredder4paper\.chat\.ru
+https?:\/\/([^\/]*\.)?shrentcar\.com
+https?:\/\/([^\/]*\.)?shrudant\.jconserv\.net
+https?:\/\/([^\/]*\.)?shticketcenter\.com
+https?:\/\/([^\/]*\.)?shtiklmiaou\.fizwig\.com
+https?:\/\/([^\/]*\.)?shtranslate\.com
+https?:\/\/([^\/]*\.)?shufflequince\.org
+https?:\/\/([^\/]*\.)?siamforum\.com
+https?:\/\/([^\/]*\.)?siek2\.szm\.sk
+https?:\/\/([^\/]*\.)?sifa600\.com
+https?:\/\/([^\/]*\.)?sigla-cartoni-animati\.19mb\.info
+https?:\/\/([^\/]*\.)?sijalik\.blogspot\.com
+https?:\/\/([^\/]*\.)?sik-sapphicparadise-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?sildenafil-citrate\.perso\.tc
+https?:\/\/([^\/]*\.)?siliconpulse\.info
+https?:\/\/([^\/]*\.)?silly-n\.blogspot\.com
+https?:\/\/([^\/]*\.)?simply-gamine\.hostingweb\.us
+https?:\/\/([^\/]*\.)?simtershrapnel\.blogspot\.com
+https?:\/\/([^\/]*\.)?sinbiom\.blogspot\.com
+https?:\/\/([^\/]*\.)?sindyhalliday\.com
+https?:\/\/([^\/]*\.)?sinequanwithdrawal\.sblog\.cz
+https?:\/\/([^\/]*\.)?sineto\.net
+https?:\/\/([^\/]*\.)?sinfulcurves-com-obh\.blogspot\.com
+https?:\/\/([^\/]*\.)?singova\.org
+https?:\/\/([^\/]*\.)?siq-xxlmovies-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?sirloincentury\.org
+https?:\/\/([^\/]*\.)?sisus\.org
+https?:\/\/([^\/]*\.)?sitacsit\.goodforum\.net
+https?:\/\/([^\/]*\.)?sitacsit\.grafbb\.com
+https?:\/\/([^\/]*\.)?sitchi-or\.xa\.pl
+https?:\/\/([^\/]*\.)?sitdelcna\.lightbb\.com
+https?:\/\/([^\/]*\.)?sitdelta\.jc\.pl
+https?:\/\/([^\/]*\.)?sitdeltroc\.bbfr\.net
+https?:\/\/([^\/]*\.)?site\.voila\.fr
+https?:\/\/([^\/]*\.)?siteapts\.info
+https?:\/\/([^\/]*\.)?sitedating\.org
+https?:\/\/([^\/]*\.)?sitel\.goodforum\.net
+https?:\/\/([^\/]*\.)?sitel\.grafbb\.com
+https?:\/\/([^\/]*\.)?sitladar\.dl\.pl
+https?:\/\/([^\/]*\.)?sitorsit\.discutfree\.com
+https?:\/\/([^\/]*\.)?sittazel\.bb-fr\.com
+https?:\/\/([^\/]*\.)?sj-qh\.com
+https?:\/\/([^\/]*\.)?sjzwz\.com
+https?:\/\/([^\/]*\.)?skbrql5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?skelaxin\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?skelaxin800mg\.sblog\.cz
+https?:\/\/([^\/]*\.)?skin-care-tip\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-care\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?skin-diseas\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-disease\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-disease\.fromru\.com
+https?:\/\/([^\/]*\.)?skin-disease\.newmail\.ru
+https?:\/\/([^\/]*\.)?skin-product\.hotmail\.ru
+https?:\/\/([^\/]*\.)?skin-treat\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-treatm\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-treatment\.boom\.ru
+https?:\/\/([^\/]*\.)?skin-trt\.boom\.ru
+https?:\/\/([^\/]*\.)?skin1-disease\.boom\.ru
+https?:\/\/([^\/]*\.)?skin1disease\.chat\.ru
+https?:\/\/([^\/]*\.)?skin1tip4care\.chat\.ru
+https?:\/\/([^\/]*\.)?skin1treatment\.chat\.ru
+https?:\/\/([^\/]*\.)?skin_product\.chat\.ru
+https?:\/\/([^\/]*\.)?skincare\.ixdm\.info
+https?:\/\/([^\/]*\.)?skodasite\.info
+https?:\/\/([^\/]*\.)?skvonk\.blogspot\.com
+https?:\/\/([^\/]*\.)?skvvdm2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sleep-aids\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?sleepingsex\.coz\.in
+https?:\/\/([^\/]*\.)?slickgalleries-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?slickgalleries-com-acf4a01s86\.blogspot\.com
+https?:\/\/([^\/]*\.)?slots-wiki\.com
+https?:\/\/([^\/]*\.)?slutsvideos-com-mwnyvb2\.blogspot\.com
+https?:\/\/([^\/]*\.)?smack-dvd\.mutogen\.be
+https?:\/\/([^\/]*\.)?smackinghotlips\.blogspot\.com
+https?:\/\/([^\/]*\.)?smal\.php5\.cz
+https?:\/\/([^\/]*\.)?small-bubble-butt\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?smart\.45\.kg
+https?:\/\/([^\/]*\.)?smbay\.cn
+https?:\/\/([^\/]*\.)?smithtownelementarypta\.org
+https?:\/\/([^\/]*\.)?smkpe\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?smlwqj2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?smnvapnd-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?smolyak\.isuisse\.com
+https?:\/\/([^\/]*\.)?sms\.bjicp\.net
+https?:\/\/([^\/]*\.)?smsdown\.blogbus\.com
+https?:\/\/([^\/]*\.)?smut-house-com-c6t8hcv1be\.blogspot\.com
+https?:\/\/([^\/]*\.)?smutgremlins-com-a46sull\.blogspot\.com
+https?:\/\/([^\/]*\.)?smutgremlins-com-w6d7m6ji\.blogspot\.com
+https?:\/\/([^\/]*\.)?smutmaestro\.net
+https?:\/\/([^\/]*\.)?snafusurfer\.net
+https?:\/\/([^\/]*\.)?snakesworld-com-bye\.blogspot\.com
+https?:\/\/([^\/]*\.)?sneakercool\.com
+https?:\/\/([^\/]*\.)?sneakernice\.com
+https?:\/\/([^\/]*\.)?sneck\.info
+https?:\/\/([^\/]*\.)?snkfbl1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?snmcq\.szm\.sk
+https?:\/\/([^\/]*\.)?snorting-ritalin\.contact\.cc
+https?:\/\/([^\/]*\.)?snymk\.szm\.sk
+https?:\/\/([^\/]*\.)?so-big-tit-video-clip-kos\.blogspot\.com
+https?:\/\/([^\/]*\.)?so-home-sex-clip-god\.blogspot\.com
+https?:\/\/([^\/]*\.)?so-so-young-com-kk727o82n\.blogspot\.com
+https?:\/\/([^\/]*\.)?so1di\.info
+https?:\/\/([^\/]*\.)?soafacil\.com
+https?:\/\/([^\/]*\.)?socalmovies-com-enr61t\.blogspot\.com
+https?:\/\/([^\/]*\.)?socalmovies-com-oy08pp72i\.blogspot\.com
+https?:\/\/([^\/]*\.)?soccer-mom-sticker\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?socialsciencedeg\.chat\.ru
+https?:\/\/([^\/]*\.)?socsci\.mccneb\.edu
+https?:\/\/([^\/]*\.)?sodo0\.szm\.sk
+https?:\/\/([^\/]*\.)?sofiefie\.blogspot\.com
+https?:\/\/([^\/]*\.)?soft17-com-d1577f\.blogspot\.com
+https?:\/\/([^\/]*\.)?softcore-erotica\.net
+https?:\/\/([^\/]*\.)?software-engine\.org
+https?:\/\/([^\/]*\.)?softwarematrix\.org
+https?:\/\/([^\/]*\.)?sohardcore-com-r56bt\.blogspot\.com
+https?:\/\/([^\/]*\.)?soho0\.szm\.sk
+https?:\/\/([^\/]*\.)?solacemysoul\.blogspot\.com
+https?:\/\/([^\/]*\.)?solder\.lowestprices\.at
+https?:\/\/([^\/]*\.)?soler\.net\.cn
+https?:\/\/([^\/]*\.)?sologals-com-hs2xad\.blogspot\.com
+https?:\/\/([^\/]*\.)?sologals-grr5g3\.blogspot\.com
+https?:\/\/([^\/]*\.)?soma\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?soma\.homelinux\.com
+https?:\/\/([^\/]*\.)?soma\.int\.tf
+https?:\/\/([^\/]*\.)?soma\.php5\.cz
+https?:\/\/([^\/]*\.)?soma1\.skocz\.net
+https?:\/\/([^\/]*\.)?someshit\.ru
+https?:\/\/([^\/]*\.)?somqyxli-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?sonata\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?sonr4\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?sotremont\.ru
+https?:\/\/([^\/]*\.)?soulswallo\.blogspot\.com
+https?:\/\/([^\/]*\.)?soundandmossl\.com
+https?:\/\/([^\/]*\.)?southcarolinamortgage-x\.com
+https?:\/\/([^\/]*\.)?southdakotamortgage-x\.com
+https?:\/\/([^\/]*\.)?southtecrepair\.com
+https?:\/\/([^\/]*\.)?spacedim68\.blogspot\.com
+https?:\/\/([^\/]*\.)?spamim\.net
+https?:\/\/([^\/]*\.)?spawww\.info
+https?:\/\/([^\/]*\.)?spcw3\.szm\.sk
+https?:\/\/([^\/]*\.)?special-ringtones\.net
+https?:\/\/([^\/]*\.)?specific911\.biz
+https?:\/\/([^\/]*\.)?specific911\.org
+https?:\/\/([^\/]*\.)?speed-casino\.com
+https?:\/\/([^\/]*\.)?speens\.pass\.as
+https?:\/\/([^\/]*\.)?spermicide-trojan-condom\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?spermshack-al\.blogspot\.com
+https?:\/\/([^\/]*\.)?spermshack-com-bef\.blogspot\.com
+https?:\/\/([^\/]*\.)?spermshack-com-gee1\.blogspot\.com
+https?:\/\/([^\/]*\.)?spermshack-com-gtafrogps\.blogspot\.com
+https?:\/\/([^\/]*\.)?spermshack-g01u1\.blogspot\.com
+https?:\/\/([^\/]*\.)?spewie-com-mbntjlrkk\.blogspot\.com
+https?:\/\/([^\/]*\.)?spfwq\.zhengstar\.com
+https?:\/\/([^\/]*\.)?spice-girlpkg\.blogspot\.com
+https?:\/\/([^\/]*\.)?spirit-of-llama\.blogspot\.com
+https?:\/\/([^\/]*\.)?spirit-psyki\.ifrance\.com
+https?:\/\/([^\/]*\.)?spiserch\.com
+https?:\/\/([^\/]*\.)?splashka\.xhostar\.com
+https?:\/\/([^\/]*\.)?splendid-casino\.com
+https?:\/\/([^\/]*\.)?spoilzone\.epinoy\.com
+https?:\/\/([^\/]*\.)?spqi6\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?sprint-ringtonenot\.blogspot\.com
+https?:\/\/([^\/]*\.)?sprintringtonesxvt\.blogspot\.com
+https?:\/\/([^\/]*\.)?sprintringtoneuad\.blogspot\.com
+https?:\/\/([^\/]*\.)?spstestfree\.com\.com
+https?:\/\/([^\/]*\.)?spunkmonster\.net
+https?:\/\/([^\/]*\.)?spwnk\.szm\.sk
+https?:\/\/([^\/]*\.)?spxqly9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?spyware-adware-killer\.com
+https?:\/\/([^\/]*\.)?sqoi8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?squall\.my10gb\.com
+https?:\/\/([^\/]*\.)?sqvde\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sralua\.com
+https?:\/\/([^\/]*\.)?srarware\.com
+https?:\/\/([^\/]*\.)?srkyyca\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?srtongje\.republika\.pl
+https?:\/\/([^\/]*\.)?sruqsz3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ssdcard\.info
+https?:\/\/([^\/]*\.)?sslive\.info
+https?:\/\/([^\/]*\.)?sspwye7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sswingersss-777\.tripod\.com
+https?:\/\/([^\/]*\.)?st-pharmacy\.com
+https?:\/\/([^\/]*\.)?staa8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?staff\.jccc\.edu
+https?:\/\/([^\/]*\.)?stainlesssteelpipe\.net
+https?:\/\/([^\/]*\.)?stampa-foto-digitale\.ll11\.info
+https?:\/\/([^\/]*\.)?starcelebs-com-ewe5\.blogspot\.com
+https?:\/\/([^\/]*\.)?starcelebs-com-i3a2mxf\.blogspot\.com
+https?:\/\/([^\/]*\.)?starcelebs-wihuk\.blogspot\.com
+https?:\/\/([^\/]*\.)?starryland\.com\.cn
+https?:\/\/([^\/]*\.)?startchicks\.info
+https?:\/\/([^\/]*\.)?state-gay-marriage-legal\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?state-of-germany\.com
+https?:\/\/([^\/]*\.)?statisticpal\.com
+https?:\/\/([^\/]*\.)?stcc9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?steeen-s-bl\.blogspot\.com
+https?:\/\/([^\/]*\.)?steel-table-leg\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?stocking-fetish-video\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?stocking-movies-com-du1\.blogspot\.com
+https?:\/\/([^\/]*\.)?stocking-tease-b7gl\.blogspot\.com
+https?:\/\/([^\/]*\.)?stocking-tease-com-bm6h145g\.blogspot\.com
+https?:\/\/([^\/]*\.)?stockings\.coz\.in
+https?:\/\/([^\/]*\.)?stop-smoking\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?stpetersburg\.it
+https?:\/\/([^\/]*\.)?stphipps\.dl\.pl
+https?:\/\/([^\/]*\.)?strakac\.dtdns\.net
+https?:\/\/([^\/]*\.)?strange-bizarre-things\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?stranieriinitalia\.org
+https?:\/\/([^\/]*\.)?straponpost\.net
+https?:\/\/([^\/]*\.)?street-poker\.com
+https?:\/\/([^\/]*\.)?streetmp3\.com
+https?:\/\/([^\/]*\.)?strega\.us
+https?:\/\/([^\/]*\.)?strip-tease-video-bb-bb-z\.blogspot\.com
+https?:\/\/([^\/]*\.)?strongsong\.republika\.pl
+https?:\/\/([^\/]*\.)?structure-settlement\.hotmail\.ru
+https?:\/\/([^\/]*\.)?sts\.ucsd\.edu
+https?:\/\/([^\/]*\.)?students\.hsc\.unt\.edu
+https?:\/\/([^\/]*\.)?study-us\.cn
+https?:\/\/([^\/]*\.)?stvincent\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?stydx\.szm\.sk
+https?:\/\/([^\/]*\.)?sublimedirectory-com-otb\.blogspot\.com
+https?:\/\/([^\/]*\.)?sublimemovies-com-wdvh2wmm3\.blogspot\.com
+https?:\/\/([^\/]*\.)?sublimepie-com-e8g3dw2\.blogspot\.com
+https?:\/\/([^\/]*\.)?sudanportal\.mrcc\.aast\.edu
+https?:\/\/([^\/]*\.)?suede-cowboy-boot\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?suicidexlove\.blogspot\.com
+https?:\/\/([^\/]*\.)?sumeshi0206\.dyndns\.org
+https?:\/\/([^\/]*\.)?sunaseth\.blogspot\.com
+https?:\/\/([^\/]*\.)?sunp\.com
+https?:\/\/([^\/]*\.)?sunporno-com-avbxn\.blogspot\.com
+https?:\/\/([^\/]*\.)?sunporno-com-go5\.blogspot\.com
+https?:\/\/([^\/]*\.)?sunsetdreamscondo\.com
+https?:\/\/([^\/]*\.)?sunsky365\.net
+https?:\/\/([^\/]*\.)?superadultdirect\.info
+https?:\/\/([^\/]*\.)?supercalcinhas-com-rij\.blogspot\.com
+https?:\/\/([^\/]*\.)?superdiosas-com-tm5k7f1v3\.blogspot\.com
+https?:\/\/([^\/]*\.)?superfinancesolutions\.com
+https?:\/\/([^\/]*\.)?supergirls\.pochta\.ru
+https?:\/\/([^\/]*\.)?superha\.angelcities\.com
+https?:\/\/([^\/]*\.)?superinsuranceworld\.info
+https?:\/\/([^\/]*\.)?superinternetexplorer\.info
+https?:\/\/([^\/]*\.)?supershare\.cn
+https?:\/\/([^\/]*\.)?suphost\.info
+https?:\/\/([^\/]*\.)?supplements\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?supplements\.mylonso\.be
+https?:\/\/([^\/]*\.)?supplierlist\.com
+https?:\/\/([^\/]*\.)?surfacing\.101freehost\.com
+https?:\/\/([^\/]*\.)?surmontil\.sblog\.cz
+https?:\/\/([^\/]*\.)?suxwyj-free-porn\.blogspot\.com
+https?:\/\/([^\/]*\.)?suzoro-amateur-sex-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?suzulan\.blogspot\.com
+https?:\/\/([^\/]*\.)?svetys9i\.125mb\.com
+https?:\/\/([^\/]*\.)?svike\.info
+https?:\/\/([^\/]*\.)?swdella\.ifrance\.com
+https?:\/\/([^\/]*\.)?swechat\.republika\.pl
+https?:\/\/([^\/]*\.)?sweet-krissy\.babubi\.net
+https?:\/\/([^\/]*\.)?sweetpniangel87\.blogspot\.com
+https?:\/\/([^\/]*\.)?swingersadult\.net
+https?:\/\/([^\/]*\.)?sx\.nazari\.org
+https?:\/\/([^\/]*\.)?sx\.z0rz\.com
+https?:\/\/([^\/]*\.)?sxwliwe\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?sy-casino\.com
+https?:\/\/([^\/]*\.)?sygz\.51mp4mp3\.com
+https?:\/\/([^\/]*\.)?sylvan-queen\.iespana\.es
+https?:\/\/([^\/]*\.)?symphony\.8tt\.org
+https?:\/\/([^\/]*\.)?symptom-of-allergic-reaction-to-latex-condom\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?symy\.jp
+https?:\/\/([^\/]*\.)?synnin-viemaa\.blogspot\.com
+https?:\/\/([^\/]*\.)?sz-cj\.com
+https?:\/\/([^\/]*\.)?sz-dongtai\.com
+https?:\/\/([^\/]*\.)?sz-tianyicn\.com
+https?:\/\/([^\/]*\.)?sz4a\.cn
+https?:\/\/([^\/]*\.)?szarts\.com
+https?:\/\/([^\/]*\.)?szbeiyang\.net
+https?:\/\/([^\/]*\.)?szhangkong\.com
+https?:\/\/([^\/]*\.)?szhjc\.net
+https?:\/\/([^\/]*\.)?szhowfine\.com
+https?:\/\/([^\/]*\.)?szhx\.ebloggy\.com
+https?:\/\/([^\/]*\.)?szhxseo\.com
+https?:\/\/([^\/]*\.)?szjiuli\.com
+https?:\/\/([^\/]*\.)?szjiuli\.ebloggy\.com
+https?:\/\/([^\/]*\.)?szjpnet\.ebloggy\.com
+https?:\/\/([^\/]*\.)?szjyhk\.com
+https?:\/\/([^\/]*\.)?szlawyer\.home4u\.china\.com
+https?:\/\/([^\/]*\.)?szlichuang\.cn
+https?:\/\/([^\/]*\.)?szlszx\.com
+https?:\/\/([^\/]*\.)?sznuts\.cn
+https?:\/\/([^\/]*\.)?szpptc\.com
+https?:\/\/([^\/]*\.)?szsc-car\.com
+https?:\/\/([^\/]*\.)?szsfbq\.com
+https?:\/\/([^\/]*\.)?szyongjin\.ebloggy\.com
+https?:\/\/([^\/]*\.)?szzhuce\.home4u\.china\.com
+https?:\/\/([^\/]*\.)?t-sonnaya\.blogspot\.com
+https?:\/\/([^\/]*\.)?t-teens-for\.blogspot\.com
+https?:\/\/([^\/]*\.)?t\.tl
+https?:\/\/([^\/]*\.)?tabarlie\.forumzen\.com
+https?:\/\/([^\/]*\.)?tabgand\.info
+https?:\/\/([^\/]*\.)?tablitki\.xwiki\.com
+https?:\/\/([^\/]*\.)?taboo-porn-clip-blogeq2\.blogspot\.com
+https?:\/\/([^\/]*\.)?tackle\.247ihost\.com
+https?:\/\/([^\/]*\.)?tacomanissansubaru\.info
+https?:\/\/([^\/]*\.)?tactroc\.dl\.pl
+https?:\/\/([^\/]*\.)?tadalafil-\.ql\.st
+https?:\/\/([^\/]*\.)?tadalafil\.scanthenet\.com
+https?:\/\/([^\/]*\.)?tadalafil\.skocz\.net
+https?:\/\/([^\/]*\.)?tadalafil35\.lookscool\.com
+https?:\/\/([^\/]*\.)?taefis\.com
+https?:\/\/([^\/]*\.)?tagetboc\.darkbb\.com
+https?:\/\/([^\/]*\.)?talj5\.szm\.sk
+https?:\/\/([^\/]*\.)?tanoli\.su\.pl
+https?:\/\/([^\/]*\.)?tanorol\.dl\.pl
+https?:\/\/([^\/]*\.)?taouolo\.dl\.pl
+https?:\/\/([^\/]*\.)?tapz3\.szm\.sk
+https?:\/\/([^\/]*\.)?taracdom\.heavenforum\.com
+https?:\/\/([^\/]*\.)?tarfol\.com
+https?:\/\/([^\/]*\.)?target-oo6qbtx\.blogspot\.com
+https?:\/\/([^\/]*\.)?taria-m4j\.blogspot\.com
+https?:\/\/([^\/]*\.)?taricdam\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?tarkupu\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?taroelt\.bb-fr\.com
+https?:\/\/([^\/]*\.)?tarra-i6vqa54v\.blogspot\.com
+https?:\/\/([^\/]*\.)?tart0938\.blogspot\.com
+https?:\/\/([^\/]*\.)?taryn-hgxikm27y\.blogspot\.com
+https?:\/\/([^\/]*\.)?tarzuf\.com
+https?:\/\/([^\/]*\.)?tasculio\.forumzen\.com
+https?:\/\/([^\/]*\.)?tasha-rup0n3a\.blogspot\.com
+https?:\/\/([^\/]*\.)?tashia-w1evjakk7\.blogspot\.com
+https?:\/\/([^\/]*\.)?tasia-emtoy\.blogspot\.com
+https?:\/\/([^\/]*\.)?tasimd\.com
+https?:\/\/([^\/]*\.)?tasizuwann-tm7y\.blogspot\.com
+https?:\/\/([^\/]*\.)?tasnin\.com
+https?:\/\/([^\/]*\.)?tate-dt\.blogspot\.com
+https?:\/\/([^\/]*\.)?tateyana-c8s1ms4ai\.blogspot\.com
+https?:\/\/([^\/]*\.)?tateyona-br48\.blogspot\.com
+https?:\/\/([^\/]*\.)?tatrocbas\.dl\.pl
+https?:\/\/([^\/]*\.)?tatrocmon\.dl\.pl
+https?:\/\/([^\/]*\.)?tattoo-ojqmc35d\.blogspot\.com
+https?:\/\/([^\/]*\.)?tatum-mlzsfqw\.blogspot\.com
+https?:\/\/([^\/]*\.)?tatumn-i4anj15\.blogspot\.com
+https?:\/\/([^\/]*\.)?tatyiana-kwg0ud8fqf\.blogspot\.com
+https?:\/\/([^\/]*\.)?tauntianna-h6\.blogspot\.com
+https?:\/\/([^\/]*\.)?taurus-gx\.blogspot\.com
+https?:\/\/([^\/]*\.)?tayamarn\.blogspot\.com
+https?:\/\/([^\/]*\.)?taydem-wdm6rxd328\.blogspot\.com
+https?:\/\/([^\/]*\.)?taydra-ejk45\.blogspot\.com
+https?:\/\/([^\/]*\.)?tayla-t7b\.blogspot\.com
+https?:\/\/([^\/]*\.)?tayler-cfez\.blogspot\.com
+https?:\/\/([^\/]*\.)?taylor-bof5\.blogspot\.com
+https?:\/\/([^\/]*\.)?taylorbow-com-il3f4ae\.blogspot\.com
+https?:\/\/([^\/]*\.)?taylorbow-com-inbg2nw\.blogspot\.com
+https?:\/\/([^\/]*\.)?taynafrates\.freetzi\.com
+https?:\/\/([^\/]*\.)?taysha-avsm8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tazman-m6\.blogspot\.com
+https?:\/\/([^\/]*\.)?tbgbnt5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tbns\.net
+https?:\/\/([^\/]*\.)?tbrgxjv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tcsgn\.szm\.sk
+https?:\/\/([^\/]*\.)?tczxwwz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tczxxm6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tdzkzkt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tdzl\.sunp\.com
+https?:\/\/([^\/]*\.)?tea-imk7ry1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tea-pot\.keckins\.be
+https?:\/\/([^\/]*\.)?teacher-fucking-free\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?teacher-km\.blogspot\.com
+https?:\/\/([^\/]*\.)?teaching1degree\.chat\.ru
+https?:\/\/([^\/]*\.)?teainfo\.org
+https?:\/\/([^\/]*\.)?teamsquirt-com-kjcj3u3i\.blogspot\.com
+https?:\/\/([^\/]*\.)?tear\.hostcroc\.com
+https?:\/\/([^\/]*\.)?tech-txyvo8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tech\.china\.com
+https?:\/\/([^\/]*\.)?techinpet\.blogspot\.com
+https?:\/\/([^\/]*\.)?technical-school\.fromru\.com
+https?:\/\/([^\/]*\.)?technical-school\.hotmail\.ru
+https?:\/\/([^\/]*\.)?technical-school\.newmail\.ru
+https?:\/\/([^\/]*\.)?technical1school\.chat\.ru
+https?:\/\/([^\/]*\.)?teen-anal-cum-shot\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?teen-blonde-beauty\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?teen-blow-job-movie\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?teen-boob-fuck\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?teen-boob-porn\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?teen-buff\.net
+https?:\/\/([^\/]*\.)?teen-chick-masturbating\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?teen-facial-fuck\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?teen-feet-bew\.blogspot\.com
+https?:\/\/([^\/]*\.)?teen-internal-cum-shot\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?teen-kelly-lesbian\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?teen-movie\.freeinsite\.net
+https?:\/\/([^\/]*\.)?teen-porn-clip-newsyk6\.blogspot\.com
+https?:\/\/([^\/]*\.)?teen-sex-movie-f-d-t\.blogspot\.com
+https?:\/\/([^\/]*\.)?teen-sex-video-w8jpk\.blogspot\.com
+https?:\/\/([^\/]*\.)?teen-zips\.babubi\.net
+https?:\/\/([^\/]*\.)?teen6\.vdforum\.ru
+https?:\/\/([^\/]*\.)?teenax-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenax-com-pidoq\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenax-com-rh0ssu62yh\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenax-com-rke6\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenbe-com-bdp\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenbe-com-mb6x\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenbe-com-mh03o\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenblowjobs\.vdforum\.ru
+https?:\/\/([^\/]*\.)?teenboat-com-g6\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenboat-com-g6f103r\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenboat-com-mu1s7p\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenboat-e76l\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenboys-wel\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenel-com-hhd\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenel-com-hq0sgbm\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniefiles-com-g84lu\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniefiles-com-o43\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniefiles-com-ob782u\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniemovies-com-aptqg\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniemovies-com-as\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniemovies-com-hinof\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeniesxxx-b00\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenmodels\.hostingtree\.org
+https?:\/\/([^\/]*\.)?teenporn\.vdforum\.ru
+https?:\/\/([^\/]*\.)?teenpornrur\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenpussyfhv\.blogspot\.com
+https?:\/\/([^\/]*\.)?teens-chat\.info
+https?:\/\/([^\/]*\.)?teens-list-b-all\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenseven-com-c0jvb2z\.blogspot\.com
+https?:\/\/([^\/]*\.)?teensex-com-c4w3g\.blogspot\.com
+https?:\/\/([^\/]*\.)?teensex-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?teensex\.adultserv\.info
+https?:\/\/([^\/]*\.)?teensss-com-b8s44\.blogspot\.com
+https?:\/\/([^\/]*\.)?teensss-com-tds\.blogspot\.com
+https?:\/\/([^\/]*\.)?teensss-com-thrd\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentera-com-d5j3qqs\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentera-com-dyty5cv\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentera-com-w65\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentiger-com-e4e6i2f\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentiger-com-eo602\.blogspot\.com
+https?:\/\/([^\/]*\.)?teentiger-com-fozol\.blogspot\.com
+https?:\/\/([^\/]*\.)?teeny-boppers-club-beg\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenybopperclub-com-bgqk6ejjv\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenybopperclub-com-bukb\.blogspot\.com
+https?:\/\/([^\/]*\.)?teenybopperclub-segod\.blogspot\.com
+https?:\/\/([^\/]*\.)?tegan-d1yagb\.blogspot\.com
+https?:\/\/([^\/]*\.)?tehxm\.szm\.sk
+https?:\/\/([^\/]*\.)?tehya-csxo8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tehyana-bg3\.blogspot\.com
+https?:\/\/([^\/]*\.)?tekd8\.szm\.sk
+https?:\/\/([^\/]*\.)?tekiartur\.xhostar\.com
+https?:\/\/([^\/]*\.)?tekila-a5x7\.blogspot\.com
+https?:\/\/([^\/]*\.)?tela-ou3khz\.blogspot\.com
+https?:\/\/([^\/]*\.)?telenglish\.com\.cn
+https?:\/\/([^\/]*\.)?telephone-ip\.blogspot\.com
+https?:\/\/([^\/]*\.)?telnushka\.blogspot\.com
+https?:\/\/([^\/]*\.)?temazepam\.xwiki\.com
+https?:\/\/([^\/]*\.)?temma-k1n03ege\.blogspot\.com
+https?:\/\/([^\/]*\.)?temp-h33\.blogspot\.com
+https?:\/\/([^\/]*\.)?temptation-gujlu2\.blogspot\.com
+https?:\/\/([^\/]*\.)?ten-ra66722hs5\.blogspot\.com
+https?:\/\/([^\/]*\.)?tenea-w1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tenisha-e6f\.blogspot\.com
+https?:\/\/([^\/]*\.)?tennasa-ttk2oqe4m\.blogspot\.com
+https?:\/\/([^\/]*\.)?tennesseemortgage-x\.com
+https?:\/\/([^\/]*\.)?tennille-dm\.blogspot\.com
+https?:\/\/([^\/]*\.)?tennis-ca8swtk\.blogspot\.com
+https?:\/\/([^\/]*\.)?tenor-saxophone-fingering\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?tenuate\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?teopoo\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?teplomer\.dtdns\.net
+https?:\/\/([^\/]*\.)?tequila-be5\.blogspot\.com
+https?:\/\/([^\/]*\.)?teresanict-oorzzsxmjd\.blogspot\.com
+https?:\/\/([^\/]*\.)?teri-m84ywv38\.blogspot\.com
+https?:\/\/([^\/]*\.)?terika-i10\.blogspot\.com
+https?:\/\/([^\/]*\.)?term-paper\.fromru\.com
+https?:\/\/([^\/]*\.)?term-paper\.nm\.ru
+https?:\/\/([^\/]*\.)?term_paper\.chat\.ru
+https?:\/\/([^\/]*\.)?terminal-h0o2cfsibt\.blogspot\.com
+https?:\/\/([^\/]*\.)?terri-gqdjfrm33d\.blogspot\.com
+https?:\/\/([^\/]*\.)?terrianna-ru\.blogspot\.com
+https?:\/\/([^\/]*\.)?terrin-wmwxu3v\.blogspot\.com
+https?:\/\/([^\/]*\.)?terriona-erbvdaj\.blogspot\.com
+https?:\/\/([^\/]*\.)?terry-tqzto0ek\.blogspot\.com
+https?:\/\/([^\/]*\.)?terryikah-dhw46164c2\.blogspot\.com
+https?:\/\/([^\/]*\.)?terryiona-czcng\.blogspot\.com
+https?:\/\/([^\/]*\.)?terryn-b8p04mxhn2\.blogspot\.com
+https?:\/\/([^\/]*\.)?tess-oybaa0ng\.blogspot\.com
+https?:\/\/([^\/]*\.)?tessa-mugg\.blogspot\.com
+https?:\/\/([^\/]*\.)?test1\.com
+https?:\/\/([^\/]*\.)?test123-kpgwe3vie4\.blogspot\.com
+https?:\/\/([^\/]*\.)?test2-h6qofysx\.blogspot\.com
+https?:\/\/([^\/]*\.)?test2\.com
+https?:\/\/([^\/]*\.)?test3\.com
+https?:\/\/([^\/]*\.)?testmutherfucker\.com
+https?:\/\/([^\/]*\.)?testtest-g14\.blogspot\.com
+https?:\/\/([^\/]*\.)?tetteteent\.blogspot\.com
+https?:\/\/([^\/]*\.)?tettgwk\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?texas-hold-em-winner\.net
+https?:\/\/([^\/]*\.)?texas-hold-em\.black-poker\.com
+https?:\/\/([^\/]*\.)?texas-holdem-poker\.us\.com
+https?:\/\/([^\/]*\.)?texas-holdem-winner\.com
+https?:\/\/([^\/]*\.)?texas-holdem\.black-poker\.com
+https?:\/\/([^\/]*\.)?texas-rvmu1a0\.blogspot\.com
+https?:\/\/([^\/]*\.)?texas-va-loan\.com
+https?:\/\/([^\/]*\.)?texasdad\.com
+https?:\/\/([^\/]*\.)?texasholdem2\.com
+https?:\/\/([^\/]*\.)?texasholdemcenteral\.com
+https?:\/\/([^\/]*\.)?texasholdemsite\.net
+https?:\/\/([^\/]*\.)?texasmortgage-x\.com
+https?:\/\/([^\/]*\.)?teyana-wtpu\.blogspot\.com
+https?:\/\/([^\/]*\.)?teylore-ew24\.blogspot\.com
+https?:\/\/([^\/]*\.)?tez-teenybopperclub-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?tgao2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tgksg\.szm\.sk
+https?:\/\/([^\/]*\.)?tgp-movie-facial\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?tgpprincess\.net
+https?:\/\/([^\/]*\.)?tgpseeker\.net
+https?:\/\/([^\/]*\.)?thailand-t865\.blogspot\.com
+https?:\/\/([^\/]*\.)?thalia-d125yh\.blogspot\.com
+https?:\/\/([^\/]*\.)?thalya-cgjm\.blogspot\.com
+https?:\/\/([^\/]*\.)?thbxg\.szm\.sk
+https?:\/\/([^\/]*\.)?the-amberlady\.blogspot\.com
+https?:\/\/([^\/]*\.)?the-craftman\.blogspot\.com
+https?:\/\/([^\/]*\.)?the-female-orgasm-com-h1sx\.blogspot\.com
+https?:\/\/([^\/]*\.)?the-female-orgasm-com-h8qf5l27j\.blogspot\.com
+https?:\/\/([^\/]*\.)?the-most-biggest-boob-in-the-world\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?the-murderer\.blogspot\.com
+https?:\/\/([^\/]*\.)?the-roulette\.net
+https?:\/\/([^\/]*\.)?theaddedtouch\.net
+https?:\/\/([^\/]*\.)?theaf\.info
+https?:\/\/([^\/]*\.)?theaftor\.com
+https?:\/\/([^\/]*\.)?theag\.info
+https?:\/\/([^\/]*\.)?theap\.info
+https?:\/\/([^\/]*\.)?theas\.info
+https?:\/\/([^\/]*\.)?theat\.info
+https?:\/\/([^\/]*\.)?theaw\.info
+https?:\/\/([^\/]*\.)?thebestjaguar\.info
+https?:\/\/([^\/]*\.)?thebigswallow-com-khcs\.blogspot\.com
+https?:\/\/([^\/]*\.)?thebigswallow-com-kp3hmbl2e\.blogspot\.com
+https?:\/\/([^\/]*\.)?thebondbroker\.info
+https?:\/\/([^\/]*\.)?thecardinaleempire\.com
+https?:\/\/([^\/]*\.)?thechryslerjeep\.info
+https?:\/\/([^\/]*\.)?thedailywash\.blogspot\.com
+https?:\/\/([^\/]*\.)?thedrivingsite\.info
+https?:\/\/([^\/]*\.)?theente\.com
+https?:\/\/([^\/]*\.)?thefiatspider\.info
+https?:\/\/([^\/]*\.)?thehomeworkco\.com
+https?:\/\/([^\/]*\.)?theiconclub\.info
+https?:\/\/([^\/]*\.)?theillegalcause\.blogspot\.com
+https?:\/\/([^\/]*\.)?thejaguarracing\.cn
+https?:\/\/([^\/]*\.)?thejaguarracing\.info
+https?:\/\/([^\/]*\.)?theking-ox0p87\.blogspot\.com
+https?:\/\/([^\/]*\.)?theluckyman\.magnesia\.dtdns\.net
+https?:\/\/([^\/]*\.)?theman-mbvc\.blogspot\.com
+https?:\/\/([^\/]*\.)?themazdaspeed\.info
+https?:\/\/([^\/]*\.)?themoblogs\.com
+https?:\/\/([^\/]*\.)?theofe\.com
+https?:\/\/([^\/]*\.)?theorless\.com
+https?:\/\/([^\/]*\.)?theorrent\.com
+https?:\/\/([^\/]*\.)?thepartyplaza\.info
+https?:\/\/([^\/]*\.)?theresa-ipvfeka0y\.blogspot\.com
+https?:\/\/([^\/]*\.)?thesam118\.blogspot\.com
+https?:\/\/([^\/]*\.)?theseeall\.com
+https?:\/\/([^\/]*\.)?theslots\.biz
+https?:\/\/([^\/]*\.)?thesmart-casino\.com
+https?:\/\/([^\/]*\.)?thesportspark\.net
+https?:\/\/([^\/]*\.)?thessaloni-ka8qpmq7\.blogspot\.com
+https?:\/\/([^\/]*\.)?thestartrekuniverse\.net
+https?:\/\/([^\/]*\.)?thetexasholdpoker\.com
+https?:\/\/([^\/]*\.)?thetrafficproject\.com
+https?:\/\/([^\/]*\.)?thetruevoyeur-com-gkjz2m\.blogspot\.com
+https?:\/\/([^\/]*\.)?thetruevoyeur-com-gy0\.blogspot\.com
+https?:\/\/([^\/]*\.)?thetruevoyeur-com-iuswifnlo\.blogspot\.com
+https?:\/\/([^\/]*\.)?thewarhal\.com
+https?:\/\/([^\/]*\.)?thexe\.info
+https?:\/\/([^\/]*\.)?thexo\.info
+https?:\/\/([^\/]*\.)?thg\.org\.ua
+https?:\/\/([^\/]*\.)?thick-ass-movie\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?thick-ass-stripper\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?thick-black-ass-pic\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?thigh-boot-movie\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?thiyanna-hl74o5m\.blogspot\.com
+https?:\/\/([^\/]*\.)?thomarina-gt\.blogspot\.com
+https?:\/\/([^\/]*\.)?thomas-r6ik\.blogspot\.com
+https?:\/\/([^\/]*\.)?thomasina-wpcw\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongbattle-com-rtrllksm\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongbattle-com-rx2f2tcqrm\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongdreams-com-w0r16sf\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongdreams-com-wq50\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongdreams-com-wx67\.blogspot\.com
+https?:\/\/([^\/]*\.)?thongdreams-com-xehiw\.blogspot\.com
+https?:\/\/([^\/]*\.)?thornblack-eq3a55o4\.blogspot\.com
+https?:\/\/([^\/]*\.)?three-to8p73\.blogspot\.com
+https?:\/\/([^\/]*\.)?threesforest\.blogspot\.com
+https?:\/\/([^\/]*\.)?thugs-djaox\.blogspot\.com
+https?:\/\/([^\/]*\.)?thugz-cqi0x7wkb6\.blogspot\.com
+https?:\/\/([^\/]*\.)?thumbzilla-com-mq\.blogspot\.com
+https?:\/\/([^\/]*\.)?thumbzilla-com-mqtw65e\.blogspot\.com
+https?:\/\/([^\/]*\.)?thumper-bs3t1\.blogspot\.com
+https?:\/\/([^\/]*\.)?thunder-aq\.blogspot\.com
+https?:\/\/([^\/]*\.)?thunder\.hostonmars\.com
+https?:\/\/([^\/]*\.)?thursday-om2jka\.blogspot\.com
+https?:\/\/([^\/]*\.)?thusqus\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?thx1138-mh86v55t2\.blogspot\.com
+https?:\/\/([^\/]*\.)?tia-icc0gbqhya\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiahaat\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tiahnna-kf24x7i4n\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiaja-hr4ci\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiana-g12f0\.blogspot\.com
+https?:\/\/([^\/]*\.)?tianna-r4s2r44e50\.blogspot\.com
+https?:\/\/([^\/]*\.)?tianti\.com\.cn
+https?:\/\/([^\/]*\.)?tiava-com-i60\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiava-com-i73ph\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiava-fiduh\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiava-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiava-tqfgkv74\.blogspot\.com
+https?:\/\/([^\/]*\.)?tibisa-e5d1w5g\.blogspot\.com
+https?:\/\/([^\/]*\.)?ticket\.hostaim\.com
+https?:\/\/([^\/]*\.)?ticketcenter\.cn
+https?:\/\/([^\/]*\.)?tied-gay-bondage\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?tiepin\.my10gb\.com
+https?:\/\/([^\/]*\.)?tieteler\.jconserv\.net
+https?:\/\/([^\/]*\.)?tiffani-dvy3\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiffany-b5arc\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiffany-teen-video-ces\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiffanyteen-a75atrdr\.blogspot\.com
+https?:\/\/([^\/]*\.)?tigers-ows\.blogspot\.com
+https?:\/\/([^\/]*\.)?tigger-muhul2h8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tight-ik340a6f\.blogspot\.com
+https?:\/\/([^\/]*\.)?tight-tranny-ass\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?tightdelights-com-bayzdrm4r\.blogspot\.com
+https?:\/\/([^\/]*\.)?tightdelights-com-bproar5r\.blogspot\.com
+https?:\/\/([^\/]*\.)?tigre-k0qdp\.blogspot\.com
+https?:\/\/([^\/]*\.)?tijldebie\.net
+https?:\/\/([^\/]*\.)?tilneshia-r1\.blogspot\.com
+https?:\/\/([^\/]*\.)?timank\.com
+https?:\/\/([^\/]*\.)?timelee\.pp\.ru
+https?:\/\/([^\/]*\.)?timetopaynow\.com
+https?:\/\/([^\/]*\.)?timewill\.pp\.ru
+https?:\/\/([^\/]*\.)?timex-ironman\.leg4is\.be
+https?:\/\/([^\/]*\.)?timothy-tkd\.blogspot\.com
+https?:\/\/([^\/]*\.)?timsmovies-com-ck0iq6v\.blogspot\.com
+https?:\/\/([^\/]*\.)?timsmovies-com-cui64k6qv\.blogspot\.com
+https?:\/\/([^\/]*\.)?timyra-dy\.blogspot\.com
+https?:\/\/([^\/]*\.)?tina-ce\.blogspot\.com
+https?:\/\/([^\/]*\.)?tinman-bb4k610\.blogspot\.com
+https?:\/\/([^\/]*\.)?tintin-abz\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiny-cock-blow-job\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?tiny18-net-e5zw0x8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiny18-net-thb44\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiny18-net-tq5qwp\.blogspot\.com
+https?:\/\/([^\/]*\.)?tinyeve-net-d8ejy5\.blogspot\.com
+https?:\/\/([^\/]*\.)?tinyeve-net-dzjflb1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tinysblackadventures-com-a61px\.blogspot\.com
+https?:\/\/([^\/]*\.)?tinysblackadventures-com-a638lqrud\.blogspot\.com
+https?:\/\/([^\/]*\.)?tipw\.org\.ua
+https?:\/\/([^\/]*\.)?tise2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?titanium-ring\.boom\.ru
+https?:\/\/([^\/]*\.)?titanium-rings\.boom\.ru
+https?:\/\/([^\/]*\.)?titanium1ring\.chat\.ru
+https?:\/\/([^\/]*\.)?titanium4ring\.chat\.ru
+https?:\/\/([^\/]*\.)?titkis\.com
+https?:\/\/([^\/]*\.)?tittypalace-com-o352hny\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiye-e5rhl\.blogspot\.com
+https?:\/\/([^\/]*\.)?tiyona-t4m7cq\.blogspot\.com
+https?:\/\/([^\/]*\.)?tizanidine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?tj-d04qczfk\.blogspot\.com
+https?:\/\/([^\/]*\.)?tjbb1\.szm\.sk
+https?:\/\/([^\/]*\.)?tjjp\.left-page\.com
+https?:\/\/([^\/]*\.)?tjjp\.zxvo\.com
+https?:\/\/([^\/]*\.)?tjzhh\.com\.cn
+https?:\/\/([^\/]*\.)?tjzrr\.com
+https?:\/\/([^\/]*\.)?tkml\.tblog\.com
+https?:\/\/([^\/]*\.)?tknani\.50webs\.com
+https?:\/\/([^\/]*\.)?tkzrb\.szm\.sk
+https?:\/\/([^\/]*\.)?tladies\.net
+https?:\/\/([^\/]*\.)?tlchjhs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tldley4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tlhd3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tljsrq\.com
+https?:\/\/([^\/]*\.)?tlkdb\.szm\.sk
+https?:\/\/([^\/]*\.)?tmhbj\.com
+https?:\/\/([^\/]*\.)?tmobilenfn\.blogspot\.com
+https?:\/\/([^\/]*\.)?tmooeen-six\.blogspot\.com
+https?:\/\/([^\/]*\.)?tneccotnec\.fr-bb\.com
+https?:\/\/([^\/]*\.)?tnt163\.com
+https?:\/\/([^\/]*\.)?toggle-c0t3\.blogspot\.com
+https?:\/\/([^\/]*\.)?tohj3\.szm\.sk
+https?:\/\/([^\/]*\.)?tohqy\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tokuctro\.forumzen\.com
+https?:\/\/([^\/]*\.)?tom-b56vx6b48\.blogspot\.com
+https?:\/\/([^\/]*\.)?tomato-a7e\.blogspot\.com
+https?:\/\/([^\/]*\.)?tomems\.125mb\.com
+https?:\/\/([^\/]*\.)?tommys-bookmarks-com-eeb0\.blogspot\.com
+https?:\/\/([^\/]*\.)?tommys-bookmarks-com-ev\.blogspot\.com
+https?:\/\/([^\/]*\.)?tomng\.info
+https?:\/\/([^\/]*\.)?tomsthumbs-com-ihj\.blogspot\.com
+https?:\/\/([^\/]*\.)?tomsthumbs-com-iqkobr\.blogspot\.com
+https?:\/\/([^\/]*\.)?ton4all\.com
+https?:\/\/([^\/]*\.)?tonea-m3t\.blogspot\.com
+https?:\/\/([^\/]*\.)?tonegativeone\.blogspot\.com
+https?:\/\/([^\/]*\.)?toniann-kr3\.blogspot\.com
+https?:\/\/([^\/]*\.)?tony-h3xs1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tonya-g0x1\.blogspot\.com
+https?:\/\/([^\/]*\.)?toons-fuck-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?toor3\.szm\.sk
+https?:\/\/([^\/]*\.)?tootsie-rjg323oj2\.blogspot\.com
+https?:\/\/([^\/]*\.)?top-hold-em\.us
+https?:\/\/([^\/]*\.)?top-holdem\.com
+https?:\/\/([^\/]*\.)?top-holdem\.us
+https?:\/\/([^\/]*\.)?top-mp3\.biz
+https?:\/\/([^\/]*\.)?top\.pcanywhere\.net
+https?:\/\/([^\/]*\.)?topacio-w3fpzg\.blogspot\.com
+https?:\/\/([^\/]*\.)?topairlines\.ifrance\.com
+https?:\/\/([^\/]*\.)?topcelebs-com-hf34tmj\.blogspot\.com
+https?:\/\/([^\/]*\.)?topdasar\.com
+https?:\/\/([^\/]*\.)?topee\.info
+https?:\/\/([^\/]*\.)?topege\.com
+https?:\/\/([^\/]*\.)?topfarmasearch\.info
+https?:\/\/([^\/]*\.)?topgun-ef7gc204\.blogspot\.com
+https?:\/\/([^\/]*\.)?topless-babes-com-mq6hbe5uvq\.blogspot\.com
+https?:\/\/([^\/]*\.)?topo20\.org
+https?:\/\/([^\/]*\.)?topography-tuowheetle\.blogspot\.com
+https?:\/\/([^\/]*\.)?topozo\.org
+https?:\/\/([^\/]*\.)?topworldauto\.info
+https?:\/\/([^\/]*\.)?torey-dr343r\.blogspot\.com
+https?:\/\/([^\/]*\.)?tori-cmg8\.blogspot\.com
+https?:\/\/([^\/]*\.)?toriana-baui\.blogspot\.com
+https?:\/\/([^\/]*\.)?tornado-axe8uch1ar\.blogspot\.com
+https?:\/\/([^\/]*\.)?toronto-ox7aprp\.blogspot\.com
+https?:\/\/([^\/]*\.)?toropiz\.125mb\.com
+https?:\/\/([^\/]*\.)?torri-mrmj\.blogspot\.com
+https?:\/\/([^\/]*\.)?tortoise-iz\.blogspot\.com
+https?:\/\/([^\/]*\.)?torucnro\.jconserv\.net
+https?:\/\/([^\/]*\.)?tosuralz\.forumzen\.com
+https?:\/\/([^\/]*\.)?tottiona-k1zx8juj\.blogspot\.com
+https?:\/\/([^\/]*\.)?touya012\.blogspot\.com
+https?:\/\/([^\/]*\.)?town-china\.cn
+https?:\/\/([^\/]*\.)?toxic-h8jasyqt1\.blogspot\.com
+https?:\/\/([^\/]*\.)?toyota-g8\.blogspot\.com
+https?:\/\/([^\/]*\.)?tpwyc\.szm\.sk
+https?:\/\/([^\/]*\.)?tqdd7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tqnkaoi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tqrkf\.szm\.sk
+https?:\/\/([^\/]*\.)?traci-r30narn\.blogspot\.com
+https?:\/\/([^\/]*\.)?tracie-wskg17md\.blogspot\.com
+https?:\/\/([^\/]*\.)?trackting\.com
+https?:\/\/([^\/]*\.)?tractor-etae7hau1y\.blogspot\.com
+https?:\/\/([^\/]*\.)?tracy-kae\.babubi\.net
+https?:\/\/([^\/]*\.)?tracy-toe7\.blogspot\.com
+https?:\/\/([^\/]*\.)?traesha-d8u3731bb6\.blogspot\.com
+https?:\/\/([^\/]*\.)?traffit\.info
+https?:\/\/([^\/]*\.)?tralina-bvqz366sv\.blogspot\.com
+https?:\/\/([^\/]*\.)?tramadol-4u\.net
+https?:\/\/([^\/]*\.)?tramadol-911\.coz\.in
+https?:\/\/([^\/]*\.)?tramadol-bznz\.blogspot\.com
+https?:\/\/([^\/]*\.)?tramadol-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?tramadol-gs\.eu\.tc
+https?:\/\/([^\/]*\.)?tramadol-gs\.net\.tc
+https?:\/\/([^\/]*\.)?tramadol-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?tramadol-wiki\.com
+https?:\/\/([^\/]*\.)?tramadol\.1\.forogratis\.es
+https?:\/\/([^\/]*\.)?tramadol\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?tramadol\.esguay\.com
+https?:\/\/([^\/]*\.)?tramadol\.fws1\.com
+https?:\/\/([^\/]*\.)?tramadol\.goodpharm\.info
+https?:\/\/([^\/]*\.)?tramadol\.knopkabablo\.info
+https?:\/\/([^\/]*\.)?tramadol\.presteert\.nl
+https?:\/\/([^\/]*\.)?tramadol\.skocz\.net
+https?:\/\/([^\/]*\.)?tramadol\.su\.pl
+https?:\/\/([^\/]*\.)?tramadol\.weboficial\.com
+https?:\/\/([^\/]*\.)?tramadol7\.php5\.cz
+https?:\/\/([^\/]*\.)?tramadolnx\.u\.yuku\.com
+https?:\/\/([^\/]*\.)?tramadolonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?tramadolonlinez\.blogsome\.com
+https?:\/\/([^\/]*\.)?tramadolq\.bloggingmylife\.com
+https?:\/\/([^\/]*\.)?tramadols\.us\.tf
+https?:\/\/([^\/]*\.)?trami-a7oq4k1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tramika-o4no\.blogspot\.com
+https?:\/\/([^\/]*\.)?tran-ma86bq3\.blogspot\.com
+https?:\/\/([^\/]*\.)?tranici\.info
+https?:\/\/([^\/]*\.)?tranlaura-ktn\.blogspot\.com
+https?:\/\/([^\/]*\.)?trannysurprise-com-ghn6k4r88\.blogspot\.com
+https?:\/\/([^\/]*\.)?trannysurprise-com-gq\.blogspot\.com
+https?:\/\/([^\/]*\.)?trannysurprise-com-i05csl\.blogspot\.com
+https?:\/\/([^\/]*\.)?transbiding\.com
+https?:\/\/([^\/]*\.)?transchinese\.com
+https?:\/\/([^\/]*\.)?transfer-h56d4zxl4\.blogspot\.com
+https?:\/\/([^\/]*\.)?translateatsh\.cn
+https?:\/\/([^\/]*\.)?translatebbs\.com
+https?:\/\/([^\/]*\.)?translateforcompany\.cn
+https?:\/\/([^\/]*\.)?traore-guh68nn\.blogspot\.com
+https?:\/\/([^\/]*\.)?trashnx\.datadiri\.cc
+https?:\/\/([^\/]*\.)?trastian-r1\.blogspot\.com
+https?:\/\/([^\/]*\.)?travel-blast\.com
+https?:\/\/([^\/]*\.)?travel-wa4g2\.blogspot\.com
+https?:\/\/([^\/]*\.)?travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?travel2nursing\.chat\.ru
+https?:\/\/([^\/]*\.)?travelmarket\.mytravelsearch\.info
+https?:\/\/([^\/]*\.)?travis-ez8v\.blogspot\.com
+https?:\/\/([^\/]*\.)?tray-t5\.blogspot\.com
+https?:\/\/([^\/]*\.)?trbodel\.frbb\.net
+https?:\/\/([^\/]*\.)?trbusget\.forumzen\.com
+https?:\/\/([^\/]*\.)?trcchi\.td\.pl
+https?:\/\/([^\/]*\.)?trcota\.bb-fr\.com
+https?:\/\/([^\/]*\.)?trdombas\.blogcu\.com
+https?:\/\/([^\/]*\.)?trerdron\.discutfree\.com
+https?:\/\/([^\/]*\.)?trerdron\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?tressa-a7w83sb\.blogspot\.com
+https?:\/\/([^\/]*\.)?tretinoingelbuy\.move\.to
+https?:\/\/([^\/]*\.)?tretinoingelbuycheap\.move\.to
+https?:\/\/([^\/]*\.)?tretinoingelbuygeneric\.drive\.to
+https?:\/\/([^\/]*\.)?tretinoingelcheap\.rulestheweb\.com
+https?:\/\/([^\/]*\.)?tretinoingelgeneric\.germany\.ms
+https?:\/\/([^\/]*\.)?trevisos\.org
+https?:\/\/([^\/]*\.)?trevor-obp5qlgdb\.blogspot\.com
+https?:\/\/([^\/]*\.)?trhlina\.republika\.pl
+https?:\/\/([^\/]*\.)?tribuna\.asp2\.cz
+https?:\/\/([^\/]*\.)?trident-m6wm\.blogspot\.com
+https?:\/\/([^\/]*\.)?trinbagoauto\.com
+https?:\/\/([^\/]*\.)?trinity-ikvstb\.blogspot\.com
+https?:\/\/([^\/]*\.)?triobuy\.vtost\.com
+https?:\/\/([^\/]*\.)?triphasil\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?tripto\.com
+https?:\/\/([^\/]*\.)?trisha-ksmv\.blogspot\.com
+https?:\/\/([^\/]*\.)?tristen-h2b1b1\.blogspot\.com
+https?:\/\/([^\/]*\.)?trivial-gk13on\.blogspot\.com
+https?:\/\/([^\/]*\.)?trixie-rkn\.blogspot\.com
+https?:\/\/([^\/]*\.)?trkucorc\.forumzen\.com
+https?:\/\/([^\/]*\.)?trlicut\.winnerforum\.net
+https?:\/\/([^\/]*\.)?trocacsit\.dl\.pl
+https?:\/\/([^\/]*\.)?troccvi\.darkbb\.com
+https?:\/\/([^\/]*\.)?trocdarc\.bb-fr\.com
+https?:\/\/([^\/]*\.)?troceltolo\.dl\.pl
+https?:\/\/([^\/]*\.)?trocoches\.info
+https?:\/\/([^\/]*\.)?trocrolac\.dl\.pl
+https?:\/\/([^\/]*\.)?troctrocro\.zj\.pl
+https?:\/\/([^\/]*\.)?trombone-wafnt\.blogspot\.com
+https?:\/\/([^\/]*\.)?trorolo\.ephpbb\.com
+https?:\/\/([^\/]*\.)?trorta\.blogcu\.com
+https?:\/\/([^\/]*\.)?trte2\.szm\.sk
+https?:\/\/([^\/]*\.)?trtrocli\.uy\.pl
+https?:\/\/([^\/]*\.)?trucks-t5rikxk1yk\.blogspot\.com
+https?:\/\/([^\/]*\.)?trumpet-d5846b6u\.blogspot\.com
+https?:\/\/([^\/]*\.)?trumst\.com
+https?:\/\/([^\/]*\.)?trzelor\.bbfr\.net
+https?:\/\/([^\/]*\.)?ts998\.com
+https?:\/\/([^\/]*\.)?tsc-clara\.hostingtree\.org
+https?:\/\/([^\/]*\.)?tsfzia5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tshirthell-com-h4dd14cx0g\.blogspot\.com
+https?:\/\/([^\/]*\.)?tshirthell-com-wbc\.blogspot\.com
+https?:\/\/([^\/]*\.)?tshirthell-com-wvayrpu2\.blogspot\.com
+https?:\/\/([^\/]*\.)?tslist-com-rwwi8zl\.blogspot\.com
+https?:\/\/([^\/]*\.)?tslist-com-ry\.blogspot\.com
+https?:\/\/([^\/]*\.)?tsoy7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tss-car\.com
+https?:\/\/([^\/]*\.)?tssuih5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tsvibak\.blogspot\.com
+https?:\/\/([^\/]*\.)?tt001\.com
+https?:\/\/([^\/]*\.)?tt002\.com
+https?:\/\/([^\/]*\.)?tt003\.com
+https?:\/\/([^\/]*\.)?tt004\.com
+https?:\/\/([^\/]*\.)?tt005\.com
+https?:\/\/([^\/]*\.)?tthumvir\.forumzen\.com
+https?:\/\/([^\/]*\.)?ttjpm\.szm\.sk
+https?:\/\/([^\/]*\.)?ttlive\.info
+https?:\/\/([^\/]*\.)?ttrgb\.szm\.sk
+https?:\/\/([^\/]*\.)?ttvpkp0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tu-wendi\.blogspot\.com
+https?:\/\/([^\/]*\.)?tubas-bc45h\.blogspot\.com
+https?:\/\/([^\/]*\.)?tuesday-anx780we1\.blogspot\.com
+https?:\/\/([^\/]*\.)?tufa\.info
+https?:\/\/([^\/]*\.)?tugjobs-com-kmr4pm\.blogspot\.com
+https?:\/\/([^\/]*\.)?tuhe-advil\.blogspot\.com
+https?:\/\/([^\/]*\.)?tulip123456\.ifrance\.com
+https?:\/\/([^\/]*\.)?turbo-o3f520u0jd\.blogspot\.com
+https?:\/\/([^\/]*\.)?turl\.jp
+https?:\/\/([^\/]*\.)?turtle-m6pr6y\.blogspot\.com
+https?:\/\/([^\/]*\.)?tuttle-i5\.blogspot\.com
+https?:\/\/([^\/]*\.)?tuttosport\.freespase\.info
+https?:\/\/([^\/]*\.)?tuubu\.szm\.sk
+https?:\/\/([^\/]*\.)?tv-bazzar\.com
+https?:\/\/([^\/]*\.)?twam0\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?tweety-k8z4spyz\.blogspot\.com
+https?:\/\/([^\/]*\.)?twelvalve\.blogspot\.com
+https?:\/\/([^\/]*\.)?twilightsex-cixeh\.blogspot\.com
+https?:\/\/([^\/]*\.)?twilightsex-com-o31qd\.blogspot\.com
+https?:\/\/([^\/]*\.)?twilightsex-com-op\.blogspot\.com
+https?:\/\/([^\/]*\.)?twins-hzhz\.blogspot\.com
+https?:\/\/([^\/]*\.)?twist-ga\.blogspot\.com
+https?:\/\/([^\/]*\.)?twister-r4\.blogspot\.com
+https?:\/\/([^\/]*\.)?two-lips-com-cfvn7fu3\.blogspot\.com
+https?:\/\/([^\/]*\.)?two-lips-com-cwk\.blogspot\.com
+https?:\/\/([^\/]*\.)?two-teen-kissing\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?two-wgn3t3\.blogspot\.com
+https?:\/\/([^\/]*\.)?twoq5\.szm\.sk
+https?:\/\/([^\/]*\.)?twxtbqn\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?txnpgc2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?txvfpo7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tyepobv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?tyj\.cwrjcn\.com
+https?:\/\/([^\/]*\.)?tyra-dna0lnjav\.blogspot\.com
+https?:\/\/([^\/]*\.)?tytiana-bjag\.blogspot\.com
+https?:\/\/([^\/]*\.)?tyvj5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uaobs\.szm\.sk
+https?:\/\/([^\/]*\.)?ub-mongolia\.mn
+https?:\/\/([^\/]*\.)?ubasak\.stabilt\.se
+https?:\/\/([^\/]*\.)?ubpmr\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ucdrun\.forumzen\.com
+https?:\/\/([^\/]*\.)?ucol2\.szm\.sk
+https?:\/\/([^\/]*\.)?udqhh\.szm\.sk
+https?:\/\/([^\/]*\.)?udtm7\.szm\.sk
+https?:\/\/([^\/]*\.)?uemhpgv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uglyjezz\.asp2\.cz
+https?:\/\/([^\/]*\.)?ugmhq\.szm\.sk
+https?:\/\/([^\/]*\.)?ukbettingweb\.com
+https?:\/\/([^\/]*\.)?ukek-hin\.isuisse\.com
+https?:\/\/([^\/]*\.)?ukrosi\.com
+https?:\/\/([^\/]*\.)?uksr9\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ulqj9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ultimateairpurifier\.com
+https?:\/\/([^\/]*\.)?ultimatesurrender-com-bkio\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultimatesurrender-com-bm8z1b\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultimatesurrender-com-c75r71j2e\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultracet\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ultradonkey-com-acp\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultradonkey-com-ag0\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultram-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultram\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?ultram\.47\.pl
+https?:\/\/([^\/]*\.)?ultram\.goodpharm\.info
+https?:\/\/([^\/]*\.)?ultram\.hav\.pl
+https?:\/\/([^\/]*\.)?ultram\.is-a-geek\.com
+https?:\/\/([^\/]*\.)?ultram\.serveftp\.com
+https?:\/\/([^\/]*\.)?ultram\.skocz\.net
+https?:\/\/([^\/]*\.)?ultrameds\.dtdns\.net
+https?:\/\/([^\/]*\.)?ultrams\.eu\.tf
+https?:\/\/([^\/]*\.)?ultrasexmovies-com-dm2dmh\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultrasexmovies-com-dz02q7\.blogspot\.com
+https?:\/\/([^\/]*\.)?ultrasexmovies-com-zujuz\.blogspot\.com
+https?:\/\/([^\/]*\.)?umax-forum\.com
+https?:\/\/([^\/]*\.)?umax-ppc\.com
+https?:\/\/([^\/]*\.)?umax-se\.com
+https?:\/\/([^\/]*\.)?umax-se\.info
+https?:\/\/([^\/]*\.)?umax-search-ppc-se-board\.com
+https?:\/\/([^\/]*\.)?umax-search-se\.com
+https?:\/\/([^\/]*\.)?umax-search\.net
+https?:\/\/([^\/]*\.)?umaxppc\.com
+https?:\/\/([^\/]*\.)?umaxse\.net
+https?:\/\/([^\/]*\.)?umaxse\.org
+https?:\/\/([^\/]*\.)?umaxsearch-search-engine\.com
+https?:\/\/([^\/]*\.)?umojucd\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?umsbm\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?un-fois\.blogspot\.com
+https?:\/\/([^\/]*\.)?un-nachrichten\.de
+https?:\/\/([^\/]*\.)?unbelievable-poker\.com
+https?:\/\/([^\/]*\.)?uncledeadly83\.blogspot\.com
+https?:\/\/([^\/]*\.)?understandish\.50webs\.org
+https?:\/\/([^\/]*\.)?unglaublichkeiten\.com
+https?:\/\/([^\/]*\.)?unicom\.027168\.com
+https?:\/\/([^\/]*\.)?uniform2nursing\.chat\.ru
+https?:\/\/([^\/]*\.)?unit01\.com
+https?:\/\/([^\/]*\.)?united-airline\.boom\.ru
+https?:\/\/([^\/]*\.)?united24\.com
+https?:\/\/([^\/]*\.)?unitedinchristchurch\.org
+https?:\/\/([^\/]*\.)?universal-hosting\.net
+https?:\/\/([^\/]*\.)?university-degre\.boom\.ru
+https?:\/\/([^\/]*\.)?university1degre\.chat\.ru
+https?:\/\/([^\/]*\.)?unixbrewers\.org
+https?:\/\/([^\/]*\.)?unka\.su\.pl
+https?:\/\/([^\/]*\.)?unseenoyster\.blogspot\.com
+https?:\/\/([^\/]*\.)?unwqs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uobasdel\.fr-bb\.com
+https?:\/\/([^\/]*\.)?uokx8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uous6\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?up-skirt-butt\.medved\.odessa\.ua
+https?:\/\/([^\/]*\.)?updatenames\.dtdns\.net
+https?:\/\/([^\/]*\.)?upskirt-ebony-teen\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?upskirt-gallery-leg\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?upskirtsexxfh\.blogspot\.com
+https?:\/\/([^\/]*\.)?upwaldru\.ifrance\.com
+https?:\/\/([^\/]*\.)?uraharaben1hime\.blogspot\.com
+https?:\/\/([^\/]*\.)?urkrdh5\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?urky5\.szm\.sk
+https?:\/\/([^\/]*\.)?us-senator-dick-durbin\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?us-viagra\.us
+https?:\/\/([^\/]*\.)?us\.kopuz\.com
+https?:\/\/([^\/]*\.)?usa-online-pharmacy\.net
+https?:\/\/([^\/]*\.)?usa568\.com
+https?:\/\/([^\/]*\.)?usaah\.com
+https?:\/\/([^\/]*\.)?usbestlawyer\.org
+https?:\/\/([^\/]*\.)?usbuorl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?usednotebooks\.ru
+https?:\/\/([^\/]*\.)?ushoh\.szm\.sk
+https?:\/\/([^\/]*\.)?uskbbb9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?usuc\.us
+https?:\/\/([^\/]*\.)?uszfp\.szm\.sk
+https?:\/\/([^\/]*\.)?utahmortgage-x\.com
+https?:\/\/([^\/]*\.)?utranslate\.org
+https?:\/\/([^\/]*\.)?utranslation\.net
+https?:\/\/([^\/]*\.)?uucwsw7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uulitr\.forumzen\.com
+https?:\/\/([^\/]*\.)?uulive\.info
+https?:\/\/([^\/]*\.)?uvfotuc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uvgpy\.szm\.sk
+https?:\/\/([^\/]*\.)?uvndhxh\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uwacadweb\.uwyo\.edu
+https?:\/\/([^\/]*\.)?uwek\.info
+https?:\/\/([^\/]*\.)?uxyei\.szm\.sk
+https?:\/\/([^\/]*\.)?uyjdrg3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?uzfde\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?uzzclm9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?v-f-sex-video-clip-g\.blogspot\.com
+https?:\/\/([^\/]*\.)?v-j-big-movie-tit-v\.blogspot\.com
+https?:\/\/([^\/]*\.)?v1h\.com
+https?:\/\/([^\/]*\.)?v5wednesday\.info
+https?:\/\/([^\/]*\.)?v7njlwgd\.nokedem\.com
+https?:\/\/([^\/]*\.)?vacanza-barcellona\.zoom10x\.info
+https?:\/\/([^\/]*\.)?vacanza-montagna\.freespase\.info
+https?:\/\/([^\/]*\.)?vacanza-neve\.zoom4x\.info
+https?:\/\/([^\/]*\.)?vacanza-toscana\.host24h\.info
+https?:\/\/([^\/]*\.)?vacuums\.be
+https?:\/\/([^\/]*\.)?vahitchc\.dl\.pl
+https?:\/\/([^\/]*\.)?valiubusines\.blogcu\.com
+https?:\/\/([^\/]*\.)?valium-911\.coz\.in
+https?:\/\/([^\/]*\.)?valium-cc\.blogspot\.com
+https?:\/\/([^\/]*\.)?valium-cheap\.18\.to
+https?:\/\/([^\/]*\.)?valium-online\.cheapills\.info
+https?:\/\/([^\/]*\.)?valium-qrxo\.blogspot\.com
+https?:\/\/([^\/]*\.)?valium\.269g\.net
+https?:\/\/([^\/]*\.)?valium\.47\.pl
+https?:\/\/([^\/]*\.)?valium\.goodpharm\.info
+https?:\/\/([^\/]*\.)?valium\.skocz\.net
+https?:\/\/([^\/]*\.)?valium\.su\.pl
+https?:\/\/([^\/]*\.)?valiumnx\.u\.yuku\.com
+https?:\/\/([^\/]*\.)?valiums\.eu\.tf
+https?:\/\/([^\/]*\.)?valleyswap\.info
+https?:\/\/([^\/]*\.)?valtrex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?vametase\.com
+https?:\/\/([^\/]*\.)?vands88\.blogspot\.com
+https?:\/\/([^\/]*\.)?vanhelsingsgirl\.datadiri\.cc
+https?:\/\/([^\/]*\.)?vaniqa\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?varac\.heavenforum\.com
+https?:\/\/([^\/]*\.)?varac\.highforum\.net
+https?:\/\/([^\/]*\.)?varelvi\.discutfree\.com
+https?:\/\/([^\/]*\.)?varnish\.8888mb\.com
+https?:\/\/([^\/]*\.)?varnotr\.naturalforum\.net
+https?:\/\/([^\/]*\.)?varoracel\.bbfr\.net
+https?:\/\/([^\/]*\.)?varracleto\.dl\.pl
+https?:\/\/([^\/]*\.)?vazicoj\.info
+https?:\/\/([^\/]*\.)?vboya\.9999mb\.com
+https?:\/\/([^\/]*\.)?vcjwc\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?vcpk9\.szm\.sk
+https?:\/\/([^\/]*\.)?vcsps\.com
+https?:\/\/([^\/]*\.)?vdpf4\.szm\.sk
+https?:\/\/([^\/]*\.)?ve-alisa\.blogspot\.com
+https?:\/\/([^\/]*\.)?vegetnuks\.blogspot\.com
+https?:\/\/([^\/]*\.)?veggis\.org\.cn
+https?:\/\/([^\/]*\.)?vehal\.com
+https?:\/\/([^\/]*\.)?vek-xxxpower-net\.blogspot\.com
+https?:\/\/([^\/]*\.)?velvetimalice\.ibelgique\.com
+https?:\/\/([^\/]*\.)?vemiles\.ifrance\.com
+https?:\/\/([^\/]*\.)?verba\.dyndns\.dk
+https?:\/\/([^\/]*\.)?verfolva\.blogspot\.com
+https?:\/\/([^\/]*\.)?veriel\.dl\.pl
+https?:\/\/([^\/]*\.)?verizonringtonersy\.blogspot\.com
+https?:\/\/([^\/]*\.)?verizonringtonesdvf\.blogspot\.com
+https?:\/\/([^\/]*\.)?vermontmortgage-x\.com
+https?:\/\/([^\/]*\.)?vertyg\.org
+https?:\/\/([^\/]*\.)?veryge\.com
+https?:\/\/([^\/]*\.)?veryprivatebanking\.info
+https?:\/\/([^\/]*\.)?vestuk\.com
+https?:\/\/([^\/]*\.)?veterinar\.spb\.ru
+https?:\/\/([^\/]*\.)?vets\.appliedphysics\.swri\.edu
+https?:\/\/([^\/]*\.)?vfrkiv6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vfrrto\.org
+https?:\/\/([^\/]*\.)?vhuekxi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vi-allo\.blogspot\.com
+https?:\/\/([^\/]*\.)?viadele\.dl\.pl
+https?:\/\/([^\/]*\.)?viagaravaegra\.com
+https?:\/\/([^\/]*\.)?viaggi-del-ventaglio\.forumhst\.info
+https?:\/\/([^\/]*\.)?viagra-4u\.us
+https?:\/\/([^\/]*\.)?viagra-online\.presteert\.nl
+https?:\/\/([^\/]*\.)?viagra-soft-tabs\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?viagra\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?viagra\.cheapills\.info
+https?:\/\/([^\/]*\.)?viagra\.edu\.tf
+https?:\/\/([^\/]*\.)?viagra\.esguay\.com
+https?:\/\/([^\/]*\.)?viagra\.inc5\.com
+https?:\/\/([^\/]*\.)?viagra\.rx4\.org
+https?:\/\/([^\/]*\.)?viagra\.skocz\.net
+https?:\/\/([^\/]*\.)?viagrai\.blogspot\.com
+https?:\/\/([^\/]*\.)?viagraorder\.mail15\.com
+https?:\/\/([^\/]*\.)?viagraq\.bloggingmylife\.com
+https?:\/\/([^\/]*\.)?viagrarx\.weboficial\.com
+https?:\/\/([^\/]*\.)?vicodin-pharm\.fws1\.com
+https?:\/\/([^\/]*\.)?vicodin\.269g\.net
+https?:\/\/([^\/]*\.)?vicodin\.conto\.pl
+https?:\/\/([^\/]*\.)?vicodin\.esguay\.com
+https?:\/\/([^\/]*\.)?vicodin\.guu\.pl
+https?:\/\/([^\/]*\.)?vicodin88\.tblog\.com
+https?:\/\/([^\/]*\.)?victoria-silvstedt\.freehostss\.info
+https?:\/\/([^\/]*\.)?videlric\.dl\.pl
+https?:\/\/([^\/]*\.)?video-comico\.host24h\.info
+https?:\/\/([^\/]*\.)?video-porn-caseros-ju\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-porn-gratis-sod\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-post-com-bejiq\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-post-com-bfoybt\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-post-com-my\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-post-com-thumbview-rehif\.blogspot\.com
+https?:\/\/([^\/]*\.)?video-spot-sexy\.19mb\.info
+https?:\/\/([^\/]*\.)?video-spot-sexy\.you-bizz\.info
+https?:\/\/([^\/]*\.)?video-whore-bb-bb-b\.blogspot\.com
+https?:\/\/([^\/]*\.)?videosection-com-h0xon\.blogspot\.com
+https?:\/\/([^\/]*\.)?videosection-com-w1w\.blogspot\.com
+https?:\/\/([^\/]*\.)?videosection-com-w62l\.blogspot\.com
+https?:\/\/([^\/]*\.)?videosharez\.com
+https?:\/\/([^\/]*\.)?vidgals-com-e13sc4yv0\.blogspot\.com
+https?:\/\/([^\/]*\.)?vidgals-com-e6ig7a\.blogspot\.com
+https?:\/\/([^\/]*\.)?vidgals-com-edvo\.blogspot\.com
+https?:\/\/([^\/]*\.)?vidronla\.blogcu\.com
+https?:\/\/([^\/]*\.)?vielsit\.su\.pl
+https?:\/\/([^\/]*\.)?vietnamparadisetravel\.com
+https?:\/\/([^\/]*\.)?viewerswives-net-c4\.blogspot\.com
+https?:\/\/([^\/]*\.)?viewerswives-net-oc\.blogspot\.com
+https?:\/\/([^\/]*\.)?viewgals-com-ah\.blogspot\.com
+https?:\/\/([^\/]*\.)?viewgals-com-il253r\.blogspot\.com
+https?:\/\/([^\/]*\.)?vigduk30\.xshorturl\.com
+https?:\/\/([^\/]*\.)?vigetleto\.heavenforum\.com
+https?:\/\/([^\/]*\.)?vihl6\.szm\.sk
+https?:\/\/([^\/]*\.)?viliolo\.winnerforum\.net
+https?:\/\/([^\/]*\.)?village\.asp2\.cz
+https?:\/\/([^\/]*\.)?villaggio-ischia\.ll11\.info
+https?:\/\/([^\/]*\.)?vinnie-1-hit\.blogspot\.com
+https?:\/\/([^\/]*\.)?vintage\.sexcluborgy\.net
+https?:\/\/([^\/]*\.)?vioxx\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?vioxx\.3d-game\.com
+https?:\/\/([^\/]*\.)?vipasrel\.cultureforum\.net
+https?:\/\/([^\/]*\.)?vipcrew-com-bj\.blogspot\.com
+https?:\/\/([^\/]*\.)?vipcrew-com-r0w\.blogspot\.com
+https?:\/\/([^\/]*\.)?vipcrew-com-rs74r7iy5\.blogspot\.com
+https?:\/\/([^\/]*\.)?viphls\.com
+https?:\/\/([^\/]*\.)?vipliz\.com
+https?:\/\/([^\/]*\.)?vipmsite\.com
+https?:\/\/([^\/]*\.)?virgin-porn\.futureblog\.org
+https?:\/\/([^\/]*\.)?virgin-sexy\.com
+https?:\/\/([^\/]*\.)?virginfucked-com-h200n1lxcg\.blogspot\.com
+https?:\/\/([^\/]*\.)?virginiamortgage-x\.com
+https?:\/\/([^\/]*\.)?viricrel\.lolbb\.com
+https?:\/\/([^\/]*\.)?virinok\.dynamicforum\.net
+https?:\/\/([^\/]*\.)?virtualeinfiniti\.cn
+https?:\/\/([^\/]*\.)?vitalitymax\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?vivino\.ephpbb\.com
+https?:\/\/([^\/]*\.)?vizelvar\.frbb\.net
+https?:\/\/([^\/]*\.)?vjkavu6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vjsgby0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vjuk7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vjwm2\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?vkblq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vksfucm\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vmdes\.com
+https?:\/\/([^\/]*\.)?vmpi4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vmvip\.com
+https?:\/\/([^\/]*\.)?vmvip\.net
+https?:\/\/([^\/]*\.)?vmvip\.org
+https?:\/\/([^\/]*\.)?vo-free-oral-movie-clip-toc\.blogspot\.com
+https?:\/\/([^\/]*\.)?voip-guide\.org
+https?:\/\/([^\/]*\.)?vol-soft17-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?voli-amsterdam\.freespase\.info
+https?:\/\/([^\/]*\.)?voli-argentina\.zoom10x\.info
+https?:\/\/([^\/]*\.)?voli-londra\.freespase\.info
+https?:\/\/([^\/]*\.)?voli-spagna\.freespase\.info
+https?:\/\/([^\/]*\.)?volume5\.8888mb\.com
+https?:\/\/([^\/]*\.)?voxn2\.szm\.sk
+https?:\/\/([^\/]*\.)?voyeur-video-amateur-free\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?voyeurzine-com-af2\.blogspot\.com
+https?:\/\/([^\/]*\.)?voyeurzine-com-dbhx1q\.blogspot\.com
+https?:\/\/([^\/]*\.)?voyiu\.szm\.sk
+https?:\/\/([^\/]*\.)?vpbu1\.szm\.sk
+https?:\/\/([^\/]*\.)?vrlw9\.szm\.sk
+https?:\/\/([^\/]*\.)?vrnjgk1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vstqfs3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vtop\.fateback\.com
+https?:\/\/([^\/]*\.)?vtop\.kilu\.de
+https?:\/\/([^\/]*\.)?vtop\.topcities\.com
+https?:\/\/([^\/]*\.)?vtrxzzwj-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?vttolldd\.org
+https?:\/\/([^\/]*\.)?vttthtgg\.org
+https?:\/\/([^\/]*\.)?vtwm7\.szm\.sk
+https?:\/\/([^\/]*\.)?vu-alias\.blogspot\.com
+https?:\/\/([^\/]*\.)?vu-aliases\.blogspot\.com
+https?:\/\/([^\/]*\.)?vu-free-big-sex-movie-fen\.blogspot\.com
+https?:\/\/([^\/]*\.)?vud-vipcrew-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?vue\.uit\.tufts\.edu
+https?:\/\/([^\/]*\.)?vulgarisprime\.50webs\.org
+https?:\/\/([^\/]*\.)?vuqi-alana\.blogspot\.com
+https?:\/\/([^\/]*\.)?vutwwd6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vuzeq-sex-video-d\.blogspot\.com
+https?:\/\/([^\/]*\.)?vvaliumonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?vvline\.info
+https?:\/\/([^\/]*\.)?vwjr2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vwzm6\.szm\.sk
+https?:\/\/([^\/]*\.)?vyqdvf1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?vyuf9\.szm\.sk
+https?:\/\/([^\/]*\.)?vzevz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?w-q-elmo-extreme-video-n\.blogspot\.com
+https?:\/\/([^\/]*\.)?w-s-free-gay-sex-video-l\.blogspot\.com
+https?:\/\/([^\/]*\.)?w2\.ftpcn\.cn
+https?:\/\/([^\/]*\.)?w528\.com
+https?:\/\/([^\/]*\.)?wacks\.info
+https?:\/\/([^\/]*\.)?wak1ngmel0dies\.blogspot\.com
+https?:\/\/([^\/]*\.)?walker-ross\.com
+https?:\/\/([^\/]*\.)?walkerproconsulting\.com
+https?:\/\/([^\/]*\.)?walt-disney-world-travel\.globaltr\.info
+https?:\/\/([^\/]*\.)?wanadoo-fr-eyn6u1yt0\.blogspot\.com
+https?:\/\/([^\/]*\.)?wanadoo-fr-gsz\.blogspot\.com
+https?:\/\/([^\/]*\.)?wanadoo-fr-i0iq\.blogspot\.com
+https?:\/\/([^\/]*\.)?wannawatch-com-k1rckf8\.blogspot\.com
+https?:\/\/([^\/]*\.)?wannawatch-com-krz7dxd5a\.blogspot\.com
+https?:\/\/([^\/]*\.)?wannawatch-com-oaeedr\.blogspot\.com
+https?:\/\/([^\/]*\.)?wapzhijia\.com
+https?:\/\/([^\/]*\.)?waserk\.com
+https?:\/\/([^\/]*\.)?washingtonmortgage-x\.com
+https?:\/\/([^\/]*\.)?watch-free-porn-clip-zone43l\.blogspot\.com
+https?:\/\/([^\/]*\.)?watch-free-porn-clip-zonekjl\.blogspot\.com
+https?:\/\/([^\/]*\.)?watch-free-porn-video-bu\.blogspot\.com
+https?:\/\/([^\/]*\.)?watchersweb-com-t61o4wrr4h\.blogspot\.com
+https?:\/\/([^\/]*\.)?watchersweb-com-tnwrlyoqk\.blogspot\.com
+https?:\/\/([^\/]*\.)?watchingthetube\.com
+https?:\/\/([^\/]*\.)?water\.toxhost\.com
+https?:\/\/([^\/]*\.)?waxen\.kwik\.to
+https?:\/\/([^\/]*\.)?wbun7\.szm\.sk
+https?:\/\/([^\/]*\.)?wc1\.worldcrossing\.com
+https?:\/\/([^\/]*\.)?we-alfred\.blogspot\.com
+https?:\/\/([^\/]*\.)?we-alondra\.blogspot\.com
+https?:\/\/([^\/]*\.)?we-lesbian-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?web\.missouri\.edu
+https?:\/\/([^\/]*\.)?web\.scc\.losrios\.edu
+https?:\/\/([^\/]*\.)?web\.skku\.edu
+https?:\/\/([^\/]*\.)?web55\.info
+https?:\/\/([^\/]*\.)?webhost11\.com
+https?:\/\/([^\/]*\.)?webhosting-x\.com
+https?:\/\/([^\/]*\.)?weblog\.xanga\.com
+https?:\/\/([^\/]*\.)?webmd-drugs\.com
+https?:\/\/([^\/]*\.)?websz\.com
+https?:\/\/([^\/]*\.)?wedding-knot\.com
+https?:\/\/([^\/]*\.)?weddingactions\.com
+https?:\/\/([^\/]*\.)?wedner\.info
+https?:\/\/([^\/]*\.)?weekly-pay\.com
+https?:\/\/([^\/]*\.)?weersa\.com
+https?:\/\/([^\/]*\.)?weight-loss\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?weixing\.hk\.cn
+https?:\/\/([^\/]*\.)?welisi\.hk
+https?:\/\/([^\/]*\.)?welivetogether-com-ek6boac\.blogspot\.com
+https?:\/\/([^\/]*\.)?welivetogether-com-oc7yzd4ev\.blogspot\.com
+https?:\/\/([^\/]*\.)?welivetogether-com-wcu8\.blogspot\.com
+https?:\/\/([^\/]*\.)?wellbutrin\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?wellbutrin\.php5\.cz
+https?:\/\/([^\/]*\.)?wenmasterworld\.com
+https?:\/\/([^\/]*\.)?werdq\.com
+https?:\/\/([^\/]*\.)?wess\.250free\.com
+https?:\/\/([^\/]*\.)?westvirginiamortgage-x\.com
+https?:\/\/([^\/]*\.)?wet-mature-slut\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?wet-pussy-cum-shot\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?wet-teen-panties-wen\.blogspot\.com
+https?:\/\/([^\/]*\.)?wetplace-com-g16jfp6\.blogspot\.com
+https?:\/\/([^\/]*\.)?wfkd3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wgxq2\.szm\.sk
+https?:\/\/([^\/]*\.)?whipped-ass-slut\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?whipsnorkel\.275mb\.com
+https?:\/\/([^\/]*\.)?white-guys-fucking-black-teen\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?whitehole\.republika\.pl
+https?:\/\/([^\/]*\.)?wholesale-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?whorevideos-com-hj8shgp\.blogspot\.com
+https?:\/\/([^\/]*\.)?whorevideos-com-wddx\.blogspot\.com
+https?:\/\/([^\/]*\.)?whorevideos-txe5g0x\.blogspot\.com
+https?:\/\/([^\/]*\.)?whpsjw1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?whss0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wierdporno-com-kur70yvrl0\.blogspot\.com
+https?:\/\/([^\/]*\.)?wifi-planet\.org
+https?:\/\/([^\/]*\.)?wiku-aikman\.blogspot\.com
+https?:\/\/([^\/]*\.)?wild-party-fuck\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?wild-poker\.com
+https?:\/\/([^\/]*\.)?willeyfordmazda\.info
+https?:\/\/([^\/]*\.)?win-for-italy\.info
+https?:\/\/([^\/]*\.)?wind\.8888mb\.com
+https?:\/\/([^\/]*\.)?winter-gossamer\.blogspot\.com
+https?:\/\/([^\/]*\.)?winter\.12gbfree\.com
+https?:\/\/([^\/]*\.)?wired-shemales\.lampa\.ipupdater\.com
+https?:\/\/([^\/]*\.)?wiremesh-guanda\.com
+https?:\/\/([^\/]*\.)?wisconsinmortgage-x\.com
+https?:\/\/([^\/]*\.)?wisdom123\.com
+https?:\/\/([^\/]*\.)?wisewomanguide\.com
+https?:\/\/([^\/]*\.)?wisnp\.szm\.sk
+https?:\/\/([^\/]*\.)?wix-timsmovies-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?wizingsh\.dl\.pl
+https?:\/\/([^\/]*\.)?wjch5\.szm\.sk
+https?:\/\/([^\/]*\.)?wjhh9\.szm\.sk
+https?:\/\/([^\/]*\.)?wjjk0\.szm\.sk
+https?:\/\/([^\/]*\.)?wjsueg-free-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?wkelleylucas\.com
+https?:\/\/([^\/]*\.)?wkfsi774k\.org
+https?:\/\/([^\/]*\.)?wljp9\.szm\.sk
+https?:\/\/([^\/]*\.)?wm-u\.com
+https?:\/\/([^\/]*\.)?wmis\.com\.cn
+https?:\/\/([^\/]*\.)?wmlpv\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wmtnd\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wnwr5\.szm\.sk
+https?:\/\/([^\/]*\.)?woilco6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wolflist-com-rkj7d3\.blogspot\.com
+https?:\/\/([^\/]*\.)?wolverine-steel-toe-work-boot\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?woman-masturbating-man\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?woman-who-can-lick-their-own-pussy\.gameover\.in\.ua
+https?:\/\/([^\/]*\.)?woman-who-fuck-donkey\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?woman-with-prosthetic-leg\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?womansmith\.com
+https?:\/\/([^\/]*\.)?women-fitness\.org
+https?:\/\/([^\/]*\.)?womens-hard-nipples\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?womens-snake-boot\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?woolygrrl\.blogspot\.com
+https?:\/\/([^\/]*\.)?worldsex-com-byzv1xjl\.blogspot\.com
+https?:\/\/([^\/]*\.)?worldsex-com-eqn4b\.blogspot\.com
+https?:\/\/([^\/]*\.)?worldtalktv\.net\.ru
+https?:\/\/([^\/]*\.)?worldufo\.net\.ru
+https?:\/\/([^\/]*\.)?worldwide-games\.net
+https?:\/\/([^\/]*\.)?worldwide-online-pharmacy\.net
+https?:\/\/([^\/]*\.)?worldwide-tramadol\.net
+https?:\/\/([^\/]*\.)?woro-adriana\.blogspot\.com
+https?:\/\/([^\/]*\.)?wot-smutgremlins-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?wow-gold\.dinmo\.cn
+https?:\/\/([^\/]*\.)?wow-powerleveling-wow\.com
+https?:\/\/([^\/]*\.)?wowgold\.org\.cn
+https?:\/\/([^\/]*\.)?wowtgp-com-ap4y\.blogspot\.com
+https?:\/\/([^\/]*\.)?wowvids-com-ooiofshz5\.blogspot\.com
+https?:\/\/([^\/]*\.)?woww0\.szm\.sk
+https?:\/\/([^\/]*\.)?wpgt1\.szm\.sk
+https?:\/\/([^\/]*\.)?wpnvjk9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wqhnog2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wqr\.cn
+https?:\/\/([^\/]*\.)?wrnf9\.szm\.sk
+https?:\/\/([^\/]*\.)?wshcroq\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wsuonline\.weber\.edu
+https?:\/\/([^\/]*\.)?wszqc\.szm\.sk
+https?:\/\/([^\/]*\.)?wtrpfpa\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wuconweb\.wustl\.edu
+https?:\/\/([^\/]*\.)?wujin\.dzsc\.com
+https?:\/\/([^\/]*\.)?wulzi\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wvuf0\.szm\.sk
+https?:\/\/([^\/]*\.)?wvwd6\.szm\.sk
+https?:\/\/([^\/]*\.)?wwfedgechristian\.com
+https?:\/\/([^\/]*\.)?wwlive\.info
+https?:\/\/([^\/]*\.)?wwtop\.info
+https?:\/\/([^\/]*\.)?www-girlygangbang-com\.magnesia\.dtdns\.net
+https?:\/\/([^\/]*\.)?www-loadmymouth-com\.klose\.ipupdater\.com
+https?:\/\/([^\/]*\.)?www-shemales-from-hell-com\.magnesia\.dtdns\.net
+https?:\/\/([^\/]*\.)?www\.aet\.cup\.edu
+https?:\/\/([^\/]*\.)?www\.ags\.uci\.edu
+https?:\/\/([^\/]*\.)?www\.chaco\.gov\.ar
+https?:\/\/([^\/]*\.)?www\.coe\.ohio-state\.edu
+https?:\/\/([^\/]*\.)?www\.csulb\.edu
+https?:\/\/([^\/]*\.)?www\.cucsur\.udg\.mx
+https?:\/\/([^\/]*\.)?www\.depts\.ttu\.edu
+https?:\/\/([^\/]*\.)?www\.elie\.com\.cn
+https?:\/\/([^\/]*\.)?www\.forourbano\.gov\.ar
+https?:\/\/([^\/]*\.)?www\.grad\.english\.ttu\.edu
+https?:\/\/([^\/]*\.)?www\.hcs\.harvard\.edu
+https?:\/\/([^\/]*\.)?www\.health-livening\.com
+https?:\/\/([^\/]*\.)?www\.imperial\.edu
+https?:\/\/([^\/]*\.)?www\.isis\.vanderbilt\.edu
+https?:\/\/([^\/]*\.)?www\.leal-alfa\.upc\.edu
+https?:\/\/([^\/]*\.)?www\.ns\.ui\.edu
+https?:\/\/([^\/]*\.)?www\.oswego\.edu
+https?:\/\/([^\/]*\.)?www\.oznet\.ksu\.edu
+https?:\/\/([^\/]*\.)?www\.polisci\.berkeley\.edu
+https?:\/\/([^\/]*\.)?www\.redwingnet\.com
+https?:\/\/([^\/]*\.)?www\.rit\.edu
+https?:\/\/([^\/]*\.)?www\.rso\.cmich\.edu
+https?:\/\/([^\/]*\.)?www\.sccs\.swarthmore\.edu
+https?:\/\/([^\/]*\.)?www\.sportsbackers\.org
+https?:\/\/([^\/]*\.)?www\.tamug\.edu
+https?:\/\/([^\/]*\.)?www\.ug\.it\.usyd\.edu\.au
+https?:\/\/([^\/]*\.)?www\.uky\.edu
+https?:\/\/([^\/]*\.)?www\.wvup\.edu
+https?:\/\/([^\/]*\.)?www1\.freehostingguru\.com
+https?:\/\/([^\/]*\.)?www2\.cs\.washington\.edu
+https?:\/\/([^\/]*\.)?www3\.ddns\.ms
+https?:\/\/([^\/]*\.)?www4\.epac\.to
+https?:\/\/([^\/]*\.)?www4\.nau\.edu
+https?:\/\/([^\/]*\.)?www4\.vjc\.edu
+https?:\/\/([^\/]*\.)?www6\.ezua\.com
+https?:\/\/([^\/]*\.)?www6\.ns1\.name
+https?:\/\/([^\/]*\.)?www69\.bestdeals\.at
+https?:\/\/([^\/]*\.)?www69\.byinter\.net
+https?:\/\/([^\/]*\.)?www69\.dynu\.com
+https?:\/\/([^\/]*\.)?www69\.findhere\.org
+https?:\/\/([^\/]*\.)?www69\.fw\.nu
+https?:\/\/([^\/]*\.)?www69\.ugly\.as
+https?:\/\/([^\/]*\.)?www7\.25u\.com
+https?:\/\/([^\/]*\.)?www7\.ygto\.com
+https?:\/\/([^\/]*\.)?www8\.ns01\.us
+https?:\/\/([^\/]*\.)?www9\.servequake\.com
+https?:\/\/([^\/]*\.)?www9\.trickip\.org
+https?:\/\/([^\/]*\.)?www99\.bounceme\.net
+https?:\/\/([^\/]*\.)?www99\.zapto\.org
+https?:\/\/([^\/]*\.)?wwweazol\.znamka\.yi\.org
+https?:\/\/([^\/]*\.)?wwwmenozac\.gumaky\.yi\.org
+https?:\/\/([^\/]*\.)?wwwpeterscumshotscom\.jalovica\.dtdns\.net
+https?:\/\/([^\/]*\.)?wwwpornweekcom\.lampa\.ipupdater\.com
+https?:\/\/([^\/]*\.)?wwwtheluckymancom\.hrable\.dtdns\.net
+https?:\/\/([^\/]*\.)?wxcl6\.szm\.sk
+https?:\/\/([^\/]*\.)?wxmbv\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?wxsbjx\.com
+https?:\/\/([^\/]*\.)?wxzgyb\.com
+https?:\/\/([^\/]*\.)?wy-ls\.com
+https?:\/\/([^\/]*\.)?wyeax\.szm\.sk
+https?:\/\/([^\/]*\.)?wyloguj\.php5\.cz
+https?:\/\/([^\/]*\.)?wyomingmortgage-x\.com
+https?:\/\/([^\/]*\.)?wywurxj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wzcub\.szm\.sk
+https?:\/\/([^\/]*\.)?wzhj\.com\.cn
+https?:\/\/([^\/]*\.)?wzhjom6\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?wzlsx\.com
+https?:\/\/([^\/]*\.)?x-cialis\.be
+https?:\/\/([^\/]*\.)?x-ho-com-m23lsy\.blogspot\.com
+https?:\/\/([^\/]*\.)?x-ho-com-mlk2tai422\.blogspot\.com
+https?:\/\/([^\/]*\.)?x-orgy-com-in7nn0o1\.blogspot\.com
+https?:\/\/([^\/]*\.)?x24\.xxuz\.com
+https?:\/\/([^\/]*\.)?x25\.2mydns\.com
+https?:\/\/([^\/]*\.)?x25\.plorp\.com
+https?:\/\/([^\/]*\.)?x4\.lov3\.net
+https?:\/\/([^\/]*\.)?x6x\.a\.la
+https?:\/\/([^\/]*\.)?x888x\.myserver\.org
+https?:\/\/([^\/]*\.)?x8x\.trickip\.net
+https?:\/\/([^\/]*\.)?xadultpersonals\.com
+https?:\/\/([^\/]*\.)?xafengyuan\.com
+https?:\/\/([^\/]*\.)?xaltc\.szm\.sk
+https?:\/\/([^\/]*\.)?xanax-911\.coz\.in
+https?:\/\/([^\/]*\.)?xanax-acpq\.blogspot\.com
+https?:\/\/([^\/]*\.)?xanax-ccc\.blogspot\.com
+https?:\/\/([^\/]*\.)?xanax-lyiy\.blogspot\.com
+https?:\/\/([^\/]*\.)?xanax-online\.cheapills\.info
+https?:\/\/([^\/]*\.)?xanax\.esguay\.com
+https?:\/\/([^\/]*\.)?xanax\.goodpharm\.info
+https?:\/\/([^\/]*\.)?xanax\.skocz\.net
+https?:\/\/([^\/]*\.)?xanax\.su\.pl
+https?:\/\/([^\/]*\.)?xanaxnx\.u\.yuku\.com
+https?:\/\/([^\/]*\.)?xawcj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xboct13\.blogspot\.com
+https?:\/\/([^\/]*\.)?xbyzkngo-teensite\.blogspot\.com
+https?:\/\/([^\/]*\.)?xcp\.51mp4mp3\.com
+https?:\/\/([^\/]*\.)?xd-fw\.com
+https?:\/\/([^\/]*\.)?xdwxs\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xdzs\.com\.cn
+https?:\/\/([^\/]*\.)?xef-publicinvasion-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?xejedot-sophie-marceau-c\.blogspot\.com
+https?:\/\/([^\/]*\.)?xelby0\.blogspot\.com
+https?:\/\/([^\/]*\.)?xenical\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?xenical\.1k\.pl
+https?:\/\/([^\/]*\.)?xenicallem\.queroumforum\.com
+https?:\/\/([^\/]*\.)?xfdr7\.szm\.sk
+https?:\/\/([^\/]*\.)?xfokcw0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xgdlfj\.com
+https?:\/\/([^\/]*\.)?xhttp\.net
+https?:\/\/([^\/]*\.)?xian-hua\.nease\.net
+https?:\/\/([^\/]*\.)?xiangyujipiao\.com
+https?:\/\/([^\/]*\.)?xibch\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xih-snakesworld-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?xih-topless-babes-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?xihdl\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xionny\.cn
+https?:\/\/([^\/]*\.)?xitokiry\.blogspot\.com
+https?:\/\/([^\/]*\.)?xiwhr\.szm\.sk
+https?:\/\/([^\/]*\.)?xjenhx\.blogspot\.com
+https?:\/\/([^\/]*\.)?xlala\.com
+https?:\/\/([^\/]*\.)?xlale\.com
+https?:\/\/([^\/]*\.)?xlalu\.com
+https?:\/\/([^\/]*\.)?xlvc3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xlxx-com-i0xeru\.blogspot\.com
+https?:\/\/([^\/]*\.)?xlxx-fokiq\.blogspot\.com
+https?:\/\/([^\/]*\.)?xlxx-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?xmail\.net
+https?:\/\/([^\/]*\.)?xmodem-mal\.blogspot\.com
+https?:\/\/([^\/]*\.)?xnbs1\.szm\.sk
+https?:\/\/([^\/]*\.)?xnews\.soad\.umich\.edu
+https?:\/\/([^\/]*\.)?xnxx-com-e06t\.blogspot\.com
+https?:\/\/([^\/]*\.)?xnxx-crcdfs0jy6\.blogspot\.com
+https?:\/\/([^\/]*\.)?xnxxmovies-com-bv10g2\.blogspot\.com
+https?:\/\/([^\/]*\.)?xnxxmovies-com-wv\.blogspot\.com
+https?:\/\/([^\/]*\.)?xo-whatever\.blogspot\.com
+https?:\/\/([^\/]*\.)?xolz4\.szm\.sk
+https?:\/\/([^\/]*\.)?xometi\.com
+https?:\/\/([^\/]*\.)?xonlinedating\.com
+https?:\/\/([^\/]*\.)?xoomer\.alice\.it
+https?:\/\/([^\/]*\.)?xparamacy\.org
+https?:\/\/([^\/]*\.)?xpharmacy\.org
+https?:\/\/([^\/]*\.)?xqnqh\.szm\.sk
+https?:\/\/([^\/]*\.)?xr\.bz
+https?:\/\/([^\/]*\.)?xsecrets-com-kyms\.blogspot\.com
+https?:\/\/([^\/]*\.)?xsgr7\.szm\.sk
+https?:\/\/([^\/]*\.)?xshorturl\.info
+https?:\/\/([^\/]*\.)?xsyvh\.szm\.sk
+https?:\/\/([^\/]*\.)?xt168\.com
+https?:\/\/([^\/]*\.)?xudo-akira\.blogspot\.com
+https?:\/\/([^\/]*\.)?xujwy\.szm\.sk
+https?:\/\/([^\/]*\.)?xun-screwedupmovies-com\.blogspot\.com
+https?:\/\/([^\/]*\.)?xvbbols\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?xvec\.com
+https?:\/\/([^\/]*\.)?xvnj5\.szm\.sk
+https?:\/\/([^\/]*\.)?xwsdr\.szm\.sk
+https?:\/\/([^\/]*\.)?xxellaxx\.250free\.com
+https?:\/\/([^\/]*\.)?xxhk2\.szm\.sk
+https?:\/\/([^\/]*\.)?xxlmovies-com-gswie\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxlmovies-com-m7rg0g8viu\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxlmovies-mcorb4\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxufdm-free-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxx-mature-movie-gallery\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?xxx-pic-blonde\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?xxx-porn-clip-blogn0y\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxx0movie\.info
+https?:\/\/([^\/]*\.)?xxx1adult1video\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxx1clip\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxx1movie\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxx1video\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxdessert-com-rl7e3\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxfolder-com-h3126\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxkey-com-ma\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxlost\.info
+https?:\/\/([^\/]*\.)?xxxphenterm1nen0w\.tripod\.com
+https?:\/\/([^\/]*\.)?xxxpornstarclassics-com-cezx51lw8\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxpornstarclassics-com-d2ttwy\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxpower-net-aped3c1xa\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxproposal-com-b06etpw\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxvogue-hux\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxvogue-net-oe2t1p081c\.blogspot\.com
+https?:\/\/([^\/]*\.)?xxxvogue-net-qerij\.blogspot\.com
+https?:\/\/([^\/]*\.)?xyz-i2\.blogspot\.com
+https?:\/\/([^\/]*\.)?xyzzy-k7c37b5tuw\.blogspot\.com
+https?:\/\/([^\/]*\.)?xzc\.org\.ua
+https?:\/\/([^\/]*\.)?xzgang-bangorgy\.hav\.pl
+https?:\/\/([^\/]*\.)?xznylonlycra\.hav\.pl
+https?:\/\/([^\/]*\.)?xzrapeextreme\.hav\.pl
+https?:\/\/([^\/]*\.)?xzzoodogsex\.hav\.pl
+https?:\/\/([^\/]*\.)?y--e--s\.com
+https?:\/\/([^\/]*\.)?ya\.ru
+https?:\/\/([^\/]*\.)?yaahoeu\.com
+https?:\/\/([^\/]*\.)?yaco-hbkklx6ltp\.blogspot\.com
+https?:\/\/([^\/]*\.)?yahia-g3x\.blogspot\.com
+https?:\/\/([^\/]*\.)?yaho-rei6\.blogspot\.com
+https?:\/\/([^\/]*\.)?yahoochat-w11g7\.blogspot\.com
+https?:\/\/([^\/]*\.)?yale-eui5rgcu\.blogspot\.com
+https?:\/\/([^\/]*\.)?yamaha-scooter\.hotmail\.ru
+https?:\/\/([^\/]*\.)?yamaha-t46nzou\.blogspot\.com
+https?:\/\/([^\/]*\.)?yamaha2scooter\.chat\.ru
+https?:\/\/([^\/]*\.)?yamel-da\.blogspot\.com
+https?:\/\/([^\/]*\.)?yamil-c1n2ob52\.blogspot\.com
+https?:\/\/([^\/]*\.)?yamonee-bqcyojq\.blogspot\.com
+https?:\/\/([^\/]*\.)?yang-as\.blogspot\.com
+https?:\/\/([^\/]*\.)?yankees-o3\.blogspot\.com
+https?:\/\/([^\/]*\.)?yasashisa\.blogspot\.com
+https?:\/\/([^\/]*\.)?yashun-i63\.blogspot\.com
+https?:\/\/([^\/]*\.)?yasin-kfn0g\.blogspot\.com
+https?:\/\/([^\/]*\.)?yaskap\.com
+https?:\/\/([^\/]*\.)?yasmin-hovn5q\.blogspot\.com
+https?:\/\/([^\/]*\.)?yasmin\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?yazar-rnzt\.blogspot\.com
+https?:\/\/([^\/]*\.)?yblwoh-free-video\.blogspot\.com
+https?:\/\/([^\/]*\.)?ycft3\.szm\.sk
+https?:\/\/([^\/]*\.)?ycixxgt\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ycsv1\.szm\.sk
+https?:\/\/([^\/]*\.)?ydyofrj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ydyp\.left-web\.com
+https?:\/\/([^\/]*\.)?ydyp\.zxvo\.com
+https?:\/\/([^\/]*\.)?yehuo\.cn
+https?:\/\/([^\/]*\.)?yell0w-n1njaman\.blogspot\.com
+https?:\/\/([^\/]*\.)?yellow-wc4pxnc\.blogspot\.com
+https?:\/\/([^\/]*\.)?yellowstone-e4b\.blogspot\.com
+https?:\/\/([^\/]*\.)?yes-t2cfk28\.blogspot\.com
+https?:\/\/([^\/]*\.)?yesenia-dip5700iq\.blogspot\.com
+https?:\/\/([^\/]*\.)?yessenia-c0ue443\.blogspot\.com
+https?:\/\/([^\/]*\.)?yetbarek-b31fe\.blogspot\.com
+https?:\/\/([^\/]*\.)?yfojo\.szm\.sk
+https?:\/\/([^\/]*\.)?yfxy2\.szm\.sk
+https?:\/\/([^\/]*\.)?yhmh\.vip\.myrice\.com
+https?:\/\/([^\/]*\.)?yi-gan\.com
+https?:\/\/([^\/]*\.)?yicloqd\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?yiqiyibiao\.dzsc\.com
+https?:\/\/([^\/]*\.)?yisroel-a5dk2rzyvx\.blogspot\.com
+https?:\/\/([^\/]*\.)?yjyvm\.szm\.sk
+https?:\/\/([^\/]*\.)?ymaby\.info
+https?:\/\/([^\/]*\.)?yncharm\.com
+https?:\/\/([^\/]*\.)?ynij1\.szm\.sk
+https?:\/\/([^\/]*\.)?ynkbb\.szm\.sk
+https?:\/\/([^\/]*\.)?ynndy\.szm\.sk
+https?:\/\/([^\/]*\.)?ynztp\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?yoda-oz08ueg\.blogspot\.com
+https?:\/\/([^\/]*\.)?yoel-mu5ej\.blogspot\.com
+https?:\/\/([^\/]*\.)?yogee\.info
+https?:\/\/([^\/]*\.)?yojany-iu3bpg2\.blogspot\.com
+https?:\/\/([^\/]*\.)?yolanda-k1\.blogspot\.com
+https?:\/\/([^\/]*\.)?yomama-hmsa\.blogspot\.com
+https?:\/\/([^\/]*\.)?yongxun\.net
+https?:\/\/([^\/]*\.)?yosemite-gf77c0ggp\.blogspot\.com
+https?:\/\/([^\/]*\.)?yoshi-in-black\.blogspot\.com
+https?:\/\/([^\/]*\.)?yosuke-r8aua1\.blogspot\.com
+https?:\/\/([^\/]*\.)?young-anal-fuck\.travel-ag\.od\.ua
+https?:\/\/([^\/]*\.)?young-anal-sex\.travel-ag\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?young-blonde-slut\.medved\.uzhgorod\.ua
+https?:\/\/([^\/]*\.)?young-britney\.babubi\.net
+https?:\/\/([^\/]*\.)?young-cheerleader-pic\.medved\.od\.ua
+https?:\/\/([^\/]*\.)?young-chubby-pussy\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?young-ffm\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?young-lesbian-having-sex\.protime\.in\.ua
+https?:\/\/([^\/]*\.)?young-sex\.futureblog\.org
+https?:\/\/([^\/]*\.)?young-teen-girl-anal\.aroundworld\.in\.ua
+https?:\/\/([^\/]*\.)?young-tender\.info
+https?:\/\/([^\/]*\.)?young-wqn\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngerbabes-com-d1fem\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngerbabes-com-dpdc\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngerbabes-freesite\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngleafs-eh2a6kcze\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngpervs-com-wdh\.blogspot\.com
+https?:\/\/([^\/]*\.)?youngshemalesex\.com
+https?:\/\/([^\/]*\.)?your-online-health\.com
+https?:\/\/([^\/]*\.)?your-starry-sky\.blogspot\.com
+https?:\/\/([^\/]*\.)?yourbudgetcar\.info
+https?:\/\/([^\/]*\.)?yourbusinesshouston\.info
+https?:\/\/([^\/]*\.)?yourchryslersebring\.info
+https?:\/\/([^\/]*\.)?yourgunter\.com
+https?:\/\/([^\/]*\.)?yourhealthypharmacy\.com
+https?:\/\/([^\/]*\.)?yourlust-com-rttu8a0a\.blogspot\.com
+https?:\/\/([^\/]*\.)?yourmazdacar\.info
+https?:\/\/([^\/]*\.)?yourmerchandise\.org
+https?:\/\/([^\/]*\.)?yourofe\.com
+https?:\/\/([^\/]*\.)?yrada\.flnet\.org
+https?:\/\/([^\/]*\.)?yrecnfz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?yrgs2\.szm\.sk
+https?:\/\/([^\/]*\.)?yronc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ysvc0\.szm\.sk
+https?:\/\/([^\/]*\.)?ytdebao\.com
+https?:\/\/([^\/]*\.)?ytgf84j\.nokedem\.com
+https?:\/\/([^\/]*\.)?ythsq\.com
+https?:\/\/([^\/]*\.)?ytifexil\.org
+https?:\/\/([^\/]*\.)?ytlmc\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ytwoqlj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?yucaibooks\.com
+https?:\/\/([^\/]*\.)?yuebing\.com
+https?:\/\/([^\/]*\.)?yume-taira\.blogspot\.com
+https?:\/\/([^\/]*\.)?yuniel-ebyd5\.blogspot\.com
+https?:\/\/([^\/]*\.)?yunmak\.com
+https?:\/\/([^\/]*\.)?yushantang\.com
+https?:\/\/([^\/]*\.)?yvette-tshq577\.blogspot\.com
+https?:\/\/([^\/]*\.)?yvonte-dyv02l\.blogspot\.com
+https?:\/\/([^\/]*\.)?yvpwh\.szm\.sk
+https?:\/\/([^\/]*\.)?ywnid\.szm\.sk
+https?:\/\/([^\/]*\.)?ywuyuan\.com
+https?:\/\/([^\/]*\.)?ywxjm\.com
+https?:\/\/([^\/]*\.)?yycp\.com
+https?:\/\/([^\/]*\.)?yylive\.info
+https?:\/\/([^\/]*\.)?yyys\.com\.cn
+https?:\/\/([^\/]*\.)?z411\.net
+https?:\/\/([^\/]*\.)?za\.spamim\.net
+https?:\/\/([^\/]*\.)?zabavna9sy4ka\.biografi\.org
+https?:\/\/([^\/]*\.)?zaccary-ciworog\.blogspot\.com
+https?:\/\/([^\/]*\.)?zachariah-bebg88d2x\.blogspot\.com
+https?:\/\/([^\/]*\.)?zacharias-a0kmh1em7\.blogspot\.com
+https?:\/\/([^\/]*\.)?zacharygen-okno4540\.blogspot\.com
+https?:\/\/([^\/]*\.)?zacherie-m82qs0617\.blogspot\.com
+https?:\/\/([^\/]*\.)?zack-ir368\.blogspot\.com
+https?:\/\/([^\/]*\.)?zackari-kkcdz8\.blogspot\.com
+https?:\/\/([^\/]*\.)?zackarylee-h4qu\.blogspot\.com
+https?:\/\/([^\/]*\.)?zackerize-ge\.blogspot\.com
+https?:\/\/([^\/]*\.)?zahtavia-riy3\.blogspot\.com
+https?:\/\/([^\/]*\.)?zaid-wi0g\.blogspot\.com
+https?:\/\/([^\/]*\.)?zaidimar-ej\.blogspot\.com
+https?:\/\/([^\/]*\.)?zainab-t46we0w3y\.blogspot\.com
+https?:\/\/([^\/]*\.)?zakaria-c5j57crpj7\.blogspot\.com
+https?:\/\/([^\/]*\.)?zanaflex\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?zanuda-juja\.blogspot\.com
+https?:\/\/([^\/]*\.)?zap-ar2fzu\.blogspot\.com
+https?:\/\/([^\/]*\.)?zara-oze5dt\.blogspot\.com
+https?:\/\/([^\/]*\.)?zarat\.php5\.cz
+https?:\/\/([^\/]*\.)?zatowana-m5hsah3h\.blogspot\.com
+https?:\/\/([^\/]*\.)?zaxswq\.com
+https?:\/\/([^\/]*\.)?zayfa\.com
+https?:\/\/([^\/]*\.)?zazu-ikzc0402\.blogspot\.com
+https?:\/\/([^\/]*\.)?zbbi8\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?zbifhoep\.t35\.com
+https?:\/\/([^\/]*\.)?zbjyzm1\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zbrown\.org
+https?:\/\/([^\/]*\.)?zbwk\.com
+https?:\/\/([^\/]*\.)?zcld\.net
+https?:\/\/([^\/]*\.)?zdei\.nokedem\.com
+https?:\/\/([^\/]*\.)?zdpid\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?ze-sex-video-download\.blogspot\.com
+https?:\/\/([^\/]*\.)?zebbiejohnson\.blogspot\.com
+https?:\/\/([^\/]*\.)?zebra-ka8g\.blogspot\.com
+https?:\/\/([^\/]*\.)?zebutal\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?zeds\.info
+https?:\/\/([^\/]*\.)?zeku-airhead\.blogspot\.com
+https?:\/\/([^\/]*\.)?zelalal\.darkbb\.com
+https?:\/\/([^\/]*\.)?zelalli\.blogcu\.com
+https?:\/\/([^\/]*\.)?zelbasleto\.heavenforum\.com
+https?:\/\/([^\/]*\.)?zeldomric\.dl\.pl
+https?:\/\/([^\/]*\.)?zelekah-h5u4yo\.blogspot\.com
+https?:\/\/([^\/]*\.)?zella\.grafbb\.com
+https?:\/\/([^\/]*\.)?zelladar\.bb-fr\.com
+https?:\/\/([^\/]*\.)?zellapask\.lolbb\.com
+https?:\/\/([^\/]*\.)?zelpasacel\.dl\.pl
+https?:\/\/([^\/]*\.)?zelrelacel\.su\.pl
+https?:\/\/([^\/]*\.)?zelrelli\.zj\.pl
+https?:\/\/([^\/]*\.)?zelrelzel\.blogcu\.com
+https?:\/\/([^\/]*\.)?zelrictr\.lolforum\.net
+https?:\/\/([^\/]*\.)?zelvaracel\.zikforum\.com
+https?:\/\/([^\/]*\.)?zelviacel\.frbb\.net
+https?:\/\/([^\/]*\.)?zelvicat\.fr-bb\.com
+https?:\/\/([^\/]*\.)?zemiacik\.yi\.org
+https?:\/\/([^\/]*\.)?zena-grmhf3shi\.blogspot\.com
+https?:\/\/([^\/]*\.)?zenaidalee-rm0p6t8md\.blogspot\.com
+https?:\/\/([^\/]*\.)?zenda-wszf1\.blogspot\.com
+https?:\/\/([^\/]*\.)?zennie-ey5i633f\.blogspot\.com
+https?:\/\/([^\/]*\.)?zenw7\.szm\.sk
+https?:\/\/([^\/]*\.)?zephyr-tk1\.blogspot\.com
+https?:\/\/([^\/]*\.)?zepporah-dypvn5g3\.blogspot\.com
+https?:\/\/([^\/]*\.)?zerks\.info
+https?:\/\/([^\/]*\.)?zfbfbs9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zfkmaei\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zghy2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zgzr\.com
+https?:\/\/([^\/]*\.)?zhenrong\.com\.cn
+https?:\/\/([^\/]*\.)?zhihehotel\.com
+https?:\/\/([^\/]*\.)?zhiju\.home4u\.china\.com
+https?:\/\/([^\/]*\.)?zhkaw\.com
+https?:\/\/([^\/]*\.)?zhkuj\.fr33webhost\.com
+https?:\/\/([^\/]*\.)?zhopaitalii\.info
+https?:\/\/([^\/]*\.)?zhuxg\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zhw35iida\.org
+https?:\/\/([^\/]*\.)?ziahya-cbqb\.blogspot\.com
+https?:\/\/([^\/]*\.)?zimg4\.szm\.sk
+https?:\/\/([^\/]*\.)?zimmerman-a4shi\.blogspot\.com
+https?:\/\/([^\/]*\.)?zippedurl\.com
+https?:\/\/([^\/]*\.)?zisai\.com\.cn
+https?:\/\/([^\/]*\.)?ziseq-sex-movie-x\.blogspot\.com
+https?:\/\/([^\/]*\.)?zithromaxbuycheap\.drive\.to
+https?:\/\/([^\/]*\.)?zithromaxbuygeneric\.cut\.by
+https?:\/\/([^\/]*\.)?zithromaxcheap\.drive\.to
+https?:\/\/([^\/]*\.)?zithromaxgenericbuy\.drive\.to
+https?:\/\/([^\/]*\.)?zithromaxgenericcheap\.dive\.to
+https?:\/\/([^\/]*\.)?zithromaxxonline\.ovp\.pl
+https?:\/\/([^\/]*\.)?zivuc-free-sex-movie-l\.blogspot\.com
+https?:\/\/([^\/]*\.)?zjeyu\.com
+https?:\/\/([^\/]*\.)?zjpgxo4\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zjudeyah-m2r38d\.blogspot\.com
+https?:\/\/([^\/]*\.)?zjww\.com
+https?:\/\/([^\/]*\.)?zlid3\.szm\.sk
+https?:\/\/([^\/]*\.)?zljekr8\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zlocztw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zmga3\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zmodem-isjrjd\.blogspot\.com
+https?:\/\/([^\/]*\.)?zocor\.bad-food\.net
+https?:\/\/([^\/]*\.)?zocor\.barnkalas\.net
+https?:\/\/([^\/]*\.)?zocor\.blomberg\.nu
+https?:\/\/([^\/]*\.)?zocor\.bokmarke\.nu
+https?:\/\/([^\/]*\.)?zocor\.bredbandsfabriken\.nu
+https?:\/\/([^\/]*\.)?zocor\.center\.nu
+https?:\/\/([^\/]*\.)?zocor\.hellstrom\.nu
+https?:\/\/([^\/]*\.)?zocor\.hem\.nu
+https?:\/\/([^\/]*\.)?zocor\.infosajt\.net
+https?:\/\/([^\/]*\.)?zocor\.internetreklam\.nu
+https?:\/\/([^\/]*\.)?zocor\.jacobson\.nu
+https?:\/\/([^\/]*\.)?zoe-ktd\.blogspot\.com
+https?:\/\/([^\/]*\.)?zofarl\.com
+https?:\/\/([^\/]*\.)?zofia-hkn\.blogspot\.com
+https?:\/\/([^\/]*\.)?zoie-g2h02z5mta\.blogspot\.com
+https?:\/\/([^\/]*\.)?zoklaku\.forumculture\.net
+https?:\/\/([^\/]*\.)?zoklapec\.dynamicbb\.com
+https?:\/\/([^\/]*\.)?zoloft\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?zoloft\.1k\.pl
+https?:\/\/([^\/]*\.)?zoloft\.skocz\.net
+https?:\/\/([^\/]*\.)?zombie-r7ye\.blogspot\.com
+https?:\/\/([^\/]*\.)?zovirax\.esdemasiado\.com
+https?:\/\/([^\/]*\.)?zovirax\.inicioya\.com
+https?:\/\/([^\/]*\.)?zovirax\.ole\.to
+https?:\/\/([^\/]*\.)?zovirax\.redireccion\.com
+https?:\/\/([^\/]*\.)?zoya-w1tebgqbtr\.blogspot\.com
+https?:\/\/([^\/]*\.)?zpbvsng\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zpco4\.szm\.sk
+https?:\/\/([^\/]*\.)?zpykbi9\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zqit6\.szm\.sk
+https?:\/\/([^\/]*\.)?zqxss\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zsbupdo\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zswok\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zsxqgv2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ztauk\.szm\.sk
+https?:\/\/([^\/]*\.)?ztkvz\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ztlztpj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?ztnqok7\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zuleima-epbxv\.blogspot\.com
+https?:\/\/([^\/]*\.)?zulema-tsaieb\.blogspot\.com
+https?:\/\/([^\/]*\.)?zulmarie-dk8\.blogspot\.com
+https?:\/\/([^\/]*\.)?zuri-ch0\.blogspot\.com
+https?:\/\/([^\/]*\.)?zurysarai-bykp\.blogspot\.com
+https?:\/\/([^\/]*\.)?zusette-ai2\.blogspot\.com
+https?:\/\/([^\/]*\.)?zvcqr\.szm\.sk
+https?:\/\/([^\/]*\.)?zvnaw\.szm\.sk
+https?:\/\/([^\/]*\.)?zvoh2\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zvzsxqw\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zxtpets\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zya9\.info
+https?:\/\/([^\/]*\.)?zyban\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?zyban\.controlando\.com
+https?:\/\/([^\/]*\.)?zybans\.blogspot\.com
+https?:\/\/([^\/]*\.)?zyrtec\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?zyrtec\.1k\.pl
+https?:\/\/([^\/]*\.)?zyrtec\.coz\.in
+https?:\/\/([^\/]*\.)?zywyn\.info
+https?:\/\/([^\/]*\.)?zzcwj\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?zzdx\.com
diff --git a/mod/dokuwiki/vendors/dokuwiki/conf/words.aspell.dist b/mod/dokuwiki/vendors/dokuwiki/conf/words.aspell.dist
new file mode 100644
index 000000000..a49138fcb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/conf/words.aspell.dist
@@ -0,0 +1,5 @@
+personal_ws-1.1 en 4 utf-8
+DokuWiki
+Wiki
+WikiWiki
+Gohr
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/_dummy
new file mode 100644
index 000000000..37ed18a63
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/_dummy
@@ -0,0 +1 @@
+data directory
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/attic/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/attic/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/attic/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/cache/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/cache/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/cache/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/index/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/index/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/index/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/locks/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/locks/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/locks/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/media/wiki/dokuwiki-128.png b/mod/dokuwiki/vendors/dokuwiki/data/media/wiki/dokuwiki-128.png
new file mode 100644
index 000000000..b2306ac95
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/media/wiki/dokuwiki-128.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/meta/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/meta/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/meta/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/pages/playground/playground.txt b/mod/dokuwiki/vendors/dokuwiki/data/pages/playground/playground.txt
new file mode 100644
index 000000000..a2274bda4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/pages/playground/playground.txt
@@ -0,0 +1 @@
+====== PlayGround ======
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/pages/sidebar.txt b/mod/dokuwiki/vendors/dokuwiki/data/pages/sidebar.txt
new file mode 100644
index 000000000..090a66349
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/pages/sidebar.txt
@@ -0,0 +1,2 @@
+{{indexmenu>..#1|js#thread navbar}}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/dokuwiki.txt b/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/dokuwiki.txt
new file mode 100644
index 000000000..2cede366f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/dokuwiki.txt
@@ -0,0 +1,66 @@
+[[http://www.dokuwiki.org/es:dokuwiki|es]] [[http://www.dokuwiki.org/ca:dokuwiki|ca]] [[http://www.dokuwiki.org/fr:dokuwiki|fr]] [[http://www.dokuwiki.org/dokuwiki|more]]
+
+====== DokuWiki ======
+
+[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a standards compliant, simple to use [[wp>Wiki]], mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful [[wiki:syntax]] which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files -- no database is required.
+
+Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki.
+
+===== Download =====
+
+DokuWiki is available at http://www.splitbrain.org/go/dokuwiki
+
+
+===== Read More =====
+
+All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]].
+
+**About DokuWiki**
+
+  * [[doku>features|A feature list]] :!:
+  * [[doku>users|Happy Users]]
+  * [[doku>press|Who wrote about it]]
+  * [[doku>blogroll|What Bloggers think]]
+  * [[http://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]]
+
+**Installing DokuWiki**
+
+  * [[doku>requirements|System Requirements]]
+  * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!:
+  * [[doku>changes|Change Log]]
+  * [[doku>Install|How to install or upgrade]] :!:
+  * [[doku>config|Configuration]]
+
+**Using DokuWiki**
+
+  * [[doku>syntax|Wiki Syntax]]
+  * [[doku>manual|The manual]] :!:
+  * [[doku>FAQ|Frequently Asked Questions (FAQ)]]
+  * [[doku>glossary|Glossary]]
+  * [[http://search.dokuwiki.org|Search for DokuWiki help and documentation]]
+
+**Customizing DokuWiki**
+
+  * [[doku>tips|Tips and Tricks]]
+  * [[doku>Template|How to create and use templates]]
+  * [[doku>plugins|Installing plugins]]
+  * [[doku>development|Development Resources]]
+
+**DokuWiki Feedback and Community**
+
+  * [[doku>newsletter|Subscribe to the newsletter]] :!:
+  * [[doku>mailinglist|Join the mailing list]]
+  * [[http://forum.dokuwiki.org|Check out the user forum]]
+  * [[doku>irc|Talk to other users in the IRC channel]]
+  * [[http://bugs.splitbrain.org/index.php?project=1|Submit bugs and feature wishes]]
+  * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]]
+  * [[doku>thanks|Some humble thanks]]
+
+
+===== Copyright =====
+
+2004-2009 (c) Andreas Gohr <andi@splitbrain.org>((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead))
+
+The DokuWiki engine is licensed under [[http://www.gnu.org/licenses/gpl.html|GNU General Public License]] Version 2. If you use DokuWiki in your company, consider [[doku>donate|donating]] a few bucks ;-).
+
+Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/syntax.txt b/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/syntax.txt
new file mode 100644
index 000000000..7dad453db
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/pages/wiki/syntax.txt
@@ -0,0 +1,488 @@
+[[http://www.dokuwiki.org/es:syntax|es]] [[http://www.dokuwiki.org/ca:syntax|ca]] [[http://www.dokuwiki.org/fr:syntax|fr]] [[http://www.dokuwiki.org/syntax|more]]
+
+====== Formatting Syntax ======
+
+[[doku>DokuWiki]] supports some simple markup language, which tries to make the datafiles to be as readable as possible. This page contains all possible syntax you may use when editing the pages. Simply have a look at the source of this page by pressing the //Edit this page// button at the top or bottom of the page. If you want to try something, just use the [[playground:playground|playground]] page. The simpler markup is easily accessible via [[doku>toolbar|quickbuttons]], too.
+
+===== Basic Text Formatting =====
+
+DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these.
+
+  DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts.
+  Of course you can **__//''combine''//__** all these.
+
+You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
+
+  You can use <sub>subscript</sub> and <sup>superscript</sup>, too.
+
+You can mark something as <del>deleted</del> as well.
+
+  You can mark something as <del>deleted</del> as well.
+
+**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line.
+
+This is some text with some linebreaks\\ Note that the
+two backslashes are only recognized at the end of a line\\
+or followed by\\ a whitespace \\this happens without it.
+
+  This is some text with some linebreaks\\ Note that the
+  two backslashes are only recognized at the end of a line\\
+  or followed by\\ a whitespace \\this happens without it.
+
+You should use forced newlines only if really needed.
+
+===== Links =====
+
+DokuWiki supports multiple ways of creating links.
+
+==== External ====
+
+External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: <andi@splitbrain.org> are recognized, too.
+
+  DokuWiki supports multiple ways of creating links. External links are recognized
+  automagically: http://www.google.com or simply www.google.com - You can set
+  link text as well: [[http://www.google.com|This Link points to google]]. Email
+  addresses like this one: <andi@splitbrain.org> are recognized, too.
+
+==== Internal ====
+
+Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]].
+
+  Internal links are created by using square brackets. You can either just give
+  a [[pagename]] or use an additional [[pagename|link text]].
+
+[[doku>pagename|Wiki pagenames]] are converted to lowercase automatically, special characters are not allowed.
+
+You can use [[some:namespaces]] by using a colon in the pagename.
+
+  You can use [[some:namespaces]] by using a colon in the pagename.
+
+For details about namespaces see [[doku>namespaces]].
+
+Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]].
+
+  This links to [[syntax#internal|this Section]].
+
+Notes:
+
+  * Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones.
+  * DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled.
+  * When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much.
+
+==== Interwiki ====
+
+DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
+
+  DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis.
+  For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]].
+
+
+==== Windows Shares ====
+
+Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]].
+
+  Windows Shares like [[\\server\share|this]] are recognized, too.
+
+Notes:
+
+  * For security reasons direct browsing of windows shares only works in Microsoft Internet Explorer per default (and only in the "local zone").
+  * For Mozilla and Firefox it can be enabled through different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_don't_work|Mozilla Knowledge Base]].
+
+
+==== Image Links ====
+
+You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this:
+
+  [[http://www.php.net|{{wiki:dokuwiki-128.png}}]]
+
+[[http://www.php.net|{{wiki:dokuwiki-128.png}}]]
+
+Please note: The image formatting is the only formatting syntax accepted in link names.
+
+The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links).
+
+===== Footnotes =====
+
+You can add footnotes ((This is a footnote)) by using double parentheses.
+
+  You can add footnotes ((This is a footnote)) by using double parentheses.
+
+===== Sectioning =====
+
+You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''<nowiki>~~NOTOC~~</nowiki>'' in the document.
+
+==== Headline Level 3 ====
+=== Headline Level 4 ===
+== Headline Level 5 ==
+
+  ==== Headline Level 3 ====
+  === Headline Level 4 ===
+  == Headline Level 5 ==
+
+By using four or more dashes, you can make a horizontal line:
+
+----
+
+===== Images and Other Files =====
+
+You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them.
+
+Real size:                        {{wiki:dokuwiki-128.png}}
+
+Resize to given width:            {{wiki:dokuwiki-128.png?50}}
+
+Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}}
+
+Resized external image:           {{http://de3.php.net/images/php.gif?200x50}}
+
+  Real size:                        {{wiki:dokuwiki-128.png}}
+  Resize to given width:            {{wiki:dokuwiki-128.png?50}}
+  Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}}
+  Resized external image:           {{http://de3.php.net/images/php.gif?200x50}}
+
+
+By using left or right whitespaces you can choose the alignment.
+
+{{ wiki:dokuwiki-128.png}}
+
+{{wiki:dokuwiki-128.png }}
+
+{{ wiki:dokuwiki-128.png }}
+
+  {{ wiki:dokuwiki-128.png}}
+  {{wiki:dokuwiki-128.png }}
+  {{ wiki:dokuwiki-128.png }}
+
+Of course, you can add a title (displayed as a tooltip by most browsers), too.
+
+{{ wiki:dokuwiki-128.png |This is the caption}}
+
+  {{ wiki:dokuwiki-128.png |This is the caption}}
+
+If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead.
+
+For linking an image to another page see [[#Image Links]] above.
+
+===== Lists =====
+
+Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones.
+
+  * This is a list
+  * The second item
+    * You may have different levels
+  * Another item
+
+  - The same list but ordered
+  - Another item
+    - Just use indention for deeper levels
+  - That's it
+
+<code>
+  * This is a list
+  * The second item
+    * You may have different levels
+  * Another item
+
+  - The same list but ordered
+  - Another item
+    - Just use indention for deeper levels
+  - That's it
+</code>
+
+Also take a look at the [[doku>faq:lists|FAQ on list items]].
+
+===== Text Conversions =====
+
+DokuWiki can convert certain pre-defined characters or strings into images or other text or HTML.
+
+The text to image conversion is mainly done for smileys. And the text to HTML conversion is used for typography replacements, but can be configured to use other HTML as well.
+
+==== Text to Image Conversions ====
+
+DokuWiki converts commonly used [[wp>emoticon]]s to their graphical equivalents. Those [[doku>Smileys]] and other images can be configured and extended. Here is an overview of Smileys included in DokuWiki:
+
+  * 8-) %%  8-)  %%
+  * 8-O %%  8-O  %%
+  * :-( %%  :-(  %%
+  * :-) %%  :-)  %%
+  * =)  %%  =)   %%
+  * :-/ %%  :-/  %%
+  * :-\ %%  :-\  %%
+  * :-? %%  :-?  %%
+  * :-D %%  :-D  %%
+  * :-P %%  :-P  %%
+  * :-O %%  :-O  %%
+  * :-X %%  :-X  %%
+  * :-| %%  :-|  %%
+  * ;-) %%  ;-)  %%
+  * ^_^ %%  ^_^  %%
+  * :?: %%  :?:  %%
+  * :!: %%  :!:  %%
+  * LOL %%  LOL  %%
+  * FIXME %%  FIXME %%
+  * DELETEME %% DELETEME %%
+
+==== Text to HTML Conversions ====
+
+Typography: [[DokuWiki]] can convert simple text characters to their typographically correct entities. Here is an example of recognized characters.
+
+-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
+"He thought 'It's a man's world'..."
+
+<code>
+-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r)
+"He thought 'It's a man's world'..."
+</code>
+
+The same can be done to produce any kind of HTML, it just needs to be added to the [[doku>entities|pattern file]].
+
+There are three exceptions which do not come from that pattern file: multiplication entity (640x480), 'single' and "double quotes". They can be turned off through a [[doku>config:typography|config option]].
+
+===== Quoting =====
+
+Some times you want to mark some text to show it's a reply or comment. You can use the following syntax:
+
+  I think we should do it
+  
+  > No we shouldn't
+  
+  >> Well, I say we should
+  
+  > Really?
+  
+  >> Yes!
+  
+  >>> Then lets do it!
+
+I think we should do it
+
+> No we shouldn't
+
+>> Well, I say we should
+
+> Really?
+
+>> Yes!
+
+>>> Then lets do it!
+
+===== Tables =====
+
+DokuWiki supports a simple syntax to create tables.
+
+^ Heading 1      ^ Heading 2       ^ Heading 3          ^
+| Row 1 Col 1    | Row 1 Col 2     | Row 1 Col 3        |
+| Row 2 Col 1    | some colspan (note the double pipe) ||
+| Row 3 Col 1    | Row 3 Col 2     | Row 3 Col 3        |
+
+Table rows have to start and end with a ''|'' for normal rows or a ''^'' for headers.
+
+  ^ Heading 1      ^ Heading 2       ^ Heading 3          ^
+  | Row 1 Col 1    | Row 1 Col 2     | Row 1 Col 3        |
+  | Row 2 Col 1    | some colspan (note the double pipe) ||
+  | Row 3 Col 1    | Row 3 Col 2     | Row 3 Col 3        |
+
+To connect cells horizontally, just make the next cell completely empty as shown above. Be sure to have always the same amount of cell separators!
+
+Vertical tableheaders are possible, too.
+
+|              ^ Heading 1            ^ Heading 2          ^
+^ Heading 3    | Row 1 Col 2          | Row 1 Col 3        |
+^ Heading 4    | no colspan this time |                    |
+^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        |
+
+As you can see, it's the cell separator before a cell which decides about the formatting:
+
+  |              ^ Heading 1            ^ Heading 2          ^
+  ^ Heading 3    | Row 1 Col 2          | Row 1 Col 3        |
+  ^ Heading 4    | no colspan this time |                    |
+  ^ Heading 5    | Row 2 Col 2          | Row 2 Col 3        |
+
+You can have rowspans (vertically connected cells) by adding '':::'' into the cells below the one to which they should connect.
+
+^ Heading 1      ^ Heading 2                  ^ Heading 3          ^
+| Row 1 Col 1    | this cell spans vertically | Row 1 Col 3        |
+| Row 2 Col 1    | :::                        | Row 2 Col 3        |
+| Row 3 Col 1    | :::                        | Row 2 Col 3        |
+
+Apart from the rowspan syntax those cells should not contain anything else.
+
+  ^ Heading 1      ^ Heading 2                  ^ Heading 3          ^
+  | Row 1 Col 1    | this cell spans vertically | Row 1 Col 3        |
+  | Row 2 Col 1    | :::                        | Row 2 Col 3        |
+  | Row 3 Col 1    | :::                        | Row 2 Col 3        |
+
+You can align the table contents, too. Just add at least two whitespaces at the opposite end of your text: Add two spaces on the left to align right, two spaces on the right to align left and two spaces at least at both ends for centered text.
+
+^           Table with alignment           ^^^
+|         right|    center    |left          |
+|left          |         right|    center    |
+| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
+
+This is how it looks in the source:
+
+  ^           Table with alignment           ^^^
+  |         right|    center    |left          |
+  |left          |         right|    center    |
+  | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx |
+
+Note: Vertical alignment is not supported.
+
+===== No Formatting =====
+
+If you need to display text exactly like it is typed (without any formatting), enclose the area either with ''%%<nowiki>%%'' tags or even simpler, with double percent signs ''<nowiki>%%</nowiki>''.
+
+<nowiki>
+This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
+</nowiki>
+The same is true for %%//__this__ text// with a smiley ;-)%%.
+
+  <nowiki>
+  This is some text which contains addresses like this: http://www.splitbrain.org and **formatting**, but nothing is done with it.
+  </nowiki>
+  The same is true for %%//__this__ text// with a smiley ;-)%%.
+
+===== Code Blocks =====
+
+You can include code blocks into your documents by either indenting them by at least two spaces (like used for the previous examples) or by using the tags ''%%<code>%%'' or ''%%<file>%%''.
+
+  This is text is indented by two spaces.
+
+<code>
+This is preformatted code all spaces are preserved: like              <-this
+</code>
+
+<file>
+This is pretty much the same, but you could use it to show that you quoted a file.
+</file>
+
+Those blocks were created by this source:
+
+    This is text is indented by two spaces.
+
+  <code>
+  This is preformatted code all spaces are preserved: like              <-this
+  </code>
+
+  <file>
+  This is pretty much the same, but you could use it to show that you quoted a file.
+  </file>
+
+==== Syntax Highlighting ====
+
+[[wiki:DokuWiki]] can highlight sourcecode, which makes it easier to read. It uses the [[http://qbnz.com/highlighter/|GeSHi]] Generic Syntax Highlighter -- so any language supported by GeSHi is supported. The syntax is the same like in the code and file blocks in the previous section, but this time the name of the used language is inserted inside the tag. Eg. ''<nowiki><code java></nowiki>'' or ''<nowiki><file java></nowiki>''.
+
+<code java>
+/**
+ * The HelloWorldApp class implements an application that
+ * simply displays "Hello World!" to the standard output.
+ */
+class HelloWorldApp {
+    public static void main(String[] args) {
+        System.out.println("Hello World!"); //Display the string.
+    }
+}
+</code>
+
+The following language strings are currently recognized: //abap, actionscript-french, actionscript, actionscript3, ada, apache, applescript, asm, asp, autoit, avisynth, bash, basic4gl, bf, bibtex, blitzbasic, bnf, boo, c, c_mac, caddcl, cadlisp, cfdg, cfm, cil, cmake, cobol, cpp, cpp-qt, csharp, css, d, dcs, delphi, diff, div, dos, dot, eiffel, email, erlang, fo, fortran, freebasic, genero, glsl, gml, gnuplot, groovy, gettext, haskell, hq9plus, html, idl, ini, inno, intercal, io, java5, java, javascript, kixtart, klonec, klonecpp, latex, lisp, locobasic, lolcode, lotusformulas, lotusscript, lscript, lsl2, lua, m68k, make, matlab, mirc, modula3, mpasm, mxml, mysql, nsis, oberon2, objc, ocaml-brief, ocaml, oobas, oracle8, oracle11, pascal, perl, per, php-brief, php, pic16, pixelbender, plsql, povray, powershell, progress, prolog, properties, providex, python, qbasic, rails, rebol, reg, robots, ruby, sas, scala, scheme, scilab, sdlbasic, smalltalk, smarty, sql, tcl, teraterm, text, thinbasic, tsql, typoscript, vbnet, vb, verilog, vhdl, vim, visualfoxpro, visualprolog, whitespace, winbatch, whois, xml, xorg_conf, xpp, z80//
+
+==== Downloadable Code Blocks ====
+
+When you use the ''%%<code>%%'' or ''%%<file>%%'' syntax as above, you might want to make the shown code available for download as well. You can to this by specifying a file name after language code like this:
+
+<code>
+<file php myexample.php>
+<?php echo "hello world!"; ?>
+</file>
+</code>
+
+<file php myexample.php>
+<?php echo "hello world!"; ?>
+</file>
+
+If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%<code - myfile.foo>%%''.
+
+
+===== Embedding HTML and PHP =====
+
+You can embed raw HTML or PHP code into your documents by using the ''%%<html>%%'' or ''%%<php>%%'' tags. (Use uppercase tags if you need to enclose block level elements.)
+
+HTML example:
+
+<code>
+<html>
+This is some <span style="color:red;font-size:150%;">inline HTML</span>
+</html>
+<HTML>
+<p style="border:2px dashed red;">And this is some block HTML</p>
+</HTML>
+</code>
+
+<html>
+This is some <span style="color:red;font-size:150%;">inline HTML</span>
+</html>
+<HTML>
+<p style="border:2px dashed red;">And this is some block HTML</p>
+</HTML>
+
+PHP example:
+
+<code>
+<php>
+echo 'A logo generated by PHP:';
+echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
+echo '(generated inline HTML)';
+</php>
+<PHP>
+echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
+echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '</tr></table>';
+</PHP>
+</code>
+
+<php>
+echo 'A logo generated by PHP:';
+echo '<img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" />';
+echo '(inline HTML)';
+</php>
+<PHP>
+echo '<table class="inline"><tr><td>The same, but inside a block level element:</td>';
+echo '<td><img src="' . $_SERVER['PHP_SELF'] . '?=' . php_logo_guid() . '" alt="PHP Logo !" /></td>';
+echo '</tr></table>';
+</PHP>
+
+**Please Note**: HTML and PHP embedding is disabled by default in the configuration. If disabled, the code is displayed instead of executed.
+
+===== RSS/ATOM Feed Aggregation =====
+[[DokuWiki]] can integrate data from external XML feeds. For parsing the XML feeds, [[http://simplepie.org/|SimplePie]] is used. All formats understood by SimplePie can be used in DokuWiki as well. You can influence the rendering by multiple additional space separated parameters:
+
+^ Parameter  ^ Description ^
+| any number | will be used as maximum number items to show, defaults to 8 |
+| reverse    | display the last items in the feed first |
+| author     | show item authors names |
+| date       | show item dates |
+| description| show the item description. If [[doku>config:htmlok|HTML]] is disabled all tags will be stripped |
+| //n//[dhm] | refresh period, where d=days, h=hours, m=minutes. (e.g. 12h = 12 hours). |
+
+The refresh period defaults to 4 hours. Any value below 10 minutes will be treated as 10 minutes. [[wiki:DokuWiki]] will generally try to supply a cached version of a page, obviously this is inappropriate when the page contains dynamic external content. The parameter tells [[wiki:DokuWiki]] to re-render the page if it is more than //refresh period// since the page was last rendered.
+
+**Example:**
+
+  {{rss>http://slashdot.org/index.rss 5 author date 1h }}
+
+{{rss>http://slashdot.org/index.rss 5 author date 1h }}
+
+
+===== Control Macros =====
+
+Some syntax influences how DokuWiki renders a page without creating any output it self. The following control macros are availble:
+
+^ Macro           ^ Description |
+| %%~~NOTOC~~%%   | If this macro is found on the page, no table of contents will be created |
+| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%<php>%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call |
+
+===== Syntax Plugins =====
+
+DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation:
+
+~~INFO:syntaxplugins~~
diff --git a/mod/dokuwiki/vendors/dokuwiki/data/tmp/_dummy b/mod/dokuwiki/vendors/dokuwiki/data/tmp/_dummy
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/data/tmp/_dummy
diff --git a/mod/dokuwiki/vendors/dokuwiki/doku.php b/mod/dokuwiki/vendors/dokuwiki/doku.php
new file mode 100644
index 000000000..5566577f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/doku.php
@@ -0,0 +1,109 @@
+<?php
+/**
+ * DokuWiki mainscript
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+//  xdebug_start_profiling();
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
+global $ACT;
+global $conf;
+
+if (isset($_SERVER['HTTP_X_DOKUWIKI_DO'])){
+    $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO']));
+} elseif (!empty($IDX)) {
+    $ACT = 'index';
+} elseif (get_input('do')) {
+    $ACT = get_input('do');
+} else {
+    $ACT = 'show';
+}
+
+global $QUERY;
+global $ID;
+global $NS;
+global $REV;
+global $IDX;
+global $DATE;
+global $RANGE;
+global $HIGH;
+global $TEXT;
+global $PRE;
+global $SUF;
+global $SUM;
+global $REV;
+global $INFO;
+global $JSINFO;
+
+
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/events.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/html.php');
+require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/actions.php');
+
+//import variables
+$QUERY = trim(get_input('id'));
+$ID    = getID();
+$NS    = getNS($ID);
+$REV   = get_input('rev');
+$IDX   = get_input('idx');
+$DATE  = get_input('date');
+$RANGE = get_input('lines');
+$HIGH  = get_input('s');
+if(empty($HIGH)) $HIGH = getGoogleQuery();
+
+$TEXT  = cleanText($_POST['wikitext']);
+$PRE   = cleanText($_POST['prefix']);
+$SUF   = cleanText($_POST['suffix']);
+$SUM   = get_input('summary');
+
+//sanitize revision
+$REV = preg_replace('/[^0-9]/','',$REV);
+
+//make infos about the selected page available
+$INFO = pageinfo();
+
+//export minimal infos to JS, plugins can add more
+$JSINFO['id']        = $ID;
+$JSINFO['namespace'] = (string) $INFO['namespace'];
+
+
+// handle debugging
+if($conf['allowdebug'] && $ACT == 'debug'){
+    html_debug();
+    exit;
+}
+
+//send 404 for missing pages if configured or ID has special meaning to bots
+if(!$INFO['exists'] &&
+  ($conf['send404'] || preg_match('/^(robots\.txt|sitemap\.xml(\.gz)?|favicon\.ico|crossdomain\.xml)$/',$ID)) &&
+  ($ACT == 'show' || substr($ACT,0,7) == 'export_') ){
+    header('HTTP/1.0 404 Not Found');
+}
+
+//prepare breadcrumbs (initialize a static var)
+if ($conf['breadcrumbs']) breadcrumbs();
+
+// check upstream
+checkUpdateMessages();
+
+$tmp = array(); // No event data
+trigger_event('DOKUWIKI_STARTED',$tmp);
+
+//close session
+session_write_close();
+
+//do the work
+act_dispatch($ACT);
+
+$tmp = array(); // No event data
+trigger_event('DOKUWIKI_DONE', $tmp);
+
+//  xdebug_dump_function_profile(1);
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/feed.php b/mod/dokuwiki/vendors/dokuwiki/feed.php
new file mode 100644
index 000000000..e7ea5808c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/feed.php
@@ -0,0 +1,353 @@
+<?php
+/**
+ * XML feed export
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/events.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+require_once(DOKU_INC.'inc/feedcreator.class.php');
+require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/httputils.php');
+
+//close session
+session_write_close();
+
+// get params
+$opt = rss_parseOptions();
+
+// the feed is dynamic - we need a cache for each combo
+// (but most people just use the default feed so it's still effective)
+$cache = getCacheName(join('',array_values($opt)).$_SERVER['REMOTE_USER'],'.feed');
+$key   = join('', array_values($opt)) . $_SERVER['REMOTE_USER']; 
+$cache = new cache($key, '.feed');
+
+// prepare cache depends
+$depends['files'] = getConfigFiles('main');
+$depends['age']   = $conf['rss_update'];
+$depends['purge'] = ($_REQUEST['purge']) ? true : false;
+
+// check cacheage and deliver if nothing has changed since last
+// time or the update interval has not passed, also handles conditional requests
+header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+header('Pragma: public');
+header('Content-Type: application/xml; charset=utf-8');
+header('X-Robots-Tag: noindex');
+if($cache->useCache($depends)) {
+    http_conditionalRequest($cache->_time);
+    if($conf['allowdebug']) header("X-CacheUsed: $cache->cache");
+    print $cache->retrieveCache();
+    exit;
+} else {
+    http_conditionalRequest(time());
+ }
+
+// create new feed
+$rss = new DokuWikiFeedCreator();
+$rss->title = $conf['title'].(($opt['namespace']) ? ' '.$opt['namespace'] : '');
+$rss->link  = DOKU_URL;
+$rss->syndicationURL = DOKU_URL.'feed.php';
+$rss->cssStyleSheet  = DOKU_URL.'lib/exe/css.php?s=feed';
+
+$image = new FeedImage();
+$image->title = $conf['title'];
+$image->url = DOKU_URL."lib/images/favicon.ico";
+$image->link = DOKU_URL;
+$rss->image = $image;
+
+$data = null;
+if($opt['feed_mode'] == 'list'){
+    $data = rssListNamespace($opt);
+}elseif($opt['feed_mode'] == 'search'){
+    $data = rssSearch($opt);
+}else{
+    $eventData = array(
+        'opt'  => &$opt,
+        'data' => &$data,
+    );
+    $event = new Doku_Event('FEED_MODE_UNKNOWN', $eventData);
+    if ($event->advise_before(true)) {
+        $data = rssRecentChanges($opt);
+    }
+    $event->advise_after();
+}
+
+rss_buildItems($rss, $data, $opt);
+$feed = $rss->createFeed($opt['feed_type'],'utf-8');
+
+// save cachefile
+$cache->storeCache($feed);
+
+// finally deliver
+print $feed;
+
+// ---------------------------------------------------------------- //
+
+/**
+ * Get URL parameters and config options and return a initialized option array
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rss_parseOptions(){
+    global $conf;
+
+    $opt['items']        = (int) $_REQUEST['num'];
+    $opt['feed_type']    = $_REQUEST['type'];
+    $opt['feed_mode']    = $_REQUEST['mode'];
+    $opt['show_minor']   = $_REQUEST['minor'];
+    $opt['namespace']    = $_REQUEST['ns'];
+    $opt['link_to']      = $_REQUEST['linkto'];
+    $opt['item_content'] = $_REQUEST['content'];
+    $opt['search_query'] = $_REQUEST['q'];
+
+    if(!$opt['feed_type'])    $opt['feed_type']    = $conf['rss_type'];
+    if(!$opt['item_content']) $opt['item_content'] = $conf['rss_content'];
+    if(!$opt['link_to'])      $opt['link_to']      = $conf['rss_linkto'];
+    if(!$opt['items'])        $opt['items']        = $conf['recent'];
+    $opt['guardmail']  = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none');
+
+    switch ($opt['feed_type']){
+        case 'rss':
+            $opt['feed_type'] = 'RSS0.91';
+            $opt['mime_type'] = 'text/xml';
+            break;
+        case 'rss2':
+            $opt['feed_type'] = 'RSS2.0';
+            $opt['mime_type'] = 'text/xml';
+            break;
+        case 'atom':
+            $opt['feed_type'] = 'ATOM0.3';
+            $opt['mime_type'] = 'application/xml';
+            break;
+        case 'atom1':
+            $opt['feed_type'] = 'ATOM1.0';
+            $opt['mime_type'] = 'application/atom+xml';
+            break;
+        default:
+            $opt['feed_type'] = 'RSS1.0';
+            $opt['mime_type'] = 'application/xml';
+    }
+
+    $eventData = array(
+        'opt' => &$opt,
+    );
+    trigger_event('FEED_OPTS_POSTPROCESS', $eventData);
+    return $opt;
+}
+
+/**
+ * Add recent changed pages to a feed object
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  object $rss - the FeedCreator Object
+ * @param  array $data - the items to add
+ * @param  array $opt  - the feed options
+ */
+function rss_buildItems(&$rss,&$data,$opt){
+    global $conf;
+    global $lang;
+    global $auth;
+
+    $eventData = array(
+        'rss' => &$rss,
+        'data' => &$data,
+        'opt' => &$opt,
+    );
+    $event = new Doku_Event('FEED_DATA_PROCESS', $eventData);
+    if ($event->advise_before(false)){
+        foreach($data as $ditem){
+            if(!is_array($ditem)){
+                // not an array? then only a list of IDs was given
+                $ditem = array( 'id' => $ditem );
+            }
+
+            $item = new FeedItem();
+            $id   = $ditem['id'];
+            $meta = p_get_metadata($id);
+
+            // add date
+            if($ditem['date']){
+                $date = $ditem['date'];
+            }elseif($meta['date']['modified']){
+                $date = $meta['date']['modified'];
+            }else{
+                $date = @filemtime(wikiFN($id));
+            }
+            if($date) $item->date = date('r',$date);
+
+            // add title
+            if($conf['useheading'] && $meta['title']){
+                $item->title = $meta['title'];
+            }else{
+                $item->title = $ditem['id'];
+            }
+            if($conf['rss_show_summary'] && !empty($ditem['sum'])){
+                $item->title .= ' - '.strip_tags($ditem['sum']);
+            }
+
+            // add item link
+            switch ($opt['link_to']){
+                case 'page':
+                    $item->link = wl($id,'rev='.$date,true,'&');
+                    break;
+                case 'rev':
+                    $item->link = wl($id,'do=revisions&rev='.$date,true,'&');
+                    break;
+                case 'current':
+                    $item->link = wl($id, '', true,'&');
+                    break;
+                case 'diff':
+                default:
+                    $item->link = wl($id,'rev='.$date.'&do=diff',true,'&');
+            }
+
+            // add item content
+            switch ($opt['item_content']){
+                case 'diff':
+                case 'htmldiff':
+                    require_once(DOKU_INC.'inc/DifferenceEngine.php');
+                    $revs = getRevisions($id, 0, 1);
+                    $rev = $revs[0];
+
+                    if($rev){
+                        $df  = new Diff(explode("\n",htmlspecialchars(rawWiki($id,$rev))),
+                                        explode("\n",htmlspecialchars(rawWiki($id,''))));
+                    }else{
+                        $df  = new Diff(array(''),
+                                        explode("\n",htmlspecialchars(rawWiki($id,''))));
+                    }
+
+                    if($opt['item_content'] == 'htmldiff'){
+                        $tdf = new TableDiffFormatter();
+                        $content  = '<table>';
+                        $content .= '<tr><th colspan="2" width="50%">'.$rev.'</th>';
+                        $content .= '<th colspan="2" width="50%">'.$lang['current'].'</th></tr>';
+                        $content .= $tdf->format($df);
+                        $content .= '</table>';
+                    }else{
+                        $udf = new UnifiedDiffFormatter();
+                        $content = "<pre>\n".$udf->format($df)."\n</pre>";
+                    }
+                    break;
+                case 'html':
+                    $content = p_wiki_xhtml($id,$date,false);
+                    // no TOC in feeds
+                    $content = preg_replace('/(<!-- TOC START -->).*(<!-- TOC END -->)/s','',$content);
+
+                    // make URLs work when canonical is not set, regexp instead of rerendering!
+                    if(!$conf['canonical']){
+                        $base = preg_quote(DOKU_REL,'/');
+                        $content = preg_replace('/(<a href|<img src)="('.$base.')/s','$1="'.DOKU_URL,$content);
+                    }
+
+                    break;
+                case 'abstract':
+                default:
+                    $content = $meta['description']['abstract'];
+            }
+            $item->description = $content; //FIXME a plugin hook here could be senseful
+
+            // add user
+            # FIXME should the user be pulled from metadata as well?
+            $user = null;
+            $user = @$ditem['user']; // the @ spares time repeating lookup
+            $item->author = '';
+            if($user && $conf['useacl'] && $auth){
+                $userInfo = $auth->getUserData($user);
+                $item->author = $userInfo['name'];
+                if($userInfo && !$opt['guardmail']){
+                    $item->authorEmail = $userInfo['mail'];
+                }else{
+                    //cannot obfuscate because some RSS readers may check validity
+                    $item->authorEmail = $user.'@'.$ditem['ip'];
+                }
+            }elseif($user){
+                // this happens when no ACL but some Apache auth is used
+                $item->author      = $user;
+                $item->authorEmail = $user.'@'.$ditem['ip'];
+            }else{
+                $item->authorEmail = 'anonymous@'.$ditem['ip'];
+            }
+
+            // add category
+            if($meta['subject']){
+                $item->category = $meta['subject'];
+            }else{
+                $cat = getNS($id);
+                if($cat) $item->category = $cat;
+            }
+
+            // finally add the item to the feed object, after handing it to registered plugins
+            $evdata = array('item'  => &$item,
+                            'opt'   => &$opt,
+                            'ditem' => &$ditem,
+                            'rss'   => &$rss);
+            $evt = new Doku_Event('FEED_ITEM_ADD', $evdata);
+            if ($evt->advise_before()){
+                $rss->addItem($item);
+            }
+            $evt->advise_after(); // for completeness
+        }
+    }
+    $event->advise_after();
+}
+
+
+/**
+ * Add recent changed pages to the feed object
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rssRecentChanges($opt){
+    global $conf;
+    global $auth;
+
+    $flags = RECENTS_SKIP_DELETED;
+    if(!$opt['show_minor']) $flags += RECENTS_SKIP_MINORS;
+
+    $recents = getRecents(0,$opt['items'],$opt['namespace'],$flags);
+    return $recents;
+}
+
+/**
+ * Add all pages of a namespace to the feed object
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rssListNamespace($opt){
+    require_once(DOKU_INC.'inc/search.php');
+    global $conf;
+
+    $ns=':'.cleanID($opt['namespace']);
+    $ns=str_replace(':','/',$ns);
+
+    $data = array();
+    sort($data);
+    search($data,$conf['datadir'],'search_list','',$ns);
+
+    return $data;
+}
+
+/**
+ * Add the result of a full text search to the feed object
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rssSearch($opt){
+    if(!$opt['search_query']) return;
+
+    require_once(DOKU_INC.'inc/fulltext.php');
+    $data = array();
+    $data = ft_pageSearch($opt['search_query'],$poswords);
+    $data = array_keys($data);
+
+    return $data;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/DifferenceEngine.php b/mod/dokuwiki/vendors/dokuwiki/inc/DifferenceEngine.php
new file mode 100644
index 000000000..e28826c1f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/DifferenceEngine.php
@@ -0,0 +1,1066 @@
+<?php
+/**
+ * A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
+ *
+ * Additions by Axel Boldt for MediaWiki
+ *
+ * @copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
+ * @license  You may copy this code freely under the conditions of the GPL.
+ */
+define('USE_ASSERTS', function_exists('assert'));
+
+class _DiffOp {
+  var $type;
+  var $orig;
+  var $closing;
+
+  function reverse() {
+    trigger_error("pure virtual", E_USER_ERROR);
+  }
+
+  function norig() {
+    return $this->orig ? sizeof($this->orig) : 0;
+  }
+
+  function nclosing() {
+    return $this->closing ? sizeof($this->closing) : 0;
+  }
+}
+
+class _DiffOp_Copy extends _DiffOp {
+  var $type = 'copy';
+
+  function _DiffOp_Copy ($orig, $closing = false) {
+    if (!is_array($closing))
+      $closing = $orig;
+    $this->orig = $orig;
+    $this->closing = $closing;
+  }
+
+  function reverse() {
+    return new _DiffOp_Copy($this->closing, $this->orig);
+  }
+}
+
+class _DiffOp_Delete extends _DiffOp {
+  var $type = 'delete';
+
+  function _DiffOp_Delete ($lines) {
+    $this->orig = $lines;
+    $this->closing = false;
+  }
+
+  function reverse() {
+    return new _DiffOp_Add($this->orig);
+  }
+}
+
+class _DiffOp_Add extends _DiffOp {
+  var $type = 'add';
+
+  function _DiffOp_Add ($lines) {
+    $this->closing = $lines;
+    $this->orig = false;
+  }
+
+  function reverse() {
+    return new _DiffOp_Delete($this->closing);
+  }
+}
+
+class _DiffOp_Change extends _DiffOp {
+  var $type = 'change';
+
+  function _DiffOp_Change ($orig, $closing) {
+    $this->orig = $orig;
+    $this->closing = $closing;
+  }
+
+  function reverse() {
+    return new _DiffOp_Change($this->closing, $this->orig);
+  }
+}
+
+
+/**
+ * Class used internally by Diff to actually compute the diffs.
+ *
+ * The algorithm used here is mostly lifted from the perl module
+ * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
+ *   http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
+ *
+ * More ideas are taken from:
+ *   http://www.ics.uci.edu/~eppstein/161/960229.html
+ *
+ * Some ideas are (and a bit of code) are from from analyze.c, from GNU
+ * diffutils-2.7, which can be found at:
+ *   ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
+ *
+ * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
+ * are my own.
+ *
+ * @author Geoffrey T. Dairiki
+ * @access private
+ */
+class _DiffEngine
+{
+  function diff ($from_lines, $to_lines) {
+    $n_from = sizeof($from_lines);
+    $n_to = sizeof($to_lines);
+
+    $this->xchanged = $this->ychanged = array();
+    $this->xv = $this->yv = array();
+    $this->xind = $this->yind = array();
+    unset($this->seq);
+    unset($this->in_seq);
+    unset($this->lcs);
+
+    // Skip leading common lines.
+    for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) {
+      if ($from_lines[$skip] != $to_lines[$skip])
+        break;
+      $this->xchanged[$skip] = $this->ychanged[$skip] = false;
+    }
+    // Skip trailing common lines.
+    $xi = $n_from; $yi = $n_to;
+    for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) {
+      if ($from_lines[$xi] != $to_lines[$yi])
+        break;
+      $this->xchanged[$xi] = $this->ychanged[$yi] = false;
+    }
+
+    // Ignore lines which do not exist in both files.
+    for ($xi = $skip; $xi < $n_from - $endskip; $xi++)
+      $xhash[$from_lines[$xi]] = 1;
+    for ($yi = $skip; $yi < $n_to - $endskip; $yi++) {
+      $line = $to_lines[$yi];
+      if ( ($this->ychanged[$yi] = empty($xhash[$line])) )
+        continue;
+      $yhash[$line] = 1;
+      $this->yv[] = $line;
+      $this->yind[] = $yi;
+    }
+    for ($xi = $skip; $xi < $n_from - $endskip; $xi++) {
+      $line = $from_lines[$xi];
+      if ( ($this->xchanged[$xi] = empty($yhash[$line])) )
+        continue;
+      $this->xv[] = $line;
+      $this->xind[] = $xi;
+    }
+
+    // Find the LCS.
+    $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
+
+    // Merge edits when possible
+    $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged);
+    $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged);
+
+    // Compute the edit operations.
+    $edits = array();
+    $xi = $yi = 0;
+    while ($xi < $n_from || $yi < $n_to) {
+      USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]);
+      USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]);
+
+      // Skip matching "snake".
+      $copy = array();
+      while ( $xi < $n_from && $yi < $n_to
+          && !$this->xchanged[$xi] && !$this->ychanged[$yi]) {
+        $copy[] = $from_lines[$xi++];
+        ++$yi;
+      }
+      if ($copy)
+        $edits[] = new _DiffOp_Copy($copy);
+
+      // Find deletes & adds.
+      $delete = array();
+      while ($xi < $n_from && $this->xchanged[$xi])
+        $delete[] = $from_lines[$xi++];
+
+      $add = array();
+      while ($yi < $n_to && $this->ychanged[$yi])
+        $add[] = $to_lines[$yi++];
+
+      if ($delete && $add)
+        $edits[] = new _DiffOp_Change($delete, $add);
+      elseif ($delete)
+        $edits[] = new _DiffOp_Delete($delete);
+      elseif ($add)
+        $edits[] = new _DiffOp_Add($add);
+    }
+    return $edits;
+  }
+
+
+  /**
+   * Divide the Largest Common Subsequence (LCS) of the sequences
+   * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
+   * sized segments.
+   *
+   * Returns (LCS, PTS).  LCS is the length of the LCS. PTS is an
+   * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
+   * sub sequences.  The first sub-sequence is contained in [X0, X1),
+   * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on.  Note
+   * that (X0, Y0) == (XOFF, YOFF) and
+   * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
+   *
+   * This function assumes that the first lines of the specified portions
+   * of the two files do not match, and likewise that the last lines do not
+   * match.  The caller must trim matching lines from the beginning and end
+   * of the portions it is going to specify.
+   */
+  function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
+  $flip = false;
+
+  if ($xlim - $xoff > $ylim - $yoff) {
+    // Things seems faster (I'm not sure I understand why)
+      // when the shortest sequence in X.
+      $flip = true;
+    list ($xoff, $xlim, $yoff, $ylim)
+    = array( $yoff, $ylim, $xoff, $xlim);
+    }
+
+  if ($flip)
+    for ($i = $ylim - 1; $i >= $yoff; $i--)
+    $ymatches[$this->xv[$i]][] = $i;
+  else
+    for ($i = $ylim - 1; $i >= $yoff; $i--)
+    $ymatches[$this->yv[$i]][] = $i;
+
+  $this->lcs = 0;
+  $this->seq[0]= $yoff - 1;
+  $this->in_seq = array();
+  $ymids[0] = array();
+
+  $numer = $xlim - $xoff + $nchunks - 1;
+  $x = $xoff;
+  for ($chunk = 0; $chunk < $nchunks; $chunk++) {
+    if ($chunk > 0)
+    for ($i = 0; $i <= $this->lcs; $i++)
+      $ymids[$i][$chunk-1] = $this->seq[$i];
+
+    $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+    for ( ; $x < $x1; $x++) {
+        $line = $flip ? $this->yv[$x] : $this->xv[$x];
+        if (empty($ymatches[$line]))
+      continue;
+    $matches = $ymatches[$line];
+        reset($matches);
+    while (list ($junk, $y) = each($matches))
+      if (empty($this->in_seq[$y])) {
+      $k = $this->_lcs_pos($y);
+      USE_ASSERTS && assert($k > 0);
+      $ymids[$k] = $ymids[$k-1];
+      break;
+          }
+    while (list ($junk, $y) = each($matches)) {
+      if ($y > $this->seq[$k-1]) {
+      USE_ASSERTS && assert($y < $this->seq[$k]);
+      // Optimization: this is a common case:
+      //  next match is just replacing previous match.
+      $this->in_seq[$this->seq[$k]] = false;
+      $this->seq[$k] = $y;
+      $this->in_seq[$y] = 1;
+          }
+      else if (empty($this->in_seq[$y])) {
+      $k = $this->_lcs_pos($y);
+      USE_ASSERTS && assert($k > 0);
+      $ymids[$k] = $ymids[$k-1];
+          }
+        }
+      }
+    }
+
+  $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
+  $ymid = $ymids[$this->lcs];
+  for ($n = 0; $n < $nchunks - 1; $n++) {
+    $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+    $y1 = $ymid[$n] + 1;
+    $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+    }
+  $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
+
+  return array($this->lcs, $seps);
+  }
+
+  function _lcs_pos ($ypos) {
+  $end = $this->lcs;
+  if ($end == 0 || $ypos > $this->seq[$end]) {
+    $this->seq[++$this->lcs] = $ypos;
+    $this->in_seq[$ypos] = 1;
+    return $this->lcs;
+    }
+
+  $beg = 1;
+  while ($beg < $end) {
+    $mid = (int)(($beg + $end) / 2);
+    if ( $ypos > $this->seq[$mid] )
+    $beg = $mid + 1;
+    else
+    $end = $mid;
+    }
+
+  USE_ASSERTS && assert($ypos != $this->seq[$end]);
+
+  $this->in_seq[$this->seq[$end]] = false;
+  $this->seq[$end] = $ypos;
+  $this->in_seq[$ypos] = 1;
+  return $end;
+  }
+
+  /**
+   * Find LCS of two sequences.
+   *
+   * The results are recorded in the vectors $this->{x,y}changed[], by
+   * storing a 1 in the element for each line that is an insertion
+   * or deletion (ie. is not in the LCS).
+   *
+   * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
+   *
+   * Note that XLIM, YLIM are exclusive bounds.
+   * All line numbers are origin-0 and discarded lines are not counted.
+   */
+  function _compareseq ($xoff, $xlim, $yoff, $ylim) {
+  // Slide down the bottom initial diagonal.
+  while ($xoff < $xlim && $yoff < $ylim
+         && $this->xv[$xoff] == $this->yv[$yoff]) {
+    ++$xoff;
+    ++$yoff;
+    }
+
+  // Slide up the top initial diagonal.
+  while ($xlim > $xoff && $ylim > $yoff
+         && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) {
+    --$xlim;
+    --$ylim;
+    }
+
+  if ($xoff == $xlim || $yoff == $ylim)
+    $lcs = 0;
+  else {
+    // This is ad hoc but seems to work well.
+    //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
+    //$nchunks = max(2,min(8,(int)$nchunks));
+    $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+    list ($lcs, $seps)
+    = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
+    }
+
+  if ($lcs == 0) {
+    // X and Y sequences have no common subsequence:
+    // mark all changed.
+    while ($yoff < $ylim)
+    $this->ychanged[$this->yind[$yoff++]] = 1;
+    while ($xoff < $xlim)
+    $this->xchanged[$this->xind[$xoff++]] = 1;
+    }
+  else {
+    // Use the partitions to split this problem into subproblems.
+    reset($seps);
+    $pt1 = $seps[0];
+    while ($pt2 = next($seps)) {
+    $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
+    $pt1 = $pt2;
+      }
+    }
+  }
+
+  /**
+   * Adjust inserts/deletes of identical lines to join changes
+   * as much as possible.
+   *
+   * We do something when a run of changed lines include a
+   * line at one end and has an excluded, identical line at the other.
+   * We are free to choose which identical line is included.
+   * `compareseq' usually chooses the one at the beginning,
+   * but usually it is cleaner to consider the following identical line
+   * to be the "change".
+   *
+   * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
+   */
+  function _shift_boundaries ($lines, &$changed, $other_changed) {
+  $i = 0;
+  $j = 0;
+
+  USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
+  $len = sizeof($lines);
+  $other_len = sizeof($other_changed);
+
+  while (1) {
+    /*
+     * Scan forwards to find beginning of another run of changes.
+     * Also keep track of the corresponding point in the other file.
+     *
+     * Throughout this code, $i and $j are adjusted together so that
+     * the first $i elements of $changed and the first $j elements
+     * of $other_changed both contain the same number of zeros
+     * (unchanged lines).
+     * Furthermore, $j is always kept so that $j == $other_len or
+     * $other_changed[$j] == false.
+     */
+    while ($j < $other_len && $other_changed[$j])
+    $j++;
+
+    while ($i < $len && ! $changed[$i]) {
+    USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+    $i++; $j++;
+    while ($j < $other_len && $other_changed[$j])
+      $j++;
+      }
+
+    if ($i == $len)
+    break;
+
+    $start = $i;
+
+    // Find the end of this run of changes.
+    while (++$i < $len && $changed[$i])
+    continue;
+
+    do {
+    /*
+     * Record the length of this run of changes, so that
+     * we can later determine whether the run has grown.
+     */
+    $runlength = $i - $start;
+
+    /*
+     * Move the changed region back, so long as the
+     * previous unchanged line matches the last changed one.
+     * This merges with previous changed regions.
+     */
+    while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
+      $changed[--$start] = 1;
+      $changed[--$i] = false;
+      while ($start > 0 && $changed[$start - 1])
+      $start--;
+      USE_ASSERTS && assert('$j > 0');
+      while ($other_changed[--$j])
+      continue;
+      USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+        }
+
+    /*
+     * Set CORRESPONDING to the end of the changed run, at the last
+     * point where it corresponds to a changed run in the other file.
+     * CORRESPONDING == LEN means no such point has been found.
+     */
+    $corresponding = $j < $other_len ? $i : $len;
+
+    /*
+     * Move the changed region forward, so long as the
+     * first changed line matches the following unchanged one.
+     * This merges with following changed regions.
+     * Do this second, so that if there are no merges,
+     * the changed region is moved forward as far as possible.
+     */
+    while ($i < $len && $lines[$start] == $lines[$i]) {
+      $changed[$start++] = false;
+      $changed[$i++] = 1;
+      while ($i < $len && $changed[$i])
+      $i++;
+
+      USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+      $j++;
+      if ($j < $other_len && $other_changed[$j]) {
+      $corresponding = $i;
+      while ($j < $other_len && $other_changed[$j])
+        $j++;
+          }
+        }
+      } while ($runlength != $i - $start);
+
+    /*
+     * If possible, move the fully-merged run of changes
+     * back to a corresponding run in the other file.
+     */
+    while ($corresponding < $i) {
+    $changed[--$start] = 1;
+    $changed[--$i] = 0;
+    USE_ASSERTS && assert('$j > 0');
+    while ($other_changed[--$j])
+      continue;
+    USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+      }
+    }
+  }
+}
+
+/**
+ * Class representing a 'diff' between two sequences of strings.
+ */
+class Diff
+{
+  var $edits;
+
+  /**
+   * Constructor.
+   * Computes diff between sequences of strings.
+   *
+   * @param $from_lines array An array of strings.
+   *      (Typically these are lines from a file.)
+   * @param $to_lines array An array of strings.
+   */
+  function Diff($from_lines, $to_lines) {
+    $eng = new _DiffEngine;
+    $this->edits = $eng->diff($from_lines, $to_lines);
+    //$this->_check($from_lines, $to_lines);
+  }
+
+  /**
+   * Compute reversed Diff.
+   *
+   * SYNOPSIS:
+   *
+   *  $diff = new Diff($lines1, $lines2);
+   *  $rev = $diff->reverse();
+   * @return object A Diff object representing the inverse of the
+   *          original diff.
+   */
+  function reverse () {
+  $rev = $this;
+    $rev->edits = array();
+    foreach ($this->edits as $edit) {
+      $rev->edits[] = $edit->reverse();
+    }
+  return $rev;
+  }
+
+  /**
+   * Check for empty diff.
+   *
+   * @return bool True iff two sequences were identical.
+   */
+  function isEmpty () {
+    foreach ($this->edits as $edit) {
+      if ($edit->type != 'copy')
+        return false;
+    }
+    return true;
+  }
+
+  /**
+   * Compute the length of the Longest Common Subsequence (LCS).
+   *
+   * This is mostly for diagnostic purposed.
+   *
+   * @return int The length of the LCS.
+   */
+  function lcs () {
+  $lcs = 0;
+    foreach ($this->edits as $edit) {
+      if ($edit->type == 'copy')
+        $lcs += sizeof($edit->orig);
+    }
+  return $lcs;
+  }
+
+  /**
+   * Get the original set of lines.
+   *
+   * This reconstructs the $from_lines parameter passed to the
+   * constructor.
+   *
+   * @return array The original sequence of strings.
+   */
+  function orig() {
+    $lines = array();
+
+    foreach ($this->edits as $edit) {
+      if ($edit->orig)
+        array_splice($lines, sizeof($lines), 0, $edit->orig);
+    }
+    return $lines;
+  }
+
+  /**
+   * Get the closing set of lines.
+   *
+   * This reconstructs the $to_lines parameter passed to the
+   * constructor.
+   *
+   * @return array The sequence of strings.
+   */
+  function closing() {
+    $lines = array();
+
+    foreach ($this->edits as $edit) {
+      if ($edit->closing)
+        array_splice($lines, sizeof($lines), 0, $edit->closing);
+    }
+    return $lines;
+  }
+
+  /**
+   * Check a Diff for validity.
+   *
+   * This is here only for debugging purposes.
+   */
+  function _check ($from_lines, $to_lines) {
+    if (serialize($from_lines) != serialize($this->orig()))
+      trigger_error("Reconstructed original doesn't match", E_USER_ERROR);
+    if (serialize($to_lines) != serialize($this->closing()))
+      trigger_error("Reconstructed closing doesn't match", E_USER_ERROR);
+
+    $rev = $this->reverse();
+    if (serialize($to_lines) != serialize($rev->orig()))
+      trigger_error("Reversed original doesn't match", E_USER_ERROR);
+    if (serialize($from_lines) != serialize($rev->closing()))
+      trigger_error("Reversed closing doesn't match", E_USER_ERROR);
+
+
+    $prevtype = 'none';
+    foreach ($this->edits as $edit) {
+      if ( $prevtype == $edit->type )
+        trigger_error("Edit sequence is non-optimal", E_USER_ERROR);
+      $prevtype = $edit->type;
+    }
+
+    $lcs = $this->lcs();
+    trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE);
+  }
+}
+
+/**
+ * FIXME: bad name.
+ */
+class MappedDiff
+extends Diff
+{
+  /**
+   * Constructor.
+   *
+   * Computes diff between sequences of strings.
+   *
+   * This can be used to compute things like
+   * case-insensitve diffs, or diffs which ignore
+   * changes in white-space.
+   *
+   * @param $from_lines array An array of strings.
+   *  (Typically these are lines from a file.)
+   *
+   * @param $to_lines array An array of strings.
+   *
+   * @param $mapped_from_lines array This array should
+   *  have the same size number of elements as $from_lines.
+   *  The elements in $mapped_from_lines and
+   *  $mapped_to_lines are what is actually compared
+   *  when computing the diff.
+   *
+   * @param $mapped_to_lines array This array should
+   *  have the same number of elements as $to_lines.
+   */
+  function MappedDiff($from_lines, $to_lines,
+            $mapped_from_lines, $mapped_to_lines) {
+
+    assert(sizeof($from_lines) == sizeof($mapped_from_lines));
+    assert(sizeof($to_lines) == sizeof($mapped_to_lines));
+
+    $this->Diff($mapped_from_lines, $mapped_to_lines);
+
+    $xi = $yi = 0;
+    for ($i = 0; $i < sizeof($this->edits); $i++) {
+      $orig = &$this->edits[$i]->orig;
+      if (is_array($orig)) {
+        $orig = array_slice($from_lines, $xi, sizeof($orig));
+        $xi += sizeof($orig);
+      }
+
+      $closing = &$this->edits[$i]->closing;
+      if (is_array($closing)) {
+        $closing = array_slice($to_lines, $yi, sizeof($closing));
+        $yi += sizeof($closing);
+      }
+    }
+  }
+}
+
+/**
+ * A class to format Diffs
+ *
+ * This class formats the diff in classic diff format.
+ * It is intended that this class be customized via inheritance,
+ * to obtain fancier outputs.
+ */
+class DiffFormatter
+{
+  /**
+   * Number of leading context "lines" to preserve.
+   *
+   * This should be left at zero for this class, but subclasses
+   * may want to set this to other values.
+   */
+  var $leading_context_lines = 0;
+
+  /**
+   * Number of trailing context "lines" to preserve.
+   *
+   * This should be left at zero for this class, but subclasses
+   * may want to set this to other values.
+   */
+  var $trailing_context_lines = 0;
+
+  /**
+   * Format a diff.
+   *
+   * @param $diff object A Diff object.
+   * @return string The formatted output.
+   */
+  function format($diff) {
+
+    $xi = $yi = 1;
+    $block = false;
+    $context = array();
+
+    $nlead = $this->leading_context_lines;
+    $ntrail = $this->trailing_context_lines;
+
+    $this->_start_diff();
+
+    foreach ($diff->edits as $edit) {
+      if ($edit->type == 'copy') {
+        if (is_array($block)) {
+          if (sizeof($edit->orig) <= $nlead + $ntrail) {
+            $block[] = $edit;
+          }
+          else{
+            if ($ntrail) {
+              $context = array_slice($edit->orig, 0, $ntrail);
+              $block[] = new _DiffOp_Copy($context);
+            }
+            $this->_block($x0, $ntrail + $xi - $x0,
+                    $y0, $ntrail + $yi - $y0,
+                    $block);
+            $block = false;
+          }
+        }
+        $context = $edit->orig;
+      }
+      else {
+        if (! is_array($block)) {
+          $context = array_slice($context, sizeof($context) - $nlead);
+          $x0 = $xi - sizeof($context);
+          $y0 = $yi - sizeof($context);
+          $block = array();
+          if ($context)
+            $block[] = new _DiffOp_Copy($context);
+        }
+        $block[] = $edit;
+      }
+
+      if ($edit->orig)
+        $xi += sizeof($edit->orig);
+      if ($edit->closing)
+        $yi += sizeof($edit->closing);
+    }
+
+    if (is_array($block))
+      $this->_block($x0, $xi - $x0,
+              $y0, $yi - $y0,
+              $block);
+
+    return $this->_end_diff();
+  }
+
+  function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
+    $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
+    foreach ($edits as $edit) {
+      if ($edit->type == 'copy')
+        $this->_context($edit->orig);
+      elseif ($edit->type == 'add')
+        $this->_added($edit->closing);
+      elseif ($edit->type == 'delete')
+        $this->_deleted($edit->orig);
+      elseif ($edit->type == 'change')
+        $this->_changed($edit->orig, $edit->closing);
+      else
+        trigger_error("Unknown edit type", E_USER_ERROR);
+    }
+    $this->_end_block();
+  }
+
+  function _start_diff() {
+    ob_start();
+  }
+
+  function _end_diff() {
+    $val = ob_get_contents();
+    ob_end_clean();
+    return $val;
+  }
+
+  function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+    if ($xlen > 1)
+      $xbeg .= "," . ($xbeg + $xlen - 1);
+    if ($ylen > 1)
+      $ybeg .= "," . ($ybeg + $ylen - 1);
+
+    return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg;
+  }
+
+  function _start_block($header) {
+    echo $header;
+  }
+
+  function _end_block() {
+  }
+
+  function _lines($lines, $prefix = ' ') {
+    foreach ($lines as $line)
+      echo "$prefix $line\n";
+  }
+
+  function _context($lines) {
+    $this->_lines($lines);
+  }
+
+  function _added($lines) {
+    $this->_lines($lines, ">");
+  }
+  function _deleted($lines) {
+    $this->_lines($lines, "<");
+  }
+
+  function _changed($orig, $closing) {
+    $this->_deleted($orig);
+    echo "---\n";
+    $this->_added($closing);
+  }
+}
+
+
+/**
+ *  Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
+ *
+ */
+
+define('NBSP', "\xC2\xA0");     // utf-8 non-breaking space.
+
+class _HWLDF_WordAccumulator {
+  function _HWLDF_WordAccumulator () {
+    $this->_lines = array();
+    $this->_line = '';
+    $this->_group = '';
+    $this->_tag = '';
+  }
+
+  function _flushGroup ($new_tag) {
+    if ($this->_group !== '') {
+    if ($this->_tag == 'mark')
+      $this->_line .= '<strong>'.$this->_group.'</strong>';
+    else
+    $this->_line .= $this->_group;
+  }
+    $this->_group = '';
+    $this->_tag = $new_tag;
+  }
+
+  function _flushLine ($new_tag) {
+    $this->_flushGroup($new_tag);
+    if ($this->_line != '')
+      $this->_lines[] = $this->_line;
+    $this->_line = '';
+  }
+
+  function addWords ($words, $tag = '') {
+    if ($tag != $this->_tag)
+      $this->_flushGroup($tag);
+
+    foreach ($words as $word) {
+      // new-line should only come as first char of word.
+      if ($word == '')
+        continue;
+      if ($word[0] == "\n") {
+        $this->_group .= NBSP;
+        $this->_flushLine($tag);
+        $word = substr($word, 1);
+      }
+      assert(!strstr($word, "\n"));
+      $this->_group .= $word;
+    }
+  }
+
+  function getLines() {
+    $this->_flushLine('~done');
+    return $this->_lines;
+  }
+}
+
+class WordLevelDiff extends MappedDiff
+{
+  function WordLevelDiff ($orig_lines, $closing_lines) {
+    list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
+    list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
+
+
+    $this->MappedDiff($orig_words, $closing_words,
+              $orig_stripped, $closing_stripped);
+  }
+
+  function _split($lines) {
+    // FIXME: fix POSIX char class.
+#    if (!preg_match_all('/ ( [^\S\n]+ | [[:alnum:]]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
+    if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
+              implode("\n", $lines),
+              $m)) {
+      return array(array(''), array(''));
+    }
+    return array($m[0], $m[1]);
+  }
+
+  function orig () {
+    $orig = new _HWLDF_WordAccumulator;
+
+    foreach ($this->edits as $edit) {
+      if ($edit->type == 'copy')
+        $orig->addWords($edit->orig);
+      elseif ($edit->orig)
+        $orig->addWords($edit->orig, 'mark');
+    }
+    return $orig->getLines();
+  }
+
+  function closing () {
+    $closing = new _HWLDF_WordAccumulator;
+
+    foreach ($this->edits as $edit) {
+      if ($edit->type == 'copy')
+        $closing->addWords($edit->closing);
+      elseif ($edit->closing)
+        $closing->addWords($edit->closing, 'mark');
+    }
+    return $closing->getLines();
+  }
+}
+
+/**
+ * "Unified" diff formatter.
+ *
+ * This class formats the diff in classic "unified diff" format.
+ */
+class UnifiedDiffFormatter extends DiffFormatter
+{
+    function UnifiedDiffFormatter($context_lines = 4) {
+        $this->leading_context_lines = $context_lines;
+        $this->trailing_context_lines = $context_lines;
+    }
+
+    function _block_header($xbeg, $xlen, $ybeg, $ylen) {
+        if ($xlen != 1)
+            $xbeg .= "," . $xlen;
+        if ($ylen != 1)
+            $ybeg .= "," . $ylen;
+        return "@@ -$xbeg +$ybeg @@\n";
+    }
+
+    function _added($lines) {
+        $this->_lines($lines, "+");
+    }
+    function _deleted($lines) {
+        $this->_lines($lines, "-");
+    }
+    function _changed($orig, $final) {
+        $this->_deleted($orig);
+        $this->_added($final);
+    }
+}
+
+/**
+ *  Wikipedia Table style diff formatter.
+ *
+ */
+class TableDiffFormatter extends DiffFormatter
+{
+  function TableDiffFormatter() {
+    $this->leading_context_lines = 2;
+    $this->trailing_context_lines = 2;
+  }
+
+  function _pre($text){
+    $text = htmlspecialchars($text);
+    $text = str_replace('  ',' &nbsp;',$text);
+    if($text{0} == ' ') $text = '&nbsp;'.substr($text,1);
+    return $text;
+  }
+
+  function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
+    global $lang;
+    $l1 = $lang['line'].' '.$xbeg;
+    $l2 = $lang['line'].' '.$ybeg;
+    $r = '<tr><td class="diff-blockheader" colspan="2">'.$l1.":</td>\n" .
+      '<td class="diff-blockheader" colspan="2">'.$l2.":</td></tr>\n";
+    return $r;
+  }
+
+  function _start_block( $header ) {
+    print( $header );
+  }
+
+  function _end_block() {
+  }
+
+  function _lines( $lines, $prefix=' ', $color="white" ) {
+  }
+
+  function addedLine( $line ) {
+    $line = str_replace('  ',' &nbsp;',$line);
+    if($line{0} == ' ') $line = '&nbsp;'.substr($line,1);
+    return '<td>+</td><td class="diff-addedline">' .
+      $line.'</td>';
+  }
+
+  function deletedLine( $line ) {
+    $line = str_replace('  ',' &nbsp;',$line);
+    if($line{0} == ' ') $line = '&nbsp;'.substr($line,1);
+    return '<td>-</td><td class="diff-deletedline">' .
+      $line.'</td>';
+  }
+
+  function emptyLine() {
+    //$line = str_replace('  ','&nbsp; ',$line);
+    return '<td colspan="2">&nbsp;</td>';
+  }
+
+  function contextLine( $line ) {
+    $line = str_replace('  ',' &nbsp;',$line);
+    if($line{0} == ' ') $line = '&nbsp;'.substr($line,1);
+    return '<td> </td><td class="diff-context">'.$line.'</td>';
+  }
+
+  function _added($lines) {
+    foreach ($lines as $line) {
+      print( '<tr>' . $this->emptyLine() .
+        $this->addedLine( $line ) . "</tr>\n" );
+    }
+  }
+
+  function _deleted($lines) {
+    foreach ($lines as $line) {
+      print( '<tr>' . $this->deletedLine( $line ) .
+        $this->emptyLine() . "</tr>\n" );
+    }
+  }
+
+  function _context( $lines ) {
+    foreach ($lines as $line) {
+      print( '<tr>' . $this->contextLine( $line ) .
+        $this->contextLine( $line ) . "</tr>\n" );
+    }
+  }
+
+  function _changed( $orig, $closing ) {
+    $diff = new WordLevelDiff( $orig, $closing );
+    $del = $diff->orig();
+    $add = $diff->closing();
+
+    while ( $line = array_shift( $del ) ) {
+      $aline = array_shift( $add );
+      print( '<tr>' . $this->deletedLine( $line ) .
+        $this->addedLine( $aline ) . "</tr>\n" );
+    }
+    $this->_added( $add ); # If any leftovers
+  }
+}
+
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/EmailAddressValidator.php b/mod/dokuwiki/vendors/dokuwiki/inc/EmailAddressValidator.php
new file mode 100644
index 000000000..2ce2093e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/EmailAddressValidator.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * EmailAddressValidator Class
+ *
+ * @author  Dave Child <dave@addedbytes.com>
+ * @link    http://code.google.com/p/php-email-address-validation/
+ * @license http://www.opensource.org/licenses/bsd-license.php
+ */
+class EmailAddressValidator {
+
+    /**
+     * Check email address validity
+     * @param   strEmailAddress     Email address to be checked
+     * @return  True if email is valid, false if not
+     */
+    function check_email_address($strEmailAddress) {
+
+        // Control characters are not allowed
+        if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $strEmailAddress)) {
+            return false;
+        }
+
+        // Split it into sections using last instance of "@"
+        $intAtSymbol = strrpos($strEmailAddress, '@');
+        if ($intAtSymbol === false) {
+            // No "@" symbol in email.
+            return false;
+        }
+        $arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol);
+        $arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1);
+
+        // Count the "@" symbols. Only one is allowed, except where
+        // contained in quote marks in the local part. Quickest way to
+        // check this is to remove anything in quotes.
+        $arrTempAddress[0] = preg_replace('/"[^"]+"/'
+                                         ,''
+                                         ,$arrEmailAddress[0]);
+        $arrTempAddress[1] = $arrEmailAddress[1];
+        $strTempAddress = $arrTempAddress[0] . $arrTempAddress[1];
+        // Then check - should be no "@" symbols.
+        if (strrpos($strTempAddress, '@') !== false) {
+            // "@" symbol found
+            return false;
+        }
+
+        // Check local portion
+        if (!$this->check_local_portion($arrEmailAddress[0])) {
+            return false;
+        }
+
+        // Check domain portion
+        if (!$this->check_domain_portion($arrEmailAddress[1])) {
+            return false;
+        }
+
+        // If we're still here, all checks above passed. Email is valid.
+        return true;
+
+    }
+
+    /**
+     * Checks email section before "@" symbol for validity
+     * @param   strLocalPortion     Text to be checked
+     * @return  True if local portion is valid, false if not
+     */
+    function check_local_portion($strLocalPortion) {
+        // Local portion can only be from 1 to 64 characters, inclusive.
+        // Please note that servers are encouraged to accept longer local
+        // parts than 64 characters.
+        if (!$this->check_text_length($strLocalPortion, 1, 64)) {
+            return false;
+        }
+        // Local portion must be:
+        // 1) a dot-atom (strings separated by periods)
+        // 2) a quoted string
+        // 3) an obsolete format string (combination of the above)
+        $arrLocalPortion = explode('.', $strLocalPortion);
+        for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) {
+             if (!preg_match('.^('
+                            .    '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]'
+                            .    '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})'
+                            .'|'
+                            .    '("[^\\\"]{0,62}")'
+                            .')$.'
+                            ,$arrLocalPortion[$i])) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Checks email section after "@" symbol for validity
+     * @param   strDomainPortion     Text to be checked
+     * @return  True if domain portion is valid, false if not
+     */
+    function check_domain_portion($strDomainPortion) {
+        // Total domain can only be from 1 to 255 characters, inclusive
+        if (!$this->check_text_length($strDomainPortion, 1, 255)) {
+            return false;
+        }
+        // Check if domain is IP, possibly enclosed in square brackets.
+        if (preg_match('/^(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+           .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}$/'
+           ,$strDomainPortion) ||
+            preg_match('/^\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])'
+           .'(\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\]$/'
+           ,$strDomainPortion)) {
+            return true;
+        } else {
+            $arrDomainPortion = explode('.', $strDomainPortion);
+            if (sizeof($arrDomainPortion) < 2) {
+                return false; // Not enough parts to domain
+            }
+            for ($i = 0, $max = sizeof($arrDomainPortion); $i < $max; $i++) {
+                // Each portion must be between 1 and 63 characters, inclusive
+                if (!$this->check_text_length($arrDomainPortion[$i], 1, 63)) {
+                    return false;
+                }
+                if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|'
+                   .'([A-Za-z0-9]+))$/', $arrDomainPortion[$i])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Check given text length is between defined bounds
+     * @param   strText     Text to be checked
+     * @param   intMinimum  Minimum acceptable length
+     * @param   intMaximum  Maximum acceptable length
+     * @return  True if string is within bounds (inclusive), false if not
+     */
+    function check_text_length($strText, $intMinimum, $intMaximum) {
+        // Minimum and maximum are both inclusive
+        $intTextLength = strlen($strText);
+        if (($intTextLength < $intMinimum) || ($intTextLength > $intMaximum)) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/FeedParser.php b/mod/dokuwiki/vendors/dokuwiki/inc/FeedParser.php
new file mode 100644
index 000000000..f37888f01
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/FeedParser.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Class used to parse RSS and ATOM feeds
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/HTTPClient.php');
+require_once(DOKU_INC.'inc/SimplePie.php');
+
+
+/**
+ * We override some methods of the original SimplePie class here
+ */
+class FeedParser extends SimplePie {
+
+    /**
+     * Constructor. Set some defaults
+     */
+    function FeedParser(){
+        $this->SimplePie();
+        $this->enable_cache(false);
+        $this->set_file_class('FeedParser_File');
+    }
+
+    /**
+     * Backward compatibility for older plugins
+     */
+    function feed_url($url){
+        $this->set_feed_url($url);
+    }
+}
+
+/**
+ * Fetch an URL using our own HTTPClient
+ *
+ * Replaces SimplePie's own class
+ */
+class FeedParser_File extends SimplePie_File {
+    var $http;
+    var $useragent;
+    var $success = true;
+    var $headers = array();
+    var $body;
+    var $error;
+
+    /**
+     * Inititializes the HTTPClient
+     *
+     * We ignore all given parameters - they are set in DokuHTTPClient
+     */
+    function FeedParser_File($url, $timeout=10, $redirects=5,
+                             $headers=null, $useragent=null, $force_fsockopen=false) {
+        $this->http    = new DokuHTTPClient();
+        $this->success = $this->http->sendRequest($url);
+
+        $this->headers = $this->http->resp_headers;
+        $this->body    = $this->http->resp_body;
+        $this->error   = $this->http->error;
+        return $this->success;
+    }
+
+    function headers(){
+        return $this->headers;
+    }
+
+    function body(){
+        return $this->body;
+    }
+
+    function close(){
+        return true;
+    }
+
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/HTTPClient.php b/mod/dokuwiki/vendors/dokuwiki/inc/HTTPClient.php
new file mode 100644
index 000000000..578d7e7cd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/HTTPClient.php
@@ -0,0 +1,573 @@
+<?php
+/**
+ * HTTP Client
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Goetz <cpuidle@gmx.de>
+ */
+
+
+define('HTTP_NL',"\r\n");
+
+
+/**
+ * Adds DokuWiki specific configs to the HTTP client
+ *
+ * @author Andreas Goetz <cpuidle@gmx.de>
+ */
+class DokuHTTPClient extends HTTPClient {
+
+    /**
+     * Constructor.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function DokuHTTPClient(){
+        global $conf;
+
+        // call parent constructor
+        $this->HTTPClient();
+
+        // set some values from the config
+        $this->proxy_host = $conf['proxy']['host'];
+        $this->proxy_port = $conf['proxy']['port'];
+        $this->proxy_user = $conf['proxy']['user'];
+        $this->proxy_pass = conf_decodeString($conf['proxy']['pass']);
+        $this->proxy_ssl  = $conf['proxy']['ssl'];
+    }
+
+
+    /**
+     * Wraps an event around the parent function
+     *
+     * @triggers HTTPCLIENT_REQUEST_SEND
+     * @author   Andreas Gohr <andi@splitbrain.org>
+     */
+    function sendRequest($url,$data='',$method='GET'){
+        $httpdata = array('url'    => $url,
+                          'data'   => $data,
+                          'method' => $method);
+        $evt = new Doku_Event('HTTPCLIENT_REQUEST_SEND',$httpdata);
+        if($evt->advise_before()){
+            $url    = $httpdata['url'];
+            $data   = $httpdata['data'];
+            $method = $httpdata['method'];
+        }
+        $evt->advise_after();
+        unset($evt);
+        return parent::sendRequest($url,$data,$method);
+    }
+
+}
+
+/**
+ * This class implements a basic HTTP client
+ *
+ * It supports POST and GET, Proxy usage, basic authentication,
+ * handles cookies and referers. It is based upon the httpclient
+ * function from the VideoDB project.
+ *
+ * @link   http://www.splitbrain.org/go/videodb
+ * @author Andreas Goetz <cpuidle@gmx.de>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class HTTPClient {
+    //set these if you like
+    var $agent;         // User agent
+    var $http;          // HTTP version defaults to 1.0
+    var $timeout;       // read timeout (seconds)
+    var $cookies;
+    var $referer;
+    var $max_redirect;
+    var $max_bodysize;
+    var $max_bodysize_abort = true;  // if set, abort if the response body is bigger than max_bodysize
+    var $header_regexp; // if set this RE must match against the headers, else abort
+    var $headers;
+    var $debug;
+    var $start = 0; // for timings
+
+    // don't set these, read on error
+    var $error;
+    var $redirect_count;
+
+    // read these after a successful request
+    var $resp_status;
+    var $resp_body;
+    var $resp_headers;
+
+    // set these to do basic authentication
+    var $user;
+    var $pass;
+
+    // set these if you need to use a proxy
+    var $proxy_host;
+    var $proxy_port;
+    var $proxy_user;
+    var $proxy_pass;
+    var $proxy_ssl; //boolean set to true if your proxy needs SSL
+
+    // what we use as boundary on multipart/form-data posts
+    var $boundary = '---DokuWikiHTTPClient--4523452351';
+
+    /**
+     * Constructor.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function HTTPClient(){
+        $this->agent        = 'Mozilla/4.0 (compatible; DokuWiki HTTP Client; '.PHP_OS.')';
+        $this->timeout      = 15;
+        $this->cookies      = array();
+        $this->referer      = '';
+        $this->max_redirect = 3;
+        $this->redirect_count = 0;
+        $this->status       = 0;
+        $this->headers      = array();
+        $this->http         = '1.0';
+        $this->debug        = false;
+        $this->max_bodysize = 0;
+        $this->header_regexp= '';
+        if(extension_loaded('zlib')) $this->headers['Accept-encoding'] = 'gzip';
+        $this->headers['Accept'] = 'text/xml,application/xml,application/xhtml+xml,'.
+                                   'text/html,text/plain,image/png,image/jpeg,image/gif,*/*';
+        $this->headers['Accept-Language'] = 'en-us';
+    }
+
+
+    /**
+     * Simple function to do a GET request
+     *
+     * Returns the wanted page or false on an error;
+     *
+     * @param  string $url       The URL to fetch
+     * @param  bool   $sloppy304 Return body on 304 not modified
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function get($url,$sloppy304=false){
+        if(!$this->sendRequest($url)) return false;
+        if($this->status == 304 && $sloppy304) return $this->resp_body;
+        if($this->status < 200 || $this->status > 206) return false;
+        return $this->resp_body;
+    }
+
+    /**
+     * Simple function to do a POST request
+     *
+     * Returns the resulting page or false on an error;
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function post($url,$data){
+        if(!$this->sendRequest($url,$data,'POST')) return false;
+        if($this->status < 200 || $this->status > 206) return false;
+        return $this->resp_body;
+    }
+
+    /**
+     * Send an HTTP request
+     *
+     * This method handles the whole HTTP communication. It respects set proxy settings,
+     * builds the request headers, follows redirects and parses the response.
+     *
+     * Post data should be passed as associative array. When passed as string it will be
+     * sent as is. You will need to setup your own Content-Type header then.
+     *
+     * @param  string $url    - the complete URL
+     * @param  mixed  $data   - the post data either as array or raw data
+     * @param  string $method - HTTP Method usually GET or POST.
+     * @return bool - true on success
+     * @author Andreas Goetz <cpuidle@gmx.de>
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function sendRequest($url,$data='',$method='GET'){
+        $this->start  = $this->_time();
+        $this->error  = '';
+        $this->status = 0;
+
+        // don't accept gzip if truncated bodies might occur
+        if($this->max_bodysize &&
+           !$this->max_bodysize_abort &&
+           $this->headers['Accept-encoding'] == 'gzip'){
+            unset($this->headers['Accept-encoding']);
+        }
+
+        // parse URL into bits
+        $uri = parse_url($url);
+        $server = $uri['host'];
+        $path   = $uri['path'];
+        if(empty($path)) $path = '/';
+        if(!empty($uri['query'])) $path .= '?'.$uri['query'];
+        $port = $uri['port'];
+        if(isset($uri['user'])) $this->user = $uri['user'];
+        if(isset($uri['pass'])) $this->pass = $uri['pass'];
+
+        // proxy setup
+        if($this->proxy_host){
+            $request_url = $url;
+            $server      = $this->proxy_host;
+            $port        = $this->proxy_port;
+            if (empty($port)) $port = 8080;
+        }else{
+            $request_url = $path;
+            $server      = $server;
+            if (empty($port)) $port = ($uri['scheme'] == 'https') ? 443 : 80;
+        }
+
+        // add SSL stream prefix if needed - needs SSL support in PHP
+        if($port == 443 || $this->proxy_ssl) $server = 'ssl://'.$server;
+
+        // prepare headers
+        $headers               = $this->headers;
+        $headers['Host']       = $uri['host'];
+        $headers['User-Agent'] = $this->agent;
+        $headers['Referer']    = $this->referer;
+        $headers['Connection'] = 'Close';
+        if($method == 'POST'){
+            if(is_array($data)){
+                if($headers['Content-Type'] == 'multipart/form-data'){
+                    $headers['Content-Type']   = 'multipart/form-data; boundary='.$this->boundary;
+                    $data = $this->_postMultipartEncode($data);
+                }else{
+                    $headers['Content-Type']   = 'application/x-www-form-urlencoded';
+                    $data = $this->_postEncode($data);
+                }
+            }
+            $headers['Content-Length'] = strlen($data);
+            $rmethod = 'POST';
+        }elseif($method == 'GET'){
+            $data = ''; //no data allowed on GET requests
+        }
+        if($this->user) {
+            $headers['Authorization'] = 'Basic '.base64_encode($this->user.':'.$this->pass);
+        }
+        if($this->proxy_user) {
+            $headers['Proxy-Authorization'] = 'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass);
+        }
+
+        // stop time
+        $start = time();
+
+        // open socket
+        $socket = @fsockopen($server,$port,$errno, $errstr, $this->timeout);
+        if (!$socket){
+            $resp->status = '-100';
+            $this->error = "Could not connect to $server:$port\n$errstr ($errno)";
+            return false;
+        }
+        //set non blocking
+        stream_set_blocking($socket,0);
+
+        // build request
+        $request  = "$method $request_url HTTP/".$this->http.HTTP_NL;
+        $request .= $this->_buildHeaders($headers);
+        $request .= $this->_getCookies();
+        $request .= HTTP_NL;
+        $request .= $data;
+
+        $this->_debug('request',$request);
+
+        // send request
+        $towrite = strlen($request);
+        $written = 0;
+        while($written < $towrite){
+            $ret = fwrite($socket, substr($request,$written));
+            if($ret === false){
+                $this->status = -100;
+                $this->error = 'Failed writing to socket';
+                return false;
+            }
+            $written += $ret;
+        }
+
+
+        // read headers from socket
+        $r_headers = '';
+        do{
+            if(time()-$start > $this->timeout){
+                $this->status = -100;
+                $this->error = sprintf('Timeout while reading headers (%.3fs)',$this->_time() - $this->start);
+                return false;
+            }
+            if(feof($socket)){
+                $this->error = 'Premature End of File (socket)';
+                return false;
+            }
+            $r_headers .= fgets($socket,1024);
+        }while(!preg_match('/\r?\n\r?\n$/',$r_headers));
+
+        $this->_debug('response headers',$r_headers);
+
+        // check if expected body size exceeds allowance
+        if($this->max_bodysize && preg_match('/\r?\nContent-Length:\s*(\d+)\r?\n/i',$r_headers,$match)){
+            if($match[1] > $this->max_bodysize){
+                $this->error = 'Reported content length exceeds allowed response size';
+                if ($this->max_bodysize_abort)
+                    return false;
+            }
+        }
+
+        // get Status
+        if (!preg_match('/^HTTP\/(\d\.\d)\s*(\d+).*?\n/', $r_headers, $m)) {
+            $this->error = 'Server returned bad answer';
+            return false;
+        }
+        $this->status = $m[2];
+
+        // handle headers and cookies
+        $this->resp_headers = $this->_parseHeaders($r_headers);
+        if(isset($this->resp_headers['set-cookie'])){
+            foreach ((array) $this->resp_headers['set-cookie'] as $cookie){
+                list($cookie)   = explode(';',$cookie,2);
+                list($key,$val) = explode('=',$cookie,2);
+                $key = trim($key);
+                if($val == 'deleted'){
+                    if(isset($this->cookies[$key])){
+                        unset($this->cookies[$key]);
+                    }
+                }elseif($key){
+                    $this->cookies[$key] = $val;
+                }
+            }
+        }
+
+        $this->_debug('Object headers',$this->resp_headers);
+
+        // check server status code to follow redirect
+        if($this->status == 301 || $this->status == 302 ){
+            if (empty($this->resp_headers['location'])){
+                $this->error = 'Redirect but no Location Header found';
+                return false;
+            }elseif($this->redirect_count == $this->max_redirect){
+                $this->error = 'Maximum number of redirects exceeded';
+                return false;
+            }else{
+                $this->redirect_count++;
+                $this->referer = $url;
+                // handle non-RFC-compliant relative redirects
+                if (!preg_match('/^http/i', $this->resp_headers['location'])){
+                    if($this->resp_headers['location'][0] != '/'){
+                        $this->resp_headers['location'] = $uri['scheme'].'://'.$uri['host'].':'.$uri['port'].
+                                                          dirname($uri['path']).'/'.$this->resp_headers['location'];
+                    }else{
+                        $this->resp_headers['location'] = $uri['scheme'].'://'.$uri['host'].':'.$uri['port'].
+                                                          $this->resp_headers['location'];
+                    }
+                }
+                // perform redirected request, always via GET (required by RFC)
+                return $this->sendRequest($this->resp_headers['location'],array(),'GET');
+            }
+        }
+
+        // check if headers are as expected
+        if($this->header_regexp && !preg_match($this->header_regexp,$r_headers)){
+            $this->error = 'The received headers did not match the given regexp';
+            return false;
+        }
+
+        //read body (with chunked encoding if needed)
+        $r_body    = '';
+        if(preg_match('/transfer\-(en)?coding:\s*chunked\r\n/i',$r_headers)){
+            do {
+                unset($chunk_size);
+                do {
+                    if(feof($socket)){
+                        $this->error = 'Premature End of File (socket)';
+                        return false;
+                    }
+                    if(time()-$start > $this->timeout){
+                        $this->status = -100;
+                        $this->error = sprintf('Timeout while reading chunk (%.3fs)',$this->_time() - $this->start);
+                        return false;
+                    }
+                    $byte = fread($socket,1);
+                    $chunk_size .= $byte;
+                } while (preg_match('/[a-zA-Z0-9]/',$byte)); // read chunksize including \r
+
+                $byte = fread($socket,1);     // readtrailing \n
+                $chunk_size = hexdec($chunk_size);
+                if ($chunk_size) {
+                    $this_chunk = fread($socket,$chunk_size);
+                    $r_body    .= $this_chunk;
+                    $byte = fread($socket,2); // read trailing \r\n
+                }
+
+                if($this->max_bodysize && strlen($r_body) > $this->max_bodysize){
+                    $this->error = 'Allowed response size exceeded';
+                    if ($this->max_bodysize_abort)
+                        return false;
+                    else
+                        break;
+                }
+            } while ($chunk_size);
+        }else{
+            // read entire socket
+            while (!feof($socket)) {
+                if(time()-$start > $this->timeout){
+                    $this->status = -100;
+                    $this->error = sprintf('Timeout while reading response (%.3fs)',$this->_time() - $this->start);
+                    return false;
+                }
+                $r_body .= fread($socket,4096);
+                $r_size = strlen($r_body);
+                if($this->max_bodysize && $r_size > $this->max_bodysize){
+                    $this->error = 'Allowed response size exceeded';
+                    if ($this->max_bodysize_abort)
+                        return false;
+                    else
+                        break;
+                }
+                if(isset($this->resp_headers['content-length']) &&
+                   !isset($this->resp_headers['transfer-encoding']) &&
+                   $this->resp_headers['content-length'] == $r_size){
+                    // we read the content-length, finish here
+                    break;
+                }
+            }
+        }
+
+        // close socket
+        $status = socket_get_status($socket);
+        fclose($socket);
+
+        // decode gzip if needed
+        if(isset($this->resp_headers['content-encoding']) &&
+           $this->resp_headers['content-encoding'] == 'gzip' &&
+           strlen($r_body) > 10 && substr($r_body,0,3)=="\x1f\x8b\x08"){
+            $this->resp_body = @gzinflate(substr($r_body, 10));
+        }else{
+            $this->resp_body = $r_body;
+        }
+
+        $this->_debug('response body',$this->resp_body);
+        $this->redirect_count = 0;
+        return true;
+    }
+
+    /**
+     * print debug info
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _debug($info,$var=null){
+        if(!$this->debug) return;
+        print '<b>'.$info.'</b> '.($this->_time() - $this->start).'s<br />';
+        if(!is_null($var)){
+            ob_start();
+            print_r($var);
+            $content = htmlspecialchars(ob_get_contents());
+            ob_end_clean();
+            print '<pre>'.$content.'</pre>';
+        }
+    }
+
+    /**
+     * Return current timestamp in microsecond resolution
+     */
+    function _time(){
+        list($usec, $sec) = explode(" ", microtime());
+        return ((float)$usec + (float)$sec);
+    }
+
+    /**
+     * convert given header string to Header array
+     *
+     * All Keys are lowercased.
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _parseHeaders($string){
+        $headers = array();
+        $lines = explode("\n",$string);
+        foreach($lines as $line){
+            list($key,$val) = explode(':',$line,2);
+            $key = strtolower(trim($key));
+            $val = trim($val);
+            if(empty($val)) continue;
+            if(isset($headers[$key])){
+                if(is_array($headers[$key])){
+                    $headers[$key][] = $val;
+                }else{
+                    $headers[$key] = array($headers[$key],$val);
+                }
+            }else{
+                $headers[$key] = $val;
+            }
+        }
+        return $headers;
+    }
+
+    /**
+     * convert given header array to header string
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _buildHeaders($headers){
+        $string = '';
+        foreach($headers as $key => $value){
+            if(empty($value)) continue;
+            $string .= $key.': '.$value.HTTP_NL;
+        }
+        return $string;
+    }
+
+    /**
+     * get cookies as http header string
+     *
+     * @author Andreas Goetz <cpuidle@gmx.de>
+     */
+    function _getCookies(){
+        $headers = '';
+        foreach ($this->cookies as $key => $val){
+            $headers .= "$key=$val; ";
+        }
+        $headers = substr($headers, 0, -2);
+        if ($headers !== '') $headers = "Cookie: $headers".HTTP_NL;
+        return $headers;
+    }
+
+    /**
+     * Encode data for posting
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _postEncode($data){
+        foreach($data as $key => $val){
+            if($url) $url .= '&';
+            $url .= urlencode($key).'='.urlencode($val);
+        }
+        return $url;
+    }
+
+    /**
+     * Encode data for posting using multipart encoding
+     *
+     * @fixme use of urlencode might be wrong here
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _postMultipartEncode($data){
+        $boundary = '--'.$this->boundary;
+        $out = '';
+        foreach($data as $key => $val){
+            $out .= $boundary.HTTP_NL;
+            if(!is_array($val)){
+                $out .= 'Content-Disposition: form-data; name="'.urlencode($key).'"'.HTTP_NL;
+                $out .= HTTP_NL; // end of headers
+                $out .= $val;
+                $out .= HTTP_NL;
+            }else{
+                $out .= 'Content-Disposition: form-data; name="'.urlencode($key).'"';
+                if($val['filename']) $out .= '; filename="'.urlencode($val['filename']).'"';
+                $out .= HTTP_NL;
+                if($val['mimetype']) $out .= 'Content-Type: '.$val['mimetype'].HTTP_NL;
+                $out .= HTTP_NL; // end of headers
+                $out .= $val['body'];
+                $out .= HTTP_NL;
+            }
+        }
+        $out .= "$boundary--".HTTP_NL;
+        return $out;
+    }
+
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/IXR_Library.php b/mod/dokuwiki/vendors/dokuwiki/inc/IXR_Library.php
new file mode 100644
index 000000000..2752e31f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/IXR_Library.php
@@ -0,0 +1,817 @@
+<?php
+/**
+ * IXR - The Inutio XML-RPC Library - (c) Incutio Ltd 2002
+ *
+ * @version 1.61
+ * @author  Simon Willison
+ * @date    11th July 2003
+ * @link    http://scripts.incutio.com/xmlrpc/
+ * @link    http://scripts.incutio.com/xmlrpc/manual.php
+ * @license Artistic License http://www.opensource.org/licenses/artistic-license.php
+ *
+ * Modified for DokuWiki
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+
+class IXR_Value {
+    var $data;
+    var $type;
+    function IXR_Value ($data, $type = false) {
+        $this->data = $data;
+        if (!$type) {
+            $type = $this->calculateType();
+        }
+        $this->type = $type;
+        if ($type == 'struct') {
+            /* Turn all the values in the array in to new IXR_Value objects */
+            foreach ($this->data as $key => $value) {
+                $this->data[$key] = new IXR_Value($value);
+            }
+        }
+        if ($type == 'array') {
+            for ($i = 0, $j = count($this->data); $i < $j; $i++) {
+                $this->data[$i] = new IXR_Value($this->data[$i]);
+            }
+        }
+    }
+    function calculateType() {
+        if ($this->data === true || $this->data === false) {
+            return 'boolean';
+        }
+        if (is_integer($this->data)) {
+            return 'int';
+        }
+        if (is_double($this->data)) {
+            return 'double';
+        }
+        // Deal with IXR object types base64 and date
+        if (is_object($this->data) && is_a($this->data, 'IXR_Date')) {
+            return 'date';
+        }
+        if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) {
+            return 'base64';
+        }
+        // If it is a normal PHP object convert it in to a struct
+        if (is_object($this->data)) {
+
+            $this->data = get_object_vars($this->data);
+            return 'struct';
+        }
+        if (!is_array($this->data)) {
+            return 'string';
+        }
+        /* We have an array - is it an array or a struct ? */
+        if ($this->isStruct($this->data)) {
+            return 'struct';
+        } else {
+            return 'array';
+        }
+    }
+    function getXml() {
+        /* Return XML for this value */
+        switch ($this->type) {
+            case 'boolean':
+                return '<boolean>'.(($this->data) ? '1' : '0').'</boolean>';
+                break;
+            case 'int':
+                return '<int>'.$this->data.'</int>';
+                break;
+            case 'double':
+                return '<double>'.$this->data.'</double>';
+                break;
+            case 'string':
+                return '<string>'.htmlspecialchars($this->data).'</string>';
+                break;
+            case 'array':
+                $return = '<array><data>'."\n";
+                foreach ($this->data as $item) {
+                    $return .= '  <value>'.$item->getXml()."</value>\n";
+                }
+                $return .= '</data></array>';
+                return $return;
+                break;
+            case 'struct':
+                $return = '<struct>'."\n";
+                foreach ($this->data as $name => $value) {
+                    $return .= "  <member><name>$name</name><value>";
+                    $return .= $value->getXml()."</value></member>\n";
+                }
+                $return .= '</struct>';
+                return $return;
+                break;
+            case 'date':
+            case 'base64':
+                return $this->data->getXml();
+                break;
+        }
+        return false;
+    }
+    function isStruct($array) {
+        /* Nasty function to check if an array is a struct or not */
+        $expected = 0;
+        foreach ($array as $key => $value) {
+            if ((string)$key != (string)$expected) {
+                return true;
+            }
+            $expected++;
+        }
+        return false;
+    }
+}
+
+
+class IXR_Message {
+    var $message;
+    var $messageType;  // methodCall / methodResponse / fault
+    var $faultCode;
+    var $faultString;
+    var $methodName;
+    var $params;
+    // Current variable stacks
+    var $_arraystructs = array();   // The stack used to keep track of the current array/struct
+    var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array
+    var $_currentStructName = array();  // A stack as well
+    var $_param;
+    var $_value;
+    var $_currentTag;
+    var $_currentTagContents;
+    // The XML parser
+    var $_parser;
+    function IXR_Message ($message) {
+        $this->message = $message;
+    }
+    function parse() {
+        // first remove the XML declaration
+        $this->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $this->message);
+        // workaround for a bug in PHP/libxml2, see http://bugs.php.net/bug.php?id=45996
+        $this->message = str_replace('&lt;', '&#60;', $this->message);
+        $this->message = str_replace('&gt;', '&#62;', $this->message);
+        $this->message = str_replace('&amp;', '&#38;', $this->message);
+        $this->message = str_replace('&apos;', '&#39;', $this->message);
+        $this->message = str_replace('&quot;', '&#34;', $this->message);
+        if (trim($this->message) == '') {
+            return false;
+        }
+        $this->_parser = xml_parser_create();
+        // Set XML parser to take the case of tags in to account
+        xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false);
+        // Set XML parser callback functions
+        xml_set_object($this->_parser, $this);
+        xml_set_element_handler($this->_parser, 'tag_open', 'tag_close');
+        xml_set_character_data_handler($this->_parser, 'cdata');
+        if (!xml_parse($this->_parser, $this->message)) {
+            /* die(sprintf('XML error: %s at line %d',
+                xml_error_string(xml_get_error_code($this->_parser)),
+                xml_get_current_line_number($this->_parser))); */
+            return false;
+        }
+        xml_parser_free($this->_parser);
+        // Grab the error messages, if any
+        if ($this->messageType == 'fault') {
+            $this->faultCode = $this->params[0]['faultCode'];
+            $this->faultString = $this->params[0]['faultString'];
+        }
+        return true;
+    }
+    function tag_open($parser, $tag, $attr) {
+        $this->currentTag = $tag;
+        $this->_currentTagContents = '';
+        switch($tag) {
+            case 'methodCall':
+            case 'methodResponse':
+            case 'fault':
+                $this->messageType = $tag;
+                break;
+            /* Deal with stacks of arrays and structs */
+            case 'data':    // data is to all intents and puposes more interesting than array
+                $this->_arraystructstypes[] = 'array';
+                $this->_arraystructs[] = array();
+                break;
+            case 'struct':
+                $this->_arraystructstypes[] = 'struct';
+                $this->_arraystructs[] = array();
+                break;
+        }
+    }
+    function cdata($parser, $cdata) {
+        $this->_currentTagContents .= $cdata;
+    }
+    function tag_close($parser, $tag) {
+        $valueFlag = false;
+        switch($tag) {
+            case 'int':
+            case 'i4':
+                $value = (int)trim($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            case 'double':
+                $value = (double)trim($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            case 'string':
+                $value = (string)$this->_currentTagContents;
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            case 'dateTime.iso8601':
+                $value = new IXR_Date(trim($this->_currentTagContents));
+                // $value = $iso->getTimestamp();
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            case 'value':
+                // "If no type is indicated, the type is string."
+                if (trim($this->_currentTagContents) != '') {
+                    $value = (string)$this->_currentTagContents;
+                    $this->_currentTagContents = '';
+                    $valueFlag = true;
+                }
+                break;
+            case 'boolean':
+                $value = (boolean)trim($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            case 'base64':
+                $value = base64_decode($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                $valueFlag = true;
+                break;
+            /* Deal with stacks of arrays and structs */
+            case 'data':
+            case 'struct':
+                $value = array_pop($this->_arraystructs);
+                array_pop($this->_arraystructstypes);
+                $valueFlag = true;
+                break;
+            case 'member':
+                array_pop($this->_currentStructName);
+                break;
+            case 'name':
+                $this->_currentStructName[] = trim($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                break;
+            case 'methodName':
+                $this->methodName = trim($this->_currentTagContents);
+                $this->_currentTagContents = '';
+                break;
+        }
+        if ($valueFlag) {
+            /*
+            if (!is_array($value) && !is_object($value)) {
+                $value = trim($value);
+            }
+            */
+            if (count($this->_arraystructs) > 0) {
+                // Add value to struct or array
+                if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') {
+                    // Add to struct
+                    $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value;
+                } else {
+                    // Add to array
+                    $this->_arraystructs[count($this->_arraystructs)-1][] = $value;
+                }
+            } else {
+                // Just add as a paramater
+                $this->params[] = $value;
+            }
+        }
+    }
+}
+
+
+class IXR_Server {
+    var $data;
+    var $callbacks = array();
+    var $message;
+    var $capabilities;
+    function IXR_Server($callbacks = false, $data = false) {
+        $this->setCapabilities();
+        if ($callbacks) {
+            $this->callbacks = $callbacks;
+        }
+        $this->setCallbacks();
+        $this->serve($data);
+    }
+    function serve($data = false) {
+        if (!$data) {
+            global $HTTP_RAW_POST_DATA;
+            if (!$HTTP_RAW_POST_DATA) {
+               die('XML-RPC server accepts POST requests only.');
+            }
+            $data = $HTTP_RAW_POST_DATA;
+        }
+        $this->message = new IXR_Message($data);
+        if (!$this->message->parse()) {
+            $this->error(-32700, 'parse error. not well formed');
+        }
+        if ($this->message->messageType != 'methodCall') {
+            $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall');
+        }
+        $result = $this->call($this->message->methodName, $this->message->params);
+        // Is the result an error?
+        if (is_a($result, 'IXR_Error')) {
+            $this->error($result);
+        }
+        // Encode the result
+        $r = new IXR_Value($result);
+        $resultxml = $r->getXml();
+        // Create the XML
+        $xml = <<<EOD
+<methodResponse>
+  <params>
+    <param>
+      <value>
+        $resultxml
+      </value>
+    </param>
+  </params>
+</methodResponse>
+
+EOD;
+        // Send it
+        $this->output($xml);
+    }
+    function call($methodname, $args) {
+        if (!$this->hasMethod($methodname)) {
+            return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.');
+        }
+        $method = $this->callbacks[$methodname];
+        // Perform the callback and send the response
+
+# Removed for DokuWiki to have a more consistent interface
+#        if (count($args) == 1) {
+#            // If only one paramater just send that instead of the whole array
+#            $args = $args[0];
+#        }
+
+
+# Adjusted for DokuWiki to use call_user_func_array
+
+        // args need to be an array
+        $args = (array) $args;
+
+        // Are we dealing with a function or a method?
+        if (substr($method, 0, 5) == 'this:') {
+            // It's a class method - check it exists
+            $method = substr($method, 5);
+            if (!method_exists($this, $method)) {
+                return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.');
+            }
+            // Call the method
+            #$result = $this->$method($args);
+            $result = call_user_func_array(array(&$this,$method),$args);
+        } elseif (substr($method, 0, 7) == 'plugin:') {
+            require_once(DOKU_INC.'inc/pluginutils.php');
+            list($pluginname, $callback) = explode(':', substr($method, 7), 2);
+            if(!plugin_isdisabled($pluginname)) {
+                $plugin = plugin_load('action', $pluginname);
+                return call_user_func_array(array($plugin, $callback), $args);
+            } else {
+                return new IXR_Error(-99999, 'server error');
+            }
+        } else {
+            // It's a function - does it exist?
+            if (!function_exists($method)) {
+                return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.');
+            }
+            // Call the function
+            #$result = $method($args);
+            $result = call_user_func_array($method,$args);
+        }
+        return $result;
+    }
+
+    function error($error, $message = false) {
+        // Accepts either an error object or an error code and message
+        if ($message && !is_object($error)) {
+            $error = new IXR_Error($error, $message);
+        }
+        $this->output($error->getXml());
+    }
+    function output($xml) {
+        $xml = '<?xml version="1.0"?>'."\n".$xml;
+        $length = strlen($xml);
+        header('Connection: close');
+        header('Content-Length: '.$length);
+        header('Content-Type: text/xml');
+        header('Date: '.date('r'));
+        echo $xml;
+        exit;
+    }
+    function hasMethod($method) {
+        return in_array($method, array_keys($this->callbacks));
+    }
+    function setCapabilities() {
+        // Initialises capabilities array
+        $this->capabilities = array(
+            'xmlrpc' => array(
+                'specUrl' => 'http://www.xmlrpc.com/spec',
+                'specVersion' => 1
+            ),
+            'faults_interop' => array(
+                'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php',
+                'specVersion' => 20010516
+            ),
+            'system.multicall' => array(
+                'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208',
+                'specVersion' => 1
+            ),
+        );
+    }
+    function getCapabilities() {
+        return $this->capabilities;
+    }
+    function setCallbacks() {
+        $this->callbacks['system.getCapabilities'] = 'this:getCapabilities';
+        $this->callbacks['system.listMethods'] = 'this:listMethods';
+        $this->callbacks['system.multicall'] = 'this:multiCall';
+    }
+    function listMethods() {
+        // Returns a list of methods - uses array_reverse to ensure user defined
+        // methods are listed before server defined methods
+        return array_reverse(array_keys($this->callbacks));
+    }
+    function multiCall($methodcalls) {
+        // See http://www.xmlrpc.com/discuss/msgReader$1208
+        $return = array();
+        foreach ($methodcalls as $call) {
+            $method = $call['methodName'];
+            $params = $call['params'];
+            if ($method == 'system.multicall') {
+                $result = new IXR_Error(-32600, 'Recursive calls to system.multicall are forbidden');
+            } else {
+                $result = $this->call($method, $params);
+            }
+            if (is_a($result, 'IXR_Error')) {
+                $return[] = array(
+                    'faultCode' => $result->code,
+                    'faultString' => $result->message
+                );
+            } else {
+                $return[] = array($result);
+            }
+        }
+        return $return;
+    }
+}
+
+class IXR_Request {
+    var $method;
+    var $args;
+    var $xml;
+    function IXR_Request($method, $args) {
+        $this->method = $method;
+        $this->args = $args;
+        $this->xml = <<<EOD
+<?xml version="1.0"?>
+<methodCall>
+<methodName>{$this->method}</methodName>
+<params>
+
+EOD;
+        foreach ($this->args as $arg) {
+            $this->xml .= '<param><value>';
+            $v = new IXR_Value($arg);
+            $this->xml .= $v->getXml();
+            $this->xml .= "</value></param>\n";
+        }
+        $this->xml .= '</params></methodCall>';
+    }
+    function getLength() {
+        return strlen($this->xml);
+    }
+    function getXml() {
+        return $this->xml;
+    }
+}
+
+/**
+ * Changed for DokuWiki to use DokuHTTPClient
+ *
+ * This should be compatible to the original class, but uses DokuWiki's
+ * HTTP client library which will respect proxy settings
+ *
+ * Because the XMLRPC client is not used in DokuWiki currently this is completely
+ * untested
+ */
+class IXR_Client extends DokuHTTPClient {
+    var $posturl = '';
+    var $message = false;
+    var $xmlerror = false;
+
+    function IXR_Client($server, $path = false, $port = 80) {
+        $this->DokuHTTPClient();
+        if (!$path) {
+            // Assume we have been given a URL instead
+            $this->posturl = $server;
+        }else{
+            $this->posturl = 'http://'.$server.':'.$port.$path;
+        }
+    }
+
+    function query() {
+        $args = func_get_args();
+        $method = array_shift($args);
+        $request = new IXR_Request($method, $args);
+        $xml = $request->getXml();
+
+        $this->headers['Content-Type'] = 'text/xml';
+        if(!$this->sendRequest($this->posturl,$xml,'POST')){
+            $this->xmlerror = new IXR_Error(-32300, 'transport error - '.$this->error);
+            return false;
+        }
+
+        // Check HTTP Response code
+        if($this->status < 200 || $this->status > 206){
+            $this->xmlerror = new IXR_Error(-32300, 'transport error - HTTP status '.$this->status);
+            return false;
+        }
+
+        // Now parse what we've got back
+        $this->message = new IXR_Message($this->resp_body);
+        if (!$this->message->parse()) {
+            // XML error
+            $this->xmlerror = new IXR_Error(-32700, 'parse error. not well formed');
+            return false;
+        }
+        // Is the message a fault?
+        if ($this->message->messageType == 'fault') {
+            $this->xmlerror = new IXR_Error($this->message->faultCode, $this->message->faultString);
+            return false;
+        }
+        // Message must be OK
+        return true;
+    }
+    function getResponse() {
+        // methodResponses can only have one param - return that
+        return $this->message->params[0];
+    }
+    function isError() {
+        return (is_object($this->xmlerror));
+    }
+    function getErrorCode() {
+        return $this->xmlerror->code;
+    }
+    function getErrorMessage() {
+        return $this->xmlerror->message;
+    }
+}
+
+
+class IXR_Error {
+    var $code;
+    var $message;
+    function IXR_Error($code, $message) {
+        $this->code = $code;
+        $this->message = $message;
+    }
+    function getXml() {
+        $xml = <<<EOD
+<methodResponse>
+  <fault>
+    <value>
+      <struct>
+        <member>
+          <name>faultCode</name>
+          <value><int>{$this->code}</int></value>
+        </member>
+        <member>
+          <name>faultString</name>
+          <value><string>{$this->message}</string></value>
+        </member>
+      </struct>
+    </value>
+  </fault>
+</methodResponse>
+
+EOD;
+        return $xml;
+    }
+}
+
+
+class IXR_Date {
+    var $year;
+    var $month;
+    var $day;
+    var $hour;
+    var $minute;
+    var $second;
+    function IXR_Date($time) {
+        // $time can be a PHP timestamp or an ISO one
+        if (is_numeric($time)) {
+            $this->parseTimestamp($time);
+        } else {
+            $this->parseIso($time);
+        }
+    }
+    function parseTimestamp($timestamp) {
+        $this->year = gmdate('Y', $timestamp);
+        $this->month = gmdate('m', $timestamp);
+        $this->day = gmdate('d', $timestamp);
+        $this->hour = gmdate('H', $timestamp);
+        $this->minute = gmdate('i', $timestamp);
+        $this->second = gmdate('s', $timestamp);
+    }
+    function parseIso($iso) {
+        $this->year = substr($iso, 0, 4);
+        $this->month = substr($iso, 5, 2);
+        $this->day = substr($iso, 8, 2);
+        $this->hour = substr($iso, 11, 2);
+        $this->minute = substr($iso, 14, 2);
+        $this->second = substr($iso, 17, 2);
+    }
+    function getIso() {
+        return $this->year.'-'.$this->month.'-'.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second;
+    }
+    function getXml() {
+        return '<dateTime.iso8601>'.$this->getIso().'</dateTime.iso8601>';
+    }
+    function getTimestamp() {
+        return gmmktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year);
+    }
+}
+
+
+class IXR_Base64 {
+    var $data;
+    function IXR_Base64($data) {
+        $this->data = $data;
+    }
+    function getXml() {
+        return '<base64>'.base64_encode($this->data).'</base64>';
+    }
+}
+
+
+class IXR_IntrospectionServer extends IXR_Server {
+    var $signatures;
+    var $help;
+    function IXR_IntrospectionServer() {
+        $this->setCallbacks();
+        $this->setCapabilities();
+        $this->capabilities['introspection'] = array(
+            'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+            'specVersion' => 1
+        );
+        $this->addCallback(
+            'system.methodSignature',
+            'this:methodSignature',
+            array('array', 'string'),
+            'Returns an array describing the return type and required parameters of a method'
+        );
+        $this->addCallback(
+            'system.getCapabilities',
+            'this:getCapabilities',
+            array('struct'),
+            'Returns a struct describing the XML-RPC specifications supported by this server'
+        );
+        $this->addCallback(
+            'system.listMethods',
+            'this:listMethods',
+            array('array'),
+            'Returns an array of available methods on this server'
+        );
+        $this->addCallback(
+            'system.methodHelp',
+            'this:methodHelp',
+            array('string', 'string'),
+            'Returns a documentation string for the specified method'
+        );
+    }
+    function addCallback($method, $callback, $args, $help) {
+        $this->callbacks[$method] = $callback;
+        $this->signatures[$method] = $args;
+        $this->help[$method] = $help;
+    }
+    function call($methodname, $args) {
+        // Make sure it's in an array
+        if ($args && !is_array($args)) {
+            $args = array($args);
+        }
+        // Over-rides default call method, adds signature check
+        if (!$this->hasMethod($methodname)) {
+            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
+        }
+        $method = $this->callbacks[$methodname];
+        $signature = $this->signatures[$methodname];
+        $returnType = array_shift($signature);
+        // Check the number of arguments. Check only, if the minimum count of parameters is specified. More parameters are possible.
+        // This is a hack to allow optional parameters...
+        if (count($args) < count($signature)) {
+            // print 'Num of args: '.count($args).' Num in signature: '.count($signature);
+            return new IXR_Error(-32602, 'server error. wrong number of method parameters');
+        }
+        // Check the argument types
+        $ok = true;
+        $argsbackup = $args;
+        for ($i = 0, $j = count($args); $i < $j; $i++) {
+            $arg = array_shift($args);
+            $type = array_shift($signature);
+            switch ($type) {
+                case 'int':
+                case 'i4':
+                    if (is_array($arg) || !is_int($arg)) {
+                        $ok = false;
+                    }
+                    break;
+                case 'base64':
+                case 'string':
+                    if (!is_string($arg)) {
+                        $ok = false;
+                    }
+                    break;
+                case 'boolean':
+                    if ($arg !== false && $arg !== true) {
+                        $ok = false;
+                    }
+                    break;
+                case 'float':
+                case 'double':
+                    if (!is_float($arg)) {
+                        $ok = false;
+                    }
+                    break;
+                case 'date':
+                case 'dateTime.iso8601':
+                    if (!is_a($arg, 'IXR_Date')) {
+                        $ok = false;
+                    }
+                    break;
+            }
+            if (!$ok) {
+                return new IXR_Error(-32602, 'server error. invalid method parameters');
+            }
+        }
+        // It passed the test - run the "real" method call
+        return parent::call($methodname, $argsbackup);
+    }
+    function methodSignature($method) {
+        if (!$this->hasMethod($method)) {
+            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
+        }
+        // We should be returning an array of types
+        $types = $this->signatures[$method];
+        $return = array();
+        foreach ($types as $type) {
+            switch ($type) {
+                case 'string':
+                    $return[] = 'string';
+                    break;
+                case 'int':
+                case 'i4':
+                    $return[] = 42;
+                    break;
+                case 'double':
+                    $return[] = 3.1415;
+                    break;
+                case 'dateTime.iso8601':
+                    $return[] = new IXR_Date(time());
+                    break;
+                case 'boolean':
+                    $return[] = true;
+                    break;
+                case 'base64':
+                    $return[] = new IXR_Base64('base64');
+                    break;
+                case 'array':
+                    $return[] = array('array');
+                    break;
+                case 'struct':
+                    $return[] = array('struct' => 'struct');
+                    break;
+            }
+        }
+        return $return;
+    }
+    function methodHelp($method) {
+        return $this->help[$method];
+    }
+}
+
+
+class IXR_ClientMulticall extends IXR_Client {
+    var $calls = array();
+    function IXR_ClientMulticall($server, $path = false, $port = 80) {
+        parent::IXR_Client($server, $path, $port);
+        //$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)';
+    }
+    function addCall() {
+        $args = func_get_args();
+        $methodName = array_shift($args);
+        $struct = array(
+            'methodName' => $methodName,
+            'params' => $args
+        );
+        $this->calls[] = $struct;
+    }
+    function query() {
+        // Prepare multicall, then call the parent::query() method
+        return parent::query('system.multicall', $this->calls);
+    }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/JSON.php b/mod/dokuwiki/vendors/dokuwiki/inc/JSON.php
new file mode 100644
index 000000000..ea66c9c32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/JSON.php
@@ -0,0 +1,624 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Converts to and from JSON format.
+ *
+ * JSON (JavaScript Object Notation) is a lightweight data-interchange
+ * format. It is easy for humans to read and write. It is easy for machines
+ * to parse and generate. It is based on a subset of the JavaScript
+ * Programming Language, Standard ECMA-262 3rd Edition - December 1999.
+ * This feature can also be found in  Python. JSON is a text format that is
+ * completely language independent but uses conventions that are familiar
+ * to programmers of the C-family of languages, including C, C++, C#, Java,
+ * JavaScript, Perl, TCL, and many others. These properties make JSON an
+ * ideal data-interchange language.
+ *
+ * This package provides a simple encoder and decoder for JSON notation. It
+ * is intended for use with client-side Javascript applications that make
+ * use of HTTPRequest to perform server communication functions - data can
+ * be encoded into JSON notation for use in a client-side javascript, or
+ * decoded from incoming Javascript requests. JSON format is native to
+ * Javascript, and can be directly eval()'ed with no further parsing
+ * overhead
+ *
+ * All strings should be in ASCII or UTF-8 format!
+ *
+ * PHP versions 4 and 5
+ *
+ * LICENSE: Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met: Redistributions of source code must retain the
+ * above copyright notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * @category
+ * @package
+ * @author      Michal Migurski <mike-json@teczno.com>
+ * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright   2005 Michal Migurski
+ * @license     http://www.freebsd.org/copyright/freebsd-license.html
+ * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
+ */
+
+// for DokuWiki
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/utf8.php');
+
+/**
+ * Marker constant for JSON::decode(), used to flag stack state
+ */
+define('JSON_SLICE',   1);
+
+/**
+ * Marker constant for JSON::decode(), used to flag stack state
+ */
+define('JSON_IN_STR',  2);
+
+/**
+ * Marker constant for JSON::decode(), used to flag stack state
+ */
+define('JSON_IN_ARR',  4);
+
+/**
+ * Marker constant for JSON::decode(), used to flag stack state
+ */
+define('JSON_IN_OBJ',  8);
+
+/**
+ * Marker constant for JSON::decode(), used to flag stack state
+ */
+define('JSON_IN_CMT', 16);
+
+/**
+ * Behavior switch for JSON::decode()
+ */
+define('JSON_LOOSE_TYPE', 10);
+
+/**
+ * Behavior switch for JSON::decode()
+ */
+define('JSON_STRICT_TYPE', 11);
+
+/**
+ * Converts to and from JSON format.
+ *
+ * @category
+ * @package
+ * @author     Michal Migurski <mike-json@teczno.com>
+ * @author     Matt Knapp <mdknapp[at]gmail[dot]com>
+ * @author     Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
+ * @copyright  2005 Michal Migurski
+ * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @version
+ * @link
+ * @see
+ * @since
+ * @deprecated
+ */
+class JSON
+{
+   /**
+    * constructs a new JSON instance
+    *
+    * @param    int     $use    object behavior: when encoding or decoding,
+    *                           be loose or strict about object/array usage
+    *
+    *                           possible values:
+    *                              JSON_STRICT_TYPE - strict typing, default
+    *                                                 "{...}" syntax creates objects in decode.
+    *                               JSON_LOOSE_TYPE - loose typing
+    *                                                 "{...}" syntax creates associative arrays in decode.
+    */
+    function JSON($use=JSON_STRICT_TYPE)
+    {
+        $this->use = $use;
+    }
+
+   /**
+    * encodes an arbitrary variable into JSON format
+    *
+    * @param    mixed   $var    any number, boolean, string, array, or object to be encoded.
+    *                           see argument 1 to JSON() above for array-parsing behavior.
+    *                           if var is a strng, note that encode() always expects it
+    *                           to be in ASCII or UTF-8 format!
+    *
+    * @return   string  JSON string representation of input var
+    * @access   public
+    */
+    function encode($var)
+    {
+        switch (gettype($var)) {
+            case 'boolean':
+                return $var ? 'true' : 'false';
+
+            case 'NULL':
+                return 'null';
+
+            case 'integer':
+                return sprintf('%d', $var);
+
+            case 'double':
+            case 'float':
+                return sprintf('%f', $var);
+
+            case 'string':
+                // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
+                $ascii = '';
+                $strlen_var = strlen($var);
+
+               /*
+                * Iterate over every character in the string,
+                * escaping with a slash or encoding to UTF-8 where necessary
+                */
+                for ($c = 0; $c < $strlen_var; ++$c) {
+
+                    $ord_var_c = ord($var{$c});
+
+                    switch ($ord_var_c) {
+                        case 0x08:  $ascii .= '\b';  break;
+                        case 0x09:  $ascii .= '\t';  break;
+                        case 0x0A:  $ascii .= '\n';  break;
+                        case 0x0C:  $ascii .= '\f';  break;
+                        case 0x0D:  $ascii .= '\r';  break;
+
+                        case 0x22:
+                        case 0x2F:
+                        case 0x5C:
+                            // double quote, slash, slosh
+                            $ascii .= '\\'.$var{$c};
+                            break;
+
+                        case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
+                            // characters U-00000000 - U-0000007F (same as ASCII)
+                            $ascii .= $var{$c};
+                            break;
+
+                        case (($ord_var_c & 0xE0) == 0xC0):
+                            // characters U-00000080 - U-000007FF, mask 110XXXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c, ord($var{$c+1}));
+                            $c+=1;
+                            //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8');
+                            $utf16 = utf8_to_utf16be($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF0) == 0xE0):
+                            // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c+1}),
+                                         ord($var{$c+2}));
+                            $c+=2;
+                            //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8');
+                            $utf16 = utf8_to_utf16be($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xF8) == 0xF0):
+                            // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c+1}),
+                                         ord($var{$c+2}),
+                                         ord($var{$c+3}));
+                            $c+=3;
+                            //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8');
+                            $utf16 = utf8_to_utf16be($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFC) == 0xF8):
+                            // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c+1}),
+                                         ord($var{$c+2}),
+                                         ord($var{$c+3}),
+                                         ord($var{$c+4}));
+                            $c+=4;
+                            //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8');
+                            $utf16 = utf8_to_utf16be($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+
+                        case (($ord_var_c & 0xFE) == 0xFC):
+                            // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                            // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                            $char = pack('C*', $ord_var_c,
+                                         ord($var{$c+1}),
+                                         ord($var{$c+2}),
+                                         ord($var{$c+3}),
+                                         ord($var{$c+4}),
+                                         ord($var{$c+5}));
+                            $c+=5;
+                            //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8');
+                            $utf16 = utf8_to_utf16be($char);
+                            $ascii .= sprintf('\u%04s', bin2hex($utf16));
+                            break;
+                    }
+                }
+
+                return '"'.$ascii.'"';
+
+            case 'array':
+               /*
+                * As per JSON spec if any array key is not an integer
+                * we must treat the the whole array as an object. We
+                * also try to catch a sparsely populated associative
+                * array with numeric keys here because some JS engines
+                * will create an array with empty indexes up to
+                * max_index which can cause memory issues and because
+                * the keys, which may be relevant, will be remapped
+                * otherwise.
+                *
+                * As per the ECMA and JSON specification an object may
+                * have any string as a property. Unfortunately due to
+                * a hole in the ECMA specification if the key is a
+                * ECMA reserved word or starts with a digit the
+                * parameter is only accessible using ECMAScript's
+                * bracket notation.
+                */
+
+                // treat as a JSON object
+                if (is_array($var) && count($var) && (array_keys($var) !== range(0, sizeof($var) - 1))) {
+                    return sprintf('{%s}', join(',', array_map(array($this, 'name_value'),
+                                                               array_keys($var),
+                                                               array_values($var))));
+                }
+
+                // treat it like a regular array
+                return sprintf('[%s]', join(',', array_map(array($this, 'encode'), $var)));
+
+            case 'object':
+                $vars = get_object_vars($var);
+                return sprintf('{%s}', join(',', array_map(array($this, 'name_value'),
+                                                           array_keys($vars),
+                                                           array_values($vars))));
+
+            default:
+                return '';
+        }
+    }
+
+   /**
+    * encodes an arbitrary variable into JSON format, alias for encode()
+    */
+    function enc($var)
+    {
+        return $this->encode($var);
+    }
+
+   /** function name_value
+    * array-walking function for use in generating JSON-formatted name-value pairs
+    *
+    * @param    string  $name   name of key to use
+    * @param    mixed   $value  reference to an array element to be encoded
+    *
+    * @return   string  JSON-formatted name-value pair, like '"name":value'
+    * @access   private
+    */
+    function name_value($name, $value)
+    {
+        return (sprintf("%s:%s", $this->encode(strval($name)), $this->encode($value)));
+    }
+
+   /**
+    * reduce a string by removing leading and trailing comments and whitespace
+    *
+    * @param    $str    string      string value to strip of comments and whitespace
+    *
+    * @return   string  string value stripped of comments and whitespace
+    * @access   private
+    */
+    function reduce_string($str)
+    {
+        $str = preg_replace(array(
+
+                // eliminate single line comments in '// ...' form
+                '#^\s*//(.+)$#m',
+
+                // eliminate multi-line comments in '/* ... */' form, at start of string
+                '#^\s*/\*(.+)\*/#Us',
+
+                // eliminate multi-line comments in '/* ... */' form, at end of string
+                '#/\*(.+)\*/\s*$#Us'
+
+            ), '', $str);
+
+        // eliminate extraneous space
+        return trim($str);
+    }
+
+   /**
+    * decodes a JSON string into appropriate variable
+    *
+    * @param    string  $str    JSON-formatted string
+    *
+    * @return   mixed   number, boolean, string, array, or object
+    *                   corresponding to given JSON input string.
+    *                   See argument 1 to JSON() above for object-output behavior.
+    *                   Note that decode() always returns strings
+    *                   in ASCII or UTF-8 format!
+    * @access   public
+    */
+    function decode($str)
+    {
+        $str = $this->reduce_string($str);
+
+        switch (strtolower($str)) {
+            case 'true':
+                return true;
+
+            case 'false':
+                return false;
+
+            case 'null':
+                return null;
+
+            default:
+                if (is_numeric($str)) {
+                    // Lookie-loo, it's a number
+
+                    // This would work on its own, but I'm trying to be
+                    // good about returning integers where appropriate:
+                    // return (float)$str;
+
+                    // Return float or int, as appropriate
+                    return ((float)$str == (integer)$str)
+                        ? (integer)$str
+                        : (float)$str;
+
+                } elseif (preg_match('/^("|\').+("|\')$/s', $str, $m) && $m[1] == $m[2]) {
+                    // STRINGS RETURNED IN UTF-8 FORMAT
+                    $delim = substr($str, 0, 1);
+                    $chrs = substr($str, 1, -1);
+                    $utf8 = '';
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c < $strlen_chrs; ++$c) {
+
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+                        $ord_chrs_c = ord($chrs{$c});
+
+                        switch ($substr_chrs_c_2) {
+                            case '\b':  $utf8 .= chr(0x08);  $c+=1;  break;
+                            case '\t':  $utf8 .= chr(0x09);  $c+=1;  break;
+                            case '\n':  $utf8 .= chr(0x0A);  $c+=1;  break;
+                            case '\f':  $utf8 .= chr(0x0C);  $c+=1;  break;
+                            case '\r':  $utf8 .= chr(0x0D);  $c+=1;  break;
+
+                            case '\\"':
+                            case '\\\'':
+                            case '\\\\':
+                            case '\\/':
+                                if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
+                                   ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
+                                    $utf8 .= $chrs{++$c};
+                                }
+                                break;
+
+                            default:
+                                if (preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6))) {
+                                    // single, escaped unicode character
+                                    $utf16 = chr(hexdec(substr($chrs, ($c+2), 2)))
+                                           . chr(hexdec(substr($chrs, ($c+4), 2)));
+                                    //$utf8 .= mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
+                                    $utf8 .= utf16be_to_utf8($utf16);
+                                    $c+=5;
+
+                                } elseif(($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F)) {
+                                    $utf8 .= $chrs{$c};
+
+                                } elseif(($ord_chrs_c & 0xE0) == 0xC0) {
+                                    // characters U-00000080 - U-000007FF, mask 110XXXXX
+                                    //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                    $utf8 .= substr($chrs, $c, 2); $c += 1;
+
+                                } elseif(($ord_chrs_c & 0xF0) == 0xE0) {
+                                    // characters U-00000800 - U-0000FFFF, mask 1110XXXX
+                                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                    $utf8 .= substr($chrs, $c, 3); $c += 2;
+
+                                } elseif(($ord_chrs_c & 0xF8) == 0xF0) {
+                                    // characters U-00010000 - U-001FFFFF, mask 11110XXX
+                                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                    $utf8 .= substr($chrs, $c, 4); $c += 3;
+
+                                } elseif(($ord_chrs_c & 0xFC) == 0xF8) {
+                                    // characters U-00200000 - U-03FFFFFF, mask 111110XX
+                                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                    $utf8 .= substr($chrs, $c, 5); $c += 4;
+
+                                } elseif(($ord_chrs_c & 0xFE) == 0xFC) {
+                                    // characters U-04000000 - U-7FFFFFFF, mask 1111110X
+                                    // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
+                                    $utf8 .= substr($chrs, $c, 6); $c += 5;
+
+                                }
+                                break;
+
+                        }
+
+                    }
+
+                    return $utf8;
+
+                } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
+                    // array, or object notation
+
+                    if ($str{0} == '[') {
+                        $stk = array(JSON_IN_ARR);
+                        $arr = array();
+                    } else {
+                        if ($this->use == JSON_LOOSE_TYPE) {
+                            $stk = array(JSON_IN_OBJ);
+                            $obj = array();
+                        } else {
+                            $stk = array(JSON_IN_OBJ);
+                            $obj = new stdClass();
+                        }
+                    }
+
+                    array_push($stk, array('what'  => JSON_SLICE,
+                                           'where' => 0,
+                                           'delim' => false));
+
+                    $chrs = substr($str, 1, -1);
+                    $chrs = $this->reduce_string($chrs);
+
+                    if ($chrs == '') {
+                        if (reset($stk) == JSON_IN_ARR) {
+                            return $arr;
+
+                        } else {
+                            return $obj;
+
+                        }
+                    }
+
+                    //print("\nparsing {$chrs}\n");
+
+                    $strlen_chrs = strlen($chrs);
+
+                    for ($c = 0; $c <= $strlen_chrs; ++$c) {
+
+                        $top = end($stk);
+                        $substr_chrs_c_2 = substr($chrs, $c, 2);
+
+                        if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == JSON_SLICE))) {
+                            // found a comma that is not inside a string, array, etc.,
+                            // OR we've reached the end of the character list
+                            $slice = substr($chrs, $top['where'], ($c - $top['where']));
+                            array_push($stk, array('what' => JSON_SLICE, 'where' => ($c + 1), 'delim' => false));
+                            //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                            if (reset($stk) == JSON_IN_ARR) {
+                                // we are in an array, so just push an element onto the stack
+                                array_push($arr, $this->decode($slice));
+
+                            } elseif (reset($stk) == JSON_IN_OBJ) {
+                                // we are in an object, so figure
+                                // out the property name and set an
+                                // element in an associative array,
+                                // for now
+                                if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // "name":value pair
+                                    $key = $this->decode($parts[1]);
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use == JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) {
+                                    // name:value pair, where name is unquoted
+                                    $key = $parts[1];
+                                    $val = $this->decode($parts[2]);
+
+                                    if ($this->use == JSON_LOOSE_TYPE) {
+                                        $obj[$key] = $val;
+                                    } else {
+                                        $obj->$key = $val;
+                                    }
+                                }
+
+                            }
+
+                        } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) &&
+                                 in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) {
+                            // found a quote, and we are not inside a string
+                            array_push($stk, array('what' => JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c}));
+                            //print("Found start of string at {$c}\n");
+
+                        } elseif (($chrs{$c} == $top['delim']) &&
+                                 ($top['what'] == JSON_IN_STR) &&
+                                 (($chrs{$c - 1} != "\\") ||
+                                 ($chrs{$c - 1} == "\\" && $chrs{$c - 2} == "\\"))) {
+                            // found a quote, we're in a string, and it's not escaped
+                            array_pop($stk);
+                            //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '[') &&
+                                 in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) {
+                            // found a left-bracket, and we are in an array, object, or slice
+                            array_push($stk, array('what' => JSON_IN_ARR, 'where' => $c, 'delim' => false));
+                            //print("Found start of array at {$c}\n");
+
+                        } elseif (($chrs{$c} == ']') && ($top['what'] == JSON_IN_ARR)) {
+                            // found a right-bracket, and we're in an array
+                            array_pop($stk);
+                            //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($chrs{$c} == '{') &&
+                                 in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) {
+                            // found a left-brace, and we are in an array, object, or slice
+                            array_push($stk, array('what' => JSON_IN_OBJ, 'where' => $c, 'delim' => false));
+                            //print("Found start of object at {$c}\n");
+
+                        } elseif (($chrs{$c} == '}') && ($top['what'] == JSON_IN_OBJ)) {
+                            // found a right-brace, and we're in an object
+                            array_pop($stk);
+                            //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        } elseif (($substr_chrs_c_2 == '/*') &&
+                                 in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) {
+                            // found a comment start, and we are in an array, object, or slice
+                            array_push($stk, array('what' => JSON_IN_CMT, 'where' => $c, 'delim' => false));
+                            $c++;
+                            //print("Found start of comment at {$c}\n");
+
+                        } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == JSON_IN_CMT)) {
+                            // found a comment end, and we're in one now
+                            array_pop($stk);
+                            $c++;
+
+                            for ($i = $top['where']; $i <= $c; ++$i)
+                                $chrs = substr_replace($chrs, ' ', $i, 1);
+
+                            //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
+
+                        }
+
+                    }
+
+                    if (reset($stk) == JSON_IN_ARR) {
+                        return $arr;
+
+                    } elseif (reset($stk) == JSON_IN_OBJ) {
+                        return $obj;
+
+                    }
+
+                }
+        }
+    }
+
+   /**
+    * decodes a JSON string into appropriate variable; alias for decode()
+    */
+    function dec($var)
+    {
+        return $this->decode($var);
+    }
+
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/JpegMeta.php b/mod/dokuwiki/vendors/dokuwiki/inc/JpegMeta.php
new file mode 100644
index 000000000..cb1d7d694
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/JpegMeta.php
@@ -0,0 +1,3116 @@
+<?php
+/**
+ * JPEG metadata reader/writer
+ *
+ * @license    PHP license 2.0 (http://www.php.net/license/2_02.txt)
+ * @link       http://www.zonageek.com/software/php/jpeg/index.php
+ * @author     Sebastian Delmont <sdelmont@zonageek.com>
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author Hakan Sandell <hakan.sandell@mydata.se>
+ * @todo       Add support for Maker Notes, Extend for GIF and PNG metadata
+ */
+
+// This class is a modified and enhanced version of the JPEG class by
+// Sebastian Delmont. Original Copyright notice follows:
+//
+// +----------------------------------------------------------------------+
+// | PHP version 4.0                                                      |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997, 1998, 1999, 2000, 2001 The PHP Group             |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Sebastian Delmont <sdelmont@zonageek.com>                   |
+// +----------------------------------------------------------------------+
+
+class JpegMeta
+{
+    var $_fileName;
+    var $_fp = null;
+    var $_type = 'unknown';
+
+    var $_markers;
+    var $_info;
+
+
+    /**
+     * Constructor
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function JpegMeta($fileName)
+    {
+
+        $this->_fileName = $fileName;
+
+        $this->_fp = null;
+        $this->_type = 'unknown';
+
+        unset($this->_info);
+        unset($this->_markers);
+    }
+
+    /**
+     * Returns all gathered info as multidim array
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function & getRawInfo()
+    {
+        $this->_parseAll();
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        return $this->_info;
+    }
+
+    /**
+     * Returns basic image info
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function & getBasicInfo()
+    {
+        $this->_parseAll();
+
+        $info = array();
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $info['Name'] = $this->_info['file']['Name'];
+        if (isset($this->_info['file']['Url'])) {
+            $info['Url'] = $this->_info['file']['Url'];
+            $info['NiceSize'] = "???KB";
+        }
+        else {
+            $info['Size'] = $this->_info['file']['Size'];
+            $info['NiceSize'] = $this->_info['file']['NiceSize'];
+        }
+
+        if (@isset($this->_info['sof']['Format'])) {
+            $info['Format'] = $this->_info['sof']['Format'] . " JPEG";
+        }
+        else {
+            $info['Format'] = $this->_info['sof']['Format'] . " JPEG";
+        }
+
+        if (@isset($this->_info['sof']['ColorChannels'])) {
+            $info['ColorMode'] = ($this->_info['sof']['ColorChannels'] > 1) ? "Color" : "B&W";
+        }
+
+        $info['Width'] = $this->getWidth();
+        $info['Height'] = $this->getHeight();
+        $info['DimStr'] = $this->getDimStr();
+
+        $dates = $this->getDates();
+
+        $info['DateTime'] = $dates['EarliestTime'];
+        $info['DateTimeStr'] = $dates['EarliestTimeStr'];
+
+        $info['HasThumbnail'] = $this->hasThumbnail();
+
+        return $info;
+    }
+
+
+    /**
+     * Convinience function to access nearly all available Data
+     * through one function
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getField($fields)
+    {
+        if(!is_array($fields)) $fields = array($fields);
+        $info = false;
+        foreach($fields as $field){
+            if(strtolower(substr($field,0,5)) == 'iptc.'){
+                $info = $this->getIPTCField(substr($field,5));
+            }elseif(strtolower(substr($field,0,5)) == 'exif.'){
+                $info = $this->getExifField(substr($field,5));
+            }elseif(strtolower(substr($field,0,4)) == 'xmp.'){
+                $info = $this->getXmpField(substr($field,4));
+            }elseif(strtolower(substr($field,0,5)) == 'file.'){
+                $info = $this->getFileField(substr($field,5));
+            }elseif(strtolower(substr($field,0,5)) == 'date.'){
+                $info = $this->getDateField(substr($field,5));
+            }elseif(strtolower($field) == 'simple.camera'){
+                $info = $this->getCamera();
+            }elseif(strtolower($field) == 'simple.raw'){
+                return $this->getRawInfo();
+            }elseif(strtolower($field) == 'simple.title'){
+                $info = $this->getTitle();
+            }elseif(strtolower($field) == 'simple.shutterspeed'){
+                $info = $this->getShutterSpeed();
+            }else{
+                $info = $this->getExifField($field);
+            }
+            if($info != false) break;
+        }
+
+        if($info === false)  $info = $alt;
+        if(is_array($info)){
+            if(isset($info['val'])){
+                $info = $info['val'];
+            }else{
+                $info = join(', ',$info);
+            }
+        }
+        return trim($info);
+    }
+
+    /**
+     * Convinience function to set nearly all available Data
+     * through one function
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function setField($field, $value)
+    {
+        if(strtolower(substr($field,0,5)) == 'iptc.'){
+            return $this->setIPTCField(substr($field,5),$value);
+        }elseif(strtolower(substr($field,0,5)) == 'exif.'){
+            return $this->setExifField(substr($field,5),$value);
+        }else{
+            return $this->setExifField($field,$value);
+        }
+    }
+
+    /**
+     * Convinience function to delete nearly all available Data
+     * through one function
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function deleteField($field)
+    {
+        if(strtolower(substr($field,0,5)) == 'iptc.'){
+            return $this->deleteIPTCField(substr($field,5));
+        }elseif(strtolower(substr($field,0,5)) == 'exif.'){
+            return $this->deleteExifField(substr($field,5));
+        }else{
+            return $this->deleteExifField($field);
+        }
+    }
+
+    /**
+     * Return a date field
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getDateField($field)
+    {
+        if (!isset($this->_info['dates'])) {
+            $this->_info['dates'] = $this->getDates();
+        }
+
+        if (isset($this->_info['dates'][$field])) {
+            return $this->_info['dates'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return a file info field
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getFileField($field)
+    {
+        if (!isset($this->_info['file'])) {
+            $this->_parseFileInfo();
+        }
+
+        if (isset($this->_info['file'][$field])) {
+            return $this->_info['file'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return the camera info (Maker and Model)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @todo   handle makernotes
+     */
+    function getCamera(){
+        $make  = $this->getField(array('Exif.Make','Exif.TIFFMake'));
+        $model = $this->getField(array('Exif.Model','Exif.TIFFModel'));
+        $cam = trim("$make $model");
+        if(empty($cam)) return false;
+        return $cam;
+    }
+
+    /**
+     * Return shutter speed as a ratio
+     *
+     * @author Joe Lapp <joe.lapp@pobox.com>
+     */
+    function getShutterSpeed()
+    {
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+        if(!isset($this->_info['exif']['ExposureTime'])){
+            return '';
+        }
+
+        $field = $this->_info['exif']['ExposureTime'];
+        if($field['den'] == 1) return $field['num'];
+        return $field['num'].'/'.$field['den'];
+    }
+
+    /**
+     * Return an EXIF field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getExifField($field)
+    {
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['exif'][$field])) {
+            return $this->_info['exif'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return an XMP field
+     *
+     * @author Hakan Sandell <hakan.sandell@mydata.se>
+     */
+    function getXmpField($field)
+    {
+        if (!isset($this->_info['xmp'])) {
+            $this->_parseMarkerXmp();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['xmp'][$field])) {
+            return $this->_info['xmp'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return an Adobe Field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getAdobeField($field)
+    {
+        if (!isset($this->_info['adobe'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['adobe'][$field])) {
+            return $this->_info['adobe'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return an IPTC field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getIPTCField($field)
+    {
+        if (!isset($this->_info['iptc'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['iptc'][$field])) {
+            return $this->_info['iptc'][$field];
+        }
+
+        return false;
+    }
+
+    /**
+     * Set an EXIF field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     * @author Joe Lapp <joe.lapp@pobox.com>
+     */
+    function setExifField($field, $value)
+    {
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['exif'] == false) {
+            $this->_info['exif'] = array();
+        }
+
+        // make sure datetimes are in correct format
+        if(strlen($field) >= 8 && strtolower(substr($field, 0, 8)) == 'datetime') {
+            if(strlen($value) < 8 || $value{4} != ':' || $value{7} != ':') {
+                $value = date('Y:m:d H:i:s', strtotime($value));
+            }
+        }
+
+        $this->_info['exif'][$field] = $value;
+
+        return true;
+    }
+
+    /**
+     * Set an Adobe Field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function setAdobeField($field, $value)
+    {
+        if (!isset($this->_info['adobe'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['adobe'] == false) {
+            $this->_info['adobe'] = array();
+        }
+
+        $this->_info['adobe'][$field] = $value;
+
+        return true;
+    }
+
+    /**
+     * Calculates the multiplier needed to resize the image to the given
+     * dimensions
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getResizeRatio($maxwidth,$maxheight=0){
+        if(!$maxheight) $maxheight = $maxwidth;
+
+        $w = $this->getField('File.Width');
+        $h = $this->getField('File.Height');
+
+        $ratio = 1;
+        if($w >= $h){
+            if($w >= $maxwidth){
+                $ratio = $maxwidth/$w;
+            }elseif($h > $maxheight){
+                $ratio = $maxheight/$h;
+            }
+        }else{
+            if($h >= $maxheight){
+                $ratio = $maxheight/$h;
+            }elseif($w > $maxwidth){
+                $ratio = $maxwidth/$w;
+            }
+        }
+        return $ratio;
+    }
+
+
+    /**
+     * Set an IPTC field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function setIPTCField($field, $value)
+    {
+        if (!isset($this->_info['iptc'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['iptc'] == false) {
+            $this->_info['iptc'] = array();
+        }
+
+        $this->_info['iptc'][$field] = $value;
+
+        return true;
+    }
+
+    /**
+     * Delete an EXIF field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function deleteExifField($field)
+    {
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['exif'] != false) {
+            unset($this->_info['exif'][$field]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete an Adobe field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function deleteAdobeField($field)
+    {
+        if (!isset($this->_info['adobe'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['adobe'] != false) {
+            unset($this->_info['adobe'][$field]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete an IPTC field
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function deleteIPTCField($field)
+    {
+        if (!isset($this->_info['iptc'])) {
+            $this->_parseMarkerAdobe();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if ($this->_info['iptc'] != false) {
+            unset($this->_info['iptc'][$field]);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the image's title, tries various fields
+     *
+     * @param int $max  maximum number chars (keeps words)
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getTitle($max=80){
+        $cap = '';
+
+        // try various fields
+        $cap = $this->getField(array('Iptc.Headline',
+                                     'Iptc.Caption',
+                                     'Xmp.dc:title',
+                                     'Exif.UserComment',
+                                     'Exif.TIFFUserComment',
+                                     'Exif.TIFFImageDescription',
+                                     'File.Name'));
+        if (empty($cap)) return false;
+
+        if(!$max) return $cap;
+        // Shorten to 80 chars (keeping words)
+        $new = preg_replace('/\n.+$/','',wordwrap($cap, $max));
+        if($new != $cap) $new .= '...';
+
+        return $new;
+    }
+
+    /**
+     * Gather various date fields
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getDates()
+    {
+        $this->_parseAll();
+        if ($this->_markers == null) {
+            if (@isset($this->_info['file']['UnixTime'])) {
+                $dates['FileModified'] = $this->_info['file']['UnixTime'];
+                $dates['Time'] = $this->_info['file']['UnixTime'];
+                $dates['TimeSource'] = 'FileModified';
+                $dates['TimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+                $dates['EarliestTime'] = $this->_info['file']['UnixTime'];
+                $dates['EarliestTimeSource'] = 'FileModified';
+                $dates['EarliestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+                $dates['LatestTime'] = $this->_info['file']['UnixTime'];
+                $dates['LatestTimeSource'] = 'FileModified';
+                $dates['LatestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']);
+                return $dates;
+            }
+            return false;
+        }
+
+        $dates = array();
+
+        $latestTime = 0;
+        $latestTimeSource = "";
+        $earliestTime = time();
+        $earliestTimeSource = "";
+
+        if (@isset($this->_info['exif']['DateTime'])) {
+            $dates['ExifDateTime'] = $this->_info['exif']['DateTime'];
+
+            $aux = $this->_info['exif']['DateTime'];
+            $aux{4} = "-";
+            $aux{7} = "-";
+            $t = strtotime($aux);
+
+            if ($t && $t > $latestTime) {
+                $latestTime = $t;
+                $latestTimeSource = "ExifDateTime";
+            }
+
+            if ($t && $t < $earliestTime) {
+                $earliestTime = $t;
+                $earliestTimeSource = "ExifDateTime";
+            }
+        }
+
+        if (@isset($this->_info['exif']['DateTimeOriginal'])) {
+            $dates['ExifDateTimeOriginal'] = $this->_info['exif']['DateTime'];
+
+            $aux = $this->_info['exif']['DateTimeOriginal'];
+            $aux{4} = "-";
+            $aux{7} = "-";
+            $t = strtotime($aux);
+
+            if ($t && $t > $latestTime) {
+                $latestTime = $t;
+                $latestTimeSource = "ExifDateTimeOriginal";
+            }
+
+            if ($t && $t < $earliestTime) {
+                $earliestTime = $t;
+                $earliestTimeSource = "ExifDateTimeOriginal";
+            }
+        }
+
+        if (@isset($this->_info['exif']['DateTimeDigitized'])) {
+            $dates['ExifDateTimeDigitized'] = $this->_info['exif']['DateTime'];
+
+            $aux = $this->_info['exif']['DateTimeDigitized'];
+            $aux{4} = "-";
+            $aux{7} = "-";
+            $t = strtotime($aux);
+
+            if ($t && $t > $latestTime) {
+                $latestTime = $t;
+                $latestTimeSource = "ExifDateTimeDigitized";
+            }
+
+            if ($t && $t < $earliestTime) {
+                $earliestTime = $t;
+                $earliestTimeSource = "ExifDateTimeDigitized";
+            }
+        }
+
+        if (@isset($this->_info['iptc']['DateCreated'])) {
+            $dates['IPTCDateCreated'] = $this->_info['iptc']['DateCreated'];
+
+            $aux = $this->_info['iptc']['DateCreated'];
+            $aux = substr($aux, 0, 4) . "-" . substr($aux, 4, 2) . "-" . substr($aux, 6, 2);
+            $t = strtotime($aux);
+
+            if ($t && $t > $latestTime) {
+                $latestTime = $t;
+                $latestTimeSource = "IPTCDateCreated";
+            }
+
+            if ($t && $t < $earliestTime) {
+                $earliestTime = $t;
+                $earliestTimeSource = "IPTCDateCreated";
+            }
+        }
+
+        if (@isset($this->_info['file']['UnixTime'])) {
+            $dates['FileModified'] = $this->_info['file']['UnixTime'];
+
+            $t = $this->_info['file']['UnixTime'];
+
+            if ($t && $t > $latestTime) {
+                $latestTime = $t;
+                $latestTimeSource = "FileModified";
+            }
+
+            if ($t && $t < $earliestTime) {
+                $earliestTime = $t;
+                $earliestTimeSource = "FileModified";
+            }
+        }
+
+        $dates['Time'] = $earliestTime;
+        $dates['TimeSource'] = $earliestTimeSource;
+        $dates['TimeStr'] = date("Y-m-d H:i:s", $earliestTime);
+        $dates['EarliestTime'] = $earliestTime;
+        $dates['EarliestTimeSource'] = $earliestTimeSource;
+        $dates['EarliestTimeStr'] = date("Y-m-d H:i:s", $earliestTime);
+        $dates['LatestTime'] = $latestTime;
+        $dates['LatestTimeSource'] = $latestTimeSource;
+        $dates['LatestTimeStr'] = date("Y-m-d H:i:s", $latestTime);
+
+        return $dates;
+    }
+
+    /**
+     * Get the image width, tries various fields
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getWidth()
+    {
+        if (!isset($this->_info['sof'])) {
+            $this->_parseMarkerSOF();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['sof']['ImageWidth'])) {
+            return $this->_info['sof']['ImageWidth'];
+        }
+
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+
+        if (isset($this->_info['exif']['PixelXDimension'])) {
+            return $this->_info['exif']['PixelXDimension'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the image height, tries various fields
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getHeight()
+    {
+        if (!isset($this->_info['sof'])) {
+            $this->_parseMarkerSOF();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (isset($this->_info['sof']['ImageHeight'])) {
+            return $this->_info['sof']['ImageHeight'];
+        }
+
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+
+        if (isset($this->_info['exif']['PixelYDimension'])) {
+            return $this->_info['exif']['PixelYDimension'];
+        }
+
+        return false;
+    }
+
+    /**
+     * Get an dimension string for use in img tag
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function getDimStr()
+    {
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $w = $this->getWidth();
+        $h = $this->getHeight();
+
+        return "width='" . $w . "' height='" . $h . "'";
+    }
+
+    /**
+     * Checks for an embedded thumbnail
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function hasThumbnail($which = 'any')
+    {
+        if (($which == 'any') || ($which == 'exif')) {
+            if (!isset($this->_info['exif'])) {
+                $this->_parseMarkerExif();
+            }
+
+            if ($this->_markers == null) {
+                return false;
+            }
+
+            if (isset($this->_info['exif']) && is_array($this->_info['exif'])) {
+                if (isset($this->_info['exif']['JFIFThumbnail'])) {
+                    return 'exif';
+                }
+            }
+        }
+
+        if ($which == 'adobe') {
+            if (!isset($this->_info['adobe'])) {
+                $this->_parseMarkerAdobe();
+            }
+
+            if ($this->_markers == null) {
+                return false;
+            }
+
+            if (isset($this->_info['adobe']) && is_array($this->_info['adobe'])) {
+                if (isset($this->_info['adobe']['ThumbnailData'])) {
+                    return 'exif';
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Send embedded thumbnail to browser
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     */
+    function sendThumbnail($which = 'any')
+    {
+        $data = null;
+
+        if (($which == 'any') || ($which == 'exif')) {
+            if (!isset($this->_info['exif'])) {
+                $this->_parseMarkerExif();
+            }
+
+            if ($this->_markers == null) {
+                return false;
+            }
+
+            if (isset($this->_info['exif']) && is_array($this->_info['exif'])) {
+                if (isset($this->_info['exif']['JFIFThumbnail'])) {
+                    $data =& $this->_info['exif']['JFIFThumbnail'];
+                }
+            }
+        }
+
+        if (($which == 'adobe') || ($data == null)){
+            if (!isset($this->_info['adobe'])) {
+                $this->_parseMarkerAdobe();
+            }
+
+            if ($this->_markers == null) {
+                return false;
+            }
+
+            if (isset($this->_info['adobe']) && is_array($this->_info['adobe'])) {
+                if (isset($this->_info['adobe']['ThumbnailData'])) {
+                    $data =& $this->_info['adobe']['ThumbnailData'];
+                }
+            }
+        }
+
+        if ($data != null) {
+            header("Content-type: image/jpeg");
+            echo $data;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Save changed Metadata
+     *
+     * @author Sebastian Delmont <sdelmont@zonageek.com>
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function save($fileName = "") {
+        if ($fileName == "") {
+            $tmpName = tempnam(dirname($this->_fileName),'_metatemp_');
+            $this->_writeJPEG($tmpName);
+            if (@file_exists($tmpName)) {
+                return io_rename($tmpName, $this->_fileName);
+            }
+        } else {
+            return $this->_writeJPEG($fileName);
+        }
+        return false;
+    }
+
+    /*************************************************************/
+    /* PRIVATE FUNCTIONS (Internal Use Only!)                    */
+    /*************************************************************/
+
+    /*************************************************************/
+    function _dispose()
+    {
+        $this->_fileName = $fileName;
+
+        $this->_fp = null;
+        $this->_type = 'unknown';
+
+        unset($this->_markers);
+        unset($this->_info);
+    }
+
+    /*************************************************************/
+    function _readJPEG()
+    {
+        unset($this->_markers);
+        //unset($this->_info);
+        $this->_markers = array();
+        //$this->_info = array();
+
+        $this->_fp = @fopen($this->_fileName, 'rb');
+        if ($this->_fp) {
+            if (file_exists($this->_fileName)) {
+                $this->_type = 'file';
+            }
+            else {
+                $this->_type = 'url';
+            }
+        }
+        else {
+            $this->_fp = null;
+            return false;  // ERROR: Can't open file
+        }
+
+        // Check for the JPEG signature
+        $c1 = ord(fgetc($this->_fp));
+        $c2 = ord(fgetc($this->_fp));
+
+        if ($c1 != 0xFF || $c2 != 0xD8) {   // (0xFF + SOI)
+            $this->_markers = null;
+            return false;  // ERROR: File is not a JPEG
+        }
+
+        $count = 0;
+
+        $done = false;
+        $ok = true;
+
+        while (!$done) {
+            $capture = false;
+
+          // First, skip any non 0xFF bytes
+            $discarded = 0;
+            $c = ord(fgetc($this->_fp));
+            while (!feof($this->_fp) && ($c != 0xFF)) {
+                $discarded++;
+                $c = ord(fgetc($this->_fp));
+            }
+          // Then skip all 0xFF until the marker byte
+            do {
+                $marker = ord(fgetc($this->_fp));
+            } while (!feof($this->_fp) && ($marker == 0xFF));
+
+            if (feof($this->_fp)) {
+                return false; // ERROR: Unexpected EOF
+            }
+            if ($discarded != 0) {
+                return false; // ERROR: Extraneous data
+            }
+
+            $length = ord(fgetc($this->_fp)) * 256 + ord(fgetc($this->_fp));
+            if (feof($this->_fp)) {
+                return false; // ERROR: Unexpected EOF
+            }
+            if ($length < 2) {
+                return false; // ERROR: Extraneous data
+            }
+            $length = $length - 2; // The length we got counts itself
+
+            switch ($marker) {
+            case 0xC0:    // SOF0
+            case 0xC1:    // SOF1
+            case 0xC2:    // SOF2
+            case 0xC9:    // SOF9
+            case 0xE0:    // APP0: JFIF data
+            case 0xE1:    // APP1: EXIF or XMP data
+            case 0xED:    // APP13: IPTC / Photoshop data
+                $capture = true;
+                break;
+            case 0xDA:    // SOS: Start of scan... the image itself and the last block on the file
+                $capture = false;
+                $length = -1;  // This field has no length... it includes all data until EOF
+                $done = true;
+                break;
+            default:
+                $capture = true;//false;
+                break;
+            }
+
+            $this->_markers[$count] = array();
+            $this->_markers[$count]['marker'] = $marker;
+            $this->_markers[$count]['length'] = $length;
+
+            if ($capture) {
+                if ($length)
+                    $this->_markers[$count]['data'] =& fread($this->_fp, $length);
+                else
+                    $this->_markers[$count]['data'] = "";
+            }
+            elseif (!$done) {
+                $result = @fseek($this->_fp, $length, SEEK_CUR);
+              // fseek doesn't seem to like HTTP 'files', but fgetc has no problem
+                if (!($result === 0)) {
+                    for ($i = 0; $i < $length; $i++) {
+                        fgetc($this->_fp);
+                    }
+                }
+            }
+            $count++;
+        }
+
+        if ($this->_fp) {
+            fclose($this->_fp);
+            $this->_fp = null;
+        }
+
+        return $ok;
+    }
+
+    /*************************************************************/
+    function _parseAll()
+    {
+        if (!isset($this->_info['file'])) {
+            $this->_parseFileInfo();
+        }
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        if (!isset($this->_info['jfif'])) {
+            $this->_parseMarkerJFIF();
+        }
+        if (!isset($this->_info['jpeg'])) {
+            $this->_parseMarkerSOF();
+        }
+        if (!isset($this->_info['exif'])) {
+            $this->_parseMarkerExif();
+        }
+        if (!isset($this->_info['xmp'])) {
+            $this->_parseMarkerXmp();
+        }
+        if (!isset($this->_info['adobe'])) {
+            $this->_parseMarkerAdobe();
+        }
+    }
+
+    /*************************************************************/
+    function _writeJPEG($outputName)
+    {
+        $this->_parseAll();
+
+        $wroteEXIF = false;
+        $wroteAdobe = false;
+
+        $this->_fp = @fopen($this->_fileName, 'r');
+        if ($this->_fp) {
+            if (file_exists($this->_fileName)) {
+                $this->_type = 'file';
+            }
+            else {
+                $this->_type = 'url';
+            }
+        }
+        else {
+            $this->_fp = null;
+            return false;  // ERROR: Can't open file
+        }
+
+        $this->_fpout = fopen($outputName, 'wb');
+        if ($this->_fpout) {
+        }
+        else {
+            $this->_fpout = null;
+            fclose($this->_fp);
+            $this->_fp = null;
+            return false;  // ERROR: Can't open output file
+        }
+
+        // Check for the JPEG signature
+        $c1 = ord(fgetc($this->_fp));
+        $c2 = ord(fgetc($this->_fp));
+
+        if ($c1 != 0xFF || $c2 != 0xD8) {   // (0xFF + SOI)
+            return false;  // ERROR: File is not a JPEG
+        }
+
+        fputs($this->_fpout, chr(0xFF), 1);
+        fputs($this->_fpout, chr(0xD8), 1); // (0xFF + SOI)
+
+        $count = 0;
+
+        $done = false;
+        $ok = true;
+
+        while (!$done) {
+          // First, skip any non 0xFF bytes
+            $discarded = 0;
+            $c = ord(fgetc($this->_fp));
+            while (!feof($this->_fp) && ($c != 0xFF)) {
+                $discarded++;
+                $c = ord(fgetc($this->_fp));
+            }
+          // Then skip all 0xFF until the marker byte
+            do {
+                $marker = ord(fgetc($this->_fp));
+            } while (!feof($this->_fp) && ($marker == 0xFF));
+
+            if (feof($this->_fp)) {
+                $ok = false;
+                break; // ERROR: Unexpected EOF
+            }
+            if ($discarded != 0) {
+                $ok = false;
+                break; // ERROR: Extraneous data
+            }
+
+            $length = ord(fgetc($this->_fp)) * 256 + ord(fgetc($this->_fp));
+            if (feof($this->_fp)) {
+                $ok = false;
+                break; // ERROR: Unexpected EOF
+            }
+            if ($length < 2) {
+                $ok = false;
+                break; // ERROR: Extraneous data
+            }
+            $length = $length - 2; // The length we got counts itself
+
+            unset($data);
+            if ($marker == 0xE1) { // APP1: EXIF data
+                $data =& $this->_createMarkerEXIF();
+                $wroteEXIF = true;
+            }
+            elseif ($marker == 0xED) { // APP13: IPTC / Photoshop data
+                $data =& $this->_createMarkerAdobe();
+                $wroteAdobe = true;
+            }
+            elseif ($marker == 0xDA) { // SOS: Start of scan... the image itself and the last block on the file
+                $done = true;
+            }
+
+            if (!$wroteEXIF && (($marker < 0xE0) || ($marker > 0xEF))) {
+                if (isset($this->_info['exif']) && is_array($this->_info['exif'])) {
+                    $exif =& $this->_createMarkerEXIF();
+                    $this->_writeJPEGMarker(0xE1, strlen($exif), $exif, 0);
+                    unset($exif);
+                }
+                $wroteEXIF = true;
+            }
+
+            if (!$wroteAdobe && (($marker < 0xE0) || ($marker > 0xEF))) {
+                if ((isset($this->_info['adobe']) && is_array($this->_info['adobe']))
+                || (isset($this->_info['iptc']) && is_array($this->_info['iptc']))) {
+                    $adobe =& $this->_createMarkerAdobe();
+                    $this->_writeJPEGMarker(0xED, strlen($adobe), $adobe, 0);
+                    unset($adobe);
+                }
+                $wroteAdobe = true;
+            }
+
+            $origLength = $length;
+            if (isset($data)) {
+                $length = strlen($data);
+            }
+
+            if ($marker != -1) {
+                $this->_writeJPEGMarker($marker, $length, $data, $origLength);
+            }
+        }
+
+        if ($this->_fp) {
+            fclose($this->_fp);
+            $this->_fp = null;
+        }
+
+        if ($this->_fpout) {
+            fclose($this->_fpout);
+            $this->_fpout = null;
+        }
+
+        return $ok;
+    }
+
+    /*************************************************************/
+    function _writeJPEGMarker($marker, $length, &$data, $origLength)
+    {
+        if ($length <= 0) {
+            return false;
+        }
+
+        fputs($this->_fpout, chr(0xFF), 1);
+        fputs($this->_fpout, chr($marker), 1);
+        fputs($this->_fpout, chr((($length + 2) & 0x0000FF00) >> 8), 1);
+        fputs($this->_fpout, chr((($length + 2) & 0x000000FF) >> 0), 1);
+
+        if (isset($data)) {
+            // Copy the generated data
+            fputs($this->_fpout, $data, $length);
+
+            if ($origLength > 0) {   // Skip the original data
+                $result = @fseek($this->_fp, $origLength, SEEK_CUR);
+                // fseek doesn't seem to like HTTP 'files', but fgetc has no problem
+                if ($result != 0) {
+                    for ($i = 0; $i < $origLength; $i++) {
+                        fgetc($this->_fp);
+                    }
+                }
+            }
+        }
+        else {
+            if ($marker == 0xDA) {  // Copy until EOF
+                while (!feof($this->_fp)) {
+                    $data = fread($this->_fp, 1024 * 16);
+                    fputs($this->_fpout, $data, strlen($data));
+                }
+            }
+            else { // Copy only $length bytes
+                $data = @fread($this->_fp, $length);
+                fputs($this->_fpout, $data, $length);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Gets basic info from the file - should work with non-JPEGs
+     *
+     * @author  Sebastian Delmont <sdelmont@zonageek.com>
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _parseFileInfo()
+    {
+        if (file_exists($this->_fileName)) {
+            $this->_info['file'] = array();
+            $this->_info['file']['Name'] = basename($this->_fileName);
+            $this->_info['file']['Path'] = fullpath($this->_fileName);
+            $this->_info['file']['Size'] = filesize($this->_fileName);
+            if ($this->_info['file']['Size'] < 1024) {
+                $this->_info['file']['NiceSize'] = $this->_info['file']['Size'] . 'B';
+            }
+            elseif ($this->_info['file']['Size'] < (1024 * 1024)) {
+                $this->_info['file']['NiceSize'] = round($this->_info['file']['Size'] / 1024) . 'KB';
+            }
+            elseif ($this->_info['file']['Size'] < (1024 * 1024 * 1024)) {
+                $this->_info['file']['NiceSize'] = round($this->_info['file']['Size'] / (1024*1024)) . 'MB';
+            }
+            else {
+                $this->_info['file']['NiceSize'] = $this->_info['file']['Size'] . 'B';
+            }
+            $this->_info['file']['UnixTime'] = filemtime($this->_fileName);
+
+            // get image size directly from file
+            $size = getimagesize($this->_fileName);
+            $this->_info['file']['Width']  = $size[0];
+            $this->_info['file']['Height'] = $size[1];
+            // set mime types and formats
+            // http://www.php.net/manual/en/function.getimagesize.php
+            // http://www.php.net/manual/en/function.image-type-to-mime-type.php
+            switch ($size[2]){
+                case 1:
+                    $this->_info['file']['Mime']   = 'image/gif';
+                    $this->_info['file']['Format'] = 'GIF';
+                    break;
+                case 2:
+                    $this->_info['file']['Mime']   = 'image/jpeg';
+                    $this->_info['file']['Format'] = 'JPEG';
+                    break;
+                case 3:
+                    $this->_info['file']['Mime']   = 'image/png';
+                    $this->_info['file']['Format'] = 'PNG';
+                    break;
+                case 4:
+                    $this->_info['file']['Mime']   = 'application/x-shockwave-flash';
+                    $this->_info['file']['Format'] = 'SWF';
+                    break;
+                case 5:
+                    $this->_info['file']['Mime']   = 'image/psd';
+                    $this->_info['file']['Format'] = 'PSD';
+                    break;
+                case 6:
+                    $this->_info['file']['Mime']   = 'image/bmp';
+                    $this->_info['file']['Format'] = 'BMP';
+                    break;
+                case 7:
+                    $this->_info['file']['Mime']   = 'image/tiff';
+                    $this->_info['file']['Format'] = 'TIFF (Intel)';
+                    break;
+                case 8:
+                    $this->_info['file']['Mime']   = 'image/tiff';
+                    $this->_info['file']['Format'] = 'TIFF (Motorola)';
+                    break;
+                case 9:
+                    $this->_info['file']['Mime']   = 'application/octet-stream';
+                    $this->_info['file']['Format'] = 'JPC';
+                    break;
+                case 10:
+                    $this->_info['file']['Mime']   = 'image/jp2';
+                    $this->_info['file']['Format'] = 'JP2';
+                    break;
+                case 11:
+                    $this->_info['file']['Mime']   = 'application/octet-stream';
+                    $this->_info['file']['Format'] = 'JPX';
+                    break;
+                case 12:
+                    $this->_info['file']['Mime']   = 'application/octet-stream';
+                    $this->_info['file']['Format'] = 'JB2';
+                    break;
+                case 13:
+                    $this->_info['file']['Mime']   = 'application/x-shockwave-flash';
+                    $this->_info['file']['Format'] = 'SWC';
+                    break;
+                case 14:
+                    $this->_info['file']['Mime']   = 'image/iff';
+                    $this->_info['file']['Format'] = 'IFF';
+                    break;
+                case 15:
+                    $this->_info['file']['Mime']   = 'image/vnd.wap.wbmp';
+                    $this->_info['file']['Format'] = 'WBMP';
+                    break;
+                case 16:
+                    $this->_info['file']['Mime']   = 'image/xbm';
+                    $this->_info['file']['Format'] = 'XBM';
+                    break;
+                default:
+                    $this->_info['file']['Mime']   = 'image/unknown';
+            }
+        }
+        else {
+            $this->_info['file'] = array();
+            $this->_info['file']['Name'] = basename($this->_fileName);
+            $this->_info['file']['Url'] = $this->_fileName;
+        }
+
+        return true;
+    }
+
+    /*************************************************************/
+    function _parseMarkerJFIF()
+    {
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->_markers[$i]['marker'] == 0xE0) {
+                $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 4);
+                if ($signature == 'JFIF') {
+                    $data =& $this->_markers[$i]['data'];
+                    break;
+                }
+            }
+        }
+
+        if ($data == null) {
+            $this->_info['jfif'] = false;
+            return false;
+        }
+
+        $pos = 0;
+        $this->_info['jfif'] = array();
+
+
+        $vmaj = $this->_getByte($data, 5);
+        $vmin = $this->_getByte($data, 6);
+
+        $this->_info['jfif']['Version'] = sprintf('%d.%02d', $vmaj, $vmin);
+
+        $units = $this->_getByte($data, 7);
+        switch ($units) {
+        case 0:
+            $this->_info['jfif']['Units'] = 'pixels';
+            break;
+        case 1:
+            $this->_info['jfif']['Units'] = 'dpi';
+            break;
+        case 2:
+            $this->_info['jfif']['Units'] = 'dpcm';
+            break;
+        default:
+            $this->_info['jfif']['Units'] = 'unknown';
+            break;
+        }
+
+        $xdens = $this->_getShort($data, 8);
+        $ydens = $this->_getShort($data, 10);
+
+        $this->_info['jfif']['XDensity'] = $xdens;
+        $this->_info['jfif']['YDensity'] = $ydens;
+
+        $thumbx = $this->_getByte($data, 12);
+        $thumby = $this->_getByte($data, 13);
+
+        $this->_info['jfif']['ThumbnailWidth'] = $thumbx;
+        $this->_info['jfif']['ThumbnailHeight'] = $thumby;
+
+        return true;
+    }
+
+    /*************************************************************/
+    function _parseMarkerSOF()
+    {
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            switch ($this->_markers[$i]['marker']) {
+            case 0xC0: // SOF0
+            case 0xC1: // SOF1
+            case 0xC2: // SOF2
+            case 0xC9: // SOF9
+                $data =& $this->_markers[$i]['data'];
+                $marker = $this->_markers[$i]['marker'];
+                break;
+            }
+        }
+
+        if ($data == null) {
+            $this->_info['sof'] = false;
+            return false;
+        }
+
+        $pos = 0;
+        $this->_info['sof'] = array();
+
+
+        switch ($marker) {
+        case 0xC0: // SOF0
+            $format = 'Baseline';
+            break;
+        case 0xC1: // SOF1
+            $format = 'Progessive';
+            break;
+        case 0xC2: // SOF2
+            $format = 'Non-baseline';
+            break;
+        case 0xC9: // SOF9
+            $format = 'Arithmetic';
+            break;
+        default:
+            return false;
+            break;
+        }
+
+
+        $this->_info['sof']['Format'] = $format;
+
+        $this->_info['sof']['SamplePrecision'] = $this->_getByte($data, $pos + 0);
+        $this->_info['sof']['ImageHeight'] = $this->_getShort($data, $pos + 1);
+        $this->_info['sof']['ImageWidth'] = $this->_getShort($data, $pos + 3);
+        $this->_info['sof']['ColorChannels'] = $this->_getByte($data, $pos + 5);
+
+        return true;
+    }
+
+    /**
+     * Parses the XMP data
+     *
+     * @author  Hakan Sandell <hakan.sandell@mydata.se>
+     */
+    function _parseMarkerXmp()
+    {
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->_markers[$i]['marker'] == 0xE1) {
+                $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 29);
+                if ($signature == "http://ns.adobe.com/xap/1.0/\0") {
+                    $data =& substr($this->_markers[$i]['data'], 29);
+                    break;
+                }
+            }
+        }
+
+        if ($data == null) {
+            $this->_info['xmp'] = false;
+            return false;
+        }
+
+        $parser = xml_parser_create();
+        xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
+        xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1);
+        xml_parse_into_struct($parser, $data, $values, $tags);
+        xml_parser_free($parser);
+
+        $this->_info['xmp'] = array();
+        $count = count($values);
+        for ($i = 0; $i < $count; $i++) {
+            if ($values[$i][tag] == 'rdf:Description' && $values[$i][type] == 'open') {
+
+                while ($values[++$i][tag] != 'rdf:Description') {
+                    $this->_parseXmpNode($values, $i, $this->_info['xmp'][$values[$i][tag]]);
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Parses XMP nodes by recursion
+     *
+     * @author  Hakan Sandell <hakan.sandell@mydata.se>
+     */
+    function _parseXmpNode($values, &$i, &$meta)
+    {
+        if ($values[$i][type] == 'complete') {
+            // Simple Type property
+            $meta = $values[$i][value];
+            return;
+        }
+
+        $i++;
+        if ($values[$i][tag] == 'rdf:Bag' || $values[$i][tag] == 'rdf:Seq') {
+            // Array property
+            $meta = array();
+            while ($values[++$i][tag] == 'rdf:li') {
+                $this->_parseXmpNode($values, $i, $meta[]);
+            }
+            $i++; // skip closing tag
+
+        } elseif ($values[$i][tag] == 'rdf:Alt') {
+            // Language Alternative property, only the first (default) value is used
+            $i++;
+            $this->_parseXmpNode($values, $i, $meta);
+            while ($values[++$i][tag] != 'rdf:Alt');
+            $i++; // skip closing tag
+
+        } else {
+            // Structure property
+            $meta = array();
+            $startTag = $values[$i-1][tag];
+            do {
+                $this->_parseXmpNode($values, $i, $meta[$values[$i][tag]]);
+            } while ($values[++$i][tag] != $startTag);
+        }
+    }
+
+    /*************************************************************/
+    function _parseMarkerExif()
+    {
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->_markers[$i]['marker'] == 0xE1) {
+                $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 6);
+                if ($signature == "Exif\0\0") {
+                    $data =& $this->_markers[$i]['data'];
+                    break;
+                }
+            }
+        }
+
+        if ($data == null) {
+            $this->_info['exif'] = false;
+            return false;
+        }
+        $pos = 6;
+        $this->_info['exif'] = array();
+
+        // We don't increment $pos after this because Exif uses offsets relative to this point
+
+        $byteAlign = $this->_getShort($data, $pos + 0);
+
+        if ($byteAlign == 0x4949) { // "II"
+            $isBigEndian = false;
+        }
+        elseif ($byteAlign == 0x4D4D) { // "MM"
+            $isBigEndian = true;
+        }
+        else {
+            return false; // Unexpected data
+        }
+
+        $alignCheck = $this->_getShort($data, $pos + 2, $isBigEndian);
+        if ($alignCheck != 0x002A) // That's the expected value
+            return false; // Unexpected data
+
+        if ($isBigEndian) {
+            $this->_info['exif']['ByteAlign'] = "Big Endian";
+        }
+        else {
+            $this->_info['exif']['ByteAlign'] = "Little Endian";
+        }
+
+        $offsetIFD0 = $this->_getLong($data, $pos + 4, $isBigEndian);
+        if ($offsetIFD0 < 8)
+            return false; // Unexpected data
+
+        $offsetIFD1 = $this->_readIFD($data, $pos, $offsetIFD0, $isBigEndian, 'ifd0');
+        if ($offsetIFD1 != 0)
+            $this->_readIFD($data, $pos, $offsetIFD1, $isBigEndian, 'ifd1');
+
+        return true;
+    }
+
+    /*************************************************************/
+    function _readIFD($data, $base, $offset, $isBigEndian, $mode)
+    {
+        $EXIFTags = $this->_exifTagNames($mode);
+
+        $numEntries = $this->_getShort($data, $base + $offset, $isBigEndian);
+        $offset += 2;
+
+        $exifTIFFOffset = 0;
+        $exifTIFFLength = 0;
+        $exifThumbnailOffset = 0;
+        $exifThumbnailLength = 0;
+
+        for ($i = 0; $i < $numEntries; $i++) {
+            $tag = $this->_getShort($data, $base + $offset, $isBigEndian);
+            $offset += 2;
+            $type = $this->_getShort($data, $base + $offset, $isBigEndian);
+            $offset += 2;
+            $count = $this->_getLong($data, $base + $offset, $isBigEndian);
+            $offset += 4;
+
+            if (($type < 1) || ($type > 12))
+                return false; // Unexpected Type
+
+            $typeLengths = array( -1, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 );
+
+            $dataLength = $typeLengths[$type] * $count;
+            if ($dataLength > 4) {
+                $dataOffset = $this->_getLong($data, $base + $offset, $isBigEndian);
+                $rawValue = $this->_getFixedString($data, $base + $dataOffset, $dataLength);
+            }
+            else {
+                $rawValue = $this->_getFixedString($data, $base + $offset, $dataLength);
+            }
+            $offset += 4;
+
+            switch ($type) {
+            case 1:    // UBYTE
+                if ($count == 1) {
+                    $value = $this->_getByte($rawValue, 0);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getByte($rawValue, $j);
+                }
+                break;
+            case 2:    // ASCII
+                $value = $rawValue;
+                break;
+            case 3:    // USHORT
+                if ($count == 1) {
+                    $value = $this->_getShort($rawValue, 0, $isBigEndian);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getShort($rawValue, $j * 2, $isBigEndian);
+                }
+                break;
+            case 4:    // ULONG
+                if ($count == 1) {
+                    $value = $this->_getLong($rawValue, 0, $isBigEndian);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getLong($rawValue, $j * 4, $isBigEndian);
+                }
+                break;
+            case 5:    // URATIONAL
+                if ($count == 1) {
+                    $a = $this->_getLong($rawValue, 0, $isBigEndian);
+                    $b = $this->_getLong($rawValue, 4, $isBigEndian);
+                    $value = array();
+                    $value['val'] = 0;
+                    $value['num'] = $a;
+                    $value['den'] = $b;
+                    if (($a != 0) && ($b != 0)) {
+                        $value['val'] = $a / $b;
+                    }
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++) {
+                        $a = $this->_getLong($rawValue, $j * 8, $isBigEndian);
+                        $b = $this->_getLong($rawValue, ($j * 8) + 4, $isBigEndian);
+                        $value = array();
+                        $value[$j]['val'] = 0;
+                        $value[$j]['num'] = $a;
+                        $value[$j]['den'] = $b;
+                        if (($a != 0) && ($b != 0))
+                            $value[$j]['val'] = $a / $b;
+                    }
+                }
+                break;
+            case 6:    // SBYTE
+                if ($count == 1) {
+                    $value = $this->_getByte($rawValue, 0);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getByte($rawValue, $j);
+                }
+                break;
+            case 7:    // UNDEFINED
+                $value = $rawValue;
+                break;
+            case 8:    // SSHORT
+                if ($count == 1) {
+                    $value = $this->_getShort($rawValue, 0, $isBigEndian);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getShort($rawValue, $j * 2, $isBigEndian);
+                }
+                break;
+            case 9:    // SLONG
+                if ($count == 1) {
+                    $value = $this->_getLong($rawValue, 0, $isBigEndian);
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++)
+                        $value[$j] = $this->_getLong($rawValue, $j * 4, $isBigEndian);
+                }
+                break;
+            case 10:   // SRATIONAL
+                if ($count == 1) {
+                    $a = $this->_getLong($rawValue, 0, $isBigEndian);
+                    $b = $this->_getLong($rawValue, 4, $isBigEndian);
+                    $value = array();
+                    $value['val'] = 0;
+                    $value['num'] = $a;
+                    $value['den'] = $b;
+                    if (($a != 0) && ($b != 0))
+                        $value['val'] = $a / $b;
+                }
+                else {
+                    $value = array();
+                    for ($j = 0; $j < $count; $j++) {
+                        $a = $this->_getLong($rawValue, $j * 8, $isBigEndian);
+                        $b = $this->_getLong($rawValue, ($j * 8) + 4, $isBigEndian);
+                        $value = array();
+                        $value[$j]['val'] = 0;
+                        $value[$j]['num'] = $a;
+                        $value[$j]['den'] = $b;
+                        if (($a != 0) && ($b != 0))
+                            $value[$j]['val'] = $a / $b;
+                    }
+                }
+                break;
+            case 11:   // FLOAT
+                $value = $rawValue;
+                break;
+
+            case 12:   // DFLOAT
+                $value = $rawValue;
+                break;
+            default:
+                return false; // Unexpected Type
+            }
+
+            $tagName = '';
+            if (($mode == 'ifd0') && ($tag == 0x8769)) {  // ExifIFDOffset
+                $this->_readIFD($data, $base, $value, $isBigEndian, 'exif');
+            }
+            elseif (($mode == 'ifd0') && ($tag == 0x8825)) {  // GPSIFDOffset
+                $this->_readIFD($data, $base, $value, $isBigEndian, 'gps');
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0111)) {  // TIFFStripOffsets
+                $exifTIFFOffset = $value;
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0117)) {  // TIFFStripByteCounts
+                $exifTIFFLength = $value;
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0201)) {  // TIFFJFIFOffset
+                $exifThumbnailOffset = $value;
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0202)) {  // TIFFJFIFLength
+                $exifThumbnailLength = $value;
+            }
+            elseif (($mode == 'exif') && ($tag == 0xA005)) {  // InteropIFDOffset
+                $this->_readIFD($data, $base, $value, $isBigEndian, 'interop');
+            }
+            // elseif (($mode == 'exif') && ($tag == 0x927C)) {  // MakerNote
+            // }
+            else {
+                if (isset($EXIFTags[$tag])) {
+                    $tagName = $EXIFTags[$tag];
+                    if (isset($this->_info['exif'][$tagName])) {
+                        if (!is_array($this->_info['exif'][$tagName])) {
+                            $aux = array();
+                            $aux[0] = $this->_info['exif'][$tagName];
+                            $this->_info['exif'][$tagName] = $aux;
+                        }
+
+                        $this->_info['exif'][$tagName][count($this->_info['exif'][$tagName])] = $value;
+                    }
+                    else {
+                        $this->_info['exif'][$tagName] = $value;
+                    }
+                }
+                else {
+#echo sprintf("<h1>Unknown tag %02x (t: %d l: %d) %s in %s</h1>", $tag, $type, $count, $mode, $this->_fileName);
+                    // Unknown Tags will be ignored!!!
+                    // That's because the tag might be a pointer (like the Exif tag)
+                    // and saving it without saving the data it points to might
+                    // create an invalid file.
+                }
+            }
+        }
+
+        if (($exifThumbnailOffset > 0) && ($exifThumbnailLength > 0)) {
+            $this->_info['exif']['JFIFThumbnail'] = $this->_getFixedString($data, $base + $exifThumbnailOffset, $exifThumbnailLength);
+        }
+
+        if (($exifTIFFOffset > 0) && ($exifTIFFLength > 0)) {
+            $this->_info['exif']['TIFFStrips'] = $this->_getFixedString($data, $base + $exifTIFFOffset, $exifTIFFLength);
+        }
+
+        $nextOffset = $this->_getLong($data, $base + $offset, $isBigEndian);
+        return $nextOffset;
+    }
+
+    /*************************************************************/
+    function & _createMarkerExif()
+    {
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->_markers[$i]['marker'] == 0xE1) {
+                $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 6);
+                if ($signature == "Exif\0\0") {
+                    $data =& $this->_markers[$i]['data'];
+                    break;
+                }
+            }
+        }
+
+        if (!isset($this->_info['exif'])) {
+            return false;
+        }
+
+        $data = "Exif\0\0";
+        $pos = 6;
+        $offsetBase = 6;
+
+        if (isset($this->_info['exif']['ByteAlign']) && ($this->_info['exif']['ByteAlign'] == "Big Endian")) {
+            $isBigEndian = true;
+            $aux = "MM";
+            $pos = $this->_putString($data, $pos, $aux);
+        }
+        else {
+            $isBigEndian = false;
+            $aux = "II";
+            $pos = $this->_putString($data, $pos, $aux);
+        }
+        $pos = $this->_putShort($data, $pos, 0x002A, $isBigEndian);
+        $pos = $this->_putLong($data, $pos, 0x00000008, $isBigEndian); // IFD0 Offset is always 8
+
+        $ifd0 =& $this->_getIFDEntries($isBigEndian, 'ifd0');
+        $ifd1 =& $this->_getIFDEntries($isBigEndian, 'ifd1');
+
+        $pos = $this->_writeIFD($data, $pos, $offsetBase, $ifd0, $isBigEndian, true);
+        $pos = $this->_writeIFD($data, $pos, $offsetBase, $ifd1, $isBigEndian, false);
+
+        return $data;
+    }
+
+    /*************************************************************/
+    function _writeIFD(&$data, $pos, $offsetBase, &$entries, $isBigEndian, $hasNext)
+    {
+        $tiffData = null;
+        $tiffDataOffsetPos = -1;
+
+        $entryCount = count($entries);
+
+        $dataPos = $pos + 2 + ($entryCount * 12) + 4;
+        $pos = $this->_putShort($data, $pos, $entryCount, $isBigEndian);
+
+        for ($i = 0; $i < $entryCount; $i++) {
+            $tag = $entries[$i]['tag'];
+            $type = $entries[$i]['type'];
+
+            if ($type == -99) { // SubIFD
+                $pos = $this->_putShort($data, $pos, $tag, $isBigEndian);
+                $pos = $this->_putShort($data, $pos, 0x04, $isBigEndian); // LONG
+                $pos = $this->_putLong($data, $pos, 0x01, $isBigEndian); // Count = 1
+                $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian);
+
+                $dataPos = $this->_writeIFD($data, $dataPos, $offsetBase, $entries[$i]['value'], $isBigEndian, false);
+            }
+            elseif ($type == -98) { // TIFF Data
+                $pos = $this->_putShort($data, $pos, $tag, $isBigEndian);
+                $pos = $this->_putShort($data, $pos, 0x04, $isBigEndian); // LONG
+                $pos = $this->_putLong($data, $pos, 0x01, $isBigEndian); // Count = 1
+                $tiffDataOffsetPos = $pos;
+                $pos = $this->_putLong($data, $pos, 0x00, $isBigEndian); // For Now
+                $tiffData =& $entries[$i]['value'] ;
+            }
+            else { // Regular Entry
+                $pos = $this->_putShort($data, $pos, $tag, $isBigEndian);
+                $pos = $this->_putShort($data, $pos, $type, $isBigEndian);
+                $pos = $this->_putLong($data, $pos, $entries[$i]['count'], $isBigEndian);
+                if (strlen($entries[$i]['value']) > 4) {
+                    $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian);
+                    $dataPos = $this->_putString($data, $dataPos, $entries[$i]['value']);
+                }
+                else {
+                    $val = str_pad($entries[$i]['value'], 4, "\0");
+                    $pos = $this->_putString($data, $pos, $val);
+                }
+            }
+        }
+
+        if ($tiffData != null) {
+            $this->_putLong($data, $tiffDataOffsetPos, $dataPos - $offsetBase, $isBigEndian);
+            $dataPos = $this->_putString($data, $dataPos, $tiffData);
+        }
+
+        if ($hasNext) {
+            $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian);
+        }
+        else {
+            $pos = $this->_putLong($data, $pos, 0, $isBigEndian);
+        }
+
+        return $dataPos;
+    }
+
+    /*************************************************************/
+    function & _getIFDEntries($isBigEndian, $mode)
+    {
+        $EXIFNames = $this->_exifTagNames($mode);
+        $EXIFTags = $this->_exifNameTags($mode);
+        $EXIFTypeInfo = $this->_exifTagTypes($mode);
+
+        $ifdEntries = array();
+        $entryCount = 0;
+
+        reset($EXIFNames);
+        while (list($tag, $name) = each($EXIFNames)) {
+            $type = $EXIFTypeInfo[$tag][0];
+            $count = $EXIFTypeInfo[$tag][1];
+            $value = null;
+
+            if (($mode == 'ifd0') && ($tag == 0x8769)) {  // ExifIFDOffset
+                if (isset($this->_info['exif']['EXIFVersion'])) {
+                    $value =& $this->_getIFDEntries($isBigEndian, "exif");
+                    $type = -99;
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'ifd0') && ($tag == 0x8825)) {  // GPSIFDOffset
+                if (isset($this->_info['exif']['GPSVersionID'])) {
+                    $value =& $this->_getIFDEntries($isBigEndian, "gps");
+                    $type = -99;
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0111)) {  // TIFFStripOffsets
+                if (isset($this->_info['exif']['TIFFStrips'])) {
+                    $value =& $this->_info['exif']['TIFFStrips'];
+                    $type = -98;
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0117)) {  // TIFFStripByteCounts
+                if (isset($this->_info['exif']['TIFFStrips'])) {
+                    $value = strlen($this->_info['exif']['TIFFStrips']);
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0201)) {  // TIFFJFIFOffset
+                if (isset($this->_info['exif']['JFIFThumbnail'])) {
+                    $value =& $this->_info['exif']['JFIFThumbnail'];
+                    $type = -98;
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'ifd1') && ($tag == 0x0202)) {  // TIFFJFIFLength
+                if (isset($this->_info['exif']['JFIFThumbnail'])) {
+                    $value = strlen($this->_info['exif']['JFIFThumbnail']);
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (($mode == 'exif') && ($tag == 0xA005)) {  // InteropIFDOffset
+                if (isset($this->_info['exif']['InteroperabilityIndex'])) {
+                    $value =& $this->_getIFDEntries($isBigEndian, "interop");
+                    $type = -99;
+                }
+                else {
+                    $value = null;
+                }
+            }
+            elseif (isset($this->_info['exif'][$name])) {
+                $origValue =& $this->_info['exif'][$name];
+
+                // This makes it easier to process variable size elements
+                if (!is_array($origValue) || isset($origValue['val'])) {
+                    unset($origValue); // Break the reference
+                    $origValue = array($this->_info['exif'][$name]);
+                }
+                $origCount = count($origValue);
+
+                if ($origCount == 0 ) {
+                    $type = -1;  // To ignore this field
+                }
+
+                $value = " ";
+
+                switch ($type) {
+                case 1:    // UBYTE
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+
+                        $this->_putByte($value, $j, $origValue[$j]);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putByte($value, $j, 0);
+                        $j++;
+                    }
+                    break;
+                case 2:    // ASCII
+                    $v = strval($origValue[0]);
+                    if (($count != 0) && (strlen($v) > $count)) {
+                        $v = substr($v, 0, $count);
+                    }
+                    elseif (($count > 0) && (strlen($v) < $count)) {
+                        $v = str_pad($v, $count, "\0");
+                    }
+
+                    $count = strlen($v);
+
+                    $this->_putString($value, 0, $v);
+                    break;
+                case 3:    // USHORT
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $this->_putShort($value, $j * 2, $origValue[$j], $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putShort($value, $j * 2, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 4:    // ULONG
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $this->_putLong($value, $j * 4, $origValue[$j], $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putLong($value, $j * 4, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 5:    // URATIONAL
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $v = $origValue[$j];
+                        if (is_array($v)) {
+                            $a = $v['num'];
+                            $b = $v['den'];
+                        }
+                        else {
+                            $a = 0;
+                            $b = 0;
+                            // TODO: Allow other types and convert them
+                        }
+                        $this->_putLong($value, $j * 8, $a, $isBigEndian);
+                        $this->_putLong($value, ($j * 8) + 4, $b, $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putLong($value, $j * 8, 0, $isBigEndian);
+                        $this->_putLong($value, ($j * 8) + 4, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 6:    // SBYTE
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $this->_putByte($value, $j, $origValue[$j]);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putByte($value, $j, 0);
+                        $j++;
+                    }
+                    break;
+                case 7:    // UNDEFINED
+                    $v = strval($origValue[0]);
+                    if (($count != 0) && (strlen($v) > $count)) {
+                        $v = substr($v, 0, $count);
+                    }
+                    elseif (($count > 0) && (strlen($v) < $count)) {
+                        $v = str_pad($v, $count, "\0");
+                    }
+
+                    $count = strlen($v);
+
+                    $this->_putString($value, 0, $v);
+                    break;
+                case 8:    // SSHORT
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $this->_putShort($value, $j * 2, $origValue[$j], $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putShort($value, $j * 2, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 9:    // SLONG
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $this->_putLong($value, $j * 4, $origValue[$j], $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putLong($value, $j * 4, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 10:   // SRATIONAL
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $v = $origValue[$j];
+                        if (is_array($v)) {
+                            $a = $v['num'];
+                            $b = $v['den'];
+                        }
+                        else {
+                            $a = 0;
+                            $b = 0;
+                            // TODO: Allow other types and convert them
+                        }
+
+                        $this->_putLong($value, $j * 8, $a, $isBigEndian);
+                        $this->_putLong($value, ($j * 8) + 4, $b, $isBigEndian);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putLong($value, $j * 8, 0, $isBigEndian);
+                        $this->_putLong($value, ($j * 8) + 4, 0, $isBigEndian);
+                        $j++;
+                    }
+                    break;
+                case 11:   // FLOAT
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $v = strval($origValue[$j]);
+                        if (strlen($v) > 4) {
+                            $v = substr($v, 0, 4);
+                        }
+                        elseif (strlen($v) < 4) {
+                            $v = str_pad($v, 4, "\0");
+                        }
+                        $this->_putString($value, $j * 4, $v);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putString($value, $j * 4, "\0\0\0\0");
+                        $j++;
+                    }
+                    break;
+                case 12:   // DFLOAT
+                    if ($count == 0) {
+                        $count = $origCount;
+                    }
+
+                    $j = 0;
+                    while (($j < $count) && ($j < $origCount)) {
+                        $v = strval($origValue[$j]);
+                        if (strlen($v) > 8) {
+                            $v = substr($v, 0, 8);
+                        }
+                        elseif (strlen($v) < 8) {
+                            $v = str_pad($v, 8, "\0");
+                        }
+                        $this->_putString($value, $j * 8, $v);
+                        $j++;
+                    }
+
+                    while ($j < $count) {
+                        $this->_putString($value, $j * 8, "\0\0\0\0\0\0\0\0");
+                        $j++;
+                    }
+                    break;
+                default:
+                    $value = null;
+                    break;
+                }
+            }
+
+            if ($value != null) {
+                $ifdEntries[$entryCount] = array();
+                $ifdEntries[$entryCount]['tag'] = $tag;
+                $ifdEntries[$entryCount]['type'] = $type;
+                $ifdEntries[$entryCount]['count'] = $count;
+                $ifdEntries[$entryCount]['value'] = $value;
+
+                $entryCount++;
+            }
+        }
+
+        return $ifdEntries;
+    }
+
+    /*************************************************************/
+    function _parseMarkerAdobe()
+    {
+        if (!isset($this->_markers)) {
+            $this->_readJPEG();
+        }
+
+        if ($this->_markers == null) {
+            return false;
+        }
+
+        $data = null;
+        $count = count($this->_markers);
+        for ($i = 0; $i < $count; $i++) {
+            if ($this->_markers[$i]['marker'] == 0xED) {
+                $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 14);
+                if ($signature == "Photoshop 3.0\0") {
+                    $data =& $this->_markers[$i]['data'];
+                    break;
+                }
+            }
+        }
+
+        if ($data == null) {
+            $this->_info['adobe'] = false;
+            $this->_info['iptc'] = false;
+            return false;
+        }
+        $pos = 14;
+        $this->_info['adobe'] = array();
+        $this->_info['adobe']['raw'] = array();
+        $this->_info['iptc'] = array();
+
+        $datasize = strlen($data);
+
+        while ($pos < $datasize) {
+            $signature = $this->_getFixedString($data, $pos, 4);
+            if ($signature != '8BIM')
+                return false;
+            $pos += 4;
+
+            $type = $this->_getShort($data, $pos);
+            $pos += 2;
+
+            $strlen = $this->_getByte($data, $pos);
+            $pos += 1;
+            $header = '';
+            for ($i = 0; $i < $strlen; $i++) {
+                $header .= $data{$pos + $i};
+            }
+            $pos += $strlen + 1 - ($strlen % 2);  // The string is padded to even length, counting the length byte itself
+
+            $length = $this->_getLong($data, $pos);
+            $pos += 4;
+
+            $basePos = $pos;
+
+            switch ($type) {
+            case 0x0404: // Caption (IPTC Data)
+                $pos = $this->_readIPTC($data, $pos);
+                if ($pos == false)
+                    return false;
+                break;
+            case 0x040A: // CopyrightFlag
+                $this->_info['adobe']['CopyrightFlag'] = $this->_getByte($data, $pos);
+                $pos += $length;
+                break;
+            case 0x040B: // ImageURL
+                $this->_info['adobe']['ImageURL'] = $this->_getFixedString($data, $pos, $length);
+                $pos += $length;
+                break;
+            case 0x040C: // Thumbnail
+                $aux = $this->_getLong($data, $pos);
+                $pos += 4;
+                if ($aux == 1) {
+                    $this->_info['adobe']['ThumbnailWidth'] = $this->_getLong($data, $pos);
+                    $pos += 4;
+                    $this->_info['adobe']['ThumbnailHeight'] = $this->_getLong($data, $pos);
+                    $pos += 4;
+
+                    $pos += 16; // Skip some data
+
+                    $this->_info['adobe']['ThumbnailData'] = $this->_getFixedString($data, $pos, $length - 28);
+                    $pos += $length - 28;
+                }
+                break;
+            default:
+                break;
+            }
+
+            // We save all blocks, even those we recognized
+            $label = sprintf('8BIM_0x%04x', $type);
+            $this->_info['adobe']['raw'][$label] = array();
+            $this->_info['adobe']['raw'][$label]['type'] = $type;
+            $this->_info['adobe']['raw'][$label]['header'] = $header;
+            $this->_info['adobe']['raw'][$label]['data'] =& $this->_getFixedString($data, $basePos, $length);
+
+            $pos = $basePos + $length + ($length % 2); // Even padding
+        }
+
+    }
+
+    /*************************************************************/
+    function _readIPTC(&$data, $pos = 0)
+    {
+        $totalLength = strlen($data);
+
+        $IPTCTags =& $this->_iptcTagNames();
+
+        while ($pos < ($totalLength - 5)) {
+            $signature = $this->_getShort($data, $pos);
+            if ($signature != 0x1C02)
+                return $pos;
+            $pos += 2;
+
+            $type = $this->_getByte($data, $pos);
+            $pos += 1;
+            $length = $this->_getShort($data, $pos);
+            $pos += 2;
+
+            $basePos = $pos;
+            $label = '';
+
+            if (isset($IPTCTags[$type])) {
+                $label = $IPTCTags[$type];
+            }
+            else {
+                $label = sprintf('IPTC_0x%02x', $type);
+            }
+
+            if ($label != '') {
+                if (isset($this->_info['iptc'][$label])) {
+                    if (!is_array($this->_info['iptc'][$label])) {
+                        $aux = array();
+                        $aux[0] = $this->_info['iptc'][$label];
+                        $this->_info['iptc'][$label] = $aux;
+                    }
+                    $this->_info['iptc'][$label][ count($this->_info['iptc'][$label]) ] = $this->_getFixedString($data, $pos, $length);
+                }
+                else {
+                    $this->_info['iptc'][$label] = $this->_getFixedString($data, $pos, $length);
+                }
+            }
+
+            $pos = $basePos + $length; // No padding
+        }
+        return $pos;
+    }
+
+    /*************************************************************/
+    function & _createMarkerAdobe()
+    {
+        if (isset($this->_info['iptc'])) {
+            if (!isset($this->_info['adobe'])) {
+                $this->_info['adobe'] = array();
+            }
+            if (!isset($this->_info['adobe']['raw'])) {
+                $this->_info['adobe']['raw'] = array();
+            }
+            if (!isset($this->_info['adobe']['raw']['8BIM_0x0404'])) {
+                $this->_info['adobe']['raw']['8BIM_0x0404'] = array();
+            }
+            $this->_info['adobe']['raw']['8BIM_0x0404']['type'] = 0x0404;
+            $this->_info['adobe']['raw']['8BIM_0x0404']['header'] = "Caption";
+            $this->_info['adobe']['raw']['8BIM_0x0404']['data'] =& $this->_writeIPTC();
+        }
+
+        if (isset($this->_info['adobe']['raw']) && (count($this->_info['adobe']['raw']) > 0)) {
+            $data = "Photoshop 3.0\0";
+            $pos = 14;
+
+            reset($this->_info['adobe']['raw']);
+            while (list($key) = each($this->_info['adobe']['raw'])) {
+                $pos = $this->_write8BIM(
+                            $data,
+                            $pos,
+                            $this->_info['adobe']['raw'][$key]['type'],
+                            $this->_info['adobe']['raw'][$key]['header'],
+                            $this->_info['adobe']['raw'][$key]['data'] );
+            }
+        }
+
+        return $data;
+    }
+
+    /*************************************************************/
+    function _write8BIM(&$data, $pos, $type, $header, &$value)
+    {
+        $signature = "8BIM";
+
+        $pos = $this->_putString($data, $pos, $signature);
+        $pos = $this->_putShort($data, $pos, $type);
+
+        $len = strlen($header);
+
+        $pos = $this->_putByte($data, $pos, $len);
+        $pos = $this->_putString($data, $pos, $header);
+        if (($len % 2) == 0) {  // Even padding, including the length byte
+            $pos = $this->_putByte($data, $pos, 0);
+        }
+
+        $len = strlen($value);
+        $pos = $this->_putLong($data, $pos, $len);
+        $pos = $this->_putString($data, $pos, $value);
+        if (($len % 2) != 0) {  // Even padding
+            $pos = $this->_putByte($data, $pos, 0);
+        }
+        return $pos;
+    }
+
+    /*************************************************************/
+    function & _writeIPTC()
+    {
+        $data = " ";
+        $pos = 0;
+
+        $IPTCNames =& $this->_iptcNameTags();
+
+        reset($this->_info['iptc']);
+
+
+        while (list($label) = each($this->_info['iptc'])) {
+            $value =& $this->_info['iptc'][$label];
+            $type = -1;
+
+            if (isset($IPTCNames[$label])) {
+                $type = $IPTCNames[$label];
+            }
+            elseif (substr($label, 0, 7) == "IPTC_0x") {
+                $type = hexdec(substr($label, 7, 2));
+            }
+
+            if ($type != -1) {
+                if (is_array($value)) {
+                    for ($i = 0; $i < count($value); $i++) {
+                        $pos = $this->_writeIPTCEntry($data, $pos, $type, $value[$i]);
+                    }
+                }
+                else {
+                    $pos = $this->_writeIPTCEntry($data, $pos, $type, $value);
+                }
+            }
+        }
+
+        return $data;
+    }
+
+    /*************************************************************/
+    function _writeIPTCEntry(&$data, $pos, $type, &$value)
+    {
+        $pos = $this->_putShort($data, $pos, 0x1C02);
+        $pos = $this->_putByte($data, $pos, $type);
+        $pos = $this->_putShort($data, $pos, strlen($value));
+        $pos = $this->_putString($data, $pos, $value);
+
+        return $pos;
+    }
+
+    /*************************************************************/
+    function _exifTagNames($mode)
+    {
+        $tags = array();
+
+        if ($mode == 'ifd0') {
+            $tags[0x010E] = 'ImageDescription';
+            $tags[0x010F] = 'Make';
+            $tags[0x0110] = 'Model';
+            $tags[0x0112] = 'Orientation';
+            $tags[0x011A] = 'XResolution';
+            $tags[0x011B] = 'YResolution';
+            $tags[0x0128] = 'ResolutionUnit';
+            $tags[0x0131] = 'Software';
+            $tags[0x0132] = 'DateTime';
+            $tags[0x013B] = 'Artist';
+            $tags[0x013E] = 'WhitePoint';
+            $tags[0x013F] = 'PrimaryChromaticities';
+            $tags[0x0211] = 'YCbCrCoefficients';
+            $tags[0x0212] = 'YCbCrSubSampling';
+            $tags[0x0213] = 'YCbCrPositioning';
+            $tags[0x0214] = 'ReferenceBlackWhite';
+            $tags[0x8298] = 'Copyright';
+            $tags[0x8769] = 'ExifIFDOffset';
+            $tags[0x8825] = 'GPSIFDOffset';
+        }
+        if ($mode == 'ifd1') {
+            $tags[0x00FE] = 'TIFFNewSubfileType';
+            $tags[0x00FF] = 'TIFFSubfileType';
+            $tags[0x0100] = 'TIFFImageWidth';
+            $tags[0x0101] = 'TIFFImageHeight';
+            $tags[0x0102] = 'TIFFBitsPerSample';
+            $tags[0x0103] = 'TIFFCompression';
+            $tags[0x0106] = 'TIFFPhotometricInterpretation';
+            $tags[0x0107] = 'TIFFThreshholding';
+            $tags[0x0108] = 'TIFFCellWidth';
+            $tags[0x0109] = 'TIFFCellLength';
+            $tags[0x010A] = 'TIFFFillOrder';
+            $tags[0x010E] = 'TIFFImageDescription';
+            $tags[0x010F] = 'TIFFMake';
+            $tags[0x0110] = 'TIFFModel';
+            $tags[0x0111] = 'TIFFStripOffsets';
+            $tags[0x0112] = 'TIFFOrientation';
+            $tags[0x0115] = 'TIFFSamplesPerPixel';
+            $tags[0x0116] = 'TIFFRowsPerStrip';
+            $tags[0x0117] = 'TIFFStripByteCounts';
+            $tags[0x0118] = 'TIFFMinSampleValue';
+            $tags[0x0119] = 'TIFFMaxSampleValue';
+            $tags[0x011A] = 'TIFFXResolution';
+            $tags[0x011B] = 'TIFFYResolution';
+            $tags[0x011C] = 'TIFFPlanarConfiguration';
+            $tags[0x0122] = 'TIFFGrayResponseUnit';
+            $tags[0x0123] = 'TIFFGrayResponseCurve';
+            $tags[0x0128] = 'TIFFResolutionUnit';
+            $tags[0x0131] = 'TIFFSoftware';
+            $tags[0x0132] = 'TIFFDateTime';
+            $tags[0x013B] = 'TIFFArtist';
+            $tags[0x013C] = 'TIFFHostComputer';
+            $tags[0x0140] = 'TIFFColorMap';
+            $tags[0x0152] = 'TIFFExtraSamples';
+            $tags[0x0201] = 'TIFFJFIFOffset';
+            $tags[0x0202] = 'TIFFJFIFLength';
+            $tags[0x0211] = 'TIFFYCbCrCoefficients';
+            $tags[0x0212] = 'TIFFYCbCrSubSampling';
+            $tags[0x0213] = 'TIFFYCbCrPositioning';
+            $tags[0x0214] = 'TIFFReferenceBlackWhite';
+            $tags[0x8298] = 'TIFFCopyright';
+            $tags[0x9286] = 'TIFFUserComment';
+        }
+        elseif ($mode == 'exif') {
+            $tags[0x829A] = 'ExposureTime';
+            $tags[0x829D] = 'FNumber';
+            $tags[0x8822] = 'ExposureProgram';
+            $tags[0x8824] = 'SpectralSensitivity';
+            $tags[0x8827] = 'ISOSpeedRatings';
+            $tags[0x8828] = 'OECF';
+            $tags[0x9000] = 'EXIFVersion';
+            $tags[0x9003] = 'DatetimeOriginal';
+            $tags[0x9004] = 'DatetimeDigitized';
+            $tags[0x9101] = 'ComponentsConfiguration';
+            $tags[0x9102] = 'CompressedBitsPerPixel';
+            $tags[0x9201] = 'ShutterSpeedValue';
+            $tags[0x9202] = 'ApertureValue';
+            $tags[0x9203] = 'BrightnessValue';
+            $tags[0x9204] = 'ExposureBiasValue';
+            $tags[0x9205] = 'MaxApertureValue';
+            $tags[0x9206] = 'SubjectDistance';
+            $tags[0x9207] = 'MeteringMode';
+            $tags[0x9208] = 'LightSource';
+            $tags[0x9209] = 'Flash';
+            $tags[0x920A] = 'FocalLength';
+            $tags[0x927C] = 'MakerNote';
+            $tags[0x9286] = 'UserComment';
+            $tags[0x9290] = 'SubSecTime';
+            $tags[0x9291] = 'SubSecTimeOriginal';
+            $tags[0x9292] = 'SubSecTimeDigitized';
+            $tags[0xA000] = 'FlashPixVersion';
+            $tags[0xA001] = 'ColorSpace';
+            $tags[0xA002] = 'PixelXDimension';
+            $tags[0xA003] = 'PixelYDimension';
+            $tags[0xA004] = 'RelatedSoundFile';
+            $tags[0xA005] = 'InteropIFDOffset';
+            $tags[0xA20B] = 'FlashEnergy';
+            $tags[0xA20C] = 'SpatialFrequencyResponse';
+            $tags[0xA20E] = 'FocalPlaneXResolution';
+            $tags[0xA20F] = 'FocalPlaneYResolution';
+            $tags[0xA210] = 'FocalPlaneResolutionUnit';
+            $tags[0xA214] = 'SubjectLocation';
+            $tags[0xA215] = 'ExposureIndex';
+            $tags[0xA217] = 'SensingMethod';
+            $tags[0xA300] = 'FileSource';
+            $tags[0xA301] = 'SceneType';
+            $tags[0xA302] = 'CFAPattern';
+        }
+        elseif ($mode == 'interop') {
+            $tags[0x0001] = 'InteroperabilityIndex';
+            $tags[0x0002] = 'InteroperabilityVersion';
+            $tags[0x1000] = 'RelatedImageFileFormat';
+            $tags[0x1001] = 'RelatedImageWidth';
+            $tags[0x1002] = 'RelatedImageLength';
+        }
+        elseif ($mode == 'gps') {
+            $tags[0x0000] = 'GPSVersionID';
+            $tags[0x0001] = 'GPSLatitudeRef';
+            $tags[0x0002] = 'GPSLatitude';
+            $tags[0x0003] = 'GPSLongitudeRef';
+            $tags[0x0004] = 'GPSLongitude';
+            $tags[0x0005] = 'GPSAltitudeRef';
+            $tags[0x0006] = 'GPSAltitude';
+            $tags[0x0007] = 'GPSTimeStamp';
+            $tags[0x0008] = 'GPSSatellites';
+            $tags[0x0009] = 'GPSStatus';
+            $tags[0x000A] = 'GPSMeasureMode';
+            $tags[0x000B] = 'GPSDOP';
+            $tags[0x000C] = 'GPSSpeedRef';
+            $tags[0x000D] = 'GPSSpeed';
+            $tags[0x000E] = 'GPSTrackRef';
+            $tags[0x000F] = 'GPSTrack';
+            $tags[0x0010] = 'GPSImgDirectionRef';
+            $tags[0x0011] = 'GPSImgDirection';
+            $tags[0x0012] = 'GPSMapDatum';
+            $tags[0x0013] = 'GPSDestLatitudeRef';
+            $tags[0x0014] = 'GPSDestLatitude';
+            $tags[0x0015] = 'GPSDestLongitudeRef';
+            $tags[0x0016] = 'GPSDestLongitude';
+            $tags[0x0017] = 'GPSDestBearingRef';
+            $tags[0x0018] = 'GPSDestBearing';
+            $tags[0x0019] = 'GPSDestDistanceRef';
+            $tags[0x001A] = 'GPSDestDistance';
+        }
+
+        return $tags;
+    }
+
+    /*************************************************************/
+    function _exifTagTypes($mode)
+    {
+        $tags = array();
+
+        if ($mode == 'ifd0') {
+            $tags[0x010E] = array(2, 0); // ImageDescription -> ASCII, Any
+            $tags[0x010F] = array(2, 0); // Make -> ASCII, Any
+            $tags[0x0110] = array(2, 0); // Model -> ASCII, Any
+            $tags[0x0112] = array(3, 1); // Orientation -> SHORT, 1
+            $tags[0x011A] = array(5, 1); // XResolution -> RATIONAL, 1
+            $tags[0x011B] = array(5, 1); // YResolution -> RATIONAL, 1
+            $tags[0x0128] = array(3, 1); // ResolutionUnit -> SHORT
+            $tags[0x0131] = array(2, 0); // Software -> ASCII, Any
+            $tags[0x0132] = array(2, 20); // DateTime -> ASCII, 20
+            $tags[0x013B] = array(2, 0); // Artist -> ASCII, Any
+            $tags[0x013E] = array(5, 2); // WhitePoint -> RATIONAL, 2
+            $tags[0x013F] = array(5, 6); // PrimaryChromaticities -> RATIONAL, 6
+            $tags[0x0211] = array(5, 3); // YCbCrCoefficients -> RATIONAL, 3
+            $tags[0x0212] = array(3, 2); // YCbCrSubSampling -> SHORT, 2
+            $tags[0x0213] = array(3, 1); // YCbCrPositioning -> SHORT, 1
+            $tags[0x0214] = array(5, 6); // ReferenceBlackWhite -> RATIONAL, 6
+            $tags[0x8298] = array(2, 0); // Copyright -> ASCII, Any
+            $tags[0x8769] = array(4, 1); // ExifIFDOffset -> LONG, 1
+            $tags[0x8825] = array(4, 1); // GPSIFDOffset -> LONG, 1
+        }
+        if ($mode == 'ifd1') {
+            $tags[0x00FE] = array(4, 1); // TIFFNewSubfileType -> LONG, 1
+            $tags[0x00FF] = array(3, 1); // TIFFSubfileType -> SHORT, 1
+            $tags[0x0100] = array(4, 1); // TIFFImageWidth -> LONG (or SHORT), 1
+            $tags[0x0101] = array(4, 1); // TIFFImageHeight -> LONG (or SHORT), 1
+            $tags[0x0102] = array(3, 3); // TIFFBitsPerSample -> SHORT, 3
+            $tags[0x0103] = array(3, 1); // TIFFCompression -> SHORT, 1
+            $tags[0x0106] = array(3, 1); // TIFFPhotometricInterpretation -> SHORT, 1
+            $tags[0x0107] = array(3, 1); // TIFFThreshholding -> SHORT, 1
+            $tags[0x0108] = array(3, 1); // TIFFCellWidth -> SHORT, 1
+            $tags[0x0109] = array(3, 1); // TIFFCellLength -> SHORT, 1
+            $tags[0x010A] = array(3, 1); // TIFFFillOrder -> SHORT, 1
+            $tags[0x010E] = array(2, 0); // TIFFImageDescription -> ASCII, Any
+            $tags[0x010F] = array(2, 0); // TIFFMake -> ASCII, Any
+            $tags[0x0110] = array(2, 0); // TIFFModel -> ASCII, Any
+            $tags[0x0111] = array(4, 0); // TIFFStripOffsets -> LONG (or SHORT), Any (one per strip)
+            $tags[0x0112] = array(3, 1); // TIFFOrientation -> SHORT, 1
+            $tags[0x0115] = array(3, 1); // TIFFSamplesPerPixel -> SHORT, 1
+            $tags[0x0116] = array(4, 1); // TIFFRowsPerStrip -> LONG (or SHORT), 1
+            $tags[0x0117] = array(4, 0); // TIFFStripByteCounts -> LONG (or SHORT), Any (one per strip)
+            $tags[0x0118] = array(3, 0); // TIFFMinSampleValue -> SHORT, Any (SamplesPerPixel)
+            $tags[0x0119] = array(3, 0); // TIFFMaxSampleValue -> SHORT, Any (SamplesPerPixel)
+            $tags[0x011A] = array(5, 1); // TIFFXResolution -> RATIONAL, 1
+            $tags[0x011B] = array(5, 1); // TIFFYResolution -> RATIONAL, 1
+            $tags[0x011C] = array(3, 1); // TIFFPlanarConfiguration -> SHORT, 1
+            $tags[0x0122] = array(3, 1); // TIFFGrayResponseUnit -> SHORT, 1
+            $tags[0x0123] = array(3, 0); // TIFFGrayResponseCurve -> SHORT, Any (2^BitsPerSample)
+            $tags[0x0128] = array(3, 1); // TIFFResolutionUnit -> SHORT, 1
+            $tags[0x0131] = array(2, 0); // TIFFSoftware -> ASCII, Any
+            $tags[0x0132] = array(2, 20); // TIFFDateTime -> ASCII, 20
+            $tags[0x013B] = array(2, 0); // TIFFArtist -> ASCII, Any
+            $tags[0x013C] = array(2, 0); // TIFFHostComputer -> ASCII, Any
+            $tags[0x0140] = array(3, 0); // TIFFColorMap -> SHORT, Any (3 * 2^BitsPerSample)
+            $tags[0x0152] = array(3, 0); // TIFFExtraSamples -> SHORT, Any (SamplesPerPixel - 3)
+            $tags[0x0201] = array(4, 1); // TIFFJFIFOffset -> LONG, 1
+            $tags[0x0202] = array(4, 1); // TIFFJFIFLength -> LONG, 1
+            $tags[0x0211] = array(5, 3); // TIFFYCbCrCoefficients -> RATIONAL, 3
+            $tags[0x0212] = array(3, 2); // TIFFYCbCrSubSampling -> SHORT, 2
+            $tags[0x0213] = array(3, 1); // TIFFYCbCrPositioning -> SHORT, 1
+            $tags[0x0214] = array(5, 6); // TIFFReferenceBlackWhite -> RATIONAL, 6
+            $tags[0x8298] = array(2, 0); // TIFFCopyright -> ASCII, Any
+            $tags[0x9286] = array(2, 0); // TIFFUserComment -> ASCII, Any
+        }
+        elseif ($mode == 'exif') {
+            $tags[0x829A] = array(5, 1); // ExposureTime -> RATIONAL, 1
+            $tags[0x829D] = array(5, 1); // FNumber -> RATIONAL, 1
+            $tags[0x8822] = array(3, 1); // ExposureProgram -> SHORT, 1
+            $tags[0x8824] = array(2, 0); // SpectralSensitivity -> ASCII, Any
+            $tags[0x8827] = array(3, 0); // ISOSpeedRatings -> SHORT, Any
+            $tags[0x8828] = array(7, 0); // OECF -> UNDEFINED, Any
+            $tags[0x9000] = array(7, 4); // EXIFVersion -> UNDEFINED, 4
+            $tags[0x9003] = array(2, 20); // DatetimeOriginal -> ASCII, 20
+            $tags[0x9004] = array(2, 20); // DatetimeDigitized -> ASCII, 20
+            $tags[0x9101] = array(7, 4); // ComponentsConfiguration -> UNDEFINED, 4
+            $tags[0x9102] = array(5, 1); // CompressedBitsPerPixel -> RATIONAL, 1
+            $tags[0x9201] = array(10, 1); // ShutterSpeedValue -> SRATIONAL, 1
+            $tags[0x9202] = array(5, 1); // ApertureValue -> RATIONAL, 1
+            $tags[0x9203] = array(10, 1); // BrightnessValue -> SRATIONAL, 1
+            $tags[0x9204] = array(10, 1); // ExposureBiasValue -> SRATIONAL, 1
+            $tags[0x9205] = array(5, 1); // MaxApertureValue -> RATIONAL, 1
+            $tags[0x9206] = array(5, 1); // SubjectDistance -> RATIONAL, 1
+            $tags[0x9207] = array(3, 1); // MeteringMode -> SHORT, 1
+            $tags[0x9208] = array(3, 1); // LightSource -> SHORT, 1
+            $tags[0x9209] = array(3, 1); // Flash -> SHORT, 1
+            $tags[0x920A] = array(5, 1); // FocalLength -> RATIONAL, 1
+            $tags[0x927C] = array(7, 0); // MakerNote -> UNDEFINED, Any
+            $tags[0x9286] = array(7, 0); // UserComment -> UNDEFINED, Any
+            $tags[0x9290] = array(2, 0); // SubSecTime -> ASCII, Any
+            $tags[0x9291] = array(2, 0); // SubSecTimeOriginal -> ASCII, Any
+            $tags[0x9292] = array(2, 0); // SubSecTimeDigitized -> ASCII, Any
+            $tags[0xA000] = array(7, 4); // FlashPixVersion -> UNDEFINED, 4
+            $tags[0xA001] = array(3, 1); // ColorSpace -> SHORT, 1
+            $tags[0xA002] = array(4, 1); // PixelXDimension -> LONG (or SHORT), 1
+            $tags[0xA003] = array(4, 1); // PixelYDimension -> LONG (or SHORT), 1
+            $tags[0xA004] = array(2, 13); // RelatedSoundFile -> ASCII, 13
+            $tags[0xA005] = array(4, 1); // InteropIFDOffset -> LONG, 1
+            $tags[0xA20B] = array(5, 1); // FlashEnergy -> RATIONAL, 1
+            $tags[0xA20C] = array(7, 0); // SpatialFrequencyResponse -> UNDEFINED, Any
+            $tags[0xA20E] = array(5, 1); // FocalPlaneXResolution -> RATIONAL, 1
+            $tags[0xA20F] = array(5, 1); // FocalPlaneYResolution -> RATIONAL, 1
+            $tags[0xA210] = array(3, 1); // FocalPlaneResolutionUnit -> SHORT, 1
+            $tags[0xA214] = array(3, 2); // SubjectLocation -> SHORT, 2
+            $tags[0xA215] = array(5, 1); // ExposureIndex -> RATIONAL, 1
+            $tags[0xA217] = array(3, 1); // SensingMethod -> SHORT, 1
+            $tags[0xA300] = array(7, 1); // FileSource -> UNDEFINED, 1
+            $tags[0xA301] = array(7, 1); // SceneType -> UNDEFINED, 1
+            $tags[0xA302] = array(7, 0); // CFAPattern -> UNDEFINED, Any
+        }
+        elseif ($mode == 'interop') {
+            $tags[0x0001] = array(2, 0); // InteroperabilityIndex -> ASCII, Any
+            $tags[0x0002] = array(7, 4); // InteroperabilityVersion -> UNKNOWN, 4
+            $tags[0x1000] = array(2, 0); // RelatedImageFileFormat -> ASCII, Any
+            $tags[0x1001] = array(4, 1); // RelatedImageWidth -> LONG (or SHORT), 1
+            $tags[0x1002] = array(4, 1); // RelatedImageLength -> LONG (or SHORT), 1
+        }
+        elseif ($mode == 'gps') {
+            $tags[0x0000] = array(1, 4); // GPSVersionID -> BYTE, 4
+            $tags[0x0001] = array(2, 2); // GPSLatitudeRef -> ASCII, 2
+            $tags[0x0002] = array(5, 3); // GPSLatitude -> RATIONAL, 3
+            $tags[0x0003] = array(2, 2); // GPSLongitudeRef -> ASCII, 2
+            $tags[0x0004] = array(5, 3); // GPSLongitude -> RATIONAL, 3
+            $tags[0x0005] = array(2, 2); // GPSAltitudeRef -> ASCII, 2
+            $tags[0x0006] = array(5, 1); // GPSAltitude -> RATIONAL, 1
+            $tags[0x0007] = array(5, 3); // GPSTimeStamp -> RATIONAL, 3
+            $tags[0x0008] = array(2, 0); // GPSSatellites -> ASCII, Any
+            $tags[0x0009] = array(2, 2); // GPSStatus -> ASCII, 2
+            $tags[0x000A] = array(2, 2); // GPSMeasureMode -> ASCII, 2
+            $tags[0x000B] = array(5, 1); // GPSDOP -> RATIONAL, 1
+            $tags[0x000C] = array(2, 2); // GPSSpeedRef -> ASCII, 2
+            $tags[0x000D] = array(5, 1); // GPSSpeed -> RATIONAL, 1
+            $tags[0x000E] = array(2, 2); // GPSTrackRef -> ASCII, 2
+            $tags[0x000F] = array(5, 1); // GPSTrack -> RATIONAL, 1
+            $tags[0x0010] = array(2, 2); // GPSImgDirectionRef -> ASCII, 2
+            $tags[0x0011] = array(5, 1); // GPSImgDirection -> RATIONAL, 1
+            $tags[0x0012] = array(2, 0); // GPSMapDatum -> ASCII, Any
+            $tags[0x0013] = array(2, 2); // GPSDestLatitudeRef -> ASCII, 2
+            $tags[0x0014] = array(5, 3); // GPSDestLatitude -> RATIONAL, 3
+            $tags[0x0015] = array(2, 2); // GPSDestLongitudeRef -> ASCII, 2
+            $tags[0x0016] = array(5, 3); // GPSDestLongitude -> RATIONAL, 3
+            $tags[0x0017] = array(2, 2); // GPSDestBearingRef -> ASCII, 2
+            $tags[0x0018] = array(5, 1); // GPSDestBearing -> RATIONAL, 1
+            $tags[0x0019] = array(2, 2); // GPSDestDistanceRef -> ASCII, 2
+            $tags[0x001A] = array(5, 1); // GPSDestDistance -> RATIONAL, 1
+        }
+
+        return $tags;
+    }
+
+    /*************************************************************/
+    function _exifNameTags($mode)
+    {
+        $tags = $this->_exifTagNames($mode);
+        return $this->_names2Tags($tags);
+    }
+
+    /*************************************************************/
+    function _iptcTagNames()
+    {
+        $tags = array();
+        $tags[0x14] = 'SuplementalCategories';
+        $tags[0x19] = 'Keywords';
+        $tags[0x78] = 'Caption';
+        $tags[0x7A] = 'CaptionWriter';
+        $tags[0x69] = 'Headline';
+        $tags[0x28] = 'SpecialInstructions';
+        $tags[0x0F] = 'Category';
+        $tags[0x50] = 'Byline';
+        $tags[0x55] = 'BylineTitle';
+        $tags[0x6E] = 'Credit';
+        $tags[0x73] = 'Source';
+        $tags[0x74] = 'CopyrightNotice';
+        $tags[0x05] = 'ObjectName';
+        $tags[0x5A] = 'City';
+        $tags[0x5C] = 'Sublocation';
+        $tags[0x5F] = 'ProvinceState';
+        $tags[0x65] = 'CountryName';
+        $tags[0x67] = 'OriginalTransmissionReference';
+        $tags[0x37] = 'DateCreated';
+        $tags[0x0A] = 'CopyrightFlag';
+
+        return $tags;
+    }
+
+    /*************************************************************/
+    function & _iptcNameTags()
+    {
+        $tags = $this->_iptcTagNames();
+        return $this->_names2Tags($tags);
+    }
+
+    /*************************************************************/
+    function _names2Tags($tags2Names)
+    {
+        $names2Tags = array();
+        reset($tags2Names);
+        while (list($tag, $name) = each($tags2Names)) {
+            $names2Tags[$name] = $tag;
+        }
+
+        return $names2Tags;
+    }
+
+    /*************************************************************/
+    function _getByte(&$data, $pos)
+    {
+        return ord($data{$pos});
+    }
+
+    /*************************************************************/
+    function _putByte(&$data, $pos, $val)
+    {
+        $val = intval($val);
+
+        $data{$pos} = chr($val);
+
+        return $pos + 1;
+    }
+
+    /*************************************************************/
+    function _getShort(&$data, $pos, $bigEndian = true)
+    {
+        if ($bigEndian) {
+            return (ord($data{$pos}) << 8)
+                   + ord($data{$pos + 1});
+        }
+        else {
+            return ord($data{$pos})
+                   + (ord($data{$pos + 1}) << 8);
+        }
+    }
+
+    /*************************************************************/
+    function _putShort(&$data, $pos = 0, $val, $bigEndian = true)
+    {
+        $val = intval($val);
+
+        if ($bigEndian) {
+            $data{$pos + 0} = chr(($val & 0x0000FF00) >> 8);
+            $data{$pos + 1} = chr(($val & 0x000000FF) >> 0);
+        }
+        else {
+            $data{$pos + 0} = chr(($val & 0x00FF) >> 0);
+            $data{$pos + 1} = chr(($val & 0xFF00) >> 8);
+        }
+
+        return $pos + 2;
+    }
+
+    /*************************************************************/
+    function _getLong(&$data, $pos, $bigEndian = true)
+    {
+        if ($bigEndian) {
+            return (ord($data{$pos}) << 24)
+                   + (ord($data{$pos + 1}) << 16)
+                   + (ord($data{$pos + 2}) << 8)
+                   + ord($data{$pos + 3});
+        }
+        else {
+            return ord($data{$pos})
+                   + (ord($data{$pos + 1}) << 8)
+                   + (ord($data{$pos + 2}) << 16)
+                   + (ord($data{$pos + 3}) << 24);
+        }
+    }
+
+    /*************************************************************/
+    function _putLong(&$data, $pos, $val, $bigEndian = true)
+    {
+        $val = intval($val);
+
+        if ($bigEndian) {
+            $data{$pos + 0} = chr(($val & 0xFF000000) >> 24);
+            $data{$pos + 1} = chr(($val & 0x00FF0000) >> 16);
+            $data{$pos + 2} = chr(($val & 0x0000FF00) >> 8);
+            $data{$pos + 3} = chr(($val & 0x000000FF) >> 0);
+        }
+        else {
+            $data{$pos + 0} = chr(($val & 0x000000FF) >> 0);
+            $data{$pos + 1} = chr(($val & 0x0000FF00) >> 8);
+            $data{$pos + 2} = chr(($val & 0x00FF0000) >> 16);
+            $data{$pos + 3} = chr(($val & 0xFF000000) >> 24);
+        }
+
+        return $pos + 4;
+    }
+
+    /*************************************************************/
+    function & _getNullString(&$data, $pos)
+    {
+        $str = '';
+        $max = strlen($data);
+
+        while ($pos < $max) {
+            if (ord($data{$pos}) == 0) {
+                return $str;
+            }
+            else {
+                $str .= $data{$pos};
+            }
+            $pos++;
+        }
+
+        return $str;
+    }
+
+    /*************************************************************/
+    function & _getFixedString(&$data, $pos, $length = -1)
+    {
+        if ($length == -1) {
+            $length = strlen($data) - $pos;
+        }
+
+        return substr($data, $pos, $length);
+    }
+
+    /*************************************************************/
+    function _putString(&$data, $pos, &$str)
+    {
+        $len = strlen($str);
+        for ($i = 0; $i < $len; $i++) {
+          $data{$pos + $i} = $str{$i};
+        }
+
+        return $pos + $len;
+    }
+
+    /*************************************************************/
+    function _hexDump(&$data, $start = 0, $length = -1)
+    {
+        if (($length == -1) || (($length + $start) > strlen($data))) {
+            $end = strlen($data);
+        }
+        else {
+            $end = $start + $length;
+        }
+
+        $ascii = '';
+        $count = 0;
+
+        echo "<tt>\n";
+
+        while ($start < $end) {
+            if (($count % 16) == 0) {
+                echo sprintf('%04d', $count) . ': ';
+            }
+
+            $c = ord($data{$start});
+            $count++;
+            $start++;
+
+            $aux = dechex($c);
+            if (strlen($aux) == 1)
+                echo '0';
+            echo $aux . ' ';
+
+            if ($c == 60)
+                $ascii .= '&lt;';
+            elseif ($c == 62)
+                $ascii .= '&gt;';
+            elseif ($c == 32)
+                $ascii .= '&nbsp;';
+            elseif ($c > 32)
+                $ascii .= chr($c);
+            else
+                $ascii .= '.';
+
+            if (($count % 4) == 0) {
+                echo ' - ';
+            }
+
+            if (($count % 16) == 0) {
+                echo ': ' . $ascii . "<br>\n";
+                $ascii = '';
+            }
+        }
+
+        if ($ascii != '') {
+            while (($count % 16) != 0) {
+                echo '-- ';
+                $count++;
+                if (($count % 4) == 0) {
+                    echo ' - ';
+                }
+            }
+            echo ': ' . $ascii . "<br>\n";
+        }
+
+        echo "</tt>\n";
+    }
+
+/*****************************************************************/
+}
+
+/* vim: set expandtab tabstop=4 shiftwidth=4: */
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/SimplePie.php b/mod/dokuwiki/vendors/dokuwiki/inc/SimplePie.php
new file mode 100644
index 000000000..1c97e2384
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/SimplePie.php
@@ -0,0 +1,10849 @@
+<?php
+/**
+ * SimplePie
+ *
+ * A PHP-Based RSS and Atom Feed Framework.
+ * Takes the hard work out of managing a complete RSS/Atom solution.
+ *
+ * Copyright (c) 2004-2007, Ryan Parman and Geoffrey Sneddon
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ * 	* Redistributions of source code must retain the above copyright notice, this list of
+ * 	  conditions and the following disclaimer.
+ *
+ * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+ * 	  of conditions and the following disclaimer in the documentation and/or other materials
+ * 	  provided with the distribution.
+ *
+ * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+ * 	  to endorse or promote products derived from this software without specific prior
+ * 	  written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+ * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @package SimplePie
+ * @version "Razzleberry"
+ * @copyright 2004-2007 Ryan Parman, Geoffrey Sneddon
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @link http://simplepie.org/ SimplePie
+ * @link http://simplepie.org/support/ Please submit all bug reports and feature requests to the SimplePie forums
+ * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+ * @todo phpDoc comments
+ */
+
+/**
+ * SimplePie Name
+ */
+define('SIMPLEPIE_NAME', 'SimplePie');
+
+/**
+ * SimplePie Version
+ */
+define('SIMPLEPIE_VERSION', '1.0.1');
+
+/**
+ * SimplePie Build
+ * @todo Hardcode for release (there's no need to have to call SimplePie_Misc::parse_date() only every load of simplepie.inc)
+ */
+define('SIMPLEPIE_BUILD', 20070719221955);
+
+/**
+ * SimplePie Website URL
+ */
+define('SIMPLEPIE_URL', 'http://simplepie.org/');
+
+/**
+ * SimplePie Useragent
+ * @see SimplePie::set_useragent()
+ */
+define('SIMPLEPIE_USERAGENT', SIMPLEPIE_NAME . '/' . SIMPLEPIE_VERSION . ' (Feed Parser; ' . SIMPLEPIE_URL . '; Allow like Gecko) Build/' . SIMPLEPIE_BUILD);
+
+/**
+ * SimplePie Linkback
+ */
+define('SIMPLEPIE_LINKBACK', '<a href="' . SIMPLEPIE_URL . '" title="' . SIMPLEPIE_NAME . ' ' . SIMPLEPIE_VERSION . '">' . SIMPLEPIE_NAME . '</a>');
+
+/**
+ * No Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_NONE', 0);
+
+/**
+ * Feed Link Element Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1);
+
+/**
+ * Local Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2);
+
+/**
+ * Local Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4);
+
+/**
+ * Remote Feed Extension Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8);
+
+/**
+ * Remote Feed Body Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16);
+
+/**
+ * All Feed Autodiscovery
+ * @see SimplePie::set_autodiscovery_level()
+ */
+define('SIMPLEPIE_LOCATOR_ALL', 31);
+
+/**
+ * No known feed type
+ */
+define('SIMPLEPIE_TYPE_NONE', 0);
+
+/**
+ * RSS 0.90
+ */
+define('SIMPLEPIE_TYPE_RSS_090', 1);
+
+/**
+ * RSS 0.91 (Netscape)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2);
+
+/**
+ * RSS 0.91 (Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4);
+
+/**
+ * RSS 0.91 (both Netscape and Userland)
+ */
+define('SIMPLEPIE_TYPE_RSS_091', 6);
+
+/**
+ * RSS 0.92
+ */
+define('SIMPLEPIE_TYPE_RSS_092', 8);
+
+/**
+ * RSS 0.93
+ */
+define('SIMPLEPIE_TYPE_RSS_093', 16);
+
+/**
+ * RSS 0.94
+ */
+define('SIMPLEPIE_TYPE_RSS_094', 32);
+
+/**
+ * RSS 1.0
+ */
+define('SIMPLEPIE_TYPE_RSS_10', 64);
+
+/**
+ * RSS 2.0
+ */
+define('SIMPLEPIE_TYPE_RSS_20', 128);
+
+/**
+ * RDF-based RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_RDF', 65);
+
+/**
+ * Non-RDF-based RSS (truly intended as syndication format)
+ */
+define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190);
+
+/**
+ * All RSS
+ */
+define('SIMPLEPIE_TYPE_RSS_ALL', 255);
+
+/**
+ * Atom 0.3
+ */
+define('SIMPLEPIE_TYPE_ATOM_03', 256);
+
+/**
+ * Atom 1.0
+ */
+define('SIMPLEPIE_TYPE_ATOM_10', 512);
+
+/**
+ * All Atom
+ */
+define('SIMPLEPIE_TYPE_ATOM_ALL', 768);
+
+/**
+ * All feed types
+ */
+define('SIMPLEPIE_TYPE_ALL', 1023);
+
+/**
+ * No construct
+ */
+define('SIMPLEPIE_CONSTRUCT_NONE', 0);
+
+/**
+ * Text construct
+ */
+define('SIMPLEPIE_CONSTRUCT_TEXT', 1);
+
+/**
+ * HTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_HTML', 2);
+
+/**
+ * XHTML construct
+ */
+define('SIMPLEPIE_CONSTRUCT_XHTML', 4);
+
+/**
+ * base64-encoded construct
+ */
+define('SIMPLEPIE_CONSTRUCT_BASE64', 8);
+
+/**
+ * IRI construct
+ */
+define('SIMPLEPIE_CONSTRUCT_IRI', 16);
+
+/**
+ * A construct that might be HTML
+ */
+define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32);
+
+/**
+ * All constructs
+ */
+define('SIMPLEPIE_CONSTRUCT_ALL', 63);
+
+/**
+ * PCRE for HTML attributes
+ */
+define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)(?:\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[a-z0-9\-._:]*)))?)*)\s*');
+
+/**
+ * PCRE for XML attributes
+ */
+define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*');
+
+/**
+ * XML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace');
+
+/**
+ * Atom 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom');
+
+/**
+ * Atom 0.3 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#');
+
+/**
+ * RDF Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#');
+
+/**
+ * RSS 0.90 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/');
+
+/**
+ * RSS 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/');
+
+/**
+ * RSS 1.0 Content Module Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/');
+
+/**
+ * DC 1.0 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/');
+
+/**
+ * DC 1.1 Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/');
+
+/**
+ * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#');
+
+/**
+ * GeoRSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss');
+
+/**
+ * Media RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/');
+
+/**
+ * iTunes RSS Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
+
+/**
+ * XHTML Namespace
+ */
+define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml');
+
+/**
+ * IANA Link Relations Registry
+ */
+define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/');
+
+/**
+ * Whether we're running on PHP5
+ */
+define('SIMPLEPIE_PHP5', version_compare(PHP_VERSION, '5.0.0', '>='));
+
+/**
+ * SimplePie
+ *
+ * @package SimplePie
+ * @version "Razzleberry"
+ * @copyright 2004-2007 Ryan Parman, Geoffrey Sneddon
+ * @author Ryan Parman
+ * @author Geoffrey Sneddon
+ * @todo Option for type of fetching (cache, not modified header, fetch, etc.)
+ */
+class SimplePie
+{
+	/**
+	 * @var array Raw data
+	 * @access private
+	 */
+	var $data = array();
+
+	/**
+	 * @var mixed Error string
+	 * @access private
+	 */
+	var $error;
+
+	/**
+	 * @var object Instance of SimplePie_Sanitize (or other class)
+	 * @see SimplePie::set_sanitize_class()
+	 * @access private
+	 */
+	var $sanitize;
+
+	/**
+	 * @var string SimplePie Useragent
+	 * @see SimplePie::set_useragent()
+	 * @access private
+	 */
+	var $useragent = SIMPLEPIE_USERAGENT;
+
+	/**
+	 * @var string Feed URL
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	var $feed_url;
+
+	/**
+	 * @var object Instance of SimplePie_File to use as a feed
+	 * @see SimplePie::set_file()
+	 * @access private
+	 */
+	var $file;
+
+	/**
+	 * @var string Raw feed data
+	 * @see SimplePie::set_raw_data()
+	 * @access private
+	 */
+	var $raw_data;
+
+	/**
+	 * @var int Timeout for fetching remote files
+	 * @see SimplePie::set_timeout()
+	 * @access private
+	 */
+	var $timeout = 10;
+
+	/**
+	 * @var bool Forces fsockopen() to be used for remote files instead
+	 * of cURL, even if a new enough version is installed
+	 * @see SimplePie::force_fsockopen()
+	 * @access private
+	 */
+	var $force_fsockopen = false;
+
+	/**
+	 * @var bool Enable/Disable XML dump
+	 * @see SimplePie::enable_xml_dump()
+	 * @access private
+	 */
+	var $xml_dump = false;
+
+	/**
+	 * @var bool Enable/Disable Caching
+	 * @see SimplePie::enable_cache()
+	 * @access private
+	 */
+	var $cache = true;
+
+	/**
+	 * @var int Cache duration (in seconds)
+	 * @see SimplePie::set_cache_duration()
+	 * @access private
+	 */
+	var $cache_duration = 3600;
+
+	/**
+	 * @var int Auto-discovery cache duration (in seconds)
+	 * @see SimplePie::set_autodiscovery_cache_duration()
+	 * @access private
+	 */
+	var $autodiscovery_cache_duration = 604800; // 7 Days.
+
+	/**
+	 * @var string Cache location (relative to executing script)
+	 * @see SimplePie::set_cache_location()
+	 * @access private
+	 */
+	var $cache_location = './cache';
+
+	/**
+	 * @var string Function that creates the cache filename
+	 * @see SimplePie::set_cache_name_function()
+	 * @access private
+	 */
+	var $cache_name_function = 'md5';
+
+	/**
+	 * @var bool Reorder feed by date descending
+	 * @see SimplePie::enable_order_by_date()
+	 * @access private
+	 */
+	var $order_by_date = true;
+
+	/**
+	 * @var mixed Force input encoding to be set to the follow value
+	 * (false, or anything type-cast to false, disables this feature)
+	 * @see SimplePie::set_input_encoding()
+	 * @access private
+	 */
+	var $input_encoding = false;
+
+	/**
+	 * @var int Feed Autodiscovery Level
+	 * @see SimplePie::set_autodiscovery_level()
+	 * @access private
+	 */
+	var $autodiscovery = SIMPLEPIE_LOCATOR_ALL;
+
+	/**
+	 * @var string Class used for caching feeds
+	 * @see SimplePie::set_cache_class()
+	 * @access private
+	 */
+	var $cache_class = 'SimplePie_Cache';
+
+	/**
+	 * @var string Class used for locating feeds
+	 * @see SimplePie::set_locator_class()
+	 * @access private
+	 */
+	var $locator_class = 'SimplePie_Locator';
+
+	/**
+	 * @var string Class used for parsing feeds
+	 * @see SimplePie::set_parser_class()
+	 * @access private
+	 */
+	var $parser_class = 'SimplePie_Parser';
+
+	/**
+	 * @var string Class used for fetching feeds
+	 * @see SimplePie::set_file_class()
+	 * @access private
+	 */
+	var $file_class = 'SimplePie_File';
+
+	/**
+	 * @var string Class used for items
+	 * @see SimplePie::set_item_class()
+	 * @access private
+	 */
+	var $item_class = 'SimplePie_Item';
+
+	/**
+	 * @var string Class used for authors
+	 * @see SimplePie::set_author_class()
+	 * @access private
+	 */
+	var $author_class = 'SimplePie_Author';
+
+	/**
+	 * @var string Class used for categories
+	 * @see SimplePie::set_category_class()
+	 * @access private
+	 */
+	var $category_class = 'SimplePie_Category';
+
+	/**
+	 * @var string Class used for enclosures
+	 * @see SimplePie::set_enclosures_class()
+	 * @access private
+	 */
+	var $enclosure_class = 'SimplePie_Enclosure';
+
+	/**
+	 * @var string Class used for Media RSS <media:text> captions
+	 * @see SimplePie::set_caption_class()
+	 * @access private
+	 */
+	var $caption_class = 'SimplePie_Caption';
+
+	/**
+	 * @var string Class used for Media RSS <media:copyright>
+	 * @see SimplePie::set_copyright_class()
+	 * @access private
+	 */
+	var $copyright_class = 'SimplePie_Copyright';
+
+	/**
+	 * @var string Class used for Media RSS <media:credit>
+	 * @see SimplePie::set_credit_class()
+	 * @access private
+	 */
+	var $credit_class = 'SimplePie_Credit';
+
+	/**
+	 * @var string Class used for Media RSS <media:rating>
+	 * @see SimplePie::set_rating_class()
+	 * @access private
+	 */
+	var $rating_class = 'SimplePie_Rating';
+
+	/**
+	 * @var string Class used for Media RSS <media:restriction>
+	 * @see SimplePie::set_restriction_class()
+	 * @access private
+	 */
+	var $restriction_class = 'SimplePie_Restriction';
+
+	/**
+	 * @var mixed Set javascript query string parameter (false, or
+	 * anything type-cast to false, disables this feature)
+	 * @see SimplePie::set_javascript()
+	 * @access private
+	 */
+	var $javascript = 'js';
+
+	/**
+	 * @var int Maximum number of feeds to check with autodiscovery
+	 * @see SimplePie::set_max_checked_feeds()
+	 * @access private
+	 */
+	var $max_checked_feeds = 10;
+
+	/**
+	 * @var string Web-accessible path to the handler_favicon.php file.
+	 * @see SimplePie::set_favicon_handler()
+	 * @access private
+	 */
+	var $favicon_handler = '';
+
+	/**
+	 * @var string Web-accessible path to the handler_image.php file.
+	 * @see SimplePie::set_image_handler()
+	 * @access private
+	 */
+	var $image_handler = '';
+
+	/**
+	 * @var array Stores the URLs when multiple feeds are being initialized.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	var $multifeed_url = array();
+
+	/**
+	 * @var array Stores SimplePie objects when multiple feeds initialized.
+	 * @access private
+	 */
+	var $multifeed_objects = array();
+
+	/**
+	 * @var array Stores the get_object_vars() array for use with multifeeds.
+	 * @see SimplePie::set_feed_url()
+	 * @access private
+	 */
+	var $config_settings = null;
+
+	/**
+	 * @var array Stores the default attributes to be stripped by strip_attributes().
+	 * @see SimplePie::strip_attributes()
+	 * @access private
+	 */
+	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+
+	/**
+	 * @var array Stores the default tags to be stripped by strip_htmltags().
+	 * @see SimplePie::strip_htmltags()
+	 * @access private
+	 */
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+
+	/**
+	 * The SimplePie class contains feed level data and options
+	 *
+	 * There are two ways that you can create a new SimplePie object. The first
+	 * is by passing a feed URL as a parameter to the SimplePie constructor
+	 * (as well as optionally setting the cache location and cache expiry). This
+	 * will initialise the whole feed with all of the default settings, and you
+	 * can begin accessing methods and properties immediately.
+	 *
+	 * The second way is to create the SimplePie object with no parameters
+	 * at all. This will enable you to set configuration options. After setting
+	 * them, you must initialise the feed using $feed->init(). At that point the
+	 * object's methods and properties will be available to you. This format is
+	 * what is used throughout this documentation.
+	 *
+	 * @access public
+	 * @since 1.0 Preview Release
+	 * @param string $feed_url This is the URL you want to parse.
+	 * @param string $cache_location This is where you want the cache to be stored.
+	 * @param int $cache_duration This is the number of seconds that you want to store the cache file for.
+	 */
+	function SimplePie($feed_url = null, $cache_location = null, $cache_duration = null)
+	{
+		// Other objects, instances created here so we can set options on them
+		$this->sanitize =& new SimplePie_Sanitize;
+
+		// Set options if they're passed to the constructor
+		if ($cache_location !== null)
+		{
+			$this->set_cache_location($cache_location);
+		}
+
+		if ($cache_duration !== null)
+		{
+			$this->set_cache_duration($cache_duration);
+		}
+
+		// Only init the script if we're passed a feed URL
+		if ($feed_url !== null)
+		{
+			$this->set_feed_url($feed_url);
+			$this->init();
+		}
+	}
+
+	/**
+	 * Used for converting object to a string
+	 */
+	function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	/**
+	 * This is the URL of the feed you want to parse.
+	 *
+	 * This allows you to enter the URL of the feed you want to parse, or the
+	 * website you want to try to use auto-discovery on. This takes priority
+	 * over any set raw data.
+	 *
+	 * You can set multiple feeds to mash together by passing an array instead
+	 * of a string for the $url. Remember that with each additional feed comes
+	 * additional processing and resources.
+	 *
+	 * @access public
+	 * @since 1.0 Preview Release
+	 * @param mixed $url This is the URL (or array of URLs) that you want to parse.
+	 * @see SimplePie::set_raw_data()
+	 */
+	function set_feed_url($url)
+	{
+		if (is_array($url))
+		{
+			$this->multifeed_url = array();
+			foreach ($url as $value)
+			{
+				$this->multifeed_url[] = SimplePie_Misc::fix_protocol($value, 1);
+			}
+		}
+		else
+		{
+			$this->feed_url = SimplePie_Misc::fix_protocol($url, 1);
+		}
+	}
+
+	/**
+	 * Provides an instance of SimplePie_File to use as a feed
+	 *
+	 * @access public
+	 * @param object &$file Instance of SimplePie_File (or subclass)
+	 * @return bool True on success, false on failure
+	 */
+	function set_file(&$file)
+	{
+		if (SimplePie_Misc::is_a($file, 'SimplePie_File'))
+		{
+			$this->feed_url = $file->url;
+			$this->file =& $file;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to use a string of RSS/Atom data instead of a remote feed.
+	 *
+	 * If you have a feed available as a string in PHP, you can tell SimplePie
+	 * to parse that data string instead of a remote feed. Any set feed URL
+	 * takes precedence.
+	 *
+	 * @access public
+	 * @since 1.0 Beta 3
+	 * @param string $data RSS or Atom data as a string.
+	 * @see SimplePie::set_feed_url()
+	 */
+	function set_raw_data($data)
+	{
+		$this->raw_data = trim($data);
+	}
+
+	/**
+	 * Allows you to override the default timeout for fetching remote feeds.
+	 *
+	 * This allows you to change the maximum time the feed's server to respond
+	 * and send the feed back.
+	 *
+	 * @access public
+	 * @since 1.0 Beta 3
+	 * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed.
+	 */
+	function set_timeout($timeout = 10)
+	{
+		$this->timeout = (int) $timeout;
+	}
+
+	/**
+	 * Forces SimplePie to use fsockopen() instead of the preferred cURL
+	 * functions.
+	 *
+	 * @access public
+	 * @since 1.0 Beta 3
+	 * @param bool $enable Force fsockopen() to be used
+	 */
+	function force_fsockopen($enable = false)
+	{
+		$this->force_fsockopen = (bool) $enable;
+	}
+
+	/**
+	 * Outputs the raw XML content of the feed, after it has gone through
+	 * SimplePie's filters.
+	 *
+	 * Used only for debugging, this function will output the XML content as
+	 * text/xml. When SimplePie reads in a feed, it does a bit of cleaning up
+	 * before trying to parse it. Many parts of the feed are re-written in
+	 * memory, and in the end, you have a parsable feed. XML dump shows you the
+	 * actual XML that SimplePie tries to parse, which may or may not be very
+	 * different from the original feed.
+	 *
+	 * @access public
+	 * @since 1.0 Preview Release
+	 * @param bool $enable Enable XML dump
+	 */
+	function enable_xml_dump($enable = false)
+	{
+		$this->xml_dump = (bool) $enable;
+	}
+
+	/**
+	 * Enables/disables caching in SimplePie.
+	 *
+	 * This option allows you to disable caching all-together in SimplePie.
+	 * However, disabling the cache can lead to longer load times.
+	 *
+	 * @access public
+	 * @since 1.0 Preview Release
+	 * @param bool $enable Enable caching
+	 */
+	function enable_cache($enable = true)
+	{
+		$this->cache = (bool) $enable;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the contents of a feed
+	 * will be cached.
+	 *
+	 * @access public
+	 * @param int $seconds The feed content cache duration.
+	 */
+	function set_cache_duration($seconds = 3600)
+	{
+		$this->cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the length of time (in seconds) that the autodiscovered feed
+	 * URL will be cached.
+	 *
+	 * @access public
+	 * @param int $seconds The autodiscovered feed URL cache duration.
+	 */
+	function set_autodiscovery_cache_duration($seconds = 604800)
+	{
+		$this->autodiscovery_cache_duration = (int) $seconds;
+	}
+
+	/**
+	 * Set the file system location where the cached files should be stored.
+	 *
+	 * @access public
+	 * @param string $location The file system location.
+	 */
+	function set_cache_location($location = './cache')
+	{
+		$this->cache_location = (string) $location;
+	}
+
+	/**
+	 * Determines whether feed items should be sorted into reverse chronological order.
+	 *
+	 * @access public
+	 * @param bool $enable Sort as reverse chronological order.
+	 */
+	function enable_order_by_date($enable = true)
+	{
+		$this->order_by_date = (bool) $enable;
+	}
+
+	/**
+	 * Allows you to override the character encoding reported by the feed.
+	 *
+	 * @access public
+	 * @param string $encoding Character encoding.
+	 */
+	function set_input_encoding($encoding = false)
+	{
+		if ($encoding)
+		{
+			$this->input_encoding = (string) $encoding;
+		}
+		else
+		{
+			$this->input_encoding = false;
+		}
+	}
+
+	/**
+	 * Set how much feed autodiscovery to do
+	 *
+	 * @access public
+	 * @see SIMPLEPIE_LOCATOR_NONE
+	 * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_LOCAL_BODY
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION
+	 * @see SIMPLEPIE_LOCATOR_REMOTE_BODY
+	 * @see SIMPLEPIE_LOCATOR_ALL
+	 * @param int $level Feed Autodiscovery Level (level can be a
+	 * combination of the above constants, see bitwise OR operator)
+	 */
+	function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL)
+	{
+		$this->autodiscovery = (int) $level;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for caching.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_cache_class($class = 'SimplePie_Cache')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Cache'))
+		{
+			$this->cache_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for auto-discovery.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_locator_class($class = 'SimplePie_Locator')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Locator'))
+		{
+			$this->locator_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for XML parsing.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_parser_class($class = 'SimplePie_Parser')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Parser'))
+		{
+			$this->parser_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for remote file fetching.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_file_class($class = 'SimplePie_File')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_File'))
+		{
+			$this->file_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for data sanitization.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_sanitize_class($class = 'SimplePie_Sanitize')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Sanitize'))
+		{
+			$this->sanitize =& new $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for handling feed items.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_item_class($class = 'SimplePie_Item')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Item'))
+		{
+			$this->item_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for handling author data.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_author_class($class = 'SimplePie_Author')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Author'))
+		{
+			$this->author_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for handling category data.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_category_class($class = 'SimplePie_Category')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Category'))
+		{
+			$this->category_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for feed enclosures.
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_enclosure_class($class = 'SimplePie_Enclosure')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Enclosure'))
+		{
+			$this->enclosure_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for <media:text> captions
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_caption_class($class = 'SimplePie_Caption')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Caption'))
+		{
+			$this->caption_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for <media:copyright>
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_copyright_class($class = 'SimplePie_Copyright')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Copyright'))
+		{
+			$this->copyright_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for <media:credit>
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_credit_class($class = 'SimplePie_Credit')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Credit'))
+		{
+			$this->credit_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for <media:rating>
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_rating_class($class = 'SimplePie_Rating')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Rating'))
+		{
+			$this->rating_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to change which class SimplePie uses for <media:restriction>
+	 * Useful when you are overloading or extending SimplePie's default classes.
+	 *
+	 * @access public
+	 * @param string $class Name of custom class.
+	 * @link http://php.net/manual/en/keyword.extends.php PHP4 extends documentation
+	 * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation
+	 */
+	function set_restriction_class($class = 'SimplePie_Restriction')
+	{
+		if (SimplePie_Misc::is_subclass_of($class, 'SimplePie_Restriction'))
+		{
+			$this->restriction_class = $class;
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Allows you to override the default user agent string.
+	 *
+	 * @access public
+	 * @param string $ua New user agent string.
+	 */
+	function set_useragent($ua = SIMPLEPIE_USERAGENT)
+	{
+		$this->useragent = (string) $ua;
+	}
+
+	/**
+	 * Set callback function to create cache filename with
+	 *
+	 * @access public
+	 * @param mixed $function Callback function
+	 */
+	function set_cache_name_function($function = 'md5')
+	{
+		if (is_callable($function))
+		{
+			$this->cache_name_function = $function;
+		}
+	}
+
+	/**
+	 * Set javascript query string parameter
+	 *
+	 * @access public
+	 * @param mixed $get Javascript query string parameter
+	 */
+	function set_javascript($get = 'js')
+	{
+		if ($get)
+		{
+			$this->javascript = (string) $get;
+		}
+		else
+		{
+			$this->javascript = false;
+		}
+	}
+
+	/**
+	 * Set options to make SP as fast as possible.  Forgoes a
+	 * substantial amount of data sanitization in favor of speed.
+	 *
+	 * @access public
+	 * @param bool $set Whether to set them or not
+	 */
+	function set_stupidly_fast($set = false)
+	{
+		if ($set)
+		{
+			$this->enable_order_by_date(false);
+			$this->remove_div(false);
+			$this->strip_comments(false);
+			$this->strip_htmltags(false);
+			$this->strip_attributes(false);
+			$this->set_image_handler(false);
+		}
+	}
+
+	/**
+	 * Set maximum number of feeds to check with autodiscovery
+	 *
+	 * @access public
+	 * @param int $max Maximum number of feeds to check
+	 */
+	function set_max_checked_feeds($max = 10)
+	{
+		$this->max_checked_feeds = (int) $max;
+	}
+
+	function remove_div($enable = true)
+	{
+		$this->sanitize->remove_div($enable);
+	}
+
+	function strip_htmltags($tags = '', $encode = null)
+	{
+		if ($tags === '')
+		{
+			$tags = $this->strip_htmltags;
+		}
+		$this->sanitize->strip_htmltags($tags);
+		if ($encode !== null)
+		{
+			$this->sanitize->encode_instead_of_strip($tags);
+		}
+	}
+
+	function encode_instead_of_strip($enable = true)
+	{
+		$this->sanitize->encode_instead_of_strip($enable);
+	}
+
+	function strip_attributes($attribs = '')
+	{
+		if ($attribs === '')
+		{
+			$attribs = $this->strip_attributes;
+		}
+		$this->sanitize->strip_attributes($attribs);
+	}
+
+	function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->sanitize->set_output_encoding($encoding);
+	}
+
+	function strip_comments($strip = false)
+	{
+		$this->sanitize->strip_comments($strip);
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * @access public
+	 * @since 1.0
+	 * @param array $element_attribute Element/attribute key/value pairs
+	 */
+	function set_url_replacements($element_attribute = array('a' => 'href', 'area' => 'href', 'blockquote' => 'cite', 'del' => 'cite', 'form' => 'action', 'img' => array('longdesc', 'src'), 'input' => 'src', 'ins' => 'cite', 'q' => 'cite'))
+	{
+		$this->sanitize->set_url_replacements($element_attribute);
+	}
+
+	/**
+	 * Set the handler to enable the display of cached favicons.
+	 *
+	 * @access public
+	 * @param str $page Web-accessible path to the handler_favicon.php file.
+	 * @param str $qs The query string that the value should be passed to.
+	 */
+	function set_favicon_handler($page = false, $qs = 'i')
+	{
+		if ($page != false)
+		{
+			$this->favicon_handler = $page . '?' . $qs . '=';
+		}
+		else
+		{
+			$this->favicon_handler = '';
+		}
+	}
+
+	/**
+	 * Set the handler to enable the display of cached images.
+	 *
+	 * @access public
+	 * @param str $page Web-accessible path to the handler_image.php file.
+	 * @param str $qs The query string that the value should be passed to.
+	 */
+	function set_image_handler($page = false, $qs = 'i')
+	{
+		if ($page != false)
+		{
+			$this->sanitize->set_image_handler($page . '?' . $qs . '=');
+		}
+		else
+		{
+			$this->image_handler = '';
+		}
+	}
+
+	function init()
+	{
+		if ((function_exists('version_compare') && version_compare(PHP_VERSION, '4.1.0', '<')) || !extension_loaded('xml') || !extension_loaded('pcre'))
+		{
+			return false;
+		}
+		if (isset($_GET[$this->javascript]))
+		{
+			if (function_exists('ob_gzhandler'))
+			{
+				ob_start('ob_gzhandler');
+			}
+			header('Content-type: text/javascript; charset: UTF-8');
+			header('Cache-Control: must-revalidate');
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+			?>
+function embed_odeo(link) {
+	document.writeln('<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url='+link+'"></embed>');
+}
+
+function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) {
+	if (placeholder != '') {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+	else {
+		document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>');
+	}
+}
+
+function embed_flash(bgcolor, width, height, link, loop, type) {
+	document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>');
+}
+
+function embed_flv(width, height, link, placeholder, loop, player) {
+	document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>');
+}
+
+function embed_wmedia(width, height, link) {
+	document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>');
+}
+			<?php
+			exit;
+		}
+
+		// Pass whatever was set with config options over to the sanitizer.
+		$this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->cache_class);
+		$this->sanitize->pass_file_data($this->file_class, $this->timeout, $this->useragent, $this->force_fsockopen);
+
+		if ($this->feed_url !== null || $this->raw_data !== null)
+		{
+			$this->data = array();
+			$this->multifeed_objects = array();
+			$cache = false;
+
+			if ($this->feed_url !== null)
+			{
+				$parsed_feed_url = SimplePie_Misc::parse_url($this->feed_url);
+				// Decide whether to enable caching
+				if ($this->cache && $parsed_feed_url['scheme'] !== '')
+				{
+					$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc');
+				}
+				// If it's enabled and we don't want an XML dump, use the cache
+				if ($cache && !$this->xml_dump)
+				{
+					// Load the Cache
+					$this->data = $cache->load();
+					if (!empty($this->data))
+					{
+						// If the cache is for an outdated build of SimplePie
+						if (!isset($this->data['build']) || $this->data['build'] != SIMPLEPIE_BUILD)
+						{
+							$cache->unlink();
+							$this->data = array();
+						}
+						// If we've hit a collision just rerun it with caching disabled
+						elseif (isset($this->data['url']) && $this->data['url'] != $this->feed_url)
+						{
+							$cache = false;
+							$this->data = array();
+						}
+						// If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL.
+						elseif (isset($this->data['feed_url']))
+						{
+							// If the autodiscovery cache is still valid use it.
+							if ($cache->mtime() + $this->autodiscovery_cache_duration > time())
+							{
+								// Do not need to do feed autodiscovery yet.
+								if ($this->data['feed_url'] == $this->data['url'])
+								{
+									$cache->unlink();
+									$this->data = array();
+								}
+								else
+								{
+									$this->set_feed_url($this->data['feed_url']);
+									return $this->init();
+								}
+							}
+						}
+						// Check if the cache has been updated
+						elseif ($cache->mtime() + $this->cache_duration < time())
+						{
+							// If we have last-modified and/or etag set
+							if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag']))
+							{
+								$headers = array();
+								if (isset($this->data['headers']['last-modified']))
+								{
+									$headers['if-modified-since'] = $this->data['headers']['last-modified'];
+								}
+								if (isset($this->data['headers']['etag']))
+								{
+									$headers['if-none-match'] = $this->data['headers']['etag'];
+								}
+								$file =& new $this->file_class($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen);
+								if ($file->success)
+								{
+									if ($file->status_code == 304)
+									{
+										$cache->touch();
+										return true;
+									}
+									else
+									{
+										$headers = $file->headers;
+									}
+								}
+								else
+								{
+									unset($file);
+								}
+							}
+						}
+						// If the cache is still valid, just return true
+						else
+						{
+							return true;
+						}
+					}
+					// If the cache is empty, delete it
+					else
+					{
+						$cache->unlink();
+						$this->data = array();
+					}
+				}
+				// If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it.
+				if (!isset($file))
+				{
+					if (SimplePie_Misc::is_a($this->file, 'SimplePie_File') && $this->file->url == $this->feed_url)
+					{
+						$file =& $this->file;
+					}
+					else
+					{
+						$file =& new $this->file_class($this->feed_url, $this->timeout, 5, null, $this->useragent, $this->force_fsockopen);
+					}
+				}
+				// If the file connection has an error, set SimplePie::error to that and quit
+				if (!$file->success)
+				{
+					$this->error = $file->error;
+					if (!empty($this->data))
+					{
+						return true;
+					}
+					else
+					{
+						return false;
+					}
+				}
+
+				// Check if the supplied URL is a feed, if it isn't, look for it.
+				$locate =& new $this->locator_class($file, $this->timeout, $this->useragent, $this->file_class, $this->max_checked_feeds);
+				if (!$locate->is_feed($file))
+				{
+					// We need to unset this so that if SimplePie::set_file() has been called that object is untouched
+					unset($file);
+					if ($file = $locate->find($this->autodiscovery))
+					{
+						if ($cache)
+						{
+							if (!$cache->save(array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD)))
+							{
+								trigger_error("$cache->name is not writeable", E_USER_WARNING);
+							}
+							$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc');
+						}
+						$this->feed_url = $file->url;
+					}
+					else
+					{
+						$this->error = "A feed could not be found at $this->feed_url";
+						SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
+						return false;
+					}
+				}
+				$locate = null;
+
+				$headers = $file->headers;
+				$data = trim($file->body);
+				unset($file);
+			}
+			else
+			{
+				$data = $this->raw_data;
+			}
+
+			// First check to see if input has been overridden.
+			if ($this->input_encoding !== false)
+			{
+				$encoding = $this->input_encoding;
+			}
+			// Second try HTTP headers
+			elseif (isset($headers['content-type']) && preg_match('/;[\x09\x20]*charset=([^;]*)/i', $headers['content-type'], $charset))
+			{
+				$encoding = $charset[1];
+			}
+			// Then prolog, if at the very start of the document
+			elseif (preg_match("/^<\?xml[\x20\x9\xD\xA]+version([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"1.0\"|'1.0'|\"1.1\"|'1.1')[\x20\x9\xD\xA]+encoding([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"[A-Za-z][A-Za-z0-9._\-]*\"|'[A-Za-z][A-Za-z0-9._\-]*')([\x20\x9\xD\xA]+standalone([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"(yes|no)\"|'(yes|no)'))?([\x20\x9\xD\xA]+)?\?>/", $data, $prolog))
+			{
+				$encoding = substr($prolog[6], 1, -1);
+			}
+			// UTF-32 Big Endian BOM
+			elseif (strpos($data, "\x0\x0\xFE\xFF") === 0)
+			{
+				$encoding = 'UTF-32be';
+			}
+			// UTF-32 Little Endian BOM
+			elseif (strpos($data, "\xFF\xFE\x0\x0") === 0)
+			{
+				$encoding = 'UTF-32';
+			}
+			// UTF-16 Big Endian BOM
+			elseif (strpos($data, "\xFE\xFF") === 0)
+			{
+				$encoding = 'UTF-16be';
+			}
+			// UTF-16 Little Endian BOM
+			elseif (strpos($data, "\xFF\xFE") === 0)
+			{
+				$encoding = 'UTF-16le';
+			}
+			// UTF-8 BOM
+			elseif (strpos($data, "\xEF\xBB\xBF") === 0)
+			{
+				$encoding = 'UTF-8';
+			}
+			// Fallback to the default (US-ASCII for text/xml, ISO-8859-1 for text/* MIME types, UTF-8 otherwise)
+			elseif (isset($headers['content-type']) && strtolower(SimplePie_Misc::parse_mime($headers['content-type'])) == 'text/xml')
+			{
+				$encoding = 'US-ASCII';
+			}
+			elseif (isset($headers['content-type']) && SimplePie_Misc::stripos(SimplePie_Misc::parse_mime($headers['content-type']), 'text/') === 0)
+			{
+				$encoding = 'ISO-8859-1';
+			}
+			else
+			{
+				$encoding = 'UTF-8';
+			}
+
+			// Change the encoding to UTF-8 (as we always use UTF-8 internally)
+			if ($encoding != 'UTF-8')
+			{
+				$data = SimplePie_Misc::change_encoding($data, $encoding, 'UTF-8');
+			}
+
+			// Strip illegal characters
+			$data = SimplePie_Misc::utf8_bad_replace($data);
+
+			$parser =& new $this->parser_class();
+			$parser->pre_process($data, 'UTF-8');
+			// If we want the XML, just output that and quit
+			if ($this->xml_dump)
+			{
+				header('Content-type: text/xml; charset=UTF-8');
+				echo $data;
+				exit;
+			}
+			// If it's parsed fine
+			elseif ($parser->parse($data))
+			{
+				unset($data);
+				$this->data = $parser->get_data();
+				if (isset($this->data['child']))
+				{
+					if (isset($headers))
+					{
+						$this->data['headers'] = $headers;
+					}
+					$this->data['build'] = SIMPLEPIE_BUILD;
+
+					// Cache the file if caching is enabled
+					if ($cache && !$cache->save($this->data))
+					{
+						trigger_error("$cache->name is not writeable", E_USER_WARNING);
+					}
+					return true;
+				}
+				else
+				{
+					$this->error = "A feed could not be found at $this->feed_url";
+					SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
+					return false;
+				}
+			}
+			// If we have an error, just set SimplePie::error to it and quit
+			else
+			{
+				$this->error = sprintf('XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column());
+				SimplePie_Misc::error($this->error, E_USER_NOTICE, __FILE__, __LINE__);
+				return false;
+			}
+		}
+		elseif (!empty($this->multifeed_url))
+		{
+			$i = 0;
+			$success = 0;
+			$this->multifeed_objects = array();
+			foreach ($this->multifeed_url as $url)
+			{
+				if (SIMPLEPIE_PHP5)
+				{
+					// This keyword needs to defy coding standards for PHP4 compatibility
+					$this->multifeed_objects[$i] = clone($this);
+				}
+				else
+				{
+					$this->multifeed_objects[$i] = $this;
+				}
+				$this->multifeed_objects[$i]->set_feed_url($url);
+				$success |= $this->multifeed_objects[$i]->init();
+				$i++;
+			}
+			return (bool) $success;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Return the error message for the occured error
+	 *
+	 * @access public
+	 * @return string Error message
+	 */
+	function error()
+	{
+		return $this->error;
+	}
+
+	function get_encoding()
+	{
+		return $this->sanitize->output_encoding;
+	}
+
+	function handle_content_type($mime = 'text/html')
+	{
+		if (!headers_sent())
+		{
+			$header = "Content-type: $mime;";
+			if ($this->get_encoding())
+			{
+				$header .= ' charset=' . $this->get_encoding();
+			}
+			else
+			{
+				$header .= ' charset=UTF-8';
+			}
+			header($header);
+		}
+	}
+
+	function get_type()
+	{
+		if (!isset($this->data['type']))
+		{
+			$this->data['type'] = SIMPLEPIE_TYPE_ALL;
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03;
+			}
+			elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF']))
+			{
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_10;
+				}
+				if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])
+				|| isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput']))
+				{
+					$this->data['type'] &= SIMPLEPIE_TYPE_RSS_090;
+				}
+			}
+			elseif (isset($this->data['child']['']['rss']))
+			{
+				$this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL;
+				if (isset($this->data['child']['']['rss'][0]['attribs']['']['version']))
+				{
+					switch (trim($this->data['child']['']['rss'][0]['attribs']['']['version']))
+					{
+						case '0.91':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091;
+							if (isset($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
+							{
+								switch (trim($this->data['child']['']['rss'][0]['child']['']['skiphours']['hour'][0]['data']))
+								{
+									case '0':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE;
+										break;
+
+									case '24':
+										$this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND;
+										break;
+								}
+							}
+							break;
+
+						case '0.92':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_092;
+							break;
+
+						case '0.93':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_093;
+							break;
+
+						case '0.94':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_094;
+							break;
+
+						case '2.0':
+							$this->data['type'] &= SIMPLEPIE_TYPE_RSS_20;
+							break;
+					}
+				}
+			}
+			else
+			{
+				$this->data['type'] = SIMPLEPIE_TYPE_NONE;
+			}
+		}
+		return $this->data['type'];
+	}
+
+	/**
+	 * Returns the URL for the favicon of the feed's website.
+	 *
+	 * @access public
+	 * @since 1.0
+	 */
+	function get_favicon()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif (($url = $this->get_link()) !== null && preg_match('/^http(s)?:\/\//i', $url))
+		{
+			$favicon = SimplePie_Misc::absolutize_url('/favicon.ico', $url);
+
+			if ($this->cache && $this->favicon_handler)
+			{
+				$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $favicon), 'spi');
+
+				if ($cache->load())
+				{
+					return $this->sanitize($this->favicon_handler . rawurlencode($favicon), SIMPLEPIE_CONSTRUCT_IRI);
+				}
+				else
+				{
+					$file =& new $this->file_class($favicon, $this->timeout / 10, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+
+					if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)) && strlen($file->body) > 0)
+					{
+						if ($cache->save(array('headers' => $file->headers, 'body' => $file->body)))
+						{
+							return $this->sanitize($this->favicon_handler . rawurlencode($favicon), SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						else
+						{
+							trigger_error("$cache->name is not writeable", E_USER_WARNING);
+							return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
+						}
+					}
+				}
+			}
+			else
+			{
+				return $this->sanitize($favicon, SIMPLEPIE_CONSTRUCT_IRI);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * @todo If we have a perm redirect we should return the new URL
+	 * @todo When we make the above change, let's support <itunes:new-feed-url> as well
+	 * @todo Also, |atom:link|@rel=self
+	 */
+	function subscribe_url()
+	{
+		if ($this->feed_url !== null)
+		{
+			return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function subscribe_feed()
+	{
+		if ($this->feed_url !== null)
+		{
+			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function subscribe_outlook()
+	{
+		if ($this->feed_url !== null)
+		{
+			return 'outlook' . $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 2), SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function subscribe_podcast()
+	{
+		if ($this->feed_url !== null)
+		{
+			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 3), SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function subscribe_itunes()
+	{
+		if ($this->feed_url !== null)
+		{
+			return $this->sanitize(SimplePie_Misc::fix_protocol($this->feed_url, 4), SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Creates the subscribe_* methods' return data
+	 *
+	 * @access private
+	 * @param string $feed_url String to prefix to the feed URL
+	 * @param string $site_url String to prefix to the site URL (and
+	 * suffix to the feed URL)
+	 * @return mixed URL if feed exists, false otherwise
+	 */
+	function subscribe_service($feed_url, $site_url = null)
+	{
+		if ($this->subscribe_url())
+		{
+			$return = $this->sanitize($feed_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->subscribe_url());
+			if ($site_url !== null && $this->get_link() !== null)
+			{
+				$return .= $this->sanitize($site_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_link());
+			}
+			return $return;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function subscribe_aol()
+	{
+		return $this->subscribe_service('http://feeds.my.aol.com/add.jsp?url=');
+	}
+
+	function subscribe_bloglines()
+	{
+		return urldecode($this->subscribe_service('http://www.bloglines.com/sub/'));
+	}
+
+	function subscribe_eskobo()
+	{
+		return $this->subscribe_service('http://www.eskobo.com/?AddToMyPage=');
+	}
+
+	function subscribe_feedfeeds()
+	{
+		return $this->subscribe_service('http://www.feedfeeds.com/add?feed=');
+	}
+
+	function subscribe_feedster()
+	{
+		return $this->subscribe_service('http://www.feedster.com/myfeedster.php?action=addrss&confirm=no&rssurl=');
+	}
+
+	function subscribe_google()
+	{
+		return $this->subscribe_service('http://fusion.google.com/add?feedurl=');
+	}
+
+	function subscribe_gritwire()
+	{
+		return $this->subscribe_service('http://my.gritwire.com/feeds/addExternalFeed.aspx?FeedUrl=');
+	}
+
+	function subscribe_msn()
+	{
+		return $this->subscribe_service('http://my.msn.com/addtomymsn.armx?id=rss&ut=', '&ru=');
+	}
+
+	function subscribe_netvibes()
+	{
+		return $this->subscribe_service('http://www.netvibes.com/subscribe.php?url=');
+	}
+
+	function subscribe_newsburst()
+	{
+		return $this->subscribe_service('http://www.newsburst.com/Source/?add=');
+	}
+
+	function subscribe_newsgator()
+	{
+		return $this->subscribe_service('http://www.newsgator.com/ngs/subscriber/subext.aspx?url=');
+	}
+
+	function subscribe_odeo()
+	{
+		return $this->subscribe_service('http://www.odeo.com/listen/subscribe?feed=');
+	}
+
+	function subscribe_podnova()
+	{
+		return $this->subscribe_service('http://www.podnova.com/index_your_podcasts.srf?action=add&url=');
+	}
+
+	function subscribe_rojo()
+	{
+		return $this->subscribe_service('http://www.rojo.com/add-subscription?resource=');
+	}
+
+	function subscribe_yahoo()
+	{
+		return $this->subscribe_service('http://add.my.yahoo.com/rss?url=');
+	}
+
+	function get_feed_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_10)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_ATOM_03)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_RDF)
+		{
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag];
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if (isset($this->data['child']['']['rss'][0]['child'][$namespace][$tag]))
+			{
+				return $this->data['child']['']['rss'][0]['child'][$namespace][$tag];
+			}
+		}
+		return null;
+	}
+
+	function get_channel_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_ATOM_ALL)
+		{
+			if ($return = $this->get_feed_tags($namespace, $tag))
+			{
+				return $return;
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($channel = $this->get_feed_tags('', 'channel'))
+			{
+				if (isset($channel[0]['child'][$namespace][$tag]))
+				{
+					return $channel[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	function get_image_tags($namespace, $tag)
+	{
+		$type = $this->get_type();
+		if ($type & SIMPLEPIE_TYPE_RSS_10)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_090)
+		{
+			if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION)
+		{
+			if ($image = $this->get_channel_tags('', 'image'))
+			{
+				if (isset($image[0]['child'][$namespace][$tag]))
+				{
+					return $image[0]['child'][$namespace][$tag];
+				}
+			}
+		}
+		return null;
+	}
+
+	function get_base($element = array())
+	{
+		if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base']))
+		{
+			return $element['xml_base'];
+		}
+		elseif ($this->get_link() !== null)
+		{
+			return $this->get_link();
+		}
+		elseif (isset($this->data['headers']['content-location']))
+		{
+			return SimplePie_Misc::absolutize_url($this->data['headers']['content-location'], $this->subscribe_url());
+		}
+		else
+		{
+			return $this->subscribe_url();
+		}
+	}
+
+	function sanitize($data, $type, $base = '')
+	{
+		return $this->sanitize->sanitize($data, $type, $base);
+	}
+
+	function get_title()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags('', 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if (isset($links[$key]))
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Added for parity between the parent-level and the item/entry-level.
+	 */
+	function get_permalink()
+	{
+		return $this->get_link(0);
+	}
+
+	function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link'))
+			{
+				foreach ($links as $link)
+				{
+					if (isset($link['attribs']['']['href']))
+					{
+						$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+						$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+					}
+				}
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_channel_tags('', 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if (SimplePie_Misc::is_isegment_nz_nc($key))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_description()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags('', 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_copyright()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags('', 'copyright'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_language()
+	{
+		if ($return = $this->get_channel_tags('', 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang']))
+		{
+			return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (isset($this->data['headers']['content-language']))
+		{
+			return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_latitude()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_longitude()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_image_title()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags('', 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_image_url()
+	{
+		if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image'))
+		{
+			return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI);
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags('', 'url'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_image_link()
+	{
+		if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_image_tags('', 'link'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0]));
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_image_width()
+	{
+		if ($return = $this->get_image_tags('', 'width'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
+		{
+			return 88.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_image_height()
+	{
+		if ($return = $this->get_image_tags('', 'height'))
+		{
+			return round($return[0]['data']);
+		}
+		elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags('', 'url'))
+		{
+			return 31.0;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_item_quantity($max = 0)
+	{
+		$qty = count($this->get_items());
+		if ($max == 0)
+		{
+			return $qty;
+		}
+		else
+		{
+			return ($qty > $max) ? $max : $qty;
+		}
+	}
+
+	function get_item($key = 0)
+	{
+		$items = $this->get_items();
+		if (isset($items[$key]))
+		{
+			return $items[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_items($start = 0, $end = 0)
+	{
+		if (!empty($this->multifeed_objects))
+		{
+			return SimplePie::merge_items($this->multifeed_objects, $start, $end);
+		}
+		elseif (!isset($this->data['items']))
+		{
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+				}
+			}
+			if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+				}
+			}
+			if ($items = $this->get_channel_tags('', 'item'))
+			{
+				$keys = array_keys($items);
+				foreach ($keys as $key)
+				{
+					$this->data['items'][] =& new $this->item_class($this, $items[$key]);
+				}
+			}
+		}
+
+		if (!empty($this->data['items']))
+		{
+			// If we want to order it by date, check if all items have a date, and then sort it
+			if ($this->order_by_date)
+			{
+				if (!isset($this->data['ordered_items']))
+				{
+					$do_sort = true;
+					foreach ($this->data['items'] as $item)
+					{
+						if (!$item->get_date('U'))
+						{
+							$do_sort = false;
+							break;
+						}
+					}
+					$item = null;
+					$this->data['ordered_items'] = $this->data['items'];
+					if ($do_sort)
+					{
+						usort($this->data['ordered_items'], array(&$this, 'sort_items'));
+					}
+				}
+				$items = $this->data['ordered_items'];
+			}
+			else
+			{
+				$items = $this->data['items'];
+			}
+
+			// Slice the data as desired
+			if ($end == 0)
+			{
+				return array_slice($items, $start);
+			}
+			else
+			{
+				return array_slice($items, $start, $end);
+			}
+		}
+		else
+		{
+			return array();
+		}
+	}
+
+	function sort_items($a, $b)
+	{
+		return $a->get_date('U') <= $b->get_date('U');
+	}
+
+	function merge_items($urls, $start = 0, $end = 0)
+	{
+		if (is_array($urls) && sizeof($urls) > 0)
+		{
+			$items = array();
+			foreach ($urls as $arg)
+			{
+				if (SimplePie_Misc::is_a($arg, 'SimplePie'))
+				{
+					$items = array_merge($items, $arg->get_items());
+				}
+				else
+				{
+					trigger_error('Arguments must be SimplePie objects', E_USER_WARNING);
+				}
+			}
+
+			$do_sort = true;
+			foreach ($items as $item)
+			{
+				if (!$item->get_date('U'))
+				{
+					$do_sort = false;
+					break;
+				}
+			}
+			$item = null;
+			if ($do_sort)
+			{
+				usort($items, array('SimplePie', 'sort_items'));
+			}
+
+			if ($end == 0)
+			{
+				return array_slice($items, $start);
+			}
+			else
+			{
+				return array_slice($items, $start, $end);
+			}
+		}
+		else
+		{
+			trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING);
+			return array();
+		}
+	}
+}
+
+class SimplePie_Item
+{
+	var $feed;
+	var $data = array();
+
+	function SimplePie_Item($feed, $data)
+	{
+		$this->feed = $feed;
+		$this->data = $data;
+	}
+
+	function __toString()
+	{
+		return md5(serialize($this->data));
+	}
+
+	function get_item_tags($namespace, $tag)
+	{
+		if (isset($this->data['child'][$namespace][$tag]))
+		{
+			return $this->data['child'][$namespace][$tag];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_base($element = array())
+	{
+		return $this->feed->get_base($element);
+	}
+
+	function sanitize($data, $type, $base = '')
+	{
+		return $this->feed->sanitize($data, $type, $base);
+	}
+
+	function get_feed()
+	{
+		return $this->feed;
+	}
+
+	function get_id($hash = false)
+	{
+		if ($hash)
+		{
+			return $this->__toString();
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags('', 'guid'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (($return = $this->get_permalink()) !== null)
+		{
+			return $return;
+		}
+		elseif (($return = $this->get_title()) !== null)
+		{
+			return $return;
+		}
+		else
+		{
+			return $this->__toString();
+		}
+	}
+
+	function get_title()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags('', 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_description($description_only = false)
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags('', 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (!$description_only)
+		{
+			return $this->get_content(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_content($content_only = false)
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_10_content_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
+		{
+			return $this->sanitize($return[0]['data'], SimplePie_Misc::atom_03_construct_type($return[0]['attribs']), $this->get_base($return[0]));
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
+		{
+			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
+		}
+		elseif (!$content_only)
+		{
+			return $this->get_description(true);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_categories()
+	{
+		$categories = array();
+
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category)
+		{
+			$term = null;
+			$scheme = null;
+			$label = null;
+			if (isset($category['attribs']['']['term']))
+			{
+				$term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['scheme']))
+			{
+				$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($category['attribs']['']['label']))
+			{
+				$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			$categories[] =& new $this->feed->category_class($term, $scheme, $label);
+		}
+		foreach ((array) $this->get_item_tags('', 'category') as $category)
+		{
+			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category)
+		{
+			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category)
+		{
+			$categories[] =& new $this->feed->category_class($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+
+		if (!empty($categories))
+		{
+			return SimplePie_Misc::array_unique($categories);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_author($key = 0)
+	{
+		$authors = $this->get_authors();
+		if (isset($authors[$key]))
+		{
+			return $authors[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * @todo Atom inheritance (item author, source author, feed author)
+	 */
+	function get_authors()
+	{
+		$authors = array();
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author)
+		{
+			$name = null;
+			$uri = null;
+			$email = null;
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data']))
+			{
+				$uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]));
+			}
+			if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] =& new $this->feed->author_class($name, $uri, $email);
+			}
+		}
+		if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author'))
+		{
+			$name = null;
+			$url = null;
+			$email = null;
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data']))
+			{
+				$name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data']))
+			{
+				$uri = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]));
+			}
+			if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data']))
+			{
+				$email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+			}
+			if ($name !== null || $email !== null || $uri !== null)
+			{
+				$authors[] =& new $this->feed->author_class($name, $url, $email);
+			}
+		}
+		if ($author = $this->get_item_tags('', 'author'))
+		{
+			$authors[] =& new $this->feed->author_class(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author)
+		{
+			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author)
+		{
+			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+		foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author)
+		{
+			$authors[] =& new $this->feed->author_class($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null);
+		}
+
+		if (!empty($authors))
+		{
+			return SimplePie_Misc::array_unique($authors);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_date($date_format = 'j F Y, g:i a')
+	{
+		if (!isset($this->data['date']))
+		{
+			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags('', 'pubDate'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			{
+				$this->data['date']['raw'] = $return[0]['data'];
+			}
+
+			if (!empty($this->data['date']['raw']))
+			{
+				$this->data['date']['parsed'] = SimplePie_Misc::parse_date($this->data['date']['raw']);
+			}
+			else
+			{
+				$this->data['date'] = null;
+			}
+		}
+		if ($this->data['date'])
+		{
+			$date_format = (string) $date_format;
+			switch ($date_format)
+			{
+				case '':
+					return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT);
+
+				case 'U':
+					return $this->data['date']['parsed'];
+
+				default:
+					return date($date_format, $this->data['date']['parsed']);
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_local_date($date_format = '%c')
+	{
+		if (!$date_format)
+		{
+			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
+		}
+		elseif (($date = $this->get_date('U')) !== null)
+		{
+			return strftime($date_format, $date);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_permalink()
+	{
+		$link = $this->get_link();
+		$enclosure = $this->get_enclosure(0);
+		if ($link !== null)
+		{
+			return $link;
+		}
+		elseif ($enclosure !== null)
+		{
+			return $enclosure->get_link();
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_link($key = 0, $rel = 'alternate')
+	{
+		$links = $this->get_links($rel);
+		if ($links[$key] !== null)
+		{
+			return $links[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_links($rel = 'alternate')
+	{
+		if (!isset($this->data['links']))
+		{
+			$this->data['links'] = array();
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+
+				}
+			}
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']))
+				{
+					$link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate';
+					$this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+				}
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags('', 'link'))
+			{
+				$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+			}
+			if ($links = $this->get_item_tags('', 'guid'))
+			{
+				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) == 'true')
+				{
+					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
+				}
+			}
+
+			$keys = array_keys($this->data['links']);
+			foreach ($keys as $key)
+			{
+				if (SimplePie_Misc::is_isegment_nz_nc($key))
+				{
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
+						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+					}
+					else
+					{
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+					}
+				}
+				elseif (substr($key, 0, 41) == SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				{
+					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+				}
+				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
+			}
+		}
+		if (isset($this->data['links'][$rel]))
+		{
+			return $this->data['links'][$rel];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * @todo Add ability to prefer one type of content over another (in a media group).
+	 */
+	function get_enclosure($key = 0, $prefer = null)
+	{
+		$enclosures = $this->get_enclosures();
+		if (isset($enclosures[$key]))
+		{
+			return $enclosures[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Grabs all available enclosures (podcasts, etc.)
+	 *
+	 * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS.
+	 *
+	 * At this point, we're pretty much assuming that all enclosures for an item are the same content.  Anything else is too complicated to properly support.
+	 *
+	 * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4).
+	 * @todo Add support for itunes: tags.  These should be relatively simple compared to media:.
+	 * @todo If an element exists at a level, but it's value is empty, we should fall back to the value from the parent (if it exists).
+	 */
+	function get_enclosures()
+	{
+		if (!isset($this->data['enclosures']))
+		{
+			$this->data['enclosures'] = array();
+
+			// Elements
+			$captions_parent = null;
+			$categories_parent = null;
+			$copyrights_parent = null;
+			$credits_parent = null;
+			$description_parent = null;
+			$duration_parent = null;
+			$hashes_parent = null;
+			$keywords_parent = null;
+			$player_parent = null;
+			$ratings_parent = null;
+			$restrictions_parent = null;
+			$thumbnails_parent = null;
+			$title_parent = null;
+
+			// Let's do the channel and item-level ones first, and just re-use them if we need to.
+			$parent = $this->get_feed();
+
+			// CAPTIONS
+			if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+				}
+			}
+			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			{
+				foreach ($captions as $caption)
+				{
+					$caption_type = null;
+					$caption_lang = null;
+					$caption_startTime = null;
+					$caption_endTime = null;
+					$caption_text = null;
+					if (isset($caption['attribs']['']['type']))
+					{
+						$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['lang']))
+					{
+						$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['start']))
+					{
+						$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['attribs']['']['end']))
+					{
+						$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($caption['data']))
+					{
+						$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$captions_parent[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+				}
+			}
+			if (is_array($captions_parent))
+			{
+				$captions_parent = array_values(SimplePie_Misc::array_unique($captions_parent));
+			}
+
+			// CATEGORIES
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category)
+			{
+				$term = null;
+				$scheme = null;
+				$label = null;
+				if (isset($category['data']))
+				{
+					$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($category['attribs']['']['scheme']))
+				{
+					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				else
+				{
+					$scheme = 'http://search.yahoo.com/mrss/category_schema';
+				}
+				if (isset($category['attribs']['']['label']))
+				{
+					$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+			}
+			foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category)
+			{
+				$term = null;
+				$scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd';
+				$label = null;
+				if (isset($category['attribs']['']['text']))
+				{
+					$label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+
+				if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category']))
+				{
+					foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory)
+					{
+						if (isset($subcategory['attribs']['']['text']))
+						{
+							$label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						$categories_parent[] =& new $this->feed->category_class($term, $scheme, $label);
+					}
+				}
+			}
+			if (is_array($categories_parent))
+			{
+				$categories_parent = array_values(SimplePie_Misc::array_unique($categories_parent));
+			}
+
+			// COPYRIGHT
+			if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+			}
+			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			{
+				$copyright_url = null;
+				$copyright_label = null;
+				if (isset($copyright[0]['attribs']['']['url']))
+				{
+					$copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				if (isset($copyright[0]['data']))
+				{
+					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+				$copyrights_parent =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+			}
+
+			// CREDITS
+			if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+				}
+			}
+			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			{
+				foreach ($credits as $credit)
+				{
+					$credit_role = null;
+					$credit_scheme = null;
+					$credit_name = null;
+					if (isset($credit['attribs']['']['role']))
+					{
+						$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($credit['attribs']['']['scheme']))
+					{
+						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$credit_scheme = 'urn:ebu';
+					}
+					if (isset($credit['data']))
+					{
+						$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$credits_parent[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+				}
+			}
+			if (is_array($credits_parent))
+			{
+				$credits_parent = array_values(SimplePie_Misc::array_unique($credits_parent));
+			}
+
+			// DESCRIPTION
+			if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			{
+				if (isset($description_parent[0]['data']))
+				{
+					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// DURATION
+			if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration'))
+			{
+				$seconds = null;
+				$minutes = null;
+				$hours = null;
+				if (isset($duration_parent[0]['data']))
+				{
+					$temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					if (sizeof($temp) > 0)
+					{
+						(int) $seconds = array_pop($temp);
+					}
+					if (sizeof($temp) > 0)
+					{
+						(int) $minutes = array_pop($temp);
+						$seconds += $minutes * 60;
+					}
+					if (sizeof($temp) > 0)
+					{
+						(int) $hours = array_pop($temp);
+						$seconds += $hours * 3600;
+					}
+					unset($temp);
+					$duration_parent = $seconds;
+				}
+			}
+
+			// HASHES
+			if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			{
+				foreach ($hashes_iterator as $hash)
+				{
+					$value = null;
+					$algo = null;
+					if (isset($hash['data']))
+					{
+						$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($hash['attribs']['']['algo']))
+					{
+						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$algo = 'md5';
+					}
+					$hashes_parent[] = $algo.':'.$value;
+				}
+			}
+			if (is_array($hashes_parent))
+			{
+				$hashes_parent = array_values(SimplePie_Misc::array_unique($hashes_parent));
+			}
+
+			// KEYWORDS
+			if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			{
+				if (isset($keywords[0]['data']))
+				{
+					$temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+					foreach ($temp as $word)
+					{
+						$keywords_parent[] = trim($word);
+					}
+				}
+				unset($temp);
+			}
+			if (is_array($keywords_parent))
+			{
+				$keywords_parent = array_values(SimplePie_Misc::array_unique($keywords_parent));
+			}
+
+			// PLAYER
+			if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			{
+				if (isset($player_parent[0]['attribs']['']['url']))
+				{
+					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+				}
+			}
+
+			// RATINGS
+			if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+				}
+			}
+			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = null;
+					$rating_value = null;
+					if (isset($rating['attribs']['']['scheme']))
+					{
+						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					else
+					{
+						$rating_scheme = 'urn:simple';
+					}
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+				}
+			}
+			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			{
+				foreach ($ratings as $rating)
+				{
+					$rating_scheme = 'urn:itunes';
+					$rating_value = null;
+					if (isset($rating['data']))
+					{
+						$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$ratings_parent[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+				}
+			}
+			if (is_array($ratings_parent))
+			{
+				$ratings_parent = array_values(SimplePie_Misc::array_unique($ratings_parent));
+			}
+
+			// RESTRICTIONS
+			if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+				}
+			}
+			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = null;
+					$restriction_type = null;
+					$restriction_value = null;
+					if (isset($restriction['attribs']['']['relationship']))
+					{
+						$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['attribs']['']['type']))
+					{
+						$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($restriction['data']))
+					{
+						$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+				}
+			}
+			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			{
+				foreach ($restrictions as $restriction)
+				{
+					$restriction_relationship = 'allow';
+					$restriction_type = null;
+					$restriction_value = 'itunes';
+					if (isset($restriction['data']) && strtolower($restriction['data']) == 'yes')
+					{
+						$restriction_relationship = 'deny';
+					}
+					$restrictions_parent[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+				}
+			}
+			if (is_array($restrictions_parent))
+			{
+				$restrictions_parent = array_values(SimplePie_Misc::array_unique($restrictions_parent));
+			}
+
+			// THUMBNAILS
+			if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			{
+				foreach ($thumbnails as $thumbnail)
+				{
+					if (isset($thumbnail['attribs']['']['url']))
+					{
+						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+					}
+				}
+			}
+
+			// TITLES
+			if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			{
+				if (isset($title_parent[0]['data']))
+				{
+					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+				}
+			}
+
+			// Clear the memory
+			unset($parent);
+
+			// If we have media:group tags, loop through them.
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
+			{
+				// If we have media:content tags, loop through them.
+				foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+				{
+					if (isset($content['attribs']['']['url']))
+					{
+						// Attributes
+						$bitrate = null;
+						$channels = null;
+						$duration = null;
+						$expression = null;
+						$framerate = null;
+						$height = null;
+						$javascript = null;
+						$lang = null;
+						$length = null;
+						$medium = null;
+						$samplingrate = null;
+						$type = null;
+						$url = null;
+						$width = null;
+
+						// Elements
+						$captions = null;
+						$categories = null;
+						$copyrights = null;
+						$credits = null;
+						$description = null;
+						$hashes = null;
+						$keywords = null;
+						$player = null;
+						$ratings = null;
+						$restrictions = null;
+						$thumbnails = null;
+						$title = null;
+
+						// Start checking the attributes of media:content
+						if (isset($content['attribs']['']['bitrate']))
+						{
+							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['channels']))
+						{
+							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['duration']))
+						{
+							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$duration = $duration_parent;
+						}
+						if (isset($content['attribs']['']['expression']))
+						{
+							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['framerate']))
+						{
+							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['height']))
+						{
+							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['lang']))
+						{
+							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['fileSize']))
+						{
+							$length = ceil($content['attribs']['']['fileSize']);
+						}
+						if (isset($content['attribs']['']['medium']))
+						{
+							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['samplingrate']))
+						{
+							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['type']))
+						{
+							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['width']))
+						{
+							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+
+						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+						// CAPTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+							{
+								$caption_type = null;
+								$caption_lang = null;
+								$caption_startTime = null;
+								$caption_endTime = null;
+								$caption_text = null;
+								if (isset($caption['attribs']['']['type']))
+								{
+									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['lang']))
+								{
+									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['start']))
+								{
+									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['end']))
+								{
+									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['data']))
+								{
+									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+							}
+							if (is_array($captions))
+							{
+								$captions = array_values(SimplePie_Misc::array_unique($captions));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+							{
+								$caption_type = null;
+								$caption_lang = null;
+								$caption_startTime = null;
+								$caption_endTime = null;
+								$caption_text = null;
+								if (isset($caption['attribs']['']['type']))
+								{
+									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['lang']))
+								{
+									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['start']))
+								{
+									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['end']))
+								{
+									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['data']))
+								{
+									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+							}
+							if (is_array($captions))
+							{
+								$captions = array_values(SimplePie_Misc::array_unique($captions));
+							}
+						}
+						else
+						{
+							$captions = $captions_parent;
+						}
+
+						// CATEGORIES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+						{
+							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+							{
+								$term = null;
+								$scheme = null;
+								$label = null;
+								if (isset($category['data']))
+								{
+									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($category['attribs']['']['scheme']))
+								{
+									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$scheme = 'http://search.yahoo.com/mrss/category_schema';
+								}
+								if (isset($category['attribs']['']['label']))
+								{
+									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
+							}
+						}
+						if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+						{
+							foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+							{
+								$term = null;
+								$scheme = null;
+								$label = null;
+								if (isset($category['data']))
+								{
+									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($category['attribs']['']['scheme']))
+								{
+									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$scheme = 'http://search.yahoo.com/mrss/category_schema';
+								}
+								if (isset($category['attribs']['']['label']))
+								{
+									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
+							}
+						}
+						if (is_array($categories) && is_array($categories_parent))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique(array_merge($categories, $categories_parent)));
+						}
+						elseif (is_array($categories))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique($categories));
+						}
+						elseif (is_array($categories_parent))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique($categories_parent));
+						}
+
+						// COPYRIGHTS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+						{
+							$copyright_url = null;
+							$copyright_label = null;
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+							{
+								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+							{
+								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+						{
+							$copyright_url = null;
+							$copyright_label = null;
+							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+							{
+								$copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+							{
+								$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+						}
+						else
+						{
+							$copyrights = $copyrights_parent;
+						}
+
+						// CREDITS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+							{
+								$credit_role = null;
+								$credit_scheme = null;
+								$credit_name = null;
+								if (isset($credit['attribs']['']['role']))
+								{
+									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($credit['attribs']['']['scheme']))
+								{
+									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$credit_scheme = 'urn:ebu';
+								}
+								if (isset($credit['data']))
+								{
+									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+							}
+							if (is_array($credits))
+							{
+								$credits = array_values(SimplePie_Misc::array_unique($credits));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+							{
+								$credit_role = null;
+								$credit_scheme = null;
+								$credit_name = null;
+								if (isset($credit['attribs']['']['role']))
+								{
+									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($credit['attribs']['']['scheme']))
+								{
+									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$credit_scheme = 'urn:ebu';
+								}
+								if (isset($credit['data']))
+								{
+									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+							}
+							if (is_array($credits))
+							{
+								$credits = array_values(SimplePie_Misc::array_unique($credits));
+							}
+						}
+						else
+						{
+							$credits = $credits_parent;
+						}
+
+						// DESCRIPTION
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+						{
+							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+						{
+							$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$description = $description_parent;
+						}
+
+						// HASHES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+							{
+								$value = null;
+								$algo = null;
+								if (isset($hash['data']))
+								{
+									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($hash['attribs']['']['algo']))
+								{
+									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$algo = 'md5';
+								}
+								$hashes[] = $algo.':'.$value;
+							}
+							if (is_array($hashes))
+							{
+								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+							{
+								$value = null;
+								$algo = null;
+								if (isset($hash['data']))
+								{
+									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($hash['attribs']['']['algo']))
+								{
+									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$algo = 'md5';
+								}
+								$hashes[] = $algo.':'.$value;
+							}
+							if (is_array($hashes))
+							{
+								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
+							}
+						}
+						else
+						{
+							$hashes = $hashes_parent;
+						}
+
+						// KEYWORDS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+						{
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+							{
+								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+								foreach ($temp as $word)
+								{
+									$keywords[] = trim($word);
+								}
+								unset($temp);
+							}
+							if (is_array($keywords))
+							{
+								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+						{
+							if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+							{
+								$temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+								foreach ($temp as $word)
+								{
+									$keywords[] = trim($word);
+								}
+								unset($temp);
+							}
+							if (is_array($keywords))
+							{
+								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
+							}
+						}
+						else
+						{
+							$keywords = $keywords_parent;
+						}
+
+						// PLAYER
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+						{
+							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+						{
+							$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						else
+						{
+							$player = $player_parent;
+						}
+
+						// RATINGS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+							{
+								$rating_scheme = null;
+								$rating_value = null;
+								if (isset($rating['attribs']['']['scheme']))
+								{
+									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$rating_scheme = 'urn:simple';
+								}
+								if (isset($rating['data']))
+								{
+									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+							}
+							if (is_array($ratings))
+							{
+								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+							{
+								$rating_scheme = null;
+								$rating_value = null;
+								if (isset($rating['attribs']['']['scheme']))
+								{
+									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$rating_scheme = 'urn:simple';
+								}
+								if (isset($rating['data']))
+								{
+									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+							}
+							if (is_array($ratings))
+							{
+								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
+							}
+						}
+						else
+						{
+							$ratings = $ratings_parent;
+						}
+
+						// RESTRICTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+							{
+								$restriction_relationship = null;
+								$restriction_type = null;
+								$restriction_value = null;
+								if (isset($restriction['attribs']['']['relationship']))
+								{
+									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['attribs']['']['type']))
+								{
+									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['data']))
+								{
+									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+							}
+							if (is_array($restrictions))
+							{
+								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+							{
+								$restriction_relationship = null;
+								$restriction_type = null;
+								$restriction_value = null;
+								if (isset($restriction['attribs']['']['relationship']))
+								{
+									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['attribs']['']['type']))
+								{
+									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['data']))
+								{
+									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+							}
+							if (is_array($restrictions))
+							{
+								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
+							}
+						}
+						else
+						{
+							$restrictions = $restrictions_parent;
+						}
+
+						// THUMBNAILS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+							{
+								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							if (is_array($thumbnails))
+							{
+								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
+							}
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+						{
+							foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+							{
+								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							if (is_array($thumbnails))
+							{
+								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
+							}
+						}
+						else
+						{
+							$thumbnails = $thumbnails_parent;
+						}
+
+						// TITLES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+						{
+							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+						{
+							$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$title = $title_parent;
+						}
+
+						$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+					}
+				}
+			}
+
+			// If we have standalone media:content tags, loop through them.
+			if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+			{
+				foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
+				{
+					if (isset($content['attribs']['']['url']))
+					{
+						// Attributes
+						$bitrate = null;
+						$channels = null;
+						$duration = null;
+						$expression = null;
+						$framerate = null;
+						$height = null;
+						$javascript = null;
+						$lang = null;
+						$length = null;
+						$medium = null;
+						$samplingrate = null;
+						$type = null;
+						$url = null;
+						$width = null;
+
+						// Elements
+						$captions = null;
+						$categories = null;
+						$copyrights = null;
+						$credits = null;
+						$description = null;
+						$hashes = null;
+						$keywords = null;
+						$player = null;
+						$ratings = null;
+						$restrictions = null;
+						$thumbnails = null;
+						$title = null;
+
+						// Start checking the attributes of media:content
+						if (isset($content['attribs']['']['bitrate']))
+						{
+							$bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['channels']))
+						{
+							$channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['duration']))
+						{
+							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$duration = $duration_parent;
+						}
+						if (isset($content['attribs']['']['expression']))
+						{
+							$expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['framerate']))
+						{
+							$framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['height']))
+						{
+							$height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['lang']))
+						{
+							$lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['fileSize']))
+						{
+							$length = ceil($content['attribs']['']['fileSize']);
+						}
+						if (isset($content['attribs']['']['medium']))
+						{
+							$medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['samplingrate']))
+						{
+							$samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['type']))
+						{
+							$type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						if (isset($content['attribs']['']['width']))
+						{
+							$width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						$url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+
+						// Checking the other optional media: elements. Priority: media:content, media:group, item, channel
+
+						// CAPTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
+							{
+								$caption_type = null;
+								$caption_lang = null;
+								$caption_startTime = null;
+								$caption_endTime = null;
+								$caption_text = null;
+								if (isset($caption['attribs']['']['type']))
+								{
+									$caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['lang']))
+								{
+									$caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['start']))
+								{
+									$caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['attribs']['']['end']))
+								{
+									$caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($caption['data']))
+								{
+									$caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$captions[] =& new $this->feed->caption_class($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text);
+							}
+							if (is_array($captions))
+							{
+								$captions = array_values(SimplePie_Misc::array_unique($captions));
+							}
+						}
+						else
+						{
+							$captions = $captions_parent;
+						}
+
+						// CATEGORIES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category']))
+						{
+							foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category)
+							{
+								$term = null;
+								$scheme = null;
+								$label = null;
+								if (isset($category['data']))
+								{
+									$term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($category['attribs']['']['scheme']))
+								{
+									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$scheme = 'http://search.yahoo.com/mrss/category_schema';
+								}
+								if (isset($category['attribs']['']['label']))
+								{
+									$label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$categories[] =& new $this->feed->category_class($term, $scheme, $label);
+							}
+						}
+						if (is_array($categories) && is_array($categories_parent))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique(array_merge($categories, $categories_parent)));
+						}
+						elseif (is_array($categories))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique($categories));
+						}
+						elseif (is_array($categories_parent))
+						{
+							$categories = array_values(SimplePie_Misc::array_unique($categories_parent));
+						}
+						else
+						{
+							$categories = null;
+						}
+
+						// COPYRIGHTS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+						{
+							$copyright_url = null;
+							$copyright_label = null;
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url']))
+							{
+								$copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data']))
+							{
+								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+							}
+							$copyrights =& new $this->feed->copyright_class($copyright_url, $copyright_label);
+						}
+						else
+						{
+							$copyrights = $copyrights_parent;
+						}
+
+						// CREDITS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
+							{
+								$credit_role = null;
+								$credit_scheme = null;
+								$credit_name = null;
+								if (isset($credit['attribs']['']['role']))
+								{
+									$credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($credit['attribs']['']['scheme']))
+								{
+									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$credit_scheme = 'urn:ebu';
+								}
+								if (isset($credit['data']))
+								{
+									$credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$credits[] =& new $this->feed->credit_class($credit_role, $credit_scheme, $credit_name);
+							}
+							if (is_array($credits))
+							{
+								$credits = array_values(SimplePie_Misc::array_unique($credits));
+							}
+						}
+						else
+						{
+							$credits = $credits_parent;
+						}
+
+						// DESCRIPTION
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+						{
+							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$description = $description_parent;
+						}
+
+						// HASHES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
+							{
+								$value = null;
+								$algo = null;
+								if (isset($hash['data']))
+								{
+									$value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($hash['attribs']['']['algo']))
+								{
+									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$algo = 'md5';
+								}
+								$hashes[] = $algo.':'.$value;
+							}
+							if (is_array($hashes))
+							{
+								$hashes = array_values(SimplePie_Misc::array_unique($hashes));
+							}
+						}
+						else
+						{
+							$hashes = $hashes_parent;
+						}
+
+						// KEYWORDS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+						{
+							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
+							{
+								$temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT));
+								foreach ($temp as $word)
+								{
+									$keywords[] = trim($word);
+								}
+								unset($temp);
+							}
+							if (is_array($keywords))
+							{
+								$keywords = array_values(SimplePie_Misc::array_unique($keywords));
+							}
+						}
+						else
+						{
+							$keywords = $keywords_parent;
+						}
+
+						// PLAYER
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+						{
+							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+						}
+						else
+						{
+							$player = $player_parent;
+						}
+
+						// RATINGS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
+							{
+								$rating_scheme = null;
+								$rating_value = null;
+								if (isset($rating['attribs']['']['scheme']))
+								{
+									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								else
+								{
+									$rating_scheme = 'urn:simple';
+								}
+								if (isset($rating['data']))
+								{
+									$rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$ratings[] =& new $this->feed->rating_class($rating_scheme, $rating_value);
+							}
+							if (is_array($ratings))
+							{
+								$ratings = array_values(SimplePie_Misc::array_unique($ratings));
+							}
+						}
+						else
+						{
+							$ratings = $ratings_parent;
+						}
+
+						// RESTRICTIONS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
+							{
+								$restriction_relationship = null;
+								$restriction_type = null;
+								$restriction_value = null;
+								if (isset($restriction['attribs']['']['relationship']))
+								{
+									$restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['attribs']['']['type']))
+								{
+									$restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								if (isset($restriction['data']))
+								{
+									$restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+								}
+								$restrictions[] =& new $this->feed->restriction_class($restriction_relationship, $restriction_type, $restriction_value);
+							}
+							if (is_array($restrictions))
+							{
+								$restrictions = array_values(SimplePie_Misc::array_unique($restrictions));
+							}
+						}
+						else
+						{
+							$restrictions = $restrictions_parent;
+						}
+
+						// THUMBNAILS
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+						{
+							foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
+							{
+								$thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
+							}
+							if (is_array($thumbnails))
+							{
+								$thumbnails = array_values(SimplePie_Misc::array_unique($thumbnails));
+							}
+						}
+						else
+						{
+							$thumbnails = $thumbnails_parent;
+						}
+
+						// TITLES
+						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+						{
+							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
+						}
+						else
+						{
+							$title = $title_parent;
+						}
+
+						$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width);
+					}
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+				}
+			}
+
+			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
+			{
+				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] == 'enclosure')
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link));
+					if (isset($link['attribs']['']['type']))
+					{
+						$type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($link['attribs']['']['length']))
+					{
+						$length = ceil($link['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+				}
+			}
+
+			if ($enclosure = $this->get_item_tags('', 'enclosure'))
+			{
+				if (isset($enclosure[0]['attribs']['']['url']))
+				{
+					// Attributes
+					$bitrate = null;
+					$channels = null;
+					$duration = null;
+					$expression = null;
+					$framerate = null;
+					$height = null;
+					$javascript = null;
+					$lang = null;
+					$length = null;
+					$medium = null;
+					$samplingrate = null;
+					$type = null;
+					$url = null;
+					$width = null;
+
+					$url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0]));
+					if (isset($enclosure[0]['attribs']['']['type']))
+					{
+						$type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT);
+					}
+					if (isset($enclosure[0]['attribs']['']['length']))
+					{
+						$length = ceil($enclosure[0]['attribs']['']['length']);
+					}
+
+					// Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor
+					$this->data['enclosures'][] =& new $this->feed->enclosure_class($url, $type, $length, $this->feed->javascript, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width);
+				}
+			}
+			$this->data['enclosures'] = array_values(SimplePie_Misc::array_unique($this->data['enclosures']));
+		}
+		if (!empty($this->data['enclosures']))
+		{
+			return $this->data['enclosures'];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_latitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
+		{
+			return (float) $match[1];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_longitude()
+	{
+		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		{
+			return (float) $return[0]['data'];
+		}
+		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', $return[0]['data'], $match))
+		{
+			return (float) $match[2];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	/**
+	 * Creates the add_to_* methods' return data
+	 *
+	 * @access private
+	 * @param string $item_url String to prefix to the item permalink
+	 * @param string $title_url String to prefix to the item title
+	 * (and suffix to the item permalink)
+	 * @return mixed URL if feed exists, false otherwise
+	 */
+	function add_to_service($item_url, $title_url = null)
+	{
+		if ($this->get_permalink() !== null)
+		{
+			$return = $this->sanitize($item_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_permalink());
+			if ($title_url !== null && $this->get_title() !== null)
+			{
+				$return .= $this->sanitize($title_url, SIMPLEPIE_CONSTRUCT_IRI) . rawurlencode($this->get_title());
+			}
+			return $return;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function add_to_blinklist()
+	{
+		return $this->add_to_service('http://www.blinklist.com/index.php?Action=Blink/addblink.php&Description=&Url=', '&Title=');
+	}
+
+	function add_to_blogmarks()
+	{
+		return $this->add_to_service('http://blogmarks.net/my/new.php?mini=1&simple=1&url=', '&title=');
+	}
+
+	function add_to_delicious()
+	{
+		return $this->add_to_service('http://del.icio.us/post/?v=3&url=', '&title=');
+	}
+
+	function add_to_digg()
+	{
+		return $this->add_to_service('http://digg.com/submit?phase=2&URL=');
+	}
+
+	function add_to_furl()
+	{
+		return $this->add_to_service('http://www.furl.net/storeIt.jsp?u=', '&t=');
+	}
+
+	function add_to_magnolia()
+	{
+		return $this->add_to_service('http://ma.gnolia.com/bookmarklet/add?url=', '&title=');
+	}
+
+	function add_to_myweb20()
+	{
+		return $this->add_to_service('http://myweb2.search.yahoo.com/myresults/bookmarklet?u=', '&t=');
+	}
+
+	function add_to_newsvine()
+	{
+		return $this->add_to_service('http://www.newsvine.com/_wine/save?u=', '&h=');
+	}
+
+	function add_to_reddit()
+	{
+		return $this->add_to_service('http://reddit.com/submit?url=', '&title=');
+	}
+
+	function add_to_segnalo()
+	{
+		return $this->add_to_service('http://segnalo.com/post.html.php?url=', '&title=');
+	}
+
+	function add_to_simpy()
+	{
+		return $this->add_to_service('http://www.simpy.com/simpy/LinkAdd.do?href=', '&title=');
+	}
+
+	function add_to_spurl()
+	{
+		return $this->add_to_service('http://www.spurl.net/spurl.php?v=3&url=', '&title=');
+	}
+
+	function add_to_wists()
+	{
+		return $this->add_to_service('http://wists.com/r.php?c=&r=', '&title=');
+	}
+
+	function search_technorati()
+	{
+		return $this->add_to_service('http://www.technorati.com/search/');
+	}
+}
+
+class SimplePie_Author
+{
+	var $name;
+	var $link;
+	var $email;
+
+	// Constructor, used to input the data
+	function SimplePie_Author($name = null, $link = null, $email = null)
+	{
+		$this->name = $name;
+		$this->link = $link;
+		$this->email = $email;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return $this->link;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_email()
+	{
+		if ($this->email !== null)
+		{
+			return $this->email;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+class SimplePie_Category
+{
+	var $term;
+	var $scheme;
+	var $label;
+
+	// Constructor, used to input the data
+	function SimplePie_Category($term = null, $scheme = null, $label = null)
+	{
+		$this->term = $term;
+		$this->scheme = $scheme;
+		$this->label = $label;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_term()
+	{
+		if ($this->term !== null)
+		{
+			return $this->term;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_label()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return $this->get_term();
+		}
+	}
+}
+
+class SimplePie_Enclosure
+{
+	var $bitrate;
+	var $captions;
+	var $categories;
+	var $channels;
+	var $copyright;
+	var $credits;
+	var $description;
+	var $duration;
+	var $expression;
+	var $framerate;
+	var $handler;
+	var $hashes;
+	var $height;
+	var $javascript;
+	var $keywords;
+	var $lang;
+	var $length;
+	var $link;
+	var $medium;
+	var $player;
+	var $ratings;
+	var $restrictions;
+	var $samplingrate;
+	var $thumbnails;
+	var $title;
+	var $type;
+	var $width;
+
+	// Constructor, used to input the data
+	function SimplePie_Enclosure($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null)
+	{
+		$this->bitrate = $bitrate;
+		$this->captions = $captions;
+		$this->categories = $categories;
+		$this->channels = $channels;
+		$this->copyright = $copyright;
+		$this->credits = $credits;
+		$this->description = $description;
+		$this->duration = $duration;
+		$this->expression = $expression;
+		$this->framerate = $framerate;
+		$this->hashes = $hashes;
+		$this->height = $height;
+		$this->javascript = $javascript;
+		$this->keywords = $keywords;
+		$this->lang = $lang;
+		$this->length = $length;
+		$this->link = $link;
+		$this->medium = $medium;
+		$this->player = $player;
+		$this->ratings = $ratings;
+		$this->restrictions = $restrictions;
+		$this->samplingrate = $samplingrate;
+		$this->thumbnails = $thumbnails;
+		$this->title = $title;
+		$this->type = $type;
+		$this->width = $width;
+		if (class_exists('idna_convert'))
+		{
+			$idn =& new idna_convert;
+			$parsed = SimplePie_Misc::parse_url($link);
+			$this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->handler = $this->get_handler(); // Needs to load last
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_bitrate()
+	{
+		if ($this->bitrate !== null)
+		{
+			return $this->bitrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_caption($key = 0)
+	{
+		$captions = $this->get_captions();
+		if (isset($captions[$key]))
+		{
+			return $captions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_captions()
+	{
+		if ($this->captions !== null)
+		{
+			return $this->captions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_category($key = 0)
+	{
+		$categories = $this->get_categories();
+		if (isset($categories[$key]))
+		{
+			return $categories[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_categories()
+	{
+		if ($this->categories !== null)
+		{
+			return $this->categories;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_channels()
+	{
+		if ($this->channels !== null)
+		{
+			return $this->channels;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_copyright()
+	{
+		if ($this->copyright !== null)
+		{
+			return $this->copyright;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_credit($key = 0)
+	{
+		$credits = $this->get_credits();
+		if (isset($credits[$key]))
+		{
+			return $credits[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_credits()
+	{
+		if ($this->credits !== null)
+		{
+			return $this->credits;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_description()
+	{
+		if ($this->description !== null)
+		{
+			return $this->description;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_duration($convert = false)
+	{
+		if ($this->duration !== null)
+		{
+			if ($convert)
+			{
+				$time = SimplePie_Misc::time_hms($this->duration);
+				return $time;
+			}
+			else
+			{
+				return $this->duration;
+			}
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_expression()
+	{
+		if ($this->expression !== null)
+		{
+			return $this->expression;
+		}
+		else
+		{
+			return 'full';
+		}
+	}
+
+	function get_extension()
+	{
+		if ($this->link !== null)
+		{
+			$url = SimplePie_Misc::parse_url($this->link);
+			if ($url['path'] !== '')
+			{
+				return pathinfo($url['path'], PATHINFO_EXTENSION);
+			}
+		}
+		return null;
+	}
+
+	function get_framerate()
+	{
+		if ($this->framerate !== null)
+		{
+			return $this->framerate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_handler()
+	{
+		return $this->get_real_type(true);
+	}
+
+	function get_hash($key = 0)
+	{
+		$hashes = $this->get_hashes();
+		if (isset($hashes[$key]))
+		{
+			return $hashes[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_hashes()
+	{
+		if ($this->hashes !== null)
+		{
+			return $this->hashes;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_height()
+	{
+		if ($this->height !== null)
+		{
+			return $this->height;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_language()
+	{
+		if ($this->lang !== null)
+		{
+			return $this->lang;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_keyword($key = 0)
+	{
+		$keywords = $this->get_keywords();
+		if (isset($keywords[$key]))
+		{
+			return $keywords[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_keywords()
+	{
+		if ($this->keywords !== null)
+		{
+			return $this->keywords;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_length()
+	{
+		if ($this->length !== null)
+		{
+			return $this->length;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_link()
+	{
+		if ($this->link !== null)
+		{
+			return urldecode($this->link);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_medium()
+	{
+		if ($this->medium !== null)
+		{
+			return $this->medium;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_player()
+	{
+		if ($this->player !== null)
+		{
+			return $this->player;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_rating($key = 0)
+	{
+		$ratings = $this->get_ratings();
+		if (isset($ratings[$key]))
+		{
+			return $ratings[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_ratings()
+	{
+		if ($this->ratings !== null)
+		{
+			return $this->ratings;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_restriction($key = 0)
+	{
+		$restrictions = $this->get_restrictions();
+		if (isset($restrictions[$key]))
+		{
+			return $restrictions[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_restrictions()
+	{
+		if ($this->restrictions !== null)
+		{
+			return $this->restrictions;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_sampling_rate()
+	{
+		if ($this->samplingrate !== null)
+		{
+			return $this->samplingrate;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_size()
+	{
+		$length = $this->get_length();
+		if ($length !== null)
+		{
+			return round($length/1048576, 2);
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_thumbnail($key = 0)
+	{
+		$thumbnails = $this->get_thumbnails();
+		if (isset($thumbnails[$key]))
+		{
+			return $thumbnails[$key];
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_thumbnails()
+	{
+		if ($this->thumbnails !== null)
+		{
+			return $this->thumbnails;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_title()
+	{
+		if ($this->title !== null)
+		{
+			return $this->title;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_width()
+	{
+		if ($this->width !== null)
+		{
+			return $this->width;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function native_embed($options='')
+	{
+		return $this->embed($options, true);
+	}
+
+	/**
+	 * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'.
+	 */
+	function embed($options = '', $native = false)
+	{
+		// Set up defaults
+		$audio = '';
+		$video = '';
+		$alt = '';
+		$altclass = '';
+		$loop = 'false';
+		$width = 'auto';
+		$height = 'auto';
+		$bgcolor = '#ffffff';
+		$mediaplayer = '';
+		$widescreen = false;
+		$handler = $this->get_handler();
+		$type = $this->get_real_type();
+
+		// Process options and reassign values as necessary
+		if (is_array($options))
+		{
+			extract($options);
+		}
+		else
+		{
+			$options = explode(',', $options);
+			foreach($options as $option)
+			{
+				$opt = explode(':', $option, 2);
+				if (isset($opt[0], $opt[1]))
+				{
+					$opt[0] = trim($opt[0]);
+					$opt[1] = trim($opt[1]);
+					switch ($opt[0])
+					{
+						case 'audio':
+							$audio = $opt[1];
+							break;
+
+						case 'video':
+							$video = $opt[1];
+							break;
+
+						case 'alt':
+							$alt = $opt[1];
+							break;
+
+						case 'altclass':
+							$altclass = $opt[1];
+							break;
+
+						case 'loop':
+							$loop = $opt[1];
+							break;
+
+						case 'width':
+							$width = $opt[1];
+							break;
+
+						case 'height':
+							$height = $opt[1];
+							break;
+
+						case 'bgcolor':
+							$bgcolor = $opt[1];
+							break;
+
+						case 'mediaplayer':
+							$mediaplayer = $opt[1];
+							break;
+
+						case 'widescreen':
+							$widescreen = $opt[1];
+							break;
+					}
+				}
+			}
+		}
+
+		$mime = explode('/', $type, 2);
+		$mime = $mime[0];
+
+		// Process values for 'auto'
+		if ($width == 'auto')
+		{
+			if ($mime == 'video')
+			{
+				if ($height == 'auto')
+				{
+					$width = 480;
+				}
+				elseif ($widescreen)
+				{
+					$width = round((intval($height)/9)*16);
+				}
+				else
+				{
+					$width = round((intval($height)/3)*4);
+				}
+			}
+			else
+			{
+				$width = '100%';
+			}
+		}
+
+		if ($height == 'auto')
+		{
+			if ($mime == 'audio')
+			{
+				$height = 0;
+			}
+			elseif ($mime == 'video')
+			{
+				if ($width == 'auto')
+				{
+					if ($widescreen)
+					{
+						$height = 270;
+					}
+					else
+					{
+						$height = 360;
+					}
+				}
+				elseif ($widescreen)
+				{
+					$height = round((intval($width)/16)*9);
+				}
+				else
+				{
+					$height = round((intval($width)/4)*3);
+				}
+			}
+			else
+			{
+				$height = 376;
+			}
+		}
+		elseif ($mime == 'audio')
+		{
+			$height = 0;
+		}
+
+		// Set proper placeholder value
+		if ($mime == 'audio')
+		{
+			$placeholder = $audio;
+		}
+		elseif ($mime == 'video')
+		{
+			$placeholder = $video;
+		}
+
+		$embed = '';
+
+		// Make sure the JS library is included
+		if (!$native)
+		{
+			static $javascript_outputted = null;
+			if (!$javascript_outputted && $this->javascript)
+			{
+				$embed .= '<script type="text/javascript" src="?' . htmlspecialchars($this->javascript) . '"></script>';
+				$javascript_outputted = true;
+			}
+		}
+
+		// Odeo Feed MP3's
+		if ($handler == 'odeo')
+		{
+			if ($native)
+			{
+				$embed .= '<embed src="http://odeo.com/flash/audio_player_fullsize.swf" pluginspage="http://adobe.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="440" height="80" wmode="transparent" allowScriptAccess="any" flashvars="valid_sample_rate=true&external_url=' . $this->get_link() . '"></embed>';
+			}
+			else
+			{
+				$embed .= '<script type="text/javascript">embed_odeo("' . $this->get_link() . '");</script>';
+			}
+		}
+
+		// Flash
+		elseif ($handler == 'flash')
+		{
+			if ($native)
+			{
+				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+			}
+		}
+
+		// Flash Media Player file types.
+		// Preferred handler for MP3 file types.
+		elseif ($handler == 'fmedia' || ($handler == 'mp3' && $mediaplayer != ''))
+		{
+			$height += 20;
+			if ($native)
+			{
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+			}
+		}
+
+		// QuickTime 7 file types.  Need to test with QuickTime 6.
+		// Only handle MP3's if the Flash Media Player is not present.
+		elseif ($handler == 'quicktime' || ($handler == 'mp3' && $mediaplayer == ''))
+		{
+			$height += 16;
+			if ($native)
+			{
+				if ($placeholder != ""){
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+				else {
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+				}
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+			}
+		}
+
+		// Windows Media
+		elseif ($handler == 'wmedia')
+		{
+			$height += 45;
+			if ($native)
+			{
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+			}
+			else
+			{
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+			}
+		}
+
+		// Everything else
+		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+
+		return $embed;
+	}
+
+	function get_real_type($find_handler = false)
+	{
+		// If it's Odeo, let's get it out of the way.
+		if (substr(strtolower($this->get_link()), 0, 15) == 'http://odeo.com')
+		{
+			return 'odeo';
+		}
+
+		// Mime-types by handler.
+		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
+		$types_fmedia = array('video/flv', 'video/x-flv'); // Flash Media Player
+		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
+		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
+		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
+
+		if ($this->get_type() !== null)
+		{
+			$type = strtolower($this->type);
+		}
+		else
+		{
+			$type = null;
+		}
+
+		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
+		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
+		{
+			switch (strtolower($this->get_extension()))
+			{
+				// Audio mime-types
+				case 'aac':
+				case 'adts':
+					$type = 'audio/acc';
+					break;
+
+				case 'aif':
+				case 'aifc':
+				case 'aiff':
+				case 'cdda':
+					$type = 'audio/aiff';
+					break;
+
+				case 'bwf':
+					$type = 'audio/wav';
+					break;
+
+				case 'kar':
+				case 'mid':
+				case 'midi':
+				case 'smf':
+					$type = 'audio/midi';
+					break;
+
+				case 'm4a':
+					$type = 'audio/x-m4a';
+					break;
+
+				case 'mp3':
+				case 'swa':
+					$type = 'audio/mp3';
+					break;
+
+				case 'wav':
+					$type = 'audio/wav';
+					break;
+
+				case 'wax':
+					$type = 'audio/x-ms-wax';
+					break;
+
+				case 'wma':
+					$type = 'audio/x-ms-wma';
+					break;
+
+				// Video mime-types
+				case '3gp':
+				case '3gpp':
+					$type = 'video/3gpp';
+					break;
+
+				case '3g2':
+				case '3gp2':
+					$type = 'video/3gpp2';
+					break;
+
+				case 'asf':
+					$type = 'video/x-ms-asf';
+					break;
+
+				case 'flv':
+					$type = 'video/x-flv';
+					break;
+
+				case 'm1a':
+				case 'm1s':
+				case 'm1v':
+				case 'm15':
+				case 'm75':
+				case 'mp2':
+				case 'mpa':
+				case 'mpeg':
+				case 'mpg':
+				case 'mpm':
+				case 'mpv':
+					$type = 'video/mpeg';
+					break;
+
+				case 'm4v':
+					$type = 'video/x-m4v';
+					break;
+
+				case 'mov':
+				case 'qt':
+					$type = 'video/quicktime';
+					break;
+
+				case 'mp4':
+				case 'mpg4':
+					$type = 'video/mp4';
+					break;
+
+				case 'sdv':
+					$type = 'video/sd-video';
+					break;
+
+				case 'wm':
+					$type = 'video/x-ms-wm';
+					break;
+
+				case 'wmv':
+					$type = 'video/x-ms-wmv';
+					break;
+
+				case 'wvx':
+					$type = 'video/x-ms-wvx';
+					break;
+
+				// Flash mime-types
+				case 'spl':
+					$type = 'application/futuresplash';
+					break;
+
+				case 'swf':
+					$type = 'application/x-shockwave-flash';
+					break;
+			}
+		}
+
+		if ($find_handler)
+		{
+			if (in_array($type, $types_flash))
+			{
+				return 'flash';
+			}
+			elseif (in_array($type, $types_fmedia))
+			{
+				return 'fmedia';
+			}
+			elseif (in_array($type, $types_quicktime))
+			{
+				return 'quicktime';
+			}
+			elseif (in_array($type, $types_wmedia))
+			{
+				return 'wmedia';
+			}
+			elseif (in_array($type, $types_mp3))
+			{
+				return 'mp3';
+			}
+			else
+			{
+				return null;
+			}
+		}
+		else
+		{
+			return $type;
+		}
+	}
+}
+
+class SimplePie_Caption
+{
+	var $type;
+	var $lang;
+	var $startTime;
+	var $endTime;
+	var $text;
+
+	// Constructor, used to input the data
+	function SimplePie_Caption($type = null, $lang = null, $startTime = null, $endTime = null, $text = null)
+	{
+		$this->type = $type;
+		$this->lang = $lang;
+		$this->startTime = $startTime;
+		$this->endTime = $endTime;
+		$this->text = $text;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_endtime()
+	{
+		if ($this->endTime !== null)
+		{
+			return $this->endTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_language()
+	{
+		if ($this->language !== null)
+		{
+			return $this->language;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_starttime()
+	{
+		if ($this->startTime !== null)
+		{
+			return $this->startTime;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_text()
+	{
+		if ($this->text !== null)
+		{
+			return $this->text;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+class SimplePie_Credit
+{
+	var $role;
+	var $scheme;
+	var $name;
+
+	// Constructor, used to input the data
+	function SimplePie_Credit($role = null, $scheme = null, $name = null)
+	{
+		$this->role = $role;
+		$this->scheme = $scheme;
+		$this->name = $name;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_role()
+	{
+		if ($this->role !== null)
+		{
+			return $this->role;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_name()
+	{
+		if ($this->name !== null)
+		{
+			return $this->name;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+class SimplePie_Copyright
+{
+	var $url;
+	var $label;
+
+	// Constructor, used to input the data
+	function SimplePie_Copyright($url = null, $label = null)
+	{
+		$this->url = $url;
+		$this->label = $label;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_url()
+	{
+		if ($this->url !== null)
+		{
+			return $this->url;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_attribution()
+	{
+		if ($this->label !== null)
+		{
+			return $this->label;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+class SimplePie_Rating
+{
+	var $scheme;
+	var $value;
+
+	// Constructor, used to input the data
+	function SimplePie_Rating($scheme = null, $value = null)
+	{
+		$this->scheme = $scheme;
+		$this->value = $value;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_scheme()
+	{
+		if ($this->scheme !== null)
+		{
+			return $this->scheme;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+class SimplePie_Restriction
+{
+	var $relationship;
+	var $type;
+	var $value;
+
+	// Constructor, used to input the data
+	function SimplePie_Restriction($relationship = null, $type = null, $value = null)
+	{
+		$this->relationship = $relationship;
+		$this->type = $type;
+		$this->value = $value;
+	}
+
+	function __toString()
+	{
+		// There is no $this->data here
+		return md5(serialize($this));
+	}
+
+	function get_relationship()
+	{
+		if ($this->relationship !== null)
+		{
+			return $this->relationship;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_type()
+	{
+		if ($this->type !== null)
+		{
+			return $this->type;
+		}
+		else
+		{
+			return null;
+		}
+	}
+
+	function get_value()
+	{
+		if ($this->value !== null)
+		{
+			return $this->value;
+		}
+		else
+		{
+			return null;
+		}
+	}
+}
+
+/**
+ * @todo Move to properly supporting RFC2616 (HTTP/1.1)
+ */
+class SimplePie_File
+{
+	var $url;
+	var $useragent;
+	var $success = true;
+	var $headers = array();
+	var $body;
+	var $status_code;
+	var $redirects = 0;
+	var $error;
+	var $method;
+
+	function SimplePie_File($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false)
+	{
+		if (class_exists('idna_convert'))
+		{
+			$idn =& new idna_convert;
+			$parsed = SimplePie_Misc::parse_url($url);
+			$url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']);
+		}
+		$this->url = $url;
+		$this->useragent = $useragent;
+		if (preg_match('/^http(s)?:\/\//i', $url))
+		{
+			if ($useragent === null)
+			{
+				$useragent = ini_get('user_agent');
+				$this->useragent = $useragent;
+			}
+			if (!is_array($headers))
+			{
+				$headers = array();
+			}
+			if (!$force_fsockopen && extension_loaded('curl'))
+			{
+				$this->method = 'curl';
+				$fp = curl_init();
+				$headers2 = array();
+				foreach ($headers as $key => $value)
+				{
+					$headers2[] = "$key: $value";
+				}
+				if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>='))
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, '');
+				}
+				curl_setopt($fp, CURLOPT_URL, $url);
+				curl_setopt($fp, CURLOPT_HEADER, 1);
+				curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1);
+				curl_setopt($fp, CURLOPT_TIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout);
+				curl_setopt($fp, CURLOPT_REFERER, $url);
+				curl_setopt($fp, CURLOPT_USERAGENT, $useragent);
+				curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2);
+				if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>='))
+				{
+					curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1);
+					curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects);
+				}
+
+				$this->headers = curl_exec($fp);
+				if (curl_errno($fp) == 23 || curl_errno($fp) == 61)
+				{
+					curl_setopt($fp, CURLOPT_ENCODING, 'none');
+					$this->headers = curl_exec($fp);
+				}
+				if (curl_errno($fp))
+				{
+					$this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp);
+					$this->success = false;
+				}
+				else
+				{
+					$info = curl_getinfo($fp);
+					curl_close($fp);
+					$this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1);
+					$this->headers = array_pop($this->headers);
+					$parser =& new SimplePie_HTTP_Parser($this->headers);
+					if ($parser->parse())
+					{
+						$this->headers = $parser->headers;
+						$this->body = $parser->body;
+						$this->status_code = $parser->status_code;
+						if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+						{
+							$this->redirects++;
+							if (isset($this->headers['content-location']))
+							{
+								$location = SimplePie_Misc::absolutize_url($this->headers['location'], SimplePie_Misc::absolutize_url($this->headers['content-location'], $url));
+							}
+							else
+							{
+								$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+							}
+							return $this->SimplePie_File($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+						}
+					}
+				}
+			}
+			else
+			{
+				$this->method = 'fsockopen';
+				$url_parts = parse_url($url);
+				if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) == 'https')
+				{
+					$url_parts['host'] = "ssl://$url_parts[host]";
+					$url_parts['port'] = 443;
+				}
+				if (!isset($url_parts['port']))
+				{
+					$url_parts['port'] = 80;
+				}
+				$fp = fsockopen($url_parts['host'], $url_parts['port'], $errno, $errstr, $timeout);
+				if (!$fp)
+				{
+					$this->error = 'fsockopen error: ' . $errstr;
+					$this->success = false;
+				}
+				else
+				{
+					if (function_exists('stream_set_timeout'))
+					{
+						stream_set_timeout($fp, $timeout);
+					}
+					else
+					{
+						socket_set_timeout($fp, $timeout);
+					}
+					if (isset($url_parts['path']))
+					{
+						if (isset($url_parts['query']))
+						{
+							$get = "$url_parts[path]?$url_parts[query]";
+						}
+						else
+						{
+							$get = $url_parts['path'];
+						}
+					}
+					else
+					{
+						$get = '/';
+					}
+					$out = "GET $get HTTP/1.0\r\n";
+					$out .= "Host: $url_parts[host]\r\n";
+					$out .= "User-Agent: $useragent\r\n";
+					if (function_exists('gzinflate'))
+					{
+						$out .= "Accept-Encoding: gzip,deflate\r\n";
+					}
+
+					if (isset($url_parts['user']) && isset($url_parts['pass']))
+					{
+						$out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n";
+					}
+					foreach ($headers as $key => $value)
+					{
+						$out .= "$key: $value\r\n";
+					}
+					$out .= "Connection: Close\r\n\r\n";
+					fwrite($fp, $out);
+
+					if (function_exists('stream_get_meta_data'))
+					{
+						$info = stream_get_meta_data($fp);
+					}
+					else
+					{
+						$info = socket_get_status($fp);
+					}
+
+					$this->headers = '';
+					while (!$info['eof'] && !$info['timed_out'])
+					{
+						$this->headers .= fread($fp, 1160);
+						if (function_exists('stream_get_meta_data'))
+						{
+							$info = stream_get_meta_data($fp);
+						}
+						else
+						{
+							$info = socket_get_status($fp);
+						}
+					}
+					if (!$info['timed_out'])
+					{
+						$parser =& new SimplePie_HTTP_Parser($this->headers);
+						if ($parser->parse())
+						{
+							$this->headers = $parser->headers;
+							$this->body = $parser->body;
+							$this->status_code = $parser->status_code;
+							if (($this->status_code == 300 || $this->status_code == 301 || $this->status_code == 302 || $this->status_code == 303 || $this->status_code == 307 || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects)
+							{
+								$this->redirects++;
+								if (isset($this->headers['content-location']))
+								{
+									$location = SimplePie_Misc::absolutize_url($this->headers['location'], SimplePie_Misc::absolutize_url($this->headers['content-location'], $url));
+								}
+								else
+								{
+									$location = SimplePie_Misc::absolutize_url($this->headers['location'], $url);
+								}
+								return $this->SimplePie_File($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen);
+							}
+							if (isset($this->headers['content-encoding']) && ($this->headers['content-encoding'] == 'gzip' || $this->headers['content-encoding'] == 'deflate'))
+							{
+								if (substr($this->body, 0, 8) == "\x1f\x8b\x08\x00\x00\x00\x00\x00")
+								{
+									$this->body = substr($this->body, 10);
+								}
+								$this->body = gzinflate($this->body);
+							}
+						}
+					}
+					else
+					{
+						$this->error = 'fsocket timed out';
+						$this->success = false;
+					}
+					fclose($fp);
+				}
+			}
+		}
+		elseif (function_exists('file_get_contents'))
+		{
+			$this->method = 'file_get_contents';
+			if (!$this->body = file_get_contents($url))
+			{
+				$this->error = 'file_get_contents could not read the file';
+				$this->success = false;
+			}
+		}
+		else
+		{
+			$this->method = 'fopen';
+			if (($fp = fopen($url, 'rb')) === false)
+			{
+				$this->error = 'failed to open stream: No such file or directory';
+				$this->success = false;
+			}
+			else
+			{
+				$this->body = '';
+				while (!feof($fp))
+				{
+					$this->body .= fread($fp, 8192);
+				}
+				fclose($fp);
+			}
+		}
+	}
+}
+
+/**
+ * HTTP Response Parser
+ *
+ * @package SimplePie
+ * @todo Support HTTP Requests
+ */
+class SimplePie_HTTP_Parser
+{
+	/**
+	 * HTTP Version
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $http_version = '';
+
+	/**
+	 * Status code
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $status_code = '';
+
+	/**
+	 * Reason phrase
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $reason = '';
+
+	/**
+	 * Key/value pairs of the headers
+	 *
+	 * @access public
+	 * @var array
+	 */
+	var $headers = array();
+
+	/**
+	 * Body of the response
+	 *
+	 * @access public
+	 * @var string
+	 */
+	var $body = '';
+
+	/**
+	 * Current state of the state machine
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $state = 'start';
+
+	/**
+	 * Input data
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Input data length (to avoid calling strlen() everytime this is needed)
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $data_length = 0;
+
+	/**
+	 * Current position of the pointer
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Name of the hedaer currently being parsed
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $name = '';
+
+	/**
+	 * Value of the hedaer currently being parsed
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $value = '';
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	function SimplePie_HTTP_Parser($data)
+	{
+		$this->data = $data;
+		$this->data_length = strlen($this->data);
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return bool true on success, false on failure
+	 */
+	function parse()
+	{
+		while ($this->state && $this->state != 'emit' && $this->has_data())
+		{
+			$state = $this->state;
+			$this->$state();
+		}
+		$this->data = '';
+		if ($this->state == 'emit')
+		{
+			return true;
+		}
+		else
+		{
+			$this->http_version = '';
+			$this->status_code = '';
+			$this->headers = array();
+			$this->body = '';
+			return false;
+		}
+	}
+
+	/**
+	 * Check whether there is data beyond the pointer
+	 *
+	 * @access private
+	 * @return bool true if there is further data, false if not
+	 */
+	function has_data()
+	{
+		return (bool) ($this->position < $this->data_length);
+	}
+
+	/**
+	 * See if the next character is LWS
+	 *
+	 * @access private
+	 * @return bool true if the next character is LWS, false if not
+	 */
+	function is_linear_whitespace()
+	{
+		return (bool) (strspn($this->data, "\x09\x20", $this->position, 1)
+			|| (substr($this->data, $this->position, 2) == "\r\n" && strspn($this->data, "\x09\x20", $this->position + 2, 1))
+			|| (strspn($this->data, "\r\n", $this->position, 1) && strspn($this->data, "\x09\x20", $this->position + 1, 1)));
+	}
+
+	/**
+	 * The starting state of the state machine, see if the data is a response or request
+	 *
+	 * @access private
+	 */
+	function start()
+	{
+		$this->state = 'http_version_response';
+	}
+
+	/**
+	 * Parse an HTTP-version string
+	 *
+	 * @access private
+	 */
+	function http_version()
+	{
+		if (preg_match('/^HTTP\/([0-9]+\.[0-9]+)/i', substr($this->data, $this->position, strcspn($this->data, "\r\n", $this->position)), $match))
+		{
+			$this->position += strlen($match[0]);
+			$this->http_version = $match[1];
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	/**
+	 * Parse LWS, replacing consecutive characters with a single space
+	 *
+	 * @access private
+	 */
+	function linear_whitespace()
+	{
+		do
+		{
+			if (substr($this->data, $this->position, 2) == "\r\n")
+			{
+				$this->position += 2;
+			}
+			elseif (strspn($this->data, "\r\n", $this->position, 1))
+			{
+				$this->position++;
+			}
+			$this->position += strspn($this->data, "\x09\x20", $this->position);
+		} while ($this->is_linear_whitespace());
+		$this->value .= "\x20";
+	}
+
+	/**
+	 * Parse an HTTP-version string within a response
+	 *
+	 * @access private
+	 */
+	function http_version_response()
+	{
+		if ($this->http_version() && $this->data[$this->position] == "\x20")
+		{
+			$this->state = 'status_code';
+			$this->position++;
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Parse a status code
+	 *
+	 * @access private
+	 */
+	function status_code()
+	{
+		if (strspn($this->data, '1234567890', $this->position, 3) == 3)
+		{
+			$this->status_code = substr($this->data, $this->position, 3);
+			$this->state = 'reason_phrase';
+			$this->position += 3;
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * Skip over the reason phrase (it has no normative value, and you can send absolutely anything here)
+	 *
+	 * @access private
+	 */
+	function reason_phrase()
+	{
+		$len = strcspn($this->data, "\r\n", $this->position);
+		$this->reason = substr($this->data, $this->position, $len);
+		$this->position += $len;
+		if ($this->has_data())
+		{
+			if (substr($this->data, $this->position, 2) == "\r\n")
+			{
+				$this->position += 2;
+			}
+			elseif (strspn($this->data, "\r\n", $this->position, 1))
+			{
+				$this->position++;
+			}
+			$this->state = 'name';
+		}
+	}
+
+	/**
+	 * Parse a header name
+	 *
+	 * @access private
+	 */
+	function name()
+	{
+		$len = strcspn($this->data, ':', $this->position);
+		$this->name = substr($this->data, $this->position, $len);
+		$this->position += $len;
+
+		if ($this->has_data() && $this->data[$this->position] == ':')
+		{
+			$this->state = 'value_next';
+			$this->position++;
+		}
+		else
+		{
+			$this->state = false;
+		}
+	}
+
+	/**
+	 * See what state to move the state machine to while within non-quoted header values
+	 *
+	 * @access private
+	 */
+	function value_next()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->state = 'value_linear_whitespace';
+		}
+		elseif ($this->data[$this->position] == '"')
+		{
+			$this->state = 'value_quote_next';
+			$this->position++;
+		}
+		elseif (substr($this->data, $this->position, 2) == "\r\n")
+		{
+			$this->state = 'end_crlf';
+			$this->position += 2;
+		}
+		elseif (strspn($this->data, "\r\n", $this->position, 1))
+		{
+			$this->state = 'end_crlf';
+			$this->position++;
+		}
+		else
+		{
+			$this->state = 'value_no_quote';
+		}
+	}
+
+	/**
+	 * Parse a header value while outside quotes
+	 *
+	 * @access private
+	 */
+	function value_no_quote()
+	{
+		$len = strcspn($this->data, "\x09\x20\r\n\"", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->state = 'value_next';
+		$this->position += $len;
+	}
+
+	/**
+	 * Parse LWS outside quotes
+	 *
+	 * @access private
+	 */
+	function value_linear_whitespace()
+	{
+		$this->linear_whitespace();
+		$this->state = 'value_next';
+	}
+
+	/**
+	 * See what state to move the state machine to while within quoted header values
+	 *
+	 * @access private
+	 */
+	function value_quote_next()
+	{
+		if ($this->is_linear_whitespace())
+		{
+			$this->state = 'value_linear_whitespace_quote';
+		}
+		else
+		{
+			switch ($this->data[$this->position])
+			{
+				case '"':
+					$this->state = 'value_next';
+					$this->position++;
+					break;
+
+				case '\\':
+					$this->state = 'value_quote_char';
+					$this->position++;
+					break;
+
+				default:
+					$this->state = 'value_quote';
+					break;
+			}
+		}
+	}
+
+	/**
+	 * Parse a header value while within quotes
+	 *
+	 * @access private
+	 */
+	function value_quote()
+	{
+		$len = strcspn($this->data, "\x09\x20\r\n\"\\", $this->position);
+		$this->value .= substr($this->data, $this->position, $len);
+		$this->position += $len;
+		$this->state = 'value_quote_next';
+	}
+
+	/**
+	 * Parse an escaped character within quotes
+	 *
+	 * @access private
+	 */
+	function value_quote_char()
+	{
+		$this->value .= $this->data[$this->position];
+		$this->state = 'value_quote_next';
+		$this->position++;
+	}
+
+	/**
+	 * Parse LWS within quotes
+	 *
+	 * @access private
+	 */
+	function value_linear_whitespace_quote()
+	{
+		$this->linear_whitespace();
+		$this->state = 'value_quote_next';
+	}
+
+	/**
+	 * Parse a CRLF, and see whether we have a further header, or whether we are followed by the body
+	 *
+	 * @access private
+	 */
+	function end_crlf()
+	{
+		$this->name = strtolower($this->name);
+		$this->value = trim($this->value, "\x20");
+		if (isset($this->headers[$this->name]))
+		{
+			$this->headers[$this->name] .= ', ' . $this->value;
+		}
+		else
+		{
+			$this->headers[$this->name] = $this->value;
+		}
+
+		if (substr($this->data, $this->position, 2) == "\r\n")
+		{
+			$this->body = substr($this->data, $this->position + 2);
+			$this->state = 'emit';
+		}
+		elseif (strspn($this->data, "\r\n", $this->position, 1))
+		{
+			$this->body = substr($this->data, $this->position + 1);
+			$this->state = 'emit';
+		}
+		else
+		{
+			$this->name = '';
+			$this->value = '';
+			$this->state = 'name';
+		}
+	}
+}
+
+class SimplePie_Cache
+{
+	var $location;
+	var $filename;
+	var $extension;
+	var $name;
+
+	function SimplePie_Cache($location, $filename, $extension)
+	{
+		$this->location = $location;
+		$this->filename = rawurlencode($filename);
+		$this->extension = rawurlencode($extension);
+		$this->name = "$location/$this->filename.$this->extension";
+	}
+
+	function save($data)
+	{
+		if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location))
+		{
+			if (function_exists('file_put_contents'))
+			{
+				return (bool) file_put_contents($this->name, serialize($data));
+			}
+			else
+			{
+				$fp = fopen($this->name, 'wb');
+				if ($fp)
+				{
+					fwrite($fp, serialize($data));
+					fclose($fp);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	function load()
+	{
+		if (file_exists($this->name) && is_readable($this->name))
+		{
+			if (function_exists('file_get_contents'))
+			{
+				return unserialize(file_get_contents($this->name));
+			}
+			elseif (($fp = fopen($this->name, 'rb')) !== false)
+			{
+				$data = '';
+				while (!feof($fp))
+				{
+					$data .= fread($fp, 8192);
+				}
+				fclose($fp);
+				return unserialize($data);
+			}
+		}
+		return false;
+	}
+
+	function mtime()
+	{
+		if (file_exists($this->name))
+		{
+			return filemtime($this->name);
+		}
+		return false;
+	}
+
+	function touch()
+	{
+		if (file_exists($this->name))
+		{
+			return touch($this->name);
+		}
+		return false;
+	}
+
+	function unlink()
+	{
+		if (file_exists($this->name))
+		{
+			return unlink($this->name);
+		}
+		return false;
+	}
+}
+
+class SimplePie_Misc
+{
+	function time_hms($seconds)
+	{
+		$time = '';
+
+		$hours = floor($seconds / 3600);
+		$remainder = $seconds % 3600;
+		if ($hours > 0)
+		{
+			$time .= $hours.':';
+		}
+
+		$minutes = floor($remainder / 60);
+		$seconds = $remainder % 60;
+		if ($minutes < 10 && $hours > 0)
+		{
+			$minutes = '0' . $minutes;
+		}
+		if ($seconds < 10)
+		{
+			$seconds = '0' . $seconds;
+		}
+
+		$time .= $minutes.':';
+		$time .= $seconds;
+
+		return $time;
+	}
+
+	function absolutize_url($relative, $base)
+	{
+		if ($relative !== '')
+		{
+			$relative = SimplePie_Misc::parse_url($relative);
+			if ($relative['scheme'] !== '')
+			{
+				$target = $relative;
+			}
+			elseif ($base !== '')
+			{
+				$base = SimplePie_Misc::parse_url($base);
+				$target = SimplePie_Misc::parse_url('');
+				if ($relative['authority'] !== '')
+				{
+					$target = $relative;
+					$target['scheme'] = $base['scheme'];
+				}
+				else
+				{
+					$target['scheme'] = $base['scheme'];
+					$target['authority'] = $base['authority'];
+					if ($relative['path'] !== '')
+					{
+						if (strpos($relative['path'], '/') === 0)
+						{
+							$target['path'] = $relative['path'];
+						}
+						elseif (($target['path'] = dirname("$base[path].")) == '/')
+						{
+							$target['path'] .= $relative['path'];
+						}
+						else
+						{
+							$target['path'] .= '/' . $relative['path'];
+						}
+						if ($relative['query'] !== '')
+						{
+							$target['query'] = $relative['query'];
+						}
+					}
+					else
+					{
+						if ($base['path'] !== '')
+						{
+							$target['path'] = $base['path'];
+						}
+						else
+						{
+							$target['path'] = '/';
+						}
+						if ($relative['query'] !== '')
+						{
+							$target['query'] = $relative['query'];
+						}
+						elseif ($base['query'] !== '')
+						{
+							$target['query'] = $base['query'];
+						}
+					}
+				}
+				if ($relative['fragment'] !== '')
+				{
+					$target['fragment'] = $relative['fragment'];
+				}
+			}
+			else
+			{
+				// No base URL, just return the relative URL
+				$target = $relative;
+			}
+			$return = SimplePie_Misc::compress_parse_url($target['scheme'], $target['authority'], $target['path'], $target['query'], $target['fragment']);
+		}
+		else
+		{
+			$return = $base;
+		}
+		$return = SimplePie_Misc::normalize_url($return);
+		return $return;
+	}
+
+	function remove_dot_segments($input)
+	{
+		$output = '';
+		while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input == '.' || $input == '..')
+		{
+			// A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
+			if (strpos($input, '../') === 0)
+			{
+				$input = substr($input, 3);
+			}
+			elseif (strpos($input, './') === 0)
+			{
+				$input = substr($input, 2);
+			}
+			// B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
+			elseif (strpos($input, '/./') === 0)
+			{
+				$input = substr_replace($input, '/', 0, 3);
+			}
+			elseif ($input == '/.')
+			{
+				$input = '/';
+			}
+			// C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
+			elseif (strpos($input, '/../') === 0)
+			{
+				$input = substr_replace($input, '/', 0, 4);
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			elseif ($input == '/..')
+			{
+				$input = '/';
+				$output = substr_replace($output, '', strrpos($output, '/'));
+			}
+			// D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
+			elseif ($input == '.' || $input == '..')
+			{
+				$input = '';
+			}
+			// E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
+			elseif (($pos = strpos($input, '/', 1)) !== false)
+			{
+				$output .= substr($input, 0, $pos);
+				$input = substr_replace($input, '', 0, $pos);
+			}
+			else
+			{
+				$output .= $input;
+				$input = '';
+			}
+		}
+		return $output . $input;
+	}
+
+	function get_element($realname, $string)
+	{
+		$return = array();
+		$name = preg_quote($realname, '/');
+		if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE))
+		{
+			for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++)
+			{
+				$return[$i]['tag'] = $realname;
+				$return[$i]['full'] = $matches[$i][0][0];
+				$return[$i]['offset'] = $matches[$i][0][1];
+				if (strlen($matches[$i][3][0]) <= 2)
+				{
+					$return[$i]['self_closing'] = true;
+				}
+				else
+				{
+					$return[$i]['self_closing'] = false;
+					$return[$i]['content'] = $matches[$i][4][0];
+				}
+				$return[$i]['attribs'] = array();
+				if (isset($matches[$i][2][0]) && preg_match_all('/((?:[^\s:]+:)?[^\s:]+)(?:\s*=\s*(?:"([^"]*)"|\'([^\']*)\'|([a-z0-9\-._:]*)))?\s/U', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER))
+				{
+					for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++)
+					{
+						if (count($attribs[$j]) == 2)
+						{
+							$attribs[$j][2] = $attribs[$j][1];
+						}
+						$return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8');
+					}
+				}
+			}
+		}
+		return $return;
+	}
+
+	function element_implode($element)
+	{
+		$full = "<$element[tag]";
+		foreach ($element['attribs'] as $key => $value)
+		{
+			$key = strtolower($key);
+			$full .= " $key=\"" . htmlspecialchars($value['data']) . '"';
+		}
+		if ($element['self_closing'])
+		{
+			$full .= ' />';
+		}
+		else
+		{
+			$full .= ">$element[content]</$element[tag]>";
+		}
+		return $full;
+	}
+
+	function error($message, $level, $file, $line)
+	{
+		switch ($level)
+		{
+			case E_USER_ERROR:
+				$note = 'PHP Error';
+				break;
+			case E_USER_WARNING:
+				$note = 'PHP Warning';
+				break;
+			case E_USER_NOTICE:
+				$note = 'PHP Notice';
+				break;
+			default:
+				$note = 'Unknown Error';
+				break;
+		}
+		error_log("$note: $message in $file on line $line", 0);
+		return $message;
+	}
+
+	/**
+	 * If a file has been cached, retrieve and display it.
+	 *
+	 * This is most useful for caching images (get_favicon(), etc.),
+	 * however it works for all cached files.  This WILL NOT display ANY
+	 * file/image/page/whatever, but rather only display what has already
+	 * been cached by SimplePie.
+	 *
+	 * @access public
+	 * @see SimplePie::get_favicon()
+	 * @param str $identifier_url URL that is used to identify the content.
+	 * This may or may not be the actual URL of the live content.
+	 * @param str $cache_location Location of SimplePie's cache.  Defaults
+	 * to './cache'.
+	 * @param str $cache_extension The file extension that the file was
+	 * cached with.  Defaults to 'spc'.
+	 * @param str $cache_class Name of the cache-handling class being used
+	 * in SimplePie.  Defaults to 'SimplePie_Cache', and should be left
+	 * as-is unless you've overloaded the class.
+	 * @param str $cache_name_function Function that converts the filename
+	 * for saving.  Defaults to 'md5'.
+	 */
+	function display_cached_file($identifier_url, $cache_location = './cache', $cache_extension = 'spc', $cache_class = 'SimplePie_Cache', $cache_name_function = 'md5')
+	{
+		$cache =& new $cache_class($cache_location, call_user_func($cache_name_function, $identifier_url), $cache_extension);
+
+		if ($file = $cache->load())
+		{
+			header('Content-type:' . $file['headers']['content-type']);
+			header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days
+			echo $file['body'];
+			exit;
+		}
+
+		die('Cached file for ' . $identifier_url . ' cannot be found.');
+	}
+
+	function fix_protocol($url, $http = 1)
+	{
+		$url = SimplePie_Misc::normalize_url($url);
+		$parsed = SimplePie_Misc::parse_url($url);
+		if ($parsed['scheme'] !== '' && $parsed['scheme'] != 'http' && $parsed['scheme'] != 'https')
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['authority'], $parsed['path'], $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($parsed['scheme'] === '' && $parsed['authority'] === '' && !file_exists($url))
+		{
+			return SimplePie_Misc::fix_protocol(SimplePie_Misc::compress_parse_url('http', $parsed['path'], '', $parsed['query'], $parsed['fragment']), $http);
+		}
+
+		if ($http == 2 && $parsed['scheme'] !== '')
+		{
+			return "feed:$url";
+		}
+		elseif ($http == 3 && strtolower($parsed['scheme']) == 'http')
+		{
+			return substr_replace($url, 'podcast', 0, 4);
+		}
+		elseif ($http == 4 && strtolower($parsed['scheme']) == 'http')
+		{
+			return substr_replace($url, 'itpc', 0, 4);
+		}
+		else
+		{
+			return $url;
+		}
+	}
+
+	function parse_url($url)
+	{
+		static $cache = array();
+		if (isset($cache[$url]))
+		{
+			return $cache[$url];
+		}
+		elseif (preg_match('/^(([^:\/?#]+):)?(\/\/([^\/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?$/', $url, $match))
+		{
+			for ($i = count($match); $i <= 9; $i++)
+			{
+				$match[$i] = '';
+			}
+			return $cache[$url] = array('scheme' => $match[2], 'authority' => $match[4], 'path' => $match[5], 'query' => $match[7], 'fragment' => $match[9]);
+		}
+		else
+		{
+			return $cache[$url] = array('scheme' => '', 'authority' => '', 'path' => '', 'query' => '', 'fragment' => '');
+		}
+	}
+
+	function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '')
+	{
+		$return = '';
+		if ($scheme !== '')
+		{
+			$return .= "$scheme:";
+		}
+		if ($authority !== '')
+		{
+			$return .= "//$authority";
+		}
+		if ($path !== '')
+		{
+			$return .= $path;
+		}
+		if ($query !== '')
+		{
+			$return .= "?$query";
+		}
+		if ($fragment !== '')
+		{
+			$return .= "#$fragment";
+		}
+		return $return;
+	}
+
+	function normalize_url($url)
+	{
+		$url = preg_replace_callback('/%([0-9A-Fa-f]{2})/', array('SimplePie_Misc', 'percent_encoding_normalization'), $url);
+		$url = SimplePie_Misc::parse_url($url);
+		$url['scheme'] = strtolower($url['scheme']);
+		if ($url['authority'] !== '')
+		{
+			$url['authority'] = strtolower($url['authority']);
+			$url['path'] = SimplePie_Misc::remove_dot_segments($url['path']);
+		}
+		return SimplePie_Misc::compress_parse_url($url['scheme'], $url['authority'], $url['path'], $url['query'], $url['fragment']);
+	}
+
+	function percent_encoding_normalization($match)
+	{
+		$integer = hexdec($match[1]);
+		if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer == 0x2D || $integer == 0x2E || $integer == 0x5F || $integer == 0x7E)
+		{
+			return chr($integer);
+		}
+		else
+		{
+			return strtoupper($match[0]);
+		}
+	}
+
+	/**
+	 * Remove bad UTF-8 bytes
+	 *
+	 * PCRE Pattern to locate bad bytes in a UTF-8 string comes from W3C
+	 * FAQ: Multilingual Forms (modified to include full ASCII range)
+	 *
+	 * @author Geoffrey Sneddon
+	 * @see http://www.w3.org/International/questions/qa-forms-utf-8
+	 * @param string $str String to remove bad UTF-8 bytes from
+	 * @return string UTF-8 string
+	 */
+	function utf8_bad_replace($str)
+	{
+		if (function_exists('iconv'))
+		{
+			$out = iconv('UTF-8', 'UTF-8//IGNORE', $str);
+			if($out !== false) return $out;
+		}
+		if (function_exists('mb_convert_encoding'))
+		{
+			return mb_convert_encoding($str, 'UTF-8', 'UTF-8');
+		}
+		elseif (preg_match_all('/([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2})/', $str, $matches))
+		{
+			return implode("\xEF\xBF\xBD", $matches[0]);
+		}
+		elseif ($str !== '')
+		{
+			return "\xEF\xBF\xBD";
+		}
+		else
+		{
+			return '';
+		}
+	}
+
+	function change_encoding($data, $input, $output)
+	{
+		$input = SimplePie_Misc::encoding($input);
+		$output = SimplePie_Misc::encoding($output);
+
+		if (function_exists('iconv') && ($return = @iconv($input, "$output//IGNORE", $data)))
+		{
+			return $return;
+		}
+		elseif (function_exists('iconv') && ($return = @iconv($input, $output, $data)))
+		{
+			return $return;
+		}
+		elseif (function_exists('mb_convert_encoding') && ($return = @mb_convert_encoding($data, $output, $input)))
+		{
+			return $return;
+		}
+		elseif ($input == 'ISO-8859-1' && $output == 'UTF-8')
+		{
+			return utf8_encode($data);
+		}
+		elseif ($input == 'UTF-8' && $output == 'ISO-8859-1')
+		{
+			return utf8_decode($data);
+		}
+		return $data;
+	}
+
+	function encoding($encoding)
+	{
+		// Character sets are case-insensitive (though we'll return them in the form given in their registration)
+		switch (strtoupper($encoding))
+		{
+			case 'ANSI_X3.4-1968':
+			case 'ISO-IR-6':
+			case 'ANSI_X3.4-1986':
+			case 'ISO_646.IRV:1991':
+			case 'ASCII':
+			case 'ISO646-US':
+			case 'US-ASCII':
+			case 'US':
+			case 'IBM367':
+			case 'CP367':
+			case 'CSASCII':
+				return 'US-ASCII';
+
+			case 'ISO_8859-1:1987':
+			case 'ISO-IR-100':
+			case 'ISO_8859-1':
+			case 'ISO-8859-1':
+			case 'LATIN1':
+			case 'L1':
+			case 'IBM819':
+			case 'CP819':
+			case 'CSISOLATIN1':
+				return 'ISO-8859-1';
+
+			case 'ISO_8859-2:1987':
+			case 'ISO-IR-101':
+			case 'ISO_8859-2':
+			case 'ISO-8859-2':
+			case 'LATIN2':
+			case 'L2':
+			case 'CSISOLATIN2':
+				return 'ISO-8859-2';
+
+			case 'ISO_8859-3:1988':
+			case 'ISO-IR-109':
+			case 'ISO_8859-3':
+			case 'ISO-8859-3':
+			case 'LATIN3':
+			case 'L3':
+			case 'CSISOLATIN3':
+				return 'ISO-8859-3';
+
+			case 'ISO_8859-4:1988':
+			case 'ISO-IR-110':
+			case 'ISO_8859-4':
+			case 'ISO-8859-4':
+			case 'LATIN4':
+			case 'L4':
+			case 'CSISOLATIN4':
+				return 'ISO-8859-4';
+
+			case 'ISO_8859-5:1988':
+			case 'ISO-IR-144':
+			case 'ISO_8859-5':
+			case 'ISO-8859-5':
+			case 'CYRILLIC':
+			case 'CSISOLATINCYRILLIC':
+				return 'ISO-8859-5';
+
+			case 'ISO_8859-6:1987':
+			case 'ISO-IR-127':
+			case 'ISO_8859-6':
+			case 'ISO-8859-6':
+			case 'ECMA-114':
+			case 'ASMO-708':
+			case 'ARABIC':
+			case 'CSISOLATINARABIC':
+				return 'ISO-8859-6';
+
+			case 'ISO_8859-7:1987':
+			case 'ISO-IR-126':
+			case 'ISO_8859-7':
+			case 'ISO-8859-7':
+			case 'ELOT_928':
+			case 'ECMA-118':
+			case 'GREEK':
+			case 'GREEK8':
+			case 'CSISOLATINGREEK':
+				return 'ISO-8859-7';
+
+			case 'ISO_8859-8:1988':
+			case 'ISO-IR-138':
+			case 'ISO_8859-8':
+			case 'ISO-8859-8':
+			case 'HEBREW':
+			case 'CSISOLATINHEBREW':
+				return 'ISO-8859-8';
+
+			case 'ISO_8859-9:1989':
+			case 'ISO-IR-148':
+			case 'ISO_8859-9':
+			case 'ISO-8859-9':
+			case 'LATIN5':
+			case 'L5':
+			case 'CSISOLATIN5':
+				return 'ISO-8859-9';
+
+			case 'ISO-8859-10':
+			case 'ISO-IR-157':
+			case 'L6':
+			case 'ISO_8859-10:1992':
+			case 'CSISOLATIN6':
+			case 'LATIN6':
+				return 'ISO-8859-10';
+
+			case 'ISO_6937-2-ADD':
+			case 'ISO-IR-142':
+			case 'CSISOTEXTCOMM':
+				return 'ISO_6937-2-add';
+
+			case 'JIS_X0201':
+			case 'X0201':
+			case 'CSHALFWIDTHKATAKANA':
+				return 'JIS_X0201';
+
+			case 'JIS_ENCODING':
+			case 'CSJISENCODING':
+				return 'JIS_Encoding';
+
+			case 'SHIFT_JIS':
+			case 'MS_KANJI':
+			case 'CSSHIFTJIS':
+				return 'Shift_JIS';
+
+			case 'EXTENDED_UNIX_CODE_PACKED_FORMAT_FOR_JAPANESE':
+			case 'CSEUCPKDFMTJAPANESE':
+			case 'EUC-JP':
+				return 'EUC-JP';
+
+			case 'EXTENDED_UNIX_CODE_FIXED_WIDTH_FOR_JAPANESE':
+			case 'CSEUCFIXWIDJAPANESE':
+				return 'Extended_UNIX_Code_Fixed_Width_for_Japanese';
+
+			case 'BS_4730':
+			case 'ISO-IR-4':
+			case 'ISO646-GB':
+			case 'GB':
+			case 'UK':
+			case 'CSISO4UNITEDKINGDOM':
+				return 'BS_4730';
+
+			case 'SEN_850200_C':
+			case 'ISO-IR-11':
+			case 'ISO646-SE2':
+			case 'SE2':
+			case 'CSISO11SWEDISHFORNAMES':
+				return 'SEN_850200_C';
+
+			case 'IT':
+			case 'ISO-IR-15':
+			case 'ISO646-IT':
+			case 'CSISO15ITALIAN':
+				return 'IT';
+
+			case 'ES':
+			case 'ISO-IR-17':
+			case 'ISO646-ES':
+			case 'CSISO17SPANISH':
+				return 'ES';
+
+			case 'DIN_66003':
+			case 'ISO-IR-21':
+			case 'DE':
+			case 'ISO646-DE':
+			case 'CSISO21GERMAN':
+				return 'DIN_66003';
+
+			case 'NS_4551-1':
+			case 'ISO-IR-60':
+			case 'ISO646-NO':
+			case 'NO':
+			case 'CSISO60DANISHNORWEGIAN':
+			case 'CSISO60NORWEGIAN1':
+				return 'NS_4551-1';
+
+			case 'NF_Z_62-010':
+			case 'ISO-IR-69':
+			case 'ISO646-FR':
+			case 'FR':
+			case 'CSISO69FRENCH':
+				return 'NF_Z_62-010';
+
+			case 'ISO-10646-UTF-1':
+			case 'CSISO10646UTF1':
+				return 'ISO-10646-UTF-1';
+
+			case 'ISO_646.BASIC:1983':
+			case 'REF':
+			case 'CSISO646BASIC1983':
+				return 'ISO_646.basic:1983';
+
+			case 'INVARIANT':
+			case 'CSINVARIANT':
+				return 'INVARIANT';
+
+			case 'ISO_646.IRV:1983':
+			case 'ISO-IR-2':
+			case 'IRV':
+			case 'CSISO2INTLREFVERSION':
+				return 'ISO_646.irv:1983';
+
+			case 'NATS-SEFI':
+			case 'ISO-IR-8-1':
+			case 'CSNATSSEFI':
+				return 'NATS-SEFI';
+
+			case 'NATS-SEFI-ADD':
+			case 'ISO-IR-8-2':
+			case 'CSNATSSEFIADD':
+				return 'NATS-SEFI-ADD';
+
+			case 'NATS-DANO':
+			case 'ISO-IR-9-1':
+			case 'CSNATSDANO':
+				return 'NATS-DANO';
+
+			case 'NATS-DANO-ADD':
+			case 'ISO-IR-9-2':
+			case 'CSNATSDANOADD':
+				return 'NATS-DANO-ADD';
+
+			case 'SEN_850200_B':
+			case 'ISO-IR-10':
+			case 'FI':
+			case 'ISO646-FI':
+			case 'ISO646-SE':
+			case 'SE':
+			case 'CSISO10SWEDISH':
+				return 'SEN_850200_B';
+
+			case 'KS_C_5601-1987':
+			case 'ISO-IR-149':
+			case 'KS_C_5601-1989':
+			case 'KSC_5601':
+			case 'KOREAN':
+			case 'CSKSC56011987':
+				return 'KS_C_5601-1987';
+
+			case 'ISO-2022-KR':
+			case 'CSISO2022KR':
+				return 'ISO-2022-KR';
+
+			case 'EUC-KR':
+			case 'CSEUCKR':
+				return 'EUC-KR';
+
+			case 'ISO-2022-JP':
+			case 'CSISO2022JP':
+				return 'ISO-2022-JP';
+
+			case 'ISO-2022-JP-2':
+			case 'CSISO2022JP2':
+				return 'ISO-2022-JP-2';
+
+			case 'JIS_C6220-1969-JP':
+			case 'JIS_C6220-1969':
+			case 'ISO-IR-13':
+			case 'KATAKANA':
+			case 'X0201-7':
+			case 'CSISO13JISC6220JP':
+				return 'JIS_C6220-1969-jp';
+
+			case 'JIS_C6220-1969-RO':
+			case 'ISO-IR-14':
+			case 'JP':
+			case 'ISO646-JP':
+			case 'CSISO14JISC6220RO':
+				return 'JIS_C6220-1969-ro';
+
+			case 'PT':
+			case 'ISO-IR-16':
+			case 'ISO646-PT':
+			case 'CSISO16PORTUGUESE':
+				return 'PT';
+
+			case 'GREEK7-OLD':
+			case 'ISO-IR-18':
+			case 'CSISO18GREEK7OLD':
+				return 'greek7-old';
+
+			case 'LATIN-GREEK':
+			case 'ISO-IR-19':
+			case 'CSISO19LATINGREEK':
+				return 'latin-greek';
+
+			case 'NF_Z_62-010_(1973)':
+			case 'ISO-IR-25':
+			case 'ISO646-FR1':
+			case 'CSISO25FRENCH':
+				return 'NF_Z_62-010_(1973)';
+
+			case 'LATIN-GREEK-1':
+			case 'ISO-IR-27':
+			case 'CSISO27LATINGREEK1':
+				return 'Latin-greek-1';
+
+			case 'ISO_5427':
+			case 'ISO-IR-37':
+			case 'CSISO5427CYRILLIC':
+				return 'ISO_5427';
+
+			case 'JIS_C6226-1978':
+			case 'ISO-IR-42':
+			case 'CSISO42JISC62261978':
+				return 'JIS_C6226-1978';
+
+			case 'BS_VIEWDATA':
+			case 'ISO-IR-47':
+			case 'CSISO47BSVIEWDATA':
+				return 'BS_viewdata';
+
+			case 'INIS':
+			case 'ISO-IR-49':
+			case 'CSISO49INIS':
+				return 'INIS';
+
+			case 'INIS-8':
+			case 'ISO-IR-50':
+			case 'CSISO50INIS8':
+				return 'INIS-8';
+
+			case 'INIS-CYRILLIC':
+			case 'ISO-IR-51':
+			case 'CSISO51INISCYRILLIC':
+				return 'INIS-cyrillic';
+
+			case 'ISO_5427:1981':
+			case 'ISO-IR-54':
+			case 'ISO5427CYRILLIC1981':
+				return 'ISO_5427:1981';
+
+			case 'ISO_5428:1980':
+			case 'ISO-IR-55':
+			case 'CSISO5428GREEK':
+				return 'ISO_5428:1980';
+
+			case 'GB_1988-80':
+			case 'ISO-IR-57':
+			case 'CN':
+			case 'ISO646-CN':
+			case 'CSISO57GB1988':
+				return 'GB_1988-80';
+
+			case 'GB_2312-80':
+			case 'ISO-IR-58':
+			case 'CHINESE':
+			case 'CSISO58GB231280':
+				return 'GB_2312-80';
+
+			case 'NS_4551-2':
+			case 'ISO646-NO2':
+			case 'ISO-IR-61':
+			case 'NO2':
+			case 'CSISO61NORWEGIAN2':
+				return 'NS_4551-2';
+
+			case 'VIDEOTEX-SUPPL':
+			case 'ISO-IR-70':
+			case 'CSISO70VIDEOTEXSUPP1':
+				return 'videotex-suppl';
+
+			case 'PT2':
+			case 'ISO-IR-84':
+			case 'ISO646-PT2':
+			case 'CSISO84PORTUGUESE2':
+				return 'PT2';
+
+			case 'ES2':
+			case 'ISO-IR-85':
+			case 'ISO646-ES2':
+			case 'CSISO85SPANISH2':
+				return 'ES2';
+
+			case 'MSZ_7795.3':
+			case 'ISO-IR-86':
+			case 'ISO646-HU':
+			case 'HU':
+			case 'CSISO86HUNGARIAN':
+				return 'MSZ_7795.3';
+
+			case 'JIS_C6226-1983':
+			case 'ISO-IR-87':
+			case 'X0208':
+			case 'JIS_X0208-1983':
+			case 'CSISO87JISX0208':
+				return 'JIS_C6226-1983';
+
+			case 'GREEK7':
+			case 'ISO-IR-88':
+			case 'CSISO88GREEK7':
+				return 'greek7';
+
+			case 'ASMO_449':
+			case 'ISO_9036':
+			case 'ARABIC7':
+			case 'ISO-IR-89':
+			case 'CSISO89ASMO449':
+				return 'ASMO_449';
+
+			case 'ISO-IR-90':
+			case 'CSISO90':
+				return 'iso-ir-90';
+
+			case 'JIS_C6229-1984-A':
+			case 'ISO-IR-91':
+			case 'JP-OCR-A':
+			case 'CSISO91JISC62291984A':
+				return 'JIS_C6229-1984-a';
+
+			case 'JIS_C6229-1984-B':
+			case 'ISO-IR-92':
+			case 'ISO646-JP-OCR-B':
+			case 'JP-OCR-B':
+			case 'CSISO92JISC62991984B':
+				return 'JIS_C6229-1984-b';
+
+			case 'JIS_C6229-1984-B-ADD':
+			case 'ISO-IR-93':
+			case 'JP-OCR-B-ADD':
+			case 'CSISO93JIS62291984BADD':
+				return 'JIS_C6229-1984-b-add';
+
+			case 'JIS_C6229-1984-HAND':
+			case 'ISO-IR-94':
+			case 'JP-OCR-HAND':
+			case 'CSISO94JIS62291984HAND':
+				return 'JIS_C6229-1984-hand';
+
+			case 'JIS_C6229-1984-HAND-ADD':
+			case 'ISO-IR-95':
+			case 'JP-OCR-HAND-ADD':
+			case 'CSISO95JIS62291984HANDADD':
+				return 'JIS_C6229-1984-hand-add';
+
+			case 'JIS_C6229-1984-KANA':
+			case 'ISO-IR-96':
+			case 'CSISO96JISC62291984KANA':
+				return 'JIS_C6229-1984-kana';
+
+			case 'ISO_2033-1983':
+			case 'ISO-IR-98':
+			case 'E13B':
+			case 'CSISO2033':
+				return 'ISO_2033-1983';
+
+			case 'ANSI_X3.110-1983':
+			case 'ISO-IR-99':
+			case 'CSA_T500-1983':
+			case 'NAPLPS':
+			case 'CSISO99NAPLPS':
+				return 'ANSI_X3.110-1983';
+
+			case 'T.61-7BIT':
+			case 'ISO-IR-102':
+			case 'CSISO102T617BIT':
+				return 'T.61-7bit';
+
+			case 'T.61-8BIT':
+			case 'T.61':
+			case 'ISO-IR-103':
+			case 'CSISO103T618BIT':
+				return 'T.61-8bit';
+
+			case 'ECMA-CYRILLIC':
+			case 'ISO-IR-111':
+			case 'KOI8-E':
+			case 'CSISO111ECMACYRILLIC':
+				return 'ECMA-cyrillic';
+
+			case 'CSA_Z243.4-1985-1':
+			case 'ISO-IR-121':
+			case 'ISO646-CA':
+			case 'CSA7-1':
+			case 'CA':
+			case 'CSISO121CANADIAN1':
+				return 'CSA_Z243.4-1985-1';
+
+			case 'CSA_Z243.4-1985-2':
+			case 'ISO-IR-122':
+			case 'ISO646-CA2':
+			case 'CSA7-2':
+			case 'CSISO122CANADIAN2':
+				return 'CSA_Z243.4-1985-2';
+
+			case 'CSA_Z243.4-1985-GR':
+			case 'ISO-IR-123':
+			case 'CSISO123CSAZ24341985GR':
+				return 'CSA_Z243.4-1985-gr';
+
+			case 'ISO_8859-6-E':
+			case 'CSISO88596E':
+			case 'ISO-8859-6-E':
+				return 'ISO-8859-6-E';
+
+			case 'ISO_8859-6-I':
+			case 'CSISO88596I':
+			case 'ISO-8859-6-I':
+				return 'ISO-8859-6-I';
+
+			case 'T.101-G2':
+			case 'ISO-IR-128':
+			case 'CSISO128T101G2':
+				return 'T.101-G2';
+
+			case 'ISO_8859-8-E':
+			case 'CSISO88598E':
+			case 'ISO-8859-8-E':
+				return 'ISO-8859-8-E';
+
+			case 'ISO_8859-8-I':
+			case 'CSISO88598I':
+			case 'ISO-8859-8-I':
+				return 'ISO-8859-8-I';
+
+			case 'CSN_369103':
+			case 'ISO-IR-139':
+			case 'CSISO139CSN369103':
+				return 'CSN_369103';
+
+			case 'JUS_I.B1.002':
+			case 'ISO-IR-141':
+			case 'ISO646-YU':
+			case 'JS':
+			case 'YU':
+			case 'CSISO141JUSIB1002':
+				return 'JUS_I.B1.002';
+
+			case 'IEC_P27-1':
+			case 'ISO-IR-143':
+			case 'CSISO143IECP271':
+				return 'IEC_P27-1';
+
+			case 'JUS_I.B1.003-SERB':
+			case 'ISO-IR-146':
+			case 'SERBIAN':
+			case 'CSISO146SERBIAN':
+				return 'JUS_I.B1.003-serb';
+
+			case 'JUS_I.B1.003-MAC':
+			case 'MACEDONIAN':
+			case 'ISO-IR-147':
+			case 'CSISO147MACEDONIAN':
+				return 'JUS_I.B1.003-mac';
+
+			case 'GREEK-CCITT':
+			case 'ISO-IR-150':
+			case 'CSISO150':
+			case 'CSISO150GREEKCCITT':
+				return 'greek-ccitt';
+
+			case 'NC_NC00-10:81':
+			case 'CUBA':
+			case 'ISO-IR-151':
+			case 'ISO646-CU':
+			case 'CSISO151CUBA':
+				return 'NC_NC00-10:81';
+
+			case 'ISO_6937-2-25':
+			case 'ISO-IR-152':
+			case 'CSISO6937ADD':
+				return 'ISO_6937-2-25';
+
+			case 'GOST_19768-74':
+			case 'ST_SEV_358-88':
+			case 'ISO-IR-153':
+			case 'CSISO153GOST1976874':
+				return 'GOST_19768-74';
+
+			case 'ISO_8859-SUPP':
+			case 'ISO-IR-154':
+			case 'LATIN1-2-5':
+			case 'CSISO8859SUPP':
+				return 'ISO_8859-supp';
+
+			case 'ISO_10367-BOX':
+			case 'ISO-IR-155':
+			case 'CSISO10367BOX':
+				return 'ISO_10367-box';
+
+			case 'LATIN-LAP':
+			case 'LAP':
+			case 'ISO-IR-158':
+			case 'CSISO158LAP':
+				return 'latin-lap';
+
+			case 'JIS_X0212-1990':
+			case 'X0212':
+			case 'ISO-IR-159':
+			case 'CSISO159JISX02121990':
+				return 'JIS_X0212-1990';
+
+			case 'DS_2089':
+			case 'DS2089':
+			case 'ISO646-DK':
+			case 'DK':
+			case 'CSISO646DANISH':
+				return 'DS_2089';
+
+			case 'US-DK':
+			case 'CSUSDK':
+				return 'us-dk';
+
+			case 'DK-US':
+			case 'CSDKUS':
+				return 'dk-us';
+
+			case 'KSC5636':
+			case 'ISO646-KR':
+			case 'CSKSC5636':
+				return 'KSC5636';
+
+			case 'UNICODE-1-1-UTF-7':
+			case 'CSUNICODE11UTF7':
+				return 'UNICODE-1-1-UTF-7';
+
+			case 'ISO-2022-CN':
+				return 'ISO-2022-CN';
+
+			case 'ISO-2022-CN-EXT':
+				return 'ISO-2022-CN-EXT';
+
+			case 'UTF-8':
+				return 'UTF-8';
+
+			case 'ISO-8859-13':
+				return 'ISO-8859-13';
+
+			case 'ISO-8859-14':
+			case 'ISO-IR-199':
+			case 'ISO_8859-14:1998':
+			case 'ISO_8859-14':
+			case 'LATIN8':
+			case 'ISO-CELTIC':
+			case 'L8':
+				return 'ISO-8859-14';
+
+			case 'ISO-8859-15':
+			case 'ISO_8859-15':
+			case 'LATIN-9':
+				return 'ISO-8859-15';
+
+			case 'ISO-8859-16':
+			case 'ISO-IR-226':
+			case 'ISO_8859-16:2001':
+			case 'ISO_8859-16':
+			case 'LATIN10':
+			case 'L10':
+				return 'ISO-8859-16';
+
+			case 'GBK':
+			case 'CP936':
+			case 'MS936':
+			case 'WINDOWS-936':
+				return 'GBK';
+
+			case 'GB18030':
+				return 'GB18030';
+
+			case 'OSD_EBCDIC_DF04_15':
+				return 'OSD_EBCDIC_DF04_15';
+
+			case 'OSD_EBCDIC_DF03_IRV':
+				return 'OSD_EBCDIC_DF03_IRV';
+
+			case 'OSD_EBCDIC_DF04_1':
+				return 'OSD_EBCDIC_DF04_1';
+
+			case 'ISO-11548-1':
+			case 'ISO_11548-1':
+			case 'ISO_TR_11548-1':
+			case 'CSISO115481':
+				return 'ISO-11548-1';
+
+			case 'KZ-1048':
+			case 'STRK1048-2002':
+			case 'RK1048':
+			case 'CSKZ1048':
+				return 'KZ-1048';
+
+			case 'ISO-10646-UCS-2':
+			case 'CSUNICODE':
+				return 'ISO-10646-UCS-2';
+
+			case 'ISO-10646-UCS-4':
+			case 'CSUCS4':
+				return 'ISO-10646-UCS-4';
+
+			case 'ISO-10646-UCS-BASIC':
+			case 'CSUNICODEASCII':
+				return 'ISO-10646-UCS-Basic';
+
+			case 'ISO-10646-UNICODE-LATIN1':
+			case 'CSUNICODELATIN1':
+			case 'ISO-10646':
+				return 'ISO-10646-Unicode-Latin1';
+
+			case 'ISO-10646-J-1':
+				return 'ISO-10646-J-1';
+
+			case 'ISO-UNICODE-IBM-1261':
+			case 'CSUNICODEIBM1261':
+				return 'ISO-Unicode-IBM-1261';
+
+			case 'ISO-UNICODE-IBM-1268':
+			case 'CSUNICODEIBM1268':
+				return 'ISO-Unicode-IBM-1268';
+
+			case 'ISO-UNICODE-IBM-1276':
+			case 'CSUNICODEIBM1276':
+				return 'ISO-Unicode-IBM-1276';
+
+			case 'ISO-UNICODE-IBM-1264':
+			case 'CSUNICODEIBM1264':
+				return 'ISO-Unicode-IBM-1264';
+
+			case 'ISO-UNICODE-IBM-1265':
+			case 'CSUNICODEIBM1265':
+				return 'ISO-Unicode-IBM-1265';
+
+			case 'UNICODE-1-1':
+			case 'CSUNICODE11':
+				return 'UNICODE-1-1';
+
+			case 'SCSU':
+				return 'SCSU';
+
+			case 'UTF-7':
+				return 'UTF-7';
+
+			case 'UTF-16BE':
+				return 'UTF-16BE';
+
+			case 'UTF-16LE':
+				return 'UTF-16LE';
+
+			case 'UTF-16':
+				return 'UTF-16';
+
+			case 'CESU-8':
+			case 'CSCESU-8':
+				return 'CESU-8';
+
+			case 'UTF-32':
+				return 'UTF-32';
+
+			case 'UTF-32BE':
+				return 'UTF-32BE';
+
+			case 'UTF-32LE':
+				return 'UTF-32LE';
+
+			case 'BOCU-1':
+			case 'CSBOCU-1':
+				return 'BOCU-1';
+
+			case 'ISO-8859-1-WINDOWS-3.0-LATIN-1':
+			case 'CSWINDOWS30LATIN1':
+				return 'ISO-8859-1-Windows-3.0-Latin-1';
+
+			case 'ISO-8859-1-WINDOWS-3.1-LATIN-1':
+			case 'CSWINDOWS31LATIN1':
+				return 'ISO-8859-1-Windows-3.1-Latin-1';
+
+			case 'ISO-8859-2-WINDOWS-LATIN-2':
+			case 'CSWINDOWS31LATIN2':
+				return 'ISO-8859-2-Windows-Latin-2';
+
+			case 'ISO-8859-9-WINDOWS-LATIN-5':
+			case 'CSWINDOWS31LATIN5':
+				return 'ISO-8859-9-Windows-Latin-5';
+
+			case 'HP-ROMAN8':
+			case 'ROMAN8':
+			case 'R8':
+			case 'CSHPROMAN8':
+				return 'hp-roman8';
+
+			case 'ADOBE-STANDARD-ENCODING':
+			case 'CSADOBESTANDARDENCODING':
+				return 'Adobe-Standard-Encoding';
+
+			case 'VENTURA-US':
+			case 'CSVENTURAUS':
+				return 'Ventura-US';
+
+			case 'VENTURA-INTERNATIONAL':
+			case 'CSVENTURAINTERNATIONAL':
+				return 'Ventura-International';
+
+			case 'DEC-MCS':
+			case 'DEC':
+			case 'CSDECMCS':
+				return 'DEC-MCS';
+
+			case 'IBM850':
+			case 'CP850':
+			case '850':
+			case 'CSPC850MULTILINGUAL':
+				return 'IBM850';
+
+			case 'PC8-DANISH-NORWEGIAN':
+			case 'CSPC8DANISHNORWEGIAN':
+				return 'PC8-Danish-Norwegian';
+
+			case 'IBM862':
+			case 'CP862':
+			case '862':
+			case 'CSPC862LATINHEBREW':
+				return 'IBM862';
+
+			case 'PC8-TURKISH':
+			case 'CSPC8TURKISH':
+				return 'PC8-Turkish';
+
+			case 'IBM-SYMBOLS':
+			case 'CSIBMSYMBOLS':
+				return 'IBM-Symbols';
+
+			case 'IBM-THAI':
+			case 'CSIBMTHAI':
+				return 'IBM-Thai';
+
+			case 'HP-LEGAL':
+			case 'CSHPLEGAL':
+				return 'HP-Legal';
+
+			case 'HP-PI-FONT':
+			case 'CSHPPIFONT':
+				return 'HP-Pi-font';
+
+			case 'HP-MATH8':
+			case 'CSHPMATH8':
+				return 'HP-Math8';
+
+			case 'ADOBE-SYMBOL-ENCODING':
+			case 'CSHPPSMATH':
+				return 'Adobe-Symbol-Encoding';
+
+			case 'HP-DESKTOP':
+			case 'CSHPDESKTOP':
+				return 'HP-DeskTop';
+
+			case 'VENTURA-MATH':
+			case 'CSVENTURAMATH':
+				return 'Ventura-Math';
+
+			case 'MICROSOFT-PUBLISHING':
+			case 'CSMICROSOFTPUBLISHING':
+				return 'Microsoft-Publishing';
+
+			case 'WINDOWS-31J':
+			case 'CSWINDOWS31J':
+				return 'Windows-31J';
+
+			case 'GB2312':
+			case 'CSGB2312':
+				return 'GB2312';
+
+			case 'BIG5':
+			case 'CSBIG5':
+				return 'Big5';
+
+			case 'MACINTOSH':
+			case 'MAC':
+			case 'CSMACINTOSH':
+				return 'macintosh';
+
+			case 'IBM037':
+			case 'CP037':
+			case 'EBCDIC-CP-US':
+			case 'EBCDIC-CP-CA':
+			case 'EBCDIC-CP-WT':
+			case 'EBCDIC-CP-NL':
+			case 'CSIBM037':
+				return 'IBM037';
+
+			case 'IBM038':
+			case 'EBCDIC-INT':
+			case 'CP038':
+			case 'CSIBM038':
+				return 'IBM038';
+
+			case 'IBM273':
+			case 'CP273':
+			case 'CSIBM273':
+				return 'IBM273';
+
+			case 'IBM274':
+			case 'EBCDIC-BE':
+			case 'CP274':
+			case 'CSIBM274':
+				return 'IBM274';
+
+			case 'IBM275':
+			case 'EBCDIC-BR':
+			case 'CP275':
+			case 'CSIBM275':
+				return 'IBM275';
+
+			case 'IBM277':
+			case 'EBCDIC-CP-DK':
+			case 'EBCDIC-CP-NO':
+			case 'CSIBM277':
+				return 'IBM277';
+
+			case 'IBM278':
+			case 'CP278':
+			case 'EBCDIC-CP-FI':
+			case 'EBCDIC-CP-SE':
+			case 'CSIBM278':
+				return 'IBM278';
+
+			case 'IBM280':
+			case 'CP280':
+			case 'EBCDIC-CP-IT':
+			case 'CSIBM280':
+				return 'IBM280';
+
+			case 'IBM281':
+			case 'EBCDIC-JP-E':
+			case 'CP281':
+			case 'CSIBM281':
+				return 'IBM281';
+
+			case 'IBM284':
+			case 'CP284':
+			case 'EBCDIC-CP-ES':
+			case 'CSIBM284':
+				return 'IBM284';
+
+			case 'IBM285':
+			case 'CP285':
+			case 'EBCDIC-CP-GB':
+			case 'CSIBM285':
+				return 'IBM285';
+
+			case 'IBM290':
+			case 'CP290':
+			case 'EBCDIC-JP-KANA':
+			case 'CSIBM290':
+				return 'IBM290';
+
+			case 'IBM297':
+			case 'CP297':
+			case 'EBCDIC-CP-FR':
+			case 'CSIBM297':
+				return 'IBM297';
+
+			case 'IBM420':
+			case 'CP420':
+			case 'EBCDIC-CP-AR1':
+			case 'CSIBM420':
+				return 'IBM420';
+
+			case 'IBM423':
+			case 'CP423':
+			case 'EBCDIC-CP-GR':
+			case 'CSIBM423':
+				return 'IBM423';
+
+			case 'IBM424':
+			case 'CP424':
+			case 'EBCDIC-CP-HE':
+			case 'CSIBM424':
+				return 'IBM424';
+
+			case 'IBM437':
+			case 'CP437':
+			case '437':
+			case 'CSPC8CODEPAGE437':
+				return 'IBM437';
+
+			case 'IBM500':
+			case 'CP500':
+			case 'EBCDIC-CP-BE':
+			case 'EBCDIC-CP-CH':
+			case 'CSIBM500':
+				return 'IBM500';
+
+			case 'IBM851':
+			case 'CP851':
+			case '851':
+			case 'CSIBM851':
+				return 'IBM851';
+
+			case 'IBM852':
+			case 'CP852':
+			case '852':
+			case 'CSPCP852':
+				return 'IBM852';
+
+			case 'IBM855':
+			case 'CP855':
+			case '855':
+			case 'CSIBM855':
+				return 'IBM855';
+
+			case 'IBM857':
+			case 'CP857':
+			case '857':
+			case 'CSIBM857':
+				return 'IBM857';
+
+			case 'IBM860':
+			case 'CP860':
+			case '860':
+			case 'CSIBM860':
+				return 'IBM860';
+
+			case 'IBM861':
+			case 'CP861':
+			case '861':
+			case 'CP-IS':
+			case 'CSIBM861':
+				return 'IBM861';
+
+			case 'IBM863':
+			case 'CP863':
+			case '863':
+			case 'CSIBM863':
+				return 'IBM863';
+
+			case 'IBM864':
+			case 'CP864':
+			case 'CSIBM864':
+				return 'IBM864';
+
+			case 'IBM865':
+			case 'CP865':
+			case '865':
+			case 'CSIBM865':
+				return 'IBM865';
+
+			case 'IBM868':
+			case 'CP868':
+			case 'CP-AR':
+			case 'CSIBM868':
+				return 'IBM868';
+
+			case 'IBM869':
+			case 'CP869':
+			case '869':
+			case 'CP-GR':
+			case 'CSIBM869':
+				return 'IBM869';
+
+			case 'IBM870':
+			case 'CP870':
+			case 'EBCDIC-CP-ROECE':
+			case 'EBCDIC-CP-YU':
+			case 'CSIBM870':
+				return 'IBM870';
+
+			case 'IBM871':
+			case 'CP871':
+			case 'EBCDIC-CP-IS':
+			case 'CSIBM871':
+				return 'IBM871';
+
+			case 'IBM880':
+			case 'CP880':
+			case 'EBCDIC-CYRILLIC':
+			case 'CSIBM880':
+				return 'IBM880';
+
+			case 'IBM891':
+			case 'CP891':
+			case 'CSIBM891':
+				return 'IBM891';
+
+			case 'IBM903':
+			case 'CP903':
+			case 'CSIBM903':
+				return 'IBM903';
+
+			case 'IBM904':
+			case 'CP904':
+			case '904':
+			case 'CSIBBM904':
+				return 'IBM904';
+
+			case 'IBM905':
+			case 'CP905':
+			case 'EBCDIC-CP-TR':
+			case 'CSIBM905':
+				return 'IBM905';
+
+			case 'IBM918':
+			case 'CP918':
+			case 'EBCDIC-CP-AR2':
+			case 'CSIBM918':
+				return 'IBM918';
+
+			case 'IBM1026':
+			case 'CP1026':
+			case 'CSIBM1026':
+				return 'IBM1026';
+
+			case 'EBCDIC-AT-DE':
+			case 'CSIBMEBCDICATDE':
+				return 'EBCDIC-AT-DE';
+
+			case 'EBCDIC-AT-DE-A':
+			case 'CSEBCDICATDEA':
+				return 'EBCDIC-AT-DE-A';
+
+			case 'EBCDIC-CA-FR':
+			case 'CSEBCDICCAFR':
+				return 'EBCDIC-CA-FR';
+
+			case 'EBCDIC-DK-NO':
+			case 'CSEBCDICDKNO':
+				return 'EBCDIC-DK-NO';
+
+			case 'EBCDIC-DK-NO-A':
+			case 'CSEBCDICDKNOA':
+				return 'EBCDIC-DK-NO-A';
+
+			case 'EBCDIC-FI-SE':
+			case 'CSEBCDICFISE':
+				return 'EBCDIC-FI-SE';
+
+			case 'EBCDIC-FI-SE-A':
+			case 'CSEBCDICFISEA':
+				return 'EBCDIC-FI-SE-A';
+
+			case 'EBCDIC-FR':
+			case 'CSEBCDICFR':
+				return 'EBCDIC-FR';
+
+			case 'EBCDIC-IT':
+			case 'CSEBCDICIT':
+				return 'EBCDIC-IT';
+
+			case 'EBCDIC-PT':
+			case 'CSEBCDICPT':
+				return 'EBCDIC-PT';
+
+			case 'EBCDIC-ES':
+			case 'CSEBCDICES':
+				return 'EBCDIC-ES';
+
+			case 'EBCDIC-ES-A':
+			case 'CSEBCDICESA':
+				return 'EBCDIC-ES-A';
+
+			case 'EBCDIC-ES-S':
+			case 'CSEBCDICESS':
+				return 'EBCDIC-ES-S';
+
+			case 'EBCDIC-UK':
+			case 'CSEBCDICUK':
+				return 'EBCDIC-UK';
+
+			case 'EBCDIC-US':
+			case 'CSEBCDICUS':
+				return 'EBCDIC-US';
+
+			case 'UNKNOWN-8BIT':
+			case 'CSUNKNOWN8BIT':
+				return 'UNKNOWN-8BIT';
+
+			case 'MNEMONIC':
+			case 'CSMNEMONIC':
+				return 'MNEMONIC';
+
+			case 'MNEM':
+			case 'CSMNEM':
+				return 'MNEM';
+
+			case 'VISCII':
+			case 'CSVISCII':
+				return 'VISCII';
+
+			case 'VIQR':
+			case 'CSVIQR':
+				return 'VIQR';
+
+			case 'KOI8-R':
+			case 'CSKOI8R':
+				return 'KOI8-R';
+
+			case 'HZ-GB-2312':
+				return 'HZ-GB-2312';
+
+			case 'IBM866':
+			case 'CP866':
+			case '866':
+			case 'CSIBM866':
+				return 'IBM866';
+
+			case 'IBM775':
+			case 'CP775':
+			case 'CSPC775BALTIC':
+				return 'IBM775';
+
+			case 'KOI8-U':
+				return 'KOI8-U';
+
+			case 'IBM00858':
+			case 'CCSID00858':
+			case 'CP00858':
+			case 'PC-MULTILINGUAL-850+EURO':
+				return 'IBM00858';
+
+			case 'IBM00924':
+			case 'CCSID00924':
+			case 'CP00924':
+			case 'EBCDIC-LATIN9--EURO':
+				return 'IBM00924';
+
+			case 'IBM01140':
+			case 'CCSID01140':
+			case 'CP01140':
+			case 'EBCDIC-US-37+EURO':
+				return 'IBM01140';
+
+			case 'IBM01141':
+			case 'CCSID01141':
+			case 'CP01141':
+			case 'EBCDIC-DE-273+EURO':
+				return 'IBM01141';
+
+			case 'IBM01142':
+			case 'CCSID01142':
+			case 'CP01142':
+			case 'EBCDIC-DK-277+EURO':
+			case 'EBCDIC-NO-277+EURO':
+				return 'IBM01142';
+
+			case 'IBM01143':
+			case 'CCSID01143':
+			case 'CP01143':
+			case 'EBCDIC-FI-278+EURO':
+			case 'EBCDIC-SE-278+EURO':
+				return 'IBM01143';
+
+			case 'IBM01144':
+			case 'CCSID01144':
+			case 'CP01144':
+			case 'EBCDIC-IT-280+EURO':
+				return 'IBM01144';
+
+			case 'IBM01145':
+			case 'CCSID01145':
+			case 'CP01145':
+			case 'EBCDIC-ES-284+EURO':
+				return 'IBM01145';
+
+			case 'IBM01146':
+			case 'CCSID01146':
+			case 'CP01146':
+			case 'EBCDIC-GB-285+EURO':
+				return 'IBM01146';
+
+			case 'IBM01147':
+			case 'CCSID01147':
+			case 'CP01147':
+			case 'EBCDIC-FR-297+EURO':
+				return 'IBM01147';
+
+			case 'IBM01148':
+			case 'CCSID01148':
+			case 'CP01148':
+			case 'EBCDIC-INTERNATIONAL-500+EURO':
+				return 'IBM01148';
+
+			case 'IBM01149':
+			case 'CCSID01149':
+			case 'CP01149':
+			case 'EBCDIC-IS-871+EURO':
+				return 'IBM01149';
+
+			case 'BIG5-HKSCS':
+				return 'Big5-HKSCS';
+
+			case 'IBM1047':
+			case 'IBM-1047':
+				return 'IBM1047';
+
+			case 'PTCP154':
+			case 'CSPTCP154':
+			case 'PT154':
+			case 'CP154':
+			case 'CYRILLIC-ASIAN':
+				return 'PTCP154';
+
+			case 'AMIGA-1251':
+			case 'AMI1251':
+			case 'AMIGA1251':
+			case 'AMI-1251':
+				return 'Amiga-1251';
+
+			case 'KOI7-SWITCHED':
+				return 'KOI7-switched';
+
+			case 'BRF':
+			case 'CSBRF':
+				return 'BRF';
+
+			case 'TSCII':
+			case 'CSTSCII':
+				return 'TSCII';
+
+			case 'WINDOWS-1250':
+				return 'windows-1250';
+
+			case 'WINDOWS-1251':
+				return 'windows-1251';
+
+			case 'WINDOWS-1252':
+				return 'windows-1252';
+
+			case 'WINDOWS-1253':
+				return 'windows-1253';
+
+			case 'WINDOWS-1254':
+				return 'windows-1254';
+
+			case 'WINDOWS-1255':
+				return 'windows-1255';
+
+			case 'WINDOWS-1256':
+				return 'windows-1256';
+
+			case 'WINDOWS-1257':
+				return 'windows-1257';
+
+			case 'WINDOWS-1258':
+				return 'windows-1258';
+
+			default:
+				return (string) $encoding;
+		}
+	}
+
+	function get_curl_version()
+	{
+		if (is_array($curl = curl_version()))
+		{
+			$curl = $curl['version'];
+		}
+		elseif (substr($curl, 0, 5) == 'curl/')
+		{
+			$curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5));
+		}
+		elseif (substr($curl, 0, 8) == 'libcurl/')
+		{
+			$curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8));
+		}
+		else
+		{
+			$curl = 0;
+		}
+		return $curl;
+	}
+
+	function is_subclass_of($class1, $class2)
+	{
+		if (func_num_args() != 2)
+		{
+			trigger_error('Wrong parameter count for SimplePie_Misc::is_subclass_of()', E_USER_WARNING);
+		}
+		elseif (version_compare(PHP_VERSION, '5.0.3', '>=') || is_object($class1))
+		{
+			return is_subclass_of($class1, $class2);
+		}
+		elseif (is_string($class1) && is_string($class2))
+		{
+			if (class_exists($class1))
+			{
+				if (class_exists($class2))
+				{
+					$class2 = strtolower($class2);
+					while ($class1 = strtolower(get_parent_class($class1)))
+					{
+						if ($class1 == $class2)
+						{
+							return true;
+						}
+					}
+				}
+			}
+			else
+			{
+				trigger_error('Unknown class passed as parameter', E_USER_WARNNG);
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Strip HTML comments
+	 *
+	 * @access public
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	function strip_comments($data)
+	{
+		$output = '';
+		while (($start = strpos($data, '<!--')) !== false)
+		{
+			$output .= substr($data, 0, $start);
+			if (($end = strpos($data, '-->', $start)) !== false)
+			{
+				$data = substr_replace($data, '', 0, $end + 3);
+			}
+			else
+			{
+				$data = '';
+			}
+		}
+		return $output . $data;
+	}
+
+	function parse_date($dt, $rfc822_tz = true)
+	{
+		static $cache = array();
+		if (!isset($cache[$dt][$rfc822_tz]))
+		{
+			$dt = SimplePie_Misc::uncomment_rfc822($dt);
+			/*
+			Capturing subpatterns:
+			1: RFC 822 date
+			2: RFC 822 day
+			3: RFC 822 month
+			4: RFC 822 year
+			5: ISO 8601 date
+			6: ISO 8601 century
+			7: ISO 8601 year
+			8: ISO 8601 month
+			9: ISO 8601 day
+			10: ISO 8601 ordinal day
+			11: ISO 8601 month
+			12: ISO 8601 day
+			13: ISO 8601 week
+			14: ISO 8601 day of week
+			15: Time
+			16: Hour
+			17: Hour Decimal
+			18: Minute
+			19: Minute Decimal
+			20: Second
+			21: Second Decimal
+			22: Timezone
+			23: Diff ±
+			24: Hour
+			25: Hour Decimal
+			26: Minute
+			27: Minute Decimal
+			28: Alphabetic Timezone
+			*/
+			if (preg_match('/^(?:(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)[,\s]+)?(([0-9]{1,2})\s*(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s*([0-9]{4}|[0-9]{2}))|(([0-9]{2})(?:([0-9]{2})(?:(?:-|\s)*(?:([0-9]{2})([0-9]{2})|([0-9]{3})|([0-9]{2})(?:(?:-|\s)*([0-9]{2}))?|W([0-9]{2})(?:(?:-|\s)*([0-9]))?))?)?))((?:T|\s)+([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*([0-9]{2})(?:(?:,|\.)([0-9]*))?)?)?(?:\s)*((?:(\+|-)([0-9]{2})(?:(?:,|\.)([0-9]*)|(?:\:|\s)*(?:([0-9]{2})(?:(?:,|\.)([0-9]*))?))?)|(UTC|GMT|EST|CST|MST|PST|EDT|CDT|MDT|PDT|UT|[A-IK-Z]))?)?$/i', $dt, $match))
+			{
+				// Fill all matches
+				for ($i = count($match); $i <= 28; $i++)
+				{
+					$match[$i] = '';
+				}
+				
+				// Set blank vars
+				$year = 1970;
+				$month = 1;
+				$day = 1;
+				$hour = 0;
+				$minute = 0;
+				$second = 0;
+				$timezone = false;
+
+				// RFC 822
+				if ($match[1] !== '')
+				{
+					if (strlen($match[4]) == 2)
+					{
+						$year = ($match[4] < 70) ? "20$match[4]" : "19$match[4]";
+					}
+					else
+					{
+						$year = $match[4];
+					}
+					switch (strtolower($match[3]))
+					{
+						case 'jan':
+							$month = 1;
+							break;
+
+						case 'feb':
+							$month = 2;
+							break;
+
+						case 'mar':
+							$month = 3;
+							break;
+
+						case 'apr':
+							$month = 4;
+							break;
+
+						case 'may':
+							$month = 5;
+							break;
+
+						case 'jun':
+							$month = 6;
+							break;
+
+						case 'jul':
+							$month = 7;
+							break;
+
+						case 'aug':
+							$month = 8;
+							break;
+
+						case 'sep':
+							$month = 9;
+							break;
+
+						case 'oct':
+							$month = 10;
+							break;
+
+						case 'nov':
+							$month = 11;
+							break;
+
+						case 'dec':
+							$month = 12;
+							break;
+					}
+					$day = $match[2];
+				}
+				// ISO 8601
+				else
+				{
+					// Year
+					if ($match[7] !== '')
+					{
+						$year = "$match[6]$match[7]";
+
+						// Two Digit Month/Day
+						if ($match[11] !== '')
+						{
+							$month = $match[11];
+							if ($match[12] !== '')
+							{
+								$day = $match[12];
+							}
+						}
+
+						// Four Digit Month/Day
+						elseif ($match[8] !== '')
+						{
+							$month = $match[8];
+							$day = $match[9];
+						}
+
+						// Ordinal Day
+						elseif ($match[10] !== '')
+						{
+							$day = $match[10];
+						}
+
+						// Week Date
+						elseif ($match[13] !== '')
+						{
+							// Week Day
+							if ($match[14] !== '')
+							{
+								$day = $match[14];
+							}
+
+							$first_day_of_year = date('w', mktime(0, 0, 0, 1, 1, $year));
+							if ($first_day_of_year == 0)
+							{
+								$first_day_of_year = 7;
+							}
+
+							$day = 7 * ($match[13] - 1) + $day - ($first_day_of_year - 1);
+						}
+					}
+					else
+					{
+						$year = "$match[6]00";
+					}
+				}
+				// Time
+				if ($match[15] !== '')
+				{
+					$time = 0;
+					$time += ($match[16] + ('.' . $match[17])) * 3600;
+					$time += ($match[18] + ('.' . $match[19])) * 60;
+					$time += $match[20] + ('.' . $match[21]);
+					$hour = floor($time / 3600);
+					$time -= $hour * 3600;
+					$minute = floor($time / 60);
+					$time -= $minute * 60;
+					$second = round($time);
+
+					// Timezone
+					if ($match[22] !== '')
+					{
+						// Alphabetic Timezone
+						if ($match[28] !== '')
+						{
+							// Military
+							if (strlen($match[28]) == 1)
+							{
+								if ($match[28] == 'Z' || $match[28] == 'z' || !$rfc822_tz)
+								{
+									$timezone = 0;
+								}
+								else
+								{
+									$timezone = ord(strtoupper($match[28]));
+
+									if ($timezone > 74)
+									{
+										$timezone--;
+									}
+
+									if ($timezone <= 76)
+									{
+										$timezone = -($timezone - 64);
+									}
+									else
+									{
+										$timezone -= 76;
+									}
+
+									$timezone *= 3600;
+								}
+							}
+							// Code
+							else
+							{
+								switch (strtoupper($match[28]))
+								{
+									case 'UT':
+									case 'UTC':
+									case 'GMT':
+										$timezone = 0;
+										break;
+
+									case 'EST':
+										$timezone = -18000;
+										break;
+
+									case 'CST':
+										$timezone = -21600;
+										break;
+
+									case 'MST':
+										$timezone = -25200;
+										break;
+
+									case 'PST':
+										$timezone = -28800;
+										break;
+
+									case 'EDT':
+										$timezone = -14400;
+										break;
+
+									case 'CDT':
+										$timezone = -18000;
+										break;
+
+									case 'MDT':
+										$timezone = -21600;
+										break;
+
+									case 'PDT':
+										$timezone = -25200;
+										break;
+								}
+							}
+						}
+						// Timezone difference from UTC
+						else
+						{
+							$timezone = 0;
+							$timezone += ($match[24] + ('.' . $match[25])) * 3600;
+							$timezone += ($match[26] + ('.' . $match[27])) * 60;
+							$timezone = (int) round($timezone);
+
+							if ($match[23] == '-')
+							{
+								$timezone = -$timezone;
+							}
+						}
+					}
+				}
+				if ($timezone === false)
+				{
+					$cache[$dt][$rfc822_tz] = mktime($hour, $minute, $second, $month, $day, $year);
+				}
+				else
+				{
+					$cache[$dt][$rfc822_tz] = gmmktime($hour, $minute, $second, $month, $day, $year) - $timezone;
+				}
+			}
+			elseif (($time = strtotime($dt)) > 0)
+			{
+				$cache[$dt][$rfc822_tz] = $time;
+			}
+			else
+			{
+				$cache[$dt][$rfc822_tz] = false;
+			}
+		}
+		return $cache[$dt][$rfc822_tz];
+	}
+
+	/**
+	 * Decode HTML entities
+	 *
+	 * @static
+	 * @access public
+	 * @param string $data Input data
+	 * @return string Output data
+	 */
+	function entities_decode($data)
+	{
+		$decoder = new SimplePie_Decode_HTML_Entities($data);
+		return $decoder->parse();
+	}
+
+	/**
+	 * Remove RFC822 comments
+	 *
+	 * @author Tomas V.V.Cox <cox@idecnet.com>
+	 * @author Pierre-Alain Joye <pajoye@php.net>
+	 * @author Amir Mohammad Saied <amir@php.net>
+	 * @copyright 1997-2006 Pierre-Alain Joye,Tomas V.V.Cox,Amir Mohammad Saied
+	 * @license http://www.opensource.org/licenses/bsd-license.php New BSD License
+	 * @version CVS: $Id: Validate.php,v 1.104 2006/11/17 16:32:06 amir Exp $
+	 * @link http://pear.php.net/package/Validate
+	 * @access public
+	 * @param string $data Data to strip comments from
+	 * @return string Comment stripped string
+	 */
+	function uncomment_rfc822($data)
+	{
+		if ((version_compare(PHP_VERSION, '4.4.6', '>=') && version_compare(PHP_VERSION, '5', '<')) || version_compare(PHP_VERSION, '5.2.2', '>='))
+		{
+			return $data;
+		}
+		else
+		{
+			return preg_replace('/((?:(?:\\\\"|[^("])*(?:"(?:[^"\\\\\r]|\\\\.)*"\s*)?)*)((?<!\\\\)\((?:(?2)|.)*?(?<!\\\\)\))/', '$1', $data);
+		}
+	}
+
+	function parse_mime($mime)
+	{
+		if (($pos = strpos($mime, ';')) === false)
+		{
+			return trim($mime);
+		}
+		else
+		{
+			return trim(substr($mime, 0, $pos));
+		}
+	}
+
+	function htmlspecialchars_decode($string, $quote_style)
+	{
+		if (function_exists('htmlspecialchars_decode'))
+		{
+			return htmlspecialchars_decode($string, $quote_style);
+		}
+		else
+		{
+			return strtr($string, array_flip(get_html_translation_table(HTML_SPECIALCHARS, $quote_style)));
+		}
+	}
+
+	function atom_03_construct_type($attribs)
+	{
+		if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) == 'base64'))
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_BASE64;
+		}
+		else
+		{
+			$mode = SIMPLEPIE_CONSTRUCT_NONE;
+		}
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+				case 'text/plain':
+					return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+
+				case 'html':
+				case 'text/html':
+					return SIMPLEPIE_CONSTRUCT_HTML | $mode;
+
+				case 'xhtml':
+				case 'application/xhtml+xml':
+					return SIMPLEPIE_CONSTRUCT_XHTML | $mode;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE | $mode;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT | $mode;
+		}
+	}
+
+	function atom_10_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			switch (strtolower(trim($attribs['']['type'])))
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+
+				default:
+					return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+		}
+		return SIMPLEPIE_CONSTRUCT_TEXT;
+	}
+
+	function atom_10_content_construct_type($attribs)
+	{
+		if (isset($attribs['']['type']))
+		{
+			$type = strtolower(trim($attribs['']['type']));
+			switch ($type)
+			{
+				case 'text':
+					return SIMPLEPIE_CONSTRUCT_TEXT;
+
+				case 'html':
+					return SIMPLEPIE_CONSTRUCT_HTML;
+
+				case 'xhtml':
+					return SIMPLEPIE_CONSTRUCT_XHTML;
+			}
+			if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) == 'text/')
+			{
+				return SIMPLEPIE_CONSTRUCT_NONE;
+			}
+			else
+			{
+				return SIMPLEPIE_CONSTRUCT_BASE64;
+			}
+		}
+		else
+		{
+			return SIMPLEPIE_CONSTRUCT_TEXT;
+		}
+	}
+
+	function is_isegment_nz_nc($string)
+	{
+		return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string);
+	}
+
+	function space_seperated_tokens($string)
+	{
+		$space_characters = "\x20\x09\x0A\x0B\x0C\x0D";
+		$string_length = strlen($string);
+
+		$position = strspn($string, $space_characters);
+		$tokens = array();
+
+		while ($position < $string_length)
+		{
+			$len = strcspn($string, $space_characters, $position);
+			$tokens[] = substr($string, $position, $len);
+			$position += $len;
+			$position += strspn($string, $space_characters, $position);
+		}
+
+		return $tokens;
+	}
+
+	function array_unique($array)
+	{
+		if (version_compare(PHP_VERSION, '5.2', '>='))
+		{
+			return array_unique($array);
+		}
+		else
+		{
+			$array = (array) $array;
+			$new_array = array();
+			$new_array_strings = array();
+			foreach ($array as $key => $value)
+			{
+				if (is_object($value))
+				{
+					if (method_exists($value, '__toString'))
+					{
+						$cmp = $value->__toString();
+					}
+					else
+					{
+						trigger_error('Object of class ' . get_class($value) . ' could not be converted to string', E_USER_ERROR);
+					}
+				}
+				elseif (is_array($value))
+				{
+					$cmp = (string) reset($value);
+				}
+				else
+				{
+					$cmp = (string) $value;
+				}
+				if (!in_array($cmp, $new_array_strings))
+				{
+					$new_array[$key] = $value;
+					$new_array_strings[] = $cmp;
+				}
+			}
+			return $new_array;
+		}
+	}
+
+	/**
+	 * Converts a unicode codepoint to a UTF-8 character
+	 *
+	 * @static
+	 * @access public
+	 * @param int $codepoint Unicode codepoint
+	 * @return string UTF-8 character
+	 */
+	function codepoint_to_utf8($codepoint)
+	{
+		static $cache = array();
+		$codepoint = (int) $codepoint;
+		if (isset($cache[$codepoint]))
+		{
+			return $cache[$codepoint];
+		}
+		elseif ($codepoint < 0)
+		{
+			return $cache[$codepoint] = false;
+		}
+		else if ($codepoint <= 0x7f)
+		{
+			return $cache[$codepoint] = chr($codepoint);
+		}
+		else if ($codepoint <= 0x7ff)
+		{
+			return $cache[$codepoint] = chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0xffff)
+		{
+			return $cache[$codepoint] = chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else if ($codepoint <= 0x10ffff)
+		{
+			return $cache[$codepoint] = chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f));
+		}
+		else
+		{
+			// U+FFFD REPLACEMENT CHARACTER
+			return $cache[$codepoint] = "\xEF\xBF\xBD";
+		}
+	}
+
+	/**
+	 * Re-implementation of PHP 4.2.0's is_a()
+	 *
+	 * @static
+	 * @access public
+	 * @param object $object The tested object
+	 * @param string $class_name The class name
+	 * @return bool Returns true if the object is of this class or has this class as one of its parents, false otherwise
+	 */
+	 function is_a($object, $class_name)
+	 {
+	 	if (function_exists('is_a'))
+	 	{
+	 		return is_a($object, $class_name);
+	 	}
+	 	elseif (!is_object($object))
+	 	{
+	 		return false;
+	 	}
+	 	elseif (get_class($object) == strtolower($class_name))
+	 	{
+	 		return true;
+	 	}
+	 	else
+	 	{
+	 		return is_subclass_of($object, $class_name);
+	 	}
+	 }
+
+	/**
+	 * Re-implementation of PHP 5's stripos()
+	 *
+	 * Returns the numeric position of the first occurrence of needle in the
+	 * haystack string.
+	 *
+	 * @static
+	 * @access string
+	 * @param object $haystack
+	 * @param string $needle Note that the needle may be a string of one or more
+	 *     characters. If needle is not a string, it is converted to an integer
+	 *     and applied as the ordinal value of a character.
+	 * @param int $offset The optional offset parameter allows you to specify which
+	 *     character in haystack to start searching. The position returned is still
+	 *     relative to the beginning of haystack.
+	 * @return bool If needle is not found, stripos() will return boolean false.
+	 */
+	 function stripos($haystack, $needle, $offset = 0)
+	 {
+	 	if (function_exists('stripos'))
+	 	{
+	 		return stripos($haystack, $needle, $offset);
+	 	}
+	 	else
+	 	{
+	 		if (is_string($needle))
+	 		{
+	 			$needle = strtolower($needle);
+	 		}
+	 		elseif (is_int($needle) || is_bool($needle) || is_double($needle))
+	 		{
+	 			$needle = strtolower(chr($needle));
+	 		}
+	 		else
+	 		{
+	 			trigger_error('needle is not a string or an integer', E_USER_WARNING);
+	 			return false;
+	 		}
+
+	 		return strpos(strtolower($haystack), $needle, $offset);
+	 	}
+	 }
+}
+
+/**
+ * Decode HTML Entities
+ *
+ * This implements HTML5 as of revision 967 (2007-06-28)
+ *
+ * @package SimplePie
+ */
+class SimplePie_Decode_HTML_Entities
+{
+	/**
+	 * Data to be parsed
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $data = '';
+
+	/**
+	 * Currently consumed bytes
+	 *
+	 * @access private
+	 * @var string
+	 */
+	var $consumed = '';
+
+	/**
+	 * Position of the current byte being parsed
+	 *
+	 * @access private
+	 * @var int
+	 */
+	var $position = 0;
+
+	/**
+	 * Create an instance of the class with the input data
+	 *
+	 * @access public
+	 * @param string $data Input data
+	 */
+	function SimplePie_Decode_HTML_Entities($data)
+	{
+		$this->data = $data;
+	}
+
+	/**
+	 * Parse the input data
+	 *
+	 * @access public
+	 * @return string Output data
+	 */
+	function parse()
+	{
+		while (($this->position = strpos($this->data, '&', $this->position)) !== false)
+		{
+			$this->consume();
+			$this->entity();
+			$this->consumed = '';
+		}
+		return $this->data;
+	}
+
+	/**
+	 * Consume the next byte
+	 *
+	 * @access private
+	 * @return mixed The next byte, or false, if there is no more data
+	 */
+	function consume()
+	{
+		if (isset($this->data[$this->position]))
+		{
+			$this->consumed .= $this->data[$this->position];
+			return $this->data[$this->position++];
+		}
+		else
+		{
+			$this->consumed = false;
+			return false;
+		}
+	}
+
+	/**
+	 * Consume a range of characters
+	 *
+	 * @access private
+	 * @param string $chars Characters to consume
+	 * @return mixed A series of characters that match the range, or false
+	 */
+	function consume_range($chars)
+	{
+		if ($len = strspn($this->data, $chars, $this->position))
+		{
+			$data = substr($this->data, $this->position, $len);
+			$this->consumed .= $data;
+			$this->position += $len;
+			return $data;
+		}
+		else
+		{
+			$this->consumed = false;
+			return false;
+		}
+	}
+
+	/**
+	 * Unconsume one byte
+	 *
+	 * @access private
+	 */
+	function unconsume()
+	{
+		$this->consumed = substr($this->consumed, 0, -1);
+		$this->position--;
+	}
+
+	/**
+	 * Decode an entity
+	 *
+	 * @access private
+	 */
+	function entity()
+	{
+		switch ($this->consume())
+		{
+			case "\x09":
+			case "\x0A":
+			case "\x0B":
+			case "\x0B":
+			case "\x0C":
+			case "\x20":
+			case "\x3C":
+			case "\x26":
+			case false:
+				break;
+
+			case "\x23":
+				switch ($this->consume())
+				{
+					case "\x78":
+					case "\x58":
+						$range = '0123456789ABCDEFabcdef';
+						$hex = true;
+						break;
+
+					default:
+						$range = '0123456789';
+						$hex = false;
+						$this->unconsume();
+						break;
+				}
+
+				if ($codepoint = $this->consume_range($range))
+				{
+					static $windows_1252_specials = array(0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => "\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8");
+
+					if ($hex)
+					{
+						$codepoint = hexdec($codepoint);
+					}
+					else
+					{
+						$codepoint = intval($codepoint);
+					}
+
+					if (isset($windows_1252_specials[$codepoint]))
+					{
+						$replacement = $windows_1252_specials[$codepoint];
+					}
+					else
+					{
+						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
+					}
+
+					if ($this->consume() != ';')
+					{
+						$this->unconsume();
+					}
+
+					$consumed_length = strlen($this->consumed);
+					$this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length);
+					$this->position += strlen($replacement) - $consumed_length;
+				}
+				break;
+
+			default:
+				static $entities = array('Aacute' => "\xC3\x81", 'aacute' => "\xC3\xA1", 'Aacute;' => "\xC3\x81", 'aacute;' => "\xC3\xA1", 'Acirc' => "\xC3\x82", 'acirc' => "\xC3\xA2", 'Acirc;' => "\xC3\x82", 'acirc;' => "\xC3\xA2", 'acute' => "\xC2\xB4", 'acute;' => "\xC2\xB4", 'AElig' => "\xC3\x86", 'aelig' => "\xC3\xA6", 'AElig;' => "\xC3\x86", 'aelig;' => "\xC3\xA6", 'Agrave' => "\xC3\x80", 'agrave' => "\xC3\xA0", 'Agrave;' => "\xC3\x80", 'agrave;' => "\xC3\xA0", 'alefsym;' => "\xE2\x84\xB5", 'Alpha;' => "\xCE\x91", 'alpha;' => "\xCE\xB1", 'AMP' => "\x26", 'amp' => "\x26", 'AMP;' => "\x26", 'amp;' => "\x26", 'and;' => "\xE2\x88\xA7", 'ang;' => "\xE2\x88\xA0", 'apos;' => "\x27", 'Aring' => "\xC3\x85", 'aring' => "\xC3\xA5", 'Aring;' => "\xC3\x85", 'aring;' => "\xC3\xA5", 'asymp;' => "\xE2\x89\x88", 'Atilde' => "\xC3\x83", 'atilde' => "\xC3\xA3", 'Atilde;' => "\xC3\x83", 'atilde;' => "\xC3\xA3", 'Auml' => "\xC3\x84", 'auml' => "\xC3\xA4", 'Auml;' => "\xC3\x84", 'auml;' => "\xC3\xA4", 'bdquo;' => "\xE2\x80\x9E", 'Beta;' => "\xCE\x92", 'beta;' => "\xCE\xB2", 'brvbar' => "\xC2\xA6", 'brvbar;' => "\xC2\xA6", 'bull;' => "\xE2\x80\xA2", 'cap;' => "\xE2\x88\xA9", 'Ccedil' => "\xC3\x87", 'ccedil' => "\xC3\xA7", 'Ccedil;' => "\xC3\x87", 'ccedil;' => "\xC3\xA7", 'cedil' => "\xC2\xB8", 'cedil;' => "\xC2\xB8", 'cent' => "\xC2\xA2", 'cent;' => "\xC2\xA2", 'Chi;' => "\xCE\xA7", 'chi;' => "\xCF\x87", 'circ;' => "\xCB\x86", 'clubs;' => "\xE2\x99\xA3", 'cong;' => "\xE2\x89\x85", 'COPY' => "\xC2\xA9", 'copy' => "\xC2\xA9", 'COPY;' => "\xC2\xA9", 'copy;' => "\xC2\xA9", 'crarr;' => "\xE2\x86\xB5", 'cup;' => "\xE2\x88\xAA", 'curren' => "\xC2\xA4", 'curren;' => "\xC2\xA4", 'Dagger;' => "\xE2\x80\xA1", 'dagger;' => "\xE2\x80\xA0", 'dArr;' => "\xE2\x87\x93", 'darr;' => "\xE2\x86\x93", 'deg' => "\xC2\xB0", 'deg;' => "\xC2\xB0", 'Delta;' => "\xCE\x94", 'delta;' => "\xCE\xB4", 'diams;' => "\xE2\x99\xA6", 'divide' => "\xC3\xB7", 'divide;' => "\xC3\xB7", 'Eacute' => "\xC3\x89", 'eacute' => "\xC3\xA9", 'Eacute;' => "\xC3\x89", 'eacute;' => "\xC3\xA9", 'Ecirc' => "\xC3\x8A", 'ecirc' => "\xC3\xAA", 'Ecirc;' => "\xC3\x8A", 'ecirc;' => "\xC3\xAA", 'Egrave' => "\xC3\x88", 'egrave' => "\xC3\xA8", 'Egrave;' => "\xC3\x88", 'egrave;' => "\xC3\xA8", 'empty;' => "\xE2\x88\x85", 'emsp;' => "\xE2\x80\x83", 'ensp;' => "\xE2\x80\x82", 'Epsilon;' => "\xCE\x95", 'epsilon;' => "\xCE\xB5", 'equiv;' => "\xE2\x89\xA1", 'Eta;' => "\xCE\x97", 'eta;' => "\xCE\xB7", 'ETH' => "\xC3\x90", 'eth' => "\xC3\xB0", 'ETH;' => "\xC3\x90", 'eth;' => "\xC3\xB0", 'Euml' => "\xC3\x8B", 'euml' => "\xC3\xAB", 'Euml;' => "\xC3\x8B", 'euml;' => "\xC3\xAB", 'euro;' => "\xE2\x82\xAC", 'exist;' => "\xE2\x88\x83", 'fnof;' => "\xC6\x92", 'forall;' => "\xE2\x88\x80", 'frac12' => "\xC2\xBD", 'frac12;' => "\xC2\xBD", 'frac14' => "\xC2\xBC", 'frac14;' => "\xC2\xBC", 'frac34' => "\xC2\xBE", 'frac34;' => "\xC2\xBE", 'frasl;' => "\xE2\x81\x84", 'Gamma;' => "\xCE\x93", 'gamma;' => "\xCE\xB3", 'ge;' => "\xE2\x89\xA5", 'GT' => "\x3E", 'gt' => "\x3E", 'GT;' => "\x3E", 'gt;' => "\x3E", 'hArr;' => "\xE2\x87\x94", 'harr;' => "\xE2\x86\x94", 'hearts;' => "\xE2\x99\xA5", 'hellip;' => "\xE2\x80\xA6", 'Iacute' => "\xC3\x8D", 'iacute' => "\xC3\xAD", 'Iacute;' => "\xC3\x8D", 'iacute;' => "\xC3\xAD", 'Icirc' => "\xC3\x8E", 'icirc' => "\xC3\xAE", 'Icirc;' => "\xC3\x8E", 'icirc;' => "\xC3\xAE", 'iexcl' => "\xC2\xA1", 'iexcl;' => "\xC2\xA1", 'Igrave' => "\xC3\x8C", 'igrave' => "\xC3\xAC", 'Igrave;' => "\xC3\x8C", 'igrave;' => "\xC3\xAC", 'image;' => "\xE2\x84\x91", 'infin;' => "\xE2\x88\x9E", 'int;' => "\xE2\x88\xAB", 'Iota;' => "\xCE\x99", 'iota;' => "\xCE\xB9", 'iquest' => "\xC2\xBF", 'iquest;' => "\xC2\xBF", 'isin;' => "\xE2\x88\x88", 'Iuml' => "\xC3\x8F", 'iuml' => "\xC3\xAF", 'Iuml;' => "\xC3\x8F", 'iuml;' => "\xC3\xAF", 'Kappa;' => "\xCE\x9A", 'kappa;' => "\xCE\xBA", 'Lambda;' => "\xCE\x9B", 'lambda;' => "\xCE\xBB", 'lang;' => "\xE3\x80\x88", 'laquo' => "\xC2\xAB", 'laquo;' => "\xC2\xAB", 'lArr;' => "\xE2\x87\x90", 'larr;' => "\xE2\x86\x90", 'lceil;' => "\xE2\x8C\x88", 'ldquo;' => "\xE2\x80\x9C", 'le;' => "\xE2\x89\xA4", 'lfloor;' => "\xE2\x8C\x8A", 'lowast;' => "\xE2\x88\x97", 'loz;' => "\xE2\x97\x8A", 'lrm;' => "\xE2\x80\x8E", 'lsaquo;' => "\xE2\x80\xB9", 'lsquo;' => "\xE2\x80\x98", 'LT' => "\x3C", 'lt' => "\x3C", 'LT;' => "\x3C", 'lt;' => "\x3C", 'macr' => "\xC2\xAF", 'macr;' => "\xC2\xAF", 'mdash;' => "\xE2\x80\x94", 'micro' => "\xC2\xB5", 'micro;' => "\xC2\xB5", 'middot' => "\xC2\xB7", 'middot;' => "\xC2\xB7", 'minus;' => "\xE2\x88\x92", 'Mu;' => "\xCE\x9C", 'mu;' => "\xCE\xBC", 'nabla;' => "\xE2\x88\x87", 'nbsp' => "\xC2\xA0", 'nbsp;' => "\xC2\xA0", 'ndash;' => "\xE2\x80\x93", 'ne;' => "\xE2\x89\xA0", 'ni;' => "\xE2\x88\x8B", 'not' => "\xC2\xAC", 'not;' => "\xC2\xAC", 'notin;' => "\xE2\x88\x89", 'nsub;' => "\xE2\x8A\x84", 'Ntilde' => "\xC3\x91", 'ntilde' => "\xC3\xB1", 'Ntilde;' => "\xC3\x91", 'ntilde;' => "\xC3\xB1", 'Nu;' => "\xCE\x9D", 'nu;' => "\xCE\xBD", 'Oacute' => "\xC3\x93", 'oacute' => "\xC3\xB3", 'Oacute;' => "\xC3\x93", 'oacute;' => "\xC3\xB3", 'Ocirc' => "\xC3\x94", 'ocirc' => "\xC3\xB4", 'Ocirc;' => "\xC3\x94", 'ocirc;' => "\xC3\xB4", 'OElig;' => "\xC5\x92", 'oelig;' => "\xC5\x93", 'Ograve' => "\xC3\x92", 'ograve' => "\xC3\xB2", 'Ograve;' => "\xC3\x92", 'ograve;' => "\xC3\xB2", 'oline;' => "\xE2\x80\xBE", 'Omega;' => "\xCE\xA9", 'omega;' => "\xCF\x89", 'Omicron;' => "\xCE\x9F", 'omicron;' => "\xCE\xBF", 'oplus;' => "\xE2\x8A\x95", 'or;' => "\xE2\x88\xA8", 'ordf' => "\xC2\xAA", 'ordf;' => "\xC2\xAA", 'ordm' => "\xC2\xBA", 'ordm;' => "\xC2\xBA", 'Oslash' => "\xC3\x98", 'oslash' => "\xC3\xB8", 'Oslash;' => "\xC3\x98", 'oslash;' => "\xC3\xB8", 'Otilde' => "\xC3\x95", 'otilde' => "\xC3\xB5", 'Otilde;' => "\xC3\x95", 'otilde;' => "\xC3\xB5", 'otimes;' => "\xE2\x8A\x97", 'Ouml' => "\xC3\x96", 'ouml' => "\xC3\xB6", 'Ouml;' => "\xC3\x96", 'ouml;' => "\xC3\xB6", 'para' => "\xC2\xB6", 'para;' => "\xC2\xB6", 'part;' => "\xE2\x88\x82", 'permil;' => "\xE2\x80\xB0", 'perp;' => "\xE2\x8A\xA5", 'Phi;' => "\xCE\xA6", 'phi;' => "\xCF\x86", 'Pi;' => "\xCE\xA0", 'pi;' => "\xCF\x80", 'piv;' => "\xCF\x96", 'plusmn' => "\xC2\xB1", 'plusmn;' => "\xC2\xB1", 'pound' => "\xC2\xA3", 'pound;' => "\xC2\xA3", 'Prime;' => "\xE2\x80\xB3", 'prime;' => "\xE2\x80\xB2", 'prod;' => "\xE2\x88\x8F", 'prop;' => "\xE2\x88\x9D", 'Psi;' => "\xCE\xA8", 'psi;' => "\xCF\x88", 'QUOT' => "\x22", 'quot' => "\x22", 'QUOT;' => "\x22", 'quot;' => "\x22", 'radic;' => "\xE2\x88\x9A", 'rang;' => "\xE3\x80\x89", 'raquo' => "\xC2\xBB", 'raquo;' => "\xC2\xBB", 'rArr;' => "\xE2\x87\x92", 'rarr;' => "\xE2\x86\x92", 'rceil;' => "\xE2\x8C\x89", 'rdquo;' => "\xE2\x80\x9D", 'real;' => "\xE2\x84\x9C", 'REG' => "\xC2\xAE", 'reg' => "\xC2\xAE", 'REG;' => "\xC2\xAE", 'reg;' => "\xC2\xAE", 'rfloor;' => "\xE2\x8C\x8B", 'Rho;' => "\xCE\xA1", 'rho;' => "\xCF\x81", 'rlm;' => "\xE2\x80\x8F", 'rsaquo;' => "\xE2\x80\xBA", 'rsquo;' => "\xE2\x80\x99", 'sbquo;' => "\xE2\x80\x9A", 'Scaron;' => "\xC5\xA0", 'scaron;' => "\xC5\xA1", 'sdot;' => "\xE2\x8B\x85", 'sect' => "\xC2\xA7", 'sect;' => "\xC2\xA7", 'shy' => "\xC2\xAD", 'shy;' => "\xC2\xAD", 'Sigma;' => "\xCE\xA3", 'sigma;' => "\xCF\x83", 'sigmaf;' => "\xCF\x82", 'sim;' => "\xE2\x88\xBC", 'spades;' => "\xE2\x99\xA0", 'sub;' => "\xE2\x8A\x82", 'sube;' => "\xE2\x8A\x86", 'sum;' => "\xE2\x88\x91", 'sup;' => "\xE2\x8A\x83", 'sup1' => "\xC2\xB9", 'sup1;' => "\xC2\xB9", 'sup2' => "\xC2\xB2", 'sup2;' => "\xC2\xB2", 'sup3' => "\xC2\xB3", 'sup3;' => "\xC2\xB3", 'supe;' => "\xE2\x8A\x87", 'szlig' => "\xC3\x9F", 'szlig;' => "\xC3\x9F", 'Tau;' => "\xCE\xA4", 'tau;' => "\xCF\x84", 'there4;' => "\xE2\x88\xB4", 'Theta;' => "\xCE\x98", 'theta;' => "\xCE\xB8", 'thetasym;' => "\xCF\x91", 'thinsp;' => "\xE2\x80\x89", 'THORN' => "\xC3\x9E", 'thorn' => "\xC3\xBE", 'THORN;' => "\xC3\x9E", 'thorn;' => "\xC3\xBE", 'tilde;' => "\xCB\x9C", 'times' => "\xC3\x97", 'times;' => "\xC3\x97", 'TRADE;' => "\xE2\x84\xA2", 'trade;' => "\xE2\x84\xA2", 'Uacute' => "\xC3\x9A", 'uacute' => "\xC3\xBA", 'Uacute;' => "\xC3\x9A", 'uacute;' => "\xC3\xBA", 'uArr;' => "\xE2\x87\x91", 'uarr;' => "\xE2\x86\x91", 'Ucirc' => "\xC3\x9B", 'ucirc' => "\xC3\xBB", 'Ucirc;' => "\xC3\x9B", 'ucirc;' => "\xC3\xBB", 'Ugrave' => "\xC3\x99", 'ugrave' => "\xC3\xB9", 'Ugrave;' => "\xC3\x99", 'ugrave;' => "\xC3\xB9", 'uml' => "\xC2\xA8", 'uml;' => "\xC2\xA8", 'upsih;' => "\xCF\x92", 'Upsilon;' => "\xCE\xA5", 'upsilon;' => "\xCF\x85", 'Uuml' => "\xC3\x9C", 'uuml' => "\xC3\xBC", 'Uuml;' => "\xC3\x9C", 'uuml;' => "\xC3\xBC", 'weierp;' => "\xE2\x84\x98", 'Xi;' => "\xCE\x9E", 'xi;' => "\xCE\xBE", 'Yacute' => "\xC3\x9D", 'yacute' => "\xC3\xBD", 'Yacute;' => "\xC3\x9D", 'yacute;' => "\xC3\xBD", 'yen' => "\xC2\xA5", 'yen;' => "\xC2\xA5", 'yuml' => "\xC3\xBF", 'Yuml;' => "\xC5\xB8", 'yuml;' => "\xC3\xBF", 'Zeta;' => "\xCE\x96", 'zeta;' => "\xCE\xB6", 'zwj;' => "\xE2\x80\x8D", 'zwnj;' => "\xE2\x80\x8C");
+
+				for ($i = 0, $match = null; $i < 9 && $this->consume(); $i++)
+				{
+					$consumed = substr($this->consumed, 1);
+					if (isset($entities[$consumed]))
+					{
+						$match = $consumed;
+					}
+				}
+
+				if ($match !== null)
+				{
+ 					$this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1);
+					$this->position += strlen($entities[$match]) - strlen($consumed) - 1;
+				}
+				break;
+		}
+	}
+}
+
+class SimplePie_Locator
+{
+	var $useragent;
+	var $timeout;
+	var $file;
+	var $local = array();
+	var $elsewhere = array();
+	var $file_class = 'SimplePie_File';
+	var $cached_entities = array();
+	var $http_base;
+	var $base;
+	var $base_location = 0;
+	var $checked_feeds = 0;
+	var $max_checked_feeds = 10;
+
+	function SimplePie_Locator(&$file, $timeout = 10, $useragent = null, $file_class = 'SimplePie_File', $max_checked_feeds = 10)
+	{
+		$this->file =& $file;
+		$this->file_class = $file_class;
+		$this->useragent = $useragent;
+		$this->timeout = $timeout;
+		$this->max_checked_feeds = $max_checked_feeds;
+	}
+
+	function find($type = SIMPLEPIE_LOCATOR_ALL)
+	{
+		if ($this->is_feed($this->file))
+		{
+			return $this->file;
+		}
+
+		if ($type & ~SIMPLEPIE_LOCATOR_NONE)
+		{
+			$this->get_base();
+		}
+
+		if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery())
+		{
+			return $working;
+		}
+
+		if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links())
+		{
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere))
+			{
+				return $working;
+			}
+
+			if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere))
+			{
+				return $working;
+			}
+		}
+		return null;
+	}
+
+	function is_feed(&$file)
+	{
+		$body = SimplePie_Misc::strip_comments($file->body);
+		if (preg_match('/<([^\s:]+:)?(rss|RDF|feed)' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/i', $body))
+		{
+			return true;
+		}
+		return false;
+	}
+
+	function get_base()
+	{
+		if (isset($this->file->headers['content-location']))
+		{
+			$this->http_base = SimplePie_Misc::absolutize_url(trim($this->file->headers['content-location']), $this->file->url);
+		}
+		else
+		{
+			$this->http_base = $this->file->url;
+		}
+		$this->base = $this->http_base;
+		$elements = SimplePie_Misc::get_element('base', $this->file->body);
+		foreach ($elements as $element)
+		{
+			if ($element['attribs']['href']['data'] !== '')
+			{
+				$this->base = SimplePie_Misc::absolutize_url(trim($element['attribs']['href']['data']), $this->http_base);
+				$this->base_location = $element['offset'];
+				break;
+			}
+		}
+	}
+
+	function autodiscovery()
+	{
+		$links = array_merge(SimplePie_Misc::get_element('link', $this->file->body), SimplePie_Misc::get_element('a', $this->file->body), SimplePie_Misc::get_element('area', $this->file->body));
+		$done = array();
+		foreach ($links as $link)
+		{
+			if ($this->checked_feeds == $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (isset($link['attribs']['href']['data']) && isset($link['attribs']['rel']['data']))
+			{
+				$rel = array_unique(SimplePie_Misc::space_seperated_tokens(strtolower($link['attribs']['rel']['data'])));
+
+				if ($this->base_location < $link['offset'])
+				{
+					$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->base);
+				}
+				else
+				{
+					$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->http_base);
+				}
+
+				if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !empty($link['attribs']['type']['data']) && in_array(strtolower(SimplePie_Misc::parse_mime($link['attribs']['type']['data'])), array('application/rss+xml', 'application/atom+xml'))))
+				{
+					$this->checked_feeds++;
+					$feed =& new $this->file_class($href, $this->timeout, 5, null, $this->useragent);
+					if ($this->is_feed($feed))
+					{
+						return $feed;
+					}
+				}
+				$done[] = $href;
+			}
+		}
+		return null;
+	}
+
+	function get_links()
+	{
+		$links = SimplePie_Misc::get_element('a', $this->file->body);
+		foreach ($links as $link)
+		{
+			if (isset($link['attribs']['href']['data']))
+			{
+				$href = trim($link['attribs']['href']['data']);
+				$parsed = SimplePie_Misc::parse_url($href);
+				if ($parsed['scheme'] === '' || preg_match('/^(http(s)|feed)?$/i', $parsed['scheme']))
+				{
+					if ($this->base_location < $link['offset'])
+					{
+						$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->base);
+					}
+					else
+					{
+						$href = SimplePie_Misc::absolutize_url(trim($link['attribs']['href']['data']), $this->http_base);
+					}
+
+					$current = SimplePie_Misc::parse_url($this->file->url);
+
+					if ($parsed['authority'] === '' || $parsed['authority'] == $current['authority'])
+					{
+						$this->local[] = $href;
+					}
+					else
+					{
+						$this->elsewhere[] = $href;
+					}
+				}
+			}
+		}
+		$this->local = array_unique($this->local);
+		$this->elsewhere = array_unique($this->elsewhere);
+		if (!empty($this->local) || !empty($this->elsewhere))
+		{
+			return true;
+		}
+		return null;
+	}
+
+	function extension(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds == $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml')))
+			{
+				$this->checked_feeds++;
+				$feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+				if ($this->is_feed($feed))
+				{
+					return $feed;
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+
+	function body(&$array)
+	{
+		foreach ($array as $key => $value)
+		{
+			if ($this->checked_feeds == $this->max_checked_feeds)
+			{
+				break;
+			}
+			if (preg_match('/(rss|rdf|atom|xml)/i', $value))
+			{
+				$this->checked_feeds++;
+				$feed =& new $this->file_class($value, $this->timeout, 5, null, $this->useragent);
+				if ($this->is_feed($feed))
+				{
+					return $feed;
+				}
+				else
+				{
+					unset($array[$key]);
+				}
+			}
+		}
+		return null;
+	}
+}
+
+class SimplePie_Parser
+{
+	var $xml;
+	var $error_code;
+	var $error_string;
+	var $current_line;
+	var $current_column;
+	var $current_byte;
+	var $separator = ' ';
+	var $feed = false;
+	var $namespace = array('');
+	var $element = array('');
+	var $xml_base = array('');
+	var $xml_base_explicit = array(false);
+	var $xml_lang = array('');
+	var $data = array();
+	var $datas = array(array());
+	var $current_xhtml_construct = -1;
+	var $encoding;
+
+	function pre_process(&$data, $encoding)
+	{
+		// Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character
+		if (strtoupper($encoding) == 'US-ASCII')
+		{
+			$this->encoding = 'UTF-8';
+		}
+		else
+		{
+			$this->encoding = $encoding;
+		}
+
+		// Strip BOM:
+		// UTF-32 Big Endian BOM
+		if (strpos($data, "\x0\x0\xFE\xFF") === 0)
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-32 Little Endian BOM
+		elseif (strpos($data, "\xFF\xFE\x0\x0") === 0)
+		{
+			$data = substr($data, 4);
+		}
+		// UTF-16 Big Endian BOM
+		elseif (strpos($data, "\xFE\xFF") === 0)
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-16 Little Endian BOM
+		elseif (strpos($data, "\xFF\xFE") === 0)
+		{
+			$data = substr($data, 2);
+		}
+		// UTF-8 BOM
+		elseif (strpos($data, "\xEF\xBB\xBF") === 0)
+		{
+			$data = substr($data, 3);
+		}
+
+		// Make sure the XML prolog is sane and has the correct encoding
+		$data = preg_replace("/^<\?xml[\x20\x9\xD\xA]+version([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"1.0\"|'1.0'|\"1.1\"|'1.1')([\x20\x9\xD\xA]+encoding([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"[A-Za-z][A-Za-z0-9._\-]*\"|'[A-Za-z][A-Za-z0-9._\-]*'))?([\x20\x9\xD\xA]+standalone([\x20\x9\xD\xA]+)?=([\x20\x9\xD\xA]+)?(\"(yes|no)\"|'(yes|no)'))?([\x20\x9\xD\xA]+)?\?>/", '', $data);
+		$data = "<?xml version='1.0' encoding='$encoding'?>\n" . $data;
+	}
+
+	function parse(&$data)
+	{
+		$return = true;
+
+		// Create the parser
+		$this->xml = xml_parser_create_ns($this->encoding, $this->separator);
+		xml_parser_set_option($this->xml, XML_OPTION_SKIP_WHITE, 1);
+		xml_parser_set_option($this->xml, XML_OPTION_CASE_FOLDING, 0);
+		xml_set_object($this->xml, $this);
+		xml_set_character_data_handler($this->xml, 'cdata');
+		xml_set_element_handler($this->xml, 'tag_open', 'tag_close');
+
+    // workound for a bug in PHP/libxml2 as described on http://bugs.simplepie.org/issues/show/101
+    $data = str_replace('&lt;', '&#60;', $data);
+    $data = str_replace('&gt;', '&#62;', $data);
+    $data = str_replace('&amp;', '&#38;', $data);
+    $data = str_replace('&apos;', '&#39;', $data);
+    $data = str_replace('&quot;', '&#34;', $data);
+
+		// Parse!
+		if (!xml_parse($this->xml, $data, true))
+		{
+			$this->data = null;
+			$this->error_code = xml_get_error_code($this->xml);
+			$this->error_string = xml_error_string($this->error_code);
+			$return = false;
+		}
+		$this->current_line = xml_get_current_line_number($this->xml);
+		$this->current_column = xml_get_current_column_number($this->xml);
+		$this->current_byte = xml_get_current_byte_index($this->xml);
+		xml_parser_free($this->xml);
+		return $return;
+	}
+
+	function get_error_code()
+	{
+		return $this->error_code;
+	}
+
+	function get_error_string()
+	{
+		return $this->error_string;
+	}
+
+	function get_current_line()
+	{
+		return $this->current_line;
+	}
+
+	function get_current_column()
+	{
+		return $this->current_column;
+	}
+
+	function get_current_byte()
+	{
+		return $this->current_byte;
+	}
+
+	function get_data()
+	{
+		return $this->data;
+	}
+
+	function tag_open($parser, $tag, $attributes)
+	{
+		if ($this->feed === 0)
+		{
+			return;
+		}
+		elseif ($this->feed == false)
+		{
+			if (in_array($tag, array(
+				SIMPLEPIE_NAMESPACE_ATOM_10 . $this->separator . 'feed',
+				SIMPLEPIE_NAMESPACE_ATOM_03 . $this->separator . 'feed',
+				'rss',
+				SIMPLEPIE_NAMESPACE_RDF . $this->separator . 'RDF'
+			)))
+			{
+					$this->feed = 1;
+			}
+		}
+		else
+		{
+			$this->feed++;
+		}
+
+		list($this->namespace[], $this->element[]) = $this->split_ns($tag);
+
+		$attribs = array();
+		foreach ($attributes as $name => $value)
+		{
+			list($attrib_namespace, $attribute) = $this->split_ns($name);
+			$attribs[$attrib_namespace][$attribute] = $value;
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base']))
+		{
+			$this->xml_base[] = SimplePie_Misc::absolutize_url($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base));
+			$this->xml_base_explicit[] = true;
+		}
+		else
+		{
+			$this->xml_base[] = end($this->xml_base);
+			$this->xml_base_explicit[] = end($this->xml_base_explicit);
+		}
+
+		if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang']))
+		{
+			$this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang'];
+		}
+		else
+		{
+			$this->xml_lang[] = end($this->xml_lang);
+		}
+
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct++;
+			if (end($this->namespace) == SIMPLEPIE_NAMESPACE_XHTML)
+			{
+				$this->data['data'] .= '<' . end($this->element);
+				if (isset($attribs['']))
+				{
+					foreach ($attribs[''] as $name => $value)
+					{
+						$this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"';
+					}
+				}
+				$this->data['data'] .= '>';
+			}
+		}
+		else
+		{
+			$this->datas[] =& $this->data;
+			$this->data =& $this->data['child'][end($this->namespace)][end($this->element)][];
+			$this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang));
+			if ((end($this->namespace) == SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] == 'xml')
+			|| (end($this->namespace) == SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] == 'xhtml'))
+			{
+				$this->current_xhtml_construct = 0;
+			}
+		}
+	}
+
+	function cdata($parser, $cdata)
+	{
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding);
+		}
+		elseif ($this->feed > 1)
+		{
+			$this->data['data'] .= $cdata;
+		}
+	}
+
+	function tag_close($parser, $tag)
+	{
+		if (!$this->feed)
+		{
+			return;
+		}
+
+		if ($this->current_xhtml_construct >= 0)
+		{
+			$this->current_xhtml_construct--;
+			if (end($this->namespace) == SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param')))
+			{
+				$this->data['data'] .= '</' . end($this->element) . '>';
+			}
+		}
+		if ($this->current_xhtml_construct == -1)
+		{
+			$this->data =& $this->datas[$this->feed];
+			array_pop($this->datas);
+		}
+
+		array_pop($this->element);
+		array_pop($this->namespace);
+		array_pop($this->xml_base);
+		array_pop($this->xml_base_explicit);
+		array_pop($this->xml_lang);
+		$this->feed--;
+	}
+
+	function split_ns($string)
+	{
+		static $cache = array();
+		if (!isset($cache[$string]))
+		{
+			if ($pos = strpos($string, $this->separator))
+			{
+				static $separator_length;
+				if (!$separator_length)
+				{
+					$separator_length = strlen($this->separator);
+				}
+				$cache[$string] = array(substr($string, 0, $pos), substr($string, $pos + $separator_length));
+			}
+			else
+			{
+				$cache[$string] = array('', $string);
+			}
+		}
+		return $cache[$string];
+	}
+}
+
+/**
+ * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shortern a string while preserving HTML tags
+ */
+class SimplePie_Sanitize
+{
+	// Private vars
+	var $base;
+
+	// Options
+	var $remove_div = true;
+	var $image_handler = '';
+	var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style');
+	var $encode_instead_of_strip = false;
+	var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc');
+	var $strip_comments = false;
+	var $output_encoding = 'UTF-8';
+	var $enable_cache = true;
+	var $cache_location = './cache';
+	var $cache_name_function = 'md5';
+	var $cache_class = 'SimplePie_Cache';
+	var $file_class = 'SimplePie_File';
+	var $timeout = 10;
+	var $useragent = '';
+	var $force_fsockopen = false;
+
+	var $replace_url_attributes = array(
+		'a' => 'href',
+		'area' => 'href',
+		'blockquote' => 'cite',
+		'del' => 'cite',
+		'form' => 'action',
+		'img' => array('longdesc', 'src'),
+		'input' => 'src',
+		'ins' => 'cite',
+		'q' => 'cite'
+	);
+
+	function remove_div($enable = true)
+	{
+		$this->remove_div = (bool) $enable;
+	}
+
+	function set_image_handler($page = false)
+	{
+		if ($page)
+		{
+			$this->image_handler = (string) $page;
+		}
+		else
+		{
+			$this->image_handler = false;
+		}
+	}
+
+	function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache')
+	{
+		if (isset($enable_cache))
+		{
+			$this->enable_cache = (bool) $enable_cache;
+		}
+
+		if ($cache_location)
+		{
+			$this->cache_location = (string) $cache_location;
+		}
+
+		if ($cache_name_function)
+		{
+			$this->cache_name_function = (string) $cache_name_function;
+		}
+
+		if ($cache_class)
+		{
+			$this->cache_class = (string) $cache_class;
+		}
+	}
+
+	function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false)
+	{
+		if ($file_class)
+		{
+			$this->file_class = (string) $file_class;
+		}
+
+		if ($timeout)
+		{
+			$this->timeout = (string) $timeout;
+		}
+
+		if ($useragent)
+		{
+			$this->useragent = (string) $useragent;
+		}
+
+		if ($force_fsockopen)
+		{
+			$this->force_fsockopen = (string) $force_fsockopen;
+		}
+	}
+
+	function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'))
+	{
+		if ($tags)
+		{
+			if (is_array($tags))
+			{
+				$this->strip_htmltags = $tags;
+			}
+			else
+			{
+				$this->strip_htmltags = explode(',', $tags);
+			}
+		}
+		else
+		{
+			$this->strip_htmltags = false;
+		}
+	}
+
+	function encode_instead_of_strip($encode = false)
+	{
+		$this->encode_instead_of_strip = (bool) $encode;
+	}
+
+	function strip_attributes($attribs = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'))
+	{
+		if ($attribs)
+		{
+			if (is_array($attribs))
+			{
+				$this->strip_attributes = $attribs;
+			}
+			else
+			{
+				$this->strip_attributes = explode(',', $attribs);
+			}
+		}
+		else
+		{
+			$this->strip_attributes = false;
+		}
+	}
+
+	function strip_comments($strip = false)
+	{
+		$this->strip_comments = (bool) $strip;
+	}
+
+	function set_output_encoding($encoding = 'UTF-8')
+	{
+		$this->output_encoding = (string) $encoding;
+	}
+
+	/**
+	 * Set element/attribute key/value pairs of HTML attributes
+	 * containing URLs that need to be resolved relative to the feed
+	 *
+	 * @access public
+	 * @since 1.0
+	 * @param array $element_attribute Element/attribute key/value pairs
+	 */
+	function set_url_replacements($element_attribute = array('a' => 'href', 'area' => 'href', 'blockquote' => 'cite', 'del' => 'cite', 'form' => 'action', 'img' => array('longdesc', 'src'), 'input' => 'src', 'ins' => 'cite', 'q' => 'cite'))
+	{
+		$this->replace_url_attributes = (array) $element_attribute;
+	}
+
+	function sanitize($data, $type, $base = '')
+	{
+		$data = trim($data);
+		if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI)
+		{
+			if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML)
+			{
+				if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/(\w+)' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data))
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_HTML;
+				}
+				else
+				{
+					$type |= SIMPLEPIE_CONSTRUCT_TEXT;
+				}
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_BASE64)
+			{
+				$data = base64_decode($data);
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_XHTML)
+			{
+				if ($this->remove_div)
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data);
+					$data = preg_replace('/<\/div>$/', '', $data);
+				}
+				else
+				{
+					$data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data);
+				}
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML))
+			{
+				// Strip comments
+				if ($this->strip_comments)
+				{
+					$data = SimplePie_Misc::strip_comments($data);
+				}
+
+				// Strip out HTML tags and attributes that might cause various security problems.
+				// Based on recommendations by Mark Pilgrim at:
+				// http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely
+				if ($this->strip_htmltags)
+				{
+					foreach ($this->strip_htmltags as $tag)
+					{
+						$pcre = "/<($tag)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$tag" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>|(\/)?>)/siU';
+						while (preg_match($pcre, $data))
+						{
+							$data = preg_replace_callback($pcre, array(&$this, 'do_strip_htmltags'), $data);
+						}
+					}
+				}
+
+				if ($this->strip_attributes)
+				{
+					foreach ($this->strip_attributes as $attrib)
+					{
+						$data = preg_replace('/ '. trim($attrib) .'=("|&quot;)(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\'|&apos;|<|>|\+|{|})*("|&quot;)/i', '', $data);
+						$data = preg_replace('/ '. trim($attrib) .'=(\'|&apos;)(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|"|&quot;|<|>|\+|{|})*(\'|&apos;)/i', '', $data);
+						$data = preg_replace('/ '. trim($attrib) .'=(\w|\s|=|-|:|;|\/|\.|\?|&|,|#|!|\(|\)|\+|{|})*/i', '', $data);
+					}
+				}
+
+				// Replace relative URLs
+				$this->base = $base;
+				foreach ($this->replace_url_attributes as $element => $attributes)
+				{
+					$data = $this->replace_urls($data, $element, $attributes);
+				}
+
+				// If image handling (caching, etc.) is enabled, cache and rewrite all the image tags.
+				if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache)
+				{
+					$images = SimplePie_Misc::get_element('img', $data);
+					foreach ($images as $img)
+					{
+						if (isset($img['attribs']['src']['data']))
+						{
+							$image_url = $img['attribs']['src']['data'];
+							$cache =& new $this->cache_class($this->cache_location, call_user_func($this->cache_name_function, $image_url), 'spi');
+
+							if ($cache->load())
+							{
+								$img['attribs']['src']['data'] = $this->image_handler . rawurlencode($img['attribs']['src']['data']);
+								$data = str_replace($img['full'], SimplePie_Misc::element_implode($img), $data);
+							}
+							else
+							{
+								$file =& new $this->file_class($image_url, $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen);
+								$headers = $file->headers;
+
+								if ($file->success && ($file->status_code == 200 || ($file->status_code > 206 && $file->status_code < 300)))
+								{
+									if (!$cache->save(array('headers' => $file->headers, 'body' => $file->body)))
+									{
+										trigger_error("$cache->name is not writeable", E_USER_WARNING);
+									}
+									$img['attribs']['src']['data'] = $this->image_handler . rawurlencode($img['attribs']['src']['data']);
+									$data = str_replace($img['full'], SimplePie_Misc::element_implode($img), $data);
+								}
+							}
+						}
+					}
+				}
+
+				// Having (possibly) taken stuff out, there may now be whitespace at the beginning/end of the data
+				$data = trim($data);
+			}
+
+			if ($type & SIMPLEPIE_CONSTRUCT_IRI)
+			{
+				$data = SimplePie_Misc::absolutize_url($data, $base);
+			}
+
+			if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI))
+			{
+				$data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8');
+			}
+
+			if ($this->output_encoding != 'UTF-8')
+			{
+				$data = SimplePie_Misc::change_encoding($data, 'UTF-8', $this->output_encoding);
+			}
+		}
+		return $data;
+	}
+
+	function replace_urls($data, $tag, $attributes)
+	{
+		if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags))
+		{
+			$elements = SimplePie_Misc::get_element($tag, $data);
+			foreach ($elements as $element)
+			{
+				if (is_array($attributes))
+				{
+					foreach ($attributes as $attribute)
+					{
+						if (isset($element['attribs'][$attribute]['data']))
+						{
+							$element['attribs'][$attribute]['data'] = SimplePie_Misc::absolutize_url($element['attribs'][$attribute]['data'], $this->base);
+							$data = str_replace($element['full'], SimplePie_Misc::element_implode($element), $data);
+						}
+					}
+				}
+				elseif (isset($element['attribs'][$attributes]['data']))
+				{
+					$element['attribs'][$attributes]['data'] = SimplePie_Misc::absolutize_url($element['attribs'][$attributes]['data'], $this->base);
+					$data = str_replace($element['full'], SimplePie_Misc::element_implode($element), $data);
+				}
+			}
+		}
+		return $data;
+	}
+
+	function do_strip_htmltags($match)
+	{
+		if ($this->encode_instead_of_strip)
+		{
+			if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+			{
+				$match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8');
+				$match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8');
+				return "&lt;$match[1]$match[2]&gt;$match[3]&lt;/$match[1]&gt;";
+			}
+			else
+			{
+				return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8');
+			}
+		}
+		elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style')))
+		{
+			return $match[4];
+		}
+		else
+		{
+			return '';
+		}
+	}
+}
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/TarLib.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/TarLib.class.php
new file mode 100644
index 000000000..ab802163b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/TarLib.class.php
@@ -0,0 +1,918 @@
+<?php
+/**
+ * TAR format class - Creates TAR archives
+ *
+ * This class is part or the MaxgComp suite and originally named
+ * MaxgTar class.
+ *
+ * Modified for Dokuwiki
+ *
+ * @license GPL
+ * @link    http://docs.maxg.info
+ * @author  Bouchon <tarlib@bouchon.org> (Maxg)
+ * @author  Christopher Smith <chris@jalakai.co.uk>
+ */
+
+
+/**
+ * Those constants represent the compression method to use.
+ * COMPRESS_GZIP is used for the GZIP compression; COMPRESS_BZIP for
+ * BZIP2 and COMPRESS_NONE for no compression.
+ *
+ * On the other hand, COMPRESS_AUTO is a bit harder. It will first check
+ * if the zlib extensions are loaded.
+ * If it is, GZIP will be used. Else it will check if the bz2 extensions
+ * are loaded. If it is, BZIP2 will be used. Else no compression will be
+ * performed.
+ *
+ * You can then use getCompression() to know the compression chosen.
+ *
+ * If you selected a compression which can't be used (i.e extension not
+ * present), it will be just disabled, and won't produce any error !
+ * As a consequence, getCompression() will return COMPRESS_NONE
+ *
+ * ARCHIVE_DYNAMIC can be passed as the first argument of the constructor, to
+ * create an archive in memory instead of a file. See also: MaxgTar(),
+ * getDynamicArchive() and writeArchive()
+ *
+ * ARCHIVE_RENAMECOMP is a flag that can be multiplied by the compression method
+ * (i.e COMPRESS_AUTO * ARCHIVE_RENAMECOMP). This will add the correct extension
+ * to the archive name, which is useful with COMPRESS_AUTO, ie .bz2 if you gave
+ * COMPRESS_BZIP. See also getCompression(TRUE) which does exactly the
+ * same
+ *
+ * COMPRESS_DETECT does exactly the opposite and try to detect the
+ * compression to use to read the archive depending on its extension. (i.e if
+ * the archive ends with .tar.gz TarLib will try to decompress it with
+ * GZIP). See also setCompression()
+ *
+ * FULL_ARCHIVE is a -1 constant that means "the complete archive" when
+ * extracting. This is explained in Extract()
+ */
+define('COMPRESS_GZIP',1);
+define('COMPRESS_BZIP',2);
+define('COMPRESS_AUTO',3);
+define('COMPRESS_NONE',0);
+define('TARLIB_VERSION','1.2');
+define('FULL_ARCHIVE',-1);
+define('ARCHIVE_DYNAMIC',0);
+define('ARCHIVE_RENAMECOMP',5);
+define('COMPRESS_DETECT',-1);
+
+class TarLib
+{
+  var $_comptype;
+  var $_compzlevel;
+  var $_fp;
+  var $_memdat;
+  var $_nomf;
+  var $_result;
+  var $_initerror;
+
+  /**
+   * constructor, initialize the class
+   *
+   * The constructor initialize the variables and prepare the class for the
+   * archive, and return the object created. Note that you can use multiple
+   * instances of the MaxgTar class, if you call this function another time and
+   * store the object in an other variable.
+   *
+   * In fact, MaxgTar accepts the following arguments (all are optional) :
+   *
+   * filename can be either a file name (absolute or relative). In this
+   * case, it can be used both for reading and writing. You can also open
+   * remote archive if you add a protocole name at the beginning of the file
+   * (ie https://host.dom/archive.tar.gz), but for reading only and if the
+   * directive allow_url_fopen is enabled in PHP.INI (this can be checked with
+   * TarInfo()). If you pass a file that doesn't exist, the script
+   * will try to create it. If the archive already exists and contains files,
+   * you can use Add() to append files.But by default this parameter
+   * is ARCHIVE_DYNAMIC (write only) so the archive is created in memory and
+   * can be sent to a file [writeArchive()] or to the client
+   * [sendClient()]
+   *
+   * compression_type should be a constant that represents a type of
+   * compression, or its integer value. The different values are described in
+   * the constants.
+   *
+   * compression_level is an integer between 1 and 9 (by default) an
+   * represent the GZIP or BZIP compression level.  1 produce fast compression,
+   * and 9 produce smaller files. See the RFC 1952 for more infos.
+   */
+  function tarlib($p_filen = ARCHIVE_DYNAMIC , $p_comptype = COMPRESS_AUTO, $p_complevel = 9)
+  {
+    $this->_initerror = 0;
+    $this->_nomf = $p_filen; $flag=0;
+    if($p_comptype && $p_comptype % 5 == 0){$p_comptype /= ARCHIVE_RENAMECOMP; $flag=1;}
+
+    if($p_complevel > 0 && $p_complevel <= 9) $this->_compzlevel = $p_complevel;
+    else $p_complevel = 9;
+
+    if($p_comptype == COMPRESS_DETECT)
+    {
+      if(strtolower(substr($p_filen,-3)) == '.gz') $p_comptype = COMPRESS_GZIP;
+      elseif(strtolower(substr($p_filen,-4)) == '.bz2') $p_comptype = COMPRESS_BZIP;
+      else $p_comptype = COMPRESS_NONE;
+    }
+
+    switch($p_comptype)
+    {
+      case COMPRESS_GZIP:
+        if(!extension_loaded('zlib')) $this->_initerror = -1;
+        $this->_comptype = COMPRESS_GZIP;
+      break;
+
+      case COMPRESS_BZIP:
+        if(!extension_loaded('bz2')) $this->_inierror = -2;
+        $this->_comptype = COMPRESS_BZIP;
+      break;
+
+      case COMPRESS_AUTO:
+        if(extension_loaded('zlib'))
+          $this->_comptype = COMPRESS_GZIP;
+        elseif(extension_loaded('bz2'))
+          $this->_comptype = COMPRESS_BZIP;
+        else
+          $this->_comptype = COMPRESS_NONE;
+      break;
+
+      default:
+        $this->_comptype = COMPRESS_NONE;
+    }
+
+    if($this->_init_error < 0) $this->_comptype = COMPRESS_NONE;
+
+    if($flag) $this->_nomf.= '.'.$this->getCompression(1);
+    $this->_result = true;
+  }
+
+  /**
+   * Recycle a TAR object.
+   *
+   * This function does exactly the same as TarLib (constructor), except it
+   * returns a status code.
+   */
+  function setArchive($p_name='', $p_comp = COMPRESS_AUTO, $p_level=9)
+  {
+    $this->_CompTar();
+    $this->TarLib($p_name, $p_comp, $p_level);
+    return $this->_result;
+  }
+
+  /**
+   * Get the compression used to generate the archive
+   *
+   * This is a very useful function when you're using dynamical archives.
+   * Besides, if you let the script chose which compression to use, you'll have
+   * a problem when you'll want to send it to the client if you don't know
+   * which compression was used.
+   *
+   * There are two ways to call this function : if you call it without argument
+   * or with FALSE, it will return the compression constants, explained on the
+   * MaxgTar Constants.  If you call it with GetExtension on TRUE it will
+   * return the extension without starting dot (ie "tar" or "tar.bz2" or
+   * "tar.gz")
+   *
+   * NOTE: This can be done with the flag ARCHIVE_RENAMECOMP, see the
+   * MaxgTar Constants
+   */
+  function getCompression($ext = false)
+  {
+    $exts = Array('tar','tar.gz','tar.bz2');
+    if($ext) return $exts[$this->_comptype];
+    return $this->_comptype;
+  }
+
+  /**
+   * Change the compression mode.
+   *
+   * This function will change the compression methode to read or write
+   * the archive. See the MaxgTar Constants to see which constants you can use.
+   * It may look strange, but it returns the GZIP compression level.
+   */
+  function setCompression($p_comp = COMPRESS_AUTO)
+  {
+    $this->setArchive($this->_nomf, $p_comp, $this->_compzlevel);
+    return $this->_compzlevel;
+  }
+
+  /**
+   * Returns the compressed dynamic archive.
+   *
+   * When you're working with dynamic archives, use this function to grab
+   * the final compressed archive in a string ready to be put in a SQL table or
+   * in a file.
+   */
+  function getDynamicArchive()
+  {
+    return $this->_encode($this->_memdat);
+  }
+
+  /**
+   * Write a dynamical archive into a file
+   *
+   * This function attempts to write a dynamicaly-genrated archive into
+   * TargetFile on the webserver.  It returns a TarErrorStr() status
+   * code.
+   *
+   * To know the extension to add to the file if you're using AUTO_DETECT
+   * compression, you can use getCompression().
+   */
+  function writeArchive($p_archive) {
+    if(!$this->_memdat) return -7;
+    $fp = @fopen($p_archive, 'wb');
+    if(!$fp) return -6;
+
+    fwrite($fp, $this->_memdat);
+    fclose($fp);
+
+    return true;
+  }
+
+  /**
+   * Send a TAR archive to the client browser.
+   *
+   * This function will send an archive to the client, and return a status
+   * code, but can behave differently depending on the arguments you give. All
+   * arguments are optional.
+   *
+   * ClientName is used to specify the archive name to give to the browser. If
+   * you don't give one, it will send the constructor filename or return an
+   * error code in case of dynamical archive.
+   *
+   * FileName is optional and used to send a specific archive. Leave it blank
+   * to send dynamical archives or the current working archive.
+   *
+   * If SendHeaders is enabled (by default), the library will send the HTTP
+   * headers itself before it sends the contents. This headers are :
+   * Content-Type, Content-Disposition, Content-Length and Accept-Range.
+   *
+   * Please note that this function DOES NOT stops the script so don't forget
+   * to exit() to avoid your script sending other data and corrupt the archive.
+   * Another note : for AUTO_DETECT dynamical archives you can know the
+   * extension to add to the name with getCompression()
+   */
+  function sendClient($name = '', $archive = '', $headers = true)
+  {
+    if(!$name && !$this->_nomf) return -9;
+    if(!$archive && !$this->_memdat) return -10;
+    if(!$name) $name = basename($this->_nomf);
+
+    if($archive){ if(!file_exists($archive)) return -11; }
+    else $decoded = $this->getDynamicArchive();
+
+    if($headers)
+    {
+      header('Content-Type: application/x-gtar');
+      header('Content-Disposition: attachment; filename='.basename($name));
+      header('Accept-Ranges: bytes');
+      header('Content-Length: '.($archive ? filesize($archive) : strlen($decoded)));
+    }
+
+    if($archive)
+    {
+      $fp = @fopen($archive,'rb');
+      if(!$fp) return -4;
+
+      while(!feof($fp)) echo fread($fp,2048);
+    }
+    else
+    {
+      echo $decoded;
+    }
+
+    return true;
+  }
+
+  /**
+   * Extract part or totality of the archive.
+   *
+   * This function can extract files from an archive, and returns then a
+   * status codes that can be converted with TarErrorStr() into a
+   * human readable message.
+   *
+   * Only the first argument is required, What and it can be either the
+   * constant FULL_ARCHIVE or an indexed array containing each file you want to
+   * extract.
+   *
+   * To contains the target folder to extract the archive. It is optional and
+   * the default value is '.' which means the current folder. If the target
+   * folder doesn't exist, the script attempts to create it and give it
+   * permissions 0777 by default.
+   *
+   * RemovePath is very usefull when you want to extract files from a subfoler
+   * in the archive to a root folder. For instance, if you have a file in the
+   * archive called some/sub/folder/test.txt and you want to extract it to the
+   * script folder, you can call Extract with To = '.' and RemovePath =
+   * 'some/sub/folder/'
+   *
+   * FileMode is optional and its default value is 0755. It is in fact the UNIX
+   * permission in octal mode (prefixed with a 0) that will be given on each
+   * extracted file.
+   */
+  function Extract($p_what = FULL_ARCHIVE, $p_to = '.', $p_remdir='', $p_mode = 0755)
+  {
+    if(!$this->_OpenRead()) return -4;
+//  if(!@is_dir($p_to)) if(!@mkdir($p_to, 0777)) return -8;   --CS
+    if(!@is_dir($p_to)) if(!$this->_dirApp($p_to)) return -8;   //--CS (route through correct dir fn)
+
+    $ok = $this->_extractList($p_to, $p_what, $p_remdir, $p_mode);
+    $this->_CompTar();
+
+    return $ok;
+  }
+
+  /**
+   * Create a new package with the given files
+   *
+   * This function will attempt to create a new archive with global headers
+   * then add the given files into.  If the archive is a real file, the
+   * contents are written directly into the file, if it is a dynamic archive
+   * contents are only stored in memory. This function should not be used to
+   * add files to an existing archive, you should use Add() instead.
+   *
+   * The FileList actually supports three different modes :
+   *
+   * - You can pass a string containing filenames separated by pipes '|'.
+   *   In this case the file are read from the webserver filesystem and the
+   *   root folder is the folder where the script using the MaxgTar is called.
+   *
+   * - You can also give a unidimensional indexed array containing the
+   *   filenames. The behaviour for the content reading is the same that a
+   *   '|'ed string.
+   *
+   * - The more useful usage is to pass bidimensional arrays, where the
+   *   first element contains the filename and the second contains the file
+   *   contents. You can even add empty folders to the package if the filename
+   *   has a leading '/'. Once again, have a look at the exemples to understand
+   *   better.
+   *
+   * Note you can also give arrays with both dynamic contents and static files.
+   *
+   * The optional parameter RemovePath can be used to delete a part of the tree
+   * of the filename you're adding, for instance if you're adding in the root
+   * of a package a file that is stored somewhere in the server tree.
+   *
+   * On the contrary the parameter AddPath can be used to add a prefix folder
+   * to the file you store. Note also that the RemovePath is applied before the
+   * AddPath is added, so it HAS a sense to use both parameters together.
+   */
+  function Create($p_filelist,$p_add='',$p_rem='')
+  {
+    if(!$fl = $this->_fetchFilelist($p_filelist)) return -5;
+    if(!$this->_OpenWrite()) return -6;
+
+    $ok = $this->_addFileList($fl,$p_add,$p_rem);
+
+    if($ok) $this->_writeFooter();
+    else{ $this->_CompTar(); @unlink($this->_nomf); }
+
+    return $ok;
+  }
+
+  /**
+   * Add files to an existing package.
+   *
+   * This function does exactly the same than Create() exept it
+   * will append the given files at the end of the archive.  Please not the is
+   * safe to call Add() on a newly created archive whereas the
+   * contrary will fail !
+   *
+   * This function returns a status code, you can use TarErrorStr() on
+   * it to get the human-readable description of the error.
+   */
+  function Add($p_filelist, $p_add = '', $p_rem = '') { if (($this->_nomf
+!= ARCHIVE_DYNAMIC && @is_file($this->_nomf)) || ($this->_nomf ==
+ARCHIVE_DYNAMIC && !$this->_memdat)) return $this->Create($p_filelist,
+$p_add, $p_rem);
+
+    if(!$fl = $this->_fetchFilelist($p_filelist)) return -5;
+    return $this->_append($fl, $p_add, $p_rem);
+  }
+
+  /**
+   * Read the contents of a TAR archive
+   *
+   * This function attempts to get the list of the files stored in the
+   * archive, and return either an error code or an indexed array of
+   * associative array containing for each file the following informations :
+   *
+   * checksum    Tar Checksum of the file
+   * filename    The full name of the stored file (up to 100 c.)
+   * mode        UNIX permissions in DECIMAL, not octal
+   * uid         The Owner ID
+   * gid         The Group ID
+   * size        Uncompressed filesize
+   * mtime       Timestamp of last modification
+   * typeflag    Empty for files, set for folders
+   * link        For the links, did you guess it ?
+   * uname       Owner name
+   * gname       Group name
+   */
+  function ListContents()
+  {
+    if(!$this->_nomf) return -3;
+    if(!$this->_OpenRead()) return -4;
+
+    $result = Array();
+
+    while ($dat = $this->_read(512))
+    {
+      $dat = $this->_readHeader($dat);
+      if(!is_array($dat)) continue;
+
+      $this->_seek(ceil($dat['size']/512)*512,1);
+      $result[] = $dat;
+    }
+
+    return  $result;
+  }
+
+  /**
+   * Convert a status code into a human readable message
+   *
+   * Some MaxgTar functions like Create(), Add() ... return numerical
+   * status code.  You can pass them to this function to grab their english
+   * equivalent.
+   */
+  function TarErrorStr($i)
+  {
+    $ecodes = Array(
+         1 => true,
+         0 => "Undocumented error",
+        -1 => "Can't use COMPRESS_GZIP compression : ZLIB extensions are not loaded !",
+        -2 => "Can't use COMPRESS_BZIP compression : BZ2 extensions are not loaded !",
+        -3 => "You must set a archive file to read the contents !",
+        -4 => "Can't open the archive file for read !",
+        -5 => "Invalide file list !",
+        -6 => "Can't open the archive in write mode !",
+        -7 => "There is no ARCHIVE_DYNAMIC to write !",
+        -8 => "Can't create the directory to extract files !",
+        -9 => "Please pass a archive name to send if you made created an ARCHIVE_DYNAMIC !",
+       -10 => "You didn't pass an archive filename and there is no stored ARCHIVE_DYNAMIC !",
+       -11 => "Given archive doesn't exist !"
+    );
+
+    return isset($ecodes[$i]) ? $ecodes[$i] : $ecodes[0];
+  }
+
+  /**
+   * Display informations about the MaxgTar Class.
+   *
+   * This function will display vaious informations about the server
+   * MaxgTar is running on.
+   *
+   * The optional parameter DispHeaders is used to generate a full page with
+   * HTML headers (TRUE by default) or just the table with the informations
+   * (FALSE).  Note that the HTML page generated is verified compatible XHTML
+   * 1.0, but not HTML 4.0 compatible.
+   */
+  function TarInfo($headers = true)
+  {
+    if($headers)
+    {
+    ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+
+<head>
+  <title>MaxgComp TAR</title>
+  <style type="text/css">
+   body{margin: 20px;}
+   body,td{font-size:10pt;font-family: arial;}
+  </style>
+  <meta name="Author" content="The Maxg Network, http://maxg.info" />
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+</head>
+
+<body bgcolor="#EFEFEF">
+<?php
+    }
+?>
+<table border="0" align="center" width="500" cellspacing="4" cellpadding="5" style="border:1px dotted black;">
+<tr>
+  <td align="center" bgcolor="#DFDFEF" colspan="3" style="font-size:15pt;font-color:#330000;border:1px solid black;">MaxgComp TAR</td>
+</tr>
+<tr>
+  <td colspan="2" bgcolor="#EFEFFE" style="border:1px solid black;">This software was created by the Maxg Network, <a href="http://maxg.info" target="_blank" style="text-decoration:none;color:#333366;">http://maxg.info</a>
+   <br />It is distributed under the GNU <a href="http://www.gnu.org/copyleft/lesser.html" target="_blank" style="text-decoration:none;color:#333366;">Lesser General Public License</a>
+   <br />You can find the documentation of this class <a href="http://docs.maxg.info" target="_blank" style="text-decoration:none;color:#333366;">here</a></td>
+   <td width="60" bgcolor="#EFEFFE" style="border:1px solid black;" align="center"><img src="http://img.maxg.info/menu/tar.gif" border="0" alt="MaxgComp TAR" /></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">MaxgComp TAR version</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=TARLIB_VERSION?></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">ZLIB extensions</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=(extension_loaded('zlib') ? '<b>Yes</b>' : '<i>No</i>')?></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">BZ2 extensions</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=(extension_loaded('bz2') ? '<b>Yes</b>' : '<i>No</i>')?></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">Allow URL fopen</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=(ini_get('allow_url_fopen') ? '<b>Yes</b>' : '<i>No</i>')?></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">Time limit</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=ini_get('max_execution_time')?></td>
+</tr>
+<tr>
+  <td width="50%" align="center" style="border:1px solid black;" bgcolor="#DFDFEF">PHP Version</td>
+  <td colspan="2" align="center" bgcolor="#EFEFFE" style="border:1px solid black;"><?=phpversion()?></td>
+</tr>
+<tr>
+  <td colspan="3" align="center" bgcolor="#EFEFFE" style="border:1px solid black;">
+    <i>Special thanks to &laquo; Vincent Blavet &raquo; for his PEAR::Archive_Tar class</i>
+  </td>
+</tr>
+</table>
+<?php
+    if($headers) echo '</body></html>';
+  }
+
+  function _seek($p_flen, $tell=0)
+  {
+    if($this->_nomf === ARCHIVE_DYNAMIC)
+      $this->_memdat=substr($this->_memdat,0,($tell ? strlen($this->_memdat) : 0) + $p_flen);
+    elseif($this->_comptype == COMPRESS_GZIP)
+      @gzseek($this->_fp, ($tell ? @gztell($this->_fp) : 0)+$p_flen);
+    elseif($this->_comptype == COMPRESS_BZIP)
+      @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0)+$p_flen);
+    else
+      @fseek($this->_fp, ($tell ? @ftell($this->_fp) : 0)+$p_flen);
+  }
+
+  function _OpenRead()
+  {
+    if($this->_comptype == COMPRESS_GZIP)
+      $this->_fp = @gzopen($this->_nomf, 'rb');
+    elseif($this->_comptype == COMPRESS_BZIP)
+      $this->_fp = @bzopen($this->_nomf, 'rb');
+    else
+      $this->_fp = @fopen($this->_nomf, 'rb');
+
+    return ($this->_fp ? true : false);
+  }
+
+  function _OpenWrite($add = 'w')
+  {
+    if($this->_nomf === ARCHIVE_DYNAMIC) return true;
+
+    if($this->_comptype == COMPRESS_GZIP)
+      $this->_fp = @gzopen($this->_nomf, $add.'b'.$this->_compzlevel);
+    elseif($this->_comptype == COMPRESS_BZIP)
+      $this->_fp = @bzopen($this->_nomf, $add.'b');
+    else
+      $this->_fp = @fopen($this->_nomf, $add.'b');
+
+    return ($this->_fp ? true : false);
+  }
+
+  function _CompTar()
+  {
+    if($this->_nomf === ARCHIVE_DYNAMIC || !$this->_fp) return;
+
+    if($this->_comptype == COMPRESS_GZIP) @gzclose($this->_fp);
+    elseif($this->_comptype == COMPRESS_BZIP) @bzclose($this->_fp);
+    else @fclose($this->_fp);
+  }
+
+  function _read($p_len)
+  {
+    if($this->_comptype == COMPRESS_GZIP)
+      return @gzread($this->_fp,$p_len);
+    elseif($this->_comptype == COMPRESS_BZIP)
+      return @bzread($this->_fp,$p_len);
+    else
+      return @fread($this->_fp,$p_len);
+  }
+
+  function _write($p_data)
+  {
+    if($this->_nomf === ARCHIVE_DYNAMIC) $this->_memdat .= $p_data;
+    elseif($this->_comptype == COMPRESS_GZIP)
+      return @gzwrite($this->_fp,$p_data);
+
+    elseif($this->_comptype == COMPRESS_BZIP)
+      return @bzwrite($this->_fp,$p_data);
+
+    else
+      return @fwrite($this->_fp,$p_data);
+  }
+
+  function _encode($p_dat)
+  {
+    if($this->_comptype == COMPRESS_GZIP)
+      return gzencode($p_dat, $this->_compzlevel);
+    elseif($this->_comptype == COMPRESS_BZIP)
+      return bzcompress($p_dat, $this->_compzlevel);
+    else return $p_dat;
+  }
+
+  function _readHeader($p_dat)
+  {
+    if (!$p_dat || strlen($p_dat) != 512) return false;
+
+    for ($i=0, $chks=0; $i<148; $i++)
+      $chks += ord($p_dat[$i]);
+
+    for ($i=156,$chks+=256; $i<512; $i++)
+      $chks += ord($p_dat[$i]);
+
+    $headers = @unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor", $p_dat);
+    if(!$headers) return false;
+
+    $return['checksum'] = OctDec(trim($headers['checksum']));
+    if ($return['checksum'] != $chks) return false;
+
+    $return['filename'] = trim($headers['filename']);
+    $return['mode'] = OctDec(trim($headers['mode']));
+    $return['uid'] = OctDec(trim($headers['uid']));
+    $return['gid'] = OctDec(trim($headers['gid']));
+    $return['size'] = OctDec(trim($headers['size']));
+    $return['mtime'] = OctDec(trim($headers['mtime']));
+    $return['typeflag'] = $headers['typeflag'];
+    $return['link'] = trim($headers['link']);
+    $return['uname'] = trim($headers['uname']);
+    $return['gname'] = trim($headers['gname']);
+
+    return $return;
+  }
+
+  function _fetchFilelist($p_filelist)
+  {
+    if(!$p_filelist || (is_array($p_filelist) && !@count($p_filelist))) return false;
+
+    if(is_string($p_filelist))
+    {
+        $p_filelist = explode('|',$p_filelist);
+        if(!is_array($p_filelist)) $p_filelist = Array($p_filelist);
+    }
+
+    return $p_filelist;
+  }
+
+  function _addFileList($p_fl, $p_addir, $p_remdir)
+  {
+    foreach($p_fl as $file)
+    {
+      if(($file == $this->_nomf && $this->_nomf != ARCHIVE_DYNAMIC) || !$file || (!file_exists($file) && !is_array($file)))
+        continue;
+
+      if (!$this->_addFile($file, $p_addir, $p_remdir))
+        continue;
+
+      if (@is_dir($file))
+      {
+        $d = @opendir($file);
+
+        if(!$d) continue;
+        readdir($d); readdir($d);
+
+        while($f = readdir($d))
+        {
+          if($file != ".") $tmplist[0] = "$file/$f";
+          else $tmplist[0] = $d;
+
+          $this->_addFileList($tmplist, $p_addir, $p_remdir);
+        }
+
+        closedir($d); unset($tmplist,$f);
+      }
+    }
+    return true;
+  }
+
+  function _addFile($p_fn, $p_addir = '', $p_remdir = '')
+  {
+    if(is_array($p_fn)) list($p_fn, $data) = $p_fn;
+    $sname = $p_fn;
+
+    if($p_remdir)
+    {
+        if(substr($p_remdir,-1) != '/') $p_remdir .= "/";
+
+        if(substr($sname, 0, strlen($p_remdir)) == $p_remdir)
+          $sname = substr($sname, strlen($p_remdir));
+    }
+
+    if($p_addir) $sname = $p_addir.(substr($p_addir,-1) == '/' ? '' : "/").$sname;
+
+    if(strlen($sname) > 99) return;
+
+    if(@is_dir($p_fn))
+    {
+      if(!$this->_writeFileHeader($p_fn, $sname)) return false;
+    }
+    else
+    {
+     if(!$data)
+     {
+      $fp = fopen($p_fn, 'rb');
+      if(!$fp) return false;
+     }
+
+     if(!$this->_writeFileHeader($p_fn, $sname, ($data ? strlen($data) : false))) return false;
+
+     if(!$data)
+     {
+      while(!feof($fp))
+      {
+        $packed = pack("a512", fread($fp,512));
+        $this->_write($packed);
+      }
+      fclose($fp);
+     }
+     else
+     {
+      for($s = 0; $s < strlen($data); $s += 512)
+        $this->_write(pack("a512",substr($data,$s,512)));
+     }
+    }
+
+    return true;
+  }
+
+  function _writeFileHeader($p_file, $p_sname, $p_data=false)
+  {
+   if(!$p_data)
+   {
+    if (!$p_sname) $p_sname = $p_file;
+    $p_sname = $this->_pathTrans($p_sname);
+
+    $h_info = stat($p_file);
+    $h[0] = sprintf("%6s ", DecOct($h_info[4]));
+    $h[] = sprintf("%6s ", DecOct($h_info[5]));
+    $h[] = sprintf("%6s ", DecOct(fileperms($p_file)));
+    clearstatcache();
+    $h[] = sprintf("%11s ", DecOct(filesize($p_file)));
+    $h[] = sprintf("%11s", DecOct(filemtime($p_file)));
+
+    $dir = @is_dir($p_file) ? '5' : '';
+   }
+   else
+   {
+    $dir = '';
+    $p_data = sprintf("%11s ", DecOct($p_data));
+    $time = sprintf("%11s ", DecOct(time()));
+    $h = Array("     0 ","     0 "," 40777 ",$p_data,$time);
+   }
+
+    $data_first = pack("a100a8a8a8a12A12", $p_sname, $h[2], $h[0], $h[1], $h[3], $h[4]);
+    $data_last = pack("a1a100a6a2a32a32a8a8a155a12", $dir, '', '', '', '', '', '', '', '', "");
+
+     for ($i=0,$chks=0; $i<148; $i++)
+       $chks += ord($data_first[$i]);
+
+     for ($i=156, $chks+=256, $j=0; $i<512; $i++, $j++)
+       $chks += ord($data_last[$j]);
+
+     $this->_write($data_first);
+
+     $chks = pack("a8",sprintf("%6s ", DecOct($chks)));
+     $this->_write($chks.$data_last);
+
+     return true;
+  }
+
+  function _append($p_filelist, $p_addir="", $p_remdir="")
+  {
+    if(!$this->_fp) if(!$this->_OpenWrite('a')) return -6;
+
+    if($this->_nomf == ARCHIVE_DYNAMIC)
+    {
+      $s = strlen($this->_memdat);
+      $this->_memdat = substr($this->_memdat,0,-512);
+    }
+    else
+    {
+      $s = filesize($this->_nomf);
+      $this->_seek($s-512);
+    }
+
+    $ok = $this->_addFileList($p_filelist, $p_addir, $p_remdir);
+    $this->_writeFooter();
+
+    return $ok;
+  }
+
+  function _pathTrans($p_dir)
+  {
+    if ($p_dir)
+    {
+      $subf = explode("/", $p_dir); $r='';
+
+      for ($i=count($subf)-1; $i>=0; $i--)
+      {
+        if ($subf[$i] == ".") {}
+        else if ($subf[$i] == "..") $i--;
+        else if (!$subf[$i] && $i!=count($subf)-1 && $i) {}
+        else $r = $subf[$i].($i!=(count($subf)-1) ? "/".$r : "");
+      }
+    }
+    return $r;
+  }
+
+  function _writeFooter()
+  {
+    $this->_write(pack("a512", ""));
+  }
+
+  function _extractList($p_to, $p_files, $p_remdir, $p_mode = 0755)
+  {
+    if (!$p_to || ($p_to[0]!="/"&&substr($p_to,0,3)!="../"&&substr($p_to,1,3)!=":\\"&&substr($p_to,1,2)!=":/")) /*" // <- PHP Coder bug */
+      $p_to = "./$p_to";
+
+    if ($p_remdir && substr($p_remdir,-1)!='/') $p_remdir .= '/';
+    $p_remdirs = strlen($p_remdir);
+    while($dat = $this->_read(512))
+    {
+      $headers = $this->_readHeader($dat);
+      if(!$headers['filename']) continue;
+
+      if($p_files == -1 || $p_files[0] == -1) $extract = true;
+      else
+      {
+        $extract = false;
+
+        foreach($p_files as $f)
+        {
+          if(substr($f,-1) == "/") {
+            if((strlen($headers['filename']) > strlen($f)) && (substr($headers['filename'],0,strlen($f))==$f)) {
+              $extract = true; break;
+            }
+          }
+          elseif($f == $headers['filename']) {
+            $extract = true; break;
+          }
+        }
+      }
+
+      if ($extract)
+      {
+        $det[] = $headers;
+        if ($p_remdir && substr($headers['filename'],0,$p_remdirs)==$p_remdir)
+          $headers['filename'] = substr($headers['filename'],$p_remdirs);
+
+        if($headers['filename'].'/' == $p_remdir && $headers['typeflag']=='5') continue;
+
+        if ($p_to != "./" && $p_to != "/")
+        {
+          while($p_to{-1}=="/") $p_to = substr($p_to,0,-1);
+
+          if($headers['filename']{0} == "/")
+            $headers['filename'] = $p_to.$headers['filename'];
+          else
+            $headers['filename'] = $p_to."/".$headers['filename'];
+        }
+
+        $ok = $this->_dirApp($headers['typeflag']=="5" ? $headers['filename'] : dirname($headers['filename']));
+        if($ok < 0) return $ok;
+
+        if (!$headers['typeflag'])
+        {
+          if (!$fp = @fopen($headers['filename'], "wb")) return -6;
+          $n = floor($headers['size']/512);
+
+          for ($i=0; $i<$n; $i++) fwrite($fp, $this->_read(512),512);
+          if (($headers['size'] % 512) != 0) fwrite($fp, $this->_read(512), $headers['size'] % 512);
+
+          fclose($fp);
+          touch($headers['filename'], $headers['mtime']);
+          chmod($headers['filename'], $p_mode);
+        }
+       else
+       {
+         $this->_seek(ceil($headers['size']/512)*512,1);
+       }
+      }else $this->_seek(ceil($headers['size']/512)*512,1);
+    }
+    return $det;
+  }
+
+function _dirApp($d)
+  {
+//  map to dokuwiki function (its more robust)
+    return io_mkdir_p($d);
+/*
+    $d = explode('/', $d);
+    $base = '';
+
+    foreach($d as $f)
+    {
+      if(!is_dir($base.$f))
+      {
+        $ok = @mkdir($base.$f, 0777);
+        if(!$ok) return false;
+      }
+      $base .= "$f/";
+    }
+*/
+  }
+
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/ZipLib.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/ZipLib.class.php
new file mode 100644
index 000000000..836e9d9e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/ZipLib.class.php
@@ -0,0 +1,475 @@
+<?php
+
+/**
+ * @author     bouchon
+ * @link       http://dev.maxg.info
+ * @link       http://forum.maxg.info
+ *
+ *  Modified for Dokuwiki
+ *  @author    Christopher Smith <chris@jalakai.co.uk>
+ */
+class ZipLib
+{
+
+ var $datasec, $ctrl_dir = array();
+ var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00";
+ var $old_offset = 0; var $dirs = Array(".");
+
+ function get_List($zip_name)
+ {
+   $zip = @fopen($zip_name, 'rb');
+   if(!$zip) return(0);
+   $centd = $this->ReadCentralDir($zip,$zip_name);
+
+    @rewind($zip);
+    @fseek($zip, $centd['offset']);
+
+   for ($i=0; $i<$centd['entries']; $i++)
+   {
+    $header = $this->ReadCentralFileHeaders($zip);
+    $header['index'] = $i;$info['filename'] = $header['filename'];
+    $info['stored_filename'] = $header['stored_filename'];
+    $info['size'] = $header['size'];$info['compressed_size']=$header['compressed_size'];
+    $info['crc'] = strtoupper(dechex( $header['crc'] ));
+    $info['mtime'] = $header['mtime']; $info['comment'] = $header['comment'];
+    $info['folder'] = ($header['external']==0x41FF0010||$header['external']==16)?1:0;
+    $info['index'] = $header['index'];$info['status'] = $header['status'];
+    $ret[]=$info; unset($header);
+   }
+  return $ret;
+ }
+
+ function Add($files,$compact)
+ {
+  if(!is_array($files[0])) $files=Array($files);
+
+  for($i=0;$files[$i];$i++){
+    $fn = $files[$i];
+    if(!in_Array(dirname($fn[0]),$this->dirs))
+     $this->add_Dir(dirname($fn[0]));
+    if(basename($fn[0]))
+     $ret[basename($fn[0])]=$this->add_File($fn[1],$fn[0],$compact);
+  }
+  return $ret;
+ }
+
+ /**
+  * Zips recursively the $folder directory, from the $basedir directory
+  */
+ function Compress($folder, $basedir=null, $parent=null)
+ {
+  $full_path = $basedir."/".$parent.$folder;
+  $zip_path = $parent.$folder;
+  if ($zip_path) {
+   $zip_path .= "/";
+   $this->add_dir($zip_path);
+  }
+  $dir = new DirectoryIterator($full_path);
+  foreach($dir as $file) {
+   if(!$file->isDot()) {
+    $filename = $file->getFilename();
+    if($file->isDir()) {
+     $this->Compress($filename, $basedir, $zip_path);
+    } else {
+     $content = join('', file($full_path.'/'.$filename));
+     $this->add_File($content, $zip_path.$filename);
+    }
+   }
+  }
+ }
+
+ /**
+  * Returns the Zip file
+  */
+ function get_file()
+ {
+   $data = implode('', $this -> datasec);
+   $ctrldir = implode('', $this -> ctrl_dir);
+
+   return $data . $ctrldir . $this -> eof_ctrl_dir .
+    pack('v', sizeof($this -> ctrl_dir)).pack('v', sizeof($this -> ctrl_dir)).
+    pack('V', strlen($ctrldir)) . pack('V', strlen($data)) . "\x00\x00";
+ }
+
+ function add_dir($name)
+ {
+   $name = str_replace("\\", "/", $name);
+   $fr = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+
+   $fr .= pack("V",0).pack("V",0).pack("V",0).pack("v", strlen($name) );
+   $fr .= pack("v", 0 ).$name.pack("V", 0).pack("V", 0).pack("V", 0);
+   $this -> datasec[] = $fr;
+
+   $new_offset = strlen(implode("", $this->datasec));
+
+   $cdrec = "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00";
+   $cdrec .= pack("V",0).pack("V",0).pack("V",0).pack("v", strlen($name) );
+   $cdrec .= pack("v", 0 ).pack("v", 0 ).pack("v", 0 ).pack("v", 0 );
+   $ext = "\xff\xff\xff\xff";
+   $cdrec .= pack("V", 16 ).pack("V", $this -> old_offset ).$name;
+
+   $this -> ctrl_dir[] = $cdrec;
+   $this -> old_offset = $new_offset;
+   $this -> dirs[] = $name;
+ }
+
+ /**
+  * Add a file named $name from a string $data
+  */
+ function add_File($data, $name, $compact = 1)
+ {
+   $name     = str_replace('\\', '/', $name);
+   $dtime    = dechex($this->DosTime());
+
+   $hexdtime = '\x' . $dtime[6] . $dtime[7].'\x'.$dtime[4] . $dtime[5]
+     . '\x' . $dtime[2] . $dtime[3].'\x'.$dtime[0].$dtime[1];
+   eval('$hexdtime = "' . $hexdtime . '";');
+
+   if($compact)
+   $fr = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$hexdtime;
+   else $fr = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00".$hexdtime;
+   $unc_len = strlen($data); $crc = crc32($data);
+
+   if($compact){
+     $zdata = gzcompress($data); $c_len = strlen($zdata);
+     $zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2);
+   }else{
+     $zdata = $data;
+   }
+   $c_len=strlen($zdata);
+   $fr .= pack('V', $crc).pack('V', $c_len).pack('V', $unc_len);
+   $fr .= pack('v', strlen($name)).pack('v', 0).$name.$zdata;
+
+   $fr .= pack('V', $crc).pack('V', $c_len).pack('V', $unc_len);
+
+   $this -> datasec[] = $fr;
+   $new_offset        = strlen(implode('', $this->datasec));
+   if($compact)
+        $cdrec = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00";
+   else $cdrec = "\x50\x4b\x01\x02\x14\x00\x0a\x00\x00\x00\x00\x00";
+   $cdrec .= $hexdtime.pack('V', $crc).pack('V', $c_len).pack('V', $unc_len);
+   $cdrec .= pack('v', strlen($name) ).pack('v', 0 ).pack('v', 0 );
+   $cdrec .= pack('v', 0 ).pack('v', 0 ).pack('V', 32 );
+   $cdrec .= pack('V', $this -> old_offset );
+
+   $this -> old_offset = $new_offset;
+   $cdrec .= $name;
+   $this -> ctrl_dir[] = $cdrec;
+   return true;
+ }
+
+ function DosTime() {
+   $timearray = getdate();
+   if ($timearray['year'] < 1980) {
+     $timearray['year'] = 1980; $timearray['mon'] = 1;
+     $timearray['mday'] = 1; $timearray['hours'] = 0;
+     $timearray['minutes'] = 0; $timearray['seconds'] = 0;
+   }
+   return (($timearray['year'] - 1980) << 25) | ($timearray['mon'] << 21) |     ($timearray['mday'] << 16) | ($timearray['hours'] << 11) |
+    ($timearray['minutes'] << 5) | ($timearray['seconds'] >> 1);
+ }
+
+ /**
+  * Extract a zip file $zn to the $to directory
+  */
+ function Extract ( $zn, $to, $index = Array(-1) )
+ {
+   if(!@is_dir($to)) $this->_mkdir($to);
+   $ok = 0; $zip = @fopen($zn,'rb');
+   if(!$zip) return(-1);
+   $cdir = $this->ReadCentralDir($zip,$zn);
+   $pos_entry = $cdir['offset'];
+
+   if(!is_array($index)){ $index = array($index);  }
+   for($i=0; isset($index[$i]);$i++){
+     if(intval($index[$i])!=$index[$i]||$index[$i]>$cdir['entries'])
+      return(-1);
+   }
+
+   for ($i=0; $i<$cdir['entries']; $i++)
+   {
+     @fseek($zip, $pos_entry);
+     $header = $this->ReadCentralFileHeaders($zip);
+     $header['index'] = $i; $pos_entry = ftell($zip);
+     @rewind($zip); fseek($zip, $header['offset']);
+     if(in_array("-1",$index)||in_array($i,$index))
+      $stat[$header['filename']]=$this->ExtractFile($header, $to, $zip);
+
+   }
+   fclose($zip);
+   return $stat;
+ }
+
+  function ReadFileHeader($zip, $header)
+  {
+    $binary_data = fread($zip, 30);
+    $data = unpack('vchk/vid/vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $binary_data);
+
+    $header['filename'] = fread($zip, $data['filename_len']);
+    if ($data['extra_len'] != 0) {
+      $header['extra'] = fread($zip, $data['extra_len']);
+    } else { $header['extra'] = ''; }
+
+    $header['compression'] = $data['compression'];
+    foreach (array('size','compressed_size','crc') as $hd) { // On ODT files, these headers are 0. Keep the previous value.
+        if ($data[$hd] != 0) $header[$hd] = $data[$hd];
+    }
+    $header['flag'] = $data['flag'];
+    $header['mdate'] = $data['mdate'];$header['mtime'] = $data['mtime'];
+
+    if ($header['mdate'] && $header['mtime']){
+     $hour=($header['mtime']&0xF800)>>11;$minute=($header['mtime']&0x07E0)>>5;
+     $seconde=($header['mtime']&0x001F)*2;$year=(($header['mdate']&0xFE00)>>9)+1980;
+     $month=($header['mdate']&0x01E0)>>5;$day=$header['mdate']&0x001F;
+     $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
+    }else{$header['mtime'] = time();}
+
+    $header['stored_filename'] = $header['filename'];
+    $header['status'] = "ok";
+    return $header;
+  }
+
+ function ReadCentralFileHeaders($zip){
+    $binary_data = fread($zip, 46);
+    $header = unpack('vchkid/vid/vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $binary_data);
+
+    if ($header['filename_len'] != 0)
+      $header['filename'] = fread($zip,$header['filename_len']);
+    else $header['filename'] = '';
+
+    if ($header['extra_len'] != 0)
+      $header['extra'] = fread($zip, $header['extra_len']);
+    else $header['extra'] = '';
+
+    if ($header['comment_len'] != 0)
+      $header['comment'] = fread($zip, $header['comment_len']);
+    else $header['comment'] = '';
+
+    if ($header['mdate'] && $header['mtime'])
+    {
+      $hour = ($header['mtime'] & 0xF800) >> 11;
+      $minute = ($header['mtime'] & 0x07E0) >> 5;
+      $seconde = ($header['mtime'] & 0x001F)*2;
+      $year = (($header['mdate'] & 0xFE00) >> 9) + 1980;
+      $month = ($header['mdate'] & 0x01E0) >> 5;
+      $day = $header['mdate'] & 0x001F;
+      $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year);
+    } else {
+      $header['mtime'] = time();
+    }
+    $header['stored_filename'] = $header['filename'];
+    $header['status'] = 'ok';
+    if (substr($header['filename'], -1) == '/')
+      $header['external'] = 0x41FF0010;
+    return $header;
+ }
+
+ function ReadCentralDir($zip,$zip_name)
+ {
+  $size = filesize($zip_name);
+  if ($size < 277) $maximum_size = $size;
+  else $maximum_size=277;
+
+  @fseek($zip, $size-$maximum_size);
+  $pos = ftell($zip); $bytes = 0x00000000;
+
+  while ($pos < $size)
+  {
+    $byte = @fread($zip, 1);
+    $bytes=(($bytes << 8) & 0xFFFFFFFF) | Ord($byte);
+    if ($bytes == 0x504b0506){ $pos++; break; } $pos++;
+  }
+
+ $data=unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size',
+        fread($zip, 18));
+
+  if ($data['comment_size'] != 0)
+    $centd['comment'] = fread($zip, $data['comment_size']);
+    else $centd['comment'] = ''; $centd['entries'] = $data['entries'];
+  $centd['disk_entries'] = $data['disk_entries'];
+  $centd['offset'] = $data['offset'];$centd['disk_start'] = $data['disk_start'];
+  $centd['size'] = $data['size'];  $centd['disk'] = $data['disk'];
+  return $centd;
+ }
+
+ function ExtractFile($header,$to,$zip)
+ {
+   $header = $this->readfileheader($zip, $header);
+
+   if(substr($to,-1)!="/") $to.="/";
+   if(substr($header['filename'],-1)=="/")
+   {
+//    @mkdir($to.$header['filename']);   --CS
+    $this->_mkdir($to.$header['filename']);  //-- CS
+    return +2;
+   }
+
+//   $pth = explode("/",dirname($header['filename']));
+//   for($i=0,$tmp="";isset($pth[$i]);$i++){
+//     if(!$pth[$i]) continue;
+//     if(!is_dir($to.$tmp.$pth[$i])) @mkdir($to.$pth[$i],0777);
+//     $tmp.=$pth[$i]."/";
+//   }
+  if (!$this->_mkdir($to.dirname($header['filename']))) return (-1);   //--CS
+
+  if (!array_key_exists("external", $header) || (!($header['external']==0x41FF0010)&&!($header['external']==16)))
+  {
+   if ($header['compression']==0)
+   {
+    $fp = @fopen($to.$header['filename'], 'wb');
+    if(!$fp) return(-1);
+    $size = $header['compressed_size'];
+
+    while ($size != 0)
+    {
+      $read_size = ($size < 2048 ? $size : 2048);
+      $buffer = fread($zip, $read_size);
+      $binary_data = pack('a'.$read_size, $buffer);
+      @fwrite($fp, $binary_data, $read_size);
+      $size -= $read_size;
+    }
+    fclose($fp);
+    touch($to.$header['filename'], $header['mtime']);
+
+  }else{
+   if (!is_dir(dirname($to.$header['filename']))) $this->_mkdir(dirname($to.$header['filename']));  //-CS
+   $fp = fopen($to.$header['filename'].'.gz','wb');
+   if(!$fp) return(-1);
+   $binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($header['compression']),
+     Chr(0x00), time(), Chr(0x00), Chr(3));
+
+   fwrite($fp, $binary_data, 10);
+   $size = $header['compressed_size'];
+
+   while ($size != 0)
+   {
+     $read_size = ($size < 1024 ? $size : 1024);
+     $buffer = fread($zip, $read_size);
+     $binary_data = pack('a'.$read_size, $buffer);
+     @fwrite($fp, $binary_data, $read_size);
+     $size -= $read_size;
+   }
+
+   $binary_data = pack('VV', $header['crc'], $header['size']);
+   fwrite($fp, $binary_data,8); fclose($fp);
+
+   $gzp = @gzopen($to.$header['filename'].'.gz','rb');
+    if(!$gzp){
+       @gzclose($gzp); @unlink($to.$header['filename']);
+       die("Archive is compressed whereas ZLIB is not enabled.");
+    }
+   $fp = @fopen($to.$header['filename'],'wb');
+   if(!$fp) return(-1);
+   $size = $header['size'];
+
+   while ($size != 0)
+   {
+     $read_size = ($size < 2048 ? $size : 2048);
+     $buffer = gzread($gzp, $read_size);
+     $binary_data = pack('a'.$read_size, $buffer);
+     @fwrite($fp, $binary_data, $read_size);
+     $size -= $read_size;
+   }
+   fclose($fp); gzclose($gzp);
+
+   touch($to.$header['filename'], $header['mtime']);
+   @unlink($to.$header['filename'].'.gz');
+
+  }}
+  return true;
+ }
+
+ //--CS start
+ // centralize mkdir calls and use dokuwiki io functions
+ function _mkdir($d) {
+    return io_mkdir_p($d);
+ }
+ //--CS end
+
+
+ function ExtractStr($zn, $name) {
+   $ok = 0;
+   $zip = @fopen($zn,'rb');
+   if(!$zip) return(NULL);
+   $cdir = $this->ReadCentralDir($zip,$zn);
+   $pos_entry = $cdir['offset'];
+
+   for ($i=0; $i<$cdir['entries']; $i++)
+   {
+     @fseek($zip, $pos_entry);
+     $header = $this->ReadCentralFileHeaders($zip);
+     $header['index'] = $i;
+     $pos_entry = ftell($zip);
+     @rewind($zip);
+     fseek($zip, $header['offset']);
+     if ($name == $header['stored_filename'] || $name == $header['filename']) {
+       $str = $this->ExtractStrFile($header, $zip);
+       fclose($zip);
+       return $str;
+     }
+
+   }
+   fclose($zip);
+   return null;
+ }
+
+  function ExtractStrFile($header,$zip) {
+    $hdr = $this->readfileheader($zip);
+    $binary_data = '';
+    if (!($header['external']==0x41FF0010) && !($header['external']==16))
+      {
+	if ($header['compression']==0)
+	  {
+	    while ($size != 0)
+	      {
+		$read_size = ($size < 2048 ? $size : 2048);
+		$buffer = fread($zip, $read_size);
+		$binary_data .= pack('a'.$read_size, $buffer);
+		$size -= $read_size;
+	      }
+	    return $binary_data;
+	  } else {
+	    $size = $header['compressed_size'];
+	    if ($size == 0) {
+	      return '';
+	    }
+	    //Just in case
+	    if ($size > ($this->_ret_bytes(ini_get('memory_limit'))/2)) {
+	      die("Compressed file is to huge to be uncompress in memory.");
+	    }
+	    while ($size != 0)
+	      {
+		$read_size = ($size < 2048 ? $size : 2048);
+		$buffer = fread($zip, $read_size);
+		$binary_data .= pack('a'.$read_size, $buffer);
+		$size -= $read_size;
+	      }
+	    $str = gzinflate($binary_data, $header['size']);
+	    if ($header['crc'] == crc32($str)) {
+	      return $str;
+	    } else {
+	      die("Crc Error");
+	    }
+	  }
+      }
+    return NULL;
+  }
+
+ function _ret_bytes($val) {
+   $val = trim($val);
+   $last = $val{strlen($val)-1};
+   switch($last) {
+   case 'k':
+   case 'K':
+     return (int) $val * 1024;
+     break;
+   case 'm':
+   case 'M':
+     return (int) $val * 1048576;
+     break;
+   default:
+     return $val;
+   }
+ }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/actions.php b/mod/dokuwiki/vendors/dokuwiki/inc/actions.php
new file mode 100644
index 000000000..ed3c12666
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/actions.php
@@ -0,0 +1,639 @@
+<?php
+/**
+ * DokuWiki Actions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/template.php');
+
+
+/**
+ * Call the needed action handlers
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @triggers ACTION_ACT_PREPROCESS
+ * @triggers ACTION_HEADERS_SEND
+ */
+function act_dispatch(){
+  global $INFO;
+  global $ACT;
+  global $ID;
+  global $QUERY;
+  global $lang;
+  global $conf;
+  global $license;
+
+  $preact = $ACT;
+
+  //error_log("dokuact:".$ACT);
+  // give plugins an opportunity to process the action
+  $evt = new Doku_Event('ACTION_ACT_PREPROCESS',$ACT);
+  if ($evt->advise_before()) {
+
+    //sanitize $ACT
+    $ACT = act_clean($ACT);
+
+    //check if searchword was given - else just show
+    $s = cleanID($QUERY);
+    if($ACT == 'search' && empty($s)){
+      $ACT = 'show';
+    }
+
+    //login stuff
+    if(in_array($ACT,array('login','logout'))){
+        $ACT = act_auth($ACT);
+    }
+
+    //check if user is asking to (un)subscribe a page
+    if($ACT == 'subscribe' || $ACT == 'unsubscribe')
+      $ACT = act_subscription($ACT);
+
+    //check if user is asking to (un)subscribe a namespace
+    if($ACT == 'subscribens' || $ACT == 'unsubscribens')
+      $ACT = act_subscriptionns($ACT);
+
+    //check permissions
+    $ACT = act_permcheck($ACT);
+
+    //register
+    $nil = array();
+    if($ACT == 'register' && $_POST['save'] && register()){
+      $ACT = 'login';
+    }
+
+    if ($ACT == 'resendpwd' && act_resendpwd()) {
+      $ACT = 'login';
+    }
+
+    //update user profile
+    if ($ACT == 'profile') {
+      if(!$_SERVER['REMOTE_USER']) {
+        $ACT = 'login';
+      } else {
+        if(updateprofile()) {
+          msg($lang['profchanged'],1);
+          $ACT = 'show';
+        }
+      }
+    }
+
+    //revert
+    if($ACT == 'revert'){
+      if(checkSecurityToken()){
+        $ACT = act_revert($ACT);
+      }else{
+        $ACT = 'show';
+      }
+    }
+
+    //save
+    if($ACT == 'save'){
+      if(checkSecurityToken()){
+        $ACT = act_save($ACT);
+      }else{
+        $ACT = 'show';
+      }
+    }
+
+    //cancel conflicting edit
+    if($ACT == 'cancel')
+      $ACT = 'show';
+
+    //draft deletion
+    if($ACT == 'draftdel')
+      $ACT = act_draftdel($ACT);
+
+    //draft saving on preview
+    if($ACT == 'preview')
+      $ACT = act_draftsave($ACT);
+
+    //edit
+    if(($ACT == 'edit' || $ACT == 'preview') && $INFO['editable']){
+      $ACT = act_edit($ACT);
+    }else{
+      unlock($ID); //try to unlock
+    }
+
+    //handle export
+    if(substr($ACT,0,7) == 'export_')
+      $ACT = act_export($ACT);
+
+    //display some infos
+    if($ACT == 'check'){
+      check();
+      $ACT = 'show';
+    }
+
+    //handle admin tasks
+    if($ACT == 'admin'){
+      // retrieve admin plugin name from $_REQUEST['page']
+      $page = get_input('dokupage');
+      if (!empty($page)) {
+          $pluginlist = plugin_list('admin');
+          if (in_array($page, $pluginlist)) {
+            // attempt to load the plugin
+            if ($plugin =& plugin_load('admin',$page) !== NULL)
+                $plugin->handle();
+          }
+      }
+    }
+
+    // check permissions again - the action may have changed
+    $ACT = act_permcheck($ACT);
+  }  // end event ACTION_ACT_PREPROCESS default action
+  $evt->advise_after();
+  unset($evt);
+  if ($ACT == 'save') {
+    $user = elgg_get_logged_in_user_entity();
+    $doku = current_dokuwiki_entity();
+    $group = get_entity($doku->container_guid);
+    add_to_river('river/dokuwiki', 'wiki/'.$ACT.'/'.$QUERY, $user->getGUID(), $doku->getGUID(), $group->access_id);
+  }
+  // when action 'show', the intial not 'show' and POST, do a redirect
+  if($ACT == 'show' && $preact != 'show' && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){
+    act_redirect($ID,$preact);
+  }
+
+  //call template FIXME: all needed vars available?
+  $headers[] = 'Content-Type: text/html; charset=utf-8';
+  trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');
+
+  include(template('main.php'));
+  // output for the commands is now handled in inc/templates.php
+  // in function tpl_content()
+}
+
+function act_sendheaders($headers) {
+  foreach ($headers as $hdr) header($hdr);
+}
+
+/**
+ * Sanitize the action command
+ *
+ * Add all allowed commands here.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_clean($act){
+  global $lang;
+  global $conf;
+
+  // check if the action was given as array key
+  if(is_array($act)){
+    list($act) = array_keys($act);
+  }
+
+  //remove all bad chars
+  $act = strtolower($act);
+  $act = preg_replace('/[^1-9a-z_]+/','',$act);
+
+  if($act == 'export_html') $act = 'export_xhtml';
+  if($act == 'export_htmlbody') $act = 'export_xhtmlbody';
+
+  // check if action is disabled
+  if(!actionOK($act)){
+    msg('Command disabled: '.htmlspecialchars($act),-1);
+    return 'show';
+  }
+
+  //disable all acl related commands if ACL is disabled
+  if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin',
+                                             'subscribe','unsubscribe','profile','revert',
+                                             'resendpwd','subscribens','unsubscribens',))){
+    msg('Command unavailable: '.htmlspecialchars($act),-1);
+    return 'show';
+  }
+
+  if(!in_array($act,array('login','logout','register','save','cancel','edit','draft',
+                          'preview','search','show','check','index','revisions',
+                          'diff','recent','backlink','admin','subscribe','revert',
+                          'unsubscribe','profile','resendpwd','recover','wordblock',
+                          'draftdel','subscribens','unsubscribens',)) && substr($act,0,7) != 'export_' ) {
+    msg('Command unknown: '.htmlspecialchars($act),-1);
+    return 'show';
+  }
+  return $act;
+}
+
+/**
+ * Run permissionchecks
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_permcheck($act){
+  global $INFO;
+  global $conf;
+//error_log("dokuwiki act:".$act.$INFO['perm']);
+  if(in_array($act,array('save','preview','edit','recover'))){
+    if($INFO['exists']){
+      if($act == 'edit'){
+        //the edit function will check again and do a source show
+        //when no AUTH_EDIT available
+        $permneed = AUTH_READ;
+      }else{
+        $permneed = AUTH_EDIT;
+      }
+    }else{
+      $permneed = AUTH_CREATE;
+    }
+  }elseif(in_array($act,array('login','search','recent','profile'))){
+    $permneed = AUTH_NONE;
+  }elseif($act == 'revert'){
+    $permneed = AUTH_ADMIN;
+    if($INFO['ismanager']) $permneed = AUTH_EDIT;
+  }elseif($act == 'register'){
+    $permneed = AUTH_NONE;
+  }elseif($act == 'resendpwd'){
+    $permneed = AUTH_NONE;
+  }elseif($act == 'admin'){
+    if($INFO['ismanager']){
+	//error_log("is manager");
+      // if the manager has the needed permissions for a certain admin
+      // action is checked later
+      $permneed = AUTH_READ;
+    }else{
+	//error_log("is admin");
+      $permneed = AUTH_ADMIN;
+    }
+  }else{
+    $permneed = AUTH_READ;
+  }
+  if($INFO['perm'] >= $permneed) return $act;
+
+  return 'denied';
+}
+
+/**
+ * Handle 'draftdel'
+ *
+ * Deletes the draft for the current page and user
+ */
+function act_draftdel($act){
+  global $INFO;
+  @unlink($INFO['draft']);
+  $INFO['draft'] = null;
+  return 'show';
+}
+
+/**
+ * Saves a draft on preview
+ *
+ * @todo this currently duplicates code from ajax.php :-/
+ */
+function act_draftsave($act){
+  global $INFO;
+  global $ID;
+  global $conf;
+  if($conf['usedraft'] && $_POST['wikitext']){
+    $draft = array('id'     => $ID,
+                   'prefix' => $_POST['prefix'],
+                   'text'   => $_POST['wikitext'],
+                   'suffix' => $_POST['suffix'],
+                   'date'   => $_POST['date'],
+                   'client' => $INFO['client'],
+                  );
+    $cname = getCacheName($draft['client'].$ID,'.draft');
+    if(io_saveFile($cname,serialize($draft))){
+      $INFO['draft'] = $cname;
+    }
+  }
+  return $act;
+}
+
+/**
+ * Handle 'save'
+ *
+ * Checks for spam and conflicts and saves the page.
+ * Does a redirect to show the page afterwards or
+ * returns a new action.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_save($act){
+  global $ID;
+  global $DATE;
+  global $PRE;
+  global $TEXT;
+  global $SUF;
+  global $SUM;
+
+  //spam check
+  if(checkwordblock())
+    return 'wordblock';
+  //conflict check //FIXME use INFO
+  if($DATE != 0 && @filemtime(wikiFN($ID)) > $DATE )
+    return 'conflict';
+
+  //save it
+  saveWikiText($ID,con($PRE,$TEXT,$SUF,1),$SUM,get_input('minor')); //use pretty mode for con
+  //unlock it
+  unlock($ID);
+
+  //delete draft
+  act_draftdel($act);
+  session_write_close();
+
+  // when done, show page
+  return 'show';
+}
+
+/**
+ * Revert to a certain revision
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_revert($act){
+    global $ID;
+    global $REV;
+    global $lang;
+
+    // when no revision is given, delete current one
+    // FIXME this feature is not exposed in the GUI currently
+    $text = '';
+    $sum  = $lang['deleted'];
+    if($REV){
+        $text = rawWiki($ID,$REV);
+        if(!$text) return 'show'; //something went wrong
+        $sum  = $lang['restored'];
+    }
+
+    // spam check
+    if(checkwordblock($Text))
+        return 'wordblock';
+
+    saveWikiText($ID,$text,$sum,false);
+    msg($sum,1);
+
+    //delete any draft
+    act_draftdel($act);
+    session_write_close();
+
+    // when done, show current page
+    $_SERVER['REQUEST_METHOD'] = 'post'; //should force a redirect
+    $REV = '';
+    return 'show';
+}
+
+/**
+ * Do a redirect after receiving post data
+ *
+ * Tries to add the section id as hash mark after section editing
+ */
+function act_redirect($id,$preact){
+  global $PRE;
+  global $TEXT;
+  global $MSG;
+
+  //are there any undisplayed messages? keep them in session for display
+  //on the next page
+  if(isset($MSG) && count($MSG)){
+    //reopen session, store data and close session again
+    @session_start();
+    $_SESSION[DOKU_COOKIE]['msg'] = $MSG;
+    session_write_close();
+  }
+
+  $opts = array(
+    'id'       => $id,
+    'preact'   => $preact
+  );
+  //get section name when coming from section edit
+  if($PRE && preg_match('/^\s*==+([^=\n]+)/',$TEXT,$match)){
+    $check = false; //Byref
+    $opts['fragment'] = sectionID($match[0], $check);
+  }
+
+  trigger_event('ACTION_SHOW_REDIRECT',$opts,'act_redirect_execute');
+}
+
+function act_redirect_execute($opts){
+  $go = wl($opts['id'],'',true);
+  if(isset($opts['fragment'])) $go .= '#'.$opts['fragment'];
+
+  //show it
+  send_redirect($go);
+}
+
+/**
+ * Handle 'login', 'logout'
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_auth($act){
+  global $ID;
+  global $INFO;
+
+  //already logged in?
+  if(isset($_SERVER['REMOTE_USER']) && $act=='login'){
+    return 'show';
+  }
+
+  //handle logout
+  if($act=='logout'){
+    $lockedby = checklock($ID); //page still locked?
+    if($lockedby == $_SERVER['REMOTE_USER'])
+      unlock($ID); //try to unlock
+
+    // do the logout stuff
+    auth_logoff();
+
+    // rebuild info array
+    $INFO = pageinfo();
+
+    act_redirect($ID,'login');
+  }
+
+  return $act;
+}
+
+/**
+ * Handle 'edit', 'preview'
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function act_edit($act){
+  global $ID;
+  global $INFO;
+
+  //check if locked by anyone - if not lock for my self
+  $lockedby = checklock($ID);
+  if($lockedby) return 'locked';
+
+  lock($ID);
+  return $act;
+}
+
+/**
+ * Export a wiki page for various formats
+ *
+ * Triggers ACTION_EXPORT_POSTPROCESS
+ *
+ *  Event data:
+ *    data['id']      -- page id
+ *    data['mode']    -- requested export mode
+ *    data['headers'] -- export headers
+ *    data['output']  -- export output
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function act_export($act){
+  global $ID;
+  global $REV;
+  global $conf;
+  global $lang;
+
+  $pre = '';
+  $post = '';
+  $output = '';
+  $headers = array();
+
+  // search engines: never cache exported docs! (Google only currently)
+  $headers['X-Robots-Tag'] = 'noindex';
+
+  $mode = substr($act,7);
+  switch($mode) {
+    case 'raw':
+      $headers['Content-Type'] = 'text/plain; charset=utf-8';
+      $headers['Content-Disposition'] = 'attachment; filename='.noNS($ID).'.txt';
+      $output = rawWiki($ID,$REV);
+      break;
+    case 'xhtml':
+      $pre .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' . DOKU_LF;
+      $pre .= ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' . DOKU_LF;
+      $pre .= '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'.$conf['lang'].'"' . DOKU_LF;
+      $pre .= ' lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF;
+      $pre .= '<head>' . DOKU_LF;
+      $pre .= '  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />' . DOKU_LF;
+      $pre .= '  <title>'.$ID.'</title>' . DOKU_LF;
+
+      // get metaheaders
+      ob_start();
+      tpl_metaheaders();
+      $pre .= ob_get_clean();
+
+      $pre .= '</head>' . DOKU_LF;
+      $pre .= '<body>' . DOKU_LF;
+      $pre .= '<div class="dokuwiki export">' . DOKU_LF;
+
+      // get toc
+      $pre .= tpl_toc(true);
+
+      $headers['Content-Type'] = 'text/html; charset=utf-8';
+      $output = p_wiki_xhtml($ID,$REV,false);
+
+      $post .= '</div>' . DOKU_LF;
+      $post .= '</body>' . DOKU_LF;
+      $post .= '</html>' . DOKU_LF;
+      break;
+    case 'xhtmlbody':
+      $headers['Content-Type'] = 'text/html; charset=utf-8';
+      $output = p_wiki_xhtml($ID,$REV,false);
+      break;
+    default:
+      $output = p_cached_output(wikiFN($ID,$REV), $mode);
+      $headers = p_get_metadata($ID,"format $mode");
+      break;
+  }
+
+  // prepare event data
+  $data = array();
+  $data['id'] = $ID;
+  $data['mode'] = $mode;
+  $data['headers'] = $headers;
+  $data['output'] =& $output;
+
+  trigger_event('ACTION_EXPORT_POSTPROCESS', $data);
+
+  if(!empty($data['output'])){
+    if(is_array($data['headers'])) foreach($data['headers'] as $key => $val){
+      header("$key: $val");
+    }
+    print $pre.$data['output'].$post;
+    exit;
+  }
+  return 'show';
+}
+
+/**
+ * Handle page 'subscribe', 'unsubscribe'
+ *
+ * @author Steven Danz <steven-danz@kc.rr.com>
+ * @todo   localize
+ */
+function act_subscription($act){
+  global $ID;
+  global $INFO;
+  global $lang;
+
+  $file=metaFN($ID,'.mlist');
+  if ($act=='subscribe' && !$INFO['subscribed']){
+    if ($INFO['userinfo']['mail']){
+      if (io_saveFile($file,$_SERVER['REMOTE_USER']."\n",true)) {
+        $INFO['subscribed'] = true;
+        msg(sprintf($lang[$act.'_success'], $INFO['userinfo']['name'], $ID),1);
+      } else {
+        msg(sprintf($lang[$act.'_error'], $INFO['userinfo']['name'], $ID),1);
+      }
+    } else {
+      msg($lang['subscribe_noaddress']);
+    }
+  } elseif ($act=='unsubscribe' && $INFO['subscribed']){
+    if (io_deleteFromFile($file,$_SERVER['REMOTE_USER']."\n")) {
+      $INFO['subscribed'] = false;
+      msg(sprintf($lang[$act.'_success'], $INFO['userinfo']['name'], $ID),1);
+    } else {
+      msg(sprintf($lang[$act.'_error'], $INFO['userinfo']['name'], $ID),1);
+    }
+  }
+
+  return 'show';
+}
+
+/**
+ * Handle namespace 'subscribe', 'unsubscribe'
+ *
+ */
+function act_subscriptionns($act){
+  global $ID;
+  global $INFO;
+  global $lang;
+
+  if(!getNS($ID)) {
+    $file = metaFN(getNS($ID),'.mlist');
+    $ns = "root";
+  } else {
+    $file = metaFN(getNS($ID),'/.mlist');
+    $ns = getNS($ID);
+  }
+
+  // reuse strings used to display the status of the subscribe action
+  $act_msg = rtrim($act, 'ns');
+
+  if ($act=='subscribens' && !$INFO['subscribedns']){
+    if ($INFO['userinfo']['mail']){
+      if (io_saveFile($file,$_SERVER['REMOTE_USER']."\n",true)) {
+        $INFO['subscribedns'] = true;
+        msg(sprintf($lang[$act_msg.'_success'], $INFO['userinfo']['name'], $ns),1);
+      } else {
+        msg(sprintf($lang[$act_msg.'_error'], $INFO['userinfo']['name'], $ns),1);
+      }
+    } else {
+      msg($lang['subscribe_noaddress']);
+    }
+  } elseif ($act=='unsubscribens' && $INFO['subscribedns']){
+    if (io_deleteFromFile($file,$_SERVER['REMOTE_USER']."\n")) {
+      $INFO['subscribedns'] = false;
+      msg(sprintf($lang[$act_msg.'_success'], $INFO['userinfo']['name'], $ns),1);
+    } else {
+      msg(sprintf($lang[$act_msg.'_error'], $INFO['userinfo']['name'], $ns),1);
+    }
+  }
+
+  return 'show';
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/adLDAP.php b/mod/dokuwiki/vendors/dokuwiki/inc/adLDAP.php
new file mode 100644
index 000000000..94cd8a50d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/adLDAP.php
@@ -0,0 +1,2347 @@
+<?php
+/**
+ * PHP LDAP CLASS FOR MANIPULATING ACTIVE DIRECTORY
+ * Version 3.3.1
+ *
+ * PHP Version 5 with SSL and LDAP support
+ *
+ * Written by Scott Barnett, Richard Hyland
+ *   email: scott@wiggumworld.com, adldap@richardhyland.com
+ *   http://adldap.sourceforge.net/
+ *
+ * Copyright (c) 2006-2009 Scott Barnett, Richard Hyland
+ *
+ * We'd appreciate any improvements or additions to be submitted back
+ * to benefit the entire community :)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * @category ToolsAndUtilities
+ * @package adLDAP
+ * @author Scott Barnett, Richard Hyland
+ * @copyright (c) 2006-2009 Scott Barnett, Richard Hyland
+ * @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html LGPLv2.1
+ * @revision $Revision: 67 $
+ * @version 3.3.1
+ * @link http://adldap.sourceforge.net/
+ */
+
+/**
+ * Define the different types of account in AD
+ */
+define ('ADLDAP_NORMAL_ACCOUNT', 805306368);
+define ('ADLDAP_WORKSTATION_TRUST', 805306369);
+define ('ADLDAP_INTERDOMAIN_TRUST', 805306370);
+define ('ADLDAP_SECURITY_GLOBAL_GROUP', 268435456);
+define ('ADLDAP_DISTRIBUTION_GROUP', 268435457);
+define ('ADLDAP_SECURITY_LOCAL_GROUP', 536870912);
+define ('ADLDAP_DISTRIBUTION_LOCAL_GROUP', 536870913);
+define ('ADLDAP_FOLDER', 'OU');
+define ('ADLDAP_CONTAINER', 'CN');
+
+/**
+* Main adLDAP class
+*
+* Can be initialised using $adldap = new adLDAP();
+*
+* Something to keep in mind is that Active Directory is a permissions
+* based directory. If you bind as a domain user, you can't fetch as
+* much information on other users as you could as a domain admin.
+*
+* Before asking questions, please read the Documentation at
+* http://adldap.sourceforge.net/wiki/doku.php?id=api
+*/
+class adLDAP {
+    /**
+    * The account suffix for your domain, can be set when the class is invoked
+    *
+    * @var string
+    */
+    protected $_account_suffix = "@mydomain.local";
+
+    /**
+    * The base dn for your domain
+    *
+    * @var string
+    */
+    protected $_base_dn = "DC=mydomain,DC=local";
+
+    /**
+    * Array of domain controllers. Specifiy multiple controllers if you
+    * would like the class to balance the LDAP queries amongst multiple servers
+    *
+    * @var array
+    */
+    protected $_domain_controllers = array ("dc01.mydomain.local");
+
+    /**
+    * Optional account with higher privileges for searching
+    * This should be set to a domain admin account
+    *
+    * @var string
+    * @var string
+    */
+    protected $_ad_username=NULL;
+    protected $_ad_password=NULL;
+
+    /**
+    * AD does not return the primary group. http://support.microsoft.com/?kbid=321360
+    * This tweak will resolve the real primary group.
+    * Setting to false will fudge "Domain Users" and is much faster. Keep in mind though that if
+    * someone's primary group is NOT domain users, this is obviously going to mess up the results
+    *
+    * @var bool
+    */
+    protected $_real_primarygroup=true;
+
+    /**
+    * Use SSL (LDAPS), your server needs to be setup, please see
+    * http://adldap.sourceforge.net/wiki/doku.php?id=ldap_over_ssl
+    *
+    * @var bool
+    */
+    protected $_use_ssl=false;
+
+    /**
+    * Use TLS
+    * If you wish to use TLS you should ensure that $_use_ssl is set to false and vice-versa
+    *
+    * @var bool
+    */
+    protected $_use_tls=false;
+
+    /**
+    * When querying group memberships, do it recursively
+    * eg. User Fred is a member of Group A, which is a member of Group B, which is a member of Group C
+    * user_ingroup("Fred","C") will returns true with this option turned on, false if turned off
+    *
+    * @var bool
+    */
+    protected $_recursive_groups=true;
+
+    // You should not need to edit anything below this line
+    //******************************************************************************************
+
+    /**
+    * Connection and bind default variables
+    *
+    * @var mixed
+    * @var mixed
+    */
+    protected $_conn;
+    protected $_bind;
+
+    /**
+    * Getters and Setters
+    */
+
+    /**
+    * Set the account suffix
+    *
+    * @param string $_account_suffix
+    * @return void
+    */
+    public function set_account_suffix($_account_suffix)
+    {
+          $this->_account_suffix = $_account_suffix;
+    }
+
+    /**
+    * Get the account suffix
+    *
+    * @return string
+    */
+    public function get_account_suffix()
+    {
+          return $this->_account_suffix;
+    }
+
+    /**
+    * Set the domain controllers array
+    *
+    * @param array $_domain_controllers
+    * @return void
+    */
+    public function set_domain_controllers(array $_domain_controllers)
+    {
+          $this->_domain_controllers = $_domain_controllers;
+    }
+
+    /**
+    * Get the list of domain controllers
+    *
+    * @return void
+    */
+    public function get_domain_controllers()
+    {
+          return $this->_domain_controllers;
+    }
+
+    /**
+    * Set the username of an account with higher priviledges
+    *
+    * @param string $_ad_username
+    * @return void
+    */
+    public function set_ad_username($_ad_username)
+    {
+          $this->_ad_username = $_ad_username;
+    }
+
+    /**
+    * Get the username of the account with higher priviledges
+    *
+    * This will throw an exception for security reasons
+    */
+    public function get_ad_username()
+    {
+          throw new adLDAPException('For security reasons you cannot access the domain administrator account details');
+    }
+
+    /**
+    * Set the password of an account with higher priviledges
+    *
+    * @param string $_ad_password
+    * @return void
+    */
+    public function set_ad_password($_ad_password)
+    {
+          $this->_ad_password = $_ad_password;
+    }
+
+    /**
+    * Get the password of the account with higher priviledges
+    *
+    * This will throw an exception for security reasons
+    */
+    public function get_ad_password()
+    {
+          throw new adLDAPException('For security reasons you cannot access the domain administrator account details');
+    }
+
+    /**
+    * Set whether to detect the true primary group
+    *
+    * @param bool $_real_primary_group
+    * @return void
+    */
+    public function set_real_primarygroup($_real_primarygroup)
+    {
+          $this->_real_primarygroup = $_real_primarygroup;
+    }
+
+    /**
+    * Get the real primary group setting
+    *
+    * @return bool
+    */
+    public function get_real_primarygroup()
+    {
+          return $this->_real_primarygroup;
+    }
+
+    /**
+    * Set whether to use SSL
+    *
+    * @param bool $_use_ssl
+    * @return void
+    */
+    public function set_use_ssl($_use_ssl)
+    {
+          $this->_use_ssl = $_use_ssl;
+    }
+
+    /**
+    * Get the SSL setting
+    *
+    * @return bool
+    */
+    public function get_use_ssl()
+    {
+          return $this->_use_ssl;
+    }
+
+    /**
+    * Set whether to use TLS
+    *
+    * @param bool $_use_tls
+    * @return void
+    */
+    public function set_use_tls($_use_tls)
+    {
+          $this->_use_tls = $_use_tls;
+    }
+
+    /**
+    * Get the TLS setting
+    *
+    * @return bool
+    */
+    public function get_use_tls()
+    {
+          return $this->_use_tls;
+    }
+
+    /**
+    * Set whether to lookup recursive groups
+    *
+    * @param bool $_recursive_groups
+    * @return void
+    */
+    public function set_recursive_groups($_recursive_groups)
+    {
+          $this->_recursive_groups = $_recursive_groups;
+    }
+
+    /**
+    * Get the recursive groups setting
+    *
+    * @return bool
+    */
+    public function get_recursive_groups()
+    {
+          return $this->_recursive_groups;
+    }
+
+    /**
+    * Default Constructor
+    *
+    * Tries to bind to the AD domain over LDAP or LDAPs
+    *
+    * @param array $options Array of options to pass to the constructor
+    * @throws Exception - if unable to bind to Domain Controller
+    * @return bool
+    */
+    function __construct($options=array()){
+        // You can specifically overide any of the default configuration options setup above
+        if (count($options)>0){
+            if (array_key_exists("account_suffix",$options)){ $this->_account_suffix=$options["account_suffix"]; }
+            if (array_key_exists("base_dn",$options)){ $this->_base_dn=$options["base_dn"]; }
+            if (array_key_exists("domain_controllers",$options)){ $this->_domain_controllers=$options["domain_controllers"]; }
+            if (array_key_exists("ad_username",$options)){ $this->_ad_username=$options["ad_username"]; }
+            if (array_key_exists("ad_password",$options)){ $this->_ad_password=$options["ad_password"]; }
+            if (array_key_exists("real_primarygroup",$options)){ $this->_real_primarygroup=$options["real_primarygroup"]; }
+            if (array_key_exists("use_ssl",$options)){ $this->_use_ssl=$options["use_ssl"]; }
+            if (array_key_exists("use_tls",$options)){ $this->_use_tls=$options["use_tls"]; }
+            if (array_key_exists("recursive_groups",$options)){ $this->_recursive_groups=$options["recursive_groups"]; }
+        }
+
+        if ($this->ldap_supported() === false) {
+            throw new adLDAPException('No LDAP support for PHP.  See: http://www.php.net/ldap');
+        }
+
+        return $this->connect();
+    }
+
+    /**
+    * Default Destructor
+    *
+    * Closes the LDAP connection
+    *
+    * @return void
+    */
+    function __destruct(){ $this->close(); }
+
+    /**
+    * Connects and Binds to the Domain Controller
+    *
+    * @return bool
+    */
+    public function connect() {
+        // Connect to the AD/LDAP server as the username/password
+        $dc=$this->random_controller();
+        if ($this->_use_ssl){
+            $this->_conn = ldap_connect("ldaps://".$dc, 636);
+        } else {
+            $this->_conn = ldap_connect($dc);
+        }
+
+        // Set some ldap options for talking to AD
+        ldap_set_option($this->_conn, LDAP_OPT_PROTOCOL_VERSION, 3);
+        ldap_set_option($this->_conn, LDAP_OPT_REFERRALS, 0);
+
+        if ($this->_use_tls) {
+            ldap_start_tls($this->_conn);
+        }
+
+        // Bind as a domain admin if they've set it up
+        if ($this->_ad_username!=NULL && $this->_ad_password!=NULL){
+            $this->_bind = @ldap_bind($this->_conn,$this->_ad_username.$this->_account_suffix,$this->_ad_password);
+            if (!$this->_bind){
+                if ($this->_use_ssl && !$this->_use_tls){
+                    // If you have problems troubleshooting, remove the @ character from the ldap_bind command above to get the actual error message
+                    throw new adLDAPException('Bind to Active Directory failed. Either the LDAPs connection failed or the login credentials are incorrect. AD said: ' . $this->get_last_error());
+                } else {
+                    throw new adLDAPException('Bind to Active Directory failed. Check the login credentials and/or server details. AD said: ' . $this->get_last_error());
+                }
+            }
+        }
+
+        if ($this->_base_dn == NULL) {
+            $this->_base_dn = $this->find_base_dn();
+        }
+
+        return (true);
+    }
+
+    /**
+    * Closes the LDAP connection
+    *
+    * @return void
+    */
+    public function close() {
+        ldap_close ($this->_conn);
+    }
+
+    /**
+    * Validate a user's login credentials
+    *
+    * @param string $username A user's AD username
+    * @param string $password A user's AD password
+    * @param bool optional $prevent_rebind
+    * @return bool
+    */
+    public function authenticate($username,$password,$prevent_rebind=false){
+        // Prevent null binding
+        if ($username===NULL || $password===NULL){ return (false); }
+        if (empty($username) || empty($password)){ return (false); }
+
+        // Bind as the user
+        $this->_bind = @ldap_bind($this->_conn,$username.$this->_account_suffix,$password);
+        if (!$this->_bind){ return (false); }
+
+        // Cnce we've checked their details, kick back into admin mode if we have it
+        if ($this->_ad_username!=NULL && !$prevent_rebind){
+            $this->_bind = @ldap_bind($this->_conn,$this->_ad_username.$this->_account_suffix,$this->_ad_password);
+            if (!$this->_bind){
+                // This should never happen in theory
+                throw new adLDAPException('Rebind to Active Directory failed. AD said: ' . $this->get_last_error());
+            }
+        }
+
+        return (true);
+    }
+
+    //*****************************************************************************************************************
+    // GROUP FUNCTIONS
+
+    /**
+    * Add a group to a group
+    *
+    * @param string $parent The parent group name
+    * @param string $child The child group name
+    * @return bool
+    */
+    public function group_add_group($parent,$child){
+
+        // Find the parent group's dn
+        $parent_group=$this->group_info($parent,array("cn"));
+        if ($parent_group[0]["dn"]===NULL){ return (false); }
+        $parent_dn=$parent_group[0]["dn"];
+
+        // Find the child group's dn
+        $child_group=$this->group_info($child,array("cn"));
+        if ($child_group[0]["dn"]===NULL){ return (false); }
+        $child_dn=$child_group[0]["dn"];
+
+        $add=array();
+        $add["member"] = $child_dn;
+
+        $result=@ldap_mod_add($this->_conn,$parent_dn,$add);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Add a user to a group
+    *
+    * @param string $group The group to add the user to
+    * @param string $user The user to add to the group
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function group_add_user($group,$user,$isGUID=false){
+        // Adding a user is a bit fiddly, we need to get the full DN of the user
+        // and add it using the full DN of the group
+
+        // Find the user's dn
+        $user_dn=$this->user_dn($user,$isGUID);
+        if ($user_dn===false){ return (false); }
+
+        // Find the group's dn
+        $group_info=$this->group_info($group,array("cn"));
+        if ($group_info[0]["dn"]===NULL){ return (false); }
+        $group_dn=$group_info[0]["dn"];
+
+        $add=array();
+        $add["member"] = $user_dn;
+
+        $result=@ldap_mod_add($this->_conn,$group_dn,$add);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Add a contact to a group
+    *
+    * @param string $group The group to add the contact to
+    * @param string $contact_dn The DN of the contact to add
+    * @return bool
+    */
+    public function group_add_contact($group,$contact_dn){
+        // To add a contact we take the contact's DN
+        // and add it using the full DN of the group
+
+        // Find the group's dn
+        $group_info=$this->group_info($group,array("cn"));
+        if ($group_info[0]["dn"]===NULL){ return (false); }
+        $group_dn=$group_info[0]["dn"];
+
+        $add=array();
+        $add["member"] = $contact_dn;
+
+        $result=@ldap_mod_add($this->_conn,$group_dn,$add);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Create a group
+    *
+    * @param array $attributes Default attributes of the group
+    * @return bool
+    */
+    public function group_create($attributes){
+        if (!is_array($attributes)){ return ("Attributes must be an array"); }
+        if (!array_key_exists("group_name",$attributes)){ return ("Missing compulsory field [group_name]"); }
+        if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); }
+        if (!array_key_exists("description",$attributes)){ return ("Missing compulsory field [description]"); }
+        if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); }
+        $attributes["container"]=array_reverse($attributes["container"]);
+
+        //$member_array = array();
+        //$member_array[0] = "cn=user1,cn=Users,dc=yourdomain,dc=com";
+        //$member_array[1] = "cn=administrator,cn=Users,dc=yourdomain,dc=com";
+
+        $add=array();
+        $add["cn"] = $attributes["group_name"];
+        $add["samaccountname"] = $attributes["group_name"];
+        $add["objectClass"] = "Group";
+        $add["description"] = $attributes["description"];
+        //$add["member"] = $member_array; UNTESTED
+
+        $container="OU=".implode(",OU=",$attributes["container"]);
+        $result=ldap_add($this->_conn,"CN=".$add["cn"].", ".$container.",".$this->_base_dn,$add);
+        if ($result!=true){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Remove a group from a group
+    *
+    * @param string $parent The parent group name
+    * @param string $child The child group name
+    * @return bool
+    */
+    public function group_del_group($parent,$child){
+
+        // Find the parent dn
+        $parent_group=$this->group_info($parent,array("cn"));
+        if ($parent_group[0]["dn"]===NULL){ return (false); }
+        $parent_dn=$parent_group[0]["dn"];
+
+        // Find the child dn
+        $child_group=$this->group_info($child,array("cn"));
+        if ($child_group[0]["dn"]===NULL){ return (false); }
+        $child_dn=$child_group[0]["dn"];
+
+        $del=array();
+        $del["member"] = $child_dn;
+
+        $result=@ldap_mod_del($this->_conn,$parent_dn,$del);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Remove a user from a group
+    *
+    * @param string $group The group to remove a user from
+    * @param string $user The AD user to remove from the group
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function group_del_user($group,$user,$isGUID=false){
+
+        // Find the parent dn
+        $group_info=$this->group_info($group,array("cn"));
+        if ($group_info[0]["dn"]===NULL){ return (false); }
+        $group_dn=$group_info[0]["dn"];
+
+        // Find the users dn
+        $user_dn=$this->user_dn($user,$isGUID);
+        if ($user_dn===false){ return (false); }
+
+        $del=array();
+        $del["member"] = $user_dn;
+
+        $result=@ldap_mod_del($this->_conn,$group_dn,$del);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Remove a contact from a group
+    *
+    * @param string $group The group to remove a user from
+    * @param string $contact_dn The DN of a contact to remove from the group
+    * @return bool
+    */
+    public function group_del_contact($group,$contact_dn){
+
+        // Find the parent dn
+        $group_info=$this->group_info($group,array("cn"));
+        if ($group_info[0]["dn"]===NULL){ return (false); }
+        $group_dn=$group_info[0]["dn"];
+
+        $del=array();
+        $del["member"] = $contact_dn;
+
+        $result=@ldap_mod_del($this->_conn,$group_dn,$del);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Return a list of groups in a group
+    *
+    * @param string $group The group to query
+    * @param bool $recursive Recursively get groups
+    * @return array
+    */
+    public function groups_in_group($group, $recursive = NULL){
+        if (!$this->_bind){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+
+        // Search the directory for the members of a group
+        $info=$this->group_info($group,array("member","cn"));
+        $groups=$info[0]["member"];
+        if (!is_array($groups)) {
+            return (false);
+        }
+
+        $group_array=array();
+
+        for ($i=0; $i<$groups["count"]; $i++){
+             $filter="(&(objectCategory=group)(distinguishedName=".$this->ldap_slashes($groups[$i])."))";
+             $fields = array("samaccountname", "distinguishedname", "objectClass");
+             $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+             $entries = ldap_get_entries($this->_conn, $sr);
+
+             // not a person, look for a group
+             if ($entries['count'] == 0 && $recursive == true) {
+                $filter="(&(objectCategory=group)(distinguishedName=".$this->ldap_slashes($groups[$i])."))";
+                $fields = array("distinguishedname");
+                $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+                $entries = ldap_get_entries($this->_conn, $sr);
+                if (!isset($entries[0]['distinguishedname'][0])) {
+                    continue;
+                }
+                $sub_groups = $this->groups_in_group($entries[0]['distinguishedname'][0], $recursive);
+                if (is_array($sub_groups)) {
+                    $group_array = array_merge($group_array, $sub_groups);
+                    $group_array = array_unique($group_array);
+                }
+                continue;
+             }
+
+             $group_array[] = $entries[0]['distinguishedname'][0];
+        }
+        return ($group_array);
+    }
+
+    /**
+    * Return a list of members in a group
+    *
+    * @param string $group The group to query
+    * @param bool $recursive Recursively get group members
+    * @return array
+    */
+    public function group_members($group, $recursive = NULL){
+        if (!$this->_bind){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+        // Search the directory for the members of a group
+        $info=$this->group_info($group,array("member","cn"));
+        $users=$info[0]["member"];
+        if (!is_array($users)) {
+            return (false);
+        }
+
+        $user_array=array();
+
+        for ($i=0; $i<$users["count"]; $i++){
+             $filter="(&(objectCategory=person)(distinguishedName=".$this->ldap_slashes($users[$i])."))";
+             $fields = array("samaccountname", "distinguishedname", "objectClass");
+             $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+             $entries = ldap_get_entries($this->_conn, $sr);
+
+             // not a person, look for a group
+             if ($entries['count'] == 0 && $recursive == true) {
+                $filter="(&(objectCategory=group)(distinguishedName=".$this->ldap_slashes($users[$i])."))";
+                $fields = array("samaccountname");
+                $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+                $entries = ldap_get_entries($this->_conn, $sr);
+                if (!isset($entries[0]['samaccountname'][0])) {
+                    continue;
+                }
+                $sub_users = $this->group_members($entries[0]['samaccountname'][0], $recursive);
+                if (is_array($sub_users)) {
+                    $user_array = array_merge($user_array, $sub_users);
+                    $user_array = array_unique($user_array);
+                }
+                continue;
+             }
+
+             if ($entries[0]['samaccountname'][0] === NULL && $entries[0]['distinguishedname'][0] !== NULL) {
+                 $user_array[] = $entries[0]['distinguishedname'][0];
+             }
+             elseif ($entries[0]['samaccountname'][0] !== NULL) {
+                $user_array[] = $entries[0]['samaccountname'][0];
+             }
+        }
+        return ($user_array);
+    }
+
+    /**
+    * Group Information.  Returns an array of information about a group.
+    * The group name is case sensitive
+    *
+    * @param string $group_name The group name to retrieve info about
+    * @param array $fields Fields to retrieve
+    * @return array
+    */
+    public function group_info($group_name,$fields=NULL){
+        if ($group_name===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        if (stristr($group_name, '+')) {
+            $group_name=stripslashes($group_name);
+        }
+
+        $filter="(&(objectCategory=group)(name=".$this->ldap_slashes($group_name)."))";
+        //echo ($filter."!!!<br>");
+        if ($fields===NULL){ $fields=array("member","memberof","cn","description","distinguishedname","objectcategory","samaccountname"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+        //print_r($entries);
+        return ($entries);
+    }
+
+    /**
+    * Return a complete list of "groups in groups"
+    *
+    * @param string $group The group to get the list from
+    * @return array
+    */
+    public function recursive_groups($group){
+        if ($group===NULL){ return (false); }
+
+        $ret_groups=array();
+
+        $groups=$this->group_info($group,array("memberof"));
+        if (is_array($groups[0]["memberof"])) {
+            $groups=$groups[0]["memberof"];
+
+            if ($groups){
+                $group_names=$this->nice_names($groups);
+                $ret_groups=array_merge($ret_groups,$group_names); //final groups to return
+
+                foreach ($group_names as $id => $group_name){
+                    $child_groups=$this->recursive_groups($group_name);
+                    $ret_groups=array_merge($ret_groups,$child_groups);
+                }
+            }
+        }
+
+        return ($ret_groups);
+    }
+
+    /**
+    * Returns a complete list of the groups in AD based on a SAM Account Type
+    *
+    * @param string $samaccounttype The account type to return
+    * @param bool $include_desc Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function search_groups($samaccounttype = ADLDAP_SECURITY_GLOBAL_GROUP, $include_desc = false, $search = "*", $sorted = true) {
+        if (!$this->_bind){ return (false); }
+
+        $filter = '(&(objectCategory=group)';
+        if ($samaccounttype !== null) {
+            $filter .= '(samaccounttype='. $samaccounttype .')';
+        }
+        $filter .= '(cn='.$search.'))';
+        // Perform the search and grab all their details
+        $fields=array("samaccountname","description");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        $groups_array = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($include_desc && strlen($entries[$i]["description"][0]) > 0 ){
+                $groups_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["description"][0];
+            } elseif ($include_desc){
+                $groups_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["samaccountname"][0];
+            } else {
+                array_push($groups_array, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if( $sorted ){ asort($groups_array); }
+        return ($groups_array);
+    }
+
+    /**
+    * Returns a complete list of all groups in AD
+    *
+    * @param bool $include_desc Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all_groups($include_desc = false, $search = "*", $sorted = true){
+        $groups_array = $this->search_groups(null, $include_desc, $search, $sorted);
+        return ($groups_array);
+    }
+
+    /**
+    * Returns a complete list of security groups in AD
+    *
+    * @param bool $include_desc Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all_security_groups($include_desc = false, $search = "*", $sorted = true){
+        $groups_array = $this->search_groups(ADLDAP_SECURITY_GLOBAL_GROUP, $include_desc, $search, $sorted);
+        return ($groups_array);
+    }
+
+    /**
+    * Returns a complete list of distribution lists in AD
+    *
+    * @param bool $include_desc Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all_distribution_groups($include_desc = false, $search = "*", $sorted = true){
+        $groups_array = $this->search_groups(ADLDAP_DISTRIBUTION_GROUP, $include_desc, $search, $sorted);
+        return ($groups_array);
+    }
+
+    //*****************************************************************************************************************
+    // USER FUNCTIONS
+
+    /**
+    * Create a user
+    *
+    * If you specify a password here, this can only be performed over SSL
+    *
+    * @param array $attributes The attributes to set to the user account
+    * @return bool
+    */
+    public function user_create($attributes){
+        // Check for compulsory fields
+        if (!array_key_exists("username",$attributes)){ return ("Missing compulsory field [username]"); }
+        if (!array_key_exists("firstname",$attributes)){ return ("Missing compulsory field [firstname]"); }
+        if (!array_key_exists("surname",$attributes)){ return ("Missing compulsory field [surname]"); }
+        if (!array_key_exists("email",$attributes)){ return ("Missing compulsory field [email]"); }
+        if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); }
+        if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); }
+
+        if (array_key_exists("password",$attributes) && (!$this->_use_ssl && !$this->_use_tls)){
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+
+        if (!array_key_exists("display_name",$attributes)){ $attributes["display_name"]=$attributes["firstname"]." ".$attributes["surname"]; }
+
+        // Translate the schema
+        $add=$this->adldap_schema($attributes);
+
+        // Additional stuff only used for adding accounts
+        $add["cn"][0]=$attributes["display_name"];
+        $add["samaccountname"][0]=$attributes["username"];
+        $add["objectclass"][0]="top";
+        $add["objectclass"][1]="person";
+        $add["objectclass"][2]="organizationalPerson";
+        $add["objectclass"][3]="user"; //person?
+        //$add["name"][0]=$attributes["firstname"]." ".$attributes["surname"];
+
+        // Set the account control attribute
+        $control_options=array("NORMAL_ACCOUNT");
+        if (!$attributes["enabled"]){ $control_options[]="ACCOUNTDISABLE"; }
+        $add["userAccountControl"][0]=$this->account_control($control_options);
+        //echo ("<pre>"); print_r($add);
+
+        // Determine the container
+        $attributes["container"]=array_reverse($attributes["container"]);
+        $container="OU=".implode(",OU=",$attributes["container"]);
+
+        // Add the entry
+        $result=@ldap_add($this->_conn, "CN=".$add["cn"][0].", ".$container.",".$this->_base_dn, $add);
+        if ($result!=true){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Delete a user account
+    *
+    * @param string $username The username to delete (please be careful here!)
+    * @param bool $isGUID Is the username a GUID or a samAccountName
+    * @return array
+    */
+    public function user_delete($username,$isGUID=false) {
+        $userinfo = $this->user_info($username, array("*"),$isGUID);
+        $dn = $userinfo[0]['distinguishedname'][0];
+        $result=$this->dn_delete($dn);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Groups the user is a member of
+    *
+    * @param string $username The username to query
+    * @param bool $recursive Recursive list of groups
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return array
+    */
+    public function user_groups($username,$recursive=NULL,$isGUID=false){
+        if ($username===NULL){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        // Search the directory for their information
+        $info=@$this->user_info($username,array("memberof","primarygroupid"),$isGUID);
+        $groups=$this->nice_names($info[0]["memberof"]); // Presuming the entry returned is our guy (unique usernames)
+
+        if ($recursive === true){
+            foreach ($groups as $id => $group_name){
+                $extra_groups=$this->recursive_groups($group_name);
+                $groups=array_merge($groups,$extra_groups);
+            }
+        }
+
+        return ($groups);
+    }
+
+    /**
+    * Find information about the users
+    *
+    * @param string $username The username to query
+    * @param array $fields Array of parameters to query
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return array
+    */
+    public function user_info($username,$fields=NULL,$isGUID=false){
+        if ($username===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        if ($isGUID === true) {
+            $username = $this->strguid2hex($username);
+            $filter="objectguid=".$username;
+        }
+        else {
+            $filter="samaccountname=".$username;
+        }
+        if ($fields===NULL){ $fields=array("samaccountname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        if ($entries[0]['count'] >= 1) {
+            // AD does not return the primary group in the ldap query, we may need to fudge it
+            if ($this->_real_primarygroup && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["objectsid"][0])){
+                //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                $entries[0]["memberof"][]=$this->get_primary_group($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+            } else {
+                $entries[0]["memberof"][]="CN=Domain Users,CN=Users,".$this->_base_dn;
+            }
+        }
+
+        $entries[0]["memberof"]["count"]++;
+        return ($entries);
+    }
+
+    /**
+    * Determine if a user is in a specific group
+    *
+    * @param string $username The username to query
+    * @param string $group The name of the group to check against
+    * @param bool $recursive Check groups recursively
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function user_ingroup($username,$group,$recursive=NULL,$isGUID=false){
+        if ($username===NULL){ return (false); }
+        if ($group===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } // Use the default option if they haven't set it
+
+        // Get a list of the groups
+        $groups=$this->user_groups($username,$recursive,$isGUID);
+
+        // Return true if the specified group is in the group list
+        if (in_array($group,$groups)){ return (true); }
+
+        return (false);
+    }
+
+    /**
+    * Determine a user's password expiry date
+    *
+    * @param string $username The username to query
+    * @param book $isGUID Is the username passed a GUID or a samAccountName
+    * @requires bcmath http://www.php.net/manual/en/book.bc.php
+    * @return array
+    */
+    public function user_password_expiry($username,$isGUID=false) {
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if (!$this->_bind){ return (false); }
+        if (!function_exists('bcmod')) { return ("Missing function support [bcmod] http://www.php.net/manual/en/book.bc.php"); };
+
+        $userinfo = $this->user_info($username, array("pwdlastset", "useraccountcontrol"), $isGUID);
+        $pwdlastset = $userinfo[0]['pwdlastset'][0];
+        $status = array();
+
+        if ($userinfo[0]['useraccountcontrol'][0] == '66048') {
+            // Password does not expire
+            return "Does not expire";
+        }
+        if ($pwdlastset === '0') {
+            // Password has already expired
+            return "Password has expired";
+        }
+
+         // Password expiry in AD can be calculated from TWO values:
+         //   - User's own pwdLastSet attribute: stores the last time the password was changed
+         //   - Domain's maxPwdAge attribute: how long passwords last in the domain
+         //
+         // Although Microsoft chose to use a different base and unit for time measurements.
+         // This function will convert them to Unix timestamps
+         $sr = ldap_read($this->_conn, $this->_base_dn, 'objectclass=*', array('maxPwdAge'));
+         if (!$sr) {
+             return false;
+         }
+         $info = ldap_get_entries($this->_conn, $sr);
+         $maxpwdage = $info[0]['maxpwdage'][0];
+
+
+         // See MSDN: http://msdn.microsoft.com/en-us/library/ms974598.aspx
+         //
+         // pwdLastSet contains the number of 100 nanosecond intervals since January 1, 1601 (UTC),
+         // stored in a 64 bit integer.
+         //
+         // The number of seconds between this date and Unix epoch is 11644473600.
+         //
+         // maxPwdAge is stored as a large integer that represents the number of 100 nanosecond
+         // intervals from the time the password was set before the password expires.
+         //
+         // We also need to scale this to seconds but also this value is a _negative_ quantity!
+         //
+         // If the low 32 bits of maxPwdAge are equal to 0 passwords do not expire
+         //
+         // Unfortunately the maths involved are too big for PHP integers, so I've had to require
+         // BCMath functions to work with arbitrary precision numbers.
+         if (bcmod($maxpwdage, 4294967296) === '0') {
+            return "Domain does not expire passwords";
+        }
+
+        // Add maxpwdage and pwdlastset and we get password expiration time in Microsoft's
+        // time units.  Because maxpwd age is negative we need to subtract it.
+        $pwdexpire = bcsub($pwdlastset, $maxpwdage);
+
+        // Convert MS's time to Unix time
+        $status['expiryts'] = bcsub(bcdiv($pwdexpire, '10000000'), '11644473600');
+        $status['expiryformat'] = date('Y-m-d H:i:s', bcsub(bcdiv($pwdexpire, '10000000'), '11644473600'));
+
+        return $status;
+    }
+
+    /**
+    * Modify a user
+    *
+    * @param string $username The username to query
+    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function user_modify($username,$attributes,$isGUID=false){
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if (array_key_exists("password",$attributes) && !$this->_use_ssl){
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+
+        // Find the dn of the user
+        $user_dn=$this->user_dn($username,$isGUID);
+        if ($user_dn===false){ return (false); }
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod && !array_key_exists("enabled", $attributes)){ return (false); }
+
+        // Set the account control attribute (only if specified)
+        if (array_key_exists("enabled",$attributes)){
+            if ($attributes["enabled"]){ $control_options=array("NORMAL_ACCOUNT"); }
+            else { $control_options=array("NORMAL_ACCOUNT","ACCOUNTDISABLE"); }
+            $mod["userAccountControl"][0]=$this->account_control($control_options);
+        }
+
+        // Do the update
+        $result=@ldap_modify($this->_conn,$user_dn,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Disable a user account
+    *
+    * @param string $username The username to disable
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function user_disable($username,$isGUID=false){
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        $attributes=array("enabled"=>0);
+        $result = $this->user_modify($username, $attributes, $isGUID);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Enable a user account
+    *
+    * @param string $username The username to enable
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function user_enable($username,$isGUID=false){
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        $attributes=array("enabled"=>1);
+        $result = $this->user_modify($username, $attributes, $isGUID);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Set the password of a user - This must be performed over SSL
+    *
+    * @param string $username The username to modify
+    * @param string $password The new password
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function user_password($username,$password,$isGUID=false){
+        if ($username===NULL){ return (false); }
+        if ($password===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if (!$this->_use_ssl && !$this->_use_tls){
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+
+        $user_dn=$this->user_dn($username,$isGUID);
+        if ($user_dn===false){ return (false); }
+
+        $add=array();
+        $add["unicodePwd"][0]=$this->encode_password($password);
+
+        $result=ldap_mod_replace($this->_conn,$user_dn,$add);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Return a list of all users in AD
+    *
+    * @param bool $include_desc Return a description of the user
+    * @param string $search Search parameter
+    * @param bool $sorted Sort the user accounts
+    * @return array
+    */
+    public function all_users($include_desc = false, $search = "*", $sorted = true){
+        if (!$this->_bind){ return (false); }
+
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=user)(samaccounttype=". ADLDAP_NORMAL_ACCOUNT .")(objectCategory=person)(cn=".$search."))";
+        $fields=array("samaccountname","displayname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        $users_array = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($include_desc && strlen($entries[$i]["displayname"][0])>0){
+                $users_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["displayname"][0];
+            } elseif ($include_desc){
+                $users_array[ $entries[$i]["samaccountname"][0] ] = $entries[$i]["samaccountname"][0];
+            } else {
+                array_push($users_array, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if ($sorted){ asort($users_array); }
+        return ($users_array);
+    }
+
+    /**
+    * Converts a username (samAccountName) to a GUID
+    *
+    * @param string $username The username to query
+    * @return string
+    */
+    public function username2guid($username) {
+        if (!$this->_bind){ return (false); }
+        if ($username === null){ return ("Missing compulsory field [username]"); }
+
+        $filter = "samaccountname=" . $username;
+        $fields = array("objectGUID");
+        $sr = @ldap_search($this->_conn, $this->_base_dn, $filter, $fields);
+        if (ldap_count_entries($this->_conn, $sr) > 0) {
+            $entry = @ldap_first_entry($this->_conn, $sr);
+            $guid = @ldap_get_values_len($this->_conn, $entry, 'objectGUID');
+            $strGUID = $this->binary2text($guid[0]);
+            return ($strGUID);
+        }
+        else {
+            return (false);
+        }
+    }
+
+    //*****************************************************************************************************************
+    // CONTACT FUNCTIONS
+    // * Still work to do in this area, and new functions to write
+
+    /**
+    * Create a contact
+    *
+    * @param array $attributes The attributes to set to the contact
+    * @return bool
+    */
+    public function contact_create($attributes){
+        // Check for compulsory fields
+        if (!array_key_exists("display_name",$attributes)){ return ("Missing compulsory field [display_name]"); }
+        if (!array_key_exists("email",$attributes)){ return ("Missing compulsory field [email]"); }
+        if (!array_key_exists("container",$attributes)){ return ("Missing compulsory field [container]"); }
+        if (!is_array($attributes["container"])){ return ("Container attribute must be an array."); }
+
+        // Translate the schema
+        $add=$this->adldap_schema($attributes);
+
+        // Additional stuff only used for adding contacts
+        $add["cn"][0]=$attributes["display_name"];
+        $add["objectclass"][0]="top";
+        $add["objectclass"][1]="person";
+        $add["objectclass"][2]="organizationalPerson";
+        $add["objectclass"][3]="contact";
+        if (!isset($attributes['exchange_hidefromlists'])) {
+            $add["msExchHideFromAddressLists"][0]="TRUE";
+        }
+
+        // Determine the container
+        $attributes["container"]=array_reverse($attributes["container"]);
+        $container="OU=".implode(",OU=",$attributes["container"]);
+
+        // Add the entry
+        $result=@ldap_add($this->_conn, "CN=".$add["cn"][0].", ".$container.",".$this->_base_dn, $add);
+        if ($result!=true){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Determine the list of groups a contact is a member of
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param bool $recursive Recursively check groups
+    * @return array
+    */
+    public function contact_groups($distinguishedname,$recursive=NULL){
+        if ($distinguishedname===NULL){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        // Search the directory for their information
+        $info=@$this->contact_info($distinguishedname,array("memberof","primarygroupid"));
+        $groups=$this->nice_names($info[0]["memberof"]); //presuming the entry returned is our contact
+
+        if ($recursive === true){
+            foreach ($groups as $id => $group_name){
+                $extra_groups=$this->recursive_groups($group_name);
+                $groups=array_merge($groups,$extra_groups);
+            }
+        }
+
+        return ($groups);
+    }
+
+    /**
+    * Get contact information
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param array $fields Attributes to be returned
+    * @return array
+    */
+    public function contact_info($distinguishedname,$fields=NULL){
+        if ($distinguishedname===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        $filter="distinguishedName=".$distinguishedname;
+        if ($fields===NULL){ $fields=array("distinguishedname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        if ($entries[0]['count'] >= 1) {
+            // AD does not return the primary group in the ldap query, we may need to fudge it
+            if ($this->_real_primarygroup && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["primarygroupid"][0])){
+                //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                $entries[0]["memberof"][]=$this->get_primary_group($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+            } else {
+                $entries[0]["memberof"][]="CN=Domain Users,CN=Users,".$this->_base_dn;
+            }
+        }
+
+        $entries[0]["memberof"]["count"]++;
+        return ($entries);
+    }
+
+    /**
+    * Determine if a contact is a member of a group
+    *
+    * @param string $distinguisedname The full DN of a contact
+    * @param string $group The group name to query
+    * @param bool $recursive Recursively check groups
+    * @return bool
+    */
+    public function contact_ingroup($distinguisedname,$group,$recursive=NULL){
+        if ($distinguisedname===NULL){ return (false); }
+        if ($group===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+
+        // Get a list of the groups
+        $groups=$this->contact_groups($distinguisedname,array("memberof"),$recursive);
+
+        // Return true if the specified group is in the group list
+        if (in_array($group,$groups)){ return (true); }
+
+        return (false);
+    }
+
+    /**
+    * Modify a contact
+    *
+    * @param string $distinguishedname The contact to query
+    * @param array $attributes The attributes to modify.  Note if you set the enabled attribute you must not specify any other attributes
+    * @return bool
+    */
+    public function contact_modify($distinguishedname,$attributes){
+        if ($distinguishedname===NULL){ return ("Missing compulsory field [distinguishedname]"); }
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod){ return (false); }
+
+        // Do the update
+        $result=ldap_modify($this->_conn,$distinguishedname,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Delete a contact
+    *
+    * @param string $distinguishedname The contact dn to delete (please be careful here!)
+    * @return array
+    */
+    public function contact_delete($distinguishedname) {
+        $result = $this->dn_delete($distinguishedname);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Return a list of all contacts
+    *
+    * @param bool $include_desc Include a description of a contact
+    * @param string $search The search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all_contacts($include_desc = false, $search = "*", $sorted = true){
+        if (!$this->_bind){ return (false); }
+
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=contact)(cn=".$search."))";
+        $fields=array("displayname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        $users_array = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($include_desc && strlen($entries[$i]["displayname"][0])>0){
+                $users_array[ $entries[$i]["distinguishedname"][0] ] = $entries[$i]["displayname"][0];
+            } elseif ($include_desc){
+                $users_array[ $entries[$i]["distinguishedname"][0] ] = $entries[$i]["distinguishedname"][0];
+            } else {
+                array_push($users_array, $entries[$i]["distinguishedname"][0]);
+            }
+        }
+        if ($sorted){ asort($users_array); }
+        return ($users_array);
+    }
+
+    //*****************************************************************************************************************
+    // FOLDER FUNCTIONS
+
+    /**
+    * Returns a folder listing for a specific OU
+    * See http://adldap.sourceforge.net/wiki/doku.php?id=api_folder_functions
+    *
+    * @param array $folder_name An array to the OU you wish to list.
+    *                           If set to NULL will list the root, strongly recommended to set
+    *                           $recursive to false in that instance!
+    * @param string $dn_type The type of record to list.  This can be ADLDAP_FOLDER or ADLDAP_CONTAINER.
+    * @param bool $recursive Recursively search sub folders
+    * @param bool $type Specify a type of object to search for
+    * @return array
+    */
+    public function folder_list($folder_name = NULL, $dn_type = ADLDAP_FOLDER, $recursive = NULL, $type = NULL) {
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        $filter = '(&';
+        if ($type !== NULL) {
+            switch ($type) {
+                case 'contact':
+                    $filter .= '(objectClass=contact)';
+                    break;
+                case 'computer':
+                    $filter .= '(objectClass=computer)';
+                    break;
+                case 'group':
+                    $filter .= '(objectClass=group)';
+                    break;
+                case 'folder':
+                    $filter .= '(objectClass=organizationalUnit)';
+                    break;
+                case 'container':
+                    $filter .= '(objectClass=container)';
+                    break;
+                case 'domain':
+                    $filter .= '(objectClass=builtinDomain)';
+                    break;
+                default:
+                    $filter .= '(objectClass=user)';
+                    break;
+            }
+        }
+        else {
+            $filter .= '(objectClass=*)';
+        }
+        // If the folder name is null then we will search the root level of AD
+        // This requires us to not have an OU= part, just the base_dn
+        $searchou = $this->_base_dn;
+        if (is_array($folder_name)) {
+            $ou = $dn_type . "=".implode("," . $dn_type . "=",$folder_name);
+            $filter .= '(!(distinguishedname=' . $ou . ',' . $this->_base_dn . ')))';
+            $searchou = $ou . ',' . $this->_base_dn;
+        }
+        else {
+            $filter .= '(!(distinguishedname=' . $this->_base_dn . ')))';
+        }
+
+        if ($recursive === true) {
+            $sr=ldap_search($this->_conn, $searchou, $filter, array('objectclass', 'distinguishedname', 'samaccountname'));
+            $entries = @ldap_get_entries($this->_conn, $sr);
+            if (is_array($entries)) {
+                return $entries;
+            }
+        }
+        else {
+            $sr=ldap_list($this->_conn, $searchou, $filter, array('objectclass', 'distinguishedname', 'samaccountname'));
+            $entries = @ldap_get_entries($this->_conn, $sr);
+            if (is_array($entries)) {
+                return $entries;
+            }
+        }
+
+        return false;
+    }
+
+    //*****************************************************************************************************************
+    // COMPUTER FUNCTIONS
+
+    /**
+    * Get information about a specific computer
+    *
+    * @param string $computer_name The name of the computer
+    * @param array $fields Attributes to return
+    * @return array
+    */
+    public function computer_info($computer_name,$fields=NULL){
+        if ($computer_name===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+
+        $filter="(&(objectClass=computer)(cn=".$computer_name."))";
+        if ($fields===NULL){ $fields=array("memberof","cn","displayname","dnshostname","distinguishedname","objectcategory","operatingsystem","operatingsystemservicepack","operatingsystemversion"); }
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        return ($entries);
+    }
+
+    /**
+    * Check if a computer is in a group
+    *
+    * @param string $computer_name The name of the computer
+    * @param string $group The group to check
+    * @param bool $recursive Whether to check recursively
+    * @return array
+    */
+    public function computer_ingroup($computer_name,$group,$recursive=NULL){
+        if ($computer_name===NULL){ return (false); }
+        if ($group===NULL){ return (false); }
+        if (!$this->_bind){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } // use the default option if they haven't set it
+
+        //get a list of the groups
+        $groups=$this->computer_groups($computer_name,array("memberof"),$recursive);
+
+        //return true if the specified group is in the group list
+        if (in_array($group,$groups)){ return (true); }
+
+        return (false);
+    }
+
+    /**
+    * Get the groups a computer is in
+    *
+    * @param string $computer_name The name of the computer
+    * @param bool $recursive Whether to check recursively
+    * @return array
+    */
+    public function computer_groups($computer_name,$recursive=NULL){
+        if ($computer_name===NULL){ return (false); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; } //use the default option if they haven't set it
+        if (!$this->_bind){ return (false); }
+
+        //search the directory for their information
+        $info=@$this->computer_info($computer_name,array("memberof","primarygroupid"));
+        $groups=$this->nice_names($info[0]["memberof"]); //presuming the entry returned is our guy (unique usernames)
+
+        if ($recursive === true){
+            foreach ($groups as $id => $group_name){
+              $extra_groups=$this->recursive_groups($group_name);
+              $groups=array_merge($groups,$extra_groups);
+            }
+        }
+
+        return ($groups);
+    }
+
+    //************************************************************************************************************
+    // EXCHANGE FUNCTIONS
+
+    /**
+    * Create an Exchange account
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param array $storagegroup The mailbox, Exchange Storage Group, for the user account, this must be a full CN
+    *                            If the storage group has a different base_dn to the adLDAP configuration, set it using $base_dn
+    * @param string $emailaddress The primary email address to add to this user
+    * @param string $mailnickname The mail nick name.  If mail nickname is blank, the username will be used
+    * @param bool $usedefaults Indicates whether the store should use the default quota, rather than the per-mailbox quota.
+    * @param string $base_dn Specify an alternative base_dn for the Exchange storage group
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function exchange_create_mailbox($username, $storagegroup, $emailaddress, $mailnickname=NULL, $usedefaults=TRUE, $base_dn=NULL, $isGUID=false){
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if ($storagegroup===NULL){ return ("Missing compulsory array [storagegroup]"); }
+        if (!is_array($storagegroup)){ return ("[storagegroup] must be an array"); }
+        if ($emailaddress===NULL){ return ("Missing compulsory field [emailaddress]"); }
+
+        if ($base_dn===NULL) {
+            $base_dn = $this->_base_dn;
+        }
+
+        $container="CN=".implode(",CN=",$storagegroup);
+
+        if ($mailnickname===NULL) { $mailnickname=$username; }
+        $mdbUseDefaults = $this->bool2str($usedefaults);
+
+        $attributes = array(
+            'exchange_homemdb'=>$container.",".$base_dn,
+            'exchange_proxyaddress'=>'SMTP:' . $emailaddress,
+            'exchange_mailnickname'=>$mailnickname,
+            'exchange_usedefaults'=>$mdbUseDefaults
+        );
+        $result = $this->user_modify($username,$attributes,$isGUID);
+        if ($result==false){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Add an X400 address to Exchange
+    * See http://tools.ietf.org/html/rfc1685 for more information.
+    * An X400 Address looks similar to this X400:c=US;a= ;p=Domain;o=Organization;s=Doe;g=John;
+    *
+    * @param string $username The username of the user to add the X400 to to
+    * @param string $country Country
+    * @param string $admd Administration Management Domain
+    * @param string $pdmd Private Management Domain (often your AD domain)
+    * @param string $org Organization
+    * @param string $surname Surname
+    * @param string $givenName Given name
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function exchange_add_X400($username, $country, $admd, $pdmd, $org, $surname, $givenname, $isGUID=false) {
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+
+        $proxyvalue = 'X400:';
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"]===NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        // We do not have to demote an email address from the default so we can just add the new proxy address
+        $attributes['exchange_proxyaddress'] = $proxyvalue . 'c=' . $country . ';a=' . $admd . ';p=' . $pdmd . ';o=' . $org . ';s=' . $surname . ';g=' . $givenname . ';';
+
+        // Translate the update to the LDAP schema
+        $add=$this->adldap_schema($attributes);
+
+        if (!$add){ return (false); }
+
+        // Do the update
+        // Take out the @ to see any errors, usually this error might occur because the address already
+        // exists in the list of proxyAddresses
+        $result=@ldap_mod_add($this->_conn,$user_dn,$add);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Add an address to Exchange
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to add to this user
+    * @param bool $default Make this email address the default address, this is a bit more intensive as we have to demote any existing default addresses
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function exchange_add_address($username, $emailaddress, $default=FALSE, $isGUID=false) {
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress===NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        $proxyvalue = 'smtp:';
+        if ($default === true) {
+            $proxyvalue = 'SMTP:';
+        }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"),$isGUID);
+        if ($user[0]["dn"]===NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        // We need to scan existing proxy addresses and demote the default one
+        if (is_array($user[0]["proxyaddresses"]) && $default===true) {
+            $modaddresses = array();
+            for ($i=0;$i<sizeof($user[0]['proxyaddresses']);$i++) {
+                if (strstr($user[0]['proxyaddresses'][$i], 'SMTP:') !== false) {
+                    $user[0]['proxyaddresses'][$i] = str_replace('SMTP:', 'smtp:', $user[0]['proxyaddresses'][$i]);
+                }
+                if ($user[0]['proxyaddresses'][$i] != '') {
+                    $modaddresses['proxyAddresses'][$i] = $user[0]['proxyaddresses'][$i];
+                }
+            }
+            $modaddresses['proxyAddresses'][(sizeof($user[0]['proxyaddresses'])-1)] = 'SMTP:' . $emailaddress;
+
+            $result=@ldap_mod_replace($this->_conn,$user_dn,$modaddresses);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+        else {
+            // We do not have to demote an email address from the default so we can just add the new proxy address
+            $attributes['exchange_proxyaddress'] = $proxyvalue . $emailaddress;
+
+            // Translate the update to the LDAP schema
+            $add=$this->adldap_schema($attributes);
+
+            if (!$add){ return (false); }
+
+            // Do the update
+            // Take out the @ to see any errors, usually this error might occur because the address already
+            // exists in the list of proxyAddresses
+            $result=@ldap_mod_add($this->_conn,$user_dn,$add);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+    }
+
+    /**
+    * Remove an address to Exchange
+    * If you remove a default address the account will no longer have a default,
+    * we recommend changing the default address first
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to add to this user
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function exchange_del_address($username, $emailaddress, $isGUID=false) {
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress===NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"),$isGUID);
+        if ($user[0]["dn"]===NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        if (is_array($user[0]["proxyaddresses"])) {
+            $mod = array();
+            for ($i=0;$i<sizeof($user[0]['proxyaddresses']);$i++) {
+                if (strstr($user[0]['proxyaddresses'][$i], 'SMTP:') !== false && $user[0]['proxyaddresses'][$i] == 'SMTP:' . $emailaddress) {
+                    $mod['proxyAddresses'][0] = 'SMTP:' . $emailaddress;
+                }
+                elseif (strstr($user[0]['proxyaddresses'][$i], 'smtp:') !== false && $user[0]['proxyaddresses'][$i] == 'smtp:' . $emailaddress) {
+                    $mod['proxyAddresses'][0] = 'smtp:' . $emailaddress;
+                }
+            }
+
+            $result=@ldap_mod_del($this->_conn,$user_dn,$mod);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+        else {
+            return (false);
+        }
+    }
+    /**
+    * Change the default address
+    *
+    * @param string $username The username of the user to add the Exchange account to
+    * @param string $emailaddress The email address to make default
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function exchange_primary_address($username, $emailaddress, $isGUID=false) {
+        if ($username===NULL){ return ("Missing compulsory field [username]"); }
+        if ($emailaddress===NULL) { return ("Missing compulsory fields [emailaddress]"); }
+
+        // Find the dn of the user
+        $user=$this->user_info($username,array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"]===NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+
+        if (is_array($user[0]["proxyaddresses"])) {
+            $modaddresses = array();
+            for ($i=0;$i<sizeof($user[0]['proxyaddresses']);$i++) {
+                if (strstr($user[0]['proxyaddresses'][$i], 'SMTP:') !== false) {
+                    $user[0]['proxyaddresses'][$i] = str_replace('SMTP:', 'smtp:', $user[0]['proxyaddresses'][$i]);
+                }
+                if ($user[0]['proxyaddresses'][$i] == 'smtp:' . $emailaddress) {
+                    $user[0]['proxyaddresses'][$i] = str_replace('smtp:', 'SMTP:', $user[0]['proxyaddresses'][$i]);
+                }
+                if ($user[0]['proxyaddresses'][$i] != '') {
+                    $modaddresses['proxyAddresses'][$i] = $user[0]['proxyaddresses'][$i];
+                }
+            }
+
+            $result=@ldap_mod_replace($this->_conn,$user_dn,$modaddresses);
+            if ($result==false){ return (false); }
+
+            return (true);
+        }
+
+    }
+
+    /**
+    * Mail enable a contact
+    * Allows email to be sent to them through Exchange
+    *
+    * @param string $distinguishedname The contact to mail enable
+    * @param string $emailaddress The email address to allow emails to be sent through
+    * @param string $mailnickname The mailnickname for the contact in Exchange.  If NULL this will be set to the display name
+    * @return bool
+    */
+    public function exchange_contact_mailenable($distinguishedname, $emailaddress, $mailnickname=NULL){
+        if ($distinguishedname===NULL){ return ("Missing compulsory field [distinguishedname]"); }
+        if ($emailaddress===NULL){ return ("Missing compulsory field [emailaddress]"); }
+
+        if ($mailnickname !== NULL) {
+            // Find the dn of the user
+            $user=$this->contact_info($distinguishedname,array("cn","displayname"));
+            if ($user[0]["displayname"]===NULL){ return (false); }
+            $mailnickname = $user[0]['displayname'][0];
+        }
+
+        $attributes = array("email"=>$emailaddress,"contact_email"=>"SMTP:" . $emailaddress,"exchange_proxyaddress"=>"SMTP:" . $emailaddress,"exchange_mailnickname"=>$mailnickname);
+
+        // Translate the update to the LDAP schema
+        $mod=$this->adldap_schema($attributes);
+
+        // Check to see if this is an enabled status update
+        if (!$mod){ return (false); }
+
+        // Do the update
+        $result=ldap_modify($this->_conn,$distinguishedname,$mod);
+        if ($result==false){ return (false); }
+
+        return (true);
+    }
+
+    /**
+    * Returns a list of Exchange Servers in the ConfigurationNamingContext of the domain
+    *
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @return array
+    */
+    public function exchange_servers($attributes = array('cn','distinguishedname','serialnumber')) {
+        if (!$this->_bind){ return (false); }
+
+        $configurationNamingContext = $this->get_root_dse(array('configurationnamingcontext'));
+        $sr = @ldap_search($this->_conn,$configurationNamingContext[0]['configurationnamingcontext'][0],'(&(objectCategory=msExchExchangeServer))',$attributes);
+        $entries = @ldap_get_entries($this->_conn, $sr);
+        return $entries;
+    }
+
+    /**
+    * Returns a list of Storage Groups in Exchange for a given mail server
+    *
+    * @param string $exchangeServer The full DN of an Exchange server.  You can use exchange_servers() to find the DN for your server
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @param bool $recursive If enabled this will automatically query the databases within a storage group
+    * @return array
+    */
+    public function exchange_storage_groups($exchangeServer, $attributes = array('cn','distinguishedname'), $recursive = NULL) {
+        if (!$this->_bind){ return (false); }
+        if ($exchangeServer===NULL){ return ("Missing compulsory field [exchangeServer]"); }
+        if ($recursive===NULL){ $recursive=$this->_recursive_groups; }
+
+        $filter = '(&(objectCategory=msExchStorageGroup))';
+        $sr=@ldap_search($this->_conn, $exchangeServer, $filter, $attributes);
+        $entries = @ldap_get_entries($this->_conn, $sr);
+
+        if ($recursive === true) {
+            for ($i=0; $i<$entries['count']; $i++) {
+                $entries[$i]['msexchprivatemdb'] = $this->exchange_storage_databases($entries[$i]['distinguishedname'][0]);
+            }
+        }
+
+        return $entries;
+    }
+
+    /**
+    * Returns a list of Databases within any given storage group in Exchange for a given mail server
+    *
+    * @param string $storageGroup The full DN of an Storage Group.  You can use exchange_storage_groups() to find the DN
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @return array
+    */
+    public function exchange_storage_databases($storageGroup, $attributes = array('cn','distinguishedname','displayname')) {
+        if (!$this->_bind){ return (false); }
+        if ($storageGroup===NULL){ return ("Missing compulsory field [storageGroup]"); }
+
+        $filter = '(&(objectCategory=msExchPrivateMDB))';
+        $sr=@ldap_search($this->_conn, $storageGroup, $filter, $attributes);
+        $entries = @ldap_get_entries($this->_conn, $sr);
+        return $entries;
+    }
+
+    //************************************************************************************************************
+    // SERVER FUNCTIONS
+
+    /**
+    * Find the Base DN of your domain controller
+    *
+    * @return string
+    */
+    public function find_base_dn() {
+        $namingContext = $this->get_root_dse(array('defaultnamingcontext'));
+        return $namingContext[0]['defaultnamingcontext'][0];
+    }
+
+    /**
+    * Get the RootDSE properties from a domain controller
+    *
+    * @param array $attributes The attributes you wish to query e.g. defaultnamingcontext
+    * @return array
+    */
+    public function get_root_dse($attributes = array("*", "+")) {
+        if (!$this->_bind){ return (false); }
+
+        $sr = @ldap_read($this->_conn, NULL, 'objectClass=*', $attributes);
+        $entries = @ldap_get_entries($this->_conn, $sr);
+        return $entries;
+    }
+
+    //************************************************************************************************************
+    // UTILITY FUNCTIONS (Many of these functions are protected and can only be called from within the class)
+
+    /**
+    * Get last error from Active Directory
+    *
+    * This function gets the last message from Active Directory
+    * This may indeed be a 'Success' message but if you get an unknown error
+    * it might be worth calling this function to see what errors were raised
+    *
+    * return string
+    */
+    public function get_last_error() {
+        return @ldap_error($this->_conn);
+    }
+
+    /**
+    * Detect LDAP support in php
+    *
+    * @return bool
+    */
+    protected function ldap_supported() {
+        if (!function_exists('ldap_connect')) {
+            return (false);
+        }
+        return (true);
+    }
+
+    /**
+    * Schema
+    *
+    * @param array $attributes Attributes to be queried
+    * @return array
+    */
+    protected function adldap_schema($attributes){
+
+        // LDAP doesn't like NULL attributes, only set them if they have values
+        // If you wish to remove an attribute you should set it to a space
+        // TO DO: Adapt user_modify to use ldap_mod_delete to remove a NULL attribute
+        $mod=array();
+
+        // Check every attribute to see if it contains 8bit characters and then UTF8 encode them
+        array_walk($attributes, array($this, 'encode8bit'));
+
+        if ($attributes["address_city"]){ $mod["l"][0]=$attributes["address_city"]; }
+        if ($attributes["address_code"]){ $mod["postalCode"][0]=$attributes["address_code"]; }
+        //if ($attributes["address_country"]){ $mod["countryCode"][0]=$attributes["address_country"]; } // use country codes?
+        if ($attributes["address_country"]){ $mod["c"][0]=$attributes["address_country"]; }
+        if ($attributes["address_pobox"]){ $mod["postOfficeBox"][0]=$attributes["address_pobox"]; }
+        if ($attributes["address_state"]){ $mod["st"][0]=$attributes["address_state"]; }
+        if ($attributes["address_street"]){ $mod["streetAddress"][0]=$attributes["address_street"]; }
+        if ($attributes["company"]){ $mod["company"][0]=$attributes["company"]; }
+        if ($attributes["change_password"]){ $mod["pwdLastSet"][0]=0; }
+        if ($attributes["department"]){ $mod["department"][0]=$attributes["department"]; }
+        if ($attributes["description"]){ $mod["description"][0]=$attributes["description"]; }
+        if ($attributes["display_name"]){ $mod["displayName"][0]=$attributes["display_name"]; }
+        if ($attributes["email"]){ $mod["mail"][0]=$attributes["email"]; }
+        if ($attributes["expires"]){ $mod["accountExpires"][0]=$attributes["expires"]; } //unix epoch format?
+        if ($attributes["firstname"]){ $mod["givenName"][0]=$attributes["firstname"]; }
+        if ($attributes["home_directory"]){ $mod["homeDirectory"][0]=$attributes["home_directory"]; }
+        if ($attributes["home_drive"]){ $mod["homeDrive"][0]=$attributes["home_drive"]; }
+        if ($attributes["initials"]){ $mod["initials"][0]=$attributes["initials"]; }
+        if ($attributes["logon_name"]){ $mod["userPrincipalName"][0]=$attributes["logon_name"]; }
+        if ($attributes["manager"]){ $mod["manager"][0]=$attributes["manager"]; }  //UNTESTED ***Use DistinguishedName***
+        if ($attributes["office"]){ $mod["physicalDeliveryOfficeName"][0]=$attributes["office"]; }
+        if ($attributes["password"]){ $mod["unicodePwd"][0]=$this->encode_password($attributes["password"]); }
+        if ($attributes["profile_path"]){ $mod["profilepath"][0]=$attributes["profile_path"]; }
+        if ($attributes["script_path"]){ $mod["scriptPath"][0]=$attributes["script_path"]; }
+        if ($attributes["surname"]){ $mod["sn"][0]=$attributes["surname"]; }
+        if ($attributes["title"]){ $mod["title"][0]=$attributes["title"]; }
+        if ($attributes["telephone"]){ $mod["telephoneNumber"][0]=$attributes["telephone"]; }
+        if ($attributes["mobile"]){ $mod["mobile"][0]=$attributes["mobile"]; }
+        if ($attributes["pager"]){ $mod["pager"][0]=$attributes["pager"]; }
+        if ($attributes["ipphone"]){ $mod["ipphone"][0]=$attributes["ipphone"]; }
+        if ($attributes["web_page"]){ $mod["wWWHomePage"][0]=$attributes["web_page"]; }
+        if ($attributes["fax"]){ $mod["facsimileTelephoneNumber"][0]=$attributes["fax"]; }
+        if ($attributes["enabled"]){ $mod["userAccountControl"][0]=$attributes["enabled"]; }
+
+        // Distribution List specific schema
+        if ($attributes["group_sendpermission"]){ $mod["dlMemSubmitPerms"][0]=$attributes["group_sendpermission"]; }
+        if ($attributes["group_rejectpermission"]){ $mod["dlMemRejectPerms"][0]=$attributes["group_rejectpermission"]; }
+
+        // Exchange Schema
+        if ($attributes["exchange_homemdb"]){ $mod["homeMDB"][0]=$attributes["exchange_homemdb"]; }
+        if ($attributes["exchange_mailnickname"]){ $mod["mailNickname"][0]=$attributes["exchange_mailnickname"]; }
+        if ($attributes["exchange_proxyaddress"]){ $mod["proxyAddresses"][0]=$attributes["exchange_proxyaddress"]; }
+        if ($attributes["exchange_usedefaults"]){ $mod["mDBUseDefaults"][0]=$attributes["exchange_usedefaults"]; }
+        if ($attributes["exchange_policyexclude"]){ $mod["msExchPoliciesExcluded"][0]=$attributes["exchange_policyexclude"]; }
+        if ($attributes["exchange_policyinclude"]){ $mod["msExchPoliciesIncluded"][0]=$attributes["exchange_policyinclude"]; }
+
+        // This schema is designed for contacts
+        if ($attributes["exchange_hidefromlists"]){ $mod["msExchHideFromAddressLists"][0]=$attributes["exchange_hidefromlists"]; }
+        if ($attributes["contact_email"]){ $mod["targetAddress"][0]=$attributes["contact_email"]; }
+
+        //echo ("<pre>"); print_r($mod);
+        /*
+        // modifying a name is a bit fiddly
+        if ($attributes["firstname"] && $attributes["surname"]){
+            $mod["cn"][0]=$attributes["firstname"]." ".$attributes["surname"];
+            $mod["displayname"][0]=$attributes["firstname"]." ".$attributes["surname"];
+            $mod["name"][0]=$attributes["firstname"]." ".$attributes["surname"];
+        }
+        */
+
+        if (count($mod)==0){ return (false); }
+        return ($mod);
+    }
+
+    /**
+    * Coping with AD not returning the primary group
+    * http://support.microsoft.com/?kbid=321360
+    *
+    * For some reason it's not possible to search on primarygrouptoken=XXX
+    * If someone can show otherwise, I'd like to know about it :)
+    * this way is resource intensive and generally a pain in the @#%^
+    *
+    * @deprecated deprecated since version 3.1, see get get_primary_group
+    * @param string $gid Group ID
+    * @return string
+    */
+    protected function group_cn($gid){
+        if ($gid===NULL){ return (false); }
+        $r=false;
+
+        $filter="(&(objectCategory=group)(samaccounttype=". ADLDAP_SECURITY_GLOBAL_GROUP ."))";
+        $fields=array("primarygrouptoken","samaccountname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($entries[$i]["primarygrouptoken"][0]==$gid){
+                $r=$entries[$i]["distinguishedname"][0];
+                $i=$entries["count"];
+            }
+        }
+
+        return ($r);
+    }
+
+    /**
+    * Coping with AD not returning the primary group
+    * http://support.microsoft.com/?kbid=321360
+    *
+    * This is a re-write based on code submitted by Bruce which prevents the
+    * need to search each security group to find the true primary group
+    *
+    * @param string $gid Group ID
+    * @param string $usersid User's Object SID
+    * @return string
+    */
+    protected function get_primary_group($gid, $usersid){
+        if ($gid===NULL || $usersid===NULL){ return (false); }
+        $r=false;
+
+        $gsid = substr_replace($usersid,pack('V',$gid),strlen($usersid)-4,4);
+        $filter='(objectsid='.$this->getTextSID($gsid).')';
+        $fields=array("samaccountname","distinguishedname");
+        $sr=ldap_search($this->_conn,$this->_base_dn,$filter,$fields);
+        $entries = ldap_get_entries($this->_conn, $sr);
+
+        return $entries[0]['distinguishedname'][0];
+     }
+
+    /**
+    * Convert a binary SID to a text SID
+    *
+    * @param string $binsid A Binary SID
+    * @return string
+    */
+     protected function getTextSID($binsid) {
+        $hex_sid = bin2hex($binsid);
+        $rev = hexdec(substr($hex_sid, 0, 2));
+        $subcount = hexdec(substr($hex_sid, 2, 2));
+        $auth = hexdec(substr($hex_sid, 4, 12));
+        $result = "$rev-$auth";
+
+        for ($x=0;$x < $subcount; $x++) {
+            $subauth[$x] =
+                hexdec($this->little_endian(substr($hex_sid, 16 + ($x * 8), 8)));
+                $result .= "-" . $subauth[$x];
+        }
+
+        // Cheat by tacking on the S-
+        return 'S-' . $result;
+     }
+
+    /**
+    * Converts a little-endian hex number to one that hexdec() can convert
+    *
+    * @param string $hex A hex code
+    * @return string
+    */
+     protected function little_endian($hex) {
+        $result = '';
+        for ($x = strlen($hex) - 2; $x >= 0; $x = $x - 2) {
+            $result .= substr($hex, $x, 2);
+        }
+        return $result;
+     }
+
+    /**
+    * Converts a binary attribute to a string
+    *
+    * @param string $bin A binary LDAP attribute
+    * @return string
+    */
+    protected function binary2text($bin) {
+        $hex_guid = bin2hex($bin);
+        $hex_guid_to_guid_str = '';
+        for($k = 1; $k <= 4; ++$k) {
+            $hex_guid_to_guid_str .= substr($hex_guid, 8 - 2 * $k, 2);
+        }
+        $hex_guid_to_guid_str .= '-';
+        for($k = 1; $k <= 2; ++$k) {
+            $hex_guid_to_guid_str .= substr($hex_guid, 12 - 2 * $k, 2);
+        }
+        $hex_guid_to_guid_str .= '-';
+        for($k = 1; $k <= 2; ++$k) {
+            $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2);
+        }
+        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4);
+        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20);
+        return strtoupper($hex_guid_to_guid_str);
+    }
+
+    /**
+    * Converts a binary GUID to a string GUID
+    *
+    * @param string $binaryGuid The binary GUID attribute to convert
+    * @return string
+    */
+    public function decodeGuid($binaryGuid) {
+        if ($binaryGuid === null){ return ("Missing compulsory field [binaryGuid]"); }
+
+        $strGUID = $this->binary2text($binaryGuid);
+        return ($strGUID);
+    }
+
+    /**
+    * Converts a string GUID to a hexdecimal value so it can be queried
+    *
+    * @param string $strGUID A string representation of a GUID
+    * @return string
+    */
+    protected function strguid2hex($strGUID) {
+        $strGUID = str_replace('-', '', $strGUID);
+
+        $octet_str = '\\' . substr($strGUID, 6, 2);
+        $octet_str .= '\\' . substr($strGUID, 4, 2);
+        $octet_str .= '\\' . substr($strGUID, 2, 2);
+        $octet_str .= '\\' . substr($strGUID, 0, 2);
+        $octet_str .= '\\' . substr($strGUID, 10, 2);
+        $octet_str .= '\\' . substr($strGUID, 8, 2);
+        $octet_str .= '\\' . substr($strGUID, 14, 2);
+        $octet_str .= '\\' . substr($strGUID, 12, 2);
+        //$octet_str .= '\\' . substr($strGUID, 16, strlen($strGUID));
+        for ($i=16; $i<=(strlen($strGUID)-2); $i++) {
+            if (($i % 2) == 0) {
+                $octet_str .= '\\' . substr($strGUID, $i, 2);
+            }
+        }
+
+        return $octet_str;
+    }
+
+    /**
+    * Obtain the user's distinguished name based on their userid
+    *
+    *
+    * @param string $username The username
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return string
+    */
+    protected function user_dn($username,$isGUID=false){
+        $user=$this->user_info($username,array("cn"),$isGUID);
+        if ($user[0]["dn"]===NULL){ return (false); }
+        $user_dn=$user[0]["dn"];
+        return ($user_dn);
+    }
+
+    /**
+    * Encode a password for transmission over LDAP
+    *
+    * @param string $password The password to encode
+    * @return string
+    */
+    protected function encode_password($password){
+        $password="\"".$password."\"";
+        $encoded="";
+        for ($i=0; $i <strlen($password); $i++){ $encoded.="{$password{$i}}\000"; }
+        return ($encoded);
+    }
+
+    /**
+    * Escape strings for the use in LDAP filters
+    *
+    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+    * Ported from Perl's Net::LDAP::Util escape_filter_value
+    *
+    * @param string $str The string the parse
+    * @author Port by Andreas Gohr <andi@splitbrain.org>
+    * @return string
+    */
+    protected function ldap_slashes($str){
+        return preg_replace('/([\x00-\x1F\*\(\)\\\\])/e',
+                            '"\\\\\".join("",unpack("H2","$1"))',
+                            $str);
+    }
+
+    /**
+    * Select a random domain controller from your domain controller array
+    *
+    * @return string
+    */
+    protected function random_controller(){
+        mt_srand(doubleval(microtime()) * 100000000); // For older PHP versions
+        return ($this->_domain_controllers[array_rand($this->_domain_controllers)]);
+    }
+
+    /**
+    * Account control options
+    *
+    * @param array $options The options to convert to int
+    * @return int
+    */
+    protected function account_control($options){
+        $val=0;
+
+        if (is_array($options)){
+            if (in_array("SCRIPT",$options)){ $val=$val+1; }
+            if (in_array("ACCOUNTDISABLE",$options)){ $val=$val+2; }
+            if (in_array("HOMEDIR_REQUIRED",$options)){ $val=$val+8; }
+            if (in_array("LOCKOUT",$options)){ $val=$val+16; }
+            if (in_array("PASSWD_NOTREQD",$options)){ $val=$val+32; }
+            //PASSWD_CANT_CHANGE Note You cannot assign this permission by directly modifying the UserAccountControl attribute.
+            //For information about how to set the permission programmatically, see the "Property flag descriptions" section.
+            if (in_array("ENCRYPTED_TEXT_PWD_ALLOWED",$options)){ $val=$val+128; }
+            if (in_array("TEMP_DUPLICATE_ACCOUNT",$options)){ $val=$val+256; }
+            if (in_array("NORMAL_ACCOUNT",$options)){ $val=$val+512; }
+            if (in_array("INTERDOMAIN_TRUST_ACCOUNT",$options)){ $val=$val+2048; }
+            if (in_array("WORKSTATION_TRUST_ACCOUNT",$options)){ $val=$val+4096; }
+            if (in_array("SERVER_TRUST_ACCOUNT",$options)){ $val=$val+8192; }
+            if (in_array("DONT_EXPIRE_PASSWORD",$options)){ $val=$val+65536; }
+            if (in_array("MNS_LOGON_ACCOUNT",$options)){ $val=$val+131072; }
+            if (in_array("SMARTCARD_REQUIRED",$options)){ $val=$val+262144; }
+            if (in_array("TRUSTED_FOR_DELEGATION",$options)){ $val=$val+524288; }
+            if (in_array("NOT_DELEGATED",$options)){ $val=$val+1048576; }
+            if (in_array("USE_DES_KEY_ONLY",$options)){ $val=$val+2097152; }
+            if (in_array("DONT_REQ_PREAUTH",$options)){ $val=$val+4194304; }
+            if (in_array("PASSWORD_EXPIRED",$options)){ $val=$val+8388608; }
+            if (in_array("TRUSTED_TO_AUTH_FOR_DELEGATION",$options)){ $val=$val+16777216; }
+        }
+        return ($val);
+    }
+
+    /**
+    * Take an LDAP query and return the nice names, without all the LDAP prefixes (eg. CN, DN)
+    *
+    * @param array $groups
+    * @return array
+    */
+    protected function nice_names($groups){
+
+        $group_array=array();
+        for ($i=0; $i<$groups["count"]; $i++){ // For each group
+            $line=$groups[$i];
+
+            if (strlen($line)>0){
+                // More presumptions, they're all prefixed with CN=
+                // so we ditch the first three characters and the group
+                // name goes up to the first comma
+                $bits=explode(",",$line);
+                $group_array[]=substr($bits[0],3,(strlen($bits[0])-3));
+            }
+        }
+        return ($group_array);
+    }
+
+    /**
+    * Delete a distinguished name from Active Directory
+    * You should never need to call this yourself, just use the wrapper functions user_delete and contact_delete
+    *
+    * @param string $dn The distinguished name to delete
+    * @return bool
+    */
+    protected function dn_delete($dn){
+        $result=ldap_delete($this->_conn, $dn);
+        if ($result!=true){ return (false); }
+        return (true);
+    }
+
+    /**
+    * Convert a boolean value to a string
+    * You should never need to call this yourself
+    *
+    * @param bool $bool Boolean value
+    * @return string
+    */
+    protected function bool2str($bool) {
+        return ($bool) ? 'TRUE' : 'FALSE';
+    }
+
+    /**
+    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+    */
+    protected function encode8bit(&$item, $key) {
+        $encode = false;
+        if (is_string($item)) {
+            for ($i=0; $i<strlen($item); $i++) {
+                if (ord($item[$i]) >> 7) {
+                    $encode = true;
+                }
+            }
+        }
+        if ($encode === true && $key != 'password') {
+            $item = utf8_encode($item);
+        }
+    }
+}
+
+/**
+* adLDAP Exception Handler
+*
+* Exceptions of this type are thrown on bind failure or when SSL is required but not configured
+* Example:
+* try {
+*   $adldap = new adLDAP();
+* }
+* catch (adLDAPException $e) {
+*   echo $e;
+*   exit();
+* }
+*/
+class adLDAPException extends Exception {}
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth.php
new file mode 100644
index 000000000..587e7c4e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth.php
@@ -0,0 +1,1099 @@
+<?php
+/**
+ * Authentication library
+ *
+ * Including this file will automatically try to login
+ * a user by calling auth_login()
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/io.php');
+
+// some ACL level defines
+define('AUTH_NONE',0);
+define('AUTH_READ',1);
+define('AUTH_EDIT',2);
+define('AUTH_CREATE',4);
+define('AUTH_UPLOAD',8);
+define('AUTH_DELETE',16);
+define('AUTH_ADMIN',255);
+
+global $conf;
+
+if($conf['useacl']){
+    require_once(DOKU_INC.'inc/blowfish.php');
+    require_once(DOKU_INC.'inc/mail.php');
+
+    global $auth;
+
+    // load the the backend auth functions and instantiate the auth object
+    if (@file_exists(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php')) {
+        require_once(DOKU_INC.'inc/auth/basic.class.php');
+        require_once(DOKU_INC.'inc/auth/'.$conf['authtype'].'.class.php');
+
+        $auth_class = "auth_".$conf['authtype'];
+        if (class_exists($auth_class)) {
+            $auth = new $auth_class();
+            if ($auth->success == false) {
+                // degrade to unauthenticated user
+                unset($auth);
+                auth_logoff();
+                msg($lang['authtempfail'], -1);
+            }
+        } else {
+            nice_die($lang['authmodfailed']);
+        }
+    } else {
+        nice_die($lang['authmodfailed']);
+    }
+}
+
+// do the login either by cookie or provided credentials
+if($conf['useacl']){
+    if($auth){
+        if (!isset($_REQUEST['u'])) $_REQUEST['u'] = '';
+        if (!isset($_REQUEST['p'])) $_REQUEST['p'] = '';
+        if (!isset($_REQUEST['r'])) $_REQUEST['r'] = '';
+        $_REQUEST['http_credentials'] = false;
+        if (!$conf['rememberme']) $_REQUEST['r'] = false;
+
+        // streamline HTTP auth credentials (IIS/rewrite -> mod_php)
+        if(isset($_SERVER['HTTP_AUTHORIZATION'])){
+            list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) =
+                explode(':', base64_decode(substr($_SERVER['HTTP_AUTHORIZATION'], 6)));
+        }
+
+        // if no credentials were given try to use HTTP auth (for SSO)
+        if(empty($_REQUEST['u']) && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])){
+            $_REQUEST['u'] = $_SERVER['PHP_AUTH_USER'];
+            $_REQUEST['p'] = $_SERVER['PHP_AUTH_PW'];
+            $_REQUEST['http_credentials'] = true;
+        }
+
+        // apply cleaning
+        $_REQUEST['u'] = $auth->cleanUser($_REQUEST['u']);
+
+        if(isset($_REQUEST['authtok'])){
+            // when an authentication token is given, trust the session
+            auth_validateToken($_REQUEST['authtok']);
+        }elseif(!is_null($auth) && $auth->canDo('external')){
+            // external trust mechanism in place
+            $auth->trustExternal($_REQUEST['u'],$_REQUEST['p'],$_REQUEST['r']);
+        }else{
+            $evdata = array(
+                    'user'     => $_REQUEST['u'],
+                    'password' => $_REQUEST['p'],
+                    'sticky'   => $_REQUEST['r'],
+                    'silent'   => $_REQUEST['http_credentials'],
+                    );
+            $evt = new Doku_Event('AUTH_LOGIN_CHECK',$evdata);
+            if($evt->advise_before()){
+                auth_login($evdata['user'],
+                           $evdata['password'],
+                           $evdata['sticky'],
+                           $evdata['silent']);
+            }
+        }
+    }
+
+    //load ACL into a global array
+    global $AUTH_ACL;
+    if($auth->cando['getACL']) {
+        $AUTH_ACL = $auth->getACL();
+        //support user wildcard
+        if(isset($_SERVER['REMOTE_USER'])){
+            $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL);
+            $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy
+        }
+    }
+    elseif(is_readable(DOKU_CONF.'acl.auth.php')){
+        $AUTH_ACL = file(DOKU_CONF.'acl.auth.php');
+        //support user wildcard
+        if(isset($_SERVER['REMOTE_USER'])){
+            $AUTH_ACL = str_replace('%USER%',$_SERVER['REMOTE_USER'],$AUTH_ACL);
+            $AUTH_ACL = str_replace('@USER@',$_SERVER['REMOTE_USER'],$AUTH_ACL); //legacy
+        }
+    }else{
+        $AUTH_ACL = array();
+    }
+}
+
+/**
+ * This tries to login the user based on the sent auth credentials
+ *
+ * The authentication works like this: if a username was given
+ * a new login is assumed and user/password are checked. If they
+ * are correct the password is encrypted with blowfish and stored
+ * together with the username in a cookie - the same info is stored
+ * in the session, too. Additonally a browserID is stored in the
+ * session.
+ *
+ * If no username was given the cookie is checked: if the username,
+ * crypted password and browserID match between session and cookie
+ * no further testing is done and the user is accepted
+ *
+ * If a cookie was found but no session info was availabe the
+ * blowfish encrypted password from the cookie is decrypted and
+ * together with username rechecked by calling this function again.
+ *
+ * On a successful login $_SERVER[REMOTE_USER] and $USERINFO
+ * are set.
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param   string  $user    Username
+ * @param   string  $pass    Cleartext Password
+ * @param   bool    $sticky  Cookie should not expire
+ * @param   bool    $silent  Don't show error on bad auth
+ * @return  bool             true on successful auth
+ */
+function auth_login($user,$pass,$sticky=false,$silent=false){
+    global $USERINFO;
+    global $conf;
+    global $lang;
+    global $auth;
+    $sticky ? $sticky = true : $sticky = false; //sanity check
+
+    if (!$auth) return false;
+
+    if(!empty($user)){
+        //usual login
+        if ($auth->checkPass($user,$pass)){
+            // make logininfo globally available
+            $_SERVER['REMOTE_USER'] = $user;
+            auth_setCookie($user,PMA_blowfish_encrypt($pass,auth_cookiesalt()),$sticky);
+            return true;
+        }else{
+            //invalid credentials - log off
+            if(!$silent) msg($lang['badlogin'],-1);
+            auth_logoff();
+            return false;
+        }
+    }else{
+        // read cookie information
+        list($user,$sticky,$pass) = auth_getCookie();
+        // get session info
+        $session = $_SESSION[DOKU_COOKIE]['auth'];
+        if($user && $pass){
+            // we got a cookie - see if we can trust it
+            if(isset($session) &&
+                    $auth->useSessionCache($user) &&
+                    ($session['time'] >= time()-$conf['auth_security_timeout']) &&
+                    ($session['user'] == $user) &&
+                    ($session['pass'] == $pass) &&  //still crypted
+                    ($session['buid'] == auth_browseruid()) ){
+                // he has session, cookie and browser right - let him in
+                $_SERVER['REMOTE_USER'] = $user;
+                $USERINFO = $session['info']; //FIXME move all references to session
+                return true;
+            }
+            // no we don't trust it yet - recheck pass but silent
+            $pass = PMA_blowfish_decrypt($pass,auth_cookiesalt());
+            return auth_login($user,$pass,$sticky,true);
+        }
+    }
+    //just to be sure
+    auth_logoff(true);
+    return false;
+}
+
+/**
+ * Checks if a given authentication token was stored in the session
+ *
+ * Will setup authentication data using data from the session if the
+ * token is correct. Will exit with a 401 Status if not.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string $token The authentication token
+ * @return boolean true (or will exit on failure)
+ */
+function auth_validateToken($token){
+    if(!$token || $token != $_SESSION[DOKU_COOKIE]['auth']['token']){
+        // bad token
+        header("HTTP/1.0 401 Unauthorized");
+        print 'Invalid auth token - maybe the session timed out';
+        unset($_SESSION[DOKU_COOKIE]['auth']['token']); // no second chance
+        exit;
+    }
+    // still here? trust the session data
+    global $USERINFO;
+    $_SERVER['REMOTE_USER'] = $_SESSION[DOKU_COOKIE]['auth']['user'];
+    $USERINFO = $_SESSION[DOKU_COOKIE]['auth']['info'];
+    return true;
+}
+
+/**
+ * Create an auth token and store it in the session
+ *
+ * NOTE: this is completely unrelated to the getSecurityToken() function
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @return string The auth token
+ */
+function auth_createToken(){
+    $token = md5(mt_rand());
+    @session_start(); // reopen the session if needed
+    $_SESSION[DOKU_COOKIE]['auth']['token'] = $token;
+    session_write_close();
+    return $token;
+}
+
+/**
+ * Builds a pseudo UID from browser and IP data
+ *
+ * This is neither unique nor unfakable - still it adds some
+ * security. Using the first part of the IP makes sure
+ * proxy farms like AOLs are stil okay.
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return  string  a MD5 sum of various browser headers
+ */
+function auth_browseruid(){
+    $ip   = clientIP(true);
+    $uid  = '';
+    $uid .= $_SERVER['HTTP_USER_AGENT'];
+    $uid .= $_SERVER['HTTP_ACCEPT_ENCODING'];
+    $uid .= $_SERVER['HTTP_ACCEPT_LANGUAGE'];
+    $uid .= $_SERVER['HTTP_ACCEPT_CHARSET'];
+    $uid .= substr($ip,0,strpos($ip,'.'));
+    return md5($uid);
+}
+
+/**
+ * Creates a random key to encrypt the password in cookies
+ *
+ * This function tries to read the password for encrypting
+ * cookies from $conf['metadir'].'/_htcookiesalt'
+ * if no such file is found a random key is created and
+ * and stored in this file.
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return  string
+ */
+function auth_cookiesalt(){
+    global $conf;
+    $file = $conf['metadir'].'/_htcookiesalt';
+    $salt = io_readFile($file);
+    if(empty($salt)){
+        $salt = uniqid(rand(),true);
+        io_saveFile($file,$salt);
+    }
+    return $salt;
+}
+
+/**
+ * Log out the current user
+ *
+ * This clears all authentication data and thus log the user
+ * off. It also clears session data.
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @param bool $keepbc - when true, the breadcrumb data is not cleared
+ */
+function auth_logoff($keepbc=false){
+    global $conf;
+    global $USERINFO;
+    global $INFO, $ID;
+    global $auth;
+
+    // make sure the session is writable (it usually is)
+    @session_start();
+
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['user']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['user']);
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['pass']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['pass']);
+    if(isset($_SESSION[DOKU_COOKIE]['auth']['info']))
+        unset($_SESSION[DOKU_COOKIE]['auth']['info']);
+    if(!$keepbc && isset($_SESSION[DOKU_COOKIE]['bc']))
+        unset($_SESSION[DOKU_COOKIE]['bc']);
+    if(isset($_SERVER['REMOTE_USER']))
+        unset($_SERVER['REMOTE_USER']);
+    $USERINFO=null; //FIXME
+
+    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
+        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        setcookie(DOKU_COOKIE,'',time()-600000,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+    }
+
+    if($auth && $auth->canDo('logoff')){
+        $auth->logOff();
+    }
+}
+
+/**
+ * Check if a user is a manager
+ *
+ * Should usually be called without any parameters to check the current
+ * user.
+ *
+ * The info is available through $INFO['ismanager'], too
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    auth_isadmin
+ * @param  string user      - Username
+ * @param  array  groups    - List of groups the user is in
+ * @param  bool   adminonly - when true checks if user is admin
+ */
+function auth_ismanager($user=null,$groups=null,$adminonly=false){
+    global $conf;
+    global $USERINFO;
+    global $auth;
+
+    if (!$auth) return false;
+    if(is_null($user)) {
+        if (!isset($_SERVER['REMOTE_USER'])) {
+            return false;
+        } else {
+            $user = $_SERVER['REMOTE_USER'];
+        }
+    }
+    $user = $auth->cleanUser($user);
+    if(is_null($groups)) $groups = (array) $USERINFO['grps'];
+    $groups = array_map(array($auth,'cleanGroup'),$groups);
+    $user   = auth_nameencode($user);
+
+    // check username against superuser and manager
+    $superusers = explode(',', $conf['superuser']);
+    $superusers = array_unique($superusers);
+    $superusers = array_map('trim', $superusers);
+    // prepare an array containing only true values for array_map call
+    $alltrue = array_fill(0, count($superusers), true);
+    $superusers = array_map('auth_nameencode', $superusers, $alltrue);
+
+    // case insensitive?
+    if(!$auth->isCaseSensitive()){
+        $superusers = array_map('utf8_strtolower',$superusers);
+        $user       = utf8_strtolower($user);
+    }
+
+    // check user match
+    if(in_array($user, $superusers)) return true;
+
+    // check managers
+    if(!$adminonly){
+        $managers = explode(',', $conf['manager']);
+        $managers = array_unique($managers);
+        $managers = array_map('trim', $managers);
+        // prepare an array containing only true values for array_map call
+        $alltrue = array_fill(0, count($managers), true);
+        $managers = array_map('auth_nameencode', $managers, $alltrue);
+        if(!$auth->isCaseSensitive()) $managers = array_map('utf8_strtolower',$managers);
+        if(in_array($user, $managers)) return true;
+    }
+
+    // check user's groups against superuser and manager
+    if (!empty($groups)) {
+
+        //prepend groups with @ and nameencode
+        $cnt = count($groups);
+        for($i=0; $i<$cnt; $i++){
+            $groups[$i] = '@'.auth_nameencode($groups[$i]);
+            if(!$auth->isCaseSensitive()){
+                $groups[$i] = utf8_strtolower($groups[$i]);
+            }
+        }
+
+        // check groups against superuser and manager
+        foreach($superusers as $supu)
+            if(in_array($supu, $groups)) return true;
+        if(!$adminonly){
+            foreach($managers as $mana)
+                if(in_array($mana, $groups)) return true;
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Check if a user is admin
+ *
+ * Alias to auth_ismanager with adminonly=true
+ *
+ * The info is available through $INFO['isadmin'], too
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see auth_ismanager
+ */
+function auth_isadmin($user=null,$groups=null){
+    return auth_ismanager($user,$groups,true);
+}
+
+/**
+ * Convinience function for auth_aclcheck()
+ *
+ * This checks the permissions for the current user
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param  string  $id  page ID (needs to be resolved and cleaned)
+ * @return int          permission level
+ */
+function auth_quickaclcheck($id){
+    global $conf;
+    global $USERINFO;
+    # if no ACL is used always return upload rights
+    if(!$conf['useacl']) return AUTH_UPLOAD;
+    //error_log("DOKUWIKI: auth_quickaclcheck:".$_SERVER['REMOTE_USER'].":".$id.json_encode($USERINFO));
+    return auth_aclcheck($id,$_SERVER['REMOTE_USER'],$USERINFO['grps']);
+}
+
+/**
+ * Returns the maximum rights a user has for
+ * the given ID or its namespace
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param  string  $id     page ID (needs to be resolved and cleaned)
+ * @param  string  $user   Username
+ * @param  array   $groups Array of groups the user is in
+ * @return int             permission level
+ */
+function auth_aclcheck($id,$user,$groups){
+    global $conf;
+    global $AUTH_ACL;
+    global $auth;
+
+    // if no ACL is used always return upload rights
+    if(!$conf['useacl']) return AUTH_UPLOAD;
+    if (!$auth) return AUTH_NONE;
+
+    //make sure groups is an array
+    if(!is_array($groups)) $groups = array();
+
+    //if user is superuser or in superusergroup return 255 (acl_admin)
+    if(auth_isadmin($user,$groups)) { return AUTH_ADMIN; }
+
+    $ci = '';
+    if(!$auth->isCaseSensitive()) $ci = 'ui';
+
+    $user = $auth->cleanUser($user);
+    $groups = array_map(array($auth,'cleanGroup'),(array)$groups);
+    $user = auth_nameencode($user);
+
+    //prepend groups with @ and nameencode
+    $cnt = count($groups);
+    for($i=0; $i<$cnt; $i++){
+        $groups[$i] = '@'.auth_nameencode($groups[$i]);
+    }
+
+    $ns    = getNS($id);
+    $perm  = -1;
+
+    if($user || count($groups)){
+        //add ALL group
+        $groups[] = '@ALL';
+        //add User
+        if($user) $groups[] = $user;
+        //build regexp
+        $regexp   = join('|',$groups);
+    }else{
+        $regexp = '@ALL';
+    }
+
+    //check exact match first
+    $matches = preg_grep('/^'.preg_quote($id,'/').'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
+    if(count($matches)){
+        foreach($matches as $match){
+            $match = preg_replace('/#.*$/','',$match); //ignore comments
+            $acl   = preg_split('/\s+/',$match);
+            if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
+            if($acl[2] > $perm){
+                $perm = $acl[2];
+            }
+        }
+        if($perm > -1){
+            //we had a match - return it
+            return $perm;
+        }
+    }
+
+    //still here? do the namespace checks
+    if($ns){
+        $path = $ns.':\*';
+    }else{
+        $path = '\*'; //root document
+    }
+
+    do{
+        $matches = preg_grep('/^'.$path.'\s+('.$regexp.')\s+/'.$ci,$AUTH_ACL);
+        if(count($matches)){
+            foreach($matches as $match){
+                $match = preg_replace('/#.*$/','',$match); //ignore comments
+                $acl   = preg_split('/\s+/',$match);
+                if($acl[2] > AUTH_DELETE) $acl[2] = AUTH_DELETE; //no admins in the ACL!
+                if($acl[2] > $perm){
+                    $perm = $acl[2];
+                }
+            }
+            //we had a match - return it
+            return $perm;
+        }
+
+        //get next higher namespace
+        $ns   = getNS($ns);
+
+        if($path != '\*'){
+            $path = $ns.':\*';
+            if($path == ':\*') $path = '\*';
+        }else{
+            //we did this already
+            //looks like there is something wrong with the ACL
+            //break here
+            msg('No ACL setup yet! Denying access to everyone.');
+            return AUTH_NONE;
+        }
+    }while(1); //this should never loop endless
+
+    //still here? return no permissions
+    return AUTH_NONE;
+}
+
+/**
+ * Encode ASCII special chars
+ *
+ * Some auth backends allow special chars in their user and groupnames
+ * The special chars are encoded with this function. Only ASCII chars
+ * are encoded UTF-8 multibyte are left as is (different from usual
+ * urlencoding!).
+ *
+ * Decoding can be done with rawurldecode
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ * @see rawurldecode()
+ */
+function auth_nameencode($name,$skip_group=false){
+    global $cache_authname;
+    $cache =& $cache_authname;
+    $name  = (string) $name;
+
+    if (!isset($cache[$name][$skip_group])) {
+        if($skip_group && $name{0} =='@'){
+            $cache[$name][$skip_group] = '@'.preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
+                    "'%'.dechex(ord(substr('\\1',-1)))",substr($name,1));
+        }else{
+            $cache[$name][$skip_group] = preg_replace('/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/e',
+                    "'%'.dechex(ord(substr('\\1',-1)))",$name);
+        }
+    }
+
+    return $cache[$name][$skip_group];
+}
+
+/**
+ * Create a pronouncable password
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @link    http://www.phpbuilder.com/annotate/message.php3?id=1014451
+ *
+ * @return string  pronouncable password
+ */
+function auth_pwgen(){
+    $pw = '';
+    $c  = 'bcdfghjklmnprstvwz'; //consonants except hard to speak ones
+    $v  = 'aeiou';              //vowels
+    $a  = $c.$v;                //both
+
+    //use two syllables...
+    for($i=0;$i < 2; $i++){
+        $pw .= $c[rand(0, strlen($c)-1)];
+        $pw .= $v[rand(0, strlen($v)-1)];
+        $pw .= $a[rand(0, strlen($a)-1)];
+    }
+    //... and add a nice number
+    $pw .= rand(10,99);
+
+    return $pw;
+}
+
+/**
+ * Sends a password to the given user
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return bool  true on success
+ */
+function auth_sendPassword($user,$password){
+    global $conf;
+    global $lang;
+    global $auth;
+    if (!$auth) return false;
+
+    $hdrs  = '';
+    $user     = $auth->cleanUser($user);
+    $userinfo = $auth->getUserData($user);
+
+    if(!$userinfo['mail']) return false;
+
+    $text = rawLocale('password');
+    $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
+    $text = str_replace('@FULLNAME@',$userinfo['name'],$text);
+    $text = str_replace('@LOGIN@',$user,$text);
+    $text = str_replace('@PASSWORD@',$password,$text);
+    $text = str_replace('@TITLE@',$conf['title'],$text);
+
+    return mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
+            $lang['regpwmail'],
+            $text,
+            $conf['mailfrom']);
+}
+
+/**
+ * Register a new user
+ *
+ * This registers a new user - Data is read directly from $_POST
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return bool  true on success, false on any error
+ */
+function register(){
+    global $lang;
+    global $conf;
+    global $auth;
+
+    if (!$auth) return false;
+    if(!$_POST['save']) return false;
+    if(!$auth->canDo('addUser')) return false;
+
+    //clean username
+    $_POST['login'] = trim($auth->cleanUser($_POST['login']));
+
+    //clean fullname and email
+    $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
+    $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
+
+    if( empty($_POST['login']) ||
+        empty($_POST['fullname']) ||
+        empty($_POST['email']) ){
+        msg($lang['regmissing'],-1);
+        return false;
+    }
+
+    if ($conf['autopasswd']) {
+        $pass = auth_pwgen();                // automatically generate password
+    } elseif (empty($_POST['pass']) ||
+            empty($_POST['passchk'])) {
+        msg($lang['regmissing'], -1);        // complain about missing passwords
+        return false;
+    } elseif ($_POST['pass'] != $_POST['passchk']) {
+        msg($lang['regbadpass'], -1);      // complain about misspelled passwords
+        return false;
+    } else {
+        $pass = $_POST['pass'];              // accept checked and valid password
+    }
+
+    //check mail
+    if(!mail_isvalid($_POST['email'])){
+        msg($lang['regbadmail'],-1);
+        return false;
+    }
+
+    //okay try to create the user
+    if(!$auth->triggerUserMod('create', array($_POST['login'],$pass,$_POST['fullname'],$_POST['email']))){
+        msg($lang['reguexists'],-1);
+        return false;
+    }
+
+    // create substitutions for use in notification email
+    $substitutions = array(
+            'NEWUSER' => $_POST['login'],
+            'NEWNAME' => $_POST['fullname'],
+            'NEWEMAIL' => $_POST['email'],
+            );
+
+    if (!$conf['autopasswd']) {
+        msg($lang['regsuccess2'],1);
+        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        return true;
+    }
+
+    // autogenerated password? then send him the password
+    if (auth_sendPassword($_POST['login'],$pass)){
+        msg($lang['regsuccess'],1);
+        notify('', 'register', '', $_POST['login'], false, $substitutions);
+        return true;
+    }else{
+        msg($lang['regmailfail'],-1);
+        return false;
+    }
+}
+
+/**
+ * Update user profile
+ *
+ * @author    Christopher Smith <chris@jalakai.co.uk>
+ */
+function updateprofile() {
+    global $conf;
+    global $INFO;
+    global $lang;
+    global $auth;
+
+    if (!$auth) return false;
+    if(empty($_POST['save'])) return false;
+    if(!checkSecurityToken()) return false;
+
+    // should not be able to get here without Profile being possible...
+    if(!$auth->canDo('Profile')) {
+        msg($lang['profna'],-1);
+        return false;
+    }
+
+    if ($_POST['newpass'] != $_POST['passchk']) {
+        msg($lang['regbadpass'], -1);      // complain about misspelled passwords
+        return false;
+    }
+
+    //clean fullname and email
+    $_POST['fullname'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['fullname']));
+    $_POST['email']    = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/','',$_POST['email']));
+
+    if ((empty($_POST['fullname']) && $auth->canDo('modName')) ||
+        (empty($_POST['email']) && $auth->canDo('modMail'))) {
+        msg($lang['profnoempty'],-1);
+        return false;
+    }
+
+    if (!mail_isvalid($_POST['email']) && $auth->canDo('modMail')){
+        msg($lang['regbadmail'],-1);
+        return false;
+    }
+
+    if ($_POST['fullname'] != $INFO['userinfo']['name'] && $auth->canDo('modName')) $changes['name'] = $_POST['fullname'];
+    if ($_POST['email'] != $INFO['userinfo']['mail'] && $auth->canDo('modMail')) $changes['mail'] = $_POST['email'];
+    if (!empty($_POST['newpass']) && $auth->canDo('modPass')) $changes['pass'] = $_POST['newpass'];
+
+    if (!count($changes)) {
+        msg($lang['profnochange'], -1);
+        return false;
+    }
+
+    if ($conf['profileconfirm']) {
+        if (!$auth->checkPass($_SERVER['REMOTE_USER'], $_POST['oldpass'])) {
+            msg($lang['badlogin'],-1);
+            return false;
+        }
+    }
+
+    if ($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) {
+        // update cookie and session with the changed data
+        $cookie = base64_decode($_COOKIE[DOKU_COOKIE]);
+        list($user,$sticky,$pass) = explode('|',$cookie,3);
+        if ($changes['pass']) $pass = PMA_blowfish_encrypt($changes['pass'],auth_cookiesalt());
+
+        auth_setCookie($_SERVER['REMOTE_USER'],$pass,(bool)$sticky);
+        return true;
+    }
+}
+
+/**
+ * Send a  new password
+ *
+ * This function handles both phases of the password reset:
+ *
+ *   - handling the first request of password reset
+ *   - validating the password reset auth token
+ *
+ * @author Benoit Chesneau <benoit@bchesneau.info>
+ * @author Chris Smith <chris@jalakai.co.uk>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @return bool true on success, false on any error
+ */
+function act_resendpwd(){
+    global $lang;
+    global $conf;
+    global $auth;
+
+    if(!actionOK('resendpwd')) return false;
+    if (!$auth) return false;
+
+    // should not be able to get here without modPass being possible...
+    if(!$auth->canDo('modPass')) {
+        msg($lang['resendna'],-1);
+        return false;
+    }
+
+    $token = preg_replace('/[^a-f0-9]+/','',$_REQUEST['pwauth']);
+
+    if($token){
+        // we're in token phase
+
+        $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth';
+        if(!@file_exists($tfile)){
+            msg($lang['resendpwdbadauth'],-1);
+            return false;
+        }
+        $user = io_readfile($tfile);
+        @unlink($tfile);
+        $userinfo = $auth->getUserData($user);
+        if(!$userinfo['mail']) {
+            msg($lang['resendpwdnouser'], -1);
+            return false;
+        }
+
+        $pass = auth_pwgen();
+        if (!$auth->triggerUserMod('modify', array($user,array('pass' => $pass)))) {
+            msg('error modifying user data',-1);
+            return false;
+        }
+
+        if (auth_sendPassword($user,$pass)) {
+            msg($lang['resendpwdsuccess'],1);
+        } else {
+            msg($lang['regmailfail'],-1);
+        }
+        return true;
+
+    } else {
+        // we're in request phase
+
+        if(!$_POST['save']) return false;
+
+        if (empty($_POST['login'])) {
+            msg($lang['resendpwdmissing'], -1);
+            return false;
+        } else {
+            $user = trim($auth->cleanUser($_POST['login']));
+        }
+
+        $userinfo = $auth->getUserData($user);
+        if(!$userinfo['mail']) {
+            msg($lang['resendpwdnouser'], -1);
+            return false;
+        }
+
+        // generate auth token
+        $token = md5(auth_cookiesalt().$user); //secret but user based
+        $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth';
+        $url = wl('',array('do'=>'resendpwd','pwauth'=>$token),true,'&');
+
+        io_saveFile($tfile,$user);
+
+        $text = rawLocale('pwconfirm');
+        $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
+        $text = str_replace('@FULLNAME@',$userinfo['name'],$text);
+        $text = str_replace('@LOGIN@',$user,$text);
+        $text = str_replace('@TITLE@',$conf['title'],$text);
+        $text = str_replace('@CONFIRM@',$url,$text);
+
+        if(mail_send($userinfo['name'].' <'.$userinfo['mail'].'>',
+                     $lang['regpwmail'],
+                     $text,
+                     $conf['mailfrom'])){
+            msg($lang['resendpwdconfirm'],1);
+        }else{
+            msg($lang['regmailfail'],-1);
+        }
+        return true;
+    }
+
+    return false; // never reached
+}
+
+/**
+ * Encrypts a password using the given method and salt
+ *
+ * If the selected method needs a salt and none was given, a random one
+ * is chosen.
+ *
+ * The following methods are understood:
+ *
+ *   smd5  - Salted MD5 hashing
+ *   apr1  - Apache salted MD5 hashing
+ *   md5   - Simple MD5 hashing
+ *   sha1  - SHA1 hashing
+ *   ssha  - Salted SHA1 hashing
+ *   crypt - Unix crypt
+ *   mysql - MySQL password (old method)
+ *   my411 - MySQL 4.1.1 password
+ *   kmd5  - Salted MD5 hashing as used by UNB
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @return  string  The crypted password
+ */
+function auth_cryptPassword($clear,$method='',$salt=null){
+    global $conf;
+    if(empty($method)) $method = $conf['passcrypt'];
+
+    //prepare a salt
+    if(is_null($salt)) $salt = md5(uniqid(rand(), true));
+
+    switch(strtolower($method)){
+        case 'smd5':
+            if(defined('CRYPT_MD5') && CRYPT_MD5) return crypt($clear,'$1$'.substr($salt,0,8).'$');
+            // when crypt can't handle SMD5, falls through to pure PHP implementation
+            $magic = '1';
+        case 'apr1':
+            //from http://de.php.net/manual/en/function.crypt.php#73619 comment by <mikey_nich at hotmail dot com>
+            if(!$magic) $magic = 'apr1';
+            $salt = substr($salt,0,8);
+            $len = strlen($clear);
+            $text = $clear.'$'.$magic.'$'.$salt;
+            $bin = pack("H32", md5($clear.$salt.$clear));
+            for($i = $len; $i > 0; $i -= 16) {
+                $text .= substr($bin, 0, min(16, $i));
+            }
+            for($i = $len; $i > 0; $i >>= 1) {
+                $text .= ($i & 1) ? chr(0) : $clear{0};
+            }
+            $bin = pack("H32", md5($text));
+            for($i = 0; $i < 1000; $i++) {
+                $new = ($i & 1) ? $clear : $bin;
+                if ($i % 3) $new .= $salt;
+                if ($i % 7) $new .= $clear;
+                $new .= ($i & 1) ? $bin : $clear;
+                $bin = pack("H32", md5($new));
+            }
+            $tmp = '';
+            for ($i = 0; $i < 5; $i++) {
+                $k = $i + 6;
+                $j = $i + 12;
+                if ($j == 16) $j = 5;
+                $tmp = $bin[$i].$bin[$k].$bin[$j].$tmp;
+            }
+            $tmp = chr(0).chr(0).$bin[11].$tmp;
+            $tmp = strtr(strrev(substr(base64_encode($tmp), 2)),
+                    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",
+                    "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz");
+            return '$'.$magic.'$'.$salt.'$'.$tmp;
+        case 'md5':
+            return md5($clear);
+        case 'sha1':
+            return sha1($clear);
+        case 'ssha':
+            $salt=substr($salt,0,4);
+            return '{SSHA}'.base64_encode(pack("H*", sha1($clear.$salt)).$salt);
+        case 'crypt':
+            return crypt($clear,substr($salt,0,2));
+        case 'mysql':
+            //from http://www.php.net/mysql comment by <soren at byu dot edu>
+            $nr=0x50305735;
+            $nr2=0x12345671;
+            $add=7;
+            $charArr = preg_split("//", $clear);
+            foreach ($charArr as $char) {
+                if (($char == '') || ($char == ' ') || ($char == '\t')) continue;
+                $charVal = ord($char);
+                $nr ^= ((($nr & 63) + $add) * $charVal) + ($nr << 8);
+                $nr2 += ($nr2 << 8) ^ $nr;
+                $add += $charVal;
+            }
+            return sprintf("%08x%08x", ($nr & 0x7fffffff), ($nr2 & 0x7fffffff));
+        case 'my411':
+            return '*'.sha1(pack("H*", sha1($clear)));
+        case 'kmd5':
+            $key = substr($salt, 16, 2);
+            $hash1 = strtolower(md5($key . md5($clear)));
+            $hash2 = substr($hash1, 0, 16) . $key . substr($hash1, 16);
+            return $hash2;
+        default:
+            msg("Unsupported crypt method $method",-1);
+    }
+}
+
+/**
+ * Verifies a cleartext password against a crypted hash
+ *
+ * The method and salt used for the crypted hash is determined automatically
+ * then the clear text password is crypted using the same method. If both hashs
+ * match true is is returned else false
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @return  bool
+ */
+function auth_verifyPassword($clear,$crypt){
+    $method='';
+    $salt='';
+
+    //determine the used method and salt
+    $len = strlen($crypt);
+    if(preg_match('/^\$1\$([^\$]{0,8})\$/',$crypt,$m)){
+        $method = 'smd5';
+        $salt   = $m[1];
+    }elseif(preg_match('/^\$apr1\$([^\$]{0,8})\$/',$crypt,$m)){
+        $method = 'apr1';
+        $salt   = $m[1];
+    }elseif(substr($crypt,0,6) == '{SSHA}'){
+        $method = 'ssha';
+        $salt   = substr(base64_decode(substr($crypt, 6)),20);
+    }elseif($len == 32){
+        $method = 'md5';
+    }elseif($len == 40){
+        $method = 'sha1';
+    }elseif($len == 16){
+        $method = 'mysql';
+    }elseif($len == 41 && $crypt[0] == '*'){
+        $method = 'my411';
+    }elseif($len == 34){
+        $method = 'kmd5';
+        $salt   = $crypt;
+    }else{
+        $method = 'crypt';
+        $salt   = substr($crypt,0,2);
+    }
+
+    //crypt and compare
+    if(auth_cryptPassword($clear,$method,$salt) === $crypt){
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Set the authentication cookie and add user identification data to the session
+ *
+ * @param string  $user       username
+ * @param string  $pass       encrypted password
+ * @param bool    $sticky     whether or not the cookie will last beyond the session
+ */
+function auth_setCookie($user,$pass,$sticky) {
+    global $conf;
+    global $auth;
+    global $USERINFO;
+
+    if (!$auth) return false;
+    $USERINFO = $auth->getUserData($user);
+
+    // set cookie
+    $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass);
+    $time = $sticky ? (time()+60*60*24*365) : 0; //one year
+    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
+        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        setcookie(DOKU_COOKIE,$cookie,$time,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+    }
+    // set session
+    $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
+    $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
+    $_SESSION[DOKU_COOKIE]['auth']['buid'] = auth_browseruid();
+    $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+    $_SESSION[DOKU_COOKIE]['auth']['time'] = time();
+}
+
+/**
+ * Returns the user, (encrypted) password and sticky bit from cookie
+ *
+ * @returns array
+ */
+function auth_getCookie(){
+    if (!isset($_COOKIE[DOKU_COOKIE])) {
+        return array(null, null, null);
+    }
+    list($user,$sticky,$pass) = explode('|',$_COOKIE[DOKU_COOKIE],3);
+    $sticky = (bool) $sticky;
+    $pass   = base64_decode($pass);
+    $user   = base64_decode($user);
+    return array($user,$sticky,$pass);
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/ad.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/ad.class.php
new file mode 100644
index 000000000..9915b9f11
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/ad.class.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Active Directory authentication backend for DokuWiki
+ *
+ * This makes authentication with a Active Directory server much easier
+ * than when using the normal LDAP backend by utilizing the adLDAP library
+ *
+ * Usage:
+ *   Set DokuWiki's local.protected.php auth setting to read
+ *
+ *   $conf['useacl']         = 1;
+ *   $conf['disableactions'] = 'register';
+ *   $conf['autopasswd']     = 0;
+ *   $conf['authtype']       = 'ad';
+ *   $conf['passcrypt']      = 'ssha';
+ *
+ *   $conf['auth']['ad']['account_suffix']     = '@my.domain.org';
+ *   $conf['auth']['ad']['base_dn']            = 'DC=my,DC=domain,DC=org';
+ *   $conf['auth']['ad']['domain_controllers'] = 'srv1.domain.org,srv2.domain.org';
+ *
+ *   //optional:
+ *   $conf['auth']['ad']['sso']                = 1;
+ *   $conf['auth']['ad']['ad_username']        = 'root';
+ *   $conf['auth']['ad']['ad_password']        = 'pass';
+ *   $conf['auth']['ad']['real_primarygroup']  = 1;
+ *   $conf['auth']['ad']['use_ssl']            = 1;
+ *   $conf['auth']['ad']['debug']              = 1;
+ *
+ *  @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ *  @author  James Van Lommel <jamesvl@gmail.com>
+ *  @link    http://www.nosq.com/blog/2005/08/ldap-activedirectory-and-dokuwiki/
+ *  @author  Andreas Gohr <andi@splitbrain.org>
+ */
+
+require_once(DOKU_INC.'inc/adLDAP.php');
+
+class auth_ad extends auth_basic {
+    var $cnf = null;
+    var $opts = null;
+    var $adldap = null;
+
+    /**
+     * Constructor
+     */
+    function auth_ad() {
+        global $conf;
+        $this->cnf = $conf['auth']['ad'];
+
+        // ldap extension is needed
+        if (!function_exists('ldap_connect')) {
+            if ($this->cnf['debug'])
+                msg("LDAP err: PHP LDAP extension not found.",-1);
+            $this->success = false;
+            return;
+        }
+
+        // Prepare SSO
+        if($_SERVER['REMOTE_USER'] && $this->cnf['sso']){
+             // remove possible NTLM domain
+             list($dom,$usr) = explode('\\',$_SERVER['REMOTE_USER'],2);
+             if(!$usr) $usr = $dom;
+
+             // remove possible Kerberos domain
+             list($usr,$dom) = explode('@',$usr);
+
+             $dom = strtolower($dom);
+             $_SERVER['REMOTE_USER'] = $usr;
+
+             // we need to simulate a login
+             if(empty($_COOKIE[DOKU_COOKIE])){
+                 $_REQUEST['u'] = $_SERVER['REMOTE_USER'];
+                 $_REQUEST['p'] = 'sso_only';
+             }
+        }
+
+        // prepare adLDAP standard configuration
+        $this->opts = $this->cnf;
+
+        // add possible domain specific configuration
+        if($dom && is_array($this->cnf[$dom])) foreach($this->cnf[$dom] as $key => $val){
+            $this->opts[$key] = $val;
+        }
+
+        // handle multiple AD servers
+        $this->opts['domain_controllers'] = explode(',',$this->opts['domain_controllers']);
+        $this->opts['domain_controllers'] = array_map('trim',$this->opts['domain_controllers']);
+        $this->opts['domain_controllers'] = array_filter($this->opts['domain_controllers']);
+
+        // we currently just handle authentication, so no capabilities are set
+    }
+
+    /**
+     * Check user+password [required auth function]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct by trying to bind
+     * to the LDAP server
+     *
+     * @author  James Van Lommel <james@nosq.com>
+     * @return  bool
+     */
+    function checkPass($user, $pass){
+        if($_SERVER['REMOTE_USER'] &&
+           $_SERVER['REMOTE_USER'] == $user &&
+           $this->cnf['sso']) return true;
+
+        if(!$this->_init()) return false;
+        return $this->adldap->authenticate($user, $pass);
+    }
+
+    /**
+     * Return user info [required auth function]
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * This LDAP specific function returns the following
+     * addional fields:
+     *
+     * dn   string  distinguished name (DN)
+     * uid  string  Posix User ID
+     *
+     * @author  James Van Lommel <james@nosq.com>
+     */
+   function getUserData($user){
+        global $conf;
+        if(!$this->_init()) return false;
+
+        //get info for given user
+        $result = $this->adldap->user_info($user);
+
+        //general user info
+        $info['name'] = $result[0]['displayname'][0];
+        $info['mail'] = $result[0]['mail'][0];
+        $info['uid']  = $result[0]['samaccountname'][0];
+        $info['dn']   = $result[0]['dn'];
+
+        // handle ActiveDirectory memberOf
+        $info['grps'] = $this->adldap->user_groups($user,(bool) $this->opts['recursive_groups']);
+
+        if (is_array($info['grps'])) {
+            foreach ($info['grps'] as $ndx => $group) {
+                $info['grps'][$ndx] = $this->cleanGroup($group);
+            }
+        }
+
+        // always add the default group to the list of groups
+        if(!is_array($info['grps']) || !in_array($conf['defaultgroup'],$info['grps'])){
+            $info['grps'][] = $conf['defaultgroup'];
+        }
+
+        return $info;
+    }
+
+    /**
+     * Make AD group names usable by DokuWiki.
+     *
+     * Removes backslashes ('\'), pound signs ('#'), and converts spaces to underscores.
+     *
+     * @author  James Van Lommel (jamesvl@gmail.com)
+     */
+    function cleanGroup($name) {
+        $sName = str_replace('\\', '', $name);
+        $sName = str_replace('#', '', $sName);
+        $sName = preg_replace('[\s]', '_', $sName);
+        return $sName;
+    }
+
+    /**
+     * Sanitize user names
+     */
+    function cleanUser($name) {
+        return $this->cleanGroup($name);
+    }
+
+    /**
+     * Most values in LDAP are case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
+     * Initialize the AdLDAP library and connect to the server
+     */
+    function _init(){
+        if(!is_null($this->adldap)) return true;
+
+        // connect
+        try {
+            $this->adldap = new adLDAP($this->opts);
+            return true;
+        } catch (adLDAPException $e) {
+            $this->success = false;
+            $this->adldap  = null;
+        }
+        return false;
+    }
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/basic.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/basic.class.php
new file mode 100644
index 000000000..c08422488
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/basic.class.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ * auth/basic.class.php
+ *
+ * foundation authorisation class
+ * all auth classes should inherit from this class
+ *
+ * @author    Chris Smith <chris@jalakai.co.uk>
+ */
+
+class auth_basic {
+
+  var $success = true;
+
+
+  /**
+   * Posible things an auth backend module may be able to
+   * do. The things a backend can do need to be set to true
+   * in the constructor.
+   */
+  var $cando = array (
+    'addUser'     => false, // can Users be created?
+    'delUser'     => false, // can Users be deleted?
+    'modLogin'    => false, // can login names be changed?
+    'modPass'     => false, // can passwords be changed?
+    'modName'     => false, // can real names be changed?
+    'modMail'     => false, // can emails be changed?
+    'modGroups'   => false, // can groups be changed?
+    'getUsers'    => false, // can a (filtered) list of users be retrieved?
+    'getUserCount'=> false, // can the number of users be retrieved?
+    'getGroups'   => false, // can a list of available groups be retrieved?
+    'external'    => false, // does the module do external auth checking?
+    'logoff'      => false, // has the module some special logoff method?
+  );
+
+
+  /**
+   * Constructor.
+   *
+   * Carry out sanity checks to ensure the object is
+   * able to operate. Set capabilities in $this->cando
+   * array here
+   *
+   * Set $this->success to false if checks fail
+   *
+   * @author  Christopher Smith <chris@jalakai.co.uk>
+   */
+  function auth_basic() {
+     // the base class constructor does nothing, derived class
+    // constructors do the real work
+  }
+
+  /**
+   * Capability check. [ DO NOT OVERRIDE ]
+   *
+   * Checks the capabilities set in the $this->cando array and
+   * some pseudo capabilities (shortcutting access to multiple
+   * ones)
+   *
+   * ususal capabilities start with lowercase letter
+   * shortcut capabilities start with uppercase letter
+   *
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   * @return  bool
+   */
+  function canDo($cap) {
+    switch($cap){
+      case 'Profile':
+        // can at least one of the user's properties be changed?
+        return ( $this->cando['modPass']  ||
+                 $this->cando['modName']  ||
+                 $this->cando['modMail'] );
+        break;
+      case 'UserMod':
+        // can at least anything be changed?
+        return ( $this->cando['modPass']   ||
+                 $this->cando['modName']   ||
+                 $this->cando['modMail']   ||
+                 $this->cando['modLogin']  ||
+                 $this->cando['modGroups'] ||
+                 $this->cando['modMail'] );
+        break;
+      default:
+        // print a helping message for developers
+        if(!isset($this->cando[$cap])){
+          msg("Check for unknown capability '$cap' - Do you use an outdated Plugin?",-1);
+        }
+        return $this->cando[$cap];
+    }
+  }
+
+  /**
+   * Trigger the AUTH_USERDATA_CHANGE event and call the modification function. [ DO NOT OVERRIDE ]
+   *
+   * You should use this function instead of calling createUser, modifyUser or
+   * deleteUsers directly. The event handlers can prevent the modification, for
+   * example for enforcing a user name schema.
+   *
+   * @author Gabriel Birke <birke@d-scribe.de>
+   * @param string $type Modification type ('create', 'modify', 'delete')
+   * @param array $params Parameters for the createUser, modifyUser or deleteUsers method. The content of this array depends on the modification type
+   * @return mixed Result from the modification function or false if an event handler has canceled the action
+   */
+  function triggerUserMod($type, $params)
+  {
+    $validTypes = array(
+      'create' => 'createUser',
+      'modify' => 'modifyUser',
+      'delete' => 'deleteUsers'
+    );
+    if(empty($validTypes[$type]))
+      return false;
+    $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
+    $evt = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
+    if ($evt->advise_before(true)) {
+      $result = call_user_func_array(array($this, $validTypes[$type]), $params);
+      $evt->data['modification_result'] = $result;
+    }
+    $evt->advise_after();
+    unset($evt);
+    return $result;
+  }
+
+  /**
+   * Log off the current user [ OPTIONAL ]
+   *
+   * Is run in addition to the ususal logoff method. Should
+   * only be needed when trustExternal is implemented.
+   *
+   * @see     auth_logoff()
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   */
+  function logOff(){
+  }
+
+  /**
+   * Do all authentication [ OPTIONAL ]
+   *
+   * Set $this->cando['external'] = true when implemented
+   *
+   * If this function is implemented it will be used to
+   * authenticate a user - all other DokuWiki internals
+   * will not be used for authenticating, thus
+   * implementing the checkPass() function is not needed
+   * anymore.
+   *
+   * The function can be used to authenticate against third
+   * party cookies or Apache auth mechanisms and replaces
+   * the auth_login() function
+   *
+   * The function will be called with or without a set
+   * username. If the Username is given it was called
+   * from the login form and the given credentials might
+   * need to be checked. If no username was given it
+   * the function needs to check if the user is logged in
+   * by other means (cookie, environment).
+   *
+   * The function needs to set some globals needed by
+   * DokuWiki like auth_login() does.
+   *
+   * @see auth_login()
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   *
+   * @param   string  $user    Username
+   * @param   string  $pass    Cleartext Password
+   * @param   bool    $sticky  Cookie should not expire
+   * @return  bool             true on successful auth
+   */
+  function trustExternal($user,$pass,$sticky=false){
+#    // some example:
+#
+#    global $USERINFO;
+#    global $conf;
+#    $sticky ? $sticky = true : $sticky = false; //sanity check
+#
+#    // do the checking here
+#
+#    // set the globals if authed
+#    $USERINFO['name'] = 'FIXME';
+#    $USERINFO['mail'] = 'FIXME';
+#    $USERINFO['grps'] = array('FIXME');
+#    $_SERVER['REMOTE_USER'] = $user;
+#    $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
+#    $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
+#    $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+#    return true;
+  }
+
+  /**
+   * Check user+password [ MUST BE OVERRIDDEN ]
+   *
+   * Checks if the given user exists and the given
+   * plaintext password is correct
+   *
+   * May be ommited if trustExternal is used.
+   *
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   * @return  bool
+   */
+  function checkPass($user,$pass){
+    msg("no valid authorisation system in use", -1);
+    return false;
+  }
+
+  /**
+   * Return user info [ MUST BE OVERRIDDEN ]
+   *
+   * Returns info about the given user needs to contain
+   * at least these fields:
+   *
+   * name string  full name of the user
+   * mail string  email addres of the user
+   * grps array   list of groups the user is in
+   *
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   * @return  array containing user data or false
+   */
+  function getUserData($user) {
+    if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
+    return false;
+  }
+
+  /**
+   * Create a new User [implement only where required/possible]
+   *
+   * Returns false if the user already exists, null when an error
+   * occurred and true if everything went well.
+   *
+   * The new user HAS TO be added to the default group by this
+   * function!
+   *
+   * Set addUser capability when implemented
+   *
+   * @author  Andreas Gohr <andi@splitbrain.org>
+   */
+  function createUser($user,$pass,$name,$mail,$grps=null){
+    msg("authorisation method does not allow creation of new users", -1);
+    return null;
+  }
+
+  /**
+   * Modify user data [implement only where required/possible]
+   *
+   * Set the mod* capabilities according to the implemented features
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   * @param   $user      nick of the user to be changed
+   * @param   $changes   array of field/value pairs to be changed (password will be clear text)
+   * @return  bool
+   */
+  function modifyUser($user, $changes) {
+    msg("authorisation method does not allow modifying of user data", -1);
+    return false;
+  }
+
+  /**
+   * Delete one or more users [implement only where required/possible]
+   *
+   * Set delUser capability when implemented
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   * @param   array  $users
+   * @return  int    number of users deleted
+   */
+  function deleteUsers($users) {
+    msg("authorisation method does not allow deleting of users", -1);
+    return false;
+  }
+
+  /**
+   * Return a count of the number of user which meet $filter criteria
+   * [should be implemented whenever retrieveUsers is implemented]
+   *
+   * Set getUserCount capability when implemented
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   */
+  function getUserCount($filter=array()) {
+    msg("authorisation method does not provide user counts", -1);
+    return 0;
+  }
+
+  /**
+   * Bulk retrieval of user data [implement only where required/possible]
+   *
+   * Set getUsers capability when implemented
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   * @param   start     index of first user to be returned
+   * @param   limit     max number of users to be returned
+   * @param   filter    array of field/pattern pairs, null for no filter
+   * @return  array of userinfo (refer getUserData for internal userinfo details)
+   */
+  function retrieveUsers($start=0,$limit=-1,$filter=null) {
+    msg("authorisation method does not support mass retrieval of user data", -1);
+    return array();
+  }
+
+  /**
+   * Define a group [implement only where required/possible]
+   *
+   * Set addGroup capability when implemented
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   * @return  bool
+   */
+  function addGroup($group) {
+    msg("authorisation method does not support independent group creation", -1);
+    return false;
+  }
+
+  /**
+   * Retrieve groups [implement only where required/possible]
+   *
+   * Set getGroups capability when implemented
+   *
+   * @author  Chris Smith <chris@jalakai.co.uk>
+   * @return  array
+   */
+  function retrieveGroups($start=0,$limit=0) {
+    msg("authorisation method does not support group list retrieval", -1);
+    return array();
+  }
+
+  /**
+   * Return case sensitivity of the backend [OPTIONAL]
+   *
+   * When your backend is caseinsensitive (eg. you can login with USER and
+   * user) then you need to overwrite this method and return false
+   */
+  function isCaseSensitive(){
+    return true;
+  }
+
+  /**
+   * Sanitize a given username [OPTIONAL]
+   *
+   * This function is applied to any user name that is given to
+   * the backend and should also be applied to any user name within
+   * the backend before returning it somewhere.
+   *
+   * This should be used to enforce username restrictions.
+   *
+   * @author Andreas Gohr <andi@splitbrain.org>
+   * @param string $user - username
+   * @param string - the cleaned username
+   */
+  function cleanUser($user){
+    return $user;
+  }
+
+  /**
+   * Sanitize a given groupname [OPTIONAL]
+   *
+   * This function is applied to any groupname that is given to
+   * the backend and should also be applied to any groupname within
+   * the backend before returning it somewhere.
+   *
+   * This should be used to enforce groupname restrictions.
+   *
+   * Groupnames are to be passed without a leading '@' here.
+   *
+   * @author Andreas Gohr <andi@splitbrain.org>
+   * @param string $group - groupname
+   * @param string - the cleaned groupname
+   */
+  function cleanGroup($group){
+    return $group;
+  }
+
+
+  /**
+   * Check Session Cache validity [implement only where required/possible]
+   *
+   * DokuWiki caches user info in the user's session for the timespan defined
+   * in $conf['auth_security_timeout'].
+   *
+   * This makes sure slow authentication backends do not slow down DokuWiki.
+   * This also means that changes to the user database will not be reflected
+   * on currently logged in users.
+   *
+   * To accommodate for this, the user manager plugin will touch a reference
+   * file whenever a change is submitted. This function compares the filetime
+   * of this reference file with the time stored in the session.
+   *
+   * This reference file mechanism does not reflect changes done directly in
+   * the backend's database through other means than the user manager plugin.
+   *
+   * Fast backends might want to return always false, to force rechecks on
+   * each page load. Others might want to use their own checking here. If
+   * unsure, do not override.
+   *
+   * @param  string $user - The username
+   * @author Andreas Gohr <andi@splitbrain.org>
+   * @return bool
+   */
+  function useSessionCache($user){
+    global $conf;
+    return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
+  }
+
+}
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/elgg.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/elgg.class.php
new file mode 100644
index 000000000..c0a291832
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/elgg.class.php
@@ -0,0 +1,352 @@
+<?php
+/**
+ * Plaintext authentication backend
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ */
+
+define('DOKU_AUTH', dirname(__FILE__));
+require_once(DOKU_AUTH.'/basic.class.php');
+
+//define('AUTH_USERFILE',DOKU_CONF.'users.auth.php');
+
+class auth_elgg extends auth_basic {
+
+    var $users = null;
+    var $_pattern = array();
+
+    /**
+     * Constructor
+     *
+     * Carry out sanity checks to ensure the object is
+     * able to operate. Set capabilities.
+     *
+     * @author  Christopher Smith <chris@jalakai.co.uk>
+     */
+    function auth_elgg() {
+      //  $this->cando['addUser']      = true;
+      //  $this->cando['delUser']      = true;
+      //  $this->cando['modLogin']     = true;
+      //  $this->cando['modPass']      = true;
+      //  $this->cando['modName']      = true;
+      //  $this->cando['modMail']      = true;
+        $this->cando['getACL']    = true;
+        $this->cando['modGroups']    = true;
+ //       $this->cando['getUsers']     = true;
+        $this->cando['getUserCount'] = true;
+    }
+
+    /**
+     * Check user+password [required auth function]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @return  bool
+     */
+    function checkPass($user,$pass){
+	$user = get_user_by_username($user);
+	if ($user && $user->password == $pass)
+		return true;
+	/*if (authenticate($user, $pass)) {
+		return true;
+	}*/
+	return false;
+    }
+
+    /**
+     * Return user info
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function getUserData($username){
+	$user = get_user_by_username($username);
+	//error_log("getUserData:".$username);
+	if (!$user)
+		return false;
+	//error_log("getUserData:".$username);
+	$page_owner = elgg_get_page_owner_entity();
+	$grps = array();
+	if ($page_owner instanceof ElggGroup) {
+		if ($page_owner->canEdit($user->getGUID())) {
+			$grps[] = "admin";
+			$grps[] = "root";
+			//error_log('operator');
+		}
+		elseif ($page_owner->isMember($user)) {
+			$grps[] = "member";
+		}
+	}
+	elseif ($page_owner instanceof ElggUser) {
+		if ($page_owner == $user) {
+			$grps[] = "admin";
+		}
+		elseif ($page_owner->isFriendsWith($user->getGUID())) {
+			$grps[] = "member";
+		}
+	}
+	if ($user->isAdmin()) {
+		$grps[] = "root";
+		$grps[] = "admin";
+	}
+	$groups = elgg_get_entities_from_relationship(array('relationship' => 'member', 'relationship_guid' => $user->getGUID(), 'inverse_relationship' => FALSE, 'limit'=>0));
+	foreach($groups as $group) {
+		$grps[] = $this->cleanUser($group->name);
+	}
+	return array('name'=>$user->name, 'mail'=>$user->email, 'grps'=>$grps);
+    }
+
+    /**
+     * Create a new User
+     *
+     * Returns false if the user already exists, null when an error
+     * occurred and true if everything went well.
+     *
+     * The new user will be added to the default group by this
+     * function if grps are not specified (default behaviour).
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     */
+    function createUser($user,$pwd,$name,$mail,$grps=null){
+      global $conf;
+
+      // user mustn't already exist
+      if ($this->getUserData($user) !== false) return false;
+
+      $pass = auth_cryptPassword($pwd);
+
+      // set default group if no groups specified
+      if (!is_array($grps)) $grps = array($conf['defaultgroup']);
+
+      // prepare user line
+      $groups = join(',',$grps);
+      $userline = join(':',array($user,$pass,$name,$mail,$groups))."\n";
+
+      if (io_saveFile(AUTH_USERFILE,$userline,true)) {
+        $this->users[$user] = compact('pass','name','mail','grps');
+        return $pwd;
+      }
+
+      msg('The '.AUTH_USERFILE.' file is not writable. Please inform the Wiki-Admin',-1);
+      return null;
+    }
+
+    /**
+     * Modify user data
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @param   $user      nick of the user to be changed
+     * @param   $changes   array of field/value pairs to be changed (password will be clear text)
+     * @return  bool
+     */
+    function modifyUser($user, $changes) {
+      global $conf;
+      global $ACT;
+      global $INFO;
+
+      // sanity checks, user must already exist and there must be something to change
+      if (($userinfo = $this->getUserData($user)) === false) return false;
+      if (!is_array($changes) || !count($changes)) return true;
+
+      // update userinfo with new data, remembering to encrypt any password
+      $newuser = $user;
+      foreach ($changes as $field => $value) {
+        if ($field == 'user') {
+          $newuser = $value;
+          continue;
+        }
+        if ($field == 'pass') $value = auth_cryptPassword($value);
+        $userinfo[$field] = $value;
+      }
+
+      $groups = join(',',$userinfo['grps']);
+      $userline = join(':',array($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $groups))."\n";
+
+      if (!$this->deleteUsers(array($user))) {
+        msg('Unable to modify user data. Please inform the Wiki-Admin',-1);
+        return false;
+      }
+
+      if (!io_saveFile(AUTH_USERFILE,$userline,true)) {
+        msg('There was an error modifying your user data. You should register again.',-1);
+        // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+        $ACT == 'register';
+        return false;
+      }
+
+      $this->users[$newuser] = $userinfo;
+      return true;
+    }
+
+    /**
+     *  Remove one or more users from the list of registered users
+     *
+     *  @author  Christopher Smith <chris@jalakai.co.uk>
+     *  @param   array  $users   array of users to be deleted
+     *  @return  int             the number of users deleted
+     */
+    function deleteUsers($users) {
+
+      if (!is_array($users) || empty($users)) return 0;
+
+      if ($this->users === null) $this->_loadUserData();
+
+      $deleted = array();
+      foreach ($users as $user) {
+        if (isset($this->users[$user])) $deleted[] = preg_quote($user,'/');
+      }
+
+      if (empty($deleted)) return 0;
+
+      $pattern = '/^('.join('|',$deleted).'):/';
+
+      if (io_deleteFromFile(AUTH_USERFILE,$pattern,true)) {
+        foreach ($deleted as $user) unset($this->users[$user]);
+        return count($deleted);
+      }
+
+      // problem deleting, reload the user list and count the difference
+      $count = count($this->users);
+      $this->_loadUserData();
+      $count -= count($this->users);
+      return $count;
+    }
+
+    /**
+     * Return a count of the number of user which meet $filter criteria
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     */
+    function getUserCount($filter=array()) {
+	return get_number_users(true);
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @param   start     index of first user to be returned
+     * @param   limit     max number of users to be returned
+     * @param   filter    array of field/pattern pairs
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     */
+    function retrieveUsers($start=0,$limit=0,$filter=array()) {
+	$entities = elgg_get_entities(array('types'=>'user','limit'=>$limit, 'offset'=>$start));
+	$allusers = array();
+	foreach ($entities as $entity) {
+		$allusers[$entity->username] = getUserData($entity->username);
+	}
+	return $allusers;
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for usernames
+     */
+    function cleanUser($user){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$user));
+    }
+
+    function getACL(){
+	$doku = current_dokuwiki_entity();
+	elgg_set_ignore_access(true);
+	$acl = explode("\n" ,$doku->wiki_acl);
+	//error_log(json_encode($acl));
+	elgg_set_ignore_access(false);
+	return $acl;
+        global $conf;
+        $acl = array();
+	$acl[] = "# acl.auth.php";
+        $acl[] = '# <?php exit()?\>';
+        $acl[] = "*               @ALL        0";
+	$acl[] = "*               @user        1";
+	$acl[] = "*               @member        8";
+	$acl[] = "*               @admin        16";
+	$acl[] = "*               @root        255";
+	$acl[] = "*               @testers_de_la_red_social        8";
+        return $acl;
+    }
+    function setACL($newacl){
+	$doku = current_dokuwiki_entity();
+	elgg_set_ignore_access(true);
+	$doku->wiki_acl = $newacl;
+	elgg_set_ignore_access(false);
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for groupnames
+     */
+    function cleanGroup($group){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$group));
+    }
+
+    /**
+     * Load all user data
+     *
+     * loads the user file into a datastructure
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _loadUserData(){
+	//error_log("getUserData:");
+      $this->users = array();
+
+      if(!@file_exists(AUTH_USERFILE)) return;
+
+      $lines = file(AUTH_USERFILE);
+      foreach($lines as $line){
+        $line = preg_replace('/#.*$/','',$line); //ignore comments
+        $line = trim($line);
+        if(empty($line)) continue;
+
+        $row    = explode(":",$line,5);
+        $groups = array_values(array_filter(explode(",",$row[4])));
+
+        $this->users[$row[0]]['pass'] = $row[1];
+        $this->users[$row[0]]['name'] = urldecode($row[2]);
+        $this->users[$row[0]]['mail'] = $row[3];
+        $this->users[$row[0]]['grps'] = $groups;
+      }
+    }
+
+    /**
+     * return 1 if $user + $info match $filter criteria, 0 otherwise
+     *
+     * @author   Chris Smith <chris@jalakai.co.uk>
+     */
+    function _filter($user, $info) {
+        // FIXME
+        foreach ($this->_pattern as $item => $pattern) {
+            if ($item == 'user') {
+                if (!preg_match($pattern, $user)) return 0;
+            } else if ($item == 'grps') {
+                if (!count(preg_grep($pattern, $info['grps']))) return 0;
+            } else {
+                if (!preg_match($pattern, $info[$item])) return 0;
+            }
+        }
+        return 1;
+    }
+
+    function _constructPattern($filter) {
+      $this->_pattern = array();
+      foreach ($filter as $item => $pattern) {
+//        $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
+        $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
+      }
+    }
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/ldap.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/ldap.class.php
new file mode 100644
index 000000000..c51924135
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/ldap.class.php
@@ -0,0 +1,357 @@
+<?php
+/**
+ * LDAP authentication backend
+ *
+ * @license   GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author    Andreas Gohr <andi@splitbrain.org>
+ * @author    Chris Smith <chris@jalakaic.co.uk>
+ */
+
+class auth_ldap extends auth_basic {
+    var $cnf = null;
+    var $con = null;
+    var $bound = 0; // 0: anonymous, 1: user, 2: superuser
+
+    /**
+     * Constructor
+     */
+    function auth_ldap(){
+        global $conf;
+        $this->cnf = $conf['auth']['ldap'];
+
+        // ldap extension is needed
+        if(!function_exists('ldap_connect')) {
+            if ($this->cnf['debug'])
+                msg("LDAP err: PHP LDAP extension not found.",-1,__LINE__,__FILE__);
+            $this->success = false;
+            return;
+        }
+
+        if(empty($this->cnf['groupkey'])) $this->cnf['groupkey'] = 'cn';
+
+        // auth_ldap currently just handles authentication, so no
+        // capabilities are set
+    }
+
+    /**
+     * Check user+password
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct by trying to bind
+     * to the LDAP server
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @return  bool
+     */
+    function checkPass($user,$pass){
+        // reject empty password
+        if(empty($pass)) return false;
+        if(!$this->_openLDAP()) return false;
+
+        // indirect user bind
+        if($this->cnf['binddn'] && $this->cnf['bindpw']){
+            // use superuser credentials
+            if(!@ldap_bind($this->con,$this->cnf['binddn'],$this->cnf['bindpw'])){
+                if($this->cnf['debug'])
+                    msg('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                return false;
+            }
+            $this->bound = 2;
+        }else if($this->cnf['binddn'] &&
+                 $this->cnf['usertree'] &&
+                 $this->cnf['userfilter']) {
+            // special bind string
+            $dn = $this->_makeFilter($this->cnf['binddn'],
+                                     array('user'=>$user,'server'=>$this->cnf['server']));
+
+        }else if(strpos($this->cnf['usertree'], '%{user}')) {
+            // direct user bind
+            $dn = $this->_makeFilter($this->cnf['usertree'],
+                                     array('user'=>$user,'server'=>$this->cnf['server']));
+
+        }else{
+            // Anonymous bind
+            if(!@ldap_bind($this->con)){
+                msg("LDAP: can not bind anonymously",-1);
+                if($this->cnf['debug'])
+                    msg('LDAP anonymous bind: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                return false;
+            }
+        }
+
+        // Try to bind to with the dn if we have one.
+        if(!empty($dn)) {
+            // User/Password bind
+            if(!@ldap_bind($this->con,$dn,$pass)){
+                if($this->cnf['debug']){
+                    msg("LDAP: bind with $dn failed", -1,__LINE__,__FILE__);
+                    msg('LDAP user dn bind: '.htmlspecialchars(ldap_error($this->con)),0);
+                }
+                return false;
+            }
+            $this->bound = 1;
+            return true;
+        }else{
+            // See if we can find the user
+            $info = $this->getUserData($user,true);
+            if(empty($info['dn'])) {
+                return false;
+            } else {
+                $dn = $info['dn'];
+            }
+
+            // Try to bind with the dn provided
+            if(!@ldap_bind($this->con,$dn,$pass)){
+                if($this->cnf['debug']){
+                    msg("LDAP: bind with $dn failed", -1,__LINE__,__FILE__);
+                    msg('LDAP user bind: '.htmlspecialchars(ldap_error($this->con)),0);
+                }
+                return false;
+            }
+            $this->bound = 1;
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return user info
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * This LDAP specific function returns the following
+     * addional fields:
+     *
+     * dn     string  distinguished name (DN)
+     * uid    string  Posix User ID
+     * inbind bool    for internal use - avoid loop in binding
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Trouble
+     * @author  Dan Allen <dan.j.allen@gmail.com>
+     * @author  <evaldas.auryla@pheur.org>
+     * @author  Stephane Chazelas <stephane.chazelas@emerson.com>
+     * @return  array containing user data or false
+     */
+    function getUserData($user,$inbind=false) {
+        global $conf;
+        if(!$this->_openLDAP()) return false;
+
+        // force superuser bind if wanted and not bound as superuser yet
+        if($this->cnf['binddn'] && $this->cnf['bindpw'] && $this->bound < 2){
+            // use superuser credentials
+            if(!@ldap_bind($this->con,$this->cnf['binddn'],$this->cnf['bindpw'])){
+                if($this->cnf['debug'])
+                    msg('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                return false;
+            }
+            $this->bound = 2;
+        }elseif($this->bound == 0 && !$inbind) {
+            // in some cases getUserData is called outside the authentication workflow
+            // eg. for sending email notification on subscribed pages. This data might not
+            // be accessible anonymously, so we try to rebind the current user here
+            $pass = PMA_blowfish_decrypt($_SESSION[DOKU_COOKIE]['auth']['pass'],auth_cookiesalt());
+            $this->checkPass($_SESSION[DOKU_COOKIE]['auth']['user'], $pass);
+        }
+
+        $info['user']   = $user;
+        $info['server'] = $this->cnf['server'];
+
+        //get info for given user
+        $base = $this->_makeFilter($this->cnf['usertree'], $info);
+        if(!empty($this->cnf['userfilter'])) {
+            $filter = $this->_makeFilter($this->cnf['userfilter'], $info);
+        } else {
+            $filter = "(ObjectClass=*)";
+        }
+
+        $sr     = @ldap_search($this->con, $base, $filter);
+        $result = @ldap_get_entries($this->con, $sr);
+        if($this->cnf['debug']){
+            msg('LDAP user search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+            msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
+        }
+
+        // Don't accept more or less than one response
+        if(!is_array($result) || $result['count'] != 1){
+            return false; //user not found
+        }
+
+        $user_result = $result[0];
+        ldap_free_result($sr);
+
+        // general user info
+        $info['dn']   = $user_result['dn'];
+        $info['gid']  = $user_result['gidnumber'][0];
+        $info['mail'] = $user_result['mail'][0];
+        $info['name'] = $user_result['cn'][0];
+        $info['grps'] = array();
+
+        // overwrite if other attribs are specified.
+        if(is_array($this->cnf['mapping'])){
+            foreach($this->cnf['mapping'] as $localkey => $key) {
+                if(is_array($key)) {
+                    // use regexp to clean up user_result
+                    list($key, $regexp) = each($key);
+                    if($user_result[$key]) foreach($user_result[$key] as $grp){
+                        if (preg_match($regexp,$grp,$match)) {
+                            if($localkey == 'grps') {
+                                $info[$localkey][] = $match[1];
+                            } else {
+                                $info[$localkey] = $match[1];
+                            }
+                        }
+                    }
+                } else {
+                    $info[$localkey] = $user_result[$key][0];
+                }
+            }
+        }
+        $user_result = array_merge($info,$user_result);
+
+        //get groups for given user if grouptree is given
+        if ($this->cnf['grouptree'] && $this->cnf['groupfilter']) {
+            $base   = $this->_makeFilter($this->cnf['grouptree'], $user_result);
+            $filter = $this->_makeFilter($this->cnf['groupfilter'], $user_result);
+            $sr = @ldap_search($this->con, $base, $filter, array($this->cnf['groupkey']));
+            if(!$sr){
+                msg("LDAP: Reading group memberships failed",-1);
+                if($this->cnf['debug']){
+                    msg('LDAP group search: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                    msg('LDAP search at: '.htmlspecialchars($base.' '.$filter),0,__LINE__,__FILE__);
+                }
+                return false;
+            }
+            $result = ldap_get_entries($this->con, $sr);
+            ldap_free_result($sr);
+
+            if(is_array($result)) foreach($result as $grp){
+                if(!empty($grp[$this->cnf['groupkey']][0])){
+                    if($this->cnf['debug'])
+                        msg('LDAP usergroup: '.htmlspecialchars($grp[$this->cnf['groupkey']][0]),0,__LINE__,__FILE__);
+                    $info['grps'][] = $grp[$this->cnf['groupkey']][0];
+                }
+            }
+        }
+
+        // always add the default group to the list of groups
+        if(!in_array($conf['defaultgroup'],$info['grps'])){
+            $info['grps'][] = $conf['defaultgroup'];
+        }
+        return $info;
+    }
+
+    /**
+     * Most values in LDAP are case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
+     * Make LDAP filter strings.
+     *
+     * Used by auth_getUserData to make the filter
+     * strings for grouptree and groupfilter
+     *
+     * filter      string  ldap search filter with placeholders
+     * placeholders array   array with the placeholders
+     *
+     * @author  Troels Liebe Bentsen <tlb@rapanden.dk>
+     * @return  string
+     */
+    function _makeFilter($filter, $placeholders) {
+        preg_match_all("/%{([^}]+)/", $filter, $matches, PREG_PATTERN_ORDER);
+        //replace each match
+        foreach ($matches[1] as $match) {
+            //take first element if array
+            if(is_array($placeholders[$match])) {
+                $value = $placeholders[$match][0];
+            } else {
+                $value = $placeholders[$match];
+            }
+            $value = $this->_filterEscape($value);
+            $filter = str_replace('%{'.$match.'}', $value, $filter);
+        }
+        return $filter;
+    }
+
+    /**
+     * Escape a string to be used in a LDAP filter
+     *
+     * Ported from Perl's Net::LDAP::Util escape_filter_value
+     *
+     * @author Andreas Gohr
+     */
+    function _filterEscape($string){
+        return preg_replace('/([\x00-\x1F\*\(\)\\\\])/e',
+                            '"\\\\\".join("",unpack("H2","$1"))',
+                            $string);
+    }
+
+    /**
+     * Opens a connection to the configured LDAP server and sets the wanted
+     * option on the connection
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _openLDAP(){
+        if($this->con) return true; // connection already established
+
+        $this->bound = 0;
+
+        $port = ($this->cnf['port']) ? $this->cnf['port'] : 389;
+        $this->con = @ldap_connect($this->cnf['server'],$port);
+        if(!$this->con){
+            msg("LDAP: couldn't connect to LDAP server",-1);
+            return false;
+        }
+
+        //set protocol version and dependend options
+        if($this->cnf['version']){
+            if(!@ldap_set_option($this->con, LDAP_OPT_PROTOCOL_VERSION,
+                                 $this->cnf['version'])){
+                msg('Setting LDAP Protocol version '.$this->cnf['version'].' failed',-1);
+                if($this->cnf['debug'])
+                    msg('LDAP version set: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+            }else{
+                //use TLS (needs version 3)
+                if($this->cnf['starttls']) {
+                    if (!@ldap_start_tls($this->con)){
+                        msg('Starting TLS failed',-1);
+                        if($this->cnf['debug'])
+                            msg('LDAP TLS set: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                    }
+                }
+                // needs version 3
+                if(isset($this->cnf['referrals'])) {
+                    if(!@ldap_set_option($this->con, LDAP_OPT_REFERRALS,
+                       $this->cnf['referrals'])){
+                        msg('Setting LDAP referrals to off failed',-1);
+                        if($this->cnf['debug'])
+                            msg('LDAP referal set: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+                    }
+                }
+            }
+        }
+
+        //set deref mode
+        if($this->cnf['deref']){
+            if(!@ldap_set_option($this->con, LDAP_OPT_DEREF, $this->cnf['deref'])){
+                msg('Setting LDAP Deref mode '.$this->cnf['deref'].' failed',-1);
+                if($this->cnf['debug'])
+                    msg('LDAP deref set: '.htmlspecialchars(ldap_error($this->con)),0,__LINE__,__FILE__);
+            }
+        }
+
+        return true;
+    }
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/mysql.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/mysql.class.php
new file mode 100644
index 000000000..b1c6a3a52
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/mysql.class.php
@@ -0,0 +1,942 @@
+<?php
+/**
+ * MySQLP authentication backend
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ * @author     Matthias Grimm <matthias.grimmm@sourceforge.net>
+*/
+
+define('DOKU_AUTH', dirname(__FILE__));
+require_once(DOKU_AUTH.'/basic.class.php');
+
+class auth_mysql extends auth_basic {
+
+    var $dbcon        = 0;
+    var $dbver        = 0;    // database version
+    var $dbrev        = 0;    // database revision
+    var $dbsub        = 0;    // database subrevision
+    var $cnf          = null;
+    var $defaultgroup = "";
+
+    /**
+     * Constructor
+     *
+     * checks if the mysql interface is available, otherwise it will
+     * set the variable $success of the basis class to false
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function auth_mysql() {
+      global $conf;
+      $this->cnf          = $conf['auth']['mysql'];
+
+      if (method_exists($this, 'auth_basic'))
+        parent::auth_basic();
+
+      if(!function_exists('mysql_connect')) {
+        if ($this->cnf['debug'])
+          msg("MySQL err: PHP MySQL extension not found.",-1,__LINE__,__FILE__);
+        $this->success = false;
+        return;
+      }
+
+      // default to UTF-8, you rarely want something else
+      if(!isset($this->cnf['charset'])) $this->cnf['charset'] = 'utf8';
+
+      $this->defaultgroup = $conf['defaultgroup'];
+
+      // set capabilities based upon config strings set
+      if (empty($this->cnf['server']) || empty($this->cnf['user']) ||
+          empty($this->cnf['password']) || empty($this->cnf['database'])){
+        if ($this->cnf['debug'])
+          msg("MySQL err: insufficient configuration.",-1,__LINE__,__FILE__);
+        $this->success = false;
+        return;
+      }
+
+      $this->cando['addUser']      = $this->_chkcnf(array('getUserInfo',
+                                                          'getGroups',
+                                                          'addUser',
+                                                          'getUserID',
+                                                          'getGroupID',
+                                                          'addGroup',
+                                                          'addUserGroup'),true);
+      $this->cando['delUser']      = $this->_chkcnf(array('getUserID',
+                                                          'delUser',
+                                                          'delUserRefs'),true);
+      $this->cando['modLogin']     = $this->_chkcnf(array('getUserID',
+                                                          'updateUser',
+                                                          'UpdateTarget'),true);
+      $this->cando['modPass']      = $this->cando['modLogin'];
+      $this->cando['modName']      = $this->cando['modLogin'];
+      $this->cando['modMail']      = $this->cando['modLogin'];
+      $this->cando['modGroups']    = $this->_chkcnf(array('getUserID',
+                                                          'getGroups',
+                                                          'getGroupID',
+                                                          'addGroup',
+                                                          'addUserGroup',
+                                                          'delGroup',
+                                                          'getGroupID',
+                                                          'delUserGroup'),true);
+      /* getGroups is not yet supported
+      $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+                                                          'getGroupID'),false); */
+      $this->cando['getUsers']     = $this->_chkcnf(array('getUsers',
+                                                          'getUserInfo',
+                                                          'getGroups'),false);
+      $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'),false);
+    }
+
+    /**
+     * Check if the given config strings are set
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     * @return  bool
+     */
+    function _chkcnf($keys, $wop=false){
+      foreach ($keys as $key){
+        if (empty($this->cnf[$key])) return false;
+      }
+
+      /* write operation and lock array filled with tables names? */
+      if ($wop && (!is_array($this->cnf['TablesToLock']) ||
+                   !count($this->cnf['TablesToLock']))){
+        return false;
+      }
+
+      return true;
+    }
+
+    /**
+     * Checks if the given user exists and the given plaintext password
+     * is correct. Furtheron it might be checked wether the user is
+     * member of the right group
+     *
+     * Depending on which SQL string is defined in the config, password
+     * checking is done here (getpass) or by the database (passcheck)
+     *
+     * @param  $user  user who would like access
+     * @param  $pass  user's clear text password to check
+     * @return bool
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function checkPass($user,$pass){
+      $rc  = false;
+
+      if($this->_openDB()) {
+        $sql    = str_replace('%{user}',$this->_escape($user),$this->cnf['checkPass']);
+        $sql    = str_replace('%{pass}',$this->_escape($pass),$sql);
+        $sql    = str_replace('%{dgroup}',$this->_escape($this->defaultgroup),$sql);
+        $result = $this->_queryDB($sql);
+
+        if($result !== false && count($result) == 1) {
+          if($this->cnf['forwardClearPass'] == 1)
+            $rc = true;
+          else
+            $rc = auth_verifyPassword($pass,$result[0]['pass']);
+        }
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * [public function]
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *   name  string  full name of the user
+     *   mail  string  email addres of the user
+     *   grps  array   list of groups the user is in
+     *
+     * @param $user   user's nick to get data for
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function getUserData($user){
+      if($this->_openDB()) {
+        $this->_lockTables("READ");
+        $info = $this->_getUserInfo($user);
+        $this->_unlockTables();
+        $this->_closeDB();
+      } else
+        $info = false;
+      return $info;
+    }
+
+    /**
+     * [public function]
+     *
+     * Create a new User. Returns false if the user already exists,
+     * null when an error occurred and true if everything went well.
+     *
+     * The new user will be added to the default group by this
+     * function if grps are not specified (default behaviour).
+     *
+     * @param $user  nick of the user
+     * @param $pwd   clear text password
+     * @param $name  full name of the user
+     * @param $mail  email address
+     * @param $grps  array of groups the user should become member of
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function createUser($user,$pwd,$name,$mail,$grps=null){
+      if($this->_openDB()) {
+        if (($info = $this->_getUserInfo($user)) !== false)
+          return false;  // user already exists
+
+        // set defaultgroup if no groups were given
+        if ($grps == null)
+          $grps = array($this->defaultgroup);
+
+        $this->_lockTables("WRITE");
+        $pwd = $this->cnf['forwardClearPass'] ? $pwd : auth_cryptPassword($pwd);
+        $rc = $this->_addUser($user,$pwd,$name,$mail,$grps);
+        $this->_unlockTables();
+        $this->_closeDB();
+        if ($rc) return true;
+      }
+      return null;  // return error
+    }
+
+    /**
+     * Modify user data [public function]
+     *
+     * An existing user dataset will be modified. Changes are given in an array.
+     *
+     * The dataset update will be rejected if the user name should be changed
+     * to an already existing one.
+     *
+     * The password must be provides unencrypted. Pasword cryption is done
+     * automatically if configured.
+     *
+     * If one or more groups could't be updated, an error would be set. In
+     * this case the dataset might already be changed and we can't rollback
+     * the changes. Transactions would be really usefull here.
+     *
+     * modifyUser() may be called without SQL statements defined that are
+     * needed to change group membership (for example if only the user profile
+     * should be modified). In this case we asure that we don't touch groups
+     * even $changes['grps'] is set by mistake.
+     *
+     * @param   $user     nick of the user to be changed
+     * @param   $changes  array of field/value pairs to be changed (password
+     *                    will be clear text)
+     * @return  bool      true on success, false on error
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function modifyUser($user, $changes) {
+      $rc = false;
+
+      if (!is_array($changes) || !count($changes))
+        return true;  // nothing to change
+
+      if($this->_openDB()) {
+        $this->_lockTables("WRITE");
+
+        if (($uid = $this->_getUserID($user))) {
+          $rc = $this->_updateUserInfo($changes, $uid);
+
+          if ($rc && isset($changes['grps']) && $this->cando['modGroups']) {
+            $groups = $this->_getGroups($user);
+            $grpadd = array_diff($changes['grps'], $groups);
+            $grpdel = array_diff($groups, $changes['grps']);
+
+            foreach($grpadd as $group)
+              if (($this->_addUserToGroup($user, $group, 1)) == false)
+                $rc = false;
+
+            foreach($grpdel as $group)
+              if (($this->_delUserFromGroup($user, $group)) == false)
+                $rc = false;
+          }
+        }
+
+        $this->_unlockTables();
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * [public function]
+     *
+     * Remove one or more users from the list of registered users
+     *
+     * @param   array  $users   array of users to be deleted
+     * @return  int             the number of users deleted
+     *
+     * @author  Christopher Smith <chris@jalakai.co.uk>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function deleteUsers($users) {
+      $count = 0;
+
+      if($this->_openDB()) {
+        if (is_array($users) && count($users)) {
+          $this->_lockTables("WRITE");
+          foreach ($users as $user) {
+            if ($this->_delUser($user))
+              $count++;
+          }
+          $this->_unlockTables();
+        }
+        $this->_closeDB();
+      }
+      return $count;
+    }
+
+    /**
+     * [public function]
+     *
+     * Counts users which meet certain $filter criteria.
+     *
+     * @param  array  $filter  filter criteria in item/pattern pairs
+     * @return count of found users.
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function getUserCount($filter=array()) {
+      $rc = 0;
+
+      if($this->_openDB()) {
+        $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+
+        if ($this->dbver >= 4) {
+          $sql = substr($sql, 6);  /* remove 'SELECT' or 'select' */
+          $sql = "SELECT SQL_CALC_FOUND_ROWS".$sql." LIMIT 1";
+          $this->_queryDB($sql);
+          $result = $this->_queryDB("SELECT FOUND_ROWS()");
+          $rc = $result[0]['FOUND_ROWS()'];
+        } else if (($result = $this->_queryDB($sql)))
+          $rc = count($result);
+
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * Bulk retrieval of user data. [public function]
+     *
+     * @param   first     index of first user to be returned
+     * @param   limit     max number of users to be returned
+     * @param   filter    array of field/pattern pairs
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function retrieveUsers($first=0,$limit=10,$filter=array()) {
+      $out   = array();
+
+      if($this->_openDB()) {
+        $this->_lockTables("READ");
+        $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+        $sql .= " ".$this->cnf['SortOrder']." LIMIT $first, $limit";
+        $result = $this->_queryDB($sql);
+
+        if (!empty($result)) {
+          foreach ($result as $user)
+            if (($info = $this->_getUserInfo($user['user'])))
+              $out[$user['user']] = $info;
+        }
+
+        $this->_unlockTables();
+        $this->_closeDB();
+      }
+      return $out;
+    }
+
+    /**
+     * Give user membership of a group [public function]
+     *
+     * @param   $user
+     * @param   $group
+     * @return  bool    true on success, false on error
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function joinGroup($user, $group) {
+      $rc = false;
+
+      if ($this->_openDB()) {
+        $this->_lockTables("WRITE");
+        $rc  = $this->_addUserToGroup($user, $group);
+        $this->_unlockTables();
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * Remove user from a group [public function]
+     *
+     * @param   $user    user that leaves a group
+     * @param   $group   group to leave
+     * @return  bool
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function leaveGroup($user, $group) {
+      $rc = false;
+
+      if ($this->_openDB()) {
+        $this->_lockTables("WRITE");
+        $uid = $this->_getUserID($user);
+        $rc  = $this->_delUserFromGroup($user, $group);
+        $this->_unlockTables();
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * MySQL is case-insensitive
+     */
+    function isCaseSensitive(){
+        return false;
+    }
+
+    /**
+     * Adds a user to a group.
+     *
+     * If $force is set to '1' non existing groups would be created.
+     *
+     * The database connection must already be established. Otherwise
+     * this function does nothing and returns 'false'. It is strongly
+     * recommended to call this function only after all participating
+     * tables (group and usergroup) have been locked.
+     *
+     * @param   $user    user to add to a group
+     * @param   $group   name of the group
+     * @param   $force   '1' create missing groups
+     * @return  bool     'true' on success, 'false' on error
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _addUserToGroup($user, $group, $force=0) {
+      $newgroup = 0;
+
+      if (($this->dbcon) && ($user)) {
+        $gid = $this->_getGroupID($group);
+        if (!$gid) {
+          if ($force) {  // create missing groups
+            $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['addGroup']);
+            $gid = $this->_modifyDB($sql);
+            $newgroup = 1;  // group newly created
+          }
+          if (!$gid) return false; // group didn't exist and can't be created
+        }
+
+        $sql = $this->cnf['addUserGroup'];
+        if(strpos($sql,'%{uid}') !== false){
+            $uid = $this->_getUserID($user);
+            $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
+        }
+        $sql = str_replace('%{user}', $this->_escape($user),$sql);
+        $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
+        $sql = str_replace('%{group}',$this->_escape($group),$sql);
+        if ($this->_modifyDB($sql) !== false) return true;
+
+        if ($newgroup) { // remove previously created group on error
+          $sql = str_replace('%{gid}',  $this->_escape($gid),$this->cnf['delGroup']);
+          $sql = str_replace('%{group}',$this->_escape($group),$sql);
+          $this->_modifyDB($sql);
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Remove user from a group
+     *
+     * @param   $user    user that leaves a group
+     * @param   $group   group to leave
+     * @return  bool     true on success, false on error
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _delUserFromGroup($user, $group) {
+      $rc = false;
+
+
+      if (($this->dbcon) && ($user)) {
+        $sql = $this->cnf['delUserGroup'];
+        if(strpos($sql,'%{uid}') !== false){
+            $uid = $this->_getUserID($user);
+            $sql = str_replace('%{uid}',  $this->_escape($uid),$sql);
+        }
+        $gid = $this->_getGroupID($group);
+        if ($gid) {
+          $sql = str_replace('%{user}', $this->_escape($user),$sql);
+          $sql = str_replace('%{gid}',  $this->_escape($gid),$sql);
+          $sql = str_replace('%{group}',$this->_escape($group),$sql);
+          $rc  = $this->_modifyDB($sql) == 0 ? true : false;
+        }
+      }
+      return $rc;
+    }
+
+    /**
+     * Retrieves a list of groups the user is a member off.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $user  user whose groups should be listed
+     * @return bool   false on error
+     * @return array  array containing all groups on success
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _getGroups($user) {
+      $groups = array();
+
+      if($this->dbcon) {
+        $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getGroups']);
+        $result = $this->_queryDB($sql);
+
+        if($result !== false && count($result)) {
+          foreach($result as $row)
+            $groups[] = $row['group'];
+        }
+        return $groups;
+      }
+      return false;
+    }
+
+    /**
+     * Retrieves the user id of a given user name
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $user   user whose id is desired
+     * @return user id
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _getUserID($user) {
+      if($this->dbcon) {
+        $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserID']);
+        $result = $this->_queryDB($sql);
+        return $result === false ? false : $result[0]['id'];
+      }
+      return false;
+    }
+
+    /**
+     * Adds a new User to the database.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $user  login of the user
+     * @param  $pwd   encrypted password
+     * @param  $name  full name of the user
+     * @param  $mail  email address
+     * @param  $grps  array of groups the user should become member of
+     * @return bool
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _addUser($user,$pwd,$name,$mail,$grps){
+      if($this->dbcon && is_array($grps)) {
+        $sql = str_replace('%{user}', $this->_escape($user),$this->cnf['addUser']);
+        $sql = str_replace('%{pass}', $this->_escape($pwd),$sql);
+        $sql = str_replace('%{name}', $this->_escape($name),$sql);
+        $sql = str_replace('%{email}',$this->_escape($mail),$sql);
+        $uid = $this->_modifyDB($sql);
+
+        if ($uid) {
+          foreach($grps as $group) {
+            $gid = $this->_addUserToGroup($user, $group, 1);
+            if ($gid === false) break;
+          }
+
+          if ($gid) return true;
+          else {
+            /* remove the new user and all group relations if a group can't
+             * be assigned. Newly created groups will remain in the database
+             * and won't be removed. This might create orphaned groups but
+             * is not a big issue so we ignore this problem here.
+             */
+            $this->_delUser($user);
+            if ($this->cnf['debug'])
+              msg ("MySQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Deletes a given user and all his group references.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $user   user whose id is desired
+     * @return bool
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _delUser($user) {
+      if($this->dbcon) {
+        $uid = $this->_getUserID($user);
+        if ($uid) {
+          $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUserRefs']);
+          $this->_modifyDB($sql);
+          $sql = str_replace('%{uid}',$this->_escape($uid),$this->cnf['delUser']);
+          $sql = str_replace('%{user}',  $this->_escape($user),$sql);
+          $this->_modifyDB($sql);
+          return true;
+        }
+      }
+      return false;
+    }
+
+    /**
+     * getUserInfo
+     *
+     * Gets the data for a specific user The database connection
+     * must already be established for this function to work.
+     * Otherwise it will return 'false'.
+     *
+     * @param  $user  user's nick to get data for
+     * @return bool   false on error
+     * @return array  user info on success
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _getUserInfo($user){
+      $sql = str_replace('%{user}',$this->_escape($user),$this->cnf['getUserInfo']);
+      $result = $this->_queryDB($sql);
+      if($result !== false && count($result)) {
+        $info = $result[0];
+        $info['grps'] = $this->_getGroups($user);
+        return $info;
+      }
+      return false;
+    }
+
+    /**
+     * Updates the user info in the database
+     *
+     * Update a user data structure in the database according changes
+     * given in an array. The user name can only be changes if it didn't
+     * exists already. If the new user name exists the update procedure
+     * will be aborted. The database keeps unchanged.
+     *
+     * The database connection has already to be established for this
+     * function to work. Otherwise it will return 'false'.
+     *
+     * The password will be crypted if necessary.
+     *
+     * @param  $changes  array of items to change as pairs of item and value
+     * @param  $uid      user id of dataset to change, must be unique in DB
+     * @return true on success or false on error
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _updateUserInfo($changes, $uid) {
+      $sql  = $this->cnf['updateUser']." ";
+      $cnt = 0;
+      $err = 0;
+
+      if($this->dbcon) {
+        foreach ($changes as $item => $value) {
+          if ($item == 'user') {
+            if (($this->_getUserID($changes['user']))) {
+              $err = 1; /* new username already exists */
+              break;    /* abort update */
+            }
+            if ($cnt++ > 0) $sql .= ", ";
+            $sql .= str_replace('%{user}',$value,$this->cnf['UpdateLogin']);
+          } else if ($item == 'name') {
+            if ($cnt++ > 0) $sql .= ", ";
+            $sql .= str_replace('%{name}',$value,$this->cnf['UpdateName']);
+          } else if ($item == 'pass') {
+            if (!$this->cnf['forwardClearPass'])
+              $value = auth_cryptPassword($value);
+            if ($cnt++ > 0) $sql .= ", ";
+            $sql .= str_replace('%{pass}',$value,$this->cnf['UpdatePass']);
+          } else if ($item == 'mail') {
+            if ($cnt++ > 0) $sql .= ", ";
+            $sql .= str_replace('%{email}',$value,$this->cnf['UpdateEmail']);
+          }
+        }
+
+        if ($err == 0) {
+          if ($cnt > 0) {
+            $sql .= " ".str_replace('%{uid}', $uid, $this->cnf['UpdateTarget']);
+            if(get_class($this) == 'auth_mysql') $sql .= " LIMIT 1"; //some PgSQL inheritance comp.
+            $this->_modifyDB($sql);
+          }
+          return true;
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Retrieves the group id of a given group name
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $group   group name which id is desired
+     * @return group id
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _getGroupID($group) {
+      if($this->dbcon) {
+        $sql = str_replace('%{group}',$this->_escape($group),$this->cnf['getGroupID']);
+        $result = $this->_queryDB($sql);
+        return $result === false ? false : $result[0]['id'];
+      }
+      return false;
+    }
+
+    /**
+     * Opens a connection to a database and saves the handle for further
+     * usage in the object. The successful call to this functions is
+     * essential for most functions in this object.
+     *
+     * @return bool
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _openDB() {
+      if (!$this->dbcon) {
+        $con = @mysql_connect ($this->cnf['server'], $this->cnf['user'], $this->cnf['password']);
+        if ($con) {
+          if ((mysql_select_db($this->cnf['database'], $con))) {
+            if ((preg_match("/^(\d+)\.(\d+)\.(\d+).*/", mysql_get_server_info ($con), $result)) == 1) {
+              $this->dbver = $result[1];
+              $this->dbrev = $result[2];
+              $this->dbsub = $result[3];
+            }
+            $this->dbcon = $con;
+            if(!empty($this->cnf['charset'])){
+                 mysql_query('SET CHARACTER SET "' . $this->cnf['charset'] . '"', $con);
+            }
+            return true;   // connection and database successfully opened
+          } else {
+            mysql_close ($con);
+            if ($this->cnf['debug'])
+              msg("MySQL err: No access to database {$this->cnf['database']}.",-1,__LINE__,__FILE__);
+          }
+        } else if ($this->cnf['debug'])
+          msg ("MySQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
+               -1,__LINE__,__FILE__);
+
+        return false;  // connection failed
+      }
+      return true;  // connection already open
+    }
+
+    /**
+     * Closes a database connection.
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _closeDB() {
+      if ($this->dbcon) {
+        mysql_close ($this->dbcon);
+        $this->dbcon = 0;
+      }
+    }
+
+    /**
+     * Sends a SQL query to the database and transforms the result into
+     * an associative array.
+     *
+     * This function is only able to handle queries that returns a
+     * table such as SELECT.
+     *
+     * @param $query  SQL string that contains the query
+     * @return array with the result table
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _queryDB($query) {
+      if($this->cnf['debug'] >= 2){
+        msg('MySQL query: '.hsc($query),0,__LINE__,__FILE__);
+      }
+
+      $resultarray = array();
+      if ($this->dbcon) {
+        $result = @mysql_query($query,$this->dbcon);
+        if ($result) {
+          while (($t = mysql_fetch_assoc($result)) !== false)
+            $resultarray[]=$t;
+          mysql_free_result ($result);
+          return $resultarray;
+        }
+        if ($this->cnf['debug'])
+          msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
+      }
+      return false;
+    }
+
+    /**
+     * Sends a SQL query to the database
+     *
+     * This function is only able to handle queries that returns
+     * either nothing or an id value such as INPUT, DELETE, UPDATE, etc.
+     *
+     * @param $query  SQL string that contains the query
+     * @return insert id or 0, false on error
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _modifyDB($query) {
+      if ($this->dbcon) {
+        $result = @mysql_query($query,$this->dbcon);
+        if ($result) {
+          $rc = mysql_insert_id($this->dbcon); //give back ID on insert
+          if ($rc !== false) return $rc;
+        }
+        if ($this->cnf['debug'])
+          msg('MySQL err: '.mysql_error($this->dbcon),-1,__LINE__,__FILE__);
+      }
+      return false;
+    }
+
+    /**
+     * Locked a list of tables for exclusive access so that modifications
+     * to the database can't be disturbed by other threads. The list
+     * could be set with $conf['auth']['mysql']['TablesToLock'] = array()
+     *
+     * If aliases for tables are used in SQL statements, also this aliases
+     * must be locked. For eg. you use a table 'user' and the alias 'u' in
+     * some sql queries, the array must looks like this (order is important):
+     *   array("user", "user AS u");
+     *
+     * MySQL V3 is not able to handle transactions with COMMIT/ROLLBACK
+     * so that this functionality is simulated by this function. Nevertheless
+     * it is not as powerful as transactions, it is a good compromise in safty.
+     *
+     * @param $mode  could be 'READ' or 'WRITE'
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _lockTables($mode) {
+      if ($this->dbcon) {
+        if (is_array($this->cnf['TablesToLock']) && !empty($this->cnf['TablesToLock'])) {
+          if ($mode == "READ" || $mode == "WRITE") {
+            $sql = "LOCK TABLES ";
+            $cnt = 0;
+            foreach ($this->cnf['TablesToLock'] as $table) {
+              if ($cnt++ != 0) $sql .= ", ";
+              $sql .= "$table $mode";
+            }
+            $this->_modifyDB($sql);
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Unlock locked tables. All existing locks of this thread will be
+     * abrogated.
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _unlockTables() {
+      if ($this->dbcon) {
+        $this->_modifyDB("UNLOCK TABLES");
+        return true;
+      }
+      return false;
+    }
+
+    /**
+     * Transforms the filter settings in an filter string for a SQL database
+     * The database connection must already be established, otherwise the
+     * original SQL string without filter criteria will be returned.
+     *
+     * @param  $sql     SQL string to which the $filter criteria should be added
+     * @param  $filter  array of filter criteria as pairs of item and pattern
+     * @return SQL string with attached $filter criteria on success
+     * @return the original SQL string on error.
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _createSQLFilter($sql, $filter) {
+      $SQLfilter = "";
+      $cnt = 0;
+
+      if ($this->dbcon) {
+        foreach ($filter as $item => $pattern) {
+          $tmp = '%'.$this->_escape($pattern).'%';
+          if ($item == 'user') {
+            if ($cnt++ > 0) $SQLfilter .= " AND ";
+            $SQLfilter .= str_replace('%{user}',$tmp,$this->cnf['FilterLogin']);
+          } else if ($item == 'name') {
+            if ($cnt++ > 0) $SQLfilter .= " AND ";
+            $SQLfilter .= str_replace('%{name}',$tmp,$this->cnf['FilterName']);
+          } else if ($item == 'mail') {
+            if ($cnt++ > 0) $SQLfilter .= " AND ";
+            $SQLfilter .= str_replace('%{email}',$tmp,$this->cnf['FilterEmail']);
+          } else if ($item == 'grps') {
+            if ($cnt++ > 0) $SQLfilter .= " AND ";
+            $SQLfilter .= str_replace('%{group}',$tmp,$this->cnf['FilterGroup']);
+          }
+        }
+
+        // we have to check SQLfilter here and must not use $cnt because if
+        // any of cnf['Filter????'] is not defined, a malformed SQL string
+        // would be generated.
+
+        if (strlen($SQLfilter)) {
+          $glue = strpos(strtolower($sql),"where") ? " AND " : " WHERE ";
+          $sql = $sql.$glue.$SQLfilter;
+        }
+      }
+
+      return $sql;
+    }
+
+    /**
+     * Escape a string for insertion into the database
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param  string  $string The string to escape
+     * @param  boolean $like   Escape wildcard chars as well?
+     */
+    function _escape($string,$like=false){
+      if($this->dbcon){
+        $string = mysql_real_escape_string($string, $this->dbcon);
+      }else{
+        $string = addslashes($string);
+      }
+      if($like){
+        $string = addcslashes($string,'%_');
+      }
+      return $string;
+    }
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/pgsql.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/pgsql.class.php
new file mode 100644
index 000000000..a6da56af5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/pgsql.class.php
@@ -0,0 +1,411 @@
+<?php
+/**
+ * PgSQL authentication backend
+ *
+ * This class inherits much functionality from the MySQL class
+ * and just reimplements the Postgres specific parts.
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ * @author     Matthias Grimm <matthias.grimmm@sourceforge.net>
+*/
+
+define('DOKU_AUTH', dirname(__FILE__));
+require_once(DOKU_AUTH.'/mysql.class.php');
+
+class auth_pgsql extends auth_mysql {
+
+    /**
+     * Constructor
+     *
+     * checks if the pgsql interface is available, otherwise it will
+     * set the variable $success of the basis class to false
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function auth_pgsql() {
+      global $conf;
+      $this->cnf          = $conf['auth']['pgsql'];
+      if(!$this->cnf['port']) $this->cnf['port'] = 5432;
+
+      if (method_exists($this, 'auth_basic'))
+        parent::auth_basic();
+
+      if(!function_exists('pg_connect')) {
+        if ($this->cnf['debug'])
+          msg("PgSQL err: PHP Postgres extension not found.",-1);
+        $this->success = false;
+        return;
+      }
+
+      $this->defaultgroup = $conf['defaultgroup'];
+
+      // set capabilities based upon config strings set
+      if (empty($this->cnf['user']) ||
+          empty($this->cnf['password']) || empty($this->cnf['database'])){
+        if ($this->cnf['debug'])
+          msg("PgSQL err: insufficient configuration.",-1,__LINE__,__FILE__);
+        $this->success = false;
+        return;
+      }
+
+      $this->cando['addUser']      = $this->_chkcnf(array('getUserInfo',
+                                                          'getGroups',
+                                                          'addUser',
+                                                          'getUserID',
+                                                          'getGroupID',
+                                                          'addGroup',
+                                                          'addUserGroup'));
+      $this->cando['delUser']      = $this->_chkcnf(array('getUserID',
+                                                          'delUser',
+                                                          'delUserRefs'));
+      $this->cando['modLogin']     = $this->_chkcnf(array('getUserID',
+                                                          'updateUser',
+                                                          'UpdateTarget'));
+      $this->cando['modPass']      = $this->cando['modLogin'];
+      $this->cando['modName']      = $this->cando['modLogin'];
+      $this->cando['modMail']      = $this->cando['modLogin'];
+      $this->cando['modGroups']    = $this->_chkcnf(array('getUserID',
+                                                          'getGroups',
+                                                          'getGroupID',
+                                                          'addGroup',
+                                                          'addUserGroup',
+                                                          'delGroup',
+                                                          'getGroupID',
+                                                          'delUserGroup'));
+      /* getGroups is not yet supported
+      $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+                                                          'getGroupID')); */
+      $this->cando['getUsers']     = $this->_chkcnf(array('getUsers',
+                                                          'getUserInfo',
+                                                          'getGroups'));
+      $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'));
+    }
+
+    /**
+     * Check if the given config strings are set
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     * @return  bool
+     */
+    function _chkcnf($keys, $wop=false){
+      foreach ($keys as $key){
+        if (empty($this->cnf[$key])) return false;
+      }
+      return true;
+    }
+
+    // @inherit function checkPass($user,$pass)
+    // @inherit function getUserData($user)
+    // @inherit function createUser($user,$pwd,$name,$mail,$grps=null)
+    // @inherit function modifyUser($user, $changes)
+    // @inherit function deleteUsers($users)
+
+
+    /**
+     * [public function]
+     *
+     * Counts users which meet certain $filter criteria.
+     *
+     * @param  array  $filter  filter criteria in item/pattern pairs
+     * @return count of found users.
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function getUserCount($filter=array()) {
+      $rc = 0;
+
+      if($this->_openDB()) {
+        $sql = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+
+        // no equivalent of SQL_CALC_FOUND_ROWS in pgsql?
+        if (($result = $this->_queryDB($sql))){
+          $rc = count($result);
+        }
+        $this->_closeDB();
+      }
+      return $rc;
+    }
+
+    /**
+     * Bulk retrieval of user data. [public function]
+     *
+     * @param   first     index of first user to be returned
+     * @param   limit     max number of users to be returned
+     * @param   filter    array of field/pattern pairs
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     *
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function retrieveUsers($first=0,$limit=10,$filter=array()) {
+      $out   = array();
+
+      if($this->_openDB()) {
+        $this->_lockTables("READ");
+        $sql  = $this->_createSQLFilter($this->cnf['getUsers'], $filter);
+        $sql .= " ".$this->cnf['SortOrder']." LIMIT $limit OFFSET $first";
+        $result = $this->_queryDB($sql);
+
+        foreach ($result as $user)
+          if (($info = $this->_getUserInfo($user['user'])))
+            $out[$user['user']] = $info;
+
+        $this->_unlockTables();
+        $this->_closeDB();
+      }
+      return $out;
+    }
+
+    // @inherit function joinGroup($user, $group)
+    // @inherit function leaveGroup($user, $group) {
+
+    /**
+     * Adds a user to a group.
+     *
+     * If $force is set to '1' non existing groups would be created.
+     *
+     * The database connection must already be established. Otherwise
+     * this function does nothing and returns 'false'.
+     *
+     * @param   $user    user to add to a group
+     * @param   $group   name of the group
+     * @param   $force   '1' create missing groups
+     * @return  bool     'true' on success, 'false' on error
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     * @author Andreas Gohr   <andi@splitbrain.org>
+     */
+    function _addUserToGroup($user, $group, $force=0) {
+      $newgroup = 0;
+
+      if (($this->dbcon) && ($user)) {
+        $gid = $this->_getGroupID($group);
+        if (!$gid) {
+          if ($force) {  // create missing groups
+            $sql = str_replace('%{group}',addslashes($group),$this->cnf['addGroup']);
+            $this->_modifyDB($sql);
+            //group should now exists try again to fetch it
+            $gid = $this->_getGroupID($group);
+            $newgroup = 1;  // group newly created
+          }
+        }
+        if (!$gid) return false; // group didn't exist and can't be created
+
+        $sql = $this->cnf['addUserGroup'];
+        if(strpos($sql,'%{uid}') !== false){
+            $uid = $this->_getUserID($user);
+            $sql = str_replace('%{uid}', addslashes($uid), $sql);
+        }
+        $sql = str_replace('%{user}', addslashes($user),$sql);
+        $sql = str_replace('%{gid}',  addslashes($gid),$sql);
+        $sql = str_replace('%{group}',addslashes($group),$sql);
+        if ($this->_modifyDB($sql) !== false) return true;
+
+        if ($newgroup) { // remove previously created group on error
+          $sql = str_replace('%{gid}',  addslashes($gid),$this->cnf['delGroup']);
+          $sql = str_replace('%{group}',addslashes($group),$sql);
+          $this->_modifyDB($sql);
+        }
+      }
+      return false;
+    }
+
+    // @inherit function _delUserFromGroup($user $group)
+    // @inherit function _getGroups($user)
+    // @inherit function _getUserID($user)
+
+    /**
+     * Adds a new User to the database.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  $user  login of the user
+     * @param  $pwd   encrypted password
+     * @param  $name  full name of the user
+     * @param  $mail  email address
+     * @param  $grps  array of groups the user should become member of
+     * @return bool
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _addUser($user,$pwd,$name,$mail,$grps){
+      if($this->dbcon && is_array($grps)) {
+        $sql = str_replace('%{user}', addslashes($user),$this->cnf['addUser']);
+        $sql = str_replace('%{pass}', addslashes($pwd),$sql);
+        $sql = str_replace('%{name}', addslashes($name),$sql);
+        $sql = str_replace('%{email}',addslashes($mail),$sql);
+        if($this->_modifyDB($sql)){
+          $uid = $this->_getUserID($user);
+        }else{
+          return false;
+        }
+
+        if ($uid) {
+          foreach($grps as $group) {
+            $gid = $this->_addUserToGroup($user, $group, 1);
+            if ($gid === false) break;
+          }
+
+          if ($gid) return true;
+          else {
+            /* remove the new user and all group relations if a group can't
+             * be assigned. Newly created groups will remain in the database
+             * and won't be removed. This might create orphaned groups but
+             * is not a big issue so we ignore this problem here.
+             */
+            $this->_delUser($user);
+            if ($this->cnf['debug'])
+              msg("PgSQL err: Adding user '$user' to group '$group' failed.",-1,__LINE__,__FILE__);
+          }
+        }
+      }
+      return false;
+    }
+
+    // @inherit function _delUser($user)
+    // @inherit function _getUserInfo($user)
+    // @inherit function _updateUserInfo($changes, $uid)
+    // @inherit function _getGroupID($group)
+
+    /**
+     * Opens a connection to a database and saves the handle for further
+     * usage in the object. The successful call to this functions is
+     * essential for most functions in this object.
+     *
+     * @return bool
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _openDB() {
+      if (!$this->dbcon) {
+        $dsn  = $this->cnf['server'] ? 'host='.$this->cnf['server'] : '';
+        $dsn .= ' port='.$this->cnf['port'];
+        $dsn .= ' dbname='.$this->cnf['database'];
+        $dsn .= ' user='.$this->cnf['user'];
+        $dsn .= ' password='.$this->cnf['password'];
+
+        $con = @pg_connect($dsn);
+        if ($con) {
+            $this->dbcon = $con;
+            return true;   // connection and database successfully opened
+        } else if ($this->cnf['debug']){
+            msg ("PgSQL err: Connection to {$this->cnf['user']}@{$this->cnf['server']} not possible.",
+                  -1,__LINE__,__FILE__);
+        }
+        return false;  // connection failed
+      }
+      return true;  // connection already open
+    }
+
+    /**
+     * Closes a database connection.
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _closeDB() {
+      if ($this->dbcon) {
+        pg_close ($this->dbcon);
+        $this->dbcon = 0;
+      }
+    }
+
+    /**
+     * Sends a SQL query to the database and transforms the result into
+     * an associative array.
+     *
+     * This function is only able to handle queries that returns a
+     * table such as SELECT.
+     *
+     * @param $query  SQL string that contains the query
+     * @return array with the result table
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _queryDB($query) {
+      if ($this->dbcon) {
+        $result = @pg_query($this->dbcon,$query);
+        if ($result) {
+          while (($t = pg_fetch_assoc($result)) !== false)
+            $resultarray[]=$t;
+          pg_free_result ($result);
+          return $resultarray;
+        }elseif ($this->cnf['debug'])
+          msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
+      }
+      return false;
+    }
+
+    /**
+     * Executes an update or insert query. This differs from the
+     * MySQL one because it does NOT return the last insertID
+     *
+     * @author Andreas Gohr
+     */
+    function _modifyDB($query) {
+      if ($this->dbcon) {
+        $result = @pg_query($this->dbcon,$query);
+        if ($result) {
+          pg_free_result ($result);
+          return true;
+        }
+        if ($this->cnf['debug']){
+          msg('PgSQL err: '.pg_last_error($this->dbcon),-1,__LINE__,__FILE__);
+        }
+      }
+      return false;
+    }
+
+    /**
+     * Start a transaction
+     *
+     * @param $mode  could be 'READ' or 'WRITE'
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _lockTables($mode) {
+      if ($this->dbcon) {
+        $this->_modifyDB('BEGIN');
+        return true;
+      }
+      return false;
+    }
+
+    /**
+     * Commit a transaction
+     *
+     * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+     */
+    function _unlockTables() {
+      if ($this->dbcon) {
+        $this->_modifyDB('COMMIT');
+        return true;
+      }
+      return false;
+    }
+
+    // @inherit function _createSQLFilter($sql, $filter)
+
+
+    /**
+     * Escape a string for insertion into the database
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param  string  $string The string to escape
+     * @param  boolean $like   Escape wildcard chars as well?
+     */
+    function _escape($string,$like=false){
+      $string = pg_escape_string($string);
+      if($like){
+        $string = addcslashes($string,'%_');
+      }
+      return $string;
+    }
+
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/auth/plain.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/auth/plain.class.php
new file mode 100644
index 000000000..94e0c6bc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/auth/plain.class.php
@@ -0,0 +1,324 @@
+<?php
+/**
+ * Plaintext authentication backend
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ */
+
+define('DOKU_AUTH', dirname(__FILE__));
+require_once(DOKU_AUTH.'/basic.class.php');
+
+define('AUTH_USERFILE',DOKU_CONF.'users.auth.php');
+
+class auth_plain extends auth_basic {
+
+    var $users = null;
+    var $_pattern = array();
+
+    /**
+     * Constructor
+     *
+     * Carry out sanity checks to ensure the object is
+     * able to operate. Set capabilities.
+     *
+     * @author  Christopher Smith <chris@jalakai.co.uk>
+     */
+    function auth_plain() {
+      if (!@is_readable(AUTH_USERFILE)){
+        $this->success = false;
+      }else{
+        if(@is_writable(AUTH_USERFILE)){
+          $this->cando['addUser']      = true;
+          $this->cando['delUser']      = true;
+          $this->cando['modLogin']     = true;
+          $this->cando['modPass']      = true;
+          $this->cando['modName']      = true;
+          $this->cando['modMail']      = true;
+          $this->cando['modGroups']    = true;
+        }
+        $this->cando['getUsers']     = true;
+        $this->cando['getUserCount'] = true;
+      }
+    }
+
+    /**
+     * Check user+password [required auth function]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @return  bool
+     */
+    function checkPass($user,$pass){
+
+      $userinfo = $this->getUserData($user);
+      if ($userinfo === false) return false;
+
+      return auth_verifyPassword($pass,$this->users[$user]['pass']);
+    }
+
+    /**
+     * Return user info
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function getUserData($user){
+
+      if($this->users === null) $this->_loadUserData();
+      return isset($this->users[$user]) ? $this->users[$user] : false;
+    }
+
+    /**
+     * Create a new User
+     *
+     * Returns false if the user already exists, null when an error
+     * occurred and true if everything went well.
+     *
+     * The new user will be added to the default group by this
+     * function if grps are not specified (default behaviour).
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     */
+    function createUser($user,$pwd,$name,$mail,$grps=null){
+      global $conf;
+
+      // user mustn't already exist
+      if ($this->getUserData($user) !== false) return false;
+
+      $pass = auth_cryptPassword($pwd);
+
+      // set default group if no groups specified
+      if (!is_array($grps)) $grps = array($conf['defaultgroup']);
+
+      // prepare user line
+      $groups = join(',',$grps);
+      $userline = join(':',array($user,$pass,$name,$mail,$groups))."\n";
+
+      if (io_saveFile(AUTH_USERFILE,$userline,true)) {
+        $this->users[$user] = compact('pass','name','mail','grps');
+        return $pwd;
+      }
+
+      msg('The '.AUTH_USERFILE.' file is not writable. Please inform the Wiki-Admin',-1);
+      return null;
+    }
+
+    /**
+     * Modify user data
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @param   $user      nick of the user to be changed
+     * @param   $changes   array of field/value pairs to be changed (password will be clear text)
+     * @return  bool
+     */
+    function modifyUser($user, $changes) {
+      global $conf;
+      global $ACT;
+      global $INFO;
+
+      // sanity checks, user must already exist and there must be something to change
+      if (($userinfo = $this->getUserData($user)) === false) return false;
+      if (!is_array($changes) || !count($changes)) return true;
+
+      // update userinfo with new data, remembering to encrypt any password
+      $newuser = $user;
+      foreach ($changes as $field => $value) {
+        if ($field == 'user') {
+          $newuser = $value;
+          continue;
+        }
+        if ($field == 'pass') $value = auth_cryptPassword($value);
+        $userinfo[$field] = $value;
+      }
+
+      $groups = join(',',$userinfo['grps']);
+      $userline = join(':',array($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $groups))."\n";
+
+      if (!$this->deleteUsers(array($user))) {
+        msg('Unable to modify user data. Please inform the Wiki-Admin',-1);
+        return false;
+      }
+
+      if (!io_saveFile(AUTH_USERFILE,$userline,true)) {
+        msg('There was an error modifying your user data. You should register again.',-1);
+        // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+        $ACT == 'register';
+        return false;
+      }
+
+      $this->users[$newuser] = $userinfo;
+      return true;
+    }
+
+    /**
+     *  Remove one or more users from the list of registered users
+     *
+     *  @author  Christopher Smith <chris@jalakai.co.uk>
+     *  @param   array  $users   array of users to be deleted
+     *  @return  int             the number of users deleted
+     */
+    function deleteUsers($users) {
+
+      if (!is_array($users) || empty($users)) return 0;
+
+      if ($this->users === null) $this->_loadUserData();
+
+      $deleted = array();
+      foreach ($users as $user) {
+        if (isset($this->users[$user])) $deleted[] = preg_quote($user,'/');
+      }
+
+      if (empty($deleted)) return 0;
+
+      $pattern = '/^('.join('|',$deleted).'):/';
+
+      if (io_deleteFromFile(AUTH_USERFILE,$pattern,true)) {
+        foreach ($deleted as $user) unset($this->users[$user]);
+        return count($deleted);
+      }
+
+      // problem deleting, reload the user list and count the difference
+      $count = count($this->users);
+      $this->_loadUserData();
+      $count -= count($this->users);
+      return $count;
+    }
+
+    /**
+     * Return a count of the number of user which meet $filter criteria
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     */
+    function getUserCount($filter=array()) {
+      if($this->users === null) $this->_loadUserData();
+
+      if (!count($filter)) return count($this->users);
+
+      $count = 0;
+      $this->_constructPattern($filter);
+
+      foreach ($this->users as $user => $info) {
+          $count += $this->_filter($user, $info);
+      }
+
+      return $count;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Chris Smith <chris@jalakai.co.uk>
+     * @param   start     index of first user to be returned
+     * @param   limit     max number of users to be returned
+     * @param   filter    array of field/pattern pairs
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     */
+    function retrieveUsers($start=0,$limit=0,$filter=array()) {
+
+      if ($this->users === null) $this->_loadUserData();
+
+      ksort($this->users);
+
+      $i = 0;
+      $count = 0;
+      $out = array();
+      $this->_constructPattern($filter);
+
+      foreach ($this->users as $user => $info) {
+        if ($this->_filter($user, $info)) {
+          if ($i >= $start) {
+            $out[$user] = $info;
+            $count++;
+            if (($limit > 0) && ($count >= $limit)) break;
+          }
+          $i++;
+        }
+      }
+
+      return $out;
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for usernames
+     */
+    function cleanUser($user){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$user));
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for groupnames
+     */
+    function cleanGroup($group){
+        global $conf;
+        return cleanID(str_replace(':',$conf['sepchar'],$group));
+    }
+
+    /**
+     * Load all user data
+     *
+     * loads the user file into a datastructure
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _loadUserData(){
+      $this->users = array();
+
+      if(!@file_exists(AUTH_USERFILE)) return;
+
+      $lines = file(AUTH_USERFILE);
+      foreach($lines as $line){
+        $line = preg_replace('/#.*$/','',$line); //ignore comments
+        $line = trim($line);
+        if(empty($line)) continue;
+
+        $row    = explode(":",$line,5);
+        $groups = array_values(array_filter(explode(",",$row[4])));
+
+        $this->users[$row[0]]['pass'] = $row[1];
+        $this->users[$row[0]]['name'] = urldecode($row[2]);
+        $this->users[$row[0]]['mail'] = $row[3];
+        $this->users[$row[0]]['grps'] = $groups;
+      }
+    }
+
+    /**
+     * return 1 if $user + $info match $filter criteria, 0 otherwise
+     *
+     * @author   Chris Smith <chris@jalakai.co.uk>
+     */
+    function _filter($user, $info) {
+        // FIXME
+        foreach ($this->_pattern as $item => $pattern) {
+            if ($item == 'user') {
+                if (!preg_match($pattern, $user)) return 0;
+            } else if ($item == 'grps') {
+                if (!count(preg_grep($pattern, $info['grps']))) return 0;
+            } else {
+                if (!preg_match($pattern, $info[$item])) return 0;
+            }
+        }
+        return 1;
+    }
+
+    function _constructPattern($filter) {
+      $this->_pattern = array();
+      foreach ($filter as $item => $pattern) {
+//        $this->_pattern[$item] = '/'.preg_quote($pattern,"/").'/i';          // don't allow regex characters
+        $this->_pattern[$item] = '/'.str_replace('/','\/',$pattern).'/i';    // allow regex characters
+      }
+    }
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/blowfish.php b/mod/dokuwiki/vendors/dokuwiki/inc/blowfish.php
new file mode 100644
index 000000000..42e3a589a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/blowfish.php
@@ -0,0 +1,521 @@
+<?php
+/* vim: set expandtab sw=4 ts=4 sts=4: */
+/**
+ * The Cipher_blowfish:: class implements the Cipher interface enryption data
+ * using the Blowfish algorithm.
+ *
+ * $Horde: horde/lib/Cipher/blowfish.php,v 1.2.2.3 2003/01/03 13:23:22 jan Exp $
+ *
+ * Copyright 2002-2003 Mike Cochrane <mike@graftonhall.co.nz>
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @author  Mike Cochrane <mike@graftonhall.co.nz>
+ * @version $Id: blowfish.php 11081 2008-01-25 09:35:48Z cybot_tm $
+ * @since   Horde 2.2
+ * @package horde.cipher
+ */
+
+// Change for phpMyAdmin by lem9:
+//class Horde_Cipher_blowfish extends Horde_Cipher {
+class Horde_Cipher_blowfish
+{
+    /* Pi Array */
+    var $p = array(
+            0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344,
+            0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89,
+            0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C,
+            0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917,
+            0x9216D5D9, 0x8979FB1B);
+
+    /* S Boxes */
+    var $s1 = array(
+            0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7,
+            0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99,
+            0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16,
+            0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E,
+            0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE,
+            0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013,
+            0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF,
+            0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E,
+            0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60,
+            0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440,
+            0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE,
+            0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A,
+            0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E,
+            0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677,
+            0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193,
+            0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032,
+            0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88,
+            0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239,
+            0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E,
+            0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0,
+            0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3,
+            0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98,
+            0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88,
+            0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE,
+            0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6,
+            0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D,
+            0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B,
+            0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7,
+            0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA,
+            0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463,
+            0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F,
+            0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09,
+            0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3,
+            0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB,
+            0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279,
+            0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8,
+            0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB,
+            0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82,
+            0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB,
+            0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573,
+            0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0,
+            0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B,
+            0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790,
+            0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8,
+            0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4,
+            0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0,
+            0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7,
+            0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C,
+            0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD,
+            0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1,
+            0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299,
+            0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9,
+            0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477,
+            0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF,
+            0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49,
+            0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF,
+            0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA,
+            0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5,
+            0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41,
+            0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915,
+            0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400,
+            0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915,
+            0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664,
+            0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A);
+    var $s2 = array(
+            0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623,
+            0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266,
+            0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1,
+            0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E,
+            0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6,
+            0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1,
+            0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E,
+            0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1,
+            0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737,
+            0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8,
+            0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF,
+            0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD,
+            0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701,
+            0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7,
+            0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41,
+            0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331,
+            0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF,
+            0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF,
+            0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E,
+            0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87,
+            0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C,
+            0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2,
+            0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16,
+            0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD,
+            0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B,
+            0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509,
+            0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E,
+            0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3,
+            0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F,
+            0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A,
+            0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4,
+            0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960,
+            0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66,
+            0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28,
+            0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802,
+            0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84,
+            0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510,
+            0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF,
+            0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14,
+            0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E,
+            0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50,
+            0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7,
+            0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8,
+            0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281,
+            0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99,
+            0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696,
+            0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128,
+            0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73,
+            0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0,
+            0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0,
+            0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105,
+            0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250,
+            0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3,
+            0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285,
+            0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00,
+            0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061,
+            0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB,
+            0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E,
+            0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735,
+            0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC,
+            0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9,
+            0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340,
+            0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20,
+            0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7);
+    var $s3 = array(
+            0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934,
+            0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068,
+            0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF,
+            0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840,
+            0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45,
+            0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504,
+            0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A,
+            0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB,
+            0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE,
+            0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6,
+            0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42,
+            0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B,
+            0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2,
+            0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB,
+            0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527,
+            0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B,
+            0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33,
+            0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C,
+            0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3,
+            0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC,
+            0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17,
+            0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564,
+            0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B,
+            0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115,
+            0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922,
+            0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728,
+            0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0,
+            0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E,
+            0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37,
+            0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D,
+            0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804,
+            0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B,
+            0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3,
+            0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB,
+            0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D,
+            0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C,
+            0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350,
+            0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9,
+            0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A,
+            0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE,
+            0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D,
+            0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC,
+            0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F,
+            0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61,
+            0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2,
+            0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9,
+            0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2,
+            0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C,
+            0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E,
+            0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633,
+            0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10,
+            0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169,
+            0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52,
+            0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027,
+            0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5,
+            0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62,
+            0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634,
+            0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76,
+            0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24,
+            0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC,
+            0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4,
+            0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C,
+            0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837,
+            0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0);
+    var $s4 = array(
+            0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B,
+            0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE,
+            0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B,
+            0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4,
+            0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8,
+            0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6,
+            0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304,
+            0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22,
+            0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4,
+            0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6,
+            0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9,
+            0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59,
+            0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593,
+            0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51,
+            0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28,
+            0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C,
+            0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B,
+            0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28,
+            0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C,
+            0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD,
+            0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A,
+            0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319,
+            0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB,
+            0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F,
+            0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991,
+            0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32,
+            0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680,
+            0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166,
+            0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE,
+            0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB,
+            0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5,
+            0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47,
+            0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370,
+            0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D,
+            0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84,
+            0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048,
+            0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8,
+            0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD,
+            0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9,
+            0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7,
+            0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38,
+            0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F,
+            0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C,
+            0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525,
+            0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1,
+            0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442,
+            0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964,
+            0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E,
+            0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8,
+            0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D,
+            0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F,
+            0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299,
+            0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02,
+            0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC,
+            0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614,
+            0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A,
+            0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6,
+            0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B,
+            0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0,
+            0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060,
+            0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E,
+            0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9,
+            0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F,
+            0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6);
+
+    /* The number of rounds to do */
+    var $_rounds = 16;
+
+    /**
+     * Set the key to be used for en/decryption
+     *
+     * @param String $key   The key to use
+     */
+    function setKey($key)
+    {
+        $key = $this->_formatKey($key);
+        $keyPos = $keyXor = 0;
+
+        $iMax = count($this->p);
+        $keyLen = count($key);
+        for ($i = 0; $i < $iMax; $i++) {
+            for ($t = 0; $t < 4; $t++) {
+                $keyXor = ($keyXor << 8) | (($key[$keyPos]) & 0x0ff);
+                if (++$keyPos == $keyLen) {
+                    $keyPos = 0;
+                }
+            }
+            $this->p[$i] = $this->p[$i] ^ $keyXor;
+        }
+
+        $encZero = array('L' => 0, 'R' => 0);
+        for ($i = 0; $i + 1 < $iMax; $i += 2) {
+          $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']);
+          $this->p[$i] = $encZero['L'];
+          $this->p[$i + 1] = $encZero['R'];
+        }
+
+        $iMax = count($this->s1);
+        for ($i = 0; $i < $iMax; $i += 2) {
+          $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']);
+          $this->s1[$i] = $encZero['L'];
+          $this->s1[$i + 1] = $encZero['R'];
+        }
+
+        $iMax = count($this->s2);
+        for ($i = 0; $i < $iMax; $i += 2) {
+          $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']);
+          $this->s2[$i] = $encZero['L'];
+          $this->s2[$i + 1] = $encZero['R'];
+        }
+
+        $iMax = count($this->s3);
+        for ($i = 0; $i < $iMax; $i += 2) {
+          $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']);
+          $this->s3[$i] = $encZero['L'];
+          $this->s3[$i + 1] = $encZero['R'];
+        }
+
+        $iMax = count($this->s4);
+        for ($i = 0; $i < $iMax; $i += 2) {
+          $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']);
+          $this->s4[$i] = $encZero['L'];
+          $this->s4[$i + 1] = $encZero['R'];
+        }
+
+    }
+
+    /**
+     * Encrypt a block on data.
+     *
+     * @param String $block         The data to encrypt
+     * @param optional String $key  The key to use
+     *
+     * @return String the encrypted output
+     */
+    function encryptBlock($block, $key = null)
+    {
+        if (!is_null($key)) {
+            $this->setKey($key);
+        }
+
+        list($L, $R) = array_values(unpack('N*', $block));
+        $parts = $this->_encryptBlock($L, $R);
+        return pack("NN", $parts['L'], $parts['R']);
+    }
+
+    /**
+     * Encrypt a block on data.
+     *
+     * @param String $L  The data to encrypt.
+     * @param String $R  The data to encrypt.
+     *
+     * @return String  The encrypted output.
+     */
+    function _encryptBlock($L, $R)
+    {
+        $L ^= $this->p[0];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[1];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[2];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[3];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[4];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[5];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[6];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[7];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[8];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[9];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[10];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[11];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[12];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[13];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[14];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[15];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[16];
+        $R ^= $this->p[17];
+
+        return array('L' => $R, 'R' => $L);
+    }
+
+    /**
+     * Decrypt a block on data.
+     *
+     * @param String $block         The data to decrypt
+     * @param optional String $key  The key to use
+     *
+     * @return String the decrypted output
+     */
+    function decryptBlock($block, $key = null)
+    {
+        if (!is_null($key)) {
+            $this->setKey($key);
+        }
+
+// change for phpMyAdmin
+        $L = null;
+        $R = null;
+
+        $retarray = array_values(unpack('N*', $block));
+        if (isset($retarray[0])) {
+            $L = $retarray[0];
+        }
+        if (isset($retarray[1])) {
+            $R = $retarray[1];
+        }
+// end change for phpMyAdmin
+
+        $L ^= $this->p[17];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[16];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[15];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[14];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[13];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[12];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[11];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[10];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[9];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[8];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[7];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[6];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[5];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[4];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[3];
+        $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[2];
+        $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[1];
+
+        $decrypted = pack("NN", $R ^ $this->p[0], $L);
+        return $decrypted;
+    }
+
+    /**
+     * Converts a text key into an array.
+     *
+     * @return array  The key.
+     */
+    function _formatKey($key)
+    {
+        return array_values(unpack('C*', $key));
+    }
+
+}
+
+// higher-level functions:
+/**
+ * Encryption using blowfish algorithm
+ *
+ * @param   string  original data
+ * @param   string  the secret
+ *
+ * @return  string  the encrypted result
+ *
+ * @access  public
+ *
+ * @author  lem9
+ */
+function PMA_blowfish_encrypt($data, $secret)
+{
+    $pma_cipher = new Horde_Cipher_blowfish;
+    $encrypt = '';
+
+    $data .= '_'; // triming fixed for DokuWiki FS#1690 FS#1713
+    $mod = strlen($data) % 8;
+
+    if ($mod > 0) {
+        $data .= str_repeat("\0", 8 - $mod);
+    }
+
+    foreach (str_split($data, 8) as $chunk) {
+        $encrypt .= $pma_cipher->encryptBlock($chunk, $secret);
+    }
+    return base64_encode($encrypt);
+}
+
+/**
+ * Decryption using blowfish algorithm
+ *
+ * @param   string  encrypted data
+ * @param   string  the secret
+ *
+ * @return  string  original data
+ *
+ * @access  public
+ *
+ * @author  lem9
+ */
+function PMA_blowfish_decrypt($encdata, $secret)
+{
+    $pma_cipher = new Horde_Cipher_blowfish;
+    $decrypt = '';
+    $data = base64_decode($encdata);
+
+    foreach (str_split($data, 8) as $chunk) {
+        $decrypt .= $pma_cipher->decryptBlock($chunk, $secret);
+    }
+    return substr(rtrim($decrypt, "\0"), 0, -1); // triming fixed for DokuWiki FS#1690 FS#1713
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/cache.php b/mod/dokuwiki/vendors/dokuwiki/inc/cache.php
new file mode 100644
index 000000000..8e8adfd6d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/cache.php
@@ -0,0 +1,292 @@
+<?php
+/**
+ * Generic class to handle caching
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Chris Smith <chris@jalakai.co.uk>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+
+class cache {
+  var $key = '';          // primary identifier for this item
+  var $ext = '';          // file ext for cache data, secondary identifier for this item
+  var $cache = '';        // cache file name
+  var $depends = array(); // array containing cache dependency information,
+                          //   used by _useCache to determine cache validity
+
+  var $_event = '';       // event to be triggered during useCache
+
+  function cache($key,$ext) {
+    $this->key = $key;
+    $this->ext = $ext;
+    $this->cache = getCacheName($key,$ext);
+  }
+
+  /**
+   * public method to determine whether the cache can be used
+   *
+   * to assist in cetralisation of event triggering and calculation of cache statistics,
+   * don't override this function override _useCache()
+   *
+   * @param  array   $depends   array of cache dependencies, support dependecies:
+   *                            'age'   => max age of the cache in seconds
+   *                            'files' => cache must be younger than mtime of each file
+   *                                       (nb. dependency passes if file doesn't exist)
+   *
+   * @return bool    true if cache can be used, false otherwise
+   */
+  function useCache($depends=array()) {
+    $this->depends = $depends;
+    $this->_addDependencies();
+
+    if ($this->_event) {
+      return $this->_stats(trigger_event($this->_event,$this,array($this,'_useCache')));
+    } else {
+      return $this->_stats($this->_useCache());
+    }
+  }
+
+  /**
+   * private method containing cache use decision logic
+   *
+   * this function processes the following keys in the depends array
+   *   purge - force a purge on any non empty value
+   *   age   - expire cache if older than age (seconds)
+   *   files - expire cache if any file in this array was updated more recently than the cache
+   *
+   * can be overridden
+   *
+   * @return bool               see useCache()
+   */
+  function _useCache() {
+
+    if (!empty($this->depends['purge'])) return false;              // purge requested?
+    if (!($this->_time = @filemtime($this->cache))) return false;   // cache exists?
+
+    // cache too old?
+    if (!empty($this->depends['age']) && ((time() - $this->_time) > $this->depends['age'])) return false;
+
+    if (!empty($this->depends['files'])) {
+      foreach ($this->depends['files'] as $file) {
+        if ($this->_time < @filemtime($file)) return false;         // cache older than files it depends on?
+      }
+    }
+
+    return true;
+  }
+
+  /**
+   * add dependencies to the depends array
+   *
+   * this method should only add dependencies,
+   * it should not remove any existing dependencies and
+   * it should only overwrite a dependency when the new value is more stringent than the old
+   */
+  function _addDependencies() {
+    if (isset($_REQUEST['purge'])) $this->depends['purge'] = true;   // purge requested
+  }
+
+  /**
+   * retrieve the cached data
+   *
+   * @param   bool   $clean   true to clean line endings, false to leave line endings alone
+   * @return  string          cache contents
+   */
+  function retrieveCache($clean=true) {
+    return io_readFile($this->cache, $clean);
+  }
+
+  /**
+   * cache $data
+   *
+   * @param   string $data   the data to be cached
+   * @return  bool           true on success, false otherwise
+   */
+  function storeCache($data) {
+    return io_savefile($this->cache, $data);
+  }
+
+  /**
+   * remove any cached data associated with this cache instance
+   */
+  function removeCache() {
+    @unlink($this->cache);
+  }
+
+  /**
+   * Record cache hits statistics.
+   * (Only when debugging allowed, to reduce overhead.)
+   *
+   * @param    bool   $success   result of this cache use attempt
+   * @return   bool              pass-thru $success value
+   */
+  function _stats($success) {
+    global $conf;
+    static $stats = NULL;
+    static $file;
+
+    if (!$conf['allowdebug']) { return $success; }
+
+    if (is_null($stats)) {
+      $file = $conf['cachedir'].'/cache_stats.txt';
+      $lines = explode("\n",io_readFile($file));
+
+      foreach ($lines as $line) {
+        $i = strpos($line,',');
+        $stats[substr($line,0,$i)] = $line;
+      }
+    }
+
+    if (isset($stats[$this->ext])) {
+      list($ext,$count,$hits) = explode(',',$stats[$this->ext]);
+    } else {
+      $ext = $this->ext;
+      $count = 0;
+      $hits = 0;
+    }
+
+    $count++;
+    if ($success) $hits++;
+    $stats[$this->ext] = "$ext,$count,$hits";
+
+    io_saveFile($file,join("\n",$stats));
+
+    return $success;
+  }
+}
+
+class cache_parser extends cache {
+
+  var $file = '';       // source file for cache
+  var $mode = '';       // input mode (represents the processing the input file will undergo)
+
+  var $_event = 'PARSER_CACHE_USE';
+
+  function cache_parser($id, $file, $mode) {
+    if ($id) $this->page = $id;
+    $this->file = $file;
+    $this->mode = $mode;
+
+    parent::cache($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode);
+  }
+
+  function _useCache() {
+
+    if (!@file_exists($this->file)) return false;                   // source exists?
+    return parent::_useCache();
+  }
+
+  function _addDependencies() {
+    global $conf, $config_cascade;
+
+    $this->depends['age'] = isset($this->depends['age']) ?
+                   min($this->depends['age'],$conf['cachetime']) : $conf['cachetime'];
+
+    // parser cache file dependencies ...
+    $files = array($this->file,                                     // ... source
+                   DOKU_INC.'inc/parser/parser.php',                // ... parser
+                   DOKU_INC.'inc/parser/handler.php',               // ... handler
+             );
+    $files = array_merge($files, getConfigFiles('main'));           // ... wiki settings
+
+    $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files;
+    parent::_addDependencies();
+  }
+
+}
+
+class cache_renderer extends cache_parser {
+
+  function useCache($depends=array()) {
+    $use = parent::useCache($depends);
+
+    // meta data needs to be kept in step with the cache
+    if (!$use && isset($this->page)) {
+      p_set_metadata($this->page,array(),true);
+    }
+
+    return $use;
+  }
+
+  function _useCache() {
+    global $conf;
+
+    if (!parent::_useCache()) return false;
+
+    if (!isset($this->page)) {
+      return true;
+    }
+
+    // check current link existence is consistent with cache version
+    // first check the purgefile
+    // - if the cache is more recent than the purgefile we know no links can have been updated
+    if ($this->_time >= @filemtime($conf['cachedir'].'/purgefile')) {
+      return true;
+    }
+
+    // for wiki pages, check metadata dependencies
+    $metadata = p_get_metadata($this->page);
+
+    if (!isset($metadata['relation']['references']) ||
+         empty($metadata['relation']['references'])) {
+      return true;
+    }
+
+    foreach ($metadata['relation']['references'] as $id => $exists) {
+      if ($exists != page_exists($id,'',false)) return false;
+    }
+
+    return true;
+  }
+
+  function _addDependencies() {
+
+    // renderer cache file dependencies ...
+    $files = array(
+                   DOKU_INC.'inc/parser/'.$this->mode.'.php',       // ... the renderer
+             );
+
+    // page implies metadata and possibly some other dependencies
+    if (isset($this->page)) {
+
+      $metafile = metaFN($this->page,'.meta');
+      if (@file_exists($metafile)) {
+        $files[] = $metafile;                                       // ... the page's own metadata
+        $files[] = DOKU_INC.'inc/parser/metadata.php';              // ... the metadata renderer
+
+        $valid = p_get_metadata($this->page, 'date valid');
+        if (!empty($valid['age'])) {
+          $this->depends['age'] = isset($this->depends['age']) ?
+                   min($this->depends['age'],$valid['age']) : $valid['age'];
+        }
+
+      } else {
+        $this->depends['purge'] = true;                             // ... purging cache will generate metadata
+        return;
+      }
+    }
+
+    $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files;
+    parent::_addDependencies();
+  }
+}
+
+class cache_instructions extends cache_parser {
+
+  function cache_instructions($id, $file) {
+    parent::cache_parser($id, $file, 'i');
+  }
+
+  function retrieveCache($clean=true) {
+    $contents = io_readFile($this->cache, false);
+    return !empty($contents) ? unserialize($contents) : array();
+  }
+
+  function storeCache($instructions) {
+    return io_savefile($this->cache,serialize($instructions));
+  }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/changelog.php b/mod/dokuwiki/vendors/dokuwiki/inc/changelog.php
new file mode 100644
index 000000000..bc2af2de3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/changelog.php
@@ -0,0 +1,474 @@
+<?php
+/**
+ * Changelog handling functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+// Constants for known core changelog line types.
+// Use these in place of string literals for more readable code.
+define('DOKU_CHANGE_TYPE_CREATE',       'C');
+define('DOKU_CHANGE_TYPE_EDIT',         'E');
+define('DOKU_CHANGE_TYPE_MINOR_EDIT',   'e');
+define('DOKU_CHANGE_TYPE_DELETE',       'D');
+define('DOKU_CHANGE_TYPE_REVERT',       'R');
+
+/**
+ * parses a changelog line into it's components
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function parseChangelogLine($line) {
+  $tmp = explode("\t", $line);
+    if ($tmp!==false && count($tmp)>1) {
+      $info = array();
+      $info['date']  = (int)$tmp[0]; // unix timestamp
+      $info['ip']    = $tmp[1]; // IPv4 address (127.0.0.1)
+      $info['type']  = $tmp[2]; // log line type
+      $info['id']    = $tmp[3]; // page id
+      $info['user']  = $tmp[4]; // user name
+      $info['sum']   = $tmp[5]; // edit summary (or action reason)
+      $info['extra'] = rtrim($tmp[6], "\n"); // extra data (varies by line type)
+      return $info;
+  } else { return false; }
+}
+
+/**
+ * Add's an entry to the changelog and saves the metadata for the page
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Esther Brunner <wikidesign@gmail.com>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){
+  global $conf, $INFO;
+
+  // check for special flags as keys
+  if (!is_array($flags)) { $flags = array(); }
+  $flagExternalEdit = isset($flags['ExternalEdit']);
+
+  $id = cleanid($id);
+  $file = wikiFN($id);
+  $created = @filectime($file);
+  $minor = ($type===DOKU_CHANGE_TYPE_MINOR_EDIT);
+  $wasRemoved = ($type===DOKU_CHANGE_TYPE_DELETE);
+
+  if(!$date) $date = time(); //use current time if none supplied
+  $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1';
+  $user   = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:'';
+
+  $strip = array("\t", "\n");
+  $logline = array(
+    'date'  => $date,
+    'ip'    => $remote,
+    'type'  => str_replace($strip, '', $type),
+    'id'    => $id,
+    'user'  => $user,
+    'sum'   => str_replace($strip, '', $summary),
+    'extra' => str_replace($strip, '', $extra)
+  );
+
+  // update metadata
+  if (!$wasRemoved) {
+    $oldmeta = p_read_metadata($id);
+    $meta    = array();
+    if (!$INFO['exists'] && empty($oldmeta['persistent']['date']['created'])){ // newly created
+      $meta['date']['created'] = $created;
+      if ($user) $meta['creator'] = $INFO['userinfo']['name'];
+    } elseif (!$INFO['exists'] && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored
+      $meta['date']['created']  = $oldmeta['persistent']['date']['created'];
+      $meta['date']['modified'] = $created; // use the files ctime here
+      $meta['creator'] = $oldmeta['persistent']['creator'];
+      if ($user) $meta['contributor'][$user] = $INFO['userinfo']['name'];
+    } elseif (!$minor) {   // non-minor modification
+      $meta['date']['modified'] = $date;
+      if ($user) $meta['contributor'][$user] = $INFO['userinfo']['name'];
+    }
+    $meta['last_change'] = $logline;
+    p_set_metadata($id, $meta, true);
+  }
+
+  // add changelog lines
+  $logline = implode("\t", $logline)."\n";
+  io_saveFile(metaFN($id,'.changes'),$logline,true); //page changelog
+  io_saveFile($conf['changelog'],$logline,true); //global changelog cache
+}
+
+/**
+ * Add's an entry to the media changelog
+ *
+ * @author Michael Hamann <michael@content-space.de>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Esther Brunner <wikidesign@gmail.com>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){
+  global $conf, $INFO;
+
+  $id = cleanid($id);
+
+  if(!$date) $date = time(); //use current time if none supplied
+  $remote = clientIP(true);
+  $user   = $_SERVER['REMOTE_USER'];
+
+  $strip = array("\t", "\n");
+  $logline = array(
+    'date'  => $date,
+    'ip'    => $remote,
+    'type'  => str_replace($strip, '', $type),
+    'id'    => $id,
+    'user'  => $user,
+    'sum'   => str_replace($strip, '', $summary),
+    'extra' => str_replace($strip, '', $extra)
+  );
+
+  // add changelog lines
+  $logline = implode("\t", $logline)."\n";
+  io_saveFile($conf['media_changelog'],$logline,true); //global media changelog cache
+}
+
+/**
+ * returns an array of recently changed files using the
+ * changelog
+ *
+ * The following constants can be used to control which changes are
+ * included. Add them together as needed.
+ *
+ * RECENTS_SKIP_DELETED   - don't include deleted pages
+ * RECENTS_SKIP_MINORS    - don't include minor changes
+ * RECENTS_SKIP_SUBSPACES - don't include subspaces
+ * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ *
+ * @param int    $first   number of first entry returned (for paginating
+ * @param int    $num     return $num entries
+ * @param string $ns      restrict to given namespace
+ * @param bool   $flags   see above
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function getRecents($first,$num,$ns='',$flags=0){
+  global $conf;
+  $recent = array();
+  $count  = 0;
+
+  if(!$num)
+    return $recent;
+
+  // read all recent changes. (kept short)
+  if ($flags & RECENTS_MEDIA_CHANGES) {
+    $lines = @file($conf['media_changelog']);
+  } else {
+    $lines = @file($conf['changelog']);
+  }
+
+
+  // handle lines
+  $seen = array(); // caches seen lines, _handleRecent() skips them
+  for($i = count($lines)-1; $i >= 0; $i--){
+    $rec = _handleRecent($lines[$i], $ns, $flags, $seen);
+    if($rec !== false) {
+      if(--$first >= 0) continue; // skip first entries
+      $recent[] = $rec;
+      $count++;
+      // break when we have enough entries
+      if($count >= $num){ break; }
+    }
+  }
+
+  return $recent;
+}
+
+/**
+ * returns an array of files changed since a given time using the
+ * changelog
+ *
+ * The following constants can be used to control which changes are
+ * included. Add them together as needed.
+ *
+ * RECENTS_SKIP_DELETED   - don't include deleted pages
+ * RECENTS_SKIP_MINORS    - don't include minor changes
+ * RECENTS_SKIP_SUBSPACES - don't include subspaces
+ * RECENTS_MEDIA_CHANGES  - return media changes instead of page changes
+ *
+ * @param int    $from    date of the oldest entry to return
+ * @param int    $to      date of the newest entry to return (for pagination, optional)
+ * @param string $ns      restrict to given namespace (optional)
+ * @param bool   $flags   see above (optional)
+ *
+ * @author Michael Hamann <michael@content-space.de>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function getRecentsSince($from,$to=null,$ns='',$flags=0){
+  global $conf;
+  $recent = array();
+
+  if($to && $to < $from)
+    return $recent;
+
+  // read all recent changes. (kept short)
+  if ($flags & RECENTS_MEDIA_CHANGES) {
+    $lines = @file($conf['media_changelog']);
+  } else {
+    $lines = @file($conf['changelog']);
+  }
+
+  // we start searching at the end of the list
+  $lines = array_reverse($lines);
+
+  // handle lines
+  $seen = array(); // caches seen lines, _handleRecent() skips them
+
+  foreach($lines as $line){
+    $rec = _handleRecent($line, $ns, $flags, $seen);
+    if($rec !== false) {
+      if ($rec['date'] >= $from) {
+        if (!$to || $rec['date'] <= $to) {
+          $recent[] = $rec;
+        }
+      } else {
+        break;
+      }
+    }
+  }
+
+  return array_reverse($recent);
+}
+
+/**
+ * Internal function used by getRecents
+ *
+ * don't call directly
+ *
+ * @see getRecents()
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function _handleRecent($line,$ns,$flags,&$seen){
+  if(empty($line)) return false;   //skip empty lines
+
+  // split the line into parts
+  $recent = parseChangelogLine($line);
+  if ($recent===false) { return false; }
+
+  // skip seen ones
+  if(isset($seen[$recent['id']])) return false;
+
+  // skip minors
+  if($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT && ($flags & RECENTS_SKIP_MINORS)) return false;
+
+  // remember in seen to skip additional sights
+  $seen[$recent['id']] = 1;
+
+  // check if it's a hidden page
+  if(isHiddenPage($recent['id'])) return false;
+
+  // filter namespace
+  if (($ns) && (strpos($recent['id'],$ns.':') !== 0)) return false;
+
+  // exclude subnamespaces
+  if (($flags & RECENTS_SKIP_SUBSPACES) && (getNS($recent['id']) != $ns)) return false;
+
+  // check ACL
+  $recent['perms'] = auth_quickaclcheck($recent['id']);
+  if ($recent['perms'] < AUTH_READ) return false;
+
+  // check existance
+  $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id']));
+  if((!@file_exists($fn)) && ($flags & RECENTS_SKIP_DELETED)) return false;
+
+  return $recent;
+}
+
+/**
+ * Get the changelog information for a specific page id
+ * and revision (timestamp). Adjacent changelog lines
+ * are optimistically parsed and cached to speed up
+ * consecutive calls to getRevisionInfo. For large
+ * changelog files, only the chunk containing the
+ * requested changelog line is read.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function getRevisionInfo($id, $rev, $chunk_size=8192) {
+  global $cache_revinfo;
+  $cache =& $cache_revinfo;
+  if (!isset($cache[$id])) { $cache[$id] = array(); }
+  $rev = max($rev, 0);
+
+  // check if it's already in the memory cache
+  if (isset($cache[$id]) && isset($cache[$id][$rev])) {
+    return $cache[$id][$rev];
+  }
+
+  $file = metaFN($id, '.changes');
+  if (!@file_exists($file)) { return false; }
+  if (filesize($file)<$chunk_size || $chunk_size==0) {
+    // read whole file
+    $lines = file($file);
+    if ($lines===false) { return false; }
+  } else {
+    // read by chunk
+    $fp = fopen($file, 'rb'); // "file pointer"
+    if ($fp===false) { return false; }
+    $head = 0;
+    fseek($fp, 0, SEEK_END);
+    $tail = ftell($fp);
+    $finger = 0;
+    $finger_rev = 0;
+
+    // find chunk
+    while ($tail-$head>$chunk_size) {
+      $finger = $head+floor(($tail-$head)/2.0);
+      fseek($fp, $finger);
+      fgets($fp); // slip the finger forward to a new line
+      $finger = ftell($fp);
+      $tmp = fgets($fp); // then read at that location
+      $tmp = parseChangelogLine($tmp);
+      $finger_rev = $tmp['date'];
+      if ($finger==$head || $finger==$tail) { break; }
+      if ($finger_rev>$rev) {
+        $tail = $finger;
+      } else {
+        $head = $finger;
+      }
+    }
+
+    if ($tail-$head<1) {
+      // cound not find chunk, assume requested rev is missing
+      fclose($fp);
+      return false;
+    }
+
+    // read chunk
+    $chunk = '';
+    $chunk_size = max($tail-$head, 0); // found chunk size
+    $got = 0;
+    fseek($fp, $head);
+    while ($got<$chunk_size && !feof($fp)) {
+      $tmp = @fread($fp, max($chunk_size-$got, 0));
+      if ($tmp===false) { break; } //error state
+      $got += strlen($tmp);
+      $chunk .= $tmp;
+    }
+    $lines = explode("\n", $chunk);
+    array_pop($lines); // remove trailing newline
+    fclose($fp);
+  }
+
+  // parse and cache changelog lines
+  foreach ($lines as $value) {
+    $tmp = parseChangelogLine($value);
+    if ($tmp!==false) {
+      $cache[$id][$tmp['date']] = $tmp;
+    }
+  }
+  if (!isset($cache[$id][$rev])) { return false; }
+  return $cache[$id][$rev];
+}
+
+/**
+ * Return a list of page revisions numbers
+ * Does not guarantee that the revision exists in the attic,
+ * only that a line with the date exists in the changelog.
+ * By default the current revision is skipped.
+ *
+ * id:    the page of interest
+ * first: skip the first n changelog lines
+ * num:   number of revisions to return
+ *
+ * The current revision is automatically skipped when the page exists.
+ * See $INFO['meta']['last_change'] for the current revision.
+ *
+ * For efficiency, the log lines are parsed and cached for later
+ * calls to getRevisionInfo. Large changelog files are read
+ * backwards in chunks until the requested number of changelog
+ * lines are recieved.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function getRevisions($id, $first, $num, $chunk_size=8192) {
+  global $cache_revinfo;
+  $cache =& $cache_revinfo;
+  if (!isset($cache[$id])) { $cache[$id] = array(); }
+
+  $revs = array();
+  $lines = array();
+  $count  = 0;
+  $file = metaFN($id, '.changes');
+  $num = max($num, 0);
+  $chunk_size = max($chunk_size, 0);
+  if ($first<0) { $first = 0; }
+  else if (@file_exists(wikiFN($id))) {
+     // skip current revision if the page exists
+    $first = max($first+1, 0);
+  }
+
+  if (!@file_exists($file)) { return $revs; }
+  if (filesize($file)<$chunk_size || $chunk_size==0) {
+    // read whole file
+    $lines = file($file);
+    if ($lines===false) { return $revs; }
+  } else {
+    // read chunks backwards
+    $fp = fopen($file, 'rb'); // "file pointer"
+    if ($fp===false) { return $revs; }
+    fseek($fp, 0, SEEK_END);
+    $tail = ftell($fp);
+
+    // chunk backwards
+    $finger = max($tail-$chunk_size, 0);
+    while ($count<$num+$first) {
+      fseek($fp, $finger);
+      if ($finger>0) {
+        fgets($fp); // slip the finger forward to a new line
+        $finger = ftell($fp);
+      }
+
+      // read chunk
+      if ($tail<=$finger) { break; }
+      $chunk = '';
+      $read_size = max($tail-$finger, 0); // found chunk size
+      $got = 0;
+      while ($got<$read_size && !feof($fp)) {
+        $tmp = @fread($fp, max($read_size-$got, 0));
+        if ($tmp===false) { break; } //error state
+        $got += strlen($tmp);
+        $chunk .= $tmp;
+      }
+      $tmp = explode("\n", $chunk);
+      array_pop($tmp); // remove trailing newline
+
+      // combine with previous chunk
+      $count += count($tmp);
+      $lines = array_merge($tmp, $lines);
+
+      // next chunk
+      if ($finger==0) { break; } // already read all the lines
+      else {
+        $tail = $finger;
+        $finger = max($tail-$chunk_size, 0);
+      }
+    }
+    fclose($fp);
+  }
+
+  // skip parsing extra lines
+  $num = max(min(count($lines)-$first, $num), 0);
+  if      ($first>0 && $num>0)  { $lines = array_slice($lines, max(count($lines)-$first-$num, 0), $num); }
+  else if ($first>0 && $num==0) { $lines = array_slice($lines, 0, max(count($lines)-$first, 0)); }
+  else if ($first==0 && $num>0) { $lines = array_slice($lines, max(count($lines)-$num, 0)); }
+
+  // handle lines in reverse order
+  for ($i = count($lines)-1; $i >= 0; $i--) {
+    $tmp = parseChangelogLine($lines[$i]);
+    if ($tmp!==false) {
+      $cache[$id][$tmp['date']] = $tmp;
+      $revs[] = $tmp['date'];
+    }
+  }
+
+  return $revs;
+}
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/cliopts.php b/mod/dokuwiki/vendors/dokuwiki/inc/cliopts.php
new file mode 100644
index 000000000..a3698ab24
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/cliopts.php
@@ -0,0 +1,361 @@
+<?php
+/**
+* Brutally chopped and modified from http://pear.php.net/package/Console_Getopts
+*/
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 3.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available through the world-wide-web at the following url:           |
+// | http://www.php.net/license/3_0.txt.                                  |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Author: Andrei Zmievski <andrei@php.net>                             |
+// | Modified: Harry Fuecks hfuecks  gmail.com                   |
+// +----------------------------------------------------------------------+
+//
+
+
+//------------------------------------------------------------------------------
+/**
+* Sets up CLI environment based on SAPI and PHP version
+* Helps resolve some issues between the CGI and CLI SAPIs
+* as well is inconsistencies between PHP 4.3+ and older versions
+*/
+if (version_compare(phpversion(), '4.3.0', '<') || php_sapi_name() == 'cgi') {
+    // Handle output buffering
+    @ob_end_flush();
+    ob_implicit_flush(true);
+
+    // PHP ini settings
+    set_time_limit(0);
+    ini_set('track_errors', true);
+    ini_set('html_errors', false);
+    ini_set('magic_quotes_runtime', false);
+
+    // Define stream constants
+    define('STDIN', fopen('php://stdin', 'r'));
+    define('STDOUT', fopen('php://stdout', 'w'));
+    define('STDERR', fopen('php://stderr', 'w'));
+
+    // Close the streams on script termination
+    register_shutdown_function(
+        create_function('',
+        'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;')
+        );
+}
+
+//------------------------------------------------------------------------------
+/**
+* Error codes
+*/
+define('DOKU_CLI_OPTS_UNKNOWN_OPT',1); //Unrecognized option
+define('DOKU_CLI_OPTS_OPT_ARG_REQUIRED',2); //Option requires argument
+define('DOKU_CLI_OPTS_OPT_ARG_DENIED',3); //Option not allowed argument
+define('DOKU_CLI_OPTS_OPT_ABIGUOUS',4);//Option abiguous
+define('DOKU_CLI_OPTS_ARG_READ',5);//Could not read argv
+
+//------------------------------------------------------------------------------
+/**
+ * Command-line options parsing class.
+ *
+ * @author Andrei Zmievski <andrei@php.net>
+ *
+ */
+ class Doku_Cli_Opts {
+
+    /**
+    * <?php ?>
+    * @see http://www.sitepoint.com/article/php-command-line-1/3
+    * @param string executing file name - this MUST be passed the __FILE__ constant
+    * @param string short options
+    * @param array (optional) long options
+    * @return Doku_Cli_Opts_Container or Doku_Cli_Opts_Error
+    */
+    function & getOptions($bin_file, $short_options, $long_options = null) {
+        $args = Doku_Cli_Opts::readPHPArgv();
+
+        if ( Doku_Cli_Opts::isError($args) ) {
+            return $args;
+        }
+
+        // Compatibility between "php extensions.php" and "./extensions.php"
+        if ( realpath($_SERVER['argv'][0]) == $bin_file ) {
+            $options = Doku_Cli_Opts::getOpt($args,$short_options,$long_options);
+        } else {
+            $options = Doku_Cli_Opts::getOpt2($args,$short_options,$long_options);
+        }
+
+        if ( Doku_Cli_Opts::isError($options) ) {
+            return $options;
+        }
+
+        $container = new Doku_Cli_Opts_Container($options);
+        return $container;
+    }
+
+    function getopt2($args, $short_options, $long_options = null) {
+        return Doku_Cli_Opts::doGetopt(
+            2, $args, $short_options, $long_options
+            );
+    }
+
+    function getopt($args, $short_options, $long_options = null) {
+        return Doku_Cli_Opts::doGetopt(
+            1, $args, $short_options, $long_options
+            );
+    }
+
+    function doGetopt($version, $args, $short_options, $long_options = null) {
+
+        // in case you pass directly readPHPArgv() as the first arg
+        if (Doku_Cli_Opts::isError($args)) {
+            return $args;
+        }
+        if (empty($args)) {
+            return array(array(), array());
+        }
+        $opts     = array();
+        $non_opts = array();
+
+        settype($args, 'array');
+
+        if ($long_options && is_array($long_options)) {
+            sort($long_options);
+        }
+
+        /*
+         * Preserve backwards compatibility with callers that relied on
+         * erroneous POSIX fix.
+         */
+        if ($version < 2) {
+            if (isset($args[0]{0}) && $args[0]{0} != '-') {
+                array_shift($args);
+            }
+        }
+
+        reset($args);
+        while (list($i, $arg) = each($args)) {
+
+            /* The special element '--' means explicit end of
+               options. Treat the rest of the arguments as non-options
+               and end the loop. */
+            if ($arg == '--') {
+                $non_opts = array_merge($non_opts, array_slice($args, $i + 1));
+                break;
+            }
+
+            if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) {
+                $non_opts = array_merge($non_opts, array_slice($args, $i));
+                break;
+            } elseif (strlen($arg) > 1 && $arg{1} == '-') {
+                $error = Doku_Cli_Opts::_parseLongOption(substr($arg, 2), $long_options, $opts, $args);
+                if (Doku_Cli_Opts::isError($error))
+                    return $error;
+            } else {
+                $error = Doku_Cli_Opts::_parseShortOption(substr($arg, 1), $short_options, $opts, $args);
+                if (Doku_Cli_Opts::isError($error))
+                    return $error;
+            }
+        }
+
+        return array($opts, $non_opts);
+    }
+
+    function _parseShortOption($arg, $short_options, &$opts, &$args) {
+        for ($i = 0; $i < strlen($arg); $i++) {
+            $opt = $arg{$i};
+            $opt_arg = null;
+
+            /* Try to find the short option in the specifier string. */
+            if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':')
+            {
+                return Doku_Cli_Opts::raiseError(
+                    DOKU_CLI_OPTS_UNKNOWN_OPT,
+                    "Unrecognized option -- $opt"
+                    );
+            }
+
+            if (strlen($spec) > 1 && $spec{1} == ':') {
+                if (strlen($spec) > 2 && $spec{2} == ':') {
+                    if ($i + 1 < strlen($arg)) {
+                        /* Option takes an optional argument. Use the remainder of
+                           the arg string if there is anything left. */
+                        $opts[] = array($opt, substr($arg, $i + 1));
+                        break;
+                    }
+                } else {
+                    /* Option requires an argument. Use the remainder of the arg
+                       string if there is anything left. */
+                    if ($i + 1 < strlen($arg)) {
+                        $opts[] = array($opt,  substr($arg, $i + 1));
+                        break;
+                    } else if (list(, $opt_arg) = each($args))
+                        /* Else use the next argument. */;
+                    else
+                        return Doku_Cli_Opts::raiseError(
+                            DOKU_CLI_OPTS_OPT_ARG_REQUIRED,
+                            "Option requires an argument -- $opt"
+                            );
+                }
+            }
+
+            $opts[] = array($opt, $opt_arg);
+        }
+    }
+
+    function _parseLongOption($arg, $long_options, &$opts, &$args) {
+        @list($opt, $opt_arg) = explode('=', $arg);
+        $opt_len = strlen($opt);
+
+        for ($i = 0; $i < count($long_options); $i++) {
+            $long_opt  = $long_options[$i];
+            $opt_start = substr($long_opt, 0, $opt_len);
+
+            /* Option doesn't match. Go on to the next one. */
+            if ($opt_start != $opt)
+                continue;
+
+            $opt_rest  = substr($long_opt, $opt_len);
+
+            /* Check that the options uniquely matches one of the allowed
+               options. */
+            if ($opt_rest != '' && $opt{0} != '=' &&
+                $i + 1 < count($long_options) &&
+                $opt == substr($long_options[$i+1], 0, $opt_len)) {
+                return Doku_Cli_Opts::raiseError(
+                    DOKU_CLI_OPTS_OPT_ABIGUOUS,
+                    "Option --$opt is ambiguous"
+                    );
+            }
+
+            if (substr($long_opt, -1) == '=') {
+                if (substr($long_opt, -2) != '==') {
+                    /* Long option requires an argument.
+                       Take the next argument if one wasn't specified. */;
+                    if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) {
+                        return Doku_Cli_Opts::raiseError(
+                            DOKU_CLI_OPTS_OPT_ARG_REQUIRED,
+                            "Option --$opt requires an argument"
+                            );
+                    }
+                }
+            } else if ($opt_arg) {
+                return Doku_Cli_Opts::raiseError(
+                    DOKU_CLI_OPTS_OPT_ARG_DENIED,
+                    "Option --$opt doesn't allow an argument"
+                    );
+            }
+
+            $opts[] = array('--' . $opt, $opt_arg);
+            return;
+        }
+
+        return Doku_Cli_Opts::raiseError(
+            DOKU_CLI_OPTS_UNKNOWN_OPT,
+            "Unrecognized option --$opt"
+            );
+    }
+
+    function readPHPArgv() {
+        global $argv;
+        if (!is_array($argv)) {
+            if (!@is_array($_SERVER['argv'])) {
+                if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) {
+                    return Doku_Cli_Opts::raiseError(
+                        DOKU_CLI_OPTS_ARG_READ,
+                        "Could not read cmd args (register_argc_argv=Off?)"
+                        );
+                }
+                return $GLOBALS['HTTP_SERVER_VARS']['argv'];
+            }
+            return $_SERVER['argv'];
+        }
+        return $argv;
+    }
+
+    function raiseError($code, $msg) {
+        return new Doku_Cli_Opts_Error($code, $msg);
+    }
+
+    function isError($obj) {
+        return is_a($obj, 'Doku_Cli_Opts_Error');
+    }
+
+}
+
+//------------------------------------------------------------------------------
+class Doku_Cli_Opts_Error {
+
+    var $code;
+    var $msg;
+
+    function Doku_Cli_Opts_Error($code, $msg) {
+        $this->code = $code;
+        $this->msg = $msg;
+    }
+
+    function getMessage() {
+        return $this->msg;
+    }
+
+    function isError() {
+        return true;
+    }
+
+}
+
+//------------------------------------------------------------------------------
+class Doku_Cli_Opts_Container {
+
+    var $options = array();
+    var $args = array();
+
+    function Doku_Cli_Opts_Container($options) {
+        foreach ( $options[0] as $option ) {
+            if ( false !== ( strpos($option[0], '--') ) ) {
+                $opt_name = substr($option[0], 2);
+            } else {
+                $opt_name = $option[0];
+            }
+            $this->options[$opt_name] = $option[1];
+        }
+
+
+        $this->args = $options[1];
+    }
+
+    function has($option) {
+        return array_key_exists($option, $this->options);
+    }
+
+    function get($option) {
+        if ( isset($this->options[$option]) ) {
+            return ( $this->options[$option] ) ;
+        }
+    }
+
+    function arg($index) {
+        if ( isset($this->args[$index]) ) {
+            return $this->args[$index];
+        }
+    }
+
+    function numArgs() {
+        return count($this->args);
+    }
+
+    function hasArgs() {
+        return count($this->args) !== 0;
+    }
+
+    function isError() {
+        return false;
+    }
+
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/common.php b/mod/dokuwiki/vendors/dokuwiki/inc/common.php
new file mode 100644
index 000000000..610bd8de6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/common.php
@@ -0,0 +1,1549 @@
+<?php
+/**
+ * Common DokuWiki functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/changelog.php');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/mail.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+require_once(DOKU_INC.'inc/infoutils.php');
+
+/**
+ * These constants are used with the recents function
+ */
+define('RECENTS_SKIP_DELETED',2);
+define('RECENTS_SKIP_MINORS',4);
+define('RECENTS_SKIP_SUBSPACES',8);
+define('RECENTS_MEDIA_CHANGES',16);
+
+/**
+ * Wrapper around htmlspecialchars()
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    htmlspecialchars()
+ */
+function hsc($string){
+  return htmlspecialchars($string, ENT_QUOTES, 'UTF-8');
+}
+
+/**
+ * print a newline terminated string
+ *
+ * You can give an indention as optional parameter
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ptln($string,$indent=0){
+  echo str_repeat(' ', $indent)."$string\n";
+}
+
+/**
+ * strips control characters (<32) from the given string
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function stripctl($string){
+  return preg_replace('/[\x00-\x1F]+/s','',$string);
+}
+
+/**
+ * Return a secret token to be used for CSRF attack prevention
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @link    http://en.wikipedia.org/wiki/Cross-site_request_forgery
+ * @link    http://christ1an.blogspot.com/2007/04/preventing-csrf-efficiently.html
+ * @return  string
+ */
+function getSecurityToken(){
+  return md5(auth_cookiesalt().session_id());
+}
+
+/**
+ * Check the secret CSRF token
+ */
+function checkSecurityToken($token=null){
+  if(!$_SERVER['REMOTE_USER']) return true; // no logged in user, no need for a check
+
+  if(is_null($token)) $token = $_REQUEST['sectok'];
+  if(getSecurityToken() != $token){
+    msg('Security Token did not match. Possible CSRF attack.',-1);
+    return false;
+  }
+  return true;
+}
+
+/**
+ * Print a hidden form field with a secret CSRF token
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function formSecurityToken($print=true){
+  $ret = '<div class="no"><input type="hidden" name="sectok" value="'.getSecurityToken().'" /></div>'."\n";
+  if($print){
+    echo $ret;
+  }else{
+    return $ret;
+  }
+}
+
+/**
+ * Return info about the current document as associative
+ * array.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function pageinfo(){
+  global $ID;
+  global $REV;
+  global $RANGE;
+  global $USERINFO;
+  global $conf;
+  global $lang;
+
+  // include ID & REV not redundant, as some parts of DokuWiki may temporarily change $ID, e.g. p_wiki_xhtml
+  // FIXME ... perhaps it would be better to ensure the temporary changes weren't necessary
+  $info['id'] = $ID;
+  $info['rev'] = $REV;
+
+    // set info about manager/admin status.
+    $info['isadmin']   = false;
+    $info['ismanager'] = false;
+  if(isset($_SERVER['REMOTE_USER'])){
+    $info['userinfo']     = $USERINFO;
+    $info['perm']         = auth_quickaclcheck($ID);
+    $info['subscribed']   = is_subscribed($ID,$_SERVER['REMOTE_USER'],false);
+    $info['subscribedns'] = is_subscribed($ID,$_SERVER['REMOTE_USER'],true);
+    $info['client']       = $_SERVER['REMOTE_USER'];
+
+    if($info['perm'] == AUTH_ADMIN){
+      $info['isadmin']   = true;
+      $info['ismanager'] = true;
+    }elseif(auth_ismanager()){
+      $info['ismanager'] = true;
+    }
+
+    // if some outside auth were used only REMOTE_USER is set
+    if(!$info['userinfo']['name']){
+      $info['userinfo']['name'] = $_SERVER['REMOTE_USER'];
+    }
+
+  }else{
+    $info['perm']       = auth_aclcheck($ID,'',null);
+    $info['subscribed'] = false;
+    $info['client']     = clientIP(true);
+  }
+
+   //error_log("dokuwiki actpageinfo!!".$info['perm']);
+  $info['namespace'] = getNS($ID);
+  $info['locked']    = checklock($ID);
+  $info['filepath']  = fullpath(wikiFN($ID));
+  $info['exists']    = @file_exists($info['filepath']);
+  if($REV){
+    //check if current revision was meant
+    if($info['exists'] && (@filemtime($info['filepath'])==$REV)){
+      $REV = '';
+    }elseif($RANGE){
+      //section editing does not work with old revisions!
+      $REV   = '';
+      $RANGE = '';
+      msg($lang['nosecedit'],0);
+    }else{
+      //really use old revision
+      $info['filepath'] = fullpath(wikiFN($ID,$REV));
+      $info['exists']   = @file_exists($info['filepath']);
+    }
+  }
+  $info['rev'] = $REV;
+  if($info['exists']){
+    $info['writable'] = (is_writable($info['filepath']) &&
+                         ($info['perm'] >= AUTH_EDIT));
+  }else{
+    $info['writable'] = ($info['perm'] >= AUTH_CREATE);
+  }
+  $info['editable']  = ($info['writable'] && empty($info['lock']));
+  $info['lastmod']   = @filemtime($info['filepath']);
+
+  //load page meta data
+  $info['meta'] = p_get_metadata($ID);
+
+  //who's the editor
+  if($REV){
+    $revinfo = getRevisionInfo($ID, $REV, 1024);
+  }else{
+    if (is_array($info['meta']['last_change'])) {
+       $revinfo = $info['meta']['last_change'];
+    } else {
+      $revinfo = getRevisionInfo($ID, $info['lastmod'], 1024);
+      // cache most recent changelog line in metadata if missing and still valid
+      if ($revinfo!==false) {
+        $info['meta']['last_change'] = $revinfo;
+        p_set_metadata($ID, array('last_change' => $revinfo));
+      }
+    }
+  }
+  //and check for an external edit
+  if($revinfo!==false && $revinfo['date']!=$info['lastmod']){
+    // cached changelog line no longer valid
+    $revinfo = false;
+    $info['meta']['last_change'] = $revinfo;
+    p_set_metadata($ID, array('last_change' => $revinfo));
+  }
+
+  $info['ip']     = $revinfo['ip'];
+  $info['user']   = $revinfo['user'];
+  $info['sum']    = $revinfo['sum'];
+  // See also $INFO['meta']['last_change'] which is the most recent log line for page $ID.
+  // Use $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT in place of $info['minor'].
+
+  if($revinfo['user']){
+    $info['editor'] = $revinfo['user'];
+  }else{
+    $info['editor'] = $revinfo['ip'];
+  }
+
+  // draft
+  $draft = getCacheName($info['client'].$ID,'.draft');
+  if(@file_exists($draft)){
+    if(@filemtime($draft) < @filemtime(wikiFN($ID))){
+      // remove stale draft
+      @unlink($draft);
+    }else{
+      $info['draft'] = $draft;
+    }
+  }
+
+  // mobile detection
+  $info['ismobile'] = clientismobile();
+
+  return $info;
+}
+
+/**
+ * Build an string of URL parameters
+ *
+ * @author Andreas Gohr
+ */
+function buildURLparams($params, $sep='&amp;'){
+  $url = '';
+  $amp = false;
+  foreach($params as $key => $val){
+    if($amp) $url .= $sep;
+
+    $url .= $key.'=';
+    $url .= rawurlencode((string)$val);
+    $amp = true;
+  }
+  return $url;
+}
+
+/**
+ * Build an string of html tag attributes
+ *
+ * Skips keys starting with '_', values get HTML encoded
+ *
+ * @author Andreas Gohr
+ */
+function buildAttributes($params,$skipempty=false){
+  $url = '';
+  foreach($params as $key => $val){
+    if($key{0} == '_') continue;
+    if($val === '' && $skipempty) continue;
+
+    $url .= $key.'="';
+    $url .= htmlspecialchars ($val);
+    $url .= '" ';
+  }
+  return $url;
+}
+
+
+/**
+ * This builds the breadcrumb trail and returns it as array
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function breadcrumbs(){
+  // we prepare the breadcrumbs early for quick session closing
+  static $crumbs = null;
+  if($crumbs != null) return $crumbs;
+
+  global $ID;
+  global $ACT;
+  global $conf;
+
+  //first visit?
+  $crumbs = isset($_SESSION[DOKU_COOKIE]['bc']) ? $_SESSION[DOKU_COOKIE]['bc'] : array();
+  //we only save on show and existing wiki documents
+  $file = wikiFN($ID);
+  if($ACT != 'show' || !@file_exists($file)){
+    $_SESSION[DOKU_COOKIE]['bc'] = $crumbs;
+    return $crumbs;
+  }
+
+  // page names
+  $name = noNSorNS($ID);
+  if (useHeading('navigation')) {
+    // get page title
+    $title = p_get_first_heading($ID,true);
+    if ($title) {
+      $name = $title;
+    }
+  }
+
+  //remove ID from array
+  if (isset($crumbs[$ID])) {
+    unset($crumbs[$ID]);
+  }
+
+  //add to array
+  $crumbs[$ID] = $name;
+  //reduce size
+  while(count($crumbs) > $conf['breadcrumbs']){
+    array_shift($crumbs);
+  }
+  //save to session
+  $_SESSION[DOKU_COOKIE]['bc'] = $crumbs;
+  return $crumbs;
+}
+
+/**
+ * Filter for page IDs
+ *
+ * This is run on a ID before it is outputted somewhere
+ * currently used to replace the colon with something else
+ * on Windows systems and to have proper URL encoding
+ *
+ * Urlencoding is ommitted when the second parameter is false
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idfilter($id,$ue=true){
+  global $conf;
+  if ($conf['useslash'] && $conf['userewrite']){
+    $id = strtr($id,':','/');
+  }elseif (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' &&
+      $conf['userewrite']) {
+    $id = strtr($id,':',';');
+  }
+  if($ue){
+    $id = rawurlencode($id);
+    $id = str_replace('%3A',':',$id); //keep as colon
+    $id = str_replace('%2F','/',$id); //keep as slash
+  }
+  return $id;
+}
+
+/**
+ * This builds a link to a wikipage
+ *
+ * It handles URL rewriting and adds additional parameter if
+ * given in $more
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function wl($id='',$more='',$abs=false,$sep='&amp;'){
+  global $conf;
+  if(is_array($more)){
+    $more = buildURLparams($more,$sep);
+  }else{
+    $more = str_replace(',',$sep,$more);
+  }
+
+  $id    = idfilter($id);
+  if($abs){
+    $xlink = DOKU_URL;
+  }else{
+    $xlink = DOKU_BASE;
+  }
+
+  if($conf['userewrite'] == 2){
+    $xlink .= DOKU_SCRIPT.'/'.$id;
+    if($more) $xlink .= '?'.$more;
+  }elseif($conf['userewrite']){
+    $xlink .= $id;
+    if($more) $xlink .= '?'.$more;
+  }elseif($id){
+    $xlink .= DOKU_SCRIPT.'?id='.$id;
+    if($more) $xlink .= $sep.$more;
+  }else{
+    $xlink .= DOKU_SCRIPT;
+    if($more) $xlink .= '?'.$more;
+  }
+
+  return $xlink;
+}
+
+/**
+ * This builds a link to an alternate page format
+ *
+ * Handles URL rewriting if enabled. Follows the style of wl().
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function exportlink($id='',$format='raw',$more='',$abs=false,$sep='&amp;'){
+  global $conf;
+  if(is_array($more)){
+    $more = buildURLparams($more,$sep);
+  }else{
+    $more = str_replace(',',$sep,$more);
+  }
+
+  $format = rawurlencode($format);
+  $id = idfilter($id);
+  if($abs){
+    $xlink = DOKU_URL;
+  }else{
+    $xlink = DOKU_BASE;
+  }
+
+  if($conf['userewrite'] == 2){
+    $xlink .= DOKU_SCRIPT.'/'.$id.'?do=export_'.$format;
+    if($more) $xlink .= $sep.$more;
+  }elseif($conf['userewrite'] == 1){
+    $xlink .= '_export/'.$format.'/'.$id;
+    if($more) $xlink .= '?'.$more;
+  }else{
+    $xlink .= DOKU_SCRIPT.'?do=export_'.$format.$sep.'id='.$id;
+    if($more) $xlink .= $sep.$more;
+  }
+
+  return $xlink;
+}
+
+/**
+ * Build a link to a media file
+ *
+ * Will return a link to the detail page if $direct is false
+ *
+ * The $more parameter should always be given as array, the function then
+ * will strip default parameters to produce even cleaner URLs
+ *
+ * @param string  $id     - the media file id or URL
+ * @param mixed   $more   - string or array with additional parameters
+ * @param boolean $direct - link to detail page if false
+ * @param string  $sep    - URL parameter separator
+ * @param boolean $abs    - Create an absolute URL
+ */
+function ml($id='',$more='',$direct=true,$sep='&amp;',$abs=false){
+  global $conf;
+  if(is_array($more)){
+    // strip defaults for shorter URLs
+    if(isset($more['cache']) && $more['cache'] == 'cache') unset($more['cache']);
+    if(!$more['w']) unset($more['w']);
+    if(!$more['h']) unset($more['h']);
+    if(isset($more['id']) && $direct) unset($more['id']);
+    $more = buildURLparams($more,$sep);
+  }else{
+    $more = str_replace('cache=cache','',$more); //skip default
+    $more = str_replace(',,',',',$more);
+    $more = str_replace(',',$sep,$more);
+  }
+
+  if($abs){
+    $xlink = DOKU_URL;
+  }else{
+    $xlink = DOKU_BASE;
+  }
+
+  // external URLs are always direct without rewriting
+  if(preg_match('#^(https?|ftp)://#i',$id)){
+    $xlink .= 'lib/exe/fetch.php';
+    // add hash:
+    $xlink .= '?hash='.substr(md5(auth_cookiesalt().$id),0,6);
+    if($more){
+      $xlink .= $sep.$more;
+      $xlink .= $sep.'media='.rawurlencode($id);
+    }else{
+      $xlink .= $sep.'media='.rawurlencode($id);
+    }
+    return $xlink;
+  }
+
+  $id = idfilter($id);
+
+  // decide on scriptname
+  if($direct){
+    if($conf['userewrite'] == 1){
+      $script = '_media';
+    }else{
+      $script = 'lib/exe/fetch.php';
+    }
+  }else{
+    if($conf['userewrite'] == 1){
+      $script = '_detail';
+    }else{
+      $script = 'lib/exe/detail.php';
+    }
+  }
+
+  // build URL based on rewrite mode
+   if($conf['userewrite']){
+     $xlink .= $script.'/'.$id;
+     if($more) $xlink .= '?'.$more;
+   }else{
+     if($more){
+       $xlink .= $script.'?'.$more;
+       $xlink .= $sep.'media='.$id;
+     }else{
+       $xlink .= $script.'?media='.$id;
+     }
+   }
+
+  return $xlink;
+}
+
+
+
+/**
+ * Just builds a link to a script
+ *
+ * @todo   maybe obsolete
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function script($script='doku.php'){
+#  $link = getBaseURL();
+#  $link .= $script;
+#  return $link;
+  return DOKU_BASE.DOKU_SCRIPT;
+}
+
+/**
+ * Spamcheck against wordlist
+ *
+ * Checks the wikitext against a list of blocked expressions
+ * returns true if the text contains any bad words
+ *
+ * Triggers COMMON_WORDBLOCK_BLOCKED
+ *
+ *  Action Plugins can use this event to inspect the blocked data
+ *  and gain information about the user who was blocked.
+ *
+ *  Event data:
+ *    data['matches']  - array of matches
+ *    data['userinfo'] - information about the blocked user
+ *      [ip]           - ip address
+ *      [user]         - username (if logged in)
+ *      [mail]         - mail address (if logged in)
+ *      [name]         - real name (if logged in)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michael Klier <chi@chimeric.de>
+ * @param  string $text - optional text to check, if not given the globals are used
+ * @return bool         - true if a spam word was found
+ */
+function checkwordblock($text=''){
+  global $TEXT;
+  global $PRE;
+  global $SUF;
+  global $conf;
+  global $INFO;
+
+  if(!$conf['usewordblock']) return false;
+
+  if(!$text) $text = "$PRE $TEXT $SUF";
+
+  // we prepare the text a tiny bit to prevent spammers circumventing URL checks
+  $text = preg_replace('!(\b)(www\.[\w.:?\-;,]+?\.[\w.:?\-;,]+?[\w/\#~:.?+=&%@\!\-.:?\-;,]+?)([.:?\-;,]*[^\w/\#~:.?+=&%@\!\-.:?\-;,])!i','\1http://\2 \2\3',$text);
+
+  $wordblocks = getWordblocks();
+  //how many lines to read at once (to work around some PCRE limits)
+  if(version_compare(phpversion(),'4.3.0','<')){
+    //old versions of PCRE define a maximum of parenthesises even if no
+    //backreferences are used - the maximum is 99
+    //this is very bad performancewise and may even be too high still
+    $chunksize = 40;
+  }else{
+    //read file in chunks of 200 - this should work around the
+    //MAX_PATTERN_SIZE in modern PCRE
+    $chunksize = 200;
+  }
+  while($blocks = array_splice($wordblocks,0,$chunksize)){
+    $re = array();
+    #build regexp from blocks
+    foreach($blocks as $block){
+      $block = preg_replace('/#.*$/','',$block);
+      $block = trim($block);
+      if(empty($block)) continue;
+      $re[]  = $block;
+    }
+    if(count($re) && preg_match('#('.join('|',$re).')#si',$text,$matches)) {
+      //prepare event data
+      $data['matches'] = $matches;
+      $data['userinfo']['ip'] = $_SERVER['REMOTE_ADDR'];
+      if($_SERVER['REMOTE_USER']) {
+          $data['userinfo']['user'] = $_SERVER['REMOTE_USER'];
+          $data['userinfo']['name'] = $INFO['userinfo']['name'];
+          $data['userinfo']['mail'] = $INFO['userinfo']['mail'];
+      }
+      $callback = create_function('', 'return true;');
+      return trigger_event('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true);
+    }
+  }
+  return false;
+}
+
+/**
+ * Return the IP of the client
+ *
+ * Honours X-Forwarded-For and X-Real-IP Proxy Headers
+ *
+ * It returns a comma separated list of IPs if the above mentioned
+ * headers are set. If the single parameter is set, it tries to return
+ * a routable public address, prefering the ones suplied in the X
+ * headers
+ *
+ * @param  boolean $single If set only a single IP is returned
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function clientIP($single=false){
+  $ip = array();
+  $ip[] = $_SERVER['REMOTE_ADDR'];
+  if(!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
+    $ip = array_merge($ip,explode(',',$_SERVER['HTTP_X_FORWARDED_FOR']));
+  if(!empty($_SERVER['HTTP_X_REAL_IP']))
+    $ip = array_merge($ip,explode(',',$_SERVER['HTTP_X_REAL_IP']));
+
+  // some IPv4/v6 regexps borrowed from Feyd
+  // see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479
+  $dec_octet = '(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|[0-9])';
+  $hex_digit = '[A-Fa-f0-9]';
+  $h16 = "{$hex_digit}{1,4}";
+  $IPv4Address = "$dec_octet\\.$dec_octet\\.$dec_octet\\.$dec_octet";
+  $ls32 = "(?:$h16:$h16|$IPv4Address)";
+  $IPv6Address =
+    "(?:(?:{$IPv4Address})|(?:".
+    "(?:$h16:){6}$ls32" .
+    "|::(?:$h16:){5}$ls32" .
+    "|(?:$h16)?::(?:$h16:){4}$ls32" .
+    "|(?:(?:$h16:){0,1}$h16)?::(?:$h16:){3}$ls32" .
+    "|(?:(?:$h16:){0,2}$h16)?::(?:$h16:){2}$ls32" .
+    "|(?:(?:$h16:){0,3}$h16)?::(?:$h16:){1}$ls32" .
+    "|(?:(?:$h16:){0,4}$h16)?::$ls32" .
+    "|(?:(?:$h16:){0,5}$h16)?::$h16" .
+    "|(?:(?:$h16:){0,6}$h16)?::" .
+    ")(?:\\/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))?)";
+
+  // remove any non-IP stuff
+  $cnt = count($ip);
+  $match = array();
+  for($i=0; $i<$cnt; $i++){
+    if(preg_match("/^$IPv4Address$/",$ip[$i],$match) || preg_match("/^$IPv6Address$/",$ip[$i],$match)) {
+      $ip[$i] = $match[0];
+    } else {
+      $ip[$i] = '';
+    }
+    if(empty($ip[$i])) unset($ip[$i]);
+  }
+  $ip = array_values(array_unique($ip));
+  if(!$ip[0]) $ip[0] = '0.0.0.0'; // for some strange reason we don't have a IP
+
+  if(!$single) return join(',',$ip);
+
+  // decide which IP to use, trying to avoid local addresses
+  $ip = array_reverse($ip);
+  foreach($ip as $i){
+    if(preg_match('/^(127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)/',$i)){
+      continue;
+    }else{
+      return $i;
+    }
+  }
+  // still here? just use the first (last) address
+  return $ip[0];
+}
+
+/**
+ * Check if the browser is on a mobile device
+ *
+ * Adapted from the example code at url below
+ *
+ * @link http://www.brainhandles.com/2007/10/15/detecting-mobile-browsers/#code
+ */
+function clientismobile(){
+
+    if(isset($_SERVER['HTTP_X_WAP_PROFILE'])) return true;
+
+    if(preg_match('/wap\.|\.wap/i',$_SERVER['HTTP_ACCEPT'])) return true;
+
+    if(!isset($_SERVER['HTTP_USER_AGENT'])) return false;
+
+    $uamatches = 'midp|j2me|avantg|docomo|novarra|palmos|palmsource|240x320|opwv|chtml|pda|windows ce|mmp\/|blackberry|mib\/|symbian|wireless|nokia|hand|mobi|phone|cdm|up\.b|audio|SIE\-|SEC\-|samsung|HTC|mot\-|mitsu|sagem|sony|alcatel|lg|erics|vx|NEC|philips|mmm|xx|panasonic|sharp|wap|sch|rover|pocket|benq|java|pt|pg|vox|amoi|bird|compal|kg|voda|sany|kdd|dbt|sendo|sgh|gradi|jb|\d\d\di|moto';
+
+    if(preg_match("/$uamatches/i",$_SERVER['HTTP_USER_AGENT'])) return true;
+
+    return false;
+}
+
+
+/**
+ * Convert one or more comma separated IPs to hostnames
+ *
+ * @author Glen Harris <astfgl@iamnota.org>
+ * @returns a comma separated list of hostnames
+ */
+function gethostsbyaddrs($ips){
+  $hosts = array();
+  $ips = explode(',',$ips);
+
+  if(is_array($ips)) {
+    foreach($ips as $ip){
+      $hosts[] = gethostbyaddr(trim($ip));
+    }
+    return join(',',$hosts);
+  } else {
+    return gethostbyaddr(trim($ips));
+  }
+}
+
+/**
+ * Checks if a given page is currently locked.
+ *
+ * removes stale lockfiles
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function checklock($id){
+  global $conf;
+  $lock = wikiLockFN($id);
+
+  //no lockfile
+  if(!@file_exists($lock)) return false;
+
+  //lockfile expired
+  if((time() - filemtime($lock)) > $conf['locktime']){
+    @unlink($lock);
+    return false;
+  }
+
+  //my own lock
+  $ip = io_readFile($lock);
+  if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){
+    return false;
+  }
+
+  return $ip;
+}
+
+/**
+ * Lock a page for editing
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function lock($id){
+  $lock = wikiLockFN($id);
+  if($_SERVER['REMOTE_USER']){
+    io_saveFile($lock,$_SERVER['REMOTE_USER']);
+  }else{
+    io_saveFile($lock,clientIP());
+  }
+}
+
+/**
+ * Unlock a page if it was locked by the user
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @return bool true if a lock was removed
+ */
+function unlock($id){
+  $lock = wikiLockFN($id);
+  if(@file_exists($lock)){
+    $ip = io_readFile($lock);
+    if( ($ip == clientIP()) || ($ip == $_SERVER['REMOTE_USER']) ){
+      @unlink($lock);
+      return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * convert line ending to unix format
+ *
+ * @see    formText() for 2crlf conversion
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function cleanText($text){
+  $text = preg_replace("/(\015\012)|(\015)/","\012",$text);
+  return $text;
+}
+
+/**
+ * Prepares text for print in Webforms by encoding special chars.
+ * It also converts line endings to Windows format which is
+ * pseudo standard for webforms.
+ *
+ * @see    cleanText() for 2unix conversion
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function formText($text){
+  $text = str_replace("\012","\015\012",$text);
+  return htmlspecialchars($text);
+}
+
+/**
+ * Returns the specified local text in raw format
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rawLocale($id){
+  return io_readFile(localeFN($id));
+}
+
+/**
+ * Returns the raw WikiText
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rawWiki($id,$rev=''){
+  return io_readWikiPage(wikiFN($id, $rev), $id, $rev);
+}
+
+/**
+ * Returns the pagetemplate contents for the ID's namespace
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function pageTemplate($data){
+  $id = $data[0];
+  global $conf;
+  global $INFO;
+
+  $path = dirname(wikiFN($id));
+
+  if(@file_exists($path.'/_template.txt')){
+    $tpl = io_readFile($path.'/_template.txt');
+  }else{
+    // search upper namespaces for templates
+    $len = strlen(rtrim($conf['datadir'],'/'));
+    while (strlen($path) >= $len){
+      if(@file_exists($path.'/__template.txt')){
+        $tpl = io_readFile($path.'/__template.txt');
+        break;
+      }
+      $path = substr($path, 0, strrpos($path, '/'));
+    }
+  }
+  if(!$tpl) return '';
+
+  // replace placeholders
+  $file = noNS($id);
+  $page = strtr($file,'_',' ');
+
+  $tpl = str_replace(array(
+                        '@ID@',
+                        '@NS@',
+                        '@FILE@',
+                        '@!FILE@',
+                        '@!FILE!@',
+                        '@PAGE@',
+                        '@!PAGE@',
+                        '@!!PAGE@',
+                        '@!PAGE!@',
+                        '@USER@',
+                        '@NAME@',
+                        '@MAIL@',
+                        '@DATE@',
+                     ),
+                     array(
+                        $id,
+                        getNS($id),
+                        $file,
+                        utf8_ucfirst($file),
+                        utf8_strtoupper($file),
+                        $page,
+                        utf8_ucfirst($page),
+                        utf8_ucwords($page),
+                        utf8_strtoupper($page),
+                        $_SERVER['REMOTE_USER'],
+                        $INFO['userinfo']['name'],
+                        $INFO['userinfo']['mail'],
+                        $conf['dformat'],
+                     ), $tpl);
+
+  // we need the callback to work around strftime's char limit
+  $tpl = preg_replace_callback('/%./',create_function('$m','return strftime($m[0]);'),$tpl);
+
+  return $tpl;
+}
+
+
+/**
+ * Returns the raw Wiki Text in three slices.
+ *
+ * The range parameter needs to have the form "from-to"
+ * and gives the range of the section in bytes - no
+ * UTF-8 awareness is needed.
+ * The returned order is prefix, section and suffix.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function rawWikiSlices($range,$id,$rev=''){
+  list($from,$to) = explode('-',$range,2);
+  $text = io_readWikiPage(wikiFN($id, $rev), $id, $rev);
+  if(!$from) $from = 0;
+  if(!$to)   $to   = strlen($text)+1;
+
+  $slices[0] = substr($text,0,$from-1);
+  $slices[1] = substr($text,$from-1,$to-$from);
+  $slices[2] = substr($text,$to);
+
+  return $slices;
+}
+
+/**
+ * Joins wiki text slices
+ *
+ * function to join the text slices with correct lineendings again.
+ * When the pretty parameter is set to true it adds additional empty
+ * lines between sections if needed (used on saving).
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function con($pre,$text,$suf,$pretty=false){
+
+  if($pretty){
+    if($pre && substr($pre,-1) != "\n") $pre .= "\n";
+    if($suf && substr($text,-1) != "\n") $text .= "\n";
+  }
+
+  // Avoid double newline above section when saving section edit
+  //if($pre) $pre .= "\n";
+  if($suf) $text .= "\n";
+  return $pre.$text.$suf;
+}
+
+/**
+ * Saves a wikitext by calling io_writeWikiPage.
+ * Also directs changelog and attic updates.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function saveWikiText($id,$text,$summary,$minor=false){
+  /* Note to developers:
+     This code is subtle and delicate. Test the behavior of
+     the attic and changelog with dokuwiki and external edits
+     after any changes. External edits change the wiki page
+     directly without using php or dokuwiki.
+  */
+  global $conf;
+  global $lang;
+  global $REV;
+  // ignore if no changes were made
+  if($text == rawWiki($id,'')){
+    return;
+  }
+
+  $file = wikiFN($id);
+  $old = @filemtime($file); // from page
+  $wasRemoved = empty($text);
+  $wasCreated = !@file_exists($file);
+  $wasReverted = ($REV==true);
+  $newRev = false;
+  $oldRev = getRevisions($id, -1, 1, 1024); // from changelog
+  $oldRev = (int)(empty($oldRev)?0:$oldRev[0]);
+  if(!@file_exists(wikiFN($id, $old)) && @file_exists($file) && $old>=$oldRev) {
+    // add old revision to the attic if missing
+    saveOldRevision($id);
+    // add a changelog entry if this edit came from outside dokuwiki
+    if ($old>$oldRev) {
+      addLogEntry($old, $id, DOKU_CHANGE_TYPE_EDIT, $lang['external_edit'], '', array('ExternalEdit'=>true));
+      // remove soon to be stale instructions
+      $cache = new cache_instructions($id, $file);
+      $cache->removeCache();
+    }
+  }
+
+  if ($wasRemoved){
+    // Send "update" event with empty data, so plugins can react to page deletion
+    $data = array(array($file, '', false), getNS($id), noNS($id), false);
+    trigger_event('IO_WIKIPAGE_WRITE', $data);
+    // pre-save deleted revision
+    @touch($file);
+    clearstatcache();
+    $newRev = saveOldRevision($id);
+    // remove empty file
+    @unlink($file);
+    // remove old meta info...
+    $mfiles = metaFiles($id);
+    $changelog = metaFN($id, '.changes');
+    $metadata  = metaFN($id, '.meta');
+    foreach ($mfiles as $mfile) {
+      // but keep per-page changelog to preserve page history and keep meta data
+      if (@file_exists($mfile) && $mfile!==$changelog && $mfile!==$metadata) { @unlink($mfile); }
+    }
+    // purge meta data
+    p_purge_metadata($id);
+    $del = true;
+    // autoset summary on deletion
+    if(empty($summary)) $summary = $lang['deleted'];
+    // remove empty namespaces
+    io_sweepNS($id, 'datadir');
+    io_sweepNS($id, 'mediadir');
+  }else{
+    // save file (namespace dir is created in io_writeWikiPage)
+    io_writeWikiPage($file, $text, $id);
+    // pre-save the revision, to keep the attic in sync
+    $newRev = saveOldRevision($id);
+    $del = false;
+  }
+
+  // select changelog line type
+  $extra = '';
+  $type = DOKU_CHANGE_TYPE_EDIT;
+  if ($wasReverted) {
+    $type = DOKU_CHANGE_TYPE_REVERT;
+    $extra = $REV;
+  }
+  else if ($wasCreated) { $type = DOKU_CHANGE_TYPE_CREATE; }
+  else if ($wasRemoved) { $type = DOKU_CHANGE_TYPE_DELETE; }
+  else if ($minor && $conf['useacl'] && $_SERVER['REMOTE_USER']) { $type = DOKU_CHANGE_TYPE_MINOR_EDIT; } //minor edits only for logged in users
+
+  addLogEntry($newRev, $id, $type, $summary, $extra);
+  // send notify mails
+  notify($id,'admin',$old,$summary,$minor);
+  notify($id,'subscribers',$old,$summary,$minor);
+
+  // update the purgefile (timestamp of the last time anything within the wiki was changed)
+  io_saveFile($conf['cachedir'].'/purgefile',time());
+
+  // if useheading is enabled, purge the cache of all linking pages
+  if(useHeading('content')){
+    require_once(DOKU_INC.'inc/fulltext.php');
+    $pages = ft_backlinks($id);
+    foreach ($pages as $page) {
+      $cache = new cache_renderer($page, wikiFN($page), 'xhtml');
+      $cache->removeCache();
+    }
+  }
+}
+
+/**
+ * moves the current version to the attic and returns its
+ * revision date
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function saveOldRevision($id){
+  global $conf;
+  $oldf = wikiFN($id);
+  if(!@file_exists($oldf)) return '';
+  $date = filemtime($oldf);
+  $newf = wikiFN($id,$date);
+  io_writeWikiPage($newf, rawWiki($id), $id, $date);
+  return $date;
+}
+
+/**
+ * Sends a notify mail on page change or registration
+ *
+ * @param  string  $id       The changed page
+ * @param  string  $who      Who to notify (admin|subscribers|register)
+ * @param  int     $rev      Old page revision
+ * @param  string  $summary  What changed
+ * @param  boolean $minor    Is this a minor edit?
+ * @param  array   $replace  Additional string substitutions, @KEY@ to be replaced by value
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function notify($id,$who,$rev='',$summary='',$minor=false,$replace=array()){
+  global $lang;
+  global $conf;
+  global $INFO;
+
+  // decide if there is something to do
+  if($who == 'admin'){
+    if(empty($conf['notify'])) return; //notify enabled?
+    $text = rawLocale('mailtext');
+    $to   = $conf['notify'];
+    $bcc  = '';
+  }elseif($who == 'subscribers'){
+    if(!$conf['subscribers']) return; //subscribers enabled?
+    if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return; //skip minors
+    $bcc  = subscriber_addresslist($id,false);
+    if(empty($bcc)) return;
+    $to   = '';
+    $text = rawLocale('subscribermail');
+  }elseif($who == 'register'){
+    if(empty($conf['registernotify'])) return;
+    $text = rawLocale('registermail');
+    $to   = $conf['registernotify'];
+    $bcc  = '';
+  }else{
+    return; //just to be safe
+  }
+
+  $ip   = clientIP();
+  $text = str_replace('@DATE@',dformat(),$text);
+  $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
+  $text = str_replace('@IPADDRESS@',$ip,$text);
+  $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
+  $text = str_replace('@NEWPAGE@',wl($id,'',true,'&'),$text);
+  $text = str_replace('@PAGE@',$id,$text);
+  $text = str_replace('@TITLE@',$conf['title'],$text);
+  $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
+  $text = str_replace('@SUMMARY@',$summary,$text);
+  $text = str_replace('@USER@',$_SERVER['REMOTE_USER'],$text);
+
+  foreach ($replace as $key => $substitution) {
+    $text = str_replace('@'.strtoupper($key).'@',$substitution, $text);
+  }
+
+  if($who == 'register'){
+    $subject = $lang['mail_new_user'].' '.$summary;
+  }elseif($rev){
+    $subject = $lang['mail_changed'].' '.$id;
+    $text = str_replace('@OLDPAGE@',wl($id,"rev=$rev",true,'&'),$text);
+    require_once(DOKU_INC.'inc/DifferenceEngine.php');
+    $df  = new Diff(explode("\n",rawWiki($id,$rev)),
+                    explode("\n",rawWiki($id)));
+    $dformat = new UnifiedDiffFormatter();
+    $diff    = $dformat->format($df);
+  }else{
+    $subject=$lang['mail_newpage'].' '.$id;
+    $text = str_replace('@OLDPAGE@','none',$text);
+    $diff = rawWiki($id);
+  }
+  $text = str_replace('@DIFF@',$diff,$text);
+  $subject = '['.$conf['title'].'] '.$subject;
+
+  $from = $conf['mailfrom'];
+  $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from);
+  $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
+  $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
+
+  mail_send($to,$subject,$text,$from,'',$bcc);
+}
+
+/**
+ * extracts the query from a search engine referrer
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Todd Augsburger <todd@rollerorgans.com>
+ */
+function getGoogleQuery(){
+  if (!isset($_SERVER['HTTP_REFERER'])) {
+    return '';
+  }
+  $url = parse_url($_SERVER['HTTP_REFERER']);
+
+  $query = array();
+
+  // temporary workaround against PHP bug #49733
+  // see http://bugs.php.net/bug.php?id=49733
+  if(UTF8_MBSTRING) $enc = mb_internal_encoding();
+  parse_str($url['query'],$query);
+  if(UTF8_MBSTRING) mb_internal_encoding($enc);
+
+  $q = '';
+  if(isset($query['q']))
+    $q = $query['q'];        // google, live/msn, aol, ask, altavista, alltheweb, gigablast
+  elseif(isset($query['p']))
+    $q = $query['p'];        // yahoo
+  elseif(isset($query['query']))
+    $q = $query['query'];    // lycos, netscape, clusty, hotbot
+  elseif(preg_match("#a9\.com#i",$url['host'])) // a9
+    $q = urldecode(ltrim($url['path'],'/'));
+
+  if($q === '') return '';
+  $q = preg_split('/[\s\'"\\\\`()\]\[?:!\.{};,#+*<>\\/]+/',$q,-1,PREG_SPLIT_NO_EMPTY);
+  return $q;
+}
+
+/**
+ * Try to set correct locale
+ *
+ * @deprecated No longer used
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+function setCorrectLocale(){
+  global $conf;
+  global $lang;
+
+  $enc = strtoupper($lang['encoding']);
+  foreach ($lang['locales'] as $loc){
+    //try locale
+    if(@setlocale(LC_ALL,$loc)) return;
+    //try loceale with encoding
+    if(@setlocale(LC_ALL,"$loc.$enc")) return;
+  }
+  //still here? try to set from environment
+  @setlocale(LC_ALL,"");
+}
+
+/**
+ * Return the human readable size of a file
+ *
+ * @param       int    $size   A file size
+ * @param       int    $dec    A number of decimal places
+ * @author      Martin Benjamin <b.martin@cybernet.ch>
+ * @author      Aidan Lister <aidan@php.net>
+ * @version     1.0.0
+ */
+function filesize_h($size, $dec = 1){
+  $sizes = array('B', 'KB', 'MB', 'GB');
+  $count = count($sizes);
+  $i = 0;
+
+  while ($size >= 1024 && ($i < $count - 1)) {
+    $size /= 1024;
+    $i++;
+  }
+
+  return round($size, $dec) . ' ' . $sizes[$i];
+}
+
+/**
+ * Return the given timestamp as human readable, fuzzy age
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function datetime_h($dt){
+  global $lang;
+
+  $ago = time() - $dt;
+  if($ago > 24*60*60*30*12*2){
+    return sprintf($lang['years'], round($ago/(24*60*60*30*12)));
+  }
+  if($ago > 24*60*60*30*2){
+    return sprintf($lang['months'], round($ago/(24*60*60*30)));
+  }
+  if($ago > 24*60*60*7*2){
+    return sprintf($lang['weeks'], round($ago/(24*60*60*7)));
+  }
+  if($ago > 24*60*60*2){
+    return sprintf($lang['days'], round($ago/(24*60*60)));
+  }
+  if($ago > 60*60*2){
+    return sprintf($lang['hours'], round($ago/(60*60)));
+  }
+  if($ago > 60*2){
+    return sprintf($lang['minutes'], round($ago/(60)));
+  }
+  return sprintf($lang['seconds'], $ago);
+
+}
+
+/**
+ * Wraps around strftime but provides support for fuzzy dates
+ *
+ * The format default to $conf['dformat']. It is passed to
+ * strftime - %f can be used to get the value from datetime_h()
+ *
+ * @see datetime_h
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function dformat($dt=null,$format=''){
+  global $conf;
+
+  if(is_null($dt)) $dt = time();
+  $dt = (int) $dt;
+  if(!$format) $format = $conf['dformat'];
+
+  $format = str_replace('%f',datetime_h($dt),$format);
+  return strftime($format,$dt);
+}
+
+/**
+ * return an obfuscated email address in line with $conf['mailguard'] setting
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ */
+function obfuscate($email) {
+  global $conf;
+
+  switch ($conf['mailguard']) {
+    case 'visible' :
+      $obfuscate = array('@' => ' [at] ', '.' => ' [dot] ', '-' => ' [dash] ');
+      return strtr($email, $obfuscate);
+
+    case 'hex' :
+      $encode = '';
+      for ($x=0; $x < strlen($email); $x++) $encode .= '&#x' . bin2hex($email{$x}).';';
+      return $encode;
+
+    case 'none' :
+    default :
+      return $email;
+  }
+}
+
+/**
+ * Let us know if a user is tracking a page or a namespace
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function is_subscribed($id,$uid,$ns=false){
+  if(!$ns) {
+    $file=metaFN($id,'.mlist');
+  } else {
+    if(!getNS($id)) {
+      $file = metaFN(getNS($id),'.mlist');
+    } else {
+      $file = metaFN(getNS($id),'/.mlist');
+    }
+  }
+  if (@file_exists($file)) {
+    $mlist = file($file);
+    $pos = array_search($uid."\n",$mlist);
+    return is_int($pos);
+  }
+
+  return false;
+}
+
+/**
+ * Return a string with the email addresses of all the
+ * users subscribed to a page
+ *
+ * @author Steven Danz <steven-danz@kc.rr.com>
+ */
+function subscriber_addresslist($id,$self=true){
+  global $conf;
+  global $auth;
+
+  if (!$conf['subscribers']) return '';
+
+  $users = array();
+  $emails = array();
+
+  // load the page mlist file content
+  $mlist = array();
+  $file=metaFN($id,'.mlist');
+  if (@file_exists($file)) {
+    $mlist = file($file);
+    foreach ($mlist as $who) {
+      $who = rtrim($who);
+      if(!$self && $who == $_SERVER['REMOTE_USER']) continue;
+      $users[$who] = true;
+    }
+  }
+
+  // load also the namespace mlist file content
+  $ns = getNS($id);
+  while ($ns) {
+    $nsfile = metaFN($ns,'/.mlist');
+    if (@file_exists($nsfile)) {
+      $mlist = file($nsfile);
+      foreach ($mlist as $who) {
+        $who = rtrim($who);
+        if(!$self && $who == $_SERVER['REMOTE_USER']) continue;
+        $users[$who] = true;
+      }
+    }
+    $ns = getNS($ns);
+  }
+  // root namespace
+  $nsfile = metaFN('','.mlist');
+  if (@file_exists($nsfile)) {
+    $mlist = file($nsfile);
+    foreach ($mlist as $who) {
+      $who = rtrim($who);
+      if(!$self && $who == $_SERVER['REMOTE_USER']) continue;
+      $users[$who] = true;
+    }
+  }
+  if(!empty($users)) {
+    foreach (array_keys($users) as $who) {
+      $info = $auth->getUserData($who);
+      if($info === false) continue;
+      $level = auth_aclcheck($id,$who,$info['grps']);
+      if ($level >= AUTH_READ) {
+        if (strcasecmp($info['mail'],$conf['notify']) != 0) {
+          $emails[] = $info['mail'];
+        }
+      }
+    }
+  }
+
+  return implode(',',$emails);
+}
+
+/**
+ * Removes quoting backslashes
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function unslash($string,$char="'"){
+  return str_replace('\\'.$char,$char,$string);
+}
+
+/**
+ * Convert php.ini shorthands to byte
+ *
+ * @author <gilthans dot NO dot SPAM at gmail dot com>
+ * @link   http://de3.php.net/manual/en/ini.core.php#79564
+ */
+function php_to_byte($v){
+    $l = substr($v, -1);
+    $ret = substr($v, 0, -1);
+    switch(strtoupper($l)){
+        case 'P':
+            $ret *= 1024;
+        case 'T':
+            $ret *= 1024;
+        case 'G':
+            $ret *= 1024;
+        case 'M':
+            $ret *= 1024;
+        case 'K':
+            $ret *= 1024;
+        break;
+    }
+    return $ret;
+}
+
+/**
+ * Wrapper around preg_quote adding the default delimiter
+ */
+function preg_quote_cb($string){
+    return preg_quote($string,'/');
+}
+
+/**
+ * Shorten a given string by removing data from the middle
+ *
+ * You can give the string in two parts, the first part $keep
+ * will never be shortened. The second part $short will be cut
+ * in the middle to shorten but only if at least $min chars are
+ * left to display it. Otherwise it will be left off.
+ *
+ * @param string $keep   the part to keep
+ * @param string $short  the part to shorten
+ * @param int    $max    maximum chars you want for the whole string
+ * @param int    $min    minimum number of chars to have left for middle shortening
+ * @param string $char   the shortening character to use
+ */
+function shorten($keep,$short,$max,$min=9,$char='…'){
+    $max = $max - utf8_strlen($keep);
+   if($max < $min) return $keep;
+    $len = utf8_strlen($short);
+    if($len <= $max) return $keep.$short;
+    $half = floor($max/2);
+    return $keep.utf8_substr($short,0,$half-1).$char.utf8_substr($short,$len-$half);
+}
+
+/**
+ * Return the users realname or e-mail address for use
+ * in page footer and recent changes pages
+ *
+ * @author Andy Webber <dokuwiki AT andywebber DOT com>
+ */
+function editorinfo($username){
+    global $conf;
+    global $auth;
+
+    switch($conf['showuseras']){
+      case 'username':
+      case 'email':
+      case 'email_link':
+        if($auth) $info = $auth->getUserData($username);
+        break;
+      default:
+        return hsc($username);
+    }
+
+    if(isset($info) && $info) {
+        switch($conf['showuseras']){
+          case 'username':
+            return hsc($info['name']);
+          case 'email':
+            return obfuscate($info['mail']);
+          case 'email_link':
+            $mail=obfuscate($info['mail']);
+            return '<a href="mailto:'.$mail.'">'.$mail.'</a>';
+          default:
+            return hsc($username);
+        }
+    } else {
+        return hsc($username);
+    }
+}
+
+/**
+ * Returns the path to a image file for the currently chosen license.
+ * When no image exists, returns an empty string
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string $type - type of image 'badge' or 'button'
+ */
+function license_img($type){
+    global $license;
+    global $conf;
+    if(!$conf['license']) return '';
+    if(!is_array($license[$conf['license']])) return '';
+    $lic = $license[$conf['license']];
+    $try = array();
+    $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.png';
+    $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.gif';
+    if(substr($conf['license'],0,3) == 'cc-'){
+        $try[] = 'lib/images/license/'.$type.'/cc.png';
+    }
+    foreach($try as $src){
+        if(@file_exists(DOKU_INC.$src)) return $src;
+    }
+    return '';
+}
+
+/**
+ * Checks if the given amount of memory is available
+ *
+ * If the memory_get_usage() function is not available the
+ * function just assumes $bytes of already allocated memory
+ *
+ * @param  int $mem  Size of memory you want to allocate in bytes
+ * @param  int $used already allocated memory (see above)
+ * @author Filip Oscadal <webmaster@illusionsoftworks.cz>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function is_mem_available($mem,$bytes=1048576){
+  $limit = trim(ini_get('memory_limit'));
+  if(empty($limit)) return true; // no limit set!
+
+  // parse limit to bytes
+  $limit = php_to_byte($limit);
+
+  // get used memory if possible
+  if(function_exists('memory_get_usage')){
+    $used = memory_get_usage();
+  }
+
+  if($used+$mem > $limit){
+    return false;
+  }
+
+  return true;
+}
+
+/**
+ * Send a HTTP redirect to the browser
+ *
+ * Works arround Microsoft IIS cookie sending bug. Exits the script.
+ *
+ * @link   http://support.microsoft.com/kb/q176113/
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function send_redirect($url){
+    // always close the session
+    session_write_close();
+
+    // check if running on IIS < 6 with CGI-PHP
+    if( isset($_SERVER['SERVER_SOFTWARE']) && isset($_SERVER['GATEWAY_INTERFACE']) &&
+        (strpos($_SERVER['GATEWAY_INTERFACE'],'CGI') !== false) &&
+        (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) &&
+        $matches[1] < 6 ){
+        header('Refresh: 0;url='.$url);
+    }else{
+        header('Location: '.$url);
+    }
+    exit;
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/confutils.php b/mod/dokuwiki/vendors/dokuwiki/inc/confutils.php
new file mode 100644
index 000000000..9ec7a551e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/confutils.php
@@ -0,0 +1,320 @@
+<?php
+/**
+ * Utilities for collecting data from config files
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Harry Fuecks <hfuecks@gmail.com>
+ */
+
+
+/**
+ * Returns the (known) extension and mimetype of a given filename
+ *
+ * If $knownonly is true (the default), then only known extensions
+ * are returned.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function mimetype($file, $knownonly=true){
+  $ret    = array(false,false,false); // return array
+  $mtypes = getMimeTypes();     // known mimetypes
+  $exts   = join('|',array_keys($mtypes));  // known extensions (regexp)
+  if(!$knownonly){
+    $exts = $exts.'|[_\-A-Za-z0-9]+';  // any extension
+  }
+  if(preg_match('#\.('.$exts.')$#i',$file,$matches)){
+    $ext = strtolower($matches[1]);
+  }
+
+  if($ext){
+    if (isset($mtypes[$ext])){
+      if($mtypes[$ext][0] == '!'){
+          $ret = array($ext, substr($mtypes[$ext],1), true);
+      }else{
+          $ret = array($ext, $mtypes[$ext], false);
+      }
+    }elseif(!$knownonly){
+      $ret = array($ext, 'application/octet-stream', true);
+    }
+  }
+
+  return $ret;
+}
+
+/**
+ * returns a hash of mimetypes
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function getMimeTypes() {
+  static $mime = NULL;
+  if ( !$mime ) {
+    $mime = retrieveConfig('mime','confToHash');
+  }
+  return $mime;
+}
+
+/**
+ * returns a hash of acronyms
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function getAcronyms() {
+  static $acronyms = NULL;
+  if ( !$acronyms ) {
+    $acronyms = retrieveConfig('acronyms','confToHash');
+  }
+  return $acronyms;
+}
+
+/**
+ * returns a hash of smileys
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function getSmileys() {
+  static $smileys = NULL;
+  if ( !$smileys ) {
+    $smileys = retrieveConfig('smileys','confToHash');
+  }
+  return $smileys;
+}
+
+/**
+ * returns a hash of entities
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function getEntities() {
+  static $entities = NULL;
+  if ( !$entities ) {
+    $entities = retrieveConfig('entities','confToHash');
+  }
+  return $entities;
+}
+
+/**
+ * returns a hash of interwikilinks
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function getInterwiki() {
+  static $wikis = NULL;
+  if ( !$wikis ) {
+    $wikis = retrieveConfig('interwiki','confToHash',array(true));
+  }
+  //add sepecial case 'this'
+  $wikis['this'] = DOKU_URL.'{NAME}';
+  return $wikis;
+}
+
+/**
+ * returns array of wordblock patterns
+ *
+ */
+function getWordblocks() {
+  static $wordblocks = NULL;
+  if ( !$wordblocks ) {
+    $wordblocks = retrieveConfig('wordblock','file');
+  }
+  return $wordblocks;
+}
+
+
+function getSchemes() {
+  static $schemes = NULL;
+  if ( !$schemes ) {
+    $schemes = retrieveConfig('scheme','file');
+  }
+  $schemes = array_map('trim', $schemes);
+  $schemes = preg_replace('/^#.*/', '', $schemes);
+  $schemes = array_filter($schemes);
+  return $schemes;
+}
+
+/**
+ * Builds a hash from an array of lines
+ *
+ * If $lower is set to true all hash keys are converted to
+ * lower case.
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Gina Haeussge <gina@foosel.net>
+ */
+function linesToHash($lines, $lower=false) {
+  foreach ( $lines as $line ) {
+    //ignore comments (except escaped ones)
+    $line = preg_replace('/(?<![&\\\\])#.*$/','',$line);
+    $line = str_replace('\\#','#',$line);
+    $line = trim($line);
+    if(empty($line)) continue;
+    $line = preg_split('/\s+/',$line,2);
+    // Build the associative array
+    if($lower){
+      $conf[strtolower($line[0])] = $line[1];
+    }else{
+      $conf[$line[0]] = $line[1];
+    }
+  }
+
+  return $conf;
+}
+
+/**
+ * Builds a hash from a configfile
+ *
+ * If $lower is set to true all hash keys are converted to
+ * lower case.
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Gina Haeussge <gina@foosel.net>
+ */
+function confToHash($file,$lower=false) {
+  $conf = array();
+  $lines = @file( $file );
+  if ( !$lines ) return $conf;
+
+  return linesToHash($lines, $lower);
+}
+
+/**
+ * Retrieve the requested configuration information
+ *
+ * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param  string   $type     the configuration settings to be read, must correspond to a key/array in $config_cascade
+ * @param  callback $fn       the function used to process the configuration file into an array
+ * @param  array    $param    optional additional params to pass to the callback
+ * @return array    configuration values
+ */
+function retrieveConfig($type,$fn,$params=null) {
+  global $config_cascade;
+
+  if(!is_array($params)) $params = array();
+
+  $combined = array();
+  if (!is_array($config_cascade[$type])) trigger_error('Missing config cascade for "'.$type.'"',E_USER_WARNING);
+  foreach (array('default','local','protected') as $config_group) {
+    if (empty($config_cascade[$type][$config_group])) continue;
+    foreach ($config_cascade[$type][$config_group] as $file) {
+      if (@file_exists($file)) {
+        $config = call_user_func_array($fn,array_merge(array($file),$params));
+        $combined = array_merge($combined, $config);
+      }
+    }
+  }
+
+  return $combined;
+}
+
+/**
+ * Include the requested configuration information
+ *
+ * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param  string   $type     the configuration settings to be read, must correspond to a key/array in $config_cascade
+ * @return array              list of files, default before local before protected
+ */
+function getConfigFiles($type) {
+  global $config_cascade;
+  $files = array();
+
+  if (!is_array($config_cascade[$type])) trigger_error('Missing config cascade for "'.$type.'"',E_USER_WARNING);
+  foreach (array('default','local','protected') as $config_group) {
+    if (empty($config_cascade[$type][$config_group])) continue;
+    $files = array_merge($files, $config_cascade[$type][$config_group]);
+  }
+
+  return $files;
+}
+
+/**
+ * check if the given action was disabled in config
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @returns boolean true if enabled, false if disabled
+ */
+function actionOK($action){
+  static $disabled = null;
+  if(is_null($disabled)){
+    global $conf;
+
+    // prepare disabled actions array and handle legacy options
+    $disabled = explode(',',$conf['disableactions']);
+    $disabled = array_map('trim',$disabled);
+    if(isset($conf['openregister']) && !$conf['openregister']) $disabled[] = 'register';
+    if(isset($conf['resendpasswd']) && !$conf['resendpasswd']) $disabled[] = 'resendpwd';
+    if(isset($conf['subscribers']) && !$conf['subscribers']) {
+        $disabled[] = 'subscribe';
+        $disabled[] = 'subscribens';
+    }
+    $disabled = array_unique($disabled);
+  }
+
+  return !in_array($action,$disabled);
+}
+
+/**
+ * check if headings should be used as link text for the specified link type
+ *
+ * @author Chris Smith <chris@jalakai.co.uk>
+ *
+ * @param   string  $linktype   'content'|'navigation', content applies to links in wiki text
+ *                                                      navigation applies to all other links
+ * @returns boolean             true if headings should be used for $linktype, false otherwise
+ */
+function useHeading($linktype) {
+  static $useHeading = null;
+
+  if (is_null($useHeading)) {
+    global $conf;
+
+    if (!empty($conf['useheading'])) {
+      switch ($conf['useheading']) {
+        case 'content'    : $useHeading['content'] = true; break;
+        case 'navigation' : $useHeading['navigation'] = true; break;
+        default:
+          $useHeading['content'] = true;
+          $useHeading['navigation'] = true;
+      }
+    } else {
+      $useHeading = array();
+    }
+  }
+
+  return (!empty($useHeading[$linktype]));
+}
+
+/**
+ * obscure config data so information isn't plain text
+ *
+ * @param string       $str     data to be encoded
+ * @param string       $code    encoding method, values: plain, base64, uuencode.
+ * @return string               the encoded value
+ */
+function conf_encodeString($str,$code) {
+  switch ($code) {
+    case 'base64'   : return '<b>'.base64_encode($str);
+    case 'uuencode' : return '<u>'.convert_uuencode($str);
+    case 'plain':
+    default:
+      return $str;
+  }
+}
+/**
+ * return obscured data as plain text
+ *
+ * @param  string      $str   encoded data
+ * @return string             plain text
+ */
+function conf_decodeString($str) {
+  switch (substr($str,0,3)) {
+    case '<b>' : return base64_decode(substr($str,3));
+    case '<u>' : return convert_uudecode(substr($str,3));
+    default:  // not encode (or unknown)
+      return $str;
+  }
+}
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/events.php b/mod/dokuwiki/vendors/dokuwiki/inc/events.php
new file mode 100644
index 000000000..1604c73c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/events.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * DokuWiki Events
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Christopher Smith <chris@jalakai.co.uk>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/pluginutils.php');
+
+class Doku_Event {
+
+  // public properties
+  var $name = '';                // READONLY  event name, objects must register against this name to see the event
+  var $data = NULL;              // READWRITE data relevant to the event, no standardised format (YET!)
+  var $result = NULL;            // READWRITE the results of the event action, only relevant in "_AFTER" advise
+                                 //    event handlers may modify this if they are preventing the default action
+                                 //    to provide the after event handlers with event results
+  var $canPreventDefault = true; // READONLY  if true, event handlers can prevent the events default action
+
+  // private properties, event handlers can effect these through the provided methods
+  var $_default = true;     // whether or not to carry out the default action associated with the event
+  var $_continue = true;    // whether or not to continue propagating the event to other handlers
+
+  /**
+   * event constructor
+   */
+  function Doku_Event($name, &$data) {
+
+    $this->name = $name;
+    $this->data =& $data;
+
+  }
+
+  /**
+   * advise functions
+   *
+   * advise all registered handlers of this event
+   *
+   * if these methods are used by functions outside of this object, they must
+   * properly handle correct processing of any default action and issue an
+   * advise_after() signal. e.g.
+   *    $evt = new Doku_Event(name, data);
+   *    if ($evt->advise_before(canPreventDefault) {
+   *      // default action code block
+   *    }
+   *    $evt->advise_after();
+   *    unset($evt);
+   *
+   * @return  results of processing the event, usually $this->_default
+   */
+  function advise_before($enablePreventDefault=true) {
+    global $EVENT_HANDLER;
+
+    $this->canPreventDefault = $enablePreventDefault;
+    $EVENT_HANDLER->process_event($this,'BEFORE');
+
+    return (!$enablePreventDefault || $this->_default);
+  }
+
+  function advise_after() {
+    global $EVENT_HANDLER;
+
+    $this->_continue = true;
+    $EVENT_HANDLER->process_event($this,'AFTER');
+  }
+
+  /**
+   * trigger
+   *
+   * - advise all registered (<event>_BEFORE) handlers that this event is about to take place
+   * - carry out the default action using $this->data based on $enablePrevent and
+   *   $this->_default, all of which may have been modified by the event handlers.
+   * - advise all registered (<event>_AFTER) handlers that the event has taken place
+   *
+   * @return  $event->results
+   *          the value set by any <event>_before or <event> handlers if the default action is prevented
+   *          or the results of the default action (as modified by <event>_after handlers)
+   *          or NULL no action took place and no handler modified the value
+   */
+  function trigger($action=NULL, $enablePrevent=true) {
+
+    if (!is_callable($action)) $enablePrevent = false;
+
+    if ($this->advise_before($enablePrevent) && is_callable($action)) {
+      if (is_array($action)) {
+        list($obj,$method) = $action;
+        $this->result = $obj->$method($this->data);
+      } else {
+        $this->result = $action($this->data);
+      }
+    }
+
+    $this->advise_after();
+
+    return $this->result;
+  }
+
+  /**
+   * stopPropagation
+   *
+   * stop any further processing of the event by event handlers
+   * this function does not prevent the default action taking place
+   */
+  function stopPropagation() { $this->_continue = false;  }
+
+  /**
+   * preventDefault
+   *
+   * prevent the default action taking place
+   */
+  function preventDefault() { $this->_default = false;  }
+}
+
+class Doku_Event_Handler {
+
+  // public properties:  none
+
+  // private properties
+  var $_hooks = array();          // array of events and their registered handlers
+
+  /**
+   * event_handler
+   *
+   * constructor, loads all action plugins and calls their register() method giving them
+   * an opportunity to register any hooks they require
+   */
+  function Doku_Event_Handler() {
+
+    // load action plugins
+    $plugin = NULL;
+    $pluginlist = plugin_list('action');
+
+    foreach ($pluginlist as $plugin_name) {
+      $plugin =& plugin_load('action',$plugin_name);
+
+      if ($plugin !== NULL) $plugin->register($this);
+    }
+  }
+
+  /**
+   * register_hook
+   *
+   * register a hook for an event
+   *
+   * @PARAM  $event   (string)   name used by the event, (incl '_before' or '_after' for triggers)
+   * @PARAM  $obj     (obj)      object in whose scope method is to be executed,
+   *                             if NULL, method is assumed to be a globally available function
+   * @PARAM  $method  (function) event handler function
+   * @PARAM  $param   (mixed)    data passed to the event handler
+   */
+  function register_hook($event, $advise, &$obj, $method, $param=NULL) {
+    $this->_hooks[$event.'_'.$advise][] = array(&$obj, $method, $param);
+  }
+
+  function process_event(&$event,$advise='') {
+
+    $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE');
+
+    if (!empty($this->_hooks[$evt_name])) {
+      $hook = reset($this->_hooks[$evt_name]);
+      do {
+//        list($obj, $method, $param) = $hook;
+        $obj =& $hook[0];
+        $method = $hook[1];
+        $param = $hook[2];
+
+        if (is_null($obj)) {
+          $method($event, $param);
+        } else {
+          $obj->$method($event, $param);
+        }
+
+      } while ($event->_continue && $hook = next($this->_hooks[$evt_name]));
+    }
+  }
+}
+
+/**
+ *  trigger_event
+ *
+ *  function wrapper to process (create, trigger and destroy) an event
+ *
+ *  @PARAM  $name               (string)   name for the event
+ *  @PARAM  $data               (mixed)    event data
+ *  @PARAM  $action             (callback) (optional, default=NULL) default action, a php callback function
+ *  @PARAM  $canPreventDefault  (bool)     (optional, default=true) can hooks prevent the default action
+ *
+ *  @RETURN (mixed)                        the event results value after all event processing is complete
+ *                                         by default this is the return value of the default action however
+ *                                         it can be set or modified by event handler hooks
+ */
+function trigger_event($name, &$data, $action=NULL, $canPreventDefault=true) {
+
+  $evt = new Doku_Event($name, $data);
+  return $evt->trigger($action, $canPreventDefault);
+}
+
+// create the event handler
+global $EVENT_HANDLER;
+$EVENT_HANDLER = new Doku_Event_Handler();
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/feedcreator.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/feedcreator.class.php
new file mode 100644
index 000000000..86113e8c3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/feedcreator.class.php
@@ -0,0 +1,1572 @@
+<?php
+/***************************************************************************
+ * FeedCreator class v1.7.2-ppt
+ * originally (c) Kai Blankenhorn
+ * www.bitfolge.de
+ * kaib@bitfolge.de
+ * v1.3 work by Scott Reynen (scott@randomchaos.com) and Kai Blankenhorn
+ * v1.5 OPML support by Dirk Clemens
+ * v1.7.2-mod on-the-fly feed generation by Fabian Wolf (info@f2w.de)
+ * v1.7.2-ppt ATOM 1.0 support by Mohammad Hafiz bin Ismail (mypapit@gmail.com)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @author www.bitfolge.de
+ *
+ * Changelog:
+ *
+ * this version contains some smaller modifications for DokuWiki as well
+ *
+ * v1.7.2-ppt   11-21-05
+ *  added Atom 1.0 support
+ *  added enclosure support for RSS 2.0/ATOM 1.0
+ *  added docs for v1.7.2-ppt only!
+ *
+ * v1.7.2-mod   03-12-05
+ *  added output function outputFeed for on-the-fly feed generation
+ *
+ * v1.7.2   10-11-04
+ *  license changed to LGPL
+ *
+ * v1.7.1
+ *  fixed a syntax bug
+ *  fixed left over debug code
+ *
+ * v1.7 07-18-04
+ *  added HTML and JavaScript feeds (configurable via CSS) (thanks to Pascal Van Hecke)
+ *  added HTML descriptions for all feed formats (thanks to Pascal Van Hecke)
+ *  added a switch to select an external stylesheet (thanks to Pascal Van Hecke)
+ *  changed default content-type to application/xml
+ *  added character encoding setting
+ *  fixed numerous smaller bugs (thanks to S�ren Fuhrmann of golem.de)
+ *  improved changing ATOM versions handling (thanks to August Trometer)
+ *  improved the UniversalFeedCreator's useCached method (thanks to S�ren Fuhrmann of golem.de)
+ *  added charset output in HTTP headers (thanks to S�ren Fuhrmann of golem.de)
+ *  added Slashdot namespace to RSS 1.0 (thanks to S�ren Fuhrmann of golem.de)
+ *
+ * See www.bitfolge.de for additional changelog info
+ */
+// your local timezone, set to "" to disable or for GMT
+define("TIME_ZONE",date("O", time()));
+
+
+
+
+/**
+ * Version string.
+ **/
+
+define("FEEDCREATOR_VERSION", "FeedCreator 1.7.2-ppt DokuWiki");
+
+
+
+/**
+ * A FeedItem is a part of a FeedCreator feed.
+ *
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedItem extends HtmlDescribable {
+    /**
+     * Mandatory attributes of an item.
+     */
+    var $title, $description, $link;
+
+    /**
+     * Optional attributes of an item.
+     */
+    var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator;
+
+    /**
+     * Publishing date of an item. May be in one of the following formats:
+     *
+     *  RFC 822:
+     *  "Mon, 20 Jan 03 18:05:41 +0400"
+     *  "20 Jan 03 18:05:41 +0000"
+     *
+     *  ISO 8601:
+     *  "2003-01-20T18:05:41+04:00"
+     *
+     *  Unix:
+     *  1043082341
+     */
+    var $date;
+
+    /**
+     * Add <enclosure> element tag RSS 2.0
+     * modified by : Mohammad Hafiz bin Ismail (mypapit@gmail.com)
+     *
+     *
+     * display :
+     * <enclosure length="17691" url="http://something.com/picture.jpg" type="image/jpeg" />
+     *
+     */
+    var $enclosure;
+
+    /**
+     * Any additional elements to include as an assiciated array. All $key => $value pairs
+     * will be included unencoded in the feed item in the form
+     *     <$key>$value</$key>
+     * Again: No encoding will be used! This means you can invalidate or enhance the feed
+     * if $value contains markup. This may be abused to embed tags not implemented by
+     * the FeedCreator class used.
+     */
+    var $additionalElements = Array();
+
+    // on hold
+    // var $source;
+}
+
+class EnclosureItem extends HtmlDescribable {
+    /*
+    *
+    * core variables
+    *
+    **/
+    var $url,$length,$type;
+
+    /*
+    * For use with another extension like Yahoo mRSS
+    * Warning :
+    * These variables might not show up in
+    * later release / not finalize yet!
+    *
+    */
+    var $width, $height, $title, $description, $keywords, $thumburl;
+
+    var $additionalElements = Array();
+
+}
+
+
+/**
+ * An FeedImage may be added to a FeedCreator feed.
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.3
+ */
+class FeedImage extends HtmlDescribable {
+    /**
+     * Mandatory attributes of an image.
+     */
+    var $title, $url, $link;
+
+    /**
+     * Optional attributes of an image.
+     */
+    var $width, $height, $description;
+}
+
+
+
+/**
+ * An HtmlDescribable is an item within a feed that can have a description that may
+ * include HTML markup.
+ */
+class HtmlDescribable {
+    /**
+     * Indicates whether the description field should be rendered in HTML.
+     */
+    var $descriptionHtmlSyndicated;
+
+    /**
+     * Indicates whether and to how many characters a description should be truncated.
+     */
+    var $descriptionTruncSize;
+
+    /**
+     * Returns a formatted description field, depending on descriptionHtmlSyndicated and
+     * $descriptionTruncSize properties
+     * @return    string    the formatted description
+     */
+    function getDescription() {
+        $descriptionField = new FeedHtmlField($this->description);
+        $descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated;
+        $descriptionField->truncSize = $this->descriptionTruncSize;
+        return $descriptionField->output();
+    }
+
+}
+
+
+
+/**
+ * An FeedHtmlField describes and generates
+ * a feed, item or image html field (probably a description). Output is
+ * generated based on $truncSize, $syndicateHtml properties.
+ * @author Pascal Van Hecke <feedcreator.class.php@vanhecke.info>
+ * @version 1.6
+ */
+class FeedHtmlField {
+    /**
+     * Mandatory attributes of a FeedHtmlField.
+     */
+    var $rawFieldContent;
+
+    /**
+     * Optional attributes of a FeedHtmlField.
+     *
+     */
+    var $truncSize, $syndicateHtml;
+
+    /**
+     * Creates a new instance of FeedHtmlField.
+     * @param  $string: if given, sets the rawFieldContent property
+     */
+    function FeedHtmlField($parFieldContent) {
+        if ($parFieldContent) {
+            $this->rawFieldContent = $parFieldContent;
+        }
+    }
+
+
+    /**
+     * Creates the right output, depending on $truncSize, $syndicateHtml properties.
+     * @return string    the formatted field
+     */
+    function output() {
+        // when field available and syndicated in html we assume
+        // - valid html in $rawFieldContent and we enclose in CDATA tags
+        // - no truncation (truncating risks producing invalid html)
+        if (!$this->rawFieldContent) {
+            $result = "";
+        }   elseif ($this->syndicateHtml) {
+            $result = "<![CDATA[".$this->rawFieldContent."]]>";
+        } else {
+            if ($this->truncSize and is_int($this->truncSize)) {
+                $result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize);
+            } else {
+                $result = htmlspecialchars($this->rawFieldContent);
+            }
+        }
+        return $result;
+    }
+
+}
+
+
+
+/**
+ * UniversalFeedCreator lets you choose during runtime which
+ * format to build.
+ * For general usage of a feed class, see the FeedCreator class
+ * below or the example above.
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class UniversalFeedCreator extends FeedCreator {
+    var $_feed;
+
+    function _setFormat($format) {
+        switch (strtoupper($format)) {
+
+            case "2.0":
+                // fall through
+            case "RSS2.0":
+                $this->_feed = new RSSCreator20();
+                break;
+
+            case "1.0":
+                // fall through
+            case "RSS1.0":
+                $this->_feed = new RSSCreator10();
+                break;
+
+            case "0.91":
+                // fall through
+            case "RSS0.91":
+                $this->_feed = new RSSCreator091();
+                break;
+
+            case "PIE0.1":
+                $this->_feed = new PIECreator01();
+                break;
+
+            case "MBOX":
+                $this->_feed = new MBOXCreator();
+                break;
+
+            case "OPML":
+                $this->_feed = new OPMLCreator();
+                break;
+
+            case "ATOM":
+                // fall through: always the latest ATOM version
+            case "ATOM1.0":
+                $this->_feed = new AtomCreator10();
+                break;
+
+            case "ATOM0.3":
+                $this->_feed = new AtomCreator03();
+                break;
+
+            case "HTML":
+                $this->_feed = new HTMLCreator();
+                break;
+
+            case "JS":
+                // fall through
+            case "JAVASCRIPT":
+                $this->_feed = new JSCreator();
+                break;
+
+            default:
+                $this->_feed = new RSSCreator091();
+                break;
+        }
+
+        $vars = get_object_vars($this);
+        foreach ($vars as $key => $value) {
+            // prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself
+            if (!in_array($key, array("_feed", "contentType", "encoding"))) {
+                $this->_feed->{$key} = $this->{$key};
+            }
+        }
+    }
+
+    function _sendMIME($format) {
+        header('Content-Type: '.$this->contentType.'; charset='.$this->encoding, true);
+    }
+
+    /**
+     * Creates a syndication feed based on the items previously added.
+     *
+     * @see        FeedCreator::addItem()
+     * @param    string    format    format the feed should comply to. Valid values are:
+     *          "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS"
+     * @return    string    the contents of the feed.
+     */
+    function createFeed($format = "RSS0.91") {
+        $this->_setFormat($format);
+        return $this->_feed->createFeed();
+    }
+
+    /**
+     * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect
+     * header may be sent to redirect the use to the newly created file.
+     * @since 1.4
+     *
+     * @param   string  format  format the feed should comply to. Valid values are:
+     *          "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS"
+     * @param   string  filename    optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param   boolean displayContents optional    send the content of the file or not. If true, the file will be sent in the body of the response.
+     */
+    function saveFeed($format="RSS0.91", $filename="", $displayContents=true) {
+        $this->_setFormat($format);
+        $this->_feed->saveFeed($filename, $displayContents);
+    }
+
+
+   /**
+    * Turns on caching and checks if there is a recent version of this feed in the cache.
+    * If there is, an HTTP redirect header is sent.
+    * To effectively use caching, you should create the FeedCreator object and call this method
+    * before anything else, especially before you do the time consuming task to build the feed
+    * (web fetching, for example).
+    *
+    * @param   string   format   format the feed should comply to. Valid values are:
+    *       "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
+    * @param filename   string   optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+    * @param timeout int      optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+    */
+   function useCached($format="RSS0.91", $filename="", $timeout=3600) {
+      $this->_setFormat($format);
+      $this->_feed->useCached($filename, $timeout);
+   }
+
+
+   /**
+    * Outputs feed to the browser - needed for on-the-fly feed generation (like it is done in WordPress, etc.)
+    *
+    * @param    format  string  format the feed should comply to. Valid values are:
+    *                           "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3".
+    */
+   function outputFeed($format='RSS0.91') {
+        $this->_setFormat($format);
+        $this->_sendMIME($format);
+        $this->_feed->outputFeed();
+   }
+
+
+}
+
+
+/**
+ * FeedCreator is the abstract base implementation for concrete
+ * implementations that implement a specific format of syndication.
+ *
+ * @abstract
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ * @since 1.4
+ */
+class FeedCreator extends HtmlDescribable {
+
+    /**
+     * Mandatory attributes of a feed.
+     */
+    var $title, $description, $link;
+
+
+    /**
+     * Optional attributes of a feed.
+     */
+    var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays;
+
+    /**
+    * The url of the external xsl stylesheet used to format the naked rss feed.
+    * Ignored in the output when empty.
+    */
+    var $xslStyleSheet = "";
+
+
+    /**
+     * @access private
+     */
+    var $items = Array();
+
+
+    /**
+     * This feed's MIME content type.
+     * @since 1.4
+     * @access private
+     */
+    var $contentType = "application/xml";
+
+
+    /**
+     * This feed's character encoding.
+     * @since 1.6.1
+     **/
+    var $encoding = "utf-8";
+
+
+    /**
+     * Any additional elements to include as an assiciated array. All $key => $value pairs
+     * will be included unencoded in the feed in the form
+     *     <$key>$value</$key>
+     * Again: No encoding will be used! This means you can invalidate or enhance the feed
+     * if $value contains markup. This may be abused to embed tags not implemented by
+     * the FeedCreator class used.
+     */
+    var $additionalElements = Array();
+
+
+    /**
+     * Adds an FeedItem to the feed.
+     *
+     * @param object FeedItem $item The FeedItem to add to the feed.
+     * @access public
+     */
+    function addItem($item) {
+        $this->items[] = $item;
+    }
+
+
+    /**
+     * Truncates a string to a certain length at the most sensible point.
+     * First, if there's a '.' character near the end of the string, the string is truncated after this character.
+     * If there is no '.', the string is truncated after the last ' ' character.
+     * If the string is truncated, " ..." is appended.
+     * If the string is already shorter than $length, it is returned unchanged.
+     *
+     * @static
+     * @param string    string A string to be truncated.
+     * @param int        length the maximum length the string should be truncated to
+     * @return string    the truncated string
+     */
+    function iTrunc($string, $length) {
+        if (strlen($string)<=$length) {
+            return $string;
+        }
+
+        $pos = strrpos($string,".");
+        if ($pos>=$length-4) {
+            $string = substr($string,0,$length-4);
+            $pos = strrpos($string,".");
+        }
+        if ($pos>=$length*0.4) {
+            return substr($string,0,$pos+1)." ...";
+        }
+
+        $pos = strrpos($string," ");
+        if ($pos>=$length-4) {
+            $string = substr($string,0,$length-4);
+            $pos = strrpos($string," ");
+        }
+        if ($pos>=$length*0.4) {
+            return substr($string,0,$pos)." ...";
+        }
+
+        return substr($string,0,$length-4)." ...";
+
+    }
+
+
+    /**
+     * Creates a comment indicating the generator of this feed.
+     * The format of this comment seems to be recognized by
+     * Syndic8.com.
+     */
+    function _createGeneratorComment() {
+        return "<!-- generator=\"".FEEDCREATOR_VERSION."\" -->\n";
+    }
+
+
+    /**
+     * Creates a string containing all additional elements specified in
+     * $additionalElements.
+     * @param   elements    array   an associative array containing key => value pairs
+     * @param indentString  string  a string that will be inserted before every generated line
+     * @return    string    the XML tags corresponding to $additionalElements
+     */
+    function _createAdditionalElements($elements, $indentString="") {
+        $ae = "";
+        if (is_array($elements)) {
+            foreach($elements AS $key => $value) {
+                $ae.= $indentString."<$key>$value</$key>\n";
+            }
+        }
+        return $ae;
+    }
+
+    function _createStylesheetReferences() {
+        $xml = "";
+        if ($this->cssStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->cssStyleSheet."\" type=\"text/css\"?>\n";
+        if ($this->xslStyleSheet) $xml .= "<?xml-stylesheet href=\"".$this->xslStyleSheet."\" type=\"text/xsl\"?>\n";
+        return $xml;
+    }
+
+
+    /**
+     * Builds the feed's text.
+     * @abstract
+     * @return    string    the feed's complete text
+     */
+    function createFeed() {
+    }
+
+    /**
+     * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml.
+     * For example:
+     *
+     * echo $_SERVER["PHP_SELF"]."\n";
+     * echo FeedCreator::_generateFilename();
+     *
+     * would produce:
+     *
+     * /rss/latestnews.php
+     * latestnews.xml
+     *
+     * @return string the feed cache filename
+     * @since 1.4
+     * @access private
+     */
+    function _generateFilename() {
+        $fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+        return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml";
+    }
+
+
+    /**
+     * @since 1.4
+     * @access private
+     */
+    function _redirect($filename) {
+        // attention, heavily-commented-out-area
+
+        // maybe use this in addition to file time checking
+        //Header("Expires: ".date("r",time()+$this->_timeout));
+
+        /* no caching at all, doesn't seem to work as good:
+        Header("Cache-Control: no-cache");
+        Header("Pragma: no-cache");
+        */
+
+        // HTTP redirect, some feed readers' simple HTTP implementations don't follow it
+        //Header("Location: ".$filename);
+
+        header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".basename($filename));
+        header("Content-Disposition: inline; filename=".basename($filename));
+        readfile($filename, "r");
+        die();
+    }
+
+    /**
+     * Turns on caching and checks if there is a recent version of this feed in the cache.
+     * If there is, an HTTP redirect header is sent.
+     * To effectively use caching, you should create the FeedCreator object and call this method
+     * before anything else, especially before you do the time consuming task to build the feed
+     * (web fetching, for example).
+     * @since 1.4
+     * @param filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param timeout   int     optional    the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour)
+     */
+    function useCached($filename="", $timeout=3600) {
+        $this->_timeout = $timeout;
+        if ($filename=="") {
+            $filename = $this->_generateFilename();
+        }
+        if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) {
+            $this->_redirect($filename);
+        }
+    }
+
+
+    /**
+     * Saves this feed as a file on the local disk. After the file is saved, a redirect
+     * header may be sent to redirect the user to the newly created file.
+     * @since 1.4
+     *
+     * @param filename  string  optional    the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()).
+     * @param redirect  boolean optional    send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file.
+     */
+    function saveFeed($filename="", $displayContents=true) {
+        if ($filename=="") {
+            $filename = $this->_generateFilename();
+        }
+        $feedFile = fopen($filename, "w+");
+        if ($feedFile) {
+            fputs($feedFile,$this->createFeed());
+            fclose($feedFile);
+            if ($displayContents) {
+                $this->_redirect($filename);
+            }
+        } else {
+            echo "<br /><b>Error creating feed file, please check write permissions.</b><br />";
+        }
+    }
+
+    /**
+     * Outputs this feed directly to the browser - for on-the-fly feed generation
+     * @since 1.7.2-mod
+     *
+     * still missing: proper header output - currently you have to add it manually
+     */
+    function outputFeed() {
+        echo $this->createFeed();
+    }
+
+
+}
+
+
+/**
+ * FeedDate is an internal class that stores a date for a feed or feed item.
+ * Usually, you won't need to use this.
+ */
+class FeedDate {
+    var $unix;
+
+    /**
+     * Creates a new instance of FeedDate representing a given date.
+     * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps.
+     * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used.
+     */
+    function FeedDate($dateString="") {
+        if ($dateString=="") $dateString = date("r");
+
+        if (is_numeric($dateString)) {
+            $this->unix = $dateString;
+            return;
+        }
+        if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) {
+            $months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12);
+            $this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]);
+            if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+                $tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+            } else {
+                if (strlen($matches[7])==1) {
+                    $oneHour = 3600;
+                    $ord = ord($matches[7]);
+                    if ($ord < ord("M")) {
+                        $tzOffset = (ord("A") - $ord - 1) * $oneHour;
+                    } elseif ($ord >= ord("M") AND $matches[7]!="Z") {
+                        $tzOffset = ($ord - ord("M")) * $oneHour;
+                    } elseif ($matches[7]=="Z") {
+                        $tzOffset = 0;
+                    }
+                }
+                switch ($matches[7]) {
+                    case "UT":
+                    case "GMT": $tzOffset = 0;
+                }
+            }
+            $this->unix += $tzOffset;
+            return;
+        }
+        if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) {
+            $this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]);
+            if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') {
+                $tzOffset = (substr($matches[7],0,3) * 60 + substr($matches[7],-2)) * 60;
+            } else {
+                if ($matches[7]=="Z") {
+                    $tzOffset = 0;
+                }
+            }
+            $this->unix += $tzOffset;
+            return;
+        }
+        $this->unix = 0;
+    }
+
+    /**
+     * Gets the date stored in this FeedDate as an RFC 822 date.
+     *
+     * @return a date in RFC 822 format
+     */
+    function rfc822() {
+        //return gmdate("r",$this->unix);
+        $date = gmdate("D, d M Y H:i:s", $this->unix);
+        if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE);
+        return $date;
+    }
+
+    /**
+     * Gets the date stored in this FeedDate as an ISO 8601 date.
+     *
+     * @return a date in ISO 8601 (RFC 3339) format
+     */
+    function iso8601() {
+        $date = gmdate("Y-m-d\TH:i:sO",$this->unix);
+        if (TIME_ZONE!="") $date = str_replace("+0000",TIME_ZONE,$date);
+        $date = substr($date,0,22) . ':' . substr($date,-2);
+        return $date;
+    }
+
+
+    /**
+     * Gets the date stored in this FeedDate as unix time stamp.
+     *
+     * @return a date as a unix time stamp
+     */
+    function unix() {
+        return $this->unix;
+    }
+}
+
+
+/**
+ * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0.
+ *
+ * @see http://www.purl.org/rss/1.0/
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator10 extends FeedCreator {
+
+    /**
+     * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+     * The feed will contain all items previously added in the same order.
+     * @return    string    the feed's complete text
+     */
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createGeneratorComment();
+        if ($this->cssStyleSheet=="") {
+            $cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css";
+        }
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<rdf:RDF\n";
+        $feed.= "    xmlns=\"http://purl.org/rss/1.0/\"\n";
+        $feed.= "    xmlns:rdf=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\"\n";
+        $feed.= "    xmlns:slash=\"http://purl.org/rss/1.0/modules/slash/\"\n";
+        $feed.= "    xmlns:dc=\"http://purl.org/dc/elements/1.1/\">\n";
+        $feed.= "    <channel rdf:about=\"".$this->syndicationURL."\">\n";
+        $feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+        $feed.= "        <description>".htmlspecialchars($this->description)."</description>\n";
+        $feed.= "        <link>".$this->link."</link>\n";
+        if ($this->image!=null) {
+            $feed.= "        <image rdf:resource=\"".$this->image->url."\" />\n";
+        }
+        $now = new FeedDate();
+        $feed.= "       <dc:date>".htmlspecialchars($now->iso8601())."</dc:date>\n";
+        $feed.= "        <items>\n";
+        $feed.= "            <rdf:Seq>\n";
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "                <rdf:li rdf:resource=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+        }
+        $feed.= "            </rdf:Seq>\n";
+        $feed.= "        </items>\n";
+        $feed.= "    </channel>\n";
+        if ($this->image!=null) {
+            $feed.= "    <image rdf:about=\"".$this->image->url."\">\n";
+            $feed.= "        <title>".htmlspecialchars($this->image->title)."</title>\n";
+            $feed.= "        <link>".$this->image->link."</link>\n";
+            $feed.= "        <url>".$this->image->url."</url>\n";
+            $feed.= "    </image>\n";
+        }
+        $feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "    <item rdf:about=\"".htmlspecialchars($this->items[$i]->link)."\">\n";
+            //$feed.= "        <dc:type>Posting</dc:type>\n";
+            $feed.= "        <dc:format>text/html</dc:format>\n";
+            if ($this->items[$i]->date!=null) {
+                $itemDate = new FeedDate($this->items[$i]->date);
+                $feed.= "        <dc:date>".htmlspecialchars($itemDate->iso8601())."</dc:date>\n";
+            }
+            if ($this->items[$i]->source!="") {
+                $feed.= "        <dc:source>".htmlspecialchars($this->items[$i]->source)."</dc:source>\n";
+            }
+            if ($this->items[$i]->author!="") {
+                $feed.= "        <dc:creator>".htmlspecialchars($this->items[$i]->author)."</dc:creator>\n";
+            }
+            $feed.= "        <title>".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")))."</title>\n";
+            $feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+            $feed.= "        <description>".htmlspecialchars($this->items[$i]->description)."</description>\n";
+            $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+            $feed.= "    </item>\n";
+        }
+        $feed.= "</rdf:RDF>\n";
+        return $feed;
+    }
+}
+
+
+
+/**
+ * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3.
+ *
+ * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator091 extends FeedCreator {
+
+    /**
+     * Stores this RSS feed's version number.
+     * @access private
+     */
+    var $RSSVersion;
+
+    function RSSCreator091() {
+        $this->_setRSSVersion("0.91");
+        $this->contentType = "application/rss+xml";
+    }
+
+    /**
+     * Sets this RSS feed's version number.
+     * @access private
+     */
+    function _setRSSVersion($version) {
+        $this->RSSVersion = $version;
+    }
+
+    /**
+     * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0.
+     * The feed will contain all items previously added in the same order.
+     * @return    string    the feed's complete text
+     */
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createGeneratorComment();
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<rss version=\"".$this->RSSVersion."\">\n";
+        $feed.= "    <channel>\n";
+        $feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+        $this->descriptionTruncSize = 500;
+        $feed.= "        <description>".$this->getDescription()."</description>\n";
+        $feed.= "        <link>".$this->link."</link>\n";
+        $now = new FeedDate();
+        $feed.= "        <lastBuildDate>".htmlspecialchars($now->rfc822())."</lastBuildDate>\n";
+        $feed.= "        <generator>".FEEDCREATOR_VERSION."</generator>\n";
+
+        if ($this->image!=null) {
+            $feed.= "        <image>\n";
+            $feed.= "            <url>".$this->image->url."</url>\n";
+            $feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."</title>\n";
+            $feed.= "            <link>".$this->image->link."</link>\n";
+            if ($this->image->width!="") {
+                $feed.= "            <width>".$this->image->width."</width>\n";
+            }
+            if ($this->image->height!="") {
+                $feed.= "            <height>".$this->image->height."</height>\n";
+            }
+            if ($this->image->description!="") {
+                $feed.= "            <description>".$this->image->getDescription()."</description>\n";
+            }
+            $feed.= "        </image>\n";
+        }
+        if ($this->language!="") {
+            $feed.= "        <language>".$this->language."</language>\n";
+        }
+        if ($this->copyright!="") {
+            $feed.= "        <copyright>".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."</copyright>\n";
+        }
+        if ($this->editor!="") {
+            $feed.= "        <managingEditor>".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."</managingEditor>\n";
+        }
+        if ($this->webmaster!="") {
+            $feed.= "        <webMaster>".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."</webMaster>\n";
+        }
+        if ($this->pubDate!="") {
+            $pubDate = new FeedDate($this->pubDate);
+            $feed.= "        <pubDate>".htmlspecialchars($pubDate->rfc822())."</pubDate>\n";
+        }
+        if ($this->category!="") {
+            // Changed for DokuWiki: multiple categories are possible
+            if(is_array($this->category)) foreach($this->category as $cat){
+                $feed.= "        <category>".htmlspecialchars($cat)."</category>\n";
+            }else{
+                $feed.= "        <category>".htmlspecialchars($this->category)."</category>\n";
+            }
+        }
+        if ($this->docs!="") {
+            $feed.= "        <docs>".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."</docs>\n";
+        }
+        if ($this->ttl!="") {
+            $feed.= "        <ttl>".htmlspecialchars($this->ttl)."</ttl>\n";
+        }
+        if ($this->rating!="") {
+            $feed.= "        <rating>".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."</rating>\n";
+        }
+        if ($this->skipHours!="") {
+            $feed.= "        <skipHours>".htmlspecialchars($this->skipHours)."</skipHours>\n";
+        }
+        if ($this->skipDays!="") {
+            $feed.= "        <skipDays>".htmlspecialchars($this->skipDays)."</skipDays>\n";
+        }
+        $feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "        <item>\n";
+            $feed.= "            <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+            $feed.= "            <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+            $feed.= "            <description>".$this->items[$i]->getDescription()."</description>\n";
+
+            if ($this->items[$i]->author!="") {
+                $feed.= "            <author>".htmlspecialchars($this->items[$i]->author)."</author>\n";
+            }
+            /*
+            // on hold
+            if ($this->items[$i]->source!="") {
+                    $feed.= "            <source>".htmlspecialchars($this->items[$i]->source)."</source>\n";
+            }
+            */
+            if ($this->items[$i]->category!="") {
+                // Changed for DokuWiki: multiple categories are possible
+                if(is_array($this->items[$i]->category)) foreach($this->items[$i]->category as $cat){
+                    $feed.= "        <category>".htmlspecialchars($cat)."</category>\n";
+                }else{
+                    $feed.= "        <category>".htmlspecialchars($this->items[$i]->category)."</category>\n";
+                }
+            }
+
+            if ($this->items[$i]->comments!="") {
+                $feed.= "            <comments>".htmlspecialchars($this->items[$i]->comments)."</comments>\n";
+            }
+            if ($this->items[$i]->date!="") {
+            $itemDate = new FeedDate($this->items[$i]->date);
+                $feed.= "            <pubDate>".htmlspecialchars($itemDate->rfc822())."</pubDate>\n";
+            }
+            if ($this->items[$i]->guid!="") {
+                $feed.= "            <guid>".htmlspecialchars($this->items[$i]->guid)."</guid>\n";
+            }
+            $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+
+            if ($this->RSSVersion == "2.0" && $this->items[$i]->enclosure != NULL)
+                {
+                                $feed.= "            <enclosure url=\"";
+                                $feed.= $this->items[$i]->enclosure->url;
+                                $feed.= "\" length=\"";
+                                $feed.= $this->items[$i]->enclosure->length;
+                                $feed.= "\" type=\"";
+                                $feed.= $this->items[$i]->enclosure->type;
+                                $feed.= "\"/>\n";
+                        }
+
+
+
+            $feed.= "        </item>\n";
+        }
+
+        $feed.= "    </channel>\n";
+        $feed.= "</rss>\n";
+        return $feed;
+    }
+}
+
+
+
+/**
+ * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0.
+ *
+ * @see http://backend.userland.com/rss
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class RSSCreator20 extends RSSCreator091 {
+
+    function RSSCreator20() {
+        parent::_setRSSVersion("2.0");
+    }
+
+}
+
+
+/**
+ * PIECreator01 is a FeedCreator that implements the emerging PIE specification,
+ * as in http://intertwingly.net/wiki/pie/Syntax.
+ *
+ * @deprecated
+ * @since 1.3
+ * @author Scott Reynen <scott@randomchaos.com> and Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class PIECreator01 extends FeedCreator {
+
+    function PIECreator01() {
+        $this->encoding = "utf-8";
+    }
+
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<feed version=\"0.1\" xmlns=\"http://example.com/newformat#\">\n";
+        $feed.= "    <title>".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</title>\n";
+        $this->truncSize = 500;
+        $feed.= "    <subtitle>".$this->getDescription()."</subtitle>\n";
+        $feed.= "    <link>".$this->link."</link>\n";
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "    <entry>\n";
+            $feed.= "        <title>".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."</title>\n";
+            $feed.= "        <link>".htmlspecialchars($this->items[$i]->link)."</link>\n";
+            $itemDate = new FeedDate($this->items[$i]->date);
+            $feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+            $feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+            $feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+            $feed.= "        <id>".htmlspecialchars($this->items[$i]->guid)."</id>\n";
+            if ($this->items[$i]->author!="") {
+                $feed.= "        <author>\n";
+                $feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+                if ($this->items[$i]->authorEmail!="") {
+                    $feed.= "            <email>".$this->items[$i]->authorEmail."</email>\n";
+                }
+                $feed.="        </author>\n";
+            }
+            $feed.= "        <content type=\"text/html\" xml:lang=\"en-us\">\n";
+            $feed.= "            <div xmlns=\"http://www.w3.org/1999/xhtml\">".$this->items[$i]->getDescription()."</div>\n";
+            $feed.= "        </content>\n";
+            $feed.= "    </entry>\n";
+        }
+        $feed.= "</feed>\n";
+        return $feed;
+    }
+}
+
+/**
+ * AtomCreator10 is a FeedCreator that implements the atom specification,
+ * as in http://www.atomenabled.org/developers/syndication/atom-format-spec.php
+ * Please note that just by using AtomCreator10 you won't automatically
+ * produce valid atom files. For example, you have to specify either an editor
+ * for the feed or an author for every single feed item.
+ *
+ * Some elements have not been implemented yet. These are (incomplete list):
+ * author URL, item author's email and URL, item contents, alternate links,
+ * other link content types than text/html. Some of them may be created with
+ * AtomCreator10::additionalElements.
+ *
+ * @see FeedCreator#additionalElements
+ * @since 1.7.2-mod (modified)
+ * @author Mohammad Hafiz Ismail (mypapit@gmail.com)
+ */
+ class AtomCreator10 extends FeedCreator {
+
+    function AtomCreator10() {
+        $this->contentType = "application/atom+xml";
+        $this->encoding = "utf-8";
+    }
+
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createGeneratorComment();
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<feed xmlns=\"http://www.w3.org/2005/Atom\"";
+        if ($this->language!="") {
+            $feed.= " xml:lang=\"".$this->language."\"";
+        }
+        $feed.= ">\n";
+        $feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
+        $feed.= "    <subtitle>".htmlspecialchars($this->description)."</subtitle>\n";
+        $feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
+        $feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
+        $now = new FeedDate();
+        $feed.= "    <updated>".htmlspecialchars($now->iso8601())."</updated>\n";
+        if ($this->editor!="") {
+            $feed.= "    <author>\n";
+            $feed.= "        <name>".$this->editor."</name>\n";
+            if ($this->editorEmail!="") {
+                $feed.= "        <email>".$this->editorEmail."</email>\n";
+            }
+            $feed.= "    </author>\n";
+        }
+        $feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+        $feed.= "<link rel=\"self\" type=\"application/atom+xml\" href=\"". $this->syndicationURL . "\" />\n";
+        $feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "    <entry>\n";
+            $feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
+            $feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+            if ($this->items[$i]->date=="") {
+                $this->items[$i]->date = time();
+            }
+            $itemDate = new FeedDate($this->items[$i]->date);
+            $feed.= "        <published>".htmlspecialchars($itemDate->iso8601())."</published>\n";
+            $feed.= "        <updated>".htmlspecialchars($itemDate->iso8601())."</updated>\n";
+            $feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
+            $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+            if ($this->items[$i]->author!="") {
+                $feed.= "        <author>\n";
+                $feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+                $feed.= "        </author>\n";
+            }
+            if ($this->items[$i]->description!="") {
+                $feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
+            }
+            if ($this->items[$i]->enclosure != NULL) {
+            $feed.="        <link rel=\"enclosure\" href=\"". $this->items[$i]->enclosure->url ."\" type=\"". $this->items[$i]->enclosure->type."\"  length=\"". $this->items[$i]->enclosure->length . "\" />\n";
+            }
+            $feed.= "    </entry>\n";
+        }
+        $feed.= "</feed>\n";
+        return $feed;
+    }
+
+
+}
+
+
+/**
+ * AtomCreator03 is a FeedCreator that implements the atom specification,
+ * as in http://www.intertwingly.net/wiki/pie/FrontPage.
+ * Please note that just by using AtomCreator03 you won't automatically
+ * produce valid atom files. For example, you have to specify either an editor
+ * for the feed or an author for every single feed item.
+ *
+ * Some elements have not been implemented yet. These are (incomplete list):
+ * author URL, item author's email and URL, item contents, alternate links,
+ * other link content types than text/html. Some of them may be created with
+ * AtomCreator03::additionalElements.
+ *
+ * @see FeedCreator#additionalElements
+ * @since 1.6
+ * @author Kai Blankenhorn <kaib@bitfolge.de>, Scott Reynen <scott@randomchaos.com>
+ */
+class AtomCreator03 extends FeedCreator {
+
+    function AtomCreator03() {
+        $this->contentType = "application/atom+xml";
+        $this->encoding = "utf-8";
+    }
+
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createGeneratorComment();
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<feed version=\"0.3\" xmlns=\"http://purl.org/atom/ns#\"";
+        if ($this->language!="") {
+            $feed.= " xml:lang=\"".$this->language."\"";
+        }
+        $feed.= ">\n";
+        $feed.= "    <title>".htmlspecialchars($this->title)."</title>\n";
+        $feed.= "    <tagline>".htmlspecialchars($this->description)."</tagline>\n";
+        $feed.= "    <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->link)."\"/>\n";
+        $feed.= "    <id>".htmlspecialchars($this->link)."</id>\n";
+        $now = new FeedDate();
+        $feed.= "    <modified>".htmlspecialchars($now->iso8601())."</modified>\n";
+        if ($this->editor!="") {
+            $feed.= "    <author>\n";
+            $feed.= "        <name>".$this->editor."</name>\n";
+            if ($this->editorEmail!="") {
+                $feed.= "        <email>".$this->editorEmail."</email>\n";
+            }
+            $feed.= "    </author>\n";
+        }
+        $feed.= "    <generator>".FEEDCREATOR_VERSION."</generator>\n";
+        $feed.= $this->_createAdditionalElements($this->additionalElements, "    ");
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "    <entry>\n";
+            $feed.= "        <title>".htmlspecialchars(strip_tags($this->items[$i]->title))."</title>\n";
+            $feed.= "        <link rel=\"alternate\" type=\"text/html\" href=\"".htmlspecialchars($this->items[$i]->link)."\"/>\n";
+            if ($this->items[$i]->date=="") {
+                $this->items[$i]->date = time();
+            }
+            $itemDate = new FeedDate($this->items[$i]->date);
+            $feed.= "        <created>".htmlspecialchars($itemDate->iso8601())."</created>\n";
+            $feed.= "        <issued>".htmlspecialchars($itemDate->iso8601())."</issued>\n";
+            $feed.= "        <modified>".htmlspecialchars($itemDate->iso8601())."</modified>\n";
+            $feed.= "        <id>".htmlspecialchars($this->items[$i]->link)."</id>\n";
+            $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, "        ");
+            if ($this->items[$i]->author!="") {
+                $feed.= "        <author>\n";
+                $feed.= "            <name>".htmlspecialchars($this->items[$i]->author)."</name>\n";
+                $feed.= "        </author>\n";
+            }
+            if ($this->items[$i]->description!="") {
+                $feed.= "        <summary>".htmlspecialchars($this->items[$i]->description)."</summary>\n";
+            }
+            $feed.= "    </entry>\n";
+        }
+        $feed.= "</feed>\n";
+        return $feed;
+    }
+}
+
+
+/**
+ * MBOXCreator is a FeedCreator that implements the mbox format
+ * as described in http://www.qmail.org/man/man5/mbox.html
+ *
+ * @since 1.3
+ * @author Kai Blankenhorn <kaib@bitfolge.de>
+ */
+class MBOXCreator extends FeedCreator {
+
+    function MBOXCreator() {
+        $this->contentType = "text/plain";
+        $this->encoding = "utf-8";
+    }
+
+    function qp_enc($input = "", $line_max = 76) {
+        $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
+        $lines = preg_split("/(?:\r\n|\r|\n)/", $input);
+        $eol = "\r\n";
+        $escape = "=";
+        $output = "";
+        while( list(, $line) = each($lines) ) {
+            //$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary
+            $linlen = strlen($line);
+            $newline = "";
+            for($i = 0; $i < $linlen; $i++) {
+                $c = substr($line, $i, 1);
+                $dec = ord($c);
+                if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only
+                    $c = "=20";
+                } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required
+                    $h2 = floor($dec/16); $h1 = floor($dec%16);
+                    $c = $escape.$hex["$h2"].$hex["$h1"];
+                }
+                if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted
+                    $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay
+                    $newline = "";
+                }
+                $newline .= $c;
+            } // end of for
+            $output .= $newline.$eol;
+        }
+        return trim($output);
+    }
+
+
+    /**
+     * Builds the MBOX contents.
+     * @return    string    the feed's complete text
+     */
+    function createFeed() {
+        for ($i=0;$i<count($this->items);$i++) {
+            if ($this->items[$i]->author!="") {
+                $from = $this->items[$i]->author;
+            } else {
+                $from = $this->title;
+            }
+            $itemDate = new FeedDate($this->items[$i]->date);
+            $feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n";
+            $feed.= "Content-Type: text/plain;\n";
+            $feed.= "   charset=\"".$this->encoding."\"\n";
+            $feed.= "Content-Transfer-Encoding: quoted-printable\n";
+            $feed.= "Content-Type: text/plain\n";
+            $feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n";
+            $feed.= "Date: ".$itemDate->rfc822()."\n";
+            $feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n";
+            $feed.= "\n";
+            $body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description));
+            $feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body);
+            $feed.= "\n";
+            $feed.= "\n";
+        }
+        return $feed;
+    }
+
+    /**
+     * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types.
+     * @return string the feed cache filename
+     * @since 1.4
+     * @access private
+     */
+    function _generateFilename() {
+        $fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+        return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox";
+    }
+}
+
+
+/**
+ * OPMLCreator is a FeedCreator that implements OPML 1.0.
+ *
+ * @see http://opml.scripting.com/spec
+ * @author Dirk Clemens, Kai Blankenhorn
+ * @since 1.5
+ */
+class OPMLCreator extends FeedCreator {
+
+    function OPMLCreator() {
+        $this->encoding = "utf-8";
+    }
+
+    function createFeed() {
+        $feed = "<?xml version=\"1.0\" encoding=\"".$this->encoding."\"?>\n";
+        $feed.= $this->_createGeneratorComment();
+        $feed.= $this->_createStylesheetReferences();
+        $feed.= "<opml xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n";
+        $feed.= "    <head>\n";
+        $feed.= "        <title>".htmlspecialchars($this->title)."</title>\n";
+        if ($this->pubDate!="") {
+            $date = new FeedDate($this->pubDate);
+            $feed.= "         <dateCreated>".$date->rfc822()."</dateCreated>\n";
+        }
+        if ($this->lastBuildDate!="") {
+            $date = new FeedDate($this->lastBuildDate);
+            $feed.= "         <dateModified>".$date->rfc822()."</dateModified>\n";
+        }
+        if ($this->editor!="") {
+            $feed.= "         <ownerName>".$this->editor."</ownerName>\n";
+        }
+        if ($this->editorEmail!="") {
+            $feed.= "         <ownerEmail>".$this->editorEmail."</ownerEmail>\n";
+        }
+        $feed.= "    </head>\n";
+        $feed.= "    <body>\n";
+        for ($i=0;$i<count($this->items);$i++) {
+            $feed.= "    <outline type=\"rss\" ";
+            $title = htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r","  ")));
+            $feed.= " title=\"".$title."\"";
+            $feed.= " text=\"".$title."\"";
+            //$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\"";
+            $feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\"";
+            $feed.= "/>\n";
+        }
+        $feed.= "    </body>\n";
+        $feed.= "</opml>\n";
+        return $feed;
+    }
+}
+
+
+
+/**
+ * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific
+ * location, overriding the createFeed method of the parent FeedCreator.
+ * The HTML produced can be included over http by scripting languages, or serve
+ * as the source for an IFrame.
+ * All output by this class is embedded in <div></div> tags to enable formatting
+ * using CSS.
+ *
+ * @author Pascal Van Hecke
+ * @since 1.7
+ */
+class HTMLCreator extends FeedCreator {
+
+    var $contentType = "text/html";
+
+    /**
+     * Contains HTML to be output at the start of the feed's html representation.
+     */
+    var $header;
+
+    /**
+     * Contains HTML to be output at the end of the feed's html representation.
+     */
+    var $footer ;
+
+    /**
+     * Contains HTML to be output between entries. A separator is only used in
+     * case of multiple entries.
+     */
+    var $separator;
+
+    /**
+     * Used to prefix the stylenames to make sure they are unique
+     * and do not clash with stylenames on the users' page.
+     */
+    var $stylePrefix;
+
+    /**
+     * Determines whether the links open in a new window or not.
+     */
+    var $openInNewWindow = true;
+
+    var $imageAlign ="right";
+
+    /**
+     * In case of very simple output you may want to get rid of the style tags,
+     * hence this variable.  There's no equivalent on item level, but of course you can
+     * add strings to it while iterating over the items ($this->stylelessOutput .= ...)
+     * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored
+     * in the function createFeed().
+     */
+    var $stylelessOutput ="";
+
+    /**
+     * Writes the HTML.
+     * @return    string    the scripts's complete text
+     */
+    function createFeed() {
+        // if there is styleless output, use the content of this variable and ignore the rest
+        if ($this->stylelessOutput!="") {
+            return $this->stylelessOutput;
+        }
+
+        //if no stylePrefix is set, generate it yourself depending on the script name
+        if ($this->stylePrefix=="") {
+            $this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_";
+        }
+
+        //set an openInNewWindow_token_to be inserted or not
+        if ($this->openInNewWindow) {
+            $targetInsert = " target='_blank'";
+        }
+
+        // use this array to put the lines in and implode later with "document.write" javascript
+        $feedArray = array();
+        if ($this->image!=null) {
+            $imageStr = "<a href='".$this->image->link."'".$targetInsert.">".
+                            "<img src='".$this->image->url."' border='0' alt='".
+                            FeedCreator::iTrunc(htmlspecialchars($this->image->title),100).
+                            "' align='".$this->imageAlign."' ";
+            if ($this->image->width) {
+                $imageStr .=" width='".$this->image->width. "' ";
+            }
+            if ($this->image->height) {
+                $imageStr .=" height='".$this->image->height."' ";
+            }
+            $imageStr .="/></a>";
+            $feedArray[] = $imageStr;
+        }
+
+        if ($this->title) {
+            $feedArray[] = "<div class='".$this->stylePrefix."title'><a href='".$this->link."' ".$targetInsert." class='".$this->stylePrefix."title'>".
+                FeedCreator::iTrunc(htmlspecialchars($this->title),100)."</a></div>";
+        }
+        if ($this->getDescription()) {
+            $feedArray[] = "<div class='".$this->stylePrefix."description'>".
+                str_replace("]]>", "", str_replace("<![CDATA[", "", $this->getDescription())).
+                "</div>";
+        }
+
+        if ($this->header) {
+            $feedArray[] = "<div class='".$this->stylePrefix."header'>".$this->header."</div>";
+        }
+
+        for ($i=0;$i<count($this->items);$i++) {
+            if ($this->separator and $i > 0) {
+                $feedArray[] = "<div class='".$this->stylePrefix."separator'>".$this->separator."</div>";
+            }
+
+            if ($this->items[$i]->title) {
+                if ($this->items[$i]->link) {
+                    $feedArray[] =
+                        "<div class='".$this->stylePrefix."item_title'><a href='".$this->items[$i]->link."' class='".$this->stylePrefix.
+                        "item_title'".$targetInsert.">".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+                        "</a></div>";
+                } else {
+                    $feedArray[] =
+                        "<div class='".$this->stylePrefix."item_title'>".
+                        FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100).
+                        "</div>";
+                }
+            }
+            if ($this->items[$i]->getDescription()) {
+                $feedArray[] =
+                "<div class='".$this->stylePrefix."item_description'>".
+                    str_replace("]]>", "", str_replace("<![CDATA[", "", $this->items[$i]->getDescription())).
+                    "</div>";
+            }
+        }
+        if ($this->footer) {
+            $feedArray[] = "<div class='".$this->stylePrefix."footer'>".$this->footer."</div>";
+        }
+
+        $feed= "".join($feedArray, "\r\n");
+        return $feed;
+    }
+
+    /**
+     * Overrrides parent to produce .html extensions
+     *
+     * @return string the feed cache filename
+     * @since 1.4
+     * @access private
+     */
+    function _generateFilename() {
+        $fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+        return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html";
+    }
+}
+
+
+/**
+ * JSCreator is a class that writes a js file to a specific
+ * location, overriding the createFeed method of the parent HTMLCreator.
+ *
+ * @author Pascal Van Hecke
+ */
+class JSCreator extends HTMLCreator {
+    var $contentType = "text/javascript";
+
+    /**
+     * writes the javascript
+     * @return    string    the scripts's complete text
+     */
+    function createFeed()
+    {
+        $feed = parent::createFeed();
+        $feedArray = explode("\n",$feed);
+
+        $jsFeed = "";
+        foreach ($feedArray as $value) {
+            $jsFeed .= "document.write('".trim(addslashes($value))."');\n";
+        }
+        return $jsFeed;
+    }
+
+    /**
+     * Overrrides parent to produce .js extensions
+     *
+     * @return string the feed cache filename
+     * @since 1.4
+     * @access private
+     */
+    function _generateFilename() {
+        $fileInfo = pathinfo($_SERVER["PHP_SELF"]);
+        return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js";
+    }
+
+}
+
+/**
+ * This class allows to override the hardcoded charset
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+class DokuWikiFeedCreator extends UniversalFeedCreator{
+    function createFeed($format = "RSS0.91",$encoding='iso-8859-15') {
+        $this->_setFormat($format);
+        $this->_feed->encoding = $encoding;
+        return $this->_feed->createFeed();
+    }
+}
+
+
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/form.php b/mod/dokuwiki/vendors/dokuwiki/inc/form.php
new file mode 100644
index 000000000..a514526b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/form.php
@@ -0,0 +1,918 @@
+<?php
+/**
+ * DokuWiki XHTML Form
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Tom N Harris <tnharris@whoopdedo.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/html.php');
+
+/**
+ * Class for creating simple HTML forms.
+ *
+ * The forms is built from a list of pseudo-tags (arrays with expected keys).
+ * Every pseudo-tag must have the key '_elem' set to the name of the element.
+ * When printed, the form class calls functions named 'form_$type' for each
+ * element it contains.
+ *
+ * Standard practice is for non-attribute keys in a pseudo-element to start
+ * with '_'. Other keys are HTML attributes that will be included in the element
+ * tag. That way, the element output functions can pass the pseudo-element
+ * directly to buildAttributes.
+ *
+ * See the form_make* functions later in this file.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+class Doku_Form {
+
+    // Form id attribute
+    var $params = array();
+
+    // Draw a border around form fields.
+    // Adds <fieldset></fieldset> around the elements
+    var $_infieldset = false;
+
+    // Hidden form fields.
+    var $_hidden = array();
+
+    // Array of pseudo-tags
+    var $_content = array();
+
+    /**
+     * Constructor
+     *
+     * Sets parameters and autoadds a security token. The old calling convention
+     * with up to four parameters is deprecated, instead the first parameter
+     * should be an array with parameters.
+     *
+     * @param   mixed   $params  Parameters for the HTML form element; Using the
+     *                           deprecated calling convention this is the ID
+     *                           attribute of the form
+     * @param   string  $action  (optional, deprecated) submit URL, defaults to
+     *                                                  current page
+     * @param   string  $method  (optional, deprecated) 'POST' or 'GET', default
+     *                                                  is POST
+     * @param   string  $enctype (optional, deprecated) Encoding type of the
+     *                                                  data
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function Doku_Form($params, $action=false, $method=false, $enctype=false) {
+        if(!is_array($params)) {
+            $this->params = array('id' => $params);
+            if ($action !== false) $this->params['action'] = $action;
+            if ($method !== false) $this->params['method'] = strtolower($method);
+            if ($enctype !== false) $this->params['enctype'] = $enctype;
+        } else {
+            $this->params = $params;
+        }
+
+        if (!isset($this->params['method'])) {
+            $this->params['method'] = 'post';
+        } else {
+            $this->params['method'] = strtolower($this->params['method']);
+        }
+
+        if (!isset($this->params['action'])) {
+            $this->params['action'] = '';
+        }
+
+        $this->addHidden('sectok', getSecurityToken());
+    }
+
+    /**
+     * startFieldset
+     *
+     * Add <fieldset></fieldset> tags around fields.
+     * Usually results in a border drawn around the form.
+     *
+     * @param   string  $legend Label that will be printed with the border.
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function startFieldset($legend) {
+        if ($this->_infieldset) {
+            $this->addElement(array('_elem'=>'closefieldset'));
+        }
+        $this->addElement(array('_elem'=>'openfieldset', '_legend'=>$legend));
+        $this->_infieldset = true;
+    }
+
+    /**
+     * endFieldset
+     *
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function endFieldset() {
+        if ($this->_infieldset) {
+            $this->addElement(array('_elem'=>'closefieldset'));
+        }
+        $this->_infieldset = false;
+    }
+
+    /**
+     * addHidden
+     *
+     * Adds a name/value pair as a hidden field.
+     * The value of the field (but not the name) will be passed to
+     * formText() before printing.
+     *
+     * @param   string  $name   Field name.
+     * @param   string  $value  Field value. If null, remove a previously added field.
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function addHidden($name, $value) {
+        if (is_null($value))
+            unset($this->_hidden[$name]);
+        else
+            $this->_hidden[$name] = $value;
+    }
+
+    /**
+     * addElement
+     *
+     * Appends a content element to the form.
+     * The element can be either a pseudo-tag or string.
+     * If string, it is printed without escaping special chars.   *
+     *
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function addElement($elem) {
+        $this->_content[] = $elem;
+    }
+
+    /**
+     * insertElement
+     *
+     * Inserts a content element at a position.
+     *
+     * @param   string  $pos    0-based index where the element will be inserted.
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function insertElement($pos, $elem) {
+        array_splice($this->_content, $pos, 0, array($elem));
+    }
+
+    /**
+     * replaceElement
+     *
+     * Replace with NULL to remove an element.
+     *
+     * @param   int     $pos    0-based index the element will be placed at.
+     * @param   string  $elem   Pseudo-tag or string to add to the form.
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function replaceElement($pos, $elem) {
+        $rep = array();
+        if (!is_null($elem)) $rep[] = $elem;
+        array_splice($this->_content, $pos, 1, $rep);
+    }
+
+    /**
+     * findElementByType
+     *
+     * Gets the position of the first of a type of element.
+     *
+     * @param   string  $type   Element type to look for.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function findElementByType($type) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && $elem['_elem'] == $type)
+                return $pos;
+        }
+        return false;
+    }
+
+    /**
+     * findElementById
+     *
+     * Gets the position of the element with an ID attribute.
+     *
+     * @param   string  $id     ID of the element to find.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function findElementById($id) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && isset($elem['id']) && $elem['id'] == $id)
+                return $pos;
+        }
+        return false;
+    }
+
+    /**
+     * findElementByAttribute
+     *
+     * Gets the position of the first element with a matching attribute value.
+     *
+     * @param   string  $name   Attribute name.
+     * @param   string  $value  Attribute value.
+     * @return  array   pseudo-element if found, false otherwise
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function findElementByAttribute($name, $value) {
+        foreach ($this->_content as $pos=>$elem) {
+            if (is_array($elem) && isset($elem[$name]) && $elem[$name] == $value)
+                return $pos;
+        }
+        return false;
+    }
+
+    /**
+     * getElementAt
+     *
+     * Returns a reference to the element at a position.
+     * A position out-of-bounds will return either the
+     * first (underflow) or last (overflow) element.
+     *
+     * @param   int     $pos    0-based index
+     * @return  arrayreference  pseudo-element
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function &getElementAt($pos) {
+        if ($pos < 0) $pos = count($this->_content) + $pos;
+        if ($pos < 0) $pos = 0;
+        if ($pos >= count($this->_content)) $pos = count($this->_content) - 1;
+        return $this->_content[$pos];
+    }
+
+    /**
+     * Return the assembled HTML for the form.
+     *
+     * Each element in the form will be passed to a function named
+     * 'form_$type'. The function should return the HTML to be printed.
+     *
+     * @author  Tom N Harris <tnharris@whoopdedo.org>
+     */
+    function getForm() {
+        global $lang;
+        $form = '';
+        $this->params['accept-charset'] = $lang['encoding'];
+        $form .= '<form ' . html_attbuild($this->params) . '><div class="no">' . DOKU_LF;
+        if (!empty($this->_hidden)) {
+            foreach ($this->_hidden as $name=>$value)
+                $form .= form_hidden(array('name'=>$name, 'value'=>$value));
+        }
+        foreach ($this->_content as $element) {
+            if (is_array($element)) {
+                $elem_type = $element['_elem'];
+                if (function_exists('form_'.$elem_type)) {
+                    $form .= call_user_func('form_'.$elem_type, $element).DOKU_LF;
+                }
+            } else {
+                $form .= $element;
+            }
+        }
+        if ($this->_infieldset) $form .= form_closefieldset().DOKU_LF;
+        $form .= '</div></form>'.DOKU_LF;
+
+        return $form;
+    }
+
+    /**
+     * Print the assembled form
+     *
+     * wraps around getForm()
+     */
+    function printForm(){
+        echo $this->getForm();
+    }
+
+}
+
+/**
+ * form_makeTag
+ *
+ * Create a form element for a non-specific empty tag.
+ *
+ * @param   string  $tag    Tag name.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeTag($tag, $attrs=array()) {
+    $elem = array('_elem'=>'tag', '_tag'=>$tag);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeOpenTag
+ *
+ * Create a form element for a non-specific opening tag.
+ * Remember to put a matching close tag after this as well.
+ *
+ * @param   string  $tag    Tag name.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeOpenTag($tag, $attrs=array()) {
+    $elem = array('_elem'=>'opentag', '_tag'=>$tag);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeCloseTag
+ *
+ * Create a form element for a non-specific closing tag.
+ * Careless use of this will result in invalid XHTML.
+ *
+ * @param   string  $tag    Tag name.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeCloseTag($tag) {
+    return array('_elem'=>'closetag', '_tag'=>$tag);
+}
+
+/**
+ * form_makeWikiText
+ *
+ * Create a form element for a textarea containing wiki text.
+ * Only one wikitext element is allowed on a page. It will have
+ * a name of 'wikitext' and id 'wiki__text'. The text will
+ * be passed to formText() before printing.
+ *
+ * @param   string  $text   Text to fill the field with.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeWikiText($text, $attrs=array()) {
+    $elem = array('_elem'=>'wikitext', '_text'=>$text,
+                        'class'=>'edit', 'cols'=>'80', 'rows'=>'10');
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeButton
+ *
+ * Create a form element for an action button.
+ * A title will automatically be generated using the value and
+ * accesskey attributes, unless you provide one.
+ *
+ * @param   string  $type   Type attribute. 'submit' or 'cancel'
+ * @param   string  $act    Wiki action of the button, will be used as the do= parameter
+ * @param   string  $value  (optional) Displayed label. Uses $act if not provided.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeButton($type, $act, $value='', $attrs=array()) {
+    if ($value == '') $value = $act;
+    $elem = array('_elem'=>'button', 'type'=>$type, '_action'=>$act,
+                        'value'=>$value, 'class'=>'button');
+    if (!empty($attrs['accesskey']) && empty($attrs['title'])) {
+        $attrs['title'] = $value . ' ['.strtoupper($attrs['accesskey']).']';
+    }
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeField
+ *
+ * Create a form element for a labelled input element.
+ * The label text will be printed before the input.
+ *
+ * @param   string  $type   Type attribute of input.
+ * @param   string  $name   Name attribute of the input.
+ * @param   string  $value  (optional) Default value.
+ * @param   string  $class  Class attribute of the label. If this is 'block',
+ *                          then a line break will be added after the field.
+ * @param   string  $label  Label that will be printed before the input.
+ * @param   string  $id     ID attribute of the input. If set, the label will
+ *                          reference it with a 'for' attribute.
+ * @param   array   $attrs  Optional attributes.
+ * @return  array   pseudo-tag
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeField($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'field', '_text'=>$label, '_class'=>$class,
+                        'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeFieldRight
+ *
+ * Create a form element for a labelled input element.
+ * The label text will be printed after the input.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeFieldRight($type, $name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'fieldright', '_text'=>$label, '_class'=>$class,
+                        'type'=>$type, 'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeTextField
+ *
+ * Create a form element for a text input element with label.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeTextField($name, $value='', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'textfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value, 'class'=>'edit');
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makePasswordField
+ *
+ * Create a form element for a password input element with label.
+ * Password elements have no default value, for obvious reasons.
+ *
+ * @see     form_makeField
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makePasswordField($name, $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'passwordfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'class'=>'edit');
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeFileField
+ *
+ * Create a form element for a file input element with label
+ *
+ * @see     form_makeField
+ * @author  Michael Klier <chi@chimeric.de>
+ */
+function form_makeFileField($name, $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $elem = array('_elem'=>'filefield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'class'=>'edit');
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeCheckboxField
+ *
+ * Create a form element for a checkbox input element with label.
+ *
+ * @see     form_makeFieldRight
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeCheckboxField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    if (is_null($value) || $value=='') $value='0';
+    $elem = array('_elem'=>'checkboxfield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeRadioField
+ *
+ * Create a form element for a radio button input element with label.
+ *
+ * @see     form_makeFieldRight
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeRadioField($name, $value='1', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    if (is_null($value) || $value=='') $value='0';
+    $elem = array('_elem'=>'radiofield', '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name, 'value'=>$value);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeMenuField
+ *
+ * Create a form element for a drop-down menu with label.
+ * The list of values can be strings, arrays of (value,text),
+ * or an associative array with the values as keys and labels as values.
+ * An item is selected by supplying its value or integer index.
+ * If the list of values is an associative array, the selected item must be
+ * a string.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeMenuField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $options = array();
+    reset($values);
+    // FIXME: php doesn't know the difference between a string and an integer
+    if (is_string(key($values))) {
+        foreach ($values as $val=>$text) {
+            $options[] = array($val,$text, (!is_null($selected) && $val==$selected));
+        }
+    } else {
+        if (is_integer($selected)) $selected = $values[$selected];
+        foreach ($values as $val) {
+            if (is_array($val))
+                @list($val,$text) = $val;
+            else
+                $text = null;
+            $options[] = array($val,$text,$val===$selected);
+        }
+    }
+    $elem = array('_elem'=>'menufield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_makeListboxField
+ *
+ * Create a form element for a list box with label.
+ * The list of values can be strings, arrays of (value,text),
+ * or an associative array with the values as keys and labels as values.
+ * Items are selected by supplying its value or an array of values.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_makeListboxField($name, $values, $selected='', $label=null, $id='', $class='', $attrs=array()) {
+    if (is_null($label)) $label = $name;
+    $options = array();
+    reset($values);
+    if (is_null($selected) || $selected == '')
+        $selected = array();
+    elseif (!is_array($selected))
+        $selected = array($selected);
+    // FIXME: php doesn't know the difference between a string and an integer
+    if (is_string(key($values))) {
+        foreach ($values as $val=>$text) {
+            $options[] = array($val,$text,in_array($val,$selected));
+        }
+    } else {
+        foreach ($values as $val) {
+            if (is_array($val))
+                @list($val,$text) = $val;
+            else
+                $text = null;
+            $options[] = array($val,$text,in_array($val,$selected));
+        }
+    }
+    $elem = array('_elem'=>'listboxfield', '_options'=>$options, '_text'=>$label, '_class'=>$class,
+                        'id'=>$id, 'name'=>$name);
+    return array_merge($elem, $attrs);
+}
+
+/**
+ * form_tag
+ *
+ * Print the HTML for a generic empty tag.
+ * Requires '_tag' key with name of the tag.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_tag($attrs) {
+    return '<'.$attrs['_tag'].' '.buildAttributes($attrs).'/>';
+}
+
+/**
+ * form_opentag
+ *
+ * Print the HTML for a generic opening tag.
+ * Requires '_tag' key with name of the tag.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_opentag($attrs) {
+    return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>';
+}
+
+/**
+ * form_closetag
+ *
+ * Print the HTML for a generic closing tag.
+ * Requires '_tag' key with name of the tag.
+ * There are no attributes.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_closetag($attrs) {
+    return '</'.$attrs['_tag'].'>';
+}
+
+/**
+ * form_openfieldset
+ *
+ * Print the HTML for an opening fieldset tag.
+ * Uses the '_legend' key.
+ * Attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_openfieldset($attrs) {
+    $s = '<fieldset '.buildAttributes($attrs,true).'>';
+    if (!is_null($attrs['_legend'])) $s .= '<legend>'.$attrs['_legend'].'</legend>';
+    return $s;
+}
+
+/**
+ * form_closefieldset
+ *
+ * Print the HTML for a closing fieldset tag.
+ * There are no attributes.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_closefieldset() {
+    return '</fieldset>';
+}
+
+/**
+ * form_hidden
+ *
+ * Print the HTML for a hidden input element.
+ * Uses only 'name' and 'value' attributes.
+ * Value is passed to formText()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_hidden($attrs) {
+    return '<input type="hidden" name="'.$attrs['name'].'" value="'.formText($attrs['value']).'" />';
+}
+
+/**
+ * form_wikitext
+ *
+ * Print the HTML for the wiki textarea.
+ * Requires '_text' with default text of the field.
+ * Text will be passed to formText(), attributes to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_wikitext($attrs) {
+    // mandatory attributes
+    unset($attrs['name']);
+    unset($attrs['id']);
+    return '<textarea name="wikitext" id="wiki__text" '
+                 .buildAttributes($attrs,true).'>'.DOKU_LF
+                 .formText($attrs['_text'])
+                 .'</textarea>';
+}
+
+/**
+ * form_button
+ *
+ * Print the HTML for a form button.
+ * If '_action' is set, the button name will be "do[_action]".
+ * Other attributes are passed to buildAttributes()
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_button($attrs) {
+    $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : '';
+    return '<input '.$p.buildAttributes($attrs,true).'/>';
+}
+
+/**
+ * form_field
+ *
+ * Print the HTML for a form input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_field($attrs) {
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span>';
+    $s .= ' <input '.buildAttributes($attrs,true).'/></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_fieldright
+ *
+ * Print the HTML for a form input field. (right-aligned)
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_fieldright($attrs) {
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><input '.buildAttributes($attrs,true).'/>';
+    $s .= ' <span>'.$attrs['_text'].'</span></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_textfield
+ *
+ * Print the HTML for a text input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_textfield($attrs) {
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span> ';
+    $s .= '<input type="text" '.buildAttributes($attrs,true).'/></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_passwordfield
+ *
+ * Print the HTML for a password input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_passwordfield($attrs) {
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span> ';
+    $s .= '<input type="password" '.buildAttributes($attrs,true).'/></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_filefield
+ *
+ * Print the HTML for a file input field.
+ *   _class     : class attribute used on the label tag
+ *   _text      : Text to display before the input. Not escaped
+ *   _maxlength : Allowed size in byte
+ *   _accept    : Accepted mime-type
+ * Other attributes are passed to buildAttributes() for the input tag
+ *
+ * @author  Michael Klier <chi@chimeric.de>
+ */
+function form_filefield($attrs) {
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span> ';
+    $s .= '<input type="file" '.buildAttributes($attrs,true);
+    if (!empty($attrs['_maxlength'])) $s .= ' maxlength="'.$attrs['_maxlength'].'"';
+    if (!empty($attrs['_accept'])) $s .= ' accept="'.$attrs['_accept'].'"';
+    $s .= '/></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_checkboxfield
+ *
+ * Print the HTML for a checkbox input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_checkboxfield($attrs) {
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><input type="checkbox" '.buildAttributes($attrs,true).'/>';
+    $s .= ' <span>'.$attrs['_text'].'</span></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_radiofield
+ *
+ * Print the HTML for a radio button input field.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display after the input. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_radiofield($attrs) {
+    // mandatory attributes
+    unset($attrs['type']);
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><input type="radio" '.buildAttributes($attrs,true).'/>';
+    $s .= ' <span>'.$attrs['_text'].'</span></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_menufield
+ *
+ * Print the HTML for a drop-down menu.
+ *   _options : Array of (value,text,selected) for the menu.
+ *              Text can be omitted. Text and value are passed to formText()
+ *              Only one item can be selected.
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the menu. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_menufield($attrs) {
+    $attrs['size'] = '1';
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span>';
+    $s .= ' <select '.buildAttributes($attrs,true).'>'.DOKU_LF;
+    if (!empty($attrs['_options'])) {
+        $selected = false;
+        for($n=0;$n<count($attrs['_options']);$n++){
+            @list($value,$text,$select) = $attrs['_options'][$n];
+            $p = '';
+            if (!is_null($text))
+                $p .= ' value="'.formText($value).'"';
+            else
+                $text = $value;
+            if (!empty($select) && !$selected) {
+                $p .= ' selected="selected"';
+                $selected = true;
+            }
+            $s .= '<option'.$p.'>'.formText($text).'</option>';
+        }
+    } else {
+        $s .= '<option></option>';
+    }
+    $s .= DOKU_LF.'</select></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
+
+/**
+ * form_listboxfield
+ *
+ * Print the HTML for a list box.
+ *   _options : Array of (value,text,selected) for the list.
+ *              Text can be omitted. Text and value are passed to formText()
+ *   _class : class attribute used on the label tag
+ *   _text  : Text to display before the menu. Not escaped.
+ * Other attributes are passed to buildAttributes() for the input tag.
+ *
+ * @author  Tom N Harris <tnharris@whoopdedo.org>
+ */
+function form_listboxfield($attrs) {
+    $s = '<label';
+    if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
+    if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
+    $s .= '><span>'.$attrs['_text'].'</span> ';
+    $s .= '<select '.buildAttributes($attrs,true).'>'.DOKU_LF;
+    if (!empty($attrs['_options'])) {
+        foreach ($attrs['_options'] as $opt) {
+            @list($value,$text,$select) = $opt;
+            $p = '';
+            if(is_null($text)) $text = $value;
+            $p .= ' value="'.formText($value).'"';
+            if (!empty($select)) $p .= ' selected="selected"';
+            $s .= '<option'.$p.'>'.formText($text).'</option>';
+        }
+    } else {
+        $s .= '<option></option>';
+    }
+    $s .= DOKU_LF.'</select></label>';
+    if (preg_match('/(^| )block($| )/', $attrs['_class']))
+        $s .= '<br />';
+    return $s;
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/fulltext.php b/mod/dokuwiki/vendors/dokuwiki/inc/fulltext.php
new file mode 100644
index 000000000..c8236e1d4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/fulltext.php
@@ -0,0 +1,722 @@
+<?php
+/**
+ * DokuWiki fulltextsearch functions using the index
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/indexer.php');
+
+
+/**
+ * The fulltext search
+ *
+ * Returns a list of matching documents for the given query
+ *
+ * refactored into ft_pageSearch(), _ft_pageSearch() and trigger_event()
+ *
+ */
+function ft_pageSearch($query,&$highlight){
+
+  $data['query'] = $query;
+  $data['highlight'] =& $highlight;
+
+  return trigger_event('SEARCH_QUERY_FULLPAGE', $data, '_ft_pageSearch');
+}
+
+/**
+ * Returns a list of matching documents for the given query
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+function _ft_pageSearch(&$data) {
+    // parse the given query
+    $q = ft_queryParser($data['query']);
+    $data['highlight'] = $q['highlight'];
+
+    if (empty($q['parsed_ary'])) return array();
+
+    // lookup all words found in the query
+    $lookup = idx_lookup($q['words']);
+
+    // get all pages in this dokuwiki site (!: includes nonexistent pages)
+    $pages_all = array();
+    foreach (idx_getIndex('page', '') as $id) {
+        $pages_all[trim($id)] = 0; // base: 0 hit
+    }
+
+    // process the query
+    $stack = array();
+    foreach ($q['parsed_ary'] as $token) {
+        switch (substr($token, 0, 3)) {
+            case 'W+:':
+            case 'W-:':
+            case 'W_:': // word
+                $word    = substr($token, 3);
+                $stack[] = (array) $lookup[$word];
+                break;
+            case 'P+:':
+            case 'P-:': // phrase
+                $phrase = substr($token, 3);
+                // since phrases are always parsed as ((W1)(W2)...(P)),
+                // the end($stack) always points the pages that contain
+                // all words in this phrase
+                $pages  = end($stack);
+                $pages_matched = array();
+                foreach(array_keys($pages) as $id){
+                    $text = utf8_strtolower(rawWiki($id));
+                    if (strpos($text, $phrase) !== false) {
+                        $pages_matched[$id] = 0; // phrase: always 0 hit
+                    }
+                }
+                $stack[] = $pages_matched;
+                break;
+            case 'N+:':
+            case 'N-:': // namespace
+                $ns = substr($token, 3);
+                $pages_matched = array();
+                foreach (array_keys($pages_all) as $id) {
+                    if (strpos($id, $ns) === 0) {
+                        $pages_matched[$id] = 0; // namespace: always 0 hit
+                    }
+                }
+                $stack[] = $pages_matched;
+                break;
+            case 'AND': // and operation
+                list($pages1, $pages2) = array_splice($stack, -2);
+                $stack[] = ft_resultCombine(array($pages1, $pages2));
+                break;
+            case 'OR':  // or operation
+                list($pages1, $pages2) = array_splice($stack, -2);
+                $stack[] = ft_resultUnite(array($pages1, $pages2));
+                break;
+            case 'NOT': // not operation (unary)
+                $pages   = array_pop($stack);
+                $stack[] = ft_resultComplement(array($pages_all, $pages));
+                break;
+        }
+    }
+    $docs = array_pop($stack);
+
+    if (empty($docs)) return array();
+
+    // check: settings, acls, existence
+    foreach (array_keys($docs) as $id) {
+        if (isHiddenPage($id) || auth_quickaclcheck($id) < AUTH_READ || !page_exists($id, '', false)) {
+            unset($docs[$id]);
+        }
+    }
+
+    // sort docs by count
+    arsort($docs);
+
+    return $docs;
+}
+
+/**
+ * Returns the backlinks for a given page
+ *
+ * Does a quick lookup with the fulltext index, then
+ * evaluates the instructions of the found pages
+ */
+function ft_backlinks($id){
+    global $conf;
+    $swfile   = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+    $stopwords = @file_exists($swfile) ? file($swfile) : array();
+
+    $result = array();
+
+    // quick lookup of the pagename
+    $page    = noNS($id);
+    $matches = idx_lookup(idx_tokenizer($page,$stopwords));  // pagename may contain specials (_ or .)
+    $docs    = array_keys(ft_resultCombine(array_values($matches)));
+    $docs    = array_filter($docs,'isVisiblePage'); // discard hidden pages
+    if(!count($docs)) return $result;
+    require_once(DOKU_INC.'inc/parserutils.php');
+
+    // check metadata for matching links
+    foreach($docs as $match){
+        // metadata relation reference links are already resolved
+        $links = p_get_metadata($match,'relation references');
+        if (isset($links[$id])) $result[] = $match;
+    }
+
+    if(!count($result)) return $result;
+
+    // check ACL permissions
+    foreach(array_keys($result) as $idx){
+        if(auth_quickaclcheck($result[$idx]) < AUTH_READ){
+            unset($result[$idx]);
+        }
+    }
+
+    sort($result);
+    return $result;
+}
+
+/**
+ * Returns the pages that use a given media file
+ *
+ * Does a quick lookup with the fulltext index, then
+ * evaluates the instructions of the found pages
+ *
+ * Aborts after $max found results
+ */
+function ft_mediause($id,$max){
+    global $conf;
+    $swfile   = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+    $stopwords = @file_exists($swfile) ? file($swfile) : array();
+
+    if(!$max) $max = 1; // need to find at least one
+
+    $result = array();
+
+    // quick lookup of the mediafile
+    $media   = noNS($id);
+    $matches = idx_lookup(idx_tokenizer($media,$stopwords));
+    $docs    = array_keys(ft_resultCombine(array_values($matches)));
+    if(!count($docs)) return $result;
+
+    // go through all found pages
+    $found = 0;
+    $pcre  = preg_quote($media,'/');
+    foreach($docs as $doc){
+        $ns = getNS($doc);
+        preg_match_all('/\{\{([^|}]*'.$pcre.'[^|}]*)(|[^}]+)?\}\}/i',rawWiki($doc),$matches);
+        foreach($matches[1] as $img){
+            $img = trim($img);
+            if(preg_match('/^https?:\/\//i',$img)) continue; // skip external images
+            list($img) = explode('?',$img);                  // remove any parameters
+            resolve_mediaid($ns,$img,$exists);               // resolve the possibly relative img
+
+            if($img == $id){                                 // we have a match
+                $result[] = $doc;
+                $found++;
+                break;
+            }
+        }
+        if($found >= $max) break;
+    }
+
+    sort($result);
+    return $result;
+}
+
+
+
+/**
+ * Quicksearch for pagenames
+ *
+ * By default it only matches the pagename and ignores the
+ * namespace. This can be changed with the second parameter
+ *
+ * refactored into ft_pageLookup(), _ft_pageLookup() and trigger_event()
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ft_pageLookup($id,$pageonly=true){
+    $data = array('id' => $id, 'pageonly' => $pageonly);
+    return trigger_event('SEARCH_QUERY_PAGELOOKUP',$data,'_ft_pageLookup');
+}
+
+function _ft_pageLookup(&$data){
+    // split out original parameterrs
+    $id = $data['id'];
+    $pageonly = $data['pageonly'];
+
+    global $conf;
+    $id    = preg_quote($id,'/');
+    $pages = file($conf['indexdir'].'/page.idx');
+    if($id) $pages = array_values(preg_grep('/'.$id.'/',$pages));
+
+    $cnt = count($pages);
+    for($i=0; $i<$cnt; $i++){
+        if($pageonly){
+            if(!preg_match('/'.$id.'/',noNS($pages[$i]))){
+                unset($pages[$i]);
+                continue;
+            }
+        }
+        if(!page_exists($pages[$i])){
+            unset($pages[$i]);
+            continue;
+        }
+    }
+
+    $pages = array_filter($pages,'isVisiblePage'); // discard hidden pages
+    if(!count($pages)) return array();
+
+    // check ACL permissions
+    foreach(array_keys($pages) as $idx){
+        if(auth_quickaclcheck(trim($pages[$idx])) < AUTH_READ){
+            unset($pages[$idx]);
+        }
+    }
+
+    $pages = array_map('trim',$pages);
+    usort($pages,'ft_pagesorter');
+    return $pages;
+}
+
+/**
+ * Sort pages based on their namespace level first, then on their string
+ * values. This makes higher hierarchy pages rank higher than lower hierarchy
+ * pages.
+ */
+function ft_pagesorter($a, $b){
+    $ac = count(explode(':',$a));
+    $bc = count(explode(':',$b));
+    if($ac < $bc){
+        return -1;
+    }elseif($ac > $bc){
+        return 1;
+    }
+    return strcmp ($a,$b);
+}
+
+/**
+ * Creates a snippet extract
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @triggers FULLTEXT_SNIPPET_CREATE
+ */
+function ft_snippet($id,$highlight){
+    $text = rawWiki($id);
+    $evdata = array(
+                'id'        => $id,
+                'text'      => &$text,
+                'highlight' => &$highlight,
+                'snippet'   => '',
+              );
+
+    $evt = new Doku_Event('FULLTEXT_SNIPPET_CREATE',$evdata);
+    if ($evt->advise_before()) {
+        $match = array();
+        $snippets = array();
+        $utf8_offset = $offset = $end = 0;
+        $len = utf8_strlen($text);
+
+        // build a regexp from the phrases to highlight
+        $re1 = '('.join('|',array_map('preg_quote_cb',array_filter((array) $highlight))).')';
+        $re2 = "$re1.{0,75}(?!\\1)$re1";
+        $re3 = "$re1.{0,45}(?!\\1)$re1.{0,45}(?!\\1)(?!\\2)$re1";
+
+        for ($cnt=4; $cnt--;) {
+          if (0) {
+          } else if (preg_match('/'.$re3.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else if (preg_match('/'.$re2.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else if (preg_match('/'.$re1.'/iu',$text,$match,PREG_OFFSET_CAPTURE,$offset)) {
+          } else {
+            break;
+          }
+
+          list($str,$idx) = $match[0];
+
+          // convert $idx (a byte offset) into a utf8 character offset
+          $utf8_idx = utf8_strlen(substr($text,0,$idx));
+          $utf8_len = utf8_strlen($str);
+
+          // establish context, 100 bytes surrounding the match string
+          // first look to see if we can go 100 either side,
+          // then drop to 50 adding any excess if the other side can't go to 50,
+          $pre = min($utf8_idx-$utf8_offset,100);
+          $post = min($len-$utf8_idx-$utf8_len,100);
+
+          if ($pre>50 && $post>50) {
+            $pre = $post = 50;
+          } else if ($pre>50) {
+            $pre = min($pre,100-$post);
+          } else if ($post>50) {
+            $post = min($post, 100-$pre);
+          } else {
+            // both are less than 50, means the context is the whole string
+            // make it so and break out of this loop - there is no need for the
+            // complex snippet calculations
+            $snippets = array($text);
+            break;
+          }
+
+          // establish context start and end points, try to append to previous
+          // context if possible
+          $start = $utf8_idx - $pre;
+          $append = ($start < $end) ? $end : false;  // still the end of the previous context snippet
+          $end = $utf8_idx + $utf8_len + $post;      // now set it to the end of this context
+
+          if ($append) {
+            $snippets[count($snippets)-1] .= utf8_substr($text,$append,$end-$append);
+          } else {
+            $snippets[] = utf8_substr($text,$start,$end-$start);
+          }
+
+          // set $offset for next match attempt
+          //   substract strlen to avoid splitting a potential search success,
+          //   this is an approximation as the search pattern may match strings
+          //   of varying length and it will fail if the context snippet
+          //   boundary breaks a matching string longer than the current match
+          $utf8_offset = $utf8_idx + $post;
+          $offset = $idx + strlen(utf8_substr($text,$utf8_idx,$post));
+          $offset = utf8_correctIdx($text,$offset);
+        }
+
+        $m = "\1";
+        $snippets = preg_replace('/'.$re1.'/iu',$m.'$1'.$m,$snippets);
+        $snippet = preg_replace('/'.$m.'([^'.$m.']*?)'.$m.'/iu','<strong class="search_hit">$1</strong>',hsc(join('... ',$snippets)));
+
+        $evdata['snippet'] = $snippet;
+    }
+    $evt->advise_after();
+    unset($evt);
+
+    return $evdata['snippet'];
+}
+
+/**
+ * Combine found documents and sum up their scores
+ *
+ * This function is used to combine searched words with a logical
+ * AND. Only documents available in all arrays are returned.
+ *
+ * based upon PEAR's PHP_Compat function for array_intersect_key()
+ *
+ * @param array $args An array of page arrays
+ */
+function ft_resultCombine($args){
+    $array_count = count($args);
+    if($array_count == 1){
+        return $args[0];
+    }
+
+    $result = array();
+    if ($array_count > 1) {
+      foreach ($args[0] as $key => $value) {
+        $result[$key] = $value;
+        for ($i = 1; $i !== $array_count; $i++) {
+            if (!isset($args[$i][$key])) {
+                unset($result[$key]);
+                break;
+            }
+            $result[$key] += $args[$i][$key];
+        }
+      }
+    }
+    return $result;
+}
+
+/**
+ * Unites found documents and sum up their scores
+ *
+ * based upon ft_resultCombine() function
+ *
+ * @param array $args An array of page arrays
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+function ft_resultUnite($args) {
+    $array_count = count($args);
+    if ($array_count === 1) {
+        return $args[0];
+    }
+
+    $result = $args[0];
+    for ($i = 1; $i !== $array_count; $i++) {
+        foreach (array_keys($args[$i]) as $id) {
+            $result[$id] += $args[$i][$id];
+        }
+    }
+    return $result;
+}
+
+/**
+ * Computes the difference of documents using page id for comparison
+ *
+ * nearly identical to PHP5's array_diff_key()
+ *
+ * @param array $args An array of page arrays
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+function ft_resultComplement($args) {
+    $array_count = count($args);
+    if ($array_count === 1) {
+        return $args[0];
+    }
+
+    $result = $args[0];
+    foreach (array_keys($result) as $id) {
+        for ($i = 1; $i !== $array_count; $i++) {
+            if (isset($args[$i][$id])) unset($result[$id]);
+        }
+    }
+    return $result;
+}
+
+/**
+ * Parses a search query and builds an array of search formulas
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+function ft_queryParser($query){
+    global $conf;
+    $swfile    = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+    $stopwords = @file_exists($swfile) ? file($swfile) : array();
+
+    /**
+     * parse a search query and transform it into intermediate representation
+     *
+     * in a search query, you can use the following expressions:
+     *
+     *   words:
+     *     include
+     *     -exclude
+     *   phrases:
+     *     "phrase to be included"
+     *     -"phrase you want to exclude"
+     *   namespaces:
+     *     @include:namespace (or ns:include:namespace)
+     *     ^exclude:namespace (or -ns:exclude:namespace)
+     *   groups:
+     *     ()
+     *     -()
+     *   operators:
+     *     and ('and' is the default operator: you can always omit this)
+     *     or  (or pipe symbol '|', lower precedence than 'and')
+     *
+     * e.g. a query [ aa "bb cc" @dd:ee ] means "search pages which contain
+     *      a word 'aa', a phrase 'bb cc' and are within a namespace 'dd:ee'".
+     *      this query is equivalent to [ -(-aa or -"bb cc" or -ns:dd:ee) ]
+     *      as long as you don't mind hit counts.
+     *
+     * intermediate representation consists of the following parts:
+     *
+     *   ( )           - group
+     *   AND           - logical and
+     *   OR            - logical or
+     *   NOT           - logical not
+     *   W+:, W-:, W_: - word      (underscore: no need to highlight)
+     *   P+:, P-:      - phrase    (minus sign: logically in NOT group)
+     *   N+:, N-:      - namespace
+     */
+    $parsed_query = '';
+    $parens_level = 0;
+    $terms = preg_split('/(-?".*?")/u', utf8_strtolower($query), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+
+    foreach ($terms as $term) {
+        $parsed = '';
+        if (preg_match('/^(-?)"(.+)"$/u', $term, $matches)) {
+            // phrase-include and phrase-exclude
+            $not = $matches[1] ? 'NOT' : '';
+            $parsed = $not.ft_termParser($matches[2], $stopwords, false, true);
+        } else {
+            // fix incomplete phrase
+            $term = str_replace('"', ' ', $term);
+
+            // fix parentheses
+            $term = str_replace(')'  , ' ) ', $term);
+            $term = str_replace('('  , ' ( ', $term);
+            $term = str_replace('- (', ' -(', $term);
+
+            // treat pipe symbols as 'OR' operators
+            $term = str_replace('|', ' or ', $term);
+
+            // treat ideographic spaces (U+3000) as search term separators
+            // FIXME: some more separators?
+            $term = preg_replace('/[ \x{3000}]+/u', ' ',  $term);
+            $term = trim($term);
+            if ($term === '') continue;
+
+            $tokens = explode(' ', $term);
+            foreach ($tokens as $token) {
+                if ($token === '(') {
+                    // parenthesis-include-open
+                    $parsed .= '(';
+                    ++$parens_level;
+                } elseif ($token === '-(') {
+                    // parenthesis-exclude-open
+                    $parsed .= 'NOT(';
+                    ++$parens_level;
+                } elseif ($token === ')') {
+                    // parenthesis-any-close
+                    if ($parens_level === 0) continue;
+                    $parsed .= ')';
+                    $parens_level--;
+                } elseif ($token === 'and') {
+                    // logical-and (do nothing)
+                } elseif ($token === 'or') {
+                    // logical-or
+                    $parsed .= 'OR';
+                } elseif (preg_match('/^(?:\^|-ns:)(.+)$/u', $token, $matches)) {
+                    // namespace-exclude
+                    $parsed .= 'NOT(N+:'.$matches[1].')';
+                } elseif (preg_match('/^(?:@|ns:)(.+)$/u', $token, $matches)) {
+                    // namespace-include
+                    $parsed .= '(N+:'.$matches[1].')';
+                } elseif (preg_match('/^-(.+)$/', $token, $matches)) {
+                    // word-exclude
+                    $parsed .= 'NOT('.ft_termParser($matches[1], $stopwords).')';
+                } else {
+                    // word-include
+                    $parsed .= ft_termParser($token, $stopwords);
+                }
+            }
+        }
+        $parsed_query .= $parsed;
+    }
+
+    // cleanup (very sensitive)
+    $parsed_query .= str_repeat(')', $parens_level);
+    do {
+        $parsed_query_old = $parsed_query;
+        $parsed_query = preg_replace('/(NOT)?\(\)/u', '', $parsed_query);
+    } while ($parsed_query !== $parsed_query_old);
+    $parsed_query = preg_replace('/(NOT|OR)+\)/u', ')'      , $parsed_query);
+    $parsed_query = preg_replace('/(OR)+/u'      , 'OR'     , $parsed_query);
+    $parsed_query = preg_replace('/\(OR/u'       , '('      , $parsed_query);
+    $parsed_query = preg_replace('/^OR|OR$/u'    , ''       , $parsed_query);
+    $parsed_query = preg_replace('/\)(NOT)?\(/u' , ')AND$1(', $parsed_query);
+
+    // adjustment: make highlightings right
+    $parens_level     = 0;
+    $notgrp_levels    = array();
+    $parsed_query_new = '';
+    $tokens = preg_split('/(NOT\(|[()])/u', $parsed_query, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+    foreach ($tokens as $token) {
+        if ($token === 'NOT(') {
+            $notgrp_levels[] = ++$parens_level;
+        } elseif ($token === '(') {
+            ++$parens_level;
+        } elseif ($token === ')') {
+            if ($parens_level-- === end($notgrp_levels)) array_pop($notgrp_levels);
+        } elseif (count($notgrp_levels) % 2 === 1) {
+            // turn highlight-flag off if terms are logically in "NOT" group
+            $token = preg_replace('/([WPN])\+\:/u', '$1-:', $token);
+        }
+        $parsed_query_new .= $token;
+    }
+    $parsed_query = $parsed_query_new;
+
+    /**
+     * convert infix notation string into postfix (Reverse Polish notation) array
+     * by Shunting-yard algorithm
+     *
+     * see: http://en.wikipedia.org/wiki/Reverse_Polish_notation
+     * see: http://en.wikipedia.org/wiki/Shunting-yard_algorithm
+     */
+    $parsed_ary     = array();
+    $ope_stack      = array();
+    $ope_precedence = array(')' => 1, 'OR' => 2, 'AND' => 3, 'NOT' => 4, '(' => 5);
+    $ope_regex      = '/([()]|OR|AND|NOT)/u';
+
+    $tokens = preg_split($ope_regex, $parsed_query, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+    foreach ($tokens as $token) {
+        if (preg_match($ope_regex, $token)) {
+            // operator
+            $last_ope = end($ope_stack);
+            while ($ope_precedence[$token] <= $ope_precedence[$last_ope] && $last_ope != '(') {
+                $parsed_ary[] = array_pop($ope_stack);
+                $last_ope = end($ope_stack);
+            }
+            if ($token == ')') {
+                array_pop($ope_stack); // this array_pop always deletes '('
+            } else {
+                $ope_stack[] = $token;
+            }
+        } else {
+            // operand
+            $token_decoded = str_replace(array('OP', 'CP'), array('(', ')'), $token);
+            $parsed_ary[] = $token_decoded;
+        }
+    }
+    $parsed_ary = array_values(array_merge($parsed_ary, array_reverse($ope_stack)));
+
+    // cleanup: each double "NOT" in RPN array actually does nothing
+    $parsed_ary_count = count($parsed_ary);
+    for ($i = 1; $i < $parsed_ary_count; ++$i) {
+        if ($parsed_ary[$i] === 'NOT' && $parsed_ary[$i - 1] === 'NOT') {
+            unset($parsed_ary[$i], $parsed_ary[$i - 1]);
+        }
+    }
+    $parsed_ary = array_values($parsed_ary);
+
+    // build return value
+    $q = array();
+    $q['query']      = $query;
+    $q['parsed_str'] = $parsed_query;
+    $q['parsed_ary'] = $parsed_ary;
+
+    foreach ($q['parsed_ary'] as $token) {
+        if ($token[2] !== ':') continue;
+        $body = substr($token, 3);
+
+        switch (substr($token, 0, 3)) {
+            case 'N+:':
+                $q['ns'][]        = $body; // for backward compatibility
+                break;
+            case 'N-:':
+                $q['notns'][]     = $body; // for backward compatibility
+                break;
+            case 'W_:':
+                $q['words'][]     = $body;
+                break;
+            case 'W-:':
+                $q['words'][]     = $body;
+                $q['not'][]       = $body; // for backward compatibility
+                break;
+            case 'W+:':
+                $q['words'][]     = $body;
+                $q['highlight'][] = str_replace('*', '', $body);
+                $q['and'][]       = $body; // for backward compatibility
+                break;
+            case 'P-:':
+                $q['phrases'][]   = $body;
+                break;
+            case 'P+:':
+                $q['phrases'][]   = $body;
+                $q['highlight'][] = str_replace('*', '', $body);
+                break;
+        }
+    }
+    foreach (array('words', 'phrases', 'highlight', 'ns', 'notns', 'and', 'not') as $key) {
+        $q[$key] = empty($q[$key]) ? array() : array_values(array_unique($q[$key]));
+    }
+
+    return $q;
+}
+
+/**
+ * Transforms given search term into intermediate representation
+ *
+ * This function is used in ft_queryParser() and not for general purpose use.
+ *
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+function ft_termParser($term, &$stopwords, $consider_asian = true, $phrase_mode = false) {
+    $parsed = '';
+    if ($consider_asian) {
+        // successive asian characters need to be searched as a phrase
+        $words = preg_split('/('.IDX_ASIAN.'+)/u', $term, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
+        foreach ($words as $word) {
+            if (preg_match('/'.IDX_ASIAN.'/u', $word)) $phrase_mode = true;
+            $parsed .= ft_termParser($word, $stopwords, false, $phrase_mode);
+        }
+    } else {
+        $term_noparen = str_replace(array('(', ')'), ' ', $term);
+        $words = idx_tokenizer($term_noparen, $stopwords, true);
+
+        // W_: no need to highlight
+        if (empty($words)) {
+            $parsed = '()'; // important: do not remove
+        } elseif ($words[0] === $term) {
+            $parsed = '(W+:'.$words[0].')';
+        } elseif ($phrase_mode) {
+            $term_encoded = str_replace(array('(', ')'), array('OP', 'CP'), $term);
+            $parsed = '((W_:'.implode(')(W_:', $words).')(P+:'.$term_encoded.'))';
+        } else {
+            $parsed = '((W+:'.implode(')(W+:', $words).'))';
+        }
+    }
+    return $parsed;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi.php
new file mode 100644
index 000000000..abe69a2bd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi.php
@@ -0,0 +1,4644 @@
+<?php
+/**
+ * GeSHi - Generic Syntax Highlighter
+ *
+ * The GeSHi class for Generic Syntax Highlighting. Please refer to the
+ * documentation at http://qbnz.com/highlighter/documentation.php for more
+ * information about how to use this class.
+ *
+ * For changes, release notes, TODOs etc, see the relevant files in the docs/
+ * directory.
+ *
+ *   This file is part of GeSHi.
+ *
+ *  GeSHi is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  GeSHi is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with GeSHi; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @package    geshi
+ * @subpackage core
+ * @author     Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
+ * @copyright  (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
+ * @license    http://gnu.org/copyleft/gpl.html GNU GPL
+ *
+ */
+
+//
+// GeSHi Constants
+// You should use these constant names in your programs instead of
+// their values - you never know when a value may change in a future
+// version
+//
+
+/** The version of this GeSHi file */
+define('GESHI_VERSION', '1.0.8.4');
+
+// Define the root directory for the GeSHi code tree
+if (!defined('GESHI_ROOT')) {
+    /** The root directory for GeSHi */
+    define('GESHI_ROOT', dirname(__FILE__) . DIRECTORY_SEPARATOR);
+}
+/** The language file directory for GeSHi
+    @access private */
+define('GESHI_LANG_ROOT', GESHI_ROOT . 'geshi' . DIRECTORY_SEPARATOR);
+
+// Define if GeSHi should be paranoid about security
+if (!defined('GESHI_SECURITY_PARANOID')) {
+    /** Tells GeSHi to be paranoid about security settings */
+    define('GESHI_SECURITY_PARANOID', false);
+}
+
+// Line numbers - use with enable_line_numbers()
+/** Use no line numbers when building the result */
+define('GESHI_NO_LINE_NUMBERS', 0);
+/** Use normal line numbers when building the result */
+define('GESHI_NORMAL_LINE_NUMBERS', 1);
+/** Use fancy line numbers when building the result */
+define('GESHI_FANCY_LINE_NUMBERS', 2);
+
+// Container HTML type
+/** Use nothing to surround the source */
+define('GESHI_HEADER_NONE', 0);
+/** Use a "div" to surround the source */
+define('GESHI_HEADER_DIV', 1);
+/** Use a "pre" to surround the source */
+define('GESHI_HEADER_PRE', 2);
+/** Use a pre to wrap lines when line numbers are enabled or to wrap the whole code. */
+define('GESHI_HEADER_PRE_VALID', 3);
+/**
+ * Use a "table" to surround the source:
+ *
+ *  <table>
+ *    <thead><tr><td colspan="2">$header</td></tr></thead>
+ *    <tbody><tr><td><pre>$linenumbers</pre></td><td><pre>$code></pre></td></tr></tbody>
+ *    <tfooter><tr><td colspan="2">$footer</td></tr></tfoot>
+ *  </table>
+ *
+ * this is essentially only a workaround for Firefox, see sf#1651996 or take a look at
+ * https://bugzilla.mozilla.org/show_bug.cgi?id=365805
+ * @note when linenumbers are disabled this is essentially the same as GESHI_HEADER_PRE
+ */
+define('GESHI_HEADER_PRE_TABLE', 4);
+
+// Capatalisation constants
+/** Lowercase keywords found */
+define('GESHI_CAPS_NO_CHANGE', 0);
+/** Uppercase keywords found */
+define('GESHI_CAPS_UPPER', 1);
+/** Leave keywords found as the case that they are */
+define('GESHI_CAPS_LOWER', 2);
+
+// Link style constants
+/** Links in the source in the :link state */
+define('GESHI_LINK', 0);
+/** Links in the source in the :hover state */
+define('GESHI_HOVER', 1);
+/** Links in the source in the :active state */
+define('GESHI_ACTIVE', 2);
+/** Links in the source in the :visited state */
+define('GESHI_VISITED', 3);
+
+// Important string starter/finisher
+// Note that if you change these, they should be as-is: i.e., don't
+// write them as if they had been run through htmlentities()
+/** The starter for important parts of the source */
+define('GESHI_START_IMPORTANT', '<BEGIN GeSHi>');
+/** The ender for important parts of the source */
+define('GESHI_END_IMPORTANT', '<END GeSHi>');
+
+/**#@+
+ *  @access private
+ */
+// When strict mode applies for a language
+/** Strict mode never applies (this is the most common) */
+define('GESHI_NEVER', 0);
+/** Strict mode *might* apply, and can be enabled or
+    disabled by {@link GeSHi->enable_strict_mode()} */
+define('GESHI_MAYBE', 1);
+/** Strict mode always applies */
+define('GESHI_ALWAYS', 2);
+
+// Advanced regexp handling constants, used in language files
+/** The key of the regex array defining what to search for */
+define('GESHI_SEARCH', 0);
+/** The key of the regex array defining what bracket group in a
+    matched search to use as a replacement */
+define('GESHI_REPLACE', 1);
+/** The key of the regex array defining any modifiers to the regular expression */
+define('GESHI_MODIFIERS', 2);
+/** The key of the regex array defining what bracket group in a
+    matched search to put before the replacement */
+define('GESHI_BEFORE', 3);
+/** The key of the regex array defining what bracket group in a
+    matched search to put after the replacement */
+define('GESHI_AFTER', 4);
+/** The key of the regex array defining a custom keyword to use
+    for this regexp's html tag class */
+define('GESHI_CLASS', 5);
+
+/** Used in language files to mark comments */
+define('GESHI_COMMENTS', 0);
+
+/** Used to work around missing PHP features **/
+define('GESHI_PHP_PRE_433', !(version_compare(PHP_VERSION, '4.3.3') === 1));
+
+/** make sure we can call stripos **/
+if (!function_exists('stripos')) {
+    // the offset param of preg_match is not supported below PHP 4.3.3
+    if (GESHI_PHP_PRE_433) {
+        /**
+         * @ignore
+         */
+        function stripos($haystack, $needle, $offset = null) {
+            if (!is_null($offset)) {
+                $haystack = substr($haystack, $offset);
+            }
+            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE)) {
+                return $match[0][1];
+            }
+            return false;
+        }
+    }
+    else {
+        /**
+         * @ignore
+         */
+        function stripos($haystack, $needle, $offset = null) {
+            if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE, $offset)) {
+                return $match[0][1];
+            }
+            return false;
+        }
+    }
+}
+
+/** some old PHP / PCRE subpatterns only support up to xxx subpatterns in
+    regular expressions. Set this to false if your PCRE lib is up to date
+    @see GeSHi->optimize_regexp_list()
+    **/
+define('GESHI_MAX_PCRE_SUBPATTERNS', 500);
+/** it's also important not to generate too long regular expressions
+    be generous here... but keep in mind, that when reaching this limit we
+    still have to close open patterns. 12k should do just fine on a 16k limit.
+    @see GeSHi->optimize_regexp_list()
+    **/
+define('GESHI_MAX_PCRE_LENGTH', 12288);
+
+//Number format specification
+/** Basic number format for integers */
+define('GESHI_NUMBER_INT_BASIC', 1);        //Default integers \d+
+/** Enhanced number format for integers like seen in C */
+define('GESHI_NUMBER_INT_CSTYLE', 2);       //Default C-Style \d+[lL]?
+/** Number format to highlight binary numbers with a suffix "b" */
+define('GESHI_NUMBER_BIN_SUFFIX', 16);           //[01]+[bB]
+/** Number format to highlight binary numbers with a prefix % */
+define('GESHI_NUMBER_BIN_PREFIX_PERCENT', 32);   //%[01]+
+/** Number format to highlight binary numbers with a prefix 0b (C) */
+define('GESHI_NUMBER_BIN_PREFIX_0B', 64);        //0b[01]+
+/** Number format to highlight octal numbers with a leading zero */
+define('GESHI_NUMBER_OCT_PREFIX', 256);           //0[0-7]+
+/** Number format to highlight octal numbers with a suffix of o */
+define('GESHI_NUMBER_OCT_SUFFIX', 512);           //[0-7]+[oO]
+/** Number format to highlight hex numbers with a prefix 0x */
+define('GESHI_NUMBER_HEX_PREFIX', 4096);           //0x[0-9a-fA-F]+
+/** Number format to highlight hex numbers with a suffix of h */
+define('GESHI_NUMBER_HEX_SUFFIX', 8192);           //[0-9][0-9a-fA-F]*h
+/** Number format to highlight floating-point numbers without support for scientific notation */
+define('GESHI_NUMBER_FLT_NONSCI', 65536);          //\d+\.\d+
+/** Number format to highlight floating-point numbers without support for scientific notation */
+define('GESHI_NUMBER_FLT_NONSCI_F', 131072);       //\d+(\.\d+)?f
+/** Number format to highlight floating-point numbers with support for scientific notation (E) and optional leading zero */
+define('GESHI_NUMBER_FLT_SCI_SHORT', 262144);      //\.\d+e\d+
+/** Number format to highlight floating-point numbers with support for scientific notation (E) and required leading digit */
+define('GESHI_NUMBER_FLT_SCI_ZERO', 524288);       //\d+(\.\d+)?e\d+
+//Custom formats are passed by RX array
+
+// Error detection - use these to analyse faults
+/** No sourcecode to highlight was specified
+ * @deprecated
+ */
+define('GESHI_ERROR_NO_INPUT', 1);
+/** The language specified does not exist */
+define('GESHI_ERROR_NO_SUCH_LANG', 2);
+/** GeSHi could not open a file for reading (generally a language file) */
+define('GESHI_ERROR_FILE_NOT_READABLE', 3);
+/** The header type passed to {@link GeSHi->set_header_type()} was invalid */
+define('GESHI_ERROR_INVALID_HEADER_TYPE', 4);
+/** The line number type passed to {@link GeSHi->enable_line_numbers()} was invalid */
+define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5);
+/**#@-*/
+
+
+/**
+ * The GeSHi Class.
+ *
+ * Please refer to the documentation for GeSHi 1.0.X that is available
+ * at http://qbnz.com/highlighter/documentation.php for more information
+ * about how to use this class.
+ *
+ * @package   geshi
+ * @author    Nigel McNie <nigel@geshi.org>, Benny Baumann <BenBE@omorphia.de>
+ * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann
+ */
+class GeSHi {
+    /**#@+
+     * @access private
+     */
+    /**
+     * The source code to highlight
+     * @var string
+     */
+    var $source = '';
+
+    /**
+     * The language to use when highlighting
+     * @var string
+     */
+    var $language = '';
+
+    /**
+     * The data for the language used
+     * @var array
+     */
+    var $language_data = array();
+
+    /**
+     * The path to the language files
+     * @var string
+     */
+    var $language_path = GESHI_LANG_ROOT;
+
+    /**
+     * The error message associated with an error
+     * @var string
+     * @todo check err reporting works
+     */
+    var $error = false;
+
+    /**
+     * Possible error messages
+     * @var array
+     */
+    var $error_messages = array(
+        GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})',
+        GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable',
+        GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid',
+        GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid'
+    );
+
+    /**
+     * Whether highlighting is strict or not
+     * @var boolean
+     */
+    var $strict_mode = false;
+
+    /**
+     * Whether to use CSS classes in output
+     * @var boolean
+     */
+    var $use_classes = false;
+
+    /**
+     * The type of header to use. Can be one of the following
+     * values:
+     *
+     * - GESHI_HEADER_PRE: Source is outputted in a "pre" HTML element.
+     * - GESHI_HEADER_DIV: Source is outputted in a "div" HTML element.
+     * - GESHI_HEADER_NONE: No header is outputted.
+     *
+     * @var int
+     */
+    var $header_type = GESHI_HEADER_PRE;
+
+    /**
+     * Array of permissions for which lexics should be highlighted
+     * @var array
+     */
+    var $lexic_permissions = array(
+        'KEYWORDS' =>    array(),
+        'COMMENTS' =>    array('MULTI' => true),
+        'REGEXPS' =>     array(),
+        'ESCAPE_CHAR' => true,
+        'BRACKETS' =>    true,
+        'SYMBOLS' =>     false,
+        'STRINGS' =>     true,
+        'NUMBERS' =>     true,
+        'METHODS' =>     true,
+        'SCRIPT' =>      true
+    );
+
+    /**
+     * The time it took to parse the code
+     * @var double
+     */
+    var $time = 0;
+
+    /**
+     * The content of the header block
+     * @var string
+     */
+    var $header_content = '';
+
+    /**
+     * The content of the footer block
+     * @var string
+     */
+    var $footer_content = '';
+
+    /**
+     * The style of the header block
+     * @var string
+     */
+    var $header_content_style = '';
+
+    /**
+     * The style of the footer block
+     * @var string
+     */
+    var $footer_content_style = '';
+
+    /**
+     * Tells if a block around the highlighted source should be forced
+     * if not using line numbering
+     * @var boolean
+     */
+    var $force_code_block = false;
+
+    /**
+     * The styles for hyperlinks in the code
+     * @var array
+     */
+    var $link_styles = array();
+
+    /**
+     * Whether important blocks should be recognised or not
+     * @var boolean
+     * @deprecated
+     * @todo REMOVE THIS FUNCTIONALITY!
+     */
+    var $enable_important_blocks = false;
+
+    /**
+     * Styles for important parts of the code
+     * @var string
+     * @deprecated
+     * @todo As above - rethink the whole idea of important blocks as it is buggy and
+     * will be hard to implement in 1.2
+     */
+    var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code
+
+    /**
+     * Whether CSS IDs should be added to the code
+     * @var boolean
+     */
+    var $add_ids = false;
+
+    /**
+     * Lines that should be highlighted extra
+     * @var array
+     */
+    var $highlight_extra_lines = array();
+
+    /**
+     * Styles of lines that should be highlighted extra
+     * @var array
+     */
+    var $highlight_extra_lines_styles = array();
+
+    /**
+     * Styles of extra-highlighted lines
+     * @var string
+     */
+    var $highlight_extra_lines_style = 'background-color: #ffc;';
+
+    /**
+     * The line ending
+     * If null, nl2br() will be used on the result string.
+     * Otherwise, all instances of \n will be replaced with $line_ending
+     * @var string
+     */
+    var $line_ending = null;
+
+    /**
+     * Number at which line numbers should start at
+     * @var int
+     */
+    var $line_numbers_start = 1;
+
+    /**
+     * The overall style for this code block
+     * @var string
+     */
+    var $overall_style = 'font-family:monospace;';
+
+    /**
+     *  The style for the actual code
+     * @var string
+     */
+    var $code_style = 'font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;';
+
+    /**
+     * The overall class for this code block
+     * @var string
+     */
+    var $overall_class = '';
+
+    /**
+     * The overall ID for this code block
+     * @var string
+     */
+    var $overall_id = '';
+
+    /**
+     * Line number styles
+     * @var string
+     */
+    var $line_style1 = 'font-weight: normal; vertical-align:top;';
+
+    /**
+     * Line number styles for fancy lines
+     * @var string
+     */
+    var $line_style2 = 'font-weight: bold; vertical-align:top;';
+
+    /**
+     * Style for line numbers when GESHI_HEADER_PRE_TABLE is chosen
+     * @var string
+     */
+    var $table_linenumber_style = 'width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;';
+
+    /**
+     * Flag for how line numbers are displayed
+     * @var boolean
+     */
+    var $line_numbers = GESHI_NO_LINE_NUMBERS;
+
+    /**
+     * Flag to decide if multi line spans are allowed. Set it to false to make sure
+     * each tag is closed before and reopened after each linefeed.
+     * @var boolean
+     */
+    var $allow_multiline_span = true;
+
+    /**
+     * The "nth" value for fancy line highlighting
+     * @var int
+     */
+    var $line_nth_row = 0;
+
+    /**
+     * The size of tab stops
+     * @var int
+     */
+    var $tab_width = 8;
+
+    /**
+     * Should we use language-defined tab stop widths?
+     * @var int
+     */
+    var $use_language_tab_width = false;
+
+    /**
+     * Default target for keyword links
+     * @var string
+     */
+    var $link_target = '';
+
+    /**
+     * The encoding to use for entity encoding
+     * NOTE: Used with Escape Char Sequences to fix UTF-8 handling (cf. SF#2037598)
+     * @var string
+     */
+    var $encoding = 'utf-8';
+
+    /**
+     * Should keywords be linked?
+     * @var boolean
+     */
+    var $keyword_links = true;
+
+    /**
+     * Currently loaded language file
+     * @var string
+     * @since 1.0.7.22
+     */
+    var $loaded_language = '';
+
+    /**
+     * Wether the caches needed for parsing are built or not
+     *
+     * @var bool
+     * @since 1.0.8
+     */
+    var $parse_cache_built = false;
+
+    /**
+     * Work around for Suhosin Patch with disabled /e modifier
+     *
+     * Note from suhosins author in config file:
+     * <blockquote>
+     *   The /e modifier inside <code>preg_replace()</code> allows code execution.
+     *   Often it is the cause for remote code execution exploits. It is wise to
+     *   deactivate this feature and test where in the application it is used.
+     *   The developer using the /e modifier should be made aware that he should
+     *   use <code>preg_replace_callback()</code> instead
+     * </blockquote>
+     *
+     * @var array
+     * @since 1.0.8
+     */
+    var $_kw_replace_group = 0;
+    var $_rx_key = 0;
+
+    /**
+     * some "callback parameters" for handle_multiline_regexps
+     *
+     * @since 1.0.8
+     * @access private
+     * @var string
+     */
+    var $_hmr_before = '';
+    var $_hmr_replace = '';
+    var $_hmr_after = '';
+    var $_hmr_key = 0;
+
+    /**#@-*/
+
+    /**
+     * Creates a new GeSHi object, with source and language
+     *
+     * @param string The source code to highlight
+     * @param string The language to highlight the source with
+     * @param string The path to the language file directory. <b>This
+     *               is deprecated!</b> I've backported the auto path
+     *               detection from the 1.1.X dev branch, so now it
+     *               should be automatically set correctly. If you have
+     *               renamed the language directory however, you will
+     *               still need to set the path using this parameter or
+     *               {@link GeSHi->set_language_path()}
+     * @since 1.0.0
+     */
+    function GeSHi($source = '', $language = '', $path = '') {
+        if (!empty($source)) {
+            $this->set_source($source);
+        }
+        if (!empty($language)) {
+            $this->set_language($language);
+        }
+        $this->set_language_path($path);
+    }
+
+    /**
+     * Returns an error message associated with the last GeSHi operation,
+     * or false if no error has occured
+     *
+     * @return string|false An error message if there has been an error, else false
+     * @since  1.0.0
+     */
+    function error() {
+        if ($this->error) {
+            //Put some template variables for debugging here ...
+            $debug_tpl_vars = array(
+                '{LANGUAGE}' => $this->language,
+                '{PATH}' => $this->language_path
+            );
+            $msg = str_replace(
+                array_keys($debug_tpl_vars),
+                array_values($debug_tpl_vars),
+                $this->error_messages[$this->error]);
+
+            return "<br /><strong>GeSHi Error:</strong> $msg (code {$this->error})<br />";
+        }
+        return false;
+    }
+
+    /**
+     * Gets a human-readable language name (thanks to Simon Patterson
+     * for the idea :))
+     *
+     * @return string The name for the current language
+     * @since  1.0.2
+     */
+    function get_language_name() {
+        if (GESHI_ERROR_NO_SUCH_LANG == $this->error) {
+            return $this->language_data['LANG_NAME'] . ' (Unknown Language)';
+        }
+        return $this->language_data['LANG_NAME'];
+    }
+
+    /**
+     * Sets the source code for this object
+     *
+     * @param string The source code to highlight
+     * @since 1.0.0
+     */
+    function set_source($source) {
+        $this->source = $source;
+        $this->highlight_extra_lines = array();
+    }
+
+    /**
+     * Sets the language for this object
+     *
+     * @note since 1.0.8 this function won't reset language-settings by default anymore!
+     *       if you need this set $force_reset = true
+     *
+     * @param string The name of the language to use
+     * @since 1.0.0
+     */
+    function set_language($language, $force_reset = false) {
+        if ($force_reset) {
+            $this->loaded_language = false;
+        }
+
+        //Clean up the language name to prevent malicious code injection
+        $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language);
+
+        $language = strtolower($language);
+
+        //Retreive the full filename
+        $file_name = $this->language_path . $language . '.php';
+        if ($file_name == $this->loaded_language) {
+            // this language is already loaded!
+            return;
+        }
+
+        $this->language = $language;
+
+        $this->error = false;
+        $this->strict_mode = GESHI_NEVER;
+
+        //Check if we can read the desired file
+        if (!is_readable($file_name)) {
+            $this->error = GESHI_ERROR_NO_SUCH_LANG;
+            return;
+        }
+
+        // Load the language for parsing
+        $this->load_language($file_name);
+    }
+
+    /**
+     * Sets the path to the directory containing the language files. Note
+     * that this path is relative to the directory of the script that included
+     * geshi.php, NOT geshi.php itself.
+     *
+     * @param string The path to the language directory
+     * @since 1.0.0
+     * @deprecated The path to the language files should now be automatically
+     *             detected, so this method should no longer be needed. The
+     *             1.1.X branch handles manual setting of the path differently
+     *             so this method will disappear in 1.2.0.
+     */
+    function set_language_path($path) {
+        if(strpos($path,':')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            if(DIRECTORY_SEPARATOR == "\\") {
+                if(!preg_match('#^[a-zA-Z]:#', $path) || false !== strpos($path, ':', 2)) {
+                    return;
+                }
+            } else {
+                return;
+            }
+        }
+        if(preg_match('#[^/a-zA-Z0-9_\.\-\\\s:]#', $path)) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '/.')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if(GESHI_SECURITY_PARANOID && false !== strpos($path, '..')) {
+            //Security Fix to prevent external directories using fopen wrappers.
+            return;
+        }
+        if ($path) {
+            $this->language_path = ('/' == $path[strlen($path) - 1]) ? $path : $path . '/';
+            $this->set_language($this->language); // otherwise set_language_path has no effect
+        }
+    }
+
+    /**
+     * Sets the type of header to be used.
+     *
+     * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This
+     * means more source code but more control over tab width and line-wrapping.
+     * GESHI_HEADER_PRE means that a "pre" is used - less source, but less
+     * control. Default is GESHI_HEADER_PRE.
+     *
+     * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code
+     * should be outputted.
+     *
+     * @param int The type of header to be used
+     * @since 1.0.0
+     */
+    function set_header_type($type) {
+        //Check if we got a valid header type
+        if (!in_array($type, array(GESHI_HEADER_NONE, GESHI_HEADER_DIV,
+            GESHI_HEADER_PRE, GESHI_HEADER_PRE_VALID, GESHI_HEADER_PRE_TABLE))) {
+            $this->error = GESHI_ERROR_INVALID_HEADER_TYPE;
+            return;
+        }
+
+        //Set that new header type
+        $this->header_type = $type;
+    }
+
+    /**
+     * Sets the styles for the code that will be outputted
+     * when this object is parsed. The style should be a
+     * string of valid stylesheet declarations
+     *
+     * @param string  The overall style for the outputted code block
+     * @param boolean Whether to merge the styles with the current styles or not
+     * @since 1.0.0
+     */
+    function set_overall_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->overall_style = $style;
+        } else {
+            $this->overall_style .= $style;
+        }
+    }
+
+    /**
+     * Sets the overall classname for this block of code. This
+     * class can then be used in a stylesheet to style this object's
+     * output
+     *
+     * @param string The class name to use for this block of code
+     * @since 1.0.0
+     */
+    function set_overall_class($class) {
+        $this->overall_class = $class;
+    }
+
+    /**
+     * Sets the overall id for this block of code. This id can then
+     * be used in a stylesheet to style this object's output
+     *
+     * @param string The ID to use for this block of code
+     * @since 1.0.0
+     */
+    function set_overall_id($id) {
+        $this->overall_id = $id;
+    }
+
+    /**
+     * Sets whether CSS classes should be used to highlight the source. Default
+     * is off, calling this method with no arguments will turn it on
+     *
+     * @param boolean Whether to turn classes on or not
+     * @since 1.0.0
+     */
+    function enable_classes($flag = true) {
+        $this->use_classes = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the style for the actual code. This should be a string
+     * containing valid stylesheet declarations. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * Note: Use this method to override any style changes you made to
+     * the line numbers if you are using line numbers, else the line of
+     * code will have the same style as the line number! Consult the
+     * GeSHi documentation for more information about this.
+     *
+     * @param string  The style to use for actual code
+     * @param boolean Whether to merge the current styles with the new styles
+     * @since 1.0.2
+     */
+    function set_code_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->code_style = $style;
+        } else {
+            $this->code_style .= $style;
+        }
+    }
+
+    /**
+     * Sets the styles for the line numbers.
+     *
+     * @param string The style for the line numbers that are "normal"
+     * @param string|boolean If a string, this is the style of the line
+     *        numbers that are "fancy", otherwise if boolean then this
+     *        defines whether the normal styles should be merged with the
+     *        new normal styles or not
+     * @param boolean If set, is the flag for whether to merge the "fancy"
+     *        styles with the current styles or not
+     * @since 1.0.2
+     */
+    function set_line_style($style1, $style2 = '', $preserve_defaults = false) {
+        //Check if we got 2 or three parameters
+        if (is_bool($style2)) {
+            $preserve_defaults = $style2;
+            $style2 = '';
+        }
+
+        //Actually set the new styles
+        if (!$preserve_defaults) {
+            $this->line_style1 = $style1;
+            $this->line_style2 = $style2;
+        } else {
+            $this->line_style1 .= $style1;
+            $this->line_style2 .= $style2;
+        }
+    }
+
+    /**
+     * Sets whether line numbers should be displayed.
+     *
+     * Valid values for the first parameter are:
+     *
+     *  - GESHI_NO_LINE_NUMBERS: Line numbers will not be displayed
+     *  - GESHI_NORMAL_LINE_NUMBERS: Line numbers will be displayed
+     *  - GESHI_FANCY_LINE_NUMBERS: Fancy line numbers will be displayed
+     *
+     * For fancy line numbers, the second parameter is used to signal which lines
+     * are to be fancy. For example, if the value of this parameter is 5 then every
+     * 5th line will be fancy.
+     *
+     * @param int How line numbers should be displayed
+     * @param int Defines which lines are fancy
+     * @since 1.0.0
+     */
+    function enable_line_numbers($flag, $nth_row = 5) {
+        if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag
+            && GESHI_FANCY_LINE_NUMBERS != $flag) {
+            $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE;
+        }
+        $this->line_numbers = $flag;
+        $this->line_nth_row = $nth_row;
+    }
+
+    /**
+     * Sets wether spans and other HTML markup generated by GeSHi can
+     * span over multiple lines or not. Defaults to true to reduce overhead.
+     * Set it to false if you want to manipulate the output or manually display
+     * the code in an ordered list.
+     *
+     * @param boolean Wether multiline spans are allowed or not
+     * @since 1.0.7.22
+     */
+    function enable_multiline_span($flag) {
+        $this->allow_multiline_span = (bool) $flag;
+    }
+
+    /**
+     * Get current setting for multiline spans, see GeSHi->enable_multiline_span().
+     *
+     * @see enable_multiline_span
+     * @return bool
+     */
+    function get_multiline_span() {
+        return $this->allow_multiline_span;
+    }
+
+    /**
+     * Sets the style for a keyword group. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the keyword group to change the styles of
+     * @param string  The style to make the keywords
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_keyword_group_style($key, $style, $preserve_defaults = false) {
+        //Set the style for this keyword group
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['KEYWORDS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['KEYWORDS'][$key] .= $style;
+        }
+
+        //Update the lexic permissions
+        if (!isset($this->lexic_permissions['KEYWORDS'][$key])) {
+            $this->lexic_permissions['KEYWORDS'][$key] = true;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for a keyword group
+     *
+     * @param int     The key of the keyword group to turn on or off
+     * @param boolean Whether to turn highlighting for that group on or off
+     * @since 1.0.0
+     */
+    function set_keyword_group_highlighting($key, $flag = true) {
+        $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for comment groups.  If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the comment group to change the styles of
+     * @param string  The style to make the comments
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_comments_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['COMMENTS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['COMMENTS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for comment groups
+     *
+     * @param int     The key of the comment group to turn on or off
+     * @param boolean Whether to turn highlighting for that group on or off
+     * @since 1.0.0
+     */
+    function set_comments_highlighting($key, $flag = true) {
+        $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for escaped characters. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the escape characters
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['ESCAPE_CHAR'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for escaped characters
+     *
+     * @param boolean Whether to turn highlighting for escape characters on or off
+     * @since 1.0.0
+     */
+    function set_escape_characters_highlighting($flag = true) {
+        $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for brackets. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * This method is DEPRECATED: use set_symbols_style instead.
+     * This method will be removed in 1.2.X
+     *
+     * @param string  The style to make the brackets
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     * @deprecated In favour of set_symbols_style
+     */
+    function set_brackets_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['BRACKETS'][0] = $style;
+        } else {
+            $this->language_data['STYLES']['BRACKETS'][0] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for brackets
+     *
+     * This method is DEPRECATED: use set_symbols_highlighting instead.
+     * This method will be remove in 1.2.X
+     *
+     * @param boolean Whether to turn highlighting for brackets on or off
+     * @since 1.0.0
+     * @deprecated In favour of set_symbols_highlighting
+     */
+    function set_brackets_highlighting($flag) {
+        $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for symbols. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the symbols
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of symbols for which style should be set.
+     * @since 1.0.1
+     */
+    function set_symbols_style($style, $preserve_defaults = false, $group = 0) {
+        // Update the style of symbols
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['SYMBOLS'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['SYMBOLS'][$group] .= $style;
+        }
+
+        // For backward compatibility
+        if (0 == $group) {
+            $this->set_brackets_style ($style, $preserve_defaults);
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for symbols
+     *
+     * @param boolean Whether to turn highlighting for symbols on or off
+     * @since 1.0.0
+     */
+    function set_symbols_highlighting($flag) {
+        // Update lexic permissions for this symbol group
+        $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false;
+
+        // For backward compatibility
+        $this->set_brackets_highlighting ($flag);
+    }
+
+    /**
+     * Sets the styles for strings. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the escape characters
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_strings_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['STRINGS'][0] = $style;
+        } else {
+            $this->language_data['STYLES']['STRINGS'][0] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for strings
+     *
+     * @param boolean Whether to turn highlighting for strings on or off
+     * @since 1.0.0
+     */
+    function set_strings_highlighting($flag) {
+        $this->lexic_permissions['STRINGS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for strict code blocks. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the script blocks
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @param int     Tells the group of script blocks for which style should be set.
+     * @since 1.0.8.4
+     */
+    function set_script_style($style, $preserve_defaults = false, $group = 0) {
+        // Update the style of symbols
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['SCRIPT'][$group] = $style;
+        } else {
+            $this->language_data['STYLES']['SCRIPT'][$group] .= $style;
+        }
+    }
+
+    /**
+     * Sets the styles for numbers. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the numbers
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_numbers_style($style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['NUMBERS'][0] = $style;
+        } else {
+            $this->language_data['STYLES']['NUMBERS'][0] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for numbers
+     *
+     * @param boolean Whether to turn highlighting for numbers on or off
+     * @since 1.0.0
+     */
+    function set_numbers_highlighting($flag) {
+        $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for methods. $key is a number that references the
+     * appropriate "object splitter" - see the language file for the language
+     * you are highlighting to get this number. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param int     The key of the object splitter to change the styles of
+     * @param string  The style to make the methods
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_methods_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['METHODS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['METHODS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for methods
+     *
+     * @param boolean Whether to turn highlighting for methods on or off
+     * @since 1.0.0
+     */
+    function set_methods_highlighting($flag) {
+        $this->lexic_permissions['METHODS'] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets the styles for regexps. If $preserve_defaults is
+     * true, then styles are merged with the default styles, with the
+     * user defined styles having priority
+     *
+     * @param string  The style to make the regular expression matches
+     * @param boolean Whether to merge the new styles with the old or just
+     *                to overwrite them
+     * @since 1.0.0
+     */
+    function set_regexps_style($key, $style, $preserve_defaults = false) {
+        if (!$preserve_defaults) {
+            $this->language_data['STYLES']['REGEXPS'][$key] = $style;
+        } else {
+            $this->language_data['STYLES']['REGEXPS'][$key] .= $style;
+        }
+    }
+
+    /**
+     * Turns highlighting on/off for regexps
+     *
+     * @param int     The key of the regular expression group to turn on or off
+     * @param boolean Whether to turn highlighting for the regular expression group on or off
+     * @since 1.0.0
+     */
+    function set_regexps_highlighting($key, $flag) {
+        $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false;
+    }
+
+    /**
+     * Sets whether a set of keywords are checked for in a case sensitive manner
+     *
+     * @param int The key of the keyword group to change the case sensitivity of
+     * @param boolean Whether to check in a case sensitive manner or not
+     * @since 1.0.0
+     */
+    function set_case_sensitivity($key, $case) {
+        $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false;
+    }
+
+    /**
+     * Sets the case that keywords should use when found. Use the constants:
+     *
+     *  - GESHI_CAPS_NO_CHANGE: leave keywords as-is
+     *  - GESHI_CAPS_UPPER: convert all keywords to uppercase where found
+     *  - GESHI_CAPS_LOWER: convert all keywords to lowercase where found
+     *
+     * @param int A constant specifying what to do with matched keywords
+     * @since 1.0.1
+     */
+    function set_case_keywords($case) {
+        if (in_array($case, array(
+            GESHI_CAPS_NO_CHANGE, GESHI_CAPS_UPPER, GESHI_CAPS_LOWER))) {
+            $this->language_data['CASE_KEYWORDS'] = $case;
+        }
+    }
+
+    /**
+     * Sets how many spaces a tab is substituted for
+     *
+     * Widths below zero are ignored
+     *
+     * @param int The tab width
+     * @since 1.0.0
+     */
+    function set_tab_width($width) {
+        $this->tab_width = intval($width);
+
+        //Check if it fit's the constraints:
+        if ($this->tab_width < 1) {
+            //Return it to the default
+            $this->tab_width = 8;
+        }
+    }
+
+    /**
+     * Sets whether or not to use tab-stop width specifed by language
+     *
+     * @param boolean Whether to use language-specific tab-stop widths
+     * @since 1.0.7.20
+     */
+    function set_use_language_tab_width($use) {
+        $this->use_language_tab_width = (bool) $use;
+    }
+
+    /**
+     * Returns the tab width to use, based on the current language and user
+     * preference
+     *
+     * @return int Tab width
+     * @since 1.0.7.20
+     */
+    function get_real_tab_width() {
+        if (!$this->use_language_tab_width ||
+            !isset($this->language_data['TAB_WIDTH'])) {
+            return $this->tab_width;
+        } else {
+            return $this->language_data['TAB_WIDTH'];
+        }
+    }
+
+    /**
+     * Enables/disables strict highlighting. Default is off, calling this
+     * method without parameters will turn it on. See documentation
+     * for more details on strict mode and where to use it.
+     *
+     * @param boolean Whether to enable strict mode or not
+     * @since 1.0.0
+     */
+    function enable_strict_mode($mode = true) {
+        if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) {
+            $this->strict_mode = ($mode) ? GESHI_ALWAYS : GESHI_NEVER;
+        }
+    }
+
+    /**
+     * Disables all highlighting
+     *
+     * @since 1.0.0
+     * @todo  Rewrite with array traversal
+     * @deprecated In favour of enable_highlighting
+     */
+    function disable_highlighting() {
+        $this->enable_highlighting(false);
+    }
+
+    /**
+     * Enables all highlighting
+     *
+     * The optional flag parameter was added in version 1.0.7.21 and can be used
+     * to enable (true) or disable (false) all highlighting.
+     *
+     * @since 1.0.0
+     * @param boolean A flag specifying whether to enable or disable all highlighting
+     * @todo  Rewrite with array traversal
+     */
+    function enable_highlighting($flag = true) {
+        $flag = $flag ? true : false;
+        foreach ($this->lexic_permissions as $key => $value) {
+            if (is_array($value)) {
+                foreach ($value as $k => $v) {
+                    $this->lexic_permissions[$key][$k] = $flag;
+                }
+            } else {
+                $this->lexic_permissions[$key] = $flag;
+            }
+        }
+
+        // Context blocks
+        $this->enable_important_blocks = $flag;
+    }
+
+    /**
+     * Given a file extension, this method returns either a valid geshi language
+     * name, or the empty string if it couldn't be found
+     *
+     * @param string The extension to get a language name for
+     * @param array  A lookup array to use instead of the default one
+     * @since 1.0.5
+     * @todo Re-think about how this method works (maybe make it private and/or make it
+     *       a extension->lang lookup?)
+     * @todo static?
+     */
+    function get_language_name_from_extension( $extension, $lookup = array() ) {
+        if ( !is_array($lookup) || empty($lookup)) {
+            $lookup = array(
+                'abap' => array('abap'),
+                'actionscript' => array('as'),
+                'ada' => array('a', 'ada', 'adb', 'ads'),
+                'apache' => array('conf'),
+                'asm' => array('ash', 'asm', 'inc'),
+                'asp' => array('asp'),
+                'bash' => array('sh'),
+                'bf' => array('bf'),
+                'c' => array('c', 'h'),
+                'c_mac' => array('c', 'h'),
+                'caddcl' => array(),
+                'cadlisp' => array(),
+                'cdfg' => array('cdfg'),
+                'cobol' => array('cbl'),
+                'cpp' => array('cpp', 'hpp', 'C', 'H', 'CPP', 'HPP'),
+                'csharp' => array('cs'),
+                'css' => array('css'),
+                'd' => array('d'),
+                'delphi' => array('dpk', 'dpr', 'pp', 'pas'),
+                'diff' => array('diff', 'patch'),
+                'dos' => array('bat', 'cmd'),
+                'gettext' => array('po', 'pot'),
+                'gml' => array('gml'),
+                'gnuplot' => array('plt'),
+                'groovy' => array('groovy'),
+                'haskell' => array('hs'),
+                'html4strict' => array('html', 'htm'),
+                'ini' => array('ini', 'desktop'),
+                'java' => array('java'),
+                'javascript' => array('js'),
+                'klonec' => array('kl1'),
+                'klonecpp' => array('klx'),
+                'latex' => array('tex'),
+                'lisp' => array('lisp'),
+                'lua' => array('lua'),
+                'matlab' => array('m'),
+                'mpasm' => array(),
+                'mysql' => array('sql'),
+                'nsis' => array(),
+                'objc' => array(),
+                'oobas' => array(),
+                'oracle8' => array(),
+                'oracle10' => array(),
+                'pascal' => array('pas'),
+                'perl' => array('pl', 'pm'),
+                'php' => array('php', 'php5', 'phtml', 'phps'),
+                'povray' => array('pov'),
+                'providex' => array('pvc', 'pvx'),
+                'prolog' => array('pl'),
+                'python' => array('py'),
+                'qbasic' => array('bi'),
+                'reg' => array('reg'),
+                'ruby' => array('rb'),
+                'sas' => array('sas'),
+                'scala' => array('scala'),
+                'scheme' => array('scm'),
+                'scilab' => array('sci'),
+                'smalltalk' => array('st'),
+                'smarty' => array(),
+                'tcl' => array('tcl'),
+                'vb' => array('bas'),
+                'vbnet' => array(),
+                'visualfoxpro' => array(),
+                'whitespace' => array('ws'),
+                'xml' => array('xml', 'svg', 'xrc'),
+                'z80' => array('z80', 'asm', 'inc')
+            );
+        }
+
+        foreach ($lookup as $lang => $extensions) {
+            if (in_array($extension, $extensions)) {
+                return $lang;
+            }
+        }
+        return '';
+    }
+
+    /**
+     * Given a file name, this method loads its contents in, and attempts
+     * to set the language automatically. An optional lookup table can be
+     * passed for looking up the language name. If not specified a default
+     * table is used
+     *
+     * The language table is in the form
+     * <pre>array(
+     *   'lang_name' => array('extension', 'extension', ...),
+     *   'lang_name' ...
+     * );</pre>
+     *
+     * @param string The filename to load the source from
+     * @param array  A lookup array to use instead of the default one
+     * @todo Complete rethink of this and above method
+     * @since 1.0.5
+     */
+    function load_from_file($file_name, $lookup = array()) {
+        if (is_readable($file_name)) {
+            $this->set_source(file_get_contents($file_name));
+            $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup));
+        } else {
+            $this->error = GESHI_ERROR_FILE_NOT_READABLE;
+        }
+    }
+
+    /**
+     * Adds a keyword to a keyword group for highlighting
+     *
+     * @param int    The key of the keyword group to add the keyword to
+     * @param string The word to add to the keyword group
+     * @since 1.0.0
+     */
+    function add_keyword($key, $word) {
+        if (!in_array($word, $this->language_data['KEYWORDS'][$key])) {
+            $this->language_data['KEYWORDS'][$key][] = $word;
+
+            //NEW in 1.0.8 don't recompile the whole optimized regexp, simply append it
+            if ($this->parse_cache_built) {
+                $subkey = count($this->language_data['CACHED_KEYWORD_LISTS'][$key]) - 1;
+                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$subkey] .= '|' . preg_quote($word, '/');
+            }
+        }
+    }
+
+    /**
+     * Removes a keyword from a keyword group
+     *
+     * @param int    The key of the keyword group to remove the keyword from
+     * @param string The word to remove from the keyword group
+     * @param bool   Wether to automatically recompile the optimized regexp list or not.
+     *               Note: if you set this to false and @see GeSHi->parse_code() was already called once,
+     *               for the current language, you have to manually call @see GeSHi->optimize_keyword_group()
+     *               or the removed keyword will stay in cache and still be highlighted! On the other hand
+     *               it might be too expensive to recompile the regexp list for every removal if you want to
+     *               remove a lot of keywords.
+     * @since 1.0.0
+     */
+    function remove_keyword($key, $word, $recompile = true) {
+        $key_to_remove = array_search($word, $this->language_data['KEYWORDS'][$key]);
+        if ($key_to_remove !== false) {
+            unset($this->language_data['KEYWORDS'][$key][$key_to_remove]);
+
+            //NEW in 1.0.8, optionally recompile keyword group
+            if ($recompile && $this->parse_cache_built) {
+                $this->optimize_keyword_group($key);
+            }
+        }
+    }
+
+    /**
+     * Creates a new keyword group
+     *
+     * @param int    The key of the keyword group to create
+     * @param string The styles for the keyword group
+     * @param boolean Whether the keyword group is case sensitive ornot
+     * @param array  The words to use for the keyword group
+     * @since 1.0.0
+     */
+    function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) {
+        $words = (array) $words;
+        if  (empty($words)) {
+            // empty word lists mess up highlighting
+            return false;
+        }
+
+        //Add the new keyword group internally
+        $this->language_data['KEYWORDS'][$key] = $words;
+        $this->lexic_permissions['KEYWORDS'][$key] = true;
+        $this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive;
+        $this->language_data['STYLES']['KEYWORDS'][$key] = $styles;
+
+        //NEW in 1.0.8, cache keyword regexp
+        if ($this->parse_cache_built) {
+            $this->optimize_keyword_group($key);
+        }
+    }
+
+    /**
+     * Removes a keyword group
+     *
+     * @param int    The key of the keyword group to remove
+     * @since 1.0.0
+     */
+    function remove_keyword_group ($key) {
+        //Remove the keyword group internally
+        unset($this->language_data['KEYWORDS'][$key]);
+        unset($this->lexic_permissions['KEYWORDS'][$key]);
+        unset($this->language_data['CASE_SENSITIVE'][$key]);
+        unset($this->language_data['STYLES']['KEYWORDS'][$key]);
+
+        //NEW in 1.0.8
+        unset($this->language_data['CACHED_KEYWORD_LISTS'][$key]);
+    }
+
+    /**
+     * compile optimized regexp list for keyword group
+     *
+     * @param int   The key of the keyword group to compile & optimize
+     * @since 1.0.8
+     */
+    function optimize_keyword_group($key) {
+        $this->language_data['CACHED_KEYWORD_LISTS'][$key] =
+            $this->optimize_regexp_list($this->language_data['KEYWORDS'][$key]);
+        $space_as_whitespace = false;
+        if(isset($this->language_data['PARSER_CONTROL'])) {
+            if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'])) {
+                    $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS']['SPACE_AS_WHITESPACE'];
+                }
+                if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                    if(isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'])) {
+                        $space_as_whitespace = $this->language_data['PARSER_CONTROL']['KEYWORDS'][$key]['SPACE_AS_WHITESPACE'];
+                    }
+                }
+            }
+        }
+        if($space_as_whitespace) {
+            foreach($this->language_data['CACHED_KEYWORD_LISTS'][$key] as $rxk => $rxv) {
+                $this->language_data['CACHED_KEYWORD_LISTS'][$key][$rxk] =
+                    str_replace(" ", "\\s+", $rxv);
+            }
+        }
+    }
+
+    /**
+     * Sets the content of the header block
+     *
+     * @param string The content of the header block
+     * @since 1.0.2
+     */
+    function set_header_content($content) {
+        $this->header_content = $content;
+    }
+
+    /**
+     * Sets the content of the footer block
+     *
+     * @param string The content of the footer block
+     * @since 1.0.2
+     */
+    function set_footer_content($content) {
+        $this->footer_content = $content;
+    }
+
+    /**
+     * Sets the style for the header content
+     *
+     * @param string The style for the header content
+     * @since 1.0.2
+     */
+    function set_header_content_style($style) {
+        $this->header_content_style = $style;
+    }
+
+    /**
+     * Sets the style for the footer content
+     *
+     * @param string The style for the footer content
+     * @since 1.0.2
+     */
+    function set_footer_content_style($style) {
+        $this->footer_content_style = $style;
+    }
+
+    /**
+     * Sets whether to force a surrounding block around
+     * the highlighted code or not
+     *
+     * @param boolean Tells whether to enable or disable this feature
+     * @since 1.0.7.20
+     */
+    function enable_inner_code_block($flag) {
+        $this->force_code_block = (bool)$flag;
+    }
+
+    /**
+     * Sets the base URL to be used for keywords
+     *
+     * @param int The key of the keyword group to set the URL for
+     * @param string The URL to set for the group. If {FNAME} is in
+     *               the url somewhere, it is replaced by the keyword
+     *               that the URL is being made for
+     * @since 1.0.2
+     */
+    function set_url_for_keyword_group($group, $url) {
+        $this->language_data['URLS'][$group] = $url;
+    }
+
+    /**
+     * Sets styles for links in code
+     *
+     * @param int A constant that specifies what state the style is being
+     *            set for - e.g. :hover or :visited
+     * @param string The styles to use for that state
+     * @since 1.0.2
+     */
+    function set_link_styles($type, $styles) {
+        $this->link_styles[$type] = $styles;
+    }
+
+    /**
+     * Sets the target for links in code
+     *
+     * @param string The target for links in the code, e.g. _blank
+     * @since 1.0.3
+     */
+    function set_link_target($target) {
+        if (!$target) {
+            $this->link_target = '';
+        } else {
+            $this->link_target = ' target="' . $target . '"';
+        }
+    }
+
+    /**
+     * Sets styles for important parts of the code
+     *
+     * @param string The styles to use on important parts of the code
+     * @since 1.0.2
+     */
+    function set_important_styles($styles) {
+        $this->important_styles = $styles;
+    }
+
+    /**
+     * Sets whether context-important blocks are highlighted
+     *
+     * @param boolean Tells whether to enable or disable highlighting of important blocks
+     * @todo REMOVE THIS SHIZ FROM GESHI!
+     * @deprecated
+     * @since 1.0.2
+     */
+    function enable_important_blocks($flag) {
+        $this->enable_important_blocks = ( $flag ) ? true : false;
+    }
+
+    /**
+     * Whether CSS IDs should be added to each line
+     *
+     * @param boolean If true, IDs will be added to each line.
+     * @since 1.0.2
+     */
+    function enable_ids($flag = true) {
+        $this->add_ids = ($flag) ? true : false;
+    }
+
+    /**
+     * Specifies which lines to highlight extra
+     *
+     * The extra style parameter was added in 1.0.7.21.
+     *
+     * @param mixed An array of line numbers to highlight, or just a line
+     *              number on its own.
+     * @param string A string specifying the style to use for this line.
+     *              If null is specified, the default style is used.
+     *              If false is specified, the line will be removed from
+     *              special highlighting
+     * @since 1.0.2
+     * @todo  Some data replication here that could be cut down on
+     */
+    function highlight_lines_extra($lines, $style = null) {
+        if (is_array($lines)) {
+            //Split up the job using single lines at a time
+            foreach ($lines as $line) {
+                $this->highlight_lines_extra($line, $style);
+            }
+        } else {
+            //Mark the line as being highlighted specially
+            $lines = intval($lines);
+            $this->highlight_extra_lines[$lines] = $lines;
+
+            //Decide on which style to use
+            if ($style === null) { //Check if we should use default style
+                unset($this->highlight_extra_lines_styles[$lines]);
+            } else if ($style === false) { //Check if to remove this line
+                unset($this->highlight_extra_lines[$lines]);
+                unset($this->highlight_extra_lines_styles[$lines]);
+            } else {
+                $this->highlight_extra_lines_styles[$lines] = $style;
+            }
+        }
+    }
+
+    /**
+     * Sets the style for extra-highlighted lines
+     *
+     * @param string The style for extra-highlighted lines
+     * @since 1.0.2
+     */
+    function set_highlight_lines_extra_style($styles) {
+        $this->highlight_extra_lines_style = $styles;
+    }
+
+    /**
+     * Sets the line-ending
+     *
+     * @param string The new line-ending
+     * @since 1.0.2
+     */
+    function set_line_ending($line_ending) {
+        $this->line_ending = (string)$line_ending;
+    }
+
+    /**
+     * Sets what number line numbers should start at. Should
+     * be a positive integer, and will be converted to one.
+     *
+     * <b>Warning:</b> Using this method will add the "start"
+     * attribute to the &lt;ol&gt; that is used for line numbering.
+     * This is <b>not</b> valid XHTML strict, so if that's what you
+     * care about then don't use this method. Firefox is getting
+     * support for the CSS method of doing this in 1.1 and Opera
+     * has support for the CSS method, but (of course) IE doesn't
+     * so it's not worth doing it the CSS way yet.
+     *
+     * @param int The number to start line numbers at
+     * @since 1.0.2
+     */
+    function start_line_numbers_at($number) {
+        $this->line_numbers_start = abs(intval($number));
+    }
+
+    /**
+     * Sets the encoding used for htmlspecialchars(), for international
+     * support.
+     *
+     * NOTE: This is not needed for now because htmlspecialchars() is not
+     * being used (it has a security hole in PHP4 that has not been patched).
+     * Maybe in a future version it may make a return for speed reasons, but
+     * I doubt it.
+     *
+     * @param string The encoding to use for the source
+     * @since 1.0.3
+     */
+    function set_encoding($encoding) {
+        if ($encoding) {
+          $this->encoding = strtolower($encoding);
+        }
+    }
+
+    /**
+     * Turns linking of keywords on or off.
+     *
+     * @param boolean If true, links will be added to keywords
+     * @since 1.0.2
+     */
+    function enable_keyword_links($enable = true) {
+        $this->keyword_links = (bool) $enable;
+    }
+
+    /**
+     * Setup caches needed for styling. This is automatically called in
+     * parse_code() and get_stylesheet() when appropriate. This function helps
+     * stylesheet generators as they rely on some style information being
+     * preprocessed
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function build_style_cache() {
+        //Build the style cache needed to highlight numbers appropriate
+        if($this->lexic_permissions['NUMBERS']) {
+            //First check what way highlighting information for numbers are given
+            if(!isset($this->language_data['NUMBERS'])) {
+                $this->language_data['NUMBERS'] = 0;
+            }
+
+            if(is_array($this->language_data['NUMBERS'])) {
+                $this->language_data['NUMBERS_CACHE'] = $this->language_data['NUMBERS'];
+            } else {
+                $this->language_data['NUMBERS_CACHE'] = array();
+                if(!$this->language_data['NUMBERS']) {
+                    $this->language_data['NUMBERS'] =
+                        GESHI_NUMBER_INT_BASIC |
+                        GESHI_NUMBER_FLT_NONSCI;
+                }
+
+                for($i = 0, $j = $this->language_data['NUMBERS']; $j > 0; ++$i, $j>>=1) {
+                    //Rearrange style indices if required ...
+                    if(isset($this->language_data['STYLES']['NUMBERS'][1<<$i])) {
+                        $this->language_data['STYLES']['NUMBERS'][$i] =
+                            $this->language_data['STYLES']['NUMBERS'][1<<$i];
+                        unset($this->language_data['STYLES']['NUMBERS'][1<<$i]);
+                    }
+
+                    //Check if this bit is set for highlighting
+                    if($j&1) {
+                        //So this bit is set ...
+                        //Check if it belongs to group 0 or the actual stylegroup
+                        if(isset($this->language_data['STYLES']['NUMBERS'][$i])) {
+                            $this->language_data['NUMBERS_CACHE'][$i] = 1 << $i;
+                        } else {
+                            if(!isset($this->language_data['NUMBERS_CACHE'][0])) {
+                                $this->language_data['NUMBERS_CACHE'][0] = 0;
+                            }
+                            $this->language_data['NUMBERS_CACHE'][0] |= 1 << $i;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Setup caches needed for parsing. This is automatically called in parse_code() when appropriate.
+     * This function makes stylesheet generators much faster as they do not need these caches.
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function build_parse_cache() {
+        // cache symbol regexp
+        //As this is a costy operation, we avoid doing it for multiple groups ...
+        //Instead we perform it for all symbols at once.
+        //
+        //For this to work, we need to reorganize the data arrays.
+        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
+            $this->language_data['MULTIPLE_SYMBOL_GROUPS'] = count($this->language_data['STYLES']['SYMBOLS']) > 1;
+
+            $this->language_data['SYMBOL_DATA'] = array();
+            $symbol_preg_multi = array(); // multi char symbols
+            $symbol_preg_single = array(); // single char symbols
+            foreach ($this->language_data['SYMBOLS'] as $key => $symbols) {
+                if (is_array($symbols)) {
+                    foreach ($symbols as $sym) {
+                        $sym = $this->hsc($sym);
+                        if (!isset($this->language_data['SYMBOL_DATA'][$sym])) {
+                            $this->language_data['SYMBOL_DATA'][$sym] = $key;
+                            if (isset($sym[1])) { // multiple chars
+                                $symbol_preg_multi[] = preg_quote($sym, '/');
+                            } else { // single char
+                                if ($sym == '-') {
+                                    // don't trigger range out of order error
+                                    $symbol_preg_single[] = '\-';
+                                } else {
+                                    $symbol_preg_single[] = preg_quote($sym, '/');
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    $symbols = $this->hsc($symbols);
+                    if (!isset($this->language_data['SYMBOL_DATA'][$symbols])) {
+                        $this->language_data['SYMBOL_DATA'][$symbols] = 0;
+                        if (isset($symbols[1])) { // multiple chars
+                            $symbol_preg_multi[] = preg_quote($symbols, '/');
+                        } else if ($symbols == '-') {
+                            // don't trigger range out of order error
+                            $symbol_preg_single[] = '\-';
+                        } else { // single char
+                            $symbol_preg_single[] = preg_quote($symbols, '/');
+                        }
+                    }
+                }
+            }
+
+            //Now we have an array with each possible symbol as the key and the style as the actual data.
+            //This way we can set the correct style just the moment we highlight ...
+            //
+            //Now we need to rewrite our array to get a search string that
+            $symbol_preg = array();
+            if (!empty($symbol_preg_multi)) {
+                rsort($symbol_preg_multi);
+                $symbol_preg[] = implode('|', $symbol_preg_multi);
+            }
+            if (!empty($symbol_preg_single)) {
+                rsort($symbol_preg_single);
+                $symbol_preg[] = '[' . implode('', $symbol_preg_single) . ']';
+            }
+            $this->language_data['SYMBOL_SEARCH'] = implode("|", $symbol_preg);
+        }
+
+        // cache optimized regexp for keyword matching
+        // remove old cache
+        $this->language_data['CACHED_KEYWORD_LISTS'] = array();
+        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
+            if (!isset($this->lexic_permissions['KEYWORDS'][$key]) ||
+                    $this->lexic_permissions['KEYWORDS'][$key]) {
+                $this->optimize_keyword_group($key);
+            }
+        }
+
+        // brackets
+        if ($this->lexic_permissions['BRACKETS']) {
+            $this->language_data['CACHE_BRACKET_MATCH'] = array('[', ']', '(', ')', '{', '}');
+            if (!$this->use_classes && isset($this->language_data['STYLES']['BRACKETS'][0])) {
+                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#91;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#93;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#40;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#41;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#123;|>',
+                    '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">&#125;|>',
+                );
+            }
+            else {
+                $this->language_data['CACHE_BRACKET_REPLACE'] = array(
+                    '<| class="br0">&#91;|>',
+                    '<| class="br0">&#93;|>',
+                    '<| class="br0">&#40;|>',
+                    '<| class="br0">&#41;|>',
+                    '<| class="br0">&#123;|>',
+                    '<| class="br0">&#125;|>',
+                );
+            }
+        }
+
+        //Build the parse cache needed to highlight numbers appropriate
+        if($this->lexic_permissions['NUMBERS']) {
+            //Check if the style rearrangements have been processed ...
+            //This also does some preprocessing to check which style groups are useable ...
+            if(!isset($this->language_data['NUMBERS_CACHE'])) {
+                $this->build_style_cache();
+            }
+
+            //Number format specification
+            //All this formats are matched case-insensitively!
+            static $numbers_format = array(
+                GESHI_NUMBER_INT_BASIC =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)(?![0-9a-z]|\.(?!(?m:$)))',
+                GESHI_NUMBER_INT_CSTYLE =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])([1-9]\d*?|0)l(?![0-9a-z\.])',
+                GESHI_NUMBER_BIN_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[01]+?b(?![0-9a-z\.])',
+                GESHI_NUMBER_BIN_PREFIX_PERCENT =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])%[01]+?(?![0-9a-z\.])',
+                GESHI_NUMBER_BIN_PREFIX_0B =>
+                    '(?<![0-9a-z_\.%])(?<![\d\.]e[+\-])0b[01]+?(?![0-9a-z\.])',
+                GESHI_NUMBER_OCT_PREFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0[0-7]+?(?![0-9a-z\.])',
+                GESHI_NUMBER_OCT_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])[0-7]+?o(?![0-9a-z\.])',
+                GESHI_NUMBER_HEX_PREFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])0x[0-9a-f]+?(?![0-9a-z\.])',
+                GESHI_NUMBER_HEX_SUFFIX =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d[0-9a-f]*?h(?![0-9a-z\.])',
+                GESHI_NUMBER_FLT_NONSCI =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\d+?\.\d+?(?![0-9a-z\.])',
+                GESHI_NUMBER_FLT_NONSCI_F =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)f(?![0-9a-z\.])',
+                GESHI_NUMBER_FLT_SCI_SHORT =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])\.\d+?(?:e[+\-]?\d+?)?(?![0-9a-z\.])',
+                GESHI_NUMBER_FLT_SCI_ZERO =>
+                    '(?<![0-9a-z_\.])(?<![\d\.]e[+\-])(?:\d+?(?:\.\d*?)?|\.\d+?)(?:e[+\-]?\d+?)?(?![0-9a-z\.])'
+                );
+
+            //At this step we have an associative array with flag groups for a
+            //specific style or an string denoting a regexp given its index.
+            $this->language_data['NUMBERS_RXCACHE'] = array();
+            foreach($this->language_data['NUMBERS_CACHE'] as $key => $rxdata) {
+                if(is_string($rxdata)) {
+                    $regexp = $rxdata;
+                } else {
+                    //This is a bitfield of number flags to highlight:
+                    //Build an array, implode them together and make this the actual RX
+                    $rxuse = array();
+                    for($i = 1; $i <= $rxdata; $i<<=1) {
+                        if($rxdata & $i) {
+                            $rxuse[] = $numbers_format[$i];
+                        }
+                    }
+                    $regexp = implode("|", $rxuse);
+                }
+
+                $this->language_data['NUMBERS_RXCACHE'][$key] =
+                    "/(?<!<\|\/)(?<!<\|!REG3XP)(?<!<\|\/NUM!)(?<!\d\/>)($regexp)(?!\|>)(?![^\"\|\>\<]+<)/i";
+            }
+        }
+
+        $this->parse_cache_built = true;
+    }
+
+    /**
+     * Returns the code in $this->source, highlighted and surrounded by the
+     * nessecary HTML.
+     *
+     * This should only be called ONCE, cos it's SLOW! If you want to highlight
+     * the same source multiple times, you're better off doing a whole lot of
+     * str_replaces to replace the &lt;span&gt;s
+     *
+     * @since 1.0.0
+     */
+    function parse_code () {
+        // Start the timer
+        $start_time = microtime();
+
+        // Firstly, if there is an error, we won't highlight
+        if ($this->error) {
+            //Escape the source for output
+            $result = $this->hsc($this->source);
+
+            //This fix is related to SF#1923020, but has to be applied regardless of
+            //actually highlighting symbols.
+            $result = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $result);
+
+            // Timing is irrelevant
+            $this->set_time($start_time, $start_time);
+            $this->finalise($result);
+            return $result;
+        }
+
+        // make sure the parse cache is up2date
+        if (!$this->parse_cache_built) {
+            $this->build_parse_cache();
+        }
+
+        // Replace all newlines to a common form.
+        $code = str_replace("\r\n", "\n", $this->source);
+        $code = str_replace("\r", "\n", $code);
+
+        // Add spaces for regular expression matching and line numbers
+//        $code = "\n" . $code . "\n";
+
+        // Initialise various stuff
+        $length           = strlen($code);
+        $COMMENT_MATCHED  = false;
+        $stuff_to_parse   = '';
+        $endresult        = '';
+
+        // "Important" selections are handled like multiline comments
+        // @todo GET RID OF THIS SHIZ
+        if ($this->enable_important_blocks) {
+            $this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT;
+        }
+
+        if ($this->strict_mode) {
+            // Break the source into bits. Each bit will be a portion of the code
+            // within script delimiters - for example, HTML between < and >
+            $k = 0;
+            $parts = array();
+            $matches = array();
+            $next_match_pointer = null;
+            // we use a copy to unset delimiters on demand (when they are not found)
+            $delim_copy = $this->language_data['SCRIPT_DELIMITERS'];
+            $i = 0;
+            while ($i < $length) {
+                $next_match_pos = $length + 1; // never true
+                foreach ($delim_copy as $dk => $delimiters) {
+                    if(is_array($delimiters)) {
+                        foreach ($delimiters as $open => $close) {
+                            // make sure the cache is setup properly
+                            if (!isset($matches[$dk][$open])) {
+                                $matches[$dk][$open] = array(
+                                    'next_match' => -1,
+                                    'dk' => $dk,
+
+                                    'open' => $open, // needed for grouping of adjacent code blocks (see below)
+                                    'open_strlen' => strlen($open),
+
+                                    'close' => $close,
+                                    'close_strlen' => strlen($close),
+                                );
+                            }
+                            // Get the next little bit for this opening string
+                            if ($matches[$dk][$open]['next_match'] < $i) {
+                                // only find the next pos if it was not already cached
+                                $open_pos = strpos($code, $open, $i);
+                                if ($open_pos === false) {
+                                    // no match for this delimiter ever
+                                    unset($delim_copy[$dk][$open]);
+                                    continue;
+                                }
+                                $matches[$dk][$open]['next_match'] = $open_pos;
+                            }
+                            if ($matches[$dk][$open]['next_match'] < $next_match_pos) {
+                                //So we got a new match, update the close_pos
+                                $matches[$dk][$open]['close_pos'] =
+                                    strpos($code, $close, $matches[$dk][$open]['next_match']+1);
+
+                                $next_match_pointer =& $matches[$dk][$open];
+                                $next_match_pos = $matches[$dk][$open]['next_match'];
+                            }
+                        }
+                    } else {
+                        //So we should match an RegExp as Strict Block ...
+                        /**
+                         * The value in $delimiters is expected to be an RegExp
+                         * containing exactly 2 matching groups:
+                         *  - Group 1 is the opener
+                         *  - Group 2 is the closer
+                         */
+                        if(!GESHI_PHP_PRE_433 && //Needs proper rewrite to work with PHP >=4.3.0; 4.3.3 is guaranteed to work.
+                            preg_match($delimiters, $code, $matches_rx, PREG_OFFSET_CAPTURE, $i)) {
+                            //We got a match ...
+                            if(isset($matches_rx['start']) && isset($matches_rx['end']))
+                            {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx['start'][1],
+                                    'dk' => $dk,
+
+                                    'close_strlen' => strlen($matches_rx['end'][0]),
+                                    'close_pos' => $matches_rx['end'][1],
+                                    );
+                            } else {
+                                $matches[$dk] = array(
+                                    'next_match' => $matches_rx[1][1],
+                                    'dk' => $dk,
+
+                                    'close_strlen' => strlen($matches_rx[2][0]),
+                                    'close_pos' => $matches_rx[2][1],
+                                    );
+                            }
+                        } else {
+                            // no match for this delimiter ever
+                            unset($delim_copy[$dk]);
+                            continue;
+                        }
+
+                        if ($matches[$dk]['next_match'] <= $next_match_pos) {
+                            $next_match_pointer =& $matches[$dk];
+                            $next_match_pos = $matches[$dk]['next_match'];
+                        }
+                    }
+                }
+
+                // non-highlightable text
+                $parts[$k] = array(
+                    1 => substr($code, $i, $next_match_pos - $i)
+                );
+                ++$k;
+
+                if ($next_match_pos > $length) {
+                    // out of bounds means no next match was found
+                    break;
+                }
+
+                // highlightable code
+                $parts[$k][0] = $next_match_pointer['dk'];
+
+                //Only combine for non-rx script blocks
+                if(is_array($delim_copy[$next_match_pointer['dk']])) {
+                    // group adjacent script blocks, e.g. <foobar><asdf> should be one block, not three!
+                    $i = $next_match_pos + $next_match_pointer['open_strlen'];
+                    while (true) {
+                        $close_pos = strpos($code, $next_match_pointer['close'], $i);
+                        if ($close_pos == false) {
+                            break;
+                        }
+                        $i = $close_pos + $next_match_pointer['close_strlen'];
+                        if ($i == $length) {
+                            break;
+                        }
+                        if ($code[$i] == $next_match_pointer['open'][0] && ($next_match_pointer['open_strlen'] == 1 ||
+                            substr($code, $i, $next_match_pointer['open_strlen']) == $next_match_pointer['open'])) {
+                            // merge adjacent but make sure we don't merge things like <tag><!-- comment -->
+                            foreach ($matches as $submatches) {
+                                foreach ($submatches as $match) {
+                                    if ($match['next_match'] == $i) {
+                                        // a different block already matches here!
+                                        break 3;
+                                    }
+                                }
+                            }
+                        } else {
+                            break;
+                        }
+                    }
+                } else {
+                    $close_pos = $next_match_pointer['close_pos'] + $next_match_pointer['close_strlen'];
+                    $i = $close_pos;
+                }
+
+                if ($close_pos === false) {
+                    // no closing delimiter found!
+                    $parts[$k][1] = substr($code, $next_match_pos);
+                    ++$k;
+                    break;
+                } else {
+                    $parts[$k][1] = substr($code, $next_match_pos, $i - $next_match_pos);
+                    ++$k;
+                }
+            }
+            unset($delim_copy, $next_match_pointer, $next_match_pos, $matches);
+            $num_parts = $k;
+
+            if ($num_parts == 1 && $this->strict_mode == GESHI_MAYBE) {
+                // when we have only one part, we don't have anything to highlight at all.
+                // if we have a "maybe" strict language, this should be handled as highlightable code
+                $parts = array(
+                    0 => array(
+                        0 => '',
+                        1 => ''
+                    ),
+                    1 => array(
+                        0 => null,
+                        1 => $parts[0][1]
+                    )
+                );
+                $num_parts = 2;
+            }
+
+        } else {
+            // Not strict mode - simply dump the source into
+            // the array at index 1 (the first highlightable block)
+            $parts = array(
+                0 => array(
+                    0 => '',
+                    1 => ''
+                ),
+                1 => array(
+                    0 => null,
+                    1 => $code
+                )
+            );
+            $num_parts = 2;
+        }
+
+        //Unset variables we won't need any longer
+        unset($code);
+
+        //Preload some repeatedly used values regarding hardquotes ...
+        $hq = isset($this->language_data['HARDQUOTE']) ? $this->language_data['HARDQUOTE'][0] : false;
+        $hq_strlen = strlen($hq);
+
+        //Preload if line numbers are to be generated afterwards
+        //Added a check if line breaks should be forced even without line numbers, fixes SF#1727398
+        $check_linenumbers = $this->line_numbers != GESHI_NO_LINE_NUMBERS ||
+            !empty($this->highlight_extra_lines) || !$this->allow_multiline_span;
+
+        //preload the escape char for faster checking ...
+        $escaped_escape_char = $this->hsc($this->language_data['ESCAPE_CHAR']);
+
+        // this is used for single-line comments
+        $sc_disallowed_before = "";
+        $sc_disallowed_after = "";
+
+        if (isset($this->language_data['PARSER_CONTROL'])) {
+            if (isset($this->language_data['PARSER_CONTROL']['COMMENTS'])) {
+                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'])) {
+                    $sc_disallowed_before = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'];
+                }
+                if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'])) {
+                    $sc_disallowed_after = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'];
+                }
+            }
+        }
+
+        //Fix for SF#1932083: Multichar Quotemarks unsupported
+        $is_string_starter = array();
+        if ($this->lexic_permissions['STRINGS']) {
+            foreach ($this->language_data['QUOTEMARKS'] as $quotemark) {
+                if (!isset($is_string_starter[$quotemark[0]])) {
+                    $is_string_starter[$quotemark[0]] = (string)$quotemark;
+                } else if (is_string($is_string_starter[$quotemark[0]])) {
+                    $is_string_starter[$quotemark[0]] = array(
+                        $is_string_starter[$quotemark[0]],
+                        $quotemark);
+                } else {
+                    $is_string_starter[$quotemark[0]][] = $quotemark;
+                }
+            }
+        }
+
+        // Now we go through each part. We know that even-indexed parts are
+        // code that shouldn't be highlighted, and odd-indexed parts should
+        // be highlighted
+        for ($key = 0; $key < $num_parts; ++$key) {
+            $STRICTATTRS = '';
+
+            // If this block should be highlighted...
+            if (!($key & 1)) {
+                // Else not a block to highlight
+                $endresult .= $this->hsc($parts[$key][1]);
+                unset($parts[$key]);
+                continue;
+            }
+
+            $result = '';
+            $part = $parts[$key][1];
+
+            $highlight_part = true;
+            if ($this->strict_mode && !is_null($parts[$key][0])) {
+                // get the class key for this block of code
+                $script_key = $parts[$key][0];
+                $highlight_part = $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key];
+                if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' &&
+                    $this->lexic_permissions['SCRIPT']) {
+                    // Add a span element around the source to
+                    // highlight the overall source block
+                    if (!$this->use_classes &&
+                        $this->language_data['STYLES']['SCRIPT'][$script_key] != '') {
+                        $attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"';
+                    } else {
+                        $attributes = ' class="sc' . $script_key . '"';
+                    }
+                    $result .= "<span$attributes>";
+                    $STRICTATTRS = $attributes;
+                }
+            }
+
+            if ($highlight_part) {
+                // Now, highlight the code in this block. This code
+                // is really the engine of GeSHi (along with the method
+                // parse_non_string_part).
+
+                // cache comment regexps incrementally
+                $next_comment_regexp_key = '';
+                $next_comment_regexp_pos = -1;
+                $next_comment_multi_pos = -1;
+                $next_comment_single_pos = -1;
+                $comment_regexp_cache_per_key = array();
+                $comment_multi_cache_per_key = array();
+                $comment_single_cache_per_key = array();
+                $next_open_comment_multi = '';
+                $next_comment_single_key = '';
+                $escape_regexp_cache_per_key = array();
+                $next_escape_regexp_key = '';
+                $next_escape_regexp_pos = -1;
+
+                $length = strlen($part);
+                for ($i = 0; $i < $length; ++$i) {
+                    // Get the next char
+                    $char = $part[$i];
+                    $char_len = 1;
+
+                    // update regexp comment cache if needed
+                    if (isset($this->language_data['COMMENT_REGEXP']) && $next_comment_regexp_pos < $i) {
+                        $next_comment_regexp_pos = $length;
+                        foreach ($this->language_data['COMMENT_REGEXP'] as $comment_key => $regexp) {
+                            $match_i = false;
+                            if (isset($comment_regexp_cache_per_key[$comment_key]) &&
+                                ($comment_regexp_cache_per_key[$comment_key]['pos'] >= $i ||
+                                 $comment_regexp_cache_per_key[$comment_key]['pos'] === false)) {
+                                // we have already matched something
+                                if ($comment_regexp_cache_per_key[$comment_key]['pos'] === false) {
+                                    // this comment is never matched
+                                    continue;
+                                }
+                                $match_i = $comment_regexp_cache_per_key[$comment_key]['pos'];
+                            } else if (
+                                //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $i), $match, PREG_OFFSET_CAPTURE)) ||
+                                (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $i))
+                                ) {
+                                $match_i = $match[0][1];
+                                if (GESHI_PHP_PRE_433) {
+                                    $match_i += $i;
+                                }
+
+                                $comment_regexp_cache_per_key[$comment_key] = array(
+                                    'key' => $comment_key,
+                                    'length' => strlen($match[0][0]),
+                                    'pos' => $match_i
+                                );
+                            } else {
+                                $comment_regexp_cache_per_key[$comment_key]['pos'] = false;
+                                continue;
+                            }
+
+                            if ($match_i !== false && $match_i < $next_comment_regexp_pos) {
+                                $next_comment_regexp_pos = $match_i;
+                                $next_comment_regexp_key = $comment_key;
+                                if ($match_i === $i) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+
+                    $string_started = false;
+
+                    if (isset($is_string_starter[$char])) {
+                        // Possibly the start of a new string ...
+
+                        //Check which starter it was ...
+                        //Fix for SF#1932083: Multichar Quotemarks unsupported
+                        if (is_array($is_string_starter[$char])) {
+                            $char_new = '';
+                            foreach ($is_string_starter[$char] as $testchar) {
+                                if ($testchar === substr($part, $i, strlen($testchar)) &&
+                                    strlen($testchar) > strlen($char_new)) {
+                                    $char_new = $testchar;
+                                    $string_started = true;
+                                }
+                            }
+                            if ($string_started) {
+                                $char = $char_new;
+                            }
+                        } else {
+                            $testchar = $is_string_starter[$char];
+                            if ($testchar === substr($part, $i, strlen($testchar))) {
+                                $char = $testchar;
+                                $string_started = true;
+                            }
+                        }
+                        $char_len = strlen($char);
+                    }
+
+                    if ($string_started && ($i != $next_comment_regexp_pos)) {
+                        // Hand out the correct style information for this string
+                        $string_key = array_search($char, $this->language_data['QUOTEMARKS']);
+                        if (!isset($this->language_data['STYLES']['STRINGS'][$string_key]) ||
+                            !isset($this->language_data['STYLES']['ESCAPE_CHAR'][$string_key])) {
+                            $string_key = 0;
+                        }
+
+                        // parse the stuff before this
+                        $result .= $this->parse_non_string_part($stuff_to_parse);
+                        $stuff_to_parse = '';
+
+                        if (!$this->use_classes) {
+                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS'][$string_key] . '"';
+                        } else {
+                            $string_attributes = ' class="st'.$string_key.'"';
+                        }
+
+                        // now handle the string
+                        $string = "<span$string_attributes>" . GeSHi::hsc($char);
+                        $start = $i + $char_len;
+                        $string_open = true;
+
+                        if(empty($this->language_data['ESCAPE_REGEXP'])) {
+                            $next_escape_regexp_pos = $length;
+                        }
+
+                        do {
+                            //Get the regular ending pos ...
+                            $close_pos = strpos($part, $char, $start);
+                            if(false === $close_pos) {
+                                $close_pos = $length;
+                            }
+
+                            if($this->lexic_permissions['ESCAPE_CHAR']) {
+                                // update escape regexp cache if needed
+                                if (isset($this->language_data['ESCAPE_REGEXP']) && $next_escape_regexp_pos < $start) {
+                                    $next_escape_regexp_pos = $length;
+                                    foreach ($this->language_data['ESCAPE_REGEXP'] as $escape_key => $regexp) {
+                                        $match_i = false;
+                                        if (isset($escape_regexp_cache_per_key[$escape_key]) &&
+                                            ($escape_regexp_cache_per_key[$escape_key]['pos'] >= $start ||
+                                             $escape_regexp_cache_per_key[$escape_key]['pos'] === false)) {
+                                            // we have already matched something
+                                            if ($escape_regexp_cache_per_key[$escape_key]['pos'] === false) {
+                                                // this comment is never matched
+                                                continue;
+                                            }
+                                            $match_i = $escape_regexp_cache_per_key[$escape_key]['pos'];
+                                        } else if (
+                                            //This is to allow use of the offset parameter in preg_match and stay as compatible with older PHP versions as possible
+                                            (GESHI_PHP_PRE_433 && preg_match($regexp, substr($part, $start), $match, PREG_OFFSET_CAPTURE)) ||
+                                            (!GESHI_PHP_PRE_433 && preg_match($regexp, $part, $match, PREG_OFFSET_CAPTURE, $start))
+                                            ) {
+                                            $match_i = $match[0][1];
+                                            if (GESHI_PHP_PRE_433) {
+                                                $match_i += $start;
+                                            }
+
+                                            $escape_regexp_cache_per_key[$escape_key] = array(
+                                                'key' => $escape_key,
+                                                'length' => strlen($match[0][0]),
+                                                'pos' => $match_i
+                                            );
+                                        } else {
+                                            $escape_regexp_cache_per_key[$escape_key]['pos'] = false;
+                                            continue;
+                                        }
+
+                                        if ($match_i !== false && $match_i < $next_escape_regexp_pos) {
+                                            $next_escape_regexp_pos = $match_i;
+                                            $next_escape_regexp_key = $escape_key;
+                                            if ($match_i === $start) {
+                                                break;
+                                            }
+                                        }
+                                    }
+                                }
+
+                                //Find the next simple escape position
+                                if('' != $this->language_data['ESCAPE_CHAR']) {
+                                    $simple_escape = strpos($part, $this->language_data['ESCAPE_CHAR'], $start);
+                                    if(false === $simple_escape) {
+                                        $simple_escape = $length;
+                                    }
+                                } else {
+                                    $simple_escape = $length;
+                                }
+                            } else {
+                                $next_escape_regexp_pos = $length;
+                                $simple_escape = $length;
+                            }
+
+                            if($simple_escape < $next_escape_regexp_pos &&
+                                $simple_escape < $length &&
+                                $simple_escape < $close_pos) {
+                                //The nexxt escape sequence is a simple one ...
+                                $es_pos = $simple_escape;
+
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
+
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][0] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es0"';
+                                }
+
+                                //Add the style for the escape char ...
+                                $string .= "<span$escape_char_attributes>" .
+                                    GeSHi::hsc($this->language_data['ESCAPE_CHAR']);
+
+                                //Get the byte AFTER the ESCAPE_CHAR we just found
+                                $es_char = $part[$es_pos + 1];
+                                if ($es_char == "\n") {
+                                    // don't put a newline around newlines
+                                    $string .= "</span>\n";
+                                    $start = $es_pos + 2;
+                                } else if (ord($es_char) >= 128) {
+                                    //This is an non-ASCII char (UTF8 or single byte)
+                                    //This code tries to work around SF#2037598 ...
+                                    if(function_exists('mb_substr')) {
+                                        $es_char_m = mb_substr(substr($part, $es_pos+1, 16), 0, 1, $this->encoding);
+                                        $string .= $es_char_m . '</span>';
+                                    } else if (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) {
+                                        if(preg_match("/[\xC2-\xDF][\x80-\xBF]".
+                                            "|\xE0[\xA0-\xBF][\x80-\xBF]".
+                                            "|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}".
+                                            "|\xED[\x80-\x9F][\x80-\xBF]".
+                                            "|\xF0[\x90-\xBF][\x80-\xBF]{2}".
+                                            "|[\xF1-\xF3][\x80-\xBF]{3}".
+                                            "|\xF4[\x80-\x8F][\x80-\xBF]{2}/s",
+                                            $part, $es_char_m, null, $es_pos + 1)) {
+                                            $es_char_m = $es_char_m[0];
+                                        } else {
+                                            $es_char_m = $es_char;
+                                        }
+                                        $string .= $this->hsc($es_char_m) . '</span>';
+                                    } else {
+                                        $es_char_m = $this->hsc($es_char);
+                                    }
+                                    $start = $es_pos + strlen($es_char_m) + 1;
+                                } else {
+                                    $string .= $this->hsc($es_char) . '</span>';
+                                    $start = $es_pos + 2;
+                                }
+                            } else if ($next_escape_regexp_pos < $length &&
+                                $next_escape_regexp_pos < $close_pos) {
+                                $es_pos = $next_escape_regexp_pos;
+                                //Add the stuff not in the string yet ...
+                                $string .= $this->hsc(substr($part, $start, $es_pos - $start));
+
+                                //Get the key and length of this match ...
+                                $escape = $escape_regexp_cache_per_key[$next_escape_regexp_key];
+                                $escape_str = substr($part, $es_pos, $escape['length']);
+                                $escape_key = $escape['key'];
+
+                                //Get the style for this escaped char ...
+                                if (!$this->use_classes) {
+                                    $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR'][$escape_key] . '"';
+                                } else {
+                                    $escape_char_attributes = ' class="es' . $escape_key . '"';
+                                }
+
+                                //Add the style for the escape char ...
+                                $string .= "<span$escape_char_attributes>" .
+                                    $this->hsc($escape_str) . '</span>';
+
+                                $start = $es_pos + $escape['length'];
+                            } else {
+                                //Copy the remainder of the string ...
+                                $string .= $this->hsc(substr($part, $start, $close_pos - $start + $char_len)) . '</span>';
+                                $start = $close_pos + $char_len;
+                                $string_open = false;
+                            }
+                        } while($string_open);
+
+                        if ($check_linenumbers) {
+                            // Are line numbers used? If, we should end the string before
+                            // the newline and begin it again (so when <li>s are put in the source
+                            // remains XHTML compliant)
+                            // note to self: This opens up possibility of config files specifying
+                            // that languages can/cannot have multiline strings???
+                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
+                        }
+
+                        $result .= $string;
+                        $string = '';
+                        $i = $start - 1;
+                        continue;
+                    } else if ($this->lexic_permissions['STRINGS'] && $hq && $hq[0] == $char &&
+                        substr($part, $i, $hq_strlen) == $hq && ($i != $next_comment_regexp_pos)) {
+                        // The start of a hard quoted string
+                        if (!$this->use_classes) {
+                            $string_attributes = ' style="' . $this->language_data['STYLES']['STRINGS']['HARD'] . '"';
+                            $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARD'] . '"';
+                        } else {
+                            $string_attributes = ' class="st_h"';
+                            $escape_char_attributes = ' class="es_h"';
+                        }
+                        // parse the stuff before this
+                        $result .= $this->parse_non_string_part($stuff_to_parse);
+                        $stuff_to_parse = '';
+
+                        // now handle the string
+                        $string = '';
+
+                        // look for closing quote
+                        $start = $i + $hq_strlen;
+                        while ($close_pos = strpos($part, $this->language_data['HARDQUOTE'][1], $start)) {
+                            $start = $close_pos + 1;
+                            if ($this->lexic_permissions['ESCAPE_CHAR'] && $part[$close_pos - 1] == $this->language_data['HARDCHAR']) {
+                                // make sure this quote is not escaped
+                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
+                                    if (substr($part, $close_pos - 1, strlen($hardescape)) == $hardescape) {
+                                        // check wether this quote is escaped or if it is something like '\\'
+                                        $escape_char_pos = $close_pos - 1;
+                                        while ($escape_char_pos > 0
+                                                && $part[$escape_char_pos - 1] == $this->language_data['HARDCHAR']) {
+                                            --$escape_char_pos;
+                                        }
+                                        if (($close_pos - $escape_char_pos) & 1) {
+                                            // uneven number of escape chars => this quote is escaped
+                                            continue 2;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // found closing quote
+                            break;
+                        }
+
+                        //Found the closing delimiter?
+                        if (!$close_pos) {
+                            // span till the end of this $part when no closing delimiter is found
+                            $close_pos = $length;
+                        }
+
+                        //Get the actual string
+                        $string = substr($part, $i, $close_pos - $i + 1);
+                        $i = $close_pos;
+
+                        // handle escape chars and encode html chars
+                        // (special because when we have escape chars within our string they may not be escaped)
+                        if ($this->lexic_permissions['ESCAPE_CHAR'] && $this->language_data['ESCAPE_CHAR']) {
+                            $start = 0;
+                            $new_string = '';
+                            while ($es_pos = strpos($string, $this->language_data['ESCAPE_CHAR'], $start)) {
+                                // hmtl escape stuff before
+                                $new_string .= $this->hsc(substr($string, $start, $es_pos - $start));
+                                // check if this is a hard escape
+                                foreach ($this->language_data['HARDESCAPE'] as $hardescape) {
+                                    if (substr($string, $es_pos, strlen($hardescape)) == $hardescape) {
+                                        // indeed, this is a hardescape
+                                        $new_string .= "<span$escape_char_attributes>" .
+                                            $this->hsc($hardescape) . '</span>';
+                                        $start = $es_pos + strlen($hardescape);
+                                        continue 2;
+                                    }
+                                }
+                                // not a hard escape, but a normal escape
+                                // they come in pairs of two
+                                $c = 0;
+                                while (isset($string[$es_pos + $c]) && isset($string[$es_pos + $c + 1])
+                                    && $string[$es_pos + $c] == $this->language_data['ESCAPE_CHAR']
+                                    && $string[$es_pos + $c + 1] == $this->language_data['ESCAPE_CHAR']) {
+                                    $c += 2;
+                                }
+                                if ($c) {
+                                    $new_string .= "<span$escape_char_attributes>" .
+                                        str_repeat($escaped_escape_char, $c) .
+                                        '</span>';
+                                    $start = $es_pos + $c;
+                                } else {
+                                    // this is just a single lonely escape char...
+                                    $new_string .= $escaped_escape_char;
+                                    $start = $es_pos + 1;
+                                }
+                            }
+                            $string = $new_string . $this->hsc(substr($string, $start));
+                        } else {
+                            $string = $this->hsc($string);
+                        }
+
+                        if ($check_linenumbers) {
+                            // Are line numbers used? If, we should end the string before
+                            // the newline and begin it again (so when <li>s are put in the source
+                            // remains XHTML compliant)
+                            // note to self: This opens up possibility of config files specifying
+                            // that languages can/cannot have multiline strings???
+                            $string = str_replace("\n", "</span>\n<span$string_attributes>", $string);
+                        }
+
+                        $result .= "<span$string_attributes>" . $string . '</span>';
+                        $string = '';
+                        continue;
+                    } else {
+                        //Have a look for regexp comments
+                        if ($i == $next_comment_regexp_pos) {
+                            $COMMENT_MATCHED = true;
+                            $comment = $comment_regexp_cache_per_key[$next_comment_regexp_key];
+                            $test_str = $this->hsc(substr($part, $i, $comment['length']));
+
+                            //@todo If remove important do remove here
+                            if ($this->lexic_permissions['COMMENTS']['MULTI']) {
+                                if (!$this->use_classes) {
+                                    $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment['key']] . '"';
+                                } else {
+                                    $attributes = ' class="co' . $comment['key'] . '"';
+                                }
+
+                                $test_str = "<span$attributes>" . $test_str . "</span>";
+
+                                // Short-cut through all the multiline code
+                                if ($check_linenumbers) {
+                                    // strreplace to put close span and open span around multiline newlines
+                                    $test_str = str_replace(
+                                        "\n", "</span>\n<span$attributes>",
+                                        str_replace("\n ", "\n&nbsp;", $test_str)
+                                    );
+                                }
+                            }
+
+                            $i += $comment['length'] - 1;
+
+                            // parse the rest
+                            $result .= $this->parse_non_string_part($stuff_to_parse);
+                            $stuff_to_parse = '';
+                        }
+
+                        // If we haven't matched a regexp comment, try multi-line comments
+                        if (!$COMMENT_MATCHED) {
+                            // Is this a multiline comment?
+                            if (!empty($this->language_data['COMMENT_MULTI']) && $next_comment_multi_pos < $i) {
+                                $next_comment_multi_pos = $length;
+                                foreach ($this->language_data['COMMENT_MULTI'] as $open => $close) {
+                                    $match_i = false;
+                                    if (isset($comment_multi_cache_per_key[$open]) &&
+                                        ($comment_multi_cache_per_key[$open] >= $i ||
+                                         $comment_multi_cache_per_key[$open] === false)) {
+                                        // we have already matched something
+                                        if ($comment_multi_cache_per_key[$open] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
+                                        $match_i = $comment_multi_cache_per_key[$open];
+                                    } else if (($match_i = stripos($part, $open, $i)) !== false) {
+                                        $comment_multi_cache_per_key[$open] = $match_i;
+                                    } else {
+                                        $comment_multi_cache_per_key[$open] = false;
+                                        continue;
+                                    }
+                                    if ($match_i !== false && $match_i < $next_comment_multi_pos) {
+                                        $next_comment_multi_pos = $match_i;
+                                        $next_open_comment_multi = $open;
+                                        if ($match_i === $i) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if ($i == $next_comment_multi_pos) {
+                                $open = $next_open_comment_multi;
+                                $close = $this->language_data['COMMENT_MULTI'][$open];
+                                $open_strlen = strlen($open);
+                                $close_strlen = strlen($close);
+                                $COMMENT_MATCHED = true;
+                                $test_str_match = $open;
+                                //@todo If remove important do remove here
+                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $open == GESHI_START_IMPORTANT) {
+                                    if ($open != GESHI_START_IMPORTANT) {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"';
+                                        } else {
+                                            $attributes = ' class="coMULTI"';
+                                        }
+                                        $test_str = "<span$attributes>" . $this->hsc($open);
+                                    } else {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->important_styles . '"';
+                                        } else {
+                                            $attributes = ' class="imp"';
+                                        }
+
+                                        // We don't include the start of the comment if it's an
+                                        // "important" part
+                                        $test_str = "<span$attributes>";
+                                    }
+                                } else {
+                                    $test_str = $this->hsc($open);
+                                }
+
+                                $close_pos = strpos( $part, $close, $i + $open_strlen );
+
+                                if ($close_pos === false) {
+                                    $close_pos = $length;
+                                }
+
+                                // Short-cut through all the multiline code
+                                $rest_of_comment = $this->hsc(substr($part, $i + $open_strlen, $close_pos - $i - $open_strlen + $close_strlen));
+                                if (($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $test_str_match == GESHI_START_IMPORTANT) &&
+                                    $check_linenumbers) {
+
+                                    // strreplace to put close span and open span around multiline newlines
+                                    $test_str .= str_replace(
+                                        "\n", "</span>\n<span$attributes>",
+                                        str_replace("\n ", "\n&nbsp;", $rest_of_comment)
+                                    );
+                                } else {
+                                    $test_str .= $rest_of_comment;
+                                }
+
+                                if ($this->lexic_permissions['COMMENTS']['MULTI'] ||
+                                    $test_str_match == GESHI_START_IMPORTANT) {
+                                    $test_str .= '</span>';
+                                }
+
+                                $i = $close_pos + $close_strlen - 1;
+
+                                // parse the rest
+                                $result .= $this->parse_non_string_part($stuff_to_parse);
+                                $stuff_to_parse = '';
+                            }
+                        }
+
+                        // If we haven't matched a multiline comment, try single-line comments
+                        if (!$COMMENT_MATCHED) {
+                            // cache potential single line comment occurances
+                            if (!empty($this->language_data['COMMENT_SINGLE']) && $next_comment_single_pos < $i) {
+                                $next_comment_single_pos = $length;
+                                foreach ($this->language_data['COMMENT_SINGLE'] as $comment_key => $comment_mark) {
+                                    $match_i = false;
+                                    if (isset($comment_single_cache_per_key[$comment_key]) &&
+                                        ($comment_single_cache_per_key[$comment_key] >= $i ||
+                                         $comment_single_cache_per_key[$comment_key] === false)) {
+                                        // we have already matched something
+                                        if ($comment_single_cache_per_key[$comment_key] === false) {
+                                            // this comment is never matched
+                                            continue;
+                                        }
+                                        $match_i = $comment_single_cache_per_key[$comment_key];
+                                    } else if (
+                                        // case sensitive comments
+                                        ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
+                                        ($match_i = stripos($part, $comment_mark, $i)) !== false) ||
+                                        // non case sensitive
+                                        (!$this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] &&
+                                          (($match_i = strpos($part, $comment_mark, $i)) !== false))) {
+                                        $comment_single_cache_per_key[$comment_key] = $match_i;
+                                    } else {
+                                        $comment_single_cache_per_key[$comment_key] = false;
+                                        continue;
+                                    }
+                                    if ($match_i !== false && $match_i < $next_comment_single_pos) {
+                                        $next_comment_single_pos = $match_i;
+                                        $next_comment_single_key = $comment_key;
+                                        if ($match_i === $i) {
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                            if ($next_comment_single_pos == $i) {
+                                $comment_key = $next_comment_single_key;
+                                $comment_mark = $this->language_data['COMMENT_SINGLE'][$comment_key];
+                                $com_len = strlen($comment_mark);
+
+                                // This check will find special variables like $# in bash
+                                // or compiler directives of Delphi beginning {$
+                                if ((empty($sc_disallowed_before) || ($i == 0) ||
+                                    (false === strpos($sc_disallowed_before, $part[$i-1]))) &&
+                                    (empty($sc_disallowed_after) || ($length <= $i + $com_len) ||
+                                    (false === strpos($sc_disallowed_after, $part[$i + $com_len]))))
+                                {
+                                    // this is a valid comment
+                                    $COMMENT_MATCHED = true;
+                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
+                                        if (!$this->use_classes) {
+                                            $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"';
+                                        } else {
+                                            $attributes = ' class="co' . $comment_key . '"';
+                                        }
+                                        $test_str = "<span$attributes>" . $this->hsc($this->change_case($comment_mark));
+                                    } else {
+                                        $test_str = $this->hsc($comment_mark);
+                                    }
+
+                                    //Check if this comment is the last in the source
+                                    $close_pos = strpos($part, "\n", $i);
+                                    $oops = false;
+                                    if ($close_pos === false) {
+                                        $close_pos = $length;
+                                        $oops = true;
+                                    }
+                                    $test_str .= $this->hsc(substr($part, $i + $com_len, $close_pos - $i - $com_len));
+                                    if ($this->lexic_permissions['COMMENTS'][$comment_key]) {
+                                        $test_str .= "</span>";
+                                    }
+
+                                    // Take into account that the comment might be the last in the source
+                                    if (!$oops) {
+                                      $test_str .= "\n";
+                                    }
+
+                                    $i = $close_pos;
+
+                                    // parse the rest
+                                    $result .= $this->parse_non_string_part($stuff_to_parse);
+                                    $stuff_to_parse = '';
+                                }
+                            }
+                        }
+                    }
+
+                    // Where are we adding this char?
+                    if (!$COMMENT_MATCHED) {
+                        $stuff_to_parse .= $char;
+                    } else {
+                        $result .= $test_str;
+                        unset($test_str);
+                        $COMMENT_MATCHED = false;
+                    }
+                }
+                // Parse the last bit
+                $result .= $this->parse_non_string_part($stuff_to_parse);
+                $stuff_to_parse = '';
+            } else {
+                $result .= $this->hsc($part);
+            }
+            // Close the <span> that surrounds the block
+            if ($STRICTATTRS != '') {
+                $result = str_replace("\n", "</span>\n<span$STRICTATTRS>", $result);
+                $result .= '</span>';
+            }
+
+            $endresult .= $result;
+            unset($part, $parts[$key], $result);
+        }
+
+        //This fix is related to SF#1923020, but has to be applied regardless of
+        //actually highlighting symbols.
+        /** NOTE: memorypeak #3 */
+        $endresult = str_replace(array('<SEMI>', '<PIPE>'), array(';', '|'), $endresult);
+
+//        // Parse the last stuff (redundant?)
+//        $result .= $this->parse_non_string_part($stuff_to_parse);
+
+        // Lop off the very first and last spaces
+//        $result = substr($result, 1, -1);
+
+        // We're finished: stop timing
+        $this->set_time($start_time, microtime());
+
+        $this->finalise($endresult);
+        return $endresult;
+    }
+
+    /**
+     * Swaps out spaces and tabs for HTML indentation. Not needed if
+     * the code is in a pre block...
+     *
+     * @param  string The source to indent (reference!)
+     * @since  1.0.0
+     * @access private
+     */
+    function indent(&$result) {
+        /// Replace tabs with the correct number of spaces
+        if (false !== strpos($result, "\t")) {
+            $lines = explode("\n", $result);
+            $result = null;//Save memory while we process the lines individually
+            $tab_width = $this->get_real_tab_width();
+            $tab_string = '&nbsp;' . str_repeat(' ', $tab_width);
+
+            for ($key = 0, $n = count($lines); $key < $n; $key++) {
+                $line = $lines[$key];
+                if (false === strpos($line, "\t")) {
+                    continue;
+                }
+
+                $pos = 0;
+                $length = strlen($line);
+                $lines[$key] = ''; // reduce memory
+
+                $IN_TAG = false;
+                for ($i = 0; $i < $length; ++$i) {
+                    $char = $line[$i];
+                    // Simple engine to work out whether we're in a tag.
+                    // If we are we modify $pos. This is so we ignore HTML
+                    // in the line and only workout the tab replacement
+                    // via the actual content of the string
+                    // This test could be improved to include strings in the
+                    // html so that < or > would be allowed in user's styles
+                    // (e.g. quotes: '<' '>'; or similar)
+                    if ($IN_TAG) {
+                        if ('>' == $char) {
+                            $IN_TAG = false;
+                        }
+                        $lines[$key] .= $char;
+                    } else if ('<' == $char) {
+                        $IN_TAG = true;
+                        $lines[$key] .= '<';
+                    } else if ('&' == $char) {
+                        $substr = substr($line, $i + 3, 5);
+                        $posi = strpos($substr, ';');
+                        if (false === $posi) {
+                            ++$pos;
+                        } else {
+                            $pos -= $posi+2;
+                        }
+                        $lines[$key] .= $char;
+                    } else if ("\t" == $char) {
+                        $str = '';
+                        // OPTIMISE - move $strs out. Make an array:
+                        // $tabs = array(
+                        //  1 => '&nbsp;',
+                        //  2 => '&nbsp; ',
+                        //  3 => '&nbsp; &nbsp;' etc etc
+                        // to use instead of building a string every time
+                        $tab_end_width = $tab_width - ($pos % $tab_width); //Moved out of the look as it doesn't change within the loop
+                        if (($pos & 1) || 1 == $tab_end_width) {
+                            $str .= substr($tab_string, 6, $tab_end_width);
+                        } else {
+                            $str .= substr($tab_string, 0, $tab_end_width+5);
+                        }
+                        $lines[$key] .= $str;
+                        $pos += $tab_end_width;
+
+                        if (false === strpos($line, "\t", $i + 1)) {
+                            $lines[$key] .= substr($line, $i + 1);
+                            break;
+                        }
+                    } else if (0 == $pos && ' ' == $char) {
+                        $lines[$key] .= '&nbsp;';
+                        ++$pos;
+                    } else {
+                        $lines[$key] .= $char;
+                        ++$pos;
+                    }
+                }
+            }
+            $result = implode("\n", $lines);
+            unset($lines);//We don't need the lines separated beyond this --- free them!
+        }
+        // Other whitespace
+        // BenBE: Fix to reduce the number of replacements to be done
+        $result = preg_replace('/^ /m', '&nbsp;', $result);
+        $result = str_replace('  ', ' &nbsp;', $result);
+
+        if ($this->line_numbers == GESHI_NO_LINE_NUMBERS) {
+            if ($this->line_ending === null) {
+                $result = nl2br($result);
+            } else {
+                $result = str_replace("\n", $this->line_ending, $result);
+            }
+        }
+    }
+
+    /**
+     * Changes the case of a keyword for those languages where a change is asked for
+     *
+     * @param  string The keyword to change the case of
+     * @return string The keyword with its case changed
+     * @since  1.0.0
+     * @access private
+     */
+    function change_case($instr) {
+        switch ($this->language_data['CASE_KEYWORDS']) {
+            case GESHI_CAPS_UPPER:
+                return strtoupper($instr);
+            case GESHI_CAPS_LOWER:
+                return strtolower($instr);
+            default:
+                return $instr;
+        }
+    }
+
+    /**
+     * Handles replacements of keywords to include markup and links if requested
+     *
+     * @param  string The keyword to add the Markup to
+     * @return The HTML for the match found
+     * @since  1.0.8
+     * @access private
+     *
+     * @todo   Get rid of ender in keyword links
+     */
+    function handle_keyword_replace($match) {
+        $k = $this->_kw_replace_group;
+        $keyword = $match[0];
+
+        $before = '';
+        $after = '';
+
+        if ($this->keyword_links) {
+            // Keyword links have been ebabled
+
+            if (isset($this->language_data['URLS'][$k]) &&
+                $this->language_data['URLS'][$k] != '') {
+                // There is a base group for this keyword
+
+                // Old system: strtolower
+                //$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword);
+                // New system: get keyword from language file to get correct case
+                if (!$this->language_data['CASE_SENSITIVE'][$k] &&
+                    strpos($this->language_data['URLS'][$k], '{FNAME}') !== false) {
+                    foreach ($this->language_data['KEYWORDS'][$k] as $word) {
+                        if (strcasecmp($word, $keyword) == 0) {
+                            break;
+                        }
+                    }
+                } else {
+                    $word = $keyword;
+                }
+
+                $before = '<|UR1|"' .
+                    str_replace(
+                        array(
+                            '{FNAME}',
+                            '{FNAMEL}',
+                            '{FNAMEU}',
+                            '.'),
+                        array(
+                            str_replace('+', '%20', urlencode($this->hsc($word))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtolower($word)))),
+                            str_replace('+', '%20', urlencode($this->hsc(strtoupper($word)))),
+                            '<DOT>'),
+                        $this->language_data['URLS'][$k]
+                    ) . '">';
+                $after = '</a>';
+            }
+        }
+
+        return $before . '<|/'. $k .'/>' . $this->change_case($keyword) . '|>' . $after;
+    }
+
+    /**
+     * handles regular expressions highlighting-definitions with callback functions
+     *
+     * @note this is a callback, don't use it directly
+     *
+     * @param array the matches array
+     * @return The highlighted string
+     * @since 1.0.8
+     * @access private
+     */
+    function handle_regexps_callback($matches) {
+        // before: "' style=\"' . call_user_func(\"$func\", '\\1') . '\"\\1|>'",
+        return  ' style="' . call_user_func($this->language_data['STYLES']['REGEXPS'][$this->_rx_key], $matches[1]) . '"'. $matches[1] . '|>';
+    }
+
+    /**
+     * handles newlines in REGEXPS matches. Set the _hmr_* vars before calling this
+     *
+     * @note this is a callback, don't use it directly
+     *
+     * @param array the matches array
+     * @return string
+     * @since 1.0.8
+     * @access private
+     */
+    function handle_multiline_regexps($matches) {
+        $before = $this->_hmr_before;
+        $after = $this->_hmr_after;
+        if ($this->_hmr_replace) {
+            $replace = $this->_hmr_replace;
+            $search = array();
+
+            foreach (array_keys($matches) as $k) {
+                $search[] = '\\' . $k;
+            }
+
+            $before = str_replace($search, $matches, $before);
+            $after = str_replace($search, $matches, $after);
+            $replace = str_replace($search, $matches, $replace);
+        } else {
+            $replace = $matches[0];
+        }
+        return $before
+                    . '<|!REG3XP' . $this->_hmr_key .'!>'
+                        . str_replace("\n", "|>\n<|!REG3XP" . $this->_hmr_key . '!>', $replace)
+                    . '|>'
+              . $after;
+    }
+
+    /**
+     * Takes a string that has no strings or comments in it, and highlights
+     * stuff like keywords, numbers and methods.
+     *
+     * @param string The string to parse for keyword, numbers etc.
+     * @since 1.0.0
+     * @access private
+     * @todo BUGGY! Why? Why not build string and return?
+     */
+    function parse_non_string_part($stuff_to_parse) {
+        $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse);
+
+        // Highlight keywords
+        $disallowed_before = "(?<![a-zA-Z0-9\$_\|\#;>|^&";
+        $disallowed_after = "(?![a-zA-Z0-9_\|%\\-&;";
+        if ($this->lexic_permissions['STRINGS']) {
+            $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/');
+            $disallowed_before .= $quotemarks;
+            $disallowed_after .= $quotemarks;
+        }
+        $disallowed_before .= "])";
+        $disallowed_after .= "])";
+
+        $parser_control_pergroup = false;
+        if (isset($this->language_data['PARSER_CONTROL'])) {
+            if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) {
+                $x = 0; // check wether per-keyword-group parser_control is enabled
+                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) {
+                    $disallowed_before = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'];
+                    ++$x;
+                }
+                if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'])) {
+                    $disallowed_after = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'];
+                    ++$x;
+                }
+                $parser_control_pergroup = (count($this->language_data['PARSER_CONTROL']['KEYWORDS']) - $x) > 0;
+            }
+        }
+
+        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
+            if (!isset($this->lexic_permissions['KEYWORDS'][$k]) ||
+            $this->lexic_permissions['KEYWORDS'][$k]) {
+
+                $case_sensitive = $this->language_data['CASE_SENSITIVE'][$k];
+                $modifiers = $case_sensitive ? '' : 'i';
+
+                // NEW in 1.0.8 - per-keyword-group parser control
+                $disallowed_before_local = $disallowed_before;
+                $disallowed_after_local = $disallowed_after;
+                if ($parser_control_pergroup && isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k])) {
+                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'])) {
+                        $disallowed_before_local =
+                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'];
+                    }
+
+                    if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'])) {
+                        $disallowed_after_local =
+                            $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'];
+                    }
+                }
+
+                $this->_kw_replace_group = $k;
+
+                //NEW in 1.0.8, the cached regexp list
+                // since we don't want PHP / PCRE to crash due to too large patterns we split them into smaller chunks
+                for ($set = 0, $set_length = count($this->language_data['CACHED_KEYWORD_LISTS'][$k]); $set <  $set_length; ++$set) {
+                    $keywordset =& $this->language_data['CACHED_KEYWORD_LISTS'][$k][$set];
+                    // Might make a more unique string for putting the number in soon
+                    // Basically, we don't put the styles in yet because then the styles themselves will
+                    // get highlighted if the language has a CSS keyword in it (like CSS, for example ;))
+                    $stuff_to_parse = preg_replace_callback(
+                        "/$disallowed_before_local({$keywordset})(?!\<DOT\>(?:htm|php))$disallowed_after_local/$modifiers",
+                        array($this, 'handle_keyword_replace'),
+                        $stuff_to_parse
+                        );
+                }
+            }
+        }
+
+        // Regular expressions
+        foreach ($this->language_data['REGEXPS'] as $key => $regexp) {
+            if ($this->lexic_permissions['REGEXPS'][$key]) {
+                if (is_array($regexp)) {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_replace = $regexp[GESHI_REPLACE];
+                        $this->_hmr_before = $regexp[GESHI_BEFORE];
+                        $this->_hmr_key = $key;
+                        $this->_hmr_after = $regexp[GESHI_AFTER];
+                        $stuff_to_parse = preg_replace_callback(
+                            "/" . $regexp[GESHI_SEARCH] . "/{$regexp[GESHI_MODIFIERS]}",
+                            array($this, 'handle_multiline_regexps'),
+                            $stuff_to_parse);
+                        $this->_hmr_replace = false;
+                        $this->_hmr_before = '';
+                        $this->_hmr_after = '';
+                    } else {
+                        $stuff_to_parse = preg_replace(
+                            '/' . $regexp[GESHI_SEARCH] . '/' . $regexp[GESHI_MODIFIERS],
+                            $regexp[GESHI_BEFORE] . '<|!REG3XP'. $key .'!>' . $regexp[GESHI_REPLACE] . '|>' . $regexp[GESHI_AFTER],
+                            $stuff_to_parse);
+                    }
+                } else {
+                    if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                        // produce valid HTML when we match multiple lines
+                        $this->_hmr_key = $key;
+                        $stuff_to_parse = preg_replace_callback( "/(" . $regexp . ")/",
+                                              array($this, 'handle_multiline_regexps'), $stuff_to_parse);
+                        $this->_hmr_key = '';
+                    } else {
+                        $stuff_to_parse = preg_replace( "/(" . $regexp . ")/", "<|!REG3XP$key!>\\1|>", $stuff_to_parse);
+                    }
+                }
+            }
+        }
+
+        // Highlight numbers. As of 1.0.8 we support different types of numbers
+        $numbers_found = false;
+        if ($this->lexic_permissions['NUMBERS'] && preg_match('#\d#', $stuff_to_parse )) {
+            $numbers_found = true;
+
+            //For each of the formats ...
+            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
+                //Check if it should be highlighted ...
+                $stuff_to_parse = preg_replace($regexp, "<|/NUM!$id/>\\1|>", $stuff_to_parse);
+            }
+        }
+
+        //
+        // Now that's all done, replace /[number]/ with the correct styles
+        //
+        foreach (array_keys($this->language_data['KEYWORDS']) as $k) {
+            if (!$this->use_classes) {
+                $attributes = ' style="' .
+                    (isset($this->language_data['STYLES']['KEYWORDS'][$k]) ?
+                    $this->language_data['STYLES']['KEYWORDS'][$k] : "") . '"';
+            } else {
+                $attributes = ' class="kw' . $k . '"';
+            }
+            $stuff_to_parse = str_replace("<|/$k/>", "<|$attributes>", $stuff_to_parse);
+        }
+
+        if ($numbers_found) {
+            // Put number styles in
+            foreach($this->language_data['NUMBERS_RXCACHE'] as $id => $regexp) {
+                //Commented out for now, as this needs some review ...
+                //                if ($numbers_permissions & $id) {
+                //Get the appropriate style ...
+                //Checking for unset styles is done by the style cache builder ...
+                if (!$this->use_classes) {
+                    $attributes = ' style="' . $this->language_data['STYLES']['NUMBERS'][$id] . '"';
+                } else {
+                    $attributes = ' class="nu'.$id.'"';
+                }
+
+                //Set in the correct styles ...
+                $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse);
+                //                }
+            }
+        }
+
+        // Highlight methods and fields in objects
+        if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) {
+            $oolang_spaces = "[\s]*";
+            $oolang_before = "";
+            $oolang_after = "[a-zA-Z][a-zA-Z0-9_]*";
+            if (isset($this->language_data['PARSER_CONTROL'])) {
+                if (isset($this->language_data['PARSER_CONTROL']['OOLANG'])) {
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'])) {
+                        $oolang_before = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'];
+                    }
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'])) {
+                        $oolang_after = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'];
+                    }
+                    if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'])) {
+                        $oolang_spaces = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'];
+                    }
+                }
+            }
+
+            foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) {
+                if (false !== strpos($stuff_to_parse, $splitter)) {
+                    if (!$this->use_classes) {
+                        $attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"';
+                    } else {
+                        $attributes = ' class="me' . $key . '"';
+                    }
+                    $stuff_to_parse = preg_replace("/($oolang_before)(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], '/') . ")($oolang_spaces)($oolang_after)/", "\\1\\2\\3<|$attributes>\\4|>", $stuff_to_parse);
+                }
+            }
+        }
+
+        //
+        // Highlight brackets. Yes, I've tried adding a semi-colon to this list.
+        // You try it, and see what happens ;)
+        // TODO: Fix lexic permissions not converting entities if shouldn't
+        // be highlighting regardless
+        //
+        if ($this->lexic_permissions['BRACKETS']) {
+            $stuff_to_parse = str_replace( $this->language_data['CACHE_BRACKET_MATCH'],
+                              $this->language_data['CACHE_BRACKET_REPLACE'], $stuff_to_parse );
+        }
+
+
+        //FIX for symbol highlighting ...
+        if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) {
+            //Get all matches and throw away those witin a block that is already highlighted... (i.e. matched by a regexp)
+            $n_symbols = preg_match_all("/<\|(?:<DOT>|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
+            $global_offset = 0;
+            for ($s_id = 0; $s_id < $n_symbols; ++$s_id) {
+                $symbol_match = $pot_symbols[$s_id][0][0];
+                if (strpos($symbol_match, '<') !== false || strpos($symbol_match, '>') !== false) {
+                    // already highlighted blocks _must_ include either < or >
+                    // so if this conditional applies, we have to skip this match
+                    // BenBE: UNLESS the block contains <SEMI> or <PIPE>
+                    if(strpos($symbol_match, '<SEMI>') === false &&
+                        strpos($symbol_match, '<PIPE>') === false) {
+                        continue;
+                    }
+                }
+
+                // if we reach this point, we have a valid match which needs to be highlighted
+
+                $symbol_length = strlen($symbol_match);
+                $symbol_offset = $pot_symbols[$s_id][0][1];
+                unset($pot_symbols[$s_id]);
+                $symbol_end = $symbol_length + $symbol_offset;
+                $symbol_hl = "";
+
+                // if we have multiple styles, we have to handle them properly
+                if ($this->language_data['MULTIPLE_SYMBOL_GROUPS']) {
+                    $old_sym = -1;
+                    // Split the current stuff to replace into its atomic symbols ...
+                    preg_match_all("/" . $this->language_data['SYMBOL_SEARCH'] . "/", $symbol_match, $sym_match_syms, PREG_PATTERN_ORDER);
+                    foreach ($sym_match_syms[0] as $sym_ms) {
+                        //Check if consequtive symbols belong to the same group to save output ...
+                        if (isset($this->language_data['SYMBOL_DATA'][$sym_ms])
+                            && ($this->language_data['SYMBOL_DATA'][$sym_ms] != $old_sym)) {
+                            if (-1 != $old_sym) {
+                                $symbol_hl .= "|>";
+                            }
+                            $old_sym = $this->language_data['SYMBOL_DATA'][$sym_ms];
+                            if (!$this->use_classes) {
+                                $symbol_hl .= '<| style="' . $this->language_data['STYLES']['SYMBOLS'][$old_sym] . '">';
+                            } else {
+                                $symbol_hl .= '<| class="sy' . $old_sym . '">';
+                            }
+                        }
+                        $symbol_hl .= $sym_ms;
+                    }
+                    unset($sym_match_syms);
+
+                    //Close remaining tags and insert the replacement at the right position ...
+                    //Take caution if symbol_hl is empty to avoid doubled closing spans.
+                    if (-1 != $old_sym) {
+                        $symbol_hl .= "|>";
+                    }
+                } else {
+                    if (!$this->use_classes) {
+                        $symbol_hl = '<| style="' . $this->language_data['STYLES']['SYMBOLS'][0] . '">';
+                    } else {
+                        $symbol_hl = '<| class="sy0">';
+                    }
+                    $symbol_hl .= $symbol_match . '|>';
+                }
+
+                $stuff_to_parse = substr_replace($stuff_to_parse, $symbol_hl, $symbol_offset + $global_offset, $symbol_length);
+
+                // since we replace old text with something of different size,
+                // we'll have to keep track of the differences
+                $global_offset += strlen($symbol_hl) - $symbol_length;
+            }
+        }
+        //FIX for symbol highlighting ...
+
+        // Add class/style for regexps
+        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
+            if ($this->lexic_permissions['REGEXPS'][$key]) {
+                if (is_callable($this->language_data['STYLES']['REGEXPS'][$key])) {
+                    $this->_rx_key = $key;
+                    $stuff_to_parse = preg_replace_callback("/!REG3XP$key!(.*)\|>/U",
+                        array($this, 'handle_regexps_callback'),
+                        $stuff_to_parse);
+                } else {
+                    if (!$this->use_classes) {
+                        $attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"';
+                    } else {
+                        if (is_array($this->language_data['REGEXPS'][$key]) &&
+                            array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$key])) {
+                            $attributes = ' class="' .
+                                $this->language_data['REGEXPS'][$key][GESHI_CLASS] . '"';
+                        } else {
+                           $attributes = ' class="re' . $key . '"';
+                        }
+                    }
+                    $stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse);
+                }
+            }
+        }
+
+        // Replace <DOT> with . for urls
+        $stuff_to_parse = str_replace('<DOT>', '.', $stuff_to_parse);
+        // Replace <|UR1| with <a href= for urls also
+        if (isset($this->link_styles[GESHI_LINK])) {
+            if ($this->use_classes) {
+                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
+            } else {
+                $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse);
+            }
+        } else {
+            $stuff_to_parse = str_replace('<|UR1|', '<a' . $this->link_target . ' href=', $stuff_to_parse);
+        }
+
+        //
+        // NOW we add the span thingy ;)
+        //
+
+        $stuff_to_parse = str_replace('<|', '<span', $stuff_to_parse);
+        $stuff_to_parse = str_replace ( '|>', '</span>', $stuff_to_parse );
+        return substr($stuff_to_parse, 1);
+    }
+
+    /**
+     * Sets the time taken to parse the code
+     *
+     * @param microtime The time when parsing started
+     * @param microtime The time when parsing ended
+     * @since 1.0.2
+     * @access private
+     */
+    function set_time($start_time, $end_time) {
+        $start = explode(' ', $start_time);
+        $end = explode(' ', $end_time);
+        $this->time = $end[0] + $end[1] - $start[0] - $start[1];
+    }
+
+    /**
+     * Gets the time taken to parse the code
+     *
+     * @return double The time taken to parse the code
+     * @since  1.0.2
+     */
+    function get_time() {
+        return $this->time;
+    }
+
+    /**
+     * Merges arrays recursively, overwriting values of the first array with values of later arrays
+     *
+     * @since 1.0.8
+     * @access private
+     */
+    function merge_arrays() {
+        $arrays = func_get_args();
+        $narrays = count($arrays);
+
+        // check arguments
+        // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array)
+        for ($i = 0; $i < $narrays; $i ++) {
+            if (!is_array($arrays[$i])) {
+                // also array_merge_recursive returns nothing in this case
+                trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning false!', E_USER_WARNING);
+                return false;
+            }
+        }
+
+        // the first array is in the output set in every case
+        $ret = $arrays[0];
+
+        // merege $ret with the remaining arrays
+        for ($i = 1; $i < $narrays; $i ++) {
+            foreach ($arrays[$i] as $key => $value) {
+                if (is_array($value) && isset($ret[$key])) {
+                    // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays)
+                    // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be false.
+                    $ret[$key] = $this->merge_arrays($ret[$key], $value);
+                } else {
+                    $ret[$key] = $value;
+                }
+            }
+        }
+
+        return $ret;
+    }
+
+    /**
+     * Gets language information and stores it for later use
+     *
+     * @param string The filename of the language file you want to load
+     * @since 1.0.0
+     * @access private
+     * @todo Needs to load keys for lexic permissions for keywords, regexps etc
+     */
+    function load_language($file_name) {
+        if ($file_name == $this->loaded_language) {
+            // this file is already loaded!
+            return;
+        }
+
+        //Prepare some stuff before actually loading the language file
+        $this->loaded_language = $file_name;
+        $this->parse_cache_built = false;
+        $this->enable_highlighting();
+        $language_data = array();
+
+        //Load the language file
+        require $file_name;
+
+        // Perhaps some checking might be added here later to check that
+        // $language data is a valid thing but maybe not
+        $this->language_data = $language_data;
+
+        // Set strict mode if should be set
+        $this->strict_mode = $this->language_data['STRICT_MODE_APPLIES'];
+
+        // Set permissions for all lexics to true
+        // so they'll be highlighted by default
+        foreach (array_keys($this->language_data['KEYWORDS']) as $key) {
+            if (!empty($this->language_data['KEYWORDS'][$key])) {
+                $this->lexic_permissions['KEYWORDS'][$key] = true;
+            } else {
+                $this->lexic_permissions['KEYWORDS'][$key] = false;
+            }
+        }
+
+        foreach (array_keys($this->language_data['COMMENT_SINGLE']) as $key) {
+            $this->lexic_permissions['COMMENTS'][$key] = true;
+        }
+        foreach (array_keys($this->language_data['REGEXPS']) as $key) {
+            $this->lexic_permissions['REGEXPS'][$key] = true;
+        }
+
+        // for BenBE and future code reviews:
+        // we can use empty here since we only check for existance and emptiness of an array
+        // if it is not an array at all but rather false or null this will work as intended as well
+        // even if $this->language_data['PARSER_CONTROL'] is undefined this won't trigger a notice
+        if (!empty($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'])) {
+            foreach ($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'] as $flag => $value) {
+                // it's either true or false and maybe is true as well
+                $perm = $value !== GESHI_NEVER;
+                if ($flag == 'ALL') {
+                    $this->enable_highlighting($perm);
+                    continue;
+                }
+                if (!isset($this->lexic_permissions[$flag])) {
+                    // unknown lexic permission
+                    continue;
+                }
+                if (is_array($this->lexic_permissions[$flag])) {
+                    foreach ($this->lexic_permissions[$flag] as $key => $val) {
+                        $this->lexic_permissions[$flag][$key] = $perm;
+                    }
+                } else {
+                    $this->lexic_permissions[$flag] = $perm;
+                }
+            }
+            unset($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS']);
+        }
+
+        //Fix: Problem where hardescapes weren't handled if no ESCAPE_CHAR was given
+        //You need to set one for HARDESCAPES only in this case.
+        if(!isset($this->language_data['HARDCHAR'])) {
+            $this->language_data['HARDCHAR'] = $this->language_data['ESCAPE_CHAR'];
+        }
+
+        //NEW in 1.0.8: Allow styles to be loaded from a separate file to override defaults
+        $style_filename = substr($file_name, 0, -4) . '.style.php';
+        if (is_readable($style_filename)) {
+            //Clear any style_data that could have been set before ...
+            if (isset($style_data)) {
+                unset($style_data);
+            }
+
+            //Read the Style Information from the style file
+            include $style_filename;
+
+            //Apply the new styles to our current language styles
+            if (isset($style_data) && is_array($style_data)) {
+                $this->language_data['STYLES'] =
+                    $this->merge_arrays($this->language_data['STYLES'], $style_data);
+            }
+        }
+    }
+
+    /**
+     * Takes the parsed code and various options, and creates the HTML
+     * surrounding it to make it look nice.
+     *
+     * @param  string The code already parsed (reference!)
+     * @since  1.0.0
+     * @access private
+     */
+    function finalise(&$parsed_code) {
+        // Remove end parts of important declarations
+        // This is BUGGY!! My fault for bad code: fix coming in 1.2
+        // @todo Remove this crap
+        if ($this->enable_important_blocks &&
+            (strpos($parsed_code, $this->hsc(GESHI_START_IMPORTANT)) === false)) {
+            $parsed_code = str_replace($this->hsc(GESHI_END_IMPORTANT), '', $parsed_code);
+        }
+
+        // Add HTML whitespace stuff if we're using the <div> header
+        if ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) {
+            $this->indent($parsed_code);
+        }
+
+        // purge some unnecessary stuff
+        /** NOTE: memorypeak #1 */
+        $parsed_code = preg_replace('#<span[^>]+>(\s*)</span>#', '\\1', $parsed_code);
+
+        // If we are using IDs for line numbers, there needs to be an overall
+        // ID set to prevent collisions.
+        if ($this->add_ids && !$this->overall_id) {
+            $this->overall_id = 'geshi-' . substr(md5(microtime()), 0, 4);
+        }
+
+        // Get code into lines
+        /** NOTE: memorypeak #2 */
+        $code = explode("\n", $parsed_code);
+        $parsed_code = $this->header();
+
+        // If we're using line numbers, we insert <li>s and appropriate
+        // markup to style them (otherwise we don't need to do anything)
+        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) {
+            // If we're using the <pre> header, we shouldn't add newlines because
+            // the <pre> will line-break them (and the <li>s already do this for us)
+            $ls = ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) ? "\n" : '';
+
+            // Set vars to defaults for following loop
+            $i = 0;
+
+            // Foreach line...
+            for ($i = 0, $n = count($code); $i < $n;) {
+                //Reset the attributes for a new line ...
+                $attrs = array();
+
+                // Make lines have at least one space in them if they're empty
+                // BenBE: Checking emptiness using trim instead of relying on blanks
+                if ('' == trim($code[$i])) {
+                    $code[$i] = '&nbsp;';
+                }
+
+                // If this is a "special line"...
+                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                    // Set the attributes to style the line
+                    if ($this->use_classes) {
+                        //$attr = ' class="li2"';
+                        $attrs['class'][] = 'li2';
+                        $def_attr = ' class="de2"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style2 . '"';
+                        $attrs['style'][] = $this->line_style2;
+                        // This style "covers up" the special styles set for special lines
+                        // so that styles applied to special lines don't apply to the actual
+                        // code on that line
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                } else {
+                    if ($this->use_classes) {
+                        //$attr = ' class="li1"';
+                        $attrs['class'][] = 'li1';
+                        $def_attr = ' class="de1"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style1 . '"';
+                        $attrs['style'][] = $this->line_style1;
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                }
+
+                //Check which type of tag to insert for this line
+                if ($this->header_type == GESHI_HEADER_PRE_VALID) {
+                    $start = "<pre$def_attr>";
+                    $end = '</pre>';
+                } else {
+                    // Span or div?
+                    $start = "<div$def_attr>";
+                    $end = '</div>';
+                }
+
+                ++$i;
+
+                // Are we supposed to use ids? If so, add them
+                if ($this->add_ids) {
+                    $attrs['id'][] = "$this->overall_id-$i";
+                }
+
+                //Is this some line with extra styles???
+                if (in_array($i, $this->highlight_extra_lines)) {
+                    if ($this->use_classes) {
+                        if (isset($this->highlight_extra_lines_styles[$i])) {
+                            $attrs['class'][] = "lx$i";
+                        } else {
+                            $attrs['class'][] = "ln-xtra";
+                        }
+                    } else {
+                        array_push($attrs['style'], $this->get_line_style($i));
+                    }
+                }
+
+                // Add in the line surrounded by appropriate list HTML
+                $attr_string = '';
+                foreach ($attrs as $key => $attr) {
+                    $attr_string .= ' ' . $key . '="' . implode(' ', $attr) . '"';
+                }
+
+                $parsed_code .= "<li$attr_string>$start{$code[$i-1]}$end</li>$ls";
+                unset($code[$i - 1]);
+            }
+        } else {
+            $n = count($code);
+            if ($this->use_classes) {
+                $attributes = ' class="de1"';
+            } else {
+                $attributes = ' style="'. $this->code_style .'"';
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_VALID) {
+                $parsed_code .= '<pre'. $attributes .'>';
+            } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+                if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                    if ($this->use_classes) {
+                        $attrs = ' class="ln"';
+                    } else {
+                        $attrs = ' style="'. $this->table_linenumber_style .'"';
+                    }
+                    $parsed_code .= '<td'.$attrs.'><pre'.$attributes.'>';
+                    // get linenumbers
+                    // we don't merge it with the for below, since it should be better for
+                    // memory consumption this way
+                    // @todo: but... actually it would still be somewhat nice to merge the two loops
+                    //        the mem peaks are at different positions
+                    for ($i = 0; $i < $n; ++$i) {
+                        $close = 0;
+                        // fancy lines
+                        if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                            $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                            // Set the attributes to style the line
+                            if ($this->use_classes) {
+                                $parsed_code .= '<span class="xtra li2"><span class="de2">';
+                            } else {
+                                // This style "covers up" the special styles set for special lines
+                                // so that styles applied to special lines don't apply to the actual
+                                // code on that line
+                                $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
+                                                  .'<span style="' . $this->code_style .'">';
+                            }
+                            $close += 2;
+                        }
+                        //Is this some line with extra styles???
+                        if (in_array($i + 1, $this->highlight_extra_lines)) {
+                            if ($this->use_classes) {
+                                if (isset($this->highlight_extra_lines_styles[$i])) {
+                                    $parsed_code .= "<span class=\"xtra lx$i\">";
+                                } else {
+                                    $parsed_code .= "<span class=\"xtra ln-xtra\">";
+                                }
+                            } else {
+                                $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
+                            }
+                            ++$close;
+                        }
+                        $parsed_code .= $this->line_numbers_start + $i;
+                        if ($close) {
+                            $parsed_code .= str_repeat('</span>', $close);
+                        } else if ($i != $n) {
+                            $parsed_code .= "\n";
+                        }
+                    }
+                    $parsed_code .= '</pre></td><td'.$attributes.'>';
+                }
+                $parsed_code .= '<pre'. $attributes .'>';
+            }
+            // No line numbers, but still need to handle highlighting lines extra.
+            // Have to use divs so the full width of the code is highlighted
+            $close = 0;
+            for ($i = 0; $i < $n; ++$i) {
+                // Make lines have at least one space in them if they're empty
+                // BenBE: Checking emptiness using trim instead of relying on blanks
+                if ('' == trim($code[$i])) {
+                    $code[$i] = '&nbsp;';
+                }
+                // fancy lines
+                if ($this->line_numbers == GESHI_FANCY_LINE_NUMBERS &&
+                    $i % $this->line_nth_row == ($this->line_nth_row - 1)) {
+                    // Set the attributes to style the line
+                    if ($this->use_classes) {
+                        $parsed_code .= '<span class="xtra li2"><span class="de2">';
+                    } else {
+                        // This style "covers up" the special styles set for special lines
+                        // so that styles applied to special lines don't apply to the actual
+                        // code on that line
+                        $parsed_code .= '<span style="display:block;' . $this->line_style2 . '">'
+                                          .'<span style="' . $this->code_style .'">';
+                    }
+                    $close += 2;
+                }
+                //Is this some line with extra styles???
+                if (in_array($i + 1, $this->highlight_extra_lines)) {
+                    if ($this->use_classes) {
+                        if (isset($this->highlight_extra_lines_styles[$i])) {
+                            $parsed_code .= "<span class=\"xtra lx$i\">";
+                        } else {
+                            $parsed_code .= "<span class=\"xtra ln-xtra\">";
+                        }
+                    } else {
+                        $parsed_code .= "<span style=\"display:block;" . $this->get_line_style($i) . "\">";
+                    }
+                    ++$close;
+                }
+
+                $parsed_code .= $code[$i];
+
+                if ($close) {
+                  $parsed_code .= str_repeat('</span>', $close);
+                  $close = 0;
+                }
+                elseif ($i + 1 < $n) {
+                    $parsed_code .= "\n";
+                }
+                unset($code[$i]);
+            }
+
+            if ($this->header_type == GESHI_HEADER_PRE_VALID || $this->header_type == GESHI_HEADER_PRE_TABLE) {
+                $parsed_code .= '</pre>';
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $parsed_code .= '</td>';
+            }
+        }
+
+        $parsed_code .= $this->footer();
+    }
+
+    /**
+     * Creates the header for the code block (with correct attributes)
+     *
+     * @return string The header for the code block
+     * @since  1.0.0
+     * @access private
+     */
+    function header() {
+        // Get attributes needed
+        /**
+         * @todo   Document behaviour change - class is outputted regardless of whether
+         *         we're using classes or not. Same with style
+         */
+        $attributes = ' class="' . $this->language;
+        if ($this->overall_class != '') {
+            $attributes .= " ".$this->overall_class;
+        }
+        $attributes .= '"';
+
+        if ($this->overall_id != '') {
+            $attributes .= " id=\"{$this->overall_id}\"";
+        }
+        if ($this->overall_style != '') {
+            $attributes .= ' style="' . $this->overall_style . '"';
+        }
+
+        $ol_attributes = '';
+
+        if ($this->line_numbers_start != 1) {
+            $ol_attributes .= ' start="' . $this->line_numbers_start . '"';
+        }
+
+        // Get the header HTML
+        $header = $this->header_content;
+        if ($header) {
+            if ($this->header_type == GESHI_HEADER_PRE || $this->header_type == GESHI_HEADER_PRE_VALID) {
+                $header = str_replace("\n", '', $header);
+            }
+            $header = $this->replace_keywords($header);
+
+            if ($this->use_classes) {
+                $attr = ' class="head"';
+            } else {
+                $attr = " style=\"{$this->header_content_style}\"";
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $header = "<thead><tr><td colspan=\"2\" $attr>$header</td></tr></thead>";
+            } else {
+                $header = "<div$attr>$header</div>";
+            }
+        }
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "$header<ol$attributes$ol_attributes>";
+            }
+            return $header . ($this->force_code_block ? '<div>' : '');
+        }
+
+        // Work out what to return and do it
+        if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                return "<pre$attributes>$header<ol$ol_attributes>";
+            } else if ($this->header_type == GESHI_HEADER_DIV ||
+                $this->header_type == GESHI_HEADER_PRE_VALID) {
+                return "<div$attributes>$header<ol$ol_attributes>";
+            } else if ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+                return "<table$attributes>$header<tbody><tr class=\"li1\">";
+            }
+        } else {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                return "<pre$attributes>$header"  .
+                    ($this->force_code_block ? '<div>' : '');
+            } else {
+                return "<div$attributes>$header" .
+                    ($this->force_code_block ? '<div>' : '');
+            }
+        }
+    }
+
+    /**
+     * Returns the footer for the code block.
+     *
+     * @return string The footer for the code block
+     * @since  1.0.0
+     * @access private
+     */
+    function footer() {
+        $footer = $this->footer_content;
+        if ($footer) {
+            if ($this->header_type == GESHI_HEADER_PRE) {
+                $footer = str_replace("\n", '', $footer);;
+            }
+            $footer = $this->replace_keywords($footer);
+
+            if ($this->use_classes) {
+                $attr = ' class="foot"';
+            } else {
+                $attr = " style=\"{$this->footer_content_style}\"";
+            }
+            if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                $footer = "<tfoot><tr><td colspan=\"2\">$footer</td></tr></tfoot>";
+            } else {
+                $footer = "<div$attr>$footer</div>";
+            }
+        }
+
+        if (GESHI_HEADER_NONE == $this->header_type) {
+            return ($this->line_numbers != GESHI_NO_LINE_NUMBERS) ? '</ol>' . $footer : $footer;
+        }
+
+        if ($this->header_type == GESHI_HEADER_DIV || $this->header_type == GESHI_HEADER_PRE_VALID) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</ol>$footer</div>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</div>";
+        }
+        elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</tr></tbody>$footer</table>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</div>";
+        }
+        else {
+            if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+                return "</ol>$footer</pre>";
+            }
+            return ($this->force_code_block ? '</div>' : '') .
+                "$footer</pre>";
+        }
+    }
+
+    /**
+     * Replaces certain keywords in the header and footer with
+     * certain configuration values
+     *
+     * @param  string The header or footer content to do replacement on
+     * @return string The header or footer with replaced keywords
+     * @since  1.0.2
+     * @access private
+     */
+    function replace_keywords($instr) {
+        $keywords = $replacements = array();
+
+        $keywords[] = '<TIME>';
+        $keywords[] = '{TIME}';
+        $replacements[] = $replacements[] = number_format($time = $this->get_time(), 3);
+
+        $keywords[] = '<LANGUAGE>';
+        $keywords[] = '{LANGUAGE}';
+        $replacements[] = $replacements[] = $this->language_data['LANG_NAME'];
+
+        $keywords[] = '<VERSION>';
+        $keywords[] = '{VERSION}';
+        $replacements[] = $replacements[] = GESHI_VERSION;
+
+        $keywords[] = '<SPEED>';
+        $keywords[] = '{SPEED}';
+        if ($time <= 0) {
+            $speed = 'N/A';
+        } else {
+            $speed = strlen($this->source) / $time;
+            if ($speed >= 1024) {
+                $speed = sprintf("%.2f KB/s", $speed / 1024.0);
+            } else {
+                $speed = sprintf("%.0f B/s", $speed);
+            }
+        }
+        $replacements[] = $replacements[] = $speed;
+
+        return str_replace($keywords, $replacements, $instr);
+    }
+
+    /**
+     * Secure replacement for PHP built-in function htmlspecialchars().
+     *
+     * See ticket #427 (http://wush.net/trac/wikka/ticket/427) for the rationale
+     * for this replacement function.
+     *
+     * The INTERFACE for this function is almost the same as that for
+     * htmlspecialchars(), with the same default for quote style; however, there
+     * is no 'charset' parameter. The reason for this is as follows:
+     *
+     * The PHP docs say:
+     *      "The third argument charset defines character set used in conversion."
+     *
+     * I suspect PHP's htmlspecialchars() is working at the byte-value level and
+     * thus _needs_ to know (or asssume) a character set because the special
+     * characters to be replaced could exist at different code points in
+     * different character sets. (If indeed htmlspecialchars() works at
+     * byte-value level that goes some  way towards explaining why the
+     * vulnerability would exist in this function, too, and not only in
+     * htmlentities() which certainly is working at byte-value level.)
+     *
+     * This replacement function however works at character level and should
+     * therefore be "immune" to character set differences - so no charset
+     * parameter is needed or provided. If a third parameter is passed, it will
+     * be silently ignored.
+     *
+     * In the OUTPUT there is a minor difference in that we use '&#39;' instead
+     * of PHP's '&#039;' for a single quote: this provides compatibility with
+     *      get_html_translation_table(HTML_SPECIALCHARS, ENT_QUOTES)
+     * (see comment by mikiwoz at yahoo dot co dot uk on
+     * http://php.net/htmlspecialchars); it also matches the entity definition
+     * for XML 1.0
+     * (http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_Special_characters).
+     * Like PHP we use a numeric character reference instead of '&apos;' for the
+     * single quote. For the other special characters we use the named entity
+     * references, as PHP is doing.
+     *
+     * @author      {@link http://wikkawiki.org/JavaWoman Marjolein Katsma}
+     *
+     * @license     http://www.gnu.org/copyleft/lgpl.html
+     *              GNU Lesser General Public License
+     * @copyright   Copyright 2007, {@link http://wikkawiki.org/CreditsPage
+     *              Wikka Development Team}
+     *
+     * @access      private
+     * @param       string  $string string to be converted
+     * @param       integer $quote_style
+     *                      - ENT_COMPAT:   escapes &, <, > and double quote (default)
+     *                      - ENT_NOQUOTES: escapes only &, < and >
+     *                      - ENT_QUOTES:   escapes &, <, >, double and single quotes
+     * @return      string  converted string
+     * @since       1.0.7.18
+     */
+    function hsc($string, $quote_style = ENT_COMPAT) {
+        // init
+        static $aTransSpecchar = array(
+            '&' => '&amp;',
+            '"' => '&quot;',
+            '<' => '&lt;',
+            '>' => '&gt;',
+
+            //This fix is related to SF#1923020, but has to be applied
+            //regardless of actually highlighting symbols.
+
+            //Circumvent a bug with symbol highlighting
+            //This is required as ; would produce undesirable side-effects if it
+            //was not to be processed as an entity.
+            ';' => '<SEMI>', // Force ; to be processed as entity
+            '|' => '<PIPE>' // Force | to be processed as entity
+            );                      // ENT_COMPAT set
+
+        switch ($quote_style) {
+            case ENT_NOQUOTES: // don't convert double quotes
+                unset($aTransSpecchar['"']);
+                break;
+            case ENT_QUOTES: // convert single quotes as well
+                $aTransSpecchar["'"] = '&#39;'; // (apos) htmlspecialchars() uses '&#039;'
+                break;
+        }
+
+        // return translated string
+        return strtr($string, $aTransSpecchar);
+    }
+
+    /**
+     * Returns a stylesheet for the highlighted code. If $economy mode
+     * is true, we only return the stylesheet declarations that matter for
+     * this code block instead of the whole thing
+     *
+     * @param  boolean Whether to use economy mode or not
+     * @return string A stylesheet built on the data for the current language
+     * @since  1.0.0
+     */
+    function get_stylesheet($economy_mode = true) {
+        // If there's an error, chances are that the language file
+        // won't have populated the language data file, so we can't
+        // risk getting a stylesheet...
+        if ($this->error) {
+            return '';
+        }
+
+        //Check if the style rearrangements have been processed ...
+        //This also does some preprocessing to check which style groups are useable ...
+        if(!isset($this->language_data['NUMBERS_CACHE'])) {
+            $this->build_style_cache();
+        }
+
+        // First, work out what the selector should be. If there's an ID,
+        // that should be used, the same for a class. Otherwise, a selector
+        // of '' means that these styles will be applied anywhere
+        if ($this->overall_id) {
+            $selector = '#' . $this->overall_id;
+        } else {
+            $selector = '.' . $this->language;
+            if ($this->overall_class) {
+                $selector .= '.' . $this->overall_class;
+            }
+        }
+        $selector .= ' ';
+
+        // Header of the stylesheet
+        if (!$economy_mode) {
+            $stylesheet = "/**\n".
+                " * GeSHi Dynamically Generated Stylesheet\n".
+                " * --------------------------------------\n".
+                " * Dynamically generated stylesheet for {$this->language}\n".
+                " * CSS class: {$this->overall_class}, CSS id: {$this->overall_id}\n".
+                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
+                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
+                " * --------------------------------------\n".
+                " */\n";
+        } else {
+            $stylesheet = "/**\n".
+                " * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann\n" .
+                " * (http://qbnz.com/highlighter/ and http://geshi.org/)\n".
+                " */\n";
+        }
+
+        // Set the <ol> to have no effect at all if there are line numbers
+        // (<ol>s have margins that should be destroyed so all layout is
+        // controlled by the set_overall_style method, which works on the
+        // <pre> or <div> container). Additionally, set default styles for lines
+        if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+            //$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
+            $stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
+        }
+
+        // Add overall styles
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->overall_style != '') {
+            $stylesheet .= "$selector {{$this->overall_style}}\n";
+        }
+
+        // Add styles for links
+        // note: economy mode does not make _any_ sense here
+        //       either the style is empty and thus no selector is needed
+        //       or the appropriate key is given.
+        foreach ($this->link_styles as $key => $style) {
+            if ($style != '') {
+                switch ($key) {
+                    case GESHI_LINK:
+                        $stylesheet .= "{$selector}a:link {{$style}}\n";
+                        break;
+                    case GESHI_HOVER:
+                        $stylesheet .= "{$selector}a:hover {{$style}}\n";
+                        break;
+                    case GESHI_ACTIVE:
+                        $stylesheet .= "{$selector}a:active {{$style}}\n";
+                        break;
+                    case GESHI_VISITED:
+                        $stylesheet .= "{$selector}a:visited {{$style}}\n";
+                        break;
+                }
+            }
+        }
+
+        // Header and footer
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->header_content_style != '') {
+            $stylesheet .= "$selector.head {{$this->header_content_style}}\n";
+        }
+        if ($this->footer_content_style != '') {
+            $stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
+        }
+
+        // Styles for important stuff
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->important_styles != '') {
+            $stylesheet .= "$selector.imp {{$this->important_styles}}\n";
+        }
+
+        // Simple line number styles
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->line_style1 != '') {
+            $stylesheet .= "{$selector}li, {$selector}.li1 {{$this->line_style1}}\n";
+        }
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->table_linenumber_style != '') {
+            $stylesheet .= "{$selector}.ln {{$this->table_linenumber_style}}\n";
+        }
+        // If there is a style set for fancy line numbers, echo it out
+        if ((!$economy_mode || $this->line_numbers == GESHI_FANCY_LINE_NUMBERS) && $this->line_style2 != '') {
+            $stylesheet .= "{$selector}.li2 {{$this->line_style2}}\n";
+        }
+
+        // note: empty styles are meaningless
+        foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['KEYWORDS'][$group]) &&
+                $this->lexic_permissions['KEYWORDS'][$group]))) {
+                $stylesheet .= "$selector.kw$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['COMMENTS'][$group]) &&
+                $this->lexic_permissions['COMMENTS'][$group]) ||
+                (!empty($this->language_data['COMMENT_REGEXP']) &&
+                !empty($this->language_data['COMMENT_REGEXP'][$group])))) {
+                $stylesheet .= "$selector.co$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['ESCAPE_CHAR'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['ESCAPE_CHAR'])) {
+                // NEW: since 1.0.8 we have to handle hardescapes
+                if ($group === 'HARD') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.es$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['BRACKETS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['BRACKETS'])) {
+                $stylesheet .= "$selector.br$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['SYMBOLS'])) {
+                $stylesheet .= "$selector.sy$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['STRINGS'])) {
+                // NEW: since 1.0.8 we have to handle hardquotes
+                if ($group === 'HARD') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.st$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['NUMBERS'])) {
+                $stylesheet .= "$selector.nu$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['METHODS'])) {
+                $stylesheet .= "$selector.me$group {{$styles}}\n";
+            }
+        }
+        // note: neglect economy_mode, empty styles are meaningless
+        foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
+            if ($styles != '') {
+                $stylesheet .= "$selector.sc$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['REGEXPS'][$group]) &&
+                $this->lexic_permissions['REGEXPS'][$group]))) {
+                if (is_array($this->language_data['REGEXPS'][$group]) &&
+                    array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$group])) {
+                    $stylesheet .= "$selector.";
+                    $stylesheet .= $this->language_data['REGEXPS'][$group][GESHI_CLASS];
+                    $stylesheet .= " {{$styles}}\n";
+                } else {
+                    $stylesheet .= "$selector.re$group {{$styles}}\n";
+                }
+            }
+        }
+        // Styles for lines being highlighted extra
+        if (!$economy_mode || (count($this->highlight_extra_lines)!=count($this->highlight_extra_lines_styles))) {
+            $stylesheet .= "{$selector}.ln-xtra, {$selector}li.ln-xtra, {$selector}div.ln-xtra {{$this->highlight_extra_lines_style}}\n";
+        }
+        $stylesheet .= "{$selector}span.xtra { display:block; }\n";
+        foreach ($this->highlight_extra_lines_styles as $lineid => $linestyle) {
+            $stylesheet .= "{$selector}.lx$lineid, {$selector}li.lx$lineid, {$selector}div.lx$lineid {{$linestyle}}\n";
+        }
+
+        return $stylesheet;
+    }
+
+    /**
+     * Get's the style that is used for the specified line
+     *
+     * @param int The line number information is requested for
+     * @access private
+     * @since 1.0.7.21
+     */
+    function get_line_style($line) {
+        //$style = null;
+        $style = null;
+        if (isset($this->highlight_extra_lines_styles[$line])) {
+            $style = $this->highlight_extra_lines_styles[$line];
+        } else { // if no "extra" style assigned
+            $style = $this->highlight_extra_lines_style;
+        }
+
+        return $style;
+    }
+
+    /**
+    * this functions creates an optimized regular expression list
+    * of an array of strings.
+    *
+    * Example:
+    * <code>$list = array('faa', 'foo', 'foobar');
+    *          => string 'f(aa|oo(bar)?)'</code>
+    *
+    * @param $list array of (unquoted) strings
+    * @param $regexp_delimiter your regular expression delimiter, @see preg_quote()
+    * @return string for regular expression
+    * @author Milian Wolff <mail@milianw.de>
+    * @since 1.0.8
+    * @access private
+    */
+    function optimize_regexp_list($list, $regexp_delimiter = '/') {
+        $regex_chars = array('.', '\\', '+', '*', '?', '[', '^', ']', '$',
+            '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
+        sort($list);
+        $regexp_list = array('');
+        $num_subpatterns = 0;
+        $list_key = 0;
+
+        // the tokens which we will use to generate the regexp list
+        $tokens = array();
+        $prev_keys = array();
+        // go through all entries of the list and generate the token list
+        $cur_len = 0;
+        for ($i = 0, $i_max = count($list); $i < $i_max; ++$i) {
+            if ($cur_len > GESHI_MAX_PCRE_LENGTH) {
+                // seems like the length of this pcre is growing exorbitantly
+                $regexp_list[++$list_key] = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                $num_subpatterns = substr_count($regexp_list[$list_key], '(?:');
+                $tokens = array();
+                $cur_len = 0;
+            }
+            $level = 0;
+            $entry = preg_quote((string) $list[$i], $regexp_delimiter);
+            $pointer = &$tokens;
+            // properly assign the new entry to the correct position in the token array
+            // possibly generate smaller common denominator keys
+            while (true) {
+                // get the common denominator
+                if (isset($prev_keys[$level])) {
+                    if ($prev_keys[$level] == $entry) {
+                        // this is a duplicate entry, skip it
+                        continue 2;
+                    }
+                    $char = 0;
+                    while (isset($entry[$char]) && isset($prev_keys[$level][$char])
+                            && $entry[$char] == $prev_keys[$level][$char]) {
+                        ++$char;
+                    }
+                    if ($char > 0) {
+                        // this entry has at least some chars in common with the current key
+                        if ($char == strlen($prev_keys[$level])) {
+                            // current key is totally matched, i.e. this entry has just some bits appended
+                            $pointer = &$pointer[$prev_keys[$level]];
+                        } else {
+                            // only part of the keys match
+                            $new_key_part1 = substr($prev_keys[$level], 0, $char);
+                            $new_key_part2 = substr($prev_keys[$level], $char);
+
+                            if (in_array($new_key_part1[0], $regex_chars)
+                                || in_array($new_key_part2[0], $regex_chars)) {
+                                // this is bad, a regex char as first character
+                                $pointer[$entry] = array('' => true);
+                                array_splice($prev_keys, $level, count($prev_keys), $entry);
+                                $cur_len += strlen($entry);
+                                continue;
+                            } else {
+                                // relocate previous tokens
+                                $pointer[$new_key_part1] = array($new_key_part2 => $pointer[$prev_keys[$level]]);
+                                unset($pointer[$prev_keys[$level]]);
+                                $pointer = &$pointer[$new_key_part1];
+                                // recreate key index
+                                array_splice($prev_keys, $level, count($prev_keys), array($new_key_part1, $new_key_part2));
+                                $cur_len += strlen($new_key_part2);
+                            }
+                        }
+                        ++$level;
+                        $entry = substr($entry, $char);
+                        continue;
+                    }
+                    // else: fall trough, i.e. no common denominator was found
+                }
+                if ($level == 0 && !empty($tokens)) {
+                    // we can dump current tokens into the string and throw them away afterwards
+                    $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                    $new_subpatterns = substr_count($new_entry, '(?:');
+                    if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + $new_subpatterns > GESHI_MAX_PCRE_SUBPATTERNS) {
+                        $regexp_list[++$list_key] = $new_entry;
+                        $num_subpatterns = $new_subpatterns;
+                    } else {
+                        if (!empty($regexp_list[$list_key])) {
+                            $new_entry = '|' . $new_entry;
+                        }
+                        $regexp_list[$list_key] .= $new_entry;
+                        $num_subpatterns += $new_subpatterns;
+                    }
+                    $tokens = array();
+                    $cur_len = 0;
+                }
+                // no further common denominator found
+                $pointer[$entry] = array('' => true);
+                array_splice($prev_keys, $level, count($prev_keys), $entry);
+
+                $cur_len += strlen($entry);
+                break;
+            }
+            unset($list[$i]);
+        }
+        // make sure the last tokens get converted as well
+        $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+        if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + substr_count($new_entry, '(?:') > GESHI_MAX_PCRE_SUBPATTERNS) {
+            $regexp_list[++$list_key] = $new_entry;
+        } else {
+            if (!empty($regexp_list[$list_key])) {
+                $new_entry = '|' . $new_entry;
+            }
+            $regexp_list[$list_key] .= $new_entry;
+        }
+        return $regexp_list;
+    }
+    /**
+    * this function creates the appropriate regexp string of an token array
+    * you should not call this function directly, @see $this->optimize_regexp_list().
+    *
+    * @param &$tokens array of tokens
+    * @param $recursed bool to know wether we recursed or not
+    * @return string
+    * @author Milian Wolff <mail@milianw.de>
+    * @since 1.0.8
+    * @access private
+    */
+    function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
+        $list = '';
+        foreach ($tokens as $token => $sub_tokens) {
+            $list .= $token;
+            $close_entry = isset($sub_tokens['']);
+            unset($sub_tokens['']);
+            if (!empty($sub_tokens)) {
+                $list .= '(?:' . $this->_optimize_regexp_list_tokens_to_string($sub_tokens, true) . ')';
+                if ($close_entry) {
+                    // make sub_tokens optional
+                    $list .= '?';
+                }
+            }
+            $list .= '|';
+        }
+        if (!$recursed) {
+            // do some optimizations
+            // common trailing strings
+            // BUGGY!
+            //$list = preg_replace_callback('#(?<=^|\:|\|)\w+?(\w+)(?:\|.+\1)+(?=\|)#', create_function(
+            //    '$matches', 'return "(?:" . preg_replace("#" . preg_quote($matches[1], "#") . "(?=\||$)#", "", $matches[0]) . ")" . $matches[1];'), $list);
+            // (?:p)? => p?
+            $list = preg_replace('#\(\?\:(.)\)\?#', '\1?', $list);
+            // (?:a|b|c|d|...)? => [abcd...]?
+            // TODO: a|bb|c => [ac]|bb
+            static $callback_2;
+            if (!isset($callback_2)) {
+                $callback_2 = create_function('$matches', 'return "[" . str_replace("|", "", $matches[1]) . "]";');
+            }
+            $list = preg_replace_callback('#\(\?\:((?:.\|)+.)\)#', $callback_2, $list);
+        }
+        // return $list without trailing pipe
+        return substr($list, 0, -1);
+    }
+} // End Class GeSHi
+
+
+if (!function_exists('geshi_highlight')) {
+    /**
+     * Easy way to highlight stuff. Behaves just like highlight_string
+     *
+     * @param string The code to highlight
+     * @param string The language to highlight the code in
+     * @param string The path to the language files. You can leave this blank if you need
+     *               as from version 1.0.7 the path should be automatically detected
+     * @param boolean Whether to return the result or to echo
+     * @return string The code highlighted (if $return is true)
+     * @since 1.0.2
+     */
+    function geshi_highlight($string, $language, $path = null, $return = false) {
+        $geshi = new GeSHi($string, $language, $path);
+        $geshi->set_header_type(GESHI_HEADER_NONE);
+
+        if ($return) {
+            return '<code>' . $geshi->parse_code() . '</code>';
+        }
+
+        echo '<code>' . $geshi->parse_code() . '</code>';
+
+        if ($geshi->error()) {
+            return false;
+        }
+        return true;
+    }
+}
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/abap.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/abap.php
new file mode 100644
index 000000000..229de9891
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/abap.php
@@ -0,0 +1,1409 @@
+<?php
+/*************************************************************************************
+ * abap.php
+ * --------
+ * Author: Andres Picazo (andres@andrespicazo.com)
+ * Contributors:
+ *  - Sandra Rossi (sandra.rossi@gmail.com)
+ *  - Jacob Laursen (jlu@kmd.dk)
+ * Copyright: (c) 2007 Andres Picazo
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * ABAP language file for GeSHi.
+ *
+ * Reference abap language documentation (abap 7.1) : http://help.sap.com/abapdocu/en/ABENABAP_INDEX.htm
+ *
+ * ABAP syntax is highly complex, several problems could not be addressed, see TODO below if you dare ;-)
+ * Be aware that in ABAP language, keywords may be composed of several tokens,
+ *    separated by one or more spaces or carriage returns
+ *    (for example CONCATENATE 'hello' 'world' INTO string SEPARATED  BY ' ')
+ *    it's why we must decode them with REGEXPS. As there are many keywords with several tokens,
+ *    I had to create a separate section in the code to simplify the reading.
+ * Be aware that some words may be highlighted several times like for "ref to data", which is first
+ *    highlighted for "ref to data", then secondly for "ref to". It is very important to
+ *    position "ref to" after "ref to data" otherwise "data" wouldn't be highlighted because
+ *    of the previous highlight.
+ * Control, declarative and other statements are assigned URLs to sap documentation website:
+ *    http://help.sap.com/abapdocu/en/ABAP<statement_name>.htm
+ *
+ * CHANGES
+ * -------
+ * 2009/02/25 (1.0.8.3)
+ *   -  Some more rework of the language file
+ * 2009/01/04 (1.0.8.2)
+ *   -  Major Release, more than 1000 statements and keywords added = whole abap 7.1 (Sandra Rossi)
+ * 2007/06/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *   - in DATA data TYPE type, 2nd "data" and 2nd "type" are highlighted with data
+ *     style, but should be ignored. Same problem for all words!!! This is quite impossible to
+ *     solve it as we should define syntaxes of all statements (huge effort!) and use a lex
+ *     or something like that instead of regexp I guess.
+ *   - Some words are considered as being statement names (report, tables, etc.) though they
+ *     are used as keyword in some statements. For example: FORM xxxx TABLES itab. It was
+ *     arbitrary decided to define them as statement instead of keyword, because it may be
+ *     useful to have the URL to SAP help for some of them.
+ *   - if a comment is between 2 words of a keyword (for example SEPARATED "comment \n BY),
+ *     it is not considered as a keyword, but it should!
+ *   - for statements like "READ DATASET", GeSHi does not allow to set URLs because these
+ *     statements are determined by REGEXPS. For "READ DATASET", the URL should be
+ *     ABAPREAD_DATASET.htm. If a technical solution is found, be careful : URLs
+ *     are sometimes not valid because the URL does not exist. For example, for "AT NEW"
+ *     statement, the URL should be ABAPAT_ITAB.htm (not ABAPAT_NEW.htm).
+ *     There are many other exceptions.
+ *     Note: for adding this functionality within your php program, you can execute this code:
+ *       function add_urls_to_multi_tokens( $matches ) {
+ *           $url = preg_replace( "/[ \n]+/" , "_" , $matches[3] );
+ *           if( $url == $matches[3] ) return $matches[0] ;
+ *           else return $matches[1]."<a href=\"http://help.sap.com/abapdocu/en/ABAP".strtoupper($url).".htm\">".$matches[3]."</a>".$matches[4];
+ *           }
+ *       $html = $geshi->parse_code();
+ *       $html = preg_replace_callback( "£(zzz:(control|statement|data);\">)(.+?)(</span>)£s", "add_urls_to_multi_tokens", $html );
+ *       echo $html;
+ *   - Numbers followed by a dot terminating the statement are not properly recognized
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'ABAP',
+    'COMMENT_SINGLE' => array(
+        1 => '"'
+        ),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // lines beginning with star at 1st position are comments
+        // (star anywhere else is not a comment, especially be careful with
+        // "assign dref->* to <fs>" statement)
+        2 => '/^\*.*?$/m'
+        ),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array(
+        1 => "'",
+        2 => "`"
+        ),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        //***********************************************
+        // Section 2 : process sequences of several tokens
+        //***********************************************
+
+        7 => array(
+            'at new',
+            'at end of',
+            'at first',
+            'at last',
+            'loop at',
+            'loop at screen',
+            ),
+
+        8 => array(
+            'private section',
+            'protected section',
+            'public section',
+            'at line-selection',
+            'at selection-screen',
+            'at user-command',
+            'assign component',
+            'assign table field',
+            'call badi',
+            'call customer-function',
+            'call customer subscreen',
+            'call dialog',
+            'call function',
+            'call method',
+            'call screen',
+            'call selection-screen',
+            'call transaction',
+            'call transformation',
+            'close cursor',
+            'close dataset',
+            'commit work',
+            'convert date',
+            'convert text',
+            'convert time stamp',
+            'create data',
+            'create object',
+            'delete dataset',
+            'delete from',
+            'describe distance',
+            'describe field',
+            'describe list',
+            'describe table',
+            'exec sql',
+            'exit from sql',
+            'exit from step-loop',
+            'export dynpro',
+            'export nametab',
+            'free memory',
+            'generate subroutine-pool',
+            'get badi',
+            'get bit',
+            'get cursor',
+            'get dataset',
+            'get locale',
+            'get parameter',
+            'get pf-status',
+            'get property',
+            'get reference',
+            'get run time',
+            'get time',
+            'get time stamp',
+            'import directory',
+            'insert report',
+            'insert text-pool',
+            'leave list-processing',
+            'leave program',
+            'leave screen',
+            'leave to list-processing',
+            'leave to transaction',
+            'modify line',
+            'modify screen',
+            'move percentage',
+            'open cursor',
+            'open dataset',
+            'raise event',
+            'raise exception',
+            'read dataset',
+            'read line',
+            'read report',
+            'read table',
+            'read textpool',
+            'receive results from function',
+            'refresh control',
+            'rollback work',
+            'set bit',
+            'set blank lines',
+            'set country',
+            'set cursor',
+            'set dataset',
+            'set extended check',
+            'set handler',
+            'set hold data',
+            'set language',
+            'set left scroll-boundary',
+            'set locale',
+            'set margin',
+            'set parameter',
+            'set pf-status',
+            'set property',
+            'set run time analyzer',
+            'set run time clock',
+            'set screen',
+            'set titlebar',
+            'set update task',
+            'set user-command',
+            'suppress dialog',
+            'truncate dataset',
+            'wait until',
+            'wait up to',
+            ),
+
+        9 => array(
+            'accepting duplicate keys',
+            'accepting padding',
+            'accepting truncation',
+            'according to',
+            'actual length',
+            'adjacent duplicates',
+            'after input',
+            'all blob columns',
+            'all clob columns',
+            'all fields',
+            'all methods',
+            'all other columns',
+            'and mark',
+            'and return to screen',
+            'and return',
+            'and skip first screen',
+            'and wait',
+            'any table',
+            'appendage type',
+            'archive mode',
+            'archiving parameters',
+            'area handle',
+            'as checkbox',
+            'as icon',
+            'as line',
+            'as listbox',
+            'as person table',
+            'as search patterns',
+            'as separate unit',
+            'as subscreen',
+            'as symbol',
+            'as text',
+            'as window',
+            'at cursor-selection',
+            'at exit-command',
+            'at next application statement',
+            'at position',
+
+            'backup into',
+            'before output',
+            'before unwind',
+            'begin of block',
+            'begin of common part',
+            'begin of line',
+            'begin of screen',
+            'begin of tabbed block',
+            'begin of version',
+            'begin of',
+            'big endian',
+            'binary mode',
+            'binary search',
+            'by kernel module',
+            'bypassing buffer',
+
+            'client specified',
+            'code page',
+            'code page hint',
+            'code page into',
+            'color black',
+            'color blue',
+            'color green',
+            'color pink',
+            'color red',
+            'color yellow',
+            'compression off',
+            'compression on',
+            'connect to',
+            'corresponding fields of table',
+            'corresponding fields of',
+            'cover page',
+            'cover text',
+            'create package',
+            'create private',
+            'create protected',
+            'create public',
+            'current position',
+
+            'data buffer',
+            'data values',
+            'dataset expiration',
+            'daylight saving time',
+            'default key',
+            'default program',
+            'default screen',
+            'defining database',
+            'deleting leading',
+            'deleting trailing',
+            'directory entry',
+            'display like',
+            'display offset',
+            'during line-selection',
+            'dynamic selections',
+
+            'edit mask',
+            'end of block',
+            'end of common part',
+            'end of file',
+            'end of line',
+            'end of screen',
+            'end of tabbed block',
+            'end of version',
+            'end of',
+            'endian into',
+            'ending at',
+            'enhancement options into',
+            'enhancement into',
+            'environment time format',
+            'execute procedure',
+            'exporting list to memory',
+            'extension type',
+
+            'field format',
+            'field selection',
+            'field value into',
+            'final methods',
+            'first occurrence of',
+            'fixed-point arithmetic',
+            'for all entries',
+            'for all instances',
+            'for appending',
+            'for columns',
+            'for event of',
+            'for field',
+            'for high',
+            'for input',
+            'for lines',
+            'for low',
+            'for node',
+            'for output',
+            'for select',
+            'for table',
+            'for testing',
+            'for update',
+            'for user',
+            'frame entry',
+            'frame program from',
+            'from code page',
+            'from context',
+            'from database',
+            'from logfile id',
+            'from number format',
+            'from screen',
+            'from table',
+            'function key',
+
+            'get connection',
+            'global friends',
+            'group by',
+
+            'hashed table of',
+            'hashed table',
+
+            'if found',
+            'ignoring case',
+            'ignoring conversion errors',
+            'ignoring structure boundaries',
+            'implementations from',
+            'in background',
+            'in background task',
+            'in background unit',
+            'in binary mode',
+            'in byte mode',
+            'in char-to-hex mode',
+            'in character mode',
+            'in group',
+            'in legacy binary mode',
+            'in legacy text mode',
+            'in program',
+            'in remote task',
+            'in text mode',
+            'in table',
+            'in update task',
+            'include bound',
+            'include into',
+            'include program from',
+            'include structure',
+            'include type',
+            'including gaps',
+            'index table',
+            'inheriting from',
+            'init destination',
+            'initial line of',
+            'initial line',
+            'initial size',
+            'internal table',
+            'into sortable code',
+
+            'keep in spool',
+            'keeping directory entry',
+            'keeping logical unit of work',
+            'keeping task',
+            'keywords from',
+
+            'left margin',
+            'left outer',
+            'levels into',
+            'line format',
+            'line into',
+            'line of',
+            'line page',
+            'line value from',
+            'line value into',
+            'lines of',
+            'list authority',
+            'list dataset',
+            'list name',
+            'little endian',
+            'lob handle for',
+            'local friends',
+            'locator for',
+            'lower case',
+
+            'main table field',
+            'match count',
+            'match length',
+            'match line',
+            'match offset',
+            'matchcode object',
+            'maximum length',
+            'maximum width into',
+            'memory id',
+            'message into',
+            'messages into',
+            'modif id',
+
+            'nesting level',
+            'new list identification',
+            'next cursor',
+            'no database selection',
+            'no dialog',
+            'no end of line',
+            'no fields',
+            'no flush',
+            'no intervals',
+            'no intervals off',
+            'no standard page heading',
+            'no-extension off',
+            'non-unique key',
+            'non-unique sorted key',
+            'not at end of mode',
+            'number of lines',
+            'number of pages',
+
+            'object key',
+            'obligatory off',
+            'of current page',
+            'of page',
+            'of program',
+            'offset into',
+            'on block',
+            'on commit',
+            'on end of task',
+            'on end of',
+            'on exit-command',
+            'on help-request for',
+            'on radiobutton group',
+            'on rollback',
+            'on value-request for',
+            'open for package',
+            'option class-coding',
+            'option class',
+            'option coding',
+            'option expand',
+            'option syncpoints',
+            'options from',
+            'order by',
+            'overflow into',
+
+            'package section',
+            'package size',
+            'preferred parameter',
+            'preserving identifier escaping',
+            'primary key',
+            'print off',
+            'print on',
+            'program from',
+            'program type',
+
+            'radiobutton groups',
+            'radiobutton group',
+            'range of',
+            'reader for',
+            'receive buffer',
+            'reduced functionality',
+            'ref to data',
+            'ref to object',
+            'ref to',
+
+            'reference into',
+            'renaming with suffix',
+            'replacement character',
+            'replacement count',
+            'replacement length',
+            'replacement line',
+            'replacement offset',
+            'respecting blanks',
+            'respecting case',
+            'result into',
+            'risk level',
+
+            'sap cover page',
+            'search fkeq',
+            'search fkge',
+            'search gkeq',
+            'search gkge',
+            'section of',
+            'send buffer',
+            'separated by',
+            'shared buffer',
+            'shared memory',
+            'shared memory enabled',
+            'skipping byte-order mark',
+            'sorted by',
+            'sorted table of',
+            'sorted table',
+            'spool parameters',
+            'standard table of',
+            'standard table',
+            'starting at',
+            'starting new task',
+            'statements into',
+            'structure default',
+            'structures into',
+
+            'table field',
+            'table of',
+            'text mode',
+            'time stamp',
+            'time zone',
+            'to code page',
+            'to column',
+            'to context',
+            'to first page',
+            'to last page',
+            'to last line',
+            'to line',
+            'to lower case',
+            'to number format',
+            'to page',
+            'to sap spool',
+            'to upper case',
+            'tokens into',
+            'transporting no fields',
+            'type tableview',
+            'type tabstrip',
+
+            'unicode enabling',
+            'up to',
+            'upper case',
+            'using edit mask',
+            'using key',
+            'using no edit mask',
+            'using screen',
+            'using selection-screen',
+            'using selection-set',
+            'using selection-sets of program',
+
+            'valid between',
+            'valid from',
+            'value check',
+            'via job',
+            'via selection-screen',
+            'visible length',
+
+            'whenever found',
+            'with analysis',
+            'with byte-order mark',
+            'with comments',
+            'with current switchstates',
+            'with explicit enhancements',
+            'with frame',
+            'with free selections',
+            'with further secondary keys',
+            'with header line',
+            'with hold',
+            'with implicit enhancements',
+            'with inactive enhancements',
+            'with includes',
+            'with key',
+            'with linefeed',
+            'with list tokenization',
+            'with native linefeed',
+            'with non-unique key',
+            'with null',
+            'with pragmas',
+            'with precompiled headers',
+            'with selection-table',
+            'with smart linefeed',
+            'with table key',
+            'with test code',
+            'with type-pools',
+            'with unique key',
+            'with unix linefeed',
+            'with windows linefeed',
+            'without further secondary keys',
+            'without selection-screen',
+            'without spool dynpro',
+            'without trmac',
+            'word into',
+            'writer for'
+            ),
+
+        //**********************************************************
+        // Other abap statements
+        //**********************************************************
+        3 => array(
+            'add',
+            'add-corresponding',
+            'aliases',
+            'append',
+            'assign',
+            'at',
+            'authority-check',
+
+            'break-point',
+
+            'clear',
+            'collect',
+            'compute',
+            'concatenate',
+            'condense',
+            'class',
+            'class-events',
+            'class-methods',
+            'class-pool',
+
+            'define',
+            'delete',
+            'demand',
+            'detail',
+            'divide',
+            'divide-corresponding',
+
+            'editor-call',
+            'end-of-file',
+            'end-enhancement-section',
+            'end-of-definition',
+            'end-of-page',
+            'end-of-selection',
+            'endclass',
+            'endenhancement',
+            'endexec',
+            'endform',
+            'endfunction',
+            'endinterface',
+            'endmethod',
+            'endmodule',
+            'endon',
+            'endprovide',
+            'endselect',
+            'enhancement',
+            'enhancement-point',
+            'enhancement-section',
+            'export',
+            'extract',
+            'events',
+
+            'fetch',
+            'field-groups',
+            'find',
+            'format',
+            'form',
+            'free',
+            'function-pool',
+            'function',
+
+            'get',
+
+            'hide',
+
+            'import',
+            'infotypes',
+            'input',
+            'insert',
+            'include',
+            'initialization',
+            'interface',
+            'interface-pool',
+            'interfaces',
+
+            'leave',
+            'load-of-program',
+            'log-point',
+
+            'maximum',
+            'message',
+            'methods',
+            'method',
+            'minimum',
+            'modify',
+            'move',
+            'move-corresponding',
+            'multiply',
+            'multiply-corresponding',
+
+            'new-line',
+            'new-page',
+            'new-section',
+
+            'overlay',
+
+            'pack',
+            'perform',
+            'position',
+            'print-control',
+            'program',
+            'provide',
+            'put',
+
+            'raise',
+            'refresh',
+            'reject',
+            'replace',
+            'report',
+            'reserve',
+
+            'scroll',
+            'search',
+            'select',
+            'selection-screen',
+            'shift',
+            'skip',
+            'sort',
+            'split',
+            'start-of-selection',
+            'submit',
+            'subtract',
+            'subtract-corresponding',
+            'sum',
+            'summary',
+            'summing',
+            'supply',
+            'syntax-check',
+
+            'top-of-page',
+            'transfer',
+            'translate',
+            'type-pool',
+
+            'uline',
+            'unpack',
+            'update',
+
+            'window',
+            'write'
+
+            ),
+
+        //**********************************************************
+        // keywords
+        //**********************************************************
+
+        4 => array(
+            'abbreviated',
+            'abstract',
+            'accept',
+            'acos',
+            'activation',
+            'alias',
+            'align',
+            'all',
+            'allocate',
+            'and',
+            'assigned',
+            'any',
+            'appending',
+            'area',
+            'as',
+            'ascending',
+            'asin',
+            'assigning',
+            'atan',
+            'attributes',
+            'avg',
+
+            'backward',
+            'between',
+            'bit-and',
+            'bit-not',
+            'bit-or',
+            'bit-set',
+            'bit-xor',
+            'boolc',
+            'boolx',
+            'bound',
+            'bt',
+            'blocks',
+            'bounds',
+            'boxed',
+            'by',
+            'byte-ca',
+            'byte-cn',
+            'byte-co',
+            'byte-cs',
+            'byte-na',
+            'byte-ns',
+
+            'ca',
+            'calling',
+            'casting',
+            'ceil',
+            'center',
+            'centered',
+            'changing',
+            'char_off',
+            'charlen',
+            'circular',
+            'class_constructor',
+            'client',
+            'clike',
+            'close',
+            'cmax',
+            'cmin',
+            'cn',
+            'cnt',
+            'co',
+            'col_background',
+            'col_group',
+            'col_heading',
+            'col_key',
+            'col_negative',
+            'col_normal',
+            'col_positive',
+            'col_total',
+            'color',
+            'column',
+            'comment',
+            'comparing',
+            'components',
+            'condition',
+            'context',
+            'copies',
+            'count',
+            'country',
+            'cpi',
+            'creating',
+            'critical',
+            'concat_lines_of',
+            'cos',
+            'cosh',
+            'count_any_not_of',
+            'count_any_of',
+            'cp',
+            'cs',
+            'csequence',
+            'currency',
+            'current',
+            'cx_static_check',
+            'cx_root',
+            'cx_dynamic_check',
+
+            'dangerous',
+            'database',
+            'datainfo',
+            'date',
+            'dbmaxlen',
+            'dd/mm/yy',
+            'dd/mm/yyyy',
+            'ddmmyy',
+            'deallocate',
+            'decfloat',
+            'decfloat16',
+            'decfloat34',
+            'decimals',
+            'default',
+            'deferred',
+            'definition',
+            'department',
+            'descending',
+            'destination',
+            'disconnect',
+            'display-mode',
+            'distance',
+            'distinct',
+            'div',
+            'dummy',
+
+            'encoding',
+            'end-lines',
+            'engineering',
+            'environment',
+            'eq',
+            'equiv',
+            'error_message',
+            'errormessage',
+            'escape',
+            'exact',
+            'exception-table',
+            'exceptions',
+            'exclude',
+            'excluding',
+            'exists',
+            'exp',
+            'exponent',
+            'exporting',
+            'extended_monetary',
+
+            'field',
+            'filter-table',
+            'filters',
+            'filter',
+            'final',
+            'find_any_not_of',
+            'find_any_of',
+            'find_end',
+            'floor',
+            'first-line',
+            'font',
+            'forward',
+            'for',
+            'frac',
+            'from_mixed',
+            'friends',
+            'from',
+
+            'giving',
+            'ge',
+            'gt',
+
+            'handle',
+            'harmless',
+            'having',
+            'head-lines',
+            'help-id',
+            'help-request',
+            'high',
+            'hold',
+            'hotspot',
+
+            'id',
+            'ids',
+            'immediately',
+            'implementation',
+            'importing',
+            'in',
+            'initial',
+            'incl',
+            'including',
+            'increment',
+            'index',
+            'index-line',
+            'inner',
+            'inout',
+            'intensified',
+            'into',
+            'inverse',
+            'is',
+            'iso',
+
+            'join',
+
+            'key',
+            'kind',
+
+            'log10',
+            'language',
+            'late',
+            'layout',
+            'le',
+            'lt',
+            'left-justified',
+            'leftplus',
+            'leftspace',
+            'left',
+            'length',
+            'level',
+            'like',
+            'line-count',
+            'line-size',
+            'lines',
+            'line',
+            'load',
+            'long',
+            'lower',
+            'low',
+            'lpi',
+
+            'matches',
+            'match',
+            'mail',
+            'major-id',
+            'max',
+            'medium',
+            'memory',
+            'message-id',
+            'module',
+            'minor-id',
+            'min',
+            'mm/dd/yyyy',
+            'mm/dd/yy',
+            'mmddyy',
+            'mode',
+            'modifier',
+            'mod',
+            'monetary',
+
+            'name',
+            'nb',
+            'ne',
+            'next',
+            'no-display',
+            'no-extension',
+            'no-gap',
+            'no-gaps',
+            'no-grouping',
+            'no-heading',
+            'no-scrolling',
+            'no-sign',
+            'no-title',
+            'no-topofpage',
+            'no-zero',
+            'nodes',
+            'non-unicode',
+            'no',
+            'number',
+            'nmax',
+            'nmin',
+            'not',
+            'null',
+            'numeric',
+            'numofchar',
+
+            'o',
+            'objects',
+            'obligatory',
+            'occurs',
+            'offset',
+            'off',
+            'of',
+            'only',
+            'open',
+            'option',
+            'optional',
+            'options',
+            'output-length',
+            'output',
+            'out',
+            'on change of',
+            'or',
+            'others',
+
+            'pad',
+            'page',
+            'pages',
+            'parameter-table',
+            'part',
+            'performing',
+            'pos_high',
+            'pos_low',
+            'priority',
+            'public',
+            'pushbutton',
+
+            'queue-only',
+            'quickinfo',
+
+            'raising',
+            'range',
+            'read-only',
+            'received',
+            'receiver',
+            'receiving',
+            'redefinition',
+            'reference',
+            'regex',
+            'replacing',
+            'reset',
+            'responsible',
+            'result',
+            'results',
+            'resumable',
+            'returncode',
+            'returning',
+            'right',
+            'right-specified',
+            'rightplus',
+            'rightspace',
+            'round',
+            'rows',
+            'repeat',
+            'requested',
+            'rescale',
+            'reverse',
+
+            'scale_preserving',
+            'scale_preserving_scientific',
+            'scientific',
+            'scientific_with_leading_zero',
+            'screen',
+            'scrolling',
+            'seconds',
+            'segment',
+            'shift_left',
+            'shift_right',
+            'sign',
+            'simple',
+            'sin',
+            'sinh',
+            'short',
+            'shortdump-id',
+            'sign_as_postfix',
+            'single',
+            'size',
+            'some',
+            'source',
+            'space',
+            'spots',
+            'stable',
+            'state',
+            'static',
+            'statusinfo',
+            'sqrt',
+            'string',
+            'strlen',
+            'structure',
+            'style',
+            'subkey',
+            'submatches',
+            'substring',
+            'substring_after',
+            'substring_before',
+            'substring_from',
+            'substring_to',
+            'super',
+            'supplied',
+            'switch',
+
+            'tan',
+            'tanh',
+            'table_line',
+            'table',
+            'tab',
+            'then',
+            'timestamp',
+            'times',
+            'time',
+            'timezone',
+            'title-lines',
+            'title',
+            'top-lines',
+            'to',
+            'to_lower',
+            'to_mixed',
+            'to_upper',
+            'trace-file',
+            'trace-table',
+            'transporting',
+            'trunc',
+            'type',
+
+            'under',
+            'unique',
+            'unit',
+            'user-command',
+            'using',
+            'utf-8',
+
+            'valid',
+            'value',
+            'value-request',
+            'values',
+            'vary',
+            'varying',
+            'version',
+
+            'warning',
+            'where',
+            'width',
+            'with',
+            'word',
+            'with-heading',
+            'with-title',
+
+            'xsequence',
+            'xstring',
+            'xstrlen',
+
+            'yes',
+            'yymmdd',
+
+            'z',
+            'zero'
+
+            ),
+
+        //**********************************************************
+        // screen statements
+        //**********************************************************
+
+        5 => array(
+            'call subscreen',
+            'chain',
+            'endchain',
+            'on chain-input',
+            'on chain-request',
+            'on help-request',
+            'on input',
+            'on request',
+            'on value-request',
+            'process'
+            ),
+
+        //**********************************************************
+        // internal statements
+        //**********************************************************
+
+        6 => array(
+            'generate dynpro',
+            'generate report',
+            'import dynpro',
+            'import nametab',
+            'include methods',
+            'load report',
+            'scan abap-source',
+            'scan and check abap-source',
+            'syntax-check for dynpro',
+            'syntax-check for program',
+            'syntax-trace',
+            'system-call',
+            'system-exit',
+            'verification-message'
+            ),
+
+        //**********************************************************
+        // Control statements
+        //**********************************************************
+
+        1 => array(
+            'assert',
+            'case',
+            'catch',
+            'check',
+            'cleanup',
+            'continue',
+            'do',
+            'else',
+            'elseif',
+            'endat',
+            'endcase',
+            'endcatch',
+            'endif',
+            'enddo',
+            'endloop',
+            'endtry',
+            'endwhile',
+            'exit',
+            'if',
+            'loop',
+            'resume',
+            'retry',
+            'return',
+            'stop',
+            'try',
+            'when',
+            'while'
+
+            ),
+
+        //**********************************************************
+        // variable declaration statements
+        //**********************************************************
+
+        2 => array(
+            'class-data',
+            'controls',
+            'constants',
+            'data',
+            'field-symbols',
+            'fields',
+            'local',
+            'parameters',
+            'ranges',
+            'select-options',
+            'statics',
+            'tables',
+            'type-pools',
+            'types'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '->*', '->', '=>',
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', '.'
+            ),
+        1 => array(
+            '>=', '<=', '<', '>', '='
+            ),
+        2 => array(
+            '?='
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;', //control statements
+            2 => 'color: #cc4050; text-transform: uppercase; font-weight: bold; zzz:data;', //data statements
+            3 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;', //first token of other statements
+            4 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;', // next tokens of other statements ("keywords")
+            5 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            6 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            7 => 'color: #000066; text-transform: uppercase; font-weight: bold; zzz:control;',
+            8 => 'color: #005066; text-transform: uppercase; font-weight: bold; zzz:statement;',
+            9 => 'color: #500066; text-transform: uppercase; font-weight: bold; zzz:keyword;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #4da619;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #3399ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;',
+            1 => 'color: #800080;',
+            2 => 'color: #0000ff;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        2 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        3 => 'http://help.sap.com/abapdocu/en/ABAP{FNAMEU}.htm',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '=&gt;'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            7 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            8 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            9 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript-french.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript-french.php
new file mode 100644
index 000000000..e81605098
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript-french.php
@@ -0,0 +1,957 @@
+<?php
+/*************************************************************************************
+ * actionscript.php
+ * ----------------
+ * Author: Steffen Krause (Steffen.krause@muse.de)
+ * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.7.9
+ * CVS Revision Version: $Revision: 1.9 $
+ * Date Started: 2004/06/20
+ * Last Modified: $Date: 2006/04/23 01:14:41 $
+ *
+ * Actionscript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/25 (1.0.2)
+ * Author [ NikO ] - http://niko.informatif.org
+ * - add full link for myInstance.methods to http://wiki.media-box.net/documentation/flash
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+	'LANG_NAME' => 'Actionscript',
+	'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		1 => array(
+			'#include', 
+			'for', 
+			'foreach', 
+			'if', 
+			'elseif', 
+			'else', 
+			'while', 
+			'do', 
+			'dowhile',
+			'endwhile', 
+			'endif', 
+			'switch', 
+			'case', 
+			'endswitch', 
+			'break', 
+			'continue', 
+			'in',
+			'null', 
+			'false', 
+			'true', 
+			'var',
+			'default',
+			'new', 
+			'_global',
+			'undefined',
+			'super'	
+			),
+		2 => array(
+			'static',
+			'private',
+			'public',
+			'class',
+			'extends',
+			'implements',
+			'import',
+			'return',
+			'trace',
+			'_quality',
+			'_root',
+			'set',
+			'setInterval',
+			'setProperty',
+			'stopAllSounds',
+			'targetPath',
+			'this',
+			'typeof',
+			'unescape',
+			'updateAfterEvent'
+			),
+		3 => array (
+			'Accessibility',
+			'Array',
+			'Boolean',
+			'Button',
+			'Camera',
+			'Color',
+			'ContextMenuItem',
+			'ContextMenu',
+			'Cookie',
+			'Date',
+			'Error',
+			'function',
+			'FWEndCommand',
+			'FWJavascript',
+			'Key',
+			'LoadMovieNum',
+			'LoadMovie',
+			'LoadVariablesNum',
+			'LoadVariables',
+			'LoadVars',
+			'LocalConnection',
+			'Math',
+			'Microphone',
+			'MMExecute',
+			'MMEndCommand',
+			'MMSave',
+			'Mouse',
+			'MovieClipLoader',
+			'MovieClip',
+			'NetConnexion',
+			'NetStream',
+			'Number',
+			'Object',
+			'printAsBitmapNum',
+			'printNum',
+			'printAsBitmap',
+			'printJob',
+			'print',
+			'Selection',
+			'SharedObject',
+			'Sound',
+			'Stage',
+			'String',
+			'System',
+			'TextField',
+			'TextFormat',
+			'Tween',
+			'Video',
+			'XMLUI',
+			'XMLNode',
+			'XMLSocket',
+			'XML'
+			),
+		4 => array (	
+			'isactive',
+			'updateProperties'
+			),
+		5 => array (	
+			'callee',
+			'caller',
+			),
+		6 => array (	
+			'concat',
+			'join',
+			'pop',
+			'push',
+			'reverse',
+			'shift',
+			'slice',
+			'sort',
+			'sortOn',
+			'splice',
+			'toString',
+			'unshift'
+			),
+		7 => array (
+			'valueOf'
+			),
+		8 => array (	
+			'onDragOut',
+			'onDragOver',
+			'onKeyUp',
+			'onKillFocus',
+			'onPress',
+			'onRelease',
+			'onReleaseOutside',
+			'onRollOut',
+			'onRollOver',
+			'onSetFocus'
+			),
+		9 => array (	
+			'setMode',
+			'setMotionLevel',
+			'setQuality',
+			'activityLevel',
+			'bandwidth',
+			'currentFps',
+			'fps',
+			'index',
+			'motionLevel',
+			'motionTimeOut',
+			'muted',
+			'names',
+			'quality',
+			'onActivity',
+			'onStatus'
+			),
+		10 => array (	
+			'getRGB',
+			'setRGB',
+			'getTransform',
+			'setTransform'
+			),
+		11 => array (	
+			'caption',
+			'enabled',
+			'separatorBefore',
+			'visible',
+			'onSelect'
+			),
+		12 => array (	
+			'setCookie',
+			'getcookie'
+			),	
+		13 => array (	
+			'hideBuiltInItems',
+			'builtInItems',
+			'customItems',
+			'onSelect'
+			),
+		14 => array (	
+			'CustomActions.get',
+			'CustomActions.install',
+			'CustomActions.list',
+			'CustomActions.uninstall',
+			),		
+		15 => array (	
+			'getDate',
+			'getDay',
+			'getFullYear',
+			'getHours',
+			'getMilliseconds',
+			'getMinutes',
+			'getMonth',
+			'getSeconds',
+			'getTime',
+			'getTimezoneOffset',
+			'getUTCDate',
+			'getUTCDay',
+			'getUTCFullYear',
+			'getUTCHours',
+			'getUTCMinutes',
+			'getUTCMilliseconds',
+			'getUTCMonth',
+			'getUTCSeconds',
+			'getYear',
+			'setDate',
+			'setFullYear',
+			'setHours',
+			'setMilliseconds',
+			'setMinutes',
+			'setMonth',
+			'setSeconds',
+			'setTime',
+			'setUTCDate',
+			'setUTCDay',
+			'setUTCFullYear',
+			'setUTCHours',
+			'setUTCMinutes',
+			'setUTCMilliseconds',
+			'setUTCMonth',
+			'setUTCSeconds',
+			'setYear',
+			'UTC'
+			),	
+		16 => array (	
+			'message',
+			'name',
+			'throw',
+			'try',
+			'catch',
+			'finally'
+			),
+		17 => array (	
+			'apply',
+			'call'
+			),
+		18 => array (	
+			'BACKSPACE',
+			'CAPSLOCK',
+			'CONTROL',
+			'DELETEKEY',
+			'DOWN',
+			'END',
+			'ENTER',
+			'ESCAPE',
+			'getAscii',
+			'getCode',
+			'HOME',
+			'INSERT',
+			'isDown',
+			'isToggled',
+			'LEFT',
+			'onKeyDown',
+			'onKeyUp',
+			'PGDN',
+			'PGUP',
+			'RIGHT',
+			'SPACE',
+			'TAB',
+			'UP'
+			),
+		19 => array (
+			'addRequestHeader',
+			'contentType',
+			'decode'
+			),
+		20 => array (
+			'allowDomain',
+			'allowInsecureDomain',
+			'close',
+			'domain'
+			),
+		21 => array (
+			'abs',
+			'acos',
+			'asin',
+			'atan',
+			'atan2',
+			'ceil',
+			'cos',
+			'exp',
+			'floor',
+			'log',
+			'LN2',
+			'LN10',
+			'LOG2E',
+			'LOG10E',
+			'max',
+			'min',
+			'PI',
+			'pow',
+			'random',
+			'sin',
+			'SQRT1_2',
+			'sqrt',
+			'tan',
+			'round',
+			'SQRT2'
+			),
+		22 => array (
+			'activityLevel',
+			'muted',
+			'names',
+			'onActivity',
+			'onStatus',
+			'setRate',
+			'setGain',
+			'gain',
+			'rate',
+			'setSilenceLevel',
+			'setUseEchoSuppression',
+			'silenceLevel',
+			'silenceTimeOut',
+			'useEchoSuppression'
+			),
+		23 => array (
+			'hide',
+			'onMouseDown',
+			'onMouseMove',
+			'onMouseUp',
+			'onMouseWeel',
+			'show'
+			),
+		24 => array (
+			'_alpha',
+			'attachAudio',
+			'attachMovie',
+			'beginFill',
+			'beginGradientFill',
+			'clear',
+			'createEmptyMovieClip',
+			'createTextField',
+			'_current',
+			'curveTo',
+			'_dropTarget',
+			'duplicateMovieClip',
+			'endFill',
+			'focusEnabled',
+			'enabled',
+			'_focusrec',
+			'_framesLoaded',
+			'getBounds',
+			'getBytesLoaded',
+			'getBytesTotal',
+			'getDepth',
+			'getInstanceAtDepth',
+			'getNextHighestDepth',
+			'getSWFVersion',
+			'getTextSnapshot',
+			'getURL',
+			'globalToLocal',
+			'gotoAndPlay',
+			'gotoAndStop',
+			'_height',
+			'hitArea',
+			'hitTest',
+			'lineStyle',
+			'lineTo',
+			'localToGlobal',
+			'_lockroot',
+			'menu',
+			'onUnload',
+			'_parent',
+			'play',
+			'prevFrame',
+			'_quality',
+			'removeMovieClip',
+			'_rotation',
+			'setMask',
+			'_soundbuftime',
+			'startDrag',
+			'stopDrag',
+			'stop',
+			'swapDepths',
+			'tabChildren',
+			'_target',
+			'_totalFrames',
+			'trackAsMenu',
+			'unloadMovie',
+			'useHandCursor',
+			'_visible',
+			'_width',
+			'_xmouse',
+			'_xscale',
+			'_x',
+			'_ymouse',
+			'_yscale',
+			'_y'
+			),
+		25 => array (
+			'getProgress',
+			'loadClip',
+			'onLoadComplete',
+			'onLoadError',
+			'onLoadInit',
+			'onLoadProgress',
+			'onLoadStart'
+			),
+		26 => array (
+			'bufferLength',
+			'currentFps',
+			'seek',
+			'setBufferTime',
+			'bufferTime',
+			'time',
+			'pause'
+			),
+		27 => array (
+			'MAX_VALUE',
+			'MIN_VALUE',
+			'NEGATIVE_INFINITY',
+			'POSITIVE_INFINITY'
+			),
+		28 => array (
+			'addProperty',
+			'constructor',
+			'__proto__',
+			'registerClass',
+			'__resolve',
+			'unwatch',
+			'watch',
+			'onUpDate'
+			),
+		29 => array (
+			'addPage'
+			),
+		30 => array (
+			'getBeginIndex',
+			'getCaretIndex',
+			'getEndIndex',
+			'setSelection'
+			),
+		31 => array (
+			'flush',
+			'getLocal',
+			'getSize'
+			),
+		32 => array (
+			'attachSound',
+			'duration',
+			'getPan',
+			'getVolume',
+			'onID3',
+			'loadSound',
+			'id3',
+			'onSoundComplete',
+			'position',
+			'setPan',
+			'setVolume'
+			),
+		33 => array (
+			'getBeginIndex',
+			'getCaretIndex',
+			'getEndIndex',
+			'setSelection'
+			),
+		34 => array (
+			'getEndIndex',
+			),
+		35 => array (
+			'align',
+			'height',
+			'width',
+			'onResize',
+			'scaleMode',
+			'showMenu'
+			),
+		36 => array (
+			'charAt',
+			'charCodeAt',
+			'concat',
+			'fromCharCode',
+			'indexOf',
+			'lastIndexOf',
+			'substr',
+			'substring',
+			'toLowerCase',
+			'toUpperCase'
+			),
+		37 => array (
+			'avHardwareDisable',
+			'hasAccessibility',
+			'hasAudioEncoder',
+			'hasAudio',
+			'hasEmbeddedVideo',
+			'hasMP3',
+			'hasPrinting',
+			'hasScreenBroadcast',
+			'hasScreenPlayback',
+			'hasStreamingAudio',
+			'hasStreamingVideo',
+			'hasVideoEncoder',
+			'isDebugger',
+			'language',
+			'localFileReadDisable',
+			'manufacturer',
+			'os',
+			'pixelAspectRatio',
+			'playerType',
+			'screenColor',
+			'screenDPI',
+			'screenResolutionX',
+			'screenResolutionY',
+			'serverString',
+			'version'
+			),
+		38 => array (
+			'allowDomain',
+			'allowInsecureDomain',
+			'loadPolicyFile'
+			),
+		39 => array (
+			'exactSettings',
+			'setClipboard',
+			'showSettings',
+			'useCodepage'
+			),
+		40 => array (
+			'getStyle',
+			'getStyleNames',
+			'parseCSS',
+			'setStyle',
+			'transform'
+			),
+		41 => array (
+			'autoSize',
+			'background',
+			'backgroundColor',
+			'border',
+			'borderColor',
+			'bottomScroll',
+			'condenseWhite',
+			'embedFonts',
+			'getFontList',
+			'getNewTextFormat',
+			'getTextFormat',
+			'hscroll',
+			'htmlText',
+			'html',
+			'maxChars',
+			'maxhscroll',
+			'maxscroll',
+			'mouseWheelEnabled',
+			'multiline',
+			'onScroller',
+			'password',
+			'removeTextField',
+			'replaceSel',
+			'replaceText',
+			'restrict',
+			'scroll',
+			'selectable',
+			'setNewTextFormat',
+			'setTextFormat',
+			'styleSheet',
+			'tabEnabled',
+			'tabIndex',
+			'textColor',
+			'textHeight',
+			'textWidth',
+			'text',
+			'type',
+			'_url',
+			'variable',
+			'wordWrap'
+			),
+		42 => array (	
+			'blockIndent',
+			'bold',
+			'bullet',
+			'font',
+			'getTextExtent',
+			'indent',
+			'italic',
+			'leading',
+			'leftMargin',
+			'rightMargin',
+			'size',
+			'tabStops',
+			'underline'
+			),
+		43 => array (	
+			'findText',
+			'getCount',
+			'getSelected',
+			'getSelectedText',
+			'getText',
+			'hitTestTextNearPos',
+			'setSelectColor',
+			'setSelected'
+			),
+		44 => array (	
+			'begin',
+			'change',
+			'continueTo',
+			'fforward',
+			'finish',
+			'func',
+			'FPS',
+			'getPosition',
+			'isPlaying',
+			'looping',
+			'obj',
+			'onMotionChanged',
+			'onMotionFinished',
+			'onMotionLooped',
+			'onMotionStarted',
+			'onMotionResumed',
+			'onMotionStopped',
+			'prop',
+			'rewind',
+			'resume',
+			'setPosition',
+			'time',
+			'userSeconds',
+			'yoyo'
+			),
+		45 => array (	
+			'attachVideo',
+			'deblocking',
+			'smoothing'
+			),
+		46 => array (	
+			'addRequestHeader',
+			'appendChild',
+			'attributes',
+			'childNodes',
+			'cloneNode',
+			'contentType',
+			'createElement',
+			'createTextNode',
+			'docTypeDecl',
+			'firstChild',
+			'hasChildNodes',
+			'ignoreWhite',
+			'insertBefore',
+			'lastChild',
+			'nextSibling',
+			'nodeName',
+			'nodeType',
+			'nodeValue',
+			'parentNode',
+			'parseXML',
+			'previousSibling',
+			'removeNode',
+			'xmlDecl'
+			),
+		47 => array (	
+			'onClose',
+			'onXML'
+			),
+		48 => array (	
+			'add',
+			'and',
+			'_highquality',
+			'chr',
+			'eq',
+			'ge',
+			'ifFrameLoaded',
+			'int',
+			'le',
+			'it',
+			'mbchr',
+			'mblength',
+			'mbord',
+			'ne',
+			'not',
+			'or',
+			'ord',
+			'tellTarget',
+			'toggleHighQuality'
+			),
+		49 => array (
+			'ASSetPropFlags',
+			'ASnative',
+			'ASconstructor',
+			'AsSetupError',
+			'FWEndCommand',
+			'FWJavascript',
+			'MMEndCommand',
+			'MMSave',
+			'XMLUI'
+		), 
+		50 => array (
+			'System.capabilities'
+		),
+		51 => array (
+			'System.security'
+		),
+		52 => array (
+			'TextField.StyleSheet'
+		)
+		),
+	'SYMBOLS' => array(
+		'(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>','='
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		1 => true,
+		2 => true,
+		3 => true,
+		4 => true,
+		5 => true,
+		6 => true,
+		7 => true,
+		8 => true,
+		9 => true,
+		10 => true,
+		11 => true,
+		12 => true,
+		13 => true,
+		14 => true,
+		15 => true,
+		16 => true,
+		17 => true,
+		18 => true,
+		19 => true,
+		20 => true,
+		21 => true,
+		22 => true,
+		23 => true,
+		24 => true,
+		25 => true,
+		26 => true,
+		27 => true,
+		28 => true,
+		29 => true,
+		30 => true,
+		31 => true,
+		32 => true,
+		33 => true,
+		34 => true,
+		35 => true,
+		36 => true,
+		37 => true,
+		38 => true,
+		39 => true,
+		40 => true,
+		41 => true,
+		42 => true,
+		43 => true,
+		44 => true,
+		45 => true,
+		46 => true,
+		47 => true,
+		48 => true,
+		49 => true,
+		50 => true,
+		51 => true,
+		52 => true
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #0000ff;',
+			2 => 'color: #006600;',
+			3 => 'color: #000080;',
+			4 => 'color: #006600;',
+			5 => 'color: #006600;',
+			6 => 'color: #006600;',
+			7 => 'color: #006600;',
+			8 => 'color: #006600;',
+			9 => 'color: #006600;',
+			10 => 'color: #006600;',
+			11 => 'color: #006600;',
+			12 => 'color: #006600;',
+			13 => 'color: #006600;',
+			14 => 'color: #006600;',
+			15 => 'color: #006600;',
+			16 => 'color: #006600;',
+			17 => 'color: #006600;',
+			18 => 'color: #006600;',
+			19 => 'color: #006600;',
+			20 => 'color: #006600;',
+			21 => 'color: #006600;',
+			22 => 'color: #006600;',
+			23 => 'color: #006600;',
+			24 => 'color: #006600;',
+			25 => 'color: #006600;',
+			26 => 'color: #006600;',
+			27 => 'color: #006600;',
+			28 => 'color: #006600;',
+			29 => 'color: #006600;',
+			30 => 'color: #006600;',
+			31 => 'color: #006600;',
+			32 => 'color: #006600;',
+			33 => 'color: #006600;',
+			34 => 'color: #006600;',
+			35 => 'color: #006600;',
+			36 => 'color: #006600;',
+			37 => 'color: #006600;',
+			38 => 'color: #006600;',
+			39 => 'color: #006600;',
+			40 => 'color: #006600;',
+			41 => 'color: #006600;',
+			42 => 'color: #006600;',
+			43 => 'color: #006600;',
+			44 => 'color: #006600;',
+			45 => 'color: #006600;',
+			46 => 'color: #006600;',
+			47 => 'color: #006600;',
+			48 => 'color: #CC0000;',
+			49 => 'color: #5700d1;',
+			50 => 'color: #006600;',
+			51 => 'color: #006600;',
+			52 => 'color: #CC0000;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #ff8000; font-style: italic;',
+			2 => 'color: #ff8000; font-style: italic;',
+			'MULTI' => 'color: #ff8000; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #333333;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #333333; background-color: #eeeeee;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #c50000;'
+			),
+
+		'SYMBOLS' => array(
+			0 => 'color: #000000;'
+			),
+		'METHODS' => array(
+			1 => 'color: #006600;'
+			),
+		'REGEXPS' => array(
+			),
+		'SCRIPT' => array(
+			)
+		),
+	'URLS' => array(
+		1 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		2 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		3 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		4 => 'http://wiki.media-box.net/documentation/flash/accessibility/{FNAME}',
+		5 => 'http://wiki.media-box.net/documentation/flash/arguments/{FNAME}',
+		6 => 'http://wiki.media-box.net/documentation/flash/array/{FNAME}',
+		7 => 'http://wiki.media-box.net/documentation/flash/boolean/{FNAME}',
+		8 => 'http://wiki.media-box.net/documentation/flash/button/{FNAME}',
+		9 => 'http://wiki.media-box.net/documentation/flash/camera/{FNAME}',
+		10 => 'http://wiki.media-box.net/documentation/flash/color/{FNAME}',
+		11 => 'http://wiki.media-box.net/documentation/flash/contextmenuitem/{FNAME}',
+		12 => 'http://wiki.media-box.net/documentation/flash/contextmenu/{FNAME}',
+		13 => 'http://wiki.media-box.net/documentation/flash/cookie/{FNAME}',
+		14 => 'http://wiki.media-box.net/documentation/flash/customactions/{FNAME}',
+		15 => 'http://wiki.media-box.net/documentation/flash/date/{FNAME}',
+		16 => 'http://wiki.media-box.net/documentation/flash/error/{FNAME}',
+		17 => 'http://wiki.media-box.net/documentation/flash/function/{FNAME}',
+		18 => 'http://wiki.media-box.net/documentation/flash/key/{FNAME}',
+		19 => 'http://wiki.media-box.net/documentation/flash/loadvars/{FNAME}',
+		20 => 'http://wiki.media-box.net/documentation/flash/localconnection/{FNAME}',
+		21 => 'http://wiki.media-box.net/documentation/flash/math/{FNAME}',
+		22 => 'http://wiki.media-box.net/documentation/flash/microphone/{FNAME}',
+		23 => 'http://wiki.media-box.net/documentation/flash/mouse/{FNAME}',
+		24 => 'http://wiki.media-box.net/documentation/flash/movieclip/{FNAME}',
+		25 => 'http://wiki.media-box.net/documentation/flash/moviecliploader/{FNAME}',
+		26 => 'http://wiki.media-box.net/documentation/flash/netstream/{FNAME}',
+		27 => 'http://wiki.media-box.net/documentation/flash/number/{FNAME}',
+		28 => 'http://wiki.media-box.net/documentation/flash/object/{FNAME}',
+		29 => 'http://wiki.media-box.net/documentation/flash/printJob/{FNAME}',
+		30 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
+		31 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
+		32 => 'http://wiki.media-box.net/documentation/flash/sound/{FNAME}',
+		33 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
+		34 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
+		35 => 'http://wiki.media-box.net/documentation/flash/stage/{FNAME}',
+		36 => 'http://wiki.media-box.net/documentation/flash/string/{FNAME}',
+		37 => 'http://wiki.media-box.net/documentation/flash/system/capabilities/{FNAME}',
+		38 => 'http://wiki.media-box.net/documentation/flash/system/security/{FNAME}',
+		39 => 'http://wiki.media-box.net/documentation/flash/system/{FNAME}',
+		40 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet/{FNAME}',
+		41 => 'http://wiki.media-box.net/documentation/flash/textfield/{FNAME}',
+		42 => 'http://wiki.media-box.net/documentation/flash/textformat/{FNAME}',
+		43 => 'http://wiki.media-box.net/documentation/flash/textsnapshot/{FNAME}',
+		44 => 'http://wiki.media-box.net/documentation/flash/tween/{FNAME}',
+		45 => 'http://wiki.media-box.net/documentation/flash/video/{FNAME}',
+		46 => 'http://wiki.media-box.net/documentation/flash/xml/{FNAME}',
+		47 => 'http://wiki.media-box.net/documentation/flash/xmlsocket/{FNAME}',
+		48 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		49 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		50 => 'http://wiki.media-box.net/documentation/flash/system/capabilities',
+		51 => 'http://wiki.media-box.net/documentation/flash/system/security',
+		52 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet'
+		),
+	'OOLANG' => true,
+	'OBJECT_SPLITTERS' => array(
+		1 => '.'
+		),
+	'REGEXPS' => array(
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(),
+	'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript.php
new file mode 100644
index 000000000..016dc8e90
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript.php
@@ -0,0 +1,197 @@
+<?php
+/*************************************************************************************
+ * actionscript.php
+ * ----------------
+ * Author: Steffen Krause (Steffen.krause@muse.de)
+ * Copyright: (c) 2004 Steffen Krause, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/20
+ *
+ * Actionscript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ActionScript',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '#include', 'for', 'foreach', 'each', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
+            'endwhile', 'endif', 'switch', 'case', 'endswitch', 'return', 'break', 'continue', 'in'
+            ),
+        2 => array(
+            'null', 'false', 'true', 'var',
+            'default', 'function', 'class',
+            'new', '_global'
+            ),
+        3 => array(
+            '#endinitclip', '#initclip', '__proto__', '_accProps', '_alpha', '_currentframe',
+            '_droptarget', '_focusrect', '_framesloaded', '_height', '_highquality', '_lockroot',
+            '_name', '_parent', '_quality', '_root', '_rotation', '_soundbuftime', '_target', '_totalframes',
+            '_url', '_visible', '_width', '_x', '_xmouse', '_xscale', '_y', '_ymouse', '_yscale', 'abs',
+            'Accessibility', 'acos', 'activityLevel', 'add', 'addListener', 'addPage', 'addProperty',
+            'addRequestHeader', 'align', 'allowDomain', 'allowInsecureDomain', 'and', 'appendChild',
+            'apply', 'Arguments', 'Array', 'asfunction', 'asin', 'atan', 'atan2', 'attachAudio', 'attachMovie',
+            'attachSound', 'attachVideo', 'attributes', 'autosize', 'avHardwareDisable', 'background',
+            'backgroundColor', 'BACKSPACE', 'bandwidth', 'beginFill', 'beginGradientFill', 'blockIndent',
+            'bold', 'Boolean', 'border', 'borderColor', 'bottomScroll', 'bufferLength', 'bufferTime',
+            'builtInItems', 'bullet', 'Button', 'bytesLoaded', 'bytesTotal', 'call', 'callee', 'caller',
+            'Camera', 'capabilities', 'CAPSLOCK', 'caption', 'catch', 'ceil', 'charAt', 'charCodeAt',
+            'childNodes', 'chr', 'clear', 'clearInterval', 'cloneNode', 'close', 'Color', 'concat',
+            'connect', 'condenseWhite', 'constructor', 'contentType', 'ContextMenu', 'ContextMenuItem',
+            'CONTROL', 'copy', 'cos', 'createElement', 'createEmptyMovieClip', 'createTextField',
+            'createTextNode', 'currentFps', 'curveTo', 'CustomActions', 'customItems', 'data', 'Date',
+            'deblocking', 'delete', 'DELETEKEY', 'docTypeDecl', 'domain', 'DOWN',
+            'duplicateMovieClip', 'duration', 'dynamic', 'E', 'embedFonts', 'enabled',
+            'END', 'endFill', 'ENTER', 'eq', 'Error', 'ESCAPE(Konstante)', 'escape(Funktion)', 'eval',
+            'exactSettings', 'exp', 'extends', 'finally', 'findText', 'firstChild', 'floor',
+            'flush', 'focusEnabled', 'font', 'fps', 'fromCharCode', 'fscommand',
+            'gain', 'ge', 'get', 'getAscii', 'getBeginIndex', 'getBounds', 'getBytesLoaded', 'getBytesTotal',
+            'getCaretIndex', 'getCode', 'getCount', 'getDate', 'getDay', 'getDepth', 'getEndIndex', 'getFocus',
+            'getFontList', 'getFullYear', 'getHours', 'getInstanceAtDepth', 'getLocal', 'getMilliseconds',
+            'getMinutes', 'getMonth', 'getNewTextFormat', 'getNextHighestDepth', 'getPan', 'getProgress',
+            'getProperty', 'getRGB', 'getSeconds', 'getSelected', 'getSelectedText', 'getSize', 'getStyle',
+            'getStyleNames', 'getSWFVersion', 'getText', 'getTextExtent', 'getTextFormat', 'getTextSnapshot',
+            'getTime', 'getTimer', 'getTimezoneOffset', 'getTransform', 'getURL', 'getUTCDate', 'getUTCDay',
+            'getUTCFullYear', 'getUTCHours', 'getUTCMilliseconds', 'getUTCMinutes', 'getUTCMonth', 'getUTCSeconds',
+            'getVersion', 'getVolume', 'getYear', 'globalToLocal', 'goto', 'gotoAndPlay', 'gotoAndStop',
+            'hasAccessibility', 'hasAudio', 'hasAudioEncoder', 'hasChildNodes', 'hasEmbeddedVideo', 'hasMP3',
+            'hasPrinting', 'hasScreenBroadcast', 'hasScreenPlayback', 'hasStreamingAudio', 'hasStreamingVideo',
+            'hasVideoEncoder', 'height', 'hide', 'hideBuiltInItems', 'hitArea', 'hitTest', 'hitTestTextNearPos',
+            'HOME', 'hscroll', 'html', 'htmlText', 'ID3', 'ifFrameLoaded', 'ignoreWhite', 'implements',
+            'import', 'indent', 'index', 'indexOf', 'Infinity', '-Infinity', 'INSERT', 'insertBefore', 'install',
+            'instanceof', 'int', 'interface', 'isActive', 'isDebugger', 'isDown', 'isFinite', 'isNaN', 'isToggled',
+            'italic', 'join', 'Key', 'language', 'lastChild', 'lastIndexOf', 'le', 'leading', 'LEFT', 'leftMargin',
+            'length', 'level', 'lineStyle', 'lineTo', 'list', 'LN10', 'LN2', 'load', 'loadClip', 'loaded', 'loadMovie',
+            'loadMovieNum', 'loadSound', 'loadVariables', 'loadVariablesNum', 'LoadVars', 'LocalConnection',
+            'localFileReadDisable', 'localToGlobal', 'log', 'LOG10E', 'LOG2E', 'manufacturer', 'Math', 'max',
+            'MAX_VALUE', 'maxChars', 'maxhscroll', 'maxscroll', 'mbchr', 'mblength', 'mbord', 'mbsubstring', 'menu',
+            'message', 'Microphone', 'min', 'MIN_VALUE', 'MMExecute', 'motionLevel', 'motionTimeOut', 'Mouse',
+            'mouseWheelEnabled', 'moveTo', 'Movieclip', 'MovieClipLoader', 'multiline', 'muted', 'name', 'names', 'NaN',
+            'ne', 'NEGATIVE_INFINITY', 'NetConnection', 'NetStream', 'newline', 'nextFrame',
+            'nextScene', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue', 'not', 'Number', 'Object',
+            'on', 'onActivity', 'onChanged', 'onClipEvent', 'onClose', 'onConnect', 'onData', 'onDragOut',
+            'onDragOver', 'onEnterFrame', 'onID3', 'onKeyDown', 'onKeyUp', 'onKillFocus', 'onLoad', 'onLoadComplete',
+            'onLoadError', 'onLoadInit', 'onLoadProgress', 'onLoadStart', 'onMouseDown', 'onMouseMove', 'onMouseUp',
+            'onMouseWheel', 'onPress', 'onRelease', 'onReleaseOutside', 'onResize', 'onRollOut', 'onRollOver',
+            'onScroller', 'onSelect', 'onSetFocus', 'onSoundComplete', 'onStatus', 'onUnload', 'onUpdate', 'onXML',
+            'or(logischesOR)', 'ord', 'os', 'parentNode', 'parseCSS', 'parseFloat', 'parseInt', 'parseXML', 'password',
+            'pause', 'PGDN', 'PGUP', 'PI', 'pixelAspectRatio', 'play', 'playerType', 'pop', 'position',
+            'POSITIVE_INFINITY', 'pow', 'prevFrame', 'previousSibling', 'prevScene', 'print', 'printAsBitmap',
+            'printAsBitmapNum', 'PrintJob', 'printNum', 'private', 'prototype', 'public', 'push', 'quality',
+            'random', 'rate', 'registerClass', 'removeListener', 'removeMovieClip', 'removeNode', 'removeTextField',
+            'replaceSel', 'replaceText', 'resolutionX', 'resolutionY', 'restrict', 'reverse', 'RIGHT',
+            'rightMargin', 'round', 'scaleMode', 'screenColor', 'screenDPI', 'screenResolutionX', 'screenResolutionY',
+            'scroll', 'seek', 'selectable', 'Selection', 'send', 'sendAndLoad', 'separatorBefore', 'serverString',
+            'set', 'setvariable', 'setBufferTime', 'setClipboard', 'setDate', 'setFocus', 'setFullYear', 'setGain',
+            'setHours', 'setInterval', 'setMask', 'setMilliseconds', 'setMinutes', 'setMode', 'setMonth',
+            'setMotionLevel', 'setNewTextFormat', 'setPan', 'setProperty', 'setQuality', 'setRate', 'setRGB',
+            'setSeconds', 'setSelectColor', 'setSelected', 'setSelection', 'setSilenceLevel', 'setStyle',
+            'setTextFormat', 'setTime', 'setTransform', 'setUseEchoSuppression', 'setUTCDate', 'setUTCFullYear',
+            'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', 'setVolume',
+            'setYear', 'SharedObject', 'SHIFT(Konstante)', 'shift(Methode)', 'show', 'showMenu', 'showSettings',
+            'silenceLevel', 'silenceTimeout', 'sin', 'size', 'slice', 'smoothing', 'sort', 'sortOn', 'Sound', 'SPACE',
+            'splice', 'split', 'sqrt', 'SQRT1_2', 'SQRT2', 'Stage', 'start', 'startDrag', 'static', 'status', 'stop',
+            'stopAllSounds', 'stopDrag', 'String', 'StyleSheet(Klasse)', 'styleSheet(Eigenschaft)', 'substr',
+            'substring', 'super', 'swapDepths', 'System', 'TAB', 'tabChildren', 'tabEnabled', 'tabIndex',
+            'tabStops', 'tan', 'target', 'targetPath', 'tellTarget', 'text', 'textColor', 'TextField', 'TextFormat',
+            'textHeight', 'TextSnapshot', 'textWidth', 'this', 'throw', 'time', 'toggleHighQuality', 'toLowerCase',
+            'toString', 'toUpperCase', 'trace', 'trackAsMenu', 'try', 'type', 'typeof', 'undefined',
+            'underline', 'unescape', 'uninstall', 'unloadClip', 'unloadMovie', 'unLoadMovieNum', 'unshift', 'unwatch',
+            'UP', 'updateAfterEvent', 'updateProperties', 'url', 'useCodePage', 'useEchoSuppression', 'useHandCursor',
+            'UTC', 'valueOf', 'variable', 'version', 'Video', 'visible', 'void', 'watch', 'width',
+            'with', 'wordwrap', 'XML', 'xmlDecl', 'XMLNode', 'XMLSocket'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #0066CC;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript3.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript3.php
new file mode 100644
index 000000000..a54e9d4df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/actionscript3.php
@@ -0,0 +1,473 @@
+<?php
+/*************************************************************************************
+ * actionscript3.php
+ * ----------------
+ * Author: Jordi Boggiano (j.boggiano@seld.be)
+ * Copyright: (c) 2007 Jordi Boggiano (http://www.seld.be/), Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/11/26
+ *
+ * ActionScript3 language file for GeSHi.
+ *
+ * All keywords scraped from the Flex 2.0.1 Documentation
+ *
+ * The default style is based on FlexBuilder2 coloring, with the addition of class, package, method and
+ * constant names that are highlighted to help identifying problem when used on public pastebins.
+ *
+ * For styling, keywords data from 0 to 1 (accessible through .kw1, etc.) are described here :
+ *
+ *   1 : operators
+ *   2 : 'var' keyword
+ *   3 : 'function' keyword
+ *   4 : 'class' and 'package' keywords
+ *   5 : all flash.* class names plus Top Level classes, mx are excluded
+ *   6 : all flash.* package names, mx are excluded
+ *   7 : valid flash method names and properties (there is no type checks sadly, for example String().x will be highlighted as 'x' is valid, but obviously strings don't have a x property)
+ *   8 : valid flash constant names (again, no type check)
+ *
+ *
+ * CHANGES
+ * -------
+ * 2007/12/06 (1.0.7.22)
+ *  -  Added the 'this' keyword (oops)
+ *
+ * TODO (updated 2007/11/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ActionScript 3',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'with', 'while', 'void', 'undefined', 'typeof', 'try', 'true',
+            'throw', 'this', 'switch', 'super', 'set', 'return', 'public', 'protected',
+            'private', 'null', 'new', 'is', 'internal', 'instanceof', 'in',
+            'import', 'if', 'get', 'for', 'false', 'else', 'each', 'do',
+            'delete', 'default', 'continue', 'catch', 'case', 'break', 'as',
+            'extends'
+            ),
+        2 => array(
+            'var'
+            ),
+        3 => array(
+            'function'
+            ),
+        4 => array(
+            'class', 'package'
+            ),
+        6 => array(
+            'flash.xml', 'flash.utils', 'flash.ui', 'flash.text',
+            'flash.system', 'flash.profiler', 'flash.printing', 'flash.net',
+            'flash.media', 'flash.geom', 'flash.filters', 'flash.external',
+            'flash.events', 'flash.errors', 'flash.display',
+            'flash.accessibility'
+            ),
+        7 => array(
+            'zoom', 'year', 'y', 'xmlDecl', 'x', 'writeUnsignedInt',
+            'writeUTFBytes', 'writeUTF', 'writeShort', 'writeObject',
+            'writeMultiByte', 'writeInt', 'writeFloat', 'writeExternal',
+            'writeDynamicProperty', 'writeDynamicProperties', 'writeDouble',
+            'writeBytes', 'writeByte', 'writeBoolean', 'wordWrap',
+            'willTrigger', 'width', 'volume', 'visible', 'videoWidth',
+            'videoHeight', 'version', 'valueOf', 'value', 'usingTLS',
+            'useRichTextClipboard', 'useHandCursor', 'useEchoSuppression',
+            'useCodePage', 'url', 'uri', 'uploadCompleteData', 'upload',
+            'updateProperties', 'updateAfterEvent', 'upState', 'unshift',
+            'unlock', 'unload', 'union', 'unescapeMultiByte', 'unescape',
+            'underline', 'uncompress', 'type', 'ty', 'tx', 'transparent',
+            'translate', 'transformPoint', 'transform', 'trackAsMenu', 'track',
+            'trace', 'totalMemory', 'totalFrames', 'topLeft', 'top',
+            'togglePause', 'toXMLString', 'toUpperCase', 'toUTCString',
+            'toTimeString', 'toString', 'toPrecision', 'toLowerCase',
+            'toLocaleUpperCase', 'toLocaleTimeString', 'toLocaleString',
+            'toLocaleLowerCase', 'toLocaleDateString', 'toFixed',
+            'toExponential', 'toDateString', 'timezoneOffset', 'timerComplete',
+            'timer', 'time', 'threshold', 'thickness', 'textWidth',
+            'textSnapshot', 'textInput', 'textHeight', 'textColor', 'text',
+            'test', 'target', 'tan', 'tabStops', 'tabIndexChange', 'tabIndex',
+            'tabEnabledChange', 'tabEnabled', 'tabChildrenChange',
+            'tabChildren', 'sync', 'swfVersion', 'swapChildrenAt',
+            'swapChildren', 'subtract', 'substring', 'substr', 'styleSheet',
+            'styleNames', 'strength', 'stopPropagation',
+            'stopImmediatePropagation', 'stopDrag', 'stopAll', 'stop', 'status',
+            'startDrag', 'start', 'stageY', 'stageX', 'stageWidth',
+            'stageHeight', 'stageFocusRect', 'stage', 'sqrt', 'split', 'splice',
+            'source', 'soundTransform', 'soundComplete', 'sortOn', 'sort',
+            'songName', 'some', 'socketData', 'smoothing', 'slice', 'size',
+            'sin', 'silent', 'silenceTimeout', 'silenceLevel', 'showSettings',
+            'showRedrawRegions', 'showDefaultContextMenu', 'show', 'shortcut',
+            'shiftKey', 'shift', 'sharpness', 'sharedEvents', 'shadowColor',
+            'shadowAlpha', 'settings', 'setUseEchoSuppression', 'setUTCSeconds',
+            'setUTCMonth', 'setUTCMinutes', 'setUTCMilliseconds', 'setUTCHours',
+            'setUTCFullYear', 'setUTCDate', 'setTimeout', 'setTime',
+            'setTextFormat', 'setStyle', 'setSilenceLevel', 'setSettings',
+            'setSelection', 'setSelected', 'setSelectColor', 'setSeconds',
+            'setQuality', 'setPropertyIsEnumerable', 'setProperty', 'setPixels',
+            'setPixel32', 'setPixel', 'setNamespace', 'setName',
+            'setMotionLevel', 'setMonth', 'setMode', 'setMinutes',
+            'setMilliseconds', 'setLoopback', 'setLoopBack', 'setLocalName',
+            'setKeyFrameInterval', 'setInterval', 'setHours', 'setFullYear',
+            'setEmpty', 'setDirty', 'setDate', 'setCompositionString',
+            'setClipboard', 'setChildren', 'setChildIndex',
+            'setAdvancedAntiAliasingTable', 'serverString', 'separatorBefore',
+            'sendToURL', 'send', 'selectionEndIndex', 'selectionBeginIndex',
+            'selectable', 'select', 'seek', 'securityError', 'securityDomain',
+            'secondsUTC', 'seconds', 'search', 'scrollV', 'scrollRect',
+            'scrollH', 'scroll', 'screenResolutionY', 'screenResolutionX',
+            'screenDPI', 'screenColor', 'scenes', 'scaleY', 'scaleX',
+            'scaleMode', 'scale9Grid', 'scale', 'save', 'sandboxType',
+            'sameDomain', 'running', 'round', 'rotation', 'rotate', 'root',
+            'rollOver', 'rollOut', 'rightToRight', 'rightToLeft', 'rightPeak',
+            'rightMargin', 'right', 'rewind', 'reverse', 'resume', 'restrict',
+            'resize', 'reset', 'requestHeaders', 'replaceText',
+            'replaceSelectedText', 'replace', 'repeatCount', 'render',
+            'removedFromStage', 'removed', 'removeNode', 'removeNamespace',
+            'removeEventListener', 'removeChildAt', 'removeChild',
+            'relatedObject', 'registerFont', 'registerClassAlias', 'redOffset',
+            'redMultiplier', 'rect', 'receiveVideo', 'receiveAudio',
+            'readUnsignedShort', 'readUnsignedInt', 'readUnsignedByte',
+            'readUTFBytes', 'readUTF', 'readShort', 'readObject',
+            'readMultiByte', 'readInt', 'readFloat', 'readExternal',
+            'readDouble', 'readBytes', 'readByte', 'readBoolean', 'ratios',
+            'rate', 'random', 'quality', 'push', 'publish', 'proxyType',
+            'prototype', 'propertyIsEnumerable', 'progress',
+            'processingInstructions', 'printAsBitmap', 'print',
+            'previousSibling', 'preventDefault', 'prevScene', 'prevFrame',
+            'prettyPrinting', 'prettyIndent', 'preserveAlpha', 'prependChild',
+            'prefix', 'pow', 'position', 'pop', 'polar', 'playerType', 'play',
+            'pixelSnapping', 'pixelDissolve', 'pixelBounds', 'pixelAspectRatio',
+            'perlinNoise', 'pause', 'parseXML', 'parseInt', 'parseFloat',
+            'parseCSS', 'parse', 'parentNode', 'parentDomain',
+            'parentAllowsChild', 'parent', 'parameters', 'paperWidth',
+            'paperHeight', 'pan', 'paletteMap', 'pageWidth', 'pageHeight',
+            'overState', 'outsideCutoff', 'os', 'orientation', 'open',
+            'opaqueBackground', 'onPlayStatus', 'onMetaData', 'onCuePoint',
+            'offsetPoint', 'offset', 'objectID', 'objectEncoding', 'numLock',
+            'numLines', 'numFrames', 'numChildren', 'normalize', 'noise',
+            'nodeValue', 'nodeType', 'nodeName', 'nodeKind', 'noAutoLabeling',
+            'nextValue', 'nextSibling', 'nextScene', 'nextNameIndex',
+            'nextName', 'nextFrame', 'netStatus', 'navigateToURL',
+            'namespaceURI', 'namespaceDeclarations', 'namespace', 'names',
+            'name', 'muted', 'multiline', 'moveTo', 'mouseY', 'mouseX',
+            'mouseWheelEnabled', 'mouseWheel', 'mouseUp', 'mouseTarget',
+            'mouseOver', 'mouseOut', 'mouseMove', 'mouseLeave',
+            'mouseFocusChange', 'mouseEnabled', 'mouseDown', 'mouseChildren',
+            'motionTimeout', 'motionLevel', 'monthUTC', 'month',
+            'modificationDate', 'mode', 'minutesUTC', 'minutes', 'min',
+            'millisecondsUTC', 'milliseconds', 'method', 'message', 'merge',
+            'menuSelect', 'menuItemSelect', 'maxScrollV', 'maxScrollH',
+            'maxLevel', 'maxChars', 'max', 'matrixY', 'matrixX', 'matrix',
+            'match', 'mask', 'mapPoint', 'mapBitmap', 'map', 'manufacturer',
+            'macType', 'loopback', 'loop', 'log', 'lock', 'localeCompare',
+            'localY', 'localX', 'localToGlobal', 'localName',
+            'localFileReadDisable', 'loaderURL', 'loaderInfo', 'loader',
+            'loadPolicyFile', 'loadBytes', 'load', 'liveDelay', 'link',
+            'lineTo', 'lineStyle', 'lineGradientStyle', 'level',
+            'letterSpacing', 'length', 'leftToRight', 'leftToLeft', 'leftPeak',
+            'leftMargin', 'left', 'leading', 'lastIndexOf', 'lastIndex',
+            'lastChild', 'language', 'labels', 'knockout', 'keyUp',
+            'keyLocation', 'keyFrameInterval', 'keyFocusChange', 'keyDown',
+            'keyCode', 'kerning', 'join', 'italic', 'isXMLName',
+            'isPrototypeOf', 'isNaN', 'isFocusInaccessible', 'isFinite',
+            'isEmpty', 'isDefaultPrevented', 'isDebugger', 'isBuffering',
+            'isAttribute', 'isAccessible', 'ioError', 'invert', 'invalidate',
+            'intersects', 'intersection', 'interpolate', 'insideCutoff',
+            'insertChildBefore', 'insertChildAfter', 'insertBefore', 'inner',
+            'init', 'info', 'inflatePoint', 'inflate', 'indexOf', 'index',
+            'indent', 'inScopeNamespaces', 'imeComposition', 'ime',
+            'ignoreWhitespace', 'ignoreWhite', 'ignoreProcessingInstructions',
+            'ignoreComments', 'ignoreCase', 'identity', 'idMap', 'id3',
+            'httpStatus', 'htmlText', 'hoursUTC', 'hours', 'hitTestTextNearPos',
+            'hitTestState', 'hitTestPoint', 'hitTestObject', 'hitTest',
+            'hitArea', 'highlightColor', 'highlightAlpha', 'hideObject',
+            'hideBuiltInItems', 'hide', 'height', 'hasVideoEncoder', 'hasTLS',
+            'hasStreamingVideo', 'hasStreamingAudio', 'hasSimpleContent',
+            'hasScreenPlayback', 'hasScreenBroadcast', 'hasProperty',
+            'hasPrinting', 'hasOwnProperty', 'hasMP3', 'hasIME', 'hasGlyphs',
+            'hasEventListener', 'hasEmbeddedVideo', 'hasDefinition',
+            'hasComplexContent', 'hasChildNodes', 'hasAudioEncoder', 'hasAudio',
+            'hasAccessibility', 'gridFitType', 'greenOffset', 'greenMultiplier',
+            'graphics', 'gotoAndStop', 'gotoAndPlay', 'globalToLocal', 'global',
+            'getUTCSeconds', 'getUTCMonth', 'getUTCMinutes',
+            'getUTCMilliseconds', 'getUTCHours', 'getUTCFullYear', 'getUTCDay',
+            'getUTCDate', 'getTimezoneOffset', 'getTimer', 'getTime',
+            'getTextRunInfo', 'getTextFormat', 'getText', 'getStyle',
+            'getStackTrace', 'getSelectedText', 'getSelected', 'getSeconds',
+            'getRemote', 'getRect', 'getQualifiedSuperclassName',
+            'getQualifiedClassName', 'getProperty', 'getPrefixForNamespace',
+            'getPixels', 'getPixel32', 'getPixel', 'getParagraphLength',
+            'getObjectsUnderPoint', 'getNamespaceForPrefix', 'getMonth',
+            'getMinutes', 'getMilliseconds', 'getMicrophone', 'getLocal',
+            'getLineText', 'getLineOffset', 'getLineMetrics', 'getLineLength',
+            'getLineIndexOfChar', 'getLineIndexAtPoint', 'getImageReference',
+            'getHours', 'getFullYear', 'getFirstCharInParagraph',
+            'getDescendants', 'getDefinitionByName', 'getDefinition', 'getDay',
+            'getDate', 'getColorBoundsRect', 'getClassByAlias', 'getChildIndex',
+            'getChildByName', 'getChildAt', 'getCharIndexAtPoint',
+            'getCharBoundaries', 'getCamera', 'getBounds', 'genre',
+            'generateFilterRect', 'gain', 'fullYearUTC', 'fullYear',
+            'fullScreen', 'fscommand', 'fromCharCode', 'framesLoaded',
+            'frameRate', 'frame', 'fps', 'forwardAndBack', 'formatToString',
+            'forceSimple', 'forEach', 'fontType', 'fontStyle', 'fontSize',
+            'fontName', 'font', 'focusRect', 'focusOut', 'focusIn', 'focus',
+            'flush', 'floor', 'floodFill', 'firstChild', 'findText', 'filters',
+            'filter', 'fillRect', 'fileList', 'extension', 'extended', 'exp',
+            'exec', 'exactSettings', 'every', 'eventPhase', 'escapeMultiByte',
+            'escape', 'errorID', 'error', 'equals', 'enumerateFonts',
+            'enterFrame', 'endian', 'endFill', 'encodeURIComponent',
+            'encodeURI', 'enabled', 'embedFonts', 'elements',
+            'dynamicPropertyWriter', 'dropTarget', 'drawRoundRect', 'drawRect',
+            'drawEllipse', 'drawCircle', 'draw', 'download', 'downState',
+            'doubleClickEnabled', 'doubleClick', 'dotall', 'domain',
+            'docTypeDecl', 'doConversion', 'divisor', 'distance', 'dispose',
+            'displayState', 'displayMode', 'displayAsPassword', 'dispatchEvent',
+            'description', 'describeType', 'descent', 'descendants',
+            'deltaTransformPoint', 'delta', 'deleteProperty', 'delay',
+            'defaultTextFormat', 'defaultSettings', 'defaultObjectEncoding',
+            'decodeURIComponent', 'decodeURI', 'decode', 'deblocking',
+            'deactivate', 'dayUTC', 'day', 'dateUTC', 'date', 'dataFormat',
+            'data', 'd', 'customItems', 'curveTo', 'currentTarget',
+            'currentScene', 'currentLabels', 'currentLabel', 'currentFrame',
+            'currentFPS', 'currentDomain', 'currentCount', 'ctrlKey', 'creator',
+            'creationDate', 'createTextNode', 'createGradientBox',
+            'createElement', 'createBox', 'cos', 'copyPixels', 'copyChannel',
+            'copy', 'conversionMode', 'contextMenuOwner', 'contextMenu',
+            'contentType', 'contentLoaderInfo', 'content', 'containsRect',
+            'containsPoint', 'contains', 'constructor', 'connectedProxyType',
+            'connected', 'connect', 'condenseWhite', 'concatenatedMatrix',
+            'concatenatedColorTransform', 'concat', 'computeSpectrum',
+            'compress', 'componentY', 'componentX', 'complete', 'compare',
+            'comments', 'comment', 'colors', 'colorTransform', 'color', 'code',
+            'close', 'cloneNode', 'clone', 'client', 'click', 'clearTimeout',
+            'clearInterval', 'clear', 'clamp', 'children', 'childNodes',
+            'childIndex', 'childAllowsParent', 'child', 'checkPolicyFile',
+            'charCount', 'charCodeAt', 'charCode', 'charAt', 'changeList',
+            'change', 'ceil', 'caretIndex', 'caption', 'capsLock', 'cancelable',
+            'cancel', 'callee', 'callProperty', 'call', 'cacheAsBitmap', 'c',
+            'bytesTotal', 'bytesLoaded', 'bytesAvailable', 'buttonMode',
+            'buttonDown', 'bullet', 'builtInItems', 'bufferTime',
+            'bufferLength', 'bubbles', 'browse', 'bottomScrollV', 'bottomRight',
+            'bottom', 'borderColor', 'border', 'bold', 'blurY', 'blurX',
+            'blueOffset', 'blueMultiplier', 'blockIndent', 'blendMode',
+            'bitmapData', 'bias', 'beginGradientFill', 'beginFill',
+            'beginBitmapFill', 'bandwidth', 'backgroundColor', 'background',
+            'b', 'available', 'avHardwareDisable', 'autoSize', 'attributes',
+            'attribute', 'attachNetStream', 'attachCamera', 'attachAudio',
+            'atan2', 'atan', 'asyncError', 'asin', 'ascent', 'artist',
+            'areSoundsInaccessible', 'areInaccessibleObjectsUnderPoint',
+            'applyFilter', 'apply', 'applicationDomain', 'appendText',
+            'appendChild', 'antiAliasType', 'angle', 'alwaysShowSelection',
+            'altKey', 'alphas', 'alphaOffset', 'alphaMultiplier', 'alpha',
+            'allowInsecureDomain', 'allowDomain', 'align', 'album',
+            'addedToStage', 'added', 'addPage', 'addNamespace', 'addHeader',
+            'addEventListener', 'addChildAt', 'addChild', 'addCallback', 'add',
+            'activityLevel', 'activity', 'active', 'activating', 'activate',
+            'actionScriptVersion', 'acos', 'accessibilityProperties', 'abs'
+            ),
+        8 => array(
+            'WRAP', 'VERTICAL', 'VARIABLES',
+            'UTC', 'UPLOAD_COMPLETE_DATA', 'UP', 'UNLOAD', 'UNKNOWN',
+            'UNIQUESORT', 'TOP_RIGHT', 'TOP_LEFT', 'TOP', 'TIMER_COMPLETE',
+            'TIMER', 'TEXT_NODE', 'TEXT_INPUT', 'TEXT', 'TAB_INDEX_CHANGE',
+            'TAB_ENABLED_CHANGE', 'TAB_CHILDREN_CHANGE', 'TAB', 'SYNC',
+            'SUBTRACT', 'SUBPIXEL', 'STATUS', 'STANDARD', 'SQUARE', 'SQRT2',
+            'SQRT1_2', 'SPACE', 'SOUND_COMPLETE', 'SOCKET_DATA', 'SHOW_ALL',
+            'SHIFT', 'SETTINGS_MANAGER', 'SELECT', 'SECURITY_ERROR', 'SCROLL',
+            'SCREEN', 'ROUND', 'ROLL_OVER', 'ROLL_OUT', 'RIGHT', 'RGB',
+            'RETURNINDEXEDARRAY', 'RESIZE', 'REPEAT', 'RENDER',
+            'REMOVED_FROM_STAGE', 'REMOVED', 'REMOTE', 'REGULAR', 'REFLECT',
+            'RED', 'RADIAL', 'PROGRESS', 'PRIVACY', 'POST', 'POSITIVE_INFINITY',
+            'PORTRAIT', 'PIXEL', 'PI', 'PENDING', 'PAGE_UP', 'PAGE_DOWN', 'PAD',
+            'OVERLAY', 'OUTER', 'OPEN', 'NaN', 'NUM_PAD', 'NUMPAD_SUBTRACT',
+            'NUMPAD_MULTIPLY', 'NUMPAD_ENTER', 'NUMPAD_DIVIDE',
+            'NUMPAD_DECIMAL', 'NUMPAD_ADD', 'NUMPAD_9', 'NUMPAD_8', 'NUMPAD_7',
+            'NUMPAD_6', 'NUMPAD_5', 'NUMPAD_4', 'NUMPAD_3', 'NUMPAD_2',
+            'NUMPAD_1', 'NUMPAD_0', 'NUMERIC', 'NO_SCALE', 'NO_BORDER',
+            'NORMAL', 'NONE', 'NEVER', 'NET_STATUS', 'NEGATIVE_INFINITY',
+            'MULTIPLY', 'MOUSE_WHEEL', 'MOUSE_UP', 'MOUSE_OVER', 'MOUSE_OUT',
+            'MOUSE_MOVE', 'MOUSE_LEAVE', 'MOUSE_FOCUS_CHANGE', 'MOUSE_DOWN',
+            'MITER', 'MIN_VALUE', 'MICROPHONE', 'MENU_SELECT',
+            'MENU_ITEM_SELECT', 'MEDIUM', 'MAX_VALUE', 'LOW', 'LOG2E', 'LOG10E',
+            'LOCAL_WITH_NETWORK', 'LOCAL_WITH_FILE', 'LOCAL_TRUSTED',
+            'LOCAL_STORAGE', 'LN2', 'LN10', 'LITTLE_ENDIAN', 'LINK',
+            'LINEAR_RGB', 'LINEAR', 'LIGHT_COLOR', 'LIGHTEN', 'LEFT', 'LCD',
+            'LAYER', 'LANDSCAPE', 'KOREAN', 'KEY_UP', 'KEY_FOCUS_CHANGE',
+            'KEY_DOWN', 'JUSTIFY', 'JAPANESE_KATAKANA_HALF',
+            'JAPANESE_KATAKANA_FULL', 'JAPANESE_HIRAGANA', 'Infinity', 'ITALIC',
+            'IO_ERROR', 'INVERT', 'INSERT', 'INPUT', 'INNER', 'INIT',
+            'IME_COMPOSITION', 'IGNORE', 'ID3', 'HTTP_STATUS', 'HORIZONTAL',
+            'HOME', 'HIGH', 'HARDLIGHT', 'GREEN', 'GET', 'FULLSCREEN', 'FULL',
+            'FOCUS_OUT', 'FOCUS_IN', 'FLUSHED', 'FLASH9', 'FLASH8', 'FLASH7',
+            'FLASH6', 'FLASH5', 'FLASH4', 'FLASH3', 'FLASH2', 'FLASH1', 'F9',
+            'F8', 'F7', 'F6', 'F5', 'F4', 'F3', 'F2', 'F15', 'F14', 'F13',
+            'F12', 'F11', 'F10', 'F1', 'EXACT_FIT', 'ESCAPE', 'ERROR', 'ERASE',
+            'ENTER_FRAME', 'ENTER', 'END', 'EMBEDDED', 'ELEMENT_NODE', 'E',
+            'DYNAMIC', 'DOWN', 'DOUBLE_CLICK', 'DIFFERENCE', 'DEVICE',
+            'DESCENDING', 'DELETE', 'DEFAULT', 'DEACTIVATE', 'DATA',
+            'DARK_COLOR', 'DARKEN', 'CRT', 'CONTROL', 'CONNECT', 'COMPLETE',
+            'COLOR', 'CLOSE', 'CLICK', 'CLAMP', 'CHINESE', 'CHANGE', 'CENTER',
+            'CASEINSENSITIVE', 'CAPTURING_PHASE', 'CAPS_LOCK', 'CANCEL',
+            'CAMERA', 'BUBBLING_PHASE', 'BOTTOM_RIGHT', 'BOTTOM_LEFT', 'BOTTOM',
+            'BOLD_ITALIC', 'BOLD', 'BLUE', 'BINARY', 'BIG_ENDIAN', 'BEVEL',
+            'BEST', 'BACKSPACE', 'AUTO', 'AT_TARGET', 'ASYNC_ERROR', 'AMF3',
+            'AMF0', 'ALWAYS', 'ALPHANUMERIC_HALF', 'ALPHANUMERIC_FULL', 'ALPHA',
+            'ADVANCED', 'ADDED_TO_STAGE', 'ADDED', 'ADD', 'ACTIVITY',
+            'ACTIONSCRIPT3', 'ACTIONSCRIPT2'
+            ),
+        //FIX: Must be last in order to avoid conflicts with keywords present
+        //in other keyword groups, that might get highlighted as part of the URL.
+        //I know this is not a proper work-around, but should do just fine.
+        5 => array(
+            'uint', 'int', 'arguments', 'XMLSocket', 'XMLNodeType', 'XMLNode',
+            'XMLList', 'XMLDocument', 'XML', 'Video', 'VerifyError',
+            'URLVariables', 'URLStream', 'URLRequestMethod', 'URLRequestHeader',
+            'URLRequest', 'URLLoaderDataFormat', 'URLLoader', 'URIError',
+            'TypeError', 'Transform', 'TimerEvent', 'Timer', 'TextSnapshot',
+            'TextRenderer', 'TextLineMetrics', 'TextFormatAlign', 'TextFormat',
+            'TextFieldType', 'TextFieldAutoSize', 'TextField', 'TextEvent',
+            'TextDisplayMode', 'TextColorType', 'System', 'SyntaxError',
+            'SyncEvent', 'StyleSheet', 'String', 'StatusEvent', 'StaticText',
+            'StageScaleMode', 'StageQuality', 'StageAlign', 'Stage',
+            'StackOverflowError', 'Sprite', 'SpreadMethod', 'SoundTransform',
+            'SoundMixer', 'SoundLoaderContext', 'SoundChannel', 'Sound',
+            'Socket', 'SimpleButton', 'SharedObjectFlushStatus', 'SharedObject',
+            'Shape', 'SecurityPanel', 'SecurityErrorEvent', 'SecurityError',
+            'SecurityDomain', 'Security', 'ScriptTimeoutError', 'Scene',
+            'SWFVersion', 'Responder', 'RegExp', 'ReferenceError', 'Rectangle',
+            'RangeError', 'QName', 'Proxy', 'ProgressEvent',
+            'PrintJobOrientation', 'PrintJobOptions', 'PrintJob', 'Point',
+            'PixelSnapping', 'ObjectEncoding', 'Object', 'Number', 'NetStream',
+            'NetStatusEvent', 'NetConnection', 'Namespace', 'MovieClip',
+            'MouseEvent', 'Mouse', 'MorphShape', 'Microphone', 'MemoryError',
+            'Matrix', 'Math', 'LocalConnection', 'LoaderInfo', 'LoaderContext',
+            'Loader', 'LineScaleMode', 'KeyboardEvent', 'Keyboard',
+            'KeyLocation', 'JointStyle', 'InvalidSWFError',
+            'InterpolationMethod', 'InteractiveObject', 'IllegalOperationError',
+            'IOErrorEvent', 'IOError', 'IMEEvent', 'IMEConversionMode', 'IME',
+            'IExternalizable', 'IEventDispatcher', 'IDynamicPropertyWriter',
+            'IDynamicPropertyOutput', 'IDataOutput', 'IDataInput', 'ID3Info',
+            'IBitmapDrawable', 'HTTPStatusEvent', 'GridFitType', 'Graphics',
+            'GradientType', 'GradientGlowFilter', 'GradientBevelFilter',
+            'GlowFilter', 'Function', 'FrameLabel', 'FontType', 'FontStyle',
+            'Font', 'FocusEvent', 'FileReferenceList', 'FileReference',
+            'FileFilter', 'ExternalInterface', 'EventPhase', 'EventDispatcher',
+            'Event', 'EvalError', 'ErrorEvent', 'Error', 'Endian', 'EOFError',
+            'DropShadowFilter', 'DisplayObjectContainer', 'DisplayObject',
+            'DisplacementMapFilterMode', 'DisplacementMapFilter', 'Dictionary',
+            'DefinitionError', 'Date', 'DataEvent', 'ConvolutionFilter',
+            'ContextMenuItem', 'ContextMenuEvent', 'ContextMenuBuiltInItems',
+            'ContextMenu', 'ColorTransform', 'ColorMatrixFilter', 'Class',
+            'CapsStyle', 'Capabilities', 'Camera', 'CSMSettings', 'ByteArray',
+            'Boolean', 'BlurFilter', 'BlendMode', 'BitmapFilterType',
+            'BitmapFilterQuality', 'BitmapFilter', 'BitmapDataChannel',
+            'BitmapData', 'Bitmap', 'BevelFilter', 'AsyncErrorEvent', 'Array',
+            'ArgumentError', 'ApplicationDomain', 'AntiAliasType',
+            'ActivityEvent', 'ActionScriptVersion', 'AccessibilityProperties',
+            'Accessibility', 'AVM1Movie'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>', '^', '-', '+', '~', '?', ':', ';', '.', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff; font-weight: bold;',
+            2 => 'color: #6699cc; font-weight: bold;',
+            3 => 'color: #339966; font-weight: bold;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #004993;',
+            6 => 'color: #004993;',
+            7 => 'color: #004993;',
+            8 => 'color: #004993;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #3f5fbf;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => false,//Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(
+        // commented out because it's not very relevant for AS, as all properties, methods and constants are dot-accessed.
+        // I believe it's preferable to have package highlighting for example, which is not possible with this enabled.
+        // 0 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ada.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ada.php
new file mode 100644
index 000000000..530ed5e4c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ada.php
@@ -0,0 +1,133 @@
+<?php
+/*************************************************************************************
+ * ada.php
+ * -------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/29
+ *
+ * Ada language file for GeSHi.
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Removed apostrophe as string delimiter
+ *   -  Added URL support
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Ada',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
+            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
+            'goto', 'return'
+            ),
+        2 => array(
+            'abs', 'and', 'mod', 'not', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array', 'at', 'body',
+            'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
+            'function', 'generic', 'in', 'limited', 'new', 'null', 'of', 'others', 'out', 'package', 'pragma',
+            'private', 'procedure', 'protected', 'raise', 'range', 'record', 'renames', 'requeue', 'reverse',
+            'separate', 'subtype', 'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apache.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apache.php
new file mode 100644
index 000000000..f319e3e3c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apache.php
@@ -0,0 +1,480 @@
+<?php
+/*************************************************************************************
+ * apache.php
+ * ----------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/29/07
+ *
+ * Apache language file for GeSHi.
+ * Words are from SciTe configuration file
+ *
+ * CHANGES
+ * -------
+ * 2008/17/06 (1.0.8)
+ *  -  Added support for apache configuration sections (milian)
+ *  -  Added missing php keywords (milian)
+ *  -  Added some more keywords
+ *  -  Disabled highlighting of brackets by default
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/07/29)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Apache configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            //core.c
+            'AcceptFilter','AcceptPathInfo','AccessConfig','AccessFileName',
+            'AddDefaultCharset','AddOutputFilterByType','AllowEncodedSlashes',
+            'AllowOverride','AuthName','AuthType','ContentDigest',
+            'CoreDumpDirectory','DefaultType','DocumentRoot','EnableMMAP',
+            'EnableSendfile','ErrorDocument','ErrorLog','FileETag','ForceType',
+            'HostnameLookups','Include','LimitInternalRecursion',
+            'LimitRequestBody','LimitRequestFields','LimitRequestFieldsize',
+            'LimitRequestLine','LimitXMLRequestBody','LogLevel','MaxMemFree',
+            'MaxRequestsPerChild','NameVirtualHost','Options','PidFile','Port',
+            'Protocol','Require','RLimitCPU','RLimitMEM','RLimitNPROC',
+            'Satisfy','ScoreBoardFile','ServerAdmin','ServerAlias','ServerName',
+            'ServerPath','ServerRoot','ServerSignature','ServerTokens',
+            'SetHandler','SetInputFilter','SetOutputFilter','ThreadStackSize',
+            'Timeout','TraceEnable','UseCanonicalName',
+            'UseCanonicalPhysicalPort',
+
+            //http_core.c
+            'KeepAlive','KeepAliveTimeout','MaxKeepAliveRequests',
+
+            //mod_actions.c
+            'Action','Script',
+
+            //mod_alias.c
+            'Alias','AliasMatch','Redirect','RedirectMatch','RedirectPermanent',
+            'RedirectTemp','ScriptAlias','ScriptAliasMatch',
+
+            //mod_asis.c
+
+            //mod_auth_basic.c
+            'AuthBasicAuthoritative','AuthBasicProvider',
+
+            //mod_auth_digest.c
+            'AuthDigestAlgorithm','AuthDigestDomain','AuthDigestNcCheck',
+            'AuthDigestNonceFormat','AuthDigestNonceLifetime',
+            'AuthDigestProvider','AuthDigestQop','AuthDigestShmemSize',
+
+            //mod_authn_alias.c
+
+            //mod_authn_anon.c
+            'Anonymous','Anonymous_LogEmail','Anonymous_MustGiveEmail',
+            'Anonymous_NoUserId','Anonymous_VerifyEmail',
+
+            //mod_authn_dbd.c
+            'AuthDBDUserPWQuery','AuthDBDUserRealmQuery',
+
+            //mod_authn_dbm.c
+            'AuthDBMType','AuthDBMUserFile',
+
+            //mod_authn_default.c
+            'AuthDefaultAuthoritative',
+
+            //mod_authn_file.c
+            'AuthUserFile',
+
+            //mod_authnz_ldap.c
+            'AuthLDAPBindDN','AuthLDAPBindPassword','AuthLDAPCharsetConfig',
+            'AuthLDAPCompareDNOnServer','AuthLDAPDereferenceAliases',
+            'AuthLDAPGroupAttribute','AuthLDAPGroupAttributeIsDN',
+            'AuthLDAPRemoteUserAttribute','AuthLDAPRemoteUserIsDN',
+            'AuthLDAPURL','AuthzLDAPAuthoritative',
+
+            //mod_authz_dbm.c
+            'AuthDBMGroupFile','AuthzDBMAuthoritative','AuthzDBMType',
+
+            //mod_authz_default.c
+            'AuthzDefaultAuthoritative',
+
+            //mod_authz_groupfile.c
+            'AuthGroupFile','AuthzGroupFileAuthoritative',
+
+            //mod_authz_host.c
+            'Allow','Deny','Order',
+
+            //mod_authz_owner.c
+            'AuthzOwnerAuthoritative',
+
+            //mod_authz_svn.c
+            'AuthzForceUsernameCase','AuthzSVNAccessFile','AuthzSVNAnonymous',
+            'AuthzSVNAuthoritative','AuthzSVNNoAuthWhenAnonymousAllowed',
+
+            //mod_authz_user.c
+            'AuthzUserAuthoritative',
+
+            //mod_autoindex.c
+            'AddAlt','AddAltByEncoding','AddAltByType','AddDescription',
+            'AddIcon','AddIconByEncoding','AddIconByType','DefaultIcon',
+            'FancyIndexing','HeaderName','IndexHeadInsert','IndexIgnore',
+            'IndexOptions','IndexOrderDefault','IndexStyleSheet','ReadmeName',
+
+            //mod_bt.c
+            'Tracker','TrackerDetailURL','TrackerFlags','TrackerHashMaxAge',
+            'TrackerHashMinAge','TrackerHashWatermark','TrackerHome',
+            'TrackerReturnInterval','TrackerReturnMax',
+            'TrackerReturnPeerFactor','TrackerReturnPeers','TrackerRootInclude',
+            'TrackerStyleSheet',
+
+            //mod_bw.c
+            'BandWidth','BandWidthError','BandWidthModule','BandWidthPacket',
+            'ForceBandWidthModule','LargeFileLimit','MaxConnection',
+            'MinBandWidth',
+
+            //mod_cache.c
+            'CacheDefaultExpire','CacheDisable','CacheEnable',
+            'CacheIgnoreCacheControl','CacheIgnoreHeaders',
+            'CacheIgnoreNoLastMod','CacheIgnoreQueryString',
+            'CacheLastModifiedFactor','CacheMaxExpire','CacheStoreNoStore',
+            'CacheStorePrivate',
+
+            //mod_cern_meta.c
+            'MetaDir','MetaFiles','MetaSuffix',
+
+            //mod_cgi.c
+            'ScriptLog','ScriptLogBuffer','ScriptLogLength',
+
+            //mod_charset_lite.c
+            'CharsetDefault','CharsetOptions','CharsetSourceEnc',
+
+            //mod_dav.c
+            'DAV','DAVDepthInfinity','DAVMinTimeout',
+
+            //mod_dav_fs.c
+            'DAVLockDB',
+
+            //mod_dav_lock.c
+            'DAVGenericLockDB',
+
+            //mod_dav_svn.c
+            'SVNActivitiesDB','SVNAllowBulkUpdates','SVNAutoversioning',
+            'SVNIndexXSLT','SVNListParentPath','SVNMasterURI','SVNParentPath',
+            'SVNPath','SVNPathAuthz','SVNReposName','SVNSpecialURI',
+
+            //mod_dbd.c
+            'DBDExptime','DBDKeep','DBDMax','DBDMin','DBDParams','DBDPersist',
+            'DBDPrepareSQL','DBDriver',
+
+            //mod_deflate.c
+            'DeflateBufferSize','DeflateCompressionLevel','DeflateFilterNote',
+            'DeflateMemLevel','DeflateWindowSize',
+
+            //mod_dir.c
+            'DirectoryIndex','DirectorySlash',
+
+            //mod_disk_cache.c
+            'CacheDirLength','CacheDirLevels','CacheMaxFileSize',
+            'CacheMinFileSize','CacheRoot',
+
+            //mod_dumpio.c
+            'DumpIOInput','DumpIOLogLevel','DumpIOOutput',
+
+            //mod_env.c
+            'PassEnv','SetEnv','UnsetEnv',
+
+            //mod_expires.c
+            'ExpiresActive','ExpiresByType','ExpiresDefault',
+
+            //mod_ext_filter.c
+            'ExtFilterDefine','ExtFilterOptions',
+
+            //mod_file_cache.c
+            'cachefile','mmapfile',
+
+            //mod_filter.c
+            'FilterChain','FilterDeclare','FilterProtocol','FilterProvider',
+            'FilterTrace',
+
+            //mod_gnutls.c
+            'GnuTLSCache','GnuTLSCacheTimeout','GnuTLSCertificateFile',
+            'GnuTLSKeyFile','GnuTLSPGPCertificateFile','GnuTLSPGPKeyFile',
+            'GnuTLSClientVerify','GnuTLSClientCAFile','GnuTLSPGPKeyringFile',
+            'GnuTLSEnable','GnuTLSDHFile','GnuTLSRSAFile','GnuTLSSRPPasswdFile',
+            'GnuTLSSRPPasswdConfFile','GnuTLSPriorities',
+            'GnuTLSExportCertificates',
+
+            //mod_headers.c
+            'Header','RequestHeader',
+
+            //mod_imagemap.c
+            'ImapBase','ImapDefault','ImapMenu',
+
+            //mod_include.c
+            'SSIAccessEnable','SSIEndTag','SSIErrorMsg','SSIStartTag',
+            'SSITimeFormat','SSIUndefinedEcho','XBitHack',
+
+            //mod_ident.c
+            'IdentityCheck','IdentityCheckTimeout',
+
+            //mod_info.c
+            'AddModuleInfo',
+
+            //mod_isapi.c
+            'ISAPIAppendLogToErrors','ISAPIAppendLogToQuery','ISAPICacheFile',
+            'ISAPIFakeAsync','ISAPILogNotSupported','ISAPIReadAheadBuffer',
+
+            //mod_log_config.c
+            'BufferedLogs','CookieLog','CustomLog','LogFormat','TransferLog',
+
+            //mod_log_forensic.c
+            'ForensicLog',
+
+            //mod_log_rotate.c
+            'RotateInterval','RotateLogs','RotateLogsLocalTime',
+
+            //mod_logio.c
+
+            //mod_mem_cache.c
+            'MCacheMaxObjectCount','MCacheMaxObjectSize',
+            'MCacheMaxStreamingBuffer','MCacheMinObjectSize',
+            'MCacheRemovalAlgorithm','MCacheSize',
+
+            //mod_mime.c
+            'AddCharset','AddEncoding','AddHandler','AddInputFilter',
+            'AddLanguage','AddOutputFilter','AddType','DefaultLanguage',
+            'ModMimeUsePathInfo','MultiviewsMatch','RemoveCharset',
+            'RemoveEncoding','RemoveHandler','RemoveInputFilter',
+            'RemoveLanguage','RemoveOutputFilter','RemoveType','TypesConfig',
+
+            //mod_mime_magic.c
+            'MimeMagicFile',
+
+            //mod_negotiation.c
+            'CacheNegotiatedDocs','ForceLanguagePriority','LanguagePriority',
+
+            //mod_php5.c
+            'php_admin_flag','php_admin_value','php_flag','php_value',
+            'PHPINIDir',
+
+            //mod_proxy.c
+            'AllowCONNECT','BalancerMember','NoProxy','ProxyBadHeader',
+            'ProxyBlock','ProxyDomain','ProxyErrorOverride',
+            'ProxyFtpDirCharset','ProxyIOBufferSize','ProxyMaxForwards',
+            'ProxyPass','ProxyPassInterpolateEnv','ProxyPassMatch',
+            'ProxyPassReverse','ProxyPassReverseCookieDomain',
+            'ProxyPassReverseCookiePath','ProxyPreserveHost',
+            'ProxyReceiveBufferSize','ProxyRemote','ProxyRemoteMatch',
+            'ProxyRequests','ProxySet','ProxyStatus','ProxyTimeout','ProxyVia',
+
+            //mod_proxy_ajp.c
+
+            //mod_proxy_balancer.c
+
+            //mod_proxy_connect.c
+
+            //mod_proxy_ftp.c
+
+            //mod_proxy_http.c
+
+            //mod_rewrite.c
+            'RewriteBase','RewriteCond','RewriteEngine','RewriteLock',
+            'RewriteLog','RewriteLogLevel','RewriteMap','RewriteOptions',
+            'RewriteRule',
+
+            //mod_setenvif.c
+            'BrowserMatch','BrowserMatchNoCase','SetEnvIf','SetEnvIfNoCase',
+
+            //mod_so.c
+            'LoadFile','LoadModule',
+
+            //mod_speling.c
+            'CheckCaseOnly','CheckSpelling',
+
+            //mod_ssl.c
+            'SSLCACertificateFile','SSLCACertificatePath','SSLCADNRequestFile',
+            'SSLCADNRequestPath','SSLCARevocationFile','SSLCARevocationPath',
+            'SSLCertificateChainFile','SSLCertificateFile',
+            'SSLCertificateKeyFile','SSLCipherSuite','SSLCryptoDevice',
+            'SSLEngine','SSLHonorCipherOrder','SSLMutex','SSLOptions',
+            'SSLPassPhraseDialog','SSLProtocol','SSLProxyCACertificateFile',
+            'SSLProxyCACertificatePath','SSLProxyCARevocationFile',
+            'SSLProxyCARevocationPath','SSLProxyCipherSuite','SSLProxyEngine',
+            'SSLProxyMachineCertificateFile','SSLProxyMachineCertificatePath',
+            'SSLProxyProtocol','SSLProxyVerify','SSLProxyVerifyDepth',
+            'SSLRandomSeed','SSLRenegBufferSize','SSLRequire','SSLRequireSSL',
+            'SSLSessionCache','SSLSessionCacheTimeout','SSLUserName',
+            'SSLVerifyClient','SSLVerifyDepth',
+
+            //mod_status.c
+            'ExtendedStatus','SeeRequestTail',
+
+            //mod_substitute.c
+            'Substitute',
+
+            //mod_suexec.c
+            'SuexecUserGroup',
+
+            //mod_unique_id.c
+
+            //mod_userdir.c
+            'UserDir',
+
+            //mod_usertrack.c
+            'CookieDomain','CookieExpires','CookieName','CookieStyle',
+            'CookieTracking',
+
+            //mod_version.c
+
+            //mod_vhost_alias.c
+            'VirtualDocumentRoot','VirtualDocumentRootIP',
+            'VirtualScriptAlias','VirtualScriptAliasIP',
+
+            //mod_view.c
+            'ViewEnable',
+
+            //mod_win32.c
+            'ScriptInterpreterSource',
+
+            //mpm_winnt.c
+            'Listen','ListenBacklog','ReceiveBufferSize','SendBufferSize',
+            'ThreadLimit','ThreadsPerChild','Win32DisableAcceptEx',
+
+            //mpm_common.c
+            'AcceptMutex','AddModule','ClearModuleList','EnableExceptionHook',
+            'Group','LockFile','MaxClients','MaxSpareServers','MaxSpareThreads',
+            'MinSpareServers','MinSpareThreads','ServerLimit','StartServers',
+            'StartThreads','User',
+
+            //util_ldap.c
+            'LDAPCacheEntries','LDAPCacheTTL','LDAPConnectionTimeout',
+            'LDAPOpCacheEntries','LDAPOpCacheTTL','LDAPSharedCacheFile',
+            'LDAPSharedCacheSize','LDAPTrustedClientCert',
+            'LDAPTrustedGlobalCert','LDAPTrustedMode','LDAPVerifyServerCert',
+
+            //Unknown Mods ...
+            'AgentLog','BindAddress','bs2000account','CacheForceCompletion',
+            'CacheGCInterval','CacheSize','NoCache','qsc','RefererIgnore',
+            'RefererLog','Resourceconfig','ServerType','SingleListen'
+            ),
+        /*keywords 2*/
+        2 => array(
+            'all','on','off','standalone','inetd','indexes',
+            'force-response-1.0','downgrade-1.0','nokeepalive',
+            'includes','followsymlinks','none',
+            'x-compress','x-gzip'
+        ),
+        /*keywords 3*/
+        3 => array(
+            //core.c
+            'Directory','DirectoryMatch','Files','FilesMatch','IfDefine',
+            'IfModule','Limit','LimitExcept','Location','LocationMatch',
+            'VirtualHost',
+
+            //mod_authn_alias.c
+            'AuthnProviderAlias',
+
+            //mod_proxy.c
+            'Proxy','ProxyMatch',
+
+            //mod_version.c
+            'IfVersion'
+        )
+    ),
+    'SYMBOLS' => array(
+        '+', '-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000000; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            )
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/applescript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/applescript.php
new file mode 100644
index 000000000..85e3d6d0d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/applescript.php
@@ -0,0 +1,157 @@
+<?php
+/*************************************************************************************
+ * applescript.php
+ * --------
+ * Author: Stephan Klimek (http://www.initware.org)
+ * Copyright: Stephan Klimek (http://www.initware.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/07/20
+ *
+ * AppleScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *
+ * TODO
+ * -------------------------
+ * URL settings to references
+ *
+ **************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AppleScript',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array( '(*' => '*)'),
+    'COMMENT_REGEXP' => array(
+        2 => '/(?<=[a-z])\'/i',
+        3 => '/(?<![a-z])\'.*?\'/i',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'application','close','count','delete','duplicate','exists','launch','make','move','open',
+            'print','quit','reopen','run','save','saving', 'idle', 'path to', 'number', 'alias', 'list', 'text', 'string',
+            'integer', 'it','me','version','pi','result','space','tab','anything','case','diacriticals','expansion',
+            'hyphens','punctuation','bold','condensed','expanded','hidden','italic','outline','plain',
+            'shadow','strikethrough','subscript','superscript','underline','ask','no','yes','false', 'id',
+            'true','weekday','monday','mon','tuesday','tue','wednesday','wed','thursday','thu','friday',
+            'fri','saturday','sat','sunday','sun','month','january','jan','february','feb','march',
+            'mar','april','apr','may','june','jun','july','jul','august','aug','september', 'quote', 'do JavaScript',
+            'sep','october','oct','november','nov','december','dec','minutes','hours', 'name', 'default answer',
+            'days','weeks', 'folder', 'folders', 'file', 'files', 'window', 'eject', 'disk', 'reveal', 'sleep',
+            'shut down', 'restart', 'display dialog', 'buttons', 'invisibles', 'item', 'items', 'delimiters', 'offset of',
+            'AppleScript\'s', 'choose file', 'choose folder', 'choose from list', 'beep', 'contents', 'do shell script',
+            'paragraph', 'paragraphs', 'missing value', 'quoted form', 'desktop', 'POSIX path', 'POSIX file',
+            'activate', 'document', 'adding', 'receiving', 'content', 'new', 'properties', 'info for', 'bounds',
+            'selection', 'extension', 'into', 'onto', 'by', 'between', 'against', 'set the clipboard to', 'the clipboard'
+            ),
+        2 => array(
+            'each','some','every','whose','where','index','first','second','third','fourth',
+            'fifth','sixth','seventh','eighth','ninth','tenth','last','front','back','st','nd',
+            'rd','th','middle','named','through','thru','before','after','beginning','the', 'as',
+            'div','mod','and','not','or','contains','equal','equals','isnt', 'less', 'greater'
+            ),
+        3 => array(
+            'script','property','prop','end','to','set','global','local','on','of',
+            'in','given','with','without','return','continue','tell','if','then','else','repeat',
+            'times','while','until','from','exit','try','error','considering','ignoring','timeout',
+            'transaction','my','get','put','is', 'copy'
+            )
+        ),
+    'SYMBOLS' => array(
+        ')','+','-','^','*','/','&','<','>=','<','<=','=','�'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0066ff;',
+            2 => 'color: #ff0033;',
+            3 => 'color: #ff0033; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => '',
+            3 => 'color: #ff0000;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #339933;',
+            4 => 'color: #0066ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ',+-=&lt;&gt;/?^&amp;*'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File descriptors
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apt_sources.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apt_sources.php
new file mode 100644
index 000000000..891c10e5e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/apt_sources.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * apt_sources.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/06/17
+ *
+ * Apt sources.list language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/17 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Apt sources',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'deb-src', 'deb'
+            ),
+        2 => array(
+            //Generic
+            'stable', 'old-stable', 'testing', 'testing-proposed-updates',
+            'unstable', 'unstable-proposed-updates', 'experimental',
+            'non-US', 'security', 'volatile', 'volatile-sloppy',
+            'apt-build',
+            'stable/updates',
+            //Debian
+            'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
+            'etch', 'lenny', 'sid',
+            //Ubuntu
+            'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
+            'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
+            'breezy', 'breezy-updates', 'breezy-security', 'breezy-proposed', 'breezy-backports',
+            'dapper', 'dapper-updates', 'dapper-security', 'dapper-proposed', 'dapper-backports',
+            'edgy', 'edgy-updates', 'edgy-security', 'edgy-proposed', 'edgy-backports',
+            'feisty', 'feisty-updates', 'feisty-security', 'feisty-proposed', 'feisty-backports',
+            'gutsy', 'gutsy-updates', 'gutsy-security', 'gutsy-proposed', 'gutsy-backports',
+            'hardy', 'hardy-updates', 'hardy-security', 'hardy-proposed', 'hardy-backports',
+            'intrepid', 'intrepid-updates', 'intrepid-security', 'intrepid-proposed', 'intrepid-backports'
+            ),
+        3 => array(
+            'main', 'restricted', 'preview', 'contrib', 'non-free',
+            'commercial', 'universe', 'multiverse'
+            )
+    ),
+    'REGEXPS' => array(
+        0 => "(((http|ftp):\/\/|file:\/)[^\s]+)|(cdrom:\[[^\]]*\][^\s]*)",
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b16000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'SCRIPT' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'ESCAPE_CHAR' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#;>|^\/])',
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\.])'
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asm.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asm.php
new file mode 100644
index 000000000..2efeac9dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asm.php
@@ -0,0 +1,225 @@
+<?php
+/*************************************************************************************
+ * asm.php
+ * -------
+ * Author: Tux (tux@inmail.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/27
+ *
+ * x86 Assembler language file for GeSHi.
+ * Words are from SciTe configuration file (based on NASM syntax)
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.2)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ *   -  Added binary and hexadecimal regexps
+ * 2004/08/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ASM',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'aaa','aad','aam','aas','adc','add','and','call','cbw','clc','cld','cli','cmc','cmp',
+            'cmps','cmpsb','cmpsw','cwd','daa','das','dec','div','esc','hlt','idiv','imul','in','inc',
+            'int','into','iret','ja','jae','jb','jbe','jc','jcxz','je','jg','jge','jl','jle','jmp',
+            'jna','jnae','jnb','jnbe','jnc','jne','jng','jnge','jnl','jnle','jno','jnp','jns','jnz',
+            'jo','jp','jpe','jpo','js','jz','lahf','lds','lea','les','lods','lodsb','lodsw','loop',
+            'loope','loopew','loopne','loopnew','loopnz','loopnzw','loopw','loopz','loopzw','mov',
+            'movs','movsb','movsw','mul','neg','nop','not','or','out','pop','popf','push','pushf',
+            'rcl','rcr','ret','retf','retn','rol','ror','sahf','sal','sar','sbb','scas','scasb','scasw',
+            'shl','shr','stc','std','sti','stos','stosb','stosw','sub','test','wait','xchg','xlat',
+            'xlatb','xor','bound','enter','ins','insb','insw','leave','outs','outsb','outsw','popa','pusha','pushw',
+            'arpl','lar','lsl','sgdt','sidt','sldt','smsw','str','verr','verw','clts','lgdt','lidt','lldt','lmsw','ltr',
+            'bsf','bsr','bt','btc','btr','bts','cdq','cmpsd','cwde','insd','iretd','iretdf','iretf',
+            'jecxz','lfs','lgs','lodsd','loopd','looped','loopned','loopnzd','loopzd','lss','movsd',
+            'movsx','movzx','outsd','popad','popfd','pushad','pushd','pushfd','scasd','seta','setae',
+            'setb','setbe','setc','sete','setg','setge','setl','setle','setna','setnae','setnb','setnbe',
+            'setnc','setne','setng','setnge','setnl','setnle','setno','setnp','setns','setnz','seto','setp',
+            'setpe','setpo','sets','setz','shld','shrd','stosd','bswap','cmpxchg','invd','invlpg','wbinvd','xadd','lock',
+            'rep','repe','repne','repnz','repz'
+            ),
+        /*FPU*/
+        2 => array(
+            'f2xm1','fabs','fadd','faddp','fbld','fbstp','fchs','fclex','fcom','fcomp','fcompp','fdecstp',
+            'fdisi','fdiv','fdivp','fdivr','fdivrp','feni','ffree','fiadd','ficom','ficomp','fidiv',
+            'fidivr','fild','fimul','fincstp','finit','fist','fistp','fisub','fisubr','fld','fld1',
+            'fldcw','fldenv','fldenvw','fldl2e','fldl2t','fldlg2','fldln2','fldpi','fldz','fmul',
+            'fmulp','fnclex','fndisi','fneni','fninit','fnop','fnsave','fnsavew','fnstcw','fnstenv',
+            'fnstenvw','fnstsw','fpatan','fprem','fptan','frndint','frstor','frstorw','fsave',
+            'fsavew','fscale','fsqrt','fst','fstcw','fstenv','fstenvw','fstp','fstsw','fsub','fsubp',
+            'fsubr','fsubrp','ftst','fwait','fxam','fxch','fxtract','fyl2x','fyl2xp1',
+            'fsetpm','fcos','fldenvd','fnsaved','fnstenvd','fprem1','frstord','fsaved','fsin','fsincos',
+            'fstenvd','fucom','fucomp','fucompp'
+            ),
+        /*registers*/
+        3 => array(
+            'ah','al','ax','bh','bl','bp','bx','ch','cl','cr0','cr2','cr3','cs','cx','dh','di','dl',
+            'dr0','dr1','dr2','dr3','dr6','dr7','ds','dx','eax','ebp','ebx','ecx','edi','edx',
+            'es','esi','esp','fs','gs','si','sp','ss','st','tr3','tr4','tr5','tr6','tr7'
+            ),
+        /*Directive*/
+        4 => array(
+            '186','286','286c','286p','287','386','386c','386p','387','486','486p',
+            '8086','8087','alpha','break','code','const','continue','cref','data','data?',
+            'dosseg','else','elseif','endif','endw','err','err1','err2','errb',
+            'errdef','errdif','errdifi','erre','erridn','erridni','errnb','errndef',
+            'errnz','exit','fardata','fardata?','if','lall','lfcond','list','listall',
+            'listif','listmacro','listmacroall',' model','no87','nocref','nolist',
+            'nolistif','nolistmacro','radix','repeat','sall','seq','sfcond','stack',
+            'startup','tfcond','type','until','untilcxz','while','xall','xcref',
+            'xlist','alias','align','assume','catstr','comm','comment','db','dd','df','dq',
+            'dt','dup','dw','echo','elseif1','elseif2','elseifb','elseifdef','elseifdif',
+            'elseifdifi','elseife','elseifidn','elseifidni','elseifnb','elseifndef','end',
+            'endm','endp','ends','eq',' equ','even','exitm','extern','externdef','extrn','for',
+            'forc','ge','goto','group','high','highword','if1','if2','ifb','ifdef','ifdif',
+            'ifdifi','ife',' ifidn','ifidni','ifnb','ifndef','include','includelib','instr','invoke',
+            'irp','irpc','label','le','length','lengthof','local','low','lowword','lroffset',
+            'macro','mask','mod','msfloat','name','ne','offset','opattr','option','org','%out',
+            'page','popcontext','private','proc','proto','ptr','public','purge','pushcontext','record',
+            'rept','seg','segment','short','size','sizeof','sizestr','struc','struct',
+            'substr','subtitle','subttl','textequ','this','title','typedef','union','width',
+            '.model', '.stack', '.code', '.data'
+            ),
+        /*Operands*/
+        5 => array(
+            '@b','@f','addr','basic','byte','c','carry?','dword',
+            'far','far16','fortran','fword','near','near16','overflow?','parity?','pascal','qword',
+            'real4',' real8','real10','sbyte','sdword','sign?','stdcall','sword','syscall','tbyte',
+            'vararg','word','zero?','flat','near32','far32',
+            'abs','all','assumes','at','casemap','common','compact',
+            'cpu','dotname','emulator','epilogue','error','export','expr16','expr32','farstack',
+            'forceframe','huge','language','large','listing','ljmp','loadds','m510','medium','memory',
+            'nearstack','nodotname','noemulator','nokeyword','noljmp','nom510','none','nonunique',
+            'nooldmacros','nooldstructs','noreadonly','noscoped','nosignextend','nothing',
+            'notpublic','oldmacros','oldstructs','os_dos','para','prologue',
+            'readonly','req','scoped','setif2','smallstack','tiny','use16','use32','uses'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        '+', '-', '*', '/', '%',
+        '.', ',', ';', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #00007f;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+//            0 => 'color: #0000ff;',
+//            1 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+//        0 => /*  */ "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))(?:[0-9][0-9a-fA-F]{0,31}[hH]|0x[0-9a-fA-F]{1,32})(?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))",
+        //Binary numbers
+//        1 => "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))[01]{1,64}[bB](?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asp.php
new file mode 100644
index 000000000..7bfec11e1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/asp.php
@@ -0,0 +1,164 @@
+<?php
+/*************************************************************************************
+ * asp.php
+ * --------
+ * Author: Amit Gupta (http://blog.igeek.info/)
+ * Copyright: (c) 2004 Amit Gupta (http://blog.igeek.info/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/13
+ *
+ * ASP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/30 (1.0.3)
+ *   -  Strings only delimited by ", comments by '
+ * 2004/11/27 (1.0.2)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/13 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Include all the functions, keywords etc that I have missed
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ASP',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'file', 'Const', 'Dim', 'Option', 'Explicit', 'Implicit', 'Set', 'Select', 'ReDim', 'Preserve',
+            'ByVal', 'ByRef', 'End', 'Private', 'Public', 'If', 'Then', 'Else', 'ElseIf', 'Case', 'With', 'NOT',
+            'While', 'Wend', 'For', 'Loop', 'Do', 'Request', 'Response', 'Server', 'ADODB', 'Session', 'Application',
+            'Each', 'In', 'Get', 'Next', 'INT', 'CINT', 'CBOOL', 'CDATE', 'CBYTE', 'CCUR', 'CDBL', 'CLNG', 'CSNG',
+            'CSTR', 'Fix', 'Is', 'Sgn', 'String', 'Boolean', 'Currency', 'Me', 'Single', 'Long', 'Integer', 'Byte',
+            'Variant', 'Double', 'To', 'Let', 'Xor', 'Resume', 'On', 'Error', 'Imp', 'GoTo', 'Call', 'Global'
+            ),
+        2 => array(
+            'Null', 'Nothing', 'And',
+            'False',
+            'True', 'var', 'Or', 'BOF', 'EOF', 'xor',
+            'Function', 'Class', 'New', 'Sub'
+            ),
+        3 => array(
+            'CreateObject', 'Write', 'Redirect', 'Cookies', 'BinaryRead', 'ClientCertificate', 'Form', 'QueryString',
+            'ServerVariables', 'TotalBytes', 'AddHeader', 'AppendToLog', 'BinaryWrite', 'Buffer', 'CacheControl',
+            'Charset', 'Clear', 'ContentType', 'End()', 'Expires', 'ExpiresAbsolute', 'Flush()', 'IsClientConnected',
+            'PICS', 'Status', 'Connection', 'Recordset', 'Execute', 'Abandon', 'Lock', 'UnLock', 'Command', 'Fields',
+            'Properties', 'Property', 'Send', 'Replace', 'InStr', 'TRIM', 'NOW', 'Day', 'Month', 'Hour', 'Minute', 'Second',
+            'Year', 'MonthName', 'LCase', 'UCase', 'Abs', 'Array', 'As', 'LEN', 'MoveFirst', 'MoveLast', 'MovePrevious',
+            'MoveNext', 'LBound', 'UBound', 'Transfer', 'Open', 'Close', 'MapPath', 'FileExists', 'OpenTextFile', 'ReadAll'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+            ';', ':', '?', '='),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990099; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #330066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #ff6600;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #9900cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600; font-weight: bold;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            ),
+        1 => array(
+            '<script language="vbscript" runat="server">' => '</script>'
+            ),
+        2 => array(
+            '<script language="javascript" runat="server">' => '</script>'
+            ),
+        3 => "/(?<start><%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(?<end>%>|\Z)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/autoit.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/autoit.php
new file mode 100644
index 000000000..526fe5d99
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/autoit.php
@@ -0,0 +1,1171 @@
+<?php
+/*************************************************************************************
+ * autoit.php
+ * --------
+ * Author: big_daddy (robert.i.anthony@gmail.com)
+ * Copyright: (c) 2006 and to GESHi ;)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/01/26
+ *
+ * AutoIT language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * Release 1.0.8.1 (2008/09/15)
+ * - Updated on 22.03.2008 By Tlem (tlem@tuxolem.fr)
+ * - The link on functions will now correctly re-direct to
+ * - http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm
+ * - Updated whith au3.api (09.02.2008).
+ * - Updated - 16 Mai 2008 - v3.2.12.0
+ * - Updated - 12 June 2008 - v3.2.12.1
+ * Release 1.0.7.20 (2006/01/26)
+ * - First Release
+ *
+ * Current bugs & todo:
+ * ----------
+ * - not sure how to get sendkeys to work " {!}, {SPACE} etc... "
+ * - just copyied the regexp for variable from php so this HAVE to be checked and fixed to a better one ;)
+ *
+ * Reference: http://www.autoitscript.com/autoit3/docs/
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License,
+or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not,
+write to the Free Software
+ *   Foundation,
+Inc.,
+59 Temple Place,
+Suite 330,
+Boston,
+MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AutoIt',
+    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_MULTI' => array(
+        '#comments-start' => '#comments-end',
+        '#cs' => '#ce'),
+    'COMMENT_REGEXP' => array(0 => '/(?<!#)#(\s.*)?$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'And','ByRef','Case','Const','ContinueCase','ContinueLoop',
+            'Default','Dim','Do','Else','ElseIf','EndFunc','EndIf','EndSelect',
+            'EndSwitch','EndWith','Enum','Exit','ExitLoop','False','For','Func',
+            'Global','If','In','Local','Next','Not','Or','ReDim','Return',
+            'Select','Step','Switch','Then','To','True','Until','WEnd','While',
+            'With'
+            ),
+        2 => array(
+            '@AppDataCommonDir','@AppDataDir','@AutoItExe','@AutoItPID',
+            '@AutoItUnicode','@AutoItVersion','@AutoItX64','@COM_EventObj',
+            '@CommonFilesDir','@Compiled','@ComputerName','@ComSpec','@CR',
+            '@CRLF','@DesktopCommonDir','@DesktopDepth','@DesktopDir',
+            '@DesktopHeight','@DesktopRefresh','@DesktopWidth',
+            '@DocumentsCommonDir','@error','@exitCode','@exitMethod',
+            '@extended','@FavoritesCommonDir','@FavoritesDir','@GUI_CtrlHandle',
+            '@GUI_CtrlId','@GUI_DragFile','@GUI_DragId','@GUI_DropId',
+            '@GUI_WinHandle','@HomeDrive','@HomePath','@HomeShare',
+            '@HotKeyPressed','@HOUR','@InetGetActive','@InetGetBytesRead',
+            '@IPAddress1','@IPAddress2','@IPAddress3','@IPAddress4','@KBLayout',
+            '@LF','@LogonDNSDomain','@LogonDomain','@LogonServer','@MDAY',
+            '@MIN','@MON','@MyDocumentsDir','@NumParams','@OSBuild','@OSLang',
+            '@OSServicePack','@OSTYPE','@OSVersion','@ProcessorArch',
+            '@ProgramFilesDir','@ProgramsCommonDir','@ProgramsDir','@ScriptDir',
+            '@ScriptFullPath','@ScriptLineNumber','@ScriptName','@SEC',
+            '@StartMenuCommonDir','@StartMenuDir','@StartupCommonDir',
+            '@StartupDir','@SW_DISABLE','@SW_ENABLE','@SW_HIDE','@SW_LOCK',
+            '@SW_MAXIMIZE','@SW_MINIMIZE','@SW_RESTORE','@SW_SHOW',
+            '@SW_SHOWDEFAULT','@SW_SHOWMAXIMIZED','@SW_SHOWMINIMIZED',
+            '@SW_SHOWMINNOACTIVE','@SW_SHOWNA','@SW_SHOWNOACTIVATE',
+            '@SW_SHOWNORMAL','@SW_UNLOCK','@SystemDir','@TAB','@TempDir',
+            '@TRAY_ID','@TrayIconFlashing','@TrayIconVisible','@UserName',
+            '@UserProfileDir','@WDAY','@WindowsDir','@WorkingDir','@YDAY',
+            '@YEAR'
+            ),
+        3 => array(
+            'Abs','ACos','AdlibDisable','AdlibEnable','Asc','AscW','ASin',
+            'Assign','ATan','AutoItSetOption','AutoItWinGetTitle',
+            'AutoItWinSetTitle','Beep','Binary','BinaryLen','BinaryMid',
+            'BinaryToString','BitAND','BitNOT','BitOR','BitRotate','BitShift',
+            'BitXOR','BlockInput','Break','Call','CDTray','Ceiling','Chr',
+            'ChrW','ClipGet','ClipPut','ConsoleRead','ConsoleWrite',
+            'ConsoleWriteError','ControlClick','ControlCommand',
+            'ControlDisable','ControlEnable','ControlFocus','ControlGetFocus',
+            'ControlGetHandle','ControlGetPos','ControlGetText','ControlHide',
+            'ControlListView','ControlMove','ControlSend','ControlSetText',
+            'ControlShow','ControlTreeView','Cos','Dec','DirCopy','DirCreate',
+            'DirGetSize','DirMove','DirRemove','DllCall','DllCallbackFree',
+            'DllCallbackGetPtr','DllCallbackRegister','DllClose','DllOpen',
+            'DllStructCreate','DllStructGetData','DllStructGetPtr',
+            'DllStructGetSize','DllStructSetData','DriveGetDrive',
+            'DriveGetFileSystem','DriveGetLabel','DriveGetSerial',
+            'DriveGetType','DriveMapAdd','DriveMapDel','DriveMapGet',
+            'DriveSetLabel','DriveSpaceFree','DriveSpaceTotal','DriveStatus',
+            'EnvGet','EnvSet','EnvUpdate','Eval','Execute','Exp',
+            'FileChangeDir','FileClose','FileCopy','FileCreateNTFSLink',
+            'FileCreateShortcut','FileDelete','FileExists','FileFindFirstFile',
+            'FileFindNextFile','FileGetAttrib','FileGetLongName',
+            'FileGetShortcut','FileGetShortName','FileGetSize','FileGetTime',
+            'FileGetVersion','FileInstall','FileMove','FileOpen',
+            'FileOpenDialog','FileRead','FileReadLine','FileRecycle',
+            'FileRecycleEmpty','FileSaveDialog','FileSelectFolder',
+            'FileSetAttrib','FileSetTime','FileWrite','FileWriteLine','Floor',
+            'FtpSetProxy','GUICreate','GUICtrlCreateAvi','GUICtrlCreateButton',
+            'GUICtrlCreateCheckbox','GUICtrlCreateCombo',
+            'GUICtrlCreateContextMenu','GUICtrlCreateDate','GUICtrlCreateDummy',
+            'GUICtrlCreateEdit','GUICtrlCreateGraphic','GUICtrlCreateGroup',
+            'GUICtrlCreateIcon','GUICtrlCreateInput','GUICtrlCreateLabel',
+            'GUICtrlCreateList','GUICtrlCreateListView',
+            'GUICtrlCreateListViewItem','GUICtrlCreateMenu',
+            'GUICtrlCreateMenuItem','GUICtrlCreateMonthCal','GUICtrlCreateObj',
+            'GUICtrlCreatePic','GUICtrlCreateProgress','GUICtrlCreateRadio',
+            'GUICtrlCreateSlider','GUICtrlCreateTab','GUICtrlCreateTabItem',
+            'GUICtrlCreateTreeView','GUICtrlCreateTreeViewItem',
+            'GUICtrlCreateUpdown','GUICtrlDelete','GUICtrlGetHandle',
+            'GUICtrlGetState','GUICtrlRead','GUICtrlRecvMsg',
+            'GUICtrlRegisterListViewSort','GUICtrlSendMsg','GUICtrlSendToDummy',
+            'GUICtrlSetBkColor','GUICtrlSetColor','GUICtrlSetCursor',
+            'GUICtrlSetData','GUICtrlSetFont','GUICtrlSetDefColor',
+            'GUICtrlSetDefBkColor','GUICtrlSetGraphic','GUICtrlSetImage',
+            'GUICtrlSetLimit','GUICtrlSetOnEvent','GUICtrlSetPos',
+            'GUICtrlSetResizing','GUICtrlSetState','GUICtrlSetStyle',
+            'GUICtrlSetTip','GUIDelete','GUIGetCursorInfo','GUIGetMsg',
+            'GUIGetStyle','GUIRegisterMsg','GUISetAccelerators()',
+            'GUISetBkColor','GUISetCoord','GUISetCursor','GUISetFont',
+            'GUISetHelp','GUISetIcon','GUISetOnEvent','GUISetState',
+            'GUISetStyle','GUIStartGroup','GUISwitch','Hex','HotKeySet',
+            'HttpSetProxy','HWnd','InetGet','InetGetSize','IniDelete','IniRead',
+            'IniReadSection','IniReadSectionNames','IniRenameSection',
+            'IniWrite','IniWriteSection','InputBox','Int','IsAdmin','IsArray',
+            'IsBinary','IsBool','IsDeclared','IsDllStruct','IsFloat','IsHWnd',
+            'IsInt','IsKeyword','IsNumber','IsObj','IsPtr','IsString','Log',
+            'MemGetStats','Mod','MouseClick','MouseClickDrag','MouseDown',
+            'MouseGetCursor','MouseGetPos','MouseMove','MouseUp','MouseWheel',
+            'MsgBox','Number','ObjCreate','ObjEvent','ObjGet','ObjName','Opt',
+            'Ping','PixelChecksum','PixelGetColor','PixelSearch','PluginClose',
+            'PluginOpen','ProcessClose','ProcessExists','ProcessGetStats',
+            'ProcessList','ProcessSetPriority','ProcessWait','ProcessWaitClose',
+            'ProgressOff','ProgressOn','ProgressSet','Ptr','Random','RegDelete',
+            'RegEnumKey','RegEnumVal','RegRead','RegWrite','Round','Run',
+            'RunAs','RunAsWait','RunWait','Send','SendKeepActive','SetError',
+            'SetExtended','ShellExecute','ShellExecuteWait','Shutdown','Sin',
+            'Sleep','SoundPlay','SoundSetWaveVolume','SplashImageOn',
+            'SplashOff','SplashTextOn','Sqrt','SRandom','StatusbarGetText',
+            'StderrRead','StdinWrite','StdioClose','StdoutRead','String',
+            'StringAddCR','StringCompare','StringFormat','StringInStr',
+            'StringIsAlNum','StringIsAlpha','StringIsASCII','StringIsDigit',
+            'StringIsFloat','StringIsInt','StringIsLower','StringIsSpace',
+            'StringIsUpper','StringIsXDigit','StringLeft','StringLen',
+            'StringLower','StringMid','StringRegExp','StringRegExpReplace',
+            'StringReplace','StringRight','StringSplit','StringStripCR',
+            'StringStripWS','StringToBinary','StringTrimLeft','StringTrimRight',
+            'StringUpper','Tan','TCPAccept','TCPCloseSocket','TCPConnect',
+            'TCPListen','TCPNameToIP','TCPRecv','TCPSend','TCPShutdown',
+            'TCPStartup','TimerDiff','TimerInit','ToolTip','TrayCreateItem',
+            'TrayCreateMenu','TrayGetMsg','TrayItemDelete','TrayItemGetHandle',
+            'TrayItemGetState','TrayItemGetText','TrayItemSetOnEvent',
+            'TrayItemSetState','TrayItemSetText','TraySetClick','TraySetIcon',
+            'TraySetOnEvent','TraySetPauseIcon','TraySetState','TraySetToolTip',
+            'TrayTip','UBound','UDPBind','UDPCloseSocket','UDPOpen','UDPRecv',
+            'UDPSend','UDPShutdown','UDPStartup','VarGetType','WinActivate',
+            'WinActive','WinClose','WinExists','WinFlash','WinGetCaretPos',
+            'WinGetClassList','WinGetClientSize','WinGetHandle','WinGetPos',
+            'WinGetProcess','WinGetState','WinGetText','WinGetTitle','WinKill',
+            'WinList','WinMenuSelectItem','WinMinimizeAll','WinMinimizeAllUndo',
+            'WinMove','WinSetOnTop','WinSetState','WinSetTitle','WinSetTrans',
+            'WinWait','WinWaitActive','WinWaitClose','WinWaitNotActive'
+            ),
+        4 => array(
+            'ArrayAdd','ArrayBinarySearch','ArrayConcatenate','ArrayDelete',
+            'ArrayDisplay','ArrayFindAll','ArrayInsert','ArrayMax',
+            'ArrayMaxIndex','ArrayMin','ArrayMinIndex','ArrayPop','ArrayPush',
+            'ArrayReverse','ArraySearch','ArraySort','ArraySwap','ArrayToClip',
+            'ArrayToString','ArrayTrim','ChooseColor','ChooseFont',
+            'ClipBoard_ChangeChain','ClipBoard_Close','ClipBoard_CountFormats',
+            'ClipBoard_Empty','ClipBoard_EnumFormats','ClipBoard_FormatStr',
+            'ClipBoard_GetData','ClipBoard_GetDataEx','ClipBoard_GetFormatName',
+            'ClipBoard_GetOpenWindow','ClipBoard_GetOwner',
+            'ClipBoard_GetPriorityFormat','ClipBoard_GetSequenceNumber',
+            'ClipBoard_GetViewer','ClipBoard_IsFormatAvailable',
+            'ClipBoard_Open','ClipBoard_RegisterFormat','ClipBoard_SetData',
+            'ClipBoard_SetDataEx','ClipBoard_SetViewer','ClipPutFile',
+            'ColorConvertHSLtoRGB','ColorConvertRGBtoHSL','ColorGetBlue',
+            'ColorGetGreen','ColorGetRed','Date_Time_CompareFileTime',
+            'Date_Time_DOSDateTimeToArray','Date_Time_DOSDateTimeToFileTime',
+            'Date_Time_DOSDateTimeToStr','Date_Time_DOSDateToArray',
+            'Date_Time_DOSDateToStr','Date_Time_DOSTimeToArray',
+            'Date_Time_DOSTimeToStr','Date_Time_EncodeFileTime',
+            'Date_Time_EncodeSystemTime','Date_Time_FileTimeToArray',
+            'Date_Time_FileTimeToDOSDateTime',
+            'Date_Time_FileTimeToLocalFileTime','Date_Time_FileTimeToStr',
+            'Date_Time_FileTimeToSystemTime','Date_Time_GetFileTime',
+            'Date_Time_GetLocalTime','Date_Time_GetSystemTime',
+            'Date_Time_GetSystemTimeAdjustment',
+            'Date_Time_GetSystemTimeAsFileTime',
+            'Date_Time_GetSystemTimes','Date_Time_GetTickCount',
+            'Date_Time_GetTimeZoneInformation',
+            'Date_Time_LocalFileTimeToFileTime','Date_Time_SetFileTime',
+            'Date_Time_SetLocalTime','Date_Time_SetSystemTime',
+            'Date_Time_SetSystemTimeAdjustment',
+            'Date_Time_SetTimeZoneInformation','Date_Time_SystemTimeToArray',
+            'Date_Time_SystemTimeToDateStr','Date_Time_SystemTimeToDateTimeStr',
+            'Date_Time_SystemTimeToFileTime','Date_Time_SystemTimeToTimeStr',
+            'Date_Time_SystemTimeToTzSpecificLocalTime',
+            'Date_Time_TzSpecificLocalTimeToSystemTime','DateAdd',
+            'DateDayOfWeek','DateDaysInMonth','DateDiff','DateIsLeapYear',
+            'DateIsValid','DateTimeFormat','DateTimeSplit','DateToDayOfWeek',
+            'DateToDayOfWeekISO','DateToDayValue','DateToMonth',
+            'DayValueToDate','DebugBugReportEnv','DebugOut','DebugSetup',
+            'Degree','EventLog__Backup','EventLog__Clear','EventLog__Close',
+            'EventLog__Count','EventLog__DeregisterSource','EventLog__Full',
+            'EventLog__Notify','EventLog__Oldest','EventLog__Open',
+            'EventLog__OpenBackup','EventLog__Read','EventLog__RegisterSource',
+            'EventLog__Report','FileCountLines','FileCreate','FileListToArray',
+            'FilePrint','FileReadToArray','FileWriteFromArray',
+            'FileWriteLog','FileWriteToLine','GDIPlus_ArrowCapCreate',
+            'GDIPlus_ArrowCapDispose','GDIPlus_ArrowCapGetFillState',
+            'GDIPlus_ArrowCapGetHeight','GDIPlus_ArrowCapGetMiddleInset',
+            'GDIPlus_ArrowCapGetWidth','GDIPlus_ArrowCapSetFillState',
+            'GDIPlus_ArrowCapSetHeight','GDIPlus_ArrowCapSetMiddleInset',
+            'GDIPlus_ArrowCapSetWidth','GDIPlus_BitmapCloneArea',
+            'GDIPlus_BitmapCreateFromFile','GDIPlus_BitmapCreateFromGraphics',
+            'GDIPlus_BitmapCreateFromHBITMAP',
+            'GDIPlus_BitmapCreateHBITMAPFromBitmap','GDIPlus_BitmapDispose',
+            'GDIPlus_BitmapLockBits','GDIPlus_BitmapUnlockBits',
+            'GDIPlus_BrushClone','GDIPlus_BrushCreateSolid',
+            'GDIPlus_BrushDispose','GDIPlus_BrushGetType',
+            'GDIPlus_CustomLineCapDispose','GDIPlus_Decoders',
+            'GDIPlus_DecodersGetCount','GDIPlus_DecodersGetSize',
+            'GDIPlus_Encoders','GDIPlus_EncodersGetCLSID',
+            'GDIPlus_EncodersGetCount','GDIPlus_EncodersGetParamList',
+            'GDIPlus_EncodersGetParamListSize','GDIPlus_EncodersGetSize',
+            'GDIPlus_FontCreate','GDIPlus_FontDispose',
+            'GDIPlus_FontFamilyCreate','GDIPlus_FontFamilyDispose',
+            'GDIPlus_GraphicsClear','GDIPlus_GraphicsCreateFromHDC',
+            'GDIPlus_GraphicsCreateFromHWND','GDIPlus_GraphicsDispose',
+            'GDIPlus_GraphicsDrawArc','GDIPlus_GraphicsDrawBezier',
+            'GDIPlus_GraphicsDrawClosedCurve','GDIPlus_GraphicsDrawCurve',
+            'GDIPlus_GraphicsDrawEllipse','GDIPlus_GraphicsDrawImage',
+            'GDIPlus_GraphicsDrawImageRect','GDIPlus_GraphicsDrawImageRectRect',
+            'GDIPlus_GraphicsDrawLine','GDIPlus_GraphicsDrawPie',
+            'GDIPlus_GraphicsDrawPolygon','GDIPlus_GraphicsDrawRect',
+            'GDIPlus_GraphicsDrawString','GDIPlus_GraphicsDrawStringEx',
+            'GDIPlus_GraphicsFillClosedCurve','GDIPlus_GraphicsFillEllipse',
+            'GDIPlus_GraphicsFillPie','GDIPlus_GraphicsFillRect',
+            'GDIPlus_GraphicsGetDC','GDIPlus_GraphicsGetSmoothingMode',
+            'GDIPlus_GraphicsMeasureString','GDIPlus_GraphicsReleaseDC',
+            'GDIPlus_GraphicsSetSmoothingMode','GDIPlus_GraphicsSetTransform',
+            'GDIPlus_ImageDispose','GDIPlus_ImageGetGraphicsContext',
+            'GDIPlus_ImageGetHeight','GDIPlus_ImageGetWidth',
+            'GDIPlus_ImageLoadFromFile','GDIPlus_ImageSaveToFile',
+            'GDIPlus_ImageSaveToFileEx','GDIPlus_MatrixCreate',
+            'GDIPlus_MatrixDispose','GDIPlus_MatrixRotate','GDIPlus_ParamAdd',
+            'GDIPlus_ParamInit','GDIPlus_PenCreate','GDIPlus_PenDispose',
+            'GDIPlus_PenGetAlignment','GDIPlus_PenGetColor',
+            'GDIPlus_PenGetCustomEndCap','GDIPlus_PenGetDashCap',
+            'GDIPlus_PenGetDashStyle','GDIPlus_PenGetEndCap',
+            'GDIPlus_PenGetWidth','GDIPlus_PenSetAlignment',
+            'GDIPlus_PenSetColor','GDIPlus_PenSetCustomEndCap',
+            'GDIPlus_PenSetDashCap','GDIPlus_PenSetDashStyle',
+            'GDIPlus_PenSetEndCap','GDIPlus_PenSetWidth','GDIPlus_RectFCreate',
+            'GDIPlus_Shutdown','GDIPlus_Startup','GDIPlus_StringFormatCreate',
+            'GDIPlus_StringFormatDispose','GetIP','GUICtrlAVI_Close',
+            'GUICtrlAVI_Create','GUICtrlAVI_Destroy','GUICtrlAVI_Open',
+            'GUICtrlAVI_OpenEx','GUICtrlAVI_Play','GUICtrlAVI_Seek',
+            'GUICtrlAVI_Show','GUICtrlAVI_Stop','GUICtrlButton_Click',
+            'GUICtrlButton_Create','GUICtrlButton_Destroy',
+            'GUICtrlButton_Enable','GUICtrlButton_GetCheck',
+            'GUICtrlButton_GetFocus','GUICtrlButton_GetIdealSize',
+            'GUICtrlButton_GetImage','GUICtrlButton_GetImageList',
+            'GUICtrlButton_GetState','GUICtrlButton_GetText',
+            'GUICtrlButton_GetTextMargin','GUICtrlButton_SetCheck',
+            'GUICtrlButton_SetFocus','GUICtrlButton_SetImage',
+            'GUICtrlButton_SetImageList','GUICtrlButton_SetSize',
+            'GUICtrlButton_SetState','GUICtrlButton_SetStyle',
+            'GUICtrlButton_SetText','GUICtrlButton_SetTextMargin',
+            'GUICtrlButton_Show','GUICtrlComboBox_AddDir',
+            'GUICtrlComboBox_AddString','GUICtrlComboBox_AutoComplete',
+            'GUICtrlComboBox_BeginUpdate','GUICtrlComboBox_Create',
+            'GUICtrlComboBox_DeleteString','GUICtrlComboBox_Destroy',
+            'GUICtrlComboBox_EndUpdate','GUICtrlComboBox_FindString',
+            'GUICtrlComboBox_FindStringExact','GUICtrlComboBox_GetComboBoxInfo',
+            'GUICtrlComboBox_GetCount','GUICtrlComboBox_GetCurSel',
+            'GUICtrlComboBox_GetDroppedControlRect',
+            'GUICtrlComboBox_GetDroppedControlRectEx',
+            'GUICtrlComboBox_GetDroppedState','GUICtrlComboBox_GetDroppedWidth',
+            'GUICtrlComboBox_GetEditSel','GUICtrlComboBox_GetEditText',
+            'GUICtrlComboBox_GetExtendedUI',
+            'GUICtrlComboBox_GetHorizontalExtent',
+            'GUICtrlComboBox_GetItemHeight','GUICtrlComboBox_GetLBText',
+            'GUICtrlComboBox_GetLBTextLen','GUICtrlComboBox_GetList',
+            'GUICtrlComboBox_GetListArray','GUICtrlComboBox_GetLocale',
+            'GUICtrlComboBox_GetLocaleCountry','GUICtrlComboBox_GetLocaleLang',
+            'GUICtrlComboBox_GetLocalePrimLang',
+            'GUICtrlComboBox_GetLocaleSubLang','GUICtrlComboBox_GetMinVisible',
+            'GUICtrlComboBox_GetTopIndex','GUICtrlComboBox_InitStorage',
+            'GUICtrlComboBox_InsertString','GUICtrlComboBox_LimitText',
+            'GUICtrlComboBox_ReplaceEditSel','GUICtrlComboBox_ResetContent',
+            'GUICtrlComboBox_SelectString','GUICtrlComboBox_SetCurSel',
+            'GUICtrlComboBox_SetDroppedWidth','GUICtrlComboBox_SetEditSel',
+            'GUICtrlComboBox_SetEditText','GUICtrlComboBox_SetExtendedUI',
+            'GUICtrlComboBox_SetHorizontalExtent',
+            'GUICtrlComboBox_SetItemHeight','GUICtrlComboBox_SetMinVisible',
+            'GUICtrlComboBox_SetTopIndex','GUICtrlComboBox_ShowDropDown',
+            'GUICtrlComboBoxEx_AddDir','GUICtrlComboBoxEx_AddString',
+            'GUICtrlComboBoxEx_BeginUpdate','GUICtrlComboBoxEx_Create',
+            'GUICtrlComboBoxEx_CreateSolidBitMap',
+            'GUICtrlComboBoxEx_DeleteString','GUICtrlComboBoxEx_Destroy',
+            'GUICtrlComboBoxEx_EndUpdate','GUICtrlComboBoxEx_FindStringExact',
+            'GUICtrlComboBoxEx_GetComboBoxInfo',
+            'GUICtrlComboBoxEx_GetComboControl','GUICtrlComboBoxEx_GetCount',
+            'GUICtrlComboBoxEx_GetCurSel',
+            'GUICtrlComboBoxEx_GetDroppedControlRect',
+            'GUICtrlComboBoxEx_GetDroppedControlRectEx',
+            'GUICtrlComboBoxEx_GetDroppedState',
+            'GUICtrlComboBoxEx_GetDroppedWidth',
+            'GUICtrlComboBoxEx_GetEditControl','GUICtrlComboBoxEx_GetEditSel',
+            'GUICtrlComboBoxEx_GetEditText',
+            'GUICtrlComboBoxEx_GetExtendedStyle',
+            'GUICtrlComboBoxEx_GetExtendedUI','GUICtrlComboBoxEx_GetImageList',
+            'GUICtrlComboBoxEx_GetItem','GUICtrlComboBoxEx_GetItemEx',
+            'GUICtrlComboBoxEx_GetItemHeight','GUICtrlComboBoxEx_GetItemImage',
+            'GUICtrlComboBoxEx_GetItemIndent',
+            'GUICtrlComboBoxEx_GetItemOverlayImage',
+            'GUICtrlComboBoxEx_GetItemParam',
+            'GUICtrlComboBoxEx_GetItemSelectedImage',
+            'GUICtrlComboBoxEx_GetItemText','GUICtrlComboBoxEx_GetItemTextLen',
+            'GUICtrlComboBoxEx_GetList','GUICtrlComboBoxEx_GetListArray',
+            'GUICtrlComboBoxEx_GetLocale','GUICtrlComboBoxEx_GetLocaleCountry',
+            'GUICtrlComboBoxEx_GetLocaleLang',
+            'GUICtrlComboBoxEx_GetLocalePrimLang',
+            'GUICtrlComboBoxEx_GetLocaleSubLang',
+            'GUICtrlComboBoxEx_GetMinVisible','GUICtrlComboBoxEx_GetTopIndex',
+            'GUICtrlComboBoxEx_InitStorage','GUICtrlComboBoxEx_InsertString',
+            'GUICtrlComboBoxEx_LimitText','GUICtrlComboBoxEx_ReplaceEditSel',
+            'GUICtrlComboBoxEx_ResetContent','GUICtrlComboBoxEx_SetCurSel',
+            'GUICtrlComboBoxEx_SetDroppedWidth','GUICtrlComboBoxEx_SetEditSel',
+            'GUICtrlComboBoxEx_SetEditText',
+            'GUICtrlComboBoxEx_SetExtendedStyle',
+            'GUICtrlComboBoxEx_SetExtendedUI','GUICtrlComboBoxEx_SetImageList',
+            'GUICtrlComboBoxEx_SetItem','GUICtrlComboBoxEx_SetItemEx',
+            'GUICtrlComboBoxEx_SetItemHeight','GUICtrlComboBoxEx_SetItemImage',
+            'GUICtrlComboBoxEx_SetItemIndent',
+            'GUICtrlComboBoxEx_SetItemOverlayImage',
+            'GUICtrlComboBoxEx_SetItemParam',
+            'GUICtrlComboBoxEx_SetItemSelectedImage',
+            'GUICtrlComboBoxEx_SetMinVisible','GUICtrlComboBoxEx_SetTopIndex',
+            'GUICtrlComboBoxEx_ShowDropDown','GUICtrlDTP_Create',
+            'GUICtrlDTP_Destroy','GUICtrlDTP_GetMCColor','GUICtrlDTP_GetMCFont',
+            'GUICtrlDTP_GetMonthCal','GUICtrlDTP_GetRange',
+            'GUICtrlDTP_GetRangeEx','GUICtrlDTP_GetSystemTime',
+            'GUICtrlDTP_GetSystemTimeEx','GUICtrlDTP_SetFormat',
+            'GUICtrlDTP_SetMCColor','GUICtrlDTP_SetMCFont',
+            'GUICtrlDTP_SetRange','GUICtrlDTP_SetRangeEx',
+            'GUICtrlDTP_SetSystemTime','GUICtrlDTP_SetSystemTimeEx',
+            'GUICtrlEdit_AppendText','GUICtrlEdit_BeginUpdate',
+            'GUICtrlEdit_CanUndo','GUICtrlEdit_CharFromPos',
+            'GUICtrlEdit_Create','GUICtrlEdit_Destroy',
+            'GUICtrlEdit_EmptyUndoBuffer','GUICtrlEdit_EndUpdate',
+            'GUICtrlEdit_Find','GUICtrlEdit_FmtLines',
+            'GUICtrlEdit_GetFirstVisibleLine','GUICtrlEdit_GetLimitText',
+            'GUICtrlEdit_GetLine','GUICtrlEdit_GetLineCount',
+            'GUICtrlEdit_GetMargins','GUICtrlEdit_GetModify',
+            'GUICtrlEdit_GetPasswordChar','GUICtrlEdit_GetRECT',
+            'GUICtrlEdit_GetRECTEx','GUICtrlEdit_GetSel','GUICtrlEdit_GetText',
+            'GUICtrlEdit_GetTextLen','GUICtrlEdit_HideBalloonTip',
+            'GUICtrlEdit_InsertText','GUICtrlEdit_LineFromChar',
+            'GUICtrlEdit_LineIndex','GUICtrlEdit_LineLength',
+            'GUICtrlEdit_LineScroll','GUICtrlEdit_PosFromChar',
+            'GUICtrlEdit_ReplaceSel','GUICtrlEdit_Scroll',
+            'GUICtrlEdit_SetLimitText','GUICtrlEdit_SetMargins',
+            'GUICtrlEdit_SetModify','GUICtrlEdit_SetPasswordChar',
+            'GUICtrlEdit_SetReadOnly','GUICtrlEdit_SetRECT',
+            'GUICtrlEdit_SetRECTEx','GUICtrlEdit_SetRECTNP',
+            'GUICtrlEdit_SetRectNPEx','GUICtrlEdit_SetSel',
+            'GUICtrlEdit_SetTabStops','GUICtrlEdit_SetText',
+            'GUICtrlEdit_ShowBalloonTip','GUICtrlEdit_Undo',
+            'GUICtrlHeader_AddItem','GUICtrlHeader_ClearFilter',
+            'GUICtrlHeader_ClearFilterAll','GUICtrlHeader_Create',
+            'GUICtrlHeader_CreateDragImage','GUICtrlHeader_DeleteItem',
+            'GUICtrlHeader_Destroy','GUICtrlHeader_EditFilter',
+            'GUICtrlHeader_GetBitmapMargin','GUICtrlHeader_GetImageList',
+            'GUICtrlHeader_GetItem','GUICtrlHeader_GetItemAlign',
+            'GUICtrlHeader_GetItemBitmap','GUICtrlHeader_GetItemCount',
+            'GUICtrlHeader_GetItemDisplay','GUICtrlHeader_GetItemFlags',
+            'GUICtrlHeader_GetItemFormat','GUICtrlHeader_GetItemImage',
+            'GUICtrlHeader_GetItemOrder','GUICtrlHeader_GetItemParam',
+            'GUICtrlHeader_GetItemRect','GUICtrlHeader_GetItemRectEx',
+            'GUICtrlHeader_GetItemText','GUICtrlHeader_GetItemWidth',
+            'GUICtrlHeader_GetOrderArray','GUICtrlHeader_GetUnicodeFormat',
+            'GUICtrlHeader_HitTest','GUICtrlHeader_InsertItem',
+            'GUICtrlHeader_Layout','GUICtrlHeader_OrderToIndex',
+            'GUICtrlHeader_SetBitmapMargin',
+            'GUICtrlHeader_SetFilterChangeTimeout',
+            'GUICtrlHeader_SetHotDivider','GUICtrlHeader_SetImageList',
+            'GUICtrlHeader_SetItem','GUICtrlHeader_SetItemAlign',
+            'GUICtrlHeader_SetItemBitmap','GUICtrlHeader_SetItemDisplay',
+            'GUICtrlHeader_SetItemFlags','GUICtrlHeader_SetItemFormat',
+            'GUICtrlHeader_SetItemImage','GUICtrlHeader_SetItemOrder',
+            'GUICtrlHeader_SetItemParam','GUICtrlHeader_SetItemText',
+            'GUICtrlHeader_SetItemWidth','GUICtrlHeader_SetOrderArray',
+            'GUICtrlHeader_SetUnicodeFormat','GUICtrlIpAddress_ClearAddress',
+            'GUICtrlIpAddress_Create','GUICtrlIpAddress_Destroy',
+            'GUICtrlIpAddress_Get','GUICtrlIpAddress_GetArray',
+            'GUICtrlIpAddress_GetEx','GUICtrlIpAddress_IsBlank',
+            'GUICtrlIpAddress_Set','GUICtrlIpAddress_SetArray',
+            'GUICtrlIpAddress_SetEx','GUICtrlIpAddress_SetFocus',
+            'GUICtrlIpAddress_SetFont','GUICtrlIpAddress_SetRange',
+            'GUICtrlIpAddress_ShowHide','GUICtrlListBox_AddFile',
+            'GUICtrlListBox_AddString','GUICtrlListBox_BeginUpdate',
+            'GUICtrlListBox_Create','GUICtrlListBox_DeleteString',
+            'GUICtrlListBox_Destroy','GUICtrlListBox_Dir',
+            'GUICtrlListBox_EndUpdate','GUICtrlListBox_FindInText',
+            'GUICtrlListBox_FindString','GUICtrlListBox_GetAnchorIndex',
+            'GUICtrlListBox_GetCaretIndex','GUICtrlListBox_GetCount',
+            'GUICtrlListBox_GetCurSel','GUICtrlListBox_GetHorizontalExtent',
+            'GUICtrlListBox_GetItemData','GUICtrlListBox_GetItemHeight',
+            'GUICtrlListBox_GetItemRect','GUICtrlListBox_GetItemRectEx',
+            'GUICtrlListBox_GetListBoxInfo','GUICtrlListBox_GetLocale',
+            'GUICtrlListBox_GetLocaleCountry','GUICtrlListBox_GetLocaleLang',
+            'GUICtrlListBox_GetLocalePrimLang',
+            'GUICtrlListBox_GetLocaleSubLang','GUICtrlListBox_GetSel',
+            'GUICtrlListBox_GetSelCount','GUICtrlListBox_GetSelItems',
+            'GUICtrlListBox_GetSelItemsText','GUICtrlListBox_GetText',
+            'GUICtrlListBox_GetTextLen','GUICtrlListBox_GetTopIndex',
+            'GUICtrlListBox_InitStorage','GUICtrlListBox_InsertString',
+            'GUICtrlListBox_ItemFromPoint','GUICtrlListBox_ReplaceString',
+            'GUICtrlListBox_ResetContent','GUICtrlListBox_SelectString',
+            'GUICtrlListBox_SelItemRange','GUICtrlListBox_SelItemRangeEx',
+            'GUICtrlListBox_SetAnchorIndex','GUICtrlListBox_SetCaretIndex',
+            'GUICtrlListBox_SetColumnWidth','GUICtrlListBox_SetCurSel',
+            'GUICtrlListBox_SetHorizontalExtent','GUICtrlListBox_SetItemData',
+            'GUICtrlListBox_SetItemHeight','GUICtrlListBox_SetLocale',
+            'GUICtrlListBox_SetSel','GUICtrlListBox_SetTabStops',
+            'GUICtrlListBox_SetTopIndex','GUICtrlListBox_Sort',
+            'GUICtrlListBox_SwapString','GUICtrlListBox_UpdateHScroll',
+            'GUICtrlListView_AddArray','GUICtrlListView_AddColumn',
+            'GUICtrlListView_AddItem','GUICtrlListView_AddSubItem',
+            'GUICtrlListView_ApproximateViewHeight',
+            'GUICtrlListView_ApproximateViewRect',
+            'GUICtrlListView_ApproximateViewWidth','GUICtrlListView_Arrange',
+            'GUICtrlListView_BeginUpdate','GUICtrlListView_CancelEditLabel',
+            'GUICtrlListView_ClickItem','GUICtrlListView_CopyItems',
+            'GUICtrlListView_Create','GUICtrlListView_CreateDragImage',
+            'GUICtrlListView_CreateSolidBitMap',
+            'GUICtrlListView_DeleteAllItems','GUICtrlListView_DeleteColumn',
+            'GUICtrlListView_DeleteItem','GUICtrlListView_DeleteItemsSelected',
+            'GUICtrlListView_Destroy','GUICtrlListView_DrawDragImage',
+            'GUICtrlListView_EditLabel','GUICtrlListView_EnableGroupView',
+            'GUICtrlListView_EndUpdate','GUICtrlListView_EnsureVisible',
+            'GUICtrlListView_FindInText','GUICtrlListView_FindItem',
+            'GUICtrlListView_FindNearest','GUICtrlListView_FindParam',
+            'GUICtrlListView_FindText','GUICtrlListView_GetBkColor',
+            'GUICtrlListView_GetBkImage','GUICtrlListView_GetCallbackMask',
+            'GUICtrlListView_GetColumn','GUICtrlListView_GetColumnCount',
+            'GUICtrlListView_GetColumnOrder',
+            'GUICtrlListView_GetColumnOrderArray',
+            'GUICtrlListView_GetColumnWidth','GUICtrlListView_GetCounterPage',
+            'GUICtrlListView_GetEditControl',
+            'GUICtrlListView_GetExtendedListViewStyle',
+            'GUICtrlListView_GetGroupInfo',
+            'GUICtrlListView_GetGroupViewEnabled','GUICtrlListView_GetHeader',
+            'GUICtrlListView_GetHotCursor','GUICtrlListView_GetHotItem',
+            'GUICtrlListView_GetHoverTime','GUICtrlListView_GetImageList',
+            'GUICtrlListView_GetISearchString','GUICtrlListView_GetItem',
+            'GUICtrlListView_GetItemChecked','GUICtrlListView_GetItemCount',
+            'GUICtrlListView_GetItemCut','GUICtrlListView_GetItemDropHilited',
+            'GUICtrlListView_GetItemEx','GUICtrlListView_GetItemFocused',
+            'GUICtrlListView_GetItemGroupID','GUICtrlListView_GetItemImage',
+            'GUICtrlListView_GetItemIndent','GUICtrlListView_GetItemParam',
+            'GUICtrlListView_GetItemPosition',
+            'GUICtrlListView_GetItemPositionX',
+            'GUICtrlListView_GetItemPositionY','GUICtrlListView_GetItemRect',
+            'GUICtrlListView_GetItemRectEx','GUICtrlListView_GetItemSelected',
+            'GUICtrlListView_GetItemSpacing','GUICtrlListView_GetItemSpacingX',
+            'GUICtrlListView_GetItemSpacingY','GUICtrlListView_GetItemState',
+            'GUICtrlListView_GetItemStateImage','GUICtrlListView_GetItemText',
+            'GUICtrlListView_GetItemTextArray',
+            'GUICtrlListView_GetItemTextString','GUICtrlListView_GetNextItem',
+            'GUICtrlListView_GetNumberOfWorkAreas','GUICtrlListView_GetOrigin',
+            'GUICtrlListView_GetOriginX','GUICtrlListView_GetOriginY',
+            'GUICtrlListView_GetOutlineColor',
+            'GUICtrlListView_GetSelectedColumn',
+            'GUICtrlListView_GetSelectedCount',
+            'GUICtrlListView_GetSelectedIndices',
+            'GUICtrlListView_GetSelectionMark','GUICtrlListView_GetStringWidth',
+            'GUICtrlListView_GetSubItemRect','GUICtrlListView_GetTextBkColor',
+            'GUICtrlListView_GetTextColor','GUICtrlListView_GetToolTips',
+            'GUICtrlListView_GetTopIndex','GUICtrlListView_GetUnicodeFormat',
+            'GUICtrlListView_GetView','GUICtrlListView_GetViewDetails',
+            'GUICtrlListView_GetViewLarge','GUICtrlListView_GetViewList',
+            'GUICtrlListView_GetViewRect','GUICtrlListView_GetViewSmall',
+            'GUICtrlListView_GetViewTile','GUICtrlListView_HideColumn',
+            'GUICtrlListView_HitTest','GUICtrlListView_InsertColumn',
+            'GUICtrlListView_InsertGroup','GUICtrlListView_InsertItem',
+            'GUICtrlListView_JustifyColumn','GUICtrlListView_MapIDToIndex',
+            'GUICtrlListView_MapIndexToID','GUICtrlListView_RedrawItems',
+            'GUICtrlListView_RegisterSortCallBack',
+            'GUICtrlListView_RemoveAllGroups','GUICtrlListView_RemoveGroup',
+            'GUICtrlListView_Scroll','GUICtrlListView_SetBkColor',
+            'GUICtrlListView_SetBkImage','GUICtrlListView_SetCallBackMask',
+            'GUICtrlListView_SetColumn','GUICtrlListView_SetColumnOrder',
+            'GUICtrlListView_SetColumnOrderArray',
+            'GUICtrlListView_SetColumnWidth',
+            'GUICtrlListView_SetExtendedListViewStyle',
+            'GUICtrlListView_SetGroupInfo','GUICtrlListView_SetHotItem',
+            'GUICtrlListView_SetHoverTime','GUICtrlListView_SetIconSpacing',
+            'GUICtrlListView_SetImageList','GUICtrlListView_SetItem',
+            'GUICtrlListView_SetItemChecked','GUICtrlListView_SetItemCount',
+            'GUICtrlListView_SetItemCut','GUICtrlListView_SetItemDropHilited',
+            'GUICtrlListView_SetItemEx','GUICtrlListView_SetItemFocused',
+            'GUICtrlListView_SetItemGroupID','GUICtrlListView_SetItemImage',
+            'GUICtrlListView_SetItemIndent','GUICtrlListView_SetItemParam',
+            'GUICtrlListView_SetItemPosition',
+            'GUICtrlListView_SetItemPosition32',
+            'GUICtrlListView_SetItemSelected','GUICtrlListView_SetItemState',
+            'GUICtrlListView_SetItemStateImage','GUICtrlListView_SetItemText',
+            'GUICtrlListView_SetOutlineColor',
+            'GUICtrlListView_SetSelectedColumn',
+            'GUICtrlListView_SetSelectionMark','GUICtrlListView_SetTextBkColor',
+            'GUICtrlListView_SetTextColor','GUICtrlListView_SetToolTips',
+            'GUICtrlListView_SetUnicodeFormat','GUICtrlListView_SetView',
+            'GUICtrlListView_SetWorkAreas','GUICtrlListView_SimpleSort',
+            'GUICtrlListView_SortItems','GUICtrlListView_SubItemHitTest',
+            'GUICtrlListView_UnRegisterSortCallBack',
+            'GUICtrlMenu_AddMenuItem','GUICtrlMenu_AppendMenu',
+            'GUICtrlMenu_CheckMenuItem','GUICtrlMenu_CheckRadioItem',
+            'GUICtrlMenu_CreateMenu','GUICtrlMenu_CreatePopup',
+            'GUICtrlMenu_DeleteMenu','GUICtrlMenu_DestroyMenu',
+            'GUICtrlMenu_DrawMenuBar','GUICtrlMenu_EnableMenuItem',
+            'GUICtrlMenu_FindItem','GUICtrlMenu_FindParent',
+            'GUICtrlMenu_GetItemBmp','GUICtrlMenu_GetItemBmpChecked',
+            'GUICtrlMenu_GetItemBmpUnchecked','GUICtrlMenu_GetItemChecked',
+            'GUICtrlMenu_GetItemCount','GUICtrlMenu_GetItemData',
+            'GUICtrlMenu_GetItemDefault','GUICtrlMenu_GetItemDisabled',
+            'GUICtrlMenu_GetItemEnabled','GUICtrlMenu_GetItemGrayed',
+            'GUICtrlMenu_GetItemHighlighted','GUICtrlMenu_GetItemID',
+            'GUICtrlMenu_GetItemInfo','GUICtrlMenu_GetItemRect',
+            'GUICtrlMenu_GetItemRectEx','GUICtrlMenu_GetItemState',
+            'GUICtrlMenu_GetItemStateEx','GUICtrlMenu_GetItemSubMenu',
+            'GUICtrlMenu_GetItemText','GUICtrlMenu_GetItemType',
+            'GUICtrlMenu_GetMenu','GUICtrlMenu_GetMenuBackground',
+            'GUICtrlMenu_GetMenuBarInfo','GUICtrlMenu_GetMenuContextHelpID',
+            'GUICtrlMenu_GetMenuData','GUICtrlMenu_GetMenuDefaultItem',
+            'GUICtrlMenu_GetMenuHeight','GUICtrlMenu_GetMenuInfo',
+            'GUICtrlMenu_GetMenuStyle','GUICtrlMenu_GetSystemMenu',
+            'GUICtrlMenu_InsertMenuItem','GUICtrlMenu_InsertMenuItemEx',
+            'GUICtrlMenu_IsMenu','GUICtrlMenu_LoadMenu',
+            'GUICtrlMenu_MapAccelerator','GUICtrlMenu_MenuItemFromPoint',
+            'GUICtrlMenu_RemoveMenu','GUICtrlMenu_SetItemBitmaps',
+            'GUICtrlMenu_SetItemBmp','GUICtrlMenu_SetItemBmpChecked',
+            'GUICtrlMenu_SetItemBmpUnchecked','GUICtrlMenu_SetItemChecked',
+            'GUICtrlMenu_SetItemData','GUICtrlMenu_SetItemDefault',
+            'GUICtrlMenu_SetItemDisabled','GUICtrlMenu_SetItemEnabled',
+            'GUICtrlMenu_SetItemGrayed','GUICtrlMenu_SetItemHighlighted',
+            'GUICtrlMenu_SetItemID','GUICtrlMenu_SetItemInfo',
+            'GUICtrlMenu_SetItemState','GUICtrlMenu_SetItemSubMenu',
+            'GUICtrlMenu_SetItemText','GUICtrlMenu_SetItemType',
+            'GUICtrlMenu_SetMenu','GUICtrlMenu_SetMenuBackground',
+            'GUICtrlMenu_SetMenuContextHelpID','GUICtrlMenu_SetMenuData',
+            'GUICtrlMenu_SetMenuDefaultItem','GUICtrlMenu_SetMenuHeight',
+            'GUICtrlMenu_SetMenuInfo','GUICtrlMenu_SetMenuStyle',
+            'GUICtrlMenu_TrackPopupMenu','GUICtrlMonthCal_Create',
+            'GUICtrlMonthCal_Destroy','GUICtrlMonthCal_GetColor',
+            'GUICtrlMonthCal_GetColorArray','GUICtrlMonthCal_GetCurSel',
+            'GUICtrlMonthCal_GetCurSelStr','GUICtrlMonthCal_GetFirstDOW',
+            'GUICtrlMonthCal_GetFirstDOWStr','GUICtrlMonthCal_GetMaxSelCount',
+            'GUICtrlMonthCal_GetMaxTodayWidth',
+            'GUICtrlMonthCal_GetMinReqHeight','GUICtrlMonthCal_GetMinReqRect',
+            'GUICtrlMonthCal_GetMinReqRectArray',
+            'GUICtrlMonthCal_GetMinReqWidth','GUICtrlMonthCal_GetMonthDelta',
+            'GUICtrlMonthCal_GetMonthRange','GUICtrlMonthCal_GetMonthRangeMax',
+            'GUICtrlMonthCal_GetMonthRangeMaxStr',
+            'GUICtrlMonthCal_GetMonthRangeMin',
+            'GUICtrlMonthCal_GetMonthRangeMinStr',
+            'GUICtrlMonthCal_GetMonthRangeSpan','GUICtrlMonthCal_GetRange',
+            'GUICtrlMonthCal_GetRangeMax','GUICtrlMonthCal_GetRangeMaxStr',
+            'GUICtrlMonthCal_GetRangeMin','GUICtrlMonthCal_GetRangeMinStr',
+            'GUICtrlMonthCal_GetSelRange','GUICtrlMonthCal_GetSelRangeMax',
+            'GUICtrlMonthCal_GetSelRangeMaxStr',
+            'GUICtrlMonthCal_GetSelRangeMin',
+            'GUICtrlMonthCal_GetSelRangeMinStr','GUICtrlMonthCal_GetToday',
+            'GUICtrlMonthCal_GetTodayStr','GUICtrlMonthCal_GetUnicodeFormat',
+            'GUICtrlMonthCal_HitTest','GUICtrlMonthCal_SetColor',
+            'GUICtrlMonthCal_SetCurSel','GUICtrlMonthCal_SetDayState',
+            'GUICtrlMonthCal_SetFirstDOW','GUICtrlMonthCal_SetMaxSelCount',
+            'GUICtrlMonthCal_SetMonthDelta','GUICtrlMonthCal_SetRange',
+            'GUICtrlMonthCal_SetSelRange','GUICtrlMonthCal_SetToday',
+            'GUICtrlMonthCal_SetUnicodeFormat','GUICtrlRebar_AddBand',
+            'GUICtrlRebar_AddToolBarBand','GUICtrlRebar_BeginDrag',
+            'GUICtrlRebar_Create','GUICtrlRebar_DeleteBand',
+            'GUICtrlRebar_Destroy','GUICtrlRebar_DragMove',
+            'GUICtrlRebar_EndDrag','GUICtrlRebar_GetBandBackColor',
+            'GUICtrlRebar_GetBandBorders','GUICtrlRebar_GetBandBordersEx',
+            'GUICtrlRebar_GetBandChildHandle','GUICtrlRebar_GetBandChildSize',
+            'GUICtrlRebar_GetBandCount','GUICtrlRebar_GetBandForeColor',
+            'GUICtrlRebar_GetBandHeaderSize','GUICtrlRebar_GetBandID',
+            'GUICtrlRebar_GetBandIdealSize','GUICtrlRebar_GetBandLength',
+            'GUICtrlRebar_GetBandLParam','GUICtrlRebar_GetBandMargins',
+            'GUICtrlRebar_GetBandMarginsEx','GUICtrlRebar_GetBandRect',
+            'GUICtrlRebar_GetBandRectEx','GUICtrlRebar_GetBandStyle',
+            'GUICtrlRebar_GetBandStyleBreak',
+            'GUICtrlRebar_GetBandStyleChildEdge',
+            'GUICtrlRebar_GetBandStyleFixedBMP',
+            'GUICtrlRebar_GetBandStyleFixedSize',
+            'GUICtrlRebar_GetBandStyleGripperAlways',
+            'GUICtrlRebar_GetBandStyleHidden',
+            'GUICtrlRebar_GetBandStyleHideTitle',
+            'GUICtrlRebar_GetBandStyleNoGripper',
+            'GUICtrlRebar_GetBandStyleTopAlign',
+            'GUICtrlRebar_GetBandStyleUseChevron',
+            'GUICtrlRebar_GetBandStyleVariableHeight',
+            'GUICtrlRebar_GetBandText','GUICtrlRebar_GetBarHeight',
+            'GUICtrlRebar_GetBKColor','GUICtrlRebar_GetColorScheme',
+            'GUICtrlRebar_GetRowCount','GUICtrlRebar_GetRowHeight',
+            'GUICtrlRebar_GetTextColor','GUICtrlRebar_GetToolTips',
+            'GUICtrlRebar_GetUnicodeFormat','GUICtrlRebar_HitTest',
+            'GUICtrlRebar_IDToIndex','GUICtrlRebar_MaximizeBand',
+            'GUICtrlRebar_MinimizeBand','GUICtrlRebar_MoveBand',
+            'GUICtrlRebar_SetBandBackColor','GUICtrlRebar_SetBandForeColor',
+            'GUICtrlRebar_SetBandHeaderSize','GUICtrlRebar_SetBandID',
+            'GUICtrlRebar_SetBandIdealSize','GUICtrlRebar_SetBandLength',
+            'GUICtrlRebar_SetBandLParam','GUICtrlRebar_SetBandStyle',
+            'GUICtrlRebar_SetBandStyleBreak',
+            'GUICtrlRebar_SetBandStyleChildEdge',
+            'GUICtrlRebar_SetBandStyleFixedBMP',
+            'GUICtrlRebar_SetBandStyleFixedSize',
+            'GUICtrlRebar_SetBandStyleGripperAlways',
+            'GUICtrlRebar_SetBandStyleHidden',
+            'GUICtrlRebar_SetBandStyleHideTitle',
+            'GUICtrlRebar_SetBandStyleNoGripper',
+            'GUICtrlRebar_SetBandStyleTopAlign',
+            'GUICtrlRebar_SetBandStyleUseChevron',
+            'GUICtrlRebar_SetBandStyleVariableHeight',
+            'GUICtrlRebar_SetBandText','GUICtrlRebar_SetBKColor',
+            'GUICtrlRebar_SetColorScheme','GUICtrlRebar_SetTextColor',
+            'GUICtrlRebar_SetToolTips','GUICtrlRebar_SetUnicodeFormat',
+            'GUICtrlRebar_ShowBand','GUICtrlSlider_ClearSel',
+            'GUICtrlSlider_ClearTics','GUICtrlSlider_Create',
+            'GUICtrlSlider_Destroy','GUICtrlSlider_GetBuddy',
+            'GUICtrlSlider_GetChannelRect','GUICtrlSlider_GetLineSize',
+            'GUICtrlSlider_GetNumTics','GUICtrlSlider_GetPageSize',
+            'GUICtrlSlider_GetPos','GUICtrlSlider_GetPTics',
+            'GUICtrlSlider_GetRange','GUICtrlSlider_GetRangeMax',
+            'GUICtrlSlider_GetRangeMin','GUICtrlSlider_GetSel',
+            'GUICtrlSlider_GetSelEnd','GUICtrlSlider_GetSelStart',
+            'GUICtrlSlider_GetThumbLength','GUICtrlSlider_GetThumbRect',
+            'GUICtrlSlider_GetThumbRectEx','GUICtrlSlider_GetTic',
+            'GUICtrlSlider_GetTicPos','GUICtrlSlider_GetToolTips',
+            'GUICtrlSlider_GetUnicodeFormat','GUICtrlSlider_SetBuddy',
+            'GUICtrlSlider_SetLineSize','GUICtrlSlider_SetPageSize',
+            'GUICtrlSlider_SetPos','GUICtrlSlider_SetRange',
+            'GUICtrlSlider_SetRangeMax','GUICtrlSlider_SetRangeMin',
+            'GUICtrlSlider_SetSel','GUICtrlSlider_SetSelEnd',
+            'GUICtrlSlider_SetSelStart','GUICtrlSlider_SetThumbLength',
+            'GUICtrlSlider_SetTic','GUICtrlSlider_SetTicFreq',
+            'GUICtrlSlider_SetTipSide','GUICtrlSlider_SetToolTips',
+            'GUICtrlSlider_SetUnicodeFormat','GUICtrlStatusBar_Create',
+            'GUICtrlStatusBar_Destroy','GUICtrlStatusBar_EmbedControl',
+            'GUICtrlStatusBar_GetBorders','GUICtrlStatusBar_GetBordersHorz',
+            'GUICtrlStatusBar_GetBordersRect','GUICtrlStatusBar_GetBordersVert',
+            'GUICtrlStatusBar_GetCount','GUICtrlStatusBar_GetHeight',
+            'GUICtrlStatusBar_GetIcon','GUICtrlStatusBar_GetParts',
+            'GUICtrlStatusBar_GetRect','GUICtrlStatusBar_GetRectEx',
+            'GUICtrlStatusBar_GetText','GUICtrlStatusBar_GetTextFlags',
+            'GUICtrlStatusBar_GetTextLength','GUICtrlStatusBar_GetTextLengthEx',
+            'GUICtrlStatusBar_GetTipText','GUICtrlStatusBar_GetUnicodeFormat',
+            'GUICtrlStatusBar_GetWidth','GUICtrlStatusBar_IsSimple',
+            'GUICtrlStatusBar_Resize','GUICtrlStatusBar_SetBkColor',
+            'GUICtrlStatusBar_SetIcon','GUICtrlStatusBar_SetMinHeight',
+            'GUICtrlStatusBar_SetParts','GUICtrlStatusBar_SetSimple',
+            'GUICtrlStatusBar_SetText','GUICtrlStatusBar_SetTipText',
+            'GUICtrlStatusBar_SetUnicodeFormat','GUICtrlStatusBar_ShowHide',
+            'GUICtrlTab_Create','GUICtrlTab_DeleteAllItems',
+            'GUICtrlTab_DeleteItem','GUICtrlTab_DeselectAll',
+            'GUICtrlTab_Destroy','GUICtrlTab_FindTab','GUICtrlTab_GetCurFocus',
+            'GUICtrlTab_GetCurSel','GUICtrlTab_GetDisplayRect',
+            'GUICtrlTab_GetDisplayRectEx','GUICtrlTab_GetExtendedStyle',
+            'GUICtrlTab_GetImageList','GUICtrlTab_GetItem',
+            'GUICtrlTab_GetItemCount','GUICtrlTab_GetItemImage',
+            'GUICtrlTab_GetItemParam','GUICtrlTab_GetItemRect',
+            'GUICtrlTab_GetItemRectEx','GUICtrlTab_GetItemState',
+            'GUICtrlTab_GetItemText','GUICtrlTab_GetRowCount',
+            'GUICtrlTab_GetToolTips','GUICtrlTab_GetUnicodeFormat',
+            'GUICtrlTab_HighlightItem','GUICtrlTab_HitTest',
+            'GUICtrlTab_InsertItem','GUICtrlTab_RemoveImage',
+            'GUICtrlTab_SetCurFocus','GUICtrlTab_SetCurSel',
+            'GUICtrlTab_SetExtendedStyle','GUICtrlTab_SetImageList',
+            'GUICtrlTab_SetItem','GUICtrlTab_SetItemImage',
+            'GUICtrlTab_SetItemParam','GUICtrlTab_SetItemSize',
+            'GUICtrlTab_SetItemState','GUICtrlTab_SetItemText',
+            'GUICtrlTab_SetMinTabWidth','GUICtrlTab_SetPadding',
+            'GUICtrlTab_SetToolTips','GUICtrlTab_SetUnicodeFormat',
+            'GUICtrlToolbar_AddBitmap','GUICtrlToolbar_AddButton',
+            'GUICtrlToolbar_AddButtonSep','GUICtrlToolbar_AddString',
+            'GUICtrlToolbar_ButtonCount','GUICtrlToolbar_CheckButton',
+            'GUICtrlToolbar_ClickAccel','GUICtrlToolbar_ClickButton',
+            'GUICtrlToolbar_ClickIndex','GUICtrlToolbar_CommandToIndex',
+            'GUICtrlToolbar_Create','GUICtrlToolbar_Customize',
+            'GUICtrlToolbar_DeleteButton','GUICtrlToolbar_Destroy',
+            'GUICtrlToolbar_EnableButton','GUICtrlToolbar_FindToolbar',
+            'GUICtrlToolbar_GetAnchorHighlight','GUICtrlToolbar_GetBitmapFlags',
+            'GUICtrlToolbar_GetButtonBitmap','GUICtrlToolbar_GetButtonInfo',
+            'GUICtrlToolbar_GetButtonInfoEx','GUICtrlToolbar_GetButtonParam',
+            'GUICtrlToolbar_GetButtonRect','GUICtrlToolbar_GetButtonRectEx',
+            'GUICtrlToolbar_GetButtonSize','GUICtrlToolbar_GetButtonState',
+            'GUICtrlToolbar_GetButtonStyle','GUICtrlToolbar_GetButtonText',
+            'GUICtrlToolbar_GetColorScheme',
+            'GUICtrlToolbar_GetDisabledImageList',
+            'GUICtrlToolbar_GetExtendedStyle','GUICtrlToolbar_GetHotImageList',
+            'GUICtrlToolbar_GetHotItem','GUICtrlToolbar_GetImageList',
+            'GUICtrlToolbar_GetInsertMark','GUICtrlToolbar_GetInsertMarkColor',
+            'GUICtrlToolbar_GetMaxSize','GUICtrlToolbar_GetMetrics',
+            'GUICtrlToolbar_GetPadding','GUICtrlToolbar_GetRows',
+            'GUICtrlToolbar_GetString','GUICtrlToolbar_GetStyle',
+            'GUICtrlToolbar_GetStyleAltDrag',
+            'GUICtrlToolbar_GetStyleCustomErase','GUICtrlToolbar_GetStyleFlat',
+            'GUICtrlToolbar_GetStyleList','GUICtrlToolbar_GetStyleRegisterDrop',
+            'GUICtrlToolbar_GetStyleToolTips',
+            'GUICtrlToolbar_GetStyleTransparent',
+            'GUICtrlToolbar_GetStyleWrapable','GUICtrlToolbar_GetTextRows',
+            'GUICtrlToolbar_GetToolTips','GUICtrlToolbar_GetUnicodeFormat',
+            'GUICtrlToolbar_HideButton','GUICtrlToolbar_HighlightButton',
+            'GUICtrlToolbar_HitTest','GUICtrlToolbar_IndexToCommand',
+            'GUICtrlToolbar_InsertButton','GUICtrlToolbar_InsertMarkHitTest',
+            'GUICtrlToolbar_IsButtonChecked','GUICtrlToolbar_IsButtonEnabled',
+            'GUICtrlToolbar_IsButtonHidden',
+            'GUICtrlToolbar_IsButtonHighlighted',
+            'GUICtrlToolbar_IsButtonIndeterminate',
+            'GUICtrlToolbar_IsButtonPressed','GUICtrlToolbar_LoadBitmap',
+            'GUICtrlToolbar_LoadImages','GUICtrlToolbar_MapAccelerator',
+            'GUICtrlToolbar_MoveButton','GUICtrlToolbar_PressButton',
+            'GUICtrlToolbar_SetAnchorHighlight','GUICtrlToolbar_SetBitmapSize',
+            'GUICtrlToolbar_SetButtonBitMap','GUICtrlToolbar_SetButtonInfo',
+            'GUICtrlToolbar_SetButtonInfoEx','GUICtrlToolbar_SetButtonParam',
+            'GUICtrlToolbar_SetButtonSize','GUICtrlToolbar_SetButtonState',
+            'GUICtrlToolbar_SetButtonStyle','GUICtrlToolbar_SetButtonText',
+            'GUICtrlToolbar_SetButtonWidth','GUICtrlToolbar_SetCmdID',
+            'GUICtrlToolbar_SetColorScheme',
+            'GUICtrlToolbar_SetDisabledImageList',
+            'GUICtrlToolbar_SetDrawTextFlags','GUICtrlToolbar_SetExtendedStyle',
+            'GUICtrlToolbar_SetHotImageList','GUICtrlToolbar_SetHotItem',
+            'GUICtrlToolbar_SetImageList','GUICtrlToolbar_SetIndent',
+            'GUICtrlToolbar_SetIndeterminate','GUICtrlToolbar_SetInsertMark',
+            'GUICtrlToolbar_SetInsertMarkColor','GUICtrlToolbar_SetMaxTextRows',
+            'GUICtrlToolbar_SetMetrics','GUICtrlToolbar_SetPadding',
+            'GUICtrlToolbar_SetParent','GUICtrlToolbar_SetRows',
+            'GUICtrlToolbar_SetStyle','GUICtrlToolbar_SetStyleAltDrag',
+            'GUICtrlToolbar_SetStyleCustomErase','GUICtrlToolbar_SetStyleFlat',
+            'GUICtrlToolbar_SetStyleList','GUICtrlToolbar_SetStyleRegisterDrop',
+            'GUICtrlToolbar_SetStyleToolTips',
+            'GUICtrlToolbar_SetStyleTransparent',
+            'GUICtrlToolbar_SetStyleWrapable','GUICtrlToolbar_SetToolTips',
+            'GUICtrlToolbar_SetUnicodeFormat','GUICtrlToolbar_SetWindowTheme',
+            'GUICtrlTreeView_Add','GUICtrlTreeView_AddChild',
+            'GUICtrlTreeView_AddChildFirst','GUICtrlTreeView_AddFirst',
+            'GUICtrlTreeView_BeginUpdate','GUICtrlTreeView_ClickItem',
+            'GUICtrlTreeView_Create','GUICtrlTreeView_CreateDragImage',
+            'GUICtrlTreeView_CreateSolidBitMap','GUICtrlTreeView_Delete',
+            'GUICtrlTreeView_DeleteAll','GUICtrlTreeView_DeleteChildren',
+            'GUICtrlTreeView_Destroy','GUICtrlTreeView_DisplayRect',
+            'GUICtrlTreeView_DisplayRectEx','GUICtrlTreeView_EditText',
+            'GUICtrlTreeView_EndEdit','GUICtrlTreeView_EndUpdate',
+            'GUICtrlTreeView_EnsureVisible','GUICtrlTreeView_Expand',
+            'GUICtrlTreeView_ExpandedOnce','GUICtrlTreeView_FindItem',
+            'GUICtrlTreeView_FindItemEx','GUICtrlTreeView_GetBkColor',
+            'GUICtrlTreeView_GetBold','GUICtrlTreeView_GetChecked',
+            'GUICtrlTreeView_GetChildCount','GUICtrlTreeView_GetChildren',
+            'GUICtrlTreeView_GetCount','GUICtrlTreeView_GetCut',
+            'GUICtrlTreeView_GetDropTarget','GUICtrlTreeView_GetEditControl',
+            'GUICtrlTreeView_GetExpanded','GUICtrlTreeView_GetFirstChild',
+            'GUICtrlTreeView_GetFirstItem','GUICtrlTreeView_GetFirstVisible',
+            'GUICtrlTreeView_GetFocused','GUICtrlTreeView_GetHeight',
+            'GUICtrlTreeView_GetImageIndex',
+            'GUICtrlTreeView_GetImageListIconHandle',
+            'GUICtrlTreeView_GetIndent','GUICtrlTreeView_GetInsertMarkColor',
+            'GUICtrlTreeView_GetISearchString','GUICtrlTreeView_GetItemByIndex',
+            'GUICtrlTreeView_GetItemHandle','GUICtrlTreeView_GetItemParam',
+            'GUICtrlTreeView_GetLastChild','GUICtrlTreeView_GetLineColor',
+            'GUICtrlTreeView_GetNext','GUICtrlTreeView_GetNextChild',
+            'GUICtrlTreeView_GetNextSibling','GUICtrlTreeView_GetNextVisible',
+            'GUICtrlTreeView_GetNormalImageList',
+            'GUICtrlTreeView_GetParentHandle','GUICtrlTreeView_GetParentParam',
+            'GUICtrlTreeView_GetPrev','GUICtrlTreeView_GetPrevChild',
+            'GUICtrlTreeView_GetPrevSibling','GUICtrlTreeView_GetPrevVisible',
+            'GUICtrlTreeView_GetScrollTime','GUICtrlTreeView_GetSelected',
+            'GUICtrlTreeView_GetSelectedImageIndex',
+            'GUICtrlTreeView_GetSelection','GUICtrlTreeView_GetSiblingCount',
+            'GUICtrlTreeView_GetState','GUICtrlTreeView_GetStateImageIndex',
+            'GUICtrlTreeView_GetStateImageList','GUICtrlTreeView_GetText',
+            'GUICtrlTreeView_GetTextColor','GUICtrlTreeView_GetToolTips',
+            'GUICtrlTreeView_GetTree','GUICtrlTreeView_GetUnicodeFormat',
+            'GUICtrlTreeView_GetVisible','GUICtrlTreeView_GetVisibleCount',
+            'GUICtrlTreeView_HitTest','GUICtrlTreeView_HitTestEx',
+            'GUICtrlTreeView_HitTestItem','GUICtrlTreeView_Index',
+            'GUICtrlTreeView_InsertItem','GUICtrlTreeView_IsFirstItem',
+            'GUICtrlTreeView_IsParent','GUICtrlTreeView_Level',
+            'GUICtrlTreeView_SelectItem','GUICtrlTreeView_SelectItemByIndex',
+            'GUICtrlTreeView_SetBkColor','GUICtrlTreeView_SetBold',
+            'GUICtrlTreeView_SetChecked','GUICtrlTreeView_SetCheckedByIndex',
+            'GUICtrlTreeView_SetChildren','GUICtrlTreeView_SetCut',
+            'GUICtrlTreeView_SetDropTarget','GUICtrlTreeView_SetFocused',
+            'GUICtrlTreeView_SetHeight','GUICtrlTreeView_SetIcon',
+            'GUICtrlTreeView_SetImageIndex','GUICtrlTreeView_SetIndent',
+            'GUICtrlTreeView_SetInsertMark',
+            'GUICtrlTreeView_SetInsertMarkColor',
+            'GUICtrlTreeView_SetItemHeight','GUICtrlTreeView_SetItemParam',
+            'GUICtrlTreeView_SetLineColor','GUICtrlTreeView_SetNormalImageList',
+            'GUICtrlTreeView_SetScrollTime','GUICtrlTreeView_SetSelected',
+            'GUICtrlTreeView_SetSelectedImageIndex','GUICtrlTreeView_SetState',
+            'GUICtrlTreeView_SetStateImageIndex',
+            'GUICtrlTreeView_SetStateImageList','GUICtrlTreeView_SetText',
+            'GUICtrlTreeView_SetTextColor','GUICtrlTreeView_SetToolTips',
+            'GUICtrlTreeView_SetUnicodeFormat','GUICtrlTreeView_Sort',
+            'GUIImageList_Add','GUIImageList_AddBitmap','GUIImageList_AddIcon',
+            'GUIImageList_AddMasked','GUIImageList_BeginDrag',
+            'GUIImageList_Copy','GUIImageList_Create','GUIImageList_Destroy',
+            'GUIImageList_DestroyIcon','GUIImageList_DragEnter',
+            'GUIImageList_DragLeave','GUIImageList_DragMove',
+            'GUIImageList_Draw','GUIImageList_DrawEx','GUIImageList_Duplicate',
+            'GUIImageList_EndDrag','GUIImageList_GetBkColor',
+            'GUIImageList_GetIcon','GUIImageList_GetIconHeight',
+            'GUIImageList_GetIconSize','GUIImageList_GetIconSizeEx',
+            'GUIImageList_GetIconWidth','GUIImageList_GetImageCount',
+            'GUIImageList_GetImageInfoEx','GUIImageList_Remove',
+            'GUIImageList_ReplaceIcon','GUIImageList_SetBkColor',
+            'GUIImageList_SetIconSize','GUIImageList_SetImageCount',
+            'GUIImageList_Swap','GUIScrollBars_EnableScrollBar',
+            'GUIScrollBars_GetScrollBarInfoEx','GUIScrollBars_GetScrollBarRect',
+            'GUIScrollBars_GetScrollBarRGState',
+            'GUIScrollBars_GetScrollBarXYLineButton',
+            'GUIScrollBars_GetScrollBarXYThumbBottom',
+            'GUIScrollBars_GetScrollBarXYThumbTop',
+            'GUIScrollBars_GetScrollInfo','GUIScrollBars_GetScrollInfoEx',
+            'GUIScrollBars_GetScrollInfoMax','GUIScrollBars_GetScrollInfoMin',
+            'GUIScrollBars_GetScrollInfoPage','GUIScrollBars_GetScrollInfoPos',
+            'GUIScrollBars_GetScrollInfoTrackPos','GUIScrollBars_GetScrollPos',
+            'GUIScrollBars_GetScrollRange','GUIScrollBars_Init',
+            'GUIScrollBars_ScrollWindow','GUIScrollBars_SetScrollInfo',
+            'GUIScrollBars_SetScrollInfoMax','GUIScrollBars_SetScrollInfoMin',
+            'GUIScrollBars_SetScrollInfoPage','GUIScrollBars_SetScrollInfoPos',
+            'GUIScrollBars_SetScrollRange','GUIScrollBars_ShowScrollBar',
+            'GUIToolTip_Activate','GUIToolTip_AddTool','GUIToolTip_AdjustRect',
+            'GUIToolTip_BitsToTTF','GUIToolTip_Create','GUIToolTip_DelTool',
+            'GUIToolTip_Destroy','GUIToolTip_EnumTools',
+            'GUIToolTip_GetBubbleHeight','GUIToolTip_GetBubbleSize',
+            'GUIToolTip_GetBubbleWidth','GUIToolTip_GetCurrentTool',
+            'GUIToolTip_GetDelayTime','GUIToolTip_GetMargin',
+            'GUIToolTip_GetMarginEx','GUIToolTip_GetMaxTipWidth',
+            'GUIToolTip_GetText','GUIToolTip_GetTipBkColor',
+            'GUIToolTip_GetTipTextColor','GUIToolTip_GetTitleBitMap',
+            'GUIToolTip_GetTitleText','GUIToolTip_GetToolCount',
+            'GUIToolTip_GetToolInfo','GUIToolTip_HitTest',
+            'GUIToolTip_NewToolRect','GUIToolTip_Pop','GUIToolTip_PopUp',
+            'GUIToolTip_SetDelayTime','GUIToolTip_SetMargin',
+            'GUIToolTip_SetMaxTipWidth','GUIToolTip_SetTipBkColor',
+            'GUIToolTip_SetTipTextColor','GUIToolTip_SetTitle',
+            'GUIToolTip_SetToolInfo','GUIToolTip_SetWindowTheme',
+            'GUIToolTip_ToolExists','GUIToolTip_ToolToArray',
+            'GUIToolTip_TrackActivate','GUIToolTip_TrackPosition',
+            'GUIToolTip_TTFToBits','GUIToolTip_Update',
+            'GUIToolTip_UpdateTipText','HexToString','IE_Example',
+            'IE_Introduction','IE_VersionInfo','IEAction','IEAttach',
+            'IEBodyReadHTML','IEBodyReadText','IEBodyWriteHTML','IECreate',
+            'IECreateEmbedded','IEDocGetObj','IEDocInsertHTML',
+            'IEDocInsertText','IEDocReadHTML','IEDocWriteHTML',
+            'IEErrorHandlerDeRegister','IEErrorHandlerRegister','IEErrorNotify',
+            'IEFormElementCheckBoxSelect','IEFormElementGetCollection',
+            'IEFormElementGetObjByName','IEFormElementGetValue',
+            'IEFormElementOptionSelect','IEFormElementRadioSelect',
+            'IEFormElementSetValue','IEFormGetCollection','IEFormGetObjByName',
+            'IEFormImageClick','IEFormReset','IEFormSubmit',
+            'IEFrameGetCollection','IEFrameGetObjByName','IEGetObjById',
+            'IEGetObjByName','IEHeadInsertEventScript','IEImgClick',
+            'IEImgGetCollection','IEIsFrameSet','IELinkClickByIndex',
+            'IELinkClickByText','IELinkGetCollection','IELoadWait',
+            'IELoadWaitTimeout','IENavigate','IEPropertyGet','IEPropertySet',
+            'IEQuit','IETableGetCollection','IETableWriteToArray',
+            'IETagNameAllGetCollection','IETagNameGetCollection','Iif',
+            'INetExplorerCapable','INetGetSource','INetMail','INetSmtpMail',
+            'IsPressed','MathCheckDiv','Max','MemGlobalAlloc','MemGlobalFree',
+            'MemGlobalLock','MemGlobalSize','MemGlobalUnlock','MemMoveMemory',
+            'MemMsgBox','MemShowError','MemVirtualAlloc','MemVirtualAllocEx',
+            'MemVirtualFree','MemVirtualFreeEx','Min','MouseTrap',
+            'NamedPipes_CallNamedPipe','NamedPipes_ConnectNamedPipe',
+            'NamedPipes_CreateNamedPipe','NamedPipes_CreatePipe',
+            'NamedPipes_DisconnectNamedPipe',
+            'NamedPipes_GetNamedPipeHandleState','NamedPipes_GetNamedPipeInfo',
+            'NamedPipes_PeekNamedPipe','NamedPipes_SetNamedPipeHandleState',
+            'NamedPipes_TransactNamedPipe','NamedPipes_WaitNamedPipe',
+            'Net_Share_ConnectionEnum','Net_Share_FileClose',
+            'Net_Share_FileEnum','Net_Share_FileGetInfo','Net_Share_PermStr',
+            'Net_Share_ResourceStr','Net_Share_SessionDel',
+            'Net_Share_SessionEnum','Net_Share_SessionGetInfo',
+            'Net_Share_ShareAdd','Net_Share_ShareCheck','Net_Share_ShareDel',
+            'Net_Share_ShareEnum','Net_Share_ShareGetInfo',
+            'Net_Share_ShareSetInfo','Net_Share_StatisticsGetSvr',
+            'Net_Share_StatisticsGetWrk','Now','NowCalc','NowCalcDate',
+            'NowDate','NowTime','PathFull','PathMake','PathSplit',
+            'ProcessGetName','ProcessGetPriority','Radian',
+            'ReplaceStringInFile','RunDOS','ScreenCapture_Capture',
+            'ScreenCapture_CaptureWnd','ScreenCapture_SaveImage',
+            'ScreenCapture_SetBMPFormat','ScreenCapture_SetJPGQuality',
+            'ScreenCapture_SetTIFColorDepth','ScreenCapture_SetTIFCompression',
+            'Security__AdjustTokenPrivileges','Security__GetAccountSid',
+            'Security__GetLengthSid','Security__GetTokenInformation',
+            'Security__ImpersonateSelf','Security__IsValidSid',
+            'Security__LookupAccountName','Security__LookupAccountSid',
+            'Security__LookupPrivilegeValue','Security__OpenProcessToken',
+            'Security__OpenThreadToken','Security__OpenThreadTokenEx',
+            'Security__SetPrivilege','Security__SidToStringSid',
+            'Security__SidTypeStr','Security__StringSidToSid','SendMessage',
+            'SendMessageA','SetDate','SetTime','Singleton','SoundClose',
+            'SoundLength','SoundOpen','SoundPause','SoundPlay','SoundPos',
+            'SoundResume','SoundSeek','SoundStatus','SoundStop',
+            'SQLite_Changes','SQLite_Close','SQLite_Display2DResult',
+            'SQLite_Encode','SQLite_ErrCode','SQLite_ErrMsg','SQLite_Escape',
+            'SQLite_Exec','SQLite_FetchData','SQLite_FetchNames',
+            'SQLite_GetTable','SQLite_GetTable2d','SQLite_LastInsertRowID',
+            'SQLite_LibVersion','SQLite_Open','SQLite_Query',
+            'SQLite_QueryFinalize','SQLite_QueryReset','SQLite_QuerySingleRow',
+            'SQLite_SaveMode','SQLite_SetTimeout','SQLite_Shutdown',
+            'SQLite_SQLiteExe','SQLite_Startup','SQLite_TotalChanges',
+            'StringAddComma','StringBetween','StringEncrypt','StringInsert',
+            'StringProper','StringRepeat','StringReverse','StringSplit',
+            'StringToHex','TCPIpToName','TempFile','TicksToTime','Timer_Diff',
+            'Timer_GetTimerID','Timer_Init','Timer_KillAllTimers',
+            'Timer_KillTimer','Timer_SetTimer','TimeToTicks','VersionCompare',
+            'viClose','viExecCommand','viFindGpib','viGpibBusReset','viGTL',
+            'viOpen','viSetAttribute','viSetTimeout','WeekNumberISO',
+            'WinAPI_AttachConsole','WinAPI_AttachThreadInput','WinAPI_Beep',
+            'WinAPI_BitBlt','WinAPI_CallNextHookEx','WinAPI_Check',
+            'WinAPI_ClientToScreen','WinAPI_CloseHandle',
+            'WinAPI_CommDlgExtendedError','WinAPI_CopyIcon',
+            'WinAPI_CreateBitmap','WinAPI_CreateCompatibleBitmap',
+            'WinAPI_CreateCompatibleDC','WinAPI_CreateEvent',
+            'WinAPI_CreateFile','WinAPI_CreateFont','WinAPI_CreateFontIndirect',
+            'WinAPI_CreateProcess','WinAPI_CreateSolidBitmap',
+            'WinAPI_CreateSolidBrush','WinAPI_CreateWindowEx',
+            'WinAPI_DefWindowProc','WinAPI_DeleteDC','WinAPI_DeleteObject',
+            'WinAPI_DestroyIcon','WinAPI_DestroyWindow','WinAPI_DrawEdge',
+            'WinAPI_DrawFrameControl','WinAPI_DrawIcon','WinAPI_DrawIconEx',
+            'WinAPI_DrawText','WinAPI_EnableWindow','WinAPI_EnumDisplayDevices',
+            'WinAPI_EnumWindows','WinAPI_EnumWindowsPopup',
+            'WinAPI_EnumWindowsTop','WinAPI_ExpandEnvironmentStrings',
+            'WinAPI_ExtractIconEx','WinAPI_FatalAppExit','WinAPI_FillRect',
+            'WinAPI_FindExecutable','WinAPI_FindWindow','WinAPI_FlashWindow',
+            'WinAPI_FlashWindowEx','WinAPI_FloatToInt',
+            'WinAPI_FlushFileBuffers','WinAPI_FormatMessage','WinAPI_FrameRect',
+            'WinAPI_FreeLibrary','WinAPI_GetAncestor','WinAPI_GetAsyncKeyState',
+            'WinAPI_GetClassName','WinAPI_GetClientHeight',
+            'WinAPI_GetClientRect','WinAPI_GetClientWidth',
+            'WinAPI_GetCurrentProcess','WinAPI_GetCurrentProcessID',
+            'WinAPI_GetCurrentThread','WinAPI_GetCurrentThreadId',
+            'WinAPI_GetCursorInfo','WinAPI_GetDC','WinAPI_GetDesktopWindow',
+            'WinAPI_GetDeviceCaps','WinAPI_GetDIBits','WinAPI_GetDlgCtrlID',
+            'WinAPI_GetDlgItem','WinAPI_GetFileSizeEx','WinAPI_GetFocus',
+            'WinAPI_GetForegroundWindow','WinAPI_GetIconInfo',
+            'WinAPI_GetLastError','WinAPI_GetLastErrorMessage',
+            'WinAPI_GetModuleHandle','WinAPI_GetMousePos','WinAPI_GetMousePosX',
+            'WinAPI_GetMousePosY','WinAPI_GetObject','WinAPI_GetOpenFileName',
+            'WinAPI_GetOverlappedResult','WinAPI_GetParent',
+            'WinAPI_GetProcessAffinityMask','WinAPI_GetSaveFileName',
+            'WinAPI_GetStdHandle','WinAPI_GetStockObject','WinAPI_GetSysColor',
+            'WinAPI_GetSysColorBrush','WinAPI_GetSystemMetrics',
+            'WinAPI_GetTextExtentPoint32','WinAPI_GetWindow',
+            'WinAPI_GetWindowDC','WinAPI_GetWindowHeight',
+            'WinAPI_GetWindowLong','WinAPI_GetWindowRect',
+            'WinAPI_GetWindowText','WinAPI_GetWindowThreadProcessId',
+            'WinAPI_GetWindowWidth','WinAPI_GetXYFromPoint',
+            'WinAPI_GlobalMemStatus','WinAPI_GUIDFromString',
+            'WinAPI_GUIDFromStringEx','WinAPI_HiWord','WinAPI_InProcess',
+            'WinAPI_IntToFloat','WinAPI_InvalidateRect','WinAPI_IsClassName',
+            'WinAPI_IsWindow','WinAPI_IsWindowVisible','WinAPI_LoadBitmap',
+            'WinAPI_LoadImage','WinAPI_LoadLibrary','WinAPI_LoadLibraryEx',
+            'WinAPI_LoadShell32Icon','WinAPI_LoadString','WinAPI_LocalFree',
+            'WinAPI_LoWord','WinAPI_MakeDWord','WinAPI_MAKELANGID',
+            'WinAPI_MAKELCID','WinAPI_MakeLong','WinAPI_MessageBeep',
+            'WinAPI_Mouse_Event','WinAPI_MoveWindow','WinAPI_MsgBox',
+            'WinAPI_MulDiv','WinAPI_MultiByteToWideChar',
+            'WinAPI_MultiByteToWideCharEx','WinAPI_OpenProcess',
+            'WinAPI_PointFromRect','WinAPI_PostMessage','WinAPI_PrimaryLangId',
+            'WinAPI_PtInRect','WinAPI_ReadFile','WinAPI_ReadProcessMemory',
+            'WinAPI_RectIsEmpty','WinAPI_RedrawWindow',
+            'WinAPI_RegisterWindowMessage','WinAPI_ReleaseCapture',
+            'WinAPI_ReleaseDC','WinAPI_ScreenToClient','WinAPI_SelectObject',
+            'WinAPI_SetBkColor','WinAPI_SetCapture','WinAPI_SetCursor',
+            'WinAPI_SetDefaultPrinter','WinAPI_SetDIBits','WinAPI_SetEvent',
+            'WinAPI_SetFocus','WinAPI_SetFont','WinAPI_SetHandleInformation',
+            'WinAPI_SetLastError','WinAPI_SetParent',
+            'WinAPI_SetProcessAffinityMask','WinAPI_SetSysColors',
+            'WinAPI_SetTextColor','WinAPI_SetWindowLong','WinAPI_SetWindowPos',
+            'WinAPI_SetWindowsHookEx','WinAPI_SetWindowText',
+            'WinAPI_ShowCursor','WinAPI_ShowError','WinAPI_ShowMsg',
+            'WinAPI_ShowWindow','WinAPI_StringFromGUID','WinAPI_SubLangId',
+            'WinAPI_SystemParametersInfo','WinAPI_TwipsPerPixelX',
+            'WinAPI_TwipsPerPixelY','WinAPI_UnhookWindowsHookEx',
+            'WinAPI_UpdateLayeredWindow','WinAPI_UpdateWindow',
+            'WinAPI_ValidateClassName','WinAPI_WaitForInputIdle',
+            'WinAPI_WaitForMultipleObjects','WinAPI_WaitForSingleObject',
+            'WinAPI_WideCharToMultiByte','WinAPI_WindowFromPoint',
+            'WinAPI_WriteConsole','WinAPI_WriteFile',
+            'WinAPI_WriteProcessMemory','WinNet_AddConnection',
+            'WinNet_AddConnection2','WinNet_AddConnection3',
+            'WinNet_CancelConnection','WinNet_CancelConnection2',
+            'WinNet_CloseEnum','WinNet_ConnectionDialog',
+            'WinNet_ConnectionDialog1','WinNet_DisconnectDialog',
+            'WinNet_DisconnectDialog1','WinNet_EnumResource',
+            'WinNet_GetConnection','WinNet_GetConnectionPerformance',
+            'WinNet_GetLastError','WinNet_GetNetworkInformation',
+            'WinNet_GetProviderName','WinNet_GetResourceInformation',
+            'WinNet_GetResourceParent','WinNet_GetUniversalName',
+            'WinNet_GetUser','WinNet_OpenEnum','WinNet_RestoreConnection',
+            'WinNet_UseConnection','Word_VersionInfo','WordAttach','WordCreate',
+            'WordDocAdd','WordDocAddLink','WordDocAddPicture','WordDocClose',
+            'WordDocFindReplace','WordDocGetCollection',
+            'WordDocLinkGetCollection','WordDocOpen','WordDocPrint',
+            'WordDocPropertyGet','WordDocPropertySet','WordDocSave',
+            'WordDocSaveAs','WordErrorHandlerDeRegister',
+            'WordErrorHandlerRegister','WordErrorNotify','WordMacroRun',
+            'WordPropertyGet','WordPropertySet','WordQuit'
+            ),
+        5 => array(
+            'ce','comments-end','comments-start','cs','include','include-once',
+            'NoTrayIcon','RequireAdmin'
+            ),
+        6 => array(
+            'AutoIt3Wrapper_Au3Check_Parameters',
+            'AutoIt3Wrapper_Au3Check_Stop_OnWarning',
+            'AutoIt3Wrapper_Change2CUI','AutoIt3Wrapper_Compression',
+            'AutoIt3Wrapper_cvsWrapper_Parameters','AutoIt3Wrapper_Icon',
+            'AutoIt3Wrapper_Outfile','AutoIt3Wrapper_Outfile_Type',
+            'AutoIt3Wrapper_Plugin_Funcs','AutoIt3Wrapper_Res_Comment',
+            'AutoIt3Wrapper_Res_Description','AutoIt3Wrapper_Res_Field',
+            'AutoIt3Wrapper_Res_File_Add','AutoIt3Wrapper_Res_Fileversion',
+            'AutoIt3Wrapper_Res_FileVersion_AutoIncrement',
+            'AutoIt3Wrapper_Res_Icon_Add','AutoIt3Wrapper_Res_Language',
+            'AutoIt3Wrapper_Res_LegalCopyright',
+            'AutoIt3Wrapper_res_requestedExecutionLevel',
+            'AutoIt3Wrapper_Res_SaveSource','AutoIt3Wrapper_Run_After',
+            'AutoIt3Wrapper_Run_Au3check','AutoIt3Wrapper_Run_Before',
+            'AutoIt3Wrapper_Run_cvsWrapper','AutoIt3Wrapper_Run_Debug_Mode',
+            'AutoIt3Wrapper_Run_Obfuscator','AutoIt3Wrapper_Run_Tidy',
+            'AutoIt3Wrapper_Tidy_Stop_OnError','AutoIt3Wrapper_UseAnsi',
+            'AutoIt3Wrapper_UseUpx','AutoIt3Wrapper_UseX64',
+            'AutoIt3Wrapper_Version','EndRegion','forceref',
+            'Obfuscator_Ignore_Funcs','Obfuscator_Ignore_Variables',
+            'Obfuscator_Parameters','Region','Tidy_Parameters'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']',
+        '+','-','*','/','&','^',
+        '=','+=','-=','*=','/=','&=',
+        '==','<','<=','>','>=',
+        ',','.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #800000; font-weight: bold;',
+            3 => 'color: #000080; font-style: italic; font-weight: bold;',
+            4 => 'color: #0080FF; font-style: italic; font-weight: bold;',
+            5 => 'color: #F000FF; font-style: italic;',
+            6 => 'color: #A00FF0; font-style: italic;'
+            ),
+        'COMMENTS' => array(
+            0 => 'font-style: italic; color: #009933;',
+            'MULTI' => 'font-style: italic; color: #669900;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'font-weight: bold; color: #008080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #AC00A9; font-style: italic; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF; font-style: italic; font-weight: bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: #AA0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
+        2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
+        3 => 'http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\_'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)\#'
+            )
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/avisynth.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/avisynth.php
new file mode 100644
index 000000000..c0526e956
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/avisynth.php
@@ -0,0 +1,194 @@
+<?php
+/*************************************************************************************
+ * avisynth.php
+ * --------
+ * Author: Ryan Jones (sciguyryan@gmail.com)
+ * Copyright: (c) 2008 Ryan Jones
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/10/08
+ *
+ * AviSynth language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/08 (1.0.8.1)
+ *  -  First Release
+ *
+ * TODO (updated 2008/10/08)
+ * -------------------------
+ * * There are also some special words that can't currently be specified directly in GeSHi as they may
+ *      also be used as variables which would really mess things up.
+ * * Also there is an issue with the escape character as this language uses a muti-character escape system. Escape char should be """ but has been left
+ *      as empty due to this restiction.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'AviSynth',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/', '[*' => '*]'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //  Reserved words.
+        1 => array(
+            'try', 'cache', 'function', 'global', 'return'
+            ),
+        // Constants / special variables.
+        2 => array(
+            'true', 'yes', 'false', 'no', '__END__'
+            ),
+        // Internal Filters.
+        3 => array(
+            'AviSource', 'AviFileSource', 'AddBorders', 'AlignedSplice', 'AssumeFPS', 'AssumeScaledFPS',
+            'AssumeFrameBased', 'AssumeFieldBased', 'AssumeBFF', 'AssumeTFF', 'Amplify', 'AmplifydB',
+            'AssumeSampleRate', 'AudioDub', 'AudioDubEx', 'Animate', 'ApplyRange',
+            'BicubicResize', 'BilinearResize', 'BlackmanResize', 'Blur', 'Bob', 'BlankClip', 'Blackness',
+            'ColorYUV', 'ConvertBackToYUY2', 'ConvertToRGB', 'ConvertToRGB24', 'ConvertToRGB32',
+            'ConvertToYUY2', 'ConvertToY8', 'ConvertToYV411', 'ConvertToYV12', 'ConvertToYV16', 'ConvertToYV24',
+            'ColorKeyMask', 'Crop', 'CropBottom', 'ChangeFPS', 'ConvertFPS', 'ComplementParity', 'ConvertAudioTo8bit',
+            'ConvertAudioTo16bit', 'ConvertAudioTo24bit', 'ConvertAudioTo32bit', 'ConvertAudioToFloat', 'ConvertToMono',
+            'ConditionalFilter', 'ConditionalReader', 'ColorBars', 'Compare',
+            'DirectShowSource', 'DeleteFrame', 'Dissolve', 'DuplicateFrame', 'DoubleWeave', 'DelayAudio',
+            'EnsureVBRMP3Sync',
+            'FixLuminance', 'FlipHorizontal', 'FlipVertical', 'FixBrokenChromaUpsampling', 'FadeIn0', 'FadeIn',
+            'FadeIn2', 'FadeOut0', 'FadeOut', 'FadeOut2', 'FadeIO0', 'FadeIO', 'FadeIO2', 'FreezeFrame', 'FrameEvaluate',
+            'GreyScale', 'GaussResize', 'GeneralConvolution', 'GetChannel', 'GetLeftChannel', 'GetRightChannel',
+            'HorizontalReduceBy2', 'Histogram',
+            'ImageReader', 'ImageSource', 'ImageWriter', 'Invert', 'Interleave', 'Info',
+            'KillAudio', 'KillVideo',
+            'Levels', 'Limiter', 'Layer', 'Letterbox', 'LanczosResize', 'Lanczos4Resize', 'Loop',
+            'MergeARGB', 'MergeRGB', 'MergeChroma', 'MergeLuma', 'Merge', 'Mask', 'MaskHS', 'MergeChannels', 'MixAudio',
+            'MonoToStereo', 'MessageClip',
+            'Normalize',
+            'OpenDMLSource', 'Overlay',
+            'PointResize', 'PeculiarBlend', 'Pulldown',
+            'RGBAdjust', 'ResetMask', 'Reverse', 'ResampleAudio', 'ReduceBy2',
+            'SegmentedAviSource', 'SegmentedDirectShowSource', 'SoundOut', 'ShowAlpha', 'ShowRed', 'ShowGreen',
+            'ShowBlue', 'SwapUV', 'Subtract', 'SincResize', 'Spline16Resize', 'Spline36Resize', 'Spline64Resize',
+            'SelectEven', 'SelectOdd', 'SelectEvery', 'SelectRangeEvery', 'Sharpen', 'SpatialSoften', 'SeparateFields',
+            'ShowFiveVersions', 'ShowFrameNumber', 'ShowSMPTE', 'ShowTime', 'StackHorizontal', 'StackVertical', 'Subtitle',
+            'SwapFields', 'SuperEQ', 'SSRC', 'ScriptClip',
+            'Tweak', 'TurnLeft', 'TurnRight', 'Turn180', 'TemporalSoften', 'TimeStretch', 'TCPServer', 'TCPSource', 'Trim',
+            'Tone',
+            'UToY', 'UToY8', 'UnalignedSplice',
+            'VToY', 'VToY8', 'VerticalReduceBy2', 'Version',
+            'WavSource', 'Weave', 'WriteFile', 'WriteFileIf', 'WriteFileStart', 'WriteFileEnd',
+            'YToUV'
+            ),
+        // Internal functions.
+        4 => array(
+            'Abs', 'Apply', 'Assert', 'AverageLuma', 'AverageChromaU', 'AverageChromaV',
+            'Ceil', 'Cos', 'Chr', 'ChromaUDifference', 'ChromaVDifference',
+            'Defined', 'Default',
+            'Exp', 'Exist', 'Eval',
+            'Floor', 'Frac', 'Float', 'Findstr', 'GetMTMode',
+            'HexValue',
+            'Int', 'IsBool', 'IsClip', 'IsFloat', 'IsInt', 'IsString', 'Import',
+            'LoadPlugin', 'Log', 'LCase', 'LeftStr', 'LumaDifference', 'LoadVirtualDubPlugin', 'LoadVFAPIPlugin',
+            'LoadCPlugin', 'Load_Stdcall_Plugin',
+            'Max', 'MulDiv', 'MidStr',
+            'NOP',
+            'OPT_AllowFloatAudio', 'OPT_UseWaveExtensible',
+            'Pi', 'Pow',
+            'Round', 'Rand', 'RevStr', 'RightStr', 'RGBDifference', 'RGBDifferenceFromPrevious', 'RGBDifferenceToNext',
+            'Sin', 'Sqrt', 'Sign', 'Spline', 'StrLen', 'String', 'Select', 'SetMemoryMax', 'SetWorkingDir', 'SetMTMode',
+            'SetPlanarLegacyAlignment',
+            'Time',
+            'UCase', 'UDifferenceFromPrevious', 'UDifferenceToNext', 'UPlaneMax', 'UPlaneMin', 'UPlaneMedian',
+            'UPlaneMinMaxDifference',
+            'Value', 'VersionNumber', 'VersionString', 'VDifferenceFromPrevious', 'VDifferenceToNext', 'VPlaneMax',
+            'VPlaneMin', 'VPlaneMedian', 'VPlaneMinMaxDifference',
+            'YDifferenceFromPrevious', 'YDifferenceToNext', 'YPlaneMax', 'YPlaneMin', 'YPlaneMedian',
+            'YPlaneMinMaxDifference'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '++', '-', '--', '/', '*', '%',
+        '=', '==', '<', '<=', '>', '>=', '<>', '!=',
+        '!', '?', ':',
+        '|', '||', '&&',
+        '\\',
+        '(', ')', '{', '}',
+        '.', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC3300; font-weight:bold;',
+            4 => 'color:#660000; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://avisynth.org/mediawiki/{FNAME}',
+        4 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bash.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bash.php
new file mode 100644
index 000000000..bb0a571ba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bash.php
@@ -0,0 +1,282 @@
+<?php
+/*************************************************************************************
+ * bash.php
+ * --------
+ * Author: Andreas Gohr (andi@splitbrain.org)
+ * Copyright: (c) 2004 Andreas Gohr, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/20
+ *
+ * BASH language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/21 (1.0.8)
+ *  -  Added loads of keywords and commands of GNU/Linux
+ *  -  Added support for parameters starting with a dash
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2007/09/05 (1.0.7.21)
+ *  -  PARSER_CONTROL patch using SF #1788408 (BenBE)
+ * 2007/06/11 (1.0.7.20)
+ *  -  Added a lot of keywords (BenBE / Jan G)
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Get symbols working
+ * * Highlight builtin vars
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Bash',
+    // Bash DOES have single line comments with # markers. But bash also has
+    // the  $# variable, so comments need special handling (see sf.net
+    // 1564839)
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Variables
+        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        //BASH-style Heredoc
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Escaped String Starters
+        3 => "/\\\\['\"]/siU"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
+        // $var
+        2 => "#\\$[a-z_][a-z0-9_]*#i",
+        // ${...}
+        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        // $(...)
+        4 => "/\\$\\([^\\n\\)]*?\\)/i",
+        // `...`
+        5 => "/`[^`]*`/"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'done', 'elif', 'else', 'esac', 'fi', 'for', 'function',
+            'if', 'in', 'select', 'set', 'then', 'until', 'while', 'time'
+            ),
+        2 => array(
+            'aclocal', 'aconnect', 'aplay', 'apm', 'apmsleep', 'apropos',
+            'apt-cache', 'apt-get', 'apt-key', 'aptitude',
+            'ar', 'arch', 'arecord', 'as', 'as86', 'ash', 'autoconf',
+            'autoheader', 'automake', 'awk',
+
+            'basename', 'bash', 'bc', 'bison', 'bunzip2', 'bzcat',
+            'bzcmp', 'bzdiff', 'bzegrep', 'bzfgrep', 'bzgrep',
+            'bzip2', 'bzip2recover', 'bzless', 'bzmore',
+
+            'c++', 'cal', 'cat', 'chattr', 'cc', 'cdda2wav', 'cdparanoia',
+            'cdrdao', 'cd-read', 'cdrecord', 'chfn', 'chgrp', 'chmod',
+            'chown', 'chroot', 'chsh', 'chvt', 'clear', 'cmp', 'comm', 'co',
+            'col', 'cp', 'cpio', 'cpp', 'csh', 'cut', 'cvs', 'cvs-pserver',
+
+            'dash', 'date', 'dd', 'dc', 'dcop', 'deallocvt', 'df', 'dialog',
+            'diff', 'diff3', 'dir', 'dircolors', 'directomatic', 'dirname',
+            'dmesg', 'dnsdomainname', 'domainname', 'dpkg', 'dselect', 'du',
+            'dumpkeys',
+
+            'ed', 'egrep', 'env', 'expr',
+
+            'false', 'fbset', 'ffmpeg', 'fgconsole','fgrep', 'file', 'find',
+            'flex', 'flex++', 'fmt', 'free', 'ftp', 'funzip', 'fuser',
+
+            'g++', 'gawk', 'gc','gcc', 'gdb', 'getent', 'getkeycodes',
+            'getopt', 'gettext', 'gettextize', 'gimp', 'gimp-remote',
+            'gimptool', 'gmake', 'gocr', 'grep', 'groups', 'gs', 'gunzip',
+            'gzexe', 'gzip',
+
+            'head', 'hexdump', 'hostname',
+
+            'id', 'ifconfig', 'igawk', 'install',
+
+            'join',
+
+            'kbd_mode','kbdrate', 'kdialog', 'kfile', 'kill', 'killall',
+
+            'lame', 'last', 'lastb', 'ld', 'ld86', 'ldd', 'less', 'lex', 'link',
+            'ln', 'loadkeys', 'loadunimap', 'locate', 'lockfile', 'login',
+            'logname', 'lp', 'lpr', 'ls', 'lsattr', 'lsmod', 'lsmod.old',
+            'lspci', 'ltrace', 'lynx',
+
+            'm4', 'make', 'man', 'mapscrn', 'mesg', 'mkdir', 'mkfifo',
+            'mknod', 'mktemp', 'more', 'mount', 'mplayer', 'msgfmt', 'mv',
+
+            'namei', 'nano', 'nasm', 'nawk', 'netstat', 'nice',
+            'nisdomainname', 'nl', 'nm', 'nm86', 'nmap', 'nohup', 'nop',
+
+            'od', 'openvt',
+
+            'passwd', 'patch', 'pcregrep', 'pcretest', 'perl', 'perror',
+            'pgawk', 'pidof', 'ping', 'pr', 'procmail', 'prune', 'ps', 'pstree',
+            'ps2ascii', 'ps2epsi', 'ps2frag', 'ps2pdf', 'ps2ps', 'psbook',
+            'psmerge', 'psnup', 'psresize', 'psselect', 'pstops',
+
+            'rbash', 'rcs', 'rcs2log', 'read', 'readlink', 'red', 'resizecons',
+            'rev', 'rm', 'rmdir', 'rsh', 'run-parts',
+
+            'sash', 'scp', 'screen', 'sed', 'seq', 'sendmail', 'setfont',
+            'setkeycodes', 'setleds', 'setmetamode', 'setserial', 'setterm',
+            'sh', 'showkey', 'shred', 'size', 'size86', 'skill', 'sleep',
+            'slogin', 'snice', 'sort', 'sox', 'split', 'ssed', 'ssh', 'ssh-add',
+            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'stat', 'strace',
+            'strings', 'strip', 'stty', 'su', 'sudo', 'suidperl', 'sum', 'svn',
+            'svnadmin', 'svndumpfilter', 'svnlook', 'svnmerge', 'svnmucc',
+            'svnserve', 'svnshell', 'svnsync', 'svnversion', 'svnwrap', 'sync',
+
+            'tac', 'tail', 'tar', 'tee', 'tempfile', 'touch', 'tr', 'tree',
+            'true',
+
+            'umount', 'uname', 'unicode_start', 'unicode_stop', 'uniq',
+            'unlink', 'unzip', 'updatedb', 'updmap', 'uptime', 'users',
+            'utmpdump', 'uuidgen',
+
+            'valgrind', 'vdir', 'vi', 'vim', 'vmstat',
+
+            'w', 'wall', 'wc', 'wget', 'whatis', 'whereis', 'which', 'whiptail',
+            'who', 'whoami', 'write',
+
+            'xargs', 'xhost', 'xmodmap', 'xset',
+
+            'yacc', 'yes', 'ypdomainname',
+
+            'zcat', 'zcmp', 'zdiff', 'zdump', 'zegrep', 'zfgrep', 'zforce',
+            'zgrep', 'zip', 'zipgrep', 'zipinfo', 'zless', 'zmore', 'znew',
+            'zsh', 'zsoelim'
+            ),
+        3 => array(
+            'alias', 'bg', 'bind', 'break', 'builtin', 'cd', 'command',
+            'compgen', 'complete', 'continue', 'declare', 'dirs', 'disown',
+            'echo', 'enable', 'eval', 'exec', 'exit', 'export', 'fc',
+            'fg', 'getopts', 'hash', 'help', 'history', 'jobs', 'let',
+            'local', 'logout', 'popd', 'printf', 'pushd', 'pwd', 'readonly',
+            'return', 'shift', 'shopt', 'source', 'suspend', 'test', 'times',
+            'trap', 'type', 'typeset', 'ulimit', 'umask', 'unalias', 'unset',
+            'wait'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #c20cb9; font-weight: bold;',
+            3 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #800000;',
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;'
+            ),
+        'ESCAPE_CHAR' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #007800;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #007800;',
+            2 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #660033;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables (will be handled by comment_regexps)
+        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
+        //Variables without braces
+        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
+        //Variable assignment
+        2 => "(?<![\.a-zA-Z_\-])([a-zA-Z_][a-zA-Z0-9_]*?)(?==)",
+        //Shorthand shell variables
+        4 => "\\$[*#\$\\-\\?!]",
+        //Parameters of commands
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|$)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#])",
+            'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%\\/])"
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/basic4gl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/basic4gl.php
new file mode 100644
index 000000000..5e3330930
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/basic4gl.php
@@ -0,0 +1,341 @@
+<?php
+/*************************************************************************************
+ * basic4gl.php
+ * ---------------------------------
+ * Author: Matthew Webb (bmatthew1@blueyonder.co.uk)
+ * Copyright: (c) 2004 Matthew Webb (http://matthew-4gl.wikispaces.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/09/15
+ *
+ * Basic4GL language file for GeSHi.
+ *
+ * You can find the Basic4GL Website at (http://www.basic4gl.net/)
+ *
+ * CHANGES
+ * -------
+ * 2007/09/17 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/09/17)
+ * -------------------------
+ * Make sure all the OpenGL and Basic4GL commands have been added and are complete.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Basic4GL',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+
+            // Navy Blue Bold Keywords
+
+            'true','rnd_max','m_pi','m_e','false','VK_ZOOM','VK_UP','VK_TAB','VK_SUBTRACT','VK_SPACE','VK_SNAPSHOT',
+            'VK_SHIFT','VK_SEPARATOR','VK_SELECT','VK_SCROLL','VK_RWIN','VK_RSHIFT','VK_RMENU','VK_RIGHT','VK_RETURN',
+            'VK_RCONTROL','VK_RBUTTON','VK_PROCESSKEY','VK_PRIOR','VK_PRINT','VK_PLAY','VK_PAUSE','VK_NUMPAD9','VK_NUMPAD8',
+            'VK_NUMPAD7','VK_NUMPAD6','VK_NUMPAD5','VK_NUMPAD4','VK_NUMPAD3','VK_NUMPAD2','VK_NUMPAD1','VK_NUMPAD0',
+            'VK_NUMLOCK','VK_NONCONVERT','VK_NEXT','VK_MULTIPLY','VK_MODECHANGE','VK_MENU','VK_MBUTTON','VK_LWIN',
+            'VK_LSHIFT','VK_LMENU','VK_LEFT','VK_LCONTROL','VK_LBUTTON','VK_KANJI','VK_KANA','VK_JUNJA','VK_INSERT',
+            'VK_HOME','VK_HELP','VK_HANJA','VK_HANGUL','VK_HANGEUL','VK_FINAL','VK_F9','VK_F8','VK_F7','VK_F6','VK_F5',
+            'VK_F4','VK_F3','VK_F24','VK_F23','VK_F22','VK_F21','VK_F20','VK_F2','VK_F19','VK_F18','VK_F17','VK_F16',
+            'VK_F15','VK_F14','VK_F13','VK_F12','VK_F11','VK_F10','VK_F1','VK_EXSEL','VK_EXECUTE','VK_ESCAPE','VK_EREOF',
+            'VK_END','VK_DOWN','VK_DIVIDE','VK_DELETE','VK_DECIMAL','VK_CRSEL','VK_CONVERT','VK_CONTROL','VK_CLEAR',
+            'VK_CAPITAL','VK_CANCEL','VK_BACK','VK_ATTN','VK_APPS','VK_ADD','VK_ACCEPT','TEXT_SIMPLE','TEXT_OVERLAID',
+            'TEXT_BUFFERED','SPR_TILEMAP','SPR_SPRITE','SPR_INVALID','MOUSE_RBUTTON','MOUSE_MBUTTON','MOUSE_LBUTTON',
+            'GL_ZOOM_Y','GL_ZOOM_X','GL_ZERO','GL_XOR','GL_WIN_swap_hint','GL_WIN_draw_range_elements','GL_VIEWPORT_BIT',
+            'GL_VIEWPORT','GL_VERTEX_ARRAY_TYPE_EXT','GL_VERTEX_ARRAY_TYPE','GL_VERTEX_ARRAY_STRIDE_EXT','GL_VERTEX_ARRAY_STRIDE',
+            'GL_VERTEX_ARRAY_SIZE_EXT','GL_VERTEX_ARRAY_SIZE','GL_VERTEX_ARRAY_POINTER_EXT','GL_VERTEX_ARRAY_POINTER',
+            'GL_VERTEX_ARRAY_EXT','GL_VERTEX_ARRAY_COUNT_EXT','GL_VERTEX_ARRAY','GL_VERSION_1_1','GL_VERSION','GL_VENDOR',
+            'GL_V3F','GL_V2F','GL_UNSIGNED_SHORT','GL_UNSIGNED_INT','GL_UNSIGNED_BYTE','GL_UNPACK_SWAP_BYTES','GL_UNPACK_SKIP_ROWS',
+            'GL_UNPACK_SKIP_PIXELS','GL_UNPACK_ROW_LENGTH','GL_UNPACK_LSB_FIRST','GL_UNPACK_ALIGNMENT','GL_TRUE','GL_TRIANGLE_STRIP',
+            'GL_TRIANGLE_FAN','GL_TRIANGLES','GL_TRANSFORM_BIT','GL_TEXTURE_WRAP_T','GL_TEXTURE_WRAP_S','GL_TEXTURE_WIDTH',
+            'GL_TEXTURE_STACK_DEPTH','GL_TEXTURE_RESIDENT','GL_TEXTURE_RED_SIZE','GL_TEXTURE_PRIORITY','GL_TEXTURE_MIN_FILTER',
+            'GL_TEXTURE_MATRIX','GL_TEXTURE_MAG_FILTER','GL_TEXTURE_LUMINANCE_SIZE','GL_TEXTURE_INTERNAL_FORMAT','GL_TEXTURE_INTENSITY_SIZE',
+            'GL_TEXTURE_HEIGHT','GL_TEXTURE_GREEN_SIZE','GL_TEXTURE_GEN_T','GL_TEXTURE_GEN_S','GL_TEXTURE_GEN_R','GL_TEXTURE_GEN_Q',
+            'GL_TEXTURE_GEN_MODE','GL_TEXTURE_ENV_MODE','GL_TEXTURE_ENV_COLOR','GL_TEXTURE_ENV','GL_TEXTURE_COORD_ARRAY_TYPE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_TYPE','GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','GL_TEXTURE_COORD_ARRAY_STRIDE','GL_TEXTURE_COORD_ARRAY_SIZE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_SIZE','GL_TEXTURE_COORD_ARRAY_POINTER_EXT','GL_TEXTURE_COORD_ARRAY_POINTER','GL_TEXTURE_COORD_ARRAY_EXT',
+            'GL_TEXTURE_COORD_ARRAY_COUNT_EXT','GL_TEXTURE_COORD_ARRAY','GL_TEXTURE_COMPONENTS','GL_TEXTURE_BORDER_COLOR','GL_TEXTURE_BORDER',
+            'GL_TEXTURE_BLUE_SIZE','GL_TEXTURE_BIT','GL_TEXTURE_BINDING_2D','GL_TEXTURE_BINDING_1D','GL_TEXTURE_ALPHA_SIZE',
+            'GL_TEXTURE_2D','GL_TEXTURE_1D','GL_TEXTURE9_ARB','GL_TEXTURE9','GL_TEXTURE8_ARB','GL_TEXTURE8','GL_TEXTURE7_ARB',
+            'GL_TEXTURE7','GL_TEXTURE6_ARB','GL_TEXTURE6','GL_TEXTURE5_ARB','GL_TEXTURE5','GL_TEXTURE4_ARB','GL_TEXTURE4',
+            'GL_TEXTURE3_ARB','GL_TEXTURE31_ARB','GL_TEXTURE31','GL_TEXTURE30_ARB','GL_TEXTURE30','GL_TEXTURE3','GL_TEXTURE2_ARB',
+            'GL_TEXTURE29_ARB','GL_TEXTURE29','GL_TEXTURE28_ARB','GL_TEXTURE28','GL_TEXTURE27_ARB','GL_TEXTURE27','GL_TEXTURE26_ARB',
+            'GL_TEXTURE26','GL_TEXTURE25_ARB','GL_TEXTURE25','GL_TEXTURE24_ARB','GL_TEXTURE24','GL_TEXTURE23_ARB','GL_TEXTURE23',
+            'GL_TEXTURE22_ARB','GL_TEXTURE22','GL_TEXTURE21_ARB','GL_TEXTURE21','GL_TEXTURE20_ARB','GL_TEXTURE20','GL_TEXTURE2',
+            'GL_TEXTURE1_ARB','GL_TEXTURE19_ARB','GL_TEXTURE19','GL_TEXTURE18_ARB','GL_TEXTURE18','GL_TEXTURE17_ARB',
+            'GL_TEXTURE17','GL_TEXTURE16_ARB','GL_TEXTURE16','GL_TEXTURE15_ARB','GL_TEXTURE15','GL_TEXTURE14_ARB','GL_TEXTURE14',
+            'GL_TEXTURE13_ARB','GL_TEXTURE13','GL_TEXTURE12_ARB','GL_TEXTURE12','GL_TEXTURE11_ARB','GL_TEXTURE11','GL_TEXTURE10_ARB',
+            'GL_TEXTURE10','GL_TEXTURE1','GL_TEXTURE0_ARB','GL_TEXTURE0','GL_TEXTURE','GL_T4F_V4F','GL_T4F_C4F_N3F_V4F','GL_T2F_V3F',
+            'GL_T2F_N3F_V3F','GL_T2F_C4UB_V3F','GL_T2F_C4F_N3F_V3F','GL_T2F_C3F_V3F','GL_T','GL_SUBPIXEL_BITS','GL_STEREO',
+            'GL_STENCIL_WRITEMASK','GL_STENCIL_VALUE_MASK','GL_STENCIL_TEST','GL_STENCIL_REF','GL_STENCIL_PASS_DEPTH_PASS',
+            'GL_STENCIL_PASS_DEPTH_FAIL','GL_STENCIL_INDEX','GL_STENCIL_FUNC','GL_STENCIL_FAIL','GL_STENCIL_CLEAR_VALUE',
+            'GL_STENCIL_BUFFER_BIT','GL_STENCIL_BITS','GL_STENCIL','GL_STACK_UNDERFLOW','GL_STACK_OVERFLOW','GL_SRC_COLOR',
+            'GL_SRC_ALPHA_SATURATE','GL_SRC_ALPHA','GL_SPOT_EXPONENT','GL_SPOT_DIRECTION','GL_SPOT_CUTOFF','GL_SPHERE_MAP',
+            'GL_SPECULAR','GL_SOURCE2_RGB_EXT','GL_SOURCE2_RGB','GL_SOURCE2_ALPHA_EXT','GL_SOURCE2_ALPHA','GL_SOURCE1_RGB_EXT',
+            'GL_SOURCE1_RGB','GL_SOURCE1_ALPHA_EXT','GL_SOURCE1_ALPHA','GL_SOURCE0_RGB_EXT','GL_SOURCE0_RGB','GL_SOURCE0_ALPHA_EXT',
+            'GL_SOURCE0_ALPHA','GL_SMOOTH','GL_SHORT','GL_SHININESS','GL_SHADE_MODEL','GL_SET','GL_SELECTION_BUFFER_SIZE',
+            'GL_SELECTION_BUFFER_POINTER','GL_SELECT','GL_SCISSOR_TEST','GL_SCISSOR_BOX','GL_SCISSOR_BIT','GL_S','GL_RIGHT',
+            'GL_RGB_SCALE_EXT','GL_RGB_SCALE','GL_RGBA_MODE','GL_RGBA8','GL_RGBA4','GL_RGBA2','GL_RGBA16','GL_RGBA12','GL_RGBA',
+            'GL_RGB8','GL_RGB5_A1','GL_RGB5','GL_RGB4','GL_RGB16','GL_RGB12','GL_RGB10_A2','GL_RGB10','GL_RGB','GL_RETURN',
+            'GL_REPLACE','GL_REPEAT','GL_RENDER_MODE','GL_RENDERER','GL_RENDER','GL_RED_SCALE','GL_RED_BITS','GL_RED_BIAS',
+            'GL_RED','GL_READ_BUFFER','GL_R3_G3_B2','GL_R','GL_QUAD_STRIP','GL_QUADS','GL_QUADRATIC_ATTENUATION','GL_Q',
+            'GL_PROXY_TEXTURE_2D','GL_PROXY_TEXTURE_1D','GL_PROJECTION_STACK_DEPTH','GL_PROJECTION_MATRIX','GL_PROJECTION',
+            'GL_PRIMARY_COLOR_EXT','GL_PRIMARY_COLOR','GL_PREVIOUS_EXT','GL_PREVIOUS','GL_POSITION','GL_POLYGON_TOKEN',
+            'GL_POLYGON_STIPPLE_BIT','GL_POLYGON_STIPPLE','GL_POLYGON_SMOOTH_HINT','GL_POLYGON_SMOOTH','GL_POLYGON_OFFSET_UNITS',
+            'GL_POLYGON_OFFSET_POINT','GL_POLYGON_OFFSET_LINE','GL_POLYGON_OFFSET_FILL','GL_POLYGON_OFFSET_FACTOR','GL_POLYGON_MODE',
+            'GL_POLYGON_BIT','GL_POLYGON','GL_POINT_TOKEN','GL_POINT_SMOOTH_HINT','GL_POINT_SMOOTH','GL_POINT_SIZE_RANGE',
+            'GL_POINT_SIZE_GRANULARITY','GL_POINT_SIZE','GL_POINT_BIT','GL_POINTS','GL_POINT','GL_PIXEL_MODE_BIT',
+            'GL_PIXEL_MAP_S_TO_S_SIZE','GL_PIXEL_MAP_S_TO_S','GL_PIXEL_MAP_R_TO_R_SIZE','GL_PIXEL_MAP_R_TO_R','GL_PIXEL_MAP_I_TO_R_SIZE',
+            'GL_PIXEL_MAP_I_TO_R','GL_PIXEL_MAP_I_TO_I_SIZE','GL_PIXEL_MAP_I_TO_I','GL_PIXEL_MAP_I_TO_G_SIZE','GL_PIXEL_MAP_I_TO_G',
+            'GL_PIXEL_MAP_I_TO_B_SIZE','GL_PIXEL_MAP_I_TO_B','GL_PIXEL_MAP_I_TO_A_SIZE','GL_PIXEL_MAP_I_TO_A','GL_PIXEL_MAP_G_TO_G_SIZE',
+            'GL_PIXEL_MAP_G_TO_G','GL_PIXEL_MAP_B_TO_B_SIZE','GL_PIXEL_MAP_B_TO_B','GL_PIXEL_MAP_A_TO_A_SIZE','GL_PIXEL_MAP_A_TO_A',
+            'GL_PHONG_WIN','GL_PHONG_HINT_WIN','GL_PERSPECTIVE_CORRECTION_HINT','GL_PASS_THROUGH_TOKEN','GL_PACK_SWAP_BYTES',
+            'GL_PACK_SKIP_ROWS','GL_PACK_SKIP_PIXELS','GL_PACK_ROW_LENGTH','GL_PACK_LSB_FIRST','GL_PACK_ALIGNMENT','GL_OUT_OF_MEMORY',
+            'GL_OR_REVERSE','GL_OR_INVERTED','GL_ORDER','GL_OR','GL_OPERAND2_RGB_EXT','GL_OPERAND2_RGB','GL_OPERAND2_ALPHA_EXT',
+            'GL_OPERAND2_ALPHA','GL_OPERAND1_RGB_EXT','GL_OPERAND1_RGB','GL_OPERAND1_ALPHA_EXT','GL_OPERAND1_ALPHA','GL_OPERAND0_RGB_EXT',
+            'GL_OPERAND0_RGB','GL_OPERAND0_ALPHA_EXT','GL_OPERAND0_ALPHA','GL_ONE_MINUS_SRC_COLOR','GL_ONE_MINUS_SRC_ALPHA',
+            'GL_ONE_MINUS_DST_COLOR','GL_ONE_MINUS_DST_ALPHA','GL_ONE','GL_OBJECT_PLANE','GL_OBJECT_LINEAR','GL_NO_ERROR',
+            'GL_NOTEQUAL','GL_NORMAL_ARRAY_TYPE_EXT','GL_NORMAL_ARRAY_TYPE','GL_NORMAL_ARRAY_STRIDE_EXT','GL_NORMAL_ARRAY_STRIDE',
+            'GL_NORMAL_ARRAY_POINTER_EXT','GL_NORMAL_ARRAY_POINTER','GL_NORMAL_ARRAY_EXT','GL_NORMAL_ARRAY_COUNT_EXT',
+            'GL_NORMAL_ARRAY','GL_NORMALIZE','GL_NOR','GL_NOOP','GL_NONE','GL_NICEST','GL_NEVER','GL_NEAREST_MIPMAP_NEAREST','GL_NEAREST_MIPMAP_LINEAR',
+            'GL_NEAREST','GL_NAND','GL_NAME_STACK_DEPTH','GL_N3F_V3F','GL_MULT','GL_MODULATE','GL_MODELVIEW_STACK_DEPTH','GL_MODELVIEW_MATRIX',
+            'GL_MODELVIEW','GL_MAX_VIEWPORT_DIMS','GL_MAX_TEXTURE_UNITS_ARB','GL_MAX_TEXTURE_UNITS','GL_MAX_TEXTURE_STACK_DEPTH',
+            'GL_MAX_TEXTURE_SIZE','GL_MAX_PROJECTION_STACK_DEPTH','GL_MAX_PIXEL_MAP_TABLE','GL_MAX_NAME_STACK_DEPTH','GL_MAX_MODELVIEW_STACK_DEPTH',
+            'GL_MAX_LIST_NESTING','GL_MAX_LIGHTS','GL_MAX_EVAL_ORDER','GL_MAX_ELEMENTS_VERTICES_WIN','GL_MAX_ELEMENTS_INDICES_WIN',
+            'GL_MAX_CLIP_PLANES','GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','GL_MAX_ATTRIB_STACK_DEPTH','GL_MATRIX_MODE','GL_MAP_STENCIL',
+            'GL_MAP_COLOR','GL_MAP2_VERTEX_4','GL_MAP2_VERTEX_3','GL_MAP2_TEXTURE_COORD_4','GL_MAP2_TEXTURE_COORD_3','GL_MAP2_TEXTURE_COORD_2',
+            'GL_MAP2_TEXTURE_COORD_1','GL_MAP2_NORMAL','GL_MAP2_INDEX','GL_MAP2_GRID_SEGMENTS','GL_MAP2_GRID_DOMAIN','GL_MAP2_COLOR_4',
+            'GL_MAP1_VERTEX_4','GL_MAP1_VERTEX_3','GL_MAP1_TEXTURE_COORD_4','GL_MAP1_TEXTURE_COORD_3','GL_MAP1_TEXTURE_COORD_2',
+            'GL_MAP1_TEXTURE_COORD_1','GL_MAP1_NORMAL','GL_MAP1_INDEX','GL_MAP1_GRID_SEGMENTS','GL_MAP1_GRID_DOMAIN',
+            'GL_MAP1_COLOR_4','GL_LUMINANCE_ALPHA','GL_LUMINANCE8_ALPHA8','GL_LUMINANCE8','GL_LUMINANCE6_ALPHA2','GL_LUMINANCE4_ALPHA4',
+            'GL_LUMINANCE4','GL_LUMINANCE16_ALPHA16','GL_LUMINANCE16','GL_LUMINANCE12_ALPHA4','GL_LUMINANCE12_ALPHA12','GL_LUMINANCE12',
+            'GL_LUMINANCE','GL_LOGIC_OP_MODE','GL_LOGIC_OP','GL_LOAD','GL_LIST_MODE','GL_LIST_INDEX','GL_LIST_BIT',
+            'GL_LIST_BASE','GL_LINE_WIDTH_RANGE','GL_LINE_WIDTH_GRANULARITY','GL_LINE_WIDTH','GL_LINE_TOKEN','GL_LINE_STRIP','GL_LINE_STIPPLE_REPEAT',
+            'GL_LINE_STIPPLE_PATTERN','GL_LINE_STIPPLE','GL_LINE_SMOOTH_HINT','GL_LINE_SMOOTH','GL_LINE_RESET_TOKEN','GL_LINE_LOOP',
+            'GL_LINE_BIT','GL_LINES','GL_LINEAR_MIPMAP_NEAREST','GL_LINEAR_MIPMAP_LINEAR','GL_LINEAR_ATTENUATION','GL_LINEAR',
+            'GL_LINE','GL_LIGHT_MODEL_TWO_SIDE','GL_LIGHT_MODEL_LOCAL_VIEWER','GL_LIGHT_MODEL_AMBIENT','GL_LIGHTING_BIT',
+            'GL_LIGHTING','GL_LIGHT7','GL_LIGHT6','GL_LIGHT5','GL_LIGHT4','GL_LIGHT3','GL_LIGHT2','GL_LIGHT1','GL_LIGHT0',
+            'GL_LESS','GL_LEQUAL','GL_LEFT','GL_KEEP','GL_INVERT','GL_INVALID_VALUE','GL_INVALID_OPERATION','GL_INVALID_ENUM','GL_INTERPOLATE_EXT',
+            'GL_INTERPOLATE','GL_INTENSITY8','GL_INTENSITY4','GL_INTENSITY16','GL_INTENSITY12','GL_INTENSITY','GL_INT',
+            'GL_INDEX_WRITEMASK','GL_INDEX_SHIFT','GL_INDEX_OFFSET','GL_INDEX_MODE','GL_INDEX_LOGIC_OP','GL_INDEX_CLEAR_VALUE','GL_INDEX_BITS',
+            'GL_INDEX_ARRAY_TYPE_EXT','GL_INDEX_ARRAY_TYPE','GL_INDEX_ARRAY_STRIDE_EXT','GL_INDEX_ARRAY_STRIDE','GL_INDEX_ARRAY_POINTER_EXT',
+            'GL_INDEX_ARRAY_POINTER','GL_INDEX_ARRAY_EXT','GL_INDEX_ARRAY_COUNT_EXT','GL_INDEX_ARRAY','GL_INCR','GL_HINT_BIT',
+            'GL_GREEN_SCALE','GL_GREEN_BITS','GL_GREEN_BIAS','GL_GREEN','GL_GREATER','GL_GEQUAL','GL_FRONT_RIGHT','GL_FRONT_LEFT',
+            'GL_FRONT_FACE','GL_FRONT_AND_BACK','GL_FRONT','GL_FOG_START','GL_FOG_SPECULAR_TEXTURE_WIN','GL_FOG_MODE','GL_FOG_INDEX',
+            'GL_FOG_HINT','GL_FOG_END','GL_FOG_DENSITY','GL_FOG_COLOR','GL_FOG_BIT','GL_FOG','GL_FLOAT','GL_FLAT','GL_FILL',
+            'GL_FEEDBACK_BUFFER_TYPE','GL_FEEDBACK_BUFFER_SIZE','GL_FEEDBACK_BUFFER_POINTER','GL_FEEDBACK','GL_FASTEST','GL_FALSE',
+            'GL_EYE_PLANE','GL_EYE_LINEAR','GL_EXT_vertex_array','GL_EXT_paletted_texture','GL_EXT_bgra','GL_EXTENSIONS','GL_EXP2',
+            'GL_EXP','GL_EVAL_BIT','GL_EQUIV','GL_EQUAL','GL_ENABLE_BIT','GL_EMISSION','GL_EDGE_FLAG_ARRAY_STRIDE_EXT','GL_EDGE_FLAG_ARRAY_STRIDE',
+            'GL_EDGE_FLAG_ARRAY_POINTER_EXT','GL_EDGE_FLAG_ARRAY_POINTER','GL_EDGE_FLAG_ARRAY_EXT','GL_EDGE_FLAG_ARRAY_COUNT_EXT','GL_EDGE_FLAG_ARRAY',
+            'GL_EDGE_FLAG','GL_DST_COLOR','GL_DST_ALPHA','GL_DRAW_PIXEL_TOKEN','GL_DRAW_BUFFER','GL_DOUBLE_EXT','GL_DOUBLEBUFFER',
+            'GL_DOUBLE','GL_DONT_CARE','GL_DOMAIN','GL_DITHER','GL_DIFFUSE','GL_DEPTH_WRITEMASK','GL_DEPTH_TEST','GL_DEPTH_SCALE',
+            'GL_DEPTH_RANGE','GL_DEPTH_FUNC','GL_DEPTH_COMPONENT','GL_DEPTH_CLEAR_VALUE','GL_DEPTH_BUFFER_BIT','GL_DEPTH_BITS',
+            'GL_DEPTH_BIAS','GL_DEPTH','GL_DECR','GL_DECAL','GL_CW','GL_CURRENT_TEXTURE_COORDS','GL_CURRENT_RASTER_TEXTURE_COORDS','GL_CURRENT_RASTER_POSITION_VALID',
+            'GL_CURRENT_RASTER_POSITION','GL_CURRENT_RASTER_INDEX','GL_CURRENT_RASTER_DISTANCE','GL_CURRENT_RASTER_COLOR','GL_CURRENT_NORMAL',
+            'GL_CURRENT_INDEX','GL_CURRENT_COLOR','GL_CURRENT_BIT','GL_CULL_FACE_MODE','GL_CULL_FACE','GL_COPY_PIXEL_TOKEN',
+            'GL_COPY_INVERTED','GL_COPY','GL_CONSTANT_EXT','GL_CONSTANT_ATTENUATION','GL_CONSTANT','GL_COMPILE_AND_EXECUTE','GL_COMPILE','GL_COMBINE_RGB_EXT',
+            'GL_COMBINE_RGB','GL_COMBINE_EXT','GL_COMBINE_ALPHA_EXT','GL_COMBINE_ALPHA','GL_COMBINE','GL_COLOR_WRITEMASK',
+            'GL_COLOR_TABLE_WIDTH_EXT','GL_COLOR_TABLE_RED_SIZE_EXT','GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','GL_COLOR_TABLE_INTENSITY_SIZE_EXT',
+            'GL_COLOR_TABLE_GREEN_SIZE_EXT','GL_COLOR_TABLE_FORMAT_EXT','GL_COLOR_TABLE_BLUE_SIZE_EXT','GL_COLOR_TABLE_ALPHA_SIZE_EXT',
+            'GL_COLOR_MATERIAL_PARAMETER','GL_COLOR_MATERIAL_FACE','GL_COLOR_MATERIAL','GL_COLOR_LOGIC_OP','GL_COLOR_INDEXES',
+            'GL_COLOR_INDEX8_EXT','GL_COLOR_INDEX4_EXT','GL_COLOR_INDEX2_EXT','GL_COLOR_INDEX1_EXT','GL_COLOR_INDEX16_EXT',
+            'GL_COLOR_INDEX12_EXT','GL_COLOR_INDEX','GL_COLOR_CLEAR_VALUE','GL_COLOR_BUFFER_BIT','GL_COLOR_ARRAY_TYPE_EXT',
+            'GL_COLOR_ARRAY_TYPE','GL_COLOR_ARRAY_STRIDE_EXT','GL_COLOR_ARRAY_STRIDE','GL_COLOR_ARRAY_SIZE_EXT','GL_COLOR_ARRAY_SIZE',
+            'GL_COLOR_ARRAY_POINTER_EXT','GL_COLOR_ARRAY_POINTER','GL_COLOR_ARRAY_EXT','GL_COLOR_ARRAY_COUNT_EXT','GL_COLOR_ARRAY',
+            'GL_COLOR','GL_COEFF','GL_CLIP_PLANE5','GL_CLIP_PLANE4','GL_CLIP_PLANE3','GL_CLIP_PLANE2','GL_CLIP_PLANE1','GL_CLIP_PLANE0',
+            'GL_CLIENT_VERTEX_ARRAY_BIT','GL_CLIENT_PIXEL_STORE_BIT','GL_CLIENT_ATTRIB_STACK_DEPTH','GL_CLIENT_ALL_ATTRIB_BITS',
+            'GL_CLIENT_ACTIVE_TEXTURE_ARB','GL_CLIENT_ACTIVE_TEXTURE','GL_CLEAR','GL_CLAMP','GL_CCW','GL_C4UB_V3F','GL_C4UB_V2F',
+            'GL_C4F_N3F_V3F','GL_C3F_V3F','GL_BYTE','GL_BLUE_SCALE','GL_BLUE_BITS','GL_BLUE_BIAS','GL_BLUE','GL_BLEND_SRC','GL_BLEND_DST',
+            'GL_BLEND','GL_BITMAP_TOKEN','GL_BITMAP','GL_BGR_EXT','GL_BGRA_EXT','GL_BACK_RIGHT','GL_BACK_LEFT','GL_BACK',
+            'GL_AUX_BUFFERS','GL_AUX3','GL_AUX2','GL_AUX1','GL_AUX0','GL_AUTO_NORMAL','GL_ATTRIB_STACK_DEPTH','GL_AND_REVERSE',
+            'GL_AND_INVERTED','GL_AND','GL_AMBIENT_AND_DIFFUSE','GL_AMBIENT','GL_ALWAYS','GL_ALPHA_TEST_REF','GL_ALPHA_TEST_FUNC',
+            'GL_ALPHA_TEST','GL_ALPHA_SCALE','GL_ALPHA_BITS','GL_ALPHA_BIAS','GL_ALPHA8','GL_ALPHA4','GL_ALPHA16','GL_ALPHA12',
+            'GL_ALPHA','GL_ALL_ATTRIB_BITS','GL_ADD_SIGNED_EXT','GL_ADD_SIGNED','GL_ADD','GL_ACTIVE_TEXTURE_ARB','GL_ACTIVE_TEXTURE',
+            'GL_ACCUM_RED_BITS','GL_ACCUM_GREEN_BITS','GL_ACCUM_CLEAR_VALUE','GL_ACCUM_BUFFER_BIT','GL_ACCUM_BLUE_BITS','GL_ACCUM_ALPHA_BITS',
+            'GL_ACCUM','GL_4_BYTES','GL_4D_COLOR_TEXTURE','GL_3_BYTES','GL_3D_COLOR_TEXTURE','GL_3D_COLOR','GL_3D','GL_2_BYTES',
+            'GL_2D','GLU_V_STEP','GLU_VERTEX','GLU_VERSION_1_2','GLU_VERSION_1_1','GLU_VERSION','GLU_U_STEP','GLU_UNKNOWN','GLU_TRUE',
+            'GLU_TESS_WINDING_RULE','GLU_TESS_WINDING_POSITIVE','GLU_TESS_WINDING_ODD','GLU_TESS_WINDING_NONZERO','GLU_TESS_WINDING_NEGATIVE',
+            'GLU_TESS_WINDING_ABS_GEQ_TWO','GLU_TESS_VERTEX_DATA','GLU_TESS_VERTEX','GLU_TESS_TOLERANCE','GLU_TESS_NEED_COMBINE_CALLBACK','GLU_TESS_MISSING_END_POLYGON',
+            'GLU_TESS_MISSING_END_CONTOUR','GLU_TESS_MISSING_BEGIN_POLYGON','GLU_TESS_MISSING_BEGIN_CONTOUR','GLU_TESS_ERROR_DATA',
+            'GLU_TESS_ERROR8','GLU_TESS_ERROR7','GLU_TESS_ERROR6','GLU_TESS_ERROR5','GLU_TESS_ERROR4','GLU_TESS_ERROR3','GLU_TESS_ERROR2',
+            'GLU_TESS_ERROR1','GLU_TESS_ERROR','GLU_TESS_END_DATA','GLU_TESS_END','GLU_TESS_EDGE_FLAG_DATA','GLU_TESS_EDGE_FLAG',
+            'GLU_TESS_COORD_TOO_LARGE','GLU_TESS_COMBINE_DATA','GLU_TESS_COMBINE','GLU_TESS_BOUNDARY_ONLY','GLU_TESS_BEGIN_DATA',
+            'GLU_TESS_BEGIN','GLU_SMOOTH','GLU_SILHOUETTE','GLU_SAMPLING_TOLERANCE','GLU_SAMPLING_METHOD','GLU_POINT','GLU_PATH_LENGTH',
+            'GLU_PARAMETRIC_TOLERANCE','GLU_PARAMETRIC_ERROR','GLU_OUT_OF_MEMORY','GLU_OUTSIDE','GLU_OUTLINE_POLYGON','GLU_OUTLINE_PATCH',
+            'GLU_NURBS_ERROR9','GLU_NURBS_ERROR8','GLU_NURBS_ERROR7','GLU_NURBS_ERROR6','GLU_NURBS_ERROR5','GLU_NURBS_ERROR4',
+            'GLU_NURBS_ERROR37','GLU_NURBS_ERROR36','GLU_NURBS_ERROR35','GLU_NURBS_ERROR34','GLU_NURBS_ERROR33','GLU_NURBS_ERROR32',
+            'GLU_NURBS_ERROR31','GLU_NURBS_ERROR30','GLU_NURBS_ERROR3','GLU_NURBS_ERROR29','GLU_NURBS_ERROR28','GLU_NURBS_ERROR27','GLU_NURBS_ERROR26',
+            'GLU_NURBS_ERROR25','GLU_NURBS_ERROR24','GLU_NURBS_ERROR23','GLU_NURBS_ERROR22','GLU_NURBS_ERROR21','GLU_NURBS_ERROR20',
+            'GLU_NURBS_ERROR2','GLU_NURBS_ERROR19','GLU_NURBS_ERROR18','GLU_NURBS_ERROR17','GLU_NURBS_ERROR16','GLU_NURBS_ERROR15','GLU_NURBS_ERROR14',
+            'GLU_NURBS_ERROR13','GLU_NURBS_ERROR12','GLU_NURBS_ERROR11','GLU_NURBS_ERROR10','GLU_NURBS_ERROR1','GLU_NONE',
+            'GLU_MAP1_TRIM_3','GLU_MAP1_TRIM_2','GLU_LINE','GLU_INVALID_VALUE','GLU_INVALID_ENUM','GLU_INTERIOR','GLU_INSIDE','GLU_INCOMPATIBLE_GL_VERSION',
+            'GLU_FLAT','GLU_FILL','GLU_FALSE','GLU_EXTERIOR','GLU_EXTENSIONS','GLU_ERROR','GLU_END','GLU_EDGE_FLAG','GLU_DOMAIN_DISTANCE',
+            'GLU_DISPLAY_MODE','GLU_CW','GLU_CULLING','GLU_CCW','GLU_BEGIN','GLU_AUTO_LOAD_MATRIX','CHANNEL_UNORDERED','CHANNEL_ORDERED',
+            'CHANNEL_MAX'
+            ),
+        2 => array(
+
+            // Red Lowercase Keywords
+
+            'WriteWord','WriteString','WriteReal','WriteLine','WriteInt','WriteFloat','WriteDouble','WriteChar','WriteByte',
+            'windowwidth','windowheight','waittimer','Vec4','Vec3','Vec2','val','UpdateJoystick','ucase$','Transpose','tickcount',
+            'textscroll','textrows','textmode','textcols','tanh','tand','tan','synctimercatchup','synctimer','swapbuffers',
+            'str$','stopsoundvoice','stopsounds','stopmusic','sqrt','sqr','sprzorder','spryvel','sprytiles','sprysize','spryrepeat',
+            'spryflip','sprycentre','spry','sprxvel','sprxtiles','sprxsize','sprxrepeat','sprxflip','sprxcentre','sprx',
+            'sprvisible','sprvel','sprtype','sprtop','sprspin','sprsolid','sprsetzorder','sprsetyvel','sprsetysize','sprsetyrepeat',
+            'sprsetyflip','sprsetycentre','sprsety','sprsetxvel','sprsetxsize','sprsetxrepeat','sprsetxflip','sprsetxcentre',
+            'sprsetx','sprsetvisible','sprsetvel','sprsettiles','sprsettextures','sprsettexture','sprsetspin','sprsetsolid',
+            'sprsetsize','sprsetscale','sprsetpos','sprsetparallax','sprsetframe','sprsetcolor','sprsetanimspeed','sprsetanimloop',
+            'sprsetangle','sprsetalpha','sprscale','sprright','sprpos','sprparallax','sprleft','spriteareawidth','spriteareaheight',
+            'sprframe','sprcolor','sprcameraz','sprcameray','sprcamerax','sprcamerasetz','sprcamerasety','sprcamerasetx',
+            'sprcamerasetpos','sprcamerasetfov','sprcamerasetangle','sprcamerapos','sprcamerafov','sprcameraangle',
+            'sprbottom','spranimspeed','spranimloop','spranimdone','sprangle','spralpha','spraddtextures','spraddtexture',
+            'sounderror','sleep','sind','sin','showcursor','sgn','settextscroll','setmusicvolume','SendMessage','Seek',
+            'scankeydown','RTInvert','rnd','right$','resizetext','resizespritearea','RejectConnection','ReceiveMessage','ReadWord',
+            'ReadText','ReadReal','ReadLine','ReadInt','ReadFloat','ReadDouble','ReadChar','ReadByte','randomize','printr',
+            'print','pow','playsound','playmusic','performancecounter','Orthonormalize','OpenFileWrite','OpenFileRead','Normalize',
+            'newtilemap','newsprite','NewServer','NewConnection','musicplaying','mouse_yd','mouse_y','mouse_xd','mouse_x',
+            'mouse_wheel','mouse_button','mid$','MessageSmoothed','MessageReliable','MessagePending','MessageChannel','maxtextureunits',
+            'MatrixZero','MatrixTranslate','MatrixScale','MatrixRotateZ','MatrixRotateY','MatrixRotateX','MatrixRotate','MatrixIdentity',
+            'MatrixCrossProduct','MatrixBasis','log','locate','loadtexture','loadsound','loadmipmaptexture','loadmipmapimagestrip',
+            'loadimagestrip','loadimage','Length','len','left$','lcase$','keydown','Joy_Y','Joy_X','Joy_Up','Joy_Right','Joy_Left',
+            'Joy_Keys','Joy_Down','Joy_Button','Joy_3','Joy_2','Joy_1','Joy_0','int','inscankey','input$','inkey$','inittimer',
+            'imagewidth','imagestripframes','imageheight','imageformat','imagedatatype','hidecursor','glViewport','glVertex4sv',
+            'glVertex4s','glVertex4iv','glVertex4i','glVertex4fv','glVertex4f','glVertex4dv','glVertex4d','glVertex3sv','glVertex3s',
+            'glVertex3iv','glVertex3i','glVertex3fv','glVertex3f','glVertex3dv','glVertex3d','glVertex2sv','glVertex2s','glVertex2iv',
+            'glVertex2i','glVertex2fv','glVertex2f','glVertex2dv','glVertex2d','gluPerspective','gluOrtho2D','gluLookAt',
+            'glubuild2dmipmaps','glTranslatef','glTranslated','gltexsubimage2d','glTexParameteriv','glTexParameteri',
+            'glTexParameterfv','glTexParameterf','glteximage2d','glTexGeniv','glTexGeni','glTexGenfv','glTexGenf','glTexGendv',
+            'glTexGend','glTexEnviv','glTexEnvi','glTexEnvfv','glTexEnvf','glTexCoord4sv','glTexCoord4s','glTexCoord4iv','glTexCoord4i',
+            'glTexCoord4fv','glTexCoord4f','glTexCoord4dv','glTexCoord4d','glTexCoord3sv','glTexCoord3s','glTexCoord3iv','glTexCoord3i',
+            'glTexCoord3fv','glTexCoord3f','glTexCoord3dv','glTexCoord3d','glTexCoord2sv','glTexCoord2s','glTexCoord2iv','glTexCoord2i',
+            'glTexCoord2fv','glTexCoord2f','glTexCoord2dv','glTexCoord2d','glTexCoord1sv','glTexCoord1s','glTexCoord1iv','glTexCoord1i','glTexCoord1fv',
+            'glTexCoord1f','glTexCoord1dv','glTexCoord1d','glStencilOp','glStencilMask','glStencilFunc','glShadeModel','glSelectBuffer',
+            'glScissor','glScalef','glScaled','glRotatef','glRotated','glRenderMode','glRectsv','glRects','glRectiv','glRecti',
+            'glRectfv','glRectf','glRectdv','glRectd','glReadBuffer','glRasterPos4sv','glRasterPos4s','glRasterPos4iv',
+            'glRasterPos4i','glRasterPos4fv','glRasterPos4f','glRasterPos4dv','glRasterPos4d','glRasterPos3sv','glRasterPos3s',
+            'glRasterPos3iv','glRasterPos3i','glRasterPos3fv','glRasterPos3f','glRasterPos3dv','glRasterPos3d','glRasterPos2sv',
+            'glRasterPos2s','glRasterPos2iv','glRasterPos2i','glRasterPos2fv','glRasterPos2f','glRasterPos2dv','glRasterPos2d',
+            'glPushName','glPushMatrix','glPushClientAttrib','glPushAttrib','glPrioritizeTextures','glPopName','glPopMatrix',
+            'glPopClientAttrib','glPopAttrib','glpolygonstipple','glPolygonOffset','glPolygonMode','glPointSize','glPixelZoom',
+            'glPixelTransferi','glPixelTransferf','glPixelStorei','glPixelStoref','glPassThrough','glOrtho','glNormal3sv','glNormal3s',
+            'glNormal3iv','glNormal3i','glNormal3fv','glNormal3f','glNormal3dv','glNormal3d','glNormal3bv','glNormal3b','glNewList',
+            'glMultMatrixf','glMultMatrixd','glmultitexcoord2f','glmultitexcoord2d','glMatrixMode','glMaterialiv','glMateriali',
+            'glMaterialfv','glMaterialf','glMapGrid2f','glMapGrid2d','glMapGrid1f','glMapGrid1d','glLogicOp','glLoadName','glLoadMatrixf',
+            'glLoadMatrixd','glLoadIdentity','glListBase','glLineWidth','glLineStipple','glLightModeliv','glLightModeli','glLightModelfv',
+            'glLightModelf','glLightiv','glLighti','glLightfv','glLightf','glIsTexture','glIsList','glIsEnabled','glInitNames',
+            'glIndexubv','glIndexub','glIndexsv','glIndexs','glIndexMask','glIndexiv','glIndexi','glIndexfv','glIndexf','glIndexdv',
+            'glIndexd','glHint','glGetTexParameteriv','glGetTexParameterfv','glGetTexLevelParameteriv','glGetTexLevelParameterfv',
+            'glGetTexGeniv','glGetTexGenfv','glGetTexGendv','glGetTexEnviv','glGetTexEnvfv','glgetstring','glgetpolygonstipple','glGetPixelMapuiv',
+            'glGetMaterialiv','glGetMaterialfv','glGetLightiv','glGetLightfv','glGetIntegerv','glGetFloatv',
+            'glGetError','glGetDoublev','glGetClipPlane','glGetBooleanv','glgentextures','glgentexture',
+            'glgenlists','glFrustum','glFrontFace','glFogiv','glFogi','glFogfv','glFogf','glFlush','glFinish','glFeedbackBuffer',
+            'glEvalPoint2','glEvalPoint1','glEvalMesh2','glEvalMesh1','glEvalCoord2fv','glEvalCoord2f','glEvalCoord2dv','glEvalCoord2d',
+            'glEvalCoord1fv','glEvalCoord1f','glEvalCoord1dv','glEvalCoord1d','glEndList','glEnd','glEnableClientState','glEnable',
+            'glEdgeFlagv','glEdgeFlag','glDrawBuffer','glDrawArrays','glDisableClientState','glDisable','glDepthRange','glDepthMask',
+            'glDepthFunc','gldeletetextures','gldeletetexture','gldeletelists','glCullFace','glCopyTexSubImage2D','glCopyTexSubImage1D',
+            'glCopyTexImage2D','glCopyTexImage1D','glColorMaterial','glColorMask','glColor4usv','glColor4us','glColor4uiv','glColor4ui',
+            'glColor4ubv','glColor4ub','glColor4sv','glColor4s','glColor4iv','glColor4i','glColor4fv','glColor4f','glColor4dv',
+            'glColor4d','glColor4bv','glColor4b','glColor3usv','glColor3us','glColor3uiv','glColor3ui','glColor3ubv','glColor3ub',
+            'glColor3sv','glColor3s','glColor3iv','glColor3i','glColor3fv','glColor3f','glColor3dv','glColor3d','glColor3bv',
+            'glColor3b','glClipPlane','glClearStencil','glClearIndex','glClearDepth','glClearColor','glClearAccum','glClear',
+            'glcalllists','glCallList','glBlendFunc','glBindTexture','glBegin','glArrayElement','glAreTexturesResident',
+            'glAlphaFunc','glactivetexture','glAccum','font','FindNextFile','FindFirstFile','FindClose','FileError',
+            'extensionsupported','exp','execute','EndOfFile','drawtext','divbyzero','Determinant','deletesprite','deletesound',
+            'DeleteServer','deleteimage','DeleteConnection','defaultfont','CrossProduct','cosd','cos','copysprite','ConnectionPending',
+            'ConnectionHandShaking','ConnectionConnected','ConnectionAddress','compilererrorline','compilererrorcol','compilererror',
+            'compilefile','compile','color','cls','CloseFile','clearregion','clearline','clearkeys','chr$','charat$','bindsprite',
+            'beep','atnd','atn2d','atn2','atn','atand','asc','argcount','arg','animatesprites','AcceptConnection','abs'
+            ),
+        3 => array(
+
+            // Blue Lowercase Keywords
+
+            'xor','while','wend','until','type','traditional_print','traditional','to','then','struc','string','step','single',
+            'run','return','reset','read','or','null','not','next','lor','loop','language','land','integer','input','if',
+            'goto','gosub','for','endstruc','endif','end','elseif','else','double','do','dim','data','const','basic4gl','as',
+            'and','alloc'
+            )
+
+        ),
+    'SYMBOLS' => array(
+        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']', '&', ';', ':', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #FF0000;',
+            3 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #657CC4; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bf.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bf.php
new file mode 100644
index 000000000..c4be922e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bf.php
@@ -0,0 +1,114 @@
+<?php
+/*************************************************************************************
+ * bf.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/10/31
+ *
+ * Brainfuck language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Brainfuck',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => '/[^\n+\-<>\[\]\.\,Y]+/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-'),
+        1 => array('[', ']'),
+        2 => array('<', '>'),
+        3 => array('.', ','),
+        4 => array('Y') //Brainfork Extension ;-)
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;',
+            1 => 'color: #660000;',
+            2 => 'color: #000066;',
+            3 => 'color: #660066;',
+            4 => 'color: #666600;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOW_BEFORE' => '',
+            'DISALLOW_AFTER' => ''
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/blitzbasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/blitzbasic.php
new file mode 100644
index 000000000..3ad5eabf0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/blitzbasic.php
@@ -0,0 +1,185 @@
+<?php
+/*************************************************************************************
+ * blitzbasic.php
+ * --------------
+ * Author: P�draig O`Connel (info@moonsword.info)
+ * Copyright: (c) 2005 P�draig O`Connel (http://moonsword.info)
+ * Release Version: 1.0.8.4
+ * Date Started: 16.10.2005
+ *
+ * BlitzBasic language file for GeSHi.
+ *
+ * It is a simple Basic dialect. Released for Games and Network Connections.
+ * In this Language File are all functions included (2D BB and 3D BB)
+ *
+ *
+ * CHANGES
+ * -------
+ * 2005/12/28 (1.0.1)
+ *   -  Remove unnecessary style index for regexps
+ * 2005/10/22 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/10/22)
+ * -------------------------
+ * * Sort out the Basic commands for splitting up.
+ * * To set up the right colors.
+ *      (the colors are ok, but not the correct ones)
+ * * Split to BlitzBasic 2D and BlitzBasic 3D.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'BlitzBasic',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'If','EndIf','ElseIf','Else If','Else','While','Wend','Return','Next','Include','End Type','End Select','End If','End Function','End','Select',
+            'Type','Forever','For','Or','And','AppTitle','Case','Goto','Gosub','Step','Stop','Int','Last','False','Then','To','True','Until','Float',
+            'String','Before','Not'
+            ),
+        2 => array(
+            // All Functions - 2D BB and 3D BB
+            'Xor','WriteString','WriteShort','WritePixelFast','WritePixel','WriteLine','WriteInt','WriteFloat','WriteFile','WriteBytes',
+            'WriteByte','Write','WaitTimer','WaitMouse','WaitKey','WaitJoy','VWait','Viewport',
+            'Upper','UpdateGamma','UnlockBuffer','UDPTimeouts','UDPStreamPort','UDPStreamIP','UDPMsgPort','UDPMsgIP',
+            'Trim','TotalVidMem','TileImage','TileBlock','TFormImage','TFormFilter','Text',
+            'TCPTimeouts','TCPStreamPort','TCPStreamIP','Tan','SystemProperty','StringWidth','StringHeight','Str','StopNetGame',
+            'StopChannel','StartNetGame','Sqr','SoundVolume','SoundPitch','SoundPan','Sin','Shr',
+            'ShowPointer','Shl','Sgn','SetGfxDriver','SetGamma','SetFont','SetEnv','SetBuffer','SendUDPMsg','SendNetMsg',
+            'SeekFile','SeedRnd','ScanLine','ScaleImage','SaveImage','SaveBuffer','Sar','RuntimeError','RSet',
+            'RotateImage','RndSeed','Rnd','Right','ResumeChannel','Restore','ResizeImage','ResizeBank','Replace',
+            'Repeat','RecvUDPMsg','RecvNetMsg','RectsOverlap','Rect','ReadString','ReadShort','ReadPixelFast','ReadPixel','ReadLine',
+            'ReadInt','ReadFloat','ReadFile','ReadDir','ReadBytes','ReadByte','ReadAvail','Read','Rand','Print',
+            'PokeShort','PokeInt','PokeFloat','PokeByte','Plot','PlaySound','PlayMusic','PlayCDTrack','Pi','PeekShort',
+            'PeekInt','PeekFloat','PeekByte','PauseChannel','Oval','Origin','OpenTCPStream','OpenMovie','OpenFile',
+            'Null','NextFile','New','NetPlayerName','NetPlayerLocal','NetMsgType','NetMsgTo','NetMsgFrom',
+            'NetMsgData','MovieWidth','MoviePlaying','MovieHeight','MoveMouse','MouseZSpeed','MouseZ','MouseYSpeed','MouseY','MouseXSpeed',
+            'MouseX','MouseHit','MouseDown','Mod','Millisecs','MidHandle','Mid','MaskImage','LSet','Lower',
+            'LoopSound','Log10','Log','LockBuffer','Locate','Local','LoadSound','LoadImage','LoadFont','LoadBuffer',
+            'LoadAnimImage','Line','Len','Left','KeyHit','KeyDown','JoyZDir','JoyZ','JoyYDir',
+            'JoyYaw','JoyY','JoyXDir','JoyX','JoyVDir','JoyV','JoyUDir','JoyU','JoyType','JoyRoll',
+            'JoyPitch','JoyHit','JoyHat','JoyDown','JoinNetGame','Instr','Insert','Input',
+            'ImageYHandle','ImageXHandle','ImageWidth','ImagesOverlap','ImagesCollide','ImageRectOverlap','ImageRectCollide','ImageHeight','ImageBuffer',
+            'HostNetGame','HostIP','HidePointer','Hex','HandleImage','GraphicsWidth','GraphicsHeight','GraphicsDepth','GraphicsBuffer','Graphics',
+            'GrabImage','Global','GFXModeWidth','GFXModeHeight','GfxModeExists','GFXModeDepth','GfxDriverName','GetMouse',
+            'GetKey','GetJoy','GetEnv','GetColor','GammaRed','GammaGreen','GammaBlue','Function','FrontBuffer','FreeTimer',
+            'FreeSound','FreeImage','FreeFont','FreeBank','FontWidth','FontHeight','FlushMouse','FlushKeys',
+            'FlushJoy','Floor','Flip','First','FileType','FileSize','FilePos','Field',
+            'Exp','Exit','ExecFile','Eof','EndGraphics','Each','DrawMovie','DrawImageRect','DrawImage','DrawBlockRect','DrawBlock',
+            'DottedIP','Dim','DeleteNetPlayer','DeleteFile','DeleteDir','Delete','Delay','Default','DebugLog','Data',
+            'CurrentTime','CurrentDir','CurrentDate','CreateUDPStream','CreateTimer','CreateTCPServer','CreateNetPlayer','CreateImage','CreateDir','CreateBank',
+            'CountHostIPs','CountGFXModes','CountGfxDrivers','Cos','CopyStream','CopyRect','CopyPixelFast','CopyPixel','CopyImage','CopyFile',
+            'CopyBank','Const','CommandLine','ColorRed','ColorGreen','ColorBlue','Color','ClsColor','Cls','CloseUDPStream',
+            'CloseTCPStream','CloseTCPServer','CloseMovie','CloseFile','CloseDir','Chr','ChannelVolume','ChannelPlaying','ChannelPitch','ChannelPan',
+            'ChangeDir','Ceil','CallDLL','Bin','BankSize','BackBuffer','AvailVidMem','AutoMidHandle',
+            'ATan2','ATan','ASin','Asc','After','ACos','AcceptTCPStream','Abs',
+            // 3D Commands
+            'Wireframe','Windowed3D','WBuffer','VertexZ','VertexY',
+            'VertexX','VertexW','VertexV','VertexU','VertexTexCoords','VertexRed','VertexNZ','VertexNY','VertexNX','VertexNormal',
+            'VertexGreen','VertexCoords','VertexColor','VertexBlue','VertexAlpha','VectorYaw','VectorPitch','UpdateWorld','UpdateNormals','TurnEntity',
+            'TrisRendered','TriangleVertex','TranslateEntity','TFormVector','TFormPoint','TFormNormal','TFormedZ','TFormedY','TFormedX','TextureWidth',
+            'TextureName','TextureHeight','TextureFilter','TextureCoords','TextureBuffer','TextureBlend','TerrainZ','TerrainY','TerrainX','TerrainSize',
+            'TerrainShading','TerrainHeight','TerrainDetail','SpriteViewMode','ShowEntity','SetCubeFace','SetAnimTime','SetAnimKey','ScaleTexture','ScaleSprite',
+            'ScaleMesh','ScaleEntity','RotateTexture','RotateSprite','RotateMesh','RotateEntity','ResetEntity','RenderWorld','ProjectedZ','ProjectedY',
+            'ProjectedX','PositionTexture','PositionMesh','PositionEntity','PointEntity','PickedZ','PickedY','PickedX','PickedTriangle','PickedTime',
+            'PickedSurface','PickedNZ','PickedNY','PickedNX','PickedEntity','PaintSurface','PaintMesh','PaintEntity','NameEntity','MoveEntity',
+            'ModifyTerrain','MeshWidth','MeshHeight','MeshesIntersect','MeshDepth','MD2AnimTime','MD2AnimLength','MD2Animating','LoadTexture','LoadTerrain',
+            'LoadSprite','LoadMesh','LoadMD2','LoaderMatrix','LoadBSP','LoadBrush','LoadAnimTexture','LoadAnimSeq','LoadAnimMesh','Load3DSound',
+            'LinePick','LightRange','LightMesh','LightConeAngles','LightColor','HWMultiTex','HideEntity','HandleSprite','Graphics3D','GfxMode3DExists',
+            'GfxMode3D','GfxDriverCaps3D','GfxDriver3D','GetSurfaceBrush','GetSurface','GetParent','GetMatElement','GetEntityType','GetEntityBrush','GetChild',
+            'GetBrushTexture','FreeTexture','FreeEntity','FreeBrush','FlipMesh','FitMesh','FindSurface','FindChild','ExtractAnimSeq','EntityZ',
+            'EntityYaw','EntityY','EntityX','EntityVisible','EntityType','EntityTexture','EntityShininess','EntityRoll','EntityRadius','EntityPitch',
+            'EntityPickMode','EntityPick','EntityParent','EntityOrder','EntityName','EntityInView','EntityFX','EntityDistance','EntityColor','EntityCollided',
+            'EntityBox','EntityBlend','EntityAutoFade','EntityAlpha','EmitSound','Dither','DeltaYaw','DeltaPitch','CreateTexture','CreateTerrain',
+            'CreateSurface','CreateSprite','CreateSphere','CreatePlane','CreatePivot','CreateMirror','CreateMesh','CreateListener','CreateLight','CreateCylinder',
+            'CreateCube','CreateCone','CreateCamera','CreateBrush','CountVertices','CountTriangles','CountSurfaces','CountGfxModes3D','CountCollisions','CountChildren',
+            'CopyMesh','CopyEntity','CollisionZ','CollisionY','CollisionX','CollisionTriangle','CollisionTime','CollisionSurface','Collisions','CollisionNZ',
+            'CollisionNY','CollisionNX','CollisionEntity','ClearWorld','ClearTextureFilters','ClearSurface','ClearCollisions','CaptureWorld','CameraZoom','CameraViewport',
+            'CameraRange','CameraProjMode','CameraProject','CameraPick','CameraFogRange','CameraFogMode','CameraFogColor','CameraClsMode','CameraClsColor','BSPLighting',
+            'BSPAmbientLight','BrushTexture','BrushShininess','BrushFX','BrushColor','BrushBlend','BrushAlpha','AntiAlias','AnimTime','AnimSeq',
+            'AnimLength','Animating','AnimateMD2','Animate','AmbientLight','AlignToVector','AddVertex','AddTriangle','AddMesh','AddAnimSeq',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #D9D100; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bnf.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bnf.php
new file mode 100644
index 000000000..0032acf48
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/bnf.php
@@ -0,0 +1,110 @@
+<?php
+/*************************************************************************************
+ * bnf.php
+ * --------
+ * Author: Rowan Rodrik van der Molen (rowan@bigsmoke.us)
+ * Copyright: (c) 2006 Rowan Rodrik van der Molen (http://www.bigsmoke.us/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/09/28
+ *
+ * BNF (Backus-Naur form) language file for GeSHi.
+ *
+ * See http://en.wikipedia.org/wiki/Backus-Naur_form for more info on BNF.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Removed superflicious regexps
+ * 2006/09/18 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/09/18)
+ * -------------------------
+ * * Nothing I can think of
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'bnf',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '::=', '|'
+    ),
+    'CASE_SENSITIVE' => array(
+        //GESHI_COMMENTS => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a00;',
+            1 => 'color: #a00;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight: bold;', // Unused
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007;',
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //terminal symbols
+        0 => array(
+            GESHI_SEARCH => '(&lt;)([^&]+?)(&gt;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/boo.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/boo.php
new file mode 100644
index 000000000..d555dd4a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/boo.php
@@ -0,0 +1,217 @@
+<?php
+/*************************************************************************************
+ * boo.php
+ * --------
+ * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
+ * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/09/10
+ *
+ * Boo language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/09/10 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2007/09/10)
+ * -------------------------
+ * Regular Expression Literal matching
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Boo',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", "'", '"""', '"'),
+    'HARDQUOTE' => array('"""', '"""'),
+    'HARDESCAPE' => array('\"""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//Namespace
+            'namespace', 'import', 'from'
+            ),
+        2 => array(//Jump
+            'yield', 'return', 'goto', 'continue', 'break'
+            ),
+        3 => array(//Conditional
+            'while', 'unless', 'then', 'in', 'if', 'for', 'else', 'elif'
+            ),
+        4 => array(//Property
+            'set', 'get'
+            ),
+        5 => array(//Exception
+            'try', 'raise', 'failure', 'except', 'ensure'
+            ),
+        6 => array(//Visibility
+            'public', 'private', 'protected', 'internal'
+            ),
+        7 => array(//Define
+            'struct', 'ref', 'of', 'interface', 'event', 'enum', 'do', 'destructor', 'def', 'constructor', 'class'
+            ),
+        8 => array(//Cast
+            'typeof', 'cast', 'as'
+            ),
+        9 => array(//BiMacro
+            'yieldAll', 'using', 'unchecked', 'rawArayIndexing', 'print', 'normalArrayIndexing', 'lock',
+            'debug', 'checked', 'assert'
+            ),
+        10 => array(//BiAttr
+            'required', 'property', 'meta', 'getter', 'default'
+            ),
+        11 => array(//BiFunc
+            'zip', 'shellp', 'shellm', 'shell', 'reversed', 'range', 'prompt',
+            'matrix', 'map', 'len', 'join', 'iterator', 'gets', 'enumerate', 'cat', 'array'
+            ),
+        12 => array(//HiFunc
+            '__switch__', '__initobj__', '__eval__', '__addressof__', 'quack'
+            ),
+        13 => array(//Primitive
+            'void', 'ushort', 'ulong', 'uint', 'true', 'timespan', 'string', 'single',
+            'short', 'sbyte', 'regex', 'object', 'null', 'long', 'int', 'false', 'duck',
+            'double', 'decimal', 'date', 'char', 'callable', 'byte', 'bool'
+            ),
+        14 => array(//Operator
+            'not', 'or', 'and', 'is', 'isa',
+            ),
+        15 => array(//Modifier
+            'virtual', 'transient', 'static', 'partial', 'override', 'final', 'abstract'
+            ),
+        16 => array(//Access
+            'super', 'self'
+            ),
+        17 => array(//Pass
+            'pass'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        11 => true,
+        12 => true,
+        13 => true,
+        14 => true,
+        15 => true,
+        16 => true,
+        17 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:green;font-weight:bold;',
+            2 => 'color:navy;',
+            3 => 'color:blue;font-weight:bold;',
+            4 => 'color:#8B4513;',
+            5 => 'color:teal;font-weight:bold;',
+            6 => 'color:blue;font-weight:bold;',
+            7 => 'color:blue;font-weight:bold;',
+            8 => 'color:blue;font-weight:bold;',
+            9 => 'color:maroon;',
+            10 => 'color:maroon;',
+            11 => 'color:purple;',
+            12 => 'color:#4B0082;',
+            13 => 'color:purple;font-weight:bold;',
+            14 => 'color:#008B8B;font-weight:bold;',
+            15 => 'color:brown;',
+            16 => 'color:black;font-weight:bold;',
+            17 => 'color:gray;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999999; font-style: italic;',
+            2 => 'color: #999999; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #0000FF; font-weight: bold;',
+            'HARD' => 'color: #0000FF; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;',
+            'HARD' => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            0 => 'color: 000000;',
+            1 => 'color: 000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            #0 => 'color: #0066ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => '.',
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        #0 => '%(@)?\/(?:(?(1)[^\/\\\\\r\n]+|[^\/\\\\\r\n \t]+)|\\\\[\/\\\\\w+()|.*?$^[\]{}\d])+\/%'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c.php
new file mode 100644
index 000000000..86f576ef6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c.php
@@ -0,0 +1,188 @@
+<?php
+/*************************************************************************************
+ * c.php
+ * -----
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Contributors:
+ *  - Jack Lloyd (lloyd@randombit.net)
+ *  - Michael Mol (mikemol@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/22 (1.0.8.3)
+ *   -  Made keywords case-sensitive.
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.4)
+ *   -  Added a couple of new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/02/08)
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore C more
+ *     to complete this rather bare language file
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            'printf', 'cout'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c_mac.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c_mac.php
new file mode 100644
index 000000000..46a3600fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/c_mac.php
@@ -0,0 +1,212 @@
+<?php
+/*************************************************************************************
+ * c_mac.php
+ * ---------
+ * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ * Copyright: (c) 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * C for Macs language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C (Mac)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            // Mac-specific constants:
+            'kCFAllocatorDefault'
+            ),
+        3 => array(
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'static', 'string', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            // Mac-specific types:
+            'CFArrayRef', 'CFDictionaryRef', 'CFMutableDictionaryRef', 'CFBundleRef', 'CFSetRef', 'CFStringRef',
+            'CFURLRef', 'CFLocaleRef', 'CFDateFormatterRef', 'CFNumberFormatterRef', 'CFPropertyListRef',
+            'CFTreeRef', 'CFWriteStreamRef', 'CFCharacterSetRef', 'CFMutableStringRef', 'CFNotificationRef',
+            'CFReadStreamRef', 'CFNull', 'CFAllocatorRef', 'CFBagRef', 'CFBinaryHeapRef',
+            'CFBitVectorRef', 'CFBooleanRef', 'CFDataRef', 'CFDateRef', 'CFMachPortRef', 'CFMessagePortRef',
+            'CFMutableArrayRef', 'CFMutableBagRef', 'CFMutableBitVectorRef', 'CFMutableCharacterSetRef',
+            'CFMutableDataRef', 'CFMutableSetRef', 'CFNumberRef', 'CFPlugInRef', 'CFPlugInInstanceRef',
+            'CFRunLoopRef', 'CFRunLoopObserverRef', 'CFRunLoopSourceRef', 'CFRunLoopTimerRef', 'CFSocketRef',
+            'CFTimeZoneRef', 'CFTypeRef', 'CFUserNotificationRef', 'CFUUIDRef', 'CFXMLNodeRef', 'CFXMLParserRef',
+            'CFXMLTreeRef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #00eeff;',
+            2 => 'color: #00eeff;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/caddcl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/caddcl.php
new file mode 100644
index 000000000..12e1d3b75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/caddcl.php
@@ -0,0 +1,126 @@
+<?php
+/*************************************************************************************
+ * caddcl.php
+ * ----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * CAD DCL (Dialog Control Language) language file for GeSHi.
+ *
+ * DCL for AutoCAD 12 or later and IntelliCAD all versions.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/1!/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CAD DCL',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'boxed_column','boxed_radio_column','boxed_radio_row','boxed_row',
+            'column','concatenation','button','dialog','edit_box','image','image_button',
+            'errtile','list_box','ok_cancel','ok_cancel_help','ok_cancel_help_errtile',
+            'ok_cancel_help_info','ok_only','paragraph','popup_list','radio_button',
+            'radio_column','radio_row','row','slider','spacer','spacer_0','spacer_1','text',
+            'text_part','toggle',
+            'action','alignment','allow_accept','aspect_ratio','big_increment',
+            'children_alignment','children_fixed_height',
+            'children_fixed_width','color',
+            'edit_limit','edit_width','fixed_height','fixed_width',
+            'height','initial_focus','is_cancel','is_default',
+            'is_enabled','is_tab_stop','is-bold','key','label','layout','list',
+            'max_value','min_value','mnemonic','multiple_select','password_char',
+            'small_increment','tabs','tab_truncate','value','width',
+            'false','true','left','right','centered','top','bottom',
+            'dialog_line','dialog_foreground','dialog_background',
+            'graphics_background','black','red','yellow','green','cyan',
+            'blue','magenta','whitegraphics_foreground',
+            'horizontal','vertical'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cadlisp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cadlisp.php
new file mode 100644
index 000000000..c537370d5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cadlisp.php
@@ -0,0 +1,186 @@
+<?php
+/*************************************************************************************
+ * cadlisp.php
+ * -----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/blog)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * AutoCAD/IntelliCAD Lisp language file for GeSHi.
+ *
+ * For AutoCAD V.12..2005 and IntelliCAD all versions.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CAD Lisp',
+    'COMMENT_SINGLE' => array(1 => ";"),
+    'COMMENT_MULTI' => array(";|" => "|;"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs','acad_colordlg','acad_helpdlg','acad_strlsort','action_tile',
+            'add_list','alert','alloc','and','angle','angtof','angtos','append','apply',
+            'arx','arxload','arxunload','ascii','assoc','atan','atof','atoi','atom',
+            'atoms-family','autoarxload','autoload','Boole','boundp','caddr',
+            'cadr','car','cdr','chr','client_data_tile','close','command','cond',
+            'cons','cos','cvunit','defun','defun-q','defun-q-list-ref',
+            'defun-q-list-set','dictadd','dictnext','dictremove','dictrename',
+            'dictsearch','dimx_tile','dimy_tile','distance','distof','done_dialog',
+            'end_image','end_list','entdel','entget','entlast','entmake',
+            'entmakex','entmod','entnext','entsel','entupd','eq','equal','eval','exit',
+            'exp','expand','expt','fill_image','findfile','fix','float','foreach','function',
+            'gc','gcd','get_attr','get_tile','getangle','getcfg','getcname','getcorner',
+            'getdist','getenv','getfiled','getint','getkword','getorient','getpoint',
+            'getreal','getstring','getvar','graphscr','grclear','grdraw','grread','grtext',
+            'grvecs','handent','help','if','initdia','initget','inters','itoa','lambda','last',
+            'layoutlist','length','list','listp','load','load_dialog','log','logand','logior',
+            'lsh','mapcar','max','mem','member','menucmd','menugroup','min','minusp','mode_tile',
+            'namedobjdict','nentsel','nentselp','new_dialog','nil','not','nth','null',
+            'numberp','open','or','osnap','polar','prin1','princ','print','progn','prompt',
+            'quit','quote','read','read-char','read-line','redraw','regapp','rem','repeat',
+            'reverse','rtos','set','set_tile','setcfg','setenv','setfunhelp','setq','setvar',
+            'setview','sin','slide_image','snvalid','sqrt','ssadd','ssdel','ssget','ssgetfirst',
+            'sslength','ssmemb','ssname','ssnamex','sssetfirst','start_dialog','start_image',
+            'start_list','startapp','strcase','strcat','strlen','subst','substr','t','tablet',
+            'tblnext','tblobjname','tblsearch','term_dialog','terpri','textbox','textpage',
+            'textscr','trace','trans','type','unload_dialog','untrace','vector_image','ver',
+            'vports','wcmatch','while','write-char','write-line','xdroom','xdsize','zerop',
+            'vl-acad-defun','vl-acad-undefun','vl-arx-import','vlax-3D-point',
+            'vlax-add-cmd','vlax-create-object','vlax-curve-getArea',
+            'vlax-curve-getClosestPointTo','vlax-curve-getClosestPointToProjection',
+            'vlax-curve-getDistAtParam','vlax-curve-getDistAtPoint',
+            'vlax-curve-getEndParam','vlax-curve-getEndPoint',
+            'vlax-curve-getFirstDeriv','vlax-curve-getParamAtDist',
+            'vlax-curve-getParamAtPoint','vlax-curve-getPointAtDist',
+            'vlax-curve-getPointAtParam','vlax-curve-getSecondDeriv',
+            'vlax-curve-getStartParam','vlax-curve-getStartPoint',
+            'vlax-curve-isClosed','vlax-curve-isPeriodic','vlax-curve-isPlanar',
+            'vlax-dump-object','vlax-erased-p','vlax-for','vlax-get-acad-object',
+            'vlax-get-object','vlax-get-or-create-object','vlax-get-property',
+            'vlax-import-type-library','vlax-invoke-method','vlax-ldata-delete',
+            'vlax-ldata-get','vlax-ldata-list','vlax-ldata-put','vlax-ldata-test',
+            'vlax-make-safearray','vlax-make-variant','vlax-map-collection',
+            'vlax-method-applicable-p','vlax-object-released-p','vlax-product-key',
+            'vlax-property-available-p','vlax-put-property','vlax-read-enabled-p',
+            'vlax-release-object','vlax-remove-cmd','vlax-safearray-fill',
+            'vlax-safearray-get-dim','vlax-safearray-get-element',
+            'vlax-safearray-get-l-bound','vlax-safearray-get-u-bound',
+            'vlax-safearray-put-element','vlax-safearray-type','vlax-tmatrix',
+            'vlax-typeinfo-available-p','vlax-variant-change-type',
+            'vlax-variant-type','vlax-variant-value','vlax-write-enabled-p',
+            'vl-bb-ref','vl-bb-set','vl-catch-all-apply','vl-catch-all-error-message',
+            'vl-catch-all-error-p','vl-cmdf','vl-consp','vl-directory-files','vl-doc-export',
+            'vl-doc-import','vl-doc-ref','vl-doc-set','vl-every','vl-exit-with-error',
+            'vl-exit-with-value','vl-file-copy','vl-file-delete','vl-file-directory-p',
+            'vl-filename-base','vl-filename-directory','vl-filename-extension',
+            'vl-filename-mktemp','vl-file-rename','vl-file-size','vl-file-systime',
+            'vl-get-resource','vlisp-compile','vl-list-exported-functions',
+            'vl-list-length','vl-list-loaded-vlx','vl-load-all','vl-load-com',
+            'vl-load-reactors','vl-member-if','vl-member-if-not','vl-position',
+            'vl-prin1-to-string','vl-princ-to-string','vl-propagate','vlr-acdb-reactor',
+            'vlr-add','vlr-added-p','vlr-beep-reaction','vlr-command-reactor',
+            'vlr-current-reaction-name','vlr-data','vlr-data-set',
+            'vlr-deepclone-reactor','vlr-docmanager-reactor','vlr-dwg-reactor',
+            'vlr-dxf-reactor','vlr-editor-reactor','vl-registry-delete',
+            'vl-registry-descendents','vl-registry-read','vl-registry-write',
+            'vl-remove','vl-remove-if','vl-remove-if-not','vlr-insert-reactor',
+            'vlr-linker-reactor','vlr-lisp-reactor','vlr-miscellaneous-reactor',
+            'vlr-mouse-reactor','vlr-notification','vlr-object-reactor',
+            'vlr-owner-add','vlr-owner-remove','vlr-owners','vlr-pers','vlr-pers-list',
+            'vlr-pers-p','vlr-pers-release','vlr-reaction-names','vlr-reactions',
+            'vlr-reaction-set','vlr-reactors','vlr-remove','vlr-remove-all',
+            'vlr-set-notification','vlr-sysvar-reactor','vlr-toolbar-reactor',
+            'vlr-trace-reaction','vlr-type','vlr-types','vlr-undo-reactor',
+            'vlr-wblock-reactor','vlr-window-reactor','vlr-xref-reactor',
+            'vl-some','vl-sort','vl-sort-i','vl-string-elt','vl-string-left-trim',
+            'vl-string-mismatch','vl-string-position','vl-string-right-trim',
+            'vl-string-search','vl-string-subst','vl-string-translate','vl-string-trim',
+            'vl-symbol-name','vl-symbolp','vl-symbol-value','vl-unload-vlx','vl-vbaload',
+            'vl-vbarun','vl-vlx-loaded-p'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfdg.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfdg.php
new file mode 100644
index 000000000..5091ffa4c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfdg.php
@@ -0,0 +1,124 @@
+<?php
+/*************************************************************************************
+ * cfdg.php
+ * --------
+ * Author: John Horigan <john@glyphic.com>
+ * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/03/11
+ *
+ * CFDG language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/03/11 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/03/11)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CFDG',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'startshape', 'rule', 'background'
+            ),
+        2 => array(
+            'SQUARE', 'CIRCLE', 'TRIANGLE',
+            ),
+        3 => array(
+            'b','brightness','h','hue','sat','saturation',
+            'a','alpha','x','y','z','s','size',
+            'r','rotate','f','flip','skew','xml_set_object'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '*', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #717100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006666;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfm.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfm.php
new file mode 100644
index 000000000..ac81695ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cfm.php
@@ -0,0 +1,299 @@
+<?php
+/*************************************************************************************
+ * cfm.php
+ * -------
+ * Author: Diego
+ * Copyright: (c) 2006 Diego
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/02/25
+ *
+ * ColdFusion language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/02/25 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2006/02/25)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ColdFusion',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* CFM Tags */
+        1 => array(
+            'cfabort', 'cfapplet', 'cfapplication', 'cfargument', 'cfassociate',
+            'cfbreak', 'cfcache', 'cfcase', 'cfcatch', 'cfchart', 'cfchartdata',
+            'cfchartseries', 'cfcol', 'cfcollection', 'cfcomponent',
+            'cfcontent', 'cfcookie', 'cfdefaultcase', 'cfdirectory',
+            'cfdocument', 'cfdocumentitem', 'cfdocumentsection', 'cfdump',
+            'cfelse', 'cfelseif', 'cferror', 'cfexecute', 'cfexit', 'cffile',
+            'cfflush', 'cfform', 'cfformgroup', 'cfformitem', 'cfftp',
+            'cffunction', 'cfgrid', 'cfgridcolumn', 'cfgridrow', 'cfgridupdate',
+            'cfheader', 'cfhtmlhead', 'cfhttp', 'cfhttpparam', 'cfif',
+            'cfimport', 'cfinclude', 'cfindex', 'cfinput', 'cfinsert',
+            'cfinvoke', 'cfinvokeargument', 'cfldap', 'cflocation', 'cflock',
+            'cflog', 'cflogin', 'cfloginuser', 'cflogout', 'cfloop', 'cfmail',
+            'cfmailparam', 'cfmailpart', 'cfmodule', 'cfNTauthenticate',
+            'cfobject', 'cfobjectcache', 'cfoutput', 'cfparam', 'cfpop',
+            'cfprocessingdirective', 'cfprocparam',
+            'cfprocresult', 'cfproperty', 'cfquery', 'cfqueryparam',
+            'cfregistry', 'cfreport', 'cfreportparam', 'cfrethrow', 'cfreturn',
+            'cfsavecontent', 'cfschedule', 'cfscript', 'cfsearch', 'cfselect',
+            'cfset', 'cfsetting', 'cfsilent', 'cfstoredproc',
+            'cfswitch', 'cftable', 'cftextarea', 'cfthrow', 'cftimer',
+            'cftrace', 'cftransaction', 'cftree', 'cftreeitem', 'cftry',
+            'cfupdate', 'cfwddx'
+            ),
+        /* HTML Tags */
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        /* HTML attributes */
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            ),
+        /* CFM Script delimeters */
+        4 => array(
+            'var', 'function', 'while', 'if','else'
+            ),
+        /* CFM Functions */
+        5 => array(
+            'Abs', 'GetFunctionList', 'LSTimeFormat','ACos','GetGatewayHelper','LTrim','AddSOAPRequestHeader','GetHttpRequestData',
+            'Max','AddSOAPResponseHeader','GetHttpTimeString','Mid','ArrayAppend','GetLocale','Min','ArrayAvg','GetLocaleDisplayName',
+            'Minute','ArrayClear','GetMetaData','Month','ArrayDeleteAt','GetMetricData','MonthAsString','ArrayInsertAt','GetPageContext',
+            'Now','ArrayIsEmpty','GetProfileSections','NumberFormat','ArrayLen','GetProfileString','ParagraphFormat','ArrayMax',
+            'GetLocalHostIP','ParseDateTime','ArrayMin','GetSOAPRequest','Pi','ArrayNew','GetSOAPRequestHeader','PreserveSingleQuotes',
+            'ArrayPrepend','GetSOAPResponse','Quarter','ArrayResize','GetSOAPResponseHeader','QueryAddColumn','ArraySet',
+            'GetTempDirectory','QueryAddRow','ArraySort','QueryNew','ArraySum','GetTempFile','QuerySetCell',
+            'ArraySwap','GetTickCount','QuotedValueList','ArrayToList','GetTimeZoneInfo','Rand','Asc','GetToken','Randomize',
+            'ASin','Hash','RandRange','Atn','Hour','REFind','BinaryDecode','HTMLCodeFormat','REFindNoCase','BinaryEncode',
+            'HTMLEditFormat','ReleaseComObject','BitAnd','IIf','RemoveChars','BitMaskClear','IncrementValue','RepeatString',
+            'BitMaskRead','InputBaseN','Replace','BitMaskSet','Insert','ReplaceList','BitNot','Int','ReplaceNoCase','BitOr',
+            'IsArray','REReplace','BitSHLN','IsBinary','REReplaceNoCase','BitSHRN','IsBoolean','Reverse','BitXor','IsCustomFunction',
+            'Right','Ceiling','IsDate','RJustify','CharsetDecode','IsDebugMode','Round','CharsetEncode','IsDefined','RTrim',
+            'Chr','IsLeapYear','Second','CJustify','IsLocalHost','SendGatewayMessage','Compare','IsNumeric','SetEncoding',
+            'CompareNoCase','IsNumericDate','SetLocale','Cos','IsObject','SetProfileString','CreateDate','IsQuery','SetVariable',
+            'CreateDateTime','IsSimpleValue','Sgn','CreateObject','IsSOAPRequest','Sin','CreateODBCDate','IsStruct','SpanExcluding',
+            'CreateODBCDateTime','IsUserInRole','SpanIncluding','CreateODBCTime','IsValid','Sqr','CreateTime','IsWDDX','StripCR',
+            'CreateTimeSpan','IsXML','StructAppend','CreateUUID','IsXmlAttribute','StructClear','DateAdd','IsXmlDoc','StructCopy',
+            'DateCompare','IsXmlElem','StructCount','DateConvert','IsXmlNode','StructDelete','DateDiff','IsXmlRoot','StructFind',
+            'DateFormat','JavaCast','StructFindKey','DatePart','JSStringFormat','StructFindValue','Day','LCase','StructGet',
+            'DayOfWeek','Left','StructInsert','DayOfWeekAsString','Len','StructIsEmpty','DayOfYear','ListAppend','StructKeyArray',
+            'DaysInMonth','ListChangeDelims','StructKeyExists','DaysInYear','ListContains','StructKeyList','DE','ListContainsNoCase',
+            'StructNew','DecimalFormat','ListDeleteAt','StructSort','DecrementValue','ListFind','StructUpdate','Decrypt','ListFindNoCase',
+            'Tan','DecryptBinary','ListFirst','TimeFormat','DeleteClientVariable','ListGetAt','ToBase64','DirectoryExists',
+            'ListInsertAt','ToBinary','DollarFormat','ListLast','ToScript','Duplicate','ListLen','ToString','Encrypt','ListPrepend',
+            'Trim','EncryptBinary','ListQualify','UCase','Evaluate','ListRest','URLDecode','Exp','ListSetAt','URLEncodedFormat',
+            'ExpandPath','ListSort','URLSessionFormat','FileExists','ListToArray','Val','Find','ListValueCount','ValueList',
+            'FindNoCase','ListValueCountNoCase','Week','FindOneOf','LJustify','Wrap','FirstDayOfMonth','Log','WriteOutput',
+            'Fix','Log10','XmlChildPos','FormatBaseN','LSCurrencyFormat','XmlElemNew','GetAuthUser','LSDateFormat','XmlFormat',
+            'GetBaseTagData','LSEuroCurrencyFormat','XmlGetNodeType','GetBaseTagList','LSIsCurrency','XmlNew','GetBaseTemplatePath',
+            'LSIsDate','XmlParse','GetClientVariablesList','LSIsNumeric','XmlSearch','GetCurrentTemplatePath','LSNumberFormat',
+            'XmlTransform','GetDirectoryFromPath','LSParseCurrency','XmlValidate','GetEncoding','LSParseDateTime','Year',
+            'GetException','LSParseEuroCurrency','YesNoFormat','GetFileFromPath','LSParseNumber'
+            ),
+        /* CFM Attributes */
+        6 => array(
+            'dbtype','connectstring','datasource','username','password','query','delimeter','description','required','hint','default','access','from','to','list','index'
+            ),
+        7 => array(
+            'EQ', 'GT', 'LT', 'GTE', 'LTE', 'IS', 'LIKE', 'NEQ'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '{', '}', '(', ')', '[', ']', '<', '>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #0000FF;',
+            6 => 'color: #0000FF;',
+            7 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #808080; font-style: italic;',
+            1 => 'color: #00bbdd;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #000099;',
+            4 => 'color: #333333;',
+            5 => 'color: #333333;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<!--' => '-->'
+            ),
+        1 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        2 => "/(?!<#)(?:(?:##)*)(#)[a-zA-Z0-9_\.\(\)]+(#)/",
+        3 => array(
+            '<cfscript>' => '</cfscript>'
+            ),
+        4 => array(
+            '<' => '>'
+            ),
+        5 => '/((?!<!)<)(?:"[^"]*"|\'[^\']*\'|(?R)|[^">])+?(>)/si'
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+                ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                ),
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?<![a-zA-Z0-9\$_\|\#>&|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                )
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cil.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cil.php
new file mode 100644
index 000000000..994f86316
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cil.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * cil.php
+ * --------
+ * Author: Marcus Griep (neoeinstein+GeSHi@gmail.com)
+ * Copyright: (c) 2007 Marcus Griep (http://www.xpdm.us)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/10/24
+ *
+ * CIL (Common Intermediate Language) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/10/24 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2007/10/24)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CIL',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array(),
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//Dotted
+            '.zeroinit', '.vtfixup', '.vtentry', '.vtable', '.ver', '.try', '.subsystem', '.size', '.set', '.removeon',
+            '.publickeytoken', '.publickey', '.property', '.permissionset', '.permission', '.pdirect', '.param', '.pack',
+            '.override', '.other', '.namespace', '.mresource', '.module', '.method', '.maxstack', '.manifestres', '.locals',
+            '.localized', '.locale', '.line', '.language', '.import', '.imagebase', '.hash', '.get', '.fire', '.file', '.field',
+            '.export', '.event', '.entrypoint', '.emitbyte', '.data', '.custom', '.culture', '.ctor', '.corflags', '.class',
+            '.cctor', '.assembly', '.addon'
+            ),
+        2 => array(//Attributes
+            'wrapper', 'with', 'winapi', 'virtual', 'vector', 'vararg', 'value', 'userdefined', 'unused', 'unmanagedexp',
+            'unmanaged', 'unicode', 'to', 'tls', 'thiscall', 'synchronized', 'struct', 'strict', 'storage', 'stdcall',
+            'static', 'specialname', 'special', 'serializable', 'sequential', 'sealed', 'runtime', 'rtspecialname', 'request',
+            'reqsecobj', 'reqrefuse', 'reqopt', 'reqmin', 'record', 'public', 'privatescope', 'private', 'preservesig',
+            'prejitgrant', 'prejitdeny', 'platformapi', 'pinvokeimpl', 'pinned', 'permitonly', 'out', 'optil', 'opt',
+            'notserialized', 'notremotable', 'not_in_gc_heap', 'noprocess', 'noncaslinkdemand', 'noncasinheritance',
+            'noncasdemand', 'nometadata', 'nomangle', 'nomachine', 'noinlining', 'noappdomain', 'newslot', 'nested', 'native',
+            'modreq', 'modopt', 'marshal', 'managed', 'literal', 'linkcheck', 'lcid', 'lasterr', 'internalcall', 'interface',
+            'instance', 'initonly', 'init', 'inheritcheck', 'in', 'import', 'implicitres', 'implicitcom', 'implements',
+            'illegal', 'il', 'hidebysig', 'handler', 'fromunmanaged', 'forwardref', 'fixed', 'finally', 'final', 'filter',
+            'filetime', 'field', 'fault', 'fastcall', 'famorassem', 'family', 'famandassem', 'extern', 'extends', 'explicit',
+            'error', 'enum', 'endmac', 'deny', 'demand', 'default', 'custom', 'compilercontrolled', 'clsid', 'class', 'cil',
+            'cf', 'cdecl', 'catch', 'beforefieldinit', 'autochar', 'auto', 'at', 'assert', 'assembly', 'as', 'any', 'ansi',
+            'alignment', 'algorithm', 'abstract'
+            ),
+        3 => array(//Types
+            'wchar', 'void', 'variant', 'unsigned', 'valuetype', 'typedref', 'tbstr', 'sysstring', 'syschar', 'string',
+            'streamed_object', 'stream', 'stored_object', 'safearray', 'objectref', 'object', 'nullref', 'method', 'lpwstr',
+            'lpvoid', 'lptstr', 'lpstruct', 'lpstr', 'iunknown', 'int64', 'int32', 'int16', 'int8', 'int', 'idispatch',
+            'hresult', 'float64', 'float32', 'float', 'decimal', 'date', 'currency', 'char', 'carray', 'byvalstr',
+            'bytearray', 'boxed', 'bool', 'blob_object', 'blob', 'array'
+            ),
+        4 => array(//Prefix
+            'volatile', 'unaligned', 'tail', 'readonly', 'no', 'constrained'
+            ),
+        5 => array(//Suffix
+            'un', 'u8', 'u4', 'u2', 'u1', 'u', 's', 'ref', 'r8', 'r4', 'm1', 'i8', 'i4', 'i2', 'i1', 'i'#, '.8', '.7', '.6', '.5', '.4', '.3', '.2', '.1', '.0'
+            ),
+        6 => array(//Base
+            'xor', 'switch', 'sub', 'stloc',
+            'stind', 'starg',
+            'shr', 'shl', 'ret', 'rem', 'pop', 'or', 'not', 'nop', 'neg', 'mul',
+            'localloc', 'leave', 'ldnull', 'ldloca',
+            'ldloc', 'ldind', 'ldftn', 'ldc', 'ldarga',
+            'ldarg', 'jmp', 'initblk', 'endfinally', 'endfilter',
+            'endfault', 'dup', 'div', 'cpblk', 'conv', 'clt', 'ckfinite', 'cgt', 'ceq', 'calli',
+            'call', 'brzero', 'brtrue', 'brnull', 'brinst',
+            'brfalse', 'break', 'br', 'bne', 'blt', 'ble', 'bgt', 'bge', 'beq', 'arglist',
+            'and', 'add'
+            ),
+        7 => array(//Object
+            'unbox.any', 'unbox', 'throw', 'stsfld', 'stobj', 'stfld', 'stelem', 'sizeof', 'rethrow', 'refanyval', 'refanytype', 'newobj',
+            'newarr', 'mkrefany', 'ldvirtftn', 'ldtoken', 'ldstr', 'ldsflda', 'ldsfld', 'ldobj', 'ldlen', 'ldflda', 'ldfld',
+            'ldelema', 'ldelem', 'isinst', 'initobj', 'cpobj', 'castclass',
+            'callvirt', 'callmostderived', 'box'
+            ),
+        8 => array(//Other
+            'prefixref', 'prefix7', 'prefix6', 'prefix5', 'prefix4', 'prefix3', 'prefix2', 'prefix1', 'prefix0'
+            ),
+        9 => array(//Literal
+            'true', 'null', 'false'
+            ),
+        10 => array(//Comment-like
+            '#line', '^THE_END^'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:maroon;font-weight:bold;',
+            2 => 'color:blue;font-weight:bold;',
+            3 => 'color:purple;font-weight:bold;',
+            4 => 'color:teal;',
+            5 => 'color:blue;',
+            6 => 'color:blue;',
+            7 => 'color:blue;',
+            8 => 'color:blue;',
+            9 => 'color:00008B',
+            10 => 'color:gray'
+            ),
+        'COMMENTS' => array(
+            0 => 'color:gray;font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000033;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:blue;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => '(?<=ldc\\.i4\\.)[0-8]|(?<=(?:ldarg|ldloc|stloc)\\.)[0-3]' # Pickup the opcodes that end with integers
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cobol.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cobol.php
new file mode 100644
index 000000000..9adae16e3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cobol.php
@@ -0,0 +1,244 @@
+<?php
+/*************************************************************************************
+ * cobol.php
+ * ----------
+ * Author: BenBE (BenBE@omorphia.org)
+ * Copyright: (c) 2007-2008 BenBE (http://www.omorphia.de/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/07/02
+ *
+ * COBOL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO (updated 2007/07/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'COBOL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => '/^\*.*?$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array( //Compiler Directives
+            'ANSI', 'BLANK', 'NOBLANK', 'CALL-SHARED', 'CANCEL', 'NOCANCEL',
+            'CHECK', 'CODE', 'NOCODE', 'COLUMNS', 'COMPACT', 'NOCOMPACT',
+            'COMPILE', 'CONSULT', 'NOCONSULT', 'CROSSREF', 'NOCROSSREF',
+            'DIAGNOSE-74', 'NODIAGNOSE-74', 'DIAGNOSE-85', 'NODIAGNOSE-85',
+            'DIAGNOSEALL', 'NODIAGNOSEALL', 'ENDIF', 'ENDUNIT', 'ENV',
+            'ERRORFILE', 'ERRORS', 'FIPS', 'NOFIPS', 'FMAP', 'HEADING', 'HEAP',
+            'HIGHPIN', 'HIGHREQUESTERS', 'ICODE', 'NOICODE', 'IF', 'IFNOT',
+            'INNERLIST', 'NOINNERLIST', 'INSPECT', 'NOINSPECT', 'LARGEDATA',
+            'LD', 'LESS-CODE', 'LIBRARY', 'LINES', 'LIST', 'NOLIST', 'LMAP',
+            'NOLMAP', 'MAIN', 'MAP', 'NOMAP', 'NLD', 'NONSTOP', 'NON-SHARED',
+            'OPTIMIZE', 'PERFORM-TRACE', 'PORT', 'NOPORT', 'RESETTOG',
+            'RUNNABLE', 'RUNNAMED', 'SAVE', 'SAVEABEND', 'NOSAVEABEND',
+            'SEARCH', 'NOSEARCH', 'SECTION', 'SETTOG', 'SHARED', 'SHOWCOPY',
+            'NOSHOWCOPY', 'SHOWFILE', 'NOSHOWFILE', 'SOURCE', 'SQL', 'NOSQL',
+            'SQLMEM', 'SUBSET', 'SUBTYPE', 'SUPPRESS', 'NOSUPPRESS', 'SYMBOLS',
+            'NOSYMBOLS', 'SYNTAX', 'TANDEM', 'TRAP2', 'NOTRAP2', 'TRAP2-74',
+            'NOTRAP2-74', 'UL', 'WARN', 'NOWARN'
+            ),
+        2 => array( //Statement Keywords
+            'ACCEPT', 'ADD', 'TO', 'GIVING', 'CORRESPONDING', 'ALTER', 'CALL',
+            'CHECKPOINT', 'CLOSE', 'COMPUTE', 'CONTINUE', 'COPY',
+            'DELETE', 'DISPLAY', 'DIVIDE', 'INTO', 'REMAINDER', 'ENTER',
+            'COBOL', 'EVALUATE', 'EXIT', 'GO', 'INITIALIZE',
+            'TALLYING', 'REPLACING', 'CONVERTING', 'LOCKFILE', 'MERGE', 'MOVE',
+            'MULTIPLY', 'OPEN', 'PERFORM', 'TIMES',
+            'UNTIL', 'VARYING', 'RETURN',
+            ),
+        3 => array( //Reserved in some contexts
+            'ACCESS', 'ADDRESS', 'ADVANCING', 'AFTER', 'ALL',
+            'ALPHABET', 'ALPHABETIC', 'ALPHABETIC-LOWER', 'ALPHABETIC-UPPER',
+            'ALPHANUMERIC', 'ALPHANUMERIC-EDITED', 'ALSO', 'ALTERNATE',
+            'AND', 'ANY', 'APPROXIMATE', 'AREA', 'AREAS', 'ASCENDING', 'ASSIGN',
+            'AT', 'AUTHOR', 'BEFORE', 'BINARY', 'BLOCK', 'BOTTOM', 'BY',
+            'CD', 'CF', 'CH', 'CHARACTER', 'CHARACTERS',
+            'CHARACTER-SET', 'CLASS', 'CLOCK-UNITS',
+            'CODE-SET', 'COLLATING', 'COLUMN', 'COMMA',
+            'COMMON', 'COMMUNICATION', 'COMP', 'COMP-3', 'COMP-5',
+            'COMPUTATIONAL', 'COMPUTATIONAL-3', 'COMPUTATIONAL-5',
+            'CONFIGURATION', 'CONTAINS', 'CONTENT', 'CONTROL',
+            'CONTROLS', 'CORR', 'COUNT',
+            'CURRENCY', 'DATA', 'DATE', 'DATE-COMPILED', 'DATE-WRITTEN', 'DAY',
+            'DAY-OF-WEEK', 'DE', 'DEBUG-CONTENTS', 'DEBUG-ITEM', 'DEBUG-LINE',
+            'DEBUG-SUB-2', 'DEBUG-SUB-3', 'DEBUGGING', 'DECIMAL-POINT',
+            'DECLARATIVES', 'DEBUG-NAME', 'DEBUG-SUB-1', 'DELIMITED',
+            'DELIMITER', 'DEPENDING', 'DESCENDING', 'DESTINATION', 'DETAIL',
+            'DISABLE', 'DIVISION', 'DOWN', 'DUPLICATES',
+            'DYNAMIC', 'EGI', 'ELSE', 'EMI', 'ENABLE', 'END', 'END-ADD',
+            'END-COMPUTE', 'END-DELETE', 'END-DIVIDE', 'END-EVALUATE', 'END-IF',
+            'END-MULTIPLY', 'END-OF-PAGE', 'END-PERFORM', 'END-READ',
+            'END-RECEIVE', 'END-RETURN', 'END-REWRITE', 'END-SEARCH',
+            'END-START', 'END-STRING', 'END-SUBTRACT', 'END-UNSTRING',
+            'END-WRITE', 'EOP', 'EQUAL', 'ERROR', 'ESI',
+            'EVERY', 'EXCEPTION', 'EXCLUSIVE', 'EXTEND',
+            'EXTENDED-STORAGE', 'EXTERNAL', 'FALSE', 'FD', 'FILE',
+            'FILE-CONTROL', 'FILLER', 'FINAL', 'FIRST', 'FOOTING', 'FOR',
+            'FROM', 'FUNCTION', 'GENERATE', 'GENERIC', 'GLOBAL',
+            'GREATER', 'GROUP', 'GUARDIAN-ERR', 'HIGH-VALUE',
+            'HIGH-VALUES', 'I-O', 'I-O-CONTROL', 'IDENTIFICATION', 'IN',
+            'INDEX', 'INDEXED', 'INDICATE', 'INITIAL', 'INITIATE',
+            'INPUT', 'INPUT-OUTPUT', 'INSTALLATION',
+            'INVALID', 'IS', 'JUST', 'JUSTIFIED', 'KEY', 'LABEL', 'LAST',
+            'LEADING', 'LEFT', 'LESS', 'LIMIT', 'LIMITS', 'LINAGE',
+            'LINAGE-COUNTER', 'LINE', 'LINE-COUNTER', 'LINKAGE', 'LOCK',
+            'LOW-VALUE', 'LOW-VALUES', 'MEMORY', 'MESSAGE',
+            'MODE', 'MODULES', 'MULTIPLE', 'NATIVE',
+            'NEGATIVE', 'NEXT', 'NO', 'NOT', 'NULL', 'NULLS', 'NUMBER',
+            'NUMERIC', 'NUMERIC-EDITED', 'OBJECT-COMPUTER', 'OCCURS', 'OF',
+            'OFF', 'OMITTED', 'ON', 'OPTIONAL', 'OR', 'ORDER',
+            'ORGANIZATION', 'OTHER', 'OUTPUT', 'OVERFLOW', 'PACKED-DECIMAL',
+            'PADDING', 'PAGE', 'PAGE-COUNTER', 'PF', 'PH', 'PIC',
+            'PICTURE', 'PLUS', 'POINTER', 'POSITION', 'POSITIVE', 'PRINTING',
+            'PROCEDURE', 'PROCEDURES', 'PROCEED', 'PROGRAM', 'PROGRAM-ID',
+            'PROGRAM-STATUS', 'PROGRAM-STATUS-1', 'PROGRAM-STATUS-2', 'PROMPT',
+            'PROTECTED', 'PURGE', 'QUEUE', 'QUOTE', 'QUOTES', 'RD',
+            'RECEIVE', 'RECEIVE-CONTROL', 'RECORD', 'RECORDS',
+            'REDEFINES', 'REEL', 'REFERENCE', 'REFERENCES', 'RELATIVE',
+            'REMOVAL', 'RENAMES', 'REPLACE',
+            'REPLY', 'REPORT', 'REPORTING', 'REPORTS', 'RERUN',
+            'RESERVE', 'RESET', 'REVERSED', 'REWIND', 'REWRITE', 'RF',
+            'RH', 'RIGHT', 'ROUNDED', 'RUN', 'SAME', 'SD',
+            'SECURITY', 'SEGMENT', 'SEGMENT-LIMIT', 'SELECT', 'SEND',
+            'SENTENCE', 'SEPARATE', 'SEQUENCE', 'SEQUENTIAL', 'SET',
+            'SIGN', 'SIZE', 'SORT', 'SORT-MERGE', 'SOURCE-COMPUTER',
+            'SPACE', 'SPACES', 'SPECIAL-NAMES', 'STANDARD', 'STANDARD-1',
+            'STANDARD-2', 'START', 'STARTBACKUP', 'STATUS', 'STOP', 'STRING',
+            'SUB-QUEUE-1', 'SUB-QUEUE-2', 'SUB-QUEUE-3', 'SUBTRACT',
+            'SYMBOLIC', 'SYNC', 'SYNCDEPTH', 'SYNCHRONIZED',
+            'TABLE', 'TAL', 'TAPE', 'TERMINAL', 'TERMINATE', 'TEST',
+            'TEXT', 'THAN', 'THEN', 'THROUGH', 'THRU', 'TIME',
+            'TOP', 'TRAILING', 'TRUE', 'TYPE', 'UNIT', 'UNLOCK', 'UNLOCKFILE',
+            'UNLOCKRECORD', 'UNSTRING', 'UP', 'UPON', 'USAGE', 'USE',
+            'USING', 'VALUE', 'VALUES', 'WHEN', 'WITH', 'WORDS',
+            'WORKING-STORAGE', 'WRITE', 'ZERO', 'ZEROES'
+            ),
+        4 => array( //Standard functions
+            'ACOS', 'ANNUITY', 'ASIN', 'ATAN', 'CHAR', 'COS', 'CURRENT-DATE',
+            'DATE-OF-INTEGER', 'DAY-OF-INTEGER', 'FACTORIAL', 'INTEGER',
+            'INTEGER-OF-DATE', 'INTEGER-OF-DAY', 'INTEGER-PART', 'LENGTH',
+            'LOG', 'LOG10', 'LOWER-CASE', 'MAX', 'MEAN', 'MEDIAN', 'MIDRANGE',
+            'MIN', 'MOD', 'NUMVAL', 'NUMVAL-C', 'ORD', 'ORD-MAX', 'ORD-MIN',
+            'PRESENT-VALUE', 'RANDOM', 'RANGE', 'REM', 'REVERSE', 'SIN', 'SQRT',
+            'STANDARD-DEVIATION', 'SUM', 'TAN', 'UPPER-CASE', 'VARIANCE',
+            'WHEN-COMPILED'
+            ),
+        5 => array( //Privileged Built-in Functions
+            '#IN', '#OUT', '#TERM', '#TEMP', '#DYNAMIC', 'COBOL85^ARMTRAP',
+            'COBOL85^COMPLETION', 'COBOL_COMPLETION_', 'COBOL_CONTROL_',
+            'COBOL_GETENV_', 'COBOL_PUTENV_', 'COBOL85^RETURN^SORT^ERRORS',
+            'COBOL_RETURN_SORT_ERRORS_', 'COBOL85^REWIND^SEQUENTIAL',
+            'COBOL_REWIND_SEQUENTIAL_', 'COBOL85^SET^SORT^PARAM^TEXT',
+            'COBOL_SET_SORT_PARAM_TEXT_', 'COBOL85^SET^SORT^PARAM^VALUE',
+            'COBOL_SET_SORT_PARAM_VALUE_', 'COBOL_SET_MAX_RECORD_',
+            'COBOL_SETMODE_', 'COBOL85^SPECIAL^OPEN', 'COBOL_SPECIAL_OPEN_',
+            'COBOLASSIGN', 'COBOL_ASSIGN_', 'COBOLFILEINFO', 'COBOL_FILE_INFO_',
+            'COBOLSPOOLOPEN', 'CREATEPROCESS', 'ALTERPARAMTEXT',
+            'CHECKLOGICALNAME', 'CHECKMESSAGE', 'DELETEASSIGN', 'DELETEPARAM',
+            'DELETESTARTUP', 'GETASSIGNTEXT', 'GETASSIGNVALUE', 'GETBACKUPCPU',
+            'GETPARAMTEXT', 'GETSTARTUPTEXT', 'PUTASSIGNTEXT', 'PUTASSIGNVALUE',
+            'PUTPARAMTEXT', 'PUTSTARTUPTEXT'
+            )
+        ),
+    'SYMBOLS' => array(
+        //Avoid having - in identifiers marked as symbols
+        ' + ', ' - ', ' * ', ' / ', ' ** ',
+        '.', ',',
+        '=',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #008000; font-weight: bold;',
+            4 => 'color: #000080;',
+            5 => 'color: #008000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a0a0a0; font-style: italic;',
+            'MULTI' => 'color: #a0a0a0; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #993399;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+    );
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp-qt.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp-qt.php
new file mode 100644
index 000000000..43105de3d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp-qt.php
@@ -0,0 +1,315 @@
+<?php
+/*************************************************************************************
+ * cpp.php
+ * -------
+ * Author: Iulian M
+ * Copyright: (c) 2006 Iulian M
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/09/27
+ *
+ * C++ (with QT extensions) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C++ (QT)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
+            'switch', 'while', 'delete', 'new', 'this'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'wchar_t', 'typename', 'typeid', 'class' ,
+            'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            ),
+        5 => array(
+            'QAbstractButton','QDir','QIntValidator','QRegExpValidator','QTabWidget','QAbstractEventDispatcher',
+            'QDirectPainter','QIODevice','QRegion','QTcpServer','QAbstractExtensionFactory','QDirModel',
+            'QItemDelegate','QResizeEvent','QTcpSocket','QAbstractExtensionManager','QDockWidget',
+            'QItemEditorCreatorBase','QResource','QTemporaryFile','QAbstractFileEngine','QDomAttr',
+            'QItemEditorFactory','QRubberBand','QTestEventList','QAbstractFileEngineHandler','QDomCDATASection',
+            'QItemSelection','QScreen','QTextBlock','QAbstractFormBuilder','QDomCharacterData','QItemSelectionModel',
+            'QScreenCursor','QTextBlockFormat','QAbstractGraphicsShapeItem','QDomComment','QItemSelectionRange',
+            'QScreenDriverFactory','QTextBlockGroup','QAbstractItemDelegate','QDomDocument','QKbdDriverFactory',
+            'QScreenDriverPlugin','QTextBlockUserData','QAbstractItemModel','QDomDocumentFragment','QKbdDriverPlugin',
+            'QScrollArea','QTextBrowser','QAbstractItemView','QDomDocumentType','QKeyEvent','QScrollBar',
+            'QTextCharFormat','QAbstractListModel','QDomElement','QKeySequence','QSemaphore','QTextCodec',
+            'QAbstractPrintDialog','QDomEntity','QLabel','QSessionManager','QTextCodecPlugin','QAbstractProxyModel',
+            'QDomEntityReference','QLatin1Char','QSet','QTextCursor','QAbstractScrollArea','QDomImplementation',
+            'QLatin1String','QSetIterator','QTextDecoder','QAbstractSlider','QDomNamedNodeMap','QLayout','QSettings',
+            'QTextDocument','QAbstractSocket','QDomNode','QLayoutItem','QSharedData','QTextDocumentFragment',
+            'QAbstractSpinBox','QDomNodeList','QLCDNumber','QSharedDataPointer','QTextEdit','QAbstractTableModel',
+            'QDomNotation','QLibrary','QShortcut','QTextEncoder','QAbstractTextDocumentLayout',
+            'QDomProcessingInstruction','QLibraryInfo','QShortcutEvent','QTextFormat','QAccessible','QDomText',
+            'QLine','QShowEvent','QTextFragment','QAccessibleBridge','QDoubleSpinBox','QLinearGradient',
+            'QSignalMapper','QTextFrame','QAccessibleBridgePlugin','QDoubleValidator','QLineEdit','QSignalSpy',
+            'QTextFrameFormat','QAccessibleEvent','QDrag','QLineF','QSize','QTextImageFormat','QAccessibleInterface',
+            'QDragEnterEvent','QLinkedList','QSizeF','QTextInlineObject','QAccessibleObject','QDragLeaveEvent',
+            'QLinkedListIterator','QSizeGrip','QTextLayout','QAccessiblePlugin','QDragMoveEvent','QLinuxFbScreen',
+            'QSizePolicy','QTextLength','QAccessibleWidget','QDropEvent','QList','QSlider','QTextLine','QAction',
+            'QDynamicPropertyChangeEvent','QListIterator','QSocketNotifier','QTextList','QActionEvent','QErrorMessage',
+            'QListView','QSortFilterProxyModel','QTextListFormat','QActionGroup','QEvent','QListWidget','QSound',
+            'QTextObject','QApplication','QEventLoop','QListWidgetItem','QSpacerItem','QTextOption','QAssistantClient',
+            'QExtensionFactory','QLocale','QSpinBox','QTextStream','QAxAggregated','QExtensionManager',
+            'QMacPasteboardMime','QSplashScreen','QTextTable','QAxBase','QFile','QMacStyle','QSplitter',
+            'QTextTableCell','QAxBindable','QFileDialog','QMainWindow','QSplitterHandle','QTextTableFormat',
+            'QAxFactory','QFileIconProvider','QMap','QSqlDatabase','QThread','QAxObject','QFileInfo','QMapIterator',
+            'QSqlDriver','QThreadStorage','QAxScript','QFileOpenEvent','QMatrix','QSqlDriverCreator','QTime',
+            'QAxScriptEngine','QFileSystemWatcher','QMenu','QSqlDriverCreatorBase','QTimeEdit','QAxScriptManager',
+            'QFlag','QMenuBar','QSqlDriverPlugin','QTimeLine','QAxWidget','QFlags','QMessageBox','QSqlError','QTimer',
+            'QBasicTimer','QFocusEvent','QMetaClassInfo','QSqlField','QTimerEvent','QBitArray','QFocusFrame',
+            'QMetaEnum','QSqlIndex','QToolBar','QBitmap','QFont','QMetaMethod','QSqlQuery','QToolBox','QBoxLayout',
+            'QFontComboBox','QMetaObject','QSqlQueryModel','QToolButton','QBrush','QFontDatabase','QMetaProperty',
+            'QSqlRecord','QToolTip','QBuffer','QFontDialog','QMetaType','QSqlRelation','QTransformedScreen',
+            'QButtonGroup','QFontInfo','QMimeData','QSqlRelationalDelegate','QTranslator','QByteArray','QFontMetrics',
+            'QMimeSource','QSqlRelationalTableModel','QTreeView','QByteArrayMatcher','QFontMetricsF','QModelIndex',
+            'QSqlResult','QTreeWidget','QCache','QFormBuilder','QMotifStyle','QSqlTableModel','QTreeWidgetItem',
+            'QCalendarWidget','QFrame','QMouseDriverFactory','QStack','QTreeWidgetItemIterator','QCDEStyle',
+            'QFSFileEngine','QMouseDriverPlugin','QStackedLayout','QUdpSocket','QChar','QFtp','QMouseEvent',
+            'QStackedWidget','QUiLoader','QCheckBox','QGenericArgument','QMoveEvent','QStandardItem','QUndoCommand',
+            'QChildEvent','QGenericReturnArgument','QMovie','QStandardItemEditorCreator','QUndoGroup',
+            'QCleanlooksStyle','QGLColormap','QMultiHash','QStandardItemModel','QUndoStack','QClipboard',
+            'QGLContext','QMultiMap','QStatusBar','QUndoView','QCloseEvent','QGLFormat','QMutableHashIterator',
+            'QStatusTipEvent','QUrl','QColor','QGLFramebufferObject','QMutableLinkedListIterator','QString',
+            'QUrlInfo','QColorDialog','QGLPixelBuffer','QMutableListIterator','QStringList','QUuid','QColormap',
+            'QGLWidget','QMutableMapIterator','QStringListModel','QValidator','QComboBox','QGradient',
+            'QMutableSetIterator','QStringMatcher','QVariant','QCommonStyle','QGraphicsEllipseItem',
+            'QMutableVectorIterator','QStyle','QVarLengthArray','QCompleter','QGraphicsItem','QMutex',
+            'QStyleFactory','QVBoxLayout','QConicalGradient','QGraphicsItemAnimation','QMutexLocker',
+            'QStyleHintReturn','QVector','QContextMenuEvent','QGraphicsItemGroup','QNetworkAddressEntry',
+            'QStyleHintReturnMask','QVectorIterator','QCopChannel','QGraphicsLineItem','QNetworkInterface',
+            'QStyleOption','QVFbScreen','QCoreApplication','QGraphicsPathItem','QNetworkProxy','QStyleOptionButton',
+            'QVNCScreen','QCursor','QGraphicsPixmapItem','QObject','QStyleOptionComboBox','QWaitCondition',
+            'QCustomRasterPaintDevice','QGraphicsPolygonItem','QObjectCleanupHandler','QStyleOptionComplex',
+            'QWhatsThis','QDataStream','QGraphicsRectItem','QPageSetupDialog','QStyleOptionDockWidget',
+            'QWhatsThisClickedEvent','QDataWidgetMapper','QGraphicsScene','QPaintDevice','QStyleOptionFocusRect',
+            'QWheelEvent','QDate','QGraphicsSceneContextMenuEvent','QPaintEngine','QStyleOptionFrame','QWidget',
+            'QDateEdit','QGraphicsSceneEvent','QPaintEngineState','QStyleOptionFrameV2','QWidgetAction','QDateTime',
+            'QGraphicsSceneHoverEvent','QPainter','QStyleOptionGraphicsItem','QWidgetItem','QDateTimeEdit',
+            'QGraphicsSceneMouseEvent','QPainterPath','QStyleOptionGroupBox','QWindowsMime','QDBusAbstractAdaptor',
+            'QGraphicsSceneWheelEvent','QPainterPathStroker','QStyleOptionHeader','QWindowsStyle',
+            'QDBusAbstractInterface','QGraphicsSimpleTextItem','QPaintEvent','QStyleOptionMenuItem',
+            'QWindowStateChangeEvent','QDBusArgument','QGraphicsSvgItem','QPair','QStyleOptionProgressBar',
+            'QWindowsXPStyle','QDBusConnection','QGraphicsTextItem','QPalette','QStyleOptionProgressBarV2',
+            'QWorkspace','QDBusConnectionInterface','QGraphicsView','QPen','QStyleOptionQ3DockWindow','QWriteLocker',
+            'QDBusError','QGridLayout','QPersistentModelIndex','QStyleOptionQ3ListView','QWSCalibratedMouseHandler',
+            'QDBusInterface','QGroupBox','QPicture','QStyleOptionQ3ListViewItem','QWSClient','QDBusMessage','QHash',
+            'QPictureFormatPlugin','QStyleOptionRubberBand','QWSEmbedWidget','QDBusObjectPath','QHashIterator',
+            'QPictureIO','QStyleOptionSizeGrip','QWSEvent','QDBusReply','QHBoxLayout','QPixmap','QStyleOptionSlider',
+            'QWSInputMethod','QDBusServer','QHeaderView','QPixmapCache','QStyleOptionSpinBox','QWSKeyboardHandler',
+            'QDBusSignature','QHelpEvent','QPlastiqueStyle','QStyleOptionTab','QWSMouseHandler','QDBusVariant',
+            'QHideEvent','QPluginLoader','QStyleOptionTabBarBase','QWSPointerCalibrationData','QDecoration',
+            'QHostAddress','QPoint','QStyleOptionTabV2','QWSScreenSaver','QDecorationFactory','QHostInfo','QPointer',
+            'QStyleOptionTabWidgetFrame','QWSServer','QDecorationPlugin','QHoverEvent','QPointF','QStyleOptionTitleBar',
+            'QWSTslibMouseHandler','QDesignerActionEditorInterface','QHttp','QPolygon','QStyleOptionToolBar','QWSWindow',
+            'QDesignerContainerExtension','QHttpHeader','QPolygonF','QStyleOptionToolBox','QWSWindowSurface',
+            'QDesignerCustomWidgetCollectionInterface','QHttpRequestHeader','QPrintDialog','QStyleOptionToolButton',
+            'QX11EmbedContainer','QDesignerCustomWidgetInterface','QHttpResponseHeader','QPrintEngine',
+            'QStyleOptionViewItem','QX11EmbedWidget','QDesignerFormEditorInterface','QIcon','QPrinter',
+            'QStyleOptionViewItemV2','QX11Info','QDesignerFormWindowCursorInterface','QIconDragEvent','QProcess',
+            'QStylePainter','QXmlAttributes','QDesignerFormWindowInterface','QIconEngine','QProgressBar',
+            'QStylePlugin','QXmlContentHandler','QDesignerFormWindowManagerInterface','QIconEnginePlugin',
+            'QProgressDialog','QSvgRenderer','QXmlDeclHandler','QDesignerMemberSheetExtension','QImage',
+            'QProxyModel','QSvgWidget','QXmlDefaultHandler','QDesignerObjectInspectorInterface','QImageIOHandler',
+            'QPushButton','QSyntaxHighlighter','QXmlDTDHandler','QDesignerPropertyEditorInterface','QImageIOPlugin',
+            'QQueue','QSysInfo','QXmlEntityResolver','QDesignerPropertySheetExtension','QImageReader','QRadialGradient',
+            'QSystemLocale','QXmlErrorHandler','QDesignerTaskMenuExtension','QImageWriter','QRadioButton',
+            'QSystemTrayIcon','QXmlInputSource','QDesignerWidgetBoxInterface','QInputContext','QRasterPaintEngine',
+            'QTabBar','QXmlLexicalHandler','QDesktopServices','QInputContextFactory','QReadLocker','QTabletEvent',
+            'QXmlLocator','QDesktopWidget','QInputContextPlugin','QReadWriteLock','QTableView','QXmlNamespaceSupport',
+            'QDial','QInputDialog','QRect','QTableWidget','QXmlParseException','QDialog','QInputEvent','QRectF',
+            'QTableWidgetItem','QXmlReader','QDialogButtonBox','QInputMethodEvent','QRegExp',
+            'QTableWidgetSelectionRange','QXmlSimpleReader'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', ';', '|', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight:bold;',
+            2 => 'color: #0057AE;',
+            3 => 'color: #2B74C7;',
+            4 => 'color: #0057AE;',
+            5 => 'color: #22aadd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            2 => 'color: #006E28;',
+            'MULTI' => 'color: #888888; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #BF0303;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #B08000;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #2B74C7;',
+            2 => 'color: #2B74C7;',
+            3 => 'color: #2B74C7;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://doc.trolltech.com/latest/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::',
+        3 => '-&gt;',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        ),
+        'OOLANG' => array(
+            'MATCH_AFTER' => '~?[a-zA-Z][a-zA-Z0-9_]*',
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp.php
new file mode 100644
index 000000000..264ef638d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/cpp.php
@@ -0,0 +1,226 @@
+<?php
+/*************************************************************************************
+ * cpp.php
+ * -------
+ * Author: Dennis Bayer (Dennis.Bayer@mnifh-giessen.de)
+ * Contributors:
+ *  - M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ *  - Jack Lloyd (lloyd@randombit.net)
+ * Copyright: (c) 2004 Dennis Bayer, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/09/27
+ *
+ * C++ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/XX/XX (1.0.2)
+ *  -  Added several new keywords (Jack Lloyd)
+ * 2004/11/27 (1.0.1)
+ *  -  Added StdCLib function and constant names, changed color scheme to
+ *     a cleaner one. (M. Uli Kusterer)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C++',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'continue', 'default', 'do', 'else', 'for', 'goto', 'if', 'return',
+            'switch', 'throw', 'while'
+            ),
+        2 => array(
+            'NULL', 'false', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'wchar_t', 'typename', 'typeid', 'class'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-])"
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/csharp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/csharp.php
new file mode 100644
index 000000000..0f8a5e2a3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/csharp.php
@@ -0,0 +1,250 @@
+<?php
+/*************************************************************************************
+ * csharp.php
+ * ----------
+ * Author: Alan Juden (alan@judenware.org)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * C# language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/25 (1.0.7.22)
+ *   -  Added highlighting of using and namespace directives as non-OOP
+ * 2005/01/05 (1.0.1)
+ *  -  Used hardquote support for @"..." strings (Cliff Stanford)
+ * 2004/11/27 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'C#',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'auto', 'base', 'break', 'case', 'catch', 'const', 'continue',
+            'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
+            'finally', 'fixed', 'for', 'foreach', 'goto', 'if', 'implicit',
+            'in', 'internal', 'lock', 'namespace', 'null', 'operator', 'out',
+            'override', 'params', 'partial', 'private', 'protected', 'public',
+            'readonly', 'ref', 'return', 'sealed', 'stackalloc', 'static',
+            'switch', 'this', 'throw', 'true', 'try', 'unsafe', 'using',
+            'virtual', 'void', 'while'
+            ),
+        2 => array(
+            '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
+            '#line', '#region', '#undef', '#warning'
+            ),
+        3 => array(
+            'checked', 'is', 'new', 'sizeof', 'typeof', 'unchecked'
+            ),
+        4 => array(
+            'bool', 'byte', 'char', 'class', 'decimal', 'delegate', 'double',
+            'enum', 'float', 'int', 'interface', 'long', 'object', 'sbyte',
+            'short', 'string', 'struct', 'uint', 'ulong', 'ushort'
+            ),
+        5 => array(
+            'Microsoft.Win32',
+            'System',
+            'System.CodeDOM',
+            'System.CodeDOM.Compiler',
+            'System.Collections',
+            'System.Collections.Bases',
+            'System.ComponentModel',
+            'System.ComponentModel.Design',
+            'System.ComponentModel.Design.CodeModel',
+            'System.Configuration',
+            'System.Configuration.Assemblies',
+            'System.Configuration.Core',
+            'System.Configuration.Install',
+            'System.Configuration.Interceptors',
+            'System.Configuration.Schema',
+            'System.Configuration.Web',
+            'System.Core',
+            'System.Data',
+            'System.Data.ADO',
+            'System.Data.Design',
+            'System.Data.Internal',
+            'System.Data.SQL',
+            'System.Data.SQLTypes',
+            'System.Data.XML',
+            'System.Data.XML.DOM',
+            'System.Data.XML.XPath',
+            'System.Data.XML.XSLT',
+            'System.Diagnostics',
+            'System.Diagnostics.SymbolStore',
+            'System.DirectoryServices',
+            'System.Drawing',
+            'System.Drawing.Design',
+            'System.Drawing.Drawing2D',
+            'System.Drawing.Imaging',
+            'System.Drawing.Printing',
+            'System.Drawing.Text',
+            'System.Globalization',
+            'System.IO',
+            'System.IO.IsolatedStorage',
+            'System.Messaging',
+            'System.Net',
+            'System.Net.Sockets',
+            'System.NewXml',
+            'System.NewXml.XPath',
+            'System.NewXml.Xsl',
+            'System.Reflection',
+            'System.Reflection.Emit',
+            'System.Resources',
+            'System.Runtime.InteropServices',
+            'System.Runtime.InteropServices.Expando',
+            'System.Runtime.Remoting',
+            'System.Runtime.Serialization',
+            'System.Runtime.Serialization.Formatters',
+            'System.Runtime.Serialization.Formatters.Binary',
+            'System.Security',
+            'System.Security.Cryptography',
+            'System.Security.Cryptography.X509Certificates',
+            'System.Security.Permissions',
+            'System.Security.Policy',
+            'System.Security.Principal',
+            'System.ServiceProcess',
+            'System.Text',
+            'System.Text.RegularExpressions',
+            'System.Threading',
+            'System.Timers',
+            'System.Web',
+            'System.Web.Caching',
+            'System.Web.Configuration',
+            'System.Web.Security',
+            'System.Web.Services',
+            'System.Web.Services.Description',
+            'System.Web.Services.Discovery',
+            'System.Web.Services.Protocols',
+            'System.Web.UI',
+            'System.Web.UI.Design',
+            'System.Web.UI.Design.WebControls',
+            'System.Web.UI.Design.WebControls.ListControls',
+            'System.Web.UI.HtmlControls',
+            'System.Web.UI.WebControls',
+            'System.WinForms',
+            'System.WinForms.ComponentModel',
+            'System.WinForms.Design',
+            'System.Xml',
+            'System.Xml.Serialization',
+            'System.Xml.Serialization.Code',
+            'System.Xml.Serialization.Schema'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+            5 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/css.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/css.php
new file mode 100644
index 000000000..f6386bdc0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/css.php
@@ -0,0 +1,212 @@
+<?php
+/*************************************************************************************
+ * css.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/18
+ *
+ * CSS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Changed regexps to catch "-" symbols
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Improve or drop regexps for class/id/psuedoclass highlighting
+ * * Re-look at keywords - possibly to make several CSS language
+ *   files, all with different versions of CSS in them
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'CSS',
+    'COMMENT_SINGLE' => array(1 => '@'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\\()\\s*(?:(?:[a-z0-9]+?:\\/\\/)?[a-z0-9_\\-\\.\\/:]+?)?[a-z]+?\\.[a-z]+?(\\?[^\)]+?)?\\s*?(?=\\))/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'aqua', 'azimuth', 'background-attachment', 'background-color',
+            'background-image', 'background-position', 'background-repeat',
+            'background', 'black', 'blue', 'border-bottom-color',
+            'border-bottom-style', 'border-bottom-width', 'border-left-color',
+            'border-left-style', 'border-left-width', 'border-right',
+            'border-right-color', 'border-right-style', 'border-right-width',
+            'border-top-color', 'border-top-style',
+            'border-top-width','border-bottom', 'border-collapse',
+            'border-left', 'border-width', 'border-color', 'border-spacing',
+            'border-style', 'border-top', 'border', 'caption-side', 'clear',
+            'clip', 'color', 'content', 'counter-increment', 'counter-reset',
+            'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
+            'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+            'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
+            'font-weight', 'font', 'line-height', 'letter-spacing',
+            'list-style', 'list-style-image', 'list-style-position',
+            'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
+            'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
+            'max-width', 'min-height', 'min-width', 'orphans', 'outline',
+            'outline-color', 'outline-style', 'outline-width', 'overflow',
+            'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+            'padding', 'page', 'page-break-after', 'page-break-before',
+            'page-break-inside', 'pause-after', 'pause-before', 'pause',
+            'pitch', 'pitch-range', 'play-during', 'position', 'quotes',
+            'richness', 'right', 'size', 'speak-header', 'speak-numeral',
+            'speak-punctuation', 'speak', 'speech-rate', 'stress',
+            'table-layout', 'text-align', 'text-decoration', 'text-indent',
+            'text-shadow', 'text-transform', 'top', 'unicode-bidi',
+            'vertical-align', 'visibility', 'voice-family', 'volume',
+            'white-space', 'widows', 'width', 'word-spacing', 'z-index',
+            'bottom', 'left', 'height'
+            ),
+        2 => array(
+            'above', 'absolute', 'always', 'armenian', 'aural', 'auto',
+            'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
+            'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
+            'center-right', 'center', 'circle', 'cjk-ideographic',
+            'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
+            'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
+            'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+            'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
+            'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
+            'fixed', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
+            'hebrew', 'help', 'hidden', 'hide', 'higher', 'high',
+            'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table',
+            'inline', 'inset', 'inside', 'invert', 'italic', 'justify',
+            'katakana-iroha', 'katakana', 'landscape', 'larger', 'large',
+            'left-side', 'leftwards', 'level', 'lighter', 'lime',
+            'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek',
+            'lower-roman', 'lowercase', 'ltr', 'lower', 'low', 'maroon',
+            'medium', 'message-box', 'middle', 'mix', 'monospace', 'n-resize',
+            'narrower', 'navy', 'ne-resize', 'no-close-quote',
+            'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap',
+            'nw-resize', 'oblique', 'olive', 'once', 'open-quote', 'outset',
+            'outside', 'overline', 'pointer', 'portrait', 'purple', 'px',
+            'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
+            'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
+            'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
+            'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower',
+            'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
+            'spell-out', 'square', 'static', 'status-bar', 'super',
+            'sw-resize', 'table-caption', 'table-cell', 'table-column',
+            'table-column-group', 'table-footer-group', 'table-header-group',
+            'table-row', 'table-row-group', 'teal', 'text', 'text-bottom',
+            'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
+            'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
+            'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
+            'white', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
+            'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow',
+            'yes'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', ':', ';',
+        '>', '+', '*', ',', '^', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a1a100;',
+            2 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #cc00cc;',
+            1 => 'color: #6666ff;',
+            2 => 'color: #3333ff;',
+            3 => 'color: #933;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //DOM Node ID
+        0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
+        //CSS classname
+        1 => '\.(?!\d)[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*\b(?=[\{\.#\s,:].|<\|)',
+        //CSS Pseudo classes
+        //note: & is needed for &gt; (i.e. > )
+        2 => '(?<!\\\\):(?!\d)[a-zA-Z0-9\-]+\b(?:\s*(?=[\{\.#a-zA-Z,:+*&](.|\n)|<\|))',
+        //Measurements
+        3 => '[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\.])'
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/d.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/d.php
new file mode 100644
index 000000000..691091809
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/d.php
@@ -0,0 +1,272 @@
+<?php
+/*************************************************************************************
+ * d.php
+ * -----
+ * Author: Thomas Kuehne (thomas@kuehne.cn)
+ * Copyright: (c) 2005 Thomas Kuehne (http://thomas.kuehne.cn/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/04/22
+ *
+ * D language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/04/22 (0.0.2)
+ *  -  added _d_* and sizeof/ptrdiff_t
+ * 2005/04/20 (0.0.1)
+ *  -  First release
+ *
+ * TODO (updated 2005/04/22)
+ * -------------------------
+ * * nested comments
+ * * correct handling of r"" and ``
+ * * correct handling of ... and ..
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'D',
+    'COMMENT_SINGLE' => array(2 => '///', 1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // doxygen comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // raw strings
+        4 => '#r"[^"]*"#s',
+        // Script Style interpreter comment
+        5 => "/\A#!(?=\\/).*?$/m"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\'\"?\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{2}#",
+        //Hexadecimal Char Specs
+        3 => "#\\\\u[\da-fA-F]{4}#",
+        //Hexadecimal Char Specs
+        4 => "#\\\\U[\da-fA-F]{8}#",
+        //Octal Char Specs
+        5 => "#\\\\[0-7]{1,3}#",
+        //Named entity escapes
+        /*6 => "#\\\\&(?:quot|amp|lt|gt|OElig|oelig|Scaron|scaron|Yuml|circ|tilde|".
+            "ensp|emsp|thinsp|zwnj|zwj|lrm|rlm|ndash|mdash|lsquo|rsquo|sbquo|".
+            "ldquo|rdquo|bdquo|dagger|Dagger|permil|lsaquo|rsaquo|euro|nbsp|".
+            "iexcl|cent|pound|curren|yen|brvbar|sect|uml|copy|ordf|laquo|not|".
+            "shy|reg|macr|deg|plusmn|sup2|sup3|acute|micro|para|middot|cedil|".
+            "sup1|ordm|raquo|frac14|frac12|frac34|iquest|Agrave|Aacute|Acirc|".
+            "Atilde|Auml|Aring|AElig|Ccedil|Egrave|Eacute|Ecirc|Euml|Igrave|".
+            "Iacute|Icirc|Iuml|ETH|Ntilde|Ograve|Oacute|Ocirc|Otilde|Ouml|".
+            "times|Oslash|Ugrave|Uacute|Ucirc|Uuml|Yacute|THORN|szlig|agrave|".
+            "aacute|acirc|atilde|auml|aring|aelig|ccedil|egrave|eacute|ecirc|".
+            "euml|igrave|iacute|icirc|iuml|eth|ntilde|ograve|oacute|ocirc|".
+            "otilde|ouml|divide|oslash|ugrave|uacute|ucirc|uuml|yacute|thorn|".
+            "yuml|fnof|Alpha|Beta|Gamma|Delta|Epsilon|Zeta|Eta|Theta|Iota|".
+            "Kappa|Lambda|Mu|Nu|Xi|Omicron|Pi|Rho|Sigma|Tau|Upsilon|Phi|Chi|".
+            "Psi|Omega|alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|".
+            "kappa|lambda|mu|nu|xi|omicron|pi|rho|sigmaf|sigma|tau|upsilon|".
+            "phi|chi|psi|omega|thetasym|upsih|piv|bull|hellip|prime|Prime|".
+            "oline|frasl|weierp|image|real|trade|alefsym|larr|uarr|rarr|darr|".
+            "harr|crarr|lArr|uArr|rArr|dArr|hArr|forall|part|exist|empty|".
+            "nabla|isin|notin|ni|prod|sum|minus|lowast|radic|prop|infin|ang|".
+            "and|or|cap|cup|int|there4|sim|cong|asymp|ne|equiv|le|ge|sub|sup|".
+            "nsub|sube|supe|oplus|otimes|perp|sdot|lceil|rceil|lfloor|rfloor|".
+            "lang|rang|loz|spades|clubs|hearts|diams);#",*/
+        // optimized:
+        6 => "#\\\\&(?:A(?:Elig|acute|circ|grave|lpha|ring|tilde|uml)|Beta|".
+            "C(?:cedil|hi)|D(?:agger|elta)|E(?:TH|acute|circ|grave|psilon|ta|uml)|".
+            "Gamma|I(?:acute|circ|grave|ota|uml)|Kappa|Lambda|Mu|N(?:tilde|u)|".
+            "O(?:Elig|acute|circ|grave|m(?:ega|icron)|slash|tilde|uml)|".
+            "P(?:hi|i|rime|si)|Rho|S(?:caron|igma)|T(?:HORN|au|heta)|".
+            "U(?:acute|circ|grave|psilon|uml)|Xi|Y(?:acute|uml)|Zeta|".
+            "a(?:acute|c(?:irc|ute)|elig|grave|l(?:efsym|pha)|mp|n[dg]|ring|".
+            "symp|tilde|uml)|b(?:dquo|eta|rvbar|ull)|c(?:ap|cedil|e(?:dil|nt)|".
+            "hi|irc|lubs|o(?:ng|py)|rarr|u(?:p|rren))|d(?:Arr|a(?:gger|rr)|".
+            "e(?:g|lta)|i(?:ams|vide))|e(?:acute|circ|grave|m(?:pty|sp)|nsp|".
+            "psilon|quiv|t[ah]|u(?:ml|ro)|xist)|f(?:nof|orall|ra(?:c(?:1[24]|34)|sl))|".
+            "g(?:amma|e|t)|h(?:Arr|arr|e(?:arts|llip))|i(?:acute|circ|excl|grave|mage|".
+            "n(?:fin|t)|ota|quest|sin|uml)|kappa|l(?:Arr|a(?:mbda|ng|quo|rr)|ceil|".
+            "dquo|e|floor|o(?:wast|z)|rm|s(?:aquo|quo)|t)|m(?:acr|dash|".
+            "i(?:cro|ddot|nus)|u)|n(?:abla|bsp|dash|e|i|ot(?:in)?|sub|tilde|u)|".
+            "o(?:acute|circ|elig|grave|line|m(?:ega|icron)|plus|r(?:d[fm])?|".
+            "slash|ti(?:lde|mes)|uml)|p(?:ar[at]|er(?:mil|p)|hi|iv?|lusmn|ound|".
+            "r(?:ime|o[dp])|si)|quot|r(?:Arr|a(?:dic|ng|quo|rr)|ceil|dquo|e(?:al|g)|".
+            "floor|ho|lm|s(?:aquo|quo))|s(?:bquo|caron|dot|ect|hy|i(?:gmaf?|m)|".
+            "pades|u(?:be?|m|p[123e]?)|zlig)|t(?:au|h(?:e(?:re4|ta(?:sym)?)|insp|".
+            "orn)|i(?:lde|mes)|rade)|u(?:Arr|a(?:cute|rr)|circ|grave|ml|".
+            "psi(?:h|lon)|uml)|weierp|xi|y(?:acute|en|uml)|z(?:eta|w(?:j|nj)));#",
+        ),
+    'HARDQUOTE' => array('`', '`'),
+    'HARDESCAPE' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+                'break', 'case', 'continue', 'do', 'else',
+                'for', 'foreach', 'goto', 'if', 'return',
+                'switch', 'while'
+            ),
+        2 => array(
+                'alias', 'asm', 'assert', 'body', 'cast',
+                'catch', 'default', 'delegate', 'delete',
+                'extern', 'false', 'finally', 'function',
+                'import', 'in', 'inout', 'interface',
+                'invariant', 'is', 'mixin', 'module', 'new',
+                'null', 'out', 'pragma', 'ref', 'super', 'this',
+                'throw', 'true', 'try', 'typedef', 'typeid',
+                'typeof', 'union', 'with'
+            ),
+        3 => array(
+                'ArrayBoundsError', 'AssertError',
+                'ClassInfo', 'Error', 'Exception',
+                'Interface', 'ModuleInfo', 'Object',
+                'OutOfMemoryException', 'SwitchError',
+                'TypeInfo', '_d_arrayappend',
+                '_d_arrayappendb', '_d_arrayappendc',
+                '_d_arrayappendcb', '_d_arraycast',
+                '_d_arraycast_frombit', '_d_arraycat',
+                '_d_arraycatb', '_d_arraycatn',
+                '_d_arraycopy', '_d_arraycopybit',
+                '_d_arraysetbit', '_d_arraysetbit2',
+                '_d_arraysetlength', '_d_arraysetlengthb',
+                '_d_callfinalizer',
+                '_d_create_exception_object',
+                '_d_criticalenter', '_d_criticalexit',
+                '_d_delarray', '_d_delclass',
+                '_d_delinterface', '_d_delmemory',
+                '_d_dynamic_cast', '_d_exception',
+                '_d_exception_filter', '_d_framehandler',
+                '_d_interface_cast', '_d_interface_vtbl',
+                '_d_invariant', '_d_isbaseof',
+                '_d_isbaseof2', '_d_local_unwind',
+                '_d_monitorenter', '_d_monitorexit',
+                '_d_monitorrelease', '_d_monitor_epilog',
+                '_d_monitor_handler', '_d_monitor_prolog',
+                '_d_new', '_d_newarrayi', '_d_newbitarray',
+                '_d_newclass', '_d_obj_cmp', '_d_obj_eq',
+                '_d_OutOfMemory', '_d_switch_dstring',
+                '_d_switch_string', '_d_switch_ustring',
+                '_d_throw',
+            ),
+        4 => array(
+                'abstract', 'align', 'auto', 'bit', 'bool',
+                'byte', 'cdouble', 'cent', 'cfloat', 'char',
+                'class', 'const', 'creal', 'dchar', 'debug',
+                'deprecated', 'double', 'enum', 'export',
+                'final', 'float', 'idouble', 'ifloat', 'int',
+                'ireal', 'long', 'override', 'package',
+                'private', 'protected', 'ptrdiff_t',
+                'public', 'real', 'short', 'size_t',
+                'static', 'struct', 'synchronized',
+                'template', 'ubyte', 'ucent', 'uint',
+                'ulong', 'unittest', 'ushort', 'version',
+                'void', 'volatile', 'wchar'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '?', '!', ';', ':', ',', '...', '..',
+        '+', '-', '*', '/', '%', '&', '|', '^', '<', '>', '=', '~',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009933; font-style: italic;',
+            3 => 'color: #009933; font-style: italic;',
+            4 => 'color: #ff0000;',
+            5 => 'color: #0040ff;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            6 => 'color: #666699; font-weight: bold; font-style: italic;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dcs.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dcs.php
new file mode 100644
index 000000000..0f6bad372
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dcs.php
@@ -0,0 +1,185 @@
+<?php
+/*************************************************************************************
+ * dcs.php
+ * ---------------------------------
+ * Author: Stelio Passaris (GeSHi@stelio.net)
+ * Copyright: (c) 2009 Stelio Passaris (http://stelio.net/stiki/GeSHi)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/01/20
+ *
+ * DCS language file for GeSHi.
+ *
+ * DCS (Data Conversion System) is part of Sungard iWorks' Prophet suite and is used
+ * to convert external data files into a format that Prophet and Glean can read.
+ * See http://www.prophet-web.com/Products/DCS for product information.
+ * This language file is current for DCS version 7.3.2.
+ *
+ * Note that the DCS IDE does not handle escape characters correctly. The IDE thinks
+ * that a backslash '\' is an escape character, but in practice the backslash does
+ * not escape the string delimiter character '"' when the program runs. A '\\' is
+ * escaped to '\' when the program runs, but '\"' is treated as '\' at the end of a
+ * string. Therefore in this language file, we do not recognise the backslash as an
+ * escape character. For the purposes of GeSHi, there is no character escaping.
+ *
+ * CHANGES
+ * -------
+ * 2009/02/21 (1.0.8.3)
+ *  -  First Release
+ *
+ * TODO (updated 2009/02/21)
+ * -------------------------
+ * * Add handling for embedded C code. Note that the DCS IDE does not highlight C code
+ *   correctly, but that doesn't mean that we can't! This will be included for a
+ *   stable release of GeSHi of version 1.1.x (or later) that allows for highlighting
+ *   embedded code using that code's appropriate language file.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DCS',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(
+        ),
+    'HARDQUOTE' => array(
+        ),
+    'HARDESCAPE' => '',
+    'COMMENT_REGEXP' => array(
+        // Highlight embedded C code in a separate color:
+        2 => '/\bINSERT_C_CODE\b.*?\bEND_C_CODE\b/ims'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(
+        '"'
+        ),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'ascii_value', 'bit_value', 'blank_date', 'calc_unit_values', 'cm',
+            'complete_months', 'complete_years', 'correct', 'create_input_file', 'cy',
+            'date_convert', 'day', 'del_output_separator',
+            'delete_existing_output_files', 'div', 'ex', 'exact_years', 'exp',
+            'extract_date', 'failed_validation', 'file_number', 'first_record',
+            'fract', 'fund_fac_a', 'fund_fac_b', 'fund_fac_c', 'fund_fac_d',
+            'fund_fac_e', 'fund_fac_f', 'fund_fac_g', 'fund_fac_h', 'fund_fac_i',
+            'fund_fac_j', 'fund_fac_k', 'fund_fac_l', 'fund_fac_m', 'fund_fac_n',
+            'fund_fac_o', 'fund_fac_p', 'fund_fac_q', 'fund_fac_r', 'fund_fac_s',
+            'fund_fac_t', 'fund_fac_u', 'fund_fac_v', 'fund_fac_w', 'fund_fac_x',
+            'fund_fac_y', 'fund_fac_z', 'group', 'group_record',
+            'input_file_date_time', 'input_file_extension', 'input_file_location',
+            'input_file_name', 'int', 'invalid', 'last_record', 'leap_year', 'len',
+            'ln', 'log', 'main_format_name', 'max', 'max_num_subrecords', 'message',
+            'min', 'mod', 'month', 'months_add', 'months_sub', 'nearest_months',
+            'nearest_years', 'next_record', 'nm', 'no_of_current_records',
+            'no_of_records', 'numval', 'ny', 'output', 'output_array_as_constants',
+            'output_file_path', 'output_record', 'pmdf_output', 'previous', 'rand',
+            're_start', 'read_generic_table', 'read_generic_table_text',
+            'read_input_footer', 'read_input_footer_text', 'read_input_header',
+            'read_input_header_text', 'record_count', 'record_suppressed', 'round',
+            'round_down', 'round_near', 'round_up', 'run_dcs_program', 'run_parameter',
+            'run_parameter_text', 'set_main_record', 'set_num_subrecords',
+            'sort_array', 'sort_current_records', 'sort_input', 'strval', 'substr',
+            'summarise', 'summarise_record', 'summarise_units',
+            'summarise_units_record', 'suppress_record', 'table_correct',
+            'table_validate', 'terminate', 'time', 'today', 'trim', 'ubound', 'year',
+            'years_add', 'years_sub'
+            ),
+        2 => array(
+            'and', 'as', 'begin', 'boolean', 'byref', 'byval', 'call', 'case', 'date',
+            'default', 'do', 'else', 'elseif', 'end_c_code', 'endfor', 'endfunction',
+            'endif', 'endproc', 'endswitch', 'endwhile', 'eq',
+            'explicit_declarations', 'false', 'for', 'from', 'function', 'ge', 'gt',
+            'if', 'insert_c_code', 'integer', 'le', 'loop', 'lt', 'ne', 'not',
+            'number', 'or', 'private', 'proc', 'public', 'quitloop', 'return',
+            'short', 'step', 'switch', 'text', 'then', 'to', 'true', 'while'
+            ),
+        3 => array(
+            // These keywords are not highlighted by the DCS IDE but we may as well
+            // keep track of them anyway:
+            'mp_file', 'odbc_file'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']',
+        '=', '<', '>',
+        '+', '-', '*', '/', '^',
+        ':', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: red;',
+            2 => 'color: blue;',
+            3 => 'color: black;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: black; background-color: silver;',
+            // Colors for highlighting embedded C code:
+            2 => 'color: maroon; background-color: pink;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: green;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: black;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/delphi.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/delphi.php
new file mode 100644
index 000000000..9d7ad7e7d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/delphi.php
@@ -0,0 +1,289 @@
+<?php
+/*************************************************************************************
+ * delphi.php
+ * ----------
+ * Author: J�rja Norbert (jnorbi@vipmail.hu), Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2004 J�rja Norbert, Benny Baumann (BenBE@omorphia.de), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/26
+ *
+ * Delphi (Object Pascal) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/11/19 (1.0.3)
+ *   -  Updated the very incomplete keyword and type lists
+ * 2005/09/03 (1.0.2)
+ *   -  Added support for hex numbers and string entities
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Delphi',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Abstract', 'And', 'Array', 'As', 'Asm', 'At', 'Begin', 'Case',
+            'Class', 'Const', 'Constructor', 'Contains', 'Destructor',
+            'DispInterface', 'Div', 'Do', 'DownTo', 'Else', 'End', 'Except',
+            'Export', 'Exports', 'External', 'File', 'Finalization', 'Finally',
+            'For', 'Function', 'Goto', 'If', 'Implementation', 'In', 'Inherited',
+            'Initialization', 'Inline', 'Interface', 'Is', 'Label', 'Library',
+            'Mod', 'Not', 'Object', 'Of', 'On', 'Or', 'Overload', 'Override',
+            'Package', 'Packed', 'Private', 'Procedure', 'Program', 'Property',
+            'Protected', 'Public', 'Published', 'Raise', 'Record', 'Register',
+            'Repeat', 'Requires', 'Resourcestring', 'Set', 'Shl', 'Shr', 'Then',
+            'ThreadVar', 'To', 'Try', 'Type', 'Unit', 'Until', 'Uses', 'Var',
+            'Virtual', 'While', 'With', 'Xor', 'assembler', 'far',
+            'near', 'pascal', 'register', 'cdecl', 'safecall', 'stdcall', 'varargs'
+            ),
+        2 => array(
+            'nil', 'false', 'self', 'true', 'var', 'type', 'const'
+            ),
+        3 => array(
+            'Abs', 'AcquireExceptionObject', 'Addr', 'AnsiToUtf8', 'Append', 'ArcTan',
+            'Assert', 'AssignFile', 'Assigned', 'BeginThread', 'BlockRead',
+            'BlockWrite', 'Break', 'ChDir', 'Chr', 'Close', 'CloseFile',
+            'CompToCurrency', 'CompToDouble', 'Concat', 'Continue', 'Copy', 'Cos',
+            'Dec', 'Delete', 'Dispose', 'DoubleToComp', 'EndThread', 'EnumModules',
+            'EnumResourceModules', 'Eof', 'Eoln', 'Erase', 'ExceptAddr',
+            'ExceptObject', 'Exclude', 'Exit', 'Exp', 'FilePos', 'FileSize',
+            'FillChar', 'Finalize', 'FindClassHInstance', 'FindHInstance',
+            'FindResourceHInstance', 'Flush', 'Frac', 'FreeMem', 'Get8087CW',
+            'GetDir', 'GetLastError', 'GetMem', 'GetMemoryManager',
+            'GetModuleFileName', 'GetVariantManager', 'Halt', 'Hi', 'High',
+            'IOResult', 'Inc', 'Include', 'Initialize', 'Insert', 'Int',
+            'IsMemoryManagerSet', 'IsVariantManagerSet', 'Length', 'Ln', 'Lo', 'Low',
+            'MkDir', 'Move', 'New', 'Odd', 'OleStrToStrVar', 'OleStrToString', 'Ord',
+            'PUCS4Chars', 'ParamCount', 'ParamStr', 'Pi', 'Pos', 'Pred', 'Ptr',
+            'Random', 'Randomize', 'Read', 'ReadLn', 'ReallocMem',
+            'ReleaseExceptionObject', 'Rename', 'Reset', 'Rewrite', 'RmDir', 'Round',
+            'RunError', 'Seek', 'SeekEof', 'SeekEoln', 'Set8087CW', 'SetLength',
+            'SetLineBreakStyle', 'SetMemoryManager', 'SetString', 'SetTextBuf',
+            'SetVariantManager', 'Sin', 'SizeOf', 'Slice', 'Sqr', 'Sqrt', 'Str',
+            'StringOfChar', 'StringToOleStr', 'StringToWideChar', 'Succ', 'Swap',
+            'Trunc', 'Truncate', 'TypeInfo', 'UCS4StringToWideString', 'UTF8Decode',
+            'UTF8Encode', 'UnicodeToUtf8', 'UniqueString', 'UpCase', 'Utf8ToAnsi',
+            'Utf8ToUnicode', 'Val', 'VarArrayRedim', 'VarClear',
+            'WideCharLenToStrVar', 'WideCharLenToString', 'WideCharToStrVar',
+            'WideCharToString', 'WideStringToUCS4String', 'Write', 'WriteLn',
+
+            'Abort', 'AddExitProc', 'AddTerminateProc', 'AdjustLineBreaks', 'AllocMem',
+            'AnsiCompareFileName', 'AnsiCompareStr', 'AnsiCompareText',
+            'AnsiDequotedStr', 'AnsiExtractQuotedStr', 'AnsiLastChar',
+            'AnsiLowerCase', 'AnsiLowerCaseFileName', 'AnsiPos', 'AnsiQuotedStr',
+            'AnsiSameStr', 'AnsiSameText', 'AnsiStrComp', 'AnsiStrIComp',
+            'AnsiStrLComp', 'AnsiStrLIComp', 'AnsiStrLastChar', 'AnsiStrLower',
+            'AnsiStrPos', 'AnsiStrRScan', 'AnsiStrScan', 'AnsiStrUpper',
+            'AnsiUpperCase', 'AnsiUpperCaseFileName', 'AppendStr', 'AssignStr',
+            'Beep', 'BoolToStr', 'ByteToCharIndex', 'ByteToCharLen', 'ByteType',
+            'CallTerminateProcs', 'ChangeFileExt', 'CharLength', 'CharToByteIndex',
+            'CharToByteLen', 'CompareMem', 'CompareStr', 'CompareText', 'CreateDir',
+            'CreateGUID', 'CurrToStr', 'CurrToStrF', 'CurrentYear', 'Date',
+            'DateTimeToFileDate', 'DateTimeToStr', 'DateTimeToString',
+            'DateTimeToSystemTime', 'DateTimeToTimeStamp', 'DateToStr', 'DayOfWeek',
+            'DecodeDate', 'DecodeDateFully', 'DecodeTime', 'DeleteFile',
+            'DirectoryExists', 'DiskFree', 'DiskSize', 'DisposeStr', 'EncodeDate',
+            'EncodeTime', 'ExceptionErrorMessage', 'ExcludeTrailingBackslash',
+            'ExcludeTrailingPathDelimiter', 'ExpandFileName', 'ExpandFileNameCase',
+            'ExpandUNCFileName', 'ExtractFileDir', 'ExtractFileDrive',
+            'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath',
+            'ExtractRelativePath', 'ExtractShortPathName', 'FileAge', 'FileClose',
+            'FileCreate', 'FileDateToDateTime', 'FileExists', 'FileGetAttr',
+            'FileGetDate', 'FileIsReadOnly', 'FileOpen', 'FileRead', 'FileSearch',
+            'FileSeek', 'FileSetAttr', 'FileSetDate', 'FileSetReadOnly', 'FileWrite',
+            'FinalizePackage', 'FindClose', 'FindCmdLineSwitch', 'FindFirst',
+            'FindNext', 'FloatToCurr', 'FloatToDateTime', 'FloatToDecimal',
+            'FloatToStr', 'FloatToStrF', 'FloatToText', 'FloatToTextFmt',
+            'FmtLoadStr', 'FmtStr', 'ForceDirectories', 'Format', 'FormatBuf',
+            'FormatCurr', 'FormatDateTime', 'FormatFloat', 'FreeAndNil',
+            'GUIDToString', 'GetCurrentDir', 'GetEnvironmentVariable',
+            'GetFileVersion', 'GetFormatSettings', 'GetLocaleFormatSettings',
+            'GetModuleName', 'GetPackageDescription', 'GetPackageInfo', 'GetTime',
+            'IncAMonth', 'IncMonth', 'IncludeTrailingBackslash',
+            'IncludeTrailingPathDelimiter', 'InitializePackage', 'IntToHex',
+            'IntToStr', 'InterlockedDecrement', 'InterlockedExchange',
+            'InterlockedExchangeAdd', 'InterlockedIncrement', 'IsDelimiter',
+            'IsEqualGUID', 'IsLeapYear', 'IsPathDelimiter', 'IsValidIdent',
+            'Languages', 'LastDelimiter', 'LoadPackage', 'LoadStr', 'LowerCase',
+            'MSecsToTimeStamp', 'NewStr', 'NextCharIndex', 'Now', 'OutOfMemoryError',
+            'QuotedStr', 'RaiseLastOSError', 'RaiseLastWin32Error', 'RemoveDir',
+            'RenameFile', 'ReplaceDate', 'ReplaceTime', 'SafeLoadLibrary',
+            'SameFileName', 'SameText', 'SetCurrentDir', 'ShowException', 'Sleep',
+            'StrAlloc', 'StrBufSize', 'StrByteType', 'StrCat', 'StrCharLength',
+            'StrComp', 'StrCopy', 'StrDispose', 'StrECopy', 'StrEnd', 'StrFmt',
+            'StrIComp', 'StrLCat', 'StrLComp', 'StrLCopy', 'StrLFmt', 'StrLIComp',
+            'StrLen', 'StrLower', 'StrMove', 'StrNew', 'StrNextChar', 'StrPCopy',
+            'StrPLCopy', 'StrPas', 'StrPos', 'StrRScan', 'StrScan', 'StrToBool',
+            'StrToBoolDef', 'StrToCurr', 'StrToCurrDef', 'StrToDate', 'StrToDateDef',
+            'StrToDateTime', 'StrToDateTimeDef', 'StrToFloat', 'StrToFloatDef',
+            'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime',
+            'StrToTimeDef', 'StrUpper', 'StringReplace', 'StringToGUID', 'Supports',
+            'SysErrorMessage', 'SystemTimeToDateTime', 'TextToFloat', 'Time',
+            'TimeStampToDateTime', 'TimeStampToMSecs', 'TimeToStr', 'Trim',
+            'TrimLeft', 'TrimRight', 'TryEncodeDate', 'TryEncodeTime',
+            'TryFloatToCurr', 'TryFloatToDateTime', 'TryStrToBool', 'TryStrToCurr',
+            'TryStrToDate', 'TryStrToDateTime', 'TryStrToFloat', 'TryStrToInt',
+            'TryStrToInt64', 'TryStrToTime', 'UnloadPackage', 'UpperCase',
+            'WideCompareStr', 'WideCompareText', 'WideFmtStr', 'WideFormat',
+            'WideFormatBuf', 'WideLowerCase', 'WideSameStr', 'WideSameText',
+            'WideUpperCase', 'Win32Check', 'WrapText',
+
+            'ActivateClassGroup', 'AllocateHwnd', 'BinToHex', 'CheckSynchronize',
+            'CollectionsEqual', 'CountGenerations', 'DeallocateHwnd', 'EqualRect',
+            'ExtractStrings', 'FindClass', 'FindGlobalComponent', 'GetClass',
+            'GroupDescendantsWith', 'HexToBin', 'IdentToInt',
+            'InitInheritedComponent', 'IntToIdent', 'InvalidPoint',
+            'IsUniqueGlobalComponentName', 'LineStart', 'ObjectBinaryToText',
+            'ObjectResourceToText', 'ObjectTextToBinary', 'ObjectTextToResource',
+            'PointsEqual', 'ReadComponentRes', 'ReadComponentResEx',
+            'ReadComponentResFile', 'Rect', 'RegisterClass', 'RegisterClassAlias',
+            'RegisterClasses', 'RegisterComponents', 'RegisterIntegerConsts',
+            'RegisterNoIcon', 'RegisterNonActiveX', 'SmallPoint', 'StartClassGroup',
+            'TestStreamFormat', 'UnregisterClass', 'UnregisterClasses',
+            'UnregisterIntegerConsts', 'UnregisterModuleClasses',
+            'WriteComponentResFile',
+
+            'ArcCos', 'ArcCosh', 'ArcCot', 'ArcCotH', 'ArcCsc', 'ArcCscH', 'ArcSec',
+            'ArcSecH', 'ArcSin', 'ArcSinh', 'ArcTan2', 'ArcTanh', 'Ceil',
+            'CompareValue', 'Cosecant', 'Cosh', 'Cot', 'CotH', 'Cotan', 'Csc', 'CscH',
+            'CycleToDeg', 'CycleToGrad', 'CycleToRad', 'DegToCycle', 'DegToGrad',
+            'DegToRad', 'DivMod', 'DoubleDecliningBalance', 'EnsureRange', 'Floor',
+            'Frexp', 'FutureValue', 'GetExceptionMask', 'GetPrecisionMode',
+            'GetRoundMode', 'GradToCycle', 'GradToDeg', 'GradToRad', 'Hypot',
+            'InRange', 'IntPower', 'InterestPayment', 'InterestRate',
+            'InternalRateOfReturn', 'IsInfinite', 'IsNan', 'IsZero', 'Ldexp', 'LnXP1',
+            'Log10', 'Log2', 'LogN', 'Max', 'MaxIntValue', 'MaxValue', 'Mean',
+            'MeanAndStdDev', 'Min', 'MinIntValue', 'MinValue', 'MomentSkewKurtosis',
+            'NetPresentValue', 'Norm', 'NumberOfPeriods', 'Payment', 'PeriodPayment',
+            'Poly', 'PopnStdDev', 'PopnVariance', 'Power', 'PresentValue',
+            'RadToCycle', 'RadToDeg', 'RadToGrad', 'RandG', 'RandomRange', 'RoundTo',
+            'SLNDepreciation', 'SYDDepreciation', 'SameValue', 'Sec', 'SecH',
+            'Secant', 'SetExceptionMask', 'SetPrecisionMode', 'SetRoundMode', 'Sign',
+            'SimpleRoundTo', 'SinCos', 'Sinh', 'StdDev', 'Sum', 'SumInt',
+            'SumOfSquares', 'SumsAndSquares', 'Tan', 'Tanh', 'TotalVariance',
+            'Variance'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Bool', 'Boolean', 'Byte', 'ByteBool', 'Cardinal', 'Char',
+            'Comp', 'Currency', 'DWORD', 'Double', 'Extended', 'Int64', 'Integer', 'IUnknown',
+            'LongBool', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PBool', 'PBoolean', 'PByte',
+            'PByteArray', 'PCardinal', 'PChar', 'PComp', 'PCurrency', 'PDWORD', 'PDate', 'PDateTime',
+            'PDouble', 'PExtended', 'PInt64', 'PInteger', 'PLongInt', 'PLongWord', 'Pointer', 'PPointer',
+            'PShortInt', 'PShortString', 'PSingle', 'PSmallInt', 'PString', 'PHandle', 'PVariant', 'PWord',
+            'PWordArray', 'PWordBool', 'PWideChar', 'PWideString', 'Real', 'Real48', 'ShortInt', 'ShortString',
+            'Single', 'SmallInt', 'String', 'TClass', 'TDate', 'TDateTime', 'TextFile', 'THandle',
+            'TObject', 'TTime', 'Variant', 'WideChar', 'WideString', 'Word', 'WordBool'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #9ac;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '\$[0-9a-fA-F]+',
+        //Characters
+        1 => '\#(?:\$[0-9a-fA-F]{1,2}|\d{1,3})'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/diff.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/diff.php
new file mode 100644
index 000000000..b4703c1d2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/diff.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * diff.php
+ * --------
+ * Author: Conny Brunnkvist (conny@fuchsia.se), W. Tasin (tasin@fhm.edu)
+ * Copyright: (c) 2004 Fuchsia Open Source Solutions (http://www.fuchsia.se/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/12/29
+ *
+ * Diff-output language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2006/02/27
+ *  -  changing language file to use matching of start (^) and end ($) (wt)
+ * 2004/12/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/02/27)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+
+$language_data = array (
+    'LANG_NAME' => 'Diff',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => ' ',
+    'KEYWORDS' => array(
+            1 => array(
+                '\ No newline at end of file'
+            ),
+//            2 => array(
+//                '***************' /* This only seems to works in some cases? */
+//            ),
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+//        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #aaaaaa; font-style: italic;',
+//            2 => 'color: #dd6611;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => ''
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #440088;',
+            1 => 'color: #991111;',
+            2 => 'color: #00b000;',
+            3 => 'color: #888822;',
+            4 => 'color: #888822;',
+            5 => 'color: #0011dd;',
+            6 => 'color: #440088;',
+            7 => 'color: #991111;',
+            8 => 'color: #00b000;',
+            9 => 'color: #888822;',
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+//        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => "[0-9,]+[acd][0-9,]+",
+        //Removed lines
+        1 => array(
+            GESHI_SEARCH => '^\\&lt;.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted lines
+        2 => array(
+            GESHI_SEARCH => '^\\&gt;.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Location line
+        3 => array(
+            GESHI_SEARCH => '^[\\-]{3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        4 => array(
+            GESHI_SEARCH => '^(\\+){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Modified line
+        5 => array(
+            GESHI_SEARCH => '^\\!.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        6 => array(
+            GESHI_SEARCH => '^[\\@]{2}.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Removed line
+        7 => array(
+            GESHI_SEARCH => '^\\-.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        8 => array(
+            GESHI_SEARCH => '^\\+.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        9 => array(
+            GESHI_SEARCH => '^(\\*){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/div.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/div.php
new file mode 100644
index 000000000..0e249740c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/div.php
@@ -0,0 +1,126 @@
+<?php
+/*************************************************************************************
+ * div.php
+ * ---------------------------------
+ * Author: Gabriel Lorenzo (ermakina@gmail.com)
+ * Copyright: (c) 2005 Gabriel Lorenzo (http://ermakina.gazpachito.net)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/06/19
+ *
+ * DIV language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/06/22 (1.0.0)
+ *  -  First Release, includes "2nd gen" ELSEIF statement
+ *
+ * TODO (updated 2005/06/22)
+ * -------------------------
+ *  -  I'm pretty satisfied with this, so nothing for now... :P
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DIV',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'while','until','to','switch','step','return','repeat','loop','if','from','frame','for','end','elseif',
+            'else','default','debug','continue','clone','case','break','begin'
+            ),
+        2 => array(
+            'xor','whoami','type','sizeof','pointer','or','offset','not','neg','mod','id','dup','and','_ne','_lt',
+            '_le','_gt','_ge','_eq'
+            ),
+        3 => array(
+            'setup_program','program','process','private','local','import','global','function','const',
+            'compiler_options'
+            ),
+        4 => array(
+            'word','struct','string','int','byte'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']','=','+','-','*','/','!','%','^','&',':',';',',','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0040b1;',
+            2 => 'color: #000000;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dos.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dos.php
new file mode 100644
index 000000000..bec3de129
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dos.php
@@ -0,0 +1,198 @@
+<?php
+/*************************************************************************************
+ * dos.php
+ * -------
+ * Author: Alessandro Staltari (staltari@geocities.com)
+ * Copyright: (c) 2005 Alessandro Staltari (http://www.geocities.com/SiliconValley/Vista/8155/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/07/05
+ *
+ * DOS language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/07/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2005/07/05)
+ * -------------------------
+ *
+ * - Highlight pipes and redirection (do we really need this?)
+ * - Add missing keywords.
+ * - Find a good hyperlink for keywords.
+ * - Improve styles.
+ *
+ * KNOWN ISSUES (updated 2005/07/07)
+ * ---------------------------------
+ *
+ * - Doesn't even try to handle spaces in variables name or labels (I can't
+ *   find a reliable way to establish if a sting is a name or not, in some
+ *   cases it depends on the contex or enviroment status).
+ * - Doesn't handle %%[letter] pseudo variable used inside FOR constructs
+ *   (it should be done only into its scope: how to handle variable it?).
+ * - Doesn't handle %~[something] pseudo arguments.
+ * - If the same keyword is placed at the end of the line and the
+ *   beginning of the next, the second occourrence is not highlighted
+ *   (this should be a GeSHi bug, not related to the language definition).
+ * - I can't avoid to have keyword highlighted even when they are not used
+ *   as keywords but, for example, as arguments to the echo command.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'DOS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    //DOS comment lines
+    'COMMENT_REGEXP' => array(1 => "/^\s*@?REM.*$/mi"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Flow control keywords */
+        1 => array(
+            'if', 'else', 'goto', 'shift',
+            'for', 'in', 'do',
+            'call', 'exit'
+            ),
+        /* IF statement keywords */
+        2 => array(
+            'not', 'exist', 'errorlevel',
+            'defined',
+            'equ', 'neq', 'lss', 'leq', 'gtr', 'geq'
+            ),
+        /* Internal commands */
+        3 => array(
+            'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
+            'del', 'copy', 'move', 'ren', 'rename',
+            'echo',
+            'setlocal', 'endlocal', 'set',
+            'pause',
+            'pushd', 'popd', 'title', 'verify'
+            ),
+        /* Special files */
+        4 => array(
+            'prn', 'nul', 'lpt3', 'lpt2', 'lpt1', 'con',
+            'com4', 'com3', 'com2', 'com1', 'aux'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '@', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00b100; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #b1b100; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #33cc33;',
+            1 => 'color: #33cc33;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #b100b1; font-weight: bold;',
+            1 => 'color: #448844;',
+            2 => 'color: #448888;'
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'URLS' => array(
+        1 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        2 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        3 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        4 => 'http://www.ss64.com/nt/{FNAMEL}.html'
+        ),
+    'REGEXPS' => array(
+        /* Label */
+        0 => array(
+/*            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\s\n]*)',*/
+            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((?<!\n)[^\n]*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+        ),
+        /* Variable assignement */
+        1 => array(
+/*            GESHI_SEARCH => '(SET[\s]+(?si:\/A[\s]+|\/P[\s]+|))([^=\s\n]+)([\s]*=)',*/
+            GESHI_SEARCH => '(SET[\s]+(?si:\/A[\s]+|\/P[\s]+|))([^=\n]+)([\s]*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        /* Arguments or variable evaluation */
+        2 => array(
+/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((?<!%\d)%|)',*/
+            GESHI_SEARCH => '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((?<!%\d)%|)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<!\w)'
+                )
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dot.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dot.php
new file mode 100644
index 000000000..c45a74af7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/dot.php
@@ -0,0 +1,164 @@
+<?php
+/*************************************************************************************
+ * dot.php
+ * ---------------------------------
+ * Author: Adrien Friggeri (adrien@friggeri.net)
+ * Copyright: (c) 2007 Adrien Friggeri (http://www.friggeri.net)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/05/30
+ *
+ * dot language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/05/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/05/30)
+ * -------------------------
+ * Everything
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'dot',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'URL', 'arrowhead', 'arrowsize', 'arrowtail', 'bb', 'bgcolor', 'bottomlabel',
+            'center', 'clusterrank', 'color', 'comment', 'constraint', 'decorate',
+            'dir', 'distortion', 'fillcolor', 'fixedsize', 'fontcolor',
+            'fontname', 'fontsize', 'group', 'headclip', 'headlabel', 'headport',
+            'height', 'id', 'label', 'labelangle', 'labeldistance', 'labelfontcolor',
+            'labelfontname', 'labelfontsize', 'layer', 'layers', 'margin', 'mclimit',
+            'minlen', 'nodesep', 'nslimit', 'ordering', 'orientation', 'page',
+            'pagedir', 'peripheries', 'port_label_distance', 'quantum', 'rank', 'rankdir',
+            'ranksep', 'ratio', 'regular', 'rotate', 'samehead', 'sametail', 'searchsize',
+            'shape', 'shapefile', 'showboxes', 'sides', 'size', 'skew', 'style',
+            'tailclip', 'taillabel', 'tailport', 'toplabel', 'weight', 'width'
+            ),
+        2 => array(
+            'node', 'graph', 'digraph', 'strict', 'edge', 'subgraph'
+            ),
+        3 => array(
+            'Mcircle', 'Mdiamond', 'Mrecord', 'Msquare', 'TRUE', 'auto', 'back',
+            'bold', 'both', 'box', 'circle', 'compress', 'dashed', 'diamond', 'dot',
+            'dotted', 'doublecircle', 'doubleoctagon', 'egg', 'ellipse', 'epsf', 'false',
+            'fill', 'filled', 'forward', 'global', 'hexagon', 'house', 'inv', 'invdot',
+            'invhouse', 'invis', 'invodot', 'invtrapezium', 'invtriangle', 'local', 'max',
+            'min', 'none', 'normal', 'octagon', 'odot', 'out', 'parallelogram', 'plaintext',
+            'polygon', 'record', 'same', 'solid', 'trapezium', 'triangle', 'tripleoctagon',
+            'true'
+            ),
+        4 => array(
+            'aliceblue', 'antiquewhite', 'aquamarine', 'azure', 'beige', 'bisque', 'black',
+            'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue',
+            'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson',
+            'cyan', 'darkgoldenrod', 'darkgreen', 'darkkhaki', 'darkolivegreen',
+            'darkorange', 'darkorchid', 'darksalmon', 'darkseagreen', 'darkslateblue',
+            'darkslategray', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue',
+            'dimgray', 'dodgerblue', 'firebrick', 'forestgreen', 'gainsboro', 'ghostwhite',
+            'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'honeydew', 'hotpink',
+            'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush',
+            'lawngreen', 'lemonchiffon', 'lightblue', 'lightcyan', 'lightgoldenrod',
+            'lightgoldenrodyellow', 'lightgray', 'lightpink', 'lightsalmon',
+            'lightseagreen', 'lightskyblue', 'lightslateblue', 'lightslategray',
+            'lightyellow', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine',
+            'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen',
+            'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred',
+            'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy',
+            'navyblue', 'oldlace', 'olivedrab', 'oralwhite', 'orange', 'orangered',
+            'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred',
+            'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple',
+            'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'salmon2', 'sandybrown',
+            'seagreen', 'seashell', 'sienna', 'skyblue', 'slateblue', 'slategray', 'snow',
+            'springgreen', 'steelblue', 'tan', 'thistle', 'tomato', 'turquoise', 'violet',
+            'violetred', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '-', '+', '*', '/', '<', '>', '!', '~', '%', '&', '|', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #993333;',
+            4 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #af624d; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/eiffel.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/eiffel.php
new file mode 100644
index 000000000..ab7abf974
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/eiffel.php
@@ -0,0 +1,395 @@
+<?php
+/*************************************************************************************
+ * eiffel.php
+ * ----------
+ * Author: Zoran Simic (zsimic@axarosenberg.com)
+ * Copyright: (c) 2005 Zoran Simic
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/06/30
+ *
+ * Eiffel language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/06/30 (1.0.7)
+ *  -  Initial release
+ *
+ * TODO (updated 2005/06/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Eiffel',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '%',
+    'KEYWORDS' => array(
+        1 => array(
+            'separate',
+            'invariant',
+            'inherit',
+            'indexing',
+            'feature',
+            'expanded',
+            'deferred',
+            'class'
+            ),
+        2 => array(
+            'xor',
+            'when',
+            'variant',
+            'until',
+            'unique',
+            'undefine',
+            'then',
+            'strip',
+            'select',
+            'retry',
+            'rescue',
+            'require',
+            'rename',
+            'reference',
+            'redefine',
+            'prefix',
+            'or',
+            'once',
+            'old',
+            'obsolete',
+            'not',
+            'loop',
+            'local',
+            'like',
+            'is',
+            'inspect',
+            'infix',
+            'include',
+            'implies',
+            'if',
+            'frozen',
+            'from',
+            'external',
+            'export',
+            'ensure',
+            'end',
+            'elseif',
+            'else',
+            'do',
+            'creation',
+            'create',
+            'check',
+            'as',
+            'and',
+            'alias',
+            'agent'
+            ),
+        3 => array(
+            'Void',
+            'True',
+            'Result',
+            'Precursor',
+            'False',
+            'Current'
+            ),
+        4 => array(
+            'UNIX_SIGNALS',
+            'UNIX_FILE_INFO',
+            'UNBOUNDED',
+            'TWO_WAY_TREE_CURSOR',
+            'TWO_WAY_TREE',
+            'TWO_WAY_SORTED_SET',
+            'TWO_WAY_LIST',
+            'TWO_WAY_CURSOR_TREE',
+            'TWO_WAY_CIRCULAR',
+            'TWO_WAY_CHAIN_ITERATOR',
+            'TUPLE',
+            'TREE',
+            'TRAVERSABLE',
+            'TO_SPECIAL',
+            'THREAD_CONTROL',
+            'THREAD_ATTRIBUTES',
+            'THREAD',
+            'TABLE',
+            'SUBSET',
+            'STRING_HANDLER',
+            'STRING',
+            'STREAM',
+            'STORABLE',
+            'STD_FILES',
+            'STACK',
+            'SPECIAL',
+            'SORTED_TWO_WAY_LIST',
+            'SORTED_STRUCT',
+            'SORTED_LIST',
+            'SINGLE_MATH',
+            'SET',
+            'SEQUENCE',
+            'SEQ_STRING',
+            'SEMAPHORE',
+            'ROUTINE',
+            'RESIZABLE',
+            'RECURSIVE_TREE_CURSOR',
+            'RECURSIVE_CURSOR_TREE',
+            'REAL_REF',
+            'REAL',
+            'RAW_FILE',
+            'RANDOM',
+            'QUEUE',
+            'PROXY',
+            'PROFILING_SETTING',
+            'PROCEDURE',
+            'PRIORITY_QUEUE',
+            'PRIMES',
+            'PRECOMP',
+            'POINTER_REF',
+            'POINTER',
+            'PLATFORM',
+            'PLAIN_TEXT_FILE',
+            'PATH_NAME',
+            'PART_SORTED_TWO_WAY_LIST',
+            'PART_SORTED_SET',
+            'PART_SORTED_LIST',
+            'PART_COMPARABLE',
+            'OPERATING_ENVIRONMENT',
+            'ONCE_CONTROL',
+            'OBJECT_OWNER',
+            'OBJECT_CONTROL',
+            'NUMERIC',
+            'NONE',
+            'MUTEX',
+            'MULTI_ARRAY_LIST',
+            'MULTAR_LIST_CURSOR',
+            'MEMORY',
+            'MEM_INFO',
+            'MEM_CONST',
+            'MATH_CONST',
+            'LIST',
+            'LINKED_TREE_CURSOR',
+            'LINKED_TREE',
+            'LINKED_STACK',
+            'LINKED_SET',
+            'LINKED_QUEUE',
+            'LINKED_PRIORITY_QUEUE',
+            'LINKED_LIST_CURSOR',
+            'LINKED_LIST',
+            'LINKED_CURSOR_TREE',
+            'LINKED_CIRCULAR',
+            'LINKABLE',
+            'LINEAR_ITERATOR',
+            'LINEAR',
+            'ITERATOR',
+            'IO_MEDIUM',
+            'INTERNAL',
+            'INTEGER_REF',
+            'INTEGER_INTERVAL',
+            'INTEGER',
+            'INFINITE',
+            'INDEXABLE',
+            'IDENTIFIED_CONTROLLER',
+            'IDENTIFIED',
+            'HIERARCHICAL',
+            'HEAP_PRIORITY_QUEUE',
+            'HASHABLE',
+            'HASH_TABLE_CURSOR',
+            'HASH_TABLE',
+            'GENERAL',
+            'GC_INFO',
+            'FUNCTION',
+            'FORMAT_INTEGER',
+            'FORMAT_DOUBLE',
+            'FIXED_TREE',
+            'FIXED_LIST',
+            'FIXED',
+            'FINITE',
+            'FILE_NAME',
+            'FILE',
+            'FIBONACCI',
+            'EXECUTION_ENVIRONMENT',
+            'EXCEPTIONS',
+            'EXCEP_CONST',
+            'DYNAMIC_TREE',
+            'DYNAMIC_LIST',
+            'DYNAMIC_CIRCULAR',
+            'DYNAMIC_CHAIN',
+            'DOUBLE_REF',
+            'DOUBLE_MATH',
+            'DOUBLE',
+            'DISPENSER',
+            'DIRECTORY_NAME',
+            'DIRECTORY',
+            'DECLARATOR',
+            'DEBUG_OUTPUT',
+            'CURSOR_TREE_ITERATOR',
+            'CURSOR_TREE',
+            'CURSOR_STRUCTURE',
+            'CURSOR',
+            'COUNTABLE_SEQUENCE',
+            'COUNTABLE',
+            'CONTAINER',
+            'CONSOLE',
+            'CONDITION_VARIABLE',
+            'COMPARABLE_STRUCT',
+            'COMPARABLE_SET',
+            'COMPARABLE',
+            'COMPACT_TREE_CURSOR',
+            'COMPACT_CURSOR_TREE',
+            'COLLECTION',
+            'CIRCULAR_CURSOR',
+            'CIRCULAR',
+            'CHARACTER_REF',
+            'CHARACTER',
+            'CHAIN',
+            'CELL',
+            'BOX',
+            'BOUNDED_STACK',
+            'BOUNDED_QUEUE',
+            'BOUNDED',
+            'BOOLEAN_REF',
+            'BOOLEAN',
+            'BOOL_STRING',
+            'BIT_REF',
+            'BINARY_TREE',
+            'BINARY_SEARCH_TREE_SET',
+            'BINARY_SEARCH_TREE',
+            'BILINEAR',
+            'BI_LINKABLE',
+            'BASIC_ROUTINES',
+            'BAG',
+            'ASCII',
+            'ARRAYED_TREE',
+            'ARRAYED_STACK',
+            'ARRAYED_QUEUE',
+            'ARRAYED_LIST_CURSOR',
+            'ARRAYED_LIST',
+            'ARRAYED_CIRCULAR',
+            'ARRAY2',
+            'ARRAY',
+            'ARGUMENTS',
+            'ANY',
+            'ACTIVE'
+            ),
+        5 => array(
+            'yes',
+            'visible',
+            'trace',
+            'system',
+            'root',
+            'profile',
+            'override_cluster',
+            'object',
+            'no',
+            'multithreaded',
+            'msil_generation_type',
+            'line_generation',
+            'library',
+            'inlining_size',
+            'inlining',
+            'include_path',
+            'il_verifiable',
+            'exclude',
+            'exception_trace',
+            'dynamic_runtime',
+            'dotnet_naming_convention',
+            'disabled_debug',
+            'default',
+            'debug',
+            'dead_code_removal',
+            'console_application',
+            'cluster',
+            'cls_compliant',
+            'check_vape',
+            'assertion',
+            'array_optimization',
+            'all',
+            'address_expression'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', '|', ':',
+        '(', ')', '{', '}', '[', ']', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',
+            2 => 'color: #0600FF; font-weight: bold;',
+            3 => 'color: #800080;',
+            4 => 'color: #800000',
+            5 => 'color: #603000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #005070; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0080A0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000060;',
+            2 => 'color: #000050;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #600000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => 'http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+{FNAMEL}&amp;btnI=I%27m+Feeling+Lucky',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/email.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/email.php
new file mode 100644
index 000000000..a0a744c6d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/email.php
@@ -0,0 +1,209 @@
+<?php
+/*************************************************************************************
+ * email.php
+ * ---------------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/10/19
+ *
+ * Email (mbox \ eml \ RFC format) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/19 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO (updated 2008/10/19)
+ * -------------------------
+ * * Better checks when a header field should be expected
+ * * Fix the bound checks for kw groups 2 and 3, as well as rx group 1
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'eMail (mbox)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'HTTP', 'SMTP', 'ASMTP', 'ESMTP'
+            ),
+        2 => array(
+            'Content-Type','Content-Transfer-Encoding','Content-Disposition',
+            'Delivered-To','Dkim-Signature','Domainkey-Signature','In-Reply-To',
+            'Message-Id','MIME-Version','Received','Received-SPF','References',
+            'Resend-From','Resend-To','Return-Path'
+            ),
+        3 => array(
+            'Date','From','Subject','To',
+            ),
+        4 => array(
+            'by', 'for', 'from', 'id', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':', ';', '<', '>', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => false,
+        3 => false,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #800000; font-weight: bold;',
+            4 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #000040;',
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #008000;',
+            4 => 'color: #0000FF; font-weight: bold;',
+            5 => 'font-weight: bold;',
+            6 => 'color: #400080;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Non-Standard-Header
+        1 => array(
+            GESHI_SEARCH => "(?<=\A\x20|\n)x-[a-z0-9\-]*(?=\s*:|\s*<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "smi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Email-Adresses or Mail-IDs
+        2 => array(
+            GESHI_SEARCH => "\b[\w\.]+@\w+(?:(?:\.\w+)*\.\w{2,4})?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Date values in RFC format
+        3 => array(
+            GESHI_SEARCH => "\b(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\s+\d\d?\s+" .
+                "(?:Jan|Feb|Mar|apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+" .
+                "\d{4}\s+\d\d?:\d\d:\d\d\s+[+\-]\d{4}(?:\s+\(\w+\))?",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //IP addresses
+        4 => array(
+            GESHI_SEARCH => "(?<=\s)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\s)|".
+                "(?<=\[)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=\])|".
+                "(?<==)\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?=<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "i",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Field-Assignments
+        5 => array(
+            GESHI_SEARCH => "(?<=\s)[A-Z0-9\-]+(?==(?!\s|$))",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "mi",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //MIME type
+        6 => array(
+            GESHI_SEARCH => "(?<=\s)(?:audio|application|image|multipart|text|".
+                "video|x-[a-z0-9\-]+)\/[a-z0-9][a-z0-9\-]*(?=\s|<|$)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "m",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => "/(?<start>^)[A-Z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?<end>$)/m"
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A\x20|\n)',
+                'DISALLOWED_AFTER' => '(?=\s*:)',
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)',
+                'DISALLOWED_AFTER' => '(?=\s|\b)',
+            )
+        ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/fortran.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/fortran.php
new file mode 100644
index 000000000..26dc9b19d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/fortran.php
@@ -0,0 +1,160 @@
+<?php
+/*************************************************************************************
+ * fortran.php
+ * -----------
+ * Author: Cedric Arrabie (cedric.arrabie@univ-pau.fr)
+ * Copyright: (C) 2006 Cetric Arrabie
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/04/22
+ *
+ * Fortran language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/04/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ *  -  Get a list of inbuilt functions to add (and explore fortran more
+ *     to complete this rather bare language file)
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME'=>'Fortran',
+    'COMMENT_SINGLE'=> array(1 =>'!',2=>'Cf2py'),
+    'COMMENT_MULTI'=> array(),
+    //Fortran Comments
+    'COMMENT_REGEXP' => array(1 => '/^C.*?$/mi'),
+    'CASE_KEYWORDS'=> GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS'=> array("'",'"'),
+    'ESCAPE_CHAR'=>'\\',
+    'KEYWORDS'=> array(
+        1 => array(
+            'allocate','block','call','case','contains','continue','cycle','deallocate',
+            'default','do','else','elseif','elsewhere','end','enddo','endif','endwhere',
+            'entry','exit','function','go','goto','if','interface','module','nullify','only',
+            'operator','procedure','program','recursive','return','select','stop',
+            'subroutine','then','to','where','while',
+            'access','action','advance','blank','blocksize','carriagecontrol',
+            'delim','direct','eor','err','exist','file','flen','fmt','form','formatted',
+            'iostat','name','named','nextrec','nml','number','opened','pad','position',
+            'readwrite','recl','sequential','status','unformatted','unit'
+            ),
+        2 => array(
+            '.AND.','.EQ.','.EQV.','.GE.','.GT.','.LE.','.LT.','.NE.','.NEQV.','.NOT.',
+            '.OR.','.TRUE.','.FALSE.'
+            ),
+        3 => array(
+            'allocatable','character','common','complex','data','dimension','double',
+            'equivalence','external','implicit','in','inout','integer','intent','intrinsic',
+            'kind','logical','namelist','none','optional','out','parameter','pointer',
+            'private','public','real','result','save','sequence','target','type','use'
+            ),
+        4 => array(
+            'abs','achar','acos','adjustl','adjustr','aimag','aint','all','allocated',
+            'anint','any','asin','atan','atan2','bit_size','break','btest','carg',
+            'ceiling','char','cmplx','conjg','cos','cosh','cpu_time','count','cshift',
+            'date_and_time','dble','digits','dim','dot_product','dprod dvchk',
+            'eoshift','epsilon','error','exp','exponent','floor','flush','fraction',
+            'getcl','huge','iachar','iand','ibclr','ibits','ibset','ichar','ieor','index',
+            'int','intrup','invalop','ior','iostat_msg','ishft','ishftc','lbound',
+            'len','len_trim','lge','lgt','lle','llt','log','log10','matmul','max','maxexponent',
+            'maxloc','maxval','merge','min','minexponent','minloc','minval','mod','modulo',
+            'mvbits','nbreak','ndperr','ndpexc','nearest','nint','not','offset','ovefl',
+            'pack','precfill','precision','present','product','prompt','radix',
+            'random_number','random_seed','range','repeat','reshape','rrspacing',
+            'scale','scan','segment','selected_int_kind','selected_real_kind',
+            'set_exponent','shape','sign','sin','sinh','size','spacing','spread','sqrt',
+            'sum system','system_clock','tan','tanh','timer','tiny','transfer','transpose',
+            'trim','ubound','undfl','unpack','val','verify'
+            ),
+        ),
+    'SYMBOLS'=> array(
+        '(',')','{','}','[',']','=','+','-','*','/','!','%','^','&',':'
+        ),
+    'CASE_SENSITIVE'=> array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES'=> array(
+        'KEYWORDS'=> array(
+            1 =>'color: #b1b100;',
+            2 =>'color: #000000; font-weight: bold;',
+            3 =>'color: #000066;',
+            4 =>'color: #993333;'
+            ),
+        'COMMENTS'=> array(
+            1 =>'color: #666666; font-style: italic;',
+            2 =>'color: #339933;',
+            'MULTI'=>'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR'=> array(
+            0 =>'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS'=> array(
+            0 =>'color: #009900;'
+            ),
+        'STRINGS'=> array(
+            0 =>'color: #ff0000;'
+            ),
+        'NUMBERS'=> array(
+            0 =>'color: #cc66cc;'
+            ),
+        'METHODS'=> array(
+            1 =>'color: #202020;',
+            2 =>'color: #202020;'
+            ),
+        'SYMBOLS'=> array(
+            0 =>'color: #339933;'
+            ),
+        'REGEXPS'=> array(
+            ),
+        'SCRIPT'=> array(
+            )
+        ),
+    'URLS'=> array(
+        1 =>'',
+        2 =>'',
+        3 =>'',
+        4 =>''
+        ),
+    'OOLANG'=> true,
+    'OBJECT_SPLITTERS'=> array(
+        1 =>'.',
+        2 =>'::'
+        ),
+    'REGEXPS'=> array(
+        ),
+    'STRICT_MODE_APPLIES'=> GESHI_NEVER,
+    'SCRIPT_DELIMITERS'=> array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK'=> array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/freebasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/freebasic.php
new file mode 100644
index 000000000..780305ba3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/freebasic.php
@@ -0,0 +1,141 @@
+<?php
+/*************************************************************************************
+ * freebasic.php
+ * -------------
+ * Author: Roberto Rossi
+ * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/08/19
+ *
+ * FreeBasic (http://www.freebasic.net/) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/19 (1.0.0)
+ *  -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'FreeBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "append", "as", "asc", "asin", "asm", "atan2", "atn", "beep", "bin", "binary", "bit",
+            "bitreset", "bitset", "bload", "bsave", "byref", "byte", "byval", "call",
+            "callocate", "case", "cbyte", "cdbl", "cdecl", "chain", "chdir", "chr", "cint",
+            "circle", "clear", "clng", "clngint", "close", "cls", "color", "command",
+            "common", "cons", "const", "continue", "cos", "cshort", "csign", "csng",
+            "csrlin", "cubyte", "cuint", "culngint", "cunsg", "curdir", "cushort", "custom",
+            "cvd", "cvi", "cvl", "cvlongint", "cvs", "cvshort", "data", "date",
+            "deallocate", "declare", "defbyte", "defdbl", "defined", "defint", "deflng",
+            "deflngint", "defshort", "defsng", "defstr", "defubyte", "defuint",
+            "defulngint", "defushort", "dim", "dir", "do", "double", "draw", "dylibload",
+            "dylibsymbol", "else", "elseif", "end", "enum", "environ", 'environ$', "eof",
+            "eqv", "erase", "err", "error", "exec", "exepath", "exit", "exp", "export",
+            "extern", "field", "fix", "flip", "for", "fre", "freefile", "function", "get",
+            "getjoystick", "getkey", "getmouse", "gosub", "goto", "hex", "hibyte", "hiword",
+            "if", "iif", "imagecreate", "imagedestroy", "imp", "inkey", "inp", "input",
+            "instr", "int", "integer", "is", "kill", "lbound", "lcase", "left", "len",
+            "let", "lib", "line", "lobyte", "loc", "local", "locate", "lock", "lof", "log",
+            "long", "longint", "loop", "loword", "lset", "ltrim", "mid", "mkd", "mkdir",
+            "mki", "mkl", "mklongint", "mks", "mkshort", "mod", "multikey", "mutexcreate",
+            "mutexdestroy", "mutexlock", "mutexunlock", "name", "next", "not", "oct", "on",
+            "once", "open", "option", "or", "out", "output", "overload", "paint", "palette",
+            "pascal", "pcopy", "peek", "peeki", "peeks", "pipe", "pmap", "point", "pointer",
+            "poke", "pokei", "pokes", "pos", "preserve", "preset", "print", "private",
+            "procptr", "pset", "ptr", "public", "put", "random", "randomize", "read",
+            "reallocate", "redim", "rem", "reset", "restore", "resume",
+            "return", "rgb", "rgba", "right", "rmdir", "rnd", "rset", "rtrim", "run",
+            "sadd", "screen", "screencopy", "screeninfo", "screenlock", "screenptr",
+            "screenres", "screenset", "screensync", "screenunlock", "seek", "statement",
+            "selectcase", "setdate", "setenviron", "setmouse",
+            "settime", "sgn", "shared", "shell", "shl", "short", "shr", "sin", "single",
+            "sizeof", "sleep", "space", "spc", "sqr", "static", "stdcall", "step", "stop",
+            "str", "string", "strptr", "sub", "swap", "system", "tab", "tan",
+            "then", "threadcreate", "threadwait", "time", "timer", "to", "trans",
+            "trim", "type", "ubound", "ubyte", "ucase", "uinteger", "ulongint", "union",
+            "unlock", "unsigned", "until", "ushort", "using", "va_arg", "va_first",
+            "va_next", "val", "val64", "valint", "varptr", "view", "viewprint", "wait",
+            "wend", "while", "width", "window", "windowtitle", "with", "write", "xor",
+            "zstring", "explicit", "escape", "true", "false"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #339933;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/genero.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/genero.php
new file mode 100644
index 000000000..1e3d7efb6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/genero.php
@@ -0,0 +1,463 @@
+<?php
+/*************************************************************************************
+ * genero.php
+ * ----------
+ * Author: Lars Gersmann (lars.gersmann@gmail.com)
+ * Copyright: (c) 2007 Lars Gersmann, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/07/01
+ *
+ * Genero (FOURJ's Genero 4GL) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/07/01 (1.0.0)
+ *  -  Initial release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'genero',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ABSOLUTE",
+            "ACCEPT",
+            "ACTION",
+            "ADD",
+            "AFTER",
+            "ALL",
+            "ALTER",
+            "AND",
+            "ANY",
+            "APPEND",
+            "APPLICATION",
+            "AS",
+            "AT",
+            "ATTRIBUTE",
+            "ATTRIBUTES",
+            "AUDIT",
+            "AVG",
+            "BEFORE",
+            "BEGIN",
+            "BETWEEN",
+            "BORDER",
+            "BOTTOM",
+            "BREAKPOINT",
+            "BUFFER",
+            "BUFFERED",
+            "BY",
+            "CALL",
+            "CANCEL",
+            "CASE",
+            "CENTURY",
+            "CHANGE",
+            "CHECK",
+            "CLEAR",
+            "CLIPPED",
+            "CLOSE",
+            "CLUSTER",
+            "COLUMN",
+            "COLUMNS",
+            "COMMAND",
+            "COMMENT",
+            "COMMIT",
+            "COMMITTED",
+            "CONCURRENT ",
+            "CONNECT",
+            "CONNECTION",
+            "CONSTANT",
+            "CONSTRAINED",
+            "CONSTRAINT",
+            "CONSTRUCT",
+            "CONTINUE",
+            "CONTROL",
+            "COUNT",
+            "CREATE",
+            "CROSS",
+            "CURRENT",
+            "DATABASE",
+            "DBA",
+            "DEC",
+            "DECLARE",
+            "DEFAULT",
+            "DEFAULTS",
+            "DEFER",
+            "DEFINE",
+            "DELETE",
+            "DELIMITER",
+            "DESCRIBE",
+            "DESTINATION",
+            "DIM",
+            "DIALOG",
+            "DIMENSION",
+            "DIRTY",
+            "DISCONNECT",
+            "DISPLAY",
+            "DISTINCT",
+            "DORMANT",
+            "DOWN",
+            "DROP",
+            "DYNAMIC",
+            "ELSE",
+            "END",
+            "ERROR",
+            "ESCAPE",
+            "EVERY",
+            "EXCLUSIVE",
+            "EXECUTE",
+            "EXISTS",
+            "EXIT",
+            "EXPLAIN",
+            "EXTEND",
+            "EXTENT",
+            "EXTERNAL",
+            "FETCH",
+            "FGL_DRAWBOX",
+            "FIELD",
+            "FIELD_TOUCHED",
+            "FILE",
+            "FILL",
+            "FINISH",
+            "FIRST",
+            "FLOAT",
+            "FLUSH",
+            "FOR",
+            "FOREACH",
+            "FORM",
+            "FORMAT",
+            "FOUND",
+            "FRACTION",
+            "FREE",
+            "FROM",
+            "FULL",
+            "FUNCTION",
+            "GET_FLDBUF",
+            "GLOBALS",
+            "GO",
+            "GOTO",
+            "GRANT",
+            "GROUP",
+            "HAVING",
+            "HEADER",
+            "HELP",
+            "HIDE",
+            "HOLD",
+            "HOUR",
+            "IDLE",
+            "IF",
+            "IMAGE",
+            "IMMEDIATE",
+            "IN",
+            "INDEX",
+            "INFIELD",
+            "INITIALIZE",
+            "INNER",
+            "INPUT",
+            "INSERT",
+            "INTERRUPT",
+            "INTERVAL",
+            "INTO",
+            "INVISIBLE",
+            "IS",
+            "ISOLATION",
+            "JOIN",
+            "KEEP",
+            "KEY",
+            "LABEL",
+            "LAST",
+            "LEFT",
+            "LENGTH",
+            "LET",
+            "LIKE",
+            "LINE",
+            "LINENO",
+            "LINES",
+            "LOAD",
+            "LOCATE",
+            "LOCK",
+            "LOG",
+            "LSTR",
+            "MAIN",
+            "MARGIN",
+            "MATCHES",
+            "MAX",
+            "MAXCOUNT",
+            "MDY",
+            "MEMORY",
+            "MENU",
+            "MESSAGE",
+            "MIN",
+            "MINUTE",
+            "MOD",
+            "MODE",
+            "MODIFY",
+            "MONEY",
+            "NAME",
+            "NEED",
+            "NEXT",
+            "NO",
+            "NORMAL",
+            "NOT",
+            "NOTFOUND",
+            "NULL",
+            "NUMERIC",
+            "OF",
+            "ON",
+            "OPEN",
+            "OPTION",
+            "OPTIONS",
+            "OR",
+            "ORDER",
+            "OTHERWISE",
+            "OUTER",
+            "OUTPUT",
+            "PAGE",
+            "PAGENO",
+            "PAUSE",
+            "PERCENT",
+            "PICTURE",
+            "PIPE",
+            "PRECISION",
+            "PREPARE",
+            "PREVIOUS",
+            "PRINT",
+            "PRINTER",
+            "PRINTX",
+            "PRIOR",
+            "PRIVILEGES",
+            "PROCEDURE",
+            "PROGRAM",
+            "PROMPT",
+            "PUBLIC",
+            "PUT",
+            "QUIT",
+            "READ",
+            "REAL",
+            "RECORD",
+            "RECOVER",
+            "RED ",
+            "RELATIVE",
+            "RENAME",
+            "REOPTIMIZATION",
+            "REPEATABLE",
+            "REPORT",
+            "RESOURCE",
+            "RETURN",
+            "RETURNING",
+            "REVERSE",
+            "REVOKE",
+            "RIGHT",
+            "ROLLBACK",
+            "ROLLFORWARD",
+            "ROW",
+            "ROWS",
+            "RUN",
+            "SCHEMA",
+            "SCREEN",
+            "SCROLL",
+            "SECOND",
+            "SELECT",
+            "SERIAL",
+            "SET",
+            "SFMT",
+            "SHARE",
+            "SHIFT",
+            "SHOW",
+            "SIGNAL ",
+            "SIZE",
+            "SKIP",
+            "SLEEP",
+            "SOME",
+            "SPACE",
+            "SPACES",
+            "SQL",
+            "SQLERRMESSAGE",
+            "SQLERROR",
+            "SQLSTATE",
+            "STABILITY",
+            "START",
+            "STATISTICS",
+            "STEP",
+            "STOP",
+            "STYLE",
+            "SUM",
+            "SYNONYM",
+            "TABLE",
+            "TEMP",
+            "TERMINATE",
+            "TEXT",
+            "THEN",
+            "THROUGH",
+            "THRU",
+            "TO",
+            "TODAY",
+            "TOP",
+            "TRAILER",
+            "TRANSACTION ",
+            "UNBUFFERED",
+            "UNCONSTRAINED",
+            "UNDERLINE",
+            "UNION",
+            "UNIQUE",
+            "UNITS",
+            "UNLOAD",
+            "UNLOCK",
+            "UP",
+            "UPDATE",
+            "USE",
+            "USER",
+            "USING",
+            "VALIDATE",
+            "VALUE",
+            "VALUES",
+            "VARCHAR",
+            "VIEW",
+            "WAIT",
+            "WAITING",
+            "WARNING",
+            "WHEN",
+            "WHENEVER",
+            "WHERE",
+            "WHILE",
+            "WINDOW",
+            "WITH",
+            "WITHOUT",
+            "WORDWRAP",
+            "WORK",
+            "WRAP"
+            ),
+        2 => array(
+            '&amp;IFDEF', '&amp;ENDIF'
+            ),
+        3 => array(
+            "ARRAY",
+            "BYTE",
+            "CHAR",
+            "CHARACTER",
+            "CURSOR",
+            "DATE",
+            "DATETIME",
+            "DECIMAL",
+            "DOUBLE",
+            "FALSE",
+            "INT",
+            "INTEGER",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "STRING",
+            "TIME",
+            "TRUE"
+            ),
+        4 => array(
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "BOLD",
+            "ANSI",
+            "ASC",
+            "ASCENDING",
+            "ASCII",
+            "CYAN",
+            "DESC",
+            "DESCENDING",
+            "GREEN",
+            "MAGENTA",
+            "OFF",
+            "WHITE",
+            "YELLOW",
+            "YEAR",
+            "DAY",
+            "MONTH",
+            "WEEKDAY"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gettext.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gettext.php
new file mode 100644
index 000000000..a1dcd8c8a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gettext.php
@@ -0,0 +1,97 @@
+<?php
+/*************************************************************************************
+ * gettext.php
+ * --------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/05/25
+ *
+ * GNU Gettext .po/.pot language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/02 (1.0.8)
+ *  -  New comments: flags and previous-fields
+ *  -  New keywords: msgctxt, msgid_plural
+ *  -  Msgstr array indices
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU Gettext',
+    'COMMENT_SINGLE' => array('#:', '#.', '#,', '#|', '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array('msgctxt', 'msgid_plural', 'msgid', 'msgstr'),
+    ),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;'
+        ),
+        'COMMENTS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #006666;',
+            4 => 'color: #666666; font-style: italic;',
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'REGEXPS' => array(),
+        'SYMBOLS' => array(),
+        'NUMBERS' => array(
+            0 => 'color: #000099;'
+        ),
+        'METHODS' => array(),
+        'SCRIPT' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #000099;'
+        ),
+    ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/glsl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/glsl.php
new file mode 100644
index 000000000..9b31fa482
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/glsl.php
@@ -0,0 +1,205 @@
+<?php
+/*************************************************************************************
+ * glsl.php
+ * -----
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2008 Benny Baumann (BenBE@omorphia.de)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/03/20
+ *
+ * glSlang language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/03/20 (1.0.7.21)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'glSlang',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'for', 'while', 'do', 'break', 'continue', 'asm',
+            'switch', 'case', 'default', 'return', 'discard',
+            'namespace', 'using', 'sizeof', 'cast'
+            ),
+        2 => array(
+            'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
+            'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
+            'public', 'static', 'extern', 'external', 'packed',
+            'inline', 'noinline', 'noperspective', 'flat'
+            ),
+        3 => array(
+            'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
+            'unsigned', 'lowp', 'mediump', 'highp', 'precision',
+            'vec2', 'vec3', 'vec4', 'bvec2', 'bvec3', 'bvec4',
+            'dvec2', 'dvec3', 'dvec4', 'fvec2', 'fvec3', 'fvec4',
+            'hvec2', 'hvec3', 'hvec4', 'ivec2', 'ivec3', 'ivec4',
+            'mat2', 'mat3', 'mat4', 'mat2x2', 'mat3x2', 'mat4x2',
+            'mat2x3', 'mat3x3', 'mat4x3', 'mat2x4', 'mat3x4', 'mat4x4',
+            'sampler1D', 'sampler2D', 'sampler3D', 'samplerCube',
+            'sampler1DShadow', 'sampler2DShadow',
+            'struct', 'class', 'union', 'enum', 'interface', 'template'
+            ),
+        4 => array(
+            'this', 'false', 'true'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan',
+            'pow', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'ceil',
+            'floor', 'fract', 'mod', 'min', 'max', 'clamp', 'mix', 'step',
+            'smoothstep', 'length', 'distance', 'dot', 'cross', 'normalize',
+            'ftransform', 'faceforward', 'reflect', 'matrixCompMult', 'equal',
+            'lessThan', 'lessThanEqual', 'greaterThan', 'greaterThanEqual',
+            'notEqual', 'any', 'all', 'not', 'texture1D', 'texture1DProj',
+            'texture1DLod', 'texture1DProjLod', 'texture2D', 'texture2DProj',
+            'texture2DLod', 'texture2DProjLod', 'texture3D', 'texture3DProj',
+            'texture3DLod', 'texture3DProjLod', 'textureCube', 'textureCubeLod',
+            'shadow1D', 'shadow1DProj', 'shadow1DLod', 'shadow1DProjLod',
+            'shadow2D', 'shadow2DProj', 'shadow2DLod', 'shadow2DProjLod',
+            'noise1', 'noise2', 'noise3', 'noise4'
+            ),
+        6 => array(
+            'gl_Position', 'gl_PointSize', 'gl_ClipVertex', 'gl_FragColor',
+            'gl_FragData', 'gl_FragDepth', 'gl_FragCoord', 'gl_FrontFacing',
+            'gl_Color', 'gl_SecondaryColor', 'gl_Normal', 'gl_Vertex',
+            'gl_MultiTexCoord0', 'gl_MultiTexCoord1', 'gl_MultiTexCoord2',
+            'gl_MultiTexCoord3', 'gl_MultiTexCoord4', 'gl_MultiTexCoord5',
+            'gl_MultiTexCoord6', 'gl_MultiTexCoord7', 'gl_FogCoord',
+            'gl_MaxLights', 'gl_MaxClipPlanes', 'gl_MaxTextureUnits',
+            'gl_MaxTextureCoords', 'gl_MaxVertexAttribs', 'gl_MaxVaryingFloats',
+            'gl_MaxVertexUniformComponents', 'gl_MaxVertexTextureImageUnits',
+            'gl_MaxCombinedTextureImageUnits', 'gl_MaxTextureImageUnits',
+            'gl_MaxFragmentUniformComponents', 'gl_MaxDrawBuffers', 'gl_Point',
+            'gl_ModelViewMatrix', 'gl_ProjectionMatrix', 'gl_FrontMaterial',
+            'gl_ModelViewProjectionMatrix', 'gl_TextureMatrix', 'gl_ClipPlane',
+            'gl_NormalMatrix', 'gl_ModelViewMatrixInverse', 'gl_BackMaterial',
+            'gl_ProjectionMatrixInverse', 'gl_ModelViewProjectionMatrixInverse',
+            'gl_TextureMatrixInverse', 'gl_ModelViewMatrixTranspose', 'gl_Fog',
+            'gl_ProjectionMatrixTranspose', 'gl_NormalScale', 'gl_DepthRange',
+            'gl_odelViewProjectionMatrixTranspose', 'gl_TextureMatrixTranspose',
+            'gl_ModelViewMatrixInverseTranspose', 'gl_LightSource',
+            'gl_ProjectionMatrixInverseTranspose', 'gl_LightModel',
+            'gl_ModelViewProjectionMatrixInverseTranspose', 'gl_TexCoord',
+            'gl_TextureMatrixInverseTranspose', 'gl_TextureEnvColor',
+            'gl_FrontLightModelProduct', 'gl_BackLightModelProduct',
+            'gl_FrontLightProduct', 'gl_BackLightProduct', 'gl_ObjectPlaneS',
+            'gl_ObjectPlaneT', 'gl_ObjectPlaneR', 'gl_ObjectPlaneQ',
+            'gl_EyePlaneS', 'gl_EyePlaneT', 'gl_EyePlaneR', 'gl_EyePlaneQ',
+            'gl_FrontColor', 'gl_BackColor', 'gl_FrontSecondaryColor',
+            'gl_BackSecondaryColor', 'gl_FogFragCoord', 'gl_PointCoord'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^',
+        '&', '?', ':', '.', '|', ';', ',', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #333399; font-weight: bold;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #333399; font-weight: bold;',
+            5 => 'color: #993333; font-weight: bold;',
+            6 => 'color: #551111;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009900;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_BEFORE' => '',
+            'MATCH_AFTER' => '[a-zA-Z_][a-zA-Z0-9_]*',
+            'MATCH_SPACES' => '[\s]*'
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gml.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gml.php
new file mode 100644
index 000000000..da3d3a8e8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gml.php
@@ -0,0 +1,506 @@
+<?php
+/*************************************************************************************
+ * gml.php
+ * --------
+ * Author: Jos� Jorge Enr�quez (jenriquez@users.sourceforge.net)
+ * Copyright: (c) 2005 Jos� Jorge Enr�quez Rodr�guez (http://www.zonamakers.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/06/21
+ *
+ * GML language file for GeSHi.
+ *
+ * GML (Game Maker Language) is a script language that is built-in into Game Maker,
+ * a game creation program, more info about Game Maker can be found at
+ * http://www.gamemaker.nl/
+ * All GML keywords were extracted from the Game Maker HTML Help file using a PHP
+ * script (one section at a time). I love PHP for saving me that bunch of work :P!.
+ * I think all GML functions have been indexed here, but I'm not sure about it, so
+ * please let me know of any issue you may find.
+ *
+ * CHANGES
+ * -------
+ * 2005/11/11
+ *  -  Changed 'CASE_KEYWORDS' fom 'GESHI_CAPS_LOWER' to 'GESHI_CAPS_NO_CHANGE',
+ *     so that MCI_command appears correctly (the only GML function using capitals).
+ *  -  Changed 'CASE_SENSITIVE' options, 'GESHI_COMMENTS' from true to false and all
+ *     of the others from false to true.
+ *  -  Deleted repeated entries.
+ *  -  div and mod are language keywords, moved (from symbols) to the appropiate section (1).
+ *  -  Moved self, other, all, noone and global identifiers to language keywords section 1.
+ *  -  Edited this file lines to a maximum width of 100 characters (as stated in
+ *     the GeSHi docs). Well, not strictly to 100 but around it.
+ *  -  Corrected some minor issues (the vk_f1...vk_f12 keys and similar).
+ *  -  Deleted the KEYWORDS=>5 and KEYWORDS=>6 sections (actually, they were empty).
+ *     I was planning of using those for the GML functions available only in the
+ *     registered version of the program, but not anymore.
+ *
+ * 2005/06/26 (1.0.3)
+ *  -  First Release.
+ *
+ * TODO (updated 2005/11/11)
+ * -------------------------
+ *  -  Test it for a while and make the appropiate corrections.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GML',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // language keywords
+        1 => array(
+            'break', 'continue', 'do', 'until', 'if', 'else',
+            'exit', 'for', 'repeat', 'return', 'switch',
+            'case', 'default', 'var', 'while', 'with', 'div', 'mod',
+            // GML Language overview
+            'self', 'other', 'all', 'noone', 'global',
+            ),
+        // modifiers and built-in variables
+        2 => array(
+            // Game play
+            'x','y','xprevious','yprevious','xstart','ystart','hspeed','vspeed','direction','speed',
+            'friction','gravity','gravity_direction',
+            'path_index','path_position','path_positionprevious','path_speed','path_orientation',
+            'path_endaction',
+            'object_index','id','mask_index','solid','persistent','instance_count','instance_id',
+            'room_speed','fps','current_time','current_year','current_month','current_day','current_weekday',
+            'current_hour','current_minute','current_second','alarm','timeline_index','timeline_position',
+            'timeline_speed',
+            'room','room_first','room_last','room_width','room_height','room_caption','room_persistent',
+            'score','lives','health','show_score','show_lives','show_health','caption_score','caption_lives',
+            'caption_health',
+            'event_type','event_number','event_object','event_action',
+            'error_occurred','error_last',
+            // User interaction
+            'keyboard_lastkey','keyboard_key','keyboard_lastchar','keyboard_string',
+            'mouse_x','mouse_y','mouse_button','mouse_lastbutton',
+            // Game Graphics
+            'sprite_index','sprite_width','sprite_height','sprite_xoffset','sprite_yoffset',
+            'image_number','image_index','image_speed','image_xscale','image_yscale','image_angle',
+            'image_alpha','image_blend','bbox_left','bbox_right','bbox_top','bbox_bottom',
+            'background_color','background_showcolor','background_visible','background_foreground',
+            'background_index','background_x','background_y','background_width','background_height',
+            'background_htiled','background_vtiled','background_xscale','background_yscale',
+            'background_hspeed','background_vspeed','background_blend','background_alpha',
+            'background','left, top, width, height','depth','visible','xscale','yscale','blend','alpha',
+            'view_enabled','view_current','view_visible','view_yview','view_wview','view_hview','view_xport',
+            'view_yport','view_wport','view_hport','view_angle','view_hborder','view_vborder','view_hspeed',
+            'view_vspeed','view_object',
+            'transition_kind',
+            // Files, registry and executing programs
+            'game_id','working_directory','temp_directory',
+            'secure_mode',
+            // Creating particles
+            'xmin', 'xmax', 'ymin', 'ymax','shape','distribution','particle type','number',
+            'force','dist','kind','additive', 'parttype1', 'parttype2'
+            ),
+        // functions
+        3 => array(
+            // Computing things
+            'random','choose','abs','sign','round','floor','ceil','frac','sqrt','sqr','power','exp','ln',
+            'log2','log10','logn','sin','cos','tan','arcsin','arccos','arctan','arctan2','degtorad',
+            'radtodeg','min','max','mean','median','point_distance','point_direction','lengthdir_x',
+            'lengthdir_y','is_real','is_string',
+            'chr','ord','real','string','string_format','string_length','string_pos','string_copy',
+            'string_char_at','string_delete','string_insert','string_replace','string_replace_all',
+            'string_count','string_lower','string_upper','string_repeat','string_letters','string_digits',
+            'string_lettersdigits','clipboard_has_text','clipboard_get_text','clipboard_set_text',
+            'date_current_datetime','date_current_date','date_current_time','date_create_datetime',
+            'date_create_date','date_create_time','date_valid_datetime','date_valid_date','date_valid_time',
+            'date_inc_year','date_inc_month','date_inc_week','date_inc_day','date_inc_hour',
+            'date_inc_minute','date_inc_second','date_get_year','date_get_month','date_get_week',
+            'date_get_day','date_get_hour', 'date_get_minute','date_get_second','date_get_weekday',
+            'date_get_day_of_year','date_get_hour_of_year','date_get_minute_of_year',
+            'date_get_second_of_year','date_year_span','date_month_span','date_week_span','date_day_span',
+            'date_hour_span','date_minute_span','date_second_span','date_compare_datetime',
+            'date_compare_date','date_compare_time','date_date_of','date_time_of','date_datetime_string',
+            'date_date_string','date_time_string','date_days_in_month','date_days_in_year','date_leap_year',
+            'date_is_today',
+            // Game play
+            'motion_set','motion_add','place_free','place_empty','place_meeting','place_snapped',
+            'move_random','move_snap','move_wrap','move_towards_point','move_bounce_solid','move_bounce_all',
+            'move_contact_solid','move_contact_all','move_outside_solid','move_outside_all',
+            'distance_to_point','distance_to_object','position_empty','position_meeting',
+            'path_start','path_end',
+            'mp_linear_step','mp_linear_step_object','mp_potential_step','mp_potential_step_object',
+            'mp_potential_settings','mp_linear_path','mp_linear_path_object', 'mp_potential_path',
+            'mp_potential_path_object','mp_grid_create','mp_grid_destroy','mp_grid_clear_all',
+            'mp_grid_clear_cell','mp_grid_clear_rectangle','mp_grid_add_cell','mp_grid_add_rectangle',
+            'mp_grid_add_instances','mp_grid_path','mp_grid_draw',
+            'collision_point','collision_rectangle','collision_circle','collision_ellipse','collision_line',
+            'instance_find','instance_exists','instance_number','instance_position','instance_nearest',
+            'instance_furthest','instance_place','instance_create','instance_copy','instance_destroy',
+            'instance_change','position_destroy','position_change',
+            'instance_deactivate_all','instance_deactivate_object','instance_deactivate_region',
+            'instance_activate_all','instance_activate_object','instance_activate_region',
+            'sleep',
+            'room_goto','room_goto_previous','room_goto_next','room_restart','room_previous','room_next',
+            'game_end','game_restart','game_save','game_load',
+            'event_perform', 'event_perform_object','event_user','event_inherited',
+            'show_debug_message','variable_global_exists','variable_local_exists','variable_global_get',
+            'variable_global_array_get','variable_global_array2_get','variable_local_get',
+            'variable_local_array_get','variable_local_array2_get','variable_global_set',
+            'variable_global_array_set','variable_global_array2_set','variable_local_set',
+            'variable_local_array_set','variable_local_array2_set','set_program_priority',
+            // User interaction
+            'keyboard_set_map','keyboard_get_map','keyboard_unset_map','keyboard_check',
+            'keyboard_check_pressed','keyboard_check_released','keyboard_check_direct',
+            'keyboard_get_numlock','keyboard_set_numlock','keyboard_key_press','keyboard_key_release',
+            'keyboard_clear','io_clear','io_handle','keyboard_wait',
+            'mouse_check_button','mouse_check_button_pressed','mouse_check_button_released','mouse_clear',
+            'mouse_wait',
+            'joystick_exists','joystick_name','joystick_axes','joystick_buttons','joystick_has_pov',
+            'joystick_direction','joystick_check_button','joystick_xpos','joystick_ypos','joystick_zpos',
+            'joystick_rpos','joystick_upos','joystick_vpos','joystick_pov',
+            // Game Graphics
+            'draw_sprite','draw_sprite_stretched','draw_sprite_tiled','draw_sprite_part','draw_background',
+            'draw_background_stretched','draw_background_tiled','draw_background_part','draw_sprite_ext',
+            'draw_sprite_stretched_ext','draw_sprite_tiled_ext','draw_sprite_part_ext','draw_sprite_general',
+            'draw_background_ext','draw_background_stretched_ext','draw_background_tiled_ext',
+            'draw_background_part_ext','draw_background_general',
+            'draw_clear','draw_clear_alpha','draw_point','draw_line','draw_rectangle','draw_roundrect',
+            'draw_triangle','draw_circle','draw_ellipse','draw_arrow','draw_button','draw_path',
+            'draw_healthbar','draw_set_color','draw_set_alpha','draw_get_color','draw_get_alpha',
+            'make_color_rgb','make_color_hsv','color_get_red','color_get_green','color_get_blue',
+            'color_get_hue','color_get_saturation','color_get_value','merge_color','draw_getpixel',
+            'screen_save','screen_save_part',
+            'draw_set_font','draw_set_halign','draw_set_valign','draw_text','draw_text_ext','string_width',
+            'string_height','string_width_ext','string_height_ext','draw_text_transformed',
+            'draw_text_ext_transformed','draw_text_color','draw_text_ext_color',
+            'draw_text_transformed_color','draw_text_ext_transformed_color',
+            'draw_point_color','draw_line_color','draw_rectangle_color','draw_roundrect_color',
+            'draw_triangle_color','draw_circle_color','draw_ellipse_color','draw_primitive_begin',
+            'draw_vertex','draw_vertex_color','draw_primitive_end','sprite_get_texture',
+            'background_get_texture','texture_preload','texture_set_priority',
+            'texture_get_width','texture_get_height','draw_primitive_begin_texture','draw_vertex_texture',
+            'draw_vertex_texture_color','texture_set_interpolation',
+            'texture_set_blending','texture_set_repeat','draw_set_blend_mode','draw_set_blend_mode_ext',
+            'surface_create','surface_free','surface_exists','surface_get_width','surface_get_height',
+            'surface_get_texture','surface_set_target','surface_reset_target','surface_getpixel',
+            'surface_save','surface_save_part','draw_surface','draw_surface_stretched','draw_surface_tiled',
+            'draw_surface_part','draw_surface_ext','draw_surface_stretched_ext','draw_surface_tiled_ext',
+            'draw_surface_part_ext','draw_surface_general','surface_copy','surface_copy_part',
+            'tile_add','tile_delete','tile_exists','tile_get_x','tile_get_y','tile_get_left','tile_get_top',
+            'tile_get_width','tile_get_height','tile_get_depth','tile_get_visible','tile_get_xscale',
+            'tile_get_yscale','tile_get_background','tile_get_blend','tile_get_alpha','tile_set_position',
+            'tile_set_region','tile_set_background','tile_set_visible','tile_set_depth','tile_set_scale',
+            'tile_set_blend','tile_set_alpha','tile_layer_hide','tile_layer_show','tile_layer_delete',
+            'tile_layer_shift','tile_layer_find','tile_layer_delete_at','tile_layer_depth',
+            'display_get_width','display_get_height','display_get_colordepth','display_get_frequency',
+            'display_set_size','display_set_colordepth','display_set_frequency','display_set_all',
+            'display_test_all','display_reset','display_mouse_get_x','display_mouse_get_y','display_mouse_set',
+            'window_set_visible','window_get_visible','window_set_fullscreen','window_get_fullscreen',
+            'window_set_showborder','window_get_showborder','window_set_showicons','window_get_showicons',
+            'window_set_stayontop','window_get_stayontop','window_set_sizeable','window_get_sizeable',
+            'window_set_caption','window_get_caption','window_set_cursor', 'window_get_cursor',
+            'window_set_color','window_get_color','window_set_region_scale','window_get_region_scale',
+            'window_set_position','window_set_size','window_set_rectangle','window_center','window_default',
+            'window_get_x','window_get_y','window_get_width','window_get_height','window_mouse_get_x',
+            'window_mouse_get_y','window_mouse_set',
+            'window_set_region_size','window_get_region_width','window_get_region_height',
+            'window_view_mouse_get_x','window_view_mouse_get_y','window_view_mouse_set',
+            'window_views_mouse_get_x','window_views_mouse_get_y','window_views_mouse_set',
+            'screen_redraw','screen_refresh','set_automatic_draw','set_synchronization','screen_wait_vsync',
+            // Sound and music)
+            'sound_play','sound_loop','sound_stop','sound_stop_all','sound_isplaying','sound_volume',
+            'sound_global_volume','sound_fade','sound_pan','sound_background_tempo','sound_set_search_directory',
+            'sound_effect_set','sound_effect_chorus','sound_effect_echo',    'sound_effect_flanger',
+            'sound_effect_gargle','sound_effect_reverb','sound_effect_compressor','sound_effect_equalizer',
+            'sound_3d_set_sound_position','sound_3d_set_sound_velocity','sound_3d_set_sound_distance',
+            'sound_3d_set_sound_cone',
+            'cd_init','cd_present','cd_number','cd_playing','cd_paused','cd_track','cd_length',
+            'cd_track_length','cd_position','cd_track_position','cd_play','cd_stop','cd_pause','cd_resume',
+            'cd_set_position','cd_set_track_position','cd_open_door','cd_close_door','MCI_command',
+            // Splash screens, highscores, and other pop-ups
+            'show_text','show_image','show_video','show_info','load_info',
+            'show_message','show_message_ext','show_question','get_integer','get_string',
+            'message_background','message_alpha','message_button','message_text_font','message_button_font',
+            'message_input_font','message_mouse_color','message_input_color','message_caption',
+            'message_position','message_size','show_menu','show_menu_pos','get_color','get_open_filename',
+            'get_save_filename','get_directory','get_directory_alt','show_error',
+            'highscore_show','highscore_set_background','highscore_set_border','highscore_set_font',
+            'highscore_set_colors','highscore_set_strings','highscore_show_ext','highscore_clear',
+            'highscore_add','highscore_add_current','highscore_value','highscore_name','draw_highscore',
+            // Resources
+            'sprite_exists','sprite_get_name','sprite_get_number','sprite_get_width','sprite_get_height',
+            'sprite_get_transparent','sprite_get_smooth','sprite_get_preload','sprite_get_xoffset',
+            'sprite_get_yoffset','sprite_get_bbox_left','sprite_get_bbox_right','sprite_get_bbox_top',
+            'sprite_get_bbox_bottom','sprite_get_bbox_mode','sprite_get_precise',
+            'sound_exists','sound_get_name','sound_get_kind','sound_get_preload','sound_discard',
+            'sound_restore',
+            'background_exists','background_get_name','background_get_width','background_get_height',
+            'background_get_transparent','background_get_smooth','background_get_preload',
+            'font_exists','font_get_name','font_get_fontname','font_get_bold','font_get_italic',
+            'font_get_first','font_get_last',
+            'path_exists','path_get_name','path_get_length','path_get_kind','path_get_closed',
+            'path_get_precision','path_get_number','path_get_point_x','path_get_point_y',
+            'path_get_point_speed','path_get_x','path_get_y','path_get_speed',
+            'script_exists','script_get_name','script_get_text',
+            'timeline_exists','timeline_get_name',
+            'object_exists','object_get_name','object_get_sprite','object_get_solid','object_get_visible',
+            'object_get_depth','object_get_persistent','object_get_mask','object_get_parent',
+            'object_is_ancestor',
+            'room_exists','room_get_name',
+            // Changing resources
+            'sprite_set_offset','sprite_set_bbox_mode','sprite_set_bbox','sprite_set_precise',
+            'sprite_duplicate','sprite_assign','sprite_merge','sprite_add','sprite_replace',
+            'sprite_create_from_screen','sprite_add_from_screen','sprite_create_from_surface',
+            'sprite_add_from_surface','sprite_delete','sprite_set_alpha_from_sprite',
+            'sound_add','sound_replace','sound_delete',
+            'background_duplicate','background_assign','background_add','background_replace',
+            'background_create_color','background_create_gradient','background_create_from_screen',
+            'background_create_from_surface','background_delete','background_set_alpha_from_background',
+            'font_add','font_add_sprite','font_replace_sprite','font_delete',
+            'path_set_kind','path_set_closed','path_set_precision','path_add','path_delete','path_duplicate',
+            'path_assign','path_append','path_add_point','path_insert_point','path_change_point',
+            'path_delete_point','path_clear_points','path_reverse','path_mirror','path_flip','path_rotate',
+            'path_scale','path_shift',
+            'execute_string','execute_file','script_execute',
+            'timeline_add','timeline_delete','timeline_moment_add','timeline_moment_clear',
+            'object_set_sprite','object_set_solid','object_set_visible','object_set_depth',
+            'object_set_persistent','object_set_mask','object_set_parent','object_add','object_delete',
+            'object_event_add','object_event_clear',
+            'room_set_width','room_set_height','room_set_caption','room_set_persistent','room_set_code',
+            'room_set_background_color','room_set_background','room_set_view','room_set_view_enabled',
+            'room_add','room_duplicate','room_assign','room_instance_add','room_instance_clear',
+            'room_tile_add','room_tile_add_ext','room_tile_clear',
+            // Files, registry and executing programs
+            'file_text_open_read','file_text_open_write','file_text_open_append','file_text_close',
+            'file_text_write_string','file_text_write_real','file_text_writeln','file_text_read_string',
+            'file_text_read_real','file_text_readln','file_text_eof','file_exists','file_delete',
+            'file_rename','file_copy','directory_exists','directory_create','file_find_first',
+            'file_find_next','file_find_close','file_attributes', 'filename_name','filename_path',
+            'filename_dir','filename_drive','filename_ext','filename_change_ext','file_bin_open',
+            'file_bin_rewrite','file_bin_close','file_bin_size','file_bin_position','file_bin_seek',
+            'file_bin_write_byte','file_bin_read_byte','parameter_count','parameter_string',
+            'environment_get_variable',
+            'registry_write_string','registry_write_real','registry_read_string','registry_read_real',
+            'registry_exists','registry_write_string_ext','registry_write_real_ext',
+            'registry_read_string_ext','registry_read_real_ext','registry_exists_ext','registry_set_root',
+            'ini_open','ini_close','ini_read_string','ini_read_real','ini_write_string','ini_write_real',
+            'ini_key_exists','ini_section_exists','ini_key_delete','ini_section_delete',
+            'execute_program','execute_shell',
+            // Data structures
+            'ds_stack_create','ds_stack_destroy','ds_stack_clear','ds_stack_size','ds_stack_empty',
+            'ds_stack_push','ds_stack_pop','ds_stack_top',
+            'ds_queue_create','ds_queue_destroy','ds_queue_clear','ds_queue_size','ds_queue_empty',
+            'ds_queue_enqueue','ds_queue_dequeue','ds_queue_head','ds_queue_tail',
+            'ds_list_create','ds_list_destroy','ds_list_clear','ds_list_size','ds_list_empty','ds_list_add',
+            'ds_list_insert','ds_list_replace','ds_list_delete','ds_list_find_index','ds_list_find_value',
+            'ds_list_sort',
+            'ds_map_create','ds_map_destroy','ds_map_clear','ds_map_size','ds_map_empty','ds_map_add',
+            'ds_map_replace','ds_map_delete','ds_map_exists','ds_map_find_value','ds_map_find_previous',
+            'ds_map_find_next','ds_map_find_first','ds_map_find_last',
+            'ds_priority_create','ds_priority_destroy','ds_priority_clear','ds_priority_size',
+            'ds_priority_empty','ds_priority_add','ds_priority_change_priority','ds_priority_find_priority',
+            'ds_priority_delete_value','ds_priority_delete_min','ds_priority_find_min',
+            'ds_priority_delete_max','ds_priority_find_max',
+            'ds_grid_create','ds_grid_destroy','ds_grid_resize','ds_grid_width','ds_grid_height',
+            'ds_grid_clear','ds_grid_set','ds_grid_add','ds_grid_multiply','ds_grid_set_region',
+            'ds_grid_add_region','ds_grid_multiply_region','ds_grid_set_disk','ds_grid_add_disk',
+            'ds_grid_multiply_disk','ds_grid_get','ds_grid_get_sum','ds_grid_get_max','ds_grid_get_min',
+            'ds_grid_get_mean','ds_grid_get_disk_sum','ds_grid_get_disk_min','ds_grid_get_disk_max',
+            'ds_grid_get_disk_mean','ds_grid_value_exists','ds_grid_value_x','ds_grid_value_y',
+            'ds_grid_value_disk_exists','ds_grid_value_disk_x','ds_grid_value_disk_y',
+            // Creating particles
+            'effect_create_below','effect_create_above','effect_clear',
+            'part_type_create','part_type_destroy','part_type_exists','part_type_clear','part_type_shape',
+            'part_type_sprite','part_type_size','part_type_scale',
+            'part_type_orientation','part_type_color1','part_type_color2','part_type_color3',
+            'part_type_color_mix','part_type_color_rgb','part_type_color_hsv',
+            'part_type_alpha1','part_type_alpha2','part_type_alpha3','part_type_blend','part_type_life',
+            'part_type_step','part_type_death','part_type_speed','part_type_direction','part_type_gravity',
+            'part_system_create','part_system_destroy','part_system_exists','part_system_clear',
+            'part_system_draw_order','part_system_depth','part_system_position',
+            'part_system_automatic_update','part_system_automatic_draw','part_system_update',
+            'part_system_drawit','part_particles_create','part_particles_create_color',
+            'part_particles_clear','part_particles_count',
+            'part_emitter_create','part_emitter_destroy','part_emitter_destroy_all','part_emitter_exists',
+            'part_emitter_clear','part_emitter_region','part_emitter_burst','part_emitter_stream',
+            'part_attractor_create','part_attractor_destroy','part_attractor_destroy_all',
+            'part_attractor_exists','part_attractor_clear','part_attractor_position','part_attractor_force',
+            'part_destroyer_create','part_destroyer_destroy','part_destroyer_destroy_all',
+            'part_destroyer_exists','part_destroyer_clear','part_destroyer_region',
+            'part_deflector_create','part_deflector_destroy','part_deflector_destroy_all',
+            'part_deflector_exists','part_deflector_clear','part_deflector_region','part_deflector_kind',
+            'part_deflector_friction',
+            'part_changer_create','part_changer_destroy','part_changer_destroy_all','part_changer_exists',
+            'part_changer_clear','part_changer_region','part_changer_types','part_changer_kind',
+            // Multiplayer games
+            'mplay_init_ipx','mplay_init_tcpip','mplay_init_modem','mplay_init_serial',
+            'mplay_connect_status','mplay_end','mplay_ipaddress',
+            'mplay_session_create','mplay_session_find','mplay_session_name','mplay_session_join',
+            'mplay_session_mode','mplay_session_status','mplay_session_end',
+            'mplay_player_find','mplay_player_name','mplay_player_id',
+            'mplay_data_write','mplay_data_read','mplay_data_mode',
+            'mplay_message_send','mplay_message_send_guaranteed','mplay_message_receive','mplay_message_id',
+            'mplay_message_value','mplay_message_player','mplay_message_name','mplay_message_count',
+            'mplay_message_clear',
+            // Using DLL's
+            'external_define','external_call','external_free','window_handle',
+            // 3D Graphics
+            'd3d_start','d3d_end','d3d_set_hidden','d3d_set_perspective',
+            'd3d_set_depth',
+            'd3d_primitive_begin','d3d_vertex','d3d_vertex_color','d3d_primitive_end',
+            'd3d_primitive_begin_texture','d3d_vertex_texture','d3d_vertex_texture_color','d3d_set_culling',
+            'd3d_draw_block','d3d_draw_cylinder','d3d_draw_cone','d3d_draw_ellipsoid','d3d_draw_wall',
+            'd3d_draw_floor',
+            'd3d_set_projection','d3d_set_projection_ext','d3d_set_projection_ortho',
+            'd3d_set_projection_perspective',
+            'd3d_transform_set_identity','d3d_transform_set_translation','d3d_transform_set_scaling',
+            'd3d_transform_set_rotation_x','d3d_transform_set_rotation_y','d3d_transform_set_rotation_z',
+            'd3d_transform_set_rotation_axis','d3d_transform_add_translation','d3d_transform_add_scaling',
+            'd3d_transform_add_rotation_x','d3d_transform_add_rotation_y','d3d_transform_add_rotation_z',
+            'd3d_transform_add_rotation_axis','d3d_transform_stack_clear','d3d_transform_stack_empty',
+            'd3d_transform_stack_push','d3d_transform_stack_pop','d3d_transform_stack_top',
+            'd3d_transform_stack_discard',
+            'd3d_set_fog',
+            'd3d_set_lighting','d3d_set_shading','d3d_light_define_direction','d3d_light_define_point',
+            'd3d_light_enable','d3d_vertex_normal','d3d_vertex_normal_color','d3d_vertex_normal_texture',
+            'd3d_vertex_normal_texture_color',
+            'd3d_model_create','d3d_model_destroy','d3d_model_clear','d3d_model_save','d3d_model_load',
+            'd3d_model_draw','d3d_model_primitive_begin','d3d_model_vertex','d3d_model_vertex_color',
+            'd3d_model_vertex_texture','d3d_model_vertex_texture_color','d3d_model_vertex_normal',
+            'd3d_model_vertex_normal_color','d3d_model_vertex_normal_texture',
+            'd3d_model_vertex_normal_texture_color','d3d_model_primitive_end','d3d_model_block',
+            'd3d_model_cylinder','d3d_model_cone','d3d_model_ellipsoid','d3d_model_wall','d3d_model_floor'
+            ),
+        // constants
+        4 => array(
+            'true', 'false', 'pi',
+            'ev_destroy','ev_step','ev_alarm','ev_keyboard','ev_mouse','ev_collision','ev_other','ev_draw',
+            'ev_keypress','ev_keyrelease','ev_left_button','ev_right_button','ev_middle_button',
+            'ev_no_button','ev_left_press','ev_right_press','ev_middle_press','ev_left_release',
+            'ev_right_release','ev_middle_release','ev_mouse_enter','ev_mouse_leave','ev_mouse_wheel_up',
+            'ev_mouse_wheel_down','ev_global_left_button','ev_global_right_button','ev_global_middle_button',
+            'ev_global_left_press','ev_global_right_press','ev_global_middle_press','ev_global_left_release',
+            'ev_global_right_release','ev_global_middle_release','ev_joystick1_left','ev_joystick1_right',
+            'ev_joystick1_up','ev_joystick1_down','ev_joystick1_button1','ev_joystick1_button2',
+            'ev_joystick1_button3','ev_joystick1_button4','ev_joystick1_button5','ev_joystick1_button6',
+            'ev_joystick1_button7','ev_joystick1_button8','ev_joystick2_left','ev_joystick2_right',
+            'ev_joystick2_up','ev_joystick2_down','ev_joystick2_button1','ev_joystick2_button2',
+            'ev_joystick2_button3','ev_joystick2_button4','ev_joystick2_button5','ev_joystick2_button6',
+            'ev_joystick2_button7','ev_joystick2_button8',
+            'ev_outside','ev_boundary','ev_game_start','ev_game_end','ev_room_start','ev_room_end',
+            'ev_no_more_lives','ev_no_more_health','ev_animation_end','ev_end_of_path','ev_user0','ev_user1',
+            'ev_user2','ev_user3','ev_user4','ev_user5','ev_user6','ev_user7','ev_user8','ev_user9',
+            'ev_user10','ev_user11','ev_user12','ev_user13','ev_user14','ev_user15','ev_step_normal',
+            'ev_step_begin','ev_step_end',
+            'vk_nokey','vk_anykey','vk_left','vk_right','vk_up','vk_down','vk_enter','vk_escape','vk_space',
+            'vk_shift','vk_control','vk_alt','vk_backspace','vk_tab','vk_home','vk_end','vk_delete',
+            'vk_insert','vk_pageup','vk_pagedown','vk_pause','vk_printscreen',
+            'vk_f1','vk_f2','vk_f3','vk_f4','vk_f5','vk_f6','vk_f7','vk_f8','vk_f9','vk_f10','vk_f11','vk_f12',
+            'vk_numpad0','vk_numpad1','vk_numpad2','vk_numpad3','vk_numpad4','vk_numpad5','vk_numpad6',
+            'vk_numpad7','vk_numpad8','vk_numpad9', 'vk_multiply','vk_divide','vk_add','vk_subtract',
+            'vk_decimal','vk_lshift','vk_lcontrol','vk_lalt','vk_rshift','vk_rcontrol','vk_ralt',
+            'c_aqua','c_black','c_blue','c_dkgray','c_fuchsia','c_gray','c_green','c_lime','c_ltgray',
+            'c_maroon','c_navy','c_olive','c_purple','c_red','c_silver','c_teal','c_white','c_yellow',
+            'fa_left', 'fa_center','fa_right','fa_top','fa_middle','fa_bottom',
+            'pr_pointlist','pr_linelist','pr_linestrip','pr_trianglelist','pr_trianglestrip',
+            'pr_trianglefan',
+            'cr_none','cr_arrow','cr_cross','cr_beam','cr_size_nesw','cr_size_ns','cr_size_nwse',
+            'cr_size_we','cr_uparrow','cr_hourglass','cr_drag','cr_nodrop','cr_hsplit','cr_vsplit',
+            'cr_multidrag','cr_sqlwait','cr_no','cr_appstart','cr_help','cr_handpoint','cr_size_all',
+            'se_chorus','se_echo','se_flanger','se_gargle','se_reverb','se_compressor','se_equalizer',
+            'fa_readonly','fa_hidden','fa_sysfile','fa_volumeid','fa_directory','fa_archive',
+            'pt_shape_pixel','pt_shape_disk','pt_shape_square','pt_shape_line','pt_shape_star',
+            'pt_shape_circle','pt_shape_ring','pt_shape_sphere','pt_shape_flare','pt_shape_spark',
+            'pt_shape_explosion','pt_shape_cloud','pt_shape_smoke','pt_shape_snow',
+            'ps_shape_rectangle','ps_shape_ellipse ','ps_shape_diamond','ps_shape_line',
+            'ps_distr_linear','ps_distr_gaussian','ps_force_constant','ps_force_linear','ps_force_quadratic',
+            'ps_deflect_horizontal', 'ps_deflect_vertical',
+            'ps_change_motion','ps_change_shape','ps_change_all'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '&&', '||', '^^', '&', '|', '^',
+        '<', '<=', '==', '!=', '>', '>=', '=',
+        '<<', '>>',
+        '+=', '-=', '*=', '/=',
+        '+', '-', '*', '/',
+        '!', '~', ',', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold; color: #000000;',
+            2 => 'font-weight: bold; color: #000000;',
+            3 => 'color: navy;',
+            4 => 'color: #663300;',
+            ),
+        'COMMENTS' => array(
+            1 => 'font-style: italic; color: green;',
+            'MULTI' => 'font-style: italic; color: green;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;' //'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gnuplot.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gnuplot.php
new file mode 100644
index 000000000..863d0dbd6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/gnuplot.php
@@ -0,0 +1,296 @@
+<?php
+/*************************************************************************************
+ * gnuplot.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/07/07
+ *
+ * Gnuplot script language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/07 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Gnuplot',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('`', '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // copy output of help command, indent properly and use this replace regexp:
+        // ([a-z0-9_\-]+)(( )+|$)          =>     '\1',\3
+
+        // commands as found in `help commands`
+        1 => array(
+            'bind', 'call', 'cd', 'clear',
+            'exit', 'fit', 'help', 'history',
+            'if', 'load', 'lower', 'pause',
+            'plot', 'print', 'pwd', 'quit',
+            'raise', 'replot', 'reread', 'reset',
+            'save', 'set', 'shell', 'show',
+            'splot', 'system', 'test', 'unset',
+            'update'
+            ),
+        2 => array(
+            // set commands as returned by `help set`
+            'angles', 'arrow', 'autoscale', 'bars',
+            'bmargin', 'border', 'boxwidth', 'cbdata',
+            'cbdtics', 'cblabel', 'cbmtics', 'cbrange',
+            'cbtics', 'clabel', 'clip', 'cntrparam',
+            'colorbox', 'contour', 'datafile', 'date_specifiers',
+            'decimalsign', 'dgrid3d', 'dummy', 'encoding',
+            'fontpath', 'format', 'grid',
+            'hidden3d', 'historysize', 'isosamples', 'key',
+            'label', 'lmargin', 'loadpath', 'locale',
+            'log', 'logscale', 'macros', 'mapping',
+            'margin', 'missing', 'mouse', 'multiplot',
+            'mx2tics', 'mxtics', 'my2tics', 'mytics',
+            'mztics', 'object', 'offsets', 'origin',
+            'output', 'palette', 'parametric', 'pm3d',
+            'pointsize', 'polar', 'rmargin',
+            'rrange', 'samples', 'size', 'style',
+            'surface', 'table', 'term', 'terminal',
+            'termoption', 'tics', 'ticscale', 'ticslevel',
+            'time_specifiers', 'timefmt', 'timestamp', 'title',
+            'trange', 'urange', 'view',
+            'vrange', 'x2data', 'x2dtics', 'x2label',
+            'x2mtics', 'x2range', 'x2tics', 'x2zeroaxis',
+            'xdata', 'xdtics', 'xlabel', 'xmtics',
+            'xrange', 'xtics', 'xyplane', 'xzeroaxis',
+            'y2data', 'y2dtics', 'y2label', 'y2mtics',
+            'y2range', 'y2tics', 'y2zeroaxis', 'ydata',
+            'ydtics', 'ylabel', 'ymtics', 'yrange',
+            'ytics', 'yzeroaxis', 'zdata', 'zdtics',
+            'zero', 'zeroaxis', 'zlabel', 'zmtics',
+            'zrange', 'ztics', 'zzeroaxis',
+            // same but with leading no
+            'noangles', 'noarrow', 'noautoscale', 'nobars',
+            'nobmargin', 'noborder', 'noboxwidth', 'nocbdata',
+            'nocbdtics', 'nocblabel', 'nocbmtics', 'nocbrange',
+            'nocbtics', 'noclabel', 'noclip', 'nocntrparam',
+            'nocolorbox', 'nocontour', 'nodatafile', 'nodate_specifiers',
+            'nodecimalsign', 'nodgrid3d', 'nodummy', 'noencoding',
+            'nofit', 'nofontpath', 'noformat', 'nogrid',
+            'nohidden3d', 'nohistorysize', 'noisosamples', 'nokey',
+            'nolabel', 'nolmargin', 'noloadpath', 'nolocale',
+            'nolog', 'nologscale', 'nomacros', 'nomapping',
+            'nomargin', 'nomissing', 'nomouse', 'nomultiplot',
+            'nomx2tics', 'nomxtics', 'nomy2tics', 'nomytics',
+            'nomztics', 'noobject', 'nooffsets', 'noorigin',
+            'nooutput', 'nopalette', 'noparametric', 'nopm3d',
+            'nopointsize', 'nopolar', 'noprint', 'normargin',
+            'norrange', 'nosamples', 'nosize', 'nostyle',
+            'nosurface', 'notable', 'noterm', 'noterminal',
+            'notermoption', 'notics', 'noticscale', 'noticslevel',
+            'notime_specifiers', 'notimefmt', 'notimestamp', 'notitle',
+            'notmargin', 'notrange', 'nourange', 'noview',
+            'novrange', 'nox2data', 'nox2dtics', 'nox2label',
+            'nox2mtics', 'nox2range', 'nox2tics', 'nox2zeroaxis',
+            'noxdata', 'noxdtics', 'noxlabel', 'noxmtics',
+            'noxrange', 'noxtics', 'noxyplane', 'noxzeroaxis',
+            'noy2data', 'noy2dtics', 'noy2label', 'noy2mtics',
+            'noy2range', 'noy2tics', 'noy2zeroaxis', 'noydata',
+            'noydtics', 'noylabel', 'noymtics', 'noyrange',
+            'noytics', 'noyzeroaxis', 'nozdata', 'nozdtics',
+            'nozero', 'nozeroaxis', 'nozlabel', 'nozmtics',
+            'nozrange', 'noztics', 'nozzeroaxis',
+            ),
+        3 => array(
+            // predefined variables
+            'pi', 'NaN', 'GNUTERM',
+            'GPVAL_X_MIN', 'GPVAL_X_MAX', 'GPVAL_Y_MIN', 'GPVAL_Y_MAX',
+            'GPVAL_TERM', 'GPVAL_TERMOPTIONS', 'GPVAL_OUTPUT',
+            'GPVAL_VERSION', 'GPVAL_PATcHLEVEL', 'GPVAL_COMPILE_OPTIONS',
+            'MOUSE_KEY', 'MOUSE_X', 'MOUSE_X2', 'MOUSE_Y', 'MOUSE_Y2',
+            'MOUSE_BUTTON', 'MOUSE_SHIFT', 'MOUSE_ALT', 'MOUSE_CTRL'
+            ),
+        4 => array(
+            // predefined functions `help functions`
+            'abs', 'acos', 'acosh', 'arg',
+            'asin', 'asinh', 'atan', 'atan2',
+            'atanh', 'besj0', 'besj1', 'besy0',
+            'besy1', 'ceil', 'column', 'cos',
+            'cosh', 'defined', 'erf', 'erfc',
+            'exists', 'exp', 'floor', 'gamma',
+            'gprintf', 'ibeta', 'igamma', 'imag',
+            'int', 'inverf', 'invnorm', 'lambertw',
+            'lgamma', 'log10', 'norm',
+            'rand', 'random', 'real', 'sgn',
+            'sin', 'sinh', 'sprintf', 'sqrt',
+            'stringcolumn', 'strlen', 'strstrt', 'substr',
+            'tan', 'tanh', 'timecolumn',
+            'tm_hour', 'tm_mday', 'tm_min', 'tm_mon',
+            'tm_sec', 'tm_wday', 'tm_yday', 'tm_year',
+            'valid', 'word', 'words',
+            ),
+        5 => array(
+            // mixed arguments
+            // there is no sane way to get these ones easily...
+            'autofreq', 'x', 'y', 'z',
+            'lt', 'linetype', 'lw', 'linewidth', 'ls', 'linestyle',
+            'out', 'rotate by', 'screen',
+            'enhanced', 'via',
+            // `help set key`
+            'on', 'off', 'default', 'inside', 'outside', 'tmargin',
+            'at', 'left', 'right', 'center', 'top', 'bottom', 'vertical', 'horizontal', 'Left', 'Right',
+            'noreverse', 'reverse', 'noinvert', 'invert', 'samplen', 'spacing', 'width', 'height',
+            'noautotitle', 'autotitle', 'noenhanced', 'nobox', 'box',
+
+            // help set terminal postscript
+            'landscape', 'portrait', 'eps', 'defaultplex', 'simplex', 'duplex',
+            'fontfile', 'add', 'delete', 'nofontfiles', 'level1', 'leveldefault',
+            'color', 'colour', 'monochrome', 'solid', 'dashed', 'dashlength', 'dl',
+            'rounded', 'butt', 'palfuncparam', 'blacktext', 'colortext', 'colourtext',
+            'font',
+
+            // help set terminal png
+            'notransparent', 'transparent', 'nointerlace', 'interlace',
+            'notruecolor', 'truecolor', 'tiny', 'small', 'medium', 'large', 'giant',
+            'nocrop', 'crop',
+
+            // `help plot`
+            'acsplines', 'bezier', 'binary', 'csplines',
+            'every',
+            'example', 'frequency', 'index', 'matrix',
+            'ranges', 'sbezier', 'smooth',
+            'special-filenames', 'thru',
+            'unique', 'using', 'with',
+
+            // `help plotting styles`
+            'boxerrorbars', 'boxes', 'boxxyerrorbars', 'candlesticks',
+            'dots', 'errorbars', 'errorlines', 'filledcurves',
+            'financebars', 'fsteps', 'histeps', 'histograms',
+            'image', 'impulses', 'labels', 'lines',
+            'linespoints', 'points', 'rgbimage', 'steps',
+            'vectors', 'xerrorbars', 'xerrorlines', 'xyerrorbars',
+            'xyerrorlines', 'yerrorbars', 'yerrorlines',
+
+
+            // terminals `help terminals`
+            'aed512', 'aed767', 'aifm', 'bitgraph',
+            'cgm', 'corel', 'dumb', 'dxf',
+            'eepic', 'emf', 'emtex', 'epslatex',
+            'epson-180dpi', 'epson-60dpi', 'epson-lx800', 'fig',
+            'gif', 'gpic', 'hp2623a', 'hp2648',
+            'hp500c', 'hpdj', 'hpgl', 'hpljii',
+            'hppj', 'imagen', 'jpeg', 'kc-tek40xx',
+            'km-tek40xx', 'latex', 'mf', 'mif',
+            'mp', 'nec-cp6', 'okidata', 'pbm',
+            'pcl5', 'png', 'pop', 'postscript',
+            'pslatex', 'pstex', 'pstricks', 'push',
+            'qms', 'regis', 'selanar', 'starc',
+            'svg', 'tandy-60dpi', 'tek40xx', 'tek410x',
+            'texdraw', 'tgif', 'tkcanvas', 'tpic',
+            'vttek', 'x11', 'xlib',
+            )
+        ),
+    'REGEXPS' => array(
+        //Variable assignment
+        0 => "(?<![?;>\w])([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
+        //Numbers with unit
+        1 => "(?<=^|\s)([0-9]*\.?[0-9]+\s*cm)"
+        ),
+    'SYMBOLS' => array(
+        '-', '+', '~', '!', '$',
+        '*', '/', '%', '=', '<', '>', '&',
+        '^', '|', '.', 'eq', 'ne', '?:', ':', '`', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;',
+            4 => 'color: #7a0874;',
+            5 => 'color: #448888;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #cc66cc;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.google.com/search?q=%22set+{FNAME}%22+site%3Ahttp%3A%2F%2Fwww.gnuplot.info%2Fdocs%2F&amp;btnI=lucky',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%])"
+            )
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/groovy.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/groovy.php
new file mode 100644
index 000000000..7db153c75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/groovy.php
@@ -0,0 +1,1011 @@
+<?php
+/*************************************************************************************
+ * groovy.php
+ * ----------
+ * Author: Ivan F. Villanueva B. (geshi_groovy@artificialidea.com)
+ * Copyright: (c) 2006 Ivan F. Villanueva B.(http://www.artificialidea.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/04/29
+ *
+ * Groovy language file for GeSHi.
+ *
+ * Keywords from http: http://docs.codehaus.org/download/attachments/2715/groovy-reference-card.pdf?version=1
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/04/29 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2006/04/29)
+ * -------------------------
+ * Testing
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Groovy',
+    'COMMENT_SINGLE' => array(1 => '//', 3 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", '"""', "'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'for', 'foreach', 'if', 'in', 'switch',
+            'while',
+            ),
+        2 => array(
+            'abstract', 'as', 'assert', 'break', 'catch', 'class', 'const',
+            'continue', 'def', 'default', 'enum', 'extends',
+            'false', 'final', 'finally', 'goto', 'implements', 'import',
+            'instanceof', 'interface', 'native', 'new', 'null',
+            'package', 'private', 'property', 'protected',
+            'public', 'return', 'static', 'strictfp', 'super',
+            'synchronized', 'this', 'throw', 'throws',
+            'transient', 'true', 'try', 'volatile'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor',
+            'Container', 'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream', 'DataTruncation',
+            'DATA_CONVERSION', 'Date', 'DateFormat',
+            'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter', 'FileInputStream',
+            'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream', 'InputStreamReader', 'InputSubset',
+            'InputVerifier', 'Insets', 'InsetsUIResource',
+            'InstantiationError', 'InstantiationException',
+            'Instrument', 'InsufficientResourcesException',
+            'Integer', 'INTERNAL', 'InternalError',
+            'InternalFrameAdapter', 'InternalFrameEvent',
+            'InternalFrameListener', 'InternalFrameUI',
+            'InterruptedException', 'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException', 'InvalidNameHelper',
+            'InvalidNameHolder', 'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl', 'ObjectInput',
+            'ObjectInputStream', 'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission', 'PermissionCollection',
+            'Permissions', 'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper', 'PolicyHolder',
+            'PolicyListHelper', 'PolicyListHolder',
+            'PolicyOperations', 'PolicyTypeHelper', 'Polygon',
+            'PopupMenu', 'PopupMenuEvent', 'PopupMenuListener',
+            'PopupMenuUI', 'Port', 'Port.Info',
+            'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'Runtime',
+            'RunTime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer', 'TimerTask',
+            'Timestamp', 'TimeZone', 'TitledBorder', 'ToolBarUI',
+            'Toolkit', 'ToolTipManager', 'ToolTipUI',
+            'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException', 'UnknownObjectException',
+            'UnknownServiceException', 'UnknownUserException',
+            'UnmarshalException', 'UnrecoverableKeyException',
+            'Unreferenced', 'UnresolvedPermission',
+            'UnsatisfiedLinkError', 'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'boolean', 'byte', 'char', 'double', 'float', 'int', 'long',
+            'short', 'void'
+            ),
+        5 => array(
+            'allProperties', 'asImmutable', 'asSynchronized', 'collect',
+            'count', 'each', 'eachProperty', 'eachPropertyName',
+            'eachWithIndex', 'find', 'findAll', 'findIndexOf',
+            'flatten', 'get', 'grep', 'inject', 'intersect',
+            'join', 'max', 'min', 'pop', 'reverse',
+            'reverseEach', 'size', 'sort', 'subMap', 'toList'
+            ),
+        6 => array(
+            'center', 'contains', 'eachMatch', 'padLeft', 'padRight',
+            'toCharacter', 'tokenize', 'toLong', 'toURL'
+            ),
+        7 => array(
+            'append', 'eachByte', 'eachFile', 'eachFileRecurse', 'eachLine',
+            'eachLines', 'encodeBase64', 'filterLine', 'getText',
+            'splitEachLine', 'transformChar', 'transformLine',
+            'withOutputStream', 'withPrintWriter', 'withReader',
+            'withStream', 'withStreams', 'withWriter',
+            'withWriterAppend', 'write', 'writeLine'
+            ),
+        8 => array(
+            'dump', 'getLastMatcher', 'inspect', 'invokeMethod', 'print',
+            'println', 'start', 'startDaemon', 'step', 'times',
+            'upto', 'use'
+            ),
+        9 => array(
+            'call', 'close', 'eachRow', 'execute', 'executeUpdate', 'Sql'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '|', '=',
+        '=>', '||', '-', '+', '<<', '<<<', '&&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;',
+            5 => 'color: #663399;',
+            6 => 'color: #CC0099;',
+            7 => 'color: #FFCC33;',
+            8 => 'color: #993399;',
+            9 => 'color: #993399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1=> 'color: #808080; font-style: italic;',
+            2=> 'color: #a1a100;',
+            3=> 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAMEL}',
+        2 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAMEL}',
+        3 => 'http://www.google.de/search?as_q={FNAME}&amp;num=100&amp;hl=en&amp;as_occt=url&amp;as_sitesearch=java.sun.com%2Fj2se%2F1.5.0%2Fdocs%2Fapi%2F',
+        4 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}',
+        5 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}',
+        6 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}',
+        7 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}',
+        8 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}',
+        9 => 'http://www.google.de/search?q=site%3Adocs.codehaus.org/%20{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/haskell.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/haskell.php
new file mode 100644
index 000000000..f0e570f1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/haskell.php
@@ -0,0 +1,198 @@
+<?php
+/*************************************************************************************
+ * haskell.php
+ * ----------
+ * Author: Jason Dagit (dagit@codersbase.com) based on ocaml.php by Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/08/27
+ *
+ * Haskell language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Haskell',
+    'COMMENT_SINGLE' => array( 1 => '--'),
+    'COMMENT_MULTI' => array('{-' => '-}'),
+    'COMMENT_REGEXP' => array(2 => "/-->/"),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "\\",
+    'KEYWORDS' => array(
+        /* main haskell keywords */
+        1 => array(
+            'as',
+            'case', 'of', 'class', 'data', 'default',
+            'deriving', 'do', 'forall', 'hiding', 'if', 'then',
+            'else', 'import', 'infix', 'infixl', 'infixr',
+            'instance', 'let', 'in', 'module', 'newtype',
+            'qualified', 'type', 'where'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Foreign', 'Numeric', 'Prelude'
+            ),
+        /* just link to Prelude functions, cause it's the default opened library when starting Haskell */
+        3 => array(
+            'not', 'otherwise', 'maybe',
+            'either', 'fst', 'snd', 'curry', 'uncurry',
+            'compare',
+            'max', 'min', 'succ', 'pred', 'toEnum', 'fromEnum',
+            'enumFrom', 'enumFromThen', 'enumFromTo',
+            'enumFromThenTo', 'minBound', 'maxBound',
+            'negate', 'abs', 'signum',
+            'fromInteger', 'toRational', 'quot', 'rem',
+            'div', 'mod', 'quotRem', 'divMod', 'toInteger',
+            'recip', 'fromRational', 'pi', 'exp',
+            'log', 'sqrt', 'logBase', 'sin', 'cos',
+            'tan', 'asin', 'acos', 'atan', 'sinh', 'cosh',
+            'tanh', 'asinh', 'acosh', 'atanh',
+            'properFraction', 'truncate', 'round', 'ceiling',
+            'floor', 'floatRadix', 'floatDigits', 'floatRange',
+            'decodeFloat', 'encodeFloat', 'exponent',
+            'significand', 'scaleFloat', 'isNaN', 'isInfinite',
+            'isDenomalized', 'isNegativeZero', 'isIEEE',
+            'atan2', 'subtract', 'even', 'odd', 'gcd',
+            'lcm', 'fromIntegral', 'realToFrac',
+            'return', 'fail', 'fmap',
+            'mapM', 'mapM_', 'sequence', 'sequence_',
+            'id', 'const','flip',
+            'until', 'asTypeOf', 'error', 'undefined',
+            'seq','map','filter', 'head',
+            'last', 'tail', 'init', 'null', 'length',
+            'reverse', 'foldl', 'foldl1', 'foldr',
+            'foldr1', 'and', 'or', 'any', 'all', 'sum',
+            'product', 'concat', 'concatMap', 'maximum',
+            'minimum', 'scanl', 'scanl1', 'scanr', 'scanr1',
+            'iterate', 'repeat', 'cycle', 'take', 'drop',
+            'splitAt', 'teakWhile', 'dropWhile', 'span',
+            'break', 'elem', 'notElem', 'lookup', 'zip',
+            'zip3', 'zipWith', 'zipWith3', 'unzip', 'unzip3',
+            'lines', 'words', 'unlines',
+            'unwords', 'showPrec', 'show', 'showList',
+            'shows', 'showChar', 'showString', 'showParen',
+            'readsPrec', 'readList', 'reads', 'readParen',
+            'read', 'lex', 'putChar', 'putStr', 'putStrLn',
+            'print', 'getChar', 'getLine', 'getContents',
+            'interact', 'readFile', 'writeFile', 'appendFile',
+            'readIO', 'readLn', 'ioError', 'userError', 'catch'
+            ),
+        /* here Prelude Types */
+        4 => array (
+            'Bool', 'Maybe', 'Either', 'Ord', 'Ordering',
+            'Char', 'String', 'Eq', 'Enum', 'Bounded',
+            'Int', 'Integer', 'Float', 'Double', 'Rational',
+            'Num', 'Real', 'Integral', 'Fractional',
+            'Floating', 'RealFrac', 'RealFloat', 'Monad',
+            'Functor', 'Show', 'ShowS', 'Read', 'ReadS',
+            'IO'
+            ),
+        /* finally Prelude Exceptions */
+        5 => array (
+            'IOError', 'IOException'
+            )
+        ),
+    /* highlighting symbols is really important in Haskell */
+    'SYMBOLS' => array(
+        '|', '->', '<-', '@', '!', '::', '_', '~', '=', '?',
+        '&&', '||', '==', '/=', '<', '<=', '>',
+        '>=','+', '-', '*','/', '%', '**', '^', '^^',
+        '>>=', '>>', '=<<',  '$', '.', ',', '$!',
+        '++', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true, /* functions name are case seinsitive */
+        3 => true, /* types name too */
+        4 => true, /* finally exceptions too */
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* blue as well */
+            3 => 'font-weight: bold;', /* make the preduled functions bold */
+            4 => 'color: #cccc00; font-weight: bold;', /* give types a different bg */
+            5 => 'color: maroon;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #5d478b; font-style: italic;',
+            2 => 'color: #339933; font-weight: bold;',
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purpHle */
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'background-color: #3cb371; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: green;'
+            ),
+        'STRINGS' => array(
+            0 => 'background-color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: red;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Prelude functions */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/{FNAME}.html',
+        /* link to Prelude functions */
+        3 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#v:{FNAME}',
+        /* link to Prelude types */
+        4 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        /* link to Prelude exceptions */
+        5 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/hq9plus.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/hq9plus.php
new file mode 100644
index 000000000..2a5c429ca
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/hq9plus.php
@@ -0,0 +1,104 @@
+<?php
+/*************************************************************************************
+ * hq9plus.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/10/31
+ *
+ * HQ9+ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'HQ9+',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        'H', 'Q', '9', '+', 'h', 'q'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a16000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/html4strict.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/html4strict.php
new file mode 100644
index 000000000..314351523
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/html4strict.php
@@ -0,0 +1,203 @@
+<?php
+/*************************************************************************************
+ * html4strict.php
+ * ---------------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/10
+ *
+ * HTML 4.01 strict language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/28 (1.0.4)
+ *   -  Removed escape character for strings
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added INS and DEL
+ *   -  Removed the background colour from tags' styles
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Check that only HTML4 strict attributes are highlighted
+ * * Eliminate empty tags that aren't allowed in HTML4 strict
+ * * Split to several files - html4trans, xhtml1 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'HTML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -1 => array(
+            '<!--' => '-->'
+            ),
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            )
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/idl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/idl.php
new file mode 100644
index 000000000..9160fd150
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/idl.php
@@ -0,0 +1,123 @@
+<?php
+/*************************************************************************************
+ * idl.php
+ * -------
+ * Author: Cedric Bosdonnat (cedricbosdo@openoffice.org)
+ * Copyright: (c) 2006 Cedric Bosdonnat
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/08/20
+ *
+ * Unoidl language file for GeSHi.
+ *
+ * 2006/08/20 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+
+$language_data = array (
+    'LANG_NAME' => 'Uno Idl',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'published', 'get', 'set', 'service', 'singleton', 'type', 'module', 'interface', 'struct',
+            'const', 'constants', 'exception', 'enum', 'raises', 'typedef'
+            ),
+        2 => array(
+            'bound', 'maybeambiguous', 'maybedefault', 'maybevoid', 'oneway', 'optional',
+            'readonly', 'in', 'out', 'inout', 'attribute', 'transient', 'removable'
+            ),
+        3 => array(
+            'True', 'False', 'TRUE', 'FALSE'
+            ),
+        4 => array(
+            'string', 'long', 'byte', 'hyper', 'boolean', 'any', 'char', 'double',
+            'void', 'sequence', 'unsigned'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ';', '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990078; font-weight: bold',
+            2 => 'color: #36dd1c;',
+            3 => 'color: #990078; font-weight: bold',
+            4 => 'color: #0000ec;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #3f7f5f;',
+            2 => 'color: #808080;',
+            'MULTI' => 'color: #4080ff; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #666666; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ini.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ini.php
new file mode 100644
index 000000000..365b4d6f8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ini.php
@@ -0,0 +1,128 @@
+<?php
+/*************************************************************************************
+ * ini.php
+ * --------
+ * Author: deguix (cevo_deguix@yahoo.com.br)
+ * Copyright: (c) 2005 deguix
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/03/27
+ *
+ * INI language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/12/28 (1.0.1)
+ *   -  Removed unnecessary keyword style index
+ *   -  Added support for " strings
+ * 2005/04/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/03/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'INI',
+    'COMMENT_SINGLE' => array(0 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight:bold;',
+            1 => 'color: #000099;',
+            2 => 'color: #660066;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Section names
+        0 => '\[.+\]',
+        //Entry names
+        1 => array(
+            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_\-]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Entry values
+        2 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so <span>s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1=',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/inno.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/inno.php
new file mode 100644
index 000000000..99563514d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/inno.php
@@ -0,0 +1,212 @@
+<?php
+/*************************************************************************************
+ * Inno.php
+ * ----------
+ * Author: Thomas Klingler (hotline@theratech.de) based on delphi.php from J�rja Norbert (jnorbi@vipmail.hu)
+ * Copyright: (c) 2004 J�rja Norbert, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/07/29
+ *
+ * Inno Script language inkl. Delphi (Object Pascal) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/09/03
+ *   -  First Release
+ *
+ * TODO (updated 2005/07/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Inno',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Setup','Types','Components','Tasks','Dirs','Files','Icons','INI',
+            'InstallDelete','Languages','Messages','CustomMessage',
+            'LangOptions','Registry','RUN','UninstallDelete','UninstallRun',
+            'app','win','sys','syswow64','src','sd','pf','pf32','pf64','cf',
+            'cf32','cf64','tmp','fonts','dao','group','localappdata','sendto',
+            'userappdata','commonappdata','userdesktop','commondesktop',
+            'userdocs','commondocs','userfavorites','commonfavorites',
+            'userprograms','commonprograms','userstartmenu','commonstartmenu',
+            'userstartup','commonstartup','usertemplates','commontemplates'
+            ),
+        2 => array(
+            'nil', 'false', 'true', 'var', 'type', 'const','And', 'Array', 'As', 'Begin', 'Case', 'Class', 'Constructor', 'Destructor', 'Div', 'Do', 'DownTo', 'Else',
+            'End', 'Except', 'File', 'Finally', 'For', 'Function', 'Goto', 'If', 'Implementation', 'In', 'Inherited', 'Interface',
+            'Is', 'Mod', 'Not', 'Object', 'Of', 'On', 'Or', 'Packed', 'Procedure', 'Property', 'Raise', 'Record',
+            'Repeat', 'Set', 'Shl', 'Shr', 'Then', 'ThreadVar', 'To', 'Try', 'Unit', 'Until', 'Uses', 'While', 'With', 'Xor',
+
+            'HKCC','HKCR','HKCU','HKLM','HKU','alwaysoverwrite','alwaysskipifsameorolder','append',
+            'binary','classic','closeonexit','comparetimestamp','confirmoverwrite',
+            'createkeyifdoesntexist','createonlyiffileexists','createvalueifdoesntexist',
+            'deleteafterinstall','deletekey','deletevalue','dirifempty','dontcloseonexit',
+            'dontcopy','dontcreatekey','disablenouninstallwarning','dword','exclusive','expandsz',
+            'external','files','filesandordirs','fixed','fontisnttruetype','ignoreversion','iscustom','isreadme',
+            'modern','multisz','new','noerror','none','normal','nowait','onlyifdestfileexists',
+            'onlyifdoesntexist','onlyifnewer','overwrite','overwritereadonly','postinstall',
+            'preservestringtype','promptifolder','regserver','regtypelib','restart','restartreplace',
+            'runhidden','runmaximized','runminimized','sharedfile','shellexec','showcheckbox',
+            'skipifnotsilent','skipifsilent','silent','skipifdoesntexist',
+            'skipifsourcedoesntexist','sortfilesbyextension','unchecked','uninsalwaysuninstall',
+            'uninsclearvalue','uninsdeleteentry','uninsdeletekey','uninsdeletekeyifempty',
+            'uninsdeletesection','uninsdeletesectionifempty','uninsdeletevalue',
+            'uninsneveruninstall','useapppaths','verysilent','waituntilidle'
+            ),
+        3 => array(
+            'Abs', 'Addr', 'AnsiCompareStr', 'AnsiCompareText', 'AnsiContainsStr', 'AnsiEndsStr', 'AnsiIndexStr', 'AnsiLeftStr',
+            'AnsiLowerCase', 'AnsiMatchStr', 'AnsiMidStr', 'AnsiPos', 'AnsiReplaceStr', 'AnsiReverseString', 'AnsiRightStr',
+            'AnsiStartsStr', 'AnsiUpperCase', 'ArcCos', 'ArcSin', 'ArcTan', 'Assigned', 'BeginThread', 'Bounds', 'CelsiusToFahrenheit',
+            'ChangeFileExt', 'Chr', 'CompareStr', 'CompareText', 'Concat', 'Convert', 'Copy', 'Cos', 'CreateDir', 'CurrToStr',
+            'CurrToStrF', 'Date', 'DateTimeToFileDate', 'DateTimeToStr', 'DateToStr', 'DayOfTheMonth', 'DayOfTheWeek', 'DayOfTheYear',
+            'DayOfWeek', 'DaysBetween', 'DaysInAMonth', 'DaysInAYear', 'DaySpan', 'DegToRad', 'DeleteFile', 'DiskFree', 'DiskSize',
+            'DupeString', 'EncodeDate', 'EncodeDateTime', 'EncodeTime', 'EndOfADay', 'EndOfAMonth', 'Eof', 'Eoln', 'Exp', 'ExtractFileDir',
+            'ExtractFileDrive', 'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath', 'FahrenheitToCelsius', 'FileAge',
+            'FileDateToDateTime', 'FileExists', 'FilePos', 'FileSearch', 'FileSetDate', 'FileSize', 'FindClose', 'FindCmdLineSwitch',
+            'FindFirst', 'FindNext', 'FloatToStr', 'FloatToStrF', 'Format', 'FormatCurr', 'FormatDateTime', 'FormatFloat', 'Frac',
+            'GetCurrentDir', 'GetLastError', 'GetMem', 'High', 'IncDay', 'IncMinute', 'IncMonth', 'IncYear', 'InputBox',
+            'InputQuery', 'Int', 'IntToHex', 'IntToStr', 'IOResult', 'IsInfinite', 'IsLeapYear', 'IsMultiThread', 'IsNaN',
+            'LastDelimiter', 'Length', 'Ln', 'Lo', 'Log10', 'Low', 'LowerCase', 'Max', 'Mean', 'MessageDlg', 'MessageDlgPos',
+            'MonthOfTheYear', 'Now', 'Odd', 'Ord', 'ParamCount', 'ParamStr', 'Pi', 'Point', 'PointsEqual', 'Pos', 'Pred',
+            'Printer', 'PromptForFileName', 'PtInRect', 'RadToDeg', 'Random', 'RandomRange', 'RecodeDate', 'RecodeTime', 'Rect',
+            'RemoveDir', 'RenameFile', 'Round', 'SeekEof', 'SeekEoln', 'SelectDirectory', 'SetCurrentDir', 'Sin', 'SizeOf',
+            'Slice', 'Sqr', 'Sqrt', 'StringOfChar', 'StringReplace', 'StringToWideChar', 'StrToCurr', 'StrToDate', 'StrToDateTime',
+            'StrToFloat', 'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime', 'StuffString', 'Succ', 'Sum', 'Tan',
+            'Time', 'TimeToStr', 'Tomorrow', 'Trunc', 'UpCase', 'UpperCase', 'VarType', 'WideCharToString', 'WrapText', 'Yesterday',
+            'Append', 'AppendStr', 'Assign', 'AssignFile', 'AssignPrn', 'Beep', 'BlockRead', 'BlockWrite', 'Break',
+            'ChDir', 'Close', 'CloseFile', 'Continue', 'DateTimeToString', 'Dec', 'DecodeDate', 'DecodeDateTime',
+            'DecodeTime', 'Delete', 'Dispose', 'EndThread', 'Erase', 'Exclude', 'Exit', 'FillChar', 'Flush', 'FreeAndNil',
+            'FreeMem', 'GetDir', 'GetLocaleFormatSettings', 'Halt', 'Inc', 'Include', 'Insert', 'MkDir', 'Move', 'New',
+            'ProcessPath', 'Randomize', 'Read', 'ReadLn', 'ReallocMem', 'Rename', 'ReplaceDate', 'ReplaceTime',
+            'Reset', 'ReWrite', 'RmDir', 'RunError', 'Seek', 'SetLength', 'SetString', 'ShowMessage', 'ShowMessageFmt',
+            'ShowMessagePos', 'Str', 'Truncate', 'Val', 'Write', 'WriteLn',
+
+            'AdminPrivilegesRequired','AfterInstall','AllowCancelDuringInstall','AllowNoIcons','AllowRootDirectory','AllowUNCPath','AlwaysRestart','AlwaysShowComponentsList','AlwaysShowDirOnReadyPage','AlwaysShowGroupOnReadyPage ','AlwaysUsePersonalGroup','AppComments','AppContact','AppCopyright','AppendDefaultDirName',
+            'AppendDefaultGroupName','AppId','AppModifyPath','AppMutex','AppName','AppPublisher',
+            'AppPublisherURL','AppReadmeFile','AppSupportURL','AppUpdatesURL','AppVerName','AppVersion',
+            'Attribs','BackColor','BackColor2','BackColorDirection','BackSolid','BeforeInstall',
+            'ChangesAssociations','ChangesEnvironment','Check','CodeFile','Comment','Compression','CopyMode',
+            'CreateAppDir','CreateUninstallRegKey','DefaultDirName','DefaultGroupName',
+            'DefaultUserInfoName','DefaultUserInfoOrg','DefaultUserInfoSerial',
+            'Description','DestDir','DestName','DirExistsWarning',
+            'DisableDirPage','DisableFinishedPage',
+            'DisableProgramGroupPage','DisableReadyMemo','DisableReadyPage',
+            'DisableStartupPrompt','DiskClusterSize','DiskSliceSize','DiskSpaceMBLabel',
+            'DiskSpanning','DontMergeDuplicateFiles','EnableDirDoesntExistWarning','Encryption',
+            'Excludes','ExtraDiskSpaceRequired','Filename','Flags','FlatComponentsList','FontInstall',
+            'GroupDescription','HotKey','IconFilename','IconIndex','InfoAfterFile','InfoBeforeFile',
+            'InternalCompressLevel','Key','LanguageDetectionMethod',
+            'LicenseFile','MergeDuplicateFiles','MessagesFile','MinVersion','Name',
+            'OnlyBelowVersion','OutputBaseFilename','OutputManifestFile','OutputDir',
+            'Parameters','Password','Permissions','PrivilegesRequired','ReserveBytes',
+            'RestartIfNeededByRun','Root','RunOnceId','Section','SetupIconFile',
+            'ShowComponentSizes','ShowLanguageDialog','ShowTasksTreeLines','SlicesPerDisk',
+            'SolidCompression','Source','SourceDir','StatusMsg','Subkey',
+            'TimeStampRounding','TimeStampsInUTC','TouchDate','TouchTime','Type',
+            'UninstallDisplayIcon','UninstallDisplayName','UninstallFilesDir','UninstallIconFile',
+            'UninstallLogMode','UninstallRestartComputer','UninstallStyle','Uninstallable',
+            'UpdateUninstallLogAppName','UsePreviousAppDir','UsePreviousGroup',
+            'UsePreviousTasks','UsePreviousSetupType','UsePreviousUserInfo',
+            'UserInfoPage','UseSetupLdr','ValueData','ValueName','ValueType',
+            'VersionInfoVersion','VersionInfoCompany','VersionInfoDescription','VersionInfoTextVersion',
+            'WindowResizable','WindowShowCaption','WindowStartMaximized',
+            'WindowVisible','WizardImageBackColor','WizardImageFile','WizardImageStretch','WizardSmallImageBackColor','WizardSmallImageFile','WizardStyle','WorkingDir'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Boolean', 'Byte', 'Cardinal', 'Char', 'Comp', 'Currency', 'Double', 'Extended',
+            'Int64', 'Integer', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PChar', 'PCurrency', 'PDateTime',
+            'PExtended', 'PInt64', 'Pointer', 'PShortString', 'PString', 'PVariant', 'PWideChar', 'PWideString',
+            'Real', 'Real48', 'ShortInt', 'ShortString', 'Single', 'SmallInt', 'String', 'TBits', 'TConvType', 'TDateTime',
+            'Text', 'TextFile', 'TFloatFormat', 'TFormatSettings', 'TList', 'TObject', 'TOpenDialog', 'TPoint',
+            'TPrintDialog', 'TRect', 'TReplaceFlags', 'TSaveDialog', 'TSearchRec', 'TStringList', 'TSysCharSet',
+            'TThreadFunc', 'Variant', 'WideChar', 'WideString', 'Word'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',/*bold Black*/
+            2 => 'color: #000000;font-style: italic;',/*Black*/
+            3 => 'color: #0000FF;',/*blue*/
+            4 => 'color: #CC0000;'/*red*/
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #33FF00; font-style: italic;',
+            'MULTI' => 'color: #33FF00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/intercal.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/intercal.php
new file mode 100644
index 000000000..a58960089
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/intercal.php
@@ -0,0 +1,122 @@
+<?php
+/*************************************************************************************
+ * intercal.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/10/31
+ *
+ * INTERCAL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'INTERCAL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //Politeness
+        1 => array(
+            'DO', 'DOES', 'DONT', 'DON\'T', 'NOT', 'PLEASE', 'PLEASENT', 'PLEASEN\'T', 'MAYBE'
+            ),
+        //Statements
+        2 => array(
+            'STASH', 'RETRIEVE', 'NEXT', 'RESUME', 'FORGET', 'ABSTAIN', 'ABSTAINING',
+            'COME', 'FROM', 'CALCULATING', 'REINSTATE', 'IGNORE', 'REMEMBER',
+            'WRITE', 'IN', 'READ', 'OUT', 'GIVE', 'UP'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', ':', ';', '#',
+        '~', '$', '&', '?',
+        '\'', '"', '<-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #000080; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '^\(\d+\)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'COMMENTS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/io.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/io.php
new file mode 100644
index 000000000..7ec53a881
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/io.php
@@ -0,0 +1,138 @@
+<?php
+/*************************************************************************************
+ * io.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2006 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/09/23
+ *
+ * Io language file for GeSHi. Thanks to Johnathan Wright for the suggestion and help
+ * with this language :)
+ *
+ * CHANGES
+ * -------
+ * 2006/09/23(1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Io',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'break', 'else', 'elseif', 'exit', 'for', 'foreach', 'if', 'ifFalse', 'ifNil',
+            'ifTrue', 'or', 'pass', 'raise', 'return', 'then', 'try', 'wait', 'while', 'yield'
+            ),
+        2 => array(
+            'activate', 'activeCoroCount', 'asString', 'block', 'catch', 'clone', 'collectGarbage',
+            'compileString', 'continue', 'do', 'doFile', 'doMessage', 'doString', 'forward',
+            'getSlot', 'getenv', 'hasSlot', 'isActive', 'isNil', 'isResumable', 'list', 'message',
+            'method', 'parent', 'pause', 'perform', 'performWithArgList', 'print', 'proto',
+            'raiseResumable', 'removeSlot', 'resend', 'resume', 'schedulerSleepSeconds', 'self',
+            'sender', 'setSchedulerSleepSeconds', 'setSlot', 'shallowCopy', 'slotNames', 'super',
+            'system', 'thisBlock', 'thisContext', 'thisMessage', 'type', 'uniqueId', 'updateSlot',
+            'write'
+            ),
+        3 => array(
+            'Array', 'AudioDevice', 'AudioMixer', 'Block', 'Box', 'Buffer', 'CFunction', 'CGI',
+            'Color', 'Curses', 'DBM', 'DNSResolver', 'DOConnection', 'DOProxy', 'DOServer',
+            'Date', 'Directory', 'Duration', 'DynLib', 'Error', 'Exception', 'FFT', 'File',
+            'Fnmatch', 'Font', 'Future', 'GL', 'GLE', 'GLScissor', 'GLU', 'GLUCylinder',
+            'GLUQuadric', 'GLUSphere', 'GLUT', 'Host', 'Image', 'Importer', 'LinkList', 'List',
+            'Lobby', 'Locals', 'MD5', 'MP3Decoder', 'MP3Encoder', 'Map', 'Message', 'Movie',
+            'NULL', 'Nil', 'Nop', 'Notifiction', 'Number', 'Object', 'OpenGL', 'Point', 'Protos',
+            'Regex', 'SGMLTag', 'SQLite', 'Server', 'ShowMessage', 'SleepyCat', 'SleepyCatCursor',
+            'Socket', 'SocketManager', 'Sound', 'Soup', 'Store', 'String', 'Tree', 'UDPSender',
+            'UDPReceiver', 'URL', 'User', 'Warning', 'WeakLink'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java.php
new file mode 100644
index 000000000..d8a2d5e4d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java.php
@@ -0,0 +1,983 @@
+<?php
+/*************************************************************************************
+ * java.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/10
+ *
+ * Java language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/25 (1.0.7.22)
+ *   -  Added highlighting of import and package directives as non-OOP
+ * 2005/12/28 (1.0.4)
+ *   -  Added instanceof keyword
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/08/05 (1.0.2)
+ *   -  Added URL support
+ *   -  Added keyword "this", as bugs in GeSHi class ironed out
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Added extra missed keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Compact the class names like the first few have been
+ *   and eliminate repeats
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Java',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'for', 'foreach', 'if', 'else', 'while', 'do',
+            'switch', 'case',  'return', 'public',
+            'private', 'protected', 'extends', 'break', 'class',
+            'new', 'try', 'catch', 'throws', 'finally', 'implements',
+            'interface', 'throw', 'final', 'native', 'synchronized', 'this',
+            'abstract', 'transient', 'instanceof', 'assert', 'continue',
+            'default', 'enum', 'package', 'static', 'strictfp', 'super',
+            'volatile', 'const', 'goto', 'import'
+            ),
+        2 => array(
+            'null', 'false', 'true'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor', 'Container',
+            'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream',
+            'DataTruncation', 'DATA_CONVERSION', 'Date',
+            'DateFormat', 'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter',
+            'FileInputStream', 'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream',
+            'InputStreamReader', 'InputSubset', 'InputVerifier',
+            'Insets', 'InsetsUIResource', 'InstantiationError',
+            'InstantiationException', 'Instrument',
+            'InsufficientResourcesException', 'Integer',
+            'INTERNAL', 'InternalError', 'InternalFrameAdapter',
+            'InternalFrameEvent', 'InternalFrameListener',
+            'InternalFrameUI', 'InterruptedException',
+            'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException',
+            'InvalidNameHelper', 'InvalidNameHolder',
+            'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl',
+            'ObjectInput', 'ObjectInputStream',
+            'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission',
+            'PermissionCollection', 'Permissions',
+            'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper',
+            'PolicyHolder', 'PolicyListHelper',
+            'PolicyListHolder', 'PolicyOperations',
+            'PolicyTypeHelper', 'Polygon', 'PopupMenu',
+            'PopupMenuEvent', 'PopupMenuListener', 'PopupMenuUI',
+            'Port', 'Port.Info', 'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'RunTime',
+            'Runtime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer',
+            'TimerTask', 'Timestamp', 'TimeZone', 'TitledBorder',
+            'ToolBarUI', 'Toolkit', 'ToolTipManager',
+            'ToolTipUI', 'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException',
+            'UnknownObjectException', 'UnknownServiceException',
+            'UnknownUserException', 'UnmarshalException',
+            'UnrecoverableKeyException', 'Unreferenced',
+            'UnresolvedPermission', 'UnsatisfiedLinkError',
+            'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '&', '|', '^',
+        '<', '>', '=',
+        '?', ':', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #003399;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&amp;q=allinurl%3A{FNAMEL}+java.sun.com&amp;btnI=I%27m%20Feeling%20Lucky',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java5.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java5.php
new file mode 100644
index 000000000..34696d760
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/java5.php
@@ -0,0 +1,1031 @@
+<?php
+/*************************************************************************************
+ * java.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/10
+ *
+ * Java language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/25 (1.0.7.22)
+ *   -  Added highlighting of import and package directives as non-OOP
+ * 2005/12/28 (1.0.4)
+ *   -  Added instanceof keyword
+ * 2004/11/27 (1.0.3)
+ *   -  Added support for multiple object splitters
+ * 2004/08/05 (1.0.2)
+ *   -  Added URL support
+ *   -  Added keyword "this", as bugs in GeSHi class ironed out
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Added extra missed keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Java(TM) 2 Platform Standard Edition 5.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            /* see the authoritative list of all 50 Java keywords at */
+            /* http://java.sun.com/docs/books/jls/third_edition/html/lexical.html#229308 */
+
+            /* java keywords, part 1: control flow */
+            'case', 'default', 'do', 'else', 'for',
+            'goto', 'if', 'switch', 'while'
+
+            /* IMO 'break', 'continue', 'return' and 'throw' */
+                        /* should also be added to this group, as they   */
+            /* also manage the control flow,                 */
+            /* arguably 'try'/'catch'/'finally' as well      */
+            ),
+        2 => array(
+            /* java keywords, part 2 */
+
+            'break', 'continue', 'return', 'throw',
+            'try', 'catch', 'finally',
+
+            'abstract', 'assert', 'class', 'const', 'enum', 'extends',
+            'final', 'implements', 'import', 'instanceof', 'interface',
+            'native', 'new', 'package', 'private', 'protected',
+            'public', 'static', 'strictfp', 'super', 'synchronized',
+            'this', 'throws', 'transient', 'volatile'
+            ),
+        3 => array(
+            /* Java keywords, part 3: primitive data types and 'void' */
+            'boolean', 'byte', 'char', 'double',
+            'float', 'int', 'long', 'short', 'void'
+            ),
+        4 => array(
+            /* other reserved words in Java: literals */
+            /* should be styled to look similar to numbers and Strings */
+            'false', 'null', 'true'
+            ),
+        5 => array (
+            'Applet', 'AppletContext', 'AppletStub', 'AudioClip'
+            ),
+        6 => array (
+            'AWTError', 'AWTEvent', 'AWTEventMulticaster', 'AWTException', 'AWTKeyStroke', 'AWTPermission', 'ActiveEvent', 'Adjustable', 'AlphaComposite', 'BasicStroke', 'BorderLayout', 'BufferCapabilities', 'BufferCapabilities.FlipContents', 'Button', 'Canvas', 'CardLayout', 'Checkbox', 'CheckboxGroup', 'CheckboxMenuItem', 'Choice', 'Color', 'Component', 'ComponentOrientation', 'Composite', 'CompositeContext', 'Container', 'ContainerOrderFocusTraversalPolicy', 'Cursor', 'DefaultFocusTraversalPolicy', 'DefaultKeyboardFocusManager', 'Dialog', 'Dimension', 'DisplayMode', 'EventQueue', 'FileDialog', 'FlowLayout', 'FocusTraversalPolicy', 'Font', 'FontFormatException', 'FontMetrics', 'Frame', 'GradientPaint', 'Graphics', 'Graphics2D', 'GraphicsConfigTemplate', 'GraphicsConfiguration', 'GraphicsDevice', 'GraphicsEnvironment', 'GridBagConstraints', 'GridBagLayout', 'GridLayout', 'HeadlessException', 'IllegalComponentStateException', 'Image', 'ImageCapabilities', 'Insets', 'ItemSelectable', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType', 'JobAttributes.DestinationType', 'JobAttributes.DialogType', 'JobAttributes.MultipleDocumentHandlingType', 'JobAttributes.SidesType', 'KeyEventDispatcher', 'KeyEventPostProcessor', 'KeyboardFocusManager', 'Label', 'LayoutManager', 'LayoutManager2', 'MediaTracker', 'Menu', 'MenuBar', 'MenuComponent', 'MenuContainer', 'MenuItem', 'MenuShortcut', 'MouseInfo', 'PageAttributes', 'PageAttributes.ColorType', 'PageAttributes.MediaType', 'PageAttributes.OrientationRequestedType', 'PageAttributes.OriginType', 'PageAttributes.PrintQualityType', 'Paint', 'PaintContext', 'Panel', 'Point', 'PointerInfo', 'Polygon', 'PopupMenu', 'PrintGraphics', 'PrintJob', 'Rectangle', 'RenderingHints', 'RenderingHints.Key', 'Robot', 'ScrollPane', 'ScrollPaneAdjustable', 'Scrollbar', 'Shape', 'Stroke', 'SystemColor', 'TextArea', 'TextComponent', 'TextField', 'TexturePaint', 'Toolkit', 'Transparency', 'Window'
+            ),
+        7 => array (
+            'CMMException', 'ColorSpace', 'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray', 'ICC_ProfileRGB', 'ProfileDataException'
+            ),
+        8 => array (
+            'Clipboard', 'ClipboardOwner', 'DataFlavor', 'FlavorEvent', 'FlavorListener', 'FlavorMap', 'FlavorTable', 'MimeTypeParseException', 'StringSelection', 'SystemFlavorMap', 'Transferable', 'UnsupportedFlavorException'
+            ),
+        9 => array (
+            'Autoscroll', 'DnDConstants', 'DragGestureEvent', 'DragGestureListener', 'DragGestureRecognizer', 'DragSource', 'DragSourceAdapter', 'DragSourceContext', 'DragSourceDragEvent', 'DragSourceDropEvent', 'DragSourceEvent', 'DragSourceListener', 'DragSourceMotionListener', 'DropTarget', 'DropTarget.DropTargetAutoScroller', 'DropTargetAdapter', 'DropTargetContext', 'DropTargetDragEvent', 'DropTargetDropEvent', 'DropTargetEvent', 'DropTargetListener', 'InvalidDnDOperationException', 'MouseDragGestureRecognizer'
+            ),
+        10 => array (
+            'AWTEventListener', 'AWTEventListenerProxy', 'ActionEvent', 'ActionListener', 'AdjustmentEvent', 'AdjustmentListener', 'ComponentAdapter', 'ComponentEvent', 'ComponentListener', 'ContainerAdapter', 'ContainerEvent', 'ContainerListener', 'FocusAdapter', 'FocusEvent', 'FocusListener', 'HierarchyBoundsAdapter', 'HierarchyBoundsListener', 'HierarchyEvent', 'HierarchyListener', 'InputEvent', 'InputMethodEvent', 'InputMethodListener', 'InvocationEvent', 'ItemEvent', 'ItemListener', 'KeyAdapter', 'KeyEvent', 'KeyListener', 'MouseAdapter', 'MouseListener', 'MouseMotionAdapter', 'MouseMotionListener', 'MouseWheelEvent', 'MouseWheelListener', 'PaintEvent', 'TextEvent', 'TextListener', 'WindowAdapter', 'WindowEvent', 'WindowFocusListener', 'WindowListener', 'WindowStateListener'
+            ),
+        11 => array (
+            'FontRenderContext', 'GlyphJustificationInfo', 'GlyphMetrics', 'GlyphVector', 'GraphicAttribute', 'ImageGraphicAttribute', 'LineBreakMeasurer', 'LineMetrics', 'MultipleMaster', 'NumericShaper', 'ShapeGraphicAttribute', 'TextAttribute', 'TextHitInfo', 'TextLayout', 'TextLayout.CaretPolicy', 'TextMeasurer', 'TransformAttribute'
+            ),
+        12 => array (
+            'AffineTransform', 'Arc2D', 'Arc2D.Double', 'Arc2D.Float', 'Area', 'CubicCurve2D', 'CubicCurve2D.Double', 'CubicCurve2D.Float', 'Dimension2D', 'Ellipse2D', 'Ellipse2D.Double', 'Ellipse2D.Float', 'FlatteningPathIterator', 'GeneralPath', 'IllegalPathStateException', 'Line2D', 'Line2D.Double', 'Line2D.Float', 'NoninvertibleTransformException', 'PathIterator', 'Point2D', 'Point2D.Double', 'Point2D.Float', 'QuadCurve2D', 'QuadCurve2D.Double', 'QuadCurve2D.Float', 'Rectangle2D', 'Rectangle2D.Double', 'Rectangle2D.Float', 'RectangularShape', 'RoundRectangle2D', 'RoundRectangle2D.Double', 'RoundRectangle2D.Float'
+            ),
+        13 => array (
+            'InputContext', 'InputMethodHighlight', 'InputMethodRequests', 'InputSubset'
+            ),
+        14 => array (
+            'InputMethod', 'InputMethodContext', 'InputMethodDescriptor'
+            ),
+        15 => array (
+            'AffineTransformOp', 'AreaAveragingScaleFilter', 'BandCombineOp', 'BandedSampleModel', 'BufferStrategy', 'BufferedImage', 'BufferedImageFilter', 'BufferedImageOp', 'ByteLookupTable', 'ColorConvertOp', 'ColorModel', 'ComponentColorModel', 'ComponentSampleModel', 'ConvolveOp', 'CropImageFilter', 'DataBuffer', 'DataBufferByte', 'DataBufferDouble', 'DataBufferFloat', 'DataBufferInt', 'DataBufferShort', 'DataBufferUShort', 'DirectColorModel', 'FilteredImageSource', 'ImageConsumer', 'ImageFilter', 'ImageObserver', 'ImageProducer', 'ImagingOpException', 'IndexColorModel', 'Kernel', 'LookupOp', 'LookupTable', 'MemoryImageSource', 'MultiPixelPackedSampleModel', 'PackedColorModel', 'PixelGrabber', 'PixelInterleavedSampleModel', 'RGBImageFilter', 'Raster', 'RasterFormatException', 'RasterOp', 'RenderedImage', 'ReplicateScaleFilter', 'RescaleOp', 'SampleModel', 'ShortLookupTable', 'SinglePixelPackedSampleModel', 'TileObserver', 'VolatileImage', 'WritableRaster', 'WritableRenderedImage'
+            ),
+        16 => array (
+            'ContextualRenderedImageFactory', 'ParameterBlock', 'RenderContext', 'RenderableImage', 'RenderableImageOp', 'RenderableImageProducer', 'RenderedImageFactory'
+            ),
+        17 => array (
+            'Book', 'PageFormat', 'Pageable', 'Paper', 'Printable', 'PrinterAbortException', 'PrinterException', 'PrinterGraphics', 'PrinterIOException', 'PrinterJob'
+            ),
+        18 => array (
+            'AppletInitializer', 'BeanDescriptor', 'BeanInfo', 'Beans', 'Customizer', 'DefaultPersistenceDelegate', 'DesignMode', 'Encoder', 'EventHandler', 'EventSetDescriptor', 'ExceptionListener', 'Expression', 'FeatureDescriptor', 'IndexedPropertyChangeEvent', 'IndexedPropertyDescriptor', 'Introspector', 'MethodDescriptor', 'ParameterDescriptor', 'PersistenceDelegate', 'PropertyChangeEvent', 'PropertyChangeListener', 'PropertyChangeListenerProxy', 'PropertyChangeSupport', 'PropertyDescriptor', 'PropertyEditor', 'PropertyEditorManager', 'PropertyEditorSupport', 'PropertyVetoException', 'SimpleBeanInfo', 'VetoableChangeListener', 'VetoableChangeListenerProxy', 'VetoableChangeSupport', 'Visibility', 'XMLDecoder', 'XMLEncoder'
+            ),
+        19 => array (
+            'BeanContext', 'BeanContextChild', 'BeanContextChildComponentProxy', 'BeanContextChildSupport', 'BeanContextContainerProxy', 'BeanContextEvent', 'BeanContextMembershipEvent', 'BeanContextMembershipListener', 'BeanContextProxy', 'BeanContextServiceAvailableEvent', 'BeanContextServiceProvider', 'BeanContextServiceProviderBeanInfo', 'BeanContextServiceRevokedEvent', 'BeanContextServiceRevokedListener', 'BeanContextServices', 'BeanContextServicesListener', 'BeanContextServicesSupport', 'BeanContextServicesSupport.BCSSServiceProvider', 'BeanContextSupport', 'BeanContextSupport.BCSIterator'
+            ),
+        20 => array (
+            'BufferedInputStream', 'BufferedOutputStream', 'BufferedReader', 'BufferedWriter', 'ByteArrayInputStream', 'ByteArrayOutputStream', 'CharArrayReader', 'CharArrayWriter', 'CharConversionException', 'Closeable', 'DataInput', 'DataOutput', 'EOFException', 'Externalizable', 'File', 'FileDescriptor', 'FileInputStream', 'FileNotFoundException', 'FileOutputStream', 'FilePermission', 'FileReader', 'FileWriter', 'FilenameFilter', 'FilterInputStream', 'FilterOutputStream', 'FilterReader', 'FilterWriter', 'Flushable', 'IOException', 'InputStreamReader', 'InterruptedIOException', 'InvalidClassException', 'InvalidObjectException', 'LineNumberInputStream', 'LineNumberReader', 'NotActiveException', 'NotSerializableException', 'ObjectInput', 'ObjectInputStream', 'ObjectInputStream.GetField', 'ObjectInputValidation', 'ObjectOutput', 'ObjectOutputStream', 'ObjectOutputStream.PutField', 'ObjectStreamClass', 'ObjectStreamConstants', 'ObjectStreamException', 'ObjectStreamField', 'OptionalDataException', 'OutputStreamWriter',
+            'PipedInputStream', 'PipedOutputStream', 'PipedReader', 'PipedWriter', 'PrintStream', 'PrintWriter', 'PushbackInputStream', 'PushbackReader', 'RandomAccessFile', 'Reader', 'SequenceInputStream', 'Serializable', 'SerializablePermission', 'StreamCorruptedException', 'StreamTokenizer', 'StringBufferInputStream', 'StringReader', 'StringWriter', 'SyncFailedException', 'UTFDataFormatException', 'UnsupportedEncodingException', 'WriteAbortedException', 'Writer'
+            ),
+        21 => array (
+            'AbstractMethodError', 'Appendable', 'ArithmeticException', 'ArrayIndexOutOfBoundsException', 'ArrayStoreException', 'AssertionError', 'Boolean', 'Byte', 'CharSequence', 'Character', 'Character.Subset', 'Character.UnicodeBlock', 'Class', 'ClassCastException', 'ClassCircularityError', 'ClassFormatError', 'ClassLoader', 'ClassNotFoundException', 'CloneNotSupportedException', 'Cloneable', 'Comparable', 'Compiler', 'Deprecated', 'Double', 'Enum', 'EnumConstantNotPresentException', 'Error', 'Exception', 'ExceptionInInitializerError', 'Float', 'IllegalAccessError', 'IllegalAccessException', 'IllegalArgumentException', 'IllegalMonitorStateException', 'IllegalStateException', 'IllegalThreadStateException', 'IncompatibleClassChangeError', 'IndexOutOfBoundsException', 'InheritableThreadLocal', 'InstantiationError', 'InstantiationException', 'Integer', 'InternalError', 'InterruptedException', 'Iterable', 'LinkageError', 'Long', 'Math', 'NegativeArraySizeException', 'NoClassDefFoundError', 'NoSuchFieldError',
+            'NoSuchFieldException', 'NoSuchMethodError', 'NoSuchMethodException', 'NullPointerException', 'Number', 'NumberFormatException', 'OutOfMemoryError', 'Override', 'Package', 'Process', 'ProcessBuilder', 'Readable', 'Runnable', 'Runtime', 'RuntimeException', 'RuntimePermission', 'SecurityException', 'SecurityManager', 'Short', 'StackOverflowError', 'StackTraceElement', 'StrictMath', 'String', 'StringBuffer', 'StringBuilder', 'StringIndexOutOfBoundsException', 'SuppressWarnings', 'System', 'Thread', 'Thread.State', 'Thread.UncaughtExceptionHandler', 'ThreadDeath', 'ThreadGroup', 'ThreadLocal', 'Throwable', 'TypeNotPresentException', 'UnknownError', 'UnsatisfiedLinkError', 'UnsupportedClassVersionError', 'UnsupportedOperationException', 'VerifyError', 'VirtualMachineError', 'Void'
+            ),
+        22 => array (
+            'AnnotationFormatError', 'AnnotationTypeMismatchException', 'Documented', 'ElementType', 'IncompleteAnnotationException', 'Inherited', 'Retention', 'RetentionPolicy', 'Target'
+            ),
+        23 => array (
+            'ClassDefinition', 'ClassFileTransformer', 'IllegalClassFormatException', 'Instrumentation', 'UnmodifiableClassException'
+            ),
+        24 => array (
+            'ClassLoadingMXBean', 'CompilationMXBean', 'GarbageCollectorMXBean', 'ManagementFactory', 'ManagementPermission', 'MemoryMXBean', 'MemoryManagerMXBean', 'MemoryNotificationInfo', 'MemoryPoolMXBean', 'MemoryType', 'MemoryUsage', 'OperatingSystemMXBean', 'RuntimeMXBean', 'ThreadInfo', 'ThreadMXBean'
+            ),
+        25 => array (
+            'PhantomReference', 'ReferenceQueue', 'SoftReference', 'WeakReference'
+            ),
+        26 => array (
+            'AccessibleObject', 'AnnotatedElement', 'Constructor', 'Field', 'GenericArrayType', 'GenericDeclaration', 'GenericSignatureFormatError', 'InvocationHandler', 'InvocationTargetException', 'MalformedParameterizedTypeException', 'Member', 'Method', 'Modifier', 'ParameterizedType', 'ReflectPermission', 'Type', 'TypeVariable', 'UndeclaredThrowableException', 'WildcardType'
+            ),
+        27 => array (
+            'BigDecimal', 'BigInteger', 'MathContext', 'RoundingMode'
+            ),
+        28 => array (
+            'Authenticator', 'Authenticator.RequestorType', 'BindException', 'CacheRequest', 'CacheResponse', 'ContentHandlerFactory', 'CookieHandler', 'DatagramPacket', 'DatagramSocket', 'DatagramSocketImpl', 'DatagramSocketImplFactory', 'FileNameMap', 'HttpRetryException', 'HttpURLConnection', 'Inet4Address', 'Inet6Address', 'InetAddress', 'InetSocketAddress', 'JarURLConnection', 'MalformedURLException', 'MulticastSocket', 'NetPermission', 'NetworkInterface', 'NoRouteToHostException', 'PasswordAuthentication', 'PortUnreachableException', 'ProtocolException', 'Proxy.Type', 'ProxySelector', 'ResponseCache', 'SecureCacheResponse', 'ServerSocket', 'Socket', 'SocketAddress', 'SocketException', 'SocketImpl', 'SocketImplFactory', 'SocketOptions', 'SocketPermission', 'SocketTimeoutException', 'URI', 'URISyntaxException', 'URL', 'URLClassLoader', 'URLConnection', 'URLDecoder', 'URLEncoder', 'URLStreamHandler', 'URLStreamHandlerFactory', 'UnknownServiceException'
+            ),
+        29 => array (
+            'Buffer', 'BufferOverflowException', 'BufferUnderflowException', 'ByteBuffer', 'ByteOrder', 'CharBuffer', 'DoubleBuffer', 'FloatBuffer', 'IntBuffer', 'InvalidMarkException', 'LongBuffer', 'MappedByteBuffer', 'ReadOnlyBufferException', 'ShortBuffer'
+            ),
+        30 => array (
+            'AlreadyConnectedException', 'AsynchronousCloseException', 'ByteChannel', 'CancelledKeyException', 'Channel', 'Channels', 'ClosedByInterruptException', 'ClosedChannelException', 'ClosedSelectorException', 'ConnectionPendingException', 'DatagramChannel', 'FileChannel', 'FileChannel.MapMode', 'FileLock', 'FileLockInterruptionException', 'GatheringByteChannel', 'IllegalBlockingModeException', 'IllegalSelectorException', 'InterruptibleChannel', 'NoConnectionPendingException', 'NonReadableChannelException', 'NonWritableChannelException', 'NotYetBoundException', 'NotYetConnectedException', 'OverlappingFileLockException', 'Pipe', 'Pipe.SinkChannel', 'Pipe.SourceChannel', 'ReadableByteChannel', 'ScatteringByteChannel', 'SelectableChannel', 'SelectionKey', 'Selector', 'ServerSocketChannel', 'SocketChannel', 'UnresolvedAddressException', 'UnsupportedAddressTypeException', 'WritableByteChannel'
+            ),
+        31 => array (
+            'AbstractInterruptibleChannel', 'AbstractSelectableChannel', 'AbstractSelectionKey', 'AbstractSelector', 'SelectorProvider'
+            ),
+        32 => array (
+            'CharacterCodingException', 'Charset', 'CharsetDecoder', 'CharsetEncoder', 'CoderMalfunctionError', 'CoderResult', 'CodingErrorAction', 'IllegalCharsetNameException', 'MalformedInputException', 'UnmappableCharacterException', 'UnsupportedCharsetException'
+            ),
+        33 => array (
+            'CharsetProvider'
+            ),
+        34 => array (
+            'AccessException', 'AlreadyBoundException', 'ConnectIOException', 'MarshalException', 'MarshalledObject', 'Naming', 'NoSuchObjectException', 'NotBoundException', 'RMISecurityException', 'RMISecurityManager', 'Remote', 'RemoteException', 'ServerError', 'ServerException', 'ServerRuntimeException', 'StubNotFoundException', 'UnexpectedException', 'UnmarshalException'
+            ),
+        35 => array (
+            'Activatable', 'ActivateFailedException', 'ActivationDesc', 'ActivationException', 'ActivationGroup', 'ActivationGroupDesc', 'ActivationGroupDesc.CommandEnvironment', 'ActivationGroupID', 'ActivationGroup_Stub', 'ActivationID', 'ActivationInstantiator', 'ActivationMonitor', 'ActivationSystem', 'Activator', 'UnknownGroupException', 'UnknownObjectException'
+            ),
+        36 => array (
+            'DGC', 'Lease', 'VMID'
+            ),
+        37 => array (
+            'LocateRegistry', 'Registry', 'RegistryHandler'
+            ),
+        38 => array (
+            'ExportException', 'LoaderHandler', 'LogStream', 'ObjID', 'Operation', 'RMIClassLoader', 'RMIClassLoaderSpi', 'RMIClientSocketFactory', 'RMIFailureHandler', 'RMIServerSocketFactory', 'RMISocketFactory', 'RemoteCall', 'RemoteObject', 'RemoteObjectInvocationHandler', 'RemoteRef', 'RemoteServer', 'RemoteStub', 'ServerCloneException', 'ServerNotActiveException', 'ServerRef', 'Skeleton', 'SkeletonMismatchException', 'SkeletonNotFoundException', 'SocketSecurityException', 'UID', 'UnicastRemoteObject', 'Unreferenced'
+            ),
+        39 => array (
+            'AccessControlContext', 'AccessControlException', 'AccessController', 'AlgorithmParameterGenerator', 'AlgorithmParameterGeneratorSpi', 'AlgorithmParameters', 'AlgorithmParametersSpi', 'AllPermission', 'AuthProvider', 'BasicPermission', 'CodeSigner', 'CodeSource', 'DigestException', 'DigestInputStream', 'DigestOutputStream', 'DomainCombiner', 'GeneralSecurityException', 'Guard', 'GuardedObject', 'Identity', 'IdentityScope', 'InvalidAlgorithmParameterException', 'InvalidParameterException', 'Key', 'KeyException', 'KeyFactory', 'KeyFactorySpi', 'KeyManagementException', 'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi', 'KeyRep', 'KeyRep.Type', 'KeyStore', 'KeyStore.Builder', 'KeyStore.CallbackHandlerProtection', 'KeyStore.Entry', 'KeyStore.LoadStoreParameter', 'KeyStore.PasswordProtection', 'KeyStore.PrivateKeyEntry', 'KeyStore.ProtectionParameter', 'KeyStore.SecretKeyEntry', 'KeyStore.TrustedCertificateEntry', 'KeyStoreException', 'KeyStoreSpi', 'MessageDigest', 'MessageDigestSpi',
+            'NoSuchAlgorithmException', 'NoSuchProviderException', 'PermissionCollection', 'Permissions', 'PrivateKey', 'PrivilegedAction', 'PrivilegedActionException', 'PrivilegedExceptionAction', 'ProtectionDomain', 'Provider', 'Provider.Service', 'ProviderException', 'PublicKey', 'SecureClassLoader', 'SecureRandom', 'SecureRandomSpi', 'Security', 'SecurityPermission', 'Signature', 'SignatureException', 'SignatureSpi', 'SignedObject', 'Signer', 'UnrecoverableEntryException', 'UnrecoverableKeyException', 'UnresolvedPermission'
+            ),
+        40 => array (
+            'Acl', 'AclEntry', 'AclNotFoundException', 'Group', 'LastOwnerException', 'NotOwnerException', 'Owner'
+            ),
+        41 => array (
+            'CRL', 'CRLException', 'CRLSelector', 'CertPath', 'CertPath.CertPathRep', 'CertPathBuilder', 'CertPathBuilderException', 'CertPathBuilderResult', 'CertPathBuilderSpi', 'CertPathParameters', 'CertPathValidator', 'CertPathValidatorException', 'CertPathValidatorResult', 'CertPathValidatorSpi', 'CertSelector', 'CertStore', 'CertStoreException', 'CertStoreParameters', 'CertStoreSpi', 'Certificate.CertificateRep', 'CertificateFactory', 'CertificateFactorySpi', 'CollectionCertStoreParameters', 'LDAPCertStoreParameters', 'PKIXBuilderParameters', 'PKIXCertPathBuilderResult', 'PKIXCertPathChecker', 'PKIXCertPathValidatorResult', 'PKIXParameters', 'PolicyNode', 'PolicyQualifierInfo', 'TrustAnchor', 'X509CRL', 'X509CRLEntry', 'X509CRLSelector', 'X509CertSelector', 'X509Extension'
+            ),
+        42 => array (
+            'DSAKey', 'DSAKeyPairGenerator', 'DSAParams', 'DSAPrivateKey', 'DSAPublicKey', 'ECKey', 'ECPrivateKey', 'ECPublicKey', 'RSAKey', 'RSAMultiPrimePrivateCrtKey', 'RSAPrivateCrtKey', 'RSAPrivateKey', 'RSAPublicKey'
+            ),
+        43 => array (
+            'AlgorithmParameterSpec', 'DSAParameterSpec', 'DSAPrivateKeySpec', 'DSAPublicKeySpec', 'ECField', 'ECFieldF2m', 'ECFieldFp', 'ECGenParameterSpec', 'ECParameterSpec', 'ECPoint', 'ECPrivateKeySpec', 'ECPublicKeySpec', 'EllipticCurve', 'EncodedKeySpec', 'InvalidKeySpecException', 'InvalidParameterSpecException', 'KeySpec', 'MGF1ParameterSpec', 'PKCS8EncodedKeySpec', 'PSSParameterSpec', 'RSAKeyGenParameterSpec', 'RSAMultiPrimePrivateCrtKeySpec', 'RSAOtherPrimeInfo', 'RSAPrivateCrtKeySpec', 'RSAPrivateKeySpec', 'RSAPublicKeySpec', 'X509EncodedKeySpec'
+            ),
+        44 => array (
+            'BatchUpdateException', 'Blob', 'CallableStatement', 'Clob', 'Connection', 'DataTruncation', 'DatabaseMetaData', 'Driver', 'DriverManager', 'DriverPropertyInfo', 'ParameterMetaData', 'PreparedStatement', 'Ref', 'ResultSet', 'ResultSetMetaData', 'SQLData', 'SQLException', 'SQLInput', 'SQLOutput', 'SQLPermission', 'SQLWarning', 'Savepoint', 'Struct', 'Time', 'Types'
+            ),
+        45 => array (
+            'AttributedCharacterIterator', 'AttributedCharacterIterator.Attribute', 'AttributedString', 'Bidi', 'BreakIterator', 'CharacterIterator', 'ChoiceFormat', 'CollationElementIterator', 'CollationKey', 'Collator', 'DateFormat', 'DateFormat.Field', 'DateFormatSymbols', 'DecimalFormat', 'DecimalFormatSymbols', 'FieldPosition', 'Format', 'Format.Field', 'MessageFormat', 'MessageFormat.Field', 'NumberFormat', 'NumberFormat.Field', 'ParseException', 'ParsePosition', 'RuleBasedCollator', 'SimpleDateFormat', 'StringCharacterIterator'
+            ),
+        46 => array (
+            'AbstractCollection', 'AbstractList', 'AbstractMap', 'AbstractQueue', 'AbstractSequentialList', 'AbstractSet', 'ArrayList', 'Arrays', 'BitSet', 'Calendar', 'Collection', 'Collections', 'Comparator', 'ConcurrentModificationException', 'Currency', 'Dictionary', 'DuplicateFormatFlagsException', 'EmptyStackException', 'EnumMap', 'EnumSet', 'Enumeration', 'EventListenerProxy', 'EventObject', 'FormatFlagsConversionMismatchException', 'Formattable', 'FormattableFlags', 'Formatter.BigDecimalLayoutForm', 'FormatterClosedException', 'GregorianCalendar', 'HashMap', 'HashSet', 'Hashtable', 'IdentityHashMap', 'IllegalFormatCodePointException', 'IllegalFormatConversionException', 'IllegalFormatException', 'IllegalFormatFlagsException', 'IllegalFormatPrecisionException', 'IllegalFormatWidthException', 'InputMismatchException', 'InvalidPropertiesFormatException', 'Iterator', 'LinkedHashMap', 'LinkedHashSet', 'LinkedList', 'ListIterator', 'ListResourceBundle', 'Locale', 'Map', 'Map.Entry', 'MissingFormatArgumentException',
+            'MissingFormatWidthException', 'MissingResourceException', 'NoSuchElementException', 'Observable', 'Observer', 'PriorityQueue', 'Properties', 'PropertyPermission', 'PropertyResourceBundle', 'Queue', 'Random', 'RandomAccess', 'ResourceBundle', 'Scanner', 'Set', 'SimpleTimeZone', 'SortedMap', 'SortedSet', 'Stack', 'StringTokenizer', 'TimeZone', 'TimerTask', 'TooManyListenersException', 'TreeMap', 'TreeSet', 'UUID', 'UnknownFormatConversionException', 'UnknownFormatFlagsException', 'Vector', 'WeakHashMap'
+            ),
+        47 => array (
+            'AbstractExecutorService', 'ArrayBlockingQueue', 'BlockingQueue', 'BrokenBarrierException', 'Callable', 'CancellationException', 'CompletionService', 'ConcurrentHashMap', 'ConcurrentLinkedQueue', 'ConcurrentMap', 'CopyOnWriteArrayList', 'CopyOnWriteArraySet', 'CountDownLatch', 'CyclicBarrier', 'DelayQueue', 'Delayed', 'Exchanger', 'ExecutionException', 'Executor', 'ExecutorCompletionService', 'ExecutorService', 'Executors', 'Future', 'FutureTask', 'LinkedBlockingQueue', 'PriorityBlockingQueue', 'RejectedExecutionException', 'RejectedExecutionHandler', 'ScheduledExecutorService', 'ScheduledFuture', 'ScheduledThreadPoolExecutor', 'Semaphore', 'SynchronousQueue', 'ThreadFactory', 'ThreadPoolExecutor', 'ThreadPoolExecutor.AbortPolicy', 'ThreadPoolExecutor.CallerRunsPolicy', 'ThreadPoolExecutor.DiscardOldestPolicy', 'ThreadPoolExecutor.DiscardPolicy', 'TimeUnit', 'TimeoutException'
+            ),
+        48 => array (
+            'AtomicBoolean', 'AtomicInteger', 'AtomicIntegerArray', 'AtomicIntegerFieldUpdater', 'AtomicLong', 'AtomicLongArray', 'AtomicLongFieldUpdater', 'AtomicMarkableReference', 'AtomicReference', 'AtomicReferenceArray', 'AtomicReferenceFieldUpdater', 'AtomicStampedReference'
+            ),
+        49 => array (
+            'AbstractQueuedSynchronizer', 'Condition', 'Lock', 'LockSupport', 'ReadWriteLock', 'ReentrantLock', 'ReentrantReadWriteLock', 'ReentrantReadWriteLock.ReadLock', 'ReentrantReadWriteLock.WriteLock'
+            ),
+        50 => array (
+            'Attributes.Name', 'JarEntry', 'JarException', 'JarFile', 'JarInputStream', 'JarOutputStream', 'Manifest', 'Pack200', 'Pack200.Packer', 'Pack200.Unpacker'
+            ),
+        51 => array (
+            'ConsoleHandler', 'ErrorManager', 'FileHandler', 'Filter', 'Handler', 'Level', 'LogManager', 'LogRecord', 'Logger', 'LoggingMXBean', 'LoggingPermission', 'MemoryHandler', 'SimpleFormatter', 'SocketHandler', 'StreamHandler', 'XMLFormatter'
+            ),
+        52 => array (
+            'AbstractPreferences', 'BackingStoreException', 'InvalidPreferencesFormatException', 'NodeChangeEvent', 'NodeChangeListener', 'PreferenceChangeEvent', 'PreferenceChangeListener', 'Preferences', 'PreferencesFactory'
+            ),
+        53 => array (
+            'MatchResult', 'Matcher', 'Pattern', 'PatternSyntaxException'
+            ),
+        54 => array (
+            'Adler32', 'CRC32', 'CheckedInputStream', 'CheckedOutputStream', 'Checksum', 'DataFormatException', 'Deflater', 'DeflaterOutputStream', 'GZIPInputStream', 'GZIPOutputStream', 'Inflater', 'InflaterInputStream', 'ZipEntry', 'ZipException', 'ZipFile', 'ZipInputStream', 'ZipOutputStream'
+            ),
+        55 => array (
+            'Accessible', 'AccessibleAction', 'AccessibleAttributeSequence', 'AccessibleBundle', 'AccessibleComponent', 'AccessibleContext', 'AccessibleEditableText', 'AccessibleExtendedComponent', 'AccessibleExtendedTable', 'AccessibleExtendedText', 'AccessibleHyperlink', 'AccessibleHypertext', 'AccessibleIcon', 'AccessibleKeyBinding', 'AccessibleRelation', 'AccessibleRelationSet', 'AccessibleResourceBundle', 'AccessibleRole', 'AccessibleSelection', 'AccessibleState', 'AccessibleStateSet', 'AccessibleStreamable', 'AccessibleTable', 'AccessibleTableModelChange', 'AccessibleText', 'AccessibleTextSequence', 'AccessibleValue'
+            ),
+        56 => array (
+            'ActivityCompletedException', 'ActivityRequiredException', 'InvalidActivityException'
+            ),
+        57 => array (
+            'BadPaddingException', 'Cipher', 'CipherInputStream', 'CipherOutputStream', 'CipherSpi', 'EncryptedPrivateKeyInfo', 'ExemptionMechanism', 'ExemptionMechanismException', 'ExemptionMechanismSpi', 'IllegalBlockSizeException', 'KeyAgreement', 'KeyAgreementSpi', 'KeyGenerator', 'KeyGeneratorSpi', 'Mac', 'MacSpi', 'NoSuchPaddingException', 'NullCipher', 'SealedObject', 'SecretKey', 'SecretKeyFactory', 'SecretKeyFactorySpi', 'ShortBufferException'
+            ),
+        58 => array (
+            'DHKey', 'DHPrivateKey', 'DHPublicKey', 'PBEKey'
+            ),
+        59 => array (
+            'DESKeySpec', 'DESedeKeySpec', 'DHGenParameterSpec', 'DHParameterSpec', 'DHPrivateKeySpec', 'DHPublicKeySpec', 'IvParameterSpec', 'OAEPParameterSpec', 'PBEKeySpec', 'PBEParameterSpec', 'PSource', 'PSource.PSpecified', 'RC2ParameterSpec', 'RC5ParameterSpec', 'SecretKeySpec'
+            ),
+        60 => array (
+            'IIOException', 'IIOImage', 'IIOParam', 'IIOParamController', 'ImageIO', 'ImageReadParam', 'ImageReader', 'ImageTranscoder', 'ImageTypeSpecifier', 'ImageWriteParam', 'ImageWriter'
+            ),
+        61 => array (
+            'IIOReadProgressListener', 'IIOReadUpdateListener', 'IIOReadWarningListener', 'IIOWriteProgressListener', 'IIOWriteWarningListener'
+            ),
+        62 => array (
+            'IIOInvalidTreeException', 'IIOMetadata', 'IIOMetadataController', 'IIOMetadataFormat', 'IIOMetadataFormatImpl', 'IIOMetadataNode'
+            ),
+        63 => array (
+            'BMPImageWriteParam'
+            ),
+        64 => array (
+            'JPEGHuffmanTable', 'JPEGImageReadParam', 'JPEGImageWriteParam', 'JPEGQTable'
+            ),
+        65 => array (
+            'IIORegistry', 'IIOServiceProvider', 'ImageInputStreamSpi', 'ImageOutputStreamSpi', 'ImageReaderSpi', 'ImageReaderWriterSpi', 'ImageTranscoderSpi', 'ImageWriterSpi', 'RegisterableService', 'ServiceRegistry', 'ServiceRegistry.Filter'
+            ),
+        66 => array (
+            'FileCacheImageInputStream', 'FileCacheImageOutputStream', 'FileImageInputStream', 'FileImageOutputStream', 'IIOByteBuffer', 'ImageInputStream', 'ImageInputStreamImpl', 'ImageOutputStream', 'ImageOutputStreamImpl', 'MemoryCacheImageInputStream', 'MemoryCacheImageOutputStream'
+            ),
+        67 => array (
+            'AttributeChangeNotification', 'AttributeChangeNotificationFilter', 'AttributeNotFoundException', 'AttributeValueExp', 'BadAttributeValueExpException', 'BadBinaryOpValueExpException', 'BadStringOperationException', 'Descriptor', 'DescriptorAccess', 'DynamicMBean', 'InstanceAlreadyExistsException', 'InstanceNotFoundException', 'InvalidApplicationException', 'JMException', 'JMRuntimeException', 'ListenerNotFoundException', 'MBeanAttributeInfo', 'MBeanConstructorInfo', 'MBeanException', 'MBeanFeatureInfo', 'MBeanInfo', 'MBeanNotificationInfo', 'MBeanOperationInfo', 'MBeanParameterInfo', 'MBeanPermission', 'MBeanRegistration', 'MBeanRegistrationException', 'MBeanServer', 'MBeanServerBuilder', 'MBeanServerConnection', 'MBeanServerDelegate', 'MBeanServerDelegateMBean', 'MBeanServerFactory', 'MBeanServerInvocationHandler', 'MBeanServerNotification', 'MBeanServerPermission', 'MBeanTrustPermission', 'MalformedObjectNameException', 'NotCompliantMBeanException', 'Notification', 'NotificationBroadcaster',
+            'NotificationBroadcasterSupport', 'NotificationEmitter', 'NotificationFilter', 'NotificationFilterSupport', 'NotificationListener', 'ObjectInstance', 'ObjectName', 'OperationsException', 'PersistentMBean', 'Query', 'QueryEval', 'QueryExp', 'ReflectionException', 'RuntimeErrorException', 'RuntimeMBeanException', 'RuntimeOperationsException', 'ServiceNotFoundException', 'StandardMBean', 'StringValueExp', 'ValueExp'
+            ),
+        68 => array (
+            'ClassLoaderRepository', 'MLet', 'MLetMBean', 'PrivateClassLoader', 'PrivateMLet'
+            ),
+        69 => array (
+            'DescriptorSupport', 'InvalidTargetObjectTypeException', 'ModelMBean', 'ModelMBeanAttributeInfo', 'ModelMBeanConstructorInfo', 'ModelMBeanInfo', 'ModelMBeanInfoSupport', 'ModelMBeanNotificationBroadcaster', 'ModelMBeanNotificationInfo', 'ModelMBeanOperationInfo', 'RequiredModelMBean', 'XMLParseException'
+            ),
+        70 => array (
+            'CounterMonitor', 'CounterMonitorMBean', 'GaugeMonitor', 'GaugeMonitorMBean', 'Monitor', 'MonitorMBean', 'MonitorNotification', 'MonitorSettingException', 'StringMonitor', 'StringMonitorMBean'
+            ),
+        71 => array (
+            'ArrayType', 'CompositeData', 'CompositeDataSupport', 'CompositeType', 'InvalidOpenTypeException', 'KeyAlreadyExistsException', 'OpenDataException', 'OpenMBeanAttributeInfo', 'OpenMBeanAttributeInfoSupport', 'OpenMBeanConstructorInfo', 'OpenMBeanConstructorInfoSupport', 'OpenMBeanInfo', 'OpenMBeanInfoSupport', 'OpenMBeanOperationInfo', 'OpenMBeanOperationInfoSupport', 'OpenMBeanParameterInfo', 'OpenMBeanParameterInfoSupport', 'SimpleType', 'TabularData', 'TabularDataSupport', 'TabularType'
+            ),
+        72 => array (
+            'InvalidRelationIdException', 'InvalidRelationServiceException', 'InvalidRelationTypeException', 'InvalidRoleInfoException', 'InvalidRoleValueException', 'MBeanServerNotificationFilter', 'Relation', 'RelationException', 'RelationNotFoundException', 'RelationNotification', 'RelationService', 'RelationServiceMBean', 'RelationServiceNotRegisteredException', 'RelationSupport', 'RelationSupportMBean', 'RelationType', 'RelationTypeNotFoundException', 'RelationTypeSupport', 'Role', 'RoleInfo', 'RoleInfoNotFoundException', 'RoleList', 'RoleNotFoundException', 'RoleResult', 'RoleStatus', 'RoleUnresolved', 'RoleUnresolvedList'
+            ),
+        73 => array (
+            'JMXAuthenticator', 'JMXConnectionNotification', 'JMXConnector', 'JMXConnectorFactory', 'JMXConnectorProvider', 'JMXConnectorServer', 'JMXConnectorServerFactory', 'JMXConnectorServerMBean', 'JMXConnectorServerProvider', 'JMXPrincipal', 'JMXProviderException', 'JMXServerErrorException', 'JMXServiceURL', 'MBeanServerForwarder', 'NotificationResult', 'SubjectDelegationPermission', 'TargetedNotification'
+            ),
+        74 => array (
+            'RMIConnection', 'RMIConnectionImpl', 'RMIConnectionImpl_Stub', 'RMIConnector', 'RMIConnectorServer', 'RMIIIOPServerImpl', 'RMIJRMPServerImpl', 'RMIServer', 'RMIServerImpl', 'RMIServerImpl_Stub'
+            ),
+        75 => array (
+            'TimerAlarmClockNotification', 'TimerMBean', 'TimerNotification'
+            ),
+        76 => array (
+            'AuthenticationNotSupportedException', 'BinaryRefAddr', 'CannotProceedException', 'CommunicationException', 'CompositeName', 'CompoundName', 'ConfigurationException', 'ContextNotEmptyException', 'InitialContext', 'InsufficientResourcesException', 'InterruptedNamingException', 'InvalidNameException', 'LimitExceededException', 'LinkException', 'LinkLoopException', 'LinkRef', 'MalformedLinkException', 'Name', 'NameAlreadyBoundException', 'NameClassPair', 'NameNotFoundException', 'NameParser', 'NamingEnumeration', 'NamingException', 'NamingSecurityException', 'NoInitialContextException', 'NoPermissionException', 'NotContextException', 'OperationNotSupportedException', 'PartialResultException', 'RefAddr', 'Referenceable', 'ReferralException', 'ServiceUnavailableException', 'SizeLimitExceededException', 'StringRefAddr', 'TimeLimitExceededException'
+            ),
+        77 => array (
+            'AttributeInUseException', 'AttributeModificationException', 'BasicAttribute', 'BasicAttributes', 'DirContext', 'InitialDirContext', 'InvalidAttributeIdentifierException', 'InvalidAttributesException', 'InvalidSearchControlsException', 'InvalidSearchFilterException', 'ModificationItem', 'NoSuchAttributeException', 'SchemaViolationException', 'SearchControls', 'SearchResult'
+            ),
+        78 => array (
+            'EventContext', 'EventDirContext', 'NamespaceChangeListener', 'NamingEvent', 'NamingExceptionEvent', 'NamingListener', 'ObjectChangeListener'
+            ),
+        79 => array (
+            'BasicControl', 'ControlFactory', 'ExtendedRequest', 'ExtendedResponse', 'HasControls', 'InitialLdapContext', 'LdapContext', 'LdapName', 'LdapReferralException', 'ManageReferralControl', 'PagedResultsControl', 'PagedResultsResponseControl', 'Rdn', 'SortControl', 'SortKey', 'SortResponseControl', 'StartTlsRequest', 'StartTlsResponse', 'UnsolicitedNotification', 'UnsolicitedNotificationEvent', 'UnsolicitedNotificationListener'
+            ),
+        80 => array (
+            'DirObjectFactory', 'DirStateFactory', 'DirStateFactory.Result', 'DirectoryManager', 'InitialContextFactory', 'InitialContextFactoryBuilder', 'NamingManager', 'ObjectFactory', 'ObjectFactoryBuilder', 'ResolveResult', 'Resolver', 'StateFactory'
+            ),
+        81 => array (
+            'ServerSocketFactory', 'SocketFactory'
+            ),
+        82 => array (
+            'CertPathTrustManagerParameters', 'HandshakeCompletedEvent', 'HandshakeCompletedListener', 'HostnameVerifier', 'HttpsURLConnection', 'KeyManager', 'KeyManagerFactory', 'KeyManagerFactorySpi', 'KeyStoreBuilderParameters', 'ManagerFactoryParameters', 'SSLContext', 'SSLContextSpi', 'SSLEngine', 'SSLEngineResult', 'SSLEngineResult.HandshakeStatus', 'SSLEngineResult.Status', 'SSLException', 'SSLHandshakeException', 'SSLKeyException', 'SSLPeerUnverifiedException', 'SSLPermission', 'SSLProtocolException', 'SSLServerSocket', 'SSLServerSocketFactory', 'SSLSession', 'SSLSessionBindingEvent', 'SSLSessionBindingListener', 'SSLSessionContext', 'SSLSocket', 'SSLSocketFactory', 'TrustManager', 'TrustManagerFactory', 'TrustManagerFactorySpi', 'X509ExtendedKeyManager', 'X509KeyManager', 'X509TrustManager'
+            ),
+        83 => array (
+            'AttributeException', 'CancelablePrintJob', 'Doc', 'DocFlavor', 'DocFlavor.BYTE_ARRAY', 'DocFlavor.CHAR_ARRAY', 'DocFlavor.INPUT_STREAM', 'DocFlavor.READER', 'DocFlavor.SERVICE_FORMATTED', 'DocFlavor.STRING', 'DocFlavor.URL', 'DocPrintJob', 'FlavorException', 'MultiDoc', 'MultiDocPrintJob', 'MultiDocPrintService', 'PrintException', 'PrintService', 'PrintServiceLookup', 'ServiceUI', 'ServiceUIFactory', 'SimpleDoc', 'StreamPrintService', 'StreamPrintServiceFactory', 'URIException'
+            ),
+        84 => array (
+            'AttributeSetUtilities', 'DateTimeSyntax', 'DocAttribute', 'DocAttributeSet', 'EnumSyntax', 'HashAttributeSet', 'HashDocAttributeSet', 'HashPrintJobAttributeSet', 'HashPrintRequestAttributeSet', 'HashPrintServiceAttributeSet', 'IntegerSyntax', 'PrintJobAttribute', 'PrintJobAttributeSet', 'PrintRequestAttribute', 'PrintRequestAttributeSet', 'PrintServiceAttribute', 'PrintServiceAttributeSet', 'ResolutionSyntax', 'SetOfIntegerSyntax', 'Size2DSyntax', 'SupportedValuesAttribute', 'TextSyntax', 'URISyntax', 'UnmodifiableSetException'
+            ),
+        85 => array (
+            'Chromaticity', 'ColorSupported', 'Compression', 'Copies', 'CopiesSupported', 'DateTimeAtCompleted', 'DateTimeAtCreation', 'DateTimeAtProcessing', 'Destination', 'DocumentName', 'Fidelity', 'Finishings', 'JobHoldUntil', 'JobImpressions', 'JobImpressionsCompleted', 'JobImpressionsSupported', 'JobKOctets', 'JobKOctetsProcessed', 'JobKOctetsSupported', 'JobMediaSheets', 'JobMediaSheetsCompleted', 'JobMediaSheetsSupported', 'JobMessageFromOperator', 'JobName', 'JobOriginatingUserName', 'JobPriority', 'JobPrioritySupported', 'JobSheets', 'JobState', 'JobStateReason', 'JobStateReasons', 'Media', 'MediaName', 'MediaPrintableArea', 'MediaSize', 'MediaSize.Engineering', 'MediaSize.ISO', 'MediaSize.JIS', 'MediaSize.NA', 'MediaSize.Other', 'MediaSizeName', 'MediaTray', 'MultipleDocumentHandling', 'NumberOfDocuments', 'NumberOfInterveningJobs', 'NumberUp', 'NumberUpSupported', 'OrientationRequested', 'OutputDeviceAssigned', 'PDLOverrideSupported', 'PageRanges', 'PagesPerMinute', 'PagesPerMinuteColor',
+            'PresentationDirection', 'PrintQuality', 'PrinterInfo', 'PrinterIsAcceptingJobs', 'PrinterLocation', 'PrinterMakeAndModel', 'PrinterMessageFromOperator', 'PrinterMoreInfo', 'PrinterMoreInfoManufacturer', 'PrinterName', 'PrinterResolution', 'PrinterState', 'PrinterStateReason', 'PrinterStateReasons', 'PrinterURI', 'QueuedJobCount', 'ReferenceUriSchemesSupported', 'RequestingUserName', 'Severity', 'SheetCollate', 'Sides'
+            ),
+        86 => array (
+            'PrintEvent', 'PrintJobAdapter', 'PrintJobAttributeEvent', 'PrintJobAttributeListener', 'PrintJobEvent', 'PrintJobListener', 'PrintServiceAttributeEvent', 'PrintServiceAttributeListener'
+            ),
+        87 => array (
+            'PortableRemoteObject'
+            ),
+        88 => array (
+            'ClassDesc', 'PortableRemoteObjectDelegate', 'Stub', 'StubDelegate', 'Tie', 'Util', 'UtilDelegate', 'ValueHandler', 'ValueHandlerMultiFormat'
+            ),
+        89 => array (
+            'SslRMIClientSocketFactory', 'SslRMIServerSocketFactory'
+            ),
+        90 => array (
+            'AuthPermission', 'DestroyFailedException', 'Destroyable', 'PrivateCredentialPermission', 'RefreshFailedException', 'Refreshable', 'Subject', 'SubjectDomainCombiner'
+            ),
+        91 => array (
+            'Callback', 'CallbackHandler', 'ChoiceCallback', 'ConfirmationCallback', 'LanguageCallback', 'NameCallback', 'PasswordCallback', 'TextInputCallback', 'TextOutputCallback', 'UnsupportedCallbackException'
+            ),
+        92 => array (
+            'DelegationPermission', 'KerberosKey', 'KerberosPrincipal', 'KerberosTicket', 'ServicePermission'
+            ),
+        93 => array (
+            'AccountException', 'AccountExpiredException', 'AccountLockedException', 'AccountNotFoundException', 'AppConfigurationEntry', 'AppConfigurationEntry.LoginModuleControlFlag', 'Configuration', 'CredentialException', 'CredentialExpiredException', 'CredentialNotFoundException', 'FailedLoginException', 'LoginContext', 'LoginException'
+            ),
+        94 => array (
+            'LoginModule'
+            ),
+        95 => array (
+            'X500Principal', 'X500PrivateCredential'
+            ),
+        96 => array (
+            'AuthorizeCallback', 'RealmCallback', 'RealmChoiceCallback', 'Sasl', 'SaslClient', 'SaslClientFactory', 'SaslException', 'SaslServer', 'SaslServerFactory'
+            ),
+        97 => array (
+            'ControllerEventListener', 'Instrument', 'InvalidMidiDataException', 'MetaEventListener', 'MetaMessage', 'MidiChannel', 'MidiDevice', 'MidiDevice.Info', 'MidiEvent', 'MidiFileFormat', 'MidiMessage', 'MidiSystem', 'MidiUnavailableException', 'Patch', 'Receiver', 'Sequence', 'Sequencer', 'Sequencer.SyncMode', 'ShortMessage', 'Soundbank', 'SoundbankResource', 'Synthesizer', 'SysexMessage', 'Track', 'Transmitter', 'VoiceStatus'
+            ),
+        98 => array (
+            'MidiDeviceProvider', 'MidiFileReader', 'MidiFileWriter', 'SoundbankReader'
+            ),
+        99 => array (
+            'AudioFileFormat', 'AudioFileFormat.Type', 'AudioFormat', 'AudioFormat.Encoding', 'AudioInputStream', 'AudioPermission', 'AudioSystem', 'BooleanControl', 'BooleanControl.Type', 'Clip', 'CompoundControl', 'CompoundControl.Type', 'Control.Type', 'DataLine', 'DataLine.Info', 'EnumControl', 'EnumControl.Type', 'FloatControl', 'FloatControl.Type', 'Line', 'Line.Info', 'LineEvent', 'LineEvent.Type', 'LineListener', 'LineUnavailableException', 'Mixer', 'Mixer.Info', 'Port', 'Port.Info', 'ReverbType', 'SourceDataLine', 'TargetDataLine', 'UnsupportedAudioFileException'
+            ),
+        100 => array (
+            'AudioFileReader', 'AudioFileWriter', 'FormatConversionProvider', 'MixerProvider'
+            ),
+        101 => array (
+            'ConnectionEvent', 'ConnectionEventListener', 'ConnectionPoolDataSource', 'DataSource', 'PooledConnection', 'RowSet', 'RowSetEvent', 'RowSetInternal', 'RowSetListener', 'RowSetMetaData', 'RowSetReader', 'RowSetWriter', 'XAConnection', 'XADataSource'
+            ),
+        102 => array (
+            'BaseRowSet', 'CachedRowSet', 'FilteredRowSet', 'JdbcRowSet', 'JoinRowSet', 'Joinable', 'Predicate', 'RowSetMetaDataImpl', 'RowSetWarning', 'WebRowSet'
+            ),
+        103 => array (
+            'SQLInputImpl', 'SQLOutputImpl', 'SerialArray', 'SerialBlob', 'SerialClob', 'SerialDatalink', 'SerialException', 'SerialJavaObject', 'SerialRef', 'SerialStruct'
+            ),
+        104 => array (
+            'SyncFactory', 'SyncFactoryException', 'SyncProvider', 'SyncProviderException', 'SyncResolver', 'TransactionalWriter', 'XmlReader', 'XmlWriter'
+            ),
+        105 => array (
+            'AbstractAction', 'AbstractButton', 'AbstractCellEditor', 'AbstractListModel', 'AbstractSpinnerModel', 'Action', 'ActionMap', 'BorderFactory', 'BoundedRangeModel', 'Box', 'Box.Filler', 'BoxLayout', 'ButtonGroup', 'ButtonModel', 'CellEditor', 'CellRendererPane', 'ComboBoxEditor', 'ComboBoxModel', 'ComponentInputMap', 'DebugGraphics', 'DefaultBoundedRangeModel', 'DefaultButtonModel', 'DefaultCellEditor', 'DefaultComboBoxModel', 'DefaultDesktopManager', 'DefaultFocusManager', 'DefaultListCellRenderer', 'DefaultListCellRenderer.UIResource', 'DefaultListModel', 'DefaultListSelectionModel', 'DefaultSingleSelectionModel', 'DesktopManager', 'FocusManager', 'GrayFilter', 'Icon', 'ImageIcon', 'InputMap', 'InputVerifier', 'InternalFrameFocusTraversalPolicy', 'JApplet', 'JButton', 'JCheckBox', 'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox', 'JComboBox.KeySelectionManager', 'JComponent', 'JDesktopPane', 'JDialog', 'JEditorPane', 'JFileChooser', 'JFormattedTextField', 'JFormattedTextField.AbstractFormatter',
+            'JFormattedTextField.AbstractFormatterFactory', 'JFrame', 'JInternalFrame', 'JInternalFrame.JDesktopIcon', 'JLabel', 'JLayeredPane', 'JList', 'JMenu', 'JMenuBar', 'JMenuItem', 'JOptionPane', 'JPanel', 'JPasswordField', 'JPopupMenu', 'JPopupMenu.Separator', 'JProgressBar', 'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane', 'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider', 'JSpinner', 'JSpinner.DateEditor', 'JSpinner.DefaultEditor', 'JSpinner.ListEditor', 'JSpinner.NumberEditor', 'JSplitPane', 'JTabbedPane', 'JTable', 'JTable.PrintMode', 'JTextArea', 'JTextField', 'JTextPane', 'JToggleButton', 'JToggleButton.ToggleButtonModel', 'JToolBar', 'JToolBar.Separator', 'JToolTip', 'JTree', 'JTree.DynamicUtilTreeNode', 'JTree.EmptySelectionModel', 'JViewport', 'JWindow', 'KeyStroke', 'LayoutFocusTraversalPolicy', 'ListCellRenderer', 'ListModel', 'ListSelectionModel', 'LookAndFeel', 'MenuElement', 'MenuSelectionManager', 'MutableComboBoxModel', 'OverlayLayout', 'Popup', 'PopupFactory', 'ProgressMonitor',
+            'ProgressMonitorInputStream', 'Renderer', 'RepaintManager', 'RootPaneContainer', 'ScrollPaneConstants', 'ScrollPaneLayout', 'ScrollPaneLayout.UIResource', 'Scrollable', 'SingleSelectionModel', 'SizeRequirements', 'SizeSequence', 'SortingFocusTraversalPolicy', 'SpinnerDateModel', 'SpinnerListModel', 'SpinnerModel', 'SpinnerNumberModel', 'Spring', 'SpringLayout', 'SpringLayout.Constraints', 'SwingConstants', 'SwingUtilities', 'ToolTipManager', 'TransferHandler', 'UIDefaults', 'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap', 'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue', 'UIManager', 'UIManager.LookAndFeelInfo', 'UnsupportedLookAndFeelException', 'ViewportLayout', 'WindowConstants'
+            ),
+        106 => array (
+            'AbstractBorder', 'BevelBorder', 'Border', 'CompoundBorder', 'EmptyBorder', 'EtchedBorder', 'LineBorder', 'MatteBorder', 'SoftBevelBorder', 'TitledBorder'
+            ),
+        107 => array (
+            'AbstractColorChooserPanel', 'ColorChooserComponentFactory', 'ColorSelectionModel', 'DefaultColorSelectionModel'
+            ),
+        108 => array (
+            'AncestorEvent', 'AncestorListener', 'CaretEvent', 'CaretListener', 'CellEditorListener', 'ChangeEvent', 'ChangeListener', 'DocumentEvent.ElementChange', 'DocumentEvent.EventType', 'DocumentListener', 'EventListenerList', 'HyperlinkEvent', 'HyperlinkEvent.EventType', 'HyperlinkListener', 'InternalFrameAdapter', 'InternalFrameEvent', 'InternalFrameListener', 'ListDataEvent', 'ListDataListener', 'ListSelectionEvent', 'ListSelectionListener', 'MenuDragMouseEvent', 'MenuDragMouseListener', 'MenuEvent', 'MenuKeyEvent', 'MenuKeyListener', 'MenuListener', 'MouseInputAdapter', 'MouseInputListener', 'PopupMenuEvent', 'PopupMenuListener', 'SwingPropertyChangeSupport', 'TableColumnModelEvent', 'TableColumnModelListener', 'TableModelEvent', 'TableModelListener', 'TreeExpansionEvent', 'TreeExpansionListener', 'TreeModelEvent', 'TreeModelListener', 'TreeSelectionEvent', 'TreeSelectionListener', 'TreeWillExpandListener', 'UndoableEditEvent', 'UndoableEditListener'
+            ),
+        109 => array (
+            'FileSystemView', 'FileView'
+            ),
+        110 => array (
+            'ActionMapUIResource', 'BorderUIResource', 'BorderUIResource.BevelBorderUIResource', 'BorderUIResource.CompoundBorderUIResource', 'BorderUIResource.EmptyBorderUIResource', 'BorderUIResource.EtchedBorderUIResource', 'BorderUIResource.LineBorderUIResource', 'BorderUIResource.MatteBorderUIResource', 'BorderUIResource.TitledBorderUIResource', 'ButtonUI', 'ColorChooserUI', 'ColorUIResource', 'ComboBoxUI', 'ComponentInputMapUIResource', 'ComponentUI', 'DesktopIconUI', 'DesktopPaneUI', 'DimensionUIResource', 'FileChooserUI', 'FontUIResource', 'IconUIResource', 'InputMapUIResource', 'InsetsUIResource', 'InternalFrameUI', 'LabelUI', 'ListUI', 'MenuBarUI', 'MenuItemUI', 'OptionPaneUI', 'PanelUI', 'PopupMenuUI', 'ProgressBarUI', 'RootPaneUI', 'ScrollBarUI', 'ScrollPaneUI', 'SeparatorUI', 'SliderUI', 'SpinnerUI', 'SplitPaneUI', 'TabbedPaneUI', 'TableHeaderUI', 'TableUI', 'TextUI', 'ToolBarUI', 'ToolTipUI', 'TreeUI', 'UIResource', 'ViewportUI'
+            ),
+        111 => array (
+            'BasicArrowButton', 'BasicBorders', 'BasicBorders.ButtonBorder', 'BasicBorders.FieldBorder', 'BasicBorders.MarginBorder', 'BasicBorders.MenuBarBorder', 'BasicBorders.RadioButtonBorder', 'BasicBorders.RolloverButtonBorder', 'BasicBorders.SplitPaneBorder', 'BasicBorders.ToggleButtonBorder', 'BasicButtonListener', 'BasicButtonUI', 'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI', 'BasicColorChooserUI', 'BasicComboBoxEditor', 'BasicComboBoxEditor.UIResource', 'BasicComboBoxRenderer', 'BasicComboBoxRenderer.UIResource', 'BasicComboBoxUI', 'BasicComboPopup', 'BasicDesktopIconUI', 'BasicDesktopPaneUI', 'BasicDirectoryModel', 'BasicEditorPaneUI', 'BasicFileChooserUI', 'BasicFormattedTextFieldUI', 'BasicGraphicsUtils', 'BasicHTML', 'BasicIconFactory', 'BasicInternalFrameTitlePane', 'BasicInternalFrameUI', 'BasicLabelUI', 'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI', 'BasicMenuItemUI', 'BasicMenuUI', 'BasicOptionPaneUI', 'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI', 'BasicPasswordFieldUI',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI', 'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI', 'BasicRadioButtonUI', 'BasicRootPaneUI', 'BasicScrollBarUI', 'BasicScrollPaneUI', 'BasicSeparatorUI', 'BasicSliderUI', 'BasicSpinnerUI', 'BasicSplitPaneDivider', 'BasicSplitPaneUI', 'BasicTabbedPaneUI', 'BasicTableHeaderUI', 'BasicTableUI', 'BasicTextAreaUI', 'BasicTextFieldUI', 'BasicTextPaneUI', 'BasicTextUI', 'BasicTextUI.BasicCaret', 'BasicTextUI.BasicHighlighter', 'BasicToggleButtonUI', 'BasicToolBarSeparatorUI', 'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI', 'BasicViewportUI', 'ComboPopup', 'DefaultMenuLayout'
+            ),
+        112 => array (
+            'DefaultMetalTheme', 'MetalBorders', 'MetalBorders.ButtonBorder', 'MetalBorders.Flush3DBorder', 'MetalBorders.InternalFrameBorder', 'MetalBorders.MenuBarBorder', 'MetalBorders.MenuItemBorder', 'MetalBorders.OptionDialogBorder', 'MetalBorders.PaletteBorder', 'MetalBorders.PopupMenuBorder', 'MetalBorders.RolloverButtonBorder', 'MetalBorders.ScrollPaneBorder', 'MetalBorders.TableHeaderBorder', 'MetalBorders.TextFieldBorder', 'MetalBorders.ToggleButtonBorder', 'MetalBorders.ToolBarBorder', 'MetalButtonUI', 'MetalCheckBoxIcon', 'MetalCheckBoxUI', 'MetalComboBoxButton', 'MetalComboBoxEditor', 'MetalComboBoxEditor.UIResource', 'MetalComboBoxIcon', 'MetalComboBoxUI', 'MetalDesktopIconUI', 'MetalFileChooserUI', 'MetalIconFactory', 'MetalIconFactory.FileIcon16', 'MetalIconFactory.FolderIcon16', 'MetalIconFactory.PaletteCloseIcon', 'MetalIconFactory.TreeControlIcon', 'MetalIconFactory.TreeFolderIcon', 'MetalIconFactory.TreeLeafIcon', 'MetalInternalFrameTitlePane', 'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalMenuBarUI', 'MetalPopupMenuSeparatorUI', 'MetalProgressBarUI', 'MetalRadioButtonUI', 'MetalRootPaneUI', 'MetalScrollBarUI', 'MetalScrollButton', 'MetalScrollPaneUI', 'MetalSeparatorUI', 'MetalSliderUI', 'MetalSplitPaneUI', 'MetalTabbedPaneUI', 'MetalTextFieldUI', 'MetalTheme', 'MetalToggleButtonUI', 'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI', 'OceanTheme'
+            ),
+        113 => array (
+            'MultiButtonUI', 'MultiColorChooserUI', 'MultiComboBoxUI', 'MultiDesktopIconUI', 'MultiDesktopPaneUI', 'MultiFileChooserUI', 'MultiInternalFrameUI', 'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel', 'MultiMenuBarUI', 'MultiMenuItemUI', 'MultiOptionPaneUI', 'MultiPanelUI', 'MultiPopupMenuUI', 'MultiProgressBarUI', 'MultiRootPaneUI', 'MultiScrollBarUI', 'MultiScrollPaneUI', 'MultiSeparatorUI', 'MultiSliderUI', 'MultiSpinnerUI', 'MultiSplitPaneUI', 'MultiTabbedPaneUI', 'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI', 'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI', 'MultiViewportUI'
+            ),
+        114 => array (
+            'ColorType', 'Region', 'SynthConstants', 'SynthContext', 'SynthGraphicsUtils', 'SynthLookAndFeel', 'SynthPainter', 'SynthStyle', 'SynthStyleFactory'
+            ),
+        115 => array (
+            'AbstractTableModel', 'DefaultTableCellRenderer', 'DefaultTableCellRenderer.UIResource', 'DefaultTableColumnModel', 'DefaultTableModel', 'JTableHeader', 'TableCellEditor', 'TableCellRenderer', 'TableColumn', 'TableColumnModel', 'TableModel'
+            ),
+        116 => array (
+            'AbstractDocument', 'AbstractDocument.AttributeContext', 'AbstractDocument.Content', 'AbstractDocument.ElementEdit', 'AbstractWriter', 'AsyncBoxView', 'AttributeSet.CharacterAttribute', 'AttributeSet.ColorAttribute', 'AttributeSet.FontAttribute', 'AttributeSet.ParagraphAttribute', 'BadLocationException', 'BoxView', 'Caret', 'ChangedCharSetException', 'ComponentView', 'CompositeView', 'DateFormatter', 'DefaultCaret', 'DefaultEditorKit', 'DefaultEditorKit.BeepAction', 'DefaultEditorKit.CopyAction', 'DefaultEditorKit.CutAction', 'DefaultEditorKit.DefaultKeyTypedAction', 'DefaultEditorKit.InsertBreakAction', 'DefaultEditorKit.InsertContentAction', 'DefaultEditorKit.InsertTabAction', 'DefaultEditorKit.PasteAction', 'DefaultFormatter', 'DefaultFormatterFactory', 'DefaultHighlighter', 'DefaultHighlighter.DefaultHighlightPainter', 'DefaultStyledDocument', 'DefaultStyledDocument.AttributeUndoableEdit', 'DefaultStyledDocument.ElementSpec', 'DefaultTextUI', 'DocumentFilter', 'DocumentFilter.FilterBypass',
+            'EditorKit', 'ElementIterator', 'FieldView', 'FlowView', 'FlowView.FlowStrategy', 'GapContent', 'GlyphView', 'GlyphView.GlyphPainter', 'Highlighter', 'Highlighter.Highlight', 'Highlighter.HighlightPainter', 'IconView', 'InternationalFormatter', 'JTextComponent', 'JTextComponent.KeyBinding', 'Keymap', 'LabelView', 'LayeredHighlighter', 'LayeredHighlighter.LayerPainter', 'LayoutQueue', 'MaskFormatter', 'MutableAttributeSet', 'NavigationFilter', 'NavigationFilter.FilterBypass', 'NumberFormatter', 'PasswordView', 'PlainDocument', 'PlainView', 'Position', 'Position.Bias', 'Segment', 'SimpleAttributeSet', 'StringContent', 'Style', 'StyleConstants', 'StyleConstants.CharacterConstants', 'StyleConstants.ColorConstants', 'StyleConstants.FontConstants', 'StyleConstants.ParagraphConstants', 'StyleContext', 'StyledDocument', 'StyledEditorKit', 'StyledEditorKit.AlignmentAction', 'StyledEditorKit.BoldAction', 'StyledEditorKit.FontFamilyAction', 'StyledEditorKit.FontSizeAction', 'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction', 'StyledEditorKit.StyledTextAction', 'StyledEditorKit.UnderlineAction', 'TabExpander', 'TabSet', 'TabStop', 'TabableView', 'TableView', 'TextAction', 'Utilities', 'View', 'ViewFactory', 'WrappedPlainView', 'ZoneView'
+            ),
+        117 => array (
+            'BlockView', 'CSS', 'CSS.Attribute', 'FormSubmitEvent', 'FormSubmitEvent.MethodType', 'FormView', 'HTML', 'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag', 'HTMLDocument', 'HTMLDocument.Iterator', 'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory', 'HTMLEditorKit.HTMLTextAction', 'HTMLEditorKit.InsertHTMLTextAction', 'HTMLEditorKit.LinkController', 'HTMLEditorKit.Parser', 'HTMLEditorKit.ParserCallback', 'HTMLFrameHyperlinkEvent', 'HTMLWriter', 'ImageView', 'InlineView', 'ListView', 'MinimalHTMLWriter', 'ObjectView', 'Option', 'StyleSheet', 'StyleSheet.BoxPainter', 'StyleSheet.ListPainter'
+            ),
+        118 => array (
+            'ContentModel', 'DTD', 'DTDConstants', 'DocumentParser', 'ParserDelegator', 'TagElement'
+            ),
+        119 => array (
+            'RTFEditorKit'
+            ),
+        120 => array (
+            'AbstractLayoutCache', 'AbstractLayoutCache.NodeDimensions', 'DefaultMutableTreeNode', 'DefaultTreeCellEditor', 'DefaultTreeCellRenderer', 'DefaultTreeModel', 'DefaultTreeSelectionModel', 'ExpandVetoException', 'FixedHeightLayoutCache', 'MutableTreeNode', 'RowMapper', 'TreeCellEditor', 'TreeCellRenderer', 'TreeModel', 'TreeNode', 'TreePath', 'TreeSelectionModel', 'VariableHeightLayoutCache'
+            ),
+        121 => array (
+            'AbstractUndoableEdit', 'CannotRedoException', 'CannotUndoException', 'CompoundEdit', 'StateEdit', 'StateEditable', 'UndoManager', 'UndoableEdit', 'UndoableEditSupport'
+            ),
+        122 => array (
+            'InvalidTransactionException', 'TransactionRequiredException', 'TransactionRolledbackException'
+            ),
+        123 => array (
+            'XAException', 'XAResource', 'Xid'
+            ),
+        124 => array (
+            'XMLConstants'
+            ),
+        125 => array (
+            'DatatypeConfigurationException', 'DatatypeConstants', 'DatatypeConstants.Field', 'DatatypeFactory', 'Duration', 'XMLGregorianCalendar'
+            ),
+        126 => array (
+            'NamespaceContext', 'QName'
+            ),
+        127 => array (
+            'DocumentBuilder', 'DocumentBuilderFactory', 'FactoryConfigurationError', 'ParserConfigurationException', 'SAXParser', 'SAXParserFactory'
+            ),
+        128 => array (
+            'ErrorListener', 'OutputKeys', 'Result', 'Source', 'SourceLocator', 'Templates', 'Transformer', 'TransformerConfigurationException', 'TransformerException', 'TransformerFactory', 'TransformerFactoryConfigurationError', 'URIResolver'
+            ),
+        129 => array (
+            'DOMResult', 'DOMSource'
+            ),
+        130 => array (
+            'SAXResult', 'SAXSource', 'SAXTransformerFactory', 'TemplatesHandler', 'TransformerHandler'
+            ),
+        131 => array (
+            'StreamResult', 'StreamSource'
+            ),
+        132 => array (
+            'Schema', 'SchemaFactory', 'SchemaFactoryLoader', 'TypeInfoProvider', 'Validator', 'ValidatorHandler'
+            ),
+        133 => array (
+            'XPath', 'XPathConstants', 'XPathException', 'XPathExpression', 'XPathExpressionException', 'XPathFactory', 'XPathFactoryConfigurationException', 'XPathFunction', 'XPathFunctionException', 'XPathFunctionResolver', 'XPathVariableResolver'
+            ),
+        134 => array (
+            'ChannelBinding', 'GSSContext', 'GSSCredential', 'GSSException', 'GSSManager', 'GSSName', 'MessageProp', 'Oid'
+            ),
+        135 => array (
+            'ACTIVITY_COMPLETED', 'ACTIVITY_REQUIRED', 'ARG_IN', 'ARG_INOUT', 'ARG_OUT', 'Any', 'AnyHolder', 'AnySeqHolder', 'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION', 'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE', 'BAD_POLICY_VALUE', 'BAD_QOS', 'BAD_TYPECODE', 'BooleanHolder', 'BooleanSeqHelper', 'BooleanSeqHolder', 'ByteHolder', 'CODESET_INCOMPATIBLE', 'COMM_FAILURE', 'CTX_RESTRICT_SCOPE', 'CharHolder', 'CharSeqHelper', 'CharSeqHolder', 'CompletionStatus', 'CompletionStatusHelper', 'ContextList', 'CurrentHolder', 'CustomMarshal', 'DATA_CONVERSION', 'DefinitionKind', 'DefinitionKindHelper', 'DomainManager', 'DomainManagerOperations', 'DoubleHolder', 'DoubleSeqHelper', 'DoubleSeqHolder', 'Environment', 'ExceptionList', 'FREE_MEM', 'FixedHolder', 'FloatHolder', 'FloatSeqHelper', 'FloatSeqHolder', 'IDLType', 'IDLTypeHelper', 'IDLTypeOperations', 'IMP_LIMIT', 'INITIALIZE', 'INTERNAL', 'INTF_REPOS', 'INVALID_ACTIVITY', 'INVALID_TRANSACTION', 'INV_FLAG', 'INV_IDENT', 'INV_OBJREF', 'INV_POLICY', 'IRObject',
+            'IRObjectOperations', 'IdentifierHelper', 'IntHolder', 'LocalObject', 'LongHolder', 'LongLongSeqHelper', 'LongLongSeqHolder', 'LongSeqHelper', 'LongSeqHolder', 'MARSHAL', 'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION', 'NO_RESOURCES', 'NO_RESPONSE', 'NVList', 'NamedValue', 'OBJECT_NOT_EXIST', 'OBJ_ADAPTER', 'OMGVMCID', 'ObjectHelper', 'ObjectHolder', 'OctetSeqHelper', 'OctetSeqHolder', 'PERSIST_STORE', 'PRIVATE_MEMBER', 'PUBLIC_MEMBER', 'ParameterMode', 'ParameterModeHelper', 'ParameterModeHolder', 'PolicyError', 'PolicyErrorCodeHelper', 'PolicyErrorHelper', 'PolicyErrorHolder', 'PolicyHelper', 'PolicyHolder', 'PolicyListHelper', 'PolicyListHolder', 'PolicyOperations', 'PolicyTypeHelper', 'PrincipalHolder', 'REBIND', 'RepositoryIdHelper', 'Request', 'ServerRequest', 'ServiceDetail', 'ServiceDetailHelper', 'ServiceInformation', 'ServiceInformationHelper', 'ServiceInformationHolder', 'SetOverrideType', 'SetOverrideTypeHelper', 'ShortHolder', 'ShortSeqHelper', 'ShortSeqHolder', 'StringHolder',
+            'StringSeqHelper', 'StringSeqHolder', 'StringValueHelper', 'StructMember', 'StructMemberHelper', 'SystemException', 'TCKind', 'TIMEOUT', 'TRANSACTION_MODE', 'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK', 'TRANSACTION_UNAVAILABLE', 'TRANSIENT', 'TypeCode', 'TypeCodeHolder', 'ULongLongSeqHelper', 'ULongLongSeqHolder', 'ULongSeqHelper', 'ULongSeqHolder', 'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE', 'UShortSeqHelper', 'UShortSeqHolder', 'UnionMember', 'UnionMemberHelper', 'UnknownUserException', 'UnknownUserExceptionHelper', 'UnknownUserExceptionHolder', 'UserException', 'VM_ABSTRACT', 'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE', 'ValueBaseHelper', 'ValueBaseHolder', 'ValueMember', 'ValueMemberHelper', 'VersionSpecHelper', 'VisibilityHelper', 'WCharSeqHelper', 'WCharSeqHolder', 'WStringSeqHelper', 'WStringSeqHolder', 'WStringValueHelper', 'WrongTransaction', 'WrongTransactionHelper', 'WrongTransactionHolder', '_IDLTypeStub', '_PolicyStub'
+            ),
+        136 => array (
+            'Invalid', 'InvalidSeq'
+            ),
+        137 => array (
+            'BadKind'
+            ),
+        138 => array (
+            'ApplicationException', 'BoxedValueHelper', 'CustomValue', 'IDLEntity', 'IndirectionException', 'InvokeHandler', 'RemarshalException', 'ResponseHandler', 'ServantObject', 'Streamable', 'StreamableValue', 'UnknownException', 'ValueBase', 'ValueFactory', 'ValueInputStream', 'ValueOutputStream'
+            ),
+        139 => array (
+            'BindingHelper', 'BindingHolder', 'BindingIterator', 'BindingIteratorHelper', 'BindingIteratorHolder', 'BindingIteratorOperations', 'BindingIteratorPOA', 'BindingListHelper', 'BindingListHolder', 'BindingType', 'BindingTypeHelper', 'BindingTypeHolder', 'IstringHelper', 'NameComponent', 'NameComponentHelper', 'NameComponentHolder', 'NameHelper', 'NameHolder', 'NamingContext', 'NamingContextExt', 'NamingContextExtHelper', 'NamingContextExtHolder', 'NamingContextExtOperations', 'NamingContextExtPOA', 'NamingContextHelper', 'NamingContextHolder', 'NamingContextOperations', 'NamingContextPOA', '_BindingIteratorImplBase', '_BindingIteratorStub', '_NamingContextExtStub', '_NamingContextImplBase', '_NamingContextStub'
+            ),
+        140 => array (
+            'AddressHelper', 'InvalidAddress', 'InvalidAddressHelper', 'InvalidAddressHolder', 'StringNameHelper', 'URLStringHelper'
+            ),
+        141 => array (
+            'AlreadyBound', 'AlreadyBoundHelper', 'AlreadyBoundHolder', 'CannotProceed', 'CannotProceedHelper', 'CannotProceedHolder', 'InvalidNameHolder', 'NotEmpty', 'NotEmptyHelper', 'NotEmptyHolder', 'NotFound', 'NotFoundHelper', 'NotFoundHolder', 'NotFoundReason', 'NotFoundReasonHelper', 'NotFoundReasonHolder'
+            ),
+        142 => array (
+            'Parameter'
+            ),
+        143 => array (
+            'DynAnyFactory', 'DynAnyFactoryHelper', 'DynAnyFactoryOperations', 'DynAnyHelper', 'DynAnyOperations', 'DynAnySeqHelper', 'DynArrayHelper', 'DynArrayOperations', 'DynEnumHelper', 'DynEnumOperations', 'DynFixedHelper', 'DynFixedOperations', 'DynSequenceHelper', 'DynSequenceOperations', 'DynStructHelper', 'DynStructOperations', 'DynUnionHelper', 'DynUnionOperations', 'DynValueBox', 'DynValueBoxOperations', 'DynValueCommon', 'DynValueCommonOperations', 'DynValueHelper', 'DynValueOperations', 'NameDynAnyPair', 'NameDynAnyPairHelper', 'NameDynAnyPairSeqHelper', 'NameValuePairSeqHelper', '_DynAnyFactoryStub', '_DynAnyStub', '_DynArrayStub', '_DynEnumStub', '_DynFixedStub', '_DynSequenceStub', '_DynStructStub', '_DynUnionStub', '_DynValueStub'
+            ),
+        144 => array (
+            'InconsistentTypeCodeHelper'
+            ),
+        145 => array (
+            'InvalidValueHelper'
+            ),
+        146 => array (
+            'CodeSets', 'Codec', 'CodecFactory', 'CodecFactoryHelper', 'CodecFactoryOperations', 'CodecOperations', 'ComponentIdHelper', 'ENCODING_CDR_ENCAPS', 'Encoding', 'ExceptionDetailMessage', 'IOR', 'IORHelper', 'IORHolder', 'MultipleComponentProfileHelper', 'MultipleComponentProfileHolder', 'ProfileIdHelper', 'RMICustomMaxStreamFormat', 'ServiceContext', 'ServiceContextHelper', 'ServiceContextHolder', 'ServiceContextListHelper', 'ServiceContextListHolder', 'ServiceIdHelper', 'TAG_ALTERNATE_IIOP_ADDRESS', 'TAG_CODE_SETS', 'TAG_INTERNET_IOP', 'TAG_JAVA_CODEBASE', 'TAG_MULTIPLE_COMPONENTS', 'TAG_ORB_TYPE', 'TAG_POLICIES', 'TAG_RMI_CUSTOM_MAX_STREAM_FORMAT', 'TaggedComponent', 'TaggedComponentHelper', 'TaggedComponentHolder', 'TaggedProfile', 'TaggedProfileHelper', 'TaggedProfileHolder', 'TransactionService'
+            ),
+        147 => array (
+            'UnknownEncoding', 'UnknownEncodingHelper'
+            ),
+        148 => array (
+            'FormatMismatch', 'FormatMismatchHelper', 'InvalidTypeForEncoding', 'InvalidTypeForEncodingHelper'
+            ),
+        149 => array (
+            'SYNC_WITH_TRANSPORT', 'SyncScopeHelper'
+            ),
+        150 => array (
+            'ACTIVE', 'AdapterManagerIdHelper', 'AdapterNameHelper', 'AdapterStateHelper', 'ClientRequestInfo', 'ClientRequestInfoOperations', 'ClientRequestInterceptor', 'ClientRequestInterceptorOperations', 'DISCARDING', 'HOLDING', 'INACTIVE', 'IORInfo', 'IORInfoOperations', 'IORInterceptor', 'IORInterceptorOperations', 'IORInterceptor_3_0', 'IORInterceptor_3_0Helper', 'IORInterceptor_3_0Holder', 'IORInterceptor_3_0Operations', 'Interceptor', 'InterceptorOperations', 'InvalidSlot', 'InvalidSlotHelper', 'LOCATION_FORWARD', 'NON_EXISTENT', 'ORBIdHelper', 'ORBInitInfo', 'ORBInitInfoOperations', 'ORBInitializer', 'ORBInitializerOperations', 'ObjectReferenceFactory', 'ObjectReferenceFactoryHelper', 'ObjectReferenceFactoryHolder', 'ObjectReferenceTemplate', 'ObjectReferenceTemplateHelper', 'ObjectReferenceTemplateHolder', 'ObjectReferenceTemplateSeqHelper', 'ObjectReferenceTemplateSeqHolder', 'PolicyFactory', 'PolicyFactoryOperations', 'RequestInfo', 'RequestInfoOperations', 'SUCCESSFUL', 'SYSTEM_EXCEPTION',
+            'ServerIdHelper', 'ServerRequestInfo', 'ServerRequestInfoOperations', 'ServerRequestInterceptor', 'ServerRequestInterceptorOperations', 'TRANSPORT_RETRY', 'USER_EXCEPTION'
+            ),
+        151 => array (
+            'DuplicateName', 'DuplicateNameHelper'
+            ),
+        152 => array (
+            'AdapterActivator', 'AdapterActivatorOperations', 'ID_ASSIGNMENT_POLICY_ID', 'ID_UNIQUENESS_POLICY_ID', 'IMPLICIT_ACTIVATION_POLICY_ID', 'IdAssignmentPolicy', 'IdAssignmentPolicyOperations', 'IdAssignmentPolicyValue', 'IdUniquenessPolicy', 'IdUniquenessPolicyOperations', 'IdUniquenessPolicyValue', 'ImplicitActivationPolicy', 'ImplicitActivationPolicyOperations', 'ImplicitActivationPolicyValue', 'LIFESPAN_POLICY_ID', 'LifespanPolicy', 'LifespanPolicyOperations', 'LifespanPolicyValue', 'POA', 'POAHelper', 'POAManager', 'POAManagerOperations', 'POAOperations', 'REQUEST_PROCESSING_POLICY_ID', 'RequestProcessingPolicy', 'RequestProcessingPolicyOperations', 'RequestProcessingPolicyValue', 'SERVANT_RETENTION_POLICY_ID', 'Servant', 'ServantActivator', 'ServantActivatorHelper', 'ServantActivatorOperations', 'ServantActivatorPOA', 'ServantLocator', 'ServantLocatorHelper', 'ServantLocatorOperations', 'ServantLocatorPOA', 'ServantManager', 'ServantManagerOperations', 'ServantRetentionPolicy',
+            'ServantRetentionPolicyOperations', 'ServantRetentionPolicyValue', 'THREAD_POLICY_ID', 'ThreadPolicy', 'ThreadPolicyOperations', 'ThreadPolicyValue', '_ServantActivatorStub', '_ServantLocatorStub'
+            ),
+        153 => array (
+            'NoContext', 'NoContextHelper'
+            ),
+        154 => array (
+            'AdapterInactive', 'AdapterInactiveHelper', 'State'
+            ),
+        155 => array (
+            'AdapterAlreadyExists', 'AdapterAlreadyExistsHelper', 'AdapterNonExistent', 'AdapterNonExistentHelper', 'InvalidPolicy', 'InvalidPolicyHelper', 'NoServant', 'NoServantHelper', 'ObjectAlreadyActive', 'ObjectAlreadyActiveHelper', 'ObjectNotActive', 'ObjectNotActiveHelper', 'ServantAlreadyActive', 'ServantAlreadyActiveHelper', 'ServantNotActive', 'ServantNotActiveHelper', 'WrongAdapter', 'WrongAdapterHelper', 'WrongPolicy', 'WrongPolicyHelper'
+            ),
+        156 => array (
+            'CookieHolder'
+            ),
+        157 => array (
+            'RunTime', 'RunTimeOperations'
+            ),
+        158 => array (
+            '_Remote_Stub'
+            ),
+        159 => array (
+            'Attr', 'CDATASection', 'CharacterData', 'Comment', 'DOMConfiguration', 'DOMError', 'DOMErrorHandler', 'DOMException', 'DOMImplementation', 'DOMImplementationList', 'DOMImplementationSource', 'DOMStringList', 'DocumentFragment', 'DocumentType', 'EntityReference', 'NameList', 'NamedNodeMap', 'Node', 'NodeList', 'Notation', 'ProcessingInstruction', 'Text', 'TypeInfo', 'UserDataHandler'
+            ),
+        160 => array (
+            'DOMImplementationRegistry'
+            ),
+        161 => array (
+            'EventException', 'EventTarget', 'MutationEvent', 'UIEvent'
+            ),
+        162 => array (
+            'DOMImplementationLS', 'LSException', 'LSInput', 'LSLoadEvent', 'LSOutput', 'LSParser', 'LSParserFilter', 'LSProgressEvent', 'LSResourceResolver', 'LSSerializer', 'LSSerializerFilter'
+            ),
+        163 => array (
+            'DTDHandler', 'DocumentHandler', 'EntityResolver', 'ErrorHandler', 'HandlerBase', 'InputSource', 'Locator', 'SAXException', 'SAXNotRecognizedException', 'SAXNotSupportedException', 'SAXParseException', 'XMLFilter', 'XMLReader'
+            ),
+        164 => array (
+            'Attributes2', 'Attributes2Impl', 'DeclHandler', 'DefaultHandler2', 'EntityResolver2', 'LexicalHandler', 'Locator2', 'Locator2Impl'
+            ),
+        165 => array (
+            'AttributeListImpl', 'AttributesImpl', 'DefaultHandler', 'LocatorImpl', 'NamespaceSupport', 'ParserAdapter', 'ParserFactory', 'XMLFilterImpl', 'XMLReaderAdapter', 'XMLReaderFactory'
+            ),
+        /* ambiguous class names (appear in more than one package) */
+        166 => array (
+            'Annotation', 'AnySeqHelper', 'Array', 'Attribute', 'AttributeList', 'AttributeSet', 'Attributes', 'AuthenticationException', 'Binding', 'Bounds', 'Certificate', 'CertificateEncodingException', 'CertificateException', 'CertificateExpiredException', 'CertificateNotYetValidException', 'CertificateParsingException', 'ConnectException', 'ContentHandler', 'Context', 'Control', 'Current', 'CurrentHelper', 'CurrentOperations', 'DOMLocator', 'DataInputStream', 'DataOutputStream', 'Date', 'DefaultLoaderRepository', 'Delegate', 'Document', 'DocumentEvent', 'DynAny', 'DynArray', 'DynEnum', 'DynFixed', 'DynSequence', 'DynStruct', 'DynUnion', 'DynValue', 'DynamicImplementation', 'Element', 'Entity', 'Event', 'EventListener', 'FieldNameHelper', 'FileFilter', 'Formatter', 'ForwardRequest', 'ForwardRequestHelper', 'InconsistentTypeCode', 'InputStream', 'IntrospectionException', 'InvalidAttributeValueException', 'InvalidKeyException', 'InvalidName', 'InvalidNameHelper', 'InvalidValue', 'List', 'MouseEvent',
+            'NameValuePair', 'NameValuePairHelper', 'ORB', 'Object', 'ObjectIdHelper', 'ObjectImpl', 'OpenType', 'OutputStream', 'ParagraphView', 'Parser', 'Permission', 'Policy', 'Principal', 'Proxy', 'Reference', 'Statement', 'Timer', 'Timestamp', 'TypeMismatch', 'TypeMismatchHelper', 'UNKNOWN', 'UnknownHostException', 'X509Certificate'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        /* all Java keywords are case sensitive */
+        1 => true, 2 => true, 3 => true, 4 => true,
+        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
+        10 => true, 11 => true, 12 => true, 13 => true, 14 => true,
+        15 => true, 16 => true, 17 => true, 18 => true, 19 => true,
+        20 => true, 21 => true, 22 => true, 23 => true, 24 => true,
+        25 => true, 26 => true, 27 => true, 28 => true, 29 => true,
+        30 => true, 31 => true, 32 => true, 33 => true, 34 => true,
+        35 => true, 36 => true, 37 => true, 38 => true, 39 => true,
+        40 => true, 41 => true, 42 => true, 43 => true, 44 => true,
+        45 => true, 46 => true, 47 => true, 48 => true, 49 => true,
+        50 => true, 51 => true, 52 => true, 53 => true, 54 => true,
+        55 => true, 56 => true, 57 => true, 58 => true, 59 => true,
+        60 => true, 61 => true, 62 => true, 63 => true, 64 => true,
+        65 => true, 66 => true, 67 => true, 68 => true, 69 => true,
+        70 => true, 71 => true, 72 => true, 73 => true, 74 => true,
+        75 => true, 76 => true, 77 => true, 78 => true, 79 => true,
+        80 => true, 81 => true, 82 => true, 83 => true, 84 => true,
+        85 => true, 86 => true, 87 => true, 88 => true, 89 => true,
+        90 => true, 91 => true, 92 => true, 93 => true, 94 => true,
+        95 => true, 96 => true, 97 => true, 98 => true, 99 => true,
+        100 => true, 101 => true, 102 => true, 103 => true, 104 => true,
+        105 => true, 106 => true, 107 => true, 108 => true, 109 => true,
+        110 => true, 111 => true, 112 => true, 113 => true, 114 => true,
+        115 => true, 116 => true, 117 => true, 118 => true, 119 => true,
+        120 => true, 121 => true, 122 => true, 123 => true, 124 => true,
+        125 => true, 126 => true, 127 => true, 128 => true, 129 => true,
+        130 => true, 131 => true, 132 => true, 133 => true, 134 => true,
+        135 => true, 136 => true, 137 => true, 138 => true, 139 => true,
+        140 => true, 141 => true, 142 => true, 143 => true, 144 => true,
+        145 => true, 146 => true, 147 => true, 148 => true, 149 => true,
+        150 => true, 151 => true, 152 => true, 153 => true, 154 => true,
+        155 => true, 156 => true, 157 => true, 158 => true, 159 => true,
+        160 => true, 161 => true, 162 => true, 163 => true, 164 => true,
+        165 => true, 166 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000;  font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006600; font-weight: bold;',
+            4 => 'color: #006600; font-weight: bold;',
+            5 => 'color: #003399; font-weight: bold;',
+            6 => 'color: #003399; font-weight: bold;',
+            7 => 'color: #003399; font-weight: bold;',
+            8 => 'color: #003399; font-weight: bold;',
+            9 => 'color: #003399; font-weight: bold;',
+            10 => 'color: #003399; font-weight: bold;',
+            11 => 'color: #003399; font-weight: bold;',
+            12 => 'color: #003399; font-weight: bold;',
+            13 => 'color: #003399; font-weight: bold;',
+            14 => 'color: #003399; font-weight: bold;',
+            15 => 'color: #003399; font-weight: bold;',
+            16 => 'color: #003399; font-weight: bold;',
+            17 => 'color: #003399; font-weight: bold;',
+            18 => 'color: #003399; font-weight: bold;',
+            19 => 'color: #003399; font-weight: bold;',
+            20 => 'color: #003399; font-weight: bold;',
+            21 => 'color: #003399; font-weight: bold;',
+            22 => 'color: #003399; font-weight: bold;',
+            23 => 'color: #003399; font-weight: bold;',
+            24 => 'color: #003399; font-weight: bold;',
+            25 => 'color: #003399; font-weight: bold;',
+            26 => 'color: #003399; font-weight: bold;',
+            27 => 'color: #003399; font-weight: bold;',
+            28 => 'color: #003399; font-weight: bold;',
+            29 => 'color: #003399; font-weight: bold;',
+            30 => 'color: #003399; font-weight: bold;',
+            31 => 'color: #003399; font-weight: bold;',
+            32 => 'color: #003399; font-weight: bold;',
+            33 => 'color: #003399; font-weight: bold;',
+            34 => 'color: #003399; font-weight: bold;',
+            35 => 'color: #003399; font-weight: bold;',
+            36 => 'color: #003399; font-weight: bold;',
+            37 => 'color: #003399; font-weight: bold;',
+            38 => 'color: #003399; font-weight: bold;',
+            39 => 'color: #003399; font-weight: bold;',
+            40 => 'color: #003399; font-weight: bold;',
+            41 => 'color: #003399; font-weight: bold;',
+            42 => 'color: #003399; font-weight: bold;',
+            43 => 'color: #003399; font-weight: bold;',
+            44 => 'color: #003399; font-weight: bold;',
+            45 => 'color: #003399; font-weight: bold;',
+            46 => 'color: #003399; font-weight: bold;',
+            47 => 'color: #003399; font-weight: bold;',
+            48 => 'color: #003399; font-weight: bold;',
+            49 => 'color: #003399; font-weight: bold;',
+            50 => 'color: #003399; font-weight: bold;',
+            51 => 'color: #003399; font-weight: bold;',
+            52 => 'color: #003399; font-weight: bold;',
+            53 => 'color: #003399; font-weight: bold;',
+            54 => 'color: #003399; font-weight: bold;',
+            55 => 'color: #003399; font-weight: bold;',
+            56 => 'color: #003399; font-weight: bold;',
+            57 => 'color: #003399; font-weight: bold;',
+            58 => 'color: #003399; font-weight: bold;',
+            59 => 'color: #003399; font-weight: bold;',
+            60 => 'color: #003399; font-weight: bold;',
+            61 => 'color: #003399; font-weight: bold;',
+            62 => 'color: #003399; font-weight: bold;',
+            63 => 'color: #003399; font-weight: bold;',
+            64 => 'color: #003399; font-weight: bold;',
+            65 => 'color: #003399; font-weight: bold;',
+            66 => 'color: #003399; font-weight: bold;',
+            67 => 'color: #003399; font-weight: bold;',
+            68 => 'color: #003399; font-weight: bold;',
+            69 => 'color: #003399; font-weight: bold;',
+            70 => 'color: #003399; font-weight: bold;',
+            71 => 'color: #003399; font-weight: bold;',
+            72 => 'color: #003399; font-weight: bold;',
+            73 => 'color: #003399; font-weight: bold;',
+            74 => 'color: #003399; font-weight: bold;',
+            75 => 'color: #003399; font-weight: bold;',
+            76 => 'color: #003399; font-weight: bold;',
+            77 => 'color: #003399; font-weight: bold;',
+            78 => 'color: #003399; font-weight: bold;',
+            79 => 'color: #003399; font-weight: bold;',
+            80 => 'color: #003399; font-weight: bold;',
+            81 => 'color: #003399; font-weight: bold;',
+            82 => 'color: #003399; font-weight: bold;',
+            83 => 'color: #003399; font-weight: bold;',
+            84 => 'color: #003399; font-weight: bold;',
+            85 => 'color: #003399; font-weight: bold;',
+            86 => 'color: #003399; font-weight: bold;',
+            87 => 'color: #003399; font-weight: bold;',
+            88 => 'color: #003399; font-weight: bold;',
+            89 => 'color: #003399; font-weight: bold;',
+            90 => 'color: #003399; font-weight: bold;',
+            91 => 'color: #003399; font-weight: bold;',
+            92 => 'color: #003399; font-weight: bold;',
+            93 => 'color: #003399; font-weight: bold;',
+            94 => 'color: #003399; font-weight: bold;',
+            95 => 'color: #003399; font-weight: bold;',
+            96 => 'color: #003399; font-weight: bold;',
+            97 => 'color: #003399; font-weight: bold;',
+            98 => 'color: #003399; font-weight: bold;',
+            99 => 'color: #003399; font-weight: bold;',
+            100 => 'color: #003399; font-weight: bold;',
+            101 => 'color: #003399; font-weight: bold;',
+            102 => 'color: #003399; font-weight: bold;',
+            103 => 'color: #003399; font-weight: bold;',
+            104 => 'color: #003399; font-weight: bold;',
+            105 => 'color: #003399; font-weight: bold;',
+            106 => 'color: #003399; font-weight: bold;',
+            107 => 'color: #003399; font-weight: bold;',
+            108 => 'color: #003399; font-weight: bold;',
+            109 => 'color: #003399; font-weight: bold;',
+            110 => 'color: #003399; font-weight: bold;',
+            111 => 'color: #003399; font-weight: bold;',
+            112 => 'color: #003399; font-weight: bold;',
+            113 => 'color: #003399; font-weight: bold;',
+            114 => 'color: #003399; font-weight: bold;',
+            115 => 'color: #003399; font-weight: bold;',
+            116 => 'color: #003399; font-weight: bold;',
+            117 => 'color: #003399; font-weight: bold;',
+            118 => 'color: #003399; font-weight: bold;',
+            119 => 'color: #003399; font-weight: bold;',
+            120 => 'color: #003399; font-weight: bold;',
+            121 => 'color: #003399; font-weight: bold;',
+            122 => 'color: #003399; font-weight: bold;',
+            123 => 'color: #003399; font-weight: bold;',
+            124 => 'color: #003399; font-weight: bold;',
+            125 => 'color: #003399; font-weight: bold;',
+            126 => 'color: #003399; font-weight: bold;',
+            127 => 'color: #003399; font-weight: bold;',
+            128 => 'color: #003399; font-weight: bold;',
+            129 => 'color: #003399; font-weight: bold;',
+            130 => 'color: #003399; font-weight: bold;',
+            131 => 'color: #003399; font-weight: bold;',
+            132 => 'color: #003399; font-weight: bold;',
+            133 => 'color: #003399; font-weight: bold;',
+            134 => 'color: #003399; font-weight: bold;',
+            135 => 'color: #003399; font-weight: bold;',
+            136 => 'color: #003399; font-weight: bold;',
+            137 => 'color: #003399; font-weight: bold;',
+            138 => 'color: #003399; font-weight: bold;',
+            139 => 'color: #003399; font-weight: bold;',
+            140 => 'color: #003399; font-weight: bold;',
+            141 => 'color: #003399; font-weight: bold;',
+            142 => 'color: #003399; font-weight: bold;',
+            143 => 'color: #003399; font-weight: bold;',
+            144 => 'color: #003399; font-weight: bold;',
+            145 => 'color: #003399; font-weight: bold;',
+            146 => 'color: #003399; font-weight: bold;',
+            147 => 'color: #003399; font-weight: bold;',
+            148 => 'color: #003399; font-weight: bold;',
+            149 => 'color: #003399; font-weight: bold;',
+            150 => 'color: #003399; font-weight: bold;',
+            151 => 'color: #003399; font-weight: bold;',
+            152 => 'color: #003399; font-weight: bold;',
+            153 => 'color: #003399; font-weight: bold;',
+            154 => 'color: #003399; font-weight: bold;',
+            155 => 'color: #003399; font-weight: bold;',
+            156 => 'color: #003399; font-weight: bold;',
+            157 => 'color: #003399; font-weight: bold;',
+            158 => 'color: #003399; font-weight: bold;',
+            159 => 'color: #003399; font-weight: bold;',
+            160 => 'color: #003399; font-weight: bold;',
+            161 => 'color: #003399; font-weight: bold;',
+            162 => 'color: #003399; font-weight: bold;',
+            163 => 'color: #003399; font-weight: bold;',
+            164 => 'color: #003399; font-weight: bold;',
+            165 => 'color: #003399; font-weight: bold;',
+            166 => 'color: #003399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #006699;',
+            3 => 'color: #008000; font-style: italic; font-weight: bold;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/applet/{FNAME}.html',
+        6 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/{FNAME}.html',
+        7 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/color/{FNAME}.html',
+        8 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/datatransfer/{FNAME}.html',
+        9 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/dnd/{FNAME}.html',
+        10 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/event/{FNAME}.html',
+        11 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/font/{FNAME}.html',
+        12 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/geom/{FNAME}.html',
+        13 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/im/{FNAME}.html',
+        14 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/im/spi/{FNAME}.html',
+        15 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/image/{FNAME}.html',
+        16 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/image/renderable/{FNAME}.html',
+        17 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/awt/print/{FNAME}.html',
+        18 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/beans/{FNAME}.html',
+        19 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/beans/beancontext/{FNAME}.html',
+        20 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/io/{FNAME}.html',
+        21 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/{FNAME}.html',
+        22 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/annotation/{FNAME}.html',
+        23 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/instrument/{FNAME}.html',
+        24 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/management/{FNAME}.html',
+        25 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/ref/{FNAME}.html',
+        26 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/lang/reflect/{FNAME}.html',
+        27 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/math/{FNAME}.html',
+        28 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/net/{FNAME}.html',
+        29 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/nio/{FNAME}.html',
+        30 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/nio/channels/{FNAME}.html',
+        31 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/nio/channels/spi/{FNAME}.html',
+        32 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/{FNAME}.html',
+        33 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/nio/charset/spi/{FNAME}.html',
+        34 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/rmi/{FNAME}.html',
+        35 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/rmi/activation/{FNAME}.html',
+        36 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/rmi/dgc/{FNAME}.html',
+        37 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/rmi/registry/{FNAME}.html',
+        38 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/rmi/server/{FNAME}.html',
+        39 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/security/{FNAME}.html',
+        40 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/security/acl/{FNAME}.html',
+        41 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/security/cert/{FNAME}.html',
+        42 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/security/interfaces/{FNAME}.html',
+        43 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/security/spec/{FNAME}.html',
+        44 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/sql/{FNAME}.html',
+        45 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/text/{FNAME}.html',
+        46 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/{FNAME}.html',
+        47 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/{FNAME}.html',
+        48 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/atomic/{FNAME}.html',
+        49 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/concurrent/locks/{FNAME}.html',
+        50 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/jar/{FNAME}.html',
+        51 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/logging/{FNAME}.html',
+        52 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/prefs/{FNAME}.html',
+        53 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/{FNAME}.html',
+        54 => 'http://java.sun.com/j2se/1.5.0/docs/api/java/util/zip/{FNAME}.html',
+        55 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/accessibility/{FNAME}.html',
+        56 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/activity/{FNAME}.html',
+        57 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/crypto/{FNAME}.html',
+        58 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/crypto/interfaces/{FNAME}.html',
+        59 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/crypto/spec/{FNAME}.html',
+        60 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/{FNAME}.html',
+        61 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/event/{FNAME}.html',
+        62 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/metadata/{FNAME}.html',
+        63 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/plugins/bmp/{FNAME}.html',
+        64 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/plugins/jpeg/{FNAME}.html',
+        65 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/spi/{FNAME}.html',
+        66 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/imageio/stream/{FNAME}.html',
+        67 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/{FNAME}.html',
+        68 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/loading/{FNAME}.html',
+        69 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/modelmbean/{FNAME}.html',
+        70 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/monitor/{FNAME}.html',
+        71 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/openmbean/{FNAME}.html',
+        72 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/relation/{FNAME}.html',
+        73 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/remote/{FNAME}.html',
+        74 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/remote/rmi/{FNAME}.html',
+        75 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/management/timer/{FNAME}.html',
+        76 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/{FNAME}.html',
+        77 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/directory/{FNAME}.html',
+        78 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/event/{FNAME}.html',
+        79 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/ldap/{FNAME}.html',
+        80 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/naming/spi/{FNAME}.html',
+        81 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/net/{FNAME}.html',
+        82 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/net/ssl/{FNAME}.html',
+        83 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/print/{FNAME}.html',
+        84 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/print/attribute/{FNAME}.html',
+        85 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/print/attribute/standard/{FNAME}.html',
+        86 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/print/event/{FNAME}.html',
+        87 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/rmi/{FNAME}.html',
+        88 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/rmi/CORBA/{FNAME}.html',
+        89 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/rmi/ssl/{FNAME}.html',
+        90 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/{FNAME}.html',
+        91 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/callback/{FNAME}.html',
+        92 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/kerberos/{FNAME}.html',
+        93 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/login/{FNAME}.html',
+        94 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/spi/{FNAME}.html',
+        95 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/auth/x500/{FNAME}.html',
+        96 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/security/sasl/{FNAME}.html',
+        97 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sound/midi/{FNAME}.html',
+        98 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sound/midi/spi/{FNAME}.html',
+        99 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sound/sampled/{FNAME}.html',
+        100 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sound/sampled/spi/{FNAME}.html',
+        101 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sql/{FNAME}.html',
+        102 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sql/rowset/{FNAME}.html',
+        103 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sql/rowset/serial/{FNAME}.html',
+        104 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/sql/rowset/spi/{FNAME}.html',
+        105 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/{FNAME}.html',
+        106 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/border/{FNAME}.html',
+        107 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/colorchooser/{FNAME}.html',
+        108 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/event/{FNAME}.html',
+        109 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/filechooser/{FNAME}.html',
+        110 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/plaf/{FNAME}.html',
+        111 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/plaf/basic/{FNAME}.html',
+        112 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/plaf/metal/{FNAME}.html',
+        113 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/plaf/multi/{FNAME}.html',
+        114 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/plaf/synth/{FNAME}.html',
+        115 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/table/{FNAME}.html',
+        116 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/text/{FNAME}.html',
+        117 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/text/html/{FNAME}.html',
+        118 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/text/html/parser/{FNAME}.html',
+        119 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/text/rtf/{FNAME}.html',
+        120 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/tree/{FNAME}.html',
+        121 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/swing/undo/{FNAME}.html',
+        122 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/transaction/{FNAME}.html',
+        123 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/transaction/xa/{FNAME}.html',
+        124 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/{FNAME}.html',
+        125 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/datatype/{FNAME}.html',
+        126 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/namespace/{FNAME}.html',
+        127 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/parsers/{FNAME}.html',
+        128 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/{FNAME}.html',
+        129 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/dom/{FNAME}.html',
+        130 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/sax/{FNAME}.html',
+        131 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/transform/stream/{FNAME}.html',
+        132 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/validation/{FNAME}.html',
+        133 => 'http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/{FNAME}.html',
+        134 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/ietf/jgss/{FNAME}.html',
+        135 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CORBA/{FNAME}.html',
+        136 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CORBA/DynAnyPackage/{FNAME}.html',
+        137 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CORBA/TypeCodePackage/{FNAME}.html',
+        138 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CORBA/portable/{FNAME}.html',
+        139 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CosNaming/{FNAME}.html',
+        140 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CosNaming/NamingContextExtPackage/{FNAME}.html',
+        141 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/CosNaming/NamingContextPackage/{FNAME}.html',
+        142 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/Dynamic/{FNAME}.html',
+        143 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/DynamicAny/{FNAME}.html',
+        144 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/DynamicAny/DynAnyFactoryPackage/{FNAME}.html',
+        145 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/DynamicAny/DynAnyPackage/{FNAME}.html',
+        146 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/IOP/{FNAME}.html',
+        147 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/IOP/CodecFactoryPackage/{FNAME}.html',
+        148 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/IOP/CodecPackage/{FNAME}.html',
+        149 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/Messaging/{FNAME}.html',
+        150 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableInterceptor/{FNAME}.html',
+        151 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableInterceptor/ORBInitInfoPackage/{FNAME}.html',
+        152 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableServer/{FNAME}.html',
+        153 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableServer/CurrentPackage/{FNAME}.html',
+        154 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableServer/POAManagerPackage/{FNAME}.html',
+        155 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableServer/POAPackage/{FNAME}.html',
+        156 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/PortableServer/ServantLocatorPackage/{FNAME}.html',
+        157 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/SendingContext/{FNAME}.html',
+        158 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/omg/stub/java/rmi/{FNAME}.html',
+        159 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/w3c/dom/{FNAME}.html',
+        160 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/w3c/dom/bootstrap/{FNAME}.html',
+        161 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/w3c/dom/events/{FNAME}.html',
+        162 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/w3c/dom/ls/{FNAME}.html',
+        163 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/xml/sax/{FNAME}.html',
+        164 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/xml/sax/ext/{FNAME}.html',
+        165 => 'http://java.sun.com/j2se/1.5.0/docs/api/org/xml/sax/helpers/{FNAME}.html',
+        /* ambiguous class names (appear in more than one package) */
+        166 => 'http://www.google.com/search?sitesearch=java.sun.com&amp;q=allinurl%3Aj2se%2F1+5+0%2Fdocs%2Fapi+{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        /* Java does not use '::' */
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/javascript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/javascript.php
new file mode 100644
index 000000000..4ffef2b2e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/javascript.php
@@ -0,0 +1,150 @@
+<?php
+/*************************************************************************************
+ * javascript.php
+ * --------------
+ * Author: Ben Keen (ben.keen@gmail.com)
+ * Copyright: (c) 2004 Ben Keen (ben.keen@gmail.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/20
+ *
+ * JavaScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Javascript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Regular Expressions
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
+            'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
+            'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
+            'while', 'write', 'with'
+            ),
+        2 => array(
+            'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
+            'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
+            'protected', 'public', 'super', 'true', 'use', 'var'
+            ),
+        3 => array(
+            // common functions for Window object
+            'alert', 'back', 'blur', 'close', 'confirm', 'focus', 'forward', 'home',
+            'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
+            'onresize', 'onunload', 'open', 'print', 'prompt', 'scroll', 'status',
+            'stop',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '@', '&', '|', '^',
+        '<', '>', '=',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<script type="text/javascript">' => '</script>'
+            ),
+        1 => array(
+            '<script language="javascript">' => '</script>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/kixtart.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/kixtart.php
new file mode 100644
index 000000000..bdffd5875
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/kixtart.php
@@ -0,0 +1,329 @@
+<?php
+/*************************************************************************************
+ * kixtart.php
+ * --------
+ * Author: Riley McArdle (riley@glyff.net)
+ * Copyright: (c) 2007 Riley McArdle (http://www.glyff.net/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/08/31
+ *
+ * PHP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/08/31 (1.0.7.22)
+ *  -  First Release
+ *
+ * TODO (updated 2007/08/31)
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KiXtart',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'Loop',
+            'Use',
+            'Small',
+            'Sleep',
+            'Shell',
+            'SetTime',
+            'SetM',
+            'SetL',
+            'Set',
+            'Select', 'Case',
+            'Run',
+            'Return',
+            'Redim',
+            'RD',
+            'Quit',
+            'Play',
+            'Move',
+            'MD',
+            'Include',
+            'If', 'Else', 'Endif',
+            'GoTo',
+            'GoSub',
+            'Go',
+            'Global',
+            'GetS',
+            'Get',
+            'Function', 'Endfunction',
+            'For', 'Next',
+            'Each',
+            'FlushKb',
+            'Exit',
+            'Do', 'Until',
+            'Display',
+            'Dim',
+            'Del',
+            'Debug',
+            'Copy',
+            'Cookie1',
+            'Color',
+            'CLS',
+            'CD',
+            'Call',
+            'Break',
+            'Big',
+            'Beep',
+            ),
+        2 => array(
+            '@Address',
+            '@Build',
+            '@Color',
+            '@Comment',
+            '@CPU',
+            '@CRLF',
+            '@CSD',
+            '@CurDir',
+            '@Date',
+            '@Day',
+            '@Domain',
+            '@DOS',
+            '@Error',
+            '@FullName',
+            '@HomeDir',
+            '@HomeDrive',
+            '@HomeShr',
+            '@HostName',
+            '@InWin',
+            '@IPaddressX',
+            '@KiX',
+            '@LanRoot',
+            '@LDomain',
+            '@LDrive',
+            '@LM',
+            '@LogonMode',
+            '@LongHomeDir',
+            '@LServer',
+            '@MaxPWAge',
+            '@MDayNo',
+            '@MHz',
+            '@MonthNo',
+            '@Month',
+            '@MSecs',
+            '@OnWoW64',
+            '@PID',
+            '@PrimaryGroup',
+            '@Priv',
+            '@ProductSuite',
+            '@ProductType',
+            '@PWAge',
+            '@RAS',
+            '@Result',
+            '@RServer',
+            '@ScriptDir',
+            '@ScriptExe',
+            '@ScriptName',
+            '@SError',
+            '@SID',
+            '@Site',
+            '@StartDir',
+            '@SysLang',
+            '@Ticks',
+            '@Time',
+            '@TsSession',
+            '@UserID',
+            '@UserLang',
+            '@WDayNo',
+            '@Wksta',
+            '@WUserID',
+            '@YDayNo',
+            '@Year',
+            ),
+        3 => array(
+            'WriteValue',
+            'WriteProfileString',
+            'WriteLine',
+            'VarTypeName',
+            'VarType',
+            'Val',
+            'UnloadHive',
+            'UCase',
+            'Ubound',
+            'Trim',
+            'Substr',
+            'SRnd',
+            'Split',
+            'SidToName',
+            'ShutDown',
+            'ShowProgramGroup',
+            'SetWallpaper',
+            'SetTitle',
+            'SetSystemState',
+            'SetOption',
+            'SetFocus',
+            'SetFileAttr',
+            'SetDefaultPrinter',
+            'SetConsole',
+            'SetAscii',
+            'SendMessage',
+            'SendKeys',
+            'SaveKey',
+            'RTrim',
+            'Round',
+            'Rnd',
+            'Right',
+            'RedirectOutput',
+            'ReadValue',
+            'ReadType',
+            'ReadProfileString',
+            'ReadLine',
+            'Open',
+            'MessageBox',
+            'MemorySize',
+            'LTrim',
+            'Logoff',
+            'LogEvent',
+            'LoadKey',
+            'LoadHive',
+            'Len',
+            'Left',
+            'LCase',
+            'KeyExist',
+            'KbHit',
+            'Join',
+            'IsDeclared',
+            'Int',
+            'InStrRev',
+            'InStr',
+            'InGroup',
+            'IIF',
+            'GetObject',
+            'GetFileVersion',
+            'GetFileTime',
+            'GetFileSize',
+            'GetFileAttr',
+            'GetDiskSpace',
+            'FreeFileHandle',
+            'FormatNumber',
+            'Fix',
+            'ExpandEnvironmentVars',
+            'Exist',
+            'Execute',
+            'EnumValue',
+            'EnumLocalGroup',
+            'EnumKey',
+            'EnumIpInfo',
+            'EnumGroup',
+            'Dir',
+            'DelValue',
+            'DelTree',
+            'DelProgramItem',
+            'DelProgramGroup',
+            'DelPrinterConnection',
+            'DelKey',
+            'DecToHex',
+            'CStr',
+            'CreateObject',
+            'CompareFileTimes',
+            'Close',
+            'ClearEventLog',
+            'CInt',
+            'Chr',
+            'CDbl',
+            'Box',
+            'BackupEventLog',
+            'At',
+            'AScan',
+            'Asc',
+            'AddProgramItem',
+            'AddProgramGroup',
+            'AddPrinterConnection',
+            'AddKey',
+            'Abs'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '?', ':', '+', '-', '*', '/', '&', '|', '^', '~', '<', '>', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.kixtart.org/manual/Commands/{FNAMEL}.htm',
+        2 => '',
+        3 => 'http://www.kixtart.org/manual/Functions/{FNAMEL}.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonec.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonec.php
new file mode 100644
index 000000000..03d64a166
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonec.php
@@ -0,0 +1,282 @@
+<?php
+/*************************************************************************************
+ * klonec.php
+ * --------
+ * Author: AUGER Mickael
+ * Copyright: Synchronic
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/04/16
+ *
+ * KLone with C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/16 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/16)
+ * -------------------------
+ * A tester et a completer si besoin
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KLone C',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C
+            'if', 'return', 'while', 'case', 'class', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+            'null', 'break', 'true', 'enum', 'extern', 'inline', 'false'
+            ),
+        2 => array(//mots-cles KLone
+            'out', 'request', 'response',
+            ),
+        3 => array(//fonctions C usuelles
+            'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite',
+            'perror', 'ferror', 'qsort', 'stats', 'sscanf', 'scanf',
+            'strdup', 'strcpy', 'strcmp', 'strncpy', 'strcasecmp', 'cat', 'strcat', 'strstr',
+            'strlen', 'strtof', 'strtod', 'strtok', 'towlower', 'towupper',
+            'cd', 'system', 'exit', 'exec', 'fork', 'vfork', 'kill', 'signal', 'syslog',
+            'usleep', 'utime', 'wait', 'waitpid', 'waitid',
+            'ceil', 'eval', 'round', 'floor',
+            'atoi', 'atol', 'abs', 'cos', 'sin', 'tan', 'acos', 'asin', 'atan', 'exp',
+            'time', 'ctime', 'localtime', 'asctime', 'gmtime', 'difftime', 'date'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile',
+            'wchar_t', 'time_t', 'FILE'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C et KLone
+            2 => 'color: #339933;',//pour les #... en C
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonecpp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonecpp.php
new file mode 100644
index 000000000..fd2d53864
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/klonecpp.php
@@ -0,0 +1,310 @@
+<?php
+/*************************************************************************************
+ * klonecpp.php
+ * --------
+ * Author: AUGER Mickael
+ * Copyright: Synchronic
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/04/16
+ *
+ * KLone with C++ language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/16 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/16)
+ * -------------------------
+ * A tester et a completer si besoin
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'KLone C++',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '<!--' => '-->' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C++
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+            'break', 'true', 'enum', 'extern', 'inline', 'false',
+            'errno', 'stdin', 'stdout', 'stderr',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class',
+            'EDOM', 'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam', 'NULL',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC'
+            ),
+        2 => array(//mots-cles KLone
+            'out', 'request', 'response',
+            ),
+        3 => array(//fonctions C++ usuelles
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C++
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            'string', 'wchar_t'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C++
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C++
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C++
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C++ et KLone
+            2 => 'color: #339933;',//pour les #... en C++
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C++ et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=&lt;|&lt;\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|&gt;)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/latex.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/latex.php
new file mode 100644
index 000000000..bad2c1861
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/latex.php
@@ -0,0 +1,218 @@
+<?php
+/*************************************************************************************
+ * latex.php
+ * -----
+ * Author: efi, Matthias Pospiech (matthias@pospiech.eu)
+ * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/09/23
+ *
+ * LaTeX language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/18 (1.0.8.1)
+ *  - Changes in color and some additional command recognition
+ *  - No special Color for Brackets, it is only distracting
+ *    if color should be reintroduced it should be less bright
+ *  - Math color changed from green to violett, since green is now used for comments
+ *  - Comments are now colored and the only green. The reason for coloring the comments
+ *    is that often important information is in the comments und was merely unvisible before.
+ *  - New Color for [Options]
+ *  - color for labels not specialised anymore. It makes sence in large documents but less in
+ *    small web examples.
+ *  - \@keyword introduced
+ *  - Fixed \& escaped ampersand
+ * 2006/09/23 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LaTeX',
+    'COMMENT_SINGLE' => array(
+        1 => '%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'addlinespace','address','appendix','author','backmatter',
+            'bfseries','bibitem','bigskip','blindtext','caption','captionabove',
+            'captionbelow','cdot','centering','cite','color','colorbox','date',
+            'def','definecolor','documentclass','edef','eqref','else','email','emph','fbox',
+            'fi','flushleft','flushright','footnote','frac','frontmatter','graphicspath','hfill',
+            'hline','hspace','huge','include','includegraphics','infty','input','int','ifx',
+            'item','label','LaTeX','left','let','limits','listfiles','listoffigures',
+            'listoftables','mainmatter','makeatletter','makeatother','makebox',
+            'makeindex','maketitle','mbox','mediumskip','newcommand',
+            'newenvironment','newpage','nocite','nonumber','pagestyle','par','paragraph','parbox',
+            'parident','parskip','partial','raggedleft','raggedright','raisebox','ref',
+            'renewcommand','renewenvironment','right','rule','section','setlength',
+            'sffamily','subparagraph','subsection','subsubsection','sum','table',
+            'tableofcontents','textbf','textcolor','textit','textnormal',
+            'textsuperscript','texttt','title','today','ttfamily','urlstyle',
+            'usepackage','vspace'
+            )
+        ),
+    'SYMBOLS' => array(
+        "&", "\\", "{", "}", "[", "]"
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => true,
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 =>  'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020; '
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #8020E0; font-weight: normal;',  // Math inner
+            2 => 'color: #C08020; font-weight: normal;', // [Option]
+            3 => 'color: #8020E0; font-weight: normal;', // Maths
+            4 => 'color: #800000; font-weight: normal;', // Structure: Labels
+            5 => 'color: #00008B; font-weight: bold;',  // Structure (\section{->x<-})
+            6 => 'color: #800000; font-weight: normal;', // Structure (\section)
+            7 => 'color: #0000D0; font-weight: normal;', // Environment \end or \begin{->x<-} (brighter blue)
+            8 => 'color: #C00000; font-weight: normal;', // Structure \end or \begin
+            9 => 'color: #2020C0; font-weight: normal;', // {...}
+            10 => 'color: #800000; font-weight: normal;', // \%, \& etc.
+            11 => 'color: #E00000; font-weight: normal;', // \@keyword
+            12 => 'color: #800000; font-weight: normal;', // \keyword
+        ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.golatex.de/wiki/index.php?title=%5C{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Math inner
+        1 => array(
+            GESHI_SEARCH => "(\\\\begin\\{(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|alignat|flalign)\\})(.*)(\\\\end\\{\\2\\})",
+            GESHI_REPLACE => '\3',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\4'
+            ),
+        // [options]
+        2 => array(
+            GESHI_SEARCH => "(?<=\[).+(?=\])",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Math mode with $ ... $
+        3 => array(
+            GESHI_SEARCH => "\\$.+\\$",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Structure: Label
+        4 => "\\\\(?:label|pageref|ref|cite)(?=[^a-zA-Z])",
+        // Structure: sections
+        5 => array(
+            GESHI_SEARCH => "(\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // Structure: sections
+        6 => "\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?(?=[^a-zA-Z])",
+        // environment \begin{} and \end{} (i.e. the things inside the {})
+        7 => array(
+            GESHI_SEARCH => "(\\\\(?:begin|end)\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // Structure \begin and \end
+        8 => "\\\\(?:end|begin)(?=[^a-zA-Z])",
+        // {parameters}
+        9 => array(
+            GESHI_SEARCH => "(?<=\\{)(?!<\|!REG3XP5!>).*(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // \%, \& usw.
+        10 => "\\\\(?:[_$%]|&amp;)",
+        //  \@keywords
+        11 => "(?<!<\|!REG3XP[8]!>)\\\\@[a-zA-Z]+\*?",
+        // \keywords
+        12 => "(?<!<\|!REG3XP[468]!>)\\\\[a-zA-Z]+\*?",
+
+// ---------------------------------------------
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<=\\\\)",
+            'DISALLOWED_AFTER' => "(?![A-Za-z0-9])"
+        ),
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lisp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lisp.php
new file mode 100644
index 000000000..aa492058b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lisp.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * lisp.php
+ * --------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * Generic Lisp language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/9  (1.0.2)
+ *  -  Added support for :keywords and ::access (Denis Mashkevich)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lisp',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(';|' => '|;'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'not','defun','princ','when',
+            'eval','apply','funcall','quote','identity','function',
+            'complement','backquote','lambda','set','setq','setf',
+            'defmacro','gensym','make','symbol','intern',
+            'name','value','plist','get',
+            'getf','putprop','remprop','hash','array','aref',
+            'car','cdr','caar','cadr','cdar','cddr','caaar','caadr','cadar',
+            'caddr','cdaar','cdadr','cddar','cdddr','caaaar','caaadr',
+            'caadar','caaddr','cadaar','cadadr','caddar','cadddr',
+            'cdaaar','cdaadr','cdadar','cdaddr','cddaar','cddadr',
+            'cdddar','cddddr','cons','list','append','reverse','last','nth',
+            'nthcdr','member','assoc','subst','sublis','nsubst',
+            'nsublis','remove','length',
+            'mapc','mapcar','mapl','maplist','mapcan','mapcon','rplaca',
+            'rplacd','nconc','delete','atom','symbolp','numberp',
+            'boundp','null','listp','consp','minusp','zerop','plusp',
+            'evenp','oddp','eq','eql','equal','cond','case','and','or',
+            'let','l','if','prog','prog1','prog2','progn','go','return',
+            'do','dolist','dotimes','catch','throw','error','cerror','break',
+            'continue','errset','baktrace','evalhook','truncate','float',
+            'rem','min','max','abs','sin','cos','tan','expt','exp','sqrt',
+            'random','logand','logior','logxor','lognot','bignums','logeqv',
+            'lognand','lognor','logorc2','logtest','logbitp','logcount',
+            'integer','nil','parse-integer'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '!', '%', '^', '&',
+        ' + ',' - ',' * ',' / ',
+        '=','<','>',
+        '.',':',',',';',
+        '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #555;',
+            1 => 'color: #555;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        '::', ':'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/locobasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/locobasic.php
new file mode 100644
index 000000000..a799d6900
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/locobasic.php
@@ -0,0 +1,130 @@
+<?php
+/*************************************************************************************
+ * locobasic.php
+ * -------------
+ * Author: Nacho Cabanes
+ * Copyright: (c) 2009 Nacho Cabanes (http://www.nachocabanes.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/03/22
+ *
+ * Locomotive Basic (Amstrad CPC series) language file for GeSHi.
+ *
+ * More details at http://en.wikipedia.org/wiki/Locomotive_BASIC
+ *
+ * CHANGES
+ * -------
+ * 2009/03/22 (1.0.8.3)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Locomotive Basic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => 'REM'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "AFTER", "AND", "AUTO", "BORDER", "BREAK", "CALL", "CAT", "CHAIN",
+            "CLEAR", "CLG", "CLS", "CLOSEIN", "CLOSEOUT", "CONT", "CURSOR",
+            "DATA", "DEF", "DEFINT", "DEFREAL", "DEFSTR", "DEG", "DELETE",
+            "DERR", "DI", "DIM", "DRAW", "DRAWR", "EDIT", "EI", "ELSE", "END",
+            "ENV", "ENT", "EOF", "ERASE", "ERL", "ERR", "ERROR", "EVERY",
+            "FILL", "FN", "FOR", "FRAME", "GOSUB", "GOTO", "GRAPHICS", "HIMEM",
+            "IF", "INK", "INPUT", "KEY", "LET", "LINE", "LIST", "LOAD",
+            "LOCATE", "MASK", "MEMORY", "MERGE", "MODE", "MOVE", "MOVER", "NEW",
+            "NEXT", "NOT", "ON", "OPENIN", "OPENOUT", "OR", "ORIGIN", "PAPER",
+            "PEEK", "PEN", "PLOT", "PLOTR", "POKE", "PRINT", "RAD", "RANDOMIZE",
+            "READ", "RELEASE", "REMAIN", "RENUM", "RESTORE", "RESUME", "RETURN",
+            "RUN", "SAVE", "SPEED", "SOUND", "SPC", "SQ", "STEP", "STOP", "SWAP",
+            "SYMBOL", "TAB", "TAG", "TAGOFF", "TEST", "TESTR", "TIME", "TO",
+            "THEN", "TRON", "TROFF", "USING", "WAIT", "WEND", "WHILE", "WIDTH",
+            "WINDOW", "WRITE", "XOR", "ZONE"
+            ),
+        2 => array(
+            "ABS", "ASC", "ATN", "BIN", "CHR", "CINT", "COPYCHR", "COS",
+            "CREAL", "DEC", "FIX", "FRE", "EXP", "HEX", "INKEY", "INP", "INSTR",
+            "INT", "JOY", "LEFT", "LEN", "LOG", "LOG10", "LOWER", "MAX", "MID",
+            "MIN", "MOD", "OUT", "PI", "POS", "RIGHT", "RND", "ROUND", "SGN",
+            "SIN", "SPACE", "SQR", "STR", "STRING", "TAN", "UNT", "UPPER",
+            "VAL", "VPOS", "XPOS", "YPOS"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #008888; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0044ff;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lolcode.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lolcode.php
new file mode 100644
index 000000000..fc60e3e9f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lolcode.php
@@ -0,0 +1,152 @@
+<?php
+/*************************************************************************************
+ * lolcode.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/10/31
+ *
+ * LOLcode language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'LOLcode',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\bBTW\b.*$/im",
+        2 => "/(^|\b)(?:OBTW\b.+?\bTLDR|LOL\b.+?\/LOL)(\b|$)/si"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => '/:[)>o":]/',
+        2 => '/:\([\da-f]+\)/i',
+        3 => '/:\{\w+\}/i',
+        4 => '/:\[\w+\]/i',
+        ),
+    'KEYWORDS' => array(
+        //Statements
+        1 => array(
+            'VISIBLE', 'HAI', 'KTHX', 'KTHXBYE', 'SMOOSH', 'GIMMEH', 'PLZ',
+            'ON', 'INVISIBLE', 'R', 'ITZ', 'GTFO', 'COMPLAIN', 'GIMME',
+
+            'OPEN', 'FILE', 'I HAS A', 'AWSUM THX', 'O NOES', 'CAN', 'HAS', 'HAZ',
+            'HOW DOES I', 'IF U SAY SO', 'FOUND YR', 'BORROW', 'OWN', 'ALONG',
+            'WITH', 'WIT', 'LOOK', 'AT', 'AWSUM', 'THX'
+            ),
+        //Conditionals
+        2 => array(
+            'IZ', 'YARLY', 'NOWAI', 'WTF?', 'MEBBE', 'OMG', 'OMGWTF',
+            'ORLY?', 'OF', 'NOPE', 'SO', 'IM', 'MAI',
+
+            'O RLY?', 'SUM', 'BOTH SAEM', 'DIFFRINT', 'BOTH', 'EITHER', 'WON',
+            'DIFF', 'PRODUKT', 'QUOSHUNT', 'MOD', 'MKAY', 'OK', 'THING',
+            'BIGNESS'
+            ),
+        //Repetition
+        3 => array(
+            'IN', 'OUTTA', 'LOOP', 'WHILE'
+            ),
+        //Operators \Math
+        4 => array(
+            'AN', 'AND', 'NOT', 'UP', 'YR', 'UPPIN', 'NERF', 'NERFIN', 'NERFZ',
+            'SMASHING', 'UR', 'KINDA', 'LIKE', 'SAEM', 'BIG', 'SMALL',
+            'BIGGR', 'SMALLR', 'BIGGER', 'SMALLER', 'GOOD', 'CUTE', 'THAN'
+            )
+        ),
+    'SYMBOLS' => array(
+        '.', ',', '?',
+        '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #000080;',
+            3 => 'color: #000080;',
+            4 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; style: italic;',
+            2 => 'color: #666666; style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusformulas.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusformulas.php
new file mode 100644
index 000000000..e82d6bf3d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusformulas.php
@@ -0,0 +1,318 @@
+<?php
+/*************************************************************************************
+ * lotusformulas.php
+ * ------------------------
+ * Author: Richard Civil (info@richardcivil.net)
+ * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/04/12
+ *
+ * @Formula/@Command language file for GeSHi.
+ *
+ * @Formula/@Command source: IBM Lotus Notes/Domino 8 Designer Help
+ *
+ * CHANGES
+ * -------
+ * 2008/04/12 (1.0.7.22)
+ *  -  First Release
+ *
+ * TODO (updated 2008/04/12)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lotus Notes @Formulas',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('REM' => ';'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            '[ZoomPreview]', '[WorkspaceStackReplicaIcons]',
+            '[WorkspaceProperties]', '[WindowWorkspace]',
+            '[WindowTile]', '[WindowRestore]', '[WindowNext]',
+            '[WindowMinimizeAll]', '[WindowMinimize]', '[WindowMaximizeAll]',
+            '[WindowMaximize]', '[WindowCascade]', '[ViewSwitchForm]',
+            '[ViewShowUnread]', '[ViewShowServerNames]', '[ViewShowSearchBar]',
+            '[ViewShowRuler]', '[ViewShowPageBreaks]', '[ViewShowOnlyUnread]',
+            '[ViewShowOnlySelected]', '[ViewShowOnlySearchResults]',
+            '[ViewShowOnlyCategories]', '[ViewShowObject]',
+            '[ViewShowFieldHelp]', '[ViewRenamePerson]', '[ViewRefreshUnread]',
+            '[ViewRefreshFields]', '[ViewNavigatorsNone]',
+            '[ViewNavigatorsFolders]', '[ViewMoveName]', '[ViewHorizScrollbar]',
+            '[ViewExpandWithChildren]', '[ViewExpandAll]', '[ViewExpand]',
+            '[ViewCollapseAll]', '[ViewCollapse]', '[ViewChange]',
+            '[ViewCertify]', '[ViewBesideFolders]', '[ViewBelowFolders]',
+            '[ViewArrangeIcons]', '[V3EditPrevField]', '[V3EditNextField]',
+            '[UserIDSwitch]', '[UserIDSetPassword]', '[UserIDMergeCopy]',
+            '[UserIDInfo]', '[UserIDEncryptionKeys]', '[UserIDCreateSafeCopy]',
+            '[UserIDClearPassword]', '[UserIDCertificates]',
+            '[ToolsUserLogoff]', '[ToolsSpellCheck]', '[ToolsSmartIcons]',
+            '[ToolsSetupUserSetup]', '[ToolsSetupPorts]', '[ToolsSetupMail]',
+            '[ToolsSetupLocation]', '[ToolsScanUnreadSelected]',
+            '[ToolsScanUnreadPreferred]', '[ToolsScanUnreadChoose]',
+            '[ToolsRunMacro]', '[ToolsRunBackgroundMacros]', '[ToolsReplicate]',
+            '[ToolsRefreshSelectedDocs]', '[ToolsRefreshAllDocs]',
+            '[ToolsMarkSelectedUnread]', '[ToolsMarkSelectedRead]',
+            '[ToolsMarkAllUnread]', '[ToolsMarkAllRead]', '[ToolsHangUp]',
+            '[ToolsCategorize]', '[ToolsCall]', '[TextUnderline]',
+            '[TextSpacingSingle]', '[TextSpacingOneAndaHalf]',
+            '[TextSpacingDouble]', '[TextSetFontSize]', '[TextSetFontFace]',
+            '[TextSetFontColor]', '[TextReduceFont]', '[TextPermanentPen]',
+            '[TextParagraphStyles]', '[TextParagraph]', '[TextOutdent]',
+            '[TextNumbers]', '[TextNormal]', '[TextItalic]', '[TextFont]',
+            '[TextEnlargeFont]', '[TextCycleSpacing]', '[TextBullet]',
+            '[TextBold]', '[TextAlignRight]', '[TextAlignNone]',
+            '[TextAlignLeft]', '[TextAlignFull]', '[TextAlignCenter]',
+            '[SwitchView]', '[SwitchForm]', '[StyleCycleKey]',
+            '[SmartIconsNextSet]', '[SmartIconsFloating]', '[ShowProperties]',
+            '[ShowHidePreviewPane]', '[ShowHideParentPreview]',
+            '[ShowHideLinkPreview]', '[ShowHideIMContactList]',
+            '[SetCurrentLocation]', '[SendInstantMessage]',
+            '[SectionRemoveHeader]', '[SectionProperties]',
+            '[SectionExpandAll]', '[SectionExpand]', '[SectionDefineEditors]',
+            '[SectionCollapseAll]', '[SectionCollapse]', '[RunScheduledAgents]',
+            '[RunAgent]', '[ReplicatorStop]', '[ReplicatorStart]',
+            '[ReplicatorSendReceiveMail]', '[ReplicatorSendMail]',
+            '[ReplicatorReplicateWithServer]', '[ReplicatorReplicateSelected]',
+            '[ReplicatorReplicateNext]', '[ReplicatorReplicateHigh]',
+            '[Replicator]', '[RenameDatabase]', '[RemoveFromFolder]',
+            '[RemoteDebugLotusScript]', '[ReloadWindow]', '[RefreshWindow]',
+            '[RefreshParentNote]', '[RefreshHideFormulas]', '[RefreshFrame]',
+            '[PublishDatabase]', '[PictureProperties]', '[PasteBitmapAsObject]',
+            '[PasteBitmapAsBackground]', '[OpenView]', '[OpenPage]',
+            '[OpenNavigator]', '[OpenInNewWindow]', '[OpenHelpDocument]',
+            '[OpenFrameset]', '[OpenDocument]', '[OpenCalendar]',
+            '[ObjectProperties]', '[ObjectOpen]', '[ObjectDisplayAs]',
+            '[NavPrevUnread]', '[NavPrevSelected]', '[NavPrevMain]',
+            '[NavPrev]', '[NavNextUnread]', '[NavNextSelected]',
+            '[NavNextMain]', '[NavNext]', '[NavigatorTest]',
+            '[NavigatorProperties]', '[NavigateToBacklink]',
+            '[NavigatePrevUnread]', '[NavigatePrevSelected]',
+            '[NavigatePrevMain]', '[NavigatePrevHighlight]', '[NavigatePrev]',
+            '[NavigateNextUnread]', '[NavigateNextSelected]',
+            '[NavigateNextMain]', '[NavigateNextHighlight]', '[NavigateNext]',
+            '[MoveToTrash]', '[MailSendPublicKey]', '[MailSendEncryptionKey]',
+            '[MailSendCertificateRequest]', '[MailSend]', '[MailScanUnread]',
+            '[MailRequestNewPublicKey]', '[MailRequestNewName]',
+            '[MailRequestCrossCert]', '[MailOpen]', '[MailForwardAsAttachment]',
+            '[MailForward]', '[MailComposeMemo]', '[MailAddress]',
+            '[LayoutProperties]', '[LayoutElementSendToBack]',
+            '[LayoutElementProperties]', '[LayoutElementBringToFront]',
+            '[LayoutAddText]', '[LayoutAddGraphic]', '[InsertSubform]',
+            '[HotspotProperties]', '[HotspotClear]', '[HelpUsingDatabase]',
+            '[HelpAboutNotes]', '[HelpAboutDatabase]', '[GoUpLevel]',
+            '[FormTestDocument]', '[FormActions]', '[FolderRename]',
+            '[FolderProperties]', '[FolderMove]', '[FolderExpandWithChildren]',
+            '[FolderExpandAll]', '[FolderExpand]', '[FolderDocuments]',
+            '[FolderCustomize]', '[FolderCollapse]', '[Folder]',
+            '[FindFreeTimeDialog]', '[FileSaveNewVersion]', '[FileSave]',
+            '[FilePrintSetup]', '[FilePrint]', '[FilePageSetup]',
+            '[FileOpenDBRepID]', '[FileOpenDatabase]', '[FileNewReplica]',
+            '[FileNewDatabase]', '[FileImport]', '[FileFullTextUpdate]',
+            '[FileFullTextInfo]', '[FileFullTextDelete]',
+            '[FileFullTextCreate]', '[FileExport]', '[FileExit]',
+            '[FileDatabaseUseServer]', '[FileDatabaseRemove]',
+            '[FileDatabaseInfo]', '[FileDatabaseDelete]', '[FileDatabaseCopy]',
+            '[FileDatabaseCompact]', '[FileDatabaseACL]', '[FileCloseWindow]',
+            '[ExitNotes]', '[Execute]', '[ExchangeUnreadMarks]', '[EmptyTrash]',
+            '[EditUp]', '[EditUntruncate]', '[EditUndo]', '[EditTop]',
+            '[EditTableInsertRowColumn]', '[EditTableFormat]',
+            '[EditTableDeleteRowColumn]', '[EditShowHideHiddenChars]',
+            '[EditSelectByDate]', '[EditSelectAll]', '[EditRight]',
+            '[EditRestoreDocument]', '[EditResizePicture]',
+            '[EditQuoteSelection]', '[EditProfileDocument]', '[EditProfile]',
+            '[EditPrevField]', '[EditPhoneNumbers]', '[EditPasteSpecial]',
+            '[EditPaste]', '[EditOpenLink]', '[EditNextField]',
+            '[EditMakeDocLink]', '[EditLocations]', '[EditLinks]', '[EditLeft]',
+            '[EditInsertText]', '[EditInsertTable]', '[EditInsertPopup]',
+            '[EditInsertPageBreak]', '[EditInsertObject]',
+            '[EditInsertFileAttachment]', '[EditInsertButton]',
+            '[EditIndentFirstLine]', '[EditIndent]', '[EditHorizScrollbar]',
+            '[EditHeaderFooter]', '[EditGotoField]', '[EditFindNext]',
+            '[EditFindInPreview]', '[EditFind]', '[EditEncryptionKeys]',
+            '[EditDown]', '[EditDocument]', '[EditDetach]', '[EditDeselectAll]',
+            '[EditCut]', '[EditCopy]', '[EditClear]', '[EditButton]',
+            '[EditBottom]', '[DiscoverFolders]', '[Directories]',
+            '[DialingRules]', '[DesignViewSelectFormula]', '[DesignViews]',
+            '[DesignViewNewColumn]', '[DesignViewFormFormula]',
+            '[DesignViewEditActions]', '[DesignViewColumnDef]',
+            '[DesignViewAttributes]', '[DesignViewAppendColumn]',
+            '[DesignSynopsis]', '[DesignSharedFields]', '[DesignReplace]',
+            '[DesignRefresh]', '[DesignMacros]', '[DesignIcon]',
+            '[DesignHelpUsingDocument]', '[DesignHelpAboutDocument]',
+            '[DesignFormWindowTitle]', '[DesignFormUseField]',
+            '[DesignFormShareField]', '[DesignForms]', '[DesignFormNewField]',
+            '[DesignFormFieldDef]', '[DesignFormAttributes]',
+            '[DesignDocumentInfo]', '[DebugLotusScript]',
+            '[DatabaseReplSettings]', '[DatabaseDelete]', '[CreateView]',
+            '[CreateTextbox]', '[CreateSubForm]', '[CreateSection]',
+            '[CreateRectangularHotspot]', '[CreateRectangle]',
+            '[CreatePolyline]', '[CreatePolygon]', '[CreateNavigator]',
+            '[CreateLayoutRegion]', '[CreateForm]', '[CreateFolder]',
+            '[CreateEllipse]', '[CreateControlledAccessSection]',
+            '[CreateAgent]', '[CreateAction]', '[CopySelectedAsTable]',
+            '[ComposeWithReference]', '[Compose]', '[CloseWindow]', '[Clear]',
+            '[ChooseFolders]', '[CalendarGoTo]', '[CalendarFormat]',
+            '[AttachmentView]', '[AttachmentProperties]', '[AttachmentLaunch]',
+            '[AttachmentDetachAll]', '[AgentTestRun]', '[AgentSetServerName]',
+            '[AgentRun]', '[AgentLog]', '[AgentEnableDisable]', '[AgentEdit]',
+            '[AdminTraceConnection]', '[AdminStatisticsConfig]',
+            '[AdminSendMailTrace]', '[AdminRemoteConsole]',
+            '[AdminRegisterUser]', '[AdminRegisterServer]',
+            '[AdminRegisterFromFile]', '[AdminOutgoingMail]',
+            '[AdminOpenUsersView]', '[AdminOpenStatistics]',
+            '[AdminOpenServersView]', '[AdminOpenServerLog]',
+            '[AdminOpenGroupsView]', '[AdminOpenCertLog]', '[AdminOpenCatalog]',
+            '[AdminOpenAddressBook]', '[AdminNewOrgUnit]',
+            '[AdminNewOrganization]', '[Administration]',
+            '[AdminIDFileSetPassword]', '[AdminIDFileExamine]',
+            '[AdminIDFileClearPassword]', '[AdminDatabaseQuotas]',
+            '[AdminDatabaseAnalysis]', '[AdminCrossCertifyKey]',
+            '[AdminCrossCertifyIDFile]', '[AdminCreateGroup]', '[AdminCertify]',
+            '[AddToIMContactList]', '[AddDatabaseRepID]', '[AddDatabase]',
+            '[AddBookmark]'
+            ),
+        2 => array(
+            'SELECT', 'FIELD', 'ENVIRONMENT', 'DEFAULT', '@Zone ', '@Yesterday',
+            '@Yes', '@Year', '@Word', '@Wide', '@While', '@Weekday',
+            '@WebDbName', '@ViewTitle', '@ViewShowThisUnread', '@Version',
+            '@VerifyPassword', '@ValidateInternetAddress', '@V4UserAccess',
+            '@V3UserName', '@V2If', '@UserRoles', '@UserPrivileges',
+            '@UserNamesList', '@UserNameLanguage', '@UserName', '@UserAccess',
+            '@UrlQueryString', '@URLOpen', '@URLHistory', '@URLGetHeader',
+            '@URLEncode', '@URLDecode', '@UpperCase', '@UpdateFormulaContext',
+            '@Unique', '@UndeleteDocument', '@Unavailable', '@True', '@Trim',
+            '@Transform', '@ToTime', '@ToNumber', '@Tomorrow', '@Today',
+            '@TimeZoneToText', '@TimeToTextInZone', '@TimeMerge', '@Time',
+            '@ThisValue', '@ThisName', '@TextToTime', '@TextToNumber', '@Text',
+            '@TemplateVersion', '@Tan', '@Sum', '@Success', '@Subset',
+            '@StatusBar', '@Sqrt', '@Soundex', '@Sort', '@Sin', '@Sign',
+            '@SetViewInfo', '@SetTargetFrame', '@SetProfileField',
+            '@SetHTTPHeader', '@SetField', '@SetEnvironment', '@SetDocField',
+            '@Set', '@ServerName', '@ServerAccess', '@Select', '@Second',
+            '@Round', '@RightBack', '@Right', '@Return', '@Responses',
+            '@ReplicaID', '@ReplaceSubstring', '@Replace', '@Repeat',
+            '@RegQueryValue', '@RefreshECL', '@Random', '@ProperCase',
+            '@Prompt', '@Power', '@PostedCommand', '@PolicyIsFieldLocked',
+            '@Platform', '@PickList', '@Pi', '@PasswordQuality', '@Password',
+            '@OrgDir', '@OptimizeMailAddress', '@OpenInNewWindow', '@Now',
+            '@Nothing', '@NoteID', '@No', '@NewLine', '@Narrow', '@NameLookup',
+            '@Name', '@Month', '@Modulo', '@Modified', '@Minute', '@Min',
+            '@MiddleBack', '@Middle', '@Member', '@Max', '@Matches',
+            '@MailSignPreference', '@MailSend', '@MailSavePreference',
+            '@MailEncryptSentPreference', '@MailEncryptSavedPreference',
+            '@MailDbName', '@LowerCase', '@Log', '@Locale', '@Ln', '@Like',
+            '@Length', '@LeftBack', '@Left', '@LDAPServer', '@LaunchApp',
+            '@LanguagePreference', '@Keywords', '@IsVirtualizedDirectory',
+            '@IsValid', '@IsUsingJavaElement', '@IsUnavailable', '@IsTime',
+            '@IsText', '@IsResponseDoc', '@IsNumber', '@IsNull', '@IsNotMember',
+            '@IsNewDoc', '@IsModalHelp', '@IsMember', '@IsExpandable',
+            '@IsError', '@IsEmbeddedInsideWCT', '@IsDocTruncated',
+            '@IsDocBeingSaved', '@IsDocBeingRecalculated', '@IsDocBeingMailed',
+            '@IsDocBeingLoaded', '@IsDocBeingEdited', '@IsDB2', '@IsCategory',
+            '@IsAvailable', '@IsAppInstalled', '@IsAgentEnabled', '@Integer',
+            '@InheritedDocumentUniqueID', '@Implode', '@IfError', '@If',
+            '@Hour', '@HashPassword', '@HardDeleteDocument', '@GetViewInfo',
+            '@GetProfileField', '@GetPortsList', '@GetIMContactListGroupNames',
+            '@GetHTTPHeader', '@GetFocusTable', '@GetField', '@GetDocField',
+            '@GetCurrentTimeZone', '@GetAddressBooks', '@FormLanguage', '@For',
+            '@FontList', '@FloatEq', '@FileDir', '@False', '@Failure',
+            '@Explode', '@Exp', '@Eval', '@Error', '@Environment', '@Ends',
+            '@EnableAlarms', '@Elements', '@EditUserECL', '@EditECL',
+            '@DoWhile', '@Domain', '@DocumentUniqueID', '@DocSiblings',
+            '@DocParentNumber', '@DocOmmittedLength', '@DocNumber', '@DocMark',
+            '@DocLock', '@DocLevel', '@DocLength', '@DocFields',
+            '@DocDescendants', '@DocChildren', '@Do', '@DialogBox',
+            '@DeleteField', '@DeleteDocument', '@DDETerminate', '@DDEPoke',
+            '@DDEInitiate', '@DDEExecute', '@DbTitle', '@DbName', '@DbManager',
+            '@DbLookup', '@DbExists', '@DbCommand', '@DbColumn', '@DB2Schema',
+            '@Day', '@Date', '@Created', '@Count', '@Cos', '@Contains',
+            '@ConfigFile', '@Compare', '@Command', '@ClientType',
+            '@CheckFormulaSyntax', '@CheckAlarms', '@Char', '@Certificate',
+            '@BusinessDays', '@BrowserInfo', '@Begins', '@Author',
+            '@Attachments', '@AttachmentNames', '@AttachmentModifiedTimes',
+            '@AttachmentLengths', '@ATan2', '@ATan', '@ASin', '@Ascii',
+            '@AllDescendants', '@AllChildren', '@All', '@AdminECLIsLocked',
+            '@Adjust', '@AddToFolder', '@ACos', '@Accessed', '@AbstractSimple',
+            '@Abstract', '@Abs'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+    );
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusscript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusscript.php
new file mode 100644
index 000000000..5272377b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lotusscript.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * lotusscript.php
+ * ------------------------
+ * Author: Richard Civil (info@richardcivil.net)
+ * Copyright: (c) 2008 Richard Civil (info@richardcivil.net), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/04/12
+ *
+ * LotusScript language file for GeSHi.
+ *
+ * LotusScript source: IBM Lotus Notes/Domino 8 Designer Help
+ *
+ * CHANGES
+ * -------
+ * 2008/04/12 (1.0.7.22)
+ *     -  First Release
+ *
+ * TODO (2008/04/12)
+ * -----------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LotusScript',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('%REM' => '%END REM'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"' , "|"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            'Yield', 'Year', 'Xor', 'Write', 'With', 'Width', 'While', 'Wend',
+            'Weekday', 'VarType', 'Variant', 'Val', 'UString', 'UString$',
+            'UseLSX', 'Use', 'Until', 'Unlock', 'Unicode', 'Uni', 'UChr',
+            'UChr$', 'UCase', 'UCase$', 'UBound', 'TypeName', 'Type', 'TRUE',
+            'Trim', 'Trim$', 'Today', 'To', 'TimeValue', 'TimeSerial', 'Timer',
+            'TimeNumber', 'Time', 'Time$', 'Then', 'Text', 'Tan', 'Tab', 'Sub',
+            'StrToken', 'StrToken$', 'StrRightBack', 'StrRightBack$',
+            'StrRight', 'StrRight$', 'StrLeftBack', 'StrLeftBack$', 'StrLeft',
+            'StrLeft$', 'String', 'String$', 'StrConv', 'StrCompare', 'StrComp',
+            'Str', 'Str$', 'Stop', 'Step', 'Static', 'Sqr', 'Split', 'Spc',
+            'Space', 'Space$', 'Sleep', 'Single', 'Sin', 'Shell', 'Shared',
+            'Sgn', 'SetFileAttr', 'SetAttr', 'Set', 'SendKeys', 'Select',
+            'Seek', 'Second', 'RTrim', 'RTrim$', 'RSet', 'Round', 'Rnd',
+            'RmDir', 'RightC', 'RightC$', 'RightBP', 'RightBP$', 'RightB',
+            'RightB$', 'Right', 'Right$', 'Return', 'Resume', 'Reset',
+            'Replace', 'Remove', 'Rem', 'ReDim', 'Read', 'Randomize',
+            'Random', 'Put', 'Public', 'Property', 'Private', 'Print',
+            'Preserve', 'Pitch', 'PI', 'Output', 'Or', 'Option', 'Open', 'On',
+            'Oct', 'Oct$', 'NULL', 'Now', 'NOTHING', 'Not', 'NoPitch', 'NoCase',
+            'Next', 'New', 'Name', 'MsgBox', 'Month', 'Mod', 'MkDir', 'Minute',
+            'MidC', 'MidC$', 'MidBP', 'MidBP$', 'MidB', 'MidB$', 'Mid', 'Mid$',
+            'MessageBox', 'Me', 'LTrim', 'LTrim$', 'LSServer', 'LSI_Info',
+            'LSet', 'Loop', 'Long', 'Log', 'LOF', 'Lock', 'LOC', 'LMBCS',
+            'ListTag', 'List', 'Line', 'Like', 'Lib', 'Let', 'LenC', 'LenBP',
+            'LenB', 'Len', 'LeftC', 'LeftC$', 'LeftBP', 'LeftBP$', 'LeftB',
+            'LeftB$', 'Left', 'Left$', 'LCase', 'LCase$', 'LBound', 'Kill',
+            'Join', 'IsUnknown', 'IsScalar', 'IsObject', 'IsNumeric', 'IsNull',
+            'IsList', 'IsEmpty', 'IsElement', 'IsDate', 'IsArray', 'IsA', 'Is',
+            'Integer', 'Int', 'InStrC', 'InStrBP', 'InStrB', 'InStr', 'InputBP',
+            'InputBP$', 'InputBox', 'InputBox$', 'InputB', 'InputB$', 'Input',
+            'Input$', 'In', 'IMSetMode', 'Implode', 'Implode$', 'Imp',
+            'IMEStatus', 'If', 'Hour', 'Hex', 'Hex$', 'Goto', 'GoSub',
+            'GetThreadInfo', 'GetFileAttr', 'GetAttr', 'Get', 'Function',
+            'FullTrim', 'From', 'FreeFile', 'Fraction', 'Format', 'Format$',
+            'ForAll', 'For', 'Fix', 'FileLen', 'FileDateTime', 'FileCopy',
+            'FileAttr', 'FALSE', 'Explicit', 'Exp', 'Exit', 'Execute', 'Event',
+            'Evaluate', 'Error', 'Error$', 'Err', 'Erl', 'Erase', 'Eqv', 'EOF',
+            'Environ', 'Environ$', 'End', 'ElseIf', 'Else', 'Double', 'DoEvents',
+            'Do', 'Dir', 'Dir$', 'Dim', 'DestroyLock', 'Delete', 'DefVar',
+            'DefStr', 'DefSng', 'DefLng', 'DefInt', 'DefDbl', 'DefCur',
+            'DefByte', 'DefBool', 'Declare', 'Day', 'DateValue', 'DateSerial',
+            'DateNumber', 'Date', 'Date$', 'DataType', 'CVDate', 'CVar',
+            'Currency', 'CurDrive', 'CurDrive$', 'CurDir', 'CurDir$', 'CStr',
+            'CSng', 'CreateLock', 'Cos', 'Const', 'Compare', 'Command',
+            'Command$', 'CodeUnlock', 'CodeLockCheck', 'CodeLock', 'Close',
+            'CLng', 'Class', 'CInt', 'Chr', 'Chr$', 'ChDrive', 'ChDir', 'CDbl',
+            'CDat', 'CCur', 'CByte', 'CBool', 'Case', 'Call', 'ByVal', 'Byte',
+            'Boolean', 'Bind', 'Binary', 'Bin', 'Bin$', 'Beep', 'Base', 'Atn2',
+            'Atn', 'ASin', 'Asc', 'As', 'ArrayUnique', 'ArrayReplace',
+            'ArrayGetIndex', 'ArrayAppend', 'Append', 'AppActivate', 'Any',
+            'And', 'Alias', 'ActivateApp', 'ACos', 'Access', 'Abs', '%Include',
+            '%If', '%END', '%ElseIf', '%Else'
+            ),
+        2 => array (
+            'NotesXSLTransformer', 'NotesXMLProcessor', 'NotesViewNavigator',
+            'NotesViewEntryCollection', 'NotesViewEntry', 'NotesViewColumn',
+            'NotesView', 'NotesUIWorkspace', 'NotesUIView', 'NotesUIScheduler',
+            'NotesUIDocument', 'NotesUIDatabase', 'NotesTimer', 'NotesStream',
+            'NotesSession', 'NotesSAXParser', 'NotesSAXException',
+            'NotesSAXAttributeList', 'NotesRichTextTable', 'NotesRichTextTab',
+            'NotesRichTextStyle', 'NotesRichTextSection', 'NotesRichTextRange',
+            'NotesRichTextParagraphStyle', 'NotesRichTextNavigator',
+            'NotesRichTextItem', 'NotesRichTextDocLink',
+            'NotesReplicationEntry', 'NotesReplication', 'NotesRegistration',
+            'NotesOutlineEntry', 'NotesOutline', 'NotesNoteCollection',
+            'NotesNewsLetter', 'NotesName', 'NotesMIMEHeader',
+            'NotesMIMEEntity', 'NotesLog', 'NotesItem', 'NotesInternational',
+            'NotesForm', 'NotesEmbeddedObject', 'NotesDXLImporter',
+            'NotesDXLExporter', 'NotesDOMXMLDeclNode', 'NotesDOMTextNode',
+            'NotesDOMProcessingInstructionNode', 'NotesDOMParser',
+            'NotesDOMNotationNode', 'NotesDOMNodeList', 'NotesDOMNode',
+            'NotesDOMNamedNodeMap', 'NotesDOMEntityReferenceNode',
+            'NotesDOMEntityNode', 'NotesDOMElementNode',
+            'NotesDOMDocumentTypeNode', 'NotesDOMDocumentNode',
+            'NotesDOMDocumentFragmentNode', 'NotesDOMCommentNode',
+            'NotesDOMCharacterDataNote', 'NotesDOMCDATASectionNode',
+            'NotesDOMAttributeNode', 'NotesDocumentCollection', 'NotesDocument',
+            'NotesDbDirectory', 'NotesDateTime', 'NotesDateRange',
+            'NotesDatabase', 'NotesColorObject', 'NotesAgent',
+            'NotesAdministrationProcess', 'NotesACLEntry', 'NotesACL',
+            'Navigator', 'Field', 'Button'
+            )
+        ) ,
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000EE;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lscript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lscript.php
new file mode 100644
index 000000000..1a5b0726e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lscript.php
@@ -0,0 +1,387 @@
+<?php
+/*************************************************************************************
+ * lscript.php
+ * ---------
+ * Author: Arendedwinter (admin@arendedwinter.com)
+ * Copyright: (c) 2008 Beau McGuigan (http://www.arendedwinter.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 15/11/2008
+ *
+ * Lightwave Script language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+    //Yes, I'm aware these are out of order,
+    //I had to rearrange and couldn't be bothered changing the numbers...
+        7 => array(
+            '@data', '@define', '@else', '@end', '@fpdepth', '@if', '@include',
+            '@insert', '@library', '@localipc', '@name', '@save', '@script',
+            '@sequence', '@version', '@warnings'
+            ),
+        1 => array(
+            'break', 'case', 'continue', 'else', 'end', 'false', 'for',
+            'foreach', 'if', 'return', 'switch', 'true', 'while',
+            ),
+        3 => array(
+            'active', 'alertlevel', 'alpha', 'alphaprefix', 'animfilename', 'autokeycreate',
+            'backdroptype', 'blue', 'boxthreshold', 'button',
+            'channelsvisible', 'childrenvisible', 'compfg', 'compbg', 'compfgalpha',
+            'coneangles', 'cosine', 'count', 'ctl', 'curFilename', 'curFrame',
+            'currenttime', 'curTime', 'curType',
+            'depth', 'diffshade', 'diffuse', 'dimensions', 'displayopts', 'dynamicupdate',
+            'end', 'eta',
+            'filename', 'flags', 'fogtype', 'fps', 'frame', 'frameend', 'frameheight',
+            'framestart', 'framestep', 'framewidth',
+            'generalopts', 'genus', 'geometry', 'gNorm', 'goal', 'green',
+            'h', 'hasAlpha', 'height',
+            'id', 'innerlimit', 'isColor',
+            'keyCount', 'keys',
+            'limiteregion', 'locked', 'luminous',
+            'maxsamplesperpixel', 'minsamplesperpixel', 'mirror', 'motionx', 'motiony',
+            'name', 'newFilename', 'newFrame', 'newTime', 'newType', 'null', 'numthreads',
+            'objID', 'oPos', 'outerlimit', 'oXfrm',
+            'parent', 'pixel', 'pixelaspect', 'point', 'points', 'pointcount', 'polNum',
+            'polycount', 'polygon', 'polygons', 'postBehavior', 'preBehavior', 'previewend',
+            'previewstart', 'previewstep',
+            'range', 'rawblue', 'rawgreen', 'rawred', 'rayLength', 'raySource', 'red',
+            'reflectblue', 'reflectgreen', 'reflectred', 'recursiondepth', 'renderend',
+            'renderopts', 'renderstart', 'renderstep', 'rendertype', 'restlength',
+            'rgbprefix', 'roughness',
+            'selected', 'setColor', 'setPattern', 'shading', 'shadow', 'shadows',
+            'shadowtype', 'size', 'source', 'special', 'specshade', 'specular',
+            'spotsize', 'start', 'sx', 'sy', 'sz',
+            'target', 'totallayers', 'totalpoints', 'totalpolygons', 'trans', 'transparency',
+            'type',
+            'value', 'view', 'visible', 'visibility',
+            'w', 'width', 'wNorm', 'wPos', 'wXfrm',
+            'x', 'xoffset',
+            'y', 'yoffset',
+            'z'
+            ),
+        4 => array(
+            'addLayer', 'addParticle', 'alphaspot', 'ambient', 'asAsc', 'asBin',
+            'asInt', 'asNum', 'asStr', 'asVec', 'attach', 'axislocks',
+            'backdropColor', 'backdropRay', 'backdropSqueeze', 'bone', 'blurLength',
+            'close', 'color', 'contains', 'copy', 'createKey',
+            'deleteKey', 'detach', 'drawCircle', 'drawLine', 'drawPoint', 'drawText',
+            'drawTriangle',
+            'edit', 'eof', 'event',
+            'firstChannel', 'firstLayer', 'firstSelect', 'focalLength', 'fogColor',
+            'fogMaxAmount', 'fogMaxDist', 'fogMinAmount', 'fogMinDist',
+            'fovAngles', 'fStop', 'firstChild', 'focalDistance',
+            'get', 'getChannelGroup', 'getEnvelope', 'getForward', 'getKeyBias',
+            'getKeyContinuity', 'getKeyCurve', 'getKeyHermite', 'getKeyTension',
+            'getKeyTime', 'getKeyValue', 'getParticle', 'getPivot', 'getPosition',
+            'getRight', 'getRotation', 'getSelect', 'getScaling', 'getTag', 'getTexture',
+            'getUp', 'getValue', 'getWorldPosition', 'getWorldForward', 'getWorldRight',
+            'getWorldRotation', 'getWorldUp', 'globalBlur', 'globalMask', 'globalResolution',
+            'hasCCEnd', 'hasCCStart',
+            'illuminate', 'indexOf', 'isAscii', 'isAlnum', 'isAlpha', 'isBone',
+            'isCamera', 'isChannel', 'isChannelGroup', 'isCntrl', 'isCurve', 'isDigit',
+            'isEnvelope', 'isImage', 'isInt', 'isLight', 'isLower', 'isMapped', 'isMesh',
+            'isNil', 'isNum', 'IsOpen', 'isOriginal', 'isPrint', 'isPunct', 'isScene',
+            'isSpace', 'isStr', 'isUpper', 'isValid', 'isVMap', 'isVec', 'isXDigit',
+            'keyExists',
+            'layer', 'layerName', 'layerVisible', 'limits', 'line', 'linecount', 'load', 'luma',
+            'next', 'nextLayer', 'nextSelect', 'nextChannel', 'nextChild', 'nl',
+            'offset', 'open',
+            'pack', 'param', 'parse', 'paste', 'persist', 'polygonCount', 'position',
+            'rayCast', 'rayTrace', 'read', 'readByte', 'readInt', 'readNumber',
+            'readDouble', 'readShort', 'readString', 'readVector', 'reduce',
+            'remParticle', 'renderCamera', 'reopen', 'replace', 'reset', 'restParam',
+            'rewind', 'rgb', 'rgbambient', 'rgbcolor', 'rgbspot',
+            'save', 'schemaPosition', 'select', 'set', 'setChannelGroup', 'setKeyBias',
+            'setKeyContinuity', 'setKeyCurve',
+            'setKeyHermite', 'setKeyTension', 'setKeyValue', 'setParticle', 'setPoints',
+            'setTag', 'setValue', 'server', 'serverFlags', 'sortA', 'sortD', 'surface',
+            'trunc',
+            'write', 'writeln', 'writeByte', 'writeData', 'writeNumber', 'writeDouble',
+            'writeShort', 'writeString', 'writeVector',
+            'vertex', 'vertexCount',
+            'zoomFactor'
+            ),
+        2 => array(
+            'abs', 'acos', 'angle', 'append', 'ascii', 'asin', 'atan',
+            'binary',
+            'ceil', 'center', 'chdir', 'clearimage', 'cloned', 'comringattach',
+            'comringdecode', 'comringdetach', 'comringencode', 'comringmsg', 'cos',
+            'cosh', 'cot', 'cross2d', 'cross3d', 'csc', 'ctlstring', 'ctlinteger',
+            'ctlnumber', 'ctlvector', 'ctldistance', 'ctlchoice', 'ctltext',
+            'ctlcolor', 'ctlsurface', 'ctlfont', 'ctlpopup', 'ctledit', 'ctlpercent',
+            'ctlangle', 'ctlrgb', 'ctlhsv', 'ctlcheckbox', 'ctlstate', 'ctlfilename',
+            'ctlbutton', 'ctllistbox', 'ctlslider', 'ctlminislider', 'ctlsep', 'ctlimage',
+            'ctltab', 'ctlallitems', 'ctlmeshitems', 'ctlcameraitems', 'ctllightitems',
+            'ctlboneitems', 'ctlimageitems', 'ctlchannel', 'ctlviewport', 'Control_Management',
+            'ctlpage', 'ctlgroup', 'ctlposition', 'ctlactive', 'ctlvisible', 'ctlalign',
+            'ctlrefresh', 'ctlmenu', 'ctlinfo',
+            'date', 'debug', 'deg', 'dot2d', 'dot3d', 'drawborder', 'drawbox', 'drawcircle',
+            'drawelipse', 'drawerase', 'drawfillcircle', 'drawfillelipse', 'drawline',
+            'drawpixel', 'drawtext', 'drawtextwidth', 'drawtextheight', 'dump',
+            'error', 'exp', 'expose', 'extent',
+            'fac', 'filecrc', 'filedelete', 'fileexists', 'filefind', 'filerename',
+            'filestat', 'floor', 'format', 'frac', 'fullpath',
+            'gamma', 'getdir', 'getenv', 'getfile', 'getfirstitem', 'getsep', 'getvalue',
+            'globalrecall', 'globalstore',
+            'hash', 'hex', 'hostBuild', 'hostVersion', 'hypot',
+            'info', 'integer',
+            'library', 'licenseId', 'lscriptVersion', 'load', 'loadimage', 'log', 'log10',
+            'matchdirs', 'matchfiles', 'max', 'min', 'mkdir', 'mod', 'monend', 'moninit', 'monstep',
+            'nil', 'normalize', 'number',
+            'octal', 'overlayglyph',
+            'parse', 'platform', 'pow',
+            'rad', 'random', 'randu', 'range', 'read', 'readdouble', 'readInt', 'readNumber',
+            'readShort', 'recall', 'regexp', 'reqabort', 'reqbegin', 'reqend', 'reqisopen',
+            'reqkeyboard', 'reqopen', 'reqposition', 'reqpost', 'reqredraw',
+            'reqsize', 'reqresize', 'requpdate', 'rmdir', 'round', 'runningUnder',
+            'save', 'sec', 'select', 'selector', 'setdesc', 'setvalue', 'sin', 'sinh', 'size',
+            'sizeof', 'sleep', 'spawn', 'split', 'sqrt', 'step', 'store', 'string', 'strleft',
+            'strlower', 'strright', 'strsub', 'strupper',
+            'tan', 'tanh', 'targetobject', 'terminate', 'text', 'time',
+            'wait', 'warn', 'when', 'write', 'writeDouble', 'writeInt', 'writeNumber', 'writeShort',
+            'var', 'vector', 'visitnodes', 'vmag',
+            ),
+        5 => array(
+            'addcurve', 'addpoint', 'addpolygon', 'addquad', 'addtriangle', 'alignpols',
+            'autoflex', 'axisdrill',
+            'bend', 'bevel', 'boolean', 'boundingbox',
+            'changepart', 'changesurface', 'close', 'closeall', 'cmdseq', 'copy', 'copysurface',
+            'createsurface', 'cut',
+            'deformregion', 'delete',
+            'editbegin', 'editend', 'exit', 'extrude',
+            'fixedflex', 'flip', 'fontclear', 'fontcount', 'fontindex', 'fontload',
+            'fontname', 'fracsubdivide', 'freezecurves',
+            'getdefaultsurface',
+            'jitter',
+            'lathe', 'layerName', 'layerVisible', 'lyrbg', 'lyrdata', 'lyrempty', 'lyremptybg',
+            'lyremptyfg', 'lyrfg', 'lyrsetbg', 'lyrsetfg', 'lyrswap',
+            'magnet', 'make4patch', 'makeball', 'makebox', 'makecone', 'makedisc',
+            'maketesball', 'maketext', 'mergepoints', 'mergepols', 'meshedit', 'mirror',
+            'morphpols', 'move',
+            'new', 'nextsurface',
+            'paste', 'pathclone', 'pathextrude', 'pixel', 'pointcount', 'pointinfo',
+            'pointmove', 'pole', 'polycount', 'polyinfo', 'polynormal', 'polypointcount',
+            'polypoints', 'polysurface',
+            'quantize',
+            'railclone', 'railextrude', 'redo', 'removepols', 'rempoint', 'rempoly',
+            'renamesurface', 'revert', 'rotate',
+            'scale', 'selhide', 'selinvert', 'selmode', 'selpoint', 'selpolygon', 'selunhide',
+            'selectvmap', 'setlayername', 'setobject', 'setpivot', 'setsurface', 'shapebevel',
+            'shear', 'skinpols', 'smooth', 'smoothcurves', 'smoothscale', 'smoothshift',
+            'soliddrill', 'splitpols', 'subdivide', 'swaphidden',
+            'taper', 'triple', 'toggleCCend', 'toggleCCstart', 'togglepatches', 'twist',
+            'undo', 'undogroupend', 'undogroupbegin', 'unifypols', 'unweld',
+            'vortex',
+            'weldaverage', 'weldpoints'
+            ),
+        6 => array(
+            'About', 'AboutOpenGL', 'AdaptiveSampling', 'AdaptiveThreshold',
+            'AddAreaLight', 'AddBone', 'AddButton', 'AddCamera', 'AddChildBone',
+            'AddDistantLight', 'AddEnvelope', 'AddLinearLight', 'AddNull',
+            'AddPartigon', 'AddPlugins', 'AddPointLight', 'AddPosition',
+            'AddRotation', 'AddScale', 'AddSpotlight', 'AddToSelection',
+            'AdjustRegionTool', 'AffectCaustics', 'AffectDiffuse', 'AffectOpenGL',
+            'AffectSpecular', 'AlertLevel', 'AmbientColor', 'AmbientIntensity',
+            'Antialiasing', 'ApertureHeight', 'ApplyServer', 'AreaLight',
+            'AutoConfirm', 'AutoFrameAdvance', 'AutoKey',
+            'BackdropColor', 'BackView', 'BController', 'BLimits', 'BLurLength', 'BoneActive',
+            'BoneFalloffType', 'BoneJointComp', 'BoneJointCompAmounts', 'BoneJointCompParent',
+            'BoneLimitedRange', 'BoneMaxRange', 'BoneMinRange', 'BoneMuscleFlex',
+            'BoneMuscleFlexAmounts', 'BoneMuscleFlexParent', 'BoneNormalization',
+            'BoneRestLength', 'BoneRestPosition', 'BoneRestRotation', 'BoneSource',
+            'BoneStrength', 'BoneStrengthMultiply', 'BoneWeightMapName', 'BoneWeightMapOnly',
+            'BoneWeightShade', 'BoneXRay', 'BottomView', 'BoundingBoxThreshold',
+            'BStiffness',
+            'CacheCaustics', 'CacheRadiosity', 'CacheShadowMap',
+            'CameraMask', 'CameraView', 'CameraZoomTool', 'CastShadow', 'CausticIntensity',
+            'CenterItem', 'CenterMouse', 'ChangeTool', 'ClearAllBones', 'ClearAllCameras',
+            'ClearAllLights', 'ClearAllObjects', 'ClearAudio', 'ClearScene', 'ClearSelected',
+            'Clone', 'CommandHistory', 'CommandInput', 'Compositing', 'ConeAngleTool',
+            'ContentDirectory', 'CreateKey',
+            'DecreaseGrid', 'DeleteKey', 'DepthBufferAA', 'DepthOfField', 'DisplayOptions',
+            'DistantLight', 'DrawAntialiasing', 'DrawBones', 'DrawChildBones', 'DynamicUpdate',
+            'EditBones', 'EditCameras', 'EditKeys', 'EditLights',
+            'EditMenus', 'EditObjects', 'EditPlugins', 'EditServer', 'EnableCaustics',
+            'EnableDeformations', 'EnableIK', 'EnableLensFlares', 'EnableRadiosity', 'EnableServer',
+            'EnableShadowMaps', 'EnableVIPER', 'EnableVolumetricLights', 'EnableXH',
+            'EnableYP', 'EnableZB', 'EnahancedAA', 'ExcludeLight', 'ExcludeObject',
+            'EyeSeparation',
+            'FasterBones', 'FirstFrame', 'FirstItem', 'FitAll', 'FitSelected',
+            'FlareIntensity', 'FlareOptions', 'FocalDistance', 'FogColor', 'FogMaxAmount',
+            'FogMaxDistance', 'FogMinAmount', 'FogMinDistance', 'FogType', 'FractionalFrames',
+            'FrameSize', 'FramesPerSecond', 'FrameStep', 'FreePreview', 'FrontView', 'FullTimeIK',
+            'GeneralOptions', 'Generics', 'GlobalApertureHeight', 'GlobalBlurLength',
+            'GlobalFrameSize', 'GlobalIllumination', 'GlobalMaskPosition', 'GlobalMotionBlur',
+            'GlobalParticleBlur', 'GlobalPixelAspect', 'GlobalResolutionMulitplier', 'GoalItem',
+            'GoalStrength', 'GoToFrame', 'GradientBackdrop', 'GraphEditor', 'GridSize', 'GroundColor',
+            'HController', 'HideToolbar', 'HideWindows', 'HLimits', 'HStiffness',
+            'ImageEditor', 'ImageProcessing', 'IncludeLight', 'IncludeObject', 'IncreaseGrid',
+            'IndirectBounces', 'Item_SetWindowPos', 'ItemActive', 'ItemColor', 'ItemLock',
+            'ItemProperties', 'ItemVisibilty',
+            'KeepGoalWithinReach',
+            'LastFrame', 'LastItem', 'LastPluginInterface', 'Layout_SetWindowPos',
+            'Layout_SetWindowSize', 'LeftView', 'LensFlare', 'LensFStop', 'LightColor',
+            'LightConeAngle', 'LightEdgeAngle', 'LightFalloffType', 'LightIntensity',
+            'LightIntensityTool', 'LightQuality', 'LightRange', 'LightView', 'LimitB',
+            'LimitDynamicRange', 'LimitedRegion', 'LimitH', 'LimitP', 'LinearLight',
+            'LoadAudio', 'LoadFromScene', 'LoadMotion', 'LoadObject', 'LoadObjectLayer',
+            'LoadPreview', 'LoadScene', 'LocalCoordinateSystem',
+            'MakePreview', 'MaskColor', 'MaskPosition', 'MasterPlugins', 'MatchGoalOrientation',
+            'MatteColor', 'MatteObject', 'MetaballResolution', 'Model', 'MorphAmount',
+            'MorphAmountTool', 'MorphMTSE', 'MorphSurfaces', 'MorphTarget', 'MotionBlur',
+            'MotionBlurDOFPreview', 'MotionOptions', 'MovePathTool', 'MovePivotTool', 'MoveTool',
+            'NadirColor', 'NetRender', 'NextFrame', 'NextItem', 'NextKey', 'NextSibling',
+            'NextViewLayout', 'NoiseReduction', 'Numeric',
+            'ObjectDissolve',
+            'ParentCoordinateSystem', 'ParentInPlace', 'ParentItem',
+            'ParticleBlur', 'PathAlignLookAhead', 'PathAlignMaxLookSteps', 'PathAlignReliableDist',
+            'Pause', 'PController', 'PerspectiveView',
+            'PivotPosition', 'PivotRotation', 'PixelAspect', 'PlayAudio', 'PlayBackward',
+            'PlayForward', 'PlayPreview', 'PLimits', 'PointLight', 'PolygonEdgeColor',
+            'PolygonEdgeFlags', 'PolygonEdgeThickness', 'PolygonEdgeZScale', 'PolygonSize',
+            'Position', 'Presets', 'PreviewFirstFrame', 'PreviewFrameStep', 'PreviewLastFrame',
+            'PreviewOptions', 'PreviousFrame', 'PreviousItem', 'PreviousKey', 'PreviousSibling',
+            'PreviousViewLayout', 'PStiffness',
+            'Quit',
+            'RadiosityIntensity', 'RadiosityTolerance', 'RadiosityType', 'RayRecursionLimit',
+            'RayTraceReflection', 'RayTraceShadows',
+            'RayTraceTransparency', 'ReceiveShadow', 'RecentContentDirs', 'RecentScenes',
+            'ReconstructionFilter', 'RecordMaxAngles', 'RecordMinAngles', 'RecordPivotRotation',
+            'RecordRestPosition', 'Redraw', 'RedrawNow', 'Refresh', 'RefreshNow', 'RegionPosition',
+            'RemoveEnvelope', 'RemoveFromSelection', 'RemoveServer', 'Rename', 'RenderFrame',
+            'RenderOptions', 'RenderScene', 'RenderSelected', 'RenderThreads',
+            'ReplaceObjectLayer', 'ReplaceWithNull', 'ReplaceWithObject', 'Reset',
+            'ResolutionMultiplier', 'RestLengthTool', 'RightView', 'RotatePivotTool',
+            'RotateTool', 'Rotation',
+            'SaveAllObjects', 'SaveCommandList', 'SaveCommandMessages',
+            'SaveEndomorph', 'SaveLight', 'SaveLWSC1', 'SaveMotion', 'SaveObject', 'SaveObjectCopy',
+            'SavePreview', 'SaveScene', 'SaveSceneAs', 'SaveSceneCopy', 'SaveTransformed',
+            'SaveViewLayout', 'Scale', 'Scene_SetWindowPos', 'Scene_SetWindowSize',
+            'SceneEditor', 'SchematicPosition', 'SchematicView', 'SelectAllBones',
+            'SelectAllCameras', 'SelectAllLights', 'SelectAllObjects', 'SelectByName',
+            'SelectChild', 'SelectItem', 'SelectParent', 'SelfShadow', 'ShadowColor',
+            'ShadowExclusion', 'ShadowMapAngle', 'ShadowMapFitCone', 'ShadowMapFuzziness',
+            'ShadowMapSize', 'ShadowType', 'ShowCages', 'ShowFieldChart', 'ShowHandles',
+            'ShowIKChains', 'ShowMotionPaths', 'ShowSafeAreas', 'ShowTargetLines',
+            'ShrinkEdgesWithDistance', 'SingleView', 'SizeTool', 'SkelegonsToBones', 'SkyColor',
+            'Spotlight', 'SquashTool', 'Statistics', 'StatusMsg', 'Stereoscopic', 'StretchTool',
+            'SubdivisionOrder', 'SubPatchLevel', 'SurfaceEditor', 'Synchronize',
+            'TargetItem', 'TopView',
+            'UnaffectedByFog', 'UnaffectedByIK', 'Undo', 'UnseenByAlphaChannel', 'UnseenByCamera',
+            'UnseenByRays', 'UseGlobalResolution', 'UseGlobalBlur', 'UseGlobalMask',
+            'UseMorphedPositions',
+            'ViewLayout', 'VIPER', 'VolumetricLighting',
+            'VolumetricLightingOptions', 'VolumetricRadiosity', 'Volumetrics',
+            'WorldCoordinateSystem',
+            'XYView', 'XZView',
+            'ZenithColor', 'ZoomFactor', 'ZoomIn', 'ZoomInX2', 'ZoomOut', 'ZoomOutX2', 'ZYView',
+            'Camera', 'Channel', 'ChannelGroup', 'Envelope', 'File', 'Glyph', 'Icon', 'Image',
+            'Light', 'Mesh', 'Scene', 'Surface', 'VMap'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '<', '>', '+', '-', '*', '/', '!', '%', '&', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #FF6820; font-weight: bold;', //LS_COMMANDS
+            3 => 'color: #007F7F; font-weight: bold;', //LS_MEMBERS
+            4 => 'color: #800080; font-weight: bold;', //LS_METHODS
+            5 => 'color: #51BD95; font-weight: bold;', //LS_MODELER
+            6 => 'color: #416F85; font-weight: bold;', //LS_GENERAL
+            7 => 'color: #C92929; font-weight: bold;'  //LS_COMMANDS (cont)
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #7F7F7F;',
+            'MULTI' => 'color: #7F7F7F;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00C800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #6953AC;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0040A0;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\.)'
+                )
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lsl2.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lsl2.php
new file mode 100644
index 000000000..0b62ee8b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lsl2.php
@@ -0,0 +1,898 @@
+<?php
+/*************************************************************************************
+ * lsl2.php
+ * --------
+ * Author: William Fry (william.fry@nyu.edu)
+ * Copyright: (c) 2009 William Fry
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/02/04
+ *
+ * Linden Scripting Language (LSL2) language file for GeSHi.
+ *
+ *   Data derived and validated against the following:
+ *      http://wiki.secondlife.com/wiki/LSL_Portal
+ *      http://www.lslwiki.net/lslwiki/wakka.php?wakka=HomePage
+ *      http://rpgstats.com/wiki/index.php?title=Main_Page
+ *
+ * CHANGES
+ * -------
+ * 2009/02/05 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2009/02/05)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'LSL2',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // flow control
+            'do',
+            'else',
+            'for',
+            'if',
+            'jump',
+            'return',
+            'state',
+            'while',
+            ),
+        2 => array( // manifest constants
+            'ACTIVE',
+            'AGENT',
+            'AGENT_ALWAYS_RUN',
+            'AGENT_ATTACHMENTS',
+            'AGENT_AWAY',
+            'AGENT_BUSY',
+            'AGENT_CROUCHING',
+            'AGENT_FLYING',
+            'AGENT_IN_AIR',
+            'AGENT_MOUSELOOK',
+            'AGENT_ON_OBJECT',
+            'AGENT_SCRIPTED',
+            'AGENT_SITTING',
+            'AGENT_TYPING',
+            'AGENT_WALKING',
+            'ALL_SIDES',
+            'ANIM_ON',
+            'ATTACH_BACK',
+            'ATTACH_BELLY',
+            'ATTACH_CHEST',
+            'ATTACH_CHIN',
+            'ATTACH_HEAD',
+            'ATTACH_HUD_BOTTOM',
+            'ATTACH_HUD_BOTTOM_LEFT',
+            'ATTACH_HUD_BOTTOM_RIGHT',
+            'ATTACH_HUD_CENTER_1',
+            'ATTACH_HUD_CENTER_2',
+            'ATTACH_HUD_TOP_CENTER',
+            'ATTACH_HUD_TOP_LEFT',
+            'ATTACH_HUD_TOP_RIGHT',
+            'ATTACH_LEAR',
+            'ATTACH_LEYE',
+            'ATTACH_LFOOT',
+            'ATTACH_LHAND',
+            'ATTACH_LHIP',
+            'ATTACH_LLARM',
+            'ATTACH_LLLEG',
+            'ATTACH_LPEC',
+            'ATTACH_LSHOULDER',
+            'ATTACH_LUARM',
+            'ATTACH_LULEG',
+            'ATTACH_MOUTH',
+            'ATTACH_NOSE',
+            'ATTACH_PELVIS',
+            'ATTACH_REAR',
+            'ATTACH_REYE',
+            'ATTACH_RFOOT',
+            'ATTACH_RHAND',
+            'ATTACH_RHIP',
+            'ATTACH_RLARM',
+            'ATTACH_RLLEG',
+            'ATTACH_RPEC',
+            'ATTACH_RSHOULDER',
+            'ATTACH_RUARM',
+            'ATTACH_RULEG',
+            'CAMERA_ACTIVE',
+            'CAMERA_BEHINDNESS_ANGLE',
+            'CAMERA_BEHINDNESS_LAG',
+            'CAMERA_DISTANCE',
+            'CAMERA_FOCUS',
+            'CAMERA_FOCUS_LAG',
+            'CAMERA_FOCUS_LOCKED',
+            'CAMERA_FOCUS_OFFSET',
+            'CAMERA_FOCUS_THRESHOLD',
+            'CAMERA_PITCH',
+            'CAMERA_POSITION',
+            'CAMERA_POSITION_LAG',
+            'CAMERA_POSITION_LOCKED',
+            'CAMERA_POSITION_THRESHOLD',
+            'CHANGED_ALLOWED_DROP',
+            'CHANGED_COLOR',
+            'CHANGED_INVENTORY',
+            'CHANGED_LINK',
+            'CHANGED_OWNER',
+            'CHANGED_REGION',
+            'CHANGED_SCALE',
+            'CHANGED_SHAPE',
+            'CHANGED_TELEPORT',
+            'CHANGED_TEXTURE',
+            'CLICK_ACTION_NONE',
+            'CLICK_ACTION_OPEN',
+            'CLICK_ACTION_OPEN_MEDIA',
+            'CLICK_ACTION_PAY',
+            'CLICK_ACTION_SIT',
+            'CLICK_ACTION_TOUCH',
+            'CONTROL_BACK',
+            'CONTROL_DOWN',
+            'CONTROL_FWD',
+            'CONTROL_LBUTTON',
+            'CONTROL_LEFT',
+            'CONTROL_ML_LBUTTON',
+            'CONTROL_RIGHT',
+            'CONTROL_ROT_LEFT',
+            'CONTROL_ROT_RIGHT',
+            'CONTROL_UP',
+            'DATA_BORN',
+            'DATA_NAME',
+            'DATA_ONLINE',
+            'DATA_PAYINFO',
+            'DATA_RATING',
+            'DATA_SIM_POS',
+            'DATA_SIM_RATING',
+            'DATA_SIM_STATUS',
+            'DEBUG_CHANNEL',
+            'DEG_TO_RAD',
+            'EOF',
+            'FALSE',
+            'HTTP_BODY_MAXLENGTH',
+            'HTTP_BODY_TRUNCATED',
+            'HTTP_METHOD',
+            'HTTP_MIMETYPE',
+            'HTTP_VERIFY_CERT',
+            'INVENTORY_ALL',
+            'INVENTORY_ANIMATION',
+            'INVENTORY_BODYPART',
+            'INVENTORY_CLOTHING',
+            'INVENTORY_GESTURE',
+            'INVENTORY_LANDMARK',
+            'INVENTORY_NONE',
+            'INVENTORY_NOTECARD',
+            'INVENTORY_OBJECT',
+            'INVENTORY_SCRIPT',
+            'INVENTORY_SOUND',
+            'INVENTORY_TEXTURE',
+            'LAND_LEVEL',
+            'LAND_LOWER',
+            'LAND_NOISE',
+            'LAND_RAISE',
+            'LAND_REVERT',
+            'LAND_SMOOTH',
+            'LINK_ALL_CHILDREN',
+            'LINK_ALL_OTHERS',
+            'LINK_ROOT',
+            'LINK_SET',
+            'LINK_THIS',
+            'LIST_STAT_GEOMETRIC_MEAN',
+            'LIST_STAT_MAX',
+            'LIST_STAT_MEAN',
+            'LIST_STAT_MEDIAN',
+            'LIST_STAT_MIN',
+            'LIST_STAT_NUM_COUNT',
+            'LIST_STAT_RANGE',
+            'LIST_STAT_STD_DEV',
+            'LIST_STAT_SUM',
+            'LIST_STAT_SUM_SQUARES',
+            'LOOP',
+            'MASK_BASE',
+            'MASK_EVERYONE',
+            'MASK_GROUP',
+            'MASK_NEXT',
+            'MASK_OWNER',
+            'NULL_KEY',
+            'OBJECT_CREATOR',
+            'OBJECT_DESC',
+            'OBJECT_GROUP',
+            'OBJECT_NAME',
+            'OBJECT_OWNER',
+            'OBJECT_POS',
+            'OBJECT_ROT',
+            'OBJECT_UNKNOWN_DETAIL',
+            'OBJECT_VELOCITY',
+            'PARCEL_DETAILS_AREA',
+            'PARCEL_DETAILS_DESC',
+            'PARCEL_DETAILS_GROUP',
+            'PARCEL_DETAILS_NAME',
+            'PARCEL_DETAILS_OWNER',
+            'PARCEL_FLAG_ALLOW_ALL_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_CREATE_GROUP_OBJECTS',
+            'PARCEL_FLAG_ALLOW_CREATE_OBJECTS',
+            'PARCEL_FLAG_ALLOW_DAMAGE',
+            'PARCEL_FLAG_ALLOW_FLY',
+            'PARCEL_FLAG_ALLOW_GROUP_OBJECT_ENTRY',
+            'PARCEL_FLAG_ALLOW_GROUP_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_LANDMARK',
+            'PARCEL_FLAG_ALLOW_SCRIPTS',
+            'PARCEL_FLAG_ALLOW_TERRAFORM',
+            'PARCEL_FLAG_LOCAL_SOUND_ONLY',
+            'PARCEL_FLAG_RESTRICT_PUSHOBJECT',
+            'PARCEL_FLAG_USE_ACCESS_GROUP',
+            'PARCEL_FLAG_USE_ACCESS_LIST',
+            'PARCEL_FLAG_USE_BAN_LIST',
+            'PARCEL_FLAG_USE_LAND_PASS_LIST',
+            'PARCEL_MEDIA_COMMAND_AGENT',
+            'PARCEL_MEDIA_COMMAND_AUTO_ALIGN',
+            'PARCEL_MEDIA_COMMAND_DESC',
+            'PARCEL_MEDIA_COMMAND_LOOP_SET',
+            'PARCEL_MEDIA_COMMAND_PAUSE',
+            'PARCEL_MEDIA_COMMAND_PLAY',
+            'PARCEL_MEDIA_COMMAND_SIZE',
+            'PARCEL_MEDIA_COMMAND_STOP',
+            'PARCEL_MEDIA_COMMAND_TEXTURE',
+            'PARCEL_MEDIA_COMMAND_TIME',
+            'PARCEL_MEDIA_COMMAND_TYPE',
+            'PARCEL_MEDIA_COMMAND_URL',
+            'PASSIVE',
+            'PAYMENT_INFO_ON_FILE',
+            'PAYMENT_INFO_USED',
+            'PAY_DEFAULT',
+            'PAY_HIDE',
+            'PERMISSION_ATTACH',
+            'PERMISSION_CHANGE_LINKS',
+            'PERMISSION_CONTROL_CAMERA',
+            'PERMISSION_DEBIT',
+            'PERMISSION_TAKE_CONTROLS',
+            'PERMISSION_TRACK_CAMERA',
+            'PERMISSION_TRIGGER_ANIMATION',
+            'PERM_ALL',
+            'PERM_COPY',
+            'PERM_MODIFY',
+            'PERM_MOVE',
+            'PERM_TRANSFER',
+            'PI',
+            'PI_BY_TWO',
+            'PRIM_BUMP_BARK',
+            'PRIM_BUMP_BLOBS',
+            'PRIM_BUMP_BRICKS',
+            'PRIM_BUMP_BRIGHT',
+            'PRIM_BUMP_CHECKER',
+            'PRIM_BUMP_CONCRETE',
+            'PRIM_BUMP_DARK',
+            'PRIM_BUMP_DISKS',
+            'PRIM_BUMP_GRAVEL',
+            'PRIM_BUMP_LARGETILE',
+            'PRIM_BUMP_NONE',
+            'PRIM_BUMP_SHINY',
+            'PRIM_BUMP_SIDING',
+            'PRIM_BUMP_STONE',
+            'PRIM_BUMP_STUCCO',
+            'PRIM_BUMP_SUCTION',
+            'PRIM_BUMP_TILE',
+            'PRIM_BUMP_WEAVE',
+            'PRIM_BUMP_WOOD',
+            'PRIM_COLOR',
+            'PRIM_FULLBRIGHT',
+            'PRIM_HOLE_CIRCLE',
+            'PRIM_HOLE_DEFAULT',
+            'PRIM_HOLE_SQUARE',
+            'PRIM_HOLE_TRIANGLE',
+            'PRIM_MATERIAL',
+            'PRIM_MATERIAL_FLESH',
+            'PRIM_MATERIAL_GLASS',
+            'PRIM_MATERIAL_LIGHT',
+            'PRIM_MATERIAL_METAL',
+            'PRIM_MATERIAL_PLASTIC',
+            'PRIM_MATERIAL_RUBBER',
+            'PRIM_MATERIAL_STONE',
+            'PRIM_MATERIAL_WOOD',
+            'PRIM_PHANTOM',
+            'PRIM_PHYSICS',
+            'PRIM_POSITION',
+            'PRIM_ROTATION',
+            'PRIM_SHINY_HIGH',
+            'PRIM_SHINY_LOW',
+            'PRIM_SHINY_MEDIUM',
+            'PRIM_SHINY_NONE',
+            'PRIM_SIZE',
+            'PRIM_TEMP_ON_REZ',
+            'PRIM_TEXTURE',
+            'PRIM_TYPE',
+            'PRIM_TYPE_BOX',
+            'PRIM_TYPE_CYLINDER',
+            'PRIM_TYPE_PRISM',
+            'PRIM_TYPE_RING',
+            'PRIM_TYPE_SPHERE',
+            'PRIM_TYPE_TORUS',
+            'PRIM_TYPE_TUBE',
+            'PSYS_PART_BOUNCE_MASK',
+            'PSYS_PART_EMISSIVE_MASK',
+            'PSYS_PART_END_ALPHA',
+            'PSYS_PART_END_COLOR',
+            'PSYS_PART_END_SCALE',
+            'PSYS_PART_FLAGS',
+            'PSYS_PART_FOLLOW_SRC_MASK',
+            'PSYS_PART_FOLLOW_VELOCITY_MASK',
+            'PSYS_PART_INTERP_COLOR_MASK',
+            'PSYS_PART_INTERP_SCALE_MASK',
+            'PSYS_PART_MAX_AGE',
+            'PSYS_PART_START_ALPHA',
+            'PSYS_PART_START_COLOR',
+            'PSYS_PART_START_SCALE',
+            'PSYS_PART_TARGET_LINEAR_MASK',
+            'PSYS_PART_TARGET_POS_MASK',
+            'PSYS_PART_WIND_MASK',
+            'PSYS_SRC_ACCEL',
+            'PSYS_SRC_ANGLE_BEGIN',
+            'PSYS_SRC_ANGLE_END',
+            'PSYS_SRC_BURST_PART_COUNT',
+            'PSYS_SRC_BURST_RADIUS',
+            'PSYS_SRC_BURST_RATE',
+            'PSYS_SRC_BURST_SPEED_MAX',
+            'PSYS_SRC_BURST_SPEED_MIN',
+            'PSYS_SRC_INNERANGLE',
+            'PSYS_SRC_MAX_AGE',
+            'PSYS_SRC_OMEGA',
+            'PSYS_SRC_OUTERANGLE',
+            'PSYS_SRC_PATTERN',
+            'PSYS_SRC_PATTERN_ANGLE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE',
+            'PSYS_SRC_PATTERN_ANGLE_CONE_EMPTY',
+            'PSYS_SRC_PATTERN_DROP',
+            'PSYS_SRC_PATTERN_EXPLODE',
+            'PSYS_SRC_TARGET_KEY',
+            'PSYS_SRC_TEXTURE',
+            'RAD_TO_DEG',
+            'REMOTE_DATA_CHANNEL',
+            'REMOTE_DATA_REQUEST',
+            'SCRIPTED',
+            'SQRT2',
+            'STATUS_BLOCK_GRAB',
+            'STATUS_DIE_AT_EDGE',
+            'STATUS_PHANTOM',
+            'STATUS_PHYSICS',
+            'STATUS_RETURN_AT_EDGE',
+            'STATUS_ROTATE_X',
+            'STATUS_ROTATE_Y',
+            'STATUS_ROTATE_Z',
+            'STATUS_SANDBOX',
+            'TRUE',
+            'TWO_PI',
+            'VEHICLE_ANGULAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_ANGULAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_ANGULAR_FRICTION_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_ANGULAR_MOTOR_DIRECTION',
+            'VEHICLE_ANGULAR_MOTOR_TIMESCALE',
+            'VEHICLE_BANKING_EFFICIENCY',
+            'VEHICLE_BANKING_MIX',
+            'VEHICLE_BANKING_TIMESCALE',
+            'VEHICLE_BUOYANCY',
+            'VEHICLE_FLAG_CAMERA_DECOUPLED',
+            'VEHICLE_FLAG_HOVER_GLOBAL_HEIGHT',
+            'VEHICLE_FLAG_HOVER_TERRAIN_ONLY',
+            'VEHICLE_FLAG_HOVER_UP_ONLY',
+            'VEHICLE_FLAG_HOVER_WATER_ONLY',
+            'VEHICLE_FLAG_LIMIT_MOTOR_UP',
+            'VEHICLE_FLAG_LIMIT_ROLL_ONLY',
+            'VEHICLE_FLAG_MOUSELOOK_BANK',
+            'VEHICLE_FLAG_MOUSELOOK_STEER',
+            'VEHICLE_FLAG_NO_DEFLECTION_UP',
+            'VEHICLE_HOVER_EFFICIENCY',
+            'VEHICLE_HOVER_HEIGHT',
+            'VEHICLE_HOVER_TIMESCALE',
+            'VEHICLE_LINEAR_DEFLECTION_EFFICIENCY',
+            'VEHICLE_LINEAR_DEFLECTION_TIMESCALE',
+            'VEHICLE_LINEAR_FRICTION_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DECAY_TIMESCALE',
+            'VEHICLE_LINEAR_MOTOR_DIRECTION',
+            'VEHICLE_LINEAR_MOTOR_OFFSET',
+            'VEHICLE_LINEAR_MOTOR_TIMESCALE',
+            'VEHICLE_REFERENCE_FRAME',
+            'VEHICLE_TYPE_AIRPLANE',
+            'VEHICLE_TYPE_BALLOON',
+            'VEHICLE_TYPE_BOAT',
+            'VEHICLE_TYPE_CAR',
+            'VEHICLE_TYPE_NONE',
+            'VEHICLE_TYPE_SLED',
+            'VEHICLE_VERTICAL_ATTRACTION_EFFICIENCY',
+            'VEHICLE_VERTICAL_ATTRACTION_TIMESCALE',
+            'ZERO_ROTATION',
+            'ZERO_VECTOR',
+            ),
+        3 => array( // handlers
+            'at_rot_target',
+            'at_target',
+            'attached',
+            'changed',
+            'collision',
+            'collision_end',
+            'collision_start',
+            'control',
+            'dataserver',
+            'email',
+            'http_response',
+            'land_collision',
+            'land_collision_end',
+            'land_collision_start',
+            'link_message',
+            'listen',
+            'money',
+            'moving_end',
+            'moving_start',
+            'no_sensor',
+            'not_at_rot_target',
+            'not_at_target',
+            'object_rez',
+            'on_rez',
+            'remote_data',
+            'run_time_permissions',
+            'sensor',
+            'state_entry',
+            'state_exit',
+            'timer',
+            'touch',
+            'touch_end',
+            'touch_start',
+            ),
+        4 => array( // data types
+            'float',
+            'integer',
+            'key',
+            'list',
+            'rotation',
+            'string',
+            'vector',
+            ),
+        5 => array( // library
+            'default',
+            'llAbs',
+            'llAcos',
+            'llAddToLandBanList',
+            'llAddToLandPassList',
+            'llAdjustSoundVolume',
+            'llAllowInventoryDrop',
+            'llAngleBetween',
+            'llApplyImpulse',
+            'llApplyRotationalImpulse',
+            'llAsin',
+            'llAtan2',
+            'llAttachToAvatar',
+            'llAvatarOnSitTarget',
+            'llAxes2Rot',
+            'llAxisAngle2Rot',
+            'llBase64ToInteger',
+            'llBase64ToString',
+            'llBreakAllLinks',
+            'llBreakLink',
+            'llCeil',
+            'llClearCameraParams',
+            'llCloseRemoteDataChannel',
+            'llCloud',
+            'llCollisionFilter',
+            'llCollisionSound',
+            'llCollisionSprite',
+            'llCos',
+            'llCreateLink',
+            'llCSV2List',
+            'llDeleteSubList',
+            'llDeleteSubString',
+            'llDetachFromAvatar',
+            'llDetectedGrab',
+            'llDetectedGroup',
+            'llDetectedKey',
+            'llDetectedLinkNumber',
+            'llDetectedName',
+            'llDetectedOwner',
+            'llDetectedPos',
+            'llDetectedRot',
+            'llDetectedTouchBinormal',
+            'llDetectedTouchFace',
+            'llDetectedTouchNormal',
+            'llDetectedTouchPos',
+            'llDetectedTouchST',
+            'llDetectedTouchUV',
+            'llDetectedType',
+            'llDetectedVel',
+            'llDialog',
+            'llDie',
+            'llDumpList2String',
+            'llEdgeOfWorld',
+            'llEjectFromLand',
+            'llEmail',
+            'llEscapeURL',
+            'llEuler2Rot',
+            'llFabs',
+            'llFloor',
+            'llForceMouselook',
+            'llFrand',
+            'llGetAccel',
+            'llGetAgentInfo',
+            'llGetAgentLanguage',
+            'llGetAgentSize',
+            'llGetAlpha',
+            'llGetAndResetTime',
+            'llGetAnimation',
+            'llGetAnimationList',
+            'llGetAttached',
+            'llGetBoundingBox',
+            'llGetCameraPos',
+            'llGetCameraRot',
+            'llGetCenterOfMass',
+            'llGetColor',
+            'llGetCreator',
+            'llGetDate',
+            'llGetEnergy',
+            'llGetForce',
+            'llGetFreeMemory',
+            'llGetGeometricCenter',
+            'llGetGMTclock',
+            'llGetInventoryCreator',
+            'llGetInventoryKey',
+            'llGetInventoryName',
+            'llGetInventoryNumber',
+            'llGetInventoryPermMask',
+            'llGetInventoryType',
+            'llGetKey',
+            'llGetLandOwnerAt',
+            'llGetLinkKey',
+            'llGetLinkName',
+            'llGetLinkNumber',
+            'llGetListEntryType',
+            'llGetListLength',
+            'llGetLocalPos',
+            'llGetLocalRot',
+            'llGetMass',
+            'llGetNextEmail',
+            'llGetNotecardLine',
+            'llGetNumberOfNotecardLines',
+            'llGetNumberOfPrims',
+            'llGetNumberOfSides',
+            'llGetObjectDesc',
+            'llGetObjectDetails',
+            'llGetObjectMass',
+            'llGetObjectName',
+            'llGetObjectPermMask',
+            'llGetObjectPrimCount',
+            'llGetOmega',
+            'llGetOwner',
+            'llGetOwnerKey',
+            'llGetParcelDetails',
+            'llGetParcelFlags',
+            'llGetParcelMaxPrims',
+            'llGetParcelPrimCount',
+            'llGetParcelPrimOwners',
+            'llGetPermissions',
+            'llGetPermissionsKey',
+            'llGetPos',
+            'llGetPrimitiveParams',
+            'llGetRegionAgentCount',
+            'llGetRegionCorner',
+            'llGetRegionFlags',
+            'llGetRegionFPS',
+            'llGetRegionName',
+            'llGetRegionTimeDilation',
+            'llGetRootPosition',
+            'llGetRootRotation',
+            'llGetRot',
+            'llGetScale',
+            'llGetScriptName',
+            'llGetScriptState',
+            'llGetSimulatorHostname',
+            'llGetStartParameter',
+            'llGetStatus',
+            'llGetSubString',
+            'llGetSunDirection',
+            'llGetTexture',
+            'llGetTextureOffset',
+            'llGetTextureRot',
+            'llGetTextureScale',
+            'llGetTime',
+            'llGetTimeOfDay',
+            'llGetTimestamp',
+            'llGetTorque',
+            'llGetUnixTime',
+            'llGetVel',
+            'llGetWallclock',
+            'llGiveInventory',
+            'llGiveInventoryList',
+            'llGiveMoney',
+            'llGround',
+            'llGroundContour',
+            'llGroundNormal',
+            'llGroundRepel',
+            'llGroundSlope',
+            'llHTTPRequest',
+            'llInsertString',
+            'llInstantMessage',
+            'llIntegerToBase64',
+            'llKey2Name',
+            'llList2CSV',
+            'llList2Float',
+            'llList2Integer',
+            'llList2Key',
+            'llList2List',
+            'llList2ListStrided',
+            'llList2Rot',
+            'llList2String',
+            'llList2Vector',
+            'llListen',
+            'llListenControl',
+            'llListenRemove',
+            'llListFindList',
+            'llListInsertList',
+            'llListRandomize',
+            'llListReplaceList',
+            'llListSort',
+            'llListStatistics',
+            'llLoadURL',
+            'llLog',
+            'llLog10',
+            'llLookAt',
+            'llLoopSound',
+            'llLoopSoundMaster',
+            'llLoopSoundSlave',
+            'llMapDestination',
+            'llMD5String',
+            'llMessageLinked',
+            'llMinEventDelay',
+            'llModifyLand',
+            'llModPow',
+            'llMoveToTarget',
+            'llOffsetTexture',
+            'llOpenRemoteDataChannel',
+            'llOverMyLand',
+            'llOwnerSay',
+            'llParcelMediaCommandList',
+            'llParcelMediaQuery',
+            'llParseString2List',
+            'llParseStringKeepNulls',
+            'llParticleSystem',
+            'llPassCollisions',
+            'llPassTouches',
+            'llPlaySound',
+            'llPlaySoundSlave',
+            'llPow',
+            'llPreloadSound',
+            'llPushObject',
+            'llRegionSay',
+            'llReleaseControls',
+            'llRemoteDataReply',
+            'llRemoteDataSetRegion',
+            'llRemoteLoadScriptPin',
+            'llRemoveFromLandBanList',
+            'llRemoveFromLandPassList',
+            'llRemoveInventory',
+            'llRemoveVehicleFlags',
+            'llRequestAgentData',
+            'llRequestInventoryData',
+            'llRequestPermissions',
+            'llRequestSimulatorData',
+            'llResetLandBanList',
+            'llResetLandPassList',
+            'llResetOtherScript',
+            'llResetScript',
+            'llResetTime',
+            'llRezAtRoot',
+            'llRezObject',
+            'llRot2Angle',
+            'llRot2Axis',
+            'llRot2Euler',
+            'llRot2Fwd',
+            'llRot2Left',
+            'llRot2Up',
+            'llRotateTexture',
+            'llRotBetween',
+            'llRotLookAt',
+            'llRotTarget',
+            'llRotTargetRemove',
+            'llRound',
+            'llSameGroup',
+            'llSay',
+            'llScaleTexture',
+            'llScriptDanger',
+            'llSendRemoteData',
+            'llSensor',
+            'llSensorRemove',
+            'llSensorRepeat',
+            'llSetAlpha',
+            'llSetBuoyancy',
+            'llSetCameraAtOffset',
+            'llSetCameraEyeOffset',
+            'llSetCameraParams',
+            'llSetClickAction',
+            'llSetColor',
+            'llSetDamage',
+            'llSetForce',
+            'llSetForceAndTorque',
+            'llSetHoverHeight',
+            'llSetLinkAlpha',
+            'llSetLinkColor',
+            'llSetLinkPrimitiveParams',
+            'llSetLinkTexture',
+            'llSetLocalRot',
+            'llSetObjectDesc',
+            'llSetObjectName',
+            'llSetParcelMusicURL',
+            'llSetPayPrice',
+            'llSetPos',
+            'llSetPrimitiveParams',
+            'llSetRemoteScriptAccessPin',
+            'llSetRot',
+            'llSetScale',
+            'llSetScriptState',
+            'llSetSitText',
+            'llSetSoundQueueing',
+            'llSetSoundRadius',
+            'llSetStatus',
+            'llSetText',
+            'llSetTexture',
+            'llSetTextureAnim',
+            'llSetTimerEvent',
+            'llSetTorque',
+            'llSetTouchText',
+            'llSetVehicleFlags',
+            'llSetVehicleFloatParam',
+            'llSetVehicleRotationParam',
+            'llSetVehicleType',
+            'llSetVehicleVectorParam',
+            'llSHA1String',
+            'llShout',
+            'llSin',
+            'llSitTarget',
+            'llSleep',
+            'llSqrt',
+            'llStartAnimation',
+            'llStopAnimation',
+            'llStopHover',
+            'llStopLookAt',
+            'llStopMoveToTarget',
+            'llStopSound',
+            'llStringLength',
+            'llStringToBase64',
+            'llStringTrim',
+            'llSubStringIndex',
+            'llTakeControls',
+            'llTan',
+            'llTarget',
+            'llTargetOmega',
+            'llTargetRemove',
+            'llTeleportAgentHome',
+            'llToLower',
+            'llToUpper',
+            'llTriggerSound',
+            'llTriggerSoundLimited',
+            'llUnescapeURL',
+            'llUnSit',
+            'llVecDist',
+            'llVecMag',
+            'llVecNorm',
+            'llVolumeDetect',
+            'llWater',
+            'llWhisper',
+            'llWind',
+            'llXorBase64StringsCorrect',
+            ),
+        6 => array( // deprecated
+            'llMakeExplosion',
+            'llMakeFire',
+            'llMakeFountain',
+            'llMakeSmoke',
+            'llSound',
+            'llSoundPreload',
+            'llXorBase64Strings',
+            ),
+        7 => array( // unimplemented
+            'llPointAt',
+            'llRefreshPrimURL',
+            'llReleaseCamera',
+            'llRemoteLoadScript',
+            'llSetPrimURL',
+            'llStopPointAt',
+            'llTakeCamera',
+            'llTextBox',
+            ),
+        8 => array( // God mode
+            'llGodLikeRezObject',
+            'llSetInventoryPermMask',
+            'llSetObjectPermMask',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '(', ')', '[', ']',
+        '=', '+', '-', '*', '/',
+        '+=', '-=', '*=', '/=', '++', '--',
+        '!', '%', '&amp;', '|', '&amp;&amp;', '||',
+        '==', '!=', '&lt;', '&gt;', '&lt;=', '&gt;=',
+        '~', '&lt;&lt;', '&gt;&gt;', '^', ':',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #000080;',
+            3 => 'color: #008080;',
+            4 => 'color: #228b22;',
+            5 => 'color: #b22222;',
+            6 => 'color: #8b0000; background-color: #ffff00;',
+            7 => 'color: #8b0000; background-color: #fa8072;',
+            8 => 'color: #000000; background-color: #ba55d3;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff7f50; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #006400;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        4 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        5 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        6 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        7 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        8 => 'http://www.lslwiki.net/lslwiki/wakka.php?wakka={FNAME}', // http://wiki.secondlife.com/wiki/{FNAME}
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lua.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lua.php
new file mode 100644
index 000000000..f85086bb2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/lua.php
@@ -0,0 +1,137 @@
+<?php
+/*************************************************************************************
+ * lua.php
+ * -------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/10
+ *
+ * LUA language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/26 (1.0.2)
+ *  -  Added support for objects and methods
+ *  -  Removed unusable keywords
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Lua',
+    'COMMENT_SINGLE' => array(1 => "--"),
+    'COMMENT_MULTI' => array('--[[' => ']]'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and','break','do','else','elseif','end','false','for','function','if',
+            'in','local','nil','not','or','repeat','return','then','true','until','while',
+            '_VERSION','assert','collectgarbage','dofile','error','gcinfo','loadfile','loadstring',
+            'print','tonumber','tostring','type','unpack',
+            '_ALERT','_ERRORMESSAGE','_INPUT','_PROMPT','_OUTPUT',
+            '_STDERR','_STDIN','_STDOUT','call','dostring','foreach','foreachi','getn','globals','newtype',
+            'rawget','rawset','require','sort','tinsert','tremove',
+            'abs','acos','asin','atan','atan2','ceil','cos','deg','exp',
+            'floor','format','frexp','gsub','ldexp','log','log10','max','min','mod','rad','random','randomseed',
+            'sin','sqrt','strbyte','strchar','strfind','strlen','strlower','strrep','strsub','strupper','tan',
+            'openfile','closefile','readfrom','writeto','appendto',
+            'remove','rename','flush','seek','tmpfile','tmpname','read','write',
+            'clock','date','difftime','execute','exit','getenv','setlocale','time',
+            '_G','getfenv','getmetatable','ipairs','loadlib','next','pairs','pcall',
+            'rawegal','setfenv','setmetatable','xpcall',
+            'string.byte','string.char','string.dump','string.find','string.len',
+            'string.lower','string.rep','string.sub','string.upper','string.format','string.gfind','string.gsub',
+            'table.concat','table.foreach','table.foreachi','table.getn','table.sort','table.insert','table.remove','table.setn',
+            'math.abs','math.acos','math.asin','math.atan','math.atan2','math.ceil','math.cos','math.deg','math.exp',
+            'math.floor','math.frexp','math.ldexp','math.log','math.log10','math.max','math.min','math.mod',
+            'math.pi','math.rad','math.random','math.randomseed','math.sin','math.sqrt','math.tan',
+            'coroutine.create','coroutine.resume','coroutine.status',
+            'coroutine.wrap','coroutine.yield',
+            'io.close','io.flush','io.input','io.lines','io.open','io.output','io.read','io.tmpfile','io.type','io.write',
+            'io.stdin','io.stdout','io.stderr',
+            'os.clock','os.date','os.difftime','os.execute','os.exit','os.getenv','os.remove','os.rename',
+            'os.setlocale','os.time','os.tmpname',
+            'string','table','math','coroutine','io','os','debug'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '=', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #b1b100;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/m68k.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/m68k.php
new file mode 100644
index 000000000..cc5807c6f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/m68k.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************
+ * m68k.php
+ * --------
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2007 Benny Baumann (http://www.omorphia.de/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/02/06
+ *
+ * Motorola 68000 Assembler language file for GeSHi.
+ *
+ * Syntax definition as commonly used by the motorola documentation for the
+ * MC68HC908GP32 Microcontroller (and maybe others).
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/06/02 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2007/06/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Motorola 68000 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','ais','aix','and','asl','asr','bcc','bclr','bcs','beq',
+            'bge','bgt','bhcc','bhcs','bhi','bhs','bih','bil','bit','ble','blo',
+            'bls','blt','bmc','bmi','bms','bne','bpl','bra','brclr','brn',
+            'brset','bset','bsr','cbeq','clc','cli','clr','cmp','com','cphx',
+            'cpx','daa','dbnz','dec','div','eor','inc','jmp','jsr','lda','ldhx',
+            'ldx','lsl','lsr','mov','mul','neg','nop','nsa','ora','psha','pshh',
+            'pshx','pula','pulh','pulx','rol','ror','rsp','rti','rts','sbc',
+            'sec','sei','sta','sthx','stop','stx','sub','swi','tap','tax','tpa',
+            'tst','tsx','txa','txs','wait'
+        ),
+        /*registers*/
+        2 => array(
+            'a','h','x',
+            'hx','sp'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '#?0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}[bB]',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]*?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/make.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/make.php
new file mode 100644
index 000000000..f01209ebf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/make.php
@@ -0,0 +1,151 @@
+<?php
+/*************************************************************************************
+ * make.php
+ * --------
+ * Author: Neil Bird <phoenix@fnxweb.com>
+ * Copyright: (c) 2008 Neil Bird
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/08/26
+ *
+ * make language file for GeSHi.
+ *
+ * (GNU make specific)
+ *
+ * CHANGES
+ * -------
+ * 2008/09/05 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'GNU make',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_REGEXP' => array(
+        //Escaped String Starters
+        2 => "/\\\\['\"]/siU"
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            // core
+            'ifeq', 'else', 'endif', 'ifneq', 'ifdef', 'ifndef',
+            'include', 'vpath', 'export', 'unexport', 'override',
+            'info', 'warning', 'error'
+            ),
+        2 => array(
+            // macros, literals
+            '.SUFFIXES', '.PHONY', '.DEFAULT', '.PRECIOUS', '.IGNORE', '.SILENT', '.EXPORT_ALL_VARIABLES', '.KEEP_STATE',
+            '.LIBPATTERNS', '.NOTPARALLEL', '.DELETE_ON_ERROR', '.INTERMEDIATE', '.POSIX', '.SECONDARY'
+            ),
+        /*
+        3 => array(
+            // funcs - see regex
+            //'subst', 'addprefix', 'addsuffix', 'basename', 'call', 'dir', 'error', 'eval', 'filter-out', 'filter',
+            //'findstring', 'firstword', 'foreach', 'if', 'join', 'notdir', 'origin', 'patsubst', 'shell', 'sort', 'strip',
+            //'suffix', 'warning', 'wildcard', 'word', 'wordlist', 'words'
+            )*/
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '!', '@', '%', '&', '|', '/',
+        '<', '>',
+        '=', '-', '+', '*',
+        '.', ':', ',', ';',
+        '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #666622; font-weight: bold;',
+            2 => 'color: #990000;',
+            //3 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #339900; font-style: italic;',
+            2 => 'color: #000099; font-weight: bold;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(  # keep same as symbols so as to make ${} and $() equiv.
+            0 => 'color: #004400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC2200;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #004400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088; font-weight: bold;',
+            1 => 'color: #0000CC; font-weight: bold;',
+            2 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(),
+        'METHODS' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        //3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //Simple variables
+        0 => "\\$(?:[^{(&]|&(?:amp|lt|gt);)",
+        //Complex variables/functions [built-ins]
+        1 => array(
+            GESHI_SEARCH => '(\\$[({])(subst|addprefix|addsuffix|basename|call|dir|error|eval|filter-out|filter,|findstring|firstword|foreach|if|join|notdir|origin|patsubst|shell|sort|strip,|suffix|warning|wildcard|word|wordlist|words)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+            //Complex variables/functions [others]
+        2 => array(
+            GESHI_SEARCH => '(\\$[({])([A-Za-z_][A-Za-z_0-9]*)([ })])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 8
+// vim: set sw=4 sts=4 :
+);
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/matlab.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/matlab.php
new file mode 100644
index 000000000..f7b649573
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/matlab.php
@@ -0,0 +1,227 @@
+<?php
+/*************************************************************************************
+ * matlab.php
+ * -----------
+ * Author: Florian Knorn (floz@gmx.de)
+ * Copyright: (c) 2004 Florian Knorn (http://www.florian-knorn.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/02/09
+ *
+ * Matlab M-file language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006-03-25 (1.0.7.22)
+ *   - support for the transpose operator
+ *   - many keywords added
+ *   - links to the matlab documentation at mathworks
+ *      by: Olivier Verdier (olivier.verdier@free.fr)
+ * 2005/05/07 (1.0.0)
+ *   -  First Release
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Matlab M',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(),
+    //Matlab Strings
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<![\\w\\)\\]\\}\\.])('[^\\n']*?')/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'catch', 'continue', 'elseif', 'else', 'end', 'for',
+            'function', 'global', 'if', 'otherwise', 'persistent', 'return',
+            'switch', 'try', 'while'
+            ),
+        2 => array(
+            'all','any','exist','is','logical','mislocked',
+
+            'abs','acos','acosh','acot','acoth','acsc','acsch','airy','angle',
+            'ans','area','asec','asech','asin','asinh','atan','atan2','atanh',
+            'auread','autumn','auwrite','axes','axis','balance','bar','bar3',
+            'bar3h','barh','besselh','besseli','besselj','besselk','Bessely',
+            'beta','betainc','betaln','bicg','bicgstab','bin2dec','bitand',
+            'bitcmp','bitget','bitmax','bitor','bitset','bitshift','bitxor',
+            'blkdiag','bone','box','brighten','builtin','bwcontr','calendar',
+            'camdolly','camlight','camlookat','camorbit','campan','campos',
+            'camproj','camroll','camtarget','camup','camva','camzoom','capture',
+            'cart2pol','cart2sph','cat','caxis','cdf2rdf','ceil','cell',
+            'cell2struct','celldisp','cellfun','cellplot','cellstr','cgs',
+            'char','chol','cholinc','cholupdate','cla','clabel','class','clc',
+            'clf','clg','clock','close','colmmd','colorbar','colorcube',
+            'colordef','colormap','colperm','comet','comet3','compan','compass',
+            'complex','computer','cond','condeig','condest','coneplot','conj',
+            'contour','contourc','contourf','contourslice','contrast','conv',
+            'conv2','convhull','cool','copper','copyobj','corrcoef','cos',
+            'cosh','cot','coth','cov','cplxpair','cputime','cross','csc','csch',
+            'cumprod','cumsum','cumtrapz','cylinder','daspect','date','datenum',
+            'datestr','datetick','datevec','dbclear','dbcont','dbdown',
+            'dblquad','dbmex','dbquit','dbstack','dbstatus','dbstep','dbstop',
+            'dbtype','dbup','deblank','dec2bin','dec2hex','deconv','del2',
+            'delaunay','det','diag','dialog','diff','diffuse','dlmread',
+            'dlmwrite','dmperm','double','dragrect','drawnow','dsearch','eig',
+            'eigs','ellipj','ellipke','eomday','eps','erf','erfc','erfcx',
+            'erfiny','error','errorbar','errordlg','etime','eval','evalc',
+            'evalin','exp','expint','expm','eye','ezcontour','ezcontourf',
+            'ezmesh','ezmeshc','ezplot','ezplot3','ezpolar','ezsurf','ezsurfc',
+            'factor','factorial','fclose','feather','feof','ferror','feval',
+            'fft','fft2','fftshift','fgetl','fgets','fieldnames','figure',
+            'fill','fill3','filter','filter2','find','findfigs','findobj',
+            'findstr','fix','flag','flipdim','fliplr','flipud','floor','flops',
+            'fmin','fmins','fopen','fplot','fprintf','fread','frewind','fscanf',
+            'fseek','ftell','full','funm','fwrite','fzero','gallery','gamma',
+            'gammainc','gammaln','gca','gcbo','gcd','gcf','gco','get',
+            'getfield','ginput','gmres','gradient','gray','graymon','grid',
+            'griddata','gsvd','gtext','hadamard','hankel','hdf','helpdlg',
+            'hess','hex2dec','hex2num','hidden','hilb','hist','hold','hot',
+            'hsv','hsv2rgb','i','ifft','ifft2','ifftn','ifftshift','imag',
+            'image','imfinfo','imread','imwrite','ind2sub','Inf','inferiorto',
+            'inline','inpolygon','input','inputdlg','inputname','int16',
+            'int2str','int32','int8','interp1','interp2','interp3','interpft',
+            'interpn','intersect','inv','invhilb','ipermute','isa','ishandle',
+            'ismember','isocaps','isonormals','isosurface','j','jet','keyboard',
+            'lcm','legend','legendre','light','lighting','lightingangle',
+            'lin2mu','line','lines','linspace','listdlg','loadobj','log',
+            'log10','log2','loglog','logm','logspace','lower','lscov','lu',
+            'luinc','magic','mat2str','material','max','mean','median','menu',
+            'menuedit','mesh','meshc','meshgrid','min','mod','msgbox','mu2lin',
+            'NaN','nargchk','nargin','nargout','nchoosek','ndgrid','ndims',
+            'newplot','nextpow2','nnls','nnz','nonzeros','norm','normest','now',
+            'null','num2cell','num2str','nzmax','ode113,','ode15s,','ode23s,',
+            'ode23t,','ode23tb','ode45,','odefile','odeget','odeset','ones',
+            'orient','orth','pagedlg','pareto','pascal','patch','pause',
+            'pbaspect','pcg','pcolor','peaks','perms','permute','pi','pie',
+            'pie3','pinv','plot','plot3','plotmatrix','plotyy','pol2cart',
+            'polar','poly','polyarea','polyder','polyeig','polyfit','polyval',
+            'polyvalm','pow2','primes','print','printdlg','printopt','prism',
+            'prod','propedit','qmr','qr','qrdelete','qrinsert','qrupdate',
+            'quad','questdlg','quiver','quiver3','qz','rand','randn','randperm',
+            'rank','rat','rats','rbbox','rcond','real','realmax','realmin',
+            'rectangle','reducepatch','reducevolume','refresh','rem','repmat',
+            'reset','reshape','residue','rgb2hsv','rgbplot','ribbon','rmfield',
+            'roots','rose','rot90','rotate','rotate3d','round','rref',
+            'rrefmovie','rsf2csf','saveobj','scatter','scatter3','schur',
+            'script','sec','sech','selectmoveresize','semilogx','semilogy',
+            'set','setdiff','setfield','setxor','shading','shg','shiftdim',
+            'shrinkfaces','sign','sin','single','sinh','slice','smooth3','sort',
+            'sortrows','sound','soundsc','spalloc','sparse','spconvert',
+            'spdiags','specular','speye','spfun','sph2cart','sphere','spinmap',
+            'spline','spones','spparms','sprand','sprandn','sprandsym','spring',
+            'sprintf','sqrt','sqrtm','squeeze','sscanf','stairs','std','stem',
+            'stem3','str2double','str2num','strcat','strcmp','strcmpi',
+            'stream2','stream3','streamline','strings','strjust','strmatch',
+            'strncmp','strrep','strtok','struct','struct2cell','strvcat',
+            'sub2ind','subplot','subspace','subvolume','sum','summer',
+            'superiorto','surf','surf2patch','surface','surfc','surfl',
+            'surfnorm','svd','svds','symmmd','symrcm','symvar','tan','tanh',
+            'texlabel','text Create','textread','textwrap','tic','title','toc',
+            'toeplitz','trace','trapz','tril','trimesh','trisurf','triu',
+            'tsearch','uicontext Create','uicontextmenu','uicontrol',
+            'uigetfile','uimenu','uint32','uint8','uiputfile','uiresume',
+            'uisetcolor','uisetfont','uiwait Used','union','unique','unwrap',
+            'upper','var','varargin','varargout','vectorize','view','viewmtx',
+            'voronoi','waitbar','waitforbuttonpress','warndlg','warning',
+            'waterfall','wavread','wavwrite','weekday','whitebg','wilkinson',
+            'winter','wk1read','wk1write','xlabel','xlim','ylabel','ylim',
+            'zeros','zlabel','zlim','zoom',
+            //'[Keywords 6]',
+            'addpath','cd','clear','copyfile','delete','diary','dir','disp',
+            'doc','docopt','echo','edit','fileparts','format','fullfile','help',
+            'helpdesk','helpwin','home','inmem','lasterr','lastwarn','length',
+            'load','lookfor','ls','matlabrc','matlabroot','mkdir','mlock',
+            'more','munlock','open','openvar','pack','partialpath','path',
+            'pathtool','profile','profreport','pwd','quit','rmpath','save',
+            'saveas','size','tempdir','tempname','type','ver','version','web',
+            'what','whatsnew','which','who','whos','workspace'
+            )
+        ),
+    'SYMBOLS' => array(
+        '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        //4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #228B22;',
+            2 => 'color:#A020F0;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #080;'
+            ),
+        'STRINGS' => array(
+            //0 => 'color: #A020F0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #33f;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #33f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Complex numbers
+        0 => '(?<![\\w])[+-]?[\\d]*([\\d]\\.|\\.[\\d])?[\\d]*[ij](?![\\w])'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mirc.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mirc.php
new file mode 100644
index 000000000..bc773458c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mirc.php
@@ -0,0 +1,171 @@
+<?php
+/*************************************************************************************
+ * mirc.php
+ * -----
+ * Author: Alberto 'Birckin' de Areba (Birckin@hotmail.com)
+ * Copyright: (c) 2006 Alberto de Areba
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/05/29
+ *
+ * mIRC Scripting language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/05/29 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'mIRC Scripting',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'menu', 'dialog',
+            ),
+        2 => array(
+            'if', 'elseif', 'else', 'while', 'return', 'goto', 'var'
+            ),
+        3 => array(
+            'action','ajinvite','amsg','ame','anick','aop','auser',
+            'avoice','auto','autojoin','away','background','ban','beep',
+            'channel','clear','clearall','clipboard','close','closemsg','color',
+            'copy','creq','ctcp','ctcpreply','ctcps','dcc','dde','ddeserver',
+            'debug','describe','disable','disconnect','dlevel','dll','dns',
+            'dqwindow','ebeeps','echo','editbox','emailaddr','enable','events',
+            'exit','filter','findtext','finger','flash','flood','flush',
+            'flushini','font','fsend','fserve','fullname','ghide','gload',
+            'gmove','gopts','gplay','gpoint','gqreq','groups','gshow','gsize',
+            'gstop','gtalk','gunload','guser','help','hop','ignore','invite',
+            'join','kick','linesep','links','list','load','loadbuf','localinfo',
+            'log','me','mdi','mkdir','mnick','mode','msg','names','nick','noop',
+            'notice','notify','omsg','onotice','part','partall','pdcc',
+            'perform','ping','play','pop','protect','pvoice','qmsg','qme',
+            'query','queryrn','quit','raw','remini','remote','remove','rename',
+            'enwin','resetidle','rlevel','rmdir','run','ruser','save','savebuf',
+            'saveini','say','server','showmirc','sline','sound','speak','splay',
+            'sreq','strip','time',
+            //'timer[N/name]', //Handled as a regular expression below ...
+            'timers','timestamp','titlebar','tnick','tokenize','topic','ulist',
+            'unload','updatenl','url','uwho','window','winhelp','write',
+            'writeini','who','whois','whowas'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #994444;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            0 => '',
+            ),
+        'METHODS' => array(
+            0 => 'color: #008000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #990000;',
+            2 => 'color: #000099;',
+            3 => 'color: #888800;',
+            4 => 'color: #888800;',
+            5 => 'color: #000099;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.mirc.com/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(
+        //Variable names
+        0 => '\$[a-zA-Z0-9]+',
+        //Variable names
+        1 => '(%|&amp;)[\w\x80-\xFE]+',
+        //Client to Client Protocol handling
+        2 => '(on|ctcp) (!|@|&amp;)?(\d|\*):[a-zA-Z]+:',
+        /*4 => array(
+            GESHI_SEARCH => '((on|ctcp) (!|@|&)?(\d|\*):(Action|Active|Agent|AppActive|Ban|Chat|Close|Connect|Ctcp|CtcpReply|DccServer|DeHelp|DeOp|DeVoice|Dialog|Dns|Error|Exit|FileRcvd|FileSent|GetFail|Help|Hotlink|Input|Invite|Join|KeyDown|KeyUp|Kick|Load|Logon|MidiEnd|Mode|Mp3End|Nick|NoSound|Notice|Notify|Op|Open|Part|Ping|Pong|PlayEnd|Quit|Raw|RawMode|SendFail|Serv|ServerMode|ServerOp|Signal|Snotice|Start|Text|Topic|UnBan|Unload|Unotify|User|Mode|Voice|Wallops|WaveEnd):)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),*/
+        //Channel names
+        3 => '(#|@)[a-zA-Z0-9]+',
+        4 => '-[a-z\d]+',
+        //Raw protocol handling
+        5 => 'raw (\d|\*):',
+        //Timer handling
+        6 => '(?<!>|:|\/)\/timer(?!s\b)[0-9a-zA-Z_]+',
+        // /...
+        7 => '(?<!>|:|\/|\w)\/[a-zA-Z][a-zA-Z0-9]*(?!>)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<![\w\$\|\#;<^&])'
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/modula3.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/modula3.php
new file mode 100644
index 000000000..a1f04ca59
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/modula3.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * modula3.php
+ * ----------
+ * Author: mbishop (mbishop@esoteriq.org)
+ * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/01/21
+ *
+ * Modula-3 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Modula-3',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'AND', 'ANY', 'ARRAY', 'AS', 'BEGIN', 'BITS', 'BRANDED', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EVAL', 'EXCEPT', 'EXCEPTION',
+            'EXIT', 'EXPORTS', 'FINALLY', 'FOR', 'FROM', 'GENERIC', 'IF', 'IMPORT', 'IN',
+            'INTERFACE', 'LOCK', 'LOOP', 'METHODS', 'MOD', 'MODULE', 'NOT', 'OBJECT', 'OF',
+            'OR', 'OVERRIDE', 'PROCEDURE', 'RAISE', 'RAISES', 'READONLY', 'RECORD', 'REF',
+            'REPEAT', 'RETURN', 'REVEAL', 'ROOT', 'SET', 'THEN', 'TO', 'TRY', 'TYPE', 'TYPECASE',
+            'UNSAFE', 'UNTIL', 'UNTRACED', 'VALUE', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'NULL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS','ADR','ADRSIZE','BITSIZE','BYTESIZE','CEILING','DEC','DISPOSE',
+            'EXTENDED','FIRST','FLOAT','FLOOR','INC','ISTYPE','LAST','LOOPHOLE','MAX','MIN',
+            'NARROW','NEW','NUMBER','ORD','ROUND','SUBARRAY','TRUNC','TYPECODE', 'VAL'
+            ),
+        4 => array(
+            'ADDRESS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
+            'LONGREAL', 'MUTEX', 'REAL', 'REFANY', 'TEXT'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mpasm.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mpasm.php
new file mode 100644
index 000000000..53aa9e7a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mpasm.php
@@ -0,0 +1,164 @@
+<?php
+/*************************************************************************************
+ * mpasm.php
+ * ---------
+ * Author: Bakalex (bakalex@gmail.com)
+ * Copyright: (c) 2004 Bakalex, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/12/6
+ *
+ * Microchip Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  - Added description of extra language features (SF#1970248)
+ * 2005/01/29 (1.0.0)
+ *  - First Release
+ *
+ * TODO (updated 2005/12/6)
+ * -------------------------
+ *
+ * For the moment, i've only added PIC16C6X registers. We need more (PIC16F/C7x/8x,
+ * PIC10, PIC18 and dsPIC registers).
+ * Must take a look to dsPIC instructions.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Microchip Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*Directive Language*/
+        4 => array(
+            'CONSTANT', '#DEFINE', 'END', 'EQU', 'ERROR', 'ERROR-LEVEL', '#INCLUDE', 'LIST',
+            'MESSG', 'NOLIST', 'ORG', 'PAGE', 'PROCESSOR', 'RADIX', 'SET', 'SPACE', 'SUBTITLE',
+            'TITLE', '#UNDEFINE', 'VARIABLE', 'ELSE', 'ENDIF', 'ENDW', 'IF', 'IFDEF', 'IFNDEF',
+            'WHILE', '__BADRAM', 'CBLOCK', '__CONFIG', 'DA', 'DATA', 'DB', 'DE', 'DT', 'DW',
+            'ENDC', 'FILL', '__IDLOCS', '__MAXRAM', 'RES', 'ENDM', 'EXITM', 'EXPAND', 'LOCAL',
+            'MACRO', 'NOEXPAND', 'BANKISEL', 'BANKSEL', 'CODE', 'EXTERN', 'GLOBAL', 'IDATA',
+            'PAGESEL', 'UDATA', 'UDATA_ACS', 'UDATA_OVR', 'UDATA_SHR'
+            ),
+        /* 12&14-bit Specific Instruction Set*/
+        1 => array(
+            'andlw', 'call', 'clrwdt', 'goto', 'iorlw', 'movlw', 'option', 'retlw', 'sleep',
+            'tris', 'xorlw', 'addwf', 'andwf', 'clrf', 'clrw', 'comf', 'decf', 'decfsz', 'incf',
+            'incfsz', 'iorwf', 'movf', 'nop', 'rlf', 'rrf', 'subwf', 'swapf', 'xorwf',
+            'bcf', 'bsf', 'btfsc', 'btfss',
+            'addlw', 'retfie', 'return', 'sublw', 'addcf', 'adddcf', 'b', 'bc', 'bdc',
+            'bnc', 'bndc', 'bnz', 'bz', 'clrc', 'clrdc', 'clrz', 'lcall', 'lgoto', 'movfw',
+            'negf', 'setc', 'setdc', 'setz', 'skpc', 'skpdc', 'skpnc', 'skpndc', 'skpnz', 'skpz',
+            'subcf', 'subdcf', 'tstf'
+            ),
+        /* 16-bit Specific Instructiob Set */
+        2 => array (
+            'movfp', 'movlb', 'movlp', 'movpf', 'movwf', 'tablrd', 'tablwt', 'tlrd', 'tlwt',
+            'addwfc', 'daw', 'mullw', 'negw', 'rlcf', 'rlncf', 'rrcf', 'rrncf', 'setf', 'subwfb',
+            'btg', 'cpfseq', 'cpfsgt', 'cpfslt', 'dcfsnz', 'infsnz', 'tstfsz', 'lfsr', 'bnn',
+            'bnov', 'bra', 'pop', 'push', 'rcall', 'reset'
+            ),
+        /* Registers */
+        3 => array(
+            'INDF', 'TMR0', 'PCL', 'STATUS', 'FSR', 'PORTA', 'PORTB', 'PORTC', 'PORTD', 'PORTE',
+            'PCLATH', 'INTCON', 'PIR1', 'PIR2', 'TMR1L', 'TMR1H', 'T1CON', 'TMR2', 'T2CON', 'TMR2L',
+            'TMR2H', 'TMR0H', 'TMR0L', 'SSPBUF', 'SSPCON', 'CCPR1L', 'CCPR1H', 'CCP1CON', 'RCSTA',
+            'TXREG', 'RCREG', 'CCPR2L', 'CCPR2H', 'CCP2CON', 'OPTION', 'TRISA', 'TRISB', 'TRISC',
+            'TRISD', 'TRISE', 'PIE2', 'PIE1', 'PR2', 'SSPADD', 'SSPSTAT', 'TXSTA', 'SPBRG'
+            ),
+        /*Operands*/
+        5 => array(
+            'high','low'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #007f00;',
+            4 => 'color: #46aa03; font-weight:bold;',
+            5 => 'color: #7f0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '[01]{1,64}[bB]'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mxml.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mxml.php
new file mode 100644
index 000000000..d34a92531
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mxml.php
@@ -0,0 +1,145 @@
+<?php
+/*************************************************************************************
+ * mxml.php
+ * -------
+ * Author: David Spurr
+ * Copyright: (c) 2007 David Spurr (http://www.defusion.org.uk/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/10/04
+ *
+ * MXML language file for GeSHi. Based on the XML file by Nigel McNie
+ *
+ * CHANGES
+ * -------
+ * 2007/10/04 (1.0.7.22)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MXML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('<!--' => '-->'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: black;',
+            1 => 'color: #7400FF;',
+            2 => 'color: #7400FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // xml declaration
+        0 => array(
+            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z0-9_\-:]*(\?&gt;))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // opening tags
+        1 => array(
+            GESHI_SEARCH => '(&lt;\/?[a-z]+:[a-z]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // closing tags
+        2 => array(
+            GESHI_SEARCH => '(\/?&gt;)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            //'<![CDATA[' => ']]>'
+            '<mx:Script>' => '</mx:Script>'
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mysql.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mysql.php
new file mode 100644
index 000000000..f41092c16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/mysql.php
@@ -0,0 +1,475 @@
+<?php
+/*************************************************************************************
+ * mysql.php
+ * ---------
+ * Author: Marjolein Katsma (marjolein.is.back@gmail.com)
+ * Copyright: (c) 2008 Marjolein Katsma (http://blog.marjoleinkatsma.com/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008-12-12
+ *
+ * MySQL language file for GeSHi.
+ *
+ * Based on original MySQL language file by Carl Fürstenberg (2004); brought
+ * up-to-date for current MySQL versions, and with more classes for different
+ * types of keywords; several minor errors were corrected as well.
+ *
+ * Some "classes" have two groups here: this is to allow for the fact that some
+ * keywords in MySQL have a double function: many of those are either a function
+ * (must be immediately followed by an opening bracket) or some other keyword:
+ * so they can be distinguished by the presence (or not) of that opening bracket.
+ * (An immediately following opening bracket is a default rule for functions in
+ * MySQL, though this may be overridden; because it's only a default, we use a
+ * regex lookahead only where necessary to distinguish homonyms, not generally
+ * to match any function.)
+ * Other keywords with double usage cannot be distinguished and are classified
+ * in the "Mix" category.
+ *
+ *************************************************************************************
+ *
+ * This file is part of GeSHi.
+ *
+ * GeSHi is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GeSHi is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GeSHi; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'MySQL',
+    //'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),    // '--' MUST be folowed by whitespace,not necessarily a space
+    'COMMENT_SINGLE' => array(
+        1 =>'-- ',
+        2 => '#'
+        ),
+    'COMMENT_REGEXP' => array(
+        1 => "/(?:--\s).*?$/",                          // double dash followed by any whitespace
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,            // @@@ would be nice if this could be defined per group!
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',                              // by default only, can be specified
+    'ESCAPE_REGEXP' => array(
+        1 => "/[_%]/",                                  // search wildcards
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_OCT_PREFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            // Mix: statement keywords and keywords that don't fit in any other
+            // category, or have multiple usage/meanings
+            'ACTION','ADD','AFTER','ALGORITHM','ALL','ALTER','ANALYZE','ANY',
+            'ASC','AS','BDB','BEGIN','BERKELEYDB','BINARY','BTREE','CALL',
+            'CASCADED','CASCADE','CHAIN','CHECK','COLUMNS','COLUMN','COMMENT',
+            'COMMIT','COMMITTED','CONSTRAINT','CONTAINS SQL','CONSISTENT',
+            'CONVERT','CREATE','CROSS','DATA','DATABASES',
+            'DECLARE','DEFINER','DELAYED','DELETE','DESCRIBE','DESC',
+            'DETERMINISTIC','DISABLE','DISCARD','DISTINCTROW','DISTINCT','DO',
+            'DROP','DUMPFILE','DUPLICATE KEY','ENABLE','ENCLOSED BY','ENGINE',
+            'ERRORS','ESCAPED BY','EXISTS','EXPLAIN','EXTENDED','FIELDS',
+            'FIRST','FOR EACH ROW','FORCE','FOREIGN KEY','FROM','FULL',
+            'FUNCTION','GLOBAL','GRANT','GROUP BY','HANDLER','HASH','HAVING',
+            'HELP','HIGH_PRIORITY','IF NOT EXISTS','IGNORE','IMPORT','INDEX',
+            'INFILE','INNER','INNODB','INOUT','INTO','INVOKER',
+            'ISOLATION LEVEL','JOIN','KEYS','KEY','KILL','LANGUAGE SQL','LAST',
+            'LIMIT','LINES','LOAD','LOCAL','LOCK','LOW_PRIORITY',
+            'MASTER_SERVER_ID','MATCH','MERGE','MIDDLEINT','MODIFIES SQL DATA',
+            'MODIFY','MRG_MYISAM','NATURAL','NEXT','NO SQL','NO','ON',
+            'OPTIMIZE','OPTIONALLY','OPTION','ORDER BY','OUTER','OUTFILE','OUT',
+            'PARTIAL','PREV','PRIMARY KEY','PRIVILEGES','PROCEDURE','PURGE',
+            'QUICK','READS SQL DATA','READ','REFERENCES','RELEASE','RENAME',
+            'REPEATABLE','REQUIRE','RESTRICT','RETURNS','REVOKE',
+            'ROLLBACK','ROUTINE','RTREE','SAVEPOINT','SELECT',
+            'SERIALIZABLE','SESSION','SET','SHARE MODE','SHOW','SIMPLE',
+            'SNAPSHOT','SOME','SONAME','SQL SECURITY','SQL_BIG_RESULT',
+            'SQL_BUFFER_RESULT','SQL_CACHE','SQL_CALC_FOUND_ROWS',
+            'SQL_NO_CACHE','SQL_SMALL_RESULT','SSL','START','STARTING BY',
+            'STATUS','STRAIGHT_JOIN','STRIPED','TABLESPACE','TABLES','TABLE',
+            'TEMPORARY','TEMPTABLE','TERMINATED BY','TO','TRANSACTIONS',
+            'TRANSACTION','TRIGGER','TYPES','TYPE','UNCOMMITTED','UNDEFINED',
+            'UNION','UNLOCK_TABLES','UPDATE','USAGE','USE','USER_RESOURCES',
+            'USING','VALUES','VALUE','VIEW','WARNINGS','WHERE','WITH ROLLUP',
+            'WITH','WORK','WRITE',
+            ),
+        2 => array(     //No ( must follow
+            // Mix: statement keywords distinguished from functions by the same name
+            "CURRENT_USER", "DATABASE", "IN", "INSERT", "DEFAULT", "REPLACE", "SCHEMA", "TRUNCATE"
+            ),
+        3 => array(
+            // Values (Constants)
+            'FALSE','NULL','TRUE',
+            ),
+        4 => array(
+            // Column Data Types
+            'BIGINT','BIT','BLOB','BOOLEAN','BOOL','CHARACTER VARYING',
+            'CHAR VARYING','DATETIME','DECIMAL','DEC','DOUBLE PRECISION',
+            'DOUBLE','ENUM','FIXED','FLOAT','GEOMETRYCOLLECTION','GEOMETRY',
+            'INTEGER','INT','LINESTRING','LONGBLOB','LONGTEXT','MEDIUMBLOB',
+            'MEDIUMINT','MEDIUMTEXT','MULTIPOINT','MULTILINESTRING',
+            'MULTIPOLYGON','NATIONAL CHARACTER','NATIONAL CHARACTER VARYING',
+            'NATIONAL CHAR VARYING','NATIONAL VARCHAR','NCHAR VARCHAR','NCHAR',
+            'NUMERIC','POINT','POLYGON','REAL','SERIAL',
+            'SMALLINT','TEXT','TIMESTAMP','TINYBLOB','TINYINT',
+            'TINYTEXT','VARBINARY','VARCHARACTER','VARCHAR',
+            ),
+        5 => array(     //No ( must follow
+            // Column data types distinguished from functions by the same name
+            "CHAR", "DATE", "TIME"
+            ),
+        6 => array(
+            // Table, Column & Index Attributes
+            'AUTO_INCREMENT','AVG_ROW_LENGTH','BOTH','CHECKSUM','CONNECTION',
+            'DATA DIRECTORY','DEFAULT NULL','DELAY_KEY_WRITE','FULLTEXT',
+            'INDEX DIRECTORY','INSERT_METHOD','LEADING','MAX_ROWS','MIN_ROWS',
+            'NOT NULL','PACK_KEYS','ROW_FORMAT','SERIAL DEFAULT VALUE','SIGNED',
+            'SPATIAL','TRAILING','UNIQUE','UNSIGNED','ZEROFILL'
+            ),
+        7 => array(     //No ( must follow
+            // Column attribute distinguished from function by the same name
+            "CHARSET"
+            ),
+        8 => array(
+            // Date and Time Unit Specifiers
+            'DAY_HOUR','DAY_MICROSECOND','DAY_MINUTE','DAY_SECOND',
+            'HOUR_MICROSECOND','HOUR_MINUTE','HOUR_SECOND',
+            'MINUTE_MICROSECOND','MINUTE_SECOND',
+            'SECOND_MICROSECOND','YEAR_MONTH'
+            ),
+        9 => array(     //No ( must follow
+            // Date-time unit specifiers distinguished from functions by the same name
+            "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER", "SECOND", "WEEK", "YEAR"
+            ),
+        10 => array(
+            // Operators (see also Symbols)
+            'AND','BETWEEN','CHARACTER SET','COLLATE','DIV','IS NOT NULL',
+            'IS NOT','IS NULL','IS','LIKE','NOT','OFFSET','OR','REGEXP','RLIKE',
+            'SOUNDS LIKE','XOR'
+            ),
+        11 => array(     //No ( must follow
+            // Operator distinghuished from function by the same name
+            "INTERVAL"
+            ),
+        12 => array(
+            // Control Flow (functions)
+            'CASE','ELSE','END','IFNULL','IF','NULLIF','THEN','WHEN',
+            ),
+        13 => array(
+            // String Functions
+            'ASCII','BIN','BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH',
+            'CONCAT_WS','CONCAT','ELT','EXPORT_SET','FIELD',
+            'FIND_IN_SET','FORMAT','HEX','INSTR','LCASE','LEFT','LENGTH',
+            'LOAD_FILE','LOCATE','LOWER','LPAD','LTRIM','MAKE_SET','MID',
+            'OCTET_LENGTH','ORD','POSITION','QUOTE','REPEAT','REVERSE',
+            'RIGHT','RPAD','RTRIM','SOUNDEX','SPACE','STRCMP','SUBSTRING_INDEX',
+            'SUBSTRING','TRIM','UCASE','UNHEX','UPPER',
+            ),
+        14 => array(     //A ( must follow
+            // String functions distinguished from other keywords by the same name
+            "INSERT", "REPLACE", "CHAR"
+            ),
+        15 => array(
+            // Numeric Functions
+            'ABS','ACOS','ASIN','ATAN2','ATAN','CEILING','CEIL',
+            'CONV','COS','COT','CRC32','DEGREES','EXP','FLOOR','LN','LOG10',
+            'LOG2','LOG','MOD','OCT','PI','POWER','POW','RADIANS','RAND',
+            'ROUND','SIGN','SIN','SQRT','TAN',
+            ),
+        16 => array(     //A ( must follow
+            // Numeric function distinguished from other keyword by the same name
+            "TRUNCATE"
+            ),
+        17 => array(
+            // Date and Time Functions
+            'ADDDATE','ADDTIME','CONVERT_TZ','CURDATE','CURRENT_DATE',
+            'CURRENT_TIME','CURRENT_TIMESTAMP','CURTIME','DATE_ADD',
+            'DATE_FORMAT','DATE_SUB','DATEDIFF','DAYNAME','DAYOFMONTH',
+            'DAYOFWEEK','DAYOFYEAR','EXTRACT','FROM_DAYS','FROM_UNIXTIME',
+            'GET_FORMAT','LAST_DAY','LOCALTIME','LOCALTIMESTAMP','MAKEDATE',
+            'MAKETIME','MONTHNAME','NOW','PERIOD_ADD',
+            'PERIOD_DIFF','SEC_TO_TIME','STR_TO_DATE','SUBDATE','SUBTIME',
+            'SYSDATE','TIME_FORMAT','TIME_TO_SEC',
+            'TIMESTAMPADD','TIMESTAMPDIFF','TO_DAYS',
+            'UNIX_TIMESTAMP','UTC_DATE','UTC_TIME','UTC_TIMESTAMP','WEEKDAY',
+            'WEEKOFYEAR','YEARWEEK',
+            ),
+        18 => array(     //A ( must follow
+            // Date-time functions distinguished from other keywords by the same name
+            "DATE", "DAY", "HOUR", "MICROSECOND", "MINUTE", "MONTH", "QUARTER",
+            "SECOND", "TIME", "WEEK", "YEAR"
+            ),
+        19 => array(
+            // Comparison Functions
+            'COALESCE','GREATEST','ISNULL','LEAST',
+            ),
+        20 => array(     //A ( must follow
+            // Comparison functions distinguished from other keywords by the same name
+            "IN", "INTERVAL"
+            ),
+        21 => array(
+            // Encryption and Compression Functions
+            'AES_DECRYPT','AES_ENCRYPT','COMPRESS','DECODE','DES_DECRYPT',
+            'DES_ENCRYPT','ENCODE','ENCRYPT','MD5','OLD_PASSWORD','PASSWORD',
+            'SHA1','SHA','UNCOMPRESS','UNCOMPRESSED_LENGTH',
+            ),
+        22 => array(
+            // GROUP BY (aggregate) Functions
+            'AVG','BIT_AND','BIT_OR','BIT_XOR','COUNT','GROUP_CONCAT',
+            'MAX','MIN','STDDEV_POP','STDDEV_SAMP','STDDEV','STD','SUM',
+            'VAR_POP','VAR_SAMP','VARIANCE',
+            ),
+        23 => array(
+            // Information Functions
+            'BENCHMARK','COERCIBILITY','COLLATION','CONNECTION_ID',
+            'FOUND_ROWS','LAST_INSERT_ID','ROW_COUNT',
+            'SESSION_USER','SYSTEM_USER','USER','VERSION',
+            ),
+        24 => array(     //A ( must follow
+            // Information functions distinguished from other keywords by the same name
+            "CURRENT_USER", "DATABASE", "SCHEMA", "CHARSET"
+            ),
+        25 => array(
+            // Miscellaneous Functions
+            'ExtractValue','BIT_COUNT','GET_LOCK','INET_ATON','INET_NTOA',
+            'IS_FREE_LOCK','IS_USED_LOCK','MASTER_POS_WAIT','NAME_CONST',
+            'RELEASE_LOCK','SLEEP','UpdateXML','UUID',
+            ),
+        26 => array(     //A ( must follow
+            // Miscellaneous function distinguished from other keyword by the same name
+            "DEFAULT"
+            ),
+        27 => array(
+            // Geometry Functions
+            'Area','AsBinary','AsText','AsWKB','AsWKT','Boundary','Buffer',
+            'Centroid','Contains','ConvexHull','Crosses',
+            'Difference','Dimension','Disjoint','Distance',
+            'EndPoint','Envelope','Equals','ExteriorRing',
+            'GLength','GeomCollFromText','GeomCollFromWKB','GeomFromText',
+            'GeomFromWKB','GeometryCollectionFromText',
+            'GeometryCollectionFromWKB','GeometryFromText','GeometryFromWKB',
+            'GeometryN','GeometryType',
+            'InteriorRingN','Intersection','Intersects','IsClosed','IsEmpty',
+            'IsRing','IsSimple',
+            'LineFromText','LineFromWKB','LineStringFromText',
+            'LineStringFromWKB',
+            'MBRContains','MBRDisjoint','MBREqual','MBRIntersects',
+            'MBROverlaps','MBRTouches','MBRWithin','MLineFromText',
+            'MLineFromWKB','MPointFromText','MPointFromWKB','MPolyFromText',
+            'MPolyFromWKB','MultiLineStringFromText','MultiLineStringFromWKB',
+            'MultiPointFromText','MultiPointFromWKB','MultiPolygonFromText',
+            'MultiPolygonFromWKB',
+            'NumGeometries','NumInteriorRings','NumPoints',
+            'Overlaps',
+            'PointFromText','PointFromWKB','PointN','PointOnSurface',
+            'PolyFromText','PolyFromWKB','PolygonFromText','PolygonFromWKB',
+            'Related','SRID','StartPoint','SymDifference',
+            'Touches',
+            'Union',
+            'Within',
+            'X',
+            'Y',
+            ),
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            /* Operators */
+            '=', ':=',                                      // assignment operators
+            '||', '&&', '!',                                // locical operators
+            '=', '<=>', '>=', '>', '<=', '<', '<>', '!=',   // comparison operators
+            '|', '&', '^', '~', '<<', '>>',                 // bitwise operators
+            '-', '+', '*', '/', '%',                        // numerical operators
+            ),
+        2 => array(
+            /* Other syntactical symbols */
+            '(', ')',
+            ',', ';',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false,
+        17 => false,
+        18 => false,
+        19 => false,
+        20 => false,
+        21 => false,
+        22 => false,
+        23 => false,
+        24 => false,
+        25 => false,
+        26 => false,
+        27 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990099; font-weight: bold;',      // mix
+            2 => 'color: #990099; font-weight: bold;',      // mix
+            3 => 'color: #9900FF; font-weight: bold;',      // constants
+            4 => 'color: #999900; font-weight: bold;',      // column data types
+            5 => 'color: #999900; font-weight: bold;',      // column data types
+            6 => 'color: #FF9900; font-weight: bold;',      // attributes
+            7 => 'color: #FF9900; font-weight: bold;',      // attributes
+            8 => 'color: #9900FF; font-weight: bold;',      // date-time units
+            9 => 'color: #9900FF; font-weight: bold;',      // date-time units
+
+            10 => 'color: #CC0099; font-weight: bold;',      // operators
+            11 => 'color: #CC0099; font-weight: bold;',      // operators
+
+            12 => 'color: #009900;',     // control flow (functions)
+            13 => 'color: #000099;',     // string functions
+            14 => 'color: #000099;',     // string functions
+            15 => 'color: #000099;',     // numeric functions
+            16 => 'color: #000099;',     // numeric functions
+            17 => 'color: #000099;',     // date-time functions
+            18 => 'color: #000099;',     // date-time functions
+            19 => 'color: #000099;',     // comparison functions
+            20 => 'color: #000099;',     // comparison functions
+            21 => 'color: #000099;',     // encryption functions
+            22 => 'color: #000099;',     // aggregate functions
+            23 => 'color: #000099;',     // information functions
+            24 => 'color: #000099;',     // information functions
+            25 => 'color: #000099;',     // miscellaneous functions
+            26 => 'color: #000099;',     // miscellaneous functions
+            27 => 'color: #00CC00;',     // geometry functions
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #808000; font-style: italic;',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #004000; font-weight: bold;',
+            1 => 'color: #008080; font-weight: bold;'       // search wildcards
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #CC0099;',         // operators
+            2 => 'color: #000033;',         // syntax
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        2 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        3 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        4 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        5 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        6 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        7 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        8 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+        9 => 'http://search.mysql.com/search?site=refman-51&amp;q={FNAME}&amp;lr=lang_en',
+
+        10 => 'http://dev.mysql.com/doc/refman/5.1/en/non-typed-operators.html',
+        11 => 'http://dev.mysql.com/doc/refman/5.1/en/non-typed-operators.html',
+
+        12 => 'http://dev.mysql.com/doc/refman/5.1/en/control-flow-functions.html',
+        13 => 'http://dev.mysql.com/doc/refman/5.1/en/string-functions.html',
+        14 => 'http://dev.mysql.com/doc/refman/5.1/en/string-functions.html',
+        15 => 'http://dev.mysql.com/doc/refman/5.1/en/numeric-functions.html',
+        16 => 'http://dev.mysql.com/doc/refman/5.1/en/numeric-functions.html',
+        17 => 'http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html',
+        18 => 'http://dev.mysql.com/doc/refman/5.1/en/date-and-time-functions.html',
+        19 => 'http://dev.mysql.com/doc/refman/5.1/en/comparison-operators.html',
+        20 => 'http://dev.mysql.com/doc/refman/5.1/en/comparison-operators.html',
+        21 => 'http://dev.mysql.com/doc/refman/5.1/en/encryption-functions.html',
+        22 => 'http://dev.mysql.com/doc/refman/5.1/en/group-by-functions-and-modifiers.html',
+        23 => 'http://dev.mysql.com/doc/refman/5.1/en/information-functions.html',
+        24 => 'http://dev.mysql.com/doc/refman/5.1/en/information-functions.html',
+        25 => 'http://dev.mysql.com/doc/refman/5.1/en/func-op-summary-ref.html',
+        26 => 'http://dev.mysql.com/doc/refman/5.1/en/func-op-summary-ref.html',
+        27 => 'http://dev.mysql.com/doc/refman/5.1/en/analysing-spatial-information.html',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            5 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            9 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            11 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            14 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            16 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            18 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            20 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            24 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+            26 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                )
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/nsis.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/nsis.php
new file mode 100644
index 000000000..63767b025
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/nsis.php
@@ -0,0 +1,351 @@
+<?php
+/*************************************************************************************
+ * nsis.php
+ * --------
+ * Author: deguix (cevo_deguix@yahoo.com.br), Tux (http://tux.a4.cz/)
+ * Copyright: (c) 2005 deguix, 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/12/03
+ *
+ * Nullsoft Scriptable Install System language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/12/03 (2.0.2)
+ *   - Updated to NSIS 2.11.
+ * 2005/06/17 (2.0.1)
+ *   - Updated to NSIS 2.07b0.
+ * 2005/04/05 (2.0.0)
+ *   - Updated to NSIS 2.06.
+ * 2004/11/27 (1.0.2)
+ *   - Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   - Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   - First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'NSIS',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"','`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '!appendfile', '!addIncludeDir', '!addplugindir', '!cd', '!define', '!delfile', '!echo', '!else',
+            '!endif', '!error', '!execute', '!ifdef', '!ifmacrodef', '!ifmacrondef', '!ifndef', '!include',
+            '!insertmacro', '!macro', '!macroend', '!packhdr', '!tempfile', '!system', '!undef', '!verbose',
+            '!warning'
+            ),
+        2 => array(
+            'AddBrandingImage', 'AllowRootDirInstall', 'AutoCloseWindow', 'BGFont',
+            'BGGradient', 'BrandingText', 'Caption', 'ChangeUI', 'CheckBitmap', 'CompletedText', 'ComponentText',
+            'CRCCheck', 'DetailsButtonText', 'DirShow', 'DirText', 'DirVar', 'DirVerify', 'FileErrorText',
+            'Function', 'FunctionEnd', 'Icon', 'InstallButtonText', 'InstallColors', 'InstallDir',
+            'InstallDirRegKey', 'InstProgressFlags', 'InstType', 'LangString', 'LangStringUP', 'LicenseBkColor',
+            'LicenseData', 'LicenseForceSelection', 'LicenseLangString', 'LicenseText', 'LoadLanguageFile',
+            'MiscButtonText', 'Name', 'OutFile', 'Page', 'PageEx', 'PageExEnd', 'Section',
+            'SectionEnd', 'SectionGroup', 'SectionGroupEnd', 'SetCompressor', 'SetFont', 'ShowInstDetails',
+            'ShowUninstDetails', 'SilentInstall', 'SilentUnInstall', 'SpaceTexts', 'SubCaption', 'SubSection',
+            'SubSectionEnd', 'UninstallButtonText', 'UninstallCaption', 'UninstallIcon', 'UninstallSubCaption',
+            'UninstallText', 'UninstPage', 'Var', 'VIAddVersionKey', 'VIProductVersion', 'WindowIcon', 'XPStyle'
+            ),
+        3 => array(
+            'AddSize', 'AllowSkipFiles', 'FileBufSize', 'GetInstDirError', 'PageCallbacks',
+            'SectionIn', 'SetCompress', 'SetCompressionLevel', 'SetCompressorDictSize',
+            'SetDatablockOptimize', 'SetDateSave', 'SetOverwrite', 'SetPluginUnload'
+            ),
+        4 => array(
+            'Abort', 'BringToFront', 'Call', 'CallInstDLL', 'ClearErrors', 'CopyFiles','CreateDirectory',
+            'CreateFont', 'CreateShortCut', 'Delete', 'DeleteINISec', 'DeleteINIStr', 'DeleteRegKey',
+            'DeleteRegValue', 'DetailPrint', 'EnableWindow', 'EnumRegKey', 'EnumRegValue', 'Exch', 'Exec',
+            'ExecShell', 'ExecWait', 'ExpandEnvStrings', 'File', 'FileClose', 'FileOpen', 'FileRead',
+            'FileReadByte', 'FileSeek', 'FileWrite', 'FileWriteByte', 'FindClose', 'FindFirst', 'FindNext',
+            'FindWindow', 'FlushINI', 'GetCurInstType', 'GetCurrentAddress', 'GetDlgItem', 'GetDLLVersion',
+            'GetDLLVersionLocal', 'GetErrorLevel', 'GetFileTime', 'GetFileTimeLocal', 'GetFullPathName',
+            'GetFunctionAddress', 'GetLabelAddress', 'GetTempFileName', 'GetWindowText', 'Goto', 'HideWindow',
+            'IfAbort', 'IfErrors', 'IfFileExists', 'IfRebootFlag', 'IfSilent', 'InitPluginsDir', 'InstTypeGetText',
+            'InstTypeSetText', 'IntCmp', 'IntCmpU', 'IntFmt', 'IntOp', 'IsWindow', 'LockWindow', 'LogSet', 'LogText',
+            'MessageBox', 'Nop', 'Pop', 'Push', 'Quit', 'ReadEnvStr', 'ReadIniStr', 'ReadRegDWORD', 'ReadRegStr',
+            'Reboot', 'RegDLL', 'Rename', 'ReserveFile', 'Return', 'RMDir', 'SearchPath', 'SectionGetFlags',
+            'SectionGetInstTypes', 'SectionGetSize', 'SectionGetText', 'SectionSetFlags', 'SectionSetInstTypes',
+            'SectionSetSize', 'SectionSetText', 'SendMessage', 'SetAutoClose', 'SetBrandingImage', 'SetCtlColors',
+            'SetCurInstType', 'SetDetailsPrint', 'SetDetailsView', 'SetErrorLevel', 'SetErrors', 'SetFileAttributes',
+            'SetOutPath', 'SetRebootFlag', 'SetShellVarContext', 'SetSilent', 'ShowWindow', 'Sleep', 'StrCmp',
+            'StrCpy', 'StrLen', 'UnRegDLL', 'WriteINIStr', 'WriteRegBin', 'WriteRegDWORD', 'WriteRegExpandStr',
+            'WriteRegStr', 'WriteUninstaller'
+            ),
+        5 => array(
+            'all', 'alwaysoff', 'ARCHIVE', 'auto', 'both', 'bzip2', 'checkbox', 'components', 'current',
+            'custom', 'directory', 'false', 'FILE_ATTRIBUTE_ARCHIVE', 'FILE_ATTRIBUTE_HIDDEN', 'FILE_ATTRIBUTE_NORMAL',
+            'FILE_ATTRIBUTE_OFFLINE', 'FILE_ATTRIBUTE_READONLY', 'FILE_ATTRIBUTE_SYSTEM,TEMPORARY',
+            'FILE_ATTRIBUTE_TEMPORARY', 'force', 'HIDDEN', 'hide', 'HKCC', 'HKCR', 'HKCU', 'HKDD', 'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_CONFIG', 'HKEY_CURRENT_USER', 'HKEY_DYN_DATA', 'HKEY_LOCAL_MACHINE', 'HKEY_PERFORMANCE_DATA',
+            'HKEY_USERS', 'HKLM', 'HKPD', 'HKU', 'IDABORT', 'IDCANCEL', 'IDIGNORE', 'IDNO', 'IDOK', 'IDRETRY', 'IDYES',
+            'ifdiff', 'ifnewer', 'instfiles', 'lastused', 'leave', 'license', 'listonly', 'lzma', 'manual',
+            'MB_ABORTRETRYIGNORE', 'MB_DEFBUTTON1', 'MB_DEFBUTTON2', 'MB_DEFBUTTON3', 'MB_DEFBUTTON4',
+            'MB_ICONEXCLAMATION', 'MB_ICONINFORMATION', 'MB_ICONQUESTION', 'MB_ICONSTOP', 'MB_OK', 'MB_OKCANCEL',
+            'MB_RETRYCANCEL', 'MB_RIGHT', 'MB_SETFOREGROUND', 'MB_TOPMOST', 'MB_YESNO', 'MB_YESNOCANCEL', 'nevershow',
+            'none', 'normal', 'off', 'OFFLINE', 'on', 'radiobuttons', 'READONLY', 'RO', 'SHCTX', 'SHELL_CONTEXT', 'show',
+            'silent', 'silentlog', 'SW_HIDE', 'SW_SHOWMAXIMIZED', 'SW_SHOWMINIMIZED', 'SW_SHOWNORMAL', 'SYSTEM',
+            'textonly', 'true', 'try', 'uninstConfirm', 'zlib'
+            ),
+        6 => array(
+            '/a', '/components', '/COMPONENTSONLYONCUSTOM', '/CUSTOMSTRING', '/e', '/FILESONLY', '/FINAL', '/gray', '/GLOBAL',
+            '/ifempty', '/IMGID', '/ITALIC', '/lang', '/NOCUSTOM', '/nonfatal', '/NOUNLOAD', '/oname', '/r', '/REBOOTOK',
+            '/RESIZETOFIT', '/SOLID', '/SD', '/SHORT', '/silent', '/STRIKE', '/TIMEOUT', '/TRIMCENTER', '/TRIMLEFT',
+            '/TRIMRIGHT', '/UNDERLINE', '/windows', '/x'
+            ),
+        7 => array(
+            '.onGUIEnd', '.onGUIInit', '.onInit', '.onInstFailed', '.onInstSuccess', '.onMouseOverSection',
+            '.onRebootFailed', '.onSelChange', '.onUserAbort', '.onVerifyInstDir', 'un.onGUIEnd', 'un.onGUIInit',
+            'un.onInit', 'un.onRebootFailed', 'un.onUninstFailed', 'un.onUninstSuccess', 'un.onUserAbort'
+            ),
+        8 => array(
+            'MUI.nsh', '"${NSISDIR}\Contrib\Modern UI\System.nsh"', 'MUI_SYSVERSION', 'MUI_ICON', 'MUI_UNICON',
+            'MUI_HEADERIMAGE', 'MUI_HEADERIMAGE_BITMAP', 'MUI_HEADERIMAGE_BITMAP_NOSTRETCH', 'MUI_HEADERIMAGE_BITMAP_RTL',
+            'MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_UNBITMAP', 'MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH',
+            'MUI_HEADERIMAGE_UNBITMAP_RTL', 'MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_RIGHT', 'MUI_BGCOLOR',
+            'MUI_UI', 'MUI_UI_HEADERIMAGE', 'MUI_UI_HEADERIMAGE_RIGHT', 'MUI_UI_COMPONENTSPAGE_SMALLDESC',
+            'MUI_UI_COMPONENTSPAGE_NODESC', 'MUI_WELCOMEFINISHPAGE_BITMAP', 'MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_WELCOMEFINISHPAGE_INI', 'MUI_UNWELCOMEFINISHPAGE_BITMAP', 'MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_UNWELCOMEFINISHPAGE_INI', 'MUI_LICENSEPAGE_BGCOLOR', 'MUI_COMPONENTSPAGE_CHECKBITMAP',
+            'MUI_COMPONENTSPAGE_SMALLDESC', 'MUI_COMPONENTSPAGE_NODESC', 'MUI_INSTFILESPAGE_COLORS',
+            'MUI_INSTFILESPAGE_PROGRESSBAR', 'MUI_FINISHPAGE_NOAUTOCLOSE', 'MUI_UNFINISHPAGE_NOAUTOCLOSE',
+            'MUI_ABORTWARNING', 'MUI_ABORTWARNING_TEXT', 'MUI_UNABORTWARNING', 'MUI_UNABORTWARNING_TEXT',
+            'MUI_PAGE_WELCOME', 'MUI_PAGE_LICENSE', 'MUI_PAGE_COMPONENTS', 'MUI_PAGE_DIRECTORY',
+            'MUI_PAGE_STARTMENU', 'MUI_PAGE_INSTFILES', 'MUI_PAGE_FINISH', 'MUI_UNPAGE_WELCOME',
+            'MUI_UNPAGE_CONFIRM', 'MUI_UNPAGE_LICENSE', 'MUI_UNPAGE_COMPONENTS', 'MUI_UNPAGE_DIRECTORY',
+            'MUI_UNPAGE_INSTFILES', 'MUI_UNPAGE_FINISH', 'MUI_PAGE_HEADER_TEXT', 'MUI_PAGE_HEADER_SUBTEXT',
+            'MUI_WELCOMEPAGE_TITLE', 'MUI_WELCOMEPAGE_TITLE_3LINES', 'MUI_WELCOMEPAGE_TEXT',
+            'MUI_LICENSEPAGE_TEXT_TOP', 'MUI_LICENSEPAGE_TEXT_BOTTOM', 'MUI_LICENSEPAGE_BUTTON',
+            'MUI_LICENSEPAGE_CHECKBOX', 'MUI_LICENSEPAGE_CHECKBOX_TEXT', 'MUI_LICENSEPAGE_RADIOBUTTONS',
+            'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT', 'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE',
+            'MUI_COMPONENTSPAGE_TEXT_TOP', 'MUI_COMPONENTSPAGE_TEXT_COMPLIST', 'MUI_COMPONENTSPAGE_TEXT_INSTTYPE',
+            'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE', 'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO',
+            'MUI_DIRECTORYPAGE_TEXT_TOP', 'MUI_DIRECTORYPAGE_TEXT_DESTINATION', 'MUI_DIRECTORYPAGE_VARIABLE',
+            'MUI_DIRECTORYPAGE_VERIFYONLEAVE', 'MUI_STARTMENU_WRITE_BEGIN', 'MUI_STARTMENU_WRITE_END',
+            'MUI_STARTMENUPAGE_TEXT_TOP', 'MUI_STARTMENUPAGE_TEXT_CHECKBOX', 'MUI_STARTMENUPAGE_DEFAULTFOLDER',
+            'MUI_STARTMENUPAGE_NODISABLE', 'MUI_STARTMENUPAGE_REGISTRY_ROOT', 'MUI_STARTMENUPAGE_REGISTRY_KEY',
+            'MUI_STARTMENUPAGE_REGISTRY_VALUENAME', 'MUI_INSTFILESPAGE_FINISHHEADER_TEXT',
+            'MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT', 'MUI_INSTFILESPAGE_ABORTHEADER_TEXT',
+            'MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT', 'MUI_FINISHPAGE_TITLE', 'MUI_FINISHPAGE_TITLE_3LINES',
+            'MUI_FINISHPAGE_TEXT', 'MUI_FINISHPAGE_TEXT_LARGE', 'MUI_FINISHPAGE_BUTTON',
+            'MUI_FINISHPAGE_TEXT_REBOOT', 'MUI_FINISHPAGE_TEXT_REBOOTNOW', 'MUI_FINISHPAGE_TEXT_REBOOTLATER',
+            'MUI_FINISHPAGE_RUN', 'MUI_FINISHPAGE_RUN_TEXT', 'MUI_FINISHPAGE_RUN_PARAMETERS',
+            'MUI_FINISHPAGE_RUN_NOTCHECKED', 'MUI_FINISHPAGE_RUN_FUNCTION', 'MUI_FINISHPAGE_SHOWREADME',
+            'MUI_FINISHPAGE_SHOWREADME_TEXT', 'MUI_FINISHPAGE_SHOWREADME_NOTCHECKED',
+            'MUI_FINISHPAGE_SHOWREADME_FUNCTION', 'MUI_FINISHPAGE_LINK', 'MUI_FINISHPAGE_LINK_LOCATION',
+            'MUI_FINISHPAGE_LINK_COLOR', 'MUI_FINISHPAGE_NOREBOOTSUPPORT', 'MUI_UNCONFIRMPAGE_TEXT_TOP',
+            'MUI_UNCONFIRMPAGE_TEXT_LOCATION', 'MUI_LANGUAGE', 'MUI_LANGDLL_DISPLAY',
+            'MUI_LANGDLL_REGISTRY_ROOT', 'MUI_LANGDLL_REGISTRY_KEY', 'MUI_LANGDLL_REGISTRY_VALUENAME',
+            'MUI_LANGDLL_WINDOWTITLE', 'MUI_LANGDLL_INFO', 'MUI_LANGDLL_ALWAYSSHOW',
+            'MUI_RESERVEFILE_INSTALLOPTIONS', 'MUI_RESERVEFILE_LANGDLL', 'MUI_FUNCTION_DESCRIPTION_BEGIN',
+            'MUI_DESCRIPTION_TEXT', 'MUI_FUNCTION_DESCRIPTION_END', 'MUI_INSTALLOPTIONS_EXTRACT',
+            'MUI_INSTALLOPTIONS_EXTRACT_AS', 'MUI_HEADER_TEXT', 'MUI_INSTALLOPTIONS_DISPLAY',
+            'MUI_INSTALLOPTIONS_INITDIALOG', 'MUI_INSTALLOPTIONS_SHOW',
+            'MUI_INSTALLOPTIONS_DISPLAY_RETURN', 'MUI_INSTALLOPTIONS_SHOW_RETURN',
+            'MUI_INSTALLOPTIONS_READ', 'MUI_INSTALLOPTIONS_WRITE',
+            'MUI_CUSTOMFUNCTION_GUIINIT', 'MUI_CUSTOMFUNCTION_UNGUIINIT',
+            'MUI_CUSTOMFUNCTION_ABORT', 'MUI_CUSTOMFUNCTION_UNABORT',
+            'MUI_PAGE_CUSTOMFUNCTION_PRE', 'MUI_PAGE_CUSTOMFUNCTION_SHOW', 'MUI_PAGE_CUSTOMFUNCTION_LEAVE',
+            'MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT'
+            ),
+        9 => array(
+            'LogicLib.nsh', '${LOGICLIB}', 'LOGICLIB_STRCMP', 'LOGICLIB_INT64CMP', 'LOGICLIB_SECTIONCMP', '${If}', '${Unless}',
+            '${ElseIf}', '${ElseUnless}', '${Else}', '${EndIf}', '${EndUnless}', '${AndIf}', '${AndUnless}',
+            '${OrIf}', '${OrUnless}', '${IfThen}', '${IfCmd}', '${Select}', '${Case2}', '${Case3}',
+            '${Case4}', '${Case5}', '${CaseElse}', '${Default}', '${EndSelect}', '${Switch}',
+            '${Case}', '${EndSwitch}', '${Do}', '${DoWhile}', '${UntilWhile}', '${Continue}', '${Break}',
+            '${Loop}', '${LoopWhile}', '${LoopUntil}', '${While}', '${ExitWhile}', '${EndWhile}', '${For}',
+            '${ForEach}', '${ExitFor}', '${Next}', '${Abort}', '${Errors}', '${RebootFlag}', '${Silent}',
+            '${FileExists}', '${Cmd}', '${SectionIsSelected}', '${SectionIsSectionGroup}',
+            '${SectionIsSectionGroupEnd}', '${SectionIsBold}', '${SectionIsReadOnly}',
+            '${SectionIsExpanded}', '${SectionIsPartiallySelected}'
+            ),
+        10 => array(
+            'StrFunc.nsh', '${STRFUNC}', '${StrCase}', '${StrClb}', '${StrIOToNSIS}', '${StrLoc}', '${StrNSISToIO}', '${StrRep}',
+            '${StrSort}', '${StrStr}', '${StrStrAdv}', '${StrTok}', '${StrTrimNewLines}'
+            ),
+        11 => array(
+            'UpgradeDLL.nsh', 'UPGRADEDLL_INCLUDED', 'UpgradeDLL'
+            ),
+        12 => array(
+            'Sections.nsh', 'SECTIONS_INCLUDED', '${SF_SELECTED}', '${SF_SECGRP}', '${SF_SUBSEC}', '${SF_SECGRPEND}',
+            '${SF_SUBSECEND}', '${SF_BOLD}', '${SF_RO}', '${SF_EXPAND}', '${SF_PSELECTED}', '${SF_TOGGLED}',
+            '${SF_NAMECHG}', '${SECTION_OFF}', 'SelectSection', 'UnselectSection', 'ReverseSection',
+            'StartRadioButtons', 'RadioButton', 'EndRadioButtons', '${INSTTYPE_0}', '${INSTTYPE_1}', '${INSTTYPE_2}',
+            '${INSTTYPE_3}', '${INSTTYPE_4}', '${INSTTYPE_5}', '${INSTTYPE_6}', '${INSTTYPE_7}', '${INSTTYPE_8}',
+            '${INSTTYPE_9}', '${INSTTYPE_10}', '${INSTTYPE_11}', '${INSTTYPE_12}', '${INSTTYPE_13}', '${INSTTYPE_14}',
+            '${INSTTYPE_15}', '${INSTTYPE_16}', '${INSTTYPE_17}', '${INSTTYPE_18}', '${INSTTYPE_19}', '${INSTTYPE_20}',
+            '${INSTTYPE_21}', '${INSTTYPE_22}', '${INSTTYPE_23}', '${INSTTYPE_24}', '${INSTTYPE_25}', '${INSTTYPE_26}',
+            '${INSTTYPE_27}', '${INSTTYPE_28}', '${INSTTYPE_29}', '${INSTTYPE_30}', '${INSTTYPE_31}', '${INSTTYPE_32}',
+            'SetSectionInInstType', 'ClearSectionInInstType', 'SetSectionFlag', 'ClearSectionFlag', 'SectionFlagIsSet'
+            ),
+        13 => array(
+            'Colors.nsh', 'WHITE', 'BLACK', 'YELLOW', 'RED', 'GREEN', 'BLUE', 'MAGENTA', 'CYAN', 'rgb2hex'
+            ),
+        14 => array(
+            'FileFunc.nsh', '${Locate}', '${GetSize}', '${DriveSpace}', '${GetDrives}', '${GetTime}', '${GetFileAttributes}', '${GetFileVersion}', '${GetExeName}', '${GetExePath}', '${GetParameters}', '${GetOptions}', '${GetRoot}', '${GetParent}', '${GetFileName}', '${GetBaseName}', '${GetFileExt}', '${BannerTrimPath}', '${DirState}', '${RefreshShellIcons}'
+            ),
+        15 => array(
+            'TextFunc.nsh', '${LineFind}', '${LineRead}', '${FileReadFromEnd}', '${LineSum}', '${FileJoin}', '${TextCompare}', '${ConfigRead}', '${ConfigWrite}', '${FileRecode}', '${TrimNewLines}'
+            ),
+        16 => array(
+            'WordFunc.nsh', '${WordFind}', '${WordFind2X}', '${WordFind3X}', '${WordReplace}', '${WordAdd}', '${WordInsert}', '${StrFilter}', '${VersionCompare}', '${VersionConvert}'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight:bold;',
+            2 => 'color: #000066;',
+            3 => 'color: #003366;',
+            4 => 'color: #000099;',
+            5 => 'color: #ff6600;',
+            6 => 'color: #ff6600;',
+            7 => 'color: #006600;',
+            8 => 'color: #006600;',
+            9 => 'color: #006600;',
+            10 => 'color: #006600;',
+            11 => 'color: #006600;',
+            12 => 'color: #006600;',
+            13 => 'color: #006600;',
+            14 => 'color: #006600;',
+            15 => 'color: #006600;',
+            16 => 'color: #006600;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #660066; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #660066;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #660000;',
+            1 => 'color: #660000;',
+            2 => 'color: #660000;',
+            3 => 'color: #660000;',
+            4 => 'color: #660000;',
+            5 => 'color: #660000;',
+            6 => 'color: #660000;',
+            7 => 'color: #000099;',
+            8 => 'color: #003399;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => '\$\$',
+        1 => '\$\\r',
+        2 => '\$\\n',
+        3 => '\$\\t',
+        4 => '\$[a-zA-Z0-9_]+',
+        5 => '\$\{.{1,256}\}',
+        6 => '\$\\\(.{1,256}\\\)',
+        7 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2\\3'
+            ),
+        8 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:<PIPE>)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:<PIPE>)]*?\s)',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1\\2',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oberon2.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oberon2.php
new file mode 100644
index 000000000..4e4223f4f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oberon2.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * oberon2.php
+ * ----------
+ * Author: mbishop (mbishop@esoteriq.org)
+ * Copyright: (c) 2009 mbishop (mbishop@esoteriq.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/02/10
+ *
+ * Oberon-2 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ *
+ * TODO
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oberon-2',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ARRAY', 'BEGIN', 'BY', 'CASE',
+            'CONST', 'DIV', 'DO', 'ELSE', 'ELSIF', 'END',
+            'EXIT', 'FOR', 'IF', 'IMPORT', 'IN', 'IS',
+            'LOOP', 'MOD', 'MODULE', 'OF',
+            'OR', 'POINTER', 'PROCEDURE', 'RECORD',
+            'REPEAT', 'RETURN', 'THEN', 'TO',
+            'TYPE', 'UNTIL', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array(
+            'NIL', 'FALSE', 'TRUE',
+            ),
+        3 => array(
+            'ABS', 'ASH', 'ASSERT', 'CAP', 'CHR', 'COPY', 'DEC',
+            'ENTIER', 'EXCL', 'HALT', 'INC', 'INCL', 'LEN',
+            'LONG', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD', 'SHORT', 'SIZE'
+            ),
+        4 => array(
+            'BOOLEAN', 'CHAR', 'SHORTINT', 'LONGINT',
+            'INTEGER', 'LONGREAL', 'REAL', 'SET', 'PTR'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/', '#', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/objc.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/objc.php
new file mode 100644
index 000000000..ec8d18e72
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/objc.php
@@ -0,0 +1,358 @@
+<?php
+/*************************************************************************************
+ * objc.php
+ * --------
+ * Author: M. Uli Kusterer (witness.of.teachtext@gmx.net)
+ * Contributors: Quinn Taylor (quinntaylor@mac.com)
+ * Copyright: (c) 2008 Quinn Taylor, 2004 M. Uli Kusterer, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * Objective-C language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  Added support for @ before strings being highlighted
+ * 2008/06/10 (1.0.7.22)
+ *   -  Added keywords for Objective-C 2.0 (Leopard+).
+ *   -  Changed colors to match Xcode 3 highlighting more closely.
+ *   -  Updated API for AppKit and Foundation; added CoreData classes.
+ *   -  Updated URLs for AppKit and Foundation; split classes and protocols.
+ *   -  Sorted all keyword group in reverse-alpha order for correct matching.
+ *   -  Changed all keyword groups to be case-sensitive.
+ * 2004/11/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Objective-C',
+    'COMMENT_SINGLE' => array(
+        //Compiler directives
+        1 => '#',
+        //Single line C-Comments
+        2 => '//'
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline Continuation for single-line comment
+        2 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Pseudo-Highlighting of the @-sign before strings
+        3 => "/@(?=\")/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+
+    'KEYWORDS' => array(
+        // Objective-C keywords
+        1 => array(
+            'while', 'switch', 'return', 'in', 'if', 'goto', 'foreach', 'for',
+            'else', 'do', 'default', 'continue', 'case', '@try', '@throw',
+            '@synthesize', '@synchronized', '@selector', '@public', '@protocol',
+            '@protected', '@property', '@private', '@interface',
+            '@implementation', '@finally', '@end', '@encode', '@defs', '@class',
+            '@catch'
+            ),
+        // Macros and constants
+        2 => array(
+            'YES', 'USHRT_MAX', 'ULONG_MAX', 'UINT_MAX', 'UCHAR_MAX', 'true',
+            'TMP_MAX', 'stdout', 'stdin', 'stderr', 'SIGTERM', 'SIGSEGV',
+            'SIGINT', 'SIGILL', 'SIG_IGN', 'SIGFPE', 'SIG_ERR', 'SIG_DFL',
+            'SIGABRT', 'SHRT_MIN', 'SHRT_MAX', 'SEEK_SET', 'SEEK_END',
+            'SEEK_CUR', 'SCHAR_MIN', 'SCHAR_MAX', 'RAND_MAX', 'NULL',
+            'NO', 'nil', 'Nil', 'L_tmpnam', 'LONG_MIN', 'LONG_MAX',
+            'LDBL_MIN_EXP', 'LDBL_MIN', 'LDBL_MAX_EXP', 'LDBL_MAX',
+            'LDBL_MANT_DIG', 'LDBL_EPSILON', 'LDBL_DIG', 'INT_MIN', 'INT_MAX',
+            'HUGE_VAL', 'FOPEN_MAX', 'FLT_ROUNDS', 'FLT_RADIX', 'FLT_MIN_EXP',
+            'FLT_MIN', 'FLT_MAX_EXP', 'FLT_MAX', 'FLT_MANT_DIG', 'FLT_EPSILON',
+            'FLT_DIG', 'FILENAME_MAX', 'false', 'EXIT_SUCCESS', 'EXIT_FAILURE',
+            'errno', 'ERANGE', 'EOF', 'enum', 'EDOM', 'DBL_MIN_EXP', 'DBL_MIN',
+            'DBL_MAX_EXP', 'DBL_MAX', 'DBL_MANT_DIG', 'DBL_EPSILON', 'DBL_DIG',
+            'CLOCKS_PER_SEC', 'CHAR_MIN', 'CHAR_MAX', 'CHAR_BIT', 'BUFSIZ',
+            'break'
+            ),
+        // C standard library functions
+        3 => array(
+            'vsprintf', 'vprintf', 'vfprintf', 'va_start', 'va_end', 'va_arg',
+            'ungetc', 'toupper', 'tolower', 'tmpname', 'tmpfile', 'time',
+            'tanh', 'tan', 'system', 'strxfrm', 'strtoul', 'strtol', 'strtok',
+            'strtod', 'strstr', 'strspn', 'strrchr', 'strpbrk', 'strncpy',
+            'strncmp', 'strncat', 'strlen', 'strftime', 'strerror', 'strcspn',
+            'strcpy', 'strcoll', 'strcmp', 'strchr', 'strcat', 'sscanf',
+            'srand', 'sqrt', 'sprintf', 'snprintf', 'sizeof', 'sinh', 'sin',
+            'setvbuf', 'setjmp', 'setbuf', 'scanf', 'rewind', 'rename',
+            'remove', 'realloc', 'rand', 'qsort', 'puts', 'putchar', 'putc',
+            'printf', 'pow', 'perror', 'offsetof', 'modf', 'mktime', 'memset',
+            'memmove', 'memcpy', 'memcmp', 'memchr', 'malloc', 'longjmp',
+            'log10', 'log', 'localtime', 'ldiv', 'ldexp', 'labs', 'isxdigit',
+            'isupper', 'isspace', 'ispunct', 'isprint', 'islower',
+            'isgraph', 'isdigit', 'iscntrl', 'isalpha', 'isalnum', 'gmtime',
+            'gets', 'getenv', 'getchar', 'getc', 'fwrite', 'ftell', 'fsetpos',
+            'fseek', 'fscanf', 'frexp', 'freopen', 'free', 'fread', 'fputs',
+            'fputc', 'fprintf', 'fopen', 'fmod', 'floor', 'fgets', 'fgetpos',
+            'fgetc', 'fflush', 'ferror', 'feof', 'fclose', 'fabs', 'exp',
+            'exit', 'div', 'difftime', 'ctime', 'cosh', 'cos', 'clock',
+            'clearerr', 'ceil', 'calloc', 'bsearch', 'atol', 'atoi', 'atof',
+            'atexit', 'atan2', 'atan', 'assert', 'asin', 'asctime', 'acos',
+            'abs', 'abort'
+            ),
+        // Data types (C, Objective-C, Cocoa)
+        4 => array(
+            'volatile', 'void', 'va_list', 'unsigned', 'union', 'typedef', 'tm',
+            'time_t', 'struct', 'string', 'static', 'size_t',
+            'signed', 'signal', 'short', 'SEL', 'register', 'raise',
+            'ptrdiff_t', 'NSZone', 'NSRect', 'NSRange', 'NSPoint', 'long',
+            'ldiv_t', 'jmp_buf', 'int', 'IMP', 'id', 'fpos_t', 'float', 'FILE',
+            'extern', 'double', 'div_t', 'const', 'clock_t', 'Class', 'char',
+            'BOOL', 'auto'
+            ),
+        // Foundation classes
+        5 => array(
+            'NSXMLParser', 'NSXMLNode', 'NSXMLElement', 'NSXMLDTDNode',
+            'NSXMLDTD', 'NSXMLDocument', 'NSWhoseSpecifier',
+            'NSValueTransformer', 'NSValue', 'NSUserDefaults', 'NSURLResponse',
+            'NSURLRequest', 'NSURLProtocol', 'NSURLProtectionSpace',
+            'NSURLHandle', 'NSURLDownload', 'NSURLCredentialStorage',
+            'NSURLCredential', 'NSURLConnection', 'NSURLCache',
+            'NSURLAuthenticationChallenge', 'NSURL', 'NSUniqueIDSpecifier',
+            'NSUndoManager', 'NSUnarchiver', 'NSTimeZone', 'NSTimer',
+            'NSThread', 'NSTask', 'NSString', 'NSStream', 'NSSpellServer',
+            'NSSpecifierTest', 'NSSortDescriptor', 'NSSocketPortNameServer',
+            'NSSocketPort', 'NSSetCommand', 'NSSet', 'NSSerializer',
+            'NSScriptWhoseTest', 'NSScriptSuiteRegistry',
+            'NSScriptObjectSpecifier', 'NSScriptExecutionContext',
+            'NSScriptCommandDescription', 'NSScriptCommand',
+            'NSScriptCoercionHandler', 'NSScriptClassDescription', 'NSScanner',
+            'NSRunLoop', 'NSRelativeSpecifier', 'NSRecursiveLock',
+            'NSRangeSpecifier', 'NSRandomSpecifier', 'NSQuitCommand', 'NSProxy',
+            'NSProtocolChecker', 'NSPropertySpecifier',
+            'NSPropertyListSerialization', 'NSProcessInfo', 'NSPredicate',
+            'NSPositionalSpecifier', 'NSPortNameServer', 'NSPortMessage',
+            'NSPortCoder', 'NSPort', 'NSPointerFunctions', 'NSPointerArray',
+            'NSPipe', 'NSOutputStream', 'NSOperationQueue', 'NSOperation',
+            'NSObject', 'NSNumberFormatter', 'NSNumber', 'NSNull',
+            'NSNotificationQueue', 'NSNotificationCenter', 'NSNotification',
+            'NSNetServiceBrowser', 'NSNetService', 'NSNameSpecifier',
+            'NSMutableURLRequest', 'NSMutableString', 'NSMutableSet',
+            'NSMutableIndexSet', 'NSMutableDictionary', 'NSMutableData',
+            'NSMutableCharacterSet', 'NSMutableAttributedString',
+            'NSMutableArray', 'NSMoveCommand', 'NSMiddleSpecifier',
+            'NSMethodSignature', 'NSMetadataQueryResultGroup',
+            'NSMetadataQueryAttributeValueTuple', 'NSMetadataQuery',
+            'NSMetadataItem', 'NSMessagePortNameServer', 'NSMessagePort',
+            'NSMapTable', 'NSMachPort', 'NSMachBootstrapServer',
+            'NSLogicalTest', 'NSLock', 'NSLocale', 'NSKeyedUnarchiver',
+            'NSKeyedArchiver', 'NSInvocationOperation', 'NSInvocation',
+            'NSInputStream', 'NSIndexSpecifier', 'NSIndexSet', 'NSIndexPath',
+            'NSHTTPURLResponse', 'NSHTTPCookieStorage', 'NSHTTPCookie',
+            'NSHost', 'NSHashTable', 'NSGetCommand', 'NSGarbageCollector',
+            'NSFormatter', 'NSFileManager', 'NSFileHandle', 'NSExpression',
+            'NSExistsCommand', 'NSException', 'NSError', 'NSEnumerator',
+            'NSDistributedNotificationCenter', 'NSDistributedLock',
+            'NSDistantObjectRequest', 'NSDistantObject',
+            'NSDirectoryEnumerator', 'NSDictionary', 'NSDeserializer',
+            'NSDeleteCommand', 'NSDecimalNumberHandler', 'NSDecimalNumber',
+            'NSDateFormatter', 'NSDateComponents', 'NSDate', 'NSData',
+            'NSCreateCommand', 'NSCountedSet', 'NSCountCommand', 'NSConnection',
+            'NSConditionLock', 'NSCondition', 'NSCompoundPredicate',
+            'NSComparisonPredicate', 'NSCoder', 'NSCloseCommand',
+            'NSCloneCommand', 'NSClassDescription', 'NSCharacterSet',
+            'NSCalendarDate', 'NSCalendar', 'NSCachedURLResponse', 'NSBundle',
+            'NSAutoreleasePool', 'NSAttributedString', 'NSAssertionHandler',
+            'NSArray', 'NSArchiver', 'NSAppleScript', 'NSAppleEventManager',
+            'NSAppleEventDescriptor', 'NSAffineTransform'
+            ),
+        // Foundation protocols
+        6 => array(
+            'NSURLProtocolClient', 'NSURLHandleClient', 'NSURLClient',
+            'NSURLAuthenticationChallengeSender', 'NSScriptObjectSpecifiers',
+            'NSScriptKeyValueCoding', 'NSScriptingComparisonMethods',
+            'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
+            'NSLocking', 'NSKeyValueObserving', 'NSKeyValueCoding',
+            'NSFastEnumeration', 'NSErrorRecoveryAttempting',
+            'NSDecimalNumberBehaviors', 'NSCopying', 'NSComparisonMethods',
+            'NSCoding'
+            ),
+        // AppKit classes
+        7 => array(
+            'NSWorkspace', 'NSWindowController', 'NSWindow', 'NSViewController',
+            'NSViewAnimation', 'NSView', 'NSUserDefaultsController',
+            'NSTypesetter', 'NSTreeNode', 'NSTreeController', 'NSTrackingArea',
+            'NSToolbarItemGroup', 'NSToolbarItem', 'NSToolbar',
+            'NSTokenFieldCell', 'NSTokenField', 'NSTextView',
+            'NSTextTableBlock', 'NSTextTable', 'NSTextTab', 'NSTextStorage',
+            'NSTextList', 'NSTextFieldCell', 'NSTextField', 'NSTextContainer',
+            'NSTextBlock', 'NSTextAttachmentCell', 'NSTextAttachment', 'NSText',
+            'NSTabViewItem', 'NSTabView', 'NSTableView', 'NSTableHeaderView',
+            'NSTableHeaderCell', 'NSTableColumn', 'NSStepperCell', 'NSStepper',
+            'NSStatusItem', 'NSStatusBar', 'NSSplitView', 'NSSpellChecker',
+            'NSSpeechSynthesizer', 'NSSpeechRecognizer', 'NSSound',
+            'NSSliderCell', 'NSSlider', 'NSSimpleHorizontalTypesetter',
+            'NSShadow', 'NSSegmentedControl', 'NSSegmentedCell',
+            'NSSecureTextFieldCell', 'NSSecureTextField', 'NSSearchFieldCell',
+            'NSSearchField', 'NSScrollView', 'NSScroller', 'NSScreen',
+            'NSSavePanel', 'NSRulerView', 'NSRulerMarker', 'NSRuleEditor',
+            'NSResponder', 'NSQuickDrawView', 'NSProgressIndicator',
+            'NSPrintPanel', 'NSPrintOperation', 'NSPrintInfo', 'NSPrinter',
+            'NSPredicateEditorRowTemplate', 'NSPredicateEditor',
+            'NSPopUpButtonCell', 'NSPopUpButton', 'NSPICTImageRep',
+            'NSPersistentDocument', 'NSPDFImageRep', 'NSPathControl',
+            'NSPathComponentCell', 'NSPathCell', 'NSPasteboard',
+            'NSParagraphStyle', 'NSPanel', 'NSPageLayout', 'NSOutlineView',
+            'NSOpenPanel', 'NSOpenGLView', 'NSOpenGLPixelFormat',
+            'NSOpenGLPixelBuffer', 'NSOpenGLContext', 'NSObjectController',
+            'NSNibOutletConnector', 'NSNibControlConnector', 'NSNibConnector',
+            'NSNib', 'NSMutableParagraphStyle', 'NSMovieView', 'NSMovie',
+            'NSMenuView', 'NSMenuItemCell', 'NSMenuItem', 'NSMenu', 'NSMatrix',
+            'NSLevelIndicatorCell', 'NSLevelIndicator', 'NSLayoutManager',
+            'NSInputServer', 'NSInputManager', 'NSImageView', 'NSImageRep',
+            'NSImageCell', 'NSImage', 'NSHelpManager', 'NSGraphicsContext',
+            'NSGradient', 'NSGlyphInfo', 'NSGlyphGenerator', 'NSFormCell',
+            'NSForm', 'NSFontPanel', 'NSFontManager', 'NSFontDescriptor',
+            'NSFont', 'NSFileWrapper', 'NSEvent', 'NSEPSImageRep', 'NSDrawer',
+            'NSDocumentController', 'NSDocument', 'NSDockTile',
+            'NSDictionaryController', 'NSDatePickerCell', 'NSDatePicker',
+            'NSCustomImageRep', 'NSCursor', 'NSController', 'NSControl',
+            'NSComboBoxCell', 'NSComboBox', 'NSColorWell', 'NSColorSpace',
+            'NSColorPicker', 'NSColorPanel', 'NSColorList', 'NSColor',
+            'NSCollectionViewItem', 'NSCollectionView', 'NSClipView',
+            'NSCIImageRep', 'NSCell', 'NSCachedImageRep', 'NSButtonCell',
+            'NSButton', 'NSBrowserCell', 'NSBrowser', 'NSBox',
+            'NSBitmapImageRep', 'NSBezierPath', 'NSATSTypesetter',
+            'NSArrayController', 'NSApplication', 'NSAnimationContext',
+            'NSAnimation', 'NSAlert', 'NSActionCell'
+            ),
+        // AppKit protocols
+        8 => array(
+            'NSWindowScripting', 'NSValidatedUserInterfaceItem',
+            'NSUserInterfaceValidations', 'NSToolTipOwner',
+            'NSToolbarItemValidation', 'NSTextInput',
+            'NSTableDataSource', 'NSServicesRequests',
+            'NSPrintPanelAccessorizing', 'NSPlaceholders',
+            'NSPathControlDelegate', 'NSPathCellDelegate',
+            'NSOutlineViewDataSource', 'NSNibAwaking', 'NSMenuValidation',
+            'NSKeyValueBindingCreation', 'NSInputServiceProvider',
+            'NSInputServerMouseTracker', 'NSIgnoreMisspelledWords',
+            'NSGlyphStorage', 'NSFontPanelValidation', 'NSEditorRegistration',
+            'NSEditor', 'NSDraggingSource', 'NSDraggingInfo',
+            'NSDraggingDestination', 'NSDictionaryControllerKeyValuePair',
+            'NSComboBoxDataSource', 'NSComboBoxCellDataSource',
+            'NSColorPickingDefault', 'NSColorPickingCustom', 'NSChangeSpelling',
+            'NSAnimatablePropertyContainer', 'NSAccessibility'
+            ),
+        // CoreData classes
+        9 => array(
+            'NSRelationshipDescription', 'NSPropertyMapping',
+            'NSPropertyDescription', 'NSPersistentStoreCoordinator',
+            'NSPersistentStore', 'NSMigrationManager', 'NSMappingModel',
+            'NSManagedObjectModel', 'NSManagedObjectID',
+            'NSManagedObjectContext', 'NSManagedObject',
+            'NSFetchRequestExpression', 'NSFetchRequest',
+            'NSFetchedPropertyDescription', 'NSEntityMigrationPolicy',
+            'NSEntityMapping', 'NSEntityDescription', 'NSAttributeDescription',
+            'NSAtomicStoreCacheNode', 'NSAtomicStore'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    // Define the colors for the groups listed above
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a61390;', // Objective-C keywords
+            2 => 'color: #a61390;', // Macros and constants
+            3 => 'color: #a61390;', // C standard library functions
+            4 => 'color: #a61390;', // data types
+            5 => 'color: #400080;', // Foundation classes
+            6 => 'color: #2a6f76;', // Foundation protocols
+            7 => 'color: #400080;', // AppKit classes
+            8 => 'color: #2a6f76;', // AppKit protocols
+            9 => 'color: #400080;' // CoreData classes
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #6e371a;', // Preprocessor directives
+            2 => 'color: #11740a; font-style: italic;', // Normal C single-line comments
+            3 => 'color: #bf1d1a;', // Q-sign in front of Strings
+            'MULTI' => 'color: #11740a; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #002200;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #bf1d1a;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #002200;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAME}.html',
+        4 => '',
+        5 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Classes/{FNAME}_Class/',
+        6 => 'http://developer.apple.com/documentation/Cocoa/Reference/Foundation/Protocols/{FNAME}_Protocol/',
+        7 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/{FNAME}_Class/',
+        8 => 'http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Protocols/{FNAME}_Protocol/',
+        9 => 'http://developer.apple.com/documentation/Cocoa/Reference/CoreDataFramework/Classes/{FNAME}_Class/'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml-brief.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml-brief.php
new file mode 100644
index 000000000..c26a334de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml-brief.php
@@ -0,0 +1,111 @@
+<?php
+/*************************************************************************************
+ * ocaml.php
+ * ----------
+ * Author: Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/08/27
+ *
+ * OCaml (Objective Caml) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OCaml (brief)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* main OCaml keywords */
+        1 => array(
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
+            'end', 'exception', 'external', 'failwith', 'false', 'flush', 'for', 'fun', 'function', 'functor',
+            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
+            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
+            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml.php
new file mode 100644
index 000000000..505149c31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ocaml.php
@@ -0,0 +1,174 @@
+<?php
+/*************************************************************************************
+ * ocaml.php
+ * ----------
+ * Author: Flaie (fireflaie@gmail.com)
+ * Copyright: (c) 2005 Flaie, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/08/27
+ *
+ * OCaml (Objective Caml) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/03/29 (1.0.7.22)
+ *   -  Fixed warnings resulting from missing style information
+ * 2005/08/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/08/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OCaml',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* main OCaml keywords */
+        1 => array(
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
+            'end', 'exception', 'external', 'failwith', 'false', 'for', 'fun', 'function', 'functor',
+            'if', 'in', 'include', 'inherit',  'incr', 'land', 'let', 'load', 'los', 'lsl', 'lsr', 'lxor',
+            'match', 'method', 'mod', 'module', 'mutable', 'new', 'not', 'of', 'open', 'option', 'or', 'parser',
+            'private', 'ref', 'rec', 'raise', 'regexp', 'sig', 'struct', 'stdout', 'stdin', 'stderr', 'then',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Arg', 'Arith_status', 'Array', 'ArrayLabels', 'Big_int', 'Bigarray', 'Buffer', 'Callback',
+            'CamlinternalOO', 'Char', 'Complex', 'Condition', 'Dbm', 'Digest', 'Dynlink', 'Event',
+            'Filename', 'Format', 'Gc', 'Genlex', 'Graphics', 'GraphicsX11', 'Hashtbl', 'Int32', 'Int64',
+            'Lazy', 'Lexing', 'List', 'ListLabels', 'Map', 'Marshal', 'MoreLabels', 'Mutex', 'Nativeint',
+            'Num', 'Obj', 'Oo', 'Parsing', 'Pervasives', 'Printexc', 'Printf', 'Queue', 'Random', 'Scanf',
+            'Set', 'Sort', 'Stack', 'StdLabels', 'Str', 'Stream', 'String', 'StringLabels', 'Sys', 'Thread',
+            'ThreadUnix', 'Tk'
+            ),
+        /* just link to the Pervasives functions library, cause it's the default opened library when starting OCaml */
+        3 => array(
+            'abs', 'abs_float', 'acos', 'asin', 'at_exit', 'atan', 'atan2',
+            'bool_of_string', 'ceil', 'char_of_int', 'classify_float',
+            'close_in', 'close_in_noerr', 'close_out', 'close_out_noerr',
+            'compare', 'cos', 'cosh', 'decr', 'epsilon_float', 'exit', 'exp',
+            'float', 'float_of_int', 'float_of_string', 'floor', 'flush',
+            'flush_all', 'format_of_string', 'frexp', 'fst', 'ignore',
+            'in_channel_length', 'infinity', 'input', 'input_binary_int',
+            'input_byte', 'input_char', 'input_line', 'input_value',
+            'int_of_char', 'int_of_float', 'int_of_string', 'invalid_arg',
+            'ldexp', 'log', 'log10', 'max', 'max_float', 'max_int', 'min',
+            'min_float', 'min_int', 'mod_float', 'modf', 'nan', 'open_in',
+            'open_in_bin', 'open_in_gen', 'open_out', 'open_out_bin',
+            'open_out_gen', 'out_channel_length', 'output', 'output_binary_int',
+            'output_byte', 'output_char', 'output_string', 'output_value',
+            'pos_in', 'pos_out',  'pred', 'prerr_char', 'prerr_endline',
+            'prerr_float', 'prerr_int', 'prerr_newline', 'prerr_string',
+            'print_char', 'print_endline', 'print_float', 'print_int',
+            'print_newline', 'print_string', 'read_float', 'read_int',
+            'read_line', 'really_input', 'seek_in', 'seek_out',
+            'set_binary_mode_in', 'set_binary_mode_out', 'sin', 'sinh', 'snd',
+            'sqrt', 'string_of_bool', 'string_of_float', 'string_of_format',
+            'string_of_int', 'succ', 'tan', 'tanh', 'truncate'
+            ),
+        /* here Pervasives Types */
+        4 => array (
+            'fpclass', 'in_channel', 'out_channel', 'open_flag', 'Sys_error', 'format'
+            ),
+        /* finally Pervasives Exceptions */
+        5 => array (
+            'Exit', 'Invalid_Argument', 'Failure', 'Division_by_zero'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true, /* functions name are case sensitive */
+        3 => true, /* types name too */
+        4 => true, /* pervasives types */
+        5 => true  /* pervasives exceptions */
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* nice blue */
+            3 => 'color: #06c; font-weight: bold;', /* nice blue */
+            4 => 'color: #06c; font-weight: bold;', /* nice blue */
+            5 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/{FNAME}.html',
+        /* link to Pervasives functions */
+        3 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#VAL{FNAME}',
+        /* link to Pervasives type */
+        4 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#TYPE{FNAME}',
+        /* link to Pervasives exceptions */
+        5 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#EXCEPTION{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oobas.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oobas.php
new file mode 100644
index 000000000..b4f95512a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oobas.php
@@ -0,0 +1,135 @@
+<?php
+/*************************************************************************************
+ * oobas.php
+ * ---------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * OpenOffice.org Basic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'OpenOffice.org Basic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    //Single-Line comments using REM keyword
+    'COMMENT_REGEXP' => array(2 => '/\bREM.*?$/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'dim','private','public','global','as','if','redim','true','set','byval',
+            'false','bool','double','integer','long','object','single','variant',
+            'msgbox','print','inputbox','green','blue','red','qbcolor',
+            'rgb','open','close','reset','freefile','get','input','line',
+            'put','write','loc','seek','eof','lof','chdir','chdrive',
+            'curdir','dir','fileattr','filecopy','filedatetime','fileexists',
+            'filelen','getattr','kill','mkdir','name','rmdir','setattr',
+            'dateserial','datevalue','day','month','weekday','year','cdatetoiso',
+            'cdatefromiso','hour','minute','second','timeserial','timevalue',
+            'date','now','time','timer','erl','err','error','on','goto','resume',
+            'and','eqv','imp','not','or','xor','mod','atn','cos','sin','tan','log',
+            'exp','rnd','randomize','sqr','fix','int','abs','sgn','hex','oct',
+            'it','then','else','select','case','iif','do','loop','for','next','to',
+            'while','wend','gosub','return','call','choose','declare',
+            'end','exit','freelibrary','function','rem','stop','sub','switch','with',
+            'cbool','cdate','cdbl','cint','clng','const','csng','cstr','defbool',
+            'defdate','defdbl','defint','deflng','asc','chr','str','val','cbyte',
+            'space','string','format','lcase','left','lset','ltrim','mid','right',
+            'rset','rtrim','trim','ucase','split','join','converttourl','convertfromurl',
+            'instr','len','strcomp','beep','shell','wait','getsystemticks','environ',
+            'getsolarversion','getguitype','twipsperpixelx','twipsperpixely',
+            'createunostruct','createunoservice','getprocessservicemanager',
+            'createunodialog','createunolistener','createunovalue','thiscomponent',
+            'globalscope'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle11.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle11.php
new file mode 100644
index 000000000..e5417d7d0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle11.php
@@ -0,0 +1,614 @@
+<?php
+/*************************************************************************************
+ * oracle11.php
+ * -----------
+ * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
+ * Contributions:
+ * - Updated for 11i by Simon Redhead
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * Oracle 11i language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/04/08 (1.0.8)
+ *  -  SR changes to oracle8.php to support Oracle 11i reserved words.
+ * 2005/01/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oracle 11 SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+//        6 => array(
+//            ),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+//        5 => array(
+//            ),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+//        4 => array(
+//            ),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+//        3 => array(
+//            ),
+
+        //Put ORACLE reserved keywords here (11i).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'APPENDCHILDXML',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASCIISTR',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BIN_TO_NUM',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CARDINALITY',
+            'CASCADE',
+            'CASE',
+            'CAST',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'CLUSTER_ID',
+            'CLUSTER_PROBABILITY',
+            'CLUSTER_SET',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPOSE',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'CORR_K',
+            'CORR_S',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUBE_TABLE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRENT_DATE',
+            'CURRENT_TIMESTAMP',
+            'CURRVAL',
+            'CURSOR',
+            'CV',
+            'DATABASE',
+            'DATAOBJ_TO_PARTITION',
+            'DATE',
+            'DAY',
+            'DBTIMEZONE',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DECOMPOSE',
+            'DEFAULT',
+            'DELETE',
+            'DELETEXML',
+            'DENSE_RANK',
+            'DEPTH',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXISTSNODE',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'EXTRACTVALUE',
+            'FALSE',
+            'FEATURE_ID',
+            'FEATURE_SET',
+            'FEATURE_VALUE',
+            'FETCH',
+            'FILE',
+            'FIRST',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FROM_TZ',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUP_ID',
+            'GROUPING',
+            'GROUPING_ID',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSERTCHILDXML',
+            'INSERTXMLBEFORE',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'ITERATION_NUMBER',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LNNVL',
+            'LOCALTIMESTAMP',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MEDIAN',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NANVL',
+            'NATURAL',
+            'NATURALN',
+            'NCHR',
+            'NEW',
+            'NEW_TIME',
+            'NEXT_DAY',
+            'NEXTVAL',
+            'NLS_CHARSET_DECL_LEN',
+            'NLS_CHARSET_ID',
+            'NLS_CHARSET_NAME',
+            'NLS_INITCAP',
+            'NLS_LOWER',
+            'NLS_UPPER',
+            'NLSSORT',
+            'NOAUDIT',
+            'NOCOMPRESS',
+            'NOCOPY',
+            'NOT',
+            'NOWAIT',
+            'NTILE',
+            'NULL',
+            'NULLIF',
+            'NUMBER',
+            'NUMBER_BASE',
+            'NUMTODSINTERVAL',
+            'NUMTOYMINTERVAL',
+            'NVL',
+            'NVL2',
+            'OCIROWID',
+            'OF',
+            'OFFLINE',
+            'ON',
+            'ONLINE',
+            'OPAQUE',
+            'OPEN',
+            'OPERATOR',
+            'OPTION',
+            'OR',
+            'ORA_HASH',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PATH',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PERCENTILE_CONT',
+            'PERCENTILE_DISC',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'POWERMULTISET',
+            'POWERMULTISET_BY_CARDINALITY',
+            'PRAGMA',
+            'PREDICTION',
+            'PREDICTION_BOUNDS',
+            'PREDICTION_COST',
+            'PREDICTION_DETAILS',
+            'PREDICTION_PROBABILITY',
+            'PREDICTION_SET',
+            'PRESENTNNV',
+            'PRESENTV',
+            'PREVIOUS',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'RAWTONHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGEXP_COUNT',
+            'REGEXP_INSTR',
+            'REGEXP_REPLACE',
+            'REGEXP_SUBSTR',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'REMAINDER',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWIDTONCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SCN_TO_TIMESTAMP',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SESSIONTIMEZONE',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STATS_BINOMIAL_TEST',
+            'STATS_CROSSTAB',
+            'STATS_F_TEST',
+            'STATS_KS_TEST',
+            'STATS_MODE',
+            'STATS_MW_TEST',
+            'STATS_ONE_WAY_ANOVA',
+            'STATS_T_TEST_INDEP',
+            'STATS_T_TEST_INDEPU',
+            'STATS_T_TEST_ONE',
+            'STATS_T_TEST_PAIRED',
+            'STATS_WSR_TEST',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONNECT_BY_PATH',
+            'SYS_CONTEXT',
+            'SYS_DBURIGEN',
+            'SYS_EXTRACT_UTC',
+            'SYS_GUID',
+            'SYS_TYPEID',
+            'SYS_XMLAGG',
+            'SYS_XMLGEN',
+            'SYSDATE',
+            'SYSTEM',
+            'SYSTIMESTAMP',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMESTAMP_TO_SCN',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_BINARY_DOUBLE',
+            'TO_BINARY_FLOAT',
+            'TO_CHAR',
+            'TO_CLOB',
+            'TO_DATE',
+            'TO_DSINTERVAL',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NCHAR',
+            'TO_NCLOB',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TO_TIMESTAMP',
+            'TO_TIMESTAMP_TZ',
+            'TO_YMINTERVAL',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TREAT',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'TZ_OFFSET',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UNISTR',
+            'UPDATE',
+            'UPDATEXML',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WIDTH_BUCKET',
+            'WITH',
+            'WORK',
+            'WRITE',
+            'XMLAGG',
+            'XMLCAST',
+            'XMLCDATA',
+            'XMLCOLATTVAL',
+            'XMLCOMMENT',
+            'XMLCONCAT',
+            'XMLDIFF',
+            'XMLELEMENT',
+            'XMLEXISTS',
+            'XMLFOREST',
+            'XMLPARSE',
+            'XMLPATCH',
+            'XMLPI',
+            'XMLQUERY',
+            'XMLROOT',
+            'XMLSEQUENCE',
+            'XMLSERIALIZE',
+            'XMLTABLE',
+            'XMLTRANSFORM',
+            'YEAR',
+            'ZONE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        3 => false,
+//        4 => false,
+//        5 => false,
+//        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        3 => '',
+//        4 => '',
+//        5 => '',
+//        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle8.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle8.php
new file mode 100644
index 000000000..d216db0a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/oracle8.php
@@ -0,0 +1,496 @@
+<?php
+/*************************************************************************************
+ * oracle8.php
+ * -----------
+ * Author: Guy Wicks (Guy.Wicks@rbs.co.uk)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * Oracle 8 language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/01/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Oracle 8 SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+//Put your package names here - e.g. select distinct ''''|| lower(name) || ''',' from user_source;
+//        6 => array(
+//            ),
+
+//Put your table names here - e.g. select distinct ''''|| lower(table_name) || ''',' from user_tables;
+//        5 => array(
+//            ),
+
+//Put your view names here - e.g. select distinct ''''|| lower(view_name) || ''',' from user_views;
+//        4 => array(
+//            ),
+
+//Put your table field names here - e.g. select distinct ''''|| lower(column_name) || ''',' from user_tab_columns;
+//        3 => array(
+//            ),
+
+//Put ORACLE reserved keywords here (8.1.7).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CASCADE',
+            'CASE',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRVAL',
+            'CURSOR',
+            'DATABASE',
+            'DATE',
+            'DAY',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DEFAULT',
+            'DELETE',
+            'DENSE_RANK',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'FALSE',
+            'FETCH',
+            'FILE',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUPING',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NATURAL',
+            'NATURALN',
+            'NEW',
+            'NEW_TIME',
+            'NEXT_DAY',
+            'NEXTVAL',
+            'NLS_CHARSET_DECL_LEN',
+            'NLS_CHARSET_ID',
+            'NLS_CHARSET_NAME',
+            'NLS_INITCAP',
+            'NLS_LOWER',
+            'NLS_UPPER',
+            'NLSSORT',
+            'NOAUDIT',
+            'NOCOMPRESS',
+            'NOCOPY',
+            'NOT',
+            'NOWAIT',
+            'NTILE',
+            'NULL',
+            'NULLIF',
+            'NUMBER',
+            'NUMBER_BASE',
+            'NUMTODSINTERVAL',
+            'NUMTOYMINTERVAL',
+            'NVL',
+            'NVL2',
+            'OCIROWID',
+            'OF',
+            'OFFLINE',
+            'ON',
+            'ONLINE',
+            'OPAQUE',
+            'OPEN',
+            'OPERATOR',
+            'OPTION',
+            'OR',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'PRAGMA',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONTEXT',
+            'SYS_GUID',
+            'SYSDATE',
+            'SYSTEM',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_CHAR',
+            'TO_DATE',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UPDATE',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WITH',
+            'WORK',
+            'WRITE',
+            'YEAR',
+            'ZONE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', '+', '-', '*', '/', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        3 => false,
+//        4 => false,
+//        5 => false,
+//        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold; text-transform: uppercase;'
+//Add the styles for groups 3-6 here when used
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        3 => '',
+//        4 => '',
+//        5 => '',
+//        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pascal.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pascal.php
new file mode 100644
index 000000000..01a66bfa0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pascal.php
@@ -0,0 +1,152 @@
+<?php
+/*************************************************************************************
+ * pascal.php
+ * ----------
+ * Author: Tux (tux@inamil.cz)
+ * Copyright: (c) 2004 Tux (http://tux.a4.cz/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/26
+ *
+ * Pascal language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.2)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.1)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.0)
+ *   -  Added support for symbols
+ * 2004/07/27 (0.9.1)
+ *   -  Pascal is OO language. Some new words.
+ * 2004/07/26 (0.9.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Pascal',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('{' => '}','(*' => '*)'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'absolute','asm','assembler','begin','break','case','catch','cdecl',
+            'const','constructor','default','destructor','div','do','downto',
+            'else','end','except','export','exports','external','far',
+            'finalization','finally','for','forward','function','goto','if',
+            'implementation','in','index','inherited','initialization','inline',
+            'interface','interrupt','label','library','mod','name','not','of',
+            'or','overload','override','private','procedure','program',
+            'property','protected','public','published','raise','repeat',
+            'resourcestring','shl','shr','stdcall','stored','switch','then',
+            'to','try','type','unit','until','uses','var','while','xor'
+            ),
+        2 => array(
+            'nil', 'false', 'true',
+            ),
+        3 => array(
+            'abs','and','arc','arctan','blockread','blockwrite','chr','dispose',
+            'cos','eof','eoln','exp','get','ln','new','odd','ord','ordinal',
+            'pred','read','readln','sin','sqrt','succ','write','writeln'
+            ),
+        4 => array(
+            'ansistring','array','boolean','byte','bytebool','char','file',
+            'integer','longbool','longint','object','packed','pointer','real',
+            'record','set','shortint','smallint','string','union','word'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ',', ':', '=', '+', '-', '*', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0066ee;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/per.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/per.php
new file mode 100644
index 000000000..ea9c75f8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/per.php
@@ -0,0 +1,302 @@
+<?php
+/*************************************************************************************
+ * per.php
+ * --------
+ * Author: Lars Gersmann (lars.gersmann@gmail.com)
+ * Copyright: (c) 2007 Lars Gersmann
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/06/03
+ *
+ * Per (forms) (FOURJ's Genero 4GL) language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'per',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ACCELERATOR",
+            "ACCELERATOR2",
+            "ACTION",
+            "ALT",
+            "AND",
+            "AUTO",
+            "AUTONEXT",
+            "AUTOSCALE",
+            "BETWEEN",
+            "BOTH",
+            "BUTTON",
+            "BUTTONEDIT",
+            "BUTTONTEXTHIDDEN",
+            "BY",
+            "BYTE",
+            "CANVAS",
+            "CENTER",
+            "CHECKBOX",
+            "CLASS",
+            "COLOR",
+            "COLUMNS",
+            "COMBOBOX",
+            "COMMAND",
+            "COMMENT",
+            "COMMENTS",
+            "COMPACT",
+            "COMPRESS",
+            "CONFIG",
+            "CONTROL",
+            "CURRENT",
+            "DATABASE",
+            "DATEEDIT",
+            "DEC",
+            "DEFAULT",
+            "DEFAULTS",
+            "DELIMITERS",
+            "DISPLAY",
+            "DISPLAYONLY",
+            "DOWNSHIFT",
+            "DYNAMIC",
+            "EDIT",
+            "FIXED",
+            "FOLDER",
+            "FONTPITCH",
+            "FORMAT",
+            "FORMONLY",
+            "GRID",
+            "GRIDCHILDRENINPARENT",
+            "GROUP",
+            "HBOX",
+            "HEIGHT",
+            "HIDDEN",
+            "HORIZONTAL",
+            "INCLUDE",
+            "INITIAL",
+            "INITIALIZER",
+            "INPUT",
+            "INSTRUCTIONS",
+            "INTERVAL",
+            "INVISIBLE",
+            "IS",
+            "ITEM",
+            "ITEMS",
+            "JUSTIFY",
+            "KEY",
+            "KEYS",
+            "LABEL",
+            "LEFT",
+            "LIKE",
+            "LINES",
+            "MATCHES",
+            "NAME",
+            "NOENTRY",
+            "NONCOMPRESS",
+            "NORMAL",
+            "NOT",
+            "NOUPDATE",
+            "OPTIONS",
+            "OR",
+            "ORIENTATION",
+            "PACKED",
+            "PAGE",
+            "PICTURE",
+            "PIXELHEIGHT",
+            "PIXELS",
+            "PIXELWIDTH",
+            "POINTS",
+            "PROGRAM",
+            "PROGRESSBAR",
+            "QUERYCLEAR",
+            "QUERYEDITABLE",
+            "RADIOGROUP",
+            "RECORD",
+            "REQUIRED",
+            "REVERSE",
+            "RIGHT",
+            "SAMPLE",
+            "SCREEN",
+            "SCROLL",
+            "SCROLLBARS",
+            "SCROLLGRID",
+            "SECOND",
+            "SEPARATOR",
+            "SHIFT",
+            "SIZE",
+            "SIZEPOLICY",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "SPACING",
+            "STRETCH",
+            "STYLE",
+            "TABINDEX",
+            "TABLE",
+            "TAG",
+            "TEXT",
+            "TEXTEDIT",
+            "THROUGH",
+            "THRU",
+            "TITLE",
+            "TO",
+            "TOOLBAR",
+            "TOPMENU",
+            "TYPE",
+            "UNHIDABLE",
+            "UNHIDABLECOLUMNS",
+            "UNMOVABLE",
+            "UNMOVABLECOLUMNS",
+            "UNSIZABLE",
+            "UNSIZABLECOLUMNS",
+            "UNSORTABLE",
+            "UNSORTABLECOLUMNS",
+            "UPSHIFT",
+            "USER",
+            "VALIDATE",
+            "VALUECHECKED",
+            "VALUEMAX",
+            "VALUEMIN",
+            "VALUEUNCHECKED",
+            "VARCHAR",
+            "VARIABLE",
+            "VBOX",
+            "VERIFY",
+            "VERSION",
+            "VERTICAL",
+            "TIMESTAMP",
+            "WANTCOLUMNSANCHORED", /* to be removed! */
+            "WANTFIXEDPAGESIZE",
+            "WANTNORETURNS",
+            "WANTTABS",
+            "WHERE",
+            "WIDGET",
+            "WIDTH",
+            "WINDOWSTYLE",
+            "WITHOUT",
+            "WORDWRAP",
+            "X",
+            "Y",
+            "ZEROFILL",
+            "SCHEMA",
+            "ATTRIBUTES",
+            "TABLES",
+            "LAYOUT",
+            "END"
+            ),
+        2 => array(
+            "YEAR",
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "YELLOW",
+            "WHITE",
+            "UNDERLINE",
+            "CENTURY",
+            "FRACTION",
+            "CHAR",
+            "CHARACTER",
+            "CHARACTERS",
+            "CYAN",
+            "DATE",
+            "DATETIME",
+            "DAY",
+            "DECIMAL",
+            "FALSE",
+            "FLOAT",
+            "GREEN",
+            "HOUR",
+            "INT",
+            "INTEGER",
+            "MAGENTA",
+            "MINUTE",
+            "MONEY",
+            "NONE",
+            "NULL",
+            "REAL",
+            "RED",
+            "TRUE",
+            "TODAY",
+            "MONTH",
+            "IMAGE"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: green'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/perl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/perl.php
new file mode 100644
index 000000000..7c212515e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/perl.php
@@ -0,0 +1,213 @@
+<?php
+/*************************************************************************************
+ * perl.php
+ * --------
+ * Author: Andreas Gohr (andi@splitbrain.org), Ben Keen (ben.keen@gmail.com)
+ * Copyright: (c) 2004 Andreas Gohr, Ben Keen (http://www.benjaminkeen.org/), Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/20
+ *
+ * Perl language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/22 (1.0.8)
+ *   -  Added support for system calls in backticks (Corley Kinnane)
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *   -  Added comment_regexp for predefined variables
+ * 2008/02/15 (1.003)
+ *   -  Fixed SF#1891630 with placebo patch
+ * 2006/01/05 (1.0.2)
+ *   -  Used hardescape feature for ' strings (Cliff Stanford)
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/08/20 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * LABEL:
+ * * string comparison operators
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Perl',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(
+        '=back' => '=cut',
+        '=head' => '=cut',
+        '=item' => '=cut',
+        '=over' => '=cut',
+        '=begin' => '=cut',
+        '=end' => '=cut',
+        '=for' => '=cut',
+        '=encoding' => '=cut',
+        '=pod' => '=cut'
+        ),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        //Regular expression match variables
+        3 => '/\$\d+/',
+        //Heredoc
+        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Predefined variables
+        5 => '/\$(\^[a-zA-Z]?|[\*\$`\'&_\.,+\-~:;\\\\\/"\|%=\?!@#<>\(\)\[\]])(?!\w)|@[_+\-]|%[!]|\$(?=\{)/',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"','`'),
+    'HARDQUOTE' => array("'", "'"),            // An optional 2-element array defining the beginning and end of a hard-quoted string
+    'HARDESCAPE' => array('\\\'',),
+        // Things that must still be escaped inside a hard-quoted string
+        // If HARDQUOTE is defined, HARDESCAPE must be defined
+        // This will not work unless the first character of each element is either in the
+        // QUOTEMARKS array or is the ESCAPE_CHAR
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'elsif', 'for', 'if', 'then', 'until', 'while', 'foreach', 'my',
+            'xor', 'or', 'and', 'unless', 'next', 'last', 'redo', 'not', 'our',
+            'reset', 'continue', 'cmp', 'ne', 'eq', 'lt', 'gt', 'le', 'ge',
+            ),
+        2 => array(
+            'use', 'sub', 'new', '__END__', '__DATA__', '__DIE__', '__WARN__', 'BEGIN',
+            'STDIN', 'STDOUT', 'STDERR', 'ARGV', 'ARGVOUT'
+            ),
+        3 => array(
+            'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless',
+            'caller', 'chdir', 'chmod', 'chomp', 'chop', 'chown', 'chr',
+            'chroot', 'close', 'closedir', 'connect', 'cos',
+            'crypt', 'dbmclose', 'dbmopen', 'defined', 'delete', 'die',
+            'dump', 'each', 'endgrent', 'endhostent', 'endnetent', 'endprotoent',
+            'endpwent', 'endservent', 'eof', 'eval', 'exec', 'exists', 'exit',
+            'exp', 'fcntl', 'fileno', 'flock', 'fork', 'format', 'formline',
+            'getc', 'getgrent', 'getgrgid', 'getgrnam', 'gethostbyaddr',
+            'gethostbyname', 'gethostent', 'getlogin', 'getnetbyaddr', 'getnetbyname',
+            'getnetent', 'getpeername', 'getpgrp', 'getppid', 'getpriority',
+            'getprotobyname', 'getprotobynumber', 'getprotoent', 'getpwent',
+            'getpwnam', 'getpwuid', 'getservbyname', 'getservbyport', 'getservent',
+            'getsockname', 'getsockopt', 'glob', 'gmtime', 'goto', 'grep',
+            'hex', 'import', 'index', 'int', 'ioctl', 'join', 'keys', 'kill',
+            'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
+            'localtime', 'log', 'lstat', 'm', 'map', 'mkdir', 'msgctl', 'msgget',
+            'msgrcv', 'msgsnd', 'no', 'oct', 'open', 'opendir',
+            'ord', 'pack', 'package', 'pipe', 'pop', 'pos', 'print',
+            'printf', 'prototype', 'push', 'qq', 'qr', 'quotemeta', 'qw',
+            'qx', 'q', 'rand', 'read', 'readdir', 'readline', 'readlink', 'readpipe',
+            'recv', 'ref', 'rename', 'require', 'return',
+            'reverse', 'rewinddir', 'rindex', 'rmdir', 's', 'scalar', 'seek',
+            'seekdir', 'select', 'semctl', 'semget', 'semop', 'send', 'setgrent',
+            'sethostent', 'setnetent', 'setpgrp', 'setpriority', 'setprotoent',
+            'setpwent', 'setservent', 'setsockopt', 'shift', 'shmctl', 'shmget',
+            'shmread', 'shmwrite', 'shutdown', 'sin', 'sleep', 'socket', 'socketpair',
+            'sort', 'splice', 'split', 'sprintf', 'sqrt', 'srand', 'stat',
+            'study', 'substr', 'symlink', 'syscall', 'sysopen', 'sysread',
+            'sysseek', 'system', 'syswrite', 'tell', 'telldir', 'tie', 'tied',
+            'time', 'times', 'tr', 'truncate', 'uc', 'ucfirst', 'umask', 'undef',
+            'unlink', 'unpack', 'unshift', 'untie', 'utime', 'values',
+            'vec', 'wait', 'waitpid', 'wantarray', 'warn', 'write', 'y'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #cc0000; font-style: italic;',
+            5 => 'color: #0000ff;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            4 => 'color: #009999;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://perldoc.perl.org/functions/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '(?:\$[\$#]?|\\\\(?:[@%*]?|\\\\*\$|&amp;)|%[$]?|@[$]?|\*[$]?|&amp;[$]?)[a-zA-Z_][a-zA-Z0-9_]*',
+        //File Descriptor
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        )
+    )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php-brief.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php-brief.php
new file mode 100644
index 000000000..2a5d78611
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php-brief.php
@@ -0,0 +1,222 @@
+<?php
+/*************************************************************************************
+ * php-brief.php
+ * -------------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/02
+ *
+ * PHP (brief version) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Remove more functions that are hardly used
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PHP (brief)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Heredoc and Nowdoc syntax
+    'COMMENT_REGEXP' => array(3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |  GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'require', 'include_once', 'require_once',
+            'for', 'as', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
+            'return', 'break'
+            ),
+        2 => array(
+            'null', '__LINE__', '__FILE__',
+            'false', '&lt;?php',
+            'true', 'var', 'default',
+            'function', 'class', 'new', '&amp;new', 'public', 'private', 'interface', 'extends',
+            'const', 'self'
+            ),
+        3 => array(
+            'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
+            'trigger_error', 'user_error', 'set_error_handler', 'restore_error_handler', 'get_declared_classes', 'get_loaded_extensions',
+            'extension_loaded', 'get_extension_funcs', 'debug_backtrace',
+            'constant', 'bin2hex', 'sleep', 'usleep', 'time', 'mktime', 'gmmktime', 'strftime', 'gmstrftime', 'strtotime', 'date', 'gmdate', 'getdate', 'localtime', 'checkdate', 'flush', 'wordwrap', 'htmlspecialchars', 'htmlentities', 'html_entity_decode', 'md5', 'md5_file', 'crc32', 'getimagesize', 'image_type_to_mime_type', 'phpinfo', 'phpversion', 'phpcredits', 'strnatcmp', 'strnatcasecmp', 'substr_count', 'strspn', 'strcspn', 'strtok', 'strtoupper', 'strtolower', 'strpos', 'strrpos', 'strrev', 'hebrev', 'hebrevc', 'nl2br', 'basename', 'dirname', 'pathinfo', 'stripslashes', 'stripcslashes', 'strstr', 'stristr', 'strrchr', 'str_shuffle', 'str_word_count', 'strcoll', 'substr', 'substr_replace', 'quotemeta', 'ucfirst', 'ucwords', 'strtr', 'addslashes', 'addcslashes', 'rtrim', 'str_replace', 'str_repeat', 'count_chars', 'chunk_split', 'trim', 'ltrim', 'strip_tags', 'similar_text', 'explode', 'implode', 'setlocale', 'localeconv',
+            'parse_str', 'str_pad', 'chop', 'strchr', 'sprintf', 'printf', 'vprintf', 'vsprintf', 'sscanf', 'fscanf', 'parse_url', 'urlencode', 'urldecode', 'rawurlencode', 'rawurldecode', 'readlink', 'linkinfo', 'link', 'unlink', 'exec', 'system', 'escapeshellcmd', 'escapeshellarg', 'passthru', 'shell_exec', 'proc_open', 'proc_close', 'rand', 'srand', 'getrandmax', 'mt_rand', 'mt_srand', 'mt_getrandmax', 'base64_decode', 'base64_encode', 'abs', 'ceil', 'floor', 'round', 'is_finite', 'is_nan', 'is_infinite', 'bindec', 'hexdec', 'octdec', 'decbin', 'decoct', 'dechex', 'base_convert', 'number_format', 'fmod', 'ip2long', 'long2ip', 'getenv', 'putenv', 'getopt', 'microtime', 'gettimeofday', 'getrusage', 'uniqid', 'quoted_printable_decode', 'set_time_limit', 'get_cfg_var', 'magic_quotes_runtime', 'set_magic_quotes_runtime', 'get_magic_quotes_gpc', 'get_magic_quotes_runtime',
+            'import_request_variables', 'error_log', 'serialize', 'unserialize', 'memory_get_usage', 'var_dump', 'var_export', 'debug_zval_dump', 'print_r','highlight_file', 'show_source', 'highlight_string', 'ini_get', 'ini_get_all', 'ini_set', 'ini_alter', 'ini_restore', 'get_include_path', 'set_include_path', 'restore_include_path', 'setcookie', 'header', 'headers_sent', 'connection_aborted', 'connection_status', 'ignore_user_abort', 'parse_ini_file', 'is_uploaded_file', 'move_uploaded_file', 'intval', 'floatval', 'doubleval', 'strval', 'gettype', 'settype', 'is_null', 'is_resource', 'is_bool', 'is_long', 'is_float', 'is_int', 'is_integer', 'is_double', 'is_real', 'is_numeric', 'is_string', 'is_array', 'is_object', 'is_scalar',
+            'ereg', 'ereg_replace', 'eregi', 'eregi_replace', 'split', 'spliti', 'join', 'sql_regcase', 'dl', 'pclose', 'popen', 'readfile', 'rewind', 'rmdir', 'umask', 'fclose', 'feof', 'fgetc', 'fgets', 'fgetss', 'fread', 'fopen', 'fpassthru', 'ftruncate', 'fstat', 'fseek', 'ftell', 'fflush', 'fwrite', 'fputs', 'mkdir', 'rename', 'copy', 'tempnam', 'tmpfile', 'file', 'file_get_contents', 'stream_select', 'stream_context_create', 'stream_context_set_params', 'stream_context_set_option', 'stream_context_get_options', 'stream_filter_prepend', 'stream_filter_append', 'fgetcsv', 'flock', 'get_meta_tags', 'stream_set_write_buffer', 'set_file_buffer', 'set_socket_blocking', 'stream_set_blocking', 'socket_set_blocking', 'stream_get_meta_data', 'stream_register_wrapper', 'stream_wrapper_register', 'stream_set_timeout', 'socket_set_timeout', 'socket_get_status', 'realpath', 'fnmatch', 'fsockopen', 'pfsockopen', 'pack', 'unpack', 'get_browser', 'crypt', 'opendir', 'closedir', 'chdir', 'getcwd', 'rewinddir', 'readdir', 'dir', 'glob', 'fileatime', 'filectime', 'filegroup', 'fileinode', 'filemtime', 'fileowner', 'fileperms', 'filesize', 'filetype', 'file_exists', 'is_writable', 'is_writeable', 'is_readable', 'is_executable', 'is_file', 'is_dir', 'is_link', 'stat', 'lstat', 'chown',
+            'touch', 'clearstatcache', 'mail', 'ob_start', 'ob_flush', 'ob_clean', 'ob_end_flush', 'ob_end_clean', 'ob_get_flush', 'ob_get_clean', 'ob_get_length', 'ob_get_level', 'ob_get_status', 'ob_get_contents', 'ob_implicit_flush', 'ob_list_handlers', 'ksort', 'krsort', 'natsort', 'natcasesort', 'asort', 'arsort', 'sort', 'rsort', 'usort', 'uasort', 'uksort', 'shuffle', 'array_walk', 'count', 'end', 'prev', 'next', 'reset', 'current', 'key', 'min', 'max', 'in_array', 'array_search', 'extract', 'compact', 'array_fill', 'range', 'array_multisort', 'array_push', 'array_pop', 'array_shift', 'array_unshift', 'array_splice', 'array_slice', 'array_merge', 'array_merge_recursive', 'array_keys', 'array_values', 'array_count_values', 'array_reverse', 'array_reduce', 'array_pad', 'array_flip', 'array_change_key_case', 'array_rand', 'array_unique', 'array_intersect', 'array_intersect_assoc', 'array_diff', 'array_diff_assoc', 'array_sum', 'array_filter', 'array_map', 'array_chunk', 'array_key_exists', 'pos', 'sizeof', 'key_exists', 'assert', 'assert_options', 'version_compare', 'ftok', 'str_rot13', 'aggregate',
+            'session_name', 'session_module_name', 'session_save_path', 'session_id', 'session_regenerate_id', 'session_decode', 'session_register', 'session_unregister', 'session_is_registered', 'session_encode',
+            'session_start', 'session_destroy', 'session_unset', 'session_set_save_handler', 'session_cache_limiter', 'session_cache_expire', 'session_set_cookie_params', 'session_get_cookie_params', 'session_write_close', 'preg_match', 'preg_match_all', 'preg_replace', 'preg_replace_callback', 'preg_split', 'preg_quote', 'preg_grep', 'overload', 'ctype_alnum', 'ctype_alpha', 'ctype_cntrl', 'ctype_digit', 'ctype_lower', 'ctype_graph', 'ctype_print', 'ctype_punct', 'ctype_space', 'ctype_upper', 'ctype_xdigit', 'virtual', 'apache_request_headers', 'apache_note', 'apache_lookup_uri', 'apache_child_terminate', 'apache_setenv', 'apache_response_headers', 'apache_get_version', 'getallheaders', 'mysql_connect', 'mysql_pconnect', 'mysql_close', 'mysql_select_db', 'mysql_create_db', 'mysql_drop_db', 'mysql_query', 'mysql_unbuffered_query', 'mysql_db_query', 'mysql_list_dbs', 'mysql_list_tables', 'mysql_list_fields', 'mysql_list_processes', 'mysql_error', 'mysql_errno', 'mysql_affected_rows', 'mysql_insert_id', 'mysql_result', 'mysql_num_rows', 'mysql_num_fields', 'mysql_fetch_row', 'mysql_fetch_array', 'mysql_fetch_assoc', 'mysql_fetch_object', 'mysql_data_seek', 'mysql_fetch_lengths', 'mysql_fetch_field', 'mysql_field_seek', 'mysql_free_result', 'mysql_field_name', 'mysql_field_table', 'mysql_field_len', 'mysql_field_type', 'mysql_field_flags', 'mysql_escape_string', 'mysql_real_escape_string', 'mysql_stat',
+            'mysql_thread_id', 'mysql_client_encoding', 'mysql_get_client_info', 'mysql_get_host_info', 'mysql_get_proto_info', 'mysql_get_server_info', 'mysql_info', 'mysql', 'mysql_fieldname', 'mysql_fieldtable', 'mysql_fieldlen', 'mysql_fieldtype', 'mysql_fieldflags', 'mysql_selectdb', 'mysql_createdb', 'mysql_dropdb', 'mysql_freeresult', 'mysql_numfields', 'mysql_numrows', 'mysql_listdbs', 'mysql_listtables', 'mysql_listfields', 'mysql_db_name', 'mysql_dbname', 'mysql_tablename', 'mysql_table_name', 'pg_connect', 'pg_pconnect', 'pg_close', 'pg_connection_status', 'pg_connection_busy', 'pg_connection_reset', 'pg_host', 'pg_dbname', 'pg_port', 'pg_tty', 'pg_options', 'pg_ping', 'pg_query', 'pg_send_query', 'pg_cancel_query', 'pg_fetch_result', 'pg_fetch_row', 'pg_fetch_assoc', 'pg_fetch_array', 'pg_fetch_object', 'pg_fetch_all', 'pg_affected_rows', 'pg_get_result', 'pg_result_seek', 'pg_result_status', 'pg_free_result', 'pg_last_oid', 'pg_num_rows', 'pg_num_fields', 'pg_field_name', 'pg_field_num', 'pg_field_size', 'pg_field_type', 'pg_field_prtlen', 'pg_field_is_null', 'pg_get_notify', 'pg_get_pid', 'pg_result_error', 'pg_last_error', 'pg_last_notice', 'pg_put_line', 'pg_end_copy', 'pg_copy_to', 'pg_copy_from',
+            'pg_trace', 'pg_untrace', 'pg_lo_create', 'pg_lo_unlink', 'pg_lo_open', 'pg_lo_close', 'pg_lo_read', 'pg_lo_write', 'pg_lo_read_all', 'pg_lo_import', 'pg_lo_export', 'pg_lo_seek', 'pg_lo_tell', 'pg_escape_string', 'pg_escape_bytea', 'pg_unescape_bytea', 'pg_client_encoding', 'pg_set_client_encoding', 'pg_meta_data', 'pg_convert', 'pg_insert', 'pg_update', 'pg_delete', 'pg_select', 'pg_exec', 'pg_getlastoid', 'pg_cmdtuples', 'pg_errormessage', 'pg_numrows', 'pg_numfields', 'pg_fieldname', 'pg_fieldsize', 'pg_fieldtype', 'pg_fieldnum', 'pg_fieldprtlen', 'pg_fieldisnull', 'pg_freeresult', 'pg_result', 'pg_loreadall', 'pg_locreate', 'pg_lounlink', 'pg_loopen', 'pg_loclose', 'pg_loread', 'pg_lowrite', 'pg_loimport', 'pg_loexport',
+            'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '<%=', '%>', '<?', '<?=', '?>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #0000cc; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<?php' => '?>'
+            ),
+        1 => array(
+            '<?' => '?>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        3 => array(
+            '<script language="php">' => '</script>'
+            ),
+        4 => "/(?<start><\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?<end>\\?>|\Z)/sm",
+        5 => "/(?<start><%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?<end>%>)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php.php
new file mode 100644
index 000000000..b96c947ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/php.php
@@ -0,0 +1,1114 @@
+<?php
+/*************************************************************************************
+ * php.php
+ * --------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/20
+ *
+ * PHP language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/25 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *  -  Added URL support
+ *  -  Added extra constants
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Make sure the last few function I may have missed
+ *   (like eval()) are included for highlighting
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'PHP',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Heredoc and Nowdoc syntax
+        3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+?)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        // phpdoc comments
+        4 => '#/\*\*(?![\*\/]).*\*/#sU',
+        // Advanced # handling
+        2 => "/#.*?(?:(?=\?\>)|^)/smi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Octal Char Specs
+        3 => "#\\\\[0-7]{1,3}#",
+        //String Parsing of Variable Names
+        4 => "#\\$[a-z0-9_]+(?:\\[[a-z0-9_]+\\]|->[a-z0-9_]+)?|(?:\\{\\$|\\$\\{)[a-z0-9_]+(?:\\[('?)[a-z0-9_]*\\1\\]|->[a-z0-9_]+)*\\}#i",
+        //Experimental extension supporting cascaded {${$var}} syntax
+        5 => "#\$[a-z0-9_]+(?:\[[a-z0-9_]+\]|->[a-z0-9_]+)?|(?:\{\$|\$\{)[a-z0-9_]+(?:\[('?)[a-z0-9_]*\\1\]|->[a-z0-9_]+)*\}|\{\$(?R)\}#i",
+        //Format String support in ""-Strings
+        6 => "#%(?:%|(?:\d+\\\\\\\$)?\\+?(?:\x20|0|'.)?-?(?:\d+|\\*)?(?:\.\d+)?[bcdefFosuxX])#"
+        ),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_OCT_PREFIX | GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'as','break','case','continue','default','do','else','elseif',
+            'endfor','endforeach','endif','endswitch','endwhile','for',
+            'foreach','if','include','include_once','require','require_once',
+            'return','switch','while',
+
+            'echo','print'
+            ),
+        2 => array(
+            '&amp;new','&lt;/script&gt;','&lt;?php','&lt;script language',
+            'class','const','declare','extends','function','global','interface',
+            'namespace','new','private','public','self','var'
+            ),
+        3 => array(
+            'abs','acos','acosh','addcslashes','addslashes','aggregate',
+            'aggregate_methods','aggregate_methods_by_list',
+            'aggregate_methods_by_regexp','aggregate_properties',
+            'aggregate_properties_by_list','aggregate_properties_by_regexp',
+            'aggregation_info','apache_child_terminate','apache_get_modules',
+            'apache_get_version','apache_getenv','apache_lookup_uri',
+            'apache_note','apache_request_headers','apache_response_headers',
+            'apache_setenv','array','array_change_key_case','array_chunk',
+            'array_combine','array_count_values','array_diff',
+            'array_diff_assoc','array_diff_key','array_diff_uassoc',
+            'array_diff_ukey','array_fill','array_fill_keys','array_filter',
+            'array_flip','array_intersect','array_intersect_assoc',
+            'array_intersect_key','array_intersect_uassoc',
+            'array_intersect_ukey','array_key_exists','array_keys','array_map',
+            'array_merge','array_merge_recursive','array_multisort','array_pad',
+            'array_pop','array_product','array_push','array_rand',
+            'array_reduce','array_reverse','array_search','array_shift',
+            'array_slice','array_splice','array_sum','array_udiff',
+            'array_udiff_assoc','array_udiff_uassoc','array_uintersect',
+            'array_uintersect_assoc','array_uintersect_uassoc','array_unique',
+            'array_unshift','array_values','array_walk','array_walk_recursive',
+            'arsort','asin','asinh','asort','assert','assert_options','atan',
+            'atan2','atanh','base_convert','base64_decode','base64_encode',
+            'basename','bcadd','bccomp','bcdiv','bcmod','bcmul',
+            'bcompiler_load','bcompiler_load_exe','bcompiler_parse_class',
+            'bcompiler_read','bcompiler_write_class','bcompiler_write_constant',
+            'bcompiler_write_exe_footer','bcompiler_write_file',
+            'bcompiler_write_footer','bcompiler_write_function',
+            'bcompiler_write_functions_from_file','bcompiler_write_header',
+            'bcompiler_write_included_filename','bcpow','bcpowmod','bcscale',
+            'bcsqrt','bcsub','bin2hex','bindec','bindtextdomain',
+            'bind_textdomain_codeset','bitset_empty','bitset_equal',
+            'bitset_excl','bitset_fill','bitset_from_array','bitset_from_hash',
+            'bitset_from_string','bitset_in','bitset_incl',
+            'bitset_intersection','bitset_invert','bitset_is_empty',
+            'bitset_subset','bitset_to_array','bitset_to_hash',
+            'bitset_to_string','bitset_union','blenc_encrypt','bzclose',
+            'bzcompress','bzdecompress','bzerrno','bzerror','bzerrstr',
+            'bzflush','bzopen','bzread','bzwrite','cal_days_in_month',
+            'cal_from_jd','cal_info','cal_to_jd','call_user_func',
+            'call_user_func_array','call_user_method','call_user_method_array',
+            'ceil','chdir','checkdate','checkdnsrr','chgrp','chmod','chop',
+            'chown','chr','chunk_split','class_exists','class_implements',
+            'class_parents','classkit_aggregate_methods',
+            'classkit_doc_comments','classkit_import','classkit_method_add',
+            'classkit_method_copy','classkit_method_redefine',
+            'classkit_method_remove','classkit_method_rename','clearstatcache',
+            'closedir','closelog','com_create_guid','com_event_sink',
+            'com_get_active_object','com_load_typelib','com_message_pump',
+            'com_print_typeinfo','compact','confirm_phpdoc_compiled',
+            'connection_aborted','connection_status','constant',
+            'convert_cyr_string','convert_uudecode','convert_uuencode','copy',
+            'cos','cosh','count','count_chars','cpdf_add_annotation',
+            'cpdf_add_outline','cpdf_arc','cpdf_begin_text','cpdf_circle',
+            'cpdf_clip','cpdf_close','cpdf_closepath',
+            'cpdf_closepath_fill_stroke','cpdf_closepath_stroke',
+            'cpdf_continue_text','cpdf_curveto','cpdf_end_text','cpdf_fill',
+            'cpdf_fill_stroke','cpdf_finalize','cpdf_finalize_page',
+            'cpdf_global_set_document_limits','cpdf_import_jpeg','cpdf_lineto',
+            'cpdf_moveto','cpdf_newpath','cpdf_open','cpdf_output_buffer',
+            'cpdf_page_init','cpdf_rect','cpdf_restore','cpdf_rlineto',
+            'cpdf_rmoveto','cpdf_rotate','cpdf_rotate_text','cpdf_save',
+            'cpdf_save_to_file','cpdf_scale','cpdf_set_action_url',
+            'cpdf_set_char_spacing','cpdf_set_creator','cpdf_set_current_page',
+            'cpdf_set_font','cpdf_set_font_directories',
+            'cpdf_set_font_map_file','cpdf_set_horiz_scaling',
+            'cpdf_set_keywords','cpdf_set_leading','cpdf_set_page_animation',
+            'cpdf_set_subject','cpdf_set_text_matrix','cpdf_set_text_pos',
+            'cpdf_set_text_rendering','cpdf_set_text_rise','cpdf_set_title',
+            'cpdf_set_viewer_preferences','cpdf_set_word_spacing',
+            'cpdf_setdash','cpdf_setflat','cpdf_setgray','cpdf_setgray_fill',
+            'cpdf_setgray_stroke','cpdf_setlinecap','cpdf_setlinejoin',
+            'cpdf_setlinewidth','cpdf_setmiterlimit','cpdf_setrgbcolor',
+            'cpdf_setrgbcolor_fill','cpdf_setrgbcolor_stroke','cpdf_show',
+            'cpdf_show_xy','cpdf_stringwidth','cpdf_stroke','cpdf_text',
+            'cpdf_translate','crack_check','crack_closedict',
+            'crack_getlastmessage','crack_opendict','crc32','create_function',
+            'crypt','ctype_alnum','ctype_alpha','ctype_cntrl','ctype_digit',
+            'ctype_graph','ctype_lower','ctype_print','ctype_punct',
+            'ctype_space','ctype_upper','ctype_xdigit','curl_close',
+            'curl_copy_handle','curl_errno','curl_error','curl_exec',
+            'curl_getinfo','curl_init','curl_multi_add_handle',
+            'curl_multi_close','curl_multi_exec','curl_multi_getcontent',
+            'curl_multi_info_read','curl_multi_init','curl_multi_remove_handle',
+            'curl_multi_select','curl_setopt','curl_setopt_array',
+            'curl_version','current','cvsclient_connect','cvsclient_log',
+            'cvsclient_login','cvsclient_retrieve','date','date_create',
+            'date_date_set','date_default_timezone_get',
+            'date_default_timezone_set','date_format','date_isodate_set',
+            'date_modify','date_offset_get','date_parse','date_sun_info',
+            'date_sunrise','date_sunset','date_time_set','date_timezone_get',
+            'date_timezone_set','db_id_list','dba_close','dba_delete',
+            'dba_exists','dba_fetch','dba_firstkey','dba_handlers','dba_insert',
+            'dba_key_split','dba_list','dba_nextkey','dba_open','dba_optimize',
+            'dba_popen','dba_replace','dba_sync','dbase_add_record',
+            'dbase_close','dbase_create','dbase_delete_record',
+            'dbase_get_header_info','dbase_get_record',
+            'dbase_get_record_with_names','dbase_numfields','dbase_numrecords',
+            'dbase_open','dbase_pack','dbase_replace_record',
+            'dbg_get_all_contexts','dbg_get_all_module_names',
+            'dbg_get_all_source_lines','dbg_get_context_name',
+            'dbg_get_module_name','dbg_get_profiler_results',
+            'dbg_get_source_context','dblist','dbmclose','dbmdelete',
+            'dbmexists','dbmfetch','dbmfirstkey','dbminsert','dbmnextkey',
+            'dbmopen','dbmreplace','dbx_close','dbx_compare','dbx_connect',
+            'dbx_error','dbx_escape_string','dbx_fetch_row','dbx_query',
+            'dbx_sort','dcgettext','dcngettext','deaggregate','debug_backtrace',
+            'debug_zval_dump','debugbreak','decbin','dechex','decoct','define',
+            'defined','define_syslog_variables','deg2rad','dgettext','die',
+            'dio_close','dio_open','dio_read','dio_seek','dio_stat','dio_write',
+            'dir','dirname','disk_free_space','disk_total_space',
+            'diskfreespace','dl','dngettext','docblock_token_name',
+            'docblock_tokenize','dom_import_simplexml','domxml_add_root',
+            'domxml_attributes','domxml_children','domxml_doc_add_root',
+            'domxml_doc_document_element','domxml_doc_get_element_by_id',
+            'domxml_doc_get_elements_by_tagname','domxml_doc_get_root',
+            'domxml_doc_set_root','domxml_doc_validate','domxml_doc_xinclude',
+            'domxml_dump_mem','domxml_dump_mem_file','domxml_dump_node',
+            'domxml_dumpmem','domxml_elem_get_attribute',
+            'domxml_elem_set_attribute','domxml_get_attribute','domxml_getattr',
+            'domxml_html_dump_mem','domxml_new_child','domxml_new_doc',
+            'domxml_new_xmldoc','domxml_node','domxml_node_add_namespace',
+            'domxml_node_attributes','domxml_node_children',
+            'domxml_node_get_content','domxml_node_has_attributes',
+            'domxml_node_new_child','domxml_node_set_content',
+            'domxml_node_set_namespace','domxml_node_unlink_node',
+            'domxml_open_file','domxml_open_mem','domxml_parser',
+            'domxml_parser_add_chunk','domxml_parser_cdata_section',
+            'domxml_parser_characters','domxml_parser_comment',
+            'domxml_parser_end','domxml_parser_end_document',
+            'domxml_parser_end_element','domxml_parser_entity_reference',
+            'domxml_parser_get_document','domxml_parser_namespace_decl',
+            'domxml_parser_processing_instruction',
+            'domxml_parser_start_document','domxml_parser_start_element',
+            'domxml_root','domxml_set_attribute','domxml_setattr',
+            'domxml_substitute_entities_default','domxml_unlink_node',
+            'domxml_version','domxml_xmltree','doubleval','each','easter_date',
+            'easter_days','empty','end','ereg','ereg_replace','eregi',
+            'eregi_replace','error_get_last','error_log','error_reporting',
+            'escapeshellarg','escapeshellcmd','eval','event_deschedule',
+            'event_dispatch','event_free','event_handle_signal',
+            'event_have_events','event_init','event_new','event_pending',
+            'event_priority_set','event_schedule','event_set','event_timeout',
+            'exec','exif_imagetype','exif_read_data','exif_tagname',
+            'exif_thumbnail','exit','exp','explode','expm1','extension_loaded',
+            'extract','ezmlm_hash','fbird_add_user','fbird_affected_rows',
+            'fbird_backup','fbird_blob_add','fbird_blob_cancel',
+            'fbird_blob_close','fbird_blob_create','fbird_blob_echo',
+            'fbird_blob_get','fbird_blob_import','fbird_blob_info',
+            'fbird_blob_open','fbird_close','fbird_commit','fbird_commit_ret',
+            'fbird_connect','fbird_db_info','fbird_delete_user','fbird_drop_db',
+            'fbird_errcode','fbird_errmsg','fbird_execute','fbird_fetch_assoc',
+            'fbird_fetch_object','fbird_fetch_row','fbird_field_info',
+            'fbird_free_event_handler','fbird_free_query','fbird_free_result',
+            'fbird_gen_id','fbird_maintain_db','fbird_modify_user',
+            'fbird_name_result','fbird_num_fields','fbird_num_params',
+            'fbird_param_info','fbird_pconnect','fbird_prepare','fbird_query',
+            'fbird_restore','fbird_rollback','fbird_rollback_ret',
+            'fbird_server_info','fbird_service_attach','fbird_service_detach',
+            'fbird_set_event_handler','fbird_trans','fbird_wait_event','fclose',
+            'fdf_add_doc_javascript','fdf_add_template','fdf_close',
+            'fdf_create','fdf_enum_values','fdf_errno','fdf_error','fdf_get_ap',
+            'fdf_get_attachment','fdf_get_encoding','fdf_get_file',
+            'fdf_get_flags','fdf_get_opt','fdf_get_status','fdf_get_value',
+            'fdf_get_version','fdf_header','fdf_next_field_name','fdf_open',
+            'fdf_open_string','fdf_remove_item','fdf_save','fdf_save_string',
+            'fdf_set_ap','fdf_set_encoding','fdf_set_file','fdf_set_flags',
+            'fdf_set_javascript_action','fdf_set_on_import_javascript',
+            'fdf_set_opt','fdf_set_status','fdf_set_submit_form_action',
+            'fdf_set_target_frame','fdf_set_value','fdf_set_version','feof',
+            'fflush','fgetc','fgetcsv','fgets','fgetss','file','file_exists',
+            'file_get_contents','file_put_contents','fileatime','filectime',
+            'filegroup','fileinode','filemtime','fileowner','fileperms',
+            'filepro','filepro_fieldcount','filepro_fieldname',
+            'filepro_fieldtype','filepro_fieldwidth','filepro_retrieve',
+            'filepro_rowcount','filesize','filetype','filter_has_var',
+            'filter_id','filter_input','filter_input_array','filter_list',
+            'filter_var','filter_var_array','finfo_buffer','finfo_close',
+            'finfo_file','finfo_open','finfo_set_flags','floatval','flock',
+            'floor','flush','fmod','fnmatch','fopen','fpassthru','fprintf',
+            'fputcsv','fputs','fread','frenchtojd','fribidi_charset_info',
+            'fribidi_get_charsets','fribidi_log2vis','fscanf','fseek',
+            'fsockopen','fstat','ftell','ftok','ftp_alloc','ftp_cdup',
+            'ftp_chdir','ftp_chmod','ftp_close','ftp_connect','ftp_delete',
+            'ftp_exec','ftp_fget','ftp_fput','ftp_get','ftp_get_option',
+            'ftp_login','ftp_mdtm','ftp_mkdir','ftp_nb_continue','ftp_nb_fget',
+            'ftp_nb_fput','ftp_nb_get','ftp_nb_put','ftp_nlist','ftp_pasv',
+            'ftp_put','ftp_pwd','ftp_quit','ftp_raw','ftp_rawlist','ftp_rename',
+            'ftp_rmdir','ftp_set_option','ftp_site','ftp_size',
+            'ftp_ssl_connect','ftp_systype','ftruncate','function_exists',
+            'func_get_arg','func_get_args','func_num_args','fwrite','gd_info',
+            'getallheaders','getcwd','getdate','getenv','gethostbyaddr',
+            'gethostbyname','gethostbynamel','getimagesize','getlastmod',
+            'getmxrr','getmygid','getmyinode','getmypid','getmyuid','getopt',
+            'getprotobyname','getprotobynumber','getrandmax','getrusage',
+            'getservbyname','getservbyport','gettext','gettimeofday','gettype',
+            'get_browser','get_cfg_var','get_class','get_class_methods',
+            'get_class_vars','get_current_user','get_declared_classes',
+            'get_defined_constants','get_defined_functions','get_defined_vars',
+            'get_extension_funcs','get_headers','get_html_translation_table',
+            'get_included_files','get_include_path','get_loaded_extensions',
+            'get_magic_quotes_gpc','get_magic_quotes_runtime','get_meta_tags',
+            'get_object_vars','get_parent_class','get_required_files',
+            'get_resource_type','glob','gmdate','gmmktime','gmp_abs','gmp_add',
+            'gmp_and','gmp_clrbit','gmp_cmp','gmp_com','gmp_div','gmp_div_q',
+            'gmp_div_qr','gmp_div_r','gmp_divexact','gmp_fact','gmp_gcd',
+            'gmp_gcdext','gmp_hamdist','gmp_init','gmp_intval','gmp_invert',
+            'gmp_jacobi','gmp_legendre','gmp_mod','gmp_mul','gmp_neg',
+            'gmp_nextprime','gmp_or','gmp_perfect_square','gmp_popcount',
+            'gmp_pow','gmp_powm','gmp_prob_prime','gmp_random','gmp_scan0',
+            'gmp_scan1','gmp_setbit','gmp_sign','gmp_sqrt','gmp_sqrtrem',
+            'gmp_strval','gmp_sub','gmp_xor','gmstrftime','gopher_parsedir',
+            'gregoriantojd','gzclose','gzcompress','gzdeflate','gzencode',
+            'gzeof','gzfile','gzgetc','gzgets','gzgetss','gzinflate','gzopen',
+            'gzpassthru','gzputs','gzread','gzrewind','gzseek','gztell',
+            'gzuncompress','gzwrite','hash','hash_algos','hash_file',
+            'hash_final','hash_hmac','hash_hmac_file','hash_init','hash_update',
+            'hash_update_file','hash_update_stream','header','headers_list',
+            'headers_sent','hebrev','hebrevc','hexdec','highlight_file',
+            'highlight_string','html_doc','html_doc_file','html_entity_decode',
+            'htmlentities','htmlspecialchars','htmlspecialchars_decode',
+            'http_build_cookie','http_build_query','http_build_str',
+            'http_build_url','http_cache_etag','http_cache_last_modified',
+            'http_chunked_decode','http_date','http_deflate','http_get',
+            'http_get_request_body','http_get_request_body_stream',
+            'http_get_request_headers','http_head','http_inflate',
+            'http_match_etag','http_match_modified','http_match_request_header',
+            'http_negotiate_charset','http_negotiate_content_type',
+            'http_negotiate_language','http_parse_cookie','http_parse_headers',
+            'http_parse_message','http_parse_params',
+            'http_persistent_handles_clean','http_persistent_handles_count',
+            'http_persistent_handles_ident','http_post_data','http_post_fields',
+            'http_put_data','http_put_file','http_put_stream','http_redirect',
+            'http_request','http_request_body_encode',
+            'http_request_method_exists','http_request_method_name',
+            'http_request_method_register','http_request_method_unregister',
+            'http_send_content_disposition','http_send_content_type',
+            'http_send_data','http_send_file','http_send_last_modified',
+            'http_send_status','http_send_stream','http_support',
+            'http_throttle','hypot','i18n_convert','i18n_discover_encoding',
+            'i18n_http_input','i18n_http_output','i18n_internal_encoding',
+            'i18n_ja_jp_hantozen','i18n_mime_header_decode',
+            'i18n_mime_header_encode','ibase_add_user','ibase_affected_rows',
+            'ibase_backup','ibase_blob_add','ibase_blob_cancel',
+            'ibase_blob_close','ibase_blob_create','ibase_blob_echo',
+            'ibase_blob_get','ibase_blob_import','ibase_blob_info',
+            'ibase_blob_open','ibase_close','ibase_commit','ibase_commit_ret',
+            'ibase_connect','ibase_db_info','ibase_delete_user','ibase_drop_db',
+            'ibase_errcode','ibase_errmsg','ibase_execute','ibase_fetch_assoc',
+            'ibase_fetch_object','ibase_fetch_row','ibase_field_info',
+            'ibase_free_event_handler','ibase_free_query','ibase_free_result',
+            'ibase_gen_id','ibase_maintain_db','ibase_modify_user',
+            'ibase_name_result','ibase_num_fields','ibase_num_params',
+            'ibase_param_info','ibase_pconnect','ibase_prepare','ibase_query',
+            'ibase_restore','ibase_rollback','ibase_rollback_ret',
+            'ibase_server_info','ibase_service_attach','ibase_service_detach',
+            'ibase_set_event_handler','ibase_trans','ibase_wait_event','iconv',
+            'iconv_get_encoding','iconv_mime_decode',
+            'iconv_mime_decode_headers','iconv_mime_encode',
+            'iconv_set_encoding','iconv_strlen','iconv_strpos','iconv_strrpos',
+            'iconv_substr','id3_get_frame_long_name','id3_get_frame_short_name',
+            'id3_get_genre_id','id3_get_genre_list','id3_get_genre_name',
+            'id3_get_tag','id3_get_version','id3_remove_tag','id3_set_tag',
+            'idate','ignore_user_abort','image_type_to_extension',
+            'image_type_to_mime_type','image2wbmp','imagealphablending',
+            'imageantialias','imagearc','imagechar','imagecharup',
+            'imagecolorallocate','imagecolorallocatealpha','imagecolorat',
+            'imagecolorclosest','imagecolorclosestalpha','imagecolordeallocate',
+            'imagecolorexact','imagecolorexactalpha','imagecolormatch',
+            'imagecolorresolve','imagecolorresolvealpha','imagecolorset',
+            'imagecolorsforindex','imagecolorstotal','imagecolortransparent',
+            'imageconvolution','imagecopy','imagecopymerge',
+            'imagecopymergegray','imagecopyresampled','imagecopyresized',
+            'imagecreate','imagecreatefromgd','imagecreatefromgd2',
+            'imagecreatefromgd2part','imagecreatefromgif','imagecreatefromjpeg',
+            'imagecreatefrompng','imagecreatefromstring','imagecreatefromwbmp',
+            'imagecreatefromxbm','imagecreatetruecolor','imagedashedline',
+            'imagedestroy','imageellipse','imagefill','imagefilledarc',
+            'imagefilledellipse','imagefilledpolygon','imagefilledrectangle',
+            'imagefilltoborder','imagefilter','imagefontheight',
+            'imagefontwidth','imageftbbox','imagefttext','imagegammacorrect',
+            'imagegd','imagegd2','imagegif','imagegrabscreen','imagegrabwindow',
+            'imageinterlace','imageistruecolor','imagejpeg','imagelayereffect',
+            'imageline','imageloadfont','imagepalettecopy','imagepng',
+            'imagepolygon','imagepsbbox','imagepsencodefont',
+            'imagepsextendfont','imagepsfreefont','imagepsloadfont',
+            'imagepsslantfont','imagepstext','imagerectangle','imagerotate',
+            'imagesavealpha','imagesetbrush','imagesetpixel','imagesetstyle',
+            'imagesetthickness','imagesettile','imagestring','imagestringup',
+            'imagesx','imagesy','imagetruecolortopalette','imagettfbbox',
+            'imagettftext','imagetypes','imagewbmp','imagexbm','imap_8bit',
+            'imap_alerts','imap_append','imap_base64','imap_binary','imap_body',
+            'imap_bodystruct','imap_check','imap_clearflag_full','imap_close',
+            'imap_create','imap_createmailbox','imap_delete',
+            'imap_deletemailbox','imap_errors','imap_expunge',
+            'imap_fetch_overview','imap_fetchbody','imap_fetchheader',
+            'imap_fetchstructure','imap_fetchtext','imap_get_quota',
+            'imap_get_quotaroot','imap_getacl','imap_getmailboxes',
+            'imap_getsubscribed','imap_header','imap_headerinfo','imap_headers',
+            'imap_last_error','imap_list','imap_listmailbox',
+            'imap_listsubscribed','imap_lsub','imap_mail','imap_mail_compose',
+            'imap_mail_copy','imap_mail_move','imap_mailboxmsginfo',
+            'imap_mime_header_decode','imap_msgno','imap_num_msg',
+            'imap_num_recent','imap_open','imap_ping','imap_qprint',
+            'imap_rename','imap_renamemailbox','imap_reopen',
+            'imap_rfc822_parse_adrlist','imap_rfc822_parse_headers',
+            'imap_rfc822_write_address','imap_savebody','imap_scan',
+            'imap_scanmailbox','imap_search','imap_set_quota','imap_setacl',
+            'imap_setflag_full','imap_sort','imap_status','imap_subscribe',
+            'imap_thread','imap_timeout','imap_uid','imap_undelete',
+            'imap_unsubscribe','imap_utf7_decode','imap_utf7_encode',
+            'imap_utf8','implode','import_request_variables','in_array',
+            'ini_alter','ini_get','ini_get_all','ini_restore','ini_set',
+            'intval','ip2long','iptcembed','iptcparse','isset','is_a',
+            'is_array','is_bool','is_callable','is_dir','is_double',
+            'is_executable','is_file','is_finite','is_float','is_infinite',
+            'is_int','is_integer','is_link','is_long','is_nan','is_null',
+            'is_numeric','is_object','is_readable','is_real','is_resource',
+            'is_scalar','is_soap_fault','is_string','is_subclass_of',
+            'is_uploaded_file','is_writable','is_writeable','iterator_apply',
+            'iterator_count','iterator_to_array','java_last_exception_clear',
+            'java_last_exception_get','jddayofweek','jdmonthname','jdtofrench',
+            'jdtogregorian','jdtojewish','jdtojulian','jdtounix','jewishtojd',
+            'join','jpeg2wbmp','json_decode','json_encode','juliantojd','key',
+            'key_exists','krsort','ksort','lcg_value','ldap_add','ldap_bind',
+            'ldap_close','ldap_compare','ldap_connect','ldap_count_entries',
+            'ldap_delete','ldap_dn2ufn','ldap_err2str','ldap_errno',
+            'ldap_error','ldap_explode_dn','ldap_first_attribute',
+            'ldap_first_entry','ldap_first_reference','ldap_free_result',
+            'ldap_get_attributes','ldap_get_dn','ldap_get_entries',
+            'ldap_get_option','ldap_get_values','ldap_get_values_len',
+            'ldap_list','ldap_mod_add','ldap_mod_del','ldap_mod_replace',
+            'ldap_modify','ldap_next_attribute','ldap_next_entry',
+            'ldap_next_reference','ldap_parse_reference','ldap_parse_result',
+            'ldap_read','ldap_rename','ldap_search','ldap_set_option',
+            'ldap_sort','ldap_start_tls','ldap_unbind','levenshtein',
+            'libxml_clear_errors','libxml_get_errors','libxml_get_last_error',
+            'libxml_set_streams_context','libxml_use_internal_errors','link',
+            'linkinfo','list','localeconv','localtime','log','log1p','log10',
+            'long2ip','lstat','ltrim','lzf_compress','lzf_decompress',
+            'lzf_optimized_for','magic_quotes_runtime','mail','max','mbereg',
+            'mberegi','mberegi_replace','mbereg_match','mbereg_replace',
+            'mbereg_search','mbereg_search_getpos','mbereg_search_getregs',
+            'mbereg_search_init','mbereg_search_pos','mbereg_search_regs',
+            'mbereg_search_setpos','mbregex_encoding','mbsplit','mbstrcut',
+            'mbstrlen','mbstrpos','mbstrrpos','mbsubstr','mb_check_encoding',
+            'mb_convert_case','mb_convert_encoding','mb_convert_kana',
+            'mb_convert_variables','mb_decode_mimeheader',
+            'mb_decode_numericentity','mb_detect_encoding','mb_detect_order',
+            'mb_encode_mimeheader','mb_encode_numericentity','mb_ereg',
+            'mb_eregi','mb_eregi_replace','mb_ereg_match','mb_ereg_replace',
+            'mb_ereg_search','mb_ereg_search_getpos','mb_ereg_search_getregs',
+            'mb_ereg_search_init','mb_ereg_search_pos','mb_ereg_search_regs',
+            'mb_ereg_search_setpos','mb_get_info','mb_http_input',
+            'mb_http_output','mb_internal_encoding','mb_language',
+            'mb_list_encodings','mb_output_handler','mb_parse_str',
+            'mb_preferred_mime_name','mb_regex_encoding','mb_regex_set_options',
+            'mb_send_mail','mb_split','mb_strcut','mb_strimwidth','mb_stripos',
+            'mb_stristr','mb_strlen','mb_strpos','mb_strrchr','mb_strrichr',
+            'mb_strripos','mb_strrpos','mb_strstr','mb_strtolower',
+            'mb_strtoupper','mb_strwidth','mb_substitute_character','mb_substr',
+            'mb_substr_count','mcrypt_cbc','mcrypt_cfb','mcrypt_create_iv',
+            'mcrypt_decrypt','mcrypt_ecb','mcrypt_enc_get_algorithms_name',
+            'mcrypt_enc_get_block_size','mcrypt_enc_get_iv_size',
+            'mcrypt_enc_get_key_size','mcrypt_enc_get_modes_name',
+            'mcrypt_enc_get_supported_key_sizes',
+            'mcrypt_enc_is_block_algorithm',
+            'mcrypt_enc_is_block_algorithm_mode','mcrypt_enc_is_block_mode',
+            'mcrypt_enc_self_test','mcrypt_encrypt','mcrypt_generic',
+            'mcrypt_generic_deinit','mcrypt_generic_end','mcrypt_generic_init',
+            'mcrypt_get_block_size','mcrypt_get_cipher_name',
+            'mcrypt_get_iv_size','mcrypt_get_key_size','mcrypt_list_algorithms',
+            'mcrypt_list_modes','mcrypt_module_close',
+            'mcrypt_module_get_algo_block_size',
+            'mcrypt_module_get_algo_key_size',
+            'mcrypt_module_get_supported_key_sizes',
+            'mcrypt_module_is_block_algorithm',
+            'mcrypt_module_is_block_algorithm_mode',
+            'mcrypt_module_is_block_mode','mcrypt_module_open',
+            'mcrypt_module_self_test','mcrypt_ofb','md5','md5_file',
+            'mdecrypt_generic','memcache_add','memcache_add_server',
+            'memcache_close','memcache_connect','memcache_debug',
+            'memcache_decrement','memcache_delete','memcache_flush',
+            'memcache_get','memcache_get_extended_stats',
+            'memcache_get_server_status','memcache_get_stats',
+            'memcache_get_version','memcache_increment','memcache_pconnect',
+            'memcache_replace','memcache_set','memcache_set_compress_threshold',
+            'memcache_set_server_params','memory_get_peak_usage',
+            'memory_get_usage','metaphone','mhash','mhash_count',
+            'mhash_get_block_size','mhash_get_hash_name','mhash_keygen_s2k',
+            'method_exists','microtime','mime_content_type','min',
+            'ming_keypress','ming_setcubicthreshold','ming_setscale',
+            'ming_useconstants','ming_useswfversion','mkdir','mktime',
+            'money_format','move_uploaded_file','msql','msql_affected_rows',
+            'msql_close','msql_connect','msql_create_db','msql_createdb',
+            'msql_data_seek','msql_db_query','msql_dbname','msql_drop_db',
+            'msql_dropdb','msql_error','msql_fetch_array','msql_fetch_field',
+            'msql_fetch_object','msql_fetch_row','msql_field_flags',
+            'msql_field_len','msql_field_name','msql_field_seek',
+            'msql_field_table','msql_field_type','msql_fieldflags',
+            'msql_fieldlen','msql_fieldname','msql_fieldtable','msql_fieldtype',
+            'msql_free_result','msql_freeresult','msql_list_dbs',
+            'msql_list_fields','msql_list_tables','msql_listdbs',
+            'msql_listfields','msql_listtables','msql_num_fields',
+            'msql_num_rows','msql_numfields','msql_numrows','msql_pconnect',
+            'msql_query','msql_regcase','msql_result','msql_select_db',
+            'msql_selectdb','msql_tablename','mssql_bind','mssql_close',
+            'mssql_connect','mssql_data_seek','mssql_execute',
+            'mssql_fetch_array','mssql_fetch_assoc','mssql_fetch_batch',
+            'mssql_fetch_field','mssql_fetch_object','mssql_fetch_row',
+            'mssql_field_length','mssql_field_name','mssql_field_seek',
+            'mssql_field_type','mssql_free_result','mssql_free_statement',
+            'mssql_get_last_message','mssql_guid_string','mssql_init',
+            'mssql_min_error_severity','mssql_min_message_severity',
+            'mssql_next_result','mssql_num_fields','mssql_num_rows',
+            'mssql_pconnect','mssql_query','mssql_result','mssql_rows_affected',
+            'mssql_select_db','mt_getrandmax','mt_rand','mt_srand','mysql',
+            'mysql_affected_rows','mysql_client_encoding','mysql_close',
+            'mysql_connect','mysql_createdb','mysql_create_db',
+            'mysql_data_seek','mysql_dbname','mysql_db_name','mysql_db_query',
+            'mysql_dropdb','mysql_drop_db','mysql_errno','mysql_error',
+            'mysql_escape_string','mysql_fetch_array','mysql_fetch_assoc',
+            'mysql_fetch_field','mysql_fetch_lengths','mysql_fetch_object',
+            'mysql_fetch_row','mysql_fieldflags','mysql_fieldlen',
+            'mysql_fieldname','mysql_fieldtable','mysql_fieldtype',
+            'mysql_field_flags','mysql_field_len','mysql_field_name',
+            'mysql_field_seek','mysql_field_table','mysql_field_type',
+            'mysql_freeresult','mysql_free_result','mysql_get_client_info',
+            'mysql_get_host_info','mysql_get_proto_info',
+            'mysql_get_server_info','mysql_info','mysql_insert_id',
+            'mysql_listdbs','mysql_listfields','mysql_listtables',
+            'mysql_list_dbs','mysql_list_fields','mysql_list_processes',
+            'mysql_list_tables','mysql_numfields','mysql_numrows',
+            'mysql_num_fields','mysql_num_rows','mysql_pconnect','mysql_ping',
+            'mysql_query','mysql_real_escape_string','mysql_result',
+            'mysql_selectdb','mysql_select_db','mysql_set_charset','mysql_stat',
+            'mysql_tablename','mysql_table_name','mysql_thread_id',
+            'mysql_unbuffered_query','mysqli_affected_rows','mysqli_autocommit',
+            'mysqli_bind_param','mysqli_bind_result','mysqli_change_user',
+            'mysqli_character_set_name','mysqli_client_encoding','mysqli_close',
+            'mysqli_commit','mysqli_connect','mysqli_connect_errno',
+            'mysqli_connect_error','mysqli_data_seek','mysqli_debug',
+            'mysqli_disable_reads_from_master','mysqli_disable_rpl_parse',
+            'mysqli_dump_debug_info','mysqli_embedded_server_end',
+            'mysqli_embedded_server_start','mysqli_enable_reads_from_master',
+            'mysqli_enable_rpl_parse','mysqli_errno','mysqli_error',
+            'mysqli_escape_string','mysqli_execute','mysqli_fetch',
+            'mysqli_fetch_array','mysqli_fetch_assoc','mysqli_fetch_field',
+            'mysqli_fetch_field_direct','mysqli_fetch_fields',
+            'mysqli_fetch_lengths','mysqli_fetch_object','mysqli_fetch_row',
+            'mysqli_field_count','mysqli_field_seek','mysqli_field_tell',
+            'mysqli_free_result','mysqli_get_charset','mysqli_get_client_info',
+            'mysqli_get_client_version','mysqli_get_host_info',
+            'mysqli_get_metadata','mysqli_get_proto_info',
+            'mysqli_get_server_info','mysqli_get_server_version',
+            'mysqli_get_warnings','mysqli_info','mysqli_init',
+            'mysqli_insert_id','mysqli_kill','mysqli_master_query',
+            'mysqli_more_results','mysqli_multi_query','mysqli_next_result',
+            'mysqli_num_fields','mysqli_num_rows','mysqli_options',
+            'mysqli_param_count','mysqli_ping','mysqli_prepare','mysqli_query',
+            'mysqli_real_connect','mysqli_real_escape_string',
+            'mysqli_real_query','mysqli_report','mysqli_rollback',
+            'mysqli_rpl_parse_enabled','mysqli_rpl_probe',
+            'mysqli_rpl_query_type','mysqli_select_db','mysqli_send_long_data',
+            'mysqli_send_query','mysqli_set_charset',
+            'mysqli_set_local_infile_default','mysqli_set_local_infile_handler',
+            'mysqli_set_opt','mysqli_slave_query','mysqli_sqlstate',
+            'mysqli_ssl_set','mysqli_stat','mysqli_stmt_affected_rows',
+            'mysqli_stmt_attr_get','mysqli_stmt_attr_set',
+            'mysqli_stmt_bind_param','mysqli_stmt_bind_result',
+            'mysqli_stmt_close','mysqli_stmt_data_seek','mysqli_stmt_errno',
+            'mysqli_stmt_error','mysqli_stmt_execute','mysqli_stmt_fetch',
+            'mysqli_stmt_field_count','mysqli_stmt_free_result',
+            'mysqli_stmt_get_warnings','mysqli_stmt_init',
+            'mysqli_stmt_insert_id','mysqli_stmt_num_rows',
+            'mysqli_stmt_param_count','mysqli_stmt_prepare','mysqli_stmt_reset',
+            'mysqli_stmt_result_metadata','mysqli_stmt_send_long_data',
+            'mysqli_stmt_sqlstate','mysqli_stmt_store_result',
+            'mysqli_store_result','mysqli_thread_id','mysqli_thread_safe',
+            'mysqli_use_result','mysqli_warning_count','natcasesort','natsort',
+            'new_xmldoc','next','ngettext','nl2br','nl_langinfo',
+            'ntuser_getdomaincontroller','ntuser_getusergroups',
+            'ntuser_getuserinfo','ntuser_getuserlist','number_format',
+            'ob_clean','ob_deflatehandler','ob_end_clean','ob_end_flush',
+            'ob_etaghandler','ob_flush','ob_get_clean','ob_get_contents',
+            'ob_get_flush','ob_get_length','ob_get_level','ob_get_status',
+            'ob_gzhandler','ob_iconv_handler','ob_implicit_flush',
+            'ob_inflatehandler','ob_list_handlers','ob_start','ob_tidyhandler',
+            'octdec','odbc_autocommit','odbc_binmode','odbc_close',
+            'odbc_close_all','odbc_columnprivileges','odbc_columns',
+            'odbc_commit','odbc_connect','odbc_cursor','odbc_data_source',
+            'odbc_do','odbc_error','odbc_errormsg','odbc_exec','odbc_execute',
+            'odbc_fetch_array','odbc_fetch_into','odbc_fetch_object',
+            'odbc_fetch_row','odbc_field_len','odbc_field_name',
+            'odbc_field_num','odbc_field_precision','odbc_field_scale',
+            'odbc_field_type','odbc_foreignkeys','odbc_free_result',
+            'odbc_gettypeinfo','odbc_longreadlen','odbc_next_result',
+            'odbc_num_fields','odbc_num_rows','odbc_pconnect','odbc_prepare',
+            'odbc_primarykeys','odbc_procedurecolumns','odbc_procedures',
+            'odbc_result','odbc_result_all','odbc_rollback','odbc_setoption',
+            'odbc_specialcolumns','odbc_statistics','odbc_tableprivileges',
+            'odbc_tables','opendir','openlog','openssl_csr_export',
+            'openssl_csr_export_to_file','openssl_csr_get_public_key',
+            'openssl_csr_get_subject','openssl_csr_new','openssl_csr_sign',
+            'openssl_error_string','openssl_free_key','openssl_get_privatekey',
+            'openssl_get_publickey','openssl_open','openssl_pkcs12_export',
+            'openssl_pkcs12_export_to_file','openssl_pkcs12_read',
+            'openssl_pkcs7_decrypt','openssl_pkcs7_encrypt',
+            'openssl_pkcs7_sign','openssl_pkcs7_verify','openssl_pkey_export',
+            'openssl_pkey_export_to_file','openssl_pkey_free',
+            'openssl_pkey_get_details','openssl_pkey_get_private',
+            'openssl_pkey_get_public','openssl_pkey_new',
+            'openssl_private_decrypt','openssl_private_encrypt',
+            'openssl_public_decrypt','openssl_public_encrypt','openssl_seal',
+            'openssl_sign','openssl_verify','openssl_x509_checkpurpose',
+            'openssl_x509_check_private_key','openssl_x509_export',
+            'openssl_x509_export_to_file','openssl_x509_free',
+            'openssl_x509_parse','openssl_x509_read','ord',
+            'output_add_rewrite_var','output_reset_rewrite_vars','overload',
+            'outputdebugstring','pack','parse_ini_file','parse_str','parse_url',
+            'parsekit_compile_file','parsekit_compile_string',
+            'parsekit_func_arginfo','parsekit_opcode_flags',
+            'parsekit_opcode_name','passthru','pathinfo','pclose',
+            'pdf_add_bookmark','pdf_add_launchlink','pdf_add_locallink',
+            'pdf_add_nameddest','pdf_add_note','pdf_add_pdflink',
+            'pdf_add_thumbnail','pdf_add_weblink','pdf_arc','pdf_arcn',
+            'pdf_attach_file','pdf_begin_font','pdf_begin_glyph',
+            'pdf_begin_page','pdf_begin_pattern','pdf_begin_template',
+            'pdf_circle','pdf_clip','pdf_close','pdf_close_image',
+            'pdf_close_pdi','pdf_close_pdi_page','pdf_closepath',
+            'pdf_closepath_fill_stroke','pdf_closepath_stroke','pdf_concat',
+            'pdf_continue_text','pdf_create_gstate','pdf_create_pvf',
+            'pdf_curveto','pdf_delete','pdf_delete_pvf','pdf_encoding_set_char',
+            'pdf_end_font','pdf_end_glyph','pdf_end_page','pdf_end_pattern',
+            'pdf_end_template','pdf_endpath','pdf_fill','pdf_fill_imageblock',
+            'pdf_fill_pdfblock','pdf_fill_stroke','pdf_fill_textblock',
+            'pdf_findfont','pdf_fit_image','pdf_fit_pdi_page',
+            'pdf_fit_textline','pdf_get_apiname','pdf_get_buffer',
+            'pdf_get_errmsg','pdf_get_errnum','pdf_get_parameter',
+            'pdf_get_pdi_parameter','pdf_get_pdi_value','pdf_get_value',
+            'pdf_initgraphics','pdf_lineto','pdf_load_font',
+            'pdf_load_iccprofile','pdf_load_image','pdf_makespotcolor',
+            'pdf_moveto','pdf_new','pdf_open_ccitt','pdf_open_file',
+            'pdf_open_image','pdf_open_image_file','pdf_open_pdi',
+            'pdf_open_pdi_page','pdf_place_image','pdf_place_pdi_page',
+            'pdf_process_pdi','pdf_rect','pdf_restore','pdf_rotate','pdf_save',
+            'pdf_scale','pdf_set_border_color','pdf_set_border_dash',
+            'pdf_set_border_style','pdf_set_gstate','pdf_set_info',
+            'pdf_set_parameter','pdf_set_text_pos','pdf_set_value',
+            'pdf_setcolor','pdf_setdash','pdf_setdashpattern','pdf_setflat',
+            'pdf_setfont','pdf_setlinecap','pdf_setlinejoin','pdf_setlinewidth',
+            'pdf_setmatrix','pdf_setmiterlimit','pdf_setpolydash','pdf_shading',
+            'pdf_shading_pattern','pdf_shfill','pdf_show','pdf_show_boxed',
+            'pdf_show_xy','pdf_skew','pdf_stringwidth','pdf_stroke',
+            'pdf_translate','pdo_drivers','pfsockopen','pg_affected_rows',
+            'pg_cancel_query','pg_clientencoding','pg_client_encoding',
+            'pg_close','pg_cmdtuples','pg_connect','pg_connection_busy',
+            'pg_connection_reset','pg_connection_status','pg_convert',
+            'pg_copy_from','pg_copy_to','pg_dbname','pg_delete','pg_end_copy',
+            'pg_errormessage','pg_escape_bytea','pg_escape_string','pg_exec',
+            'pg_execute','pg_fetch_all','pg_fetch_all_columns','pg_fetch_array',
+            'pg_fetch_assoc','pg_fetch_object','pg_fetch_result','pg_fetch_row',
+            'pg_fieldisnull','pg_fieldname','pg_fieldnum','pg_fieldprtlen',
+            'pg_fieldsize','pg_fieldtype','pg_field_is_null','pg_field_name',
+            'pg_field_num','pg_field_prtlen','pg_field_size','pg_field_table',
+            'pg_field_type','pg_field_type_oid','pg_free_result',
+            'pg_freeresult','pg_get_notify','pg_get_pid','pg_get_result',
+            'pg_getlastoid','pg_host','pg_insert','pg_last_error',
+            'pg_last_notice','pg_last_oid','pg_loclose','pg_locreate',
+            'pg_loexport','pg_loimport','pg_loopen','pg_loread','pg_loreadall',
+            'pg_lounlink','pg_lowrite','pg_lo_close','pg_lo_create',
+            'pg_lo_export','pg_lo_import','pg_lo_open','pg_lo_read',
+            'pg_lo_read_all','pg_lo_seek','pg_lo_tell','pg_lo_unlink',
+            'pg_lo_write','pg_meta_data','pg_numfields','pg_numrows',
+            'pg_num_fields','pg_num_rows','pg_options','pg_parameter_status',
+            'pg_pconnect','pg_ping','pg_port','pg_prepare','pg_put_line',
+            'pg_query','pg_query_params','pg_result','pg_result_error',
+            'pg_result_error_field','pg_result_seek','pg_result_status',
+            'pg_select','pg_send_execute','pg_send_prepare','pg_send_query',
+            'pg_send_query_params','pg_set_client_encoding',
+            'pg_set_error_verbosity','pg_setclientencoding','pg_trace',
+            'pg_transaction_status','pg_tty','pg_unescape_bytea','pg_untrace',
+            'pg_update','pg_version','php_egg_logo_guid','php_ini_loaded_file',
+            'php_ini_scanned_files','php_logo_guid','php_real_logo_guid',
+            'php_sapi_name','php_strip_whitespace','php_uname','phpcredits',
+            'phpdoc_xml_from_string','phpinfo','phpversion','pi','png2wbmp',
+            'pop3_close','pop3_delete_message','pop3_get_account_size',
+            'pop3_get_message','pop3_get_message_count',
+            'pop3_get_message_header','pop3_get_message_ids',
+            'pop3_get_message_size','pop3_get_message_sizes','pop3_open',
+            'pop3_undelete','popen','pos','posix_ctermid','posix_errno',
+            'posix_getcwd','posix_getegid','posix_geteuid','posix_getgid',
+            'posix_getgrgid','posix_getgrnam','posix_getgroups',
+            'posix_getlogin','posix_getpgid','posix_getpgrp','posix_getpid',
+            'posix_getppid','posix_getpwnam','posix_getpwuid','posix_getrlimit',
+            'posix_getsid','posix_getuid','posix_get_last_error','posix_isatty',
+            'posix_kill','posix_mkfifo','posix_setegid','posix_seteuid',
+            'posix_setgid','posix_setpgid','posix_setsid','posix_setuid',
+            'posix_strerror','posix_times','posix_ttyname','posix_uname','pow',
+            'preg_grep','preg_last_error','preg_match','preg_match_all',
+            'preg_quote','preg_replace','preg_replace_callback','preg_split',
+            'prev','print_r','printf','proc_close','proc_get_status',
+            'proc_open','proc_terminate','putenv','quoted_printable_decode',
+            'quotemeta','rad2deg','radius_acct_open','radius_add_server',
+            'radius_auth_open','radius_close','radius_config',
+            'radius_create_request','radius_cvt_addr','radius_cvt_int',
+            'radius_cvt_string','radius_demangle','radius_demangle_mppe_key',
+            'radius_get_attr','radius_get_vendor_attr','radius_put_addr',
+            'radius_put_attr','radius_put_int','radius_put_string',
+            'radius_put_vendor_addr','radius_put_vendor_attr',
+            'radius_put_vendor_int','radius_put_vendor_string',
+            'radius_request_authenticator','radius_send_request',
+            'radius_server_secret','radius_strerror','rand','range',
+            'rawurldecode','rawurlencode','read_exif_data','readdir','readfile',
+            'readgzfile','readlink','realpath','reg_close_key','reg_create_key',
+            'reg_enum_key','reg_enum_value','reg_get_value','reg_open_key',
+            'reg_set_value','register_shutdown_function',
+            'register_tick_function','rename','res_close','res_get','res_list',
+            'res_list_type','res_open','res_set','reset',
+            'restore_error_handler','restore_include_path','rewind','rewinddir',
+            'rmdir','round','rsort','rtrim','runkit_class_adopt',
+            'runkit_class_emancipate','runkit_constant_add',
+            'runkit_constant_redefine','runkit_constant_remove',
+            'runkit_default_property_add','runkit_function_add',
+            'runkit_function_copy','runkit_function_redefine',
+            'runkit_function_remove','runkit_function_rename','runkit_import',
+            'runkit_lint','runkit_lint_file','runkit_method_add',
+            'runkit_method_copy','runkit_method_redefine',
+            'runkit_method_remove','runkit_method_rename','runkit_object_id',
+            'runkit_return_value_used','runkit_sandbox_output_handler',
+            'runkit_superglobals','runkit_zval_inspect','scandir','sem_acquire',
+            'sem_get','sem_release','sem_remove','serialize',
+            'session_cache_expire','session_cache_limiter','session_commit',
+            'session_decode','session_destroy','session_encode',
+            'session_get_cookie_params','session_id','session_is_registered',
+            'session_module_name','session_name','session_regenerate_id',
+            'session_register','session_save_path','session_set_cookie_params',
+            'session_set_save_handler','session_start','session_unregister',
+            'session_unset','session_write_close','set_content',
+            'set_error_handler','set_file_buffer','set_include_path',
+            'set_magic_quotes_runtime','set_socket_blocking','set_time_limit',
+            'setcookie','setlocale','setrawcookie','settype','sha1','sha1_file',
+            'shell_exec','shmop_close','shmop_delete','shmop_open','shmop_read',
+            'shmop_size','shmop_write','shm_attach','shm_detach','shm_get_var',
+            'shm_put_var','shm_remove','shm_remove_var','show_source','shuffle',
+            'similar_text','simplexml_import_dom','simplexml_load_file',
+            'simplexml_load_string','sin','sinh','sizeof','sleep','smtp_close',
+            'smtp_cmd_data','smtp_cmd_mail','smtp_cmd_rcpt','smtp_connect',
+            'snmp_get_quick_print','snmp_get_valueretrieval','snmp_read_mib',
+            'snmp_set_quick_print','snmp_set_valueretrieval','snmp2_get',
+            'snmp2_getnext','snmp2_real_walk','snmp2_set','snmp2_walk',
+            'snmp3_get','snmp3_getnext','snmp3_real_walk','snmp3_set',
+            'snmp3_walk','snmpget','snmpgetnext','snmprealwalk','snmpset',
+            'snmpwalk','snmpwalkoid','socket_accept','socket_bind',
+            'socket_clear_error','socket_close','socket_connect',
+            'socket_create','socket_create_listen','socket_create_pair',
+            'socket_getopt','socket_getpeername','socket_getsockname',
+            'socket_get_option','socket_get_status','socket_iovec_add',
+            'socket_iovec_alloc','socket_iovec_delete','socket_iovec_fetch',
+            'socket_iovec_free','socket_iovec_set','socket_last_error',
+            'socket_listen','socket_read','socket_readv','socket_recv',
+            'socket_recvfrom','socket_recvmsg','socket_select','socket_send',
+            'socket_sendmsg','socket_sendto','socket_setopt','socket_set_block',
+            'socket_set_blocking','socket_set_nonblock','socket_set_option',
+            'socket_set_timeout','socket_shutdown','socket_strerror',
+            'socket_write','socket_writev','sort','soundex','spl_autoload',
+            'spl_autoload_call','spl_autoload_extensions',
+            'spl_autoload_functions','spl_autoload_register',
+            'spl_autoload_unregister','spl_classes','spl_object_hash','split',
+            'spliti','sprintf','sql_regcase','sqlite_array_query',
+            'sqlite_busy_timeout','sqlite_changes','sqlite_close',
+            'sqlite_column','sqlite_create_aggregate','sqlite_create_function',
+            'sqlite_current','sqlite_error_string','sqlite_escape_string',
+            'sqlite_exec','sqlite_factory','sqlite_fetch_all',
+            'sqlite_fetch_array','sqlite_fetch_column_types',
+            'sqlite_fetch_object','sqlite_fetch_single','sqlite_fetch_string',
+            'sqlite_field_name','sqlite_has_more','sqlite_has_prev',
+            'sqlite_last_error','sqlite_last_insert_rowid','sqlite_libencoding',
+            'sqlite_libversion','sqlite_next','sqlite_num_fields',
+            'sqlite_num_rows','sqlite_open','sqlite_popen','sqlite_prev',
+            'sqlite_query','sqlite_rewind','sqlite_seek','sqlite_single_query',
+            'sqlite_udf_decode_binary','sqlite_udf_encode_binary',
+            'sqlite_unbuffered_query','sqlite_valid','sqrt','srand','sscanf',
+            'ssh2_auth_hostbased_file','ssh2_auth_none','ssh2_auth_password',
+            'ssh2_auth_pubkey_file','ssh2_connect','ssh2_exec',
+            'ssh2_fetch_stream','ssh2_fingerprint','ssh2_forward_accept',
+            'ssh2_forward_listen','ssh2_methods_negotiated','ssh2_poll',
+            'ssh2_publickey_add','ssh2_publickey_init','ssh2_publickey_list',
+            'ssh2_publickey_remove','ssh2_scp_recv','ssh2_scp_send','ssh2_sftp',
+            'ssh2_sftp_lstat','ssh2_sftp_mkdir','ssh2_sftp_readlink',
+            'ssh2_sftp_realpath','ssh2_sftp_rename','ssh2_sftp_rmdir',
+            'ssh2_sftp_stat','ssh2_sftp_symlink','ssh2_sftp_unlink',
+            'ssh2_shell','ssh2_tunnel','stat','stats_absolute_deviation',
+            'stats_cdf_beta','stats_cdf_binomial','stats_cdf_cauchy',
+            'stats_cdf_chisquare','stats_cdf_exponential','stats_cdf_f',
+            'stats_cdf_gamma','stats_cdf_laplace','stats_cdf_logistic',
+            'stats_cdf_negative_binomial','stats_cdf_noncentral_chisquare',
+            'stats_cdf_noncentral_f','stats_cdf_noncentral_t',
+            'stats_cdf_normal','stats_cdf_poisson','stats_cdf_t',
+            'stats_cdf_uniform','stats_cdf_weibull','stats_covariance',
+            'stats_dens_beta','stats_dens_cauchy','stats_dens_chisquare',
+            'stats_dens_exponential','stats_dens_f','stats_dens_gamma',
+            'stats_dens_laplace','stats_dens_logistic','stats_dens_normal',
+            'stats_dens_pmf_binomial','stats_dens_pmf_hypergeometric',
+            'stats_dens_pmf_negative_binomial','stats_dens_pmf_poisson',
+            'stats_dens_t','stats_dens_uniform','stats_dens_weibull',
+            'stats_harmonic_mean','stats_kurtosis','stats_rand_gen_beta',
+            'stats_rand_gen_chisquare','stats_rand_gen_exponential',
+            'stats_rand_gen_f','stats_rand_gen_funiform','stats_rand_gen_gamma',
+            'stats_rand_gen_ipoisson','stats_rand_gen_iuniform',
+            'stats_rand_gen_noncenral_f','stats_rand_gen_noncentral_chisquare',
+            'stats_rand_gen_noncentral_t','stats_rand_gen_normal',
+            'stats_rand_gen_t','stats_rand_getsd','stats_rand_ibinomial',
+            'stats_rand_ibinomial_negative','stats_rand_ignlgi',
+            'stats_rand_phrase_to_seeds','stats_rand_ranf','stats_rand_setall',
+            'stats_skew','stats_standard_deviation','stats_stat_binomial_coef',
+            'stats_stat_correlation','stats_stat_factorial',
+            'stats_stat_independent_t','stats_stat_innerproduct',
+            'stats_stat_paired_t','stats_stat_percentile','stats_stat_powersum',
+            'stats_variance','strcasecmp','strchr','strcmp','strcoll','strcspn',
+            'stream_bucket_append','stream_bucket_make_writeable',
+            'stream_bucket_new','stream_bucket_prepend','stream_context_create',
+            'stream_context_get_default','stream_context_get_options',
+            'stream_context_set_default','stream_context_set_option',
+            'stream_context_set_params','stream_copy_to_stream',
+            'stream_encoding','stream_filter_append','stream_filter_prepend',
+            'stream_filter_register','stream_filter_remove',
+            'stream_get_contents','stream_get_filters','stream_get_line',
+            'stream_get_meta_data','stream_get_transports',
+            'stream_get_wrappers','stream_is_local',
+            'stream_notification_callback','stream_register_wrapper',
+            'stream_resolve_include_path','stream_select','stream_set_blocking',
+            'stream_set_timeout','stream_set_write_buffer',
+            'stream_socket_accept','stream_socket_client',
+            'stream_socket_enable_crypto','stream_socket_get_name',
+            'stream_socket_pair','stream_socket_recvfrom',
+            'stream_socket_sendto','stream_socket_server',
+            'stream_socket_shutdown','stream_supports_lock',
+            'stream_wrapper_register','stream_wrapper_restore',
+            'stream_wrapper_unregister','strftime','stripcslashes','stripos',
+            'stripslashes','strip_tags','stristr','strlen','strnatcasecmp',
+            'strnatcmp','strpbrk','strncasecmp','strncmp','strpos','strrchr',
+            'strrev','strripos','strrpos','strspn','strstr','strtok',
+            'strtolower','strtotime','strtoupper','strtr','strval',
+            'str_ireplace','str_pad','str_repeat','str_replace','str_rot13',
+            'str_split','str_shuffle','str_word_count','substr',
+            'substr_compare','substr_count','substr_replace','svn_add',
+            'svn_auth_get_parameter','svn_auth_set_parameter','svn_cat',
+            'svn_checkout','svn_cleanup','svn_client_version','svn_commit',
+            'svn_diff','svn_export','svn_fs_abort_txn','svn_fs_apply_text',
+            'svn_fs_begin_txn2','svn_fs_change_node_prop','svn_fs_check_path',
+            'svn_fs_contents_changed','svn_fs_copy','svn_fs_delete',
+            'svn_fs_dir_entries','svn_fs_file_contents','svn_fs_file_length',
+            'svn_fs_is_dir','svn_fs_is_file','svn_fs_make_dir',
+            'svn_fs_make_file','svn_fs_node_created_rev','svn_fs_node_prop',
+            'svn_fs_props_changed','svn_fs_revision_prop',
+            'svn_fs_revision_root','svn_fs_txn_root','svn_fs_youngest_rev',
+            'svn_import','svn_info','svn_log','svn_ls','svn_repos_create',
+            'svn_repos_fs','svn_repos_fs_begin_txn_for_commit',
+            'svn_repos_fs_commit_txn','svn_repos_hotcopy','svn_repos_open',
+            'svn_repos_recover','svn_status','svn_update','symlink',
+            'sys_get_temp_dir','syslog','system','tan','tanh','tempnam',
+            'textdomain','thread_get','thread_include','thread_lock',
+            'thread_lock_try','thread_mutex_destroy','thread_mutex_init',
+            'thread_set','thread_start','thread_unlock','tidy_access_count',
+            'tidy_clean_repair','tidy_config_count','tidy_diagnose',
+            'tidy_error_count','tidy_get_body','tidy_get_config',
+            'tidy_get_error_buffer','tidy_get_head','tidy_get_html',
+            'tidy_get_html_ver','tidy_get_output','tidy_get_release',
+            'tidy_get_root','tidy_get_status','tidy_getopt','tidy_is_xhtml',
+            'tidy_is_xml','tidy_parse_file','tidy_parse_string',
+            'tidy_repair_file','tidy_repair_string','tidy_warning_count','time',
+            'timezone_abbreviations_list','timezone_identifiers_list',
+            'timezone_name_from_abbr','timezone_name_get','timezone_offset_get',
+            'timezone_open','timezone_transitions_get','tmpfile',
+            'token_get_all','token_name','touch','trigger_error',
+            'transliterate','transliterate_filters_get','trim','uasort',
+            'ucfirst','ucwords','uksort','umask','uniqid','unixtojd','unlink',
+            'unpack','unregister_tick_function','unserialize','unset',
+            'urldecode','urlencode','user_error','use_soap_error_handler',
+            'usleep','usort','utf8_decode','utf8_encode','var_dump',
+            'var_export','variant_abs','variant_add','variant_and',
+            'variant_cast','variant_cat','variant_cmp',
+            'variant_date_from_timestamp','variant_date_to_timestamp',
+            'variant_div','variant_eqv','variant_fix','variant_get_type',
+            'variant_idiv','variant_imp','variant_int','variant_mod',
+            'variant_mul','variant_neg','variant_not','variant_or',
+            'variant_pow','variant_round','variant_set','variant_set_type',
+            'variant_sub','variant_xor','version_compare','virtual','vfprintf',
+            'vprintf','vsprintf','wddx_add_vars','wddx_deserialize',
+            'wddx_packet_end','wddx_packet_start','wddx_serialize_value',
+            'wddx_serialize_vars','win_beep','win_browse_file',
+            'win_browse_folder','win_create_link','win_message_box',
+            'win_play_wav','win_shell_execute','win32_create_service',
+            'win32_delete_service','win32_get_last_control_message',
+            'win32_ps_list_procs','win32_ps_stat_mem','win32_ps_stat_proc',
+            'win32_query_service_status','win32_scheduler_delete_task',
+            'win32_scheduler_enum_tasks','win32_scheduler_get_task_info',
+            'win32_scheduler_run','win32_scheduler_set_task_info',
+            'win32_set_service_status','win32_start_service',
+            'win32_start_service_ctrl_dispatcher','win32_stop_service',
+            'wordwrap','xml_error_string','xml_get_current_byte_index',
+            'xml_get_current_column_number','xml_get_current_line_number',
+            'xml_get_error_code','xml_parse','xml_parser_create',
+            'xml_parser_create_ns','xml_parser_free','xml_parser_get_option',
+            'xml_parser_set_option','xml_parse_into_struct',
+            'xml_set_character_data_handler','xml_set_default_handler',
+            'xml_set_element_handler','xml_set_end_namespace_decl_handler',
+            'xml_set_external_entity_ref_handler',
+            'xml_set_notation_decl_handler','xml_set_object',
+            'xml_set_processing_instruction_handler',
+            'xml_set_start_namespace_decl_handler',
+            'xml_set_unparsed_entity_decl_handler','xmldoc','xmldocfile',
+            'xmlrpc_decode','xmlrpc_decode_request','xmlrpc_encode',
+            'xmlrpc_encode_request','xmlrpc_get_type','xmlrpc_is_fault',
+            'xmlrpc_parse_method_descriptions',
+            'xmlrpc_server_add_introspection_data','xmlrpc_server_call_method',
+            'xmlrpc_server_create','xmlrpc_server_destroy',
+            'xmlrpc_server_register_introspection_callback',
+            'xmlrpc_server_register_method','xmlrpc_set_type','xmltree',
+            'xmlwriter_end_attribute','xmlwriter_end_cdata',
+            'xmlwriter_end_comment','xmlwriter_end_document',
+            'xmlwriter_end_dtd','xmlwriter_end_dtd_attlist',
+            'xmlwriter_end_dtd_element','xmlwriter_end_dtd_entity',
+            'xmlwriter_end_element','xmlwriter_end_pi','xmlwriter_flush',
+            'xmlwriter_full_end_element','xmlwriter_open_memory',
+            'xmlwriter_open_uri','xmlwriter_output_memory',
+            'xmlwriter_set_indent','xmlwriter_set_indent_string',
+            'xmlwriter_start_attribute','xmlwriter_start_attribute_ns',
+            'xmlwriter_start_cdata','xmlwriter_start_comment',
+            'xmlwriter_start_document','xmlwriter_start_dtd',
+            'xmlwriter_start_dtd_attlist','xmlwriter_start_dtd_element',
+            'xmlwriter_start_dtd_entity','xmlwriter_start_element',
+            'xmlwriter_start_element_ns','xmlwriter_start_pi','xmlwriter_text',
+            'xmlwriter_write_attribute','xmlwriter_write_attribute_ns',
+            'xmlwriter_write_cdata','xmlwriter_write_comment',
+            'xmlwriter_write_dtd','xmlwriter_write_dtd_attlist',
+            'xmlwriter_write_dtd_element','xmlwriter_write_dtd_entity',
+            'xmlwriter_write_element','xmlwriter_write_element_ns',
+            'xmlwriter_write_pi','xmlwriter_write_raw','xpath_eval',
+            'xpath_eval_expression','xpath_new_context','xpath_register_ns',
+            'xpath_register_ns_auto','xptr_eval','xptr_new_context','yp_all',
+            'yp_cat','yp_errno','yp_err_string','yp_first',
+            'yp_get_default_domain','yp_master','yp_match','yp_next','yp_order',
+            'zend_current_obfuscation_level','zend_get_cfg_var','zend_get_id',
+            'zend_loader_current_file','zend_loader_enabled',
+            'zend_loader_file_encoded','zend_loader_file_licensed',
+            'zend_loader_install_license','zend_loader_version',
+            'zend_logo_guid','zend_match_hostmasks','zend_obfuscate_class_name',
+            'zend_obfuscate_function_name','zend_optimizer_version',
+            'zend_runtime_obfuscate','zend_version','zip_close',
+            'zip_entry_close','zip_entry_compressedsize',
+            'zip_entry_compressionmethod','zip_entry_filesize','zip_entry_name',
+            'zip_entry_open','zip_entry_read','zip_open','zip_read',
+            'zlib_get_coding_type'
+            ),
+        4 => array(
+            'DEFAULT_INCLUDE_PATH', 'DIRECTORY_SEPARATOR', 'E_ALL',
+            'E_COMPILE_ERROR', 'E_COMPILE_WARNING', 'E_CORE_ERROR',
+            'E_CORE_WARNING', 'E_ERROR', 'E_NOTICE', 'E_PARSE', 'E_STRICT',
+            'E_USER_ERROR', 'E_USER_NOTICE', 'E_USER_WARNING', 'E_WARNING',
+            'ENT_COMPAT','ENT_QUOTES','ENT_NOQUOTES',
+            'false', 'null', 'PEAR_EXTENSION_DIR', 'PEAR_INSTALL_DIR',
+            'PHP_BINDIR', 'PHP_CONFIG_FILE_PATH', 'PHP_DATADIR',
+            'PHP_EXTENSION_DIR', 'PHP_LIBDIR',
+            'PHP_LOCALSTATEDIR', 'PHP_OS',
+            'PHP_OUTPUT_HANDLER_CONT', 'PHP_OUTPUT_HANDLER_END',
+            'PHP_OUTPUT_HANDLER_START', 'PHP_SYSCONFDIR',
+            'PHP_VERSION', 'true', '__CLASS__', '__FILE__', '__FUNCTION__',
+            '__LINE__', '__METHOD__'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<'.'%', '<'.'%=', '%'.'>', '<'.'?', '<'.'?=', '?'.'>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;',
+            4 => 'color: #009900; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #0000cc; font-style: italic;',
+            4 => 'color: #009933; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #660099; font-weight: bold;',
+            3 => 'color: #660099; font-weight: bold;',
+            4 => 'color: #006699; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold; font-style: italic;',
+            6 => 'color: #009933; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<'.'?php' => '?'.'>'
+            ),
+        1 => array(
+            '<'.'?' => '?'.'>'
+            ),
+        2 => array(
+            '<'.'%' => '%'.'>'
+            ),
+        3 => array(
+            '<script language="php">' => '</script>'
+            ),
+        4 => "/(?<start><\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?<end>\\?>|\Z)/sm",
+        5 => "/(?<start><%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?<phpdoc>\w+)\s.*?\s\k<phpdoc>".
+            ")*(?<end>%>)/sm",
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pic16.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pic16.php
new file mode 100644
index 000000000..f25183ffb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pic16.php
@@ -0,0 +1,141 @@
+<?php
+/*************************************************************************************
+ * pic16.php
+ * -------
+ * Author: Phil Mattison (mattison@ohmikron.com)
+ * Copyright: (c) 2008 Ohmikron Corp. (http://www.ohmikron.com/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/07/30
+ *
+ * PIC16 Assembler language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/30 (1.0.8)
+ *   -  First Release
+ *
+ * TODO (updated 2008/07/30)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PIC16',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*Instructions*/
+        1 => array(
+            'addcf','adddcf','addlw','addwf','andlw','andwf','bc','bcf','bdc',
+            'bnc','bndc','bnz','bsf','btfsc','btfss','bz','call','clrc','clrdc',
+            'clrf','clrw','clrwdt','clrz','comf','decf','goto','incf','incfsz',
+            'iorlw','iorwf','lcall','lgoto','movf','movfw','movlw','movwf',
+            'option','negf','nop','retfie','retlw','return','rlf','rrf','setc',
+            'setdc','setz','skpc','skpdc','skpnc','skpndc','skpnz','skpz',
+            'sleep','subcf','subdcf','sublw','subwf','swapf','tris','tstf',
+            'xorlw','xorwf'
+            ),
+        /*Registers*/
+        2 => array(
+            'INDF','TMR0','OPTION','PCL','STATUS','FSR','PORTA','PORTB','PORTC',
+            'PORTD','PORTE','PORTF','TRISA','TRISB','TRISC','TRISD','TRISE',
+            'TRISF','PCLATH','INTCON','PIR1','PIE1','PCON','CMCON','VRCON',
+            'F','W'
+            ),
+        /*Directives*/
+        3 => array(
+            '_BADRAM','BANKISEL','BANKSEL','CBLOCK','CODE','_CONFIG','CONSTANT',
+            'DA','DATA','DB','DE','#DEFINE','DT','DW','ELSE','END','ENDC',
+            'ENDIF','ENDM','ENDW','EQU','ERROR','ERRORLEVEL','EXITM','EXPAND',
+            'EXTERN','FILL','GLOBAL','IDATA','_IDLOCS','IF','IFDEF','IFNDEF',
+            'INCLUDE','#INCLUDE','LIST','LOCAL','MACRO','_MAXRAM','MESSG',
+            'NOEXPAND','NOLIST','ORG','PAGE','PAGESEL','PROCESSOR','RADIX',
+            'RES','SET','SPACE','SUBTITLE','TITLE','UDATA','UDATA_ACS',
+            'UDATA_OVR','UDATA_SHR','#UNDEFINE','VARIABLE','WHILE',
+            'D','H','O','B','A'
+            ),
+        ),
+    'SYMBOLS' => array('=','.',',',':'),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000a0; font-weight: bold;',
+            2 => 'color: #aa3300; font-weight: bold;',
+            3 => 'color: #0000ff;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00a000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #7777ff;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX,
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "a-zA-Z0-9\$_\|\#>|^",
+            'DISALLOWED_AFTER' => "a-zA-Z0-9_<\|%"
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pixelbender.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pixelbender.php
new file mode 100644
index 000000000..b65e228a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/pixelbender.php
@@ -0,0 +1,176 @@
+<?php
+/*************************************************************************************
+ * pixelbender.php
+ * ----------------
+ * Author: Richard Olsson (r@richardolsson.se)
+ * Copyright: (c) 2008 Richard Olsson (richardolsson.se)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/11/16
+ *
+ * Pixel Bender 1.0 language file for GeSHi.
+ *
+ *
+ * Please feel free to modify this file, although I would greatly appreciate
+ * it if you would then send some feedback on why the file needed to be
+ * changed, using the e-mail address above.
+ *
+ *
+ * The colors are inspired by those used in the Pixel Bender Toolkit, with
+ * some slight modifications.
+ *
+ * For more info on Pixel Bender, see the Adobe Labs Wiki article at
+ * http://labs.adobe.com/wiki/index.php/Pixel_Bender_Toolkit.
+ *
+ * Keyword groups are defined as follows (groups marked with an asterisk
+ * inherit their names from terminology used in the language specification
+ * included with the Pixel Bender Toolkit, see URL above.)
+ *
+ *  1. languageVersion & kernel keywords
+ *  2. Kernel Members *
+ *  3. Types *
+ *  4. Statements * & qualifiers (in, out, inout)
+ *  5. Built-in functions *
+ *  6. Meta-data names
+ *  7. Preprocessor & Pre-defined symbols *
+ *
+ *
+ * CHANGES
+ * -------
+ * 2008/11/16 (1.0.8.2)
+ *  - Initial release
+ *
+ * TODO (updated 2008/11/16)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Pixel Bender 1.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'languageVersion', 'kernel'
+            ),
+        2 => array(
+            'import', 'parameter', 'dependent', 'const', 'input', 'output',
+            'evaluatePixel', 'evaluateDependents', 'needed', 'changed', 'generated'
+            ),
+        3 => array(
+            'bool', 'bool2', 'bool3', 'bool4', 'int', 'int2', 'int3', 'int4',
+            'float', 'float2', 'float3', 'float4', 'float2x2', 'float3x3', 'float4x4',
+            'pixel2', 'pixel3', 'pixel4', 'region', 'image1', 'image2', 'image3', 'image4',
+            'imageRef', 'void'
+            ),
+        4 => array(
+            'in', 'out', 'inout', 'if', 'else', 'for', 'while', 'do', 'break',
+            'continue', 'return'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'pow',
+            'exp', 'exp2', 'log', 'log2', 'sqrt', 'inverseSqrt', 'abs', 'sign', 'floor',
+            'ceil', 'fract', 'mod', 'min', 'max', 'step', 'clamp', 'mix', 'smoothStep',
+            'length', 'distance', 'dot', 'cross', 'normalize', 'matrixCompMult', 'lessThan',
+            'lessThanEqual', 'greaterThan', 'greaterThanEqual', 'equal', 'notEqual', 'any',
+            'all', 'not', 'nowhere', 'everywhere', 'transform', 'union', 'intersect',
+            'outset', 'inset', 'bounds', 'isEmpty', 'sample', 'sampleLinear', 'sampleNearest',
+            'outCoord', 'dod', 'pixelSize', 'pixelAspectRatio'
+            ),
+        6 => array(
+            'namespace', 'vendor', 'version', 'minValue', 'maxValue', 'defaultValue', 'description'
+            ),
+        7 => array(
+            '#if', '#endif', '#ifdef', '#elif', 'defined', '#define',
+            'AIF_ATI', 'AIF_NVIDIA', 'AIF_FLASH_TARGET'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '|', '+', '-', '*', '/', '=', '<', '>', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff;',
+            2 => 'color: #0033ff; font-weight: bold;',
+            3 => 'color: #0033ff;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #333333;',
+            6 => 'color: #666666;',
+            7 => 'color: #990000;',
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;',
+            'MULTI' => 'color: #3f5fbf;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/plsql.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/plsql.php
new file mode 100644
index 000000000..6534a1922
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/plsql.php
@@ -0,0 +1,256 @@
+<?php
+/*************************************************************************************
+ * plsql.php
+ * -------
+ * Author: Victor Engmark <victor.engmark@gmail.com>
+ * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/10/26
+ *
+ * Oracle 9.2 PL/SQL language file for GeSHi.
+ * Formatting is based on the default setup of TOAD 8.6.
+ *
+ * CHANGES
+ * -------
+ * 2006/10/27 (1.0.0)
+ *    -    First Release
+ *
+ * TODO (updated 2006/10/27)
+ * -------------------------
+ * * Add < and > to brackets
+ * * Remove symbols which are also comment delimiters / quote marks?
+ *
+ *************************************************************************************
+ *
+ *         This file is part of GeSHi.
+ *
+ *     GeSHi is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     GeSHi is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with GeSHi; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA    02111-1307    USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PL/SQL',
+    'COMMENT_SINGLE' => array(1 =>'--'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2930
+    'COMMENT_MULTI' => array('/*' => '*/'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2950
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //PL/SQL reserved keywords (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/f_words.htm#LNPLS019)
+        1 => array('ZONE', 'YEAR', 'WRITE', 'WORK', 'WITH', 'WHILE', 'WHERE',
+        'WHENEVER', 'WHEN', 'VIEW', 'VARCHAR2', 'VARCHAR', 'VALUES',
+        'VALIDATE', 'USE', 'UPDATE', 'UNIQUE', 'UNION', 'TYPE', 'TRUE',
+        'TRIGGER', 'TO', 'TIMEZONE_REGION', 'TIMEZONE_MINUTE', 'TIMEZONE_HOUR',
+        'TIMEZONE_ABBR', 'TIMESTAMP', 'TIME', 'THEN', 'TABLE', 'SYNONYM',
+        'SUCCESSFUL', 'SUBTYPE', 'START', 'SQLERRM', 'SQLCODE', 'SQL', 'SPACE',
+        'SMALLINT', 'SHARE', 'SET', 'SEPARATE', 'SELECT', 'SECOND',
+        'SAVEPOINT', 'ROWTYPE', 'ROWNUM', 'ROWID', 'ROW', 'ROLLBACK',
+        'REVERSE', 'RETURN', 'RELEASE', 'RECORD', 'REAL', 'RAW', 'RANGE',
+        'RAISE', 'PUBLIC', 'PROCEDURE', 'PRIVATE', 'PRIOR', 'PRAGMA',
+        'POSITIVEN', 'POSITIVE', 'PLS_INTEGER', 'PCTFREE', 'PARTITION',
+        'PACKAGE', 'OUT', 'OTHERS', 'ORGANIZATION', 'ORDER', 'OR', 'OPTION',
+        'OPERATOR', 'OPEN', 'OPAQUE', 'ON', 'OF', 'OCIROWID', 'NUMBER_BASE',
+        'NUMBER', 'NULL', 'NOWAIT', 'NOT', 'NOCOPY', 'NEXTVAL', 'NEW',
+        'NATURALN', 'NATURAL', 'MONTH', 'MODE', 'MLSLABEL', 'MINUTE', 'MINUS',
+        'LOOP', 'LONG', 'LOCK', 'LIMITED', 'LIKE', 'LEVEL', 'JAVA',
+        'ISOLATION', 'IS', 'INTO', 'INTERVAL', 'INTERSECT', 'INTERFACE',
+        'INTEGER', 'INSERT', 'INDICATOR', 'INDEX', 'IN', 'IMMEDIATE', 'IF',
+        'HOUR', 'HEAP', 'HAVING', 'GROUP', 'GOTO', 'FUNCTION', 'FROM',
+        'FORALL', 'FOR', 'FLOAT', 'FETCH', 'FALSE', 'EXTENDS', 'EXIT',
+        'EXISTS', 'EXECUTE', 'EXCLUSIVE', 'EXCEPTION', 'END', 'ELSIF', 'ELSE',
+        'DROP', 'DO', 'DISTINCT', 'DESC', 'DELETE', 'DEFAULT', 'DECLARE',
+        'DECIMAL', 'DAY', 'DATE', 'CURSOR', 'CURRVAL', 'CURRENT', 'CREATE',
+        'CONSTANT', 'CONNECT', 'COMPRESS', 'COMMIT', 'COMMENT', 'COLLECT',
+        'CLUSTER', 'CLOSE', 'CHECK', 'CHAR_BASE', 'CHAR', 'CASE', 'BY', 'BULK',
+        'BOOLEAN', 'BODY', 'BINARY_INTEGER', 'BETWEEN', 'BEGIN', 'AUTHID',
+        'AT', 'ASC', 'AS', 'ARRAY', 'ANY', 'AND', 'ALTER', 'ALL'),
+        //SQL functions (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/toc.htm & http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/functions101a.htm#85925)
+        2 => array('XMLTRANSFORM', 'XMLSEQUENCE', 'XMLFOREST', 'XMLELEMENT',
+        'XMLCONCAT', 'XMLCOLATTVAL', 'XMLAGG', 'WIDTH_BUCKET', 'VSIZE',
+        'VARIANCE', 'VAR_SAMP', 'VAR_POP', 'VALUE', 'USERENV', 'USER', 'UPPER',
+        'UPDATEXML', 'UNISTR', 'UID', 'TZ_OFFSET', 'TRUNC', 'TRIM', 'TREAT',
+        'TRANSLATE', 'TO_YMINTERVAL', 'TO_TIMESTAMP_TZ', 'TO_TIMESTAMP',
+        'TO_SINGLE_BYTE', 'TO_NUMBER', 'TO_NCLOB', 'TO_NCHAR', 'TO_MULTI_BYTE',
+        'TO_LOB', 'TO_DSINTERVAL', 'TO_DATE', 'TO_CLOB', 'TO_CHAR', 'TANH',
+        'TAN', 'SYSTIMESTAMP', 'SYSDATE', 'SYS_XMLGEN', 'SYS_XMLAGG',
+        'SYS_TYPEID', 'SYS_GUID', 'SYS_EXTRACT_UTC', 'SYS_DBURIGEN',
+        'SYS_CONTEXT', 'SYS_CONNECT_BY_PATH', 'SUM', 'SUBSTR', 'STDDEV_SAMP',
+        'STDDEV_POP', 'STDDEV', 'SQRT', 'SOUNDEX', 'SINH', 'SIN', 'SIGN',
+        'SESSIONTIMEZONE', 'RTRIM', 'RPAD', 'ROWIDTONCHAR', 'ROWIDTOCHAR',
+        'ROW_NUMBER', 'ROUND', 'REPLACE', 'REGR_SYY', 'REGR_SXY', 'REGR_SXX',
+        'REGR_SLOPE', 'REGR_R2', 'REGR_INTERCEPT', 'REGR_COUNT', 'REGR_AVGY',
+        'REGR_AVGX', 'REFTOHEX', 'REF', 'RAWTONHEX', 'RAWTOHEX',
+        'RATIO_TO_REPORT', 'RANK', 'POWER', 'PERCENTILE_DISC',
+        'PERCENTILE_CONT', 'PERCENT_RANK', 'PATH', 'NVL2', 'NVL',
+        'NUMTOYMINTERVAL', 'NUMTODSINTERVAL', 'NULLIF', 'NTILE', 'NLSSORT',
+        'NLS_UPPER', 'NLS_LOWER', 'NLS_INITCAP', 'NLS_CHARSET_NAME',
+        'NLS_CHARSET_ID', 'NLS_CHARSET_DECL_LEN', 'NEXT_DAY', 'NEW_TIME',
+        'NCHR', 'MONTHS_BETWEEN', 'MOD', 'MIN', 'MAX', 'MAKE_REF', 'LTRIM',
+        'LPAD', 'LOWER', 'LOG', 'LOCALTIMESTAMP', 'LN', 'LENGTH', 'LEAST',
+        'LEAD', 'LAST_VALUE', 'LAST_DAY', 'LAST', 'LAG', 'INSTR', 'INITCAP',
+        'HEXTORAW', 'GROUPING_ID', 'GROUPING', 'GROUP_ID', 'GREATEST',
+        'FROM_TZ', 'FLOOR', 'FIRST_VALUE', 'FIRST', 'EXTRACTVALUE', 'EXTRACT',
+        'EXP', 'EXISTSNODE', 'EMPTY_CLOB', 'EMPTY_BLOB', 'DUMP', 'DEREF',
+        'DEPTH', 'DENSE_RANK', 'DECOMPOSE', 'DECODE', 'DBTIMEZONE',
+        'CURRENT_TIMESTAMP', 'CURRENT_DATE', 'CUME_DIST', 'COVAR_SAMP',
+        'COVAR_POP', 'COUNT', 'COSH', 'COS', 'CORR', 'CONVERT', 'CONCAT',
+        'COMPOSE', 'COALESCE', 'CHR', 'CHARTOROWID', 'CEIL', 'CAST', 'BITAND',
+        'BIN_TO_NUM', 'BFILENAME', 'AVG', 'ATAN2', 'ATAN', 'ASIN', 'ASCIISTR',
+        'ASCII', 'ADD_MONTHS', 'ACOS', 'ABS'),
+        //PL/SQL packages (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96612/intro2.htm#1025672)
+        3 => array('UTL_URL', 'UTL_TCP', 'UTL_SMTP', 'UTL_REF', 'UTL_RAW',
+        'UTL_PG', 'UTL_INADDR', 'UTL_HTTP', 'UTL_FILE', 'UTL_ENCODE',
+        'UTL_COLL', 'SDO_UTIL', 'SDO_TUNE', 'SDO_MIGRATE', 'SDO_LRS',
+        'SDO_GEOM', 'SDO_CS', 'DMBS_XMLQUERY', 'DMBS_FLASHBACK',
+        'DMBS_DEFER_SYS', 'DEBUG_EXTPROC', 'DBMS_XSLPROCESSOR', 'DBMS_XPLAN',
+        'DBMS_XMLSCHEMA', 'DBMS_XMLSAVE', 'DBMS_XMLPARSER', 'DBMS_XMLGEN',
+        'DBMS_XMLDOM', 'DBMS_XDBT', 'DBMS_XDB_VERSION', 'DBMS_XDB', 'DBMS_WM',
+        'DBMS_UTILITY', 'DBMS_TYPES', 'DBMS_TTS', 'DBMS_TRANSFORM',
+        'DBMS_TRANSACTION', 'DBMS_TRACE', 'DBMS_STRM_A', 'DBMS_STRM',
+        'DBMS_STORAGE_MAP', 'DBMS_STATS', 'DBMS_SQL', 'DBMS_SPACE_ADMIN',
+        'DBMS_SPACE', 'DBMS_SHARED_POOL', 'DBMS_SESSION', 'DBMS_RULE_ADM',
+        'DBMS_RULE', 'DBMS_ROWID', 'DBMS_RLS', 'DBMS_RESUMABLE',
+        'DBMS_RESOURCE_MANAGER_PRIVS', 'DBMS_RESOURCE_MANAGER', 'DBMS_REPUTIL',
+        'DBMS_REPCAT_RGT', 'DBMS_REPCAT_INSTATIATE', 'DBMS_REPCAT_ADMIN',
+        'DBMS_REPCAT', 'DBMS_REPAIR', 'DBMS_REFRESH', 'DBMS_REDEFINITION',
+        'DBMS_RECTIFIER_DIFF', 'DBMS_RANDOM', 'DBMS_PROPAGATION_ADM',
+        'DBMS_PROFILER', 'DBMS_PIPE', 'DBMS_PCLXUTIL', 'DBMS_OUTPUT',
+        'DBMS_OUTLN_EDIT', 'DBMS_OUTLN', 'DBMS_ORACLE_TRACE_USER',
+        'DBMS_ORACLE_TRACE_AGENT', 'DBMS_OLAP', 'DBMS_OFFLINE_SNAPSHOT',
+        'DBMS_OFFLINE_OG', 'DBMS_ODCI', 'DBMS_OBFUSCATION_TOOLKIT',
+        'DBMS_MVIEW', 'DBMS_MGWMSG', 'DBMS_MGWADM', 'DBMS_METADATA',
+        'DBMS_LOGSTDBY', 'DBMS_LOGMNR_D', 'DBMS_LOGMNR_CDC_SUBSCRIBE',
+        'DBMS_LOGMNR_CDC_PUBLISH', 'DBMS_LOGMNR', 'DBMS_LOCK', 'DBMS_LOB',
+        'DBMS_LIBCACHE', 'DBMS_LDAP', 'DBMS_JOB', 'DBMS_IOT',
+        'DBMS_HS_PASSTHROUGH', 'DBMS_FGA', 'DBMS_DISTRIBUTED_TRUST_ADMIN',
+        'DBMS_DESCRIBE', 'DBMS_DEFER_QUERY', 'DBMS_DEFER', 'DBMS_DEBUG',
+        'DBMS_DDL', 'DBMS_CAPTURE_ADM', 'DBMS_AW', 'DBMS_AQELM', 'DBMS_AQADM',
+        'DBMS_AQ', 'DBMS_APPLY_ADM', 'DBMS_APPLICATION_INFO', 'DBMS_ALERT',
+        'CWM2_OLAP_AW_ACCESS'),
+        //PL/SQL predefined exceptions (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/07_errs.htm#784)
+        4 => array('ZERO_DIVIDE', 'VALUE_ERROR', 'TOO_MANY_ROWS',
+        'TIMEOUT_ON_RESOURCE', 'SYS_INVALID_ROWID', 'SUBSCRIPT_OUTSIDE_LIMIT',
+        'SUBSCRIPT_BEYOND_COUNT', 'STORAGE_ERROR', 'SELF_IS_NULL',
+        'ROWTYPE_MISMATCH', 'PROGRAM_ERROR', 'NOT_LOGGED_ON', 'NO_DATA_FOUND',
+        'LOGIN_DENIED', 'INVALID_NUMBER', 'INVALID_CURSOR', 'DUP_VAL_ON_INDEX',
+        'CURSOR_ALREADY_OPEN', 'COLLECTION_IS_NULL', 'CASE_NOT_FOUND',
+        'ACCESS_INTO_NULL'),
+        //Static data dictionary views (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96536/ch2.htm)
+        5 => array('USER_REPSITES', 'USER_REPSCHEMA',
+        'USER_REPRESOLUTION_STATISTICS', 'USER_REPRESOLUTION_METHOD',
+        'USER_REPRESOLUTION', 'USER_REPRESOL_STATS_CONTROL', 'USER_REPPROP',
+        'USER_REPPRIORITY_GROUP', 'USER_REPPRIORITY',
+        'USER_REPPARAMETER_COLUMN', 'USER_REPOBJECT', 'USER_REPKEY_COLUMNS',
+        'USER_REPGROUPED_COLUMN', 'USER_REPGROUP_PRIVILEGES', 'USER_REPGROUP',
+        'USER_REPGENOBJECTS', 'USER_REPGENERATED', 'USER_REPFLAVORS',
+        'USER_REPFLAVOR_OBJECTS', 'USER_REPFLAVOR_COLUMNS', 'USER_REPDDL',
+        'USER_REPCONFLICT', 'USER_REPCOLUMN_GROUP', 'USER_REPCOLUMN',
+        'USER_REPCATLOG', 'USER_REPCAT_USER_PARM_VALUES',
+        'USER_REPCAT_USER_AUTHORIZATIONS', 'USER_REPCAT_TEMPLATE_SITES',
+        'USER_REPCAT_TEMPLATE_PARMS', 'USER_REPCAT_TEMPLATE_OBJECTS',
+        'USER_REPCAT_REFRESH_TEMPLATES', 'USER_REPCAT', 'USER_REPAUDIT_COLUMN',
+        'USER_REPAUDIT_ATTRIBUTE', 'DBA_REPSITES_NEW', 'DBA_REPSITES',
+        'DBA_REPSCHEMA', 'DBA_REPRESOLUTION_STATISTICS',
+        'DBA_REPRESOLUTION_METHOD', 'DBA_REPRESOLUTION',
+        'DBA_REPRESOL_STATS_CONTROL', 'DBA_REPPROP', 'DBA_REPPRIORITY_GROUP',
+        'DBA_REPPRIORITY', 'DBA_REPPARAMETER_COLUMN', 'DBA_REPOBJECT',
+        'DBA_REPKEY_COLUMNS', 'DBA_REPGROUPED_COLUMN',
+        'DBA_REPGROUP_PRIVILEGES', 'DBA_REPGROUP', 'DBA_REPGENOBJECTS',
+        'DBA_REPGENERATED', 'DBA_REPFLAVORS', 'DBA_REPFLAVOR_OBJECTS',
+        'DBA_REPFLAVOR_COLUMNS', 'DBA_REPEXTENSIONS', 'DBA_REPDDL',
+        'DBA_REPCONFLICT', 'DBA_REPCOLUMN_GROUP', 'DBA_REPCOLUMN',
+        'DBA_REPCATLOG', 'DBA_REPCAT_USER_PARM_VALUES',
+        'DBA_REPCAT_USER_AUTHORIZATIONS', 'DBA_REPCAT_TEMPLATE_SITES',
+        'DBA_REPCAT_TEMPLATE_PARMS', 'DBA_REPCAT_TEMPLATE_OBJECTS',
+        'DBA_REPCAT_REFRESH_TEMPLATES', 'DBA_REPCAT_EXCEPTIONS', 'DBA_REPCAT',
+        'DBA_REPAUDIT_COLUMN', 'DBA_REPAUDIT_ATTRIBUTE', 'ALL_REPSITES',
+        'ALL_REPSCHEMA', 'ALL_REPRESOLUTION_STATISTICS',
+        'ALL_REPRESOLUTION_METHOD', 'ALL_REPRESOLUTION',
+        'ALL_REPRESOL_STATS_CONTROL', 'ALL_REPPROP', 'ALL_REPPRIORITY_GROUP',
+        'ALL_REPPRIORITY', 'ALL_REPPARAMETER_COLUMN', 'ALL_REPOBJECT',
+        'ALL_REPKEY_COLUMNS', 'ALL_REPGROUPED_COLUMN',
+        'ALL_REPGROUP_PRIVILEGES', 'ALL_REPGROUP', 'ALL_REPGENOBJECTS',
+        'ALL_REPGENERATED', 'ALL_REPFLAVORS', 'ALL_REPFLAVOR_OBJECTS',
+        'ALL_REPFLAVOR_COLUMNS', 'ALL_REPDDL', 'ALL_REPCONFLICT',
+        'ALL_REPCOLUMN_GROUP', 'ALL_REPCOLUMN', 'ALL_REPCATLOG',
+        'ALL_REPCAT_USER_PARM_VALUES', 'ALL_REPCAT_USER_AUTHORIZATIONS',
+        'ALL_REPCAT_TEMPLATE_SITES', 'ALL_REPCAT_TEMPLATE_PARMS',
+        'ALL_REPCAT_TEMPLATE_OBJECTS', 'ALL_REPCAT_REFRESH_TEMPLATES',
+        'ALL_REPCAT', 'ALL_REPAUDIT_COLUMN', 'ALL_REPAUDIT_ATTRIBUTE')
+        ),
+    'SYMBOLS' => array(
+        //PL/SQL delimiters (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2732)
+        '+', '%', "'", '.', '/', '(', ')', ':', ',', '*', '"', '=', '<', '>', '@', ';', '-', ':=', '=>', '||', '**', '<<', '>>', '/*', '*/', '..', '<>', '!=', '~=', '^=', '<=', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00F;',
+            2 => 'color: #000;',
+            3 => 'color: #00F;',
+            4 => 'color: #F00;',
+            5 => 'color: #800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #080; font-style: italic;',
+            'MULTI' => 'color: #080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00F;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #F00;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #0F0;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00F;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #0F0;'
+            )
+        ),
+        'URLS' => array(
+            1 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            2 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            3 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            4 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            5 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}'
+            ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/povray.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/povray.php
new file mode 100644
index 000000000..af6c443da
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/povray.php
@@ -0,0 +1,199 @@
+<?php
+/*************************************************************************************
+ * povray.php
+ * --------
+ * Author: Carl Fürstenberg (azatoth@gmail.com)
+ * Copyright: © 2007 Carl Fürstenberg
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/07/11
+ *
+ * Povray language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  initial import to GeSHi SVN
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'POVRAY',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'yes', 'wrinkles', 'wood', 'width', 'waves', 'water_level', 'warp', 'vturbulence',
+            'vstr', 'vrotate', 'vnormalize', 'vlength', 'vcross', 'vaxis_rotate', 'variance', 'v_steps',
+            'uv_mapping', 'utf8', 'use_index', 'use_colour', 'use_color', 'use_alpha', 'up', 'undef',
+            'ultra_wide_angle', 'u_steps', 'type', 'turbulence', 'turb_depth', 'ttf', 'true', 'triangle_wave',
+            'translate', 'transform', 'trace', 'toroidal', 'tolerance', 'tiles', 'tile2', 'tightness',
+            'tiff', 'threshold', 'thickness', 'tga', 'texture_map', 'target', 'sys', 'sum',
+            'substr', 'sturm', 'strupr', 'strlwr', 'strength', 'str', 'statistics', 'sqr',
+            'spotted', 'spotlight', 'split_union', 'spline', 'spiral2', 'spiral1', 'spherical', 'specular',
+            'spacing', 'solid', 'smooth', 'slope', 'slice', 'sky', 'size', 'sine_wave',
+            'shadowless', 'scattering', 'scallop_wave', 'scale', 'save_file', 'samples', 'roughness', 'rotate',
+            'ripples', 'right', 'rgbt', 'rgbft', 'rgbf', 'rgb', 'repeat', 'render',
+            'refraction', 'reflection_exponent', 'recursion_limit', 'reciprocal', 'ratio', 'ramp_wave', 'radius', 'radial',
+            'quilted', 'quick_colour', 'quick_color', 'quaternion', 'quadratic_spline', 'pwr', 'projected_through', 'prod',
+            'pretrace_start', 'pretrace_end', 'precompute', 'precision', 'ppm', 'pow', 'pot', 'poly_wave',
+            'point_at', 'png', 'planar', 'pigment_pattern', 'pi', 'phong_size', 'phong', 'phase',
+            'pgm', 'perspective', 'pattern', 'pass_through', 'parallel', 'panoramic', 'orthographic', 'orientation',
+            'orient', 'open', 'onion', 'once', 'on', 'omnimax', 'omega', 'offset',
+            'off', 'octaves', 'number_of_waves', 'noise_generator', 'no_shadow', 'no_reflection', 'no_image', 'no_bump_scale',
+            'no', 'nearest_count', 'natural_spline', 'mortar', 'minimum_reuse', 'min_extent', 'metric', 'method',
+            'metallic', 'media_interaction', 'media_attenuation', 'media', 'max_trace_level', 'max_trace', 'max_sample', 'max_iteration',
+            'max_intersections', 'max_gradient', 'max_extent', 'matrix', 'material_map', 'marble', 'map_type', 'mandel',
+            'major_radius', 'magnet', 'low_error_factor', 'look_at', 'location', 'load_file', 'linear_sweep', 'linear_spline',
+            'leopard', 'lambda', 'julia', 'jpeg', 'jitter', 'irid_wavelength', 'ior', 'inverse',
+            'intervals', 'interpolate', 'internal', 'inside_vector', 'inside', 'initial_frame', 'initial_clock', 'image_width',
+            'image_pattern', 'image_height', 'iff', 'hypercomplex', 'hollow', 'hierarchy', 'hf_gray_16', 'hexagon',
+            'gray_threshold', 'granite', 'gradient', 'global_lights', 'gif', 'gather', 'fresnel', 'frequency',
+            'frame_number', 'form', 'fog_type', 'fog_offset', 'fog_alt', 'focal_point', 'flip', 'flatness',
+            'fisheye', 'final_frame', 'final_clock', 'false', 'falloff_angle', 'falloff', 'fade_power', 'fade_distance',
+            'fade_colour', 'fade_color', 'facets', 'extinction', 'exterior', 'exponent', 'expand_thresholds', 'evaluate',
+            'error_bound', 'emission', 'eccentricity', 'double_illuminate', 'distance', 'dist_exp', 'dispersion_samples', 'dispersion',
+            'direction', 'diffuse', 'df3', 'dents', 'density_map', 'density_file', 'density', 'cylindrical',
+            'cutaway_textures', 'cubic_wave', 'cubic_spline', 'cube', 'crand', 'crackle', 'count', 'coords',
+            'control1', 'control0', 'conserve_energy', 'conic_sweep', 'confidence', 'concat', 'composite', 'component',
+            'colour_map', 'colour', 'color', 'collect', 'clock_on', 'clock_delta', 'clock', 'circular',
+            'chr', 'checker', 'charset', 'cells', 'caustics', 'bumps', 'bump_size', 'brilliance',
+            'brightness', 'brick_size', 'brick', 'bozo', 'boxed', 'blur_samples', 'black_hole', 'bezier_spline',
+            'b_spline', 'average', 'autostop', 'assumed_gamma', 'ascii', 'array', 'area_light', 'arc_angle',
+            'append', 'aperture', 'angle', 'ambient_light', 'ambient', 'always_sample', 'altitude', 'alpha',
+            'all_intersections', 'all', 'agate_turb', 'agate', 'adc_bailout', 'adaptive', 'accuracy', 'absorption',
+            'aa_threshold', 'aa_level', 'reflection'
+            ),
+        2 => array(
+            'abs', 'acos', 'acosh', 'asc', 'asin', 'asinh', 'atan', 'atanh',
+            'atan2', 'ceil', 'cos', 'cosh', 'defined', 'degrees', 'dimensions', 'dimension_size',
+            'div', 'exp', 'file_exists', 'floor', 'int', 'ln', 'log', 'max',
+            'min', 'mod', 'pov', 'radians', 'rand', 'seed', 'select', 'sin',
+            'sinh', 'sqrt', 'strcmp', 'strlen', 'tan', 'tanh', 'val', 'vdot',
+            'vlenght',
+            ),
+        3 => array (
+            'x', 'y', 'z', 't', 'u', 'v', 'red', 'blue',
+            'green', 'filter', 'transmit', 'gray', 'e',
+            ),
+        4 => array (
+            'camera', 'background', 'fog', 'sky_sphere', 'rainbow', 'global_settings', 'radiosity', 'photon',
+            'object', 'blob', 'sphere', 'cylinder', 'box', 'cone', 'height_field', 'julia_fractal',
+            'lathe', 'prism', 'sphere_sweep', 'superellipsoid', 'sor', 'text', 'torus', 'bicubic_patch',
+            'disc', 'mesh', 'triangle', 'smooth_triangle', 'mesh2', 'vertex_vectors', 'normal_vectors', 'uv_vectors',
+            'texture_list', 'face_indices', 'normal_indices', 'uv_indices', 'texture', 'polygon', 'plane', 'poly',
+            'cubic', 'quartic', 'quadric', 'isosurface', 'function', 'contained_by', 'parametric', 'pigment',
+            'union', 'intersection', 'difference', 'merge', 'light_source', 'looks_like', 'light_group', 'clipped_by',
+            'bounded_by', 'interior', 'material', 'interior_texture', 'normal', 'finish', 'color_map', 'pigment_map',
+            'image_map', 'bump_map', 'slope_map', 'normal_map', 'irid', 'photons',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!',
+        '@', '%', '&', '*', '|', '/', '<',
+        '>', '+', '-', '.', '=', '<=', '>=',
+        '!=',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a63123;',
+            2 => 'color: #2312bc;',
+            3 => 'color: #cc1122; font-weight: bold;',
+            4 => 'color: #116688; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66aa;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6666cc; font-weight: bold;',
+            1 => 'color: #66cc66; font-weight: bold;',
+            2 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        # normal hash lines
+        0 => '\#(?!(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro) )[[:word:]]*',
+        # syntax functions hash thingis
+        1 => "\#(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro)",
+        2 => array(
+            GESHI_SEARCH  => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)",
+            GESHI_REPLACE => '\3',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => '\4\5',
+            GESHI_MODIFIERS => 'siU'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/powershell.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/powershell.php
new file mode 100644
index 000000000..e427059d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/powershell.php
@@ -0,0 +1,277 @@
+<?php
+/*************************************************************************************
+ * powershell.php
+ * ---------------------------------
+ * Author: Frode Aarebrot (frode@aarebrot.net)
+ * Copyright: (c) 2008 Frode Aarebrot (http://www.aarebrot.net)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/06/20
+ *
+ * PowerShell language file for GeSHi.
+ *
+ * I've tried to make this language file as true to the highlighting in PowerGUI as
+ * possible. Unfortunately it's not 100% complete, although it is pretty close.
+ *
+ * I've included some classes and their members, but there's tons and tons of these.
+ * I suggest you add the ones you need yourself. I've included a few Sharepoint ones
+ * in this language file.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/20 (1.0.8)
+ *  -  First Release
+ *
+ * TODO (updated 2008/06/20)
+ * -------------------------
+ * - Color text between Cmdlets/Aliases and pipe/end-of-line
+ * - Try and get -- and ++ to work in the KEYWORDS array with the other operators
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'PowerShell',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '`',
+    'KEYWORDS' => array(
+        1 => array(
+            // Cmdlets
+            'Add-Content', 'Add-History', 'Add-Member', 'Add-PSSnapin', 'Clear-Content', 'Clear-Item',
+            'Clear-ItemProperty', 'Clear-Variable', 'Compare-Object', 'ConvertFrom-SecureString',
+            'Convert-Path', 'ConvertTo-Html', 'ConvertTo-SecureString', 'Copy-Item', 'Copy-ItemProperty',
+            'Export-Alias', 'Export-Clixml', 'Export-Console', 'Export-Csv', 'ForEach-Object',
+            'Format-Custom', 'Format-List', 'Format-Table', 'Format-Wide', 'Get-Acl', 'Get-Alias',
+            'Get-AuthenticodeSignature', 'Get-ChildItem', 'Get-Command', 'Get-Content', 'Get-Credential',
+            'Get-Culture', 'Get-Date', 'Get-EventLog', 'Get-ExecutionPolicy', 'Get-Help', 'Get-History',
+            'Get-Host', 'Get-Item', 'Get-ItemProperty', 'Get-Location', 'Get-Member',
+            'Get-PfxCertificate', 'Get-Process', 'Get-PSDrive', 'Get-PSProvider', 'Get-PSSnapin',
+            'Get-Service', 'Get-TraceSource', 'Get-UICulture', 'Get-Unique', 'Get-Variable',
+            'Get-WmiObject', 'Group-Object', 'Import-Alias', 'Import-Clixml', 'Import-Csv',
+            'Invoke-Expression', 'Invoke-History', 'Invoke-Item', 'Join-Path', 'Measure-Command',
+            'Measure-Object', 'Move-Item', 'Move-ItemProperty', 'New-Alias', 'New-Item',
+            'New-ItemProperty', 'New-Object', 'New-PSDrive', 'New-Service', 'New-TimeSpan',
+            'New-Variable', 'Out-Default', 'Out-File', 'Out-Host', 'Out-Null', 'Out-Printer',
+            'Out-String', 'Pop-Location', 'Push-Location', 'Read-Host', 'Remove-Item',
+            'Remove-ItemProperty', 'Remove-PSDrive', 'Remove-PSSnapin', 'Remove-Variable', 'Rename-Item',
+            'Rename-ItemProperty', 'Resolve-Path', 'Restart-Service', 'Resume-Service', 'Select-Object',
+            'Select-String', 'Set-Acl', 'Set-Alias', 'Set-AuthenticodeSignature', 'Set-Content',
+            'Set-Date', 'Set-ExecutionPolicy', 'Set-Item', 'Set-ItemProperty', 'Set-Location',
+            'Set-PSDebug', 'Set-Service', 'Set-TraceSource', 'Set-Variable', 'Sort-Object', 'Split-Path',
+            'Start-Service', 'Start-Sleep', 'Start-Transcript', 'Stop-Process', 'Stop-Service',
+            'Stop-Transcript', 'Suspend-Service', 'Tee-Object', 'Test-Path', 'Trace-Command',
+            'Update-FormatData', 'Update-TypeData', 'Where-Object', 'Write-Debug', 'Write-Error',
+            'Write-Host', 'Write-Output', 'Write-Progress', 'Write-Verbose', 'Write-Warning'
+            ),
+        2 => array(
+            // Aliases
+            'ac', 'asnp', 'clc', 'cli', 'clp', 'clv', 'cpi', 'cpp', 'cvpa', 'diff', 'epal', 'epcsv', 'fc',
+            'fl', 'ft', 'fw', 'gal', 'gc', 'gci', 'gcm', 'gdr', 'ghy', 'gi', 'gl', 'gm',
+            'gp', 'gps', 'group', 'gsv', 'gsnp', 'gu', 'gv', 'gwmi', 'iex', 'ihy', 'ii', 'ipal', 'ipcsv',
+            'mi', 'mp', 'nal', 'ndr', 'ni', 'nv', 'oh', 'rdr', 'ri', 'rni', 'rnp', 'rp', 'rsnp', 'rv',
+            'rvpa', 'sal', 'sasv', 'sc', 'select', 'si', 'sl', 'sleep', 'sort', 'sp', 'spps', 'spsv', 'sv',
+            'tee', 'write', 'cat', 'cd', 'clear', 'cp', 'h', 'history', 'kill', 'lp', 'ls',
+            'mount', 'mv', 'popd', 'ps', 'pushd', 'pwd', 'r', 'rm', 'rmdir', 'echo', 'cls', 'chdir',
+            'copy', 'del', 'dir', 'erase', 'move', 'rd', 'ren', 'set', 'type'
+            ),
+        3 => array(
+            // Reserved words
+            'break', 'continue', 'do', 'for', 'foreach', 'while', 'if', 'switch', 'until', 'where',
+            'function', 'filter', 'else', 'elseif', 'in', 'return', 'param', 'throw', 'trap'
+            ),
+        4 => array(
+            // Operators
+            '-eq', '-ne', '-gt', '-ge', '-lt', '-le', '-ieq', '-ine', '-igt', '-ige', '-ilt', '-ile',
+            '-ceq', '-cne', '-cgt', '-cge', '-clt', '-cle', '-like', '-notlike', '-match', '-notmatch',
+            '-ilike', '-inotlike', '-imatch', '-inotmatch', '-clike', '-cnotlike', '-cmatch', '-cnotmatch',
+            '-contains', '-notcontains', '-icontains', '-inotcontains', '-ccontains', '-cnotcontains',
+            '-isnot', '-is', '-as', '-replace', '-ireplace', '-creplace', '-and', '-or', '-band', '-bor',
+            '-not', '-bnot', '-f', '-casesensitive', '-exact', '-file', '-regex', '-wildcard'
+            ),
+        5 => array(
+            // Options
+            '-Year', '-Wrap', '-Word', '-Width', '-WhatIf', '-Wait', '-View', '-Verbose', '-Verb',
+            '-Variable', '-ValueOnly', '-Value', '-Unique', '-UFormat', '-TypeName', '-Trace', '-TotalCount',
+            '-Title', '-TimestampServer', '-TargetObject', '-Syntax', '-SyncWindow', '-Sum', '-String',
+            '-Strict', '-Stream', '-Step', '-Status', '-Static', '-StartupType', '-Start', '-StackName',
+            '-Stack', '-SourceId', '-SimpleMatch', '-ShowError', '-Separator', '-SecureString', '-SecureKey',
+            '-SecondValue', '-SecondsRemaining', '-Seconds', '-Second', '-Scope', '-Root', '-Role',
+            '-Resolve', '-RemoveListener', '-RemoveFileListener', '-Registered', '-ReferenceObject',
+            '-Recurse', '-RecommendedAction', '-ReadCount', '-Quiet', '-Query', '-Qualifier', '-PSSnapin',
+            '-PSProvider', '-PSHost', '-PSDrive', '-PropertyType', '-Property', '-Prompt', '-Process',
+            '-PrependPath', '-PercentComplete', '-Pattern', '-PathType', '-Path', '-PassThru', '-ParentId',
+            '-Parent', '-Parameter', '-Paging', '-OutVariable', '-OutBuffer', '-Option', '-OnType', '-Off',
+            '-Object', '-Noun', '-NoTypeInformation', '-NoQualifier', '-NoNewline', '-NoElement',
+            '-NoClobber', '-NewName', '-Newest', '-Namespace', '-Name', '-Month', '-Minutes', '-Minute',
+            '-Minimum', '-Milliseconds', '-Message', '-MemberType', '-Maximum', '-LogName', '-LiteralPath',
+            '-LiteralName', '-ListenerOption', '-List', '-Line', '-Leaf', '-Last', '-Key', '-ItemType',
+            '-IsValid', '-IsAbsolute', '-InputObject', '-IncludeEqual', '-IncludeChain', '-Include',
+            '-IgnoreWhiteSpace', '-Id', '-Hours', '-Hour', '-HideTableHeaders', '-Head', '-GroupBy',
+            '-Functionality', '-Full', '-Format', '-ForegroundColor', '-Force', '-First', '-FilterScript',
+            '-Filter', '-FilePath', '-Expression', '-ExpandProperty', '-Expand', '-ExecutionPolicy',
+            '-ExcludeProperty', '-ExcludeDifferent', '-Exclude', '-Exception', '-Examples', '-ErrorVariable',
+            '-ErrorRecord', '-ErrorId', '-ErrorAction', '-End', '-Encoding', '-DisplayName', '-DisplayHint',
+            '-DisplayError', '-DifferenceObject', '-Detailed', '-Destination', '-Description', '-Descending',
+            '-Depth', '-DependsOn', '-Delimiter', '-Debugger', '-Debug', '-Days', '-Day', '-Date',
+            '-CurrentOperation', '-Culture', '-Credential', '-Count', '-Container', '-Confirm',
+            '-ComputerName', '-Component', '-Completed', '-ComObject', '-CommandType', '-Command',
+            '-Column', '-Class', '-ChildPath', '-Character', '-Certificate', '-CategoryTargetType',
+            '-CategoryTargetName', '-CategoryReason', '-CategoryActivity', '-Category', '-CaseSensitive',
+            '-Body', '-BinaryPathName', '-Begin', '-BackgroundColor', '-Average', '-AutoSize', '-Audit',
+            '-AsString', '-AsSecureString', '-AsPlainText', '-As', '-ArgumentList', '-AppendPath', '-Append',
+            '-Adjust', '-Activity', '-AclObject'
+            ),
+        6 => array(
+            '_','args','DebugPreference','Error','ErrorActionPreference',
+            'foreach','Home','Host','Input','LASTEXITCODE','MaximumAliasCount',
+            'MaximumDriveCount','MaximumFunctionCount','MaximumHistoryCount',
+            'MaximumVariableCount','OFS','PsHome',
+            'ReportErrorShowExceptionClass','ReportErrorShowInnerException',
+            'ReportErrorShowSource','ReportErrorShowStackTrace',
+            'ShouldProcessPreference','ShouldProcessReturnPreference',
+            'StackTrace','VerbosePreference','WarningPreference','PWD'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '=', '<', '>', '@', '|', '&', ',', '?',
+        '+=', '-=', '*=', '/=', '%=', '*', '/', '%', '!', '+', '-', '++', '--'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008080; font-weight: bold;',
+            2 => 'color: #008080; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF0000;',
+            5 => 'color: #008080; font-style: italic;',
+            6 => 'color: #000080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #804000;'
+            ),
+        'METHODS' => array(
+            0 => 'color: pink;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: pink;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #800080;',
+            3 => 'color: #008080;',
+            4 => 'color: #008080;',
+            5 => 'color: #800000;',
+            6 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => 'about:blank',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // special after pipe
+        3 => array(
+            GESHI_SEARCH => '(\[)(int|long|string|char|bool|byte|double|decimal|float|single|regex|array|xml|scriptblock|switch|hashtable|type|ref|psobject|wmi|wmisearcher|wmiclass|object)((\[.*\])?\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Classes
+        4 => array(
+            GESHI_SEARCH => '(\[)(System\.Reflection\.Assembly|System\.Net\.CredentialCache|Microsoft\.SharePoint\.SPFileLevel|Microsoft\.SharePoint\.Publishing\.PublishingWeb|Microsoft\.SharePoint\.Publishing|Microsoft\.SharePoint\.SPWeb)(\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Members
+        // There's about a hundred million of these, add the ones you need as you need them
+        5 => array (
+            GESHI_SEARCH => '(::)(ReflectionOnlyLoadFrom|ReflectionOnlyLoad|ReferenceEquals|LoadWithPartialName|LoadFrom|LoadFile|Load|GetExecutingAssembly|GetEntryAssembly|GetCallingAssembly|GetAssembly|Equals|DefaultNetworkCredentials|DefaultCredentials|CreateQualifiedName|Checkout|Draft|Published|IsPublishingWeb)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // Special variables
+        6 => array(
+            GESHI_SEARCH => '(\$)(\$[_\^]?|\?)(?!\w)',
+            GESHI_REPLACE => '\1\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // variables
+        //BenBE: Please note that changes here and in Keyword group 6 have to be synchronized in order to work properly.
+        //This Regexp must only match, if keyword group 6 doesn't. If this assumption fails
+        //Highlighting of the keywords will be incomplete or incorrect!
+        0 => "(?<!\\\$|>)[\\\$](\w+)(?=[^|\w])",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' => '(?![a-zA-Z])',
+                'DISALLOWED_BEFORE' => ''
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<!\$>)\$'
+                )
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/progress.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/progress.php
new file mode 100644
index 000000000..2d6024e74
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/progress.php
@@ -0,0 +1,485 @@
+<?php
+/*************************************************************************************
+ * progress.php
+ * --------
+ * Author: Marco Aurelio de Pasqual (marcop@hdi.com.br)
+ * Copyright: (c) 2008 Marco Aurelio de Pasqual, Benny Baumann (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/07/11
+ *
+ * Progress language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ *   -  First Release
+ *
+ * TODO (updated 2008/07/11)
+ * -------------------------
+ * * Clean up the keyword list
+ * * Sort Keyword lists by Control Structures, Predefined functions and other important keywords
+ * * Complete language support
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Progress',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array (
+        1 => array(
+            'ACCUMULATE','APPLY','ASSIGN','BELL','QUERY',
+            'BUFFER-COMPARE','BUFFER-COPY','CALL','CASE',
+            'CHOOSE','CLASS','CLOSE QUERY','each','WHERE',
+            'CLOSE STORED-PROCEDURE','COLOR','COMPILE','CONNECT',
+            'CONSTRUCTOR','COPY-LOB','CREATE','CREATE ALIAS',
+            'CREATE BROWSE','CREATE BUFFER','CREATE CALL','CREATE CLIENT-PRINCIPAL',
+            'CREATE DATABASE','CREATE DATASET','CREATE DATA-SOURCE','CREATE QUERY',
+            'CREATE SAX-attributeS','CREATE SAX-READER','CREATE SAX-WRITER','CREATE SERVER',
+            'CREATE SERVER-SOCKET','CREATE SOAP-HEADER','CREATE SOAP-HEADER-ENTRYREF','CREATE SOCKET',
+            'CREATE TEMP-TABLE','CREATE WIDGET','CREATE widget-POOL','CREATE X-DOCUMENT',
+            'CREATE X-NODEREF','CURRENT-LANGUAGE','CURRENT-VALUE','DDE ADVISE',
+            'DDE EXECUTE','DDE GET','DDE INITIATE','DDE REQUEST',
+            'DDE SEND','DDE TERMINATE','DEFINE BROWSE','DEFINE BUFFER','DEFINE',
+            'DEFINE BUTTON','DEFINE DATASET','DEFINE DATA-SOURCE','DEFINE FRAME','DEF','VAR',
+            'DEFINE IMAGE','DEFINE MENU','DEFINE PARAMETER','DEFINE property','PARAM',
+            'DEFINE QUERY','DEFINE RECTANGLE','DEFINE STREAM','DEFINE SUB-MENU',
+            'DEFINE TEMP-TABLE','DEFINE WORKFILE','DEFINE WORK-TABLE',
+            'DELETE','DELETE ALIAS','DELETE object','DELETE PROCEDURE',
+            'DELETE widget','DELETE widget-POOL','DESTRUCTOR','DICTIONARY',
+            'DISABLE','DISABLE TRIGGERS','DISCONNECT','DISPLAY',
+            'DO','DOS','DOWN','DYNAMIC-CURRENT-VALUE',
+            'ELSE','EMPTY TEMP-TABLE','ENABLE','END',
+            'ENTRY','FIND','AND',
+            'FIX-CODEPAGE','FOR','FORM','FRAME-VALUE',
+            'GET','GET-KEY-VALUE','HIDE','IF',
+            'IMPORT','INPUT CLEAR','INPUT CLOSE','INPUT FROM','input',
+            'INPUT THROUGH','INPUT-OUTPUT CLOSE','INPUT-OUTPUT THROUGH',
+            'INTERFACE','LEAVE','BREAK',
+            'LOAD-PICTURE','MESSAGE','method','NEXT','prev',
+            'NEXT-PROMPT','ON','OPEN QUERY','OS-APPEND',
+            'OS-COMMAND','OS-COPY','OS-CREATE-DIR','OS-DELETE',
+            'OS-RENAME','OUTPUT CLOSE','OUTPUT THROUGH','OUTPUT TO',
+            'OVERLAY','PAGE','PAUSE','PROCEDURE',
+            'PROCESS EVENTS','PROMPT-FOR','PROMSGS','PROPATH',
+            'PUBLISH','PUT','PUT CURSOR','PUT SCREEN',
+            'PUT-BITS','PUT-BYTE','PUT-BYTES','PUT-DOUBLE',
+            'PUT-FLOAT','PUT-INT64','PUT-KEY-VALUE','PUT-LONG',
+            'PUT-SHORT','PUT-STRING','PUT-UNSIGNED-LONG','PUT-UNSIGNED-SHORT',
+            'QUIT','RAW-TRANSFER','READKEY','RELEASE',
+            'RELEASE EXTERNAL','RELEASE object','REPEAT','REPOSITION',
+            'RUN','RUN STORED-PROCEDURE','RUN SUPER',
+            'SAVE CACHE','SCROLL','SEEK','SET',
+            'SET-BYTE-ORDER','SET-POINTER-VALUE','SET-SIZE','SHOW-STATS',
+            'STATUS','STOP','SUBSCRIBE','SUBSTRING',
+            'system-DIALOG COLOR','system-DIALOG FONT','system-DIALOG GET-DIR','system-DIALOG GET-FILE',
+            'system-DIALOG PRINTER-SETUP','system-HELP','THEN','THIS-object',
+            'TRANSACTION-MODE AUTOMATIC','TRIGGER PROCEDURE','UNDERLINE','UNDO',
+            'UNIX','UNLOAD','UNSUBSCRIBE','UP','STRING',
+            'UPDATE','USE','USING','substr','SKIP','CLOSE',
+            'VIEW','WAIT-FOR','MODULO','NE','AVAIL',
+            'NOT','OR','&GLOBAL-DEFINE','&IF','UNFORMATTED','NO-PAUSE',
+            '&THEN','&ELSEIF','&ELSE','&ENDIF','OPEN','NO-WAIT',
+            '&MESSAGE','&SCOPED-DEFINE','&UNDEFINE','DEFINED',
+            'BROWSE','BUTTON','COMBO-BOX','CONTROL-FRAME',
+            'DIALOG-BOX','EDITOR','FIELD-GROUP','FILL-IN',
+            'FRAME','IMAGE','LITERAL','MENU',
+            'MENU-ITEM','RADIO-SET','RECTANGLE','SELECTION-LIST',
+            'SLIDER','SUB-MENU','TEXT','TOGGLE-BOX',
+            'WINDOW','WITH','AT','OF','EDITING','ON ENDKEY','output',
+            'ON ERROR','ON QUIT','ON STOP','PRESELECT',
+            'QUERY-TUNING','SIZE','Trigger','VIEW-AS','ALERT-BOX',
+            'Buffer','Data-relation','ProDataSet','SAX-attributes',
+            'SAX-reader','SAX-writer','Server socket','SOAP-fault',
+            'SOAP-header','SOAP-header-entryref','Socket','Temp-table',
+            'X-noderef','Height','Left','Top','TO',
+            'Width','ACTIVE-WINDOW','AUDIT-CONTROL','FIRST','LAST',
+            'AUDIT-POLICY','CLIPBOARD','CODEBASE-LOCATOR','COLOR-TABLE',
+            'COMPILER','COM-SELF','DEBUGGER','DEFAULT-WINDOW',
+            'ERROR-STATUS','FILE-INFO','FOCUS','FONT-TABLE',
+            'LAST-EVENT','LOG-MANAGER','RCODE-INFO','SECURITY-POLICY',
+            'SELF','SESSION','SOURCE-PROCEDURE','TARGET-PROCEDURE','NO-LOCK','NO-error',
+            'THIS-PROCEDURE','WEB-CONTEXT','FUNCTION','RETURNS','NO-UNDO'
+            ),
+        2 => array(
+            'ACCEPT-CHANGES','ACCEPT-ROW-CHANGES','ADD-BUFFER','ADD-CALC-COLUMN',
+            'ADD-COLUMNS-FROM','ADD-EVENTS-PROCEDURE','ADD-FIELDS-FROM','ADD-FIRST',
+            'ADD-HEADER-ENTRY','ADD-INDEX-FIELD','ADD-LAST','ADD-LIKE-COLUMN',
+            'ADD-LIKE-FIELD','ADD-LIKE-INDEX','ADD-NEW-FIELD','ADD-NEW-INDEX',
+            'ADD-RELATION','ADD-SCHEMA-LOCATION','ADD-SOURCE-BUFFER','ADD-SUPER-PROCEDURE',
+            'APPEND-CHILD','APPLY-CALLBACK','ATTACH-DATA-SOURCE','AUTHENTICATION-FAILED',
+            'BEGIN-EVENT-GROUP','BUFFER-CREATE',
+            'BUFFER-DELETE','BUFFER-RELEASE','BUFFER-VALIDATE',
+            'CANCEL-BREAK','CANCEL-REQUESTS','CLEAR','CLEAR-APPL-CONTEXT',
+            'CLEAR-LOG','CLEAR-SELECTION','CLEAR-SORT-ARROWS','CLONE-NODE',
+            'CLOSE-LOG','CONNECTED','CONVERT-TO-OFFSET',
+            'COPY-DATASET','COPY-SAX-attributeS','COPY-TEMP-TABLE','CREATE-LIKE',
+            'CREATE-NODE','CREATE-NODE-NAMESPACE','CREATE-RESULT-LIST-ENTRY','DEBUG',
+            'DECLARE-NAMESPACE','DELETE-CHAR','DELETE-CURRENT-ROW',
+            'DELETE-HEADER-ENTRY','DELETE-LINE','DELETE-NODE','DELETE-RESULT-LIST-ENTRY',
+            'DELETE-SELECTED-ROW','DELETE-SELECTED-ROWS','DESELECT-FOCUSED-ROW','DESELECT-ROWS',
+            'DESELECT-SELECTED-ROW','DETACH-DATA-SOURCE','DISABLE-CONNECTIONS',
+            'DISABLE-DUMP-TRIGGERS','DISABLE-LOAD-TRIGGERS','DISPLAY-MESSAGE',
+            'DUMP-LOGGING-NOW','EDIT-CLEAR','EDIT-COPY','EDIT-CUT',
+            'EDIT-PASTE','EDIT-UNDO','EMPTY-DATASET','EMPTY-TEMP-TABLE',
+            'ENABLE-CONNECTIONS','ENABLE-EVENTS','ENCRYPT-AUDIT-MAC-KEY',
+            'END-DOCUMENT','END-ELEMENT','END-EVENT-GROUP','END-FILE-DROP',
+            'EXPORT','EXPORT-PRINCIPAL','FETCH-SELECTED-ROW',
+            'FILL','FIND-BY-ROWID','FIND-CURRENT','FIND-FIRST',
+            'FIND-LAST','FIND-UNIQUE','GET-attribute','GET-attribute-NODE',
+            'GET-BINARY-DATA','GET-BLUE-VALUE','GET-BROWSE-COLUMN','GET-BUFFER-HANDLE',
+            'GET-BYTES-AVAILABLE','GET-CALLBACK-PROC-CONTEXT','GET-CALLBACK-PROC-NAME','GET-CGI-LIST',
+            'GET-CGI-LONG-VALUE','GET-CGI-VALUE','GET-CHANGES','GET-CHILD',
+            'GET-CHILD-RELATION','GET-CONFIG-VALUE','GET-CURRENT','GET-DATASET-BUFFER',
+            'GET-DOCUMENT-ELEMENT','GET-DROPPED-FILE','GET-DYNAMIC','GET-ERROR-COLUMN ',
+            'GET-ERROR-ROW ','GET-FILE-NAME ','GET-FILE-OFFSET ','GET-FIRST',
+            'GET-GREEN-VALUE','GET-HEADER-ENTRY','GET-INDEX-BY-NAMESPACE-NAME','GET-INDEX-BY-QNAME',
+            'GET-ITERATION','GET-LAST','GET-LOCALNAME-BY-INDEX','GET-MESSAGE',
+            'GET-NEXT','GET-NODE','GET-NUMBER','GET-PARENT',
+            'GET-PREV','GET-PRINTERS','GET-property','GET-QNAME-BY-INDEX',
+            'GET-RED-VALUE','GET-RELATION','GET-REPOSITIONED-ROW','GET-RGB-VALUE',
+            'GET-SELECTED-widget','GET-SERIALIZED','GET-SIGNATURE','GET-SOCKET-OPTION',
+            'GET-SOURCE-BUFFER','GET-TAB-ITEM','GET-TEXT-HEIGHT-CHARS','GET-TEXT-HEIGHT-PIXELS',
+            'GET-TEXT-WIDTH-CHARS','GET-TEXT-WIDTH-PIXELS','GET-TOP-BUFFER','GET-TYPE-BY-INDEX',
+            'GET-TYPE-BY-NAMESPACE-NAME','GET-TYPE-BY-QNAME','GET-URI-BY-INDEX','GET-VALUE-BY-INDEX',
+            'GET-VALUE-BY-NAMESPACE-NAME','GET-VALUE-BY-QNAME','GET-WAIT-STATE','IMPORT-NODE',
+            'IMPORT-PRINCIPAL','INCREMENT-EXCLUSIVE-ID','INITIALIZE-DOCUMENT-TYPE',
+            'INITIATE','INSERT','INSERT-attribute','INSERT-BACKTAB',
+            'INSERT-BEFORE','INSERT-FILE','INSERT-ROW','INSERT-STRING',
+            'INSERT-TAB','INVOKE','IS-ROW-SELECTED','IS-SELECTED',
+            'LIST-property-NAMES','LOAD','LoadControls','LOAD-DOMAINS',
+            'LOAD-ICON','LOAD-IMAGE','LOAD-IMAGE-DOWN','LOAD-IMAGE-INSENSITIVE',
+            'LOAD-IMAGE-UP','LOAD-MOUSE-POINTER','LOAD-SMALL-ICON','LOCK-REGISTRATION',
+            'LOG-AUDIT-EVENT','LOGOUT','LONGCHAR-TO-NODE-VALUE','LOOKUP',
+            'MEMPTR-TO-NODE-VALUE','MERGE-CHANGES','MERGE-ROW-CHANGES','MOVE-AFTER-TAB-ITEM',
+            'MOVE-BEFORE-TAB-ITEM','MOVE-COLUMN','MOVE-TO-BOTTOM','MOVE-TO-EOF',
+            'MOVE-TO-TOP','NODE-VALUE-TO-LONGCHAR','NODE-VALUE-TO-MEMPTR','NORMALIZE',
+            'QUERY-CLOSE','QUERY-OPEN','QUERY-PREPARE',
+            'READ','READ-FILE','READ-XML','READ-XMLSCHEMA',
+            'REFRESH','REFRESH-AUDIT-POLICY','REGISTER-DOMAIN','REJECT-CHANGES',
+            'REJECT-ROW-CHANGES','REMOVE-attribute','REMOVE-CHILD','REMOVE-EVENTS-PROCEDURE',
+            'REMOVE-SUPER-PROCEDURE','REPLACE','REPLACE-CHILD','REPLACE-SELECTION-TEXT',
+            'REPOSITION-BACKWARD','REPOSITION-FORWARD','REPOSITION-TO-ROW','REPOSITION-TO-ROWID',
+            'RESET','SAVE','SAVE-FILE','SAVE-ROW-CHANGES',
+            'SAX-PARSE','SAX-PARSE-FIRST','SAX-PARSE-NEXT','SCROLL-TO-CURRENT-ROW',
+            'SCROLL-TO-ITEM','SCROLL-TO-SELECTED-ROW','SEAL','SEARCH',
+            'SELECT-ALL','SELECT-FOCUSED-ROW','SELECT-NEXT-ROW','SELECT-PREV-ROW',
+            'SELECT-ROW','SET-ACTOR','SET-APPL-CONTEXT','SET-attribute',
+            'SET-attribute-NODE','SET-BLUE-VALUE','SET-BREAK','SET-BUFFERS',
+            'SET-CALLBACK','SET-CALLBACK-PROCEDURE','SET-CLIENT','SET-COMMIT',
+            'SET-CONNECT-PROCEDURE','SET-DYNAMIC','SET-GREEN-VALUE','SET-INPUT-SOURCE',
+            'SET-MUST-UNDERSTAND','SET-NODE','SET-NUMERIC-FORMAT','SET-OUTPUT-DESTINATION',
+            'SET-PARAMETER','SET-property','SET-READ-RESPONSE-PROCEDURE','SET-RED-VALUE',
+            'SET-REPOSITIONED-ROW','SET-RGB-VALUE','SET-ROLLBACK','SET-SELECTION',
+            'SET-SERIALIZED','SET-SOCKET-OPTION','SET-SORT-ARROW','SET-WAIT-STATE',
+            'START-DOCUMENT','START-ELEMENT','STOP-PARSING','SYNCHRONIZE',
+            'TEMP-TABLE-PREPARE','UPDATE-attribute','URL-DECODE','URL-ENCODE',
+            'VALIDATE','VALIDATE-SEAL','WRITE','WRITE-CDATA','USE-INDEX',
+            'WRITE-CHARACTERS','WRITE-COMMENT','WRITE-DATA-ELEMENT','WRITE-EMPTY-ELEMENT',
+            'WRITE-ENTITY-REF','WRITE-EXTERNAL-DTD','WRITE-FRAGMENT','WRITE-MESSAGE',
+            'WRITE-PROCESSING-INSTRUCTION','WRITE-XML','WRITE-XMLSCHEMA','FALSE','true'
+            ),
+        3 => array(
+            'ABSOLUTE','ACCUM','ADD-INTERVAL','ALIAS','mod',
+            'AMBIGUOUS','ASC','AUDIT-ENABLED','AVAILABLE',
+            'BASE64-DECODE','BASE64-ENCODE','CAN-DO','CAN-FIND',
+            'CAN-QUERY','CAN-SET','CAPS','CAST','OS-DIR',
+            'CHR','CODEPAGE-CONVERT','COMPARE',
+            'COUNT-OF','CURRENT-CHANGED','CURRENT-RESULT-ROW','DATASERVERS',
+            'DATA-SOURCE-MODIFIED','DATETIME','DATETIME-TZ',
+            'DAY','DBCODEPAGE','DBCOLLATION','DBNAME',
+            'DBPARAM','DBRESTRICTIONS','DBTASKID','DBTYPE',
+            'DBVERSION','DECIMAL','DECRYPT','DYNAMIC-function',
+            'DYNAMIC-NEXT-VALUE','ENCODE','ENCRYPT','ENTERED',
+            'ERROR','ETIME','EXP','ENDKEY','END-error',
+            'FIRST-OF','FRAME-DB','FRAME-DOWN',
+            'FRAME-FIELD','FRAME-FILE','FRAME-INDEX','FRAME-LINE',
+            'GATEWAYS','GENERATE-PBE-KEY','GENERATE-PBE-SALT','GENERATE-RANDOM-KEY',
+            'GENERATE-UUID','GET-BITS','GET-BYTE','GET-BYTE-ORDER',
+            'GET-BYTES','GET-CODEPAGE','GET-CODEPAGES','GET-COLLATION',
+            'GET-COLLATIONS','GET-DOUBLE','GET-FLOAT','GET-INT64',
+            'GET-LONG','GET-POINTER-VALUE','GET-SHORT','GET-SIZE',
+            'GET-STRING','GET-UNSIGNED-LONG','GET-UNSIGNED-SHORT','GO-PENDING',
+            'GUID','HEX-DECODE','INDEX',
+            'INT64','INTEGER','INTERVAL','IS-ATTR-SPACE',
+            'IS-CODEPAGE-FIXED','IS-COLUMN-CODEPAGE','IS-LEAD-BYTE','ISO-DATE',
+            'KBLABEL','KEYCODE','KEYFUNCTION','KEYLABEL',
+            'KEYWORD','KEYWORD-ALL','LASTKEY',
+            'LAST-OF','LC','LDBNAME','LEFT-TRIM',
+            'LIBRARY','LINE-COUNTER','LIST-EVENTS','LIST-QUERY-ATTRS',
+            'LIST-SET-ATTRS','LIST-widgetS','LOCKED',
+            'LOGICAL','MAXIMUM','MD5-DIGEST',
+            'MEMBER','MESSAGE-LINES','MINIMUM','MONTH',
+            'MTIME','NEW','NEXT-VALUE','SHARED',
+            'NOT ENTERED','NOW','NUM-ALIASES','NUM-DBS',
+            'NUM-ENTRIES','NUM-RESULTS','OPSYS','OS-DRIVES',
+            'OS-ERROR','OS-GETENV','PAGE-NUMBER','PAGE-SIZE',
+            'PDBNAME','PROC-HANDLE','PROC-STATUS','PROGRAM-NAME',
+            'PROGRESS','PROVERSION','QUERY-OFF-END','QUOTER',
+            'RANDOM','RAW','RECID','REJECTED',
+            'RETRY','RETURN-VALUE','RGB-VALUE',
+            'RIGHT-TRIM','R-INDEX','ROUND','ROWID','LENGTH',
+            'SDBNAME','SET-DB-CLIENT','SETUSERID',
+            'SHA1-DIGEST','SQRT','SUBSTITUTE','VARIABLE',
+            'SUPER','TERMINAL','TIME','TIMEZONE','external',
+            'TODAY','TO-ROWID','TRIM','TRUNCATE','return',
+            'TYPE-OF','USERID','VALID-EVENT','VALID-HANDLE',
+            'VALID-object','WEEKDAY','YEAR','BEGINS','VALUE',
+            'EQ','GE','GT','LE','LT','MATCHES','AS','BY','LIKE'
+            ),
+        4 => array(
+            'ACCELERATOR','ACTIVE','ACTOR','ADM-DATA',
+            'AFTER-BUFFER','AFTER-ROWID','AFTER-TABLE','ALLOW-COLUMN-SEARCHING',
+            'ALWAYS-ON-TOP','APPL-ALERT-BOXES','APPL-CONTEXT-ID','APPSERVER-INFO',
+            'APPSERVER-PASSWORD','APPSERVER-USERID','ASYNCHRONOUS','ASYNC-REQUEST-COUNT',
+            'ASYNC-REQUEST-HANDLE','ATTACHED-PAIRLIST','attribute-NAMES','ATTR-SPACE',
+            'AUDIT-EVENT-CONTEXT','AUTO-COMPLETION','AUTO-DELETE','AUTO-DELETE-XML',
+            'AUTO-END-KEY','AUTO-GO','AUTO-INDENT','AUTO-RESIZE',
+            'AUTO-RETURN','AUTO-SYNCHRONIZE','AUTO-VALIDATE','AUTO-ZAP',
+            'AVAILABLE-FORMATS','BACKGROUND','BASE-ADE','BASIC-LOGGING',
+            'BATCH-MODE','BATCH-SIZE','BEFORE-BUFFER','BEFORE-ROWID',
+            'BEFORE-TABLE','BGCOLOR','BLANK','BLOCK-ITERATION-DISPLAY',
+            'BORDER-BOTTOM-CHARS','BORDER-BOTTOM-PIXELS','BORDER-LEFT-CHARS','BORDER-LEFT-PIXELS',
+            'BORDER-RIGHT-CHARS','BORDER-RIGHT-PIXELS','BORDER-TOP-CHARS','BORDER-TOP-PIXELS',
+            'BOX','BOX-SELECTABLE','BUFFER-CHARS','BUFFER-FIELD',
+            'BUFFER-HANDLE','BUFFER-LINES','BUFFER-NAME','BUFFER-VALUE',
+            'BYTES-READ','BYTES-WRITTEN','CACHE','CALL-NAME',
+            'CALL-TYPE','CANCEL-BUTTON','CANCELLED','CAN-CREATE',
+            'CAN-DELETE','CAN-READ','CAN-WRITE','CAREFUL-PAINT',
+            'CASE-SENSITIVE','CENTERED','CHARSET','CHECKED',
+            'CHILD-BUFFER','CHILD-NUM','CLASS-TYPE','CLIENT-CONNECTION-ID',
+            'CLIENT-TTY','CLIENT-TYPE','CLIENT-WORKSTATION','CODE',
+            'CODEPAGE','COLUMN','COLUMN-BGCOLOR','COLUMN-DCOLOR',
+            'COLUMN-FGCOLOR','COLUMN-FONT','COLUMN-LABEL','COLUMN-MOVABLE',
+            'COLUMN-PFCOLOR','COLUMN-READ-ONLY','COLUMN-RESIZABLE','COLUMN-SCROLLING',
+            'COM-HANDLE','COMPLETE','CONFIG-NAME','CONTEXT-HELP',
+            'CONTEXT-HELP-FILE','CONTEXT-HELP-ID','CONTROL-BOX','CONVERT-3D-COLORS',
+            'CPCASE','CPCOLL','CPINTERNAL','CPLOG',
+            'CPPRINT','CPRCODEIN','CPRCODEOUT','CPSTREAM',
+            'CPTERM','CRC-VALUE','CURRENT-COLUMN','CURRENT-ENVIRONMENT',
+            'CURRENT-ITERATION','CURRENT-ROW-MODIFIED','CURRENT-WINDOW','CURSOR-CHAR',
+            'CURSOR-LINE','CURSOR-OFFSET','DATA-ENTRY-RETURN','DATASET',
+            'DATA-SOURCE','DATA-SOURCE-COMPLETE-MAP','DATA-TYPE','DATE-FORMAT',
+            'DB-REFERENCES','DCOLOR','DDE-ERROR','DDE-ID',
+            'DDE-ITEM','DDE-NAME','DDE-TOPIC','DEBLANK',
+            'DEBUG-ALERT','DECIMALS','DEFAULT','DEFAULT-BUFFER-HANDLE',
+            'DEFAULT-BUTTON','DEFAULT-COMMIT','DELIMITER','DISABLE-AUTO-ZAP',
+            'DISPLAY-TIMEZONE','DISPLAY-TYPE','DOMAIN-DESCRIPTION','DOMAIN-NAME',
+            'DOMAIN-TYPE','DRAG-ENABLED','DROP-TARGET','DYNAMIC',
+            'EDGE-CHARS','EDGE-PIXELS','EDIT-CAN-PASTE','EDIT-CAN-UNDO',
+            'EMPTY','ENCODING','ENCRYPTION-SALT','END-USER-PROMPT',
+            'ENTRY-TYPES-LIST','ERROR-COLUMN','ERROR-object-DETAIL','ERROR-ROW',
+            'ERROR-STRING','EVENT-GROUP-ID','EVENT-PROCEDURE','EVENT-PROCEDURE-CONTEXT',
+            'EVENT-TYPE','EXCLUSIVE-ID','EXECUTION-LOG','EXPAND',
+            'EXPANDABLE','FGCOLOR','FILE-CREATE-DATE','FILE-CREATE-TIME',
+            'FILE-MOD-DATE','FILE-MOD-TIME','FILE-NAME','FILE-OFFSET',
+            'FILE-SIZE','FILE-TYPE','FILLED','FILL-MODE',
+            'FILL-WHERE-STRING','FIRST-ASYNC-REQUEST','FIRST-BUFFER','FIRST-CHILD',
+            'FIRST-COLUMN','FIRST-DATASET','FIRST-DATA-SOURCE','FIRST-object',
+            'FIRST-PROCEDURE','FIRST-QUERY','FIRST-SERVER','FIRST-SERVER-SOCKET',
+            'FIRST-SOCKET','FIRST-TAB-ITEM','FIT-LAST-COLUMN','FLAT-BUTTON',
+            'FOCUSED-ROW','FOCUSED-ROW-SELECTED','FONT','FOREGROUND',
+            'FORMAT','FORMATTED','FORM-INPUT','FORM-LONG-INPUT',
+            'FORWARD-ONLY','FRAGMENT','FRAME-COL','FRAME-NAME',
+            'FRAME-ROW','FRAME-SPACING','FRAME-X','FRAME-Y',
+            'FREQUENCY','FULL-HEIGHT-CHARS','FULL-HEIGHT-PIXELS','FULL-PATHNAME',
+            'FULL-WIDTH-CHARS','FULL-WIDTH-PIXELS','GRAPHIC-EDGE',
+            'GRID-FACTOR-HORIZONTAL','GRID-FACTOR-VERTICAL','GRID-SNAP','GRID-UNIT-HEIGHT-CHARS',
+            'GRID-UNIT-HEIGHT-PIXELS','GRID-UNIT-WIDTH-CHARS','GRID-UNIT-WIDTH-PIXELS','GRID-VISIBLE',
+            'GROUP-BOX','HANDLE','HANDLER','HAS-LOBS',
+            'HAS-RECORDS','HEIGHT-CHARS','HEIGHT-PIXELS','HELP',
+            'HIDDEN','HORIZONTAL','HTML-CHARSET','HTML-END-OF-LINE',
+            'HTML-END-OF-PAGE','HTML-FRAME-BEGIN','HTML-FRAME-END','HTML-HEADER-BEGIN',
+            'HTML-HEADER-END','HTML-TITLE-BEGIN','HTML-TITLE-END','HWND',
+            'ICFPARAMETER','ICON','IGNORE-CURRENT-MODIFIED','IMAGE-DOWN',
+            'IMAGE-INSENSITIVE','IMAGE-UP','IMMEDIATE-DISPLAY','INDEX-INFORMATION',
+            'IN-HANDLE','INHERIT-BGCOLOR','INHERIT-FGCOLOR','INITIAL','INIT',
+            'INNER-CHARS','INNER-LINES','INPUT-VALUE','INSTANTIATING-PROCEDURE',
+            'INTERNAL-ENTRIES','IS-CLASS','IS-OPEN','IS-PARAMETER-SET',
+            'IS-XML','ITEMS-PER-ROW','KEEP-CONNECTION-OPEN','KEEP-FRAME-Z-ORDER',
+            'KEEP-SECURITY-CACHE','KEY','KEYS','LABEL',
+            'LABEL-BGCOLOR','LABEL-DCOLOR','LABEL-FGCOLOR','LABEL-FONT',
+            'LABELS','LANGUAGES','LARGE','LARGE-TO-SMALL',
+            'LAST-ASYNC-REQUEST','LAST-BATCH','LAST-CHILD','LAST-object',
+            'LAST-PROCEDURE','LAST-SERVER','LAST-SERVER-SOCKET','LAST-SOCKET',
+            'LAST-TAB-ITEM','LINE','LIST-ITEM-PAIRS','LIST-ITEMS',
+            'LITERAL-QUESTION','LOCAL-HOST','LOCAL-NAME','LOCAL-PORT',
+            'LOCATOR-COLUMN-NUMBER','LOCATOR-LINE-NUMBER','LOCATOR-PUBLIC-ID','LOCATOR-system-ID',
+            'LOCATOR-TYPE','LOG-ENTRY-TYPES','LOGFILE-NAME','LOGGING-LEVEL',
+            'LOGIN-EXPIRATION-TIMESTAMP','LOGIN-HOST','LOGIN-STATE','LOG-THRESHOLD',
+            'MANDATORY','MANUAL-HIGHLIGHT','MAX-BUTTON','MAX-CHARS',
+            'MAX-DATA-GUESS','MAX-HEIGHT-CHARS','MAX-HEIGHT-PIXELS','MAX-VALUE',
+            'MAX-WIDTH-CHARS','MAX-WIDTH-PIXELS','MD5-VALUE','MENU-BAR',
+            'MENU-KEY','MENU-MOUSE','MERGE-BY-FIELD','MESSAGE-AREA',
+            'MESSAGE-AREA-FONT','MIN-BUTTON','MIN-COLUMN-WIDTH-CHARS','MIN-COLUMN-WIDTH-PIXELS',
+            'MIN-HEIGHT-CHARS','MIN-HEIGHT-PIXELS','MIN-SCHEMA-MARSHAL','MIN-VALUE',
+            'MIN-WIDTH-CHARS','MIN-WIDTH-PIXELS','MODIFIED','MOUSE-POINTER',
+            'MOVABLE','MULTI-COMPILE','MULTIPLE','MULTITASKING-INTERVAL',
+            'MUST-UNDERSTAND','NAME','NAMESPACE-PREFIX','NAMESPACE-URI',
+            'NEEDS-APPSERVER-PROMPT','NEEDS-PROMPT','NESTED','NEW-ROW',
+            'NEXT-COLUMN','NEXT-ROWID','NEXT-SIBLING','NEXT-TAB-ITEM', 'NO-BOX',
+            'NO-CURRENT-VALUE','NODE-VALUE','NO-EMPTY-SPACE','NO-FOCUS',
+            'NONAMESPACE-SCHEMA-LOCATION','NO-SCHEMA-MARSHAL','NO-VALIDATE','NUM-BUFFERS',
+            'NUM-BUTTONS','NUM-CHILD-RELATIONS','NUM-CHILDREN','NUM-COLUMNS',
+            'NUM-DROPPED-FILES','NUMERIC-DECIMAL-POINT','NUMERIC-FORMAT','NUMERIC-SEPARATOR',
+            'NUM-FIELDS','NUM-FORMATS','NUM-HEADER-ENTRIES','NUM-ITEMS',
+            'NUM-ITERATIONS','NUM-LINES','NUM-LOCKED-COLUMNS','NUM-LOG-FILES',
+            'NUM-MESSAGES','NUM-PARAMETERS','NUM-REFERENCES','NUM-RELATIONS',
+            'NUM-REPLACED','NUM-SELECTED-ROWS','NUM-SELECTED-WIDGETS','NUM-SOURCE-BUFFERS',
+            'NUM-TABS','NUM-TOP-BUFFERS','NUM-TO-RETAIN','NUM-VISIBLE-COLUMNS',
+            'ON-FRAME-BORDER','ORIGIN-HANDLE','ORIGIN-ROWID','OWNER',
+            'OWNER-DOCUMENT','PAGE-BOTTOM','PAGE-TOP','PARAMETER',
+            'PARENT','PARENT-BUFFER','PARENT-RELATION','PARSE-STATUS',
+            'PASSWORD-FIELD','PATHNAME','PBE-HASH-ALGORITHM','PBE-KEY-ROUNDS',
+            'PERSISTENT','PERSISTENT-CACHE-DISABLED','PERSISTENT-PROCEDURE','PFCOLOR',
+            'PIXELS-PER-COLUMN','PIXELS-PER-ROW','POPUP-MENU','POPUP-ONLY',
+            'POSITION','PREFER-DATASET','PREPARED','PREPARE-STRING',
+            'PREV-COLUMN','PREV-SIBLING','PREV-TAB-ITEM','PRIMARY',
+            'PRINTER-CONTROL-HANDLE','PRINTER-HDC','PRINTER-NAME','PRINTER-PORT',
+            'PRIVATE-DATA','PROCEDURE-NAME','PROGRESS-SOURCE','PROXY',
+            'PROXY-PASSWORD','PROXY-USERID','PUBLIC-ID','PUBLISHED-EVENTS',
+            'RADIO-BUTTONS','READ-ONLY','RECORD-LENGTH',
+            'REFRESHABLE','RELATION-FIELDS','RELATIONS-ACTIVE','REMOTE',
+            'REMOTE-HOST','REMOTE-PORT','RESIZABLE','RESIZE',
+            'RESTART-ROWID','RETAIN-SHAPE','RETURN-INSERTED','RETURN-VALUE-DATA-TYPE',
+            'ROLES','ROUNDED','COL','ROW','ROW-HEIGHT-CHARS',
+            'ROW-HEIGHT-PIXELS','ROW-MARKERS','ROW-RESIZABLE','ROW-STATE',
+            'SAVE-WHERE-STRING','SCHEMA-CHANGE','SCHEMA-LOCATION','SCHEMA-MARSHAL',
+            'SCHEMA-PATH','SCREEN-LINES','SCREEN-VALUE','SCROLLABLE',
+            'SCROLLBAR-HORIZONTAL','SCROLL-BARS','SCROLLBAR-VERTICAL','SEAL-TIMESTAMP',
+            'SELECTABLE','SELECTED','SELECTION-END','SELECTION-START',
+            'SELECTION-TEXT','SENSITIVE','SEPARATOR-FGCOLOR','SEPARATORS',
+            'SERVER','SERVER-CONNECTION-BOUND','SERVER-CONNECTION-BOUND-REQUEST','SERVER-CONNECTION-CONTEXT',
+            'SERVER-CONNECTION-ID','SERVER-OPERATING-MODE','SESSION-END','SESSION-ID',
+            'SHOW-IN-TASKBAR','SIDE-LABEL-HANDLE','SIDE-LABELS','SKIP-DELETED-RECORD',
+            'SMALL-ICON','SMALL-TITLE','SOAP-FAULT-ACTOR','SOAP-FAULT-CODE',
+            'SOAP-FAULT-DETAIL','SOAP-FAULT-STRING','SORT','SORT-ASCENDING',
+            'SORT-NUMBER','SSL-SERVER-NAME','STANDALONE','STARTUP-PARAMETERS',
+            'STATE-DETAIL','STATUS-AREA','STATUS-AREA-FONT','STOPPED',
+            'STREAM','STRETCH-TO-FIT','STRICT','STRING-VALUE',
+            'SUBTYPE','SUPER-PROCEDURES','SUPPRESS-NAMESPACE-PROCESSING','SUPPRESS-WARNINGS',
+            'SYMMETRIC-ENCRYPTION-ALGORITHM','SYMMETRIC-ENCRYPTION-IV','SYMMETRIC-ENCRYPTION-KEY','SYMMETRIC-SUPPORT',
+            'system-ALERT-BOXES','system-ID','TABLE','TABLE-CRC-LIST',
+            'TABLE-HANDLE','TABLE-LIST','TABLE-NUMBER','TAB-POSITION',
+            'TAB-STOP','TEMP-DIRECTORY','TEXT-SELECTED','THREE-D',
+            'TIC-MARKS','TIME-SOURCE','TITLE','TITLE-BGCOLOR','FIELD',
+            'TITLE-DCOLOR','TITLE-FGCOLOR','TITLE-FONT','TOOLTIP',
+            'TOOLTIPS','TOP-ONLY','TRACKING-CHANGES','TRANSACTION',
+            'TRANS-INIT-PROCEDURE','TRANSPARENT','TYPE','UNIQUE-ID',
+            'UNIQUE-MATCH','URL','URL-PASSWORD','URL-USERID','EXTENT',
+            'USER-ID','V6DISPLAY','VALIDATE-EXPRESSION','VALIDATE-MESSAGE',
+            'VALIDATE-XML','VALIDATION-ENABLED','VIEW-FIRST-COLUMN-ON-REOPEN',
+            'VIRTUAL-HEIGHT-CHARS','VIRTUAL-HEIGHT-PIXELS','VIRTUAL-WIDTH-CHARS','VIRTUAL-WIDTH-PIXELS',
+            'VISIBLE','WARNING','WHERE-STRING','widget-ENTER','DATE',
+            'widget-LEAVE','WIDTH-CHARS','WIDTH-PIXELS','WINDOW-STATE',
+            'WINDOW-system','WORD-WRAP','WORK-AREA-HEIGHT-PIXELS','WORK-AREA-WIDTH-PIXELS',
+            'WORK-AREA-X','WORK-AREA-Y','WRITE-STATUS','X','widget-Handle',
+            'X-DOCUMENT','XML-DATA-TYPE','XML-NODE-TYPE','XML-SCHEMA-PATH',
+            'XML-SUPPRESS-NAMESPACE-PROCESSING','Y','YEAR-OFFSET','CHARACTER',
+            'LONGCHAR','MEMPTR','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '<', '>', '=',
+        '+', '-', '*', '/',
+        '!', '@', '%', '|', '$',
+        ':', '.', ';', ',',
+        '?', '<=','<>','>=', '\\'
+        ),
+    'CASE_SENSITIVE' => array (
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array (
+        'KEYWORDS' => array (
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #1D16B2;',
+            3 => 'color: #993333;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array (
+//            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array (
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array (
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array (
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array (
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array (
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array (
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array (
+            ),
+        'SCRIPT' => array (
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => ':'
+        ),
+    'REGEXPS' => array (
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array (
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array (
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![\.\-a-zA-Z0-9_\$\#&])",
+            'DISALLOWED_AFTER' =>  "(?![\-a-zA-Z0-9_%])",
+            1 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            2 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/prolog.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/prolog.php
new file mode 100644
index 000000000..fa9e03a63
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/prolog.php
@@ -0,0 +1,143 @@
+<?php
+/*************************************************************************************
+ * prolog.php
+ * --------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/10/02
+ *
+ * Prolog language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/02 (1.0.8.1)
+ *  -  First Release
+ *
+ * TODO (updated 2008/10/02)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'abolish','abs','arg','asserta','assertz','at_end_of_stream','atan',
+            'atom','atom_chars','atom_codes','atom_concat','atom_length',
+            'atomic','bagof','call','catch','ceiling','char_code',
+            'char_conversion','clause','close','compound','consult','copy_term',
+            'cos','current_char_conversion','current_input','current_op',
+            'current_output','current_predicate','current_prolog_flag',
+            'discontiguous','dynamic','ensure_loaded','exp','fail','findall',
+            'float','float_fractional_part','float_integer_part','floor',
+            'flush_output','functor','get_byte','get_char','get_code','halt',
+            'include','initialization','integer','is','listing','log','mod',
+            'multifile','nl','nonvar','notrace','number','number_chars',
+            'number_codes','once','op','open','peek_byte','peek_char',
+            'peek_code','put_byte','put_char','put_code','read','read_term',
+            'rem','repeat','retract','round','set_input','set_output',
+            'set_prolog_flag','set_stream_position','setof','sign','sin','sqrt',
+            'stream_property','sub_atom','throw','trace','true','truncate',
+            'unify_with_occurs_check','univ','var','write','write_canonical',
+            'write_term','writeq'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}',),
+        1 => array('?-', ':-', '=:='),
+        2 => array('\-', '\+', '\*', '\/'),
+        3 => array('-', '+', '*', '/'),
+        4 => array('.', ':', ',', ';'),
+        5 => array('!', '@', '&', '|'),
+        6 => array('<', '>', '=')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;',
+            2 => 'color: #339933;',
+            3 => 'color: #339933;',
+            4 => 'color: #339933;',
+            5 => 'color: #339933;',
+            6 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://pauillac.inria.fr/~deransar/prolog/bips.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "(?<![A-Z_])(?!(?:PIPE|SEMI)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/providex.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/providex.php
new file mode 100644
index 000000000..f24a57d18
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/providex.php
@@ -0,0 +1,299 @@
+<?php
+/******************************************************************************
+ * providex.php
+ * ----------
+ * Author: Jeff Wilder (jeff@coastallogix.com)
+ * Copyright:  (c) 2008 Coastal Logix (http://www.coastallogix.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/10/18
+ *
+ * ProvideX language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/21 (1.0.0)
+ *  - First Release
+ *
+ * TODO
+ * -------------------------
+ * 1. Create a regexp for numeric global variables (ex: %VarName = 3)
+ * 2. Add standard object control properties
+ *
+ ******************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *****************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'ProvideX',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // Single-Line Comments using REM command
+        2 => "/\bREM\b.*?$/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Directives
+            '*break', '*continue', '*end', '*escape', '*next', '*proceed',
+            '*retry', '*return', '*same', 'accept', 'add index', 'addr',
+            'auto', 'begin', 'break', 'button', 'bye', 'call', 'case',
+            'chart', 'check_box', 'class', 'clear', 'clip_board', 'close',
+            'continue', 'control', 'create required', 'create table',
+            'cwdir', 'data', 'day_format', 'def', 'default', 'defctl',
+            'defprt', 'deftty', 'delete required', 'dictionary', 'dim', 'direct',
+            'directory', 'disable', 'drop', 'drop_box', 'dump', 'edit',
+            'else', 'enable', 'end switch', 'end', 'end_if', 'endtrace',
+            'enter', 'erase', 'error_handler', 'escape', 'event', 'execute',
+            'exit', 'exitto', 'extract', 'file', 'find', 'floating point',
+            'for', 'function', 'get_file_box', 'gosub', 'goto', 'grid',
+            'h_scrollbar', 'hide', 'if', 'index', 'indexed', 'input',
+            'insert', 'invoke', 'iolist', 'keyed', 'let', 'like',
+            'line_switch', 'list', 'list_box', 'load', 'local', 'lock',
+            'long_form', 'menu_bar', 'merge', 'message_lib', 'mnemonic',
+            'msgbox', 'multi_line', 'multi_media', 'next', 'object', 'obtain',
+            'on', 'open', 'password', 'perform', 'pop', 'popup_menu',
+            'precision', 'prefix', 'preinput', 'print', 'process', 'program',
+            'property', 'purge', 'quit', 'radio_button', 'randomize',
+            'read', 'record', 'redim', 'refile', 'release', 'rem', 'remove',
+            'rename', 'renumber', 'repeat', 'reset', 'restore', 'retry',
+            'return', 'round', 'run', 'save', 'select', 'serial', 'server',
+            'set_focus', 'set_nbf', 'set_param', 'setctl', 'setday', 'setdev',
+            'setdrive', 'seterr', 'setesc', 'setfid', 'setmouse', 'settime',
+            'settrace', 'short_form', 'show', 'sort', 'start', 'static',
+            'step', 'stop', 'switch', 'system_help', 'system_jrnl', 'table',
+            'then', 'to', 'translate', 'tristate_box', 'unlock', 'until',
+            'update', 'user_lex', 'v_scrollbar', 'vardrop_box', 'varlist_box',
+            'via', 'video_palette', 'wait', 'wend', 'while', 'winprt_setup',
+            'with', 'write'
+            ),
+        2 => array(
+            // System Functions
+            '@x', '@y', 'abs', 'acs', 'and', 'arg', 'asc', 'asn', 'ath',
+            'atn', 'bin', 'bsz', 'chg', 'chr', 'cmp', 'cos', 'cpl',
+            'crc', 'cse', 'ctl', 'cvs', 'dec', 'dir', 'dll', 'dsk',
+            'dte', 'env', 'ept', 'err', 'evn', 'evs', 'exp', 'ffn',
+            'fib', 'fid', 'fin', 'fpt', 'gap', 'gbl', 'gep', 'hsa',
+            'hsh', 'hta', 'hwn', 'i3e', 'ind', 'int', 'iol', 'ior',
+            'jul', 'jst', 'kec', 'kef', 'kel', 'ken', 'kep', 'key',
+            'kgn', 'lcs', 'len', 'lno', 'log', 'lrc', 'lst', 'max',
+            'mem', 'mid', 'min', 'mnm', 'mod', 'msg', 'msk', 'mxc',
+            'mxl', 'new', 'not', 'nul', 'num', 'obj', 'opt', 'pad',
+            'pck', 'pfx', 'pgm', 'pos', 'prc', 'prm', 'pth', 'pub',
+            'rcd', 'rdx', 'rec', 'ref', 'rnd', 'rno', 'sep', 'sgn',
+            'sin', 'sqr', 'srt', 'ssz', 'stk', 'stp', 'str', 'sub',
+            'swp', 'sys', 'tan', 'tbl', 'tcb', 'tmr', 'trx', 'tsk',
+            'txh', 'txw', 'ucp', 'ucs', 'upk', 'vin', 'vis', 'xeq',
+            'xfa', 'xor', '_obj'
+            ),
+        3 => array(
+            // System Variables
+            // Vars that are duplicates of functions
+            // 'ctl', 'err', 'pfx', 'prm', 'rnd', 'sep', 'sys',
+            'bkg', 'chn', 'day', 'dlm', 'dsz', 'eom', 'ers', 'esc',
+            'gfn', 'gid', 'hfn', 'hlp', 'hwd', 'lfa', 'lfo', 'lip',
+            'lpg', 'lwd', 'mse', 'msl', 'nar', 'nid', 'pgn', 'psz',
+            'quo', 'ret', 'sid', 'ssn', 'tim', 'tme', 'tms', 'tsm',
+            'uid', 'unt', 'who'
+
+            ),
+        4 => array(
+            // Nomads Variables
+            '%Flmaint_Lib$', '%Flmaint_Msg$', '%Nomads_Activation_Ok',
+            '%Nomads_Auto_Qry', '%Nomads_Disable_Debug',
+            '%Nomads_Disable_Trace', '%Nomads_Fkey_Handler$',
+            '%Nomads_Fkey_Tbl$', '%Nomads_Notest', '%Nomads_Onexit$',
+            '%Nomads_Post_Display', '%Nomads_Pre_Display$',
+            '%Nomads_Process$', '%Nomads_Trace_File$',
+            '%Nomad_Actv_Folder_Colors$', '%Nomad_Automation_Enabled',
+            '%Nomad_Auto_Close', '%Nomad_Center_Wdw', '%Nomad_Concurrent_Wdw',
+            '%Nomad_Custom_Define', '%Nomad_Custom_Dir$',
+            '%Nomad_Custom_Genmtc', '%Nomad_Custom_Skip_Definition',
+            '%Nomad_Def_Sfx$', '%Nomad_Enter_Tab', '%Nomad_Esc_Sel',
+            '%Nomad_Isjavx', '%Nomad_Iswindx', '%Nomad_Iswindx$',
+            '%Nomad_Menu$', '%Nomad_Menu_Leftedge_Clr$',
+            '%Nomad_Menu_Textbackground_Clr$', '%Nomad_Mln_Sep$',
+            '%Nomad_Msgmnt$', '%Nomad_Noplusw', '%Nomad_No_Customize',
+            '%Nomad_Object_Persistence', '%Nomad_Object_Resize',
+            '%Nomad_Open_Load', '%Nomad_Override_Font$',
+            '%Nomad_Palette_Loaded', '%Nomad_Panel_Info_Force',
+            '%Nomad_Panel_Info_Prog$', '%Nomad_Pnl_Def_Colour$',
+            '%Nomad_Pnl_Def_Font$', '%Nomad_Prg_Cache', '%Nomad_Qry_Attr$',
+            '%Nomad_Qry_Btn$', '%Nomad_Qry_Clear_Start', '%Nomad_Qry_Tip$',
+            '%Nomad_Qry_Wide', '%Nomad_Query_Clear_Status', '%Nomad_Query_Kno',
+            '%Nomad_Query_No_Gray', '%Nomad_Query_Odb_Ignore',
+            '%Nomad_Query_Retkno', '%Nomad_Query_Sbar_Max',
+            '%Nomad_Relative_Wdw', '%Nomad_Save_Qry_Path', '%Nomad_Script_Fn',
+            '%Nomad_Script_Log', '%Nomad_Script_Wdw',
+            '%Nomad_Skip_Change_Logic', '%Nomad_Skip_Onselect_Logic',
+            '%Nomad_Stk$', '%Nomad_Tab_Dir', '%Nomad_Timeout',
+            '%Nomad_Turbo_Off', '%Nomad_Visual_Effect',
+            '%Nomad_Visual_Override', '%Nomad_Win_Ver', '%Nomad_Xchar',
+            '%Nomad_Xmax', '%Nomad_Ychar', '%Nomad_Ymax', '%Scr_Def_Attr$',
+            '%Scr_Def_H_Fl$', '%Scr_Def_H_Id$', '%Scr_Lib', '%Scr_Lib$',
+            '%Z__Usr_Sec$', 'Alternate_Panel$', 'Alternate_Panel_Type$',
+            'Arg_1$', 'Arg_10$', 'Arg_11$', 'Arg_12$', 'Arg_13$', 'Arg_14$',
+            'Arg_15$', 'Arg_16$', 'Arg_17$', 'Arg_18$', 'Arg_19$', 'Arg_2$',
+            'Arg_20$', 'Arg_3$', 'Arg_4$', 'Arg_5$', 'Arg_6$', 'Arg_7$',
+            'Arg_8$', 'Arg_9$', 'Change_Flg', 'Cmd_Str$', 'Default_Prog$',
+            'Disp_Cmd$', 'Entire_Record$', 'Exit_Cmd$', 'Fldr_Default_Prog$',
+            'Folder_Id$', 'Id', 'Id$', 'Ignore_Exit', 'Initialize_Flg',
+            'Init_Text$', 'Init_Val$', 'Main_Scrn_K$', 'Mnu_Ln$',
+            'Next_Folder', 'Next_Id', 'Next_Id$', 'No_Flush', 'Prime_Key$',
+            'Prior_Val', 'Prior_Val$', 'Qry_Val$', 'Refresh_Flg',
+            'Replacement_Folder$', 'Replacement_Lib$', 'Replacement_Scrn$',
+            'Scrn_Id$', 'Scrn_K$', 'Scrn_Lib$', 'Tab_Table$', '_Eom$'
+            ),
+        5 => array(
+            // Mnemonics
+            "'!w'", "'*c'", "'*h'", "'*i'", "'*o'", "'*r'", "'*x'",
+            "'+b'", "'+d'", "'+e'", "'+f'", "'+i'", "'+n'",
+            "'+p'", "'+s'", "'+t'", "'+u'", "'+v'", "'+w'", "'+x'",
+            "'+z'", "'-b'", "'-d'", "'-e'", "'-f'", "'-i'",
+            "'-n'", "'-p'", "'-s'", "'-t'", "'-u'", "'-v'", "'-w'",
+            "'-x'", "'-z'", "'2d'", "'3d'", "'4d'", "'@@'", "'ab'",
+            "'arc'", "'at'", "'backgr'", "'bb'", "'be'", "'beep'",
+            "'bg'", "'bi'", "'bj'", "'bk'", "'black'", "'blue'",
+            "'bm'", "'bo'", "'box'", "'br'", "'bs'", "'bt'", "'bu'",
+            "'bw'", "'bx'", "'caption'", "'ce'", "'cf'", "'ch'",
+            "'ci'", "'circle'", "'cl'", "'colour'", "'cp'", "'cpi'",
+            "'cr'", "'cs'", "'cursor'", "'cyan''_cyan'", "'dc'",
+            "'default'", "'df'", "'dialogue'", "'dn'", "'do'",
+            "'drop'", "'eb'", "'ee'", "'ef'", "'eg'", "'ei'", "'ej'",
+            "'el'", "'em'", "'eo'", "'ep'", "'er'", "'es'", "'et'",
+            "'eu'", "'ew'", "'ff'", "'fill'", "'fl'", "'font'",
+            "'frame'", "'gd'", "'ge'", "'gf'", "'goto'", "'green'",
+            "'gs'", "'hide'", "'ic'", "'image'", "'jc'",
+            "'jd'", "'jl'", "'jn'", "'jr'", "'js'", "'l6'", "'l8'",
+            "'lc'", "'ld'", "'lf'", "'li'", "'line'", "'lm'",
+            "'lpi'", "'lt'", "'magenta'", "'maxsize'", "'me'",
+            "'message'", "'minsize'", "'mn'", "'mode'",
+            "'move'", "'mp'", "'ms'", "'ni'", "'offset'", "'option'",
+            "'pe'", "'pen'", "'picture'", "'pie'", "'pm'", "'polygon'",
+            "'pop'", "'ps'", "'push'", "'rb'", "'rc'", "'rectangle'",
+            "'red'", "'rl'", "'rm'", "'rp'", "'rs'", "'rt'", "'sb'",
+            "'scroll'", "'sd'", "'se'", "'sf'", "'show'", "'size'",
+            "'sl'", "'sn'", "'sp'", "'sr'", "'swap'", "'sx'", "'text'",
+            "'textwdw'", "'tr'", "'tw'", "'uc'", "'up'", "'vt'", "'wa'",
+            "'wc'", "'wd'", "'wg'", "'white'", "'window'", "'wm'",
+            "'wp'", "'wr'", "'wrap'", "'ws'", "'wx'", "'xp'", "'yellow'",
+            "'zx'", "'_black'", "'_blue'", "'_colour'", "'_green'",
+            "'_magenta'", "'_red'", "'_white'", "'_yellow'"
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('+', '-', '*', '/', '^', '|'),
+        1 => array('++', '--', '+=', '-=', '*=', '/=', '^=', '|='),
+        2 => array('&lt;', '&gt;', '='),
+        3 => array('(', ')', '[', ']', '{', '}'),
+        4 => array(',', '@', ';', '\\')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: navy;', // Directives
+            2 => 'color: blue;', // System Functions
+            3 => 'color: blue;', // System Variables
+            4 => 'color: #6A5ACD; font-style: italic;', // Nomads Global Variables
+            5 => 'color: #BDB76B;', // Mnemonics
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: green;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #0000C9;',
+            4 => 'color: #000099;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #006400; font-weight: bold',
+            2 => 'color: #6A5ACD;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.allbasic.info./wiki/index.php/PX:Directive_{FNAME}',
+        2 => 'http://www.allbasic.info./wiki/index.php/PX:System_function_{FNAME}',
+        3 => 'http://www.allbasic.info./wiki/index.php/PX:System_variable_{FNAME}',
+        4 => 'http://www.allbasic.info./wiki/index.php/PX:Nomads_{FNAME}',
+        5 => 'http://www.allbasic.info./wiki/index.php/PX:Mnemonic_{FNAMEU}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => "'"
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            // Line Labels
+            GESHI_SEARCH => '([[:space:]])([a-zA-Z_][a-zA-Z0-9_]+)(:)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        2 => array(
+            // Global String Variables
+            GESHI_SEARCH => '(\%)([a-zA-Z_][a-zA-Z0-9_]+)(\$)',
+            GESHI_REPLACE => '\\1\\2\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            )
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/python.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/python.php
new file mode 100644
index 000000000..6f378f434
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/python.php
@@ -0,0 +1,237 @@
+<?php
+/*************************************************************************************
+ * python.php
+ * ----------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * Python language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/12/18
+ *  -  Added missing functions and keywords. Also added two new Python 3.0 types. SF#2441839
+ * 2005/05/26
+ *  -  Modifications by Tim (tim@skreak.com): added more keyword categories, tweaked colors
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Python',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+        ** Set 1: reserved words
+        ** http://python.org/doc/current/ref/keywords.html
+        */
+        1 => array(
+            'and', 'del', 'for', 'is', 'raise', 'assert', 'elif', 'from', 'lambda', 'return', 'break',
+            'else', 'global', 'not', 'try', 'class', 'except', 'if', 'or', 'while', 'continue', 'exec',
+            'import', 'pass', 'yield', 'def', 'finally', 'in', 'print', 'with', 'as'
+            ),
+
+        /*
+        ** Set 2: builtins
+        ** http://python.org/doc/current/lib/built-in-funcs.html
+        */
+        2 => array(
+            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
+            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
+            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
+            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
+            'raw_input', 'reduce', 'reload', 'reversed', 'round', 'set', 'setattr', 'slice',
+            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
+            'vars', 'xrange', 'zip',
+            // Built-in constants: http://python.org/doc/current/lib/node35.html
+            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
+            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
+            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
+            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
+            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
+            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
+            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
+            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
+            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
+            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
+            'RuntimeWarning', 'FutureWarning',
+            // self: this is a common python convention (but not a reserved word)
+            'self',
+            // other
+            'any', 'all'
+            ),
+
+        /*
+        ** Set 3: standard library
+        ** http://python.org/doc/current/lib/modindex.html
+        */
+        3 => array(
+            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
+            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
+            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
+            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
+            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
+            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
+            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
+            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
+            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
+            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
+            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
+            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
+            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
+            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
+            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
+            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
+            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
+            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
+            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
+            're', 'readline', 'repr', 'resource', 'rexec', 'rfc822', 'rgbimg', 'rlcompleter',
+            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
+            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
+            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
+            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
+            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
+            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
+            'tokenize', 'traceback', 'tty', 'turtle', 'types', 'unicodedata', 'unittest', 'urllib2',
+            'urllib', 'urlparse', 'user', 'UserDict', 'UserList', 'UserString', 'uu', 'warnings',
+            'wave', 'weakref', 'webbrowser', 'whichdb', 'whrandom', 'winsound', 'xdrlib', 'xml',
+            'xmllib', 'xmlrpclib', 'zipfile', 'zipimport', 'zlib',
+            // Python 3.0
+            'bytes', 'bytearray'
+            ),
+
+        /*
+        ** Set 4: special methods
+        ** http://python.org/doc/current/ref/specialnames.html
+        */
+        4 => array(
+            /*
+            // Iterator types: http://python.org/doc/current/lib/typeiter.html
+            '__iter__', 'next',
+            // String types: http://python.org/doc/current/lib/string-methods.html
+            'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
+            'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
+            'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
+            'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
+            'translate', 'upper', 'zfill',
+            */
+            // Basic customization: http://python.org/doc/current/ref/customization.html
+            '__new__', '__init__', '__del__', '__repr__', '__str__',
+            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
+            '__hash__', '__nonzero__', '__unicode__', '__dict__',
+            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
+            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
+            '__delete__', '__slots__',
+            // Class creation, callable objects
+            '__metaclass__', '__call__',
+            // Container types: http://python.org/doc/current/ref/sequence-types.html
+            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
+            '__getslice__', '__setslice__', '__delslice__',
+            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
+            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
+            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
+            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
+            '__long__','__lshift__',
+            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
+            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
+            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
+            '__sub__','__xor__'
+            )
+        ),
+    'SYMBOLS' => array(
+            '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/qbasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/qbasic.php
new file mode 100644
index 000000000..e3b5df8a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/qbasic.php
@@ -0,0 +1,151 @@
+<?php
+/*************************************************************************************
+ * qbasic.php
+ * ----------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/20
+ *
+ * QBasic/QuickBASIC language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *   -  Added support for URLs
+ * 2004/08/05 (1.0.1)
+ *   -  Added support for symbols
+ *   -  Removed unnessecary slashes from some keywords
+ * 2004/07/14 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Make sure all possible combinations of keywords with
+ *   a space in them (EXIT FOR, END SELECT) are added
+ *   to the first keyword group
+ * * Update colours, especially for the first keyword group
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'QBasic/QuickBASIC',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Single-Line Comments using REM command
+        2 => "/\bREM.*?$/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'DO', 'LOOP', 'WHILE', 'WEND', 'THEN', 'ELSE', 'ELSEIF', 'IF',
+            'FOR', 'TO', 'NEXT', 'STEP', 'GOTO', 'GOSUB', 'CALL', 'CALLS',
+            'SUB', 'FUNCTION', 'RETURN', 'RESUME', 'SELECT', 'CASE', 'UNTIL'
+            ),
+        3 => array(
+            'ABS', 'ABSOLUTE', 'ACCESS', 'ALIAS', 'AND', 'ANY', 'APPEND', 'AS', 'ASC', 'ATN',
+            'BASE', 'BEEP', 'BINARY', 'BLOAD', 'BSAVE', 'BYVAL',
+            'CDBL', 'CDECL', 'CHAIN', 'CHDIR', 'CHR$', 'CINT', 'CIRCLE', 'CLEAR',
+            'CLNG', 'CLOSE', 'CLS', 'COM', 'COMMAND$', 'COMMON', 'CONST', 'COS', 'CSNG',
+            'CSRLIN', 'CVD', 'CVDMBF', 'CVI', 'CVL', 'CVS', 'CVSMDF', 'DATA', 'DATE$',
+            'DECLARE', 'DEF', 'FN', 'SEG', 'DEFDBL', 'DEFINT', 'DEFLNG', 'DEFSNG', 'DEFSTR',
+            'DIM', 'DOUBLE', 'DRAW', 'END', 'ENVIRON', 'ENVIRON$', 'EOF', 'EQV', 'ERASE',
+            'ERDEV', 'ERDEV$', 'ERL', 'ERR', 'ERROR', 'EXIT', 'EXP', 'FIELD', 'FILEATTR',
+            'FILES', 'FIX', 'FRE', 'FREEFILE', 'GET', 'HEX$', 'IMP', 'INKEY$',
+            'INP', 'INPUT', 'INPUT$', 'INSTR', 'INT', 'INTEGER', 'IOCTL', 'IOCTL$', 'IS',
+            'KEY', 'KILL', 'LBOUND', 'LCASE$', 'LEFT$', 'LEN', 'LET', 'LINE', 'LIST', 'LOC',
+            'LOCAL', 'LOCATE', 'LOCK', 'LOF', 'LOG', 'LONG', 'LPOS', 'LPRINT',
+            'LSET', 'LTRIM$', 'MID$', 'MKD$', 'MKDIR', 'MKDMBF$', 'MKI$', 'MKL$',
+            'MKS$', 'MKSMBF$', 'MOD', 'NAME', 'NOT', 'OCT$', 'OFF', 'ON', 'PEN', 'PLAY',
+            'OPEN', 'OPTION', 'OR', 'OUT', 'OUTPUT',
+            'PAINT', 'PALETTE', 'PCOPY', 'PEEK', 'PMAP', 'POINT', 'POKE', 'POS', 'PRESET',
+            'PRINT', 'PSET', 'PUT', 'RANDOM', 'RANDOMIZE', 'READ', 'REDIM', 'RESET',
+            'RESTORE', 'RIGHT$', 'RMDIR', 'RND', 'RSET', 'RTRIM$', 'RUN', 'SADD', 'SCREEN',
+            'SEEK', 'SETMEM', 'SGN', 'SHARED', 'SHELL', 'SIGNAL', 'SIN', 'SINGLE', 'SLEEP',
+            'SOUND', 'SPACE$', 'SPC', 'SQR', 'STATIC', 'STICK', 'STOP', 'STR$', 'STRIG',
+            'STRING', 'STRING$', 'SWAP', 'SYSTEM', 'TAB', 'TAN', 'TIME$', 'TIMER',
+            'TROFF', 'TRON', 'TYPE', 'UBOUND', 'UCASE$', 'UEVENT', 'UNLOCK', 'USING', 'VAL',
+            'VARPTR', 'VARPTR$', 'VARSEG', 'VIEW', 'WAIT', 'WIDTH', 'WINDOW', 'WRITE', 'XOR'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', ',', '+', '-', '*', '/', '=', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a1a100;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        3 => 'http://www.qbasicnews.com/qboho/qck{FNAMEL}.shtml'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rails.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rails.php
new file mode 100644
index 000000000..cc6e079b0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rails.php
@@ -0,0 +1,406 @@
+<?php
+/*************************************************************************************
+ * rails.php
+ * ---------
+ * Author: Moises Deniz
+ * Copyright: (c) 2005 Moises Deniz
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/03/21
+ *
+ * Ruby (with Ruby on Rails Framework) language file for GeSHi.
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Rails',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'and', 'begin', 'break', 'case', 'class',
+            'def', 'defined', 'do', 'else', 'elsif', 'end',
+            'ensure', 'for', 'if', 'in', 'module', 'while',
+            'next', 'not', 'or', 'redo', 'rescue', 'yield',
+            'retry', 'super', 'then', 'undef', 'unless',
+            'until', 'when', 'BEGIN', 'END', 'include'
+            ),
+        2 => array(
+            '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
+            'return'
+            ),
+        3 => array(
+            'Array', 'Float', 'Integer', 'String', 'at_exit',
+            'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
+            'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
+            'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
+            'iterator?', 'lambda', 'load', 'local_variables', 'loop',
+            'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
+            'raise', 'rand', 'readline', 'readlines', 'require', 'select',
+            'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
+            'system', 'trace_var', 'trap', 'untrace_var'
+            ),
+        4 => array(
+            'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
+            'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
+            'CGI::HtmlExtension', 'CGI::QueryExtension',
+            'CGI::Session', 'CGI::Session::FileStore',
+            'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
+            'ConditionVariable', 'Continuation', 'Data',
+            'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
+            'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
+            'Exception', 'FalseClass', 'File',
+            'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
+            'FileUtils::DryRun', 'FileUtils::NoWrite',
+            'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
+            'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
+            'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
+            'Iconv::Failure', 'Iconv::IllegalSequence',
+            'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
+            'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
+            'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
+            'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
+            'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
+            'Logger::ShiftingError', 'Marshal', 'MatchData',
+            'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
+            'NameError::message', 'NilClass', 'NoMemoryError',
+            'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
+            'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
+            'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
+            'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
+            'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
+            'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
+            'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
+            'SingleForwardable', 'Singleton', 'SingletonClassMethods',
+            'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
+            'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
+            'SyncEnumerator', 'SyntaxError', 'SystemCallError',
+            'SystemExit', 'SystemStackError', 'Tempfile',
+            'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
+            'ThreadError', 'ThreadGroup',
+            'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
+            'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
+            'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
+            'URI::InvalidComponentError', 'URI::InvalidURIError',
+            'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
+            'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
+            'ZeroDivisionError', 'Zlib',
+            'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
+            'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
+            'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
+            'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
+            'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
+            'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
+            'Zlib::VersionError',
+            'Zlib::ZStream',
+            'ActionController::AbstractRequest',
+            'ActionController::Assertions::DomAssertions',
+            'ActionController::Assertions::ModelAssertions',
+            'ActionController::Assertions::ResponseAssertions',
+            'ActionController::Assertions::RoutingAssertions',
+            'ActionController::Assertions::SelectorAssertions',
+            'ActionController::Assertions::TagAssertions',
+            'ActionController::Base',
+            'ActionController::Benchmarking::ClassMethods',
+            'ActionController::Caching',
+            'ActionController::Caching::Actions',
+            'ActionController::Caching::Actions::ActionCachePath',
+            'ActionController::Caching::Fragments',
+            'ActionController::Caching::Pages',
+            'ActionController::Caching::Pages::ClassMethods',
+            'ActionController::Caching::Sweeping',
+            'ActionController::Components',
+            'ActionController::Components::ClassMethods',
+            'ActionController::Components::InstanceMethods',
+            'ActionController::Cookies',
+            'ActionController::Filters::ClassMethods',
+            'ActionController::Flash',
+            'ActionController::Flash::FlashHash',
+            'ActionController::Helpers::ClassMethods',
+            'ActionController::Integration::Session',
+            'ActionController::IntegrationTest',
+            'ActionController::Layout::ClassMethods',
+            'ActionController::Macros',
+            'ActionController::Macros::AutoComplete::ClassMethods',
+            'ActionController::Macros::InPlaceEditing::ClassMethods',
+            'ActionController::MimeResponds::InstanceMethods',
+            'ActionController::Pagination',
+            'ActionController::Pagination::ClassMethods',
+            'ActionController::Pagination::Paginator',
+            'ActionController::Pagination::Paginator::Page',
+            'ActionController::Pagination::Paginator::Window',
+            'ActionController::Rescue', 'ActionController::Resources',
+            'ActionController::Routing',
+            'ActionController::Scaffolding::ClassMethods',
+            'ActionController::SessionManagement::ClassMethods',
+            'ActionController::Streaming', 'ActionController::TestProcess',
+            'ActionController::TestUploadedFile',
+            'ActionController::UrlWriter',
+            'ActionController::Verification::ClassMethods',
+            'ActionMailer::Base', 'ActionView::Base',
+            'ActionView::Helpers::ActiveRecordHelper',
+            'ActionView::Helpers::AssetTagHelper',
+            'ActionView::Helpers::BenchmarkHelper',
+            'ActionView::Helpers::CacheHelper',
+            'ActionView::Helpers::CaptureHelper',
+            'ActionView::Helpers::DateHelper',
+            'ActionView::Helpers::DebugHelper',
+            'ActionView::Helpers::FormHelper',
+            'ActionView::Helpers::FormOptionsHelper',
+            'ActionView::Helpers::FormTagHelper',
+            'ActionView::Helpers::JavaScriptHelper',
+            'ActionView::Helpers::JavaScriptMacrosHelper',
+            'ActionView::Helpers::NumberHelper',
+            'ActionView::Helpers::PaginationHelper',
+            'ActionView::Helpers::PrototypeHelper',
+            'ActionView::Helpers::PrototypeHelper::JavaScriptGenerator::GeneratorMethods',
+            'ActionView::Helpers::ScriptaculousHelper',
+            'ActionView::Helpers::TagHelper',
+            'ActionView::Helpers::TextHelper',
+            'ActionView::Helpers::UrlHelper', 'ActionView::Partials',
+            'ActionWebService::API::Method', 'ActionWebService::Base',
+            'ActionWebService::Client::Soap',
+            'ActionWebService::Client::XmlRpc',
+            'ActionWebService::Container::ActionController::ClassMethods',
+            'ActionWebService::Container::Delegated::ClassMethods',
+            'ActionWebService::Container::Direct::ClassMethods',
+            'ActionWebService::Invocation::ClassMethods',
+            'ActionWebService::Scaffolding::ClassMethods',
+            'ActionWebService::SignatureTypes', 'ActionWebService::Struct',
+            'ActiveRecord::Acts::List::ClassMethods',
+            'ActiveRecord::Acts::List::InstanceMethods',
+            'ActiveRecord::Acts::NestedSet::ClassMethods',
+            'ActiveRecord::Acts::NestedSet::InstanceMethods',
+            'ActiveRecord::Acts::Tree::ClassMethods',
+            'ActiveRecord::Acts::Tree::InstanceMethods',
+            'ActiveRecord::Aggregations::ClassMethods',
+            'ActiveRecord::Associations::ClassMethods',
+            'ActiveRecord::AttributeMethods::ClassMethods',
+            'ActiveRecord::Base',
+            'ActiveRecord::Calculations::ClassMethods',
+            'ActiveRecord::Callbacks',
+            'ActiveRecord::ConnectionAdapters::AbstractAdapter',
+            'ActiveRecord::ConnectionAdapters::Column',
+            'ActiveRecord::ConnectionAdapters::DB2Adapter',
+            'ActiveRecord::ConnectionAdapters::DatabaseStatements',
+            'ActiveRecord::ConnectionAdapters::FirebirdAdapter',
+            'ActiveRecord::ConnectionAdapters::FrontBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::MysqlAdapter',
+            'ActiveRecord::ConnectionAdapters::OpenBaseAdapter',
+            'ActiveRecord::ConnectionAdapters::OracleAdapter',
+            'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter',
+            'ActiveRecord::ConnectionAdapters::Quoting',
+            'ActiveRecord::ConnectionAdapters::SQLServerAdapter',
+            'ActiveRecord::ConnectionAdapters::SQLiteAdapter',
+            'ActiveRecord::ConnectionAdapters::SchemaStatements',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapter::ColumnWithIdentity',
+            'ActiveRecord::ConnectionAdapters::SybaseAdapterContext',
+            'ActiveRecord::ConnectionAdapters::TableDefinition',
+            'ActiveRecord::Errors', 'ActiveRecord::Locking',
+            'ActiveRecord::Locking::Optimistic',
+            'ActiveRecord::Locking::Optimistic::ClassMethods',
+            'ActiveRecord::Locking::Pessimistic',
+            'ActiveRecord::Migration', 'ActiveRecord::Observer',
+            'ActiveRecord::Observing::ClassMethods',
+            'ActiveRecord::Reflection::ClassMethods',
+            'ActiveRecord::Reflection::MacroReflection',
+            'ActiveRecord::Schema', 'ActiveRecord::Timestamp',
+            'ActiveRecord::Transactions::ClassMethods',
+            'ActiveRecord::Validations',
+            'ActiveRecord::Validations::ClassMethods',
+            'ActiveRecord::XmlSerialization',
+            'ActiveSupport::CachingTools::HashCaching',
+            'ActiveSupport::CoreExtensions::Array::Conversions',
+            'ActiveSupport::CoreExtensions::Array::Grouping',
+            'ActiveSupport::CoreExtensions::Date::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions',
+            'ActiveSupport::CoreExtensions::Hash::Conversions::ClassMethods',
+            'ActiveSupport::CoreExtensions::Hash::Diff',
+            'ActiveSupport::CoreExtensions::Hash::Keys',
+            'ActiveSupport::CoreExtensions::Hash::ReverseMerge',
+            'ActiveSupport::CoreExtensions::Integer::EvenOdd',
+            'ActiveSupport::CoreExtensions::Integer::Inflections',
+            'ActiveSupport::CoreExtensions::Numeric::Bytes',
+            'ActiveSupport::CoreExtensions::Numeric::Time',
+            'ActiveSupport::CoreExtensions::Pathname::CleanWithin',
+            'ActiveSupport::CoreExtensions::Range::Conversions',
+            'ActiveSupport::CoreExtensions::String::Access',
+            'ActiveSupport::CoreExtensions::String::Conversions',
+            'ActiveSupport::CoreExtensions::String::Inflections',
+            'ActiveSupport::CoreExtensions::String::Iterators',
+            'ActiveSupport::CoreExtensions::String::StartsEndsWith',
+            'ActiveSupport::CoreExtensions::String::Unicode',
+            'ActiveSupport::CoreExtensions::Time::Calculations',
+            'ActiveSupport::CoreExtensions::Time::Calculations::ClassMethods',
+            'ActiveSupport::CoreExtensions::Time::Conversions',
+            'ActiveSupport::Multibyte::Chars',
+            'ActiveSupport::Multibyte::Handlers::UTF8Handler',
+            'Breakpoint', 'Builder::BlankSlate', 'Builder::XmlMarkup',
+            'Fixtures',
+            'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+            'Inflector::Inflections', 'Mime', 'Mime::Type',
+            'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
+            ),
+        5 => array(
+            'image_tag', 'link_to', 'link_to_remote', 'javascript_include_tag',
+            'assert_equal', 'assert_not_equal', 'before_filter',
+            'after_filter', 'render', 'redirect_to', 'hide_action',
+            'render_to_string', 'url_for', 'controller_name',
+            'controller_class_name', 'controller_path', 'session',
+            'render_component', 'render_component_as_string', 'cookie',
+            'layout', 'flash', 'auto_complete_for', 'in_place_editor_for',
+            'respond_to', 'paginate', 'current_page', 'each', 'first',
+            'first_page', 'last_page', 'last', 'length', 'new', 'page_count',
+            'previous', 'scaffold', 'send_data',
+            'send_file', 'deliver', 'receive', 'error_messages_for',
+            'error_message_on', 'form', 'input', 'stylesheet_link_tag',
+            'stylesheet_path', 'content_for', 'select_date', 'ago',
+            'month', 'day', 'check_box', 'fields_for', 'file_field',
+            'form_for', 'hidden_field', 'text_area', 'password_field',
+            'collection_select', 'options_for_select',
+            'options_from_collection_for_select', 'file_field_tag',
+            'form_for_tag', 'hidden_field_tag', 'text_area_tag',
+            'password_field_tag', 'link_to_function', 'javascript_tag',
+            'human_size', 'number_to_currency', 'pagination_links',
+            'form_remote_tag', 'form_remote_for',
+            'submit_to_remote', 'remote_function', 'observe_form',
+            'observe_field', 'remote_form_for', 'options_for_ajax', 'alert',
+            'call', 'assign', 'show', 'hide', 'insert_html', 'sortable',
+            'toggle', 'visual_effect', 'replace', 'replace_html', 'remove',
+            'save', 'save!', 'draggable', 'drop_receiving', 'literal',
+            'draggable_element', 'drop_receiving_element', 'sortable_element',
+            'content_tag', 'tag', 'link_to_image', 'link_to_if',
+            'link_to_unless', 'mail_to', 'link_image_to', 'button_to',
+            'current_page?', 'act_as_list', 'act_as_nested', 'act_as_tree',
+            'has_many', 'has_one', 'belongs_to', 'has_many_and_belogns_to',
+            'delete', 'destroy', 'destroy_all', 'clone', 'deep_clone', 'copy',
+            'update', 'table_name', 'primary_key', 'sum', 'maximun', 'minimum',
+            'count', 'size', 'after_save', 'after_create', 'before_save',
+            'before_create', 'add_to_base', 'errors', 'add', 'validate',
+            'validates_presence_of', 'validates_numericality_of',
+            'validates_uniqueness_of', 'validates_length_of',
+            'validates_format_of', 'validates_size_of', 'to_a', 'to_s',
+            'to_xml', 'to_i'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            5 => 'color:#5A0A0A; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+                    'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*", //Static OOP References
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rebol.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rebol.php
new file mode 100644
index 000000000..97eff1f32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/rebol.php
@@ -0,0 +1,196 @@
+<?php
+/*************************************************************************************
+ * rebol.php
+ * --------
+ * Author: Lecanu Guillaume (Guillaume@LyA.fr)
+ * Copyright: (c) 2004-2005 Lecanu Guillaume (Guillaume@LyA.fr)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/12/22
+ *
+ * Rebol language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2009/01/26 (1.0.8.3)
+ *  -  Adapted language file to comply to GeSHi language file guidelines
+ * 2004/11/25 (1.0.3)
+ *  -  Added support for multiple object splitters
+ *  -  Fixed &new problem
+ * 2004/10/27 (1.0.2)
+ *  -  Added URL support
+ *  -  Added extra constants
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * * Make sure the last few function I may have missed
+ *   (like eval()) are included for highlighting
+ * * Split to several files - php4, php5 etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'REBOL',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('rebol [' => ']', 'comment [' => ']'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'binary!','block!','char!','date!','decimal!','email!','file!',
+            'hash!','integer!','issue!','list!','logic!','money!','none!',
+            'object!','paren!','pair!','path!','string!','tag!','time!',
+            'tuple!','url!',
+            ),
+        2 => array(
+            'all','any','attempt','break','catch','compose','disarm','dispatch',
+            'do','do-events','does','either','else','exit','for','forall',
+            'foreach','forever','forskip','func','function','halt','has','if',
+            'launch','loop','next','quit','reduce','remove-each','repeat',
+            'return','secure','switch','throw','try','until','wait','while',
+            ),
+        3 => array(
+            'about','abs','absolute','add','alert','alias','alter','and',
+            'any-block?','any-function?','any-string?','any-type?','any-word?',
+            'append','arccosine','arcsine','arctangent','array','as-pair',
+            'ask','at','back','binary?','bind','bitset?','block?','brightness?',
+            'browse','build-tag','caret-to-offset','center-face','change',
+            'change-dir','char?','charset','checksum','choose','clean-path',
+            'clear','clear-fields','close','comment','complement','component?',
+            'compress','confirm','connected?','construct','context','copy',
+            'cosine','datatype?','date?','debase','decimal?','decode-cgi',
+            'decompress','dehex','delete','detab','difference','dir?','dirize',
+            'divide','dump-face','dump-obj','echo','email?','empty?','enbase',
+            'entab','equal?','error?','even?','event?','exclude','exists?',
+            'exp','extract','fifth','file?','find','first','flash','focus',
+            'form','found?','fourth','free','function?','get','get-modes',
+            'get-word?','greater-or-equal?','greater?','hash?','head','head?',
+            'help','hide','hide-popup','image?','import-email','in',
+            'in-window?','index?','info?','inform','input','input?','insert',
+            'integer?','intersect','issue?','join','last','layout','length?',
+            'lesser-or-equal?','lesser?','library?','license','link?',
+            'list-dir','list?','lit-path?','lit-word?','load','load-image',
+            'log-10','log-2','log-e','logic?','lowercase','make','make-dir',
+            'make-face','max','maximum','maximum-of','min','minimum',
+            'minimum-of','modified?','mold','money?','multiply','native?',
+            'negate','negative?','none?','not','not-equal?','now','number?',
+            'object?','odd?','offset-to-caret','offset?','op?','open','or',
+            'pair?','paren?','parse','parse-xml','path?','pick','poke','port?',
+            'positive?','power','prin','print','probe','protect',
+            'protect-system','query','random','read','read-io','recycle',
+            'refinement?','reform','rejoin','remainder','remold','remove',
+            'rename',
+            //'repeat',
+            'repend','replace','request','request-color','request-date',
+            'request-download','request-file','request-list','request-pass',
+            'request-text','resend','reverse','routine?','same?','save',
+            'script?','second','select','send','series?','set','set-modes',
+            'set-net','set-path?','set-word?','show','show-popup','sign?',
+            'sine','size-text','size?','skip','sort','source','span?',
+            'split-path','square-root','strict-equal?','strict-not-equal?',
+            'string?','struct?','stylize','subtract','suffix?','tag?','tail',
+            'tail?','tangent','third','time?','to','to-binary','to-bitset',
+            'to-block','to-char','to-date','to-decimal','to-email','to-file',
+            'to-get-word','to-hash','to-hex','to-idate','to-image','to-integer',
+            'to-issue','to-list','to-lit-path','to-lit-word','to-local-file',
+            'to-logic','to-money','to-pair','to-paren','to-path',
+            'to-rebol-file','to-refinement','to-set-path','to-set-word',
+            'to-string','to-tag','to-time','to-tuple','to-url','to-word',
+            'trace','trim','tuple?','type?','unfocus','union','unique',
+            'unprotect','unset','unset?','unview','update','upgrade',
+            'uppercase','url?','usage','use','value?','view','viewed?','what',
+            'what-dir','within?','word?','write','write-io','xor','zero?',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+//        2 => 'includes/dico_rebol.php?word={FNAME}',
+//        3 => 'includes/dico_rebol.php?word={FNAME}'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/reg.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/reg.php
new file mode 100644
index 000000000..59199f743
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/reg.php
@@ -0,0 +1,233 @@
+<?php
+/*************************************************************************************
+ * reg.php
+ * -------
+ * Author: Sean Hanna (smokingrope@gmail.com)
+ * Copyright: (c) 2006 Sean Hanna
+ * Release Version: 1.0.8.4
+ * Date Started: 03/15/2006
+ *
+ * Microsoft Registry Editor language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Updated and optimized most regular expressions
+ * 03/15/2006 (0.5.0)
+ *  -  Syntax File Created
+ * 04/27/2006 (0.9.5)
+ *  -  Syntax Coloring Cleaned Up
+ *  -  First Release
+ * 04/29/2006 (1.0.0)
+ *  -  Updated a few coloring settings
+ *
+ * TODO (updated 4/27/2006)
+ * -------------------------
+ * - Add a verification to the multi-line portion of the hex field regex
+ *    for a '\' character on the line preceding the line of the multi-line
+ *    hex field.
+ *
+ * KNOWN ISSUES (updated 4/27/2006)
+ * ---------------------------------
+ *
+ * - There are two regexes for the multiline hex value regex. The regex for
+ *        all lines after the first does not verify that the previous line contains
+ *        a line continuation character '\'. This regex also does not check for
+ *        end of line as it should.
+ *
+ * - If number_highlighting is enabled during processing of this syntax file
+ *    many of the regexps used will appear slightly incorrect.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Microsoft Registry',
+    'COMMENT_SINGLE' => array(1 =>';'),
+    'COMMENT_MULTI' => array( ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+//        1 => array(),
+//        2 => array(),
+        /* Registry Key Constants Not Used */
+        3 => array(
+            'HKEY_LOCAL_MACHINE',
+            'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_USER',
+            'HKEY_USERS',
+            'HKEY_CURRENT_CONFIG',
+            'HKEY_DYN_DATA',
+            'HKLM', 'HKCR', 'HKCU', 'HKU', 'HKCC', 'HKDD'
+            )
+        ),
+    'SYMBOLS' => array(
+        '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+//        1 => false,
+//        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+//            1 => 'color: #00CCFF;',
+//            2 => 'color: #0000FF;',
+            3 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00CCFF;',
+            1 => 'color: #0000FF;',
+            2 => '',
+            3 => 'color: #0000FF;',
+            4 => 'color: #0000FF;',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => 'color: #FF6600;',
+            )
+        ),
+    'URLS' => array(
+//        1 => '',
+//        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Highlight Key Delimiters
+        0 => array(
+            GESHI_SEARCH => '((^|\\n)\\s*)(\\\\\\[(.*)\\\\\\])(\\s*(\\n|$))',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\5'
+//            GESHI_CLASS => 'kw1'
+            ),
+        // Highlight File Format Header Version 5
+        1 => array(
+            GESHI_SEARCH => '(^\s*)(Windows Registry Editor Version \d+\.\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight File Format Header Version 4
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(REGEDIT\s?\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight dword: 32 bit integer values
+        3 => array(
+            GESHI_SEARCH => '(=\s*)(dword:[0-9a-fA-F]{8})(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+//            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight variable names
+        4 => array(
+            GESHI_SEARCH => '(^\s*)(\&quot;.*?\&quot;)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight String Values
+        5 => array(
+            GESHI_SEARCH => '(=\s*)(\&quot;.*?\&quot;)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'st0'
+            ),
+        // Highlight Hexadecimal Values (Single-Line and Multi-Line)
+        6 => array(
+            GESHI_SEARCH => '(=\s*\n?\s*)(hex:[0-9a-fA-F]{2}(,(\\\s*\n\s*)?[0-9a-fA-F]{2})*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight Default Variable
+        7 => array(
+            GESHI_SEARCH => '(^\s*)(@)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight GUID's found anywhere.
+        8 => array(
+            GESHI_SEARCH => '(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'geshi_guid'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/robots.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/robots.php
new file mode 100644
index 000000000..af5fe1426
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/robots.php
@@ -0,0 +1,98 @@
+<?php
+/*************************************************************************************
+ * robots.php
+ * --------
+ * Author: Christian Lescuyer (cl@goelette.net)
+ * Copyright: (c) 2006 Christian Lescuyer http://xtian.goelette.info
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/02/17
+ *
+ * robots.txt language file for GeSHi.
+ *
+ * 2006/02/17 (1.0.0)
+ *   -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'robots.txt',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'User-agent', 'Disallow'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.robotstxt.org/wc/norobots.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ruby.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ruby.php
new file mode 100644
index 000000000..8c2b7d829
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/ruby.php
@@ -0,0 +1,226 @@
+<?php
+/*************************************************************************************
+ * ruby.php
+ * --------
+ * Author: Moises Deniz
+ * Copyright: (c) 2007 Moises Deniz
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/03/21
+ *
+ * Ruby language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/03/21 (1.0.7.19)
+ *   -  Initial release
+ *
+ *************************************************************************************
+ *
+ *   This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Ruby',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+                'alias', 'and', 'begin', 'break', 'case', 'class',
+                'def', 'defined', 'do', 'else', 'elsif', 'end',
+                'ensure', 'for', 'if', 'in', 'module', 'while',
+                'next', 'not', 'or', 'redo', 'rescue', 'yield',
+                'retry', 'super', 'then', 'undef', 'unless',
+                'until', 'when', 'BEGIN', 'END', 'include'
+            ),
+        2 => array(
+                '__FILE__', '__LINE__', 'false', 'nil', 'self', 'true',
+                'return'
+            ),
+        3 => array(
+                'Array', 'Float', 'Integer', 'String', 'at_exit',
+                'autoload', 'binding', 'caller', 'catch', 'chop', 'chop!',
+                'chomp', 'chomp!', 'eval', 'exec', 'exit', 'exit!', 'fail',
+                'fork', 'format', 'gets', 'global_variables', 'gsub', 'gsub!',
+                'iterator?', 'lambda', 'load', 'local_variables', 'loop',
+                'open', 'p', 'print', 'printf', 'proc', 'putc', 'puts',
+                'raise', 'rand', 'readline', 'readlines', 'require', 'select',
+                'sleep', 'split', 'sprintf', 'srand', 'sub', 'sub!', 'syscall',
+                'system', 'trace_var', 'trap', 'untrace_var'
+            ),
+        4 => array(
+                'Abbrev', 'ArgumentError', 'Base64', 'Benchmark',
+                'Benchmark::Tms', 'Bignum', 'Binding', 'CGI', 'CGI::Cookie',
+                'CGI::HtmlExtension', 'CGI::QueryExtension',
+                'CGI::Session', 'CGI::Session::FileStore',
+                'CGI::Session::MemoryStore', 'Class', 'Comparable', 'Complex',
+                'ConditionVariable', 'Continuation', 'Data',
+                'Date', 'DateTime', 'Delegator', 'Dir', 'EOFError', 'ERB',
+                'ERB::Util', 'Enumerable', 'Enumerable::Enumerator', 'Errno',
+                'Exception', 'FalseClass', 'File',
+                'File::Constants', 'File::Stat', 'FileTest', 'FileUtils',
+                'FileUtils::DryRun', 'FileUtils::NoWrite',
+                'FileUtils::StreamUtils_', 'FileUtils::Verbose', 'Find',
+                'Fixnum', 'FloatDomainError', 'Forwardable', 'GC', 'Generator',
+                'Hash', 'IO', 'IOError', 'Iconv', 'Iconv::BrokenLibrary',
+                'Iconv::Failure', 'Iconv::IllegalSequence',
+                'Iconv::InvalidCharacter', 'Iconv::InvalidEncoding',
+                'Iconv::OutOfRange', 'IndexError', 'Interrupt', 'Kernel',
+                'LoadError', 'LocalJumpError', 'Logger', 'Logger::Application',
+                'Logger::Error', 'Logger::Formatter', 'Logger::LogDevice',
+                'Logger::LogDevice::LogDeviceMutex', 'Logger::Severity',
+                'Logger::ShiftingError', 'Marshal', 'MatchData',
+                'Math', 'Matrix', 'Method', 'Module', 'Mutex', 'NameError',
+                'NameError::message', 'NilClass', 'NoMemoryError',
+                'NoMethodError', 'NotImplementedError', 'Numeric', 'Object',
+                'ObjectSpace', 'Observable', 'PStore', 'PStore::Error',
+                'Pathname', 'Precision', 'Proc', 'Process', 'Process::GID',
+                'Process::Status', 'Process::Sys', 'Process::UID', 'Queue',
+                'Range', 'RangeError', 'Rational', 'Regexp', 'RegexpError',
+                'RuntimeError', 'ScriptError', 'SecurityError', 'Set',
+                'Shellwords', 'Signal', 'SignalException', 'SimpleDelegator',
+                'SingleForwardable', 'Singleton', 'SingletonClassMethods',
+                'SizedQueue', 'SortedSet', 'StandardError', 'StringIO',
+                'StringScanner', 'StringScanner::Error', 'Struct', 'Symbol',
+                'SyncEnumerator', 'SyntaxError', 'SystemCallError',
+                'SystemExit', 'SystemStackError', 'Tempfile',
+                'Test::Unit::TestCase', 'Test::Unit', 'Test', 'Thread',
+                'ThreadError', 'ThreadGroup',
+                'ThreadsWait', 'Time', 'TrueClass', 'TypeError', 'URI',
+                'URI::BadURIError', 'URI::Error', 'URI::Escape', 'URI::FTP',
+                'URI::Generic', 'URI::HTTP', 'URI::HTTPS',
+                'URI::InvalidComponentError', 'URI::InvalidURIError',
+                'URI::LDAP', 'URI::MailTo', 'URI::REGEXP',
+                'URI::REGEXP::PATTERN', 'UnboundMethod', 'Vector', 'YAML',
+                'ZeroDivisionError', 'Zlib',
+                'Zlib::BufError', 'Zlib::DataError', 'Zlib::Deflate',
+                'Zlib::Error', 'Zlib::GzipFile', 'Zlib::GzipFile::CRCError',
+                'Zlib::GzipFile::Error', 'Zlib::GzipFile::LengthError',
+                'Zlib::GzipFile::NoFooter', 'Zlib::GzipReader',
+                'Zlib::GzipWriter', 'Zlib::Inflate', 'Zlib::MemError',
+                'Zlib::NeedDict', 'Zlib::StreamEnd', 'Zlib::StreamError',
+                'Zlib::VersionError',
+                'Zlib::ZStream',
+                'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+                'Inflector::Inflections', 'Mime', 'Mime::Type',
+                'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            'MULTI' => 'color:#000080; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#006666;'
+            ),
+        'METHODS' => array(
+            1 => 'color:#9900CC;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#006600; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(//Variables
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(//Arrays
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sas.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sas.php
new file mode 100644
index 000000000..bc6899716
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sas.php
@@ -0,0 +1,290 @@
+<?php
+/*************************************************************************************
+ * sas.php
+ * -------
+ * Author: Galen Johnson (solitaryr@gmail.com)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/12/27
+ *
+ * SAS language file for GeSHi. Based on the sas vim file.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ *   -  Cleaned up code style
+ * 2005/12/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2005/12/27)
+ * -------------------------
+ * * Check highlighting stuff works
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SAS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '_ALL_','_CHARACTER_','_INFILE_','_N_','_NULL_','_NUMERIC_',
+            '_WEBOUT_'
+            ),
+        2 => array(
+            '%BQUOTE','%CMPRES','%COMPSTOR','%DATATYP','%DISPLAY','%DO','%ELSE',
+            '%END','%EVAL','%GLOBAL','%GOTO','%IF','%INDEX','%INPUT','%KEYDEF',
+            '%LABEL','%LEFT','%LENGTH','%LET','%LOCAL','%LOWCASE','%MACRO',
+            '%MEND','%NRBQUOTE','%NRQUOTE','%NRSTR','%PUT','%QCMPRES','%QLEFT',
+            '%QLOWCASE','%QSCAN','%QSUBSTR','%QSYSFUNC','%QTRIM','%QUOTE',
+            '%QUPCASE','%SCAN','%STR','%SUBSTR','%SUPERQ','%SYSCALL',
+            '%SYSEVALF','%SYSEXEC','%SYSFUNC','%SYSGET','%SYSLPUT','%SYSPROD',
+            '%SYSRC','%SYSRPUT','%THEN','%TO','%TRIM','%UNQUOTE','%UNTIL',
+            '%UPCASE','%VERIFY','%WHILE','%WINDOW'
+            ),
+        3 => array(
+            'ABS','ADDR','AIRY','ARCOS','ARSIN','ATAN','ATTRC','ATTRN','BAND',
+            'BETAINV','BLSHIFT','BNOT','BOR','BRSHIFT','BXOR','BYTE','CDF',
+            'CEIL','CEXIST','CINV','CLOSE','CNONCT','COLLATE','COMPBL',
+            'COMPOUND','COMPRESS','COSH','COS','CSS','CUROBS','CV','DACCDBSL',
+            'DACCDB','DACCSL','DACCSYD','DACCTAB','DAIRY','DATETIME','DATEJUL',
+            'DATEPART','DATE','DAY','DCLOSE','DEPDBSL','DEPDB','DEPSL','DEPSYD',
+            'DEPTAB','DEQUOTE','DHMS','DIF','DIGAMMA','DIM','DINFO','DNUM',
+            'DOPEN','DOPTNAME','DOPTNUM','DREAD','DROPNOTE','DSNAME','ERFC',
+            'ERF','EXIST','EXP','FAPPEND','FCLOSE','FCOL','FDELETE','FETCHOBS',
+            'FETCH','FEXIST','FGET','FILEEXIST','FILENAME','FILEREF','FINFO',
+            'FINV','FIPNAMEL','FIPNAME','FIPSTATE','FLOOR','FNONCT','FNOTE',
+            'FOPEN','FOPTNAME','FOPTNUM','FPOINT','FPOS','FPUT','FREAD',
+            'FREWIND','FRLEN','FSEP','FUZZ','FWRITE','GAMINV','GAMMA',
+            'GETOPTION','GETVARC','GETVARN','HBOUND','HMS','HOSTHELP','HOUR',
+            'IBESSEL','INDEXW','INDEXC','INDEX','INPUTN','INPUTC','INPUT',
+            'INTRR','INTCK','INTNX','INT','IRR','JBESSEL','JULDATE','KURTOSIS',
+            'LAG','LBOUND','LEFT','LENGTH','LGAMMA','LIBNAME','LIBREF','LOG10',
+            'LOG2','LOGPDF','LOGPMF','LOGSDF','LOG','LOWCASE','MAX','MDY',
+            'MEAN','MINUTE','MIN','MOD','MONTH','MOPEN','MORT','NETPV','NMISS',
+            'NORMAL','NPV','N','OPEN','ORDINAL','PATHNAME','PDF','PEEKC','PEEK',
+            'PMF','POINT','POISSON','POKE','PROBBETA','PROBBNML','PROBCHI',
+            'PROBF','PROBGAM','PROBHYPR','PROBIT','PROBNEGB','PROBNORM','PROBT',
+            'PUTN','PUTC','PUT','QTR','QUOTE','RANBIN','RANCAU','RANEXP',
+            'RANGAM','RANGE','RANK','RANNOR','RANPOI','RANTBL','RANTRI',
+            'RANUNI','REPEAT','RESOLVE','REVERSE','REWIND','RIGHT','ROUND',
+            'SAVING','SCAN','SDF','SECOND','SIGN','SINH','SIN','SKEWNESS',
+            'SOUNDEX','SPEDIS','SQRT','STDERR','STD','STFIPS','STNAME',
+            'STNAMEL','SUBSTR','SUM','SYMGET','SYSGET','SYSMSG','SYSPROD',
+            'SYSRC','SYSTEM','TANH','TAN','TIMEPART','TIME','TINV','TNONCT',
+            'TODAY','TRANSLATE','TRANWRD','TRIGAMMA','TRIMN','TRIM','TRUNC',
+            'UNIFORM','UPCASE','USS','VARFMT','VARINFMT','VARLABEL','VARLEN',
+            'VARNAME','VARNUM','VARRAYX','VARRAY','VARTYPE','VAR','VERIFY',
+            'VFORMATX','VFORMATDX','VFORMATD','VFORMATNX','VFORMATN',
+            'VFORMATWX','VFORMATW','VFORMAT','VINARRAYX','VINARRAY',
+            'VINFORMATX','VINFORMATDX','VINFORMATD','VINFORMATNX','VINFORMATN',
+            'VINFORMATWX','VINFORMATW','VINFORMAT','VLABELX','VLABEL',
+            'VLENGTHX','VLENGTH','VNAMEX','VNAME','VTYPEX','VTYPE','WEEKDAY',
+            'YEAR','YYQ','ZIPFIPS','ZIPNAME','ZIPNAMEL','ZIPSTATE'
+            ),
+        4 => array(
+            'ABORT','ADD','ALTER','AND','ARRAY','AS','ATTRIB','BY','CALL',
+            'CARDS4','CASCADE','CATNAME','CHECK','CONTINUE','CREATE',
+            'DATALINES4','DELETE','DESCRIBE','DISPLAY','DISTINCT','DM','DROP',
+            'ENDSAS','FILE','FOOTNOTE','FOREIGN','FORMAT','FROM',
+            'GOTO','GROUP','HAVING','IN','INFILE','INFORMAT',
+            'INSERT','INTO','KEEP','KEY','LABEL','LEAVE',
+            'LIKE','LINK','LIST','LOSTCARD','MERGE','MESSAGE','MISSING',
+            'MODIFY','MSGTYPE','NOT','NULL','ON','OPTIONS','OR','ORDER',
+            'OUTPUT','PAGE','PRIMARY','REDIRECT','REFERENCES','REMOVE',
+            'RENAME','REPLACE','RESET','RESTRICT','RETAIN','RETURN','SELECT',
+            'SET','SKIP','STARTSAS','STOP','SYSTASK','TABLE','TITLE','UNIQUE',
+            'UPDATE','VALIDATE','VIEW','WAITSAS','WHERE','WINDOW','X'
+            ),
+        5 => array(
+            'DO','ELSE','END','IF','THEN','UNTIL','WHILE'
+            ),
+        6 => array(
+            'RUN','QUIT','DATA'
+            ),
+        7 => array(
+            'ERROR'
+            ),
+        8 => array(
+            'WARNING'
+            ),
+        9 => array(
+            'NOTE'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #0000ff;',
+            6 => 'color: #000080; font-weight: bold;',
+            7 => 'color: #ff0000;',
+            8 => 'color: #00ff00;',
+            9 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+//            1 => 'color: #006400; font-style: italic;',
+            'MULTI' => 'color: #006400; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a020f0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2e8b57; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #006400; font-style: italic;',
+            3 => 'color: #006400; font-style: italic;',
+            4 => 'color: #006400; font-style: italic;',
+            5 => 'color: #ff0000; font-weight: bold;',
+            6 => 'color: #00ff00; font-style: italic;',
+            7 => 'color: #0000ff; font-style: normal;',
+            8 => 'color: #b218b2; font-weight: bold;',
+            9 => 'color: #b218b2; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "&amp;[a-zA-Z_][a-zA-Z0-9_]*",
+        1 => array(//Procedures
+            GESHI_SEARCH => '(^\\s*)(PROC \\w+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '(.*;\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^\\s*)(%\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        5 => array(//Error messages
+            GESHI_SEARCH => '(^ERROR.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        6 => array(//Warning messages
+            GESHI_SEARCH => '(^WARNING.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(//Notice messages
+            GESHI_SEARCH => '(^NOTE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        8 => array(
+            GESHI_SEARCH => '(^\\s*)(CARDS.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        9 => array(
+            GESHI_SEARCH => '(^\\s*)(DATALINES.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scala.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scala.php
new file mode 100644
index 000000000..0eae52d92
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scala.php
@@ -0,0 +1,122 @@
+<?php
+/*************************************************************************************
+ * scala.php
+ * ----------
+ * Author: Franco Lombardo (franco@francolombardo.net)
+ * Copyright: (c) 2008 Franco Lombardo, Benny Baumann
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/02/08
+ *
+ * Scala language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/02/08 (1.0.7.22)
+ *   -  First Release
+ *
+ * TODO (updated 2007/04/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Scala',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'case', 'catch', 'class', 'def',
+            'do', 'else', 'extends', 'false', 'final',
+            'finally', 'for', 'forSome', 'if', 'implicit',
+            'import', 'match', 'new', 'null', 'object',
+            'override', 'package', 'private', 'protected', 'requires',
+            'return', 'sealed', 'super', 'this', 'throw',
+            'trait', 'try', 'true', 'type', 'val',
+            'var', 'while', 'with', 'yield'
+            ),
+        2 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?',
+        '_', ':', '=', '=>', '<<:',
+        '<%', '>:', '#', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #9999cc; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1=> 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #00ff00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #6666FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://scala-lang.org',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scheme.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scheme.php
new file mode 100644
index 000000000..1fffcb248
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scheme.php
@@ -0,0 +1,170 @@
+<?php
+/*************************************************************************************
+ * scheme.php
+ * ----------
+ * Author: Jon Raphaelson (jonraphaelson@gmail.com)
+ * Copyright: (c) 2005 Jon Raphaelson, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * Scheme language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/09/22 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2005/09/22)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Scheme',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('#|' => '|#'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'acos', 'and', 'angle', 'append', 'appply', 'approximate',
+            'asin', 'assoc', 'assq', 'assv', 'atan',
+
+            'begin', 'boolean?', 'bound-identifier=?',
+
+            'caar', 'caddr', 'cadr', 'call-with-current-continuation',
+            'call-with-input-file', 'call-with-output-file', 'call/cc', 'car',
+            'case', 'catch', 'cdddar', 'cddddr', 'cdr', 'ceiling', 'char->integer',
+            'char-alphabetic?', 'char-ci<=?', 'char-ci<?', 'char-ci?', 'char-ci>=?',
+            'char-ci>?', 'char-ci=?', 'char-downcase', 'char-lower-case?',
+            'char-numeric', 'char-ready', 'char-ready?', 'char-upcase',
+            'char-upper-case?', 'char-whitespace?', 'char<=?', 'char<?', 'char=?',
+            'char>=?', 'char>?', 'char?', 'close-input-port', 'close-output-port',
+            'complex?', 'cond', 'cons', 'construct-identifier', 'cos',
+            'current-input-port', 'current-output-port',
+
+            'd', 'define', 'define-syntax', 'delay', 'denominator', 'display', 'do',
+
+            'e', 'eof-object?', 'eq?', 'equal?', 'eqv?', 'even?', 'exact->inexact',
+            'exact?', 'exp', 'expt', 'else',
+
+            'f', 'floor', 'for-each', 'force', 'free-identifer=?',
+
+            'gcd', 'gen-counter', 'gen-loser', 'generate-identifier',
+
+            'identifier->symbol', 'identifier', 'if', 'imag-part', 'inexact->exact',
+            'inexact?', 'input-port?', 'integer->char', 'integer?', 'integrate-system',
+
+            'l', 'lambda', 'last-pair', 'lcm', 'length', 'let', 'let*', 'letrec',
+            'list', 'list->string', 'list->vector', 'list-ref', 'list-tail', 'list?',
+            'load', 'log',
+
+            'magnitude', 'make-polar', 'make-promise', 'make-rectangular',
+            'make-string', 'make-vector', 'map', 'map-streams', 'max', 'member',
+            'memq', 'memv', 'min', 'modulo',
+
+            'negative', 'newline', 'nil', 'not', 'null?', 'number->string', 'number?',
+            'numerator',
+
+            'odd?', 'open-input-file', 'open-output-file', 'or', 'output-port',
+
+            'pair?', 'peek-char', 'positive?', 'procedure?',
+
+            'quasiquote', 'quote', 'quotient',
+
+            'rational', 'rationalize', 'read', 'read-char', 'real-part', 'real?',
+            'remainder', 'return', 'reverse',
+
+            's', 'sequence', 'set!', 'set-char!', 'set-cdr!', 'sin', 'sqrt', 'string',
+            'string->list', 'string->number', 'string->symbol', 'string-append',
+            'string-ci<=?', 'string-ci<?', 'string-ci=?', 'string-ci>=?',
+            'string-ci>?', 'string-copy', 'string-fill!', 'string-length',
+            'string-ref', 'string-set!', 'string<=?', 'string<?', 'string=?',
+            'string>=?', 'string>?', 'string?', 'substring', 'symbol->string',
+            'symbol?', 'syntax', 'syntax-rules',
+
+            't', 'tan', 'template', 'transcript-off', 'transcript-on', 'truncate',
+
+            'unquote', 'unquote-splicing', 'unwrap-syntax',
+
+            'vector', 'vector->list', 'vector-fill!', 'vector-length', 'vector-ref',
+            'vector-set!', 'vector?',
+
+            'with-input-from-file', 'with-output-to-file', 'write', 'write-char',
+
+            'zero?'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scilab.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scilab.php
new file mode 100644
index 000000000..3d66d810a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/scilab.php
@@ -0,0 +1,295 @@
+<?php
+/*************************************************************************************
+ * scilab.php
+ * --------
+ * Author: Christophe David (geshi@christophedavid.org)
+ * Copyright: (c) 2008 Christophe David (geshi@christophedavid.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/08/04
+ *
+ * SciLab language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/25 (1.0.8.1)
+ *   - Corrected with the help of Benny Baumann (BenBE@geshi.org)
+ * 2008/08/04 (0.0.0.1)
+ *   - First beta Release - known problem with ' used to transpose matrices considered as start of strings
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SciLab',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\)|\]|\w)'/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array(),
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'elseif', 'end', 'select', 'case', 'for', 'while', 'break'
+            ),
+        2 => array(
+            'STDIN', 'STDOUT', 'STDERR',
+            '%i', '%pi', '%e', '%eps', '%nan', '%inf', '%s', '%t', '%f',
+            'usual', 'polynomial', 'boolean', 'character', 'function', 'rational', 'state-space',
+            'sparse', 'boolean sparse', 'list', 'tlist', 'library', 'endfunction'
+            ),
+        3 => array(
+            '%asn', '%helps', '%k', '%sn', 'abcd', 'abinv', 'abort', 'about', 'About_M2SCI_tools',
+            'abs', 'acos', 'acosh', 'acoshm', 'acosm', 'AdCommunications', 'add_demo', 'add_edge',
+            'add_help_chapter', 'add_node', 'add_palette', 'addcolor', 'addf', 'addinter', 'addmenu',
+            'adj_lists', 'adj2sp', 'aff2ab', 'alufunctions', 'amell', 'analpf', 'analyze', 'and',
+            'ans', 'apropos', 'arc_graph', 'arc_number', 'arc_properties', 'argn', 'arhnk', 'arl2',
+            'arma', 'arma2p', 'armac', 'armax', 'armax1', 'arsimul', 'artest', 'articul', 'ascii',
+            'asciimat', 'asin', 'asinh', 'asinhm', 'asinm', 'assignation', 'atan', 'atanh', 'atanhm',
+            'atanm', 'augment', 'auread', 'auwrite', 'axes_properties', 'axis_properties', 'backslash',
+            'balanc', 'balreal', 'bandwr', 'banner','bar', 'barh', 'barhomogenize', 'basename', 'bdiag',
+            'beep', 'besselh', 'besseli', 'besselj', 'besselk', 'bessely', 'best_match', 'beta','bezout',
+            'bifish', 'bilin', 'binomial', 'black', 'bloc2exp', 'bloc2ss', 'bode', 'bool2s',
+            'boucle', 'brackets', 'browsevar', 'bsplin3val', 'bstap', 'buttmag', 'buttondialog',
+            'bvode', 'bvodeS', 'c_link', 'cainv', 'calendar', 'calerf', 'calfrq', 'call', 'canon', 'casc',
+            'cat', 'catch', 'ccontrg', 'cd', 'cdfbet', 'cdfbin', 'cdfchi', 'cdfchn', 'cdff', 'cdffnc',
+            'cdfgam', 'cdfnbn', 'cdfnor', 'cdfpoi', 'cdft', 'ceil', 'cell', 'cell2mat', 'cellstr', 'center',
+            'cepstrum', 'chain_struct', 'chaintest', 'champ', 'champ_properties', 'champ1', 'char', 'chart',
+            'chartooem', 'chdir', 'cheb1mag', 'cheb2mag', 'check_graph', 'chepol', 'chfact', 'chol', 'chsolve',
+            'circuit', 'classmarkov', 'clc', 'clean', 'clear', 'clear_pixmap', 'clearfun', 'clearglobal','clf',
+            'clipboard', 'close', 'cls2dls', 'cmb_lin', 'cmndred', 'cmoment', 'code2str', 'coeff', 'coff', 'coffg',
+            'colcomp', 'colcompr', 'colinout', 'colon', 'color', 'color_list', 'colorbar', 'colordef', 'colormap',
+            'colregul', 'comma', 'comments', 'comp', 'companion', 'comparison', 'Compound_properties', 'con_nodes',
+            'cond', 'config', 'configure_msvc', 'conj', 'connex', 'console', 'cont_frm', 'cont_mat', 'Contents',
+            'continue', 'contour', 'contour2d', 'contour2di', 'contourf', 'contr', 'contract_edge', 'contrss',
+            'convex_hull', 'convol', 'convstr', 'copfac', 'copy', 'corr', 'correl', 'cos', 'cosh', 'coshm',
+            'cosm', 'cotg', 'coth', 'cothm', 'covar', 'create_palette', 'cshep2d', 'csim', 'cspect', 'Cste',
+            'ctr_gram', 'cumprod', 'cumsum', 'cycle_basis', 'czt', 'dasrt', 'dassl', 'datafit', 'date', 'datenum',
+            'datevec', 'dbphi', 'dcf', 'ddp', 'debug', 'dec2hex', 'deff', 'definedfields', 'degree', 'delbpt',
+            'delete', 'delete_arcs', 'delete_nodes', 'delip', 'delmenu', 'demoplay', 'denom', 'derivat', 'derivative',
+            'des2ss', 'des2tf', 'det', 'determ', 'detr', 'detrend', 'dft', 'dhinf', 'dhnorm', 'diag', 'diary',
+            'diff', 'diophant', 'dir', 'dirname', 'disp', 'dispbpt', 'dispfiles', 'dlgamma', 'dnaupd', 'do', 'dot',
+            'double', 'dragrect', 'draw', 'drawaxis', 'drawlater', 'drawnow', 'driver', 'dsaupd', 'dscr',
+            'dsearch', 'dsimul', 'dt_ility', 'dtsi', 'edge_number', 'edit', 'edit_curv', 'edit_error',
+            'edit_graph', 'edit_graph_menus', 'editvar', 'eigenmarkov', 'ell1mag',
+            'empty', 'emptystr', 'eqfir', 'eqiir', 'equal', 'Equal', 'equil', 'equil1',
+            'ereduc', 'erf', 'erfc', 'erfcx', 'errbar', 'errcatch', 'errclear', 'error', 'error_table', 'etime',
+            'eval', 'eval_cshep2d', 'eval3d', 'eval3dp', 'evans', 'evstr', 'excel2sci', 'exec', 'execstr', 'exists',
+            'exit', 'exp', 'expm', 'external', 'extraction', 'eye', 'fac3d', 'factorial', 'factors', 'faurre', 'fchamp',
+            'fcontour', 'fcontour2d', 'fec', 'fec_properties', 'feedback', 'feval', 'ffilt', 'fft', 'fft2', 'fftshift',
+            'fgrayplot', 'figure', 'figure_properties', 'figure_style', 'file', 'fileinfo', 'fileparts', 'filter', 'find',
+            'find_freq', 'find_path', 'findABCD', 'findAC', 'findBD', 'findBDK', 'findm', 'findmsvccompiler', 'findobj',
+            'findR', 'findx0BD', 'firstnonsingleton', 'fit_dat', 'fix', 'floor', 'flts', 'foo', 'format',
+            'formatman', 'fort', 'fourplan', 'fplot2d', 'fplot3d', 'fplot3d1', 'fprintf', 'fprintfMat', 'frep2tf',
+            'freq', 'freson', 'frexp', 'frfit', 'frmag', 'fscanf', 'fscanfMat', 'fsfirlin', 'fsolve', 'fspecg',
+            'fstabst', 'fstair', 'ftest', 'ftuneq', 'full', 'fullfile', 'fullrf', 'fullrfk', 'fun2string', 'Funcall',
+            'funcprot', 'functions', 'funptr', 'fusee', 'G_make', 'g_margin', 'gainplot', 'gamitg',
+            'gamma', 'gammaln', 'gca', 'gcare', 'gcd', 'gce', 'gcf', 'gda', 'gdf', 'gen_net', 'genfac3d', 'genlib',
+            'genmarkov', 'geom3d', 'geomean', 'get', 'get_contents_infer', 'get_function_path', 'getcolor', 'getcwd',
+            'getd', 'getdate', 'getenv', 'getf', 'getfield', 'getfont', 'gethistory', 'getio', 'getlinestyle',
+            'getlongpathname', 'getmark', 'getmemory', 'getos', 'getpid', 'getscilabkeywords', 'getshell',
+            'getshortpathname', 'getsymbol', 'getvalue', 'getversion', 'gfare', 'gfrancis', 'girth', 'givens',
+            'glever', 'glist', 'global', 'GlobalProperty', 'glue', 'gmres', 'gpeche', 'gr_menu', 'graduate', 'grand',
+            'graph_2_mat', 'graph_center', 'graph_complement', 'graph_diameter', 'graph_power', 'graph_simp', 'graph_sum',
+            'graph_union', 'graphic', 'Graphics', 'graphics_entities', 'graph-list', 'graycolormap', 'grayplot',
+            'grayplot_properties', 'graypolarplot', 'great', 'grep', 'group', 'gschur', 'gsort', 'gspec', 'gstacksize',
+            'gtild', 'h_cl', 'h_inf', 'h_inf_st', 'h_norm', 'h2norm', 'halt', 'hamilton', 'hank', 'hankelsv', 'harmean',
+            'hat', 'havewindow', 'head_comments', 'help', 'help_skeleton', 'hermit', 'hess', 'hex2dec', 'hilb', 'hinf',
+            'hist3d', 'histplot', 'horner', 'host', 'hotcolormap', 'householder', 'hrmt', 'hsv2rgb', 'hsvcolormap',
+            'htrianr', 'hypermat', 'hypermatrices', 'iconvert', 'ieee', 'ifft', 'iir', 'iirgroup', 'iirlp',
+            'ilib_build', 'ilib_compile', 'ilib_for_link', 'ilib_gen_gateway', 'ilib_gen_loader', 'ilib_gen_Make',
+            'im_inv', 'imag', 'impl', 'imrep2ss', 'imult', 'ind2sub', 'Infer', 'inistate', 'input', 'insertion', 'int',
+            'int16', 'int2d', 'int32', 'int3d', 'int8', 'intc', 'intdec', 'integrate', 'interp', 'interp1', 'interp2d',
+            'interp3d', 'interpln', 'intersci', 'intersect', 'intg', 'intl', 'intppty', 'intsplin', 'inttrap', 'inttype',
+            'inv', 'inv_coeff', 'invr', 'invsyslin', 'iqr', 'is_connex', 'iscellstr', 'isdef', 'isdir', 'isempty',
+            'isequal', 'isequalbitwise', 'iserror', 'isglobal', 'isinf', 'isnan', 'isoview', 'isreal', 'javasci',
+            'jetcolormap', 'jmat', 'justify', 'kalm', 'karmarkar', 'kernel', 'keyboard', 'knapsack', 'kpure', 'krac2',
+            'kron', 'kroneck', 'label_properties', 'labostat', 'LANGUAGE', 'lasterror', 'lattn', 'lattp', 'lcf', 'lcm',
+            'lcmdiag', 'ldiv', 'ldivf', 'leastsq', 'left', 'legend', 'legend_properties', 'legendre', 'legends', 'length',
+            'leqr', 'less', 'lev', 'levin', 'lex_sort', 'lft', 'lgfft', 'lib', 'lin', 'lin2mu', 'lindquist',
+            'line_graph', 'linear_interpn', 'lines', 'LineSpec', 'linf', 'linfn', 'link', 'linmeq', 'linpro', 'linsolve',
+            'linspace', 'listfiles', 'listvarinfile', 'lmisolver', 'lmitool', 'load', 'load_graph', 'loadhistory',
+            'loadmatfile', 'loadplots', 'loadwave', 'locate', 'log', 'log10', 'log1p', 'log2', 'logm', 'logspace',
+            'lotest', 'lqe', 'lqg', 'lqg_ltr', 'lqg2stan', 'lqr', 'ls', 'lsq', 'lsq_splin', 'lsqrsolve', 'lsslist',
+            'lstcat', 'lstsize', 'ltitr', 'lu', 'ludel', 'lufact', 'luget', 'lusolve', 'lyap', 'm_circle', 'm2scideclare',
+            'macglov', 'macr2lst', 'macr2tree', 'macro', 'macrovar', 'mad', 'make_graph', 'make_index', 'makecell', 'man',
+            'manedit', 'mapsound', 'markp2ss', 'mat_2_graph', 'matfile2sci', 'Matlab-Scilab_character_strings', 'Matplot',
+            'Matplot_properties', 'Matplot1', 'matrices', 'matrix', 'max', 'max_cap_path', 'max_clique', 'max_flow',
+            'maxi', 'mcisendstring', 'mclearerr', 'mclose', 'mdelete', 'mean', 'meanf', 'median', 'menus', 'meof',
+            'merror', 'mese', 'mesh', 'mesh2d', 'meshgrid', 'mfft', 'mfile2sci', 'mfprintf', 'mfscanf', 'mget', 'mgeti',
+            'mgetl', 'mgetstr', 'milk_drop', 'min', 'min_lcost_cflow', 'min_lcost_flow1', 'min_lcost_flow2',
+            'min_qcost_flow', 'min_weight_tree', 'mine', 'mini', 'minreal', 'minss', 'minus', 'mkdir', 'mlist', 'mode',
+            'modulo', 'moment', 'mopen', 'move', 'mprintf', 'mps2linpro', 'mput', 'mputl', 'mputstr', 'mrfit', 'mscanf',
+            'msd', 'mseek', 'msprintf', 'msscanf', 'mstr2sci', 'mtell', 'mtlb_0', 'mtlb_a', 'mtlb_all', 'mtlb_any',
+            'mtlb_axis', 'mtlb_beta', 'mtlb_box', 'mtlb_close', 'mtlb_colordef', 'mtlb_conv', 'mtlb_cumprod', 'mtlb_cumsum',
+            'mtlb_dec2hex', 'mtlb_delete', 'mtlb_diag', 'mtlb_diff', 'mtlb_dir', 'mtlb_double', 'mtlb_e', 'mtlb_echo',
+            'mtlb_eig', 'mtlb_eval', 'mtlb_exist', 'mtlb_eye', 'mtlb_false', 'mtlb_fft', 'mtlb_fftshift', 'mtlb_find',
+            'mtlb_findstr', 'mtlb_fliplr', 'mtlb_fopen', 'mtlb_format', 'mtlb_fprintf', 'mtlb_fread', 'mtlb_fscanf',
+            'mtlb_full', 'mtlb_fwrite', 'mtlb_grid', 'mtlb_hold', 'mtlb_i', 'mtlb_ifft', 'mtlb_imp', 'mtlb_int16',
+            'mtlb_int32', 'mtlb_int8', 'mtlb_is', 'mtlb_isa', 'mtlb_isfield', 'mtlb_isletter', 'mtlb_isspace', 'mtlb_l',
+            'mtlb_legendre', 'mtlb_linspace', 'mtlb_load', 'mtlb_logic', 'mtlb_logical', 'mtlb_lower', 'mtlb_max',
+            'mtlb_min', 'mtlb_mode', 'mtlb_more', 'mtlb_num2str', 'mtlb_ones', 'mtlb_plot', 'mtlb_prod', 'mtlb_rand',
+            'mtlb_randn', 'mtlb_rcond', 'mtlb_realmax', 'mtlb_realmin', 'mtlb_repmat', 'mtlb_s', 'mtlb_save',
+            'mtlb_setstr', 'mtlb_size', 'mtlb_sort', 'mtlb_sparse', 'mtlb_strcmp', 'mtlb_strcmpi', 'mtlb_strfind',
+            'mtlb_strrep', 'mtlb_sum', 'mtlb_t', 'mtlb_toeplitz', 'mtlb_tril', 'mtlb_triu', 'mtlb_true', 'mtlb_uint16',
+            'mtlb_uint32', 'mtlb_uint8', 'mtlb_upper', 'mtlb_zeros', 'mu2lin', 'mucomp', 'mulf', 'mvvacov', 'name2rgb',
+            'names', 'nancumsum', 'nand2mean', 'nanmax', 'nanmean', 'nanmeanf', 'nanmedian', 'nanmin', 'nanstdev',
+            'nansum', 'narsimul', 'NDcost', 'ndgrid', 'ndims', 'nearfloat', 'nehari', 'neighbors', 'netclose', 'netwindow',
+            'netwindows', 'new', 'newaxes', 'newest', 'newfun', 'nextpow2', 'nf3d', 'nfreq', 'nlev', 'nnz', 'node_number',
+            'nodes_2_path', 'nodes_degrees', 'noisegen', 'norm', 'not', 'null', 'number_properties', 'numdiff', 'numer',
+            'nyquist', 'object_editor', 'obs_gram', 'obscont', 'obscont1', 'observer', 'obsv_mat', 'obsvss', 'ode',
+            'ode_discrete', 'ode_optional_output', 'ode_root', 'odedc', 'odeoptions', 'oemtochar', 'old_style',
+            'oldbesseli', 'oldbesselj', 'oldbesselk', 'oldbessely', 'oldload', 'oldplot', 'oldsave', 'ones',
+            'Operation', 'optim', 'or', 'orth', 'overloading', 'p_margin', 'param3d', 'param3d_properties',
+            'param3d1', 'paramfplot2d', 'parents', 'parrot', 'part', 'path_2_nodes', 'pathconvert', 'pause', 'pbig',
+            'pca', 'pcg', 'pdiv', 'pen2ea', 'pencan', 'penlaur', 'percent', 'perctl', 'perfect_match', 'perl',
+            'perms', 'permute', 'pertrans', 'pfss', 'phasemag', 'phc', 'pie', 'pinv', 'pipe_network', 'playsnd', 'plot',
+            'plot_graph', 'plot2d', 'plot2d_old_version', 'plot2d1', 'plot2d2', 'plot2d3', 'plot2d4', 'plot3d',
+            'plot3d_old_version', 'plot3d1', 'plot3d2', 'plot3d3', 'plotframe', 'plotprofile', 'plus', 'plzr',
+            'pmodulo', 'pol2des', 'pol2str', 'pol2tex', 'polar', 'polarplot', 'polfact', 'poly', 'polyline_properties',
+            'portr3d', 'portrait', 'power', 'ppol', 'prbs_a', 'predecessors', 'predef', 'print', 'printf',
+            'printf_conversion', 'printing', 'printsetupbox', 'prod', 'profile', 'progressionbar', 'proj', 'projsl',
+            'projspec', 'psmall', 'pspect', 'pvm', 'pvm_addhosts', 'pvm_barrier', 'pvm_bcast', 'pvm_bufinfo', 'pvm_config',
+            'pvm_delhosts', 'pvm_error', 'pvm_exit', 'pvm_f772sci', 'pvm_get_timer', 'pvm_getinst', 'pvm_gettid',
+            'pvm_gsize', 'pvm_halt', 'pvm_joingroup', 'pvm_kill', 'pvm_lvgroup', 'pvm_mytid', 'pvm_parent', 'pvm_probe',
+            'pvm_recv', 'pvm_reduce', 'pvm_sci2f77', 'pvm_send', 'pvm_set_timer', 'pvm_spawn', 'pvm_spawn_independent',
+            'pvm_start', 'pvm_tasks', 'pvm_tidtohost', 'pvmd3', 'pwd', 'qassign', 'qld', 'qmr', 'qr', 'quapro', 'quart',
+            'quaskro', 'quit', 'quote', 'rand', 'randpencil', 'range', 'rank', 'rankqr', 'rat',  'rcond',
+            'rdivf', 'read', 'read4b', 'readb', 'readc_', 'readmps', 'readxls', 'real', 'realtime', 'realtimeinit',
+            'rectangle_properties', 'recur', 'reglin', 'regress', 'remez', 'remezb', 'repfreq', 'replot', 'resethistory',
+            'residu', 'resume', 'return', 'rgb2name', 'ric_desc', 'ricc', 'riccati', 'rlist', 'rmdir', 'roots', 'rotate',
+            'round', 'routh_t', 'rowcomp', 'rowcompr', 'rowinout', 'rowregul', 'rowshuff', 'rpem', 'rref', 'rtitr',
+            'rubberbox', 'salesman', 'sample', 'samplef', 'samwr', 'save', 'save_format', 'save_graph', 'savehistory',
+            'savematfile', 'savewave', 'sca', 'scaling', 'scanf', 'scanf_conversion', 'scf', 'schur', 'sci_files',
+            'sci2exp', 'sci2for', 'sci2map', 'sciargs', 'SciComplex', 'SciComplexArray', 'SciDouble', 'SciDoubleArray',
+            'scilab', 'Scilab', 'ScilabEval', 'scilink', 'scipad', 'SciString', 'SciStringArray', 'sd2sci', 'sda', 'sdf',
+            'secto3d', 'segs_properties', 'semi', 'semicolon', 'semidef', 'sensi', 'set', 'set_posfig_dim',
+            'setbpt', 'setdiff', 'setenv', 'seteventhandler', 'setfield', 'sethomedirectory', 'setlanguage', 'setmenu',
+            'sfact', 'Sfgrayplot', 'Sgrayplot', 'sgrid', 'shortest_path', 'show_arcs', 'show_graph', 'show_nodes',
+            'show_pixmap', 'showprofile', 'sident', 'sign', 'Signal', 'signm', 'simp', 'simp_mode', 'sin', 'sinc',
+            'sincd', 'sinh', 'sinhm', 'sinm', 'size', 'slash', 'sleep', 'sm2des', 'sm2ss', 'smooth', 'solve',
+            'sorder', 'sort', 'sound', 'soundsec', 'sp2adj', 'spaninter', 'spanplus', 'spantwo', 'spchol',
+            'spcompack', 'spec', 'specfact', 'speye', 'spget', 'splin', 'splin2d', 'splin3d', 'split_edge', 'spones',
+            'sprand', 'sprintf', 'spzeros', 'sqroot', 'sqrt', 'sqrtm', 'square', 'squarewave', 'srfaur', 'srkf', 'ss2des',
+            'ss2ss', 'ss2tf', 'sscanf', 'sskf', 'ssprint', 'ssrand', 'st_deviation', 'st_ility', 'stabil', 'stacksize',
+            'star', 'startup', 'stdev', 'stdevf', 'str2code', 'strange', 'strcat', 'strindex', 'string', 'stringbox',
+            'strings', 'stripblanks', 'strong_con_nodes', 'strong_connex', 'strsplit', 'strsubst', 'struct', 'sub2ind',
+            'subf', 'subgraph', 'subplot', 'successors', 'sum', 'supernode', 'surf', 'surface_properties', 'sva',
+            'svd', 'svplot', 'sylm', 'sylv', 'symbols', 'sysconv', 'sysdiag', 'sysfact', 'syslin', 'syssize', 'system',
+            'systems', 'systmat', 'tabul', 'tan', 'tangent', 'tanh', 'tanhm', 'tanm', 'TCL_CreateSlave', 'TCL_DeleteInterp',
+            'TCL_EvalFile', 'TCL_EvalStr', 'TCL_ExistInterp', 'TCL_ExistVar', 'TCL_GetVar', 'TCL_GetVersion', 'TCL_SetVar',
+            'TCL_UnsetVar', 'TCL_UpVar', 'tdinit', 'testmatrix', 'texprint', 'text_properties', 'tf2des', 'tf2ss', 'then',
+            'thrownan', 'tic', 'tilda', 'time_id', 'timer', 'title', 'titlepage', 'TK_EvalFile', 'TK_EvalStr', 'tk_getdir',
+            'tk_getfile', 'TK_GetVar', 'tk_savefile', 'TK_SetVar',  'toc', 'toeplitz', 'tohome', 'tokenpos',
+            'tokens', 'toolbar', 'toprint', 'trace', 'trans', 'trans_closure', 'translatepaths', 'tree2code', 'trfmod',
+            'trianfml', 'tril', 'trimmean', 'trisolve', 'triu', 'try', 'trzeros', 'twinkle', 'type', 'Type', 'typename',
+            'typeof', 'ui_observer', 'uicontrol', 'uimenu', 'uint16', 'uint32', 'uint8', 'ulink', 'unglue', 'union',
+            'unique', 'unix', 'unix_g', 'unix_s', 'unix_w', 'unix_x', 'unobs', 'unsetmenu', 'unzoom', 'user', 'varargin',
+            'varargout', 'Variable', 'variance', 'variancef', 'varn', 'vectorfind', 'waitbar', 'warning', 'wavread',
+            'wavwrite', 'wcenter', 'wfir', 'what', 'where', 'whereami', 'whereis', 'who', 'who_user', 'whos',
+            'wiener', 'wigner', 'winclose', 'window', 'winlist', 'winopen', 'winqueryreg', 'winsid', 'with_atlas',
+            'with_gtk', 'with_javasci', 'with_pvm', 'with_texmacs', 'with_tk', 'writb', 'write', 'write4b', 'x_choices',
+            'x_choose', 'x_dialog', 'x_matrix', 'x_mdialog', 'x_message', 'x_message_modeless', 'xarc', 'xarcs', 'xarrows',
+            'xaxis', 'xbasc', 'xbasimp', 'xbasr', 'xchange', 'xclea', 'xclear', 'xclick', 'xclip', 'xdel', 'xend',
+            'xfarc', 'xfarcs', 'xfpoly', 'xfpolys', 'xfrect', 'xget', 'xgetech', 'xgetfile', 'xgetmouse', 'xgraduate',
+            'xgrid', 'xinfo', 'xinit', 'xlfont', 'xload', 'xls_open', 'xls_read', 'xmltohtml', 'xname', 'xnumb', 'xpause',
+            'xpoly', 'xpolys', 'xrect', 'xrects', 'xrpoly', 'xs2bmp', 'xs2emf', 'xs2eps', 'xs2fig', 'xs2gif', 'xs2ppm',
+            'xs2ps', 'xsave', 'xsegs', 'xselect', 'xset', 'xsetech', 'xsetm', 'xstring', 'xstringb', 'xstringl', 'xtape',
+            'xtitle', 'yulewalk', 'zeropen', 'zeros', 'zgrid', 'zoom_rect', 'zpbutt', 'zpch1', 'zpch2', 'zpell'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', ':', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => '',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            'HARD' => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            4 => 'color: #009999;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        2 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm',
+        3 => 'http://www.scilab.org/product/dic-mat-sci/M2SCI_doc.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '-&gt;',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File Descriptor
+        4 => '&lt;[a-zA-Z_][a-zA-Z0-9_]*&gt;',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sdlbasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sdlbasic.php
new file mode 100644
index 000000000..b756df514
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sdlbasic.php
@@ -0,0 +1,165 @@
+<?php
+/*************************************************************************************
+ * sdlbasic.php
+ * ------------
+ * Author: Roberto Rossi
+ * Copyright: (c) 2005 Roberto Rossi (http://rsoftware.altervista.org)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/08/19
+ *
+ * sdlBasic (http://sdlbasic.sf.net) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2005/08/19 (1.0.0)
+ *  -  First Release
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'sdlBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => "rem", 3 => "!", 4 => "#"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'const', 'option', 'explicit', 'qbasic', 'include', 'argc',
+            'argv', 'command', 'command$', 'run', 'shell', 'os', 'declare',
+            'sub', 'function', 'return', 'while', 'wend', 'exit', 'end',
+            'continue', 'if', 'then', 'else', 'elseif',
+            'select', 'case', 'for', 'each', 'step',
+            'next', 'to', 'dim', 'shared', 'common', 'lbound', 'bound',
+            'erase', 'asc', 'chr', 'chr$', 'insert', 'insert$', 'instr', 'lcase',
+            'lcase$', 'left', 'left$', 'len', 'length', 'ltrim', 'ltrim$', 'mid',
+            'mid$', 'replace', 'replace$', 'replacesubstr', 'replacesubstr$',
+            'reverse', 'reverse$', 'right', 'right$', 'rinstr', 'rtrim', 'rtrim$',
+            'space', 'space$', 'str', 'str$', 'strf', 'strf$', 'string', 'string$',
+            'tally', 'trim', 'trim$', 'typeof', 'typeof$', 'ucase', 'ucase$', 'val',
+            'abs', 'acos', 'andbit', 'asin', 'atan', 'bitwiseand', 'bitwiseor',
+            'bitwisexor', 'cos', 'exp', 'fix', 'floor', 'frac', 'hex', 'hex$', 'int',
+            'log', 'min', 'max', 'orbit', 'randomize', 'rnd', 'round', 'sgn', 'sin',
+            'sqr', 'tan', 'xorbit', 'open', 'as', 'file', 'input', 'close', 'output',
+            'append', 'eof', 'fileexists', 'filecopy', 'filemove', 'filerename',
+            'freefile', 'kill', 'loc', 'lof', 'readbyte', 'rename', 'seek',
+            'writebyte', 'chdir', 'dir', 'dir$', 'direxists', 'dirfirst', 'dirnext',
+            'mkdir', 'rmdir', 'print', 'date', 'date$', 'time', 'time$', 'ticks',
+            'data', 'read', 'reservebank', 'freebank', 'copybank', 'loadbank',
+            'savebank', 'setbank', 'sizebank', 'poke', 'doke', 'loke', 'peek', 'deek',
+            'leek', 'memcopy', 'setdisplay', 'setcaption', 'caption', 'displaywidth',
+            'displayheight', 'displaybpp', 'screen', 'directscreen', 'screenopen',
+            'screenclose', 'screenclone', 'screencopy', 'screenfade', 'screenfadein',
+            'screencrossfade', 'screenalpha', 'screenlock', 'screenunlock',
+            'screenrect', 'xscreenrect', 'yscreenrect', 'wscreenrect', 'hscreenrect',
+            'flagscreenrect', 'screenwidth', 'screenheight', 'offset', 'xoffset',
+            'yoffset', 'cls', 'screenswap', 'autoback', 'setautoback',
+            'dualplayfield', 'waitvbl', 'fps', 'rgb', 'enablepalette', 'color',
+            'palette', 'colorcycling', 'ink', 'point', 'dot', 'plot', 'line', 'box',
+            'bar', 'circle', 'fillcircle', 'ellipse', 'fillellipse', 'paint',
+            'loadimage', 'saveimage', 'loadsound', 'savesound', 'loadmusic',
+            'hotspot', 'setcolorkey', 'imageexists', 'imagewidth', 'imageheight',
+            'deleteimage', 'copyimage', 'setalpha', 'zoomimage', 'rotateimage',
+            'rotozoomimage', 'blt', 'pastebob', 'pasteicon', 'grab', 'spriteclip',
+            'sprite', 'deletesprite', 'xsprite', 'ysprite', 'spritewidth',
+            'spriteheight', 'frsprite', 'livesprite', 'spritehit', 'autoupdatesprite',
+            'updatesprite', 'setbob', 'bob', 'deletebob', 'xbob', 'ybob', 'bobwidth',
+            'bobheight', 'frbob', 'livebob', 'bobhit', 'autoupdatebob', 'updatebob',
+            'text', 'setfont', 'textrender', 'pen', 'paper', 'prints', 'locate',
+            'atx', 'aty', 'curson', 'cursoff', 'inputs', 'zoneinputs',
+            'isenabledsound', 'soundexists', 'deletesound', 'copysound',
+            'musicexists', 'playsound', 'volumesound', 'stopsound', 'pausesound',
+            'resumesound', 'vumetersound', 'positionsound', 'soundchannels',
+            'playmusic', 'positionmusic', 'stopmusic', 'fademusic', 'pausemusic',
+            'resumemusic', 'rewindmusic', 'volumemusic', 'speedmusic', 'numdrivescd',
+            'namecd', 'getfreecd', 'opencd', 'indrivecd', 'trackscd', 'curtrackcd',
+            'curframecd', 'playcd', 'playtrackscd',
+            'pausecd', 'resumecd', 'stopcd', 'ejectcd', 'closecd', 'tracktypecd',
+            'tracklengthcd', 'trackoffsetcd', 'key', 'inkey', 'waitkey', 'xmouse',
+            'ymouse', 'xmousescreen', 'ymousescreen', 'bmouse', 'changemouse',
+            'locatemouse', 'mouseshow', 'mousehide', 'mousezone', 'numjoysticks',
+            'namejoystick', 'numaxesjoystick', 'numballsjoystick', 'numhatsjoystick',
+            'numbuttonsjoystick', 'getaxisjoystick', 'gethatjoystick',
+            'getbuttonjoystick', 'xgetballjoystick', 'ygetballjoystick', 'joy',
+            'bjoy', 'wait', 'timer', 'isenabledsock', 'getfreesock', 'opensock',
+            'acceptsock', 'isserverready', 'connectsock', 'connectionreadysock',
+            'isclientready', 'losesock', 'peeksock', 'readsock', 'readbytesock',
+            'readlinesock', 'writesock', 'writebytesock', 'writelinesock',
+            'getremoteip', 'getremoteport', 'getlocalip'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;',
+            3 => 'color: #808080;',
+            4 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smalltalk.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smalltalk.php
new file mode 100644
index 000000000..b4d67cc71
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smalltalk.php
@@ -0,0 +1,160 @@
+<?php
+/*************************************************************************************
+ * smalltalk.php
+ * --------
+ * Author: Bananeweizen (Bananeweizen@gmx.de)
+ * Copyright: (c) 2005 Bananeweizen (www.bananeweizen.de)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/03/27
+ *
+ * Smalltalk language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006-05-24 (1.0.0)
+ *   -  First Release
+ *
+ * TODO
+ * -------------------------
+ * * recognize nested array symbols correctly
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Smalltalk',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('"' => '"'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array('self','super','true','false','nil')
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '=' , ':=', '(', ')', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #7f007f;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            1 => 'color: #7f0000;',
+            2 => 'color: #7f0000;',
+            3 => 'color: #00007f;',
+            4 => 'color: #7f007f;',
+            5 => 'color: #00007f;',
+            6 => 'color: #00007f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '([^a-zA-Z0-9_#<])([A-Z]+[a-zA-Z0-9_]*)(?!>)', //class names
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => '(#+)([a-zA-Z0-9_]+)', //symbols
+            GESHI_REPLACE => '\\1\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(#\s*\([^)]*\))', //array symbols
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '<PIPE>([a-zA-Z0-9_\s]+)<PIPE>', //temporary variables
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '|',
+            GESHI_AFTER => '|'
+            ),
+        4 => array(
+            GESHI_SEARCH => '(self|super|true|false|nil)', //keywords again (to avoid matching in next regexp)
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        5 => array(
+            GESHI_SEARCH => '([:(,=[.*\/+-]\s*)([a-zA-Z0-9_]+)', //message parameters, message receivers
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        6 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_]+)(\s*:=)', //assignment targets
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smarty.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smarty.php
new file mode 100644
index 000000000..dcc11f61d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/smarty.php
@@ -0,0 +1,192 @@
+<?php
+/*************************************************************************************
+ * smarty.php
+ * ----------
+ * Author: Alan Juden (alan@judenware.org)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/07/10
+ *
+ * Smarty template language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.0)
+ *  -  Initial Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Smarty',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('{*' => '*}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '$smarty', 'now', 'const', 'capture', 'config', 'section', 'foreach', 'template', 'version', 'ldelim', 'rdelim',
+            'foreachelse', 'include', 'include_php', 'insert', 'if', 'elseif', 'else', 'php',
+            'sectionelse', 'is_cached',
+            ),
+        2 => array(
+            'capitalize', 'count_characters', 'cat', 'count_paragraphs', 'count_sentences', 'count_words', 'date_format',
+            'default', 'escape', 'indent', 'lower', 'nl2br', 'regex_replace', 'replace', 'spacify', 'string_format',
+            'strip', 'strip_tags', 'truncate', 'upper', 'wordwrap',
+            ),
+        3 => array(
+            'counter', 'cycle', 'debug', 'eval', 'html_checkboxes', 'html_image', 'html_options',
+            'html_radios', 'html_select_date', 'html_select_time', 'html_table', 'math', 'mailto', 'popup_init',
+            'popup', 'textformat'
+            ),
+        4 => array(
+            '$template_dir', '$compile_dir', '$config_dir', '$plugins_dir', '$debugging', '$debug_tpl',
+            '$debugging_ctrl', '$autoload_filters', '$compile_check', '$force_compile', '$caching', '$cache_dir',
+            '$cache_lifetime', '$cache_handler_func', '$cache_modified_check', '$config_overwrite',
+            '$config_booleanize', '$config_read_hidden', '$config_fix_newlines', '$default_template_handler_func',
+            '$php_handling', '$security', '$secure_dir', '$security_settings', '$trusted_dir', '$left_delimiter',
+            '$right_delimiter', '$compiler_class', '$request_vars_order', '$request_use_auto_globals',
+            '$error_reporting', '$compile_id', '$use_sub_dirs', '$default_modifiers', '$default_resource_type'
+            ),
+        5 => array(
+            'append', 'append_by_ref', 'assign', 'assign_by_ref', 'clear_all_assign', 'clear_all_cache',
+            'clear_assign', 'clear_cache', 'clear_compiled_tpl', 'clear_config', 'config_load', 'display',
+            'fetch', 'get_config_vars', 'get_registered_object', 'get_template_vars',
+            'load_filter', 'register_block', 'register_compiler_function', 'register_function',
+            'register_modifier', 'register_object', 'register_outputfilter', 'register_postfilter',
+            'register_prefilter', 'register_resource', 'trigger_error', 'template_exists', 'unregister_block',
+            'unregister_compiler_function', 'unregister_function', 'unregister_modifier', 'unregister_object',
+            'unregister_outputfilter', 'unregister_postfilter', 'unregister_prefilter', 'unregister_resource'
+            ),
+        6 => array(
+            'name', 'file', 'scope', 'global', 'key', 'once', 'script',
+            'loop', 'start', 'step', 'max', 'show', 'values', 'value', 'from', 'item'
+            ),
+        7 => array(
+            'eq', 'neq', 'ne', 'lte', 'gte', 'ge', 'le', 'not', 'mod'
+            ),
+        8 => array(
+            // some common php functions
+            'isset', 'is_array', 'empty', 'count', 'sizeof'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '==', '!=', '>', '<', '>=', '<=', '!', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',        //Functions
+            2 => 'color: #008000;',        //Modifiers
+            3 => 'color: #0600FF;',        //Custom Functions
+            4 => 'color: #804040;',        //Variables
+            5 => 'color: #008000;',        //Methods
+            6 => 'color: #6A0A0A;',        //Attributes
+            7 => 'color: #D36900;',        //Text-based symbols
+            8 => 'color: #0600FF;'        //php functions
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00aaff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://smarty.php.net/{FNAMEL}',
+        2 => 'http://smarty.php.net/{FNAMEL}',
+        3 => 'http://smarty.php.net/{FNAMEL}',
+        4 => 'http://smarty.php.net/{FNAMEL}',
+        5 => 'http://smarty.php.net/{FNAMEL}',
+        6 => '',
+        7 => 'http://smarty.php.net/{FNAMEL}',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => '\$[a-zA-Z][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '{' => '}'
+            ),
+        1 => array(
+            '<!--' => '-->',
+        ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => false,
+        2 => false
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<![a-zA-Z0-9\$_\|\#;>|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-&])"
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sql.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sql.php
new file mode 100644
index 000000000..ba91191d1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/sql.php
@@ -0,0 +1,140 @@
+<?php
+/*************************************************************************************
+ * sql.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * SQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added additional symbols for highlighting
+ * 2004/11/27 (1.0.3)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.2)
+ *  -  Added "`" string delimiter
+ *  -  Added "#" single comment starter
+ * 2004/08/05 (1.0.1)
+ *  -  Added support for symbols
+ *  -  Added many more keywords (mostly MYSQL keywords)
+ * 2004/07/14 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Add all keywords
+ * * Split this to several sql files - mysql-sql, ansi-sql etc
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SQL',
+    'COMMENT_SINGLE' => array(1 =>'--', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => 1,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC',
+            'AUTO_INCREMENT', 'BETWEEN', 'BINARY', 'BOOLEAN',
+            'BOTH', 'BY', 'CHANGE', 'CHECK', 'COLUMN', 'COLUMNS',
+            'CREATE', 'CROSS', 'DATA', 'DATABASE', 'DATABASES',
+            'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE',
+            'DISTINCT', 'DROP', 'ENCLOSED', 'ESCAPED', 'EXISTS',
+            'EXPLAIN', 'FIELD', 'FIELDS', 'FLUSH', 'FOR',
+            'FOREIGN', 'FROM', 'FULL', 'FUNCTION', 'GRANT',
+            'GROUP', 'HAVING', 'IDENTIFIED', 'IF', 'IGNORE',
+            'IN', 'INDEX', 'INFILE', 'INNER', 'INSERT', 'INTO',
+            'IS', 'JOIN', 'KEY', 'KEYS', 'KILL', 'LANGUAGE',
+            'LEADING', 'LEFT', 'LIKE', 'LIMIT', 'LINES', 'LOAD',
+            'LOCAL', 'LOCK', 'LOW_PRIORITY', 'MODIFY', 'NATURAL',
+            'NEXTVAL', 'NOT', 'NULL', 'ON', 'OPTIMIZE', 'OPTION',
+            'OPTIONALLY', 'OR', 'ORDER', 'OUTER', 'OUTFILE',
+            'PRIMARY', 'PROCEDURAL', 'PROCEEDURE', 'READ',
+            'REFERENCES', 'REGEXP', 'RENAME', 'REPLACE',
+            'RETURN', 'REVOKE', 'RIGHT', 'RLIKE', 'SELECT',
+            'SET', 'SETVAL', 'SHOW', 'SONAME', 'STATUS',
+            'STRAIGHT_JOIN', 'TABLE', 'TABLES', 'TEMINATED',
+            'TEMPORARY', 'TO', 'TRAILING', 'TRIGGER', 'TRUNCATE',
+            'TRUSTED', 'UNION', 'UNIQUE', 'UNLOCK', 'UNSIGNED',
+            'UPDATE', 'USE', 'USING', 'VALUES', 'VARIABLES',
+            'VIEW', 'WHERE', 'WITH', 'WRITE', 'XOR', 'ZEROFILL'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', ',', '.', '+', '-', '*', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tcl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tcl.php
new file mode 100644
index 000000000..25cb31d5b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tcl.php
@@ -0,0 +1,194 @@
+<?php
+/*************************************************************************************
+ * tcl.php
+ * ---------------------------------
+ * Author: Reid van Melle (rvanmelle@gmail.com)
+ * Copyright: (c) 2004 Reid van Melle (sorry@nowhere)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/05/05
+ *
+ * TCL/iTCL language file for GeSHi.
+ *
+ * This was thrown together in about an hour so I don't expect
+ * really great things.  However, it is a good start.  I never
+ * got a change to try out the iTCL or object-based support but
+ * this is not widely used anyway.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ * 2006/05/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/05/05)
+ * -------------------------
+ * - Get TCL built-in special variables highlighted with a new color..
+ *   currently, these are listed in //special variables in the keywords
+ *   section, but they get covered by the general REGEXP for symbols
+ * - General cleanup, testing, and verification
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'TCL',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(?<!\\\\)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        2 => '/{[^}\n]+}/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*
+         * Set 1: reserved words
+         * http://python.org/doc/current/ref/keywords.html
+         */
+        1 => array(
+            'proc', 'global', 'upvar', 'if', 'then', 'else', 'elseif', 'for', 'foreach',
+            'break', 'continue', 'while', 'set', 'eval', 'case', 'in', 'switch',
+            'default', 'exit', 'error', 'return', 'uplevel', 'loop',
+            'for_array_keys', 'for_recursive_glob', 'for_file', 'unwind_protect',
+            'expr', 'catch', 'namespace', 'rename', 'variable',
+            // itcl
+            'method', 'itcl_class', 'public', 'protected'),
+
+        /*
+         * Set 2: builtins
+         * http://asps.activatestate.com/ASPN/docs/ActiveTcl/8.4/tcl/tcl_2_contents.htm
+         */
+        2 => array(
+            // string handling
+            'append', 'binary', 'format', 're_syntax', 'regexp', 'regsub',
+            'scan', 'string', 'subst',
+            // list handling
+            'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
+            'lreplace', 'lsearch', 'lset', 'lsort', 'split',
+            // procedures and output
+            'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
+            'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
+            'socket', 'tell',
+            // packages and source files
+            'load', 'loadTk', 'package', 'pgk::create', 'pgk_mkIndex', 'source',
+            // interpreter routines
+            'bgerror', 'history', 'info', 'interp', 'memory', 'unknown',
+            // library routines
+            'enconding', 'http', 'msgcat',
+            // system related
+            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
+            // platform specified
+            'dde', 'registry', 'resource',
+            // special variables
+            '$argc', '$argv', '$errorCode', '$errorInfo', '$argv0',
+            '$auto_index', '$auto_oldpath', '$auto_path', '$env',
+            '$tcl_interactive', '$tcl_libpath', '$tcl_library',
+            '$tcl_pkgPath', '$tcl_platform', '$tcl_precision', '$tcl_traceExec',
+            ),
+
+        /*
+         * Set 3: standard library
+         */
+        3 => array(
+            'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
+            ),
+
+        /*
+         * Set 4: special methods
+         */
+//        4 => array(
+//            )
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '$', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+//        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+//            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #483d8b;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff3333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        //Special variables
+        0 => '[\\$]+[a-zA-Z_][a-zA-Z0-9_]*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/teraterm.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/teraterm.php
new file mode 100644
index 000000000..5ac9f8743
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/teraterm.php
@@ -0,0 +1,317 @@
+<?php
+/*************************************************************************************
+ * teraterm.php
+ * --------
+ * Author: Boris Maisuradze (boris at logmett.com)
+ * Copyright: (c) 2008 Boris Maisuradze (http://logmett.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/09/26
+ *
+ * Tera Term Macro language file for GeSHi.
+ *
+ *
+ * This version of ttl.php was created for Tera Term 4.60 and LogMeTT 2.9.4.
+ * Newer versions of these application can contain additional Macro commands
+ * and/or keywords that are not listed here. The latest release of ttl.php
+ * can be downloaded from Download section of LogMeTT.com
+ *
+ * CHANGES
+ * -------
+ * 2008/09/26 (1.0.8)
+ *   -  First Release for Tera Term 4.60 and below.
+ *
+ * TODO (updated 2008/09/26)
+ * -------------------------
+ * *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Tera Term Macro',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Commands */
+        1 => array(
+            'Beep',
+            'BplusRecv',
+            'BplusSend',
+            'Break',            // (version 4.53 or later)
+            'Call',
+            'CallMenu',         // (version 4.56 or later)
+            'ChangeDir',
+            'ClearScreen',
+            'Clipb2Var',        //(version 4.46 or later)
+            'ClosesBox',
+            'CloseTT',
+            'Code2Str',
+            'Connect',
+            'CRC32',            // (version 4.60 or later)
+            'CRC32File',        // (version 4.60 or later)
+            'CygConnect',       // (version 4.57 or later)
+            'DelPassword',
+            'Disconnect',
+            'Do',               // (version 4.56 or later)
+            'Else',
+            'EnableKeyb',
+            'End',
+            'EndIf',
+            'EndUntil',         // (version 4.56 or later)
+            'EndWhile',
+            'Exec',
+            'ExecCmnd',
+            'Exit',
+            'FileClose',
+            'FileConcat',
+            'FileCopy',
+            'FileCreate',
+            'FileDelete',
+            'FileMarkPtr',
+            'FilenameBox',      //(version 4.54 or later)
+            'FileOpen',
+            'FileRead',
+            'FileReadln',       // (version 4.48 or later)
+            'FileRename',
+            'FileSearch',
+            'FileSeek',
+            'FileSeekBack',
+            'FileStrSeek',
+            'FileStrSeek2',
+            'FileWrite',
+            'FileWriteln',
+            'FindOperations',
+            'FlushRecv',
+            'ForNext',
+            'GetDate',
+            'GetDir',           //(version 4.46 or later)
+            'GetEnv',
+            'GetPassword',
+            'GetTime',
+            'GetTitle',
+            'GetVer',           //(version 4.58 or later)
+            'GoTo',
+            'If',
+            'IfDefined',        // (version 4.46 or later)
+            'IfThenElseIf',
+            'Include',
+            'InputBox',
+            'Int2Str',
+            'KmtFinish',
+            'KmtGet',
+            'KmtRecv',
+            'KmtSend',
+            'LoadKeyMap',
+            'LogClose',
+            'LogOpen',
+            'LogPause',
+            'LogStart',
+            'LogWrite',
+            'Loop',             // (version 4.56 or later)
+            'MakePath',
+            'MessageBox',
+            'MPause',           // (version 4.27 or later)
+            'PasswordBox',
+            'Pause',
+            'QuickvanRecv',
+            'QuickvanSend',
+            'Random',           //(version 4.27 or later)
+            'Recvln',
+            'RestoreSetup',
+            'Return',
+            'RotateLeft',       //(version 4.54 or later)
+            'RotateRight',      //(version 4.54 or later)
+            'ScpRecv',          // (version 4.57 or later)
+            'ScpSend',          // (version 4.57 or later)
+            'Send',
+            'SendBreak',
+            'SendFile',
+            'SendKcode',
+            'Sendln',
+            'SetBaud',          // (version 4.58 or later)
+            'SetDate',
+            'SetDir',
+            'SetDlgPos',
+            'SetDTR',           // (version 4.59 or later)
+            'SetRTS',           // (version 4.59 or later)
+            'SetEnv',           // (version 4.54 or later)
+            'SetEcho',
+            'SetExitCode',
+            'SetSync',
+            'SetTime',
+            'SetTitle',
+            'Show',
+            'ShowTT',
+            'Sprintf',          // (version 4.52 or later)
+            'StatusBox',
+            'Str2Code',
+            'Str2Int',
+            'StrCompare',
+            'StrConcat',
+            'StrCopy',
+            'StrLen',
+            'StrMatch',         // (version 4.59 or later)
+            'StrScan',
+            'Testlink',
+            'Then',
+            'ToLower',          //(version 4.53 or later)
+            'ToUpper',          //(version 4.53 or later)
+            'Unlink',
+            'Until',            // (version 4.56 or later)
+            'Var2Clipb',        //(version 4.46 or later)
+            'Wait',
+            'WaitEvent',
+            'Waitln',
+            'WaitRecv',
+            'WaitRegex',        // (version 4.21 or later)
+            'While',
+            'XmodemRecv',
+            'XmodemSend',
+            'YesNoBox',
+            'ZmodemRecv',
+            'ZmodemSend'
+            ),
+        /* System Variables */
+        2 => array(
+            'groupmatchstr1',
+            'groupmatchstr2',
+            'groupmatchstr3',
+            'groupmatchstr4',
+            'groupmatchstr5',
+            'groupmatchstr6',
+            'groupmatchstr7',
+            'groupmatchstr8',
+            'groupmatchstr9',
+            'inputstr',
+            'matchstr',
+            'param2',
+            'param3',
+            'param4',
+            'param5',
+            'param6',
+            'param7',
+            'param8',
+            'param9',
+            'result',
+            'timeout'
+            ),
+        /* LogMeTT Key Words */
+        3 => array(
+            '$[1]',
+            '$[2]',
+            '$[3]',
+            '$[4]',
+            '$[5]',
+            '$[6]',
+            '$[7]',
+            '$[8]',
+            '$connection$',
+            '$email$',
+            '$logdir$',
+            '$logfilename$',
+            '$logit$',
+            '$mobile$',
+            '$name$',
+            '$pager$',
+            '$parent$',
+            '$phone$',
+            '$snippet$',
+            '$ttdir$',
+            '$user$',
+            '$windir$',
+            ),
+        /* Keyword Symbols */
+        4 => array(
+            'and',
+            'not',
+            'or',
+            'xor'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']',
+        '~', '!', '+', '-', '*', '/', '%', '>>', '<<', '<<<', '>>>', '&', '^', '|',
+        '<>', '<=', '>=', '=', '==', '<>', '!=', '&&', '||'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold!important;',
+            2 => 'color: #808000; font-weight: bold;',  // System Variables
+            3 => 'color: #ff0000; font-weight: bold;',  // LogMeTT Key Words
+            4 => 'color: #ff00ff; font-weight: bold;'   // Keyword Symbols
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #ff00ff; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => array (
+            GESHI_SEARCH => '(\:[_a-zA-Z][_a-zA-Z0-9]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/text.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/text.php
new file mode 100644
index 000000000..9183895c2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/text.php
@@ -0,0 +1,84 @@
+<?php
+/*************************************************************************************
+ * text.php
+ * --------
+ * Author: Sean Hanna (smokingrope@gmail.com)
+ * Copyright: (c) 2006 Sean Hanna
+ * Release Version: 1.0.8.4
+ * Date Started: 04/23/2006
+ *
+ * Standard Text File (No Syntax Highlighting).
+ * Plaintext language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 04/23/2006 (0.5.0)
+ * - Syntax File Created
+ *
+ * 04/27/2006 (1.0.0)
+ * - Documentation Cleaned Up
+ * - First Release
+ *
+ * TODO (updated 04/27/2006)
+ * -------------------------
+ *
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Text',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(),
+        'STRINGS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SYMBOLS' => array(),
+        'SCRIPT' => array(),
+        'REGEXPS' => array()
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'ALL' => GESHI_NEVER
+        ),
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/thinbasic.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/thinbasic.php
new file mode 100644
index 000000000..b9c9742c7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/thinbasic.php
@@ -0,0 +1,868 @@
+<?php
+/*************************************************************************************
+ * thinbasic.php
+ * ------
+ * Author: Eros Olmi (eros.olmi@thinbasic.com)
+ * Copyright: (c) 2006 Eros Olmi (http://www.thinbasic.com), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/05/12
+ *
+ * thinBasic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/05/12 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/05/12)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'thinBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'XOR','XML_TREETOSTRING','XML_PARSEFILE','XML_PARSE','XML_PARENT','XML_NODETYPE','XML_NODETOSTRING','XML_NEXTSIBLING',
+            'XML_LASTERROR','XML_GETTAG','XML_FREE','XML_FINDNODE','XML_DECODEPARAM','XML_CHILDDATA','XML_CHILD','XML_ATTRIBVALUE',
+            'XML_ATTRIBNAME','XML_ATTRIBCOUNT','WORD','WITH','WIN_SHOW','WIN_SETTITLE','WIN_SETFOREGROUND','WIN_ISZOOMED',
+            'WIN_ISVISIBLE','WIN_ISICONIC','WIN_GETTITLE','WIN_GETFOREGROUND','WIN_GETCLASS','WIN_GETACTIVE','WIN_FLASH','WIN_FINDBYTITLE',
+            'WIN_FINDBYCLASS','WHILE','WEND','VERIFY','VARPTR','VARIANTVT$','VARIANTVT','VARIANT',
+            'VARIABLE_GETINFO','VARIABLE_EXISTS','VARIABLE_EXIST','VALUE','VAL','USING$','USING','USES',
+            'USER','UNTIL','UNITS','UNION','UNICODE2ASCII','UDP_SEND','UDP_RECV','UDP_OPENSERVER',
+            'UDP_OPEN','UDP_FREEFILE','UDP_CLOSE','UCODE$','UCASE$','UBOUND','TYPE','TRIMFULL$',
+            'TRIM$','TOOLTIP','TOKENIZER_MOVETOEOL','TOKENIZER_KEYSETUSERSTRING','TOKENIZER_KEYSETUSERNUMBER','TOKENIZER_KEYGETUSERSTRING','TOKENIZER_KEYGETUSERNUMBER','TOKENIZER_KEYGETSUBTYPE',
+            'TOKENIZER_KEYGETNAME','TOKENIZER_KEYGETMAINTYPE','TOKENIZER_KEYFIND','TOKENIZER_KEYADD','TOKENIZER_GETNEXTTOKEN','TOKENIZER_DEFAULT_SET','TOKENIZER_DEFAULT_GET','TOKENIZER_DEFAULT_CODE',
+            'TOKENIZER_DEFAULT_CHAR','TO','TIMER','TIME$','THEN','TEXTBOX','TEXT','TCP_SEND',
+            'TCP_RECV','TCP_PRINT','TCP_OPEN','TCP_LINEINPUT','TCP_FREEFILE','TCP_CLOSE','TB_IMGCTX_SETIMAGEADJUSTMENT','TB_IMGCTX_LOADIMAGE',
+            'TB_IMGCTX_GETIMAGEADJUSTMENT','TBGL_VIEWPORT','TBGL_VERTEX','TBGL_USETEXTUREFLAG','TBGL_USETEXTURE','TBGL_USELINESTIPPLEFLAG','TBGL_USELINESTIPPLE','TBGL_USELIGHTSOURCEFLAG',
+            'TBGL_USELIGHTSOURCE','TBGL_USELIGHTINGFLAG','TBGL_USELIGHTING','TBGL_USEFOGFLAG','TBGL_USEFOG','TBGL_USEDEPTHMASK','TBGL_USEDEPTHFLAG','TBGL_USEDEPTH',
+            'TBGL_USECLIPPLANEFLAG','TBGL_USECLIPPLANE','TBGL_USEBLENDFLAG','TBGL_USEBLEND','TBGL_USEALPHATEST','TBGL_TRANSLATE','TBGL_TORUS','TBGL_TEXCOORD2D',
+            'TBGL_SPHERE','TBGL_SHOWWINDOW','TBGL_SHOWCURSOR','TBGL_SETWINDOWTITLE','TBGL_SETUPLIGHTSOURCE','TBGL_SETUPFOG','TBGL_SETUPCLIPPLANE','TBGL_SETPRIMITIVEQUALITY',
+            'TBGL_SETLIGHTPARAMETER','TBGL_SETDRAWDISTANCE','TBGL_SCALE','TBGL_SAVESCREENSHOT','TBGL_ROTATEXYZ','TBGL_ROTATE','TBGL_RESETMATRIX','TBGL_RENDERTOTEXTURE',
+            'TBGL_RENDERMATRIX3D','TBGL_RENDERMATRIX2D','TBGL_PUSHMATRIX','TBGL_PRINTFONT','TBGL_PRINTBMP','TBGL_PRINT','TBGL_POS3DTOPOS2D','TBGL_POPMATRIX',
+            'TBGL_POLYGONLOOK','TBGL_POINTSIZE','TBGL_POINTINSIDE3D','TBGL_NORMAL','TBGL_NEWLIST','TBGL_MOUSEGETWHEELDELTA','TBGL_MOUSEGETRBUTTON','TBGL_MOUSEGETPOSY',
+            'TBGL_MOUSEGETPOSX','TBGL_MOUSEGETMBUTTON','TBGL_MOUSEGETLBUTTON','TBGL_M15SETVERTEXZ','TBGL_M15SETVERTEXY','TBGL_M15SETVERTEXXYZ','TBGL_M15SETVERTEXX','TBGL_M15SETVERTEXTEXY',
+            'TBGL_M15SETVERTEXTEXXY','TBGL_M15SETVERTEXTEXX','TBGL_M15SETVERTEXTEXN','TBGL_M15SETVERTEXRGB','TBGL_M15SETVERTEXR','TBGL_M15SETVERTEXPSTOP','TBGL_M15SETVERTEXPARAM','TBGL_M15SETVERTEXLAYER',
+            'TBGL_M15SETVERTEXG','TBGL_M15SETVERTEXB','TBGL_M15SETMODELVERTEXCOUNT','TBGL_M15SETBONECHILD','TBGL_M15ROTBONEZ','TBGL_M15ROTBONEY','TBGL_M15ROTBONEX','TBGL_M15ROTBONE',
+            'TBGL_M15RESETBONES','TBGL_M15RECALCNORMALS','TBGL_M15LOADMODEL','TBGL_M15INITMODELBUFFERS','TBGL_M15GETVERTEXZ','TBGL_M15GETVERTEXY','TBGL_M15GETVERTEXXYZ','TBGL_M15GETVERTEXX',
+            'TBGL_M15GETVERTEXTEXY','TBGL_M15GETVERTEXTEXXY','TBGL_M15GETVERTEXTEXX','TBGL_M15GETVERTEXTEXN','TBGL_M15GETVERTEXRGB','TBGL_M15GETVERTEXR','TBGL_M15GETVERTEXPSTOP','TBGL_M15GETVERTEXPARAM',
+            'TBGL_M15GETVERTEXLAYER','TBGL_M15GETVERTEXG','TBGL_M15GETVERTEXB','TBGL_M15GETMODELVERTEXCOUNT','TBGL_M15GETMODELPOLYCOUNT','TBGL_M15ERASECHILDBONES','TBGL_M15DRAWMODEL','TBGL_M15DEFBONERESET',
+            'TBGL_M15DEFBONELAYER','TBGL_M15DEFBONEBOX','TBGL_M15DEFBONEANCHOR','TBGL_M15DEFBONEADDVERTEX','TBGL_M15CLEARMODEL','TBGL_M15APPLYBONES','TBGL_M15ADDBONETREEITEM','TBGL_LOADTEXTURE',
+            'TBGL_LOADFONT','TBGL_LOADBMPFONT','TBGL_LINEWIDTH','TBGL_LINESTIPPLE','TBGL_KILLFONT','TBGL_ISWINDOW','TBGL_ISPOINTVISIBLE','TBGL_ISPOINTBEHINDVIEW',
+            'TBGL_GETWINDOWMULTIKEYSTATE','TBGL_GETWINDOWKEYSTATE','TBGL_GETWINDOWKEYONCE','TBGL_GETWINDOWCLIENT','TBGL_GETTEXTURENAME','TBGL_GETTEXTURELIST','TBGL_GETPIXELINFO','TBGL_GETMULTIASYNCKEYSTATE',
+            'TBGL_GETLASTGLERROR','TBGL_GETFRAMERATE','TBGL_GETDESKTOPINFO','TBGL_GETASYNCKEYSTATE','TBGL_ERRORMESSAGES','TBGL_ENDPOLY','TBGL_ENDLIST','TBGL_DRAWFRAME',
+            'TBGL_DESTROYWINDOW','TBGL_DELETELIST','TBGL_CYLINDER','TBGL_CREATEWINDOWEX','TBGL_CREATEWINDOW','TBGL_COLORALPHA','TBGL_COLOR','TBGL_CLEARFRAME',
+            'TBGL_CAMERA','TBGL_CALLLIST','TBGL_BUILDFONT','TBGL_BOX','TBGL_BLENDFUNC','TBGL_BINDTEXTURE','TBGL_BEGINPOLY','TBGL_BACKCOLOR',
+            'TBGL_ALPHAFUNC','TBDI_JOYZ','TBDI_JOYY','TBDI_JOYX','TBDI_JOYSTOPEFFECT','TBDI_JOYSLIDER','TBDI_JOYSETRANGEZ','TBDI_JOYSETRANGEY',
+            'TBDI_JOYSETRANGEXYZ','TBDI_JOYSETRANGEX','TBDI_JOYSETDEADZONEZ','TBDI_JOYSETDEADZONEY','TBDI_JOYSETDEADZONEXYZ','TBDI_JOYSETDEADZONEX','TBDI_JOYSETAUTOCENTER','TBDI_JOYRZ',
+            'TBDI_JOYRY','TBDI_JOYRX','TBDI_JOYPOV','TBDI_JOYPLAYEFFECT','TBDI_JOYLOADEFFECT','TBDI_JOYHASFF','TBDI_JOYHASEFFECT','TBDI_JOYGETEFFECTNAME',
+            'TBDI_JOYGETEFFECTGUID','TBDI_JOYCREATEEFFECT','TBDI_JOYCOUNTPOV','TBDI_JOYCOUNTEFFECTS','TBDI_JOYCOUNTBTN','TBDI_JOYCOUNTAXES','TBDI_JOYBUTTON','TBDI_JOYAVAIL',
+            'TBDI_INIT','TBASS_STREAMFREE','TBASS_STREAMCREATEFILE','TBASS_SETVOLUME','TBASS_SETEAXPRESET','TBASS_SETEAXPARAMETERS','TBASS_SETCONFIG','TBASS_SET3DPOSITION',
+            'TBASS_SET3DFACTORS','TBASS_SAMPLELOAD','TBASS_SAMPLEGETCHANNEL','TBASS_MUSICLOAD','TBASS_MUSICFREE','TBASS_INIT','TBASS_GETVOLUME','TBASS_GETVERSION',
+            'TBASS_GETCONFIG','TBASS_FREE','TBASS_ERRORGETCODE','TBASS_CHANNELSTOP','TBASS_CHANNELSETPOSITION','TBASS_CHANNELSETATTRIBUTES','TBASS_CHANNELSET3DPOSITION','TBASS_CHANNELPLAY',
+            'TBASS_CHANNELPAUSE','TBASS_CHANNELISACTIVE','TBASS_CHANNELGETPOSITION','TBASS_CHANNELGETLENGTH','TBASS_CHANNELGETATTRIBUTES','TBASS_APPLY3D','TANH','TANGENT',
+            'TAN','TALLY','TABCTRL_ONNOTIFY','TABCTRL_INSERTITEM','TABCTRL_GETCURSEL','SWAP','SUB','STRZIP$',
+            'STRUNZIP$','STRREVERSE$','STRPTRLEN','STRPTR','STRINSERT$','STRING$','STRING','STRDELETE$',
+            'STR$','STOP','STEP','STDOUT','STDIN','STAT_SUM','STAT_STDERROR','STAT_STDDEVIATION',
+            'STAT_RANDOM','STAT_PRODUCT','STAT_MIN','STAT_MEDIAN','STAT_MEANHARMONIC','STAT_MEANGEOMETRIC','STAT_MEANARITHMETIC','STAT_MAX',
+            'STAT_INVERSESUM','STAT_HISTOGRAM','STAT_FILLARRAY','STAT_COUNT','STAT_COPYARRAY','STAT_CLONEARRAY','STAT_CHISQUARE','STATIC',
+            'STATE','SQR','SPLIT','SORT','SMTP_STATISTICS','SMTP_SETOPTION','SMTP_SETLOGFILE','SMTP_SENDHTML',
+            'SMTP_SENDEMAIL','SMTP_GETERROR','SMTP_FINISHED','SMTP_DEBUG','SMTP_CONNECT','SMTP_CLOSE','SLEEP','SIZEOF',
+            'SIZE','SINH','SINGLE','SIN','SIGNED','SHOW','SHIFT','SHAPETOBMP',
+            'SGN','SETAT','SET','SENDMESSAGE','SENDKEYSBULK','SENDKEYS','SEND','SELECTEXPRESSION',
+            'SELECT','SECH','SEC','SCAN','SAPI_SPEAK','SAPI_SETVOLUME','SAPI_SETRATE','SAPI_MODULELOADED',
+            'SAPI_GETVOLUME','SAPI_GETRATE','RTRIM$','RTF_SETTEXT','RTF_SETFONTSIZE','RTF_SETFONTNAME','RTF_SETFGCOLOR','RTF_SETEFFECT',
+            'RTF_SETBGCOLOR','RTF_SETALIGN','RTF_SAVETOFILE','RTF_LOADFROMFILE','RTF_GETTEXT','RTF_GETFONTSIZE','RTF_GETFONTNAME','RTF_GETEFFECT',
+            'RTF_GETCLASS','RTF_APPENDTEXT','RSET$','ROUND','RNDF','RND','RIGHT$','RIGHT',
+            'RGB','RESOURCE','RESIZE','RESET','REPLACE$','REPEAT$','REMOVE$','REM',
+            'REGISTRY_SETVALUE','REGISTRY_SETTXTNUM','REGISTRY_SETTXTBOOL','REGISTRY_SETDWORD','REGISTRY_GETVALUE','REGISTRY_GETTXTNUM','REGISTRY_GETTXTBOOL','REGISTRY_GETDWORD',
+            'REGISTRY_GETALLKEYS','REGISTRY_DELVALUE','REGISTRY_DELKEY','REFERENCE','REF','REDRAW','REDIM','RAS_SETPARAMS',
+            'RAS_OPENDIALUPDIALOG','RAS_LOADENTRIES','RAS_HANGUPALL','RAS_HANGUP','RAS_GETENTRY','RAS_BEGINDIAL','RANDOMIZE','RADTODEG',
+            'QUERYPERFORMANCEFREQUENCY','QUERYPERFORMANCECOUNTER','QUAD','PTR','PRESERVE','POST','POPUP','POKE$',
+            'POKE','PIXELS','PI','PERMUTATIONS','PEEKMESSAGE','PEEK$','PEEK','PC_SYSTEMUPFROM',
+            'PC_SUSPENDSTATE','PC_SHUTDOWN','PC_SHOWCARET','PC_SETCARETBLINKTIME','PC_RESTARTDIALOG','PC_PREVENTSHUTDOWN','PC_LOCK','PC_INSERTCD',
+            'PC_HIDECARET','PC_GETSTATEONOFF','PC_GETSCROLLLOCKKEYSTATE','PC_GETNUMLOCKKEYSTATE','PC_GETCARETBLINKTIME','PC_GETCAPSLOCKKEYSTATE','PC_EMPTYBIN','PC_EJECTCD',
+            'PC_DECODECDERROR','PCT','PARSESET$','PARSECOUNT','PARSE$','PARSE','PARAMETERS','OUTSIDE',
+            'OS_WINVERSIONTEXT','OS_WINGETVERSIONTIMELINE','OS_SHELLEXECUTE','OS_SHELLABOUT','OS_SHELL','OS_SETLASTCALLDLLERROR','OS_SERVICESTOP','OS_SERVICESTATUSDESCRIPTION',
+            'OS_SERVICESTARTTYPEDESCRIPTION','OS_SERVICESTART','OS_SERVICESETSTARTTYPE','OS_SERVICEQUERY','OS_SERVICEGETSTARTTYPE','OS_SERVICEGETLIST','OS_PROCESSKILLBYNAME','OS_PROCESSKILLBYID',
+            'OS_PROCESSISRUNNING','OS_PROCESSGETLIST','OS_PROCESSGETID','OS_PROCESSARERUNNING','OS_MESSAGEBEEP','OS_ISWOW64','OS_ISFEATUREPRESENT','OS_IEVERSION',
+            'OS_GETWINDOWSDIR','OS_GETUSERNAME','OS_GETTEMPDIR','OS_GETSYSTEMDIR','OS_GETSPECIALFOLDER','OS_GETLASTCALLDLLSTATUS','OS_GETLASTCALLDLLERROR','OS_GETCURRENTTHREADID',
+            'OS_GETCURRENTPROCESSID','OS_GETCOMPUTERNAME','OS_GETCOMMANDS','OS_GETCOMMAND','OS_FLASHWINDOW','OS_FATALAPPEXIT','OS_ENVIRON','OS_CALLDLL',
+            'OR','OPTIONAL','OPTION','OPT','ONCE','ON','OFF','NUMBER',
+            'NOT','NEXT','NEW','MSGBOX','MOUSEPTR','MODULE','MODELESS','MODAL',
+            'MOD','MKWRD$','MKS$','MKQ$','MKL$','MKI$','MKE$','MKDWD$',
+            'MKD$','MKCUX$','MKCUR$','MKBYT$','MIN$','MIN','MID$','MENU',
+            'MDI_CREATE','MCASE$','MAX$','MAX','MAKWRD','MAKLNG','MAKINT','MAKDWR',
+            'LTRIM$','LSET$','LOWRD','LOOP','LONG','LOINT','LOG_WRITE','LOGB',
+            'LOG2','LOG10','LOG','LOCAL','LOC','LL_UPDATEBYNAME','LL_UPDATE','LL_TOSTRING',
+            'LL_TOFILE','LL_NAME','LL_GETITEM','LL_GETBYNUMBER','LL_FROMFILE','LL_FREE','LL_FINDLAST','LL_FINDBYNAME',
+            'LL_FINDBYDATA','LL_DELETELIKE','LL_DELETEBYNAME','LL_DELETE','LL_DATABYNAME','LL_DATA','LL_COUNT','LL_ADD',
+            'LISTBOX','LINE','LIBRARY_EXISTS','LIB','LEN','LEFT$','LEFT','LCASE$',
+            'LBOUND','LABEL','KILL','JOIN$','ITERATE','ISWINDOW','ISUNICODE','ISTRUE',
+            'ISODD','ISLIKE','ISFALSE','ISEVEN','IP_TOSTRING','IP_ADDR','INTERNALINFO','INTEGER',
+            'INT','INSTR','INSIDE','INPUTBOX$','INI_SETKEY','INI_GETSECTIONSLIST','INI_GETSECTIONKEYLIST','INI_GETKEY',
+            'INET_URLDOWNLOAD','INET_PING','INET_OPENDIALUPDIALOG','INET_GETSTATE','INET_GETREMOTEMACADDRESS','INET_GETIP','INET_GETCONNECTIONMODE','INCR',
+            'IN','IMAGE','IIF$','IIF','IF','ICRYPTO_TESTSHA1','ICRYPTO_TESTMD5','ICRYPTO_TESTCRC32',
+            'ICRYPTO_TESTCRC16','ICRYPTO_STRING2ASCII','ICRYPTO_SHA1','ICRYPTO_MD5','ICRYPTO_ENCRYPTRIJNDAEL','ICRYPTO_ENCRYPTRC4','ICRYPTO_DECRYPTRIJNDAEL','ICRYPTO_DECRYPTRC4',
+            'ICRYPTO_CRC32','ICRYPTO_CRC16','ICRYPTO_BYTEXOR','ICRYPTO_BIN2ASCII','ICRYPTO_ASCII2STRING','ICRYPTO_ASCII2BIN','HOST_ADDR','HOSTNAME_TOIP',
+            'HOSTIP_TONAME','HIWRD','HIINT','HEX$','HASH','HANDLE','GUIDTXT$','GUID$',
+            'GRAPHIC','GLVOID','GLUSHORT','GLUINT','GLUBYTE','GLSIZEI','GLSHORT','GLOBAL',
+            'GLINT','GLFLOAT','GLENUM','GLDOUBLE','GLCLAMPF','GLCLAMPD','GLBYTE','GLBOOLEAN',
+            'GLBITFIELD','GETWINDOWMULTIKEYSTATE','GETWINDOWKEYSTATE','GETTICKCOUNT','GETS','GETMULTIASYNCKEYSTATE','GETMESSAGE','GETCURRENTINSTANCE',
+            'GETAT','GETASYNCKEYSTATE','GET','FUNCTION_NPARAMS','FUNCTION_EXISTS','FUNCTION_CPARAMS','FUNCTION','FTP_SETSTRING',
+            'FTP_SETSERVERDIR','FTP_SETNUMBER','FTP_SETMODE','FTP_SETLOGFILE','FTP_SETLOCALDIR','FTP_QUIT','FTP_PUTFILE','FTP_GETSTRING',
+            'FTP_GETSERVERDIR','FTP_GETNUMBER','FTP_GETLOCALDIR','FTP_GETLIST','FTP_GETFILE','FTP_GETERRORSTRING','FTP_GETERRORNUMBER','FTP_FINISHED',
+            'FTP_EXTRACT','FTP_DELFILE','FTP_CONNECT','FTP_COMMAND','FRAME','FRAC','FORMAT$','FOR',
+            'FONT_LIST','FONT_CREATE','FONT','FOCUS','FLUSH','FIX','FILE_SIZE','FILE_SHELLDELETE',
+            'FILE_SHELLCOPY','FILE_SETDATETIME','FILE_SEEK','FILE_SAVE','FILE_RENAME','FILE_PUT','FILE_PATHSPLIT','FILE_OPEN',
+            'FILE_LOF','FILE_LOAD','FILE_LINEPRINT','FILE_LINEINPUT','FILE_KILL','FILE_GETVERSIONSTRING','FILE_GETVERSION','FILE_GETTIME',
+            'FILE_GETDATETIMESTAMP','FILE_GETDATETIME','FILE_GETDATE','FILE_GET','FILE_EXISTS','FILE_EOF','FILE_COPY','FILE_CLOSE',
+            'FILE_CHANGED','FILE_APPEND','FACTORIAL','EXTRACT$','EXT','EXPORT','EXP2','EXP10',
+            'EXP','EXIT','EVAL_STRING','EVAL_SETSTRING','EVAL_SETNUMBER','EVAL_MATH','EVAL_LINKEXT','EVAL_GETSTRING',
+            'EVAL_GETNUMBER','EVAL_ERRORGETTOKEN','EVAL_ERRORDESCRIPTION','EVAL_ERRORCLEAR','EVAL','ERRCLEAR','ERR','ENGINE_GETCURRENTTOKEN',
+            'ENDIF','END','ENABLE','ELSEIF','ELSE','ECHO','DWORD','DT_YEAR',
+            'DT_TIMETOSEC','DT_TIMESUBSECONDS','DT_TIMEFORMAT','DT_TIMEADDSECONDS','DT_SETTIMESEPARATOR','DT_SETDATESEPARATOR','DT_SETDATECENTURY','DT_SECTOTIME',
+            'DT_SECTODATE','DT_SECOND','DT_MONTH','DT_MINUTE','DT_LASTDAYOFMONTH','DT_ISVALIDDATE','DT_ISLEAPYEAR','DT_HOUR',
+            'DT_GETWEEKDAYNAME','DT_GETWEEKDAY','DT_GETTIMESTAMP','DT_GETTIMESEPARATOR','DT_GETMONTHNAME','DT_GETDATESEPARATOR','DT_GETDATECENTURY','DT_DAY',
+            'DT_DATETOSEC','DT_DATETIMESUBSECONDS','DT_DATETIMEADDSECONDS','DT_DATESUBDAYS','DT_DATEFORMAT','DT_DATEDIFF','DT_DATEADDDAYS','DT_COOKIEDATE',
+            'DRAW','DOUBLE','DOEVENTS','DO','DISABLE','DIR_REMOVE','DIR_MAKEALL','DIR_MAKE',
+            'DIR_LISTARRAY','DIR_LIST','DIR_ISEMPTY','DIR_ISDIR','DIR_GETCURRENT','DIR_EXISTS','DIR_CHANGEDRIVE','DIR_CHANGE',
+            'DIM','DICTIONARY_MEMINFO','DICTIONARY_LISTKEYS','DICTIONARY_FREE','DICTIONARY_FIND','DICTIONARY_EXISTS','DICTIONARY_CREATE','DICTIONARY_COUNT',
+            'DICTIONARY_ADD','DIALOG_STOPEVENTS','DIALOG_SAVEFILE','DIALOG_OPENFILE','DIALOG_GETCONTROL','DIALOG_CHOOSECOLOR','DIALOG_BROWSEFORFOLDER','DIALOG',
+            'DESKTOP','DESCENDING','DESCEND','DELETEOBJECT','DELETE','DEGTORAD','DECR','DECLARE',
+            'DATE$','CVWRD','CVS','CVQ','CVL','CVI','CVE','CVDWD',
+            'CVD','CVCUX','CVCUR','CVBYT','CURRENCY','CUR','CSET$','CSCH',
+            'CSC','CRYPTO_GETPROVIDERTYPESCOUNT','CRYPTO_GETPROVIDERSCOUNT','CRYPTO_GETDEFAULTPROVIDER','CRYPTO_GENRANDOMSTRING','CRYPTO_ENUMPROVIDERTYPES','CRYPTO_ENUMPROVIDERS','CRYPTO_ENCRYPT',
+            'CRYPTO_DECRYPT','CREATEFONT','COTH','COTAN','COSH','COS','CONTROL_SETTEXT','CONTROL_GETTEXT',
+            'CONTROL_GETNUMBER','CONTROL','CONST','CONSOLE_WRITELINE','CONSOLE_WRITE','CONSOLE_WAITKEY','CONSOLE_SHOWWINDOW','CONSOLE_SHOWCURSOR',
+            'CONSOLE_SETTITLE','CONSOLE_SETTEXTATTRIBUTE','CONSOLE_SETSTDHANDLE','CONSOLE_SETSCREENBUFFERSIZE','CONSOLE_SETPROGRESSBARCHAR','CONSOLE_SETOUTPUTMODE','CONSOLE_SETOUTPUTCP','CONSOLE_SETINPUTMODE',
+            'CONSOLE_SETFILEAPISTOOEM','CONSOLE_SETFILEAPISTOANSI','CONSOLE_SETCURSORSIZE','CONSOLE_SETCURSORPOSITION','CONSOLE_SETCP','CONSOLE_SETACTIVESCREENBUFFER','CONSOLE_SCROLLWINDOW','CONSOLE_SCROLLBUFFERONEROW',
+            'CONSOLE_SCROLLBUFFER','CONSOLE_SAVESCREEN','CONSOLE_RESTORESCREEN','CONSOLE_READLINE','CONSOLE_READ','CONSOLE_PROGRESSBAR','CONSOLE_PRINTLINE','CONSOLE_PRINTAT',
+            'CONSOLE_PRINT','CONSOLE_NORMALSCREEN','CONSOLE_LINE','CONSOLE_INKEYB','CONSOLE_INKEY','CONSOLE_HIDECURSOR','CONSOLE_GETTITLE','CONSOLE_GETTEXTATTRIBUTE',
+            'CONSOLE_GETSTDHANDLE','CONSOLE_GETSIZEY','CONSOLE_GETSIZEX','CONSOLE_GETPROGRESSBARCHAR','CONSOLE_GETOUTPUTMODE','CONSOLE_GETOUTPUTCP','CONSOLE_GETNUMBEROFMOUSEBUTTONS','CONSOLE_GETINPUTMODE',
+            'CONSOLE_GETCURSORY','CONSOLE_GETCURSORX','CONSOLE_GETCURSORSIZE','CONSOLE_GETCURRENTFONTINDEX','CONSOLE_GETCP','CONSOLE_GENERATECTRLEVENT','CONSOLE_FULLSCREEN','CONSOLE_FREE',
+            'CONSOLE_FOREGROUNDRGB','CONSOLE_ENABLECTRLC','CONSOLE_DISABLECTRLC','CONSOLE_CREATESCREENBUFFER','CONSOLE_COLORAT','CONSOLE_CLS','CONSOLE_BOX','CONSOLE_BACKGROUNDRGB',
+            'CONSOLE_ATTACH','CONSOLE_AREFILEAPISANSI','CONSOLE_ALLOC','COM_VARIANTINIT','COM_VARIANTCOPY','COM_VARIANTCLEAR','COM_SUCCEEDED','COM_STRINGFROMCLSID',
+            'COM_RELEASE','COM_QUERYINTERFACE','COM_PROGIDFROMCLSID','COM_ISEQUALIID','COM_ISEQUALGUID','COM_ISEQUALCLSID','COM_GETOBJECT','COM_GETENGINEGUID',
+            'COM_EXECUTE','COM_DISPLAYERROR','COM_CREATEOBJECT','COM_CLSIDFROMSTRING','COM_CLSIDFROMPROGID','COM_BUILDVARIANT','COMBOBOX','COMBINATIONS',
+            'COLOR','CLIPBOARD_SETTEXT','CLIPBOARD_GETTEXT','CLIENT','CLEARMESSAGES','CHR$','CHOOSE$','CHOOSE',
+            'CHECKBOX','CHECK3STATE','CHECK','CGI_WRITELOGFILE','CGI_WRITE','CGI_URLDECODESTRING','CGI_UPLOADFILESTIME','CGI_UPLOADFILESNUMBER',
+            'CGI_UPLOADFILESIZE','CGI_STARTSESSION','CGI_SETSESSIONVARIABLE','CGI_RESETDEFAULTSETTINGS','CGI_REMOVESPECIALCHARSPREFIX','CGI_REMOVEQUOTE','CGI_READ','CGI_LOADCONFIGFILE',
+            'CGI_HEADER','CGI_GETSESSIONVARIABLE','CGI_GETREQUESTMETHOD','CGI_GETQUERYVALUE','CGI_GETCURRENTSESSION','CGI_GETCURRENTGUID','CGI_ENVIRON','CGI_CFGSETOPTION',
+            'CGI_CFGGETOPTION','CGI_ADDSPECIALCHARSPREFIX','CGI_ADDQUOTE','CEIL','CASE','CALL','BYVAL','BYTE',
+            'BYREF','BYCMD','BUTTON','BUNDLE_SETSCRIPTPARAMETERS','BUNDLE_SETSCRIPTNAME','BUNDLE_SETFLAGOBFUSCATEMAINSCRIPT','BUNDLE_SETFLAGDELETEAFTERRUN','BUNDLE_SETFLAGCOMPRESSALLFILES',
+            'BUNDLE_SETFLAGASKBEFOREEXTRACT','BUNDLE_SETEXTRACTIONFOLDER','BUNDLE_SETCREATIONFOLDER','BUNDLE_SETBUNDLENAME','BUNDLE_RESET','BUNDLE_MAKE','BUNDLE_BUILDER','BUNDLE_ADDFOLDER',
+            'BUNDLE_ADDFILE','BOUNDCHECK','BIN$','BIFF_WRITETEXT','BIFF_WRITENUMBER','BIFF_WRITEDATE','BIFF_SETROWHEIGHT','BIFF_SETCOLWIDTH',
+            'BIFF_SETBUFFER','BIFF_CREATEFILE','BIFF_CLOSEFILE','BETWEEN','BEEP','BAR','ATTACH','ATN',
+            'AT','ASSIGN','ASCIZ','ASCIIZ','ASCII2UNICODE','ASCENDING','ASCEND','ASC',
+            'AS','ARRAY','ARCTANH','ARCSINH','ARCSIN','ARCSECH','ARCSEC','ARCCSCH',
+            'ARCCSC','ARCCOTH','ARCCOT','ARCCOSH','ARCCOS','APP_TIMER','APP_SOURCEPATH','APP_SOURCENAME',
+            'APP_SOURCEFULLNAME','APP_PATH','APP_NAME','APP_LISTVARIABLES','APP_LISTKEYWORDS','APP_LISTFUNCTIONS','APP_LISTEQUATES','APP_INCLUDEPATH',
+            'APP_GETMODULEFULLPATH','APP_COUNTER','APPEND','ANY','ANIMATE_STOP','ANIMATE_PLAY','ANIMATE_OPEN','AND',
+            'ALIAS','ALERT','ADD','ACODE$','ABS','%DEF','#MINVERSION','#IF',
+            '#ENDIF','#ELSEIF','#ELSE','#DEFAULT','#DEF','SQLWRITEPRIVATEPROFILESTRING','SQLWRITEFILEDSN','SQLWRITEDSNTOINI',
+            'SQLVALIDDSN','SQLTRANSACT','SQLTABLES','SQLTABLEPRIVILEGES','SQLSTATISTICS','SQLSPECIALCOLUMNS','SQLSETSTMTOPTION','SQLSETSTMTATTR',
+            'SQLSETSCROLLOPTIONS','SQLSETPOS','SQLSETPARAM','SQLSETENVATTR','SQLSETDESCREC','SQLSETDESCFIELD','SQLSETCURSORNAME','SQLSETCONNECTOPTION',
+            'SQLSETCONNECTATTR','SQLSETCONFIGMODE','SQLROWCOUNT','SQLREMOVETRANSLATOR','SQLREMOVEDSNFROMINI','SQLREMOVEDRIVERMANAGER','SQLREMOVEDRIVER','SQLREADFILEDSN',
+            'SQLPUTDATA','SQLPROCEDURES','SQLPROCEDURECOLUMNS','SQLPRIMARYKEYS','SQLPREPARE','SQLPOSTINSTALLERERROR','SQLPARAMOPTIONS','SQLPARAMDATA',
+            'SQLNUMRESULTCOLS','SQLNUMPARAMS','SQLNATIVESQL','SQLMORERESULTS','SQLMANAGEDATASOURCES','SQLINSTALLTRANSLATOREX','SQLINSTALLERERROR','SQLINSTALLDRIVERMANAGER',
+            'SQLINSTALLDRIVEREX','SQLGETTYPEINFO','SQLGETTRANSLATOR','SQLGETSTMTOPTION','SQLGETSTMTATTR','SQLGETPRIVATEPROFILESTRING','SQLGETINSTALLEDDRIVERS','SQLGETINFO',
+            'SQLGETFUNCTIONS','SQLGETENVATTR','SQLGETDIAGREC','SQLGETDIAGFIELD','SQLGETDESCREC','SQLGETDESCFIELD','SQLGETDATA','SQLGETCURSORNAME',
+            'SQLGETCONNECTOPTION','SQLGETCONNECTATTR','SQLGETCONFIGMODE','SQLFREESTMT','SQLFREEHANDLE','SQLFREEENV','SQLFREECONNECT','SQLFOREIGNKEYS',
+            'SQLFETCHSCROLL','SQLFETCH','SQLEXTENDEDFETCH','SQLEXECUTE','SQLEXECDIRECT','SQLERROR','SQLENDTRAN','SQLDRIVERS',
+            'SQLDRIVERCONNECT','SQLDISCONNECT','SQLDESCRIBEPARAM','SQLDESCRIBECOL','SQLDATASOURCES','SQLCREATEDATASOURCE','SQLCOPYDESC','SQLCONNECT',
+            'SQLCONFIGDRIVER','SQLCONFIGDATASOURCE','SQLCOLUMNS','SQLCOLUMNPRIVILEGES','SQLCOLATTRIBUTES','SQLCOLATTRIBUTE','SQLCLOSECURSOR','SQLCANCEL',
+            'SQLBULKOPERATIONS','SQLBROWSECONNECT','SQLBINDPARAMETER','SQLBINDPARAM','SQLBINDCOL','SQLALLOCSTMT','SQLALLOCHANDLE','SQLALLOCENV',
+            'SQLALLOCCONNECT','ODBCWRONGDRIVER','ODBCWRITEPRIVATEPROFILESTRING','ODBCWRITEFILEDSN','ODBCWRITEDSNTOINI','ODBCVALIDDSN','ODBCUPDATERECORD','ODBCUPDATEBYBOOKMARK',
+            'ODBCUNLOCKRECORD','ODBCUNBINDCOLUMNS','ODBCUNBINDCOL','ODBCTABLESCOUNT','ODBCTABLES','ODBCTABLEPRIVILEGESCOUNT','ODBCTABLEPRIVILEGES','ODBCSUPPORTS',
+            'ODBCSTATTABLESCHEMANAME','ODBCSTATTABLEPAGES','ODBCSTATTABLECATALOGNAME','ODBCSTATTABLECARDINALITY','ODBCSTATISTICSCOUNT','ODBCSTATISTICS','ODBCSTATINDEXSORTSEQUENCE','ODBCSTATINDEXSCHEMANAME',
+            'ODBCSTATINDEXQUALIFIER','ODBCSTATINDEXPAGES','ODBCSTATINDEXFILTERCONDITION','ODBCSTATINDEXCOLUMNORDINALPOSITION','ODBCSTATINDEXCOLUMNNAME','ODBCSTATINDEXCATALOGNAME','ODBCSTATINDEXCARDINALITY','ODBCSTATINDEXALLOWDUPLICATES',
+            'ODBCSPECIALCOLUMNSCOUNT','ODBCSPECIALCOLUMNS','ODBCSETTXNISOLATION','ODBCSETTRANSLATELIB','ODBCSETTRACEFILE','ODBCSETTRACE','ODBCSETSTMTUSEBOOKMARKS','ODBCSETSTMTSIMULATECURSOR',
+            'ODBCSETSTMTROWSTATUSPTR','ODBCSETSTMTROWSFETCHEDPTR','ODBCSETSTMTROWOPERATIONPTR','ODBCSETSTMTROWBINDTYPE','ODBCSETSTMTROWBINDOFFSETPTR','ODBCSETSTMTROWARRAYSIZE','ODBCSETSTMTRETRIEVEDATA','ODBCSETSTMTQUERYTIMEOUT',
+            'ODBCSETSTMTPARAMSTATUSPTR','ODBCSETSTMTPARAMSPROCESSEDPTR','ODBCSETSTMTPARAMSETSIZE','ODBCSETSTMTPARAMOPERATIONPTR','ODBCSETSTMTPARAMBINDTYPE','ODBCSETSTMTPARAMBINDOFFSETPTR','ODBCSETSTMTNOSCAN','ODBCSETSTMTMETADATAID',
+            'ODBCSETSTMTMAXROWS','ODBCSETSTMTMAXLENGTH','ODBCSETSTMTKEYSETSIZE','ODBCSETSTMTFETCHBOOKMARKPTR','ODBCSETSTMTENABLEAUTOIPD','ODBCSETSTMTCURSORTYPE','ODBCSETSTMTCURSORSENSITIVITY','ODBCSETSTMTCURSORSCROLLABLE',
+            'ODBCSETSTMTCONCURRENCY','ODBCSETSTMTATTR','ODBCSETSTMTASYNCENABLE','ODBCSETSTMTAPPROWDESC','ODBCSETSTMTAPPPARAMDESC','ODBCSETSTATICCURSOR','ODBCSETROWVERCONCURRENCY','ODBCSETRESULT',
+            'ODBCSETRELATIVEPOSITION','ODBCSETREADONLYCONCURRENCY','ODBCSETQUIETMODE','ODBCSETPOSITION','ODBCSETPOS','ODBCSETPACKETMODE','ODBCSETOPTIMISTICCONCURRENCY','ODBCSETODBCCURSORS',
+            'ODBCSETMULTIUSERKEYSETCURSOR','ODBCSETMETADATAID','ODBCSETLOGINTIMEOUT','ODBCSETLOCKCONCURRENCY','ODBCSETKEYSETDRIVENCURSOR','ODBCSETFORWARDONLYCURSOR','ODBCSETENVOUTPUTNTS','ODBCSETENVODBCVERSION',
+            'ODBCSETENVCPMATCH','ODBCSETENVCONNECTIONPOOLING','ODBCSETENVATTR','ODBCSETDYNAMICCURSOR','ODBCSETDESCREC','ODBCSETDESCFIELD','ODBCSETCURSORTYPE','ODBCSETCURSORSENSITIVITY',
+            'ODBCSETCURSORSCROLLABILITY','ODBCSETCURSORNAME','ODBCSETCURSORLOCKTYPE','ODBCSETCURSORKEYSETSIZE','ODBCSETCURSORCONCURRENCY','ODBCSETCURRENTCATALOG','ODBCSETCONNECTIONTIMEOUT','ODBCSETCONNECTATTR',
+            'ODBCSETCONFIGMODE','ODBCSETCONCURVALUESCONCURRENCY','ODBCSETAUTOCOMMITON','ODBCSETAUTOCOMMITOFF','ODBCSETAUTOCOMMIT','ODBCSETASYNCENABLE','ODBCSETACCESSMODE','ODBCSETABSOLUTEPOSITION',
+            'ODBCROWCOUNT','ODBCROLLBACKTRAN','ODBCROLLBACKENVTRAN','ODBCROLLBACKDBCTRAN','ODBCRESULT','ODBCRESETPARAMS','ODBCREMOVETRANSLATOR','ODBCREMOVEDSNFROMINI',
+            'ODBCREMOVEDRIVERMANAGER','ODBCREMOVEDRIVER','ODBCREFRESHRECORD','ODBCRECORDCOUNT','ODBCREADFILEDSN','ODBCQUOTEDIDENTIFIERCASE','ODBCPUTDATA','ODBCPROCEDURESCOUNT',
+            'ODBCPROCEDURES','ODBCPROCEDURECOLUMNSCOUNT','ODBCPROCEDURECOLUMNS','ODBCPRIMARYKEYSCOUNT','ODBCPRIMARYKEYS','ODBCPREPARE','ODBCPOSTINSTALLERERROR','ODBCPARAMDATA',
+            'ODBCOPENSTMT','ODBCOPENCONNECTION','ODBCNUMRESULTCOLS','ODBCNUMPARAMS','ODBCNATIVESQL','ODBCMOVEPREVIOUS','ODBCMOVENEXT','ODBCMOVELAST',
+            'ODBCMOVEFIRST','ODBCMOVE','ODBCMORERESULTS','ODBCMANAGEDATASOURCES','ODBCLOCKRECORD','ODBCINSTALLTRANSLATOREX','ODBCINSTALLERERROR','ODBCINSTALLDRIVERMANAGER',
+            'ODBCINSTALLDRIVEREX','ODBCGETXOPENCLIYEAR','ODBCGETUSERNAME','ODBCGETUNION','ODBCGETTYPEINFOCOUNT','ODBCGETTYPEINFO','ODBCGETTXNISOLATIONOPTION','ODBCGETTXNISOLATION',
+            'ODBCGETTXNCAPABLE','ODBCGETTRANSLATOR','ODBCGETTRANSLATELIB','ODBCGETTRACEFILE','ODBCGETTRACE','ODBCGETTIMEDATEFUNCTIONS','ODBCGETTIMEDATEDIFFINTERVALS','ODBCGETTIMEDATEADDINTERVALS',
+            'ODBCGETTABLETERM','ODBCGETSYSTEMFUNCTIONS','ODBCGETSUBQUERIES','ODBCGETSTRINGFUNCTIONS','ODBCGETSTMTUSEBOOKMARKS','ODBCGETSTMTSQLSTATE','ODBCGETSTMTSIMULATECURSOR','ODBCGETSTMTROWSTATUSPTR',
+            'ODBCGETSTMTROWSFETCHEDPTR','ODBCGETSTMTROWOPERATIONPTR','ODBCGETSTMTROWNUMBER','ODBCGETSTMTROWBINDTYPE','ODBCGETSTMTROWBINDOFFSETPTR','ODBCGETSTMTROWARRAYSIZE','ODBCGETSTMTRETRIEVEDATA','ODBCGETSTMTQUERYTIMEOUT',
+            'ODBCGETSTMTPARAMSTATUSPTR','ODBCGETSTMTPARAMSPROCESSEDPTR','ODBCGETSTMTPARAMSETSIZE','ODBCGETSTMTPARAMOPERATIONPTR','ODBCGETSTMTPARAMBINDTYPE','ODBCGETSTMTPARAMBINDOFFSETPTR','ODBCGETSTMTNOSCAN','ODBCGETSTMTMETADATAID',
+            'ODBCGETSTMTMAXROWS','ODBCGETSTMTMAXLENGTH','ODBCGETSTMTKEYSETSIZE','ODBCGETSTMTIMPROWDESC','ODBCGETSTMTIMPPARAMDESC','ODBCGETSTMTFETCHBOOKMARKPTR','ODBCGETSTMTERRORINFO','ODBCGETSTMTENABLEAUTOIPD',
+            'ODBCGETSTMTCURSORTYPE','ODBCGETSTMTCURSORSENSITIVITY','ODBCGETSTMTCURSORSCROLLABLE','ODBCGETSTMTCONCURRENCY','ODBCGETSTMTATTR','ODBCGETSTMTASYNCENABLE','ODBCGETSTMTAPPROWDESC','ODBCGETSTMTAPPPARAMDESC',
+            'ODBCGETSTATICCURSORATTRIBUTES2','ODBCGETSTATICCURSORATTRIBUTES1','ODBCGETSTATEMENTSQLSTATE','ODBCGETSTATEMENTERRORINFO','ODBCGETSTANDARDCLICONFORMANCE','ODBCGETSQLSTATE','ODBCGETSQLCONFORMANCE','ODBCGETSQL92VALUEEXPRESSIONS',
+            'ODBCGETSQL92STRINGFUNCTIONS','ODBCGETSQL92ROWVALUECONSTRUCTOR','ODBCGETSQL92REVOKE','ODBCGETSQL92RELATIONALJOINOPERATORS','ODBCGETSQL92PREDICATES','ODBCGETSQL92NUMERICVALUEFUNCTIONS','ODBCGETSQL92GRANT','ODBCGETSQL92FOREIGNKEYUPDATERULE',
+            'ODBCGETSQL92FOREIGNKEYDELETERULE','ODBCGETSQL92DATETIMEFUNCTIONS','ODBCGETSPECIALCHARACTERS','ODBCGETSERVERNAME','ODBCGETSEARCHPATTERNESCAPE','ODBCGETSCROLLOPTIONS','ODBCGETSCHEMAUSAGE','ODBCGETSCHEMATERM',
+            'ODBCGETROWUPDATES','ODBCGETQUIETMODE','ODBCGETPROCEDURETERM','ODBCGETPROCEDURESSUPPORT','ODBCGETPRIVATEPROFILESTRING','ODBCGETPOSOPERATIONS','ODBCGETPARAMARRAYSELECTS','ODBCGETPARAMARRAYROWCOUNTS',
+            'ODBCGETPACKETMODE','ODBCGETOUTERJOINS','ODBCGETORDERBYCOLUMNSINSELECT','ODBCGETOJCAPABILITIES','ODBCGETODBCVER','ODBCGETODBCINTERFACECONFORMANCE','ODBCGETODBCCURSORS','ODBCGETNUMERICFUNCTIONS',
+            'ODBCGETNULLCOLLATION','ODBCGETNONNULLABLECOLUMNS','ODBCGETNEEDLONGDATALEN','ODBCGETMULTRESULTSETS','ODBCGETMULTIPLEACTIVETXN','ODBCGETMETADATAID','ODBCGETMAXUSERNAMELEN','ODBCGETMAXTABLESINSELECT',
+            'ODBCGETMAXTABLENAMELEN','ODBCGETMAXSTATEMENTLEN','ODBCGETMAXSCHEMANAMELEN','ODBCGETMAXROWSIZEINCLUDESLONG','ODBCGETMAXROWSIZE','ODBCGETMAXPROCEDURENAMELEN','ODBCGETMAXINDEXSIZE','ODBCGETMAXIDENTIFIERLEN',
+            'ODBCGETMAXDRIVERCONNECTIONS','ODBCGETMAXCURSORNAMELEN','ODBCGETMAXCONCURRENTACTIVITIES','ODBCGETMAXCOLUMNSINTABLE','ODBCGETMAXCOLUMNSINSELECT','ODBCGETMAXCOLUMNSINORDERBY','ODBCGETMAXCOLUMNSININDEX','ODBCGETMAXCOLUMNSINGROUPBY',
+            'ODBCGETMAXCOLUMNNAMELEN','ODBCGETMAXCHARLITERALLEN','ODBCGETMAXCATALOGNAMELEN','ODBCGETMAXBINARYLITERALLEN','ODBCGETMAXASYNCCONCURRENTSTATEMENTS','ODBCGETLONGVARCHARDATABYCOLNAME','ODBCGETLONGVARCHARDATA','ODBCGETLOGINTIMEOUT',
+            'ODBCGETLIKEESCAPECLAUSE','ODBCGETKEYWORDS','ODBCGETKEYSETCURSORATTRIBUTES2','ODBCGETKEYSETCURSORATTRIBUTES1','ODBCGETINTEGRITY','ODBCGETINSTALLERERRORMESSAGE','ODBCGETINSTALLERERRORCODE','ODBCGETINSTALLEDDRIVERS',
+            'ODBCGETINSERTSTATEMENT','ODBCGETINFOSTR','ODBCGETINFOSCHEMAVIEWS','ODBCGETINFOLONG','ODBCGETINFOINT','ODBCGETINFO','ODBCGETINDEXKEYWORDS','ODBCGETIMPROWDESCREC',
+            'ODBCGETIMPROWDESCFIELDTYPE','ODBCGETIMPROWDESCFIELDSCALE','ODBCGETIMPROWDESCFIELDPRECISION','ODBCGETIMPROWDESCFIELDOCTETLENGTH','ODBCGETIMPROWDESCFIELDNULLABLE','ODBCGETIMPROWDESCFIELDNAME','ODBCGETIMPROWDESCFIELD','ODBCGETIMPPARAMDESCREC',
+            'ODBCGETIMPPARAMDESCFIELDTYPE','ODBCGETIMPPARAMDESCFIELDSCALE','ODBCGETIMPPARAMDESCFIELDPRECISION','ODBCGETIMPPARAMDESCFIELDOCTETLENGTH','ODBCGETIMPPARAMDESCFIELDNULLABLE','ODBCGETIMPPARAMDESCFIELDNAME','ODBCGETIMPPARAMDESCFIELD','ODBCGETIDENTIFIERQUOTECHAR',
+            'ODBCGETIDENTIFIERCASE','ODBCGETGROUPBY','ODBCGETFUNCTIONS','ODBCGETFORWARDONLYCURSORATTRIBUTES2','ODBCGETFORWARDONLYCURSORATTRIBUTES1','ODBCGETFILEUSAGE','ODBCGETEXPRESSIONSINORDERBY','ODBCGETERRORINFO',
+            'ODBCGETENVSQLSTATE','ODBCGETENVOUTPUTNTS','ODBCGETENVODBCVERSION','ODBCGETENVIRONMENTSQLSTATE','ODBCGETENVIRONMENTERRORINFO','ODBCGETENVERRORINFO','ODBCGETENVCPMATCH','ODBCGETENVCONNECTIONPOOLING',
+            'ODBCGETENVATTR','ODBCGETDYNAMICCURSORATTRIBUTES2','ODBCGETDYNAMICCURSORATTRIBUTES1','ODBCGETDROPVIEW','ODBCGETDROPTRANSLATION','ODBCGETDROPTABLE','ODBCGETDROPSCHEMA','ODBCGETDROPDOMAIN',
+            'ODBCGETDROPCOLLATION','ODBCGETDROPCHARACTERSET','ODBCGETDROPASSERTION','ODBCGETDRIVERVER','ODBCGETDRIVERODBCVER','ODBCGETDRIVERNAME','ODBCGETDRIVERMANAGERINSTALLPATH','ODBCGETDRIVERHLIB',
+            'ODBCGETDRIVERHENV','ODBCGETDRIVERHDBC','ODBCGETDMVERMINOR','ODBCGETDMVERMAJOR','ODBCGETDMVER','ODBCGETDIAGREC','ODBCGETDIAGFIELD','ODBCGETDESCSQLSTATE',
+            'ODBCGETDESCRIPTORSQLSTATE','ODBCGETDESCRIPTORERRORINFO','ODBCGETDESCRIBEPARAMETER','ODBCGETDESCREC','ODBCGETDESCFIELD','ODBCGETDESCERRORINFO','ODBCGETDEFAULTTXNISOLATION','ODBCGETDDLINDEX',
+            'ODBCGETDBMSVER','ODBCGETDBMSNAME','ODBCGETDBCSQLSTATE','ODBCGETDBCERRORINFO','ODBCGETDATETIMELITERALS','ODBCGETDATASTRINGBYCOLNAME','ODBCGETDATASTRING','ODBCGETDATASOURCEREADONLY',
+            'ODBCGETDATASOURCENAME','ODBCGETDATAEXTENSIONS','ODBCGETDATABASENAME','ODBCGETDATA','ODBCGETCURSORTYPE','ODBCGETCURSORSENSITIVITYSUPPORT','ODBCGETCURSORSENSITIVITY','ODBCGETCURSORSCROLLABILITY',
+            'ODBCGETCURSORROLLBACKBEHAVIOR','ODBCGETCURSORNAME','ODBCGETCURSORLOCKTYPE','ODBCGETCURSORKEYSETSIZE','ODBCGETCURSORCONCURRENCY','ODBCGETCURSORCOMMITBEHAVIOR','ODBCGETCURRENTCATALOG','ODBCGETCREATEVIEW',
+            'ODBCGETCREATETRANSLATION','ODBCGETCREATETABLE','ODBCGETCREATESCHEMA','ODBCGETCREATEDOMAIN','ODBCGETCREATECOLLATION','ODBCGETCREATECHARACTERSET','ODBCGETCREATEASSERTION','ODBCGETCORRELATIONNAME',
+            'ODBCGETCONVERTVARCHAR','ODBCGETCONVERTVARBINARY','ODBCGETCONVERTTINYINT','ODBCGETCONVERTTIMESTAMP','ODBCGETCONVERTTIME','ODBCGETCONVERTSMALLINT','ODBCGETCONVERTREAL','ODBCGETCONVERTNUMERIC',
+            'ODBCGETCONVERTLONGVARCHAR','ODBCGETCONVERTLONGVARBINARY','ODBCGETCONVERTINTERVALYEARMONTH','ODBCGETCONVERTINTERVALDAYTIME','ODBCGETCONVERTINTEGER','ODBCGETCONVERTFUNCTIONS','ODBCGETCONVERTFLOAT','ODBCGETCONVERTDOUBLE',
+            'ODBCGETCONVERTDECIMAL','ODBCGETCONVERTDATE','ODBCGETCONVERTCHAR','ODBCGETCONVERTBIT','ODBCGETCONVERTBINARY','ODBCGETCONVERTBIGINT','ODBCGETCONNECTIONTIMEOUT','ODBCGETCONNECTIONSQLSTATE',
+            'ODBCGETCONNECTIONERRORINFO','ODBCGETCONNECTIONDEAD','ODBCGETCONNECTATTR','ODBCGETCONFIGMODE','ODBCGETCONCATNULLBEHAVIOR','ODBCGETCOLUMNALIAS','ODBCGETCOLLATIONSEQ','ODBCGETCATALOGUSAGE',
+            'ODBCGETCATALOGTERM','ODBCGETCATALOGNAMESEPARATOR','ODBCGETCATALOGNAME','ODBCGETCATALOGLOCATION','ODBCGETBOOKMARKPERSISTENCE','ODBCGETBATCHSUPPORT','ODBCGETBATCHROWCOUNT','ODBCGETAUTOIPD',
+            'ODBCGETAUTOCOMMIT','ODBCGETASYNCMODE','ODBCGETASYNCENABLE','ODBCGETALTERTABLE','ODBCGETALTERDOMAIN','ODBCGETAGGREGATEFUNCTIONS','ODBCGETACTIVEENVIRONMENTS','ODBCGETACCESSMODE',
+            'ODBCGETACCESSIBLETABLES','ODBCGETACCESSIBLEPROCEDURES','ODBCFREESTMT','ODBCFREEHANDLE','ODBCFREEENV','ODBCFREEDESC','ODBCFREEDBC','ODBCFREECONNECT',
+            'ODBCFOREIGNKEYSCOUNT','ODBCFOREIGNKEYS','ODBCFETCHSCROLL','ODBCFETCHBYBOOKMARK','ODBCFETCH','ODBCEXTENDEDFETCH','ODBCEXECUTE','ODBCEXECDIRECT',
+            'ODBCERROR','ODBCEOF','ODBCENDTRAN','ODBCDRIVERSCOUNT','ODBCDRIVERS','ODBCDRIVERCONNECT','ODBCDISCONNECT','ODBCDESCRIBEPARAM',
+            'ODBCDESCRIBECOL','ODBCDELETERECORD','ODBCDELETEBYBOOKMARK','ODBCDATASOURCES','ODBCCREATEDATASOURCE','ODBCCOPYDESC','ODBCCONNECTIONISDEAD','ODBCCONNECTIONISALIVE',
+            'ODBCCONNECT','ODBCCONFIGDRIVER','ODBCCONFIGDATASOURCE','ODBCCOMMITTRAN','ODBCCOMMITENVTRAN','ODBCCOMMITDBCTRAN','ODBCCOLUPDATABLE','ODBCCOLUNSIGNED',
+            'ODBCCOLUNNAMED','ODBCCOLUMNSCOUNT','ODBCCOLUMNS','ODBCCOLUMNPRIVILEGESCOUNT','ODBCCOLUMNPRIVILEGES','ODBCCOLUMN','ODBCCOLTYPENAME','ODBCCOLTYPE',
+            'ODBCCOLTABLENAME','ODBCCOLSEARCHABLE','ODBCCOLSCHEMANAME','ODBCCOLSCALE','ODBCCOLPRECISION','ODBCCOLOCTETLENGTH','ODBCCOLNUMPRECRADIX','ODBCCOLNULLABLE',
+            'ODBCCOLNAME','ODBCCOLLOCALTYPENAME','ODBCCOLLITERALSUFFIX','ODBCCOLLITERALPREFIX','ODBCCOLLENGTH','ODBCCOLLABEL','ODBCCOLISNULL','ODBCCOLFIXEDPRECSCALE',
+            'ODBCCOLDISPLAYSIZE','ODBCCOLCOUNT','ODBCCOLCONCISETYPE','ODBCCOLCATALOGNAME','ODBCCOLCASESENSITIVE','ODBCCOLBASETABLENAME','ODBCCOLBASECOLUMNNAME','ODBCCOLAUTOUNIQUEVALUE',
+            'ODBCCOLATTRIBUTE','ODBCCLOSESTMTCURSOR','ODBCCLOSESTMT','ODBCCLOSECURSOR','ODBCCLOSECONNECTION','ODBCCLEARRESULT','ODBCCANCEL','ODBCBULKOPERATIONS',
+            'ODBCBROWSECONNECT','ODBCBINDPARAMETER','ODBCBINDCOLTOWORD','ODBCBINDCOLTOTIMESTAMP','ODBCBINDCOLTOTIME','ODBCBINDCOLTOSTRING','ODBCBINDCOLTOSINGLE','ODBCBINDCOLTOQUAD',
+            'ODBCBINDCOLTONUMERIC','ODBCBINDCOLTOLONG','ODBCBINDCOLTOINTEGER','ODBCBINDCOLTODWORD','ODBCBINDCOLTODOUBLE','ODBCBINDCOLTODECIMAL','ODBCBINDCOLTODATE','ODBCBINDCOLTOCURRENCY',
+            'ODBCBINDCOLTOBYTE','ODBCBINDCOLTOBIT','ODBCBINDCOLTOBINARY','ODBCBINDCOL','ODBCALLOCSTMT','ODBCALLOCHANDLE','ODBCALLOCENV','ODBCALLOCDESC',
+            'ODBCALLOCDBC','ODBCALLOCCONNECT','ODBCADDRECORD','GLVIEWPORT','GLVERTEXPOINTER','GLVERTEX4SV','GLVERTEX4S','GLVERTEX4IV',
+            'GLVERTEX4I','GLVERTEX4FV','GLVERTEX4F','GLVERTEX4DV','GLVERTEX4D','GLVERTEX3SV','GLVERTEX3S','GLVERTEX3IV',
+            'GLVERTEX3I','GLVERTEX3FV','GLVERTEX3F','GLVERTEX3DV','GLVERTEX3D','GLVERTEX2SV','GLVERTEX2S','GLVERTEX2IV',
+            'GLVERTEX2I','GLVERTEX2FV','GLVERTEX2F','GLVERTEX2DV','GLVERTEX2D','GLUUNPROJECT','GLUTESSVERTEX','GLUTESSPROPERTY',
+            'GLUTESSNORMAL','GLUTESSENDPOLYGON','GLUTESSENDCONTOUR','GLUTESSCALLBACK','GLUTESSBEGINPOLYGON','GLUTESSBEGINCONTOUR','GLUSPHERE','GLUSCALEIMAGE',
+            'GLUQUADRICTEXTURE','GLUQUADRICORIENTATION','GLUQUADRICNORMALS','GLUQUADRICDRAWSTYLE','GLUQUADRICCALLBACK','GLUPWLCURVE','GLUPROJECT','GLUPICKMATRIX',
+            'GLUPERSPECTIVE','GLUPARTIALDISK','GLUORTHO2D','GLUNURBSSURFACE','GLUNURBSPROPERTY','GLUNURBSCURVE','GLUNURBSCALLBACK','GLUNEXTCONTOUR',
+            'GLUNEWTESS','GLUNEWQUADRIC','GLUNEWNURBSRENDERER','GLULOOKAT','GLULOADSAMPLINGMATRICES','GLUGETTESSPROPERTY','GLUGETSTRING','GLUGETNURBSPROPERTY',
+            'GLUERRORSTRING','GLUENDTRIM','GLUENDSURFACE','GLUENDPOLYGON','GLUENDCURVE','GLUDISK','GLUDELETETESS','GLUDELETEQUADRIC',
+            'GLUDELETENURBSRENDERER','GLUCYLINDER','GLUBUILD2DMIPMAPS','GLUBUILD1DMIPMAPS','GLUBEGINTRIM','GLUBEGINSURFACE','GLUBEGINPOLYGON','GLUBEGINCURVE',
+            'GLTRANSLATEF','GLTRANSLATED','GLTEXSUBIMAGE2D','GLTEXSUBIMAGE1D','GLTEXPARAMETERIV','GLTEXPARAMETERI','GLTEXPARAMETERFV','GLTEXPARAMETERF',
+            'GLTEXIMAGE2D','GLTEXIMAGE1D','GLTEXGENIV','GLTEXGENI','GLTEXGENFV','GLTEXGENF','GLTEXGENDV','GLTEXGEND',
+            'GLTEXENVIV','GLTEXENVI','GLTEXENVFV','GLTEXENVF','GLTEXCOORDPOINTER','GLTEXCOORD4SV','GLTEXCOORD4S','GLTEXCOORD4IV',
+            'GLTEXCOORD4I','GLTEXCOORD4FV','GLTEXCOORD4F','GLTEXCOORD4DV','GLTEXCOORD4D','GLTEXCOORD3SV','GLTEXCOORD3S','GLTEXCOORD3IV',
+            'GLTEXCOORD3I','GLTEXCOORD3FV','GLTEXCOORD3F','GLTEXCOORD3DV','GLTEXCOORD3D','GLTEXCOORD2SV','GLTEXCOORD2S','GLTEXCOORD2IV',
+            'GLTEXCOORD2I','GLTEXCOORD2FV','GLTEXCOORD2F','GLTEXCOORD2DV','GLTEXCOORD2D','GLTEXCOORD1SV','GLTEXCOORD1S','GLTEXCOORD1IV',
+            'GLTEXCOORD1I','GLTEXCOORD1FV','GLTEXCOORD1F','GLTEXCOORD1DV','GLTEXCOORD1D','GLSTENCILOP','GLSTENCILMASK','GLSTENCILFUNC',
+            'GLSHADEMODEL','GLSELECTBUFFER','GLSCISSOR','GLSCALEF','GLSCALED','GLROTATEF','GLROTATED','GLRENDERMODE',
+            'GLRECTSV','GLRECTS','GLRECTIV','GLRECTI','GLRECTFV','GLRECTF','GLRECTDV','GLRECTD',
+            'GLREADPIXELS','GLREADBUFFER','GLRASTERPOS4SV','GLRASTERPOS4S','GLRASTERPOS4IV','GLRASTERPOS4I','GLRASTERPOS4FV','GLRASTERPOS4F',
+            'GLRASTERPOS4DV','GLRASTERPOS4D','GLRASTERPOS3SV','GLRASTERPOS3S','GLRASTERPOS3IV','GLRASTERPOS3I','GLRASTERPOS3FV','GLRASTERPOS3F',
+            'GLRASTERPOS3DV','GLRASTERPOS3D','GLRASTERPOS2SV','GLRASTERPOS2S','GLRASTERPOS2IV','GLRASTERPOS2I','GLRASTERPOS2FV','GLRASTERPOS2F',
+            'GLRASTERPOS2DV','GLRASTERPOS2D','GLPUSHNAME','GLPUSHMATRIX','GLPUSHCLIENTATTRIB','GLPUSHATTRIB','GLPRIORITIZETEXTURES','GLPOPNAME',
+            'GLPOPMATRIX','GLPOPCLIENTATTRIB','GLPOPATTRIB','GLPOLYGONSTIPPLE','GLPOLYGONOFFSET','GLPOLYGONMODE','GLPOINTSIZE','GLPIXELZOOM',
+            'GLPIXELTRANSFERI','GLPIXELTRANSFERF','GLPIXELSTOREI','GLPIXELSTOREF','GLPIXELMAPUSV','GLPIXELMAPUIV','GLPIXELMAPFV','GLPASSTHROUGH',
+            'GLORTHO','GLNORMALPOINTER','GLNORMAL3SV','GLNORMAL3S','GLNORMAL3IV','GLNORMAL3I','GLNORMAL3FV','GLNORMAL3F',
+            'GLNORMAL3DV','GLNORMAL3D','GLNORMAL3BV','GLNORMAL3B','GLNEWLIST','GLMULTMATRIXF','GLMULTMATRIXD','GLMATRIXMODE',
+            'GLMATERIALIV','GLMATERIALI','GLMATERIALFV','GLMATERIALF','GLMAPGRID2F','GLMAPGRID2D','GLMAPGRID1F','GLMAPGRID1D',
+            'GLMAP2F','GLMAP2D','GLMAP1F','GLMAP1D','GLLOGICOP','GLLOADNAME','GLLOADMATRIXF','GLLOADMATRIXD',
+            'GLLOADIDENTITY','GLLISTBASE','GLLINEWIDTH','GLLINESTIPPLE','GLLIGHTMODELIV','GLLIGHTMODELI','GLLIGHTMODELFV','GLLIGHTMODELF',
+            'GLLIGHTIV','GLLIGHTI','GLLIGHTFV','GLLIGHTF','GLISTEXTURE','GLISLIST','GLISENABLED','GLINTERLEAVEDARRAYS',
+            'GLINITNAMES','GLINDEXUBV','GLINDEXUB','GLINDEXSV','GLINDEXS','GLINDEXPOINTER','GLINDEXMASK','GLINDEXIV',
+            'GLINDEXI','GLINDEXFV','GLINDEXF','GLINDEXDV','GLINDEXD','GLHINT','GLGETTEXPARAMETERIV','GLGETTEXPARAMETERFV',
+            'GLGETTEXLEVELPARAMETERIV','GLGETTEXLEVELPARAMETERFV','GLGETTEXIMAGE','GLGETTEXGENIV','GLGETTEXGENFV','GLGETTEXGENDV','GLGETTEXENVIV','GLGETTEXENVFV',
+            'GLGETSTRING','GLGETPOLYGONSTIPPLE','GLGETPOINTERV','GLGETPIXELMAPUSV','GLGETPIXELMAPUIV','GLGETPIXELMAPFV','GLGETMATERIALIV','GLGETMATERIALFV',
+            'GLGETMAPIV','GLGETMAPFV','GLGETMAPDV','GLGETLIGHTIV','GLGETLIGHTFV','GLGETINTEGERV','GLGETFLOATV','GLGETERROR',
+            'GLGETDOUBLEV','GLGETCLIPPLANE','GLGETBOOLEANV','GLGENTEXTURES','GLGENLISTS','GLFRUSTUM','GLFRONTFACE','GLFOGIV',
+            'GLFOGI','GLFOGFV','GLFOGF','GLFLUSH','GLFINISH','GLFEEDBACKBUFFER','GLEVALPOINT2','GLEVALPOINT1',
+            'GLEVALMESH2','GLEVALMESH1','GLEVALCOORD2FV','GLEVALCOORD2F','GLEVALCOORD2DV','GLEVALCOORD2D','GLEVALCOORD1FV','GLEVALCOORD1F',
+            'GLEVALCOORD1DV','GLEVALCOORD1D','GLENDLIST','GLEND','GLENABLECLIENTSTATE','GLENABLE','GLEDGEFLAGV','GLEDGEFLAGPOINTER',
+            'GLEDGEFLAG','GLDRAWPIXELS','GLDRAWELEMENTS','GLDRAWBUFFER','GLDRAWARRAYS','GLDISABLECLIENTSTATE','GLDISABLE','GLDEPTHRANGE',
+            'GLDEPTHMASK','GLDEPTHFUNC','GLDELETETEXTURES','GLDELETELISTS','GLCULLFACE','GLCOPYTEXSUBIMAGE2D','GLCOPYTEXSUBIMAGE1D','GLCOPYTEXIMAGE2D',
+            'GLCOPYTEXIMAGE1D','GLCOPYPIXELS','GLCOLORPOINTER','GLCOLORMATERIAL','GLCOLORMASK','GLCOLOR4USV','GLCOLOR4US','GLCOLOR4UIV',
+            'GLCOLOR4UI','GLCOLOR4UBV','GLCOLOR4UB','GLCOLOR4SV','GLCOLOR4S','GLCOLOR4IV','GLCOLOR4I','GLCOLOR4FV',
+            'GLCOLOR4F','GLCOLOR4DV','GLCOLOR4D','GLCOLOR4BV','GLCOLOR4B','GLCOLOR3USV','GLCOLOR3US','GLCOLOR3UIV',
+            'GLCOLOR3UI','GLCOLOR3UBV','GLCOLOR3UB','GLCOLOR3SV','GLCOLOR3S','GLCOLOR3IV','GLCOLOR3I','GLCOLOR3FV',
+            'GLCOLOR3F','GLCOLOR3DV','GLCOLOR3D','GLCOLOR3BV','GLCOLOR3B','GLCLIPPLANE','GLCLEARSTENCIL','GLCLEARINDEX',
+            'GLCLEARDEPTH','GLCLEARCOLOR','GLCLEARACCUM','GLCLEAR','GLCALLLISTS','GLCALLLIST','GLBLENDFUNC','GLBITMAP',
+            'GLBINDTEXTURE','GLBEGIN','GLARRAYELEMENT','GLARETEXTURESRESIDENT','GLALPHAFUNC','GLACCUM'),
+        2 => array(
+            '$BEL','$BS','$CR','$CRLF','$DQ','$DT_DATE_SEPARATOR','$DT_LANGUAGE','$DT_TIME_SEPARATOR',
+            '$ESC','$FF','$LF','$NUL','$PC_SD_MY_PC','$SPC','$SQL_OPT_TRACE_FILE_DEFAULT','$SQL_SPEC_STRING',
+            '$TAB','$TRACKBAR_CLASS','$VT','%ACM_OPEN','%ACM_OPENW','%ACM_PLAY','%ACM_STOP','%ACN_START',
+            '%ACN_STOP','%ACS_AUTOPLAY','%ACS_CENTER','%ACS_TIMER','%ACS_TRANSPARENT','%APP_COUNTER_FUNLOOKUP','%APP_COUNTER_KEYLOOKUP','%APP_COUNTER_LOOKUP',
+            '%APP_COUNTER_TESTALPHA','%APP_COUNTER_UDTLOOKUP','%APP_COUNTER_VARLOOKUP','%APP_TIMER_EXECTOTAL','%APP_TIMER_INIT','%APP_TIMER_LOAD','%APP_TIMER_PREPROCESSOR','%AW_ACTIVATE',
+            '%AW_BLEND','%AW_CENTER','%AW_HIDE','%AW_HOR_NEGATIVE','%AW_HOR_POSITIVE','%AW_SLIDE','%AW_VER_NEGATIVE','%AW_VER_POSITIVE',
+            '%BCM_FIRST','%BLACK','%BLUE','%BM_GETCHECK','%BM_SETCHECK','%BST_CHECKED','%BST_UNCHECKED','%BS_AUTOCHECKBOX',
+            '%BS_BOTTOM','%BS_CENTER','%BS_DEFAULT','%BS_DEFPUSHBUTTON','%BS_FLAT','%BS_LEFT','%BS_LEFTTEXT','%BS_MULTILINE',
+            '%BS_NOTIFY','%BS_OWNERDRAW','%BS_PUSHLIKE','%BS_RIGHT','%BS_TOP','%BS_VCENTER','%BUNDLE_BUILDER_CANCELLED','%CBM_FIRST',
+            '%CBN_CLOSEUP','%CBN_DBLCLK','%CBN_DROPDOWN','%CBN_EDITCHANGE','%CBN_EDITUPDATE','%CBN_ERRSPACE','%CBN_KILLFOCUS','%CBN_SELCANCEL',
+            '%CBN_SELCHANGE','%CBN_SELENDCANCEL','%CBN_SELENDOK','%CBN_SETFOCUS','%CBS_AUTOHSCROLL','%CBS_DISABLENOSCROLL','%CBS_DROPDOWN','%CBS_DROPDOWNLIST',
+            '%CBS_HASSTRINGS','%CBS_LOWERCASE','%CBS_NOINTEGRALHEIGHT','%CBS_SIMPLE','%CBS_SORT','%CBS_UPPERCASE','%CB_SELECTSTRING','%CCM_FIRST',
+            '%CC_ANYCOLOR','%CC_ENABLEHOOK','%CC_ENABLETEMPLATE','%CC_ENABLETEMPLATEHANDLE','%CC_FULLOPEN','%CC_PREVENTFULLOPEN','%CC_RGBINIT','%CC_SHOWHELP',
+            '%CC_SOLIDCOLOR','%CFE_BOLD','%CFE_ITALIC','%CFE_LINK','%CFE_PROTECTED','%CFE_STRIKEOUT','%CFE_UNDERLINE','%CFM_ANIMATION',
+            '%CFM_BACKCOLOR','%CFM_BOLD','%CFM_CHARSET','%CFM_COLOR','%CFM_FACE','%CFM_ITALIC','%CFM_KERNING','%CFM_LCID',
+            '%CFM_LINK','%CFM_OFFSET','%CFM_PROTECTED','%CFM_REVAUTHOR','%CFM_SIZE','%CFM_SPACING','%CFM_STRIKEOUT','%CFM_STYLE',
+            '%CFM_UNDERLINE','%CFM_UNDERLINETYPE','%CFM_WEIGHT','%CGI_ACCEPT_FILE_UPLOAD','%CGI_AUTO_ADD_SPECIAL_CHARS_PREFIX','%CGI_AUTO_CREATE_VARS','%CGI_BUFFERIZE_OUTPUT','%CGI_DOUBLE_QUOTE',
+            '%CGI_FILE_UPLOAD_BASEPATH','%CGI_FORCE_SESSION_VALIDATION','%CGI_MAX_BYTE_FROM_STD_IN','%CGI_REQUEST_METHOD_GET','%CGI_REQUEST_METHOD_POST','%CGI_SESSION_FILE_BASEPATH','%CGI_SINGLE_QUOTE','%CGI_SPECIAL_CHARS_PREFIX',
+            '%CGI_TEMPORARY_UPLOAD_PATH','%CGI_UPLOAD_CAN_OVERWRITE','%CGI_WRITE_LOG_FILE','%CGI_WRITE_VARS_INTO_LOG_FILE','%CONOLE_ATTACH_PARENT_PROCESS','%CONSOLE_BACKGROUND_BLUE','%CONSOLE_BACKGROUND_GREEN','%CONSOLE_BACKGROUND_INTENSITY',
+            '%CONSOLE_BACKGROUND_RED','%CONSOLE_BOX_FLAG_3DOFF','%CONSOLE_BOX_FLAG_3DON','%CONSOLE_BOX_FLAG_SHADOW','%CONSOLE_COMMON_LVB_GRID_HORIZONTAL','%CONSOLE_COMMON_LVB_GRID_LVERTICAL','%CONSOLE_COMMON_LVB_GRID_RVERTICAL','%CONSOLE_COMMON_LVB_LEADING_BYTE',
+            '%CONSOLE_COMMON_LVB_REVERSE_VIDEO','%CONSOLE_COMMON_LVB_TRAILING_BYTE','%CONSOLE_COMMON_LVB_UNDERSCORE','%CONSOLE_CTRL_BREAK_EVENT','%CONSOLE_CTRL_C_EVENT','%CONSOLE_DOUBLE_CLICK','%CONSOLE_ENABLE_AUTO_POSITION','%CONSOLE_ENABLE_ECHO_INPUT',
+            '%CONSOLE_ENABLE_EXTENDED_FLAGS','%CONSOLE_ENABLE_INSERT_MODE','%CONSOLE_ENABLE_LINE_INPUT','%CONSOLE_ENABLE_MOUSE_INPUT','%CONSOLE_ENABLE_PROCESSED_INPUT','%CONSOLE_ENABLE_PROCESSED_OUTPUT','%CONSOLE_ENABLE_QUICK_EDIT_MODE','%CONSOLE_ENABLE_WINDOW_INPUT',
+            '%CONSOLE_ENABLE_WRAP_AT_EOL_OUTPUT','%CONSOLE_FOREGROUND_BLUE','%CONSOLE_FOREGROUND_GREEN','%CONSOLE_FOREGROUND_INTENSITY','%CONSOLE_FOREGROUND_RED','%CONSOLE_LBUTTON','%CONSOLE_LINE_HORIZONTAL','%CONSOLE_LINE_VERTICAL',
+            '%CONSOLE_MBUTTON','%CONSOLE_MOUSE_MOVED','%CONSOLE_MOUSE_WHEELED','%CONSOLE_RBUTTON','%CONSOLE_SCROLLBUF_DOWN','%CONSOLE_SCROLLBUF_UP','%CONSOLE_SCROLLWND_ABSOLUTE','%CONSOLE_SCROLLWND_RELATIVE',
+            '%CONSOLE_STD_ERROR_HANDLE','%CONSOLE_STD_INPUT_HANDLE','%CONSOLE_STD_OUTPUT_HANDLE','%CONSOLE_SW_FORCEMINIMIZE','%CONSOLE_SW_HIDE','%CONSOLE_SW_MAXIMIZE','%CONSOLE_SW_MINIMIZE','%CONSOLE_SW_RESTORE',
+            '%CONSOLE_SW_SHOW','%CONSOLE_SW_SHOWDEFAULT','%CONSOLE_SW_SHOWMAXIMIZED','%CONSOLE_SW_SHOWMINIMIZED','%CONSOLE_SW_SHOWMINNOACTIVE','%CONSOLE_SW_SHOWNA','%CONSOLE_SW_SHOWNOACTIVATE','%CONSOLE_SW_SHOWNORMAL',
+            '%CONSOLE_UNAVAILABLE','%CRYPTO_CALG_DES','%CRYPTO_CALG_RC2','%CRYPTO_CALG_RC4','%CRYPTO_PROV_DH_SCHANNEL','%CRYPTO_PROV_DSS','%CRYPTO_PROV_DSS_DH','%CRYPTO_PROV_FORTEZZA',
+            '%CRYPTO_PROV_MS_EXCHANGE','%CRYPTO_PROV_RSA_FULL','%CRYPTO_PROV_RSA_SCHANNEL','%CRYPTO_PROV_RSA_SIG','%CRYPTO_PROV_SSL','%CSIDL_ADMINTOOLS','%CSIDL_ALTSTARTUP','%CSIDL_APPDATA',
+            '%CSIDL_BITBUCKET','%CSIDL_CDBURN_AREA','%CSIDL_COMMON_ADMINTOOLS','%CSIDL_COMMON_ALTSTARTUP','%CSIDL_COMMON_APPDATA','%CSIDL_COMMON_DESKTOPDIRECTORY','%CSIDL_COMMON_DOCUMENTS','%CSIDL_COMMON_FAVORITES',
+            '%CSIDL_COMMON_MUSIC','%CSIDL_COMMON_PICTURES','%CSIDL_COMMON_PROGRAMS','%CSIDL_COMMON_STARTMENU','%CSIDL_COMMON_STARTUP','%CSIDL_COMMON_TEMPLATES','%CSIDL_COMMON_VIDEO','%CSIDL_CONTROLS',
+            '%CSIDL_COOKIES','%CSIDL_DESKTOP','%CSIDL_DESKTOPDIRECTORY','%CSIDL_DRIVES','%CSIDL_FAVORITES','%CSIDL_FLAG_CREATE','%CSIDL_FONTS','%CSIDL_HISTORY',
+            '%CSIDL_INTERNET','%CSIDL_INTERNET_CACHE','%CSIDL_LOCAL_APPDATA','%CSIDL_MYDOCUMENTS','%CSIDL_MYMUSIC','%CSIDL_MYPICTURES','%CSIDL_MYVIDEO','%CSIDL_NETHOOD',
+            '%CSIDL_NETWORK','%CSIDL_PERSONAL','%CSIDL_PRINTERS','%CSIDL_PRINTHOOD','%CSIDL_PROFILE','%CSIDL_PROGRAMS','%CSIDL_PROGRAM_FILES','%CSIDL_PROGRAM_FILES_COMMON',
+            '%CSIDL_RECENT','%CSIDL_SENDTO','%CSIDL_STARTMENU','%CSIDL_STARTUP','%CSIDL_SYSTEM','%CSIDL_TEMPLATES','%CSIDL_WINDOWS','%CW_USEDEFAULT',
+            '%CYAN','%DATE_TIME_FILE_CREATION','%DATE_TIME_LAST_FILE_ACCESS','%DATE_TIME_LAST_FILE_WRITE','%DICTIONARY_MEMINFO_DATA','%DICTIONARY_MEMINFO_KEYS','%DICTIONARY_MEMINFO_TOTAL','%DICTIONARY_SORTDESCENDING',
+            '%DICTIONARY_SORTKEYS','%DSCAPS_CERTIFIED','%DSCAPS_CONTINUOUSRATE','%DSCAPS_EMULDRIVER','%DSCAPS_SECONDARY16BIT','%DSCAPS_SECONDARY8BIT','%DSCAPS_SECONDARYMONO','%DSCAPS_SECONDARYSTEREO',
+            '%DSCCAPS_CERTIFIED','%DSCCAPS_EMULDRIVER','%DS_3DLOOK','%DS_ABSALIGN','%DS_CENTER','%DS_CENTERMOUSE','%DS_CONTEXTHELP','%DS_CONTROL',
+            '%DS_MODALFRAME','%DS_NOFAILCREATE','%DS_SETFONT','%DS_SETFOREGROUND','%DS_SYSMODAL','%DTM_FIRST','%DTM_GETMCCOLOR','%DTM_GETMCFONT',
+            '%DTM_GETMONTHCAL','%DTM_GETRANGE','%DTM_GETSYSTEMTIME','%DTM_SETFORMAT','%DTM_SETFORMATW','%DTM_SETMCCOLOR','%DTM_SETMCFONT','%DTM_SETRANGE',
+            '%DTM_SETSYSTEMTIME','%DTN_CLOSEUP','%DTN_DATETIMECHANGE','%DTN_DROPDOWN','%DTN_FORMAT','%DTN_FORMATQUERY','%DTN_FORMATQUERYW','%DTN_FORMATW',
+            '%DTN_USERSTRING','%DTN_USERSTRINGW','%DTN_WMKEYDOWN','%DTN_WMKEYDOWNW','%DTS_APPCANPARSE','%DTS_LONGDATEFORMAT','%DTS_RIGHTALIGN','%DTS_SHORTDATECENTURYFORMAT',
+            '%DTS_SHORTDATEFORMAT','%DTS_SHOWNONE','%DTS_TIMEFORMAT','%DTS_UPDOWN','%DT_DATE_CENTURY','%DT_DATE_OK','%DT_DAY_IN_YEAR','%DT_DIFF_IN_DAYS',
+            '%DT_DIFF_IN_HOURS','%DT_DIFF_IN_MINUTES','%DT_DIFF_IN_SECONDS','%DT_HOURS_IN_DAY','%DT_MINUTES_IN_HOUR','%DT_SECONDS_IN_DAY','%DT_SECONDS_IN_HOUR','%DT_SECONDS_IN_MINUTE',
+            '%DT_SECONDS_IN_YEAR','%DT_USE_LONG_FORM','%DT_USE_SHORT_FORM','%DT_WRONG_DATE','%DT_WRONG_DAY','%DT_WRONG_MONTH','%ECM_FIRST','%ECOOP_AND',
+            '%ECOOP_OR','%ECOOP_SET','%ECOOP_XOR','%ECO_AUTOHSCROLL','%ECO_AUTOVSCROLL','%ECO_AUTOWORDSELECTION','%ECO_NOHIDESEL','%ECO_READONLY',
+            '%ECO_SELECTIONBAR','%ECO_WANTRETURN','%EM_AUTOURLDETECT','%EM_CANPASTE','%EM_CANREDO','%EM_CANUNDO','%EM_CHARFROMPOS','%EM_DISPLAYBAND',
+            '%EM_EMPTYUNDOBUFFER','%EM_EXGETSEL','%EM_EXLIMITTEXT','%EM_EXLINEFROMCHAR','%EM_EXSETSEL','%EM_FINDTEXT','%EM_FINDTEXTEX','%EM_FINDWORDBREAK',
+            '%EM_FMTLINES','%EM_FORMATRANGE','%EM_GETAUTOURLDETECT','%EM_GETCHARFORMAT','%EM_GETEDITSTYLE','%EM_GETEVENTMASK','%EM_GETFIRSTVISIBLELINE','%EM_GETHANDLE',
+            '%EM_GETIMESTATUS','%EM_GETLIMITTEXT','%EM_GETLINE','%EM_GETLINECOUNT','%EM_GETMARGINS','%EM_GETMODIFY','%EM_GETOLEINTERFACE','%EM_GETOPTIONS',
+            '%EM_GETPARAFORMAT','%EM_GETPASSWORDCHAR','%EM_GETRECT','%EM_GETREDONAME','%EM_GETSCROLLPOS','%EM_GETSEL','%EM_GETSELTEXT','%EM_GETTEXTMODE',
+            '%EM_GETTEXTRANGE','%EM_GETTHUMB','%EM_GETUNDONAME','%EM_GETWORDBREAKPROC','%EM_GETWORDBREAKPROCEX','%EM_HIDESELECTION','%EM_LIMITTEXT','%EM_LINEFROMCHAR',
+            '%EM_LINEINDEX','%EM_LINELENGTH','%EM_LINESCROLL','%EM_PASTESPECIAL','%EM_POSFROMCHAR','%EM_REDO','%EM_REPLACESEL','%EM_REQUESTRESIZE',
+            '%EM_SCROLL','%EM_SCROLLCARET','%EM_SELECTIONTYPE','%EM_SETBKGNDCOLOR','%EM_SETCHARFORMAT','%EM_SETEDITSTYLE','%EM_SETEVENTMASK','%EM_SETHANDLE',
+            '%EM_SETIMESTATUS','%EM_SETLIMITTEXT','%EM_SETMARGINS','%EM_SETMODIFY','%EM_SETOLECALLBACK','%EM_SETOPTIONS','%EM_SETPARAFORMAT','%EM_SETPASSWORDCHAR',
+            '%EM_SETREADONLY','%EM_SETRECT','%EM_SETRECTNP','%EM_SETSCROLLPOS','%EM_SETSEL','%EM_SETTABSTOPS','%EM_SETTARGETDEVICE','%EM_SETTEXTMODE',
+            '%EM_SETUNDOLIMIT','%EM_SETWORDBREAKPROC','%EM_SETWORDBREAKPROCEX','%EM_SETWORDWRAPMODE','%EM_SETZOOM','%EM_STOPGROUPTYPING','%EM_STREAMIN','%EM_STREAMOUT',
+            '%EM_UNDO','%ENM_CHANGE','%ENM_CORRECTTEXT','%ENM_DRAGDROPDONE','%ENM_DROPFILES','%ENM_KEYEVENTS','%ENM_MOUSEEVENTS','%ENM_NONE',
+            '%ENM_PARAGRAPHEXPANDED','%ENM_PROTECTED','%ENM_REQUESTRESIZE','%ENM_SCROLL','%ENM_SCROLLEVENTS','%ENM_SELCHANGE','%ENM_UPDATE','%EN_CHANGE',
+            '%EN_MSGFILTER','%EN_SELCHANGE','%EN_UPDATE','%ES_AUTOHSCROLL','%ES_AUTOVSCROLL','%ES_CENTER','%ES_DISABLENOSCROLL','%ES_EX_NOCALLOLEINIT',
+            '%ES_LEFT','%ES_LOWERCASE','%ES_MULTILINE','%ES_NOHIDESEL','%ES_NOOLEDRAGDROP','%ES_NUMBER','%ES_OEMCONVERT','%ES_PASSWORD',
+            '%ES_READONLY','%ES_RIGHT','%ES_SAVESEL','%ES_SELECTIONBAR','%ES_SUNKEN','%ES_UPPERCASE','%ES_WANTRETURN','%EVAL_EXEC_STRING',
+            '%FALSE','%FILE_ADDPATH','%FILE_ARCHIVE','%FILE_BUILDVERSION','%FILE_HIDDEN','%FILE_MAJORVERSION','%FILE_MINORVERSION','%FILE_NORMAL',
+            '%FILE_READONLY','%FILE_REVISIONVERSION','%FILE_SUBDIR','%FILE_SYSTEM','%FILE_VLABEL','%FTP_GET_CONNECT_STATUS','%FTP_GET_FILE_BYTES_RCVD','%FTP_GET_FILE_BYTES_SENT',
+            '%FTP_GET_LAST_RESPONSE','%FTP_GET_LOCAL_IP','%FTP_GET_SERVER_IP','%FTP_GET_TOTAL_BYTES_RCVD','%FTP_GET_TOTAL_BYTES_SENT','%FTP_LIST_FULLLIST','%FTP_LIST_FULLLISTDIR','%FTP_LIST_FULLLISTFILE',
+            '%FTP_SET_ASYNC','%FTP_SET_CONNECT_WAIT','%FTP_SET_MAX_LISTEN_WAIT','%FTP_SET_MAX_RESPONSE_WAIT','%FTP_SET_PASSIVE','%FTP_SET_SYNC','%FW_BLACK','%FW_BOLD',
+            '%FW_DEMIBOLD','%FW_DONTCARE','%FW_EXTRABOLD','%FW_EXTRALIGHT','%FW_HEAVY','%FW_LIGHT','%FW_MEDIUM','%FW_NORMAL',
+            '%FW_REGULAR','%FW_SEMIBOLD','%FW_THIN','%FW_ULTRABOLD','%FW_ULTRALIGHT','%GDTR_MAX','%GDTR_MIN','%GLU_AUTO_LOAD_MATRIX',
+            '%GLU_BEGIN','%GLU_CCW','%GLU_CULLING','%GLU_CW','%GLU_DISPLAY_MODE','%GLU_DOMAIN_DISTANCE','%GLU_EDGE_FLAG','%GLU_END',
+            '%GLU_ERROR','%GLU_EXTENSIONS','%GLU_EXTERIOR','%GLU_FALSE','%GLU_FILL','%GLU_FLAT','%GLU_INCOMPATIBLE_GL_VERSION','%GLU_INSIDE',
+            '%GLU_INTERIOR','%GLU_INVALID_ENUM','%GLU_INVALID_VALUE','%GLU_LINE','%GLU_MAP1_TRIM_2','%GLU_MAP1_TRIM_3','%GLU_NONE','%GLU_NURBS_ERROR1',
+            '%GLU_NURBS_ERROR10','%GLU_NURBS_ERROR11','%GLU_NURBS_ERROR12','%GLU_NURBS_ERROR13','%GLU_NURBS_ERROR14','%GLU_NURBS_ERROR15','%GLU_NURBS_ERROR16','%GLU_NURBS_ERROR17',
+            '%GLU_NURBS_ERROR18','%GLU_NURBS_ERROR19','%GLU_NURBS_ERROR2','%GLU_NURBS_ERROR20','%GLU_NURBS_ERROR21','%GLU_NURBS_ERROR22','%GLU_NURBS_ERROR23','%GLU_NURBS_ERROR24',
+            '%GLU_NURBS_ERROR25','%GLU_NURBS_ERROR26','%GLU_NURBS_ERROR27','%GLU_NURBS_ERROR28','%GLU_NURBS_ERROR29','%GLU_NURBS_ERROR3','%GLU_NURBS_ERROR30','%GLU_NURBS_ERROR31',
+            '%GLU_NURBS_ERROR32','%GLU_NURBS_ERROR33','%GLU_NURBS_ERROR34','%GLU_NURBS_ERROR35','%GLU_NURBS_ERROR36','%GLU_NURBS_ERROR37','%GLU_NURBS_ERROR4','%GLU_NURBS_ERROR5',
+            '%GLU_NURBS_ERROR6','%GLU_NURBS_ERROR7','%GLU_NURBS_ERROR8','%GLU_NURBS_ERROR9','%GLU_OUTLINE_PATCH','%GLU_OUTLINE_POLYGON','%GLU_OUTSIDE','%GLU_OUT_OF_MEMORY',
+            '%GLU_PARAMETRIC_ERROR','%GLU_PARAMETRIC_TOLERANCE','%GLU_PATH_LENGTH','%GLU_POINT','%GLU_SAMPLING_METHOD','%GLU_SAMPLING_TOLERANCE','%GLU_SILHOUETTE','%GLU_SMOOTH',
+            '%GLU_TESS_BEGIN','%GLU_TESS_BEGIN_DATA','%GLU_TESS_BOUNDARY_ONLY','%GLU_TESS_COMBINE','%GLU_TESS_COMBINE_DATA','%GLU_TESS_COORD_TOO_LARGE','%GLU_TESS_EDGE_FLAG','%GLU_TESS_EDGE_FLAG_DATA',
+            '%GLU_TESS_END','%GLU_TESS_END_DATA','%GLU_TESS_ERROR','%GLU_TESS_ERROR1','%GLU_TESS_ERROR2','%GLU_TESS_ERROR3','%GLU_TESS_ERROR4','%GLU_TESS_ERROR5',
+            '%GLU_TESS_ERROR6','%GLU_TESS_ERROR7','%GLU_TESS_ERROR8','%GLU_TESS_ERROR_DATA','%GLU_TESS_MISSING_BEGIN_CONTOUR','%GLU_TESS_MISSING_BEGIN_POLYGON','%GLU_TESS_MISSING_END_CONTOUR','%GLU_TESS_MISSING_END_POLYGON',
+            '%GLU_TESS_NEED_COMBINE_CALLBACK','%GLU_TESS_TOLERANCE','%GLU_TESS_VERTEX','%GLU_TESS_VERTEX_DATA','%GLU_TESS_WINDING_ABS_GEQ_TWO','%GLU_TESS_WINDING_NEGATIVE','%GLU_TESS_WINDING_NONZERO','%GLU_TESS_WINDING_ODD',
+            '%GLU_TESS_WINDING_POSITIVE','%GLU_TESS_WINDING_RULE','%GLU_TRUE','%GLU_UNKNOWN','%GLU_U_STEP','%GLU_VERSION','%GLU_VERSION_1_1','%GLU_VERSION_1_2',
+            '%GLU_VERTEX','%GLU_V_STEP','%GL_2D','%GL_2_BYTES','%GL_3D','%GL_3D_COLOR','%GL_3D_COLOR_TEXTURE','%GL_3_BYTES',
+            '%GL_4D_COLOR_TEXTURE','%GL_4_BYTES','%GL_ABGR_EXT','%GL_ACCUM','%GL_ACCUM_ALPHA_BITS','%GL_ACCUM_BLUE_BITS','%GL_ACCUM_BUFFER_BIT','%GL_ACCUM_CLEAR_VALUE',
+            '%GL_ACCUM_GREEN_BITS','%GL_ACCUM_RED_BITS','%GL_ADD','%GL_ALL_ATTRIB_BITS','%GL_ALPHA','%GL_ALPHA12','%GL_ALPHA16','%GL_ALPHA4',
+            '%GL_ALPHA8','%GL_ALPHA_BIAS','%GL_ALPHA_BITS','%GL_ALPHA_SCALE','%GL_ALPHA_TEST','%GL_ALPHA_TEST_FUNC','%GL_ALPHA_TEST_REF','%GL_ALWAYS',
+            '%GL_AMBIENT','%GL_AMBIENT_AND_DIFFUSE','%GL_AND','%GL_AND_INVERTED','%GL_AND_REVERSE','%GL_ARRAY_ELEMENT_LOCK_COUNT_EXT','%GL_ARRAY_ELEMENT_LOCK_FIRST_EXT','%GL_ATTRIB_STACK_DEPTH',
+            '%GL_AUTO_NORMAL','%GL_AUX0','%GL_AUX1','%GL_AUX2','%GL_AUX3','%GL_AUX_BUFFERS','%GL_BACK','%GL_BACK_LEFT',
+            '%GL_BACK_RIGHT','%GL_BGRA_EXT','%GL_BGR_EXT','%GL_BITMAP','%GL_BITMAP_TOKEN','%GL_BLEND','%GL_BLEND_COLOR_EXT','%GL_BLEND_DST',
+            '%GL_BLEND_EQUATION_EXT','%GL_BLEND_SRC','%GL_BLUE','%GL_BLUE_BIAS','%GL_BLUE_BITS','%GL_BLUE_SCALE','%GL_BYTE','%GL_C3F_V3F',
+            '%GL_C4F_N3F_V3F','%GL_C4UB_V2F','%GL_C4UB_V3F','%GL_CCW','%GL_CLAMP','%GL_CLEAR','%GL_CLIENT_ALL_ATTRIB_BITS','%GL_CLIENT_ATTRIB_STACK_DEPTH',
+            '%GL_CLIENT_PIXEL_STORE_BIT','%GL_CLIENT_VERTEX_ARRAY_BIT','%GL_CLIP_PLANE0','%GL_CLIP_PLANE1','%GL_CLIP_PLANE2','%GL_CLIP_PLANE3','%GL_CLIP_PLANE4','%GL_CLIP_PLANE5',
+            '%GL_CLIP_VOLUME_CLIPPING_HINT_EXT','%GL_COEFF','%GL_COLOR','%GL_COLOR_ARRAY','%GL_COLOR_ARRAY_COUNT_EXT','%GL_COLOR_ARRAY_EXT','%GL_COLOR_ARRAY_POINTER','%GL_COLOR_ARRAY_POINTER_EXT',
+            '%GL_COLOR_ARRAY_SIZE','%GL_COLOR_ARRAY_SIZE_EXT','%GL_COLOR_ARRAY_STRIDE','%GL_COLOR_ARRAY_STRIDE_EXT','%GL_COLOR_ARRAY_TYPE','%GL_COLOR_ARRAY_TYPE_EXT','%GL_COLOR_BUFFER_BIT','%GL_COLOR_CLEAR_VALUE',
+            '%GL_COLOR_INDEX','%GL_COLOR_INDEX12_EXT','%GL_COLOR_INDEX16_EXT','%GL_COLOR_INDEX1_EXT','%GL_COLOR_INDEX2_EXT','%GL_COLOR_INDEX4_EXT','%GL_COLOR_INDEX8_EXT','%GL_COLOR_INDEXES',
+            '%GL_COLOR_LOGIC_OP','%GL_COLOR_MATERIAL','%GL_COLOR_MATERIAL_FACE','%GL_COLOR_MATERIAL_PARAMETER','%GL_COLOR_SUM_EXT','%GL_COLOR_TABLE_ALPHA_SIZE_EXT','%GL_COLOR_TABLE_BIAS_EXT','%GL_COLOR_TABLE_BLUE_SIZE_EXT',
+            '%GL_COLOR_TABLE_EXT','%GL_COLOR_TABLE_FORMAT_EXT','%GL_COLOR_TABLE_GREEN_SIZE_EXT','%GL_COLOR_TABLE_INTENSITY_SIZE_EXT','%GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','%GL_COLOR_TABLE_RED_SIZE_EXT','%GL_COLOR_TABLE_SCALE_EXT','%GL_COLOR_TABLE_WIDTH_EXT',
+            '%GL_COLOR_WRITEMASK','%GL_COMPILE','%GL_COMPILE_AND_EXECUTE','%GL_CONSTANT_ALPHA_EXT','%GL_CONSTANT_ATTENUATION','%GL_CONSTANT_COLOR_EXT','%GL_CONVOLUTION_1D_EXT','%GL_CONVOLUTION_2D_EXT',
+            '%GL_CONVOLUTION_BORDER_MODE_EXT','%GL_CONVOLUTION_FILTER_BIAS_EXT','%GL_CONVOLUTION_FILTER_SCALE_EXT','%GL_CONVOLUTION_FORMAT_EXT','%GL_CONVOLUTION_HEIGHT_EXT','%GL_CONVOLUTION_WIDTH_EXT','%GL_COPY','%GL_COPY_INVERTED',
+            '%GL_COPY_PIXEL_TOKEN','%GL_CULL_FACE','%GL_CULL_FACE_MODE','%GL_CULL_VERTEX_EXT','%GL_CULL_VERTEX_EYE_POSITION_EXT','%GL_CULL_VERTEX_OBJECT_POSITION_EXT','%GL_CURRENT_BIT','%GL_CURRENT_COLOR',
+            '%GL_CURRENT_INDEX','%GL_CURRENT_NORMAL','%GL_CURRENT_RASTER_COLOR','%GL_CURRENT_RASTER_DISTANCE','%GL_CURRENT_RASTER_INDEX','%GL_CURRENT_RASTER_POSITION','%GL_CURRENT_RASTER_POSITION_VALID','%GL_CURRENT_RASTER_TEXTURE_COORDS',
+            '%GL_CURRENT_SECONDARY_COLOR_EXT','%GL_CURRENT_TEXTURE_COORDS','%GL_CW','%GL_DECAL','%GL_DECR','%GL_DEPTH','%GL_DEPTH_BIAS','%GL_DEPTH_BITS',
+            '%GL_DEPTH_BUFFER_BIT','%GL_DEPTH_CLEAR_VALUE','%GL_DEPTH_COMPONENT','%GL_DEPTH_FUNC','%GL_DEPTH_RANGE','%GL_DEPTH_SCALE','%GL_DEPTH_TEST','%GL_DEPTH_WRITEMASK',
+            '%GL_DIFFUSE','%GL_DITHER','%GL_DOMAIN','%GL_DONT_CARE','%GL_DOUBLE','%GL_DOUBLEBUFFER','%GL_DOUBLE_EXT','%GL_DRAW_BUFFER',
+            '%GL_DRAW_PIXEL_TOKEN','%GL_DST_ALPHA','%GL_DST_COLOR','%GL_EDGE_FLAG','%GL_EDGE_FLAG_ARRAY','%GL_EDGE_FLAG_ARRAY_COUNT_EXT','%GL_EDGE_FLAG_ARRAY_EXT','%GL_EDGE_FLAG_ARRAY_POINTER',
+            '%GL_EDGE_FLAG_ARRAY_POINTER_EXT','%GL_EDGE_FLAG_ARRAY_STRIDE','%GL_EDGE_FLAG_ARRAY_STRIDE_EXT','%GL_EMISSION','%GL_ENABLE_BIT','%GL_EQUAL','%GL_EQUIV','%GL_EVAL_BIT',
+            '%GL_EXP','%GL_EXP2','%GL_EXTENSIONS','%GL_EXT_ABGR','%GL_EXT_BGRA','%GL_EXT_BLEND_COLOR','%GL_EXT_BLEND_MINMAX','%GL_EXT_BLEND_SUBTRACT',
+            '%GL_EXT_CLIP_VOLUME_HINT','%GL_EXT_COLOR_TABLE','%GL_EXT_COMPILED_VERTEX_ARRAY','%GL_EXT_CONVOLUTION','%GL_EXT_CULL_VERTEX','%GL_EXT_HISTOGRAM','%GL_EXT_PACKED_PIXELS','%GL_EXT_PALETTED_TEXTURE',
+            '%GL_EXT_POLYGON_OFFSET','%GL_EXT_SECONDARY_COLOR','%GL_EXT_SEPARATE_SPECULAR_COLOR','%GL_EXT_VERTEX_ARRAY','%GL_EYE_LINEAR','%GL_EYE_PLANE','%GL_FALSE','%GL_FASTEST',
+            '%GL_FEEDBACK','%GL_FEEDBACK_BUFFER_POINTER','%GL_FEEDBACK_BUFFER_SIZE','%GL_FEEDBACK_BUFFER_TYPE','%GL_FILL','%GL_FLAT','%GL_FLOAT','%GL_FOG',
+            '%GL_FOG_BIT','%GL_FOG_COLOR','%GL_FOG_DENSITY','%GL_FOG_END','%GL_FOG_HINT','%GL_FOG_INDEX','%GL_FOG_MODE','%GL_FOG_START',
+            '%GL_FRONT','%GL_FRONT_AND_BACK','%GL_FRONT_FACE','%GL_FRONT_LEFT','%GL_FRONT_RIGHT','%GL_FUNC_ADD_EXT','%GL_FUNC_REVERSE_SUBTRACT_EXT','%GL_FUNC_SUBTRACT_EXT',
+            '%GL_GEQUAL','%GL_GREATER','%GL_GREEN','%GL_GREEN_BIAS','%GL_GREEN_BITS','%GL_GREEN_SCALE','%GL_HINT_BIT','%GL_HISTOGRAM_ALPHA_SIZE_EXT',
+            '%GL_HISTOGRAM_BLUE_SIZE_EXT','%GL_HISTOGRAM_EXT','%GL_HISTOGRAM_FORMAT_EXT','%GL_HISTOGRAM_GREEN_SIZE_EXT','%GL_HISTOGRAM_LUMINANCE_SIZE_EXT','%GL_HISTOGRAM_RED_SIZE_EXT','%GL_HISTOGRAM_SINK_EXT','%GL_HISTOGRAM_WIDTH_EXT',
+            '%GL_INCR','%GL_INDEX_ARRAY','%GL_INDEX_ARRAY_COUNT_EXT','%GL_INDEX_ARRAY_EXT','%GL_INDEX_ARRAY_POINTER','%GL_INDEX_ARRAY_POINTER_EXT','%GL_INDEX_ARRAY_STRIDE','%GL_INDEX_ARRAY_STRIDE_EXT',
+            '%GL_INDEX_ARRAY_TYPE','%GL_INDEX_ARRAY_TYPE_EXT','%GL_INDEX_BITS','%GL_INDEX_CLEAR_VALUE','%GL_INDEX_LOGIC_OP','%GL_INDEX_MODE','%GL_INDEX_OFFSET','%GL_INDEX_SHIFT',
+            '%GL_INDEX_WRITEMASK','%GL_INT','%GL_INTENSITY','%GL_INTENSITY12','%GL_INTENSITY16','%GL_INTENSITY4','%GL_INTENSITY8','%GL_INVALID_ENUM',
+            '%GL_INVALID_OPERATION','%GL_INVALID_VALUE','%GL_INVERT','%GL_KEEP','%GL_LEFT','%GL_LEQUAL','%GL_LESS','%GL_LIGHT0',
+            '%GL_LIGHT1','%GL_LIGHT2','%GL_LIGHT3','%GL_LIGHT4','%GL_LIGHT5','%GL_LIGHT6','%GL_LIGHT7','%GL_LIGHTING',
+            '%GL_LIGHTING_BIT','%GL_LIGHT_MODEL_AMBIENT','%GL_LIGHT_MODEL_COLOR_CONTROL_EXT','%GL_LIGHT_MODEL_LOCAL_VIEWER','%GL_LIGHT_MODEL_TWO_SIDE','%GL_LINE','%GL_LINEAR','%GL_LINEAR_ATTENUATION',
+            '%GL_LINEAR_MIPMAP_LINEAR','%GL_LINEAR_MIPMAP_NEAREST','%GL_LINES','%GL_LINE_BIT','%GL_LINE_LOOP','%GL_LINE_RESET_TOKEN','%GL_LINE_SMOOTH','%GL_LINE_SMOOTH_HINT',
+            '%GL_LINE_STIPPLE','%GL_LINE_STIPPLE_PATTERN','%GL_LINE_STIPPLE_REPEAT','%GL_LINE_STRIP','%GL_LINE_TOKEN','%GL_LINE_WIDTH','%GL_LINE_WIDTH_GRANULARITY','%GL_LINE_WIDTH_RANGE',
+            '%GL_LIST_BASE','%GL_LIST_BIT','%GL_LIST_INDEX','%GL_LIST_MODE','%GL_LOAD','%GL_LOGIC_OP','%GL_LOGIC_OP_MODE','%GL_LUMINANCE',
+            '%GL_LUMINANCE12','%GL_LUMINANCE12_ALPHA12','%GL_LUMINANCE12_ALPHA4','%GL_LUMINANCE16','%GL_LUMINANCE16_ALPHA16','%GL_LUMINANCE4','%GL_LUMINANCE4_ALPHA4','%GL_LUMINANCE6_ALPHA2',
+            '%GL_LUMINANCE8','%GL_LUMINANCE8_ALPHA8','%GL_LUMINANCE_ALPHA','%GL_MAP1_COLOR_4','%GL_MAP1_GRID_DOMAIN','%GL_MAP1_GRID_SEGMENTS','%GL_MAP1_INDEX','%GL_MAP1_NORMAL',
+            '%GL_MAP1_TEXTURE_COORD_1','%GL_MAP1_TEXTURE_COORD_2','%GL_MAP1_TEXTURE_COORD_3','%GL_MAP1_TEXTURE_COORD_4','%GL_MAP1_VERTEX_3','%GL_MAP1_VERTEX_4','%GL_MAP2_COLOR_4','%GL_MAP2_GRID_DOMAIN',
+            '%GL_MAP2_GRID_SEGMENTS','%GL_MAP2_INDEX','%GL_MAP2_NORMAL','%GL_MAP2_TEXTURE_COORD_1','%GL_MAP2_TEXTURE_COORD_2','%GL_MAP2_TEXTURE_COORD_3','%GL_MAP2_TEXTURE_COORD_4','%GL_MAP2_VERTEX_3',
+            '%GL_MAP2_VERTEX_4','%GL_MAP_COLOR','%GL_MAP_STENCIL','%GL_MATRIX_MODE','%GL_MAX_ATTRIB_STACK_DEPTH','%GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','%GL_MAX_CLIP_PLANES','%GL_MAX_CONVOLUTION_HEIGHT_EXT',
+            '%GL_MAX_CONVOLUTION_WIDTH_EXT','%GL_MAX_EVAL_ORDER','%GL_MAX_EXT','%GL_MAX_LIGHTS','%GL_MAX_LIST_NESTING','%GL_MAX_MODELVIEW_STACK_DEPTH','%GL_MAX_NAME_STACK_DEPTH','%GL_MAX_PIXEL_MAP_TABLE',
+            '%GL_MAX_PROJECTION_STACK_DEPTH','%GL_MAX_TEXTURE_SIZE','%GL_MAX_TEXTURE_STACK_DEPTH','%GL_MAX_VIEWPORT_DIMS','%GL_MINMAX_EXT','%GL_MINMAX_FORMAT_EXT','%GL_MINMAX_SINK_EXT','%GL_MIN_EXT',
+            '%GL_MODELVIEW','%GL_MODELVIEW_MATRIX','%GL_MODELVIEW_STACK_DEPTH','%GL_MODULATE','%GL_MULT','%GL_N3F_V3F','%GL_NAME_STACK_DEPTH','%GL_NAND',
+            '%GL_NEAREST','%GL_NEAREST_MIPMAP_LINEAR','%GL_NEAREST_MIPMAP_NEAREST','%GL_NEVER','%GL_NICEST','%GL_NONE','%GL_NOOP','%GL_NOR',
+            '%GL_NORMALIZE','%GL_NORMAL_ARRAY','%GL_NORMAL_ARRAY_COUNT_EXT','%GL_NORMAL_ARRAY_EXT','%GL_NORMAL_ARRAY_POINTER','%GL_NORMAL_ARRAY_POINTER_EXT','%GL_NORMAL_ARRAY_STRIDE','%GL_NORMAL_ARRAY_STRIDE_EXT',
+            '%GL_NORMAL_ARRAY_TYPE','%GL_NORMAL_ARRAY_TYPE_EXT','%GL_NOTEQUAL','%GL_NO_ERROR','%GL_OBJECT_LINEAR','%GL_OBJECT_PLANE','%GL_ONE','%GL_ONE_MINUS_CONSTANT_ALPHA_EXT',
+            '%GL_ONE_MINUS_CONSTANT_COLOR_EXT','%GL_ONE_MINUS_DST_ALPHA','%GL_ONE_MINUS_DST_COLOR','%GL_ONE_MINUS_SRC_ALPHA','%GL_ONE_MINUS_SRC_COLOR','%GL_OR','%GL_ORDER','%GL_OR_INVERTED',
+            '%GL_OR_REVERSE','%GL_OUT_OF_MEMORY','%GL_PACK_ALIGNMENT','%GL_PACK_LSB_FIRST','%GL_PACK_ROW_LENGTH','%GL_PACK_SKIP_PIXELS','%GL_PACK_SKIP_ROWS','%GL_PACK_SWAP_BYTES',
+            '%GL_PASS_THROUGH_TOKEN','%GL_PERSPECTIVE_CORRECTION_HINT','%GL_PIXEL_MAP_A_TO_A','%GL_PIXEL_MAP_A_TO_A_SIZE','%GL_PIXEL_MAP_B_TO_B','%GL_PIXEL_MAP_B_TO_B_SIZE','%GL_PIXEL_MAP_G_TO_G','%GL_PIXEL_MAP_G_TO_G_SIZE',
+            '%GL_PIXEL_MAP_I_TO_A','%GL_PIXEL_MAP_I_TO_A_SIZE','%GL_PIXEL_MAP_I_TO_B','%GL_PIXEL_MAP_I_TO_B_SIZE','%GL_PIXEL_MAP_I_TO_G','%GL_PIXEL_MAP_I_TO_G_SIZE','%GL_PIXEL_MAP_I_TO_I','%GL_PIXEL_MAP_I_TO_I_SIZE',
+            '%GL_PIXEL_MAP_I_TO_R','%GL_PIXEL_MAP_I_TO_R_SIZE','%GL_PIXEL_MAP_R_TO_R','%GL_PIXEL_MAP_R_TO_R_SIZE','%GL_PIXEL_MAP_S_TO_S','%GL_PIXEL_MAP_S_TO_S_SIZE','%GL_PIXEL_MODE_BIT','%GL_POINT',
+            '%GL_POINTS','%GL_POINT_BIT','%GL_POINT_SIZE','%GL_POINT_SIZE_GRANULARITY','%GL_POINT_SIZE_RANGE','%GL_POINT_SMOOTH','%GL_POINT_SMOOTH_HINT','%GL_POINT_TOKEN',
+            '%GL_POLYGON','%GL_POLYGON_BIT','%GL_POLYGON_MODE','%GL_POLYGON_OFFSET_BIAS_EXT','%GL_POLYGON_OFFSET_EXT','%GL_POLYGON_OFFSET_FACTOR','%GL_POLYGON_OFFSET_FACTOR_EXT','%GL_POLYGON_OFFSET_FILL',
+            '%GL_POLYGON_OFFSET_LINE','%GL_POLYGON_OFFSET_POINT','%GL_POLYGON_OFFSET_UNITS','%GL_POLYGON_SMOOTH','%GL_POLYGON_SMOOTH_HINT','%GL_POLYGON_STIPPLE','%GL_POLYGON_STIPPLE_BIT','%GL_POLYGON_TOKEN',
+            '%GL_POSITION','%GL_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_ALPHA_BIAS_EXT','%GL_POST_CONVOLUTION_ALPHA_SCALE_EXT','%GL_POST_CONVOLUTION_BLUE_BIAS_EXT','%GL_POST_CONVOLUTION_BLUE_SCALE_EXT','%GL_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_GREEN_BIAS_EXT',
+            '%GL_POST_CONVOLUTION_GREEN_SCALE_EXT','%GL_POST_CONVOLUTION_RED_BIAS_EXT','%GL_POST_CONVOLUTION_RED_SCALE_EXT','%GL_PROJECTION','%GL_PROJECTION_MATRIX','%GL_PROJECTION_STACK_DEPTH','%GL_PROXY_COLOR_TABLE_EXT','%GL_PROXY_HISTOGRAM_EXT',
+            '%GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_PROXY_TEXTURE_1D','%GL_PROXY_TEXTURE_2D','%GL_Q','%GL_QUADRATIC_ATTENUATION','%GL_QUADS','%GL_QUAD_STRIP',
+            '%GL_R','%GL_R3_G3_B2','%GL_READ_BUFFER','%GL_RED','%GL_REDUCE_EXT','%GL_RED_BIAS','%GL_RED_BITS','%GL_RED_SCALE',
+            '%GL_RENDER','%GL_RENDERER','%GL_RENDER_MODE','%GL_REPEAT','%GL_REPLACE','%GL_RETURN','%GL_RGB','%GL_RGB10',
+            '%GL_RGB10_A2','%GL_RGB12','%GL_RGB16','%GL_RGB4','%GL_RGB5','%GL_RGB5_A1','%GL_RGB8','%GL_RGBA',
+            '%GL_RGBA12','%GL_RGBA16','%GL_RGBA2','%GL_RGBA4','%GL_RGBA8','%GL_RGBA_MODE','%GL_RIGHT','%GL_S',
+            '%GL_SCISSOR_BIT','%GL_SCISSOR_BOX','%GL_SCISSOR_TEST','%GL_SECONDARY_COLOR_ARRAY_EXT','%GL_SECONDARY_COLOR_ARRAY_POINTER_EXT','%GL_SECONDARY_COLOR_ARRAY_SIZE_EXT','%GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT','%GL_SECONDARY_COLOR_ARRAY_TYPE_EXT',
+            '%GL_SELECT','%GL_SELECTION_BUFFER_POINTER','%GL_SELECTION_BUFFER_SIZE','%GL_SEPARABLE_2D_EXT','%GL_SEPARATE_SPECULAR_COLOR_EXT','%GL_SET','%GL_SHADE_MODEL','%GL_SHININESS',
+            '%GL_SHORT','%GL_SINGLE_COLOR_EXT','%GL_SMOOTH','%GL_SPECULAR','%GL_SPHERE_MAP','%GL_SPOT_CUTOFF','%GL_SPOT_DIRECTION','%GL_SPOT_EXPONENT',
+            '%GL_SRC_ALPHA','%GL_SRC_ALPHA_SATURATE','%GL_SRC_COLOR','%GL_STACK_OVERFLOW','%GL_STACK_UNDERFLOW','%GL_STENCIL','%GL_STENCIL_BITS','%GL_STENCIL_BUFFER_BIT',
+            '%GL_STENCIL_CLEAR_VALUE','%GL_STENCIL_FAIL','%GL_STENCIL_FUNC','%GL_STENCIL_INDEX','%GL_STENCIL_PASS_DEPTH_FAIL','%GL_STENCIL_PASS_DEPTH_PASS','%GL_STENCIL_REF','%GL_STENCIL_TEST',
+            '%GL_STENCIL_VALUE_MASK','%GL_STENCIL_WRITEMASK','%GL_STEREO','%GL_SUBPIXEL_BITS','%GL_T','%GL_T2F_C3F_V3F','%GL_T2F_C4F_N3F_V3F','%GL_T2F_C4UB_V3F',
+            '%GL_T2F_N3F_V3F','%GL_T2F_V3F','%GL_T4F_C4F_N3F_V4F','%GL_T4F_V4F','%GL_TABLE_TOO_LARGE_EXT','%GL_TEXTURE','%GL_TEXTURE_1D','%GL_TEXTURE_2D',
+            '%GL_TEXTURE_ALPHA_SIZE','%GL_TEXTURE_BINDING_1D','%GL_TEXTURE_BINDING_2D','%GL_TEXTURE_BIT','%GL_TEXTURE_BLUE_SIZE','%GL_TEXTURE_BORDER','%GL_TEXTURE_BORDER_COLOR','%GL_TEXTURE_COMPONENTS',
+            '%GL_TEXTURE_COORD_ARRAY','%GL_TEXTURE_COORD_ARRAY_COUNT_EXT','%GL_TEXTURE_COORD_ARRAY_EXT','%GL_TEXTURE_COORD_ARRAY_POINTER','%GL_TEXTURE_COORD_ARRAY_POINTER_EXT','%GL_TEXTURE_COORD_ARRAY_SIZE','%GL_TEXTURE_COORD_ARRAY_SIZE_EXT','%GL_TEXTURE_COORD_ARRAY_STRIDE',
+            '%GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','%GL_TEXTURE_COORD_ARRAY_TYPE','%GL_TEXTURE_COORD_ARRAY_TYPE_EXT','%GL_TEXTURE_ENV','%GL_TEXTURE_ENV_COLOR','%GL_TEXTURE_ENV_MODE','%GL_TEXTURE_GEN_MODE','%GL_TEXTURE_GEN_Q',
+            '%GL_TEXTURE_GEN_R','%GL_TEXTURE_GEN_S','%GL_TEXTURE_GEN_T','%GL_TEXTURE_GREEN_SIZE','%GL_TEXTURE_HEIGHT','%GL_TEXTURE_INTENSITY_SIZE','%GL_TEXTURE_INTERNAL_FORMAT','%GL_TEXTURE_LUMINANCE_SIZE',
+            '%GL_TEXTURE_MAG_FILTER','%GL_TEXTURE_MATRIX','%GL_TEXTURE_MIN_FILTER','%GL_TEXTURE_PRIORITY','%GL_TEXTURE_RED_SIZE','%GL_TEXTURE_RESIDENT','%GL_TEXTURE_STACK_DEPTH','%GL_TEXTURE_WIDTH',
+            '%GL_TEXTURE_WRAP_S','%GL_TEXTURE_WRAP_T','%GL_TRANSFORM_BIT','%GL_TRIANGLES','%GL_TRIANGLE_FAN','%GL_TRIANGLE_STRIP','%GL_TRUE','%GL_UNPACK_ALIGNMENT',
+            '%GL_UNPACK_LSB_FIRST','%GL_UNPACK_ROW_LENGTH','%GL_UNPACK_SKIP_PIXELS','%GL_UNPACK_SKIP_ROWS','%GL_UNPACK_SWAP_BYTES','%GL_UNSIGNED_BYTE','%GL_UNSIGNED_BYTE_3_3_2_EXT','%GL_UNSIGNED_INT',
+            '%GL_UNSIGNED_INT_10_10_10_2_EXT','%GL_UNSIGNED_INT_8_8_8_8_EXT','%GL_UNSIGNED_SHORT','%GL_UNSIGNED_SHORT_4_4_4_4_EXT','%GL_UNSIGNED_SHORT_5_5_5_1_EXT','%GL_V2F','%GL_V3F','%GL_VENDOR',
+            '%GL_VERSION','%GL_VERSION_1_1','%GL_VERTEX_ARRAY','%GL_VERTEX_ARRAY_COUNT_EXT','%GL_VERTEX_ARRAY_EXT','%GL_VERTEX_ARRAY_POINTER','%GL_VERTEX_ARRAY_POINTER_EXT','%GL_VERTEX_ARRAY_SIZE',
+            '%GL_VERTEX_ARRAY_SIZE_EXT','%GL_VERTEX_ARRAY_STRIDE','%GL_VERTEX_ARRAY_STRIDE_EXT','%GL_VERTEX_ARRAY_TYPE','%GL_VERTEX_ARRAY_TYPE_EXT','%GL_VIEWPORT','%GL_VIEWPORT_BIT','%GL_WIN_SWAP_HINT',
+            '%GL_XOR','%GL_ZERO','%GL_ZOOM_X','%GL_ZOOM_Y','%GRAY','%GREEN','%GWLP_HINSTANCE','%GWLP_HWNDPARENT',
+            '%GWLP_ID','%GWLP_USERDATA','%GWLP_WNDPROC','%GWL_EXSTYLE','%GWL_HINSTANCE','%GWL_HWNDPARENT','%GWL_ID','%GWL_STYLE',
+            '%GWL_USERDATA','%GWL_WNDPROC','%HDM_FIRST','%HTCAPTION','%HWND_BOTTOM','%HWND_DESKTOP','%HWND_MESSAGE','%HWND_NOTOPMOST',
+            '%HWND_TOP','%HWND_TOPMOST','%ICRYPTO_XOR_DECREASE','%ICRYPTO_XOR_INCREASE','%ICRYPTO_XOR_NORMAL','%IDABORT','%IDCANCEL','%IDCONTINUE',
+            '%IDIGNORE','%IDNO','%IDOK','%IDRETRY','%IDTIMEOUT','%IDTRYAGAIN','%IDYES','%INTERNET_CONNECTION_CONFIGURED',
+            '%INTERNET_CONNECTION_LAN','%INTERNET_CONNECTION_MODEM','%INTERNET_CONNECTION_MODEM_BUSY','%INTERNET_CONNECTION_OFFLINE','%INTERNET_CONNECTION_PROXY','%INTERNET_RAS_INSTALLED','%LBN_DBLCLK','%LBN_KILLFOCUS',
+            '%LBN_SELCANCEL','%LBN_SELCHANGE','%LBN_SETFOCUS','%LBS_DISABLENOSCROLL','%LBS_EXTENDEDSEL','%LBS_MULTICOLUMN','%LBS_MULTIPLESEL','%LBS_NOINTEGRALHEIGHT',
+            '%LBS_NOSEL','%LBS_NOTIFY','%LBS_SORT','%LBS_STANDARD','%LBS_USETABSTOPS','%LB_ADDFILE','%LB_ADDSTRING','%LB_DELETESTRING',
+            '%LB_DIR','%LB_FINDSTRING','%LB_FINDSTRINGEXACT','%LB_GETANCHORINDEX','%LB_GETCARETINDEX','%LB_GETCOUNT','%LB_GETCURSEL','%LB_GETHORIZONTALEXTENT',
+            '%LB_GETITEMDATA','%LB_GETITEMHEIGHT','%LB_GETITEMRECT','%LB_GETLISTBOXINFO','%LB_GETLOCALE','%LB_GETSEL','%LB_GETSELCOUNT','%LB_GETSELITEMS',
+            '%LB_GETTEXT','%LB_GETTEXTLEN','%LB_GETTOPINDEX','%LB_INITSTORAGE','%LB_INSERTSTRING','%LB_ITEMFROMPOINT','%LB_MULTIPLEADDSTRING','%LB_RESETCONTENT',
+            '%LB_SELECTSTRING','%LB_SELITEMRANGE','%LB_SELITEMRANGEEX','%LB_SETANCHORINDEX','%LB_SETCARETINDEX','%LB_SETCOLUMNWIDTH','%LB_SETCOUNT','%LB_SETCURSEL',
+            '%LB_SETHORIZONTALEXTENT','%LB_SETITEMDATA','%LB_SETITEMHEIGHT','%LB_SETLOCALE','%LB_SETSEL','%LB_SETTABSTOPS','%LB_SETTOPINDEX','%LF_FACESIZE',
+            '%LTGRAY','%LVM_FIRST','%LWA_ALPHA','%LWA_COLORKEY','%MAGENTA','%MAXBYTE','%MAXCHAR','%MAXDWORD',
+            '%MAXSHORT','%MAXWORD','%MAX_PATH','%MB_ABORTRETRYIGNORE','%MB_APPLMODAL','%MB_CANCELTRYCONTINUE','%MB_DEFBUTTON1','%MB_DEFBUTTON2',
+            '%MB_DEFBUTTON3','%MB_HELP','%MB_ICONASTERISK','%MB_ICONERROR','%MB_ICONEXCLAMATION','%MB_ICONHAND','%MB_ICONINFORMATION','%MB_ICONQUESTION',
+            '%MB_ICONSTOP','%MB_ICONWARNING','%MB_OK','%MB_OKCANCEL','%MB_RETRYCANCEL','%MB_SIMPLE','%MB_SYSTEMMODAL','%MB_TOPMOST',
+            '%MB_YESNO','%MB_YESNOCANCEL','%MF_CHECKED','%MF_DISABLED','%MF_ENABLED','%MF_GRAYED','%MF_SEPARATOR','%MF_UNCHECKED',
+            '%MINCHAR','%MINLONG','%MINSHORT','%NULL','%ODBC352_INC','%ODBCVER','%ODBC_ADD_DSN','%ODBC_ADD_SYS_DSN',
+            '%ODBC_BOTH_DSN','%ODBC_CONFIG_DRIVER','%ODBC_CONFIG_DRIVER_MAX','%ODBC_CONFIG_DSN','%ODBC_CONFIG_SYS_DSN','%ODBC_DRIVER_VERSION','%ODBC_ERROR_COMPONENT_NOT_FOUND','%ODBC_ERROR_CREATE_DSN_FAILED',
+            '%ODBC_ERROR_GENERAL_ERR','%ODBC_ERROR_INVALID_BUFF_LEN','%ODBC_ERROR_INVALID_DSN','%ODBC_ERROR_INVALID_HWND','%ODBC_ERROR_INVALID_INF','%ODBC_ERROR_INVALID_KEYWORD_VALUE','%ODBC_ERROR_INVALID_LOG_FILE','%ODBC_ERROR_INVALID_NAME',
+            '%ODBC_ERROR_INVALID_PARAM_SEQUENCE','%ODBC_ERROR_INVALID_PATH','%ODBC_ERROR_INVALID_REQUEST_TYPE','%ODBC_ERROR_INVALID_STR','%ODBC_ERROR_LOAD_LIB_FAILED','%ODBC_ERROR_OUTPUT_STRING_TRUNCATED','%ODBC_ERROR_OUT_OF_MEM','%ODBC_ERROR_REMOVE_DSN_FAILED',
+            '%ODBC_ERROR_REQUEST_FAILED','%ODBC_ERROR_USAGE_UPDATE_FAILED','%ODBC_ERROR_USER_CANCELED','%ODBC_ERROR_WRITING_SYSINFO_FAILED','%ODBC_INSTALL_COMPLETE','%ODBC_INSTALL_DRIVER','%ODBC_INSTALL_INQUIRY','%ODBC_REMOVE_DEFAULT_DSN',
+            '%ODBC_REMOVE_DRIVER','%ODBC_REMOVE_DSN','%ODBC_REMOVE_SYS_DSN','%ODBC_SYSTEM_DSN','%ODBC_USER_DSN','%OFN_ALLOWMULTISELECT','%OFN_CREATEPROMPT','%OFN_ENABLEHOOK',
+            '%OFN_ENABLEINCLUDENOTIFY','%OFN_ENABLESIZING','%OFN_ENABLETEMPLATE','%OFN_ENABLETEMPLATEHANDLE','%OFN_EXPLORER','%OFN_EXTENSIONDIFFERENT','%OFN_FILEMUSTEXIST','%OFN_HIDEREADONLY',
+            '%OFN_LONGNAMES','%OFN_NOCHANGEDIR','%OFN_NODEREFERENCELINKS','%OFN_NOLONGNAMES','%OFN_NONETWORKBUTTON','%OFN_NOREADONLYRETURN','%OFN_NOTESTFILECREATE','%OFN_NOVALIDATE',
+            '%OFN_OVERWRITEPROMPT','%OFN_PATHMUSTEXIST','%OFN_READONLY','%OFN_SHAREAWARE','%OFN_SHOWHELP','%OS_ERROR_CALLFUNCTION','%OS_ERROR_EMPTYSTRING','%OS_ERROR_LOADLIBRARY',
+            '%OS_ERROR_SUCCESS','%OS_ERROR_WRONGPARAMETER','%OS_SHELL_ASYNC','%OS_SHELL_SYNC','%OS_WINDOWS_2K','%OS_WINDOWS_95','%OS_WINDOWS_95_OSR2','%OS_WINDOWS_98',
+            '%OS_WINDOWS_98_SE','%OS_WINDOWS_ME','%OS_WINDOWS_NT','%OS_WINDOWS_SERVER_2003','%OS_WINDOWS_SERVER_LONGHORN','%OS_WINDOWS_SERVER_LONGHORN_DC','%OS_WINDOWS_VISTA','%OS_WINDOWS_XP',
+            '%OS_WNDSTYLE_HIDE','%OS_WNDSTYLE_MAXIMIZED','%OS_WNDSTYLE_MINIMIZED','%OS_WNDSTYLE_MINIMIZEDNOFOCUS','%OS_WNDSTYLE_NORMAL','%OS_WNDSTYLE_NORMALNOFOCUS','%PATH_EXT','%PATH_FILE',
+            '%PATH_FILEEXT','%PATH_ROOT','%PATH_ROOTPATH','%PATH_ROOTPATHPROG','%PATH_ROOTPATHPROGEXT','%PBM_DELTAPOS','%PBM_GETPOS','%PBM_GETRANGE',
+            '%PBM_SETBARCOLOR','%PBM_SETBKCOLOR','%PBM_SETPOS','%PBM_SETRANGE','%PBM_SETRANGE32','%PBM_SETSTEP','%PBM_STEPIT','%PBS_SMOOTH',
+            '%PBS_VERTICAL','%PC_DISABLEWAKEEVENT_OFF','%PC_DISABLEWAKEEVENT_ON','%PC_EB_NOCONFIRMATION','%PC_EB_NOPROGRESSUI','%PC_EB_NORMAL','%PC_EB_NOSOUND','%PC_FORCECRITICAL_OFF',
+            '%PC_FORCECRITICAL_ON','%PC_HIBERNATE_OFF','%PC_HIBERNATE_ON','%PC_RD_FORCE','%PC_RD_FORCEIFHUNG','%PC_RD_LOGOFF','%PC_RD_POWEROFF','%PC_RD_REBOOT',
+            '%PC_RD_SHUTDOWN','%PC_SD_DONOT_FORCE','%PC_SD_DONOT_REBOOT','%PC_SD_FORCE','%PC_SD_REBOOT','%PFA_CENTER','%PFA_LEFT','%PFA_RIGHT',
+            '%PF_3DNOW_INSTRUCTIONS_AVAILABLE','%PF_CHANNELS_ENABLED','%PF_COMPARE64_EXCHANGE128','%PF_COMPARE_EXCHANGE128','%PF_COMPARE_EXCHANGE_DOUBLE','%PF_FLOATING_POINT_EMULATED','%PF_FLOATING_POINT_PRECISION_ERRATA','%PF_MMX_INSTRUCTIONS_AVAILABLE',
+            '%PF_NX_ENABLED','%PF_PAE_ENABLED','%PF_RDTSC_INSTRUCTION_AVAILABLE','%PF_SSE3_INSTRUCTIONS_AVAILABLE','%PF_XMMI64_INSTRUCTIONS_AVAILABLE','%PF_XMMI_INSTRUCTIONS_AVAILABLE','%PGM_FIRST','%RED',
+            '%RTF_UBB','%SAPI_SVSFDEFAULT','%SAPI_SVSFISFILENAME','%SAPI_SVSFISNOTXML','%SAPI_SVSFISXML','%SAPI_SVSFLAGSASYNC','%SAPI_SVSFNLPMASK','%SAPI_SVSFNLPSPEAKPUNC',
+            '%SAPI_SVSFPERSISTXML','%SAPI_SVSFPURGEBEFORESPEAK','%SAPI_SVSFUNUSEDFLAGS','%SAPI_SVSFVOICEMASK','%SBS_SIZEGRIP','%SB_BOTTOM','%SB_ENDSCROLL','%SB_LEFT',
+            '%SB_LINEDOWN','%SB_LINELEFT','%SB_LINERIGHT','%SB_LINEUP','%SB_PAGEDOWN','%SB_PAGELEFT','%SB_PAGERIGHT','%SB_PAGEUP',
+            '%SB_RIGHT','%SB_SETPARTS','%SB_SETTEXT','%SB_THUMBPOSITION','%SB_THUMBTRACK','%SB_TOP','%SCF_ALL','%SCF_ASSOCIATEFONT',
+            '%SCF_DEFAULT','%SCF_NOKBUPDATE','%SCF_SELECTION','%SCF_USEUIRULES','%SCF_WORD','%SC_CLOSE','%SC_CONTEXTHELP','%SC_HOTKEY',
+            '%SC_HSCROLL','%SC_KEYMENU','%SC_MAXIMIZE','%SC_MINIMIZE','%SC_MONITORPOWER','%SC_MOUSEMENU','%SC_MOVE','%SC_NEXTWINDOW',
+            '%SC_PREVWINDOW','%SC_RESTORE','%SC_SCREENSAVE','%SC_SIZE','%SC_TASKLIST','%SC_VSCROLL','%SERVICE_ACTIVE','%SERVICE_AUTO_START',
+            '%SERVICE_BOOT_START','%SERVICE_CONTINUE_PENDING','%SERVICE_DEMAND_START','%SERVICE_DISABLED','%SERVICE_DRIVER','%SERVICE_INACTIVE','%SERVICE_INFO_DISPLAY_NAME','%SERVICE_INFO_NAME',
+            '%SERVICE_PAUSED','%SERVICE_PAUSE_PENDING','%SERVICE_RUNNING','%SERVICE_START_PENDING','%SERVICE_STATE_ALL','%SERVICE_STOPPED','%SERVICE_STOP_PENDING','%SERVICE_SYSTEM_START',
+            '%SERVICE_TYPE_ALL','%SERVICE_WIN32','%SES_ALLOWBEEPS','%SES_BEEPONMAXTEXT','%SES_BIDI','%SES_EMULATE10','%SES_EMULATESYSEDIT','%SES_EXTENDBACKCOLOR',
+            '%SES_LOWERCASE','%SES_MAPCPS','%SES_NOIME','%SES_NOINPUTSEQUENCECHK','%SES_SCROLLONKILLFOCUS','%SES_UPPERCASE','%SES_USEAIMM','%SES_USECRLF',
+            '%SES_XLTCRCRLFTOCR','%SF_RTF','%SF_TEXT','%SMTP_SET_ATTACH_CONTENT_TYPE','%SMTP_SET_CONTENT_TYPE_PREFIX','%SQL_AA_FALSE','%SQL_AA_TRUE','%SQL_ACCESSIBLE_PROCEDURES',
+            '%SQL_ACCESSIBLE_TABLES','%SQL_ACCESS_MODE','%SQL_ACTIVE_CONNECTIONS','%SQL_ACTIVE_ENVIRONMENTS','%SQL_ACTIVE_STATEMENTS','%SQL_ADD','%SQL_AD_ADD_CONSTRAINT_DEFERRABLE','%SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE','%SQL_AD_ADD_DOMAIN_CONSTRAINT','%SQL_AD_ADD_DOMAIN_DEFAULT','%SQL_AD_CONSTRAINT_NAME_DEFINITION','%SQL_AD_DROP_DOMAIN_CONSTRAINT','%SQL_AD_DROP_DOMAIN_DEFAULT','%SQL_AF_ALL',
+            '%SQL_AF_AVG','%SQL_AF_COUNT','%SQL_AF_DISTINCT','%SQL_AF_MAX','%SQL_AF_MIN','%SQL_AF_SUM','%SQL_AGGREGATE_FUNCTIONS','%SQL_ALL_EXCEPT_LIKE',
+            '%SQL_ALL_TYPES','%SQL_ALTER_DOMAIN','%SQL_ALTER_TABLE','%SQL_AM_CONNECTION','%SQL_AM_NONE','%SQL_AM_STATEMENT','%SQL_API_ALL_FUNCTIONS','%SQL_API_LOADBYORDINAL',
+            '%SQL_API_ODBC3_ALL_FUNCTIONS','%SQL_API_ODBC3_ALL_FUNCTIONS_SIZE','%SQL_API_SQLALLOCCONNECT','%SQL_API_SQLALLOCENV','%SQL_API_SQLALLOCHANDLE','%SQL_API_SQLALLOCHANDLESTD','%SQL_API_SQLALLOCSTMT','%SQL_API_SQLBINDCOL',
+            '%SQL_API_SQLBINDPARAM','%SQL_API_SQLBINDPARAMETER','%SQL_API_SQLBROWSECONNECT','%SQL_API_SQLBULKOPERATIONS','%SQL_API_SQLCANCEL','%SQL_API_SQLCLOSECURSOR','%SQL_API_SQLCOLATTRIBUTE','%SQL_API_SQLCOLATTRIBUTES',
+            '%SQL_API_SQLCOLUMNPRIVILEGES','%SQL_API_SQLCOLUMNS','%SQL_API_SQLCONNECT','%SQL_API_SQLCOPYDESC','%SQL_API_SQLDATASOURCES','%SQL_API_SQLDESCRIBECOL','%SQL_API_SQLDESCRIBEPARAM','%SQL_API_SQLDISCONNECT',
+            '%SQL_API_SQLDRIVERCONNECT','%SQL_API_SQLDRIVERS','%SQL_API_SQLENDTRAN','%SQL_API_SQLERROR','%SQL_API_SQLEXECDIRECT','%SQL_API_SQLEXECUTE','%SQL_API_SQLEXTENDEDFETCH','%SQL_API_SQLFETCH',
+            '%SQL_API_SQLFETCHSCROLL','%SQL_API_SQLFOREIGNKEYS','%SQL_API_SQLFREECONNECT','%SQL_API_SQLFREEENV','%SQL_API_SQLFREEHANDLE','%SQL_API_SQLFREESTMT','%SQL_API_SQLGETCONNECTATTR','%SQL_API_SQLGETCONNECTOPTION',
+            '%SQL_API_SQLGETCURSORNAME','%SQL_API_SQLGETDATA','%SQL_API_SQLGETDESCFIELD','%SQL_API_SQLGETDESCREC','%SQL_API_SQLGETDIAGFIELD','%SQL_API_SQLGETDIAGREC','%SQL_API_SQLGETENVATTR','%SQL_API_SQLGETFUNCTIONS',
+            '%SQL_API_SQLGETINFO','%SQL_API_SQLGETSTMTATTR','%SQL_API_SQLGETSTMTOPTION','%SQL_API_SQLGETTYPEINFO','%SQL_API_SQLMORERESULTS','%SQL_API_SQLNATIVESQL','%SQL_API_SQLNUMPARAMS','%SQL_API_SQLNUMRESULTCOLS',
+            '%SQL_API_SQLPARAMDATA','%SQL_API_SQLPARAMOPTIONS','%SQL_API_SQLPREPARE','%SQL_API_SQLPRIMARYKEYS','%SQL_API_SQLPROCEDURECOLUMNS','%SQL_API_SQLPROCEDURES','%SQL_API_SQLPUTDATA','%SQL_API_SQLROWCOUNT',
+            '%SQL_API_SQLSETCONNECTATTR','%SQL_API_SQLSETCONNECTOPTION','%SQL_API_SQLSETCURSORNAME','%SQL_API_SQLSETDESCFIELD','%SQL_API_SQLSETDESCREC','%SQL_API_SQLSETENVATTR','%SQL_API_SQLSETPARAM','%SQL_API_SQLSETPOS',
+            '%SQL_API_SQLSETSCROLLOPTIONS','%SQL_API_SQLSETSTMTATTR','%SQL_API_SQLSETSTMTOPTION','%SQL_API_SQLSPECIALCOLUMNS','%SQL_API_SQLSTATISTICS','%SQL_API_SQLTABLEPRIVILEGES','%SQL_API_SQLTABLES','%SQL_API_SQLTRANSACT',
+            '%SQL_ARD_TYPE','%SQL_ASYNC_ENABLE','%SQL_ASYNC_ENABLE_DEFAULT','%SQL_ASYNC_ENABLE_OFF','%SQL_ASYNC_ENABLE_ON','%SQL_ASYNC_MODE','%SQL_ATTR_ACCESS_MODE','%SQL_ATTR_ANSI_APP',
+            '%SQL_ATTR_APP_PARAM_DESC','%SQL_ATTR_APP_ROW_DESC','%SQL_ATTR_ASYNC_ENABLE','%SQL_ATTR_AUTOCOMMIT','%SQL_ATTR_AUTO_IPD','%SQL_ATTR_CONCURRENCY','%SQL_ATTR_CONNECTION_DEAD','%SQL_ATTR_CONNECTION_POOLING',
+            '%SQL_ATTR_CONNECTION_TIMEOUT','%SQL_ATTR_CP_MATCH','%SQL_ATTR_CURRENT_CATALOG','%SQL_ATTR_CURSOR_SCROLLABLE','%SQL_ATTR_CURSOR_SENSITIVITY','%SQL_ATTR_CURSOR_TYPE','%SQL_ATTR_DISCONNECT_BEHAVIOR','%SQL_ATTR_ENABLE_AUTO_IPD',
+            '%SQL_ATTR_ENLIST_IN_DTC','%SQL_ATTR_ENLIST_IN_XA','%SQL_ATTR_FETCH_BOOKMARK_PTR','%SQL_ATTR_IMP_PARAM_DESC','%SQL_ATTR_IMP_ROW_DESC','%SQL_ATTR_KEYSET_SIZE','%SQL_ATTR_LOGIN_TIMEOUT','%SQL_ATTR_MAX_LENGTH',
+            '%SQL_ATTR_MAX_ROWS','%SQL_ATTR_METADATA_ID','%SQL_ATTR_NOSCAN','%SQL_ATTR_ODBC_CURSORS','%SQL_ATTR_ODBC_VERSION','%SQL_ATTR_OUTPUT_NTS','%SQL_ATTR_PACKET_SIZE','%SQL_ATTR_PARAMSET_SIZE',
+            '%SQL_ATTR_PARAMS_PROCESSED_PTR','%SQL_ATTR_PARAM_BIND_OFFSET_PTR','%SQL_ATTR_PARAM_BIND_TYPE','%SQL_ATTR_PARAM_OPERATION_PTR','%SQL_ATTR_PARAM_STATUS_PTR','%SQL_ATTR_QUERY_TIMEOUT','%SQL_ATTR_QUIET_MODE','%SQL_ATTR_READONLY',
+            '%SQL_ATTR_READWRITE_UNKNOWN','%SQL_ATTR_RETRIEVE_DATA','%SQL_ATTR_ROWS_FETCHED_PTR','%SQL_ATTR_ROW_ARRAY_SIZE','%SQL_ATTR_ROW_BIND_OFFSET_PTR','%SQL_ATTR_ROW_BIND_TYPE','%SQL_ATTR_ROW_NUMBER','%SQL_ATTR_ROW_OPERATION_PTR',
+            '%SQL_ATTR_ROW_STATUS_PTR','%SQL_ATTR_SIMULATE_CURSOR','%SQL_ATTR_TRACE','%SQL_ATTR_TRACEFILE','%SQL_ATTR_TRANSLATE_LIB','%SQL_ATTR_TRANSLATE_OPTION','%SQL_ATTR_TXN_ISOLATION','%SQL_ATTR_USE_BOOKMARKS',
+            '%SQL_ATTR_WRITE','%SQL_AT_ADD_COLUMN','%SQL_AT_ADD_COLUMN_COLLATION','%SQL_AT_ADD_COLUMN_DEFAULT','%SQL_AT_ADD_COLUMN_SINGLE','%SQL_AT_ADD_CONSTRAINT','%SQL_AT_ADD_TABLE_CONSTRAINT','%SQL_AT_CONSTRAINT_DEFERRABLE',
+            '%SQL_AT_CONSTRAINT_INITIALLY_DEFERRED','%SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AT_CONSTRAINT_NAME_DEFINITION','%SQL_AT_CONSTRAINT_NON_DEFERRABLE','%SQL_AT_DROP_COLUMN','%SQL_AT_DROP_COLUMN_CASCADE','%SQL_AT_DROP_COLUMN_DEFAULT','%SQL_AT_DROP_COLUMN_RESTRICT',
+            '%SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE','%SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT','%SQL_AT_SET_COLUMN_DEFAULT','%SQL_AUTOCOMMIT','%SQL_AUTOCOMMIT_DEFAULT','%SQL_AUTOCOMMIT_OFF','%SQL_AUTOCOMMIT_ON','%SQL_BATCH_ROW_COUNT',
+            '%SQL_BATCH_SUPPORT','%SQL_BEST_ROWID','%SQL_BIGINT','%SQL_BINARY','%SQL_BIND_BY_COLUMN','%SQL_BIND_TYPE','%SQL_BIND_TYPE_DEFAULT','%SQL_BIT',
+            '%SQL_BOOKMARK_PERSISTENCE','%SQL_BP_CLOSE','%SQL_BP_DELETE','%SQL_BP_DROP','%SQL_BP_OTHER_HSTMT','%SQL_BP_SCROLL','%SQL_BP_TRANSACTION','%SQL_BP_UPDATE',
+            '%SQL_BRC_EXPLICIT','%SQL_BRC_PROCEDURES','%SQL_BRC_ROLLED_UP','%SQL_BS_ROW_COUNT_EXPLICIT','%SQL_BS_ROW_COUNT_PROC','%SQL_BS_SELECT_EXPLICIT','%SQL_BS_SELECT_PROC','%SQL_CA1_ABSOLUTE',
+            '%SQL_CA1_BOOKMARK','%SQL_CA1_BULK_ADD','%SQL_CA1_BULK_DELETE_BY_BOOKMARK','%SQL_CA1_BULK_FETCH_BY_BOOKMARK','%SQL_CA1_BULK_UPDATE_BY_BOOKMARK','%SQL_CA1_LOCK_EXCLUSIVE','%SQL_CA1_LOCK_NO_CHANGE','%SQL_CA1_LOCK_UNLOCK',
+            '%SQL_CA1_NEXT','%SQL_CA1_POSITIONED_DELETE','%SQL_CA1_POSITIONED_UPDATE','%SQL_CA1_POS_DELETE','%SQL_CA1_POS_POSITION','%SQL_CA1_POS_REFRESH','%SQL_CA1_POS_UPDATE','%SQL_CA1_RELATIVE',
+            '%SQL_CA1_SELECT_FOR_UPDATE','%SQL_CA2_CRC_APPROXIMATE','%SQL_CA2_CRC_EXACT','%SQL_CA2_LOCK_CONCURRENCY','%SQL_CA2_MAX_ROWS_AFFECTS_ALL','%SQL_CA2_MAX_ROWS_CATALOG','%SQL_CA2_MAX_ROWS_DELETE','%SQL_CA2_MAX_ROWS_INSERT',
+            '%SQL_CA2_MAX_ROWS_SELECT','%SQL_CA2_MAX_ROWS_UPDATE','%SQL_CA2_OPT_ROWVER_CONCURRENCY','%SQL_CA2_OPT_VALUES_CONCURRENCY','%SQL_CA2_READ_ONLY_CONCURRENCY','%SQL_CA2_SENSITIVITY_ADDITIONS','%SQL_CA2_SENSITIVITY_DELETIONS','%SQL_CA2_SENSITIVITY_UPDATES',
+            '%SQL_CA2_SIMULATE_NON_UNIQUE','%SQL_CA2_SIMULATE_TRY_UNIQUE','%SQL_CA2_SIMULATE_UNIQUE','%SQL_CASCADE','%SQL_CATALOG_LOCATION','%SQL_CATALOG_NAME','%SQL_CATALOG_NAME_SEPARATOR','%SQL_CATALOG_TERM',
+            '%SQL_CATALOG_USAGE','%SQL_CA_CONSTRAINT_DEFERRABLE','%SQL_CA_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CA_CONSTRAINT_NON_DEFERRABLE','%SQL_CA_CREATE_ASSERTION','%SQL_CB_CLOSE','%SQL_CB_DELETE',
+            '%SQL_CB_NON_NULL','%SQL_CB_NULL','%SQL_CB_PRESERVE','%SQL_CCOL_CREATE_COLLATION','%SQL_CCS_COLLATE_CLAUSE','%SQL_CCS_CREATE_CHARACTER_SET','%SQL_CCS_LIMITED_COLLATION','%SQL_CC_CLOSE',
+            '%SQL_CC_DELETE','%SQL_CC_PRESERVE','%SQL_CDO_COLLATION','%SQL_CDO_CONSTRAINT','%SQL_CDO_CONSTRAINT_DEFERRABLE','%SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CDO_CONSTRAINT_NAME_DEFINITION',
+            '%SQL_CDO_CONSTRAINT_NON_DEFERRABLE','%SQL_CDO_CREATE_DOMAIN','%SQL_CDO_DEFAULT','%SQL_CD_FALSE','%SQL_CD_TRUE','%SQL_CHAR','%SQL_CLOSE','%SQL_CL_END',
+            '%SQL_CL_START','%SQL_CN_ANY','%SQL_CN_DIFFERENT','%SQL_CN_NONE','%SQL_CODE_DATE','%SQL_CODE_DAY','%SQL_CODE_DAY_TO_HOUR','%SQL_CODE_DAY_TO_MINUTE',
+            '%SQL_CODE_DAY_TO_SECOND','%SQL_CODE_HOUR','%SQL_CODE_HOUR_TO_MINUTE','%SQL_CODE_HOUR_TO_SECOND','%SQL_CODE_MINUTE','%SQL_CODE_MINUTE_TO_SECOND','%SQL_CODE_MONTH','%SQL_CODE_SECOND',
+            '%SQL_CODE_TIME','%SQL_CODE_TIMESTAMP','%SQL_CODE_YEAR','%SQL_CODE_YEAR_TO_MONTH','%SQL_COLATT_OPT_MAX','%SQL_COLATT_OPT_MIN','%SQL_COLLATION_SEQ','%SQL_COLUMN_ALIAS',
+            '%SQL_COLUMN_AUTO_INCREMENT','%SQL_COLUMN_CASE_SENSITIVE','%SQL_COLUMN_COUNT','%SQL_COLUMN_DISPLAY_SIZE','%SQL_COLUMN_IGNORE','%SQL_COLUMN_LABEL','%SQL_COLUMN_LENGTH','%SQL_COLUMN_MONEY',
+            '%SQL_COLUMN_NAME','%SQL_COLUMN_NULLABLE','%SQL_COLUMN_NUMBER_UNKNOWN','%SQL_COLUMN_OWNER_NAME','%SQL_COLUMN_PRECISION','%SQL_COLUMN_QUALIFIER_NAME','%SQL_COLUMN_SCALE','%SQL_COLUMN_SEARCHABLE',
+            '%SQL_COLUMN_TABLE_NAME','%SQL_COLUMN_TYPE','%SQL_COLUMN_TYPE_NAME','%SQL_COLUMN_UNSIGNED','%SQL_COLUMN_UPDATABLE','%SQL_COL_PRED_BASIC','%SQL_COL_PRED_CHAR','%SQL_COMMIT',
+            '%SQL_CONCAT_NULL_BEHAVIOR','%SQL_CONCURRENCY','%SQL_CONCUR_DEFAULT','%SQL_CONCUR_LOCK','%SQL_CONCUR_READ_ONLY','%SQL_CONCUR_ROWVER','%SQL_CONCUR_TIMESTAMP','%SQL_CONCUR_VALUES',
+            '%SQL_CONVERT_BIGINT','%SQL_CONVERT_BINARY','%SQL_CONVERT_BIT','%SQL_CONVERT_CHAR','%SQL_CONVERT_DATE','%SQL_CONVERT_DECIMAL','%SQL_CONVERT_DOUBLE','%SQL_CONVERT_FLOAT',
+            '%SQL_CONVERT_FUNCTIONS','%SQL_CONVERT_GUID','%SQL_CONVERT_INTEGER','%SQL_CONVERT_INTERVAL_DAY_TIME','%SQL_CONVERT_INTERVAL_YEAR_MONTH','%SQL_CONVERT_LONGVARBINARY','%SQL_CONVERT_LONGVARCHAR','%SQL_CONVERT_NUMERIC',
+            '%SQL_CONVERT_REAL','%SQL_CONVERT_SMALLINT','%SQL_CONVERT_TIME','%SQL_CONVERT_TIMESTAMP','%SQL_CONVERT_TINYINT','%SQL_CONVERT_VARBINARY','%SQL_CONVERT_VARCHAR','%SQL_CONVERT_WCHAR',
+            '%SQL_CONVERT_WLONGVARCHAR','%SQL_CONVERT_WVARCHAR','%SQL_CORRELATION_NAME','%SQL_CP_DEFAULT','%SQL_CP_MATCH_DEFAULT','%SQL_CP_OFF','%SQL_CP_ONE_PER_DRIVER','%SQL_CP_ONE_PER_HENV',
+            '%SQL_CP_RELAXED_MATCH','%SQL_CP_STRICT_MATCH','%SQL_CREATE_ASSERTION','%SQL_CREATE_CHARACTER_SET','%SQL_CREATE_COLLATION','%SQL_CREATE_DOMAIN','%SQL_CREATE_SCHEMA','%SQL_CREATE_TABLE',
+            '%SQL_CREATE_TRANSLATION','%SQL_CREATE_VIEW','%SQL_CR_CLOSE','%SQL_CR_DELETE','%SQL_CR_PRESERVE','%SQL_CS_AUTHORIZATION','%SQL_CS_CREATE_SCHEMA','%SQL_CS_DEFAULT_CHARACTER_SET',
+            '%SQL_CTR_CREATE_TRANSLATION','%SQL_CT_COLUMN_COLLATION','%SQL_CT_COLUMN_CONSTRAINT','%SQL_CT_COLUMN_DEFAULT','%SQL_CT_COMMIT_DELETE','%SQL_CT_COMMIT_PRESERVE','%SQL_CT_CONSTRAINT_DEFERRABLE','%SQL_CT_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CT_CONSTRAINT_NAME_DEFINITION','%SQL_CT_CONSTRAINT_NON_DEFERRABLE','%SQL_CT_CREATE_TABLE','%SQL_CT_GLOBAL_TEMPORARY','%SQL_CT_LOCAL_TEMPORARY','%SQL_CT_TABLE_CONSTRAINT','%SQL_CURRENT_QUALIFIER',
+            '%SQL_CURSOR_COMMIT_BEHAVIOR','%SQL_CURSOR_DYNAMIC','%SQL_CURSOR_FORWARD_ONLY','%SQL_CURSOR_KEYSET_DRIVEN','%SQL_CURSOR_ROLLBACK_BEHAVIOR','%SQL_CURSOR_SENSITIVITY','%SQL_CURSOR_STATIC','%SQL_CURSOR_TYPE',
+            '%SQL_CURSOR_TYPE_DEFAULT','%SQL_CUR_DEFAULT','%SQL_CUR_USE_DRIVER','%SQL_CUR_USE_IF_NEEDED','%SQL_CUR_USE_ODBC','%SQL_CU_DML_STATEMENTS','%SQL_CU_INDEX_DEFINITION','%SQL_CU_PRIVILEGE_DEFINITION',
+            '%SQL_CU_PROCEDURE_INVOCATION','%SQL_CU_TABLE_DEFINITION','%SQL_CVT_BIGINT','%SQL_CVT_BINARY','%SQL_CVT_BIT','%SQL_CVT_CHAR','%SQL_CVT_DATE','%SQL_CVT_DECIMAL',
+            '%SQL_CVT_DOUBLE','%SQL_CVT_FLOAT','%SQL_CVT_GUID','%SQL_CVT_INTEGER','%SQL_CVT_INTERVAL_DAY_TIME','%SQL_CVT_INTERVAL_YEAR_MONTH','%SQL_CVT_LONGVARBINARY','%SQL_CVT_LONGVARCHAR',
+            '%SQL_CVT_NUMERIC','%SQL_CVT_REAL','%SQL_CVT_SMALLINT','%SQL_CVT_TIME','%SQL_CVT_TIMESTAMP','%SQL_CVT_TINYINT','%SQL_CVT_VARBINARY','%SQL_CVT_VARCHAR',
+            '%SQL_CVT_WCHAR','%SQL_CVT_WLONGVARCHAR','%SQL_CVT_WVARCHAR','%SQL_CV_CASCADED','%SQL_CV_CHECK_OPTION','%SQL_CV_CREATE_VIEW','%SQL_CV_LOCAL','%SQL_C_BINARY',
+            '%SQL_C_BIT','%SQL_C_BOOKMARK','%SQL_C_CHAR','%SQL_C_DATE','%SQL_C_DEFAULT','%SQL_C_DOUBLE','%SQL_C_FLOAT','%SQL_C_GUID',
+            '%SQL_C_INTERVAL_DAY','%SQL_C_INTERVAL_DAY_TO_HOUR','%SQL_C_INTERVAL_DAY_TO_MINUTE','%SQL_C_INTERVAL_DAY_TO_SECOND','%SQL_C_INTERVAL_HOUR','%SQL_C_INTERVAL_HOUR_TO_MINUTE','%SQL_C_INTERVAL_HOUR_TO_SECOND','%SQL_C_INTERVAL_MINUTE',
+            '%SQL_C_INTERVAL_MINUTE_TO_SECOND','%SQL_C_INTERVAL_MONTH','%SQL_C_INTERVAL_SECOND','%SQL_C_INTERVAL_YEAR','%SQL_C_INTERVAL_YEAR_TO_MONTH','%SQL_C_LONG','%SQL_C_NUMERIC','%SQL_C_SBIGINT',
+            '%SQL_C_SHORT','%SQL_C_SLONG','%SQL_C_SSHORT','%SQL_C_STINYINT','%SQL_C_TIME','%SQL_C_TIMESTAMP','%SQL_C_TINYINT','%SQL_C_TYPE_DATE',
+            '%SQL_C_TYPE_TIME','%SQL_C_TYPE_TIMESTAMP','%SQL_C_UBIGINT','%SQL_C_ULONG','%SQL_C_USHORT','%SQL_C_UTINYINT','%SQL_C_VARBOOKMARK','%SQL_DATABASE_NAME',
+            '%SQL_DATA_AT_EXEC','%SQL_DATA_SOURCE_NAME','%SQL_DATA_SOURCE_READ_ONLY','%SQL_DATE','%SQL_DATETIME','%SQL_DATETIME_LITERALS','%SQL_DATE_LEN','%SQL_DAY',
+            '%SQL_DAY_TO_HOUR','%SQL_DAY_TO_MINUTE','%SQL_DAY_TO_SECOND','%SQL_DA_DROP_ASSERTION','%SQL_DBMS_NAME','%SQL_DBMS_VER','%SQL_DB_DEFAULT','%SQL_DB_DISCONNECT',
+            '%SQL_DB_RETURN_TO_POOL','%SQL_DCS_DROP_CHARACTER_SET','%SQL_DC_DROP_COLLATION','%SQL_DDL_INDEX','%SQL_DD_CASCADE','%SQL_DD_DROP_DOMAIN','%SQL_DD_RESTRICT','%SQL_DECIMAL',
+            '%SQL_DEFAULT','%SQL_DEFAULT_PARAM','%SQL_DEFAULT_TXN_ISOLATION','%SQL_DELETE','%SQL_DELETE_BY_BOOKMARK','%SQL_DESCRIBE_PARAMETER','%SQL_DESC_ALLOC_AUTO','%SQL_DESC_ALLOC_TYPE',
+            '%SQL_DESC_ALLOC_USER','%SQL_DESC_ARRAY_SIZE','%SQL_DESC_ARRAY_STATUS_PTR','%SQL_DESC_AUTO_UNIQUE_VALUE','%SQL_DESC_BASE_COLUMN_NAME','%SQL_DESC_BASE_TABLE_NAME','%SQL_DESC_BIND_OFFSET_PTR','%SQL_DESC_BIND_TYPE',
+            '%SQL_DESC_CASE_SENSITIVE','%SQL_DESC_CATALOG_NAME','%SQL_DESC_CONCISE_TYPE','%SQL_DESC_COUNT','%SQL_DESC_DATA_PTR','%SQL_DESC_DATETIME_INTERVAL_CODE','%SQL_DESC_DATETIME_INTERVAL_PRECISION','%SQL_DESC_DISPLAY_SIZE',
+            '%SQL_DESC_FIXED_PREC_SCALE','%SQL_DESC_INDICATOR_PTR','%SQL_DESC_LABEL','%SQL_DESC_LENGTH','%SQL_DESC_LITERAL_PREFIX','%SQL_DESC_LITERAL_SUFFIX','%SQL_DESC_LOCAL_TYPE_NAME','%SQL_DESC_MAXIMUM_SCALE',
+            '%SQL_DESC_MINIMUM_SCALE','%SQL_DESC_NAME','%SQL_DESC_NULLABLE','%SQL_DESC_NUM_PREC_RADIX','%SQL_DESC_OCTET_LENGTH','%SQL_DESC_OCTET_LENGTH_PTR','%SQL_DESC_PARAMETER_TYPE','%SQL_DESC_PRECISION',
+            '%SQL_DESC_ROWS_PROCESSED_PTR','%SQL_DESC_SCALE','%SQL_DESC_SCHEMA_NAME','%SQL_DESC_SEARCHABLE','%SQL_DESC_TABLE_NAME','%SQL_DESC_TYPE','%SQL_DESC_TYPE_NAME','%SQL_DESC_UNNAMED',
+            '%SQL_DESC_UNSIGNED','%SQL_DESC_UPDATABLE','%SQL_DIAG_ALTER_TABLE','%SQL_DIAG_CALL','%SQL_DIAG_CLASS_ORIGIN','%SQL_DIAG_COLUMN_NUMBER','%SQL_DIAG_CONNECTION_NAME','%SQL_DIAG_CREATE_INDEX',
+            '%SQL_DIAG_CREATE_TABLE','%SQL_DIAG_CREATE_VIEW','%SQL_DIAG_CURSOR_ROW_COUNT','%SQL_DIAG_DELETE_WHERE','%SQL_DIAG_DROP_INDEX','%SQL_DIAG_DROP_TABLE','%SQL_DIAG_DROP_VIEW','%SQL_DIAG_DYNAMIC_DELETE_CURSOR',
+            '%SQL_DIAG_DYNAMIC_FUNCTION','%SQL_DIAG_DYNAMIC_FUNCTION_CODE','%SQL_DIAG_DYNAMIC_UPDATE_CURSOR','%SQL_DIAG_GRANT','%SQL_DIAG_INSERT','%SQL_DIAG_MESSAGE_TEXT','%SQL_DIAG_NATIVE','%SQL_DIAG_NUMBER',
+            '%SQL_DIAG_RETURNCODE','%SQL_DIAG_REVOKE','%SQL_DIAG_ROW_COUNT','%SQL_DIAG_ROW_NUMBER','%SQL_DIAG_SELECT_CURSOR','%SQL_DIAG_SERVER_NAME','%SQL_DIAG_SQLSTATE','%SQL_DIAG_SUBCLASS_ORIGIN',
+            '%SQL_DIAG_UNKNOWN_STATEMENT','%SQL_DIAG_UPDATE_WHERE','%SQL_DI_CREATE_INDEX','%SQL_DI_DROP_INDEX','%SQL_DL_SQL92_DATE','%SQL_DL_SQL92_INTERVAL_DAY','%SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR','%SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE',
+            '%SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND','%SQL_DL_SQL92_INTERVAL_HOUR','%SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE','%SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MINUTE','%SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MONTH','%SQL_DL_SQL92_INTERVAL_SECOND',
+            '%SQL_DL_SQL92_INTERVAL_YEAR','%SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH','%SQL_DL_SQL92_TIME','%SQL_DL_SQL92_TIMESTAMP','%SQL_DM_VER','%SQL_DOUBLE','%SQL_DRIVER_COMPLETE','%SQL_DRIVER_COMPLETE_REQUIRED',
+            '%SQL_DRIVER_HDBC','%SQL_DRIVER_HDESC','%SQL_DRIVER_HENV','%SQL_DRIVER_HLIB','%SQL_DRIVER_HSTMT','%SQL_DRIVER_NAME','%SQL_DRIVER_NOPROMPT','%SQL_DRIVER_ODBC_VER',
+            '%SQL_DRIVER_PROMPT','%SQL_DRIVER_VER','%SQL_DROP','%SQL_DROP_ASSERTION','%SQL_DROP_CHARACTER_SET','%SQL_DROP_COLLATION','%SQL_DROP_DOMAIN','%SQL_DROP_SCHEMA',
+            '%SQL_DROP_TABLE','%SQL_DROP_TRANSLATION','%SQL_DROP_VIEW','%SQL_DS_CASCADE','%SQL_DS_DROP_SCHEMA','%SQL_DS_RESTRICT','%SQL_DTC_DONE','%SQL_DTC_ENLIST_EXPENSIVE',
+            '%SQL_DTC_TRANSITION_COST','%SQL_DTC_UNENLIST_EXPENSIVE','%SQL_DTR_DROP_TRANSLATION','%SQL_DT_CASCADE','%SQL_DT_DROP_TABLE','%SQL_DT_RESTRICT','%SQL_DV_CASCADE','%SQL_DV_DROP_VIEW',
+            '%SQL_DV_RESTRICT','%SQL_DYNAMIC_CURSOR_ATTRIBUTES1','%SQL_DYNAMIC_CURSOR_ATTRIBUTES2','%SQL_ENSURE','%SQL_ENTIRE_ROWSET','%SQL_ERROR','%SQL_EXPRESSIONS_IN_ORDERBY','%SQL_FALSE',
+            '%SQL_FD_FETCH_ABSOLUTE','%SQL_FD_FETCH_BOOKMARK','%SQL_FD_FETCH_FIRST','%SQL_FD_FETCH_LAST','%SQL_FD_FETCH_NEXT','%SQL_FD_FETCH_PREV','%SQL_FD_FETCH_PRIOR','%SQL_FD_FETCH_RELATIVE',
+            '%SQL_FETCH_ABSOLUTE','%SQL_FETCH_BOOKMARK','%SQL_FETCH_BY_BOOKMARK','%SQL_FETCH_DIRECTION','%SQL_FETCH_FIRST','%SQL_FETCH_FIRST_SYSTEM','%SQL_FETCH_FIRST_USER','%SQL_FETCH_LAST',
+            '%SQL_FETCH_NEXT','%SQL_FETCH_PREV','%SQL_FETCH_PRIOR','%SQL_FETCH_RELATIVE','%SQL_FILE_CATALOG','%SQL_FILE_NOT_SUPPORTED','%SQL_FILE_QUALIFIER','%SQL_FILE_TABLE',
+            '%SQL_FILE_USAGE','%SQL_FLOAT','%SQL_FN_CVT_CAST','%SQL_FN_CVT_CONVERT','%SQL_FN_NUM_ABS','%SQL_FN_NUM_ACOS','%SQL_FN_NUM_ASIN','%SQL_FN_NUM_ATAN',
+            '%SQL_FN_NUM_ATAN2','%SQL_FN_NUM_CEILING','%SQL_FN_NUM_COS','%SQL_FN_NUM_COT','%SQL_FN_NUM_DEGREES','%SQL_FN_NUM_EXP','%SQL_FN_NUM_FLOOR','%SQL_FN_NUM_LOG',
+            '%SQL_FN_NUM_LOG10','%SQL_FN_NUM_MOD','%SQL_FN_NUM_PI','%SQL_FN_NUM_POWER','%SQL_FN_NUM_RADIANS','%SQL_FN_NUM_RAND','%SQL_FN_NUM_ROUND','%SQL_FN_NUM_SIGN',
+            '%SQL_FN_NUM_SIN','%SQL_FN_NUM_SQRT','%SQL_FN_NUM_TAN','%SQL_FN_NUM_TRUNCATE','%SQL_FN_STR_ASCII','%SQL_FN_STR_BIT_LENGTH','%SQL_FN_STR_CHAR','%SQL_FN_STR_CHARACTER_LENGTH',
+            '%SQL_FN_STR_CHAR_LENGTH','%SQL_FN_STR_CONCAT','%SQL_FN_STR_DIFFERENCE','%SQL_FN_STR_INSERT','%SQL_FN_STR_LCASE','%SQL_FN_STR_LEFT','%SQL_FN_STR_LENGTH','%SQL_FN_STR_LOCATE',
+            '%SQL_FN_STR_LOCATE_2','%SQL_FN_STR_LTRIM','%SQL_FN_STR_OCTET_LENGTH','%SQL_FN_STR_POSITION','%SQL_FN_STR_REPEAT','%SQL_FN_STR_REPLACE','%SQL_FN_STR_RIGHT','%SQL_FN_STR_RTRIM',
+            '%SQL_FN_STR_SOUNDEX','%SQL_FN_STR_SPACE','%SQL_FN_STR_SUBSTRING','%SQL_FN_STR_UCASE','%SQL_FN_SYS_DBNAME','%SQL_FN_SYS_IFNULL','%SQL_FN_SYS_USERNAME','%SQL_FN_TD_CURDATE',
+            '%SQL_FN_TD_CURRENT_DATE','%SQL_FN_TD_CURRENT_TIME','%SQL_FN_TD_CURRENT_TIMESTAMP','%SQL_FN_TD_CURTIME','%SQL_FN_TD_DAYNAME','%SQL_FN_TD_DAYOFMONTH','%SQL_FN_TD_DAYOFWEEK','%SQL_FN_TD_DAYOFYEAR',
+            '%SQL_FN_TD_EXTRACT','%SQL_FN_TD_HOUR','%SQL_FN_TD_MINUTE','%SQL_FN_TD_MONTH','%SQL_FN_TD_MONTHNAME','%SQL_FN_TD_NOW','%SQL_FN_TD_QUARTER','%SQL_FN_TD_SECOND',
+            '%SQL_FN_TD_TIMESTAMPADD','%SQL_FN_TD_TIMESTAMPDIFF','%SQL_FN_TD_WEEK','%SQL_FN_TD_YEAR','%SQL_FN_TSI_DAY','%SQL_FN_TSI_FRAC_SECOND','%SQL_FN_TSI_HOUR','%SQL_FN_TSI_MINUTE',
+            '%SQL_FN_TSI_MONTH','%SQL_FN_TSI_QUARTER','%SQL_FN_TSI_SECOND','%SQL_FN_TSI_WEEK','%SQL_FN_TSI_YEAR','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2','%SQL_GB_COLLATE',
+            '%SQL_GB_GROUP_BY_CONTAINS_SELECT','%SQL_GB_GROUP_BY_EQUALS_SELECT','%SQL_GB_NOT_SUPPORTED','%SQL_GB_NO_RELATION','%SQL_GD_ANY_COLUMN','%SQL_GD_ANY_ORDER','%SQL_GD_BLOCK','%SQL_GD_BOUND',
+            '%SQL_GETDATA_EXTENSIONS','%SQL_GET_BOOKMARK','%SQL_GROUP_BY','%SQL_GUID','%SQL_HANDLE_DBC','%SQL_HANDLE_DESC','%SQL_HANDLE_ENV','%SQL_HANDLE_SENV',
+            '%SQL_HANDLE_STMT','%SQL_HOUR','%SQL_HOUR_TO_MINUTE','%SQL_HOUR_TO_SECOND','%SQL_IC_LOWER','%SQL_IC_MIXED','%SQL_IC_SENSITIVE','%SQL_IC_UPPER',
+            '%SQL_IDENTIFIER_CASE','%SQL_IDENTIFIER_QUOTE_CHAR','%SQL_IGNORE','%SQL_IK_ALL','%SQL_IK_ASC','%SQL_IK_DESC','%SQL_IK_NONE','%SQL_INDEX_ALL',
+            '%SQL_INDEX_CLUSTERED','%SQL_INDEX_HASHED','%SQL_INDEX_KEYWORDS','%SQL_INDEX_OTHER','%SQL_INDEX_UNIQUE','%SQL_INFO_FIRST','%SQL_INFO_SCHEMA_VIEWS','%SQL_INITIALLY_DEFERRED',
+            '%SQL_INITIALLY_IMMEDIATE','%SQL_INSENSITIVE','%SQL_INSERT_STATEMENT','%SQL_INTEGER','%SQL_INTEGRITY','%SQL_INTERVAL','%SQL_INTERVAL_DAY','%SQL_INTERVAL_DAY_TO_HOUR',
+            '%SQL_INTERVAL_DAY_TO_MINUTE','%SQL_INTERVAL_DAY_TO_SECOND','%SQL_INTERVAL_HOUR','%SQL_INTERVAL_HOUR_TO_MINUTE','%SQL_INTERVAL_HOUR_TO_SECOND','%SQL_INTERVAL_MINUTE','%SQL_INTERVAL_MINUTE_TO_SECOND','%SQL_INTERVAL_MONTH',
+            '%SQL_INTERVAL_SECOND','%SQL_INTERVAL_YEAR','%SQL_INTERVAL_YEAR_TO_MONTH','%SQL_INVALID_HANDLE','%SQL_ISV_ASSERTIONS','%SQL_ISV_CHARACTER_SETS','%SQL_ISV_CHECK_CONSTRAINTS','%SQL_ISV_COLLATIONS',
+            '%SQL_ISV_COLUMNS','%SQL_ISV_COLUMN_DOMAIN_USAGE','%SQL_ISV_COLUMN_PRIVILEGES','%SQL_ISV_CONSTRAINT_COLUMN_USAGE','%SQL_ISV_CONSTRAINT_TABLE_USAGE','%SQL_ISV_DOMAINS','%SQL_ISV_DOMAIN_CONSTRAINTS','%SQL_ISV_KEY_COLUMN_USAGE',
+            '%SQL_ISV_REFERENTIAL_CONSTRAINTS','%SQL_ISV_SCHEMATA','%SQL_ISV_SQL_LANGUAGES','%SQL_ISV_TABLES','%SQL_ISV_TABLE_CONSTRAINTS','%SQL_ISV_TABLE_PRIVILEGES','%SQL_ISV_TRANSLATIONS','%SQL_ISV_USAGE_PRIVILEGES',
+            '%SQL_ISV_VIEWS','%SQL_ISV_VIEW_COLUMN_USAGE','%SQL_ISV_VIEW_TABLE_USAGE','%SQL_IS_DAY','%SQL_IS_DAY_TO_HOUR','%SQL_IS_DAY_TO_MINUTE','%SQL_IS_DAY_TO_SECOND','%SQL_IS_HOUR',
+            '%SQL_IS_HOUR_TO_MINUTE','%SQL_IS_HOUR_TO_SECOND','%SQL_IS_INSERT_LITERALS','%SQL_IS_INSERT_SEARCHED','%SQL_IS_INTEGER','%SQL_IS_MINUTE','%SQL_IS_MINUTE_TO_SECOND','%SQL_IS_MONTH',
+            '%SQL_IS_POINTER','%SQL_IS_SECOND','%SQL_IS_SELECT_INTO','%SQL_IS_SMALLINT','%SQL_IS_UINTEGER','%SQL_IS_USMALLINT','%SQL_IS_YEAR','%SQL_IS_YEAR_TO_MONTH',
+            '%SQL_KEYSET_CURSOR_ATTRIBUTES1','%SQL_KEYSET_CURSOR_ATTRIBUTES2','%SQL_KEYSET_SIZE','%SQL_KEYSET_SIZE_DEFAULT','%SQL_KEYWORDS','%SQL_LCK_EXCLUSIVE','%SQL_LCK_NO_CHANGE','%SQL_LCK_UNLOCK',
+            '%SQL_LEN_BINARY_ATTR_OFFSET','%SQL_LEN_DATA_AT_EXEC_OFFSET','%SQL_LIKE_ESCAPE_CLAUSE','%SQL_LIKE_ONLY','%SQL_LOCK_EXCLUSIVE','%SQL_LOCK_NO_CHANGE','%SQL_LOCK_TYPES','%SQL_LOCK_UNLOCK',
+            '%SQL_LOGIN_TIMEOUT','%SQL_LOGIN_TIMEOUT_DEFAULT','%SQL_LONGVARBINARY','%SQL_LONGVARCHAR','%SQL_MAXIMUM_CATALOG_NAME_LENGTH','%SQL_MAXIMUM_COLUMNS_IN_GROUP_BY','%SQL_MAXIMUM_COLUMNS_IN_INDEX','%SQL_MAXIMUM_COLUMNS_IN_ORDER_BY',
+            '%SQL_MAXIMUM_COLUMNS_IN_SELECT','%SQL_MAXIMUM_COLUMN_NAME_LENGTH','%SQL_MAXIMUM_CONCURRENT_ACTIVITIES','%SQL_MAXIMUM_CURSOR_NAME_LENGTH','%SQL_MAXIMUM_DRIVER_CONNECTIONS','%SQL_MAXIMUM_IDENTIFIER_LENGTH','%SQL_MAXIMUM_INDEX_SIZE','%SQL_MAXIMUM_ROW_SIZE',
+            '%SQL_MAXIMUM_SCHEMA_NAME_LENGTH','%SQL_MAXIMUM_STATEMENT_LENGTH','%SQL_MAXIMUM_TABLES_IN_SELECT','%SQL_MAXIMUM_USER_NAME_LENGTH','%SQL_MAX_ASYNC_CONCURRENT_STATEMENTS','%SQL_MAX_BINARY_LITERAL_LEN','%SQL_MAX_CATALOG_NAME_LEN','%SQL_MAX_CHAR_LITERAL_LEN',
+            '%SQL_MAX_COLUMNS_IN_GROUP_BY','%SQL_MAX_COLUMNS_IN_INDEX','%SQL_MAX_COLUMNS_IN_ORDER_BY','%SQL_MAX_COLUMNS_IN_SELECT','%SQL_MAX_COLUMNS_IN_TABLE','%SQL_MAX_COLUMN_NAME_LEN','%SQL_MAX_CONCURRENT_ACTIVITIES','%SQL_MAX_CURSOR_NAME_LEN',
+            '%SQL_MAX_DRIVER_CONNECTIONS','%SQL_MAX_DSN_LENGTH','%SQL_MAX_IDENTIFIER_LEN','%SQL_MAX_INDEX_SIZE','%SQL_MAX_LENGTH','%SQL_MAX_LENGTH_DEFAULT','%SQL_MAX_MESSAGE_LENGTH','%SQL_MAX_NUMERIC_LEN',
+            '%SQL_MAX_OPTION_STRING_LENGTH','%SQL_MAX_OWNER_NAME_LEN','%SQL_MAX_PROCEDURE_NAME_LEN','%SQL_MAX_QUALIFIER_NAME_LEN','%SQL_MAX_ROWS','%SQL_MAX_ROWS_DEFAULT','%SQL_MAX_ROW_SIZE','%SQL_MAX_ROW_SIZE_INCLUDES_LONG',
+            '%SQL_MAX_SCHEMA_NAME_LEN','%SQL_MAX_STATEMENT_LEN','%SQL_MAX_TABLES_IN_SELECT','%SQL_MAX_TABLE_NAME_LEN','%SQL_MAX_USER_NAME_LEN','%SQL_MINUTE','%SQL_MINUTE_TO_SECOND','%SQL_MODE_DEFAULT',
+            '%SQL_MODE_READ_ONLY','%SQL_MODE_READ_WRITE','%SQL_MONTH','%SQL_MULTIPLE_ACTIVE_TXN','%SQL_MULT_RESULT_SETS','%SQL_NAMED','%SQL_NC_END','%SQL_NC_HIGH',
+            '%SQL_NC_LOW','%SQL_NC_START','%SQL_NEED_DATA','%SQL_NEED_LONG_DATA_LEN','%SQL_NNC_NON_NULL','%SQL_NNC_NULL','%SQL_NONSCROLLABLE','%SQL_NON_NULLABLE_COLUMNS',
+            '%SQL_NOSCAN','%SQL_NOSCAN_DEFAULT','%SQL_NOSCAN_OFF','%SQL_NOSCAN_ON','%SQL_NOT_DEFERRABLE','%SQL_NO_ACTION','%SQL_NO_COLUMN_NUMBER','%SQL_NO_DATA',
+            '%SQL_NO_DATA_FOUND','%SQL_NO_NULLS','%SQL_NO_ROW_NUMBER','%SQL_NO_TOTAL','%SQL_NTS','%SQL_NTSL','%SQL_NULLABLE','%SQL_NULLABLE_UNKNOWN',
+            '%SQL_NULL_COLLATION','%SQL_NULL_DATA','%SQL_NULL_HANDLE','%SQL_NULL_HDBC','%SQL_NULL_HDESC','%SQL_NULL_HENV','%SQL_NULL_HSTMT','%SQL_NUMERIC',
+            '%SQL_NUMERIC_FUNCTIONS','%SQL_OAC_LEVEL1','%SQL_OAC_LEVEL2','%SQL_OAC_NONE','%SQL_ODBC_API_CONFORMANCE','%SQL_ODBC_CURSORS','%SQL_ODBC_INTERFACE_CONFORMANCE','%SQL_ODBC_SAG_CLI_CONFORMANCE',
+            '%SQL_ODBC_SQL_CONFORMANCE','%SQL_ODBC_SQL_OPT_IEF','%SQL_ODBC_VER','%SQL_OIC_CORE','%SQL_OIC_LEVEL1','%SQL_OIC_LEVEL2','%SQL_OJ_ALL_COMPARISON_OPS','%SQL_OJ_CAPABILITIES',
+            '%SQL_OJ_FULL','%SQL_OJ_INNER','%SQL_OJ_LEFT','%SQL_OJ_NESTED','%SQL_OJ_NOT_ORDERED','%SQL_OJ_RIGHT','%SQL_OPT_TRACE','%SQL_OPT_TRACEFILE',
+            '%SQL_OPT_TRACE_DEFAULT','%SQL_OPT_TRACE_OFF','%SQL_OPT_TRACE_ON','%SQL_ORDER_BY_COLUMNS_IN_SELECT','%SQL_OSCC_COMPLIANT','%SQL_OSCC_NOT_COMPLIANT','%SQL_OSC_CORE','%SQL_OSC_EXTENDED',
+            '%SQL_OSC_MINIMUM','%SQL_OUTER_JOINS','%SQL_OUTER_JOIN_CAPABILITIES','%SQL_OU_DML_STATEMENTS','%SQL_OU_INDEX_DEFINITION','%SQL_OU_PRIVILEGE_DEFINITION','%SQL_OU_PROCEDURE_INVOCATION','%SQL_OU_TABLE_DEFINITION',
+            '%SQL_OV_ODBC2','%SQL_OV_ODBC3','%SQL_OWNER_TERM','%SQL_OWNER_USAGE','%SQL_PACKET_SIZE','%SQL_PARAM_ARRAY_ROW_COUNTS','%SQL_PARAM_ARRAY_SELECTS','%SQL_PARAM_BIND_BY_COLUMN',
+            '%SQL_PARAM_BIND_TYPE_DEFAULT','%SQL_PARAM_DIAG_UNAVAILABLE','%SQL_PARAM_ERROR','%SQL_PARAM_IGNORE','%SQL_PARAM_INPUT','%SQL_PARAM_INPUT_OUTPUT','%SQL_PARAM_OUTPUT','%SQL_PARAM_PROCEED',
+            '%SQL_PARAM_SUCCESS','%SQL_PARAM_SUCCESS_WITH_INFO','%SQL_PARAM_TYPE_DEFAULT','%SQL_PARAM_TYPE_UNKNOWN','%SQL_PARAM_UNUSED','%SQL_PARC_BATCH','%SQL_PARC_NO_BATCH','%SQL_PAS_BATCH',
+            '%SQL_PAS_NO_BATCH','%SQL_PAS_NO_SELECT','%SQL_PC_NON_PSEUDO','%SQL_PC_NOT_PSEUDO','%SQL_PC_PSEUDO','%SQL_PC_UNKNOWN','%SQL_POSITION','%SQL_POSITIONED_STATEMENTS',
+            '%SQL_POS_ADD','%SQL_POS_DELETE','%SQL_POS_OPERATIONS','%SQL_POS_POSITION','%SQL_POS_REFRESH','%SQL_POS_UPDATE','%SQL_PRED_BASIC','%SQL_PRED_CHAR',
+            '%SQL_PRED_NONE','%SQL_PRED_SEARCHABLE','%SQL_PROCEDURES','%SQL_PROCEDURE_TERM','%SQL_PS_POSITIONED_DELETE','%SQL_PS_POSITIONED_UPDATE','%SQL_PS_SELECT_FOR_UPDATE','%SQL_PT_FUNCTION',
+            '%SQL_PT_PROCEDURE','%SQL_PT_UNKNOWN','%SQL_QL_END','%SQL_QL_START','%SQL_QUALIFIER_LOCATION','%SQL_QUALIFIER_NAME_SEPARATOR','%SQL_QUALIFIER_TERM','%SQL_QUALIFIER_USAGE',
+            '%SQL_QUERY_TIMEOUT','%SQL_QUERY_TIMEOUT_DEFAULT','%SQL_QUICK','%SQL_QUIET_MODE','%SQL_QUOTED_IDENTIFIER_CASE','%SQL_QU_DML_STATEMENTS','%SQL_QU_INDEX_DEFINITION','%SQL_QU_PRIVILEGE_DEFINITION',
+            '%SQL_QU_PROCEDURE_INVOCATION','%SQL_QU_TABLE_DEFINITION','%SQL_RD_DEFAULT','%SQL_RD_OFF','%SQL_RD_ON','%SQL_REAL','%SQL_REFRESH','%SQL_RESET_PARAMS',
+            '%SQL_RESTRICT','%SQL_RESULT_COL','%SQL_RETRIEVE_DATA','%SQL_RETURN_VALUE','%SQL_ROLLBACK','%SQL_ROWSET_SIZE','%SQL_ROWSET_SIZE_DEFAULT','%SQL_ROWVER',
+            '%SQL_ROW_ADDED','%SQL_ROW_DELETED','%SQL_ROW_ERROR','%SQL_ROW_IDENTIFIER','%SQL_ROW_IGNORE','%SQL_ROW_NOROW','%SQL_ROW_NUMBER','%SQL_ROW_NUMBER_UNKNOWN',
+            '%SQL_ROW_PROCEED','%SQL_ROW_SUCCESS','%SQL_ROW_SUCCESS_WITH_INFO','%SQL_ROW_UPDATED','%SQL_ROW_UPDATES','%SQL_SCCO_LOCK','%SQL_SCCO_OPT_ROWVER','%SQL_SCCO_OPT_TIMESTAMP',
+            '%SQL_SCCO_OPT_VALUES','%SQL_SCCO_READ_ONLY','%SQL_SCC_ISO92_CLI','%SQL_SCC_XOPEN_CLI_VERSION1','%SQL_SCHEMA_TERM','%SQL_SCHEMA_USAGE','%SQL_SCOPE_CURROW','%SQL_SCOPE_SESSION',
+            '%SQL_SCOPE_TRANSACTION','%SQL_SCROLLABLE','%SQL_SCROLL_CONCURRENCY','%SQL_SCROLL_DYNAMIC','%SQL_SCROLL_FORWARD_ONLY','%SQL_SCROLL_KEYSET_DRIVEN','%SQL_SCROLL_OPTIONS','%SQL_SCROLL_STATIC',
+            '%SQL_SC_FIPS127_2_TRANSITIONAL','%SQL_SC_NON_UNIQUE','%SQL_SC_SQL92_ENTRY','%SQL_SC_SQL92_FULL','%SQL_SC_SQL92_INTERMEDIATE','%SQL_SC_TRY_UNIQUE','%SQL_SC_UNIQUE','%SQL_SDF_CURRENT_DATE',
+            '%SQL_SDF_CURRENT_TIME','%SQL_SDF_CURRENT_TIMESTAMP','%SQL_SEARCHABLE','%SQL_SEARCH_PATTERN_ESCAPE','%SQL_SECOND','%SQL_SENSITIVE','%SQL_SERVER_NAME','%SQL_SETPARAM_VALUE_MAX',
+            '%SQL_SETPOS_MAX_LOCK_VALUE','%SQL_SETPOS_MAX_OPTION_VALUE','%SQL_SET_DEFAULT','%SQL_SET_NULL','%SQL_SFKD_CASCADE','%SQL_SFKD_NO_ACTION','%SQL_SFKD_SET_DEFAULT','%SQL_SFKD_SET_NULL',
+            '%SQL_SFKU_CASCADE','%SQL_SFKU_NO_ACTION','%SQL_SFKU_SET_DEFAULT','%SQL_SFKU_SET_NULL','%SQL_SG_DELETE_TABLE','%SQL_SG_INSERT_COLUMN','%SQL_SG_INSERT_TABLE','%SQL_SG_REFERENCES_COLUMN',
+            '%SQL_SG_REFERENCES_TABLE','%SQL_SG_SELECT_TABLE','%SQL_SG_UPDATE_COLUMN','%SQL_SG_UPDATE_TABLE','%SQL_SG_USAGE_ON_CHARACTER_SET','%SQL_SG_USAGE_ON_COLLATION','%SQL_SG_USAGE_ON_DOMAIN','%SQL_SG_USAGE_ON_TRANSLATION',
+            '%SQL_SG_WITH_GRANT_OPTION','%SQL_SIGNED_OFFSET','%SQL_SIMULATE_CURSOR','%SQL_SMALLINT','%SQL_SNVF_BIT_LENGTH','%SQL_SNVF_CHARACTER_LENGTH','%SQL_SNVF_CHAR_LENGTH','%SQL_SNVF_EXTRACT',
+            '%SQL_SNVF_OCTET_LENGTH','%SQL_SNVF_POSITION','%SQL_SO_DYNAMIC','%SQL_SO_FORWARD_ONLY','%SQL_SO_KEYSET_DRIVEN','%SQL_SO_MIXED','%SQL_SO_STATIC','%SQL_SPECIAL_CHARACTERS',
+            '%SQL_SPEC_MAJOR','%SQL_SPEC_MINOR','%SQL_SP_BETWEEN','%SQL_SP_COMPARISON','%SQL_SP_EXISTS','%SQL_SP_IN','%SQL_SP_ISNOTNULL','%SQL_SP_ISNULL',
+            '%SQL_SP_LIKE','%SQL_SP_MATCH_FULL','%SQL_SP_MATCH_PARTIAL','%SQL_SP_MATCH_UNIQUE_FULL','%SQL_SP_MATCH_UNIQUE_PARTIAL','%SQL_SP_OVERLAPS','%SQL_SP_QUANTIFIED_COMPARISON','%SQL_SP_UNIQUE',
+            '%SQL_SQL92_DATETIME_FUNCTIONS','%SQL_SQL92_FOREIGN_KEY_DELETE_RULE','%SQL_SQL92_FOREIGN_KEY_UPDATE_RULE','%SQL_SQL92_GRANT','%SQL_SQL92_NUMERIC_VALUE_FUNCTIONS','%SQL_SQL92_PREDICATES','%SQL_SQL92_RELATIONAL_JOIN_OPERATORS','%SQL_SQL92_REVOKE',
+            '%SQL_SQL92_ROW_VALUE_CONSTRUCTOR','%SQL_SQL92_STRING_FUNCTIONS','%SQL_SQL92_VALUE_EXPRESSIONS','%SQL_SQLSTATE_SIZE','%SQL_SQL_CONFORMANCE','%SQL_SQ_COMPARISON','%SQL_SQ_CORRELATED_SUBQUERIES','%SQL_SQ_EXISTS',
+            '%SQL_SQ_IN','%SQL_SQ_QUANTIFIED','%SQL_SRJO_CORRESPONDING_CLAUSE','%SQL_SRJO_CROSS_JOIN','%SQL_SRJO_EXCEPT_JOIN','%SQL_SRJO_FULL_OUTER_JOIN','%SQL_SRJO_INNER_JOIN','%SQL_SRJO_INTERSECT_JOIN',
+            '%SQL_SRJO_LEFT_OUTER_JOIN','%SQL_SRJO_NATURAL_JOIN','%SQL_SRJO_RIGHT_OUTER_JOIN','%SQL_SRJO_UNION_JOIN','%SQL_SRVC_DEFAULT','%SQL_SRVC_NULL','%SQL_SRVC_ROW_SUBQUERY','%SQL_SRVC_VALUE_EXPRESSION',
+            '%SQL_SR_CASCADE','%SQL_SR_DELETE_TABLE','%SQL_SR_GRANT_OPTION_FOR','%SQL_SR_INSERT_COLUMN','%SQL_SR_INSERT_TABLE','%SQL_SR_REFERENCES_COLUMN','%SQL_SR_REFERENCES_TABLE','%SQL_SR_RESTRICT',
+            '%SQL_SR_SELECT_TABLE','%SQL_SR_UPDATE_COLUMN','%SQL_SR_UPDATE_TABLE','%SQL_SR_USAGE_ON_CHARACTER_SET','%SQL_SR_USAGE_ON_COLLATION','%SQL_SR_USAGE_ON_DOMAIN','%SQL_SR_USAGE_ON_TRANSLATION','%SQL_SSF_CONVERT',
+            '%SQL_SSF_LOWER','%SQL_SSF_SUBSTRING','%SQL_SSF_TRANSLATE','%SQL_SSF_TRIM_BOTH','%SQL_SSF_TRIM_LEADING','%SQL_SSF_TRIM_TRAILING','%SQL_SSF_UPPER','%SQL_SS_ADDITIONS',
+            '%SQL_SS_DELETIONS','%SQL_SS_UPDATES','%SQL_STANDARD_CLI_CONFORMANCE','%SQL_STATIC_CURSOR_ATTRIBUTES1','%SQL_STATIC_CURSOR_ATTRIBUTES2','%SQL_STATIC_SENSITIVITY','%SQL_STILL_EXECUTING','%SQL_STRING_FUNCTIONS',
+            '%SQL_SUBQUERIES','%SQL_SUCCESS','%SQL_SUCCESS_WITH_INFO','%SQL_SU_DML_STATEMENTS','%SQL_SU_INDEX_DEFINITION','%SQL_SU_PRIVILEGE_DEFINITION','%SQL_SU_PROCEDURE_INVOCATION','%SQL_SU_TABLE_DEFINITION',
+            '%SQL_SVE_CASE','%SQL_SVE_CAST','%SQL_SVE_COALESCE','%SQL_SVE_NULLIF','%SQL_SYSTEM_FUNCTIONS','%SQL_TABLE_STAT','%SQL_TABLE_TERM','%SQL_TC_ALL',
+            '%SQL_TC_DDL_COMMIT','%SQL_TC_DDL_IGNORE','%SQL_TC_DML','%SQL_TC_NONE','%SQL_TIME','%SQL_TIMEDATE_ADD_INTERVALS','%SQL_TIMEDATE_DIFF_INTERVALS','%SQL_TIMEDATE_FUNCTIONS',
+            '%SQL_TIMESTAMP','%SQL_TIMESTAMP_LEN','%SQL_TIME_LEN','%SQL_TINYINT','%SQL_TRANSACTION_CAPABLE','%SQL_TRANSACTION_ISOLATION_OPTION','%SQL_TRANSACTION_READ_COMMITTED','%SQL_TRANSACTION_READ_UNCOMMITTED',
+            '%SQL_TRANSACTION_REPEATABLE_READ','%SQL_TRANSACTION_SERIALIZABLE','%SQL_TRANSLATE_DLL','%SQL_TRANSLATE_OPTION','%SQL_TRUE','%SQL_TXN_CAPABLE','%SQL_TXN_ISOLATION','%SQL_TXN_ISOLATION_OPTION',
+            '%SQL_TXN_READ_COMMITTED','%SQL_TXN_READ_UNCOMMITTED','%SQL_TXN_REPEATABLE_READ','%SQL_TXN_SERIALIZABLE','%SQL_TYPE_DATE','%SQL_TYPE_NULL','%SQL_TYPE_TIME','%SQL_TYPE_TIMESTAMP',
+            '%SQL_UB_DEFAULT','%SQL_UB_FIXED','%SQL_UB_OFF','%SQL_UB_ON','%SQL_UB_VARIABLE','%SQL_UNBIND','%SQL_UNICODE','%SQL_UNICODE_CHAR',
+            '%SQL_UNICODE_LONGVARCHAR','%SQL_UNICODE_VARCHAR','%SQL_UNION','%SQL_UNION_STATEMENT','%SQL_UNKNOWN_TYPE','%SQL_UNNAMED','%SQL_UNSEARCHABLE','%SQL_UNSIGNED_OFFSET',
+            '%SQL_UNSPECIFIED','%SQL_UPDATE','%SQL_UPDATE_BY_BOOKMARK','%SQL_USER_NAME','%SQL_USE_BOOKMARKS','%SQL_US_UNION','%SQL_US_UNION_ALL','%SQL_U_UNION',
+            '%SQL_U_UNION_ALL','%SQL_VARBINARY','%SQL_VARCHAR','%SQL_XOPEN_CLI_YEAR','%SQL_YEAR','%SQL_YEAR_TO_MONTH','%SRCCOPY','%SS_BITMAP',
+            '%SS_BLACKFRAME','%SS_BLACKRECT','%SS_CENTER','%SS_CENTERIMAGE','%SS_ENDELLIPSIS','%SS_ETCHEDFRAME','%SS_ETCHEDHORZ','%SS_ETCHEDVERT',
+            '%SS_GRAYFRAME','%SS_GRAYRECT','%SS_LEFT','%SS_NOPREFIX','%SS_NOTIFY','%SS_NOWORDWRAP','%SS_PATHELLIPSIS','%SS_RIGHT',
+            '%SS_RIGHTJUST','%SS_SIMPLE','%SS_SUNKEN','%SS_WHITEFRAME','%SS_WHITERECT','%SS_WORDELLIPSIS','%STAT_FILL_FROM_MEMORY','%STAT_FILL_NATURAL',
+            '%STAT_FILL_NATURAL_ERASTONE','%STAT_FILL_NATURAL_EVEN','%STAT_FILL_NATURAL_FIBONACCI','%STAT_FILL_NATURAL_ODD','%STAT_FILL_WITH_NUMBER','%STAT_MINMAX_INDEX','%STAT_MINMAX_VALUE','%STAT_TYPE_BYTE',
+            '%STAT_TYPE_CURRENCY','%STAT_TYPE_DOUBLE','%STAT_TYPE_DWORD','%STAT_TYPE_EXT','%STAT_TYPE_INTEGER','%STAT_TYPE_LONG','%STAT_TYPE_QUAD','%STAT_TYPE_SINGLE',
+            '%STAT_TYPE_WORD','%SWP_ASYNCWINDOWPOS','%SWP_DEFERERASE','%SWP_DRAWFRAME','%SWP_FRAMECHANGED','%SWP_HIDEWINDOW','%SWP_NOACTIVATE','%SWP_NOCOPYBITS',
+            '%SWP_NOMOVE','%SWP_NOOWNERZORDER','%SWP_NOREDRAW','%SWP_NOREPOSITION','%SWP_NOSENDCHANGING','%SWP_NOSIZE','%SWP_NOZORDER','%SWP_SHOWWINDOW',
+            '%SW_FORCEMINIMIZE','%SW_HIDE','%SW_MAXIMIZE','%SW_MINIMIZE','%SW_NORMAL','%SW_RESTORE','%SW_SHOW','%SW_SHOWDEFAULT',
+            '%SW_SHOWMAXIMIZED','%SW_SHOWMINIMIZED','%SW_SHOWMINNOACTIVE','%SW_SHOWNA','%SW_SHOWNOACTIVATE','%SW_SHOWNORMAL','%TBASS_3DALG_DEFAULT','%TBASS_3DALG_FULL',
+            '%TBASS_3DALG_LIGHT','%TBASS_3DALG_OFF','%TBASS_3DMODE_NORMAL','%TBASS_3DMODE_OFF','%TBASS_3DMODE_RELATIVE','%TBASS_ACTIVE_PAUSED','%TBASS_ACTIVE_PLAYING','%TBASS_ACTIVE_STALLED',
+            '%TBASS_ACTIVE_STOPPED','%TBASS_CONFIG_3DALGORITHM','%TBASS_CONFIG_BUFFER','%TBASS_CONFIG_CURVE_PAN','%TBASS_CONFIG_CURVE_VOL','%TBASS_CONFIG_FLOATDSP','%TBASS_CONFIG_GVOL_MUSIC','%TBASS_CONFIG_GVOL_SAMPLE',
+            '%TBASS_CONFIG_GVOL_STREAM','%TBASS_CONFIG_MAXVOL','%TBASS_CONFIG_MP3_CODEC','%TBASS_CONFIG_NET_AGENT','%TBASS_CONFIG_NET_BUFFER','%TBASS_CONFIG_NET_PASSIVE','%TBASS_CONFIG_NET_PREBUF','%TBASS_CONFIG_NET_PROXY',
+            '%TBASS_CONFIG_NET_TIMEOUT','%TBASS_CONFIG_PAUSE_NOPLAY','%TBASS_CONFIG_UPDATEPERIOD','%TBASS_CTYPE_MUSIC_IT','%TBASS_CTYPE_MUSIC_MO3','%TBASS_CTYPE_MUSIC_MOD','%TBASS_CTYPE_MUSIC_MTM','%TBASS_CTYPE_MUSIC_S3M',
+            '%TBASS_CTYPE_MUSIC_XM','%TBASS_CTYPE_RECORD','%TBASS_CTYPE_SAMPLE','%TBASS_CTYPE_STREAM','%TBASS_CTYPE_STREAM_AIFF','%TBASS_CTYPE_STREAM_MP1','%TBASS_CTYPE_STREAM_MP2','%TBASS_CTYPE_STREAM_MP3',
+            '%TBASS_CTYPE_STREAM_OGG','%TBASS_CTYPE_STREAM_WAV','%TBASS_CTYPE_STREAM_WAV_FLOAT','%TBASS_CTYPE_STREAM_WAV_PCM','%TBASS_DATA_AVAILABLE','%TBASS_DATA_FFT1024','%TBASS_DATA_FFT2048','%TBASS_DATA_FFT4096',
+            '%TBASS_DATA_FFT512','%TBASS_DATA_FFT_INDIVIDUAL','%TBASS_DATA_FFT_NOWINDOW','%TBASS_DATA_FLOAT','%TBASS_DEVICE_3D','%TBASS_DEVICE_8BITS','%TBASS_DEVICE_LATENCY','%TBASS_DEVICE_MONO',
+            '%TBASS_DEVICE_NOSPEAKER','%TBASS_DEVICE_SPEAKERS','%TBASS_EAX_ENVIRONMENT_ALLEY','%TBASS_EAX_ENVIRONMENT_ARENA','%TBASS_EAX_ENVIRONMENT_AUDITORIUM','%TBASS_EAX_ENVIRONMENT_BATHROOM','%TBASS_EAX_ENVIRONMENT_CARPETEDHALLWAY','%TBASS_EAX_ENVIRONMENT_CAVE',
+            '%TBASS_EAX_ENVIRONMENT_CITY','%TBASS_EAX_ENVIRONMENT_CONCERTHALL','%TBASS_EAX_ENVIRONMENT_COUNT','%TBASS_EAX_ENVIRONMENT_DIZZY','%TBASS_EAX_ENVIRONMENT_DRUGGED','%TBASS_EAX_ENVIRONMENT_FOREST','%TBASS_EAX_ENVIRONMENT_GENERIC','%TBASS_EAX_ENVIRONMENT_HALLWAY',
+            '%TBASS_EAX_ENVIRONMENT_HANGAR','%TBASS_EAX_ENVIRONMENT_LIVINGROOM','%TBASS_EAX_ENVIRONMENT_MOUNTAINS','%TBASS_EAX_ENVIRONMENT_PADDEDCELL','%TBASS_EAX_ENVIRONMENT_PARKINGLOT','%TBASS_EAX_ENVIRONMENT_PLAIN','%TBASS_EAX_ENVIRONMENT_PSYCHOTIC','%TBASS_EAX_ENVIRONMENT_QUARRY',
+            '%TBASS_EAX_ENVIRONMENT_ROOM','%TBASS_EAX_ENVIRONMENT_SEWERPIPE','%TBASS_EAX_ENVIRONMENT_STONECORRIDOR','%TBASS_EAX_ENVIRONMENT_STONEROOM','%TBASS_EAX_ENVIRONMENT_UNDERWATER','%TBASS_ERROR_ALREADY','%TBASS_ERROR_BUFLOST','%TBASS_ERROR_CODEC',
+            '%TBASS_ERROR_CREATE','%TBASS_ERROR_DECODE','%TBASS_ERROR_DEVICE','%TBASS_ERROR_DRIVER','%TBASS_ERROR_DX','%TBASS_ERROR_EMPTY','%TBASS_ERROR_FILEFORM','%TBASS_ERROR_FILEOPEN',
+            '%TBASS_ERROR_FORMAT','%TBASS_ERROR_FREQ','%TBASS_ERROR_HANDLE','%TBASS_ERROR_ILLPARAM','%TBASS_ERROR_ILLTYPE','%TBASS_ERROR_INIT','%TBASS_ERROR_MEM','%TBASS_ERROR_NO3D',
+            '%TBASS_ERROR_NOCHAN','%TBASS_ERROR_NOEAX','%TBASS_ERROR_NOFX','%TBASS_ERROR_NOHW','%TBASS_ERROR_NONET','%TBASS_ERROR_NOPAUSE','%TBASS_ERROR_NOPLAY','%TBASS_ERROR_NOTAVAIL',
+            '%TBASS_ERROR_NOTFILE','%TBASS_ERROR_PLAYING','%TBASS_ERROR_POSITION','%TBASS_ERROR_SPEAKER','%TBASS_ERROR_START','%TBASS_ERROR_TIMEOUT','%TBASS_ERROR_UNKNOWN','%TBASS_ERROR_VERSION',
+            '%TBASS_FALSE','%TBASS_FILEPOS_CURRENT','%TBASS_FILEPOS_DECODE','%TBASS_FILEPOS_DOWNLOAD','%TBASS_FILEPOS_END','%TBASS_FILEPOS_START','%TBASS_FILE_CLOSE','%TBASS_FILE_LEN',
+            '%TBASS_FILE_READ','%TBASS_FILE_SEEK','%TBASS_FX_CHORUS','%TBASS_FX_COMPRESSOR','%TBASS_FX_DISTORTION','%TBASS_FX_ECHO','%TBASS_FX_FLANGER','%TBASS_FX_GARGLE',
+            '%TBASS_FX_I3DL2REVERB','%TBASS_FX_PARAMEQ','%TBASS_FX_PHASE_180','%TBASS_FX_PHASE_90','%TBASS_FX_PHASE_NEG_180','%TBASS_FX_PHASE_NEG_90','%TBASS_FX_PHASE_ZERO','%TBASS_FX_REVERB',
+            '%TBASS_INPUT_LEVEL','%TBASS_INPUT_OFF','%TBASS_INPUT_ON','%TBASS_INPUT_TYPE_ANALOG','%TBASS_INPUT_TYPE_AUX','%TBASS_INPUT_TYPE_CD','%TBASS_INPUT_TYPE_DIGITAL','%TBASS_INPUT_TYPE_LINE',
+            '%TBASS_INPUT_TYPE_MASK','%TBASS_INPUT_TYPE_MIC','%TBASS_INPUT_TYPE_PHONE','%TBASS_INPUT_TYPE_SPEAKER','%TBASS_INPUT_TYPE_SYNTH','%TBASS_INPUT_TYPE_UNDEF','%TBASS_INPUT_TYPE_WAVE','%TBASS_MP3_SETPOS',
+            '%TBASS_MUSIC_3D','%TBASS_MUSIC_ATTRIB_AMPLIFY','%TBASS_MUSIC_ATTRIB_BPM','%TBASS_MUSIC_ATTRIB_PANSEP','%TBASS_MUSIC_ATTRIB_PSCALER','%TBASS_MUSIC_ATTRIB_SPEED','%TBASS_MUSIC_ATTRIB_VOL_CHAN','%TBASS_MUSIC_ATTRIB_VOL_GLOBAL',
+            '%TBASS_MUSIC_ATTRIB_VOL_INST','%TBASS_MUSIC_AUTOFREE','%TBASS_MUSIC_CALCLEN','%TBASS_MUSIC_DECODE','%TBASS_MUSIC_FLOAT','%TBASS_MUSIC_FT2MOD','%TBASS_MUSIC_FX','%TBASS_MUSIC_LOOP',
+            '%TBASS_MUSIC_MONO','%TBASS_MUSIC_NONINTER','%TBASS_MUSIC_NOSAMPLE','%TBASS_MUSIC_POSRESET','%TBASS_MUSIC_POSRESETEX','%TBASS_MUSIC_PRESCAN','%TBASS_MUSIC_PT1MOD','%TBASS_MUSIC_RAMP',
+            '%TBASS_MUSIC_RAMPS','%TBASS_MUSIC_STOPBACK','%TBASS_MUSIC_SURROUND','%TBASS_MUSIC_SURROUND2','%TBASS_OBJECT_DS','%TBASS_OBJECT_DS3DL','%TBASS_OK','%TBASS_RECORD_PAUSE',
+            '%TBASS_SAMPLE_3D','%TBASS_SAMPLE_8BITS','%TBASS_SAMPLE_FLOAT','%TBASS_SAMPLE_FX','%TBASS_SAMPLE_LOOP','%TBASS_SAMPLE_MONO','%TBASS_SAMPLE_MUTEMAX','%TBASS_SAMPLE_OVER_DIST',
+            '%TBASS_SAMPLE_OVER_POS','%TBASS_SAMPLE_OVER_VOL','%TBASS_SAMPLE_SOFTWARE','%TBASS_SAMPLE_VAM','%TBASS_SLIDE_FREQ','%TBASS_SLIDE_PAN','%TBASS_SLIDE_VOL','%TBASS_SPEAKER_CENLFE',
+            '%TBASS_SPEAKER_CENTER','%TBASS_SPEAKER_FRONT','%TBASS_SPEAKER_FRONTLEFT','%TBASS_SPEAKER_FRONTRIGHT','%TBASS_SPEAKER_LEFT','%TBASS_SPEAKER_LFE','%TBASS_SPEAKER_REAR','%TBASS_SPEAKER_REAR2',
+            '%TBASS_SPEAKER_REAR2LEFT','%TBASS_SPEAKER_REAR2RIGHT','%TBASS_SPEAKER_REARLEFT','%TBASS_SPEAKER_REARRIGHT','%TBASS_SPEAKER_RIGHT','%TBASS_STREAMPROC_END','%TBASS_STREAM_AUTOFREE','%TBASS_STREAM_BLOCK',
+            '%TBASS_STREAM_DECODE','%TBASS_STREAM_PRESCAN','%TBASS_STREAM_RESTRATE','%TBASS_STREAM_STATUS','%TBASS_SYNC_DOWNLOAD','%TBASS_SYNC_END','%TBASS_SYNC_FREE','%TBASS_SYNC_MESSAGE',
+            '%TBASS_SYNC_META','%TBASS_SYNC_MIXTIME','%TBASS_SYNC_MUSICFX','%TBASS_SYNC_MUSICINST','%TBASS_SYNC_MUSICPOS','%TBASS_SYNC_ONETIME','%TBASS_SYNC_POS','%TBASS_SYNC_SLIDE',
+            '%TBASS_SYNC_STALL','%TBASS_TAG_HTTP','%TBASS_TAG_ICY','%TBASS_TAG_ID3','%TBASS_TAG_ID3V2','%TBASS_TAG_META','%TBASS_TAG_MUSIC_INST','%TBASS_TAG_MUSIC_MESSAGE',
+            '%TBASS_TAG_MUSIC_NAME','%TBASS_TAG_MUSIC_SAMPLE','%TBASS_TAG_OGG','%TBASS_TAG_RIFF_INFO','%TBASS_TAG_VENDOR','%TBASS_TRUE','%TBASS_UNICODE','%TBASS_VAM_HARDWARE',
+            '%TBASS_VAM_SOFTWARE','%TBASS_VAM_TERM_DIST','%TBASS_VAM_TERM_PRIO','%TBASS_VAM_TERM_TIME','%TBASS_VERSION','%TBCD_CHANNEL','%TBCD_THUMB','%TBCD_TICS',
+            '%TBGL_ALIGN_CENTER','%TBGL_ALIGN_CENTER_CENTER','%TBGL_ALIGN_CENTER_DOWN','%TBGL_ALIGN_CENTER_UP','%TBGL_ALIGN_LEFT','%TBGL_ALIGN_LEFT_CENTER','%TBGL_ALIGN_LEFT_DOWN','%TBGL_ALIGN_LEFT_UP',
+            '%TBGL_ALIGN_RIGHT','%TBGL_ALIGN_RIGHT_CENTER','%TBGL_ALIGN_RIGHT_DOWN','%TBGL_ALIGN_RIGHT_UP','%TBGL_ALWAYS','%TBGL_EQUAL','%TBGL_ERROR_FILE','%TBGL_ERROR_MSGBOX',
+            '%TBGL_ERROR_NONE','%TBGL_GEQUAL','%TBGL_GREATER','%TBGL_LEQUAL','%TBGL_LESS','%TBGL_LIGHT_AMBIENT','%TBGL_LIGHT_CONSTANT_ATTENUATION','%TBGL_LIGHT_DIFFUSE',
+            '%TBGL_LIGHT_LINEAR_ATTENUATION','%TBGL_LIGHT_POSITION','%TBGL_LIGHT_QUADRATIC_ATTENUATION','%TBGL_LIGHT_SPECULAR','%TBGL_LIGHT_SPOT_CUTOFF','%TBGL_LIGHT_SPOT_DIRECTION','%TBGL_LIGHT_SPOT_EXPONENT','%TBGL_M15B',
+            '%TBGL_M15G','%TBGL_M15LAYER','%TBGL_M15PSTOP','%TBGL_M15R','%TBGL_M15TEXN','%TBGL_M15TEXX','%TBGL_M15TEXY','%TBGL_M15X',
+            '%TBGL_M15Y','%TBGL_M15Z','%TBGL_NEVER','%TBGL_NORMAL_NONE','%TBGL_NORMAL_PRECISE','%TBGL_NORMAL_SMOOTH','%TBGL_NOTEQUAL','%TBGL_OBJ_CUBE',
+            '%TBGL_OBJ_CUBE3','%TBGL_OBJ_CYLINDER','%TBGL_OBJ_SPHERE','%TBGL_PINFO_RGB','%TBGL_PINFO_XYZ','%TBGL_TEX_LINEAR','%TBGL_TEX_MIPMAP','%TBGL_TEX_NEAREST',
+            '%TBM_CLEARSEL','%TBM_CLEARTICS','%TBM_GETBUDDY','%TBM_GETCHANNELRECT','%TBM_GETLINESIZE','%TBM_GETNUMTICS','%TBM_GETPAGESIZE','%TBM_GETPOS',
+            '%TBM_GETPTICS','%TBM_GETRANGEMAX','%TBM_GETRANGEMIN','%TBM_GETSELEND','%TBM_GETSELSTART','%TBM_GETTHUMBLENGTH','%TBM_GETTHUMBRECT','%TBM_GETTIC',
+            '%TBM_GETTICPOS','%TBM_GETTOOLTIPS','%TBM_GETUNICODEFORMAT','%TBM_SETBUDDY','%TBM_SETLINESIZE','%TBM_SETPAGESIZE','%TBM_SETPOS','%TBM_SETRANGE',
+            '%TBM_SETRANGEMAX','%TBM_SETRANGEMIN','%TBM_SETSEL','%TBM_SETSELEND','%TBM_SETSELSTART','%TBM_SETTHUMBLENGTH','%TBM_SETTIC','%TBM_SETTICFREQ',
+            '%TBM_SETTIPSIDE','%TBM_SETTOOLTIPS','%TBM_SETUNICODEFORMAT','%TBS_AUTOTICKS','%TBS_BOTH','%TBS_BOTTOM','%TBS_DOWNISLEFT','%TBS_ENABLESELRANGE',
+            '%TBS_FIXEDLENGTH','%TBS_HORZ','%TBS_LEFT','%TBS_NOTHUMB','%TBS_NOTICKS','%TBS_REVERSED','%TBS_RIGHT','%TBS_TOOLTIPS',
+            '%TBS_TOP','%TBS_VERT','%TBTS_BOTTOM','%TBTS_LEFT','%TBTS_RIGHT','%TBTS_TOP','%TB_%VT_BSTR','%TB_%VT_CY',
+            '%TB_%VT_DATE','%TB_%VT_EMPTY','%TB_%VT_I2','%TB_%VT_I4','%TB_%VT_NULL','%TB_%VT_R4','%TB_%VT_R8','%TB_BOTTOM',
+            '%TB_CLASS_E_NOAGGREGATION','%TB_CO_E_CLASSSTRING','%TB_DISPATCH_METHOD','%TB_DISPATCH_PROPERTYGET','%TB_DISPATCH_PROPERTYPUT','%TB_DISPATCH_PROPERTYPUTREF','%TB_ENDTRACK','%TB_E_INVALIDARG',
+            '%TB_E_NOINTERFACE','%TB_E_OUTOFMEMORY','%TB_IMGCTX_ACTUALSIZE','%TB_IMGCTX_AUTOSIZE','%TB_IMGCTX_FITTOHEIGHT','%TB_IMGCTX_FITTOWIDTH','%TB_IMGCTX_STRETCH','%TB_LINEDOWN',
+            '%TB_LINEUP','%TB_MK_E_CONNECTMANUALLY','%TB_MK_E_EXCEEDEDDEADLINE','%TB_MK_E_INTERMEDIATEINTERFACENOTSUPPORTED','%TB_MK_E_NOOBJECT','%TB_MK_E_SYNTAX','%TB_PAGEDOWN','%TB_PAGEUP',
+            '%TB_REGDB_E_CLASSNOTREG','%TB_REGDB_E_WRITEREGDB','%TB_SIZEOF_TBVARIANT','%TB_S_FALSE','%TB_S_OK','%TB_THUMBPOSITION','%TB_THUMBTRACK','%TB_TOP',
+            '%TCM_FIRST','%TCM_GETCURSEL','%TCN_FOCUSCHANGE','%TCN_GETOBJECT','%TCN_SELCHANGE','%TCN_SELCHANGING','%TCS_BOTTOM','%TCS_BUTTONS',
+            '%TCS_EX_FLATSEPARATORS','%TCS_EX_REGISTERDROP','%TCS_FIXEDWIDTH','%TCS_FLATBUTTONS','%TCS_FOCUSNEVER','%TCS_FOCUSONBUTTONDOWN','%TCS_FORCEICONLEFT','%TCS_FORCELABELLEFT',
+            '%TCS_HOTTRACK','%TCS_MULTILINE','%TCS_MULTISELECT','%TCS_OWNERDRAWFIXED','%TCS_RAGGEDRIGHT','%TCS_RIGHT','%TCS_RIGHTJUSTIFY','%TCS_SCROLLOPPOSITE',
+            '%TCS_SINGLELINE','%TCS_TABS','%TCS_TOOLTIPS','%TCS_VERTICAL','%TM_PLAINTEXT','%TM_RICHTEXT','%TOKENIZER_DEFAULT_ALPHA','%TOKENIZER_DEFAULT_DELIM',
+            '%TOKENIZER_DEFAULT_DQUOTE','%TOKENIZER_DEFAULT_NEWLINE','%TOKENIZER_DEFAULT_NUMERIC','%TOKENIZER_DEFAULT_SPACE','%TOKENIZER_DELIMITER','%TOKENIZER_EOL','%TOKENIZER_ERROR','%TOKENIZER_FINISHED',
+            '%TOKENIZER_NUMBER','%TOKENIZER_QUOTE','%TOKENIZER_STRING','%TOKENIZER_UNDEFTOK','%TRUE','%TV_FIRST','%UDM_GETACCEL','%UDM_GETBASE',
+            '%UDM_GETBUDDY','%UDM_GETPOS','%UDM_GETPOS32','%UDM_GETRANGE','%UDM_GETRANGE32','%UDM_GETUNICODEFORMAT','%UDM_SETACCEL','%UDM_SETBASE',
+            '%UDM_SETBUDDY','%UDM_SETPOS','%UDM_SETPOS32','%UDM_SETRANGE','%UDM_SETRANGE32','%UDM_SETUNICODEFORMAT','%UDS_ALIGNLEFT','%UDS_ALIGNRIGHT',
+            '%UDS_ARROWKEYS','%UDS_AUTOBUDDY','%UDS_HORZ','%UDS_HOTTRACK','%UDS_NOTHOUSANDS','%UDS_SETBUDDYINT','%UDS_WRAP','%UD_MAXVAL',
+            '%UD_MINVAL','%VK_0','%VK_1','%VK_2','%VK_3','%VK_4','%VK_5','%VK_6',
+            '%VK_7','%VK_8','%VK_9','%VK_A','%VK_ACCEPT','%VK_ADD','%VK_APPS','%VK_B',
+            '%VK_BACK','%VK_C','%VK_CANCEL','%VK_CAPITAL','%VK_CLEAR','%VK_CONTROL','%VK_CONVERT','%VK_D',
+            '%VK_DECIMAL','%VK_DELETE','%VK_DIVIDE','%VK_DOWN','%VK_E','%VK_END','%VK_ESCAPE','%VK_EXECUTE',
+            '%VK_F','%VK_F1','%VK_F10','%VK_F11','%VK_F12','%VK_F13','%VK_F14','%VK_F15',
+            '%VK_F16','%VK_F17','%VK_F18','%VK_F19','%VK_F2','%VK_F20','%VK_F21','%VK_F22',
+            '%VK_F23','%VK_F24','%VK_F3','%VK_F4','%VK_F5','%VK_F6','%VK_F7','%VK_F8',
+            '%VK_F9','%VK_FINAL','%VK_G','%VK_H','%VK_HANGEUL','%VK_HANGUL','%VK_HANJA','%VK_HELP',
+            '%VK_HOME','%VK_I','%VK_INSERT','%VK_J','%VK_JUNJA','%VK_K','%VK_KANA','%VK_KANJI',
+            '%VK_L','%VK_LBUTTON','%VK_LEFT','%VK_LINEFEED','%VK_LWIN','%VK_M','%VK_MBUTTON','%VK_MENU',
+            '%VK_MODECHANGE','%VK_MULTIPLY','%VK_N','%VK_NEXT','%VK_NONCONVERT','%VK_NUMLOCK','%VK_NUMPAD0','%VK_NUMPAD1',
+            '%VK_NUMPAD2','%VK_NUMPAD3','%VK_NUMPAD4','%VK_NUMPAD5','%VK_NUMPAD6','%VK_NUMPAD7','%VK_NUMPAD8','%VK_NUMPAD9',
+            '%VK_O','%VK_P','%VK_PAUSE','%VK_PGDN','%VK_PGUP','%VK_PRINT','%VK_PRIOR','%VK_Q',
+            '%VK_R','%VK_RBUTTON','%VK_RETURN','%VK_RIGHT','%VK_RWIN','%VK_S','%VK_SCROLL','%VK_SELECT',
+            '%VK_SEPARATOR','%VK_SHIFT','%VK_SLEEP','%VK_SNAPSHOT','%VK_SPACE','%VK_SUBTRACT','%VK_T','%VK_TAB',
+            '%VK_U','%VK_UP','%VK_V','%VK_W','%VK_X','%VK_XBUTTON1','%VK_XBUTTON2','%VK_Y',
+            '%VK_Z','%VT_ARRAY','%VT_BLOB','%VT_BLOB_OBJECT','%VT_BOOL','%VT_BSTR','%VT_BYREF','%VT_CARRAY',
+            '%VT_CF','%VT_CLSID','%VT_CY','%VT_DATE','%VT_DISPATCH','%VT_EMPTY','%VT_ERROR','%VT_FILETIME',
+            '%VT_HRESULT','%VT_I1','%VT_I2','%VT_I4','%VT_I8','%VT_INT','%VT_LPSTR','%VT_LPWSTR',
+            '%VT_NULL','%VT_PTR','%VT_R4','%VT_R8','%VT_RECORD','%VT_RESERVED','%VT_SAFEARRAY','%VT_STORAGE',
+            '%VT_STORED_OBJECT','%VT_STREAM','%VT_STREAMED_OBJECT','%VT_UI1','%VT_UI2','%VT_UI4','%VT_UI8','%VT_UINT',
+            '%VT_UNKNOWN','%VT_USERDEFINED','%VT_VARIANT','%VT_VECTOR','%VT_VOID','%WAVE_FORMAT_1M08','%WAVE_FORMAT_1M16','%WAVE_FORMAT_1S08',
+            '%WAVE_FORMAT_1S16','%WAVE_FORMAT_2M08','%WAVE_FORMAT_2M16','%WAVE_FORMAT_2S08','%WAVE_FORMAT_2S16','%WAVE_FORMAT_4M08','%WAVE_FORMAT_4M16','%WAVE_FORMAT_4S08',
+            '%WAVE_FORMAT_4S16','%WBF_CUSTOM','%WBF_LEVEL1','%WBF_LEVEL2','%WBF_OVERFLOW','%WBF_WORDBREAK','%WBF_WORDWRAP','%WHITE',
+            '%WIN_FINDTITLECONTAIN','%WIN_FINDTITLEEND','%WIN_FINDTITLEEQUAL','%WIN_FINDTITLESTART','%WM_ACTIVATE','%WM_ACTIVATEAPP','%WM_CAPTURECHANGED','%WM_CHAR',
+            '%WM_CLOSE','%WM_COMMAND','%WM_DESTROY','%WM_DROPFILES','%WM_ERASEBKGND','%WM_GETTEXTLENGTH','%WM_HOTKEY','%WM_HSCROLL',
+            '%WM_IDLE','%WM_INITDIALOG','%WM_KEYDOWN','%WM_KEYUP','%WM_KILLFOCUS','%WM_LBUTTONDBLCLK','%WM_LBUTTONDOWN','%WM_LBUTTONUP',
+            '%WM_MBUTTONDBLCLK','%WM_MBUTTONDOWN','%WM_MBUTTONUP','%WM_MOUSEFIRST','%WM_MOUSEMOVE','%WM_MOUSEWHEEL','%WM_MOVE','%WM_MOVING',
+            '%WM_NCLBUTTONDOWN','%WM_NCRBUTTONDOWN','%WM_NEXTDLGCTL','%WM_NOTIFY','%WM_PAINT','%WM_QUIT','%WM_RBUTTONDBLCLK','%WM_RBUTTONDOWN',
+            '%WM_RBUTTONUP','%WM_SETFOCUS','%WM_SETFONT','%WM_SETTEXT','%WM_SIZE','%WM_SIZING','%WM_SYSCOMMAND','%WM_TIMER',
+            '%WM_USER','%WM_VSCROLL','%WS_BORDER','%WS_CAPTION','%WS_CHILD','%WS_CLIPCHILDREN','%WS_CLIPSIBLINGS','%WS_DISABLED',
+            '%WS_DLGFRAME','%WS_EX_ACCEPTFILES','%WS_EX_APPWINDOW','%WS_EX_CLIENTEDGE','%WS_EX_CONTEXTHELP','%WS_EX_CONTROLPARENT','%WS_EX_LAYERED','%WS_EX_LEFT',
+            '%WS_EX_LEFTSCROLLBAR','%WS_EX_LTRREADING','%WS_EX_MDICHILD','%WS_EX_NOPARENTNOTIFY','%WS_EX_OVERLAPPEDWINDOW','%WS_EX_PALETTEWINDOW','%WS_EX_RIGHT','%WS_EX_RIGHTSCROLLBAR',
+            '%WS_EX_RTLREADING','%WS_EX_STATICEDGE','%WS_EX_TOOLWINDOW','%WS_EX_TOPMOST','%WS_EX_TRANSPARENT','%WS_EX_WINDOWEDGE','%WS_GROUP','%WS_HSCROLL',
+            '%WS_ICONIC','%WS_MAXIMIZE','%WS_MAXIMIZEBOX','%WS_MINIMIZE','%WS_MINIMIZEBOX','%WS_OVERLAPPEDWINDOW','%WS_POPUP','%WS_POPUPWINDOW',
+            '%WS_SYSMENU','%WS_TABSTOP','%WS_THICKFRAME','%WS_VISIBLE','%WS_VSCROLL','%YELLOW','%ZERO','CRLF',
+            'FALSE','M_E','M_PI','NULL','TAB','TRUE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #993333; font-style: italic; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #333333;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #333333;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '_'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tsql.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tsql.php
new file mode 100644
index 000000000..fca874954
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/tsql.php
@@ -0,0 +1,375 @@
+<?php
+/*************************************************************************************
+ * tsql.php
+ * --------
+ * Author: Duncan Lock (dunc@dflock.co.uk)
+ * Copyright: (c) 2006 Duncan Lock (http://dflock.co.uk/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/11/22
+ *
+ * T-SQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/01/23 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/01/23)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'T-SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            // Datatypes
+            'bigint', 'int', 'smallint', 'tinyint', 'bit', 'decimal', 'numeric', 'money',
+            'smallmoney', 'float', 'real', 'datetime', 'smalldatetime', 'char', 'varchar',
+            'text', 'nchar', 'nvarchar', 'ntext', 'binary', 'varbinary', 'image', 'cursor',
+            'sql_variant', 'table', 'timestamp', 'uniqueidentifier',
+
+            // Keywords
+            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALTER', 'ARE', 'ARRAY', 'AS',
+            'ASC', 'ASSERTION', 'AT', 'AUTHORIZATION', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
+            'BREAK', 'BROWSE', 'BULK', 'BY', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CHAR', 'CHARACTER', 'CHECK', 'CHECKPOINT',
+            'CLASS', 'CLOB', 'CLOSE', 'CLUSTERED', 'COALESCE', 'COLLATE', 'COLLATION', 'COLUMN', 'COMMIT', 'COMPLETION', 'COMPUTE', 'CONNECT',
+            'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CONVERT', 'CORRESPONDING', 'CREATE',
+            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+            'CURSOR', 'CYCLE', 'DATA', 'DATABASE', 'DATE', 'DAY', 'DBCC', 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
+            'DEFERRED', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
+            'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DUMMY', 'DUMP', 'DYNAMIC',
+            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
+            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOREIGN', 'FOUND', 'FREE', 'FREETEXT', 'FREETEXTTABLE',
+            'FROM', 'FULL', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST', 'HOUR',
+            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
+            'INNER', 'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
+            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LEFT', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
+            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MATCH', 'MINUTE', 'MODIFIES', 'MODIFY', 'MODULE', 'MONTH', 'NAMES', 'NATIONAL',
+            'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCHECK', 'NONCLUSTERED', 'NONE', 'NULLIF', 'NUMERIC', 'OBJECT', 'OF',
+            'OFF', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
+            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARTIAL', 'PATH', 'PERCENT', 'PLAN',
+            'POSTFIX', 'PRECISION', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
+            'PUBLIC', 'RAISERROR', 'READ', 'READS', 'READTEXT', 'REAL', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
+            'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW',
+            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECTION', 'SELECT',
+            'SEQUENCE', 'SESSION', 'SESSION_USER', 'SET', 'SETS', 'SETUSER', 'SHUTDOWN', 'SIZE', 'SMALLINT', 'SPACE', 'SPECIFIC',
+            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
+            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
+            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TSEQUAL', 'UNDER', 'UNION',
+            'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES', 'VARCHAR', 'VARIABLE',
+            'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'YEAR', 'ZONE',
+            'UNCOMMITTED', 'NOCOUNT',
+            ),
+        2 => array(
+            /*
+                Built-in functions
+                Highlighted in pink.
+            */
+
+            //Configuration Functions
+            '@@DATEFIRST','@@OPTIONS','@@DBTS','@@REMSERVER','@@LANGID','@@SERVERNAME',
+            '@@LANGUAGE','@@SERVICENAME','@@LOCK_TIMEOUT','@@SPID','@@MAX_CONNECTIONS',
+            '@@TEXTSIZE','@@MAX_PRECISION','@@VERSION','@@NESTLEVEL',
+
+            //Cursor Functions
+            '@@CURSOR_ROWS','@@FETCH_STATUS',
+
+            //Date and Time Functions
+            'DATEADD','DATEDIFF','DATENAME','DATEPART','GETDATE','GETUTCDATE',
+
+            //Mathematical Functions
+            'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
+            'ATAN','LOG','SIN','ATN2','LOG10','SQUARE','CEILING','PI','SQRT','COS',
+            'POWER','TAN','COT','RADIANS',
+
+            //Meta Data Functions
+            'COL_LENGTH','COL_NAME','FULLTEXTCATALOGPROPERTY',
+            'COLUMNPROPERTY','FULLTEXTSERVICEPROPERTY','DATABASEPROPERTY','INDEX_COL',
+            'DATABASEPROPERTYEX','INDEXKEY_PROPERTY','DB_ID','INDEXPROPERTY','DB_NAME',
+            'OBJECT_ID','FILE_ID','OBJECT_NAME','FILE_NAME','OBJECTPROPERTY','FILEGROUP_ID',
+            '@@PROCID','FILEGROUP_NAME','SQL_VARIANT_PROPERTY','FILEGROUPPROPERTY',
+            'TYPEPROPERTY','FILEPROPERTY',
+
+            //Security Functions
+            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
+            'HAS_DBACCESS','IS_MEMBER',
+
+            //String Functions
+            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
+            'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
+            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
+
+            //System Functions
+            'APP_NAME','COLLATIONPROPERTY','@@ERROR','FORMATMESSAGE',
+            'GETANSINULL','HOST_ID','HOST_NAME','IDENT_CURRENT','IDENT_INCR',
+            'IDENT_SEED','@@IDENTITY','ISDATE','ISNUMERIC','PARSENAME','PERMISSIONS',
+            '@@ROWCOUNT','ROWCOUNT_BIG','SCOPE_IDENTITY','SERVERPROPERTY','SESSIONPROPERTY',
+            'STATS_DATE','@@TRANCOUNT','USER_NAME',
+
+            //System Statistical Functions
+            '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
+            '@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
+            '@@TOTAL_READ','@@PACKET_ERRORS','@@TOTAL_WRITE',
+
+            //Text and Image Functions
+            'TEXTPTR','TEXTVALID',
+
+            //Aggregate functions
+            'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
+            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
+            ),
+        3 => array(
+            /*
+                System stored procedures
+                Higlighted dark brown
+            */
+
+            //Active Directory Procedures
+            'sp_ActiveDirectory_Obj', 'sp_ActiveDirectory_SCP',
+
+            //Catalog Procedures
+            'sp_column_privileges', 'sp_special_columns', 'sp_columns', 'sp_sproc_columns',
+            'sp_databases', 'sp_statistics', 'sp_fkeys', 'sp_stored_procedures', 'sp_pkeys',
+            'sp_table_privileges', 'sp_server_info', 'sp_tables',
+
+            //Cursor Procedures
+            'sp_cursor_list', 'sp_describe_cursor_columns', 'sp_describe_cursor', 'sp_describe_cursor_tables',
+
+            //Database Maintenance Plan Procedures
+            'sp_add_maintenance_plan', 'sp_delete_maintenance_plan_db', 'sp_add_maintenance_plan_db',
+            'sp_delete_maintenance_plan_job', 'sp_add_maintenance_plan_job', 'sp_help_maintenance_plan',
+            'sp_delete_maintenance_plan',
+
+            //Distributed Queries Procedures
+            'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
+            'sp_primarykeys', 'sp_column_privileges_ex', 'sp_columns_ex',
+            'sp_table_privileges_ex', 'sp_tables_ex', 'sp_foreignkeys',
+
+            //Full-Text Search Procedures
+            'sp_fulltext_catalog', 'sp_help_fulltext_catalogs_cursor', 'sp_fulltext_column',
+            'sp_help_fulltext_columns', 'sp_fulltext_database', 'sp_help_fulltext_columns_cursor',
+            'sp_fulltext_service', 'sp_help_fulltext_tables', 'sp_fulltext_table',
+            'sp_help_fulltext_tables_cursor', 'sp_help_fulltext_catalogs',
+
+            //Log Shipping Procedures
+            'sp_add_log_shipping_database', 'sp_delete_log_shipping_database', 'sp_add_log_shipping_plan',
+            'sp_delete_log_shipping_plan', 'sp_add_log_shipping_plan_database',
+            'sp_delete_log_shipping_plan_database', 'sp_add_log_shipping_primary',
+            'sp_delete_log_shipping_primary', 'sp_add_log_shipping_secondary',
+            'sp_delete_log_shipping_secondary', 'sp_can_tlog_be_applied', 'sp_get_log_shipping_monitor_info',
+            'sp_change_monitor_role', 'sp_remove_log_shipping_monitor', 'sp_change_primary_role',
+            'sp_resolve_logins', 'sp_change_secondary_role', 'sp_update_log_shipping_monitor_info',
+            'sp_create_log_shipping_monitor_account', 'sp_update_log_shipping_plan',
+            'sp_define_log_shipping_monitor', 'sp_update_log_shipping_plan_database',
+
+            //OLE Automation Extended Stored Procedures
+            'sp_OACreate', 'sp_OAMethod', 'sp_OADestroy', 'sp_OASetProperty', 'sp_OAGetErrorInfo',
+            'sp_OAStop', 'sp_OAGetProperty',
+
+            //Replication Procedures
+            'sp_add_agent_parameter', 'sp_enableagentoffload', 'sp_add_agent_profile',
+            'sp_enumcustomresolvers', 'sp_addarticle', 'sp_enumdsn', 'sp_adddistpublisher',
+            'sp_enumfullsubscribers', 'sp_adddistributiondb', 'sp_expired_subscription_cleanup',
+            'sp_adddistributor', 'sp_generatefilters', 'sp_addmergealternatepublisher',
+            'sp_getagentoffloadinfo', 'sp_addmergearticle', 'sp_getmergedeletetype', 'sp_addmergefilter',
+            'sp_get_distributor', 'sp_addmergepublication', 'sp_getqueuedrows', 'sp_addmergepullsubscription',
+            'sp_getsubscriptiondtspackagename', 'sp_addmergepullsubscription_agent', 'sp_grant_publication_access',
+            'sp_addmergesubscription', 'sp_help_agent_default', 'sp_addpublication', 'sp_help_agent_parameter',
+            'sp_addpublication_snapshot', 'sp_help_agent_profile', 'sp_addpublisher70', 'sp_helparticle',
+            'sp_addpullsubscription', 'sp_helparticlecolumns', 'sp_addpullsubscription_agent', 'sp_helparticledts',
+            'sp_addscriptexec', 'sp_helpdistpublisher', 'sp_addsubscriber', 'sp_helpdistributiondb',
+            'sp_addsubscriber_schedule', 'sp_helpdistributor', 'sp_addsubscription', 'sp_helpmergealternatepublisher',
+            'sp_addsynctriggers', 'sp_helpmergearticle', 'sp_addtabletocontents', 'sp_helpmergearticlecolumn',
+            'sp_adjustpublisheridentityrange', 'sp_helpmergearticleconflicts', 'sp_article_validation',
+            'sp_helpmergeconflictrows', 'sp_articlecolumn', 'sp_helpmergedeleteconflictrows', 'sp_articlefilter',
+            'sp_helpmergefilter', 'sp_articlesynctranprocs', 'sp_helpmergepublication', 'sp_articleview',
+            'sp_helpmergepullsubscription', 'sp_attachsubscription', 'sp_helpmergesubscription', 'sp_browsesnapshotfolder',
+            'sp_helppublication', 'sp_browsemergesnapshotfolder', 'sp_help_publication_access', 'sp_browsereplcmds',
+            'sp_helppullsubscription', 'sp_change_agent_parameter', 'sp_helpreplfailovermode', 'sp_change_agent_profile',
+            'sp_helpreplicationdboption', 'sp_changearticle', 'sp_helpreplicationoption', 'sp_changedistpublisher',
+            'sp_helpsubscriberinfo', 'sp_changedistributiondb', 'sp_helpsubscription', 'sp_changedistributor_password',
+            'sp_ivindexhasnullcols', 'sp_changedistributor_property', 'sp_helpsubscription_properties', 'sp_changemergearticle',
+            'sp_link_publication', 'sp_changemergefilter', 'sp_marksubscriptionvalidation', 'sp_changemergepublication',
+            'sp_mergearticlecolumn', 'sp_changemergepullsubscription', 'sp_mergecleanupmetadata', 'sp_changemergesubscription',
+            'sp_mergedummyupdate', 'sp_changepublication', 'sp_mergesubscription_cleanup', 'sp_changesubscriber',
+            'sp_publication_validation', 'sp_changesubscriber_schedule', 'sp_refreshsubscriptions', 'sp_changesubscriptiondtsinfo',
+            'sp_reinitmergepullsubscription', 'sp_changesubstatus', 'sp_reinitmergesubscription', 'sp_change_subscription_properties',
+            'sp_reinitpullsubscription', 'sp_check_for_sync_trigger', 'sp_reinitsubscription', 'sp_copymergesnapshot',
+            'sp_removedbreplication', 'sp_copysnapshot', 'sp_repladdcolumn', 'sp_copysubscription', 'sp_replcmds',
+            'sp_deletemergeconflictrow', 'sp_replcounters', 'sp_disableagentoffload', 'sp_repldone', 'sp_drop_agent_parameter',
+            'sp_repldropcolumn', 'sp_drop_agent_profile', 'sp_replflush', 'sp_droparticle', 'sp_replicationdboption',
+            'sp_dropanonymouseagent', 'sp_replication_agent_checkup', 'sp_dropdistpublisher', 'sp_replqueuemonitor',
+            'sp_dropdistributiondb', 'sp_replsetoriginator', 'sp_dropmergealternatepublisher', 'sp_replshowcmds',
+            'sp_dropdistributor', 'sp_repltrans', 'sp_dropmergearticle', 'sp_restoredbreplication', 'sp_dropmergefilter',
+            'sp_revoke_publication_access', 'sp_scriptsubconflicttable', 'sp_dropmergepublication', 'sp_script_synctran_commands',
+            'sp_dropmergepullsubscription', 'sp_setreplfailovermode', 'sp_showrowreplicainfo', 'sp_dropmergesubscription',
+            'sp_subscription_cleanup', 'sp_droppublication', 'sp_table_validation', 'sp_droppullsubscription',
+            'sp_update_agent_profile', 'sp_dropsubscriber', 'sp_validatemergepublication', 'sp_dropsubscription',
+            'sp_validatemergesubscription', 'sp_dsninfo', 'sp_vupgrade_replication', 'sp_dumpparamcmd',
+
+            //Security Procedures
+            'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
+            'sp_dropuser', 'sp_addlogin', 'sp_grantdbaccess', 'sp_addremotelogin',
+            'sp_grantlogin', 'sp_addrole', 'sp_helpdbfixedrole', 'sp_addrolemember', 'sp_helpgroup',
+            'sp_addserver', 'sp_helplinkedsrvlogin', 'sp_addsrvrolemember', 'sp_helplogins', 'sp_adduser',
+            'sp_helpntgroup', 'sp_approlepassword', 'sp_helpremotelogin', 'sp_changedbowner', 'sp_helprole',
+            'sp_changegroup', 'sp_helprolemember', 'sp_changeobjectowner', 'sp_helprotect', 'sp_change_users_login',
+            'sp_helpsrvrole', 'sp_dbfixedrolepermission', 'sp_helpsrvrolemember', 'sp_defaultdb', 'sp_helpuser',
+            'sp_defaultlanguage', 'sp_MShasdbaccess', 'sp_denylogin', 'sp_password', 'sp_dropalias', 'sp_remoteoption',
+            'sp_dropapprole', 'sp_revokedbaccess', 'sp_dropgroup', 'sp_revokelogin', 'sp_droplinkedsrvlogin',
+            'sp_setapprole', 'sp_droplogin', 'sp_srvrolepermission', 'sp_dropremotelogin', 'sp_validatelogins', 'sp_droprole',
+
+            //SQL Mail Procedures
+            'sp_processmail', 'xp_sendmail', 'xp_deletemail', 'xp_startmail', 'xp_findnextmsg', 'xp_stopmail', 'xp_readmail',
+
+            //SQL Profiler Procedures
+            'sp_trace_create', 'sp_trace_setfilter', 'sp_trace_generateevent', 'sp_trace_setstatus', 'sp_trace_setevent',
+
+            //SQL Server Agent Procedures
+            'sp_add_alert', 'sp_help_jobhistory', 'sp_add_category', 'sp_help_jobschedule', 'sp_add_job',
+            'sp_help_jobserver', 'sp_add_jobschedule', 'sp_help_jobstep', 'sp_add_jobserver', 'sp_help_notification',
+            'sp_add_jobstep', 'sp_help_operator', 'sp_add_notification', 'sp_help_targetserver',
+            'sp_add_operator', 'sp_help_targetservergroup', 'sp_add_targetservergroup', 'sp_helptask',
+            'sp_add_targetsvrgrp_member', 'sp_manage_jobs_by_login', 'sp_addtask', 'sp_msx_defect',
+            'sp_apply_job_to_targets', 'sp_msx_enlist', 'sp_delete_alert', 'sp_post_msx_operation',
+            'sp_delete_category', 'sp_purgehistory', 'sp_delete_job', 'sp_purge_jobhistory', 'sp_delete_jobschedule',
+            'sp_reassigntask', 'sp_delete_jobserver', 'sp_remove_job_from_targets', 'sp_delete_jobstep',
+            'sp_resync_targetserver', 'sp_delete_notification', 'sp_start_job', 'sp_delete_operator',
+            'sp_stop_job', 'sp_delete_targetserver', 'sp_update_alert', 'sp_delete_targetservergroup',
+            'sp_update_category', 'sp_delete_targetsvrgrp_member', 'sp_update_job', 'sp_droptask',
+            'sp_update_jobschedule', 'sp_help_alert', 'sp_update_jobstep', 'sp_help_category',
+            'sp_update_notification', 'sp_help_downloadlist', 'sp_update_operator', 'sp_helphistory',
+            'sp_update_targetservergroup', 'sp_help_job', 'sp_updatetask', 'xp_sqlagent_proxy_account',
+
+            //System Procedures
+            'sp_add_data_file_recover_suspect_db', 'sp_helpconstraint', 'sp_addextendedproc',
+            'sp_helpdb', 'sp_addextendedproperty', 'sp_helpdevice', 'sp_add_log_file_recover_suspect_db',
+            'sp_helpextendedproc', 'sp_addmessage', 'sp_helpfile', 'sp_addtype', 'sp_helpfilegroup',
+            'sp_addumpdevice', 'sp_helpindex', 'sp_altermessage', 'sp_helplanguage', 'sp_autostats',
+            'sp_helpserver', 'sp_attach_db', 'sp_helpsort', 'sp_attach_single_file_db', 'sp_helpstats',
+            'sp_bindefault', 'sp_helptext', 'sp_bindrule', 'sp_helptrigger', 'sp_bindsession',
+            'sp_indexoption', 'sp_certify_removable', 'sp_invalidate_textptr', 'sp_configure',
+            'sp_lock', 'sp_create_removable', 'sp_monitor', 'sp_createstats', 'sp_procoption',
+            'sp_cycle_errorlog', 'sp_recompile', 'sp_datatype_info', 'sp_refreshview', 'sp_dbcmptlevel',
+            'sp_releaseapplock', 'sp_dboption', 'sp_rename', 'sp_dbremove', 'sp_renamedb',
+            'sp_delete_backuphistory', 'sp_resetstatus', 'sp_depends', 'sp_serveroption', 'sp_detach_db',
+            'sp_setnetname', 'sp_dropdevice', 'sp_settriggerorder', 'sp_dropextendedproc', 'sp_spaceused',
+            'sp_dropextendedproperty', 'sp_tableoption', 'sp_dropmessage', 'sp_unbindefault', 'sp_droptype',
+            'sp_unbindrule', 'sp_executesql', 'sp_updateextendedproperty', 'sp_getapplock', 'sp_updatestats',
+            'sp_getbindtoken', 'sp_validname', 'sp_help', 'sp_who',
+
+            //Web Assistant Procedures
+            'sp_dropwebtask', 'sp_makewebtask', 'sp_enumcodepages', 'sp_runwebtask',
+
+            //XML Procedures
+            'sp_xml_preparedocument', 'sp_xml_removedocument',
+
+            //General Extended Procedures
+            'xp_cmdshellxp_logininfo', 'xp_enumgroups', 'xp_msver', 'xp_findnextmsgxp_revokelogin',
+            'xp_grantlogin', 'xp_sprintf', 'xp_logevent', 'xp_sqlmaint', 'xp_loginconfig', 'xp_sscanf',
+
+            //API System Stored Procedures
+            'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen',
+            'sp_cursoroption', 'sp_cursorprepare', 'sp_cursorunprepare', 'sp_execute', 'sp_prepare', 'sp_unprepare',
+
+            //Misc
+            'sp_createorphan', 'sp_droporphans', 'sp_reset_connection', 'sp_sdidebug'
+            ),
+        4 => array(
+            //Function/sp's higlighted brown.
+            'fn_helpcollations', 'fn_listextendedproperty ', 'fn_servershareddrives',
+            'fn_trace_geteventinfo', 'fn_trace_getfilterinfo', 'fn_trace_getinfo',
+            'fn_trace_gettable', 'fn_virtualfilestats','fn_listextendedproperty',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=',
+        '<=>', '<>', '=', '>', '>=', '>>', '^', 'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS',
+        'EXISTS', 'IN', 'JOIN', 'LIKE', 'NOT', 'NULL', 'OR', 'OUTER', 'SOME', '|', '||', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #FF00FF;',
+            3 => 'color: #AF0000;',
+            4 => 'color: #AF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080;',
+            'MULTI' => 'color: #008080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/typoscript.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/typoscript.php
new file mode 100644
index 000000000..1e8243c2e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/typoscript.php
@@ -0,0 +1,300 @@
+<?php
+/*************************************************************************************
+ * typoscript.php
+ * --------
+ * Author: Jan-Philipp Halle (typo3@jphalle.de)
+ * Copyright: (c) 2005 Jan-Philipp Halle (http://www.jphalle.de/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/07/29
+ *
+ * TypoScript language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/07/11 (1.0.8)
+ * - Michiel Roos <geshi@typofree.org> Complete rewrite
+ * 2005/07/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * <things-to-do>
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'TypoScript',
+    'COMMENT_SINGLE' => array(1  => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => '/(?<!(#|\'|"))(?:#(?!(?:[a-fA-F0-9]{6}|[a-fA-F0-9]{3}))[^\n#]+|#{2}[^\n#]+|#{7,999}[^\n]+)/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        // Conditions: http://documentation.typo3.org/documentation/tsref/conditions/
+        1 => array(
+            'browser', 'compatVersion', 'dayofmonth', 'dayofweek', 'device',
+            'globalString', 'globalVars', 'hostname', 'hour',
+            'ip', 'language', 'loginUser', 'loginuser', 'minute',
+            'month', 'PIDinRootline', 'PIDupinRootline',
+            'system', 'treelevel', 'useragent', 'userFunc',
+            'usergroup', 'version'
+            ),
+
+        // Functions: http://documentation.typo3.org/documentation/tsref/functions/
+        2 => array(
+            'addParams', 'encapsLines', 'filelink', 'HTMLparser',
+            'HTMLparser_tags', 'if', 'imageLinkWrap',
+            'imgResource', 'makelinks', 'numRows', 'parseFunc',
+            'select', 'split', 'stdWrap', 'tableStyle', 'tags',
+            'textStyle', 'typolink'
+            ),
+
+        // Toplevel objects: http://documentation.typo3.org/documentation/tsref/tlo-objects/
+        3 => array(
+            'CARRAY', 'CONFIG', 'CONSTANTS', 'FE_DATA', 'FE_TABLE', 'FRAME',
+            'FRAMESET', 'META', 'PAGE', 'plugin'
+            ),
+
+        // Content Objects (cObject) : http://documentation.typo3.org/documentation/tsref/cobjects/
+        4 => array(
+            'CASE', 'CLEARGIF', 'COA', 'COA_INT', 'COBJ_ARRAY', 'COLUMNS',
+            'CONTENT', 'CTABLE', 'EDITPANEL', 'FILE', 'FORM',
+            'HMENU', 'HRULER', 'HTML', 'IMAGE', 'IMGTEXT',
+            'IMG_RESOURCE', 'LOAD_REGISTER', 'MULTIMEDIA',
+            'OTABLE', 'PHP_SCRIPT', 'PHP_SCRIPT_EXT',
+            'PHP_SCRIPT_INT', 'RECORDS', 'RESTORE_REGISTER',
+            'SEARCHRESULT', 'TEMPLATE', 'TEXT', 'USER',
+            'USER_INT'
+            ),
+
+        // GIFBUILDER toplevel link: http://documentation.typo3.org/documentation/tsref/gifbuilder/
+        5 => array(
+            'GIFBUILDER',
+            ),
+
+        // GIFBUILDER: http://documentation.typo3.org/documentation/tsref/gifbuilder/
+        // skipped fields: IMAGE, TEXT
+        // NOTE! the IMAGE and TEXT field already are linked in group 4, they
+        // cannot be linked twice . . . . unfortunately
+        6 => array(
+            'ADJUST', 'BOX', 'CROP', 'EFFECT', 'EMBOSS',
+            'IMGMAP', 'OUTLINE', 'SCALE', 'SHADOW',
+            'WORKAREA'
+            ),
+
+        // MENU Objects: http://documentation.typo3.org/documentation/tsref/menu/
+        7 => array(
+            'GMENU', 'GMENU_FOLDOUT', 'GMENU_LAYERS', 'IMGMENU',
+            'IMGMENUITEM', 'JSMENU', 'JSMENUITEM', 'TMENU',
+            'TMENUITEM', 'TMENU_LAYERS'
+            ),
+
+        // MENU common properties: http://documentation.typo3.org/documentation/tsref/menu/common-properties/
+        8 => array(
+            'alternativeSortingField', 'begin', 'debugItemConf',
+            'imgNameNotRandom', 'imgNamePrefix',
+            'itemArrayProcFunc', 'JSWindow', 'maxItems',
+            'minItems', 'overrideId', 'sectionIndex',
+            'showAccessRestrictedPages', 'submenuObjSuffixes'
+            ),
+
+        // MENU item states: http://documentation.typo3.org/documentation/tsref/menu/item-states/
+        9 => array(
+            'ACT', 'ACTIFSUB', 'ACTIFSUBRO', 'ACTRO', 'CUR', 'CURIFSUB',
+            'CURIFSUBRO', 'CURRO', 'IFSUB', 'IFSUBRO', 'NO',
+            'SPC', 'USERDEF1', 'USERDEF1RO', 'USERDEF2',
+            'USERDEF2RO', 'USR', 'USRRO'
+            ),
+        ),
+
+    // Does not include '-' because of stuff like htmlTag_langKey = en-GB and
+    // lib.nav-sub
+    'SYMBOLS' => array(
+        0 => array(
+            '|',
+            '+', '*', '/', '%',
+            '!', '&&', '^',
+            '<', '>', '=',
+            '?', ':',
+            '.'
+            ),
+        1 => array(
+            '(', ')', '{', '}', '[', ']'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ed7d14;',
+            2 => 'font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            4 => 'color: #990000; font-weight: bold;',
+            5 => 'color: #990000; font-weight: bold;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;',
+            8 => 'font-weight: bold;',
+            9 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #aaa; font-style: italic;',
+            2 => 'color: #aaa; font-style: italic;',
+            'MULTI' => 'color: #aaa; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ac14aa;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000e0; font-weight: bold;',
+            2 => 'color: #0000e0; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;',
+                // Set this to the same value as brackets above
+            1 => 'color: #009900; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            1 => 'color: #009900; font-weight: bold;',
+            2 => 'color: #3366CC;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #ed7d14;',
+            5 => 'color: #000066; font-weight: bold;',
+            6 => 'color: #009900;',
+            7 => 'color: #3366CC;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://documentation.typo3.org/documentation/tsref/conditions/{FNAME}/',
+        2 => 'http://documentation.typo3.org/documentation/tsref/functions/{FNAME}/',
+        3 => 'http://documentation.typo3.org/documentation/tsref/tlo-objects/{FNAME}/',
+        4 => 'http://documentation.typo3.org/documentation/tsref/cobjects/{FNAME}/',
+        5 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/',
+        6 => 'http://documentation.typo3.org/documentation/tsref/gifbuilder/{FNAME}/',
+        7 => 'http://documentation.typo3.org/documentation/tsref/menu/{FNAME}/',
+        8 => 'http://documentation.typo3.org/documentation/tsref/menu/common-properties/',
+        9 => 'http://documentation.typo3.org/documentation/tsref/menu/item-states/'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+            // Constant
+        0 => array(
+            GESHI_SEARCH => '(\{)(\$[a-zA-Z_\.]+[a-zA-Z0-9_\.]*)(\})',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+
+            // Constant dollar sign
+        1 => array(
+            GESHI_SEARCH => '(\$)([a-zA-Z_\.]+[a-zA-Z0-9_\.]*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+
+            // xhtml tag
+        2 => array(
+            GESHI_SEARCH => '(&lt;[a-zA-Z\!\/].*?&gt;)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+
+            // extension keys / tables: (static|user|ttx|tx|tt|fe)_something[_something]
+        3 => array(
+            GESHI_SEARCH => '(plugin\.|[^\.]\b)((?:static|user|ttx|tx|tt|fe)(?:_[0-9A-Za-z_]+?)\b)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // conditions and controls
+        4 => array(
+            GESHI_SEARCH => '(\[)(globalVar|global|end)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // lowlevel setup and constant objects
+        5 => array(
+            GESHI_SEARCH => '([^\.\$-\{]\b)(cObj|field|config|content|file|frameset|includeLibs|lib|page|plugin|register|resources|sitemap|sitetitle|styles|temp|tt_content|tt_news|types|xmlnews)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // markers
+        6 => array(
+            GESHI_SEARCH => '(###[^#]+###)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+
+            // hex color codes
+        7 => array(
+            GESHI_SEARCH => '(#[a-fA-F0-9]{6}\b|#[a-fA-F0-9]{3}\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vb.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vb.php
new file mode 100644
index 000000000..bc43ca4a8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vb.php
@@ -0,0 +1,133 @@
+<?php
+/*************************************************************************************
+ * vb.php
+ * ------
+ * Author: Roberto Rossi (rsoftware@altervista.org)
+ * Copyright: (c) 2004 Roberto Rossi (http://rsoftware.altervista.org),
+ *                     Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/08/30
+ *
+ * Visual Basic language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/08/27 (1.0.8.1)
+ *  -  changed keyword list for better Visual Studio compliance
+ * 2008/08/26 (1.0.8.1)
+ *  -  Fixed multiline comments
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/08/30 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Basic',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        // Comments (either single or multiline with _
+        1 => '/\'.*(?<! _)\n/sU',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'AddressOf', 'Alias', 'And', 'Append', 'As', 'BF', 'Binary',
+            'Boolean', 'ByRef', 'Byte', 'ByVal', 'Call', 'Case', 'CBool',
+            'CByte', 'CCur', 'CDate', 'CDbl', 'CDec', 'CInt', 'CLng',
+            'Close', 'Collection', 'Const', 'Control', 'CSng', 'CStr',
+            'Currency', 'CVar', 'Date', 'Declare', 'Dim', 'Do', 'Double',
+            'Each', 'Else', 'ElseIf', 'End', 'Enum', 'Erase', 'Error',
+            'Event', 'Exit', 'Explicit', 'False', 'For', 'Friend',
+            'Function', 'Get', 'GoSub', 'Goto', 'If', 'Implements', 'In',
+            'Input', 'Integer', 'Is', 'LBound', 'Let', 'Lib', 'Like',
+            'Line', 'Long', 'Loop', 'Mod', 'New', 'Next', 'Not',
+            'Nothing', 'Object', 'On', 'Open', 'Option', 'Optional',
+            'Or', 'Output', 'ParamArray', 'Preserve', 'Print', 'Private',
+            'Property', 'Public', 'RaiseEvent', 'Random', 'ReDim',
+            'Resume', 'Select', 'Set', 'Single', 'Static', 'Step',
+            'Stop', 'String', 'Sub', 'Then', 'To', 'True', 'Type',
+            'TypeOf', 'UBound', 'Until', 'Variant', 'While', 'With',
+            'WithEvents', 'Xor'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vbnet.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vbnet.php
new file mode 100644
index 000000000..e9f7c3e43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vbnet.php
@@ -0,0 +1,201 @@
+<?php
+/*************************************************************************************
+ * vbnet.php
+ * ---------
+ * Author: Alan Juden (alan@judenware.org)
+ * Copyright: (c) 2004 Alan Juden, Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/06/04
+ *
+ * VB.NET language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2004/11/27 (1.0.0)
+ *  -  Initial release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'vb.net',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '3DDKSHADOW', '3DHIGHLIGHT', '3DLIGHT', 'ABORT', 'ABORTRETRYIGNORE', 'ACTIVEBORDER',
+            'ACTIVETITLEBAR', 'ALIAS', 'APPLICATIONMODAL', 'APPLICATIONWORKSPACE', 'ARCHIVE',
+            'BACK', 'BINARYCOMPARE', 'BLACK', 'BLUE', 'BUTTONFACE', 'BUTTONSHADOW', 'BUTTONTEXT',
+            'CANCEL', 'CDROM', 'CR', 'CRITICAL', 'CRLF', 'CYAN', 'DEFAULT', 'DEFAULTBUTTON1',
+            'DEFAULTBUTTON2', 'DEFAULTBUTTON3', 'DESKTOP', 'DIRECTORY', 'EXCLAMATION', 'FALSE',
+            'FIXED', 'FORAPPENDING', 'FORMFEED', 'FORREADING', 'FORWRITING', 'FROMUNICODE',
+            'GRAYTEXT', 'GREEN', 'HIDDEN', 'HIDE', 'HIGHLIGHT', 'HIGHLIGHTTEXT', 'HIRAGANA',
+            'IGNORE', 'INACTIVEBORDER', 'INACTIVECAPTIONTEXT', 'INACTIVETITLEBAR', 'INFOBACKGROUND',
+            'INFORMATION', 'INFOTEXT', 'KATAKANALF', 'LOWERCASE', 'MAGENTA', 'MAXIMIZEDFOCUS',
+            'MENUBAR', 'MENUTEXT', 'METHOD', 'MINIMIZEDFOCUS', 'MINIMIZEDNOFOCUS', 'MSGBOXRIGHT',
+            'MSGBOXRTLREADING', 'MSGBOXSETFOREGROUND', 'NARROW', 'NEWLINE', 'NO', 'NORMAL',
+            'NORMALFOCUS', 'NORMALNOFOCUS', 'NULLSTRING', 'OBJECTERROR', 'OK', 'OKCANCEL', 'OKONLY',
+            'PROPERCASE', 'QUESTION', 'RAMDISK', 'READONLY', 'RED', 'REMOTE', 'REMOVABLE', 'RETRY',
+            'RETRYCANCEL', 'SCROLLBARS', 'SYSTEMFOLDER', 'SYSTEMMODAL', 'TEMPORARYFOLDER',
+            'TEXTCOMPARE', 'TITLEBARTEXT', 'TRUE', 'UNICODE', 'UNKNOWN', 'UPPERCASE', 'VERTICALTAB',
+            'VOLUME', 'WHITE', 'WIDE', 'WIN16', 'WIN32', 'WINDOWBACKGROUND', 'WINDOWFRAME',
+            'WINDOWSFOLDER', 'WINDOWTEXT', 'YELLOW', 'YES', 'YESNO', 'YESNOCANCEL'
+            ),
+        2 => array(
+            'AndAlso', 'As', 'ADDHANDLER', 'ASSEMBLY', 'AUTO', 'Binary', 'ByRef', 'ByVal', 'BEGINEPILOGUE',
+            'Else', 'ElseIf', 'Empty', 'Error', 'ENDPROLOGUE', 'EXTERNALSOURCE', 'ENVIRON', 'For',
+            'Friend', 'GET', 'HANDLES', 'Input', 'Is', 'IsNot', 'Len', 'Lock', 'Me', 'Mid', 'MUSTINHERIT', 'MustOverride',
+            'MYBASE', 'MYCLASS', 'New', 'Next', 'Nothing', 'Null', 'NOTINHERITABLE',
+            'NOTOVERRIDABLE', 'OFF', 'On', 'Option', 'Optional', 'Overloads', 'OVERRIDABLE', 'Overrides', 'ParamArray',
+            'Print', 'Private', 'Property', 'Public', 'Resume', 'Return', 'Seek', 'Static', 'Step',
+            'String', 'SHELL', 'SENDKEYS', 'SET', 'Shared', 'Then', 'Time', 'To', 'THROW', 'WithEvents'
+            ),
+        3 => array(
+            'COLLECTION', 'DEBUG', 'DICTIONARY', 'DRIVE', 'DRIVES', 'ERR', 'FILE', 'FILES',
+            'FILESYSTEMOBJECT', 'FOLDER', 'FOLDERS', 'TEXTSTREAM'
+            ),
+        4 => array(
+            'BOOLEAN', 'BYTE', 'DATE', 'DECIMIAL', 'DOUBLE', 'INTEGER', 'LONG', 'OBJECT',
+            'SINGLE STRING'
+            ),
+        5 => array(
+            'ADDRESSOF', 'AND', 'BITAND', 'BITNOT', 'BITOR', 'BITXOR',
+            'GETTYPE', 'LIKE', 'MOD', 'NOT', 'ORXOR'
+            ),
+        6 => array(
+            'APPACTIVATE', 'BEEP', 'CALL', 'CHDIR', 'CHDRIVE', 'CLASS', 'CASE', 'CATCH', 'CONST',
+            'DECLARE', 'DELEGATE', 'DELETESETTING', 'DIM', 'DO', 'DOEVENTS', 'END', 'ENUM',
+            'EVENT', 'EXIT', 'EACH', 'FUNCTION', 'FINALLY', 'IF', 'IMPORTS', 'INHERITS',
+            'INTERFACE', 'IMPLEMENTS', 'KILL', 'LOOP', 'NAMESPACE', 'OPEN', 'PUT',
+            'RAISEEVENT', 'RANDOMIZE', 'REDIM', 'REM', 'RESET', 'SAVESETTING', 'SELECT',
+            'SETATTR', 'STOP', 'SUB', 'SYNCLOCK', 'STRUCTURE', 'SHADOWS', 'SWITCH',
+            'TRY', 'WIDTH', 'WITH', 'WRITE', 'WHILE'
+            ),
+        7 => array(
+            'ABS', 'ARRAY', 'ASC', 'ASCB', 'ASCW', 'CALLBYNAME', 'CBOOL', 'CBYTE', 'CCHAR',
+            'CCHR', 'CDATE', 'CDBL', 'CDEC', 'CHOOSE', 'CHR', 'CHR$', 'CHRB', 'CHRB$', 'CHRW',
+            'CINT', 'CLNG', 'CLNG8', 'CLOSE', 'COBJ', 'COMMAND', 'COMMAND$', 'CONVERSION',
+            'COS', 'CREATEOBJECT', 'CSHORT', 'CSTR', 'CURDIR', 'CTYPE', 'CVDATE', 'DATEADD',
+            'DATEDIFF', 'DATEPART', 'DATESERIAL', 'DATEVALUE', 'DAY', 'DDB', 'DIR', 'DIR$',
+            'EOF', 'ERROR$', 'EXP', 'FILEATTR', 'FILECOPY', 'FILEDATATIME', 'FILELEN', 'FILTER',
+            'FIX', 'FORMAT', 'FORMAT$', 'FORMATCURRENCY', 'FORMATDATETIME', 'FORMATNUMBER',
+            'FORMATPERCENT', 'FREEFILE', 'FV', 'GETALLSETTINGS', 'GETATTRGETOBJECT', 'GETSETTING',
+            'HEX', 'HEX$', 'HOUR', 'IIF', 'IMESTATUS', 'INPUT$', 'INPUTB', 'INPUTB$', 'INPUTBOX',
+            'INSTR', 'INSTRB', 'INSTRREV', 'INT', 'IPMT', 'IRR', 'ISARRAY', 'ISDATE', 'ISEMPTY',
+            'ISERROR', 'ISNULL', 'ISNUMERIC', 'ISOBJECT', 'JOIN', 'LBOUND', 'LCASE', 'LCASE$',
+            'LEFT', 'LEFT$', 'LEFTB', 'LEFTB$', 'LENB', 'LINEINPUT', 'LOC', 'LOF', 'LOG', 'LTRIM',
+            'LTRIM$', 'MID$', 'MIDB', 'MIDB$', 'MINUTE', 'MIRR', 'MKDIR', 'MONTH', 'MONTHNAME',
+            'MSGBOX', 'NOW', 'NPER', 'NPV', 'OCT', 'OCT$', 'PARTITION', 'PMT', 'PPMT', 'PV',
+            'RATE', 'REPLACE', 'RIGHT', 'RIGHT$', 'RIGHTB', 'RIGHTB$', 'RMDIR', 'RND', 'RTRIM',
+            'RTRIM$', 'SECOND', 'SIN', 'SLN', 'SPACE', 'SPACE$', 'SPC', 'SPLIT', 'SQRT', 'STR', 'STR$',
+            'STRCOMP', 'STRCONV', 'STRING$', 'STRREVERSE', 'SYD', 'TAB', 'TAN', 'TIMEOFDAY',
+            'TIMER', 'TIMESERIAL', 'TIMEVALUE', 'TODAY', 'TRIM', 'TRIM$', 'TYPENAME', 'UBOUND',
+            'UCASE', 'UCASE$', 'VAL', 'WEEKDAY', 'WEEKDAYNAME', 'YEAR'
+            ),
+        8 => array(
+            'ANY', 'ATN', 'CALENDAR', 'CIRCLE', 'CURRENCY', 'DEFBOOL', 'DEFBYTE', 'DEFCUR',
+            'DEFDATE', 'DEFDBL', 'DEFDEC', 'DEFINT', 'DEFLNG', 'DEFOBJ', 'DEFSNG', 'DEFSTR',
+            'DEFVAR', 'EQV', 'GOSUB', 'IMP', 'INITIALIZE', 'ISMISSING', 'LET', 'LINE', 'LSET',
+            'RSET', 'SGN', 'SQR', 'TERMINATE', 'VARIANT', 'VARTYPE', 'WEND'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '&', '&=', '*', '*=', '+', '+=', '-', '-=', '//', '/', '/=', '=', '\\', '\\=',
+        '^', '^='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',        //Constants
+            2 => 'color: #FF8000;',        //Keywords
+            3 => 'color: #008000;',        //Data Types
+            4 => 'color: #FF0000;',        //Objects
+            5 => 'color: #804040;',        //Operators
+            6 => 'color: #0600FF;',        //Statements
+            7 => 'color: #0600FF;',        //Functions
+            8 => 'color: #0600FF;'        //Deprecated
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/verilog.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/verilog.php
new file mode 100644
index 000000000..ba1766c2d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/verilog.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * verilog.php
+ * -----------
+ * Author: G�nter Dannoritzer <dannoritzer@web.de>
+ * Copyright: (C) 2008 Guenter Dannoritzer
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/05/28
+ *
+ * Verilog language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/29
+ *   -  added regular expression to find numbers of the form 4'b001xz
+ *   -  added regular expression to find values for `timescale command
+ *   -  extended macro keywords
+ *
+ * TODO (updated 2008/05/29)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Verilog',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // keywords
+        1 => array('always', 'and', 'assign', 'begin', 'buf', 'bufif0', 'bufif1', 'case',
+            'casex', 'casez', 'cmos', 'deassign', 'default', 'defparam',
+            'disable', 'edge', 'else', 'end', 'endcase', 'endfunction',
+            'endmodule', 'endprimitive', 'endspecify', 'endtable', 'endtask',
+            'event', 'for', 'force', 'forever', 'function', 'highz0',
+            'highz1', 'if', 'ifnone', 'initial', 'inout', 'input', 'integer',
+            'join', 'large', 'macromodule', 'medium', 'module', 'nand',
+            'negedge', 'nmos', 'nor', 'not', 'notif0', 'notif1', 'or',
+            'output', 'parameter', 'pmos', 'posedge', 'primitive', 'pull0',
+            'pull1', 'pulldown', 'pullup', 'rcmos', 'real', 'realtime', 'reg',
+            'release', 'repeat', 'rnmos', 'rpmos', 'rtran', 'rtranif0',
+            'rtranif1', 'scalared', 'small', 'specify', 'specparam',
+            'strong0', 'strong1', 'supply0', 'supply1', 'table', 'task',
+            'time', 'tran', 'tranif0', 'tranif1', 'tri', 'tri0', 'tri1',
+            'triand', 'trior', 'trireg', 'vectored', 'wait', 'wand', 'weak0',
+            'weak1', 'while', 'wire', 'wor', 'xnor', 'xor'
+            ),
+        // system tasks
+        2 => array(
+            '$display', '$monitor',
+            '$dumpall', '$dumpfile', '$dumpflush', '$dumplimit', '$dumpoff',
+            '$dumpon', '$dumpvars',
+            '$fclose', '$fdisplay', '$fopen',
+            '$finish', '$fmonitor', '$fstrobe', '$fwrite',
+            '$fgetc', '$ungetc', '$fgets', '$fscanf', '$fread', '$ftell',
+            '$fseek', '$frewind', '$ferror', '$fflush', '$feof',
+            '$random',
+            '$readmemb', '$readmemh', '$readmemx',
+            '$signed', '$stime', '$stop',
+            '$strobe', '$time', '$unsigned', '$write'
+            ),
+        // macros
+        3 => array(
+            '`default-net', '`define',
+            '`celldefine', '`default_nettype', '`else', '`elsif', '`endcelldefine',
+            '`endif', '`ifdef', '`ifndef', '`include', '`line', '`nounconnected_drive',
+            '`resetall', '`timescale', '`unconnected_drive', '`undef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
+        '^', '&', '|', '~',
+        '?', ':',
+        '#', '<<', '<<<',
+        '>', '<', '>=', '<=',
+        '@', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #A52A2A; font-weight: bold;',
+            2 => 'color: #9932CC;',
+            3 => 'color: #008800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00008B; font-style: italic;',
+            'MULTI' => 'color: #00008B; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9F79EE'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #9F79EE;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0055;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #5D478B;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0055;',
+            1 => 'color: #ff0055;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // numbers
+        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
+        // time -> 1, 10, or 100; s, ms, us, ns, ps, of fs
+        1 => "1[0]{0,2}[munpf]?s"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        1 => ''
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vhdl.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vhdl.php
new file mode 100644
index 000000000..14072c9d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vhdl.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * vhdl.php
+ * --------
+ * Author: Alexander 'E-Razor' Krause (admin@erazor-zone.de)
+ * Copyright: (c) 2005 Alexander Krause
+ * Release Version: 1.0.8.4
+ * Date Started: 2005/06/15
+ *
+ * VHDL (VHSICADL, very high speed integrated circuit HDL) language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Added description of extra language features (SF#1970248)
+ *  -  Optimized regexp group 0 somewhat
+ * 2006/06/15 (1.0.0)
+ *  -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'VHDL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('%' => '%'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'access','after','alias','all','assert','attribute','architecture','begin',
+            'block','body','buffer','bus','case','component','configuration','constant',
+            'disconnect','downto','else','elsif','end','entity','exit','file','for',
+            'function','generate','generic','group','guarded','if','impure','in',
+            'inertial','inout','is','label','library','linkage','literal','loop',
+            'map','new','next','null','of','on','open','others','out','package',
+            'port','postponed','procedure','process','pure','range','record','register',
+            'reject','report','return','select','severity','signal','shared','subtype',
+            'then','to','transport','type','unaffected','units','until','use','variable',
+            'wait','when','while','with','note','warning','error','failure','and',
+            'or','xor','not','nor','used','memory','segments','dff','dffe','help_id',
+            'mod','info','latch','rising_edge','falling_edge'
+        ),
+        /*types*/
+        2 => array(
+            'bit','bit_vector','character','boolean','integer','real','time','string',
+            'severity_level','positive','natural','signed','unsigned','line','text',
+            'std_logic','std_logic_vector','std_ulogic','std_ulogic_vector','qsim_state',
+            'qsim_state_vector','qsim_12state','qsim_12state_vector','qsim_strength',
+            'mux_bit','mux_vector','reg_bit','reg_vector','wor_bit','wor_vector',
+            'work','ieee','std_logic_signed','std_logic_1164','std_logic_arith',
+            'numeric_std'
+
+        ),
+        /*operators*/
+    ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        ';',':',
+        '<','>','=','<=',':=','=>','=='
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+    ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers and scientific notation for numbers
+        0 => '(\b0x[0-9a-fA-F]+|\b\d[0-9a-fA-F]+[hH])|'.
+            '(\b\d+?(\.\d+?)?E[+\-]?\d+)|(\bns)|'.
+            "('[0-9a-zA-Z]+(?!'))",
+        //Number characters?
+        1 => "\b(''\d'')"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vim.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vim.php
new file mode 100644
index 000000000..3946c4f96
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/vim.php
@@ -0,0 +1,185 @@
+<?php
+
+/*************************************************************************************
+ * vim.php
+ * ----------------
+ * Author: Swaroop C H (swaroop@swaroopch.com)
+ * Copyright: (c) 2008 Swaroop C H (http://www.swaroopch.com)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/10/19
+ *
+ * Vim scripting language file for GeSHi.
+ *
+ * Reference: http://qbnz.com/highlighter/geshi-doc.html#language-files
+ * All keywords scraped from `:help expression-commands`.
+ * All method names scraped from `:help function-list`.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/19 (1.0.8.2)
+ * - Started.
+ *
+ * TODO (updated 2008/10/19)
+ * -------------------------
+ * - Fill out list of zillion commands
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array(
+    'LANG_NAME' => 'Vim Script',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/^\".*$/m"
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'brea', 'break', 'call', 'cat', 'catc',
+            'catch', 'con', 'cont', 'conti',
+            'contin', 'continu', 'continue', 'ec', 'echo',
+            'echoe', 'echoer', 'echoerr', 'echoh',
+            'echohl', 'echom', 'echoms', 'echomsg', 'echon',
+            'el', 'els', 'else', 'elsei', 'elseif',
+            'en', 'end', 'endi', 'endif', 'endfo',
+            'endfor', 'endt', 'endtr', 'endtry', 'endw',
+            'endwh', 'endwhi', 'endwhil', 'endwhile', 'exe', 'exec', 'execu',
+            'execut', 'execute', 'fina', 'final', 'finall', 'finally', 'for',
+            'fun', 'func', 'funct', 'functi', 'functio', 'function', 'if', 'in',
+            'let', 'lockv', 'lockva', 'lockvar', 'retu', 'retur', 'return', 'th',
+            'thr', 'thro', 'throw', 'try', 'unl', 'unle', 'unlet', 'unlo', 'unloc',
+            'unlock', 'unlockv', 'unlockva', 'unlockvar', 'wh', 'whi', 'whil',
+            'while'
+            ),
+        2 => array(
+            'autocmd', 'com', 'comm', 'comma', 'comman', 'command', 'comc',
+            'comcl', 'comcle', 'comclea', 'comclear', 'delc', 'delco',
+            'delcom', 'delcomm', 'delcomma', 'delcomman', 'delcommand',
+            '-nargs' # TODO There are zillions of commands to be added here from http://vimdoc.sourceforge.net/htmldoc/usr_toc.html
+            ),
+        3 => array(
+            'abs', 'add', 'append', 'argc', 'argidx', 'argv', 'atan',
+            'browse', 'browsedir', 'bufexists', 'buflisted', 'bufloaded',
+            'bufname', 'bufnr', 'bufwinnr', 'byte2line', 'byteidx',
+            'ceil', 'changenr', 'char2nr', 'cindent', 'clearmatches',
+            'col', 'complete', 'complete_add', 'complete_check', 'confirm',
+            'copy', 'cos', 'count', 'cscope_connection', 'cursor',
+            'deepcopy', 'delete', 'did_filetype', 'diff_filler',
+            'diff_hlID', 'empty', 'escape', 'eval', 'eventhandler',
+            'executable', 'exists', 'extend', 'expand', 'feedkeys',
+            'filereadable', 'filewritable', 'filter', 'finddir',
+            'findfile', 'float2nr', 'floor', 'fnameescape', 'fnamemodify',
+            'foldclosed', 'foldclosedend', 'foldlevel', 'foldtext',
+            'foldtextresult', 'foreground', 'garbagecollect',
+            'get', 'getbufline', 'getbufvar', 'getchar', 'getcharmod',
+            'getcmdline', 'getcmdpos', 'getcmdtype', 'getcwd', 'getfperm',
+            'getfsize', 'getfontname', 'getftime', 'getftype', 'getline',
+            'getloclist', 'getmatches', 'getpid', 'getpos', 'getqflist',
+            'getreg', 'getregtype', 'gettabwinvar', 'getwinposx',
+            'getwinposy', 'getwinvar', 'glob', 'globpath', 'has',
+            'has_key', 'haslocaldir', 'hasmapto', 'histadd', 'histdel',
+            'histget', 'histnr', 'hlexists', 'hlID', 'hostname', 'iconv',
+            'indent', 'index', 'input', 'inputdialog', 'inputlist',
+            'inputrestore', 'inputsave', 'inputsecret', 'insert',
+            'isdirectory', 'islocked', 'items', 'join', 'keys', 'len',
+            'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent',
+            'localtime', 'log10', 'map', 'maparg', 'mapcheck', 'match',
+            'matchadd', 'matcharg', 'matchdelete', 'matchend', 'matchlist',
+            'matchstr', 'max', 'min', 'mkdir', 'mode', 'nextnonblank',
+            'nr2char', 'pathshorten', 'pow', 'prevnonblank', 'printf',
+            'pumvisible', 'range', 'readfile', 'reltime', 'reltimestr',
+            'remote_expr', 'remote_foreground', 'remote_peek',
+            'remote_read', 'remote_send', 'remove', 'rename', 'repeat',
+            'resolve', 'reverse', 'round', 'search', 'searchdecl',
+            'searchpair', 'searchpairpos', 'searchpos', 'server2client',
+            'serverlist', 'setbufvar', 'setcmdpos', 'setline',
+            'setloclist', 'setmatches', 'setpos', 'setqflist', 'setreg',
+            'settabwinvar', 'setwinvar', 'shellescape', 'simplify', 'sin',
+            'sort', 'soundfold', 'spellbadword', 'spellsuggest', 'split',
+            'sqrt', 'str2float', 'str2nr', 'strftime', 'stridx', 'string',
+            'strlen', 'strpart', 'strridx', 'strtrans', 'submatch',
+            'substitute', 'synID', 'synIDattr', 'synIDtrans', 'synstack',
+            'system', 'tabpagebuflist', 'tabpagenr', 'tabpagewinnr',
+            'taglist', 'tagfiles', 'tempname', 'tolower', 'toupper', 'tr',
+            'trunc', 'type', 'values', 'virtcol', 'visualmode', 'winbufnr',
+            'wincol', 'winheight', 'winline', 'winnr', 'winrestcmd',
+            'winrestview', 'winsaveview', 'winwidth', 'writefile'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '%', '&', '*', '|', '/', '<', '>',
+        '^', '-', '+', '~', '?', ':', '$', '@', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #804040;',
+            2 => 'color: #668080;',
+            3 => 'color: #25BB4D;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #C5A22D;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false, //Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualfoxpro.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualfoxpro.php
new file mode 100644
index 000000000..0cb73c2a0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualfoxpro.php
@@ -0,0 +1,456 @@
+<?php
+/*************************************************************************************
+ * visualfoxpro.php
+ * ----------------
+ * Author: Roberto Armellin (r.armellin@tin.it)
+ * Copyright: (c) 2004 Roberto Armellin, Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/09/17
+ *
+ * Visual FoxPro language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *  -  Removed tab as a symbol char
+ * 2004/11/27 (1.0.1)
+ *  -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/10/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Fox Pro',
+    'COMMENT_SINGLE' => array(1 => "//", 2 => "\n*"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'Case', 'Else', '#Else', 'Then',
+            'Endcase', 'Enddefine', 'Enddo', 'Endfor', 'Endfunc', 'Endif', 'Endprintjob',
+            'Endproc', 'Endscan', 'Endtext', 'Endwith', '#Endif',
+            '#Elif','#Define','#If','#Include',
+            '#Itsexpression','#Readclauses','#Region','#Section','#Undef','#Wname',
+            'Define','Do',
+            'For','Function','Hidden',
+            'If','Local','Lparameter','Lparameters','Next','Otherwise',
+            'Parameters','Printjob','Procedure','Protected','Public','Scan',
+            'Text','While','With','Abs','Accept','Access','Aclass','Acopy',
+            'Acos','Adatabases','Adbobjects','Addbs','Addrelationtoenv','Addtabletoenv',
+            'Adel','Adir','Aelement','Aerror','Afields','Afont',
+            'Agetclass','Agetfileversion','Ains','Ainstance','Alen','Align',
+            'Alines','Alltrim','Alter','Amembers','Amouseobj','Anetresources',
+            'Ansitooem','Append','Aprinters','Ascan','Aselobj','Asin',
+            'Asort','Assert','Asserts','Assist','Asubscript','Asynchronous',
+            'At_c','Atan','Atc','Atcc','Atcline','Atline',
+            'Atn2','Aused','Autoform','Autoreport','Avcxclasses','Average',
+            'BarCount','BarPrompt','BatchMode','BatchUpdateCount','Begin','BellSound',
+            'BinToC','Bintoc','Bitand','Bitclear','Bitlshift','Bitnot',
+            'Bitor','Bitrshift','Bitset','Bittest','Bitxor','Bof',
+            'Browse','BrowseRefresh','Buffering','BuilderLock','COMArray','COMReturnError',
+            'CToBin','Calculate','Call','Capslock','Cd','Cdow',
+            'Ceiling','Central','Change','Char','Chdir','Chr',
+            'Chrsaw','Chrtran','Chrtranc','Close','Cmonth','Cntbar',
+            'Cntpad','Col','Comclassinfo','CommandTargetQuery','Compile','Completed',
+            'Compobj','Compute','Concat','ConnectBusy','ConnectHandle','ConnectName',
+            'ConnectString','ConnectTimeOut','ContainerReleaseType','Continue','Copy','Cos',
+            'Cot','Count','Coverage','Cpconvert','Cpcurrent','Cpdbf',
+            'Cpnotrans','Create','CreateBinary','Createobject','Createobjectex','Createoffline',
+            'CrsBuffering','CrsFetchMemo','CrsFetchSize','CrsMaxRows','CrsMethodUsed','CrsNumBatch',
+            'CrsShareConnection','CrsUseMemoSize','CrsWhereClause','Ctobin','Ctod','Ctot',
+            'Curdate','Curdir','CurrLeft','CurrSymbol','CursorGetProp','CursorSetProp',
+            'Curtime','Curval','DBGetProp','DBSetProp','DB_BufLockRow','DB_BufLockTable',
+            'DB_BufOff','DB_BufOptRow','DB_BufOptTable','DB_Complette','DB_DeleteInsert','DB_KeyAndModified',
+            'DB_KeyAndTimestamp','DB_KeyAndUpdatable','DB_LocalSQL','DB_NoPrompt','DB_Prompt','DB_RemoteSQL',
+            'DB_TransAuto','DB_TransManual','DB_TransNone','DB_Update','Datetime','Day',
+            'Dayname','Dayofmonth','Dayofweek','Dayofyear','Dbalias','Dbused',
+            'Ddeaborttrans','Ddeadvise','Ddeenabled','Ddeexecute','Ddeinitiate','Ddelasterror',
+            'Ddepoke','Dderequest','Ddesetoption','Ddesetservice','Ddesettopic','Ddeterminate',
+            'Debugout','Declare','DefOLELCid','DefaultValue','Defaultext','Degrees',
+            'DeleteTrigger','Desc','Description','Difference','Dimension','Dir',
+            'Directory','Diskspace','DispLogin','DispWarnings','Display','Dll',
+            'Dmy','DoDefault','DoEvents','Doc','Doevents','Dow',
+            'Drivetype','Drop','Dropoffline','Dtoc','Dtor','Dtos',
+            'Dtot','DynamicInputMask','Each','Edit','Eject','Elif',
+            'End','Eof','Erase','Evaluate','Event','Eventtracking',
+            'Exclude','Exclusive','Exit','Exp','Export','External',
+            'FDate','FTime','Fchsize','Fclose','Fcount','Fcreate',
+            'Feof','Ferror','FetchMemo','FetchSize','Fflush','Fgets',
+            'Filer','Filetostr','Find','Fklabel','Fkmax','Fldlist',
+            'Flock','Floor','Flush','Fontmetric','Fopen','Forceext',
+            'Forcepath','FormSetClass','FormSetLib','FormsClass','FormsLib','Found',
+            'FoxPro','Foxcode','Foxdoc','Foxgen','Foxgraph','Foxview',
+            'Fputs','Fread','French','Fseek','Fsize','Fv',
+            'Fwrite','Gather','German','GetPem','Getbar','Getcolor',
+            'Getcp','Getdir','Getenv','Getexpr','Getfile','Getfldstate',
+            'Getfont','Gethost','Getnextmodified','Getobject','Getpad','Getpict',
+            'Getprinter','Go','Gomonth','Goto','Graph','GridHorz',
+            'GridShow','GridShowPos','GridSnap','GridVert','Help','HelpOn',
+            'HelpTo','HighLightRow','Home','Hour','IMEStatus','IdleTimeOut',
+            'Idxcollate','Ifdef','Ifndef','Iif','Import','Include',
+            'Indbc','Index','Indexseek','Inkey','Inlist','Input',
+            'Insert','InsertTrigger','Insmode','IsBlank','IsFLocked','IsLeadByte',
+            'IsMouse','IsNull','IsRLocked','Isalpha','Iscolor','Isdigit',
+            'Isexclusive','Isflocked','Ishosted','Islower','Isreadonly','Isrlocked',
+            'Isupper','Italian','Japan','Join','Justdrive','Justext',
+            'Justfname','Justpath','Juststem','KeyField','KeyFieldList','Keyboard'
+            ),
+        2 => array('Keymatch','LastProject','Lastkey','Lcase','Leftc','Len',
+            'Lenc','Length','Likec','Lineno','LoadPicture','Loadpicture',
+            'Locate','Locfile','Log','Log10','Logout','Lookup',
+            'Loop','Lower','Ltrim','Lupdate','Mail','MaxRecords',
+            'Mcol','Md','Mdown','Mdx','Mdy','Memlines',
+            'Menu','Messagebox','Minute','Mkdir','Mline','Modify',
+            'Month','Monthname','Mouse','Mrkbar','Mrkpad','Mrow',
+            'Mtdll','Mton','Mwindow','Native','Ndx','Network',
+            'NoFilter','Nodefault','Normalize','Note','Now','Ntom',
+            'NullString','Numlock','Nvl','ODBChdbc','ODBChstmt','OLEDropTextInsertion',
+            'OLELCid','Objnum','Objref','Objtoclient','Objvar','Occurs',
+            'Oemtoansi','Oldval','OlePublic','Olereturnerror','On','Open',
+            'Oracle','Order','Os','Outer','PCount','Pack',
+            'PacketSize','Padc','Padl','Padr','Payment','Pcol',
+            'PemStatus','Pi','Pivot','Play','Pop','Popup',
+            'Power','PrimaryKey','Printstatus','Private','Prmbar','Prmpad',
+            'ProjectClick','Proper','Prow','Prtinfo','Push','Putfile',
+            'Pv','Qpr','Quater','QueryTimeOut','Quit','Radians',
+            'Rand','Rat','Ratc','Ratline','Rd','Rdlevel',
+            'Read','Readkey','Recall','Reccount','RecentlyUsedFiles','Recno',
+            'Recsize','Regional','Reindex','RelatedChild','RelatedTable','RelatedTag',
+            'Remove','Rename','Repeat','Replace','Replicate','Report',
+            'ResHeight','ResWidth','ResourceOn','ResourceTo','Resources','Restore',
+            'Resume','Retry','Return','Revertoffline','Rgbscheme','Rightc',
+            'Rlock','Rmdir','Rollback','Round','Rtod','Rtrim',
+            'RuleExpression','RuleText','Run','Runscript','Rview','SQLAsynchronous',
+            'SQLBatchMode','SQLCancel','SQLColumns','SQLConnect','SQLConnectTimeOut','SQLDisconnect',
+            'SQLDispLogin','SQLDispWarnings','SQLExec','SQLGetProp','SQLIdleTimeOut','SQLMoreResults',
+            'SQLPrepare','SQLQueryTimeOut','SQLSetProp','SQLTables','SQLTransactions','SQLWaitTime',
+            'Save','SavePicture','Savepicture','ScaleUnits','Scatter','Scols',
+            'Scroll','Sec','Second','Seek','Select','SendUpdates',
+            'Set','SetDefault','Setfldstate','Setup','ShareConnection','ShowOLEControls',
+            'ShowOLEInsertable','ShowVCXs','Sign','Sin','Size','SizeBox',
+            'Skpbar','Skppad','Sort','Soundex','SourceName','Sqlcommit',
+            'Sqll','Sqlrollback','Sqlstringconnect','Sqrt','Srows','StatusBar',
+            'Store','Str','Strconv','Strtofile','Strtran','Stuff',
+            'Stuffc','Substr','Substrc','Substring','Sum','Suspend',
+            'Sys','Sysmetric','TabOrdering','Table','TableRefresh','Tablerevert',
+            'Tableupdate','TagCount','TagNo','Tan','Target','This',
+            'Thisform','Thisformset','Timestamp','Timestampdiff','Total','Transactions',
+            'Transform','Trim','Truncate','Ttoc','Ttod','Txnlevel',
+            'Txtwidth','Type','Ucase','Undefine','Unlock','Unpack',
+            'Updatable','UpdatableFieldList','Update','UpdateName','UpdateNameList','UpdateTrigger',
+            'UpdateType','Updated','Upper','Upsizing','Usa','Use',
+            'UseMemoSize','Used','Val','Validate','Varread','Vartype',
+            'Version','VersionLanguage','Wait','WaitTime','Wborder','Wchild',
+            'Wcols','Week','Wexist','Wfont','WhereType','Windcmd',
+            'Windhelp','Windmemo','Windmenu','Windmodify','Windquery','Windscreen',
+            'Windsnip','Windstproc','WizardPrompt','Wlast','Wlcol','Wlrow',
+            'Wmaximum','Wminimum','Wontop','Woutput','Wparent','Wread',
+            'Wrows','Wtitle','Wvisible','Year','Zap','_Alignment',
+            '_Asciicols','_Asciirows','_Assist','_Beautify','_Box','_Browser',
+            '_Builder','_Calcmem','_Calcvalue','_Cliptext','_Converter','_Coverage',
+            '_Curobj','_Dblclick','_Diarydate','_Dos','_Foxdoc','_Foxgraph',
+            '_Gallery','_Gengraph','_Genhtml','_Genmenu','_Genpd','_Genscrn',
+            '_Genxtab','_Getexpr','_Include','_Indent','_Lmargin','_Mac',
+            '_Mbr_appnd','_Mbr_cpart','_Mbr_delet','_Mbr_font','_Mbr_goto','_Mbr_grid',
+            '_Mbr_link','_Mbr_mode','_Mbr_mvfld','_Mbr_mvprt','_Mbr_seek','_Mbr_sp100',
+            '_Mbr_sp200','_Mbr_szfld','_Mbrowse','_Mda_appnd','_Mda_avg','_Mda_brow',
+            '_Mda_calc','_Mda_copy','_Mda_count','_Mda_label','_Mda_pack','_Mda_reprt',
+            '_Mda_rindx','_Mda_setup','_Mda_sort','_Mda_sp100','_Mda_sp200','_Mda_sp300',
+            '_Mda_sum','_Mda_total','_Mdata','_Mdiary','_Med_clear','_Med_copy',
+            '_Med_cut','_Med_cvtst','_Med_find','_Med_finda','_Med_goto','_Med_insob',
+            '_Med_link','_Med_obj','_Med_paste','_Med_pref','_Med_pstlk','_Med_redo',
+            '_Med_repl','_Med_repla','_Med_slcta','_Med_sp100','_Med_sp200','_Med_sp300',
+            '_Med_sp400','_Med_sp500','_Med_undo','_Medit','_Mfi_clall','_Mfi_close',
+            '_Mfi_export','_Mfi_import','_Mfi_new','_Mfi_open','_Mfi_pgset','_Mfi_prevu',
+            '_Mfi_print','_Mfi_quit','_Mfi_revrt','_Mfi_savas','_Mfi_save','_Mfi_send',
+            '_Mfi_setup','_Mfi_sp100','_Mfi_sp200','_Mfi_sp300','_Mfi_sp400','_Mfile',
+            '_Mfiler','_Mfirst','_Mlabel','_Mlast','_Mline','_Mmacro',
+            '_Mmbldr','_Mpr_beaut','_Mpr_cancl','_Mpr_compl','_Mpr_do','_Mpr_docum',
+            '_Mpr_formwz','_Mpr_gener','_Mpr_graph','_Mpr_resum','_Mpr_sp100','_Mpr_sp200',
+            '_Mpr_sp300','_Mpr_suspend','_Mprog','_Mproj','_Mrc_appnd','_Mrc_chnge',
+            '_Mrc_cont','_Mrc_delet','_Mrc_goto','_Mrc_locat','_Mrc_recal','_Mrc_repl',
+            '_Mrc_seek','_Mrc_sp100','_Mrc_sp200','_Mrecord','_Mreport','_Mrqbe',
+            '_Mscreen','_Msm_data','_Msm_edit','_Msm_file','_Msm_format','_Msm_prog',
+            '_Msm_recrd','_Msm_systm','_Msm_text','_Msm_tools','_Msm_view','_Msm_windo',
+            '_Mst_about','_Mst_ascii','_Mst_calcu','_Mst_captr','_Mst_dbase','_Mst_diary',
+            '_Mst_filer','_Mst_help','_Mst_hphow','_Mst_hpsch','_Mst_macro','_Mst_office',
+            '_Mst_puzzl','_Mst_sp100','_Mst_sp200','_Mst_sp300','_Mst_specl','_Msysmenu',
+            '_Msystem','_Mtable','_Mtb_appnd','_Mtb_cpart','_Mtb_delet','_Mtb_delrc',
+            '_Mtb_goto','_Mtb_link','_Mtb_mvfld','_Mtb_mvprt','_Mtb_props','_Mtb_recal',
+            '_Mtb_sp100','_Mtb_sp200','_Mtb_sp300','_Mtb_sp400','_Mtb_szfld','_Mwi_arran',
+            '_Mwi_clear','_Mwi_cmd','_Mwi_color','_Mwi_debug','_Mwi_hide','_Mwi_hidea',
+            '_Mwi_min','_Mwi_move','_Mwi_rotat','_Mwi_showa','_Mwi_size','_Mwi_sp100',
+            '_Mwi_sp200','_Mwi_toolb','_Mwi_trace','_Mwi_view','_Mwi_zoom','_Mwindow',
+            '_Mwizards','_Mwz_all','_Mwz_form','_Mwz_foxdoc','_Mwz_import','_Mwz_label',
+            '_Mwz_mail','_Mwz_pivot','_Mwz_query','_Mwz_reprt','_Mwz_setup','_Mwz_table',
+            '_Mwz_upsizing','_Netware','_Oracle','_Padvance','_Pageno','_Pbpage',
+            '_Pcolno','_Pcopies','_Pdparms','_Pdriver','_Pdsetup','_Pecode',
+            '_Peject','_Pepage','_Pform','_Plength','_Plineno','_Ploffset',
+            '_Ppitch','_Pquality','_Pretext','_Pscode','_Pspacing','_Pwait',
+            '_Rmargin','_Runactivedoc','_Samples','_Screen','_Shell','_Spellchk',
+            '_Sqlserver','_Startup','_Tabs','_Tally','_Text','_Throttle',
+            '_Transport','_Triggerlevel','_Unix','_WebDevOnly','_WebMenu','_WebMsftHomePage',
+            '_WebVFPHomePage','_WebVfpOnlineSupport','_Windows','_Wizard','_Wrap','_scctext',
+            '_vfp','Additive','After','Again','Aindent','Alignright',
+            'All','Alt','Alternate','And','Ansi','Any',
+            'Aplabout','App','Array','As','Asc','Ascending',
+            'Ascii','At','Attributes','Automatic','Autosave','Avg',
+            'Bar','Before','Bell','Between','Bitmap','Blank',
+            'Blink','Blocksize','Border','Bottom','Brstatus','Bucket',
+            'Buffers','By','Candidate','Carry','Cascade','Catalog',
+            'Cdx','Center','Century','Cga','Character','Check',
+            'Classlib','Clock','Cnt','Codepage','Collate','Color',
+            'Com1','Com2','Command','Compact','Compatible','Compress',
+            'Confirm','Connection','Connections','Connstring','Console','Copies',
+            'Cpcompile','Cpdialog','Csv','Currency','Cycle','Databases',
+            'Datasource','Date','Db4','Dbc','Dbf','Dbmemo3',
+            'Debug','Decimals','Defaultsource','Deletetables','Delimited','Delimiters',
+            'Descending','Design','Development','Device','Dif','Disabled',
+            'Distinct','Dlls','Dohistory','Dos','Dosmem','Double',
+            'Driver','Duplex','Echo','Editwork','Ega25','Ega43',
+            'Ems','Ems64','Encrypt','Encryption','Environment','Escape',
+            'Events','Exact','Except','Exe','Exists','Expression',
+            'Extended','F','Fdow','Fetch','Field','Fields',
+            'File','Files','Fill','Fixed','Float','Foldconst',
+            'Font','Footer','Force','Foreign','Fox2x','Foxplus',
+            'Free','Freeze','From','Fullpath','Fw2','Fweek',
+            'Get','Gets','Global','Group','Grow','Halfheight',
+            'Having','Heading','Headings','Helpfilter','History','Hmemory',
+            'Hours','Id','In','Indexes','Information','Instruct',
+            'Int','Integer','Intensity','Intersect','Into','Is',
+            'Isometric','Key','Keycolumns','Keycomp','Keyset','Last',
+            'Ledit','Level','Library','Like','Linked','Lock',
+            'Logerrors','Long','Lpartition','Mac','Macdesktop','Machelp',
+            'Mackey','Macros','Mark','Master','Max','Maxmem',
+            'Mdi','Memlimit','Memory','Memos','Memowidth','Memvar',
+            'Menus','Messages','Middle','Min','Minimize','Minus',
+            'Mod','Modal','Module','Mono43','Movers','Multilocks',
+            'Mvarsiz','Mvcount','N','Near','Negotiate','Noalias',
+            'Noappend','Noclear','Noclose','Noconsole','Nocptrans','Nodata',
+            'Nodebug','Nodelete','Nodup','Noedit','Noeject','Noenvironment',
+            'Nofloat','Nofollow','Nogrow','Noinit','Nolgrid','Nolink',
+            'Nolock','Nomargin','Nomdi','Nomenu','Nominimize','Nomodify'
+            ),
+        3 => array('Nomouse','None','Nooptimize','Nooverwrite','Noprojecthook','Noprompt',
+            'Noread','Norefresh','Norequery','Norgrid','Norm','Normal',
+            'Nosave','Noshadow','Noshow','Nospace','Not','Notab',
+            'Notify','Noupdate','Novalidate','Noverify','Nowait','Nowindow',
+            'Nowrap','Nozoom','Npv','Null','Number','Objects',
+            'Odometer','Of','Off','Oleobjects','Only','Optimize',
+            'Or','Orientation','Output','Outshow','Overlay','Overwrite',
+            'Pad','Palette','Paperlength','Papersize','Paperwidth','Password',
+            'Path','Pattern','Pause','Pdox','Pdsetup','Pen',
+            'Pfs','Pixels','Plain','Popups','Precision','Preference',
+            'Preview','Primary','Printer','Printquality','Procedures','Production',
+            'Program','Progwork','Project','Prompt','Query','Random',
+            'Range','Readborder','Readerror','Record','Recover','Redit',
+            'Reference','References','Relative','Remote','Reprocess','Resource',
+            'Rest','Restrict','Rgb','Right','Row','Rowset',
+            'Rpd','Runtime','Safety','Same','Sample','Say',
+            'Scale','Scheme','Scoreboard','Screen','Sdf','Seconds',
+            'Selection','Shadows','Shared','Sheet','Shell','Shift',
+            'Shutdown','Single','Some','Sortwork','Space','Sql',
+            'Standalone','Status','Std','Step','Sticky','String',
+            'Structure','Subclass','Summary','Sylk','Sysformats','Sysmenus',
+            'System','T','Tab','Tables','Talk','Tedit',
+            'Textmerge','Time','Timeout','Titles','Tmpfiles','To',
+            'Topic','Transaction','Trap','Trbetween','Trigger','Ttoption',
+            'Typeahead','Udfparms','Union','Unique','Userid','Users',
+            'Values','Var','Verb','Vga25','Vga50','Views',
+            'Volume','Where','Windows','Wk1','Wk3','Wks',
+            'Workarea','Wp','Wr1','Wrap','Wrk','Xcmdfile',
+            'Xl5','Xl8','Xls','Y','Yresolution','Zoom',
+            'Activate','ActivateCell','Add','AddColumn','AddItem','AddListItem',
+            'AddObject','AddProperty','AddToSCC','AfterBuild','AfterCloseTables','AfterDock',
+            'AfterRowColChange','BeforeBuild','BeforeDock','BeforeOpenTables','BeforeRowColChange','Box',
+            'Build','CheckIn','CheckOut','Circle','Clear','ClearData',
+            'Cleanup','Click','CloneObject','CloseEditor','CloseTables','Cls',
+            'CommandTargetExec','CommandTargetQueryStas','ContainerRelease','DataToClip','DblClick','Deactivate',
+            'Delete','DeleteColumn','Deleted','Destroy','DoCmd','Dock',
+            'DoScroll','DoVerb','DownClick','Drag','DragDrop','DragOver',
+            'DropDown','Draw','EnterFocus','Error','ErrorMessage','Eval',
+            'ExitFocus','FormatChange','GetData','GetFormat','GetLatestVersion','GoBack',
+            'GotFocus','GoForward','GridHitTest','Hide','HideDoc','IndexToItemId',
+            'Init','InteractiveChange','Item','ItemIdToIndex','KeyPress','Line',
+            'Load','LostFocus','Message','MiddleClick','MouseDown','MouseMove',
+            'MouseUp','MouseWheel','Move','Moved','NavigateTo','Newobject',
+            'OLECompleteDrag','OLEDrag','OLEDragDrop','OLEDragOver','OLEGiveFeedback','OLESetData',
+            'OLEStartDrag','OpenEditor','OpenTables','Paint','Point','Print',
+            'ProgrammaticChange','PSet','QueryAddFile','QueryModifyFile','QueryRemoveFile','QueryRunFile',
+            'QueryUnload','RangeHigh','RangeLow','ReadActivate','ReadExpression','ReadDeactivate',
+            'ReadMethod','ReadShow','ReadValid','ReadWhen','Refresh','Release',
+            'RemoveFromSCC','RemoveItem','RemoveListItem','RemoveObject','Requery','RequestData',
+            'Reset','ResetToDefault','Resize','RightClick','SaveAs','SaveAsClass',
+            'Scrolled','SetAll','SetData','SetFocus','SetFormat','SetMain',
+            'SetVar','SetViewPort','ShowDoc','ShowWhatsThis','TextHeight','TextWidth',
+            'Timer','UIEnable','UnDock','UndoCheckOut','Unload','UpClick',
+            'Valid','WhatsThisMode','When','WriteExpression','WriteMethod','ZOrder',
+            'ATGetColors','ATListColors','Accelerate','ActiveColumn','ActiveControl','ActiveForm',
+            'ActiveObjectId','ActivePage','ActiveProject','ActiveRow','AddLineFeeds','Alias',
+            'Alignment','AllowAddNew','AllowHeaderSizing','AllowResize','AllowRowSizing','AllowTabs',
+            'AlwaysOnTop','Application','AutoActivate','AutoCenter','AutoCloseTables','AutoIncrement',
+            'AutoOpenTables','AutoRelease','AutoSize','AutoVerbMenu','AutoYield','AvailNum',
+            'BackColor','BackStyle','BaseClass','BorderColor','BorderStyle','BorderWidth',
+            'Bound','BoundColumn','BoundTo','BrowseAlignment','BrowseCellMarg','BrowseDestWidth',
+            'BufferMode','BufferModeOverride','BuildDateTime','ButtonCount','ButtonIndex','Buttons',
+            'CLSID','CanAccelerate','CanGetFocus','CanLoseFocus','Cancel','Caption',
+            'ChildAlias','ChildOrder','Class','ClassLibrary','ClipControls','ClipRect',
+            'Closable','ColorScheme','ColorSource','ColumnCount','ColumnHeaders','ColumnLines',
+            'ColumnOrder','ColumnWidths','Columns','Comment','ContinuousScroll','ControlBox',
+            'ControlCount','ControlIndex','ControlSource','Controls','CurrentControl','CurrentX',
+            'CurrentY','CursorSource','Curvature','DataSession','DataSessionId','DataSourceObj',
+            'DataType','Database','DateFormat','DateMark','DefButton','DefButtonOrig',
+            'DefHeight','DefLeft','DefTop','DefWidth','Default','DefaultFilePath',
+            'DefineWindows','DeleteMark','Desktop','Dirty','DisabledBackColor','DisabledByEOF',
+            'DisabledForeColor','DisabledItemBackColor','DisabledItemForeColor','DisabledPicture','DispPageHeight','DispPageWidth',
+            'DisplayCount','DisplayValue','DoCreate','DockPosition','Docked','DocumentFile',
+            'DownPicture','DragIcon','DragMode','DragState','DrawMode','DrawStyle',
+            'DrawWidth','DynamicAlignment','DynamicBackColor','DynamicCurrentControl','DynamicFontBold','DynamicFontItalic',
+            'DynamicFontName','DynamicFontOutline','DynamicFontShadow','DynamicFontSize','DynamicFontStrikethru','DynamicFontUnderline',
+            'DynamicForeColor','EditFlags','Enabled','EnabledByReadLock','Encrypted','EnvLevel',
+            'ErasePage','FileClass','FileClassLibrary','FillColor','FillStyle','Filter',
+            'FirstElement','FontBold','FontItalic','FontName','FontOutline','FontShadow',
+            'FontSize','FontStrikethru','FontUnderline','ForceFocus','ForeColor','FormCount',
+            'FormIndex','FormPageCount','FormPageIndex','Format','Forms','FoxFont',
+            'FullName','GoFirst','GoLast','GridLineColor','GridLineWidth','GridLines'
+            ),
+        4 => array('HPROJ','HWnd','HalfHeightCaption','HasClip','HeaderGap','HeaderHeight',
+            'Height','HelpContextID','HideSelection','Highlight','HomeDir','HostName',
+            'HotKey','HscrollSmallChange','IMEMode','Icon','IgnoreInsert','InResize',
+            'Increment','IncrementalSearch','InitialSelectedAlias','InputMask','Instancing','IntegralHeight',
+            'Interval','ItemBackColor','ItemData','ItemForeColor','ItemIDData','ItemTips',
+            'JustReadLocked','KeyPreview','KeyboardHighValue','KeyboardLowValue','LastModified','Left',
+            'LeftColumn','LineSlant','LinkMaster','List','ListCount','ListIndex',
+            'ListItem','ListItemId','LockDataSource','LockScreen','MDIForm','MainClass',
+            'MainFile','Margin','MaxButton','MaxHeight','MaxLeft','MaxLength',
+            'MaxTop','MaxWidth','MemoWindow','MinButton','MinHeight','MinWidth',
+            'MouseIcon','MousePointer','Movable','MoverBars','MultiSelect','Name',
+            'NapTime','NewIndex','NewItemId','NoDataOnLoad','NoDefine','NotifyContainer',
+            'NullDisplay','NumberOfElements','OLEDragMode','OLEDragPicture','OLEDropEffects','OLEDropHasData',
+            'OLEDropMode','OLERequestPendingTimeOut','OLEServerBusyRaiseError','OLEServerBusyTimeOut','OLETypeAllowed','OleClass',
+            'OleClassId','OleControlContainer','OleIDispInValue','OleIDispOutValue','OleIDispatchIncoming','OleIDispatchOutgoing',
+            'OnResize','OneToMany','OpenViews','OpenWindow','PageCount','PageHeight',
+            'PageOrder','PageWidth','Pages','Panel','PanelLink','Parent',
+            'ParentAlias','ParentClass','Partition','PasswordChar','Picture','ProcessID',
+            'ProgID','ProjectHookClass','ProjectHookLibrary','Projects','ReadColors','ReadCycle',
+            'ReadFiller','ReadLock','ReadMouse','ReadOnly','ReadSave','ReadSize',
+            'ReadTimeout','RecordMark','RecordSource','RecordSourceType','Rect','RelationalExpr',
+            'RelativeColumn','RelativeRow','ReleaseErase','ReleaseType','ReleaseWindows','Resizable',
+            'RightToLeft','RowHeight','RowSource','RowSourceType','SCCProvider','SCCStatus',
+            'SDIForm','ScaleMode','ScrollBars','SelLength','SelStart','SelText',
+            'SelectOnEntry','Selected','SelectedBackColor','SelectedForeColor','SelectedID','SelectedItemBackColor',
+            'SelectedItemForeColor','SelfEdit','ServerClass','ServerClassLibrary','ServerHelpFile','ServerName',
+            'ServerProject','ShowTips','ShowWindow','Sizable','Size<height>','Size<maxlength>',
+            'Size<width>','Skip','SkipForm','Sorted','SourceType','Sparse',
+            'SpecialEffect','SpinnerHighValue','SpinnerLowValue','SplitBar','StartMode','StatusBarText',
+            'Stretch','StrictDateEntry','Style','SystemRefCount','TabIndex','TabStop',
+            'TabStretch','TabStyle','Tabhit','Tabs','Tag','TerminateRead',
+            'ThreadID','TitleBar','ToolTipText','Top','TopIndex','TopItemId',
+            'TypeLibCLSID','TypeLibDesc','TypeLibName','UnlockDataSource','Value','ValueDirty',
+            'VersionComments','VersionCompany','VersionCopyright','VersionDescription','VersionNumber','VersionProduct',
+            'VersionTrademarks','View','ViewPortHeight','ViewPortLeft','ViewPortTop','ViewPortWidth',
+            'Visible','VscrollSmallChange','WasActive','WasOpen','WhatsThisButton','WhatsThisHelp',
+            'WhatsThisHelpID','Width','WindowList','WindowNTIList','WindowState','WindowType',
+            'WordWrap','ZOrderSet','ActiveDoc','Checkbox','Column','ComboBox',
+            'CommandButton','CommandGroup','Container','Control','Cursor','Custom',
+            'DataEnvironment','EditBox','Empty','FontClass','Form','Formset',
+            'General','Grid','Header','HyperLink','Image','Label',
+            'ListBox','Memo','OleBaseControl','OleBoundControl','OleClassIDispOut','OleControl',
+            'OptionButton','OptionGroup','Page','PageFrame','ProjectHook','RectClass',
+            'Relation','Session','Shape','Spinner','TextBox' ,'Toolbar'
+            ),
+        ),
+    'SYMBOLS' => array(
+        "!", "@", "$", "%",
+        "(", ")", "{", "}", "[", "]",
+        "-", "+", "*", "/",
+        "=", "<", ">",
+        ":", ";", ",", ".", "&",
+        "?", "??", "???"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: blue;',
+            2 => 'color: blue;',
+            3 => 'color: blue;',
+            4 => 'color: blue;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: green; font-style: italic;',
+            2 => 'color: green; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: blue;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: blue;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualprolog.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualprolog.php
new file mode 100644
index 000000000..19eab2de6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/visualprolog.php
@@ -0,0 +1,129 @@
+<?php
+/*************************************************************************************
+ * visualprolog.php
+ * ----------
+ * Author: Thomas Linder Puls (puls@pdc.dk)
+ * Copyright: (c) 2008 Thomas Linder Puls (puls@pdc.dk)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/11/20
+ *
+ * Visual Prolog language file for GeSHi.
+ *
+ * CHANGES
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Visual Prolog',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'clauses','constants','constructors','delegate','domains','facts',
+            'goal','guards','inherits','monitor','namespace','open',
+            'predicates','properties','resolve','supports'
+            ),
+        2 => array(
+            'align','and','anyflow','as','bitsize','catch','determ','digits',
+            'div','do','else','elseif','erroneous','externally','failure',
+            'finally','from','language','mod','multi','nondeterm','or',
+            'procedure','quot','rem','single','then','to'
+            ),
+        3 => array(
+            '#bininclude','#else','#elseif','#endif','#error','#export',
+            '#externally','#if','#import','#include','#message','#options',
+            '#orrequires','#requires','#then','#warning'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '>', '<', '^', '!', ':', '(', ')', '{', '}', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            3 => 'color: #800080;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #AA77BD',
+            'MULTI' => 'color: #AA77BD'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00B7B7;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #808000;',
+            2 => 'color: #333399;',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ':',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => "(?<![a-zA-Z0-9_])(?!(?:PIPE|SEMI)>)[A-Z_]\w*(?!\w)",
+        1 => "\\b(end\\s+)?(implement|class|interface)\\b",
+        2 => "\\b(end\\s+)?(foreach|if|try)\\b",
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/whitespace.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/whitespace.php
new file mode 100644
index 000000000..59bbdb8e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/whitespace.php
@@ -0,0 +1,121 @@
+<?php
+/*************************************************************************************
+ * whitespace.php
+ * ----------
+ * Author: Benny Baumann (BenBE@geshi.org)
+ * Copyright: (c) 2008 Benny Baumann (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2009/10/31
+ *
+ * Whitespace language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/10/31 (1.0.8.1)
+ *   -  First Release
+ *
+ * TODO
+ * ----
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+$language_data = array (
+    'LANG_NAME' => 'Whitespace',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        3 => "/[^\n\x20\x09]+/s"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            3 => 'color: #666666; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            2 => 'background-color: #FF9999;',
+            3 => 'background-color: #9999FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        2 => array(
+            GESHI_SEARCH => "(?<!\\A)\x20",
+            GESHI_REPLACE => "&#32;",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        3 => array(
+            GESHI_SEARCH => "\x09",
+            GESHI_REPLACE => "&#9;",
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'KEYWORDS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+//            'REGEXPS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/winbatch.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/winbatch.php
new file mode 100644
index 000000000..e86b03636
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/winbatch.php
@@ -0,0 +1,369 @@
+<?php
+/*************************************************************************************
+ * winbatch.php
+ * ------------
+ * Author: Craig Storey (storey.craig@gmail.com)
+ * Copyright: (c) 2004 Craig Storey (craig.xcottawa.ca)
+ * Release Version: 1.0.8.4
+ * Date Started: 2006/05/19
+ *
+ * WinBatch language file for GeSHi.
+ *
+ * WinBatch is a Windows scripting language - www.winbatch.com.
+ * The keywords were pulled from the winbatch/system/WIL.clr file for v2005G.
+ * Not all extender functions are added, but a very large set of the most common.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2006/05/05 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * - Right now any ':Subroutine' is treated as a comment. This highlights the
+ *   Subroutine's name, but it's not a perfect fix. I should use a RegEx in
+ *   GeSHI_Search&Replace features..
+ * - Update the list of extender functions.
+ * - Use a regular expression to comment UDFs that start with 'udf_'.
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Winbatch',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => ':'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'To', 'Then', 'Switch', 'Select', 'Return', 'Next', 'IntControl', 'Include', 'In', 'If',
+            'Goto', 'GoSub', 'ForEach', 'For', 'Exit', 'Execute', 'ErrorMode', 'EndWhile', 'EndSwitch', '#EndSubRoutine',
+            'EndSelect', 'EndIf', '#EEndFunction', 'EndFor', 'End', 'Else', 'DropWild', 'Drop', '#DefineSubRoutine',
+            '#DefineFunction', 'Debug', 'Continue', 'Case', 'CallExt', 'Call', 'By', 'BreakPoint', 'Break'
+            ),
+        2 => array(
+            'ZOOMED', 'YES', 'WORD4', 'WORD2', 'WORD1', 'WHOLESECTION', 'WAIT', 'UNSORTED', 'UNCHECK', 'TRUE', 'TILE',
+            'TAB', 'STRING', 'STACK', 'SPC2NET', 'SORTED', 'SOK', 'SNET2PC', 'SINGLE', 'SHIFT', 'SERVER', 'SERRWINSOCK',
+            'SERRVOICE', 'SERRSOCKET', 'SERRSERVICE', 'SERRSELECT', 'SERRPARAM', 'SERROUTOFMEM', 'SERRNOTFOUND', 'SERRNOCONN',
+            'SERRNOANSWER', 'SERRMUSTWAIT', 'SERRIPADDR', 'SERRHOSTNAME', 'SERRFAILURE', 'SERRBUSY', 'SCROLLLOCK', 'SCANCEL',
+            'SAVE', 'SALREADY', 'ROWS', 'REGUSERS', 'REGROOT', 'REGMACHINE', 'REGCURRENT', 'REGCLASSES', 'RDBLCLICK', 'RCLICK',
+            'RBUTTON', 'RAD2DEG', 'QSUCCESSINFO', 'QSUCCESS', 'QSTILLEX', 'QROLLBACK', 'QNULL', 'QNODATA', 'QNEXT', 'QNEEDDATA',
+            'QFIRST', 'QCOMMIT', 'QBADHANDLE', 'PRINTER', 'PLANCKJOULES', 'PLANCKERGS', 'PI', 'PARSEONLY', 'PARSEC', 'P3ERRREPLY',
+            'OPEN', 'ON', 'OFF', 'NUMLOCK', 'NOWAIT', 'NOTIFY', 'NORMAL', 'NORESIZE', 'NONE', 'NO', 'NCSAFORMAT', 'MULTIPLE',
+            'MSFORMAT', 'MPLAYRDBLCK', 'MPLAYRCLK', 'MPLAYRBUTTON', 'MPLAYMDBLCK', 'MPLAYMCLK', 'MPLAYMBUTTON', 'MPLAYLDBLCK',
+            'MPLAYLCLK', 'MPLAYLBUTTON', 'MINOR', 'MDBLCLICK', 'MCLICK', 'MBYESNO', 'MBUTTON', 'MBOKCANCEL', 'MAJOR', 'MAGFIELD',
+            'LOCALGROUP', 'LIGHTMTPS', 'LIGHTMPS', 'LF', 'LDBLCLICK', 'LCLICK', 'LBUTTON', 'LAFFDBERROR', 'ICON', 'HTTPS', 'HTTP',
+            'HNOHEADER', 'HMETHODPOST', 'HMETHODGET', 'HIDDEN', 'HHEADERONLY', 'HHEADER', 'GRAVITATION', 'GOPHER', 'GOLDENRATIO',
+            'GMTSEC', 'GLOBALGROUP', 'GFTSEC', 'GETPROCID', 'GETEXITCODE', 'FWDSCAN', 'FTPPASSIVE', 'FTP', 'FLOAT8', 'FARADAY',
+            'FALSE', 'EXTENDED', 'EULERS', 'ENABLE', 'ELECTRIC', 'DRIVE', 'DISABLE', 'DESCENDING', 'DEG2RAD', 'DEFAULT', 'CTRL',
+            'CRLF', 'CR', 'COMMONFORMAT', 'COLUMNS', 'CHECK', 'CAPSLOCK', 'CANCEL', 'BOLTZMANN', 'BACKSCAN', 'AVOGADRO', 'ATTR_X',
+            'ATTR_T', 'ATTR_SY', 'ATTR_SH', 'ATTR_RO', 'ATTR_RI', 'ATTR_P', 'ATTR_IC', 'ATTR_H', 'ATTR_DM', 'ATTR_DI', 'ATTR_DC',
+            'ATTR_CI', 'ATTR_A', 'ASCENDING', 'ARRANGE', 'AMC', 'ACC_WRITE', 'ACC_READ_NT', 'ACC_READ_95', 'ACC_READ', 'ACC_PRINT_NT',
+            'ACC_PMANG_NT', 'ACC_PFULL_NT', 'ACC_LIST', 'ACC_FULL_NT', 'ACC_FULL_95', 'ACC_DELETE', 'ACC_CREATE', 'ACC_CONTROL',
+            'ACC_CHNG_NT', 'ACC_ATTRIB', 'ABOVEICONS'
+            ),
+        3 => array(
+            'Yields', 'Yield', 'WinZoom', 'WinWaitExist', 'WinWaitClose', 'WinWaitChild', 'WinVersion', 'WinTitle', 'WinSysInfo',
+            'WinState', 'WinShow', 'WinResources', 'WinPositionChild', 'WinPosition', 'WinPlaceSet', 'WinPlaceGet', 'WinPlaceChild',
+            'WinPlace', 'WinParmSet', 'WinParmGet', 'WinName', 'WinMetrics', 'WinItemProcId', 'WinItemNameId', 'WinItemizeEx',
+            'WinItemize', 'WinItemChild', 'WinIsDos', 'WinIdGet', 'WinIconize', 'WinHide', 'WinHelp', 'WinGetactive', 'WinExistchild',
+            'WinExist', 'WinExename', 'WinConfig', 'WinClosenot', 'WinClose', 'WinArrange', 'WinActivechild', 'WinActivchild',
+            'WinActivate', 'WebVerifyCard', 'WebSetTimeout', 'WebParamSize', 'WebParamNames', 'WebParamFile', 'WebParamData',
+            'WebParamBuf', 'WebOutFile', 'WebOutBinary', 'WebOut', 'WebDumpError', 'WebDatData', 'WebCounter', 'WebConSize', 'WebConData',
+            'WebConBuf', 'WebCmdData', 'WebBaseConv', 'Wallpaper', 'WaitForKeyEX', 'WaitForKey', 'VersionDLL', 'Version', 'VarType',
+            'TimeYmdHms', 'TimeWait', 'TimeSubtract', 'TimeJulToYmd', 'TimeJulianDay', 'TimeDiffSecs', 'TimeDiffDays', 'TimeDiff', 'TimeDelay',
+            'TimeDate', 'TimeAdd', 'TextSelect', 'TextBoxSort', 'TextBox', 'Terminate', 'Tanh', 'Tan', 'SysParamInfo', 'SvcWaitForCmd',
+            'SvcSetState', 'SvcSetAccept', 'StrUpper', 'StrTrim', 'StrSubWild', 'StrSub', 'StrScan', 'StrReplace', 'StrLower', 'StrLenWild',
+            'StrLen', 'StrIndexWild', 'StrIndexNC', 'StrIndex', 'StriCmp', 'StrFixLeft', 'StrFixCharsL', 'StrFixChars', 'StrFix', 'StrFill',
+            'StrCnt', 'StrCmp', 'StrClean', 'StrCharCount', 'StrCat', 'StrByteCount', 'Sqrt', 'SoundVolume', 'Sounds', 'Snapshot', 'Sinh', 'Sin',
+            'ShortCutMake', 'ShortCutInfo', 'ShortCutExtra', 'ShortCutEdit', 'ShortCutDir', 'ShellExecute', 'SendMenusToEx', 'SendMenusTo',
+            'SendKeysTo', 'SendKeysChild', 'SendKey', 'RunZoomWait', 'RunZoom', 'RunWithLogon', 'RunWait', 'RunShell', 'RunIconWait',
+            'RunIcon', 'RunHideWait', 'RunHide', 'RunExit', 'RunEnviron', 'Run', 'RtStatus', 'Reload', 'RegUnloadHive', 'RegSetValue',
+            'RegSetQword', 'RegSetMulSz', 'RegSetExpSz', 'RegSetEx', 'RegSetDword', 'RegSetBin', 'RegQueryValue', 'RegQueryStr',
+            'RegQueryQword', 'RegQueryMulSz', 'RegQueryKeys', 'RegQueryKeyLastWriteTime', 'RegQueryKey', 'RegQueryItem', 'RegQueryExpSz',
+            'RegQueryEx', 'RegQueryDword', 'RegQueryBin', 'RegOpenKeyEx', 'RegOpenKey', 'RegOpenFlags', 'RegLoadHive', 'RegExistValue',
+            'RegExistKey', 'RegEntryType', 'RegDelValue', 'RegDeleteKey', 'RegCreateKey', 'RegConnect', 'RegCloseKey', 'RegApp', 'Random',
+            'PtrPersistent', 'PtrGlobalDefine', 'PtrGlobal', 'Print', 'PlayWaveform', 'PlayMidi', 'PlayMedia', 'PipeServerWrite', 'PipeServerRead',
+            'PipeServerCreate', 'PipeServerClose', 'PipeInfo', 'PipeClientSendRecvData', 'PipeClientOpen', 'PipeClientClose', 'Pause',
+            'ParseData', 'ObjectTypeGet', 'ObjectType', 'ObjectOpen', 'ObjectGet', 'ObjectEventRemove', 'objecteventremove', 'ObjectEventAdd',
+            'objecteventadd', 'ObjectCreate', 'ObjectConstToArray', 'ObjectConstantsGet', 'ObjectCollectionOpen', 'ObjectCollectionNext',
+            'ObjectCollectionClose', 'ObjectClose', 'ObjectAccess', 'Num2Char', 'NetInfo', 'MsgTextGet', 'MousePlay', 'MouseMove', 'MouseInfo',
+            'MouseDrag', 'MouseCoords', 'MouseClickBtn', 'MouseClick', 'mod', 'Min', 'Message', 'Max', 'Loge', 'LogDisk', 'Log10', 'LastError',
+            'KeyToggleSet', 'KeyToggleGet', 'ItemSortNc', 'ItemSort', 'ItemSelect', 'ItemReplace', 'ItemRemove', 'ItemLocate', 'ItemInsert',
+            'ItemExtractCSV', 'ItemExtract', 'ItemCountCSV', 'ItemCount', 'IsNumber', 'IsLicensed', 'IsKeyDown', 'IsInt', 'IsFloat', 'IsDefined',
+            'Int', 'InstallFile', 'IniWritePvt', 'IniWrite', 'IniReadPvt', 'IniRead', 'IniItemizePvt', 'IniItemize', 'IniDeletePvt', 'IniDelete',
+            'IgnoreInput', 'IconReplace', 'IconInfo', 'IconExtract', 'IconArrange', 'GetTickCount', 'GetObject', 'GetExactTime', 'Floor',
+            'FindWindow', 'FileYmdHms', 'FileWrite', 'FileVerInfo', 'FileTimeTouch', 'FileTimeSetEx', 'FileTimeSet', 'FileTimeGetEx',
+            'FileTimeGet', 'FileTimeCode', 'FileSizeEx', 'FileSize', 'FileRoot', 'FileRename', 'FileRead', 'FilePutW', 'FilePut', 'FilePath',
+            'FileOpen', 'FileNameShort', 'FileNameLong', 'FileNameEval2', 'FileNameEval1', 'FileMoveAttr', 'FileMove', 'FileMapName',
+            'FileLocate', 'FileItemPath', 'FileItemize', 'FileInfoToArray', 'FileGetW', 'FileGet', 'FileFullname', 'FileExtension', 'FileExist',
+            'FileDelete', 'FileCreateTemp', 'FileCopyAttr', 'FileCopy', 'FileCompare', 'FileClose', 'FileBaseName', 'FileAttrSetEx',
+            'FileAttrSet', 'FileAttrGetEx', 'FileAttrGet', 'FileAppend', 'Fabs', 'ExtractAttachedFile', 'Exp', 'ExeTypeInfo', 'Exclusive',
+            'EnvItemize', 'EnvironSet', 'Environment', 'EndSession', 'DosVersion', 'DllLoad', 'DllLastError', 'DllHwnd', 'DllHinst',
+            'DllFree', 'DllCallCDecl', 'DllCall', 'Display', 'DiskVolinfo', 'DiskSize', 'DiskScan', 'DiskInfo', 'DiskFree', 'DiskExist',
+            'DirWindows', 'DirSize', 'DirScript', 'DirRename', 'DirRemove', 'DirMake', 'DirItemize', 'DirInfoToArray', 'DirHome', 'DirGet',
+            'DirExist', 'DirChange', 'DirAttrSetEx', 'DirAttrSet', 'DirAttrGetEx', 'DirAttrGet', 'DialogProcOptions', 'DialogObject',
+            'DialogControlState', 'DialogControlSet', 'DialogControlGet', 'DialogBox', 'Dialog', 'Delay', 'Decimals', 'DebugTrace',
+            'DebugData', 'DDETimeout', 'DDETerminate', 'DDERequest', 'DDEPoke', 'DDEInitiate', 'DDEExecute', 'DateTime', 'CurrFilepath',
+            'CurrentPath', 'CurrentFile', 'CreateObject', 'Cosh', 'Cos', 'ClipPut', 'ClipHasFormat', 'ClipGetEx', 'ClipGet', 'ClipAppend',
+            'ChrUnicodeToString', 'ChrUnicodeToHex', 'ChrStringToUnicode', 'ChrSetCodepage', 'ChrHexToUnicode', 'ChrGetCodepage',
+            'Char2Num', 'Ceiling', 'ButtonNames', 'BoxUpdates', 'BoxTitle', 'BoxTextFont', 'BoxTextColor', 'BoxText', 'BoxShut', 'BoxPen',
+            'BoxOpen', 'BoxNew', 'BoxMapmode', 'BoxesUp', 'BoxDrawText', 'BoxDrawRect', 'BoxDrawLine', 'BoxDrawCircle', 'BoxDestroy',
+            'BoxDataTag', 'BoxDataClear', 'BoxColor', 'BoxCaption', 'BoxButtonWait', 'BoxButtonStat', 'BoxButtonKill', 'BoxButtonDraw',
+            'BoxBitMap', 'BinaryXor', 'BinaryXlate', 'BinaryWriteEx', 'BinaryWrite', 'BinaryTagRepl', 'BinaryTagLen', 'BinaryTagInit',
+            'BinaryTagIndex', 'BinaryTagFind', 'BinaryTagExtr', 'BinaryStrCnt', 'BinarySort', 'BinaryReplace', 'BinaryReadEx',
+            'BinaryRead', 'BinaryPokeStrW', 'BinaryPokeStr', 'BinaryPokeHex', 'BinaryPokeFlt', 'BinaryPoke4', 'BinaryPoke2', 'BinaryPoke',
+            'BinaryPeekStrW', 'BinaryPeekStr', 'BinaryPeekHex', 'BinaryPeekFlt', 'BinaryPeek4', 'BinaryPeek2', 'BinaryPeek', 'BinaryOr',
+            'BinaryOleType', 'BinaryIndexNc', 'BinaryIndexEx', 'BinaryIndexBin', 'BinaryIndex', 'BinaryIncrFlt', 'BinaryIncr4',
+            'BinaryIncr2', 'BinaryIncr', 'BinaryHashRec', 'BinaryFree', 'BinaryEodSet', 'BinaryEodGet', 'BinaryCopy', 'BinaryConvert',
+            'BinaryCompare', 'BinaryClipPut', 'BinaryClipGet', 'BinaryChecksum', 'BinaryBufInfo', 'BinaryAnd', 'BinaryAllocArray',
+            'BinaryAlloc', 'Beep', 'Average', 'Atan', 'AskYesNo', 'AskTextbox', 'AskPassword', 'AskLine', 'AskItemlist', 'AskFont',
+            'AskFiletext', 'AskFilename', 'AskDirectory', 'AskColor', 'Asin', 'ArrInitialize', 'ArrInfo', 'ArrDimension',
+            'Arrayize', 'ArrayFilePutCSV', 'ArrayFilePut', 'ArrayFileGetCSV', 'ArrayFileGet', 'AppWaitClose', 'AppExist', 'AddExtender',
+            'Acos', 'Abs', 'About'
+            ),
+        4 => array(
+            'zZipFiles', 'zVersionInfo', 'zVersion', 'zUnZipFiles', 'zSetPortBit', 'zRPortShift', 'zPortOut', 'zPortIn', 'zNotPortBit',
+            'zLPortShift', 'zGetPortBit', 'zClrPortBit', 'xVerifyCCard', 'xSendMessage', 'xMessageBox', 'xMemCompact', 'xHex', 'xGetElapsed',
+            'xGetChildHwnd', 'xExtenderInfo', 'xEnumStreams', 'xEjectMedia', 'xDriveReady', 'xDiskLabelGet', 'xCursorSet', 'xBaseConvert',
+            'wxPing', 'wxParmSet', 'wxParmGet', 'wxMsgSetHdr', 'wxMsgGetHdr', 'wxMsgGetBody', 'wxHost2Addr', 'wxGetLastErr', 'wxGetInfo',
+            'wxGetErrDesc', 'wxAddr2Host', 'wtsWaitSystemEvent', 'wtsVersion', 'wtsTerminateProcess', 'wtsShutdownSystem', 'wtsSendMessage',
+            'wtsQuerySessionInfo', 'wtsProcIdToSessId', 'wtsLogoffSession', 'wtsLastErrMsg', 'wtsIsTSEnabled', 'wtsIsCitrixEnabled',
+            'wtsGetActiveConsoleSessId', 'wtsEnumSessions', 'wtsEnumProcesses', 'wtsDisconnectSession', 'wnWrkGroups', 'wnVersion', 'wntWtsUserSet',
+            'wntWtsUserGet', 'wntVersion', 'wntUserSidChk', 'wntUserSetDat', 'wntUserRename', 'wntUserProps', 'wntUserList', 'wntUserInfo',
+            'wntUserGetDat', 'wntUserFiles', 'wntUserExist', 'wntUserDel', 'wntUserAddDat', 'wntUserAdd', 'wntSvcStatus', 'wntSvcStart',
+            'wntSvcList', 'wntSvcDelete', 'wntSvcCreate', 'wntSvcControl', 'wntSvcCfgSet', 'wntSvcCfgGet', 'wntShutdown', 'wntShareUsers',
+            'wntShareSet', 'wntShareList', 'wntShareInfo', 'wntShareDel', 'wntShareAdd', 'wntServiceInf', 'wntServiceAt', 'wntServerType',
+            'wntServerList', 'wntServerInfo', 'wntSecurityGet', 'wntRunAsUser', 'wntResources2', 'wntResources', 'wntRemoteTime', 'wntRasUserSet',
+            'wntRasUserGet', 'wntProfileInfo', 'wntProfileDel', 'wntPrivUsers', 'wntPrivList', 'wntPrivGet', 'wntPrivDel', 'wntPrivAdd',
+            'wntOwnerSet', 'wntOwnerGet', 'wntMemberSet', 'wntMemberLst2', 'wntMemberList', 'wntMemberGrps', 'wntMemberGet', 'wntMemberDel',
+            'wntLsaPolSet', 'wntLsaPolGet', 'wntListGroups', 'wntLastErrMsg', 'wntGroupRen', 'wntGroupInfo', 'wntGroupEdit', 'wntGroupDel',
+            'wntGroupAdd', 'wntGetUser', 'wntGetDrive', 'wntGetDc', 'wntGetCon', 'wntFileUsers', 'wntFilesOpen', 'wntFileClose', 'wntEventWrite',
+            'wntEventLog', 'wntDomainSync', 'wntDirDialog', 'wntDfsList', 'wntDfsGetInfo', 'wntCurrUsers', 'wntChgPswd', 'wntCancelCon',
+            'wntAuditMod', 'wntAuditList', 'wntAuditGet', 'wntAuditDel', 'wntAuditAdd2', 'wntAuditAdd', 'wntAddPrinter', 'wntAddDrive',
+            'wntAcctPolSet', 'wntAcctPolGet', 'wntAcctList', 'wntAcctInfo', 'wntAccessMod', 'wntAccessList', 'wntAccessGet', 'wntAccessDel',
+            'wntaccessadd2', 'wntAccessAdd', 'wnShares', 'wnSharePath', 'wnShareName', 'wnShareCnt', 'wnServers', 'wnRestore', 'wnNetNames',
+            'wnGetUser', 'wnGetCon', 'wnGetCaps', 'wnDlgShare', 'wnDlgNoShare', 'wnDlgDiscon', 'wnDlgCon4', 'wnDlgCon3', 'wnDlgCon2', 'wnDlgCon',
+            'wnDlgBrowse', 'wnDialog', 'wnCmptrInfo', 'wnCancelCon', 'wnAddCon', 'WaitSRQ', 'w9xVersion', 'w9xUserSetDat', 'w9xUserRename',
+            'w9xUserprops', 'w9xUserList', 'w9xUserinfo', 'w9xUserGetDat', 'w9xUserExist', 'w9xUserDel', 'w9xUserAddDat', 'w9xUserAdd', 'w9xShareSet',
+            'w9xShareInfo', 'w9xShareDel', 'w9xShareAdd', 'w9xServiceAt', 'w9xServerList', 'w9xRemoteTime', 'w9xOwnerGet', 'w9xMemberSet',
+            'w9xMemberList', 'w9xMemberGrps', 'w9xMemberGet', 'w9xMemberDel', 'w9xListGroups', 'w9xGroupInfo', 'w9xGroupDel', 'w9xGroupAdd',
+            'w9xGetDC', 'w9xFileUsers', 'w9xAccessList', 'w9xAccessGet', 'w9xAccessDel', 'w9xAccessAdd', 'w95Version', 'w95ShareUsers',
+            'w95ShareSet', 'w95ShareList', 'w95ShareInfo', 'w95ShareDel', 'w95ShareAdd', 'w95ServiceInf', 'w95ServiceAt', 'w95ServerType',
+            'w95ServerInfo', 'w95Resources', 'w95GetUser', 'w95GetDrive', 'w95GetCon', 'w95FileUsers', 'w95FileClose', 'w95DirDialog',
+            'w95CancelCon', 'w95AddPrinter', 'w95AddDrive', 'w95AccessDel', 'w95AccessAdd', 'w3Version', 'w3PrtBrowse', 'w3NetGetUser',
+            'w3NetDialog', 'w3GetCon', 'w3GetCaps', 'w3DirBrowse', 'w3CancelCon', 'w3AddCon', 'urlGetScheme', 'urlEncode', 'urlDecode',
+            'tVersion', 'tSetPriority', 'TriggerList', 'Trigger', 'tRemoteConn', 'tOpenProc', 'tListProc', 'tListMod', 'tKillProc', 'tGetProcInfo',
+            'tGetPriority', 'tGetModInfo', 'tGetLastError', 'tGetData', 'TestSys', 'TestSRQ', 'tCountProc', 'tCompatible', 'tCloseProc',
+            'tBrowseCntrs', 'sSendString', 'sSendNum', 'sSendLine', 'sSendBinary', 'sRecvNum', 'sRecvLine', 'sRecvBinary', 'SrchVersion',
+            'SrchNext', 'SrchInit', 'SrchFree', 'sOpen', 'sOK2Send', 'sOK2Recv', 'smtpSendText', 'smtpSendFile', 'sListen', 'SetRWLS',
+            'SendSetup', 'SendLLO', 'SendList', 'SendIFC', 'SendDataBytes', 'SendCmds', 'Send', 'sConnect', 'sClose', 'SByteOrder32',
+            'sByteOrder16', 'sAccept', 'rRegVersion', 'rRegSearch', 'ResetSys', 'ReceiveSetup', 'Receive', 'ReadStsByte', 'RcvRespMsg',
+            'RasVersion', 'RasTypeSize', 'RasRename', 'RasNumCons', 'RasNameValid', 'RasListActCon', 'RasItemize', 'RasHangUp', 'RasGetLastErr',
+            'RasGetConStat', 'RasEntrySet', 'RasEntryInfo', 'RasEntryExist', 'RasEntryDel', 'RasEntryAdd', 'RasDialInfo', 'RasDial',
+            'RasCopy', 'RasConStatus', 'qVersionInfo', 'qTransact', 'qTables', 'qSpecial', 'qSetConnOpt', 'qNumRsltCol', 'qNativeSql', 'qLastCode',
+            'qGetData', 'qFreeStmt', 'qFreeEnv', 'qFreeConnect', 'qFetch', 'qExecDirect', 'qError', 'qDriverList', 'qDriverCon', 'qDisconnect',
+            'qDataSources', 'qConnect', 'qConfigError', 'qConfigData', 'qColumns', 'qBindCol', 'qAllocStmt', 'qAllocEnv', 'qAllocConnect',
+            'pWaitFor', 'pVersionInfo', 'pTimeout', 'pSetPublish', 'pSetPrtInfo', 'pSetPrtAttrib', 'pSetDefPrtEx', 'pSetDefPrt', 'pSendFile',
+            'pRecvFile', 'pPutString', 'pPutLine', 'pPutChar', 'pPutByte', 'pPutBinary', 'PPollUnconfig', 'PPollConfig', 'PPoll', 'pPeekChar',
+            'pPeekByte', 'pPaperSizes', 'pPaperBins', 'pModemSReg', 'pModemParams', 'pModemInit', 'pModemHangUp', 'pModemDial', 'pModemControl',
+            'pModemConnect', 'pModemCommand', 'pModemAnsRing', 'pModemAnsCall', 'pMediaTypes', 'pGetString', 'pGetPublish', 'pGetPrtList',
+            'pGetPrtInfo', 'pGetPrtAttrib', 'pGetLine', 'pGetLastError', 'pGetErrorMsg', 'pGetErrorCode', 'pGetDefPrtInf', 'pGetChar',
+            'pGetByte', 'pGetBinary', 'pDelPrtConn', 'pDelPrinter', 'pComOpen', 'pComModify', 'pComInfo', 'pComControl', 'pComClose',
+            'pCheckSum', 'pCheckBinary', 'pCaptureOn', 'pCaptureOff', 'pCaptureLog', 'PassControl', 'pAddPrtConn', 'pAddPrinter', 'p3RecvText',
+            'p3RecvFile', 'p3Peek', 'p3Open', 'p3GetReply', 'p3Delete', 'p3Count', 'p3Close', 'nwWhoAmI', 'nwVfyPassword', 'nwVersion',
+            'nwSrvShutdown', 'nwSrvNLMMgr', 'nwSrvGenGUID', 'nwSrvExecNCF', 'nwSetVolLimit', 'nwSetSrvParam', 'nwSetSrvInfo', 'nwSetPrimServ',
+            'nwSetPassword', 'nwSetOptions', 'nwSetFileInfo', 'nwSetDirLimit', 'nwSetDirInfo', 'nwSetContext', 'nwSetBcastMode', 'nwServerList',
+            'nwSendBcastMsg', 'nwSearchObjects', 'nwSearchFilter', 'nwRenameObject', 'nwRemoveObject', 'nwReceiveBcastMsg', 'nwNameConvert',
+            'nwMutateObject', 'nwMoveObject', 'nwModifyObject', 'nwMapDelete', 'nwMap', 'nwLogout', 'nwLogin', 'nwListUserGroups',
+            'nwListObjects', 'nwListGroupMembers', 'nwLastErrMsg', 'nwIsUserInGroup', 'nwGetVolLimit', 'nwGetSrvStats', 'nwGetSrvParam',
+            'nwGetSrvInfo', 'nwGetSrvCfg', 'nwGetOptions', 'nwGetObjValue', 'nwGetObjInfo', 'nwGetNLMInfo', 'nwGetMapped', 'nwGetFileInfo',
+            'nwGetDirLimit', 'nwGetDirInfo', 'nwGetContext', 'nwGetConnInfo', 'nwGetCapture', 'nwGetBcastMode', 'nwGetAttrInfo',
+            'nwDriveStatus', 'nwDrivePath', 'nwDetachFromServer', 'nwDelUserFromGroup', 'nwDelConnNum', 'nwCompareObject', 'nwClientInfo',
+            'nwChgPassword', 'nwAttachToServer', 'nwAddUserToGroup', 'nwAddObject', 'netVersion', 'netResources', 'netGetUser', 'netGetCon',
+            'netDirDialog', 'netCancelCon', 'netAddPrinter', 'netAddDrive', 'n4Version', 'n4UserGroups', 'n4UserGroupEx', 'n4SetPrimServ',
+            'n4SetOptions', 'n4SetContextG', 'n4SetContext', 'n4ServerList', 'n4ServerInfo', 'n4ObjSearch', 'n4ObjRename', 'n4ObjOptions',
+            'n4ObjMove', 'n4ObjGetVal', 'n4ObjectProps', 'n4ObjectList', 'n4ObjectInfo', 'n4ObjDelete', 'n4NameConvert', 'n4MsgsEndAll',
+            'n4MsgsEnd', 'n4MemberSet', 'n4MemberGet', 'n4MemberDel', 'n4MapRoot', 'n4MapDir', 'n4MapDelete', 'n4Map', 'n4LogoutTree',
+            'n4Logout', 'n4Login', 'n4GetUserName', 'n4GetUserId', 'n4GetUser', 'n4GetNetAddr', 'n4GetMapped', 'n4GetContext',
+            'n4GetConnNum', 'n4FileUsers', 'n4FileTimeGet', 'n4FileAttrSet', 'n4FileAttrGet', 'n4DriveStatus', 'n4DrivePath', 'n4DirTimeGet',
+            'n4DirAttrSet', 'n4DirAttrGet', 'n4Detach', 'n4ChgPassword', 'n4CapturePrt', 'n4CaptureGet', 'n4CaptureEnd', 'n4Attach',
+            'n3Version', 'n3UserGroups', 'n3ServerList', 'n3ServerInfo', 'n3MsgsEndAll', 'n3MsgsEnd', 'n3MemberSet', 'n3MemberGet',
+            'n3MemberDel', 'n3Maproot', 'n3Mapdir', 'n3Mapdelete', 'n3Map', 'n3Logout', 'n3GetUserId', 'n3GetUser', 'n3GetNetAddr',
+            'n3GetMapped', 'n3GetConnNum', 'n3FileTimeGet', 'n3FileAttrSet', 'n3FileAttrGet', 'n3DriveStatus', 'n3DrivePath',
+            'n3DirTimeGet', 'n3DirAttrSet', 'n3DirAttrGet', 'n3Detach', 'n3ChgPassword', 'n3CapturePrt', 'n3CaptureGet',
+            'n3CaptureEnd', 'n3Attach', 'mVersion', 'mSyncMail', 'mSendMailEx', 'mSendMail', 'mrecvmail', 'mReadNextMsg', 'mLogOn',
+            'mLogOff', 'mFindNext', 'mError', 'mCompatible', 'kVerInfo', 'kStatusInfo', 'kSendText', 'kSendFile', 'kManageImap4',
+            'kInit', 'kGetMail', 'kExtra', 'kDest', 'kDeletePop3', 'iWriteDataBuf', 'iWriteData', 'iVersion', 'IUrlOpen', 'iUrlEncode',
+            'iUrlDecode', 'iReadDataBuf', 'iReadData', 'ipVersion', 'ipPing', 'iPing', 'ipHost2Addr', 'ipGetLastErr', 'ipGetAddress',
+            'iParseURL', 'ipAddr2Host', 'iOptionSet', 'iOptionGet', 'ImgWave', 'ImgVersion', 'ImgUnsharpMask', 'ImgThreshold', 'ImgSwirl',
+            'ImgSpread', 'ImgSolarize', 'ImgShear', 'ImgSharpen', 'ImgShade', 'ImgScale', 'ImgSample', 'ImgRotate', 'ImgResize',
+            'ImgReduceNoise', 'ImgRaise', 'ImgOilPaint', 'ImgNormalize', 'ImgNegate', 'ImgMotionBlur', 'ImgModulate', 'ImgMinify',
+            'ImgMedianFilter', 'ImgMagnify', 'ImgLevel', 'ImgIsValid', 'ImgIsPalette', 'ImgIsMono', 'ImgIsGray', 'ImgInfo', 'ImgImplode',
+            'ImgGetImageType', 'ImgGetColorCount', 'ImgGaussianBlur', 'ImgGamma', 'ImgFrame', 'ImgFlop', 'ImgFlip', 'ImgEqualize',
+            'ImgEnhance', 'ImgEmboss', 'ImgCrop', 'ImgConvert', 'ImgContrast', 'ImgCompare', 'ImgColorize', 'ImgChop', 'ImgCharcoal',
+            'ImgBorder', 'ImgBlur', 'ImgAddNoise', 'iLocFindNext', 'iLocFindInit', 'iHttpOpen', 'iHttpInit', 'iHttpHeaders', 'iHttpAccept',
+            'iHostConnect', 'iHost2Addr', 'iGetResponse', 'iGetLastError', 'iGetIEVer', 'iGetConStatEx', 'iGetConState', 'iFtpRename',
+            'iFtpPut', 'iFtpOpen', 'iFtpGet', 'iFtpFindNext', 'iFtpFindInit', 'iFtpDirRemove', 'iFtpDirMake', 'iFtpDirGet', 'iFtpDirChange',
+            'iFtpDialog', 'iFtpDelete', 'iFtpCmd', 'iErrorDialog', 'iDialItemize', 'iDialHangUp', 'iDial', 'iCookieSet', 'iCookieGet',
+            'iContentURL', 'iContentFile', 'iContentData', 'iClose', 'ibWrtf', 'ibWrt', 'ibWait', 'ibVersion', 'ibUnlock', 'ibTrg',
+            'ibTmo', 'ibStop', 'ibStatus', 'ibSta', 'ibSre', 'ibSic', 'ibSad', 'ibRsv', 'ibRsp', 'ibRsc', 'ibRpp', 'ibRdf', 'ibRd',
+            'ibPpc', 'ibPoke', 'ibPct', 'ibPad', 'ibOnl', 'ibMakeAddr', 'ibLock', 'ibLoc', 'ibLn', 'ibLines', 'ibIst', 'ibInit',
+            'ibGts', 'ibGetSad', 'ibGetPad', 'ibFind', 'ibEvent', 'ibErr', 'ibEot', 'ibEos', 'iBegin', 'ibDma', 'ibDev', 'ibConfig',
+            'ibCntl', 'ibCnt', 'ibCmda', 'ibCmd', 'ibClr', 'ibCac', 'ibBna', 'ibAsk', 'iAddr2Host', 'huge_Thousands', 'huge_Subtract',
+            'huge_SetOptions', 'huge_Multiply', 'huge_GetLastError', 'huge_ExtenderInfo', 'huge_Divide', 'huge_Decimal', 'huge_Add',
+            'httpStripHTML', 'httpRecvTextF', 'httpRecvText', 'httpRecvQuery', 'httpRecvQryF', 'httpRecvFile', 'httpGetServer',
+            'httpGetQuery', 'httpGetPath', 'httpGetFile', 'httpGetDir', 'httpGetAnchor', 'httpFullPath', 'httpFirewall', 'httpAuth',
+            'ftpRename', 'ftpQuote', 'ftpPut', 'ftpOpen', 'ftpList', 'ftpGet', 'ftpFirewall', 'ftpDelete', 'ftpClose', 'ftpChDir',
+            'FindRQS', 'FindLstn', 'EnvSetVar', 'EnvPathDel', 'EnvPathChk', 'EnvPathAdd', 'EnvListVars', 'EnvGetVar', 'EnvGetInfo',
+            'EnableRemote', 'EnableLocal', 'ehllapiWait', 'ehllapiVersion', 'ehllapiUninit', 'ehllapiStopKeyIntercept', 'ehllapiStopHostNotify',
+            'ehllapiStopCloseIntercept', 'ehllapiStartKeyIntercept', 'ehllapiStartHostNotify', 'ehllapiStartCloseIntercept',
+            'ehllapiSetWindowStatus', 'ehllapiSetSessionParams', 'ehllapiSetPSWindowName', 'ehllapiSetCursorLoc', 'ehllapiSendKey',
+            'ehllapiSendFile', 'ehllapiSearchPS', 'ehllapiSearchField', 'ehllapiRunProfile', 'ehllapiResetSystem', 'ehllapiReserve',
+            'ehllapiRelease', 'ehllapiReceiveFile', 'ehllapiQuerySystem', 'ehllapiQueryPSStatus', 'ehllapiQueryHostNotify',
+            'ehllapiQueryFieldAttr', 'ehllapiQueryCursorLoc', 'ehllapiQueryCloseIntercept', 'ehllapiPostInterceptStatus',
+            'ehllapiPause', 'ehllapiLastErrMsg', 'ehllapiInit', 'ehllapiGetWindowStatus', 'ehllapiGetPSHWND', 'ehllapiGetKey',
+            'ehllapiFindFieldPos', 'ehllapiFindFieldLen', 'ehllapiDisconnectPS', 'ehllapiCvtRCToPos', 'ehllapiCvtPosToRC',
+            'ehllapiCopyTextToPS', 'ehllapiCopyTextToField', 'ehllapiCopyTextFromPS', 'ehllapiCopyTextFromField', 'ehllapiCopyOIA',
+            'ehllapiConnectPS', 'dunItemize', 'dunDisconnect', 'dunConnectEx', 'dunConnect', 'dsTestParam', 'dsSIDtoHexStr', 'dsSetSecProp',
+            'dsSetProperty', 'dsSetPassword', 'dsSetObj', 'dsSetCredentX', 'dsSetCredent', 'dsRemFromGrp', 'dsRelSecObj', 'dsMoveObj',
+            'dsIsObject', 'dsIsMemberGrp', 'dsIsContainer', 'dsGetUsersGrps', 'dsGetSecProp', 'dsGetPropName', 'dsGetProperty',
+            'dsGetPrntPath', 'dsGetPrimGrp', 'dsGetMemGrp', 'dsGetInfo', 'dsGetClass', 'dsGetChldPath', 'dsFindPath', 'dsDeleteObj',
+            'dsCreatSecObj', 'dsCreateObj', 'dsCopySecObj', 'dsAddToGrp', 'dsAclRemAce', 'dsAclOrderAce', 'dsAclGetAces', 'dsAclAddAce',
+            'DevClearList', 'DevClear', 'dbTest', 'dbSwapColumns', 'dbSort', 'dbSetRecordField', 'dbSetOptions', 'dbSetErrorReporting',
+            'dbSetEntireRecord', 'dbSetDelimiter', 'dbSave', 'dbOpen', 'dbNameColumn', 'dbMakeNewItem', 'dbInsertColumn', 'dbGetVersion',
+            'dbGetSaveStatus', 'dbGetRecordField', 'dbGetRecordCount', 'dbGetNextItem', 'dbGetLastError', 'dbGetEntireRecord',
+            'dbGetColumnType', 'dbGetColumnNumber', 'dbGetColumnName', 'dbGetColumnCount', 'dbFindRecord', 'dbExist', 'dbEasterEgg',
+            'dbDeleteRecord', 'dbDeleteColumn', 'dbDebug', 'dbCookDatabases', 'dbClose', 'dbCloneRecord', 'dbBindCol', 'cWndState',
+            'cWndinfo', 'cWndGetWndSpecName', 'cWndGetWndSpec', 'cWndexist', 'cWndByWndSpecName', 'cWndByWndSpec', 'cWndbyseq',
+            'cWndbyname', 'cWndbyid', 'cWndbyclass', 'cWinIDConvert', 'cVersionInfo', 'cVendorId', 'cSetWndText', 'cSetUpDownPos',
+            'cSetTvItem', 'cSetTrackPos', 'cSetTabItem', 'cSetLvItem', 'cSetLbItemEx', 'cSetLbItem', 'cSetIpAddr', 'cSetFocus',
+            'cSetEditText', 'cSetDtpDate', 'cSetCbItem', 'cSetCalDate', 'cSendMessage', 'cRadioButton', 'cPostMessage', 'cPostButton',
+            'cMemStat', 'cGetWndCursor', 'cGetUpDownPos', 'cGetUpDownMin', 'cGetUpDownMax', 'cGetTVItem', 'cGetTrackPos', 'cGetTrackMin',
+            'cGetTrackMax', 'cGetTbText', 'cGetSbText', 'cGetLvText', 'cGetLvSelText', 'cGetLvFocText', 'cGetLvDdtText', 'cGetLvColText',
+            'cGetLbText', 'cGetLbSelText', 'cGetLbCount', 'cGetIpAddr', 'cGetInfo', 'cGetHrText', 'cGetFocus', 'cGetEditText', 'cGetDtpDate',
+            'cGetControlImageCRC', 'cGetCBText', 'cGetCbCount', 'cGetCalDate', 'cFindByName', 'cFindByClass', 'cEnablestate', 'cDblClickItem',
+            'cCpuSupt', 'cCpuSpeed', 'cCpuIdExt', 'cCpuId', 'cCpuFeat', 'cCpuBenchmark', 'cCloneCheck', 'cClickToolbar', 'cClickButton',
+            'cClearTvItem', 'cClearLvItem', 'cClearLbAll', 'cCheckbox', 'aVersion', 'aStatusbar', 'aShellFolder', 'aMsgTimeout', 'AllSPoll',
+            'aGetLastError', 'aFileRename', 'aFileMove', 'aFileDelete', 'aFileCopy'
+            ),
+        5 => array(
+            'wWordRight', 'wWordLeft', 'wWinTile', 'wWinRestore', 'wWinNext', 'wWinMinimize', 'wWinMaximize', 'wWinCloseAll', 'wWinClose',
+            'wWinCascade', 'wWinArricons', 'wViewOutput', 'wViewOptions', 'wViewHtml', 'wUpperCase', 'wUpline', 'wUndo', 'wTopOfFile', 'wToggleIns',
+            'wTab', 'wStatusMsg', 'wStartSel', 'wSpellcheck', 'wSetProject', 'wSetPrefs', 'wSetColblk', 'wSetBookmark', 'wSelWordRight',
+            'wSelWordLeft', 'wSelUp', 'wSelTop', 'wSelRight', 'wSelPgUp', 'wSelPgDn', 'wSelLeft', 'wSelInfo', 'wSelHome', 'wSelEnd', 'wSelectAll',
+            'wSelDown', 'wSelBottom', 'wRunRebuild', 'wRunMake', 'wRunExecute', 'wRunDebug', 'wRunConfig', 'wRunCompile', 'wRunCommand', 'wRight',
+            'wRepeat', 'wRedo', 'wRecord', 'wProperties', 'wPrintDirect', 'wPrinSetup', 'wPrevError', 'wPaste', 'wPageUp', 'wPageDown', 'wNextError',
+            'wNewLine', 'wLowerCase', 'wLineCount', 'wLeft', 'wInvertCase', 'wInsString', 'wInsLine', 'wHome', 'wHelpKeyword', 'wHelpKeybrd',
+            'wHelpIndex', 'wHelpHelp', 'wHelpCmds', 'wHelpAbout', 'wGotoLine', 'wGotoCol', 'wGetWrap', 'wGetWord', 'wGetUndo', 'wGetSelstate',
+            'wGetRedo', 'wGetOutput', 'wGetModified', 'wGetLineNo', 'wGetIns', 'wGetFilename', 'wGetColNo', 'wGetChar', 'wFtpOpen', 'wFindNext',
+            'wFindInFiles', 'wFind', 'wFileSaveAs', 'wFileSave', 'wFileRevert', 'wFilePrint', 'wFilePgSetup', 'wFileOpen', 'wFileNew', 'wFileMerge',
+            'wFileList', 'wFileExit', 'wEndSel', 'wEndOfFile', 'wEnd', 'wEdWrap', 'wEdWordRight', 'wEdWordLeft', 'wEdUpLine', 'wEdUndo', 'wEdTopOfFile',
+            'wEdToggleIns', 'wEdTab', 'wEdStartSel', 'wEdSetColBlk', 'wEdSelectAll', 'wEdRight', 'wEdRedo', 'wEdPaste', 'wEdPageUp', 'wEdPageDown',
+            'wEdNewLine', 'wEdLeft', 'wEdInsString', 'wEdHome', 'wEdGoToLine', 'wEdGoToCol', 'wEdGetWord', 'wEdEndSel', 'wEdEndOfFile', 'wEdEnd',
+            'wEdDownLine', 'wEdDelete', 'wEdCutLine', 'wEdCut', 'wEdCopyLine', 'wEdCopy', 'wEdClearSel', 'wEdBackTab', 'wEdBackspace', 'wDownLine',
+            'wDelete', 'wDelButton', 'wCutMarked', 'wCutLine', 'wCutAppend', 'wCut', 'wCopyMarked', 'wCopyLine', 'wCopyAppend', 'wCopy', 'wCompile',
+            'wClearSel', 'wChange', 'wCallMacro', 'wBackTab', 'wBackspace', 'wAutoIndent', 'wAddButton', 'edWindowTile', 'edWindowRestore',
+            'edWindowNext', 'edWindowMinimize', 'edWindowMaximize', 'edWindowCloseall', 'edWindowClose', 'edWindowCascade', 'edWindowArrangeIcons',
+            'edStatusMsg', 'edSearchViewOutput', 'edSearchRepeat', 'edSearchPrevError', 'edSearchNextError', 'edSearchFind', 'edSearchChange',
+            'edRunRebuild', 'edRunMake', 'edRunExecute', 'edRunDebug', 'edRunConfigure', 'edRunCompile', 'edRunCommand', 'edRecord', 'edHelpProcedures',
+            'edHelpKeyword', 'edHelpKeyboard', 'edHelpIndex', 'edHelpHelp', 'edHelpCommands', 'edHelpAbout', 'edGetWordWrapState', 'edGetWindowName',
+            'edGetUndoState', 'edGetSelectionState', 'edGetRedoState', 'edGetModifiedStatus', 'edGetLineNumber', 'edGetInsertState', 'edGetColumnNumber',
+            'edGetChar', 'edFileSetPreferences', 'edFileSaveAs', 'edFileSave', 'edFilePrinterSetup', 'edFilePrint', 'edFilePageSetup', 'edFileOpen',
+            'edFileNew', 'edFileMerge', 'edFileList', 'edFileExit', 'edEditWrap', 'edEditWordRight', 'edEditWordLeft', 'edEditUpLine', 'edEditUndo',
+            'edEditToggleIns', 'edEditTab', 'edEditStartSelection', 'edEditSetColumnBlock', 'edEditSetBookmark', 'edEditSelectAll', 'edEditRight',
+            'edEditRedo', 'edEditPaste', 'edEditPageUp', 'edEditPageDown', 'edEditLeft', 'edEditInsertString', 'edEditGoToLine', 'edEditGoToColumn',
+            'edEditGoToBookmark', 'edEditGetCurrentWord', 'edEditEndSelection', 'edEditEndOfLine', 'edEditEndOfFile', 'edEditDownline', 'edEditDelete',
+            'edEditCutline', 'edEditCut', 'edEditCopyline', 'edEditCopy', 'edEditClearSelection', 'edEditBeginningOfLine', 'edEditBeginningOfFile',
+            'edEditBackTab', 'edEditBackspace', 'edDeleteButton', 'edAddButton'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '+', '-', '~', '$', '^', '?', '@', '%', '#', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF00FF;',
+            5 => 'color: #008000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #FF1010; font-weight: bold;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(//Variable names
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xml.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xml.php
new file mode 100644
index 000000000..1222e9fb9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xml.php
@@ -0,0 +1,157 @@
+<?php
+/*************************************************************************************
+ * xml.php
+ * -------
+ * Author: Nigel McNie (nigel@geshi.org)
+ * Copyright: (c) 2004 Nigel McNie (http://qbnz.com/highlighter/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2004/09/01
+ *
+ * XML language file for GeSHi. Based on the idea/file by Christian Weiske
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2005/12/28 (1.0.2)
+ *   -  Removed escape character for strings
+ * 2004/11/27 (1.0.1)
+ *   -  Added support for multiple object splitters
+ * 2004/10/27 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2004/11/27)
+ * -------------------------
+ * * Check regexps work and correctly highlight XML stuff and nothing else
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'XML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(//attribute names
+            GESHI_SEARCH => '([a-z_:][\w\-\.:]*)(=)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        1 => array(//Initial header line
+            GESHI_SEARCH => '(&lt;[\/?|(\?xml)]?[a-z_:][\w\-\.:]*(\??&gt;)?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(//Tag end markers
+            GESHI_SEARCH => '(([\/|\?])?&gt;)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -1 => array(
+            '<!--' => '-->'
+            ),
+        0 => array(
+            '<!DOCTYPE' => '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<![CDATA[' => ']]>'
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xorg_conf.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xorg_conf.php
new file mode 100644
index 000000000..c32c460b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xorg_conf.php
@@ -0,0 +1,124 @@
+<?php
+/*************************************************************************************
+ * xorg_conf.php
+ * ----------
+ * Author: Milian Wolff (mail@milianw.de)
+ * Copyright: (c) 2008 Milian Wolff (http://milianw.de)
+ * Release Version: 1.0.8.4
+ * Date Started: 2008/06/18
+ *
+ * xorg.conf language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/06/18 (1.0.8)
+ *  -  Initial import
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'Xorg configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // sections
+        1 => array(
+            'Section', 'EndSection', 'SubSection', 'EndSubSection'
+            ),
+        2 => array(
+            // see http://www.x.org/archive/X11R6.9.0/doc/html/xorg.conf.5.html
+            'BiosBase', 'Black', 'Boardname', 'BusID', 'ChipID', 'ChipRev',
+            'Chipset', 'ClockChip', 'Clocks', 'DacSpeed',
+            'DefaultDepth', 'DefaultFbBpp', 'Depth', 'Device',
+            'DisplaySize', 'Driver', 'FbBpp', 'Gamma',
+            'HorizSync', 'IOBase', 'Identifier', 'InputDevice',
+            'Load', 'MemBase', 'Mode', 'Modeline', 'Modelname',
+            'Modes', 'Monitor', 'Option', 'Ramdac', 'RgbPath',
+            'Screen', 'TextClockFreq', 'UseModes', 'VendorName',
+            'VertRefresh', 'VideoAdaptor', 'VideoRam',
+            'ViewPort', 'Virtual', 'Visual', 'Weight', 'White'
+            ),
+        3 => array(
+            // some sub-keywords
+            // screen position
+            'Above', 'Absolute', 'Below', 'LeftOf', 'Relative', 'RightOf',
+            // modes
+            'DotClock', 'Flags', 'HSkew', 'HTimings', 'VScan', 'VTimings'
+            ),
+        ),
+    'REGEXPS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xpp.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xpp.php
new file mode 100644
index 000000000..db0019dd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/xpp.php
@@ -0,0 +1,436 @@
+<?php
+/*************************************************************************************
+ * xpp.php
+ * -------
+ * Author: Simon Butcher (simon@butcher.name)
+ * Copyright: (c) 2007 Simon Butcher (http://simon.butcher.name/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/02/27
+ *
+ * Axapta/Dynamics Ax X++ language file for GeSHi.
+ * For details, see <http://msdn.microsoft.com/en-us/library/aa867122.aspx>
+ *
+ * CHANGES
+ * -------
+ * 2007/02/28 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/02/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'X++',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // Primitive types
+            'void',
+            'str',
+            'real',
+            'int64',
+            'int',
+            'date',
+            'container',
+            'boolean',
+            'anytype'
+            ),
+        2 => array( // Keywords
+            'window',
+            'while',
+            'try',
+            'true',
+            'throw',
+            'switch',
+            'super',
+            'static',
+            'server',
+            'right',
+            'return',
+            'retry',
+            'public',
+            'protected',
+            'private',
+            'print',
+            'pause',
+            'null',
+            'new',
+            'mod',
+            'left',
+            'interface',
+            'implements',
+            'if',
+            'for',
+            'final',
+            'false',
+            'extends',
+            'else',
+            'edit',
+            'do',
+            'div',
+            'display',
+            'default',
+            'continue',
+            'client',
+            'class',
+            'changeCompany',
+            'case',
+            'breakpoint',
+            'break',
+            'at',
+            'abstract'
+            ),
+        3 => array( // Functions within the Axapta kernel
+            'year',
+            'wkofyr',
+            'webwebpartstr',
+            'webstaticfilestr',
+            'websitetempstr',
+            'websitedefstr',
+            'webreportstr',
+            'webpagedefstr',
+            'weboutputcontentitemstr',
+            'webmenustr',
+            'webletitemstr',
+            'webformstr',
+            'webdisplaycontentitemstr',
+            'webactionitemstr',
+            'varstr',
+            'utilmoyr',
+            'uint2str',
+            'typeof',
+            'typeid',
+            'trunc',
+            'today',
+            'timenow',
+            'time2str',
+            'term',
+            'tanh',
+            'tan',
+            'tablestr',
+            'tablestaticmethodstr',
+            'tablepname',
+            'tablenum',
+            'tablename2id',
+            'tablemethodstr',
+            'tableid2pname',
+            'tableid2name',
+            'tablefieldgroupstr',
+            'tablecollectionstr',
+            'systemdateset',
+            'systemdateget',
+            'syd',
+            'substr',
+            'strupr',
+            'strscan',
+            'strrtrim',
+            'strrep',
+            'strrem',
+            'strprompt',
+            'strpoke',
+            'strnfind',
+            'strlwr',
+            'strltrim',
+            'strline',
+            'strlen',
+            'strkeep',
+            'strins',
+            'strfmt',
+            'strfind',
+            'strdel',
+            'strcolseq',
+            'strcmp',
+            'stralpha',
+            'str2time',
+            'str2num',
+            'str2int64',
+            'str2int',
+            'str2guid',
+            'str2enum',
+            'str2date',
+            'staticmethodstr',
+            'sln',
+            'sleep',
+            'sinh',
+            'sin',
+            'setprefix',
+            'sessionid',
+            'securitykeystr',
+            'securitykeynum',
+            'runbuf',
+            'runas',
+            'round',
+            'resourcestr',
+            'reportstr',
+            'refprintall',
+            'rate',
+            'querystr',
+            'pv',
+            'pt',
+            'prmisdefault',
+            'primoyr',
+            'prevyr',
+            'prevqtr',
+            'prevmth',
+            'power',
+            'pmt',
+            'num2str',
+            'num2date',
+            'num2char',
+            'nextyr',
+            'nextqtr',
+            'nextmth',
+            'newguid',
+            'mthofyr',
+            'mthname',
+            'mkdate',
+            'minint',
+            'min',
+            'methodstr',
+            'menustr',
+            'menuitemoutputstr',
+            'menuitemdisplaystr',
+            'menuitemactionstr',
+            'maxint',
+            'maxdate',
+            'max',
+            'match',
+            'logn',
+            'log10',
+            'literalstr',
+            'licensecodestr',
+            'licensecodenum',
+            'intvnorm',
+            'intvno',
+            'intvname',
+            'intvmax',
+            'int64str',
+            'indexstr',
+            'indexnum',
+            'indexname2id',
+            'indexid2name',
+            'idg',
+            'identifierstr',
+            'helpfilestr',
+            'helpdevstr',
+            'helpapplstr',
+            'guid2str',
+            'getprefix',
+            'getCurrentUTCTime',
+            'fv',
+            'funcname',
+            'frac',
+            'formstr',
+            'fieldstr',
+            'fieldpname',
+            'fieldnum',
+            'fieldname2id',
+            'fieldid2pname',
+            'fieldid2name',
+            'extendedTypeStr',
+            'extendedTypeNum',
+            'exp10',
+            'exp',
+            'evalbuf',
+            'enumstr',
+            'enumnum',
+            'enumcnt',
+            'enum2str',
+            'endmth',
+            'dimof',
+            'dg',
+            'decround',
+            'ddb',
+            'dayofyr',
+            'dayofwk',
+            'dayofmth',
+            'dayname',
+            'date2str',
+            'date2num',
+            'curuserid',
+            'curext',
+            'cterm',
+            'cosh',
+            'cos',
+            'corrflagset',
+            'corrflagget',
+            'convertUTCTimeToLocalTime',
+            'convertUTCDateToLocalDate',
+            'conpoke',
+            'conpeek',
+            'connull',
+            'conlen',
+            'conins',
+            'confind',
+            'configurationkeystr',
+            'configurationkeynum',
+            'condel',
+            'classstr',
+            'classnum',
+            'classidget',
+            'char2num',
+            'beep',
+            'atan',
+            'asin',
+            'ascii2ansi',
+            'any2str',
+            'any2real',
+            'any2int64',
+            'any2int',
+            'any2guid',
+            'any2enum',
+            'any2date',
+            'ansi2ascii',
+            'acos',
+            'abs'
+            ),
+        4 => array( // X++ SQL stuff
+            'where',
+            'update_recordset',
+            'ttsCommit',
+            'ttsBegin',
+            'ttsAbort',
+            'sum',
+            'setting',
+            'select',
+            'reverse',
+            'pessimisticLock',
+            'outer',
+            'order by',
+            'optimisticLock',
+            'notExists',
+            'noFetch',
+            'next',
+            'minof',
+            'maxof',
+            'like',
+            'join',
+            'insert_recordset',
+            'index hint',
+            'index',
+            'group by',
+            'from',
+            'forUpdate',
+            'forceSelectOrder',
+            'forcePlaceholders',
+            'forceNestedLoop',
+            'forceLiterals',
+            'flush',
+            'firstOnly',
+            'firstFast',
+            'exists',
+            'desc',
+            'delete_from',
+            'count',
+            'avg',
+            'asc'
+            )
+        ),
+    'SYMBOLS' => array( // X++ symbols
+        '!',
+        '&',
+        '(',
+        ')',
+        '*',
+        '^',
+        '|',
+        '~',
+        '+',
+        ',',
+        '-',
+        '/',
+        ':',
+        '<',
+        '=',
+        '>',
+        '?',
+        '[',
+        ']',
+        '{',
+        '}'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #007f00;',
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00007f;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/geshi/z80.php b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/z80.php
new file mode 100644
index 000000000..2a9b14886
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/geshi/z80.php
@@ -0,0 +1,144 @@
+<?php
+/*************************************************************************************
+ * z80.php
+ * -------
+ * Author: Benny Baumann (BenBE@omorphia.de)
+ * Copyright: (c) 2007-2008 Benny Baumann (http://www.omorphia.de/)
+ * Release Version: 1.0.8.4
+ * Date Started: 2007/02/06
+ *
+ * ZiLOG Z80 Assembler language file for GeSHi.
+ * Syntax definition as commonly used with table assembler TASM32
+ * This file will contain some undocumented opcodes.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/23 (1.0.7.22)
+ *   -  Added description of extra language features (SF#1970248)
+ * 2007/06/03 (1.0.1)
+ *   -  Fixed two typos in the language file
+ * 2007/02/06 (1.0.0)
+ *   -  First Release
+ *
+ * TODO (updated 2007/02/06)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     This file is part of GeSHi.
+ *
+ *   GeSHi is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   GeSHi is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with GeSHi; if not, write to the Free Software
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ ************************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'ZiLOG Z80 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','and','bit','call','ccf','cp','cpd','cpdr','cpir','cpi',
+            'cpl','daa','dec','di','djnz','ei','ex','exx','halt','im','in',
+            'in0','inc','ind','indr','inir','ini','jp','jr','ld','ldd','lddr',
+            'ldir','ldi','mlt','neg','nop','or','otdm','otdmr','otdr','otim',
+            'otimr','otir','out','out0','outd','outi','pop','push','res','ret',
+            'reti','retn','rl','rla','rlc','rlca','rld','rr','rra','rrc','rrca',
+            'rrd','rst','sbc','scf','set','sla','sl1','sll','slp','sra','srl',
+            'sub','tst','tstio','xor'
+            ),
+        /*registers*/
+        2 => array(
+            'a','b','c','d','e','h','l',
+            'af','bc','de','hl','ix','iy','sp',
+            'af\'','ixh','ixl','iyh','iyl'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')', '?', '+', '-', '*', '/', '%', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}|[01]{1,64}[bB]?',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/html.php b/mod/dokuwiki/vendors/dokuwiki/inc/html.php
new file mode 100644
index 000000000..0a23370ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/html.php
@@ -0,0 +1,1608 @@
+<?php
+/**
+ * HTML output functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/parserutils.php');
+require_once(DOKU_INC.'inc/form.php');
+
+/**
+ * Convenience function to quickly build a wikilink
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_wikilink($id,$name=null,$search=''){
+    static $xhtml_renderer = null;
+    if(is_null($xhtml_renderer)){
+        $xhtml_renderer = p_get_renderer('xhtml');
+    }
+
+    return $xhtml_renderer->internallink($id,$name,$search,true,'navigation');
+}
+
+/**
+ * Helps building long attribute lists
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_attbuild($attributes){
+    $ret = '';
+    foreach ( $attributes as $key => $value ) {
+        $ret .= $key.'="'.formText($value).'" ';
+    }
+    return trim($ret);
+}
+
+/**
+ * The loginform
+ *
+ * @author   Andreas Gohr <andi@splitbrain.org>
+ */
+function html_login(){
+    global $lang;
+    global $conf;
+    global $ID;
+    global $auth;
+
+    print p_locale_xhtml('login');
+    print '<div class="centeralign">'.NL;
+    $form = new Doku_Form(array('id' => 'dw__login'));
+    $form->startFieldset($lang['btn_login']);
+    $form->addHidden('id', $ID);
+    $form->addHidden('do', 'login');
+    $form->addElement(form_makeTextField('u', ((!$_REQUEST['http_credentials']) ? $_REQUEST['u'] : ''), $lang['user'], 'focus__this', 'block'));
+    $form->addElement(form_makePasswordField('p', $lang['pass'], '', 'block'));
+    if($conf['rememberme']) {
+        $form->addElement(form_makeCheckboxField('r', '1', $lang['remember'], 'remember__me', 'simple'));
+    }
+    $form->addElement(form_makeButton('submit', '', $lang['btn_login']));
+    $form->endFieldset();
+
+    if($auth && $auth->canDo('addUser') && actionOK('register')){
+        $form->addElement('<p>'
+                          . $lang['reghere']
+                          . ': <a href="'.wl($ID,'do=register').'" rel="nofollow" class="wikilink1">'.$lang['register'].'</a>'
+                          . '</p>');
+    }
+
+    if ($auth && $auth->canDo('modPass') && actionOK('resendpwd')) {
+        $form->addElement('<p>'
+                          . $lang['pwdforget']
+                          . ': <a href="'.wl($ID,'do=resendpwd').'" rel="nofollow" class="wikilink1">'.$lang['btn_resendpwd'].'</a>'
+                          . '</p>');
+    }
+
+    html_form('login', $form);
+    print '</div>'.NL;
+}
+
+/**
+ * prints a section editing button
+ * used as a callback in html_secedit
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_secedit_button($matches){
+    global $ID;
+    global $INFO;
+
+    $section = $matches[2];
+    $name = $matches[1];
+
+    $secedit  = '';
+    $secedit .= '<div class="secedit">';
+    $secedit .= html_btn('secedit',$ID,'',
+            array('do'      => 'edit',
+                'lines'   => "$section",
+                'rev' => $INFO['lastmod']),
+            'post', $name);
+    $secedit .= '</div>';
+    return $secedit;
+}
+
+/**
+ * inserts section edit buttons if wanted or removes the markers
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_secedit($text,$show=true){
+    global $INFO;
+
+    if($INFO['writable'] && $show && !$INFO['rev']){
+        $text = preg_replace_callback('#<!-- SECTION "(.*?)" \[(\d+-\d*)\] -->#',
+                'html_secedit_button', $text);
+    }else{
+        $text = preg_replace('#<!-- SECTION "(.*?)" \[(\d+-\d*)\] -->#','',$text);
+    }
+
+    return $text;
+}
+
+/**
+ * Just the back to top button (in its own form)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_topbtn(){
+    global $lang;
+
+    $ret  = '';
+    $ret  = '<a class="nolink" href="#dokuwiki__top"><input type="button" class="button" value="'.$lang['btn_top'].'" onclick="window.scrollTo(0, 0)" title="'.$lang['btn_top'].'" /></a>';
+
+    return $ret;
+}
+
+/**
+ * Displays a button (using its own form)
+ * If tooltip exists, the access key tooltip is replaced.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_btn($name,$id,$akey,$params,$method='get',$tooltip=''){
+    global $conf;
+    global $lang;
+
+    $label = $lang['btn_'.$name];
+
+    $ret = '';
+    $tip = '';
+
+    //filter id (without urlencoding)
+    $id = idfilter($id,false);
+
+    //make nice URLs even for buttons
+    if($conf['userewrite'] == 2){
+        $script = DOKU_BASE.DOKU_SCRIPT.'/'.$id;
+    }elseif($conf['userewrite']){
+        $script = DOKU_BASE.$id;
+    }else{
+        $script = DOKU_BASE.DOKU_SCRIPT;
+        $params['id'] = $id;
+    }
+
+    $ret .= '<form class="button btn_'.$name.'" method="'.$method.'" action="'.$script.'"><div class="no">';
+
+    if(is_array($params)){
+        reset($params);
+        while (list($key, $val) = each($params)) {
+            $ret .= '<input type="hidden" name="'.$key.'" ';
+            $ret .= 'value="'.htmlspecialchars($val).'" />';
+        }
+    }
+
+    if ($tooltip!='') {
+        $tip = htmlspecialchars($tooltip);
+    }else{
+        $tip = htmlspecialchars($label);
+    }
+
+    $ret .= '<input type="submit" value="'.htmlspecialchars($label).'" class="button" ';
+    if($akey){
+        $tip .= ' ['.strtoupper($akey).']';
+        $ret .= 'accesskey="'.$akey.'" ';
+    }
+    $ret .= 'title="'.$tip.'" ';
+    $ret .= '/>';
+    $ret .= '</div></form>';
+
+    return $ret;
+}
+
+/**
+ * show a wiki page
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_show($txt=''){
+    global $ID;
+    global $REV;
+    global $HIGH;
+    global $INFO;
+    //disable section editing for old revisions or in preview
+    if($txt || $REV){
+        $secedit = false;
+    }else{
+        $secedit = true;
+    }
+
+    if ($txt){
+        //PreviewHeader
+        echo '<br id="scroll__here" />';
+        echo p_locale_xhtml('preview');
+        echo '<div class="preview">';
+        $html = html_secedit(p_render('xhtml',p_get_instructions($txt),$info),$secedit);
+        if($INFO['prependTOC']) $html = tpl_toc(true).$html;
+        echo $html;
+        echo '<div class="clearer"></div>';
+        echo '</div>';
+
+    }else{
+        if ($REV) print p_locale_xhtml('showrev');
+        $html = p_wiki_xhtml($ID,$REV,true);
+        $html = html_secedit($html,$secedit);
+        if($INFO['prependTOC']) $html = tpl_toc(true).$html;
+        $html = html_hilight($html,$HIGH);
+        echo $html;
+    }
+}
+
+/**
+ * ask the user about how to handle an exisiting draft
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_draft(){
+    global $INFO;
+    global $ID;
+    global $lang;
+    global $conf;
+    $draft = unserialize(io_readFile($INFO['draft'],false));
+    $text  = cleanText(con($draft['prefix'],$draft['text'],$draft['suffix'],true));
+
+    print p_locale_xhtml('draft');
+    $form = new Doku_Form(array('id' => 'dw__editform'));
+    $form->addHidden('id', $ID);
+    $form->addHidden('date', $draft['date']);
+    $form->addElement(form_makeWikiText($text, array('readonly'=>'readonly')));
+    $form->addElement(form_makeOpenTag('div', array('id'=>'draft__status')));
+    $form->addElement($lang['draftdate'].' '. dformat(filemtime($INFO['draft'])));
+    $form->addElement(form_makeCloseTag('div'));
+    $form->addElement(form_makeButton('submit', 'recover', $lang['btn_recover'], array('tabindex'=>'1')));
+    $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_draftdel'], array('tabindex'=>'2')));
+    $form->addElement(form_makeButton('submit', 'show', $lang['btn_cancel'], array('tabindex'=>'3')));
+    html_form('draft', $form);
+}
+
+/**
+ * Highlights searchqueries in HTML code
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function html_hilight($html,$phrases){
+    $phrases = array_filter((array) $phrases);
+    $regex = join('|',array_map('preg_quote_cb',$phrases));
+
+    if ($regex === '') return $html;
+    $html = preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
+    return $html;
+}
+
+/**
+ * Callback used by html_hilight()
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function html_hilight_callback($m) {
+    $hlight = unslash($m[0]);
+    if ( !isset($m[2])) {
+        $hlight = '<span class="search_hit">'.$hlight.'</span>';
+    }
+    return $hlight;
+}
+
+/**
+ * Run a search and display the result
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_search(){
+    require_once(DOKU_INC.'inc/search.php');
+    require_once(DOKU_INC.'inc/fulltext.php');
+    global $conf;
+    global $QUERY;
+    global $ID;
+    global $lang;
+
+    print p_locale_xhtml('searchpage');
+    flush();
+
+    //check if search is restricted to namespace
+    if(preg_match('/@([^@]*)/',$QUERY,$match)) {
+        $id = cleanID($match[1]);
+    } else {
+        $id = cleanID($QUERY);
+    }
+
+    //show progressbar
+    print '<div class="centeralign" id="dw__loading">'.NL;
+    print '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'.NL;
+    print 'showLoadBar();'.NL;
+    print '//--><!]]></script>'.NL;
+    print '<br /></div>'.NL;
+    flush();
+
+    //do quick pagesearch
+    $data = array();
+
+    if($id) $data = ft_pageLookup($id);
+    if(count($data)){
+        print '<div class="search_quickresult">';
+        print '<h3>'.$lang['quickhits'].':</h3>';
+        print '<ul class="search_quickhits">';
+        foreach($data as $id){
+            print '<li> ';
+            $ns = getNS($id);
+            if($ns){
+                $name = shorten(noNS($id), ' ('.$ns.')',30);
+            }else{
+                $name = $id;
+            }
+            print html_wikilink(':'.$id,$name);
+            print '</li> ';
+        }
+        print '</ul> ';
+        //clear float (see http://www.complexspiral.com/publications/containing-floats/)
+        print '<div class="clearer">&nbsp;</div>';
+        print '</div>';
+    }
+    flush();
+
+    //do fulltext search
+    $data = ft_pageSearch($QUERY,$regex);
+    if(count($data)){
+        $num = 1;
+        foreach($data as $id => $cnt){
+            print '<div class="search_result">';
+            print html_wikilink(':'.$id,useHeading('navigation')?null:$id,$regex);
+            if($cnt !== 0){
+                print ': <span class="search_cnt">'.$cnt.' '.$lang['hits'].'</span><br />';
+                if($num < 15){ // create snippets for the first number of matches only #FIXME add to conf ?
+                    print '<div class="search_snippet">'.ft_snippet($id,$regex).'</div>';
+                }
+                $num++;
+            }
+            print '</div>';
+            flush();
+        }
+    }else{
+        print '<div class="nothing">'.$lang['nothingfound'].'</div>';
+    }
+
+    //hide progressbar
+    print '<script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--'.NL;
+    print 'hideLoadBar("dw__loading");'.NL;
+    print '//--><!]]></script>'.NL;
+    flush();
+}
+
+/**
+ * Display error on locked pages
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_locked(){
+    global $ID;
+    global $conf;
+    global $lang;
+    global $INFO;
+
+    $locktime = filemtime(wikiLockFN($ID));
+    $expire = dformat($locktime + $conf['locktime']);
+    $min    = round(($conf['locktime'] - (time() - $locktime) )/60);
+
+    print p_locale_xhtml('locked');
+    print '<ul>';
+    print '<li><div class="li"><strong>'.$lang['lockedby'].':</strong> '.editorinfo($INFO['locked']).'</div></li>';
+    print '<li><div class="li"><strong>'.$lang['lockexpire'].':</strong> '.$expire.' ('.$min.' min)</div></li>';
+    print '</ul>';
+}
+
+/**
+ * list old revisions
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function html_revisions($first=0){
+    global $ID;
+    global $INFO;
+    global $conf;
+    global $lang;
+    /* we need to get one additionally log entry to be able to
+     * decide if this is the last page or is there another one.
+     * see html_recent()
+     */
+    $revisions = getRevisions($ID, $first, $conf['recent']+1);
+    if(count($revisions)==0 && $first!=0){
+        $first=0;
+        $revisions = getRevisions($ID, $first, $conf['recent']+1);;
+    }
+    $hasNext = false;
+    if (count($revisions)>$conf['recent']) {
+        $hasNext = true;
+        array_pop($revisions); // remove extra log entry
+    }
+
+    $date = dformat($INFO['lastmod']);
+
+    print p_locale_xhtml('revisions');
+
+    $form = new Doku_Form(array('id' => 'page__revisions'));
+    $form->addElement(form_makeOpenTag('ul'));
+    if($INFO['exists'] && $first==0){
+        if (isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
+            $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
+        else
+            $form->addElement(form_makeOpenTag('li'));
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+        $form->addElement(form_makeTag('input', array(
+                        'type' => 'checkbox',
+                        'name' => 'rev2[]',
+                        'value' => 'current')));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeTag('img', array(
+                        'src' =>  DOKU_MEDIA.'lib/images/blank.gif',
+                        'width' => '15',
+                        'height' => '11',
+                        'alt'    => '')));
+
+        $form->addElement(form_makeOpenTag('a', array(
+                        'class' => 'wikilink1',
+                        'href'  => wl($ID))));
+        $form->addElement($ID);
+        $form->addElement(form_makeCloseTag('a'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+        $form->addElement(' &ndash; ');
+        $form->addElement(htmlspecialchars($INFO['sum']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        $form->addElement((empty($INFO['editor']))?('('.$lang['external_edit'].')'):editorinfo($INFO['editor']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement('('.$lang['current'].')');
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+
+    foreach($revisions as $rev){
+        $date   = dformat($rev);
+        $info   = getRevisionInfo($ID,$rev,true);
+        $exists = page_exists($ID,$rev);
+
+        if ($info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
+            $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
+        else
+            $form->addElement(form_makeOpenTag('li'));
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+        if($exists){
+            $form->addElement(form_makeTag('input', array(
+                            'type' => 'checkbox',
+                            'name' => 'rev2[]',
+                            'value' => $rev)));
+        }else{
+            $form->addElement(form_makeTag('img', array(
+                            'src' => DOKU_MEDIA.'lib/images/blank.gif',
+                            'width' => 14,
+                            'height' => 11,
+                            'alt' => '')));
+        }
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        if($exists){
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev,do=diff", false, '&'), 'class' => 'diff_link')));
+            $form->addElement(form_makeTag('img', array(
+                            'src'    => DOKU_MEDIA.'lib/images/diff.png',
+                            'width'  => 15,
+                            'height' => 11,
+                            'title'  => $lang['diff'],
+                            'alt'    => $lang['diff'])));
+            $form->addElement(form_makeCloseTag('a'));
+
+            $form->addElement(form_makeOpenTag('a', array('href' => wl($ID,"rev=$rev",false,'&'), 'class' => 'wikilink1')));
+            $form->addElement($ID);
+            $form->addElement(form_makeCloseTag('a'));
+        }else{
+            $form->addElement(form_makeTag('img', array(
+                            'src' => DOKU_MEDIA.'lib/images/blank.gif',
+                            'width' => '15',
+                            'height' => '11',
+                            'alt'   => '')));
+            $form->addElement($ID);
+        }
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+        $form->addElement(' &ndash; ');
+        $form->addElement(htmlspecialchars($info['sum']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        if($info['user']){
+            $form->addElement(editorinfo($info['user']));
+            if(auth_ismanager()){
+                $form->addElement(' ('.$info['ip'].')');
+            }
+        }else{
+            $form->addElement($info['ip']);
+        }
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+    $form->addElement(form_makeCloseTag('ul'));
+    $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    html_form('revisions', $form);
+
+    print '<div class="pagenav">';
+    $last = $first + $conf['recent'];
+    if ($first > 0) {
+        $first -= $conf['recent'];
+        if ($first < 0) $first = 0;
+        print '<div class="pagenav-prev">';
+        print html_btn('newer',$ID,"p",array('do' => 'revisions', 'first' => $first));
+        print '</div>';
+    }
+    if ($hasNext) {
+        print '<div class="pagenav-next">';
+        print html_btn('older',$ID,"n",array('do' => 'revisions', 'first' => $last));
+        print '</div>';
+    }
+    print '</div>';
+
+}
+
+/**
+ * display recent changes
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function html_recent($first=0){
+    global $conf;
+    global $lang;
+    global $ID;
+    /* we need to get one additionally log entry to be able to
+     * decide if this is the last page or is there another one.
+     * This is the cheapest solution to get this information.
+     */
+    $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
+    if(count($recents) == 0 && $first != 0){
+        $first=0;
+        $recents = getRecents($first,$conf['recent'] + 1,getNS($ID));
+    }
+    $hasNext = false;
+    if (count($recents)>$conf['recent']) {
+        $hasNext = true;
+        array_pop($recents); // remove extra log entry
+    }
+
+    print p_locale_xhtml('recent');
+
+    if (getNS($ID) != '')
+        print '<div class="level1"><p>' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '</p></div>';
+
+    $form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET'));
+    $form->addHidden('sectok', null);
+    $form->addHidden('do', 'recent');
+    $form->addHidden('id', $ID);
+    $form->addElement(form_makeOpenTag('ul'));
+
+    foreach($recents as $recent){
+        $date = dformat($recent['date']);
+        if ($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
+            $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
+        else
+            $form->addElement(form_makeOpenTag('li'));
+
+        $form->addElement(form_makeOpenTag('div', array('class' => 'li')));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => wl($recent['id'],"do=diff", false, '&'))));
+        $form->addElement(form_makeTag('img', array(
+                        'src'   => DOKU_MEDIA.'lib/images/diff.png',
+                        'width' => 15,
+                        'height'=> 11,
+                        'title' => $lang['diff'],
+                        'alt'   => $lang['diff']
+                        )));
+        $form->addElement(form_makeCloseTag('a'));
+
+        $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => wl($recent['id'],"do=revisions",false,'&'))));
+        $form->addElement(form_makeTag('img', array(
+                        'src'   => DOKU_MEDIA.'lib/images/history.png',
+                        'width' => 12,
+                        'height'=> 14,
+                        'title' => $lang['btn_revs'],
+                        'alt'   => $lang['btn_revs']
+                        )));
+        $form->addElement(form_makeCloseTag('a'));
+
+        $form->addElement(html_wikilink(':'.$recent['id'],useHeading('navigation')?null:$recent['id']));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+        $form->addElement(' &ndash; '.htmlspecialchars($recent['sum']));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'user')));
+        if($recent['user']){
+            $form->addElement(editorinfo($recent['user']));
+            if(auth_ismanager()){
+                $form->addElement(' ('.$recent['ip'].')');
+            }
+        }else{
+            $form->addElement($recent['ip']);
+        }
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+    $form->addElement(form_makeCloseTag('ul'));
+
+    $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav')));
+    $last = $first + $conf['recent'];
+    if ($first > 0) {
+        $first -= $conf['recent'];
+        if ($first < 0) $first = 0;
+        $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-prev')));
+        $form->addElement(form_makeTag('input', array(
+                    'type'  => 'submit',
+                    'name'  => 'first['.$first.']',
+                    'value' => $lang['btn_newer'],
+                    'accesskey' => 'n',
+                    'title' => $lang['btn_newer'].' [N]',
+                    'class' => 'button'
+                    )));
+        $form->addElement(form_makeCloseTag('div'));
+    }
+    if ($hasNext) {
+        $form->addElement(form_makeOpenTag('div', array('class' => 'pagenav-next')));
+        $form->addElement(form_makeTag('input', array(
+                        'type'  => 'submit',
+                        'name'  => 'first['.$last.']',
+                        'value' => $lang['btn_older'],
+                        'accesskey' => 'p',
+                        'title' => $lang['btn_older'].' [P]',
+                        'class' => 'button'
+                        )));
+        $form->addElement(form_makeCloseTag('div'));
+    }
+    $form->addElement(form_makeCloseTag('div'));
+    html_form('recent', $form);
+}
+
+/**
+ * Display page index
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_index($ns){
+    require_once(DOKU_INC.'inc/search.php');
+    global $conf;
+    global $ID;
+    $dir = $conf['datadir'];
+    $ns  = cleanID($ns);
+    #fixme use appropriate function
+    if(empty($ns)){
+        $ns = dirname(str_replace(':','/',$ID));
+        if($ns == '.') $ns ='';
+    }
+    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    echo p_locale_xhtml('index');
+    echo '<div id="index__tree">';
+
+    $data = array();
+    search($data,$conf['datadir'],'search_index',array('ns' => $ns));
+    echo html_buildlist($data,'idx','html_list_index','html_li_index');
+
+    echo '</div>';
+}
+
+/**
+ * Index item formatter
+ *
+ * User function for html_buildlist()
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_list_index($item){
+    global $ID;
+    $ret = '';
+    $base = ':'.$item['id'];
+    $base = substr($base,strrpos($base,':')+1);
+    if($item['type']=='d'){
+        $ret .= '<a href="'.wl($ID,'idx='.rawurlencode($item['id'])).'" class="idx_dir"><strong>';
+        $ret .= $base;
+        $ret .= '</strong></a>';
+    }else{
+        $ret .= html_wikilink(':'.$item['id']);
+    }
+    return $ret;
+}
+
+/**
+ * Index List item
+ *
+ * This user function is used in html_build_lidt to build the
+ * <li> tags for namespaces when displaying the page index
+ * it gives different classes to opened or closed "folders"
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_li_index($item){
+    if($item['type'] == "f"){
+        return '<li class="level'.$item['level'].'">';
+    }elseif($item['open']){
+        return '<li class="open">';
+    }else{
+        return '<li class="closed">';
+    }
+}
+
+/**
+ * Default List item
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_li_default($item){
+    return '<li class="level'.$item['level'].'">';
+}
+
+/**
+ * Build an unordered list
+ *
+ * Build an unordered list from the given $data array
+ * Each item in the array has to have a 'level' property
+ * the item itself gets printed by the given $func user
+ * function. The second and optional function is used to
+ * print the <li> tag. Both user function need to accept
+ * a single item.
+ *
+ * Both user functions can be given as array to point to
+ * a member of an object.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_buildlist($data,$class,$func,$lifunc='html_li_default'){
+    $level = 0;
+    $opens = 0;
+    $ret   = '';
+
+    foreach ($data as $item){
+
+        if( $item['level'] > $level ){
+            //open new list
+            for($i=0; $i<($item['level'] - $level); $i++){
+                if ($i) $ret .= "<li class=\"clear\">\n";
+                $ret .= "\n<ul class=\"$class\">\n";
+            }
+        }elseif( $item['level'] < $level ){
+            //close last item
+            $ret .= "</li>\n";
+            for ($i=0; $i<($level - $item['level']); $i++){
+                //close higher lists
+                $ret .= "</ul>\n</li>\n";
+            }
+        }else{
+            //close last item
+            $ret .= "</li>\n";
+        }
+
+        //remember current level
+        $level = $item['level'];
+
+        //print item
+        $ret .= call_user_func($lifunc,$item);
+        $ret .= '<div class="li">';
+
+        $ret .= call_user_func($func,$item);
+        $ret .= '</div>';
+    }
+
+    //close remaining items and lists
+    for ($i=0; $i < $level; $i++){
+        $ret .= "</li></ul>\n";
+    }
+
+    return $ret;
+}
+
+/**
+ * display backlinks
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function html_backlinks(){
+    require_once(DOKU_INC.'inc/fulltext.php');
+    global $ID;
+    global $conf;
+    global $lang;
+
+    print p_locale_xhtml('backlinks');
+
+    $data = ft_backlinks($ID);
+
+    if(!empty($data)) {
+        print '<ul class="idx">';
+        foreach($data as $blink){
+            print '<li><div class="li">';
+            print html_wikilink(':'.$blink,useHeading('navigation')?null:$blink);
+            print '</div></li>';
+        }
+        print '</ul>';
+    } else {
+        print '<div class="level1"><p>' . $lang['nothingfound'] . '</p></div>';
+    }
+}
+
+/**
+ * show diff
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_diff($text='',$intro=true){
+    require_once(DOKU_INC.'inc/DifferenceEngine.php');
+    global $ID;
+    global $REV;
+    global $lang;
+    global $conf;
+
+    // we're trying to be clever here, revisions to compare can be either
+    // given as rev and rev2 parameters, with rev2 being optional. Or in an
+    // array in rev2.
+    $rev1 = $REV;
+
+    if(is_array($_REQUEST['rev2'])){
+        $rev1 = (int) $_REQUEST['rev2'][0];
+        $rev2 = (int) $_REQUEST['rev2'][1];
+
+        if(!$rev1){
+            $rev1 = $rev2;
+            unset($rev2);
+        }
+    }else{
+        $rev2 = (int) $_REQUEST['rev2'];
+    }
+
+    if($text){                      // compare text to the most current revision
+        $l_rev   = '';
+        $l_text  = rawWiki($ID,'');
+        $l_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
+            $ID.' '.dformat((int) @filemtime(wikiFN($ID))).'</a> '.
+            $lang['current'];
+
+        $r_rev   = '';
+        $r_text  = cleanText($text);
+        $r_head  = $lang['yours'];
+    }else{
+        if($rev1 && $rev2){            // two specific revisions wanted
+            // make sure order is correct (older on the left)
+            if($rev1 < $rev2){
+                $l_rev = $rev1;
+                $r_rev = $rev2;
+            }else{
+                $l_rev = $rev2;
+                $r_rev = $rev1;
+            }
+        }elseif($rev1){                // single revision given, compare to current
+            $r_rev = '';
+            $l_rev = $rev1;
+        }else{                        // no revision was given, compare previous to current
+            $r_rev = '';
+            $revs = getRevisions($ID, 0, 1);
+            $l_rev = $revs[0];
+            $REV = $l_rev; // store revision back in $REV
+        }
+
+        // when both revisions are empty then the page was created just now
+        if(!$l_rev && !$r_rev){
+            $l_text = '';
+        }else{
+            $l_text = rawWiki($ID,$l_rev);
+        }
+        $r_text = rawWiki($ID,$r_rev);
+
+        if(!$l_rev){
+            $l_head = '&mdash;';
+        }else{
+            $l_info   = getRevisionInfo($ID,$l_rev,true);
+            if($l_info['user']){
+                $l_user = editorinfo($l_info['user']);
+                if(auth_ismanager()) $l_user .= ' ('.$l_info['ip'].')';
+            } else {
+                $l_user = $l_info['ip'];
+            }
+            $l_user  = '<span class="user">'.$l_user.'</span>';
+            $l_sum   = ($l_info['sum']) ? '<span class="sum">'.hsc($l_info['sum']).'</span>' : '';
+            if ($l_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $l_minor = 'class="minor"';
+
+            $l_head = '<a class="wikilink1" href="'.wl($ID,"rev=$l_rev").'">'.
+            $ID.' ['.dformat($l_rev).']</a>'.
+            '<br />'.$l_user.' '.$l_sum;
+        }
+
+        if($r_rev){
+            $r_info   = getRevisionInfo($ID,$r_rev,true);
+            if($r_info['user']){
+                $r_user = editorinfo($r_info['user']);
+                if(auth_ismanager()) $r_user .= ' ('.$r_info['ip'].')';
+            } else {
+                $r_user = $r_info['ip'];
+            }
+            $r_user = '<span class="user">'.$r_user.'</span>';
+            $r_sum  = ($r_info['sum']) ? '<span class="sum">'.hsc($r_info['sum']).'</span>' : '';
+            if ($r_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+            $r_head = '<a class="wikilink1" href="'.wl($ID,"rev=$r_rev").'">'.
+            $ID.' ['.dformat($r_rev).']</a>'.
+            '<br />'.$r_user.' '.$r_sum;
+        }elseif($_rev = @filemtime(wikiFN($ID))){
+            $_info   = getRevisionInfo($ID,$_rev,true);
+            if($_info['user']){
+                $_user = editorinfo($_info['user']);
+                if(auth_ismanager()) $_user .= ' ('.$_info['ip'].')';
+            } else {
+                $_user = $_info['ip'];
+            }
+            $_user = '<span class="user">'.$_user.'</span>';
+            $_sum  = ($_info['sum']) ? '<span class="sum">'.hsc($_info['sum']).'</span>' : '';
+            if ($_info['type']===DOKU_CHANGE_TYPE_MINOR_EDIT) $r_minor = 'class="minor"';
+
+            $r_head  = '<a class="wikilink1" href="'.wl($ID).'">'.
+            $ID.' ['.dformat($_rev).']</a> '.
+            '('.$lang['current'].')'.
+            '<br />'.$_user.' '.$_sum;
+        }else{
+            $r_head = '&mdash; ('.$lang['current'].')';
+        }
+    }
+
+    $df = new Diff(explode("\n",htmlspecialchars($l_text)),
+        explode("\n",htmlspecialchars($r_text)));
+
+    $tdf = new TableDiffFormatter();
+    if($intro) print p_locale_xhtml('diff');
+    ?>
+    <table class="diff">
+    <tr>
+    <th colspan="2" <?php echo $l_minor?>>
+    <?php echo $l_head?>
+    </th>
+    <th colspan="2" <?php echo $r_minor?>>
+    <?php echo $r_head?>
+    </th>
+    </tr>
+    <?php echo $tdf->format($df)?>
+    </table>
+    <?php
+}
+
+/**
+ * show warning on conflict detection
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_conflict($text,$summary){
+    global $ID;
+    global $lang;
+
+    print p_locale_xhtml('conflict');
+    $form = new Doku_Form(array('id' => 'dw__editform'));
+    $form->addHidden('id', $ID);
+    $form->addHidden('wikitext', $text);
+    $form->addHidden('summary', $summary);
+    $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('accesskey'=>'s')));
+    $form->addElement(form_makeButton('submit', 'cancel', $lang['btn_cancel']));
+    html_form('conflict', $form);
+    print '<br /><br /><br /><br />'.NL;
+}
+
+/**
+ * Prints the global message array
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_msgarea(){
+    global $MSG;
+    if(!isset($MSG)) return;
+
+    $shown = array();
+    foreach($MSG as $msg){
+        $hash = md5($msg['msg']);
+        if(isset($shown[$hash])) continue; // skip double messages
+        print '<div class="'.$msg['lvl'].'">';
+        print $msg['msg'];
+        print '</div>';
+        $shown[$hash] = 1;
+    }
+}
+
+/**
+ * Prints the registration form
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_register(){
+    global $lang;
+    global $conf;
+    global $ID;
+
+    print p_locale_xhtml('register');
+    print '<div class="centeralign">'.NL;
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['register']);
+    $form->addHidden('do', 'register');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], null, 'block', array('size'=>'50')));
+    if (!$conf['autopasswd']) {
+        $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', array('size'=>'50')));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
+    }
+    $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', array('size'=>'50')));
+    $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', array('size'=>'50')));
+    $form->addElement(form_makeButton('submit', '', $lang['register']));
+    $form->endFieldset();
+    html_form('register', $form);
+
+    print '</div>'.NL;
+}
+
+/**
+ * Print the update profile form
+ *
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_updateprofile(){
+    global $lang;
+    global $conf;
+    global $ID;
+    global $INFO;
+    global $auth;
+
+    print p_locale_xhtml('updateprofile');
+
+    if (empty($_POST['fullname'])) $_POST['fullname'] = $INFO['userinfo']['name'];
+    if (empty($_POST['email'])) $_POST['email'] = $INFO['userinfo']['mail'];
+    print '<div class="centeralign">'.NL;
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['profile']);
+    $form->addHidden('do', 'profile');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('fullname', $_SERVER['REMOTE_USER'], $lang['user'], '', 'block', array('size'=>'50', 'disabled'=>'disabled')));
+    $attr = array('size'=>'50');
+    if (!$auth->canDo('modName')) $attr['disabled'] = 'disabled';
+    $form->addElement(form_makeTextField('fullname', $_POST['fullname'], $lang['fullname'], '', 'block', $attr));
+    $attr = array('size'=>'50');
+    if (!$auth->canDo('modMail')) $attr['disabled'] = 'disabled';
+    $form->addElement(form_makeTextField('email', $_POST['email'], $lang['email'], '', 'block', $attr));
+    $form->addElement(form_makeTag('br'));
+    if ($auth->canDo('modPass')) {
+        $form->addElement(form_makePasswordField('newpass', $lang['newpass'], '', 'block', array('size'=>'50')));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', array('size'=>'50')));
+    }
+    if ($conf['profileconfirm']) {
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50')));
+    }
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save']));
+    $form->addElement(form_makeButton('reset', '', $lang['btn_reset']));
+    $form->endFieldset();
+    html_form('updateprofile', $form);
+    print '</div>'.NL;
+}
+
+/**
+ * This displays the edit form (lots of logic included)
+ *
+ * @fixme    this is a huge lump of code and should be modularized
+ * @triggers HTML_PAGE_FROMTEMPLATE
+ * @triggers HTML_EDITFORM_INJECTION
+ * @author   Andreas Gohr <andi@splitbrain.org>
+ */
+function html_edit($text=null,$include='edit'){ //FIXME: include needed?
+    global $ID;
+    global $REV;
+    global $DATE;
+    global $RANGE;
+    global $PRE;
+    global $SUF;
+    global $INFO;
+    global $SUM;
+    global $lang;
+    global $conf;
+    global $license;
+
+    //set summary default
+    if(!$SUM){
+        if($REV){
+            $SUM = $lang['restored'];
+        }elseif(!$INFO['exists']){
+            $SUM = $lang['created'];
+        }
+    }
+
+    //no text? Load it!
+    if(!isset($text)){
+        $pr = false; //no preview mode
+        if($INFO['exists']){
+            if($RANGE){
+                list($PRE,$text,$SUF) = rawWikiSlices($RANGE,$ID,$REV);
+            }else{
+                $text = rawWiki($ID,$REV);
+            }
+            $check = md5($text);
+            $mod = false;
+        }else{
+            //try to load a pagetemplate
+            $data = array($ID);
+            $text = trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
+            $check = md5('');
+            $mod = $text!=='';
+        }
+    }else{
+        $pr = true; //preview mode
+        if (isset($_REQUEST['changecheck'])) {
+            $check = $_REQUEST['changecheck'];
+            $mod = md5($text)!==$check;
+        } else {
+            // Why? Assume default text is unmodified.
+            $check = md5($text);
+            $mod = false;
+        }
+    }
+
+    $wr = $INFO['writable'] && !$INFO['locked'];
+    if($wr){
+        if ($REV) print p_locale_xhtml('editrev');
+        print p_locale_xhtml($include);
+    }else{
+        // check pseudo action 'source'
+        if(!actionOK('source')){
+            msg('Command disabled: source',-1);
+            return;
+        }
+        print p_locale_xhtml('read');
+    }
+    if(!$DATE) $DATE = $INFO['lastmod'];
+    ?>
+        <div style="width:99%;">
+
+        <div class="toolbar">
+        <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
+        <div id="tool__bar"><?php if($wr){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
+            target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
+
+            <?php if($wr){?>
+                <script type="text/javascript" charset="utf-8"><!--//--><![CDATA[//><!--
+                    <?php /* sets changed to true when previewed */?>
+                    textChanged = <?php ($mod) ? print 'true' : print 'false' ?>;
+                //--><!]]></script>
+            <?php } ?>
+        </div>
+        <?php
+        $form = new Doku_Form(array('id' => 'dw__editform'));
+        $form->addHidden('id', $ID);
+        $form->addHidden('rev', $REV);
+        $form->addHidden('date', $DATE);
+        $form->addHidden('prefix', $PRE);
+        $form->addHidden('suffix', $SUF);
+        $form->addHidden('changecheck', $check);
+        $attr = array('tabindex'=>'1');
+        if (!$wr) $attr['readonly'] = 'readonly';
+        $form->addElement(form_makeWikiText($text, $attr));
+        $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
+        $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
+        $form->addElement(form_makeCloseTag('div'));
+        if ($wr) {
+            $form->addElement(form_makeOpenTag('div', array('class'=>'editButtons')));
+            $form->addElement(form_makeButton('submit', 'save', $lang['btn_save'], array('id'=>'edbtn__save', 'accesskey'=>'s', 'tabindex'=>'4')));
+            $form->addElement(form_makeButton('submit', 'preview', $lang['btn_preview'], array('id'=>'edbtn__preview', 'accesskey'=>'p', 'tabindex'=>'5')));
+            $form->addElement(form_makeButton('submit', 'draftdel', $lang['btn_cancel'], array('tabindex'=>'6')));
+            $form->addElement(form_makeCloseTag('div'));
+            $form->addElement(form_makeOpenTag('div', array('class'=>'summary')));
+            $form->addElement(form_makeTextField('summary', $SUM, $lang['summary'], 'edit__summary', 'nowrap', array('size'=>'50', 'tabindex'=>'2')));
+            $elem = html_minoredit();
+            if ($elem) $form->addElement($elem);
+            $form->addElement(form_makeCloseTag('div'));
+        }
+        $form->addElement(form_makeCloseTag('div'));
+        if($wr && $conf['license']){
+            $form->addElement(form_makeOpenTag('div', array('class'=>'license')));
+            $out  = $lang['licenseok'];
+            $out .= '<a href="'.$license[$conf['license']]['url'].'" rel="license" class="urlextern"';
+            if(isset($conf['target']['external'])) $out .= ' target="'.$conf['target']['external'].'"';
+            $out .= '> '.$license[$conf['license']]['name'].'</a>';
+            $form->addElement($out);
+            $form->addElement(form_makeCloseTag('div'));
+        }
+        html_form('edit', $form);
+        print '</div>'.NL;
+}
+
+/**
+ * Adds a checkbox for minor edits for logged in users
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_minoredit(){
+    global $conf;
+    global $lang;
+    // minor edits are for logged in users only
+    if(!$conf['useacl'] || !$_SERVER['REMOTE_USER']){
+        return false;
+    }
+
+    $p = array();
+    $p['tabindex'] = 3;
+    if(!empty($_REQUEST['minor'])) $p['checked']='checked';
+    return form_makeCheckboxField('minor', '1', $lang['minoredit'], 'minoredit', 'nowrap', $p);
+}
+
+/**
+ * prints some debug info
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_debug(){
+    global $conf;
+    global $lang;
+    global $auth;
+    global $INFO;
+
+    //remove sensitive data
+    $cnf = $conf;
+    debug_guard($cnf);
+    $nfo = $INFO;
+    debug_guard($nfo);
+    $ses = $_SESSION;
+    debug_guard($ses);
+
+    print '<html><body>';
+
+    print '<p>When reporting bugs please send all the following ';
+    print 'output as a mail to andi@splitbrain.org ';
+    print 'The best way to do this is to save this page in your browser</p>';
+
+    print '<b>$INFO:</b><pre>';
+    print_r($nfo);
+    print '</pre>';
+
+    print '<b>$_SERVER:</b><pre>';
+    print_r($_SERVER);
+    print '</pre>';
+
+    print '<b>$conf:</b><pre>';
+    print_r($cnf);
+    print '</pre>';
+
+    print '<b>DOKU_BASE:</b><pre>';
+    print DOKU_BASE;
+    print '</pre>';
+
+    print '<b>abs DOKU_BASE:</b><pre>';
+    print DOKU_URL;
+    print '</pre>';
+
+    print '<b>rel DOKU_BASE:</b><pre>';
+    print dirname($_SERVER['PHP_SELF']).'/';
+    print '</pre>';
+
+    print '<b>PHP Version:</b><pre>';
+    print phpversion();
+    print '</pre>';
+
+    print '<b>locale:</b><pre>';
+    print setlocale(LC_ALL,0);
+    print '</pre>';
+
+    print '<b>encoding:</b><pre>';
+    print $lang['encoding'];
+    print '</pre>';
+
+    if($auth){
+        print '<b>Auth backend capabilities:</b><pre>';
+        print_r($auth->cando);
+        print '</pre>';
+    }
+
+    print '<b>$_SESSION:</b><pre>';
+    print_r($ses);
+    print '</pre>';
+
+    print '<b>Environment:</b><pre>';
+    print_r($_ENV);
+    print '</pre>';
+
+    print '<b>PHP settings:</b><pre>';
+    $inis = ini_get_all();
+    print_r($inis);
+    print '</pre>';
+
+    print '</body></html>';
+}
+
+/**
+ * List available Administration Tasks
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Håkan Sandell <hakan.sandell@home.se>
+ */
+function html_admin(){
+    global $ID;
+    global $INFO;
+    global $lang;
+    global $conf;
+    global $auth;
+
+    // build menu of admin functions from the plugins that handle them
+    $pluginlist = plugin_list('admin');
+    $menu = array();
+    foreach ($pluginlist as $p) {
+        if($obj =& plugin_load('admin',$p) === null) continue;
+
+        // check permissions
+        if($obj->forAdminOnly() && !$INFO['isadmin']) continue;
+
+        $menu[$p] = array('plugin' => $p,
+                'prompt' => $obj->getMenuText($conf['lang']),
+                'sort' => $obj->getMenuSort()
+                );
+    }
+
+    print p_locale_xhtml('admin');
+
+    // Admin Tasks
+    if($INFO['isadmin']){
+        ptln('<ul class="admin_tasks">');
+
+        if($menu['usermanager'] && $auth && $auth->canDo('getUsers')){
+            ptln('  <li class="admin_usermanager"><div class="li">'.
+                    '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'usermanager')).'">'.
+                    $menu['usermanager']['prompt'].'</a></div></li>');
+        }
+        unset($menu['usermanager']);
+
+        if($menu['acl']){
+            ptln('  <li class="admin_acl"><div class="li">'.
+                    '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'acl')).'">'.
+                    $menu['acl']['prompt'].'</a></div></li>');
+        }
+        unset($menu['acl']);
+
+        if($menu['plugin']){
+            ptln('  <li class="admin_plugin"><div class="li">'.
+                    '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'plugin')).'">'.
+                    $menu['plugin']['prompt'].'</a></div></li>');
+        }
+        unset($menu['plugin']);
+
+        if($menu['config']){
+            ptln('  <li class="admin_config"><div class="li">'.
+                    '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'config')).'">'.
+                    $menu['config']['prompt'].'</a></div></li>');
+        }
+        unset($menu['config']);
+    }
+    ptln('</ul>');
+
+    // Manager Tasks
+    ptln('<ul class="admin_tasks">');
+
+    if($menu['revert']){
+        ptln('  <li class="admin_revert"><div class="li">'.
+                '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'revert')).'">'.
+                $menu['revert']['prompt'].'</a></div></li>');
+    }
+    unset($menu['revert']);
+
+    if($menu['popularity']){
+        ptln('  <li class="admin_popularity"><div class="li">'.
+                '<a href="'.wl($ID, array('do' => 'admin','dokupage' => 'popularity')).'">'.
+                $menu['popularity']['prompt'].'</a></div></li>');
+    }
+    unset($menu['popularity']);
+
+    ptln('</ul>');
+
+    // print the rest as sorted list
+    if(count($menu)){
+        usort($menu, 'p_sort_modes');
+        // output the menu
+        ptln('<div class="clearer"></div>');
+        print p_locale_xhtml('adminplugins');
+        ptln('<ul>');
+        foreach ($menu as $item) {
+            if (!$item['prompt']) continue;
+            ptln('  <li><div class="li"><a href="'.wl($ID, 'do=admin&amp;dokupage='.$item['plugin']).'">'.$item['prompt'].'</a></div></li>');
+        }
+        ptln('</ul>');
+    }
+}
+
+/**
+ * Form to request a new password for an existing account
+ *
+ * @author Benoit Chesneau <benoit@bchesneau.info>
+ */
+function html_resendpwd() {
+    global $lang;
+    global $conf;
+    global $ID;
+
+    print p_locale_xhtml('resendpwd');
+    print '<div class="centeralign">'.NL;
+    $form = new Doku_Form(array('id' => 'dw__resendpwd'));
+    $form->startFieldset($lang['resendpwd']);
+    $form->addHidden('do', 'resendpwd');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeTextField('login', $_POST['login'], $lang['user'], '', 'block'));
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeTag('br'));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_resendpwd']));
+    $form->endFieldset();
+    html_form('resendpwd', $form);
+    print '</div>'.NL;
+}
+
+/**
+ * Return the TOC rendered to XHTML
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function html_TOC($toc){
+    if(!count($toc)) return '';
+    global $lang;
+    $out  = '<!-- TOC START -->'.DOKU_LF;
+    $out .= '<div class="toc">'.DOKU_LF;
+    $out .= '<div class="tocheader toctoggle" id="toc__header">';
+    $out .= $lang['toc'];
+    $out .= '</div>'.DOKU_LF;
+    $out .= '<div id="toc__inside">'.DOKU_LF;
+    $out .= html_buildlist($toc,'toc','html_list_toc');
+    $out .= '</div>'.DOKU_LF.'</div>'.DOKU_LF;
+    $out .= '<!-- TOC END -->'.DOKU_LF;
+    return $out;
+}
+
+/**
+ * Callback for html_buildlist
+ */
+function html_list_toc($item){
+    if(isset($item['hid'])){
+        $link = '#'.$item['hid'];
+    }else{
+        $link = $item['link'];
+    }
+
+    return '<span class="li"><a href="'.$link.'" class="toc">'.
+        hsc($item['title']).'</a></span>';
+}
+
+/**
+ * Helper function to build TOC items
+ *
+ * Returns an array ready to be added to a TOC array
+ *
+ * @param string $link  - where to link (if $hash set to '#' it's a local anchor)
+ * @param string $text  - what to display in the TOC
+ * @param int    $level - nesting level
+ * @param string $hash  - is prepended to the given $link, set blank if you want full links
+ */
+function html_mktocitem($link, $text, $level, $hash='#'){
+    global $conf;
+    return  array( 'link'  => $hash.$link,
+            'title' => $text,
+            'type'  => 'ul',
+            'level' => $level);
+}
+
+/**
+ * Output a Doku_Form object.
+ * Triggers an event with the form name: HTML_{$name}FORM_OUTPUT
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function html_form($name, &$form) {
+    // Safety check in case the caller forgets.
+    $form->endFieldset();
+    trigger_event('HTML_'.strtoupper($name).'FORM_OUTPUT', $form, 'html_form_output', false);
+}
+
+/**
+ * Form print function.
+ * Just calls printForm() on the data object.
+ */
+function html_form_output($data) {
+    $data->printForm();
+}
+
+/**
+ * Embed a flash object in HTML
+ *
+ * This will create the needed HTML to embed a flash movie in a cross browser
+ * compatble way using valid XHTML
+ *
+ * The parameters $params, $flashvars and $atts need to be associative arrays.
+ * No escaping needs to be done for them. The alternative content *has* to be
+ * escaped because it is used as is. If no alternative content is given
+ * $lang['noflash'] is used.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @link   http://latrine.dgx.cz/how-to-correctly-insert-a-flash-into-xhtml
+ *
+ * @param string $swf      - the SWF movie to embed
+ * @param int $width       - width of the flash movie in pixels
+ * @param int $height      - height of the flash movie in pixels
+ * @param array $params    - additional parameters (<param>)
+ * @param array $flashvars - parameters to be passed in the flashvar parameter
+ * @param array $atts      - additional attributes for the <object> tag
+ * @param string $alt      - alternative content (is NOT automatically escaped!)
+ * @returns string         - the XHTML markup
+ */
+function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts=null,$alt=''){
+    global $lang;
+
+    $out = '';
+
+    // prepare the object attributes
+    if(is_null($atts)) $atts = array();
+    $atts['width']  = (int) $width;
+    $atts['height'] = (int) $height;
+    if(!$atts['width'])  $atts['width']  = 425;
+    if(!$atts['height']) $atts['height'] = 350;
+
+    // add object attributes for standard compliant browsers
+    $std = $atts;
+    $std['type'] = 'application/x-shockwave-flash';
+    $std['data'] = $swf;
+
+    // add object attributes for IE
+    $ie  = $atts;
+    $ie['classid'] = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+
+    // open object (with conditional comments)
+    $out .= '<!--[if !IE]> -->'.NL;
+    $out .= '<object '.buildAttributes($std).'>'.NL;
+    $out .= '<!-- <![endif]-->'.NL;
+    $out .= '<!--[if IE]>'.NL;
+    $out .= '<object '.buildAttributes($ie).'>'.NL;
+    $out .= '    <param name="movie" value="'.hsc($swf).'" />'.NL;
+    $out .= '<!--><!-- -->'.NL;
+
+    // print params
+    if(is_array($params)) foreach($params as $key => $val){
+        $out .= '  <param name="'.hsc($key).'" value="'.hsc($val).'" />'.NL;
+    }
+
+    // add flashvars
+    if(is_array($flashvars)){
+        $out .= '  <param name="FlashVars" value="'.buildURLparams($flashvars).'" />'.NL;
+    }
+
+    // alternative content
+    if($alt){
+        $out .= $alt.NL;
+    }else{
+        $out .= $lang['noflash'].NL;
+    }
+
+    // finish
+    $out .= '</object>'.NL;
+    $out .= '<!-- <![endif]-->'.NL;
+
+    return $out;
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/httputils.php b/mod/dokuwiki/vendors/dokuwiki/inc/httputils.php
new file mode 100644
index 000000000..324a730b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/httputils.php
@@ -0,0 +1,199 @@
+<?php
+/**
+ * Utilities for handling HTTP related tasks
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+define('HTTP_MULTIPART_BOUNDARY','D0KuW1K1B0uNDARY');
+define('HTTP_HEADER_LF',"\r\n");
+define('HTTP_CHUNK_SIZE',16*1024);
+
+/**
+ * Checks and sets HTTP headers for conditional HTTP requests
+ *
+ * @author   Simon Willison <swillison@gmail.com>
+ * @link     http://simon.incutio.com/archive/2003/04/23/conditionalGet
+ * @param    timestamp $timestamp lastmodified time of the cache file
+ * @returns  void or exits with previously header() commands executed
+ */
+function http_conditionalRequest($timestamp){
+    // A PHP implementation of conditional get, see
+    //   http://fishbowl.pastiche.org/archives/001132.html
+    $last_modified = substr(gmdate('r', $timestamp), 0, -5).'GMT';
+    $etag = '"'.md5($last_modified).'"';
+    // Send the headers
+    header("Last-Modified: $last_modified");
+    header("ETag: $etag");
+    // See if the client has provided the required headers
+    if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])){
+        $if_modified_since = stripslashes($_SERVER['HTTP_IF_MODIFIED_SINCE']);
+    }else{
+        $if_modified_since = false;
+    }
+
+    if (isset($_SERVER['HTTP_IF_NONE_MATCH'])){
+        $if_none_match = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+    }else{
+        $if_none_match = false;
+    }
+
+    if (!$if_modified_since && !$if_none_match){
+        return;
+    }
+
+    // At least one of the headers is there - check them
+    if ($if_none_match && $if_none_match != $etag) {
+        return; // etag is there but doesn't match
+    }
+
+    if ($if_modified_since && $if_modified_since != $last_modified) {
+        return; // if-modified-since is there but doesn't match
+    }
+
+    // Nothing has changed since their last request - serve a 304 and exit
+    header('HTTP/1.0 304 Not Modified');
+
+    // don't produce output, even if compression is on
+    @ob_end_clean();
+    exit;
+}
+
+/**
+ * Let the webserver send the given file vi x-sendfile method
+ *
+ * @author Chris Smith <chris.eureka@jalakai.co.uk>
+ * @returns  void or exits with previously header() commands executed
+ */
+function http_sendfile($file) {
+    global $conf;
+
+    //use x-sendfile header to pass the delivery to compatible webservers
+    if($conf['xsendfile'] == 1){
+        header("X-LIGHTTPD-send-file: $file");
+        ob_end_clean();
+        exit;
+    }elseif($conf['xsendfile'] == 2){
+        header("X-Sendfile: $file");
+        ob_end_clean();
+        exit;
+    }elseif($conf['xsendfile'] == 3){
+        header("X-Accel-Redirect: $file");
+        ob_end_clean();
+        exit;
+    }
+
+    return false;
+}
+
+/**
+ * Send file contents supporting rangeRequests
+ *
+ * This function exits the running script
+ *
+ * @param ressource $fh - file handle for an already open file
+ * @param int $size     - size of the whole file
+ * @param int $mime     - MIME type of the file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function http_rangeRequest($fh,$size,$mime){
+    $ranges  = array();
+    $isrange = false;
+
+    header('Accept-Ranges: bytes');
+
+    if(!isset($_SERVER['HTTP_RANGE'])){
+        // no range requested - send the whole file
+        $ranges[] = array(0,$size,$size);
+    }else{
+        $t = explode('=', $_SERVER['HTTP_RANGE']);
+        if (!$t[0]=='bytes') {
+            // we only understand byte ranges - send the whole file
+            $ranges[] = array(0,$size,$size);
+        }else{
+            $isrange = true;
+            // handle multiple ranges
+            $r = explode(',',$t[1]);
+            foreach($r as $x){
+                $p = explode('-', $x);
+                $start = (int)$p[0];
+                $end   = (int)$p[1];
+                if (!$end) $end = $size - 1;
+                if ($start > $end || $start > $size || $end > $size){
+                    header('HTTP/1.1 416 Requested Range Not Satisfiable');
+                    print 'Bad Range Request!';
+                    exit;
+                }
+                $len = $end - $start + 1;
+                $ranges[] = array($start,$end,$len);
+            }
+        }
+    }
+    $parts = count($ranges);
+
+    // now send the type and length headers
+    if(!$isrange){
+        header("Content-Type: $mime",true);
+    }else{
+        header('HTTP/1.1 206 Partial Content');
+        if($parts == 1){
+            header("Content-Type: $mime",true);
+        }else{
+            header('Content-Type: multipart/byteranges; boundary='.HTTP_MULTIPART_BOUNDARY,true);
+        }
+    }
+
+    // send all ranges
+    for($i=0; $i<$parts; $i++){
+        list($start,$end,$len) = $ranges[$i];
+
+        // multipart or normal headers
+        if($parts > 1){
+            echo HTTP_HEADER_LF.'--'.HTTP_MULTIPART_BOUNDARY.HTTP_HEADER_LF;
+            echo "Content-Type: $mime".HTTP_HEADER_LF;
+            echo "Content-Range: bytes $start-$end/$size".HTTP_HEADER_LF;
+            echo HTTP_HEADER_LF;
+        }else{
+            header("Content-Length: $len");
+            if($isrange){
+                header("Content-Range: bytes $start-$end/$size");
+            }
+        }
+
+        // send file content
+        fseek($fh,$start); //seek to start of range
+        $chunk = ($len > HTTP_CHUNK_SIZE) ? HTTP_CHUNK_SIZE : $len;
+        while (!feof($fh) && $chunk > 0) {
+            @set_time_limit(30); // large files can take a lot of time
+            print fread($fh, $chunk);
+            flush();
+            $len -= $chunk;
+            $chunk = ($len > HTTP_CHUNK_SIZE) ? HTTP_CHUNK_SIZE : $len;
+        }
+    }
+    if($parts > 1){
+        echo HTTP_HEADER_LF.'--'.HTTP_MULTIPART_BOUNDARY.'--'.HTTP_HEADER_LF;
+    }
+
+    // everything should be done here, exit
+    exit;
+}
+
+/**
+ * Check for a gzipped version and create if necessary
+ *
+ * return true if there exists a gzip version of the uncompressed file
+ * (samepath/samefilename.sameext.gz) created after the uncompressed file
+ *
+ * @author Chris Smith <chris.eureka@jalakai.co.uk>
+ */
+function http_gzip_valid($uncompressed_file) {
+    $gzip = $uncompressed_file.'.gz';
+    if (filemtime($gzip) < filemtime($uncompressed_file)) {    // filemtime returns false (0) if file doesn't exist
+        return copy($uncompressed_file, 'compress.zlib://'.$gzip);
+    }
+
+    return true;
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/indexer.php b/mod/dokuwiki/vendors/dokuwiki/inc/indexer.php
new file mode 100644
index 000000000..14af579bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/indexer.php
@@ -0,0 +1,705 @@
+<?php
+/**
+ * Common DokuWiki functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+
+// set the minimum token length to use in the index (note, this doesn't apply to numeric tokens)
+if (!defined('IDX_MINWORDLENGTH')) define('IDX_MINWORDLENGTH',2);
+
+// Asian characters are handled as words. The following regexp defines the
+// Unicode-Ranges for Asian characters
+// Ranges taken from http://en.wikipedia.org/wiki/Unicode_block
+// I'm no language expert. If you think some ranges are wrongly chosen or
+// a range is missing, please contact me
+define('IDX_ASIAN1','[\x{0E00}-\x{0E7F}]'); // Thai
+define('IDX_ASIAN2','['.
+                   '\x{2E80}-\x{3040}'.  // CJK -> Hangul
+                   '\x{309D}-\x{30A0}'.
+                   '\x{30FD}-\x{31EF}\x{3200}-\x{D7AF}'.
+                   '\x{F900}-\x{FAFF}'.  // CJK Compatibility Ideographs
+                   '\x{FE30}-\x{FE4F}'.  // CJK Compatibility Forms
+                   ']');
+define('IDX_ASIAN3','['.                // Hiragana/Katakana (can be two characters)
+                   '\x{3042}\x{3044}\x{3046}\x{3048}'.
+                   '\x{304A}-\x{3062}\x{3064}-\x{3082}'.
+                   '\x{3084}\x{3086}\x{3088}-\x{308D}'.
+                   '\x{308F}-\x{3094}'.
+                   '\x{30A2}\x{30A4}\x{30A6}\x{30A8}'.
+                   '\x{30AA}-\x{30C2}\x{30C4}-\x{30E2}'.
+                   '\x{30E4}\x{30E6}\x{30E8}-\x{30ED}'.
+                   '\x{30EF}-\x{30F4}\x{30F7}-\x{30FA}'.
+                   ']['.
+                   '\x{3041}\x{3043}\x{3045}\x{3047}\x{3049}'.
+                   '\x{3063}\x{3083}\x{3085}\x{3087}\x{308E}\x{3095}-\x{309C}'.
+                   '\x{30A1}\x{30A3}\x{30A5}\x{30A7}\x{30A9}'.
+                   '\x{30C3}\x{30E3}\x{30E5}\x{30E7}\x{30EE}\x{30F5}\x{30F6}\x{30FB}\x{30FC}'.
+                   '\x{31F0}-\x{31FF}'.
+                   ']?');
+define('IDX_ASIAN', '(?:'.IDX_ASIAN1.'|'.IDX_ASIAN2.'|'.IDX_ASIAN3.')');
+
+/**
+ * Measure the length of a string.
+ * Differs from strlen in handling of asian characters.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function wordlen($w){
+    $l = strlen($w);
+    // If left alone, all chinese "words" will get put into w3.idx
+    // So the "length" of a "word" is faked
+    if(preg_match('/'.IDX_ASIAN2.'/u',$w))
+        $l += ord($w) - 0xE1;  // Lead bytes from 0xE2-0xEF
+    return $l;
+}
+
+/**
+ * Write a list of strings to an index file.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_saveIndex($pre, $wlen, &$idx){
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$pre.$wlen;
+    $fh = @fopen($fn.'.tmp','w');
+    if(!$fh) return false;
+    foreach ($idx as $line) {
+        fwrite($fh,$line);
+    }
+    fclose($fh);
+    if(isset($conf['fperm'])) chmod($fn.'.tmp', $conf['fperm']);
+    io_rename($fn.'.tmp', $fn.'.idx');
+    return true;
+}
+
+/**
+ * Append a given line to an index file.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_appendIndex($pre, $wlen, $line){
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$pre.$wlen;
+    $fh = @fopen($fn.'.idx','a');
+    if(!$fh) return false;
+    fwrite($fh,$line);
+    fclose($fh);
+    return true;
+}
+
+/**
+ * Read the list of words in an index (if it exists).
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_getIndex($pre, $wlen){
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$pre.$wlen.'.idx';
+    if(!@file_exists($fn)) return array();
+    return file($fn);
+}
+
+/**
+ * Create an empty index file if it doesn't exist yet.
+ *
+ * FIXME: This function isn't currently used. It will probably be removed soon.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_touchIndex($pre, $wlen){
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$pre.$wlen.'.idx';
+    if(!@file_exists($fn)){
+        touch($fn);
+        if($conf['fperm']) chmod($fn, $conf['fperm']);
+    }
+}
+
+/**
+ * Read a line ending with \n.
+ * Returns false on EOF.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function _freadline($fh) {
+    if (feof($fh)) return false;
+    $ln = '';
+    while (($buf = fgets($fh,4096)) !== false) {
+        $ln .= $buf;
+        if (substr($buf,-1) == "\n") break;
+    }
+    if ($ln === '') return false;
+    if (substr($ln,-1) != "\n") $ln .= "\n";
+    return $ln;
+}
+
+/**
+ * Write a line to an index file.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_saveIndexLine($pre, $wlen, $idx, $line){
+    global $conf;
+    if(substr($line,-1) != "\n") $line .= "\n";
+    $fn = $conf['indexdir'].'/'.$pre.$wlen;
+    $fh = @fopen($fn.'.tmp','w');
+    if(!$fh) return false;
+    $ih = @fopen($fn.'.idx','r');
+    if ($ih) {
+        $ln = -1;
+        while (($curline = _freadline($ih)) !== false) {
+            if (++$ln == $idx) {
+                fwrite($fh, $line);
+            } else {
+                fwrite($fh, $curline);
+            }
+        }
+        if ($idx > $ln) {
+            fwrite($fh,$line);
+        }
+        fclose($ih);
+    } else {
+        fwrite($fh,$line);
+    }
+    fclose($fh);
+    if($conf['fperm']) chmod($fn.'.tmp', $conf['fperm']);
+    io_rename($fn.'.tmp', $fn.'.idx');
+    return true;
+}
+
+/**
+ * Read a single line from an index (if it exists).
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_getIndexLine($pre, $wlen, $idx){
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$pre.$wlen.'.idx';
+    if(!@file_exists($fn)) return '';
+    $fh = @fopen($fn,'r');
+    if(!$fh) return '';
+    $ln = -1;
+    while (($line = _freadline($fh)) !== false) {
+        if (++$ln == $idx) break;
+    }
+    fclose($fh);
+    return "$line";
+}
+
+/**
+ * Split a page into words
+ *
+ * Returns an array of word counts, false if an error occurred.
+ * Array is keyed on the word length, then the word index.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ */
+function idx_getPageWords($page){
+    global $conf;
+    $swfile   = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+    if(@file_exists($swfile)){
+        $stopwords = file($swfile);
+    }else{
+        $stopwords = array();
+    }
+
+    $body = '';
+    $data = array($page, $body);
+    $evt = new Doku_Event('INDEXER_PAGE_ADD', $data);
+    if ($evt->advise_before()) $data[1] .= rawWiki($page);
+    $evt->advise_after();
+    unset($evt);
+
+    list($page,$body) = $data;
+
+    $body   = strtr($body, "\r\n\t", '   ');
+    $tokens = explode(' ', $body);
+    $tokens = array_count_values($tokens);   // count the frequency of each token
+
+    // ensure the deaccented or romanised page names of internal links are added to the token array
+    // (this is necessary for the backlink function -- there maybe a better way!)
+    if ($conf['deaccent']) {
+        $links = p_get_metadata($page,'relation references');
+
+        if (!empty($links)) {
+            $tmp = join(' ',array_keys($links));                // make a single string
+            $tmp = strtr($tmp, ':', ' ');                       // replace namespace separator with a space
+            $link_tokens = array_unique(explode(' ', $tmp));    // break into tokens
+
+            foreach ($link_tokens as $link_token) {
+                if (isset($tokens[$link_token])) continue;
+                $tokens[$link_token] = 1;
+            }
+        }
+    }
+
+    $words = array();
+    foreach ($tokens as $word => $count) {
+        $arr = idx_tokenizer($word,$stopwords);
+        $arr = array_count_values($arr);
+        foreach ($arr as $w => $c) {
+            $l = wordlen($w);
+            if(isset($words[$l])){
+                $words[$l][$w] = $c * $count + (isset($words[$l][$w]) ? $words[$l][$w] : 0);
+            }else{
+                $words[$l] = array($w => $c * $count);
+            }
+        }
+    }
+
+    // arrive here with $words = array(wordlen => array(word => frequency))
+
+    $index = array(); //resulting index
+    foreach (array_keys($words) as $wlen){
+        $word_idx = idx_getIndex('w',$wlen);
+        foreach ($words[$wlen] as $word => $freq) {
+            $wid = array_search("$word\n",$word_idx);
+            if(!is_int($wid)){
+                $wid = count($word_idx);
+                $word_idx[] = "$word\n";
+            }
+            if(!isset($index[$wlen]))
+                $index[$wlen] = array();
+            $index[$wlen][$wid] = $freq;
+        }
+
+        // save back word index
+        if(!idx_saveIndex('w',$wlen,$word_idx)){
+            trigger_error("Failed to write word index", E_USER_ERROR);
+            return false;
+        }
+    }
+
+    return $index;
+}
+
+/**
+ * Adds/updates the search for the given page
+ *
+ * This is the core function of the indexer which does most
+ * of the work. This function needs to be called with proper
+ * locking!
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_addPage($page){
+    global $conf;
+
+    // load known documents
+    $page_idx = idx_getIndex('page','');
+
+    // get page id (this is the linenumber in page.idx)
+    $pid = array_search("$page\n",$page_idx);
+    if(!is_int($pid)){
+        $pid = count($page_idx);
+        // page was new - write back
+        if (!idx_appendIndex('page','',"$page\n")){
+            trigger_error("Failed to write page index", E_USER_ERROR);
+            return false;
+        }
+    }
+    unset($page_idx); // free memory
+
+    $pagewords = array();
+    // get word usage in page
+    $words = idx_getPageWords($page);
+    if($words === false) return false;
+
+    if(!empty($words)) {
+        foreach(array_keys($words) as $wlen){
+            $index = idx_getIndex('i',$wlen);
+            foreach($words[$wlen] as $wid => $freq){
+                if($wid<count($index)){
+                    $index[$wid] = idx_updateIndexLine($index[$wid],$pid,$freq);
+                }else{
+                    // New words **should** have been added in increasing order
+                    // starting with the first unassigned index.
+                    // If someone can show how this isn't true, then I'll need to sort
+                    // or do something special.
+                    $index[$wid] = idx_updateIndexLine('',$pid,$freq);
+                }
+                $pagewords[] = "$wlen*$wid";
+            }
+            // save back word index
+            if(!idx_saveIndex('i',$wlen,$index)){
+                trigger_error("Failed to write index", E_USER_ERROR);
+                return false;
+            }
+        }
+    }
+
+    // Remove obsolete index entries
+    $pageword_idx = trim(idx_getIndexLine('pageword','',$pid));
+    if ($pageword_idx !== '') {
+        $oldwords = explode(':',$pageword_idx);
+        $delwords = array_diff($oldwords, $pagewords);
+        $upwords = array();
+        foreach ($delwords as $word) {
+            if($word=='') continue;
+            list($wlen,$wid) = explode('*',$word);
+            $wid = (int)$wid;
+            $upwords[$wlen][] = $wid;
+        }
+        foreach ($upwords as $wlen => $widx) {
+            $index = idx_getIndex('i',$wlen);
+            foreach ($widx as $wid) {
+                $index[$wid] = idx_updateIndexLine($index[$wid],$pid,0);
+            }
+            idx_saveIndex('i',$wlen,$index);
+        }
+    }
+    // Save the reverse index
+    $pageword_idx = join(':',$pagewords)."\n";
+    if(!idx_saveIndexLine('pageword','',$pid,$pageword_idx)){
+        trigger_error("Failed to write word index", E_USER_ERROR);
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * Write a new index line to the filehandle
+ *
+ * This function writes an line for the index file to the
+ * given filehandle. It removes the given document from
+ * the given line and readds it when $count is >0.
+ *
+ * @deprecated - see idx_updateIndexLine
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_writeIndexLine($fh,$line,$pid,$count){
+    fwrite($fh,idx_updateIndexLine($line,$pid,$count));
+}
+
+/**
+ * Modify an index line with new information
+ *
+ * This returns a line of the index. It removes the
+ * given document from the line and readds it if
+ * $count is >0.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_updateIndexLine($line,$pid,$count){
+    $line = trim($line);
+    $updated = array();
+    if($line != ''){
+        $parts = explode(':',$line);
+        // remove doc from given line
+        foreach($parts as $part){
+            if($part == '') continue;
+            list($doc,$cnt) = explode('*',$part);
+            if($doc != $pid){
+                $updated[] = $part;
+            }
+        }
+    }
+
+    // add doc
+    if ($count){
+        $updated[] = "$pid*$count";
+    }
+
+    return join(':',$updated)."\n";
+}
+
+/**
+ * Get the word lengths that have been indexed.
+ *
+ * Reads the index directory and returns an array of lengths
+ * that there are indices for.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_indexLengths(&$filter){
+    global $conf;
+    $dir = @opendir($conf['indexdir']);
+    if($dir===false)
+        return array();
+    $idx = array();
+    if(is_array($filter)){
+        while (($f = readdir($dir)) !== false) {
+            if (substr($f,0,1) == 'i' && substr($f,-4) == '.idx'){
+                $i = substr($f,1,-4);
+                if (is_numeric($i) && isset($filter[(int)$i]))
+                    $idx[] = (int)$i;
+            }
+        }
+    }else{
+        // Exact match first.
+        if(@file_exists($conf['indexdir']."/i$filter.idx"))
+            $idx[] = $filter;
+        while (($f = readdir($dir)) !== false) {
+            if (substr($f,0,1) == 'i' && substr($f,-4) == '.idx'){
+                $i = substr($f,1,-4);
+                if (is_numeric($i) && $i > $filter)
+                    $idx[] = (int)$i;
+            }
+        }
+    }
+    closedir($dir);
+    return $idx;
+}
+
+/**
+ * Find the the index number of each search term.
+ *
+ * This will group together words that appear in the same index.
+ * So it should perform better, because it only opens each index once.
+ * Actually, it's not that great. (in my experience) Probably because of the disk cache.
+ * And the sorted function does more work, making it slightly slower in some cases.
+ *
+ * @param array    $words   The query terms. Words should only contain valid characters,
+ *                          with a '*' at either the beginning or end of the word (or both)
+ * @param arrayref $result  Set to word => array("length*id" ...), use this to merge the
+ *                          index locations with the appropriate query term.
+ * @return array            Set to length => array(id ...)
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_getIndexWordsSorted($words,&$result){
+    // parse and sort tokens
+    $tokens = array();
+    $tokenlength = array();
+    $tokenwild = array();
+    foreach($words as $word){
+        $result[$word] = array();
+        $wild = 0;
+        $xword = $word;
+        $wlen = wordlen($word);
+
+        // check for wildcards
+        if(substr($xword,0,1) == '*'){
+            $xword = substr($xword,1);
+            $wild |= 1;
+            $wlen -= 1;
+        }
+        if(substr($xword,-1,1) == '*'){
+            $xword = substr($xword,0,-1);
+            $wild |= 2;
+            $wlen -= 1;
+        }
+        if ($wlen < IDX_MINWORDLENGTH && $wild == 0 && !is_numeric($xword)) continue;
+        if(!isset($tokens[$xword])){
+            $tokenlength[$wlen][] = $xword;
+        }
+        if($wild){
+            $ptn = preg_quote($xword,'/');
+            if(($wild&1) == 0) $ptn = '^'.$ptn;
+            if(($wild&2) == 0) $ptn = $ptn.'$';
+            $tokens[$xword][] = array($word, '/'.$ptn.'/');
+            if(!isset($tokenwild[$xword])) $tokenwild[$xword] = $wlen;
+        }else
+            $tokens[$xword][] = array($word, null);
+    }
+    asort($tokenwild);
+    // $tokens = array( base word => array( [ query word , grep pattern ] ... ) ... )
+    // $tokenlength = array( base word length => base word ... )
+    // $tokenwild = array( base word => base word length ... )
+
+    $length_filter = empty($tokenwild) ? $tokenlength : min(array_keys($tokenlength));
+    $indexes_known = idx_indexLengths($length_filter);
+    if(!empty($tokenwild)) sort($indexes_known);
+    // get word IDs
+    $wids = array();
+    foreach($indexes_known as $ixlen){
+        $word_idx = idx_getIndex('w',$ixlen);
+        // handle exact search
+        if(isset($tokenlength[$ixlen])){
+            foreach($tokenlength[$ixlen] as $xword){
+                $wid = array_search("$xword\n",$word_idx);
+                if(is_int($wid)){
+                    $wids[$ixlen][] = $wid;
+                    foreach($tokens[$xword] as $w)
+                        $result[$w[0]][] = "$ixlen*$wid";
+                }
+            }
+        }
+        // handle wildcard search
+        foreach($tokenwild as $xword => $wlen){
+            if($wlen >= $ixlen) break;
+            foreach($tokens[$xword] as $w){
+                if(is_null($w[1])) continue;
+                foreach(array_keys(preg_grep($w[1],$word_idx)) as $wid){
+                    $wids[$ixlen][] = $wid;
+                    $result[$w[0]][] = "$ixlen*$wid";
+                }
+            }
+        }
+    }
+    return $wids;
+}
+
+/**
+ * Lookup words in index
+ *
+ * Takes an array of word and will return a list of matching
+ * documents for each one.
+ *
+ * Important: No ACL checking is done here! All results are
+ *            returned, regardless of permissions
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_lookup($words){
+    global $conf;
+
+    $result = array();
+
+    $wids = idx_getIndexWordsSorted($words, $result);
+    if(empty($wids)) return array();
+
+    // load known words and documents
+    $page_idx = idx_getIndex('page','');
+
+    $docs = array();                          // hold docs found
+    foreach(array_keys($wids) as $wlen){
+        $wids[$wlen] = array_unique($wids[$wlen]);
+        $index = idx_getIndex('i',$wlen);
+        foreach($wids[$wlen] as $ixid){
+            if($ixid < count($index))
+                $docs["$wlen*$ixid"] = idx_parseIndexLine($page_idx,$index[$ixid]);
+        }
+    }
+
+    // merge found pages into final result array
+    $final = array();
+    foreach($result as $word => $res){
+        $final[$word] = array();
+        foreach($res as $wid){
+            $hits = &$docs[$wid];
+            foreach ($hits as $hitkey => $hitcnt) {
+                if (!isset($final[$word][$hitkey])) {
+                    $final[$word][$hitkey] = $hitcnt;
+                } else {
+                    $final[$word][$hitkey] += $hitcnt;
+                }
+            }
+        }
+    }
+    return $final;
+}
+
+/**
+ * Returns a list of documents and counts from a index line
+ *
+ * It omits docs with a count of 0 and pages that no longer
+ * exist.
+ *
+ * @param  array  $page_idx The list of known pages
+ * @param  string $line     A line from the main index
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function idx_parseIndexLine(&$page_idx,$line){
+    $result = array();
+
+    $line = trim($line);
+    if($line == '') return $result;
+
+    $parts = explode(':',$line);
+    foreach($parts as $part){
+        if($part == '') continue;
+        list($doc,$cnt) = explode('*',$part);
+        if(!$cnt) continue;
+        $doc = trim($page_idx[$doc]);
+        if(!$doc) continue;
+        // make sure the document still exists
+        if(!page_exists($doc,'',false)) continue;
+
+        $result[$doc] = $cnt;
+    }
+    return $result;
+}
+
+/**
+ * Tokenizes a string into an array of search words
+ *
+ * Uses the same algorithm as idx_getPageWords()
+ *
+ * @param string   $string     the query as given by the user
+ * @param arrayref $stopwords  array of stopwords
+ * @param boolean  $wc         are wildcards allowed?
+ */
+function idx_tokenizer($string,&$stopwords,$wc=false){
+    $words = array();
+    $wc = ($wc) ? '' : $wc = '\*';
+
+    if(preg_match('/[^0-9A-Za-z]/u', $string)){
+        // handle asian chars as single words (may fail on older PHP version)
+        $asia = @preg_replace('/('.IDX_ASIAN.')/u',' \1 ',$string);
+        if(!is_null($asia)) $string = $asia; //recover from regexp failure
+
+        $arr = explode(' ', utf8_stripspecials($string,' ','\._\-:'.$wc));
+        foreach ($arr as $w) {
+            if (!is_numeric($w) && strlen($w) < IDX_MINWORDLENGTH) continue;
+            $w = utf8_strtolower($w);
+            if($stopwords && is_int(array_search("$w\n",$stopwords))) continue;
+            $words[] = $w;
+        }
+    }else{
+        $w = $string;
+        if (!is_numeric($w) && strlen($w) < IDX_MINWORDLENGTH) return $words;
+        $w = strtolower($w);
+        if(is_int(array_search("$w\n",$stopwords))) return $words;
+        $words[] = $w;
+    }
+
+    return $words;
+}
+
+/**
+ * Create a pagewords index from the existing index.
+ *
+ * @author Tom N Harris <tnharris@whoopdedo.org>
+ */
+function idx_upgradePageWords(){
+    global $conf;
+    $page_idx = idx_getIndex('page','');
+    if (empty($page_idx)) return;
+    $pagewords = array();
+    $len = count($page_idx);
+    for ($n=0;$n<$len;$n++){
+        $pagewords[] = array();
+    }
+    unset($page_idx);
+
+    $n=0;
+    foreach (idx_indexLengths($n) as $wlen) {
+        $lines = idx_getIndex('i',$wlen);
+        $len = count($lines);
+        for ($wid=0;$wid<$len;$wid++) {
+            $wkey = "$wlen*$wid";
+            foreach (explode(':',trim($lines[$wid])) as $part) {
+                if($part == '') continue;
+                list($doc,$cnt) = explode('*',$part);
+                $pagewords[(int)$doc][] = $wkey;
+            }
+        }
+    }
+
+    $fn = $conf['indexdir'].'/pageword';
+    $fh = @fopen($fn.'.tmp','w');
+    if (!$fh){
+        trigger_error("Failed to write word index", E_USER_ERROR);
+        return false;
+    }
+    foreach ($pagewords as $line){
+        fwrite($fh, join(':',$line)."\n");
+    }
+    fclose($fh);
+    if($conf['fperm']) chmod($fn.'.tmp', $conf['fperm']);
+    io_rename($fn.'.tmp', $fn.'.idx');
+    return true;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/infoutils.php b/mod/dokuwiki/vendors/dokuwiki/inc/infoutils.php
new file mode 100644
index 000000000..b43dd40be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/infoutils.php
@@ -0,0 +1,385 @@
+<?php
+/**
+ * Information and debugging functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki.org/check/');
+require_once(DOKU_INC.'inc/HTTPClient.php');
+
+/**
+ * Check for new messages from upstream
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function checkUpdateMessages(){
+    global $conf;
+    global $INFO;
+    if(!$conf['updatecheck']) return;
+    if($conf['useacl'] && !$INFO['ismanager']) return;
+
+    $cf = $conf['cachedir'].'/messages.txt';
+    $lm = @filemtime($cf);
+
+    // check if new messages needs to be fetched
+    if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_CONF.'msg')){
+        $num = @file(DOKU_CONF.'msg');
+        $num = is_array($num) ? (int) $num[0] : 0;
+        $http = new DokuHTTPClient();
+        $http->timeout = 8;
+        $data = $http->get(DOKU_MESSAGEURL.$num);
+        io_saveFile($cf,$data);
+    }else{
+        $data = io_readFile($cf);
+    }
+
+    // show messages through the usual message mechanism
+    $msgs = explode("\n%\n",$data);
+    foreach($msgs as $msg){
+        if($msg) msg($msg,2);
+    }
+}
+
+
+/**
+ * Return DokuWiki's version (split up in date and type)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function getVersionData(){
+    $version = array();
+    //import version string
+    if(@file_exists(DOKU_INC.'VERSION')){
+        //official release
+        $version['date'] = trim(io_readfile(DOKU_INC.'VERSION'));
+        $version['type'] = 'Release';
+        return $version;
+    }elseif(is_dir(DOKU_INC.'_darcs')){
+        if(is_file(DOKU_INC.'_darcs/inventory')){
+            $inventory = DOKU_INC.'_darcs/inventory';
+        }elseif(is_file(DOKU_INC.'_darcs/hashed_inventory')){
+            $inventory = DOKU_INC.'_darcs/hashed_inventory';
+        }else{
+            $version['date'] = 'unknown';
+            $version['type'] = 'Darcs';
+            return $version;
+        }
+
+        //darcs checkout - read last 2000 bytes of inventory
+        $sz   = filesize($inventory);
+        $seek = max(0,$sz-2000);
+        $fh   = fopen($inventory,'rb');
+        fseek($fh,$seek);
+        $chunk = fread($fh,2000);
+        fclose($fh);
+
+        preg_match_all('#\*\*(\d{4})(\d{2})(\d{2})\d{6}(?:\]|$)#m', $chunk, $matches,
+                       PREG_SET_ORDER);
+        $version['date'] = implode('-', array_slice(array_pop($matches), 1));
+        $version['type'] = 'Darcs';
+        return $version;
+    }else{
+        $version['date'] = 'unknown';
+        $version['type'] = 'snapshot?';
+        return $version;
+    }
+}
+
+/**
+ * Return DokuWiki's version (as a string)
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function getVersion(){
+    $version = getVersionData();
+    return $version['type'].' '.$version['date'];
+}
+
+/**
+ * Run a few sanity checks
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function check(){
+    global $conf;
+    global $INFO;
+
+    msg('DokuWiki version: '.getVersion(),1);
+
+    if(version_compare(phpversion(),'5.1.2','<')){
+        msg('Your PHP version is too old ('.phpversion().' vs. 5.1.2+ needed)',-1);
+    }else{
+        msg('PHP version '.phpversion(),1);
+    }
+
+    $mem = (int) php_to_byte(ini_get('memory_limit'));
+    if($mem){
+        if($mem < 16777216){
+            msg('PHP is limited to less than 16MB RAM ('.$mem.' bytes). Increase memory_limit in php.ini',-1);
+        }elseif($mem < 20971520){
+            msg('PHP is limited to less than 20MB RAM ('.$mem.' bytes), you might encounter problems with bigger pages. Increase memory_limit in php.ini',-1);
+        }elseif($mem < 33554432){
+            msg('PHP is limited to less than 32MB RAM ('.$mem.' bytes), but that should be enough in most cases. If not, increase memory_limit in php.ini',0);
+        }else{
+            msg('More than 32MB RAM ('.$mem.' bytes) available.',1);
+        }
+    }
+
+    if(is_writable($conf['changelog'])){
+        msg('Changelog is writable',1);
+    }else{
+        if (@file_exists($conf['changelog'])) {
+            msg('Changelog is not writable',-1);
+        }
+    }
+
+    if (isset($conf['changelog_old']) && @file_exists($conf['changelog_old'])) {
+        msg('Old changelog exists', 0);
+    }
+
+    if (@file_exists($conf['changelog'].'_failed')) {
+        msg('Importing old changelog failed', -1);
+    } else if (@file_exists($conf['changelog'].'_importing')) {
+        msg('Importing old changelog now.', 0);
+    } else if (@file_exists($conf['changelog'].'_import_ok')) {
+        msg('Old changelog imported', 1);
+        if (!plugin_isdisabled('importoldchangelog')) {
+            msg('Importoldchangelog plugin not disabled after import', -1);
+        }
+    }
+
+    if(is_writable($conf['datadir'])){
+        msg('Datadir is writable',1);
+    }else{
+        msg('Datadir is not writable',-1);
+    }
+
+    if(is_writable($conf['olddir'])){
+        msg('Attic is writable',1);
+    }else{
+        msg('Attic is not writable',-1);
+    }
+
+    if(is_writable($conf['mediadir'])){
+        msg('Mediadir is writable',1);
+    }else{
+        msg('Mediadir is not writable',-1);
+    }
+
+    if(is_writable($conf['cachedir'])){
+        msg('Cachedir is writable',1);
+    }else{
+        msg('Cachedir is not writable',-1);
+    }
+
+    if(is_writable($conf['lockdir'])){
+        msg('Lockdir is writable',1);
+    }else{
+        msg('Lockdir is not writable',-1);
+    }
+
+    if($conf['authtype'] == 'plain'){
+        if(is_writable(DOKU_CONF.'users.auth.php')){
+            msg('conf/users.auth.php is writable',1);
+        }else{
+            msg('conf/users.auth.php is not writable',0);
+        }
+    }
+
+    if(function_exists('mb_strpos')){
+        if(defined('UTF8_NOMBSTRING')){
+            msg('mb_string extension is available but will not be used',0);
+        }else{
+            msg('mb_string extension is available and will be used',1);
+            if(ini_get('mbstring.func_overload') != 0){
+                msg('mb_string function overloading is enabled, this will cause problems and should be disabled',-1);
+            }
+        }
+    }else{
+        msg('mb_string extension not available - PHP only replacements will be used',0);
+    }
+
+    if($conf['allowdebug']){
+        msg('Debugging support is enabled. If you don\'t need it you should set $conf[\'allowdebug\'] = 0',-1);
+    }else{
+        msg('Debugging support is disabled',1);
+    }
+
+    if($INFO['userinfo']['name']){
+        msg('You are currently logged in as '.$_SERVER['REMOTE_USER'].' ('.$INFO['userinfo']['name'].')',0);
+        msg('You are part of the groups '.join($INFO['userinfo']['grps'],', '),0);
+    }else{
+        msg('You are currently not logged in',0);
+    }
+
+    msg('Your current permission for this page is '.$INFO['perm'],0);
+
+    if(is_writable($INFO['filepath'])){
+        msg('The current page is writable by the webserver',0);
+    }else{
+        msg('The current page is not writable by the webserver',0);
+    }
+
+    if($INFO['writable']){
+        msg('The current page is writable by you',0);
+    }else{
+        msg('The current page is not writable by you',0);
+    }
+
+    require_once(DOKU_INC.'inc/HTTPClient.php');
+    $check = wl('','',true).'data/_dummy';
+    $http = new DokuHTTPClient();
+    $http->timeout = 6;
+    $res = $http->get($check);
+    if(strpos($res,'data directory') !== false){
+        msg('It seems like the data directory is accessible from the web.
+                Make sure this directory is properly protected
+                (See <a href="http://www.dokuwiki.org/security">security</a>)',-1);
+    }elseif($http->status == 404 || $http->status == 403){
+        msg('The data directory seems to be properly protected',1);
+    }else{
+        msg('Failed to check if the data directory is accessible from the web.
+                Make sure this directory is properly protected
+                (See <a href="http://www.dokuwiki.org/security">security</a>)',-1);
+    }
+}
+
+/**
+ * print a message
+ *
+ * If HTTP headers were not sent yet the message is added
+ * to the global message array else it's printed directly
+ * using html_msgarea()
+ *
+ *
+ * Levels can be:
+ *
+ * -1 error
+ *  0 info
+ *  1 success
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    html_msgarea
+ */
+function msg($message,$lvl=0,$line='',$file=''){
+    global $MSG;
+    $errors[-1] = 'error';
+    $errors[0]  = 'info';
+    $errors[1]  = 'success';
+    $errors[2]  = 'notify';
+
+    if($line || $file) $message.=' ['.basename($file).':'.$line.']';
+
+    if(!headers_sent()){
+        if(!isset($MSG)) $MSG = array();
+        $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+    }else{
+        $MSG = array();
+        $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message);
+        if(function_exists('html_msgarea')){
+            html_msgarea();
+        }else{
+            print "ERROR($lvl) $message";
+        }
+    }
+}
+
+/**
+ * print debug messages
+ *
+ * little function to print the content of a var
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function dbg($msg,$hidden=false){
+    (!$hidden) ? print '<pre class="dbg">' : print "<!--\n";
+    print_r($msg);
+    (!$hidden) ? print '</pre>' : print "\n-->";
+}
+
+/**
+ * Print info to a log file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function dbglog($msg,$header=''){
+    global $conf;
+    if(is_object($msg) || is_array($msg)){
+        $msg = print_r($msg,true);
+    }
+
+    if($header) $msg = "$header\n$msg";
+
+    $file = $conf['cachedir'].'/debug.log';
+    $fh = fopen($file,'a');
+    if($fh){
+        fwrite($fh,date('H:i:s ').$_SERVER['REMOTE_ADDR'].': '.$msg."\n");
+        fclose($fh);
+    }
+}
+
+/**
+ * Print a reversed, prettyprinted backtrace
+ *
+ * @author Gary Owen <gary_owen@bigfoot.com>
+ */
+function dbg_backtrace(){
+    // Get backtrace
+    $backtrace = debug_backtrace();
+
+    // Unset call to debug_print_backtrace
+    array_shift($backtrace);
+
+    // Iterate backtrace
+    $calls = array();
+    $depth = count($backtrace) - 1;
+    foreach ($backtrace as $i => $call) {
+        $location = $call['file'] . ':' . $call['line'];
+        $function = (isset($call['class'])) ?
+            $call['class'] . $call['type'] . $call['function'] : $call['function'];
+
+        $params = array();
+        if (isset($call['args'])){
+            foreach($call['args'] as $arg){
+                if(is_object($arg)){
+                    $params[] = '[Object '.get_class($arg).']';
+                }elseif(is_array($arg)){
+                    $params[] = '[Array]';
+                }elseif(is_null($arg)){
+                    $param[] = '[NULL]';
+                }else{
+                    $params[] = (string) '"'.$arg.'"';
+                }
+            }
+        }
+        $params = implode(', ',$params);
+
+        $calls[$depth - $i] = sprintf('%s(%s) called at %s',
+                $function,
+                str_replace("\n", '\n', $params),
+                $location);
+    }
+    ksort($calls);
+
+    return implode("\n", $calls);
+}
+
+/**
+ * Remove all data from an array where the key seems to point to sensitive data
+ *
+ * This is used to remove passwords, mail addresses and similar data from the
+ * debug output
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function debug_guard(&$data){
+    foreach($data as $key => $value){
+        if(preg_match('/(notify|pass|auth|secret|ftp|userinfo|token|buid|mail|proxy)/i',$key)){
+            $data[$key] = '***';
+            continue;
+        }
+        if(is_array($value)) debug_guard($data[$key]);
+    }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/init.php b/mod/dokuwiki/vendors/dokuwiki/inc/init.php
new file mode 100644
index 000000000..eca97f5f7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/init.php
@@ -0,0 +1,598 @@
+<?php
+/**
+ * Initialize some defaults needed for DokuWiki
+ */
+
+// start timing Dokuwiki execution
+function delta_time($start=0) {
+    list($usec, $sec) = explode(" ", microtime());
+    return ((float)$usec+(float)$sec)-((float)$start);
+}
+define('DOKU_START_TIME', delta_time());
+
+global $config_cascade;
+$config_cascade = '';
+
+// if available load a preload config file
+$preload = fullpath(dirname(__FILE__)).'/preload.php';
+if (@file_exists($preload)) include($preload);
+
+// define the include path
+if(!defined('DOKU_INC')) define('DOKU_INC',fullpath(dirname(__FILE__).'/../').'/');
+
+
+// define config path (packagers may want to change this to /etc/dokuwiki/)
+if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+
+// check for error reporting override or set error reporting to sane values
+if (!defined('DOKU_E_LEVEL') && @file_exists(DOKU_CONF.'report_e_all')) {
+    define('DOKU_E_LEVEL', E_ALL);
+}
+if (!defined('DOKU_E_LEVEL')) {
+    if(defined('E_DEPRECATED')){ // since php 5.3
+        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED);
+    }else{
+        error_reporting(E_ALL ^ E_NOTICE);
+    }
+} else {
+    error_reporting(DOKU_E_LEVEL);
+}
+
+// init memory caches
+global $cache_revinfo;
+       $cache_revinfo = array();
+global $cache_wikifn;
+       $cache_wikifn = array();
+global $cache_cleanid;
+       $cache_cleanid = array();
+global $cache_authname;
+       $cache_authname = array();
+global $cache_metadata;
+       $cache_metadata = array();
+
+//set the configuration cascade - but only if its not already been set in preload.php
+if (empty($config_cascade)) {
+    $config_cascade = array(
+            'main' => array(
+                'default'   => array(DOKU_CONF.'dokuwiki.php'),
+                'local'     => array(DOKU_CONF.'local.php'),
+                'protected' => array(DOKU_CONF.'local.protected.php'),
+                ),
+            'acronyms'  => array(
+                'default'   => array(DOKU_CONF.'acronyms.conf'),
+                'local'     => array(DOKU_CONF.'acronyms.local.conf'),
+                ),
+            'entities'  => array(
+                'default'   => array(DOKU_CONF.'entities.conf'),
+                'local'     => array(DOKU_CONF.'entities.local.conf'),
+                ),
+            'interwiki' => array(
+                'default'   => array(DOKU_CONF.'interwiki.conf'),
+                'local'     => array(DOKU_CONF.'interwiki.local.conf'),
+                ),
+            'license' => array(
+                'default'   => array(DOKU_CONF.'license.php'),
+                'local'     => array(DOKU_CONF.'license.local.php'),
+                ),
+            'mediameta' => array(
+                    'default'   => array(DOKU_CONF.'mediameta.php'),
+                    'local'     => array(DOKU_CONF.'mediameta.local.php'),
+                    ),
+            'mime'      => array(
+                    'default'   => array(DOKU_CONF.'mime.conf'),
+                    'local'     => array(DOKU_CONF.'mime.local.conf'),
+                    ),
+            'scheme'    => array(
+                    'default'   => array(DOKU_CONF.'scheme.conf'),
+                    'local'     => array(DOKU_CONF.'scheme.local.conf'),
+                    ),
+            'smileys'   => array(
+                    'default'   => array(DOKU_CONF.'smileys.conf'),
+                    'local'     => array(DOKU_CONF.'smileys.local.conf'),
+                    ),
+            'wordblock' => array(
+                    'default'   => array(DOKU_CONF.'wordblock.conf'),
+                    'local'     => array(DOKU_CONF.'wordblock.local.conf'),
+                    ),
+            );
+}
+
+//prepare config array()
+global $conf;
+$conf = array();
+
+// load the global config file(s)
+foreach (array('default','local','protected') as $config_group) {
+    if (empty($config_cascade['main'][$config_group])) continue;
+    foreach ($config_cascade['main'][$config_group] as $config_file) {
+        if (@file_exists($config_file)) {
+            include($config_file);
+        }
+    }
+}
+
+//prepare language array
+global $lang;
+$lang = array();
+
+//load the language files
+require_once(DOKU_INC.'inc/lang/en/lang.php');
+if ( $conf['lang'] && $conf['lang'] != 'en' ) {
+    require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
+}
+
+//prepare license array()
+global $license;
+$license = array();
+
+// load the license file(s)
+foreach (array('default','local') as $config_group) {
+    if (empty($config_cascade['license'][$config_group])) continue;
+    foreach ($config_cascade['license'][$config_group] as $config_file) {
+        if(@file_exists($config_file)){
+            include($config_file);
+        }
+    }
+}
+
+// set timezone (as in pre 5.3.0 days)
+date_default_timezone_set(@date_default_timezone_get());
+
+// define baseURL
+if(!defined('DOKU_REL')) define('DOKU_REL',getBaseURL(false));
+if(!defined('DOKU_URL')) define('DOKU_URL',getBaseURL(true));
+if(!defined('DOKU_BASE')){
+    if($conf['canonical']){
+        define('DOKU_BASE',DOKU_URL);
+    }else{
+        define('DOKU_BASE',DOKU_REL);
+    }
+}
+//error_log("DOKU_INC:".DOKU_INC);
+//error_log("DOKU_REL:".DOKU_REL);
+//error_log("DOKU_URL:".DOKU_URL);
+//error_log("DOKU_BASE:".DOKU_BASE);
+
+// define whitespace
+if(!defined('DOKU_LF')) define ('DOKU_LF',"\n");
+if(!defined('DOKU_TAB')) define ('DOKU_TAB',"\t");
+
+// define cookie and session id, append server port when securecookie is configured FS#1664
+if (!defined('DOKU_COOKIE')) define('DOKU_COOKIE', 'DW'.md5(DOKU_REL.(($conf['securecookie'])?$_SERVER['SERVER_PORT']:'')));
+
+// define Plugin dir
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+
+// define main script
+if(!defined('DOKU_SCRIPT')) define('DOKU_SCRIPT','doku.php');
+
+// define Template baseURL
+if(!defined('DOKU_TPL')) define('DOKU_TPL',
+        DOKU_BASE.'lib/tpl/'.$conf['template'].'/');
+
+// define real Template directory
+if(!defined('DOKU_TPLINC')) define('DOKU_TPLINC',
+        DOKU_INC.'lib/tpl/'.$conf['template'].'/');
+
+// make session rewrites XHTML compliant
+@ini_set('arg_separator.output', '&amp;');
+
+// make sure global zlib does not interfere FS#1132
+@ini_set('zlib.output_compression', 'off');
+
+// increase PCRE backtrack limit
+@ini_set('pcre.backtrack_limit', '20971520');
+
+// enable gzip compression if supported
+$conf['gzip_output'] &= (strpos($_SERVER['HTTP_ACCEPT_ENCODING'],'gzip') !== false);
+if ($conf['gzip_output'] &&
+        !defined('DOKU_DISABLE_GZIP_OUTPUT') &&
+        function_exists('ob_gzhandler')) {
+    ob_start('ob_gzhandler');
+}
+
+// init session
+if (!headers_sent() && !defined('NOSESSION')){
+    session_name("DokuWiki");
+    if (version_compare(PHP_VERSION, '5.2.0', '>')) {
+        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        session_set_cookie_params(0,DOKU_REL,'',($conf['securecookie'] && is_ssl()));
+    }
+    session_start();
+
+    // load left over messages
+    if(isset($_SESSION[DOKU_COOKIE]['msg'])){
+        $MSG = $_SESSION[DOKU_COOKIE]['msg'];
+        unset($_SESSION[DOKU_COOKIE]['msg']);
+    }
+}
+
+// kill magic quotes
+if (get_magic_quotes_gpc() && !defined('MAGIC_QUOTES_STRIPPED')) {
+    if (!empty($_GET))    remove_magic_quotes($_GET);
+    if (!empty($_POST))   remove_magic_quotes($_POST);
+    if (!empty($_COOKIE)) remove_magic_quotes($_COOKIE);
+    if (!empty($_REQUEST)) remove_magic_quotes($_REQUEST);
+    @ini_set('magic_quotes_gpc', 0);
+    define('MAGIC_QUOTES_STRIPPED',1);
+}
+@set_magic_quotes_runtime(0);
+@ini_set('magic_quotes_sybase',0);
+
+// don't let cookies ever interfere with request vars
+$_REQUEST = array_merge($_GET,$_POST);
+
+// we don't want a purge URL to be digged
+if(isset($_REQUEST['purge']) && $_SERVER['HTTP_REFERER']) unset($_REQUEST['purge']);
+
+// disable gzip if not available
+if($conf['compression'] == 'bz2' && !function_exists('bzopen')){
+    $conf['compression'] = 'gz';
+}
+if($conf['compression'] == 'gz' && !function_exists('gzopen')){
+    $conf['compression'] = 0;
+}
+
+// fix dateformat for upgraders
+if(strpos($conf['dformat'],'%') === false){
+    $conf['dformat'] = '%Y/%m/%d %H:%M';
+}
+
+// precalculate file creation modes
+init_creationmodes();
+
+// make real paths and check them
+init_paths();
+init_files();
+
+// automatic upgrade to script versions of certain files
+scriptify(DOKU_CONF.'users.auth');
+scriptify(DOKU_CONF.'acl.auth');
+
+
+/**
+ * Checks paths from config file
+ */
+function init_paths(){
+    global $conf;
+
+    $paths = array('datadir'   => 'pages',
+            'olddir'    => 'attic',
+            'mediadir'  => 'media',
+            'metadir'   => 'meta',
+            'cachedir'  => 'cache',
+            'indexdir'  => 'index',
+            'lockdir'   => 'locks',
+            'tmpdir'    => 'tmp');
+
+    foreach($paths as $c => $p){
+        if(empty($conf[$c]))  $conf[$c] = $conf['savedir'].'/'.$p;
+        $conf[$c]             = init_path($conf[$c]);
+        if(empty($conf[$c]))  nice_die("The $c ('$p') does not exist, isn't accessible or writable.
+                You should check your config and permission settings.
+                Or maybe you want to <a href=\"install.php\">run the
+                installer</a>?");
+    }
+
+    // path to old changelog only needed for upgrading
+    $conf['changelog_old'] = init_path((isset($conf['changelog']))?($conf['changelog']):($conf['savedir'].'/changes.log'));
+    if ($conf['changelog_old']=='') { unset($conf['changelog_old']); }
+    // hardcoded changelog because it is now a cache that lives in meta
+    $conf['changelog'] = $conf['metadir'].'/_dokuwiki.changes';
+    $conf['media_changelog'] = $conf['metadir'].'/_media.changes';
+}
+
+/**
+ * Checks the existance of certain files and creates them if missing.
+ */
+function init_files(){
+    global $conf;
+
+    $files = array( $conf['indexdir'].'/page.idx');
+
+    foreach($files as $file){
+        if(!@file_exists($file)){
+            $fh = @fopen($file,'a');
+            if($fh){
+                fclose($fh);
+                if($conf['fperm']) chmod($file, $conf['fperm']);
+            }else{
+                nice_die("$file is not writable. Check your permissions settings!");
+            }
+        }
+    }
+}
+
+/**
+ * Returns absolute path
+ *
+ * This tries the given path first, then checks in DOKU_INC.
+ * Check for accessability on directories as well.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function init_path($path){
+    // check existance
+	//error_log("init_path:".$path);
+    $p = fullpath($path);
+    if(!@file_exists($p)){
+        $p = fullpath(DOKU_INC.$path);
+        if(!@file_exists($p)){
+            return '';
+        }
+    }
+
+    // check writability
+    if(!@is_writable($p)){
+        return '';
+    }
+
+    // check accessability (execute bit) for directories
+    if(@is_dir($p) && !@file_exists("$p/.")){
+        return '';
+    }
+
+    return $p;
+}
+
+/**
+ * Sets the internal config values fperm and dperm which, when set,
+ * will be used to change the permission of a newly created dir or
+ * file with chmod. Considers the influence of the system's umask
+ * setting the values only if needed.
+ */
+function init_creationmodes(){
+    global $conf;
+
+    // Legacy support for old umask/dmask scheme
+    unset($conf['dmask']);
+    unset($conf['fmask']);
+    unset($conf['umask']);
+    unset($conf['fperm']);
+    unset($conf['dperm']);
+
+    // get system umask, fallback to 0 if none available
+    $umask = @umask();
+    if(!$umask) $umask = 0000;
+
+    // check what is set automatically by the system on file creation
+    // and set the fperm param if it's not what we want
+    $auto_fmode = 0666 & ~$umask;
+    if($auto_fmode != $conf['fmode']) $conf['fperm'] = $conf['fmode'];
+
+    // check what is set automatically by the system on file creation
+    // and set the dperm param if it's not what we want
+    $auto_dmode = $conf['dmode'] & ~$umask;
+    if($auto_dmode != $conf['dmode']) $conf['dperm'] = $conf['dmode'];
+}
+
+/**
+ * remove magic quotes recursivly
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function remove_magic_quotes(&$array) {
+    foreach (array_keys($array) as $key) {
+        // handle magic quotes in keynames (breaks order)
+        $sk = stripslashes($key);
+        if($sk != $key){
+            $array[$sk] = $array[$key];
+            unset($array[$key]);
+            $key = $sk;
+        }
+
+        // do recursion if needed
+        if (is_array($array[$key])) {
+            remove_magic_quotes($array[$key]);
+        }else {
+            $array[$key] = stripslashes($array[$key]);
+        }
+    }
+}
+
+/**
+ * Returns the full absolute URL to the directory where
+ * DokuWiki is installed in (includes a trailing slash)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function getBaseURL($abs=null){
+    global $conf;
+    //if canonical url enabled always return absolute
+    if(is_null($abs)) $abs = $conf['canonical'];
+
+    if($conf['basedir']){
+        $dir = $conf['basedir'];
+    }elseif(substr($_SERVER['SCRIPT_NAME'],-4) == '.php'){
+        $dir = dirname($_SERVER['SCRIPT_NAME']);
+    }elseif(substr($_SERVER['PHP_SELF'],-4) == '.php'){
+        $dir = dirname($_SERVER['PHP_SELF']);
+    }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
+        $dir = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                $_SERVER['SCRIPT_FILENAME']);
+        $dir = dirname('/'.$dir);
+    }else{
+        $dir = '.'; //probably wrong
+    }
+
+    $dir = str_replace('\\','/',$dir);             // bugfix for weird WIN behaviour
+    $dir = preg_replace('#//+#','/',"/$dir/");     // ensure leading and trailing slashes
+
+    //handle script in lib/exe dir
+    $dir = preg_replace('!lib/exe/$!','',$dir);
+
+    //handle script in lib/plugins dir
+    $dir = preg_replace('!lib/plugins/.*$!','',$dir);
+
+    //finish here for relative URLs
+    if(!$abs) return $dir;
+
+    //use config option if available, trim any slash from end of baseurl to avoid multiple consecutive slashes in the path
+    if($conf['baseurl']) return rtrim($conf['baseurl'],'/').$dir;
+
+    //split hostheader into host and port
+    $addr = explode(':',$_SERVER['HTTP_HOST']);
+    $host = $addr[0];
+    $port = '';
+    if (isset($addr[1])) {
+        $port = $addr[1];
+    } elseif (isset($_SERVER['SERVER_PORT'])) {
+        $port = $_SERVER['SERVER_PORT'];
+    }
+    if(!is_ssl()){
+        $proto = 'http://';
+        if ($port == '80') {
+            $port = '';
+        }
+    }else{
+        $proto = 'https://';
+        if ($port == '443') {
+            $port = '';
+        }
+    }
+
+    if($port !== '') $port = ':'.$port;
+
+    return $proto.$host.$port.$dir;
+}
+
+/**
+ * Check if accessed via HTTPS
+ *
+ * Apache leaves ,$_SERVER['HTTPS'] empty when not available, IIS sets it to 'off'.
+ * 'false' and 'disabled' are just guessing
+ *
+ * @returns bool true when SSL is active
+ */
+function is_ssl(){
+    if (!isset($_SERVER['HTTPS']) ||
+        preg_match('/^(|off|false|disabled)$/i',$_SERVER['HTTPS'])){
+        return false;
+    }else{
+        return true;
+    }
+}
+
+/**
+ * Append a PHP extension to a given file and adds an exit call
+ *
+ * This is used to migrate some old configfiles. An added PHP extension
+ * ensures the contents are not shown to webusers even if .htaccess files
+ * do not work
+ *
+ * @author Jan Decaluwe <jan@jandecaluwe.com>
+ */
+function scriptify($file) {
+    // checks
+    if (!is_readable($file)) {
+        return;
+    }
+    $fn = $file.'.php';
+    if (@file_exists($fn)) {
+        return;
+    }
+    $fh = fopen($fn, 'w');
+    if (!$fh) {
+        nice_die($fn.' is not writable. Check your permission settings!');
+    }
+    // write php exit hack first
+    fwrite($fh, "# $fn\n");
+    fwrite($fh, '# <?php exit()?>'."\n");
+    fwrite($fh, "# Don't modify the lines above\n");
+    fwrite($fh, "#\n");
+    // copy existing lines
+    $lines = file($file);
+    foreach ($lines as $line){
+        fwrite($fh, $line);
+    }
+    fclose($fh);
+    //try to rename the old file
+    io_rename($file,"$file.old");
+}
+
+/**
+ * print a nice message even if no styles are loaded yet.
+ */
+function nice_die($msg){
+    echo<<<EOT
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head><title>DokuWiki Setup Error</title></head>
+<body style="font-family: Arial, sans-serif">
+    <div style="width:60%; margin: auto; background-color: #fcc;
+                border: 1px solid #faa; padding: 0.5em 1em;">
+        <h1 style="font-size: 120%">DokuWiki Setup Error</h1>
+        <p>$msg</p>
+    </div>
+</body>
+</html>
+EOT;
+    exit;
+}
+
+
+/**
+ * A realpath() replacement
+ *
+ * This function behaves similar to PHP's realpath() but does not resolve
+ * symlinks or accesses upper directories
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author <richpageau at yahoo dot co dot uk>
+ * @link   http://de3.php.net/manual/en/function.realpath.php#75992
+ */
+function fullpath($path,$exists=false){
+    static $run = 0;
+    $root  = '';
+    $iswin = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' || @$GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS']);
+
+    // find the (indestructable) root of the path - keeps windows stuff intact
+    if($path{0} == '/'){
+        $root = '/';
+    }elseif($iswin){
+        // match drive letter and UNC paths
+        if(preg_match('!^([a-zA-z]:)(.*)!',$path,$match)){
+            $root = $match[1].'/';
+            $path = $match[2];
+        }else if(preg_match('!^(\\\\\\\\[^\\\\/]+\\\\[^\\\\/]+[\\\\/])(.*)!',$path,$match)){
+            $root = $match[1];
+            $path = $match[2];
+        }
+    }
+    $path = str_replace('\\','/',$path);
+
+    // if the given path wasn't absolute already, prepend the script path and retry
+    if(!$root){
+        $base = dirname($_SERVER['SCRIPT_FILENAME']);
+        $path = $base.'/'.$path;
+        if($run == 0){ // avoid endless recursion when base isn't absolute for some reason
+            $run++;
+            return fullpath($path,$exists);
+        }
+    }
+    $run = 0;
+
+    // canonicalize
+    $path=explode('/', $path);
+    $newpath=array();
+    foreach($path as $p) {
+        if ($p === '' || $p === '.') continue;
+        if ($p==='..') {
+            array_pop($newpath);
+            continue;
+        }
+        array_push($newpath, $p);
+    }
+    $finalpath = $root.implode('/', $newpath);
+
+    // check for existance when needed (except when unit testing)
+    if($exists && !defined('DOKU_UNITTEST') && !@file_exists($finalpath)) {
+        return false;
+    }
+    return $finalpath;
+}
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/io.php b/mod/dokuwiki/vendors/dokuwiki/inc/io.php
new file mode 100644
index 000000000..32a6f7b8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/io.php
@@ -0,0 +1,593 @@
+<?php
+/**
+ * File IO functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/HTTPClient.php');
+require_once(DOKU_INC.'inc/events.php');
+require_once(DOKU_INC.'inc/utf8.php');
+
+/**
+ * Removes empty directories
+ *
+ * Sends IO_NAMESPACE_DELETED events for 'pages' and 'media' namespaces.
+ * Event data:
+ * $data[0]    ns: The colon separated namespace path minus the trailing page name.
+ * $data[1]    ns_type: 'pages' or 'media' namespace tree.
+ *
+ * @todo use safemode hack
+ * @param string $id      - a pageid, the namespace of that id will be tried to deleted
+ * @param string $basadir - the config name of the type to delete (datadir or mediadir usally)
+ * @returns bool - true if at least one namespace was deleted
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function io_sweepNS($id,$basedir='datadir'){
+    global $conf;
+    $types = array ('datadir'=>'pages', 'mediadir'=>'media');
+    $ns_type = (isset($types[$basedir])?$types[$basedir]:false);
+
+    $delone = false;
+
+    //scan all namespaces
+    while(($id = getNS($id)) !== false){
+        $dir = $conf[$basedir].'/'.utf8_encodeFN(str_replace(':','/',$id));
+
+        //try to delete dir else return
+        if(@rmdir($dir)) {
+            if ($ns_type!==false) {
+                $data = array($id, $ns_type);
+                $delone = true; // we deleted at least one dir
+                trigger_event('IO_NAMESPACE_DELETED', $data);
+            }
+        } else { return $delone; }
+    }
+    return $delone;
+}
+
+/**
+ * Used to read in a DokuWiki page from file, and send IO_WIKIPAGE_READ events.
+ *
+ * Generates the action event which delegates to io_readFile().
+ * Action plugins are allowed to modify the page content in transit.
+ * The file path should not be changed.
+ *
+ * Event data:
+ * $data[0]    The raw arguments for io_readFile as an array.
+ * $data[1]    ns: The colon separated namespace path minus the trailing page name. (false if root ns)
+ * $data[2]    page_name: The wiki page name.
+ * $data[3]    rev: The page revision, false for current wiki pages.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function io_readWikiPage($file, $id, $rev=false) {
+    if (empty($rev)) { $rev = false; }
+    $data = array(array($file, false), getNS($id), noNS($id), $rev);
+    return trigger_event('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
+}
+
+/**
+ * Callback adapter for io_readFile().
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function _io_readWikiPage_action($data) {
+    if (is_array($data) && is_array($data[0]) && count($data[0])===2) {
+        return call_user_func_array('io_readFile', $data[0]);
+    } else {
+        return ''; //callback error
+    }
+}
+
+/**
+ * Returns content of $file as cleaned string.
+ *
+ * Uses gzip if extension is .gz
+ *
+ * If you want to use the returned value in unserialize
+ * be sure to set $clean to false!
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function io_readFile($file,$clean=true){
+    $ret = '';
+    if(@file_exists($file)){
+        if(substr($file,-3) == '.gz'){
+            $ret = join('',gzfile($file));
+        }else if(substr($file,-4) == '.bz2'){
+            $ret = bzfile($file);
+        }else{
+            $ret = file_get_contents($file);
+        }
+    }
+    if($clean){
+        return cleanText($ret);
+    }else{
+        return $ret;
+    }
+}
+/**
+ * Returns the content of a .bz2 compressed file as string
+ * @author marcel senf <marcel@rucksackreinigung.de>
+ */
+
+function bzfile($file){
+    $bz = bzopen($file,"r");
+    while (!feof($bz)){
+        //8192 seems to be the maximum buffersize?
+        $str = $str . bzread($bz,8192);
+    }
+    bzclose($bz);
+    return $str;
+}
+
+
+/**
+ * Used to write out a DokuWiki page to file, and send IO_WIKIPAGE_WRITE events.
+ *
+ * This generates an action event and delegates to io_saveFile().
+ * Action plugins are allowed to modify the page content in transit.
+ * The file path should not be changed.
+ * (The append parameter is set to false.)
+ *
+ * Event data:
+ * $data[0]    The raw arguments for io_saveFile as an array.
+ * $data[1]    ns: The colon separated namespace path minus the trailing page name. (false if root ns)
+ * $data[2]    page_name: The wiki page name.
+ * $data[3]    rev: The page revision, false for current wiki pages.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function io_writeWikiPage($file, $content, $id, $rev=false) {
+    if (empty($rev)) { $rev = false; }
+    if ($rev===false) { io_createNamespace($id); } // create namespaces as needed
+    $data = array(array($file, $content, false), getNS($id), noNS($id), $rev);
+    return trigger_event('IO_WIKIPAGE_WRITE', $data, '_io_writeWikiPage_action', false);
+}
+
+/**
+ * Callback adapter for io_saveFile().
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function _io_writeWikiPage_action($data) {
+    if (is_array($data) && is_array($data[0]) && count($data[0])===3) {
+        return call_user_func_array('io_saveFile', $data[0]);
+    } else {
+        return false; //callback error
+    }
+}
+
+/**
+ * Saves $content to $file.
+ *
+ * If the third parameter is set to true the given content
+ * will be appended.
+ *
+ * Uses gzip if extension is .gz
+ * and bz2 if extension is .bz2
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @return bool true on success
+ */
+function io_saveFile($file,$content,$append=false){
+    global $conf;
+    $mode = ($append) ? 'ab' : 'wb';
+
+    $fileexists = @file_exists($file);
+    io_makeFileDir($file);
+    io_lock($file);
+    if(substr($file,-3) == '.gz'){
+        $fh = @gzopen($file,$mode.'9');
+        if(!$fh){
+            msg("Writing $file failed",-1);
+            io_unlock($file);
+            return false;
+        }
+        gzwrite($fh, $content);
+        gzclose($fh);
+    }else if(substr($file,-4) == '.bz2'){
+        $fh = @bzopen($file,$mode{0});
+        if(!$fh){
+            msg("Writing $file failed", -1);
+            io_unlock($file);
+            return false;
+        }
+        bzwrite($fh, $content);
+        bzclose($fh);
+    }else{
+        $fh = @fopen($file,$mode);
+        if(!$fh){
+            msg("Writing $file failed",-1);
+            io_unlock($file);
+            return false;
+        }
+        fwrite($fh, $content);
+        fclose($fh);
+    }
+
+    if(!$fileexists and !empty($conf['fperm'])) chmod($file, $conf['fperm']);
+    io_unlock($file);
+    return true;
+}
+
+/**
+ * Delete exact linematch for $badline from $file.
+ *
+ * Be sure to include the trailing newline in $badline
+ *
+ * Uses gzip if extension is .gz
+ *
+ * 2005-10-14 : added regex option -- Christopher Smith <chris@jalakai.co.uk>
+ *
+ * @author Steven Danz <steven-danz@kc.rr.com>
+ * @return bool true on success
+ */
+function io_deleteFromFile($file,$badline,$regex=false){
+    if (!@file_exists($file)) return true;
+
+    io_lock($file);
+
+    // load into array
+    if(substr($file,-3) == '.gz'){
+        $lines = gzfile($file);
+    }else{
+        $lines = file($file);
+    }
+
+    // remove all matching lines
+    if ($regex) {
+        $lines = preg_grep($badline,$lines,PREG_GREP_INVERT);
+    } else {
+        $pos = array_search($badline,$lines); //return null or false if not found
+        while(is_int($pos)){
+            unset($lines[$pos]);
+            $pos = array_search($badline,$lines);
+        }
+    }
+
+    if(count($lines)){
+        $content = join('',$lines);
+        if(substr($file,-3) == '.gz'){
+            $fh = @gzopen($file,'wb9');
+            if(!$fh){
+                msg("Removing content from $file failed",-1);
+                io_unlock($file);
+                return false;
+            }
+            gzwrite($fh, $content);
+            gzclose($fh);
+        }else{
+            $fh = @fopen($file,'wb');
+            if(!$fh){
+                msg("Removing content from $file failed",-1);
+                io_unlock($file);
+                return false;
+            }
+            fwrite($fh, $content);
+            fclose($fh);
+        }
+    }else{
+        @unlink($file);
+    }
+
+    io_unlock($file);
+    return true;
+}
+
+/**
+ * Tries to lock a file
+ *
+ * Locking is only done for io_savefile and uses directories
+ * inside $conf['lockdir']
+ *
+ * It waits maximal 3 seconds for the lock, after this time
+ * the lock is assumed to be stale and the function goes on
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function io_lock($file){
+    global $conf;
+    // no locking if safemode hack
+    if($conf['safemodehack']) return;
+
+    $lockDir = $conf['lockdir'].'/'.md5($file);
+    @ignore_user_abort(1);
+
+    $timeStart = time();
+    do {
+        //waited longer than 3 seconds? -> stale lock
+        if ((time() - $timeStart) > 3) break;
+        $locked = @mkdir($lockDir, $conf['dmode']);
+        if($locked){
+            if(!empty($conf['dperm'])) chmod($lockDir, $conf['dperm']);
+            break;
+        }
+        usleep(50);
+    } while ($locked === false);
+}
+
+/**
+ * Unlocks a file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function io_unlock($file){
+    global $conf;
+    // no locking if safemode hack
+    if($conf['safemodehack']) return;
+
+    $lockDir = $conf['lockdir'].'/'.md5($file);
+    @rmdir($lockDir);
+    @ignore_user_abort(0);
+}
+
+/**
+ * Create missing namespace directories and send the IO_NAMESPACE_CREATED events
+ * in the order of directory creation. (Parent directories first.)
+ *
+ * Event data:
+ * $data[0]    ns: The colon separated namespace path minus the trailing page name.
+ * $data[1]    ns_type: 'pages' or 'media' namespace tree.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function io_createNamespace($id, $ns_type='pages') {
+    // verify ns_type
+    $types = array('pages'=>'wikiFN', 'media'=>'mediaFN');
+    if (!isset($types[$ns_type])) {
+        trigger_error('Bad $ns_type parameter for io_createNamespace().');
+        return;
+    }
+    // make event list
+    $missing = array();
+    $ns_stack = explode(':', $id);
+    $ns = $id;
+    $tmp = dirname( $file = call_user_func($types[$ns_type], $ns) );
+    while (!@is_dir($tmp) && !(@file_exists($tmp) && !is_dir($tmp))) {
+        array_pop($ns_stack);
+        $ns = implode(':', $ns_stack);
+        if (strlen($ns)==0) { break; }
+        $missing[] = $ns;
+        $tmp = dirname(call_user_func($types[$ns_type], $ns));
+    }
+    // make directories
+    io_makeFileDir($file);
+    // send the events
+    $missing = array_reverse($missing); // inside out
+    foreach ($missing as $ns) {
+        $data = array($ns, $ns_type);
+        trigger_event('IO_NAMESPACE_CREATED', $data);
+    }
+}
+
+/**
+ * Create the directory needed for the given file
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function io_makeFileDir($file){
+    global $conf;
+
+    $dir = dirname($file);
+    if(!@is_dir($dir)){
+        io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);
+    }
+}
+
+/**
+ * Creates a directory hierachy.
+ *
+ * @link    http://www.php.net/manual/en/function.mkdir.php
+ * @author  <saint@corenova.com>
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function io_mkdir_p($target){
+    global $conf;
+    if (@is_dir($target)||empty($target)) return 1; // best case check first
+    if (@file_exists($target) && !is_dir($target)) return 0;
+    //recursion
+    if (io_mkdir_p(substr($target,0,strrpos($target,'/')))){
+        if($conf['safemodehack']){
+            $dir = preg_replace('/^'.preg_quote(fullpath($conf['ftp']['root']),'/').'/','', $target);
+            return io_mkdir_ftp($dir);
+        }else{
+            $ret = @mkdir($target,$conf['dmode']); // crawl back up & create dir tree
+            if($ret && $conf['dperm']) chmod($target, $conf['dperm']);
+            return $ret;
+        }
+    }
+    return 0;
+}
+
+/**
+ * Creates a directory using FTP
+ *
+ * This is used when the safemode workaround is enabled
+ *
+ * @author <andi@splitbrain.org>
+ */
+function io_mkdir_ftp($dir){
+    global $conf;
+
+    if(!function_exists('ftp_connect')){
+        msg("FTP support not found - safemode workaround not usable",-1);
+        return false;
+    }
+
+    $conn = @ftp_connect($conf['ftp']['host'],$conf['ftp']['port'],10);
+    if(!$conn){
+        msg("FTP connection failed",-1);
+        return false;
+    }
+
+    if(!@ftp_login($conn, $conf['ftp']['user'], conf_decodeString($conf['ftp']['pass']))){
+        msg("FTP login failed",-1);
+        return false;
+    }
+
+    //create directory
+    $ok = @ftp_mkdir($conn, $dir);
+    //set permissions
+    @ftp_site($conn,sprintf("CHMOD %04o %s",$conf['dmode'],$dir));
+
+    @ftp_close($conn);
+    return $ok;
+}
+
+/**
+ * Creates a unique temporary directory and returns
+ * its path.
+ *
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function io_mktmpdir() {
+    global $conf;
+
+    $base = $conf['tmpdir'];
+    $dir  = md5(uniqid(mt_rand(), true));
+    $tmpdir = $base.'/'.$dir;
+
+    if(io_mkdir_p($tmpdir)) {
+        return($tmpdir);
+    } else {
+        return false;
+    }
+}
+
+/**
+ * downloads a file from the net and saves it
+ *
+ * if $useAttachment is false,
+ * - $file is the full filename to save the file, incl. path
+ * - if successful will return true, false otherwise
+ *
+ * if $useAttachment is true,
+ * - $file is the directory where the file should be saved
+ * - if successful will return the name used for the saved file, false otherwise
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Chris Smith <chris@jalakai.co.uk>
+ */
+function io_download($url,$file,$useAttachment=false,$defaultName='',$maxSize=2097152){
+    global $conf;
+    $http = new DokuHTTPClient();
+    $http->max_bodysize = $maxSize;
+    $http->timeout = 25; //max. 25 sec
+
+    $data = $http->get($url);
+    if(!$data) return false;
+
+    if ($useAttachment) {
+        $name = '';
+        if (isset($http->resp_headers['content-disposition'])) {
+            $content_disposition = $http->resp_headers['content-disposition'];
+            $match=array();
+            if (is_string($content_disposition) &&
+                    preg_match('/attachment;\s*filename\s*=\s*"([^"]*)"/i', $content_disposition, $match)) {
+
+                $name = basename($match[1]);
+        }
+
+        }
+
+        if (!$name) {
+            if (!$defaultName) return false;
+            $name = $defaultName;
+        }
+
+        $file = $file.$name;
+    }
+
+    $fileexists = @file_exists($file);
+    $fp = @fopen($file,"w");
+    if(!$fp) return false;
+    fwrite($fp,$data);
+    fclose($fp);
+    if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
+    if ($useAttachment) return $name;
+    return true;
+}
+
+/**
+ * Windows compatible rename
+ *
+ * rename() can not overwrite existing files on Windows
+ * this function will use copy/unlink instead
+ */
+function io_rename($from,$to){
+    global $conf;
+    if(!@rename($from,$to)){
+        if(@copy($from,$to)){
+            if($conf['fperm']) chmod($to, $conf['fperm']);
+            @unlink($from);
+            return true;
+        }
+        return false;
+    }
+    return true;
+}
+
+
+/**
+ * Runs an external command and returns it's output as string
+ *
+ * @author Harry Brueckner <harry_b@eml.cc>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @deprecated
+ */
+function io_runcmd($cmd){
+    $fh = popen($cmd, "r");
+    if(!$fh) return false;
+    $ret = '';
+    while (!feof($fh)) {
+        $ret .= fread($fh, 8192);
+    }
+    pclose($fh);
+    return $ret;
+}
+
+/**
+ * Search a file for matching lines
+ *
+ * This is probably not faster than file()+preg_grep() but less
+ * memory intensive because not the whole file needs to be loaded
+ * at once.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string $file    The file to search
+ * @param  string $pattern PCRE pattern
+ * @param  int    $max     How many lines to return (0 for all)
+ * @param  bool   $baxkref When true returns array with backreferences instead of lines
+ * @return matching lines or backref, false on error
+ */
+function io_grep($file,$pattern,$max=0,$backref=false){
+    $fh = @fopen($file,'r');
+    if(!$fh) return false;
+    $matches = array();
+
+    $cnt  = 0;
+    $line = '';
+    while (!feof($fh)) {
+        $line .= fgets($fh, 4096);  // read full line
+        if(substr($line,-1) != "\n") continue;
+
+        // check if line matches
+        if(preg_match($pattern,$line,$match)){
+            if($backref){
+                $matches[] = $match;
+            }else{
+                $matches[] = $line;
+            }
+            $cnt++;
+        }
+        if($max && $max == $cnt) break;
+        $line = '';
+    }
+    fclose($fh);
+    return $matches;
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/af/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/af/lang.php
new file mode 100644
index 000000000..fce59d13e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/af/lang.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * af language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesAf.php?view=co
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['btn_edit']              = 'Wysig hierdie bladsy';
+$lang['btn_source']            = 'Bekyk bronteks';
+$lang['btn_search']            = 'Soek';
+$lang['btn_preview']           = 'Voorskou';
+$lang['btn_revs']              = 'geskiedenis';
+$lang['btn_recent']            = 'Onlangse wysigings';
+$lang['btn_cancel']            = 'Kanselleer';
+$lang['btn_secedit']           = 'Wysig';
+$lang['btn_login']             = 'Teken in';
+$lang['btn_logout']            = 'Teken uit';
+$lang['btn_back']              = 'Terug';
+$lang['btn_backlink']          = 'Wat skakel hierheen';
+$lang['btn_subscribe']         = 'Hou bladsy dop';
+$lang['btn_unsubscribe']       = 'Verwyder van bladsy  dophoulys';
+$lang['btn_resendpwd']         = 'E-pos nuwe wagwoord';
+$lang['loggedinas']            = 'Ingeteken as';
+$lang['user']                  = 'Gebruikernaam';
+$lang['pass']                  = 'Wagwoord';
+$lang['newpass']               = 'Nuive wagwoord';
+$lang['oldpass']               = 'Ou wagwoord';
+$lang['passchk']               = 'Herhaal wagwoord';
+$lang['remember']              = 'Onthou my wagwoord oor sessies';
+$lang['fullname']              = 'Regte naam';
+$lang['email']                 = 'E-pos';
+$lang['register']              = 'Skep gerus \'n rekening';
+$lang['badlogin']              = 'Intekenfout';
+$lang['minoredit']             = 'Klein wysiging';
+$lang['reguexists']            = 'Die gebruikersnaam wat jy gebruik het, is alreeds gebruik. Kies asseblief \'n ander gebruikersnaam.';
+$lang['regsuccess2']           = 'Rekening geskep';
+$lang['regbadpass']            = 'Die ingetikte wagwoorde is nie dieselfde nie.';
+$lang['regpwmail']             = 'Jo DokuWiki wagwoord';
+$lang['profnoempty']           = 'Jy moet \'n name en a e-posadres in sit';
+$lang['resendpwd']             = 'Stuir vir a niwe wagwoord';
+$lang['resendpwdmissing']      = 'Jammer, jy moet ales in fil';
+$lang['resendpwdconfirm']      = '\'n Bevestigingpos is gestuur na die gekose e-posadres.';
+$lang['resendpwdsuccess']      = 'Jou nuive wagwoord was deur e-pos gesteur';
+$lang['fileupload']            = 'Laai lêer';
+$lang['uploadsucc']            = 'Laai suksesvol';
+$lang['uploadfail']            = 'Laai fout';
+$lang['js']['hidedetails']     = 'Steek weg';
+$lang['mediaroot']             = 'root';
+$lang['toc']                   = 'Inhoud';
+$lang['current']               = 'huidige';
+$lang['line']                  = 'Streak';
+$lang['youarehere']            = 'Jy is hier';
+$lang['by']                    = 'by';
+$lang['restored']              = 'Het terug gegaan na vroeëre weergawe';
+$lang['summary']               = 'Voorskou';
+$lang['qb_bold']               = 'Vetdruk';
+$lang['qb_italic']             = 'Skuinsdruk';
+$lang['qb_link']               = 'Interne skakel';
+$lang['qb_extlink']            = 'Eksterne skakel';
+$lang['qb_hr']                 = 'Horisontale streep';
+$lang['qb_sig']                = 'Handtekening met datum';
+$lang['admin_register']        = 'Skep gerus \'n rekening';
+$lang['img_backto']            = 'Terug na';
+$lang['img_date']              = 'Datem';
+$lang['img_camera']            = 'Camera';
+$lang['i_wikiname']            = 'Wiki Naam';
+$lang['i_funcna']              = 'PHP funksie <code>%s</code> is nie beskibaar nie. Miskien is dit af gehaal.';
+$lang['mu_toobig']             = 'te groet';
+$lang['mu_done']               = 'klaar';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/admin.txt
new file mode 100644
index 000000000..7edee8a2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/admin.txt
@@ -0,0 +1,3 @@
+====== الأدارة ======
+
+قائمة بالمهام الإدارية المتاحة فى دوكي ويكي.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/backlinks.txt
new file mode 100644
index 000000000..f6d24f413
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/backlinks.txt
@@ -0,0 +1,3 @@
+====== إرتباطات ======
+
+هذه قائمة بالصفحات المرتبطة بالصفحة الحالية.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/conflict.txt
new file mode 100644
index 000000000..4d7c4e8e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/conflict.txt
@@ -0,0 +1,5 @@
+====== يوجد نسخة أحدث ======
+
+يوجد نسخة أحدث من هذه الصفحة. يحدث هذا عندما يحرر مشترك آخر الصفحة أثناء تعديلك لها.
+
+افحص الاختلافات جيداً، ثم حدد أية نسخة تحفظ. بالضغط على "حفظ" ستحفظ نسختك. أما بالضغط على "إلغاء" فستحافظ على النسخة الحالية.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/denied.txt
new file mode 100644
index 000000000..0703697b6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/denied.txt
@@ -0,0 +1,3 @@
+====== ممنوع ======
+
+عذرا، ليس مصرح لك الاستمرار، لعلك نسيت تسجيل الدخول
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/diff.txt
new file mode 100644
index 000000000..ed1937c2f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/diff.txt
@@ -0,0 +1,3 @@
+====== اختلافات ======
+
+عرض الاختلافات بين النسخة المختارة و النسخة الحالية من الصفحة.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/draft.txt
new file mode 100644
index 000000000..a6221b0df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/draft.txt
@@ -0,0 +1,5 @@
+====== وجدت مسوّدة ======
+
+إن تعديلك لهذه الصفحة في المرة الماضية لم يتم بشكل صحيح، حفظت دوكي ويكي آلياً مسوّدة من عملك الأخير الذي يمكنك استخدامه الآن لمتابعة التعديل. فيما يلي البيانات التي حفظت من المرة الماضية.
+
+يرجى أن تقرر إن كنت تريد //استعادة// عملك السابق أو //حذف// المسوّدة أو //إلغاء// عملية التحرير.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/edit.txt
new file mode 100644
index 000000000..d4e1eb43b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/edit.txt
@@ -0,0 +1 @@
+حرر هذه الصفحة ثم اضغط على "حفظ". انظر [[wiki:syntax|دليل الصياغة]] لمعرفة صيغة الويكي. يرجى تعديل الصفحة فقط إذا كنت ستحسنها. إذا رغبت فى اختبار شيء ما، تعلم الخطوات الأولى فى [[playground:playground|الملعب]].
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/editrev.txt
new file mode 100644
index 000000000..a51fe9436
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/editrev.txt
@@ -0,0 +1,2 @@
+**لقد حملت نسخة قديمة من الصفحة!** إذا حفظتها، سيتم إنشاء نسخة جديدة بهذه المعلومات.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/index.txt
new file mode 100644
index 000000000..43840ec26
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/index.txt
@@ -0,0 +1,3 @@
+====== فهرس ======
+
+هذا فهرس لجميع الصفحات مرتبة حسب [[doku>namespaces|namespaces]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/lang.php
new file mode 100644
index 000000000..2ba1f7e9f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/lang.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Arabic language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Mostafa Hussein <mostafa@gmail.com>
+ * @author Yaman Hokan <always.smile.yh@hotmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '؛';
+$lang['btn_edit']              = 'تحرير هذه الصفحة';
+$lang['btn_source']            = 'عرض مصدر الصفحة';
+$lang['btn_show']              = 'عرض الصفحة';
+$lang['btn_create']            = 'إنشاء هذه الصفحة';
+$lang['btn_search']            = 'بحث';
+$lang['btn_save']              = 'حفظ';
+$lang['btn_preview']           = 'استعراض';
+$lang['btn_top']               = 'لأعلى';
+$lang['btn_newer']             = '<< أحدث';
+$lang['btn_older']             = 'أقدم >>';
+$lang['btn_revs']              = 'نسخ قديمة';
+$lang['btn_recent']            = 'أحدث التعديلات';
+$lang['btn_upload']            = 'تحميل';
+$lang['btn_cancel']            = 'إلغاء';
+$lang['btn_index']             = 'فهرس';
+$lang['btn_secedit']           = 'تحرير';
+$lang['btn_login']             = 'دخول';
+$lang['btn_logout']            = 'خروج';
+$lang['btn_admin']             = 'المدير';
+$lang['btn_update']            = 'تحديث';
+$lang['btn_delete']            = 'حذف';
+$lang['btn_back']              = 'رجوع';
+$lang['btn_backlink']          = 'ارتباطات';
+$lang['btn_backtomedia']       = 'رجوع إلى اختيار ملف الوسائط';
+$lang['btn_subscribe']         = 'اشترك في التعديلات';
+$lang['btn_unsubscribe']       = 'إلغاء الاشتراك في التعديلات';
+$lang['btn_profile']           = 'تحديث الملف الشخصي';
+$lang['btn_reset']             = 'تفريغ';
+$lang['btn_resendpwd']         = 'إرسال كلمة مرور جديدة';
+$lang['btn_draft']             = 'تحرير المسوّدة';
+$lang['btn_recover']           = 'استعادة المسوّدة';
+$lang['btn_draftdel']          = 'حذف المسوّدة';
+$lang['btn_revert']            = 'إعادة';
+$lang['loggedinas']            = 'دخول باسم';
+$lang['user']                  = 'اسم المشترك';
+$lang['pass']                  = 'كلمة المرور';
+$lang['newpass']               = 'كلمة مرور جديدة';
+$lang['oldpass']               = 'تأكيد كلمة المرور الحالية';
+$lang['passchk']               = 'مرة أخرى';
+$lang['remember']              = 'تذكرني';
+$lang['fullname']              = 'الاسم الكامل';
+$lang['email']                 = 'البريد الإلكتروني';
+$lang['register']              = 'تسجيل';
+$lang['profile']               = 'الملف الشخصي';
+$lang['badlogin']              = 'عذرا، اسم المشترك أو كلمة المرور غير صحيحة';
+$lang['minoredit']             = 'تعديلات طفيفة';
+$lang['draftdate']             = 'تشغيل حفظ المسوّدة آلياً';
+$lang['regmissing']            = 'عذرا، يجب ملء جميع الخانات';
+$lang['reguexists']            = 'عذرا، يوجد مشترك بنفس الاسم';
+$lang['regsuccess']            = 'تم تسجيل المشترك و أرسلت كلمة المرور عبر البريد الإلكتروني';
+$lang['regsuccess2']           = 'تم إنشاء المشترك';
+$lang['regmailfail']           = 'حدث خطأ فى إرسال رسالة كلمة المرور. يرجى مراسلة المدير';
+$lang['regbadmail']            = 'البريد الإلكتروني المعطى غير صحيح، إن كنت تظن الخطأ من الموقع راسل المدير';
+$lang['regbadpass']            = 'كلمتى المرور غير متطابقتين، حاول مرة أخرى';
+$lang['regpwmail']             = 'كلمة مرورك إلى دوكي ويكي';
+$lang['reghere']               = 'لست مشتركاً؟ تفضل اشترك';
+$lang['profna']                = 'هذه الويكي لا تدعم تعديل الملف الشخصي';
+$lang['profnochange']          = 'لا تغييرات، لا شيء مطلوب عمله';
+$lang['profnoempty']           = 'ليس مسموحاً ترك الاسم أو البريد الإلكتروني فارغاً';
+$lang['profchanged']           = 'تم تحديث الملف الشخصي بنجاح';
+$lang['pwdforget']             = 'نسيت كلمة المرور؟ احصل على واحدة جديدة';
+$lang['resendna']              = 'هذه الويكي لا تدعم إعادة إرسال كلمة المرور';
+$lang['resendpwd']             = 'إرسال كلمة المرور إلى';
+$lang['resendpwdmissing']      = 'عذراّ، يجب أن تملأ جميع الخانات';
+$lang['resendpwdnouser']       = 'عذراً، لدينا هذا المشترك في قاعدة بياناتنا';
+$lang['resendpwdbadauth']      = 'عذراً، رمز التفعيل هذا غير صحيح. نأكد أنك استخدمت كامل وصلة التأكيد';
+$lang['resendpwdconfirm']      = 'تم إرسال وصلة تأكيد إلى بريدك الإلكتروني';
+$lang['resendpwdsuccess']      = 'كلمة مرورك الجديدة تم إرسالها عبر البريد الإلكتروني';
+$lang['searchmedia']           = 'البحث عن اسم الملف : ';
+$lang['txt_upload']            = 'اختر ملفاً للتحميل';
+$lang['txt_filename']          = 'تحميل باسم - اختياري';
+$lang['txt_overwrt']           = 'الكتابة على ملف موجود بنفس الاسم مسموحة';
+$lang['lockedby']              = 'حالياً مقفول بواسطة';
+$lang['lockexpire']            = 'سينتهي القفل في';
+$lang['willexpire']            = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة. لتجنب التعارض استخدم زر استعراض لبدأ القفل من جديد';
+$lang['notsavedyet']           = 'التعديلات التي لم تحفظ ستفقد. أموافق ؟';
+$lang['rssfailed']             = 'خطأ ما حدث أثناء جلب ملف التغذية:';
+$lang['nothingfound']          = 'لا يوجد شيء';
+$lang['mediaselect']           = 'ملفات الوسائط المتعددة';
+$lang['fileupload']            = 'تحميل ملف وسائط متعددة';
+$lang['uploadsucc']            = 'تم التحميل بنجاح';
+$lang['uploadfail']            = 'فشل التحميل، قد يكون الخطأ فى التراخيص؟';
+$lang['uploadwrong']           = 'التحميل ممنوع، نوع الملف مرفوض!';
+$lang['uploadexist']           = 'الملف موجود أصلاً. لم يحدث شيء';
+$lang['uploadbadcontent']      = 'المحتوى المحمّل لم يتطابق مع نوع الملف %s';
+$lang['uploadspam']            = 'التحميل محجوب بواسطة القائمة السوداء لبرنامج تقفي التطفل';
+$lang['uploadxss']             = 'التحميل محجوب لمنع المحتويات الخبيثة';
+$lang['uploadsize']            = 'الملف الذي تم رفعه كبير جدا . ( الحد الأقصى %s )';
+$lang['deletesucc']            = 'تم حذف الملف "%s"';
+$lang['deletefail']            = 'لا يمكن حذف "%s"، تأكد من تراخيصك';
+$lang['mediainuse']            = 'لم يحذف الملف "%s"، مازال موجوداً';
+$lang['namespaces']            = 'فضاء التسمية';
+$lang['mediafiles']            = 'ملفات موجودة في';
+$lang['js']['searchmedia']     = 'البحث عن الملفات';
+$lang['js']['keepopen']        = 'أبقي النافذة مفتوحة أثناء الاختيار';
+$lang['js']['hidedetails']     = 'إخفاء التفاصيل';
+$lang['js']['nosmblinks']      = 'الروابط لمجلدات ويندوز المشاركة تعمل فقط مع متصفح مايكروسفت Internet Explorer.  ما زال بإمكانك قص و لصق الرابط.';
+$lang['js']['linkto']          = 'الرابط إلى :';
+$lang['js']['del_confirm']     = 'هل حقاً تريد حذف البنود المختارة؟';
+$lang['js']['mu_btn']          = 'رفع عدة ملفات في وقت واحد';
+$lang['mediausage']            = 'استخدم هذه الصياغة للدلالة على هذا الملف:';
+$lang['mediaview']             = 'عرض الملف الأصلي';
+$lang['mediaroot']             = 'الجذر';
+$lang['mediaupload']           = 'تحميل ملف إلى فضاء التسمية هنا. لإنشاء فضاءات تسمية فرعية، أضفها إلى بداية خانة تحميل باسم وافصل بينها باستخدام الفواصل';
+$lang['mediaextchange']        = 'تم تغيير نوع الملف من .%s إلى .%s!';
+$lang['reference']             = 'مراجع لـ';
+$lang['ref_inuse']             = 'لا يمكن حذف الملف، لأنه مستخدم من قبل الصفحات التالية:';
+$lang['ref_hidden']            = 'بعض المراجع لصفاحات لا تملك ترخيص برؤيتها';
+$lang['hits']                  = 'زوار';
+$lang['quickhits']             = 'صفحات بهذا الاسم';
+$lang['toc']                   = 'جدول المحتويات';
+$lang['current']               = 'حالي';
+$lang['yours']                 = 'نسختك';
+$lang['diff']                  = 'مقارنة بالنسخة الحالية';
+$lang['diff2']                 = 'مقارنة بين النسخ المختارة';
+$lang['line']                  = 'سطر';
+$lang['breadcrumb']            = 'أثر';
+$lang['youarehere']            = 'أنت هنا';
+$lang['lastmod']               = 'آخر تعديل';
+$lang['by']                    = 'بواسطة';
+$lang['deleted']               = 'تم حذف';
+$lang['created']               = 'تم إنشاء';
+$lang['restored']              = 'عودة لنسخة قديمة';
+$lang['external_edit']         = 'تحرير خارجي';
+$lang['summary']               = 'ملخص التحرير';
+$lang['mail_newpage']          = 'إضافة صفحة:';
+$lang['mail_changed']          = 'تعديل صفحة:';
+$lang['mail_new_user']         = 'مشترك جديد';
+$lang['mail_upload']           = 'تحميل ملف:';
+$lang['qb_bold']               = 'نص عريض';
+$lang['qb_italic']             = 'نص مائل';
+$lang['qb_underl']             = 'نص مسطر';
+$lang['qb_code']               = 'نص برمجي';
+$lang['qb_strike']             = 'نص مشطوب';
+$lang['qb_h1']                 = 'عنوان مستوى أول';
+$lang['qb_h2']                 = 'عنوان مستوى ثاني';
+$lang['qb_h3']                 = 'عنوان مستوى ثالث';
+$lang['qb_h4']                 = 'عنوان مستوى رابع';
+$lang['qb_h5']                 = 'عنوان مستوى خامس';
+$lang['qb_link']               = 'رابط داخلي';
+$lang['qb_extlink']            = 'رابط خارجي';
+$lang['qb_hr']                 = 'سطر أفقي';
+$lang['qb_ol']                 = 'بند فى قائمة مرتبة';
+$lang['qb_ul']                 = 'بند فى قائمة غير مرتبة';
+$lang['qb_media']              = 'إضافة صور و ملفات أخرى';
+$lang['qb_sig']                = 'أضف توقيعك';
+$lang['qb_smileys']            = 'الابتسامات';
+$lang['qb_chars']              = 'محارف خاصة';
+$lang['admin_register']        = 'إضافة مشترك جديد';
+$lang['metaedit']              = 'تحرير البيانات الشمولية ';
+$lang['metasaveerr']           = 'فشلت عملية كتابة البيانات الشمولية';
+$lang['metasaveok']            = 'تم حفظ البيانت الشمولية';
+$lang['img_backto']            = 'العودة إلى';
+$lang['img_title']             = 'العنوان';
+$lang['img_caption']           = 'تنويه الصورة';
+$lang['img_date']              = 'التاريخ';
+$lang['img_fname']             = 'اسم الملف';
+$lang['img_fsize']             = 'الحجم';
+$lang['img_artist']            = 'المصور';
+$lang['img_copyr']             = 'حقوق النسخ';
+$lang['img_format']            = 'صيغ رسومية';
+$lang['img_camera']            = 'آلة التصوير';
+$lang['img_keywords']          = 'كلمات مفتاحية';
+$lang['subscribe_success']     = 'تم إضافة %s لقائمة الاشتراكات %s';
+$lang['subscribe_error']       = 'حدث خطأ فى إضافة %s لقائمة الاشتراكات %s';
+$lang['subscribe_noaddress']   = 'لا يوجد عنوان مرفق مع بيانات تسجيلك، لا يمكن إضافتك إلى قائمة الاشتراكات';
+$lang['unsubscribe_success']   = 'تم حذف%s من قائمة الاشتراكات %s';
+$lang['unsubscribe_error']     = 'حدث خطأ فى حذف %s من قائمة الاشتراكات %s';
+$lang['authmodfailed']         = 'إعدادات تصريح فاسدة، يرجى مراسلة المدير.';
+$lang['authtempfail']          = 'تصريح المشترك غير متوفر مؤقتاً، إن استمرت هذه الحالة يرجى مراسلة المدير';
+$lang['i_chooselang']          = 'اختر لغتك';
+$lang['i_installer']           = 'برنامج تنصيب دوكي ويكي';
+$lang['i_wikiname']            = 'اسم الويكي';
+$lang['i_enableacl']           = 'تفعيل ACL - مفضل';
+$lang['i_superuser']           = 'مشرف';
+$lang['i_problems']            = 'وجد برنامج التنصيب المشاكل التالية، لا يمكنك المتابعة قبل حلها.';
+$lang['i_modified']            = 'لأسباب أمنية هذا البرنامج سيعمل فقط مع تنصيب دوكي ويكي جديد و غير معدّل.
+يجب أن تعيد فك ضغط الملفات مرة أخرى من المكتبة المضغوطة، أو راجع <a href="http://dokuwiki.org/install"> تعليمات تنصيب دوكي ويكي </a> ';
+$lang['i_funcna']              = 'دالة PHP التالية غير متوفرة.
+<code>%s</code>
+قد يكون مزود خدمة الاستفادة قد حجبها لسبب ما.';
+$lang['i_phpver']              = 'نسخة PHP التي لديك هي
+<code>%s</code>
+وهي أقل من النسخة المطلوبة
+<code>%s</code>
+عليك تحديث نسخة PHP';
+$lang['i_permfail']            = 'إن <code>%s</code> غير قابل للكتابة بواسطة دوكي ويكي، عليك تعديل إعدادات الصلاحيات لهذا المجلد!';
+$lang['i_confexists']          = 'إن <code>%s</code> موجود أصلاً';
+$lang['i_writeerr']            = 'لا يمكن إنشاء <code>%s</code>، عليك التأكد من صلاحيات الملف أو المجلد وإنشاء الملف يدوياً.';
+$lang['i_badhash']             = 'الملف dokuwiki.php غير مصنف أو قد تم تعديله
+(hash=<code>%s</code>)';
+$lang['i_badval']              = 'القيمة <code>%s</code> غير شرعية أو فارغة';
+$lang['i_success']             = 'الإعدادات تمت بنجاح، يرجى حذف الملف install.php الآن.
+ثم تابع إلى <a href="doku.php"> دوكي ويكي الجديدة</a>';
+$lang['i_failure']             = 'بعض الأخطاء حدثت أثنا كتابة ملفات الإعدادات، عليك تعديلها يدوياً قبل أن تستطيع استخدام <a href="doku.php"> دوكي ويكي الجديدة</a>';
+$lang['i_policy']              = 'تصريح ACL مبدئي';
+$lang['i_pol0']                = 'ويكي مفتوحة؛ أي القراءة والكتابة والتحميل مسموحة للجميع';
+$lang['i_pol1']                = 'ويكي عامة؛ أي القراءة للجميع ولكن الكتابة والتحميل للمشتركين المسجلين فقط';
+$lang['i_pol2']                = 'ويكي مغلقة؛ أي القراءة والكتابة والتحميل للمشتركين المسجلين فقط';
+$lang['i_retry']               = 'إعادة المحاولة';
+$lang['mu_gridname']           = 'اسم الملف';
+$lang['mu_gridsize']           = 'الحجم';
+$lang['mu_gridstat']           = 'الحالة';
+$lang['mu_toobig']             = 'كبير جدا';
+$lang['mu_ready']              = 'جاهز للرفع';
+$lang['mu_done']               = 'اكتمل';
+$lang['mu_fail']               = 'فشل';
+$lang['mu_info']               = 'تم رفع الملفات';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/locked.txt
new file mode 100644
index 000000000..72e9be535
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/locked.txt
@@ -0,0 +1,3 @@
+====== الصفحة مقفلة ======
+
+هذه الصفحة مقفلة للتحرير بواسطة مستخدم أخر. عليك أن تنتظر حتى ينتهى من تعديلاتة أو تتنتهى مدة القفل.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/login.txt
new file mode 100644
index 000000000..00ffccdd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/login.txt
@@ -0,0 +1,3 @@
+====== دخول ======
+
+أنت لست مسجل دخولك. أدخل بيانات تسجيلك للدخول. يجب أن يكون مسموح للمتصفح بأستخدام الكوكي.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/mailtext.txt
new file mode 100644
index 000000000..541d28da2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/mailtext.txt
@@ -0,0 +1,17 @@
+تم تغيير أو أضافة صفحة فى دوكيويكي. اليك التفاصيل:
+
+التاريخ        : @DATE@
+المتصفح     : @BROWSER@
+عنوان الـIP  : @IPADDRESS@
+أسم الجهاز    : @HOSTNAME@
+النسخة القديمة: @OLDPAGE@
+النسخة الجديدة: @NEWPAGE@
+ملخص التحرير: @SUMMARY@
+مستخدم        : @USER@
+
+@DIFF@
+
+
+-- 
+تم أرسال هذه الرسالة من الدوكيويكي المتوجدة فى
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/newpage.txt
new file mode 100644
index 000000000..ecaa7fa38
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/newpage.txt
@@ -0,0 +1,3 @@
+====== لا يوجد هذا الموضوع بعد ======
+
+لقد تابعت رابط لموضوع غير متواجد بعد. يمكنك إنشائة بالضعط على زر "انشيء هذه الصفحة".
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/norev.txt
new file mode 100644
index 000000000..2aa2330e1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/norev.txt
@@ -0,0 +1,3 @@
+====== لا توجد تلك النسخة ======
+
+النسخة المختارة ليست موجودة. أسبخدم زر "نسخ قديمة" لعرض قائمة بالنسخ القديمة من هذه الصفحة.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/preview.txt
new file mode 100644
index 000000000..c537e6b26
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/preview.txt
@@ -0,0 +1,3 @@
+====== عرض التعديلات ======
+
+هذا عرض لما سيصبح علية نص الصفحة. تذكر أن التعديلات **لم تحفظ** بعد!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/pwconfirm.txt
new file mode 100644
index 000000000..6b735e291
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/pwconfirm.txt
@@ -0,0 +1,8 @@
+مرحبا @ الاسم الكامل @
+
+شخص ما طلب كلمة سر جديدة لـحسابك @ المعرف @ في @ DOKUWIURL @
+إذا لم تكن قد طلبت كلمة سر جديدة رجاء قم بتجاهل هذه الرسالة .
+لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط في الأسفل . 
+@ التأكيد @ 
+ -- 
+لقد تم عمل هذه الرسالة من قبل DokuWiki .. في @ DOKUWIKIURL @
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/read.txt
new file mode 100644
index 000000000..3e6c504ff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/read.txt
@@ -0,0 +1 @@
+هذه الصفحة للقراءة فقط. يمكنك تصفح مصدرها، ولكن لا يمكنك تعديلها. إن كنت تتعتفد أن هناك خطأ ما خاطب المدير.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/recent.txt
new file mode 100644
index 000000000..94d68401e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/recent.txt
@@ -0,0 +1,3 @@
+====== احدث التغييرات ======
+
+تم تعديل الصفحات التالية حديثا.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/register.txt
new file mode 100644
index 000000000..57406ddd4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/register.txt
@@ -0,0 +1,3 @@
+====== سجل كمستخدم جديد ======
+
+أملئ البيانات التالية لتسجيل حساب جديد على الويكي. تأكد من كتابة **بريد إلكترونى صحيح** - سترسل اليك كلمة سر جديدة. أسم الدخول يجب أن يكون [[doku>pagename|أسم صفحة]] صحيح.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/resendpwd.txt
new file mode 100644
index 000000000..e9f6690ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/resendpwd.txt
@@ -0,0 +1,3 @@
+==== إرسال رقم سري جديد ====
+
+رجاء اكتب اسم المستخدم في الاستمارة الموجودة في الأسفل ليتم طلب رقم سري جديد لحسابك في هذا الويكي . سيتم إرسال رابط لتأكيد طلبك إلى بريدك الإلكتروني المسجل .
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/revisions.txt
new file mode 100644
index 000000000..930a4ef5c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/revisions.txt
@@ -0,0 +1,2 @@
+====== النسخ القديمة ======
+النسخ القديمة للصفحة الحالية. لإستعادة نسخة قديمة: أخترها من المعروض، ثم إضغط على زر "عدل هذه الصفحة" و أحفظها.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/searchpage.txt
new file mode 100644
index 000000000..62c05f5e4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/searchpage.txt
@@ -0,0 +1,5 @@
+====== بحث ======
+
+نتائج البحث . إن لم تجد ما تبحث عنه، يمكنك إنشاء صفحة جديدة بعنوان ما تبحث عنة بالضغط على زر "حرر هذه الصفحة".
+
+===== نتائج البحث =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/showrev.txt
new file mode 100644
index 000000000..30129071c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/showrev.txt
@@ -0,0 +1,2 @@
+**هذه نسخة قديمة من الصفحة!**
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/stopwords.txt
new file mode 100644
index 000000000..bc6eb48ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/stopwords.txt
@@ -0,0 +1,29 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/subscribermail.txt
new file mode 100644
index 000000000..c9894570e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/subscribermail.txt
@@ -0,0 +1,17 @@
+أهلاً!
+
+الصفحة @PAGE@ فى @TITLE@ ويكي تم تعديلها.
+ها هى التعديلات:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+لإلغاء إشتراكك فى تلك الصفحة أدخل على الويكي على العنوان
+@DOKUWIKIURL@ ثم أذهب الى
+@NEWPAGE@
+و أختار 'إلغاء أشتراكك'.
+
+-- 
+تم ارسال هذه الرسالة من دوكيويكي
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/updateprofile.txt
new file mode 100644
index 000000000..04a5a09d5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ar/updateprofile.txt
@@ -0,0 +1,3 @@
+==== تحديث بيانات حسابك ====
+
+عليك فقط أن تكمل كتابة الحقول التي تريد أن تغيرها . لا تستطيع تغيير اسم المستخدم .
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/admin.txt
new file mode 100644
index 000000000..8d16f68aa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/admin.txt
@@ -0,0 +1,3 @@
+====== Администрация ======
+
+Долу може да намерите списък с администраторски задачи в DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/adminplugins.txt
new file mode 100644
index 000000000..2b0268ed4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/adminplugins.txt
@@ -0,0 +1 @@
+===== Допълнителни Plugins =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/backlinks.txt
new file mode 100644
index 000000000..28801a8ee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/backlinks.txt
@@ -0,0 +1,3 @@
+====== Задни връзки ======
+
+Това е списък на страници, които изглежда препращат обратно към текущата страница.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/conflict.txt
new file mode 100644
index 000000000..51ec4b706
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/conflict.txt
@@ -0,0 +1,6 @@
+====== По-нова версия съшествува ======
+
+По-нова версия на документа който сте редактирали съществува. Това се случва когато друг потребител е променил документа докато сте го редактирали.
+
+Разгледайте внимателно разгледайте разликите показани долу, след това решете коя версия да запазите. Ако изберете ''Запис'', версия Ви ще бъде запазена. Изберете ''Отказ'', за да запазите текущата версия.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/denied.txt
new file mode 100644
index 000000000..7b1d5788e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/denied.txt
@@ -0,0 +1,4 @@
+====== Отказан достъп ======
+
+Нямате достатъчно права да продължите. Може би сте забравили да влезете?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/diff.txt
new file mode 100644
index 000000000..2bd8262c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/diff.txt
@@ -0,0 +1,4 @@
+====== Разлики ======
+
+Тук са показани разликите между избраната версия на страницата и текущата.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/draft.txt
new file mode 100644
index 000000000..1938e7d9c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/draft.txt
@@ -0,0 +1,6 @@
+====== Намерена чернова ======
+
+Последната редакционна сесия на тази страница не е завършена правилно. Dokuwiki автоматично запазва чернова по време на работа, която може сега да използвате, за да продължите редактирането си. Долу може да видите данните, които бяха запазени от последната сесия.
+
+Моля решете, дали искате да //recover// последната си редакционна сесия, да //delete// автоматично запазената чернова или да //cancel// редакцията.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/edit.txt
new file mode 100644
index 000000000..90d376dbc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/edit.txt
@@ -0,0 +1,2 @@
+Редактирайте страницата и натиснете ''Запис''. Погледнете [[wiki:syntax]] за Wiki синтаксис. Моля редактирайте страницата, само ако може да я **подобрите**. Ако искате да пробвате разни неща, научете се да правите първите си стъпки в [[playground:playground|пясъчника]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/editrev.txt
new file mode 100644
index 000000000..87e7b26a8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/editrev.txt
@@ -0,0 +1,2 @@
+**Заредили сте стара версия на документа!** Ако я запазите, ще създадете нова редакция с текущите данни.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/index.txt
new file mode 100644
index 000000000..2ebf5128a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/index.txt
@@ -0,0 +1,4 @@
+====== Индекс ======
+
+Това е списък на всички достъпни страници подредени по [[doku>namespaces|именни пространства]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/install.html
new file mode 100644
index 000000000..0d7fd5232
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/install.html
@@ -0,0 +1,25 @@
+<p>Тази страница помага при първоначална инсталация и настройка на
+<a href="http://dokuwiki.org">Dokuwiki</a>.  Повече информация 
+за този инсталатор е достъпна в неговата собствена 
+<a href="http://dokuwiki.org/installer">документация</a>.</p>
+
+<p>Dokuwiki използва обикновени файлове за хранилище на уики страниците и друга 
+информация свързана с тези страници(примерно картинки, търсене, стари версии, т.н.).
+За да използвате успешно DokuWiki 
+<strong>трябва</strong> да имате достъп за писане в директориите които съдържат тези
+файлове. Този инсталатор няма възможности да настройва правата на директориите. 
+Това обикновено трябва да бъде направено директно от командният ред или ако 
+използвате хостинг - през FTP или контрол панела на хоста(примерно cPanel).</p>
+
+<p>Този инсталатор ще настрои вашата DokuWiki конфигурация за
+<acronym title="access control list">ACL</acronym>, което на 
+свой ред ще позволи на администратора да влезе и да има достъп 
+до администраторското меню в DokuWiki за инсталиране на плъгини, контрол 
+на потребители, управление да достъп до уики страници и промяна на настройките
+Това не е необходимо на DokuWiki да работи, но ще направи DokuWiki по-лесно за 
+администриране.</p>
+
+<p>Опитните потребители или потребителите със специални изисквания 
+към настройките може да използват тези връзки за детайли свързани с
+<a href="http://dokuwiki.org/install">инструкции за инсталация</a>
+и <a href="http://dokuwiki.org/config">настройка</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/lang.php
new file mode 100644
index 000000000..2c306095d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/lang.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Bulgarian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
+ * @author Viktor Usunov <usun0v@mail.bg>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Редактиране';
+$lang['btn_source']            = 'Показване на кода на страницата';
+$lang['btn_show']              = 'Показване на страница';
+$lang['btn_create']            = 'Създаване на страница';
+$lang['btn_search']            = 'Търсене';
+$lang['btn_save']              = 'Запис';
+$lang['btn_preview']           = 'Преглед';
+$lang['btn_top']               = 'Към началото';
+$lang['btn_newer']             = '<< по-нови';
+$lang['btn_older']             = 'по-стари >>';
+$lang['btn_revs']              = 'История';
+$lang['btn_recent']            = 'Последни промени';
+$lang['btn_upload']            = 'Качване';
+$lang['btn_cancel']            = 'Отказ';
+$lang['btn_index']             = 'Индекс';
+$lang['btn_secedit']           = 'Редактиране';
+$lang['btn_login']             = 'Вход';
+$lang['btn_logout']            = 'Изход';
+$lang['btn_admin']             = 'Настройки';
+$lang['btn_update']            = 'Обновяване';
+$lang['btn_delete']            = 'Изтриване';
+$lang['btn_back']              = 'Назад';
+$lang['btn_backlink']          = 'Обратни връзки';
+$lang['btn_backtomedia']       = 'Назад към избор на медиен файл';
+$lang['btn_subscribe']         = 'Абониране за Промени';
+$lang['btn_unsubscribe']       = 'Отписване от Промени';
+$lang['btn_subscribens']       = 'Абониране за Промени на именно пространство';
+$lang['btn_unsubscribens']     = 'Отписване от Промени на именно пространство';
+$lang['btn_profile']           = 'Актуализирай Профила';
+$lang['btn_reset']             = 'Изчистване';
+$lang['btn_resendpwd']         = 'Пращане на нова парола';
+$lang['btn_draft']             = 'Редактиране на чернова';
+$lang['btn_recover']           = 'Възстановяване на чернова';
+$lang['btn_draftdel']          = 'Изтриване на чернова';
+$lang['btn_revert']            = 'Възстановяване';
+$lang['loggedinas']            = 'Влезли сте като';
+$lang['user']                  = 'Потребител';
+$lang['pass']                  = 'Парола';
+$lang['newpass']               = 'Нова парола';
+$lang['oldpass']               = 'Потвърждение на текуща парола';
+$lang['passchk']               = 'oтново';
+$lang['remember']              = 'Запомни ме';
+$lang['fullname']              = 'Пълно име';
+$lang['email']                 = 'Електронна поща';
+$lang['register']              = 'Регистрация';
+$lang['profile']               = 'Потребителски профил';
+$lang['badlogin']              = 'Потребителското име или паролата са грешни';
+$lang['minoredit']             = 'Незначителни промени';
+$lang['draftdate']             = 'Черновата бе автоматично записана на';
+$lang['nosecedit']             = 'Страницата бе междувременно променена, презареждане на страницата поради неактуална информация.';
+$lang['regmissing']            = 'Моля, попълнете всички полета.';
+$lang['reguexists']            = 'Потребител с такова име вече съществува.';
+$lang['regsuccess']            = 'Потребителят бе създаден и паролата бе пратена на електронната поща.';
+$lang['regsuccess2']           = 'Потребителят бе създаден.';
+$lang['regmailfail']           = 'Изглежда, че има проблем с пращането на писмото с паролата. Моля, свържете се с администратора.';
+$lang['regbadmail']            = 'Въведеният адрес изглежда невалиден - ако мислите, че това е грешка, свържете се с администратора.';
+$lang['regbadpass']            = 'Двете въведени пароли не съвпадат, моля опитайте отново';
+$lang['regpwmail']             = 'Парола за DokuWiki';
+$lang['reghere']               = 'Нямате профил все още? Направете си!';
+$lang['profna']                = 'Това Wiki не поддържа промяна на профила';
+$lang['profnochange']          = 'Няма промени.';
+$lang['profnoempty']           = 'Невъведено име или електронна поща не са позволени.';
+$lang['profchanged']           = 'Потребителският профил бе успешно обновен.';
+$lang['pwdforget']             = 'Забравили сте си паролата? Въведете нова.';
+$lang['resendna']              = 'Това Wiki не поддържа повторно пращане на парола';
+$lang['resendpwd']             = 'Изпращане на нова парола за';
+$lang['resendpwdmissing']      = 'Моля, попълнете всички полета.';
+$lang['resendpwdnouser']       = 'Потребителят не бе намерен в базата данни.';
+$lang['resendpwdbadauth']      = 'Този код за потвърждение е невалиден. Проверете дали сте използвали целият линк за потвърждение.';
+$lang['resendpwdconfirm']      = 'Адресът за потвърждение бе пратен по електронната поща.';
+$lang['resendpwdsuccess']      = 'Паролата ви бе изпратена на електронната поща.';
+$lang['license']               = 'Освен ако не е посочено друго, съдържанието на това Wiki е лицензирано под следния лиценз:';
+$lang['licenseok']             = 'Имайте предвид, че чрез редактирането на тази страница, Вие се съгласявате съдържанието й да бъде лицензирано под следния лиценз:';
+$lang['searchmedia']           = 'Търсене на файл: ';
+$lang['searchmedia_in']        = 'Търсене в %s';
+$lang['txt_upload']            = 'Изберете файл за качване ';
+$lang['txt_filename']          = 'Качване като (по избор)';
+$lang['txt_overwrt']           = 'Запис върху съществуващ файл';
+$lang['lockedby']              = 'В момента е заключено от';
+$lang['lockexpire']            = 'Затварянето изтича в';
+$lang['willexpire']            = 'Затварянето на страницата за редактиране изтича след минута.\nЗа да избегнете противоречия, използвайте бутона, за да рестартирате броячът за затваряне.';
+$lang['notsavedyet']           = 'Незапазените промени ще бъдат загубени.\nИскате ли да продължите?';
+$lang['rssfailed']             = 'Възникна грешка при вземането на този feed: ';
+$lang['nothingfound']          = 'Нищо не бе намерено.';
+$lang['mediaselect']           = 'Медийни файлове';
+$lang['fileupload']            = 'Качване на медийни файлове';
+$lang['uploadsucc']            = 'Качването бе успешно';
+$lang['uploadfail']            = 'Качването бе неуспешно. Може би поради грешни права?';
+$lang['uploadwrong']           = 'Качването бе отказано. Това файлово разширение е забранено!';
+$lang['uploadexist']           = 'Файлът вече съществува. Нищо не бе направено.';
+$lang['uploadbadcontent']      = 'Каченото съдържание на съответства на файлово разширение %s .';
+$lang['uploadspam']            = 'Качването бе блокирано от спам списъка.';
+$lang['uploadxss']             = 'Качването бе блокирано, заради възможно обидно съдържание.';
+$lang['uploadsize']            = 'Файльт за качване бе прекалено голям. (макс. %s)';
+$lang['deletesucc']            = 'Файлът "%s" бе изтрит.';
+$lang['deletefail']            = '"%s" не бе изтрит, проверете правата';
+$lang['mediainuse']            = 'Файлът "%s" не бе изтрит - все още се ползва.';
+$lang['namespaces']            = 'Именни пространства';
+$lang['mediafiles']            = 'Достъпни файлове в';
+$lang['js']['searchmedia']     = 'Търси файлове';
+$lang['js']['keepopen']        = 'Задържане на прозореца отворен при избор';
+$lang['js']['hidedetails']     = 'Скрий детайлите';
+$lang['js']['nosmblinks']      = 'Връзките към Windows shares работят само под Internet Explorer.
+Можете да копирате и поставите връзката.';
+$lang['js']['linkwiz']         = 'Линк съветник';
+$lang['js']['linkto']          = 'Линк към: ';
+$lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
+$lang['js']['mu_btn']          = 'Качване на няколко файла наведнъж';
+$lang['mediausage']            = 'Използвайте следният синтакс, за да упоменете файла:';
+$lang['mediaview']             = 'Преглед на оригиналния файл';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Качете файл в текущото именнопространство тук. За да създадете подименни пространства, добавете ги в началото на "Качи като" име на файл, разделени с двоеточие.';
+$lang['mediaextchange']        = 'Разширението на файла бе сменено от .%s на .%s!';
+$lang['reference']             = 'Референции за';
+$lang['ref_inuse']             = 'Файлът не може да бъде изтрит, защото все още се ползва от следните страници:';
+$lang['ref_hidden']            = 'Някои препратки са към страници, които нямате права да четете';
+$lang['hits']                  = 'Съвпадения';
+$lang['quickhits']             = 'Съвпадащи имена на страници';
+$lang['toc']                   = 'Съдържание';
+$lang['current']               = 'текущо';
+$lang['yours']                 = 'Вашата версия';
+$lang['diff']                  = 'Преглед на разликите с текущата версия';
+$lang['diff2']                 = 'Показване на разликите между избрани преработки';
+$lang['line']                  = 'Ред';
+$lang['breadcrumb']            = 'Следа';
+$lang['youarehere']            = 'Намирате се в';
+$lang['lastmod']               = 'Последна промяна';
+$lang['by']                    = 'от';
+$lang['deleted']               = 'изтриване';
+$lang['created']               = 'създаване';
+$lang['restored']              = 'възстановена предишна версия';
+$lang['external_edit']         = 'външна редакция';
+$lang['summary']               = 'Обобщение';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> е необходим за показване на съдържанието.';
+$lang['download']              = 'Изтегляне на фрагмент';
+$lang['mail_newpage']          = 'добавена страница:';
+$lang['mail_changed']          = 'променена страница:';
+$lang['mail_new_user']         = 'нов потребител:';
+$lang['mail_upload']           = 'качен файл: ';
+$lang['qb_bold']               = 'Удебелен текст';
+$lang['qb_italic']             = 'Курсив текст';
+$lang['qb_underl']             = 'Подчертан текст';
+$lang['qb_code']               = 'Код';
+$lang['qb_strike']             = 'Зачеркнат текст';
+$lang['qb_h1']                 = 'Заглавие ниво 1';
+$lang['qb_h2']                 = 'Заглавие ниво 2';
+$lang['qb_h3']                 = 'Заглавие ниво 3';
+$lang['qb_h4']                 = 'Заглавие ниво 4';
+$lang['qb_h5']                 = 'Заглавие ниво 5';
+$lang['qb_h']                  = 'Заглавие';
+$lang['qb_hs']                 = 'Избери заглавие';
+$lang['qb_hplus']              = 'Основно заглавие';
+$lang['qb_hminus']             = 'Подзаглавие';
+$lang['qb_hequal']             = 'Заглавие на същото ниво';
+$lang['qb_link']               = 'Вътрешна препратка';
+$lang['qb_extlink']            = 'Външна препратка';
+$lang['qb_hr']                 = 'Хоризонтална линия';
+$lang['qb_ol']                 = 'Подреден списък';
+$lang['qb_ul']                 = 'Неподреден списък';
+$lang['qb_media']              = 'Добавяне на изображения и други файлове';
+$lang['qb_sig']                = 'Вмъкване на подпис';
+$lang['qb_smileys']            = 'Усмивчици';
+$lang['qb_chars']              = 'Специални знаци';
+$lang['upperns']               = 'Към свьрзано именно пространство';
+$lang['admin_register']        = 'Добабяне на нов потребител';
+$lang['metaedit']              = 'Редактиране на метаданни';
+$lang['metasaveerr']           = 'Запазването на метаданните бе неуспешно';
+$lang['metasaveok']            = 'Метаданните бяха запазени';
+$lang['img_backto']            = 'Назад към';
+$lang['img_title']             = 'Заглавие';
+$lang['img_caption']           = 'Надпис';
+$lang['img_date']              = 'Дата';
+$lang['img_fname']             = 'Име на файл';
+$lang['img_fsize']             = 'Размер';
+$lang['img_artist']            = 'Заснет от';
+$lang['img_copyr']             = 'Авторско право';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Фотоапарат';
+$lang['img_keywords']          = 'Ключови думи';
+$lang['subscribe_success']     = '%s бе добавен към абонамента за %s';
+$lang['subscribe_error']       = 'Имаше грешка при добавянето на абонамента на %s за %s';
+$lang['subscribe_noaddress']   = 'Няма адрес свързан с потребителя, не може да се абонирате';
+$lang['unsubscribe_success']   = 'Абонаментът %s бе премахнат от списъка за %s';
+$lang['unsubscribe_error']     = 'Имаше грешка при премахването на абонамента на %s от списъка %s';
+$lang['authmodfailed']         = 'Лоша настройка за удостоверяване на потребителя. Моля, уведомете администратора.';
+$lang['authtempfail']          = 'Удостоверяването на потребителите е временно недостъпно. Ако това продължи дълго, моля уведомете администратора.';
+$lang['i_chooselang']          = 'Избор на език';
+$lang['i_installer']           = 'Инсталатор на DokuWiki';
+$lang['i_wikiname']            = 'Име на Wiki';
+$lang['i_enableacl']           = 'Включване на списъци за достъп ACL (препоръчително)';
+$lang['i_superuser']           = 'Супер потребител';
+$lang['i_problems']            = 'Инсталатора намери проблеми указани по-долу. Не може да продължите, докато не ги отстраните.';
+$lang['i_modified']            = 'Поради мерки за сигурност този скрипт ще работи само с нова и непроменена Dokuwiki инсталация. Трябва да разархивирате отново файловете от дръпнатия пакет или да се посъветвате с пълните <a href="http://dokuwiki.org/install">Инструкции за инсталация на Dokuwiki</a>.';
+$lang['i_funcna']              = 'PHP функцията <code>%s</code> не е достъпна. Може би е забранена от доставчика на хостинг.';
+$lang['i_phpver']              = 'Вашата PHP версия <code>%s</code> е по-стара от необходимата <code>%s</code>. Обновете PHP инсталацията си.';
+$lang['i_permfail']            = '<code>%s</code> не е достъпна за писане от DokuWiki. Трябва да промените настройките за достъп до директорията!';
+$lang['i_confexists']          = '<code>%s</code> вече съществува';
+$lang['i_writeerr']            = '<code>%s</code> не можа да бъде създаден. Трябва да проверите правата на директорията/файла за достъп и да създадете файл ръчно.';
+$lang['i_badhash']             = 'неразпознат или променен dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - непозволена или празна стойност';
+$lang['i_success']             = 'Настройката приключи успешно. Може да създадете файлът install.php сега. Продължете към
+                        <a href="doku.php">Ново Ви DokuWiki</a>.';
+$lang['i_failure']             = 'Имаше грешки при записа на файловете с настройки. Може да трябва да ги редактирате ръчно. Ползвайте <a href="doku.php">Ново Ви DokuWiki</a>.';
+$lang['i_policy']              = 'Първоначална политика за достъп ACL';
+$lang['i_pol0']                = 'Отворено Wiki (четене, писане, качване от всички)';
+$lang['i_pol1']                = 'Публично Wiki (четене от всички, писане и качване от регистрирани потребители)';
+$lang['i_pol2']                = 'Затворено Wiki (четене, писане, качване само от регистрирани потребители)';
+$lang['i_retry']               = 'Повторен опит';
+$lang['mu_intro']              = 'Тук можете да качите няколко файла наведнъж. Добавете ги към съответните полета и натиснете бутона за качване.
+';
+$lang['mu_gridname']           = 'Име на файл';
+$lang['mu_gridsize']           = 'Големина';
+$lang['mu_gridstat']           = 'Състояние';
+$lang['mu_namespace']          = 'Именно пространство';
+$lang['mu_browse']             = 'Избери';
+$lang['mu_toobig']             = 'прекалено голям';
+$lang['mu_ready']              = 'готов за качване';
+$lang['mu_done']               = 'приключен';
+$lang['mu_fail']               = 'неуспешен';
+$lang['mu_authfail']           = 'сесията изтече';
+$lang['mu_progress']           = '@PCT@% качен';
+$lang['mu_filetypes']          = 'Позволени файлови разширения';
+$lang['mu_info']               = 'качени файлове';
+$lang['mu_lasterr']            = 'Последна грешка:';
+$lang['recent_global']         = 'В момента преглеждате промените в <b>%s</b> именно пространство. Може да прегледате и <a href="%s">промените на цялото Wiki</a>.';
+$lang['years']                 = 'преди %d години';
+$lang['months']                = 'преди %d месеци';
+$lang['weeks']                 = 'преди %d седмици';
+$lang['days']                  = 'преди %d дни';
+$lang['hours']                 = 'преди %d часа';
+$lang['minutes']               = 'преди %d минути';
+$lang['seconds']               = 'преди %d секунди';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/locked.txt
new file mode 100644
index 000000000..0eecc6729
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/locked.txt
@@ -0,0 +1,3 @@
+====== Страницата е затворена ======
+
+В момента страницата е затворена за редакция от друг потребител. Трябва да изчаката докато този потребител приключи или затварянето изтече.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/login.txt
new file mode 100644
index 000000000..b525f08cf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/login.txt
@@ -0,0 +1,3 @@
+====== Вход ======
+
+В момента не сте влезли! Въведете данните си долу, за да го направите. Бисквитките (cookies) трябва да са включени.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/mailtext.txt
new file mode 100644
index 000000000..8c18767e5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/mailtext.txt
@@ -0,0 +1,16 @@
+Страница във DokuWiki бе добавена или променена. Ето детайлите:
+
+Дата        : @DATE@
+Браузър     : @BROWSER@
+IP-адрес    : @IPADDRESS@
+Име на хост : @HOSTNAME@
+Стара версия: @OLDPAGE@
+Нова версия : @NEWPAGE@
+Обобщение   : @SUMMARY@
+Потребител  : @USER@
+
+@DIFF@
+
+
+-- 
+Това писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/newpage.txt
new file mode 100644
index 000000000..fcc1c6257
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/newpage.txt
@@ -0,0 +1,4 @@
+====== Несъществуваща тема ======
+
+Последвали сте връзка към тема, която все още не съществува. Ако правата Ви позволяват, може да я създадете като използвате бутона ''Създаване на страницата''
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/norev.txt
new file mode 100644
index 000000000..0262aef60
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/norev.txt
@@ -0,0 +1,4 @@
+====== Няма такава версия ======
+
+Избраната версия не съществува. Използвайте бутона ''Редакции'' за списък на стари версии на документа.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/preview.txt
new file mode 100644
index 000000000..442f16de2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/preview.txt
@@ -0,0 +1,3 @@
+====== Преглед ======
+
+Ето как ще изглежда текста. Той обаче все още **не е запазен** !
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/pwconfirm.txt
new file mode 100644
index 000000000..1cd64b151
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/pwconfirm.txt
@@ -0,0 +1,14 @@
+Здравейте @FULLNAME@!
+
+Някой е поискал нова парола за потребителя @TITLE@
+на @DOKUWIKIURL@
+
+Ако не сте поискали нова парола, товава просто игнорирайте това писмо.
+
+За да потвърдите, че искането е наистина пратено от вас, моля използвайте
+следния адрес.
+
+@CONFIRM@
+
+-- 
+Това писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/read.txt
new file mode 100644
index 000000000..89e9a9d70
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/read.txt
@@ -0,0 +1,2 @@
+Тази страница е позволена само за четене. Може да разгледате кода, но не и да го променята. Обърнете се съм администратора си, ако мислите, че това е грешно.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/recent.txt
new file mode 100644
index 000000000..262979e34
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/recent.txt
@@ -0,0 +1,4 @@
+====== Последни промени ======
+
+Следните страници са били променени наскоро.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/register.txt
new file mode 100644
index 000000000..74a07cd90
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/register.txt
@@ -0,0 +1,4 @@
+====== Регистрирайте се като нов потребител ======
+
+Моля, попълнете всичката информация долу, за да създадете нов профил в това уики. Бъдете сигурни, че подавате **валиден адрес на електронна поща** - ако не се пита за парола тук, нова ще бъде пратена на този адрес. Потребителското име трябва да бъде валидно [[doku>pagename|име на сраница]]
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/registermail.txt
new file mode 100644
index 000000000..7839b0910
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/registermail.txt
@@ -0,0 +1,13 @@
+Нов потребител беше регистриран. Ето детайлите:
+
+Потребител  : @NEWUSER@
+Пълно име   : @NEWNAME@
+E-поща      : @NEWEMAIL@
+
+Дата        : @DATE@
+Браузър     : @BROWSER@
+IP-адрес    : @IPADDRESS@
+Име на хоста: @HOSTNAME@
+
+-- 
+Това писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/resendpwd.txt
new file mode 100644
index 000000000..7b9b9a027
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Пращане на нова парола ======
+
+Моля, въведете потребителското си име във формуляра долу, за да поискате нова парола за вашият профил в това Wiki. Връзка за потвърждение ще ви бъде пратена на регистрираният в това Wiki адрес на електронна поща.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/revisions.txt
new file mode 100644
index 000000000..295f5f6cc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/revisions.txt
@@ -0,0 +1,4 @@
+====== Стари редакции ======
+
+Това са стари редакции на този документ. За да възстановите стара версия, изберете я долу, натиснете ''Редактиране'' и я запазете.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/searchpage.txt
new file mode 100644
index 000000000..03e019985
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/searchpage.txt
@@ -0,0 +1,5 @@
+====== Търсене ======
+
+Може да намерите резултатите на търсенето долу. Ако не сте намерили каквото сте търсили, може да създадете или редактирате страница кръстена по вашета заявка за търсене със съответният бутон
+
+===== Резултати =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/showrev.txt
new file mode 100644
index 000000000..c0b1709fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/showrev.txt
@@ -0,0 +1,2 @@
+**Това е стара редакция на документа**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/stopwords.txt
new file mode 100644
index 000000000..369f4d789
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/stopwords.txt
@@ -0,0 +1,29 @@
+# Това е списък на думи за игнориране, с една дума на ред
+# Когато редактирате този файл, не забравяйте да използвате UNIX символ за нов ред
+# Не е нужно да включвате думи по-кратки от 3 символа - те са игнорирани така или иначе
+# Този списък се основава на думи намерени на http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/subscribermail.txt
new file mode 100644
index 000000000..51d4f005a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/subscribermail.txt
@@ -0,0 +1,16 @@
+Привет!
+
+Страницата  @PAGE@ в @TITLE@ уиките бе променена.
+Ето промените:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+За да се отпишете от тази страница, влезте в уикито на
+@DOKUWIKIURL@ тогава отидете на
+@NEWPAGE@
+и изберете 'Отписване от промените'.
+
+-- 
+Това писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/updateprofile.txt
new file mode 100644
index 000000000..0a6f15297
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Обновете профила си ======
+
+Трябва само да допълните полетата, които искате да промените. Не може да сменяте потребителското си име.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/uploadmail.txt
new file mode 100644
index 000000000..74f0cdc3e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/uploadmail.txt
@@ -0,0 +1,13 @@
+Бе качен файл на вашето DokuWiki. Ето детайлите
+
+Файл        : @MEDIA@
+Дата        : @DATE@
+Браузeр     : @BROWSER@
+IP-Адрес    : @IPADDRESS@
+Име на хост : @HOSTNAME@
+Размер      : @SIZE@
+MIME Тип    : @MIME@
+Потребител  : @USER@
+
+-- 
+Tова писмо е генерирано от DokuWiki на адрес @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/wordblock.txt
new file mode 100644
index 000000000..1afbae21d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/bg/wordblock.txt
@@ -0,0 +1,3 @@
+====== Блокиран СПАМ ======
+
+Промените ви **не** бяха запазени, защото съдържат една или повече забранени думи. Ако сте се опитали да пуснете спам в уикито и таз хубава! Ако смятате, че това е грешка, свържете се с администратора на това Wiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/admin.txt
new file mode 100644
index 000000000..628948e86
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/admin.txt
@@ -0,0 +1,4 @@
+====== Administració ======
+
+Avall pot trobar una llista de tasques administratives disponibles en DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/adminplugins.txt
new file mode 100644
index 000000000..6c5c4f90d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/adminplugins.txt
@@ -0,0 +1 @@
+===== Plúgins adicionals =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/backlinks.txt
new file mode 100644
index 000000000..06a1106f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/backlinks.txt
@@ -0,0 +1,3 @@
+====== Vínculs remitents ======
+
+Una llista de pàgines que pareixen vincular a la pàgina actual.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/conflict.txt
new file mode 100644
index 000000000..67319612d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/conflict.txt
@@ -0,0 +1,6 @@
+====== Ya existix una versió més nova ======
+
+Existix una versió més nova del document que ha editat. Açò ha passat perque un atre usuari ha modificat el document mentres vosté estava editant-lo.
+
+Estudie be les diferències mostrades avall i decidixca quina versió vol guardar. Si pulsa ''Guardar'' es guardarà la versió que està editant. Pulse ''Cancelar'' per a conservar la versió modificada per l'atre usuari..
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/denied.txt
new file mode 100644
index 000000000..39c45d946
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/denied.txt
@@ -0,0 +1,4 @@
+====== Permís denegat ======
+
+Disculpe, pero no té permís per a continuar. ¿Haurà oblidat iniciar sessió?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/diff.txt
new file mode 100644
index 000000000..2b5c60e1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/diff.txt
@@ -0,0 +1,4 @@
+====== Diferències ======
+
+Ací es mostren les diferències entre dos versions de la pàgina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/draft.txt
new file mode 100644
index 000000000..e7e814a69
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/draft.txt
@@ -0,0 +1,6 @@
+====== Borrador trobat ======
+
+L'última edició d'esta pàgina no es completà correctament. DokuWiki guarda automàticament un borrador que ara pot recuperar per a continuar editant. Avall pot vore la data en que es guardà l'últim borrador.
+
+Per favor, decidixca si vol //recuperar// la sessió que pergué, //borrar// el borrador o //cancelar// esta edició.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/edit.txt
new file mode 100644
index 000000000..e1ca6bf23
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/edit.txt
@@ -0,0 +1,2 @@
+Edite la pàgina i pulse 'Guardar". Consulte la [[wiki:syntax|Sintaxis]] del Wiki. Per favor, edite la pàgina només **si pot millorar-la**. Si vol fer proves, deprenga a utilisar el Wiki en el [[playground:playground|espai de proves]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/editrev.txt
new file mode 100644
index 000000000..99188a0e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/editrev.txt
@@ -0,0 +1,2 @@
+**¡Ha carregat una versió antiga del document!** Si la guarda crearà una nova versió en el contingut d'esta.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/index.txt
new file mode 100644
index 000000000..5e57c1680
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/index.txt
@@ -0,0 +1,4 @@
+====== Índex ======
+
+Un índex de totes les pàgines disponibles ordenades per [[doku>namespaces|espais de noms]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/install.html
new file mode 100644
index 000000000..eb77cd648
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/install.html
@@ -0,0 +1,11 @@
+<p>Esta pàgina l'ajudarà en la primera instalació i configuració de <a href="http://dokuwiki.org">Dokuwiki</a>. N'hi ha més informació de l'instalador disponible en la
+<a href="http://dokuwiki.org/installer">pàgina de documentació</a>.</p>
+
+<p>DokuWiki utilisa archius corrents per a l'almagasenament de les pàgines del wiki i atra informació associada ad estes pàgines (p. e. imàgens, índexs de busca, versions antigues, etc.). Per a que DokuWiki funcione correctament 
+<strong>deu</strong> tindre accés d'escritura als directoris que contenen estos archius. Est instalador no pot ajustar els permissos del directori. Normalment haurà de fer-ho directament en una consola de del sistema o, si utilisa un hostage, per FTP o en el panel de control (p. e. cPanel).</p>
+
+<p>Est instalador configurarà <acronym title="access control list">ACL</acronym> en el seu DokuWiki, que al mateix temps permet l'accés de l'administrador i l'accés al menú d'administració de DokuWiki per a instalar plúgins, gestionar usuaris, gestionar els accessos a les pàgines del wiki i la modificació dels ajusts de configuració. No és necessari per a que DokuWiki funcione, pero farà més fàcil la seua administració.</p>
+
+<p>Els usuaris experimentats o en necessitats especials de configuració deuen utilisar estos vínculs per a informació referent a
+<a href="http://dokuwiki.org/install">instruccions d'instalació</a>
+i <a href="http://dokuwiki.org/config">ajusts de configuració</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/lang.php
new file mode 100644
index 000000000..d85cc1c06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/lang.php
@@ -0,0 +1,250 @@
+<?php
+/**
+ * valencian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Bernat Arlandis i Mañó <berarma@ya.com>
+ * @author Bernat Arlandis <berarma@ya.com>
+ * @author Bernat Arlandis <berarma@llenguaitecnologia.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta pàgina';
+$lang['btn_source']            = 'Mostrar font';
+$lang['btn_show']              = 'Mostrar pàgina';
+$lang['btn_create']            = 'Crear esta pàgina';
+$lang['btn_search']            = 'Buscar';
+$lang['btn_save']              = 'Guardar';
+$lang['btn_preview']           = 'Vista prèvia';
+$lang['btn_top']               = 'Tornar dalt';
+$lang['btn_newer']             = '<< més recents';
+$lang['btn_older']             = 'manco recents >>';
+$lang['btn_revs']              = 'Versions antigues';
+$lang['btn_recent']            = 'Canvis recents';
+$lang['btn_upload']            = 'Pujar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índex';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Iniciar sessió';
+$lang['btn_logout']            = 'Tancar sessió';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Actualisar';
+$lang['btn_delete']            = 'Borrar';
+$lang['btn_back']              = 'Arrere';
+$lang['btn_backlink']          = 'Vínculs remitents';
+$lang['btn_backtomedia']       = 'Tornar a la selecció d\'archius de mijos';
+$lang['btn_subscribe']         = 'Subscriure\'s a la pàgina';
+$lang['btn_unsubscribe']       = 'Desubscriure\'s de la pàgina';
+$lang['btn_subscribens']       = 'Subscriure\'s a l\'espai de noms';
+$lang['btn_unsubscribens']     = 'Desubscriure\'s de l\'espai de noms';
+$lang['btn_profile']           = 'Actualisar perfil';
+$lang['btn_reset']             = 'Reiniciar';
+$lang['btn_resendpwd']         = 'Enviar contrasenya nova';
+$lang['btn_draft']             = 'Editar borrador';
+$lang['btn_recover']           = 'Recuperar borrador';
+$lang['btn_draftdel']          = 'Borrar borrador';
+$lang['btn_revert']            = 'Recuperar';
+$lang['loggedinas']            = 'Sessió de';
+$lang['user']                  = 'Nom d\'usuari';
+$lang['pass']                  = 'Contrasenya';
+$lang['newpass']               = 'Contrasenya nova';
+$lang['oldpass']               = 'Confirmar la contrasenya actual';
+$lang['passchk']               = 'una atra volta';
+$lang['remember']              = 'Recorda\'m';
+$lang['fullname']              = 'Nom complet';
+$lang['email']                 = 'Correu electrònic';
+$lang['register']              = 'Registrar-se';
+$lang['profile']               = 'Perfil d\'usuari';
+$lang['badlogin']              = 'Disculpe, pero el nom d\'usuari o la contrasenya són incorrectes.';
+$lang['minoredit']             = 'Canvis menors';
+$lang['draftdate']             = 'Borrador gravat el';
+$lang['nosecedit']             = 'La pàgina ha canviat mentres tant, l\'informació de la secció no estava al dia, s\'ha carregat la pàgina sancera.';
+$lang['regmissing']            = 'Disculpe, pero deu omplir tots els camps.';
+$lang['reguexists']            = 'Disculpe, pero ya existix un usuari en este nom.';
+$lang['regsuccess']            = 'S\'ha creat l\'usuari i se li ha enviat la contrasenya per correu electrònic.';
+$lang['regsuccess2']           = 'S\'ha creat l\'usuari.';
+$lang['regmailfail']           = 'Pareix que ha hagut un erro enviant el correu en la contrasenya. ¡Per favor, contacte en l\'administrador!';
+$lang['regbadmail']            = 'La direcció de correu no pareix vàlida - contacte en l\'administrador si pensa que és deu a un erro nostre';
+$lang['regbadpass']            = 'Les dos contrasenyes que ha donat no són idèntiques, per favor, torne a intentar-ho.';
+$lang['regpwmail']             = 'La seua contrasenya de DokuWiki';
+$lang['reghere']               = '¿Encara no té un conte? Cree-se\'n un';
+$lang['profna']                = 'Este wiki no li permet modificar el perfil';
+$lang['profnochange']          = 'Sense canvis, no hi ha res que fer.';
+$lang['profnoempty']           = 'No es permet deixar el nom o la direcció de correu buits.';
+$lang['profchanged']           = 'Perfil de l\'usuari actualisat.';
+$lang['pwdforget']             = '¿Ha oblidat la contrasenya? Demane\'n una nova';
+$lang['resendna']              = 'Este wiki no permet reenviar la contrasenya.';
+$lang['resendpwd']             = 'Enviar contrasenya nova per a';
+$lang['resendpwdmissing']      = 'Disculpe, pero deu omplir tots els camps.';
+$lang['resendpwdnouser']       = 'Disculpe, pero no trobem ad est usuari en la base de senyes.';
+$lang['resendpwdbadauth']      = 'Disculpe, pero este còdic d\'autenticació no es vàlit. Verifique que haja utilisat el víncul de confirmació sancer.';
+$lang['resendpwdconfirm']      = 'Li hem enviat un víncul de confirmació al correu.';
+$lang['resendpwdsuccess']      = 'Se li ha enviat una nova contrasenya per correu electrònic.';
+$lang['license']               = 'Excepte quan s\'indique una atra cosa, el contingut d\'este wiki està llicenciat baix la següent llicència:';
+$lang['licenseok']             = 'Nota: a l\'editar esta pàgina accepta llicenciar el seu contingut baix la següent llicència:';
+$lang['searchmedia']           = 'Buscar nom d\'archiu:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Seleccione l\'archiu que vol pujar';
+$lang['txt_filename']          = 'Enviar com (opcional)';
+$lang['txt_overwrt']           = 'Sobreescriure archius existents';
+$lang['lockedby']              = 'Actualment bloquejat per';
+$lang['lockexpire']            = 'El bloqueig venç a les';
+$lang['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
+$lang['notsavedyet']           = 'Els canvis no guardats es perdran.\n¿Segur que vol continuar?';
+$lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
+$lang['nothingfound']          = 'No s\'ha trobat res.';
+$lang['mediaselect']           = 'Archius de mijos';
+$lang['fileupload']            = 'Enviar archius de mijos';
+$lang['uploadsucc']            = 'Enviament correcte';
+$lang['uploadfail']            = 'Enviament fallit. ¿Potser no tinga els permissos necessaris?';
+$lang['uploadwrong']           = 'Enviament denegat. ¡Esta extensió d\'archiu està prohibida!';
+$lang['uploadexist']           = 'L\'archiu ya existix. No s\'ha fet res.';
+$lang['uploadbadcontent']      = 'El contingut enviat no coincidix en l\'extensió de l\'archiu %s';
+$lang['uploadspam']            = 'L\'enviament ha segut bloquejat per la llista anti-spam.';
+$lang['uploadxss']             = 'L\'enviament ha segut bloquejat per ser possiblement perillós.';
+$lang['uploadsize']            = 'L\'archiu enviat és massa gran. (màx. %s)';
+$lang['deletesucc']            = 'S\'ha borrat l\'archiu "%s".';
+$lang['deletefail']            = 'No s\'ha pogut borrar "%s" - comprove els permissos.';
+$lang['mediainuse']            = 'L\'archiu "%s" no s\'ha borrat - encara s\'està utilisant.';
+$lang['namespaces']            = 'Espais de noms';
+$lang['mediafiles']            = 'Archius disponibles en';
+$lang['js']['searchmedia']     = 'Buscar archius';
+$lang['js']['keepopen']        = 'Mantindre la finestra oberta al seleccionar';
+$lang['js']['hidedetails']     = 'Ocultar detalls';
+$lang['js']['nosmblinks']      = 'Els vínculs a recursos compartits de Windows només funcionen en Microsoft Internet Explorer. No obstant, es poden copiar i apegar.';
+$lang['js']['linkwiz']         = 'Assistent de vínculs';
+$lang['js']['linkto']          = 'Vincular a:';
+$lang['js']['del_confirm']     = '¿Realment vol borrar el(s) ítem(s) seleccionat(s)?';
+$lang['js']['mu_btn']          = 'Enviar diversos archius d\'una';
+$lang['mediausage']            = 'Utilise la següent sintaxis per a referenciar est archiu:';
+$lang['mediaview']             = 'Vore l\'archiu original';
+$lang['mediaroot']             = 'base';
+$lang['mediaupload']           = 'Enviar un archiu a l\'espai de noms actual. Per a crear sub-espais, afigga\'ls separats per dos punts davant del nom de l\'archiu que pose en "Enviar com".';
+$lang['mediaextchange']        = '¡Extensió de l\'archiu canviada de .%s a .%s!';
+$lang['reference']             = 'Referències per a';
+$lang['ref_inuse']             = 'No es pot borrar l\'archiu perque encara s\'utilisa en les següents pàgines:';
+$lang['ref_hidden']            = 'Algunes referències estan en pàgines que no té permissos per a vore';
+$lang['hits']                  = 'Encerts';
+$lang['quickhits']             = 'Noms de pàgines coincidents';
+$lang['toc']                   = 'Taula de continguts';
+$lang['current']               = 'Actual';
+$lang['yours']                 = 'La seua versió';
+$lang['diff']                  = 'Mostrar diferències en la versió actual';
+$lang['diff2']                 = 'Mostrar diferències entre versions';
+$lang['line']                  = 'Llínea';
+$lang['breadcrumb']            = 'Traça';
+$lang['youarehere']            = 'Vosté està ací';
+$lang['lastmod']               = 'Última modificació el';
+$lang['by']                    = 'per';
+$lang['deleted']               = 'borrat';
+$lang['created']               = 'creat';
+$lang['restored']              = 'restaurada l\'última versió';
+$lang['external_edit']         = 'edició externa';
+$lang['summary']               = 'Editar sumari';
+$lang['noflash']               = 'Necessita el <a href="http://www.adobe.com/products/flashplayer/">plúgin d\'Adobe Flash</a> per a vore este contingut.';
+$lang['download']              = 'Descarregar un tros';
+$lang['mail_newpage']          = 'pàgina afegida:';
+$lang['mail_changed']          = 'pàgina canviada:';
+$lang['mail_new_user']         = 'Usuari nou:';
+$lang['mail_upload']           = 'archiu enviat:';
+$lang['qb_bold']               = 'Negreta';
+$lang['qb_italic']             = 'Itàlica';
+$lang['qb_underl']             = 'Subrallat';
+$lang['qb_code']               = 'Còdic';
+$lang['qb_strike']             = 'Tachat';
+$lang['qb_h1']                 = 'Titular de nivell 1';
+$lang['qb_h2']                 = 'Titular de nivell 2';
+$lang['qb_h3']                 = 'Titular de nivell 3';
+$lang['qb_h4']                 = 'Titular de nivell 4';
+$lang['qb_h5']                 = 'Titular de nivell 5';
+$lang['qb_h']                  = 'Titular';
+$lang['qb_hs']                 = 'Triar titular';
+$lang['qb_hplus']              = 'Titular superior';
+$lang['qb_hminus']             = 'Titular inferior';
+$lang['qb_hequal']             = 'Titular al mateix nivell';
+$lang['qb_link']               = 'Víncul intern';
+$lang['qb_extlink']            = 'Víncul extern';
+$lang['qb_hr']                 = 'Llínea horisontal';
+$lang['qb_ol']                 = 'Llista numerada';
+$lang['qb_ul']                 = 'Llista ';
+$lang['qb_media']              = 'Afegir imàgens i atres archius';
+$lang['qb_sig']                = 'Afegir firma';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Caràcters especials';
+$lang['upperns']               = 'anar a l\'espai de noms superior';
+$lang['admin_register']        = 'Afegir nou usuari';
+$lang['metaedit']              = 'Editar meta-senyes';
+$lang['metasaveerr']           = 'Erro escrivint meta-senyes';
+$lang['metasaveok']            = 'Meta-senyes guardades';
+$lang['img_backto']            = 'Tornar a';
+$lang['img_title']             = 'Títul';
+$lang['img_caption']           = 'Subtítul';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nom de l\'archiu';
+$lang['img_fsize']             = 'Tamany';
+$lang['img_artist']            = 'Fotógraf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Càmara';
+$lang['img_keywords']          = 'Paraules clau';
+$lang['subscribe_success']     = '%s afegit a la llista de subscripció per a %s';
+$lang['subscribe_error']       = 'Erro afegint a %s a la llista de subscripció per a %s';
+$lang['subscribe_noaddress']   = 'No hi ha cap direcció associada a la sessió, no es pot subscriure';
+$lang['unsubscribe_success']   = '%s borrat de la llista de subscripció per a %s';
+$lang['unsubscribe_error']     = 'Erro borrant a %s de la llista de subscripció per a %s';
+$lang['authmodfailed']         = 'Mala configuració de l\'autenticació d\'usuari. Per favor, informe a l\'administrador del Wiki.';
+$lang['authtempfail']          = 'L\'autenticació d\'usuaris està desactivada temporalment. Si la situació persistix, per favor, informe a l\'administrador del Wiki.';
+$lang['i_chooselang']          = 'Trie l\'idioma';
+$lang['i_installer']           = 'Instalador de DokuWiki';
+$lang['i_wikiname']            = 'Nom del Wiki';
+$lang['i_enableacl']           = 'Activar ACL (recomanat)';
+$lang['i_superuser']           = 'Super-usuari';
+$lang['i_problems']            = 'L\'instalador ha trobat els problemes mostrats més avall. No pot continuar fins que no els arregle.';
+$lang['i_modified']            = 'Per raons de seguritat, este procés només funcionarà en una instalació nova i verge de DokuWiki.
+Deuria tornar a extraure els archius del paquet que ha descarregat o consultar les
+<a href="http://dokuwiki.org/install">instruccions d\'instalació de Dokuwiki</a> completes';
+$lang['i_funcna']              = 'La funció de PHP <code>%s</code> no està disponible. ¿Pot ser que el seu proveïdor d\'hostage l\'haja desactivada per algun motiu?';
+$lang['i_phpver']              = 'La versió de PHP <code>%s</code> és menor que
+la <code>%s</code> que es necessita. Necessita actualisar PHP.';
+$lang['i_permfail']            = 'DokuWiki no pot escriure en <code>%s</code>. ¡Necessita arreglar els permissos d\'este directori!';
+$lang['i_confexists']          = '<code>%s</code> ya existix';
+$lang['i_writeerr']            = 'No es pot crear <code>%s</code>. Haurà de comprovar els permissos del directori/archiu i crear manualment l\'archiu.';
+$lang['i_badhash']             = 'dokuwiki.php substituït o modificat (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valor illegal o buit';
+$lang['i_success']             = 'La configuració ha finalisat correctament. Ya pot borrar l\'archiu install.php. Passe al
+<a href="doku.php">nou DokuWiki</a>.';
+$lang['i_failure']             = 'Han aparegut alguns erros escrivint els archius de configuració. Deurà arreglar-los manualment abans de que
+puga utilisar el <a href="doku.php">nou DokuWiki</a>.';
+$lang['i_policy']              = 'Política inicial ACL';
+$lang['i_pol0']                = 'Wiki obert (llegir, escriure i enviar tots)';
+$lang['i_pol1']                = 'Wiki públic (llegir tots, escriure i enviar només usuaris registrats)';
+$lang['i_pol2']                = 'Wiki tancat (llegir, escriure i enviar només usuaris registrats)';
+$lang['i_retry']               = 'Reintentar';
+$lang['mu_intro']              = 'Des d\'ací pot enviar diversos archius d\'una volta. Pulse el botó d\'examinar per a afegir-los a la coa. Pulse enviar quan ho tinga.';
+$lang['mu_gridname']           = 'Nom d\'archiu';
+$lang['mu_gridsize']           = 'Tamany';
+$lang['mu_gridstat']           = 'Estat';
+$lang['mu_namespace']          = 'Espai de noms';
+$lang['mu_browse']             = 'Examinar';
+$lang['mu_toobig']             = 'massa gran';
+$lang['mu_ready']              = 'preparat per a enviar';
+$lang['mu_done']               = 'complet';
+$lang['mu_fail']               = 'fallit';
+$lang['mu_authfail']           = 'la sessió ha vençut';
+$lang['mu_progress']           = '@PCT@% enviat';
+$lang['mu_filetypes']          = 'Classes d\'archiu permeses';
+$lang['mu_info']               = 'archius enviats.';
+$lang['mu_lasterr']            = 'Últim erro:';
+$lang['recent_global']         = 'Està veent els canvis dins de l\'espai de noms <b>%s</b>. També pot <a href="%s">vore els canvis recents en el wiki sancer</a>.';
+$lang['years']                 = 'fa %d anys';
+$lang['months']                = 'fa %d mesos';
+$lang['weeks']                 = 'fa %s semanes';
+$lang['days']                  = 'fa %d dies';
+$lang['hours']                 = 'fa %d hores';
+$lang['minutes']               = 'fa %d minuts';
+$lang['seconds']               = 'fa %d segons';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/locked.txt
new file mode 100644
index 000000000..bdb2bdf0e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/locked.txt
@@ -0,0 +1,3 @@
+====== Pàgina bloquejada ======
+
+Esta pàgina està actualment bloquejada mentres l'edita un atre usuari. Ha d'esperar fins que l'usuari acabe d'editar la pàgina o vença el bloqueig.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/login.txt
new file mode 100644
index 000000000..b550c6440
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/login.txt
@@ -0,0 +1,4 @@
+====== Inici de sessió ======
+
+¡Encara no ha iniciat sessió! Introduïxca les seues credencials d'autenticació per a iniciar-la. Necessita tindre les galletes del navegador activades.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/mailtext.txt
new file mode 100644
index 000000000..e8da6f8de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/mailtext.txt
@@ -0,0 +1,17 @@
+S'ha afegit o modificat una pàgina en el seu DokuWiki. Les senyes són:
+
+Data: @DATE@
+Navegador: @BROWSER@
+Direcció IP: @IPADDRESS@
+Nom de la màquina: @HOSTNAME@
+Revisió anterior: @OLDPAGE@
+Nova revisió: @NEWPAGE@
+Resum: @SUMMARY@
+Usuari: @USER@
+
+@DIFF@
+
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/newpage.txt
new file mode 100644
index 000000000..93b154425
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/newpage.txt
@@ -0,0 +1,3 @@
+====== Este tema encara no existix ======
+
+Ha seguit un víncul a una pàgina que encara no existix. Si té els permissos necessaris pot crear-la utilisant el botó ''Crear esta pàgina''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/norev.txt
new file mode 100644
index 000000000..434e62dfa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/norev.txt
@@ -0,0 +1,3 @@
+====== No existix la versió ======
+
+La versió especificada no existix. Utilise el botó ''Versions antigues'' per a vore una llista de versions antigues d'este document.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/preview.txt
new file mode 100644
index 000000000..0997f5953
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualisació ======
+
+Açò es una previsualisació per a vore cóm quedarà la pàgina. ¡Recorde que encara no està guardada!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/pwconfirm.txt
new file mode 100644
index 000000000..919c3d89d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/pwconfirm.txt
@@ -0,0 +1,15 @@
+¡Hola @FULLNAME@!
+
+Algú ha solicitat una nova contrasenya per a entrar com a
+@TITLE en @DOKUWIKIURL@
+
+Si no ha segut vosté qui ha solicitat la nova contrasenya ignore este correu.
+
+Per a confirmar que la petició ha segut feta realment per vosté
+utilise el següent víncul.
+
+@CONFIRM@
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/read.txt
new file mode 100644
index 000000000..80d96cd45
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/read.txt
@@ -0,0 +1,2 @@
+Esta pàgina és només de llectura. Pot vore el còdic font, pero no pot canviar-lo. Pregunte a l'administrador si creu que és un erro.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/recent.txt
new file mode 100644
index 000000000..ca1f5c5ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/recent.txt
@@ -0,0 +1,5 @@
+====== Canvis recents ======
+
+Les següents pàgines han canviat recentment.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/register.txt
new file mode 100644
index 000000000..7515be6a9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/register.txt
@@ -0,0 +1,5 @@
+====== Registrar-se com a usuari nou ======
+
+Escriga tota la informació que se li demana avall per a crear un nou conte en este wiki. Assegure's de donar una **direcció de correu electrònic vàlida** - si no se li demana una contrasenya ací se li enviarà a eixa direcció. El nom d'usuari deuria ser un
+[[doku>pagename|nom de pàgina]] vàlit.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/registermail.txt
new file mode 100644
index 000000000..47b9318bd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/registermail.txt
@@ -0,0 +1,14 @@
+S'ha registrat un usuari nou. Estes són les senyes:
+
+Nom d'usuari : @NEWUSER@
+Nom complet : @NEWNAME@
+Correu electrònic : @NEWEMAIL@
+
+Data : @DATE@
+Navegador : @BROWSER@
+Direcció IP : @IPADDRESS@
+Nom de la màquina : @HOSTNAME@
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/resendpwd.txt
new file mode 100644
index 000000000..2feac0966
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Enviar contrasenya nova ======
+
+Per favor, introduïxca el nom d'usuari en el formulari per a demanar una nova contrasenya per al seu conte en este wiki. Se li enviarà un víncul de confirmació a la direcció de correu en que estiga registrat.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/revisions.txt
new file mode 100644
index 000000000..08e7e043c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/revisions.txt
@@ -0,0 +1,4 @@
+====== Versions antigues ======
+
+Versions antigues del document actual. Per a recuperar una versió anterior de la pàgina, trie-la ací avall, pulse ''Editar esta pàgina'' i guarde-la.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/searchpage.txt
new file mode 100644
index 000000000..80f7e9119
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/searchpage.txt
@@ -0,0 +1,5 @@
+====== Buscar ======
+
+Pot vore els resultats de la busca ací avall. Si no ha trobat lo que buscava pot crear o editar una pàgina en el mateix nom que el text que ha buscat utilisant el botó corresponent.
+
+===== Resultats =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/showrev.txt
new file mode 100644
index 000000000..86f282292
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/showrev.txt
@@ -0,0 +1,2 @@
+**¡Açò és una versió antiga del document!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/stopwords.txt
new file mode 100644
index 000000000..1b4decbe5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/stopwords.txt
@@ -0,0 +1,76 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+ell
+ella
+nosatres
+nosatros
+mosatros
+vosatres
+vosatros
+ells
+els
+los
+dels
+les
+una
+uns
+unes
+seu
+seua
+seus
+seues
+meu
+meua
+meus
+meues
+teu
+teua
+teus
+teues
+nostre
+nostres
+vostre
+vostres
+nos
+vos
+#eix
+eixe
+eixa
+aquell
+aquella
+aquells
+aquelles
+#est
+este
+esta
+estos
+estes
+està
+això
+açò
+allò
+des
+soc
+eres
+som
+sou
+són
+fon
+per
+com
+cóm
+qui
+que
+qué
+quan
+quant
+quants
+quanta
+quantes
+mentres
+pero
+atre
+atra
+atres
+també
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/subscribermail.txt
new file mode 100644
index 000000000..43299b598
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/subscribermail.txt
@@ -0,0 +1,23 @@
+¡Hola!
+
+La pàgina @PAGE@ del wiki @TITLE@ ha canviat.
+Estos són els canvis:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data: @DATE@
+Usuari: @USER@
+Resum: @SUMMARY@
+Revisió anterior: @OLDPAGE@
+Nova revisió: @NEWPAGE@
+
+Per a cancelar les notificacions de pàgina, inicie sessió en el wiki en 
+@DOKUWIKIURL@, visite
+@NEWPAGE@
+i desubscriga's dels canvis de la pàgina o de l'espai de noms.
+
+--
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/updateprofile.txt
new file mode 100644
index 000000000..9116fedf0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Actualise el seu perfil ======
+
+Només deu completar els camps que vol canviar. No es pot canviar el nom d'usuari.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/uploadmail.txt
new file mode 100644
index 000000000..c5a330274
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/uploadmail.txt
@@ -0,0 +1,14 @@
+S'ha enviat un archiu al seu DokuWiki. Les senyes:
+
+Archiu: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Direcció IP: @IPADDRESS@
+Nom de la màquina: @HOSTNAME@
+Tamany: @SIZE@
+Tipo MIME: @MIME@
+Usuari: @USER@
+
+-- 
+Este correu ha segut generat per DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/wordblock.txt
new file mode 100644
index 000000000..718bfe883
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca-valencia/wordblock.txt
@@ -0,0 +1,4 @@
+====== Bloqueig de SPAM ======
+
+Els seus canvis *no* s'han guardat perque contenen una o més paraules prohibides. Si ha intentat posar spam en el wiki.. ¡malament! Si pensa que açò és un erro, contacte en l'administrador d'este wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/admin.txt
new file mode 100644
index 000000000..5c0a6d00a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/admin.txt
@@ -0,0 +1,4 @@
+====== Administració ======
+
+Heus ací una llista de les tasques administratives disponibles en DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/adminplugins.txt
new file mode 100644
index 000000000..9ea165c1f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/adminplugins.txt
@@ -0,0 +1 @@
+===== Connectors addicionals =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/backlinks.txt
new file mode 100644
index 000000000..e2ecaf4f9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/backlinks.txt
@@ -0,0 +1,4 @@
+====== Enllaços ======
+
+Heus ací una llista de pàgines enllaçades amb la pàgina actual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/conflict.txt
new file mode 100644
index 000000000..53183f0b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/conflict.txt
@@ -0,0 +1,6 @@
+====== Hi ha una versió més recent ======
+
+Existeix una versió més recent del document que heu editat. Això passa quan un altre usuari canvia el document mentre l'estàveu editant.
+
+Examineu detingudament les diferències que es mostren més avall i després decidiu quina versió voleu mantenir. Si trieu ''desa'', es desarà la vostra versió. Si trieu ''cancel·la'' es mantindrà la versió actual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/denied.txt
new file mode 100644
index 000000000..e6125e83b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/denied.txt
@@ -0,0 +1,4 @@
+====== Permís denegat ======
+
+No teniu prou drets per continuar. Potser us heu descuidat d'entrar?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/diff.txt
new file mode 100644
index 000000000..83ca86782
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/diff.txt
@@ -0,0 +1,4 @@
+====== Diferències ======
+
+Ací es mostren les diferències entre la revisió seleccionada i la versió actual de la pàgina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/draft.txt
new file mode 100644
index 000000000..68593c2fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/draft.txt
@@ -0,0 +1,5 @@
+====== S'ha trobat un esborrany ======
+
+La darrera sessió vostra d'edició d'aquesta pàgina no es va completar correctament. DokuWiki en va desar automàticament un esborrany mentre treballàveu, el qual podeu utilitzar ara per continuar l'edició. Més avall podeu veure la data i hora en què es va desar durant la vostra darrera sessió.
+
+Decidiu si voleu //recuperar// la vostra darrera sessió d'edició, //suprimir// l'esborrany que es va desar automàticament o //cancel·lar// el procés d'edició.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/edit.txt
new file mode 100644
index 000000000..743b0ff55
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/edit.txt
@@ -0,0 +1,2 @@
+Editeu la pàgina i premeu ''Desa''. Per a més informació sobre la sintaxi Wiki vegeu [[wiki:syntax|sintaxi]]. Si us plau, editeu la pàgina només si podeu **millorar-la**. Si voleu fer proves, aprengueu a donar les primeres passes al [[playground:playground|pati]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/editrev.txt
new file mode 100644
index 000000000..b2f304cbb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/editrev.txt
@@ -0,0 +1,2 @@
+**Heu penjat una revisió anterior del document.** Si la deseu, creareu una nova versió amb aquestes dades.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/index.txt
new file mode 100644
index 000000000..6ba71fd8f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/index.txt
@@ -0,0 +1,4 @@
+====== Índex ======
+
+Heus ací un índex de totes les pàgines disponibles, ordenades per [[doku>namespaces|espais]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/install.html
new file mode 100644
index 000000000..e7c8f0b57
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/install.html
@@ -0,0 +1,8 @@
+<p>Aquesta pàgina us ajuda a fer la primera instal·lació i la configuració de <a href="http://dokuwiki.org">Dokuwiki</a>. Hi ha més informació sobre aquest instal·lador en la seva <a href="http://dokuwiki.org/installer">pàgina de documentació</a>.</p>
+
+<p>DokuWiki utilitza fitxers normals per a emmagatzemar les pàgines wiki i la informació associada a aquestes pàgines (p. ex. imatges, índexs de cerca, revisions anteriors, etc.). Per tal de funcionar correctament DokuWiki <strong>necessita</strong> tenir accés d'escriptura als directoris que contenen aquests fitxers. Aquest instal·lador no pot configurar els permisos del directori. Normalment això cal fer-ho directament en la línia d'ordres o, si esteu utilitzant un hostatge, mitjançant FTP o el tauler de control del vostre hostatge (p. ex. cPanel).</p>
+
+<p>Aquest instal·lador configurarà el vostre DokuWiki per a <acronym title="access control list">ACL</acronym>, cosa que, al seu torn, permet l'accés de l'administrador al menú d'administració, on pot instal·lar connectors, gestionar usuaris, gestionar l'accés a les pàgines wiki i modificar els paràmetres de configuració. No és un requisit per al funcionament de DokuWiki, però el fa més fàcil d'administrar.</p>
+
+<p>Els usuaris experts o els que tinguin requeriments específics poden utilitzar els enllaços següents per a obtenir més detalls sobre <a href="http://dokuwiki.org/install">instruccions d'instal·lació</a>
+i <a href="http://dokuwiki.org/config">paràmetres de configuració</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/lang.php
new file mode 100644
index 000000000..778123445
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/lang.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * catalan language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Carles Bellver <carles.bellver@cent.uji.es>
+ * @author Carles Bellver <carles.bellver@gmail.com>
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Edita aquesta pàgina';
+$lang['btn_source']            = 'Mostra codi font';
+$lang['btn_show']              = 'Mostra pàgina';
+$lang['btn_create']            = 'Crea aquesta pàgina';
+$lang['btn_search']            = 'Cerca';
+$lang['btn_save']              = 'Desa';
+$lang['btn_preview']           = 'Previsualitza';
+$lang['btn_top']               = 'Torna dalt';
+$lang['btn_newer']             = '<< més recent';
+$lang['btn_older']             = 'menys recent >>';
+$lang['btn_revs']              = 'Revisions anteriors';
+$lang['btn_recent']            = 'Canvis recents';
+$lang['btn_upload']            = 'Penja';
+$lang['btn_cancel']            = 'Cancel·la';
+$lang['btn_index']             = 'Índex';
+$lang['btn_secedit']           = 'Edita';
+$lang['btn_login']             = 'Entra';
+$lang['btn_logout']            = 'Surt';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Actualitza';
+$lang['btn_delete']            = 'Suprimeix';
+$lang['btn_back']              = 'Enrere';
+$lang['btn_backlink']          = 'Què hi enllaça';
+$lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
+$lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
+$lang['btn_unsubscribe']       = 'Cancel·la subscripció a pàgina';
+$lang['btn_subscribens']       = 'Subscripció a canvis d\'aquest espai';
+$lang['btn_unsubscribens']     = 'Cancel·la subscripció a espai';
+$lang['btn_profile']           = 'Actualització del perfil';
+$lang['btn_reset']             = 'Reinicia';
+$lang['btn_resendpwd']         = 'Envia nova contrasenya';
+$lang['btn_draft']             = 'Edita esborrany';
+$lang['btn_recover']           = 'Recupera esborrany';
+$lang['btn_draftdel']          = 'Suprimeix esborrany';
+$lang['btn_revert']            = 'Restaura';
+$lang['loggedinas']            = 'Heu entrat com';
+$lang['user']                  = 'Nom d\'usuari';
+$lang['pass']                  = 'Contrasenya';
+$lang['newpass']               = 'Nova contrasenya';
+$lang['oldpass']               = 'Confirmeu la contrasenya actual';
+$lang['passchk']               = 'una altra vegada';
+$lang['remember']              = 'Recorda\'m';
+$lang['fullname']              = 'Nom complet';
+$lang['email']                 = 'Correu electrònic';
+$lang['register']              = 'Registra\'m';
+$lang['profile']               = 'Perfil d\'usuari';
+$lang['badlogin']              = 'Nom d\'usuari o contrasenya incorrectes.';
+$lang['minoredit']             = 'Canvis menors';
+$lang['draftdate']             = 'L\'esborrany s\'ha desat automàticament';
+$lang['nosecedit']             = 'Mentrestant la pàgina ha estat modificada. La informació de seccions estava obsoleta i ha calgut carregar la pàgina sencera.';
+$lang['regmissing']            = 'Heu d\'omplir tots els camps.';
+$lang['reguexists']            = 'Ja existeix un altre usuari amb aquest nom.';
+$lang['regsuccess']            = 'S\'ha creat l\'usuari. La contrasenya s\'ha enviat per correu.';
+$lang['regsuccess2']           = 'S\'ha creat l\'usuari.';
+$lang['regmailfail']           = 'Sembla que un error ha impedit enviar la contrasenya per correu. Contacteu amb l\'administrador.';
+$lang['regbadmail']            = 'L\'adreça de correu que heu donat no sembla vàlida. Si creieu que això és un error, contacu amb l\'administrador.';
+$lang['regbadpass']            = 'Les dues contrasenyes no són iguals. Torneu a intentar-ho.';
+$lang['regpwmail']             = 'La vostra contrasenya per al Wiki';
+$lang['reghere']               = 'Si no teniu un compte, aquí en podeu obtenir un';
+$lang['profna']                = 'Aquest wiki no permet modificar el perfil';
+$lang['profnochange']          = 'No heu introduït cap canvi.';
+$lang['profnoempty']           = 'No es pot deixar en blanc el nom o l\'adreça de correu.';
+$lang['profchanged']           = 'El perfil d\'usuari s\'ha actualitzat correctament.';
+$lang['pwdforget']             = 'Heu oblidat la contrasenya? Podeu obtenir-ne una de nova.';
+$lang['resendna']              = 'Aquest wiki no permet tornar a enviar la contrasenya.';
+$lang['resendpwd']             = 'Enviament d\'una nova contrasenya per a';
+$lang['resendpwdmissing']      = 'Heu d\'emplenar tots els camps.';
+$lang['resendpwdnouser']       = 'No s\'ha pogut trobar aquest usuari a la base de dades.';
+$lang['resendpwdbadauth']      = 'Aquest codi d\'autenticació no és vàlid. Assegureu-vos d\'utilitzar l\'enllaç de confirmació complet.';
+$lang['resendpwdconfirm']      = 'Se us ha enviat per correu electrònic un enllaç de confirmació.';
+$lang['resendpwdsuccess']      = 'Se us ha enviat la nova contrasenya per correu electrònic.';
+$lang['license']               = 'Excepte on es digui una altra cosa, el contingut d\'aquest wiki està subjecte a la llicència següent:';
+$lang['licenseok']             = 'Nota. En editar aquesta pàgina esteu acceptant que el vostre contingut estigui subjecte a la llicència següent:';
+$lang['searchmedia']           = 'Cerca pel nom de fitxer';
+$lang['searchmedia_in']        = 'Cerca en: %s';
+$lang['txt_upload']            = 'Trieu el fitxer que voleu penjar';
+$lang['txt_filename']          = 'Introduïu el nom wiki (opcional)';
+$lang['txt_overwrt']           = 'Sobreescriu el fitxer actual';
+$lang['lockedby']              = 'Actualment blocat per:';
+$lang['lockexpire']            = 'Venciment del blocatge:';
+$lang['willexpire']            = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
+$lang['notsavedyet']           = 'Heu fet canvis que es perdran si no els deseu.\nVoleu continuar?';
+$lang['rssfailed']             = 'S\'ha produït un error en recollir aquesta alimentació: ';
+$lang['nothingfound']          = 'No s\'ha trobat res.';
+$lang['mediaselect']           = 'Selecció de fitxers';
+$lang['fileupload']            = 'Càrrega de fitxers';
+$lang['uploadsucc']            = 'S\'ha penjat el fitxer';
+$lang['uploadfail']            = 'No es pot penjar el fitxer. Potser no teniu prou permisos?';
+$lang['uploadwrong']           = 'No es pot penjar el fitxer. Aquesta extensió està prohibida.';
+$lang['uploadexist']           = 'El fitxer ja existeix. No s\'ha penjat.';
+$lang['uploadbadcontent']      = 'El contingut que heu penjat coincideix amb l\'extensió de fitxer %s.';
+$lang['uploadspam']            = 'La càrrega ha estat blocada per la llista negra de brossa.';
+$lang['uploadxss']             = 'La càrrega ha estat blocada perquè podria ser un contingut maligne.';
+$lang['uploadsize']            = 'El fitxer que voleu penjar és massa gran (màxim %s)';
+$lang['deletesucc']            = 'S\'ha suprimit el fitxer "%s".';
+$lang['deletefail']            = 'No s\'ha pogut suprimir el fitxer "%s". Comproveu els permisos.';
+$lang['mediainuse']            = 'No s\'ha pogut suprimir el fitxer "%s". Encara s\'està utilitzant.';
+$lang['namespaces']            = 'Espais';
+$lang['mediafiles']            = 'Fitxers disponibles en';
+$lang['js']['searchmedia']     = 'Cerca fitxers';
+$lang['js']['keepopen']        = 'Manté la finestra oberta';
+$lang['js']['hidedetails']     = 'Oculta detalls';
+$lang['js']['nosmblinks']      = 'Els enllaços amb recursos compartits de Windows només funcionen amb el Microsoft Internet Explorer.
+Si voleu podeu copiar i enganxar l\'enllaç.';
+$lang['js']['linkwiz']         = 'Auxiliar d\'enllaços';
+$lang['js']['linkto']          = 'Enllaça a:';
+$lang['js']['del_confirm']     = 'Suprimiu aquesta entrada?';
+$lang['js']['mu_btn']          = 'Penja múltiples fitxers';
+$lang['mediausage']            = 'Utilitzeu la sintaxi següent per referir-vos a aquest enllaç:';
+$lang['mediaview']             = 'Mostra el fitxer original';
+$lang['mediaroot']             = 'arrel';
+$lang['mediaupload']           = 'Pengeu aquí un fitxer dins de l\'espai actual. Per a crear un nou subespai, poseu-ne el nom davant del nom de fitxer i separeu-los amb el signe de dos punts.';
+$lang['mediaextchange']        = 'S\'ha canviat l\'extensió del fitxer de .%s a .%s';
+$lang['reference']             = 'Referències per a';
+$lang['ref_inuse']             = 'El fitxer no es pot suprimir perquè l\'estan utilitzant les pàgines següents:';
+$lang['ref_hidden']            = 'Algunes referències apareixen en pàgines per a les quals no teniu permís de lectura';
+$lang['hits']                  = 'Resultats';
+$lang['quickhits']             = 'Noms de pàgina coincidents';
+$lang['toc']                   = 'Taula de continguts';
+$lang['current']               = 'actual';
+$lang['yours']                 = 'La vostra versió';
+$lang['diff']                  = 'Mostra diferències amb la versió actual';
+$lang['diff2']                 = 'Mostra diferències entre les revisions seleccionades';
+$lang['line']                  = 'Línia';
+$lang['breadcrumb']            = 'Camí';
+$lang['youarehere']            = 'Sou aquí';
+$lang['lastmod']               = 'Darrera modificació';
+$lang['by']                    = 'per';
+$lang['deleted']               = 'suprimit';
+$lang['created']               = 'creat';
+$lang['restored']              = 's\'ha restaurat una versió anterior';
+$lang['external_edit']         = 'edició externa';
+$lang['summary']               = 'Resum d\'edició';
+$lang['noflash']               = 'Per a visualitzar aquest contingut necessiteu el <a href="http://www.adobe.com/products/flashplayer/">connector d\'Adobe Flash</a>.';
+$lang['download']              = 'Baixa el fragment';
+$lang['mail_newpage']          = 'pàgina afegida:';
+$lang['mail_changed']          = 'pàgina modificada:';
+$lang['mail_new_user']         = 'nou usuari:';
+$lang['mail_upload']           = 'fitxer penjat:';
+$lang['qb_bold']               = 'Negreta';
+$lang['qb_italic']             = 'Cursiva';
+$lang['qb_underl']             = 'Subratllat';
+$lang['qb_code']               = 'Codi';
+$lang['qb_strike']             = 'Text barrat';
+$lang['qb_h1']                 = 'Encapçalament nivell 1';
+$lang['qb_h2']                 = 'Encapçalament nivell 2';
+$lang['qb_h3']                 = 'Encapçalament nivell 3';
+$lang['qb_h4']                 = 'Encapçalament nivell 4';
+$lang['qb_h5']                 = 'Encapçalament nivell 5';
+$lang['qb_h']                  = 'Encapçalament';
+$lang['qb_hs']                 = 'Selcciona l\'encapçalament';
+$lang['qb_hplus']              = 'Encapçalament més alt';
+$lang['qb_hminus']             = 'Encapçalament més baix';
+$lang['qb_hequal']             = 'Encapçalament del mateix nivell';
+$lang['qb_link']               = 'Enllaç intern';
+$lang['qb_extlink']            = 'Enllaç extern';
+$lang['qb_hr']                 = 'Ratlla horitzontal';
+$lang['qb_ol']                 = 'Element de llista numerada';
+$lang['qb_ul']                 = 'Element de llista de pics';
+$lang['qb_media']              = 'Afegeix imatges o altres fitxers';
+$lang['qb_sig']                = 'Insereix signatura';
+$lang['qb_smileys']            = 'Emoticones';
+$lang['qb_chars']              = 'Caràcters especials';
+$lang['upperns']               = 'Salta a l\'espai superior';
+$lang['admin_register']        = 'Afegeix nou usuari';
+$lang['metaedit']              = 'Edita metadades';
+$lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
+$lang['metasaveok']            = 'S\'han desat les metadades';
+$lang['img_backto']            = 'Torna a';
+$lang['img_title']             = 'Títol';
+$lang['img_caption']           = 'Peu d\'imatge';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nom de fitxer';
+$lang['img_fsize']             = 'Mida';
+$lang['img_artist']            = 'Fotògraf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Càmera';
+$lang['img_keywords']          = 'Paraules clau';
+$lang['subscribe_success']     = 'S\'ha afegit %s a la llista de subscripcions de %s';
+$lang['subscribe_error']       = 'S\'ha produït un error en afegir %s a la llista de subscripcions de %s';
+$lang['subscribe_noaddress']   = 'No hi ha cap adreça de correu associada al vostre nom d\'usuari. No se us ha pogut afegir a la llista de subscripcions.';
+$lang['unsubscribe_success']   = '%s ha estat suprimit de la llista de subscripcions de %s';
+$lang['unsubscribe_error']     = 'S\'ha produït un error en suprimir %s de la llista de subscripcions de %s';
+$lang['authmodfailed']         = 'La configuració de l\'autenticació d\'usuaris és errònia. Informeu els administradors del wiki.';
+$lang['authtempfail']          = 'L\'autenticació d\'usuaris no està disponible temporalment. Si aquesta situació persisteix, si us plau informeu els administradors del wiki.';
+$lang['i_chooselang']          = 'Trieu l\'idioma';
+$lang['i_installer']           = 'Instal·lador de DokuWiki';
+$lang['i_wikiname']            = 'Nom del wiki';
+$lang['i_enableacl']           = 'Habilita ACL (recomanat)';
+$lang['i_superuser']           = 'Superusuari';
+$lang['i_problems']            = 'L\'instal·lador ha trobat alguns problemes, que s\'indiquen més avall. No podeu continuar fins que no els hàgiu solucionat.';
+$lang['i_modified']            = 'Per raons de seguretat aquesta seqüència només funciona amb una instal·lació nova i no modificada de Dokuwiki. Hauríeu de tornar a baixar el paquet i/o descomprimir-lo o consultar les <a href="http://dokuwiki.org/install">instruccions d\'instal·lació de Dokuwiki</a> completes';
+$lang['i_funcna']              = 'La funció PHP <code>%s</code> no està disponible. Potser el vostre proveïdor de serveis l\'ha inhabilitada per alguna raó';
+$lang['i_phpver']              = 'La vostra versió de PHP <code>%s</code> és inferior a la requerida <code>%s</code>. Necessiteu actualitzar la vostra instal·lació de PHP.';
+$lang['i_permfail']            = 'DokuWiki no pot escriure <code>%s</code>. Heu d\'arreglar els permisos d\'aquest directori';
+$lang['i_confexists']          = '<code>%s</code> ja existeix';
+$lang['i_writeerr']            = 'No es pot crear <code>%s</code>. Comproveu els permisos del directori i/o del fitxer i creeu el fitxer manualment.';
+$lang['i_badhash']             = 'dokuwiki.php no reconegut o modificat (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valor il·legal o buit';
+$lang['i_success']             = 'La configuració s\'ha acabat amb èxit. Ara podeu suprimir el fitxer install.php. Aneu al vostre nou <a href="doku.php">DokuWiki</a>.';
+$lang['i_failure']             = 'S\'han produït alguns errors en escriure els fitxers de configuració. Potser caldrà que els arregleu manualment abans d\'utilitzar el vostre nou <a href="doku.php">DokuWiki</a>.';
+$lang['i_policy']              = 'Política ACL inicial';
+$lang['i_pol0']                = 'Wiki obert (tothom pot llegir, escriure i penjar fitxers)';
+$lang['i_pol1']                = 'Wiki públic (tothom pot llegir, els usuaris registrats poden escriure i penjar fitxers)';
+$lang['i_pol2']                = 'Wiki tancat (només els usuaris registrats poden llegir, escriure i penjar fitxers)';
+$lang['i_retry']               = 'Reintenta';
+$lang['mu_intro']              = 'Aquí podeu penjar múltiples fitxers d\'una vegada. Feu clic en el botó Explora per afegir els fitxers a la cua. Després, premeu Penja.';
+$lang['mu_gridname']           = 'Nom del fitxer';
+$lang['mu_gridsize']           = 'Mida';
+$lang['mu_gridstat']           = 'Estat';
+$lang['mu_namespace']          = 'Espai';
+$lang['mu_browse']             = 'Explora';
+$lang['mu_toobig']             = 'massa gran';
+$lang['mu_ready']              = 'llest per a penjar';
+$lang['mu_done']               = 'complet';
+$lang['mu_fail']               = 'error';
+$lang['mu_authfail']           = 'la sessió ha vençut';
+$lang['mu_progress']           = 'càrrega @PCT@%';
+$lang['mu_filetypes']          = 'Tipus de fitxer permesos';
+$lang['mu_info']               = 'fitxers penjats.';
+$lang['mu_lasterr']            = 'Darrer error:';
+$lang['recent_global']         = 'Esteu veient els canvis recents de l\'espai <strong>%s</strong>. També podeu veure els <a href="%s">canvis recents de tot el wiki</a>.';
+$lang['years']                 = 'fa %d anys';
+$lang['months']                = 'fa %d mesos';
+$lang['weeks']                 = 'fa %d setmanes';
+$lang['days']                  = 'fa %d dies';
+$lang['hours']                 = 'fa %d hores';
+$lang['minutes']               = 'fa %d minuts';
+$lang['seconds']               = 'fa %d segons';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/locked.txt
new file mode 100644
index 000000000..93487c268
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/locked.txt
@@ -0,0 +1,3 @@
+====== Pàgina blocada ======
+
+Aquesta pàgina actualment està blocada per a edició per un altre usuari. Haureu d'esperar fins que aquest usuari acabe d'editar-la o fins que venci el blocatge.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/login.txt
new file mode 100644
index 000000000..37ca4d582
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/login.txt
@@ -0,0 +1,4 @@
+====== Entrada ======
+
+No heu entrat. Introduïu les vostres credencials d'autenticació en aquest formulari. A partir d'aquest moment heu de tenir les galetes habilitades en el vostre navegador.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/mailtext.txt
new file mode 100644
index 000000000..eda330954
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/mailtext.txt
@@ -0,0 +1,16 @@
+S'ha afegit o modificat una pàgina en el vostre wiki. Ací teniu més detalls:
+
+Data           : @DATE@
+Navegador      : @BROWSER@
+IP             : @IPADDRESS@
+Rev. anterior  : @OLDPAGE@
+Rev. actual    : @NEWPAGE@
+Resum d'edició : @SUMMARY@
+Usuari         : @USER@
+
+@DIFF@
+
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/newpage.txt
new file mode 100644
index 000000000..d0a2db92a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/newpage.txt
@@ -0,0 +1,3 @@
+====== Aquest tema encara no existeix ======
+
+Heu seguit un enllaç a un tema que encara no existeix. Podeu crear-lo per mitjà del botó ''Crea aquesta pàgina''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/norev.txt
new file mode 100644
index 000000000..b5089c5eb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/norev.txt
@@ -0,0 +1,5 @@
+====== No existeix aquesta revisió ======
+
+
+La revisió especificada no existeix. Utilitzeu el botó ''Revisions anteriors'' per obtenir una llista de revisions d'aquest document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/preview.txt
new file mode 100644
index 000000000..fa2f98ca5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualització ======
+
+Heus ací una previsualització del vostre text. Recordeu que encara **no l'heu desat!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/pwconfirm.txt
new file mode 100644
index 000000000..119c4292d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/pwconfirm.txt
@@ -0,0 +1,15 @@
+@FULLNAME@,
+
+Algú ha sol·licitat una nova contrasenya per al vostre compte d'usuari en @TITLE@
+@DOKUWIKIURL@
+
+Si no heu fet aquesta sol·licitud, simplement no feu cas de la resta del missatge.
+
+Per confirmar que realment heu sol·licitat una nova contrasenya, utilitzeu
+l'enllaç següent:
+
+@CONFIRM@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/read.txt
new file mode 100644
index 000000000..e173ad2dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/read.txt
@@ -0,0 +1,2 @@
+Aquesta pàgina és només de lectura. Podeu veure'n el codi font, però no podeu canviar-la. Consulteu el vostre administrador si penseu que això és degut a algun error.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/recent.txt
new file mode 100644
index 000000000..cea2f5cff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/recent.txt
@@ -0,0 +1,5 @@
+====== Canvis recents ======
+
+Les pàgines següents s'han modificat recentment.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/register.txt
new file mode 100644
index 000000000..a91e6df31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/register.txt
@@ -0,0 +1,4 @@
+====== Registre d'un usuari nou ======
+
+Empleneu tota la informació que se us demana per crear un compte nou en aquest wiki. Assegureu-vos que doneu una **adreça de correu vàlida**, on se us enviarà la vostra contrasenya. El nom d'usuari o usuària ha de ser vàlid com a [[doku>pagename|nom de pàgina]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/registermail.txt
new file mode 100644
index 000000000..84bf5f1a4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/registermail.txt
@@ -0,0 +1,14 @@
+S'ha registrat un nou usuari. Heus ací els detalls:
+
+Nom d'usuari: @NEWUSER@
+Nom complet:  @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Navegador: @BROWSER@
+Adreça IP: @IPADDRESS@
+Ordinador: @HOSTNAME@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/resendpwd.txt
new file mode 100644
index 000000000..cd59f899d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Nova contrasenya ======
+
+Per sol·licitar una nova contrasenya, introduïu el vostre nom d'usuari en el formulari següent. Se us enviarà un enllaç de confirmació a l'adreça de correu amb què us vau registrar.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/revisions.txt
new file mode 100644
index 000000000..5c044d8e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisions anteriors ======
+
+Heus ací les revisions anteriors del document actual. Per restaurar una revisió anterior, seleccioneu-la de la llista, feu clic en ''Edita aquesta pàgina'' i deseu-la.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/searchpage.txt
new file mode 100644
index 000000000..bf69aef15
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/searchpage.txt
@@ -0,0 +1,5 @@
+====== Cerca ======
+
+Heus ací els resultats de la cerca. Si no trobeu allò que buscàveu, podeu crear una pàgina nova per mitjà del botó ''Edita aquesta pàgina''.
+
+===== Resultats =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/showrev.txt
new file mode 100644
index 000000000..b1411824f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/showrev.txt
@@ -0,0 +1,2 @@
+**Aquesta és una revisió antiga del document**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/stopwords.txt
new file mode 100644
index 000000000..03be425ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/stopwords.txt
@@ -0,0 +1,106 @@
+# Això és una llista de paraules que seran omeses per l'indexador, una paraula per línia
+# Utilitzeu finals de línia UNIX
+# No cal incloure paraules de menys de 3 caràcters: s'ometran igualment
+# Llista basada en http://www.ranks.nl/stopwords/
+abans
+algun
+alguna
+alguns
+algunes
+altre
+altra
+altres
+amb
+ambdós
+anar
+ans
+aquell
+aquella
+aquelles
+aquells
+aquí
+bastant
+cada
+com
+dalt
+des
+dins
+ell
+ella
+elles
+ells
+els
+ens
+entre
+era
+erem
+eren
+eres
+estan
+estat
+estava
+estem
+esteu
+estic
+està
+ets
+faig
+fan
+fas
+fem
+fer
+feu
+haver
+inclòs
+llarg
+llavors
+mentre
+meu
+mode
+molt
+molts
+nosaltres
+per
+per que
+perquè
+però
+podem
+poden
+poder
+podeu
+potser
+primer
+puc
+quan
+quant
+qui
+sabem
+saben
+saber
+sabeu
+sap
+saps
+sense
+ser
+seu
+seus
+sóc
+solament
+sols
+som
+sota
+també
+tene
+tenim
+tenir
+teniu
+teu
+tinc
+tot
+una
+uns
+unes
+uns
+vaig
+van
+vosaltres
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/subscribermail.txt
new file mode 100644
index 000000000..5558d2ff5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/subscribermail.txt
@@ -0,0 +1,15 @@
+La pàgina @PAGE@ del wiki @TITLE@ ha estat modificada.
+Heus ací els canvis:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Per cancel·lar la subscripció a aquesta pàgina, entre al wiki en
+@DOKUWIKIURL@, aneu a
+@NEWPAGE@
+i trieu 'Cancel·la subscripció'.
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/updateprofile.txt
new file mode 100644
index 000000000..0ba022600
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualització del perfil d'usuari ======
+
+Només cal que completeu els camps que vulgueu canviar. El nom d'usuari no es pot canviar.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/uploadmail.txt
new file mode 100644
index 000000000..c282f1f37
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/uploadmail.txt
@@ -0,0 +1,14 @@
+S'ha penjat un fitxer al vostre DokuWiki. Heus ací els detalls:
+
+Fitxer: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Adreça IP: @IPADDRESS@
+Ordinador: @HOSTNAME@
+Mida: @SIZE@
+Tipus MIME: @MIME@
+Usuari: @USER@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/wordblock.txt
new file mode 100644
index 000000000..1b5f5fb36
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ca/wordblock.txt
@@ -0,0 +1,4 @@
+====== Brossa blocada ======
+
+Els canvis **no** s'han desat perquè contenen una o més paraules blocades. Volíeu inundar el wiki amb brossa? Molt mal fet! Si penseu que això és un error, contacteu amb l'administrador d'aquest Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/admin.txt
new file mode 100644
index 000000000..ccfbc4455
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/admin.txt
@@ -0,0 +1,3 @@
+====== Správa ======
+
+Níže je možno spravovat vaši DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/adminplugins.txt
new file mode 100644
index 000000000..005f8f2df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/adminplugins.txt
@@ -0,0 +1 @@
+===== Další pluginy =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/backlinks.txt
new file mode 100644
index 000000000..59430eeae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/backlinks.txt
@@ -0,0 +1,3 @@
+====== Zpětné odkazy ======
+
+Zde je seznam stránek, které pravděpodobně odkazují na aktuální stránku.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/conflict.txt
new file mode 100644
index 000000000..941118db3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/conflict.txt
@@ -0,0 +1,5 @@
+====== Existuje novější verze ======
+
+Existuje novější verze právě upravovaného dokumentu. To se stává, pokud někdo jiný změnil dokument, který právě upravujete.
+
+Prohlédněte si níže uvedené rozdíly, případně rozdíly z obou verzí ručně spojte dohromady a rozhodněte se, kterou verzi uchovat. Pokud zvolíte ''Uložit'', bude uložena vaše verze. Jinak stiskněte ''Storno'' pro uchování původní verze.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/denied.txt
new file mode 100644
index 000000000..00a8811de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/denied.txt
@@ -0,0 +1,3 @@
+====== Nepovolená akce ======
+
+Promiňte, ale nemáte dostatečná oprávnění k této činnosti. Možná jste se zapomněli přihlásit?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/diff.txt
new file mode 100644
index 000000000..d49e56993
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/diff.txt
@@ -0,0 +1,4 @@
+====== Rozdíly ======
+
+Zde můžete vidět rozdíly mezi vybranou verzí a aktuální verzí dané stránky.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/draft.txt
new file mode 100644
index 000000000..ebdfb8d9d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/draft.txt
@@ -0,0 +1,5 @@
+====== Nalezen koncept ======
+
+Vaše minulá editace této stránky nebyla korektně dokončena. DokuWiki během editace automaticky uložila koncept, který nyní můžete použít a pokračovat v editaci. Níže je vidět text uložený během minulé editace.
+
+Prosím rozhodněte se, jestli chcete automaticky uložený koncept //obnovit// a pokračovat v editaci, nebo jej chcete //vymazat//, nebo úplně //zrušit// celý proces editace.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/edit.txt
new file mode 100644
index 000000000..1a135aee3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/edit.txt
@@ -0,0 +1 @@
+Upravte stránku a stiskněte ''Uložit''. Na stránce [[wiki:syntax]] se můžete dozvědět více o wiki syntaxi. Prosím upravujte stránky pouze, pokud je můžete **vylepšit**. V případě, že si chcete něco pouze vyzkoušet, použijte raději [[playground:playground|pískoviště]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/editrev.txt
new file mode 100644
index 000000000..44f0bc67d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/editrev.txt
@@ -0,0 +1,2 @@
+**Máte načtenou starší verzi dokumentu!** Pokud ji uložíte, vytvoříte tím novou aktuální verzi.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/index.txt
new file mode 100644
index 000000000..d19626f6f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Zde je k dispozici index všech dostupných stránek seřazený podle [[doku>namespaces|jmenných prostorů]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/install.html
new file mode 100644
index 000000000..726d7c31f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/install.html
@@ -0,0 +1,23 @@
+<p>Tato stránka vám pomůže při první instalaci a konfiguraci
+<a href="http://dokuwiki.org">Dokuwiki</a>. Více
+informací o tomto instalátoru naleznete v jeho vlastní <a
+href="http://dokuwiki.org/installer">dokumentaci</a>.</p>
+
+<p>DokuWiki používá obyčejné soubory pro uložení wiki stránek a dalších informací
+spojených s nimi (např. obrázků, vyhledávacích indexů, starších verzí). Aby DokuWiki
+správně fungovala <strong>musí</strong> mít přístup k adresářům, kde jsou uloženy
+tyto soubory. Tento instalátor není schopen sám nastavit přístupová práva k souborům
+a adresářům. To se obyčejně dělá přímo v shellu nebo, používáte-li hosting, přes
+FTP nebo ovládací panel vašeho hostingu (např. cPanel).</p>
+
+<p>Tento instalátor nastaví <acronym title="access control list">ACL</acronym>
+(přístupová práva uživatelů) pro vaši DokuWiki, což umožní správci přihlásit
+se do administrační části DokuWiki a tam instalovat pluginy, spravovat uživatele,
+nastavovat přístup k wiki stránkám a měnit další nastavení wiki. Není to
+nutné, ale zpříjemní to správu DokuWiki.</p>
+
+<p>Zkušení uživatelé nebo uživatelé se speciálními požadavky by se
+měli podívat na následující stránky pro další informace ohledně
+<a href="http://dokuwiki.org/install">instalace</a> a
+<a href="http://dokuwiki.org/config">nastavení</a> DokuWiki.</p>
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/lang.php
new file mode 100644
index 000000000..ffc2a05d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/lang.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Czech language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Bohumir Zamecnik <bohumir@zamecnik.org>
+ * @author Tomas Valenta <t.valenta@sh.cvut.cz>
+ * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
+ * @author tomas@valenta.cz
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Upravit stránku';
+$lang['btn_source']            = 'Zdrojový kód stránky';
+$lang['btn_show']              = 'Zobrazit stránku';
+$lang['btn_create']            = 'Vytvořit stránku';
+$lang['btn_search']            = 'Hledat';
+$lang['btn_save']              = 'Uložit';
+$lang['btn_preview']           = 'Náhled';
+$lang['btn_top']               = 'Nahoru';
+$lang['btn_newer']             = '<< novější';
+$lang['btn_older']             = 'starší >>';
+$lang['btn_revs']              = 'Starší verze';
+$lang['btn_recent']            = 'Poslední úpravy';
+$lang['btn_upload']            = 'Načíst';
+$lang['btn_cancel']            = 'Storno';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Upravit';
+$lang['btn_login']             = 'Přihlásit se';
+$lang['btn_logout']            = 'Odhlásit se';
+$lang['btn_admin']             = 'Správa';
+$lang['btn_update']            = 'Aktualizovat';
+$lang['btn_delete']            = 'Vymazat';
+$lang['btn_back']              = 'Zpět';
+$lang['btn_backlink']          = 'Zpětné odkazy';
+$lang['btn_backtomedia']       = 'Zpět do Výběru dokumentu';
+$lang['btn_subscribe']         = 'Odebírat mailem změny stránky';
+$lang['btn_unsubscribe']       = 'Neodebírat mailem změny stránky';
+$lang['btn_subscribens']       = 'Odebírat mailem změny ve jmenném prostoru';
+$lang['btn_unsubscribens']     = 'Neodebírat mailem změny ve jmenném prostoru';
+$lang['btn_profile']           = 'Upravit profil';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_resendpwd']         = 'Zaslat nové heslo';
+$lang['btn_draft']             = 'Upravit koncept';
+$lang['btn_recover']           = 'Obnovit koncept';
+$lang['btn_draftdel']          = 'Vymazat koncept';
+$lang['btn_revert']            = 'Vrátit zpět';
+$lang['loggedinas']            = 'Přihlášen(a) jako';
+$lang['user']                  = 'Uživatelské jméno';
+$lang['pass']                  = 'Heslo';
+$lang['newpass']               = 'Nové heslo';
+$lang['oldpass']               = 'Současné heslo';
+$lang['passchk']               = 'ještě jednou';
+$lang['remember']              = 'Přihlásit se nastálo';
+$lang['fullname']              = 'Celé jméno';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Registrovat';
+$lang['profile']               = 'Uživatelský profil';
+$lang['badlogin']              = 'Zadané uživatelské jméno a heslo není správně.';
+$lang['minoredit']             = 'Drobné změny';
+$lang['draftdate']             = 'Koncept automaticky uložen v';
+$lang['nosecedit']             = 'Stránka byla v mezičase změněna. Informace o sekci již nebylo platné, byla načtena celá stránka.';
+$lang['regmissing']            = 'Musíte vyplnit všechny údaje.';
+$lang['reguexists']            = 'Uživatel se stejným jménem už je zaregistrován.';
+$lang['regsuccess']            = 'Uživatelský účet byl vytvořen a heslo zasláno mailem.';
+$lang['regsuccess2']           = 'Uživatelský účet byl vytvořen.';
+$lang['regmailfail']           = 'Zdá se, že nastala chyba při posílání mailu s heslem. Zkuste kontaktovat správce.';
+$lang['regbadmail']            = 'Zadaná mailová adresa není platná. Pokud si myslíte, že to je špatně, zkuste kontaktovat správce.';
+$lang['regbadpass']            = 'Heslo nebylo zadáno dvakrát stejně, zkuste to prosím znovu.';
+$lang['regpwmail']             = 'Vaše heslo do systému DokuWiki';
+$lang['reghere']               = 'Nemáte uživatelský účet? Zřiďte si ho';
+$lang['profna']                = 'Tato wiki neumožňuje změnu profilu';
+$lang['profnochange']          = 'Žádné změny nebyly provedeny.';
+$lang['profnoempty']           = 'Nelze zadat prázdné jméno nebo mailová adresa.';
+$lang['profchanged']           = 'Uživatelský profil změněn.';
+$lang['pwdforget']             = 'Zapomněli jste heslo? Nechte si zaslat nové';
+$lang['resendna']              = 'Tato wiki neumožňuje zasílání nových hesel.';
+$lang['resendpwd']             = 'Odeslat nové heslo pro uživatele';
+$lang['resendpwdmissing']      = 'Musíte vyplnit všechny položky.';
+$lang['resendpwdnouser']       = 'Bohužel takový uživatel v systému není.';
+$lang['resendpwdbadauth']      = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?';
+$lang['resendpwdconfirm']      = 'Odkaz na potvrzovací stránku byl odeslán mailem.';
+$lang['resendpwdsuccess']      = 'Vaše nové heslo bylo odesláno emailem.';
+$lang['license']               = 'Kromě míst, kde je explicitně uvedeno jinak, je obsah této wiki licencován pod následující licencí:';
+$lang['licenseok']             = 'Poznámka: Tím, že editujete tuto stránku, souhlasíte, aby váš obsah byl licencován pod následující licencí:';
+$lang['searchmedia']           = 'Hledat jméno souboru:';
+$lang['searchmedia_in']        = 'Hledat v %s';
+$lang['txt_upload']            = 'Vyberte soubor jako přílohu';
+$lang['txt_filename']          = 'Wiki jméno (volitelné)';
+$lang['txt_overwrt']           = 'Přepsat existující soubor';
+$lang['lockedby']              = 'Právě zamknuto:';
+$lang['lockexpire']            = 'Zámek vyprší:';
+$lang['willexpire']            = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
+$lang['notsavedyet']           = 'Jsou tu neuložené změny, které budou ztraceny.\nChcete opravdu pokračovat?';
+$lang['rssfailed']             = 'Nastala chyba při vytváření tohoto RSS: ';
+$lang['nothingfound']          = 'Nic nenalezeno.';
+$lang['mediaselect']           = 'Výběr dokumentu';
+$lang['fileupload']            = 'Načtení dokumentu';
+$lang['uploadsucc']            = 'Přenos proběhl v pořádku';
+$lang['uploadfail']            = 'Chyba při načítání. Možná kvůli špatně nastaveným právům?';
+$lang['uploadwrong']           = 'Načtení souboru s takovouto příponou není dovoleno.';
+$lang['uploadexist']           = 'Soubor už existuje, necháme ho být.';
+$lang['uploadbadcontent']      = 'Obsah načteného dokumentu %s neodpovídá jeho příponě.';
+$lang['uploadspam']            = 'Načtený dokument byl odmítnut, je na spamovém blacklistu.';
+$lang['uploadxss']             = 'Načtený dokument byl odmítnut. Zdá se, že obsahuje škodlivé věci.';
+$lang['uploadsize']            = 'Nahraný soubor byl příliš velký (max. %s)';
+$lang['deletesucc']            = 'Soubor "%s" byl vymazán.';
+$lang['deletefail']            = 'Soubor "%s" nelze vymazat - zkontrolujte oprávnění.';
+$lang['mediainuse']            = 'Soubor "%s" nebyl vymazán - stále se používá.';
+$lang['namespaces']            = 'Jmenné prostory';
+$lang['mediafiles']            = 'Dostupné soubory';
+$lang['js']['searchmedia']     = 'Hledat soubory';
+$lang['js']['keepopen']        = 'Po vybrání souboru nechat okno otevřené';
+$lang['js']['hidedetails']     = 'Skrýt detaily';
+$lang['js']['nosmblinks']      = 'Odkazování na sdílené prostředky Windows funguje jen v Internet Exploreru.
+Přesto tento odkaz můžete zkopírovat a vložit jinde.';
+$lang['js']['linkwiz']         = 'Průvodce odkazy';
+$lang['js']['linkto']          = 'Odkaz na:';
+$lang['js']['del_confirm']     = 'Vymazat tuto položku?';
+$lang['js']['mu_btn']          = 'Načíst více souborů najednou';
+$lang['mediausage']            = 'K odkázání se na tento soubor použijte následující syntax:';
+$lang['mediaview']             = 'Zobrazit původní soubor';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Načíst soubor do aktuálního jmenného prostoru. K vytvoření nových jmenných prostorů, přidejte jejich názvy na začátek wiki jména (oddělte dvojtečkou).';
+$lang['mediaextchange']        = 'Přípona souboru byla změněna z .%s na .%s!';
+$lang['reference']             = 'Odkazy na';
+$lang['ref_inuse']             = 'Soubor nelze vymazat, jelikož ho využívají následující stránky:';
+$lang['ref_hidden']            = 'Některé odkazy jsou na stránkách, kam nemáte právo přístupu';
+$lang['hits']                  = '- počet výskytů';
+$lang['quickhits']             = 'Odpovídající stránky';
+$lang['toc']                   = 'Obsah';
+$lang['current']               = 'aktuální';
+$lang['yours']                 = 'Vaše verze';
+$lang['diff']                  = 'zobrazit rozdíly vůči aktuální verzi';
+$lang['diff2']                 = 'zobrazit rozdíly mezi vybranými verzemi';
+$lang['line']                  = 'Řádek';
+$lang['breadcrumb']            = 'Historie';
+$lang['youarehere']            = 'Umístění';
+$lang['lastmod']               = 'Poslední úprava';
+$lang['by']                    = 'autor:';
+$lang['deleted']               = 'odstraněno';
+$lang['created']               = 'vytvořeno';
+$lang['restored']              = 'stará verze byla obnovena';
+$lang['external_edit']         = 'upraveno mimo DokuWiki';
+$lang['summary']               = 'Komentář k úpravám';
+$lang['noflash']               = 'Pro přehrání obsahu potřebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['download']              = 'Stáhnout snippet';
+$lang['mail_newpage']          = 'nová stránka:';
+$lang['mail_changed']          = 'změna stránky:';
+$lang['mail_new_user']         = 'nový uživatel:';
+$lang['mail_upload']           = 'načtený dokument:';
+$lang['qb_bold']               = 'Tučně';
+$lang['qb_italic']             = 'Kurzíva';
+$lang['qb_underl']             = 'Podtržení';
+$lang['qb_code']               = 'Neformátovat (zdrojový kód)';
+$lang['qb_strike']             = 'Přeškrtnutý text';
+$lang['qb_h1']                 = 'Nadpis 1. úrovně';
+$lang['qb_h2']                 = 'Nadpis 2. úrovně';
+$lang['qb_h3']                 = 'Nadpis 3. úrovně';
+$lang['qb_h4']                 = 'Nadpis 4. úrovně';
+$lang['qb_h5']                 = 'Nadpis 5. úrovně';
+$lang['qb_h']                  = 'Nadpis';
+$lang['qb_hs']                 = 'Vybrat nadpis';
+$lang['qb_hplus']              = 'Nadpis vyšší úrovně';
+$lang['qb_hminus']             = 'Nadpis nižší úrovně';
+$lang['qb_hequal']             = 'Nadpis stejné úrovně';
+$lang['qb_link']               = 'Interní odkaz';
+$lang['qb_extlink']            = 'Externí odkaz';
+$lang['qb_hr']                 = 'Vodorovná čára';
+$lang['qb_ol']                 = 'Číslovaný seznam';
+$lang['qb_ul']                 = 'Nečíslovaný seznam';
+$lang['qb_media']              = 'Vložit obrázky nebo jiné soubory';
+$lang['qb_sig']                = 'Vložit podpis';
+$lang['qb_smileys']            = 'Emotikony';
+$lang['qb_chars']              = 'Speciální znaky';
+$lang['upperns']               = 'skočit do nadřazeného jmenného prostoru';
+$lang['admin_register']        = 'Přidat nového uživatele';
+$lang['metaedit']              = 'Upravit Metadata';
+$lang['metasaveerr']           = 'Chyba při zápisu metadat';
+$lang['metasaveok']            = 'Metadata uložena';
+$lang['img_backto']            = 'Zpět na';
+$lang['img_title']             = 'Titulek';
+$lang['img_caption']           = 'Popis';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Jméno souboru';
+$lang['img_fsize']             = 'Velikost';
+$lang['img_artist']            = 'Autor fotografie';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formát';
+$lang['img_camera']            = 'Typ fotoaparátu';
+$lang['img_keywords']          = 'Klíčová slova';
+$lang['subscribe_success']     = 'Uživatel %s je nyní přihlášen k odběru změn ve stránce %s';
+$lang['subscribe_error']       = 'Chyba při zařazování uživatele %s do seznamu pro odběr změn ve stránce %s';
+$lang['subscribe_noaddress']   = 'K vašemu uživatelskému profilu chybí mailová adresa, takže vás nelze zařadit do seznamu pro odběr změn';
+$lang['unsubscribe_success']   = 'Uživatel %s byl odebrán ze seznamu pro odběr změn ve stránce %s';
+$lang['unsubscribe_error']     = 'Chyba při odstraňování uživatele %s ze seznamu pro odběru změn ve stránce %s';
+$lang['authmodfailed']         = 'Autentizace uživatelů je špatně nastavena. Informujte prosím správce této wiki.';
+$lang['authtempfail']          = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
+$lang['i_chooselang']          = 'Vyberte si jazyk';
+$lang['i_installer']           = 'Instalace DokuWiki';
+$lang['i_wikiname']            = 'Název wiki';
+$lang['i_enableacl']           = 'Zapnout ACL (doporučeno)';
+$lang['i_superuser']           = 'Správce';
+$lang['i_problems']            = 'Instalátor narazil na níže popsané problémy. Nelze pokračovat v instalaci, dokud je neopravíte.';
+$lang['i_modified']            = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte souboru z instalačního balíčku nebo se zkuste poradit s <a href="http://dokuwiki.org/install">instrukcemi pro instalci DokuWiki</a>.';
+$lang['i_funcna']              = 'PHP funkce <code>%s</code> není dostupná. Váš webhosting ji možná z nějakého důvodu vypnul.';
+$lang['i_phpver']              = 'Verze vaší instalace PHP <code>%s</code> je nižší než požadovaná <code>%s</code>. Budete muset aktualizovat svou instalaci PHP.';
+$lang['i_permfail']            = 'DokuWiki nemůže zapisovat do <code>%s</code>. Budete muset opravit práva k tomuto adresáři.';
+$lang['i_confexists']          = '<code>%s</code> již existuje';
+$lang['i_writeerr']            = 'Nelze vytvořit <code>%s</code>. Budete muset zkontrolovat práva k souborům či adresářům a vytvořit tento soubor ručně.';
+$lang['i_badhash']             = 'soubor dokuwiki.php (hash=<code>%s</code>) nebyl rozpoznán nebo byl upraven';
+$lang['i_badval']              = '<code>%s</code> - neplatná nebo prázdná hodnota';
+$lang['i_success']             = 'Konfigurace byla úspěšně dokončena. Nyní můžete smazat soubor install.php. Pokračujte do <a href="doku.php">své nové DokuWiki</a>.';
+$lang['i_failure']             = 'Vyskytly se nějaké chyby při zápisu do konfiguračních souborů. Budete je nejspíš muset upravit ručně před použitím <a href="doku.php">své nové DokuWiki</a>.';
+$lang['i_policy']              = 'Úvodní politika ACL';
+$lang['i_pol0']                = 'Otevřená wiki (čtení, zápis a upload pro všechny)';
+$lang['i_pol1']                = 'Veřejná wiki (čtení pro všechny, zápis a upload pro registrované uživatele)';
+$lang['i_pol2']                = 'Uzavřená wiki (čtení, zápis a upload pouze pro registrované uživatele)';
+$lang['i_retry']               = 'Zkusit znovu';
+$lang['mu_intro']              = 'Zde můžete načíst více souborů najednou. Pro přidání souborů do fronty stiskněte tlačítko "Procházet". Až budete hotovi, stiskněte "Načíst".';
+$lang['mu_gridname']           = 'Název souboru';
+$lang['mu_gridsize']           = 'Velikost';
+$lang['mu_gridstat']           = 'Stav';
+$lang['mu_namespace']          = 'Jmenný prostor';
+$lang['mu_browse']             = 'Procházet';
+$lang['mu_toobig']             = 'příliš velké';
+$lang['mu_ready']              = 'připraveno k načtení';
+$lang['mu_done']               = 'hotovo';
+$lang['mu_fail']               = 'selhalo';
+$lang['mu_authfail']           = 'vypršla session';
+$lang['mu_progress']           = '@PCT@% načten';
+$lang['mu_filetypes']          = 'Povolené typy souborů';
+$lang['mu_info']               = 'soubory načteny.';
+$lang['mu_lasterr']            = 'Poslední chyba:';
+$lang['recent_global']         = 'Právě si prohlížíte změny ve jmenném prostoru <b>%s</b>. Také si můžete <a href="%s">zobrazit změny v celé wiki</a>.';
+$lang['years']                 = 'před % roky';
+$lang['months']                = 'před % měsíci';
+$lang['weeks']                 = 'před % týdny';
+$lang['days']                  = 'před % dny';
+$lang['hours']                 = 'před % hodinami';
+$lang['minutes']               = 'před % minutami';
+$lang['seconds']               = 'před % sekundami';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/locked.txt
new file mode 100644
index 000000000..23fd943a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/locked.txt
@@ -0,0 +1,3 @@
+====== Stránka je zamknutá ======
+
+Tato stránka je právě zamknutá pro úpravy jiným uživatelem. Musíte počkat, než onen uživatel dokončí své úpravy nebo než tento zámek vyprší.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/login.txt
new file mode 100644
index 000000000..a44ae599a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/login.txt
@@ -0,0 +1,3 @@
+====== Přihlášení ======
+
+Momentálně nejste přihlášen(a)! Prosím vložte své identifikační údaje níže. Pro přihlášení musíte mít zapnuté cookies.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/mailtext.txt
new file mode 100644
index 000000000..9fc68cdce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/mailtext.txt
@@ -0,0 +1,17 @@
+Stránka ve vaší DokuWiki byla změněna. Zde jsou podrobnosti:
+
+Datum       : @DATE@
+Prohlížeč   : @BROWSER@
+IP adresa   : @IPADDRESS@
+Hostitel    : @HOSTNAME@
+Stará verze : @OLDPAGE@
+Nová verze  : @NEWPAGE@
+Komentář    : @SUMMARY@
+Uživatel    : @USER@
+
+@DIFF@
+
+
+-- 
+Tato zpráva byla vygenerována systémem DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/newpage.txt
new file mode 100644
index 000000000..091250af7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/newpage.txt
@@ -0,0 +1,3 @@
+====== Stránka s tímto názvem ještě neexistuje ======
+
+Odkaz vás zavedl na stránku, která ještě neexistuje. Můžete ji vytvořit stisknutím tlačítka ''Vytvořit stránku''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/norev.txt
new file mode 100644
index 000000000..f601f5899
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/norev.txt
@@ -0,0 +1,3 @@
+====== Taková verze neexistuje ======
+
+Zadaná verze neexistuje. Stiskněte tlačítko ''Starší verze'' pro seznam starších verzí tohoto dokumentu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/preview.txt
new file mode 100644
index 000000000..079eda4e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/preview.txt
@@ -0,0 +1,3 @@
+====== Náhled ======
+
+Zde je náhled, jak bude dokument vypadat. Pozor: Soubor zatím **není uložen**!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/pwconfirm.txt
new file mode 100644
index 000000000..1199150e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/pwconfirm.txt
@@ -0,0 +1,13 @@
+Dobrý den,
+
+Někdo požádal o nové heslo k vašemu uživatelskému účtu na wiki @TITLE@ (@DOKUWIKIURL@)
+
+Pokud jste o nové heslo nežádali, ignorujte prosím tento mail.
+
+Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevřete následující odkaz.
+
+@CONFIRM@
+
+-- 
+Tento mail byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/read.txt
new file mode 100644
index 000000000..d5b2d73cb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/read.txt
@@ -0,0 +1 @@
+Tato stránka je pouze pro čtení. Můžete si pouze prohlédnout zdrojový kód, ale ne ho měnit. Zeptejte se správce, pokud si myslíte, že něco není v pořádku.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/recent.txt
new file mode 100644
index 000000000..e4ca5e9bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/recent.txt
@@ -0,0 +1,3 @@
+====== Poslední úpravy ======
+
+Následující stránky byly nedávno změněny.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/register.txt
new file mode 100644
index 000000000..b0d6bb1ff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/register.txt
@@ -0,0 +1,3 @@
+====== Zaregistrujte se jako nový uživatel ======
+
+Abyste získali uživatelský účet, vyplňte prosím všechny informace v následujícím formuláři. Zadejte **platnou** mailovou adresu, na níž bude zasláno heslo. Uživatelské jméno musí být v platném [[doku>pagename|formátu]] (který je stejný jako formát názvu stránky).
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/registermail.txt
new file mode 100644
index 000000000..e51ee6bb2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/registermail.txt
@@ -0,0 +1,14 @@
+Zaregistroval se nový uživatel. Zde jsou detaily:
+
+Uživatelské jméno : @NEWUSER@
+Celé jméno : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Datum : @DATE@
+Prohlížeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME
+
+-- 
+Tato zpráva byla vygenerována systémem DokuWiki
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/resendpwd.txt
new file mode 100644
index 000000000..1d2aa0d97
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Zaslat nové heslo ======
+
+Abyste získali nové heslo k vašemu učtu v této wiki, vyplňte všechny níže uvedené informace . Vaše nové heslo bude zasláno na emailovou adresu, kterou jste zadali při registraci. Uživatelské jméno by mělo být stejné jako vaše uživatelské jméno, s nímž se přihlašujete do této wiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/revisions.txt
new file mode 100644
index 000000000..e3744b76f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/revisions.txt
@@ -0,0 +1,3 @@
+====== Starší verze ======
+
+Zde jsou starší verze daného dokumentu. Pro návrat ke starší verzi si ji zvolte ze seznamu níže, stiskněte tlačítko ''Upravit stránku'' a uložte ji.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/searchpage.txt
new file mode 100644
index 000000000..ac045e100
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/searchpage.txt
@@ -0,0 +1,5 @@
+====== Vyhledávání ======
+
+Výsledky hledání můžete vidět níže. Pokud jste nenašli, co hledáte, zkuste požadovanou stránku sami vytvořit stisknutím tlačítka ''Vytvořit stránku''.
+
+===== Výsledky =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/showrev.txt
new file mode 100644
index 000000000..48be467b2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/showrev.txt
@@ -0,0 +1,3 @@
+**Toto je starší verze dokumentu!**
+----
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/stopwords.txt
new file mode 100644
index 000000000..26d874143
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/stopwords.txt
@@ -0,0 +1,944 @@
+# Stopwords for Czech - generated from ispell-cs (license: GNU GPL)
+aby
+ako
+akorát
+ale
+and
+ani
+ano
+apod
+asi
+atd
+během
+bez
+beze
+blízko
+bohudík
+bohužel
+bokem
+buď
+bude
+budem
+budeme
+budeš
+budete
+budiž
+budou
+budu
+bůhvíco
+bůhvíčí
+bůhvíjak
+bůhvíjaký
+bůhvíkam
+bůhvíkde
+bůhvíkdo
+bůhvíkdy
+bůhvíkolik
+bůhvíkterý
+bůhvínač
+bůhvíproč
+bych
+bychom
+byl
+byla
+byli
+bylo
+byly
+bysme
+být
+cca
+cokoli
+cokoliv
+copak
+cosi
+což
+cože
+častěji
+často
+čeho
+čehokoli
+čehokoliv
+čehosi
+čehož
+čem
+čemkoli
+čemkoliv
+čemsi
+čemu
+čemukoli
+čemukoliv
+čemusi
+čemuž
+čemž
+čertvíco
+čertvíčí
+čertvíjak
+čertvíjaký
+čertvíkam
+čertvíkde
+čertvíkdo
+čertvíkdy
+čertvíkolik
+čertvíkterý
+čertvínač
+čertvíproč
+číhokoli
+číhosi
+číchkoli
+číchsi
+číkoli
+čím
+čímakoli
+čímasi
+čímikoli
+čímisi
+čímkoli
+čímkoliv
+čímpak
+čímsi
+čímukoli
+čímusi
+čímž
+čísi
+dál
+dále
+daleko
+další
+dám
+dle
+dnem
+dnes
+dneska
+dobrá
+dobré
+dobrý
+dobře
+docela
+dokonce
+doposavad
+doposud
+doprostřed
+dosavad
+dospod
+dospodu
+dost
+dosti
+dosud
+dovnitř
+eště
+formou
+ho
+hodinou
+hodně
+horší
+hůř
+hůře
+chceš
+chci
+chtěl
+jacíkoli
+jacíkoliv
+jacípak
+jacísi
+jak
+jakákoli
+jakákoliv
+jakápak
+jakási
+jaké
+jakéhokoli
+jakéhokoliv
+jakéhopak
+jakéhosi
+jakékoli
+jakékoliv
+jakémkoli
+jakémkoliv
+jakémpak
+jakémsi
+jakémukoli
+jakémukoliv
+jakémupak
+jakémusi
+jaképak
+jakési
+jakmile
+jako
+jakou
+jakoukoli
+jakoukoliv
+jakoupak
+jakousi
+jakož
+jakpak
+jaký
+jakýchkoli
+jakýchkoliv
+jakýchpak
+jakýchsi
+jakýkoli
+jakýkoliv
+jakýmakoli
+jakýmakoliv
+jakýmapak
+jakýmasi
+jakýmikoli
+jakýmikoliv
+jakýmipak
+jakýmisi
+jakýmkoli
+jakýmkoliv
+jakýmpak
+jakýmsi
+jakýpak
+jakýsi
+jakže
+jasné
+jasně
+jde
+je
+jediná
+jediné
+jediný
+jeho
+jehož
+jej
+její
+jejíhož
+jejich
+jejichž
+jejíchž
+jejímaž
+jejímiž
+jejímuž
+jejímž
+jejíž
+jejž
+jelikož
+jemu
+jemuž
+jen
+jenom
+jenž
+jenže
+jestli
+ještě
+jež
+ježto
+ji
+jí
+jich
+jichž
+jim
+jím
+jimi
+jimiž
+jimž
+jímž
+jiná
+jinak
+jiné
+jinou
+jiný
+jiných
+jiným
+jisté
+jistě
+již
+jíž
+jménem
+jsem
+jseš
+jsi
+jsme
+jsou
+jste
+kam
+každý
+kde
+kdeco
+kdečí
+kdejaký
+kdekdo
+kdekterý
+kdepak
+kdesi
+kdo
+kdokoli
+kdokoliv
+kdopak
+kdosi
+kdovíjak
+kdovíkde
+kdovíkdo
+kdož
+kdy
+kdysi
+když
+kohokoli
+kohokoliv
+kohopak
+kohosi
+kohož
+kol
+kolem
+kolik
+kolikže
+kolkolem
+komkoli
+komkoliv
+kompak
+komsi
+komu
+komukoli
+komukoliv
+komupak
+komusi
+komuž
+komž
+koncem
+konče
+končí
+končíc
+konec
+kontra
+kromě
+která
+kterákoli
+kterákoliv
+kterási
+kterážto
+které
+kteréhokoli
+kteréhokoliv
+kteréhosi
+kteréhož
+kterékoli
+kterékoliv
+kterém
+kterémkoli
+kterémkoliv
+kterémsi
+kterémukoli
+kterémukoliv
+kterémusi
+kterémuž
+kterémžto
+kterési
+kteréžto
+kterou
+kteroukoli
+kteroukoliv
+kterousi
+kteroužto
+který
+kterýchkoli
+kterýchkoliv
+kterýchsi
+kterýchžto
+kterýkoli
+kterýkoliv
+kterým
+kterýmakoli
+kterýmakoliv
+kterýmasi
+kterýmikoli
+kterýmikoliv
+kterýmisi
+kterýmiž
+kterýmkoli
+kterýmkoliv
+kterýmsi
+kterýmžto
+kterýsi
+kterýžto
+kteří
+kteřísi
+kteřížto
+ktříkoli
+ktříkoliv
+kupodivu
+kupříkladu
+kvůli
+kýmkoli
+kýmkoliv
+kýmpak
+kýmsi
+kýmž
+lecco
+leccos
+lecčems
+lecjak
+lecjaký
+leckam
+leckams
+leckde
+leckdo
+leckdy
+leckterý
+ledaco
+ledacos
+ledačí
+ledajak
+ledajaký
+ledakdo
+ledakterý
+ledaskam
+ledaskde
+ledaskdo
+ledaskdy
+lépe
+lepší
+líp
+má
+mají
+málo
+máloco
+málokdo
+málokterý
+mám
+máme
+máš
+máte
+max
+mé
+mě
+mého
+měl
+měla
+mělo
+mém
+mému
+mezi
+mi
+mí
+mimo
+min
+míň
+místo
+mít
+mne
+mně
+mnoho
+mnou
+moc
+mohl
+mohla
+mohou
+mohu
+moje
+moji
+mojí
+mou
+možná
+mu
+můj
+musel
+muset
+musí
+musím
+musíš
+musíte
+může
+můžeš
+můžete
+můžu
+my
+mých
+mým
+mými
+nač
+načež
+načpak
+nad
+nade
+nám
+námi
+namísto
+naň
+naprosto
+naproti
+např
+napříč
+nás
+náš
+naši
+navíc
+navrch
+navrchu
+navzdory
+ně
+nebo
+nebude
+nebyl
+nebyli
+nebyly
+něco
+něčí
+nedaleko
+nehledíc
+něho
+něhož
+nechceš
+nechci
+nechť
+nechtěl
+něj
+nějak
+nějaká
+nějaké
+nějakého
+nějakou
+nějaký
+nejasné
+nejasný
+nejčastěji
+nejde
+nejen
+nejhůř
+nejhůře
+nejlépe
+nejnižší
+nejsem
+nejsou
+nejvyšší
+nějž
+někam
+někde
+někdo
+někdy
+několik
+nekončí
+některý
+nelze
+něm
+nemá
+nemají
+nemálo
+nemám
+nemáme
+nemáš
+nemáte
+nemít
+nemohl
+nemohla
+nemohou
+nemohu
+němu
+nemusel
+nemuset
+nemusí
+nemusím
+nemusíš
+němuž
+nemůže
+nemůžeš
+nemůžete
+nemůžu
+němž
+není
+nepřesná
+nepřesné
+nepřesně
+nepřesný
+nepřímo
+netřeba
+netuším
+netýká
+neví
+nevím
+nevíš
+nevlastní
+nevyjímaje
+nevyjímajíc
+než
+něž
+ni
+ní
+nic
+ničeho
+ničem
+ničemu
+ničí
+ničím
+nie
+nieje
+nich
+nichž
+nijaký
+nikdo
+nikto
+nim
+ním
+nimi
+nimiž
+nimž
+nímž
+nízká
+niž
+níž
+nižádný
+níže
+nižší
+nový
+nutně
+oba
+obě
+oběma
+obou
+oč
+očpak
+ode
+odspoda
+odspodu
+ohledně
+okamžikem
+okolo
+on
+oň
+ona
+onen
+oni
+ono
+ony
+opravdu
+oproti
+ostatní
+osum
+pak
+poblíž
+počátkem
+počínaje
+počínajíc
+pod
+pode
+podél
+podle
+podobně
+pokud
+poměrně
+pomocí
+ponad
+pořád
+poslední
+posléze
+posud
+potom
+pražádný
+pro
+proč
+pročpak
+proň
+prostě
+proti
+proto
+protože
+před
+přede
+předem
+přes
+přese
+přesná
+přesné
+přesně
+přesný
+při
+přičemž
+přímo
+případná
+případné
+případně
+případný
+přitom
+půlí
+raději
+rokem
+sám
+sama
+samá
+samé
+samého
+samém
+samému
+sami
+samo
+samou
+samozřejmě
+samozřejmý
+samu
+samy
+samý
+samých
+samým
+samými
+se
+sebe
+sebou
+sem
+ses
+si
+sice
+sis
+skoro
+skrz
+skrze
+snad
+sobě
+som
+sotva
+sotvaco
+sotvakdo
+spíš
+spíše
+spodem
+spolu
+stačí
+stejně
+stranou
+středem
+svá
+své
+svého
+svém
+svému
+sví
+svoje
+svoji
+svojí
+svou
+svrchu
+svůj
+svých
+svým
+svými
+špatná
+špatné
+špatně
+špatný
+tací
+tady
+tahle
+tak
+taká
+také
+takhle
+takováto
+takové
+takovéhoto
+takovémto
+takovémuto
+takovéto
+takovíto
+takovouto
+takový
+takovýchto
+takovýma
+takovýmato
+takovýmito
+takovýmto
+takovýto
+takto
+taky
+taký
+takže
+tam
+tamten
+tatáž
+tato
+táž
+tě
+tebe
+tebou
+teď
+teda
+tedy
+téhle
+téhož
+těchhle
+těchto
+těchže
+těm
+téma
+těmahle
+těmhle
+těmihle
+těmito
+těmto
+těmu
+témuž
+témž
+témže
+ten
+tenhle
+tenhleten
+tento
+tentýž
+této
+téže
+ti
+tihle
+tím
+tímhle
+tímtéž
+tímto
+titíž
+tito
+tíž
+tobě
+tohle
+toho
+tohohle
+tohoto
+tom
+tomhle
+tomtéž
+tomto
+tomu
+tomuhle
+tomuto
+totéž
+toto
+touhle
+toutéž
+touto
+touž
+touže
+trochu
+trošku
+třeba
+tuhle
+tutéž
+tuto
+tvá
+tvé
+tvého
+tvém
+tvému
+tví
+tvoje
+tvoji
+tvojí
+tvou
+tvůj
+tvých
+tvým
+tvými
+ty
+tyhle
+týchž
+týká
+týmiž
+týmž
+tys
+tytéž
+tyto
+týž
+úderem
+uplná
+uplné
+úplně
+úplný
+uprostřed
+určitě
+uvnitř
+úvodem
+vám
+vámi
+vás
+váš
+vaše
+vaši
+včetně
+vedle
+velmi
+veprostřed
+versus
+vespod
+vespodu
+veškerý
+vevnitř
+víc
+více
+vím
+vinou
+víš
+viz
+vlastně
+vlivem
+vně
+vnitřka
+vnitřkem
+vnitřku
+von
+vrchem
+však
+vše
+všecek
+všecka
+všecko
+všecky
+všeho
+všech
+všechen
+všechna
+všechno
+všechnu
+všechny
+všelico
+všelicos
+všeličehos
+všeličems
+všeličemus
+všeličí
+všeličíms
+všelijaký
+všelikdo
+všeliký
+všeliskdo
+všem
+všemi
+všemu
+vši
+vší
+všicci
+všichni
+vším
+vůbec
+vůči
+vy
+vyjma
+vysoká
+výše
+vyšší
+vzdor
+vzhledem
+vždy
+za
+zač
+začátkem
+začpak
+zaň
+zásluhou
+zatím
+závěrem
+zboku
+zcela
+zčásti
+zda
+zdaleka
+zde
+zespoda
+zespodu
+zevnitř
+zeza
+znovu
+zpět
+zpod
+zponad
+zpoza
+zprostřed
+zřídkaco
+zřídkakdo
+zvnitřka
+zvnitřku
+žádný
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/subscribermail.txt
new file mode 100644
index 000000000..6ef6411d0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/subscribermail.txt
@@ -0,0 +1,23 @@
+Dobrý den,
+
+Stránka @PAGE@ ve wiki @TITLE@ se změnila.
+Tady jsou detaily:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Uživatel: @USER@
+Souhrn úpravy: @SUMMARY@
+Původní revize: @OLDPAGE@
+Nová revize: @NEWPAGE@
+
+
+Pro odhlášení z odběru změn pro tuto stránku se přihlašte do wiki
+@DOKUWIKIURL@ a vstupte na stránku
+@NEWPAGE@, kde stisknete tlačítko "Neodebírat změny mailem".
+
+-- 
+Tato zpráva byla vygenerována systémem DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/updateprofile.txt
new file mode 100644
index 000000000..d5eadc66c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Upravit profil vašeho učtu ======
+
+Vyplňte pouze pole, která chcete změnit. Nemůžete ale změnit své uživatelské jméno.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/uploadmail.txt
new file mode 100644
index 000000000..98f860138
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/uploadmail.txt
@@ -0,0 +1,14 @@
+Do vaší DokuWiki byl nahrán nový dokument. Tady jsou detaily:
+
+Soubor : @MEDIA@
+Datum : @DATE@
+Prohlážeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME@
+Velikost : @SIZE@
+MIME typ : @MIME@
+Uživatel : @USER@
+
+-- 
+Tato zpráva byla vygenerována systémem DokuWiki
+@DOKUWIKIUR
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/wordblock.txt
new file mode 100644
index 000000000..75fe58e0c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/cs/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM nebyl povolen ======
+
+Vaše změny **nebyly uloženy**, protože obsahují jedno nebo více nepovolených slov. Wiki si nepotrpí na spam! Pokud se domníváte, že jde o omyl, kontaktujte správce.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/admin.txt
new file mode 100644
index 000000000..3ac4a70df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Nedenfor kan du finde en række administrative værktøjer.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/adminplugins.txt
new file mode 100644
index 000000000..2a3d687f1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/adminplugins.txt
@@ -0,0 +1 @@
+===== Yderligere udvidelser =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/backlinks.txt
new file mode 100644
index 000000000..6dfa3cc43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/backlinks.txt
@@ -0,0 +1,4 @@
+====== Henvisninger bagud ======
+
+Dette er en liste over alle de dokumenter der henviser tilbage til det nuværende dokument.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/conflict.txt
new file mode 100644
index 000000000..fc38cee63
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/conflict.txt
@@ -0,0 +1,5 @@
+====== Der eksisterer en nyere udgave af dokumentet ======
+
+Der eksisterer en nyere udgave af dette dokument. Det sker når flere brugere ændrer i dokumentet på samme tid.
+
+Gennemgå de viste forskelle grundigt, og beslut hvilken udgave der skal bevares. Hvis du vælger ''Gem'', bliver din udgave af dokumentet gemt. Vælger du ''Fortryd'' beholder du den nuværende udgave.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/denied.txt
new file mode 100644
index 000000000..a4fa8b88f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/denied.txt
@@ -0,0 +1,3 @@
+====== Adgang nægtet! ======
+
+Du har ikke rettigheder til at fortsætte. Måske er du ikke logget ind.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/diff.txt
new file mode 100644
index 000000000..f77224f2f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/diff.txt
@@ -0,0 +1,4 @@
+====== Forskelle ======
+
+Dette viser forskellene mellem den valgte og den nuværende udgave af dokumentet. Gul er linjer der findes i den gamle udgave, og grøn er linjer der findes i den nuværende.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/draft.txt
new file mode 100644
index 000000000..69c780140
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/draft.txt
@@ -0,0 +1,6 @@
+====== Kladdefil fundet ======
+
+Din sidste redigeringssession på denne side blev ikke afsluttet korrekt. DokuWiki har automatisk gemt en kladde mens du arbejdede, som du kan benytte til at fortsætte redigeringen. Forneden kan du se de data der blev gemt fra din sidste session.
+
+Vælg venligst, om du vil //gendanne// din tabte redigering, //slette// den gemte kladde eller //afbryde// redigeringen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/edit.txt
new file mode 100644
index 000000000..0a9ea39dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/edit.txt
@@ -0,0 +1,2 @@
+Rediger dette dokument og tryk på knappen **''[Gem]''**. Se [[wiki:syntax|Formaterings tips]] for Wiki syntaks. Ret venligst kun dette dokument hvis du kan **forbedre** det. Brug venligst [[playground:playground|sandkassen]] til at teste før du retter i et rigtigt dokument. Husk også at bruge **''[Forhåndsvisning]''** før du gemmer dokumentet.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/editrev.txt
new file mode 100644
index 000000000..438363e5d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hentet en gammel udgave af dette dokument!** Hvis du gemmer dokumentet vil du overskrive den nuværende med den gamle udgave.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/index.txt
new file mode 100644
index 000000000..74afb9831
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/index.txt
@@ -0,0 +1,3 @@
+====== Indeks ======
+
+Dette er en oversigt over alle tilgængelige dokumenter, sorteret efter [[doku>namespaces|navnerum]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/install.html
new file mode 100644
index 000000000..5c53c5546
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/install.html
@@ -0,0 +1,24 @@
+<p>Denne side hjælper til første-gangs installation og konfiguration af 
+<a href="http://dokuwiki.org">Dokuwiki</a>. Mere information om denne 
+installer er tilgængelig på dens egen
+<a href="http://dokuwiki.org/installer">dokumentations side</a>.</p>
+
+<p>DokuWiki bruger almindelige filer til at gemme wiki sider og anden 
+information relaterende til disse sider (f.eks. billeder, søge indeks, gamle 
+udgaver, osv).  For at fungerer optimalt <strong>skal</strong> DokuWiki have 
+skrive adgang til mapperne der holder disse filer. Denne installer er ikke 
+istand til at opsætte mappe tilladelser. Det skal normalt udføres direkte i en 
+kommando shell eller hvis du bruger hosting, gennem FTP eller dit hostings 
+kontrol panel (f.eks. cPanel).</p>
+
+<p>Denne installer vil opsætte din DokuWiki konfiguration for 
+<acronym title="access control list">ACL</acronym>, hvilket tillader 
+administrator login og adgang til DokuWiki's adminstrative menu til 
+installation af udvidelser, håndtering af brugere, håndtering af adgang til wiki 
+sider og ændring af konfigurations indstillinger. Det er ikke et krav for at 
+DokuWiki kan fungere, men det vil gøre DokuWiki lettere at administre.</p>
+
+<p>Erfarne brugere og brugere med specielle opsætningskrav burde bruge disse 
+henvisninger for detaljer vedrørende 
+<a href="http://dokuwiki.org/install">installations instruktioner</a>
+og <a href="http://dokuwiki.org/config">konfigurations indstillinger</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/lang.php
new file mode 100644
index 000000000..56239718b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/lang.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * danish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author koeppe <koeppe@kazur.dk>
+ * @author Jon Bendtsen <bendtsen@diku.dk>
+ * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Kalle Sommer Nielsen <kalle@php.net>
+ * @author Esben Laursen <hyber@hyber.dk>
+ * @author Harith <haj@berlingske.dk>
+ * @author Daniel Ejsing-Duun <dokuwiki@zilvador.dk>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Rediger dette dokument';
+$lang['btn_source']            = 'Vis kildekode';
+$lang['btn_show']              = 'Vis dokument';
+$lang['btn_create']            = 'Opret dette dokument';
+$lang['btn_search']            = 'Søg';
+$lang['btn_save']              = 'Gem';
+$lang['btn_preview']           = 'Forhåndsvisning';
+$lang['btn_top']               = 'Tilbage til toppen';
+$lang['btn_newer']             = '<< forrige side';
+$lang['btn_older']             = 'næste side >>';
+$lang['btn_revs']              = 'Gamle udgaver';
+$lang['btn_recent']            = 'Nye ændringer';
+$lang['btn_upload']            = 'Overføre';
+$lang['btn_cancel']            = 'Fortryd';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Rediger';
+$lang['btn_login']             = 'Log ind';
+$lang['btn_logout']            = 'Log ud';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Opdater';
+$lang['btn_delete']            = 'Slet';
+$lang['btn_back']              = 'Tilbage';
+$lang['btn_backlink']          = 'Henvisninger bagud';
+$lang['btn_backtomedia']       = 'Tilbage til valg af mediefil';
+$lang['btn_subscribe']         = 'Abonner på ændringer';
+$lang['btn_unsubscribe']       = 'Fjern abonnement på ændringer';
+$lang['btn_subscribens']       = 'Abonner på namespace ændringer';
+$lang['btn_unsubscribens']     = 'Fjern abonnement på namespace ændringer';
+$lang['btn_profile']           = 'Opdater profil';
+$lang['btn_reset']             = 'Nulstil';
+$lang['btn_resendpwd']         = 'Send nyt adgangskode';
+$lang['btn_draft']             = 'Rediger kladde';
+$lang['btn_recover']           = 'Gendan kladde';
+$lang['btn_draftdel']          = 'Slet kladde';
+$lang['btn_revert']            = 'Reetablere';
+$lang['loggedinas']            = 'Logget på som';
+$lang['user']                  = 'Brugernavn';
+$lang['pass']                  = 'Adgangskode';
+$lang['newpass']               = 'Nyt adgangskode';
+$lang['oldpass']               = 'Bekræft gammelt adgangskode';
+$lang['passchk']               = 'Gentag nyt adgangskode';
+$lang['remember']              = 'Log automatisk på';
+$lang['fullname']              = 'Navn';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Tilmeld';
+$lang['profile']               = 'Brugerprofil';
+$lang['badlogin']              = 'Brugernavn eller adgangskode var forkert.';
+$lang['minoredit']             = 'Mindre ændringer';
+$lang['draftdate']             = 'Kladde automatisk gemt d.';
+$lang['nosecedit']             = 'Siden blev ændret i mellemtiden, sektions information var for gammel, hentede hele siden i stedet.';
+$lang['regmissing']            = 'Du skal udfylde alle felter.';
+$lang['reguexists']            = 'Dette brugernavn er allerede i brug.';
+$lang['regsuccess']            = 'Du er nu oprettet som bruger. Dit adgangskode bliver sendt til dig i en e-mail.';
+$lang['regsuccess2']           = 'Du er nu oprettet som bruger.';
+$lang['regmailfail']           = 'Dit adgangskode blev ikke sendt. Kontakt venligst administratoren.';
+$lang['regbadmail']            = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.';
+$lang['regbadpass']            = 'De to adgangskoder er ikke ens, vær venlig at prøve igen.';
+$lang['regpwmail']             = 'Dit DokuWiki password';
+$lang['reghere']               = 'Opret en DokuWiki-konto her';
+$lang['profna']                = 'Denne wiki understøtter ikke ændring af profiler';
+$lang['profnochange']          = 'Ingen ændringer, intet modificeret.';
+$lang['profnoempty']           = 'Tomt navn eller e-mail adresse er ikke tilladt.';
+$lang['profchanged']           = 'Brugerprofil opdateret korrekt.';
+$lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
+$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
+$lang['resendpwd']             = 'Send nyt adgangskode for';
+$lang['resendpwdmissing']      = 'Du skal udfylde alle felter.';
+$lang['resendpwdnouser']       = 'Vi kan ikke finde denne bruger i vores database.';
+$lang['resendpwdbadauth']      = 'Beklager, denne autoriseringskode er ikke gyldig. Kontroller venligst at du benyttede det fulde link til bekræftelse.';
+$lang['resendpwdconfirm']      = 'Et henvisning med bekræftelse er blevet sendt med email.';
+$lang['resendpwdsuccess']      = 'Dit nye adgangskode er blevet sendt med e-mail.';
+$lang['license']               = 'Med mindre andet angivet, vil indhold på denne wiki blive frigjort under følgende licens:';
+$lang['licenseok']             = 'Note: ved at ændre denne side, acceptere du at dit indhold bliver frigivet under følgende licens:';
+$lang['searchmedia']           = 'Søg filnavn';
+$lang['searchmedia_in']        = 'Søg i %s';
+$lang['txt_upload']            = 'Vælg den fil der skal overføres';
+$lang['txt_filename']          = 'Indtast wikinavn (valgfrit)';
+$lang['txt_overwrt']           = 'Overskriv eksisterende fil';
+$lang['lockedby']              = 'Midlertidig låst af';
+$lang['lockexpire']            = 'Lås udløber kl.';
+$lang['willexpire']            = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
+$lang['notsavedyet']           = 'Der er lavet ændringer i dokumentet. Hvis du fortsætter vil ændringerne gå tabt.\nØnsker du at fortsætte?';
+$lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
+$lang['nothingfound']          = 'Søgningen gav intet resultat.';
+$lang['mediaselect']           = 'Vælg mediefil';
+$lang['fileupload']            = 'Overføre mediefil';
+$lang['uploadsucc']            = 'Overførelse var en succes';
+$lang['uploadfail']            = 'Overførelse fejlede. Der er muligvis problemer med rettighederne.';
+$lang['uploadwrong']           = 'Overførelse afvist. Filtypen er ikke tilladt.';
+$lang['uploadexist']           = 'Filen eksisterer allerede.';
+$lang['uploadbadcontent']      = 'Overføret indhold tilsvaret ikke til %s fil-endelsen.';
+$lang['uploadspam']            = 'Overførelsen blev blokeret af spam sortlisten.';
+$lang['uploadxss']             = 'Overførelsen blev blokeret på grund af mulig skadeligt indhold.';
+$lang['uploadsize']            = 'Den overføret fil var for stor (max. %s)';
+$lang['deletesucc']            = 'Filen "%s" er blevet slettet.';
+$lang['deletefail']            = '"%s" kunne ikke slettes - check rettighederne.';
+$lang['mediainuse']            = 'Filen "%s" er ikke slettet - den er stadig i brug.';
+$lang['namespaces']            = 'Navnerum';
+$lang['mediafiles']            = 'Tilgængelige filer i';
+$lang['js']['searchmedia']     = 'Søg for filer';
+$lang['js']['keepopen']        = 'Hold vindue åbent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['js']['nosmblinks']      = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.
+Du kan stadig kopiere og indsætte linket.';
+$lang['js']['linkwiz']         = 'guiden til henvisninger';
+$lang['js']['linkto']          = 'Henvise til:';
+$lang['js']['del_confirm']     = 'Slet valgte post(er)?';
+$lang['js']['mu_btn']          = 'Overføre flere filer på en gang';
+$lang['mediausage']            = 'Brug den følgende syntaks til at henvise til denne fil:';
+$lang['mediaview']             = 'Vis oprindelig fil';
+$lang['mediaroot']             = 'rod';
+$lang['mediaupload']           = 'Overføre en fil til det nuværende navnerum her. For at oprette under-navnerum, tilføj dem til "Overføre som" filnavnet, adskilt af kolontegn.';
+$lang['mediaextchange']        = 'Filudvidelse ændret fra .%s til .%s!';
+$lang['reference']             = 'Henvisning til';
+$lang['ref_inuse']             = 'Filen kan ikke slettes, da den stadig er i brug på følgende sider:';
+$lang['ref_hidden']            = 'Nogle henvisninger er i dokumenter du ikke har læserettigheder til';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Tilsvarende dokumentnavne';
+$lang['toc']                   = 'Indholdsfortegnelse';
+$lang['current']               = 'nuværende';
+$lang['yours']                 = 'Din version';
+$lang['diff']                  = 'Vis forskelle i forhold til den nuværende udgave';
+$lang['diff2']                 = 'Vis forskelle i forhold til de valgte revisioner';
+$lang['line']                  = 'Linje';
+$lang['breadcrumb']            = 'Sti';
+$lang['youarehere']            = 'Du er her';
+$lang['lastmod']               = 'Sidst ændret';
+$lang['by']                    = 'af';
+$lang['deleted']               = 'slettet';
+$lang['created']               = 'oprettet';
+$lang['restored']              = 'gammel udgave reetableret';
+$lang['external_edit']         = 'ekstern redigering';
+$lang['summary']               = 'Redigerings resumé';
+$lang['noflash']               = 'Den <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> er nødvendig til at vise denne indehold.';
+$lang['download']              = 'Hente kodestykke';
+$lang['mail_newpage']          = 'dokument tilføjet:';
+$lang['mail_changed']          = 'dokument ændret:';
+$lang['mail_new_user']         = 'Ny bruger';
+$lang['mail_upload']           = 'fil overføret:';
+$lang['qb_bold']               = 'Fed';
+$lang['qb_italic']             = 'Kursiv';
+$lang['qb_underl']             = 'Understregning';
+$lang['qb_code']               = 'Skrivemaskine tekst';
+$lang['qb_strike']             = 'Gennemstregning';
+$lang['qb_h1']                 = 'Niveau 1 overskrift';
+$lang['qb_h2']                 = 'Niveau 2 overskrift';
+$lang['qb_h3']                 = 'Niveau 3 overskrift';
+$lang['qb_h4']                 = 'Niveau 4 overskrift';
+$lang['qb_h5']                 = 'Niveau 5 overskrift';
+$lang['qb_h']                  = 'Overskrift';
+$lang['qb_hs']                 = 'Vælg overskriften';
+$lang['qb_hplus']              = 'Højere overskriftsniveau';
+$lang['qb_hminus']             = 'Lavere overskriftsniveau';
+$lang['qb_hequal']             = 'Samme overskriftsniveau';
+$lang['qb_link']               = 'Intern henvisning';
+$lang['qb_extlink']            = 'Ekstern henvisning';
+$lang['qb_hr']                 = 'Vandret linje';
+$lang['qb_ol']                 = 'Nummereret liste';
+$lang['qb_ul']                 = 'Unummereret liste';
+$lang['qb_media']              = 'Tilføj billeder og andre filer';
+$lang['qb_sig']                = 'Indsæt signatur';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Specialtegn';
+$lang['upperns']               = 'Gå til overordnet navnerum';
+$lang['admin_register']        = 'Tilføj ny bruger';
+$lang['metaedit']              = 'Rediger metadata';
+$lang['metasaveerr']           = 'Skrivning af metadata fejlede';
+$lang['metasaveok']            = 'Metadata gemt';
+$lang['img_backto']            = 'Tilbage til';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Billedtekst';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Filnavn';
+$lang['img_fsize']             = 'Størrelse';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Ophavsret';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Emneord';
+$lang['subscribe_success']     = 'Tilføjet %s til abonnentliste for %s';
+$lang['subscribe_error']       = 'Fejl ved tilføjelse af %s til abonnentliste for %s';
+$lang['subscribe_noaddress']   = 'Ingen adresse knyttet til dit login, du kan ikke tilføjes til abonnentlisten';
+$lang['unsubscribe_success']   = 'Fjernet %s fra abonnentliste for %s';
+$lang['unsubscribe_error']     = 'Fejl ved fjernelse af %s fra abonnentliste for %s';
+$lang['authmodfailed']         = 'Fejl i brugervalideringens konfiguration. Kontakt venligst wikiens administrator.';
+$lang['authtempfail']          = 'Brugervalidering er midlertidigt ude af drift. Hvis dette er vedvarende, kontakt venligst wikiens administrator.';
+$lang['i_chooselang']          = 'Vælg dit sprog';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wiki Navn';
+$lang['i_enableacl']           = 'Brug ACL (foreslået)';
+$lang['i_superuser']           = 'Superbruger';
+$lang['i_problems']            = 'Installeren fandt nogle problemer, vist nedenunder. Du kan ikke fortsætte før du har rettet dem.';
+$lang['i_modified']            = 'Af sikkerheds hensyn vil dette script kun virke på en ny og umodificeret Dokuwiki installation.
+Du burde enten gen-udpakke filerne fra den hentede pakke eller tjekke den fuldstændige
+<a href="http://dokuwiki.org/install">DokuWiki installations instruktioner</a>';
+$lang['i_funcna']              = 'PHP funtionen <code>%s</code> er ikke tilgængelig. Måske har din udbyder slået det fra af en eller anden grund?';
+$lang['i_phpver']              = 'Din PHP version <code>%s</code> er mindre en den nødvendige <code>%s</code>. Du er nød til at opgradere din PHP installation.';
+$lang['i_permfail']            = 'DokuWiki kan ikke skrive til <code>%s</code>. Du er nød til at rette tilladelses indstillingerne for denne mappe!';
+$lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
+$lang['i_writeerr']            = 'Kunne ikke oprette <code>%s</code>. Du bliver nød til at tjekke mappe/fil- tilladelserne og oprette filen manuelt.';
+$lang['i_badhash']             = 'uigenkendelig eller modificeret dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - ulovlig eller tom værdi';
+$lang['i_success']             = 'Konfigurationen fulførtedes med success.  Du kan nu slette install.php filen. Fortsætte til <a href="doku.php">din nye DokuWiki</a>.';
+$lang['i_failure']             = 'Nogle fejl forekom mens konfigurations filerne skulle skrives. Du er mulighvis nød til at fixe dem manuelt før du kan bruge <a href="doku.php">din nye DokuWiki</a>.';
+$lang['i_policy']              = 'Begyndende ACL politik';
+$lang['i_pol0']                = 'Åben Wiki (alle kan læse, skrive og uploade)';
+$lang['i_pol1']                = 'Offentlig Wiki (alle kan læse, kun registrerede brugere kan skrive og overføre)';
+$lang['i_pol2']                = 'Lukket Wiki (kun for registerede brugere kan læse, skrive og overføre)';
+$lang['i_retry']               = 'Forsøg igen';
+$lang['mu_intro']              = 'Her kan du overføre flere filer af gangen. Klik på gennemse for at tilføje dem til køen. Tryk på overføre knappen når du er klar.';
+$lang['mu_gridname']           = 'Filnavn';
+$lang['mu_gridsize']           = 'Størrelse';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Navnerum';
+$lang['mu_browse']             = 'gennemse';
+$lang['mu_toobig']             = 'for stor';
+$lang['mu_ready']              = 'klar til overføre';
+$lang['mu_done']               = 'færdig';
+$lang['mu_fail']               = 'fejlede';
+$lang['mu_authfail']           = 'session udløb';
+$lang['mu_progress']           = '@PCT@% upload';
+$lang['mu_filetypes']          = 'Tilladte filtyper';
+$lang['mu_info']               = 'filer var overføret.';
+$lang['mu_lasterr']            = 'Sidste fejl:';
+$lang['recent_global']         = 'Du ser lige nu ændringerne i <b>%s</b> navnerummet. Du kan også <a href="%s">se de sidste ændringer for hele wiki siden </a>';
+$lang['years']                 = '%d år siden';
+$lang['months']                = '%d måned siden';
+$lang['weeks']                 = '%d uge siden';
+$lang['days']                  = '%d dage siden';
+$lang['hours']                 = '%d timer siden';
+$lang['minutes']               = '%d minutter siden';
+$lang['seconds']               = '%d sekunder siden';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/locked.txt
new file mode 100644
index 000000000..74b677d51
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/locked.txt
@@ -0,0 +1,3 @@
+====== Låst Dokument ======
+
+Dette dokument er midlertidigt låst af en anden bruger. Vent venligst til brugeren er færdig med at redigere dokumentet, eller låsen udløber.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/login.txt
new file mode 100644
index 000000000..039bb0a7a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+Du er ikke logget ind! Indtast brugernavn og adgangskode. Din browser skal have tilladt cookies for at du kan logge ind.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/mailtext.txt
new file mode 100644
index 000000000..948a265fb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/mailtext.txt
@@ -0,0 +1,17 @@
+Et dokument i din DokuWiki blev ændret eller tilføjet. Her er detajlerne:
+
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adresse         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gammel udgave      : @OLDPAGE@
+Ny udgave          : @NEWPAGE@
+Redigerings resumé : @SUMMARY@
+Bruger             : @USER@
+
+@DIFF@
+
+
+-- 
+Denne e-mail blev genereret af DokuWiki på:
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/newpage.txt
new file mode 100644
index 000000000..1d602c02c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/newpage.txt
@@ -0,0 +1,3 @@
+====== Dette dokument eksisterer ikke (endnu) ======
+
+Du har fulgt en henvisning til et dokument der ikke eksisterer (endnu). Du kan oprette dokumentet ved at trykke på knappen **''[Opret dette dokument]''**.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/norev.txt
new file mode 100644
index 000000000..aa6896237
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/norev.txt
@@ -0,0 +1,4 @@
+====== Den valgte udgave findes ikke ======
+
+Den valgte udgave af dokumentet findes ikke! Tryk på knappen **''[Gamle udgaver]''** for at se en liste af gamle udgaver af dette dokument.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/preview.txt
new file mode 100644
index 000000000..23e65e89d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/preview.txt
@@ -0,0 +1,4 @@
+====== Forhåndsvisning ======
+
+Dette er en forhåndsvisning af hvordan dokumentet vil se ud. Husk: Det er //**IKKE**// gemt endnu! Hvis det ser godt ud, så tryk på knappen **''[Gem]''**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/pwconfirm.txt
new file mode 100644
index 000000000..3df556e68
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/pwconfirm.txt
@@ -0,0 +1,14 @@
+Hej @FULLNAME@!
+
+Nogen har bedt om et nyt password til dit @TITLE@
+login på @DOKUWIKIURL@
+
+Hvis du ikke bad om dette, så ignorer venligst denne email.
+
+For at bekræfte at det var dig der bad om dette, benyt venligst det følgende henvisning.
+
+@CONFIRM@
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/read.txt
new file mode 100644
index 000000000..49f65831b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/read.txt
@@ -0,0 +1,2 @@
+Dette dokument kan kun læses. Du kan se kildekoden, men ikke gemme ændringer i det. Hvis du mener at dette er en fejl, så skriv det venligst på [[wiki:fejl-oversigt]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/recent.txt
new file mode 100644
index 000000000..c44fa368e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/recent.txt
@@ -0,0 +1,5 @@
+====== Nye ændringer ======
+
+Følgende dokumenter er blevet ændret for nylig.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/register.txt
new file mode 100644
index 000000000..4ff2ed1eb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/register.txt
@@ -0,0 +1,4 @@
+====== Opret en wiki-konto ======
+
+Udfyld nedenstånde skema for at oprette en konto i denne wiki. Sørg for at bruge en **gyldig e-mail-adresse** - dit adgangskode bliver sendt til dig. Dit brugernavn skal være et gyldigt [[doku>pagename|dokumentnavn]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/registermail.txt
new file mode 100644
index 000000000..d431f7591
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/registermail.txt
@@ -0,0 +1,14 @@
+En ny bruger har registreret. Her er detaljerne:
+
+Brugernavn : @NEWUSER@
+Navn       : @NEWNAME@
+E-mail     : @NEWEMAIL@
+
+Dato       : @DATE@
+Browser    : @BROWSER@
+IP-adresse : @IPADDRESS@
+Værtsnavn  : @HOSTNAME@
+
+-- 
+Denne mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/resendpwd.txt
new file mode 100644
index 000000000..e96861ed2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Send nyt password ======
+
+Udfyld alle nedenstående felter for at få tilsendt et nyt password til denne wiki. Dit nye password vil blive sendt til den opgivne e-mail-adresse. Brugernavnet bør være dit wiki brugernavn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/revisions.txt
new file mode 100644
index 000000000..08f6f2073
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/revisions.txt
@@ -0,0 +1,3 @@
+====== Gamle udgaver ======
+
+Her er de gamle udgaver af dette dokument. Du kan vende tilbage til en tidligere udgave af dokumentet ved at vælge det nedenfor, trykke på knappen **''[Rediger dette dokument]''**, og til sidst gemme dokumentet.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/searchpage.txt
new file mode 100644
index 000000000..eca1b589c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/searchpage.txt
@@ -0,0 +1,5 @@
+====== Søgning ======
+
+Du kan se resultaterne af din søgning nedenunder. Hvis resultaterne ikke indeholder det du søgte efter kan du oprette et nyt dokument med samme navn som søgningen ved at trykke på knappen **''[Opret dette dokument]''**.
+
+===== Søgeresultater =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/showrev.txt
new file mode 100644
index 000000000..3d4890397
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/showrev.txt
@@ -0,0 +1,2 @@
+**Dette er en gammel udgave af dokumentet!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/stopwords.txt
new file mode 100644
index 000000000..0fb926720
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/stopwords.txt
@@ -0,0 +1,87 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+alle
+andet
+andre
+begge
+den
+denne
+der
+deres
+det
+dette
+dig
+din
+dog
+eller
+end
+ene
+eneste
+enhver
+fem
+fire
+flere
+fleste
+for
+fordi
+forrige
+fra
+før
+god
+han
+hans
+har
+hendes
+her
+hun
+hvad
+hvem
+hver
+hvilken
+hvis
+hvor
+hvordan
+hvorfor
+hvornår
+ikke
+ind
+ingen
+intet
+jeg
+jeres
+kan
+kom
+kommer
+lav
+lidt
+lille
+man
+mand
+mange
+med
+meget
+men
+mens
+mere
+mig
+ned
+nogen
+noget
+nyt
+nær
+næste
+næsten
+otte
+over
+seks
+ses
+som
+stor
+store
+syv
+til
+tre
+var
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/subscribermail.txt
new file mode 100644
index 000000000..e89dd3c46
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/subscribermail.txt
@@ -0,0 +1,17 @@
+Hej!
+
+Siden @PAGE@ i @TITLE@ wikien er blevet ændret.
+Her er detaljerne:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For at afmelde abonnement på denne side log ind på wikien på
+@DOKUWIKIURL@ , besøg
+@NEWPAGE@
+og vælg 'Fjern abonnement på ændringer'.
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/updateprofile.txt
new file mode 100644
index 000000000..2c6ce3f16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Opdater din kontos profil ======
+
+Du behøver kun at udfylde de felter du ønsker at ændre. Du kan ikke ændre dit brugernavn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/uploadmail.txt
new file mode 100644
index 000000000..316463fee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/uploadmail.txt
@@ -0,0 +1,14 @@
+En fil blev overføret til din DokuWiki. Her er detaljerne:
+
+Fil         : @MEDIA@
+Dato        : @DATE@
+Browser     : @BROWSER@
+IP-adresse  : @IPADDRESS@
+Værtsnavn   : @HOSTNAME@
+Størrelse   : @SIZE@
+MIME Type   : @MIME@
+Bruger      : @USER@
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/wordblock.txt
new file mode 100644
index 000000000..5a1c0d754
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/da/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM blokeret ======
+
+Dine ændringer blev **ikke** gemt da de indeholder et eller flere uønskede ord. Kontakt venligst admin, hvis du mener dette er en fejl.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/admin.txt
new file mode 100644
index 000000000..c52f343ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Folgende administrative Aufgaben stehen in DokuWiki zur Verfügung.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/adminplugins.txt
new file mode 100644
index 000000000..a0ae21faf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/adminplugins.txt
@@ -0,0 +1 @@
+===== Zusätzliche Plugins =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/backlinks.txt
new file mode 100644
index 000000000..aae4c5582
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/backlinks.txt
@@ -0,0 +1,5 @@
+====== Backlinks ======
+
+Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/conflict.txt
new file mode 100644
index 000000000..a5ae425be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/conflict.txt
@@ -0,0 +1,6 @@
+====== Eine neuere Version existiert ======
+
+Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat parallel an der selben Seite gearbeitet und zuerst gespeichert.
+
+Die unten aufgeführten Unterschiede können bei der Entscheidung helfen, welchem Dokument Vorrang gewährt wird. Wähle **''[Speichern]''** zum Sichern deiner Version oder **''[Abbrechen]''**,  um deine Version zu verwerfen und die zuerst gespeicherte Seite zu behalten.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/denied.txt
new file mode 100644
index 000000000..ff3bdf9a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/denied.txt
@@ -0,0 +1,4 @@
+====== Zugang verweigert ======
+
+Du hast nicht die erforderlichen Rechte, um diese Aktion durchzuführen. Eventuell bist du nicht beim Wiki angemeldet?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/diff.txt
new file mode 100644
index 000000000..82fbbc252
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/diff.txt
@@ -0,0 +1,5 @@
+====== Unterschiede ======
+
+Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/draft.txt
new file mode 100644
index 000000000..704c6d1da
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/draft.txt
@@ -0,0 +1,6 @@
+====== Entwurf gefunden ======
+
+Deine letzte Bearbeitungssitzung wurde nicht ordnungsgemäß abgeschlossen. DokuWiki hat während deiner Arbeit automatisch einen Zwischenentwurf gespeichert, den du jetzt nutzen kannst, um deine Arbeit fortzusetzen. Unten siehst du die Daten, die bei deiner letzten Sitzung gespeichert wurden.
+
+Bitte entscheide dich, ob du den Entwurf //wieder herstellen// oder //löschen// willst oder ob du die Bearbeitung abbrechen möchtest.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/edit.txt
new file mode 100644
index 000000000..15e02c61a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/edit.txt
@@ -0,0 +1,4 @@
+Bitte nur editieren, falls das Dokument **verbessert** werden kann.
+
+Nach dem Bearbeiten den **''[Speichern]''**-Knopf drücken. Siehe [[wiki:syntax]] zur Wiki-Syntax. Zum Testen bitte erst im [[playground:playground|Spielplatz]] üben.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/editrev.txt
new file mode 100644
index 000000000..6c1f642cc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/editrev.txt
@@ -0,0 +1,2 @@
+**Eine ältere Version des Dokuments wurde geladen!** Beim Speichern wird eine neue Version des Dokuments mit diesem Inhalt erstellt.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/index.txt
new file mode 100644
index 000000000..fa8dc4663
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/index.txt
@@ -0,0 +1,4 @@
+====== Übersicht ======
+
+Dies ist eine Übersicht über alle vorhandenen Seiten und [[doku>namespaces|Namensräume]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/install.html
new file mode 100644
index 000000000..b8baa5f97
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/install.html
@@ -0,0 +1,27 @@
+<p>Diese Seite hilft dir bei der Erst-Installation und Konfiguration von
+<a href="http://dokuwiki.org">Dokuwiki</a>. Zusätzliche Informationen zu
+diesem Installationsskript findest du auf der entsprechenden
+<a href="http://dokuwiki.org/installer">Hilfe-Seite</a> (en).</p>
+
+<p>DokuWiki verwendet normale Dateien für das Speichern von Wikiseiten und
+anderen Informationen (Bilder, Suchindizes, alte Versionen, usw.).
+Um DokuWiki betreiben zu können, <strong>muss</strong> Schreibzugriff auf die
+Verzeichnisse bestehen, in denen DokuWiki diese Dateien ablegt. Dieses
+Installationsprogramm kann diese Rechte nicht für dich setzen. Du musst dies
+manuell auf einer Kommando-Shell oder, falls du DokuWiki bei einem Fremdanbieter
+hostest, über FTP oder ein entsprechendes Werkzeug (z.B. cPanel) durchführen.</p>
+
+<p>Dieses Skript hilft dir beim ersten Einrichten des Zugangsschutzes
+(<acronym title="access control list">ACL</acronym>) von DokuWiki, welcher eine
+Administratoranmeldung und damit Zugang zum Administrationsmenu ermöglicht.
+Dort kannst du dann weitere Tätigkeiten wie das Installieren von Plugins, das
+Verwalten von Nutzern und das Ändern von Konfigurationseinstellungen durchführen.
+Das Nutzen der Zugangskontrolle ist nicht zwingend erforderlich, es erleichtert aber
+die Administration von DokuWiki.</p>
+
+<p>Erfahrene Anwender oder Nutzer mit speziellen Konfigurationsbedürfnissen sollten
+die folgenden Links nutzen, um sich über
+<a href="http://dokuwiki.org/install">Installation</a>
+und <a href="http://dokuwiki.org/config">Konfiguration</a> zu
+informieren.</p>
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/lang.php
new file mode 100644
index 000000000..1747e3288
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/lang.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * german language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Christof <gagi@fin.de>
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author Michael Klier <chi@chimeric.de>
+ * @author Leo Moll <leo@yeasoft.com>
+ * @author Florian Anderiasch <fa@art-core.org>
+ * @author Robin Kluth <commi1993@gmail.com>
+ * @author Arne Pelka <mail@arnepelka.de>
+ * @author Alexander Fischer <tbanus@os-forge.net>
+ * @author Juergen Schwarzer <jschwarzer@freenet.de>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Diese Seite bearbeiten';
+$lang['btn_source']            = 'Zeige Quelltext';
+$lang['btn_show']              = 'Seite anzeigen';
+$lang['btn_create']            = 'Seite anlegen';
+$lang['btn_search']            = 'Suche';
+$lang['btn_save']              = 'Speichern';
+$lang['btn_preview']           = 'Vorschau';
+$lang['btn_top']               = 'Nach oben';
+$lang['btn_newer']             = '<< jüngere Änderungen';
+$lang['btn_older']             = 'ältere Änderungen >>';
+$lang['btn_revs']              = 'Ältere Versionen';
+$lang['btn_recent']            = 'Letzte Änderungen';
+$lang['btn_upload']            = 'Hochladen';
+$lang['btn_cancel']            = 'Abbrechen';
+$lang['btn_index']             = 'Übersicht';
+$lang['btn_secedit']           = 'Bearbeiten';
+$lang['btn_login']             = 'Anmelden';
+$lang['btn_logout']            = 'Abmelden';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Updaten';
+$lang['btn_delete']            = 'Löschen';
+$lang['btn_back']              = 'Zurück';
+$lang['btn_backlink']          = 'Links hierher';
+$lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
+$lang['btn_subscribe']         = 'Änderungen abonnieren';
+$lang['btn_unsubscribe']       = 'Änderungen abbestellen';
+$lang['btn_subscribens']       = 'Namensraumänderungen abonnieren';
+$lang['btn_unsubscribens']     = 'Namensraumänderungen abbestellen';
+$lang['btn_profile']           = 'Benutzerprofil';
+$lang['btn_reset']             = 'Zurücksetzen';
+$lang['btn_resendpwd']         = 'Sende neues Passwort';
+$lang['btn_draft']             = 'Entwurf bearbeiten';
+$lang['btn_recover']           = 'Entwurf wieder herstellen';
+$lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
+$lang['loggedinas']            = 'Angemeldet als';
+$lang['user']                  = 'Benutzername';
+$lang['pass']                  = 'Passwort';
+$lang['newpass']               = 'Neues Passwort';
+$lang['oldpass']               = 'Bestätigen (Altes Passwort)';
+$lang['passchk']               = 'und nochmal';
+$lang['remember']              = 'Angemeldet bleiben';
+$lang['fullname']              = 'Voller Name';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrieren';
+$lang['profile']               = 'Benutzerprofil';
+$lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
+$lang['minoredit']             = 'kleine Änderung';
+$lang['draftdate']             = 'Entwurf gespeichert am';
+$lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
+$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
+$lang['reguexists']            = 'Der Nutzername existiert leider schon.';
+$lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per Email versandt.';
+$lang['regsuccess2']           = 'Der neue Nutzer wurde angelegt.';
+$lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwortmail aufgetreten. Bitte wende dich an den Wiki-Admin.';
+$lang['regbadmail']            = 'Die angegebene Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wende dich bitte an den Wiki-Admin.';
+$lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuche es noch einmal.';
+$lang['regpwmail']             = 'Ihr DokuWiki Passwort';
+$lang['reghere']               = 'Du hast noch keinen Zugang? Hier anmelden';
+$lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
+$lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
+$lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
+$lang['profchanged']           = 'Benuzerprofil erfolgreich geändert.';
+$lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
+$lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
+$lang['resendpwd']             = 'Neues Passwort schicken für';
+$lang['resendpwdmissing']      = 'Es tut mir Leid, aber du musst alle Felder ausfüllen.';
+$lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
+$lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stelle sicher, dass du den kompletten Bestätigungslink verwendet haben.';
+$lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
+$lang['resendpwdsuccess']      = 'Dein neues Passwort wurde per E-Mail versandt.';
+$lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
+$lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite gibst du dein Einverständnis, dass dein Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+$lang['searchmedia']           = 'Suche Dateiname:';
+$lang['searchmedia_in']        = 'Suche in %s';
+$lang['txt_upload']            = 'Datei zum Hochladen auswählen';
+$lang['txt_filename']          = 'Hochladen als (optional)';
+$lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
+$lang['lockedby']              = 'Momentan gesperrt von';
+$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['notsavedyet']           = 'Nicht gespeicherte Änderungen gehen verloren!\nWeitermachen?';
+$lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
+$lang['nothingfound']          = 'Nichts gefunden.';
+$lang['mediaselect']           = 'Dateiauswahl';
+$lang['fileupload']            = 'Datei hochladen';
+$lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
+$lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
+$lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
+$lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung % überein.';
+$lang['uploadspam']            = 'Hochladen verweigert: Treffer auf der Spamliste.';
+$lang['uploadxss']             = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.';
+$lang['uploadsize']            = 'Die hochgeladene Datei war zu groß. (max. %s)';
+$lang['deletesucc']            = 'Die Datei "%s" wurde gelöscht.';
+$lang['deletefail']            = '"%s" konnte nicht gelöscht werden - prüfe die Berechtigungen.';
+$lang['mediainuse']            = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.';
+$lang['namespaces']            = 'Namensräume';
+$lang['mediafiles']            = 'Vorhandene Dateien in';
+$lang['js']['searchmedia']     = 'Suche nach Dateien';
+$lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
+$lang['js']['hidedetails']     = 'Details ausblenden';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows Freigaben funktioniert nur im Microsoft Internet Explorer.
+Der Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
+$lang['js']['linkwiz']         = 'Link-Assistent';
+$lang['js']['linkto']          = 'Link zu:';
+$lang['js']['del_confirm']     = 'Die ausgewählten Dateien wirklich löschen?';
+$lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
+$lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
+$lang['mediaview']             = 'Originaldatei öffnen';
+$lang['mediaroot']             = 'Wurzel';
+$lang['mediaupload']           = 'Lade hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stelle diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
+$lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
+$lang['reference']             = 'Verwendung von';
+$lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
+$lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die du keine Leseberechtigung hast.';
+$lang['hits']                  = 'Treffer';
+$lang['quickhits']             = 'Passende Seitennamen';
+$lang['toc']                   = 'Inhaltsverzeichnis';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Deine Version';
+$lang['diff']                  = 'Zeige Unterschiede zu aktueller Version';
+$lang['diff2']                 = 'Zeige Unterschiede der ausgewählten Versionen';
+$lang['line']                  = 'Zeile';
+$lang['breadcrumb']            = 'Zuletzt angesehen';
+$lang['youarehere']            = 'Du befindest dich hier';
+$lang['lastmod']               = 'Zuletzt geändert';
+$lang['by']                    = 'von';
+$lang['deleted']               = 'gelöscht';
+$lang['created']               = 'angelegt';
+$lang['restored']              = 'alte Version wieder hergestellt';
+$lang['external_edit']         = 'Externe Bearbeitung';
+$lang['summary']               = 'Zusammenfassung';
+$lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Ihnalt anzuzeigen.';
+$lang['download']              = 'Download-Teil';
+$lang['mail_newpage']          = 'Neue Seite:';
+$lang['mail_changed']          = 'Seite geaendert:';
+$lang['mail_new_user']         = 'Neuer Benutzer:';
+$lang['mail_upload']           = 'Datei hochgeladen:';
+$lang['qb_bold']               = 'Fetter Text';
+$lang['qb_italic']             = 'Kursiver Text';
+$lang['qb_underl']             = 'Unterstrichener Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Durchgestrichener Text';
+$lang['qb_h1']                 = 'Level 1 Überschrift';
+$lang['qb_h2']                 = 'Level 2 Überschrift';
+$lang['qb_h3']                 = 'Level 3 Überschrift';
+$lang['qb_h4']                 = 'Level 4 Überschrift';
+$lang['qb_h5']                 = 'Level 5 Überschrift';
+$lang['qb_h']                  = 'Überschrift';
+$lang['qb_hs']                 = 'Wähle eine Überschrift';
+$lang['qb_hplus']              = 'Überschrift eine Ebene höher';
+$lang['qb_hminus']             = 'Überschrift eine Ebene runter';
+$lang['qb_hequal']             = 'Überschrift auf selber Ebene';
+$lang['qb_link']               = 'Interner Link';
+$lang['qb_extlink']            = 'Externer Link';
+$lang['qb_hr']                 = 'Horizontale Linie';
+$lang['qb_ol']                 = 'Nummerierter Listenpunkt';
+$lang['qb_ul']                 = 'Listenpunkt';
+$lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
+$lang['qb_sig']                = 'Unterschrift einfügen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Sonderzeichen';
+$lang['upperns']               = 'Gehe zum Ausgangsfeld';
+$lang['admin_register']        = 'Neuen Benutzer anmelden';
+$lang['metaedit']              = 'Metadaten bearbeiten';
+$lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
+$lang['metasaveok']            = 'Metadaten gesichert';
+$lang['img_backto']            = 'Zurück zu';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Bildunterschrift';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Dateiname';
+$lang['img_fsize']             = 'Grösse';
+$lang['img_artist']            = 'FotografIn';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlagwörter';
+$lang['subscribe_success']     = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscribe_error']       = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['subscribe_noaddress']   = 'Weil deine E-Mail-Adresse fehlt, kannst du das Thema nicht abonnieren';
+$lang['unsubscribe_success']   = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
+$lang['unsubscribe_error']     = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wende dich an den Systembetreuer.';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Systembetreuer.';
+$lang['i_chooselang']          = 'Wähle deine Sprache';
+$lang['i_installer']           = 'DokuWiki Installation';
+$lang['i_wikiname']            = 'Wiki-Name';
+$lang['i_enableacl']           = 'Zugangskontrolle (ACL) aktivieren (empfohlen)';
+$lang['i_superuser']           = 'Administrator Benutzername';
+$lang['i_problems']            = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen, bevor du mit der Installation fortfahren kannst.';
+$lang['i_modified']            = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki-Installation. Du solltest entweder alle Dateien noch einmal frisch installieren oder die <a href="http://dokuwiki.org/install">Dokuwiki-Installationsanleitung</a> konsultieren.';
+$lang['i_funcna']              = 'Die PHP Funktion <code>%s</code> ist nicht verfügbar. Unter Umständen wurde sie von deinem Hoster deaktiviert?';
+$lang['i_phpver']              = 'Deine PHP-Version <code>%s</code> ist niedriger als die benötigte Version <code>%s</code>. Bitte aktualisiere deine PHP-Installation.';
+$lang['i_permfail']            = '<code>%s</code> ist nicht durch DokuWiki beschreibbar. Du musst die Berechtigungen dieses Ordners ändern!';
+$lang['i_confexists']          = '<code>%s</code> existiert bereits';
+$lang['i_writeerr']            = '<code>%s</code> konnte nicht erzeugt werden. Du solltest die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.';
+$lang['i_badhash']             = 'Unbekannte oder modifizierte dokuwiki.php (Hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - unerlaubter oder leerer Wert';
+$lang['i_success']             = 'Die Konfiguration wurde erfolgreich abgeschlossen. Du kannst jetzt die install.php löschen. Dein
+                        <a href="doku.php">neues DokuWiki</a> ist jetzt für dich bereit.';
+$lang['i_failure']             = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Du musst diese vermutlich von Hand beheben, bevor du dein <a href="doku.php">neues DokuWiki</a> nutzen kannst.';
+$lang['i_policy']              = 'Anfangseinstellung für Zugangskontrolle (ACL)';
+$lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben, hochladen für alle)';
+$lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben und hochladen für registrierte Nutzer)';
+$lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
+$lang['i_retry']               = 'Wiederholen';
+$lang['mu_intro']              = 'In diesem Bereich kannst du mehrere Dateien gleichzeitig hochladen. Benutze die Schaltfläche "Durchsuchen", um sie der Warteschlange zuzufügen. Betätige die Schaltfläche "Hochladen", um die Übertragung zu starten.';
+$lang['mu_gridname']           = 'Dateiname';
+$lang['mu_gridsize']           = 'Größe';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namensraum';
+$lang['mu_browse']             = 'Durchsuchen';
+$lang['mu_toobig']             = 'zu groß';
+$lang['mu_ready']              = 'bereit zum hochladen';
+$lang['mu_done']               = 'fertig';
+$lang['mu_fail']               = 'gescheitert';
+$lang['mu_authfail']           = 'Sitzung abgelaufen';
+$lang['mu_progress']           = '@PCT@% hochgeladen';
+$lang['mu_filetypes']          = 'Erlaubte Dateitypen';
+$lang['mu_info']               = 'Dateien hochgeladen.';
+$lang['mu_lasterr']            = 'Letzter Fehler:';
+$lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum <b>%s</b>. Du kannst auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/locked.txt
new file mode 100644
index 000000000..4430fc6dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/locked.txt
@@ -0,0 +1,4 @@
+====== Seite gesperrt ======
+
+Diese Seite ist momentan von einem anderen Nutzer gesperrt. Warte, bis dieser mit dem Bearbeiten fertig ist oder die Sperre abläuft.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/login.txt
new file mode 100644
index 000000000..5c99c48f1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/login.txt
@@ -0,0 +1,4 @@
+====== Anmelden ======
+
+Gib deinen Benutzernamen und dein Passwort in das Formular unten ein, um dich anzumelden. Bitte beachte, dass dafür "Cookies" in den Sicherheitseinstellungen deines Browsers erlaubt sein müssen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/mailtext.txt
new file mode 100644
index 000000000..4fd41ad19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/mailtext.txt
@@ -0,0 +1,17 @@
+Eine Seite in deinem Wiki wurde geändert oder neu angelegt. Hier sind die Details:
+
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Adresse     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Alte Version   : @OLDPAGE@
+Neue Version   : @NEWPAGE@
+Zusammenfassung: @SUMMARY@
+Benutzer       : @USER@
+
+@DIFF@
+
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/newpage.txt
new file mode 100644
index 000000000..5e261cc89
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/newpage.txt
@@ -0,0 +1,5 @@
+====== Dieses Thema existiert noch nicht ======
+
+Du bist einem Link zu einer Seite gefolgt, die noch nicht existiert. Du kannst die Seite mit dem Knopf **''[Seite anlegen]''** selbst anlegen und mit Inhalt füllen.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/norev.txt
new file mode 100644
index 000000000..c6243313d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/norev.txt
@@ -0,0 +1,4 @@
+====== Version existiert nicht ======
+
+Die angegebene Version des Dokuments wurde nicht gefunden. Benutze den **''[Ältere Versionen]''** Knopf, um eine Liste aller verfügbaren Versionen dieses Dokuments zu erhalten.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/preview.txt
new file mode 100644
index 000000000..d3a578f69
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/preview.txt
@@ -0,0 +1,5 @@
+====== Vorschau ======
+
+So wird dein Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/pwconfirm.txt
new file mode 100644
index 000000000..538597cfa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hallo @FULLNAME@!
+
+Jemand hat ein neues Passwort für deinen @TITLE@
+login auf @DOKUWIKIURL@ angefordert.
+
+Wenn du diese Änderung nicht angefordert hast, ignoriere diese
+E-Mail einfach.
+
+Um die Anforderung zu bestätigen, folge bitte dem unten angegebenen
+Bestätigungslink.
+
+@CONFIRM@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/read.txt
new file mode 100644
index 000000000..1c5422a29
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/read.txt
@@ -0,0 +1,2 @@
+Diese Seite ist nicht editierbar. Du kannst den Quelltext sehen, jedoch nicht verändern. Kontaktiere den Administrator, wenn du glaubst, dass hier ein Fehler vorliegt.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/recent.txt
new file mode 100644
index 000000000..c05bbae12
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/recent.txt
@@ -0,0 +1,5 @@
+====== Letzte Änderungen ======
+
+Die folgenden Seiten wurden zuletzt geändert.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/register.txt
new file mode 100644
index 000000000..8fe4718dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/register.txt
@@ -0,0 +1,4 @@
+====== Als neuer Nutzer registrieren ======
+
+Bitte fülle alle Felder aus, um einen neuen Nutzer-Account in diesem Wiki anzulegen. Stelle sicher, dass eine **gültige E-Mail-Adresse** angegeben wird - das Passwort wird an diese Adresse gesendet. Der Nutzername sollte aus einem Wort ohne Umlaute, Leer- oder Sonderzeichen bestehen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/registermail.txt
new file mode 100644
index 000000000..ed37a9505
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/registermail.txt
@@ -0,0 +1,14 @@
+Ein neuer Benutzer hat sich registriert. Hier sind die Details:
+
+Benutzername : @NEWUSER@
+Voller Name  : @NEWNAME@
+E-Mail       : @NEWEMAIL@
+
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/resendpwd.txt
new file mode 100644
index 000000000..4dcd4bb4d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Neues Passwort anfordern ======
+
+Fülle alle Felder unten aus, um ein neues Passwort für deinen Zugang zu erhalten. Das neue Passwort wird an deine gespeicherte E-Mail-Adresse geschickt. Der Benutzername sollte dein Wiki-Benutzername sein.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/revisions.txt
new file mode 100644
index 000000000..e4a7be8f1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/revisions.txt
@@ -0,0 +1,4 @@
+====== Ältere Versionen ======
+
+Dies sind ältere Versionen des gewählten Dokuments. Um zu einer älteren Version zurückzukehren, wähle die entsprechende Version aus, klicke auf **''[Diese Seite bearbeiten]''** und speichere sie erneut ab.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/searchpage.txt
new file mode 100644
index 000000000..72c57b765
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/searchpage.txt
@@ -0,0 +1,7 @@
+====== Suche ======
+
+Unten sind die Ergebnisse deiner Suche gelistet. Falls der gesuchte Begriff nicht gefunden wurde, kannst du direkt eine neue Seite für den Suchbegriff anlegen, indem du auf den Knopf **''[Seite anlegen]''** drückst.
+
+===== Ergebnisse =====
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/showrev.txt
new file mode 100644
index 000000000..65f53c9c1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/showrev.txt
@@ -0,0 +1,2 @@
+**Dies ist eine alte Version des Dokuments!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/stopwords.txt
new file mode 100644
index 000000000..443b17723
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/stopwords.txt
@@ -0,0 +1,125 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+aber
+als
+auch
+auf
+aus
+bei
+bin
+bis
+bist
+dadurch
+daher
+darum
+das
+daß
+dass
+dein
+deine
+dem
+den
+der
+des
+dessen
+deshalb
+die
+dies
+dieser
+dieses
+doch
+dort
+durch
+ein
+eine
+einem
+einen
+einer
+eines
+euer
+eure
+für
+hatte
+hatten
+hattest
+hattet
+hier
+hinter
+ich
+ihr
+ihre
+in
+im
+ist
+jede
+jedem
+jeden
+jeder
+jedes
+jener
+jenes
+jetzt
+kann
+kannst
+können
+könnt
+machen
+mein
+meine
+mit
+muß
+mußt
+musst
+müssen
+müßt
+nach
+nachdem
+nein
+nicht
+nun
+oder
+seid
+sein
+seine
+sich
+sie
+sind
+soll
+sollen
+sollst
+sollt
+sonst
+soweit
+sowie
+und
+unser
+unsere
+unter
+vom
+von
+vor
+um
+wann
+warum
+was
+weiter
+weitere
+wenn
+wer
+werde
+werden
+werdet
+weshalb
+wie
+wieder
+wieso
+wir
+wird
+wirst
+woher
+wohin
+zum
+zur
+über
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/subscribermail.txt
new file mode 100644
index 000000000..952ac911e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/subscribermail.txt
@@ -0,0 +1,23 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Das sind die Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum : @DATE@
+Benutzer : @USER@
+Übersicht: @SUMMARY@
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
+@DOKUWIKIURL@, besuche dann
+@NEWPAGE@
+und klicke auf die Taste 'Änderungen abbestellen'.
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/updateprofile.txt
new file mode 100644
index 000000000..66c2e8293
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Benutzerprofil ändern ======
+
+Nur die Felder, die du änderst, werden aktualisiert. Alle anderen bleiben, wie sie sind. Deinen Benutzernamen kannst du jedoch nicht ändern.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/uploadmail.txt
new file mode 100644
index 000000000..72e4a2a6e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/uploadmail.txt
@@ -0,0 +1,14 @@
+Eine Datei wurde in deinem Wiki hochgeladen. Hier sind die Details:
+
+Datei      : @MEDIA@
+Datum      : @DATE@
+Browser    : @BROWSER@
+IP-Adresse : @IPADDRESS@
+Hostname   : @HOSTNAME@
+Größe      : @SIZE@
+MIME-Typ   : @MIME@
+Benutzer   : @USER@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/wordblock.txt
new file mode 100644
index 000000000..cb3e4c06a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de-informal/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blockiert ======
+
+Deine Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls du versucht haben solltest, das Wiki zu Spammen -- Schande über ich! Wenn du glaubst, dass der Eintrag zu Unrecht blockiert wurde, kontaktiere bitte den Administrator des Wikis.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/admin.txt
new file mode 100644
index 000000000..c52f343ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Folgende administrative Aufgaben stehen in DokuWiki zur Verfügung.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/adminplugins.txt
new file mode 100644
index 000000000..d3bfd0910
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/adminplugins.txt
@@ -0,0 +1 @@
+===== Weitere Plugins =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/backlinks.txt
new file mode 100644
index 000000000..aae4c5582
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/backlinks.txt
@@ -0,0 +1,5 @@
+====== Backlinks ======
+
+Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/conflict.txt
new file mode 100644
index 000000000..d24e5b198
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/conflict.txt
@@ -0,0 +1,6 @@
+====== Eine neuere Version existiert ======
+
+Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat parallel an der selben Seite gearbeitet und zuerst gespeichert.
+
+Die unten aufgeführten Unterschiede können bei der Entscheidung helfen, welchem Dokument Vorrang gewährt wird. Wählen Sie  **''[Speichern]''** zum Sichern Ihrer Version oder **''[Abbrechen]''**,  um Ihre Version zu verwerfen und die zuerst gespeicherte Seite zu behalten.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/denied.txt
new file mode 100644
index 000000000..b87965067
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/denied.txt
@@ -0,0 +1,4 @@
+====== Zugang verweigert ======
+
+Sie haben nicht die erforderlichen Rechte, um diese Aktion durchzuführen. Eventuell sind Sie nicht beim Wiki angemeldet?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/diff.txt
new file mode 100644
index 000000000..82fbbc252
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/diff.txt
@@ -0,0 +1,5 @@
+====== Unterschiede ======
+
+Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/draft.txt
new file mode 100644
index 000000000..14a5e8495
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/draft.txt
@@ -0,0 +1,6 @@
+====== Entwurf gefunden ======
+
+Ihre letzte Bearbeitungssitzung wurde nicht ordnungsgemäß abgeschlossen. DokuWiki hat während Ihrer Arbeit automatisch einen Zwischenentwurf gespeichert, den Sie jetzt nutzen können, um Ihre Arbeit fortzusetzen. Unten sehen Sie die Daten, die bei Ihrer letzten Sitzung gespeichert wurden.
+
+Bitte entscheiden Sie, ob Sie den Entwurf //wieder herstellen// oder //löschen// wollen oder ob Sie die Bearbeitung abbrechen möchten.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/edit.txt
new file mode 100644
index 000000000..15e02c61a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/edit.txt
@@ -0,0 +1,4 @@
+Bitte nur editieren, falls das Dokument **verbessert** werden kann.
+
+Nach dem Bearbeiten den **''[Speichern]''**-Knopf drücken. Siehe [[wiki:syntax]] zur Wiki-Syntax. Zum Testen bitte erst im [[playground:playground|Spielplatz]] üben.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/editrev.txt
new file mode 100644
index 000000000..6c1f642cc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/editrev.txt
@@ -0,0 +1,2 @@
+**Eine ältere Version des Dokuments wurde geladen!** Beim Speichern wird eine neue Version des Dokuments mit diesem Inhalt erstellt.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/index.txt
new file mode 100644
index 000000000..fa8dc4663
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/index.txt
@@ -0,0 +1,4 @@
+====== Übersicht ======
+
+Dies ist eine Übersicht über alle vorhandenen Seiten und [[doku>namespaces|Namensräume]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/install.html
new file mode 100644
index 000000000..15fd1c36b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/install.html
@@ -0,0 +1,27 @@
+<p>Diese Seite hilft Ihnen bei der Erst-Installation und Konfiguration von
+<a href="http://dokuwiki.org">Dokuwiki</a>. Zusätzliche Informationen zu
+diesem Installationsskript finden Sie auf der entsprechenden
+<a href="http://dokuwiki.org/installer">Hilfe Seite</a> (en).</p>
+
+<p>DokuWiki verwendet normale Dateien für das Speichern von Wikiseiten und
+anderen Informationen (Bilder, Suchindizes, alte Versionen, usw.).
+Um DokuWiki betreiben zu können, <strong>muss</strong> Schreibzugriff auf die
+Verzeichnisse bestehen, in denen DokuWiki diese Dateien ablegt. Dieses
+Installationsprogramm kann diese Rechte nicht für Sie setzen. Sie müssen dies
+manuell auf einer Kommando-Shell oder, falls Sie DokuWiki bei einem Fremdanbieter
+hosten, über FTP oder ein entsprechendes Werkzeug (z.B. cPanel) durchführen.</p>
+
+<p>Dieses Skript hilft Ihnen beim ersten Einrichten des Zugangsschutzes
+(<acronym title="access control list">ACL</acronym>) von DokuWiki, welcher eine
+Administratoranmeldung und damit Zugang zum Administrationsmenu ermöglicht.
+Dort können Sie dann weitere Tätigkeiten wie das Installieren von Plugins, das
+Verwalten von Nutzern und das Ändern von Konfigurationseinstellungen durchführen.
+Das Nutzen der Zugangskontrolle ist nicht zwingend erforderlich, es erleichtert aber
+die Administration von DokuWiki.</p>
+
+<p>Erfahrene Anwender oder Nutzer mit speziellen Konfigurationsbedürfnissen sollten
+die folgenden Links nutzen, um sich über
+<a href="http://dokuwiki.org/install">Installation</a>
+und <a href="http://dokuwiki.org/config">Konfiguration</a> zu
+informieren.</p>
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/lang.php
new file mode 100644
index 000000000..d0c1f8b70
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/lang.php
@@ -0,0 +1,257 @@
+<?php
+/**
+ * german language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Christof <gagi@fin.de>
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author Michael Klier <chi@chimeric.de>
+ * @author Leo Moll <leo@yeasoft.com>
+ * @author Florian Anderiasch <fa@art-core.org>
+ * @author Robin Kluth <commi1993@gmail.com>
+ * @author Arne Pelka <mail@arnepelka.de>
+ * @author Dirk Einecke <dirk@dirkeinecke.de>
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider <robog@GMX.de>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Diese Seite bearbeiten';
+$lang['btn_source']            = 'Zeige Quelltext';
+$lang['btn_show']              = 'Seite anzeigen';
+$lang['btn_create']            = 'Seite anlegen';
+$lang['btn_search']            = 'Suche';
+$lang['btn_save']              = 'Speichern';
+$lang['btn_preview']           = 'Vorschau';
+$lang['btn_top']               = 'Nach oben';
+$lang['btn_newer']             = '<< jüngere Änderungen';
+$lang['btn_older']             = 'ältere Änderungen >>';
+$lang['btn_revs']              = 'Ältere Versionen';
+$lang['btn_recent']            = 'Letzte Änderungen';
+$lang['btn_upload']            = 'Hochladen';
+$lang['btn_cancel']            = 'Abbrechen';
+$lang['btn_index']             = 'Übersicht';
+$lang['btn_secedit']           = 'Bearbeiten';
+$lang['btn_login']             = 'Anmelden';
+$lang['btn_logout']            = 'Abmelden';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Updaten';
+$lang['btn_delete']            = 'Löschen';
+$lang['btn_back']              = 'Zurück';
+$lang['btn_backlink']          = 'Links hierher';
+$lang['btn_backtomedia']       = 'Zurück zur Dateiauswahl';
+$lang['btn_subscribe']         = 'Änderungen abonnieren';
+$lang['btn_unsubscribe']       = 'Änderungen abbestellen';
+$lang['btn_subscribens']       = 'Namensraumänderungen abonnieren';
+$lang['btn_unsubscribens']     = 'Namensraumänderungen abbestellen';
+$lang['btn_profile']           = 'Benutzerprofil';
+$lang['btn_reset']             = 'Zurücksetzen';
+$lang['btn_resendpwd']         = 'Sende neues Passwort';
+$lang['btn_draft']             = 'Entwurf bearbeiten';
+$lang['btn_recover']           = 'Entwurf wieder herstellen';
+$lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
+$lang['loggedinas']            = 'Angemeldet als';
+$lang['user']                  = 'Benutzername';
+$lang['pass']                  = 'Passwort';
+$lang['newpass']               = 'Neues Passwort';
+$lang['oldpass']               = 'Bestätigen (Altes Passwort)';
+$lang['passchk']               = 'und nochmal';
+$lang['remember']              = 'Angemeldet bleiben';
+$lang['fullname']              = 'Voller Name';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrieren';
+$lang['profile']               = 'Benutzerprofil';
+$lang['badlogin']              = 'Nutzername oder Passwort sind falsch.';
+$lang['minoredit']             = 'kleine Änderung';
+$lang['draftdate']             = 'Entwurf gespeichert am';
+$lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, Sektionsinfo ist veraltet, lade stattdessen volle Seite.';
+$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden.';
+$lang['reguexists']            = 'Der Nutzername existiert leider schon.';
+$lang['regsuccess']            = 'Der neue Nutzer wurde angelegt und das Passwort per E-Mail versandt.';
+$lang['regsuccess2']           = 'Der neue Nutzer wurde angelegt.';
+$lang['regmailfail']           = 'Offenbar ist ein Fehler beim Versenden der Passwort-E-Mail aufgetreten. Bitte wenden Sie sich an den Wiki-Admin.';
+$lang['regbadmail']            = 'Die angegebene E-Mail-Adresse scheint ungültig zu sein. Falls dies ein Fehler ist, wenden Sie sich bitte an den Wiki-Admin.';
+$lang['regbadpass']            = 'Die beiden eingegeben Passwörter stimmen nicht überein. Bitte versuchen Sie es noch einmal.';
+$lang['regpwmail']             = 'Ihr DokuWiki Passwort';
+$lang['reghere']               = 'Sie haben noch keinen Zugang? Hier anmelden';
+$lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
+$lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
+$lang['profnoempty']           = 'Es muß ein Name und eine E-Mail-Adresse angegeben werden.';
+$lang['profchanged']           = 'Benuzerprofil erfolgreich geändert.';
+$lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
+$lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
+$lang['resendpwd']             = 'Neues Passwort schicken für';
+$lang['resendpwdmissing']      = 'Es tut mir Leid, aber Sie müssen alle Felder ausfüllen.';
+$lang['resendpwdnouser']       = 'Es tut mir Leid, aber der Benutzer existiert nicht in unserer Datenbank.';
+$lang['resendpwdbadauth']      = 'Es tut mir Leid, aber dieser Authentifizierungscode ist ungültig. Stellen Sie sicher, dass Sie den kompletten Bestätigungslink verwendet haben.';
+$lang['resendpwdconfirm']      = 'Ein Bestätigungslink wurde per E-Mail versandt.';
+$lang['resendpwdsuccess']      = 'Ihr neues Passwort wurde per E-Mail versandt.';
+$lang['license']               = 'Falls nicht anders bezeichnet, ist der Inhalt dieses Wikis unter der folgenden Lizenz veröffentlicht:';
+$lang['licenseok']             = 'Hinweis: Durch das Bearbeiten dieser Seite geben Sie Ihr Einverständnis, dass Ihr Inhalt unter der folgenden Lizenz veröffentlicht wird:';
+$lang['searchmedia']           = 'Suche Dateinamen:';
+$lang['searchmedia_in']        = 'Suche in %s';
+$lang['txt_upload']            = 'Datei zum Hochladen auswählen';
+$lang['txt_filename']          = 'Hochladen als (optional)';
+$lang['txt_overwrt']           = 'Bestehende Datei überschreiben';
+$lang['lockedby']              = 'Momentan gesperrt von';
+$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['willexpire']            = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['notsavedyet']           = 'Nicht gespeicherte Änderungen gehen verloren!\nWeitermachen?';
+$lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
+$lang['nothingfound']          = 'Nichts gefunden.';
+$lang['mediaselect']           = 'Dateiauswahl';
+$lang['fileupload']            = 'Datei hochladen';
+$lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
+$lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
+$lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
+$lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %s überein.';
+$lang['uploadspam']            = 'Hochladen verweigert: Treffer auf der Spamliste.';
+$lang['uploadxss']             = 'Hochladen verweigert: Daten scheinen Schadcode zu enthalten.';
+$lang['uploadsize']            = 'Die hochgeladene Datei war zu groß. (max. %s)';
+$lang['deletesucc']            = 'Die Datei "%s" wurde gelöscht.';
+$lang['deletefail']            = '"%s" konnte nicht gelöscht werden - prüfen Sie die Berechtigungen.';
+$lang['mediainuse']            = 'Die Datei "%s" wurde nicht gelöscht - sie wird noch verwendet.';
+$lang['namespaces']            = 'Namensräume';
+$lang['mediafiles']            = 'Vorhandene Dateien in';
+$lang['js']['searchmedia']     = 'Suche Dateien';
+$lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
+$lang['js']['hidedetails']     = 'Details ausblenden';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet Explorer.
+Der Link kann jedoch durch Kopieren und Einfügen verwendet werden.';
+$lang['js']['linkwiz']         = 'Link-Assistent';
+$lang['js']['linkto']          = 'Link nach:';
+$lang['js']['del_confirm']     = 'Eintrag wirklich löschen?';
+$lang['js']['mu_btn']          = 'Mehrere Dateien gleichzeitig hochladen';
+$lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
+$lang['mediaview']             = 'Originaldatei öffnen';
+$lang['mediaroot']             = 'Wurzel';
+$lang['mediaupload']           = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen im Feld "Hochladen als" durch Doppelpunkt getrennt voran.';
+$lang['mediaextchange']        = 'Dateiendung vom .%s nach .%s geändert!';
+$lang['reference']             = 'Verwendung von';
+$lang['ref_inuse']             = 'Diese Datei kann nicht gelöscht werden, da sie noch von folgenden Seiten benutzt wird:';
+$lang['ref_hidden']            = 'Einige Verweise sind auf Seiten, für die Sie keine Leseberechtigung haben.';
+$lang['hits']                  = 'Treffer';
+$lang['quickhits']             = 'Passende Seitennamen';
+$lang['toc']                   = 'Inhaltsverzeichnis';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Ihre Version';
+$lang['diff']                  = 'Zeige Unterschiede zu aktueller Version';
+$lang['diff2']                 = 'Zeige Unterschiede der ausgewählten Versionen';
+$lang['line']                  = 'Zeile';
+$lang['breadcrumb']            = 'Zuletzt angesehen';
+$lang['youarehere']            = 'Sie befinden sich hier';
+$lang['lastmod']               = 'Zuletzt geändert';
+$lang['by']                    = 'von';
+$lang['deleted']               = 'gelöscht';
+$lang['created']               = 'angelegt';
+$lang['restored']              = 'alte Version wieder hergestellt';
+$lang['external_edit']         = 'Externe Bearbeitung';
+$lang['summary']               = 'Zusammenfassung';
+$lang['noflash']               = 'Das <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> wird benötigt, um diesen Ihnalt anzuzeigen.';
+$lang['download']              = 'Schnipsel herunterladen';
+$lang['mail_newpage']          = 'Neue Seite:';
+$lang['mail_changed']          = 'Seite geaendert:';
+$lang['mail_new_user']         = 'Neuer Benutzer:';
+$lang['mail_upload']           = 'Datei hochgeladen:';
+$lang['qb_bold']               = 'Fetter Text';
+$lang['qb_italic']             = 'Kursiver Text';
+$lang['qb_underl']             = 'Unterstrichener Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Durchgestrichener Text';
+$lang['qb_h1']                 = 'Level 1 Überschrift';
+$lang['qb_h2']                 = 'Level 2 Überschrift';
+$lang['qb_h3']                 = 'Level 3 Überschrift';
+$lang['qb_h4']                 = 'Level 4 Überschrift';
+$lang['qb_h5']                 = 'Level 5 Überschrift';
+$lang['qb_h']                  = 'Überschrift';
+$lang['qb_hs']                 = 'Wähle die Überschrift';
+$lang['qb_hplus']              = 'Obere Überschrift';
+$lang['qb_hminus']             = 'Untere Überschrift';
+$lang['qb_hequal']             = 'Gleichzeilige Überschrift';
+$lang['qb_link']               = 'Interner Link';
+$lang['qb_extlink']            = 'Externer Link';
+$lang['qb_hr']                 = 'Horizontale Linie';
+$lang['qb_ol']                 = 'Nummerierter Listenpunkt';
+$lang['qb_ul']                 = 'Listenpunkt';
+$lang['qb_media']              = 'Bilder und andere Dateien hinzufügen';
+$lang['qb_sig']                = 'Unterschrift einfügen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Sonderzeichen';
+$lang['upperns']               = 'zum übergeordneten Namensraum springen';
+$lang['admin_register']        = 'Neuen Benutzer anmelden';
+$lang['metaedit']              = 'Metadaten bearbeiten';
+$lang['metasaveerr']           = 'Die Metadaten konnten nicht gesichert werden';
+$lang['metasaveok']            = 'Metadaten gesichert';
+$lang['img_backto']            = 'Zurück zu';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Bildunterschrift';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Dateiname';
+$lang['img_fsize']             = 'Grösse';
+$lang['img_artist']            = 'FotografIn';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlagwörter';
+$lang['subscribe_success']     = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscribe_error']       = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['subscribe_noaddress']   = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren';
+$lang['unsubscribe_success']   = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
+$lang['unsubscribe_error']     = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['authmodfailed']         = 'Benutzerüberprüfung nicht möglich. Bitte wenden Sie sich an den Systembetreuer.';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Systembetreuer.';
+$lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
+$lang['i_installer']           = 'DokuWiki Installation';
+$lang['i_wikiname']            = 'Wiki-Name';
+$lang['i_enableacl']           = 'Zugangskontrolle (ACL) aktivieren (empfohlen)';
+$lang['i_superuser']           = 'Administrator Benutzername';
+$lang['i_problems']            = 'Das Installationsprogramm hat unten aufgeführte Probleme festgestellt, die zunächst behoben werden müssen bevor Sie mit der Installation fortfahren können.';
+$lang['i_modified']            = 'Aus Sicherheitsgründen arbeitet dieses Script nur mit einer neuen, unmodifizierten DokuWiki Installation.  Sie sollten entweder alle Dateien noch einmal frisch installieren oder die <a href="http://dokuwiki.org/install">Dokuwiki-Installationsanleitung</a> konsultieren.';
+$lang['i_funcna']              = 'Die PHP Funktion <code>%s</code> ist nicht verfügbar. Unter Umständen wurde sie von Ihrem Hoster deaktiviert?';
+$lang['i_phpver']              = 'Ihre PHP-Version <code>%s</code> ist niedriger als die benötigte Version <code>%s</code>. Bitte aktualisieren Sie Ihre PHP-Installation.';
+$lang['i_permfail']            = '<code>%s</code> ist nicht durch DokuWiki beschreibbar. Sie müssen die Berechtigungen dieses Ordners ändern!';
+$lang['i_confexists']          = '<code>%s</code> existiert bereits';
+$lang['i_writeerr']            = '<code>%s</code> konnte nicht erzeugt werden. Sie sollten die Verzeichnis-/Datei-Rechte überprüfen und die Datei manuell anlegen.';
+$lang['i_badhash']             = 'Unbekannte oder modifizierte dokuwiki.php (Hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - unerlaubter oder leerer Wert';
+$lang['i_success']             = 'Die Konfiguration wurde erfolgreich abgeschlossen. Sie können jetzt die install.php löschen. Ihr <a href="doku.php">neues DokuWiki</a> ist jetzt für Sie bereit.';
+$lang['i_failure']             = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Sie müssen diese vermutlich von Hand beheben, bevor Sie Ihr <a href="doku.php">neues DokuWiki</a> nutzen können.';
+$lang['i_policy']              = 'Anfangseinstellung für Zugangskontrolle (ACL)';
+$lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben, hochladen für alle)';
+$lang['i_pol1']                = 'Öffentliches Wiki (lesen für alle, schreiben und hochladen für registrierte Nutzer)';
+$lang['i_pol2']                = 'Geschlossenes Wiki (lesen, schreiben, hochladen nur für registrierte Nutzer)';
+$lang['i_retry']               = 'Wiederholen';
+$lang['mu_intro']              = 'In diesem Bereich können Sie mehrere Dateien gleichzeitig hochladen. Benutzen Sie die Schaltfläche "Durchsuchen" um sie der Warteschlange zuzufügen. Betätigen Sie die Schaltfläche "Hochladen" um die Übertragung zu starten.';
+$lang['mu_gridname']           = 'Dateiname';
+$lang['mu_gridsize']           = 'Größe';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namensraum';
+$lang['mu_browse']             = 'Durchsuchen';
+$lang['mu_toobig']             = 'zu groß';
+$lang['mu_ready']              = 'bereit zum hochladen';
+$lang['mu_done']               = 'fertig';
+$lang['mu_fail']               = 'gescheitert';
+$lang['mu_authfail']           = 'Sitzung abgelaufen';
+$lang['mu_progress']           = '@PCT@% hochgeladen';
+$lang['mu_filetypes']          = 'Erlaubte Dateitypen';
+$lang['mu_info']               = 'Dateien hochgeladen!';
+$lang['mu_lasterr']            = 'Letzter Fehler:';
+$lang['recent_global']         = 'Im Moment sehen Sie die Änderungen im Namensraum <b>%s</b>. Sie können auch <a href="%s">die Änderungen im gesamten Wiki sehen</a>.';
+
+$lang['years']   = 'vor %d Jahren';
+$lang['months']  = 'vor %d Monaten';
+$lang['weeks']   = 'vor %d Wochen';
+$lang['days']    = 'vor %d Tagen';
+$lang['hours']   = 'vor %d Stunden';
+$lang['minutes'] = 'vor %d Minuten';
+$lang['seconds'] = 'vor %d Sekunden';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/locked.txt
new file mode 100644
index 000000000..6656beece
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/locked.txt
@@ -0,0 +1,4 @@
+====== Seite gesperrt ======
+
+Diese Seite ist momentan von einem anderen Nutzer gesperrt. Warten Sie, bis dieser mit dem Bearbeiten fertig ist oder die Sperre abläuft.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/login.txt
new file mode 100644
index 000000000..6698da614
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/login.txt
@@ -0,0 +1,4 @@
+====== Anmelden ======
+
+Geben Sie Ihren Benutzernamen und Ihr Passwort in das Formular unten ein, um sich anzumelden. Bitte beachten Sie, dass dafür "Cookies" in den Sicherheitseinstellungen Ihres Browsers erlaubt sein müssen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/mailtext.txt
new file mode 100644
index 000000000..fee88d4d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/mailtext.txt
@@ -0,0 +1,17 @@
+Eine Seite in Ihrem Wiki wurde geändert oder neu angelegt. Hier sind die Details:
+
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Adresse     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Alte Version   : @OLDPAGE@
+Neue Version   : @NEWPAGE@
+Zusammenfassung: @SUMMARY@
+Benutzer       : @USER@
+
+@DIFF@
+
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/newpage.txt
new file mode 100644
index 000000000..7871c67de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/newpage.txt
@@ -0,0 +1,5 @@
+====== Dieses Thema existiert noch nicht ======
+
+Sie sind einem Link zu einer Seite gefolgt, die noch nicht existiert. Sie können die Seite mit dem Knopf **"[Seite anlegen]"** selbst anlegen und mit Inhalt füllen.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/norev.txt
new file mode 100644
index 000000000..8a9c6927b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/norev.txt
@@ -0,0 +1,4 @@
+====== Version existiert nicht ======
+
+Die angegebene Version des Dokuments wurde nicht gefunden. Benutzen Sie den **''[Ältere Versionen]''** Knopf,  um eine Liste aller verfügbaren Versionen dieses Dokuments zu erhalten.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/preview.txt
new file mode 100644
index 000000000..b07ae5091
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/preview.txt
@@ -0,0 +1,5 @@
+====== Vorschau ======
+
+So wird Ihr Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/pwconfirm.txt
new file mode 100644
index 000000000..3aa81bf77
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hallo @FULLNAME@!
+
+Jemand hat ein neues Passwort für Ihren @TITLE@
+login auf @DOKUWIKIURL@ angefordert.
+
+Wenn Sie diese Änderung nicht angefordert haben, ignorieren Sie diese
+E-Mail einfach.
+
+Um die Anforderung zu bestätigen, folgen Sie bitte dem unten angegebenen
+Bestätigungslink.
+
+@CONFIRM@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/read.txt
new file mode 100644
index 000000000..bc011d0ee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/read.txt
@@ -0,0 +1,2 @@
+Diese Seite ist nicht editierbar. Sie können den Quelltext sehen, jedoch nicht verändern. Kontaktieren Sie den Administrator, wenn Sie glauben, dass hier ein Fehler vorliegt.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/recent.txt
new file mode 100644
index 000000000..c05bbae12
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/recent.txt
@@ -0,0 +1,5 @@
+====== Letzte Änderungen ======
+
+Die folgenden Seiten wurden zuletzt geändert.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/register.txt
new file mode 100644
index 000000000..83684f500
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/register.txt
@@ -0,0 +1,4 @@
+====== Als neuer Nutzer registrieren ======
+
+Bitte füllen Sie alle Felder aus, um einen neuen Nutzer-Account in diesem Wiki anzulegen. Stellen Sie sicher, dass eine **gültige E-Mail-Adresse** angegeben wird - das Passwort wird an diese Adresse gesendet. Der Nutzername sollte aus einem Wort ohne Umlaute, Leer- oder Sonderzeichen bestehen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/registermail.txt
new file mode 100644
index 000000000..ed37a9505
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/registermail.txt
@@ -0,0 +1,14 @@
+Ein neuer Benutzer hat sich registriert. Hier sind die Details:
+
+Benutzername : @NEWUSER@
+Voller Name  : @NEWNAME@
+E-Mail       : @NEWEMAIL@
+
+Date         : @DATE@
+Browser      : @BROWSER@
+IP-Address   : @IPADDRESS@
+Hostname     : @HOSTNAME@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/resendpwd.txt
new file mode 100644
index 000000000..2ff639369
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Neues Passwort anfordern ======
+
+Füllen Sie alle Felder unten aus, um ein neues Passwort für Ihren Zugang zu erhalten. Das neue Passwort wird an Ihre gespeicherte E-Mail-Adresse geschickt. Der Benutzername sollte Ihr Wiki-Benutzername sein.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/revisions.txt
new file mode 100644
index 000000000..e1bafdd2d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/revisions.txt
@@ -0,0 +1,4 @@
+====== Ältere Versionen ======
+
+Dies sind ältere Versionen des gewählten Dokuments. Um zu einer älteren Version zurückzukehren, wählen Sie die entsprechende Version aus, klicken auf **''[Diese Seite bearbeiten]''** und speichern Sie sie erneut ab.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/searchpage.txt
new file mode 100644
index 000000000..56104551b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/searchpage.txt
@@ -0,0 +1,7 @@
+====== Suche ======
+
+Unten sind die Ergebnisse Ihrer Suche gelistet. Falls der gesuchte Begriff nicht gefunden wurde, können Sie direkt eine neue Seite für den Suchbegriff anlegen, indem Sie auf den **''[Seite anlegen]''** Knopf drücken.
+
+===== Ergebnisse =====
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/showrev.txt
new file mode 100644
index 000000000..65f53c9c1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/showrev.txt
@@ -0,0 +1,2 @@
+**Dies ist eine alte Version des Dokuments!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/stopwords.txt
new file mode 100644
index 000000000..0487a940a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/stopwords.txt
@@ -0,0 +1,125 @@
+# Die Wörter dieser Liste werden bei der Indexierung ignoriert. Jedes Wort steht in einer neuen Zeile.
+# Beachten Sie beim Bearbeiten der Datei darauf, dass Sie UNIX-Zeilenumbrüche verwenden (einfacher Zeilenumbruch).
+# Wörter, die kürzer als 3 Buchstaben sind, brauchen Sie nicht in die Liste mit aufnehmen. Diese werden automatisch ignoriert.
+# Diese Liste basiert auf der folgenden: http://www.ranks.nl/stopwords/
+aber
+als
+auch
+auf
+aus
+bei
+bin
+bis
+bist
+dadurch
+daher
+darum
+das
+daß
+dass
+dein
+deine
+dem
+den
+der
+des
+dessen
+deshalb
+die
+dies
+dieser
+dieses
+doch
+dort
+durch
+ein
+eine
+einem
+einen
+einer
+eines
+euer
+eure
+für
+hatte
+hatten
+hattest
+hattet
+hier
+hinter
+ich
+ihr
+ihre
+in
+im
+ist
+jede
+jedem
+jeden
+jeder
+jedes
+jener
+jenes
+jetzt
+kann
+kannst
+können
+könnt
+machen
+mein
+meine
+mit
+muß
+mußt
+musst
+müssen
+müßt
+nach
+nachdem
+nein
+nicht
+nun
+oder
+seid
+sein
+seine
+sich
+sie
+sind
+soll
+sollen
+sollst
+sollt
+sonst
+soweit
+sowie
+und
+unser
+unsere
+unter
+vom
+von
+vor
+um
+wann
+warum
+was
+weiter
+weitere
+wenn
+wer
+werde
+werden
+werdet
+weshalb
+wie
+wieder
+wieso
+wir
+wird
+wirst
+woher
+wohin
+zum
+zur
+über
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/subscribermail.txt
new file mode 100644
index 000000000..0d90967a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/subscribermail.txt
@@ -0,0 +1,23 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Das sind die Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum : @DATE@
+Benutzer : @USER@
+Übersicht: @SUMMARY@
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melde Sie sich im Wiki an
+@DOKUWIKIURL@, besuchen dann
+@NEWPAGE@
+und klicken auf die Taste 'Änderungen abbestellen'.
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/updateprofile.txt
new file mode 100644
index 000000000..f19dd13f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Benutzerprofil ändern ======
+
+Nur die Felder, die Sie ändern, werden aktualisiert. Alle anderen bleiben, wie sie sind. Ihren Benutzernamen können Sie jedoch nicht ändern.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/uploadmail.txt
new file mode 100644
index 000000000..757729804
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/uploadmail.txt
@@ -0,0 +1,14 @@
+Eine Datei wurde in Ihrem Wiki hochgeladen. Hier sind die Details:
+
+Datei      : @MEDIA@
+Datum      : @DATE@
+Browser    : @BROWSER@
+IP-Adresse : @IPADDRESS@
+Hostname   : @HOSTNAME@
+Größe      : @SIZE@
+MIME-Typ   : @MIME@
+Benutzer   : @USER@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/wordblock.txt
new file mode 100644
index 000000000..14622ebc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/de/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blockiert ======
+
+Ihre Änderungen wurden nicht gespeichert, da sie ein oder mehrere nicht erlaubte Wörter enthielten. Falls Sie versucht haben sollten, das Wiki zu Spammen -- Schande über Sie! Wenn Sie glauben, dass der Eintrag zu Unrecht blockiert wurde, kontaktieren Sie bitte den Administrator des Wikis.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/admin.txt
new file mode 100644
index 000000000..49e6c657b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/admin.txt
@@ -0,0 +1,3 @@
+====== Διαχείριση ======
+
+Παρακάτω μπορείτε να βρείτε μια λίστα με τις δυνατότητες διαχείρισης στο DokuWiki
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/adminplugins.txt
new file mode 100644
index 000000000..ea00b959e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/adminplugins.txt
@@ -0,0 +1 @@
+===== Πρόσθετες συνδεόμενες υπομονάδες =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/backlinks.txt
new file mode 100644
index 000000000..572f85791
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/backlinks.txt
@@ -0,0 +1,3 @@
+====== Σύνδεσμοι προς την τρέχουσα σελίδα ======
+
+Οι παρακάτω σελίδες περιέχουν συνδέσμους προς την τρέχουσα σελίδα.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/conflict.txt
new file mode 100644
index 000000000..27b80b397
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/conflict.txt
@@ -0,0 +1,5 @@
+====== Υπάρχει μία νεώτερη έκδοση αυτής της σελίδας ======
+
+Υπάρχει μία νεώτερη έκδοση της σελίδας που τρoποποιήσατε. Αυτό συμβαίνει εάν κάποιος άλλος χρήστης τροποποίησε την ίδια σελίδα ενώ την τροποποιούσατε και εσείς.
+
+Ελέγξτε προσεκτικά τις διαφορές που παρουσιάζονται παρακάτω και έπειτα αποφασίστε ποια έκδοση θα κρατήσετε.  Εάν επιλέξετε ''Αποθήκευση'', η δική σας έκδοση θα αποθηκευτεί. Εάν επιλέξετε ''Ακύρωση'', η νεώτερη έκδοση θα διατηρηθεί ως τρέχουσα.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/denied.txt
new file mode 100644
index 000000000..71e9a04b8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/denied.txt
@@ -0,0 +1,5 @@
+====== Μη επιτρεπτή ενέργεια ======
+
+Συγγνώμη, αλλά δεν έχετε επαρκή δικαιώματα για την συγκεκριμένη ενέργεια.
+
+Μήπως παραλείψατε να συνδεθείτε?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/diff.txt
new file mode 100644
index 000000000..dde065b43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/diff.txt
@@ -0,0 +1,3 @@
+====== Σύγκριση εκδόσεων ======
+
+Εδώ βλέπετε τις διαφορές μεταξύ της επιλεγμένης έκδοσης και της τρέχουσας έκδοσης της σελίδας.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/draft.txt
new file mode 100644
index 000000000..3bb15037f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/draft.txt
@@ -0,0 +1,7 @@
+====== Βρέθηκε μία αυτόματα αποθηκευμένη σελίδα ======
+
+Η τελευταία τροποποίηση αυτής της σελίδας δεν ολοκληρώθηκε επιτυχώς. Η εφαρμογή αποθήκευσε αυτόματα μία εκδοχή της σελίδας την ώρα που την τροποποιούσατε και μπορείτε να την χρησιμοποιήσετε για να συνεχίσετε την εργασία σας. Παρακάτω φαίνεται αυτή η πιο πρόσφατη αυτόματα αποθηκευμένη σελίδα.
+
+Μπορείτε να //επαναφέρετε// αυτή την αυτόματα αποθηκευμένη σελίδα ως τρέχουσα, να την //διαγράψετε// ή να //ακυρώσετε// τη διαδικασία τροποποίησης της τρέχουσας σελίδας.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/edit.txt
new file mode 100644
index 000000000..26b52f97a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/edit.txt
@@ -0,0 +1 @@
+Τροποποιήστε την σελίδα **μόνο** εάν μπορείτε να την **βελτιώσετε**. Για να κάνετε δοκιμές με ασφάλεια ή να εξοικειωθείτε με το περιβάλλον χρησιμοποιήστε το [[:playground:playground|playground]]. Αφού τροποποιήστε την σελίδα επιλέξτε ''Αποθήκευση''. Δείτε τις [[:wiki:syntax|οδηγίες]] για την σωστή σύνταξη.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/editrev.txt
new file mode 100644
index 000000000..ac6bc5a3d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/editrev.txt
@@ -0,0 +1,2 @@
+**Φορτώσατε μια παλαιότερη έκδοση της σελίδας!** Εάν την αποθηκεύσετε, θα αντικαταστήσει την τρέχουσα έκδοση.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/index.txt
new file mode 100644
index 000000000..51f1fc600
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/index.txt
@@ -0,0 +1,3 @@
+====== Κατάλογος ======
+
+Αυτός είναι ένας κατάλογος όλων των διαθέσιμων σελίδων ταξινομημένων κατά [[doku>namespaces|φακέλους]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/install.html
new file mode 100644
index 000000000..89429d55b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/install.html
@@ -0,0 +1,25 @@
+<p>Αυτή η σελίδα περιέχει πληροφορίες που βοηθούν στην αρχική εγκατάσταση και
+ρύθμιση της εφαρμογής <a href="http://dokuwiki.org">Dokuwiki</a>. Περισσότερες 
+πληροφορίες υπάρχουν στη <a href="http://dokuwiki.org/installer">σελίδα τεκμηρίωσης</a> 
+του οδηγού εγκατάστασης.</p>
+
+<p>Η εφαρμογή DokuWiki χρησιμοποιεί απλά αρχεία για να αποθηκεύει τις σελίδες wiki 
+καθώς και πληροφορίες που σχετίζονται με αυτές (π.χ. εικόνες, καταλόγους αναζήτησης,
+παλαιότερες εκδόσεις σελίδων, κλπ). Για να λειτουργεί σωστά η εφαρμογή DokuWiki
+<strong>πρέπει</strong> να έχει δικαιώματα εγγραφής στους φακέλους που φιλοξενούν 
+αυτά τα αρχεία. Ο οδηγός εγκατάστασης δεν έχει την δυνατότητα να παραχωρήσει αυτά τα 
+δικαιώματα εγγραφής στους σχετικούς φακέλους. Ο κανονικός τρόπος για να γίνει αυτό είναι
+είτε απευθείας σε περιβάλλον γραμμής εντολών ή, εάν δεν έχετε τέτοια πρόσβαση, μέσω FTP ή 
+του πίνακα ελέγχου του περιβάλλοντος φιλοξενίας (π.χ. cPanel).</p>
+
+<p>Ο οδηγός εγκατάστασης θα ρυθμίσει την εφαρμογή DokuWiki ώστε να χρησιμοποιεί 
+<acronym title="access control list">ACL</acronym>, με τρόπο ώστε ο διαχειριστής να
+έχει δυνατότητα εισόδου και πρόσβαση στο μενού διαχείρισης της εφαρμογής για εγκατάσταση 
+επεκτάσεων, διαχείριση χρηστών, διαχείριση δικαιωμάτων πρόσβασης στις διάφορες σελίδες και
+αλλαγή των ρυθμίσεων. Αυτό δεν είναι απαραίτητο για να λειτουργήσει η εφαρμογή, αλλά
+κάνει την διαχείρισή της ευκολότερη.</p>
+
+<p>Οι έμπειροι χρήστες και οι χρήστες με ειδικές απαιτήσεις μπορούν να επισκεφθούν 
+τις σελίδες που περιέχουν λεπτομερείς
+<a href="http://dokuwiki.org/install">οδηγίες εγκατάστασης</a>
+και <a href="http://dokuwiki.org/config">πληροφορίες για τις ρυθμίσεις</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/lang.php
new file mode 100644
index 000000000..7aee3161d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/lang.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * Greek language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Thanos Massias <tm@thriasio.gr>
+ * @author Αθανάσιος Νταής <homunculus@wana.gr>
+ * @author Konstantinos Koryllos <koryllos@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Τροποποίηση σελίδας';
+$lang['btn_source']            = 'Προβολή κώδικα σελίδας';
+$lang['btn_show']              = 'Προβολή σελίδας';
+$lang['btn_create']            = 'Δημιουργία σελίδας';
+$lang['btn_search']            = 'Αναζήτηση';
+$lang['btn_save']              = 'Αποθήκευση';
+$lang['btn_preview']           = 'Προεπισκόπηση';
+$lang['btn_top']               = 'Επιστροφή στην κορυφή της σελίδας';
+$lang['btn_newer']             = '<< πλέον πρόσφατες';
+$lang['btn_older']             = 'λιγότερο πρόσφατες >>';
+$lang['btn_revs']              = 'Παλαιότερες εκδόσεις σελίδας';
+$lang['btn_recent']            = 'Πρόσφατες αλλαγές σελίδων';
+$lang['btn_upload']            = 'Φόρτωση';
+$lang['btn_cancel']            = 'Ακύρωση';
+$lang['btn_index']             = 'Κατάλογος';
+$lang['btn_secedit']           = 'Τροποποίηση';
+$lang['btn_login']             = 'Είσοδος χρήστη';
+$lang['btn_logout']            = 'Έξοδος χρήστη';
+$lang['btn_admin']             = 'Διαχείριση';
+$lang['btn_update']            = 'Ενημέρωση';
+$lang['btn_delete']            = 'Σβήσιμο';
+$lang['btn_back']              = 'Πίσω';
+$lang['btn_backlink']          = 'Σύνδεσμοι προς την τρέχουσα σελίδα';
+$lang['btn_backtomedia']       = 'Επιστροφή στην επιλογή αρχείων';
+$lang['btn_subscribe']         = 'Εγγραφή σε λήψη ενημερώσεων σελίδας';
+$lang['btn_unsubscribe']       = 'Διαγραφή από λήψη ενημερώσεων σελίδας';
+$lang['btn_subscribens']       = 'Εγγραφή σε λήψη ενημερώσεων φακέλου';
+$lang['btn_unsubscribens']     = 'Διαγραφή από λήψη ενημερώσεων φακέλου';
+$lang['btn_profile']           = 'Τροποποίηση προφίλ';
+$lang['btn_reset']             = 'Ακύρωση';
+$lang['btn_resendpwd']         = 'Αποστολή νέου κωδικού';
+$lang['btn_draft']             = 'Τροποποίηση αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_recover']           = 'Επαναφορά αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_draftdel']          = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_revert']            = 'Αποκατάσταση';
+$lang['loggedinas']            = 'Συνδεδεμένος ως';
+$lang['user']                  = 'Όνομα χρήστη';
+$lang['pass']                  = 'Κωδικός';
+$lang['newpass']               = 'Νέος κωδικός';
+$lang['oldpass']               = 'Επιβεβαίωση τρέχοντος κωδικού';
+$lang['passchk']               = 'ακόμη μια φορά';
+$lang['remember']              = 'Απομνημόνευση στοιχείων λογαριασμού';
+$lang['fullname']              = 'Ονοματεπώνυμο';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Εγγραφή';
+$lang['profile']               = 'Προφίλ χρήστη';
+$lang['badlogin']              = 'Συγνώμη, το όνομα χρήστη ή ο κωδικός ήταν λανθασμένο.';
+$lang['minoredit']             = 'Ασήμαντες αλλαγές';
+$lang['draftdate']             = 'Αυτόματη αποθήκευση πρόχειρης σελίδας στις';
+$lang['nosecedit']             = 'Η σελίδα τροποποιήθηκε στο μεταξύ και τα στοιχεία της ενότητας δεν ήταν συγχρονισμένα, οπότε φορτώθηκε η πλήρης σελίδα.  ';
+$lang['regmissing']            = 'Πρέπει να συμπληρώσετε όλα τα πεδία.';
+$lang['reguexists']            = 'Αυτός ο λογαριασμός υπάρχει ήδη.';
+$lang['regsuccess']            = 'Ο λογαριασμός δημιουργήθηκε και ο κωδικός εστάλει με e-mail.';
+$lang['regsuccess2']           = 'Ο λογαριασμός δημιουργήθηκε.';
+$lang['regmailfail']           = 'Φαίνεται να υπάρχει πρόβλημα με την αποστολή του κωδικού μέσω e-mail. Παρακαλούμε επικοινωνήστε μαζί μας!';
+$lang['regbadmail']            = 'Η διεύθυνση e-mail δεν δείχνει έγκυρη - εάν πιστεύετε ότι αυτό είναι λάθος, επικοινωνήστε μαζί μας';
+$lang['regbadpass']            = 'Οι δύο κωδικοί δεν είναι ίδιοι, προσπαθήστε ξανά.';
+$lang['regpwmail']             = 'Ο κωδικός σας';
+$lang['reghere']               = 'Δεν έχετε λογαριασμό ακόμη? Δημιουργήστε έναν';
+$lang['profna']                = 'Αυτό το wiki δεν υποστηρίζει την τροποποίηση προφίλ.';
+$lang['profnochange']          = 'Καμία αλλαγή.';
+$lang['profnoempty']           = 'Δεν επιτρέπεται κενό όνομα χρήστη η κενή διεύθυνση email.';
+$lang['profchanged']           = 'Το προφίλ χρήστη τροποποιήθηκε επιτυχώς.';
+$lang['pwdforget']             = 'Ξεχάσατε το κωδικό σας? Αποκτήστε νέο.';
+$lang['resendna']              = 'Αυτό το wiki δεν υποστηρίζει την εκ\' νέου αποστολή κωδικών.';
+$lang['resendpwd']             = 'Αποστολή νέων κωδικών για τον χρήστη';
+$lang['resendpwdmissing']      = 'Πρέπει να συμπληρώσετε όλα τα πεδία.';
+$lang['resendpwdnouser']       = 'Αυτός ο χρήστης δεν υπάρχει στα αρχεία μας.';
+$lang['resendpwdbadauth']      = 'Αυτός ο κωδικός ενεργοποίησης δεν είναι έγκυρος.';
+$lang['resendpwdconfirm']      = 'Ο σύνδεσμος προς την σελίδα ενεργοποίησης εστάλει με e-mail.';
+$lang['resendpwdsuccess']      = 'Ο νέος σας κωδικός εστάλη με e-mail.';
+$lang['license']               = 'Εκτός εάν αναφέρεται διαφορετικά, το υλικό αυτού του wiki διατίθεται κάτω από την ακόλουθη άδεια:';
+$lang['licenseok']             = 'Σημείωση: Τροποποιώντας αυτή την σελίδα αποδέχεστε την διάθεση του υλικού σας σύμφωνα με την ακόλουθη άδεια:';
+$lang['searchmedia']           = 'Αναζήτηση αρχείου:';
+$lang['searchmedia_in']        = 'Αναζήτηση σε %s';
+$lang['txt_upload']            = 'Επιλέξτε αρχείο για φόρτωση';
+$lang['txt_filename']          = 'Επιλέξτε νέο όνομα αρχείου (προαιρετικό)';
+$lang['txt_overwrt']           = 'Αντικατάσταση υπάρχοντος αρχείου';
+$lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
+$lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
+$lang['willexpire']            = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την επιλογή Προεπισκόπηση.';
+$lang['notsavedyet']           = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.\nΘέλετε να συνεχίσετε?';
+$lang['rssfailed']             = 'Εμφανίστηκε κάποιο σφάλμα κατά την ανάγνωση αυτού του feed: ';
+$lang['nothingfound']          = 'Δεν βρέθηκαν σχετικά αποτελέσματα.';
+$lang['mediaselect']           = 'Επιλογή Αρχείων';
+$lang['fileupload']            = 'Φόρτωση αρχείου';
+$lang['uploadsucc']            = 'Επιτυχής φόρτωση';
+$lang['uploadfail']            = 'Η μεταφόρτωση απέτυχε. Πιθανόν αυτό να οφείλεται στις ρυθμίσεις πρόσβασης του αρχείου.';
+$lang['uploadwrong']           = 'Η μεταφόρτωση δεν έγινε δεκτή. Δεν επιτρέπονται αρχεία αυτού του τύπου!';
+$lang['uploadexist']           = 'Το αρχείο ήδη υπάρχει. Δεν έγινε καμία αλλαγή.';
+$lang['uploadbadcontent']      = 'Το περιεχόμενο του αρχείου δεν ταιριάζει με την επέκτασή του.';
+$lang['uploadspam']            = 'Η μεταφόρτωση ακυρώθηκε από το φίλτρο spam.';
+$lang['uploadxss']             = 'Η μεταφόρτωση ακυρώθηκε λόγω πιθανού επικίνδυνου περιεχομένου.';
+$lang['uploadsize']            = 'Το αρχείο ήταν πολύ μεγάλο. (μέγιστο %s)';
+$lang['deletesucc']            = 'Το αρχείο "%s" διαγράφηκε.';
+$lang['deletefail']            = 'Το αρχείο "%s" δεν διαγράφηκε. Πιθανόν αυτό να οφείλεται στις ρυθμίσεις πρόσβασης του αρχείου.';
+$lang['mediainuse']            = 'Το αρχείο "%s" δεν διαγράφηκε - είναι ακόμα σε χρήση.';
+$lang['namespaces']            = 'Φάκελοι';
+$lang['mediafiles']            = 'Διαθέσιμα αρχεία σε';
+$lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
+$lang['js']['keepopen']        = 'Το παράθυρο να μην κλείνει';
+$lang['js']['hidedetails']     = 'Απόκρυψη λεπτομερειών';
+$lang['js']['nosmblinks']      = 'Οι σύνδεσμοι προς Windows shares δουλεύουν μόνο στον Microsoft Internet Explorer.
+Μπορείτε πάντα να κάνετε αντιγραφή και επικόλληση του συνδέσμου.';
+$lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμων';
+$lang['js']['linkto']          = 'Σύνδεση σε:';
+$lang['js']['del_confirm']     = 'Να διαγραφεί?';
+$lang['js']['mu_btn']          = 'Ταυτόχρονη φόρτωση πολλαπλών φακέλων';
+$lang['mediausage']            = 'Χρησιμοποιήστε την ακόλουθη σύνταξη για να παραθέσετε αυτό το αρχείο:';
+$lang['mediaview']             = 'Κανονική προβολή αρχείου';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Φορτώστε ένα αρχείο στον τρέχοντα φάκελο. Για δημιουργία υπο-φακέλων, προσθέστε τους πριν από το όνομα του αρχείου, στο πεδίο "Αποθήκευση ως", χρησιμοποιώντας άνω-κάτω τελείες ως διαχωριστικά.';
+$lang['mediaextchange']        = 'Η επέκταση του αρχείου τροποποιήθηκε από .%s σε .%s!';
+$lang['reference']             = 'Αναφορές προς';
+$lang['ref_inuse']             = 'Το αρχείο δεν μπορεί να διαγραφεί, επειδή είναι ακόμη σε χρήση από τις ακόλουθες σελίδες:';
+$lang['ref_hidden']            = 'Μερικές αναφορές βρίσκονται σε σελίδες που δεν έχετε δικαίωμα να διαβάσετε';
+$lang['hits']                  = 'Αναφορές';
+$lang['quickhits']             = 'Σχετικές σελίδες';
+$lang['toc']                   = 'Πίνακας Περιεχομένων';
+$lang['current']               = 'τρέχουσα';
+$lang['yours']                 = 'Η έκδοσή σας';
+$lang['diff']                  = 'προβολή διαφορών με την τρέχουσα έκδοση';
+$lang['diff2']                 = 'Προβολή διαφορών μεταξύ των επιλεγμένων εκδόσεων';
+$lang['line']                  = 'Γραμμή';
+$lang['breadcrumb']            = 'Ιστορικό';
+$lang['youarehere']            = 'Είστε εδώ';
+$lang['lastmod']               = 'Τελευταία τροποποίηση';
+$lang['by']                    = 'από';
+$lang['deleted']               = 'διαγράφηκε';
+$lang['created']               = 'δημιουργήθηκε';
+$lang['restored']              = 'παλαιότερη έκδοση επαναφέρθηκε';
+$lang['external_edit']         = 'εξωτερική τροποποίηση';
+$lang['summary']               = 'Επεξεργασία σύνοψης';
+$lang['noflash']               = 'Το <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> απαιτείται για την προβολή αυτού του στοιχείου.';
+$lang['download']              = 'Λήψη Κώδικα';
+$lang['mail_newpage']          = 'σελίδα προστέθηκε:';
+$lang['mail_changed']          = 'σελίδα τροποποιήθηκε:';
+$lang['mail_new_user']         = 'νέος χρήστης:';
+$lang['mail_upload']           = 'αρχείο φορτώθηκε:';
+$lang['qb_bold']               = 'Έντονο Κείμενο';
+$lang['qb_italic']             = 'Πλάγιο Κείμενο';
+$lang['qb_underl']             = 'Υπογραμμισμένο Κείμενο';
+$lang['qb_code']               = 'Κείμενο κώδικα';
+$lang['qb_strike']             = 'Διαγραμμισμένο Κείμενο';
+$lang['qb_h1']                 = 'Κεφαλίδα 1ου Επιπέδου';
+$lang['qb_h2']                 = 'Κεφαλίδα 2ου Επιπέδου';
+$lang['qb_h3']                 = 'Κεφαλίδα 3ου Επιπέδου';
+$lang['qb_h4']                 = 'Κεφαλίδα 4ου Επιπέδου';
+$lang['qb_h5']                 = 'Κεφαλίδα 5ου Επιπέδου';
+$lang['qb_h']                  = 'Κεφαλίδα';
+$lang['qb_hs']                 = 'Επιλογή Κεφαλίδας';
+$lang['qb_link']               = 'Εσωτερικός Σύνδεσμος';
+$lang['qb_extlink']            = 'Εξωτερικός Σύνδεσμος';
+$lang['qb_hr']                 = 'Διαχωριστική Γραμμή';
+$lang['qb_ol']                 = 'Αριθμημένη Λίστα';
+$lang['qb_ul']                 = 'Λίστα';
+$lang['qb_media']              = 'Προσθήκη Αρχείων';
+$lang['qb_sig']                = 'Προσθήκη Υπογραφής';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Ειδικοί Χαρακτήρες';
+$lang['admin_register']        = 'Προσθήκη νέου χρήστη';
+$lang['metaedit']              = 'Τροποποίηση metadata';
+$lang['metasaveerr']           = 'Η αποθήκευση των metadata απέτυχε';
+$lang['metasaveok']            = 'Επιτυχής αποθήκευση metadata';
+$lang['img_backto']            = 'Επιστροφή σε';
+$lang['img_title']             = 'Τίτλος';
+$lang['img_caption']           = 'Λεζάντα';
+$lang['img_date']              = 'Ημερομηνία';
+$lang['img_fname']             = 'Όνομα αρχείου';
+$lang['img_fsize']             = 'Μέγεθος';
+$lang['img_artist']            = 'Καλλιτέχνης';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Λέξεις-κλειδιά';
+$lang['subscribe_success']     = 'Προσθήκη %s στην λίστα συνδρομητών %s';
+$lang['subscribe_error']       = 'Αποτυχία προσθήκης %s στην λίστα συνδρομητών %s';
+$lang['subscribe_noaddress']   = 'Δεν έχετε δηλώσει e-mail διεύθυνση - δεν μπορείτε να γραφτείτε στην λίστα συνδρομητών.';
+$lang['unsubscribe_success']   = 'Διαγραφή %s από την λίστα συνδρομητών %s';
+$lang['unsubscribe_error']     = 'Αποτυχία διαγραφής %s από την λίστα συνδρομητών %s';
+$lang['authmodfailed']         = 'Κακή ρύθμιση λίστας χρηστών. Παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
+$lang['authtempfail']          = 'Η είσοδος χρηστών δεν λειτουργεί αυτή την στιγμή. Εάν αυτό διαρκεί για πολύ χρόνο, παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
+$lang['i_chooselang']          = 'Επιλογή γλώσσας';
+$lang['i_installer']           = 'Οδηγός εγκατάστασης DokuWiki';
+$lang['i_wikiname']            = 'Ονομασία wiki';
+$lang['i_enableacl']           = 'Ενεργοποίηση Λίστας Δικαιωμάτων Πρόσβασης - ACL (συνιστάται)';
+$lang['i_superuser']           = 'Διαχειριστής';
+$lang['i_problems']            = 'Ο οδηγός εγκατάστασης συνάντησε τα προβλήματα που αναφέρονται παρακάτω. Η εγκατάσταση δεν θα ολοκληρωθεί επιτυχώς μέχρι να επιλυθούν αυτά τα προβλήματα.';
+$lang['i_modified']            = 'Για λόγους ασφαλείας, ο οδηγός εγκατάστασης λειτουργεί μόνο με νέες και μη τροποποιημένες εγκαταστάσεις Dokuwiki.
+Πρέπει είτε να κάνετε νέα εγκατάσταση, χρησιμοποιώντας το αρχικό πακέτο εγκατάστασης, ή να συμβουλευτείτε τις <a href="http://dokuwiki.org/install">οδηγίες εγκατάστασης της εφαρμογής</a>.';
+$lang['i_funcna']              = 'Η λειτουργία <code>%s</code> της PHP δεν είναι διαθέσιμη. Πιθανόν να είναι απενεργοποιημένη στις ρυθμίσεις έναρξης της PHP';
+$lang['i_phpver']              = 'Η έκδοση <code>%s</code> της PHP που έχετε είναι παλαιότερη της απαιτούμενης <code>%s</code>. Πρέπει να αναβαθμίσετε την PHP.';
+$lang['i_permfail']            = 'Ο φάκελος <code>%s</code> δεν είναι εγγράψιμος από την εφαρμογή DokuWiki. Πρέπει να διορθώσετε τα δικαιώματα πρόσβασης αυτού του φακέλου!';
+$lang['i_confexists']          = '<code>%s</code> υπάρχει ήδη';
+$lang['i_writeerr']            = 'Δεν είναι δυνατή η δημιουργία του <code>%s</code>. Πρέπει να διορθώσετε τα δικαιώματα πρόσβασης αυτού του φακέλου/αρχείου και να δημιουργήσετε το αρχείο χειροκίνητα!';
+$lang['i_badhash']             = 'Μη αναγνωρίσιμο ή τροποποιημένο αρχείο dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - λάθος ή ανύπαρκτη τιμή';
+$lang['i_success']             = 'Η εγκατάσταση ολοκληρώθηκε επιτυχώς. Μπορείτε πλέον να διαγράψετε το αρχείο install.php. Συνεχίστε στο <a href="doku.php">νέο σας DokuWiki</a>.';
+$lang['i_failure']             = 'Εμφανίστηκαν κάποια προβλήματα στη διαδικασία ανανέωσης των αρχείων ρυθμίσεων. Πιθανόν να χρειάζεται να τα τροποποιήσετε χειροκίνητα ώστε να μπορείτε να χρησιμοποιήσετε το <a href="doku.php">νέο σας DokuWiki</a>.';
+$lang['i_policy']              = 'Αρχική πολιτική Λίστας Δικαιωμάτων Πρόσβασης - ACL';
+$lang['i_pol0']                = 'Ανοιχτό Wiki (όλοι μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_pol1']                = 'Δημόσιο Wiki (όλοι μπορούν να διαβάσουν σελίδες αλλά μόνο οι εγγεγραμμένοι χρήστες μπορούν να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_pol2']                = 'Κλειστό Wiki (μόνο οι εγγεγραμμένοι χρήστες μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_retry']               = 'Νέα προσπάθεια';
+$lang['mu_intro']              = 'Εδώ μπορείτε να φορτώσετε ταυτόχρονα πολλαπλά αρχεία. Πατήστε στο κουμπί προεπισκόπησης για να τα προσθέσετε στη λίστα. Πατήστε στο κουμπί μεταφόρτωσης όταν έχετε τελειώσει.';
+$lang['mu_gridname']           = 'Όνομα αρχείου';
+$lang['mu_gridsize']           = 'Μέγεθος';
+$lang['mu_gridstat']           = 'Κατάσταση';
+$lang['mu_namespace']          = 'Φάκελος';
+$lang['mu_browse']             = 'Επισκόπηση';
+$lang['mu_toobig']             = 'υπερβολικά μεγάλο';
+$lang['mu_ready']              = 'έτοιμο για φόρτωση';
+$lang['mu_done']               = 'ολοκληρώθηκε';
+$lang['mu_fail']               = 'απέτυχε';
+$lang['mu_authfail']           = 'η συνεδρία έληξε';
+$lang['mu_progress']           = '@PCT@% φορτώθηκε';
+$lang['mu_filetypes']          = 'Επιτρεπτοί τύποι αρχείων';
+$lang['mu_info']               = 'τα αρχεία ανέβηκαν.';
+$lang['mu_lasterr']            = 'Τελευταίο σφάλμα:';
+$lang['recent_global']         = 'Βλέπετε τις αλλαγές εντός του φακέλου <b>%s</b>. Μπορείτε επίσης να <a href="%s">δείτε τις πρόσφατες αλλαγές σε όλο το wiki</a>.';
+$lang['years']                 = 'πριν από %d χρόνια';
+$lang['months']                = 'πριν από %d μήνες';
+$lang['weeks']                 = 'πριν από %d εβδομάδες';
+$lang['days']                  = 'πριν από %d ημέρες';
+$lang['hours']                 = 'πριν από %d ώρες';
+$lang['minutes']               = 'πριν από %d λεπτά';
+$lang['seconds']               = 'πριν από %d δευτερόλεπτα';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/locked.txt
new file mode 100644
index 000000000..d2f542c19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/locked.txt
@@ -0,0 +1,4 @@
+====== Κλειδωμένη σελίδα ======
+
+Αυτή η σελίδα είναι προς το παρόν δεσμευμένη για τροποποίηση από άλλον χρήστη. Θα πρέπει να περιμένετε μέχρι ο συγκεκριμένος χρήστης να τελειώσει την τροποποίηση ή να εκπνεύσει το χρονικό όριο για το σχετικό κλείδωμα.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/login.txt
new file mode 100644
index 000000000..3839b7279
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/login.txt
@@ -0,0 +1,3 @@
+====== Είσοδος χρήστη ======
+
+Αυτή την στιγμή δεν έχετε συνδεθεί ως χρήστης! Για να συνδεθείτε, εισάγετε τα στοιχεία σας στην παρακάτω φόρμα. Πρέπει να έχετε ενεργοποιήσει τα cookies στον φυλλομετρητή σας.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/mailtext.txt
new file mode 100644
index 000000000..a5059ca4d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/mailtext.txt
@@ -0,0 +1,17 @@
+Μία σελίδα προστέθηκε ή τροποποιήθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
+
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+Παλιά έκδοση    : @OLDPAGE@
+Νέα έκδοση      : @NEWPAGE@
+Σύνοψη          : @SUMMARY@
+Χρήστης         : @USER@
+
+@DIFF@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/newpage.txt
new file mode 100644
index 000000000..e8d65d6e5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/newpage.txt
@@ -0,0 +1,3 @@
+====== Αυτή η σελίδα δεν υπάρχει ακόμη ======
+
+Η σελίδα που ζητάτε δεν υπάρχει ακόμη. Εάν όμως έχετε επαρκή δικαιώματα, μπορείτε να την δημιουργήσετε επιλέγοντας ''Δημιουργία σελίδας''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/norev.txt
new file mode 100644
index 000000000..9ce347948
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/norev.txt
@@ -0,0 +1,4 @@
+====== Δεν υπάρχει τέτοια έκδοση ======
+
+Η έκδοση που αναζητήσατε δεν υπάρχει. Επιλέξτε ''Παλαιότερες εκδόσεις σελίδας'' για να δείτε την λίστα με τις παλαιότερες εκδόσεις της τρέχουσας σελίδας.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/preview.txt
new file mode 100644
index 000000000..f6709a441
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/preview.txt
@@ -0,0 +1,4 @@
+====== Προεπισκόπηση ======
+
+Αυτή είναι μια προεπισκόπηση του πως θα δείχνει η σελίδα. Θυμηθείτε: Οι αλλαγές σας **δεν έχουν αποθηκευθεί** ακόμη!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/pwconfirm.txt
new file mode 100644
index 000000000..03f408819
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/pwconfirm.txt
@@ -0,0 +1,14 @@
+Γεια σας @FULLNAME@!
+
+Κάποιος ζήτησε τη δημιουργία νέου κωδικού για τον λογαριασμό @TITLE@
+που διατηρείτε στο @DOKUWIKIURL@
+
+Εάν δεν ζητήσατε εσείς την δημιουργία νέου κωδικού απλά αγνοήστε αυτό το e-mail.
+
+Εάν όντως εσείς ζητήσατε την δημιουργία νέου κωδικού, ακολουθήστε τον παρακάτω σύνδεσμο για να το επιβεβαιώσετε.
+
+@CONFIRM@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/read.txt
new file mode 100644
index 000000000..2d43c28fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/read.txt
@@ -0,0 +1 @@
+Μπορείτε μόνο να διαβάσετε αυτή την σελίδα και όχι να την τροποποιήσετε. Εάν πιστεύετε ότι αυτό δεν είναι σωστό, απευθυνθείτε στον διαχειριστή της εφαρμογής.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/recent.txt
new file mode 100644
index 000000000..cc8051581
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/recent.txt
@@ -0,0 +1,3 @@
+====== Πρόσφατες αλλαγές σελίδων ======
+
+Οι παρακάτω σελίδες τροποποιήθηκαν πρόσφατα:
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/register.txt
new file mode 100644
index 000000000..15d64cba3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/register.txt
@@ -0,0 +1,3 @@
+====== Εγγραφή νέου χρήστη ======
+
+Συμπληρώστε όλα τα παρακάτω πεδία για να δημιουργήσετε ένα νέο λογαριασμό σε αυτό το wiki. Πρέπει να δώσετε μια **υπαρκτή e-mail διεύθυνση** - ο κωδικός σας θα σας αποσταλεί σε αυτήν. Το όνομα χρήστη θα πρέπει να πληρεί τις ίδιες απαιτήσεις ονόματος που ισχύουν και για τους [[doku>pagename|φακέλους]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/registermail.txt
new file mode 100644
index 000000000..5d516ee31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/registermail.txt
@@ -0,0 +1,14 @@
+Ένας νέος χρήστης εγγράφηκε. Αυτές είναι οι λεπτομέρειες:
+
+Χρήστης         : @NEWUSER@
+Όνομα           : @NEWNAME@
+e-mail          : @NEWEMAIL@
+
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/resendpwd.txt
new file mode 100644
index 000000000..2b91ed017
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Αποστολή νέου κωδικού ======
+
+Συμπληρώστε όλα τα παρακάτω πεδία για να λάβετε ένα νέο κωδικό για τον λογαριασμό σας σε αυτό το wiki. Ο νέος κωδικός σας θα σταλεί στην e-mail διεύθυνση που έχετε ήδη δηλώσει. Το όνομα πρέπει να είναι αυτό που ισχύει για τον λογαριασμό σας σε αυτό το wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/revisions.txt
new file mode 100644
index 000000000..7689c3b2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/revisions.txt
@@ -0,0 +1,3 @@
+====== Παλαιότερες εκδόσεις σελίδας ======
+
+Οι παρακάτω είναι παλαιότερες εκδόσεις της τρέχουσας σελίδας. Εάν θέλετε να αντικαταστήσετε την τρέχουσα σελίδα με κάποια από τις παλαιότερες εκδόσεις της, επιλέξτε την σχετική έκδοση, επιλέξτε ''Τροποποίηση σελίδας'', κάνετε τυχόν αλλαγές και αποθηκεύστε την.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/searchpage.txt
new file mode 100644
index 000000000..87f396292
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/searchpage.txt
@@ -0,0 +1,5 @@
+====== Αναζήτηση ======
+
+Τα αποτελέσματα της αναζήτησής σας ακολουθούν.
+
+===== Αποτελέσματα =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/showrev.txt
new file mode 100644
index 000000000..212245420
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/showrev.txt
@@ -0,0 +1,2 @@
+**Αυτή είναι μια παλαιότερη έκδοση της σελίδας!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/stopwords.txt
new file mode 100644
index 000000000..bc6eb48ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/stopwords.txt
@@ -0,0 +1,29 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/subscribermail.txt
new file mode 100644
index 000000000..2963ef348
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/subscribermail.txt
@@ -0,0 +1,24 @@
+Γειa σας!
+
+Η σελίδα @PAGE@ στο wiki @TITLE@ τροποποιήθηκε.
+Αυτές είναι οι διαφορές σε σχέση με την προηγούμενη έκδοση:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ημερομηνία: @DATE@
+Χρήστης: @USER@
+Περίληψη τροποποίησης: @SUMMARY@
+Παλιά έκδοση: @OLDPAGE@
+Νέα έκδοση: @NEWPAGE@
+
+Για να πάψετε να λαμβάνετε τέτοια ενημερωτικά e-mails,
+επισκεφτείτε το wiki στο
+@DOKUWIKIURL@ δείτε την σελίδα
+@NEWPAGE@
+και επιλέξτε 'Διαγραφή από λήψη ενημερώσεων'.
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/updateprofile.txt
new file mode 100644
index 000000000..ccb9596b6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Τροποποίηση προφίλ ======
+
+Τροποποιήστε **μόνο** τα πεδία που θέλετε να αλλάξετε. Δεν μπορείτε να αλλάξετε το πεδίο ''Όνομα''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/uploadmail.txt
new file mode 100644
index 000000000..52d2f1f53
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/uploadmail.txt
@@ -0,0 +1,15 @@
+Ένα αρχείο φορτώθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
+
+Αρχείο          : @MEDIA@
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+Μέγεθος         : @SIZE@
+MIME Type       : @MIME@
+Χρήστης         : @USER@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/wordblock.txt
new file mode 100644
index 000000000..b54e8ef77
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/el/wordblock.txt
@@ -0,0 +1,4 @@
+====== Εντοπίστηκε SPAM ======
+
+Οι αλλαγές σας **δεν** αποθηκεύτηκαν επειδή βρέθηκε τουλάχιστον μία μη αποδεκτή λέξη. Εάν προσπαθήσατε να προσθέσετε spam σε αυτό το wiki -- κακώς! Εάν πιστεύετε ότι αυτό δεν είναι σωστό, απευθυνθείτε στον διαχειριστή της εφαρμογής.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/admin.txt
new file mode 100644
index 000000000..cfd21b217
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Below you can find a list of administrative tasks available in DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/adminplugins.txt
new file mode 100644
index 000000000..3ec46cf4e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/adminplugins.txt
@@ -0,0 +1,2 @@
+===== Additional Plugins =====
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/backlinks.txt
new file mode 100644
index 000000000..5b40b84ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+This is a list of pages that seem to link back to the current page.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt
new file mode 100644
index 000000000..624f17b21
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/conflict.txt
@@ -0,0 +1,6 @@
+====== A newer version exists ======
+
+A newer version of the document you edited exists. This happens when another user changed the document while you were editing it.
+
+Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/denied.txt
new file mode 100644
index 000000000..3ac72820c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/denied.txt
@@ -0,0 +1,4 @@
+====== Permission Denied ======
+
+Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/diff.txt
new file mode 100644
index 000000000..934534d42
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/diff.txt
@@ -0,0 +1,4 @@
+====== Differences ======
+
+This shows you the differences between two versions of the page.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/draft.txt
new file mode 100644
index 000000000..e84d34a5b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/draft.txt
@@ -0,0 +1,6 @@
+====== Draft file found ======
+
+Your last edit session on this page was not completed correctly. DokuWiki automatically saved a draft during your work which you may now use to continue your editing. Below you can see the data that was saved from your last session.
+
+Please decide if you want to //recover// your lost edit session, //delete// the autosaved draft or //cancel// the editing process.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/edit.txt
new file mode 100644
index 000000000..48c9c296d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/edit.txt
@@ -0,0 +1,2 @@
+Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If you want to test some things, learn to make your first steps on the [[playground:playground|playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/editrev.txt
new file mode 100644
index 000000000..638216b07
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/editrev.txt
@@ -0,0 +1,2 @@
+**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/index.txt
new file mode 100644
index 000000000..5adbfd898
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+This is an index over all available pages ordered by [[doku>namespaces|namespaces]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/install.html
new file mode 100644
index 000000000..0f94839a6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/install.html
@@ -0,0 +1,24 @@
+<p>This page assists in the first time installation and configuration of
+<a href="http://dokuwiki.org">Dokuwiki</a>. More info on this
+installer is available on it's own
+<a href="http://dokuwiki.org/installer">documentation page</a>.</p>
+
+<p>DokuWiki uses ordinary files for the storage of wiki pages and other
+information associated with those pages (e.g. images, search indexes, old
+revisions, etc).  In order to operate successfully DokuWiki
+<strong>must</strong> have write access to the directories that hold those
+files.  This installer is not capable of setting up directory permissions. That
+normally needs to be done directly on a command shell or if you are using hosting,
+through FTP or your hosting control panel (e.g. cPanel).</p>
+
+<p>This installer will setup your DokuWiki configuration for
+<acronym title="access control list">ACL</acronym>, which in turn allows administrator
+login and access to DokuWiki's admin menu for installing plugins, managing
+users, managing access to wiki pages and alteration of configuration settings.
+It isn't required for DokuWiki to operate, however it will make Dokuwiki easier
+to administer.</p>
+
+<p>Experienced users or users with special setup requirements should use these links
+for details concerning
+<a href="http://dokuwiki.org/install">installation instructions</a>
+and <a href="http://dokuwiki.org/config">configuration settings</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/lang.php
new file mode 100644
index 000000000..cf5173d05
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/lang.php
@@ -0,0 +1,280 @@
+<?php
+/**
+ * english language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Anika Henke <anika@selfthinker.org>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '“';//&ldquo;
+$lang['doublequoteclosing']  = '”';//&rdquo;
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
+$lang['apostrophe']          = '’';//&rsquo;
+
+$lang['btn_edit']   = 'Edit this page';
+$lang['btn_source'] = 'Show pagesource';
+$lang['btn_show']   = 'Show page';
+$lang['btn_create'] = 'Create this page';
+$lang['btn_search'] = 'Search';
+$lang['btn_save']   = 'Save';
+$lang['btn_preview']= 'Preview';
+$lang['btn_top']    = 'Back to top';
+$lang['btn_newer']  = '<< more recent';
+$lang['btn_older']  = 'less recent >>';
+$lang['btn_revs']   = 'Old revisions';
+$lang['btn_recent'] = 'Recent changes';
+$lang['btn_upload'] = 'Upload';
+$lang['btn_cancel'] = 'Cancel';
+$lang['btn_index']  = 'Index';
+$lang['btn_secedit']= 'Edit';
+$lang['btn_login']  = 'Login';
+$lang['btn_logout'] = 'Logout';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Update';
+$lang['btn_delete'] = 'Delete';
+$lang['btn_back']   = 'Back';
+$lang['btn_backlink']    = "Backlinks";
+$lang['btn_backtomedia'] = 'Back to Mediafile Selection';
+$lang['btn_subscribe']   = 'Subscribe Page Changes';
+$lang['btn_unsubscribe'] = 'Unsubscribe Page Changes';
+$lang['btn_subscribens']   = 'Subscribe Namespace Changes';
+$lang['btn_unsubscribens'] = 'Unsubscribe Namespace Changes';
+$lang['btn_profile']     = 'Update Profile';
+$lang['btn_reset']       = 'Reset';
+$lang['btn_resendpwd']   = 'Send new password';
+$lang['btn_draft']    = 'Edit draft';
+$lang['btn_recover']  = 'Recover draft';
+$lang['btn_draftdel'] = 'Delete draft';
+$lang['btn_revert'] = 'Restore';
+
+$lang['loggedinas'] = 'Logged in as';
+$lang['user']       = 'Username';
+$lang['pass']       = 'Password';
+$lang['newpass']    = 'New password';
+$lang['oldpass']    = 'Confirm current password';
+$lang['passchk']    = 'once again';
+$lang['remember']   = 'Remember me';
+$lang['fullname']   = 'Real name';
+$lang['email']      = 'E-Mail';
+$lang['register']   = 'Register';
+$lang['profile']    = 'User Profile';
+$lang['badlogin']   = 'Sorry, username or password was wrong.';
+$lang['minoredit']  = 'Minor Changes';
+$lang['draftdate']  = 'Draft autosaved on'; // full dformat date will be added
+$lang['nosecedit']  = 'The page was changed in the meantime, section info was out of date loaded full page instead.';
+
+$lang['regmissing'] = 'Sorry, you must fill in all fields.';
+$lang['reguexists'] = 'Sorry, a user with this login already exists.';
+$lang['regsuccess'] = 'The user has been created and the password was sent by email.';
+$lang['regsuccess2']= 'The user has been created.';
+$lang['regmailfail']= 'Looks like there was an error on sending the password mail. Please contact the admin!';
+$lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin';
+$lang['regbadpass'] = 'The two given passwords are not identical, please try again.';
+$lang['regpwmail']  = 'Your DokuWiki password';
+$lang['reghere']    = 'You don\'t have an account yet? Just get one';
+
+$lang['profna']       = 'This wiki does not support profile modification';
+$lang['profnochange'] = 'No changes, nothing to do.';
+$lang['profnoempty']  = 'An empty name or email address is not allowed.';
+$lang['profchanged']  = 'User profile successfully updated.';
+
+$lang['pwdforget'] = 'Forgotten your password? Get a new one';
+$lang['resendna']  = 'This wiki does not support password resending.';
+$lang['resendpwd'] = 'Send new password for';
+$lang['resendpwdmissing'] = 'Sorry, you must fill in all fields.';
+$lang['resendpwdnouser']  = 'Sorry, we can\'t find this user in our database.';
+$lang['resendpwdbadauth'] = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
+$lang['resendpwdconfirm'] = 'A confirmation link has been sent by email.';
+$lang['resendpwdsuccess'] = 'Your new password has been sent by email.';
+
+$lang['license']   = 'Except where otherwise noted, content on this wiki is licensed under the following license:';
+$lang['licenseok'] = 'Note: By editing this page you agree to license your content under the following license:';
+
+$lang['searchmedia']  = 'Search file name:';
+$lang['searchmedia_in']  = 'Search in %s';
+$lang['txt_upload']   = 'Select file to upload';
+$lang['txt_filename'] = 'Upload as (optional)';
+$lang['txt_overwrt']  = 'Overwrite existing file';
+$lang['lockedby']     = 'Currently locked by';
+$lang['lockexpire']   = 'Lock expires at';
+$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+
+$lang['notsavedyet'] = 'Unsaved changes will be lost.\nReally continue?';
+$lang['rssfailed']   = 'An error occurred while fetching this feed: ';
+$lang['nothingfound']= 'Nothing was found.';
+
+$lang['mediaselect'] = 'Media Files';
+$lang['fileupload']  = 'Media File Upload';
+$lang['uploadsucc']  = 'Upload successful';
+$lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
+$lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
+$lang['uploadexist'] = 'File already exists. Nothing done.';
+$lang['uploadbadcontent'] = 'The uploaded content did not match the %s file extension.';
+$lang['uploadspam']  = 'The upload was blocked by the spam blacklist.';
+$lang['uploadxss']   = 'The upload was blocked for possibly malicious content.';
+$lang['uploadsize']  = 'The uploaded file was too big. (max. %s)';
+$lang['deletesucc']  = 'The file "%s" has been deleted.';
+$lang['deletefail']  = '"%s" couldn\'t be deleted - check permissions.';
+$lang['mediainuse']  = 'The file "%s" hasn\'t been deleted - it is still in use.';
+$lang['namespaces']  = 'Namespaces';
+$lang['mediafiles']  = 'Available files in';
+
+$lang['js']['searchmedia']    = 'Search for files';
+$lang['js']['keepopen']    = 'Keep window open on selection';
+$lang['js']['hidedetails'] = 'Hide Details';
+$lang['mediausage']  = 'Use the following syntax to reference this file:';
+$lang['mediaview']   = 'View original file';
+$lang['mediaroot']   = 'root';
+$lang['mediaupload'] = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your "Upload as" filename separated by colons.';
+$lang['mediaextchange'] = 'Filextension changed from .%s to .%s!';
+
+$lang['reference']   = 'References for';
+$lang['ref_inuse']   = 'The file can\'t be deleted, because it\'s still used by the following pages:';
+$lang['ref_hidden']  = 'Some references  are on pages you don\'t have permission to read';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Matching pagenames';
+$lang['toc']        = 'Table of Contents';
+$lang['current']    = 'current';
+$lang['yours']      = 'Your Version';
+$lang['diff']       = 'Show differences to current revisions';
+$lang['diff2']      = 'Show differences between selected revisions';
+$lang['line']       = 'Line';
+$lang['breadcrumb'] = 'Trace';
+$lang['youarehere'] = 'You are here';
+$lang['lastmod']    = 'Last modified';
+$lang['by']         = 'by';
+$lang['deleted']    = 'removed';
+$lang['created']    = 'created';
+$lang['restored']   = 'old revision restored';
+$lang['external_edit'] = 'external edit';
+$lang['summary']    = 'Edit summary';
+$lang['noflash']    = 'The <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is needed to display this content.';
+$lang['download']   = 'Download Snippet';
+
+$lang['mail_newpage']  = 'page added:';
+$lang['mail_changed']  = 'page changed:';
+$lang['mail_new_user'] = 'new user:';
+$lang['mail_upload']   = 'file uploaded:';
+
+$lang['js']['nosmblinks'] = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
+
+$lang['qb_bold']    = 'Bold Text';
+$lang['qb_italic']  = 'Italic Text';
+$lang['qb_underl']  = 'Underlined Text';
+$lang['qb_code']    = 'Code Text';
+$lang['qb_strike']  = 'Strike-through Text';
+$lang['qb_h1']      = 'Level 1 Headline';
+$lang['qb_h2']      = 'Level 2 Headline';
+$lang['qb_h3']      = 'Level 3 Headline';
+$lang['qb_h4']      = 'Level 4 Headline';
+$lang['qb_h5']      = 'Level 5 Headline';
+
+$lang['qb_h']       = 'Headline';
+$lang['qb_hs']      = 'Select Headline';
+$lang['qb_hplus']   = 'Higher Headline';
+$lang['qb_hminus']  = 'Lower Headline';
+$lang['qb_hequal']  = 'Same Level Headline';
+
+$lang['qb_link']    = 'Internal Link';
+$lang['qb_extlink'] = 'External Link';
+$lang['qb_hr']      = 'Horizontal Rule';
+$lang['qb_ol']      = 'Ordered List Item';
+$lang['qb_ul']      = 'Unordered List Item';
+$lang['qb_media']   = 'Add Images and other files';
+$lang['qb_sig']     = 'Insert Signature';
+$lang['qb_smileys'] = 'Smileys';
+$lang['qb_chars']   = 'Special Chars';
+
+$lang['upperns']       = 'jump to parent namespace';
+$lang['js']['linkwiz'] = 'Link Wizard';
+$lang['js']['linkto']  = 'Link to:';
+
+$lang['js']['del_confirm']= 'Really delete selected item(s)?';
+$lang['admin_register']= 'Add new user';
+
+$lang['metaedit']    = 'Edit Metadata';
+$lang['metasaveerr'] = 'Writing metadata failed';
+$lang['metasaveok']  = 'Metadata saved';
+$lang['img_backto']  = 'Back to';
+$lang['img_title']   = 'Title';
+$lang['img_caption'] = 'Caption';
+$lang['img_date']    = 'Date';
+$lang['img_fname']   = 'Filename';
+$lang['img_fsize']   = 'Size';
+$lang['img_artist']  = 'Photographer';
+$lang['img_copyr']   = 'Copyright';
+$lang['img_format']  = 'Format';
+$lang['img_camera']  = 'Camera';
+$lang['img_keywords']= 'Keywords';
+
+$lang['subscribe_success']  = 'Added %s to subscription list for %s';
+$lang['subscribe_error']    = 'Error adding %s to subscription list for %s';
+$lang['subscribe_noaddress']= 'There is no address associated with your login, you cannot be added to the subscription list';
+$lang['unsubscribe_success']= 'Removed %s from subscription list for %s';
+$lang['unsubscribe_error']  = 'Error removing %s from subscription list for %s';
+
+/* auth.class language support */
+$lang['authmodfailed']   = 'Bad user authentication configuration. Please inform your Wiki Admin.';
+$lang['authtempfail']    = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+
+/* installer strings */
+$lang['i_chooselang'] = 'Choose your language';
+$lang['i_installer']  = 'DokuWiki Installer';
+$lang['i_wikiname']   = 'Wiki Name';
+$lang['i_enableacl']  = 'Enable ACL (recommended)';
+$lang['i_superuser']  = 'Superuser';
+$lang['i_problems']   = 'The installer found some problems, indicated below. You can not continue until you have fixed them.';
+$lang['i_modified']   = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation.
+                         You should either re-extract the files from the downloaded package or consult the complete
+                         <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna']     = 'PHP function <code>%s</code> is not available. Maybe your hosting provider disabled it for some reason?';
+$lang['i_phpver']     = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
+$lang['i_permfail']   = '<code>%s</code> is not writable by DokuWiki. You need to fix the permission settings of this directory!';
+$lang['i_confexists'] = '<code>%s</code> already exists';
+$lang['i_writeerr']   = 'Unable to create <code>%s</code>. You will need to check directory/file permissions and create the file manually.';
+$lang['i_badhash']    = 'unrecognised or modified dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']     = '<code>%s</code> - illegal or empty value';
+$lang['i_success']    = 'The configuration was finished successfully. You may delete the install.php file now. Continue to
+                        <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_failure']    = 'Some errors occurred while writing the configuration files. You may need to fix them manually before
+                         you can use <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_policy']     = 'Initial ACL policy';
+$lang['i_pol0']       = 'Open Wiki (read, write, upload for everyone)';
+$lang['i_pol1']       = 'Public Wiki (read for everyone, write and upload for registered users)';
+$lang['i_pol2']       = 'Closed Wiki (read, write, upload for registered users only)';
+
+$lang['i_retry']      = 'Retry';
+
+$lang['mu_intro']     = 'Here you can upload multiple files at once. Click the browse button to add them to the queue. Press upload when done.';
+$lang['js']['mu_btn'] = 'Upload multiple files at once';
+$lang['mu_gridname']  = 'Filename';
+$lang['mu_gridsize']  = 'Size';
+$lang['mu_gridstat']  = 'Status';
+$lang['mu_namespace'] = 'Namespace';
+$lang['mu_browse']    = 'Browse';
+$lang['mu_toobig']    = 'too big';
+$lang['mu_ready']     = 'ready for upload';
+$lang['mu_done']      = 'complete';
+$lang['mu_fail']      = 'failed';
+$lang['mu_authfail']  = 'session expired';
+$lang['mu_progress']  = '@PCT@% uploaded';
+$lang['mu_filetypes'] = 'Allowed Filetypes';
+$lang['mu_info']      = 'files uploaded.';
+$lang['mu_lasterr']   = 'Last error:';
+
+$lang['recent_global'] = 'You\'re currently watching the changes inside the <b>%s</b> namespace. You can also <a href="%s">view the recent changes of the whole wiki</a>.';
+
+$lang['years']   = '%d years ago';
+$lang['months']  = '%d months ago';
+$lang['weeks']   = '%d weeks ago';
+$lang['days']    = '%d days ago';
+$lang['hours']   = '%d hours ago';
+$lang['minutes'] = '%d minutes ago';
+$lang['seconds'] = '%d seconds ago';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/locked.txt
new file mode 100644
index 000000000..af6347a96
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/locked.txt
@@ -0,0 +1,3 @@
+====== Page locked ======
+
+This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/login.txt
new file mode 100644
index 000000000..2004ea198
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/mailtext.txt
new file mode 100644
index 000000000..44a3f6553
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/mailtext.txt
@@ -0,0 +1,17 @@
+A page in your DokuWiki was added or changed. Here are the details:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/newpage.txt
new file mode 100644
index 000000000..848d4df09
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/newpage.txt
@@ -0,0 +1,4 @@
+====== This topic does not exist yet ======
+
+You've followed a link to a topic that doesn't exist yet. If permissions allow, you may create it by using the ''Create this page'' button.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/norev.txt
new file mode 100644
index 000000000..0b21bf3f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/norev.txt
@@ -0,0 +1,4 @@
+====== No such revision ======
+
+The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/preview.txt
new file mode 100644
index 000000000..16c96c5d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+This is a preview of how your text will look like. Remember: It is **not saved** yet!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/pwconfirm.txt
new file mode 100644
index 000000000..a342ff95a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/pwconfirm.txt
@@ -0,0 +1,15 @@
+Hi @FULLNAME@!
+
+Someone requested a new password for your @TITLE@
+login at @DOKUWIKIURL@
+
+If you did not request a new password then just ignore this email.
+
+To confirm that the request was really sent by you please use the
+following link.
+
+@CONFIRM@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/read.txt
new file mode 100644
index 000000000..9f56d81ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/read.txt
@@ -0,0 +1,2 @@
+This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/recent.txt
new file mode 100644
index 000000000..3f7b58c46
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/recent.txt
@@ -0,0 +1,5 @@
+====== Recent Changes ======
+
+The following pages were changed recently.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/register.txt
new file mode 100644
index 000000000..db68d4f2f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/register.txt
@@ -0,0 +1,4 @@
+====== Register as new user ======
+
+Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - if you are not asked to enter a password here, a new one will be sent to that address. The login name should be a valid [[doku>pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/registermail.txt
new file mode 100644
index 000000000..f02015767
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/registermail.txt
@@ -0,0 +1,14 @@
+A new user has registered. Here are the details:
+
+User name   : @NEWUSER@
+Full name   : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/resendpwd.txt
new file mode 100644
index 000000000..98c8c756b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Send new password ======
+
+Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/revisions.txt
new file mode 100644
index 000000000..dd5f35b8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/revisions.txt
@@ -0,0 +1,4 @@
+====== Old Revisions ======
+
+These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/searchpage.txt
new file mode 100644
index 000000000..e357d6cdd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/searchpage.txt
@@ -0,0 +1,5 @@
+====== Search ======
+
+You can find the results of your search below. If you didn't find what you were looking for, you can create or edit the page named after your query with the appropriate button.
+
+===== Results =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/showrev.txt
new file mode 100644
index 000000000..3608de36b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/showrev.txt
@@ -0,0 +1,2 @@
+**This is an old revision of the document!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/stopwords.txt
new file mode 100644
index 000000000..afc301659
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/stopwords.txt
@@ -0,0 +1,39 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/subscribermail.txt
new file mode 100644
index 000000000..673c4c32a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/subscribermail.txt
@@ -0,0 +1,23 @@
+Hello!
+
+The page @PAGE@ in the @TITLE@ wiki changed.
+Here are the changes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Date        : @DATE@
+User        : @USER@
+Edit Summary: @SUMMARY@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+
+To cancel the page notifications, log into the wiki at
+@DOKUWIKIURL@ then visit
+@NEWPAGE@
+and unsubscribe page and/or namespace changes.
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/updateprofile.txt
new file mode 100644
index 000000000..b929fee83
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Update your account profile ======
+
+You only need to complete those fields you wish to change.  You may not change your user name.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/uploadmail.txt
new file mode 100644
index 000000000..6fa196730
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/uploadmail.txt
@@ -0,0 +1,14 @@
+A file was uploaded to your DokuWiki. Here are the details:
+
+File        : @MEDIA@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Size        : @SIZE@
+MIME Type   : @MIME@
+User        : @USER@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/wordblock.txt
new file mode 100644
index 000000000..f0f7d759d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/en/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blocked ======
+
+Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/admin.txt
new file mode 100644
index 000000000..2ede2763c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/admin.txt
@@ -0,0 +1,3 @@
+====== Administro ======
+
+Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/adminplugins.txt
new file mode 100644
index 000000000..ed2949b10
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/adminplugins.txt
@@ -0,0 +1 @@
+===== Ekstra kromaĵojn =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/backlinks.txt
new file mode 100644
index 000000000..cd0cca9c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/backlinks.txt
@@ -0,0 +1,3 @@
+====== Retroligiloj ======
+
+Ĉi tiu listo montras paĝojn, kiuj referencas al la aktuala paĝo.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/conflict.txt
new file mode 100644
index 000000000..0d7ede0b0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/conflict.txt
@@ -0,0 +1,5 @@
+====== Pli nova versio ekzistas ======
+
+Ekzistas pli nova versio de la dokumento. Tio okazas kiam iu alia uzanto ŝanĝigis enhavon de la dokumento dum vi redaktis ĝin.
+
+Atente esploru distingojn kaj decidu kiun version vi tenigos. Se vi premos ''Konservi'', do via versio estos konservita. Presonte butonon ''Rezigni'' vi tenos la kurantan version.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/denied.txt
new file mode 100644
index 000000000..b35fe0412
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/denied.txt
@@ -0,0 +1,4 @@
+====== Aliro malpermesita ======
+
+Vi ne havas sufiĉe da rajtoj por rigardi ĉi tiujn paĝojn. Eble vi forgesis identiĝi.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/diff.txt
new file mode 100644
index 000000000..ac5474ef1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/diff.txt
@@ -0,0 +1,4 @@
+====== Diferencoj ======
+
+Ĉi tie vi povas ekvidi diferencojn inter la aktuala versio kaj la elektita revizio de la paĝo.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/draft.txt
new file mode 100644
index 000000000..fa43ecb74
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/draft.txt
@@ -0,0 +1,5 @@
+====== Skiza dosiero estis trovata ======
+
+Via lasta sekcio de redakto en tiu ĉi paĝo ne estis korekte kompletita. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datenaron, kiu estis konservata el via lasta sekcio.
+
+Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aŭ //rezigni// pri la redakta procezo.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/edit.txt
new file mode 100644
index 000000000..c1ca31e1d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/edit.txt
@@ -0,0 +1 @@
+Redaktu paĝon kaj poste premu butonon titolitan ''Konservi''. Bonvolu tralegi la [[vikio:sintakso|vikian sintakson]] por kompreni kiel vi povas krei paĝojn. Bonvolu redakti nur se vi planas **plibonigi** la enhavon de la paĝo. Se vi volas nur testi ion, do bonvolu uzi specialan paĝon: [[vikio:ludejo|ludejo]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/editrev.txt
new file mode 100644
index 000000000..4bab50b93
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/editrev.txt
@@ -0,0 +1,2 @@
+**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, tiel kreiĝos nova kuranta versio kun la sama enhavo.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/index.txt
new file mode 100644
index 000000000..08bf3c894
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/index.txt
@@ -0,0 +1,3 @@
+====== Enhavo ======
+
+Tio ĉi estas indekso pri ĉiuj disponeblaj paĝoj ordigitaj laŭ [[doku>namespaces|nomspacoj]].
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/install.html
new file mode 100644
index 000000000..74bbe15e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/install.html
@@ -0,0 +1,9 @@
+<p>Tiu ĉi paĝo helpas en la unua instalo kaj agordado de <a href="http://dokuwiki.org">DokuWiki</a>. Pli da informo pri tiu instalilo estas disponebla en ĝia propra <a href="http://dokuwiki.org/installer">dokumentada paĝo</a>.</p>
+
+<p>DokuWiki uzas ordinarajn dosierojn por konservi vikiajn paĝojn kaj aliajn informojn asociitaj al tiuj paĝoj (ekz. bildoj, serĉindeksoj, malnovaj revizioj, ktp). Por bone funkcii, DokuWiki <strong>devas</strong> havi registran rajton sur la subdosierujoj, kiuj entenas tiujn dosierojn. Tiu ĉi instalilo ne kapablas difini permes-atributojn de dosierujoj. Ordinare, tio devas esti senpere farita de iu komando en konzolo aŭ, se vi abonas retprovizanton, per FTP aŭ kontrola panelo de tiu retprovizanto (ekz. cPanel).</p>
+
+<p>Tiu ĉi instalilo difinos vian DokuWiki-an agordadon por <acronym title="alir-kontrola listo">ACL</acronym>, kiu ebligas al administranto identiĝi kaj aliri taŭgan interfacon por instali kromaĵojn, administri uzantojn kaj alireblon al vikipaĝoj, kaj difini agordojn ĝeneralajn.
+Ĝi ne estas nepra por ke DokuWiki funkciu, tamen ĝi multe faciligos administradon.</p>
+
+<p>Spertuloj aŭ uzantoj kiuj bezonas specialajn agordrimedojn devus uzi tiujn ligilojn por havi pli detalojn pri <a href="http://dokuwiki.org/install">instaladaj instrukcioj</a>
+kaj <a href="http://dokuwiki.org/config">agordadaj difinoj</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/lang.php
new file mode 100644
index 000000000..e2c25ae43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/lang.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * Esperanta dosiero
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Antono Vasiljev <esperanto.minsk ĈE tut.by>
+ * @author Felipe Castro <fefcas CXE yahoo.com.br>
+ * @author Felipe Castro <fefcas@uol.com.br>
+ * @author Felipe Castro <fefcas@gmail.com>
+ * @author Felipe Castro <fefcas (cxe) gmail (punkto) com>
+ * @author Felipo Kastro <fefcas@gmail.com>
+ * @author Robert Bogenschneider <robog@gmx.de>
+ * @author Erik Pedersen <erik pedersen@shaw.ca>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Robert Bogenschneider <robog@GMX.de>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Redakti la paĝon';
+$lang['btn_source']            = 'Montri fontan tekston';
+$lang['btn_show']              = 'Montri paĝon';
+$lang['btn_create']            = 'Krei paĝon';
+$lang['btn_search']            = 'Serĉi';
+$lang['btn_save']              = 'Konservi';
+$lang['btn_preview']           = 'Antaŭrigardi';
+$lang['btn_top']               = 'Supren';
+$lang['btn_newer']             = '<< pli freŝe';
+$lang['btn_older']             = 'malpli freŝe >>';
+$lang['btn_revs']              = 'Malnovaj revizioj';
+$lang['btn_recent']            = 'Freŝaj ŝanĝoj';
+$lang['btn_upload']            = 'Alŝuti';
+$lang['btn_cancel']            = 'Rezigni';
+$lang['btn_index']             = 'Indekso';
+$lang['btn_secedit']           = 'Redakti';
+$lang['btn_login']             = 'Ensaluti';
+$lang['btn_logout']            = 'Elsaluti';
+$lang['btn_admin']             = 'Administri';
+$lang['btn_update']            = 'Ĝisdatigi';
+$lang['btn_delete']            = 'Forigi';
+$lang['btn_back']              = 'Retroiri';
+$lang['btn_backlink']          = 'Retroligoj';
+$lang['btn_backtomedia']       = 'Retroiri al elekto de dosiero';
+$lang['btn_subscribe']         = 'Aliĝi al paĝaj modifoj';
+$lang['btn_unsubscribe']       = 'Malaliĝi al paĝaj modifoj';
+$lang['btn_subscribens']       = 'Aliĝi al nomspacaj modifoj';
+$lang['btn_unsubscribens']     = 'Malaliĝi al nomspacaj modifoj';
+$lang['btn_profile']           = 'Ĝisdatigi profilon';
+$lang['btn_reset']             = 'Rekomenci';
+$lang['btn_resendpwd']         = 'Sendi novan pasvorton';
+$lang['btn_draft']             = 'Redakti skizon';
+$lang['btn_recover']           = 'Restarigi skizon';
+$lang['btn_draftdel']          = 'Forigi skizon';
+$lang['btn_revert']            = 'Restarigi';
+$lang['loggedinas']            = 'Ensalutita kiel';
+$lang['user']                  = 'Uzant-nomo';
+$lang['pass']                  = 'Pasvorto';
+$lang['newpass']               = 'Nova pasvorto';
+$lang['oldpass']               = 'Konfirmu la nunan pasvorton';
+$lang['passchk']               = 'plian fojon';
+$lang['remember']              = 'Rememoru min';
+$lang['fullname']              = 'Kompleta nomo';
+$lang['email']                 = 'Retpoŝto';
+$lang['register']              = 'Registro';
+$lang['profile']               = 'Uzanto-profilo';
+$lang['badlogin']              = 'Pardonu, uzant-nomo aŭ pasvorto estis erara.';
+$lang['minoredit']             = 'Etaj modifoj';
+$lang['draftdate']             = 'Lasta konservo de la skizo:';
+$lang['nosecedit']             = 'La paĝo ŝanĝiĝis intertempe, sekcio-informo estis malĝisdata, ni ŝargas la tutan paĝon anstataŭe.';
+$lang['regmissing']            = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
+$lang['reguexists']            = 'Pardonu, ĉi tiu uzanto-nomo jam estas okupita.';
+$lang['regsuccess']            = 'La uzanto estas kreita kaj la pasvorto estis elsendita per retpoŝto.';
+$lang['regsuccess2']           = 'La uzanto estas kreita.';
+$lang['regmailfail']           = 'Ŝajne okazis eraro dum elsendo de la pasvorto. Bonvolu informi administranton pri tio!';
+$lang['regbadmail']            = 'Entajpita retpoŝta adreso ne ŝajnas valida. Se vi pensas, ke tio estas eraro, kontaktu la administranton.';
+$lang['regbadpass']            = 'La du pasvortoj ne samas, bonvolu provi refoje.';
+$lang['regpwmail']             = 'Via DokuWiki-pasvorto';
+$lang['reghere']               = 'Se vi ne havas konton, do vi povos akiri ĝin';
+$lang['profna']                = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.';
+$lang['profnochange']          = 'Neniu ŝanĝo, nenio farinda.';
+$lang['profnoempty']           = 'Malplena nomo aŭ retadreso ne estas permesataj.';
+$lang['profchanged']           = 'La profilo de la uzanto estas sukcese ĝisdatigita.';
+$lang['pwdforget']             = 'Ĉu vi forgesis vian pasvorton? Prenu novan';
+$lang['resendna']              = 'Tiu ĉi vikio ne ebligas resendon de la pasvortoj.';
+$lang['resendpwd']             = 'Sendi novan pasvorton al';
+$lang['resendpwdmissing']      = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
+$lang['resendpwdnouser']       = 'Pardonu, ni ne trovas tiun uzanton en nia datenbazo.';
+$lang['resendpwdbadauth']      = 'Pardonu, tiu aŭtentiga kodo ne validas. Certiĝu, ke vi uzis la kompletan konfirmigan ligilon.';
+$lang['resendpwdconfirm']      = 'Konfirmiga ligilo estas sendita per retpoŝto.';
+$lang['resendpwdsuccess']      = 'Via nova pasvorto estas sendita per retpoŝto.';
+$lang['license']               = 'Krom kie rekte indikite, enhavo de tiu ĉi vikio estas publikigita laŭ la jena permesilo:';
+$lang['licenseok']             = 'Rimarku: redaktante tiun ĉi paĝon vi konsentas publikigi vian enhavon laŭ la jena permesilo:';
+$lang['searchmedia']           = 'Serĉi dosiernomon:';
+$lang['searchmedia_in']        = 'Serĉi en %s';
+$lang['txt_upload']            = 'Elektu dosieron por alŝuto';
+$lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
+$lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
+$lang['lockedby']              = 'Nune ŝlosita de';
+$lang['lockexpire']            = 'Ŝlosado ĉesos en';
+$lang['willexpire']            = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempkontrolon de la ŝlosado, do premu butonon "Antaŭrigardi".';
+$lang['notsavedyet']           = 'Ne konservitaj modifoj perdiĝos.\nĈu vi certe volas daŭrigi la procezon?';
+$lang['rssfailed']             = 'Okazis eraro dum ricevado de la novaĵ-fluo: ';
+$lang['nothingfound']          = 'Ankoraŭ nenio troviĝas tie ĉi.';
+$lang['mediaselect']           = 'Elekto de aŭdvidaĵa dosiero';
+$lang['fileupload']            = 'Alŝuto de aŭdvidaĵa dosiero';
+$lang['uploadsucc']            = 'Alŝuto estis sukcesa';
+$lang['uploadfail']            = 'Alŝuto estis malsukcesa. Eble ĉu estas problemoj pro permes-atributoj?';
+$lang['uploadwrong']           = 'Rifuzita alŝuto. Tiu ĉi dosiersufikso estas malpermesata!';
+$lang['uploadexist']           = 'La dosiero jam ekzistas. Nenio estas farita.';
+$lang['uploadbadcontent']      = 'La alŝutita enhavo ne kongruas al la sufikso %s.';
+$lang['uploadspam']            = 'La alŝutaĵo estis blokita de kontraŭspama vortlisto.';
+$lang['uploadxss']             = 'La alŝutajo estis blokita pro ebla malica enhavo.';
+$lang['uploadsize']            = 'La alŝutita dosiero estis tro granda. (maks. %s)';
+$lang['deletesucc']            = 'La dosiero "%s" estas forigita.';
+$lang['deletefail']            = '"%s" ne povis esti forigita - kontrolu permes-atributojn.';
+$lang['mediainuse']            = 'La dosiero "%s" ne estis forigita - ĝi ankoraŭ estas uzata.';
+$lang['namespaces']            = 'Nomspacoj';
+$lang['mediafiles']            = 'Disponeblaj dosieroj';
+$lang['js']['searchmedia']     = 'Serĉi dosierojn';
+$lang['js']['keepopen']        = 'Tenu la fenestron malfermata dum elekto';
+$lang['js']['hidedetails']     = 'Kaŝi detalojn';
+$lang['js']['nosmblinks']      = 'Tio ĉi nur funkcias en la Vindozaĉa "Microsoft Internet Explorer".
+Vi ankoraŭ povas kopii kaj almeti la ligilon.';
+$lang['js']['linkwiz']         = 'Ligil-Asistanto';
+$lang['js']['linkto']          = 'Ligilo al:';
+$lang['js']['del_confirm']     = 'Ĉu vere forigi elektitajn ero(j)n?';
+$lang['js']['mu_btn']          = 'Alŝuti plurajn dosierojn multope.';
+$lang['mediausage']            = 'Uzu la jenan sintakson por referenci tiun ĉi dosieron:';
+$lang['mediaview']             = 'Rigardi originalan dosieron';
+$lang['mediaroot']             = 'ĉefo (root)';
+$lang['mediaupload']           = 'Alŝutu dosieron al la kuranta nomspaco tien ĉi. Por krei subnomspacojn, antaŭmetu ilin al via "Alŝuti kiel" dosiernomo, apartigante per dupunktoj (:).';
+$lang['mediaextchange']        = 'La dosiersufikso ŝanĝis de .%s al .%s!';
+$lang['reference']             = 'Referencoj por';
+$lang['ref_inuse']             = 'La dosiero ne povas esti forigita, ĉar ĝi ankoraŭ estas uzata de la jenaj paĝoj:';
+$lang['ref_hidden']            = 'Kelkaj referencoj estas en paĝoj, kiujn vi ne rajtas legi';
+$lang['hits']                  = 'Kongruoj';
+$lang['quickhits']             = 'Kongruoj trovitaj en paĝnomoj';
+$lang['toc']                   = 'Enhavtabelo';
+$lang['current']               = 'aktuala';
+$lang['yours']                 = 'Via Versio';
+$lang['diff']                  = 'Montri diferencojn el la aktuala versio';
+$lang['diff2']                 = 'Montri diferencojn inter la elektitaj revizioj';
+$lang['line']                  = 'Linio';
+$lang['breadcrumb']            = 'Paŝoj';
+$lang['youarehere']            = 'Vi estas ĉi tie';
+$lang['lastmod']               = 'Lastaj ŝanĝoj';
+$lang['by']                    = 'de';
+$lang['deleted']               = 'forigita';
+$lang['created']               = 'kreita';
+$lang['restored']              = 'malnova revizio restarigita';
+$lang['external_edit']         = 'ekstera redakto';
+$lang['summary']               = 'Bulteno de ŝanĝoj';
+$lang['noflash']               = 'La <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> estas bezonata por montrigi tiun ĉi enhavon.';
+$lang['download']              = 'Elŝuti eltiraĵon';
+$lang['mail_newpage']          = 'paĝo aldonita:';
+$lang['mail_changed']          = 'paĝo modifita:';
+$lang['mail_new_user']         = 'Nova uzanto:';
+$lang['mail_upload']           = 'dosiero alŝutita:';
+$lang['qb_bold']               = 'Dika teksto';
+$lang['qb_italic']             = 'Dekliva teksto';
+$lang['qb_underl']             = 'Substrekita teksto';
+$lang['qb_code']               = 'Koduma teksto';
+$lang['qb_strike']             = 'Trastrekita teksto';
+$lang['qb_h1']                 = 'Titolo de 1-a nivelo';
+$lang['qb_h2']                 = 'Titolo de 2-a nivelo';
+$lang['qb_h3']                 = 'Titolo de 3-a nivelo';
+$lang['qb_h4']                 = 'Titolo de 4-a nivelo';
+$lang['qb_h5']                 = 'Titolo de 5-a nivelo';
+$lang['qb_h']                  = 'Ĉeftitolo';
+$lang['qb_hs']                 = 'Elektu ĉeftitolon';
+$lang['qb_hplus']              = 'Altnivela titolo';
+$lang['qb_hminus']             = 'Subnivela titolo';
+$lang['qb_hequal']             = 'Samnivela titolo';
+$lang['qb_link']               = 'Interna ligilo';
+$lang['qb_extlink']            = 'Ekstera ligilo';
+$lang['qb_hr']                 = 'Horizontala streko';
+$lang['qb_ol']                 = 'Elemento de numerita listo';
+$lang['qb_ul']                 = 'Elemento de ne numerita listo';
+$lang['qb_media']              = 'Aldoni bildojn kaj aliajn dosierojn';
+$lang['qb_sig']                = 'Inkluzivi subskribon';
+$lang['qb_smileys']            = 'Ridetuloj';
+$lang['qb_chars']              = 'Specialaj signaĵoj';
+$lang['upperns']               = 'saltu al la parenca nomspaco';
+$lang['admin_register']        = 'Aldoni novan uzanton';
+$lang['metaedit']              = 'Redakti metadatenaron';
+$lang['metasaveerr']           = 'La konservo de metadatenaro malsukcesis';
+$lang['metasaveok']            = 'La metadatenaro estis konservita';
+$lang['img_backto']            = 'Retroiri al';
+$lang['img_title']             = 'Titolo';
+$lang['img_caption']           = 'Priskribo';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Dosiernomo';
+$lang['img_fsize']             = 'Grandeco';
+$lang['img_artist']            = 'Fotisto';
+$lang['img_copyr']             = 'Kopirajtoj';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Kamerao';
+$lang['img_keywords']          = 'Ŝlosilvortoj';
+$lang['subscribe_success']     = '%s estis aldonita al dissendolisto por %s';
+$lang['subscribe_error']       = 'Estas eraro je aldono de %s al dissendolisto por %s';
+$lang['subscribe_noaddress']   = 'Estas neniu retadreso asociita al via identiĝ-nomo, do vi ne povas esti aldonata al la dissendolisto.';
+$lang['unsubscribe_success']   = '%s estas forigita de la dissendolisto por %s';
+$lang['unsubscribe_error']     = 'Estas eraro je forigo de %s el dissendolisto por %s';
+$lang['authmodfailed']         = 'Malbona agordo por identigi la uzanton. Bonvolu informi la administranton de la vikio.';
+$lang['authtempfail']          = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
+$lang['i_chooselang']          = 'Elektu vian lingvon';
+$lang['i_installer']           = 'Instalilo de DokuWiki';
+$lang['i_wikiname']            = 'Nomo de la vikio';
+$lang['i_enableacl']           = 'Ebligi "ACL" (alirkontrolo, rekomendinde)';
+$lang['i_superuser']           = 'Superuzanto';
+$lang['i_problems']            = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri ĝis ili estos iel korektitaj.';
+$lang['i_modified']            = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita Dokuwiki-pakaĵo.
+Vi devas aŭ redemeti la dosierojn el la elŝutita pakaĵo aŭ plibone informiĝi pri la instalada procezo.';
+$lang['i_funcna']              = 'La PHP-a funkcio <code>%s</code> ne estas uzebla. Eble via retprovizanto ial malpermesis tion?';
+$lang['i_phpver']              = 'La versio de la PHP <code>%s</code> estas pli malnova ol la bezonata <code>%s</code>. Vi bezonas ĝisdatigi la PHP-an instalon.';
+$lang['i_permfail']            = '<code>%s</code> ne estas skribebla por DokuWiki. Vi devas redifini la permes-atributojn de tiu ĉi dosierujo!';
+$lang['i_confexists']          = '<code>%s</code> jam ekzistas';
+$lang['i_writeerr']            = 'Ne eblas krei "<code>%s</code>"-on. Vi bezonas kontroli la permesojn de la dosier(uj)oj kaj mem krej la dosieron.';
+$lang['i_badhash']             = 'dokuwiki.php ne estas rekonebla aŭ ĝi estas modifita (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - malvalida aŭ malplena valoro';
+$lang['i_success']             = 'La agordado estas sukcese kompletita. Vi povas forigi la dosieron nun. Pluiru al <a href="doku.php">via nova DokuWiki</a>.';
+$lang['i_failure']             = 'Kelkaj eraroj okazis dum la konservo de la agordaj dosieroj. Vi devas senpere korekti ilin antaŭ ol vi povos uzi <a href="doku.php">vian novan DokuWiki-on</a>.                       ';
+$lang['i_policy']              = 'Apriora ACL-a agordo';
+$lang['i_pol0']                = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)';
+$lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)';
+$lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)';
+$lang['i_retry']               = 'Reprovi';
+$lang['mu_intro']              = 'Ĉi tie vi povas alŝuti plurajn dosierojn multope. Klaku la esplor-butonon por aldoni ilin al la vico. Premu alŝuti kiam prete.';
+$lang['mu_gridname']           = 'Dosiernomo';
+$lang['mu_gridsize']           = 'Grandeco';
+$lang['mu_gridstat']           = 'Stato';
+$lang['mu_namespace']          = 'Nomspaco';
+$lang['mu_browse']             = 'Esplori';
+$lang['mu_toobig']             = 'tro granda';
+$lang['mu_ready']              = 'preta por alŝuti';
+$lang['mu_done']               = 'plenumite';
+$lang['mu_fail']               = 'malsukcesinte';
+$lang['mu_authfail']           = 'sekcio tro longdaŭris';
+$lang['mu_progress']           = '@PCT@% alŝutite';
+$lang['mu_filetypes']          = 'Permesitaj dosiertipoj';
+$lang['mu_info']               = 'alŝutitaj dosieroj.';
+$lang['mu_lasterr']            = 'Lasta eraro:';
+$lang['recent_global']         = 'Vi nun rigardas la ŝanĝojn ene de la nomspaco <b>%s</b>. Vi povas ankaŭ <a href="%s">vidi la freŝajn ŝanĝojn de la tuta vikio</a>.';
+$lang['years']                 = 'antaŭ %d jaroj';
+$lang['months']                = 'antaŭ %d monatoj';
+$lang['weeks']                 = 'antaŭ %d semajnoj';
+$lang['days']                  = 'antaŭ %d tagoj';
+$lang['hours']                 = 'antaŭ %d horoj';
+$lang['minutes']               = 'antaŭ %d minutoj';
+$lang['seconds']               = 'antaŭ %d sekundoj';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/locked.txt
new file mode 100644
index 000000000..68963da75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/locked.txt
@@ -0,0 +1,3 @@
+====== La paĝo estas ŝlosita ======
+
+Tiu ĉi paĝo nun estas blokita pro redaktado de iu alia uzanto. Bonvole atendu ke ŝi/li finu redakti aŭ ke la ŝlosada tempolimo finiĝu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/login.txt
new file mode 100644
index 000000000..2b9b34340
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/login.txt
@@ -0,0 +1,3 @@
+====== Enirejo ======
+
+Vi ankoraŭ ne identiĝis! Entajpu necesajn informojn sube por identiĝi. Kuketoj (cookies) devas esti ŝaltitaj.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/mailtext.txt
new file mode 100644
index 000000000..5e83b324b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/mailtext.txt
@@ -0,0 +1,16 @@
+Paĝo en via DokuVikio estis ŝanĝita aŭ aldonita. Jen detaloj:
+
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-adreso: @IPADDRESS@
+RetNodo: @HOSTNAME@
+Antaŭa revizio: @OLDPAGE@
+Nova revizio: @NEWPAGE@
+Bulteno de ŝanĝoj: @SUMMARY@
+Uzulo: @USER@
+
+@DIFF@
+
+-- 
+Tiu ĉi mesaĝo estis kreata de DokuWiki, kiu lokiĝas tie:
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/newpage.txt
new file mode 100644
index 000000000..4ddcd33be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/newpage.txt
@@ -0,0 +1,4 @@
+====== Ĉi tiu paĝo ankoraŭ ne ekzistas ======
+
+Vi sekvis ligilon, kiu kondukas al artikolo ankoraŭ ne ekzistanta. Se vi rajtas, tiel vi povas krei tiun ĉi paĝon ekpremante la butonon ''Krei paĝon''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/norev.txt
new file mode 100644
index 000000000..6dffbaa1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/norev.txt
@@ -0,0 +1,3 @@
+====== Tia revizio ne ekzistas ======
+
+La elektita revizio ne ekzistas. Premu butonon ''Malnovaj revizioj'', por vidi liston de malnovaj revizioj de la dokumento.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/preview.txt
new file mode 100644
index 000000000..784f693e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/preview.txt
@@ -0,0 +1,3 @@
+====== Antaŭrigardo ======
+
+Tiu ĉi estas antaŭrigardo pri kia estos via teksto. Memoru: ĝi ankoraŭ **ne estas konservita**!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/pwconfirm.txt
new file mode 100644
index 000000000..f227752b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/pwconfirm.txt
@@ -0,0 +1,14 @@
+Saluton @FULLNAME@!
+
+Iu petis novan pasvorton por via @TITLE@
+ensalutnomo ĉe @DOKUWIKIURL@
+
+Se ne estas vi, kiu petis tion, do preterlasu tiun ĉi mesaĝon.
+
+Por konfirmi, ke la peto estis vere via, bonvolu musklaki la jenan ligilon.
+
+@CONFIRM@
+
+-- 
+Tiu ĉi mesaĝo estis kreita de DokuWiki ĉe
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/read.txt
new file mode 100644
index 000000000..734eb1654
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/read.txt
@@ -0,0 +1,2 @@
+Tiu ĉi paĝo estas disponigata nur por legado (vi ne povas redakti ĝin). Sciigu administranton, se vi opinias ke tio estas ne ĝusta malpermeso.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/recent.txt
new file mode 100644
index 000000000..e03144668
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/recent.txt
@@ -0,0 +1,3 @@
+====== Freŝaj Ŝanĝoj ======
+
+La jenaj paĝoj estis ŝanĝitaj antaŭ malmulta tempo.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/register.txt
new file mode 100644
index 000000000..57d5ca1f4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/register.txt
@@ -0,0 +1,4 @@
+====== Registriĝi ======
+
+Entajpu necesajn informojn por enregistriĝi. Certiĝu ke via retpoŝta adreso estas vera ĉar ni sendos al ĝi vian pasvorton.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/registermail.txt
new file mode 100644
index 000000000..c832eca42
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/registermail.txt
@@ -0,0 +1,14 @@
+Nova uzulo estis registrata. Jen la detaloj:
+
+Uzantonomo: @NEWUSER@
+Kompleta nomo: @NEWNAME@
+Retadreso: @NEWEMAIL@
+
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-Adreso: @IPADDRESS@
+Provizanto: @HOSTNAME@
+
+-- 
+Tiu ĉi mesaĝo estis kreata de DokuWiki ĉe
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/resendpwd.txt
new file mode 100644
index 000000000..57b4b0408
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Sendi novan pasvorton ======
+
+Bonvolu meti vian uzantonomon en la suban formularon petante novan pasvorton por via aliĝo en tiu ĉi vikio. Konfirma ligilo estos sendata al via registrita retadreso.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/revisions.txt
new file mode 100644
index 000000000..4f37bb125
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/revisions.txt
@@ -0,0 +1,3 @@
+====== Malnovaj revizioj ======
+
+Sube estas listo de malnovaj revizioj de la dokumento. Elektu revizion se vi volas rigardi ĝin aŭ anstataŭigi kurantan paĝon per ĝi.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/searchpage.txt
new file mode 100644
index 000000000..a940c503d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/searchpage.txt
@@ -0,0 +1,5 @@
+====== Serĉo ======
+
+Sube estas rezultoj de serĉo en la retejo.\\ Se vi ne trovis tion, kion vi serĉis, vi povas krei novan paĝon kun necesa nomo per la koresponda butono.
+
+===== Rezultoj =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/showrev.txt
new file mode 100644
index 000000000..e3a8a1747
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/showrev.txt
@@ -0,0 +1,2 @@
+**Tiu estas malnova revizio de la dokumento**. Klaku sur titolo por ricevi kurantan version.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/stopwords.txt
new file mode 100644
index 000000000..2c18cb319
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/stopwords.txt
@@ -0,0 +1,23 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+la
+pri
+estas
+kaj
+mi
+mia
+vi
+via
+ili
+ilia
+kun
+por
+kiel
+tiu
+estis
+kio
+kiam
+kie
+kiu
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/subscribermail.txt
new file mode 100644
index 000000000..074a99351
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/subscribermail.txt
@@ -0,0 +1,23 @@
+Saluton!
+
+La retpaĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen la ŝanĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Uzanto : @USER@
+Modifa rezumo: @SUMMARY@
+Malnova revizio: @OLDPAGE@
+Nova revizio: @NEWPAGE@
+
+Por nuligi la avizojn pri paĝoŝanĝoj, ensalutu en la vikio ĉe
+@DOKUWIKIURL@ kaj aliru
+@NEWPAGE@
+kaj malaliĝu al avizoj pri paĝaj kaj/aŭ nomspacaj ŝanĝoj.
+
+-- 
+Tiu ĉi mesaĝo estis kreita de DokuWiki ĉe
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/updateprofile.txt
new file mode 100644
index 000000000..a3de0c840
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ĝisdatigi vian profilon ======
+
+Vi nur bezonas kompletigi tiujn kampojn, kiujn vi deziras ŝanĝi. Vi ne povas ŝanĝi vian uzantonomon.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/uploadmail.txt
new file mode 100644
index 000000000..e7c327a60
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/uploadmail.txt
@@ -0,0 +1,14 @@
+Dosiero estis alŝutita al via DokuVikio. Jen detaloj:
+
+Dosiero: @MEDIA@
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-Adreso: @IPADDRESS@
+Ret-nodo: @HOSTNAME@
+Grandeco: @SIZE@
+Dosier-tipo: @MIME@
+Uzanto: @USER@
+
+-- 
+Tiu ĉi mesaĝo estis kreita de DokuWiki ĉe
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/wordblock.txt
new file mode 100644
index 000000000..64bb19e5c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eo/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAMO estis blokita ======
+
+Viaj redaktoj ne estas konservitaj, ĉar en la teksto estis trovitaj unu aŭ kelkaj malpermesindaj vortoj, ŝajnante spamo. Se vi pensas, ke tio estas eraro, bonvolu kontakti la administranton de la vikio.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/admin.txt
new file mode 100644
index 000000000..320b1c5be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/admin.txt
@@ -0,0 +1,3 @@
+====== Administración ======
+
+Abajo puedes encontrar una lista de las tareas de administración disponibles en Dokuwiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/adminplugins.txt
new file mode 100644
index 000000000..8e1b0f813
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionales =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/backlinks.txt
new file mode 100644
index 000000000..4de93ef34
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/backlinks.txt
@@ -0,0 +1,4 @@
+====== Referencias ======
+
+Esta es una lista de páginas que parecen hacer referencia a la página actual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/conflict.txt
new file mode 100644
index 000000000..265ac1ee6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/conflict.txt
@@ -0,0 +1,5 @@
+====== Existe una versión más reciente ======
+
+Existe una versión más reciente del documento que has editado. Esto sucede cuando otro usuario ha modificado el documento mientras lo estabas editando.
+
+Examina las diferencias mostradas abajo a fondo, y decide entonces cual conservar. Si eliges ''Guardar'', tu versión será guardada. Si eliges ''Cancelar'' se guardará la actual versión.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/denied.txt
new file mode 100644
index 000000000..d7b37404b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/denied.txt
@@ -0,0 +1,3 @@
+====== Permiso Denegado ======
+
+Lo siento, no tienes suficientes permisos para continuar. ¿Quizás has olvidado identificarte?
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/diff.txt
new file mode 100644
index 000000000..e0e9e08ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/diff.txt
@@ -0,0 +1,4 @@
+====== Diferencias ======
+
+Muestra las diferencias entre dos versiones de la página.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/draft.txt
new file mode 100644
index 000000000..054d618b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/draft.txt
@@ -0,0 +1,6 @@
+====== Fichero borrador encontrado ======
+
+Su última sesión de edición en esta página no se completó correctamente. DokuWiki guardó automáticamente un borrador mientras usted trabajaba; puede utilizar el borrador para continuar editándolo. Abajo se ven los datos que fueron guardados en su última sesión.
+
+Por favor decida si desea //recuperar// su sesión perdida, //eliminar// el borrador guardado automáticamente o //cancelar// el proceso de edición.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/edit.txt
new file mode 100644
index 000000000..55c3c1dc5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/edit.txt
@@ -0,0 +1,2 @@
+Edita la página y pulsa ''Guardar''. Mira [[wiki:syntax]] para sintaxis Wiki. Por favor edita la página solo si puedes **mejorarla**. Si quieres testear algunas cosas aprende a dar tus primeros pasos en el [[playground:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/editrev.txt
new file mode 100644
index 000000000..4b587b7ce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/editrev.txt
@@ -0,0 +1,2 @@
+**Has cargado una revisión vieja del documento!** Si la guardas crearás una versión nueva con estos datos.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/index.txt
new file mode 100644
index 000000000..148e5f406
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/index.txt
@@ -0,0 +1,4 @@
+====== Índice ======
+
+Este es un índice de todas las páginas disponibles ordenado por [[doku>namespaces|espacios de nombres]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/install.html
new file mode 100644
index 000000000..c16d4c47c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/install.html
@@ -0,0 +1,14 @@
+<p>Esta página lo asiste en la primera vez que instala y configura 
+<a href="http://dokuwiki.org">Dokuwiki</a>.
+Más información sobre este instalador está disponible en la 
+<a href="http://dokuwiki.org/installer">página de documentación</a>.
+</p>
+
+<p>DokuWiki usa ficheros comunes para el almacenamiento de las páginas del wiki y otra información asociada a esas páginas (por ejemplo, imágenes, índices de archivos, revisiones viejas, etc). Para funcionar correctamente DokuWiki <strong>debe</strong> tener permisos de escritura en los directorios que contienen esos ficheros. Este instalador no es capaz de establecer permisos en directorios. Normalmente eso debe ser hecho a través de una consola de comandos o si usted usa servicios de hosting a través de FTP o el panel de control brindado por su hosting (e.g. cPanel).</p>
+
+<p>Este instalador configurará una <acronym title="lista de control de acceso">ACL</acronym>, que a su vez permite el acceso al administrador y acceso a los menúes de administración para instalación
+de plugins, administración de usuarios, administración de permisos para las páginas wiki y modificación de la configuración. A pesar que no es necesario para que DokuWiki funcione, hará que sea más fácil la administración.</p>
+
+<p>Usuarios experimentados o usuarios con requerimientos especiales deben usar estos enlaces para detalles concernientes a
+<a href="http://dokuwiki.org/install">instrucciones de instalación</a>
+y <a href="http://dokuwiki.org/config">configuración</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/lang.php
new file mode 100644
index 000000000..9d4995c52
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/lang.php
@@ -0,0 +1,262 @@
+<?php
+/**
+ * spanish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Zigor Astarbe <zigor@astarbe.com>
+ * @author Adrián Ariza <adrian_ariza.ciudad.com.ar>
+ * @author Gabiel Molina <gabriel191@gmail.com>
+ * @author Paco Avila <monkiki@gmail.com>
+ * @author Bernardo Arlandis Mañó <bernardo@tsolucio.com>
+ * @author Miguel Pagano <miguel.pagano@gmail.com>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
+ * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Manuel Meco <manuel.meco@gmail.com>
+ * @author VictorCastelan <victorcastelan@gmail.com>
+ * @author Jordan Mero  hack.jord@gmail.com
+ * @author Felipe Martinez <metalmartinez@gmail.com>
+ * @author Javier Aranda <internet@javierav.com>
+ * @author Zerial <fernando@zerial.org>
+ * @author Marvin Ortega <maty1206@maryanlinux.com>
+ * @author Daniel Castro Alvarado <dancas2@gmail.com>
+ * @author Fernando J. Gómez <fjgomez@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta página';
+$lang['btn_source']            = 'Ver fuente';
+$lang['btn_show']              = 'Ver página';
+$lang['btn_create']            = 'Crear esta página';
+$lang['btn_search']            = 'Buscar';
+$lang['btn_save']              = 'Guardar';
+$lang['btn_preview']           = 'Previsualización';
+$lang['btn_top']               = 'Ir hasta arriba';
+$lang['btn_newer']             = '<< más reciente';
+$lang['btn_older']             = 'menos reciente >>';
+$lang['btn_revs']              = 'Revisiones antiguas';
+$lang['btn_recent']            = 'Cambios recientes';
+$lang['btn_upload']            = 'Cargar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Conectarse';
+$lang['btn_logout']            = 'Desconectarse';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Actualizar';
+$lang['btn_delete']            = 'Borrar';
+$lang['btn_back']              = 'Atrás';
+$lang['btn_backlink']          = 'Enlaces anteriores';
+$lang['btn_backtomedia']       = 'Volver a la selección de archivos multimedia';
+$lang['btn_subscribe']         = 'Suscribirse a cambios de la página';
+$lang['btn_unsubscribe']       = 'Cancelar suscripción a cambios de la página';
+$lang['btn_subscribens']       = 'Suscribirse a cambios del espacio de nombres';
+$lang['btn_unsubscribens']     = 'Cancelar suscripción a cambios del espacio de nombres';
+$lang['btn_profile']           = 'Actualizar perfil';
+$lang['btn_reset']             = 'Restablecer';
+$lang['btn_resendpwd']         = 'Enviar nueva contraseña';
+$lang['btn_draft']             = 'Editar borrador';
+$lang['btn_recover']           = 'Recuperar borrador';
+$lang['btn_draftdel']          = 'Eliminar borrador';
+$lang['btn_revert']            = 'Restaurar';
+$lang['loggedinas']            = 'Conectado como ';
+$lang['user']                  = 'Usuario';
+$lang['pass']                  = 'Contraseña';
+$lang['newpass']               = 'Nueva contraseña';
+$lang['oldpass']               = 'Confirma tu contraseña actual';
+$lang['passchk']               = 'otra vez';
+$lang['remember']              = 'Recordarme';
+$lang['fullname']              = 'Nombre real';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrarse';
+$lang['profile']               = 'Perfil del usuario';
+$lang['badlogin']              = 'Lo siento, el usuario o la contraseña es incorrecto.';
+$lang['minoredit']             = 'Cambios menores';
+$lang['draftdate']             = 'Borrador guardado automáticamente:';
+$lang['nosecedit']             = 'La página ha cambiado en el lapso, la información de sección estaba anticuada, en su lugar se cargó la página completa.';
+$lang['regmissing']            = 'Lo siento, tienes que completar todos los campos.';
+$lang['reguexists']            = 'Lo siento, ya existe un usuario con este nombre.';
+$lang['regsuccess']            = 'El usuario ha sido creado y la contraseña se ha enviado por correo.';
+$lang['regsuccess2']           = 'El usuario ha sido creado.';
+$lang['regmailfail']           = 'Parece que ha habido un error al enviar el correo con la contraseña. ¡Por favor, contacta al administrador!';
+$lang['regbadmail']            = 'La dirección de correo no parece válida. Si piensas que esto es un error, contacta al administrador';
+$lang['regbadpass']            = 'Las dos contraseñas no son iguales, por favor inténtalo de nuevo.';
+$lang['regpwmail']             = 'Tu contraseña de DokuWiki';
+$lang['reghere']               = '¿No tienes una cuenta todavía? Consigue una';
+$lang['profna']                = 'Este wiki no permite la modificación del perfil';
+$lang['profnochange']          = 'Sin cambios, nada que hacer.';
+$lang['profnoempty']           = 'No se permite que el nombre o la dirección de correo electrónico estén vacíos.';
+$lang['profchanged']           = 'Se actualizó correctamente el perfil del usuario.';
+$lang['pwdforget']             = '¿Has olvidado tu contraseña? Consigue una nueva';
+$lang['resendna']              = 'Este wiki no brinda la posibilidad de reenvío de contraseña.';
+$lang['resendpwd']             = 'Enviar una nueva contraseña para';
+$lang['resendpwdmissing']      = 'Lo siento, debes completar todos los campos.';
+$lang['resendpwdnouser']       = 'Lo siento, no se encuentra este usuario en nuestra base de datos.';
+$lang['resendpwdbadauth']      = 'Lo siento, este código de autenticación no es válido. Asegúrate de haber usado el enlace de confirmación entero.';
+$lang['resendpwdconfirm']      = 'Un enlace para confirmación ha sido enviado por correo electrónico.';
+$lang['resendpwdsuccess']      = 'Tu nueva contraseña ha sido enviada por correo electrónico.';
+$lang['license']               = 'Excepto donde se indique lo contrario, el contenido de esta wiki se autoriza bajo la siguiente licencia:';
+$lang['licenseok']             = 'Nota: Al editar esta página, estás de acuerdo en autorizar su contenido bajo la siguiente licencia:';
+$lang['searchmedia']           = 'Buscar archivo:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Selecciona el archivo a subir';
+$lang['txt_filename']          = 'Subir como (opcional)';
+$lang['txt_overwrt']           = 'Sobreescribir archivo existente';
+$lang['lockedby']              = 'Actualmente bloqueado por';
+$lang['lockexpire']            = 'El bloqueo expira en';
+$lang['willexpire']            = 'Tu bloqueo para editar esta página expira en un minuto.\nPara evitar conflictos usa el botón previsualizar para reiniciar el contador de tiempo.';
+$lang['notsavedyet']           = 'Los cambios que no se han guardado se perderán.\n¿Realmente quieres continuar?';
+$lang['rssfailed']             = 'Se ha producido un error mientras se leían los datos de este feed: ';
+$lang['nothingfound']          = 'No se ha encontrado nada.';
+$lang['mediaselect']           = 'Archivos Multimedia';
+$lang['fileupload']            = 'Subida de archivos multimedia';
+$lang['uploadsucc']            = 'El archivo se ha subido satisfactoriamente';
+$lang['uploadfail']            = 'La subida del fichero ha fallado. ¿Permisos equivocados?';
+$lang['uploadwrong']           = 'Subida de fichero denegada. ¡Los ficheros con esta extensión están prohibidos!';
+$lang['uploadexist']           = 'El fichero ya existe. No se ha hecho nada.';
+$lang['uploadbadcontent']      = 'El contenido de la subida no coincide con la extensión de fichero %s';
+$lang['uploadspam']            = 'La subida ha sido bloqueada por una lista negra de spam';
+$lang['uploadxss']             = 'La subida ha sido bloqueada por contenido posiblemente malicioso';
+$lang['uploadsize']            = 'El fichero subido es demasiado grande. (max. %s)';
+$lang['deletesucc']            = 'El fichero "%s" ha sido borrado.';
+$lang['deletefail']            = '"%s" no pudo ser borrado; verifique los permisos.';
+$lang['mediainuse']            = 'El fichero "%s" no ha sido borrado, aún está en uso.';
+$lang['namespaces']            = 'Espacios de nombres';
+$lang['mediafiles']            = 'Ficheros disponibles en';
+$lang['js']['searchmedia']     = 'Buscar archivos';
+$lang['js']['keepopen']        = 'Mantener la ventana abierta luego de seleccionar';
+$lang['js']['hidedetails']     = 'Ocultar detalles';
+$lang['js']['nosmblinks']      = 'El enlace a recursos compartidos de Windows sólo funciona en Microsoft Internet Explorer.
+Lo que sí puedes hacer es copiar y pegar el enlace.';
+$lang['js']['linkwiz']         = 'Asistente de enlaces';
+$lang['js']['linkto']          = 'Enlazar a:';
+$lang['js']['del_confirm']     = '¿Quieres realmente borrar lo seleccionado?';
+$lang['js']['mu_btn']          = 'Subir varios archivos a la vez';
+$lang['mediausage']            = 'Use la siguiente sintaxis para hacer referencia a este fichero:';
+$lang['mediaview']             = 'Ver el fichero original';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Subir aquí un fichero al espacio de nombres actual. Para crear sub-espacios de nombres, antepóngalos al nombre de fichero separándolos por dos puntos (:) en "Subir como".';
+$lang['mediaextchange']        = 'Extensión del fichero cambiada de .%s a .%s!';
+$lang['reference']             = 'Referencias para';
+$lang['ref_inuse']             = 'El fichero no puede ser borrado, porque todavía se está usando en las siguientes páginas:';
+$lang['ref_hidden']            = 'Algunas referencias están en páginas sobre las que no tienes permiso de lectura';
+$lang['hits']                  = 'Entradas';
+$lang['quickhits']             = 'Páginas que coinciden';
+$lang['toc']                   = 'Tabla de Contenidos';
+$lang['current']               = 'actual';
+$lang['yours']                 = 'Tu versión';
+$lang['diff']                  = 'Muestra diferencias a la versión actual';
+$lang['diff2']                 = 'Muestra las diferencias entre las revisiones seleccionadas';
+$lang['line']                  = 'Línea';
+$lang['breadcrumb']            = 'Traza';
+$lang['youarehere']            = 'Estás aquí';
+$lang['lastmod']               = 'Última modificación';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'borrado';
+$lang['created']               = 'creado';
+$lang['restored']              = 'se ha restaurado la vieja versión';
+$lang['external_edit']         = 'editor externo';
+$lang['summary']               = 'Resumen de la edición';
+$lang['noflash']               = 'Para mostrar este contenido es necesario el <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a>.';
+$lang['download']              = 'Descargar trozo de código fuente';
+$lang['mail_newpage']          = 'página añadida:';
+$lang['mail_changed']          = 'página cambiada:';
+$lang['mail_new_user']         = 'nuevo usuario:';
+$lang['mail_upload']           = 'archivo subido:';
+$lang['qb_bold']               = 'Negrita';
+$lang['qb_italic']             = 'Itálica';
+$lang['qb_underl']             = 'Subrayado';
+$lang['qb_code']               = 'Código';
+$lang['qb_strike']             = 'Tachado';
+$lang['qb_h1']                 = 'Título 1';
+$lang['qb_h2']                 = 'Título 2';
+$lang['qb_h3']                 = 'Título 3';
+$lang['qb_h4']                 = 'Título 4';
+$lang['qb_h5']                 = 'Título 5';
+$lang['qb_h']                  = 'Título';
+$lang['qb_hs']                 = 'Selecciona el título';
+$lang['qb_hplus']              = 'Título alto';
+$lang['qb_hminus']             = 'Título bajo';
+$lang['qb_hequal']             = 'Título del mismo nivel';
+$lang['qb_link']               = 'Enlace interno';
+$lang['qb_extlink']            = 'Enlace externo';
+$lang['qb_hr']                 = 'Línea horizontal';
+$lang['qb_ol']                 = 'Ítem de lista ordenada';
+$lang['qb_ul']                 = 'Ítem de lista desordenada';
+$lang['qb_media']              = 'Añadir Imágenes u otros ficheros';
+$lang['qb_sig']                = 'Insertar firma';
+$lang['qb_smileys']            = 'Sonrisas';
+$lang['qb_chars']              = 'Caracteres especiales';
+$lang['upperns']               = 'Saltar al espacio de nombres superior';
+$lang['admin_register']        = 'Añadir nuevo usuario';
+$lang['metaedit']              = 'Editar metadatos';
+$lang['metasaveerr']           = 'La escritura de los metadatos ha fallado';
+$lang['metasaveok']            = 'Los metadatos han sido guardados';
+$lang['img_backto']            = 'Volver a';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Epígrafe';
+$lang['img_date']              = 'Fecha';
+$lang['img_fname']             = 'Nombre de fichero';
+$lang['img_fsize']             = 'Tamaño';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Cámara';
+$lang['img_keywords']          = 'Palabras claves';
+$lang['subscribe_success']     = '%s ha sido añadido a la lista de notificación de cambios de %s';
+$lang['subscribe_error']       = 'Ha habido un error al agregar %s a la lista de notificación de cambios de %s';
+$lang['subscribe_noaddress']   = 'No hay ninguna dirección de correo electrónico asociada con tu nombre de usuario, no puedes ser añadido a la lista de notificación de cambios';
+$lang['unsubscribe_success']   = '%s ha sido eliminado de la lista de notificación de cambios de %s';
+$lang['unsubscribe_error']     = 'Ha habido un error al eliminar %s de la lista de notificación de cambios de %s';
+$lang['authmodfailed']         = 'Está mal configurada la autenticación de usuarios. Por favor, avisa al administrador del wiki.';
+$lang['authtempfail']          = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
+$lang['i_chooselang']          = 'Elija su idioma';
+$lang['i_installer']           = 'Instalador de DokuWiki';
+$lang['i_wikiname']            = 'Nombre del wiki';
+$lang['i_enableacl']           = 'Habilitar ACL (recomendado) (ACL: lista de control de acceso)';
+$lang['i_superuser']           = 'Super-usuario';
+$lang['i_problems']            = 'El instalador encontró algunos problemas, se muestran abajo. No se puede continuar la instalación hasta que usted no los corrija.';
+$lang['i_modified']            = 'Por razones de seguridad este script sólo funcionará con una instalación nueva y no modificada de Dokuwiki. Usted debe extraer nuevamente los ficheros del paquete bajado, o bien consultar las <a href="http://dokuwiki.org/install">instrucciones de instalación de Dokuwiki</a> completas.';
+$lang['i_funcna']              = 'La función de PHP <code>%s</code> no está disponible. Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?';
+$lang['i_phpver']              = 'Su versión de PHP <code>%s</code> es menor que la necesaria <code>%s</code>. Es necesario que actualice su instalación de PHP.';
+$lang['i_permfail']            = 'DokuWili no puede escribir <code>%s</code>. Es necesario establecer  correctamente los permisos de este directorio!';
+$lang['i_confexists']          = '<code>%s</code> ya existe';
+$lang['i_writeerr']            = 'Imposible crear <code>%s</code>. Se necesita que usted controle los permisos del fichero/directorio y que cree el fichero manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php no reconocido o modificado (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valor ilegal o vacío';
+$lang['i_success']             = 'La configuración ha concluido correctamente. Ahora puede eliminar el archivo install.php. Visite <a href="doku.php">su nuevo DokuWiki</a>.';
+$lang['i_failure']             = 'Han ocurrido algunos errores durante la escritura de los ficheros de configuración. Puede ser que necesite corregirlos manualmente antes de poder usar <a href="doku.php">su nuevo DokuWiki</a>.';
+$lang['i_policy']              = 'Política de ACL inicial';
+$lang['i_pol0']                = 'Wiki abierto (leer, escribir y subir archivos para todos)';
+$lang['i_pol1']                = 'Wiki público (leer para todos, escribir y subir archivos para usuarios registrados únicamente)';
+$lang['i_pol2']                = 'Wiki cerrado (leer, escribir y subir archivos para usuarios registrados únicamente)';
+$lang['i_retry']               = 'Reintentar';
+$lang['mu_intro']              = 'Puedes subir varios archivos a la vez desde aquí. Pulsa el botón del navegador para agregarlos a la cola. Pulsa "subir archivo" para proceder.';
+$lang['mu_gridname']           = 'Nombre de archivo';
+$lang['mu_gridsize']           = 'Tamaño';
+$lang['mu_gridstat']           = 'Estado';
+$lang['mu_namespace']          = 'Espacio de nombres';
+$lang['mu_browse']             = 'Buscar';
+$lang['mu_toobig']             = 'demasiado grande';
+$lang['mu_ready']              = 'listo para subir';
+$lang['mu_done']               = 'completado';
+$lang['mu_fail']               = 'falló';
+$lang['mu_authfail']           = 'la sesión caducó';
+$lang['mu_progress']           = '@PCT@% transferido';
+$lang['mu_filetypes']          = 'Tipos de archivos permitidos';
+$lang['mu_info']               = 'Archivos subidos:';
+$lang['mu_lasterr']            = 'Último error:';
+$lang['recent_global']         = 'Actualmente estás viendo los cambios dentro del namespace <b>%s</b>. También puedes <a href="%s">ver los cambios recientes en el wiki completo</a>.';
+$lang['years']                 = '%d años atrás';
+$lang['months']                = '%d meses atrás';
+$lang['weeks']                 = '%d semanas atrás';
+$lang['days']                  = '%d días atrás';
+$lang['hours']                 = '%d horas atrás';
+$lang['minutes']               = '%d minutos atrás';
+$lang['seconds']               = '%d segundos atrás';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/locked.txt
new file mode 100644
index 000000000..e151bf7e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/locked.txt
@@ -0,0 +1,3 @@
+====== Página bloqueada ======
+
+Esta página está actualmente bloqueada porque la está editando otro usuario. Tienes que esperar a que  termine de editarla o el bloqueo expire.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/login.txt
new file mode 100644
index 000000000..a8d9be7a9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+¡Actualmente no estás identificado! Introduce abajo tus datos de identificación para abrir una sesión. Necesitas tener las cookies activadas para identificarte.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/mailtext.txt
new file mode 100644
index 000000000..893ec1cb9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/mailtext.txt
@@ -0,0 +1,17 @@
+Se ha cambiado o añadido una página en tu DokuWiki. Aquí están los detalles:
+
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
+Nombre de Host : @HOSTNAME@
+Revisión Vieja: @OLDPAGE@
+Revisión Nueva : @NEWPAGE@
+Resumen de la edición: @SUMMARY@
+Usuario : @USER@
+
+@DIFF@
+
+
+-- 
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/newpage.txt
new file mode 100644
index 000000000..d119ca29d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/newpage.txt
@@ -0,0 +1,3 @@
+====== Este tema no existe todavía ======
+
+Has seguido un enlace a un tema que no existe todavía. Puedes crearlo usando el botón ''Crea esta página''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/norev.txt
new file mode 100644
index 000000000..42ee6b5c2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/norev.txt
@@ -0,0 +1,4 @@
+====== No existe esta revision ======
+
+La revisión especificada no existe. Usa el botón ''Revisiones antiguas'' para una lista de revisiones antiguas de este documento.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/preview.txt
new file mode 100644
index 000000000..b4d5a2ed1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualización ======
+
+Esto es una previsualización de cómo aparecerá tu texto. Recuerda: **no está guardado** todavía!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/pwconfirm.txt
new file mode 100644
index 000000000..c3dad116e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hola @FULLNAME@!
+
+Alguien solicitó una nueva contraseña para su nombre de
+usuario @TITLE@ en @DOKUWIKIURL@
+
+Si usted no solicitó una nueva contraseña, simplemente ignore este email.
+
+Para confirmar que la solicitud fue realizada realmente por usted,
+por favor use el siguiente enlace.
+
+@CONFIRM@
+
+
+-- 
+Este mail ha sido generado por DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/read.txt
new file mode 100644
index 000000000..461b745fb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/read.txt
@@ -0,0 +1 @@
+Esta página es de solo lectura. Puedes ver la fuente pero no puedes cambiarla. Pregunta a tu administrador si crees que esto es incorrecto.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/recent.txt
new file mode 100644
index 000000000..432def26f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/recent.txt
@@ -0,0 +1,5 @@
+====== Cambios Recientes ======
+
+Las siguientes páginas han sido modificadas recientemente.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/register.txt
new file mode 100644
index 000000000..98248269d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/register.txt
@@ -0,0 +1,3 @@
+====== Registro como nuevo usuario ======
+
+Completa toda la información del formulario para crear un nuevo usuario en este wiki. Asegúrate que escribes una **dirección de e-mail válida** puesto que allí se enviará tu contraseña. El nombre de usuario ha de ser un nombre válido según [[doku>pagename|pagename]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/registermail.txt
new file mode 100644
index 000000000..e773e3200
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/registermail.txt
@@ -0,0 +1,14 @@
+Un nuevo usuario ha sido registrado. Aquí están los detalles:
+
+Usuario         : @NEWUSER@
+Nombre completo : @NEWNAME@
+E-Mail          : @NEWEMAIL@
+
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
+Nombre del host : @HOSTNAME@
+
+-- 
+Este mail ha sido generado por DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/resendpwd.txt
new file mode 100644
index 000000000..1d74e79bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar nueva contraseña ======
+
+Completa la información requerida abajo para obtener una nueva contraseña para tu cuenta de usuario en este wiki. La nueva contraseña te será enviada a la dirección de mail que está registrada.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/revisions.txt
new file mode 100644
index 000000000..b093e857f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisiones Antiguas ======
+
+Estas son revisiones más antiguas del documento actual. Para volver a una revisión antigua selecciónala de abajo, pulsa ''Edita esta página'' y guárdala.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/searchpage.txt
new file mode 100644
index 000000000..47a1a90dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/searchpage.txt
@@ -0,0 +1,5 @@
+====== Búsqueda ======
+
+Puedes encontrar los resultados de tu búsqueda abajo. Si no has encontrado lo que buscabas, puedes crear una nueva página con tu consulta utilizando el botón  ''Crea esta página''.
+
+===== Resultados =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/showrev.txt
new file mode 100644
index 000000000..c84bbc01d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/showrev.txt
@@ -0,0 +1,2 @@
+**¡Esta es una revisión vieja del documento!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/stopwords.txt
new file mode 100644
index 000000000..256908925
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/stopwords.txt
@@ -0,0 +1,171 @@
+# Esta es una lista de palabras que estan ignoradas por el indexador, una palabra por línea
+# Cuando se edita este archivo, asegúrese de usar la línea de terminaciones UNIX  (una sola nueva línea)
+# No necesita incluir palabras cortas con 3 caracteres - estas son ignoradas de todos modos
+#Esta lista esta basada en las que encontramos en la siguiente url http://www.ranks.nl/stopwords/
+una
+unas
+unos
+uno
+sobre
+todo
+también
+tras
+otro
+algún
+alguno
+alguna
+algunos
+algunas
+ser
+soy
+eres
+somos
+sois
+estoy
+esta
+estamos
+estais
+estan
+como
+para
+atras
+porque
+por
+qué
+estado
+estaba
+ante
+antes
+siendo
+ambos
+pero
+poder
+puede
+puedo
+podemos
+podeis
+pueden
+fui
+fue
+fuimos
+fueron
+hacer
+hago
+hace
+hacemos
+haceis
+hacen
+cada
+fin
+incluso
+primero
+desde
+conseguir
+consigo
+consigue
+consigues
+conseguimos
+consiguen
+voy
+va
+vamos
+vais
+van
+vaya
+gueno
+tener
+tengo
+tiene
+tenemos
+teneis
+tienen
+las
+los
+aqui
+mio
+tuyo
+ellos
+ellas
+nos
+nosotros
+vosotros
+vosotras
+dentro
+solo
+solamente
+saber
+sabes
+sabe
+sabemos
+sabeis
+saben
+ultimo
+largo
+bastante
+haces
+muchos
+aquellos
+aquellas
+sus
+entonces
+tiempo
+verdad
+verdadero
+verdadera
+cierto
+ciertos
+cierta
+ciertas
+intentar
+intento
+intenta
+intentas
+intentamos
+intentais
+intentan
+dos
+bajo
+arriba
+encima
+usar
+uso
+usas
+usa
+usamos
+usais
+usan
+emplear
+empleo
+empleas
+emplean
+ampleamos
+empleais
+valor
+muy
+era
+eras
+eramos
+eran
+modo
+bien
+cual
+cuando
+donde
+mientras
+quien
+con
+entre
+sin
+trabajo
+trabajar
+trabajas
+trabaja
+trabajamos
+trabajais
+trabajan
+podria
+podrias
+podriamos
+podrian
+podriais
+aquel
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/subscribermail.txt
new file mode 100644
index 000000000..05be8557a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/subscribermail.txt
@@ -0,0 +1,23 @@
+¡Hola!
+
+La página @PAGE@ en el wiki @TITLE@ ha cambiado.
+Los cambios son los siguientes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Fecha : @DATE@
+Usuario : @USER@
+Resumen de la edición: @SUMMARY@
+Revisión vieja: @OLDPAGE@
+Revisión nueva: @NEWPAGE@
+
+Para cacelar las notificaciones, ingresa al wiki
+en @DOKUWIKIURL@ y luego visita la página
+@NEWPAGE@
+y elige 'Cancelar suscripción'.
+
+-- 
+Este mail fue generado por DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/updateprofile.txt
new file mode 100644
index 000000000..822e558f8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualiza el perfil de tu cuenta de usuario ======
+
+Sólo necesitas completar aquellos campos que quieres cambiar. No puedes cambiar tu nombre de usuario.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/uploadmail.txt
new file mode 100644
index 000000000..9d2f980d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/uploadmail.txt
@@ -0,0 +1,14 @@
+Se ha subido un fichero a tu DokuWuki. Estos son los detalles:
+
+Archivo : @MEDIA@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Tamaño : @SIZE@
+MIME Type : @MIME@
+Usuario : @USER@
+
+-- 
+Este correo fue generado por DokuWiki en
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/wordblock.txt
new file mode 100644
index 000000000..739a1b76b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/es/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM bloqueado ======
+
+Tus cambios **no** se han guardado porque contienen una o más palabras prohibidas. Si has intentado spamear el Wiki: ¡Perro malo! Si crees que es un error contacta con el administrador de este Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/admin.txt
new file mode 100644
index 000000000..1934f482b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/admin.txt
@@ -0,0 +1,4 @@
+====== Administreerimine ======
+
+Alljärgnevalt leiate nimekirja administratiivsetest tegevustest, mida DokuWiki võimaldab.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/backlinks.txt
new file mode 100644
index 000000000..4b405cdfd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/backlinks.txt
@@ -0,0 +1,4 @@
+====== Siia lehele lingiga haagitud lehed ======
+
+Nimekiri nendest lehtedest, kuskohalt Sa lingi abil siia lehele saad.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/conflict.txt
new file mode 100644
index 000000000..cf9f571ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/conflict.txt
@@ -0,0 +1,6 @@
+====== Uus versioon täitsa olemas ======
+
+Sellest dokumendist, mis Sa toimetasid on tegelikult juba olemas ka uuem versioon. Selline asi juhtub siis kui sel ajal kui Sina vaikselt oma dokumendi kallal nokitsesid tegi keegi juba kähku omad Muutused sealsamas dokumendis ära.
+
+Vaata hoolikalt allpool näidatud erinevusi ja siis otsusta millise versiooni alles jätad. Kui Sa peaks valima ''salvesta'', siis juhtubki selline lugu, et Sinu versioon salvestatakse. kui Sa aga peaks klõpsama ''katkesta'' säilib hetkel kehtiv versioon.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/denied.txt
new file mode 100644
index 000000000..bb564ac57
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/denied.txt
@@ -0,0 +1,3 @@
+====== Sul pole ligipääsuluba ======
+
+Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/diff.txt
new file mode 100644
index 000000000..d10a93b84
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/diff.txt
@@ -0,0 +1,4 @@
+====== Erinevused ======
+
+Siin näed erinevusi valitud versiooni ja hetkel kehtiva lehekülje vahel.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/draft.txt
new file mode 100644
index 000000000..6669f3be5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/draft.txt
@@ -0,0 +1,6 @@
+====== Leidsin katkenud toimetamise ======
+
+Sinu viimane toimetamissessioon ei lõppenud eelmine kord korrapäraselt. DokuWiki automaatselt salvestas Sinu pooliku töö, mida võid nüüd kasutada töö jätkamiseks. Allpool näed teksti, mis suudeti päästa.
+
+Kas tahad //taastada// kaotused, //kustutada// poolik töö või //üldse mitte midagi teha//?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/edit.txt
new file mode 100644
index 000000000..6167c8552
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/edit.txt
@@ -0,0 +1,2 @@
+Toimeta seda lehte ja klõpsa ''Salvesta'' peal. Wikis teksti kujundamise vahenditega tutvumiseks, st. kuidas teha rasvast ja kaldkirja jne., vaata [[wiki:syntax|süntaksitutvustus lehelt]]. Kui Sa tahad midagi testida, saad seda teha [[playground:playground|mängualal]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/editrev.txt
new file mode 100644
index 000000000..3ab6d7161
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/editrev.txt
@@ -0,0 +1,3 @@
+**Sa oled omale tõmmanud selle dokumendi vana versiooni!** Kui Sa selle salvestad sünnib nende andmetega uus versioon.
+----
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/index.txt
new file mode 100644
index 000000000..8d2e25a68
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/index.txt
@@ -0,0 +1,3 @@
+====== Sisukord ======
+
+See siin on nimekiri kõigist saadaval olevatest lehtedest järjestatud [[doku>namespaces|alajaotuste]] järgi.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/lang.php
new file mode 100644
index 000000000..4d3f10bdc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/lang.php
@@ -0,0 +1,214 @@
+<?php
+/**
+ * Estonian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Oliver S6ro <seem.iges@mail.ee>
+ * @author     Aari Juhanson <aari@vmg.vil.ee>
+ * @author     Kaiko Kaur <kaiko@kultuur.edu.ee>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '„';//&bdquo;
+$lang['doublequoteclosing']  = '“';//&ldquo;
+$lang['singlequoteopening']  = '‚';//&sbquo;
+$lang['singlequoteclosing']  = '‘';//&lsquo;
+
+$lang['btn_edit']   = 'Toimeta seda lehte';
+$lang['btn_source'] = 'Näita lehepõhja';
+$lang['btn_show']   = 'Näita lehte';
+$lang['btn_create'] = 'Tekita selle lingi alla leht';
+$lang['btn_search'] = 'Otsi';
+$lang['btn_save']   = 'Salvesta';
+$lang['btn_preview']= 'Eelvaade';
+$lang['btn_top']    = 'Tagasi lehe algusesse';
+$lang['btn_revs']   = 'Eelmised versioonid';
+$lang['btn_recent'] = 'Viimased muudatused';
+$lang['btn_upload'] = 'Lae üles';
+$lang['btn_cancel'] = 'Katkesta';
+$lang['btn_index']  = 'Sisukord';
+$lang['btn_secedit']= 'Toimeta';
+$lang['btn_login']  = 'Logi sisse';
+$lang['btn_logout'] = 'Logi välja';
+$lang['btn_admin']  = 'Administreeri';
+$lang['btn_update'] = 'Uuenda';
+$lang['btn_delete'] = 'Kustuta';
+$lang['btn_newer'] = '<< varajasemad';
+$lang['btn_older'] = '>> hilisemad';
+$lang['btn_back'] = 'Tagasi';
+$lang['btn_backtomedia'] = 'Tagasi faili valikusse';
+$lang['btn_profile'] = 'Minu info';
+$lang['btn_reset'] = 'Taasta';
+$lang['btn_resendpwd'] = 'Saada uus parool';
+$lang['btn_draft'] = 'Toimeta mustandit';
+$lang['btn_recover'] = 'Taata mustand';
+$lang['btn_draftdel'] = 'Kustuta mustand';
+$lang['newpass'] = 'Uus parool';
+$lang['oldpass'] = 'Vana parool';
+$lang['passchk'] = 'Korda uut parooli';
+$lang['profile'] = 'Kasutaja info';
+$lang['minoredit'] = 'Ebaolulised muudatused';
+$lang['draftdate'] = 'Mustand automaatselt salvestatud';
+$lang['regsuccess2'] = 'Kasutaja sai tehtud.';
+$lang['regbadpass'] = 'Uus parool on kirjutatud erinevalt. Proovi uuesti.';
+$lang['uploadexist'] = 'Fail on juba olemas. Midagi ei muudetud.';
+$lang['deletesucc'] = 'Fail nimega "%s" sai kustutatud.';
+$lang['deletefail'] = 'Faili nimega "%s" ei kustutatud (kontrolli õigusi).';
+$lang['mediainuse'] = 'Faili nimega "%s" ei kustutatud, sest see on kasutuses.';
+$lang['js']['keepopen'] = 'Jäta aken peale valiku sooritamist avatuks';
+$lang['js']['hidedetails'] = 'Peida detailid';
+$lang['mediausage'] = 'Kasuta järgmist kirjapilti sellele failile viitamaks:';
+$lang['mediaview'] = 'Vaata faili algsel kujul.';
+$lang['mediaroot'] = 'juur';
+$lang['mediaupload'] = 'Lae fail sellesse nimeruumi (kataloogi). Et tekitada veel alam nimeruum kasuta koolonit Wiki nimes.';
+$lang['mediaextchange'] = 'Faili laiend .%s-st %s-ks!';
+$lang['ref_inuse'] = 'Seda faili ei saa kustutada, sest teda kasutavad järgmised lehed:';
+$lang['ref_hidden'] = 'Mõned viidad failile on lehtedel, millele sul ei ole ligipääsu';
+$lang['youarehere'] = 'Sa oled siin';
+$lang['mail_new_user'] = 'Uus kasutaja:';
+$lang['qb_strike'] = 'Läbijoonitud tekst';
+$lang['qb_smileys'] = 'Emotikonid';
+$lang['qb_chars'] = 'Erisümbolid';
+$lang['admin_register'] = 'Lisa kasutaja';
+
+
+#$lang['reference'] = '';
+#$lang['btn_backlink'] = '';
+#$lang['profna'] = '';
+$lang['btn_subscribe'] = 'Jälgi seda lehte (teated meilile)';
+$lang['btn_unsubscribe'] = 'Lõpeta lehe jälgimine';
+$lang['profnochange'] = 'Muutused puuduvad.';
+$lang['profnoempty'] = 'Tühi nimi ega meiliaadress pole lubatud.';
+$lang['profchanged'] = 'Kasutaja info edukalt muudetud';
+$lang['pwdforget'] = 'Unustasid parooli? Tee uus';
+$lang['resendna'] = 'See wiki ei toeta parooli taassaatmist.';
+$lang['resendpwd'] = 'Saada uus parool';
+$lang['resendpwdmissing'] = 'Khmm... Sa pead täitma kõik väljad.';
+$lang['resendpwdnouser'] = 'Aga sellist kasutajat ei ole.';
+$lang['resendpwdbadauth'] = 'See autentimiskood ei ole õige. Kontrolli, et kopeerisid terve lingi.';
+$lang['resendpwdconfirm'] = 'Kinnituslink saadeti meilile.';
+$lang['resendpwdsuccess'] = 'Uus parool saadeti Sinu meilile.';
+$lang['txt_overwrt'] = 'Kirjutan olemasoleva faili üle';
+$lang['metaedit'] = 'Muuda lisainfot';
+$lang['metasaveerr'] = 'Lisainfo salvestamine läks untsu.';
+$lang['metasaveok'] = 'Lisainfo salvestatud';
+$lang['img_backto'] = 'Tagasi';
+$lang['img_title'] = 'Tiitel';
+$lang['img_caption'] = 'Kirjeldus';
+$lang['img_date'] = 'Kuupäev';
+$lang['img_fname'] = 'Faili nimi';
+$lang['img_fsize'] = 'Suurus';
+$lang['img_artist'] = 'Autor';
+#$lang['img_copyr'] = '';
+$lang['img_format'] = 'Formaat';
+$lang['img_camera'] = 'Kaamera';
+$lang['img_keywords'] = 'Võtmesõnad';
+
+$lang['i_chooselang'] = 'Vali keel';
+$lang['i_installer'] = 'DokuWiki paigaldaja';
+$lang['i_wikiname'] = 'Wiki nimi';
+$lang['i_enableacl'] = 'Kas lubada kasutajate haldus (soovitatav)';
+$lang['i_superuser'] = 'Superkasutaja';
+$lang['i_problems'] = 'Paigaldaja leidis mõned vead, mis on allpool välja toodud. Enne vigade eemaldamist ei saa jätkata.';
+$lang['i_modified'] = 'Õnnetuste vältimiseks läheb see skript käima ainult värskelt paigaldatud ja muutmata Dokuwiki peal.
+                       Sa peaksid ilmselt kogu koodi uuesti lahti pakkima. Vaata ka <a href="http://dokuwiki.org/install">Dokuwiki installeerimis juhendit</a>';
+$lang['i_funcna'] = 'PHP funktsiooni <code>%s</code> ei ole olemas.võibolla sinu serveri hooldaja on selle mingil põhjusel keelanud?';
+$lang['i_permfail'] = 'Dokuwiki ei saa kirjutada faili <code>%s</code>. Kontrolli serveris failide õigused üle.';
+$lang['i_confexists'] = '<code>%s</code> on juba olemas';
+$lang['i_writeerr'] = 'Faili <code>%s</code> ei lubata tekitada. Kontrolli kataloogi ja faili õigusi.';
+#$lang['i_badhash'] = '';
+$lang['i_badval'] = '<code>%s</code> - lubamatu või tühi väärtus';
+$lang['i_success'] = 'Seadistamine on õnnelikult lõpule viidud. Sa võid nüüd kustutada faili install.php. Alusta oma <a href="doku.php">uue DokuWiki</a> täitmist.';
+$lang['i_failure'] = 'Konfiguratsiooni faili kirjutamisel esines vigu. Võimalik, et pead need käsitsi parandama enne <a href="doku.php">uue DokuWiki</a> täitma asumist.';
+$lang['i_policy'] = 'Wiki õiguste algne poliitika';
+$lang['i_pol0'] = 'Avatud (lugemine, kirjutamine ja üleslaadimine kõigile lubatud)';
+$lang['i_pol1'] = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)';
+$lang['i_pol2'] = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)';
+
+$lang['loggedinas'] = 'Logis sisse kui';
+$lang['user']       = 'Kasutaja';
+$lang['pass']       = 'Parool';
+$lang['remember']   = 'Pea mind meeles';
+$lang['fullname']   = 'Täielik nimi';
+$lang['email']      = 'E-post';
+$lang['register']   = 'Registreeri uus kasutaja';
+$lang['badlogin']   = 'Oops, Sinu kasutajanimi või parool oli vale.';
+
+$lang['regmissing'] = 'Kõik väljad tuleb ära täita.';
+$lang['reguexists'] = 'Tegelikult on sellise nimega kasutaja juba olemas.';
+$lang['regsuccess'] = 'Kasutaja sai tehtud. Parool saadeti Sulle e-posti aadressil.';
+$lang['regmailfail']= 'Ilmselt tekkis e-posti teel parooli saatmisel mingi tõrge. Palun suhtle sel teemal
+oma serveri administraatoriga!';
+$lang['regbadmail'] = 'Tundub, et Sinu antud e-posti aadress ei toimi - kui Sa arvad, et tegemist on
+ekstitusega, suhtle oma serveri administraatoriga';
+$lang['regpwmail']  = 'Sinu DokuWiki parool';
+$lang['reghere']    = 'Sul ei olegi veel kasutajakontot? No aga tekita see siis endale!';
+
+$lang['txt_upload']   = 'Vali fail, mida üles laadida';
+$lang['txt_filename'] = 'Siseta oma Wikinimi (soovituslik)';
+$lang['lockedby']     = 'Praegu on selle lukustanud';
+$lang['lockexpire']   = 'Lukustus aegub';
+$lang['willexpire']   = 'Teie lukustus selle lehe toimetamisele aegub umbes minuti pärast.\nIgasugu  probleemide vältimiseks kasuta eelvaate nuppu, et lukustusarvesti taas tööle panna.';
+
+$lang['notsavedyet'] = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.\nKas Sa ikka tahad edasi liikuda?';
+$lang['rssfailed']   = 'Sinu soovitud info ammutamisel tekkis viga: ';
+$lang['nothingfound']= 'Oops, aga mitte muhvigi ei leitud.';
+
+$lang['mediaselect'] = 'Hunnik faile';
+$lang['fileupload']  = 'Faili üleslaadimine';
+$lang['uploadsucc']  = 'Üleslaadimine läks ootuspäraselt hästi';
+$lang['uploadfail']  = 'Üleslaadimine läks nässu. Äkki pole Sa selleks lihtsalt piisavalt võimukas tegija?';
+$lang['uploadwrong'] = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida';
+$lang['namespaces']  = 'Alajaotus';
+$lang['mediafiles']  = 'Failid on Sulle kättesaadavad';
+
+$lang['hits']       = 'Päringu tabamused';
+$lang['quickhits']  = 'Päringule vastavad lehed';
+$lang['toc']        = 'Sisujuht';
+$lang['current']    = 'Hetkel kehtiv';
+$lang['yours']      = 'Sinu versioon';
+$lang['diff']       = 'Näita erinevusi hetkel kehtiva versiooniga';
+$lang['line']       = 'Rida';
+$lang['breadcrumb'] = 'Käidud rada';
+$lang['lastmod']    = 'Viimati muutnud';
+$lang['by']         = 'persoon';
+$lang['deleted']    = 'eemaldatud';
+$lang['created']    = 'tekitatud';
+$lang['restored']   = 'vana versioon taastatud';
+$lang['summary']    = 'kokkuvõte muudatustest';
+
+$lang['mail_newpage'] = 'leht lisatud:';
+$lang['mail_changed'] = 'leht muudetud';
+
+$lang['nosmblinks'] = 'Windowsis võrguarvutiga ühendamine toimib ainult Internet Exploreris ja
+sisevõrgus.\nAga Sa saad õnneks omale lingi kopeerida ja hiljem kuhugi kleepida.';
+
+$lang['qb_bold']    = 'Rasvane kiri';
+$lang['qb_italic']  = 'Kaldkiri';
+$lang['qb_underl']  = 'Alajoonega kiri';
+$lang['qb_code']    = 'Koodi tekst';
+$lang['qb_h1']      = '1. astme pealkiri';
+$lang['qb_h2']      = '2. astme pealkiri';
+$lang['qb_h3']      = '3. astme pealkiri';
+$lang['qb_h4']      = '4. astme pealkiri';
+$lang['qb_h5']      = '5. astme pealkiri';
+$lang['qb_link']    = 'Siselink';
+$lang['qb_extlink'] = 'Välislink';
+$lang['qb_hr']      = 'Horisontaalne vahejoon';
+$lang['qb_ol']      = 'Nummerdatud nimikiri';
+$lang['qb_ul']      = 'Mummuga nimekiri';
+$lang['qb_media']   = 'Lisa pilte ja muid faile';
+$lang['qb_sig']     = 'Lisa allkiri!';
+
+$lang['authmodfailed'] = 'Vigane kasutajate autentimise konfiguratsioon. Palun teavita sellest serveri haldajat.';
+$lang['authtempfail'] = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.';
+
+$lang['js']['del_confirm']= 'Kas kustutame selle kirje?';
+
+#$lang['subscribe_success'] = '';
+#$lang['subscribe_error'] = '';
+#$lang['subscribe_noaddress'] = '';
+#$lang['unsubscribe_success'] = '';
+#$lang['unsubscribe_error'] = '';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/locked.txt
new file mode 100644
index 000000000..0fd2743ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/locked.txt
@@ -0,0 +1,3 @@
+====== Leht lukustatud ======
+
+Hetkel on see leht lukustatud kuna teine kasutaja toimetab tema kallal. Sa pead ootama kuni ta kas lõpetab või lukustus aegub.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/login.txt
new file mode 100644
index 000000000..3e746cd8d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/login.txt
@@ -0,0 +1,3 @@
+====== Logi sisse ======
+
+Hetkel pole Sa sisse logitud! Allpool saad sisestada kõik vajaliku, et sisse logida. Kui Sa oled oma arvuti taga ainukasutaja oleks hea kui Su arvutil  oleks lubatud 'cookies', st. järgmine kord kui siia lehele tuled oled automaatselt sisse logitud.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/mailtext.txt
new file mode 100644
index 000000000..3214584f5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/mailtext.txt
@@ -0,0 +1,16 @@
+Sinu lehte DokuWiki-s on muudetud. Alljärgnevalt detailid:
+
+Kuupäev           : @DATE@
+Brauser           : @BROWSER@
+IP-Aadress        : @IPADDRESS@
+Arvuti nimi       : @HOSTNAME@
+Eelnev versioon   : @OLDPAGE@
+Uus versioon      : @NEWPAGE@
+Toimeta kokkuvõtet: @SUMMARY@
+Kasutaja          : @USER@
+
+@DIFF@
+
+
+-- 
+Selle e-posti tekitas Sulle DokuWiki @DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/newpage.txt
new file mode 100644
index 000000000..fb78e6434
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/newpage.txt
@@ -0,0 +1,3 @@
+====== Seda teemat veel ei ole ======
+
+Sa klikkisid lingile, mille all teemat veel pole. Selle saad Sa tekitada kasutades ''Tekita see leht nuppu''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/norev.txt
new file mode 100644
index 000000000..42d204f2d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/norev.txt
@@ -0,0 +1,4 @@
+====== Sellist versiooni pole ======
+
+Sellist versiooni ei ole olemas. Selle dokumendi eelmiste versioonide nägemiseks klõpsa ''Eelmised versioonid'' nupul.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/preview.txt
new file mode 100644
index 000000000..df45c65ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/preview.txt
@@ -0,0 +1,3 @@
+====== Eelvaade ======
+
+Siin saad eelnevalt vaadata, milline su tekst välja näeks. Pea aga meeles, et see **ei ole veel salvestatud** !
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/pwconfirm.txt
new file mode 100644
index 000000000..4f17140e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/pwconfirm.txt
@@ -0,0 +1,12 @@
+Tere @FULLNAME@!
+
+Keegi on Sinu parooli uuendust soovinud kasutajale @TITLE@ (@DOKUWIKIURL@).
+
+Kui see ei olnud Sina, siis võid seda meili lihtsalt ignoreerida.
+Kinnitamaks uue parooli saamise soovi mine aadressile:
+
+@CONFIRM@
+
+-- 
+See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/read.txt
new file mode 100644
index 000000000..64696f079
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/read.txt
@@ -0,0 +1,2 @@
+Seda lehte saad ainult lugeda. Saad küll vaadata lehe põhja aga muuta midagi ei saa. Suhtle oma serveri administraatoriga kui Sa millegagi rahul pole.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/recent.txt
new file mode 100644
index 000000000..cf7a85420
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/recent.txt
@@ -0,0 +1,5 @@
+====== Viimased muutused ======
+
+Viimati muudeti alljärgnevaid lehti.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/register.txt
new file mode 100644
index 000000000..9cd0b911d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/register.txt
@@ -0,0 +1,4 @@
+====== Registreeri uus kasutaja ======
+
+Täida alljärgnevad lüngad et me saaks Sulle Wikis kasutajakonto tekitada. Ole nii kena ja kindlasti pane kirja oma **kehtiv e-posti aadress** - Sinu uus parool saadetakse sellele aadressile. Sisselogimise nimi peaks olema kehtiv [[doku>pagename|lehenimi]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/registermail.txt
new file mode 100644
index 000000000..47d2ef14c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/registermail.txt
@@ -0,0 +1,14 @@
+Uus kasutaja on registreeritud. Tema info:
+
+Kasutaja     : @NEWUSER@
+Täielik nimi : @NEWNAME@
+E-post       : @NEWEMAIL@
+
+Kuupäev      : @DATE@
+Lehitseja    : @BROWSER@
+IP-Aaddress  : @IPADDRESS@
+Hosti nimi   : @HOSTNAME@
+
+-- 
+See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/resendpwd.txt
new file mode 100644
index 000000000..cd0ef8d10
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Saada uus parool ======
+
+Palun sisesta oma kasutaja nimi, et saada uut parooli. Soovi kinnitamiseks saadame Sinu meilile lingi.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/revisions.txt
new file mode 100644
index 000000000..c546a1f14
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/revisions.txt
@@ -0,0 +1,4 @@
+====== eelnevad versioonid ======
+
+Need on käesoleva dokumendi eelnevad versioonid. Vana versiooni juurde tagasi pöördumiseks vali sobiv, klõpsa ''Toimeta seda lehte'' peal ja salvesta see.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/searchpage.txt
new file mode 100644
index 000000000..bbc86b637
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/searchpage.txt
@@ -0,0 +1,5 @@
+====== Otsi ======
+
+Leiad vasted oma otsingule. Kui Sa otsitavat ei leidnud võid tekitada oma otsingu nimelise uue lehe kasutades ''Toimeta seda lehte'' nuppu.
+
+===== Vasted =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/showrev.txt
new file mode 100644
index 000000000..ef73d74a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/showrev.txt
@@ -0,0 +1,2 @@
+**See on dokumendi vana versioon!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/stopwords.txt
new file mode 100644
index 000000000..5dda5f797
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/stopwords.txt
@@ -0,0 +1,15 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+ning
+ega
+see
+mina
+sina
+tema
+meie
+teie
+nemad
+com
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/subscribermail.txt
new file mode 100644
index 000000000..76ce2845f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/subscribermail.txt
@@ -0,0 +1,17 @@
+Tere!
+
+Lehekülg @PAGE@ on muutunud (@TITLE@).
+Siin on muudatused:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Selle lehe jälgimisest loobumiseks logi wikisse sisse
+@DOKUWIKIURL@ ja siis külasta
+@NEWPAGE@
+ning vali sealt 'Lõpeta jälgimine'.
+
+-- 
+See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/updateprofile.txt
new file mode 100644
index 000000000..35da12801
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Uuenda oma kasutaja infot ======
+
+Täida ainult need väljad, mida tahad uuendada. Uuendada ei saa kasutajanime.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/wordblock.txt
new file mode 100644
index 000000000..65d0d6ac3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/et/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPÄMM blokeeritud ======
+
+Sinu muutusi kahjuks **ei** salvestatud kuna tekst sisaldab ühte või rohkem blokeeritud sõna. Kas Sa üritad Wikile spämmi saata -- oh sa põrsas! Kui aga arvad, et tegemist on eksitusega, siis suhtle Wiki administraatoriga.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/admin.txt
new file mode 100644
index 000000000..13673263c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/admin.txt
@@ -0,0 +1,3 @@
+====== Kudeaketa ======
+
+Jarraian wikia kudeatzeko erabilgarri dauden tresnak aurki ditzakezu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/backlinks.txt
new file mode 100644
index 000000000..8cbb7b6d2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/backlinks.txt
@@ -0,0 +1,3 @@
+====== Itzulera Estekak ======
+
+Orri honetara bueltan estekatzen dutela diruditen orrien lista bat da honakoa.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/conflict.txt
new file mode 100644
index 000000000..d7d0d337e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/conflict.txt
@@ -0,0 +1,5 @@
+====== Bertsio berriago bat existitzen da ======
+
+Editatu duzun dokumentua baino bertsio berriago existitzen da. Editatzen ari zarela beste erabiltzaile batek dokumentua aldatzen duenean gertatzen da hau.
+
+Aztertu arretaz behean erakutsitako desberdintasunak eta erabaki zein bertsio mantendu. Zure aukera "Gorde" bada, zure bertsioa gordeko da. Uneko bertsioa mantentzeko "ezeztatu" sakatu.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/denied.txt
new file mode 100644
index 000000000..257076a3d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/denied.txt
@@ -0,0 +1,3 @@
+====== Ez duzu baimenik ======
+
+Barkatu, ez duzu baimenik orri hau ikusteko. Agian sesioa hastea ahaztu zaizu?
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/diff.txt
new file mode 100644
index 000000000..8d335ea2e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/diff.txt
@@ -0,0 +1,4 @@
+====== Aldaketak ======
+
+Aukeratutako bertsioaren eta egungo bertsioaren arteko aldaketak aurkezten ditu.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/draft.txt
new file mode 100644
index 000000000..5d64b0b36
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/draft.txt
@@ -0,0 +1,5 @@
+====== Zirriborro fitxategia aurkitu da ======
+
+Zure azken edizio saioa orri honetan ez zen zuzen burutu. DokuWiki-k automatikoki zirriborro bat gorde zuen lanean ari zinen bitartean eta orain zure edizioa jarraitzeko erabili dezakezu. Behean ikusi dezakezu zure asken saioan gorde ziren datuak.
+
+Erabaki mesedez zure edizio saio galdua //berreskuratu// nahi duzun, automatikoki gordetako zirriborroa //ezabatu// nahi duzun edo edizio prozesua //ezeztatu// nahi duzun.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/edit.txt
new file mode 100644
index 000000000..c117731ef
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/edit.txt
@@ -0,0 +1 @@
+Egin aldaketak eta ''Gorde'' pultsatu. Begiratu [[wiki:syntax]] Wiki-aren sintaxiarentzat. Mesedez aldaketak orrialdea **hobetzeko** bakarrik egin itzazu. Probak egin nahi badituzu, ikas ezazu [[playground:playground]] erabiltzen.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/editrev.txt
new file mode 100644
index 000000000..920cd89ec
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/editrev.txt
@@ -0,0 +1,2 @@
+**Dokumentuaren bertsio zahar bat ireki duzu!** Gordetzen baduzu bertsio berri bat sortuko duzu datu hauekin.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/index.txt
new file mode 100644
index 000000000..30f88498a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/index.txt
@@ -0,0 +1,4 @@
+====== Aurkibidea ======
+
+[[doku>namespaces|namespaces]] bitartez ordenatutako aurkibidea da hau.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/install.html
new file mode 100644
index 000000000..81f1efd95
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/install.html
@@ -0,0 +1,9 @@
+<p>Orri honek <a href="http://dokuwiki.org">Dokuwiki-ren</a> lehenengo instalazioan eta konfigurazioan gidatzen du. Instalatzaile honen informazio gehiago eskuragarri dago bere <a href="http://dokuwiki.org/installer">dokumentazio orrian</a>.</p>
+
+<p>DokuWikik fitxategi arruntak erabiltzen ditu wiki orriak eta orri horiekin erlazionatutako informazioa (adb. irudiak, bilaketa indizeak, azken berrikuspenak, etab.) gordetzeko. Modu egokian funtziona dezan, DokuWikik idazketa baimena <strong>behar</strong> du fitxategi horiek gordetzen dituzten direktorioetan. Instalatzaile hau ez da gai direktorio baimenak ezartzeko. Hori normalean komando bidez egin beharra dago, edo hosting bat erabiliz gero, FTP bidez edo hosting-aren kontrol panel bidez (adb. cPanel).</p>
+
+<p>Instalatzaile honek zure DokiWikiren konfigurazioa ezarriko du  
+<acronym title="atzipen kontrol lista">AKL</acronym>rentzat, zeinak administratzaileei ahalbidetzen dien saioa hasi eta DokuWikiren administrazio menua atzitzea plugin-ak instalatu, erabiltzaileak kudeatu, wiki orrietara atzipenak kudeatu eta konfigurazio aukerak aldatzeko. Hau ez da beharrezkoa DokuWikirentzat funtziona ahal dezan, baina DokuWiki administratzeko errazagoa egingo du.</p>
+
+<p>Esperientziadun erabiltzaileek edo ezarpen behar bereziak dituzten erabiltzaileek honako estekak erabili beharko lituzkete xehetasun gehiago lortzeko 
+<a href="http://dokuwiki.org/install">instalazio azalpenen</a> inguruan eta <a href="http://dokuwiki.org/config">konfigurazio ezarpenen</a> inguruan.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/lang.php
new file mode 100644
index 000000000..8324e2587
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/lang.php
@@ -0,0 +1,223 @@
+<?php
+/**
+ * Basque language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Xabi Ezpeleta <xezpeleta@mendikute.com>
+ * @author Inko Illarramendi <inko.i.a@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Aldatu orri hau';
+$lang['btn_source']            = 'Kodea ikusi';
+$lang['btn_show']              = 'Orria ikusi';
+$lang['btn_create']            = 'Sortu orri hau';
+$lang['btn_search']            = 'Bilatu';
+$lang['btn_save']              = 'Gorde';
+$lang['btn_preview']           = 'Aurrebista';
+$lang['btn_top']               = 'Itzuli gora';
+$lang['btn_newer']             = '<< berriagoa';
+$lang['btn_older']             = 'zaharragoa >>';
+$lang['btn_revs']              = 'Berrikuspen zaharrak';
+$lang['btn_recent']            = 'Azken aldaketak';
+$lang['btn_upload']            = 'Ireki';
+$lang['btn_cancel']            = 'Ezeztatu';
+$lang['btn_index']             = 'Aurkibidea';
+$lang['btn_secedit']           = 'Aldatu';
+$lang['btn_login']             = 'Sartu';
+$lang['btn_logout']            = 'Irten';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Eguneratu';
+$lang['btn_delete']            = 'Ezabatu';
+$lang['btn_back']              = 'Atzera';
+$lang['btn_backlink']          = 'Itzulera estekak';
+$lang['btn_backtomedia']       = 'Atzera Multimedia Fitxategiaren Aukeraketara';
+$lang['btn_subscribe']         = 'Harpidetu Orri Aldaketetara';
+$lang['btn_unsubscribe']       = 'Utzi Harpidetza Orri Aldaketetara';
+$lang['btn_subscribens']       = 'Harpidetu Izen-espazio Aldaketetara';
+$lang['btn_unsubscribens']     = 'Utzi Harpidetza Izen-espazio Aldaketetara';
+$lang['btn_profile']           = 'Eguneratu Profila ';
+$lang['btn_reset']             = 'Aldaketak Desegin';
+$lang['btn_resendpwd']         = 'Pasahitz berria bidali';
+$lang['btn_draft']             = 'Editatu zirriborroa';
+$lang['btn_recover']           = 'Berreskuratu zirriborroa';
+$lang['btn_draftdel']          = 'Ezabatu zirriborroa';
+$lang['loggedinas']            = 'Erabiltzailea';
+$lang['user']                  = 'Erabiltzailea';
+$lang['pass']                  = 'Pasahitza';
+$lang['newpass']               = 'Pasahitz berria';
+$lang['oldpass']               = 'Baieztatu oraingo pasahitza';
+$lang['passchk']               = 'berriz';
+$lang['remember']              = 'Gogoratu';
+$lang['fullname']              = 'Izen Deiturak';
+$lang['email']                 = 'E-Maila';
+$lang['register']              = 'Erregistratu';
+$lang['profile']               = 'Erabiltzaile Profila';
+$lang['badlogin']              = 'Barkatu, prozesuak huts egin du; saiatu berriz';
+$lang['minoredit']             = 'Aldaketa Txikiak';
+$lang['draftdate']             = 'Zirriborroa automatikoki gorde da hemen:';
+$lang['nosecedit']             = 'Orria aldatua izan da bitartean, info atala zaharkituta geratu da, orri osoa kargatu da horren ordez.';
+$lang['regmissing']            = 'Barkatu, hutsune guztiak bete behar dituzu.';
+$lang['reguexists']            = 'Barkatu, izen bereko erabiltzailea existitzen da.';
+$lang['regsuccess']            = 'Erabiltzailea sortu da. Pasahitza mailez bidaliko zaizu.';
+$lang['regsuccess2']           = 'Erabiltzailea sortua izan da.';
+$lang['regmailfail']           = 'Badirudi arazoren bat egon dela pasahitza mailez bidaltzeko orduan. Administratzailearekin harremanetan jarri!';
+$lang['regbadmail']            = 'Emandako helbidea ez da zuzena - jarri harremanetan administratzailearekin hau akats bat dela uste baduzu';
+$lang['regbadpass']            = 'Idatzitako bi pasahitzak ez dira berdinak, berriz saiatu.';
+$lang['regpwmail']             = 'Zure DokuWiki pasahitza';
+$lang['reghere']               = 'Oraindik ez duzu konturik? Eginzazu bat!';
+$lang['profna']                = 'Wiki honek ez du profilaren aldaketa ahalbidetzen';
+$lang['profnochange']          = 'Aldaketarik ez, ez dago egiteko ezer.';
+$lang['profnoempty']           = 'Izen edota e-posta hutsa ez dago onartua.';
+$lang['profchanged']           = 'Erabiltzaile profila arrakastaz eguneratua.';
+$lang['pwdforget']             = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
+$lang['resendna']              = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
+$lang['resendpwd']             = 'Bidali pasahitz berria honentzat:';
+$lang['resendpwdmissing']      = 'Barkatu, eremu guztiak bete behar dituzu.';
+$lang['resendpwdnouser']       = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen';
+$lang['resendpwdbadauth']      = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.';
+$lang['resendpwdconfirm']      = 'Baieztapen esteka bat e-postaz bidali da.';
+$lang['resendpwdsuccess']      = 'Zure pasahitz berria e-postaz bidali da.';
+$lang['license']               = 'Besterik esan ezean, wiki hontako edukia ondorengo lizentziapean argitaratzen da:';
+$lang['licenseok']             = 'Oharra: Orri hau editatzean, zure edukia ondorengo lizentziapean argitaratzea onartzen duzu: ';
+$lang['txt_upload']            = 'Ireki nahi den fitxategia aukeratu';
+$lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa)';
+$lang['txt_overwrt']           = 'Oraingo fitxategiaren gainean idatzi';
+$lang['lockedby']              = 'Momentu honetan blokeatzen:';
+$lang['lockexpire']            = 'Blokeaketa iraungitzen da:';
+$lang['willexpire']            = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
+$lang['notsavedyet']           = 'Gorde gabeko aldaketak galdu egingo dira.\nBenetan jarraitu nahi duzu?';
+$lang['rssfailed']             = 'Errorea gertatu da feed hau irakurtzean:';
+$lang['nothingfound']          = 'Ez da ezer aurkitu.';
+$lang['mediaselect']           = 'Aukeratu Multimedia fitxategia';
+$lang['fileupload']            = 'Igo Multimedia Fitxategia';
+$lang['uploadsucc']            = 'Igoera arrakastatsua';
+$lang['uploadfail']            = 'Igoerak huts egin du. Baimen arazoengatik agian?';
+$lang['uploadwrong']           = 'Fitxategi igoera ukatua. Fitxategi-luzapen hau debekatua dago!';
+$lang['uploadexist']           = 'Fitxategia lehenagotik existitzen da. Ez da ezer egin.';
+$lang['uploadbadcontent']      = 'Igotako edukia ez dator bat %s fitxategi-luzapenarekin.';
+$lang['uploadspam']            = 'Igoera spam zerrenda beltzak blokeatu du.';
+$lang['uploadxss']             = 'Igoera blokeatua izan da eduki maltzurra edukitzeko susmoagatik.';
+$lang['uploadsize']            = 'Igotako fitxategia handiegia zen. (max. %s)';
+$lang['deletesucc']            = 'Ezabatua izan da "%s" fitxategia.';
+$lang['deletefail']            = 'Ezin izan da "%s" ezabatu - egiaztatu baimenak.';
+$lang['mediainuse']            = 'Ez da "%s" fitxategia ezabatu - oraindik erabilia izaten ari da.';
+$lang['namespaces']            = 'Izen-espazioak';
+$lang['mediafiles']            = 'Fitxategiak eskuragarri hemen:';
+$lang['js']['keepopen']        = 'Mantendu leihoa irekita aukeraketan';
+$lang['js']['hidedetails']     = 'Xehetasunak Ezkutatu';
+$lang['js']['nosmblinks']      = 'Window baliabide konpartituetara estekek Microsoft Internet Explorer-en bakarrik balio dute.
+Esteka kopiatu eta itsatsi dezakezu dena den.';
+$lang['js']['mu_btn']          = 'Igo hainbat fitxategi aldi berean';
+$lang['mediausage']            = 'Erabili ondoko sintaxia fitxategi honi erreferentzia egiteko:';
+$lang['mediaview']             = 'Ikusi jatorrizko fitxategia';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Igo fitxategi bat uneko izen-espaziora. Azpi-izen-espazioak sortzeko, zure "Honela igo" fitxategi izenaren aurretik ezarri, bi puntuz (:) bananduta.';
+$lang['mediaextchange']        = 'Fitxategi-luzapena aldatua .%s -tik .%s! -ra';
+$lang['reference']             = 'Erreferentziak honentzat:';
+$lang['ref_inuse']             = 'Fitxategia ezin da ezabatu, honako orri hauek erabiltzen dutelako:';
+$lang['ref_hidden']            = 'Erreferentzi batzuk irakurtzeko baimenik ez duzun orrietan daude';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Eduki Taula';
+$lang['current']               = 'egungoa';
+$lang['yours']                 = 'Zure Bertsioa';
+$lang['diff']                  = 'egungo bertsioarekin dituen aldaketak aurkezten ditu';
+$lang['diff2']                 = 'Erakutsi desberdintasunak aukeratutako bertsioen artean';
+$lang['line']                  = 'Marra';
+$lang['breadcrumb']            = 'Traza';
+$lang['youarehere']            = 'Hemen zaude';
+$lang['lastmod']               = 'Azken aldaketa';
+$lang['by']                    = 'egilea:';
+$lang['deleted']               = 'ezabatua';
+$lang['created']               = 'sortua';
+$lang['restored']              = 'bertsio zaharra berrezarria';
+$lang['external_edit']         = 'kanpoko aldaketa';
+$lang['summary']               = 'Aldatu laburpena';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> beharrezkoa da eduki hau bistaratzeko.';
+$lang['mail_newpage']          = '[DokuWiki] gehitutako orria:';
+$lang['mail_changed']          = '[DokuWiki] aldatutako orria:';
+$lang['mail_new_user']         = 'erabiltzaile berria:';
+$lang['mail_upload']           = 'fitxategia igota:';
+$lang['qb_bold']               = 'Letra beltzez';
+$lang['qb_italic']             = 'Letra italiarrez';
+$lang['qb_underl']             = 'Azpimarratua';
+$lang['qb_code']               = 'Kodea';
+$lang['qb_strike']             = 'Marratu Testua';
+$lang['qb_h1']                 = 'Izenburua 1';
+$lang['qb_h2']                 = 'Izenburua 2';
+$lang['qb_h3']                 = 'Izenburua 3';
+$lang['qb_h4']                 = 'Izenburua 4';
+$lang['qb_h5']                 = 'Izenburua 5';
+$lang['qb_link']               = 'Barruko Lotura';
+$lang['qb_extlink']            = 'Kanpoko Lotura';
+$lang['qb_hr']                 = 'Horizontal Marra';
+$lang['qb_ol']                 = 'Zerrenda ordenatuko gaia';
+$lang['qb_ul']                 = 'Zerrenda desordenatuko gaia';
+$lang['qb_media']              = 'Irudiak eta beste fitxategiak gehitu';
+$lang['qb_sig']                = 'Gehitu sinadura';
+$lang['qb_smileys']            = 'Irrifartxoak';
+$lang['qb_chars']              = 'Karaktere Bereziak';
+$lang['js']['del_confirm']           = 'Benetan ezabatu aukeratutako fitxategia(k)?';
+$lang['admin_register']        = 'Erabiltzaile berria gehitu';
+$lang['metaedit']              = 'Metadatua Aldatu';
+$lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
+$lang['metasaveok']            = 'Metadatua gordea';
+$lang['img_backto']            = 'Atzera hona';
+$lang['img_title']             = 'Izenburua';
+$lang['img_caption']           = 'Epigrafea';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Fitxategi izena';
+$lang['img_fsize']             = 'Tamaina';
+$lang['img_artist']            = 'Artista';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formatua';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Hitz-gakoak';
+$lang['subscribe_success']     = 'Gehitua %s %s harpidetza zerrendara';
+$lang['subscribe_error']       = 'Errorea %s gehitzen %s harpidetza zerrendara';
+$lang['subscribe_noaddress']   = 'Ez dago posta elektroniko helbiderik zure erabiltzaile izenarekin erlazionatuta, ezin zara harpidetza zerrendara gehitua izan';
+$lang['unsubscribe_success']   = 'Ezabatua %s %s harpidetza zerrendatik';
+$lang['unsubscribe_error']     = 'Errorea %s ezabatzen %s harpidetza zerrendatik';
+$lang['authmodfailed']         = 'Erabiltzaile kautotzearen konfigurazioa okerra da. Mesedez, eman honen berri Wiki administratzaileari';
+$lang['authtempfail']          = 'Erabiltzaile kautotzea denboraldi batez ez dago erabilgarri. Egoerak hala jarraitzen badu, mesedez, eman honen berri Wiki administratzaileari';
+$lang['i_chooselang']          = 'Hautatu zure hizkuntza';
+$lang['i_installer']           = 'DokuWiki instalatzailea';
+$lang['i_wikiname']            = 'Wiki Izena';
+$lang['i_enableacl']           = 'Gaitu ACL (gomendatua) (ACL: Atzipen Kontrol Lista)';
+$lang['i_superuser']           = 'Supererabiltzailea';
+$lang['i_problems']            = 'Instalatzaileak arazo batzuk aurkitu ditu, behean azalduak. Ezin duzu horiek konpondu arte jarraitu.';
+$lang['i_modified']            = 'Segurtasun arrazoiengatik, script hau DokuWikiren instalazio berri eta aldatu gabeko batekin bakarrik dabil. Deskargatutako paketetik fitxategiak berriz atera edo <a href="http://dokuwiki.org/install">DokuWikiren instalazio azalpenak</a> osorik irakurri beharko zenituzke.';
+$lang['i_funcna']              = 'PHP <code>%s</code> funtzioa ez dago erabilgarri. Agian zure hosting hornitzaileak arrazoiren batengatik ezgaituko zuen?';
+$lang['i_phpver']              = 'Zure PHP <code>%s</code> bertsioa behar den <code>%s</code> bertsioa baino zaharragoa da. PHP instalazioa eguneratu beharra daukazu.';
+$lang['i_permfail']            = 'DokuWiki ez da   <code>%s</code> idazteko gai. Direktorio honen baimenen konfigurazioa konpondu behar duzu!';
+$lang['i_confexists']          = '<code>%s</code> lehendik existitzen da';
+$lang['i_writeerr']            = 'Ezin da <code>%s</code> sortu. Direktorioaren/fitxategiaren baimenak egiaztatu eta sortu fitxategia eskuz.';
+$lang['i_badhash']             = 'aldatutakoa edo ezezaguna den dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - balioa arauen aurka edo hutsa';
+$lang['i_success']             = 'Konfigurazioa arrakastaz amaitu da. Orain, install.php fitxategia ezabatu dezakezu. Jarraitu ezazu <a href="doku.php">zure DokuWiki berrian</a>.';
+$lang['i_failure']             = 'Akats batzuk gertatu dira konfigurazio fitxategiak idazterakoan. Hauek eskuz konpondu beharra izan dezakezu <a href="doku.php">zure DokuWiki berria</a> erabili ahal izan aurretik.';
+$lang['i_policy']              = 'Hasierako ACL politika';
+$lang['i_pol0']                = 'Wiki Irekia (irakurri, idatzi, fitxategiak igo edonorentzat)';
+$lang['i_pol1']                = 'Wiki Publikoa (irakurri edonorentzat, idatzi eta fitxategiak igo erregistratutako erabiltzaileentzat)';
+$lang['i_pol2']                = 'Wiki Itxia (irakurri, idatzi, fitxategiak igo erregistratutako erabiltzaileentzat soilik)';
+$lang['i_retry']               = 'Berriz saiatu';
+$lang['mu_intro']              = 'Hemen hainbat fitxategi aldi berean igo ditzakezu. Egin klik nabigazio botoian hauek ilarara gehitzeko. Sakatu igo botoia prest egotean.';
+$lang['mu_gridname']           = 'Fitxategi izena';
+$lang['mu_gridsize']           = 'Tamaina';
+$lang['mu_gridstat']           = 'Egoera';
+$lang['mu_namespace']          = 'Izen-espazioa';
+$lang['mu_browse']             = 'Nabigatu';
+$lang['mu_toobig']             = 'handiegia';
+$lang['mu_ready']              = 'igotzeko prest';
+$lang['mu_done']               = 'amaitua';
+$lang['mu_fail']               = 'hutsegitea';
+$lang['mu_authfail']           = 'saioa iraungita';
+$lang['mu_progress']           = '@PCT@% igota';
+$lang['mu_filetypes']          = 'Onartutako Fitxategi Motak';
+$lang['recent_global']         = 'Une honetan <b>%s</b> izen-espazioaren barneko aldaketak ikusten ari zara.<a href="%s"> Wiki osoaren azken aldaketak</a> ere ikusi ditzakezu.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/locked.txt
new file mode 100644
index 000000000..dc29e51a5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/locked.txt
@@ -0,0 +1,3 @@
+====== Orria blokeatua ======
+
+Orrialde hau blokeatua dago beste erabiltzaile batengatik. Berak aldaketak bukatu arte itxaron beharko duzu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/login.txt
new file mode 100644
index 000000000..ebb1607d9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Ez duzu sesiorik hasi! Sar ezazu zure erabiltzaile izena eta pasahitza. Gogoratu coockie-ak baimenduta izan behar dituzula.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/mailtext.txt
new file mode 100644
index 000000000..86ab1a3a7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWiki-Eskuliburuetan orriren bat aldatu edo gehitu da. Hemen dituzu xehetasunak
+
+Data                : @DATE@
+Nabigatzailea       : @BROWSER@
+IP-Helbidea         : @IPADDRESS@
+Host izena          : @HOSTNAME@
+Bertsio zaharra : @OLDPAGE@
+Bertsio berria  : @NEWPAGE@
+Aldatu laburpena    : @SUMMARY@
+Erabiltzailea       : @USER@
+
+@DIFF@
+
+
+-- 
+Email hau DokuWiki erabiliz sortu da;
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/newpage.txt
new file mode 100644
index 000000000..cac872ce1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/newpage.txt
@@ -0,0 +1,3 @@
+====== Gai hau ez da existitzen oraindik ======
+
+Existitzen ez den gai batera doan lotura bat jarraitu duzu. Zuk zeuk sortu dezakezu ''Sortu orri hau'' erabiliz.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/norev.txt
new file mode 100644
index 000000000..7d9cc60d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/norev.txt
@@ -0,0 +1,3 @@
+====== Berrikuspen hau ez da existitzen ======
+
+Zehaztutako bertsioa ez da existitzen. Erabili ''Bertsio zaharrak'' dokumentu honen aurreko bertsioen zerrenda bat ikusi ahal izateko.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/preview.txt
new file mode 100644
index 000000000..1f0d14f5e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/preview.txt
@@ -0,0 +1,3 @@
+====== Aurreikuspena ======
+
+Hau zure testuaren aurrebista bat besterik ez da. Gogoratu: **ez da gorde** oraindik!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/pwconfirm.txt
new file mode 100644
index 000000000..0f0fd5e8f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/pwconfirm.txt
@@ -0,0 +1,12 @@
+Kaixo @FULLNAME@!
+
+Norbaitek zure @TITLE@ erabiltzailearentzat pasahitz berria eskatu du @DOKUWIKIURL@ gunean.
+
+Ez baduzu zuk eskatu pasahitz berria, ez kasurik egin posta honi.
+
+Eskakizuna zuk bidalia dela egiaztatzeko, mesedez, ondorengo esteka erabili.
+
+@CONFIRM@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/read.txt
new file mode 100644
index 000000000..f7ed7b071
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/read.txt
@@ -0,0 +1 @@
+Orri hau irakurtzeko bakarrik da. Jatorria ikusi dezakezu baina ezin duzu aldatu. Administratzailearekin kontaktuan jarri  gaizki dagoela uste baduzu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/recent.txt
new file mode 100644
index 000000000..4ab5482ce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/recent.txt
@@ -0,0 +1,3 @@
+====== Azken Aldaketak ======
+
+Ondorengo orriak aldatu berriak izan dira:
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/register.txt
new file mode 100644
index 000000000..4a8a49bd7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/register.txt
@@ -0,0 +1,3 @@
+====== Erregistratu erabiltzaile berri bezala ======
+
+Bete beheko informazio guztia wiki honetan kontu berri bat sortzeko. Ziurtatu **baliozko posta-e helbide** bat ematen duzula - ez bazaizu hemen eskatzen pasahitzik sartzeko, berri bat bidaliko zaizu helbide horretara. Saioa hasteko izenak baliozko [[doku>pagename|orri izena]] izan behar du.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/registermail.txt
new file mode 100644
index 000000000..a0154444e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/registermail.txt
@@ -0,0 +1,13 @@
+Erabiltzaile berri bat erregistratu da. Hona hemen xehetasunak:
+
+Erabiltzaile izena : @NEWUSER@
+Izen osoa : @NEWNAME@
+Posta-e : @NEWEMAIL@
+
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbidea : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/resendpwd.txt
new file mode 100644
index 000000000..98f261cd8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Bidali pasahitz berria ======
+
+Mesedez, sartu zure erabiltzaile izena beheko formularioan zure wiki honetako kontuarentzat pasahitz berria eskatzeko. Baieztapen esteka bat bidaliko zaizu erregistratutako  zure posta-e helbidera.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/revisions.txt
new file mode 100644
index 000000000..203cb7e43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/revisions.txt
@@ -0,0 +1,3 @@
+====== Bertsio zaharrak ======
+
+Hauek egungo dokumentua baino zaharragoak diren bertsioak dira. Hauetako bertsio batetara itzultzeko aukera ezazu behetik, pultsatu ''Sortu orri hau'' eta gorde.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/searchpage.txt
new file mode 100644
index 000000000..2a487a3bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/searchpage.txt
@@ -0,0 +1,5 @@
+====== Bilaketa ======
+
+Emaitzak ondorengo aurkiketan bilatu ditzakezu. Bilatzen zabiltzana aurkitu ez baduzu, zuk zeuk sortu dezakezu orri berri bat bilaketa ostean ''Sortu orri hau'' erabiliz.
+
+===== Bilaketa emaitzak: =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/showrev.txt
new file mode 100644
index 000000000..ad1b36057
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/showrev.txt
@@ -0,0 +1,2 @@
+**Hau dokumentuaren bertsio zahar bat da!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/stopwords.txt
new file mode 100644
index 000000000..1aeb868bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/stopwords.txt
@@ -0,0 +1,26 @@
+# Lista hau, indexatzaileak alde batera uzten dituen hitzen zerrenda da, hitz bat lerroko
+# Fitxategi hau editatzean, ziurtatu UNIX lerro bukaerak (lerro berri bakarra) erabiltzen duzula
+# Ez dago 3 letra baino motzagoak diren hitzik sartu beharrik - bestela ere baztertuak dira
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+# FITXATEGI HONEK BEGIRATU BAT BEHAR DU!
+buruz
+dira
+da
+eta
+zure
+haiek
+haien
+com
+nondik
+nora
+nola
+zer
+hau
+zen
+noiz
+non
+nor
+nork
+und
+the
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/subscribermail.txt
new file mode 100644
index 000000000..9e5503a8b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/subscribermail.txt
@@ -0,0 +1,13 @@
+Kaixo!
+
+@PAGE@ orria @TITLE@ wikian aldatua izan da.
+Hona hemen aldaketak:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Orri jakinarazpenak ezeztatzeko, hasi saioa @DOKUWIKIURL@ wikian, bisitatu @NEWPAGE@ eta orriaren eta/edo izen-espazioaren harpidetza utzi.
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/updateprofile.txt
new file mode 100644
index 000000000..233bfecf1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Eguneratu zure kontuaren profila ======
+
+Aldatu nahi dituzun atalak bakarrik bete behar dituzu. Ezin duzu zure erabiltzaile izena aldatu.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/uploadmail.txt
new file mode 100644
index 000000000..639f3d95a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/uploadmail.txt
@@ -0,0 +1,13 @@
+Fitxategi bat igo da zure DokuWikira. Hona hemen xehetasunak:
+
+Fitxategia : @MEDIA@
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbide : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
+Tamaina : @SIZE@
+MIME Mota : @MIME@
+Erabiltzailea : @USER@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/wordblock.txt
new file mode 100644
index 000000000..0af3fb26c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/eu/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAMaren aurkako babesa ======
+
+Zure aldaketak **ez** dira gorde aurrez debekatutako hitzak erabili dituzulako. Wiki-a spammeatzen saitu bazara... -- Aiss osobuko! (VS). Hau akats bat dela uste baduzu jarri arremanetan Wiki-aren administratzailearekin.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/admin.txt
new file mode 100644
index 000000000..ce7550977
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/admin.txt
@@ -0,0 +1,3 @@
+====== مدیریت ======
+
+در اینجا لیستی از وظیفه‌های مدیریتی را مشاهده می‌کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/adminplugins.txt
new file mode 100644
index 000000000..3d2bb4a5b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/adminplugins.txt
@@ -0,0 +1 @@
+===== برنامه های جانبی دیگر =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/backlinks.txt
new file mode 100644
index 000000000..6864e22d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/backlinks.txt
@@ -0,0 +1,3 @@
+====== پیوندهای بازگشتی ======
+
+در این‌جا لیستی از صفحاتی که به این صفحه پیوند داده‌اند را مشاهده می‌کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/conflict.txt
new file mode 100644
index 000000000..9de037024
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/conflict.txt
@@ -0,0 +1,5 @@
+====== یک نگارش جدید وجود دارد ======
+
+این نگارش جدید از مطلبی که ویرایش کرده‌اید وجود دارد. این اتفاق زمانی رخ می‌دهد که یک کاربر دیگر زمانی که شما ویرایش می‌کرده‌اید، ان را تغییر داده است.
+
+تفاوت‌های زیر را بررسی کنید، و تصمیم بگیرید که کدام نگارش حفظ شود. اگر دکمه‌ی «ذخیره» را بفشارید، نسخه‌ی شما ذخیره می‌شود و اگر دکمه‌ی «لغو» را بفشارید، نسخه‌ی کنونی حفظ خواهد شد.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/denied.txt
new file mode 100644
index 000000000..827f73e2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/denied.txt
@@ -0,0 +1,3 @@
+====== دسترسی ممکن نیست ======
+
+شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. ممکن است فراموش کرده باشید که وارد سایت شوید!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/diff.txt
new file mode 100644
index 000000000..d5354f727
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/diff.txt
@@ -0,0 +1,3 @@
+====== تفاوت‌ها ======
+
+تفاوت دو نسخه‌ی متفاوت از صفحه را مشاهده می‌کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/draft.txt
new file mode 100644
index 000000000..164b217b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/draft.txt
@@ -0,0 +1,5 @@
+====== فایل چرک‌نویس یافت شد ======
+
+آخرین سشن ویرایش شما با موفقیت به پایان نرسیده. Dokuwiki به طور خودکار چرک‌نویسی از صفحه‌ی شما ذخیره می‌کند که شما می‌توانید آن را کامل کنید. در زیر مقادیر موجود در چرک‌نویس را مشاهده می‌کنید.
+
+خواهشمندیم تصمیم بگیرید که می‌خواهید چرک‌نویس را //بازیابی//، یا آن را //حذف// کنید و یا ویرایش را //لغو// نمایید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/edit.txt
new file mode 100644
index 000000000..7c3873af4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/edit.txt
@@ -0,0 +1 @@
+این صفحه را ویرایش کنید و کلید «ذخیره» را فشار دهید. صفحه [[wiki:syntax|قوانین نگارشی]] را برای روش نگارش ویکی مشاهده کنید. خواهشمندیم فقط در صورتی این صفحه را ویرایش کنید که توانایی **بهبود بخشیدن** به آن را دارید. اگر تصمیم دارید چیزی را تست کنید یا اولین قدم‌های‌تان را در نگارش ویکی بردارید، به [[playground:playground|زمین بازی]] بروید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/editrev.txt
new file mode 100644
index 000000000..ca896feeb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/editrev.txt
@@ -0,0 +1 @@
+**شما یک نگارش قدیمی را مشاهده می‌کنید!** اگر این نگارش را ذخیره کنید، شما یک نگارش جدید ایجاد کرده‌اید!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/index.txt
new file mode 100644
index 000000000..89ed74b7d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/index.txt
@@ -0,0 +1,3 @@
+====== فهرست ======
+
+این صفحه فهرست تمامی صفحات بر اساس [[doku>namespaces|فضای‌نام‌ها]] است.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/install.html
new file mode 100644
index 000000000..b76e9443f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/install.html
@@ -0,0 +1,12 @@
+<p>این صفحه به شما در نصب و تنظیم
+<a href="http://dokuwiki.org">Dokuwiki</a> کمک می‌کند. اطلاعات بیشتری در این مورد را می‌توانید در <a href="http://dokuwiki.org/installer">بخش راهنما</a> مشاهده کنید.</p>
+
+<p>DokuWiki از فایل‌های معمولی برای ذخیره‌ی صفحات ویکی و اطلاعات مربوط به آن‌ها استفاده می‌کند (مثل تصاویر، فهرست‌های جستجو، نگارش‌های پیشین و غیره). برای نصب موفقیت آمیز DokuWiki
+<strong>باید</strong> دسترسی نوشتن برای شاخه‌های این فایل‌ها داشته باشید. این کار باید توسط دستورات خط فرمان و یا دسترسی FTP و یا از طریق کنترل پنل خدمات میزبانی‌تون انجام شود. </p>
+
+<p>این برنامه <acronym title="access control list">دسترسی‌ها</acronym>ی DokuWiki را برای شما تنظیم خواهد کرد،
+به این معنی که مدیر سیستم می‌تواند به صفحه‌ی مدیران وارد شود، افزونه نصب کنید، کاربران را مدیریت کند، دسترسی به صفحات ویکی را مدیریت کند و یا تنظیمات را تغییر دهد.</p>
+
+<p>برای اطلاعات بیشتر در مورد نصب می‌توانید از این پیوند‌ها استفاده کنید
+<a href="http://dokuwiki.org/install">روش نصب</a>
+و  <a href="http://dokuwiki.org/config">تنظیمات پیکربندی</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/lang.php
new file mode 100644
index 000000000..1123efe13
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/lang.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * fa language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesFa.php?view=co
+ * @author behrad eslamifar <behrad_es@yahoo.com)
+ * @author Mohsen Firoozmandan <info@mambolearn.com>
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi <omidmr@gmail.com>
+ * @author Mohammad Reza Shoaei <shoaei@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'ویرایش این صفحه';
+$lang['btn_source']            = 'نمایش مبدا';
+$lang['btn_show']              = 'نمایش صفحه';
+$lang['btn_create']            = 'ساخت این صفحه';
+$lang['btn_search']            = 'جستجو';
+$lang['btn_save']              = 'ذخیره';
+$lang['btn_preview']           = 'پیش‌نمایش';
+$lang['btn_top']               = 'برگشت به بالا';
+$lang['btn_newer']             = 'نتایج بیشتر »';
+$lang['btn_older']             = '« نتایج کمتر';
+$lang['btn_revs']              = 'نگارش‌های پیشین';
+$lang['btn_recent']            = 'تغییرات اخیر';
+$lang['btn_upload']            = 'ارسال';
+$lang['btn_cancel']            = 'لغو';
+$lang['btn_index']             = 'فهرست';
+$lang['btn_secedit']           = 'ویرایش';
+$lang['btn_login']             = 'ورود به سیستم';
+$lang['btn_logout']            = 'خروج از سیستم';
+$lang['btn_admin']             = 'مدیر';
+$lang['btn_update']            = 'به روز رسانی';
+$lang['btn_delete']            = 'حذف';
+$lang['btn_back']              = 'عقب';
+$lang['btn_backlink']          = 'پیوندهای به این صفحه';
+$lang['btn_backtomedia']       = 'بازگشت به انتخاب فایل';
+$lang['btn_subscribe']         = 'عضویت در تغییرات صفحه';
+$lang['btn_unsubscribe']       = 'لغو عضویت در تغییرات صفحه';
+$lang['btn_subscribens']       = 'عضویت در تغییرات فضای‌نام';
+$lang['btn_unsubscribens']     = 'عضویت در تغییرات فضای‌نام';
+$lang['btn_profile']           = 'به روز رسانی پروفایل';
+$lang['btn_reset']             = 'بازنشاندن';
+$lang['btn_resendpwd']         = 'یک گذرواژه‌ی جدید برای شما فرستاده شود';
+$lang['btn_draft']             = 'ویرایش پیش‌نویس';
+$lang['btn_recover']           = 'بازیابی پیش‌نویس';
+$lang['btn_draftdel']          = 'حذف پیش‌نویس';
+$lang['btn_revert']            = 'بازیابی';
+$lang['loggedinas']            = 'به عنوان کاربر روبرو وارد شده‌اید:';
+$lang['user']                  = 'نام کاربری:';
+$lang['pass']                  = 'گذرواژه‌ی شما';
+$lang['newpass']               = 'گذروازه‌ی جدید';
+$lang['oldpass']               = 'گذرواژه‌ی پیشین';
+$lang['passchk']               = 'گذرواژه را دوباره وارد کنید';
+$lang['remember']              = 'گذرواژه را به یاد بسپار.';
+$lang['fullname']              = '*نام واقعی شما';
+$lang['email']                 = 'ایمیل شما*';
+$lang['register']              = 'یک حساب جدید بسازید';
+$lang['profile']               = 'پروفایل کاربر';
+$lang['badlogin']              = 'خطا در ورود به سیستم';
+$lang['minoredit']             = 'این ویرایش خُرد است';
+$lang['draftdate']             = 'ذخیره خودکار پیش‌نویس';
+$lang['nosecedit']             = 'این صفحه در این میان تغییر کرده است، اطلاعات بخش قدیمی شده است، در عوض محتوای کل نمایش داده می‌شود.';
+$lang['regmissing']            = 'متاسفم، شما باید همه قسمت‌ها را پر کنید.';
+$lang['reguexists']            = 'نام کاربری‌ای که وارد کردید قبلن استفاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.';
+$lang['regsuccess']            = 'کاربر ساخته شد و گذرواژه به صورت ایمیل ارسال گردید.';
+$lang['regsuccess2']           = 'حساب ایجاد شد.';
+$lang['regmailfail']           = 'مشکلی در ارسال ایمیل پیش آمده است، با مدیر تماس بگیرید!';
+$lang['regbadmail']            = 'نشانی واردشده‌ی ایمیل قابل‌قبول نیست، چرا که دارای ساختار نامعتبری است. خواهشمندیم نشانی‌ای با ساختار صحیح وارد کنید و یا بخش مربوط را خالی بگذارید.';
+$lang['regbadpass']            = 'گذرواژه‌هایی که وارد کردید یکسان نیستند.';
+$lang['regpwmail']             = 'گذرواژه‌ی DokuWiki شما';
+$lang['reghere']               = 'شما هنوز حسابی در اینجا ندارید؟ یکی ایجاد کنید';
+$lang['profna']                = 'این ویکی اجازه ویرایش پروفایل را نمی‌دهد';
+$lang['profnochange']          = 'تغییری صورت نگرفت';
+$lang['profnoempty']           = 'نام و آدرس ایمیل باید پر شود';
+$lang['profchanged']           = 'پروفایل کاربر با موفقیت به روز شد';
+$lang['pwdforget']             = 'گذرواژه‌ی خود را فراموش کرده‌اید؟ جدید دریافت کنید';
+$lang['resendna']              = 'این ویکی ارسال مجدد گذرواژه را پشتیبانی نمی‌کند';
+$lang['resendpwd']             = 'گذرواژه‌ی جدید ارسال شد';
+$lang['resendpwdmissing']      = 'متاسفم، شما باید تمام قسمت‌ها را پر کنید';
+$lang['resendpwdnouser']       = 'متاسفم، ما نتوانستیم این نام کاربری را در بانک خود پیدا کنیم';
+$lang['resendpwdbadauth']      = 'متاسفم، کد شناسایی معتبر نیست. از صحت لینک تاییدیه اطمینان حاصل کنید.';
+$lang['resendpwdconfirm']      = 'یک ایمیل تاییدیه‌ی آدرس به آدرس مورنظر ارسال شد. قبل از اینکه نامه‌ی دیگری قابل ارسال به این آدرس باشد، باید دستوراتی که در آن نامه آمده است را جهت تایید این مساله که این آدرس متعلق به شماست، اجرا کنید.';
+$lang['resendpwdsuccess']      = 'گذرواژه‌ی جدید شما توسط ایمیل ارسال شد';
+$lang['license']               = 'به جز مواردی که ذکر می‌شود، مابقی محتویات ویکی تحت مجوز زیر می‌باشند:';
+$lang['licenseok']             = 'توجه: با ویرایش این صفحه، شما مجوز زیر را تایید می‌کنید:';
+$lang['searchmedia']           = 'نام فایل برای جستجو:';
+$lang['searchmedia_in']        = 'جستجو در %s';
+$lang['txt_upload']            = 'فایل را برای ارسال انتخاب کنید';
+$lang['txt_filename']          = 'ارسال به صورت (اختیاری)';
+$lang['txt_overwrt']           = 'بر روی فایل موجود بنویس';
+$lang['lockedby']              = 'در حال حاضر قفل شده است';
+$lang['lockexpire']            = 'قفل منقضی شده است';
+$lang['willexpire']            = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
+$lang['notsavedyet']           = 'تغییرات ذخیره شده از بین خواهد رفت. \n می‌خواهید ادامه دهید؟';
+$lang['rssfailed']             = 'بروز خطا در هنگام واکشی';
+$lang['nothingfound']          = 'چیزی پیدا نشد';
+$lang['mediaselect']           = 'فایل‌ها';
+$lang['fileupload']            = 'ارسال پرونده';
+$lang['uploadsucc']            = 'ارسال با موفقیت انجام شد';
+$lang['uploadfail']            = 'خطا در ارسال';
+$lang['uploadwrong']           = 'ارسال متوقف شد. این توسعه‌ی فایل ممنوع می‌باشد.';
+$lang['uploadexist']           = 'این فابل وجود دارد. عملی انجام نشد.';
+$lang['uploadbadcontent']      = 'محتوای فایل ارسال شده با توسعه‌ی %s متناقض است.';
+$lang['uploadspam']            = 'فایل ارسال شده توسط لیست سیاه اسپم‌ها مسدود شده است.';
+$lang['uploadxss']             = 'این صفحه حاوی اسکریپت یا کد اچ‌تی‌ام‌ال است که ممکن است به نادرست توسط مرورگر وب تفسیر شود.';
+$lang['uploadsize']            = 'فایل ارسال شده سنگین است. (بیشینه، %s)';
+$lang['deletesucc']            = 'فایل «%s» حذف شد.';
+$lang['deletefail']            = '«%s» حذف نمی‌شود، دسترسی‌ها را بررسی کنید.';
+$lang['mediainuse']            = 'فایل «%s» حذف نمی‌شود، چون هنوز در حال استفاده است.';
+$lang['namespaces']            = 'فضای‌نام';
+$lang['mediafiles']            = 'فایل‌های موجود در';
+$lang['js']['searchmedia']     = 'جستجو برای فایل';
+$lang['js']['keepopen']        = 'پنجره را ر زمان انتخاب باز نگه‌دار';
+$lang['js']['hidedetails']     = 'پتهان کردن جزییات';
+$lang['js']['nosmblinks']      = 'پیوند به Windows share فقط در اینترنت‌اکسپلورر قابل استفاده است.
+شما می‌توانید پیوند‌ها رو کپی کنید.';
+$lang['js']['linkwiz']         = 'ویزارد پیوند';
+$lang['js']['linkto']          = 'پیوند به:';
+$lang['js']['del_confirm']     = 'واقعن تصمیم به حذف این موارد دارید؟';
+$lang['js']['mu_btn']          = 'ارسال هم‌زمان چندین فایل ';
+$lang['mediausage']            = 'برای ارجاع دادن به فایل از نگارش زیر استفاده کنید.';
+$lang['mediaview']             = 'مشاهده‌ی فایل اصلی';
+$lang['mediaroot']             = 'ریشه';
+$lang['mediaupload']           = 'ارسال فایل به فضای‌نام کنونی. برای ایجاد زیرفضای‌نام‌ها، نام‌های آن‌ها را به عنوان پیشوندهایی که با دونقطه «:» جدا شده‌اند به نام فایل، در قسمت «ارسال به صورت» اضافه کنید.';
+$lang['mediaextchange']        = 'توسعه‌ی فایل از %s به %s تغییر داده شد.';
+$lang['reference']             = 'ارجاع‌های';
+$lang['ref_inuse']             = 'این فایل نمی‌تواند حذف شود، زیرا هم‌چنان در این صفحه استفاده شده است:';
+$lang['ref_hidden']            = 'تعدادی مرجع در صفحاتی که شما دسترسی خواندن ندارید وجود دارد.';
+$lang['hits']                  = 'بازدید';
+$lang['quickhits']             = 'جور کردن نام صفحات';
+$lang['toc']                   = 'فهرست مندرجات';
+$lang['current']               = 'فعلی';
+$lang['yours']                 = 'نسخه‌ی شما';
+$lang['diff']                  = 'تفاوت‌ها را با نگارش کنونی نمایش بده.';
+$lang['diff2']                 = 'تفاوت‌ها را با نگارش انتخابی نمایش بده.';
+$lang['line']                  = 'خط';
+$lang['breadcrumb']            = 'ردپا';
+$lang['youarehere']            = 'محل شما';
+$lang['lastmod']               = 'آخرین ویرایش';
+$lang['by']                    = 'توسط';
+$lang['deleted']               = 'حذف شد';
+$lang['created']               = 'ایجاد شد';
+$lang['restored']              = 'یک نگارش پیشین واگردانی شد.';
+$lang['external_edit']         = 'ویرایش خارجی';
+$lang['summary']               = 'پیش‌نمایش';
+$lang['noflash']               = 'برای نمایش محتویات <a href="http://www.adobe.com/products/flashplayer/">افزونه‌ی فلش</a> مورد نیاز است.';
+$lang['download']              = 'دیافت فایل منقطع گردید';
+$lang['mail_newpage']          = 'صفحه اضافه شد:';
+$lang['mail_changed']          = 'صفحه تغییر داده شد:';
+$lang['mail_new_user']         = 'کاربر جدید:';
+$lang['mail_upload']           = 'فایل ارسال شده:';
+$lang['qb_bold']               = 'متن پُررنگ';
+$lang['qb_italic']             = 'متن ایتالیک';
+$lang['qb_underl']             = 'متن زیرخط‌دار';
+$lang['qb_code']               = 'کد';
+$lang['qb_strike']             = 'متن وسط‌خط‌دار';
+$lang['qb_h1']                 = 'عنوان سطح ۱';
+$lang['qb_h2']                 = 'عنوان سطح ۲';
+$lang['qb_h3']                 = 'عنوان سطح ۳';
+$lang['qb_h4']                 = 'عنوان سطح ۴';
+$lang['qb_h5']                 = 'عنوان سطح ۵';
+$lang['qb_h']                  = 'تیتر';
+$lang['qb_hs']                 = 'تیتر مورد نظر را انتخاب نمایید';
+$lang['qb_hplus']              = 'تیتر بالاتر';
+$lang['qb_hminus']             = 'تیتر پایین تر';
+$lang['qb_hequal']             = 'تیتر در یک سطح';
+$lang['qb_link']               = 'پیوند داخلی';
+$lang['qb_extlink']            = 'پیوند به بیرون (پیشوند http:// را فراموش نکنید)';
+$lang['qb_hr']                 = 'خط افقی';
+$lang['qb_ol']                 = 'لیست‌های مرتب';
+$lang['qb_ul']                 = 'لیست‌های بدون ترتیب';
+$lang['qb_media']              = 'افزودن تصویر و فایل';
+$lang['qb_sig']                = 'افزودن امضا';
+$lang['qb_smileys']            = 'شکلک';
+$lang['qb_chars']              = 'حروف ویژه';
+$lang['upperns']               = 'پرش به فضای‌نام بالا';
+$lang['admin_register']        = 'یک حساب جدید بسازید';
+$lang['metaedit']              = 'ویرایش داده‌های متا';
+$lang['metasaveerr']           = 'نوشتن داده‌نما با مشکل مواجه شد';
+$lang['metasaveok']            = 'داده‌نما ذخیره شد';
+$lang['img_backto']            = 'بازگشت به ';
+$lang['img_title']             = 'عنوان تصویر';
+$lang['img_caption']           = 'عنوان';
+$lang['img_date']              = 'تاریخ';
+$lang['img_fname']             = 'نام فایل';
+$lang['img_fsize']             = 'اندازه';
+$lang['img_artist']            = 'عکاس/هنرمند';
+$lang['img_copyr']             = 'دارنده‌ی حق تکثیر';
+$lang['img_format']            = 'فرمت';
+$lang['img_camera']            = 'دوربین';
+$lang['img_keywords']          = 'واژه‌های کلیدی';
+$lang['subscribe_success']     = '%s با موفقیت به عضویت %s درآمد';
+$lang['subscribe_error']       = 'عضویت %s در %s با مشکل مواجه شد';
+$lang['subscribe_noaddress']   = 'هیچ آدرس ایمیلی ثبت نکرده‌اید و نمی‌توانید عضو شوید';
+$lang['unsubscribe_success']   = '%s با موفقیت از عضویت %s خارج شد';
+$lang['unsubscribe_error']     = 'خارج کردن %s از عضویت %s با مشکل مواجه شد.';
+$lang['authmodfailed']         = 'اشکال در نوع معتبرسازی کاربران، مدیر ویکی را باخبر سازید.';
+$lang['authtempfail']          = 'معتبرسازی کابران موقتن مسدود می‌باشد. اگر این حالت پایدار بود، مدیر ویکی را باخبر سازید.';
+$lang['i_chooselang']          = 'انتخاب زبان';
+$lang['i_installer']           = 'نصب کننده‌ی Dokuwiki';
+$lang['i_wikiname']            = 'نام ویکی';
+$lang['i_enableacl']           = 'فعال بودن کنترل دسترسی‌ها (توصیه شده)';
+$lang['i_superuser']           = 'کاربر اصلی';
+$lang['i_problems']            = 'نصب کننده با مشکلات زیر مواجه شد. در صورت رفع این مشکلات، امکان ادامه نصب خواهد بود.';
+$lang['i_modified']            = 'به دلایل امنیتی، این اسکریپت فقط با نصب تازه و بدون تغییر DokuWiki کار خواهد کرد.شما باید دوباره فایل فشرده را باز کنید <a href="http://dokuwiki.org/install">راهنمای نصب DokuWiki</a> را بررسی کنید.';
+$lang['i_funcna']              = 'تابع <code>%s</code> در PHP موجود نیست. ممکن است شرکت خدمات وب شما آن را مسدود کرده باشد.';
+$lang['i_phpver']              = 'نگارش پی‌اچ‌پی <code>%s</code> پایین‌تر از نگارش مورد نیاز، یعنی <code>%s</code> می‌باشد. خواهشمندیم به روز رسانی کنید.';
+$lang['i_permfail']            = 'شاخه‌ی <code>%s</code> قابلیت نوشتن ندارد. شما باید دسترسی‌های این شاخه را تنظیم کنید!';
+$lang['i_confexists']          = '<code>%s</code> پیش‌تر موجود است';
+$lang['i_writeerr']            = 'توانایی ایجاد <code>%s</code> نیست. شما باید دسترسی‌های شاخه یا فایل را بررسی کنید و فایل را به طور دستی ایجاد کنید.';
+$lang['i_badhash']             = 'فایل dokuwiki.php غیرقابل تشخیص بوده یا تغییر کرده است (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - غیرقانونی و یا مقادیر تهی';
+$lang['i_success']             = 'تنظیمات با موفقیت به پایان رسید. بهتر است فایل install.php رو حذف کنید. برای ادامه <a href="doku.php">این‌جا</a> کلیک کنید.';
+$lang['i_failure']             = 'مشکلاتی در زمان نوشتن فایل تنظیمات پیش آمده است. شما باید این مشکلات را پیش از استفاده از <a href="doku.php">DokuWiki</a> برطرف کنید.';
+$lang['i_policy']              = 'کنترل دسترسی‌های اولیه';
+$lang['i_pol0']                = 'ویکی باز (همه می‌توانند بخوانند، بنویسند و فایل ارسال کنند)';
+$lang['i_pol1']                = 'ویکی عمومی (همه می‌توانند بخوانند، کاربران ثبت شده می‌توانند بنویسند و فایل ارسال کنند)';
+$lang['i_pol2']                = 'ویکی بسته (فقط کاربران ثبت شده می‌توانند بخوانند، بنویسند و فایل ارسال کنند)';
+$lang['i_retry']               = 'تلاش مجدد';
+$lang['mu_intro']              = 'شما می‌توانید چندین فایل را با یک حرکت ارسال کنید. روی دکمه‌ی «بچر» کلیک کنید و فایل‌ها را به صف ارسال اضافه نمایید. سپس دکمه‌ی «ارسال» را فشار دهید. ';
+$lang['mu_gridname']           = 'نام فایل';
+$lang['mu_gridsize']           = 'اندازه';
+$lang['mu_gridstat']           = 'وضعیت';
+$lang['mu_namespace']          = 'فضای‌نام';
+$lang['mu_browse']             = 'بچر';
+$lang['mu_toobig']             = 'خیلی بزرگ';
+$lang['mu_ready']              = 'آماده‌ی ارسال';
+$lang['mu_done']               = 'کامل';
+$lang['mu_fail']               = 'شکست خورد';
+$lang['mu_authfail']           = 'سشن به پایان رسید';
+$lang['mu_progress']           = '@PCT@% ارسال شد';
+$lang['mu_filetypes']          = 'توسعه‌های مجاز';
+$lang['mu_info']               = 'فایل ارسال گردید';
+$lang['mu_lasterr']            = 'آخرین خطا:';
+$lang['recent_global']         = 'شما هم‌اکنون تغییرات فضای‌نام <b>%s</b> را مشاهده می‌کنید. شما هم‌چنین می‌توانید <a href="%s">تغییرات اخیر در کل ویکی را مشاهده نمایید</a>.';
+$lang['years']                 = '%d سال پیش';
+$lang['months']                = '%d ماه پیش';
+$lang['weeks']                 = '%d هفته‌ی پیش';
+$lang['days']                  = '%d روز پیش';
+$lang['hours']                 = '%d ساعت پیش';
+$lang['minutes']               = '%d دقیقه‌ی پیش';
+$lang['seconds']               = '%d ثانیه‌ی پیش';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/locked.txt
new file mode 100644
index 000000000..1400e22da
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/locked.txt
@@ -0,0 +1,3 @@
+====== قفل شده است ======
+
+این صفحه توسط یک کاربر دیگر، برای ویرایش، قفل شده است. شما باید تا پایان ویرایش این کاربر یا پایان زمان ویرایش، صبر کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/login.txt
new file mode 100644
index 000000000..0b1b3f9fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/login.txt
@@ -0,0 +1,3 @@
+====== ورود ======
+
+شما وارد سایت نشده‌اید! موارد زیر را تایپ کنید تا وارد شوید. برای ورود، نیاز دارید که کوکی‌های مرورگر فعال باشد.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/mailtext.txt
new file mode 100644
index 000000000..44e98db06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/mailtext.txt
@@ -0,0 +1,17 @@
+یک صفحه در ویکی افزوده شده یا تغییر کرده، اطلاعات آن را می‌توانید در زیر بینید:
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+خلاصه ویرایش: @SUMMARY@
+کاربر: @USER@
+
+@DIFF@
+
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/newpage.txt
new file mode 100644
index 000000000..06377a94a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/newpage.txt
@@ -0,0 +1,3 @@
+====== این صفحه وجود ندارد ======
+
+شما به این صفحه که وجود ندارد رسیده‌اید. اگر دسترسی‌ها به شما اجازه می‌دهند، می‌توانید این صفحه را با کلیلک کردن روی دکمه‌ی «ساخت این صفحه» ایجاد کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/norev.txt
new file mode 100644
index 000000000..78a3d94be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/norev.txt
@@ -0,0 +1,3 @@
+====== نگارشی یافت نشد ======
+
+نگارش موردنظر یافت نشد. از دکمه‌ی «نگارش‌های پیشین» برای مشاهده‌ی نگارش‌های پیشین این صفحه استفاده کنید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/preview.txt
new file mode 100644
index 000000000..3a67326df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/preview.txt
@@ -0,0 +1,3 @@
+====== پیش‌نمایش ======
+
+این پیش‌نمایش متن شماست. به یاد داشته باشید که این متن **هنوز ذخیره نشده‌است**
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/pwconfirm.txt
new file mode 100644
index 000000000..fd76b7ddd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/pwconfirm.txt
@@ -0,0 +1,13 @@
+سلام @FULLNAME@!
+
+یک نفر برای ورود به @DOKUWIKIURL@ با عنوان @TITLE@ درخواست گذرواژه‌ای جدید کرده است:
+
+اگر شما چنین درخواستی نداده‌اید، این ایمیل را پاک کنید.
+
+اگر این درخواست توسط شما داده شده است، باید آن را تایید کنید، پس روی پیوند زیر کلیک کنید.
+
+@CONFIRM@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/read.txt
new file mode 100644
index 000000000..1acfdb466
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/read.txt
@@ -0,0 +1 @@
+این صفحه فقط خواندنی است. شما می‌توانید متن صفحه را مشاهده کنید، اما نمی‌توانید آن را تغییر دهید. اگر فکر می‌کنید که مشکلی رخ داده است، مدیر ویکی را در جریان بگذارید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/recent.txt
new file mode 100644
index 000000000..5d5b5b795
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/recent.txt
@@ -0,0 +1,3 @@
+====== تغییرات اخیر ======
+
+این صفحه‌ها اخیرن تغییر کرده‌اند.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/register.txt
new file mode 100644
index 000000000..c6e1f0d4a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/register.txt
@@ -0,0 +1,3 @@
+====== ثبت نام ======
+
+تمامی فیلدها را پر کنید و اطمینان پیدا کنید که ایمیل معتبر وارد کرده‌اید - اگر شما گذرواژه‌ای وارد نکردید، یک مقدار جدید برای‌تان ارسال خواهد شد. نام کاربری شما باید یک [[doku>pagename|صفحه‌ی]] معتبر باشد.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/registermail.txt
new file mode 100644
index 000000000..e22c2d0ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/registermail.txt
@@ -0,0 +1,14 @@
+یک کاربر تازه با مشخصات زیر عضو ویکی شده است:
+
+نام کاربری: @NEWUSER@
+اسم کامل: @NEWNAME@
+ایمیل: @NEWEMAIL@
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/resendpwd.txt
new file mode 100644
index 000000000..8b7b0d387
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ارسال گذرواژه‌ی جدید ======
+
+خواهشمندیم نام کاربری خود را در فرم زیر بنویسید تا گذرواژه‌ی جدید برای تان ارسال شود. یک پیوند تاییدیه برای ایمیل ثبت شده ارسال می‌شود.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/revisions.txt
new file mode 100644
index 000000000..7714ae674
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/revisions.txt
@@ -0,0 +1,3 @@
+====== نگارش‌های پیشین ======
+
+در اینجا نگارش‌های پیشین این صفحه را مشاهده می‌کنید. برای بازگشتن به آن‌ها، آن را انتخاب کنید و کلید «ویرایش این صفحه» را انتخاب کنید و سپس ذخیره نمایید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/searchpage.txt
new file mode 100644
index 000000000..3f0378ed3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/searchpage.txt
@@ -0,0 +1,5 @@
+====== جستجو ======
+
+نتایج جستجو در زیر آمده است. اگر به نتیجه‌ی مطلوبی نرسیده‌اید، می‌توانید صفحه‌ی مورد نظر را ایجاد کنید.
+
+===== نتایج =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/showrev.txt
new file mode 100644
index 000000000..9d0500860
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/showrev.txt
@@ -0,0 +1 @@
+**این یک نگارش قدیمی از این مطلب است!**
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/stopwords.txt
new file mode 100644
index 000000000..58d3ca0f3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/stopwords.txt
@@ -0,0 +1,445 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+من
+تو
+او
+ما
+شما
+آنها
+ایشان
+ایشون
+از
+و
+را
+ای
+یا
+باید
+شاید
+چرا
+چون
+چگونه
+چه
+اگر
+الان
+سلام
+ممنون
+موفق
+باشید
+باش
+باشند
+باشی
+باشم
+باشد
+است
+نیست
+شد
+شدن
+شدند
+شدیم
+شدید
+درباره
+یک
+دو
+سه
+چهار
+پنج
+شش
+هفت
+هشت
+ده
+در
+هست
+هستم
+هستی
+هستیم
+هستید
+هستند
+برای
+این
+آن
+اون
+روی
+رو
+بود
+بودم
+بودی
+بودیم
+بودید
+بودند
+کجا
+کی
+با
+کس
+کسی
+پیرامون
+نزدیک
+بالا
+پایین
+بالای
+بالاتر
+موافق
+مطابق
+طبق
+برطبق
+همان
+سر
+درمیان
+عرض
+طرف
+عملا
+واقعا
+بعد
+قبل
+جستجو
+سپس
+دوباره
+رفتم
+رفتی
+رفت
+رفتیم
+رفتید
+رفتند
+بای
+اوه
+آه
+اه
+برابر
+بااینکه
+همواره
+همیشه
+پیوسته
+وقت
+هزار
+دیگر
+جدا
+شخص
+کدام
+هیچگونه
+بهرحال
+هرچیز
+هیچکار
+درهرصورت
+پدیدار
+درک
+باشه
+جنوب
+ضبط
+حوالی
+نزدیکی
+چنانچه
+بطوریکه
+هنگامیکه
+مثال
+مانند
+پرسیدن
+جویا
+خواهش
+خواستن
+انجمن
+کنار
+پیک
+بیرون
+خارج
+مرتبا
+آغاز
+پایان
+آمد
+امد
+به
+زیرا
+چونکه
+آمدن
+بودن
+درخور
+بوده
+پیش
+پس
+قبلا
+راحت
+مقدم
+کار
+برو
+بیا
+باور
+گمان
+بمیر
+چپ
+راست
+شمال
+غرب
+شرق
+دور
+گذشته
+آینده
+بهتر
+بهترین
+بدترین
+عظیم
+کوچک
+نیک
+بدتر
+خوب
+بد
+زشت
+میان
+هردو
+هم
+یکی
+کوتاه
+بلند
+مختصر
+حکم
+اما
+ولی
+لیکن
+حز
+مگر
+فقط
+بدون
+محض
+بخش
+بدست
+وسیله
+درجه
+اول
+دوم
+سوم
+چهارم
+پنجم
+ششم
+هفتم
+هشتم
+نهم
+دهم
+امکان
+داشتن
+داشتیم
+داشتی
+داشتند
+داشتید
+سبب
+علت
+موجب
+هدف
+صفر
+محتوی
+دارا
+شامل
+نیا
+چیز
+نرو
+مسیر
+روش
+جهت
+دقیقا
+درطی
+درضمن
+بسرعت
+رایج
+جاری
+طورقطعی
+شرح
+کرد
+انجام
+عدد
+غیر
+بریم
+کاملا
+قلم
+آب
+سایه
+مساوی
+صاف
+هموار
+حتی
+جفت
+هرگز
+درست
+کامل
+چنین
+دومین
+سومین
+چهارمین
+پنجمین
+ششمین
+هشتمین
+نهمین
+دهمین
+برید
+رفتن
+راه
+درود
+خداحافظ
+حاجی
+واقع
+سخت
+آسان
+مشکل
+اینجا
+آنجا
+خودش
+هنوز
+بلافاصله
+نگاه
+نگه
+آخر
+اخر
+عمرا
+کمترین
+کوچکترین
+اقل
+مثل
+شکل
+نظر
+چندین
+زیاد
+احتمالا
+متوسط
+یعنی
+اساسا
+عالی
+وای
+خودم
+خودت
+خودمان
+خودمون
+اسم
+نام
+آره
+حال
+حالا
+اینک
+خیلی
+بارها
+بسیار
+کن
+وسط
+ممکن
+راستی
+فعلا
+صحیح
+واقعی
+گفت
+گفتم
+گفتیم
+امثال
+آنکه
+مهم
+جدی
+چنان
+چندان
+زیادی
+بعضی
+گاهگاهی
+زود
+بزودی
+بگیر
+ببر
+بردن
+گیرنده
+تا
+تشکر
+سپاس
+ان
+آنان
+بکلی
+تماما
+بنا
+همدیگر
+جلو
+معمولا
+مقدار
+موقع
+اونجا
+آیا
+که
+بچه
+حاضر
+میخواستم
+بلی
+خیر
+فوروم
+خواهم
+داره
+نداره
+داری
+همون
+میبینم
+اینجوریه
+بهش
+هستن
+امضام
+اولی
+دومی
+سومی
+چهارمی
+بگذار
+بکنه
+امروز
+صدمین
+همش
+همگی
+هوا
+اعلام
+اخرین
+خودشون
+حد
+شده
+اینکه
+خب
+یه
+اینجوری
+گاه
+گهگاه
+گاهی
+گهگدار
+گهگداری
+ها
+میشه
+کمی
+راجبه
+توضیح
+بدی
+راجع
+می
+شه
+روز
+کنی
+اصلا
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/subscribermail.txt
new file mode 100644
index 000000000..140f2e3e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/subscribermail.txt
@@ -0,0 +1,21 @@
+درود!
+
+صفحه‌ی @PAGE@ با عنوان @TITLE@ تغییر کرد.
+تغییرات عبارتند از:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+تاریخ: @DATE@
+کاربر: @USER@
+خلاصه‌ی ویرایش: @SUMMARY@
+نگارش پیشین: @OLDPAGE@
+نگارش تازه: @NEWPAGE@
+
+برای لغو دریافت پیام‌های آگاهی دهنده، وارد ویکی به آدرس
+@DOKUWIKIURL@ شده و سپس به صفحه‌ی @NEWPAGE@ بروید
+و از عضویت صفحه یا فضای‌نام خارج شوید.
+
+-- 
+این ایمیل توسط DokuWiki به آدرس @DOKUWIKIURL@ ایجاد شده است.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/updateprofile.txt
new file mode 100644
index 000000000..d79083306
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/updateprofile.txt
@@ -0,0 +1,3 @@
+====== به روز رسانی پروفایل ======
+
+شما می‌توانید مقادیر زیر را تغییر دهید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/uploadmail.txt
new file mode 100644
index 000000000..625df73dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/uploadmail.txt
@@ -0,0 +1,14 @@
+یک فایل به ویکی ارسال شد:
+
+فایل: @MEDIA@
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+اندازه: @SIZE@
+MIME: @MIME@
+کاربر: @USER@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/wordblock.txt
new file mode 100644
index 000000000..a78c86f06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fa/wordblock.txt
@@ -0,0 +1,3 @@
+====== اسپم مسدود شد ======
+
+این تغییرات ذخیره **نمی‌شود**، چون چند کلمه از کلمه‌های مسدود شده در آن یافت شده است. اگر فکر می‌کنید که نباید این اتفاق می‌افتاد با مدیر سیستم تماس بگیرید.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/admin.txt
new file mode 100644
index 000000000..b57b6080c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/admin.txt
@@ -0,0 +1,3 @@
+====== Ylläpito ======
+
+Alla on lista DokuWiki:ssä käytössä olevista ylläpitotoiminnoista.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/adminplugins.txt
new file mode 100644
index 000000000..fa3571e46
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/adminplugins.txt
@@ -0,0 +1 @@
+===== Muita liitännäisiä =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/backlinks.txt
new file mode 100644
index 000000000..457720241
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/backlinks.txt
@@ -0,0 +1,4 @@
+====== Linkitykset ======
+
+Tässä lista tälle sivuille linkittävistä sivuista.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/conflict.txt
new file mode 100644
index 000000000..be788a116
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/conflict.txt
@@ -0,0 +1,5 @@
+====== On olemassa uudempi versio ======
+
+Muokkaamastasi dokumentista on olemassa uudempi versio. Näin käy, kun toinen käyttäjä muuttaa dokumenttia sillä aikaa, kun sinä olit muokkaamassa sitä.
+
+Tutki alla näkyvät eroavaisuudet kunnolla ja päätä mikä versio säilytetään. Jos valitset "tallenna", sinun versiosi tallennetaan. Valitse ''peru'' pitääksesi tämänhetkisen, toisen käyttäjän muuttaman version.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/denied.txt
new file mode 100644
index 000000000..cd31da06b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/denied.txt
@@ -0,0 +1,3 @@
+====== Lupa evätty ======
+
+Sinulla ei ole tarpeeksi valtuuksia jatkaa. Ehkä unohdit kirjautua sisään?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/diff.txt
new file mode 100644
index 000000000..fbf62b78c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/diff.txt
@@ -0,0 +1,3 @@
+====== Erot ======
+
+Tämä näyttää erot valitun ja nykyisen version kesken tästä sivusta.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/draft.txt
new file mode 100644
index 000000000..859f4d9f9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/draft.txt
@@ -0,0 +1,5 @@
+====== Vedos löydetty ======
+
+Edellinen muokkauksesi tälle sivulle ei ole päivittynyt oikein. DokuWiki on automaattisesti tallentanut vedoksen muokkauksen aikana. Voit nyt jatkaa muokkausta. Alla näet tallennetun version edellisestä istunnostasi.
+
+Valitse jos haluat //palauttaa// edellisen muutoksesi, //poistaa// automaattisesti tallennetun vedoksen, vai //peruuttaa// muutokset.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/edit.txt
new file mode 100644
index 000000000..81b7714d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/edit.txt
@@ -0,0 +1 @@
+Muokkaa sivua ja paina ''Tallenna''. Katso [[wiki:syntax]] nähdäksesi Wikisyntaksi. Muuta sivua vain jos voit **parantaa** sitä. Jos haluat kokeilla Wikiä hyvä paikka siihen on [[playground:playground]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/editrev.txt
new file mode 100644
index 000000000..fd4d9a3de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/editrev.txt
@@ -0,0 +1,2 @@
+**Olet ladannut vanhan version dokumentista** Jos tallennat tämän, tästä tulee uusin versio dokumentista.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/index.txt
new file mode 100644
index 000000000..9086e220e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/index.txt
@@ -0,0 +1,3 @@
+====== hakemisto ======
+
+Tämä on hakemisto kaikista saatavilla olevista sivuista järjestettynä [[doku>namespace|nimiavaruuksittain]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/install.html
new file mode 100644
index 000000000..8d20e045c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/install.html
@@ -0,0 +1,21 @@
+<p>Tämä sivu avustaa <a href="http://dokuwiki.org">Dokuwikin</a> ensiasennuksessa ja 
+  asetuksissa. Lisätietoa asennusohjelmasta löytyy ohjelman 
+	<a href="http://dokuwiki.org/installer">dokumentaatiosta</a>.</p>
+
+<p>DokuWiki käyttää tavallisia tiedostoja wiki-sivujen, sekä muiden niihin liittyvien 
+  tietojen kuten kuvien, hakuindeksien, versionhallinnan jne. tallentamiseen. Toimiakseen 
+	oikein DokuWikillä <strong>täytyy</strong> olla kirjoitusoikeus niihin hakemistoihin joissa nämä 
+	tiedostot sijaitsevat. Asennusohjelma ei pysty asettamaan näitä oikeuksia. Tämä täytyy 
+	useimmiten tehdä suoraan komentoriviltä tai muulla, esimerkiksi 
+	internet-palveluntarjoajan määrittämällä tavalla, kuten FTP -ohjelmalla tai erillisen 
+	asetusvalikon kautta. (cPanel).</p>
+
+<p>Asennusohjelma määrittelee DokuWikin <acronym title="käyttöoikeudet">käyttöoikeudet (ACL)</acronym>,
+  jotka mahdollistavat ylläpitäjän sisäänkirjautumisen ja pääsyn DokuWikin ylläpito -valikkoon, 
+	josta voidaan asentaa plugineja, hallita käyttäjätietoja, wiki-sivujen luku- ja 
+	kirjoitusoikeuksia sekä muita asetuksia. Käyttöoikeuksien käyttäminen ei ole pakollista, 
+	mutta se helpottaa DokuWikin ylläpitämistä.</p>
+
+<p>Kokeneille käyttäjille tai käyttäjille joilla on erityisvaatimuksia asennukselle 
+  löytyy lisätietoa <a href="http://dokuwiki.org/install">asennuksesta</a> sekä 
+	<a href="http://dokuwiki.org/config">asetuksista</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/lang.php
new file mode 100644
index 000000000..6ef19ee8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/lang.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * Finnish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Petteri <petteri@gmail.com>
+ * @author Matti Pöllä <mpo@iki.fi>
+ * @author otto@valjakko.net
+ * @author Otto Vainio <otto@valjakko.net>
+ * @author Teemu Mattila <ghcsystems@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '”';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '’';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Muokkaa tätä sivua';
+$lang['btn_source']            = 'Näytä sivun lähdekoodi';
+$lang['btn_show']              = 'Näytä sivu';
+$lang['btn_create']            = 'Luo tämä sivu';
+$lang['btn_search']            = 'Etsi';
+$lang['btn_save']              = 'Tallenna';
+$lang['btn_preview']           = 'Esikatselu';
+$lang['btn_top']               = 'Takaisin ylös';
+$lang['btn_newer']             = '<< uudemmat';
+$lang['btn_older']             = 'vanhemmat >>';
+$lang['btn_revs']              = 'Vanhat versiot';
+$lang['btn_recent']            = 'Viimeiset muutokset';
+$lang['btn_upload']            = 'Lähetä tiedosto';
+$lang['btn_cancel']            = 'Peru';
+$lang['btn_index']             = 'Hakemisto';
+$lang['btn_secedit']           = 'Muokkaa';
+$lang['btn_login']             = 'Kirjaudu sisään';
+$lang['btn_logout']            = 'Kirjaudu ulos';
+$lang['btn_admin']             = 'Ylläpito';
+$lang['btn_update']            = 'Päivitä';
+$lang['btn_delete']            = 'Poista';
+$lang['btn_back']              = 'Takaisin';
+$lang['btn_backlink']          = 'Paluulinkit';
+$lang['btn_backtomedia']       = 'Takaisin mediatiedostojen valintaan';
+$lang['btn_subscribe']         = 'Tilaa muutokset';
+$lang['btn_unsubscribe']       = 'Lopeta muutosten tilaus';
+$lang['btn_subscribens']       = 'Tilaa nimiavaruuden muutokset';
+$lang['btn_unsubscribens']     = 'Lopeta nimiavaruuden muutosten tilaus';
+$lang['btn_profile']           = 'Päivitä profiili';
+$lang['btn_reset']             = 'Tyhjennä';
+$lang['btn_resendpwd']         = 'Lähetä uusi salasana';
+$lang['btn_draft']             = 'Muokkaa luonnosta';
+$lang['btn_recover']           = 'Palauta luonnos';
+$lang['btn_draftdel']          = 'Poista luonnos';
+$lang['btn_revert']            = 'palauta';
+$lang['loggedinas']            = 'Kirjautunut nimellä';
+$lang['user']                  = 'Käyttäjänimi';
+$lang['pass']                  = 'Salasana';
+$lang['newpass']               = 'Uusi salasana';
+$lang['oldpass']               = 'Vahvista nykyinen salasana';
+$lang['passchk']               = 'uudelleen';
+$lang['remember']              = 'Muista minut';
+$lang['fullname']              = 'Koko nimi';
+$lang['email']                 = 'Sähköposti';
+$lang['register']              = 'Rekisteröidy';
+$lang['profile']               = 'Käyttäjän profiili';
+$lang['badlogin']              = 'Käyttäjänimi tai salasana oli väärä.';
+$lang['minoredit']             = 'Pieni muutos';
+$lang['draftdate']             = 'Luonnos tallennettu automaattisesti';
+$lang['nosecedit']             = 'Sivu on muuttunut välillä ja kappaleen tiedot olivat vanhentuneet. Koko sivu ladattu.';
+$lang['regmissing']            = 'Kaikki kentät tulee täyttää.';
+$lang['reguexists']            = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.';
+$lang['regsuccess']            = 'Käyttäjä luotiin ja salasana lähetettiin sähköpostilla.';
+$lang['regsuccess2']           = 'Käyttäjänimi on luotu.';
+$lang['regmailfail']           = 'Näyttää siltä, että salasanan lähettämisessä tapahtui virhe. Ota yhteys ylläpitäjään!';
+$lang['regbadmail']            = 'Antamasi sähköpostiosoite näyttää epäkelvolta. Jos pidät tätä virheenä ota yhteys ylläpitäjään.';
+$lang['regbadpass']            = 'Annetut kaksi salasanaa eivät täsmää. Yritä uudelleen.';
+$lang['regpwmail']             = 'DokuWiki salasanasi';
+$lang['reghere']               = 'Puuttuuko sinulta käyttäjätili? Hanki sellainen';
+$lang['profna']                = 'Tässä wikissä profiilien muokkaaminen ei ole mahdollista';
+$lang['profnochange']          = 'Ei muutoksia.';
+$lang['profnoempty']           = 'Tyhjä nimi tai sähköpostiosoite ei ole sallittu.';
+$lang['profchanged']           = 'Käyttäjän profiilin päivitys onnistui.';
+$lang['pwdforget']             = 'Unohtuiko salasana? Hanki uusi';
+$lang['resendna']              = 'Tämä wiki ei tue salasanan uudelleenlähettämistä.';
+$lang['resendpwd']             = 'Lähetä uusi salasana käyttäjälle';
+$lang['resendpwdmissing']      = 'Kaikki kentät on täytettävä.';
+$lang['resendpwdnouser']       = 'Käyttäjää ei löydy tietokannastamme.';
+$lang['resendpwdbadauth']      = 'Tunnistuskoodi on virheellinen. Varmista, että käytit koko varmistuslinkkiä.';
+$lang['resendpwdconfirm']      = 'Varmistuslinkki on lähetetty sähköpostilla';
+$lang['resendpwdsuccess']      = 'Uusi salasanasi on lähetetty sähköpostilla.';
+$lang['license']               = 'Jollei muuta ole mainittu, niin sisältö tässä wikissä on lisensoitu seuraavalla lisenssillä:';
+$lang['licenseok']             = 'Huom: Muokkaamalla tätä sivua suostut lisensoimaan sisällön seuraavan lisenssin mukaisesti:';
+$lang['searchmedia']           = 'Etsi tiedostoa nimeltä:';
+$lang['searchmedia_in']        = 'Etsi kohteesta %s';
+$lang['txt_upload']            = 'Valitse tiedosto lähetettäväksi';
+$lang['txt_filename']          = 'Lähetä nimellä (valinnainen)';
+$lang['txt_overwrt']           = 'Ylikirjoita olemassa oleva';
+$lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
+$lang['lockexpire']            = 'Lukitus päättyy';
+$lang['willexpire']            = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['notsavedyet']           = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.\n Haluatko varmasti jatkaa?';
+$lang['rssfailed']             = 'Virhe tapahtui noudettaessa tätä syötettä: ';
+$lang['nothingfound']          = 'Mitään ei löytynyt.';
+$lang['mediaselect']           = 'Mediatiedoston valinta';
+$lang['fileupload']            = 'Mediatiedoston lähetys';
+$lang['uploadsucc']            = 'Tiedoston lähetys onnistui';
+$lang['uploadfail']            = 'Tiedoston lähetys epäonnistui. Syynä ehkä väärät oikeudet?';
+$lang['uploadwrong']           = 'Tiedoston lähetys evätty. Tämä tiedostopääte on kielletty';
+$lang['uploadexist']           = 'Tiedosto on jo olemassa. Mitään ei tehty.';
+$lang['uploadbadcontent']      = 'Tiedoston sisältö ei vastannut päätettä %s';
+$lang['uploadspam']            = 'Roskapostin estolista esti tiedoston lähetyksen.';
+$lang['uploadxss']             = 'Tiedoston lähetys estettiin mahdollisen haitallisen sisällön vuoksi.';
+$lang['uploadsize']            = 'Lähetetty tiedosto oli liian iso. (max %s)';
+$lang['deletesucc']            = 'Tiedosto "%s" on poistettu.';
+$lang['deletefail']            = 'Kohdetta "%s" poistaminen ei onnistunut - tarkista oikeudet.';
+$lang['mediainuse']            = 'Tiedostoa "%s" ei ole poistettu - se on vielä käytössä.';
+$lang['namespaces']            = 'Nimiavaruudet';
+$lang['mediafiles']            = 'Tarjolla olevat tiedostot';
+$lang['js']['searchmedia']     = 'Etsi tiedostoja';
+$lang['js']['keepopen']        = 'Pidä valinnan ikkuna avoinna.';
+$lang['js']['hidedetails']     = 'Piilota yksityiskohdat';
+$lang['js']['nosmblinks']      = 'Linkit Windows-jakoihin toimivat vain Microsoft Internet Explorerilla.
+Voit silti kopioida ja liittää linkin.';
+$lang['js']['linkwiz']         = 'Linkkivelho';
+$lang['js']['linkto']          = 'Linkki kohteeseen:';
+$lang['js']['del_confirm']     = 'Haluatko todella poistaa valitut kohteet?';
+$lang['js']['mu_btn']          = 'Lähetä useampia tiedostoja kerralla';
+$lang['mediausage']            = 'Käytä seuraavaa merkintätapaa viittausta tehtäessä:';
+$lang['mediaview']             = 'Katsele alkuperäistä tiedostoa';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Siirrä tiedosto nykyiseen nimiavaruuteen täällä. Voit luoda uusia alinimiavaruuksia laittamalla lisäämällä sen nimen ja kaksoispisteen "Lähetä nimellä" eteen.';
+$lang['mediaextchange']        = 'Tiedoston pääte muutettu: .%s on nyt .%s!';
+$lang['reference']             = 'Viitteet';
+$lang['ref_inuse']             = 'Tiedostoa ei voi poistaa, koska seuraavat sivut käyttävät sitä:';
+$lang['ref_hidden']            = 'Osa viitteistä on sivuilla, joihin sinulla ei ole lukuoikeutta';
+$lang['hits']                  = 'Osumia';
+$lang['quickhits']             = 'Sopivat sivunimet';
+$lang['toc']                   = 'Sisällysluettelo';
+$lang['current']               = 'nykyinen';
+$lang['yours']                 = 'Sinun versiosi';
+$lang['diff']                  = 'Näytä eroavaisuudet nykyiseen versioon';
+$lang['diff2']                 = 'Näytä eroavaisuudet valittuun versioon';
+$lang['line']                  = 'Rivi';
+$lang['breadcrumb']            = 'Jäljet';
+$lang['youarehere']            = 'Olet täällä';
+$lang['lastmod']               = 'Viimeksi muutettu';
+$lang['by']                    = '/';
+$lang['deleted']               = 'poistettu';
+$lang['created']               = 'luotu';
+$lang['restored']              = 'vanha versio palautettu';
+$lang['external_edit']         = 'ulkoinen muokkaus';
+$lang['summary']               = 'Yhteenveto muokkauksesta';
+$lang['noflash']               = 'Tarvitset <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash-liitännäisen</a> nähdäksesi tämän sisällön.';
+$lang['download']              = 'Lataa palanen';
+$lang['mail_newpage']          = 'sivu lisätty:';
+$lang['mail_changed']          = 'sivu muutettu:';
+$lang['mail_new_user']         = 'uusi käyttäjä:';
+$lang['mail_upload']           = 'tiedosto lähetetty:';
+$lang['qb_bold']               = 'Lihavoitu teksti';
+$lang['qb_italic']             = 'Kursivoitu teksti';
+$lang['qb_underl']             = 'Alleviivattu teksti';
+$lang['qb_code']               = 'Kooditeksti';
+$lang['qb_strike']             = 'Yliviivattu teksti';
+$lang['qb_h1']                 = 'Taso 1 otsikko';
+$lang['qb_h2']                 = 'Taso 2 otsikko';
+$lang['qb_h3']                 = 'Taso 3 otsikko';
+$lang['qb_h4']                 = 'Taso 4 otsikko';
+$lang['qb_h5']                 = 'Taso 5 otsikko';
+$lang['qb_h']                  = 'Otsikko';
+$lang['qb_hs']                 = 'Valitse otsikko';
+$lang['qb_hplus']              = 'Ylempi otsikko';
+$lang['qb_hminus']             = 'Alempi otsikko';
+$lang['qb_hequal']             = 'Saman tason otsikko';
+$lang['qb_link']               = 'Sisäinen linkki';
+$lang['qb_extlink']            = 'Ulkoinen linkki';
+$lang['qb_hr']                 = 'Vaakaerotin';
+$lang['qb_ol']                 = 'Järjestetyn listan osa ';
+$lang['qb_ul']                 = 'Epäjärjestetyn listan osa';
+$lang['qb_media']              = 'Lisää kuvia ja muita tiedostoja';
+$lang['qb_sig']                = 'Lisää allekirjoitus';
+$lang['qb_smileys']            = 'Hymiöt';
+$lang['qb_chars']              = 'Erikoismerkit';
+$lang['upperns']               = 'Hyppää edelliseen nimiavaruuteen';
+$lang['admin_register']        = 'Lisää uusi käyttäjä';
+$lang['metaedit']              = 'Muokkaa metadataa';
+$lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
+$lang['metasaveok']            = 'Metadata tallennettu';
+$lang['img_backto']            = 'Takaisin';
+$lang['img_title']             = 'Otsikko';
+$lang['img_caption']           = 'Kuvateksti';
+$lang['img_date']              = 'Päivämäärä';
+$lang['img_fname']             = 'Tiedoston nimi';
+$lang['img_fsize']             = 'Koko';
+$lang['img_artist']            = 'Kuvaaja';
+$lang['img_copyr']             = 'Tekijänoikeus';
+$lang['img_format']            = 'Formaatti';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Avainsanat';
+$lang['subscribe_success']     = '%s lisättiin käyttäjän %s seurattavien listaan';
+$lang['subscribe_error']       = 'Lisättäessä %s käyttäjän %s seurattavien listaan tapahtui virhe';
+$lang['subscribe_noaddress']   = 'Käyttäjänimelle ei löydy osoitetta. Seurattavien listaan lisääminen ei onnistu.';
+$lang['unsubscribe_success']   = '%s poistettiin käyttäjän %s seurattavien listasta';
+$lang['unsubscribe_error']     = 'Poistettaessa %s käyttäjän %s seurattavien listasta tapahtui virhe';
+$lang['authmodfailed']         = 'Käyttäjien autentikoinnin asetukset ovat virheelliset. Ilmoita asiasta wikin ylläpitäjälle.';
+$lang['authtempfail']          = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.';
+$lang['i_chooselang']          = 'Valitse kieli';
+$lang['i_installer']           = 'DokuWikin asentaja';
+$lang['i_wikiname']            = 'Wikin nimi';
+$lang['i_enableacl']           = 'Käytä käyttöoikeuksien hallintaa (ACL) (Suositeltu)';
+$lang['i_superuser']           = 'Pääkäyttäjä';
+$lang['i_problems']            = 'Asennusohjelma löysi alla listattuja ongelmia ongelmia. Et voi jatkaa ennen kuin ne on korjattu.';
+$lang['i_modified']            = 'Turvallisuussyistä tämä ohjelma toimii vain uusien ja muokkaamattomien Dokuwiki-asennusten kanssa. Pura tiedostot uudestaan asennuspaketista, tai lue <a href="http://dokuwiki.org/install">Dokuwikin asennusohje (englanniksi)</a>';
+$lang['i_funcna']              = 'PHP:n funktio <code>%s</code> ei ole käytettävissä. Palveluntarjoajasi on saattanut poistaa sen jostain syystä.';
+$lang['i_phpver']              = 'Käyttämäsi PHP-ohjelmiston versio <code>%s</code> on pienempi, kuin tarvitaan <code>%s</code>. PHP-asennuksesi pitää päivittää.';
+$lang['i_permfail']            = '<code>%s</code> ei ole DokuWikin kirjoitettavissa. Muokkaa hakemiston oikeuksia!';
+$lang['i_confexists']          = '<code>%s</code> on jo olemassa';
+$lang['i_writeerr']            = '<code>%s</code>n luonti epäonnistui. Tarkista hakemiston/tiedoston oikeudet ja luo tiedosto käsin.';
+$lang['i_badhash']             = 'tunnistamaton tai muokattu dokuwiki.php (tarkistussumma=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - väärä tai tyhjä arvo';
+$lang['i_success']             = 'Kokoonpano tehty onnistuneesti. Voit poistaa install.php tiedoston. Jatka <a href="doku.php">uuteen DokuWikiisi</a>.';
+$lang['i_failure']             = 'Joitain virheitä tapahtui kirjoitettaessa vaadittavia tiedostoja. Sinun pitää korjata ne käsin ennen kuin voit käyttää <a href="doku.php">uutta DokuWikiäsi</a>.';
+$lang['i_policy']              = 'Käyttöoikeuksien oletusmenettelytapa';
+$lang['i_pol0']                = 'Avoin Wiki (luku, kirjoitus, tiedostojen lähetys on sallittu kaikille)';
+$lang['i_pol1']                = 'Julkinen Wiki (luku kaikilla, kirjoitus ja tiedostojen lähetys rekisteröidyillä käyttäjillä)';
+$lang['i_pol2']                = 'Suljettu Wiki (luku, kirjoitus ja tiedostojen lähetys vain rekisteröityneillä käyttäjillä)';
+$lang['i_retry']               = 'Yritä uudelleen';
+$lang['mu_intro']              = 'Täällä voit lähettää useampia tiedostoja kerralla. Klikkaa Selaa-nappia lisätäksesi ne jonoon. Paina lähetä, kun olet valmis.';
+$lang['mu_gridname']           = 'Tiedoston nimi';
+$lang['mu_gridsize']           = 'Koko';
+$lang['mu_gridstat']           = 'Tilanne';
+$lang['mu_namespace']          = 'Nimiavaruus';
+$lang['mu_browse']             = 'Selaa';
+$lang['mu_toobig']             = 'liian iso';
+$lang['mu_ready']              = 'valmis lähetettäväksi';
+$lang['mu_done']               = 'valmis';
+$lang['mu_fail']               = 'epäonnistui';
+$lang['mu_authfail']           = 'istunto on vanhentunut';
+$lang['mu_progress']           = '@PCT@% lähetetty';
+$lang['mu_filetypes']          = 'Sallitut tyypit';
+$lang['mu_info']               = 'tiedstoa ladattu.';
+$lang['mu_lasterr']            = 'Edellinen virhe:';
+$lang['recent_global']         = 'Seuraat tällä hetkellä muutoksia nimiavaruuden <b>%s</b> sisällä. Voit myös <a href="%s">katsoa muutoksia koko wikissä</a>';
+$lang['years']                 = '%d vuotta sitten';
+$lang['months']                = '%d kuukautta sitten';
+$lang['weeks']                 = '%d viikkoa sitten';
+$lang['days']                  = '%d päivää sitten';
+$lang['hours']                 = '%d tuntia sitten';
+$lang['minutes']               = '%d minuuttia sitten';
+$lang['seconds']               = '% sekuntia sitten';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/locked.txt
new file mode 100644
index 000000000..3a48ff8ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/locked.txt
@@ -0,0 +1,3 @@
+====== Sivu lukittu ======
+
+Tämä sivu on tällä hetkellä lukittuna, koska se on toisen käyttäjän muokkauksessa. Joudut odottamaan, kunnes hän lopettaa muokkauksen, tai kunnes lukko aukeaa.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/login.txt
new file mode 100644
index 000000000..efba26286
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/login.txt
@@ -0,0 +1,3 @@
+====== Sisäänkirjautuminen ======
+
+Et ole tällä hetkellä kirjautunut sisään! Anna käyttäjätunnus ja salasana alle kirjautuaksesi. Muista, että evästeiden käyttö tulee olla päällä, jotta sisäänkirjautuminen onnistuu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/mailtext.txt
new file mode 100644
index 000000000..0a953cb87
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWikiisi lisättiin tai siellä muutettiin sivua. Tässä yksityiskohdat
+
+Päivämäärä : @DATE@
+Selain: @BROWSER@
+IP-Osoite: @IPADDRESS@
+Isäntänimi: @HOSTNAME@
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+Yhteenveto: @SUMMARY@
+Käyttäjä : @USER@
+
+@DIFF@
+
+
+-- 
+Tämän postin generoi DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/newpage.txt
new file mode 100644
index 000000000..fc6379be7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/newpage.txt
@@ -0,0 +1,3 @@
+====== Tätä otsikkoa ei vielä ole ======
+
+Olet seurannut linkkiä otsikkoon jota ei vielä ole. Voit luoda tämän käyttämällä ''Luo tämä sivu'' -nappia.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/norev.txt
new file mode 100644
index 000000000..a5138cfc3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/norev.txt
@@ -0,0 +1,3 @@
+====== Ei tällaista versiota ======
+
+Kyseistä versiota ei ole. Käytä ''Vanha versio''-nappia nähdäksesi listan tämän dokumentin vanhoista versioista
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/preview.txt
new file mode 100644
index 000000000..848780701
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/preview.txt
@@ -0,0 +1,3 @@
+====== Esikatselu ======
+
+Tämä on esikatselu siitä, miltä tekstisi tulee näyttämään. Muista, että tätä **ei ole tallennettu** vielä!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/pwconfirm.txt
new file mode 100644
index 000000000..d134943f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/pwconfirm.txt
@@ -0,0 +1,13 @@
+Hei @FULLNAME@!
+
+Joku pyysi uutta salasanaa login nimellesi @TITLE@ sivustolla @DOKUWIKIURL@
+
+Jos sinä ei pyytänyt uutta salasanaa, niin voit unohtaa tämän postin.
+
+Käytä alla olevaa linkkiä vahvistaaksesi, että pyynnön lähettäjä todella olet sinä.
+
+@CONFIRM@
+
+-- 
+Tämän postin generoi DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/read.txt
new file mode 100644
index 000000000..eb4380229
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/read.txt
@@ -0,0 +1 @@
+Tämä sivu on vain luettavissa. Voit katsoa sen lähdekoodia, mutta et muuttaa sitä. Kysy ylläpitäjältä jos pidät tätä estoa virheellisenä.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/recent.txt
new file mode 100644
index 000000000..ffb08107e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/recent.txt
@@ -0,0 +1,4 @@
+====== Viimeiset muutokset ======
+
+Seuraavat sivut ovat muuttuneet viime aikoina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/register.txt
new file mode 100644
index 000000000..cf7a62557
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/register.txt
@@ -0,0 +1,3 @@
+====== Rekisteröi uusi käyttäjä ======
+
+Täytä alla olevat tiedot luodaksesi uuden käyttäjätilin tähän wikiin. Muista antaa **toimiva sähköpostiosoite**. Jos sinulta ei kysytä uutta salasanaa, niin uusi salasanasi lähetetään sähköpostiisi. Käyttäjänimi pitää olla myös käypä [[doku>pagename|sivunimi]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/registermail.txt
new file mode 100644
index 000000000..78d73f63d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/registermail.txt
@@ -0,0 +1,14 @@
+Uusi käyttäjä on rekisteröitynyt. Tässä tiedot:
+
+Käyttäjänimi : @NEWUSER@
+Kokonimi : @NEWNAME@
+Sähköposti : @NEWEMAIL@
+
+Päivämäärä : @DATE@
+Selain : @BROWSER@
+IP-osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Tämän postin generoi DokuWiki osoitteessa
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/resendpwd.txt
new file mode 100644
index 000000000..5a567b022
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Lähetä uusi salasana ======
+
+Täytä käyttäjätunnuksesi kaavakkeeseen pyytääksesi uutta salasanaa wikin käyttäjätilillesi. Vahvistuslinkki lähetetään kirjautumisen yhteydessä antamaan sähköpostiosoitteeseen.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/revisions.txt
new file mode 100644
index 000000000..a48cd3366
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/revisions.txt
@@ -0,0 +1,3 @@
+====== Vanha versio ======
+
+Nämä ovat vanhoja versioita nykyisestä dokumentista. Jos haluat palauttaa vanhan version valitse se alhaalta, paina ''Muokkaa tätä sivua'' ja tallenna se.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/searchpage.txt
new file mode 100644
index 000000000..aa9fbf52f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/searchpage.txt
@@ -0,0 +1,5 @@
+====== Etsi ======
+
+Löydät etsinnän tulokset alta. Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä ''Muokkaa tätä sivua'' -napilla.
+
+===== Tulokset =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/showrev.txt
new file mode 100644
index 000000000..243f8d01e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/showrev.txt
@@ -0,0 +1,2 @@
+**Tämä on vanha versio dokumentista!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/stopwords.txt
new file mode 100644
index 000000000..f92fe70cc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/stopwords.txt
@@ -0,0 +1,11 @@
+# Tämä on lista sanoista, jotka indeksoija ohittaa. Yksi sana riviä kohti
+# Kun muokkaat sivua, varmista että käytät UNIX rivinvaihtoa (yksi newline)
+# Ei tarvitse lisätä alle kolmen merkin sanoja. NE ohitetaan automaattisesti.
+# Jos wikissäsin muita kieliä, lisää sanoja listaan esim sivulta http://www.ranks.nl/stopwords/
+www
+eli
+tai
+sinä
+sinun
+com
+oli
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/subscribermail.txt
new file mode 100644
index 000000000..d1c5d9138
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/subscribermail.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Sivua @PAGE@ wiki-sivustolla @TITLE@ on muokattu.
+Tässä muutokset:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Päivä : @DATE@
+Käyttäjä : @USER@
+Yhteenveto: @SUMMARY@
+Vanha revisio: @OLDPAGE@
+Uusi revisio: @NEWPAGE@
+
+Poistaaksesi sivun seurannan, kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ ja siirry sivulle
+@NEWPAGE@
+ja valitse 'Lopeta sivun ja/tai nimiavaruuden tarkkailu'.
+
+-- 
+Tämän viestin generoi DokuWiki osoitteessa
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/updateprofile.txt
new file mode 100644
index 000000000..71407954a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Päivitä käyttäjätilisi profiilia ======
+
+Täytä vain ne kentät, joita haluat muuttaa. Et voi muuttaa käyttäjätunnustasi.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/uploadmail.txt
new file mode 100644
index 000000000..7a5ea49ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/uploadmail.txt
@@ -0,0 +1,14 @@
+Tiedosto ladattiin DokuWikillesi. Tässä yksityiskohtaiset tiedot:
+
+Tiedosto : @MEDIA@
+PVM : @DATE@
+Selain : @BROWSER@
+IP-Osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
+Koko : @SIZE@
+MIME Type : @MIME@
+Käyttäjä : @USER@
+
+-- 
+Tämän postin generoi DokuWiki osoitteessa
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/wordblock.txt
new file mode 100644
index 000000000..4e416c68c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fi/wordblock.txt
@@ -0,0 +1,3 @@
+====== Roskaposti torjuttu ======
+
+Muutoksiasi **ei** talletettu, koska ne pitivät sisällään yhden tai useampia epäkelpoja sanoja. Jos yritit spämmätä Wikiä, häpeä! Jos pidät tätä virheenä ota yhteyttä wikin ylläpitäjään.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/admin.txt
new file mode 100644
index 000000000..27743223d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/admin.txt
@@ -0,0 +1,4 @@
+====== Fyrisiting ======
+
+Niðanfyri kanst tú finna eina røð av amboðum til fyrisiting.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/backlinks.txt
new file mode 100644
index 000000000..422377f62
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/backlinks.txt
@@ -0,0 +1,4 @@
+====== Ávísing afturúr ======
+
+Hetta er ein listi yvur øll tey skjøl sum vísa aftur á tað núverandi skjali.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt
new file mode 100644
index 000000000..df3fe52be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/conflict.txt
@@ -0,0 +1,5 @@
+====== Ein níggjari útgáva av skjalinum er til ======
+
+Ein nýggjari útgáva av hesum skjalinum er til. Hetta hendur tá fleiri brúkarir rætta í skjalinum samstundis.
+
+Eftirkanna tær vístu broytingar nágreiniliga, og avgerð hvat fyri útgávu sum skal goymast. Um tú velur ''Goym'', verður tín útgáva av skalinum goymd. Velur tú ''Angra'' varðveittur tú tí núverandi útgávuna.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/denied.txt
new file mode 100644
index 000000000..505b249b4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/denied.txt
@@ -0,0 +1,3 @@
+====== Atgongd nokta! ======
+
+Tú hevur ikki rættindi til at halda áfram. Møguliga hevur tú ikki rita inn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/diff.txt
new file mode 100644
index 000000000..343818b40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/diff.txt
@@ -0,0 +1,4 @@
+====== Munir ======
+
+Hetta vísur munir millum tí valdu og núverandu útgávu av skjalinum. Gular eru linjur sum er at finna í gomlu útgávuni, og grønar eru linjur sum eru at finna í núvarandi útgávuni.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/edit.txt
new file mode 100644
index 000000000..2ba92a2d2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/edit.txt
@@ -0,0 +1,2 @@
+Rætta hetta skjal og trýst so á **''[Goym]''** knappin. Sí [[wiki:syntax|snið ábending]] fyri Wiki setningsbygnað. Rætta vinarliga bert hetta skjali um tú kanst **fyrireika** tað. Nýt vinarliga [[playground:playground|sandkassan]] til at testa áðrenn tú rættar í einum røttum skjali. Minst eisini til at brúkar **''[Forskoðan]''** áðrenn tú goymur skjalið.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/editrev.txt
new file mode 100644
index 000000000..274d423af
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/editrev.txt
@@ -0,0 +1,2 @@
+**Tú hevur heinta eina gamla útgávu av hesum skjalinum!** Um tú goymur skjali vilt tú skriva útyvir núverandi við gomlu útgávuni.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/index.txt
new file mode 100644
index 000000000..640edfbc3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/index.txt
@@ -0,0 +1,3 @@
+====== Evnisyvirlit ======
+
+Hetta er eitt yvirlit yvur øll atkomandi skjøl, flokka eftir [[doku>namespaces|navnarúm]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/lang.php
new file mode 100644
index 000000000..a8c241fc1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/lang.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * faroese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Poul J. Clementsen <poul@diku.dk>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Rætta hetta skjal';
+$lang['btn_source'] = 'Vís keldu';
+$lang['btn_show']   = 'Vís skjal';
+$lang['btn_create'] = 'Býrja uppá hetta skjal';
+$lang['btn_search'] = 'Leita';
+$lang['btn_save']   = 'Goym';
+$lang['btn_preview']= 'Forskoðan';
+$lang['btn_top']    = 'Aftur til toppin';
+$lang['btn_newer']  = '<< undan síða';
+$lang['btn_older']  = 'næsta síðe >>';
+$lang['btn_revs']   = 'Gamlar útgávur';
+$lang['btn_recent'] = 'Nýggj broyting';
+$lang['btn_upload'] = 'Legg fílu upp';
+$lang['btn_cancel'] = 'Angra';
+$lang['btn_index']  = 'Evnisyvirlit';
+$lang['btn_secedit']= 'Rætta';
+$lang['btn_login']  = 'Rita inn';
+$lang['btn_logout'] = 'Rita út';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Dagfør';
+$lang['btn_delete'] = 'Strika';
+$lang['btn_back']   = 'Aftur';
+$lang['btn_backlink']    = "Ávísingar afturúr";
+$lang['btn_backtomedia'] = 'Aftur til val av miðlafílu';
+$lang['btn_subscribe']   = 'Tilmelda broytingar';
+$lang['btn_unsubscribe'] = 'Strika tilmelding av broytingum';
+$lang['btn_profile']    = 'Dagføra vangamynd';
+$lang['btn_reset']     = 'Nullstilla';
+$lang['btn_resendpwd'] = 'Send nýtt loyniorð';
+
+$lang['loggedinas'] = 'Ritavur inn sum';
+$lang['user']       = 'Brúkaranavn';
+$lang['pass']       = 'Loyniorð';
+$lang['newpass']    = 'Nýtt loyniorð';
+$lang['oldpass']    = 'Vátta gamalt loyniorð';
+$lang['passchk']    = 'Endurtak nýtt loyniorð';
+$lang['remember']   = 'Minst til loyniorðið hjá mær';
+$lang['fullname']   = 'Navn';
+$lang['email']      = 'T-postur';
+$lang['register']   = 'Melda til';
+$lang['profile']    = 'Brúkara vangamynd';
+$lang['badlogin']   = 'Skeivt brúkaranavn ella loyniorð.';
+$lang['minoredit']  = 'Smærri broytingar';
+
+$lang['regmissing'] = 'Tú skalt fylla út øll øki.';
+$lang['reguexists'] = 'Hetta brúkaranavn er upptiki.';
+$lang['regsuccess'] = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.';
+$lang['regsuccess2']= 'Tú ert nú stovnavur sum brúkari.';
+$lang['regmailfail']= 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.';
+$lang['regbadmail'] = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.';
+$lang['regbadpass'] = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.';
+$lang['regpwmail']  = 'Títt DokuWiki loyniorð';
+$lang['reghere']    = 'Upprætta eina DokuWiki-konto her';
+
+$lang['profna']       = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki';
+$lang['profnochange'] = 'Ongar broytingar, onki tillaga.';
+$lang['profnoempty']  = 'Tómt navn ella t-post adressa er ikki loyvt.';
+$lang['profchanged']  = 'Brúkara vangamynd dagført rætt.';
+
+$lang['pwdforget'] = 'Gloymt títt loyniorð? Fá eitt nýtt';
+$lang['resendna']  = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.';
+$lang['resendpwd'] = 'Send nýtt loyniorð til';
+$lang['resendpwdmissing'] = 'Tú skal filla út øll økir.';
+$lang['resendpwdnouser']  = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.';
+$lang['resendpwdsuccess'] = 'Títt nýggja loyniorð er sent við t-posti.';
+
+$lang['txt_upload']   = 'Vel tí fílu sum skal leggjast upp';
+$lang['txt_filename'] = 'Sláa inn wikinavn (valfrítt)';
+$lang['txt_overwrt']  = 'Yvurskriva verandi fílu';
+$lang['lockedby']     = 'Fyribils læst av';
+$lang['lockexpire']   = 'Lásið ferð úr gildi kl.';
+$lang['willexpire']   = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á '.$lang['btn_preview'].'-knappin fyri at sleppa undan trupulleikum.';
+
+$lang['notsavedyet'] = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.\nYnskir tú at halda fram?';
+$lang['rssfailed']   = 'Eitt brek koma fyri tá roynt var at fáa: ';
+$lang['nothingfound']= 'Leiting gav onki úrslit.';
+
+$lang['mediaselect'] = 'Vel miðlafílu';
+$lang['fileupload']  = 'Legg miðla fílu upp';
+$lang['uploadsucc']  = 'Upp legg av fílu var væl eydna';
+$lang['uploadfail']  = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum';
+$lang['uploadwrong'] = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt';
+$lang['uploadexist'] = 'Fílan er longu til.';
+$lang['deletesucc']  = 'Fílan "%s" er nú strika.';
+$lang['deletefail']  = '"%s" kundi ikki strikast - kanna rættindini.';
+$lang['mediainuse']  = 'Fíla "%s" er ikki strika - hen verður enn nýtt.';
+$lang['namespaces']  = 'Navnarúm';
+$lang['mediafiles']  = 'Atkomandi fílur í';
+
+$lang['reference']   = 'Ávísing til';
+$lang['ref_inuse']   = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:';
+$lang['ref_hidden']  = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Samsvarandi skjøl';
+$lang['toc']        = 'Innihaldsyvirlit';
+$lang['current']    = 'núverandi';
+$lang['yours']      = 'Tín útgáva';
+$lang['diff']       = 'vís broytingar í mun til núverandi útgávu';
+$lang['line']       = 'Linja';
+$lang['breadcrumb'] = 'Leið';
+$lang['youarehere'] = 'Tú ert her';
+$lang['lastmod']    = 'Seinast broytt';
+$lang['by']         = 'av';
+$lang['deleted']    = 'strika';
+$lang['created']    = 'stovna';
+$lang['restored']   = 'gomul útgáva endurstovna';
+$lang['summary']    = 'Samandráttur';
+
+$lang['mail_newpage'] = 'skjal skoyta uppí:';
+$lang['mail_changed'] = 'skjal broytt:';
+
+$lang['js']['nosmblinks'] = "Ávísingar til Windows shares virka bert í Microsoft Internet Explorer.\nTú kanst enn avrita og sata inn slóðina.";
+
+$lang['qb_bold']    = 'Feit';
+$lang['qb_italic']  = 'Skák';
+$lang['qb_underl']  = 'Undurstrika';
+$lang['qb_code']    = 'Skrivimaskinu tekstur';
+$lang['qb_strike']  = 'Gjøgnumstrika';
+$lang['qb_h1']      = 'Stig 1 yvirskrift';
+$lang['qb_h2']      = 'Stig 2 yvirskrift';
+$lang['qb_h3']      = 'Stig 3 yvirskrift';
+$lang['qb_h4']      = 'Stig 4 yvirskrift';
+$lang['qb_h5']      = 'Stig 5 yvirskrift';
+$lang['qb_link']    = 'Innanhýsis slóð';
+$lang['qb_extlink'] = 'Útvortis slóð';
+$lang['qb_hr']      = 'Vatnrætt linja';
+$lang['qb_ol']      = 'Talmerktur listi';
+$lang['qb_ul']      = 'Ótalmerktur listi';
+$lang['qb_media']   = 'Leggja myndir og aðrar fílur afturat';
+$lang['qb_sig']     = 'Set inn undirskrift';
+$lang['qb_smileys'] = 'Smileys';
+$lang['qb_chars']   = 'Sertekn';
+
+$lang['js']['del_confirm']= 'Strika post(ar)?';
+$lang['admin_register']= 'Upprætta nýggjan brúkara';
+
+$lang['metaedit']    = 'Rætta metadáta';
+$lang['metasaveerr'] = 'Brek við skriving av metadáta';
+$lang['metasaveok']  = 'Metadáta goymt';
+$lang['img_backto']  = 'Aftur til';
+$lang['img_title']   = 'Heitið';
+$lang['img_caption'] = 'Myndatekstur';
+$lang['img_date']    = 'Dato';
+$lang['img_fname']   = 'Fílunavn';
+$lang['img_fsize']   = 'Stødd';
+$lang['img_artist']  = 'Myndafólk';
+$lang['img_copyr']   = 'Upphavsrættur';
+$lang['img_format']  = 'Snið';
+$lang['img_camera']  = 'Fototól';
+$lang['img_keywords']= 'Evnisorð';
+
+$lang['subscribe_success']  = 'Skoyt %s uppí tilmeldulistan fyri %s';
+$lang['subscribe_error']    = 'Brek við uppí skoyting av %s til tilmeldulistan fyri %s';
+$lang['subscribe_noaddress']= 'Ongin adressa er knýtt at tíni inn ritan, tú kanst ikki skoytast uppí tilmeldulistan';
+$lang['unsubscribe_success']= 'Strika %s frá tilmeldulistan fyri %s';
+$lang['unsubscribe_error']  = 'Brek við burturtøku av %s frá tilmeldulista fyri %s';
+
+/* auth.class language support */
+$lang['authmodfailed']   = 'Brek við validering av brúkarasamansetingv. Fá samband við umboðsstjóran á hesi wiki.';
+$lang['authtempfail']    = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/locked.txt
new file mode 100644
index 000000000..2e65a064c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/locked.txt
@@ -0,0 +1,3 @@
+====== Læst skjal ======
+
+Hetta skjal er fyribils læst av einum øðrum brúkara. Bíða vinarliga til brúkarin er liðugur við at rætta skjali, ella at lásið er fara úr gildi.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/login.txt
new file mode 100644
index 000000000..31a4c544f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/login.txt
@@ -0,0 +1,3 @@
+====== Rita inn ======
+
+Tú hevur ikki rita inn! Slá inn brúkaranavn og loyniorð. Tín kagi skal loyva at cookies verða goymdar fyri at tú kanst rita inn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/mailtext.txt
new file mode 100644
index 000000000..358a23be0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/mailtext.txt
@@ -0,0 +1,17 @@
+Eitt skjal í tíni DokuWiki bleiv broytt ella skoytt uppí. Her er ein lýsing:
+
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adressa         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gomul útgáva       : @OLDPAGE@
+Nýggj útgáva       : @NEWPAGE@
+Rætti samandráttur : @SUMMARY@
+Brúkari            : @USER@
+
+@DIFF@
+
+
+-- 
+Hesin t-postur var skaptur av DokuWiki á:
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/newpage.txt
new file mode 100644
index 000000000..6eeb1ef31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/newpage.txt
@@ -0,0 +1,3 @@
+====== Hetta skjal er ikki til (enn) ======
+
+Tú fylgdi ein ávísing til eitt skjal sum ikki er til (enn). Tú kanst stovna skjali við at trýsta á **''[Stovna hetta skjal]''** knappin.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/norev.txt
new file mode 100644
index 000000000..d0b463a40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/norev.txt
@@ -0,0 +1,4 @@
+====== Valda útgávan er ikki til ======
+
+Valda útgávan av skjalinum er ikki til! Trýst á knappin **''[Gamlar útgávur]''** fyri at síggja ein lista yvur gamlar útgávur av hesum skjali.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/preview.txt
new file mode 100644
index 000000000..e3e65d805
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/preview.txt
@@ -0,0 +1,4 @@
+====== Forskoðan ======
+
+Hetta er ein forskoðan skjalinum, sum vísur hvussi tað fer at síggja út. Minst til: Tað er //**IKKI**// goymt enn! Um tað sær rætt út, trýst so á **''[Goym]''** knappin
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/read.txt
new file mode 100644
index 000000000..bacf79026
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/read.txt
@@ -0,0 +1,2 @@
+Hetta skjal kan bert læsast. Tú kanst síggja kelduna, men ikki goyma  broytingar í tí. Um tú heldur at hetta er eitt brek, skriva so vinarliga í [[wiki:brek-yvirlit]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/recent.txt
new file mode 100644
index 000000000..4704f3781
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/recent.txt
@@ -0,0 +1,5 @@
+====== Nýggjar broytingar ======
+
+Fylgjandi skjøl er broytt nýliga.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/register.txt
new file mode 100644
index 000000000..24438afe8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/register.txt
@@ -0,0 +1,4 @@
+====== Upprætta eina wiki-konti ======
+
+Fylla út niðanfyrista skema fyri at upprætta eina konti í hesu wiki. Minst til at nýta eina **galdandi t-post-adressu** - títt loyniorð verður sent til tín. Títt brúkaranavn skal verða galdandi [[doku>pagename|skjalanavn]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/resendpwd.txt
new file mode 100644
index 000000000..450202c12
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Send nýtt loyniorð ======
+
+Fyll út øll niðanfyristandandi øki fyri at fáa sent eitt nýtt loyniorð til hesa wiki. Títt nýggja loyniorð verður sent til tí uppgivnu t-postadressu. Brúkaranavn eigur at verða títt wiki brúkaranavn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/revisions.txt
new file mode 100644
index 000000000..dcd845c10
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/revisions.txt
@@ -0,0 +1,3 @@
+====== Gamlar útgávur ======
+
+Her eru tær gomlu útgávurnar av hesum skalinum. Tú kanst venda aftur til eina eldri útgávu av skjalinum við at velja tað niðanfyri, trýst á **''[Rætta hetta skjal]''** knappin, og til síðst goyma skjali.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/searchpage.txt
new file mode 100644
index 000000000..6304a8901
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/searchpage.txt
@@ -0,0 +1,5 @@
+====== Leiting ======
+
+Tú kanst síggja úrslitini av tíni leiting niðanfyri. Um úrslitini ikki innihalda tað sum tú leitaði eftir kanst tú upprætta eitt nýtt skjal við sama navni sum leitingin við at trýsta á **''[Upprætta hetta skjal]''** knappin.
+
+===== Leitiúrslit =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/showrev.txt
new file mode 100644
index 000000000..515f80aad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/showrev.txt
@@ -0,0 +1,2 @@
+**Hetta er ein gomul útgáva av skjalinum!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/stopwords.txt
new file mode 100644
index 000000000..210e85902
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/stopwords.txt
@@ -0,0 +1,87 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+annar
+báðir
+eg
+eingin
+einhvør
+eini
+eitt
+ella
+enn
+fim
+fleiri
+flestir
+frá
+fyri
+fyrr
+fýra
+góður
+hann
+hansara
+har
+hendan
+hennara
+her
+hetta
+hevur
+hon
+hvar
+hvat
+hvussi
+hví
+hvør
+ikki
+inn
+kan
+koma
+lítil
+man
+maður
+meira
+men
+miðan
+niður
+nær
+næstan
+næsti
+nógv
+nýtt
+okkurt
+ongin
+onki
+onkur
+seks
+sindur
+sjey
+smáur
+stórur
+større
+størst
+sum
+síggjast
+tann
+tað
+teir
+tey
+til
+tríggir
+trý
+tvey
+tykkara
+tær
+tí
+tín
+tó
+tú
+um
+undan
+var
+vera
+við
+yvur
+átta
+áðrenn
+øll
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/subscribermail.txt
new file mode 100644
index 000000000..4dca0cda5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/subscribermail.txt
@@ -0,0 +1,17 @@
+Hey!
+
+Síðan @PAGE@ á @TITLE@ wikiuni er blivin broytt.
+Her eru ein lýsing:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Fyri at avmelda broytinga upplýsingar fyri hesa síðu rita inn á wikiuna á
+@DOKUWIKIURL@ , vitja
+@NEWPAGE@
+og vel 'Strika til melda broytingar'.
+
+-- 
+Hesin t-postur var skaptur av DokuWiki á:
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/updateprofile.txt
new file mode 100644
index 000000000..10ee40d30
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Dagføra vangamynd fyri tína konti ======
+
+Tú nýtist bert at fylla út tey øki sum tú ynskjur at broyta. Tú kanst ikki broyta títt brúkaranavn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/wordblock.txt
new file mode 100644
index 000000000..f3a9b9dcd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fo/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM banning ======
+
+Tínar broytingar vóru **ikki** goymdar av tí at tær innihalda eitt ella fleiri óynskt orð. Fá vinarliga samband við admin, um tú heldur at hetta er eitt brek.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/admin.txt
new file mode 100644
index 000000000..4477a512b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Ci-dessous, vous trouverez une liste des tâches administratives disponibles dans DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/adminplugins.txt
new file mode 100644
index 000000000..42a3538ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/adminplugins.txt
@@ -0,0 +1 @@
+===== Modules supplémentaires ===== 
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/backlinks.txt
new file mode 100644
index 000000000..6902b43e3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Pages pointant sur la page en cours ======
+
+Ceci est la liste des pages qui pointent sur la page en cours.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/conflict.txt
new file mode 100644
index 000000000..0cb0a67fb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/conflict.txt
@@ -0,0 +1,6 @@
+====== Une version plus récente existe déjà ======
+
+Une version plus récente du document que vous avez édité existe déjà. Cela se produit lorsqu'un autre utilisateur enregistre le document pendant que vous l'éditez.
+
+Examinez attentivement les différences ci-dessous, et décidez quelle version conserver. Si vous choisissez ''Enregistrer'', votre version sera enregistrée. Cliquez sur ''Annuler'' pour conserver la version actuelle.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/denied.txt
new file mode 100644
index 000000000..20d4d6755
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/denied.txt
@@ -0,0 +1,3 @@
+====== Autorisation refusée ======
+
+Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/diff.txt
new file mode 100644
index 000000000..773695d6d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/diff.txt
@@ -0,0 +1,4 @@
+====== Différences ======
+
+Cette page vous donne les différences entre la révision choisie et la version actuelle de la page.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/draft.txt
new file mode 100644
index 000000000..fbc1609a8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/draft.txt
@@ -0,0 +1,6 @@
+====== Un fichier brouillon a été trouvé ======
+
+La dernière édition de cette page ne s'est pas terminée proprement. Dokuwiki a enregistré automatiquement un brouillon de votre travail que vous pouvez utiliser pour votre édition. Ci-dessous figurent les données enregistrées lors de votre dernière session.
+
+À vous de décider si vous souhaitez //récupérer// votre session d'édition passée, //supprimer// le brouillon enregistré automatiquement ou //annuler// le processus d'édition.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/edit.txt
new file mode 100644
index 000000000..71b0a7c1b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/edit.txt
@@ -0,0 +1,2 @@
+Modifiez cette page et cliquez sur ''Enregistrer''. Voyez le [[wiki:syntax|Guide de la mise en page]] pour une aide à propos du format. Veuillez ne modifier cette page que si vous pouvez l'**améliorer**. Si vous souhaitez faire des tests, faites vos premiers pas dans le [[playground:playground|bac à sable]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/editrev.txt
new file mode 100644
index 000000000..1a7e0f434
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/editrev.txt
@@ -0,0 +1,2 @@
+**Vous affichez une ancienne révision du document !** Si vous l'enregistrez vous créerez une nouvelle version avec ce contenu.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/index.txt
new file mode 100644
index 000000000..14446681e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Voici un index de toutes les pages disponibles, triées par [[doku>namespaces|catégorie]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/install.html
new file mode 100644
index 000000000..a2c29d022
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/install.html
@@ -0,0 +1,19 @@
+<p>Cette page vous assiste dans la premi&egrave;re installation et la
+configuration de <a href="http://dokuwiki.org">DokuWiki</a>.
+Pour plus d'information sur cet installeur reportez vous &agrave; sa
+<a href="http://dokuwiki.org/installer">page de
+documentation</a>.</p>
+
+<p>DokuWiki utilise des fichiers ordinaires pour stocker les pages du
+wiki et les autres informations associ&eacute;es &agrave; ces pages
+(tel que images, index de recherche, anciennes r&eacute;visions, etc). Pour fonctionner correctement DokuWiki <strong>doit</strong> avoir acc&egrave;s en &eacute;criture aux diff&eacute;rents r&eacute;pertoires qui contiennent ces fichiers. L'installeur n'est pas capable de modifier les permissions sur les r&eacute;pertoires. Ceci doit &ecirc;tre effectu&eacute; directement sur la ligne de commande de votre shell, ou, si vous &ecirc;tes h&eacute;berg&eacute;, via FTP ou votre panneau de contr&ocirc;le (tel que cPanel).</p>
+
+<p>Cet installeur va param&eacute;trer votre configuration de DokuWiki pour des <acronym title="access control list">ACL</acronym>, qui permettront l'acc&egrave;s &agrave; un login administrateur et l'acc&egrave;s au menu d'administration de DokuWiki pour l'ajout de modules externes, la gestion d'utilisateurs, la gestion de l'acc&egrave;s aux pages du wiki et les changements de param&egrave;tres de configuration. Il n'est pas n&eacute;cessaire au fonctionnement de DokuWiki, n&eacute;anmoins il facilite l'administration de DokuWiki.</p>
+
+<p>Les utilisateurs exp&eacute;riment&eacute;s ou ceux
+n&eacute;cessitant des param&eacute;trages particuliers devraient se
+reporter aux liens suivants pour les d&eacute;tails concernant les <a
+href="http://dokuwiki.org/install">instructions
+d'installation</a> et les <a
+href="http://dokuwiki.org/config">param&egrave;tres de
+configuration</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/lang.php
new file mode 100644
index 000000000..6a0f408b8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/lang.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * french language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
+ * @author Antoine Fixary <antoine.fixary@freesbee.fr>
+ * @author cumulus <pta-n56@myamail.com>
+ * @author Gwenn Gueguen <contact@demisel.net>
+ * @author Guy Brand <gb@isis.u-strasbg.fr>
+ * @author Fabien Chabreuil <fabien@integralpersonality.com>
+ * @author Stéphane Chamberland <stephane.chamberland@ec.gc.ca>
+ * @author Delassaux Julien <julien@delassaux.fr>
+ * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
+ * @author gb@isis.u-strasbg.fr
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri <guillaume.turri@gmail.com>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author olivier duperray <duperray.olivier@laposte.net>
+ * @author Vincent Feltz <psycho@feltzv.fr>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Éditer cette page';
+$lang['btn_source']            = 'Afficher le texte source';
+$lang['btn_show']              = 'Afficher la page';
+$lang['btn_create']            = 'Créer cette page';
+$lang['btn_search']            = 'Rechercher';
+$lang['btn_save']              = 'Enregistrer';
+$lang['btn_preview']           = 'Aperçu';
+$lang['btn_top']               = 'Haut de page';
+$lang['btn_newer']             = '<< plus récent';
+$lang['btn_older']             = 'moins récent >>';
+$lang['btn_revs']              = 'Anciennes révisions';
+$lang['btn_recent']            = 'Derniers changements';
+$lang['btn_upload']            = 'Envoyer';
+$lang['btn_cancel']            = 'Annuler';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Éditer';
+$lang['btn_login']             = 'Connexion';
+$lang['btn_logout']            = 'Déconnexion';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Rafraîchir';
+$lang['btn_delete']            = 'Effacer';
+$lang['btn_back']              = 'Retour';
+$lang['btn_backlink']          = 'Liens vers cette page';
+$lang['btn_backtomedia']       = 'Retour à la sélection du fichier média';
+$lang['btn_subscribe']         = 'S\'abonner à la page';
+$lang['btn_unsubscribe']       = 'Se désabonner de la page';
+$lang['btn_subscribens']       = 'S\'abonner à la catégorie';
+$lang['btn_unsubscribens']     = 'Se désabonner de la catégorie';
+$lang['btn_profile']           = 'Mettre à jour le profil';
+$lang['btn_reset']             = 'Réinitialiser';
+$lang['btn_resendpwd']         = 'Envoyer le mot de passe';
+$lang['btn_draft']             = 'Éditer brouillon';
+$lang['btn_recover']           = 'Récupérer brouillon';
+$lang['btn_draftdel']          = 'Effacer brouillon';
+$lang['btn_revert']            = 'Restaurer';
+$lang['loggedinas']            = 'Connecté en tant que ';
+$lang['user']                  = 'Utilisateur';
+$lang['pass']                  = 'Mot de passe';
+$lang['newpass']               = 'Nouveau mot de passe';
+$lang['oldpass']               = 'Mot de passe actuel';
+$lang['passchk']               = 'Répéter nouveau mot de passe';
+$lang['remember']              = 'Mémoriser';
+$lang['fullname']              = 'Nom';
+$lang['email']                 = 'Adresse de courriel';
+$lang['register']              = 'S\'enregistrer';
+$lang['profile']               = 'Profil utilisateur';
+$lang['badlogin']              = 'L\'utilisateur ou le mot de passe est incorrect.';
+$lang['minoredit']             = 'Mineur';
+$lang['draftdate']             = 'Brouillon auto-enregistré le';
+$lang['nosecedit']             = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
+$lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.';
+$lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà pris';
+$lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
+$lang['regsuccess2']           = 'L\'utilisateur a été créé.';
+$lang['regmailfail']           = 'Il semble y avoir un problème à l\'envoi du courriel. Contactez l\'administrateur.';
+$lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte - si vous pensez que c\'est une erreur, contactez l\'administrateur.';
+$lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, recommencez SVP.';
+$lang['regpwmail']             = 'Votre mot de passe DokuWiki';
+$lang['reghere']               = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
+$lang['profna']                = 'Ce wiki ne permet pas de modifier les profils';
+$lang['profnochange']          = 'Pas de changement, rien à faire.';
+$lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est pas permis.';
+$lang['profchanged']           = 'Mise à jour du profil réussie.';
+$lang['pwdforget']             = 'Mot de passe oublié ? Faites-vous envoyer votre mot de passe ';
+$lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
+$lang['resendpwd']             = 'Renvoyer le mot de passe de';
+$lang['resendpwdmissing']      = 'Désolé, vous devez remplir tous les champs.';
+$lang['resendpwdnouser']       = 'Désolé, cet utilisateur est introuvable dans notre base.';
+$lang['resendpwdbadauth']      = 'Désolé, ce code d\'authentification est invalide. Assurez vous d\'avoir utilisé le lien de confirmation.';
+$lang['resendpwdconfirm']      = 'Un lien de confirmation vous a été envoyé par courriel.';
+$lang['resendpwdsuccess']      = 'Votre nouveau mot de passe vous a été expédié par courriel.';
+$lang['license']               = 'Sauf mention contraire, le contenu de ce wiki est placé sous la licence suivante:';
+$lang['licenseok']             = 'Note : En éditant cette page vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
+$lang['searchmedia']           = 'Chercher le nom de fichier :';
+$lang['searchmedia_in']        = 'Chercher dans %s';
+$lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
+$lang['txt_filename']          = 'Donnez un "wikiname" (optionnel) ';
+$lang['txt_overwrt']           = 'Écraser le fichier cible';
+$lang['lockedby']              = 'Actuellement bloqué par';
+$lang['lockexpire']            = 'Le blocage expire à';
+$lang['willexpire']            = 'Votre blocage pour modifier cette page expire dans une minute.\nPour éviter les conflits, utiliser le bouton Aperçu pour réinitialiser le minuteur.';
+$lang['notsavedyet']           = 'Les changements non enregistrés seront perdus.\nVoulez-vous vraiment continuer ?';
+$lang['rssfailed']             = 'Une erreur s\'est produite en récupérant ce flux : ';
+$lang['nothingfound']          = 'Pas de réponse.';
+$lang['mediaselect']           = 'Sélection de fichier';
+$lang['fileupload']            = 'Envoi de fichier';
+$lang['uploadsucc']            = 'Envoi réussi';
+$lang['uploadfail']            = 'L\'envoi n\'a pas réussi. Les permissions sont-elles correctes ?';
+$lang['uploadwrong']           = 'Envoi refusé. Cette extension de fichier est interdite !';
+$lang['uploadexist']           = 'Le fichier existe. Envoi avorté.';
+$lang['uploadbadcontent']      = 'Le contenu envoyé ne correspond pas à l\'extension du fichier %s.';
+$lang['uploadspam']            = 'L\'envoi a été bloqué par la liste noire antispam.';
+$lang['uploadxss']             = 'L\'envoi a été bloqué car son contenu est peut-être malveillant.';
+$lang['uploadsize']            = 'Le fichier envoyé était trop gros. (max. %s)';
+$lang['deletesucc']            = 'Le fichier "%s" a été effacé.';
+$lang['deletefail']            = 'Le fichier "%s" n\'a pu être effacé - vérifier les permissions.';
+$lang['mediainuse']            = 'Le fichier "%s" n\'a pas été effacé - il est en cours d\'utilisation.';
+$lang['namespaces']            = 'Catégories';
+$lang['mediafiles']            = 'Fichiers disponibles dans';
+$lang['js']['searchmedia']     = 'Chercher des fichiers';
+$lang['js']['keepopen']        = 'Gardez la fenêtre ouverte pendant la sélection';
+$lang['js']['hidedetails']     = 'Masquer détails';
+$lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.
+Vous pouvez toujours faire un copier/coller du lien.';
+$lang['js']['linkwiz']         = 'Assistant Lien';
+$lang['js']['linkto']          = 'Lien vers:';
+$lang['js']['del_confirm']     = 'Effacer cette entrée ?';
+$lang['js']['mu_btn']          = 'Envoyer plusieurs fichiers en même temps';
+$lang['mediausage']            = 'Utilisez la syntaxe suivante pour faire référence à ce fichier :';
+$lang['mediaview']             = 'Voir fichier original';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Envoyer un fichier dans la catégorie courante ici. Pour créer des sous-catégories, préfixez le nom du fichier par le nom de la sous-catégorie séparée par un double point.';
+$lang['mediaextchange']        = 'Extension du fichier changée de .%s en .%s !';
+$lang['reference']             = 'Références pour';
+$lang['ref_inuse']             = 'Le fichier ne peut être effacé car il est utilisé par les pages suivantes :';
+$lang['ref_hidden']            = 'Des références existent dans des pages que vous n\'avez pas la permission de lire';
+$lang['hits']                  = 'occurrences trouvées';
+$lang['quickhits']             = 'Pages trouvées ';
+$lang['toc']                   = 'Table des matières';
+$lang['current']               = 'version actuelle';
+$lang['yours']                 = 'Votre version';
+$lang['diff']                  = 'Différences avec la version actuelle';
+$lang['diff2']                 = 'Différences entre les versions sélectionnées';
+$lang['line']                  = 'Ligne';
+$lang['breadcrumb']            = 'Piste';
+$lang['youarehere']            = 'Vous êtes ici';
+$lang['lastmod']               = 'Dernière modification';
+$lang['by']                    = 'par';
+$lang['deleted']               = 'effacée';
+$lang['created']               = 'créée';
+$lang['restored']              = 'ancienne révision restaurée';
+$lang['external_edit']         = 'édition externe';
+$lang['summary']               = 'Résumé';
+$lang['noflash']               = 'L"extension <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> est nécessaire pour afficher ce contenu.';
+$lang['download']              = 'Télécharger un extrait';
+$lang['mail_newpage']          = 'page ajoutée :';
+$lang['mail_changed']          = 'page changée :';
+$lang['mail_new_user']         = 'nouvel utilisateur :';
+$lang['mail_upload']           = 'fichier envoyé :';
+$lang['qb_bold']               = 'Gras';
+$lang['qb_italic']             = 'Italique';
+$lang['qb_underl']             = 'Souligné';
+$lang['qb_code']               = 'Code';
+$lang['qb_strike']             = 'Texte barré';
+$lang['qb_h1']                 = 'En-tête 1';
+$lang['qb_h2']                 = 'En-tête 2';
+$lang['qb_h3']                 = 'En-tête 3';
+$lang['qb_h4']                 = 'En-tête 4';
+$lang['qb_h5']                 = 'En-tête 5';
+$lang['qb_h']                  = 'Titre';
+$lang['qb_hs']                 = 'Sélectionner la ligne de titre';
+$lang['qb_hplus']              = 'Titre supérieur';
+$lang['qb_hminus']             = 'Titre inférieur';
+$lang['qb_hequal']             = 'Titre de même niveau';
+$lang['qb_link']               = 'Lien interne';
+$lang['qb_extlink']            = 'Lien externe';
+$lang['qb_hr']                 = 'Ligne horizontale';
+$lang['qb_ol']                 = 'Liste numérotée';
+$lang['qb_ul']                 = 'Liste à puce';
+$lang['qb_media']              = 'Ajouter des images et autres fichiers';
+$lang['qb_sig']                = 'Insérer une signature';
+$lang['qb_smileys']            = 'Émoticons';
+$lang['qb_chars']              = 'Caractères spéciaux';
+$lang['upperns']               = 'Aller à la catégorie parente';
+$lang['admin_register']        = 'Ajouter un nouvel utilisateur';
+$lang['metaedit']              = 'Éditer les métadonnées';
+$lang['metasaveerr']           = 'Erreur à l\'écriture des métadonnées';
+$lang['metasaveok']            = 'Métadonnées enregistrées';
+$lang['img_backto']            = 'Retour à';
+$lang['img_title']             = 'Titre';
+$lang['img_caption']           = 'Légende';
+$lang['img_date']              = 'Date';
+$lang['img_fname']             = 'Nom de fichier';
+$lang['img_fsize']             = 'Taille';
+$lang['img_artist']            = 'Auteur';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Appareil photo';
+$lang['img_keywords']          = 'Mots clef';
+$lang['subscribe_success']     = 'Ajout de %s à la liste d\'abonnés de %s';
+$lang['subscribe_error']       = 'Erreur à l\'ajout de %s à la liste d\'abonnés de %s';
+$lang['subscribe_noaddress']   = 'Aucune adresse associée à votre nom d\'utilisateur, impossible de vous ajouter à la liste d\'abonnés';
+$lang['unsubscribe_success']   = 'Suppression de %s de la liste d\'abonnés de %s';
+$lang['unsubscribe_error']     = 'Erreur à la suppression de %s de la liste d\'abonnés de %s';
+$lang['authmodfailed']         = 'Mauvais paramétrage de l\'authentification. Merci d\'informer l\'administrateur du Wiki.';
+$lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'informer l\'administrateur du Wiki.';
+$lang['i_chooselang']          = 'Choisissez votre langue';
+$lang['i_installer']           = 'Installeur DokuWiki';
+$lang['i_wikiname']            = 'Nom du Wiki';
+$lang['i_enableacl']           = 'Activer les ACL (recommandé)';
+$lang['i_superuser']           = 'Super-utilisateur';
+$lang['i_problems']            = 'L\'installeur a détecté les problèmes indiqués ci-dessous. Vous ne pouvez poursuivre tant qu\'ils n\'auront pas été corrigés.';
+$lang['i_modified']            = 'Pour des raisons de sécurité ce script ne fonctionne qu\'avec une installation neuve et non modifiée de DokuWiki. Vous devriez ré-extraire les fichiers depuis le paquet téléchargé ou consulter les <a href="http://dokuwiki.org/install">instructions d\'installation de DokuWiki</a>';
+$lang['i_funcna']              = 'La fonction PHP <code>%s</code> n\'est pas disponible. Peut-être que votre hébergeur l\'a désactivée ?';
+$lang['i_phpver']              = 'Votre version de PHP (<code>%s</code>) est antérieure à la version requise (<code>%s</code>. Vous devez mettre à jour votre installation de PHP.';
+$lang['i_permfail']            = '<code>%s</code> n\'est pas accessible en écriture pour DokuWiki. Vous devez corriger les permissions de ce répertoire !';
+$lang['i_confexists']          = '<code>%s</code> existe déjà';
+$lang['i_writeerr']            = 'Impossible de créer <code>%s</code>. Vous devez vérifier les permissions des répertoires/fichiers et créer le fichier manuellement.';
+$lang['i_badhash']             = 'dokuwiki.php non reconnu ou modifié (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valeur illégale ou vide';
+$lang['i_success']             = 'L\'installation s\'est terminée avec succès. Vous pouvez maintenant supprimer le fichier install.php. Continuer avec <a href="doku.php">votre nouveau DokuWiki</a>.';
+$lang['i_failure']             = 'Des erreurs sont survenues lors de l\'écriture des fichiers de configuration. Il vous faudra les corriger manuellement avant de pouvoir utiliser <a href="doku.php">votre nouveau DokuWiki</a>.';
+$lang['i_policy']              = 'Politique d\'ACL initiale';
+$lang['i_pol0']                = 'Wiki ouvert (lecture, écriture, envoi de fichiers pour tout le monde)';
+$lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écriture et envoi de fichiers pour les utilisateurs enregistrés)';
+$lang['i_pol2']                = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)';
+$lang['i_retry']               = 'Réessayer';
+$lang['mu_intro']              = 'Ici vous pouvez envoyer plusieurs fichiers en même temps. Cliquez sur le bouton parcourir pour les ajouter. Cliquez sur envoyer lorsque c\'est prêt. ';
+$lang['mu_gridname']           = 'Nom du fichier';
+$lang['mu_gridsize']           = 'Taille';
+$lang['mu_gridstat']           = 'État';
+$lang['mu_namespace']          = 'Catégorie';
+$lang['mu_browse']             = 'Parcourir';
+$lang['mu_toobig']             = 'Trop gros';
+$lang['mu_ready']              = 'Prêt à envoyer';
+$lang['mu_done']               = 'Terminé';
+$lang['mu_fail']               = 'Échoué';
+$lang['mu_authfail']           = 'Session expirée';
+$lang['mu_progress']           = '@PCT@% envoyé';
+$lang['mu_filetypes']          = 'Types de fichiers acceptés';
+$lang['mu_info']               = 'fichiers envoyés.';
+$lang['mu_lasterr']            = 'Dernière erreur : ';
+$lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein du namespace <b>%s</b>. Vous pouvez aussi <a href="%s">voir les récentes modifications sur tout le wiki</a>.';
+$lang['years']                 = 'il y a %d ans';
+$lang['months']                = 'il y a %d mois';
+$lang['weeks']                 = 'il y a %d semaines';
+$lang['days']                  = 'il y a %d jours';
+$lang['hours']                 = 'il y a %d heures';
+$lang['minutes']               = 'il y a %d minutes';
+$lang['seconds']               = 'il y a %d secondes';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/locked.txt
new file mode 100644
index 000000000..ac8eb4c4b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/locked.txt
@@ -0,0 +1,3 @@
+====== Page bloquée ======
+
+Cette page est actuellement bloquée pour édition par un autre utilisateur. Vous devez attendre que l'autre utilisateur ait terminé ou que le blocage de la page expire.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/login.txt
new file mode 100644
index 000000000..c8d40c86d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/login.txt
@@ -0,0 +1,3 @@
+====== Connexion ======
+
+Vous n'êtes pas connecté ! Entrez vos identifiants ci-dessous pour vous connecter. Votre navigateur doit accepter les cookies pour pouvoir vous connecter.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/mailtext.txt
new file mode 100644
index 000000000..0b87616b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/mailtext.txt
@@ -0,0 +1,18 @@
+Une page dans votre Wiki a été ajoutée ou modifiée. Voici les
+détails :
+
+Date              : @DATE@
+Navigateur        : @BROWSER@
+Adresse IP        : @IPADDRESS@
+Nom d'hôte        : @HOSTNAME@
+Ancienne révision : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+Résumé            : @SUMMARY@
+Utilisateur       : @USER@
+
+@DIFF@
+
+
+-- 
+Ce message a été généré par DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/newpage.txt
new file mode 100644
index 000000000..3d834ffd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/newpage.txt
@@ -0,0 +1,4 @@
+====== Cette page n'existe pas encore ======
+
+Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos droits sont suffisants, vous pouvez utiliser le bouton ''Créer cette page''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/norev.txt
new file mode 100644
index 000000000..65984ef9c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/norev.txt
@@ -0,0 +1,4 @@
+====== Révision non trouvée ======
+
+La révision demandée n'existe pas. Utilisez le bouton 'Anciennes révisions' pour une liste des révisions de ce document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/preview.txt
new file mode 100644
index 000000000..26fbcd9c2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/preview.txt
@@ -0,0 +1,4 @@
+====== Aperçu ======
+
+Ceci est un aperçu de votre document. Attention ! Il n'est **pas encore enregistré** !
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/pwconfirm.txt
new file mode 100644
index 000000000..432b5f102
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/pwconfirm.txt
@@ -0,0 +1,15 @@
+Bonjour @FULLNAME@ !
+
+Quelqu'un a demandé un nouveau mot de passe pour votre login
+@TITLE@ sur @DOKUWIKIURL@
+
+Si vous n'êtes pas à l'origine de cette requête d'un nouveau mot de
+passe, ignorez ce message.
+
+Pour confirmer que cette requête émane bien de vous, merci de suivre le lien ci-dessous.
+
+@CONFIRM@
+
+-- 
+Ce message a été généré par DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/read.txt
new file mode 100644
index 000000000..faa756e8b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/read.txt
@@ -0,0 +1,2 @@
+Cette page est en lecture seule. Vous pouvez afficher le texte source, mais pas le modifier. Contactez votre administrateur si vous pensez qu'il s'agit d'une erreur.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/recent.txt
new file mode 100644
index 000000000..b41972fc1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/recent.txt
@@ -0,0 +1,5 @@
+====== Derniers changements ======
+
+Les pages suivantes ont été modifiées récemment.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/register.txt
new file mode 100644
index 000000000..e2d02f55c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/register.txt
@@ -0,0 +1,3 @@
+====== S'enregistrer comme nouvel utilisateur ======
+
+Remplissez toutes les informations ci-dessous pour vous créer un compte sur ce Wiki. Assurez-vous de fournir une **adresse de courriel valide** car votre mot de passe sera envoyé à cette adresse. Le nom d'utilisateur doit être un [[doku>pagename|nom de page]] valide.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/registermail.txt
new file mode 100644
index 000000000..960aedf2d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/registermail.txt
@@ -0,0 +1,14 @@
+Un nouvel utilisateur s'est enregistré. Voici les détails :
+
+Utilisateur         : @NEWUSER@
+Nom         : @NEWNAME@
+Adresse de courriel : @NEWEMAIL@
+
+Date                : @DATE@
+Navigateur          : @BROWSER@
+Adresse IP          : @IPADDRESS@
+Nom d'hôte          : @HOSTNAME@
+
+-- 
+Ce message a été généré par DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/resendpwd.txt
new file mode 100644
index 000000000..2cfbed617
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Envoyer un nouveau mot de passe ======
+
+Veuillez compléter les champs ci dessous pour obtenir un nouveau mot de passe pour votre compte dans ce wiki. Un lien de confirmation vous sera envoyé à l'adresse de courriel utilisée lors de votre enregistrement.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/revisions.txt
new file mode 100644
index 000000000..c9149ef9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/revisions.txt
@@ -0,0 +1,4 @@
+====== Anciennes révisions ======
+
+Voici les anciennes révisions de la page en cours. Pour revenir à une ancienne révision, sélectionnez-la ci-dessous, cliquez sur le bouton ''Éditer cette page'' et enregistrez-la.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/searchpage.txt
new file mode 100644
index 000000000..8355a2f9d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/searchpage.txt
@@ -0,0 +1,5 @@
+====== Recherche ======
+
+Voici les résultats de votre recherche. Si vous n'avez pas trouvé ce que vous cherchiez, vous pouvez créer ou éditer la page correspondante à votre requête en cliquant sur le bouton approprié.
+
+===== Résultats =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/showrev.txt
new file mode 100644
index 000000000..2e36199b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/showrev.txt
@@ -0,0 +1,2 @@
+**Ceci est une ancienne révision du document !**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/stopwords.txt
new file mode 100644
index 000000000..981bae26b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/stopwords.txt
@@ -0,0 +1,112 @@
+# Cette liste regroupe des mots ignorés par l'indexeur
+# Chaque ligne comporte un mot
+# Les fins de ligne de ce fichier doivent être de type UNIX
+# Les mots de moins de 3 lettres sont ignorés par défaut.
+# Cette liste est basée sur http://www.ranks.nl/stopwords/
+alors
+aucuns
+aussi
+autre
+avant
+avec
+avoir
+bon
+car
+cela
+ces
+ceux
+chaque
+comme
+comment
+dans
+des
+dedans
+dehors
+depuis
+deux
+devrait
+doit
+donc
+dos
+droite
+début
+elle
+elles
+encore
+essai
+est
+fait
+faites
+fois
+font
+force
+haut
+hors
+ici
+ils
+juste
+les
+leur
+là
+maintenant
+mais
+mes
+mine
+moins
+mon
+mot
+même
+nommés
+notre
+nous
+nouveaux
+où
+par
+parce
+parole
+pas
+personnes
+peut
+peu
+pièce
+plupart
+pour
+pourquoi
+quand
+que
+quel
+quelle
+quelles
+quels
+qui
+sans
+ses
+seulement
+sien
+son
+sont
+sous
+soyez
+sujet
+sur
+tandis
+tellement
+tels
+tes
+ton
+tous
+tout
+trop
+très
+valeur
+voie
+voient
+vont
+votre
+vous
+ça
+étaient
+état
+étions
+été
+être
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/subscribermail.txt
new file mode 100644
index 000000000..514f9cf5d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/subscribermail.txt
@@ -0,0 +1,17 @@
+Bonjour !
+
+La page @PAGE@ dans le wiki @TITLE@ a changé.
+Voici les modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pour vous désabonner de cette page, connectez vous via
+@DOKUWIKIURL@ et visualisez la page
+@NEWPAGE@
+puis choisissez 'Ne pas notifier les modifications'.
+
+-- 
+Ce message a été généré par Dokuwiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/updateprofile.txt
new file mode 100644
index 000000000..623d75e88
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Mise à jour de votre profil ======
+
+Ne complétez que les champs que vous souhaitez modifier. Vous ne pouvez pas modifier votre nom d'utilisateur.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/uploadmail.txt
new file mode 100644
index 000000000..3a186b554
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/uploadmail.txt
@@ -0,0 +1,14 @@
+Un fichier a été envoyé dans votre DokuWiki. En voici les détails :
+
+Fichier     : @MEDIA@
+Date        : @DATE@
+Navigateur  : @BROWSER@
+Adresse IP  : @IPADDRESS@
+Nom d'hôte  : @HOSTNAME@
+Taille      : @SIZE@
+Type MIME   : @MIME@
+Utilisateur : @USER@
+
+-- 
+Ce message a été généré par DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/wordblock.txt
new file mode 100644
index 000000000..ae5962a80
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/fr/wordblock.txt
@@ -0,0 +1,4 @@
+====== Changement bloqué ======
+
+Vos changements n'ont **pas été enregistrés** car ils contiennent un ou plusieurs mots bloqués. Si vous avez essayé de spammer le Wiki -- mauvaise idée ! Si vous pensez que c'est une erreur, contactez l'administrateur de ce Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/admin.txt
new file mode 100644
index 000000000..a5bb1753d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/admin.txt
@@ -0,0 +1,4 @@
+====== Administración ======
+
+A continuación pode encontrar unha lista de tarefas administrativas dispoñíbeis no DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/adminplugins.txt
new file mode 100644
index 000000000..e791265e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins adicionais =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/backlinks.txt
new file mode 100644
index 000000000..90066d032
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Ligazóns entrantes ======
+
+Isto é unha listaxe de páxinas que parecen estar vinculadas á páxina actual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/conflict.txt
new file mode 100644
index 000000000..e63e5b216
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/conflict.txt
@@ -0,0 +1,6 @@
+====== Hai unha versión máis nova ======
+
+Hai unha versión máis nova do documento que editou. Isto sucede cando outra persoa usuaria alterou o documento mentres vostede o estaba a editar.
+
+Examine as diferenzas que se mostran abaixo detalladamente e despois decida a versión que quere manter. Se selecciona ''Gardar'', gardarase a súa versión. Prema en ''Cancelar'' para manter a versión actual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/denied.txt
new file mode 100644
index 000000000..8d388a8bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/denied.txt
@@ -0,0 +1,4 @@
+====== Permiso denegado ======
+
+Sentímolo, mais non ten os permisos suficientes para continuar. É posíbel que esquecese iniciar unha sesión.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/diff.txt
new file mode 100644
index 000000000..5660e4025
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/diff.txt
@@ -0,0 +1,4 @@
+====== Diferenzas ======
+
+Isto mostra as diferenzas entre a revisión seleccionada e a versión actual da páxina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/draft.txt
new file mode 100644
index 000000000..8e2aa19f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/draft.txt
@@ -0,0 +1,6 @@
+====== Encontrouse un ficheiro de borrador ======
+
+A súa última sesión de edición desta páxina non terminou de modo correcto. O DokuWiki gardou automaticamente un borrador durante o seu traballo que agora pode usar para continuar coa edición. A continuación pode ver os datos que foron gardados durante a súa última sesión.
+
+Por favor, escolla entre se se quere //Recuperar// a súa sesión de edición perdida, //Eliminar// o borrador gardado automaticamente ou //Cancelar// o proceso de edición.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/edit.txt
new file mode 100644
index 000000000..9e2061b51
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/edit.txt
@@ -0,0 +1,2 @@
+Edite a páxina e prema en ''Gardar''. Vexa a páxina [[wiki:syntax|sintaxe]] para aprender a sintaxe da Wiki. Edite a páxina só se pode **mellorala**. Se quere facer probas, aprenda como efectuar os seus primeiros pasos no [[playground:playground|campo de xogo]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/editrev.txt
new file mode 100644
index 000000000..c582fc3d0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/editrev.txt
@@ -0,0 +1,2 @@
+**Cargou unha revisión antiga do documento!** Se o garda, creará unha versión nova con eses datos.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/index.txt
new file mode 100644
index 000000000..b0b100bda
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/index.txt
@@ -0,0 +1,4 @@
+====== Índice ======
+
+Isto é un índice de todas as páxinas dispoñíbeis, ordenadas por [[doku>namespaces|nomes de espazo]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/install.html
new file mode 100644
index 000000000..017abad8f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/install.html
@@ -0,0 +1,25 @@
+<p>Esta páxina é unha axuda para a primeira instalación e configuración do
+<a href="http://dokuwiki.org">Dokuwiki</a>. Se quere máis información
+sobre este instalador, está dispoñíbel na súa propia
+<a href="http://dokuwiki.org/installer">páxina de documentación</a>.</p>
+
+<p>O DokuWiki usa ficheiros normais para o almacenamento das páxinas do wiki
+e outra información asociada ás mesmas (por ex. imaxes, índices de procura, 
+revisións antigas etc.). Por iso, para poder operar correctamente, o DokuWiki
+<strong>precisa</strong> ter acceso de escritura nos directorios que conteñen
+eses ficheiros. Este instalador non é quen de configurar os permisos dos directorios.
+Isto debe facerse normalmente de xeito directo na liña de comandos ou, se está a 
+usar unha hospedaxe, a través do FTP ou do panel de control da súa hospedaxe (por ex.
+o cPanel).</p>
+
+<p>Este instalador configurará o seu DokuWiki para o uso da
+<acronym title="access control list">ACL</acronym>, o cal lle permitirá á persoa administradora
+iniciar unha sesión e acceder ao menú de administración do DokuWiki para instalar plugins,
+xestionar as persoas usuarias e os accesos ás páxinas do wiki; ademais de modificar a configuración.
+Non é imprescindíbel para o funcionamento do DokuWiki, mais fai moito máis doada a
+administración do mesmo.</p>
+
+<p>As persoas usuarias expertas ou con requisitos especiais de configuración poden visitar
+as seguintes ligazóns para obter os pormenores relativos ás
+<a href="http://dokuwiki.org/install">instruccións de instalación</a>
+e á <a href="http://dokuwiki.org/config">configuración</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/lang.php
new file mode 100644
index 000000000..2f34a02a0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/lang.php
@@ -0,0 +1,243 @@
+<?php
+/**
+ * galician language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
+ * @author Tagen Ata <localizacion@tagenata>
+ * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta páxina';
+$lang['btn_source']            = 'Mostrar o código da páxina';
+$lang['btn_show']              = 'Mostrar a páxina';
+$lang['btn_create']            = 'Crear esta páxina';
+$lang['btn_search']            = 'Procurar';
+$lang['btn_save']              = 'Gardar';
+$lang['btn_preview']           = 'Previsualizar';
+$lang['btn_top']               = 'Comezo da páxina';
+$lang['btn_newer']             = '<< máis recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisións antigas';
+$lang['btn_recent']            = 'Cambios recentes';
+$lang['btn_upload']            = 'Subir';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Iniciar unha sesión';
+$lang['btn_logout']            = 'Terminar a sesión';
+$lang['btn_admin']             = 'Administración';
+$lang['btn_update']            = 'Actualizar';
+$lang['btn_delete']            = 'Borrar';
+$lang['btn_back']              = 'Atrás';
+$lang['btn_backlink']          = 'Ligazón entrante';
+$lang['btn_backtomedia']       = 'Volver á Selección de Ficheiros multimedia';
+$lang['btn_subscribe']         = 'Avisar dos cambios na páxina';
+$lang['btn_unsubscribe']       = 'Non avisar dos cambios na páxina';
+$lang['btn_subscribens']       = 'Avísar dos cambios nos Nomes de espazo';
+$lang['btn_unsubscribens']     = 'Non avisar dos cambios nos Nomes de espazo';
+$lang['btn_profile']           = 'Actualizar o perfil';
+$lang['btn_reset']             = 'Reiniciar';
+$lang['btn_resendpwd']         = 'Enviar un contrasinal novo';
+$lang['btn_draft']             = 'Editar o borrador';
+$lang['btn_recover']           = 'Recuperar o borrador';
+$lang['btn_draftdel']          = 'Eliminar o borrador';
+$lang['btn_revert']            = 'Restaurar';
+$lang['loggedinas']            = 'Iniciou unha sesión como';
+$lang['user']                  = 'Nome de persoa usuaria';
+$lang['pass']                  = 'Contrasinal';
+$lang['newpass']               = 'Contrasinal novo';
+$lang['oldpass']               = 'Confirmar o contrasinal actual';
+$lang['passchk']               = 'de novo';
+$lang['remember']              = 'Lémbrame';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'Correo';
+$lang['register']              = 'Rexístrate';
+$lang['profile']               = 'Perfil de persoa usuaria';
+$lang['badlogin']              = 'Sentímolo, mais o nome de persoa usuaria ou o contrasinal non son correctos.';
+$lang['minoredit']             = 'Cambios menores';
+$lang['draftdate']             = 'O borrador gardouse automaticamente en';
+$lang['nosecedit']             = 'A páxina cambiou, no entanto, a información da sección estaba desactualizada, polo que se cargou a páxina completa en seu lugar.';
+$lang['regmissing']            = 'Sentímolo, mais ten que encher todos os campos.';
+$lang['reguexists']            = 'Sentímolo, mais xa existe unha persoa usuaria con ese nome.';
+$lang['regsuccess']            = 'A persoa usuaria foi creada e o contrasinal enviado por correo electrónico.';
+$lang['regsuccess2']           = 'A persoa usuaria foi creada.';
+$lang['regmailfail']           = 'Semella que houbo un erro ao tentar enviar o correo co contrasinal. Contacte coa persoa administradora!';
+$lang['regbadmail']            = 'O enderezo de correo proporcionado semella incorrecto - se considera que isto é un erro, contacte coa persoa administradora';
+$lang['regbadpass']            = 'Os dous contrasinais introducidos non coinciden: Ténteo de novo.';
+$lang['regpwmail']             = 'O seu contrasinal do DokuWiki';
+$lang['reghere']               = 'Aínda non ten unha conta? Cree unha';
+$lang['profna']                = 'Esta wiki non permite modificacións dos perfís';
+$lang['profnochange']          = 'Non hai cambios, non hai nada para facer.';
+$lang['profnoempty']           = 'Non se permite un nome ou un enderezo de correo baleiros.';
+$lang['profchanged']           = 'O perfil de persoa usuaria foi actualizado correctamente.';
+$lang['pwdforget']             = 'Esqueceu o seu contrasinal? Obteña un novo';
+$lang['resendna']              = 'Esta wiki non permite o reenvío de contrasinais.';
+$lang['resendpwd']             = 'Enviar un contrasinal novo a';
+$lang['resendpwdmissing']      = 'Sentímolo, ten que encher todos os campos.';
+$lang['resendpwdnouser']       = 'Sentímolo, non encontramos esta persoa usuaria na nosa base de datos.';
+$lang['resendpwdbadauth']      = 'Sentímolo, mais este código de autorización non é válido. Asegúrese de que usou a ligazón completa de confirmación.';
+$lang['resendpwdconfirm']      = 'Enviouse unha ligazón de confirmación por correo.';
+$lang['resendpwdsuccess']      = 'O seu novo contrasinal foi enviado por correo.';
+$lang['license']               = 'O contido deste wiki, agás onde se indique o contrario, ofrécese baixo a seguinte licenza:';
+$lang['licenseok']             = 'Nota: Ao editar esta páxina estás a aceptar o licenciamento do contido baixo a seguinte licenza:';
+$lang['searchmedia']           = 'Buscar nome de ficheiro:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Selecciona o arquivo para subir';
+$lang['txt_filename']          = 'Subir como (opcional)';
+$lang['txt_overwrt']           = 'Sobrescribir o arquivo existente';
+$lang['lockedby']              = 'Bloqueado actualmente por';
+$lang['lockexpire']            = 'O bloqueo termina o';
+$lang['willexpire']            = 'O seu bloqueo para editar esta páxina vai caducar nun minuto.\nPara de evitar conflitos, use o botón de previsualización para reiniciar o contador do tempo de bloqueo.';
+$lang['notsavedyet']           = 'Perderanse os cambios non gardados.\nEstá segura/o de que quere continuar?';
+$lang['rssfailed']             = 'Houbo un erro ao tentar obter este fío RSS: ';
+$lang['nothingfound']          = 'Non se encontrou nada.';
+$lang['mediaselect']           = 'Ficheiros multimedia';
+$lang['fileupload']            = 'Subir ficheiros multimedia';
+$lang['uploadsucc']            = 'Subiuse correctamente';
+$lang['uploadfail']            = 'Fallou ao subir. É posíbel que sexa un problema de permisos?';
+$lang['uploadwrong']           = 'Subida denegada. Esta extensión de ficheiro non está permitida!';
+$lang['uploadexist']           = 'Xa existe o ficheiro. Non se fixo nada.';
+$lang['uploadbadcontent']      = 'O contido subido non concorda coa extensión de ficheiro %s.';
+$lang['uploadspam']            = 'A subida foi bloqueada pola lista negra de correo lixo.';
+$lang['uploadxss']             = 'A subida foi bloqueada por un posíbel contido malicioso.';
+$lang['uploadsize']            = 'O ficheiro subido é grande de máis. (máx. %s)';
+$lang['deletesucc']            = 'O ficheiro "%s" foi eliminado.';
+$lang['deletefail']            = '"%s" non puido ser eliminado - comprobe os permisos.';
+$lang['mediainuse']            = 'O ficheiro "%s" non foi eliminado - aínda está en uso.';
+$lang['namespaces']            = 'Nomes de espazos';
+$lang['mediafiles']            = 'Ficheiro dispoñíbeis en';
+$lang['js']['searchmedia']     = 'Buscar ficheiros';
+$lang['js']['keepopen']        = 'Manter a xanela aberta na selección';
+$lang['js']['hidedetails']     = 'Ocultar os detalles';
+$lang['js']['nosmblinks']      = 'A ligazón aos compartidos do Windows só funciona co Microsoft Internet Explorer.
+Sempre podes copiar e colar a ligazón.';
+$lang['js']['linkwiz']         = 'Asistente de ligazóns';
+$lang['js']['linkto']          = 'Ligazón a:';
+$lang['js']['del_confirm']     = 'Quere eliminar os elementos seleccionados?';
+$lang['js']['mu_btn']          = 'Subir varios ficheiros dunha vez';
+$lang['mediausage']            = 'Utilice a seguinte sintaxe para referenciar este ficheiro:';
+$lang['mediaview']             = 'Ver o ficheiro orixinal';
+$lang['mediaroot']             = 'raíz';
+$lang['mediaupload']           = 'Suba aquí un ficheiro ao nome de espazo actual. Para crear subnomes de espazos deberá engadilos ao principio do seu nome de ficheiro en "Subir como", separados por dous puntos.';
+$lang['mediaextchange']        = 'A extensión de ficheiro foi alterada de .%s a .%s!';
+$lang['reference']             = 'Referencias para';
+$lang['ref_inuse']             = 'O ficheiro non pode ser eliminado, xa que aínda está a ser usado polas seguintes páxinas:';
+$lang['ref_hidden']            = 'Algunhas referencias están en páxinas para as cales non ten permisos de lectura';
+$lang['hits']                  = 'Visualizacións';
+$lang['quickhits']             = 'Nomes de páxinas coincidentes';
+$lang['toc']                   = 'Táboa de contidos';
+$lang['current']               = 'actual';
+$lang['yours']                 = 'A súa versión';
+$lang['diff']                  = 'Mostrar as diferenzas coa versión actual';
+$lang['diff2']                 = 'Mostrar as diferenzas entre as revisións seleccionadas';
+$lang['line']                  = 'Liña';
+$lang['breadcrumb']            = 'Trazado';
+$lang['youarehere']            = 'Vostede está aquí';
+$lang['lastmod']               = 'Última modificación';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'eliminado';
+$lang['created']               = 'creado';
+$lang['restored']              = 'a revisión antiga foi restaurada';
+$lang['external_edit']         = 'edición externa';
+$lang['summary']               = 'Resumo da edición';
+$lang['noflash']               = 'Precísase o <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a> para mostrar este contido.';
+$lang['mail_newpage']          = 'páxina engadida:';
+$lang['mail_changed']          = 'páxina alterada:';
+$lang['mail_new_user']         = 'Persoa usuaria nova:';
+$lang['mail_upload']           = 'ficheiro subido:';
+$lang['qb_bold']               = 'Texto en negra';
+$lang['qb_italic']             = 'Texto en cursiva';
+$lang['qb_underl']             = 'Texto subliñado';
+$lang['qb_code']               = 'Texto de código';
+$lang['qb_strike']             = 'Texto riscado';
+$lang['qb_h1']                 = 'Título de nivel 1';
+$lang['qb_h2']                 = 'Título de nivel 2';
+$lang['qb_h3']                 = 'Título de nivel 3';
+$lang['qb_h4']                 = 'Título de nivel 4';
+$lang['qb_h5']                 = 'Título de nivel 5';
+$lang['qb_link']               = 'Ligazón interna';
+$lang['qb_extlink']            = 'Ligazón externa';
+$lang['qb_hr']                 = 'Liña horizontal';
+$lang['qb_ol']                 = 'Elemento de lista ordenada';
+$lang['qb_ul']                 = 'Elemento de lista desordenada';
+$lang['qb_media']              = 'Engadir imaxes e outros ficheiros';
+$lang['qb_sig']                = 'Inserir unha sinatura';
+$lang['qb_smileys']            = 'Emoticonas';
+$lang['qb_chars']              = 'Caracteres especiais';
+$lang['admin_register']        = 'Engadir unha persoa usuaria nova';
+$lang['metaedit']              = 'Editar os metadatos';
+$lang['metasaveerr']           = 'Non se puideron escribir os metadatos';
+$lang['metasaveok']            = 'Os metadatos foron gardados';
+$lang['img_backto']            = 'Volver a';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Lenda';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nome do ficheiro';
+$lang['img_fsize']             = 'Tamaño';
+$lang['img_artist']            = 'Fotógrafa/o';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Cámara';
+$lang['img_keywords']          = 'Palabras chave';
+$lang['subscribe_success']     = '%s foi engadido á lista de subscrición de cambios de %s';
+$lang['subscribe_error']       = 'Erro ao tentar engadir %s á lista de subscrición de cambios de %s';
+$lang['subscribe_noaddress']   = 'Non hai ningún enderezo asociado ao seu nome de persoa usuaria: non pode ser engadida/o á lista de subscrición';
+$lang['unsubscribe_success']   = 'Eliminouse %s da lista de subscrición de cambios de %s';
+$lang['unsubscribe_error']     = 'Erro ao tentar eliminar %s da lista de subscrición de cambios de %s';
+$lang['authmodfailed']         = 'A configuración de autenticación de persoa usuaria é incorrecta. Informe á persoa administradora do seu Wiki.';
+$lang['authtempfail']          = 'A autenticación de persoa usuaria non está dispoñíbel de modo temporal. Se esta situación persiste informe á persoa administradora do seu Wiki.';
+$lang['i_chooselang']          = 'Seleccione o seu idioma';
+$lang['i_installer']           = 'Instalador do DokuWiki';
+$lang['i_wikiname']            = 'Nome do Wiki';
+$lang['i_enableacl']           = 'Activar o lista de control de acceso (ACL) (recomendado)';
+$lang['i_superuser']           = 'Superusuaria/o';
+$lang['i_problems']            = 'O instalador encontrou algúns problemas que se mostran a continuación. Non poderá continuar até que os solucione.';
+$lang['i_modified']            = 'Por razóns de seguridade este script só funcionará cunha instalación nova e sen modificar do Dokuwiki.
+                         Pode ou ben extraer de novo os ficheiros desde o paquete descargado ou consultar as
+                         <a href="http://dokuwiki.org/install">instruccións completas de instalación do Dokuwiki</a>';
+$lang['i_funcna']              = 'A función <code>%s</code> de PHP non está dispoñíbel. Pode que o seu provedor de hospedaxe a desactivase por algún motivo.';
+$lang['i_phpver']              = 'A súa versión <code>%s</code> de PHP é inferior á <code>%s</code> precisa. Debe actualizar a súa instalación de PHP.';
+$lang['i_permfail']            = '<code>%s</code> non é escribíbel polo DokuWiki. Debe corrixir a configuración de permisos deste directorio!';
+$lang['i_confexists']          = '<code>%s</code> xa existe';
+$lang['i_writeerr']            = 'Non se puido crear <code>%s</code>. Terá que comprobar os permisos do directorio/ficheiro e crear o ficheiro de modo manual.';
+$lang['i_badhash']             = 'dokuwiki.php é irrecoñecíbel ou foi modificado (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - ilegal ou valor baleiro';
+$lang['i_success']             = 'A configuración terminou correctamente. Agora pode borrar o ficheiro install.php. Continúe até o
+                        <a href="doku.php">seu novo DokuWiki</a>.';
+$lang['i_failure']             = 'Houbo algúns erros ao tentar escribir os ficheiros de configuración. Pode que precise solucionalos de mod manual antes
+                         de que poder usar <a href="doku.php">o seu novo DokuWiki</a>.';
+$lang['i_policy']              = 'Regras iniciais da ACL';
+$lang['i_pol0']                = 'Wiki aberto (lectura, escritura, subida de arquivos para todas as persoas)';
+$lang['i_pol1']                = 'Wiki público (lectura para todas as persoas, escritura e subida de ficheiros para as persoas usuarias rexistradas)';
+$lang['i_pol2']                = 'Wiki pechado (lectura, escritura, subida de arquivos só para as persoas usuarias rexistradas)';
+$lang['i_retry']               = 'Tentar de novo';
+$lang['mu_intro']              = 'Aquí podes subir varios ficheiros dunha vez. Preme o botón Examinar para engadilos á fila. Preme en Subir cando remates.';
+$lang['mu_gridname']           = 'Nome do ficheiro';
+$lang['mu_gridsize']           = 'Tamaño';
+$lang['mu_gridstat']           = 'Estado';
+$lang['mu_namespace']          = 'Nome de espazo';
+$lang['mu_browse']             = 'Examinar';
+$lang['mu_toobig']             = 'demasiado grande';
+$lang['mu_ready']              = 'listo para subir';
+$lang['mu_done']               = 'feito';
+$lang['mu_fail']               = 'fallou';
+$lang['mu_authfail']           = 'a sesión caducou';
+$lang['mu_progress']           = '@PCT@% subido';
+$lang['mu_filetypes']          = 'Tipos de ficheiro permitidos';
+$lang['mu_info']               = 'ficheiros subidos.';
+$lang['mu_lasterr']            = 'Último erro:';
+$lang['recent_global']         = 'Agora mesmo está a ver os cambios no nome de espazo <b>%s</b>. Tamén pode <a href="%s">ver os cambios recentes en todo o Wiki</a>.';
+$lang['years']                 = 'hai %d anos';
+$lang['months']                = 'hai %d meses';
+$lang['weeks']                 = 'hai %d semanas';
+$lang['days']                  = 'hai %d días';
+$lang['hours']                 = 'hai %d horas';
+$lang['minutes']               = 'hai %d minutos';
+$lang['seconds']               = 'hai %d segundos';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/locked.txt
new file mode 100644
index 000000000..14240335e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/locked.txt
@@ -0,0 +1,3 @@
+====== Páxina bloqueada ======
+
+Esta páxina está actualmente bloqueada para a edición por outra persoa usuaria. Terá que agardar até que esa persoa usuaria termine de editar a páxina ou a que expire o bloqueo.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/login.txt
new file mode 100644
index 000000000..11719de50
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/login.txt
@@ -0,0 +1,4 @@
+====== Inicio de sesión ======
+
+Actualmente non ten unha sesión iniciada! Insira as súas credenciais de autenticación para iniciar a sesión. Debe ter as cookies activadas para poder iniciar unha sesión.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/mailtext.txt
new file mode 100644
index 000000000..f7c06bc83
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/mailtext.txt
@@ -0,0 +1,17 @@
+Engadiuse ou modificouse unha páxina do seu DokuWiki. Aquí van os detalles:
+
+Data              : @DATE@
+Navegador         : @BROWSER@
+Enderezo IP       : @IPADDRESS@
+Nome do host      : @HOSTNAME@
+Revisión antiga   : @OLDPAGE@
+Revision nova     : @NEWPAGE@
+Resumo da edición : @SUMMARY@
+Usuaria/o         : @USER@
+
+@DIFF@
+
+
+-- 
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/newpage.txt
new file mode 100644
index 000000000..c79ef6a41
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/newpage.txt
@@ -0,0 +1,4 @@
+====== Este tema aínda non existe ======
+
+Seguiu unha ligazón até un tema que aínda non existe. Se ten os permisos adecuados, pode creala vostede premendo no botón ''Crear esta páxina''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/norev.txt
new file mode 100644
index 000000000..dd6027165
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/norev.txt
@@ -0,0 +1,4 @@
+====== Non existe esa revisión ======
+
+A revisión especificada non existe. Utilice o botón ''Revisións antigas'' para obter un listado das revisións antigas deste documento.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/preview.txt
new file mode 100644
index 000000000..01cc41dcc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualización ======
+
+Isto é unha previsualización de como aparecerá o seu texto. Lembre: **Aínda non está gardado!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/pwconfirm.txt
new file mode 100644
index 000000000..e020790d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ola @FULLNAME@!
+
+Alguén solicitou un contrasinal novo para o seu inicio de sesión no
+@TITLE@ en @DOKUWIKIURL@
+
+Se non foi vostede quen o solicitou pode ignorar este correo.
+
+Para confirmar que esta solicitude foi realmente enviada por vostede
+por favor, visite a seguinte ligazón.
+
+@CONFIRM@
+
+-- 
+Este correo foi xerador polo DokuWiki de
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/read.txt
new file mode 100644
index 000000000..912864c31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/read.txt
@@ -0,0 +1,2 @@
+Esta páxina é só de lectura. Podes ver o código fonte, mais non pode alterala. Coméntello á persoa administradora se considera que é un erro.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/recent.txt
new file mode 100644
index 000000000..93f8632dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/recent.txt
@@ -0,0 +1,5 @@
+====== Cambios recentes ======
+
+As seguintes páxinas foron cambiadas recentemente.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/register.txt
new file mode 100644
index 000000000..17d9e0ff4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/register.txt
@@ -0,0 +1,4 @@
+====== Rexistro como persoa usuaria nova ======
+
+Encha toda a información requirida a continuación para crear unha conta nova neste wiki. Asegúrese de proporcionar un **enderezo de correo electrónico válido** - se non se lle solicita aquí que insira un contrasinal, recibirá un contrasinal novo nese enderezo. O nome de persoa usuaria deberá ser un [[doku>pagename|nome de páxina]] válido.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/registermail.txt
new file mode 100644
index 000000000..e02fe1a1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/registermail.txt
@@ -0,0 +1,14 @@
+Rexistrouse unha persoa usuaria nova. Estes son os detalles:
+
+Nome de usuaria/o   : @NEWUSER@
+Nome completo	    : @NEWNAME@
+Correo	            : @NEWEMAIL@
+
+Data		    : @DATE@
+Navegador     	    : @BROWSER@
+Enderezo IP	    : @IPADDRESS@
+Nome do host	    : @HOSTNAME@
+
+-- 
+Este correo foi xerado polo DokuWiki de
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/resendpwd.txt
new file mode 100644
index 000000000..eb8cf4835
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar un contrasinal novo ======
+
+Insira o seu nome de persoa usuaria no seguinte formulario para obter un contrasinal novo para a súa conta neste wiki. Enviarase unha ligazón de confirmación ao seu enderezo de correo rexistrado.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/revisions.txt
new file mode 100644
index 000000000..a08b54685
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisións antigas ======
+
+Estas son as revisións antigas do documento actual. Para retomar unha revisión antiga: selecciónea na seguinte lista, prema en ''Editar esta páxina'' e gárdea.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/searchpage.txt
new file mode 100644
index 000000000..7157cdcbf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Procurar ======
+
+Podes encontrar os resultados da súa procura a continuación. Se non encontrou o que estaba a procurar, pode crear ou editar a páxina co nome relacionado coa súa procura co botón axeitado.
+
+===== Resultados =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/showrev.txt
new file mode 100644
index 000000000..88fb0c39d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/showrev.txt
@@ -0,0 +1,2 @@
+**Esta é unha revisión antiga do documento!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/stopwords.txt
new file mode 100644
index 000000000..c262147f8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/stopwords.txt
@@ -0,0 +1,246 @@
+# Isto é unha listaxe das palabras que o indexador ignora (stopwords); unha por liña
+# Cando edite este ficheiro asegúrese de usar os fins de liña UNIX (nova liña única)
+# Non precisa incluír palabras de menos de 3 caracteres - estas son ignoradas de todas as formas
+# Esta listaxe está baseada nas encontradas en http://www.ranks.nl/stopwords/ (aínda en proceso)
+#	Actualizouse a listaxe a partir as stopwords dispoñibilizadas por Paulo Malvar en:
+# http://d108.dinaserver.com/hosting/paulomalvar.com/Paulo_Malvar_personal_webpage/Resources_files/Galician_single_and_multiword_stopwords_Verbal_Periphrases_and_Abbreviations.tgz
+# e tamén as listaxes de palabras gramaticais na Galipedia: http://gl.wikipedia.org/wiki/Categoría_gramatical
+abaixo
+acerca
+ademais
+agás
+aínda
+alén
+algún
+algunha
+algunhas
+algúns
+amais
+ante
+antes
+após
+aquel
+aquela
+aquelas
+aqueles
+aquén
+aquilo
+arredor
+bardante
+beira
+canda
+cando
+canto
+carón
+causa
+cerca
+como
+conforme
+consonte
+contra
+deica
+dela
+delas
+deles
+dende
+derredor
+derriba
+desde
+despois
+durante
+elas
+eles
+entre
+erades
+eramos
+eran
+eras
+esas
+eses
+esta
+está
+estaba
+estabades
+estabamos
+estaban
+estades
+estamos
+están
+estas
+este
+estea
+esteades
+esteamos
+estean
+esteas
+estes
+estivemos
+estiven
+estiver
+estivera
+estiveramos
+estiveran
+estiverdes
+estiveren
+estivermos
+estivese
+estivesemos
+estivesen
+estivo
+estou
+excepto
+fomos
+fora
+foramos
+foran
+fordes
+foren
+formos
+fose
+fosedes
+fosemos
+fosen
+habemos
+haberá
+haberán
+haberedes
+haberei
+haberemos
+habería
+haberíades
+haberíamos
+haxa
+haxades
+haxamos
+haxan
+haxas
+houbemos
+houben
+houber
+houbera
+houberades
+houberamos
+houberan
+houberemos
+houberen
+houberían
+houbermos
+houbese
+houbesedes
+houbesemos
+houbesen
+houbo
+isto
+lles
+logo
+mais
+máis
+malia
+mediante
+menos
+mesmo
+meus
+miña
+miñas
+moito
+nosa
+nosas
+noso
+nosos
+nunha
+onda
+outra
+outro
+para
+perante
+pero
+pois
+pola
+polas
+polo
+polos
+por
+porén
+porque
+prol
+quen
+redor
+rente
+respecto
+sacado
+sacando
+salvante
+salvo
+senón
+será
+serán
+serás
+seredes
+serei
+seremos
+sería
+seríamos
+serían
+seus
+sexa
+sexades
+sexamos
+sexan
+sexas
+sobre
+sodes
+somos
+súas
+tamén
+tedes
+temos
+teña
+teñades
+teñamos
+teñan
+teñas
+teño
+terá
+terán
+terás
+teredes
+terei
+teremos
+tería
+teriades
+teriamos
+terían
+terías
+teus
+tiña
+tiñades
+tiñamos
+tiñan
+tiñas
+tiveches
+tivemos
+tiven
+tiver
+tivera
+tiverades
+tiveramos
+tiveran
+tiveras
+tiverdes
+tiveren
+tivermos
+tivese
+tivesedes
+tivesemos
+tivesen
+tiveses
+tivestes
+tivo
+todo
+tras
+través
+túas
+unha
+unhas
+vostede
+vostedes
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/subscribermail.txt
new file mode 100644
index 000000000..0b1c3a662
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/subscribermail.txt
@@ -0,0 +1,19 @@
+Ola!
+
+A páxina @PAGE@ na wiki @TITLE@ foi mudada.
+Aquí van as modificacións:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para desubscribirte deste rexistro de cambios de páxina
+na wiki en
+@DOKUWIKIURL@
+fai unha visita a
+@NEWPAGE@
+e selecciona 'Non avisar dos cambios'.
+
+-- 
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/updateprofile.txt
new file mode 100644
index 000000000..bfd598117
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Actualizar o perfil da súa conta ======
+
+Só precisa cubrir os campos que desexe cambiar. Non pode cambiar o seu nome de persoa usuaria.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/uploadmail.txt
new file mode 100644
index 000000000..914c3644c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/uploadmail.txt
@@ -0,0 +1,14 @@
+Subiuse un ficheiro ao seu DokuWiki. Aquí van os detalles:
+
+Ficheiro     : @MEDIA@
+Data         : @DATE@
+Navegador    : @BROWSER@
+Enderezo IP  : @IPADDRESS@
+Nome do host : @HOSTNAME@
+Tamaño       : @SIZE@
+Tipo MIME    : @MIME@
+Usuaria/o    : @USER@
+
+-- 
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/wordblock.txt
new file mode 100644
index 000000000..f219f8436
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/gl/wordblock.txt
@@ -0,0 +1,4 @@
+====== Bloqueo por SPAM ======
+
+Os seus cambios **non** foron gardados porque conteñen unha ou varias palabras bloqueadas. Se tentou introducir spam no wiki -- Nen@ mal@! Se considera que é un erro, contacte coa persoa administradora deste Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/admin.txt
new file mode 100644
index 000000000..ada73e5d4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/admin.txt
@@ -0,0 +1,4 @@
+====== ניהול ======
+
+ניתן למצוא מטה רשימה של משימות ניהול זמינות ב-DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/backlinks.txt
new file mode 100644
index 000000000..dfcdd22dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/backlinks.txt
@@ -0,0 +1,3 @@
+====== קישורים לאחור ======
+
+זוהי רשימת דפים אשר נראה כי הם מקשרים לדף ממנו הגעת.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/conflict.txt
new file mode 100644
index 000000000..d27a78559
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/conflict.txt
@@ -0,0 +1,6 @@
+====== גירסה עדכנית יותר של הקובץ קיימת ======
+
+גירסה עדכנית יותר של המסמך קיימת. דבר זה קורה כאשר משתמש אחר שינה את המסמך בזמן שערכת אותו.
+
+מומלץ לעיין בהבדלים תחת הודעה ולאחר מכן להחליט איזו גירסה כדאי לשמור. לחיצה על הכפתור "שמור" תשמור את הגרסה שערכת. לחיצה על הכפתור "בטל" תשמור את הגרסה הקיימת.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/denied.txt
new file mode 100644
index 000000000..34c8417b4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/denied.txt
@@ -0,0 +1,3 @@
+====== הרשאה נדחתה ======
+
+אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. אולי שכחת להכנס למערכת?
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/diff.txt
new file mode 100644
index 000000000..f1216bb4a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/diff.txt
@@ -0,0 +1,4 @@
+====== הבדלים ======
+
+כאן מוצגים ההבדלים בין הגרסה שנבחרה והגרסה הנוכחית של הדף.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/draft.txt
new file mode 100644
index 000000000..22fc88d9f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/draft.txt
@@ -0,0 +1,5 @@
+====== נמצא קובץ טיוטא ======
+
+העריכה האחרונה שבוצעה לדף זה לא הסתימה כהלכה. DokuWiki שמר באופן אוטומטי טיוטה של העבודה ובאפשרותך להשתמש בה  כדי להמשיך את העריכה. ניתן לראות מטה את המידע שנשמר מהפעם הקודמת.
+
+באפשרותך לבחור ב//שחזור הטיוטה// של אותה עריכה //מחיקת הטיוטה// או //ביטול// העריכה כליל.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/edit.txt
new file mode 100644
index 000000000..4d8151e9d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/edit.txt
@@ -0,0 +1 @@
+עריכת הדף ולחיצה על הכפתור "שמור" תעדכן את תוכנו. מומלץ לעיין בדף ה[[wiki:syntax|תחביר]] כדי להכיר את כללי תחביר הויקי. נא לערוך את הדף רק אם הדבר נעשה כדי **לשפר** אותו. אם העריכה היא לצורך התנסות מומלץ לבקר ב[[playground:playground|ארגז החול]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/editrev.txt
new file mode 100644
index 000000000..a6c755cba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/editrev.txt
@@ -0,0 +1,2 @@
+**הדף שנפתח הוא גרסה ישנה של המסמך!** לחיצה על הכפתור "שמור" תשחזר את המסמך לגרסה המוצגת כעת.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/index.txt
new file mode 100644
index 000000000..12b7a960e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/index.txt
@@ -0,0 +1,4 @@
+====== אינדקס ======
+
+זהו קובץ אינדקס הנמצא מעל לכל הדפים המאורגנים ב[[ויקי:דוקיוויקי]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/install.html
new file mode 100644
index 000000000..7831623c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/install.html
@@ -0,0 +1,13 @@
+<p>דף זה מסייע להתקנה וההגדרה הראשוניות של
+<a href="http://dokuwiki.org">Dokuwiki</a>. מידע נוסף על מתקין זה זמין בדף 
+<a href="http://dokuwiki.org/installer">התיעוד שלו</a>.</p>
+
+<p>DokuWiki עושה שימוש בקבצים רגילים לשמירת דפי ויקי ומידע נוסף הקשור לדפים אלו (לדוגמה תמונות, רשימות חיפוש, גרסאות קודמות וכו').
+לתפקוד תקין DokuWiki <strong>חייב</strong> גישה לכתיבה לתיקיות המכילות קבצים אלו. מתקין זה אינו יכול לקבוע הרשאות לתיקיות. 
+פעולה זו צריכה בד"כ להתבצע ישירות משורת הפקודה או במקרה שנעשה שימוש בשרת מארח דרך FTP או מנשק הניהול של המארח (cPanell לדוגמה).</p>
+
+<p>מתקין זה יגדיר את תצורת ה-<acronym title="access control list">ACL</acronym> ב-DokuWiki שלך
+, זה בתורו מאפשר גישת מנהל לתפריט הניהול של DokuWiki כדי להתקין הרחבות, לנהל משתמשים, לנהל גישות לדפי ויקי ושינויים בהגדרות התצורה.
+אין הוא הכרחי לתפקוד DokuWiki אך הוא יהפוך את Dokuwiki קל יותר לניהול.</p>
+
+<p>על משתמשים מנוסים או כאלו עם דרישות מיוחדות להתקנה להשתמש בקישורים אלו לפרטים בנוגע ל<a href="http://dokuwiki.org/install">הוראות התקנה</a> ו<a href="http://dokuwiki.org/config">הגדרות תצורה</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/lang.php
new file mode 100644
index 000000000..8545d1542
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/lang.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Hebrew language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @link       http://sourceforge.net/projects/hebdokuwiki/
+ * @author גיא שפר <guysoft@ort.org.il>
+ * @author Denis Simakov <akinoame1@gmail.com>
+ * @author DoK <kamberd@yahoo.com>
+ * @author Dotan Kamber <kamberd@yahoo.com>
+ * @author Moshe Kaplan <mokplan@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'עריכה';
+$lang['btn_source']            = 'הצג את מקור הדף';
+$lang['btn_show']              = 'הצג דף';
+$lang['btn_create']            = 'יצירת דף';
+$lang['btn_search']            = 'חפש';
+$lang['btn_save']              = 'שמור';
+$lang['btn_preview']           = 'תצוגה מקדימה';
+$lang['btn_top']               = 'חזור למעלה';
+$lang['btn_newer']             = '<< יותר חדש';
+$lang['btn_older']             = 'פחות חדש >>';
+$lang['btn_revs']              = 'גרסאות קודמות';
+$lang['btn_recent']            = 'שינויים אחרונים';
+$lang['btn_upload']            = 'העלה';
+$lang['btn_cancel']            = 'בטל';
+$lang['btn_index']             = 'אינדקס';
+$lang['btn_secedit']           = 'עריכה';
+$lang['btn_login']             = 'כניסה';
+$lang['btn_logout']            = 'יציאה';
+$lang['btn_admin']             = 'מנהל';
+$lang['btn_update']            = 'עדכן';
+$lang['btn_delete']            = 'מחק';
+$lang['btn_back']              = 'חזור';
+$lang['btn_backlink']          = 'קישורים לכאן';
+$lang['btn_backtomedia']       = 'לחזור לבחירת קובץ מדיה';
+$lang['btn_subscribe']         = 'עקוב אחרי שינוים';
+$lang['btn_unsubscribe']       = 'הפסק לעקוב';
+$lang['btn_subscribens']       = 'הרשמה לשינויים במרחב השם';
+$lang['btn_unsubscribens']     = 'הסרת הרשמה לשינויים במחב השם';
+$lang['btn_profile']           = 'עדכן פרופיל';
+$lang['btn_reset']             = 'איפוס';
+$lang['btn_resendpwd']         = 'שלח סיסמה חדשה';
+$lang['btn_draft']             = 'עריכת טיוטה';
+$lang['btn_recover']           = 'שחזור טיוטה';
+$lang['btn_draftdel']          = 'מחיקת טיוטה';
+$lang['loggedinas']            = 'רשום כ-';
+$lang['user']                  = 'שם משתמש';
+$lang['pass']                  = 'סיסמה';
+$lang['newpass']               = 'סיסמה חדשה';
+$lang['oldpass']               = 'אשר את הסיסמה הנוכחית';
+$lang['passchk']               = 'שוב';
+$lang['remember']              = 'זכור אותי';
+$lang['fullname']              = 'שם מלא';
+$lang['email']                 = 'דוא"ל';
+$lang['register']              = 'הרשמה';
+$lang['profile']               = 'פרופיל';
+$lang['badlogin']              = 'סליחה, שם המשתמש או הסיסמה שגויים';
+$lang['minoredit']             = 'שינוים מינוריים';
+$lang['draftdate']             = 'טיוטה נשמרה ב-';
+$lang['regmissing']            = 'סליחה, עליך למלא את כל השדות';
+$lang['reguexists']            = 'סליחה, משתמש בשם זה כבר נרשם';
+$lang['regsuccess']            = 'הרשמה הצליחה, המשתמש נרשם והודעה נשלחה בדואר';
+$lang['regsuccess2']           = 'הרשמה הצליחה, המשתמש נרשם.';
+$lang['regmailfail']           = 'שליחת הודעת הדואר כשלה, נא ליצור קשר עם מנהל האתר';
+$lang['regbadmail']            = 'כתובת דואר כנראה לא תקפה, אם לא כך היא יש ליצור קשר עם מנהל האתר';
+$lang['regbadpass']            = 'שתי הסיסמות הן לא זהות, נא לנסות שוב';
+$lang['regpwmail']             = 'סיסמת הדוקוויקי שלך';
+$lang['reghere']               = 'עדיין ללא שם-משתמש? ההרשמה כאן';
+$lang['profna']                = 'בוויקי הזה לא ניתן לשנות פרופיל';
+$lang['profnochange']          = 'אין שינוים, פרופיל לא עודכן';
+$lang['profnoempty']           = 'שם וכתובת דוא"ל לא יכולים להיות ריקים';
+$lang['profchanged']           = 'פרופיל עודכן בהצלחה';
+$lang['pwdforget']             = 'שכחת סיסמה? קבל חדשה';
+$lang['resendna']              = 'הוויקי הזה לא תומך בחידוש סיסמה';
+$lang['resendpwd']             = 'שלח סיסמה חדשה עבור';
+$lang['resendpwdmissing']      = 'סליחה, עליך למלא את כל השדות';
+$lang['resendpwdnouser']       = 'סליחה, משתמש בשם זה לא נמצא';
+$lang['resendpwdbadauth']      = 'סליחה, קוד אימות זה אינו תקף. יש לודא כי נעשה שימוש במלוא קישור האימות.';
+$lang['resendpwdconfirm']      = 'קישור אימות נשלח בדוא"ל.';
+$lang['resendpwdsuccess']      = 'סיסמה חדשה נשלחה בדואר';
+$lang['txt_upload']            = 'בחר קובץ להעלות';
+$lang['txt_filename']          = 'הכנס שם לוויקי (בחירה)';
+$lang['txt_overwrt']           = 'לכתוב במקום קובץ קיים';
+$lang['lockedby']              = 'נעול על ידי';
+$lang['lockexpire']            = 'נעילה פגה';
+$lang['willexpire']            = 'נעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאתחל את הנעילה שנית';
+$lang['notsavedyet']           = 'קיימים שינויים שטרם נשמרו ואשר יאבדו \n האם להמשיך?';
+$lang['rssfailed']             = 'כשל ב-RSS';
+$lang['nothingfound']          = 'לא נמצאו תוצאות';
+$lang['mediaselect']           = 'בחירת קובץ מדיה';
+$lang['fileupload']            = 'העלאת קובץ מדיה';
+$lang['uploadsucc']            = 'העלאת הקובץ בוצעה בהצלחה';
+$lang['uploadfail']            = 'קרתה שגיאה בעת העלאת הקובץ. תיתכן ובעייה זו נוצרה עקב הרשאות שגיות.';
+$lang['uploadwrong']           = 'העלאה לא אושרה. קבצים בסיומת זו אסורים';
+$lang['uploadexist']           = 'הקובץ כבר קיים. פעולה בוטלה';
+$lang['uploadbadcontent']      = 'התוכן שהועלה לא תאם את הסיומת %s של הקובץ.';
+$lang['uploadspam']            = 'ההעלאה נחסמה על ידי הרשימה השחורה של הספאם.';
+$lang['uploadxss']             = 'ההעלאה נחסמה בשל חשד לתוכן זדוני.';
+$lang['deletesucc']            = 'קובץ %s נמחק';
+$lang['deletefail']            = 'לא יכולתי למחוק "%s" -- בדקו הרשאות';
+$lang['mediainuse']            = 'קובץ "%s" לא נמחק - הוא עדיין בשימוש';
+$lang['namespaces']            = 'שמות מתחם';
+$lang['mediafiles']            = 'קבצים זמינים ב-';
+$lang['js']['searchmedia']     = 'חיפוש קבצים';
+$lang['js']['keepopen']        = 'השאר חלון פתוח בבחירה';
+$lang['js']['hidedetails']     = 'הסתר פרטים';
+$lang['js']['nosmblinks']      = ':( קישור למערכת קבצים של חלונות פועל רק בדפדפן אינטרנט אקספלורר.
+ זה בסדר, אין צורך לעבור. אפשר להעתיק ולהדביק את הקישור';
+$lang['js']['del_confirm']     = 'באמת למחוק?';
+$lang['js']['mu_btn']          = 'העלאת קבצים מרובים';
+$lang['mediausage']            = 'השתמש בתחביר הבא להתיחסות אל קובץ זה:';
+$lang['mediaview']             = 'הצג את הקובץ המקורי';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'כאן ניתן להעלות קובץ למרחב השמות הנוכחי. ליצירת תתי-מרחבי שמות צרפם ב-"העלה" לתחילת שם הקובץ מופרדים בפסיקים';
+$lang['mediaextchange']        = 'סיומת הקובץ השתנתה מ-.%s ל-.%s!';
+$lang['reference']             = 'קישורים ל';
+$lang['ref_inuse']             = 'לא יכולתי למחוק קובץ, הדפים הבאים עדיין משתמשים בו:';
+$lang['ref_hidden']            = 'יש קישורים לדפים ללא הרשאת קריאה';
+$lang['hits']                  = 'פגיעות';
+$lang['quickhits']             = 'דפים שנמצאו';
+$lang['toc']                   = 'תוכן עניינים';
+$lang['current']               = 'גירסה נוכחית';
+$lang['yours']                 = 'הגרסה שלך';
+$lang['diff']                  = 'הצג שינוים מגרסה זו ועד הנוכחית';
+$lang['diff2']                 = 'הצגת הבדלים בין הגרסאות שנבחרו';
+$lang['line']                  = 'שורה';
+$lang['breadcrumb']            = 'ביקורים אחרונים';
+$lang['youarehere']            = 'אתה נמצה כאן';
+$lang['lastmod']               = 'שונה לאחרונה ב';
+$lang['by']                    = 'על ידי';
+$lang['deleted']               = 'נמחק';
+$lang['created']               = 'נוצר';
+$lang['restored']              = 'שוחזר';
+$lang['external_edit']         = 'עריכה חיצונית';
+$lang['summary']               = 'תקציר העריכה';
+$lang['mail_newpage']          = 'דף נוסף:';
+$lang['mail_changed']          = 'דף שונה:';
+$lang['mail_new_user']         = 'משתמש חדש:';
+$lang['mail_upload']           = 'קובץ הועלה:';
+$lang['qb_bold']               = 'טקסט מודגש';
+$lang['qb_italic']             = 'טקסט נטוי';
+$lang['qb_underl']             = 'טקסט עם קו תחתון';
+$lang['qb_code']               = 'קוד';
+$lang['qb_strike']             = 'טקסט מחוק';
+$lang['qb_h1']                 = 'כותרת רמה 1';
+$lang['qb_h2']                 = 'כותרת רמה 2';
+$lang['qb_h3']                 = 'כותרת רמה 3';
+$lang['qb_h4']                 = 'כותרת רמה 4';
+$lang['qb_h5']                 = 'כותרת רמה 5';
+$lang['qb_h']                  = 'כותרת';
+$lang['qb_hs']                 = 'בחירת כותרת';
+$lang['qb_link']               = 'קישור פנימי';
+$lang['qb_extlink']            = 'קישור חיצוני';
+$lang['qb_hr']                 = 'קו אופקי';
+$lang['qb_ol']                 = 'איבר ברשימה ממוספרת';
+$lang['qb_ul']                 = 'אבר ברשימה לא ממוספרת';
+$lang['qb_media']              = 'תמונות או קובץ אחר';
+$lang['qb_sig']                = 'הזנת חתימה';
+$lang['qb_smileys']            = 'פרצופונים';
+$lang['qb_chars']              = 'סימנים מיוחדים';
+$lang['admin_register']        = 'להוסיף משתמש חדש';
+$lang['metaedit']              = 'ערוך נתונים';
+$lang['metasaveerr']           = 'כשל בשמירת נתונים';
+$lang['metasaveok']            = 'נתונים נשמרו';
+$lang['img_backto']            = 'הזור ל';
+$lang['img_title']             = 'כותרת';
+$lang['img_caption']           = 'תיאור';
+$lang['img_date']              = 'תאריך';
+$lang['img_fname']             = 'שם הקובץ';
+$lang['img_fsize']             = 'גודל';
+$lang['img_artist']            = 'צלם';
+$lang['img_copyr']             = 'זכויות';
+$lang['img_format']            = 'פורמט';
+$lang['img_camera']            = 'מצלמה';
+$lang['img_keywords']          = 'מילות מפתח';
+$lang['subscribe_success']     = '%s נוסף לרשימת המכותבים עבור %s';
+$lang['subscribe_error']       = 'שגיאה בהוספת %s לרשימת המכותבים עבור %s';
+$lang['subscribe_noaddress']   = 'אין כתובת המשויכת לרישום שלך ולכן אין באפשרותך להצטרף לרשימת המכותבים';
+$lang['unsubscribe_success']   = '%s הוסר מרשימת המכותבים עבור %s';
+$lang['unsubscribe_error']     = 'שגיאה בהסרת %s מרשימת המכותבים עבור %s';
+$lang['authmodfailed']         = 'תצורת אימות משתמשים גרועה. נא לדווח למנהל הויקי.';
+$lang['authtempfail']          = 'אימות משתמשים אינו זמין כרגע. אם מצב זה נמשך נא להודיע למנהל הויקי.';
+$lang['i_chooselang']          = 'נא לבחור שפה';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'שם הויקי';
+$lang['i_enableacl']           = 'אפשר ACL (מומלץ)';
+$lang['i_superuser']           = 'משתמש-על';
+$lang['i_problems']            = 'המתקין זיהה מספר בעיות המצוינות מטה. אין באפשרותך להמשיך לפני תיקונן.';
+$lang['i_modified']            = 'משיקולי אבטחה תסריט זה יעבוד אך ורק עם התקנת DokuWiki חדשה שלא עברה כל שינוי.
+                         עליך לחלץ שנית את הקבצים מהחבילה שהורדה או להעזר בדף
+                         <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna']              = 'פונקצית ה-PHP <code>%s</code> אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
+$lang['i_phpver']              = 'גרסת ה-PHP שלך <code>%s</code> נמוכה מהדרוש. עליך לשדרג את התקנת ה-PHP';
+$lang['i_permfail']            = '<code>%s</code> אינה ברת כתיבה על ידי DokuWiki. עליך לשנות הרשאות ספריה זו!';
+$lang['i_confexists']          = '<code>%s</code> כבר קיים';
+$lang['i_writeerr']            = 'אין אפשרות ליצור את <code>%s</code>. נא לבדוק את הרשאות הקובץ/ספריה וליצור את הקובץ ידנית.';
+$lang['i_badhash']             = 'קובץ Dokuwiki.php לא מזוהה או שעבר שינויים (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - ערך לא חוקי או ריק';
+$lang['i_success']             = 'ההגדרה הסתימה בהצלחה. באפשרותך למחוק עתה את הקובץ install.php ולהמשיך אל <a href="doku.php">DokuWiki החדש שלך</a>.';
+$lang['i_failure']             = 'מספר שגיאות ארעו בעת כתיבת קבצי התצורה. ייתכן כי יהיה צורך לתקנם ידנית לפני שניתן יהיה להשתמש ב<a href="doku.php">DokuWiki החדש שלך</a>.';
+$lang['i_policy']              = 'מדיניות ACL תחילית';
+$lang['i_pol0']                = 'ויקי פתוח (קריאה, כתיבה והעלאה לכולם)';
+$lang['i_pol1']                = ' ויקי ציבורי (קריאה לכולם, כתיבה והעלאה למשתמשים רשומים)';
+$lang['i_pol2']                = 'ויקי סגור (קריאה, כתיבה והעלאה למשתמשים רשומים בלבד)';
+$lang['i_retry']               = 'נסיון נוסף';
+$lang['mu_intro']              = 'כאן תוכל להעלות קבצים מרובים. לחץ על כפתור החיפוש להוסיף אותם למחסנית. לחץ על העלאה לסיום.';
+$lang['mu_gridname']           = 'שם קובץ';
+$lang['mu_gridsize']           = 'גודל';
+$lang['mu_gridstat']           = 'סטאטןס';
+$lang['mu_browse']             = 'חיפוש';
+$lang['mu_toobig']             = 'גדול מדי';
+$lang['mu_ready']              = 'מוכן להעלאה';
+$lang['mu_done']               = 'סיים';
+$lang['mu_fail']               = 'נכשל';
+$lang['mu_info']               = 'הקבצים הועלו';
+$lang['mu_lasterr']            = 'שגיאה אחרונה:';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/locked.txt
new file mode 100644
index 000000000..307874a73
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/locked.txt
@@ -0,0 +1,3 @@
+====== דף נעול ======
+
+דף זה נעול כרגע לעריכה על ידי משתמש אחר. עליך להמתין עד שהמשתמש יסיים את העריכה או עד שהנעילה תפוג.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/login.txt
new file mode 100644
index 000000000..5a575f1f8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/login.txt
@@ -0,0 +1,3 @@
+====== כניסה ======
+
+אינך ברשומות המערכת כרגע! יש להזין את נתוני ההזדהות מטה לכניסה. יש לאפשר עוגיות (cookies) כדי להכנס.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/mailtext.txt
new file mode 100644
index 000000000..d7990b2b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/mailtext.txt
@@ -0,0 +1,17 @@
+דף בDokuWiki נוסף או שונה. הנה הפרטים:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+-- 
+
+דף זה נוצר ע"י DokuWiki ב-
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/newpage.txt
new file mode 100644
index 000000000..ac6fb7386
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/newpage.txt
@@ -0,0 +1,3 @@
+====== דף זה עדיין לא קיים ======
+
+הדף אליו הגעת עדיין לא קיים. לחיצה על הכפתור "יצירת דף" תצור אותו.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/norev.txt
new file mode 100644
index 000000000..3d08e16db
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/norev.txt
@@ -0,0 +1,4 @@
+====== גרסה לא קיימת ======
+
+הגרסה שהוזנה אינה קיימת. נא להשתמש בכפתור ''גרסאות קודמות'' להצגת רשימת הגרסאות של מסמך זה.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/preview.txt
new file mode 100644
index 000000000..1331c23ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/preview.txt
@@ -0,0 +1,4 @@
+====== תצוגה מקדימה ======
+
+זו תצוגה מקדימה של הדף לעתיד. להזכירך: **הדף עדיין לא נשמר!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/pwconfirm.txt
new file mode 100644
index 000000000..255195c7f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/pwconfirm.txt
@@ -0,0 +1,13 @@
+שלום @FULLNAME@!
+
+מישהו ביקש סיסמה חדשה עבור הכניסה שלך ל-@TITLE@ ב-@DOKUWIKIURL@
+
+אם לא ביקשת סיסמה חדשה פשוט התעלם מדוא"ל זה.
+
+כדי לאשר שהבקשה באמת נשלחה על ידך נא השתמש בקישור הבא.
+
+@CONFIRM@
+
+-- 
+דואר זה נוצר על ידי DokuWiki ב-
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/read.txt
new file mode 100644
index 000000000..8e4c177ee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/read.txt
@@ -0,0 +1,2 @@
+דף זה הוא דף לקריאה בלבד. ניתן לצפות בקוד המקור שלו, אבל לא ניתן לערוך אותו. ניתן לפנות אל מנהל הויקי אם לדעתך נפלה טעות.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/recent.txt
new file mode 100644
index 000000000..0febd96e5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/recent.txt
@@ -0,0 +1,5 @@
+====== שינויים אחרונים ======
+
+הדפים הבאים עברו שינויים לאחרונה.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/register.txt
new file mode 100644
index 000000000..7225b02fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/register.txt
@@ -0,0 +1,3 @@
+====== הרשמה כמשתמש חדש ======
+
+יש למלא את כל המידע מטה כדי ליצור חשבון חדש בויקי זה. יש לודא כי מוזנת **כתובת דוא"ל תקפה**- סיסמתך החדשה תשלח לכתובת זו\\ על שם המשתמש להיות [[hdoku>ויקי:שם דף|שם דף]] תקף.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/registermail.txt
new file mode 100644
index 000000000..bb64a8158
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/registermail.txt
@@ -0,0 +1,14 @@
+משתמש חדש נרשם. הנה הפרטים:
+
+שם משתמש   : @NEWUSER@
+שם מלא     : @NEWNAME@
+דוא"ל      : @NEWEMAIL@
+
+תאריך      : @DATE@
+דפדפן      : @BROWSER@
+כתובת רשת  : @IPADDRESS@
+שם המחשב   : @HOSTNAME@
+
+-- 
+דוא"ל זה נוצר על ידי DokuWiki ב-
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/resendpwd.txt
new file mode 100644
index 000000000..47e7749c2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/resendpwd.txt
@@ -0,0 +1,4 @@
+====== שליחת סיסמה חדשה ======
+
+יש להזין את שם המשתמש בטופס מטה ולבקש סיסמה חדשה לחשבון שלך בויקי זה. קישור לאימות ישלח לכתובת הדו"ל איתה נרשמת.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/revisions.txt
new file mode 100644
index 000000000..6b23402f5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/revisions.txt
@@ -0,0 +1,4 @@
+====== גרסאות ישנות ======
+
+אלה גרסאות מוקדמות יותר של המסמך הנוכחי. כדי לשחזר גרסה מוקדמת יותר יש ללחוץ על הכפתור ''עריכה'' ולשמור את הדף.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/searchpage.txt
new file mode 100644
index 000000000..aed23be24
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/searchpage.txt
@@ -0,0 +1,5 @@
+====== חיפוש ======
+
+ניתן לראות את תוצאות החיפוש למטה. אם לא נמצאו דפים בחיפוש, לחיצה על הכפתור "עריכה" תיצור דף חדש על שם מילת החיפוש שהוזנה.
+
+===== תוצאות =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/showrev.txt
new file mode 100644
index 000000000..22ca0c3ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/showrev.txt
@@ -0,0 +1,2 @@
+**זו גרסה ישנה של המסמך!** לחיצה על כותרת המסמך תציג את גרסתו הנוכחית.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/stopwords.txt
new file mode 100644
index 000000000..ca85eb2e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/stopwords.txt
@@ -0,0 +1,29 @@
+# זוהי רשימת מילים ממנה מתעלם סורק התוכן, אחת בכל שורה
+# בעורכך קובץ זה עליך לודא כי נעשה שימוש בסימני סוף שורה של UNIX (שורה חדשה ללא החזרת הסמן)
+# אין צורך לכלול מילים בנות פחות משלוש אותיות - אלו נפסחות בכל מקרה
+# רשימה זו מבוססת על אלו הנמצאות ב- http://www.ranks.nl/stopwords
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/subscribermail.txt
new file mode 100644
index 000000000..7b05c4f47
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/subscribermail.txt
@@ -0,0 +1,17 @@
+שלום!
+
+הדף @PAGE@ בויקי @TITLE@ השתנה.
+הנה השינויים:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+כדי להפסיק את ההרשמה לדף זה יש להכנס לויקי ב-
+@DOKUWIKIURL@ לבקר בדף
+@NEWPAGE@
+ולבחור  'הפסק לעקוב'.
+
+-- 
+דוא"ל זה נוצר על ידי DokuWiki ב-
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/updateprofile.txt
new file mode 100644
index 000000000..494d8389d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/updateprofile.txt
@@ -0,0 +1,5 @@
+====== עידכון פרטי חשבונך ======
+
+אין צורך למלא מעבר לפרטים המיועדים לשינוי. לא ניתן לשנות את שם המשתמש.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/uploadmail.txt
new file mode 100644
index 000000000..fd670796c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/uploadmail.txt
@@ -0,0 +1,14 @@
+קובץ הועלה אל הדוקוויקי שלך. הנה פרטיו:
+
+קובץ : @MEDIA@
+תאריך : @DATE@
+דפדפן : @BROWSER@
+כתובת IP : @IPADDRESS@
+מארח : @HOSTNAME@
+גודל : @SIZE@
+סיווג : @MIME@
+משתמש : @USER@
+
+-- 
+דואר זה נוצר על ידי דוקוויקי בתובת
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/wordblock.txt
new file mode 100644
index 000000000..b7c3f0a7c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/he/wordblock.txt
@@ -0,0 +1,4 @@
+====== הצפה נחסמה ======
+
+השנויים שלך **לא** נשמרו מפני שהם מכילים מילה חסומה או יותר. אם באמת ניסית להציף את הויקי -- כלב רע! אם נראה לך כי זו טעות,ניתן ליצור קשר עם מנהל הויקי (מפני שאנחנו לא רוצים לקרוא לאנשים כלבים לחינם, זה פוגע בכלבים).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hi/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hi/lang.php
new file mode 100644
index 000000000..044d7d5a4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hi/lang.php
@@ -0,0 +1,126 @@
+<?php
+/**
+ * hi language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesHi.php?view=co
+ * @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'यह पृष्ठ संपादित करें';
+$lang['btn_source']            = 'पृष्ठ का श्रोत दिखाएँ';
+$lang['btn_show']              = 'पृष्ठ दिखाएँ';
+$lang['btn_create']            = 'इस पृष्ठ को बनायें';
+$lang['btn_search']            = 'खोजें';
+$lang['btn_save']              = 'सुरक्षित करें';
+$lang['btn_preview']           = 'पूर्वावलोकन';
+$lang['btn_top']               = 'वापस शीर्ष पर';
+$lang['btn_newer']             = '<< अधिक विगत';
+$lang['btn_older']             = 'अमूल विगत >>';
+$lang['btn_revs']              = 'पुराने संशोधन';
+$lang['btn_recent']            = 'विगत परिवर्तन';
+$lang['btn_upload']            = 'अपलोड करें';
+$lang['btn_cancel']            = 'रद्द करें';
+$lang['btn_index']             = 'सूचकांक';
+$lang['btn_secedit']           = 'संपादित करें';
+$lang['btn_login']             = 'लॉग इन';
+$lang['btn_logout']            = 'लॉगआउट';
+$lang['btn_admin']             = 'व्यवस्थापक';
+$lang['btn_update']            = 'अद्यतन करना';
+$lang['btn_delete']            = 'मिटाना';
+$lang['btn_back']              = 'पीछे';
+$lang['btn_backlink']          = 'पिछली कड़ियाँ';
+$lang['btn_backtomedia']       = 'मीडिया फाइल चयन पर पीछे जायें';
+$lang['user']                  = 'उपयोगकर्ता का नाम';
+$lang['pass']                  = 'गुप्त शब्द';
+$lang['newpass']               = 'नव गुप्त शब्द';
+$lang['passchk']               = 'पासवर्ड दुबारा लिखें';
+$lang['remember']              = 'मुझे स्मृत रखना';
+$lang['fullname']              = 'सही नाम';
+$lang['email']                 = 'ईमेल';
+$lang['badlogin']              = 'छमा करें, उपयोगकर्ता का नाम व गुप्त शब्द ग़लत था |';
+$lang['minoredit']             = 'अमूल चूल परिवर्तन';
+$lang['regmissing']            = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
+$lang['regbadpass']            = 'दोनो दिए गये गुप्तशब्द समान नहीं हैं | दोबारा प्रयास करें |';
+$lang['regpwmail']             = 'आपकी डोकुविकी का गुप्तशब्द';
+$lang['reghere']               = 'आपके पास अभी तक कोई खाता नहीं है? बस एक लें |';
+$lang['profna']                = 'यह विकी प्रोफ़ाइल संशोधन का समर्थन नहीं करता |';
+$lang['profnochange']          = 'कोई परिवर्तन नहीं, कुछ नहीं करना |';
+$lang['resendpwd']             = 'नवगुप्तशब्द भेजें';
+$lang['resendpwdmissing']      = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
+$lang['resendpwdsuccess']      = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |';
+$lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें';
+$lang['txt_filename']          = 'के रूप में अपलोड करें (वैकल्पिक)';
+$lang['txt_overwrt']           = 'अधिलेखित उपस्थित फ़ाइल';
+$lang['lockedby']              = 'इस समय तक बंद';
+$lang['lockexpire']            = 'बंद समाप्त होगा';
+$lang['nothingfound']          = 'कुच्छ नहीं मिला |';
+$lang['uploadexist']           = 'फ़ाइल पहले से उपस्थित है. कुछ भी नहीं किया |';
+$lang['mediafiles']            = 'उपलब्ध फाइलों में';
+$lang['js']['hidedetails']     = 'विवरण छिपाएँ';
+$lang['mediaview']             = 'मूल फ़ाइल देखें';
+$lang['reference']             = 'संदर्भ के लिए';
+$lang['ref_hidden']            = 'कुच्छ संदर्भ उन पन्नो पर हैं जिनको पड़ने की आपको अनुमति नहीं है|';
+$lang['toc']                   = 'विषय सूची';
+$lang['current']               = 'वर्तमान';
+$lang['yours']                 = 'आपका संस्करणः';
+$lang['diff']                  = 'वर्तमान संशोधन में मतभेद दिखाइये |';
+$lang['diff2']                 = 'चयनित संशोधन के बीच में मतभेद दिखाइये |';
+$lang['line']                  = 'रेखा
+';
+$lang['youarehere']            = 'आप यहाँ हैं |
+
+';
+$lang['lastmod']               = 'अंतिम बार संशोधित';
+$lang['by']                    = 'के द्वारा';
+$lang['deleted']               = 'हटाया';
+$lang['created']               = 'निर्मित';
+$lang['restored']              = 'पुराने संशोधन बहाल';
+$lang['external_edit']         = 'बाह्य सम्पादित';
+$lang['summary']               = 'सारांश संपादित करें';
+$lang['mail_newpage']          = 'पृष्ठ जोड़ा:';
+$lang['mail_changed']          = 'पृष्ठ बदला:';
+$lang['mail_new_user']         = 'नये उपयोगकर्ता:';
+$lang['mail_upload']           = 'अपलोड की गई फ़ाइल:';
+$lang['qb_bold']               = 'बोल्ड पाठ्य';
+$lang['qb_h1']                 = 'स्तर 1 शीर्षपंक्ति';
+$lang['qb_h2']                 = 'स्तर 2 शीर्षपंक्ति';
+$lang['qb_h3']                 = 'स्तर 3 शीर्षपंक्ति';
+$lang['qb_h4']                 = 'स्तर 4 शीर्षपंक्ति';
+$lang['qb_h5']                 = 'स्तर 5 शीर्षपंक्ति';
+$lang['qb_link']               = 'आंतरिक कड़ी';
+$lang['qb_extlink']            = 'बाह्य कड़ी';
+$lang['qb_hr']                 = 'खड़ी रेखा';
+$lang['qb_sig']                = 'हस्ताक्षर डालें';
+$lang['admin_register']        = 'नया उपयोगकर्ता जोड़ें';
+$lang['img_backto']            = 'वापस जाना';
+$lang['img_title']             = 'शीर्षक';
+$lang['img_caption']           = 'सहशीर्षक';
+$lang['img_date']              = 'तिथि';
+$lang['img_fsize']             = 'आकार';
+$lang['img_artist']            = 'फोटोग्राफर';
+$lang['img_format']            = 'प्रारूप';
+$lang['img_camera']            = 'कैमरा';
+$lang['i_chooselang']          = 'अपनी भाषा चुनें';
+$lang['i_installer']           = 'डोकुविकी इंस्टॉलर';
+$lang['i_wikiname']            = 'विकी का नाम';
+$lang['i_superuser']           = 'महाउपयोगकर्ता';
+$lang['i_retry']               = 'पुनःप्रयास';
+$lang['mu_gridsize']           = 'आकार';
+$lang['mu_gridstat']           = 'स्थिति';
+$lang['mu_browse']             = 'ब्राउज़
+';
+$lang['mu_toobig']             = 'बहुत बड़ा';
+$lang['mu_ready']              = 'अपलोड करने के लिए तैयार';
+$lang['mu_done']               = 'पूर्ण';
+$lang['mu_fail']               = 'असफल';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/admin.txt
new file mode 100644
index 000000000..15a2a2b13
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/admin.txt
@@ -0,0 +1,3 @@
+====== Administracija ======
+
+Slijedi spisak svih administracijskih poslova koji su trenutno dostupni.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/backlinks.txt
new file mode 100644
index 000000000..e7115a6b6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linkovi na stranicu ======
+
+Slijedi spisak svih dokumenata koji imaju link na trenutni.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/conflict.txt
new file mode 100644
index 000000000..e33d7020a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/conflict.txt
@@ -0,0 +1,5 @@
+====== Postoji novija verzija ======
+
+Već postoji novija verzija dokumenta kojeg ste mijenjali. To se dešava jer je neki drugi korisnik snimio dokument za vrijeme dok ste ga Vi mijenjali.
+
+Proučite promjene koje slijede i odaberite koje želite preuzeti. Odaberite ''Snimi'' da biste snimili Vašu verziju ili ''Poništi'' da ostavite sačuvanu trenutnu verziju dokumenta.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/denied.txt
new file mode 100644
index 000000000..216eea582
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/denied.txt
@@ -0,0 +1,5 @@
+====== Niste autorizirani ======
+
+Nemate autorizaciju.
+
+Niste li se možda zaboravili prijaviti u aplikaciju?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/diff.txt
new file mode 100644
index 000000000..ce6c8c4cb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/diff.txt
@@ -0,0 +1,3 @@
+====== Razlike ======
+
+Slijede sve razlike između odabrane i trenutne verzije dokumenta
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/edit.txt
new file mode 100644
index 000000000..8cd57d524
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/edit.txt
@@ -0,0 +1 @@
+Nakon što ste napravili sve potrebne promjene - odaberite ''Snimi'' za snimanje dokumenta.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/editrev.txt
new file mode 100644
index 000000000..911855f47
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/editrev.txt
@@ -0,0 +1,2 @@
+**Učitali ste stariju verziju dokumenta!** Ukoliko je snimite - biti će kreirana nova verzija dokumenta.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/index.txt
new file mode 100644
index 000000000..9c30a805c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/index.txt
@@ -0,0 +1 @@
+====== Indeks ======
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/lang.php
new file mode 100644
index 000000000..05a20c25e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/lang.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * croatian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Tomo Krajina <aaa@puzz.info>
+ * @author Branko Rihtman <theney@gmail.com>
+ * @author Dražen Odobašić <dodobasic@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Izmijeni dokument';
+$lang['btn_source']            = 'Prikaži kod dokumenta';
+$lang['btn_show']              = 'Prikaži dokument';
+$lang['btn_create']            = 'Novi dokument';
+$lang['btn_search']            = 'Pretraži';
+$lang['btn_save']              = 'Snimi';
+$lang['btn_preview']           = 'Prikaži';
+$lang['btn_top']               = 'Na vrh';
+$lang['btn_newer']             = '<< noviji';
+$lang['btn_older']             = 'stariji >>';
+$lang['btn_revs']              = 'Stare inačice';
+$lang['btn_recent']            = 'Nedavne izmjene';
+$lang['btn_upload']            = 'Postavi';
+$lang['btn_cancel']            = 'Odustani';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Izmjeni';
+$lang['btn_login']             = 'Prijavi se';
+$lang['btn_logout']            = 'Odjavi se';
+$lang['btn_admin']             = 'Administriranje';
+$lang['btn_update']            = 'Ažuriraj';
+$lang['btn_delete']            = 'Obriši';
+$lang['btn_back']              = 'Povratak';
+$lang['btn_backlink']          = 'Povratni linkovi';
+$lang['btn_backtomedia']       = 'Povratak na Mediafile izbornik';
+$lang['btn_subscribe']         = 'Pretplati se na promjene dokumenta';
+$lang['btn_unsubscribe']       = 'Odjavi pretplatu o promjenama dokumenta';
+$lang['btn_subscribens']       = 'Pretplati se na promjene imenskog prostora';
+$lang['btn_unsubscribens']     = 'Odjavi pretplatu o promjenama imenskog prostora';
+$lang['btn_profile']           = 'Ažuriraj profil';
+$lang['btn_reset']             = 'Poništi promjene';
+$lang['btn_resendpwd']         = 'Pošalji novu lozinku';
+$lang['btn_draft']             = 'Uredi nacrt dokumenta';
+$lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
+$lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
+$lang['loggedinas']            = 'Prijavljen kao';
+$lang['user']                  = 'Korisničko ime';
+$lang['pass']                  = 'Lozinka';
+$lang['newpass']               = 'Nova lozinka';
+$lang['oldpass']               = 'Potvrdi trenutnu lozinku';
+$lang['passchk']               = 'Ponoviti';
+$lang['remember']              = 'Zapamti me';
+$lang['fullname']              = 'Ime i prezime';
+$lang['email']                 = 'Email';
+$lang['register']              = 'Registracija';
+$lang['profile']               = 'Korisnički profil';
+$lang['badlogin']              = 'Ne ispravno korisničko ime ili lozinka.';
+$lang['minoredit']             = 'Manje izmjene';
+$lang['draftdate']             = 'Nacrt dokumenta je automatski spremljen u ';
+$lang['nosecedit']             = 'Stranica se u međuvremenu promijenila. Informacija o odjeljku je ostarila pa je učitana kompletna stranica.';
+$lang['regmissing']            = 'Morate popuniti sva polja.';
+$lang['reguexists']            = 'Korisnik s tim korisničkim imenom već postoji.';
+$lang['regsuccess']            = 'Korisnik je uspješno stvoren i poslana je lozinka emailom.';
+$lang['regsuccess2']           = 'Korisnik je uspješno stvoren.';
+$lang['regmailfail']           = 'Pojavila se greška prilikom slanja lozinke emailom. Kontaktirajte administratora!';
+$lang['regbadmail']            = 'Email adresa nije ispravna, ukoliko ovo smatrate greškom, kontaktirajte administratora.';
+$lang['regbadpass']            = 'Unesene lozinke nisu jednake, pokušajte ponovno.';
+$lang['regpwmail']             = 'Vaša DokuWiki lozinka';
+$lang['reghere']               = 'Još uvijek nemate korisnički račun? Registrirajte se.';
+$lang['profna']                = 'Ovaj wiki ne dopušta izmjene korisničkog profila.';
+$lang['profnochange']          = 'Nema izmjena.';
+$lang['profnoempty']           = 'Prazno korisničko ime ili email nisu dopušteni.';
+$lang['profchanged']           = 'Korisnički profil je uspješno izmijenjen.';
+$lang['pwdforget']             = 'Izgubili ste lozinku? Zatražite novu';
+$lang['resendna']              = 'Ovaj wiki ne podržava ponovno slanje lozinke emailom.';
+$lang['resendpwd']             = 'Poslati novu lozinku za';
+$lang['resendpwdmissing']      = 'Ispunite sva polja.';
+$lang['resendpwdnouser']       = 'Nije moguće pronaći korisnika.';
+$lang['resendpwdbadauth']      = 'Neispravan autorizacijski kod. Provjerite da li ste koristili potpun potvrdni link.';
+$lang['resendpwdconfirm']      = 'Potvrdni link je poslan emailom.';
+$lang['resendpwdsuccess']      = 'Nova lozinka je poslana emailom.';
+$lang['license']               = 'Osim na mjestima gdje je naznačeno drugačije, sadržaj ovog wikija je licenciran sljedećom licencom:';
+$lang['licenseok']             = 'Pažnja: promjenom ovog dokumenta pristajete licencirati sadržaj sljedećom licencom: ';
+$lang['txt_upload']            = 'Odaberite datoteku za postavljanje';
+$lang['txt_filename']          = 'Postaviti kao (nije obavezno)';
+$lang['txt_overwrt']           = 'Prepiši postojeću datoteku';
+$lang['lockedby']              = 'Zaključao';
+$lang['lockexpire']            = 'Zaključano do';
+$lang['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['notsavedyet']           = 'Vaše izmjene će se izgubiti.\nŽelite li nastaviti?';
+$lang['rssfailed']             = 'Došlo je do greške prilikom preuzimanja feed-a: ';
+$lang['nothingfound']          = 'Traženi dokumetni nisu pronađeni.';
+$lang['mediaselect']           = 'Mediafile datoteke';
+$lang['fileupload']            = 'Mediafile postavljanje';
+$lang['uploadsucc']            = 'Postavljanje uspješno';
+$lang['uploadfail']            = 'Neuspješno postavljanje. Možda dozvole na poslužitelju nisu ispravne?';
+$lang['uploadwrong']           = 'Postavljanje nije dopušteno. Nastavak datoteke je zabranjen!';
+$lang['uploadexist']           = 'Datoteka već postoji.';
+$lang['uploadbadcontent']      = 'Postavljeni sadržaj ne odgovara ekstenziji %s datoteke.';
+$lang['uploadspam']            = 'Postavljanje je blokirano spam crnom listom.';
+$lang['uploadxss']             = 'Postavljanje je blokirano zbog mogućeg zlonamjernog sadržaja.';
+$lang['uploadsize']            = 'Postavljena datoteka je prevelika (max. %s)';
+$lang['deletesucc']            = 'Datoteka "%s" je obrisana.';
+$lang['deletefail']            = '"%s" se ne može obrisati - provjerite dozvole na poslužitelju.';
+$lang['mediainuse']            = 'Datoteka "%s" nije obrisana - još uvijek se koristi.';
+$lang['namespaces']            = 'Imenski prostori';
+$lang['mediafiles']            = 'Datoteke u';
+$lang['js']['keepopen']        = 'Ostavi prozor otvoren nakon izbora';
+$lang['js']['hidedetails']     = 'Sakrij detalje';
+$lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s Internet Explorerom. Link je još uvijek moguće kopirati i zalijepiti.';
+$lang['js']['mu_btn']          = 'Postavi više datoteka odjednom';
+$lang['mediausage']            = 'Koristi sljedeću sintaksu za referenciranje ove datoteke:';
+$lang['mediaview']             = 'Pregledaj originalnu datoteku';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Postavi datoteku u odabrani imenski prostor. Podimenski prostori se stvaraju dodavanjem istih kao prefiks naziva datoteke u "Postavi kao" polju, tako da se odvoje dvotočkama.';
+$lang['mediaextchange']        = 'Ekstenzija datoteke promijenjena iz .%s u .%s!';
+$lang['reference']             = 'Reference za';
+$lang['ref_inuse']             = 'Datoteka se ne može obrisati jer se još uvijek koristi u sljedećim dokumentima:';
+$lang['ref_hidden']            = 'Neke reference se nalaze na dokumentima koje nemate dozvolu čitati';
+$lang['hits']                  = 'Pronađeno';
+$lang['quickhits']             = 'Pronađeno po nazivima dokumenata';
+$lang['toc']                   = 'Sadržaj';
+$lang['current']               = 'trenutno';
+$lang['yours']                 = 'Vaša inačica';
+$lang['diff']                  = 'Prikaži razlike u odnosu na trenutnu inačicu';
+$lang['diff2']                 = 'Pokaži razlike između odabranih inačica';
+$lang['line']                  = 'Redak';
+$lang['breadcrumb']            = 'Putanja';
+$lang['youarehere']            = 'Vi ste ovdje';
+$lang['lastmod']               = 'Zadnja izmjena';
+$lang['by']                    = 'od';
+$lang['deleted']               = 'obrisano';
+$lang['created']               = 'stvoreno';
+$lang['restored']              = 'vraćena prijašnja inačica';
+$lang['external_edit']         = 'vanjsko uređivanje';
+$lang['summary']               = 'Sažetak izmjena';
+$lang['noflash']               = 'Za prikazivanje ovog sadržaja potreban je <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
+$lang['mail_newpage']          = 'stranica dodana:';
+$lang['mail_changed']          = 'stranica izmjenjena:';
+$lang['mail_new_user']         = 'novi korisnik:';
+$lang['mail_upload']           = 'datoteka postavljena:';
+$lang['qb_bold']               = 'Podebljani tekst';
+$lang['qb_italic']             = 'Ukošeni tekst';
+$lang['qb_underl']             = 'Podcrtani tekst';
+$lang['qb_code']               = 'Kod';
+$lang['qb_strike']             = 'Precrtani tekst';
+$lang['qb_h1']                 = 'Naslov - razina 1';
+$lang['qb_h2']                 = 'Naslov - razina 2';
+$lang['qb_h3']                 = 'Naslov - razina 3';
+$lang['qb_h4']                 = 'Naslov - razina 4';
+$lang['qb_h5']                 = 'Naslov - razina 5';
+$lang['qb_h']                  = 'Naslov';
+$lang['qb_hs']                 = 'Odaberite naslov';
+$lang['qb_hplus']              = 'Naslov više razine';
+$lang['qb_hminus']             = 'Naslov niže razine';
+$lang['qb_hequal']             = 'Naslov iste razine';
+$lang['qb_link']               = 'Interni link';
+$lang['qb_extlink']            = 'Vanjski link';
+$lang['qb_hr']                 = 'Vodoravna crta';
+$lang['qb_ol']                 = 'Pobrojana lista';
+$lang['qb_ul']                 = 'Lista';
+$lang['qb_media']              = 'Dodaj slike i ostale datoteke';
+$lang['qb_sig']                = 'Potpis';
+$lang['qb_smileys']            = 'Smiješkići';
+$lang['qb_chars']              = 'Posebni znakovi';
+$lang['js']['del_confirm']           = 'Zbilja želite obrisati odabrane stavke?';
+$lang['admin_register']        = 'Dodaj novog korisnika';
+$lang['metaedit']              = 'Uredi metapodatake';
+$lang['metasaveerr']           = 'Neuspješno zapisivanje metapodataka';
+$lang['metasaveok']            = 'Spremljeni metapdaci';
+$lang['img_backto']            = 'Povratak na';
+$lang['img_title']             = 'Naziv';
+$lang['img_caption']           = 'Naslov';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Ime datoteke';
+$lang['img_fsize']             = 'Veličina';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Autorsko pravo';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Ključne riječi';
+$lang['subscribe_success']     = 'Dodan %s na listu preplata za %s';
+$lang['subscribe_error']       = 'Greška prilikom dodavanju %s na listu pretplata za %s';
+$lang['subscribe_noaddress']   = 'Nije postavljena email adresa za vaš korisnički profil, nije Vas moguće dodati na listu pretplata';
+$lang['unsubscribe_success']   = 'Izbrisan %s s liste pretplata za %s';
+$lang['unsubscribe_error']     = 'Greška prilikom brisanja %s s liste pretplatnika za %s';
+$lang['authmodfailed']         = 'Greška u konfiguraciji korisničke autentifikacije. Molimo Vas da kontaktirate administratora.';
+$lang['authtempfail']          = 'Autentifikacija korisnika je privremeno nedostupna. Molimo Vas da kontaktirate administratora.';
+$lang['i_chooselang']          = 'Izaberite vaš jezik';
+$lang['i_installer']           = 'DokuWiki instalacija';
+$lang['i_wikiname']            = 'Naziv Wikija';
+$lang['i_enableacl']           = 'Omogući ACL (preporučeno)';
+$lang['i_superuser']           = 'Superkorisnik';
+$lang['i_problems']            = 'Instalacija je pronašla probleme koji su naznačeni ispod. Nije moguće nastaviti dok se ti problemi ne riješe.';
+$lang['i_modified']            = 'Zbog sigurnosnih razlog, ova skripta ce raditi samo sa novim i nepromijenjenim instalacijama dokuWikija. Preporucujemo da ili re-ekstraktirate fajlove iz downloadovanog paketa ili konsultujete pune a href="http://dokuwiki.org/install">Instrukcije za instalaciju Dokuwikija</a>';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/locked.txt
new file mode 100644
index 000000000..ff081aad8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/locked.txt
@@ -0,0 +1,3 @@
+====== Dokument zaključan ======
+
+Mijenjanje ovog dokumenta je trenutno onemogućeno jer je otvoren od strane nekog drugog korisnika. Morate pričekati da on završi sa svojim izmjenama.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/login.txt
new file mode 100644
index 000000000..216af130d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/login.txt
@@ -0,0 +1,3 @@
+====== Prijava ======
+
+Upišite korisničko ime i lozinku da biste se prijavili.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/mailtext.txt
new file mode 100644
index 000000000..911f8eade
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/mailtext.txt
@@ -0,0 +1,16 @@
+Dokument na Vašem wiki-ju je promijenjen ili dodan:
+
+Datum             : @DATE@
+Preglednik        : @BROWSER@
+IP-Adresa         : @IPADDRESS@
+Host              : @HOSTNAME@
+Prijašnja verzija : @OLDPAGE@
+Nova verzija      : @NEWPAGE@
+Opis izmjene      : @SUMMARY@
+Korisnik          : @USER@
+
+@DIFF@
+
+
+-- 
+Ovaj email je poslan na: @DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/newpage.txt
new file mode 100644
index 000000000..39346580f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/newpage.txt
@@ -0,0 +1,3 @@
+====== Dokument ne postoji ======
+
+Traženi dokument (još) ne postoji. Ukoliko ga želite otvoriti kliknite na ''Novi dokument''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/norev.txt
new file mode 100644
index 000000000..231fb5edf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/norev.txt
@@ -0,0 +1,3 @@
+====== Nepostojeća verzija ======
+
+Tražena verzija dokumenta ne postoji.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/preview.txt
new file mode 100644
index 000000000..89ae86a71
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/preview.txt
@@ -0,0 +1,3 @@
+====== Pregled ======
+
+Ovo je pregled kako će izgledati Vaš dokument nakon što se snimi.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/read.txt
new file mode 100644
index 000000000..d036c0a7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/read.txt
@@ -0,0 +1 @@
+Nije dopušteno mijenjati sadržaj ove stranice.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/recent.txt
new file mode 100644
index 000000000..4145ca1c5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/recent.txt
@@ -0,0 +1,3 @@
+====== Nedavne izmjene ======
+
+Stranice koje su nedavno promijenjene.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/register.txt
new file mode 100644
index 000000000..32a5489fb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/register.txt
@@ -0,0 +1,3 @@
+====== Prijava novog korisnika ======
+
+Ispunite potrebne podatke da biste dobili korisnički račun na wikiju. Posebno obratite pažnju da ste unijeli valjani email.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/resendpwd.txt
new file mode 100644
index 000000000..fe2c72bf3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Slanje nove lozinke ======
+
+Ispunite potrebne podatke da biste dobili novu lozinku za Vaš korisnički račun.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/revisions.txt
new file mode 100644
index 000000000..d224a56f3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/revisions.txt
@@ -0,0 +1,3 @@
+====== Stare verzije ======
+
+Slijedi spisak starih verzija za traženi dokument.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/searchpage.txt
new file mode 100644
index 000000000..91d9f9c0a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/searchpage.txt
@@ -0,0 +1 @@
+====== Rezultati pretraživanja ======
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/showrev.txt
new file mode 100644
index 000000000..aba2c0db0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/showrev.txt
@@ -0,0 +1,2 @@
+**Ovo je stara verzija dokumenta!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/stopwords.txt
new file mode 100644
index 000000000..bc6eb48ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/stopwords.txt
@@ -0,0 +1,29 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/subscribermail.txt
new file mode 100644
index 000000000..c55b4a288
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/subscribermail.txt
@@ -0,0 +1,16 @@
+Pozdrav!
+
+Stranica @PAGE@ na @TITLE@ je promijenjena.
+Slijede promjene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ukoliko se želite odjaviti s ove pretplate - prijavite se na:
+@DOKUWIKIURL@ zatim odite na
+@NEWPAGE@
+i odaberite 'Odjava'.
+
+-- 
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/updateprofile.txt
new file mode 100644
index 000000000..8eab906d2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Izmjena korisničkog profila ======
+
+Ispunite samo polja koja želite mijenjati. Ne može se mijenjati korisničko ime.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/wordblock.txt
new file mode 100644
index 000000000..7faf03c19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hr/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM blokiranje ======
+
+Vaše izmjene **nisu** snimljene jer sadrže jednu ili više blokiranih/zabranjenih riječi. Ukoliko mislite da je to greška - molimo Vas da kontaktirate administratora.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/admin.txt
new file mode 100644
index 000000000..03d29243c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/admin.txt
@@ -0,0 +1,3 @@
+===== Adminisztrálás =====
+
+Itt találod a DokuWiki adminisztrálási lehetőségeit.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/adminplugins.txt
new file mode 100644
index 000000000..89fe3738a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/adminplugins.txt
@@ -0,0 +1 @@
+===== További modulok =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/backlinks.txt
new file mode 100644
index 000000000..d457ab769
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/backlinks.txt
@@ -0,0 +1,5 @@
+====== Hivatkozások ======
+
+Ez azoknak az oldalaknak a listája, amelyek erre az oldalra "visszamutatnak" (hivatkoznak).
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/conflict.txt
new file mode 100644
index 000000000..b823465b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/conflict.txt
@@ -0,0 +1,7 @@
+====== Újabb változat létezik ======
+
+Az általad szerkesztett dokumentumnak egy újabb változata létezik. Ez akkor történik, ha egy másik felhasználó megváltoztatta a dokumentumot, amíg szerkesztetted.
+
+Nézd át gondosan a lenti eltéréseket, aztán dönts arról, melyik változatot tartod meg. Ha ''Mentés'' gombot választod, akkor a Te változatod kerül mentésre. Nyomj ''Mégsem'' gombot a jelenlegi változat megtartásához.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/denied.txt
new file mode 100644
index 000000000..0b06724df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/denied.txt
@@ -0,0 +1,4 @@
+====== Hozzáférés megtagadva ======
+
+Sajnáljuk, nincs jogod a folytatáshoz. Esetleg elfelejtettél bejelentkezni?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/diff.txt
new file mode 100644
index 000000000..6a09cdea2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/diff.txt
@@ -0,0 +1,4 @@
+====== Különbségek ======
+
+A kiválasztott változat és az aktuális verzió közötti különbséget mutatjuk.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/draft.txt
new file mode 100644
index 000000000..4d12e2e0c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/draft.txt
@@ -0,0 +1,5 @@
+===== Piszkozatot találtunk =====
+
+Az oldal utolsó szerkesztését nem fejezted be rendesen. A DokuWiki elmentette piszkozatként, így most folytathatod a szerkesztést. Lent látható, amit az utolsó szerkesztésből elmentettünk.
+
+Válassz a //helyreállítás// vagy a //törlés// opciók közül a piszkozat sorsát illetően.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/edit.txt
new file mode 100644
index 000000000..898387cf2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/edit.txt
@@ -0,0 +1 @@
+Szerkeszd az oldalt majd üsd le a ''Mentés'' gombot. Lásd a [[wiki:syntax|nyelvtan]] oldalt a formázási lehetőségekért. Kérünk, hogy csak akkor szerkeszd az oldalt ha **jobbítani** tudod. Ha ki akarsz próbálni dolgokat akkor az első lépéseid a [[playground:playground|játszótéren]] (playground) tedd.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/editrev.txt
new file mode 100644
index 000000000..e17662e60
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/editrev.txt
@@ -0,0 +1,2 @@
+**Egy korábbi változatot töltöttél be!** Ha elmented, akkor egy újabb aktuális verzió jön létre ezzel a tartalommal.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/index.txt
new file mode 100644
index 000000000..ebf15148d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/index.txt
@@ -0,0 +1,4 @@
+====== Áttekintő (index) ======
+
+Az összes elérhető oldal áttekintése [[doku>namespaces|névterek]] szerint rendezve.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/install.html
new file mode 100644
index 000000000..1676e9364
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/install.html
@@ -0,0 +1,26 @@
+<p>Ez az oldal segít a <a href="http://dokuwiki.org">DokuWiki</a> kezdeti
+beállításában és a konfigurálásban. További információ 
+<a href="http://dokuwiki.org/installer">ezen az oldalon</a>
+található.</p>
+
+<p>A DokuWiki hagyományos fájlokat használ a wiki oldalak és a hozzájuk
+kapcsolódó információk (pl. képek, keresési indexek, korábbi változatok stb.)
+tárolásához. Emiatt a sikeres működés érdekében a DokuWikinek írási joggal
+<strong>kell</strong> rendelkeznie azokon a könyvtárakon, ahová ezek a
+fájlok kerülnek. Ez a Beállító Varázsló nem képes beállítani a könyvtárakhoz
+a szükséges jogosultságokat, azokat közvetlenül parancssorból kell megtenni,
+illetve tárhelyszolgáltatás igénybevétele esetén FTP kliens segítségével,
+vagy a tárhelyszolgáltató által rendelkezésre bocsátott beállítóeszköz
+(pl. cPanel) segítségével.</p>
+
+<p>A Beállító Varázsló felkészíti ezt a DokuWikit a hozzáférési listák
+(<acronym title="access control list">ACL</acronym>-ek) használatára. Így
+a Wiki-gazda felhasználóval hozzáférünk az admin menühöz, mellyel
+bővítményeket telepíthetünk, felhasználókat és hozzáférési jogokat
+kezelhetünk, valamint változtathatunk a konfigurációs beállításokon.
+Ez tulajdonképpen nem szükséges a DokuWiki működéséhez, de megkönnyíti
+az adminisztrációt.</p>
+
+<p>Szakértők illetve speciális beállítást igénylő felhasználók további információkat
+találnak a következő oldalakon <a href="http://dokuwiki.org/install">telepítéssel</a>
+és <a href="http://dokuwiki.org/config">konfigurálási lehetőségekkel</a> kapcsolatban.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/lang.php
new file mode 100644
index 000000000..b9218f897
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/lang.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Ziegler Gábor <gziegler@freemail.hu>
+ * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
+ * @author Siaynoq Siaynoq <siaynoqmage@gmail.com>
+ * @author Siaynoq Mage <siaynoqmage@gmail.com>
+ * @author schilling.janos@gmail.com
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Oldal szerkesztése';
+$lang['btn_source']            = 'Oldalforrás megtekintése';
+$lang['btn_show']              = 'Oldal megtekintése';
+$lang['btn_create']            = 'Oldal létrehozása';
+$lang['btn_search']            = 'Keresés';
+$lang['btn_save']              = 'Mentés';
+$lang['btn_preview']           = 'Előnézet';
+$lang['btn_top']               = 'Vissza a tetejére';
+$lang['btn_newer']             = '<< Újabb változat';
+$lang['btn_older']             = 'Régebbi változat >>';
+$lang['btn_revs']              = 'Korábbi változatok';
+$lang['btn_recent']            = 'Legfrissebb változások';
+$lang['btn_upload']            = 'Feltöltés';
+$lang['btn_cancel']            = 'Mégsem';
+$lang['btn_index']             = 'Áttekintő';
+$lang['btn_secedit']           = 'Szerkesztés';
+$lang['btn_login']             = 'Bejelentkezés';
+$lang['btn_logout']            = 'Kijelentkezés';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Frissítés';
+$lang['btn_delete']            = 'Törlés';
+$lang['btn_back']              = 'Vissza';
+$lang['btn_backlink']          = 'Hivatkozások';
+$lang['btn_backtomedia']       = 'Vissza a médiafájlok kezeléséhez';
+$lang['btn_subscribe']         = 'Oldalváltozások-hírlevél feliratkozás';
+$lang['btn_unsubscribe']       = 'Oldalváltozások-hírlevél leiratkozás';
+$lang['btn_subscribens']       = 'Névtér-változás hírlevél feliratkozás';
+$lang['btn_unsubscribens']     = 'Névtér-változás hírlevél leiratkozás';
+$lang['btn_profile']           = 'Személyes beállítások';
+$lang['btn_reset']             = 'Alaphelyzet';
+$lang['btn_resendpwd']         = 'Új jelszó küldése';
+$lang['btn_draft']             = 'Piszkozat szerkesztése';
+$lang['btn_recover']           = 'Piszkozat folytatása';
+$lang['btn_draftdel']          = 'Piszkozat törlése';
+$lang['btn_revert']            = 'Helyreállítás';
+$lang['loggedinas']            = 'Belépett felhasználó: ';
+$lang['user']                  = 'Azonosító';
+$lang['pass']                  = 'Jelszó';
+$lang['newpass']               = 'Új jelszó';
+$lang['oldpass']               = 'Régi jelszó';
+$lang['passchk']               = 'még egyszer';
+$lang['remember']              = 'Emlékezz rám';
+$lang['fullname']              = 'Teljes név';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Regisztráció';
+$lang['profile']               = 'Személyes beállítások';
+$lang['badlogin']              = 'Sajnáljuk, az azonosító, vagy a jelszó nem jó.';
+$lang['minoredit']             = 'Apróbb változások';
+$lang['draftdate']             = 'Piszkozat elmentve:';
+$lang['nosecedit']             = 'Időközben megváltozott az oldal, emiatt a szakasz nem friss. Töltse újra az egész oldalt!';
+$lang['regmissing']            = 'Sajnáljuk, az összes mezőt ki kell töltened.';
+$lang['reguexists']            = 'Sajnáljuk, ilyen azonosítójú felhasználónk már van.';
+$lang['regsuccess']            = 'A felhasználói azonosítót létrehoztuk. A jelszót postáztuk.';
+$lang['regsuccess2']           = 'A felhasználói azonosítót létrehoztuk.';
+$lang['regmailfail']           = 'Úgy tűnik hiba történt a jelszó postázása során. Kérjük lépj kapcsolatba a Wiki-gazdával!!';
+$lang['regbadmail']            = 'A megadott e-mail cím érvénytelennek tűnik. Ha úgy gondolod ez hiba, lépj kapcsolatba Wiki-gazdával!';
+$lang['regbadpass']            = 'A két megadott jelszó nem egyezik, próbáld újra!';
+$lang['regpwmail']             = 'A DokuWiki jelszavad';
+$lang['reghere']               = 'Még nincs azonosítód? Itt kérhetsz';
+$lang['profna']                = 'Ez a wiki nem támogatja a személyes beállítások módosítását.';
+$lang['profnochange']          = 'Nem történt változás.';
+$lang['profnoempty']           = 'A név és e-mail mező nem maradhat üresen!';
+$lang['profchanged']           = 'A személyes beállítások változtatása megtörtént.';
+$lang['pwdforget']             = 'Elfelejtetted a jelszavad? Itt kérhetsz újat';
+$lang['resendna']              = 'Ez a wiki nem támogatja a jelszó újraküldést.';
+$lang['resendpwd']             = 'Új jelszó kiküldése ennek a felhasználónak';
+$lang['resendpwdmissing']      = 'Sajnáljuk, az összes mezőt ki kell töltened.';
+$lang['resendpwdnouser']       = 'Sajnáljuk, ilyen azonosítójú felhasználónk nem létezik.';
+$lang['resendpwdbadauth']      = 'Sajnáljuk, ez a megerősítő kód nem helyes. Biztos, hogy a teljes megerősítés linket beírtad pontosan?';
+$lang['resendpwdconfirm']      = 'A megerősítés linket e-mailben elküldtük.';
+$lang['resendpwdsuccess']      = 'Az új jelszavadat elküldtük e-mailben.';
+$lang['license']               = 'Hacsak máshol nincs egyéb rendelkezés, ezen wiki tartalma a következő licenc alatt érhető el:';
+$lang['licenseok']             = 'Megjegyzés: az oldal szerkesztésével elfogadja, hogy a tartalom a következő licenc alatt lesz elérhető:';
+$lang['searchmedia']           = 'Keresett fájl neve:';
+$lang['searchmedia_in']        = 'Keresés a következőben: %s';
+$lang['txt_upload']            = 'Válaszd ki a feltöltendő fájlt';
+$lang['txt_filename']          = 'feltöltési név (elhagyható)';
+$lang['txt_overwrt']           = 'Létező fájl felülírása';
+$lang['lockedby']              = 'Jelenleg zárolta:';
+$lang['lockexpire']            = 'A zárolás lejár:';
+$lang['willexpire']            = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolási időzítés frissítéséhez.';
+$lang['notsavedyet']           = 'Elmentetlen változások vannak, amelyek el fognak veszni.\nTényleg ezt akarod?';
+$lang['rssfailed']             = 'Hiba történt ennek a betöltésekor: ';
+$lang['nothingfound']          = 'Semmit sem találtam.';
+$lang['mediaselect']           = 'Médiafájl kiválasztása';
+$lang['fileupload']            = 'Médiafájl feltöltése';
+$lang['uploadsucc']            = 'A feltöltés sikerült';
+$lang['uploadfail']            = 'A feltöltés nem sikerült. Talán rosszak a jogosultságok?';
+$lang['uploadwrong']           = 'A feltöltés megtagadva. Ez a fájl kiterjesztés tiltott.';
+$lang['uploadexist']           = 'A fájl már létezik, nem történt semmi.';
+$lang['uploadbadcontent']      = 'A feltöltött tartalom nem egyezik a %s fájl kiterjesztéssel.';
+$lang['uploadspam']            = 'A feltöltést visszautasítottuk spam-gyanú miatt.';
+$lang['uploadxss']             = 'A feltöltést visszautasítottuk, mert lehetséges, hogy kártékony kódot tartalmaz.';
+$lang['uploadsize']            = 'A feltöltött fájl túl nagy. (max. %s)';
+$lang['deletesucc']            = 'A "%s" fájlt töröltük.';
+$lang['deletefail']            = 'A "%s" fájl nem törölhető. - Ellenőrizd a jogosultságokat!';
+$lang['mediainuse']            = 'A "%s" fájl nem törlődött - még használat alatt van.';
+$lang['namespaces']            = 'Névtér';
+$lang['mediafiles']            = 'Elérhető fájlok itt:';
+$lang['js']['searchmedia']     = 'Fájlok keresése';
+$lang['js']['keepopen']        = 'Tartsd nyitva ezt az ablakot a kijelöléshez!';
+$lang['js']['hidedetails']     = 'Részletek elrejtése';
+$lang['js']['nosmblinks']      = 'A Windows megosztott könyvtárak kereszthivatkozása csak  Microsoft Internet Explorerben működik közvetlenül.
+A hivatkozást másolni és beszúrni ettől fügetlenül mndig tudod.';
+$lang['js']['linkwiz']         = 'Hivatkozás varázsló';
+$lang['js']['linkto']          = 'Hivatkozás erre:';
+$lang['js']['del_confirm']     = 'Valóban törölni akarod a kiválasztott elem(ek)et?';
+$lang['js']['mu_btn']          = 'Több fájl feltöltése egyszerre';
+$lang['mediausage']            = 'A következő formában hivatkozhatsz erre az állományra:';
+$lang['mediaview']             = 'Eredeti állomány megtekintése';
+$lang['mediaroot']             = 'kiindulási hely';
+$lang['mediaupload']           = 'Itt tölthetsz fel állományt az aktuális névtérbe. Al-névtér létrehozásához a "Feltöltési név" mezőben kell kettősponttal elválasztva megadnod azt.';
+$lang['mediaextchange']        = 'Az állomány kiterjesztése erről: .%s erre: .%s változott!';
+$lang['reference']             = 'Hivatkozások';
+$lang['ref_inuse']             = 'A fájl nem törölhető, mert a következő oldalakon használják:';
+$lang['ref_hidden']            = 'Van néhány hivatkozás az oldalakon, amelyekhez nincs olvasási jogosultságod';
+$lang['hits']                  = 'Találatok';
+$lang['quickhits']             = 'Illeszkedő oldalnevek';
+$lang['toc']                   = 'Tartalomjegyzék';
+$lang['current']               = 'aktuális';
+$lang['yours']                 = 'A te változatod';
+$lang['diff']                  = 'a különbségeket mutatja az aktuális változathoz képest';
+$lang['diff2']                 = 'a különbségeket mutatja a kiválasztott változatok között';
+$lang['line']                  = 'sorszám';
+$lang['breadcrumb']            = 'Nyomvonal';
+$lang['youarehere']            = 'Itt vagy';
+$lang['lastmod']               = 'Utolsó módosítás';
+$lang['by']                    = 'szerkesztette:';
+$lang['deleted']               = 'eltávolítva';
+$lang['created']               = 'létrehozva';
+$lang['restored']              = 'az előző változat helyreállítva';
+$lang['external_edit']         = 'külső szerkesztés';
+$lang['summary']               = 'A változások összefoglalása';
+$lang['noflash']               = 'Ennek a tartalomnak a megtekintéséhez <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> szükséges.';
+$lang['download']              = 'Kódrészlet letöltése';
+$lang['mail_newpage']          = 'új oldal jött létre:';
+$lang['mail_changed']          = 'oldal megváltozott:';
+$lang['mail_new_user']         = 'Új felhasználó:';
+$lang['mail_upload']           = 'állományt töltöttek fel:';
+$lang['qb_bold']               = 'Félkövér szöveg';
+$lang['qb_italic']             = 'Dőlt szöveg';
+$lang['qb_underl']             = 'Aláhúzott szöveg';
+$lang['qb_code']               = 'Forráskód szöveg';
+$lang['qb_strike']             = 'Áthúzott szöveg';
+$lang['qb_h1']                 = '1. szintű címsor';
+$lang['qb_h2']                 = '2. szintű címsor';
+$lang['qb_h3']                 = '3. szintű címsor';
+$lang['qb_h4']                 = '4. szintű címsor';
+$lang['qb_h5']                 = '5. szintű címsor';
+$lang['qb_h']                  = 'Címsor';
+$lang['qb_hs']                 = 'Címsor kiválasztása';
+$lang['qb_hplus']              = 'Nagyobb címsor';
+$lang['qb_hminus']             = 'Kisebb címsor';
+$lang['qb_hequal']             = 'Azonos szintű címsor';
+$lang['qb_link']               = 'Belső hivatkozás';
+$lang['qb_extlink']            = 'Külső hivatkozás';
+$lang['qb_hr']                 = 'Vízszintes elválasztó vonal';
+$lang['qb_ol']                 = 'Sorszámozott lista elem';
+$lang['qb_ul']                 = 'Felsorolás lista elem';
+$lang['qb_media']              = 'Képek és más fájlok hozzáadása';
+$lang['qb_sig']                = 'Aláírás beszúrása';
+$lang['qb_smileys']            = 'Szmájlik';
+$lang['qb_chars']              = 'Speciális karakterek';
+$lang['upperns']               = 'Ugrás a szülő névtérhez';
+$lang['admin_register']        = 'Új felhasználó';
+$lang['metaedit']              = 'Meta-adatok szerkesztése';
+$lang['metasaveerr']           = 'A meta-adatok írása meghiúsult ';
+$lang['metasaveok']            = 'Meta-adatok elmentve';
+$lang['img_backto']            = 'Vissza';
+$lang['img_title']             = 'Cím';
+$lang['img_caption']           = 'Képaláírás';
+$lang['img_date']              = 'Dátum';
+$lang['img_fname']             = 'Fájlnév';
+$lang['img_fsize']             = 'Méret';
+$lang['img_artist']            = 'Készítette';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formátum';
+$lang['img_camera']            = 'Fényképező típusa';
+$lang['img_keywords']          = 'Kulcsszavak';
+$lang['subscribe_success']     = '%s feliratkozott a(z) %s oldal változás-követő hírlevelére';
+$lang['subscribe_error']       = 'Hiba történt, miközben %s feliratkozni próbált a(z) %s oldal változás-követő hírlevelére';
+$lang['subscribe_noaddress']   = 'Nincs beállítva az e-mail címed, így nem tudsz feliratkozni az oldal változás-követő hírlevelére';
+$lang['unsubscribe_success']   = '%s leiratkozott az oldal változás-követő hírleveléről';
+$lang['unsubscribe_error']     = 'Hiba történt, miközben %s leiratkozni próbált az oldal változás-követő hírleveléről';
+$lang['authmodfailed']         = 'Hibás felhasználó-aznosítási módszer van beállítva. Légy szíves értesítsd a Wiki-gazdát!';
+$lang['authtempfail']          = 'A felhasználó azonosítás átmenetileg nem működik. Ha sokáig így lenne, légy szíves értesítsd a Wiki-gazdát!';
+$lang['i_chooselang']          = 'Válassz nyelvet';
+$lang['i_installer']           = 'DokuWiki Beállító Varázsló';
+$lang['i_wikiname']            = 'A Wiki neve';
+$lang['i_enableacl']           = 'Hozzáférési listák engedélyezése (ajánlott)';
+$lang['i_superuser']           = 'Wiki-gazda';
+$lang['i_problems']            = 'A Beállító Varázsló a következő problémák miatt megakadt. Nem tudjuk folytatni, amíg ezek nincsenek elhárítva!';
+$lang['i_modified']            = 'Biztonsági okokból ez a Varázsló csak új és módosítatlan DokuWiki változaton működik.
+Csomagold ki újra a fájlokat a letöltött csomagból, vagy nézd meg a teljes <a href="http://dokuwiki.org/install">Dokuwiki telepítési útmutatót</a>.';
+$lang['i_funcna']              = 'A <code>%s</code> PHP funkció nem elérhető. Esetleg a tárhelyszolgáltató letiltotta biztonsági okok miatt?';
+$lang['i_phpver']              = 'A PHP <code>%s</code> verziója alacsonyabb, mint ami szükséges lenne: <code>%s</code>. Frissítsd a PHP-det újabb verzióra!';
+$lang['i_permfail']            = 'A DokiWiki nem tudja írni a <code>%s</code> könyvtárat. Be kell állítanod ehhez a könyvtárhoz a megfelelő jogosultságokat!';
+$lang['i_confexists']          = '<code>%s</code> már létezik.';
+$lang['i_writeerr']            = 'Nem tudom ezt létrehozni: <code>%s</code>. Ellenőrizd a könyvtár/fájl jogosultságokat, és hozd létre az állományt kézzel.';
+$lang['i_badhash']             = 'A dokuwiki.php nem felismerhető vagy módosított (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - nem helyes vagy üres érték';
+$lang['i_success']             = 'A beállítás sikeresen befejeződött. Most már letörölhető az install.php fájl. Látogasd meg az <a href="doku.php">új DokuWikidet</a>!';
+$lang['i_failure']             = 'Hiba lépett fel a konfigurációs állományok írásakor. Ki kell javítanod kézzel, mielőtt használni kezded az <a href="doku.php">új DokuWikidet</a>.';
+$lang['i_policy']              = 'Kezdeti hozzáférési politika';
+$lang['i_pol0']                = 'Nyitott Wiki (mindenki olvashatja, írhatja, és fájlokat tölthet fel)';
+$lang['i_pol1']                = 'Publikus Wiki (mindenki olvashatja, de csak regisztrált felhasználók írhatják, és tölthetnek fel fájlokat)';
+$lang['i_pol2']                = 'Zárt Wiki (csak regisztrált felhasználók olvashatják, írhatják és tölthetnek fel fájlokat)';
+$lang['i_retry']               = 'Újra';
+$lang['mu_intro']              = 'Itt több fájlt is fel tudsz tölteni egyszerre. Kattints a "Kiválaszt" gombra és add hozzá a listához. Nyomd meg a Feltöltés gombot, amikor elkészültél.';
+$lang['mu_gridname']           = 'Fájlnév';
+$lang['mu_gridsize']           = 'Méret';
+$lang['mu_gridstat']           = 'Állapot';
+$lang['mu_namespace']          = 'Névtér';
+$lang['mu_browse']             = 'Kiválaszt';
+$lang['mu_toobig']             = 'túl nagy';
+$lang['mu_ready']              = 'feltöltésre kész';
+$lang['mu_done']               = 'kész';
+$lang['mu_fail']               = 'hibás';
+$lang['mu_authfail']           = 'session lejárt';
+$lang['mu_progress']           = '@PCT@% feltöltve';
+$lang['mu_filetypes']          = 'Megengedett fájltípusok';
+$lang['mu_info']               = 'Fájlok feltöltve.';
+$lang['mu_lasterr']            = 'Utolsó hiba:';
+$lang['recent_global']         = 'Jelenleg csak a <b>%s</b> névtér friss változásai látszanak. Megtekinthetők <a href="%s">a teljes wiki friss változásai</a> is.';
+$lang['years']                 = '%d évvel ezelőtt';
+$lang['months']                = '%d hónappal ezelőtt';
+$lang['weeks']                 = '%d héttel ezelőtt';
+$lang['days']                  = '%d nappal ezelőtt';
+$lang['hours']                 = '%d órával ezelőtt';
+$lang['minutes']               = '%d perccel ezelőtt';
+$lang['seconds']               = '%d másodperccel ezelőtt';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/locked.txt
new file mode 100644
index 000000000..229141674
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/locked.txt
@@ -0,0 +1,4 @@
+====== Az oldal zárolva ======
+
+Ezt az oldalt épp szerkeszti egy másik felhasználó. Várnod kell, amíg a másik felhasználó befejezi, vagy amíg a zárolási időzítő le nem jár.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/login.txt
new file mode 100644
index 000000000..3f7e62e72
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/login.txt
@@ -0,0 +1,5 @@
+====== Belépés ======
+
+Nem vagy bejelentkezve! Add meg az azonosítási adataid a belépéshez lentebb! A böngésződben engedélyezned kell a sütik (cookies) fogadását a belépéshez.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/mailtext.txt
new file mode 100644
index 000000000..9b0c2921e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/mailtext.txt
@@ -0,0 +1,16 @@
+A DokuWikidben egy oldalt létrejött, vagy megváltozott. A részletek:
+
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím: @IPADDRESS@
+Gép neve: @HOSTNAME@
+Előző változat: @OLDPAGE@
+Új változat: @NEWPAGE@
+Összefoglaló: @SUMMARY@
+Felhasználó: @USER@
+
+@DIFF@
+
+
+-- 
+Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/newpage.txt
new file mode 100644
index 000000000..de5a34d8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/newpage.txt
@@ -0,0 +1,3 @@
+====== Ilyen oldal még nem létezik ======
+
+Egy nem létező oldalra tévedtél. Létrehozhatod az ''Oldal létrehozása'' gombra kattintva.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/norev.txt
new file mode 100644
index 000000000..4dd408459
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/norev.txt
@@ -0,0 +1,5 @@
+====== Nincs ilyen változat ======
+
+A megadott változat nem létezik. Használd az ''Előző változatok'' nyomógombot az előzmények listájának megtekintéséhez.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/preview.txt
new file mode 100644
index 000000000..ad7f7d4b0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/preview.txt
@@ -0,0 +1,4 @@
+====== Előnézet ======
+
+Ez a szöveged előnézete, így fog kinézni. Figyelj jól: ez **még nincs elmentve**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/pwconfirm.txt
new file mode 100644
index 000000000..617419ee8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/pwconfirm.txt
@@ -0,0 +1,14 @@
+Szia @FULLNAME@!
+
+Te vagy más valaki kért egy új jelszót a @DOKUWIKIURL@
+címen lévő @TITLE@ wiki felhasználódhoz.
+
+Ha nem kértél ilyet, hagyd figyelmen kívül ezt a levelet.
+
+Ha Te voltál, az új jelszó kérelmed megerősítéséhez a
+következő linkre kattints, vagy másold a böngésződbe:
+
+@CONFIRM@
+
+-- 
+Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki generálta.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/read.txt
new file mode 100644
index 000000000..89ac96338
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/read.txt
@@ -0,0 +1,2 @@
+Ez az oldal csak olvasható. Megtekintheted a forrását, de nem változtathatod meg. Ha úgy gondolod, hogy ez helytelen, kérdezd a Wiki-gazdát.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/recent.txt
new file mode 100644
index 000000000..4e0c1ec06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/recent.txt
@@ -0,0 +1,5 @@
+====== Legutóbbi változások ======
+
+Az alábbi oldalak változtak legutoljára.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/register.txt
new file mode 100644
index 000000000..2745c4d77
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/register.txt
@@ -0,0 +1,4 @@
+====== Új felhasználó regisztrálása ======
+
+Töltsd ki az összes alábbi adatot az új Wiki felhasználói azonosítód létrehozásához. Győződj meg róla, hogy **érvényes e-mail címet** adtál meg -- az új jelszavad erre a címre küldjük el. Az azonosítód érvényes [[doku>pagename|oldalnév]] kell legyen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/registermail.txt
new file mode 100644
index 000000000..d45ef0d38
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/registermail.txt
@@ -0,0 +1,13 @@
+Egy új felhasználó regisztrált a következő adatokkal:
+
+Felhasználói név: @NEWUSER@
+Teljes név: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím : @IPADDRESS@
+Gép neve: @HOSTNAME@
+
+-- 
+Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/resendpwd.txt
new file mode 100644
index 000000000..24931a7ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/resendpwd.txt
@@ -0,0 +1,3 @@
+===== Új jelszó kérése =====
+
+Kérlek add meg a felhasználó neved az új jelszó elküldéséhez. A jelszó cseréjéhez szükséges megerősítő linket a regisztrált e-mail címedre küldjük.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/revisions.txt
new file mode 100644
index 000000000..3537fd653
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/revisions.txt
@@ -0,0 +1,3 @@
+====== Előző változatok ======
+
+Ezek az előző változatai az aktuális dokumentumnak. Egy előző változathoz való visszatéréshez nyomd meg az ''Oldal szerkesztése'' gombot, majd mentsd el.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/searchpage.txt
new file mode 100644
index 000000000..b1defed84
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/searchpage.txt
@@ -0,0 +1,5 @@
+====== Keresés ======
+
+A keresés eredményét lentebb láthatod. Ha nem találtad meg amit kerestél, akkor létrehozhatsz egy új oldalt a keresésed alapján ''Az oldal szerkesztése''  gombbal.
+
+===== Eredmény(ek) =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/showrev.txt
new file mode 100644
index 000000000..2131b4dc0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/showrev.txt
@@ -0,0 +1,2 @@
+**Ez a dokumentum egy előző változata!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/stopwords.txt
new file mode 100644
index 000000000..a8bd35c7d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/stopwords.txt
@@ -0,0 +1,39 @@
+# Ez egy szó-lista (soronként egy szóval), amelyeket az index készítésekor nem veszünk figyelembe.
+# Ha szerkeszted ezt a fájlt, győződj meg arról, hogy UNIX sorvég-jeleket használj! (csak NL karakter)
+# Nincs szükség 3 karakternél rövidebb szavak felsorolására, ezeket egyébként sem vesszük figyelembe.
+# Ez a lista a http://www.ranks.nl/stopwords/ oldalon szereplő alapján készült
+a
+az
+egy
+be
+ki
+le
+fel
+meg
+el
+át
+rá
+ide
+oda
+szét
+össze
+vissza
+de
+hát
+és
+vagy
+hogy
+van
+lesz
+volt
+csak
+nem
+igen
+mint
+én
+te
+ő
+mi
+ti
+ők
+ön
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/subscribermail.txt
new file mode 100644
index 000000000..a5e8c96d1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/subscribermail.txt
@@ -0,0 +1,18 @@
+Szia!
+
+A(z) @PAGE@ oldal a(z) @TITLE@ wikiben megváltozott.
+Itt vannak a változások:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ha le szeretnél iratkozni ennek az oldalnak a változás-követéséről,
+lépj be a wikibe ezen a címen:
+@DOKUWIKIURL@, majd keresd meg a(z)
+@NEWPAGE@ oldalt
+és válaszd a 'Oldalváltozások-hírlevél leiratkozás' gombot.
+
+-- 
+Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki alkalmazás generálta.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/updateprofile.txt
new file mode 100644
index 000000000..50df15384
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/updateprofile.txt
@@ -0,0 +1,3 @@
+===== Felhasználói adatok megváltoztatása =====
+
+Csak azt a mezőt kell kitöltened, amit változtatni szeretnél. A felhasználói nevet nem lehet megváltoztatni.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/uploadmail.txt
new file mode 100644
index 000000000..c772ab220
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/uploadmail.txt
@@ -0,0 +1,13 @@
+Fájlfeltöltés történt a DokuWikidben. Részletek:
+
+Állomány: @MEDIA@
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím: @IPADDRESS@
+Gépnév: @HOSTNAME@
+Méret: @SIZE@
+MIME-típus: @MIME@
+Felhasználó: @USER@
+
+-- 
+Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/wordblock.txt
new file mode 100644
index 000000000..2fe2efa9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/hu/wordblock.txt
@@ -0,0 +1,6 @@
+====== SPAM szűrés ======
+
+A változtatásaid **nem** mentettük, mert egy vagy több tiltott szót tartalmaz. Ha kéretlen reklám anyagot ("SPAM") próbáltál erre a Wikire rakni, akkor szégyelld magad.
+
+Ha azt gondolod, hogy valami hibáról, vagy félreértésről van szó, akkor lépj kapcsolatba a Wiki-gazdával.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id-ni/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id-ni/lang.php
new file mode 100644
index 000000000..2fc631373
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id-ni/lang.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * idni language file
+ *
+ * @author Harefa <fidelis@harefa.com>
+ * @author Yustinus Waruwu <juswaruwu@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Haogö nga\'örö da\'a';
+$lang['btn_source']            = 'Oroma\'ö nga\'örö sindruhu';
+$lang['btn_show']              = 'Foroma\'ö nga\'örö';
+$lang['btn_create']            = 'Fazökhi nga\'öro';
+$lang['btn_search']            = 'Alui';
+$lang['btn_save']              = 'Irö\'ö';
+$lang['btn_preview']           = 'Foroma\'ö zikhala';
+$lang['btn_top']               = 'Angawuli ba mböröta';
+$lang['btn_newer']             = '<< sibohou';
+$lang['btn_older']             = 'si no ara >>';
+$lang['btn_revs']              = 'nifawu\'a si\'oföna';
+$lang['btn_recent']            = 'Lahe nibohouni';
+$lang['btn_upload']            = 'Fa\'oeh\'ö';
+$lang['btn_cancel']            = 'Lö alua';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Ehaogö';
+$lang['btn_login']             = 'Felalö bakha';
+$lang['btn_logout']            = 'Möi baero';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Bohouni';
+$lang['btn_delete']            = 'Heta';
+$lang['btn_back']              = 'Fulifuri';
+$lang['btn_backlink']          = 'Link fangawuli';
+$lang['btn_backtomedia']       = 'Angawuli ba filianö Mediafile';
+$lang['btn_profile']           = 'Famohouni pörofile';
+$lang['btn_reset']             = 'Fawu\'a';
+$lang['btn_resendpwd']         = 'Fa\'ohe\'ö kode sibohou';
+$lang['btn_draft']             = 'Fawu\'a wanura';
+$lang['btn_draftdel']          = 'Heta zura';
+$lang['loggedinas']            = 'Möi bakha zotöi';
+$lang['user']                  = 'Töi';
+$lang['pass']                  = 'Kode';
+$lang['newpass']               = 'Kode sibohou';
+$lang['oldpass']               = 'Faduhu\'ö kode';
+$lang['passchk']               = 'Sura sakalitö';
+$lang['remember']              = 'Töngöni ndra\'o';
+$lang['fullname']              = 'Töi safönu';
+$lang['email']                 = 'Imele';
+$lang['register']              = 'Fasura\'ö';
+$lang['profile']               = 'Töi pörofile';
+$lang['badlogin']              = 'Bologö dödöu, fasala döi faoma kode.';
+$lang['minoredit']             = 'Famawu\'a ma\'ifu';
+$lang['regmissing']            = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
+$lang['reguexists']            = 'Bologö dödöu, no so zangoguna\'ö töi da\'a.';
+$lang['regsuccess']            = 'No tefazökhi akunö ba tefa\'ohe\'ö kode ba imele.';
+$lang['regsuccess2']           = 'No tefazökhi akunö';
+$lang['regmailfail']           = 'Oroma wa so ma\'ifu zifawuka ba wama\'ohe\'ö imele kode. Fuli sofu khö admin!';
+$lang['regbadmail']            = 'Imele nibe\'emö lö atulö - na ö\'ila wa fasala da\'a, sofu khö admin';
+$lang['regbadpass']            = 'Dombuadombua kode nibe\'emö lö fagölö, fuli sura.';
+$lang['regpwmail']             = 'Kode DokuWiki';
+$lang['reghere']               = 'Hadia no so akunömö? Na lö\'ö, fazökhi sambua.';
+$lang['profna']                = 'Lö tetehegö ba wiki da\'a ba wamawu\'a pörofile';
+$lang['profnochange']          = 'Lö hadöi nifawu\'ö, lö hadöi ni\'ohalöwögöi';
+$lang['profnoempty']           = 'Lö tetehegö na lö hadöi töi ma imele.';
+$lang['profchanged']           = 'Pörofile zangoguna\'ö no tebohouni.';
+$lang['pwdforget']             = 'Hadia olifu\'ö kode? Fuli halö kode';
+$lang['resendna']              = 'Lö tetehegi ba wiki da\'a wama\'ohe\'ö kode dua kali.';
+$lang['resendpwd']             = 'Tefa\'ohe\'ö kode sibahou khö';
+$lang['resendpwdmissing']      = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
+$lang['resendpwdnouser']       = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.';
+$lang['resendpwdconfirm']      = 'No tefaohe\'ö link famaduhu\'ö ba imele.';
+$lang['resendpwdsuccess']      = 'No tefa\'ohe\'ö kode sibohou ba imele.';
+$lang['txt_upload']            = 'Fili file ni fa\'ohe\'ö';
+$lang['notsavedyet']           = 'Famawu\'a si lö mu\'irö\'ö taya. \nSinduhu ötohugö?';
+$lang['mediaselect']           = 'Media file';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/admin.txt
new file mode 100644
index 000000000..8cb25edb6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/admin.txt
@@ -0,0 +1,4 @@
+====== Administrasi ======
+
+Berikut ini adalah daftar pekerjaan administratif yang dapat Anda temukan di DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/backlinks.txt
new file mode 100644
index 000000000..79c70f30b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/backlinks.txt
@@ -0,0 +1,3 @@
+====== Backlinks ======
+
+Daftar dibawah ini adalah halaman-halaman (lain) yang terhubung ke halaman ini.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/conflict.txt
new file mode 100644
index 000000000..236e8b6e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/conflict.txt
@@ -0,0 +1,6 @@
+====== Versi terbaru telah Ada ======
+
+Versi terbaru dari dokumen yang baru saja Anda Edit telah ada. Ini terjadi ketika user lain telah selesai mengubah halaman, saat Anda sedang meng-edit.
+
+Pertimbangkan perbedaan yang ditampilkan dibawah ini, kemudian putuskan versi mana yang harus disimpan. Jika Anda memilih "Simpan", versi (tulisan terbaru) Andalah yang akan disimpan. Tekan "Batal" to menggunakan versi tulisan yang telah ada.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/denied.txt
new file mode 100644
index 000000000..bad8f24a6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/denied.txt
@@ -0,0 +1,4 @@
+====== Akses Ditolak ======
+
+Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. Apakah Anda belum login?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/diff.txt
new file mode 100644
index 000000000..eee1e5a58
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/diff.txt
@@ -0,0 +1,4 @@
+====== Perbedaan ======
+
+Ini menunjukkan perbedaan antara versi yang terpilih dengan versi yang sedang aktif.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/draft.txt
new file mode 100644
index 000000000..d7de1458b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/draft.txt
@@ -0,0 +1,5 @@
+====== File Draft ditemukan ======
+
+Proses pengeditan Anda sebelumnya tidak selesai dengan sempurna. DokuWiki secara otomatis meyimpan draft yang dapat Anda pakai untuk melanjutkan pengeditan. Dibawah ini Anda dapat melihat data yang disimpan pada sesi sebelumnya.
+
+Silahkan pilih jika Anda ingin //recover// sesi pengeditan terakhir atau //hapus// draft, atau //batalkan// proses pengeditan.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/edit.txt
new file mode 100644
index 000000000..a32803c44
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/edit.txt
@@ -0,0 +1,2 @@
+Ubah isi halaman kemudian tekan "Simpan". Lihat [[wiki:syntax]] untuk sintaks-sintaks Wiki. Mohon edit/ubah halaman sesuai dengan judul halamannya. Bila Anda masih ragu untuk menulis di halaman ini, silahkan bermain-main di [[playground:playground|tamanbermain]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/editrev.txt
new file mode 100644
index 000000000..e6d247c7a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/editrev.txt
@@ -0,0 +1,2 @@
+**Anda telah membuka dokumen versi lama!** Jika menyimpannya, berarti Anda akan membuat versi baru dari data ini.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/index.txt
new file mode 100644
index 000000000..88bbb12e4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Berikut ini adalah index dari keseluruhan halaman yang ada, diurutkan berdasar [[doku>namespaces|namespaces]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/install.html
new file mode 100644
index 000000000..9a9a8f1e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/install.html
@@ -0,0 +1,25 @@
+<p>Halaman ini membatu Anda dalam proses instalasi dan konfigurasi pertama kali
+untuk <a href="http://dokuwiki.org">Dokuwiki</a>. Informasi lebih lanjut
+tentang alat instalasi ini tersedia dalam 
+<a href="http://dokuwiki.org/installer">halaman dokumentasi</a> sendiri.</p>
+
+<p>DokuWIki menggunakan berkas biasa sebagai media penyimpanan halaman wiki 
+dan informasi lainnya yang berhubungan dengan halaman tersebut (contoh: gambar, 
+indeks pencarian, revisi lama, dll). Agar bisa menggunakannya DokuWiki 
+<strong>harus</strong> memiliki hak akses tulis pada direktori yang menyimpan
+berkas-berkas tersebut. Alat instalasi ini tidak dapat melakukan perubahan
+konfigurasi hak akses pada direktori. Biasanya harus menggunakan command shell
+atau jika Anda pengguna layanan hosting, melalui FTP atau control panel layanan
+hosting Anda (misalnya: cPanel). </p>
+
+<p>Alat instalasi ini akan mengatur konfigurasi DokuWiki Anda untuk 
+<acronym title="access control list">ACL</acronym>, yang selanjutnya akan 
+memperbolehkan administrator untuk login dan mengakses menu Admin DokuWiki 
+untuk menginstal plugin, mengatur pengguna (user), mengatur hak akses ke 
+halaman wiki dan perubahan konfigurasi. Ini tidak diawajibkan dalam pengoperasian
+DokuWiki, tetapi dapat membuat DokuWiki lebih mudah untuk dipelihara.</p>
+
+<p>Pengguna berpengalaman atau pengguna dengan kebutuhan instalasi khusus silahkan
+melihat link <a href="http://dokuwiki.org/install">Panduan Instalasi</a>
+and <a href="http://dokuwiki.org/config">Konfigurasi WIki</a>. 
+untuk hal-hal yang berhubungan dengan instalasi dan konfigurasi.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/lang.php
new file mode 100644
index 000000000..447abaf1a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/lang.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Indonesian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author mubaidillah <mubaidillah@gmail.com>
+ * @author Irwan Butar Butar <irwansah.putra@gmail.com>
+ * @author Yustinus Waruwu <juswaruwu@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '\'';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Edit halaman ini';
+$lang['btn_source']            = 'Lihat sumber halaman';
+$lang['btn_show']              = 'Tampilkan halaman';
+$lang['btn_create']            = 'Buat halaman baru';
+$lang['btn_search']            = 'Cari';
+$lang['btn_save']              = 'Simpan';
+$lang['btn_preview']           = 'Preview';
+$lang['btn_top']               = 'kembali ke atas';
+$lang['btn_newer']             = '<< lebih lanjut';
+$lang['btn_older']             = 'sebelumnya >>';
+$lang['btn_revs']              = 'Revisi-revisi lama';
+$lang['btn_recent']            = 'Perubahan terbaru';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Batal';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Edit';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Keluar';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Ubah';
+$lang['btn_delete']            = 'Hapus';
+$lang['btn_back']              = 'Kembali';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Kembali ke Pilihan Mediafile';
+$lang['btn_subscribe']         = 'Ikuti Perubahan';
+$lang['btn_unsubscribe']       = 'Berhenti Ikuti Perubahan';
+$lang['btn_profile']           = 'Ubah Profil';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_resendpwd']         = 'Kirim password baru';
+$lang['btn_draft']             = 'Edit draft';
+$lang['btn_draftdel']          = 'Hapus draft';
+$lang['loggedinas']            = 'Login sebagai ';
+$lang['user']                  = 'Username';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'Password baru';
+$lang['oldpass']               = 'Konfirmasi password';
+$lang['passchk']               = 'sekali lagi';
+$lang['remember']              = 'Ingat saya';
+$lang['fullname']              = 'Nama lengkap';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Daftar';
+$lang['profile']               = 'Profil User';
+$lang['badlogin']              = 'Maaf, username atau password salah.';
+$lang['minoredit']             = 'Perubahan Minor';
+$lang['draftdate']             = 'Simpan draft secara otomatis';
+$lang['regmissing']            = 'Maaf, Anda harus mengisi semua field.';
+$lang['reguexists']            = 'Maaf, user dengan user login ini telah ada.';
+$lang['regsuccess']            = 'User telah didaftarkan dan password telah dikirim ke email Anda.';
+$lang['regsuccess2']           = 'User telah dibuatkan.';
+$lang['regmailfail']           = 'Kami menemukan kesalahan saat mengirimkan password ke alamat email Anda. Mohon hubungi administrator.';
+$lang['regbadmail']            = 'Alamat email yang Anda masukkan tidak valid - jika menurut Anda hal ini adalah kesalahan sistem, mohon hubungi admin.';
+$lang['regbadpass']            = 'Passwod yang dimasukkan tidak sama. Silahkan ulangi lagi.';
+$lang['regpwmail']             = 'Password DokuWiki Anda';
+$lang['reghere']               = 'Anda belum mempunyai account? silahkan ';
+$lang['profna']                = 'Wiki ini tidak mengijinkan perubahan profil.';
+$lang['profnochange']          = 'Tidak ada perubahan.';
+$lang['profnoempty']           = 'Mohon mengisikan nama atau alamat email.';
+$lang['profchanged']           = 'Profil User berhasil diubah.';
+$lang['pwdforget']             = 'Lupa Password? Dapatkan yang baru';
+$lang['resendna']              = 'Wiki ini tidak mendukung pengiriman ulang password.';
+$lang['resendpwd']             = 'Kirim password baru untuk';
+$lang['resendpwdmissing']      = 'Maaf, Anda harus mengisikan semua field.';
+$lang['resendpwdnouser']       = 'Maaf, user ini tidak ditemukan.';
+$lang['resendpwdbadauth']      = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.';
+$lang['resendpwdconfirm']      = 'Link konfirmasi telah dikirim melalui email.';
+$lang['resendpwdsuccess']      = 'Password baru Anda telah dikirim melalui email.';
+$lang['txt_upload']            = 'File yang akan diupload';
+$lang['txt_filename']          = 'Masukkan nama wiki (opsional)';
+$lang['txt_overwrt']           = 'File yang telah ada akan ditindih';
+$lang['lockedby']              = 'Sedang dikunci oleh';
+$lang['lockexpire']            = 'Penguncian artikel sampai dengan';
+$lang['willexpire']            = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
+$lang['notsavedyet']           = 'Perubahan yang belum disimpan akan hilang.\nYakin akan dilanjutkan?';
+$lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
+$lang['nothingfound']          = 'Tidak menemukan samasekali.';
+$lang['mediaselect']           = 'Pilihan Mediafile';
+$lang['fileupload']            = 'Mediafile Upload';
+$lang['uploadsucc']            = 'Upload sukses';
+$lang['uploadfail']            = 'Upload gagal. Apakah hak ijinnya salah?';
+$lang['uploadwrong']           = 'Upload ditolak. Ekstensi file ini tidak diperbolehkan!';
+$lang['uploadexist']           = 'File telah ada. Tidak mengerjakan apa-apa.';
+$lang['uploadbadcontent']      = 'Isi file yang diupload tidak cocok dengan ekstensi file %s.';
+$lang['uploadspam']            = 'File yang diupload diblok oleh spam blacklist.';
+$lang['uploadxss']             = 'File yang diupload diblok karena kemungkinan isi yang berbahaya.';
+$lang['deletesucc']            = 'File "%s" telah dihapus.';
+$lang['deletefail']            = '"%s" tidak dapat dihapus - cek hak aksesnya.';
+$lang['mediainuse']            = 'File "%s" belum dihapus - file ini sedang digunakan.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'File tersedia didalam';
+$lang['js']['keepopen']        = 'Biarkan window terbuka dalam pemilihan';
+$lang['js']['hidedetails']     = 'Sembunyikan detil';
+$lang['mediausage']            = 'Gunakan sintaks berikut untuk me-refer ke file ini';
+$lang['mediaview']             = 'Tampilkan file asli';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload file ke namespace ini. Untuk menbuat namespace baru, tambahkan namanya didepanpada nama file "Upload as" dipisahkan dengan titik dua (:).';
+$lang['mediaextchange']        = 'Ektensi file berubah dari .%s ke .%s';
+$lang['reference']             = 'Referensi untuk';
+$lang['ref_inuse']             = 'File tidak dapat dihapus karena sedang digunakan oleh halaman:';
+$lang['ref_hidden']            = 'Beberapa referensi ada didalam halaman yang tidak diijinkan untuk Anda baca.';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Daftar isi';
+$lang['current']               = 'sekarang';
+$lang['yours']                 = 'Versi Anda';
+$lang['diff']                  = 'Tampilkan perbedaan dengan versi sekarang';
+$lang['diff2']                 = 'Tampilkan perbedaan diantara revisi terpilih';
+$lang['line']                  = 'Baris';
+$lang['breadcrumb']            = 'Jejak';
+$lang['youarehere']            = 'Anda disini';
+$lang['lastmod']               = 'Terakhir diubah';
+$lang['by']                    = 'oleh';
+$lang['deleted']               = 'terhapus';
+$lang['created']               = 'dibuat';
+$lang['restored']              = 'revisi lama ditampilkan kembali';
+$lang['external_edit']         = 'Perubahan eksternal';
+$lang['summary']               = 'Edit summary';
+$lang['mail_newpage']          = 'Halaman ditambahkan:';
+$lang['mail_changed']          = 'Halaman diubah:';
+$lang['mail_new_user']         = 'User baru:';
+$lang['mail_upload']           = 'Berkas di-upload:';
+$lang['js']['nosmblinks']            = "Link ke share Windows hanya bekerja di Microsoft Internet Explorer.\nAnda masih dapat mengcopy and paste linknya.";
+$lang['qb_bold']               = 'Tebal';
+$lang['qb_italic']             = 'Miring';
+$lang['qb_underl']             = 'Garis Bawah';
+$lang['qb_code']               = 'Kode';
+$lang['qb_strike']             = 'Text Tercoret';
+$lang['qb_h1']                 = 'Level 1 Headline';
+$lang['qb_h2']                 = 'Level 2 Headline';
+$lang['qb_h3']                 = 'Level 3 Headline';
+$lang['qb_h4']                 = 'Level 4 Headline';
+$lang['qb_h5']                 = 'Level 5 Headline';
+$lang['qb_link']               = 'Link Internal';
+$lang['qb_extlink']            = 'Link External';
+$lang['qb_hr']                 = 'Garis Horisontal';
+$lang['qb_ol']                 = 'Item Berurutan';
+$lang['qb_ul']                 = 'Item Tidak Berurutan';
+$lang['qb_media']              = 'Tambahkan gambar atau file lain';
+$lang['qb_sig']                = 'Sisipkan tanda tangan';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Karakter Khusus';
+$lang['js']['del_confirm']           = 'Hapus tulisan ini?';
+$lang['admin_register']        = 'Tambah user baru';
+$lang['metaedit']              = 'Edit Metadata';
+$lang['metasaveerr']           = 'Gagal menulis metadata';
+$lang['metasaveok']            = 'Metadata tersimpan';
+$lang['img_backto']            = 'Kembali ke';
+$lang['img_title']             = 'Judul';
+$lang['img_caption']           = 'Label';
+$lang['img_date']              = 'Tanggal';
+$lang['img_fname']             = 'Nama file';
+$lang['img_fsize']             = 'Ukuran';
+$lang['img_artist']            = 'Tukang foto';
+$lang['img_copyr']             = 'Hakcipta';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Katakunci';
+$lang['subscribe_success']     = 'Penambahan %s ke data subsripsi untuk %s';
+$lang['subscribe_error']       = 'Gagal menambahkan %s ke data subsripsi untuk %s';
+$lang['subscribe_noaddress']   = 'Tidak ditemukan alamat yang berhubungan dengan login Anda, Anda tidak dapat menambahkan daftar subscription';
+$lang['unsubscribe_success']   = 'Menghapus %s dari daftar subscription untuk %s';
+$lang['unsubscribe_error']     = 'Gagal menghapus %s dari daftar subscription untuk %s';
+$lang['authmodfailed']         = 'Konfigurasi autentikasi user tidak valid. Harap informasikan admin Wiki Anda.';
+$lang['authtempfail']          = 'Autentikasi user saat ini sedang tidak dapat digunakan. Jika kejadian ini berlanjut, Harap informasikan admin Wiki Anda.';
+$lang['i_chooselang']          = 'Pilih bahasa';
+$lang['i_installer']           = 'Instalasi DokuWiki';
+$lang['i_wikiname']            = 'Nama Wiki';
+$lang['i_enableacl']           = 'Aktifkan ACL (disarankan)';
+$lang['i_problems']            = 'Terdapat beberapa kesalahan seperti berikut. Anda tidak dapat melanjutkan sampai kesalahan tersebut diperbaiki.';
+$lang['i_modified']            = 'Untuk alasan keamanan, skrip ini hanya dapat dijalankan pada instalasi DikuWiki baru dan belum di modifikasi. Silahkan meng-ekstrak kembali berkasi dari halaman dowload, atau lihat   <a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a> ';
+$lang['i_funcna']              = 'Fungsi PHP <code>%s</code> tidak tersedia. Mungkin dinonaktifkan oleh layanan hosting Anda?';
+$lang['i_phpver']              = 'Versi PHP Anda <code>%s</code> lebih rendah dari yang dibutuhkan <code>%s</code>. Mohon melakukan upgrade.';
+$lang['i_permfail']            = '<code>%s</code> tidak dapat ditulis oleh DokuWiki. Anda harus memperbaiki konfigurasi hak akses untuk direktori tersebut.';
+$lang['i_confexists']          = '<code>%s</code> sudah ada';
+$lang['i_writeerr']            = 'Tidak dapat membuat <code>%s</code>. Anda harus memeriksa konfigurasi hak akses direktori/berkas dan membuatnya secara manual.';
+$lang['i_badhash']             = 'dokuwiki.php tidak dikenal atau sudah diubah (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - tidak valid atau belum diisi';
+$lang['i_success']             = 'Konfigurasi telah berhasil. Anda boleh menghapus berkas install.php sekarang. Lanjutkan ke <a href="doku.php">DokuWiki baru Anda</a>.';
+$lang['i_failure']             = 'Terdapat beberapa kesalahan dalam menulis berkas konfigurasi. Anda harus memperbaikinnya sendiri sebelum dapat menggunakan <a href="doku.php">DokuWiki baru Anda</a>.';
+$lang['i_policy']              = 'Policy ACL awal';
+$lang['i_pol0']                = 'Wiki Terbuka (baca, tulis, upload untuk semua orang)';
+$lang['i_pol1']                = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)';
+$lang['i_pol2']                = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)';
+$lang['i_retry']               = 'Coba Lagi';
+$lang['mu_gridname']           = 'Nama file';
+$lang['mu_gridsize']           = 'Ukuran';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namaspace';
+$lang['mu_browse']             = 'Jelajah';
+$lang['mu_ready']              = 'Siap untuk uplod';
+$lang['mu_done']               = 'Selesai';
+$lang['mu_fail']               = 'Gagal';
+$lang['mu_authfail']           = 'sesi habis';
+$lang['mu_progress']           = '@PCT@% uploaded';
+$lang['mu_filetypes']          = 'Izinkan tipe file';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/locked.txt
new file mode 100644
index 000000000..8147717fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/locked.txt
@@ -0,0 +1,3 @@
+====== Halaman Terkunci ======
+
+Halaman ini tertutup (terkunci) untuk diedit oleh user lain. Anda harus menunggu sampai user ini menyelesaikan pengeditan, atau masa berlaku penguncian telah berakhir.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/login.txt
new file mode 100644
index 000000000..f736e882b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Anda belum login! Masukkan data autentifikasi dibawah ini untuk masuk log (login). Cookies harus diaktifkan agar bisa login.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/mailtext.txt
new file mode 100644
index 000000000..7eede9b3c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/mailtext.txt
@@ -0,0 +1,17 @@
+Halaman di DokuWiki Anda telah bertamah atau berubah, dengan detil sebagai berikut:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+Email ini digenerate oleh DokuWiki di
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/newpage.txt
new file mode 100644
index 000000000..8d3f99d72
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/newpage.txt
@@ -0,0 +1,3 @@
+====== Topik ini belum tersedia ======
+
+Belum ada artikel di halaman ini. Anda dapat membuat tulisan-tulisan baru di halaman ini dengan menekan tombol "Buat Halaman Baru" (lihat dibagian bawah...!)
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/norev.txt
new file mode 100644
index 000000000..5244f8303
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/norev.txt
@@ -0,0 +1,4 @@
+====== Revisi tidak tersedia ======
+
+Revisi yang diinginkan tidak ada. Gunakan tombol ''Revisi Lama'' untuk menampilkan daftar revisi lama dari dokumen ini.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/preview.txt
new file mode 100644
index 000000000..1621946b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+Ini adalah preview tentang bagimana tulisan Anda akan ditampilkan. Ingat: tulisan ini **belum disimpan**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/pwconfirm.txt
new file mode 100644
index 000000000..19131ee47
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/pwconfirm.txt
@@ -0,0 +1,13 @@
+Hai @FULLNAME@!
+
+Seseorang telah meminta password baru untuk @TITLE@ Anda login ke @DOKUWIKIURL@
+
+Jika Anda tidak meminta password baru, mohon mengacuhkan email ini.
+
+Untuk mengkonfirmasi bahwa permintaan tersebut adalah benar dari Anda, silahkan gunakan link dibawah.
+
+@CONFIRM@
+
+-- 
+Email ini dibuat otomatis  oleh DokuWiki
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/read.txt
new file mode 100644
index 000000000..f78c0eb9d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/read.txt
@@ -0,0 +1,2 @@
+Halaman ini hanya bisa dibaca. Anda bisa melihat sumbernya, tetapi tidak diperkenankan untuk mengubah. Hubungi administrator jika menemukan kesalahan pada halaman ini.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/recent.txt
new file mode 100644
index 000000000..f7cf24443
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/recent.txt
@@ -0,0 +1,5 @@
+====== Perubahan ======
+
+Berikut ini adalah halaman-halaman yang baru saja diubah.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/register.txt
new file mode 100644
index 000000000..dd8c578f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/register.txt
@@ -0,0 +1,4 @@
+====== Mendaftar sebagai anggota baru ======
+
+Isikan semua informasi dibawah ini untuk membuat account baru di wiki ini. Pastikan Anda telah mengisikan **alamat email yang valid**, karena password akan dikirim melalui email ini. Nama login harus sesuai dengan aturan [[doku>pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/registermail.txt
new file mode 100644
index 000000000..ed8c97ca3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/registermail.txt
@@ -0,0 +1,14 @@
+User baru telah mendaftar. Berikut detailnya:
+
+User name : @NEWUSER@
+Full name : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Email ini dibuat otomatis oleh DokuWIki
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/resendpwd.txt
new file mode 100644
index 000000000..276b2928f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Kirim Password Baru ======
+
+Masukkan nama user Anda pada form dibawah untuk permintaan perubahan password account Anda di Wiki ini. Link konfirmasi akan dikirimkan melalui alamat email Anda sewaktu registrasi.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/revisions.txt
new file mode 100644
index 000000000..d82b2735f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisi Lama ======
+
+Ini adalah revisi-revisi lama dari dokumen ini. Untuk mengaktifkan kembali revisi lama, pilih dokumen revisi, kemudikan tekan "Edit halaman ini" lalu Simpan.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/searchpage.txt
new file mode 100644
index 000000000..c47bed7dc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/searchpage.txt
@@ -0,0 +1,5 @@
+====== Pencarian ======
+
+Anda dapat menemukan hasil pencarian dibawah ini. Jika Anda tidak menemukan apa yang diinginkan, Anda dapat membuat halaman baru, dengan nama sesuai "text pencarian" Anda. Gunakan tombol "Edit halaman ini".
+
+===== Hasil Pencarian =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/showrev.txt
new file mode 100644
index 000000000..27f0c6421
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/showrev.txt
@@ -0,0 +1,2 @@
+**Ini adalah dokumen versi lama!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/stopwords.txt
new file mode 100644
index 000000000..73713c838
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/stopwords.txt
@@ -0,0 +1,37 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+yang
+dan
+adalah
+untuk
+lalu
+maka
+kemudian
+jika
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/subscribermail.txt
new file mode 100644
index 000000000..dc04df29a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/subscribermail.txt
@@ -0,0 +1,17 @@
+Halo Dunia!
+
+Halaman @PAGE@ di @TITLE@ wiki telah berubah.
+Perubahannya adalah sebagai berikut:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Untuk unsubscribe dari halaman ini, silahkan login ke wiki di
+@DOKUWIKIURL@ lalu buka
+@NEWPAGE@
+dan pilih 'Unsubscribe Changes'.
+
+-- 
+Email ini telah digenerate oleh DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/updateprofile.txt
new file mode 100644
index 000000000..b7f71a198
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ubah Profil Account Anda ======
+
+Anda hanya perlu mengisikan field yang ingin Anda ubah. Anda tidak dapat mengubah username Anda.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/uploadmail.txt
new file mode 100644
index 000000000..dc628fc11
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/uploadmail.txt
@@ -0,0 +1,14 @@
+Sebuah file telah diupload di DokuWiki Anda. Berikut detailnya:
+
+File : @MEDIA@
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+Size : @SIZE@
+MIME Type : @MIME@
+User : @USER@
+
+-- 
+Email ini dibuat otomatis oleh DokuWiki
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/wordblock.txt
new file mode 100644
index 000000000..1e40ce381
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/id/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blocked ======
+
+Maaf, tulisan Anda **tidak disimpan** karena terdapat satu atau lebih kata-kata yang **tabu**. Jika Anda mencoba melakukan SPAM wiki ini -- Bangsat lu! Tetapi, jika Anda pikir ini adalah kesalahan sistem, harap hubungi administrator wiki ini.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/adminplugins.txt
new file mode 100644
index 000000000..ce7b9d390
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/adminplugins.txt
@@ -0,0 +1 @@
+===== Aðrar viðbætur =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/diff.txt
new file mode 100644
index 000000000..a6d246ad7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/diff.txt
@@ -0,0 +1,3 @@
+===== Breytingar =====
+
+Hér sést hvað hefur breyst á milli útgáfna.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/lang.php
new file mode 100644
index 000000000..ba1ab2c04
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/lang.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * is language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesIs.php?view=co
+ * @author Hrannar Baldursson <hrannar.baldursson@gmail.com>
+ * @author Ólafur Gunnlaugsson <oli@audiotools.com>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Breyta þessari síðu';
+$lang['btn_source']            = 'Skoða wikikóða';
+$lang['btn_show']              = 'Sýna síðu';
+$lang['btn_create']            = 'Búa til þessa síðu';
+$lang['btn_search']            = 'Leit';
+$lang['btn_save']              = 'Vista';
+$lang['btn_preview']           = 'Forskoða';
+$lang['btn_top']               = 'Efst á síðu';
+$lang['btn_newer']             = '<< nýrra';
+$lang['btn_older']             = 'eldra >>';
+$lang['btn_revs']              = 'breytingaskrá';
+$lang['btn_recent']            = 'Nýlegar breytingar';
+$lang['btn_upload']            = 'Hlaða upp';
+$lang['btn_cancel']            = 'Hætta við';
+$lang['btn_index']             = 'Atriðaskrá';
+$lang['btn_secedit']           = 'Breyta';
+$lang['btn_login']             = 'Innskrá';
+$lang['btn_logout']            = 'Útskrá';
+$lang['btn_admin']             = 'Stjórnandi';
+$lang['btn_update']            = 'Uppfæra';
+$lang['btn_delete']            = 'Eyða';
+$lang['btn_back']              = 'Til baka';
+$lang['btn_backlink']          = 'Hvað tengist hingað';
+$lang['btn_backtomedia']       = 'Aftur til miðlaskrá';
+$lang['btn_subscribe']         = 'Vakta';
+$lang['btn_unsubscribe']       = 'Afvakta';
+$lang['btn_subscribens']       = 'Vakta breytingar á nafnrými';
+$lang['btn_unsubscribens']     = 'Afvakta breytingar á nafnrými';
+$lang['btn_profile']           = 'Uppfæra notanda';
+$lang['btn_reset']             = 'Endurstilla';
+$lang['btn_resendpwd']         = 'Senda nýtt aðgangsorð með tölvupósti';
+$lang['btn_draft']             = 'Breyta uppkasti';
+$lang['btn_recover']           = 'Endurheimta uppkast';
+$lang['btn_draftdel']          = 'Eyða uppkasti';
+$lang['btn_revert']            = 'Endurheimta';
+$lang['loggedinas']            = 'Innskráning sem';
+$lang['user']                  = 'Notendanafn';
+$lang['pass']                  = 'Aðgangsorð';
+$lang['newpass']               = 'Nýtt aðgangsorð';
+$lang['oldpass']               = 'Staðfesta núverandi (gamla) aðgangsorðið';
+$lang['passchk']               = 'Aðgangsorð (aftur)';
+$lang['remember']              = 'Muna.';
+$lang['fullname']              = 'Fullt nafn þitt*';
+$lang['email']                 = 'Tölvupóstfangið þitt*';
+$lang['register']              = 'Skráning';
+$lang['profile']               = 'Notendastillingar';
+$lang['badlogin']              = 'Því miður, notandanafn eða aðgangsorð var rangur.';
+$lang['minoredit']             = 'Minniháttar breyting';
+$lang['draftdate']             = 'Uppkast vistað sjálfkrafa';
+$lang['nosecedit']             = 'Síðunni var breytt á meðan, upplýsingar um svæðið voru úreltar og öll síðan því endurhlaðin.';
+$lang['regmissing']            = 'Afsakið, en þú verður að fylla út í allar eyður.';
+$lang['reguexists']            = 'Afsakið, notandi með þessu nafni er þegar skráður inn.';
+$lang['regsuccess']            = 'Notandi hefur verið búinn til og aðgangsorð sent í tölvupósti.';
+$lang['regsuccess2']           = 'Notandi hefur verið búinn til.';
+$lang['regmailfail']           = 'Það lítur út fyrir villu við sendingu aðgangsorðs. Vinsamlegast hafðu samband við stjórnanda.';
+$lang['regbadmail']            = 'Uppgefinn tölvupóstur virðist ógildur - teljir þú þetta vera villu, hafðu þá samband við stjórnanda.';
+$lang['regbadpass']            = 'Aðgangsorðin tvö eru ekki eins, vinsamlegast reyndu aftur.';
+$lang['regpwmail']             = 'DokuWiki aðgangsorðið þitt';
+$lang['reghere']               = 'Ertu ekki með reikning? Skráðu þig';
+$lang['profna']                = 'Þessi wiki leyfir ekki breytingar á notendaupplýsingum';
+$lang['profnochange']          = 'Enga breytingar vistaðar';
+$lang['profnoempty']           = 'Það er ekki leyfilegt að skilja nafn og póstfang eftir óútfyllt';
+$lang['profchanged']           = 'Notendaupplýsingum breytt';
+$lang['pwdforget']             = 'Gleymt aðgangsorð? Fáðu nýtt';
+$lang['resendna']              = 'Þessi wiki styður ekki endursendingar aðgangsorðs';
+$lang['resendpwd']             = 'Senda nýtt aðgangsorð fyrir';
+$lang['resendpwdmissing']      = 'Afsakið, þú verður að út eyðublaðið allt';
+$lang['resendpwdnouser']       = 'Afsakið, notandi finnst ekki.';
+$lang['resendpwdbadauth']      = 'Afsakið, þessi sannvottunorð er ekki gild. Gakktu úr skugga um að þú notaðir að ljúka staðfesting hlekkur.';
+$lang['resendpwdconfirm']      = 'Staðfesting hlekkur hefur verið send með tölvupósti.';
+$lang['resendpwdsuccess']      = 'Nýja aðgangsorðið hefur verið sent með tölvupósti.';
+$lang['license']               = 'Nema annað sé tekið fram, efni á þessari wiki er leyfð undir eftirfarandi leyfi:';
+$lang['licenseok']             = 'Athugið: Með því að breyta þessari síðu samþykkir þú að leyfisveitandi efni undir eftirfarandi leyfi:';
+$lang['searchmedia']           = 'Leit skrárheiti:';
+$lang['searchmedia_in']        = 'Leit í %s';
+$lang['txt_upload']            = 'Veldu skrá til innhleðslu';
+$lang['txt_filename']          = 'Innhlaða sem (valfrjálst)';
+$lang['txt_overwrt']           = 'Skrifa yfir skrá sem þegar er til';
+$lang['lockedby']              = 'Læstur af';
+$lang['lockexpire']            = 'Læsing rennur út eftir';
+$lang['nothingfound']          = 'Ekkert fannst';
+$lang['mediaselect']           = 'Miðlaskrá';
+$lang['fileupload']            = 'Hlaða inn miðlaskrá';
+$lang['uploadsucc']            = 'Innhlaðning tókst';
+$lang['uploadfail']            = 'Villa í innhlaðningu';
+$lang['uploadwrong']           = 'Innhleðslu neitað. Skrár með þessari endingu eru ekki leyfðar.';
+$lang['uploadexist']           = 'Skrá var þegar til staðar.';
+$lang['uploadbadcontent']      = 'Innhlaðið efni var ekki við að %s skrárendingu.';
+$lang['uploadspam']            = 'Þessi innhlaðning er útilokuð vegna ruslpósts svarturlisti.';
+$lang['uploadxss']             = 'Þessi innhlaðning er útilokuð vegna hugsanlega skaðlegum efni.';
+$lang['uploadsize']            = 'Innhlaðið skrá var of stór. (Hámark eru %s)';
+$lang['deletesucc']            = 'Skrá %s hefur verið eytt.';
+$lang['namespaces']            = 'Nafnrýmar';
+$lang['mediafiles']            = 'Tiltækar skrár í';
+$lang['js']['searchmedia']     = 'Leita að skrám';
+$lang['js']['hidedetails']     = 'Fela upplýsingar';
+$lang['js']['linkwiz']         = 'Tengill-leiðsagnarforrit';
+$lang['js']['linkto']          = 'Tengja';
+$lang['js']['del_confirm']     = 'Á örugglega að eyða valdar skrár?';
+$lang['mediaview']             = 'Sjá upprunalega skrá';
+$lang['mediaroot']             = 'rót';
+$lang['mediaextchange']        = 'Skrárending var breytt úr .%s til .%s!';
+$lang['reference']             = 'Tilvísanir til';
+$lang['ref_inuse']             = 'Ekki hægt að eyða skráin, því það er enn notað af eftirfarandi síðum:';
+$lang['ref_hidden']            = 'Sumar tilvísanir eru að síður sem þú hefur ekki leyfi til að lesa';
+$lang['hits']                  = 'Samsvör';
+$lang['quickhits']             = 'Samsvörun síðunöfn';
+$lang['toc']                   = 'Efnisyfirlit';
+$lang['current']               = 'nú';
+$lang['yours']                 = 'Þín útgáfa';
+$lang['diff']                  = 'Sýna ágreiningur til núverandi endurskoðun';
+$lang['diff2']                 = 'Sýna ágreiningur meðal valið endurskoðun';
+$lang['line']                  = 'Lína';
+$lang['breadcrumb']            = 'Snefill';
+$lang['youarehere']            = 'Þú ert hér';
+$lang['lastmod']               = 'Síðast breytt';
+$lang['by']                    = 'af';
+$lang['deleted']               = 'eytt';
+$lang['created']               = 'myndað';
+$lang['restored']              = 'Breytt aftur til fyrri útgáfu';
+$lang['external_edit']         = 'utanaðkomandi breyta';
+$lang['summary']               = 'Forskoða';
+$lang['noflash']               = 'Það þarf <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash viðbót</a> til að sýna sumt efnið á þessari síðu';
+$lang['download']              = 'Hlaða niður til kóðabút';
+$lang['mail_newpage']          = 'síðu bætt við:';
+$lang['mail_changed']          = 'síðu breytt:';
+$lang['mail_new_user']         = 'nýr notandi:';
+$lang['mail_upload']           = 'Innhlaðið skrá:';
+$lang['qb_bold']               = 'Feitletraður texti';
+$lang['qb_italic']             = 'Skáletraður texti';
+$lang['qb_underl']             = 'Undirstrikaður texti';
+$lang['qb_code']               = 'Kóðatraður texti';
+$lang['qb_strike']             = 'Yfirstrikaður texti';
+$lang['qb_h1']                 = 'Fyrsta stigs fyrirsögn';
+$lang['qb_h2']                 = 'Annars stigs fyrirsögn';
+$lang['qb_h3']                 = 'Þriðja stigs fyrirsögn';
+$lang['qb_h4']                 = 'Fjórða stigs fyrirsögn';
+$lang['qb_h5']                 = 'Fimmta stigs fyrirsögn';
+$lang['qb_h']                  = 'Fyrirsögn';
+$lang['qb_hs']                 = 'Veldu fyrirsögn';
+$lang['qb_hplus']              = 'Hærra stigs fyrirsögn';
+$lang['qb_hminus']             = 'Lægri stigs fyrirsögn';
+$lang['qb_hequal']             = 'Sama stigs fyrirsögn';
+$lang['qb_link']               = 'Innri tengill';
+$lang['qb_extlink']            = 'Ytri tengill (muna að setja http:// á undan)';
+$lang['qb_hr']                 = 'Lárétt lína (notist sparlega)';
+$lang['qb_ol']                 = 'Númeraðaðan listatriði';
+$lang['qb_ul']                 = 'Ónúmeraðaðan listatriði';
+$lang['qb_media']              = 'Bæta inn myndum og öðrum skrám';
+$lang['qb_sig']                = 'Undirskrift þín auk tímasetningu';
+$lang['qb_smileys']            = 'Broskallar';
+$lang['qb_chars']              = 'Sértækir stafir';
+$lang['admin_register']        = 'Setja nýjan notenda inn';
+$lang['metaedit']              = 'Breyta lýsigögnum';
+$lang['metasaveerr']           = 'Vistun lýsigagna mistókst';
+$lang['metasaveok']            = 'Lýsigögn vistuð';
+$lang['img_backto']            = 'Aftur til';
+$lang['img_title']             = 'Heiti';
+$lang['img_caption']           = 'Skýringartexti';
+$lang['img_date']              = 'Dagsetning';
+$lang['img_fname']             = 'Skrárheiti';
+$lang['img_fsize']             = 'Stærð';
+$lang['img_artist']            = 'Myndsmiður';
+$lang['img_copyr']             = 'Útgáfuréttur';
+$lang['img_format']            = 'Forsnið';
+$lang['img_camera']            = 'Myndavél';
+$lang['img_keywords']          = 'Lykilorðir';
+$lang['i_retry']               = 'Reyna aftur';
+$lang['mu_gridsize']           = 'Stærð';
+$lang['mu_toobig']             = 'of stór';
+$lang['mu_ready']              = 'tilbúin til upphleðslu';
+$lang['mu_done']               = 'lokið';
+$lang['mu_fail']               = 'mistókst';
+$lang['mu_info']               = 'Skrár innhlaðnar.';
+$lang['mu_lasterr']            = 'Síðasta villa:';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/login.txt
new file mode 100644
index 000000000..81e7e5e32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/login.txt
@@ -0,0 +1,3 @@
+===== Innskráning =====
+
+Þú ert ekki skráður inn! Skráuðu þig inn hér að neðan. Athugaðu að vafrinn sem að þú notar verður að styðja móttöku smákaka.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/recent.txt
new file mode 100644
index 000000000..7d3cf5720
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/recent.txt
@@ -0,0 +1,3 @@
+===== Nýlegar Breytingar =====
+
+Eftirfarandi síðum hefur nýlega verið breytt.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/resendpwd.txt
new file mode 100644
index 000000000..b847b1d4d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Senda nýtt aðgangsorð ======
+
+Vinsamlegast sláðu inn notendanafn þitt í formið hér fyrir neðan til að biðja um nýtt aðgangsorð fyrir reikninginn þinn í þessu wiki. A staðfesting hlekkur verður sendast á skráð netfang.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/subscribermail.txt
new file mode 100644
index 000000000..57e5faf86
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/is/subscribermail.txt
@@ -0,0 +1,23 @@
+Hæ
+
+@PAGE@ síðan í @TITLE@ hefur breyst.
+Hér eru breytingarnar:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dagsetning : @DATE@
+Notandi : @USER@
+Samantekt : @SUMMARY@
+Eldri útgáfa: @OLDPAGE@
+Ný útgáfa: @NEWPAGE@
+
+Ef þú vilt ekki lengur fá tilkynningar um breytingar á síðum, skráðu þig þá inn á
+@DOKUWIKIURL@, heimsóttu síðan
+@NEWPAGE@
+og afskráðu þig af tilkynningum fyrir síður og/ eða rými fyrir heiti.
+
+-- 
+Pósturinn var myndaður af DokuWiki að
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/admin.txt
new file mode 100644
index 000000000..95a611edc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/admin.txt
@@ -0,0 +1,4 @@
+====== Amministrazione ======
+
+Qui sotto puoi trovare una lista delle possibili azioni amministrative attualmente disponibili in Dokuwiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/adminplugins.txt
new file mode 100644
index 000000000..6a5a30573
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin addizionali =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/backlinks.txt
new file mode 100644
index 000000000..452019db5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/backlinks.txt
@@ -0,0 +1,4 @@
+====== Puntano qui ======
+
+Questa è una lista delle pagine che sembrano avere un collegamento alla pagina corrente.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/conflict.txt
new file mode 100644
index 000000000..44789a365
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/conflict.txt
@@ -0,0 +1,6 @@
+====== Esiste una versione più recente ======
+
+Esiste una versione più recente del documento che hai modificato. Questo può accadere quando un altro utente ha già modificato il documento durante le tue modifiche.
+
+Esamina le differenze mostrate di seguito, quindi decidi quale versione mantenere. Se scegli ''salva'', la tua versione verrà salvata. Clicca su ''annulla'' per mantenere la versione corrente.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/denied.txt
new file mode 100644
index 000000000..e87eeeada
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/denied.txt
@@ -0,0 +1,5 @@
+====== Accesso negato ======
+
+Non hai i diritti per continuare. Hai forse dimenticato di effettuare il login?
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/diff.txt
new file mode 100644
index 000000000..6b48ed44e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/diff.txt
@@ -0,0 +1,4 @@
+====== Differenze ======
+
+Queste sono le differenze tra la revisione selezionata e la versione corrente della pagina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/draft.txt
new file mode 100644
index 000000000..9932786ba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/draft.txt
@@ -0,0 +1,6 @@
+====== Trovata Bozza ======
+
+La tua ultima sessione di modifica su questa pagina non è stata completata correttamente. DokuWiki ha salvato in automatico una bozza durante il tuo lavoro, che puoi ora utilizzare per continuare le tue modifiche. Di seguito puoi trovare i dati che sono stati salvati dalla tua ultima sessione.
+
+Decidi se vuoi //recuperare// la sessione di modifica, //cancellare// la bozza salavata in automatico oppure //annullare// le modifiche.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/edit.txt
new file mode 100644
index 000000000..fdfaf463e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/edit.txt
@@ -0,0 +1,2 @@
+Modifica la pagina e clicca su ''Salva''. Vedi [[wiki:syntax]] per la sintassi riconosciuta da Wiki. Modifica questa pagina solo se puoi **apportare dei miglioramenti**. Se vuoi solo fare degli esperimenti ed imparare come fare i primi passi usa [[playground:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/editrev.txt
new file mode 100644
index 000000000..0a309fa24
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/editrev.txt
@@ -0,0 +1,2 @@
+**Hai caricato una precedente revisione del documento!** Se salvi questa pagina creerai una nuova versione con questi dati.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/index.txt
new file mode 100644
index 000000000..8d5f00409
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/index.txt
@@ -0,0 +1,4 @@
+====== Indice ======
+
+Questo è un indice di tutte le pagine disponibili ordinate per [[doku>namespaces|categoria]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/install.html
new file mode 100644
index 000000000..5bc4b0dc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/install.html
@@ -0,0 +1,24 @@
+<p>Questa pagina ti assisterà durante la prima installazione e configurazione di
+<a href="http://dokuwiki.org">Dokuwiki</a>. Ulteriori informazioni sulla
+procedura di installazione sono reperibili nella
+<a href="http://dokuwiki.org/installer">pagina di documentazione</a>.</p>
+
+<p>DokuWiki utilizza normali file per la memorizzazione di pagine wiki ed altre
+informazioni associate a tali pagine (es. immagini, indici per la ricerca, vecchie
+revisioni, ecc.).  Per poter operare correttamente DokuWiki
+<strong>deve</strong> accedere in scrittura alle directory che contengono tali
+file.  La procedura di installazione non è in grado di impostare i permessi sulle directory. Questo
+deve normalmente essere fatto direttamente da linea di comando oppure, se stai usando un servizio di hosting,
+attraverso FTP o dal pannello di controllo del servizio di hosting (es. cPanel).</p>
+
+<p>Questa procedura di installazione imposterà la configurazione di DokuWiki per l'uso di
+<acronym title="lista controllo accessi">ACL</acronym>, che consente all'amministratore di
+collegarsi e accedere al menu di amministrazione di DokuWiki per installare plugin, gestire
+utenti, gestire gli accessi alle pagine wiki e modificare le impostazioni del wiki.
+Non è necessario per il funzionamento di DokuWiki, ma renderà Dokuwiki più facile
+da amministrare.</p>
+
+<p>Gli utenti esperti o con particolari esigenze di installazione dovrebbero far riferimento ai
+seguenti link per i dettagli riguardanti
+<a href="http://dokuwiki.org/install">istruzioni per l'installazione</a>
+and <a href="http://dokuwiki.org/config">parametri di configurazione</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/lang.php
new file mode 100644
index 000000000..827967d0f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/lang.php
@@ -0,0 +1,240 @@
+<?php
+/**
+ * Italian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Giorgio Vecchiocattivi <giorgio@vecchio.it>
+ * @author Roberto Bolli <http://www.rbnet.it/>
+ * @author Silvia Sargentoni <polinnia@tin.it>
+ * @author Diego Pierotto <ita.translations@tiscali.it>
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda <lbreda@gmail.com>
+ * @author snarchio@alice.it
+ * @author robocap <robocap1@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Modifica questa pagina';
+$lang['btn_source']            = 'Mostra sorgente';
+$lang['btn_show']              = 'Mostra pagina';
+$lang['btn_create']            = 'Crea questa pagina';
+$lang['btn_search']            = 'Cerca';
+$lang['btn_save']              = 'Salva';
+$lang['btn_preview']           = 'Anteprima';
+$lang['btn_top']               = 'Torna su';
+$lang['btn_newer']             = '<< più recenti';
+$lang['btn_older']             = 'meno recenti >>';
+$lang['btn_revs']              = 'Revisioni precedenti';
+$lang['btn_recent']            = 'Ultime modifiche';
+$lang['btn_upload']            = 'Invia file';
+$lang['btn_cancel']            = 'Annulla';
+$lang['btn_index']             = 'Indice';
+$lang['btn_secedit']           = 'Modifica';
+$lang['btn_login']             = 'Entra';
+$lang['btn_logout']            = 'Esci';
+$lang['btn_admin']             = 'Amministrazione';
+$lang['btn_update']            = 'Aggiorna';
+$lang['btn_delete']            = 'Cancella';
+$lang['btn_back']              = 'Indietro';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Torna alla selezione file';
+$lang['btn_subscribe']         = 'Sottoscrivi modifiche';
+$lang['btn_unsubscribe']       = 'Cancella sottoscrizione';
+$lang['btn_subscribens']       = 'Sottoscrivi modifiche della categoria';
+$lang['btn_unsubscribens']     = 'Cancella sottoscrizione modifiche della categoria';
+$lang['btn_profile']           = 'Aggiorna profilo';
+$lang['btn_reset']             = 'Annulla';
+$lang['btn_resendpwd']         = 'Invia nuova password';
+$lang['btn_draft']             = 'Modifica bozza';
+$lang['btn_recover']           = 'Ripristina bozza';
+$lang['btn_draftdel']          = 'Cancella bozza';
+$lang['loggedinas']            = 'Collegato come';
+$lang['user']                  = 'Nome utente';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'Nuova password';
+$lang['oldpass']               = 'Conferma password corrente';
+$lang['passchk']               = 'Ripeti password';
+$lang['remember']              = 'Ricorda automaticamente';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrazione';
+$lang['profile']               = 'Profilo utente';
+$lang['badlogin']              = 'Il nome utente o la password non sono validi.';
+$lang['minoredit']             = 'Modifiche minori';
+$lang['draftdate']             = 'Bozza salvata in automatico il';
+$lang['nosecedit']             = 'La pagina nel frattempo è cambiata, la sezione info è scaduta, caricata invece la pagina intera.';
+$lang['regmissing']            = 'Devi riempire tutti i campi.';
+$lang['reguexists']            = 'Il nome utente inserito esiste già .';
+$lang['regsuccess']            = 'L\'utente è stato creato. La password è stata spedita via e-mail.';
+$lang['regsuccess2']           = 'L\'utente è stato creato.';
+$lang['regmailfail']           = 'Sembra che ci sia stato un errore nell\'invio della e-mail. Per favore contatta il tuo amministratore!';
+$lang['regbadmail']            = 'L\'indirizzo e-mail fornito sembra essere non valido - se pensi che ci sia un errore contatta il tuo amministratore';
+$lang['regbadpass']            = 'Le due password inserite non coincidono, prova di nuovo.';
+$lang['regpwmail']             = 'La tua password DokuWiki';
+$lang['reghere']               = 'Non hai ancora un accesso? Registrati qui.';
+$lang['profna']                = 'Questo wiki non supporta modifiche al profilo';
+$lang['profnochange']          = 'Nessuna modifica, niente da aggiornare.';
+$lang['profnoempty']           = 'Nome o indirizzo email vuoti non sono consentiti.';
+$lang['profchanged']           = 'Aggiornamento del profilo utente riuscito.';
+$lang['pwdforget']             = 'Hai dimenticato la password? Richiedine una nuova';
+$lang['resendna']              = 'Questo wiki non supporta l\'invio di nuove password.';
+$lang['resendpwd']             = 'Invia nuova password per';
+$lang['resendpwdmissing']      = 'Devi riempire tutti i campi.';
+$lang['resendpwdnouser']       = 'Impossibile trovare questo utente nel database.';
+$lang['resendpwdbadauth']      = 'Spiacente, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.';
+$lang['resendpwdconfirm']      = 'Un link di conferma è stato spedito via email.';
+$lang['resendpwdsuccess']      = 'La nuova password è stata spedita via email.';
+$lang['license']               = 'Ad eccezione da dove è diversamente indicato, il contenuto di questo wiki è sotto la seguente licenza:';
+$lang['licenseok']             = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:';
+$lang['txt_upload']            = 'Seleziona un file da caricare';
+$lang['txt_filename']          = 'Inserisci un "wikiname" (opzionale)';
+$lang['txt_overwrt']           = 'Sovrascrivi file esistente';
+$lang['lockedby']              = 'Attualmente bloccato da';
+$lang['lockexpire']            = 'Il blocco scade alle';
+$lang['willexpire']            = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
+$lang['notsavedyet']           = 'Le modifiche non salvate andranno perse.\nContinuare?';
+$lang['rssfailed']             = 'Si è verificato un errore cercando questo feed: ';
+$lang['nothingfound']          = 'Nessun risultato trovato.';
+$lang['mediaselect']           = 'Selezione dei file';
+$lang['fileupload']            = 'File caricato';
+$lang['uploadsucc']            = 'Invio riuscito';
+$lang['uploadfail']            = 'Invio fallito. Contatta l\'amministratore.';
+$lang['uploadwrong']           = 'Invio rifiutato. Questa estensione di file non è ammessa';
+$lang['uploadexist']           = 'Il file esiste già . Invio annullato.';
+$lang['uploadbadcontent']      = 'Il contenuto caricato non corrisponde all\'estensione del file %s.';
+$lang['uploadspam']            = 'Il caricamento è stato bloccato dalla lista nera di spam.';
+$lang['uploadxss']             = 'Il caricamento è stato bloccato perchè il contenuto potrebbe essere malizioso.';
+$lang['uploadsize']            = 'Il file caricato è troppo grande. (massimo %s)';
+$lang['deletesucc']            = 'Il file "%s" è stato cancellato.';
+$lang['deletefail']            = '"%s" non può essere cancellato - verifica i permessi.';
+$lang['mediainuse']            = 'Il file "%s" non è stato cancellato - è ancora in uso.';
+$lang['namespaces']            = 'Categorie';
+$lang['mediafiles']            = 'File disponibili in';
+$lang['js']['keepopen']        = 'Tieni la finestra aperta durante la selezione';
+$lang['js']['hidedetails']     = 'Nascondi Dettagli';
+$lang['js']['nosmblinks']      = 'I collegamenti con le risorse condivise di Windows funzionano solo con Microsoft Internet Explorer.
+Puoi fare un copia/incolla di questo collegamento.';
+$lang['js']['mu_btn']          = 'Carica più di un file alla volta';
+$lang['mediausage']            = 'Usa la seguente sintassi per riferirti a questo file:';
+$lang['mediaview']             = 'Mostra file originale';
+$lang['mediaroot']             = 'directory principale';
+$lang['mediaupload']           = 'Carica un file nella categoria corrente. Per creare sottocategorie, falle precedere al nome del file nella casella "Carica come", separandole da due punti (:).';
+$lang['mediaextchange']        = 'Estensione del file modificata da .%s a .%s!';
+$lang['reference']             = 'Riferimenti a';
+$lang['ref_inuse']             = 'Il file non può essere cancellato in quanto è ancora utilizzato dalle seguenti pagine:';
+$lang['ref_hidden']            = 'Sono presenti alcuni riferimenti a pagine per le quali non hai i permessi di lettura';
+$lang['hits']                  = 'Occorrenze trovate';
+$lang['quickhits']             = 'Pagine trovate';
+$lang['toc']                   = 'Indice';
+$lang['current']               = 'versione corrente';
+$lang['yours']                 = 'la tua versione';
+$lang['diff']                  = 'differenze con la versione attuale';
+$lang['diff2']                 = 'differenze tra le versioni selezionate';
+$lang['line']                  = 'Linea';
+$lang['breadcrumb']            = 'Traccia';
+$lang['youarehere']            = 'Ti trovi qui';
+$lang['lastmod']               = 'Ultima modifica';
+$lang['by']                    = 'da';
+$lang['deleted']               = 'cancellata';
+$lang['created']               = 'creata';
+$lang['restored']              = 'versione precedente ripristinata';
+$lang['external_edit']         = 'modifica esterna';
+$lang['summary']               = 'Oggetto della modifica';
+$lang['noflash']               = 'E\' necessario <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> per visualizzare questo contenuto.';
+$lang['download']              = 'Scarica lo "snippet"';
+$lang['mail_newpage']          = 'pagina aggiunta:';
+$lang['mail_changed']          = 'pagina modificata:';
+$lang['mail_new_user']         = 'Nuovo utente:';
+$lang['mail_upload']           = 'file caricato:';
+$lang['qb_bold']               = 'Grassetto';
+$lang['qb_italic']             = 'Corsivo';
+$lang['qb_underl']             = 'Sottolineato';
+$lang['qb_code']               = 'Codice';
+$lang['qb_strike']             = 'Barrato';
+$lang['qb_h1']                 = 'Intestazione di livello 1';
+$lang['qb_h2']                 = 'Intestazione di livello 2';
+$lang['qb_h3']                 = 'Intestazione di livello 3';
+$lang['qb_h4']                 = 'Intestazione di livello 4';
+$lang['qb_h5']                 = 'Intestazione di livello 5';
+$lang['qb_h']                  = 'Titolo';
+$lang['qb_hs']                 = 'Seleziona il titolo';
+$lang['qb_hplus']              = 'Titolo superiore';
+$lang['qb_hminus']             = 'Titolo inferiore';
+$lang['qb_hequal']             = 'Titolo dello stesso livello';
+$lang['qb_link']               = 'Collegamento interno';
+$lang['qb_extlink']            = 'Collegamento esterno';
+$lang['qb_hr']                 = 'Riga orizzontale';
+$lang['qb_ol']                 = 'Elenco numerato';
+$lang['qb_ul']                 = 'Elenco puntato';
+$lang['qb_media']              = 'Inserisci immagini o altri file';
+$lang['qb_sig']                = 'Inserisci la firma';
+$lang['qb_smileys']            = 'Smiley';
+$lang['qb_chars']              = 'Caratteri speciali';
+$lang['js']['del_confirm']           = 'Cancellare questa voce?';
+$lang['admin_register']        = 'Aggiungi un nuovo utente';
+$lang['metaedit']              = 'Modifica metadati';
+$lang['metasaveerr']           = 'Scrittura metadati fallita';
+$lang['metasaveok']            = 'Metadati salvati';
+$lang['img_backto']            = 'Torna a';
+$lang['img_title']             = 'Titolo';
+$lang['img_caption']           = 'Descrizione';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nome File';
+$lang['img_fsize']             = 'Dimensione';
+$lang['img_artist']            = 'Autore';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Parole chiave';
+$lang['subscribe_success']     = '%s è stato aggiunto alla lista di sottoscrizione per la pagina %s';
+$lang['subscribe_error']       = 'Si è verificato un errore durante l\'aggiunta di %s alla lista di sottoscrizione per la pagina %s';
+$lang['subscribe_noaddress']   = 'Non c\'è alcun indirizzo associato con il tuo profilo, non puoi sottoscriverti ad alcuna lista';
+$lang['unsubscribe_success']   = '%s è stato rimosso dalla lista di sottoscrizione per la pagina %s';
+$lang['unsubscribe_error']     = 'Si è verificato un errore durante la rimozione di %s dalla lista di sottoscrizione per la pagina %s';
+$lang['authmodfailed']         = 'La configurazione dell\'autenticazione non è corretta. Per favore informa l\'amministratore di questo Wiki.';
+$lang['authtempfail']          = 'L\'autenticazione è temporaneamente non disponibile. Se questa situazione persiste, per favore informa l\'amministratore di questo Wiki.';
+$lang['i_chooselang']          = 'Scegli la lingua';
+$lang['i_installer']           = 'Installazione DokuWiki';
+$lang['i_wikiname']            = 'Nome Wiki';
+$lang['i_enableacl']           = 'Abilita ACL (consigliato)';
+$lang['i_superuser']           = 'Amministratore';
+$lang['i_problems']            = 'Si sono verificati problemi durante l\'installazione, indicati di seguito. Non è possibile continuare finché non saranno risolti.';
+$lang['i_modified']            = 'Per motivi di sicurezza questa procedura funziona solamente con un\'installazione Dokuwiki nuova e non modificata.
+                         Dovresti ri-estrarre i file dal pacchetto scaricato oppure consultare tutte le
+                         <a href="http://dokuwiki.org/install">istruzioni per l\'installazione di Dokuwiki</a>';
+$lang['i_funcna']              = 'La funzione PHP <code>%s</code> non è disponibile. Forse il tuo provider l\'ha disabilitata per qualche motivo?';
+$lang['i_phpver']              = 'La versione di PHP <code>%s</code> è inferiore a quella richiesta <code>%s</code>. Devi aggiornare l\'installazione di PHP.';
+$lang['i_permfail']            = 'DokuWiki non può scrivere <code>%s</code>. E\' necessario correggere i permessi per questa directory!';
+$lang['i_confexists']          = '<code>%s</code> esiste già';
+$lang['i_writeerr']            = 'Impossibile creare <code>%s</code>. E\' necessario verificare i permessi della directory/file e creare il file manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php (hash=<code>%s</code>) non riconosciuto o modificato';
+$lang['i_badval']              = '<code>%s</code> - valore vuoto o non valido';
+$lang['i_success']             = 'La configurazione è stata completata correttamente. E\' ora possibile cancellare il file install.php. Continuare con
+                        <a href="doku.php">il nuovo DokuWiki</a>.';
+$lang['i_failure']             = 'Si sono verificati errori durante la scrittura dei file di configurazione. Potrebbe essere necessario correggerli manualmente prima di poter utilizzare <a href="doku.php">il nuovo DokuWiki</a>.';
+$lang['i_policy']              = 'Policy di accesso iniziali';
+$lang['i_pol0']                = 'Wiki Aperto (lettura, scrittura, caricamento file per tutti)';
+$lang['i_pol1']                = 'Wiki Pubblico (lettura per tutti, scrittura e caricamento file per gli utenti registrati)';
+$lang['i_pol2']                = 'Wiki Chiuso (lettura, scrittura, caricamento file solamente per gli utenti registrati)';
+$lang['i_retry']               = 'Riprova';
+$lang['mu_intro']              = 'Qui si possono caricare più di un file alla volta. Cliccare su "Sfoglia..." per aggiungere i file in coda. Cliccare "Carica" quando si è pronti.';
+$lang['mu_gridname']           = 'Nome del file';
+$lang['mu_gridsize']           = 'Dimensione';
+$lang['mu_gridstat']           = 'Stato';
+$lang['mu_namespace']          = 'Namespace';
+$lang['mu_browse']             = 'Sfoglia...';
+$lang['mu_toobig']             = 'troppo grande';
+$lang['mu_ready']              = 'pronto per l\'upload';
+$lang['mu_done']               = 'completo';
+$lang['mu_fail']               = 'fallito';
+$lang['mu_authfail']           = 'sessione scaduta';
+$lang['mu_progress']           = '@PCT@% caricato';
+$lang['mu_filetypes']          = 'Tipi di file permessi';
+$lang['mu_info']               = 'file caricati.';
+$lang['recent_global']         = 'Stai attualmente vedendo le modifiche dentro l\'area <b>%s</b>. Puoi anche <a href="%s">vedere le modifiche recenti dell\'intero wiki</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/locked.txt
new file mode 100644
index 000000000..a655ffcd3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina bloccata ======
+
+Questa pagina è attualmente bloccata poiché un altro utente sta effettuando delle modifiche. Devi attendere che l'utente concluda le modifiche o che il blocco scada.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/login.txt
new file mode 100644
index 000000000..6487c8537
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Non sei ancora collegato! Inserisci il tuo nome utente e la tua password per autenticarti. E' necessario che il tuo browser abbia i cookie abilitati.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/mailtext.txt
new file mode 100644
index 000000000..ee6e958b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/mailtext.txt
@@ -0,0 +1,16 @@
+Una pagina su DokuWiki è stata aggiunta o modificata. Questi sono i dettagli:
+
+Data                   : @DATE@
+Browser                : @BROWSER@
+Indirizzo IP           : @IPADDRESS@
+Nome host              : @HOSTNAME@
+Vecchia revisione      : @OLDPAGE@
+Nuova revisione        : @NEWPAGE@
+Oggetto della modifica : @SUMMARY@
+
+@DIFF@
+
+
+-- 
+Questa e-mail è stata generata da DokuWiki su
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/newpage.txt
new file mode 100644
index 000000000..d41601cfb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/newpage.txt
@@ -0,0 +1,3 @@
+====== Questo argomento non esiste ancora ======
+
+Hai seguito un collegamento ad un argomento che non è ancora stato creato. Se vuoi puoi crearlo tu stesso usando il pulsante ''Crea questa pagina''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/norev.txt
new file mode 100644
index 000000000..91ef751f9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/norev.txt
@@ -0,0 +1,3 @@
+====== Revisione inesistente ======
+
+La revisione richiesta non esiste. Usa il pulsante ''Revisioni precedenti'' per ottenere una lista di revisioni precedenti di questo documento.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/preview.txt
new file mode 100644
index 000000000..c3cf35246
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/preview.txt
@@ -0,0 +1,5 @@
+====== Anteprima ======
+
+Questa è un'anteprima di come apparirà il tuo testo. Attenzione: **la pagina non è ancora stata salvata**!.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/pwconfirm.txt
new file mode 100644
index 000000000..5437d077c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ciao @FULLNAME@!
+
+Qualcuno ha richiesto una nuova password per il tuo @TITLE@
+login su @DOKUWIKIURL@
+
+Se non hai richiesto tu la nuova password ignora questa email.
+
+Per confermare che la richiesta è stata realmente inviata da te per favore usa il
+seguente link.
+
+@CONFIRM@
+
+-- 
+Questa mail è stata generata da DokuWiki su
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/read.txt
new file mode 100644
index 000000000..0a7245404
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/read.txt
@@ -0,0 +1 @@
+Questa pagina è in sola lettura. Puoi visualizzare il sorgente, ma non puoi modificarlo. Contatta l'amministratore se pensi che ci sia un errore.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/recent.txt
new file mode 100644
index 000000000..4c29a9d52
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/recent.txt
@@ -0,0 +1,4 @@
+====== Ultime modifiche ======
+
+Queste sono le ultime pagine modificate.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/register.txt
new file mode 100644
index 000000000..973aead78
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/register.txt
@@ -0,0 +1,4 @@
+====== Registrazione nuovo utente ======
+
+Riempi tutte le informazioni seguenti per creare un nuovo account in questo wiki.  Assicurati di inserire un **indirizzo e-mail valido** - la tua nuova password ti sarà inviata con un messaggio di posta elettronica. La login dovrebbe essere un [[doku>pagename|nome di pagina]] valido.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/registermail.txt
new file mode 100644
index 000000000..5a9f89344
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/registermail.txt
@@ -0,0 +1,14 @@
+Un nuovo utente è stato registrato. Ecco i dettagli:
+
+Nome utente   : @NEWUSER@
+Nome completo : @NEWNAME@
+E-Mail        : @NEWEMAIL@
+
+Data          : @DATE@
+Browser       : @BROWSER@
+Indirizzo IP  : @IPADDRESS@
+Nome macchina : @HOSTNAME@
+
+-- 
+Questa mail è stata generata da DokuWiki su
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/resendpwd.txt
new file mode 100644
index 000000000..fc3f09414
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Invia nuova password ======
+
+Riempi tutte le informazioni seguenti per ottenere una nuova password per il tuo account su questo wiki. La nuova password sarà inviata al tuo indirizzo di posta elettronica registrato. Il nome utente deve essere il tuo nome utente di questo wiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/revisions.txt
new file mode 100644
index 000000000..984b4a068
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/revisions.txt
@@ -0,0 +1,3 @@
+====== Versione precedente ======
+
+Queste sono le precedenti versioni del documento corrente. Per ripristinare una versione precedente, seleziona la versione, modificala usando il pulsante ''Modifica questa pagina'' e salvala.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/searchpage.txt
new file mode 100644
index 000000000..60a019c3e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/searchpage.txt
@@ -0,0 +1,5 @@
+====== Cerca ======
+
+Questi sono i risultati della ricerca. Se non hai trovato quello che cercavi, puoi creare una nuova pagina con questo titolo usando il pulsante ''Crea questa pagina''.
+
+===== Risultati =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/showrev.txt
new file mode 100644
index 000000000..7c184f206
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/showrev.txt
@@ -0,0 +1,2 @@
+**Questa è una vecchia versione del documento!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/stopwords.txt
new file mode 100644
index 000000000..a6aa1cfc6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/stopwords.txt
@@ -0,0 +1,119 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+adesso
+alla
+allo
+allora
+altre
+altri
+altro
+anche
+ancora
+avere
+aveva
+avevano
+ben
+buono
+che
+chi
+cinque
+comprare
+con
+consecutivi
+consecutivo
+cosa
+cui
+del
+della
+dello
+dentro
+deve
+devo
+doppio
+due
+ecco
+fare
+fine
+fino
+fra
+gente
+giu
+hai
+hanno
+indietro
+invece
+lavoro
+lei
+loro
+lui
+lungo
+meglio
+molta
+molti
+molto
+nei
+nella
+noi
+nome
+nostro
+nove
+nuovi
+nuovo
+oltre
+ora
+otto
+peggio
+pero
+persone
+piu
+poco
+primo
+promesso
+qua
+quarto
+quasi
+quattro
+quello
+questo
+qui
+quindi
+quinto
+rispetto
+sara
+secondo
+sei
+sembra
+sembrava
+senza
+sette
+sia
+siamo
+siete
+solo
+sono
+sopra
+soprattutto
+sotto
+stati
+stato
+stesso
+su
+subito
+sul
+sulla
+tanto
+tempo
+terzo
+tra
+tre
+triplo
+ultimo
+una
+uno
+va
+vai
+voi
+volte
+vostro
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/subscribermail.txt
new file mode 100644
index 000000000..a211ef2e5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/subscribermail.txt
@@ -0,0 +1,18 @@
+Ciao!
+
+La pagina @PAGE@ di @TITLE@ wiki è stata aggiornata.
+Qui sotto sono elencate le modifiche apportate:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Per cancellare la tua sottoscrizione alla lista di controllo
+per questa pagina collegati al wiki
+@DOKUWIKIURL@ poi spostati su
+@NEWPAGE@
+e seleziona 'Cancella sottoscrizione'.
+
+-- 
+Questa email è stata generata da DokuWiki su
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/updateprofile.txt
new file mode 100644
index 000000000..71157a2ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Aggiorna il profilo del tuo account ======
+
+E' necessario compilare solo i campi che desideri modificare. Non puoi cambiare il tuo nome utente.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/uploadmail.txt
new file mode 100644
index 000000000..56cebc6b1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/uploadmail.txt
@@ -0,0 +1,14 @@
+Un file è stato caricato sul tuo DokuWiki. Seguono i dettagli:
+
+File : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensione : @SIZE@
+MIME Type : @MIME@
+Utente : @USER@
+
+-- 
+Questa email è stata generata dal DokuWiki di
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/wordblock.txt
new file mode 100644
index 000000000..510d6521d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/it/wordblock.txt
@@ -0,0 +1,4 @@
+====== Modifica bloccata ======
+
+Le tue modifiche **non sono state salvate** perché contengono una o più parole vietate. Se hai cercato di spammare il Wiki -- bambino cattivo! Se pensi che sia un errore contatta l'amministratore di questo Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/admin.txt
new file mode 100644
index 000000000..b0c6d34ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/admin.txt
@@ -0,0 +1,4 @@
+====== 管理者メニュー ======
+
+DokuWikiで管理できるタスクの一覧です
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/adminplugins.txt
new file mode 100644
index 000000000..1708bbb3c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/adminplugins.txt
@@ -0,0 +1 @@
+===== 追加プラグイン =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/backlinks.txt
new file mode 100644
index 000000000..69644b79d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/backlinks.txt
@@ -0,0 +1,4 @@
+====== バックリンク ======
+
+先ほどの文書にリンクしている文書のリストです。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/conflict.txt
new file mode 100644
index 000000000..099b5989a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/conflict.txt
@@ -0,0 +1,6 @@
+====== 新しいバージョンが存在します ======
+
+編集中に他のユーザーがこの文書を更新したため、新しいバージョンの文書が存在します。
+
+以下に文書間の差分を表示するので、どちらかの文書を選択してください。''保存'' を選択すると現在編集中の文書が保存されます。''キャンセル'' は編集中の文書が破棄されます。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/denied.txt
new file mode 100644
index 000000000..d170aebe4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/denied.txt
@@ -0,0 +1,4 @@
+====== アクセスが拒否されました ======
+
+実行する権限がありません。ログインされているか確認してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/diff.txt
new file mode 100644
index 000000000..fe5f6b165
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/diff.txt
@@ -0,0 +1,4 @@
+====== 差分 ======
+
+この文書の現在のバージョンと選択したバージョンの差分を表示します。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/draft.txt
new file mode 100644
index 000000000..af3160b8c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/draft.txt
@@ -0,0 +1,6 @@
+====== ドラフトファイルが存在します ======
+
+このページに対する最後の編集は正しく終了されませんでした。 その編集作業を引き続き行えるよう、以下に示す内容が自動的に保存されています。
+
+この自動的に保存された編集内容に対して、//復元する//、//削除する//、 もしくはこのページの編集を//キャンセル//して下さい。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/edit.txt
new file mode 100644
index 000000000..e7a8f9720
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/edit.txt
@@ -0,0 +1,4 @@
+編集して''保存''をクリックしてください。Wikiの構文については [[wiki:syntax]] を参考にしてください
+
+当然のことですが、この文書の質を **向上** させる場合のみ編集してください。もし編集方法や構文を練習したいのであれば [[playground:playground]] を利用してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/editrev.txt
new file mode 100644
index 000000000..7c984131c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/editrev.txt
@@ -0,0 +1,2 @@
+**古いリビジョンの文書を開いています** もしこのまま保存すると、この文書が最新となります。
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/index.txt
new file mode 100644
index 000000000..b5fbac97d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/index.txt
@@ -0,0 +1,4 @@
+====== 索引 ======
+
+[[doku>namespaces|名前空間]] に基づく、全ての文書の索引です。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/install.html
new file mode 100644
index 000000000..7439d27e1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/install.html
@@ -0,0 +1,14 @@
+<p>このページは、<a href="http://dokuwiki.org">Dokuwiki</a>のインストールと初期設定をサポートします。
+このインストーラーに関する詳細は <a href="http://dokuwiki.org/installer">documentation page</a> を参考にしてください。</p>
+
+<p>DokuWikiは、通常のファイルにWikiページの内容と関連する情報（例えば、画像、検索インデックス、古いリビジョンなど）を保存します。
+そのため、DokuWikiを使用するためには、それらのファイルを保存するディレクトリに書き込みの権限が<strong>必ず</strong>必要となります。
+このインストーラーではディレクトリの権限の変更は行えないため、コマンドシェルで権限の変更を直接行うか、
+ホスティングサービスを利用している場合はそのコントロールパネルもしくはFTPを通して、権限の変更を行ってください。</p>
+
+<p>DokuWikiは、プラグイン、ユーザー、Wikiページへのアクセス制限、設定の変更を管理する機能を有しており、
+その機能を有効にするために必要な <acronym title="access control list">ACL</acronym> の設定が、このインストーラーによって行われます。
+この管理機能は、DokuWikiを使用する上で必要ではありませんが、DokuWikiの管理を簡単にしてくれます。</p>
+
+<p>従来のバージョンを使用しているユーザーや特別なセットアップが必要な場合は、次のリンク先を参考にして下さい
+（<a href="http://dokuwiki.org/install">installation instructions</a>, <a href="http://dokuwiki.org/config">configuration settings</a>）。</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/lang.php
new file mode 100644
index 000000000..1f6681af1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/lang.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * japanese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Yuji Takenaka <webmaster@davilin.com>
+ * @author Ikuo Obataya <i.obataya@gmail.com>
+ * @author Daniel Dupriest <kououken@gmail.com>
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = '文書の編集';
+$lang['btn_source']            = 'ソースの表示';
+$lang['btn_show']              = '文書の表示';
+$lang['btn_create']            = '文書の作成';
+$lang['btn_search']            = '検索';
+$lang['btn_save']              = '保存';
+$lang['btn_preview']           = 'プレビュー';
+$lang['btn_top']               = '文書の先頭へ';
+$lang['btn_newer']             = '<< より新しい';
+$lang['btn_older']             = 'より古い >>';
+$lang['btn_revs']              = '以前のリビジョン';
+$lang['btn_recent']            = '最近の変更';
+$lang['btn_upload']            = 'アップロード';
+$lang['btn_cancel']            = 'キャンセル';
+$lang['btn_index']             = '索引';
+$lang['btn_secedit']           = '編集';
+$lang['btn_login']             = 'ログイン';
+$lang['btn_logout']            = 'ログアウト';
+$lang['btn_admin']             = '管理';
+$lang['btn_update']            = '更新';
+$lang['btn_delete']            = '削除';
+$lang['btn_back']              = '戻る';
+$lang['btn_backlink']          = 'バックリンク';
+$lang['btn_backtomedia']       = 'メディアファイル選択に戻る';
+$lang['btn_subscribe']         = '変更履歴配信の登録';
+$lang['btn_unsubscribe']       = '変更履歴配信の解除';
+$lang['btn_subscribens']       = '名前空間変更配信の登録';
+$lang['btn_unsubscribens']     = '名前空間変更配信の解除';
+$lang['btn_profile']           = 'ユーザー情報の更新';
+$lang['btn_reset']             = 'リセット';
+$lang['btn_resendpwd']         = 'パスワード再発行';
+$lang['btn_draft']             = 'ドラフトを編集';
+$lang['btn_recover']           = 'ドラフトを復元';
+$lang['btn_draftdel']          = 'ドラフトを削除';
+$lang['btn_revert']            = '元に戻す';
+$lang['loggedinas']            = 'ようこそ';
+$lang['user']                  = 'ユーザー名';
+$lang['pass']                  = 'パスワード';
+$lang['newpass']               = '新しいパスワード';
+$lang['oldpass']               = '現在のパスワード';
+$lang['passchk']               = '確認';
+$lang['remember']              = 'ユーザー名とパスワードを記憶する';
+$lang['fullname']              = 'フルネーム';
+$lang['email']                 = 'メールアドレス';
+$lang['register']              = 'ユーザー登録';
+$lang['profile']               = 'ユーザー情報';
+$lang['badlogin']              = 'ユーザー名かパスワードが違います。';
+$lang['minoredit']             = '小変更';
+$lang['draftdate']             = 'ドラフト保存日時：';
+$lang['nosecedit']             = 'ページ内容が変更されていますがセクション情報が古いため、代わりにページ全体をロードしました。';
+$lang['regmissing']            = '全ての項目を入力してください。';
+$lang['reguexists']            = 'このユーザー名は既に存在しています。';
+$lang['regsuccess']            = '新しいユーザーが作成されました。パスワードは登録したメールアドレス宛てに送付されます。';
+$lang['regsuccess2']           = '新しいユーザーが作成されました。';
+$lang['regmailfail']           = 'パスワードのメール送信に失敗しました。お手数ですが管理者まで連絡をお願いします。';
+$lang['regbadmail']            = 'メールアドレスが有効ではありません。';
+$lang['regbadpass']            = '確認用のパスワードが正しくありません。';
+$lang['regpwmail']             = 'あなたの DokuWiki パスワード';
+$lang['reghere']               = 'ご自分用のアカウントを取ってみては如何ですか？';
+$lang['profna']                = 'ユーザー情報の変更は出来ません';
+$lang['profnochange']          = '変更点はありませんでした。';
+$lang['profnoempty']           = 'ユーザー名とメールアドレスを入力して下さい。';
+$lang['profchanged']           = 'ユーザー情報は更新されました。';
+$lang['pwdforget']             = 'パスワードをお忘れですか？パスワード再発行';
+$lang['resendna']              = 'パスワードの再発行は出来ません。';
+$lang['resendpwd']             = '新しいパスワードを送信します：';
+$lang['resendpwdmissing']      = '全ての項目を入力して下さい。';
+$lang['resendpwdnouser']       = '入力されたユーザーが見つかりませんでした。';
+$lang['resendpwdbadauth']      = '申し訳ありません。この確認コードは有効ではありません。メール内に記載されたリンクを確認してください。';
+$lang['resendpwdconfirm']      = '確認用のリンクを含んだメールを送信しました。';
+$lang['resendpwdsuccess']      = '新しいパスワードがメールで送信されました。';
+$lang['license']               = '特に明示されていない限り、本Wikiの内容は次のライセンスに従います：';
+$lang['licenseok']             = '注意： 本ページを編集することは、あなたの編集した内容が次のライセンスに従うことに同意したものとみなします：';
+$lang['searchmedia']           = '検索ファイル名：';
+$lang['searchmedia_in']        = '%s 内を検索';
+$lang['txt_upload']            = 'アップロードするファイルを選んでください。';
+$lang['txt_filename']          = '名前を変更してアップロード（オプション）';
+$lang['txt_overwrt']           = '既存のファイルを上書き';
+$lang['lockedby']              = 'この文書は次のユーザによってロックされています';
+$lang['lockexpire']            = 'ロック期限：';
+$lang['willexpire']            = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
+$lang['notsavedyet']           = '変更は保存されません。このまま処理を続けてよろしいですか？';
+$lang['rssfailed']             = 'RSSの取り出しに失敗しました：';
+$lang['nothingfound']          = '該当文書はありませんでした。';
+$lang['mediaselect']           = 'メディアファイルを選択';
+$lang['fileupload']            = 'メディアファイルをアップロード';
+$lang['uploadsucc']            = 'アップロード完了';
+$lang['uploadfail']            = 'アップロードに失敗しました。権限がありません。';
+$lang['uploadwrong']           = 'アップロードは拒否されました。この拡張子は許可されていません。';
+$lang['uploadexist']           = '同名のファイルが存在するため、アップロードできません。';
+$lang['uploadbadcontent']      = 'アップロードされたファイルの内容は、拡張子 %s と一致しません。';
+$lang['uploadspam']            = 'スパムブラックリストによりアップロードが遮断されました。';
+$lang['uploadxss']             = '悪意のある内容である可能性により、アップロードが遮断されました。';
+$lang['uploadsize']            = 'アップロードしようとしたファイルは大きすぎます（最大 %s）。';
+$lang['deletesucc']            = 'ファイル "%s" は削除されました。';
+$lang['deletefail']            = 'ファイル "%s" が削除できません。権限を確認して下さい。';
+$lang['mediainuse']            = 'ファイル "%s" は使用中のため、削除されませんでした。';
+$lang['namespaces']            = '名前空間';
+$lang['mediafiles']            = '有効なファイル：';
+$lang['js']['searchmedia']     = 'ファイル検索';
+$lang['js']['keepopen']        = '選択中はウィンドウを閉じない';
+$lang['js']['hidedetails']     = '詳細を非表示';
+$lang['js']['nosmblinks']      = 'ウィンドウズの共有フォルダへリンクは Microsoft Internet Explorer でのみ可能となります。
+当然、カットアンドペーストが使用できます。';
+$lang['js']['linkwiz']         = 'リンクウィザード';
+$lang['js']['linkto']          = 'リンク先：';
+$lang['js']['del_confirm']     = '選択した項目を本当に削除しますか？';
+$lang['js']['mu_btn']          = '複数のファイルを一度にアップロード';
+$lang['mediausage']            = 'このファイルを使用するためには次の文法を使用する：';
+$lang['mediaview']             = 'オリジナルファイルを閲覧';
+$lang['mediaroot']             = 'ルート';
+$lang['mediaupload']           = 'ファイルを現在の名前空間にアップロードします。副名前空間を使用する場合には、ファイル名の前にコロンで区切って追加してください。';
+$lang['mediaextchange']        = '拡張子が .%s から .%s へ変更されました。';
+$lang['reference']             = '参照先';
+$lang['ref_inuse']             = 'このファイルは、次のページで使用中のため削除できません。';
+$lang['ref_hidden']            = 'このページに存在するいくつかの参照先は、権限が無いため読むことができません。';
+$lang['hits']                  = 'ヒット';
+$lang['quickhits']             = 'マッチした文書名';
+$lang['toc']                   = '目次';
+$lang['current']               = '現在';
+$lang['yours']                 = 'あなたのバージョン';
+$lang['diff']                  = '現在のリビジョンとの差分を表示';
+$lang['diff2']                 = '選択したリビジョン間の差分を表示';
+$lang['line']                  = 'ライン';
+$lang['breadcrumb']            = 'トレース';
+$lang['youarehere']            = '現在位置';
+$lang['lastmod']               = '最終更新';
+$lang['by']                    = 'by';
+$lang['deleted']               = '削除';
+$lang['created']               = '作成';
+$lang['restored']              = '以前のバージョンを復元';
+$lang['external_edit']         = '外部編集';
+$lang['summary']               = '編集の概要';
+$lang['noflash']               = 'この内容を表示するためには <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> が必要です。';
+$lang['download']              = 'この部分をダウンロード';
+$lang['mail_newpage']          = '文書の追加：';
+$lang['mail_changed']          = '文書の変更：';
+$lang['mail_new_user']         = '新規ユーザー：';
+$lang['mail_upload']           = 'ファイルのアップロード：';
+$lang['qb_bold']               = '太字';
+$lang['qb_italic']             = '斜体';
+$lang['qb_underl']             = '下線';
+$lang['qb_code']               = 'コード';
+$lang['qb_strike']             = '打消線';
+$lang['qb_h1']                 = '第一見出し';
+$lang['qb_h2']                 = '第二見出し';
+$lang['qb_h3']                 = '第三見出し';
+$lang['qb_h4']                 = '第四見出し';
+$lang['qb_h5']                 = '第五見出し';
+$lang['qb_h']                  = '見出し';
+$lang['qb_hs']                 = '見出し選択';
+$lang['qb_hplus']              = '上の階層の見出し';
+$lang['qb_hminus']             = '下の階層の見出し';
+$lang['qb_hequal']             = '同じ階層の見出し';
+$lang['qb_link']               = '内部リンク';
+$lang['qb_extlink']            = '外部リンク';
+$lang['qb_hr']                 = '横罫線';
+$lang['qb_ol']                 = '記号付きリスト';
+$lang['qb_ul']                 = '記号なしリスト';
+$lang['qb_media']              = 'イメージやファイルの追加';
+$lang['qb_sig']                = '署名の挿入';
+$lang['qb_smileys']            = 'スマイリー';
+$lang['qb_chars']              = '特殊文字';
+$lang['upperns']               = '上の階層の名前空間へ';
+$lang['admin_register']        = '新規ユーザー作成';
+$lang['metaedit']              = 'メタデータ編集';
+$lang['metasaveerr']           = 'メタデータの書き込みに失敗しました';
+$lang['metasaveok']            = 'メタデータは保存されました';
+$lang['img_backto']            = '戻る';
+$lang['img_title']             = 'タイトル';
+$lang['img_caption']           = '見出し';
+$lang['img_date']              = '日付';
+$lang['img_fname']             = 'ファイル名';
+$lang['img_fsize']             = 'サイズ';
+$lang['img_artist']            = '作成者';
+$lang['img_copyr']             = '著作権';
+$lang['img_format']            = 'フォーマット';
+$lang['img_camera']            = '使用カメラ';
+$lang['img_keywords']          = 'キーワード';
+$lang['subscribe_success']     = '変更履歴配信の登録が完了しました。';
+$lang['subscribe_error']       = '変更履歴配信の登録に失敗しました。';
+$lang['subscribe_noaddress']   = 'ログインしていないため、変更履歴配信に登録することはできません。';
+$lang['unsubscribe_success']   = '変更履歴配信の解除が完了しました。';
+$lang['unsubscribe_error']     = '変更履歴配信の解除に失敗しました。';
+$lang['authmodfailed']         = 'ユーザー認証の設定が正しくありません。Wikiの管理者に連絡して下さい。';
+$lang['authtempfail']          = 'ユーザー認証が一時的に使用できなくなっています。この状態が続いているようであれば、Wikiの管理者に連絡して下さい。';
+$lang['i_chooselang']          = '使用言語を選択してください';
+$lang['i_installer']           = 'DokuWiki インストーラー';
+$lang['i_wikiname']            = 'Wiki名';
+$lang['i_enableacl']           = 'ACL（アクセス管理）を使用する（推奨）';
+$lang['i_superuser']           = 'スーパーユーザー';
+$lang['i_problems']            = '問題が発見されました。以下に示す問題を解決するまで、インストールを続行できません。';
+$lang['i_modified']            = 'セキュリティの理由から、新規もしくはカスタマイズしていない DokuWiki に対してのみ、このスクリプトは有効です。
+                         ダウンロードしたパッケージを再解凍して使用するか、
+                         <a href="http://dokuwiki.org/install">Dokuwiki インストールガイド</a>を参考にしてインストールしてください。';
+$lang['i_funcna']              = 'PHPの関数 <code>%s</code> が使用できません。ホスティング会社が何らかの理由で無効にしている恐れがあります。';
+$lang['i_phpver']              = 'PHPのバージョン <code>%s</code> が必要なバージョン <code>%s</code> より以前のものです。PHPのアップグレードが必要です。';
+$lang['i_permfail']            = '<code>%s</code> に書き込みできません。このディレクトリの権限を確認して下さい。';
+$lang['i_confexists']          = '<code>%s</code> は既に存在します';
+$lang['i_writeerr']            = '<code>%s</code> を作成できません。ディレクトリとファイルの権限を確認し、それらを手動で作成する必要があります。';
+$lang['i_badhash']             = 'dokuwiki.php が認識できないか、編集されています（hash=<code>%s</code>）';
+$lang['i_badval']              = '<code>%s</code> - 正しくない、もしくは値が空です';
+$lang['i_success']             = '設定ファイルは正しく作成されました。<a href="doku.php">作成した DokuWiki</a>を使用するには install.php を削除してください。';
+$lang['i_failure']             = '設定ファイルの作成中にエラーが発生しました。<a href="doku.php">作成した DokuWiki</a>を使用する前に、それらの問題を手動で修正する必要があります。';
+$lang['i_policy']              = 'ACL初期設定';
+$lang['i_pol0']                = 'オープン Wiki（全ての人に、閲覧・書き込み・アップロードを許可）';
+$lang['i_pol1']                = 'パブリック Wiki（閲覧は全ての人が可能、書き込み・アップロードは登録ユーザーのみ）';
+$lang['i_pol2']                = 'クローズド Wiki (登録ユーザーにのみ使用を許可)';
+$lang['i_retry']               = '再試行';
+$lang['mu_intro']              = '複数のファイルを一度にアップロードできます。ブラウズボタンをクリックしてファイルを追加してください。追加したら、アップロードボタンをクリックしてください。';
+$lang['mu_gridname']           = 'ファイル名';
+$lang['mu_gridsize']           = 'サイズ';
+$lang['mu_gridstat']           = 'ステータス';
+$lang['mu_namespace']          = '名前空間';
+$lang['mu_browse']             = 'ブラウズ';
+$lang['mu_toobig']             = '大きすぎます';
+$lang['mu_ready']              = 'アップロードできます';
+$lang['mu_done']               = '完了';
+$lang['mu_fail']               = '失敗';
+$lang['mu_authfail']           = 'セッション期限切れ';
+$lang['mu_progress']           = '@PCT@% アップロード完了';
+$lang['mu_filetypes']          = '使用できるファイル形式';
+$lang['mu_info']               = 'ファイルアップロード完了';
+$lang['mu_lasterr']            = '直近のエラー：';
+$lang['recent_global']         = '現在、<b>%s</b> 名前空間内の変更点を閲覧中です。<a href="%s">Wiki全体の最近の変更点を確認する</a>ことも可能です。';
+$lang['years']                 = '%d年前';
+$lang['months']                = '%dカ月前';
+$lang['weeks']                 = '%d週間前';
+$lang['days']                  = '%d日前';
+$lang['hours']                 = '%d時間前';
+$lang['minutes']               = '%d分前';
+$lang['seconds']               = '%d秒前';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/locked.txt
new file mode 100644
index 000000000..1c37c93d1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/locked.txt
@@ -0,0 +1,3 @@
+====== 文書ロック中 ======
+
+この文書は他のユーザーによってロックされています。編集が完了するか、ロックの期限が切れるのを待って下さい。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/login.txt
new file mode 100644
index 000000000..ef18d378e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/login.txt
@@ -0,0 +1,4 @@
+====== ログイン ======
+
+ユーザー名とパスワードを入力してログインしてください（クッキーを有効にする必要があります）。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/mailtext.txt
new file mode 100644
index 000000000..09688cbb7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWiki 内の文書が追加もしくは変更されました。詳細は以下の通りです。
+
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
+前リビジョン: @OLDPAGE@
+新リビジョン: @NEWPAGE@
+編集のサマリ: @SUMMARY@
+ユーザー名  : @USER@
+
+@DIFF@
+
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/newpage.txt
new file mode 100644
index 000000000..d03169f8a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/newpage.txt
@@ -0,0 +1,4 @@
+====== このトピックには文書が存在しません ======
+
+このトピックに文書が作成されていません。 もし、文書作成の権限がある場合は、''文書の作成''をクリックして 最初の文書を作成することができます。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/norev.txt
new file mode 100644
index 000000000..48ccde700
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/norev.txt
@@ -0,0 +1,4 @@
+====== リビジョンが存在しません ======
+
+指定されたリビジョン存在しません。''以前のリビジョン''をクリックして確認してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/preview.txt
new file mode 100644
index 000000000..ee839cd06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/preview.txt
@@ -0,0 +1,4 @@
+====== プレビュー ======
+
+編集中の文書のプレビューです。確認用なので**保存されていない**ことに注意してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/pwconfirm.txt
new file mode 100644
index 000000000..98ccfcdea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/pwconfirm.txt
@@ -0,0 +1,13 @@
+こんにちは @FULLNAME@ さん
+
+@TITLE@（@DOKUWIKIURL@）に新規パスワード発行のリクエストがありました。
+
+もしこのリクエストに覚えが無ければ、このメールは無視してください。
+
+このリクエストを行った本人であれば、以下のリンクから作業を完了させてください。
+
+@CONFIRM@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/read.txt
new file mode 100644
index 000000000..14137cc14
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/read.txt
@@ -0,0 +1,2 @@
+この文書は読取専用です。文書のソースを閲覧することは可能ですが、変更はできません。もし変更したい場合は管理者に連絡してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/recent.txt
new file mode 100644
index 000000000..d18fd1bc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/recent.txt
@@ -0,0 +1,5 @@
+====== 最近の変更 ======
+
+以下の文書は最近更新されたものです。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/register.txt
new file mode 100644
index 000000000..b242d1e88
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/register.txt
@@ -0,0 +1,4 @@
+====== 新規ユーザー登録 ======
+
+このWikiのユーザー登録を行うためには、以下の情報を全て入力して下さい。 もし以下の項目にパスワードが存在しない場合、パスワードはメールにて送信されますので、 必ず**有効な**メールアドレスを入力してください。 また、ログイン名は [[doku>pagename|pagename]] に準拠していなければなりません。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/registermail.txt
new file mode 100644
index 000000000..2b272de40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/registermail.txt
@@ -0,0 +1,14 @@
+新しいユーザーが登録されました。ユーザー情報は以下の通りです。
+
+ユーザー名     : @NEWUSER@
+フルネーム     : @NEWNAME@
+メールアドレス : @NEWEMAIL@
+
+登録日         : @DATE@
+ブラウザ       : @BROWSER@
+IPアドレス     : @IPADDRESS@
+ホスト名       : @HOSTNAME@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/resendpwd.txt
new file mode 100644
index 000000000..23dd6ff1f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/resendpwd.txt
@@ -0,0 +1,4 @@
+====== パスワード再発行 ======
+
+このWikiで使用する新しいパスワードをリクエストするために、ユーザー名を入力して下さい。 新パスワード発行リクエストの確認メールが、登録されているメールアドレスに送信されます。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/revisions.txt
new file mode 100644
index 000000000..e43731ccd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/revisions.txt
@@ -0,0 +1,4 @@
+====== 以前のリビジョン ======
+
+以下はこの文書の以前のリビジョンです。復元するには''文書の編集''をクリック、その後保存してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/searchpage.txt
new file mode 100644
index 000000000..af312728b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/searchpage.txt
@@ -0,0 +1,5 @@
+====== 検索 ======
+
+以下に検索結果を表示します。もし、探しているものが見つからない場合、 検索キーワードにちなんだ名前の文書を作成もしくは編集を行ってください。
+
+===== 結果 =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/showrev.txt
new file mode 100644
index 000000000..d8ce4784e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/showrev.txt
@@ -0,0 +1,2 @@
+**以前のリビジョンの文書です**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/stopwords.txt
new file mode 100644
index 000000000..628e46ebe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/stopwords.txt
@@ -0,0 +1,29 @@
+# 以下は、インデックス作成時に無視する語句のリストです。一行に一単語ずつ記入してください。
+# UNIXで用いられる改行コード（LF）を使用してください
+# 3文字より短い語句は自動的に無視されるので、リストに加える必要はありません。
+# このリストは次のサイトをもとに作成されています（http://www.ranks.nl/stopwords/）
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/subscribermail.txt
new file mode 100644
index 000000000..d18ffe36d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/subscribermail.txt
@@ -0,0 +1,16 @@
+こんにちは
+
+@TITLE@ 内のページ @PAGE@ は変更されました。
+変更内容は以下の通りです。
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+ページ変更履歴配信サービスの解除は、
+@DOKUWIKIURL@ の @NEWPAGE@
+にある'変更履歴配信の解除'で行うことができます。
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/updateprofile.txt
new file mode 100644
index 000000000..e83d92965
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/updateprofile.txt
@@ -0,0 +1,5 @@
+====== アカウント情報更新 ======
+
+変更したい項目を入力して下さい。ユーザー名は変更できません。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/uploadmail.txt
new file mode 100644
index 000000000..53f30db61
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/uploadmail.txt
@@ -0,0 +1,14 @@
+お使いのDokuWikiにファイルがアップロードされました。詳細は以下の通りです。
+
+ファイル    : @MEDIA@
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
+サイズ      : @SIZE@
+MIMEタイプ  : @MIME@
+ユーザー名  : @USER@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/wordblock.txt
new file mode 100644
index 000000000..d7edd8765
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ja/wordblock.txt
@@ -0,0 +1,4 @@
+====== スパム ブロック ======
+
+除外する単語が含まれているため、変更は**保存されませんでした**。 もし意図したスパム行為でないのであれば、管理者に連絡してください。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/admin.txt
new file mode 100644
index 000000000..29338b2e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/admin.txt
@@ -0,0 +1,3 @@
+====== អ្នកគ្រោង ======
+ខាងក្រោមជាប្រដបប្រដារបស់អ្នកគ្រោង ឌោគូវីគី។
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/backlinks.txt
new file mode 100644
index 000000000..f28068a58
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/backlinks.txt
@@ -0,0 +1,5 @@
+====== ខ្សែដំណរក្រោយ ======
+នេះជាទំព័រដែលមានដំណរបណ្តពីទំព័រឥឡូវ។
+====== Backlinks ======
+This is a list of pages that seem to link back to the current page.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/conflict.txt
new file mode 100644
index 000000000..7b95fda65
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/conflict.txt
@@ -0,0 +1,3 @@
+====== មានបុនរាព្រឹត្តិថ្មីៗ ======
+មានបុនរាព្រឹត្តិថ្មី
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/denied.txt
new file mode 100644
index 000000000..58b10ee86
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/denied.txt
@@ -0,0 +1,3 @@
+====== បដិសេធអនុញ្ញាត ======
+សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/edit.txt
new file mode 100644
index 000000000..516ea3779
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/edit.txt
@@ -0,0 +1,3 @@
+កែតម្រូវទំព័រនេះហើយ ចុច«រក្សាតុក»។  មើល [[wiki:syntax|វាក្យសម្ពន្ធ]] ជាកម្នូវីគី។
+សំកែសម្រួលបើអ្នកអាច**ច្នៃចរើន**វា។  បើអ្នកចង់សាកពិសោតអ្វីមួយ សំរៀននៅក្នុង
+[[playground:playground|playground]]។
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/editrev.txt
new file mode 100644
index 000000000..097c1dae1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/editrev.txt
@@ -0,0 +1,2 @@
+**អ្នក ឯក្សារចាស់!**  បើអ្នករក្សាវា អ្នកគុង់តែបង្កើត ថ្មីជាមួយទិន្នន័យនេះ។
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/index.txt
new file mode 100644
index 000000000..350050837
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/index.txt
@@ -0,0 +1,2 @@
+====== លិបិក្រម ======
+នេះជាលិបិក្រមទំព័រទាំងឡាយបញ្ជាដោយ [[doku>wiki:namespaces|នាមថាន]]។
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/lang.php
new file mode 100644
index 000000000..a8257255f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/lang.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Anika Henke <henke@cosmocode.de>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author     Ratana Lim <aerorat@yahoo.com>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+$lang['doublequoteopening']  = '«';
+$lang['doublequoteclosing']  = '»';
+$lang['singlequoteopening']  = '‘';//&lsquo;
+$lang['singlequoteclosing']  = '’';//&rsquo;
+$lang['apostrophe']          = '’';//&rsquo;
+
+$lang['btn_edit']   = 'កែទំព័រនេះ';
+$lang['btn_source'] = 'បង្ហាងប្រភពទំព័រ';
+$lang['btn_show']   = 'បង្ហាងទំព័រ';
+$lang['btn_create'] = 'បង្កើតទំព័រនេះ';
+$lang['btn_search'] = 'ស្វែងរក';
+$lang['btn_save']   = 'រក្សាទុក';
+$lang['btn_preview']= 'បង្ហាញ';
+$lang['btn_top']    = 'ទៅលើ';
+$lang['btn_newer']  = '<<ទំព័រទំនើប';
+$lang['btn_older']  = 'ទំព័រថ្មែសម័យ>>';
+$lang['btn_revs']   = 'ទំព័រចាស់ៗ';
+$lang['btn_recent'] = 'ទំព័រថ្មីៗ';
+$lang['btn_upload'] = 'ដាកលើង';
+$lang['btn_cancel'] = 'បោះបង់';
+$lang['btn_index']  = 'លិបិក្រម';
+$lang['btn_secedit']= 'កែ';
+$lang['btn_login']  = 'កត់ចូល';
+$lang['btn_logout'] = 'កត់ចេញ';
+$lang['btn_admin']  = 'អ្នកគ្រប់គ្រង';
+$lang['btn_update'] = 'កែឡើង';
+$lang['btn_delete'] = 'លុបចោល';
+$lang['btn_back']   = 'ត្រឡប់';
+$lang['btn_backlink']    = 'ខ្សែចំណងក្រោយ';
+$lang['btn_backtomedia'] = 'ទៅប្រព័នឯកសាវិញ';
+$lang['btn_subscribe']   = 'ដាក់ដំណឹងផ្លស់ប្តូរ';
+$lang['btn_unsubscribe'] = 'ដកដំណឹងផ្លស់ប្តូរ';
+$lang['btn_profile']     = 'កែប្រវត្តិរូប';
+$lang['btn_reset']       = 'កមណត់ឡើងរិញ';
+$lang['btn_resendpwd']   = 'ផ្ញើពាក្សសម្ងាត់';
+$lang['btn_draft']    = 'កែគំរោង';
+$lang['btn_recover']  = 'ស្រោះគំរោងឡើង';
+$lang['btn_draftdel'] = 'លុបគំរោង';
+
+$lang['loggedinas'] = 'អ្នកប្រើ';
+$lang['user']       = 'នាមបម្រើ';
+$lang['pass']       = 'ពាក្សសម្ងត់';
+$lang['newpass']    = 'ពាក្សសម្ងាត់ថ្មី';
+$lang['oldpass']    = 'បន្ជាកពាក្សសម្ងាត់';
+$lang['passchk']    = 'ម្ដងទាត';
+$lang['remember']   = 'ចំណាំខ្ញុំ';
+$lang['fullname']   = 'នាមត្រគោល';
+$lang['email']      = 'អ៊ីមែល';
+$lang['register']   = 'ចុះឈ្មោះ';//'Register';
+$lang['profile']    = 'ប្រវត្តិរូប';// 'User Profile';
+$lang['badlogin']   = 'សុំអាទោស នាមបំរើ ឬ ពាក្សសម្ងាតមិនត្រវទេ។';
+$lang['minoredit']  = 'កែបបណ្តិចបណ្តួច';// 'Minor Changes';
+$lang['draftdate']  = 'គំរោង កត់ស្វ័យប្រវត្ត';
+
+$lang['regmissing'] = 'សុំអាទោស អ្នកត្រវបំពេញក្របវាល។';
+$lang['reguexists'] = 'សុំអាទោស នាមប្រើនេះមានរួចហើ។';
+$lang['regsuccess'] = 'អ្នកប្រើបានបង្កើតហើយ និងពាក្សសម្ងាតក៏បានផ្ញើទៀត។';
+$lang['regsuccess2']= 'អ្នកប្រើបានបង្កើតហើយ។';
+$lang['regmailfail']= 'មើលទៅដុចជាមានកំហុសក្នុង....សុំទាកទងអ្នកក្របក្រង';
+$lang['regbadmail'] = 'អ៊ីមេលអ្នកសាសេមិនត្រូវបញ្ជរ&mdash;បើអ្នកកិតថានេះជាកំហុសបដិបត្តិ សុំទាកទងអ្នកក្របគ្រោង។';
+$lang['regbadpass'] = 'គូពាក្សសម្ងាតមិនដូចគ្នាទេ សមសាកទៀត។';
+$lang['regpwmail']  = 'ពាក្សសម្ងាតអ្នក';
+$lang['reghere']    = 'អ្នកឥតមានបញ្ជីនាមបម្រើទេ?  សុំចល់ចុះឈ្មោះធ្វើគណនីសម្របប្រើប្រស';
+
+$lang['profna']       = 'មិនអាចកែ';
+$lang['profnochange'] = 'ឥតផ្លាស់ប្ដូរ ក្មានអ្វីធ្វើទេ។';
+$lang['profnoempty']  = 'នាមេឬអីមេលទទេ';
+$lang['profchanged']  = 'ប្រវត្តិរូបអ្នកប្រើបាន ។';
+
+$lang['pwdforget'] = 'ភ្លិចពាក្សសម្ងាត់ យកមួយទាត។';
+$lang['resendna']  = 'វីគីនេះមិនឧបរំផ្ញើពាក្សសម្ងាតម្ដងទៀតទេ។';
+$lang['resendpwd'] = 'ផ្ញើពាក្សសម្ងាតឲ្យ';
+$lang['resendpwdmissing'] = 'សុំអាទោស អ្នកត្រវបំពេញវាល។';
+$lang['resendpwdnouser']  = 'សុំអាទោស យាងរកអ្នកប្រើមិនឃើងទេ។';
+$lang['resendpwdbadauth'] = 'សុំអាទោស រហស្សលេខអនុញ្ញាតពំអាចប្រើបានទេ។ ខ្សែបន្ត';
+$lang['resendpwdconfirm'] ='ខ្សែបន្ត';
+$lang['resendpwdsuccess'] = 'ពាក្សសម្ងាតអ្នកបានផ្ញើហើយ។';
+
+$lang['txt_upload']   = 'ជ្រើសឯកសារដែលរុញឡើង';
+$lang['txt_filename'] = 'រុញឡើងជា (ស្រេចចិត្ត)';
+$lang['txt_overwrt']  = 'កត់ពីលើ';//'Overwrite existing file';
+$lang['lockedby']     = 'ឥឡូវនេះចកជាប់';
+$lang['lockexpire']   = 'សោជាប់ផុតកំណត់ម៉ោង';
+$lang['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ» ទៅកំណត់ឡើងវិញ។';
+
+$lang['notsavedyet'] = 'កម្រែមិនទានរុក្សាទកត្រូវបោះបង់។\nបន្តទៅទាឬទេ?';
+$lang['rssfailed']   = 'មានកំហុសពេលទៅប្រមូលយកមតិព័ត៌មាន៖ ';
+$lang['nothingfound']= 'រកមិនឃើញអ្វីទេ។';
+
+$lang['mediaselect'] = 'ឯកសារមីឌៀ';
+$lang['fileupload']  = 'រុញឯកសារមីឌៀឡើង';
+$lang['uploadsucc']  = 'រុញចូលមានជ័យ';
+$lang['uploadfail']  = 'រុញឡើងបរាជ័យ។ ប្រហែលខុសសិទ្ឋានុញ្ញាត?';
+$lang['uploadwrong'] = 'រុញឡើងត្រូវបានបដិសេធ។ ឯកសារ';
+$lang['uploadexist'] = 'ឯកសារមានហើយ។ ឥតមានធ្វើអ្វីទេ។';
+$lang['uploadbadcontent'] = 'ធាតុចំរុញឡើងមិនត្រូវកន្ទុយឯកសារ %s ទេ។';
+$lang['uploadspam']  = 'ចំរុញឡើង បង្ខាំង ដៅយ  ';
+$lang['uploadxss']   = 'ចំរុញឡើង បង្ខាំង  ';
+$lang['deletesucc']  = 'ឯកសារ «%s» បានលុបហើយ។';
+$lang['deletefail']  = '«%s» មិនអាចលុបទេ&mdashមើល';
+$lang['mediainuse']  = 'ឯកសារ «%s» ឥតទានលុបទេ&mdashមានគេកំភងទេជាប់ប្រើ។';
+$lang['namespaces']  = 'នាមដ្ឋាន';
+$lang['mediafiles']  = 'ឯកសារទំនេនៅក្នុង';
+
+$lang['js']['keepopen']    = 'ទុកបង្អួចបើក ពេលការជម្រើស';
+$lang['js']['hidedetails'] = 'បាំង';
+$lang['mediausage']  = 'ប្រើ';
+$lang['mediaview']   = 'មើលឯកសារដើម';
+$lang['mediaroot']   = 'ឫស';
+$lang['mediaupload'] = 'រុញឯកសារឡើងទៅនាមដ្ឋាននេះ។ នាមដ្ឋាន «រុញឡើង»';
+$lang['mediaextchange'] = 'កន្ទុយឯកសារផ្លាសពី «%s» ទៅ «%s»!';
+
+$lang['reference']   = 'អនុសាសនចំពោះ';
+$lang['ref_inuse']   = 'ឯកសារមិនអាចលុបពីព្រោះវានៅចាប់ប្រើដៅទំព័រ៖';
+$lang['ref_hidden']  = 'អនុសាសនខ្លះនៅលើទំព័រអ្នកគ្មានសេធអនុញ្ញាត';
+
+$lang['hits']       = 'ត្រូវ';
+$lang['quickhits']  = 'ឈ្មោះទំព័រប្រៀបដូច';
+$lang['toc']        = 'មាតិកា';
+$lang['current']    = 'ឥឡៅវ';
+$lang['yours']      = 'តំណែអ្នាក';
+$lang['diff']       = 'បង្ហាងអសទិសភាពជាមួយតំណែឥឡូវ ';
+$lang['line']       = 'ខ្សែ';
+$lang['breadcrumb'] = 'ដាន';
+$lang['youarehere'] = 'ដាន';
+$lang['lastmod']    = 'ពេលកែចុងក្រោយ';
+$lang['by']         = 'និពន្ឋដោយ';
+$lang['deleted']    = 'យកចេញ';
+$lang['created']    = 'បង្កើត';
+$lang['restored']   = 'ស្ដារបុនរាព្រឹតចាស់';
+$lang['external_edit'] = 'កំរេពីក្រៅ';
+$lang['summary']    = 'កែតម្រា';
+
+$lang['mail_newpage']  = 'ថែមទំព័រ';
+$lang['mail_changed']  = 'ទំព័រប្រែប្រួល';
+$lang['mail_new_user'] = 'អ្នកប្រើថ្មី';
+$lang['mail_upload']   = 'រុញអក្សាលើង';
+
+$lang['nosmblinks'] = 'ខ្សែបន្តទៅ «Windows share» ប្រើបានក្នុង «Microsoft IE»។ អ្នកអាច កាត់ឬបិត ខ្សែនេះ។';
+
+$lang['qb_bold']    = 'ឃ្វាមក្រស';
+$lang['qb_italic']  = 'ឃ្វាមជ្រៀង';
+$lang['qb_underl']  = 'ឃ្វាម';
+$lang['qb_code']    = 'ឃ្វាមក្បួន';
+$lang['qb_strike']  = 'ឃ្វាម';
+$lang['qb_h1']      = 'និវេទន៍ទី១';
+$lang['qb_h2']      = 'និវេទន៍ទី២';
+$lang['qb_h3']      = 'និវេទន៍ទី៣';
+$lang['qb_h4']      = 'និវេទន៍ទី៤';
+$lang['qb_h5']      = 'និវេទន៍ទី៥';
+$lang['qb_link']    = 'ខ្សែបន្តក្នុង';
+$lang['qb_extlink'] = 'ខ្សែបន្តក្រៅ';
+$lang['qb_hr']      = 'បន្ទាផ្ដេក';
+$lang['qb_ol']      = 'តារាងត្រៀប';
+$lang['qb_ul']      = 'តារាងអត្រៀប';
+$lang['qb_media']   = 'បន្ថែមរូនឹងឯកសារឥទៀត';
+$lang['qb_sig']     = 'ស៊កហត្ថលេខា';
+$lang['qb_smileys'] = 'សញ្ញាអារម្មណ៍';
+$lang['qb_chars']   = 'អក្ខរៈពិសេស';
+
+$lang['js']['del_confirm']= 'លុប';
+$lang['admin_register']= 'តែមអ្នកប្រើ';//'Add new user';
+
+$lang['spell_start'] = 'ពិនិត្យអក្ខរាវិរុទ្ធ';//'Check Spelling';
+$lang['spell_stop']  = 'បណ្តកំរែ'; 'Resume Editing';
+$lang['spell_wait']  = 'សូមចាំ';//'Please wait...';
+$lang['spell_noerr'] = 'ឥតមានខុះទេ';
+$lang['spell_nosug'] = 'ឥតមានយោបល់';
+$lang['spell_change']= 'ដូរជំនួស';//'Change';
+
+$lang['metaedit']    = 'កែទិន្នន័យអរូប';//'Edit Metadata';
+$lang['metasaveerr'] = 'ពំអាចកត់រទិន្នន័យអរូប';//'Writing metadata failed';
+$lang['metasaveok']  = 'ទិន្នន័យអរូប';
+$lang['img_backto']  = 'ថយក្រោយ';
+$lang['img_title']   = 'អភិធេយ្យ';
+$lang['img_caption'] = 'ចំណងជើង';
+$lang['img_date']    = 'ថ្ងៃខែ';//'Date';
+$lang['img_fname']   = 'ឈ្មោះឯកសារ';
+$lang['img_fsize']   = 'ទំហំ';//'Size';
+$lang['img_artist']  = 'អ្នកថតរូប';
+$lang['img_copyr']   = 'រក្សាសិទ្ធិ';
+$lang['img_format']  = 'ធុនប្រភេទ';
+$lang['img_camera']  = 'គ្រឿងថត';
+$lang['img_keywords']= 'មេពាក្ស';//'Keywords';
+
+$lang['subscribe_success']  = ' ដកថែម %s ចូលបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['subscribe_error']    = 'មានកំហុសពេលបន្ថែម %s ចូលបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['subscribe_noaddress']= 'ឥតមានអាសយដ្ឋាន អ្នកមិនអាចកត់ចុល';
+$lang['unsubscribe_success']= 'ដក %s ចេញពីបញ្ជីបរិវិសកមចំពោះ %s';
+$lang['unsubscribe_error']  = 'មានកំហុសពេលដក %s  ចេញពីបញ្ជីបរិវិសកមចំពោះ %s';
+
+/* auth.class language support */
+$lang['authmodfailed']   = 'និនផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវបានទេ។ សុំទាកទងអ្នកក្របគ្រោង។';
+$lang['authtempfail']    = 'ការផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវឥតដំនេ។ ប្រើ ....';
+
+/* installer strings */
+$lang['i_chooselang'] = 'រើសពាស្សាអ្នក';
+$lang['i_installer']  = 'ដំឡើងឌោគូវីគី';
+$lang['i_wikiname']   = 'នាមវីគី';
+$lang['i_enableacl']  = 'បើកប្រើ (អនុសាស)';
+$lang['i_superuser']  = 'អ្នកកំពូល';
+$lang['i_problems']   = 'កម្មវិធីដំឡើងបានប៉ះឧបសគ្គ។ អ្នកមិនអាចបន្តទៅទៀត ដល់អ្នកជួសជុលវា។';
+$lang['i_modified']   = '';
+$lang['i_funcna']     = '<code>%s</code> ';
+$lang['i_phpver']     = 'PHP ប្រវត់លេខ<code>%s</code> ជា';
+$lang['i_permfail']   = '<code>%s</code> មិនអាចសាស';
+$lang['i_confexists'] = '<code>%s</code> មានហាយ';
+$lang['i_writeerr']   = 'មិនអាចបណ្កើ<code>%s</code>។ អ្នកត្រវការពិនិត្យអធិក្រឹតិរបស់ថតនឹងឯកសារ។';
+$lang['i_badhash']    = '(hash=<code>%s</code>)';
+$lang['i_badval']     = '<code>%s</code>&mdash;';
+$lang['i_success']    = '';
+$lang['i_failure']    = 'ពលសាសារ';
+$lang['i_policy']     = 'បញ្ជីអនុញ្ញតផ្ដើម';
+$lang['i_pol0']       = 'វីគីបើកចំហ';
+$lang['i_pol1']       = 'វីគីសធារណៈ';
+$lang['i_pol2']       = 'វីគីបិទជិត';
+
+$lang['i_retry']      = 'ម្តងទៀត';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/login.txt
new file mode 100644
index 000000000..2149d9c32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/login.txt
@@ -0,0 +1,5 @@
+====== កត់ចូល ======
+
+អ្នកមិនទាន់។
+អ្នកត្រូវការអនុញ្ញាឲ្យកត់តនំបានចូល។
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/newpage.txt
new file mode 100644
index 000000000..4b2b4e2d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/newpage.txt
@@ -0,0 +1,4 @@
+====== ឥតទានមានទេ ======
+អ្នកតាមត្រសៃខ្សែដែលគ្មានទំព័រ។
+បើ
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/norev.txt
new file mode 100644
index 000000000..7ca11893e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/norev.txt
@@ -0,0 +1,2 @@
+====== ឥតមានបុនរាព្រឹត្តិទេ ======
+បុនរាព្រឹត្តិពុំមានទេ។ សុំប្រើ «ទំព័រចាស់ៗ» ទៅមើលបញ្ជីប្រវត្តទំព័រចាស់រូបស់អត្ថបទនេះ។
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/pwconfirm.txt
new file mode 100644
index 000000000..7c6a3ac97
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/pwconfirm.txt
@@ -0,0 +1,13 @@
+សួស្ដី @FULLNAME@!
+
+មានគេសុមស្នើពាក្យសម្ងាត់រុបសឲ្យ@TITLE@ នៅ @DOKUWIKIURL@។
+បើអ្នកមិនជាអ្នកសុមពាក្យសម្ងាត់ទេ សុំបស់ចល់អ៊ីមេលនេះ។
+
+
+សុំអះអាងដែលសំណើនេះដោយទៅតាមខ្សែ
+
+@CONFIRM@
+
+-- 
+អ៊ីមេលនេះបង្កើតពីឌក្គូវីគីនៅ
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/recent.txt
new file mode 100644
index 000000000..14449ea49
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/recent.txt
@@ -0,0 +1,3 @@
+====== ប្រវត្តិទំព័របច្ចុប្បន្ន ======
+ទំព័រទាំងនេះគឺទំព័រកែប្រែ
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/register.txt
new file mode 100644
index 000000000..b850c2ec3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/register.txt
@@ -0,0 +1,7 @@
+====== អ្នកប្រើថ្មី ======
+
+Fill in all the information below to create a new account in this wiki.
+Make sure you supply a **valid e-mail address** - if you are not asked
+to enter a password here, a new one will be sent to that address.
+The login name should be a valid [[doku>wiki:pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/revisions.txt
new file mode 100644
index 000000000..a15186df8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/km/revisions.txt
@@ -0,0 +1,4 @@
+====== ប្រវត្តិទំព័រចាស់ ======
+ទាំងនេះគឺប្រវត្តិទំព័រចាស់រុបសអត្ថបទនេះ។
+ជ្រើសខ្សែទំព័រពីខាងក្រោមហើយ ចុត «កែទំព័រនេះ» រួចហើយរក្សាវាទុក។
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/admin.txt
new file mode 100644
index 000000000..7dd0f58b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/admin.txt
@@ -0,0 +1,4 @@
+====== 관리 작업 ======
+
+DokuWiki에서 사용가능한 관리 작업 목록을 아래에서 찾을 수 있습니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/backlinks.txt
new file mode 100644
index 000000000..1711945e4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/backlinks.txt
@@ -0,0 +1,4 @@
+====== 백링크 ======
+
+현재 페이지로 백링크되는 페이지 목록입니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/conflict.txt
new file mode 100644
index 000000000..529296359
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/conflict.txt
@@ -0,0 +1,6 @@
+====== 새 버전 있음 ======
+
+편집하신 문서의 새 버전이 있습니다.  당신이 편집하고 있는 동안 다른 사람이 동일한 파일을 편집하였을 경우 이런 일이 생길 수 있습니다.
+
+아래의 차이점을 면밀히 검토하시고, 어떤 버전을 저장하실지 결정하십시오. **저장**을 선택하시면, 당신의 버전이 저장됩니다. **취소** 를 선택하시면 현재 버전이 유지됩니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/denied.txt
new file mode 100644
index 000000000..316a660c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/denied.txt
@@ -0,0 +1,4 @@
+====== 권한 거절 ======
+
+계속할 수 있는 권한이 없습니다. 로그인하십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/diff.txt
new file mode 100644
index 000000000..8cfb1da43
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/diff.txt
@@ -0,0 +1,5 @@
+====== 차이점 ======
+
+이 페이지의 선택한 이전 버전과 현재 버전 사이의 차이점을 보여줍니다.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/draft.txt
new file mode 100644
index 000000000..3df8a5e86
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/draft.txt
@@ -0,0 +1,6 @@
+====== 문서 초안이 있습니다. ======
+
+이 페이지의 마지막 편집 세션은 정상적으로 끝나지 않았습니다. DokuWiki는 작업 도중 자동으로 저장된 문서 초안을 사용하여 편집을 계속 할 수 있습니다. 마지막 세션동안 저장된 문서 초안을 아래에서 볼 수 있습니다.
+
+확실하게 비정상적으로 종료된 세션을 //복구//할지 여부를 결정하고, 자동으로 저장되었던 초안을 //삭제//하거나 편집 과정을 취소하기 바랍니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/edit.txt
new file mode 100644
index 000000000..d73f935fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/edit.txt
@@ -0,0 +1,2 @@
+페이지를 편집하고 **저장**을 누르십시오.  위키 구문은 [[wiki:syntax]] 혹은 [[syntax|(한글) 구문]]을 참고하십시오. 이 페이지를 **더 낫게 만들 자신이 있을** 때에만 편집하십시오. 실험을 하고 싶을 때에는, 먼저 [[playground:playground|연습장]] 에 가서 연습해 보십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/editrev.txt
new file mode 100644
index 000000000..2715448d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/editrev.txt
@@ -0,0 +1,2 @@
+**문서의 이전 버전을 선택하였습니다!** 저장할 경우 이 자료의 새 버전을 만듭니다.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/index.txt
new file mode 100644
index 000000000..7ca9488e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+이 페이지는 [[doku>namespaces|네임스페이스]] 에서 정렬한 모든 페이지의 목록입니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/install.html
new file mode 100644
index 000000000..6b1bfaf75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/install.html
@@ -0,0 +1,17 @@
+<p>이 페이지는 <a href="http://dokuwiki.org">Dokuwiki</a> 설치와 환경 설정을 도와줍니다.
+. 설치 과정에 대한 더 자세한 정보는 <a href="http://dokuwiki.org/ko:install">한글 설치문서</a>와 
+<a href="http://dokuwiki.org/install">영문 설치문서</a>를 참고하기 바랍니다.
+</p>
+
+<p>DokuWiki는 위키 페이지와 페이지와 관련된 정보(그림,색인, 이전 버전 문서 등등)를 저장하기 위해 일반적인 텍스트 파일들을 사용합니다. 정상적으로 DokuWiki를 사용하려면 이 파일들을 담고 있는 디렉토리들에 대한 쓰기 권한을 가지고 있어야 합니다.
+현재 설치 과정 중에는 디렉토리 권한 설정이 불가능합니다. 보통 직접 쉘 명령어를 사용하거나, 호스팅을 사용한다면 FTP나 호스팅 제어판(예. CPanel)을 사용해서 설정해야 합니다.</p>
+
+<p>현재 설치 과정중에 관리자로 로그인 후 DokuWiki의 관리 메뉴(플러그인 설치, 사용자 관리, 위키 페이지 접근 권한 관리, 옵션 설정)를 가능하게 <acronym title="접근 제어 목록">ACL</acronym>에 대한 환경 설정을 수행합니다.
+이 것은 DokuWiki가 동작하는데 필요한 사항은 아니지만, 어찌되었든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.</p>
+
+<p>숙련된 사용자들이나 특별한 설치 과정이 필요한 경우에 다음 링크들을 참조하기 바랍니다:
+<a href="http://dokuwiki.org/ko:install">설치 과정(한글)</a>
+과 <a href="http://dokuwiki.org/ko:config">환경 설정(한글),</a>
+<a href="http://dokuwiki.org/install">설치 과정(영문)</a>
+과 <a href="http://dokuwiki.org/config">환경 설정(영문)</a>
+</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/lang.php
new file mode 100644
index 000000000..f11ec95fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/lang.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * korean language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Hyun Kim <lawfully@gmail.com>
+ * @author jk Lee
+ * @author dongnak@gmail.com
+ * @author Song Younghwan <purluno@gmail.com>
+ * @author SONG Younghwan <purluno@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = '페이지 편집';
+$lang['btn_source']            = '소스 보기';
+$lang['btn_show']              = '페이지 보기';
+$lang['btn_create']            = '페이지 만들기';
+$lang['btn_search']            = '찾기';
+$lang['btn_save']              = '저장';
+$lang['btn_preview']           = '미리보기';
+$lang['btn_top']               = '맨위로';
+$lang['btn_newer']             = '<< 최근';
+$lang['btn_older']             = '이전 >>';
+$lang['btn_revs']              = '이전 버전들';
+$lang['btn_recent']            = '최근 변경 목록';
+$lang['btn_upload']            = '업로드';
+$lang['btn_cancel']            = '취소';
+$lang['btn_index']             = '색인';
+$lang['btn_secedit']           = '편집';
+$lang['btn_login']             = '로그인';
+$lang['btn_logout']            = '로그아웃';
+$lang['btn_admin']             = '관리';
+$lang['btn_update']            = '변경';
+$lang['btn_delete']            = '삭제';
+$lang['btn_back']              = '뒤로';
+$lang['btn_backlink']          = '이전 링크';
+$lang['btn_backtomedia']       = '미디어 파일 선택으로 돌아가기';
+$lang['btn_subscribe']         = '구독 신청';
+$lang['btn_unsubscribe']       = '구독 신청 해지';
+$lang['btn_subscribens']       = '네임스페이스 구독 신청';
+$lang['btn_unsubscribens']     = '네임스페이스 구독 신청 해지';
+$lang['btn_profile']           = '개인정보 변경';
+$lang['btn_reset']             = '초기화';
+$lang['btn_resendpwd']         = '새 패스워드 보내기';
+$lang['btn_draft']             = '문서초안 편집';
+$lang['btn_recover']           = '문서초안 복구';
+$lang['btn_draftdel']          = '문서초안 삭제';
+$lang['loggedinas']            = '다음 사용자로 로그인';
+$lang['user']                  = '사용자';
+$lang['pass']                  = '패스워드';
+$lang['newpass']               = '새로운 패스워드';
+$lang['oldpass']               = '현재 패스워드 확인';
+$lang['passchk']               = '패스워드 다시 확인';
+$lang['remember']              = '기억하기';
+$lang['fullname']              = '실제 이름';
+$lang['email']                 = '이메일';
+$lang['register']              = '등록';
+$lang['profile']               = '개인 정보';
+$lang['badlogin']              = '잘못된 사용자 이름이거나 패스워드입니다.';
+$lang['minoredit']             = '일부 내용 변경';
+$lang['draftdate']             = '문서 초안 자동저장 시간';
+$lang['nosecedit']             = '페이지가 수정되어 섹션정보가 달라져 페이지 전부를 다시 읽습니다.';
+$lang['regmissing']            = '모든 항목을 입력해야 합니다.';
+$lang['reguexists']            = '같은 이름을 사용하는 사용자가 있습니다.';
+$lang['regsuccess']            = '사용자를 만들었습니다. 패스워드는 이메일로 보냈습니다.';
+$lang['regsuccess2']           = '사용자를 만들었습니다.';
+$lang['regmailfail']           = '패스워드를 이메일로 전송할 때 오류가 발생했습니다. 관리자에게 문의하기 바랍니다!';
+$lang['regbadmail']            = '이메일 주소가 틀렸습니다. - 오류라고 생각되면 관리자에게 문의하기 바랍니다.';
+$lang['regbadpass']            = '새로운 패스워드들이 일치하지 않습니다. 다시 입력하기 바랍니다.';
+$lang['regpwmail']             = 'DokuWiki 패스워드';
+$lang['reghere']               = '아직 등록하지 않았다면 등록하기 바랍니다.';
+$lang['profna']                = '이 위키는 개인 정보 수정을 허용하지 않습니다.';
+$lang['profnochange']          = '변경사항이 없습니다.';
+$lang['profnoempty']           = '이름이나 이메일 주소가 비었습니다.';
+$lang['profchanged']           = '개인정보 변경이 성공했습니다.';
+$lang['pwdforget']             = '패스워드를 잊어버린 경우 새로 발급받을 수 있습니다.';
+$lang['resendna']              = '이 위키는 패스워드 재발급을 지원하지 않습니다.';
+$lang['resendpwd']             = '새로운 패스워드를 보냅니다.';
+$lang['resendpwdmissing']      = '새로운 패스워드를 입력해야햡니다.';
+$lang['resendpwdnouser']       = '등록된 사용자가 아닙니다. 다시 확인 바랍니다.';
+$lang['resendpwdbadauth']      = '인증 코드가 틀립니다. 잘못된 링크인지 확인 바랍니다.';
+$lang['resendpwdconfirm']      = '확인 링크를 이메일로 보냈습니다.';
+$lang['resendpwdsuccess']      = '새로운 패스워드는 이메일로 보내드립니다.';
+$lang['license']               = '이 위키의 내용은 다음의 라이센스에 따릅니다 :';
+$lang['licenseok']             = '주의 : 이 페이지를 수정한다는 다음의 라이센스에 동의함을 의미합니다 :';
+$lang['txt_upload']            = '업로드 파일을 선택합니다.';
+$lang['txt_filename']          = '업로드 파일 이름을 입력합니다.(선택 사항)';
+$lang['txt_overwrt']           = '새로운 파일로 이전 파일을 교체합니다.';
+$lang['lockedby']              = '현재 잠금 사용자';
+$lang['lockexpire']            = '잠금 해제 시간';
+$lang['willexpire']            = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리보기를 눌러 잠금 시간을 다시 설정하기 바랍니다.';
+$lang['notsavedyet']           = '저장하지 않은 변경은 지워집니다.\n계속하시겠습니까?';
+$lang['rssfailed']             = 'feed 가져오기 실패: ';
+$lang['nothingfound']          = '아무 것도 없습니다.';
+$lang['mediaselect']           = '미디어 파일 선택';
+$lang['fileupload']            = '미디어 파일 업로드';
+$lang['uploadsucc']            = '업로드 성공';
+$lang['uploadfail']            = '업로드 실패. 잘못된 권한 때문일지도 모릅니다.';
+$lang['uploadwrong']           = '업로드 거부. 금지된 확장자입니다!';
+$lang['uploadexist']           = '이미 파일이 존재합니다.';
+$lang['uploadbadcontent']      = '업로드된 파일이 파일 확장자 %s와 일치하지 않습니다.';
+$lang['uploadspam']            = '스팸 차단기가 업로드를 취소하였습니다.';
+$lang['uploadxss']             = '악성 코드의 가능성이 있어 업로드를 취소하였습니다.';
+$lang['uploadsize']            = '업로드한 파일이 너무 큽니다. (최대 %s)';
+$lang['deletesucc']            = '"%s" 파일이 삭제되었습니다.';
+$lang['deletefail']            = '"%s" 파일을 삭제할 수 없습니다. - 삭제 권한이 있는지 확인하기 바랍니다.';
+$lang['mediainuse']            = '"%s" 파일을 삭제할 수 없습니다. - 아직 사용 중입니다.';
+$lang['namespaces']            = '네임스페이스';
+$lang['mediafiles']            = '사용 가능한 파일 목록';
+$lang['js']['keepopen']        = '선택할 때 윈도우를 열어놓으시기 바랍니다.';
+$lang['js']['hidedetails']     = '자세한 정보 감추기';
+$lang['js']['nosmblinks']      = '윈도우 공유 파일과의 연결은 MS 인터넷 익스플로러에서만 동작합니다.
+그러나 링크를 복사하거나 붙여넣기를 할 수 있습니다.';
+$lang['js']['mu_btn']          = '여러 파일들을 한번에 업로드합니다.';
+$lang['mediausage']            = '이 파일을 참조하려면 다음 문법을 사용하기 바랍니다:';
+$lang['mediaview']             = '원본 파일 보기';
+$lang['mediaroot']             = '루트(root)';
+$lang['mediaupload']           = '파일을 현재 네임스페이스로 업로드합니다. 하위 네임스페이스를 만들려면 파일 이름 앞에 콜론(:)으로 구분되는 이름을 붙이면 됩니다.';
+$lang['mediaextchange']        = '파일 확장자가 .%s에서 .%s으로 변경됐습니다!';
+$lang['reference']             = '참조';
+$lang['ref_inuse']             = '다음 페이지들에서 아직 사용 중이므로 파일을 삭제할 수 없습니다:';
+$lang['ref_hidden']            = '페이지들의 몇몇 참조는 읽을 수 있는 권한이 없습니다.';
+$lang['hits']                  = '히트 수';
+$lang['quickhits']             = '일치하는 페이지 이름';
+$lang['toc']                   = '목차';
+$lang['current']               = '현재';
+$lang['yours']                 = '버전';
+$lang['diff']                  = '현재 버전과의 차이 보기';
+$lang['diff2']                 = '선택된 버전들 간 차이 보기';
+$lang['line']                  = '줄';
+$lang['breadcrumb']            = '추적';
+$lang['youarehere']            = '현재 위치';
+$lang['lastmod']               = '마지막 수정';
+$lang['by']                    = '작성자';
+$lang['deleted']               = '삭제';
+$lang['created']               = '새로 만듦';
+$lang['restored']              = '옛 버전 복구';
+$lang['external_edit']         = '외부 편집기';
+$lang['summary']               = '편집 요약';
+$lang['noflash']               = '이 컨텐츠를 표시하기 위해서 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>이 필요합니다.';
+$lang['mail_newpage']          = '페이지 추가:';
+$lang['mail_changed']          = '페이지 변경:';
+$lang['mail_new_user']         = '새로운 사용자:';
+$lang['mail_upload']           = '파일 첨부:';
+$lang['qb_bold']               = '굵은 글';
+$lang['qb_italic']             = '이탤릭체 글';
+$lang['qb_underl']             = '밑줄 그어진 글';
+$lang['qb_code']               = '코드로 표시된 글';
+$lang['qb_strike']             = '취소 표시된 글';
+$lang['qb_h1']                 = '1단계 헤드라인';
+$lang['qb_h2']                 = '2단계 헤드라인';
+$lang['qb_h3']                 = '3단계 헤드라인';
+$lang['qb_h4']                 = '4단계 헤드라인';
+$lang['qb_h5']                 = '5단계 헤드라인';
+$lang['qb_link']               = '내부 링크';
+$lang['qb_extlink']            = '외부 링크';
+$lang['qb_hr']                 = '수평선';
+$lang['qb_ol']                 = '숫자 목록';
+$lang['qb_ul']                 = '목록';
+$lang['qb_media']              = '이미지와 기타 파일 추가';
+$lang['qb_sig']                = '서명 추가';
+$lang['qb_smileys']            = '이모티콘';
+$lang['qb_chars']              = '특수문자';
+$lang['js']['del_confirm']           = '정말로 선택된 항목(들)을 삭제하시겠습니까?';
+$lang['admin_register']        = '새로운 사용자 추가';
+$lang['metaedit']              = '메타 데이타를 편집합니다.';
+$lang['metasaveerr']           = '메타 데이타 쓰기가 실패했습니다.';
+$lang['metasaveok']            = '메타 데이타가 저장되었습니다.';
+$lang['img_backto']            = '뒤로';
+$lang['img_title']             = '이름';
+$lang['img_caption']           = '설명';
+$lang['img_date']              = '날짜';
+$lang['img_fname']             = '파일 이름';
+$lang['img_fsize']             = '크기';
+$lang['img_artist']            = '만든이';
+$lang['img_copyr']             = '저작권';
+$lang['img_format']            = '포맷';
+$lang['img_camera']            = '카메라';
+$lang['img_keywords']          = '키워드';
+$lang['subscribe_success']     = '%s를 추가했습니다. (%s의 구독 목록)';
+$lang['subscribe_error']       = '%s를 추가하는데 실패했습니다.(%s의 구독 목록)';
+$lang['subscribe_noaddress']   = '로그인 정보에 이메일 주소가 없습니다, 구독 목록에 추가할 수 없습니다.';
+$lang['unsubscribe_success']   = '%s를 제외시켰습니다. (%s의 구독 목록)';
+$lang['unsubscribe_error']     = '%s를 제외시키는데 실패했습니다.(%s의 구독 목록)';
+$lang['authmodfailed']         = '잘못된 사용자 인증 설정입니다. 관리자에게 문의하기 바랍니다.';
+$lang['authtempfail']          = '사용자 인증이 일시적으로 불가능합니다. 만일 계속해서 문제가 발생하면 관리자에게 문의하기 바랍니다.';
+$lang['i_chooselang']          = '사용하는 언어를 선택합니다.';
+$lang['i_installer']           = 'DokuWiki 설치';
+$lang['i_wikiname']            = '위키 이름';
+$lang['i_enableacl']           = 'ACL기능 사용(권장 사항)';
+$lang['i_superuser']           = '슈퍼 유저';
+$lang['i_problems']            = '설치 중 아래와 같은 문제가 발생했습니다. 문제를 해결한 후 설치를 계속하기 바랍니다.';
+$lang['i_modified']            = '보안 상의 이유로 아래 스크립트는 수정되지 않은 새 Dokuwiki설치에서만 동작됩니다.
+다운로드된 압축 패키지를 다시 설치하거나 <a href="http://dokuwiki.org/install"> DokuWiki 설치 과정</a>을 참고해서 설치하기 바랍니다.';
+$lang['i_funcna']              = 'PHP함수 <code>%s</code> 사용이 불가능합니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
+$lang['i_phpver']              = 'PHP <code>%s</code>버전은 필요한 <code>%s</code>버전보다 오래되었습니다.PHP를 업그레이드할 필요가 있습니다.';
+$lang['i_permfail']            = 'DokuWiki는 <code>%s</code>에 쓰기 가능 권한이 없습니다. 먼저 이 디렉토리에 쓰기 권한이 설정되어야 합니다!';
+$lang['i_confexists']          = '<code>%s</code>는 이미 존재합니다.';
+$lang['i_writeerr']            = '<code>%s</code>을 만들 수 없습니다. 먼저 디렉토리/파일 권한을 확인하고 파일을 수동으로 만들기 바랍니다.';
+$lang['i_badhash']             = 'dokuwiki.php를 인식할 수 없거나 원본 파일이 아닙니다. (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - 유효하지 않거나 빈 값입니다.';
+$lang['i_success']             = '환경 설정이 성공적으로 끝났습니다. install.php를 지워도 상관없습니다.
+                        <a href="doku.php">새로운 DokuWiki</a>.';
+$lang['i_failure']             = '환경 설정 파일에 쓰는 도중 에러가 발생했습니다.
+새로운 <a href="doku.php"> DokuWiki</a>를 사용하기 전에 수동으로 문제를 해결할 필요가 있습니다.';
+$lang['i_policy']              = '초기 ACL 정책';
+$lang['i_pol0']                = '개방형 위키 (누구나 읽기/쓰기/업로드가 가능합니다.)';
+$lang['i_pol1']                = '공개형 위키 (누구나 읽을 수 있지만, 등록된 사용자만 쓰기/업로드가 가능합니다.)';
+$lang['i_pol2']                = '폐쇄형 위키 (등록된 사용자만 읽기/쓰기/업로드가 가능합니다.)';
+$lang['i_retry']               = '다시 시도';
+$lang['mu_intro']              = '여러 파일을 한번에 업로드할 수 있습니다. 파일 목록에 추가하려면 "찾기" 버튼을 클릭합니다. 파일 목록 추가 작업이 끝나면 "업로드" 버튼을 클릭하기 바랍니다. ';
+$lang['mu_gridname']           = '파일명';
+$lang['mu_gridsize']           = '크기';
+$lang['mu_gridstat']           = '상태';
+$lang['mu_namespace']          = '네임스페이스';
+$lang['mu_browse']             = '찾기';
+$lang['mu_toobig']             = '업로드 가능 크기를 초과했습니다.';
+$lang['mu_ready']              = '업로드가 가능합니다.';
+$lang['mu_done']               = '업로드가 완료되었습니다.';
+$lang['mu_fail']               = '업로드가 실패했습니다.';
+$lang['mu_authfail']           = '세션 기간이 종료되었습니다.';
+$lang['mu_progress']           = '@PCT@% 업로드되었습니다.';
+$lang['mu_filetypes']          = '허용된 파일타입';
+$lang['recent_global']         = '<b>%s</b> 네임스페이스를 구독중입니다. <a href="%s">전체위키 변경사항 </a>도 보실수 있습니다.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/locked.txt
new file mode 100644
index 000000000..24525fc46
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/locked.txt
@@ -0,0 +1,3 @@
+====== 페이지 잠금 ======
+
+다른 사용자가 이 페이지 편집을 위해 잠금을 실행하였습니다.  해당 사용자가 편집을 끝내거나 잠금이 해제될 때까지 기다리십시오.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/login.txt
new file mode 100644
index 000000000..1aae449df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/login.txt
@@ -0,0 +1,4 @@
+====== 로그인 ======
+
+로그인하지 않았습니다! 아래에서 로그인하십시오. 로그인하려면 쿠키를 받도록 설정하여야 합니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/mailtext.txt
new file mode 100644
index 000000000..5c496435e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWiki 페이지가 수정 혹은 추가되었습니다.  상세한 정보는 다음과 같습니다.
+
+날짜        : @DATE@
+브라우저    : @BROWSER@
+IP 주소     : @IPADDRESS@
+호스트명    : @HOSTNAME@
+옛날버전    : @OLDPAGE@
+새버전      : @NEWPAGE@
+편집 요약   : @SUMMARY@
+사용자        : @USER@
+
+@DIFF@
+
+
+-- 
+이 메일은 @DOKUWIKIURL@ 의 DokuWiki 가 생성한
+이메일입니다.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/newpage.txt
new file mode 100644
index 000000000..f8380bd84
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/newpage.txt
@@ -0,0 +1,3 @@
+====== 이 토픽은 아직 없습니다 ======
+
+아직 없는 토픽 링크를 따라오셨습니다. **페이지 만들기** 버튼을 이용하여 새로 만들 수 있습니다.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/norev.txt
new file mode 100644
index 000000000..e1b4093b4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/norev.txt
@@ -0,0 +1,3 @@
+====== 지정한 버전 없음 ======
+
+지정한 버전이 없습니다. **과거 버전** 버튼을 사용하여 이 문서의 버전 목록을 보십시오.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/preview.txt
new file mode 100644
index 000000000..8bcc6a1eb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/preview.txt
@@ -0,0 +1,4 @@
+====== 미리보기 ======
+
+이것은 입력하신 내용이 어떻게 보일지 미리보기하는 곳입니다.  아직은 **저장되지 않았다**는 점을 기억하십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/pwconfirm.txt
new file mode 100644
index 000000000..c022a52a9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/pwconfirm.txt
@@ -0,0 +1,11 @@
+안녕하세요. @FULLNAME@!
+
+@DOKUWIKIURL@에 작성하신 @TITLE@을 보려면 새 패스워드가 필요하다는 요청을 누군가 받았다고 합니다.
+
+새로운 패스워드를 요청한 적이 없다면 이 이메일을 무시해버리세요.
+
+@CONFIRM@에서 정말로 본인이 그런 요청을 했었는지 확인해 보기 바랍니다.
+
+-- 
+
+@DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/read.txt
new file mode 100644
index 000000000..6b5d7b3db
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/read.txt
@@ -0,0 +1,2 @@
+이 페이지는 읽기 전용입니다. 소스를 볼 수는 있지만, 수정할 수는 없습니다. 연습은 [[public:playground|연습장]]에서 하십시오. 문제가 있다고 생각하시면 관리자에게 문의하십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/recent.txt
new file mode 100644
index 000000000..f693c4bf1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/recent.txt
@@ -0,0 +1,5 @@
+====== 최근 변경 ======
+
+아래의 페이지는 최근에 변경된 것입니다.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/register.txt
new file mode 100644
index 000000000..999073a1d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/register.txt
@@ -0,0 +1,4 @@
+====== 새 사용자 등록 ======
+
+이 위키에 새 계정을 만들려면 아래의 모든 내용을 입력하십시오. **제대로 된 이메일 주소**를 사용하십시오. 그러나, 아래 내용을 입력했다고 해서 계정을 만들 수 있으리라고는 믿지 마십시오.  이곳은 내가 개인적으로 사용하는 곳이며, 계정을 만들어 주고 안주고는 내 마음입니다. 차라리, 내게 이메일을 보내서 신청하는 편이 더 나을 것입니다. 패스워드는 이 이메일로 보내집니다. 사용자명은 올바른 [[doku>pagename|pagename]] 이어야 합니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/registermail.txt
new file mode 100644
index 000000000..4b1aa20a5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/registermail.txt
@@ -0,0 +1,14 @@
+새로운 사용자가 등록되었습니다:
+
+사용자 이름     : @NEWUSER@
+사용자 실제 이름 : @NEWNAME@
+이메일         : @NEWEMAIL@
+
+날짜           : @DATE@
+브라우저        : @BROWSER@
+IP주소         : @IPADDRESS@
+호스트 이름     : @HOSTNAME@
+
+-- 
+
+@DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/resendpwd.txt
new file mode 100644
index 000000000..b06163e92
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/resendpwd.txt
@@ -0,0 +1,4 @@
+====== 새로운 패스워드 전송 ======
+
+이 위키 계정에 대한 새 패스워드를 요구하기 위해 아래 폼에서 사용자 이름을 입력하세요. 확인 링크는 새로 등록된 이메일 주소로 발송됩니다.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/revisions.txt
new file mode 100644
index 000000000..12d11894d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/revisions.txt
@@ -0,0 +1,4 @@
+====== 이전 버전 ======
+
+이 문서의 옛날 버전은 다음과 같습니다. 이전 버전으로 돌아가려면, 아래에서 선택한 다음, **페이지 편집**을 클릭한 아후 저장하십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/searchpage.txt
new file mode 100644
index 000000000..198d9a428
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/searchpage.txt
@@ -0,0 +1,5 @@
+====== 찾기 ======
+
+찾기 결과를 아래에서 볼 수 있습니다. 만일 원하는 것을 찾지 못하였다면, **페이지 편집** 버튼을 이용하여 질의 내용과 같은 이름의 페이지를 만들 수 있습니다.
+
+===== 결과 =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/showrev.txt
new file mode 100644
index 000000000..084d82737
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/showrev.txt
@@ -0,0 +1,2 @@
+**이것은 문서의 이전 버전입니다!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/stopwords.txt
new file mode 100644
index 000000000..bdb41deba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/stopwords.txt
@@ -0,0 +1,29 @@
+# 색인이 만들어 지지 않는 단어 목록입니다.(한줄에 한단어)
+# 이 파일을 편집한다면 UNIX줄 종료문자를 사용해야합니다.(단일 개행문자)
+# 3문자이하 단어는 자동으로 무시되므로 3문자보다 짧은 단어는 포함시킬 필요가 없습니다.
+# http://www.ranks.nl/stopwords/을 기준으로 만들어진 목록입니다.
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/subscribermail.txt
new file mode 100644
index 000000000..9bd0d9011
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/subscribermail.txt
@@ -0,0 +1,15 @@
+안녕하세요!
+
+@TITLE@ 위키의 @PAGE@ 페이지가 변경됬습니다.
+
+변경 내용은 아래와 같습니다.
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+@DOKUWIKIURL@의 이 페이지 구독신청을 해지하려면  @NEWPAGE@를 방문하여
+'구독신청 해지'를 선택하세요.
+
+-- 
+
+@DOKUWIKIURL@의 DokuWiki가 자동으로 만들어낸 메일입니다.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/updateprofile.txt
new file mode 100644
index 000000000..5ea331c05
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/updateprofile.txt
@@ -0,0 +1,5 @@
+====== 개인 정보 수정 ======
+
+변경하고 싶은 항목을 입력하기 바랍니다. 사용자 이름은 바꾸고 싶지 않겠지요?
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/uploadmail.txt
new file mode 100644
index 000000000..46c66a66b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/uploadmail.txt
@@ -0,0 +1,15 @@
+DokuWiki가 파일을 업로드하였습니다.
+
+자세한 정보:
+
+파일         : @MEDIA@
+날짜         : @DATE@
+웹 브라우저   : @BROWSER@
+IP 주소      : @IPADDRESS@
+호스트명      : @HOSTNAME@
+크기        : @SIZE@
+파일 종류     : @MIME@
+사용자        : @USER@
+
+-- 
+이 메일은 @DOKUWIKIURL@의 DokuWiki가 생성한 메일입니다.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/wordblock.txt
new file mode 100644
index 000000000..35e251187
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ko/wordblock.txt
@@ -0,0 +1,4 @@
+====== 스팸 차단 ======
+
+하나 혹은 그 이상의 차단된 단어가 포함되어 있으므로 변경 내용이 저장되지 **않았습니다.** 나쁜 로봇 같으니! 스팸이나 추가하려 하고! 만일 로봇이 아니라 사람이고, 오류라고 생각하신다면, 관리자에게 문의하십시오.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/admin.txt
new file mode 100644
index 000000000..cfd21b217
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Below you can find a list of administrative tasks available in DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/backlinks.txt
new file mode 100644
index 000000000..5fa2ddfda
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/backlinks.txt
@@ -0,0 +1,4 @@
+====== Girêdanên paş ======
+
+Di rûpelên di vê lîsteyê de girêdanên ji vê rûpelê re hene.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/conflict.txt
new file mode 100644
index 000000000..e139dce26
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/conflict.txt
@@ -0,0 +1,6 @@
+====== Guhertoyeke nûtir heye ======
+
+Guhertoyeke nûtir a belgeya ku tu biguherînî heye. Sedema wê, bikarhênerkê/î din di hema demê de belge diguherîne.
+
+Examine the differences shown below thoroughly, then decide which version to keep. If you choose ''save'', your version will be saved. Hit ''cancel'' to keep the current version.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/denied.txt
new file mode 100644
index 000000000..3ac72820c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/denied.txt
@@ -0,0 +1,4 @@
+====== Permission Denied ======
+
+Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/diff.txt
new file mode 100644
index 000000000..934ffb67e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/diff.txt
@@ -0,0 +1,4 @@
+====== Cuyawazî ======
+
+Li vê derê cuyawaziyên nav revîziyona hilbijartî û verziyona aniha tên nîşan dan.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/edit.txt
new file mode 100644
index 000000000..3a259dcf7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/edit.txt
@@ -0,0 +1,2 @@
+Rûpelê biguherîne û ''Tomar bike'' bitikîne. Ji bo sîntaksa wîkiyê binihêre [[wiki:syntax]]. Ji kerema xwe rûpelê bi tenê biguherîne, heke tû dikarî **baştir** bikî.  Heke tu dixwazî çend tiştan biceribînî, biçe [[wiki:playground]]. Li vê derê tu dikarî her tiştî biceribînî.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/editrev.txt
new file mode 100644
index 000000000..e6995713b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/editrev.txt
@@ -0,0 +1,2 @@
+**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/index.txt
new file mode 100644
index 000000000..401404484
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/index.txt
@@ -0,0 +1,3 @@
+====== Îndeks ======
+
+Ev îndeksa hemû rûpelên heyî ye. Rûpel li gora [[doku>namespaces|namespace]] hatin birêzkirin.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/lang.php
new file mode 100644
index 000000000..946954b98
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/lang.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * kurdish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @translator Erdal Ronahî <erdal.ronahi@gmail.com>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Vê rûpelê biguherîne';
+$lang['btn_source'] = 'Çavkaniya rûpelê nîşan bide';
+$lang['btn_show']   = 'Rûpelê nîşan bide';
+$lang['btn_create'] = 'Vê rûpelê biafirîne';
+$lang['btn_search'] = 'Lêbigere';
+$lang['btn_save']   = 'Tomar bike';
+$lang['btn_preview']= 'Pêşdîtin';
+$lang['btn_top']    = 'Biçe ser';
+$lang['btn_newer']  = '<< nûtir';
+$lang['btn_older']  = 'kevntir >>';
+$lang['btn_revs']   = 'Revîziyonên kevn';
+$lang['btn_recent'] = 'Guherandinên dawî';
+$lang['btn_upload'] = 'Bar bike';
+$lang['btn_cancel'] = 'Betal';
+$lang['btn_index']  = 'Îndeks';
+$lang['btn_secedit']= 'Biguherîne';
+$lang['btn_login']  = 'Têkeve';
+$lang['btn_logout'] = 'Derkeve';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Rojanekirin';
+$lang['btn_delete'] = 'Jê bibe';
+$lang['btn_back']   = 'Paş';
+$lang['btn_backlink']    = "Girêdanên paş";
+$lang['btn_backtomedia'] = 'Back to Mediafile Selection';
+$lang['btn_subscribe']   = 'Subscribe Changes';
+$lang['btn_unsubscribe'] = 'Unsubscribe Changes';
+
+$lang['loggedinas'] = 'Logged in as';
+$lang['user']       = 'Username';
+$lang['pass']       = 'Password';
+$lang['passchk']    = 'once again';
+$lang['remember']   = 'Remember me';
+$lang['fullname']   = 'Full name';
+$lang['email']      = 'E-Mail';
+$lang['register']   = 'Register';
+$lang['badlogin']   = 'Sorry, username or password was wrong.';
+
+$lang['regmissing'] = 'Sorry, you must fill in all fields.';
+$lang['reguexists'] = 'Sorry, a user with this login already exists.';
+$lang['regsuccess'] = 'The user has been created and the password was sent by email.';
+$lang['regsuccess2']= 'The user has been created.';
+$lang['regmailfail']= 'Looks like there was an error on sending the password mail. Please contact the admin!';
+$lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin';
+$lang['regbadpass'] = 'The two given passwords are not identically, please try again.';
+$lang['regpwmail']  = 'Your DokuWiki password';
+$lang['reghere']    = 'You don\'t have an account yet? Just get one';
+
+$lang['txt_upload']   = 'Select file to upload';
+$lang['txt_filename'] = 'Enter wikiname (optional)';
+$lang['txt_overwrt']  = 'Overwrite existing file';
+$lang['lockedby']     = 'Currently locked by';
+$lang['lockexpire']   = 'Lock expires at';
+$lang['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+
+$lang['notsavedyet'] = 'Unsaved changes will be lost.\nReally continue?';
+
+$lang['rssfailed']   = 'An error occured while fetching this feed: ';
+$lang['nothingfound']= 'Tiştek nehat dîtin.';
+
+$lang['mediaselect'] = 'Mediafile Selection';
+$lang['fileupload']  = 'Mediafile Upload';
+$lang['uploadsucc']  = 'Upload successful';
+$lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
+$lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
+$lang['uploadexist'] = 'File already exists. Nothing done.';
+$lang['deletesucc']  = 'The file "%s" has been deleted.';
+$lang['deletefail']  = '"%s" couldn\'t be deleted - check permissions.';
+$lang['mediainuse']  = 'The file "%s" hasn\'t been deleted - it is still in use.';
+$lang['namespaces']  = 'Namespace';
+$lang['mediafiles']  = 'Available files in';
+
+$lang['reference']   = 'Referansa';
+$lang['ref_inuse']   = 'The file can\'t be deleted, because it\'s still used by the following pages:';
+$lang['ref_hidden']  = 'Some references  are on pages you don\'t have permission to read';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Matching pagenames';
+$lang['toc']        = 'Tabloya Navêrokê';
+$lang['current']    = 'current';
+$lang['yours']      = 'Your Version';
+$lang['diff']       = 'show differences to current version';
+$lang['line']       = 'Rêz';
+$lang['breadcrumb'] = 'Şop';
+$lang['lastmod']    = 'Guherandina dawî';
+$lang['by']         = 'by';
+$lang['deleted']    = 'hat jê birin';
+$lang['created']    = 'hat afirandin';
+$lang['restored']   = 'old revision restored';
+$lang['summary']    = 'Kurteya guhartinê';
+
+$lang['mail_newpage'] = 'page added:';
+$lang['mail_changed'] = 'page changed:';
+
+$lang['js']['nosmblinks'] = "Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.";
+
+$lang['qb_bold']    = 'Bold Text';
+$lang['qb_italic']  = 'Italic Text';
+$lang['qb_underl']  = 'Underlined Text';
+$lang['qb_code']    = 'Code Text';
+$lang['qb_strike']  = 'Strike-through Text';
+$lang['qb_h1']      = 'Level 1 Headline';
+$lang['qb_h2']      = 'Level 2 Headline';
+$lang['qb_h3']      = 'Level 3 Headline';
+$lang['qb_h4']      = 'Level 4 Headline';
+$lang['qb_h5']      = 'Level 5 Headline';
+$lang['qb_link']    = 'Internal Link';
+$lang['qb_extlink'] = 'External Link';
+$lang['qb_hr']      = 'Horizontal Rule';
+$lang['qb_ol']      = 'Ordered List Item';
+$lang['qb_ul']      = 'Unordered List Item';
+$lang['qb_media']   = 'Add Images and other files';
+$lang['qb_sig']     = 'Insert Signature';
+
+$lang['js']['del_confirm']= 'Delete this entry?';
+
+$lang['admin_acl']  = 'Access Control List Management...';
+$lang['admin_register']= 'Add new user...';
+
+$lang['acl_group']  = 'Group';
+$lang['acl_user']   = 'User';
+$lang['acl_perms']  = 'Permissions for';
+$lang['page']       = 'Rûpel';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = 'Bixwîne';
+$lang['acl_perm2']  = 'Biguherîne';
+$lang['acl_perm4']  = 'Biafirîne';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Jê bibe';
+$lang['acl_new']    = 'Add new Entry';
+
+$lang['metaedit']    = 'Edit Metadata';
+$lang['metasaveerr'] = 'Writing metadata failed';
+$lang['metasaveok']  = 'Metadata saved';
+$lang['img_backto']  = 'Back to';
+$lang['img_title']   = 'Title';
+$lang['img_caption'] = 'Caption';
+$lang['img_date']    = 'Date';
+$lang['img_fname']   = 'Filename';
+$lang['img_fsize']   = 'Size';
+$lang['img_artist']  = 'Photographer';
+$lang['img_copyr']   = 'Copyright';
+$lang['img_format']  = 'Format';
+$lang['img_camera']  = 'Camera';
+$lang['img_keywords']= 'Keywords';
+
+$lang['subscribe_success']  = 'Added %s to subscription list for %s';
+$lang['subscribe_error']    = 'Error adding %s to subscription list for %s';
+$lang['subscribe_noaddress']= 'There is no address associated with your login, you cannot be added to the subscription list';
+$lang['unsubscribe_success']= 'Removed %s from subscription list for %s';
+$lang['unsubscribe_error']  = 'Error removing %s from subscription list for %s';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/locked.txt
new file mode 100644
index 000000000..af6347a96
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/locked.txt
@@ -0,0 +1,3 @@
+====== Page locked ======
+
+This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/login.txt
new file mode 100644
index 000000000..2004ea198
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/mailtext.txt
new file mode 100644
index 000000000..44a3f6553
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/mailtext.txt
@@ -0,0 +1,17 @@
+A page in your DokuWiki was added or changed. Here are the details:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/newpage.txt
new file mode 100644
index 000000000..6d256f06e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/newpage.txt
@@ -0,0 +1,3 @@
+====== Ev rûpel hîn nehat nivîsandin ======
+
+Rûpela tu hatî hîn nehat nivîsandin. Tu dikarî niha dest bi nivîsandina vê rûpelê bikî. Ji bo vê, ''Dest pê bike'' bitikîne.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/norev.txt
new file mode 100644
index 000000000..0b21bf3f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/norev.txt
@@ -0,0 +1,4 @@
+====== No such revision ======
+
+The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/preview.txt
new file mode 100644
index 000000000..da8f4cb44
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/preview.txt
@@ -0,0 +1,3 @@
+====== Pêşdîtin ======
+
+Li vê derê tu dikarî bibîni ku nivîsa te dê çawa xuya bibe. Ji bîr neke: Hîn **nehat tomar kirin**!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/read.txt
new file mode 100644
index 000000000..9f56d81ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/read.txt
@@ -0,0 +1,2 @@
+This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/recent.txt
new file mode 100644
index 000000000..268c89ab2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/recent.txt
@@ -0,0 +1,3 @@
+====== Guherandinên dawî ======
+
+Ev rûpel di dema nêzîk de hatin guherandin.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/register.txt
new file mode 100644
index 000000000..b65683bc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/register.txt
@@ -0,0 +1,4 @@
+====== Register as new user ======
+
+Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - your new password will be sent to it. The login name should be a valid [[doku>pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/revisions.txt
new file mode 100644
index 000000000..dd5f35b8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/revisions.txt
@@ -0,0 +1,4 @@
+====== Old Revisions ======
+
+These are the older revisons of the current document. To revert to an old revision, select it from below, click ''Edit this page'' and save it.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/searchpage.txt
new file mode 100644
index 000000000..6646228d5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/searchpage.txt
@@ -0,0 +1,5 @@
+====== Lêbigere ======
+
+Jêr encamên lêgerandina te tên nîşan dan. Heke tiştek nehatibe dîtin, tu dikarî dest bi nivîsandina rûpelekê nû bikî. Ji bo vê, ''Vê rûpelê biguherîne'' bitikîne.
+
+===== Encam =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/showrev.txt
new file mode 100644
index 000000000..3608de36b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/showrev.txt
@@ -0,0 +1,2 @@
+**This is an old revision of the document!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/stopwords.txt
new file mode 100644
index 000000000..bc6eb48ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/stopwords.txt
@@ -0,0 +1,29 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/subscribermail.txt
new file mode 100644
index 000000000..0c8c2637f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/subscribermail.txt
@@ -0,0 +1,17 @@
+Hello!
+
+The page @PAGE@ in the @TITLE@ wiki changed.
+Here are the changes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+To unsubscribe from this page log into the wiki at
+@DOKUWIKIURL@ then visit
+@NEWPAGE@
+and choose 'Unsubscribe Changes'.
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/wordblock.txt
new file mode 100644
index 000000000..f0f7d759d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ku/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blocked ======
+
+Your changes were **not** saved because it contains one or more blocked words. If you tried to spam the Wiki -- Bad dog! If you think this is an error, contact the administrator of this Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/admin.txt
new file mode 100644
index 000000000..fd9ae9a87
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/admin.txt
@@ -0,0 +1,4 @@
+====== Administracija ======
+
+Žemiau matote veiksmų, kuriuos gali atlikti administratorius, sąrašą.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/backlinks.txt
new file mode 100644
index 000000000..ad0d5b83a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/backlinks.txt
@@ -0,0 +1,4 @@
+====== Atgalinės nuorodos ======
+
+Čia matote sąrašą puslapių, kuriuose yra nuorodos į esamą puslapį.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/conflict.txt
new file mode 100644
index 000000000..be0c5ff4f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/conflict.txt
@@ -0,0 +1,6 @@
+====== Egzistuoja naujesnė versija ======
+
+Rasta naujesnė dokumento, kurį redagavote, versija. Tai atsitinka tada, kai kitas vartotojas modifikuoja dokumentą tuo metu, kai jūs jį redaguojate.
+
+Atidžiai peržvelkite žemiau esančius skirtumus ir nuspręskite, kurią versiją išsaugoti. Paspausdami ''Išsaugoti'' išsaugosite saviškę versiją. Paspausdami ''Atšaukti'' išsaugosite esamą versiją.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/denied.txt
new file mode 100644
index 000000000..c25fb5f0c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/denied.txt
@@ -0,0 +1,4 @@
+====== Priėjimas uždraustas ======
+
+Jūs neturite reikiamų teisių, kad galėtumėte tęsti. Turbūt pamiršote prisijungti :-).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/diff.txt
new file mode 100644
index 000000000..dc5e59f89
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/diff.txt
@@ -0,0 +1,4 @@
+====== Skirtumai ======
+
+Čia matote skirtumus tarp pasirinktos versijos ir esamo dokumento.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/edit.txt
new file mode 100644
index 000000000..8fadf97ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/edit.txt
@@ -0,0 +1,2 @@
+Modifikuokite šį puslapį ir paspauskite ''Išsaugoti''. Apie wiki sintaksę galite paskaityti [[wiki:syntax|čia]]. Prašome redaguoti šį puslapį tik tada, kai galite jį **patobulinti**. Jei tik norite išbandyti wiki galimybes, prašytume tai daryti [[playground:playground|čia]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/editrev.txt
new file mode 100644
index 000000000..9e5eaeece
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/editrev.txt
@@ -0,0 +1,2 @@
+**Jūs naudojate seną šio dokumento versiją!** jei ją išsaugosite, su šiais duomenimis sukursite naują versiją.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/index.txt
new file mode 100644
index 000000000..d13683c47
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/index.txt
@@ -0,0 +1,4 @@
+====== Indeksas ======
+
+Čia matote visų šiuo metu egzistuojančių puslapių sąrašą. Jie išrūšiuoti pagal [[doku>namespaces|pavadinimą]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/lang.php
new file mode 100644
index 000000000..151964e03
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/lang.php
@@ -0,0 +1,207 @@
+<?php
+/**
+ * lithuanian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Linas Valiukas <shirshegsm@gmail.com>
+ * @author Edmondas Girkantas <eg@zemaitija.net>
+ * @author Arūnas Vaitekūnas <aras@fan.lt>
+ * @author audrius.klevas@gmail.com
+ * @author Arunas Vaitekunas <aras@fan.lt>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Redaguoti šį puslapį';
+$lang['btn_source']            = 'Parodyti puslapio kodą';
+$lang['btn_show']              = 'Parodyti puslapį';
+$lang['btn_create']            = 'Sukurti šį puslapį';
+$lang['btn_search']            = 'Paieška';
+$lang['btn_save']              = 'Išsaugoti';
+$lang['btn_preview']           = 'Peržiūra';
+$lang['btn_top']               = 'Į viršų';
+$lang['btn_newer']             = '<< naujesnė';
+$lang['btn_older']             = 'senesnė >>';
+$lang['btn_revs']              = 'Senos versijos';
+$lang['btn_recent']            = 'Naujausi keitimai';
+$lang['btn_upload']            = 'Atsiųsti bylą';
+$lang['btn_cancel']            = 'Atšaukti';
+$lang['btn_index']             = 'Indeksas';
+$lang['btn_secedit']           = 'Redaguoti';
+$lang['btn_login']             = 'Prisijungti';
+$lang['btn_logout']            = 'Atsijungti';
+$lang['btn_admin']             = 'Administracija';
+$lang['btn_update']            = 'Atnaujinti';
+$lang['btn_delete']            = 'Ištrinti';
+$lang['btn_back']              = 'Atgal';
+$lang['btn_backlink']          = 'Atgalinės nuorodos';
+$lang['btn_backtomedia']       = 'Atgal į Mediabylos išsirinkimą';
+$lang['btn_subscribe']         = 'Užsisakyti keitimų prenumeratą';
+$lang['btn_unsubscribe']       = 'Atsisakyti keitimų prenumeratos';
+$lang['btn_subscribens']       = 'Užsakyti vardų srities prenumeratą';
+$lang['btn_unsubscribens']     = 'Atsisakyti vardų srities prenumeratos';
+$lang['btn_profile']           = 'Atnaujinti profilį';
+$lang['btn_reset']             = 'Atstata';
+$lang['btn_resendpwd']         = 'Išsiųsti naują slaptažodį';
+$lang['btn_draft']             = 'Redaguoti juodraštį';
+$lang['btn_recover']           = 'Atkurti juodraštį';
+$lang['btn_draftdel']          = 'Šalinti juodraštį';
+$lang['loggedinas']            = 'Prisijungęs kaip';
+$lang['user']                  = 'Vartotojo vardas';
+$lang['pass']                  = 'Slaptažodis';
+$lang['newpass']               = 'Naujas slaptažodis';
+$lang['oldpass']               = 'Patvirtinti esamą slaptažodį';
+$lang['passchk']               = 'dar kartą';
+$lang['remember']              = 'Prisiminti mane';
+$lang['fullname']              = 'Visas vardas';
+$lang['email']                 = 'El. pašto adresas';
+$lang['register']              = 'Registruotis';
+$lang['profile']               = 'Vartotojo profilis';
+$lang['badlogin']              = 'Nurodėte blogą vartotojo vardą arba slaptažodį.';
+$lang['minoredit']             = 'Nedidelis pataisymas';
+$lang['draftdate']             = 'Juodraštis automatiškai išsaugotas';
+$lang['nosecedit']             = 'Puslapis buvo kažkieno pataisytas, teksto dalies informacija tapo pasenusi, todėl pakrautas visas puslapis.';
+$lang['regmissing']            = 'Turite užpildyti visus laukus.';
+$lang['reguexists']            = 'Vartotojas su pasirinktu prisijungimo vardu jau egzistuoja.';
+$lang['regsuccess']            = 'Vartotojas sukurtas, slaptažodis išsiųstas el. paštu.';
+$lang['regsuccess2']           = 'Vartotojas sukurtas.';
+$lang['regmailfail']           = 'Siunčiant slaptažodį el. paštu įvyko klaida - susisiekite su administracija!';
+$lang['regbadmail']            = 'Nurodytas el. pašto adresas yra neteisingas - jei manote, kad tai klaida, susisiekite su administracija';
+$lang['regbadpass']            = 'Įvesti slaptažodžiai nesutampa, bandykite dar kartą.';
+$lang['regpwmail']             = 'Jūsų DokuWiki slaptažodis';
+$lang['reghere']               = 'Dar neužsiregistravote? Padarykite tai dabar';
+$lang['profna']                = 'Ši vikisvetainė neleidžia pakeisti profilio';
+$lang['profnochange']          = 'Nėra pakeitimų, todėl nėra ką atlikti.';
+$lang['profnoempty']           = 'Tuščias vardo arba el. pašto adreso laukas nėra leidžiamas.';
+$lang['profchanged']           = 'Vartotojo profilis sėkmingai atnaujintas.';
+$lang['pwdforget']             = 'Pamiršote slaptažodį? Gaukite naują';
+$lang['resendna']              = 'Ši vikisvetainė neleidžia persiųsti slaptažodžių.';
+$lang['resendpwd']             = 'Atsiųsti naują slaptažodį';
+$lang['resendpwdmissing']      = 'Jūs turite užpildyti visus laukus.';
+$lang['resendpwdnouser']       = 'Tokio vartotojo nėra duomenų bazėje.';
+$lang['resendpwdbadauth']      = 'Atsiprašome, bet šis tapatybės nustatymo kodas netinkamas. Įsitikinkite, kad panaudojote pilną patvirtinimo nuorodą.';
+$lang['resendpwdconfirm']      = 'Patvirtinimo nuoroda išsiųsta el. paštu.';
+$lang['resendpwdsuccess']      = 'Jūsų naujas slaptažodis buvo išsiųstas el. paštu.';
+$lang['license']               = 'Jei nenurodyta kitaip, šio wiki turinys ginamas tokia licencija:';
+$lang['licenseok']             = 'Pastaba: Redaguodami šį puslapį jūs sutinkate jog jūsų turinys atitinka licencijavima pagal šią licenciją';
+$lang['txt_upload']            = 'Išsirinkite atsiunčiamą bylą';
+$lang['txt_filename']          = 'Įveskite wikivardą (nebūtina)';
+$lang['txt_overwrt']           = 'Perrašyti egzistuojančią bylą';
+$lang['lockedby']              = 'Užrakintas vartotojo';
+$lang['lockexpire']            = 'Užraktas bus nuimtas';
+$lang['willexpire']            = 'Šio puslapio redagavimo užrakto galiojimo laikas baigsis po minutės.\nNorėdami išvengti nesklandumų naudokite peržiūros mygtuką ir užraktas atsinaujins.';
+$lang['notsavedyet']           = 'Pakeitimai nebus išsaugoti.\nTikrai tęsti?';
+$lang['rssfailed']             = 'Siunčiant šį feed\'ą įvyko klaida: ';
+$lang['nothingfound']          = 'Paieškos rezultatų nėra.';
+$lang['mediaselect']           = 'Mediabylos išsirinkimas';
+$lang['fileupload']            = 'Mediabylos atsiuntimas';
+$lang['uploadsucc']            = 'Atsiuntimas pavyko';
+$lang['uploadfail']            = 'Atsiuntimas nepavyko. Blogi priėjimo leidimai??';
+$lang['uploadwrong']           = 'Atsiuntimas atmestas. Bylos tipas neleistinas';
+$lang['uploadexist']           = 'Tokia byla jau egzistuoja. Veiksmai atšaukti.';
+$lang['uploadbadcontent']      = 'Įkeltas turinys neatitinka %s failo išplėtimo.';
+$lang['uploadspam']            = 'Įkėlimas blokuotas pagal šiukšlintojų juodajį šąrašą.';
+$lang['uploadxss']             = 'Įkėlimas blokuotas greičiausiai dėl netinkamo teksto.';
+$lang['uploadsize']            = 'Įkeltas failas per didelis (maks. %s)';
+$lang['deletesucc']            = 'Byla "%s" ištrinta.';
+$lang['deletefail']            = 'Byla "%s" negali būti ištrinta - patikrinkite leidimus.';
+$lang['mediainuse']            = 'Byla "%s" nebuvo ištrinta - ji vis dar naudojama.';
+$lang['namespaces']            = 'Pavadinimai';
+$lang['mediafiles']            = 'Prieinamos bylos';
+$lang['js']['keepopen']        = 'Pažymėjus palikti langą atvertą';
+$lang['js']['hidedetails']     = 'Paslėpti Detales';
+$lang['js']['nosmblinks']      = 'Nurodos į "Windows shares" veikia tik su Microsoft Internet Explorer naršykle.
+Vis dėlto, jūs galite nukopijuoti šią nuorodą.';
+$lang['js']['mu_btn']          = 'Pateikite kelis failus vienu ypu';
+$lang['mediausage']            = 'Failo nuorodai užrašyti naudokite tokią sintaksę:';
+$lang['mediaview']             = 'Žiūrėti pirminį failą';
+$lang['mediaroot']             = 'pradžia (root)';
+$lang['mediaextchange']        = 'Failo galūnė pasikeitė iš .%s į .%s!';
+$lang['reference']             = 'Paminėjimai';
+$lang['ref_inuse']             = 'Byla negali būti ištrinta, nes ji vis dar yra naudojama šiuose puslapiuose:';
+$lang['ref_hidden']            = 'Kai kurie paminėjimai yra puslapiuose, kurių jums neleista skaityti.';
+$lang['hits']                  = 'Atidarymai';
+$lang['quickhits']             = 'Sutampantys pavadinimai';
+$lang['toc']                   = 'Turinys';
+$lang['current']               = 'esamas';
+$lang['yours']                 = 'Jūsų versija';
+$lang['diff']                  = 'rodyti skirtumus tarp šios ir esamos versijos';
+$lang['diff2']                 = 'Parodyti skirtumus tarp pasirinktų versijų';
+$lang['line']                  = 'Linija';
+$lang['breadcrumb']            = 'Kelias';
+$lang['youarehere']            = 'Jūs esate čia';
+$lang['lastmod']               = 'Keista';
+$lang['by']                    = 'vartotojo';
+$lang['deleted']               = 'ištrintas';
+$lang['created']               = 'sukurtas';
+$lang['restored']              = 'atstatyta sena versija';
+$lang['external_edit']         = 'redaguoti papildomomis priemonėmis';
+$lang['summary']               = 'Redaguoti santrauką';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> reikalingas šios medžiagos peržiūrai.';
+$lang['mail_newpage']          = '[DokuWiki] puslapis pridėtas:';
+$lang['mail_changed']          = '[DokuWiki] puslapis pakeistas:';
+$lang['mail_new_user']         = 'naujas vartotojas:';
+$lang['mail_upload']           = 'failas įkeltas:';
+$lang['qb_bold']               = 'Pusjuodis';
+$lang['qb_italic']             = 'Kursyvas';
+$lang['qb_underl']             = 'Pabrauktas';
+$lang['qb_code']               = 'Kodas';
+$lang['qb_strike']             = 'Perbraukta';
+$lang['qb_h1']                 = 'Pirmo lygio antraštė';
+$lang['qb_h2']                 = 'Antro lygio antraštė';
+$lang['qb_h3']                 = 'Trečio lygio antraštė';
+$lang['qb_h4']                 = 'Ketvirto lygio antraštė';
+$lang['qb_h5']                 = 'Penkto lygio antraštė';
+$lang['qb_link']               = 'Vidinė nuoroda';
+$lang['qb_extlink']            = 'Išorinė nuoroda';
+$lang['qb_hr']                 = 'Horizontali linija';
+$lang['qb_ol']                 = 'Numeruotas sąrašas';
+$lang['qb_ul']                 = 'Nenumetuotas sąrašas';
+$lang['qb_media']              = 'Paveikslėliai ir kitos bylos';
+$lang['qb_sig']                = 'Įterpti parašą';
+$lang['qb_smileys']            = 'Šypsenėlės';
+$lang['qb_chars']              = 'Specialūs simboliai';
+$lang['js']['del_confirm']           = 'Ar tikrai ištrinti pažymėtą(us) įrašą(us)?';
+$lang['admin_register']        = 'Sukurti naują vartotoją';
+$lang['metaedit']              = 'Redaguoti metaduomenis';
+$lang['metasaveerr']           = 'Nepavyko išsaugoti metaduomenų';
+$lang['metasaveok']            = 'Metaduomenys išsaugoti';
+$lang['img_backto']            = 'Atgal į';
+$lang['img_title']             = 'Pavadinimas';
+$lang['img_caption']           = 'Antraštė';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Bylos pavadinimas';
+$lang['img_fsize']             = 'Dydis';
+$lang['img_artist']            = 'Fotografas';
+$lang['img_copyr']             = 'Autorinės teisės';
+$lang['img_format']            = 'Formatas';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Raktiniai žodžiai';
+$lang['subscribe_success']     = '%s užsakyta "%s" prenumerata';
+$lang['subscribe_error']       = '%s užsakant "%s" prenumeratą įvyko klaida';
+$lang['subscribe_noaddress']   = 'Jūs nesatė nurodęs el. pašto adreso, todėl negalima Jums užsakyti prenumeratos';
+$lang['unsubscribe_success']   = '%s ištrintas iš "%s" prenumeratos';
+$lang['unsubscribe_error']     = '%s trinant iš "%s" prenumeratos įvyko klaida';
+$lang['authmodfailed']         = 'Bloga vartotojo tapatumo nustatymo konfigūracija. Praneškite apie tai savo administratoriui.';
+$lang['authtempfail']          = 'Vartotojo tapatumo nustatymas laikinai nepasiekiamas. Jei ši situacija kartojasi, tai praneškite savo administratoriui.';
+$lang['i_chooselang']          = 'Pasirinkite kalbą';
+$lang['i_installer']           = 'DokuWiki Instaliatorius';
+$lang['i_wikiname']            = 'Wiki vardas';
+$lang['i_enableacl']           = 'Įjungti ACL (rekomenduojama)';
+$lang['i_superuser']           = 'Supervartotojas';
+$lang['i_problems']            = 'Instaliavimo metu buvo klaidų, kurios pateiktos žemiau. Tęsti negalima, kol nebus pašalintos priežastys.';
+$lang['mu_gridname']           = 'Failo vardas';
+$lang['mu_gridsize']           = 'Dydis';
+$lang['mu_gridstat']           = 'Statusas';
+$lang['mu_namespace']          = 'Vardų sritis';
+$lang['mu_browse']             = 'Browse';
+$lang['mu_toobig']             = 'perdidelis';
+$lang['mu_ready']              = 'paruošta įkrovimui';
+$lang['mu_done']               = 'užbaigta';
+$lang['mu_fail']               = 'nepavyko';
+$lang['mu_authfail']           = 'sesija nutraukta';
+$lang['mu_filetypes']          = 'Leidžiami failų tipai';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/locked.txt
new file mode 100644
index 000000000..3f6d000f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/locked.txt
@@ -0,0 +1,3 @@
+====== Puslapis užrakintas ======
+
+Šis puslapis yra apsaugotas (užrakintas) nuo kitų vartotojų pakeitimų. Norėdami redaguoti puslapį, turėsite palaukti, kol kitas vartotojas baigs tai daryti arba „užrakto“ galiojimo laikas pasibaigs.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/login.txt
new file mode 100644
index 000000000..2a6e21db2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/login.txt
@@ -0,0 +1,5 @@
+====== Prisijungimas ======
+
+Šiuo metu jūs nesate prisijungęs. Įveskite savo prisijungimo duomenis žemiau. „Cookies“ palaikymas jūsų naršyklėje turi būti įjungtas.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/mailtext.txt
new file mode 100644
index 000000000..63b2f591e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/mailtext.txt
@@ -0,0 +1,18 @@
+Jūsų DokuWiki buvo sukurtas arba pakeistas puslapis. Detalės:
+
+Data        : @DATE@
+Naršyklė     : @BROWSER@
+IP adresas  : @IPADDRESS@
+Host'as    : @HOSTNAME@
+Sena versija: @OLDPAGE@
+Nauja versija: @NEWPAGE@
+Redagavimo aprašas: @SUMMARY@
+Vartotojas        : @USER@
+
+Pakeitimo diff'as:
+
+@DIFF@
+
+
+-- 
+Šis laiškas buvo sugeneruotas DokuWiki (@DOKUWIKIURL@).
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/newpage.txt
new file mode 100644
index 000000000..c28e30bd4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/newpage.txt
@@ -0,0 +1,4 @@
+====== Šis puslapis dar neegzistuoja ======
+
+Nuoroda, kurią jūs paspaudėte, atvedė į dar neegzistuojantį puslapį. Jūs galite jį sukurti paspausdami ''Sukurti šį puslapį'' mygtuką.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/norev.txt
new file mode 100644
index 000000000..028ebe7f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/norev.txt
@@ -0,0 +1,5 @@
+====== Tokios versijos nėra ======
+
+Nurodyta versija neegzistuoja. Norėdami pamatyti visas dokumento versijas, paspauskite ''Senos versijos'' mygtuką
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/preview.txt
new file mode 100644
index 000000000..2d24e2164
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/preview.txt
@@ -0,0 +1,5 @@
+====== Peržiūra ======
+
+Čia matote, kaip atrodo jūsų pakeitimai. **Pakeitimai dar nėra išsaugoti!**
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/read.txt
new file mode 100644
index 000000000..91ea7e656
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/read.txt
@@ -0,0 +1,3 @@
+Šį puslapį galima tik skaityti. Jūs galite peržvelgti jo kodą (source), bet negalite jo keisti. Jei manote, kad tai klaida - susisiekite su administratoriumi.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/recent.txt
new file mode 100644
index 000000000..506538629
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/recent.txt
@@ -0,0 +1,5 @@
+====== Naujausi keitimai ======
+
+Šie puslapiai buvo neseniai pakeisti.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/register.txt
new file mode 100644
index 000000000..f595826f3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/register.txt
@@ -0,0 +1,4 @@
+====== Naujo vartotojo registracija ======
+
+Norėdami tapti nauju registruotu šio tinklalapio vartotoju, užpildykite žemiau esančią formą. Būtinai turite nurodyti **veikiantį el. pašto adresą**, nes jūsų slaptažodis bus išsiųstas pastaruoju adresu. Prisijungimo vardas turėtų būti sukurtas pagal [[doku>pagename|puslapio pavadinimo]] taisykles.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/resendpwd.txt
new file mode 100644
index 000000000..753827108
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Siųsti naują slaptažodį ======
+
+Naujo slaptažodžio gavimui, užpildykite visus žemiau esančius laukus. Naujas slaptažodis bus atsiųstas į jūsų užregistruotą el. pašto adresą. Vartotojo vardas turi būti toks pat kaip ir wiki sistemoje.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/revisions.txt
new file mode 100644
index 000000000..9999767bd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/revisions.txt
@@ -0,0 +1,4 @@
+====== Senos versijos ======
+
+Čia matote senas šio dokumento versijas. Jei norite atstatyti dokumentą į jo senesniąją versiją, paspauskite "Redaguoti šį puslapį" prie norimos versijos ir išsaugokite ją.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/searchpage.txt
new file mode 100644
index 000000000..a83a6a58a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/searchpage.txt
@@ -0,0 +1,5 @@
+====== Paieška ======
+
+Žemiau matote Jūsų atliktos paieškos rezultatus. Jeigu neradote to, ko ieškojote, galite sukurti naują puslapį šiuo pavadinimu paspausdami "Redaguoti šį puslapį".
+
+===== Rezultatai =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/showrev.txt
new file mode 100644
index 000000000..ed774244a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/showrev.txt
@@ -0,0 +1,2 @@
+**Čia yra sena dokumento versija!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/subscribermail.txt
new file mode 100644
index 000000000..8f101bcd7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/subscribermail.txt
@@ -0,0 +1,17 @@
+Sveiki!
+
+Pranešame, kad Wiki tinklalapyje @TITLE@ pakeistas puslapis @PAGE@.
+Štai pakeitimai:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Norėdami nutraukti šią prenumeratą, apsilankykite
+@DOKUWIKIURL@, tada atverkite
+@NEWPAGE@
+ir išsirinkite 'Atsisakyti keitimų prenumeratos'.
+
+-- 
+Šis laiškas sugeneruotas DokuWiki (@DOKUWIKIURL@).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/updateprofile.txt
new file mode 100644
index 000000000..7ede1a00a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/updateprofile.txt
@@ -0,0 +1,4 @@
+====== Redaguoti savo profilį ======
+
+Užpildykite tik tuos laukus, kuriuos norite pakeisti. Vartotojo vardo keisti nebūtina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/wordblock.txt
new file mode 100644
index 000000000..43ac79bbf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lt/wordblock.txt
@@ -0,0 +1,4 @@
+====== NESPAM'INK! ======
+
+Jūsų pakeitimai **nebuvo išsaugoti**, nes juose rasta vienas ar daugiau užblokuotų žodžių. Jeigu manote, kad tai klaida, susisiekite su administracija. Jeigu sugalvojote čia spam'inti - pyzdink nachui iš čia, byby bled!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/admin.txt
new file mode 100644
index 000000000..3b37fa389
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/admin.txt
@@ -0,0 +1,6 @@
+====== Administrēšana ======
+
+DokuWiki pieejamas šādas administrēšanas iespējas:
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/adminplugins.txt
new file mode 100644
index 000000000..e8d208d24
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/adminplugins.txt
@@ -0,0 +1 @@
+===== Papildu moduļi =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/backlinks.txt
new file mode 100644
index 000000000..19bebf7b2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/backlinks.txt
@@ -0,0 +1,5 @@
+====== Saistītās lapas ======
+
+Norāde uz šo lapu ir atrodama dokumentos:
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/conflict.txt
new file mode 100644
index 000000000..5aa6442c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/conflict.txt
@@ -0,0 +1,8 @@
+====== Ir jaunāka versija ======
+
+Tevis labotajam dokumentam jau ir jaunāka versija. Tā gadās, ja cits lietotājs tavas labošanas laikā ir paguvis veikt savus labojumus.
+
+Rūpīgi pārlūko šeit parādītās atšķirības un tad izlem, kuru variantu paturēt. Ja nospiedīsi  ''Saglabāt'', saglabāsies tavs teksts. Ja nospiedīsi ''Atlikt'' paliks pašreizējais variants.
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/denied.txt
new file mode 100644
index 000000000..c7df462c8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/denied.txt
@@ -0,0 +1,6 @@
+====== Piekļuve aizliegta ======
+
+Atvaino, tev nav tiesību turpināt. Varbūt aizmirsi ielogoties?
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/diff.txt
new file mode 100644
index 000000000..40e1b5405
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/diff.txt
@@ -0,0 +1,7 @@
+====== Atšķirības ======
+
+Norādītais vecais variants no patreizējās lapas atšķiras ar:
+
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/draft.txt
new file mode 100644
index 000000000..525f7cbb2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/draft.txt
@@ -0,0 +1,5 @@
+====== Atrasts melnraksta fails ======
+
+Iepriekšējā šīs lapas labošana nav pabeigta. DokuWiki darba laikā automātiski saglabāja melnrakstu, kuru tagad var labot tālāk. Zemāk redzami iepriekšējās labošanas dati.
+
+Nolem, vai vajag //atjaunot// zudušos labojumus, //dzēst// saglabāto melnrakstu vai //atlikt// labošanu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/edit.txt
new file mode 100644
index 000000000..9da6f2d23
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/edit.txt
@@ -0,0 +1,2 @@
+Labo lapu un uzklikšķini uz ''Saglabāt''. Par lietojamo sintaksi skaties rakstu  [[wiki:syntax]]. Lūdzu labo tika tad, ja vari lapu **uzlabot**. Ja gribi tikai kaut ko izmēģināt, izmanto [[wiki:playground|smilšukasti]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/editrev.txt
new file mode 100644
index 000000000..6fa7a4c05
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/editrev.txt
@@ -0,0 +1 @@
+---- **Tu skaties vecu dokumenta versiju!** Ja to saglabāsi, tad izveidosies jauns dokuments ar šo veco saturu. ----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/index.txt
new file mode 100644
index 000000000..6baa2a3e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/index.txt
@@ -0,0 +1,4 @@
+====== Rādītājs ======
+
+Visu pieejamo lapu rādītājs. Sakārtots pēc [[doku>namespaces|sadaļām]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/install.html
new file mode 100644
index 000000000..9967d2edd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/install.html
@@ -0,0 +1,12 @@
+<p>Šī lapa palīdz <a href="http://dokuwiki.org">Dokuwiki</a>pirmajā instalācijā un konfigurēšanā. 
+Vairāk par instalatoru var lasīt tā
+<a href="http://dokuwiki.org/installer">documentācijas lapā</a>.</p>
+ 
+<p>DokuWiki lapu un ar to saistīto datu (piem.: attēlu, meklēšanas indeksu, veco versiju utt.) glabāšanai lieto parastus failus.  Lai Dokuwiki veiksmīgi darbotos <strong>vajag</strong> rakstīšanas tiesības direktorijās, kur šie faili glabājas. Instalators tiesības nomainīt nespēj. Tas parasti jums jāizdara komandrindā vai ar FTP vadības paneli (piem. cPanel).</p>
+ 
+<p>Instalators konfigurēs DokuWiki <acronym title="access control list">ACL</acronym> lietošanai, kas ļauj administratoram ielogoties un piekļūt DokuWiki administrēšanas izvēlnei, lai instalētu moduļus, pārvaldītu lietotājus, notiektu piekļuves tiesības Wiki lapām un mainītu DokuWiki konfigurāciju.
+Tas nav vajadzīgs, lai DokuWiki darbotos, bet ar to var vieglāk administrēt.</p>
+ 
+<p>Pieredzējušiem lietotājiem ar īpašām prasībām  jāmeklē sīkākas ziņas  
+<a href="http://dokuwiki.org/install">uzstādīšanas instrukcijā</a>
+un <a href="http://dokuwiki.org/config">konfigurēšanas padomos</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/lang.php
new file mode 100644
index 000000000..5de7a0cc6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/lang.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * latvian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Labot lapu';
+$lang['btn_source']            = 'Parādīt lapas kodu';
+$lang['btn_show']              = 'Parādīt lapu';
+$lang['btn_create']            = 'Izveidot lapu';
+$lang['btn_search']            = 'Meklēt';
+$lang['btn_save']              = 'Saglabāt';
+$lang['btn_preview']           = 'Priekšskats';
+$lang['btn_top']               = 'Atpakaļ uz sākumu';
+$lang['btn_newer']             = '<< jaunāki';
+$lang['btn_older']             = 'vecāki >>';
+$lang['btn_revs']              = 'Vecās versijas';
+$lang['btn_recent']            = 'Jaunākie grozījumi';
+$lang['btn_upload']            = 'Augšupielādēt';
+$lang['btn_cancel']            = 'Atlikt';
+$lang['btn_index']             = 'Rādītājs';
+$lang['btn_secedit']           = 'Labot';
+$lang['btn_login']             = 'Ieiet';
+$lang['btn_logout']            = 'Iziet';
+$lang['btn_admin']             = 'Administrēt';
+$lang['btn_update']            = 'Atjaunot';
+$lang['btn_delete']            = 'Dzēst';
+$lang['btn_back']              = 'Atpakaļ';
+$lang['btn_backlink']          = 'Norādes uz lapu';
+$lang['btn_backtomedia']       = 'Atpakaļ uz mēdiju failu izvēli';
+$lang['btn_subscribe']         = 'Abonēt izmaiņu paziņojumus';
+$lang['btn_unsubscribe']       = 'Atteikties no izmaiņu paziņojumiem';
+$lang['btn_subscribens']       = 'Abonēt nodaļas izmaiņu paziņojumus';
+$lang['btn_unsubscribens']     = 'Atteikties no nodaļas izmaiņu paziņojumiem';
+$lang['btn_profile']           = 'Labot savu profilu';
+$lang['btn_reset']             = 'Atsaukt izmaiņas';
+$lang['btn_resendpwd']         = 'Nosūtīt jaunu paroli';
+$lang['btn_draft']             = 'Labot melnrakstu';
+$lang['btn_recover']           = 'Atjaunot melnrakstu';
+$lang['btn_draftdel']          = 'Dzēst melnrakstu';
+$lang['btn_revert']            = 'Atjaunot';
+$lang['loggedinas']            = 'Pieteicies kā';
+$lang['user']                  = 'Lietotājvārds';
+$lang['pass']                  = 'Parole';
+$lang['newpass']               = 'Jaunā parole';
+$lang['oldpass']               = 'Atkārto patreizējo paroli';
+$lang['passchk']               = 'vēlreiz';
+$lang['remember']              = 'Atceries mani';
+$lang['fullname']              = 'Pilns vārds';
+$lang['email']                 = 'E-pasts';
+$lang['register']              = 'Reģistrēties';
+$lang['profile']               = 'Lietotāja vārds';
+$lang['badlogin']              = 'Atvaino, lietotājvārds vai parole aplama.';
+$lang['minoredit']             = 'Sīki labojumi';
+$lang['draftdate']             = 'Melnraksts automātiski saglabāts';
+$lang['nosecedit']             = 'Lapa pa šo laiku ir mainījusies, sekcijas informācija novecojusi. Ielādēta lapas  pilnās versija.';
+$lang['regmissing']            = 'Atvaino, jāaizpilda visas ailes.';
+$lang['reguexists']            = 'Atvaino, tāds lietotājs jau ir.';
+$lang['regsuccess']            = 'Lietotājs izveidots. Parole nosūtīta pa pastu.';
+$lang['regsuccess2']           = 'Lietotājs izveidots.';
+$lang['regmailfail']           = 'Šķiet, ka ir problēmas nosūtīt pastu. Lūdzu sazinies ar administratoru!';
+$lang['regbadmail']            = 'Uzdotā epasta adrese izskatās aplama. Ja tas nav tiesa, sazinies ar administratoru.';
+$lang['regbadpass']            = 'Abas ierakstītās paroles nav vienādas, lūdzu atkārto.';
+$lang['regpwmail']             = 'Tava DokuWiki parole';
+$lang['reghere']               = 'Tev vēl nav sava konta? Izveido!';
+$lang['profna']                = 'Labot profilu nav iespējams';
+$lang['profnochange']          = 'Izmaiņu nav. Nav, ko darīt.';
+$lang['profnoempty']           = 'Bez vārda vai e-pasta adreses nevar.';
+$lang['profchanged']           = 'Profils veiksmīgi izlabots.';
+$lang['pwdforget']             = 'Aizmirsi paroli? Saņem jaunu';
+$lang['resendna']              = 'Paroļu izsūtīšanu nepiedāvāju.';
+$lang['resendpwd']             = 'Nosūtīt jaunu paroli lietotājam';
+$lang['resendpwdmissing']      = 'Atvaino, jāizpilda visas ailes.';
+$lang['resendpwdnouser']       = 'Atvaino, tāda lietotāja nav.';
+$lang['resendpwdbadauth']      = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.';
+$lang['resendpwdconfirm']      = 'Apstiprināšanas adrese nosūtīta pa epastu.';
+$lang['resendpwdsuccess']      = 'Jaunā parole nosūtīta pa e-pastu.';
+$lang['license']               = 'Ja nav norādīts citādi, viki saturs pieejams ar šādas licenzes  noteikumiem:';
+$lang['licenseok']             = 'Ievēro: Labojot lapu, tu piekrīti šādiem licenzes noteikumiem.';
+$lang['searchmedia']           = 'Meklētais faila vārds: ';
+$lang['searchmedia_in']        = 'Meklēt iekš %s';
+$lang['txt_upload']            = 'Norādi augšupielādējamo failu';
+$lang['txt_filename']          = 'Ievadi vikivārdu (nav obligāts)';
+$lang['txt_overwrt']           = 'Aizstāt esošo failu';
+$lang['lockedby']              = 'Patlaban bloķējis ';
+$lang['lockexpire']            = 'Bloķējums beigsies ';
+$lang['willexpire']            = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
+$lang['notsavedyet']           = 'Veiktas bet nav saglabātas izmaiņas.\nVai tiešām tās nevajag?';
+$lang['rssfailed']             = 'Kļūda saņemot saturu no ';
+$lang['nothingfound']          = 'Nekas nav atrasts.';
+$lang['mediaselect']           = 'Mēdiju faila izvēle';
+$lang['fileupload']            = 'Mēdiju faila augšupielāde';
+$lang['uploadsucc']            = 'Veiksmīgi ielādēts';
+$lang['uploadfail']            = 'Ielādes kļūme. Varbūt aplamas tiesības?';
+$lang['uploadwrong']           = 'Ielāde aizliegta. Neatļauts faila paplašinājums';
+$lang['uploadexist']           = 'Neko nedarīju, jo fails jau ir.';
+$lang['uploadbadcontent']      = 'Augšupielādētā saturs neatbilst faila paplašinājumam %s.';
+$lang['uploadspam']            = 'Augšupielāde bloķēta ar melno sarakstu.';
+$lang['uploadxss']             = 'Augšupielāde bloķēta iespējama slikta satura dēļ.';
+$lang['uploadsize']            = 'Augšup lādētais fails pārāk liels. Maksimums ir  %s.';
+$lang['deletesucc']            = 'Fails "%s" dzēsts.';
+$lang['deletefail']            = 'Nevar dzēst "%s". Pārbaudi tiesības.';
+$lang['mediainuse']            = 'Fails "%s" nav izdzēsts, to lieto.';
+$lang['namespaces']            = 'Nodaļas';
+$lang['mediafiles']            = 'Pieejamie faili';
+$lang['js']['searchmedia']     = 'Meklēt failus';
+$lang['js']['keepopen']        = 'Pēc faila izvēles logu paturēt atvērtu';
+$lang['js']['hidedetails']     = 'Slēpt detaļas';
+$lang['js']['nosmblinks']      = 'Saites uz Windows resursiem darbojas tikai Microsoft Internet Explorer.
+Protams, ka vari saiti kopēt un iespraust citā programmā.';
+$lang['js']['linkwiz']         = 'Saišu vednis';
+$lang['js']['linkto']          = 'Saite uz: ';
+$lang['js']['del_confirm']     = 'Dzēst šo šķirkli?';
+$lang['js']['mu_btn']          = 'Augšuplādēt uzreiz vairākus failus.';
+$lang['mediausage']            = 'Atsaucei uz failu lietot šādu sintaksi:';
+$lang['mediaview']             = 'Skatīt oriģinālo failu';
+$lang['mediaroot']             = 'sakne';
+$lang['mediaupload']           = 'Augšupielādēt failu patreizējā nodaļā. Lai izveidotu apakšnodaļu, pieraksti to, atdalot ar kolu, pirms augšupielādējamā faila vārda.';
+$lang['mediaextchange']        = 'Faila paplašinājums mainīts no .%s uz .%s!';
+$lang['reference']             = 'Norādes uz failu';
+$lang['ref_inuse']             = 'Failu nevar dzēst, jo izmanto šādas lapas:';
+$lang['ref_hidden']            = 'Dažas norādes ir lapās, ko nav tiesību skatīt';
+$lang['hits']                  = 'Apmeklējumi';
+$lang['quickhits']             = 'Atbilstošās lapas';
+$lang['toc']                   = 'Satura rādītājs';
+$lang['current']               = 'patlaban';
+$lang['yours']                 = 'Tava versija';
+$lang['diff']                  = 'atšķirības no patreizējas versijas';
+$lang['diff2']                 = 'norādīto versiju atšķirības';
+$lang['line']                  = 'Rinda';
+$lang['breadcrumb']            = 'Ceļš';
+$lang['youarehere']            = 'Tu atrodies šeit';
+$lang['lastmod']               = 'Labota';
+$lang['by']                    = ', labojis';
+$lang['deleted']               = 'dzēsts';
+$lang['created']               = 'izveidots';
+$lang['restored']              = 'vecā versija atjaunota';
+$lang['external_edit']         = 'ārpussistēmas labojums';
+$lang['summary']               = 'Anotācija';
+$lang['noflash']               = 'Lai attēlotu lapas saturu, vajag <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['mail_newpage']          = 'lapa pievienota:';
+$lang['mail_changed']          = 'lapa mainīta:';
+$lang['mail_new_user']         = 'Jauns lietotājs:';
+$lang['mail_upload']           = 'augšupielādētais fails:';
+$lang['qb_bold']               = 'Trekninājums';
+$lang['qb_italic']             = 'Kursīvs';
+$lang['qb_underl']             = 'Pasvītrojums';
+$lang['qb_code']               = 'Vienplatuma burti';
+$lang['qb_strike']             = 'Pārsvītrots teksts';
+$lang['qb_h1']                 = '1. līmeņa virsraksts';
+$lang['qb_h2']                 = '2. līmeņa virsraksts';
+$lang['qb_h3']                 = '3. līmeņa virsraksts';
+$lang['qb_h4']                 = '4. līmeņa virsraksts';
+$lang['qb_h5']                 = '5. līmeņa virsraksts';
+$lang['qb_h']                  = 'Virsraksts';
+$lang['qb_hs']                 = 'Izraudzīties virsrakstu';
+$lang['qb_hplus']              = 'Lielāks virsraksts';
+$lang['qb_hminus']             = 'Mazāks virsraksts';
+$lang['qb_hequal']             = 'Tāds pats virsraksts';
+$lang['qb_link']               = 'Iekšēja saite';
+$lang['qb_extlink']            = 'Ārēja saite';
+$lang['qb_hr']                 = 'Horizontāla līnija';
+$lang['qb_ol']                 = 'Numurēts saraksts';
+$lang['qb_ul']                 = 'Nenumurēts saraksts';
+$lang['qb_media']              = 'Pielikt attēlus un citus failus.';
+$lang['qb_sig']                = 'Ievietot parakstu';
+$lang['qb_smileys']            = 'Emotikoni';
+$lang['qb_chars']              = 'Īpašās zīmes';
+$lang['upperns']               = 'vienu nodaļu līmeni augstāk';
+$lang['admin_register']        = 'Pievienot jaunu lietotāju';
+$lang['metaedit']              = 'Labot metadatus';
+$lang['metasaveerr']           = 'Metadati nav saglabāti';
+$lang['metasaveok']            = 'Metadati saglabāti';
+$lang['img_backto']            = 'Atpakaļ uz';
+$lang['img_title']             = 'Virsraksts';
+$lang['img_caption']           = 'Apraksts';
+$lang['img_date']              = 'Datums';
+$lang['img_fname']             = 'Faila vārds';
+$lang['img_fsize']             = 'Izmērs';
+$lang['img_artist']            = 'Fotogrāfs';
+$lang['img_copyr']             = 'Autortiesības';
+$lang['img_format']            = 'Formāts';
+$lang['img_camera']            = 'Fotoaparāts';
+$lang['img_keywords']          = 'Atslēgvārdi';
+$lang['subscribe_success']     = '%s pievienots  %s abonentu sarakstam';
+$lang['subscribe_error']       = 'Kļūme pievienojot %s  %s abonentu sarakstam';
+$lang['subscribe_noaddress']   = 'Nav zināma adrese, ko pievienot abonentu sarakstam';
+$lang['unsubscribe_success']   = ' %s svītrots no %s abonentu saraksta';
+$lang['unsubscribe_error']     = 'Kļūme svītrojot %s  no %s abonentu saraksta';
+$lang['authmodfailed']         = 'Aplami konfigurēta lietotāju autentifikācija. Lūdzo ziņo Wiki administratoram.';
+$lang['authtempfail']          = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
+$lang['i_chooselang']          = 'Izvēlies valodu';
+$lang['i_installer']           = 'DokuWiki instalētājs';
+$lang['i_wikiname']            = 'Wiki vārds';
+$lang['i_enableacl']           = 'Lietot ACL (ieteikts)';
+$lang['i_superuser']           = 'Superuser';
+$lang['i_problems']            = 'Instalētājs atrada zemāk minētās problēmas. Kamēr tās nenovērš, nav iespējam turpināt.';
+$lang['i_modified']            = 'Drošības nolūkos šis skripts darbosies tika ar jaunu nemodificētu Dokuwiki instalāciju.
+Vai nu no jauna jāatarhivē faili no lejupielādētās pakas vai jāraugās pēc padoma pilnā Dokuwiki instalācijas instrukcijā <a href="http://dokuwiki.org/install"></a>';
+$lang['i_funcna']              = 'PHP funkcija <code>%s</code> nav pieejama. Varbūt jūsu servera īpašnieks to kāda iemesla dēļ atslēdzis?';
+$lang['i_phpver']              = 'Jūsu PHP versija <code>%s</code> ir par vecu. Vajag versiju <code>%s</code>. Atjaunojiet savu PHP instalāciju.';
+$lang['i_permfail']            = 'Dokuwiki nevar ierakstīt <code>%s</code>. Jālabo direktorijas tiesības!';
+$lang['i_confexists']          = '<code>%s</code> jau ir';
+$lang['i_writeerr']            = 'Nevar izveidot <code>%s</code>. Jāpārbauda direktorijas/faila tiesības un fails jāizveido pašam.';
+$lang['i_badhash']             = 'nepazīstams vai izmainīts dokuwiki.php fails (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - neatļauta vai tukša vērtība';
+$lang['i_success']             = 'Konfigurēšana veiksmīgi pabeigta. Tagad vari nodzēst failu install.php. Tālāk turpini <a href="doku.php">savā jaunajā DokuWiki</a>.';
+$lang['i_failure']             = 'Rakstot konfigurācijas failu, gadījās dažas kļūmes. Pirms lieto <a href="doku.php">savu jauno DokuWiki</a>, tās varbūt jāizlabo.';
+$lang['i_policy']              = 'Sākotnējā ACL politika';
+$lang['i_pol0']                = 'Atvērts Wiki (raksta, lasa un augšupielādē ikviens)';
+$lang['i_pol1']                = 'Publisks Wiki (lasa ikviens, raksta un augšupielādē reģistrēti lietotāji)';
+$lang['i_pol2']                = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)';
+$lang['i_retry']               = 'Atkārtot';
+$lang['mu_intro']              = 'Šeit var augšupielādēt uzreiz vairāku failus. Uzklikšķini Pārlūkot pogai, lai tos ieliktu rindā. Nospied Augšupielādēt, kad rinda sastādīta.';
+$lang['mu_gridname']           = 'Faila vārds';
+$lang['mu_gridsize']           = 'Izmērs';
+$lang['mu_gridstat']           = 'Statuss';
+$lang['mu_namespace']          = 'Nodaļa';
+$lang['mu_browse']             = 'Pārlūkot';
+$lang['mu_toobig']             = 'par lielu';
+$lang['mu_ready']              = 'gatavs augšupielādei';
+$lang['mu_done']               = 'pabeigts';
+$lang['mu_fail']               = 'neizdevās';
+$lang['mu_authfail']           = 'sesijas laiks iztecējis';
+$lang['mu_progress']           = '@PCT@% augšupielādēts';
+$lang['mu_filetypes']          = 'Atļautie failu tipi';
+$lang['mu_info']               = 'faili ir augšupielādēti.';
+$lang['mu_lasterr']            = 'Pēdējā ķļūda.';
+$lang['recent_global']         = 'Tu skati izmaiņas nodaļā <b>%s</b>. Ir iespējams <a href="%s">skatīt jaunākos grozījums visā viki</a>. ';
+$lang['years']                 = 'pirms %d gadiem';
+$lang['months']                = 'pirms %d mēnešiem';
+$lang['weeks']                 = 'pirms % nedēļām';
+$lang['days']                  = 'pirms %d  dienām';
+$lang['hours']                 = 'pirms %d stundām';
+$lang['minutes']               = 'pirms %d minūtēm';
+$lang['seconds']               = 'pirms %d sekundēm';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/locked.txt
new file mode 100644
index 000000000..7d57ce98b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/locked.txt
@@ -0,0 +1,5 @@
+====== Lapa aizņemta ======
+
+Lapa aizņemta, to patlaban labo cits lietotājs. Tev ir jāgaida, kamēr to pabeigs labot vai arī iztecēs labotājam atvēlētais laiks.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/login.txt
new file mode 100644
index 000000000..a98d21d1a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+Tu neesi ielogojies! Ievadi savu lietotājvārdu un paroli. Pārlūkprogrammai jāpieņem //cookies//.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/mailtext.txt
new file mode 100644
index 000000000..cd4a5d6d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/mailtext.txt
@@ -0,0 +1,18 @@
+Tavā DokuWiki pievienota vai labota lapa. Šeit ir sīkākas ziņas:
+
+Datums       : @DATE@
+Pārlūks      : @BROWSER@
+IP adrese    : @IPADDRESS@
+Dators       : @HOSTNAME@
+Vecā versija : @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+Anotācija    : @SUMMARY@
+Lietotājs    : @USER@
+
+@DIFF@
+
+
+-- 
+Vēstuli nosūtījusi DokuWiki programma no
+@DOKUWIKIURL@ datora
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/newpage.txt
new file mode 100644
index 000000000..a4a05fdc5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/newpage.txt
@@ -0,0 +1,5 @@
+====== Šķirklis vēl nav izveidots ======
+
+Tu izvēlējies saiti uz vēl neizveidotu šķirkli. Ja tiesības ļauj, vari to izveidot, uzklikšķinot uz pogas ''Izveidot lapu''.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/norev.txt
new file mode 100644
index 000000000..b7c46245f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/norev.txt
@@ -0,0 +1,5 @@
+====== Nav šādas versijas ======
+
+Norādītās lapas versijas nav. Lieto pogu ''Vecās versijas'', lai redzētu dokumenta veco versiju sarakstu.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/preview.txt
new file mode 100644
index 000000000..c3d618a12
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/preview.txt
@@ -0,0 +1,5 @@
+====== Priekšskats ======
+
+Tavs teksts izskatīsies šādi. Ievēro, tas vēl **nav saglabāts** !
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/pwconfirm.txt
new file mode 100644
index 000000000..308ca29a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/pwconfirm.txt
@@ -0,0 +1,14 @@
+Sveiki, @FULLNAME@!
+
+Kāds pieprasījis jaunu paroli tavam @TITLE@ kontam
+@DOKUWIKIURL@ sistēmā.
+
+Ja paroli neesi prasījis, ignorē šo vēstuli.
+
+Lai apstiprinātu, ka esi paroli pieprasījis  lieto norādīto saiti.
+
+@CONFIRM@
+
+-- 
+Šo vēstuli ģenerējusi DokuWiki no
+@DOKUWIKIURL
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/read.txt
new file mode 100644
index 000000000..876e53cb8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/read.txt
@@ -0,0 +1,4 @@
+Šī lapa ir tikai lasāma. Vari apskatīt izejas kodu, bet nevari to mainīt. Ja domā, ka tas nav pareizi, vaicā administratoram.
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/recent.txt
new file mode 100644
index 000000000..70cf1aa1e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/recent.txt
@@ -0,0 +1,8 @@
+====== Jaunākie grozījumi ======
+
+Jaunākie labojumi ir:
+
+
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/register.txt
new file mode 100644
index 000000000..5e6477d37
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/register.txt
@@ -0,0 +1,4 @@
+====== Jauna lietotāja reģistrācija ======
+
+Lai izveidotu jaunu kontu, aizpildi visas prasītās ailes. Pārliecinies, ka uzdod **derīgu pasta adresi**, jo jauno paroli tev nosūtīs pa pastu. Lietotājvārdam jāatbilst [[doku>pagename|wiki vārdu nosacījumiem]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/registermail.txt
new file mode 100644
index 000000000..50fd8a92b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/registermail.txt
@@ -0,0 +1,14 @@
+Reģistrēts jauns lietotājs. Tā dati:
+
+Lietotājvārds : @NEWUSER@
+Pilns vārds   : @NEWNAME@
+E-pasts       : @NEWEMAIL@
+
+Datums      : @DATE@
+Pārlūks     : @BROWSER@
+IP aderese  : @IPADDRESS@
+Datora vārds: @HOSTNAME@
+
+-- 
+Šo vēstuli ģenerējis DokuWiki no
+@DOKUWIKIURL
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/resendpwd.txt
new file mode 100644
index 000000000..3f4597ac0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Nosūtīt jaunu paroli ======
+
+Azipildi zemāk prasīto, lai saņemtu savam kontam jaunu paroli. Jauno paroli nosūtīs uz reģistrēto e-pasta adresi. Lietotāja vārdam jābūt tavam //wiki sistēmas// lietotājavārdam.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/revisions.txt
new file mode 100644
index 000000000..51ad8495d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/revisions.txt
@@ -0,0 +1,5 @@
+====== Vecās versijas ======
+
+Dokumentam ir šādas vecās versijas. Lai atgrieztos pie vecā varianta, izvēlies to no saraksta,  uzklikšķini uz "Labot šo lapu" un saglabā to.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/searchpage.txt
new file mode 100644
index 000000000..22eb55f04
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/searchpage.txt
@@ -0,0 +1,4 @@
+====== Meklēšana ======
+
+Te vari redzēt meklēšanas rezultātus. Ja neatradi meklēto, nospiežot pogu "Labot lapu", vari izveidot jaunu lapu ar tevis meklētajiem atslēgvārdiem nosaukumā.
+===== Atrasts =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/showrev.txt
new file mode 100644
index 000000000..7d5c0fa07
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/showrev.txt
@@ -0,0 +1,2 @@
+**Šī ir veca dokumenta versija!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/stopwords.txt
new file mode 100644
index 000000000..846c86946
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/stopwords.txt
@@ -0,0 +1,48 @@
+# Šis ir to vārdu sarakstus, kurus indeksētājs neņem vērā. Katru vārdu savā rindā!
+# Labojot failu ievēro, ja jālieto UNIX rindu aplauzumi (single newline)
+# Nevajag likt sarakstā par 3 burtiem īsākus vārdus, tos tā pat neņem vērā
+# Angļu valodai saraksts ņemts no http://www.ranks.nl/stopwords/
+gar
+par
+pār
+pret
+starp
+caur
+uz
+aiz
+apakš
+bez
+iz
+kopš
+no
+pēc
+pie
+pirms
+priekš
+uz
+virs
+zem
+apakšpus
+ārpus
+augšpus
+iekšpus
+lejpus
+otrpus
+šaipus
+viņpus
+virspus
+dēļ
+labad
+pēc 
+līdz 
+pa
+vai
+jā
+nē
+kaut 
+nav
+itin
+jo 
+taču
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/subscribermail.txt
new file mode 100644
index 000000000..1395009f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/subscribermail.txt
@@ -0,0 +1,23 @@
+Sveiki!
+
+@TITLE@ wiki ir mainījusies lapa @PAGE@ .
+
+Atšķirības ir:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datums : @DATE@
+Lietotājs : @USER@
+Izmaiņu anotācija: @SUMMARY@
+Vecā versijan: @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+
+Lai atteiktos no šīm vēstulēm, ielogojies wiki sistēmā
+@DOKUWIKIURL@, tad apmeklē @NEWPAGE@
+uz izvēlies 'Atteikties no izmaiņu paziņojumiem'.
+
+-- 
+Vestuli izveidoja
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/updateprofile.txt
new file mode 100644
index 000000000..12fbd8de4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/updateprofile.txt
@@ -0,0 +1,8 @@
+====== Atjaunot sava konta datus ======
+
+Jāaizpilda tikai tie lauki, kuru saturu vēlies mainīt.  Nav iespējams mainīt savu lietotājvārdu.
+
+
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/uploadmail.txt
new file mode 100644
index 000000000..5975d5bd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/uploadmail.txt
@@ -0,0 +1,14 @@
+Fails augšupielādēts DokuWiki. Sīkākas ziņas:
+
+Fails         : @MEDIA@
+Datums        : @DATE@
+Pārlūks       : @BROWSER@
+IP adrese     : @IPADDRESS@
+Datora vārds  : @HOSTNAME@
+Izmērs        : @SIZE@
+MIME tips     : @MIME@
+Lietotājs     : @USER@
+
+-- 
+Vēstuli nosūtījusi DokuWiki programma no
+@DOKUWIKIURL@ datora.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/wordblock.txt
new file mode 100644
index 000000000..aa7051c8d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/lv/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAMs bloķēts ======
+
+Tavas izmaiņas **nav** saglabātas, jo satur vienu vai vairākus aizliegtos vārdus. Ja uzskati, ka tā ir kļūda, sazinies ar administratoru.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/admin.txt
new file mode 100644
index 000000000..2c4fc3f6c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Hitanao eo ambany lisitry ny asa fanaovana admin misy amin'ny DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/backlinks.txt
new file mode 100644
index 000000000..c625e6504
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/backlinks.txt
@@ -0,0 +1,5 @@
+====== Verindrohy ======
+
+Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
new file mode 100644
index 000000000..96b369e39
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/conflict.txt
@@ -0,0 +1,6 @@
+====== A newer version exists ======
+
+Efa misy kinova vaovao ny tahirin-kevitra novainao. Rehefa misy olona hafa nanova koa nandritra anao nanova no mitranga ny toy izao.
+
+Jereo ny tsy fitoviany miseho etsy ambany ireo, avy eo safidio izay kinova tianao hotazonina. Raha misafidy ny bokotra ''Raketo'' ianao, dia ny nataonao no horaketina. Ny bokotra ''Aoka ihany'' tsindriana raha hitazonana izay kinova misy ao.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/denied.txt
new file mode 100644
index 000000000..edf20f1a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/denied.txt
@@ -0,0 +1,4 @@
+====== Tsy tafiditra ======
+
+Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/diff.txt
new file mode 100644
index 000000000..8d7d69b45
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/diff.txt
@@ -0,0 +1,4 @@
+====== Tsy fitoviana ======
+
+Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/edit.txt
new file mode 100644
index 000000000..2cde9deb1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/edit.txt
@@ -0,0 +1,2 @@
+Rehefa avy manova ny pejy dia tsindrio ny bokotra ''Raketo''. Jereo ny [[wiki:syntax]] misy ny fomba fanoratana. Raha misy zavatra tianao handramana dia ianaro ao amin'ny [[wiki:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/editrev.txt
new file mode 100644
index 000000000..a6ff5ba32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/editrev.txt
@@ -0,0 +1,2 @@
+**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/index.txt
new file mode 100644
index 000000000..614fd6434
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>namespaces|namespaces]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/lang.php
new file mode 100644
index 000000000..bae292363
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/lang.php
@@ -0,0 +1,135 @@
+<?php
+/**
+ * mg language file
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Hanova ny pejy';
+$lang['btn_source'] = 'Asehoy ny source';
+$lang['btn_show']   = 'Asehoy ny pejy';
+$lang['btn_create'] = 'Amboary ity pejy';
+$lang['btn_search'] = 'Hikaroka';
+$lang['btn_save']   = 'Raketo';
+$lang['btn_preview']= 'Topi-maso';
+$lang['btn_top']    = 'Ho ery ambony';
+$lang['btn_newer']  = '<< taloha kokoa';
+$lang['btn_older']  = 'taoriana kokoa >>';
+$lang['btn_revs']   = 'Kinova taloha';
+$lang['btn_recent'] = 'Fiovana farany';
+$lang['btn_upload'] = 'Alefaso';
+$lang['btn_cancel'] = 'Aoka ihany';
+$lang['btn_index']  = 'Index';
+$lang['btn_secedit']= 'Edit';
+$lang['btn_login']  = 'Hiditra';
+$lang['btn_logout'] = 'Hivoaka';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Update';
+$lang['btn_delete'] = 'Fafao';
+$lang['btn_back']   = 'Miverina';
+$lang['btn_backtomedia'] = 'Fitsongana fichier Media';
+
+$lang['loggedinas'] = 'Anaranao:';
+$lang['user']       = 'Anarana';
+$lang['pass']       = 'Alahidy';
+$lang['passchk']    = 'Ataovy indray';
+$lang['remember']   = 'Tsarovy';
+$lang['fullname']   = 'Anarana feno';
+$lang['email']      = 'Imailaka';
+$lang['register']   = 'Hisoratra';
+$lang['badlogin']   = 'Miala tsiny fa misy diso ny anarana na ny alahidy.';
+
+$lang['regmissing'] = 'Tsy maintsy fenoina ny saha rehetra.';
+$lang['reguexists'] = 'Indrisy fa efa nisy namandrika io anarana io.';
+$lang['regsuccess'] = 'Voaforona ny kaontinao, halefa any imailaka ny alahidy.';
+$lang['regsuccess2']= 'Voaforona ilay kaonty.';
+$lang['regmailfail']= 'Ohatra ny nisy olana ny nandefasana imailaka. Miangavy anao hilaza ny Admin!';
+$lang['regbadmail'] = 'Toa tsy mandeha ny imailaka nomenao - Raha heverinao fa erreur io dia ilazao ny admin';
+$lang['regbadpass'] = 'Tsy mitovy ny alahidy roa nomenao, avereno indray.';
+$lang['regpwmail']  = 'Ny alahidy Wiki-nao';
+$lang['reghere']    = 'Mbola tsy manana kaonty ianao? Manaova vaovao';
+
+$lang['txt_upload']   = 'Misafidiana rakitra halefa';
+$lang['txt_filename'] = 'Ampidiro ny anaran\'ny wiki (tsy voatery)';
+$lang['txt_overwrt']  = 'Fafana izay rakitra efa misy?';
+$lang['lockedby']     = 'Mbola voahidin\'i';
+$lang['lockexpire']   = 'Afaka ny hidy amin\'ny';
+$lang['willexpire']   = 'Efa ho lany fotoana afaka iray minitra ny hidy ahafahanao manova ny pejy.\nMba hialana amin\'ny conflit dia ampiasao ny bokotra topi-maso hamerenana ny timer-n\'ny hidy.';
+
+$lang['notsavedyet'] = 'Misy fiovana tsy voarakitra, ho very izany ireo.\nAzo antoka fa hotohizana?';
+$lang['rssfailed']   = 'An error occured while fetching this feed: ';
+$lang['nothingfound']= 'Tsy nahitana n\'inon\'inona.';
+
+$lang['mediaselect'] = 'Safidy rakitra Media';
+$lang['fileupload']  = 'Fandefasana rakitra Media';
+$lang['uploadsucc']  = 'Voalefa soa aman-tsara';
+$lang['uploadfail']  = 'Tsy lasa ilay izy. Mety tsy fananana alalana?';
+$lang['uploadwrong'] = 'Nolavina ny lefa. Voarara io extension-na rakitra io!';
+$lang['uploadexist'] = 'Efa misy ilay rakitra. Tsy nisy inona natao.';
+$lang['deletesucc']  = 'Voafafa ny rakitra "%s" .';
+$lang['deletefail']  = 'Tsy afaka nofafana ny "%s" - Hamarino ny alalana.';
+$lang['mediainuse']  = 'Tsy voafafa ny rakitra "%s" - mbola misy mampiasa io.';
+$lang['namespaces']  = 'Namespaces';
+$lang['mediafiles']  = 'Rakitra misy amin\'ny';
+
+$lang['reference']   = 'References for';
+$lang['ref_inuse']   = 'Tsy afaka fafana io rakitra io, satria mbola ampiasain\'ireto pejy ireto:';
+$lang['ref_hidden']  = 'Misy references  vitsivitsy amina pejy tsy anananao alalana hamaky';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Anaram-pejy mifanaraka';
+$lang['toc']        = 'Fizahan-takila';
+$lang['current']    = 'current';
+$lang['yours']      = 'Kinova-nao';
+$lang['diff']       = 'Asehoy ny tsy fitoviana amin\'ny kinova amin\'izao';
+$lang['line']       = 'Andalana';
+$lang['breadcrumb'] = 'Taiza ianao';
+$lang['lastmod']    = 'Novaina farany:';
+$lang['by']         = '/';
+$lang['deleted']    = 'voafafa';
+$lang['created']    = 'Voamboatra';
+$lang['restored']   = 'Naverina tamin\'ny kinova taloha';
+$lang['summary']    = 'Fanovana teo';
+
+$lang['mail_newpage'] = 'pejy niampy:';
+$lang['mail_changed'] = 'pejy niova:';
+
+$lang['js']['nosmblinks'] = "rohy mankamin\'ny fizarana Windows dia amin\'ny Microsoft Internet Explorer ihany no miasa.\nAzo atao ihany anefa ny manao dika-petaka ny rohy.";
+
+$lang['qb_bold']    = 'Matavy';
+$lang['qb_italic']  = 'Mandry';
+$lang['qb_underl']  = 'Voatsipika';
+$lang['qb_code']    = 'Code programa';
+$lang['qb_strike']  = 'Disoina';
+$lang['qb_h1']      = 'Lohateny laharana 1';
+$lang['qb_h2']      = 'Lohateny laharana 2';
+$lang['qb_h3']      = 'Lohateny laharana 3';
+$lang['qb_h4']      = 'Lohateny laharana 4';
+$lang['qb_h5']      = 'Lohateny laharana 5';
+$lang['qb_link']    = 'Rohy ato anatiny';
+$lang['qb_extlink'] = 'Rohy mivoaka';
+$lang['qb_hr']      = 'Tsipika marindrano';
+$lang['qb_ol']      = 'Tanisa milahatra';
+$lang['qb_ul']      = 'Tanisa tsy milahatra';
+$lang['qb_media']   = 'Hanampy sary na rakitra hafa';
+$lang['qb_sig']     = 'Manisy sonia';
+
+$lang['js']['del_confirm']= 'Hofafana ilay andalana?';
+
+$lang['admin_acl']  = 'Fitantanana ACL (Access Control List)...';
+$lang['admin_register']= 'Ampio mpampiasa vaovao...';
+
+$lang['acl_group']  = 'Vondrona';
+$lang['acl_user']   = 'Mpampiasa';
+$lang['acl_perms']  = 'Alalana @';
+$lang['page']       = 'Pejy';
+$lang['namespace']  = 'Namespace';
+
+$lang['acl_perm1']  = 'Mamaky';
+$lang['acl_perm2']  = 'Manova';
+$lang['acl_perm4']  = 'Manamboatra';
+$lang['acl_perm8']  = 'Mandefa rakitra';
+$lang['acl_perm16'] = 'Mamafa';
+$lang['acl_new']    = 'Ampio andalana vaovao';
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/locked.txt
new file mode 100644
index 000000000..5705659a3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/locked.txt
@@ -0,0 +1,4 @@
+====== Pejy voahidy ======
+
+Mbola ovain'olona hafa ity pejy ity ka voahidy aloha. Andraso kely ho vitany ny azy, na ho lany fotoana ilay hidy.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/login.txt
new file mode 100644
index 000000000..1ea3facb0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/mailtext.txt
new file mode 100644
index 000000000..ca919345a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/mailtext.txt
@@ -0,0 +1,17 @@
+Nisy pejy niova tao amin'ny wiky. Ireto ny antsipiriany:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+Adiresy IP  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Taloha      : @OLDPAGE@
+Vaovao      : @NEWPAGE@
+Fiovana     : @SUMMARY@
+Novain'i    : @USER@
+
+@DIFF@
+
+
+-- 
+Ity imailaka ity dia navoakan'ny wiki tao amin'ny
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/newpage.txt
new file mode 100644
index 000000000..a998caf28
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/newpage.txt
@@ -0,0 +1,3 @@
+====== Mbola tsy misy an'io pejy io ======
+
+Nanindry rohy manondro pejy mbola tsy misy ianao. Afaka amboarinao io pejy io, tsindrio ny bokotra ''Amboary ity pejy''
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/norev.txt
new file mode 100644
index 000000000..71ecb9ba4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/norev.txt
@@ -0,0 +1,4 @@
+====== Tsy misy io kinova io ======
+
+Tsy misy ny kinova voalaza. Ampiasao ny bokotra ''Kinova taloha'' hampisehoana ireo karazana fanovana natao tamin'ity pejy ity.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/preview.txt
new file mode 100644
index 000000000..52019cd73
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/preview.txt
@@ -0,0 +1,5 @@
+====== Topi-maso ======
+
+Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/read.txt
new file mode 100644
index 000000000..0fe51f4a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/read.txt
@@ -0,0 +1,3 @@
+Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/recent.txt
new file mode 100644
index 000000000..4bc8245a7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/recent.txt
@@ -0,0 +1,5 @@
+====== Fiovana farany ======
+
+Ireto pejy ireto no niova vao haingana.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/register.txt
new file mode 100644
index 000000000..618c1f97e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/register.txt
@@ -0,0 +1,5 @@
+====== Hanokatra kaonty vaovao ======
+
+Fenoy ny saha rehetra eto ambany raha hanokatra kaonty amin'ity wiki ity. Hamarino fa adiresy imailaka mandeha no omenao - halefa any mantsy ny alahidy. Ny anarana dia tsy maintsy manaraka ny fepetran'ny [[doku>pagename|pagename]].
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/revisions.txt
new file mode 100644
index 000000000..72704587a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/revisions.txt
@@ -0,0 +1,5 @@
+====== Kinova taloha ======
+
+Ireto ny kinovan'ny pejy taloha. Raha te hamerina kinova taloha ianao, tsongay eo ambany izy hisokatra, avy eo tsindrio ny bokotra ''Hanova ny pejy'' ary ''Soraty''.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/searchpage.txt
new file mode 100644
index 000000000..68c6271df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/searchpage.txt
@@ -0,0 +1,7 @@
+====== Karoka ======
+
+Ireto ambany ireto ny valin'ny fikarohanao.
+
+Raha tsy nahita izay notadiavinao ianao, dia afaka mamorona pejy vaovao avy amin'ny teny nanaovanao fikarohana; Ampiasao ny bokotra ''Hanova ny pejy''.
+
+===== Vokatry ny fikarohana =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/showrev.txt
new file mode 100644
index 000000000..92690f4dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/showrev.txt
@@ -0,0 +1,2 @@
+**Ity dia kinovan'ny pejy taloha!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/wordblock.txt
new file mode 100644
index 000000000..581d67d16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mg/wordblock.txt
@@ -0,0 +1,5 @@
+====== SPAM Voasakana ======
+
+Tsy voarakitra ny fanovana nataonao satria misy teny voarara ao. Raha nanandrana nandefa spam ny wiki ianao dia -- Alika maty! Raha heverinao fa error dia ilazao ny Admin.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/admin.txt
new file mode 100644
index 000000000..6f54384f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/admin.txt
@@ -0,0 +1,3 @@
+====== व्यवस्थापन ======
+
+खाली तुम्हाला डॉक्युविकि मधे उपलब्ध असलेल्या व्यवस्थापनाच्या क्रियांची सूची दिली आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/backlinks.txt
new file mode 100644
index 000000000..997fa68e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/backlinks.txt
@@ -0,0 +1,3 @@
+====== प्रतिलिंक ======
+
+ही त्या सर्व प्रृष्ठांची सूची आहे जी या पृष्ठाला परत लिंक करतात.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/conflict.txt
new file mode 100644
index 000000000..2b1bb6423
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/conflict.txt
@@ -0,0 +1,5 @@
+====== नवीन आवृत्ती उपलब्ध आहे ======
+
+तुम्ही संपादित केलेल्या दस्तावेजाची नवीन आवृत्ती उपलब्ध आहे. तुम्ही संपादित करत असलेल्या दस्तावेजामधे त्याच वेळी इतर यूजरने बदल केल्यास असे घडते.
+
+खाली दर्शाविलेले फरक नीट तपासा आणि त्यापैकी कुठले ठेवायचे ते ठरवा. जर तुम्ही 'सुरक्षित' केलं तर तुमचे बदल सुरक्षित होतील. सध्याची आवृत्ति ठेवण्यासाठी 'कॅन्सल' वर क्लिक करा.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/denied.txt
new file mode 100644
index 000000000..1b499f51d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/denied.txt
@@ -0,0 +1,3 @@
+====== परवानगी नाकारली ======
+
+क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. कदाचित तुम्ही लॉगिन करायला विसरला आहात ? 
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/diff.txt
new file mode 100644
index 000000000..f0a845056
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/diff.txt
@@ -0,0 +1,3 @@
+====== फरक ======
+
+या पानावर तुम्हाला निवडलेली आवृत्ती व सध्याच्या आवृत्ती मधले फरक दाखवले आहेत.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/draft.txt
new file mode 100644
index 000000000..aa74475d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/draft.txt
@@ -0,0 +1,5 @@
+====== मसुद्याची फाइल मिळाली ======
+
+तुमचा मागचा संपादानाचा सेशन नीट पूर्ण झाला नव्हता. डॉक्युविकिने तुमच्या कामाचा मसुदा आपोआप सुरक्षित केला होता , जो वापरून तुमची संपादन परत चालू करू शकता. खाली तुमच्या मागच्या सेशन मधला सुरक्षित केलेला डेटा दाखवला आहे.
+
+कृपया आता हे ठरवा की तुमच्या संपादन सेशनचे //पुनर्स्थापन// करायचे, सुरक्षित केलेला मसुदा //रद्द// करायचा  का संपादनच //कॅन्सल// करायचं.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/edit.txt
new file mode 100644
index 000000000..6c6347e70
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/edit.txt
@@ -0,0 +1 @@
+पान संपादित करा आणि 'सुरक्षित' वर क्लिक करा. विकी सिन्टॅक्स साठी [[wiki:syntax]] पहा.कृपया तुम्ही जर एखादे पान **सुधारित** करू शकत असाल तरच ते संपादित करा. अन्यथा जर तुम्हाला फ़क्त काही गोष्टी ट्राय करून बघायच्या असतील तर [[playground:playground|प्लेग्राऊण्ड]] मधे आपले धडे गिरवा!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/editrev.txt
new file mode 100644
index 000000000..d58c8abd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/editrev.txt
@@ -0,0 +1,2 @@
+**तुमची या पानाची जुनी आवृत्ती लोड केलि आहे!** जर तुमची ती सुरक्षित केली तर तुमची त्याची एक नवीन आवृत्ती तयार कराल.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/index.txt
new file mode 100644
index 000000000..489b20435
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/index.txt
@@ -0,0 +1,3 @@
+====== सूची ======
+
+ही सर्व उपलब्ध पानांची [[doku>namespaces|नेमस्पेस]] अनुसार तयार केलेली सूची आहे. 
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/install.html
new file mode 100644
index 000000000..ddbf8245b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/install.html
@@ -0,0 +1,10 @@
+<p>हे पान <a href="http://dokuwiki.org">डॉक्युविकि</a> च्या पहिल्या इन्स्टॉलेशन आणि कॉन्फिगरेशन साठी मदत करतं. या इंस्टॉलर  विषयी जास्ती माहिती त्याच्या 
+<a href="http://dokuwiki.org/installer">माहितीसंग्रह पानावर</a> उपलब्ध आहे.</p>
+
+<p> डॉक्युविकि विकी पाने व सम्बंधित माहिती ( उदा. फोटो , शोध सूची, जुन्या आवृत्ती ई.) साठवण्यासाठी सामान्य फाइलचा उपयोग करतं. डॉक्युविकिने नीट काम करण्यासाठी डॉक्युविकिला या फाइल जिथे साठवल्या आहेत त्या डिरेक्टरीमधे लेखनाचे हक्क ( write access ) असणे <strong>अत्यावश्यक</strong> आहे. या इंस्टॉलरला डिरेक्टरीचे हक्क सेट करता येत नाहीत. ते थेट तुमच्या शेल मधून सेट करावे लागतात, किंवा तुम्ही व्यावसायिक होस्टिंग वापरत असाल तर FTP वापरून अथवा तुमच्या होस्टिंग कंट्रोल पॅनल ( उदा. cPanel  वगैरे ) मधून सेट करावे लागतात.</p>
+
+<p>हा इंस्टॉलर तुमच्या डॉक्युविकिचे <acronym title="access control list">ACL</acronym> कॉन्फिगरेशन ठरवेल, ज्याद्वारे तुम्हाला व्यवस्थापकीय लॉगिन, डॉक्युविकिच्या व्यवस्थापन मेनू मधे प्लगिनचे इन्स्टॉलेशन, सदस्यांची व्यवस्था, विकी पानांवरील हक्क, कॉन्फिगरेशन बदलणे ई. साठी प्रवेशाचे हक्क वगैरे बदल करता येतील. ही व्यवस्था डॉक्युविकि वापरण्यासाठी आवश्यक नाही पण वापरल्यास डॉक्युविकिचे व्यवस्थापन अधिक सुरळित होइल.</p>
+
+<p>अनुभवी सदस्य किंवा ज्याना काही ख़ास गरजा असतील त्यानी खालील लिंक्स वापराव्यात :
+<a href="http://dokuwiki.org/install">इन्स्टॉलेशनविषयी सूचना</a>
+and <a href="http://dokuwiki.org/config">कॉन्फिगरेशनची सेटिंग</a></p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/lang.php
new file mode 100644
index 000000000..715d51119
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/lang.php
@@ -0,0 +1,229 @@
+<?php
+/**
+ * mr language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesMr.php?view=co
+ * @author ghatothkach@hotmail.com
+ * @author Padmanabh Kulkarni <kulkarnipadmanabh@gmail.com>
+ * @author Padmanabh Kulkarni<kulkarnipadmanabh@gmail.com>
+ * @author shantanoo@gmail.com
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '`';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'हे पृष्ठ संपादित करा';
+$lang['btn_source']            = 'पानाचा स्त्रोत दाखवा ';
+$lang['btn_show']              = 'पान दाखवा';
+$lang['btn_create']            = 'हे पृष्ठ लीहा';
+$lang['btn_search']            = 'शोधा';
+$lang['btn_save']              = 'सुरक्षित';
+$lang['btn_preview']           = 'झलक';
+$lang['btn_top']               = 'परत वर';
+$lang['btn_newer']             = 'जास्त अलीकडचे';
+$lang['btn_older']             = 'कमी अलीकडचे';
+$lang['btn_revs']              = 'जून्या आव्रुत्ती';
+$lang['btn_recent']            = 'अलीकडील बदल';
+$lang['btn_upload']            = 'अपलोड';
+$lang['btn_cancel']            = 'रद्द करा';
+$lang['btn_index']             = 'सूचि';
+$lang['btn_secedit']           = 'संपादन';
+$lang['btn_login']             = 'प्रवेश करा';
+$lang['btn_logout']            = 'बाहेर पडा';
+$lang['btn_admin']             = 'अधिकारी';
+$lang['btn_update']            = 'अद्ययावत';
+$lang['btn_delete']            = 'नष्ट';
+$lang['btn_back']              = 'मागॆ';
+$lang['btn_backlink']          = 'येथे काय जोडले आहे';
+$lang['btn_backtomedia']       = 'परत माध्यम फाइल निवडीकड़े';
+$lang['btn_subscribe']         = 'पृष्ठाच्या बदलांची पुरवणी (फीड) लावा ';
+$lang['btn_unsubscribe']       = 'पृष्ठाच्या बदलांची पुरवणी (फीड) बंद करा';
+$lang['btn_subscribens']       = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) लावा';
+$lang['btn_unsubscribens']     = 'नामसमुहाच्या (नेमस्पेस) बदलांची पुरवणी (फीड) बंद करा';
+$lang['btn_profile']           = 'प्रोफाइल अद्ययावत करा';
+$lang['btn_reset']             = 'रिसेट';
+$lang['btn_resendpwd']         = 'कृपया परवलीचा नवीन शब्द माझ्या इमेल पत्त्यावर पाठविणे.';
+$lang['btn_draft']             = 'प्रत संपादन';
+$lang['btn_recover']           = 'प्रत परत मिळवा';
+$lang['btn_draftdel']          = 'प्रत रद्द';
+$lang['loggedinas']            = 'लॉगिन नाव';
+$lang['user']                  = 'वापरकर्ता';
+$lang['pass']                  = 'परवलीचा शब्द';
+$lang['newpass']               = 'नवीन परवलीचा शब्द';
+$lang['oldpass']               = 'सध्याचा परवलीचा शब्द नक्की करा';
+$lang['passchk']               = 'परत एकदा';
+$lang['remember']              = 'लक्षात ठेवा';
+$lang['fullname']              = 'पूर्ण नावं';
+$lang['email']                 = 'इमेल';
+$lang['register']              = 'नोंदणी';
+$lang['profile']               = 'वापरकर्त्याची माहिती';
+$lang['badlogin']              = 'माफ़ करा, वापरकर्ता नावात किंवा परवलीच्या शब्दात चूक झाली आहे.';
+$lang['minoredit']             = 'छोटे बदल';
+$lang['draftdate']             = 'प्रत आपोआप सुरक्षित केल्याची तारीख';
+$lang['nosecedit']             = 'मध्यंतरीच्या काळात हे पृष्ठ बदलले आहे.विभागाची माहिती जुनी झाली होती. त्याऐवजी सबंध पृष्ठ परत लोड केले आहे.';
+$lang['regmissing']            = 'कृपया सर्व रकाने भरा.';
+$lang['reguexists']            = 'या नावाने सदस्याची नोंदणी झालेली आहे, कृपया दुसरे सदस्य नाव निवडा.';
+$lang['regsuccess']            = 'सदस्याची नोंदणी झाली आहे आणि परवलीचा शब्द इमेल केला आहे.';
+$lang['regsuccess2']           = 'सदस्याची नोंदणी झाली.';
+$lang['regmailfail']           = 'परवलीचा शब्दाची इमेल पाठवण्यात चूक झाली आहे, क्रुपया संचालकांशी संपर्क साधा.';
+$lang['regbadmail']            = 'तुम्ही दिलेला ईमेल बरोबर नाही असे दिसते - तुमच्या मते ही चूक असल्यास साईटच्या व्यवस्थापकाशी संपर्क साधा.';
+$lang['regbadpass']            = 'आपला परवलीचा शब्द चुकीचा आहे.';
+$lang['regpwmail']             = 'तुमचा डोक्युविकि परवली.';
+$lang['reghere']               = 'अजुन तुमचे खाते नाही ? एक उघडून टाका.';
+$lang['profna']                = 'ह्या विकी मधे प्रोफाइल बदलण्याची सुविधा नाही.';
+$lang['profnochange']          = 'काही बदल नाहित. करण्यासारखे काही नाही.';
+$lang['profnoempty']           = 'रिकामे नाव किंवा ईमेल चालत नाही.';
+$lang['profchanged']           = 'सदस्याची प्रोफाइल अद्ययावत झाली आहे.';
+$lang['pwdforget']             = 'परवलीचा शब्द विसरला आहे का? नविन मागवा.';
+$lang['resendna']              = 'ह्या विकी मधे परवलीचा शब्द परत पाथाव्न्याची सुविधा नाही.';
+$lang['resendpwd']             = 'नविन परवली इच्छुक';
+$lang['resendpwdmissing']      = 'कृपया सर्व रकाने भरा.';
+$lang['resendpwdnouser']       = 'माफ़ करा, हा सदस्य आमच्या माहितिसंग्रहात सापडला नाही.';
+$lang['resendpwdbadauth']      = 'माफ़ करा, हा अधिकार कोड बरोबर नाही. कृपया आपण पूर्ण शिकामोर्तबाची लिंक वापरल्याची खात्री करा.';
+$lang['resendpwdconfirm']      = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.';
+$lang['resendpwdsuccess']      = 'शिक्कामोर्तबाची लिंक ईमेल द्वारा पाठवली आहे.';
+$lang['license']               = 'विशिष्ठ नोंद केलि नसल्यास ह्या विकी वरील सर्व मजकूर खालील लायसन्स मधे मोडतो : ';
+$lang['licenseok']             = 'नोंद : हे पृष्ठ संपादित केल्यास तुम्ही तुमचे योगदान खालील लायसन्स अंतर्गत येइल : ';
+$lang['txt_upload']            = 'अपलोड करण्याची फाइल निवडा';
+$lang['txt_filename']          = 'अपलोड उर्फ़ ( वैकल्पिक )';
+$lang['txt_overwrt']           = 'अस्तित्वात असलेल्या फाइलवरच सुरक्षित करा.';
+$lang['lockedby']              = 'सध्या लॉक करणारा :';
+$lang['lockexpire']            = 'सध्या लॉक करणारा :';
+$lang['willexpire']            = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
+$lang['notsavedyet']           = 'सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?';
+$lang['rssfailed']             = 'ही पुरवणी आणण्यात काही चूक झाली:';
+$lang['nothingfound']          = 'काही सापडला नाही.';
+$lang['mediaselect']           = 'दृकश्राव्य फाइल';
+$lang['fileupload']            = 'दृकश्राव्य फाइल अपलोड';
+$lang['uploadsucc']            = 'अपलोड यशस्वी';
+$lang['uploadfail']            = 'अपलोड अयशस्वी.कदाचित चुकीच्या परवानग्या असतील ?';
+$lang['uploadwrong']           = 'अपलोड नाकारण्यात आला. हे फाइल एक्सटेंशन अवैध आहे!';
+$lang['uploadexist']           = 'फाइल आधीच अस्तित्वात आहे. काही केले नाही.';
+$lang['uploadbadcontent']      = 'अपलोड केलेली माहिती %s फाइल एक्सटेंशनशी मिळतिजुळति नाही.';
+$lang['uploadspam']            = 'अपलोड स्पॅम ब्लॅकलिस्टमुळे थोपवला आहे.';
+$lang['uploadxss']             = 'अपलोड संशयित हानिकारक मजकूर असल्याने थोपवला आहे.';
+$lang['uploadsize']            = 'अपलोड केलेली फाइल जास्तीच मोठी होती. (जास्तीत जास्त %s)';
+$lang['deletesucc']            = '%s ही फाइल नष्ट करण्यात आलेली आहे.';
+$lang['deletefail']            = '%s ही फाइल नष्ट करू शकलो नाही - कृपया परवानग्या तपासा.';
+$lang['mediainuse']            = '%s ही फाइल नष्ट केली नाही - ती अजुन वापरात आहे.';
+$lang['namespaces']            = 'नेमस्पेस';
+$lang['mediafiles']            = 'मध्ये उपलब्ध असलेल्या फाइल';
+$lang['js']['keepopen']        = 'निवड केल्यावर विण्डो उघडी ठेवा';
+$lang['js']['hidedetails']     = 'सविस्तर मजकूर लपवा';
+$lang['js']['nosmblinks']      = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.';
+$lang['js']['mu_btn']          = 'एक वेळेस अनेक फाइल वापरा';
+$lang['mediausage']            = 'ह्या फाइलचा संदर्भ देण्यासाठी खालील सिन्टॅक्स वापरा :';
+$lang['mediaview']             = 'मूळ फाइल बघू ';
+$lang['mediaroot']             = 'रूट';
+$lang['mediaupload']           = 'सध्याच्या नेमस्पेसमधे इथेच फाइल अपलोड करा. उप-नेमस्पेस बनवण्यासाठि त्याचे नाव तुमच्या "अपलोड उर्फ़" मधे दिलेल्या फाइल नावाच्या आधी विसर्गचिन्हाने वेगळे करून ते वापरा.';
+$lang['mediaextchange']        = 'फाइलचे एक्सटेंशन .%s चे बदलून  .%s केले आहे.';
+$lang['reference']             = 'च्या साठी संदर्भ';
+$lang['ref_inuse']             = 'फाइल नष्ट केली जाऊ शकत नाही. ती अजुन खालील पृष्ठे वापरत आहेत :';
+$lang['ref_hidden']            = 'काही संदर्भ तुम्हाला वाचण्याची परवानगी नसलेल्या पृष्ठावर आहेत';
+$lang['hits']                  = 'हिट्स';
+$lang['quickhits']             = 'जुळणारि पाने';
+$lang['toc']                   = 'अनुक्रमणिका';
+$lang['current']               = 'चालू';
+$lang['yours']                 = 'तुमची आवृत्ति';
+$lang['diff']                  = 'सध्याच्या आवृत्तिंशी फरक दाखवा';
+$lang['diff2']                 = 'निवडलेल्या आवृत्तिंमधील फरक दाखवा';
+$lang['line']                  = 'ओळ';
+$lang['breadcrumb']            = 'मागमूस';
+$lang['youarehere']            = 'तुम्ही इथे आहात';
+$lang['lastmod']               = 'सर्वात शेवटचा बदल';
+$lang['by']                    = 'द्वारा';
+$lang['deleted']               = 'काढून टाकले';
+$lang['created']               = 'निर्माण केले';
+$lang['restored']              = 'जुनी आवृत्ति पुनर्स्थापित केली';
+$lang['external_edit']         = 'बाहेरून संपादित';
+$lang['summary']               = 'सारांश बदला';
+$lang['noflash']               = 'ही माहिती दाखवण्यासाठी <a href="http://www.adobe.com/products/flashplayer/">अडोब फ्लॅश प्लेअर</a> ची गरज आहे.';
+$lang['mail_newpage']          = 'पृष्ठ जोडले : ';
+$lang['mail_changed']          = 'पृष्ठ बदलले : ';
+$lang['mail_new_user']         = 'नवीन सदस्य : ';
+$lang['mail_upload']           = 'फाइल अपलोड केली : ';
+$lang['qb_bold']               = 'ठळक मजकूर';
+$lang['qb_italic']             = 'तिरका मजकूर';
+$lang['qb_underl']             = 'अधोरेखित मजकूर';
+$lang['qb_code']               = 'कोड मजकूर';
+$lang['qb_strike']             = 'रद्द मजकूर';
+$lang['qb_h1']                 = 'पहिल्या पातळीचे शीर्षक';
+$lang['qb_h2']                 = 'दुसर्या पातळीचे शीर्षक';
+$lang['qb_h3']                 = 'तिसर्या पातळीचे शीर्षक';
+$lang['qb_h4']                 = 'चवथ्या पातळीचे शीर्षक';
+$lang['qb_h5']                 = 'पाचव्या पातळीचे शीर्षक';
+$lang['qb_link']               = 'अंतर्गत लिंक';
+$lang['qb_extlink']            = 'बाह्य लिंक';
+$lang['qb_hr']                 = 'आडवी पट्टी';
+$lang['qb_ol']                 = 'अनुक्रमित यादीतील वस्तु';
+$lang['qb_ul']                 = 'साध्या यादीतील वस्तु';
+$lang['qb_media']              = 'प्रतिमा आणि इतर फाइल टाका';
+$lang['qb_sig']                = 'स्वाक्षरी टाका';
+$lang['qb_smileys']            = 'स्माइली';
+$lang['qb_chars']              = 'ख़ास चिन्ह';
+$lang['js']['del_confirm']           = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?';
+$lang['admin_register']        = 'नवीन सदस्य';
+$lang['metaedit']              = 'मेटाडेटा बदला';
+$lang['metasaveerr']           = 'मेटाडेटा सुरक्षित झाला नाही';
+$lang['metasaveok']            = 'मेटाडेटा सुरक्षित झाला';
+$lang['img_backto']            = 'परत जा';
+$lang['img_title']             = 'नाव';
+$lang['img_caption']           = 'टीप';
+$lang['img_date']              = 'तारीख';
+$lang['img_fname']             = 'फाइल नाव';
+$lang['img_fsize']             = 'साइझ';
+$lang['img_artist']            = 'फोटोग्राफर';
+$lang['img_copyr']             = 'कॉपीराइट';
+$lang['img_format']            = 'प्रकार';
+$lang['img_camera']            = 'कॅमेरा';
+$lang['img_keywords']          = 'मुख्य शब्द';
+$lang['subscribe_success']     = '%s  ला %s च्या पुरवणिसाठि नोंदवले';
+$lang['subscribe_error']       = '%s  ला %s च्या पुरवणिसाठि नोंदवताना चूक झाली';
+$lang['subscribe_noaddress']   = 'तुमच्या लॉगिनशी  सम्बंधित कुठलाही पत्ता नाही , त्यामुळे पुरवणिसाठि नोंद केली जाऊ शकत नाही';
+$lang['unsubscribe_success']   = '%s ला %s च्या पुरवणी यादी मधून काढून टाकले';
+$lang['unsubscribe_error']     = '%s  ला  %s  च्या पुरवणी यादी मधून काढून टाकण्यात चूक झाली';
+$lang['authmodfailed']         = 'सदस्य अधिकृत करण्याची व्यवस्था चुकीची आहे. कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.';
+$lang['authtempfail']          = 'सदस्य अधिकृत करण्याची सुविधा सध्या चालू नाही. सतत हा मजकूर दिसल्यास कृपया तुमच्या विकीच्या व्यवस्थापकाशी सम्पर्क साधा.';
+$lang['i_chooselang']          = 'तुमची भाषा निवडा';
+$lang['i_installer']           = 'डॉक्युविकि इनस्टॉलर';
+$lang['i_wikiname']            = 'विकी नाम';
+$lang['i_enableacl']           = 'ACL चालू करा ( अधिक चांगले )';
+$lang['i_superuser']           = 'सुपर-सदस्य';
+$lang['i_problems']            = 'इनस्टॉलरला काही अडचणि आल्या आहेत. त्या ठीक केल्याशिवाय तुम्ही पुढे जाऊ शकत नाही.';
+$lang['i_modified']            = 'सुरक्षिततेच्या कारणासठि ही स्क्रिप्ट फ़क्त नवीन आणि बदललेल्या डॉक्युविकि इन्स्टॉलेशन मधेच चालेल. तुम्ही एकतर डाउनलोड केलेले पॅकेज मधील फाइल परत प्रसारित करा किंवा <a href="http://dokuwiki.org/install">डॉक्युविकि इन्स्टॉलेशन विषयी सूचना</a> वाचा.';
+$lang['i_funcna']              = 'PHP  मधलं <code>%s</code> हे फंक्शन उपलब्ध नाही. बहुधा तुमच्या होस्टिंग पुरवणाराने ते काही कारणाने अनुपलब्ध केलं असावं.';
+$lang['i_phpver']              = 'तुमची PHP आवृत्ति <code>%s</code> ही आवश्यक असलेल्या <code>%s</code> ह्या आवृत्तिपेक्षा कमी आहे. कृपया तुमचे PHP इन्स्टॉलेशन अद्ययावत करा.';
+$lang['i_permfail']            = '<code>%s</code> या डिरेक्टरी मध्ये डॉक्युविकि बदल करू शकत नाही. कृपया या डिरेक्टरीच्या परवानग्या ठीक करा.';
+$lang['i_confexists']          = '<code>%s</code> आधीच अस्तित्वात आहे.';
+$lang['i_writeerr']            = '<code>%s</code> निर्माण करू शकलो नाही. तुम्हाला डिरेक्टरी / फाइल च्या परवानग्या तपासून स्वतःच ही फाइल बनवावी लागेल.';
+$lang['i_badhash']             = 'अनाकलनीय किंवा बदललेले dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = 'code>%s</code> - अवैध किंवा रिकामा मजकूर.';
+$lang['i_success']             = 'व्यवस्था लावण्याचे काम यशस्वीरीत्या पार पडले. आता तुम्ही install.php डिलीट करू शकता. <a href="doku.php">तुमच्या नविन डॉक्युविकि </a> वर जा.';
+$lang['i_failure']             = 'कॉन्फिगुरेशनच्या फाइल सुरक्षित करताना काही अडचणी आल्या आहेत. <a href="doku.php">तुमची नवीन डॉक्युविकि </a> वापरण्याआधी तुम्हाला ह्या फाइल स्वतः ठीक कराव्या लागतील.';
+$lang['i_policy']              = 'आरंभीची ACL पॉलिसी';
+$lang['i_pol0']                = 'मुक्त विकी ( सर्वांना वाचन, लेखन व अपलोड करण्याची परवानगी )';
+$lang['i_pol1']                = 'सार्वजनिक विकी ( सर्वांना वाचण्याची मुभा , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना )';
+$lang['i_pol2']                = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) ';
+$lang['i_retry']               = 'पुन्हा प्रयत्न';
+$lang['mu_intro']              = 'इथे तुम्ही एकापेक्षा अधिक फाइल अपलोड करू शकता. ब्राउझ च्या बटणावर क्लिक करून त्याना लिस्ट मधे टाका. सगळ्या टाकुन झाल्यावर अपलोड च्या बटणावर क्लिक करा.';
+$lang['mu_gridname']           = 'फाइल नाम';
+$lang['mu_gridsize']           = 'साइज';
+$lang['mu_gridstat']           = 'स्थिति';
+$lang['mu_namespace']          = 'नेमस्पेस';
+$lang['mu_browse']             = 'ब्राउझ';
+$lang['mu_toobig']             = 'अति मोठे';
+$lang['mu_ready']              = 'अपलोडसाठी तयार';
+$lang['mu_done']               = 'पूर्ण';
+$lang['mu_fail']               = 'अयशस्वी';
+$lang['mu_authfail']           = 'सेशन संपला';
+$lang['mu_progress']           = '@PCT@% अपलोड झाले';
+$lang['mu_filetypes']          = 'मान्य फाइल टाइप';
+$lang['recent_global']         = 'तुम्ही सध्या <b>%s</b> या नेमस्पेस मधील बदल पाहात आहात.तुम्ही <a href="%s">पूर्ण विकी मधले बदल </a> सुद्धा पाहू शकता.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/locked.txt
new file mode 100644
index 000000000..dae909c40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/locked.txt
@@ -0,0 +1,3 @@
+====== पान लॉक आहे ======
+
+हे पान सध्या दुसर्या सदस्याने संपादनासाठी लॉक केले आहे. तुम्हाला त्याचे संपादन करून होईपर्यंत किंवा लॉक संपेपर्यंत थांबावे लागेल.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/login.txt
new file mode 100644
index 000000000..f2fef4c45
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/login.txt
@@ -0,0 +1,3 @@
+====== लॉगिन ======
+
+तुम्ही सध्या लॉगिन केलेले नाही! तुमचे नाव-पासवर्ड देऊन खाली लॉगिन करा. लॉगिन करण्यासाठी तुमच्या ब्राउजरमधे कुकीज चालू असल्या पाहिजेत.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/mailtext.txt
new file mode 100644
index 000000000..18fa23846
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/mailtext.txt
@@ -0,0 +1,15 @@
+तुमच्या डॉक्युविकिमधील एक पान बदलले किंवा नवीन टाकले गेले आहे. त्याची माहिती पुढील प्रमाणे :
+
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+मशिनचे नाव ( Host name ) : @HOSTNAME@
+जुनी आवृत्ती : @OLDPAGE@
+नवी आवृत्ती : @NEWPAGE@
+संपादन सारांश : @SUMMARY@
+सदस्य : @USER@
+
+@DIFF@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/newpage.txt
new file mode 100644
index 000000000..00a1c6b60
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/newpage.txt
@@ -0,0 +1,3 @@
+====== हा मुद्दा अजून अस्तित्त्वात नाही ======
+
+तुमची अशा एखाद्या मुद्द्याच्या लिंक वरून इथे आला आहात जो अजून अस्तित्त्वात नाही. जर तुम्हाला परवानगी असेल तर तुमची त्या मुद्द्यावर "हे पान नवीन तयार करा" हे बटण क्लिक करून स्वतः एक पान तयार करू शकता.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/norev.txt
new file mode 100644
index 000000000..180b031fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/norev.txt
@@ -0,0 +1,3 @@
+====== अशी कुठली आवृत्ती नाही ======
+
+ही आवृत्ती अस्तित्त्वात नाही. "जुन्या आवृत्त्या" बटण वापरून या दस्तावेजाच्या सर्व जुन्या आवृत्त्या तुमची पाहू शकता.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/preview.txt
new file mode 100644
index 000000000..8277398dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/preview.txt
@@ -0,0 +1,3 @@
+====== झलक ======
+
+ही तुमचा मजकूर कसा दिसेल त्याची एक झलक आहे. लक्षात ठेवा : हा मजकूर अजुन **सुरक्षित केलेला नाही** !
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/pwconfirm.txt
new file mode 100644
index 000000000..ec0b707a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/pwconfirm.txt
@@ -0,0 +1,11 @@
+नमस्कार @FULLNAME@!
+
+कोणीतरी तुमच्या @TITLE@ या @DOKUWIKIURL@ येथील लॉगिनसाठी नवीन पासवर्ड मागवला आहे.
+जर तुम्ही हा पासवर्ड मागवला नसेल तर कृपया ह्या ईमेलकड़े दुर्लक्ष करा.
+
+जर नक्की तुम्हीच हा पासवर्ड मागवला असेल तर खालील लिंकवर क्लिक करून ते नक्की करा.
+
+@CONFIRM@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/read.txt
new file mode 100644
index 000000000..b834dd750
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/read.txt
@@ -0,0 +1 @@
+हे पान फक्त वाचता येऊ शकतं. तुम्ही त्याचा मूळ विकी मजकूर पाहू शकता पण तो बदलू शकत नाही. जर हे चुकीचं असेल तर तुमच्या विकी व्यवस्थापकाशी संपर्क साधा.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/recent.txt
new file mode 100644
index 000000000..9a6d6f151
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/recent.txt
@@ -0,0 +1,3 @@
+====== अलीकडील बदल ======
+
+खालील पाने हल्लीच बदलली आहेत
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/register.txt
new file mode 100644
index 000000000..3aca31278
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/register.txt
@@ -0,0 +1,3 @@
+====== नवीन सदस्य म्हणुन नोंदणी करा ======
+
+खाली तुमची माहिती भरून या विकी वर नवीन खातं उघडा. कृपया आपण देत असलेला ईमेल चालू असल्याची खात्री करा - जर तुम्हाला इथे पासवर्ड टाकायला सांगितला नाही तयार एक नवीन पासवर्ड तुम्हाला त्या ईमेल वर पाठवला जाइल. तुमचं लॉगिन नाम एक वैध [[doku>pagename|पेजनेम]] असले पाहिजे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/registermail.txt
new file mode 100644
index 000000000..a6fea4d06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/registermail.txt
@@ -0,0 +1,13 @@
+एक नवीन सदस्याची नोंदणी झाली आहे. त्याची माहीत पुढीलप्रमाणे :
+
+सदस्य नाम :  @NEWUSER@
+पूर्ण नाव : @NEWNAME@
+ईमेल : @NEWEMAIL@
+
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्ट नाम : @HOSTNAME@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/resendpwd.txt
new file mode 100644
index 000000000..64b95a45f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== नवीन पासवर्ड पाठव ======
+
+या विकिवरील तुमच्या अकाउंटसाठी नवीन पासवर्ड मिळवण्यासाठी कृपया तुमचे सदस्य नाम खालच्या फॉर्म मधे टाका. ही पासवर्डची मागणी नक्की करण्यासाठी तुम्ही नोंदणी करताना दिलेल्या ईमेल पत्त्यावर एक लिंक पाठवली जाइल.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/revisions.txt
new file mode 100644
index 000000000..fb842c763
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/revisions.txt
@@ -0,0 +1,3 @@
+====== जुन्या आवृत्त्या ======
+
+ह्या सद्य दस्तावेजच्या जुन्या आवृत्त्या आहेत. एखाद्या जुन्या आवृत्तीवर परत जाण्यासाठी टी खालून निवडा, "हे पान संपादित करा" वर क्लिक करा आणि ते सुरक्षित करा.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/searchpage.txt
new file mode 100644
index 000000000..23e10b1d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/searchpage.txt
@@ -0,0 +1,5 @@
+====== शोध ======
+
+तुम्हाला खाली तुमच्या शोधाचे फलित दिसतील. जर तुमची शोधत असलेली गोष्ट तुम्हाला सापडली नाही, तर योग्य बटण वापरून तुम्ही शोधत असलेल्या गोष्टीविषयी तुम्ही एखादे पान निर्माण किंवा संपादित करू शकता.
+
+====== फलित ======
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/showrev.txt
new file mode 100644
index 000000000..aeaeee500
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/showrev.txt
@@ -0,0 +1,2 @@
+** ही ह्या दस्तावेजची जुनी आवृत्ती आहे. **
+--
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/stopwords.txt
new file mode 100644
index 000000000..2b413a928
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/stopwords.txt
@@ -0,0 +1,39 @@
+# ही अशा शब्दांची यादी आहे जी अनुक्रमक (इंडेक्सर) दुर्लक्षित करतो, जर एक ओळित एक शब्द आला तरच.
+# ही यादी बदलल्यास केवळ यूनिक्स पद्धतीची लाइन एंडिंग वापरा. तीन अक्षरापेक्षा लहान शब्द टाकण्याची
+# गरज नाही - ते आपोआपच दुर्लक्षित केले जातात. ही यादी http://www.ranks.nl/stopwords/ येथील यादीवर
+# आधारित आहे.
+about
+are
+as
+an
+and
+you
+your
+them
+their
+com
+for
+from
+into
+if
+in
+is
+it
+how
+of
+on
+or
+that
+the
+this
+to
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/subscribermail.txt
new file mode 100644
index 000000000..8cbb3164e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/subscribermail.txt
@@ -0,0 +1,21 @@
+नमस्कार !
+
+@TITLE@ विकी मधलं @PAGE@ हे पान बदललं आहे.
+खाली त्यातील बदल दाखवले आहेत:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+दिनांक : @DATE@
+सदस्य : @USER@
+संपादन सारांश : @SUMMARY@
+जुनी आवृत्ती : @OLDPAGE@
+नवीन आवृत्ती : @NEWPAGE@
+
+पानाच्या बदलाविषयिच्या सूचना तुम्हाला नको असतील तर
+@DOKUWIKIURL@ या विकी वर लॉगिन करा आणि
+@NEWPAGE@ पानावर जा व त्या पान/नेमस्पेस विषयीच्या सूचना बंद ( unsubscribe ) करा.
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/updateprofile.txt
new file mode 100644
index 000000000..c08810f3e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== तुमची सदस्य माहिती अद्ययावत करा ======
+
+फ़क्त तुम्हाला बदल करायचा असेल तेच रकाने परत भरा. तुमची तुमचे सदस्य नाम बदलू शकत नाही.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/uploadmail.txt
new file mode 100644
index 000000000..66e736598
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/uploadmail.txt
@@ -0,0 +1,13 @@
+एक फाइल तुमच्या डॉक्युविकिवर अपलोड केली गेली आहे. त्याची माहिती याप्रमाणे :
+
+फाइल : @MEDIA@
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+साइज़ : @SIZE@
+MIME टाइप : @MIME@
+सदस्य : @USER@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/wordblock.txt
new file mode 100644
index 000000000..e885cbed9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/mr/wordblock.txt
@@ -0,0 +1,3 @@
+====== भंकस रोखली ======
+
+तुमचे बदल सुरक्षित केलेले ** नाहीत ** कारण त्यामधे एक किंवा अधिक निषिद्ध शब्द आहेत. जर तुम्ही मुद्दामच विकिवर भंकस करण्याचा प्रयत्न केला असेल तर असले चाळे बंद करा ! आणि समजा तुम्हाला असा वाटत असेल की हा मजकूर निषिद्ध समजण्याचे काही कारण नाही तर तुमच्या विकी व्यवस्थापकाशी संपर्क साधा.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/admin.txt
new file mode 100644
index 000000000..7a829dbe5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/admin.txt
@@ -0,0 +1,2 @@
+====== व्यवस्थापन ======
+तल तपाईले  DokuWikiमा  उपलव्ध व्यवस्थापकिय कार्यहरुको सुची पाउन सक्नुहुन्छ ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/backlinks.txt
new file mode 100644
index 000000000..51b95731d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/backlinks.txt
@@ -0,0 +1,2 @@
+====== पछाडि लिङ्क ======
+यो पृष्ठहरुको सुचीहरुले पछाडि लिङ्क स्वयंलाई नै गरेको छ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/conflict.txt
new file mode 100644
index 000000000..457e108ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/conflict.txt
@@ -0,0 +1,5 @@
+====== नयाँ संस्करण उपलब्ध छ ======
+
+तपाईले सम्पादन गर्नुभएको पाठको नयाँ सस्करण उपलब्ध छ। तपाईले सम्पादन गरिरहनु भएको समयमा अर्को प्रयोगकर्ताले यो पाठ परिवर्तन गरेकोले यस्तो भएको हो ।
+
+दुबैका फरक दाज्नुहोस् र दुईमा कुन राख्नेहो  निश्चित गर्नुहोस् ।तपाईले "वचत गर्नुहोस् " छान्नु भयो भने तपाईको संस्करण वचत हुनेछ। "रद्द गर्नुहोस्" छान्नु भयो भने अहिलेको संस्करण वचत हुनेछ । 
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/denied.txt
new file mode 100644
index 000000000..ab4bcf290
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/denied.txt
@@ -0,0 +1,3 @@
+====== अनुमति अमान्य ======
+
+माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/diff.txt
new file mode 100644
index 000000000..76d75fbfb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/diff.txt
@@ -0,0 +1,3 @@
+====== भिन्नताहरु ======
+
+यसले यो पृष्ठको  छानिएको संस्करण र हालको संकरण बीच भिन्नताहरु देखाउँछ ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/draft.txt
new file mode 100644
index 000000000..88630c992
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/draft.txt
@@ -0,0 +1,5 @@
+====== ड्राफ्ट फाइल भेटियो ======
+
+तपाईको यो पृष्ठको गत सम्पादन सफलतापूर्वक सम्पन्न भएको थिएन ।DokuWiki ले स्वचालितरुपमा ड्राफ्ट वचतगरेको छ त्यस देखि तपाईले आफ्नो सम्पादन कार्यमा निरन्तरता दिन सक्नुहुन्छ। तल तपाईले गत सत्रमा बचत गरिएको सामग्री देख्न सक्नुहुन्छ ।
+
+कृपया निर्णय दिनुहोस्  कि तपाई गत सत्रमा बचत गरिएको सत्रको सम्पादनकार्य  //recover// , //delete// वा  //cancel//  के गर्न चाहनुहुन्छ भनेर।
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/edit.txt
new file mode 100644
index 000000000..be498a61b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/edit.txt
@@ -0,0 +1 @@
+पृष्ठ सम्पादन गर्नुहोस र "बचत" मा थिच्नुहोस् । सिन्टेक्सको लागि  [[wiki:syntax]] हेर्नुहोस् । यो पृष्ठलाई **सुधार्न** सक्नुहुन्छ भने मात्र सम्पादन गर्नुहोस् ।यदि कुनै प्रयोग गर्न या , जान्न चाहनुहुन्छ भने [[playground:playground|playground]] को प्रयोग गर्नुहोस् ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/editrev.txt
new file mode 100644
index 000000000..0db67c2bb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/editrev.txt
@@ -0,0 +1,2 @@
+** तपाईले यस कागजातको पुरानो संस्करण खोल्नु भएको छ ।** यदि यसलाई वचत गर्नुभयो भने यसैसामग्रीबाट नयाँ संस्करणको निर्माण हुनेछ ।
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/index.txt
new file mode 100644
index 000000000..cb06f0307
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/index.txt
@@ -0,0 +1,3 @@
+====== सुची ======
+
+यो सबै उपलाब्ध पृष्ठहरुको [[doku>namespaces|namespaces]] का आधारमा मिलाइएको सुची हो ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/lang.php
new file mode 100644
index 000000000..ce9310ee5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/lang.php
@@ -0,0 +1,220 @@
+<?php
+/**
+ * Nepali language file
+ *
+ * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
+ * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
+ * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'यो पृष्ठ सम्पादन गर्नुहोस् ';
+$lang['btn_source']            = 'यो पृष्ठको स्रोत देखाउनुहोस् ';
+$lang['btn_show']              = 'पृष्ठ देखाउनुहोस् ';
+$lang['btn_create']            = 'यो पृष्ठ निर्माण गर्नुहोस्';
+$lang['btn_search']            = 'खोज्नुहोस् ';
+$lang['btn_save']              = 'वचत गर्नुहोस्';
+$lang['btn_preview']           = 'पूर्वरुप ';
+$lang['btn_top']               = 'माथि फर्कनुहोस्';
+$lang['btn_newer']             = '<< यो भन्दा पछिको';
+$lang['btn_older']             = 'यो भन्दा पहिलेको >>';
+$lang['btn_revs']              = 'पुरानो संकरण';
+$lang['btn_recent']            = 'हालैका परिवर्तनहरु ';
+$lang['btn_upload']            = 'अपलोड ';
+$lang['btn_cancel']            = 'रद्द गर्नुहोस् ';
+$lang['btn_index']             = 'सुची';
+$lang['btn_secedit']           = 'सम्पादन गर्नुहोस्';
+$lang['btn_login']             = 'प्रवेश गर्नुहोस् ';
+$lang['btn_logout']            = 'बाहिर जानुहोस् ';
+$lang['btn_admin']             = 'एड्मिन(व्यवस्थापक)';
+$lang['btn_update']            = 'अध्यावधिक गर्नुहोस्';
+$lang['btn_delete']            = 'मेटाउनुहोस् ';
+$lang['btn_back']              = 'पछाडि';
+$lang['btn_backlink']          = 'पछाडिका लिङ्कहरु ';
+$lang['btn_backtomedia']       = 'मिडिया छनौटमा फर्कनुहोस्';
+$lang['btn_subscribe']         = 'पृष्ठ परिवर्तन ग्राह्य गर्नुहोस्';
+$lang['btn_unsubscribe']       = 'पृष्ठ परिवर्तन अग्राह्य गर्नुहोस्';
+$lang['btn_subscribens']       = 'नेमस्पेस परिवर्तन ग्राह्य गर्नुहोस् ';
+$lang['btn_unsubscribens']     = 'नेमस्पेस परिवर्तन अग्राह्य गर्नुहोस् ';
+$lang['btn_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
+$lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
+$lang['btn_resendpwd']         = 'नयाँ प्रवेश शव्द(पासवर्ड) पठाउनुहोस् ';
+$lang['btn_draft']             = ' ड्राफ्ट सम्पादन गर्नुहोस् ';
+$lang['btn_recover']           = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस ';
+$lang['btn_draftdel']          = ' ड्राफ्ट मेटाउनुहोस् ';
+$lang['loggedinas']            = 'प्रवेश गर्नुहोस् ';
+$lang['user']                  = 'प्रयोगकर्ता ';
+$lang['pass']                  = 'प्रवेशशव्द';
+$lang['newpass']               = 'नयाँ प्रवेशशव्द';
+$lang['oldpass']               = 'नयाँ प्रवेशशव्द निश्चित गर्नुहोस ';
+$lang['passchk']               = 'एकपटक पुन:';
+$lang['remember']              = 'मलाई सम्झनु';
+$lang['fullname']              = 'पूरा नाम';
+$lang['email']                 = 'इमेल';
+$lang['register']              = 'दर्ता  गर्नुहोस्';
+$lang['profile']               = 'प्रयोगकर्ताको प्रोफाइल';
+$lang['badlogin']              = 'माफ गर्नुहोस् , प्रयोगकर्तानाम वा प्रवेशशव्द गलत भयो  ';
+$lang['minoredit']             = 'सामान्य परिवर्तन';
+$lang['draftdate']             = 'ड्राफ्ट स्वचालित रुपमा वचत भएको';
+$lang['nosecedit']             = 'यो पृष्ठ यसै बखतमा परिवर्तन भयो, खण्ड जानकारी अध्यावधिक हुन सकेन र पूरै पृष्ठ लोड भयो । ';
+$lang['regmissing']            = 'माफ गर्नुहोला , सबै ठाउमा भर्नुपर्नेछ ।';
+$lang['reguexists']            = 'यो नामको प्रयोगकर्ता पहिले देखि रहेको छ।';
+$lang['regsuccess']            = 'यो प्रयोगकर्ता बनाइएको छ र प्रवेशशव्द इमेलमा पठइएको छ।';
+$lang['regsuccess2']           = 'यो प्रयोगकर्ता बनाइएको छ ।';
+$lang['regmailfail']           = 'इमेलबाट प्रवेशशब्द पठउन गल्ति भयो । कृपया एड्मिन(व्यवस्थापक)लाई सम्पर्क गर्नुहोस्  !';
+$lang['regbadmail']            = 'दिएको इमेल ठेगाना गलत भए जस्तो देखिन्छ - यदि यो सहि हो भने एड्मिन(व्यवस्थापक)लाई सम्पर्क गर्नुहोस्  !';
+$lang['regbadpass']            = 'दिइएका  प्रवेशशव्दहरु मिल्दैनन् , पुन: प्रयास गर्नुहोस् ।';
+$lang['regpwmail']             = 'तपाईको DokuWiki प्रवेशशब्द ';
+$lang['reghere']               = 'तपाईको आफ्नै खाता छैन ? अहिल्यै एउटा बनाउनुहोस् ';
+$lang['profna']                = 'यो विकिले यो प्रोफाइल परिवर्तन समर्थन गर्दैन ।';
+$lang['profnochange']          = 'केहि  परिवर्तन छैन , केहि गर्नु छैन ।';
+$lang['profnoempty']           = 'खाली नाम वा इमेल ठेगानालाई अनुमति छैन ।';
+$lang['profchanged']           = 'प्रयोगकर्ताको प्रफाइल सफलरुपमा परिवर्तन भयो ।';
+$lang['pwdforget']             = 'आफ्नो पासवर्ड भुल्नु भयो ? नयाँ हासिल गर्नुहोस् ';
+$lang['resendna']              = 'यो विकिबाट प्रवेशशव्द पठाउन समर्थित छैन ।';
+$lang['resendpwd']             = 'नयाँ  प्रवेशशव्द पठाउनुहोस् ';
+$lang['resendpwdmissing']      = 'माफ गर्नुहोस् , तपाईले सबै ठाउ भर्नुपर्छ। ';
+$lang['resendpwdnouser']       = 'माफ गर्नुहोस्,  हाम्रो डेटावेसमा यो प्रयोगकर्ता भेटिएन ।';
+$lang['resendpwdbadauth']      = 'माफ गर्नुहोस् , यो अनुमति चिन्ह गलत छ। तपाईले पूरै जानकारी लिङ्क प्रयोग गर्नु पर्नेछ। ';
+$lang['resendpwdconfirm']      = 'तपाईको इमेलमा कन्फरमेशन लिङ्क पठाइएको छ। ';
+$lang['resendpwdsuccess']      = 'तपाईको प्रवेशशव्द इमेलबाट पठाइएको छ। ';
+$lang['license']               = 'खुलाइएको बाहेक, यस विकिका विषयवस्तुहरु निम्त प्रमाण द्वारा प्रमाणिक गरिएको छ।';
+$lang['licenseok']             = 'नोट: यस पृष्ठ सम्पादन गरी तपाईले आफ्नो विषयवस्तु तलको प्रमाण पत्र अन्तर्गत प्रमाणिक गर्न राजी हुनु हुनेछ ।';
+$lang['txt_upload']            = 'अपलोड गर्नलाई फाइल छा्न्नुहो्स्';
+$lang['txt_filename']          = 'अर्को रुपमा अपलोड गर्नुहोस् (ऐच्छिक)';
+$lang['txt_overwrt']           = 'रहेको उहि नामको फाइललाई मेटाउने';
+$lang['lockedby']              = 'अहिले ताल्चा लगाइएको';
+$lang['lockexpire']            = 'ताल्चा अवधि सकिने :';
+$lang['willexpire']            = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
+$lang['notsavedyet']           = 'तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।';
+$lang['rssfailed']             = 'यो फिड लिइ आउदा गल्ति भयो ।';
+$lang['nothingfound']          = 'केहि पनि भेटिएन ।';
+$lang['mediaselect']           = 'मिडिया फाइलहरू ';
+$lang['fileupload']            = 'मिडिया फाइल अपलोड ';
+$lang['uploadsucc']            = 'अपलोड सफल ';
+$lang['uploadfail']            = 'अपलोड असफल । सायद गलत अनुमति । ';
+$lang['uploadwrong']           = 'अपलोड असमर्थित । फाइल एक्सटेन्सन अमान्य।  ';
+$lang['uploadexist']           = 'फाइल पहिलेदेखि छ। केहि गरिएन ।';
+$lang['uploadbadcontent']      = 'अपलोड गरिएको वस्तु %s फाइल एक्टेन्सन अनुसार मिलेन ।';
+$lang['uploadspam']            = 'अपलोड स्प्याम कालो सुचीले रोकिएको छ। ';
+$lang['uploadxss']             = 'अपलोड सम्भवत: हानिकारक वस्तुको कारणले रोकिएको। ';
+$lang['deletesucc']            = 'फाइल  "%s"  मेटिएको छ। ';
+$lang['deletefail']            = '"%s"  मेट्न सकिएन - अनुमति हेर्नुहोस् ।';
+$lang['mediainuse']            = 'फाइल "%s" मेटिएको छैन - प्रयोगमा छ।';
+$lang['namespaces']            = 'नेमस्पेसहरु ';
+$lang['mediafiles']            = ' उपलब्ध फाइलहरु ';
+$lang['js']['keepopen']        = 'छनौटमा विन्डो खुला राख्नुहोस् ';
+$lang['js']['hidedetails']     = 'जानकारी लुकाउनु होस् ';
+$lang['js']['nosmblinks']      = 'विन्डोहरु लिङ्क गर्दा माइक्रो सफ्ट एक्सप्लोररमामात्र  काम साझा हुन्छ । तर कपि गर्न र टास्न मिल्छ।   ';
+$lang['js']['mu_btn']          = 'धेरै वटा फाइलहरु एकैपटक अपलोड गर्नुहोस् ।';
+$lang['mediausage']            = 'फाइललाई रेफरेन्स गर्न निम्न सुत्र प्रयोग गर्नुहोस् :';
+$lang['mediaview']             = 'सक्कली फाइल हेर्नुहोस् ';
+$lang['mediaroot']             = 'रुट(मूख्य प्रयोगकर्ता)';
+$lang['mediaupload']           = 'अहिलेको नेमस्पेसमा यहा अपलोड गर्नुहोस् । सबनेमस्पेसहरु बनाउन "रुपमा आपलोड" छानी फाइलहरुलाई कोलोन(:) ले छुट्टयाउनुहोस् ।';
+$lang['mediaextchange']        = 'फाइल एकस्टेन्सन .%s देखि  .%s मा परिवरतित भयो ';
+$lang['reference']             = 'रेफररेन्स ';
+$lang['ref_inuse']             = 'फाइल मेट्न मिलेन , किनभने यो निम्न पृष्ठहरुद्वारा प्रयोगमा छ। ';
+$lang['ref_hidden']            = 'केहि रेफरेन्स यस्ता पृष्ठहरुमा छन् जुन हेर्न तपाईलाई अनुमति छैन ।';
+$lang['hits']                  = 'मिलेको';
+$lang['quickhits']             = 'मिलेका पृष्ठनामहरु ';
+$lang['toc']                   = 'वस्तुहरुको सुची';
+$lang['current']               = 'हालको';
+$lang['yours']                 = 'तपाईको संस्करण';
+$lang['diff']                  = 'हालको संस्करण सँगको भिन्नता';
+$lang['diff2']                 = 'रोजिएका संस्करण वीचका भिन्नताहरु ';
+$lang['line']                  = 'हरफ';
+$lang['breadcrumb']            = 'छुट्ट्याउनुहोस् ';
+$lang['youarehere']            = 'तपाई यहा हुनुहुन्छ';
+$lang['lastmod']               = 'अन्तिम पटक सच्याइएको';
+$lang['by']                    = 'द्वारा ';
+$lang['deleted']               = 'हटाइएको';
+$lang['created']               = 'निर्माण गरिएको';
+$lang['restored']              = 'पुरानो संस्करण पुनर्‌प्रयोग गरिएको';
+$lang['external_edit']         = 'बाह्य सम्पादन';
+$lang['summary']               = 'सम्पादनको बारेमा';
+$lang['mail_newpage']          = 'थपिएको पृष्ठ';
+$lang['mail_changed']          = 'परिवर्तित पृष्ठ';
+$lang['mail_new_user']         = 'नयाँ प्रयोगकर्ता ';
+$lang['mail_upload']           = 'अपलोड गरिएको फाइल';
+$lang['qb_bold']               = 'मोटो पाठ(बोल्ड)';
+$lang['qb_italic']             = 'इटालिक पाठ';
+$lang['qb_underl']             = 'निम्न रेखांकित(अन्डरलाइन) पाठ';
+$lang['qb_code']               = 'चिन्ह(कोड) पाठ';
+$lang['qb_strike']             = 'स्ट्राइकथ्रु पाठ';
+$lang['qb_h1']                 = 'पहिलो स्तरको शिर्षक(लेभल १ हेडलाइन)';
+$lang['qb_h2']                 = 'दोस्रो स्तरको  शिर्षक(लेभल २ हेडलाइन)';
+$lang['qb_h3']                 = 'तेस्रो स्तरको  शिर्षक(लेभल ३ हेडलाइन)';
+$lang['qb_h4']                 = 'चौथो स्तरको  शिर्षक(लेभल ४ हेडलाइन)';
+$lang['qb_h5']                 = 'पाचौँ स्तरको  शिर्षक(लेभल ५ हेडलाइन)';
+$lang['qb_link']               = 'आन्तरिक लिङ्क ';
+$lang['qb_extlink']            = 'वाह्य लिङ्क';
+$lang['qb_hr']                 = 'क्षितिज (होरिजोन्टल) रुल';
+$lang['qb_ol']                 = 'मिलाइएको सुची';
+$lang['qb_ul']                 = 'नमिलाइएको सुची';
+$lang['qb_media']              = 'तस्विर र अरु फाइलहरु थप्नुहोस्';
+$lang['qb_sig']                = 'हस्ताक्षर थप्नुहोस् ';
+$lang['qb_smileys']            = 'स्माइलीहरु ';
+$lang['qb_chars']              = 'विशेष वर्णहरु ';
+$lang['js']['del_confirm']           = 'साच्चै छानिएका वस्तुहरु मेट्ने हो ?';
+$lang['admin_register']        = 'नयाँ प्रयोगकर्ता थप्नुहोस् ';
+$lang['metaedit']              = 'मेटाडेटा सम्पादन गर्नुहोस्';
+$lang['metasaveerr']           = 'मेटाडाटा लेखन असफल';
+$lang['metasaveok']            = 'मेटाडाटा वचत भयो ';
+$lang['img_backto']            = 'फिर्ता';
+$lang['img_title']             = 'शिर्षक';
+$lang['img_caption']           = 'निम्न लेख';
+$lang['img_date']              = 'मिति';
+$lang['img_fname']             = 'फाइलनाम';
+$lang['img_fsize']             = 'आकार';
+$lang['img_artist']            = 'चित्रकार';
+$lang['img_copyr']             = 'सर्वाधिकार';
+$lang['img_format']            = 'ढाचा';
+$lang['img_camera']            = 'क्यामेरा';
+$lang['img_keywords']          = 'खोज शब्द';
+$lang['subscribe_success']     = '%s ,%s को ग्राह्यताको लागि थपियो  ';
+$lang['subscribe_error']       = '%s ,%s को ग्राह्यताको लागि थपिदा त्रुटि';
+$lang['subscribe_noaddress']   = 'तपाईको खातासँग कुनै पनि ठेगाना संबन्धित छैन , तपाईलाई  ग्रहाक सुचीमा राखन मिलेन।';
+$lang['unsubscribe_success']   = '%s लाई %s को ग्रहाक सुचीबाट हटाइयो';
+$lang['unsubscribe_error']     = '%s लाई %s को ग्राहक सुचीबाट हटाउदा त्रुटि';
+$lang['authmodfailed']         = 'खराब प्रयोगकर्ता प्रामाणिकरण विधि ।तपाईको विकी एड्मिनलाई खवर गर्नुहोस् ।';
+$lang['authtempfail']          = 'प्रयोगकर्ता प्रामाणिकरण अस्थाइरुपमा अनुपलब्ध छ। यदि यो समस्या रहि रहेमा तपाईको  विकि एड्मिनलाई खवर गर्नुहोला ।';
+$lang['i_chooselang']          = 'भाषा छान्नुहोस् ';
+$lang['i_installer']           = 'DokuWiki  स्थापक';
+$lang['i_wikiname']            = 'विकी नाम';
+$lang['i_enableacl']           = 'ACL लागु गर्नुहोस्( सिफारिस गरिएको)';
+$lang['i_superuser']           = 'मूख्य प्रयोगकर्ता';
+$lang['i_problems']            = 'स्थापकले तल देखाइएको त्रुटि फेला पार्‌यो ।तपाईले  यो त्रुटि नसच्याए सम्म अगि बढ्न सक्नुहुने छैन।';
+$lang['i_modified']            = 'सुरक्षाको कारणले यो स्क्रिप्ट नया तथा नसच्याइएको Dokuwiki स्थापनामा  मात्र काम गर्छ।  तपाईले कि डाउनलोड गर्नुभएको प्याकेज पुन: खोल्नुहोस्  कि <a href="http://dokuwiki.org/install">Dokuwiki स्थापना विधि</a>';
+$lang['i_funcna']              = 'PHP function <code>%s</code> उपलव्ध छैन । हुनसक्छ तपाईको होस्टिङ्ग प्रदायकले कुनै कारण वश यसलाई वन्द गरिदिएका हुनसक्छन् । ';
+$lang['i_phpver']              = 'तपाईको PHP संस्करण <code>%s</code> चाहिएको <code>%s</code> भन्दा कम छ। तपाईले आफ्नो PHP स्थापना अध्यावधिक गर्नुपर्छ ।';
+$lang['i_permfail']            = '<code>%s</code> DokuWiki द्वारा लेख्य छैन । तपाईले डाइरेक्टरीको अनुमति परिवर्तन गर्नुपर्छ !';
+$lang['i_confexists']          = '<code>%s</code> पहिले देखि नै रहेको छ।';
+$lang['i_writeerr']            = '<code>%s</code> बनाउन असमर्थ । तपाईले डाइरेक्टरी / फाइल अनुमति जाच्नु पर्छ र फाइल आफैले बनाउनु पर्छ ।';
+$lang['i_badhash']             = 'पहिचान हुन नसकेको वा परिवर्तित  okuwiki.php (hash=code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - अवैध वा रित्तो मान ';
+$lang['i_success']             = 'स्थापना सफलरुपमा समाप्त भयो ।तपाई install.php मेट्न सक्नुहु्न्छ । <a href="doku.php">तपाईको नयाँ DokuWiki</a> निरन्तर गर्न सक्नुहुन्छ ।';
+$lang['i_failure']             = 'स्थापना समयमा केहि त्रुटि फेला पर्यो ।तपाईले आफैले यसलाई <a href="doku.php">तपाईको नयाँ DokuWiki</a> प्रयोग गर्नु अगि	सच्याउनुपर्ने  हुन्छ ।';
+$lang['i_policy']              = 'सुरुको ACL निति';
+$lang['i_pol0']                = 'खुल्ला विकि (पठन, लेखन , अपलोड ) सबैका लागि';
+$lang['i_pol1']                = 'Public विकि (पठन सवैका लागि,लेखन र अपलोड दर्ता गरिएका प्रयपगकर्ताका लागि ) ';
+$lang['i_pol2']                = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।';
+$lang['i_retry']               = 'पुन: प्रयास गर्नुहोस् ';
+$lang['mu_intro']              = 'तपाईले धेरै वटा फाइलहरु एकै पटक अपलोड गर्न सक्नुहुन्छ । browse थिच्नुहोस् अनि सुचीमा थप्नुहोस् । सकिएपछि अपलोड थिछ्चुहोस् ।';
+$lang['mu_gridname']           = 'फाइलनाम ';
+$lang['mu_gridsize']           = 'आकार';
+$lang['mu_gridstat']           = 'स्थिति';
+$lang['mu_namespace']          = 'नेमस्पेस';
+$lang['mu_browse']             = 'Browse';
+$lang['mu_toobig']             = 'धेरै ठूलो';
+$lang['mu_ready']              = 'अपलोडको लागि तयार';
+$lang['mu_done']               = 'पूरा';
+$lang['mu_fail']               = 'असफल';
+$lang['mu_authfail']           = 'सत्र सकियो ';
+$lang['mu_progress']           = '@PCT@% अपलोड भयो ';
+$lang['mu_filetypes']          = 'समर्थित फाइल प्रकार';
+$lang['recent_global']         = 'तपाई अहिले <b>%s</b> नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई <a href="%s">पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/locked.txt
new file mode 100644
index 000000000..85f5390a0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/locked.txt
@@ -0,0 +1,3 @@
+====== पृष्ठमा ताला लगाएको छ ======
+
+यो पृष्ठ अर्को प्रयोगकर्ताद्वारा सम्पादनका लागि ताला लगाइएको छ । तपाईले सम्पादन समाप्त नहुन्जेल या तालाको समय समाप्त नहुन्जेल सम्म प्रतिक्षागर्नु पर्छ ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/norev.txt
new file mode 100644
index 000000000..28c4efb66
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/norev.txt
@@ -0,0 +1,2 @@
+====== कुनै त्यस्तो पुन:संस्करण भेटिएन ======
+खुलाइएको पुन:संस्करण अस्तित्वमा छैन ।यस कागजातको सम्पूर्ण संस्करणको  सुचीको लागि  "पुरानो पुन:संस्करण" बटन प्रयोग  गर्नुहोस् ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/pwconfirm.txt
new file mode 100644
index 000000000..1d8cd9fd6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/pwconfirm.txt
@@ -0,0 +1,12 @@
+नमस्कार @FULLNAME@!
+
+कसैद्वारा तपाईको @TITLE@ को लागि नयाँ प्रवेशशब्द माग भएको छ ।@DOKUWIKIURL@मा प्रवेश  ।
+
+यदि तपाईले नयाँ प्रवेशशब्दको माग गर्नुभएको हैन भने यस इमेललाई वेवास्ता गर्न सक्नुहुन्छ ।
+
+कृपया तपाईको माग साच्चै पठाइएको थियो भन्ने   यकिन गराउनाको लागि तलाको लिङ्कमा प्रयोग गर्नुहोस्  ।
+
+@CONFIRM@
+
+-- 
+यो पत्र DokuWiki ले  @DOKUWIKIURL@ मा तयार पारेको हो ।
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/read.txt
new file mode 100644
index 000000000..e004cd39b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/read.txt
@@ -0,0 +1 @@
+यो पृष्ठ पढ्नको लागि मात्र हो । तपाई स्रोतहेर्न सक्नुहुन्छ ,तर सम्पादन भने गर्न सक्नुहुन्न । तपाईको व्यवस्थापक(administrator) सँग के समस्या छ भनेर सोध्नु होला ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/recent.txt
new file mode 100644
index 000000000..239903fd7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/recent.txt
@@ -0,0 +1,2 @@
+====== हालैको परिवर्तन ======
+निम्न पृष्ठहरु हालै परिवर्तन गरिएका छन् ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/resendpwd.txt
new file mode 100644
index 000000000..aec9dfb95
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/resendpwd.txt
@@ -0,0 +1,3 @@
+====== नयाँ प्रवेशशब्द पठाउनुहोस् ======
+
+कृपया तपाईको यस विकीमा रहेको खाताको लाहि नयाँ प्रवेशशव्द अनुरोध गर्न तपाईँको नाम निम्न फर्ममा प्रविष्ट गर्नुहोस । एउटा किटानी लिङ्क तपाईले दर्ता गर्नु भएको इमेल ठेगानामा पठाइने छ ।  
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/searchpage.txt
new file mode 100644
index 000000000..a8139f0ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/searchpage.txt
@@ -0,0 +1,3 @@
+====== खोज ======
+तपाईले आफ्नो खोजको निम्न नतिजा  पाउन सक्नुहुन्छ। यदि तपाईले आफुले खोजेको पाउनुभएन भने, तपाईलेको उपयुक्त बटन प्रयोग गरी खोज सँग सम्बन्धित शिर्षकहरु भएका पृष्ठ सृजना या सम्पादन गर्न सक्नुहुन्छ ।
+===== नतिजा =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/showrev.txt
new file mode 100644
index 000000000..5b22e9737
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/showrev.txt
@@ -0,0 +1,2 @@
+** यो कागजातको पुरानो पुन:संस्करण हो !**
+---
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/subscribermail.txt
new file mode 100644
index 000000000..413c79c67
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/subscribermail.txt
@@ -0,0 +1,19 @@
+नमस्कार !
+@TITLE@ शिर्षक रहेको यो पृष्ठ @PAGE@ परिवर्तन भएको छ ।
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+मिति : @DATE@
+प्रयोगकर्ता : @USER@
+सम्पादन सारांस: @SUMMARY@
+पुरानो संस्करण  : @OLDPAGE@
+नविन संस्करण: @NEWPAGE@
+
+यस्ता जानकारीहरु रद्द गर्नको लागि
+@DOKUWIKIURL@ मा प्रवेश गरी
+@NEWPAGE@ अवलोकन पश्चात
+पृष्ठ या नेमस्पेस परिवर्तन जानकारी ग्राह्यता बदर गर्नुहो
+
+-- 
+यो पत्र  DokuWiki ले
+@DOKUWIKIURL@ मा स्वत: बनाएको हो ।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/updateprofile.txt
new file mode 100644
index 000000000..e3027e429
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/updateprofile.txt
@@ -0,0 +1,3 @@
+‌‌‍‍‍======तपाईँको खाताको जानकारी अद्यावधिक गर्नुहोस्======
+
+तपाईँले आफूले परिवर्तन गर्न चाहेको फिल्ड मात्र परिवर्तन गरे पुग्छ । तपाईँले आफ्नो प्रयोगकर्ता नाम परिवर्तन गर्न पाउनुहुने छैन ।
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/uploadmail.txt
new file mode 100644
index 000000000..74ea46407
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ne/uploadmail.txt
@@ -0,0 +1,13 @@
+एउटा फाइल तपाईको DokuWiki मा भरण गरिएको छ। थप जानकारी निम्न रहेका छन् :
+फाइल : @MEDIA@
+मिति : @DATE@
+ब्राउजर : @BROWSER@
+आइपि ठगाना  : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+आकार : @SIZE@
+MIME प्रकार : @MIME@
+प्रयोगकर्ता : @USER@
+
+-- 
+यो पत्र  DokuWiki  ले
+@DOKUWIKIURL@मा स्वत: तयार पारेको हो।
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/admin.txt
new file mode 100644
index 000000000..7138456f1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/admin.txt
@@ -0,0 +1,3 @@
+====== Beheer ======
+
+Hieronder zie je een lijst van beheertaken beschikbaar in DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/adminplugins.txt
new file mode 100644
index 000000000..916a9ca9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/adminplugins.txt
@@ -0,0 +1 @@
+===== Additionele plugins =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/backlinks.txt
new file mode 100644
index 000000000..6edbf4021
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+Dit is een lijst van pagina's die terug lijken te wijzen naar de huidige pagina.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/conflict.txt
new file mode 100644
index 000000000..926214517
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/conflict.txt
@@ -0,0 +1,5 @@
+====== Er bestaat een nieuwere versie ======
+
+Er bestaat een nieuwere versie van het document dat aangepast wordt. Dit komt voor als een andere gebruiker dit document tegelijk met jou wijzigt.
+
+Bekijk de verschillen die beneden weergegeven worden uitvoerig, beslis dan welke versie de beste is en dus bewaard moet worden. Klik op ''opslaan'' om de eigen versie te bewaren. Klik op ''annuleren'' om de huidige versie te bewaren.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/denied.txt
new file mode 100644
index 000000000..6a8bf773f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/denied.txt
@@ -0,0 +1,3 @@
+====== Toegang geweigerd ======
+
+Sorry: je hebt niet voldoende rechten om verder te gaan. Misschien ben je vergeten in te loggen?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/diff.txt
new file mode 100644
index 000000000..ef5a1b189
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/diff.txt
@@ -0,0 +1,3 @@
+====== Verschillen ======
+
+Dit geeft de verschillen weer tussen de geselecteerde revisie en de huidige revisie van de pagina.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/draft.txt
new file mode 100644
index 000000000..a6bf5275d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/draft.txt
@@ -0,0 +1,5 @@
+===== Conceptbestand gevonden =====
+
+Je laatste bewerking op deze pagina is niet volledig afgerond. DokuWiki heeft automatisch een concept van je werk opgeslagen waarmee je nu verder kunt gaan. Hieronder tref je het concept aan.
+
+Beslis of je het concept wilt //herstellen//, //verwijderen// of het bewerken wilt //annuleren//.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/edit.txt
new file mode 100644
index 000000000..e539050bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/edit.txt
@@ -0,0 +1 @@
+Pas de pagina aan en klik op ''Opslaan''. Zie [[wiki:syntax]] voor de Wiki syntax. Pas  de pagina allen aan als hij **verbeterd** kan worden. Als je iets wilt uitproberen kun je spelen in de  [[playground:playground|zandbak]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/editrev.txt
new file mode 100644
index 000000000..1b2d130c7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/editrev.txt
@@ -0,0 +1,2 @@
+**Er is een oude revisie van het document geladen!** Als je nu opslaat bewaar je een nieuwe versie met deze inhoud.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/index.txt
new file mode 100644
index 000000000..288957ed4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Dit is een index van alle beschikbare pagina's gesorteerd op [[doku>wiki:namespaces|namespaces]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/install.html
new file mode 100644
index 000000000..8ddec7aab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/install.html
@@ -0,0 +1,14 @@
+<p>Deze pagina helpt u bij de eerste installatie en configuratie van <a href="http://wiki.splitbrain.org">Dokuwiki</a>. 
+Meer informatie over deze installer is beschikbaar op zijn eigen <a href="http://wiki.splitbrain.org/wiki:installer">documentatiepagina</a>.</p>
+
+<p>DokuWiki gebruikt platte tekstbestanden voor het opslaan van wikipagina's en andere informatie die bij deze pagina's horen (bijvoorbeeld plaatjes, zoek-indexen, oude revisies enz.). Om goed te kunnen functioneren, <strong>moet</strong>
+DokuWiki schrijftoegang hebben tot de directories die deze bestanden bevatten.
+De installer kan zelf deze toegangspermissies niet regelen. Dit moet normaal gesproken direct in de command shell worden ingevoerd, of in het geval van hosting via FTP of via uw hosting control panel (bijvoorbeeld cPanel).</p>
+
+<p>Deze installer zal uw DokuWiki configureren voor <acronym title="access control list">ACL</acronym>, 
+wat de beheerder in staat stelt in te loggen en toegang te verkrijgen tot het beheersdeel van de DokuWiki voor het installeren van plugins, beheren van gebruikers, toegangsrechten tot wiki pagina's en veranderen van configuratie-instellingen.
+Het is niet noodzakelijk voor DokuWiki om te functioneren maar het maakt het een stuk makkelijker om Dokuwiki te beheren.</p>
+
+<p>Ervaren gebruikers of gebruikers die een aangepaste configuratie nodig hebben kunnen voor details terecht op de volgende pagina's:
+<a href="http://wiki.splitbrain.org/wiki:install">installatie-instructies</a>
+en <a href="http://wiki.splitbrain.org/wiki:config">configuratie-instellingen</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/lang.php
new file mode 100644
index 000000000..782a76758
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/lang.php
@@ -0,0 +1,253 @@
+<?php
+/**
+ * dutch language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author François Kooman <fkooman.tuxed.net>
+ * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
+ * @author Riny Heijdendael <riny@heijdendael.nl>
+ * @author Koen Huybrechts <huybkoen@gmail.com>
+ * @author Wouter Schoot <wouter@schoot.org>
+ * @author John de Graaff <john@de-graaff.net>
+ * @author Dion Nicolaas <dion@nicolaas.net>
+ * @author Danny Rotsaert <danny.rotsaert@edpnet.be>
+ * @author Marijn Hofstra hofstra.m@gmail.com
+ * @author Matthias Carchon webmaster@c-mattic.be
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Pagina aanpassen';
+$lang['btn_source']            = 'Toon broncode';
+$lang['btn_show']              = 'Toon pagina';
+$lang['btn_create']            = 'Maak deze pagina aan';
+$lang['btn_search']            = 'Zoeken';
+$lang['btn_save']              = 'Opslaan';
+$lang['btn_preview']           = 'Voorbeeld';
+$lang['btn_top']               = 'Terug naar boven';
+$lang['btn_newer']             = '<< recenter';
+$lang['btn_older']             = 'ouder >>';
+$lang['btn_revs']              = 'Oude revisies';
+$lang['btn_recent']            = 'Recente aanpassingen';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Annuleren';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Aanpassen';
+$lang['btn_login']             = 'Inloggen';
+$lang['btn_logout']            = 'Uitloggen';
+$lang['btn_admin']             = 'Beheer';
+$lang['btn_update']            = 'Bijwerken';
+$lang['btn_delete']            = 'Verwijder';
+$lang['btn_back']              = 'Terug';
+$lang['btn_backlink']          = 'Referenties';
+$lang['btn_backtomedia']       = 'Terug naar Bestandsselectie';
+$lang['btn_subscribe']         = 'Inschrijven wijzigingen';
+$lang['btn_unsubscribe']       = 'Opzeggen wijzigingen';
+$lang['btn_subscribens']       = 'Inschrijven namespace-wijzigingen';
+$lang['btn_unsubscribens']     = 'Opzeggen namespace-wijzigingen';
+$lang['btn_profile']           = 'Profiel aanpassen';
+$lang['btn_reset']             = 'Wissen';
+$lang['btn_resendpwd']         = 'Stuur een nieuw wachtwoord';
+$lang['btn_draft']             = 'Bewerk concept';
+$lang['btn_recover']           = 'Herstel concept';
+$lang['btn_draftdel']          = 'Verwijder concept';
+$lang['btn_revert']            = 'Herstellen';
+$lang['loggedinas']            = 'Ingelogd als';
+$lang['user']                  = 'Gebruikersnaam';
+$lang['pass']                  = 'Wachtwoord';
+$lang['newpass']               = 'Nieuw wachtwoord';
+$lang['oldpass']               = 'Bevestig huidig wachtwoord';
+$lang['passchk']               = 'nogmaals';
+$lang['remember']              = 'Bewaar';
+$lang['fullname']              = 'Volledige naam';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Registreren';
+$lang['profile']               = 'Gebruikersprofiel';
+$lang['badlogin']              = 'Sorry, gebruikersnaam of wachtwoord onjuist';
+$lang['minoredit']             = 'Kleine wijziging';
+$lang['draftdate']             = 'Concept automatisch opgeslagen op';
+$lang['nosecedit']             = 'De pagina is tussentijds veranderd, sectie-informatie was verouderd, volledige pagina geladen.';
+$lang['regmissing']            = 'Vul alle velden in';
+$lang['reguexists']            = 'Er bestaat al een gebruiker met deze loginnaam.';
+$lang['regsuccess']            = 'De gebruiker is aangemaakt. Het wachtwoord is per e-mail verzonden.';
+$lang['regsuccess2']           = 'De gebruiker is aangemaakt.';
+$lang['regmailfail']           = 'Het lijkt erop dat het sturen van de wachtwoordmail mislukt is. Neem contact op met de beheerder!';
+$lang['regbadmail']            = 'Het opgegeven e-mailadres lijkt ongeldig - als je denkt dat dit niet klopt neem dan contact op met de beheerder.';
+$lang['regbadpass']            = 'De twee ingevoerde wachtwoorden zijn niet identiek. Probeer het nog eens.';
+$lang['regpwmail']             = 'Je DokuWiki wachtwoord';
+$lang['reghere']               = 'Je hebt nog geen account? Vraag er eentje aan';
+$lang['profna']                = 'Deze wiki ondersteunt geen profielwijzigingen';
+$lang['profnochange']          = 'Geen wijzigingen, niets gedaan';
+$lang['profnoempty']           = 'Een lege gebruikersnaam of e-mailadres is niet toegestaan';
+$lang['profchanged']           = 'Gebruikersprofiel succesvol aangepast';
+$lang['pwdforget']             = 'Je wachtwoord vergeten? Vraag een nieuw wachtwoord aan';
+$lang['resendna']              = 'Deze wiki ondersteunt het verzenden van wachtwoorden niet';
+$lang['resendpwd']             = 'Stuur een nieuw wachtwoord voor';
+$lang['resendpwdmissing']      = 'Sorry, je moet alle velden invullen.';
+$lang['resendpwdnouser']       = 'Sorry, we kunnen deze gebruikersnaam niet vinden in onze database.';
+$lang['resendpwdbadauth']      = 'Sorry, deze authentiecatiecode is niet geldig. Controleer of je de volledige bevestigings-link hebt gebruikt.';
+$lang['resendpwdconfirm']      = 'Een bevestigingslink is per e-mail verzonden.';
+$lang['resendpwdsuccess']      = 'Je nieuwe wachtwoord is per e-mail verzonden.';
+$lang['license']               = 'Tenzij anders vermeld valt de inhoud van deze wiki onder de volgende licentie:';
+$lang['licenseok']             = 'Let op: Door deze pagina aan te passen geef je de inhoud vrij onder de volgende licentie:';
+$lang['searchmedia']           = 'Bestandsnaam zoeken:';
+$lang['searchmedia_in']        = 'Zoek in %s';
+$lang['txt_upload']            = 'Selecteer een bestand om te uploaden';
+$lang['txt_filename']          = 'Vul nieuwe naam in (optioneel)';
+$lang['txt_overwrt']           = 'Overschrijf bestaand bestand';
+$lang['lockedby']              = 'Momenteel in gebruik door';
+$lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
+$lang['willexpire']            = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
+$lang['notsavedyet']           = 'Nog niet bewaarde wijzigingen zullen verloren gaan.\nWeet je zeker dat je wilt doorgaan?';
+$lang['rssfailed']             = 'Er is een fout opgetreden bij het ophalen van de feed: ';
+$lang['nothingfound']          = 'Er werd niets gevonden.';
+$lang['mediaselect']           = 'Bestandsselectie';
+$lang['fileupload']            = 'Bestandsupload';
+$lang['uploadsucc']            = 'Upload geslaagd';
+$lang['uploadfail']            = 'Upload mislukt. Misschien verkeerde permissies?';
+$lang['uploadwrong']           = 'Upload mislukt. Deze bestandsextensie is verboden!';
+$lang['uploadexist']           = 'Bestand bestaat reeds. Er is niets gewijzigd.';
+$lang['uploadbadcontent']      = 'Het geüploade bestand heeft niet de bestandsextensie %s.';
+$lang['uploadspam']            = 'De upload is geblokkeerd door de spam blacklist.';
+$lang['uploadxss']             = 'De upload is geblokkeerd wegens mogelijk onveilige inhoud.';
+$lang['uploadsize']            = 'Het geüploade bestand is te groot. (max. %s)';
+$lang['deletesucc']            = 'Het bestand "%s" is verwijderd.';
+$lang['deletefail']            = '"%s" kan niet worden verwijderd - controleer permissies.';
+$lang['mediainuse']            = 'Het bestand "%s" is niet verwijderd - het is nog in gebruik.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Beschikbare bestanden in';
+$lang['js']['searchmedia']     = 'Zoek naar bestanden';
+$lang['js']['keepopen']        = 'Houd scherm open bij selectie';
+$lang['js']['hidedetails']     = 'Verberg details';
+$lang['js']['nosmblinks']      = 'Linken naar Windows shares werkt alleen in Microsoft Internet Explorer.
+Je kan de link wel kopiëren en plakken.';
+$lang['js']['linkwiz']         = 'Linkwizard';
+$lang['js']['linkto']          = 'Link naar:';
+$lang['js']['del_confirm']     = 'Item(s) verwijderen?';
+$lang['js']['mu_btn']          = 'Meerdere files tegelijk uploaden';
+$lang['mediausage']            = 'Gebruik de volgende syntax om aan het bestand te refereren:';
+$lang['mediaview']             = 'Bekijk het orginele bestand';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload een bestand naar de huidige namespace. Om een subnamespace aan te maken, laat je die voorafgaan aan de bestandsnaam bij "Upload als", gescheiden door een dubbele punt.';
+$lang['mediaextchange']        = 'Bestandsextensie veranderd van .%s naar .%s!';
+$lang['reference']             = 'Referenties voor';
+$lang['ref_inuse']             = 'Het bestand kan niet worden verwijderd omdat het nog in gebruik is op de volgende pagina\'s:';
+$lang['ref_hidden']            = 'Enkele referenties staan op pagina\'s waarvoor je geen leesrechten hebt';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Overeenkomende paginanamen';
+$lang['toc']                   = 'Inhoud';
+$lang['current']               = 'huidige';
+$lang['yours']                 = 'Jouw versie';
+$lang['diff']                  = 'Toon verschillen met huidige revisie';
+$lang['diff2']                 = 'Toon verschillen tussen geselecteerde revisies';
+$lang['line']                  = 'Regel';
+$lang['breadcrumb']            = 'Spoor';
+$lang['youarehere']            = 'Je bent hier';
+$lang['lastmod']               = 'Laatst gewijzigd';
+$lang['by']                    = 'door';
+$lang['deleted']               = 'verwijderd';
+$lang['created']               = 'aangemaakt';
+$lang['restored']              = 'oude revisie hersteld';
+$lang['external_edit']         = 'Externe bewerking';
+$lang['summary']               = 'Samenvatting wijziging';
+$lang['noflash']               = 'De <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> is vereist om de pagina te kunnen weergeven.';
+$lang['download']              = 'Download fragment';
+$lang['mail_newpage']          = 'pagina toegevoegd:';
+$lang['mail_changed']          = 'pagina aangepast:';
+$lang['mail_new_user']         = 'nieuwe gebruiker:';
+$lang['mail_upload']           = 'bestand geüpload:';
+$lang['qb_bold']               = 'Vette tekst';
+$lang['qb_italic']             = 'Cursieve tekst';
+$lang['qb_underl']             = 'Onderstreepte tekst';
+$lang['qb_code']               = 'Code tekst';
+$lang['qb_strike']             = 'Doorgestreepte tekst';
+$lang['qb_h1']                 = 'Niveau 1 kop';
+$lang['qb_h2']                 = 'Niveau 2 kop';
+$lang['qb_h3']                 = 'Niveau 3 kop';
+$lang['qb_h4']                 = 'Niveau 4 kop';
+$lang['qb_h5']                 = 'Niveau 5 kop';
+$lang['qb_h']                  = 'Koptekst';
+$lang['qb_hs']                 = 'Kies koptekst';
+$lang['qb_hplus']              = 'Hogere koptekst';
+$lang['qb_hminus']             = 'Lagere koptekst';
+$lang['qb_hequal']             = 'Koptekst op zelfde niveau';
+$lang['qb_link']               = 'Interne link';
+$lang['qb_extlink']            = 'Externe link';
+$lang['qb_hr']                 = 'Horizontale lijn';
+$lang['qb_ol']                 = 'Geordende lijst';
+$lang['qb_ul']                 = 'Ongeordende lijst';
+$lang['qb_media']              = 'Voeg plaatjes en andere bestanden toe';
+$lang['qb_sig']                = 'Handtekening invoegen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Speciale tekens';
+$lang['upperns']               = 'Spring naar bovenliggende namespace';
+$lang['admin_register']        = 'Nieuwe gebruiker toevoegen';
+$lang['metaedit']              = 'Metadata wijzigen';
+$lang['metasaveerr']           = 'Schrijven van metadata mislukt';
+$lang['metasaveok']            = 'Metadata bewaard';
+$lang['img_backto']            = 'Terug naar';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Bijschrift';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Bestandsnaam';
+$lang['img_fsize']             = 'Grootte';
+$lang['img_artist']            = 'Fotograaf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formaat';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Trefwoorden';
+$lang['subscribe_success']     = '%s toegevoegd aan de lijst voor %s';
+$lang['subscribe_error']       = 'Fout bij toevoegen van %s aan de lijst voor %s';
+$lang['subscribe_noaddress']   = 'Er is geen adres dat overeenkomt met je login, je kan niet toegevoegd worden aan de lijst';
+$lang['unsubscribe_success']   = '%s verwijderd van de lijst voor %s';
+$lang['unsubscribe_error']     = 'Fout bij verwijderen van %s van de lijst voor %s';
+$lang['authmodfailed']         = 'Ongeldige gebruikersauthenticatie-configuratie. Informeer de wikibeheerder.';
+$lang['authtempfail']          = 'Gebruikersauthenticatie is tijdelijk niet beschikbaar. Als deze situatie zich blijft voordoen, informeer dan de wikibeheerder.';
+$lang['i_chooselang']          = 'Kies je taal';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wikinaam';
+$lang['i_enableacl']           = 'ACLs inschakelen (aanbevolen)';
+$lang['i_superuser']           = 'Superuser';
+$lang['i_problems']            = 'De installer vond problemen, hieronder aangegeven. Verhelp deze voor je doorgaat.';
+$lang['i_modified']            = 'Uit veiligheidsoverwegingen werkt dit script alleen met nieuwe en onveranderde DokuWiki-installaties. Pak de bestanden opnieuw uit of raadpleeg de <a href="http://wiki.splitbrain.org/wiki:install">Dokuwiki installatie-instructies</a>';
+$lang['i_funcna']              = 'PHP functie <code>%s</code> is niet beschikbaar. Wellicht heeft je hosting provider deze uitgeschakeld?';
+$lang['i_phpver']              = 'PHP-versie <code>%s</code> is lager dan de vereiste <code>%s</code>. Upgrade PHP.';
+$lang['i_permfail']            = '<code>%s</code> is niet schrijfbaar voor DokuWiki. Pas de permissie-instellingen van deze directory aan.';
+$lang['i_confexists']          = '<code>%s</code> bestaat reeds';
+$lang['i_writeerr']            = 'Niet mogelijk om <code>%s</code> aan te maken. Controleer de directory/bestandspermissies en maak het bestand handmatig aan.';
+$lang['i_badhash']             = 'Onbekende of aangepaste dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - onjuiste of lege waarde';
+$lang['i_success']             = 'De configuratie is succesvol afgerond. Je kunt nu het bestand install.php verwijderen. Ga naar <a href="doku.php">je nieuwe DokuWiki</a>.';
+$lang['i_failure']             = 'Fouten deden zich voor tijdens het schrijven naar de configuratiebestanden. Pas deze aan voor je gebruik kunt maken van <a href="doku.php">je nieuwe DokuWiki</a>.';
+$lang['i_policy']              = 'Initieel ACL-beleid';
+$lang['i_pol0']                = 'Open wiki (lezen, schrijven, uploaden voor iedereen)';
+$lang['i_pol1']                = 'Publieke wiki (lezen voor iedereen, schrijven en uploaden voor geregistreerde gebruikers)';
+$lang['i_pol2']                = 'Besloten wiki (lezen, schrijven en uploaden alleen voor geregistreerde gebruikers)';
+$lang['i_retry']               = 'Opnieuw';
+$lang['mu_intro']              = 'Hiier kun je meerdere bestanden tegelijk uploaden. Klik de blader-knop om ze aan de lijst toe te voegen. Klik Upload als je klaar bent.';
+$lang['mu_gridname']           = 'Bestandsnaam';
+$lang['mu_gridsize']           = 'Grootte';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namespace';
+$lang['mu_browse']             = 'Blader';
+$lang['mu_toobig']             = 'te groot';
+$lang['mu_ready']              = 'Klaar om te uploaden';
+$lang['mu_done']               = 'klaar';
+$lang['mu_fail']               = 'mislukt';
+$lang['mu_authfail']           = 'sessie beëindigd';
+$lang['mu_progress']           = '@PCT@% geüpload';
+$lang['mu_filetypes']          = 'Toegestane bestandstypes';
+$lang['mu_info']               = 'bestanden geüpload.';
+$lang['mu_lasterr']            = 'Laatste foutmelding:';
+$lang['recent_global']         = 'Je bekijkt momenteel de wijzigingen binnen de <b>%s</b> namespace. Je kunt ook de <a href="%s">recente wijzigingen van de hele wiki</a> bekijken.';
+$lang['years']                 = '%d jaar geleden';
+$lang['months']                = '%d maand geleden';
+$lang['weeks']                 = '%d weken geleden';
+$lang['days']                  = '%d dagen geleden';
+$lang['hours']                 = '%d uren geleden';
+$lang['minutes']               = '%d minuten geleden';
+$lang['seconds']               = '%d seconden geleden';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/locked.txt
new file mode 100644
index 000000000..878fb375c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina in exclusief gebruik ======
+
+Deze pagina wordt momenteel aangepast door een andere gebruiker. Wacht tot deze gebruiker klaar is met aanpassen of totdat het gebruiksrecht vervalt.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/login.txt
new file mode 100644
index 000000000..699cbf8fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+Je bent op dit moment niet ingelogd! Voer je login-gegevens hieronder in om in te loggen. Je browser moet cookies accepteren om in te kunnen loggen.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/mailtext.txt
new file mode 100644
index 000000000..dbe35c519
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/mailtext.txt
@@ -0,0 +1,17 @@
+Er is een pagina in je DokuWiki toegevoegd of gewijzigd. Hier zijn de details
+
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-Adres      : @IPADDRESS@
+Hostname      : @HOSTNAME@
+Oude revisie  : @OLDPAGE@
+Nieuwe revisie: @NEWPAGE@
+Samenvatting  : @SUMMARY@
+User          : @USER@
+
+@DIFF@
+
+
+-- 
+Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/newpage.txt
new file mode 100644
index 000000000..0e4b95ec0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/newpage.txt
@@ -0,0 +1,3 @@
+====== Dit onderwerp bestaat nog niet ======
+
+De pagina over dit onderwerp bestaat nog niet. Aanmaken kan door op de ''Maak deze pagina aan'' te klikken.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/norev.txt
new file mode 100644
index 000000000..849fc5138
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/norev.txt
@@ -0,0 +1,4 @@
+====== Revisie bestaat niet ======
+
+De opgegeven revisie bestaat niet. Klik op ''Oude revisies'' voor een lijst van oude revisies van dit document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/preview.txt
new file mode 100644
index 000000000..4d2927aff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+Dit is een preview van de tekst zoals hij er uit komt te zien. Let op: het is nog **niet opgeslagen!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/pwconfirm.txt
new file mode 100644
index 000000000..ab72ae7c4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/pwconfirm.txt
@@ -0,0 +1,13 @@
+Beste @FULLNAME@!
+
+Iemand heeft een nieuw wachtwoord aangevraagd voor je @TITLE@ login op @DOKUWIKIURL@
+
+Als je geen nieuw wachtwoord hebt aangevraagd kun je deze e-mail negeren.
+
+Volg de volgende link om te bevestigen dat je inderdaad een nieuw wachtwoord wilt:
+
+@CONFIRM@
+
+-- 
+Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/read.txt
new file mode 100644
index 000000000..fcb791811
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/read.txt
@@ -0,0 +1,2 @@
+Deze pagina is niet beschrijfbaar. Je kan de broncode bekijken maar niks veranderen. Neem contact op met de beheerder als je denkt dat dit niet klopt.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/recent.txt
new file mode 100644
index 000000000..4b507f2ca
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/recent.txt
@@ -0,0 +1,3 @@
+====== Recente wijzigingen ======
+
+De volgende pagina's zijn recent aangepast.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/register.txt
new file mode 100644
index 000000000..338edcca3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/register.txt
@@ -0,0 +1,4 @@
+====== Registreer als nieuwe gebruiker ======
+
+Vul alle informatie hieronder in om een nieuw account voor deze wiki aan te maken. Zorg dat je een **geldig e-mailadres** opgeeft - als je je wachtwoord hier niet in kunt vullen wordt het naar dit adres verzonden. De gebruikersnaam moet een geldige [[doku>wiki:pagename|pagename]] zijn.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/registermail.txt
new file mode 100644
index 000000000..5efb25144
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/registermail.txt
@@ -0,0 +1,14 @@
+Een nieuwe gebruiker heeft zich geregistreerd. Dit zijn de details:
+
+Gebruikersnaam: @NEWUSER@
+Volledige naam: @NEWNAME@
+E-mail        : @NEWEMAIL@
+
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-adres      : @IPADDRESS@
+Hostname      : @HOSTNAME@
+
+-- 
+Dit bericht is gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/resendpwd.txt
new file mode 100644
index 000000000..ed4617748
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/resendpwd.txt
@@ -0,0 +1,3 @@
+==== Verstuur een nieuw wachtwoord ====
+
+Voer uw gebruikersnaam in het formulier hieronder in om een nieuw wachtwoord aan te vragen voor deze wiki. Een bevestigingslink zal worden verzonden naar het geregistreerde e-mailadres.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/revisions.txt
new file mode 100644
index 000000000..7a78917fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/revisions.txt
@@ -0,0 +1,4 @@
+====== Oude revisies ======
+
+Dit zijn de oude revisies van het document. Om terug te keren naar een oude revisie selecteer je hem hieronder en klik je op de ''Pagina aanpassen'' en vervolgens op ''Opslaan''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/searchpage.txt
new file mode 100644
index 000000000..3ace704c8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Zoeken ======
+
+Hieronder zijn de resultaten van de zoekopdracht. Niks gevonden? Maak een nieuwe pagina met als naam je zoekopdracht. Klik hiervoor op ''Pagina aanpassen''.
+
+===== Resultaten =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/showrev.txt
new file mode 100644
index 000000000..c1bfa4e2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/showrev.txt
@@ -0,0 +1,2 @@
+**Dit is een oude revisie van het document!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/stopwords.txt
new file mode 100644
index 000000000..3056c4a70
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/stopwords.txt
@@ -0,0 +1,37 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+aan
+als
+bij
+dan
+dat
+die
+dit
+een
+had
+heb
+hem
+het
+hij
+hoe
+hun
+kan
+men
+met
+mij
+nog
+ons
+ook
+tot
+uit
+van
+was
+wat
+wel
+wij
+zal
+zei
+zij
+zou
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/subscribermail.txt
new file mode 100644
index 000000000..5b092a9a6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/subscribermail.txt
@@ -0,0 +1,16 @@
+Hallo!
+
+De pagina @PAGE@ op de @TITLE@ wiki is gewijzigd.
+Hier zijn de aanpassingen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Om deze berichten niet meer te ontvangen van @DOKUWIKIURL@ , ga naar
+@NEWPAGE@
+en kies 'Opzeggen wijzigingen'.
+
+-- 
+Dit bericht is gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/updateprofile.txt
new file mode 100644
index 000000000..2368a09fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/updateprofile.txt
@@ -0,0 +1,3 @@
+===== Wijzig uw gebruikersprofiel =====
+
+Je hoeft alleen de velden aan te passen die je wilt wijzigen. Je gebruikersnaam is niet aan te passen.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/uploadmail.txt
new file mode 100644
index 000000000..1816400d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/uploadmail.txt
@@ -0,0 +1,14 @@
+Er is een bestand geüpload naar uw DokuWiki. Hier zijn de details;
+
+Bestand  : @MEDIA@
+Datum    : @DATE@
+Browser  : @BROWSER@
+IP-adres : @IPADDRESS@
+Hostname : @HOSTNAME@
+Grootte  : @SIZE@
+MIME type: @MIME@
+Gebruiker: @USER@
+
+-- 
+Dit bericht is gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/wordblock.txt
new file mode 100644
index 000000000..d887d7318
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/nl/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM geblokkeerd ======
+
+Je wijzigingen zijn **niet** opgeslagen omdat ze een of meer geblokkeerde woorden bevatten. Als je probeerde de Wiki te spammen -- Foei stouterd! Als je denkt dat dit een fout is neem dan contact op met de beheerder van deze Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/admin.txt
new file mode 100644
index 000000000..99289a18b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/admin.txt
@@ -0,0 +1,3 @@
+====== Administrasjon ======
+
+Nedenfor finner du en liste over administrative oppgaver tilgjengelig i DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/adminplugins.txt
new file mode 100644
index 000000000..32499a2e4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/adminplugins.txt
@@ -0,0 +1 @@
+====== Ekstra tilleggene ======
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/backlinks.txt
new file mode 100644
index 000000000..9fe72066e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/backlinks.txt
@@ -0,0 +1,3 @@
+====== Tilbakelinker ======
+
+Dette er en liste over sider som ser ut til å linke tilbake til den aktuelle siden.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/conflict.txt
new file mode 100644
index 000000000..89479af4f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/conflict.txt
@@ -0,0 +1,6 @@
+====== Det fins en nyere versjon ======
+
+Det fins en nyere versjon av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
+
+Legg nøye merke til forskjellene som vises under, og velg deretter hvilken versjon du vil beholde. Om du velger ''**Lagre**'', så kommer din versjon til å lagres. Velg ''**Avbryt**'' for å beholde den nyeste versjonen (ikke din).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/denied.txt
new file mode 100644
index 000000000..4f8c9a188
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/denied.txt
@@ -0,0 +1,3 @@
+====== Adgang forbudt ======
+
+Adgang forbudt. Kanskje du har glemt å logge deg inn?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/diff.txt
new file mode 100644
index 000000000..e4c2eb080
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/diff.txt
@@ -0,0 +1,4 @@
+====== Forskjeller ======
+
+Her vises forskjeller mellom den valgte versjonen og den nåværende versjonen av dokumentet.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/draft.txt
new file mode 100644
index 000000000..8bcea65aa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/draft.txt
@@ -0,0 +1,6 @@
+====== Kladdfil funnet ======
+
+Din siste endring av denne siden ble ikke avsluttet riktig. DokuWiki lagret automatisk en kladd under ditt arbeid som du nå kan bruke for å fortsette redigeringen. Nedenfor kan du se de lagrede data.
+
+Vennligst avgjør om du vil //gjennopprette// din tapte sesjon, //slette// kladden eller //avbryte// redigeringen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/edit.txt
new file mode 100644
index 000000000..bdb3bc854
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/edit.txt
@@ -0,0 +1,2 @@
+Rediger siden og klikk på ''**Lagre**''. Se [[wiki:syntax]] for Wikisyntaks. Rediger siden bare hvis du kan **forbedre** sidens innhold. Hvis du vil teste ut hvordan saker og ting fungerer, kan du gjøre det på [[playground:playground|lekeplassen]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/editrev.txt
new file mode 100644
index 000000000..652a84c38
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hentet en tidligere versjon av dokumentet!** Hvis du lagrer den tidligere versjonen så kommer du til å lage en ny og aktiv versjon med dette innholdet.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/index.txt
new file mode 100644
index 000000000..e2ea95933
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/index.txt
@@ -0,0 +1,4 @@
+====== Indeks ======
+
+Dette er en fortegnelse over alle tilgjengelige sider, sortert etter [[doku>namespaces|navnerom]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/install.html
new file mode 100644
index 000000000..541445494
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/install.html
@@ -0,0 +1,24 @@
+<p>Denne siden assisterer under førstegangs installasjon og konfigurasjon av
+<a href="http://dokuwiki.org">Dokuwiki</a>. Mer informasjon for denne
+installasjonen er tilgjengelig på
+<a href="http://dokuwiki.org/installer">dokumentasjonssiden</a>.</p>
+
+<p>DokuWiki bruker vanlige filer for lagring av wikisider og annen
+informasjon assosiert med disse sidene (f.eks. bilder, søkeindekser, eldre
+revisjoner osv.). For å kunne virke <strong>må</strong> DokuWiki
+ha skrivetilgang til de mapper som lagrer disse filene.
+Denne installasjonen kan ikke sette opp mapperettigheter. Det må normalt
+gjøres direkte fra et kommandoskall, eller om du bruker en leverandør,
+via FTP eller ditt kontrollpanel på tjener (f.eks. cPanel).</p>
+
+<p>Denne installasjonen vil sette opp din DokuWiki-konfigurasjon for
+<acronym title="access control list">ACL</acronym>, som igjen tillater administrator
+innlogging og tilgang til DokuWikiens administratormeny for installasjon av tillegg,
+brukerbehandling, adgangskontrollbehandling til wikisider og endring av konfigurasjon.
+Det er ikke påkrevd for at DokuWiki skal virke, men det vil gjøre Dokuwiki enklere å
+administrere.</p>
+
+<p>Erfarne brukere eller brukere med spessielle oppsettingskrav bør se på disse lenkene
+for detaljer rundt
+<a href="http://dokuwiki.org/install">installasjonsinstrukser</a>
+og <a href="http://dokuwiki.org/config">konfigurasjonsinnstillinger</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/lang.php
new file mode 100644
index 000000000..2dc2c8339
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/lang.php
@@ -0,0 +1,260 @@
+<?php
+/**
+ * Norwegian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Reidar Mosvold <Reidar.Mosvold@hit.no>
+ * @author Jorge Barrera Grandon <jorge@digitalwolves.org>
+ * @author Rune Rasmussen http://www.syntaxerror.no/
+ * @author Thomas Nygreen <nygreen@gmail.com>
+ * @author Arild Burud <arildb@met.no>
+ * @author Torkill Bruland <torkar-b@online.no>
+ * @author Rune M. Andersen <rune.andersen@gmail.com>
+ * @author Jakob Vad Nielsen (me@jakobnielsen.net)
+ * @author Kjell Tore Næsgaard  <kjell.t.nasgaard@ntnu.no>
+ * @author Knut Staring <knutst@gmail.com>
+ * @author Lisa Ditlefsen <lisa@vervesearch.com>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Rediger denne siden';
+$lang['btn_source']            = 'Vis kildetekst';
+$lang['btn_show']              = 'Vis siden';
+$lang['btn_create']            = 'Lag denne siden';
+$lang['btn_search']            = 'Søk';
+$lang['btn_save']              = 'Lagre';
+$lang['btn_preview']           = 'Forhåndsvis';
+$lang['btn_top']               = 'Til toppen av siden';
+$lang['btn_newer']             = '<< nyere';
+$lang['btn_older']             = 'eldre >>';
+$lang['btn_revs']              = 'Historikk';
+$lang['btn_recent']            = 'Siste endringer';
+$lang['btn_upload']            = 'Last opp';
+$lang['btn_cancel']            = 'Avbryt';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Rediger';
+$lang['btn_login']             = 'Logg inn';
+$lang['btn_logout']            = 'Logg ut';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Oppdater';
+$lang['btn_delete']            = 'Slett';
+$lang['btn_back']              = 'Tilbake';
+$lang['btn_backlink']          = 'Tilbakelenker';
+$lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
+$lang['btn_subscribe']         = 'Abonner på endringer';
+$lang['btn_unsubscribe']       = 'Ikke abonner på endringer';
+$lang['btn_subscribens']       = 'Abonner på endringer i navnerom';
+$lang['btn_unsubscribens']     = 'Stopp abonnement på endringer i navnerom';
+$lang['btn_profile']           = 'Oppdater profil';
+$lang['btn_reset']             = 'Tilbakestill';
+$lang['btn_resendpwd']         = 'Send nytt passord';
+$lang['btn_draft']             = 'Rediger kladd';
+$lang['btn_recover']           = 'Gjennvinn kladd';
+$lang['btn_draftdel']          = 'Slett kladd';
+$lang['btn_revert']            = 'Gjenopprette';
+$lang['loggedinas']            = 'Innlogget som';
+$lang['user']                  = 'Brukernavn';
+$lang['pass']                  = 'Passord';
+$lang['newpass']               = 'Nytt passord';
+$lang['oldpass']               = 'Bekreft gjeldende passord';
+$lang['passchk']               = 'Bekreft passord';
+$lang['remember']              = 'Husk meg';
+$lang['fullname']              = 'Fullt navn';
+$lang['email']                 = 'E-post';
+$lang['register']              = 'Registrer deg';
+$lang['profile']               = 'Brukerprofil';
+$lang['badlogin']              = 'Ugyldig brukernavn og/eller passord.';
+$lang['minoredit']             = 'Mindre endringer';
+$lang['draftdate']             = 'Kladd autolagret';
+$lang['nosecedit']             = 'Siden ble endret i mellomtiden, seksjonsinfo har blitt foreldet - lastet full side istedet.';
+$lang['regmissing']            = 'Vennligst fyll ut alle felt.';
+$lang['reguexists']            = 'Det finnes allerede en konto med dette brukernavnet.';
+$lang['regsuccess']            = 'Brukerkonto har blitt laget og passord har blitt sendt via e-post.';
+$lang['regsuccess2']           = 'Brukeren har blitt laget.';
+$lang['regmailfail']           = 'En feil oppstod da passordet ditt skulle sendes via e-post. Vennligst kontakt administratoren!';
+$lang['regbadmail']            = 'Den angitte e-post adressen ser ut til å være ugyldig. Vennligst kontakt administratoren om du anser dette som feilaktig.';
+$lang['regbadpass']            = 'De to angitte passordene er ikke like, vennligst forsøk igjen.';
+$lang['regpwmail']             = 'Ditt DokuWiki passord';
+$lang['reghere']               = 'Har du ikke en konto ennå? Lag deg en';
+$lang['profna']                = 'Denne wikien støtter ikke profilendringer';
+$lang['profnochange']          = 'Ingen endringer, ingenting å gjøre.';
+$lang['profnoempty']           = 'Tomt navn- eller e-postfelt er ikke tillatt.';
+$lang['profchanged']           = 'Brukerprofil ble vellykket oppdatert.';
+$lang['pwdforget']             = 'Glemt ditt passord? Få deg et nytt';
+$lang['resendna']              = 'Denne wikien støtter ikke nyutsending.';
+$lang['resendpwd']             = 'Send nytt passord for';
+$lang['resendpwdmissing']      = 'Beklager, du må fylle inn alle felt.';
+$lang['resendpwdnouser']       = 'Beklager, vi kan ikke finne denne brukeren i vår database.';
+$lang['resendpwdbadauth']      = 'Beklager, denne autorisasjonskoden er ikke gyldig. Sjekk at du brukte hele bekreftelseslenken.';
+$lang['resendpwdconfirm']      = 'En bekreftelseslenke er blitt sendt på e-post.';
+$lang['resendpwdsuccess']      = 'Ditt nye passord er blitt sendt på e-post.';
+$lang['license']               = 'Der annet ikke er særskilt beskrevet, er innholdet på denne wiki regulert av følgende lisens:';
+$lang['licenseok']             = 'Merk: Ved å endre på denne siden godtar du at ditt innhold blir regulert av følgende lisens:';
+$lang['searchmedia']           = 'Søk filnavn';
+$lang['searchmedia_in']        = 'Søk i %s';
+$lang['txt_upload']            = 'Velg fil som skal lastes opp';
+$lang['txt_filename']          = 'Skriv inn wikinavn (alternativt)';
+$lang['txt_overwrt']           = 'Overskriv eksisterende fil';
+$lang['lockedby']              = 'Stengt av';
+$lang['lockexpire']            = 'Avstengningen opphører';
+$lang['willexpire']            = 'Din redigeringslås for dette dokumentet kommer snart til å opphøre.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['notsavedyet']           = 'Ulagrede endringer vil gå tapt.\nVil du fortsette?';
+$lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
+$lang['nothingfound']          = 'Ingen data funnet.';
+$lang['mediaselect']           = 'Valg av mediafil';
+$lang['fileupload']            = 'Mediafil Opplasting';
+$lang['uploadsucc']            = 'Opplastingen var vellykket';
+$lang['uploadfail']            = 'Opplastingen var mislykket. Kanskje feil rettigheter?';
+$lang['uploadwrong']           = 'Opplastingen ble nektet. Denne filendelsen er ikke tillatt!';
+$lang['uploadexist']           = 'Filen eksisterer. Ingenting har blitt gjort.';
+$lang['uploadbadcontent']      = 'Det opplastede innholdet passer ikke til filendelsen %s.';
+$lang['uploadspam']            = 'Opplastingen ble blokkert av svartelisten for spam.';
+$lang['uploadxss']             = 'Opplastingen ble blokkert på grunn av mulig skadelig innhold.';
+$lang['uploadsize']            = 'Den opplastede filen var for stor. (max. %s)';
+$lang['deletesucc']            = 'Filen "%s" har blitt slettet.';
+$lang['deletefail']            = '"%s" kunne ikke slettes - sjekk rettighetene.';
+$lang['mediainuse']            = 'Filen "%s" har ikke biltt slettet - den er fortsatt i bruk.';
+$lang['namespaces']            = 'Navnerom';
+$lang['mediafiles']            = 'Tilgjengelige filer i';
+$lang['js']['searchmedia']     = 'Søk for filer';
+$lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['js']['nosmblinks']      = 'Lenker til Windows-ressurser fungerer bare i Microsoft sin Internet Explorer.
+Du kan fortsatt kopiere og lime inn lenken.';
+$lang['js']['linkwiz']         = 'guide til lenker';
+$lang['js']['linkto']          = 'Lenke til:';
+$lang['js']['del_confirm']     = 'Slett denne oppføringen?';
+$lang['js']['mu_btn']          = 'Last opp flere filer samtidig';
+$lang['mediausage']            = 'Bruk følgende syntaks til å refferer til denne filen:';
+$lang['mediaview']             = 'Vis original fil';
+$lang['mediaroot']             = 'rot';
+$lang['mediaupload']           = 'Last opp en fil til gjeldende navnerom her. For å opprette undernavnerom, før dem opp før filnavn i "Last opp som" adskilt med kolon.';
+$lang['mediaextchange']        = 'Filendelse endret fra .%s til .%s!';
+$lang['reference']             = 'Referanser for';
+$lang['ref_inuse']             = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk av følgende sider:';
+$lang['ref_hidden']            = 'Noen referanser er på sider du ikke har tilgang til å lese';
+$lang['hits']                  = 'Treff';
+$lang['quickhits']             = 'Matchende wikinavn';
+$lang['toc']                   = 'Innholdsfortegnelse';
+$lang['current']               = 'nåværende versjon';
+$lang['yours']                 = 'Din versjon';
+$lang['diff']                  = 'Vis forskjeller mot nåværende versjon';
+$lang['diff2']                 = 'Vis forskjeller mellom valgte versjoner';
+$lang['line']                  = 'Linje';
+$lang['breadcrumb']            = 'Spor';
+$lang['youarehere']            = 'Du er her';
+$lang['lastmod']               = 'Sist modifisert';
+$lang['by']                    = 'av';
+$lang['deleted']               = 'fjernet';
+$lang['created']               = 'opprettet';
+$lang['restored']              = 'gjenopprettet til en tidligere versjon';
+$lang['external_edit']         = 'ekstern redigering';
+$lang['summary']               = 'Redigeringskommentar';
+$lang['noflash']               = 'For at dette innholdet skal vises må du ha <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['download']              = 'Last ned utdraget';
+$lang['mail_newpage']          = 'side lagt til:';
+$lang['mail_changed']          = 'side endret:';
+$lang['mail_new_user']         = 'ny bruker:';
+$lang['mail_upload']           = 'fil opplastet:';
+$lang['qb_bold']               = 'Fet tekst';
+$lang['qb_italic']             = 'Kursiv tekst';
+$lang['qb_underl']             = 'Understreket tekst';
+$lang['qb_code']               = 'Kodetekst';
+$lang['qb_strike']             = 'Gjennomstreket tekst';
+$lang['qb_h1']                 = 'Overskrift nivå 1';
+$lang['qb_h2']                 = 'Overskrift nivå 2';
+$lang['qb_h3']                 = 'Overskrift nivå 3';
+$lang['qb_h4']                 = 'Overskrift nivå 4';
+$lang['qb_h5']                 = 'Overskrift nivå 5';
+$lang['qb_h']                  = 'Overskrift';
+$lang['qb_hs']                 = 'Velg overskrift';
+$lang['qb_hplus']              = 'Høyere overskrift';
+$lang['qb_hminus']             = 'Lavere overskrift';
+$lang['qb_hequal']             = 'Overskrift på samme nivå';
+$lang['qb_link']               = 'Intern lenke';
+$lang['qb_extlink']            = 'Ekstern lenke';
+$lang['qb_hr']                 = 'Horisontal linje';
+$lang['qb_ol']                 = 'Sortert listepunkt';
+$lang['qb_ul']                 = 'Usortert listepunkt';
+$lang['qb_media']              = 'Legg til bilder og andre filer';
+$lang['qb_sig']                = 'Føy til signatur';
+$lang['qb_smileys']            = 'Smilefjes';
+$lang['qb_chars']              = 'Spesialtegn';
+$lang['upperns']               = 'gå til overordnet navnerom';
+$lang['admin_register']        = 'Legg til ny bruker';
+$lang['metaedit']              = 'Rediger metadata';
+$lang['metasaveerr']           = 'Skriving av metadata feilet';
+$lang['metasaveok']            = 'Metadata lagret';
+$lang['img_backto']            = 'Tilbake til';
+$lang['img_title']             = 'Tittel';
+$lang['img_caption']           = 'Bildetekst';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Filnavn';
+$lang['img_fsize']             = 'Størrelse';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Opphavsrett';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Nøkkelord';
+$lang['subscribe_success']     = 'Lagt til %s som abonnent av listen for %s';
+$lang['subscribe_error']       = 'En feil oppstod når %s skulle legges til som abonnent av listen for %s';
+$lang['subscribe_noaddress']   = 'Det er ingen adresse assosiert med din login. Du kan dermed ikke bli lagt til som abonnent av listen.';
+$lang['unsubscribe_success']   = 'Fjernet %s som abonnent for listen %s';
+$lang['unsubscribe_error']     = 'En feil oppstod når %s skulle fjernes som abonnent fra listen for %s';
+$lang['authmodfailed']         = 'Feilkonfigurert brukerautorisasjon. Vennligst innformer Wiki-admin.';
+$lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
+$lang['i_chooselang']          = 'Velg ditt språk';
+$lang['i_installer']           = 'DokuWiki-installasjon';
+$lang['i_wikiname']            = 'Wikinavn';
+$lang['i_enableacl']           = 'Aktiver ACL (anbefalt)';
+$lang['i_superuser']           = 'Superbruker';
+$lang['i_problems']            = 'Installasjonen oppdaget noen problemer, disse listes nedenfor. Du kan ikke fortsett før du har løst disse.';
+$lang['i_modified']            = 'For sikkerhets skyld vil dette skriptet bare virke med en ny og uendret Dokuwiki-installsjon.
+                         Du bør enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette
+                         <a href="http://dokuwiki.org/install">Dokuwiki-installasjonsinstruksen</a>';
+$lang['i_funcna']              = 'PHP-funksjonen <code>%s</code> er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?';
+$lang['i_phpver']              = 'Your PHP version <code>%s</code> is lower than the needed <code>%s</code>. You need to upgrade your PHP install.';
+$lang['i_permfail']            = '<code>%s</code> er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!';
+$lang['i_confexists']          = '<code>%s</code> eksisterer allerede';
+$lang['i_writeerr']            = 'Kunne ikke opprette <code>%s</code>. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.';
+$lang['i_badhash']             = 'ikke gjenkjent eller modifisert dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - ugyldig eller tom verdi';
+$lang['i_success']             = 'Konfigurasjonen ble vellykket fullført. Du kan slette install.php filen nå. Fortsett til
+                        <a href="doku.php">din nye DokuWiki</a>.';
+$lang['i_failure']             = 'En eller flere feil oppstod ved skriving til konfigurasjonsfilene. Du må kanskje fikse dem manuelt før
+                         du kan bruke <a href="doku.php">din nye DokuWiki</a>.';
+$lang['i_policy']              = 'Innledende ACL-politikk';
+$lang['i_pol0']                = 'Åpen Wiki (les, skriv og opplasting for alle)';
+$lang['i_pol1']                = 'Offentlig Wiki (les for alle, skriving og opplasting bare for registrerte brukere)';
+$lang['i_pol2']                = 'Lukket Wiki (les, skriv og opplasting bare for registrerte brukere)';
+$lang['i_retry']               = 'Prøv igjen';
+$lang['mu_intro']              = 'Her kan du laste opp flere filer samtidig. Klikk på utforsk-knappen for å legge dem til i køen. Klikk på "last opp" når du er ferdig med å velge filene. ';
+$lang['mu_gridname']           = 'Filnavn';
+$lang['mu_gridsize']           = 'Størrelse';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Navnerom (Namespace)';
+$lang['mu_browse']             = 'Utforsk';
+$lang['mu_toobig']             = 'for stor';
+$lang['mu_ready']              = 'klar for opplasting';
+$lang['mu_done']               = 'komplett';
+$lang['mu_fail']               = 'feilet';
+$lang['mu_authfail']           = 'sesjonen har utløpt';
+$lang['mu_progress']           = '@PCT@% lastet opp';
+$lang['mu_filetypes']          = 'Tillatte filtyper';
+$lang['mu_info']               = 'filer lastet opp.';
+$lang['mu_lasterr']            = 'Siste feilen:';
+$lang['recent_global']         = 'Du ser nå på endringene i navnerommet <b>%s</b>. Du kan også<a href="%s">se på nylig foretatte endringer for hele wikien</a>.';
+$lang['years']                 = '%d år siden';
+$lang['months']                = '%d måneder siden';
+$lang['weeks']                 = '%d uker siden';
+$lang['days']                  = '%d dager siden';
+$lang['hours']                 = '%d timer siden';
+$lang['minutes']               = '%d minutter siden';
+$lang['seconds']               = '%d sekunder siden';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/locked.txt
new file mode 100644
index 000000000..cb14c892e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/locked.txt
@@ -0,0 +1,3 @@
+====== Dokumentet er låst ======
+
+Dette dokumentet er for tiden låst for redigering av en annen bruker. Du må vente til denne brukeren er ferdig med sin redigering, eller til dokumentlåsen opphører å gjelde.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/login.txt
new file mode 100644
index 000000000..149cf0031
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/login.txt
@@ -0,0 +1,4 @@
+====== Logg inn ======
+
+Du er ikke innlogget! Angi ditt brukernavn og passord nedenfor for å logge inn. Støtte for såkalte "cookies" må være aktivert i din nettleser for at du skal kunne logge inn.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/mailtext.txt
new file mode 100644
index 000000000..9c0714c2f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/mailtext.txt
@@ -0,0 +1,17 @@
+En side i din DokuWiki har blitt lagt til eller blitt endret. Informasjon om endringen:
+
+Dato                 : @DATE@
+Nettleser            : @BROWSER@
+IP-adresse           : @IPADDRESS@
+Vertsnavn            : @HOSTNAME@
+Tidligere versjon    : @OLDPAGE@
+Aktuell versjon      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Bruker               : @USER@
+
+@DIFF@
+
+
+-- 
+Denne meldingen ble laget av DokuWiki
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/newpage.txt
new file mode 100644
index 000000000..8f4b8da79
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/newpage.txt
@@ -0,0 +1,3 @@
+====== Det fins ikke noe innhold ======
+
+Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan skape det gjennom å klikke på ''**Lag denne siden**''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/norev.txt
new file mode 100644
index 000000000..dfd71db0f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/norev.txt
@@ -0,0 +1,4 @@
+====== Det fins ingen slik versjon ======
+
+Den angitte versjonen fins ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som fins av dette dokumentet.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/preview.txt
new file mode 100644
index 000000000..2bed20e86
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/preview.txt
@@ -0,0 +1,4 @@
+====== Forhåndsvisning ======
+
+Dette er en forhåndsvisning av hvordan din tekst kommer til å se ut når den blir vist. Husk at den er **ikke lagret** ennå!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/pwconfirm.txt
new file mode 100644
index 000000000..9b8a0ab3e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/pwconfirm.txt
@@ -0,0 +1,15 @@
+Hei @FULLNAME@!
+
+Noen har bedt om nytt passord for din @TITLE@ innlogging
+på @DOKUWIKIURL@
+
+Om du ikke bad om nytt passord kan du bare overse denne e-posten.
+
+For å bekrefte at forespørselen virkelig kom fra deg kan du bruke
+følgende lenke:
+
+@CONFIRM@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/read.txt
new file mode 100644
index 000000000..27fcb5118
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/read.txt
@@ -0,0 +1,2 @@
+Denne siden er skrivebeskyttet. Du kan se på den, men ikke endre den. Kontakt administratoren hvis du mener at du bør kunne endre siden.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/recent.txt
new file mode 100644
index 000000000..d9357b1a4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/recent.txt
@@ -0,0 +1,5 @@
+====== Siste nytt ======
+
+Følgende sider/dokumenter har nylig blitt oppdatert.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/register.txt
new file mode 100644
index 000000000..1ce95c44d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/register.txt
@@ -0,0 +1,4 @@
+====== Registrer deg som bruker ======
+
+Angi all informasjon som det blir spurt om nedenfor for å skape en ny brukerkonto for denne wiki. Vær spesielt nøye med å angi en **gyldig e-postadresse** - ditt passord vil bli sendt til den e-postadressen du angir. Brukernavnet må være et gyldig [[doku>pagename|sidenavn]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/registermail.txt
new file mode 100644
index 000000000..e1fae2b90
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/registermail.txt
@@ -0,0 +1,14 @@
+En ny bruker har registret seg, her er detaljene:
+
+Brukernavn  : @NEWUSER@
+Fult navn   : @NEWNAME@
+E-post      : @NEWEMAIL@
+
+Dato        : @DATE@
+Nettleser   : @BROWSER@
+IP-adresse  : @IPADDRESS@
+Tjener      : @HOSTNAME@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/resendpwd.txt
new file mode 100644
index 000000000..21625d3f5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Send nytt passord ======
+
+Fyll inn ditt brukernavn i skjema nedenfor for å be om nytt passord for din konto i denne wiki. En bekreftelseslenke vil bli sent til din e-postadresse.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/revisions.txt
new file mode 100644
index 000000000..023fd8dce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/revisions.txt
@@ -0,0 +1,4 @@
+====== Historikk ======
+
+Her vises tidligere versjoner av dokumentet. For å sette dette dokumentet tilbake til en tidligere versjon kan du velge den ønskede versjonen nedenfor, klikke på **''Rediger denne siden''** og lagre dokumentet.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/searchpage.txt
new file mode 100644
index 000000000..e94e7895b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/searchpage.txt
@@ -0,0 +1,5 @@
+====== Søk ======
+
+Du ser resultatet av dette søket nedenfor. Hvis du ikke finner det du leter etter, så kan du skape en ny side med samme navn som ditt søk ved å klikke på ''**Lag denne siden**''-knappen.
+
+===== Resultat =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/showrev.txt
new file mode 100644
index 000000000..556896437
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/showrev.txt
@@ -0,0 +1,2 @@
+**Dette er en gammel revisjon av dokumentet!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/stopwords.txt
new file mode 100644
index 000000000..2b2ab11e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/stopwords.txt
@@ -0,0 +1,130 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+alle
+andre
+arbeid
+begge
+bort
+bra
+bruke
+denne
+der
+deres
+det
+din
+disse
+eller
+ene
+eneste
+enhver
+enn
+folk
+for
+fordi
+forsÛke
+fra
+fÅ
+fÛr
+fÛrst
+gjorde
+gjÛre
+god
+gÅ
+hadde
+han
+hans
+hennes
+her
+hva
+hvem
+hver
+hvilken
+hvis
+hvor
+hvordan
+hvorfor
+ikke
+inn
+innen
+kan
+kunne
+lage
+lang
+lik
+like
+makt
+mange
+med
+meg
+meget
+men
+mens
+mer
+mest
+min
+mye
+mÅ
+mÅte
+navn
+nei
+nÅ
+nÅr
+ogsÅ
+opp
+oss
+over
+part
+punkt
+pÅ
+rett
+riktig
+samme
+sant
+siden
+sist
+skulle
+slik
+slutt
+som
+start
+stille
+sÅ
+tid
+til
+tilbake
+tilstand
+under
+uten
+var
+ved
+verdi
+vil
+ville
+vite
+vÅr
+vÖre
+vÖrt
+om
+er
+og
+du
+dine
+de
+deres
+com
+for
+fra
+inni
+hvordan
+det
+dette
+var
+hva
+når
+hvor
+hvem
+vil
+med
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/subscribermail.txt
new file mode 100644
index 000000000..999f75787
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/subscribermail.txt
@@ -0,0 +1,16 @@
+Hei!
+
+Siden @PAGE@ i @TITLE@-wikien har blitt endret.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For å avslutte abonnering på denne siden logg inn
+på wikien på @DOKUWIKIURL@, besøk deretter @NEWPAGE@
+og velg 'Ikke abonner på endringer'.
+
+-- 
+Denne mailen ble generert av DokuWiki på
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/updateprofile.txt
new file mode 100644
index 000000000..5565e528f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Oppdater din brukerprofil ======
+
+Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre ditt brukernavn.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/uploadmail.txt
new file mode 100644
index 000000000..b01905009
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/uploadmail.txt
@@ -0,0 +1,14 @@
+En fil ble lastet opp på din DokuWiki. Her er detaljene:
+
+Fil : @MEDIA@
+Dato : @DATE@
+Nettleser : @BROWSER@
+IP-adresse : @IPADDRESS@
+Vertnavn : @HOSTNAME@
+Størrelse : @SIZE@
+MIME-type : @MIME@
+Bruker : @USER@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/wordblock.txt
new file mode 100644
index 000000000..30c4c31ce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/no/wordblock.txt
@@ -0,0 +1,4 @@
+====== Ordsperre ======
+
+Dine endringer har **ikke** blitt lagret på grunn av at de inneholder ett eller flere ord som er sperret. Hvis du har forsøkt å lagre søppel, eller såkalt ''spam'' -- Fy deg! Hvis du anser denne beskjeden som feilaktig kan du kontakte administratoren til denne wikien.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/admin.txt
new file mode 100644
index 000000000..cea45f9d0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/admin.txt
@@ -0,0 +1,4 @@
+====== Administracja ======
+
+Czynności administracyjne DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/adminplugins.txt
new file mode 100644
index 000000000..0fb03993e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/adminplugins.txt
@@ -0,0 +1 @@
+===== Dodatkowe Wtyczki =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/backlinks.txt
new file mode 100644
index 000000000..4edccb09b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Odnośnik z innych stron ======
+
+Strony zawierające odnośniki do aktualnej strony.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/conflict.txt
new file mode 100644
index 000000000..da6f95260
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/conflict.txt
@@ -0,0 +1,6 @@
+====== Istnieje nowsza wersja strony ======
+
+Istnieje nowsza wersja edytowanej strony. Prawdopodobnie ktoś zmienił tę stronę w trakcie Twojej pracy.
+
+Przeglądnij dokładnie poniższe różnice i zdecyduj, którą wersję zatrzymać. Jeśli naciśniesz ''zapisz'' to Twoja wersja zostanie zapisana. Jeśli naciśniesz ''anuluj'' to zostanie wybrana aktualna wersja strony.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/denied.txt
new file mode 100644
index 000000000..d402463ef
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/denied.txt
@@ -0,0 +1,4 @@
+====== Brak dostępu ======
+
+Nie masz wystarczających uprawnień. Zaloguj się!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/diff.txt
new file mode 100644
index 000000000..2c896ddb3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/diff.txt
@@ -0,0 +1,4 @@
+====== Różnice ======
+
+Różnice między wybraną wersją a wersją aktualną.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/draft.txt
new file mode 100644
index 000000000..4036c3079
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/draft.txt
@@ -0,0 +1,6 @@
+====== Znaleziono szkic strony ======
+
+Twoja ostatnia sesja edycji nie została poprawnie zakończona. DokuWiki automatycznie zachowało szkic strony podczas Twojej pracy abyś mógł (mogła) ją dokończyć. Poniżej możesz zobaczyć co zostało zapisane w czasie ostatnie sesji.
+
+Zdecyduj czy chcesz //przywrócić// ostatnią sesję, //usunąć// ją lub //anulować//.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/edit.txt
new file mode 100644
index 000000000..abb20ae1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/edit.txt
@@ -0,0 +1,4 @@
+Zredaguj tę stronę i naciśnij ''zapisz''.
+
+Na stronie ze [[wiki:syntax|składnią]] znajdziesz opis znaczników wiki. Jeśli chcesz poćwiczyć zajrzyj do [[playground:playground|piaskownicy]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/editrev.txt
new file mode 100644
index 000000000..1528cac7e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/editrev.txt
@@ -0,0 +1,2 @@
+**Edytujesz nieaktualną wersję strony!** Jeśli ją zapiszesz to stanie się ona wersją aktualną.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/index.txt
new file mode 100644
index 000000000..1d3fd27f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/index.txt
@@ -0,0 +1,4 @@
+====== Indeks ======
+
+Indeks wszystkich dostępnych stron pogrupowany według [[doku>namespaces|katalogów]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/install.html
new file mode 100644
index 000000000..f1d48c1ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/install.html
@@ -0,0 +1,23 @@
+<p>Ta strona ma na celu pomóc Ci w instalacji i konfiguracji
+<a href="http://dokuwiki.org">Dokuwiki</a>.
+Więcej informacji o instalatorze znajdziesz w
+<a href="http://dokuwiki.org/installer">dokumentacji instalatora</a>.</p>
+
+<p>DokuWiki używa zwykłych plików do przechowywania zawartości stron oraz wszelkich
+innych informacji takich jak obrazki, poprzednie wersje strony, itp.
+Żeby DokuWiki mogło poprawnie działać <strong>musisz</strong> 
+nadać prawo zapisu do katalogu zawierającego te pliki. Instalator nie może wykonać
+tych czynności. Musisz zrobić to za pomocą polecenia powłoki, klienta FTP 
+lub panelu kontrolnego Twojego dostawcy usług serwerowych.</p>
+
+<p>Instalator pomoże Ci w konfiguracji uprawnień
+<acronym title="access control list">ACL</acronym>, 
+które z kolei umożliwią Ci założenie konta administratora oraz umożliwią dostęp
+do czynności administracyjnych takich jak instalowanie wtyczek, zarządzanie kontami,
+zarządzania uprawnieniami do stron oraz konfiguracji wiki. Użycie tego instalatora
+nie jest konieczne, jego celem jest tylko ułatwienie administracji DokuWiki.</p>
+
+<p>Zaawansowani użytkownicy lub użytkownicy mający specjalne wymagania powinni
+zapoznać się z 
+<a href="http://dokuwiki.org/install">instrukcją instalacji</a>
+oraz <a href="http://dokuwiki.org/config">instrukcją konfiguracji</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/lang.php
new file mode 100644
index 000000000..882806577
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/lang.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * polish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Grzegorz Żur <grzegorz.zur@gmail.com>
+ * @author Mariusz Kujawski <marinespl@gmail.com>
+ * @author Maciej Kurczewski <pipijajko@gmail.com>
+ * @author Sławomir Boczek <slawkens@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Edytuj stronę';
+$lang['btn_source']            = 'Pokaż źródło strony';
+$lang['btn_show']              = 'Pokaż stronę';
+$lang['btn_create']            = 'Utwórz stronę';
+$lang['btn_search']            = 'Szukaj';
+$lang['btn_save']              = 'Zapisz';
+$lang['btn_preview']           = 'Podgląd';
+$lang['btn_top']               = 'Do góry';
+$lang['btn_newer']             = '<< nowsze';
+$lang['btn_older']             = 'starsze >>';
+$lang['btn_revs']              = 'Poprzednie wersje';
+$lang['btn_recent']            = 'Ostatnie zmiany';
+$lang['btn_upload']            = 'Wyślij';
+$lang['btn_cancel']            = 'Anuluj';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Edytuj';
+$lang['btn_login']             = 'Zaloguj';
+$lang['btn_logout']            = 'Wyloguj';
+$lang['btn_admin']             = 'Administracja';
+$lang['btn_update']            = 'Aktualizuj';
+$lang['btn_delete']            = 'Usuń';
+$lang['btn_back']              = 'Wstecz';
+$lang['btn_backlink']          = 'Odnośniki';
+$lang['btn_backtomedia']       = 'Powrót do wyboru pliku';
+$lang['btn_subscribe']         = 'Subskrybuj zmiany';
+$lang['btn_unsubscribe']       = 'Zaprzestań subskrypcji zmian';
+$lang['btn_subscribens']       = 'Subskrybuj zmiany w katalogu';
+$lang['btn_unsubscribens']     = 'Zaprzestań subskrypcji zmian w katalogu';
+$lang['btn_profile']           = 'Aktualizuj profil';
+$lang['btn_reset']             = 'Resetuj';
+$lang['btn_resendpwd']         = 'Prześlij nowe hasło';
+$lang['btn_draft']             = 'Edytuj szkic';
+$lang['btn_recover']           = 'Przywróć szkic';
+$lang['btn_draftdel']          = 'Usuń szkic';
+$lang['btn_revert']            = 'Przywróć';
+$lang['loggedinas']            = 'Zalogowany jako';
+$lang['user']                  = 'Użytkownik';
+$lang['pass']                  = 'Hasło';
+$lang['newpass']               = 'Nowe hasło';
+$lang['oldpass']               = 'Potwierdź aktualne hasło';
+$lang['passchk']               = 'Powtórz hasło';
+$lang['remember']              = 'Zapamiętaj';
+$lang['fullname']              = 'Imię i nazwisko';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Zarejestruj się!';
+$lang['profile']               = 'Profil użytkownika';
+$lang['badlogin']              = 'Nazwa użytkownika lub hasło są nieprawidłowe.';
+$lang['minoredit']             = 'Mniejsze zmiany';
+$lang['draftdate']             = 'Czas zachowania szkicu';
+$lang['nosecedit']             = 'Strona została zmodyfikowana, sekcje zostały zmienione. Załadowano całą stronę.';
+$lang['regmissing']            = 'Wypełnij wszystkie pola.';
+$lang['reguexists']            = 'Użytkownik o tej nazwie już istnieje.';
+$lang['regsuccess']            = 'Utworzono użytkownika. Hasło zostało przesłane pocztą.';
+$lang['regsuccess2']           = 'Utworzono użytkownika.';
+$lang['regmailfail']           = 'Wystąpił błąd przy wysyłaniu hasła pocztą!';
+$lang['regbadmail']            = 'Adres e-mail jest nieprawidłowy!';
+$lang['regbadpass']            = 'Hasła nie są identyczne, spróbuj ponownie.';
+$lang['regpwmail']             = 'Twoje hasło do DokuWiki';
+$lang['reghere']               = 'Nie masz jeszcze konta? Zdobądź je';
+$lang['profna']                = 'To wiki nie pozwala na zmianę profilu.';
+$lang['profnochange']          = 'Żadnych zmian, nic do zrobienia.';
+$lang['profnoempty']           = 'Pusta nazwa lub adres e-mail nie dozwolone.';
+$lang['profchanged']           = 'Zaktualizowano profil użytkownika.';
+$lang['pwdforget']             = 'Nie pamiętasz hasła? Zdobądź nowe!';
+$lang['resendna']              = 'To wiki nie pozwala na powtórne przesyłanie hasła.';
+$lang['resendpwd']             = 'Prześlij nowe hasło dla';
+$lang['resendpwdmissing']      = 'Wypełnij wszystkie pola.';
+$lang['resendpwdnouser']       = 'Nie można znaleźć tego użytkownika w bazie danych.';
+$lang['resendpwdbadauth']      = 'Błędny kod autoryzacji! Upewnij się, że użyłeś(aś) właściwego odnośnika.';
+$lang['resendpwdconfirm']      = 'Prośba o potwierdzenie została przesłana pocztą.';
+$lang['resendpwdsuccess']      = 'Nowe hasło zostało wysłane pocztą.';
+$lang['license']               = 'Wszystkie treści w tym wiki, którym nie przyporządkowano licencji, podlegają licencji:';
+$lang['licenseok']             = 'Uwaga: edytując tę stronę zgadzasz się na publikowanie jej treści pod licencją:';
+$lang['searchmedia']           = 'Szukaj pliku o nazwie:';
+$lang['searchmedia_in']        = 'Szukaj w  %s';
+$lang['txt_upload']            = 'Wybierz plik do wysłania';
+$lang['txt_filename']          = 'Nazwa pliku (opcjonalnie)';
+$lang['txt_overwrt']           = 'Nadpisać istniejący plik?';
+$lang['lockedby']              = 'Aktualnie zablokowane przez';
+$lang['lockexpire']            = 'Blokada wygasa';
+$lang['willexpire']            = 'Za minutę Twoja blokada tej strony wygaśnie.\nW celu uniknięcia konfliktów wyświetl podgląd aby odnowić blokadę.';
+$lang['notsavedyet']           = 'Nie zapisane zmiany zostaną utracone.\nCzy na pewno kontynuować?';
+$lang['rssfailed']             = 'Wystąpił błąd przy pobieraniu tych danych: ';
+$lang['nothingfound']          = 'Nic nie znaleziono.';
+$lang['mediaselect']           = 'Wysyłanie pliku';
+$lang['fileupload']            = 'Wysyłanie pliku';
+$lang['uploadsucc']            = 'Wysyłanie powiodło się!';
+$lang['uploadfail']            = 'Błąd wysyłania pliku. Czy prawa do katalogów są poprawne?';
+$lang['uploadwrong']           = 'Wysyłanie zabronione. Nie można wysłać plików z takim rozszerzeniem';
+$lang['uploadexist']           = 'Plik już istnieje, nie wykonano operacji.';
+$lang['uploadbadcontent']      = 'Typ pliku "%s" nie odpowiadał jego rozszerzeniu.';
+$lang['uploadspam']            = 'Plik zablokowany przez filtr antyspamowy.';
+$lang['uploadxss']             = 'Plik zablokowany ze względu na podejrzaną zawartość.';
+$lang['uploadsize']            = 'Plik jest za duży (maksymalny rozmiar %s)';
+$lang['deletesucc']            = 'Plik "%s" został usunięty.';
+$lang['deletefail']            = 'Plik "%s" nie został usunięty, sprawdź uprawnienia.';
+$lang['mediainuse']            = 'Plik "%s" nie został usunięty, ponieważ jest używany.';
+$lang['namespaces']            = 'Katalogi';
+$lang['mediafiles']            = 'Dostępne pliki';
+$lang['js']['searchmedia']     = 'Szukaj plików';
+$lang['js']['keepopen']        = 'Nie zamykaj okna po wyborze';
+$lang['js']['hidedetails']     = 'Ukryj szczegóły';
+$lang['js']['nosmblinks']      = 'Odnośniki do zasobów sieci Windows działają tylko w przeglądarce Internet Explorer.
+Możesz skopiować odnośnik.';
+$lang['js']['linkwiz']         = 'Tworzenie odnośników';
+$lang['js']['linkto']          = 'Link do';
+$lang['js']['del_confirm']     = 'Czy na pewno usunąć?';
+$lang['js']['mu_btn']          = 'Wyślij wiele plików na raz';
+$lang['mediausage']            = 'Użyj następującej składni w odnośniku do tego pliku:';
+$lang['mediaview']             = 'Pokaż oryginalny plik';
+$lang['mediaroot']             = 'główny';
+$lang['mediaupload']           = 'Umieść plik w aktualnym katalogu. Aby utworzyć podkatalogi, poprzedź nazwę pliku nazwami katalogów oddzielonymi dwukropkami.';
+$lang['mediaextchange']        = 'Rozszerzenie pliku zmieniono z .%s na .%s!';
+$lang['reference']             = 'Odnośniki do';
+$lang['ref_inuse']             = 'Ten plik nie może być usunięty, ponieważ jest używany na następujących stronach:';
+$lang['ref_hidden']            = 'Odnośniki mogą znajdować się na stronach, do których nie masz uprawnień.';
+$lang['hits']                  = 'trafień';
+$lang['quickhits']             = 'Pasujące hasła';
+$lang['toc']                   = 'Spis treści';
+$lang['current']               = 'aktualna';
+$lang['yours']                 = 'Twoja wersja';
+$lang['diff']                  = 'Pokaż różnice między wersjami';
+$lang['diff2']                 = 'Pokaż różnice między zaznaczonymi wersjami';
+$lang['line']                  = 'Linia';
+$lang['breadcrumb']            = 'Ślad';
+$lang['youarehere']            = 'Jesteś tutaj';
+$lang['lastmod']               = 'ostatnio zmienione';
+$lang['by']                    = 'przez';
+$lang['deleted']               = 'usunięto';
+$lang['created']               = 'utworzono';
+$lang['restored']              = 'przywrócono poprzednią wersję';
+$lang['external_edit']         = 'edycja zewnętrzna';
+$lang['summary']               = 'Opis zmian';
+$lang['noflash']               = 'Plugin <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> jest niezbędny do obejrzenia tej zawartości.';
+$lang['download']              = 'Pobierz zrzut';
+$lang['mail_newpage']          = 'Strona dodana:';
+$lang['mail_changed']          = 'Strona zmieniona:';
+$lang['mail_new_user']         = 'Nowy użytkownik:';
+$lang['mail_upload']           = 'Umieszczono plik:';
+$lang['qb_bold']               = 'Pogrubienie';
+$lang['qb_italic']             = 'Pochylenie';
+$lang['qb_underl']             = 'Podkreślenie';
+$lang['qb_code']               = 'Kod źródłowy';
+$lang['qb_strike']             = 'Przekreślenie';
+$lang['qb_h1']                 = 'Nagłówek 1 stopnia';
+$lang['qb_h2']                 = 'Nagłówek 2 stopnia';
+$lang['qb_h3']                 = 'Nagłówek 3 stopnia';
+$lang['qb_h4']                 = 'Nagłówek 4 stopnia';
+$lang['qb_h5']                 = 'Nagłówek 5 stopnia';
+$lang['qb_h']                  = 'Nagłówek';
+$lang['qb_hs']                 = 'Wybierz nagłówek';
+$lang['qb_hplus']              = 'Nagłówek wyższego stopnia';
+$lang['qb_hminus']             = 'Nagłówek niższego stopnia';
+$lang['qb_hequal']             = 'Nagłówek tego samego stopnia';
+$lang['qb_link']               = 'Odnośnik wewnętrzny';
+$lang['qb_extlink']            = 'Odnośnik zewnętrzny';
+$lang['qb_hr']                 = 'Linia pozioma';
+$lang['qb_ol']                 = 'Numeracja';
+$lang['qb_ul']                 = 'Wypunktowanie';
+$lang['qb_media']              = 'Dodaj obrazek lub inny plik';
+$lang['qb_sig']                = 'Wstaw podpis';
+$lang['qb_smileys']            = 'Emotikony';
+$lang['qb_chars']              = 'Znaki specjalne';
+$lang['upperns']               = 'Skok piętro wyżej';
+$lang['admin_register']        = 'Dodawanie użytkownika';
+$lang['metaedit']              = 'Edytuj metadane';
+$lang['metasaveerr']           = 'Zapis metadanych nie powiódł się';
+$lang['metasaveok']            = 'Metadane zapisano';
+$lang['img_backto']            = 'Wróć do';
+$lang['img_title']             = 'Tytuł';
+$lang['img_caption']           = 'Nagłówek';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nazwa pliku';
+$lang['img_fsize']             = 'Rozmiar';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Prawa autorskie';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Aparat';
+$lang['img_keywords']          = 'Słowa kluczowe';
+$lang['subscribe_success']     = 'Dodano %s do listy subskrypcji strony %s';
+$lang['subscribe_error']       = 'Błąd przy dodawaniu %s do listy subskrypcji strony %s';
+$lang['subscribe_noaddress']   = 'Nie podałeś adresu e-mail przy rejestracji, nie możesz zostać dodany do listy subskrypcji.';
+$lang['unsubscribe_success']   = 'Usunięto %s z listy subskrypcji strony %s';
+$lang['unsubscribe_error']     = 'Błąd przy usuwaniu %s z listy subskrypcji strony %s';
+$lang['authmodfailed']         = 'Błąd uwierzytelnienia. Powiadom administratora tego wiki.';
+$lang['authtempfail']          = 'Uwierzytelnienie użytkownika jest w tej chwili niemożliwe. Jeśli ta sytuacja się powtórzy, powiadom administratora tego wiki.';
+$lang['i_chooselang']          = 'Wybierz język';
+$lang['i_installer']           = 'Instalator DokuWiki';
+$lang['i_wikiname']            = 'Nazwa Wiki';
+$lang['i_enableacl']           = 'Włącz mechanizm uprawnień ACL (zalecane)';
+$lang['i_superuser']           = 'Administrator';
+$lang['i_problems']            = 'Instalator napotkał poniższe problemy. Nie można kontynuować póki nie zostaną usunięte.';
+$lang['i_modified']            = 'Ze względów bezpieczeństwa, ten skrypt działa tylko z nową i niezmodyfikowaną instalacją DokuWiki.
+Aby uruchomić instalator ponownie, rozpakuj archiwum DokuWiki lub zapoznaj się z <a href="http://dokuwiki.org/install">instrukcją instalacji Dokuwiki</a>';
+$lang['i_funcna']              = 'Funkcja PHP <code>%s</code> jest niedostępna.';
+$lang['i_phpver']              = 'Wersja PHP <code>%s</code> jest niższa od wymaganej <code>%s</code>. Zaktualizuj instalację PHP.';
+$lang['i_permfail']            = 'DokuWiki nie ma prawa zapisu w katalogu <code>%s</code>. Zmień uprawnienia zapisu dla tego katalogu!';
+$lang['i_confexists']          = '<code>%s</code> już istnieje';
+$lang['i_writeerr']            = 'Nie można utworzyć <code>%s</code>. Sprawdź uprawnienia do katalogu lub pliku i stwórz plik ręcznie.';
+$lang['i_badhash']             = 'nierozpoznany lub zmodyfikowany plik dokuwiki.php (skrót=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - nieprawidłowa wartość lub jej brak';
+$lang['i_success']             = 'Konfiguracja pomyślnie zakończona. Możesz teraz usunąć plik install.php. Przejdź do <a href="doku.php">Twojego nowego DokuWiki</a>.';
+$lang['i_failure']             = 'Podczas zapisu plików konfiguracyjnych wystąpiły błędy. Musisz usunąć wszystkie problemy, zanim zaczniesz korzystać z <a href="doku.php">Twojego nowego DokuWiki</a>.';
+$lang['i_policy']              = 'Wstępna polityka uprawnień ACL';
+$lang['i_pol0']                = 'Otwarte Wiki (odczyt, zapis i dodawanie plików dla wszystkich)';
+$lang['i_pol1']                = 'Publiczne Wiki (odczyt dla wszystkich, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)';
+$lang['i_pol2']                = 'Zamknięte Wiki (odczyt, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)';
+$lang['i_retry']               = 'Spróbuj ponownie';
+$lang['mu_intro']              = 'Możesz tutaj wysłać wiele plików na raz. Kliknij przycisk "Przeglądaj" aby dodać je do kolejki. Kliknij "Wyślij" gdy skończysz.';
+$lang['mu_gridname']           = 'Nazwa pliku';
+$lang['mu_gridsize']           = 'Rozmiar';
+$lang['mu_gridstat']           = 'Stan';
+$lang['mu_namespace']          = 'Katalog';
+$lang['mu_browse']             = 'Przeglądaj';
+$lang['mu_toobig']             = 'za duży';
+$lang['mu_ready']              = 'gotowy do wysłania';
+$lang['mu_done']               = 'zakończono';
+$lang['mu_fail']               = 'nie powiodło się';
+$lang['mu_authfail']           = 'sesja wygasła';
+$lang['mu_progress']           = '@PCT@% wysłano';
+$lang['mu_filetypes']          = 'Dozwolone typy plików';
+$lang['mu_info']               = 'wysłanych plików.';
+$lang['mu_lasterr']            = 'Ostatni błąd:';
+$lang['recent_global']         = 'W tej chwili przeglądasz zmiany w katalogu <b>%s</b>. Możesz przejrzeć także <a href="%s">zmiany w całym wiki</a>.';
+$lang['years']                 = '%d lat temu';
+$lang['months']                = '%d miesięcy temu';
+$lang['weeks']                 = '%d tygodni temu';
+$lang['days']                  = '%d dni temu';
+$lang['hours']                 = '%d godzin temu';
+$lang['minutes']               = '%d minut temu';
+$lang['seconds']               = '%d sekund temu';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/locked.txt
new file mode 100644
index 000000000..e3e05fefc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/locked.txt
@@ -0,0 +1,3 @@
+====== Strona zablokowana ======
+
+Ta strona jest zablokowana do edycji przez innego użytkownika. Musisz zaczekać aż użytkownik zakończy redagowanie lub jego blokada wygaśnie.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/login.txt
new file mode 100644
index 000000000..b60427f4f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/login.txt
@@ -0,0 +1,4 @@
+====== Logowanie ======
+
+Wprowadź nazwę użytkownika i hasło aby się zalogować. Twoja przeglądarka musi mieć włączoną obsługę ciasteczek (cookies).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/mailtext.txt
new file mode 100644
index 000000000..1180966bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/mailtext.txt
@@ -0,0 +1,18 @@
+Strona w Twoim DokuWiki została dodana lub zmieniona.
+Szczegółowe informacje:
+
+Data         : @DATE@
+Przeglądarka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Stara wersja : @OLDPAGE@
+Nowa wersja  : @NEWPAGE@
+Opis zmian   : @SUMMARY@
+Użytkownik   : @USER@
+
+@DIFF@
+
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/newpage.txt
new file mode 100644
index 000000000..532d3f4ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/newpage.txt
@@ -0,0 +1,4 @@
+====== Ta strona jeszcze nie istnieje ======
+
+Jesteś na stronie, która jeszcze nie istnieje. Jeśli masz wystarczające uprawnienia, możesz utworzyć tę stronę klikając ''utwórz stronę''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/norev.txt
new file mode 100644
index 000000000..858e4a881
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/norev.txt
@@ -0,0 +1,4 @@
+====== Nie ma takiej wersji ======
+
+Nie ma takiej wersji. Kliknij przycisk ''poprzednie wersje'', aby wyświetlić listę wszystkich wersji tej strony.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/preview.txt
new file mode 100644
index 000000000..41a123cf3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/preview.txt
@@ -0,0 +1,4 @@
+====== Podgląd ======
+
+To jest podgląd edytowanej strony. Pamiętaj, że ta strona **nie** jest jeszcze zapisana!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/pwconfirm.txt
new file mode 100644
index 000000000..f6ccca47e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/pwconfirm.txt
@@ -0,0 +1,13 @@
+Witaj @FULLNAME@!
+
+Potwierdzenie prośby o nowe hasło dla konta @TITLE@ w wiki @DOKUWIKIURL@
+
+Jeśli to nie Ty prosiłeś(aś) o nowe hasło, zignoruj ten list.
+
+Aby potwierdzić prośbę o hasło, przejdź na następującą stronę.
+
+@CONFIRM@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/read.txt
new file mode 100644
index 000000000..5f89fd93d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/read.txt
@@ -0,0 +1,2 @@
+Ta strona jest tylko do odczytu. Możesz wyświetlić źródła tej strony ale nie możesz ich zmienić.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/recent.txt
new file mode 100644
index 000000000..65a776c0e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/recent.txt
@@ -0,0 +1,5 @@
+====== Ostatnie zmiany ======
+
+Ostatnio zmienione strony.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/register.txt
new file mode 100644
index 000000000..91b761d15
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/register.txt
@@ -0,0 +1,4 @@
+====== Rejestracja nowego użytkownika ======
+
+Wypełnij wszystkie pola formularza aby utworzyć nowe konto w tym wiki. Pamiętaj, żeby podać **poprawny adres e-mail**, ponieważ nowe hasło może zostać do Ciebie przesłane pocztą. Nazwa użytkownika powinna być zgodna z formatem [[doku>pagename|nazw stron]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/registermail.txt
new file mode 100644
index 000000000..18437fa0a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/registermail.txt
@@ -0,0 +1,15 @@
+Zarejestrował się nowy użytkownik.
+Szczegółowe informacje:
+
+Użytkownik      : @NEWUSER@
+Imię i nazwisko : @NEWNAME@
+E-mail          : @NEWEMAIL@
+
+Data            : @DATE@
+Przeglądarka    : @BROWSER@
+Adres IP        : @IPADDRESS@
+Nazwa DNS       : @HOSTNAME@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/resendpwd.txt
new file mode 100644
index 000000000..a7cac7442
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Przesyłanie nowego hasła ======
+
+Aby otrzymać nowe hasło, podaj nazwę Twojego konta w tym wiki. Prośba o potwierdzenie w postaci odnośnika zostanie Ci przesłana pocztą elektroniczną.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/revisions.txt
new file mode 100644
index 000000000..afe2b6478
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/revisions.txt
@@ -0,0 +1,4 @@
+====== Poprzednie wersje ======
+
+Poprzednie wersje tej strony. Aby przywrócić poprzednią wersję wybierz ją, rozpocznij edycję a potem zapisz.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/searchpage.txt
new file mode 100644
index 000000000..61b9ffbf9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Wyszukiwanie ======
+
+Wyniki wyszukiwania. Jeśli nie znaleziono szukanego hasła, możesz utworzyć nową stronę, której tytułem będzie poszukiwane hasło.
+
+===== Wyniki =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/showrev.txt
new file mode 100644
index 000000000..43e826ed5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/showrev.txt
@@ -0,0 +1,2 @@
+**To jest stara wersja strony!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/stopwords.txt
new file mode 100644
index 000000000..f1d244a26
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/stopwords.txt
@@ -0,0 +1,89 @@
+# Lista słów ignorowanych przy indeksowaniu treści.
+# W jednej linii powinno znajdować się tylko jedno słowo.
+# Przy edycji tego pliku pamiętaj o używaniu uniksowego końca linii (LF).
+# Nie ma potrzeby wpisywania słów krótszych niż 3 znaki, ponieważ one są zawsze ignorowane.
+# Lista oparta na danych ze strony http://www.ranks.nl/stopwords/
+aby
+ale
+bardziej
+bardzo
+bez
+bowiem
+był
+była
+było
+były
+będzie
+czy
+czyli
+dla
+dlatego
+gdy
+gdzie
+ich
+innych
+jak
+jako
+jednak
+jego
+jej
+jest
+jeszcze
+jeśli
+już
+kiedy
+kilka
+która
+które
+którego
+której
+który
+których
+którym
+którzy
+lub
+między
+mnie
+mogą
+może
+można
+nad
+nam
+nas
+naszego
+naszych
+nawet
+nich
+nie
+nim
+niż
+oraz
+pod
+poza
+przed
+przede
+przez
+przy
+również
+się
+sobie
+swoje
+tak
+takie
+także
+tam
+tego
+tej
+ten
+też
+tych
+tylko
+tym
+wiele
+wielu
+więc
+wszystkich
+wszystkim
+wszystko
+właśnie
+zawsze
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/subscribermail.txt
new file mode 100644
index 000000000..76300177e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/subscribermail.txt
@@ -0,0 +1,17 @@
+Witaj!
+
+Strona @PAGE@ w wiki @TITLE@ została zmieniona.
+Szczegóły:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Aby zaprzestać subskrypcji zmian tej strony zaloguj się na
+@DOKUWIKIURL@ a następnie przejdź do strony
+@NEWPAGE@
+i wybierz 'zaprzestań subskrypcji zmian'.
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/updateprofile.txt
new file mode 100644
index 000000000..aa80f4cdf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Aktualizacja profilu użytkownika ======
+
+Wystarczy, że wypełnisz tylko te pola, które chcesz zmienić. Nie możesz zmienić nazwy użytkownika.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/uploadmail.txt
new file mode 100644
index 000000000..e76ec80e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/uploadmail.txt
@@ -0,0 +1,16 @@
+Umieszczono nowy plik.
+
+Szczegóły:
+
+Plik         : @MEDIA@
+Data         : @DATE@
+Przeglądarka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Rozmiar      : @SIZE@
+Typ MIME     : @MIME@
+Użytkownik   : @USER@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/wordblock.txt
new file mode 100644
index 000000000..09edb25dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pl/wordblock.txt
@@ -0,0 +1,4 @@
+====== Blokowanie niedozwolonych treści i spamu ======
+
+Twoje zmiany **nie** zostały zapisane, ponieważ zawierają niedozwolone słowa. Jeśli próbowałeś(aś) umieścić niedozwolone treści to wstydź się!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/admin.txt
new file mode 100644
index 000000000..f8be56e60
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/admin.txt
@@ -0,0 +1,4 @@
+====== Administração ======
+
+Abaixo você encontra uma lista das tarefas administrativas disponíveis no DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/adminplugins.txt
new file mode 100644
index 000000000..3eac7af53
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/backlinks.txt
new file mode 100644
index 000000000..fce9dba54
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/backlinks.txt
@@ -0,0 +1,4 @@
+====== Links reversos ======
+
+Esta é uma lista de todas as páginas que apresentam links para a página atual.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/conflict.txt
new file mode 100644
index 000000000..53d9afac7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/conflict.txt
@@ -0,0 +1,5 @@
+====== Existe uma nova versão ======
+
+Existe uma versão mais nova do documento que você editou. Isso acontece quando outro usuário modifica o documento enquanto você o está editando.
+
+Examine as diferenças mostradas abaixo atentamente e então decida qual versão deve permanecer. Se você selecionar ''Salvar'', sua versão será salva. Pressione ''Cancelar'' para manter a versão atual.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/denied.txt
new file mode 100644
index 000000000..d7e423f42
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/denied.txt
@@ -0,0 +1,3 @@
+====== Permissão Negada ======
+
+Desculpe, você não tem permissões suficientes para continuar. Por acaso esqueceu de autenticar-se?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/diff.txt
new file mode 100644
index 000000000..517d9f275
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/diff.txt
@@ -0,0 +1,3 @@
+====== Diferenças ======
+
+Aqui você vê as diferenças entre duas revisões dessa página.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/draft.txt
new file mode 100644
index 000000000..b3d345cca
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/draft.txt
@@ -0,0 +1,5 @@
+====== Rascunho encontrado ======
+
+A sua última sessão de edição não foi concluída corretamente. O DokuWiki automaticamente salvou um rascunho durante o seu trabalho, que você pode usar agora para continuar a sua edição. Abaixo você pode ver os dados que foram salvos na sua última sessão.
+
+Por favor, escolha se você quer //recuperar// sua sessão de edição perdida, //excluir// o rascunho salvo automaticamente ou //cancelar// o processo de edição.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/edit.txt
new file mode 100644
index 000000000..113fb8ede
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/edit.txt
@@ -0,0 +1,2 @@
+Edite a página e clique em ''Salvar''. Veja [[wiki:syntax|aqui]] a sintaxe do Wiki. Por favor, edite a página apenas se você puder **aprimorá-la**. Se você deseja testar alguma coisa, faça-o no [[playground:playground|playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/editrev.txt
new file mode 100644
index 000000000..c7aa47878
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/editrev.txt
@@ -0,0 +1,4 @@
+**Você carregou uma revisão antiga desse documento!** Se você salvá-la, irá criar uma nova versão em esses dados.
+----
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/index.txt
new file mode 100644
index 000000000..a7d17a2bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/index.txt
@@ -0,0 +1,3 @@
+====== Índice ======
+
+Esse é um índice de todas as páginas disponíveis, ordenadas por [[doku>namespaces|espaços de nomes]].
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/install.html
new file mode 100644
index 000000000..b915f0701
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/install.html
@@ -0,0 +1,7 @@
+<p>Essa página irá auxiliá-lo na instalação e configuração do <a href="http://dokuwiki.org">DokuWiki</a>. Você encontra mais informações sobre esse instalador na sua <a href="http://dokuwiki.org/installer">página de documentação</a>.</p>
+
+<p>O DokuWiki utiliza arquivos em texto simples para o armazenamento das páginas wiki e de outras informações associadas a essas páginas (ex.: imagens, índices de pesquisa, revisões antigas, etc.). Para que o DokuWiki funcione corretamente, ele <strong>precisa</strong> ter permissão de escrita aos diretórios onde esses arquivos ficarão armazenados. Esse instalador não tem capacidade de configurar as permissões de diretório. Isso normalmente é feito usando-se a linha de comando ou através do FTP ou do painel de controle da sua hospedagem (ex.: cPanel).</p>
+
+<p>O instalador irá definir as configurações da <acronym title="access control list (lista de controle de acessos)">ACL</acronym> do seu DokuWiki, o que permitirá a autenticação do administrador e o acesso ao menu de administração do sistema. Esse menu é utilizado para instalar plug-ins, alterar as configurações do ambiente e gerenciar usuários e acessos às páginas do wiki. Isso não é necessário para o funcionamento do DokuWiki, mas irá torna sua administração mais simples.</p>
+
+<p>Usuários experientes ou que necessitem efetuar configurações especiais devem utilizar os seguintes links, com instruções detalhadas da <a href="http://dokuwiki.org/install">instalação</a> e da <a href="http://dokuwiki.org/config">configuração</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/lang.php
new file mode 100644
index 000000000..ed7224c14
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/lang.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Brazilian Portuguese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Luis Fernando Enciso <lfenciso@certto.com.br>
+ * @author Alauton/Loug
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ * @author Felipe Castro <fefcas@gmail.com>
+ * @author Lucien Raven <lucienraven@yahoo.com.br>
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Flávio Veras <flaviove@gmail.com>
+ * @author Jeferson Propheta <jeferson.propheta@gmail.com>
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas <luis@dantas.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
+ * @author Jair Henrique <jair.henrique@gmail.com>
+ * @author Luis Dantas <luisdantas@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta página';
+$lang['btn_source']            = 'Mostrar código fonte';
+$lang['btn_show']              = 'Mostrar página';
+$lang['btn_create']            = 'Criar esta página';
+$lang['btn_search']            = 'Pesquisar';
+$lang['btn_save']              = 'Salvar';
+$lang['btn_preview']           = 'Visualizar';
+$lang['btn_top']               = 'Voltar ao topo';
+$lang['btn_newer']             = '<< mais recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisões anteriores';
+$lang['btn_recent']            = 'Alterações recentes';
+$lang['btn_upload']            = 'Enviar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Autenticar-se';
+$lang['btn_logout']            = 'Sair';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Atualizar';
+$lang['btn_delete']            = 'Excluir';
+$lang['btn_back']              = 'Voltar';
+$lang['btn_backlink']          = 'Links reversos';
+$lang['btn_backtomedia']       = 'Voltar à seleção do arquivo de mídia';
+$lang['btn_subscribe']         = 'Monitorar alterações na página';
+$lang['btn_unsubscribe']       = 'Cancelar monitoramento da página';
+$lang['btn_subscribens']       = 'Monitorar alterações no espaço de nomes';
+$lang['btn_unsubscribens']     = 'Cancelar monitoramento do espaço de nomes';
+$lang['btn_profile']           = 'Atualizar o perfil';
+$lang['btn_reset']             = 'Limpar';
+$lang['btn_resendpwd']         = 'Enviar uma nova senha';
+$lang['btn_draft']             = 'Editar o rascunho';
+$lang['btn_recover']           = 'Recuperar o rascunho';
+$lang['btn_draftdel']          = 'Excluir o rascunho';
+$lang['btn_revert']            = 'Restaure';
+$lang['loggedinas']            = 'Autenticado(a) como';
+$lang['user']                  = 'Nome de usuário';
+$lang['pass']                  = 'Senha';
+$lang['newpass']               = 'Nova senha';
+$lang['oldpass']               = 'Confirme a senha atual';
+$lang['passchk']               = 'mais uma vez';
+$lang['remember']              = 'Lembre-se de mim';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'E-mail';
+$lang['register']              = 'Registrar';
+$lang['profile']               = 'Perfil do usuário';
+$lang['badlogin']              = 'Desculpe, mas o nome de usuário ou a senha estão incorretos.';
+$lang['minoredit']             = 'Alterações mínimas';
+$lang['draftdate']             = 'O rascunho foi salvo automaticamente em';
+$lang['nosecedit']             = 'A página foi modificada nesse intervalo de tempo. Como a informação da seção estava desatualizada, foi carregada a página inteira.';
+$lang['regmissing']            = 'Desculpe, mas você precisa preencher todos os campos.';
+$lang['reguexists']            = 'Desculpe, mas já existe um usuário com esse nome.';
+$lang['regsuccess']            = 'O usuário foi criado e a senha enviada para seu e-mail.';
+$lang['regsuccess2']           = 'O usuário foi criado.';
+$lang['regmailfail']           = 'Aparentemente ocorreu um erro no envio da senha. Por favor, entre em contato com o administrador!';
+$lang['regbadmail']            = 'O endereço de e-mail fornecido é, aparentemente, inválido - se você acha que isso é um erro, entre em contato com o administrador';
+$lang['regbadpass']            = 'As senhas digitadas não são idênticas. Por favor, tente novamente.';
+$lang['regpwmail']             = 'A sua senha do DokuWiki';
+$lang['reghere']               = 'Ainda não tem uma conta? Cadastre-se para obter uma.';
+$lang['profna']                = 'Esse wiki não suporta modificações do perfil.';
+$lang['profnochange']          = 'Sem alterações, nada para fazer.';
+$lang['profnoempty']           = 'Não são permitidos nomes ou endereços de e-mail em branco.';
+$lang['profchanged']           = 'O perfil do usuário foi atualizado com sucesso.';
+$lang['pwdforget']             = 'Esqueceu sua senha? Obtenha uma nova.';
+$lang['resendna']              = 'Esse wiki não tem suporte para o reenvio de senhas.';
+$lang['resendpwd']             = 'Enviar a nova senha para';
+$lang['resendpwdmissing']      = 'Desculpe, você deve preencher todos os campos.';
+$lang['resendpwdnouser']       = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.';
+$lang['resendpwdbadauth']      = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.';
+$lang['resendpwdconfirm']      = 'Um link de confirmação foi enviado por e-mail.';
+$lang['resendpwdsuccess']      = 'Sua nova senha foi enviada por e-mail.';
+$lang['license']               = 'Exceto onde for informado ao contrário, o conteúdo neste wiki está sob a seguinte licença:';
+$lang['licenseok']             = 'Observe: editando esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+$lang['txt_upload']            = 'Selecione o arquivo a ser enviado';
+$lang['txt_filename']          = 'Enviar como (opcional)';
+$lang['txt_overwrt']           = 'Substituir o arquivo existente';
+$lang['lockedby']              = 'Atualmente bloqueada por';
+$lang['lockexpire']            = 'O bloqueio expira em';
+$lang['willexpire']            = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
+$lang['notsavedyet']           = 'As alterações não salvas serão perdidas.\nDeseja realmente continuar?';
+$lang['rssfailed']             = 'Ocorreu um erro durante a atualização dessa fonte: ';
+$lang['nothingfound']          = 'Não foi encontrado nada.';
+$lang['mediaselect']           = 'Arquivos de mídia';
+$lang['fileupload']            = 'Envio de arquivo de mídia';
+$lang['uploadsucc']            = 'O envio foi efetuado com sucesso';
+$lang['uploadfail']            = 'Não foi possível enviar o arquivo. Será algum problema com as permissões?';
+$lang['uploadwrong']           = 'O envio foi bloqueado. Essa extensão de arquivo é proibida!';
+$lang['uploadexist']           = 'O arquivo já existe. Não foi feito nada.';
+$lang['uploadbadcontent']      = 'O conteúdo enviado não corresponde à extensão do arquivo %s.';
+$lang['uploadspam']            = 'O envio foi bloqueado pela lista negra de spams.';
+$lang['uploadxss']             = 'O envio foi bloqueado devido à possibilidade do seu conteúdo ser malicioso.';
+$lang['uploadsize']            = 'O arquivo transmitido era grande demais. (max. %s)';
+$lang['deletesucc']            = 'O arquivo "%s" foi excluído.';
+$lang['deletefail']            = 'Não foi possível excluir "%s" - verifique as permissões.';
+$lang['mediainuse']            = 'O arquivo "%s" não foi excluído - ele ainda está em uso.';
+$lang['namespaces']            = 'Espaços de nome';
+$lang['mediafiles']            = 'Arquivos disponíveis em';
+$lang['js']['keepopen']        = 'Manter a janela aberta na seleção';
+$lang['js']['hidedetails']     = 'Esconder detalhes';
+$lang['js']['nosmblinks']      = 'Atalhos para pastas compartilhadas do Windows funcionam apenas no Microsoft Internet Explorer.
+Entretanto, você ainda pode copiar e colar o atalho.';
+$lang['js']['linkto']          = 'Link para:';
+$lang['js']['del_confirm']     = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
+$lang['js']['mu_btn']          = 'Enviar vários arquivos de uma vez';
+$lang['mediausage']            = 'Use a seguinte sintaxe para referenciar esse arquivo:';
+$lang['mediaview']             = 'Ver o arquivo original';
+$lang['mediaroot']             = 'raiz';
+$lang['mediaupload']           = 'Envie um arquivo para o espaço de nomes atual aqui. Para criar subespaços de nomes, preponha-os ao nome do arquivo no parâmetro "Enviar como", separados por vírgulas.';
+$lang['mediaextchange']        = 'A extensão do arquivo mudou de .%s para .%s!';
+$lang['reference']             = 'Referências para';
+$lang['ref_inuse']             = 'O arquivo não pode ser excluído, porque ele ainda está sendo utilizado nas seguintes páginas:';
+$lang['ref_hidden']            = 'Algumas referências estão em páginas que você não tem permissão para ler';
+$lang['hits']                  = 'Resultados';
+$lang['quickhits']             = 'Nomes de páginas coincidentes';
+$lang['toc']                   = 'Tabela de conteúdos';
+$lang['current']               = 'atual';
+$lang['yours']                 = 'Sua versão';
+$lang['diff']                  = 'Mostrar diferenças com a revisão atual';
+$lang['diff2']                 = 'Mostrar diferenças entre as revisões selecionadas';
+$lang['line']                  = 'Linha';
+$lang['breadcrumb']            = 'Visitou';
+$lang['youarehere']            = 'Você está aqui';
+$lang['lastmod']               = 'Última modificação';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'removida';
+$lang['created']               = 'criada';
+$lang['restored']              = 'revisão anterior restaurada';
+$lang['external_edit']         = 'edição externa';
+$lang['summary']               = 'Resumo da edição';
+$lang['noflash']               = 'O <a href="http://www.adobe.com/products/flashplayer/">plug-in Adobe Flash</a> é necessário para exibir este conteúdo.';
+$lang['mail_newpage']          = 'página adicionada:';
+$lang['mail_changed']          = 'página modificada:';
+$lang['mail_new_user']         = 'novo usuário:';
+$lang['mail_upload']           = 'arquivo enviado:';
+$lang['qb_bold']               = 'Texto em negrito';
+$lang['qb_italic']             = 'Texto em itálico';
+$lang['qb_underl']             = 'Texto sublinhado';
+$lang['qb_code']               = 'Texto de código';
+$lang['qb_strike']             = 'Texto riscado';
+$lang['qb_h1']                 = 'Cabeçalho de nível 1';
+$lang['qb_h2']                 = 'Cabeçalho de nível 2';
+$lang['qb_h3']                 = 'Cabeçalho de nível 3';
+$lang['qb_h4']                 = 'Cabeçalho de nível 4';
+$lang['qb_h5']                 = 'Cabeçalho de nível 5';
+$lang['qb_h']                  = 'Cabeçalho';
+$lang['qb_link']               = 'Link interno';
+$lang['qb_extlink']            = 'Link externo';
+$lang['qb_hr']                 = 'Linha horizontal';
+$lang['qb_ol']                 = 'Item de lista ordenada';
+$lang['qb_ul']                 = 'Item de lista não ordenada';
+$lang['qb_media']              = 'Adicionar imagens e/ou outros arquivos';
+$lang['qb_sig']                = 'Inserir assinatura';
+$lang['qb_smileys']            = 'Carinhas';
+$lang['qb_chars']              = 'Caracteres especiais';
+$lang['admin_register']        = 'Adicionar novo usuário';
+$lang['metaedit']              = 'Editar metadados';
+$lang['metasaveerr']           = 'Não foi possível escrever os metadados';
+$lang['metasaveok']            = 'Os metadados foram salvos';
+$lang['img_backto']            = 'Voltar para';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Descrição';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nome do arquivo';
+$lang['img_fsize']             = 'Tamanho';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Direitos autorais';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Câmera';
+$lang['img_keywords']          = 'Palavras-chave';
+$lang['subscribe_success']     = '%s foi adicionado à lista de monitoramento de %s';
+$lang['subscribe_error']       = 'Ocorreu um erro ao tentar adicionar %s à lista de monitoramento de %s';
+$lang['subscribe_noaddress']   = 'Não existe nenhum endereço de e-mail associado ao seu usuário, você não pode ser adicionado à lista de monitoramento.';
+$lang['unsubscribe_success']   = '%s foi removido da lista de monitoramento de %s';
+$lang['unsubscribe_error']     = 'Ocorreu um erro ao tentar remover %s da lista de monitoramento de %s';
+$lang['authmodfailed']         = 'A configuração da autenticação de usuário está com problemas. Por favor, informe ao administrador do wiki.';
+$lang['authtempfail']          = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.';
+$lang['i_chooselang']          = 'Selecione o seu idioma';
+$lang['i_installer']           = 'Instalador do DokuWiki';
+$lang['i_wikiname']            = 'Nome do Wiki';
+$lang['i_enableacl']           = 'Habilitar Lista de Controle de Acessos (recomendado)';
+$lang['i_superuser']           = 'Superusuário';
+$lang['i_problems']            = 'O instalador encontrou alguns problemas, indicados abaixo. Você não pode continuar até corrigi-los.';
+$lang['i_modified']            = 'Por questões de segurança, esse script funcionará apenas em uma instalação nova e não modificada do DokuWiki.
+Você pode extrair novamente os arquivos do pacote original ou consultar as <a href="http://dokuwiki.org/install">instruções de instalação do DokuWiki</a>.';
+$lang['i_funcna']              = 'A função PHP <code>%s</code> não está disponível. O seu host a mantém desabilitada por algum motivo?';
+$lang['i_phpver']              = 'A sua versão do PHP (<code>%s</code>) é inferior à necessária (<code>%s</code>). Você precisa atualizar a sua instalação do PHP.';
+$lang['i_permfail']            = 'O DokuWiki não tem permissão de escrita em <code>%s</code>. Você precisa corrigir as configurações de permissão nesse diretório!';
+$lang['i_confexists']          = '<code>%s</code> já existe';
+$lang['i_writeerr']            = 'Não foi possível criar <code>%s</code>. É necessário checar as permissões de arquivos/diretórios e criar o arquivo manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php não reconhecido ou modificado (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valor ilegal ou em branco';
+$lang['i_success']             = 'A configuração terminou com sucesso. Agora você deve excluir o arquivo install.php. Conheça o seu <a href="doku.php">novo DokuWiki</a>!';
+$lang['i_failure']             = 'Ocorreram alguns erros durante a escrita dos arquivos de configuração. É necessário corrigi-los manualmente antes de usar seu <a href="doku.php">novo DokuWiki</a>';
+$lang['i_policy']              = 'Política inicial de permissões';
+$lang['i_pol0']                = 'Wiki aberto (leitura, escrita e envio de arquivos por todos)';
+$lang['i_pol1']                = 'Wiki público (leitura por todos, escrita e envio de arquivos por usuários registrados)';
+$lang['i_pol2']                = 'Wiki fechado (leitura, escrita e envio de arquivos somente por usuários registrados)';
+$lang['i_retry']               = 'Tentar novamente';
+$lang['mu_intro']              = 'Aqui você pode enviar vários arquivos de uma só vez. Clique no botão de navegação e adicione-os à fila. Pressione Enviar quando estiver pronto.';
+$lang['mu_gridname']           = 'Nome do arquivo';
+$lang['mu_gridsize']           = 'Tamanho';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Espaço de nomes';
+$lang['mu_browse']             = 'Navegar';
+$lang['mu_toobig']             = 'muito grande';
+$lang['mu_ready']              = 'pronto para enviar';
+$lang['mu_done']               = 'completo';
+$lang['mu_fail']               = 'falhou';
+$lang['mu_authfail']           = 'a sessão expirou';
+$lang['mu_progress']           = '@PCT@% enviado';
+$lang['mu_filetypes']          = 'Tipos de arquivo permitidos';
+$lang['mu_info']               = 'arquivos enviados.';
+$lang['mu_lasterr']            = 'Erro mais recente:';
+$lang['recent_global']         = 'Você está observando as alterações dentro do espaço de nomes <b>%s</b>. Também é possível ver as <a href="%s">modificações recentes no wiki inteiro</a>.';
+$lang['years']                 = '%d anos atrás';
+$lang['months']                = '%d meses atrás';
+$lang['weeks']                 = '%d semanas atrás';
+$lang['days']                  = '%d dias atrás';
+$lang['hours']                 = '%d horas atrás';
+$lang['minutes']               = '%d minutos atrás';
+$lang['seconds']               = '%d segundos atrás';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/locked.txt
new file mode 100644
index 000000000..70658cba1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/locked.txt
@@ -0,0 +1,3 @@
+====== Página bloqueada ======
+
+Essa página está bloqueada para edição por outro usuário. Você tem que esperar até que esse usuário termine a edição ou que o bloqueio expire.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/login.txt
new file mode 100644
index 000000000..23215e16c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/login.txt
@@ -0,0 +1,3 @@
+====== Autenticação ======
+
+Você não está autenticado. Digite as seus dados de usuário abaixo para entrar no sistema. É necessário habilitar os //cookies// no seu navegador para que isso funcione.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/mailtext.txt
new file mode 100644
index 000000000..e52535bf0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/mailtext.txt
@@ -0,0 +1,17 @@
+Uma página em seu DokuWiki foi adicionada ou alterada. Aqui estão os detalhes:
+
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+Revisão antiga: @OLDPAGE@
+Nova revisão: @NEWPAGE@
+Resumo da edição: @SUMMARY@
+Usuário: @USER@
+
+@DIFF@
+
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/newpage.txt
new file mode 100644
index 000000000..77ba49fa5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/newpage.txt
@@ -0,0 +1,3 @@
+====== Esse tópico ainda não existe ======
+
+Você clicou em um link para um tópico que ainda não existe. Se for permitido, você poderá criá-lo usando o botão ''Criar essa página''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/norev.txt
new file mode 100644
index 000000000..19024dcf7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/norev.txt
@@ -0,0 +1,3 @@
+====== Essa revisão não existe ======
+
+A revisão especificada não existe. Utilize o botão ''Revisões anteriores'' para uma listagem das revisões anteriores deste documento.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/preview.txt
new file mode 100644
index 000000000..efdc8f7f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/preview.txt
@@ -0,0 +1,3 @@
+====== Visualização ======
+
+Essa é uma visualização de como será a aparência do seu texto. Lembre-se: ele ainda **não foi gravado**!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/pwconfirm.txt
new file mode 100644
index 000000000..2a7c88531
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/pwconfirm.txt
@@ -0,0 +1,13 @@
+Olá @FULLNAME@!
+
+Alguém requisitou um nova senha para o seu usuário @TITLE@ em @DOKUWIKIURL@.
+
+Se não foi você quem fez essa requisição, simplesmente ignore essa mensagem.
+
+Se você realmente deseja receber uma nova senha, por favor, utilize o link abaixo, para confirmar sua requisição.
+
+@CONFIRM@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/read.txt
new file mode 100644
index 000000000..897155eed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/read.txt
@@ -0,0 +1 @@
+Essa página está em modo somente de leitura. Você pode visualizar a fonte, mas não alterá-la. Informe-se com o administrador do Wiki, caso você ache que isso está incorreto.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/recent.txt
new file mode 100644
index 000000000..988f235b4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/recent.txt
@@ -0,0 +1,4 @@
+====== Alterações Recentes ======
+
+As seguintes páginas foram alteradas recentemente.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/register.txt
new file mode 100644
index 000000000..431feca98
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/register.txt
@@ -0,0 +1,4 @@
+====== Registre-se como um novo usuário ======
+
+Preencha todas as informações abaixo para criar uma nova conta nesse Wiki. Certifique-se de que você forneceu um **endereço de e-mail válido** - se não for pedido que você entre com uma senha aqui, ela será enviada para esse endereço. O nome de usuário deve ser um [[doku>pagename|nome de página]] válido.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/registermail.txt
new file mode 100644
index 000000000..9bb6a00ba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/registermail.txt
@@ -0,0 +1,14 @@
+Foi registrado um novo usuário. Seus detalhes são:
+
+Nome de usuário: @NEWUSER@
+Nome completo: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/resendpwd.txt
new file mode 100644
index 000000000..b74713f0f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar nova senha ======
+
+Por favor, digite o seu nome de usuário no formulário abaixo para requisitar uma nova senha para a sua conta nesse wiki. O link de confirmação será enviado para o endereço de e-mail que você forneceu.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/revisions.txt
new file mode 100644
index 000000000..1c174dcb0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisões anteriores ======
+
+Essas são as revisões anteriores desse documento. Para reverter a uma revisão antiga, selecione-a abaixo, clique em ''Editar esta página'' e salve-a.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/searchpage.txt
new file mode 100644
index 000000000..2fba3afe9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/searchpage.txt
@@ -0,0 +1,5 @@
+====== Pesquisa ======
+
+Você pode encontrar os resultados da sua pesquisa abaixo. Se você não encontrou o que está procurando, pode criar ou editar a página com o nome que você especificou, usando o botão apropriado.
+
+===== Resultados =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/showrev.txt
new file mode 100644
index 000000000..89d9cad5a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/showrev.txt
@@ -0,0 +1,2 @@
+**Essa é uma revisão anterior do documento!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/stopwords.txt
new file mode 100644
index 000000000..c781ffbf2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/stopwords.txt
@@ -0,0 +1,55 @@
+# Essa é uma lista de palavras que o indexador ignora, uma palavra por linha
+# Ao editar esse arquivo, certifique-se de usar terminações de linha UNIX (newline simples)
+# Não há necessidade de incluir palavras menores que 3 caracteres - elas já são ignoradas por padrão
+# Essa lista é baseada na encontrada em http://www.ranks.nl/stopwords/portugese.html
+acerca
+algum
+alguma
+algumas
+alguns
+ambos
+antes
+após
+aquela
+aquelas
+aquele
+aqueles
+até
+bem
+bom
+cada
+com
+como
+das
+desde
+dos
+enquanto
+então
+esta
+este
+estas
+estes
+essa
+essas
+esse
+esses
+isso
+isto
+mas
+mesmo
+onde
+para
+pelo
+por
+qual
+quando
+que
+quem
+sem
+somente
+tal
+também
+uma
+umas
+uns
+www
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/subscribermail.txt
new file mode 100644
index 000000000..157196c15
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/subscribermail.txt
@@ -0,0 +1,24 @@
+Olá!
+
+A página @PAGE@, no wiki @TITLE@ foi modificada.
+Aqui estão as mudanças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Usuário : @USER@
+Resumo da edição: @SUMMARY@
+Revisão antiga: @OLDPAGE@
+Revisão nova: @NEWPAGE@
+
+Para cancelar as notificações dessa página, identifique-se em
+@DOKUWIKIURL@, vá até
+@NEWPAGE@
+e cancele o monitoramento das alterações da página e/ou do
+espaço de nomes.
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/updateprofile.txt
new file mode 100644
index 000000000..b3f62f396
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Atualize o perfil da sua conta ======
+
+Você precisa preencher somente os campos que você deseja alterar. Você não pode alterar o seu nome de usuário.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/uploadmail.txt
new file mode 100644
index 000000000..a3ac9bac7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/uploadmail.txt
@@ -0,0 +1,14 @@
+Um arquivo foi enviado para o seu DokuWiki. Os detalhes são:
+
+Arquivo: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+Tamanho: @SIZE@
+Tipo MIME: @MIME@
+Usuário: @USER@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/wordblock.txt
new file mode 100644
index 000000000..c2c9cbdb0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt-br/wordblock.txt
@@ -0,0 +1,4 @@
+====== Bloqueio de SPAM ======
+
+Suas modificações **não** foram salvas porque elas contém uma ou mais palavras bloqueadas. Se você tentou enviar //spam// para o //wiki//, isso é feio, muito feio! Agora, se você acha que esse bloqueio foi indevido, por favor entre em contato com o administrador desse wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/admin.txt
new file mode 100644
index 000000000..fccd9ca33
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/admin.txt
@@ -0,0 +1,5 @@
+====== Administração ======
+
+Esta é a lista de tarefas de Administração permitidas pelo DokuWiki.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/adminplugins.txt
new file mode 100644
index 000000000..3eac7af53
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/backlinks.txt
new file mode 100644
index 000000000..e78ddf874
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+Esta é uma lista de todos os documentos que apresentam ligações ao documento corrente.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/conflict.txt
new file mode 100644
index 000000000..d2af1fe11
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/conflict.txt
@@ -0,0 +1,9 @@
+====== Conflito de Edição ======
+
+**Atenção**: Existe uma versão mais recente do que a versão usada no começo da sua edição. Isto acontece quando outra pessoa editou este documento entretanto e já gravou as alterações efectuadas.
+
+Por favor, examine todas as diferenças mostradas abaixo com atenção, e decida qual a versão que deverá ser tornada a mais actual:   * Se escolher <Gravar> a sua versão será sobreposta à versão editada pela outra pessoa, que será perdida.   * Se escolher <Cancelar> a versão editada pela outra pessoa será a versão final, e a sua será perdida.
+
+**Nota**: Sem que efectue a consolidação das alterações de ambas as revisões ao documento irá sempre perder uma das versões.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/denied.txt
new file mode 100644
index 000000000..71355b01f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/denied.txt
@@ -0,0 +1,5 @@
+====== Permissão Negada ======
+
+Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de entrar em sessão?
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/diff.txt
new file mode 100644
index 000000000..e27640aa8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/diff.txt
@@ -0,0 +1,5 @@
+====== Diferenças ======
+
+Esta página mostra as diferenças entre a revisão do documento que escolheu e a versão actual.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/draft.txt
new file mode 100644
index 000000000..1baf95c1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/draft.txt
@@ -0,0 +1,7 @@
+====== Rascunho encontrado ======
+
+A sessão referente à última edição desta página não terminou correctamente. Foi guardado automaticamente um rascunho durante a edição que pode ou não usar para continuar a edição. Abaixo pode ver os dados guardados da última sessão.
+
+Por favor, decida se quer **recuperar** os dados guardados, **remover** o rascunho** ou **cancelar** o processo de edição corrente.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/edit.txt
new file mode 100644
index 000000000..2fa596e29
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/edit.txt
@@ -0,0 +1,4 @@
+Edite o documento e clique no botão <Gravar>. Reveja a [[wiki:syntax|sintaxe]] das regras de formatação do texto.
+
+Por favor, altere o conteúdo deste documento apenas quando puder **melhorá-lo**.\\ Se pretende testar os seus conhecimentos no uso deste motor Wiki, realize os seus testes no [[playground:playground | Recreio]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/editrev.txt
new file mode 100644
index 000000000..9845a6915
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/editrev.txt
@@ -0,0 +1,5 @@
+**Atenção**: Carregou uma revisão antiga do documento!
+
+Se gravar esta revisão irá criar uma nova versão actual do documento com este conteúdo, que substituirá a versão actual.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/index.txt
new file mode 100644
index 000000000..f490b7a5c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/index.txt
@@ -0,0 +1,6 @@
+====== Índice ======
+
+Este índice mostra todos os documentos disponíveis neste site Wiki, [[doku>namespaces | agrupados]] por assunto.
+
+----
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/install.html
new file mode 100644
index 000000000..a2fd5c7c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/install.html
@@ -0,0 +1,8 @@
+<p>Esta página serve de "assistente" para a primeira instalação e configuração do <a href="http://dokuwiki.org">Dokuwiki</a>. Está disponível mais informação sobre este "assistente" na sua <a href="http://dokuwiki.org/installer">página de documentação</a>.</p>
+
+<p>O DokuWiki usa ficheiros normais para armazenar as páginas Wiki e outras informações associadas a essas páginas (i.e. imagens, índices de pesquisa, revisões antigas, etc.). O DokuWiki para poder funcionar correctamente <strong>requer</strong> permissões de escrita às pastas que contêm esses ficheiros. Este "assistente" não é capaz de configurar essas permissões. Isso tem que ser feito via linha de comandos, FTP ou Painel de Controlo do serviço de alojamento (i.e. cPanel).</p>
+
+<p>Este "assistente" vai configurar o DokuWiki com
+<acronym title="access control list">ACL</acronym>, que por sua vez permite ao administrador entrar em sessão e aceder ao menu de Administração do DokuWiki para poder instalar plugins, gerir utilizadores e seus perfis, gerir acesso às páginas e à própria configuração do DokuWiki. Não é necessário para que o DokuWiki funcione, mas facilita a sua administração.</p>
+
+<p>Utilizadores experiente ou com requisitos especiais devem seguir estes links, que detalham mais em pormenor a<a href="http://dokuwiki.org/install">instalação</a> e <a href="http://dokuwiki.org/config">configuração</a> do DokuWiki.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/lang.php
new file mode 100644
index 000000000..ef4c70785
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/lang.php
@@ -0,0 +1,237 @@
+<?php
+/**
+ * Portuguese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
+ * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Fil <fil@meteopt.com>
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '´';
+$lang['btn_edit']              = 'Editar página';
+$lang['btn_source']            = 'Ver fonte';
+$lang['btn_show']              = 'Ver página';
+$lang['btn_create']            = 'Criar página';
+$lang['btn_search']            = 'Pesquisar';
+$lang['btn_save']              = 'Gravar';
+$lang['btn_preview']           = 'Prever';
+$lang['btn_top']               = 'Voltar ao topo';
+$lang['btn_newer']             = '<< mais recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisões';
+$lang['btn_recent']            = 'Alt. Recentes';
+$lang['btn_upload']            = 'Carregar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Entrar';
+$lang['btn_logout']            = 'Sair';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Actualizar';
+$lang['btn_delete']            = 'Apagar';
+$lang['btn_back']              = 'Voltar';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Voltar à Selecção de Media';
+$lang['btn_subscribe']         = 'Subscrever Alterações';
+$lang['btn_unsubscribe']       = 'Não Subscrever Alterações';
+$lang['btn_subscribens']       = 'Subscrever Mudanças de Espaço de Nome';
+$lang['btn_unsubscribens']     = 'Cancelar Subscrição de Mudanças de Espaço de Nome';
+$lang['btn_profile']           = 'Actualizar Perfil';
+$lang['btn_reset']             = 'Limpar';
+$lang['btn_resendpwd']         = 'Enviar nova senha';
+$lang['btn_draft']             = 'Editar rascunho';
+$lang['btn_recover']           = 'Recuperar rascunho';
+$lang['btn_draftdel']          = 'Apagar rascunho';
+$lang['loggedinas']            = 'Está em sessão como';
+$lang['user']                  = 'Utilizador';
+$lang['pass']                  = 'Senha';
+$lang['newpass']               = 'Nova senha';
+$lang['oldpass']               = 'Confirme senha actual';
+$lang['passchk']               = 'Confirmar novamente';
+$lang['remember']              = 'Memorizar?';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'Email';
+$lang['register']              = 'Registar';
+$lang['profile']               = 'Perfil do Utilizador';
+$lang['badlogin']              = 'O utilizador inválido ou senha inválida.';
+$lang['minoredit']             = 'Alterações Menores';
+$lang['draftdate']             = 'Rascunho automaticamente gravado em';
+$lang['nosecedit']             = 'A página foi modificada entretanto. Como a informação da secção estava desactualizada, foi carregada a página inteira.';
+$lang['regmissing']            = 'Por favor, preencha todos os campos.';
+$lang['reguexists']            = 'Este utilizador já está inscrito. Por favor escolha outro nome de utilizador.';
+$lang['regsuccess']            = 'O utilizador foi criado e a senha foi enviada para o endereço de correio electrónico usado na inscrição.';
+$lang['regsuccess2']           = 'O utilizador foi criado.';
+$lang['regmailfail']           = 'Houve um erro no envio da senha por e-mail. Por favor, contacte o administrador!';
+$lang['regbadmail']            = 'O endereço de correio electrónico é inválido. Se o endereço está correcto, e isto é um erro, por favor, contacte o administrador!';
+$lang['regbadpass']            = 'As duas senhas não são idênticas, por favor tente de novo.';
+$lang['regpwmail']             = 'A sua senha DokuWiki';
+$lang['reghere']               = 'Para se registar, clique em';
+$lang['profna']                = 'Este Wiki não suporta modificações aos perfis.';
+$lang['profnochange']          = 'Nada alteração, nada a fazer.';
+$lang['profnoempty']           = 'Não são permitidos nomes ou endereços em branco.';
+$lang['profchanged']           = 'Perfil do utilizador actualizado com sucesso.';
+$lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
+$lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
+$lang['resendpwd']             = 'Enviar nova senha para';
+$lang['resendpwdmissing']      = 'É preciso preencher todos os campos.';
+$lang['resendpwdnouser']       = 'Não foi possível encontrar este utilizador.';
+$lang['resendpwdbadauth']      = 'O código de autenticação não é válido. Por favor, assegure-se de que o link de confirmação está completo.';
+$lang['resendpwdconfirm']      = 'O link de confirmação foi enviado por e-mail.';
+$lang['resendpwdsuccess']      = 'A nova senha foi enviada por e-mail.';
+$lang['license']               = 'Excepto menção em contrário, o conteúdo neste wiki está sob a seguinte licença:';
+$lang['licenseok']             = 'Nota: Ao editar esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+$lang['txt_upload']            = 'Escolha ficheiro para carregar';
+$lang['txt_filename']          = 'Carregar como (opcional)';
+$lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
+$lang['lockedby']              = 'Bloqueado por';
+$lang['lockexpire']            = 'Expira em';
+$lang['willexpire']            = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos de edição, clique no botão <Prever> para re-iniciar o temporizador de bloqueio.';
+$lang['notsavedyet']           = 'Existem alterações não gravadas, que serão perdidas se continuar.\nDeseja realmente continuar?';
+$lang['rssfailed']             = 'Ocorreu um erro neste canal RSS: ';
+$lang['nothingfound']          = 'Nada foi encontrado.';
+$lang['mediaselect']           = 'Selecção de ficheiros';
+$lang['fileupload']            = 'Carregamento de ficheiros';
+$lang['uploadsucc']            = 'Carregamento com sucesso';
+$lang['uploadfail']            = 'Falhou o carregamento. Talvez por não ter permissões?';
+$lang['uploadwrong']           = 'Carregamento negado. Esta extensão está proibida.';
+$lang['uploadexist']           = 'O ficheiro já existe. Não pode ser carregado.';
+$lang['uploadbadcontent']      = 'O conteúdo carregado não corresponde à extensão %s.';
+$lang['uploadspam']            = 'O carregamento foi bloqueado pela lista negra de SPAM.';
+$lang['uploadxss']             = 'O carregamento foi bloqueado porque possivelmente contem conteúdo malicioso.';
+$lang['uploadsize']            = 'O ficheiro carregado é demasiado grande. (máx. %s)';
+$lang['deletesucc']            = 'O ficheiro "%s" foi removido.';
+$lang['deletefail']            = 'O ficheiro "%s" não pode ser removido, por favor verifique as permissões.';
+$lang['mediainuse']            = 'O ficheiro "%s" não foi removido porque está ainda a ser usado.';
+$lang['namespaces']            = 'Grupos';
+$lang['mediafiles']            = 'Ficheiros disponíveis em';
+$lang['js']['keepopen']        = 'Mantenha a janela aberta durante a selecção';
+$lang['js']['hidedetails']     = 'Esconder Detalhes';
+$lang['js']['nosmblinks']      = 'Ligação a pastas Windows partilhadas apenas funciona com o Microsoft Internet Explorer.
+Pode no entanto copiar e colar o link.';
+$lang['js']['linkwiz']         = 'Assistente de Criação de Ligação';
+$lang['js']['linkto']          = 'Ligação para:';
+$lang['js']['del_confirm']     = 'Remover esta entrada?';
+$lang['js']['mu_btn']          = 'Enviar múltiplos ficheiros de uma vez';
+$lang['mediausage']            = 'Use a seguinte sintaxe para referenciar este ficheiro:';
+$lang['mediaview']             = 'Ver ficheiro original';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Carregar ficheiros para o grupo actual aqui. Para criar sub-grupos: escrever o nome do sub-grupo seguido de : antes do nome do ficheiro no campo "Carregar como".';
+$lang['mediaextchange']        = 'Extensão alterada de .%s para .%s!';
+$lang['reference']             = 'Referências para';
+$lang['ref_inuse']             = 'O ficheiro "%s" não pode ser removido, porque está ainda a ser usado nestes documentos:';
+$lang['ref_hidden']            = 'Algumas referências estão em documentos para os quais não tem permissão para ler';
+$lang['hits']                  = 'Resultados';
+$lang['quickhits']             = 'Documentos encontrados';
+$lang['toc']                   = 'Tabela de Conteúdos';
+$lang['current']               = 'Actual';
+$lang['yours']                 = 'A sua versão';
+$lang['diff']                  = 'mostrar diferenças com a versão actual';
+$lang['diff2']                 = 'mostrar diferenças entre versões escolhidas';
+$lang['line']                  = 'Linha';
+$lang['breadcrumb']            = 'Está em';
+$lang['youarehere']            = 'Está aqui';
+$lang['lastmod']               = 'Esta página foi modificada pela última vez em';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'Documento automaticamente removido.';
+$lang['created']               = 'Criação deste novo documento.';
+$lang['restored']              = 'Versão anterior restaurada.';
+$lang['external_edit']         = 'Edição externa';
+$lang['summary']               = 'Sumário da Edição';
+$lang['noflash']               = 'O <a href="http://www.adobe.com/products/flashplayer/">Plugin Adobe Flash</a> é necessário para exibir este conteúdo.';
+$lang['download']              = 'Descarregar Snippet';
+$lang['mail_newpage']          = 'documento adicionado:';
+$lang['mail_changed']          = 'documento modificado:';
+$lang['mail_new_user']         = 'Novo utilizador:';
+$lang['mail_upload']           = 'Ficheiro carregado:';
+$lang['qb_bold']               = 'Texto com Ênfase';
+$lang['qb_italic']             = 'Texto Itálico';
+$lang['qb_underl']             = 'Texto Sublinhado';
+$lang['qb_code']               = 'Texto Código';
+$lang['qb_strike']             = 'Texto Riscado';
+$lang['qb_h1']                 = 'Cabeçalho Nível 1';
+$lang['qb_h2']                 = 'Cabeçalho Nível 2';
+$lang['qb_h3']                 = 'Cabeçalho Nível 3';
+$lang['qb_h4']                 = 'Cabeçalho Nível 4';
+$lang['qb_h5']                 = 'Cabeçalho Nível 5';
+$lang['qb_h']                  = 'Cabeçalho';
+$lang['qb_hs']                 = 'Seleccionar Cabeçalho';
+$lang['qb_hplus']              = 'Cabeçalho Maior';
+$lang['qb_hminus']             = 'Cabeçalho Menor';
+$lang['qb_hequal']             = 'Cabeçalho de Nível Semelhante';
+$lang['qb_link']               = 'Ligação Interna';
+$lang['qb_extlink']            = 'Ligação Externa';
+$lang['qb_hr']                 = 'Barra Horizontal';
+$lang['qb_ol']                 = 'Item numa Lista Ordenada';
+$lang['qb_ul']                 = 'Item numa Lista Não Ordenada';
+$lang['qb_media']              = 'Incluir imagens e outros ficheiros';
+$lang['qb_sig']                = 'Inserir Assinatura';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Caracteres Especiais';
+$lang['upperns']               = 'Ir para o espaço de nomes parente';
+$lang['admin_register']        = 'Registar Novo Utilizador';
+$lang['metaedit']              = 'Editar Metadata';
+$lang['metasaveerr']           = 'Falhou a escrita de Metadata';
+$lang['metasaveok']            = 'Metadata gravada';
+$lang['img_backto']            = 'De volta a';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Legenda';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Ficheiro';
+$lang['img_fsize']             = 'Tamanho';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Câmara';
+$lang['img_keywords']          = 'Palavras-Chave';
+$lang['subscribe_success']     = '%s adicionado à lista de subscritores de %s';
+$lang['subscribe_error']       = 'Erro ao adicionar %s à lista de subscritores de %s';
+$lang['subscribe_noaddress']   = 'Não existe nenhum endereço associado ao seu perfil, por isso não pode ser adicionado à lista de subscritores.';
+$lang['unsubscribe_success']   = '%s removido da lista de subscritores de %s';
+$lang['unsubscribe_error']     = 'Erro ao remover %s da lista de subscritores de %s';
+$lang['authmodfailed']         = 'Configuração de autenticação errada. Por favor, informe o Wiki Admin.';
+$lang['authtempfail']          = 'Autenticação temporariamente indisponível. Se a situação persistir, por favor informe o Wiki Admin.';
+$lang['i_chooselang']          = 'Escolha a linguagem';
+$lang['i_installer']           = 'Instalador do DokuWiki';
+$lang['i_wikiname']            = 'Nome Wiki';
+$lang['i_enableacl']           = 'Activar ACL (recomendado)';
+$lang['i_superuser']           = 'Super-utilizador';
+$lang['i_problems']            = 'O instalador encontrou alguns problemas, indicados mais abaixo. Não pode continuar até que sejam corrigidos.';
+$lang['i_modified']            = 'Por razões de segurança, este script só funciona em novas e não-modificadas instalações do Dokuwiki. Deve por isso re-extrair os ficheiros do pacote que descarregou ou então deve consultar as completas <a href="http://dokuwiki.org/install">instruções de instalação do Dokuwiki installation instructions</a>';
+$lang['i_funcna']              = 'A função PHP <code>%s</code> não está disponível. Terá o serviço de alojamento desactivado-a por alguma razão?';
+$lang['i_phpver']              = 'A versão de PHP actual <code>%s</code> é inferior à versão mínima <code>%s</code>. É preciso actualizar a instalação PHP.';
+$lang['i_permfail']            = '<code>%s</code> não permite que o DokuWiki escreva nela. É preciso corrigir as permissões desta pasta!';
+$lang['i_confexists']          = '<code>%s</code> já existe';
+$lang['i_writeerr']            = 'Não foi possível criar <code>%s</code>. É preciso verificar as permissões e criar o ficheiro manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php não é o original ou não é reconhecido (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valor ilegal ou vazio';
+$lang['i_success']             = 'A instalação e configuração inicial foram bem sucedidas. Pode remover o install.php. Aceda ao seu novo <a href="doku.php">Wiki</a> a correr o DokuWiki.';
+$lang['i_failure']             = 'Ocorreram alguns erros durante a escrita nos ficheiros de configuração. Poderá ser preciso corrigi-los manualmente antes de poder aceder ao seu novo <a href="doku.php">Wiki</a> a correr o DokuWiki.';
+$lang['i_policy']              = 'Politica ACL inicial';
+$lang['i_pol0']                = 'Wiki Aberto (ler, escrever e carregar para todos)';
+$lang['i_pol1']                = 'Wiki Público (ler para todos, escrever e carregar para utilizadores inscritos)';
+$lang['i_pol2']                = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)';
+$lang['i_retry']               = 'Repetir';
+$lang['mu_intro']              = 'Aqui podes enviar múltiplos ficheiros de uma vez. Clique no botão de navegação para adicioná-los na fila. Premir upload quando pronto.';
+$lang['mu_gridname']           = 'Nome do ficheiro';
+$lang['mu_gridsize']           = 'Tamanho';
+$lang['mu_gridstat']           = 'Estado';
+$lang['mu_namespace']          = 'Espaço de Nomes';
+$lang['mu_browse']             = 'Navegar';
+$lang['mu_toobig']             = 'demasiado grande';
+$lang['mu_ready']              = 'pronto para upload';
+$lang['mu_done']               = 'completo';
+$lang['mu_fail']               = 'falhou';
+$lang['mu_authfail']           = 'sessão expirada';
+$lang['mu_progress']           = '@PCT@% transferido';
+$lang['mu_filetypes']          = 'Tipos de Ficheiros Permitidos';
+$lang['mu_info']               = 'Ficheiros carregados.';
+$lang['mu_lasterr']            = 'Último erro:';
+$lang['recent_global']         = 'Você está a observar as alterações dentro do espaço de nomes <b>%s</b>. Também é possível ver as <a href="%s">modificações recentes no wiki inteiro</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/locked.txt
new file mode 100644
index 000000000..b9df29cb5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/locked.txt
@@ -0,0 +1,5 @@
+====== Página em Edição ======
+
+Esta página está bloqueada por outro utilizador, que se encontra a editá-la neste momento.\\ Terá que aguardar que o utilizador termine a edição e grava as alterações ou então que temporizador de bloqueio expire.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/login.txt
new file mode 100644
index 000000000..e8000bbab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/login.txt
@@ -0,0 +1,7 @@
+====== Entrar ======
+
+Não está actualmente em sessão!\\ Introduza os seus dados de utilizador para entrar em sessão.
+
+**Nota**: Precisa de ter //cookies// activos no seu navegador.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/mailtext.txt
new file mode 100644
index 000000000..915a147ec
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/mailtext.txt
@@ -0,0 +1,20 @@
+Um documento no site Wiki @DOKUWIKIURL@ foi criado ou modificado.
+
+Aqui estão os detalhes:
+
+Data          : @DATE@
+Browser       : @BROWSER@
+Endereço IP   : @IPADDRESS@
+Hostname      : @HOSTNAME@
+Documento Ant.: @OLDPAGE@
+Documento Novo: @NEWPAGE@
+Edit Summary  : @SUMMARY@
+User          : @USER@
+
+@DIFF@
+
+
+
+----
+
+Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/newpage.txt
new file mode 100644
index 000000000..4db706be1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/newpage.txt
@@ -0,0 +1,7 @@
+====== Documento Inexistente ======
+
+Acaba de tentar aceder a um documento que ainda não existe.
+
+Pode criar o conteúdo deste novo documento após clicar no botão <Criar página>.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/norev.txt
new file mode 100644
index 000000000..6dd8dfb6c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/norev.txt
@@ -0,0 +1,7 @@
+====== Revisão Inexistente ======
+
+A revisão especificada não existe.
+
+Clique no botão <Revisões> para aceder à lista de revisões deste documento.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/preview.txt
new file mode 100644
index 000000000..077665881
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/preview.txt
@@ -0,0 +1,7 @@
+====== Previsão ======
+
+Esta é a previsão de como irá ficar o conteúdo do documento se clicar no botão <Gravar>.
+
+**Atenção**: O documento ainda não se encontra gravado.\\ É necessário clicar no botão <Gravar> para efectivar as modificações que tenha realizado.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/pwconfirm.txt
new file mode 100644
index 000000000..2848a116c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/pwconfirm.txt
@@ -0,0 +1,13 @@
+Olá @FULLNAME@!
+
+Alguém efectuou um pedido para uma nova senha para o seu perfil @TITLE@ em @DOKUWIKIURL@
+
+Se não foi você que efectuou o pedido então por favor ignore esta mensagem.
+
+Senão, para confirmar o pedido, por favor siga este link:
+
+@CONFIRM@
+
+-- 
+
+Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/read.txt
new file mode 100644
index 000000000..92be189f3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/read.txt
@@ -0,0 +1,3 @@
+**Atenção**: Este documento é apenas de leitura.\\ Pode ver o documento em bruto mas não pode gravar qualquer alteração.\\ \\ Informe-se com o administrador deste Wiki se achar que isto não está correcto.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/recent.txt
new file mode 100644
index 000000000..339041468
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/recent.txt
@@ -0,0 +1,5 @@
+====== Alterações Recentes ======
+
+Os seguintes documentos foram alterados recentemente.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/register.txt
new file mode 100644
index 000000000..c647a4615
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/register.txt
@@ -0,0 +1,7 @@
+====== Inscrição ======
+
+Por favor, preencha todos os campos com a informação correspondente, para poder criar uma nova conta neste SiteWiki.
+
+**Nota**: O nome de utilizador deve cumprir as mesmas regras de nomeação de documentos Wiki válidos.\\ **Atenção**: Verifique que o endereço de correio electrónico que preencheu é válido, pois a sua senha será enviada por e-mail.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/registermail.txt
new file mode 100644
index 000000000..b9c1f164b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/registermail.txt
@@ -0,0 +1,14 @@
+Inscrição de um novo utilizador. Aqui estão os detalhes:
+
+Username : @NEWUSER@
+Nome Completo : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Browser : @BROWSER@
+Endereço IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+----
+
+Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/resendpwd.txt
new file mode 100644
index 000000000..9a54ace07
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar nova senha ======
+
+Por favor, insira o seu nome de utilizador neste formulário para requerer uma nova senha para esta conta/perfil. Um link de confirmação será enviado para o endereço de e-mail associado.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/revisions.txt
new file mode 100644
index 000000000..213022f91
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/revisions.txt
@@ -0,0 +1,5 @@
+====== Revisões ======
+
+Estas são as revisões ao documento corrente.\\ Para reverter o documento para uma destas revisões:   * Escolha a revisão do documento da lista abaixo;   * Clique depois no botão <Editar página>;   * Faça as alterações que veja necessárias - opcional;   * Grava a revisão antiga como sendo a revisão actual do documento. Após a gravação, o documento da versão actual será substituído pelo documento da revisão escolhida.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/searchpage.txt
new file mode 100644
index 000000000..49a0b16ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/searchpage.txt
@@ -0,0 +1,7 @@
+====== Pesquisa ======
+
+Os resultados da sua pesquisa encontram-se mais abaixo.
+
+Se não encontrou o que procurava, pode criar uma nova página com o nome da sua pesquisa, usando o botão <Editar página>.
+
+===== Resultados =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/showrev.txt
new file mode 100644
index 000000000..e8ad7f47a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/showrev.txt
@@ -0,0 +1,3 @@
+**Atenção**: Esta é uma versão antiga do documento!
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/stopwords.txt
new file mode 100644
index 000000000..373e6ee5a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/stopwords.txt
@@ -0,0 +1,141 @@
+# Esta é uma lista de plavaras que o indexador ignora, uma palavra por linha
+# Quando você edita esta lista certifique-se que usa fim de linha usado em sistemas UNIX
+# Não é necessário incluir palavras menores que 3 letras - estas são sempre ignoradas
+# Esta lista é baseada nas encontradas em http://www.ranks.nl/stopwords/
+último
+acerca
+agora
+algmas
+alguns
+ali
+ambos
+antes
+apontar
+aquela
+aquelas
+aquele
+aqueles
+aqui
+atrás
+bem
+bom
+cada
+caminho
+cima
+com
+como
+comprido
+conhecido
+corrente
+das
+debaixo
+dentro
+desde
+desligado
+deve
+devem
+deverá
+direita
+diz
+dizer
+dois
+dos
+ela
+ele
+eles
+enquanto
+então
+está
+estão
+estado
+estar
+estará
+este
+estes
+esteve
+estive
+estivemos
+estiveram
+fará
+faz
+fazer
+fazia
+fez
+fim
+foi
+fora
+horas
+iniciar
+inicio
+irá
+ista
+iste
+isto
+ligado
+maioria
+maiorias
+mais
+mas
+mesmo
+meu
+muito
+muitos
+nós
+não
+nome
+nosso
+novo
+onde
+outro
+para
+parte
+pegar
+pelo
+pessoas
+pode
+poderá
+podia
+por
+porque
+povo
+promeiro
+quê
+qual
+qualquer
+quando
+quem
+quieto
+são
+saber
+sem
+ser
+seu
+somente
+têm
+tal
+também
+tem
+tempo
+tenho
+tentar
+tentaram
+tente
+tentei
+teu
+teve
+tipo
+tive
+todos
+trabalhar
+trabalho
+uma
+umas
+uns
+usa
+usar
+valor
+veja
+ver
+verdade
+verdadeiro
+você
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/subscribermail.txt
new file mode 100644
index 000000000..3a9e40d20
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/subscribermail.txt
@@ -0,0 +1,15 @@
+Olá,
+
+A página @PAGE@ em @TITLE@ foi alterda.
+Aqui estão as diferenças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para receber mais notificações desta página alterada, por favor, entre no Wiki em @DOKUWIKIURL@ e aceda a @NEWPAGE@ para depois poder clicar no botão [ Não Subscrever ].
+
+
+----
+
+Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/updateprofile.txt
new file mode 100644
index 000000000..efacfe4a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualize o seu perfil ======
+
+Apenas precisa de completar os campos que pretende alterar. Não é possível alterar o seu nome de utilizador.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/uploadmail.txt
new file mode 100644
index 000000000..249d66234
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/uploadmail.txt
@@ -0,0 +1,14 @@
+Um ficheiro foi carregado. Aqui estão os detalhes:
+
+Ficheiro : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Endereço IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Tamanho : @SIZE@
+MIME Type : @MIME@
+Utilizador : @USER@
+
+----
+
+Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/wordblock.txt
new file mode 100644
index 000000000..a88063c9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/pt/wordblock.txt
@@ -0,0 +1,7 @@
+====== Bloquear SPAM ======
+
+As suas alterações foram **bloqueadas**, porque contêm uma ou mais palavras consideradas abusivas (SPAM).
+
+Se pensa que isto não está correcto, por favor contacte o administrador deste site Wiki.
+
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/admin.txt
new file mode 100644
index 000000000..4b1a9062a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/admin.txt
@@ -0,0 +1,3 @@
+====== Administrare ======
+
+Puteţi vedea mai jos o listă cu activităţile administrative disponibile în DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/adminplugins.txt
new file mode 100644
index 000000000..f076c3651
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin-uri Adiţionale =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/backlinks.txt
new file mode 100644
index 000000000..3fd5e3415
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/backlinks.txt
@@ -0,0 +1,4 @@
+====== Legături înapoi ======
+
+Aceasta e o listă de pagini care au legături către pagina curentă.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/conflict.txt
new file mode 100644
index 000000000..d7218ca5f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/conflict.txt
@@ -0,0 +1,6 @@
+====== Există o nouă versiune ======
+
+Există o versiune nouă a documentului editat. Aceasta se întîmplă cînd un alt utilizator a schimbat documentul în timp ce îl editezi.
+
+Examinează diferenţele arătate mai jos, apoi ia decizia care versiune o reţii. Dacă alegi ''Salvează'', versiunea documentului va fi salvată. Apăsaţi ''Renunţare'' pentru a menţine versiunea curentă.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/denied.txt
new file mode 100644
index 000000000..8178995e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/denied.txt
@@ -0,0 +1,4 @@
+====== Acces Interzis ======
+
+Din păcate nu aveţi destule drepturi pentru a continua. Poate aţi uitat să vă logaţi?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/diff.txt
new file mode 100644
index 000000000..f33be8afd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/diff.txt
@@ -0,0 +1,4 @@
+====== Diferenţe ======
+
+Aceasta arată diferenţele dintre revziile selectate şi versiunea curentă a paginii.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/draft.txt
new file mode 100644
index 000000000..e13671e3e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/draft.txt
@@ -0,0 +1,5 @@
+====== Fişierul schiţă nu a fost găsit ======
+
+Ultima dvs. sesiune de editare nu s-a finalizat corect. În timpul lucrului, DocuWiki a salvat automat o schiţă, pe care o puteţi utiliza acum pentru a continua editarea. Mai jos puteţi vedea informaţiile care s-au salvat de la ultima dvs. sesiune.
+
+Decideţi dacă vreţi să //recuperaţi// sesiunea de editare pierdută, //ştergeţi// schiţa salvată automat sau să //anulaţi// procesul de editare.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/edit.txt
new file mode 100644
index 000000000..1e79dc4fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/edit.txt
@@ -0,0 +1,2 @@
+Editează pagina şi apasă ''Salvează''. Vezi [[wiki:syntax]] pentru sintaxă. Te rog editează pagina doar pentru a o **îmbunătaţi**. Dacă vrei să testezi cîteva lucruri, învaţă sa faci primii paşi în [[playground:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/editrev.txt
new file mode 100644
index 000000000..290dca496
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/editrev.txt
@@ -0,0 +1,2 @@
+**Ai încărcat o versuine veche a documentului!** Dacă ai salvat-o, vei crea o versiune nouă cu această dată.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/index.txt
new file mode 100644
index 000000000..5b88cc03b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Acesta e un index al tuturor paginilor ordonat după [[doku>namespaces|namespaces]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/install.html
new file mode 100644
index 000000000..56cf3873b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/install.html
@@ -0,0 +1,10 @@
+<p>Această pagină oferă asistenţă la instalarea pentru prima dată a <a href="http://dokuwiki.org">Dokuwiki</a>. Mai multe informaţii privind această instalare găsiţi pe <a href="http://dokuwiki.org/installer">pagina de documentaţie</a>.</p>
+
+<p>DokuWiki foloseşte fişiere obişnuite pentru stocarea paginilor wiki şi a informaţilor asociate acestor pagini (de ex. imagini, indecşi de căutare, versiuni vechi, etc). Pentru a lucra cu succes, DokuWiki <strong>trebuie</strong> să aibă drepturi de scriere în directoarele ce conţin aceste fişiere. 
+Acest script de instalare nu poate seta drepturile directoarelor. De regulă, aceasta se face direct, în linie de comandă, sau în cazul găzduirii, prin FTP sau prin panoul de control al gazdei (de ex. cPanel).</p>
+
+<p>Acest script de instalare va configura DokuWiki pentru <acronym title="access control list">ACL</acronym>, care permite logarea administratorului şi accesul la meniul de administrare pentru instalarea plugin-urilor, gestiunea utilizatorilor, a accesului la paginile wiki şi modificarea setărilor de configurare.
+Nu este necesar pentru ca DokuWiki să funcţioneze, însă face mai uşoară administrarea DokuWiki.</p>
+
+<p>Utilizatorii experimentaţi sau utilizatorii ce au nevoie de setări speciale ar putea folosi această legătură privind<a href="http://dokuwiki.org/install">instrucţiunile de instalare</a> şi <a href="http://dokuwiki.org/config">setările de configurare</a>.</p>
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/lang.php
new file mode 100644
index 000000000..87ee6ae0f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/lang.php
@@ -0,0 +1,251 @@
+<?php
+/**
+ * romanian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Tiberiu Micu <tibimicu@gmx.net>
+ * @author Sergiu Baltariu <s_baltariu@yahoo.com>
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
+ * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
+ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
+ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Editează această pagină';
+$lang['btn_source']            = 'Arată sursa paginii';
+$lang['btn_show']              = 'Arată pagina';
+$lang['btn_create']            = 'Crează această pagină';
+$lang['btn_search']            = 'Caută';
+$lang['btn_save']              = 'Salvează';
+$lang['btn_preview']           = 'Previzualizează';
+$lang['btn_top']               = 'La început';
+$lang['btn_newer']             = '<< mai recent';
+$lang['btn_older']             = 'mai vechi>>';
+$lang['btn_revs']              = 'Versiuni vechi';
+$lang['btn_recent']            = 'Modificări recente';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Renunţare';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Editează';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Logout';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Actualizează';
+$lang['btn_delete']            = 'Şterge';
+$lang['btn_back']              = 'Înapoi';
+$lang['btn_backlink']          = 'Legătură anterioară';
+$lang['btn_backtomedia']       = 'Înapoi la Selecţia Mediafile';
+$lang['btn_subscribe']         = 'Subscrie Modificarea Paginii';
+$lang['btn_unsubscribe']       = 'Anulează Subscrierea Modificării Paginii';
+$lang['btn_subscribens']       = 'Subscrie Modificarea Spaţiului de Nume';
+$lang['btn_unsubscribens']     = 'Anulează Subscrierea Modificării Spaţiului de Nume';
+$lang['btn_profile']           = 'Actualizează Profil';
+$lang['btn_reset']             = 'Resetează';
+$lang['btn_resendpwd']         = 'Trimite parola nouă';
+$lang['btn_draft']             = 'Editează schiţă';
+$lang['btn_recover']           = 'Recuperează schiţă';
+$lang['btn_draftdel']          = 'Şterge schiţă';
+$lang['btn_revert']            = 'Revenire';
+$lang['loggedinas']            = 'Logat ca şi';
+$lang['user']                  = 'Utilizator';
+$lang['pass']                  = 'Parola';
+$lang['newpass']               = 'Parola nouă';
+$lang['oldpass']               = 'Confirmă parola curentă';
+$lang['passchk']               = 'încă o dată';
+$lang['remember']              = 'Ţine-mă minte';
+$lang['fullname']              = 'Nume complet';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Înregistrează';
+$lang['profile']               = 'Profil Utilizator';
+$lang['badlogin']              = 'Imi pare rău, utilizatorul şi/sau parola au fost greşite.';
+$lang['minoredit']             = 'Modificare Minoră';
+$lang['draftdate']             = 'Schiţă salvată automat la';
+$lang['nosecedit']             = 'Pagina s-a modificat între timp, secţiunea info a expirat, s-a încărcat pagina întreagă în loc.';
+$lang['regmissing']            = 'Ne pare rău, trebuie să completezi toate cîmpurile.';
+$lang['reguexists']            = 'Ne pare rău, un utilizator cu acest nume există deja logat.';
+$lang['regsuccess']            = 'Utilizatorul a fost creat. Parola a fost trimisă prin email.';
+$lang['regsuccess2']           = 'Utilizatorul a fost creat.';
+$lang['regmailfail']           = 'Se pare că a fost o eroare la trimiterea parolei prin email. Contactaţi administratorul!';
+$lang['regbadmail']            = 'Adresa de email este invalidă - dacă credeţi că este o eroare contactaţi administratorul.';
+$lang['regbadpass']            = 'Cele două parole furnizate nu sunt identice; încercaţi din nou.';
+$lang['regpwmail']             = 'Parola ta DokuWiki';
+$lang['reghere']               = 'Înca nu ai un cont? Fă-ţi unul';
+$lang['profna']                = 'Această wiki nu suportă modificarea profilului';
+$lang['profnochange']          = 'Nici o modificare; nimic de făcut.';
+$lang['profnoempty']           = 'Nu sunt admise numele sau adresa de email necompletate.';
+$lang['profchanged']           = 'Profilul de utilizator a fost actualizat succes.';
+$lang['pwdforget']             = 'Parola uitată? Luaţi una nouă';
+$lang['resendna']              = 'Această wiki nu suportă retrimiterea parolei.';
+$lang['resendpwd']             = 'Trimite parola nouă pentru';
+$lang['resendpwdmissing']      = 'Ne pare rău, trebuie completate toate câmpurile.';
+$lang['resendpwdnouser']       = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.';
+$lang['resendpwdbadauth']      = 'Ne pare rău, acest cod de autorizare nu este corect. Verificaţi dacă aţi folosit tot link-ul de confirmare.';
+$lang['resendpwdconfirm']      = 'Un link de confirmare a fost trimis prin email.';
+$lang['resendpwdsuccess']      = 'Parola nouă';
+$lang['license']               = 'Exceptând locurile unde este altfel specificat, conţinutul acestui wiki este licenţiat sub următoarea licenţă:';
+$lang['licenseok']             = 'Notă: Prin editarea acestei pagini sunteţi de acord să vă licenţiaţi conţintul sub următoarea licenţă:';
+$lang['searchmedia']           = 'Caută numele fişierului:';
+$lang['searchmedia_in']        = 'Caută în %s';
+$lang['txt_upload']            = 'Selectează fisierul de încărcat';
+$lang['txt_filename']          = 'Încarcă fişierul ca (opţional)';
+$lang['txt_overwrt']           = 'Suprascrie fişierul existent';
+$lang['lockedby']              = 'Momentan blocat de';
+$lang['lockexpire']            = 'Blocarea expiră la';
+$lang['willexpire']            = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele foloseşte butonul de previzualizare pentru resetarea blocării.';
+$lang['notsavedyet']           = 'Există modificări nesalvate, care se vor pierde.\nDoreşti să continui?';
+$lang['rssfailed']             = 'A apărut o eroare in timpul descărcării acestui cîmp: ';
+$lang['nothingfound']          = 'Nu am găsit nimic.';
+$lang['mediaselect']           = 'Selectare fişiere media';
+$lang['fileupload']            = 'Încarcă fişier media';
+$lang['uploadsucc']            = 'Încărcare reuşită';
+$lang['uploadfail']            = 'Încărcare eşuată. Poate din cauza permisiunilor?';
+$lang['uploadwrong']           = 'Încărcare nepermisă. Extensia fişierului e nepermisă';
+$lang['uploadexist']           = 'Fişierul există deja. Nimic nu a fost făcut.';
+$lang['uploadbadcontent']      = 'Conţinutul încărcat nu corespunde extensiei fişierului %s.';
+$lang['uploadspam']            = 'Încărcarea a fost blocată datorită listei negre de spam.';
+$lang['uploadxss']             = 'Încărcarea a fost blocată datorită unui posibil conţinut dăunător.';
+$lang['uploadsize']            = 'Fişierul uploadat a fost prea mare. (max %s)';
+$lang['deletesucc']            = 'Fişierul "%s" a fost şters.';
+$lang['deletefail']            = '"%s" nu a putut fi şters - verificaţi drepturile.';
+$lang['mediainuse']            = 'Fişierul "%s" nu a fost şters - este încă în uz.';
+$lang['namespaces']            = 'Spaţii de nume';
+$lang['mediafiles']            = 'Fişiere disponibile în';
+$lang['js']['searchmedia']     = 'Caută fişiere';
+$lang['js']['keepopen']        = 'Menţine fereastra deschisă la selecţie';
+$lang['js']['hidedetails']     = 'Ascunde Detalii';
+$lang['js']['nosmblinks']      = 'Legăturile către sharing-uri Windows funcţioneaza numai in Microsoft Internet Explorer.
+Puteţi însă copia şi insera legătura.';
+$lang['js']['linkwiz']         = 'Asistent legătură';
+$lang['js']['linkto']          = 'Legătură la:';
+$lang['js']['del_confirm']     = 'Doriţi într-adevăr ştergerea elementelor selectate?';
+$lang['js']['mu_btn']          = 'Încarcă mai multe fişiere simultan';
+$lang['mediausage']            = 'Folosiţi următoarea sintaxă pentru a face referinţă la acest fişier:';
+$lang['mediaview']             = 'Vizualizează fişierul original';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Încarcă un fişier in acest spaţiu de nume. Pentru a crea sub-spaţii de nume, adaugă-le la fişierul de încărcat, separate de doua puncte (:).';
+$lang['mediaextchange']        = 'Extensia fişierului a fost modificată din .%s în .%s!';
+$lang['reference']             = 'Referinţă pentru';
+$lang['ref_inuse']             = 'Fişierul nu a putut fi şters întrucât este folosit încă de următoarele pagini:';
+$lang['ref_hidden']            = 'Nu aveţi permisiunea să citiţi o parte din referinţele din pagină.';
+$lang['hits']                  = 'Hituri';
+$lang['quickhits']             = 'Nume de pagini potrivite';
+$lang['toc']                   = 'Cuprins';
+$lang['current']               = 'curent';
+$lang['yours']                 = 'Versiunea ta';
+$lang['diff']                  = 'arată diferenţele faţă de versiunea curentă';
+$lang['diff2']                 = 'Arată diferenţele dintre versiunile selectate';
+$lang['line']                  = 'Linia';
+$lang['breadcrumb']            = 'Traseu';
+$lang['youarehere']            = 'Sunteţi aici';
+$lang['lastmod']               = 'Ultima modificare';
+$lang['by']                    = 'de către';
+$lang['deleted']               = 'şters';
+$lang['created']               = 'creat';
+$lang['restored']              = 'versiune veche restaurată';
+$lang['external_edit']         = 'editare externă';
+$lang['summary']               = 'Editează sumarul';
+$lang['noflash']               = 'Plugin-ul <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> este necesar pentru afişarea corectă a conţinutului.';
+$lang['download']              = 'Bloc descărcări';
+$lang['mail_newpage']          = 'pagina adăugată:';
+$lang['mail_changed']          = 'page schimbată:';
+$lang['mail_new_user']         = 'utilizator nou';
+$lang['mail_upload']           = 'fişier încărcat:';
+$lang['qb_bold']               = 'Text Îngroşat';
+$lang['qb_italic']             = 'Text Italic';
+$lang['qb_underl']             = 'Text Subliniat';
+$lang['qb_code']               = 'Text Cod';
+$lang['qb_strike']             = 'Text Tăiat';
+$lang['qb_h1']                 = 'Titlu de Nivel 1';
+$lang['qb_h2']                 = 'Titlu de Nivel 2';
+$lang['qb_h3']                 = 'Titlu de Nivel 3';
+$lang['qb_h4']                 = 'Titlu de Nivel 4';
+$lang['qb_h5']                 = 'Titlu de Nivel 5';
+$lang['qb_h']                  = 'Titlu';
+$lang['qb_hs']                 = 'Selectaţi Titlul';
+$lang['qb_hplus']              = 'Titlu mai mare';
+$lang['qb_hminus']             = 'Titlu mai mic';
+$lang['qb_hequal']             = 'Titlu de acelaşi nivel';
+$lang['qb_link']               = 'Legătură internă';
+$lang['qb_extlink']            = 'Legătura externă';
+$lang['qb_hr']                 = 'Linie Orizontal';
+$lang['qb_ol']                 = 'Listă Ordonată';
+$lang['qb_ul']                 = 'Listă Neordoată';
+$lang['qb_media']              = 'Adaugă imagini şi alte fişiere';
+$lang['qb_sig']                = 'Inserează semnătură';
+$lang['qb_smileys']            = 'Smiley-uri';
+$lang['qb_chars']              = 'Caractere speciale';
+$lang['upperns']               = 'sari la numele de spaţiu părinte';
+$lang['admin_register']        = 'Adaugă utilizator nou';
+$lang['metaedit']              = 'Editează Metadata';
+$lang['metasaveerr']           = 'Scrierea metadatelor a eşuat';
+$lang['metasaveok']            = 'Metadatele au fost salvate';
+$lang['img_backto']            = 'Înapoi la';
+$lang['img_title']             = 'Titlu';
+$lang['img_caption']           = 'Legendă';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nume fişier';
+$lang['img_fsize']             = 'Dimensiune';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Cuvinte cheie';
+$lang['subscribe_success']     = 'A fost adăugat %s la lista de subscriere pentru %s';
+$lang['subscribe_error']       = 'Eroare la adăugarea %s la lista de subscriere pentru %s';
+$lang['subscribe_noaddress']   = 'Nu este nici o adresă de mail asociată cu utilizatorul dvs. Nu puteţi fi adăugat la lista de subscriere';
+$lang['unsubscribe_success']   = '%s a fost eliminat din lista de subscriere pentru %s';
+$lang['unsubscribe_error']     = 'Eroare la eliminarea %s din lista de subscriere pentru %s';
+$lang['authmodfailed']         = 'Configuraţia autentificării utilizatorului este eronată. Anunţaţi Wiki Admin-ul.';
+$lang['authtempfail']          = 'Autentificarea utilizatorului este temporar indisponibilă. Anunţaţi Wiki Admin-ul.';
+$lang['i_chooselang']          = 'Alegeţi limba';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Numele Wiki';
+$lang['i_enableacl']           = 'Activează ACL (recomandat)';
+$lang['i_superuser']           = 'Superutilizator';
+$lang['i_problems']            = 'Programul de instalare a găsit câteva probleme, indicate mai jos. Nu puteţi continua până nu le rezolvaţi.';
+$lang['i_modified']            = 'Din motive de securitate, acest script va funcţiona doar cu o instalare nouă şi nemodificată a Docuwiki.
+Puteţi fie să extrageţi din nou fişierele din arhiva descărcată fie să consultaţi instrucţiunile de instalare Dokuwiki la <a href="http://dokuwiki.org/install">';
+$lang['i_funcna']              = 'Funcţia PHP <code>%s</code> nu este disponibilă. Probabil provider-ul dvs. a inactivat-o pentru un motiv oarecare.';
+$lang['i_phpver']              = 'Versiunea dvs. de PHP <code>%s</code> este mai veche decât cea necesară (<code>%s</code>). Trebuie să vă actualizaţi instalarea PHP.';
+$lang['i_permfail']            = '<code>%s</code> nu poate fi scris de către DokuWiki. Trebuie să modificaţi drepturile acestui director!';
+$lang['i_confexists']          = '<code>%s</code> există deja';
+$lang['i_writeerr']            = 'Nu s-a putut crea <code>%s</code>. Trebuie să verificaţi drepturile directorului/fişierului şi să creaţi fişierul manual.';
+$lang['i_badhash']             = 'dokuwiki.php nu a fost recunoscut sau a fost modificat (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - valoare nepemisă sau neintrodusă';
+$lang['i_success']             = 'Configurarea a fost finalizată cu succes. Acum puteţi sterge fişierul install.php. Continuaţi cu <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_failure']             = 'Au apărut erori la scrierea fişierelor de configurare. Va trebui să le corectaţi manual înainte de a putea folosi <a href="doku.php">your new DokuWiki</a>.';
+$lang['i_policy']              = 'Politica ACL iniţială';
+$lang['i_pol0']                = 'Wiki Deschisă (citeşte, scrie şi încarcă oricine)';
+$lang['i_pol1']                = 'Wiki Deschisă (citeste oricine, scrie şi încarcă doar utilizatorul înregistrat)';
+$lang['i_pol2']                = 'Wiki Închisă (citeşte, scrie şi încarcă doar utilizatorul înregistrat)';
+$lang['i_retry']               = 'Încearcă din nou';
+$lang['mu_intro']              = 'Aici poţi încărca mai multe fişiere simultan. Apasă butonul Răsfoieşte pentru a le adăuga. Apasă Încarcă când ai terminat.';
+$lang['mu_gridname']           = 'Numele fişierului';
+$lang['mu_gridsize']           = 'Mărime';
+$lang['mu_gridstat']           = 'Stare';
+$lang['mu_namespace']          = 'Spaţiu de nume';
+$lang['mu_browse']             = 'Răsfoieşte';
+$lang['mu_toobig']             = 'prea mare';
+$lang['mu_ready']              = 'pregătit pentru încărcare';
+$lang['mu_done']               = 'complet';
+$lang['mu_fail']               = 'eşuat';
+$lang['mu_authfail']           = 'sesiunea a expirat';
+$lang['mu_progress']           = '@PCT@% incărcat';
+$lang['mu_filetypes']          = 'Tipuri de fişiere permise';
+$lang['mu_info']               = 'fişiere încărcate';
+$lang['mu_lasterr']            = 'Ultima eroare:';
+$lang['recent_global']         = 'Acum vizualizaţi modificările în interiorul numelui de spaţiu <b>%s</b>. De asemenea puteţi <a href="%s">vizualiza modificările recente ale întregului wiki</a>.';
+$lang['years']                 = 'acum %d ani';
+$lang['months']                = 'acum %d luni';
+$lang['weeks']                 = 'acum %d săptămâni';
+$lang['days']                  = 'acum %d zile';
+$lang['hours']                 = 'acum %d ore';
+$lang['minutes']               = 'acum %d minute';
+$lang['seconds']               = 'acum %d secunde';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/locked.txt
new file mode 100644
index 000000000..94d6eb2ff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/locked.txt
@@ -0,0 +1,3 @@
+====== Pagină blocată ======
+
+Pagina este momentan blocată de alt utilizator. Trebuie să aştepţi pînă cînd acest utilizator termină editarea ori expiră blocarea.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/login.txt
new file mode 100644
index 000000000..2f1fda9ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Nu sînteţi logat! Introduceţi datele de autentificare pentru logare. Trebuie să permiteţi cookie-uri pentru logare.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/mailtext.txt
new file mode 100644
index 000000000..77aca8c4b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/mailtext.txt
@@ -0,0 +1,16 @@
+A fost adăugată sau schimbată o pagină. Aici sînt detaliile:
+
+Data        : @DATE@
+Navigator   : @BROWSER@
+Adresa-IP   : @IPADDRESS@
+Nume gazdă  : @HOSTNAME@
+Versiune veche : @OLDPAGE@
+Versiune nouă  : @NEWPAGE@
+Rezumat editare: @SUMMARY@
+
+@DIFF@
+
+
+-- 
+Mailul a fost generat de DokuWiki la
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/newpage.txt
new file mode 100644
index 000000000..7fb9d55a6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/newpage.txt
@@ -0,0 +1,3 @@
+====== Subiectul nu există încă ======
+
+Aţi urmat o legătură către un subiect care nu există. O puteţi crea prin apăsarea butonului ''Editează această pagină''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/norev.txt
new file mode 100644
index 000000000..926f9144e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/norev.txt
@@ -0,0 +1,4 @@
+====== Nu există versiunea ======
+
+Versiunea specificată nu există. Foloseşte butonul ''Versiuni vechi'' pentru o listă a versiunilor acestui document.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/preview.txt
new file mode 100644
index 000000000..1964d7476
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/preview.txt
@@ -0,0 +1,4 @@
+====== Previzualizare ======
+
+Acesta este modul în care va arăta textul. Nu uita: **Nu** e încă **salvat**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/pwconfirm.txt
new file mode 100644
index 000000000..043e08868
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/pwconfirm.txt
@@ -0,0 +1,13 @@
+Salut @FULLNAME@!
+
+Cineva a cerut o parolă nouă pentru @TITLE@ pentru conectarea la @DOKUWIKIURL@
+
+Dacă nu aţi solicitat o parolă nouă, ignoraţi acest email.
+
+Pentru a confirma că cererea a fost într-adevăr trimisă de dumneavoastră, folosiţi link-ul de mai jos.
+
+@CONFIRM@
+
+-- 
+Acest mail a fost generat de DocuWiki la
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/read.txt
new file mode 100644
index 000000000..2c0aa6d90
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/read.txt
@@ -0,0 +1,2 @@
+Această pagină poate fi doar citită. Poţi vedea sursa, dar n-o poţi modifica. Consultă administratorul dacă crezi că e ceva în neregulă.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/recent.txt
new file mode 100644
index 000000000..8d4aa043a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/recent.txt
@@ -0,0 +1,5 @@
+====== Schimbări recente ======
+
+Următoarele pagini au fost schimbate recent.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/register.txt
new file mode 100644
index 000000000..9fc6eec65
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/register.txt
@@ -0,0 +1,3 @@
+====== Înregistrează-te ca utilizator nou ======
+Pentru a crea un wiki nou completează mai jos toate informaţiile. Asigură-te că ai introdus o adresă de **e-mail validă** unde va fi trimisă noua parolă. Numele de utilizator trebuie de asemenea să fie valid [[doku>pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/registermail.txt
new file mode 100644
index 000000000..fb754af67
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/registermail.txt
@@ -0,0 +1,14 @@
+Un nou utilizator s-a înregsitrat. Iată detaliile:
+
+Nume utilizator : @NEWUSER@
+Nume complet : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Acest mail a fost generat automat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/resendpwd.txt
new file mode 100644
index 000000000..b7de241e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Trimite parolă nouă ======
+
+Introduceţi numele de utilizator în formularul de mai jos pentru a solicita o nouă parolă pentru această wiki. Un link de confirmare va fi trimis la adresa de email înregistrată.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/revisions.txt
new file mode 100644
index 000000000..b2ff46f77
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/revisions.txt
@@ -0,0 +1,4 @@
+====== Versiune veche ======
+
+Acestea sînt versiunile vechi ale documentului curent. Pentru revenirea la o versiune mai veche, selecteaz-o de mai jos, clic pe ''Editează această pagină'' şi salveaz-o.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/searchpage.txt
new file mode 100644
index 000000000..c1169b88d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/searchpage.txt
@@ -0,0 +1,5 @@
+====== Căutare ======
+
+Rezultatele căutării sînt afisate mai jos. Dacă n-aţi găsit ce-aţi căutat, puteţi creea o pagină nouă după căutare prin folosirea butonului ''Editează această pagină''.
+
+===== Rezultate =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/showrev.txt
new file mode 100644
index 000000000..c1d5e545d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/showrev.txt
@@ -0,0 +1,2 @@
+**Aceasta e o versiune veche a documentului!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/stopwords.txt
new file mode 100644
index 000000000..29e7452d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/stopwords.txt
@@ -0,0 +1,29 @@
+# Aceasta este o listă de cuvinte ignorate la indexare, câte un cuvânt pe linie
+# Când editaţi acest fişier, asiguraţi-vă că folosiţi sfârşituri de linie UNIX (o singură linie nouă)
+# Nu e nevoie să includeţi cuvinte mai scurte de 3 caractere - acestea sunt, oricum, ignorate
+# Această listă se bazează pe cele ce pot fi găsite la http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/subscribermail.txt
new file mode 100644
index 000000000..23374dc6f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/subscribermail.txt
@@ -0,0 +1,17 @@
+Bună!
+
+Pagina @PAGE@ din @TITLE@ wiki a fost modificată.
+Iată modificările:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pentru a vă dezabona, logaţi-vă la wiki la
+@DOKUWIKIURL@, apoi vizitaţi
+@NEWPAGE@
+şi alegeţi 'Anulează modificările'.
+
+-- 
+Acest mail a fost generat automat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/updateprofile.txt
new file mode 100644
index 000000000..e5988ec51
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualizare profil utilizator ======
+
+Trebuie să completaţi doar câmpurile pe care doriţi să le modificaţi. Nu puteţi modifica numele de utilizator.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/uploadmail.txt
new file mode 100644
index 000000000..39faed370
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/uploadmail.txt
@@ -0,0 +1,14 @@
+Un fişier a fost încărcat în DocuWiki. Iată detaliile:
+
+Fişier : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensiune : @SIZE@
+MIME Type : @MIME@
+Utilizator : @USER@
+
+-- 
+Acest mail a fost generat automat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/wordblock.txt
new file mode 100644
index 000000000..1fa7bd6cd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ro/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM blocat ======
+
+Modificările **nu** au fost salvate deoarece conţin unul sau mai multe cuvinte nepermise. Daca ai încercat să spamezi Wiki-ul -- Eşti un om rău! Dacă crezi că asta e o eroare, contactează administratorul acestui Wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/admin.txt
new file mode 100644
index 000000000..cb03be52e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/admin.txt
@@ -0,0 +1,4 @@
+====== Управление ======
+
+Ниже вы сможете найти список административных операций, доступных в DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/adminplugins.txt
new file mode 100644
index 000000000..6e3fc26f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/adminplugins.txt
@@ -0,0 +1 @@
+===== Дополнительные плагины =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/backlinks.txt
new file mode 100644
index 000000000..a3b638d19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/backlinks.txt
@@ -0,0 +1,4 @@
+====== Обратные ссылки ======
+
+Это список страниц, которые ссылаются на текущую страницу.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/conflict.txt
new file mode 100644
index 000000000..f1ac60bd4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/conflict.txt
@@ -0,0 +1,5 @@
+====== Существует более новая версия ======
+
+Существует более новая версия документа, который вы редактировали. Такое случается, когда другой пользователь изменил документ, пока вы делали то же самое.
+
+Внимательно изучите различия, приведенные ниже и решите, какую версию оставить. Если вы выберете ''Сохранить'', то ваша версия будет сохранена. Нажав ''Отменить',' вы оставите текущую версию.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/denied.txt
new file mode 100644
index 000000000..eee59efe6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/denied.txt
@@ -0,0 +1,3 @@
+====== Доступ запрещен ======
+
+Извините, у вас не хватает прав для этого действия. Может быть, Вы забыли войти в вики под своим именем?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/diff.txt
new file mode 100644
index 000000000..4d1d4d031
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/diff.txt
@@ -0,0 +1,4 @@
+====== Различия ======
+
+Здесь показаны различия между выбранной ревизией и текущей версией данной страницы.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/draft.txt
new file mode 100644
index 000000000..bbd2e5913
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/draft.txt
@@ -0,0 +1,6 @@
+====== Найден черновик ======
+
+Последний раз редактирование этой страницы не было корректно завершено. Во время вашей работы был автоматически сохранён черновик, который вы теперь можете восстановить и продолжить прерванную правку. Ниже вы видите автоматически сохраненную версию.
+
+Пожалуйста, решите, хотите ли вы //восстановить// потерянную версию, //удалить// черновик, или //отменить// редактирование.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/edit.txt
new file mode 100644
index 000000000..2237f082e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/edit.txt
@@ -0,0 +1,2 @@
+Отредактируйте страницу и нажмите ''Сохранить''. Прочтите [[wiki:syntax]] для ознакомления с синтаксисом вики. Пожалуйста, редактируйте только в том случае, если планируете **улучшить** содержимое. Если Вы просто хотите потестировать что-либо, воспользуйтесь специальной страницей: [[playground:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/editrev.txt
new file mode 100644
index 000000000..db843ec1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/editrev.txt
@@ -0,0 +1,2 @@
+**Вы загрузили старую ревизию документа!** Сохранив её, вы создадите новую текущую версию с этим содержимым.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/index.txt
new file mode 100644
index 000000000..376d58947
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/index.txt
@@ -0,0 +1,4 @@
+====== Содержание ======
+
+Перед Вами список доступных страниц, упорядоченный по пространствам имён ([[doku>namespaces|namespaces]]).
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/install.html
new file mode 100644
index 000000000..d7022dd46
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/install.html
@@ -0,0 +1,7 @@
+<p>Эта страница предназначена помочь в первоначальной установке и конфигурации <a href="http://dokuwiki.org">DokuWiki</a>. Дополнительная информация о программе установки доступна на её <a href="http://dokuwiki.org/installer">странице документации</a>.</p>
+
+<p>DokuWiki использует обычные файлы для хранения страниц и дополнительной информации (например, изображений, поискового индекса, предыдущих версий страницы, и т.д.). Для успешной работы DokuWiki <strong>необходим</strong> доступ на запись к директориям с этими файлами. Данная программа установки не может самостоятельно изменять системные права доступа к директориям. Обычно это делается напрямую из командной строки (shell), или, если Вы используете удалённый хостинг, через FTP или панель управления вашего хостинга (например, cPanel).</p>
+
+<p>Программа установки включит использование списков контроля доступа (<acronym title="access control list">ACL</acronym>) в Вашей DokuWiki. Это позволит администратору, после авторизации в DokuWiki, использовать специальное меню для установки плагинов, управления пользователями и доступом к страницам вики, а также для настройки конфигурационных параметров. Списки контроля доступа не обязательны для работы DokuWiki, однако они позволяют упростить управление вашей DokuWiki.</p>
+
+<p>Опытным пользователям и пользователям со специальными требованиями к установке рекомендуется обратиться по следующим ссылкам для уточнения подробностей <a href="http://dokuwiki.org/install">процесса установки</a> и <a href="http://dokuwiki.org/config">параметров конфигурации</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/lang.php
new file mode 100644
index 000000000..f6cec8170
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/lang.php
@@ -0,0 +1,258 @@
+<?php
+/**
+ * Russian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Yuri Pimenov <up@ftpsearch.lv>
+ * @author Igor Tarasov <tigr@mail15.com>
+ * @author Denis Simakov <akinoame1@gmail.com>
+ * @author Kaens Bard <kaens@mail.ru>
+ * @author Andrew Pleshakov <beotiger@mail.ru>
+ * @author Змей Этерийский evil_snake@eternion.ru
+ * @author Hikaru Nakajima <jisatsu@mail.ru>
+ * @author Alexei Tereschenko <alexeitlex@yahoo.com>
+ * @author Irina Ponomareva irinaponomareva@webperfectionist.com
+ * @author Alexander Sorkin <kibizoid@gmail.com>
+ * @author Kirill Krasnov <krasnovforum@gmail.com>
+ * @author Vlad Tsybenko <vlad.development@gmail.com>
+ */
+$lang['encoding']              = ' utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
+$lang['singlequoteopening']    = '„';
+$lang['singlequoteclosing']    = '“';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Править страницу';
+$lang['btn_source']            = 'Показать исходный текст';
+$lang['btn_show']              = 'Показать страницу';
+$lang['btn_create']            = 'Создать страницу';
+$lang['btn_search']            = 'Поиск';
+$lang['btn_save']              = 'Сохранить';
+$lang['btn_preview']           = 'Просмотр';
+$lang['btn_top']               = 'Наверх';
+$lang['btn_newer']             = '<< более новые';
+$lang['btn_older']             = 'более старые >>';
+$lang['btn_revs']              = 'История страницы';
+$lang['btn_recent']            = 'Недавние изменения';
+$lang['btn_upload']            = 'Закачать';
+$lang['btn_cancel']            = 'Отменить';
+$lang['btn_index']             = 'Все страницы';
+$lang['btn_secedit']           = 'Править';
+$lang['btn_login']             = 'Войти';
+$lang['btn_logout']            = 'Выйти';
+$lang['btn_admin']             = 'Управление';
+$lang['btn_update']            = 'Обновить';
+$lang['btn_delete']            = 'Удалить';
+$lang['btn_back']              = 'Назад';
+$lang['btn_backlink']          = 'Ссылки сюда';
+$lang['btn_backtomedia']       = 'Вернуться к выбору медиа-файла';
+$lang['btn_subscribe']         = 'Подписаться (все правки)';
+$lang['btn_unsubscribe']       = 'Отписаться (все правки)';
+$lang['btn_subscribens']       = 'Подписаться (правки этого раздела)';
+$lang['btn_unsubscribens']     = 'Отписаться (правки этого раздела)';
+$lang['btn_profile']           = 'Профиль';
+$lang['btn_reset']             = 'Сброс';
+$lang['btn_resendpwd']         = 'Послать новый пароль';
+$lang['btn_draft']             = 'Править черновик';
+$lang['btn_recover']           = 'Восстановить черновик';
+$lang['btn_draftdel']          = 'Удалить черновик';
+$lang['btn_revert']            = 'Восстановить';
+$lang['loggedinas']            = 'Зашли как';
+$lang['user']                  = 'Логин';
+$lang['pass']                  = 'Пароль';
+$lang['newpass']               = 'Новый пароль';
+$lang['oldpass']               = 'Введите текущий пароль';
+$lang['passchk']               = 'повторите';
+$lang['remember']              = 'Запомнить меня';
+$lang['fullname']              = 'Полное имя';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Зарегистрироваться';
+$lang['profile']               = 'Профиль пользователя';
+$lang['badlogin']              = 'Извините, неверное имя пользователя или пароль.';
+$lang['minoredit']             = 'Небольшие изменения';
+$lang['draftdate']             = 'Черновик сохранён';
+$lang['nosecedit']             = 'За это время страница была изменена, и информация о секции устарела. Загружена полная версия страницы.';
+$lang['regmissing']            = 'Извините, вам следует заполнить все поля.';
+$lang['reguexists']            = 'Извините, пользователь с таким логином уже существует.';
+$lang['regsuccess']            = 'Пользователь создан, пароль выслан на e-mail.';
+$lang['regsuccess2']           = 'Пользователь создан.';
+$lang['regmailfail']           = 'Похоже, проблема с посылкой пароля по почте. Пожалуйста, сообщите администратору!';
+$lang['regbadmail']            = 'Данный Вами адрес e-mail выглядит неправильным. Если вы считаете это ошибкой, сообщите админу.';
+$lang['regbadpass']            = 'Два введённых пароля не идентичны. Пожалуйста, попробуйте ещё раз.';
+$lang['regpwmail']             = 'Ваш пароль для системы DokuWiki';
+$lang['reghere']               = 'У вас ещё нет аккаунта? Извольте получить';
+$lang['profna']                = 'Данная вики не поддерживает изменение профиля';
+$lang['profnochange']          = 'Изменений не было внесено, профиль не обновлён.';
+$lang['profnoempty']           = 'Логин и адрес e-mail не могут быть пустыми.';
+$lang['profchanged']           = 'Профиль пользователя успешно обновлён.';
+$lang['pwdforget']             = 'Забыли пароль? Получите новый';
+$lang['resendna']              = 'Данная вики не поддерживает повторную отправку пароля.';
+$lang['resendpwd']             = 'Выслать пароль для';
+$lang['resendpwdmissing']      = 'Вы должны заполнить все поля формы.';
+$lang['resendpwdnouser']       = 'Пользователь с таким логином не обнаружен в нашей базе данных.';
+$lang['resendpwdbadauth']      = 'Извините, неверный код авторизации. Убедитесь, что Вы полностью скопировали ссылку. ';
+$lang['resendpwdconfirm']      = 'Ссылка для подтверждения пароля была выслана по e-mail. ';
+$lang['resendpwdsuccess']      = 'Ваш новый пароль был выслан по e-mail.';
+$lang['license']               = 'За исключением случаев, когда указано иное, содержимое этой вики предоставляется на условиях следующей лицензии:';
+$lang['licenseok']             = 'Примечание: редактируя эту страницу, Вы соглашаетесь на использование вашего вклада на условиях следующей лицензии:';
+$lang['searchmedia']           = 'Поиск по имени файла:';
+$lang['searchmedia_in']        = 'Поиск в %s';
+$lang['txt_upload']            = 'Выберите файл для закачки';
+$lang['txt_filename']          = 'Введите имя файла в вики (необязательно)';
+$lang['txt_overwrt']           = 'Перезаписать существующий файл';
+$lang['lockedby']              = 'В данный момент заблокирован';
+$lang['lockexpire']            = 'Блокировка истекает в';
+$lang['willexpire']            = 'Ваша блокировка редактирования этой страницы истекает в течение минуты.\nЧтобы избежать конфликтов и сбросить таймер блокировки, нажмите кнопку просмотра.';
+$lang['notsavedyet']           = 'Несохранённые изменения будут потеряны.\nВы действительно хотите продолжить?';
+$lang['rssfailed']             = 'Произошла ошибка при получении следующей новостной ленты: ';
+$lang['nothingfound']          = 'Ничего не найдено.';
+$lang['mediaselect']           = 'Выбор медиа-файла';
+$lang['fileupload']            = 'Закачка медиа-файла';
+$lang['uploadsucc']            = 'Закачка произведена успешно';
+$lang['uploadfail']            = 'Закачка не удалась. Возможно, проблемы с правами доступа?';
+$lang['uploadwrong']           = 'В закачке отказано. Файлы с таким расширением запрещены. ';
+$lang['uploadexist']           = 'Файл с таким именем существует. Загрузка не произведена.';
+$lang['uploadbadcontent']      = 'Содержание файла не соответствует расширению %s.';
+$lang['uploadspam']            = 'Закачка заблокирована спам-фильтром.';
+$lang['uploadxss']             = 'Закачка заблокирована по соображениям безопасности.';
+$lang['uploadsize']            = 'Загруженный файл был слишком большой. (макс. %s)';
+$lang['deletesucc']            = 'Файл "%s" был удалён.';
+$lang['deletefail']            = 'Невозможно удалить файл "%s". Проверьте права доступа к файлу.';
+$lang['mediainuse']            = 'Файл "%s" не был удалён - файл всё ещё используется.';
+$lang['namespaces']            = 'Пространства имён';
+$lang['mediafiles']            = 'Доступные файлы';
+$lang['js']['searchmedia']     = 'Поиск файлов';
+$lang['js']['keepopen']        = 'Не закрывать окно после выбора';
+$lang['js']['hidedetails']     = 'Скрыть детали';
+$lang['js']['nosmblinks']      = 'Ссылка на сетевые каталоги Windows работает только из Интернет Эксплорера
+Но Вы можете скопировать ссылку.';
+$lang['js']['linkwiz']         = 'Мастер ссылок';
+$lang['js']['linkto']          = 'Ссылка на:';
+$lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
+$lang['js']['mu_btn']          = 'Загрузить несколько файлов одновременно';
+$lang['mediausage']            = 'Для ссылки на этот файл используйте следующий синтаксис:';
+$lang['mediaview']             = 'Посмотреть исходный файл';
+$lang['mediaroot']             = 'корень';
+$lang['mediaupload']           = 'Здесь можно загрузить файл в текущий каталог ("пространство имен"). Чтобы создать подкаталоги, добавьте их к началу имени файла ("Загрузить как"). Имена подкаталогов разделяются двоеточиями. ';
+$lang['mediaextchange']        = 'Расширение изменилось: с .%s на .%s!';
+$lang['reference']             = 'Ссылки для';
+$lang['ref_inuse']             = 'Этот файл не может быть удалён, так как он используется следующими страницами:';
+$lang['ref_hidden']            = 'Некоторые ссылки находятся на страницах, на чтение которых у Вас нет прав';
+$lang['hits']                  = 'соответствий';
+$lang['quickhits']             = 'Соответствия в названиях страниц';
+$lang['toc']                   = 'Содержание';
+$lang['current']               = 'текущий';
+$lang['yours']                 = 'Ваша версия';
+$lang['diff']                  = 'показать отличия от текущей версии';
+$lang['diff2']                 = 'Показать различия между ревизиями  ';
+$lang['line']                  = 'Строка';
+$lang['breadcrumb']            = 'Вы посетили';
+$lang['youarehere']            = 'Вы находитесь здесь';
+$lang['lastmod']               = 'Последние изменения';
+$lang['by']                    = ' От';
+$lang['deleted']               = 'удалено';
+$lang['created']               = 'создано';
+$lang['restored']              = 'старая ревизия восстановлена';
+$lang['external_edit']         = 'внешнее изменение';
+$lang['summary']               = 'Сводка изменений';
+$lang['noflash']               = 'Для просмотра этого содержимого требуется <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['download']              = 'Скачать код';
+$lang['mail_newpage']          = 'страница добавлена:';
+$lang['mail_changed']          = 'страница изменена:';
+$lang['mail_new_user']         = 'новый пользователь:';
+$lang['mail_upload']           = 'файл закачан:';
+$lang['qb_bold']               = 'Полужирный шрифт';
+$lang['qb_italic']             = 'Курсивный шрифт';
+$lang['qb_underl']             = 'Подчеркивание';
+$lang['qb_code']               = 'Текст кода';
+$lang['qb_strike']             = 'Зачёркнутый шрифт';
+$lang['qb_h1']                 = 'Заголовок уровня 1';
+$lang['qb_h2']                 = 'Заголовок уровня 2';
+$lang['qb_h3']                 = 'Заголовок уровня 3';
+$lang['qb_h4']                 = 'Заголовок уровня 4';
+$lang['qb_h5']                 = 'Заголовок уровня 5';
+$lang['qb_h']                  = 'Заголовок';
+$lang['qb_hs']                 = 'Выбор заголовка';
+$lang['qb_hplus']              = 'Заголовок более высокого уровня';
+$lang['qb_hminus']             = 'Заголовок более низкого уровня (подзаголовок)';
+$lang['qb_hequal']             = 'Заголовок текущего уровня';
+$lang['qb_link']               = 'Внутренняя ссылка';
+$lang['qb_extlink']            = 'Внешняя ссылка';
+$lang['qb_hr']                 = 'Разделитель';
+$lang['qb_ol']                 = 'Элемент нумерованного списка';
+$lang['qb_ul']                 = 'Элемент ненумерованного списка';
+$lang['qb_media']              = 'Добавить картинки и другие файлы';
+$lang['qb_sig']                = 'Вставить подпись';
+$lang['qb_smileys']            = 'Смайлики';
+$lang['qb_chars']              = 'Специальные символы';
+$lang['upperns']               = 'Перейти в родительское пространство имен';
+$lang['admin_register']        = 'Добавить пользователя';
+$lang['metaedit']              = 'Править метаданные';
+$lang['metasaveerr']           = 'Ошибка записи метаданных';
+$lang['metasaveok']            = 'Метаданные сохранены';
+$lang['img_backto']            = 'Вернуться к';
+$lang['img_title']             = 'Название';
+$lang['img_caption']           = 'Подпись';
+$lang['img_date']              = 'Дата';
+$lang['img_fname']             = 'Имя файла';
+$lang['img_fsize']             = 'Размер';
+$lang['img_artist']            = 'Фотограф';
+$lang['img_copyr']             = 'Авторские права';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Модель';
+$lang['img_keywords']          = 'Ключевые слова';
+$lang['subscribe_success']     = '%s добавлен(а) в список рассылки для страницы %s';
+$lang['subscribe_error']       = 'Ошибка добавления пользователя %s в список рассылки для страницы %s';
+$lang['subscribe_noaddress']   = 'В вашем профиле не указан адрес электронной почты. Ввиду этого вы не можете подписываться на рассылки.';
+$lang['unsubscribe_success']   = '%s удален(а) из списка рассылки для страницы %s';
+$lang['unsubscribe_error']     = 'Ошибка удаления %s из списка рассылки для страницы %s';
+$lang['authmodfailed']         = 'Неправильная конфигурация аутентификации пользователя. Пожалуйста, сообщите об этом вашему администратору вики.';
+$lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом вашему администратору вики.';
+$lang['i_chooselang']          = 'Выберите Ваш язык/Language';
+$lang['i_installer']           = 'Установка DokuWiki';
+$lang['i_wikiname']            = 'Название вики';
+$lang['i_enableacl']           = 'Разрешить ограничение прав доступа (рекомендуется)';
+$lang['i_superuser']           = 'Суперюзер';
+$lang['i_problems']            = 'Программа установки столкнулась с проблемами, перечисленными ниже. Чтобы продолжить, вам необходимо их устранить. ';
+$lang['i_modified']            = 'Из соображений безопасности эта программа запускается только на новой, неизменённой установке DokuWiki.
+                         Вам нужно либо заново распаковать скачанный пакет установки, либо обратиться к полной
+                         <a href="http://dokuwiki.org/install">инструкции по установке DokuWiki</a>';
+$lang['i_funcna']              = 'Функция PHP <code>%s</code> недоступна. Может быть, она по какой-то причине заблокирована Вашим хостингом?';
+$lang['i_phpver']              = 'Ваша версия PHP (<code>%s</code>) ниже требуемой (<code>%s</code>). Вам необходимо обновить установленную версию PHP.';
+$lang['i_permfail']            = '<code>%s</code> недоступна для записи DokuWiki. Вам необходимо исправить системные права доступа для этой директории!';
+$lang['i_confexists']          = '<code>%s</code> уже существует';
+$lang['i_writeerr']            = 'Не удалось создать <code>%s</code>. Вам необходимо проверить системные права доступа к файлу/директориям и создать файл вручную. ';
+$lang['i_badhash']             = 'dokuwiki.php не распознана или изменена (хэш=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - недопустимое или пустое значение';
+$lang['i_success']             = 'Конфигурация прошла успешно. Теперь вы можете удалить файл install.php. Переходите к
+                        <a href="doku.php">вашей новой DokuWiki</a>.';
+$lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придется исправить их вручную, прежде чем вы сможете использовать <a href="doku.php">Вашу новую DokuWiki</a>.';
+$lang['i_policy']              = 'Исходная политика прав доступа';
+$lang['i_pol0']                = 'Открытая вики (чтение, запись, закачка файлов для всех)';
+$lang['i_pol1']                = 'Общедоступная вики (чтение для всех, запись и загрузка файлов для зарегистрированных пользователей)';
+$lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
+$lang['i_retry']               = 'Повторить попытку';
+$lang['mu_intro']              = 'Здесь Вы можете загрузить несколько файлов сразу. Кликните на "обзор", чтобы добавить их в список. Нажмите "загрузить" когда будете готовы.';
+$lang['mu_gridname']           = 'Имя файла';
+$lang['mu_gridsize']           = 'Размер';
+$lang['mu_gridstat']           = 'Статус';
+$lang['mu_namespace']          = 'Пространство имён';
+$lang['mu_browse']             = 'Обзор';
+$lang['mu_toobig']             = 'слишком большой';
+$lang['mu_ready']              = 'готово к загрузке';
+$lang['mu_done']               = 'завершено';
+$lang['mu_fail']               = 'провалено';
+$lang['mu_authfail']           = 'истекло время сессии';
+$lang['mu_progress']           = '@PCT@% загружено';
+$lang['mu_filetypes']          = 'Допустимые типы файлов';
+$lang['mu_info']               = 'файлов загружено.';
+$lang['mu_lasterr']            = 'Последняя ошибка:';
+$lang['recent_global']         = 'Вы просматриваете изменения в пространстве имён <b>%s</b>. Вы можете также <a href="%s">просмотреть недавние изменения на всей вики</a>.';
+$lang['years']                 = '%d лет назад';
+$lang['months']                = '%d месяц(ев) назад';
+$lang['weeks']                 = '%d недель назад';
+$lang['days']                  = '%d дней назад';
+$lang['hours']                 = '%d час(ов) назад';
+$lang['minutes']               = '%d минут назад';
+$lang['seconds']               = '%d секунд назад';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/locked.txt
new file mode 100644
index 000000000..3e868ba9a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/locked.txt
@@ -0,0 +1,3 @@
+====== Страница заблокирована ======
+
+Эта страница в данный момент заблокирована для редактирования другим пользователем. Вам придётся подождать, пока этот пользователь закончит редактирование или истечёт время блокировки.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/login.txt
new file mode 100644
index 000000000..967131874
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/login.txt
@@ -0,0 +1,4 @@
+====== Авторизация ======
+
+В данный момент Вы не в системе. Авторизируйтесь при помощи следующей формы. //Замечание:// для работы у вас должны быть включены cookies.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/mailtext.txt
new file mode 100644
index 000000000..596fd8275
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/mailtext.txt
@@ -0,0 +1,17 @@
+В вашей DokuWiki была добавлена или изменена страница. Подробности:
+
+Дата             : @DATE@
+Браузер          : @BROWSER@
+IP-адрес         : @IPADDRESS@
+Хост             : @HOSTNAME@
+Старая версия   : @OLDPAGE@
+Новая версия    : @NEWPAGE@
+Сводка изменений : @SUMMARY@
+Пользователь             : @USER@
+
+@DIFF@
+
+
+-- 
+Это письмо было сгенерировано DokuWiki по адресу
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/newpage.txt
new file mode 100644
index 000000000..042941310
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/newpage.txt
@@ -0,0 +1,3 @@
+====== Эта страница ещё не существует ======
+
+Вы перешли по ссылке на тему, для которой ещё не создана страница. Если позволяют Ваши права доступа, Вы можете создать её, нажав на кнопку "Создать страницу".
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/norev.txt
new file mode 100644
index 000000000..db36a0ddd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/norev.txt
@@ -0,0 +1,4 @@
+====== Такой версии не существует ======
+
+Указанная версия страницы не существует. Нажмите на кнопку ''История страницы'', чтобы получить список доступных предыдущих версий этого документа.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/preview.txt
new file mode 100644
index 000000000..a3f37843d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/preview.txt
@@ -0,0 +1,4 @@
+====== Просмотр ======
+
+Здесь показано, как Ваш текст будет выглядеть. Внимание: текст ещё **не сохранён!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/pwconfirm.txt
new file mode 100644
index 000000000..89c84791e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/pwconfirm.txt
@@ -0,0 +1,13 @@
+Здравствуйте, @FULLNAME@!
+
+Кто-то запросил новый пароль для входа в @TITLE@ по адресу @DOKUWIKIURL@
+
+Если Вы не запрашивали новый пароль, просто проигнорируйте этот e-mail.
+
+Для подтверждения, что запрос был действительно сделан Вами, пожалуйста, перейдите по следующей ссылке.
+
+@CONFIRM@
+
+-- 
+Это сообщение было сгенерировано DokuWiki по адресу
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/read.txt
new file mode 100644
index 000000000..ed2754ac7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/read.txt
@@ -0,0 +1,2 @@
+Эта страница — только для чтения. Вы можете посмотреть исходный текст, но не можете его изменить. Сообщите администратору, если считаете, что это неправильно.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/recent.txt
new file mode 100644
index 000000000..aa088c734
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/recent.txt
@@ -0,0 +1,5 @@
+====== Недавние изменения ======
+
+Эти страницы были изменены недавно.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/register.txt
new file mode 100644
index 000000000..23ed33656
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/register.txt
@@ -0,0 +1,3 @@
+====== Регистрация нового пользователя ======
+
+Для регистрации в вики заполните все поля ниже. Обратите внимание на **правильность адреса е-мэйл** - туда будет выслан пароль в том случае, если Вас не просят самостоятельно ввести его здесь. Логин должен удовлетворять ограничениям для [[doku>pagename|идентификатора страницы]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/registermail.txt
new file mode 100644
index 000000000..615cff543
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/registermail.txt
@@ -0,0 +1,14 @@
+Был зарегистрирован новый пользователь. Подробности:
+
+Логин       : @NEWUSER@
+Полное имя  : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+Дата        : @DATE@
+Браузер     : @BROWSER@
+Адрес IP    : @IPADDRESS@
+Хост        : @HOSTNAME@
+
+-- 
+Это сообщение было сгенерировано DokuWiki по адресу
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/resendpwd.txt
new file mode 100644
index 000000000..9bcd98dea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Послать новый пароль ======
+
+Для получения нового пароля введите требуемые данные ниже. Ваш новый пароль будет послан по адресу е-мэйл, зарегистрированному на Ваше имя. Указанное ниже имя должно быть Вашим логином в этой вики.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/revisions.txt
new file mode 100644
index 000000000..4341969a3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/revisions.txt
@@ -0,0 +1,3 @@
+====== История страницы ======
+
+Перед Вами — история правок текущего документа. Чтобы вернуться к одной из предыдущих версий, выберите нужную, нажмите ''Править страницу'' и сохраните.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/searchpage.txt
new file mode 100644
index 000000000..33cac358a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/searchpage.txt
@@ -0,0 +1,5 @@
+====== Поиск ======
+
+Перед Вами — результаты поиска. Если Вы не нашли то, что искали, Вы можете создать новую страницу с именем, совпадающим с запросом. Чтобы сделать это, просто нажмите на кнопку ''Создать страницу''.
+
+===== Результаты =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/showrev.txt
new file mode 100644
index 000000000..acb814e17
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/showrev.txt
@@ -0,0 +1,2 @@
+**Это — старая версия документа!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/stopwords.txt
new file mode 100644
index 000000000..a6df13902
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/stopwords.txt
@@ -0,0 +1,93 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+более
+больше
+будет
+будто
+была
+было
+быть
+вдруг
+ведь
+впрочем
+всегда
+всех
+всего
+говорил
+говорила
+даже
+другой
+другая
+если
+есть
+жизнь
+жизня
+зачем
+здесь
+иногда
+кажется
+какая
+какой
+какое
+когда
+конечно
+лучше
+между
+менее
+меньше
+меня
+много
+может
+можно
+надо
+наконец
+него
+нельзя
+нибудь
+никогда
+ничего
+нужно
+один
+одна
+опять
+перед
+после
+потом
+потому
+почти
+разве
+свое
+своё
+свой
+свою
+своя
+себе
+себя
+сегодня
+сейчас
+сказал
+сказала
+сказать
+совсем
+такая
+такое
+такой
+тебя
+теперь
+тогда
+того
+тоже
+только
+тому
+хорошо
+хоть
+чего
+через
+чтоб
+чтобы
+чуть
+этого
+этой
+этим
+этот
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/subscribermail.txt
new file mode 100644
index 000000000..1a846ac32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/subscribermail.txt
@@ -0,0 +1,17 @@
+Здравствуйте!
+
+Страница @PAGE@ в вики @TITLE@ была изменена.
+Ниже представлены изменения:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Чтобы отписаться от изменений этой страницы,
+войдите под своим именем в Вики по адресу
+@DOKUWIKIURL@, перейдите на страницу
+@NEWPAGE@ и нажмите 'Отписаться'.
+
+-- 
+Это сообщение было сгенерировано DokuWiki по адресу
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/updateprofile.txt
new file mode 100644
index 000000000..136184467
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Обновить профиль ======
+
+Необходимо заполнить только те поля, которые Вы хотите изменить. Имя пользователя не может быть изменено.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/uploadmail.txt
new file mode 100644
index 000000000..07dbf186d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/uploadmail.txt
@@ -0,0 +1,14 @@
+В вашу DokuWiki был закачан файл. Подробная информация:
+
+Файл        : @MEDIA@
+Дата        : @DATE@
+Браузер     : @BROWSER@
+Адрес IP    : @IPADDRESS@
+Хост        : @HOSTNAME@
+Размер      : @SIZE@
+Тип MIME    : @MIME@
+Пользователь: @USER@
+
+-- 
+Это письмо было сгенерировано DokuWiki по адресу
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/wordblock.txt
new file mode 100644
index 000000000..09c663fb3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/ru/wordblock.txt
@@ -0,0 +1,3 @@
+====== СПАМ заблокирован ======
+
+Ваши изменения **не были** сохранены, так как они содержат одно или более запрещенных слов. Если Вы пытались добавить спам в Вики -- ай-яй-яй!  Если Вы считаете, что это какая-то ошибка, обратитесь к администратору вики.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/admin.txt
new file mode 100644
index 000000000..039da2ae2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/admin.txt
@@ -0,0 +1,5 @@
+====== Administrácia ======
+
+Nižšie môžte nájsť zoznam administratívnych úloch, ktoré môžte vykonávať v DokuWiki.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/backlinks.txt
new file mode 100644
index 000000000..b3217d545
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/backlinks.txt
@@ -0,0 +1,3 @@
+====== Spätné odkazy ======
+
+Tu je zoznam stránok, ktoré pravdepodobne odkazujú na aktuálnu stránku.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/conflict.txt
new file mode 100644
index 000000000..d3cd0f590
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/conflict.txt
@@ -0,0 +1,5 @@
+====== Existuje novšia verzia ======
+
+Existuje novšia verzia práve upravovaného dokumentu. To se stáva, keď niekto iný zmenil dokument, ktorý práve upravujete.
+
+Prehliadnite si nižšie uvedené rozdiely, prípadne rozdiely z obidvoch verzií ručne spojte dohromady a rozhodnite sa, ktorú verziu uchovať. Ak zvolíte ''Uložiť', bude uložená vaša verzia. V opačnom prípade stlačte ''Storno'' pre uchovanie pôvodnej verzie.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/denied.txt
new file mode 100644
index 000000000..6f673c7d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/denied.txt
@@ -0,0 +1,3 @@
+====== Nepovolená akcia ======
+
+Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. Možno ste se zabudli prihlásiť?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/diff.txt
new file mode 100644
index 000000000..0e29e7f7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/diff.txt
@@ -0,0 +1,4 @@
+====== Rozdiely ======
+
+Tu môžete vidieť rozdiely medzi vybranou verziou a aktuálnou verzou danej stránky.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/draft.txt
new file mode 100644
index 000000000..7e6776deb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/draft.txt
@@ -0,0 +1,6 @@
+====== Nájdený súbor konceptu ======
+
+Vaša posledná editácia tejto stránky nebola ukončená korektne. Dokuwiki automaticky uložila počas vašej práce koncept a ten môžete teraz použiť pre pokračovanie editácie. Nižšie môžete vidieť dáta, ktoré boli uložené.
+
+Prosím, rozhodnite sa, či chcete //obnoviť// vašu poslednú editáciu, //zmazať// automaticky uložený koncept, alebo //stornovať// proces editácie.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/edit.txt
new file mode 100644
index 000000000..1adf4e16f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/edit.txt
@@ -0,0 +1 @@
+Upravte stránku a stlačte ''Uložiť''. Na stránke [[wiki:syntax]] sa môžete dozvedieť viac o Wiki syntaxi. Prosím upravujte stránky len pokiaľ ich môžete **vylepšit**. Pokiaľ si chcete niečo len vyskúšať, použite [[playground:playground| pieskovisko]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/editrev.txt
new file mode 100644
index 000000000..6a837c244
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/editrev.txt
@@ -0,0 +1 @@
+**Máte načítanú staršiu verziu dokumentu!** Pokiaľ ju uložíte, vytvoríte tým novú aktuálnú verziu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/index.txt
new file mode 100644
index 000000000..7b26d42ce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Tu je k dispozícii index všetkých dostupných stránok Zoradených podľa [[doku>namespaces|menných priestorov]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/install.html
new file mode 100644
index 000000000..c45b82005
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/install.html
@@ -0,0 +1,23 @@
+<p>Táto stránka sprevádza prvou inštaláciou a konfiguráciou 
+<a href="http://dokuwiki.org">Dokuwiki</a>. Viac informácií o tomto Inštalátore je dostupných na jeho 
+<a href="http://dokuwiki.org/installer">dokumentačnej stránke</a>.</p>
+
+<p>DokuWiki používa bežné súbory pre ukladanie wiki stránok a iných informácií 
+priradených k týmto stránkam (napr. obrázkov, vyhľadávacích indexov, starých 
+revízií). Ak chcete úspešne narábať s DokuWiki, <strong>musí</strong> 
+mať práva pre zápis do adresárov, kde sa ukladajú tieto súbory. Tento Inštalátor 
+nie je schopný nastaviť prístupové práva pre adresáre. Je potrebné to urobiť 
+priamo cez príkazový riadok, alebo ak využívate webhosting, cez FTP, alebo vaše 
+webhostingové administračné rozhranie.</p>
+
+<p>Tento Inštalátor nastaví <acronym title="access control list - zoznam prístupových práv">ACL</acronym> 
+konfiguráciu vašej Dokuwiki. Umožňuje vytvoriť administrátorské konto 
+s prístupom do administračného menu s možnosťou inštalácie pluginov, správy
+užívateľov, správy prístupových práv k wiki stránkam a zmeny konfiguračných 
+nastavení. Nie je nevyhnutné pre používanie Dokuwiki, ale umožňuje to ľahšie 
+spravovať Dokuwiki.</p>
+
+<p>Skúsení užívatelia, alebo užívatelia so špeciálnymi požiadavkami môžu použiť
+tieto odkazy pre bližšie informácie týkajúce sa
+<a href="http://dokuwiki.org/install">inštalačných pokynov</a>
+a <a href="http://dokuwiki.org/config">konfiguračných nastavení</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/lang.php
new file mode 100644
index 000000000..2d9c8efea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/lang.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Slovak language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Ondrej Vegh <ov@vsieti.sk> with help of the scholars from Zdruzena stredna skola polygraficka in Bratislava
+ * @author Michal Mesko <michal.mesko@gmail.com>
+ * @author exusik@gmail.com
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Upraviť stránku';
+$lang['btn_source']            = 'Zobraziť zdroj stránky';
+$lang['btn_show']              = 'Zobraziť stránku';
+$lang['btn_create']            = 'Vytvoriť stránku';
+$lang['btn_search']            = 'Hľadať';
+$lang['btn_save']              = 'Uložiť';
+$lang['btn_preview']           = 'Náhľad';
+$lang['btn_top']               = 'Hore';
+$lang['btn_newer']             = '<< novšie';
+$lang['btn_older']             = 'staršie >>';
+$lang['btn_revs']              = 'Staršia verzia';
+$lang['btn_recent']            = 'Posledné úpravy';
+$lang['btn_upload']            = 'Nahrať';
+$lang['btn_cancel']            = 'Storno';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Upraviť';
+$lang['btn_login']             = 'Prihlásiť sa';
+$lang['btn_logout']            = 'Odhlásiť sa';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Aktualizovať';
+$lang['btn_delete']            = 'Zmazať';
+$lang['btn_back']              = 'Späť';
+$lang['btn_backlink']          = 'Spätné linky';
+$lang['btn_backtomedia']       = 'Späť na výber média';
+$lang['btn_subscribe']         = 'Posielať zmeny';
+$lang['btn_unsubscribe']       = 'Neposielať zmeny';
+$lang['btn_subscribens']       = 'Posielať zmeny menných priestorov';
+$lang['btn_unsubscribens']     = 'Neposielať zmeny menných priestorov';
+$lang['btn_profile']           = 'Aktualizovať profil';
+$lang['btn_reset']             = 'Zrušiť';
+$lang['btn_resendpwd']         = 'Poslať nové heslo';
+$lang['btn_draft']             = 'Upraviť koncept';
+$lang['btn_recover']           = 'Obnoviť koncept';
+$lang['btn_draftdel']          = 'Zmazať koncept';
+$lang['loggedinas']            = 'Prihlásený(á) ako';
+$lang['user']                  = 'Užívateľské meno';
+$lang['pass']                  = 'Heslo';
+$lang['newpass']               = 'Nové heslo';
+$lang['oldpass']               = 'Potvrď aktuálne heslo';
+$lang['passchk']               = 'Ešte raz znovu';
+$lang['remember']              = 'Zapamätaj si ma';
+$lang['fullname']              = 'Celé meno';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Registrovať';
+$lang['profile']               = 'Užívateľský profil';
+$lang['badlogin']              = 'Zadané užívateľské meno a heslo nie je správne.';
+$lang['minoredit']             = 'Menšie zmeny';
+$lang['draftdate']             = 'Koncept automaticky uložený';
+$lang['nosecedit']             = 'Skránka bola medzičasom zmenená, informácie o sekcii sú zastaralé a z tohto dôvodu bola nahraná celá stránka.';
+$lang['regmissing']            = 'Musíte vyplniť všetky údaje.';
+$lang['reguexists']            = 'Užívateľ s rovnakým menom je už zaregistrovaný.';
+$lang['regsuccess']            = 'Užívateľský účet bol vytvorený a heslo zaslané mailom.';
+$lang['regsuccess2']           = 'Užívateľský účet bol vytvorený.';
+$lang['regmailfail']           = 'Zdá sa, že nastala chyba pri posielaní mailu s heslom. Skúste kontaktovať správcu.';
+$lang['regbadmail']            = 'Zadaná mailová adresa nie je platná. Pokiaľ si myslíte, že to je zle, skúste kontaktovať správcu.';
+$lang['regbadpass']            = 'Dve zadané heslá nie sú rovnaké, skúste prosím znovu.';
+$lang['regpwmail']             = 'Vaše heslo do systému DokuWiki';
+$lang['reghere']               = 'Nemáte uživateľský účet? Vytvorte si ho';
+$lang['profna']                = 'Toto wiki nepodporuje zmenu profilu';
+$lang['profnochange']          = 'Žiadne zmeny, nie je čo robiť.';
+$lang['profnoempty']           = 'Prázdne meno, alebo e-mailová adresa nie sú povolené.';
+$lang['profchanged']           = 'Užívateľský účet úspešne zmenený.';
+$lang['pwdforget']             = 'Zabudli ste heslo? Získajte nové!';
+$lang['resendna']              = 'Toto wiki nepodporuje znovuposielanie hesla.';
+$lang['resendpwd']             = 'Pošli nové heslo pre';
+$lang['resendpwdmissing']      = 'Prepáčte, musíte vyplniť všetky polia.';
+$lang['resendpwdnouser']       = 'Prepáčte, nemôžeme nájsť zadaného užívateľa v databáze.';
+$lang['resendpwdbadauth']      = 'Prepáčte, tento autorizačný kód nie je platný. Uistite sa, či ste použili celý autorizačný odkaz.';
+$lang['resendpwdconfirm']      = 'Autorizačný odkaz bol zaslaný na e-mail.';
+$lang['resendpwdsuccess']      = 'Vaše nové heslo bolo zaslané na e-mail.';
+$lang['license']               = 'Ak nie je uvedené inak, obsah tejto wiki je uverejnený pod nasledujúcou licenciou:';
+$lang['licenseok']             = 'Poznámka: Zmenou tejto stránky súhlasíte s uverejnením obsahu pod nasledujúcou licenciou:';
+$lang['txt_upload']            = 'Vyberte súbor ako prílohu';
+$lang['txt_filename']          = 'Wiki meno (volitelné)';
+$lang['txt_overwrt']           = 'Prepísať existujúci súbor';
+$lang['lockedby']              = 'Práve zamknuté:';
+$lang['lockexpire']            = 'Zámok vyprší:';
+$lang['willexpire']            = 'Váš zámok pre editáciu za chvílu vyprší.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
+$lang['notsavedyet']           = 'Neuložené zmeny budú stratené.\nChcete naozaj pokračovať?';
+$lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
+$lang['nothingfound']          = 'Nič nenájdené.';
+$lang['mediaselect']           = 'Výber dokumentu';
+$lang['fileupload']            = 'Nahrávanie dokumentu';
+$lang['uploadsucc']            = 'Prenos prebehol v poriadku';
+$lang['uploadfail']            = 'Chyba pri nahrávaní. Možno kvôli zle nastaveným právam?';
+$lang['uploadwrong']           = 'Prenos súboru s takouto príponou nie je dovolený.';
+$lang['uploadexist']           = 'Súbor skutočne existuje. Nie je čo robiť.';
+$lang['uploadbadcontent']      = 'Nahraný obsah sa nezhoduje s príponou súboru %s.';
+$lang['uploadspam']            = 'Nahrávanie bolo zablokované spamovým blacklistom.';
+$lang['uploadxss']             = 'Nahrávanie bolo zablokované kvôli potenciálnemu škodlivému obsahu.';
+$lang['uploadsize']            = 'Nahraný súbor bol príliš veľký. (max %s)';
+$lang['deletesucc']            = 'Súbor "%s" bol zmazaný.';
+$lang['deletefail']            = '"%s" nie je možné zmazať - skontrolujte oprávnenia.';
+$lang['mediainuse']            = 'Súbor "%s" nebol zmazaný - je stále používaný.';
+$lang['namespaces']            = 'Menné priestory';
+$lang['mediafiles']            = 'Dostupné súbory';
+$lang['js']['keepopen']        = 'Po vybraní súboru ponechať okno otvorené';
+$lang['js']['hidedetails']     = 'Skryť detaily';
+$lang['js']['nosmblinks']      = 'Odkazovanie na zdielané prostriedky Windows funguje len v Internet Explorer.
+Aj napriek tomu tento odkaz môžete skopírovat a vložit inde.';
+$lang['js']['mu_btn']          = 'Nahrať viac súborov naraz';
+$lang['mediausage']            = 'Pre odkázanie na súbor použite nasledujúcu syntax:';
+$lang['mediaview']             = 'Zobraziť pôvodný súbor';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Nahrať súbor do aktuálneho menného priestoru. Pre vytvorenie menného podpriestoru, pridajte jeho názov na začiatok wiki mena (oddelený dvojbodkou)';
+$lang['mediaextchange']        = 'Prípona súboru bola zmenená z .%s na .%s!';
+$lang['reference']             = 'Referencie pre';
+$lang['ref_inuse']             = 'Súbor nemôže byť zmazaný, pretože je stále používaný nasledujúcimi stránkami:';
+$lang['ref_hidden']            = 'Niektoré referencie sú na stránky pre ktoré nemáte právo na čítanie';
+$lang['hits']                  = '- počet výskytov';
+$lang['quickhits']             = 'Zodpovedajúce stránky';
+$lang['toc']                   = 'Obsah';
+$lang['current']               = 'aktuálne';
+$lang['yours']                 = 'Vaša verzia';
+$lang['diff']                  = 'zobrazit rozdiely voči aktuálnej verzii';
+$lang['diff2']                 = 'Ukázať rozdiely medzi vybranými verziami';
+$lang['line']                  = 'Riadok';
+$lang['breadcrumb']            = 'História';
+$lang['youarehere']            = 'Nachádzate sa';
+$lang['lastmod']               = 'Posledná úprava';
+$lang['by']                    = 'od';
+$lang['deleted']               = 'odstranené';
+$lang['created']               = 'vytvorené';
+$lang['restored']              = 'stará verzia bola obnovena';
+$lang['external_edit']         = 'externá úprava';
+$lang['summary']               = 'Komentár k úpravám';
+$lang['noflash']               = 'Pre zobrazenie tohto obsahu potrebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['mail_newpage']          = 'stránka pridaná:';
+$lang['mail_changed']          = 'stránka zmenená:';
+$lang['mail_new_user']         = 'Nový užívateľ:';
+$lang['mail_upload']           = 'nahraný súbor:';
+$lang['qb_bold']               = 'Tučné';
+$lang['qb_italic']             = 'Kurzíva';
+$lang['qb_underl']             = 'Podčiarknutie';
+$lang['qb_code']               = 'Neformátovať (zdrojový kód)';
+$lang['qb_strike']             = 'Prečiarknutie';
+$lang['qb_h1']                 = 'Nadpis 1. úrovne';
+$lang['qb_h2']                 = 'Nadpis 2. úrovne';
+$lang['qb_h3']                 = 'Nadpis 3. úrovne';
+$lang['qb_h4']                 = 'Nadpis 4. úrovne';
+$lang['qb_h5']                 = 'Nadpis 5. úrovne';
+$lang['qb_link']               = 'Interný odkaz';
+$lang['qb_extlink']            = 'Externý odkaz';
+$lang['qb_hr']                 = 'Horizontálna linka';
+$lang['qb_ol']                 = 'Číslovaný zoznam';
+$lang['qb_ul']                 = 'Nečíslovaný zoznam';
+$lang['qb_media']              = 'Vložiť obrázky alebo iné súbory';
+$lang['qb_sig']                = 'Vložiť podpis';
+$lang['qb_smileys']            = 'Smajlíky';
+$lang['qb_chars']              = 'Špeciálne znaky';
+$lang['js']['del_confirm']           = 'Zmazať túto položku?';
+$lang['admin_register']        = 'Pridaj nového užívateľa';
+$lang['metaedit']              = 'Upraviť metainformácie';
+$lang['metasaveerr']           = 'Zápis metainformácií zlyhal';
+$lang['metasaveok']            = 'Metainformácie uložené';
+$lang['img_backto']            = 'Späť na';
+$lang['img_title']             = 'Titul';
+$lang['img_caption']           = 'Popis';
+$lang['img_date']              = 'Dátum';
+$lang['img_fname']             = 'Názov súboru';
+$lang['img_fsize']             = 'Veľkosť';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Kopírovacie práva';
+$lang['img_format']            = 'Formát';
+$lang['img_camera']            = 'Fotoaparát';
+$lang['img_keywords']          = 'Klúčové slová';
+$lang['subscribe_success']     = 'Pridané %s do zoznamu objednávok pre %s';
+$lang['subscribe_error']       = 'Chyba pri pridaní %s do zoznamu objednávok pre %s';
+$lang['subscribe_noaddress']   = 'Nie je žiadna e-mailová adresa priradená k vašemu menu,nemôžte byť pridaný do zoznamu objednávok';
+$lang['unsubscribe_success']   = 'Odobrané %s zo zoznamu objednávok pre %s';
+$lang['unsubscribe_error']     = 'Chaba pri odobraní %s zo zoznamu objednávok pre %s';
+$lang['authmodfailed']         = 'Užívateľská autentifikácia nie je možná. Prosím informujte  správcu tohto systému.';
+$lang['authtempfail']          = 'Užívateľská autentifikácia je dočasne nedostupná. Ak táto situácia pretrvá, prosím informujte správcu tohto systému.';
+$lang['i_chooselang']          = 'Zvoľte váš jazyk';
+$lang['i_installer']           = 'DokuWiki inštalátor';
+$lang['i_wikiname']            = 'Názov Wiki';
+$lang['i_enableacl']           = 'Aktivovať ACL (doporučené)';
+$lang['i_superuser']           = 'Správca';
+$lang['i_problems']            = 'Inštalátor narazil na nižšie uvedené problémy. Nemôžete pokračovať, pokiaľ ich neodstránite.';
+$lang['i_modified']            = 'Z bezpečnostných dôvodov bude tento skript fungovať iba s novou, neupravenou inštaláciou Dokuwiki. Môžete buď znovu rozbaliť stiahnutý inštalačný balíček, alebo preštudovať <a href="http://dokuwiki.org/install"> inštalačné inštrukcie Dokuwiki</a>';
+$lang['i_funcna']              = 'PHP funkcia <code>%s</code> nie je dostupná. Je možné, že ju z určitých dôvodov zablokoval váš poskytovateľ webhostingu?';
+$lang['i_phpver']              = 'Vaša verzia PHP <code>%s</code> je nižšia ako požadovaná <code>%s</code>. Potrebujete aktualizovať Vašu instaláciu PHP.';
+$lang['i_permfail']            = '<code>%s</code> nie je zapisovateľný pre DokuWiki. Musíte zmeniť prístupové práva pre tento adresár!';
+$lang['i_confexists']          = '<code>%s</code> už existuje';
+$lang['i_writeerr']            = 'Nie je možné vytvoriť <code>%s</code>. Potrebujete skontrolovať prístupové práva pre adresár/súbor a vytvoriť ho manuálne.';
+$lang['i_badhash']             = 'nerozpoznaný, alebo zmenený súbor dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - bola zadaná nesprávna, alebo žiadna hodnota';
+$lang['i_success']             = 'Konfigurácia bola úspešne ukončená. Teraz môžte zmazať súbor install.php. Pokračujte vo
+                       <a href="doku.php">vašej novej DokuWiki</a>.';
+$lang['i_failure']             = 'Pri zápise konfiguračného súboru nastali nejaké chyby. Potrebujete ich opraviť manuálne pred tým ako budete môcť používať
+                         <a href="doku.php">vašu novú DokuWiki</a>.';
+$lang['i_policy']              = 'Počiatočná ACL politika';
+$lang['i_pol0']                = 'Otvorená Wiki (čítanie, zápis a nahrávanie pre každého)';
+$lang['i_pol1']                = 'Verejná Wiki (čítanie pre každého, zápis a nahrávanie pre registrovaných užívateľov)';
+$lang['i_pol2']                = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)';
+$lang['i_retry']               = 'Skúsiť znovu';
+$lang['mu_intro']              = 'Na tomto mieste môžete nahrávať viac súborov naraz. Tlačidlom Prehľadávať pridáte súbory do zoznamu. Tlačidlom Nahrať vykonáte prenos súborov.';
+$lang['mu_gridname']           = 'Názov súboru';
+$lang['mu_gridsize']           = 'Veľkosť';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Oblasť mien';
+$lang['mu_browse']             = 'Prehľadávať';
+$lang['mu_toobig']             = 'príliš veľký';
+$lang['mu_ready']              = 'pripravený na nahratie';
+$lang['mu_done']               = 'dokončený';
+$lang['mu_fail']               = 'neúspešný';
+$lang['mu_authfail']           = 'spojenie vypršalo';
+$lang['mu_progress']           = '@PCT@% nahraných';
+$lang['mu_filetypes']          = 'Povolené typy súborov';
+$lang['recent_global']         = 'Práve prehliadate zmeny v mennom priestore <b>%s</b>. Môžete si tiež pozrieť <a href="%s">aktuálne zmeny celej wiki</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/locked.txt
new file mode 100644
index 000000000..0e7d9645e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/locked.txt
@@ -0,0 +1,3 @@
+====== Stránka je uzamknutá ======
+
+Tato stránka je práve uzamknutá pre úpravy iným užívateľom. Musíte počkať pokým daný užívateľ dokončí svoje úpravy, alebo pokým tento zámok vyprší.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/login.txt
new file mode 100644
index 000000000..3bfc91037
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/login.txt
@@ -0,0 +1,3 @@
+====== Prihlásenie ======
+
+Momentálne nie ste prihlásený(á)! Prosím vložte svoje identifikačné údaje. Pre prihlásenie musíte mať zapnuté cookies.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/mailtext.txt
new file mode 100644
index 000000000..78757799e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/mailtext.txt
@@ -0,0 +1,17 @@
+Stránka vo vašom DokuWiki bola zmenená. Tu sú podrobnosti:
+
+Dátum       : @DATE@
+Prehliadač   : @BROWSER@
+IP adresa   : @IPADDRESS@
+Hostitel    : @HOSTNAME@
+Stará verzia : @OLDPAGE@
+Nová verzia  : @NEWPAGE@
+Komentár    : @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+Táto správa bola vygenerovaná systémom DokuWiki:
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/newpage.txt
new file mode 100644
index 000000000..180d80ee1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/newpage.txt
@@ -0,0 +1,3 @@
+====== Stránka s týmto názvom ešte neexistuje ======
+
+Odkaz vás zaviedol na stránku, ktorá ešte neexistuje. Môžete ju vytvoriť stlačením tlačítka ''Vytvoriť stránku''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/norev.txt
new file mode 100644
index 000000000..8d35f7f20
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/norev.txt
@@ -0,0 +1,3 @@
+====== Takáto verzia neexistuje ======
+
+Zadaná verzia neexistuje. Stlačte tlačítko ''Staršia verzia'' pre zoznam starších verzií tohoto dokumentu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/preview.txt
new file mode 100644
index 000000000..871bca371
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/preview.txt
@@ -0,0 +1,3 @@
+====== Náhľad ======
+
+Tu je náhľad, ako bude dokument vyzerať. Pozor: Súbor zatiaľ **nie je uložený**!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/pwconfirm.txt
new file mode 100644
index 000000000..19903203d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ahoj @FULLNAME@!
+
+Niekto žiadal o nové heslo pre vaše @TITLE@
+konto na @DOKUWIKIURL@
+
+Ak ste nežiadali o nové heslo, potom iba ignorujte tento mail.
+
+Pre potvrdenie, že požiadavka bola skutočne odoslaná vami,
+použite prosím nasledujúci odkaz.
+
+@CONFIRM@
+
+-- 
+Tento mail bol generovaný Dokuwiki na adrese
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/read.txt
new file mode 100644
index 000000000..a50b2afb6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/read.txt
@@ -0,0 +1,2 @@
+Táto stránka je iba na čítanie. Môžete si iba prehliadnuť zdrojový kód, ale nie meniť ho. Opýtajte sa správcu, ak si myslíťe že niečo nie je v poriadku.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/recent.txt
new file mode 100644
index 000000000..408d1075b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/recent.txt
@@ -0,0 +1,3 @@
+====== Posledné úpravy ======
+
+Následujúce stránky boli nedávno zmenené.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/register.txt
new file mode 100644
index 000000000..8dfe6be4e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/register.txt
@@ -0,0 +1,3 @@
+====== Zaregistrujte sa ako nový užívateľ ======
+
+Aby ste získali uživateľský účet, vyplňťe prosím všetky informácie v následujúcom formulári. Zadajte **platnú** mailovú adresu, na ktorú bude zaslané heslo. Uživateľské meno musí byť v platnom [[doku>pagename|formáte]] (ktorý je rovnaký ako formát názvu stránky).
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/registermail.txt
new file mode 100644
index 000000000..3fdc63f74
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/registermail.txt
@@ -0,0 +1,14 @@
+Nový užívateľ bol registrovaný. Tu sú detaily:
+
+Užívateľské meno : @NEWUSER@
+Celé meno        : @NEWNAME@
+E-Mail           : @NEWEMAIL@
+
+Dátum            : @DATE@
+Prehliadač       : @BROWSER@
+IP adresa        : @IPADDRESS@
+Meno servera     : @HOSTNAME@
+
+-- 
+Tento mail bol generovaný Dokuwiki na adrese
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/resendpwd.txt
new file mode 100644
index 000000000..b51706c96
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Poslať nové heslo ======
+
+Vyplnte niežšie požadované informácie pre získanie nového hesla pre váš účet v tomto wiki. Vaše nové heslo bude zaslané na vašu registrovanú e-mailovú adresu. Užívateľské meno má byť vaše prihlasovaciemeno do wiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/revisions.txt
new file mode 100644
index 000000000..887386eab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/revisions.txt
@@ -0,0 +1,3 @@
+====== Staršia verzia ======
+
+Tu sú staršie verzie daného dokumentu. Pre návrat ku staršej verzii si ju zvoľte zo zoznamu nižšie, stlačte tlačidlo ''Upraviť stránku'' a uložte ju.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/searchpage.txt
new file mode 100644
index 000000000..3fdf074b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/searchpage.txt
@@ -0,0 +1,5 @@
+====== Vyhľadávanie ======
+
+Výsledky hľadania môžete vidieť nižšie. Pokiaľ ste nenašli, čo hľadáte, skúste požadovanú stránku sami vytvoriť stlačením tlačidla ''Vytvoriť stránku''.
+
+===== Výsledky =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/showrev.txt
new file mode 100644
index 000000000..036769694
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/showrev.txt
@@ -0,0 +1,3 @@
+**Toto je staršia verzia dokumentu!**
+----
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/stopwords.txt
new file mode 100644
index 000000000..86eb84046
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/stopwords.txt
@@ -0,0 +1,28 @@
+#Toto je zoznam slov ignorovaných indexérom, jedno slovo na riadok
+# Keď editujete tento súbor, uistite sa, či používate UNIXové konce riadkov (jednoduchý nový riadok)
+# Nie je potrebné vkladať slová kraťšie ako 3 znaky - tie sú ignorované vždy.
+# Tento zoznam je založený na inom nájdenom na http://www.ranks.nl/stopwords/
+okolo
+tvoj
+ale
+ako
+aký
+aká
+aké
+kde
+kým
+kom
+komu
+ich
+jeho
+jej
+tvoj
+môj
+moja
+moje
+moji
+náš
+váš
+www
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/subscribermail.txt
new file mode 100644
index 000000000..47505bc1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/subscribermail.txt
@@ -0,0 +1,18 @@
+Zdravím!
+
+Stránka @PAGE@ v @TITLE@ wiki bola zmenená.
+Tu sú zmeny:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pre odhlásenie sa z tejto stránky choďte na
+@DOKUWIKIURL@, potom navštívte
+@NEWPAGE@
+a zvoľte 'Neposielať zmeny'.
+
+-- 
+Tento mail bol vygenerovaný DokuWiki na
+@DOKUWIKIURL@
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/updateprofile.txt
new file mode 100644
index 000000000..67b823dc5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/updateprofile.txt
@@ -0,0 +1,6 @@
+====== Zmena vášho užívateľského profilu ======
+
+Potrebujete vyplniť len tie polia, ktoré chcete zmeniť. Nemôžete zmeniť prihlasovacie meno.
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/uploadmail.txt
new file mode 100644
index 000000000..871fcaeb2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/uploadmail.txt
@@ -0,0 +1,14 @@
+Súbor bol nahraný do DokuWiki. Tu sú podrobnosti:
+
+Súbor : @MEDIA@
+Dátum : @DATE@
+Prehliadač : @BROWSER@
+IP adresa : @IPADDRESS@
+Názov hostiteľa : @HOSTNAME@
+Veľkosť : @SIZE@
+MIME Typ : @MIME@
+Užívateľ : @USER@
+
+-- 
+Tento mail vygenerovalo DokuWiki na
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/wordblock.txt
new file mode 100644
index 000000000..4901b2aab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sk/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM nebol povolený ======
+
+Vaše zmeny **neboli uložené**, pretože obsahujú jedno alebo viacej nepovolených slov. Wiki si nepotrpí na spam! Pokiaľ sa domnievate, že ide o omyl, kontaktujte správcu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/backlinks.txt
new file mode 100644
index 000000000..e637199c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Kaj je povezano sem ======
+
+To je seznam strani, ki so povezane na trenutno stran. Opomba: CamelCase povezave niso zaznane kot take povezave.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/conflict.txt
new file mode 100644
index 000000000..7ada08b5f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/conflict.txt
@@ -0,0 +1,6 @@
+====== Obstaja novejša različica ======
+
+Obstaja novejša različica dokumenta, ki ga urejate. Do tega pride, ko kak drugi uporabnik spremeni dokument med vašim urejanjem.
+
+Temeljito preglejte spodaj prikazane razlike in se potem odločite, katero verzijo želite obdržati. Če izberete ''shrani'', bo shranjena vaša različica. Pritisnite ''prekliči'', če želite ohraniti trenutno različico.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/denied.txt
new file mode 100644
index 000000000..96c03a569
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/denied.txt
@@ -0,0 +1,4 @@
+====== Nimate dovoljenja ======
+
+Oprostite, za nadaljevanje nimati dovolj dovoljenj. Mogoče ste se pozabili prijaviti?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/diff.txt
new file mode 100644
index 000000000..f98f7e5ce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/diff.txt
@@ -0,0 +1,4 @@
+====== Primerjaj izbrane različice ======
+
+Prikazana je razlika med izbrano in trenutno različico te strani.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/edit.txt
new file mode 100644
index 000000000..180a97ade
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/edit.txt
@@ -0,0 +1,2 @@
+Uredite stran in pritisnite ''Shrani''. Glej [[wiki:syntax]] za  navodila za urejanje. Prosimo vas, da stran spremenite le, če jo nameravate **izboljšati**. Če hočete preizkusiti kakšno zadevo, se poigrajte v [[playground:playground|peskovniku]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/editrev.txt
new file mode 100644
index 000000000..cf2b4ec7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/editrev.txt
@@ -0,0 +1,2 @@
+**Naložili ste staro različico dokumenta!** Če jo shranite, boste ustvarili novo različico s to vsebino.
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/index.txt
new file mode 100644
index 000000000..89dd05fbe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/index.txt
@@ -0,0 +1,4 @@
+====== Kazalo ======
+
+To je kazalo vseh strani, ki so na voljo, urejenimi po [[doku>namespaces|imenskih prostorih]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/lang.php
new file mode 100644
index 000000000..bbffcfbb1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/lang.php
@@ -0,0 +1,162 @@
+<?php
+/**
+ * slovenian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Jaka Kranjc <lynxlupodian@hotmail.com>
+ * @author Boštjan Seničar <senicar@gmail.com>
+ * @author Dejan Levec <webphp@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Uredi to stran';
+$lang['btn_source']            = 'Prikaži izvorno kodo strani';
+$lang['btn_show']              = 'Prikaži stran';
+$lang['btn_create']            = 'Ustvari to stran';
+$lang['btn_search']            = 'Išči';
+$lang['btn_save']              = 'Shrani';
+$lang['btn_preview']           = 'Predogled';
+$lang['btn_top']               = 'Nazaj na vrh';
+$lang['btn_newer']             = '<< novejši';
+$lang['btn_older']             = 'starejši >>';
+$lang['btn_revs']              = 'Stare različice';
+$lang['btn_recent']            = 'Novosti';
+$lang['btn_upload']            = 'Pošlji';
+$lang['btn_cancel']            = 'Prekliči';
+$lang['btn_index']             = 'Kazalo';
+$lang['btn_secedit']           = 'Uredi';
+$lang['btn_login']             = 'Prijava';
+$lang['btn_logout']            = 'Odjava';
+$lang['btn_admin']             = 'Administrator';
+$lang['btn_update']            = 'Posodobi';
+$lang['btn_delete']            = 'Izbriši';
+$lang['btn_back']              = 'Nazaj';
+$lang['btn_profile']           = 'Posodobi profil';
+$lang['btn_reset']             = 'Ponastavi';
+$lang['btn_resendpwd']         = 'Pošlji novo geslo';
+$lang['btn_draft']             = 'Uredi osnutek';
+$lang['btn_recover']           = 'Obnovi osnutek';
+$lang['btn_draftdel']          = 'Izbriši osnutek';
+$lang['loggedinas']            = 'Prijavljen kot';
+$lang['user']                  = 'Uporabniško ime';
+$lang['pass']                  = 'Geslo';
+$lang['newpass']               = 'Novo geslo';
+$lang['oldpass']               = 'Potrdi trenutno geslo';
+$lang['passchk']               = 'ponovno';
+$lang['remember']              = 'Zapomni si me';
+$lang['fullname']              = 'Pravo ime';
+$lang['email']                 = 'Elektronska pošta';
+$lang['register']              = 'Odpri nov račun';
+$lang['profile']               = 'Profil uporabnika';
+$lang['badlogin']              = 'Oprostite, uporabniško ime ali geslo ni pravo.';
+$lang['minoredit']             = 'Manjše spremembe';
+$lang['draftdate']             = 'Samodejno shranjevanje osnutka vključeno';
+$lang['regmissing']            = 'Oprostite, zapolniti morate vsa polja.';
+$lang['reguexists']            = 'Oprostite, uporabnik s tem imenom že obstaja.';
+$lang['regsuccess']            = 'Uporabnik je bil ustvarjen. Geslo je bilo poslano na vaš elektronski naslov.';
+$lang['regsuccess2']           = 'Uporabnik je bil ustvarjen.';
+$lang['regmailfail']           = 'Zgleda, da je prišlo do napake pri pošiljanju gesla. Prosimo da stopite v stik z administratorjem!';
+$lang['regbadmail']            = 'Podan elektronski naslov izgleda neveljaven - če mislite da je to napaka, stopite v stik z administratorjem.';
+$lang['regbadpass']            = 'Gesli nista enaki.';
+$lang['regpwmail']             = 'Vaše geslo za DokuWiki';
+$lang['reghere']               = 'Nimate še računa? Priskrbite si ga';
+$lang['profnochange']          = 'Brez sprememb, ničesar za storiti.';
+$lang['profchanged']           = 'Uporabniški profil uspešno posodobljen';
+$lang['pwdforget']             = 'Pozabili geslo? Pridobite novega';
+$lang['resendpwd']             = 'Pošlji novo geslo za';
+$lang['resendpwdmissing']      = 'Se opravičujemo, vendar morate izpolniti vsa polja.';
+$lang['resendpwdnouser']       = 'Se opravičujemo, vendar tega uporabniškega imena ni v bazi.';
+$lang['resendpwdconfirm']      = 'Potrditvena povezava je bila poslana na vaš elektronski naslov';
+$lang['resendpwdsuccess']      = 'Vaše novo geslo je bilo poslano na vaš elektronski naslov';
+$lang['txt_upload']            = 'Izberite datoteko za pošiljanje';
+$lang['txt_filename']          = 'Vnesite wikiname (neobvezno)';
+$lang['txt_overwrt']           = 'Prepiši obstoječo datoteko';
+$lang['lockedby']              = 'Trenutno zaklenjeno od';
+$lang['lockexpire']            = 'Zaklep preteče';
+$lang['willexpire']            = 'Vaš zaklep za urejevanje bo pretekel čez eno minuto.\nDa se izognete konfliktom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
+$lang['notsavedyet']           = 'Obstajajo neshranjene spremembe, ki bodo izgubljene.\nRes želite nadaljevati?';
+$lang['rssfailed']             = 'Prišlo je do napake pri prenašanju tega dovoda: ';
+$lang['nothingfound']          = 'Nič ni bilo najdeno.';
+$lang['mediaselect']           = 'Mediafile Izbira';
+$lang['fileupload']            = 'Mediafile Pošiljanje';
+$lang['uploadsucc']            = 'Pošiljanje uspelo';
+$lang['uploadfail']            = 'Pošiljanje je spodletelo. Mogoče nimate dovoljenj?';
+$lang['uploadwrong']           = 'Pošiljanje zavrnjeno. Ta datotečna končnica je prepovedana';
+$lang['uploadexist']           = 'Dokument že obstaja. Brez sprememb.';
+$lang['uploadxss']             = 'Prenos je bil zaustavljen zaradi možne zlonamerne vsebine.';
+$lang['uploadsize']            = 'Prenesen dokument je prevelik. (max. %s)';
+$lang['deletesucc']            = 'Datoteka "%s" je bila izbrisana.';
+$lang['mediainuse']            = 'Dokument "%s" ni bil izbrisan - je še vedno v uporabi.';
+$lang['namespaces']            = 'Imenski prostori';
+$lang['mediafiles']            = 'Datoteke ki so na voljo v';
+$lang['js']['hidedetails']     = 'Skrij podrobnosti';
+$lang['js']['nosmblinks']      = 'Povezovanje do Windows deljenih datotek deluje samo v Microsoft Internet Explorer-ju.
+Še vedno pa lahko ročno kopirate povezavo.';
+$lang['js']['mu_btn']          = 'Prenesite več dokumentov naenkrat.';
+$lang['mediaview']             = 'Poglej originalno datoteko';
+$lang['hits']                  = 'Zadetkov';
+$lang['quickhits']             = 'Ujemanja v imenih strani';
+$lang['toc']                   = 'Kazalo';
+$lang['current']               = 'trenutna';
+$lang['yours']                 = 'Vaša različica';
+$lang['diff']                  = 'prikaži razlike s trenutno različico';
+$lang['line']                  = 'Vrstica';
+$lang['breadcrumb']            = 'Sled';
+$lang['youarehere']            = 'Tukaj ste';
+$lang['lastmod']               = 'Zadnjič spremenil/a';
+$lang['by']                    = 'od';
+$lang['deleted']               = 'odstranjena';
+$lang['created']               = 'ustvarjena';
+$lang['restored']              = 'stara različica povrnjena';
+$lang['summary']               = 'Povzetek urejanja';
+$lang['noflash']               = 'Za prikaz vsebine potrebujete <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
+$lang['mail_newpage']          = '[DokuWiki] stran dodana:';
+$lang['mail_changed']          = '[DokuWiki] stran spremenjena:';
+$lang['mail_new_user']         = 'nov uporabnik.';
+$lang['mail_upload']           = 'naložena datoteka:';
+$lang['qb_bold']               = 'Krepki tisk';
+$lang['qb_italic']             = 'Ležeči tisk';
+$lang['qb_underl']             = 'Podčrtano besedilo';
+$lang['qb_code']               = 'Koda';
+$lang['qb_strike']             = 'Prečrtano besedilo';
+$lang['qb_h1']                 = 'Naslov prve stopnje';
+$lang['qb_h2']                 = 'Naslov drugee stopnje';
+$lang['qb_h3']                 = 'Naslov tretje stopnje';
+$lang['qb_h4']                 = 'Naslov četrte stopnje';
+$lang['qb_h5']                 = 'Naslov pete stopnje';
+$lang['qb_link']               = 'Notranja povezava';
+$lang['qb_extlink']            = 'Zunanja povezava';
+$lang['qb_hr']                 = 'Vodoravna črta';
+$lang['qb_ol']                 = 'Element urejenega seznama';
+$lang['qb_ul']                 = 'Element neurejenega seznama';
+$lang['qb_media']              = 'Dodaj slike in druge datoteke';
+$lang['qb_sig']                = 'Vstavi podpis';
+$lang['qb_smileys']            = 'Smeški';
+$lang['qb_chars']              = 'Posebni znaki';
+$lang['admin_register']        = 'Dodaj novega uporabnika';
+$lang['metaedit']              = 'Popravi metapodatke';
+$lang['metasaveerr']           = 'Zapisovanje metapodatkov ni uspelo';
+$lang['metasaveok']            = 'Meta podatki shranjeni';
+$lang['img_backto']            = 'Nazaj na';
+$lang['img_title']             = 'Naslov';
+$lang['img_caption']           = 'Opis';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Ime datoteke';
+$lang['img_fsize']             = 'Velikost';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_format']            = 'Velikost';
+$lang['img_camera']            = 'Fotoaparat';
+$lang['img_keywords']          = 'Ključne besede';
+$lang['i_chooselang']          = 'Izberite jezik';
+$lang['i_installer']           = 'DokuWiki namestitev';
+$lang['i_wikiname']            = 'Wiki ime';
+$lang['i_enableacl']           = 'Omogoči ACL (priporočeno)';
+$lang['i_superuser']           = 'Naduporabnik';
+$lang['i_confexists']          = '<code>%s</code> že obstaja';
+$lang['mu_gridsize']           = 'Velikost';
+$lang['mu_done']               = 'končano';
+$lang['mu_filetypes']          = 'Dovoljeni tipi datotek';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/locked.txt
new file mode 100644
index 000000000..dbdcf48a1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/locked.txt
@@ -0,0 +1,3 @@
+====== Stran je zaklenjena ======
+
+To stran je nekdo zaklenjenil za urejanje. Počakati morate, da jo ta uporabnik neha urejati ali pa da poteče zaklep.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/login.txt
new file mode 100644
index 000000000..f385d0099
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/login.txt
@@ -0,0 +1,4 @@
+====== Prijava ======
+
+Niste prijavljeni! Spodaj vnesite svoje podatke in se prijavite. Da se lahko prijavite, morate imeti omogočene piškotke.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/mailtext.txt
new file mode 100644
index 000000000..a46c672d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/mailtext.txt
@@ -0,0 +1,17 @@
+Stran na vašem DokuWiki je bila dodana ali spremenjena. Podrobnosti:
+
+Datum            : @DATE@
+Brskalnik        : @BROWSER@
+IP-naslov        : @IPADDRESS@
+Gostitelj        : @HOSTNAME@
+Stara različica  : @OLDPAGE@
+Nova Različica   : @NEWPAGE@
+Povzetek urejanja: @SUMMARY@
+Uporabnik        : @USER@
+
+@DIFF@
+
+
+-- 
+To sporočilo je ustvaril DokuWiki na
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/newpage.txt
new file mode 100644
index 000000000..c58ab17ff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/newpage.txt
@@ -0,0 +1,3 @@
+====== Ta stran še ne obstaja ======
+
+Sledili ste povezavi na stran, ki še ne obstaja. Ustvarite jo lahko, tako da pritisnete na ''Ustvari to stran''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/norev.txt
new file mode 100644
index 000000000..28b9f8ac5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/norev.txt
@@ -0,0 +1,4 @@
+====== Ta različica ne obstaja ======
+
+Podana različica ne obstaja. Uporabite gumb ''Stare različice'' za seznam starih različic tega dokumenta.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/preview.txt
new file mode 100644
index 000000000..4ebf183ec
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/preview.txt
@@ -0,0 +1,4 @@
+====== Predogled ======
+
+To je predogled strani. Lahko si ogledate kako bo izgledal dokument. Ne pozabite pa, da še ni shranjen!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/pwconfirm.txt
new file mode 100644
index 000000000..96c3a64d5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/pwconfirm.txt
@@ -0,0 +1,13 @@
+Pozdravljen @FULLNAME@!
+
+Nekdo je v vašem imenu zahteval novo geslo za uporabniško ime @TITLE@ na @DOKUWIKIURL@.
+
+Če novega gesla niste zahtevali, prezrite to sporočilo.
+
+Za potrditev novega gesla, kliknite spodnjo povezavo.
+
+@CONFIRM@
+
+-- 
+To sporočilo je ustvaril DokuWiki na
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/read.txt
new file mode 100644
index 000000000..1423a4f16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/read.txt
@@ -0,0 +1,2 @@
+Ta stran je samo za branje. Lahko si ogledate njeno izvorno kodo, spreminjati pa je ne morete. Vprašajte administratorja, če se vam to zdi narobe.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/recent.txt
new file mode 100644
index 000000000..534063384
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/recent.txt
@@ -0,0 +1,5 @@
+====== Trenutne spremembe ======
+
+Sledeče strani so bile nedavno spremenjene.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/register.txt
new file mode 100644
index 000000000..d1f7ab49e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/register.txt
@@ -0,0 +1,4 @@
+====== Odpri nov račun ======
+
+Vnesite vse potrebne podatke in si ustvarite račun za ta wiki. Preverite da ste vnesli **veljaven e-mail naslov** - tja bo poslano geslo. Uporabniško ime mora biti veljavno [[doku>pagename|ime strani]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/registermail.txt
new file mode 100644
index 000000000..d9622325e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/registermail.txt
@@ -0,0 +1,14 @@
+Nov uporabnik registriran. Podatki:
+
+Uporabniško ime: @NEWUSER@
+Polno ime: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Datum: @DATE@
+Brskalnik: @BROWSER@
+IP naslov: @IPADDRESS@
+Hostname: @HOSTNAME@
+
+-- 
+To sporočilo je ustvaril DokuWiki na
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/resendpwd.txt
new file mode 100644
index 000000000..9f46a7a59
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Pošlji novo geslo ======
+
+Za pridobitev novega gesla, vnesite vaše uporabniško ime v obrazec spodaj. Na vaš email naslov bo poslano sporočilo s povezavo za potrditev avtentičnosti.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/revisions.txt
new file mode 100644
index 000000000..19bf39a87
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/revisions.txt
@@ -0,0 +1,4 @@
+====== Stare različice ======
+
+To so stare različice tega dokumenta. Da ga povrnete na starejšo različico, to prvo izberite,  pritisnite na ''Uredi to stran'' in jo še shranite.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/searchpage.txt
new file mode 100644
index 000000000..b41c6dd44
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Išči ======
+
+Spodaj so prikazani rezultati vašega iskanja. Če niste našli kar ste iskali, lahko ustvarite novo stran z imenom vaše poizvedbe, tako da uporabite gumb ''Uredi to stran''.
+
+===== Rezultati =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/showrev.txt
new file mode 100644
index 000000000..00111ffc5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/showrev.txt
@@ -0,0 +1,2 @@
+**To je stara različica tega dokumenta!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/wordblock.txt
new file mode 100644
index 000000000..c9d9c1ca0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sl/wordblock.txt
@@ -0,0 +1,4 @@
+====== Blokiran SPAM ======
+
+Vaše spremembe **niso** bile shranjene, ker so vsebovale eno ali več prepovedanih besed. Če ste poskusili nasmetiti Wiki -- Fuj Fido! Če mislite da je to napaka, stopite v stik z administratorjem.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/admin.txt
new file mode 100644
index 000000000..1e42970d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/admin.txt
@@ -0,0 +1,4 @@
+====== Администрација ======
+
+Изпод се налази листа доступних администраторских опција у DokuWiki-ју.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/backlinks.txt
new file mode 100644
index 000000000..dae8d5ab2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Повратне везе ======
+
+Ово је листа страница које имају везе ка тренутној страници.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/conflict.txt
new file mode 100644
index 000000000..2a1427ec4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/conflict.txt
@@ -0,0 +1,6 @@
+====== Постоји новија верзија ======
+
+Постоји новија верзија документа који сте изменили. Ово се дешава када неки други корисник измени документ док га Ви још увек мењате.
+
+Проучите разлике које су доле детаљно приказане, па након тога одлучите коју верзију желите да задржите. Ако изаберете ''сачувај'', Ваша верзија ће да буде сачувана. Ако изаберите ''поништи'', тренутна верзија ће да буде сачувана.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/denied.txt
new file mode 100644
index 000000000..b74f2b1f8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/denied.txt
@@ -0,0 +1,4 @@
+====== Забрањен приступ ======
+
+Извините, али немате довољно права да наставите. Можда сте заборавили да се пријавите?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/diff.txt
new file mode 100644
index 000000000..39b7427ec
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/diff.txt
@@ -0,0 +1,4 @@
+====== Разлике ======
+
+Овде су приказане разлике између изабране ревизије и тренутне верзије странице.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/draft.txt
new file mode 100644
index 000000000..046c709cf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/draft.txt
@@ -0,0 +1 @@
+====== Пронађена је скица датотеке ======
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/edit.txt
new file mode 100644
index 000000000..2d6fa7b8e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/edit.txt
@@ -0,0 +1,2 @@
+Измените ову страницу и притисните ''Сачувај''. Погледајте [[wiki:syntax]] за синтаксу Викија. Молим Вас, измените ову страницу само ако имате намеру да је **побољшате**. Ако желите да тестирате могућности, научите да направите своје кораке на [[playground:playground]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/editrev.txt
new file mode 100644
index 000000000..327902943
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/editrev.txt
@@ -0,0 +1,2 @@
+**Учитали сте стару ревизију документа!** Ако је сачувате, направићете нову верзију са овим подацима.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/index.txt
new file mode 100644
index 000000000..fe6467a1d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/index.txt
@@ -0,0 +1,4 @@
+====== Индекс ======
+
+Овде је индекс свих доступних страница поређаних по [[doku>namespaces|именским просторима]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/install.html
new file mode 100644
index 000000000..b9ab35c71
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/install.html
@@ -0,0 +1,12 @@
+<p>Ова страница ће вам помоћи у инсталацији и подешавању <a href="http://dokuwiki.org">Dokuwiki-ја</a>. Више информација о инсталацији можете пронаћи у 
+<a href="http://dokuwiki.org/installer">документацији</a>.</p>
+
+<p>DokuWiki користи обичне датотеке за складиштење вики страница и осталих информација везаних за странице (слике, индекс претраге, старе преправке, итд.). 
+Да би радио како треба DokuWiki као апликација <strong>мора</strong> имати могућност писања под фасциклама у којима се налазе ове датотеке. Овај програм за инсталацију нема могућност постављања дозвола за фасцикле. То се обично ради директно из командне линије или ако користите изнајмњени сервер, помоћу ФТПа или кроз Контролни панел (нпр. cPanel).</p>
+
+<p>Овај програм за инсталацију DokuWiki-а ће поставити подешавања за
+<acronym title="access control list">Права приступа</acronym>, које ће омогућити пријјављивање као администратор и приступ менију за инсталацију додатака, управљање корисницима, управљање приступом ка страницама и алтернатвна подешавања. Није неопходно да би DokuWiki радио, али ће вам олакшати администрацију.</p>
+
+<p>Искуснији корисници и корисници са посебним захтевима би требало да погледају следеће линкове са детаљним упутствима о 
+<a href="http://dokuwiki.org/install">инструкцијама за инсталацију</a>
+и <a href="http://dokuwiki.org/config">подешавањима</a>.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/lang.php
new file mode 100644
index 000000000..94829d314
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/lang.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * serbian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Filip Brcic <brcha@users.sourceforge.net>
+ * @author Иван Петровић petrovicivan@ubuntusrbija.org
+ * @author Ivan Petrovic <petrovicivan@ubuntusrbija.org>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Измени ову страницу';
+$lang['btn_source']            = 'Прикажи изворни код';
+$lang['btn_show']              = 'Прикажи страницу';
+$lang['btn_create']            = 'Направи ову страницу';
+$lang['btn_search']            = 'Тражи';
+$lang['btn_save']              = 'Сачувај';
+$lang['btn_preview']           = 'Прегледај';
+$lang['btn_top']               = 'Врати се на врх';
+$lang['btn_newer']             = '<< новије';
+$lang['btn_older']             = 'старије >>';
+$lang['btn_revs']              = 'Старе верзије';
+$lang['btn_recent']            = 'Скорије измене';
+$lang['btn_upload']            = 'Пошаљи';
+$lang['btn_cancel']            = 'Поништи';
+$lang['btn_index']             = 'Индекс';
+$lang['btn_secedit']           = 'Измени';
+$lang['btn_login']             = 'Пријави се';
+$lang['btn_logout']            = 'Одјави се';
+$lang['btn_admin']             = 'Администрација';
+$lang['btn_update']            = 'Ажурирај';
+$lang['btn_delete']            = 'Избриши';
+$lang['btn_back']              = 'Натраг';
+$lang['btn_backlink']          = 'Повратне везе';
+$lang['btn_backtomedia']       = 'Врати се на избор медијске датотеке';
+$lang['btn_subscribe']         = 'Пријави се на измене';
+$lang['btn_unsubscribe']       = 'Одјави се са измена';
+$lang['btn_subscribens']       = 'Претплати се на промене у именском простору';
+$lang['btn_unsubscribens']     = 'Откажи претплату на промене у именском простору';
+$lang['btn_profile']           = 'Ажурирај профил';
+$lang['btn_reset']             = 'Поништи';
+$lang['btn_resendpwd']         = 'Пошаљи нову лозинку';
+$lang['btn_draft']             = 'Измени нацрт';
+$lang['btn_recover']           = 'Опорави нацрт';
+$lang['btn_draftdel']          = 'Обриши нацрт';
+$lang['loggedinas']            = 'Пријављен као';
+$lang['user']                  = 'Корисничко име';
+$lang['pass']                  = 'Лозинка';
+$lang['newpass']               = 'Нова лозинка';
+$lang['oldpass']               = 'Потврди нову лозинку';
+$lang['passchk']               = 'поново';
+$lang['remember']              = 'Запамти ме';
+$lang['fullname']              = 'Име и презиме';
+$lang['email']                 = 'Е-адреса';
+$lang['register']              = 'Региструј се';
+$lang['profile']               = 'Кориснички профил';
+$lang['badlogin']              = 'Извините, није добро корисничко име или шифра.';
+$lang['minoredit']             = 'Мала измена';
+$lang['draftdate']             = 'Нацрт је аутоматски сачуван';
+$lang['nosecedit']             = 'Страна је у међувремену промењена, поглавље је застарело и поново се учитава цела страна.';
+$lang['regmissing']            = 'Извините, морате да попуните сва поља.';
+$lang['reguexists']            = 'Извините, корисник са истим именом већ постоји.';
+$lang['regsuccess']            = 'Корисник је направљен и лозинка је послата путем е-поште.';
+$lang['regsuccess2']           = 'Корисник је направљен.';
+$lang['regmailfail']           = 'Изгледа да је дошло до грешке приликом слања лозинке е-поштом. Молим Вас, контактирајте администратора!';
+$lang['regbadmail']            = 'Дата е-адреса није у реду - ако мислите да је ово грешка, контактирајте администратора';
+$lang['regbadpass']            = 'Две задате лозинке нису исте. Молим Вас, пробајте поново.';
+$lang['regpwmail']             = 'Ваша DokuWiki лозинка';
+$lang['reghere']               = 'Још увек немате налог? Само направите један';
+$lang['profna']                = 'Овај вики не дозвољава измену профила';
+$lang['profnochange']          = 'Нема промена.';
+$lang['profnoempty']           = 'Није дозвољено оставити празно поље имена или е-адресе.';
+$lang['profchanged']           = 'Кориснички профил је ажуриран.';
+$lang['pwdforget']             = 'Заборавили сте лозинку? Направите нову';
+$lang['resendna']              = 'Овај вики не дозвољава слање лозинки.';
+$lang['resendpwd']             = 'Пошаљи нову лозинку за';
+$lang['resendpwdmissing']      = 'Жао ми је, сва поља морају бити попуњена.';
+$lang['resendpwdnouser']       = 'Жао ми је, овај корисник не постоји у нашој бази.';
+$lang['resendpwdbadauth']      = 'Жао ми је, потврдни код није исправан. Проверите да ли сте користили комплетан потврдни линк.';
+$lang['resendpwdconfirm']      = 'Потврдни линк је постат као е-порука.';
+$lang['resendpwdsuccess']      = 'Ваша нова лозинка је послата као е-порука.';
+$lang['license']               = 'Осим где је другачије назначено, материјал на овом викију је под следећом лиценцом:';
+$lang['licenseok']             = 'Напомена: Изменом ове стране слажете се да ће ваше измене бити под следећом лиценцом:';
+$lang['txt_upload']            = 'Изаберите датотеку за слање';
+$lang['txt_filename']          = 'Унесите вики-име (опционо)';
+$lang['txt_overwrt']           = 'Препишите тренутни фајл';
+$lang['lockedby']              = 'Тренутно закључано од стране';
+$lang['lockexpire']            = 'Закључавање истиче';
+$lang['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
+$lang['notsavedyet']           = 'Несачуване измене ће бити изгубљене.\nДа ли стварно желите да наставите?';
+$lang['rssfailed']             = 'Дошло је до грешке приликом преузимања овог довода: ';
+$lang['nothingfound']          = 'Ништа није нађено.';
+$lang['mediaselect']           = 'Избор медијске датотеке';
+$lang['fileupload']            = 'Слање медијске датотеке';
+$lang['uploadsucc']            = 'Успешно слање';
+$lang['uploadfail']            = 'Неуспешно слање. Можда немате дозволу?';
+$lang['uploadwrong']           = 'Слање је забрањено. Овај наставак датотеке је забрањен!';
+$lang['uploadexist']           = 'Датотека већ постоји. Ништа није учињено.';
+$lang['uploadbadcontent']      = 'Материјал који шаљете не одговара %s ';
+$lang['uploadspam']            = 'Слање је блокирано јер се налазите на црној листи пошиљаоца.';
+$lang['uploadxss']             = 'Слање је блокирано јер је потенцијално малициозног садржаја.';
+$lang['uploadsize']            = 'Послата датотека је превелика. (максимум је %s)';
+$lang['deletesucc']            = 'Фајл "%s" је избрисан.';
+$lang['deletefail']            = '"%s" није могао да буде избрисан - проверите дозволе.';
+$lang['mediainuse']            = 'Фајл "%s" није избрисан - још је у употреби.';
+$lang['namespaces']            = 'Именски простори';
+$lang['mediafiles']            = 'Доступни фајлови у';
+$lang['js']['keepopen']        = 'Задржи отворен прозор након одабира';
+$lang['js']['hidedetails']     = 'Сакриј детаље';
+$lang['js']['nosmblinks']      = 'Повезивање са Windows дељеним фолдерима ради само у Мајкрософтовом Интернет Претраживачу.
+Ипак, можете да ископирате и залепите везу.';
+$lang['js']['mu_btn']          = 'Слање више датотека одједном';
+$lang['mediausage']            = 'Користите следећу синтаксу за референцу ка овој датотеци:';
+$lang['mediaview']             = 'Прикажи оригиналну датотеку';
+$lang['mediaroot']             = 'почетак';
+$lang['mediaupload']           = 'Пошаљи датотеку у тренутни именски простор. Да бисте направили подпросторе, предвидите их у поље „Пошаљи као“ раздвојено двотачкама.';
+$lang['mediaextchange']        = 'Наставак датотеке је промењен из .%s у .%s!';
+$lang['reference']             = 'Референце за';
+$lang['ref_inuse']             = 'Фајл не може да буде избрисан јер га још увек користе следеће странице:';
+$lang['ref_hidden']            = 'Неке референце су на страницама за које немате дозволе за читање';
+$lang['hits']                  = 'Поготци';
+$lang['quickhits']             = 'Имена страница које се поклапају';
+$lang['toc']                   = 'Садржај';
+$lang['current']               = 'тренутно';
+$lang['yours']                 = 'Ваша верзија';
+$lang['diff']                  = 'прикажи разлике до тренутне верзије';
+$lang['diff2']                 = 'Прикажи разлике између одабраних ревизија';
+$lang['line']                  = 'Линија';
+$lang['breadcrumb']            = 'Траг';
+$lang['youarehere']            = 'Сада сте овде';
+$lang['lastmod']               = 'Последњи пут мењано';
+$lang['by']                    = 'од';
+$lang['deleted']               = 'избрисано';
+$lang['created']               = 'направљено';
+$lang['restored']              = 'стара верзија повраћена';
+$lang['external_edit']         = 'спољна измена';
+$lang['summary']               = 'Сажетак измене';
+$lang['noflash']               = 'За приказивање ове врсте материјала потребан вам је <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['mail_newpage']          = 'страница додата:';
+$lang['mail_changed']          = 'страница измењена:';
+$lang['mail_new_user']         = 'нови корисник:';
+$lang['mail_upload']           = 'послата датотека:';
+$lang['qb_bold']               = 'Мастан текст';
+$lang['qb_italic']             = 'Курзивни текст';
+$lang['qb_underl']             = 'Подвучени текст';
+$lang['qb_code']               = 'Изворни код';
+$lang['qb_strike']             = 'Прецртани текст';
+$lang['qb_h1']                 = 'Наслов 1. нивоа';
+$lang['qb_h2']                 = 'Наслов 2. нивоа';
+$lang['qb_h3']                 = 'Наслов 3. нивоа';
+$lang['qb_h4']                 = 'Наслов 4. нивоа';
+$lang['qb_h5']                 = 'Наслов 5. нивоа';
+$lang['qb_link']               = 'Унутрашња веза';
+$lang['qb_extlink']            = 'Спољашња веза';
+$lang['qb_hr']                 = 'Хоризонтална линија';
+$lang['qb_ol']                 = 'Елемент уређене листе';
+$lang['qb_ul']                 = 'Елемент неуређене листе';
+$lang['qb_media']              = 'Додај слике и друге фајлове';
+$lang['qb_sig']                = 'Убаци потпис';
+$lang['qb_smileys']            = 'Смешко';
+$lang['qb_chars']              = 'Посебни карактери';
+$lang['js']['del_confirm']           = 'Обриши овај унос?';
+$lang['admin_register']        = 'Додај новог корисника';
+$lang['metaedit']              = 'Измени мета-податке';
+$lang['metasaveerr']           = 'Записивање мета-података није било успешно';
+$lang['metasaveok']            = 'Мета-подаци су сачувани';
+$lang['img_backto']            = 'Натраг на';
+$lang['img_title']             = 'Наслов';
+$lang['img_caption']           = 'Назив';
+$lang['img_date']              = 'Датум';
+$lang['img_fname']             = 'Име фајла';
+$lang['img_fsize']             = 'Величина';
+$lang['img_artist']            = 'Фотограф';
+$lang['img_copyr']             = 'Права копирања';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Камера';
+$lang['img_keywords']          = 'Кључне речи';
+$lang['subscribe_success']     = 'Додао сам %s на листу претплатника за %s';
+$lang['subscribe_error']       = 'Дошло је до грешке при додавању %s на листу претплатника за %s';
+$lang['subscribe_noaddress']   = 'Не постоји е-адреса асоцирана са Вашим налогом. Не можете да будете додати на листу претплатника';
+$lang['unsubscribe_success']   = 'Избрисао сам %s са листе претплатника за %s';
+$lang['unsubscribe_error']     = 'Дошло је до грешке приликом брисања %s са листе претплатника за %s';
+$lang['authmodfailed']         = 'Лоше подешена провера корисника. Молим Вас да обавестите администратора викија.';
+$lang['authtempfail']          = 'Провера корисника је тренутно недоступна. Ако се ситуација настави, молимо Вас да обавестите администратора викија.';
+$lang['i_chooselang']          = 'Одаберите језик';
+$lang['i_installer']           = 'Докувики инсталација';
+$lang['i_wikiname']            = 'Назив викија';
+$lang['i_enableacl']           = 'Укључи ';
+$lang['i_superuser']           = 'Суперкорисник';
+$lang['i_problems']            = 'Инсталација је наишла на проблеме који су навадени у тексту испод. Не можете наставити даље док их не исправите.';
+$lang['i_modified']            = 'Из сигурносних разлога ова скрипта ради само са новом Dokuwiki инсталацијом. Требало би или да опет распакујете архиву преузету са сајта или да погледате <a href="http://dokuwiki.org/install">Dokuwiki инструкције за инсталацију</a>';
+$lang['i_funcna']              = 'ПХП функција <code>%s</code> није доступна. Можда је Ваш хостинг провајдер забранио из неког разлога?';
+$lang['i_phpver']              = '<code>%s</code> Верзија Вашег ПХПа је нижа од неопходне <code>%s</code>. Требало би да надоградите ПХП инсталацију.';
+$lang['i_permfail']            = 'DokuWiki нема дозволу писања у <code>%s</code>. Потребно је да поправите дозволе за ову фасциклу!';
+$lang['i_confexists']          = '<code>%s</code> већ постоји';
+$lang['i_writeerr']            = 'Не могу да направим <code>%s</code>. Проверите дозволе а затим ручно направите ову датотеку.';
+$lang['i_badhash']             = 'dokuwiki.php није препознат или је измењен (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - недозвољена или празна вредност';
+$lang['i_success']             = 'Подешавања су завршена. Сада можете обрисати датотеку install.php. Наставите у <a href="doku.php">Ваш нови DokuWiki</a>.';
+$lang['i_failure']             = 'Појавили су се проблеми при писању датотеке са подешавањима. Требало би да их ручно исправите пре него што ћете моћи да користите <a href="doku.php">Ваш нови DokuWiki</a>.';
+$lang['i_policy']              = 'Иницијалне корисничке дозволе';
+$lang['i_pol0']                = 'Отворени вики (читање, писање, слање датотека за све)';
+$lang['i_pol1']                = 'Јавни вики (читање за све, писање и слање датотека само за регистроване кориснике)';
+$lang['i_pol2']                = 'Затворени вики (читање, писање и слање датотека само за регистроване кориснике)';
+$lang['i_retry']               = 'Понови';
+$lang['mu_intro']              = 'Одавде можете послати више датотека одједном. Кликните на дугме Тражи да бисте додали датотеке на листу. Када завршите са одабирањем кликните на Пошаљи.';
+$lang['mu_gridname']           = 'Назив датотеке';
+$lang['mu_gridsize']           = 'Величина';
+$lang['mu_gridstat']           = 'Статус';
+$lang['mu_namespace']          = 'Именски простор';
+$lang['mu_browse']             = 'Тражи';
+$lang['mu_toobig']             = 'превелико';
+$lang['mu_ready']              = 'спремно за слање';
+$lang['mu_done']               = 'завршено';
+$lang['mu_fail']               = 'није успело';
+$lang['mu_authfail']           = 'сесија је истекла';
+$lang['mu_progress']           = '@PCT@% послато';
+$lang['mu_filetypes']          = 'Дозвољени типови датотека';
+$lang['recent_global']         = 'Тренутно пратите промене у именском простору <b>%s</b>. Такође, можете пратити <a href="%s">прмене на целом викију</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/locked.txt
new file mode 100644
index 000000000..4bcc0ac5c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/locked.txt
@@ -0,0 +1,3 @@
+====== Страница је закључана ======
+
+Ову страница је други корисник у овом тренутку закључао за измене. Мораћете да сачекате док он не заврши са изменама или не истекне закључавање.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/login.txt
new file mode 100644
index 000000000..c2f5a6fb6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/login.txt
@@ -0,0 +1,4 @@
+====== Пријављивање ======
+
+Тренутно нисте пријављени! Унесите Ваше информације испод да бисте се пријавили. За то је неопходно да колачићи буду омогућен.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/mailtext.txt
new file mode 100644
index 000000000..2ed99bf34
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/mailtext.txt
@@ -0,0 +1,17 @@
+Страница на Вашем DokuWiki-ју је додата или измењена. Ево детаља
+
+Датум                 : @DATE@
+Веб читач           : @BROWSER@
+ИП адреса          : @IPADDRESS@
+Име домаћина     : @HOSTNAME@
+Стара ревизија    : @OLDPAGE@
+Нова ревизија      : @NEWPAGE@
+Сажетак измена   : @SUMMARY@
+Корисник             : @USER@
+
+@DIFF@
+
+
+-- 
+Ову поруку је генерисао DokuWiki са
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/newpage.txt
new file mode 100644
index 000000000..40a36e6f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/newpage.txt
@@ -0,0 +1,3 @@
+====== Ова тема још увек не постоји ======
+
+Пратили сте везу до теме која још увек не постоји. Можете да је направите користећи дугме ''Направи ову страницу''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/norev.txt
new file mode 100644
index 000000000..73f8d0b48
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/norev.txt
@@ -0,0 +1,4 @@
+====== Не постоји таква ревизија ======
+
+Задата ревизија не постоји. Искористите дугме ''Старе ревизије'' да излистате старе ревизије овог документа.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/preview.txt
new file mode 100644
index 000000000..be928884f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/preview.txt
@@ -0,0 +1,4 @@
+====== Преглед ======
+
+Ово је преглед тога како би Ваш текст изгледао. Не заборавите: он још **није сачуван**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/pwconfirm.txt
new file mode 100644
index 000000000..35e23b75d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/pwconfirm.txt
@@ -0,0 +1,13 @@
+Здраво @FULLNAME@!
+
+Неко је затражио нову лозинку за Ваш налог @TITLE@ на @DOKUWIKIURL@
+
+Ако то нисте Ви, само игноришите ову поруку.
+
+У супротном, да бисте потврдили захтев кликните на следећи линк:
+
+@CONFIRM@
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/read.txt
new file mode 100644
index 000000000..c2d9ffff7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/read.txt
@@ -0,0 +1,2 @@
+Ова страница је само за читање. Можете да погледате изворни код, али не можете да је мењате. Обратите се администратору ако мислите да то није уреду.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/recent.txt
new file mode 100644
index 000000000..54c0c26f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/recent.txt
@@ -0,0 +1,5 @@
+====== Скорије измене ======
+
+Следеће странице су биле измењене у скорије време.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/register.txt
new file mode 100644
index 000000000..a553b7a1f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/register.txt
@@ -0,0 +1,4 @@
+====== Региструјте се као нови корисник ======
+
+Попуните све информације испод како би сте направили нови налог на овом викију. Обавезно упишите **тачну е-адресу** - Ваша нова лозинка ће тамо бити послата. Корисничко име би требало да буде исправно [[doku>pagename|име странице]]
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/registermail.txt
new file mode 100644
index 000000000..efdcbb5c5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/registermail.txt
@@ -0,0 +1,15 @@
+Регистрован је нови корисник. Ово су детаљи:
+
+Корисничко име: @NEWUSER@
+Име и презиме: @NEWNAME@
+Е-адреса: @NEWEMAIL@
+
+Датум: @DATE@
+Веб читач: @BROWSER@
+ИП адреса: @IPADDRESS@
+Домаћин: @HOSTNAME@
+
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/resendpwd.txt
new file mode 100644
index 000000000..7f6623dbd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Пошаљи нову лозинку ======
+
+Молим Вас унесите корисничко име у форму да бисте затражили нову лозинку за Ваш налог на овом викију. Потврдни линк ће бити послат на е-адресу коју сте користили на регистрацији.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/revisions.txt
new file mode 100644
index 000000000..1ca995a11
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/revisions.txt
@@ -0,0 +1,4 @@
+====== Старе ревизије ======
+
+Ово су старије ревизије тренутног документа. Да би сте повратили стару ревизију, изаберите је одоздо, кликните на ''Измени страницу'' и сачувајте је.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/searchpage.txt
new file mode 100644
index 000000000..010966a7c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/searchpage.txt
@@ -0,0 +1,5 @@
+====== Претрага ======
+
+Испод можете да нађете резултате Ваше претраге. Ако нисте нашли то што сте тражили, можете да направите нову страницу названу по Вашем упиту користећи дугме ''Измени ову страницу''.
+
+===== Резултати =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/showrev.txt
new file mode 100644
index 000000000..f2aabb2cb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/showrev.txt
@@ -0,0 +1,2 @@
+**Ово је стара верзија документа!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/stopwords.txt
new file mode 100644
index 000000000..78093e29a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/stopwords.txt
@@ -0,0 +1,12 @@
+# Ово је листа речи које се неће индексирати, по једна реч у реду
+# Када мењате ову датотеку проверите да ли је нови ред записан по UNIX систему
+# Нема потребе уносити речи краће од 3 слова - оне се прескачу иначе
+ваш
+они
+њихов
+како
+ово
+шта
+кад
+где
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/subscribermail.txt
new file mode 100644
index 000000000..fd3de7d38
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/subscribermail.txt
@@ -0,0 +1,17 @@
+Здраво!
+
+Измењена је страница @PAGE@ на @TITLE@ викију.
+Ево измена:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Да се одјавите са ове странице, пријавите се на вики на
+@DOKUWIKIURL@ и онда посетите
+@NEWPAGE@
+и изаберите 'Одјави се са измена'.
+
+-- 
+Ову поруку је генерисао DokuWiki на
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/updateprofile.txt
new file mode 100644
index 000000000..15b9955e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ажурирање Вашег профила ======
+
+Потребно је попунити само она поља која желите да промените. Поље Корисничко име не можете да променити.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/uploadmail.txt
new file mode 100644
index 000000000..36b3bb31d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/uploadmail.txt
@@ -0,0 +1,14 @@
+Нова датотека је послата на Ваш DokuWiki. Ово су њени детањи:
+
+Датотека: @MEDIA@
+Датум: @DATE@
+Веб читач: @BROWSER@
+ИП адреса: @IPADDRESS@
+Домаћин: @HOSTNAME@
+Величина: @SIZE@
+MIME тип: @MIME@
+Корисник: @USER@
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/wordblock.txt
new file mode 100644
index 000000000..56ecde3fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sr/wordblock.txt
@@ -0,0 +1,4 @@
+====== СПАМ је блокиран ======
+
+Ваше измене **нису** сачуване јер садрже једну или више блокираних речи. Ако сте покушали да спамујете вики -- надрљаћете! Ако мислите да је ово грешка, контактирајте администратора овог викија.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/admin.txt
new file mode 100644
index 000000000..10887da7d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Nedan hittar du en lista över de tillgängliga administrativa uppgifterna i DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/adminplugins.txt
new file mode 100644
index 000000000..0af37c769
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/adminplugins.txt
@@ -0,0 +1,2 @@
+	
+===== Ytterligare Tillägg =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/backlinks.txt
new file mode 100644
index 000000000..c907c8ecf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/backlinks.txt
@@ -0,0 +1,3 @@
+====== Tillbakalänkar ======
+
+Detta är en lista över sidor som verkar länka tillbaka till den aktuella sidan.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/conflict.txt
new file mode 100644
index 000000000..42168d1b4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/conflict.txt
@@ -0,0 +1,6 @@
+====== Det finns en senare version ======
+
+Det finns en senare version av dokumentet du har redigerat. Detta kan hända när en annan användare redigerar dokumentet samtidigt som du.
+
+Granska skillnaderna som visas nedan noga, och välj sedan vilken version du vill behålla. Om du väljer ''spara'', så kommer din version att sparas. Välj ''avbryt'' för att behålla den nuvarande versionen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/denied.txt
new file mode 100644
index 000000000..64d129227
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/denied.txt
@@ -0,0 +1,4 @@
+====== Åtkomst nekad ======
+
+Tyvärr, du har inte behörighet att fortsätta. Kanske har du glömt att logga in?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/diff.txt
new file mode 100644
index 000000000..9fb8c20f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/diff.txt
@@ -0,0 +1,4 @@
+====== Skillnader ======
+
+Här visas skillnader mellan den valda versionen och den nuvarande versionen av sidan.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/draft.txt
new file mode 100644
index 000000000..3749ad035
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/draft.txt
@@ -0,0 +1,6 @@
+====== Utkast hittat ======
+
+Din senaste redigering av sidan avslutades inte på ett korrekt sätt. DokuWiki sparade automatiskt ett utkast under tiden du arbetade, och nu kan du använda det för att fortsätta redigeringen. Nedan kan du se det innehåll som sparats från din förra session.
+
+Bestäm om du vill //återskapa// din förlorade redigeringssession, //radera// det automatiskt sparade utkastet eller //avbryta// redigeringen.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/edit.txt
new file mode 100644
index 000000000..187b11fca
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/edit.txt
@@ -0,0 +1,2 @@
+Redigera sidan och klicka ''Spara''. Se [[wiki:syntax]] för Wikisyntax. Redigera bara sidan om du kan **förbättra** den. Om du vill testa hur saker och ting fungerar, gör det på [[playground:playground|lekplatsen]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/editrev.txt
new file mode 100644
index 000000000..8bd1adb0a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hämtat en tidigare version av dokumentet!** Om du sparar den så kommer du att skapa en ny version med detta innehåll.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/index.txt
new file mode 100644
index 000000000..24d715b74
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/index.txt
@@ -0,0 +1,4 @@
+====== Innehållsförteckning ======
+
+Detta är en innehållsförteckning över alla tillgängliga sidor, sorterad efter [[doku>namespaces|namnrymder]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/install.html
new file mode 100644
index 000000000..11e2eea49
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/install.html
@@ -0,0 +1,25 @@
+<p>Denna sida hjälper dig med nyinstallation och inställningar för
+<a href="http://dokuwiki.org">Dokuwiki</a>. Mer information om 
+installationsprogrammet finns på dess egen 
+<a href="http://dokuwiki.org/installer">dokumentationssida</a>.</p>
+
+<p>DokuWiki använder vanliga filer för att lagra wikisidor och annan
+information som här till sidorna (till exempel bilder, sökindex, gamla
+versioner, etc).  För att kunna fungera 
+<strong>måste</strong> DokuWiki ha skrivrättigheter i de kataloger där
+filerna ligger. Detta installationsprogram kan inte ändra rättigheter
+på kataloger. Det måste normalt göras direkt på en kommandorad, eller
+om du använder ett webbhotell, via FTP eller din leverantörs kontrollpanel
+(till exempel cPanel).</p>
+
+<p>Detta installationsprogram anpassar inställningarna i din DokuWiki för
+<acronym title="access control list">ACL</acronym> (behörighetslista), vilket i sin tur gör att
+administratören kan logga in och komma åt DokuWikis administrationsmenu för
+att installera insticksmoduler, hantera användare, hantera behörighet till
+wikisidor och ändra inställningar. ACL är inget krav för att DokuWiki ska
+fungera, men det förenklar administrationen.</p>
+
+<p>Erfarna användare, eller användare med särskilda behov, kan använda dessa
+länkar för att hitta mer detaljer om
+<a href="http://dokuwiki.org/install">installation</a>
+och <a href="http://dokuwiki.org/config">inställningar</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/lang.php
new file mode 100644
index 000000000..062e83a31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/lang.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Swedish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Joaquim Homrighausen <joho@webbplatsen.se>
+ * @author Per Foreby <per@foreby.se>
+ * @author Nicklas Henriksson <nicklas[at]nihe.se>
+ * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Dennis Karlsson
+ * @author Tormod Otter Johansson <tormod@latast.se>
+ * @author emil@sys.nu
+ * @author Pontus Bergendahl <pontus.bergendahl@gmail.com>
+ * @author Tormod Johansson tormod.otter.johansson@gmail.com
+ * @author Emil Lind <emil@sys.nu>
+ * @author Bogge Bogge <bogge@bogge.com>
+ * @author Peter Åström <eaustreum@gmail.com>
+ * @author Håkan Sandell <hakan.sandell@home.se>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '”';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '’';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Redigera sidan';
+$lang['btn_source']            = 'Visa källkod';
+$lang['btn_show']              = 'Visa sidan';
+$lang['btn_create']            = 'Skapa sidan';
+$lang['btn_search']            = 'Sök';
+$lang['btn_save']              = 'Spara';
+$lang['btn_preview']           = 'Granska';
+$lang['btn_top']               = 'Till början av sidan';
+$lang['btn_newer']             = '<< nyare';
+$lang['btn_older']             = 'äldre >>';
+$lang['btn_revs']              = 'Historik';
+$lang['btn_recent']            = 'Nyligen ändrat';
+$lang['btn_upload']            = 'Ladda upp';
+$lang['btn_cancel']            = 'Avbryt';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Redigera';
+$lang['btn_login']             = 'Logga in';
+$lang['btn_logout']            = 'Logga ut';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Uppdatera';
+$lang['btn_delete']            = 'Radera';
+$lang['btn_back']              = 'Tillbaka';
+$lang['btn_backlink']          = 'Tillbakalänkar';
+$lang['btn_backtomedia']       = 'Tillbaka till val av Mediafil';
+$lang['btn_subscribe']         = 'Prenumerera på ändringar';
+$lang['btn_unsubscribe']       = 'Säg upp prenumeration på ändringar';
+$lang['btn_subscribens']       = 'Prenumerera på namnrymdsändringar';
+$lang['btn_unsubscribens']     = 'Sluta prenumerera på namnrymdsändringar
+';
+$lang['btn_profile']           = 'Uppdatera profil';
+$lang['btn_reset']             = 'Återställ';
+$lang['btn_resendpwd']         = 'Skicka nytt lösenord';
+$lang['btn_draft']             = 'Redigera utkast';
+$lang['btn_recover']           = 'Återskapa utkast';
+$lang['btn_draftdel']          = 'Radera utkast';
+$lang['btn_revert']            = 'Återställ';
+$lang['loggedinas']            = 'Inloggad som';
+$lang['user']                  = 'Användarnamn';
+$lang['pass']                  = 'Lösenord';
+$lang['newpass']               = 'Nytt lösenord';
+$lang['oldpass']               = 'Bekräfta nuvarande lösenord';
+$lang['passchk']               = 'en gång till';
+$lang['remember']              = 'Kom ihåg mig';
+$lang['fullname']              = 'Namn';
+$lang['email']                 = 'E-post';
+$lang['register']              = 'Registrera';
+$lang['profile']               = 'Användarprofil';
+$lang['badlogin']              = 'Felaktigt användarnamn eller lösenord.';
+$lang['minoredit']             = 'Små ändringar';
+$lang['draftdate']             = 'Utkast automatiskt sparat';
+$lang['nosecedit']             = 'Sidan ändrades medan du skrev, sektionsinformationen var inte uppdaterad. Laddar hela sidan istället.';
+$lang['regmissing']            = 'Du måste fylla i alla fälten.';
+$lang['reguexists']            = 'Det finns redan en användare med det användarnamnet.';
+$lang['regsuccess']            = 'Användarkontot skapat, lösenordet har skickats via e-post.';
+$lang['regsuccess2']           = 'Användarkontot skapat.';
+$lang['regmailfail']           = 'Ett fel uppstod när ditt lösenord skulle skickas via e-post. Var god kontakta administratören!';
+$lang['regbadmail']            = 'Den angivna e-postadressen verkar vara ogiltig - om du anser detta felaktigt, var god kontakta administratören';
+$lang['regbadpass']            = 'De två angivna lösenorden är inte identiska. Försök igen.';
+$lang['regpwmail']             = 'Ditt DokuWikilösenord';
+$lang['reghere']               = 'Har du inte ett konto än? Skaffa ett';
+$lang['profna']                = 'Denna wiki stödjer inte ändringar av profiler';
+$lang['profnochange']          = 'Ingenting ändrades, inget att göra.';
+$lang['profnoempty']           = 'Namn och e-postadress måste fyllas i.';
+$lang['profchanged']           = 'Användarprofilen uppdaterad.';
+$lang['pwdforget']             = 'Glömt ditt lösenord? Ordna ett nytt';
+$lang['resendna']              = 'Den här wikin stödjer inte utskick av lösenord.';
+$lang['resendpwd']             = 'Skicka nytt lösenord för';
+$lang['resendpwdmissing']      = 'Du måste fylla i alla fält.';
+$lang['resendpwdnouser']       = 'Den här användaren hittas inte i databasen.';
+$lang['resendpwdbadauth']      = 'Den här verifieringskoden är inte giltig. Kontrollera att du använde hela verifieringslänken.';
+$lang['resendpwdconfirm']      = 'En verifieringslänk har skickats med e-post.';
+$lang['resendpwdsuccess']      = 'Ditt nya lösenord har skickats med e-post.';
+$lang['license']               = 'Om inte annat angivet, innehållet i denna wiki är licensierat under följande licenser:';
+$lang['licenseok']             = 'Notera: Genom att ändra i denna sidan så accepterar du att licensiera ditt bidrag under följande licenser:';
+$lang['searchmedia']           = 'Sök efter filnamn:';
+$lang['searchmedia_in']        = 'Sök i %s';
+$lang['txt_upload']            = 'Välj fil att ladda upp';
+$lang['txt_filename']          = 'Ladda upp som (ej obligatoriskt)';
+$lang['txt_overwrt']           = 'Skriv över befintlig fil';
+$lang['lockedby']              = 'Låst av';
+$lang['lockexpire']            = 'Lås upphör att gälla';
+$lang['willexpire']            = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
+$lang['notsavedyet']           = 'Det finns ändringar som inte är sparade.\nÄr du säker på att du vill fortsätta?';
+$lang['rssfailed']             = 'Ett fel uppstod när detta RSS-flöde skulle hämtas: ';
+$lang['nothingfound']          = 'Inga filer hittades.';
+$lang['mediaselect']           = 'Mediafiler';
+$lang['fileupload']            = 'Ladda upp mediafiler';
+$lang['uploadsucc']            = 'Uppladdningen lyckades';
+$lang['uploadfail']            = 'Uppladdningen misslyckades, fel filskydd?';
+$lang['uploadwrong']           = 'Uppladdning nekad. Filändelsen är inte tillåten!';
+$lang['uploadexist']           = 'Filen finns redan. Ingenting gjordes.';
+$lang['uploadbadcontent']      = 'Det uppladdade innehållet stämde inte överens med filändelsen %s.';
+$lang['uploadspam']            = 'Uppladdningen stoppades av spärrlistan för spam.';
+$lang['uploadxss']             = 'Uppladdningen stoppades på grund av eventuellt skadligt innehåll.';
+$lang['uploadsize']            = 'Den uppladdade filen är för stor. (max. %s)';
+$lang['deletesucc']            = 'Filen "%s" har raderats.';
+$lang['deletefail']            = 'Kunde inte radera "%s" - kontrollera filskydd.';
+$lang['mediainuse']            = 'Filen "%s" har inte raderats - den används fortfarande.';
+$lang['namespaces']            = 'Namnrymder';
+$lang['mediafiles']            = 'Tillgängliga filer i';
+$lang['js']['searchmedia']     = 'Sök efter filer';
+$lang['js']['keepopen']        = 'Lämna fönstret öppet efter val av fil';
+$lang['js']['hidedetails']     = 'Dölj detaljer';
+$lang['js']['nosmblinks']      = 'Länkning till Windowsresurser fungerar bara med Microsofts Internet Explorer.
+Du kan fortfarande klippa och klistra in länken om du använder en annan webbläsare än MSIE.';
+$lang['js']['linkwiz']         = 'Snabbguide Länkar';
+$lang['js']['linkto']          = 'Länk till:';
+$lang['js']['del_confirm']     = 'Vill du verkligen radera?';
+$lang['js']['mu_btn']          = 'Ladda upp flera filer samtidigt';
+$lang['mediausage']            = 'Använd följande syntax för att referera till denna fil:';
+$lang['mediaview']             = 'Visa originalfilen';
+$lang['mediaroot']             = 'rot';
+$lang['mediaupload']           = 'Här kan du ladda upp en fil till den nuvarande namnrymden. För att skapa undernamnrymder, skriv dem före filnamnet under "Ladda upp som". Separera namnrymd och filnamn med kolon.';
+$lang['mediaextchange']        = 'Filändelsen ändrad från .%s till .%s!';
+$lang['reference']             = 'Referenser till';
+$lang['ref_inuse']             = 'Filen kan inte raderas eftersom den fortfarande används av följande sidor:';
+$lang['ref_hidden']            = 'Vissa referenser är på sidor som du inte har rätt att läsa';
+$lang['hits']                  = 'Träffar';
+$lang['quickhits']             = 'Matchande sidnamn';
+$lang['toc']                   = 'Innehållsförteckning';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Din version';
+$lang['diff']                  = 'visa skillnader mot aktuell version';
+$lang['diff2']                 = 'Visa skillnader mellan valda versioner';
+$lang['line']                  = 'Rad';
+$lang['breadcrumb']            = 'Spår';
+$lang['youarehere']            = 'Här är du';
+$lang['lastmod']               = 'Senast uppdaterad';
+$lang['by']                    = 'av';
+$lang['deleted']               = 'raderad';
+$lang['created']               = 'skapad';
+$lang['restored']              = 'tidigare version återställd';
+$lang['external_edit']         = 'extern redigering';
+$lang['summary']               = 'Redigeringskommentar';
+$lang['noflash']               = '<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> behövs för att visa detta innehåll.';
+$lang['download']              = 'Ladda ner kodfragmentet';
+$lang['mail_newpage']          = 'sida tillagd:';
+$lang['mail_changed']          = 'sida ändrad:';
+$lang['mail_new_user']         = 'Ny användare:';
+$lang['mail_upload']           = 'fil uppladdad:';
+$lang['qb_bold']               = 'Fet text';
+$lang['qb_italic']             = 'Kursiv text';
+$lang['qb_underl']             = 'Understruken text';
+$lang['qb_code']               = 'Kodtext';
+$lang['qb_strike']             = 'Överstruken text';
+$lang['qb_h1']                 = 'Rubrik nivå 1';
+$lang['qb_h2']                 = 'Rubrik nivå 2';
+$lang['qb_h3']                 = 'Rubrik nivå 3';
+$lang['qb_h4']                 = 'Rubrik nivå 4';
+$lang['qb_h5']                 = 'Rubrik nivå 5';
+$lang['qb_h']                  = 'Rubrik';
+$lang['qb_hs']                 = 'Välj Rubrik';
+$lang['qb_hplus']              = 'Större Rubrik';
+$lang['qb_hminus']             = 'Mindre Rubrik';
+$lang['qb_hequal']             = 'Rubrik samma nivå.';
+$lang['qb_link']               = 'Intern Länk';
+$lang['qb_extlink']            = 'Extern Länk';
+$lang['qb_hr']                 = 'Horisontell linje';
+$lang['qb_ol']                 = 'Punkt i sorterad lista';
+$lang['qb_ul']                 = 'Punkt i osorterad lista';
+$lang['qb_media']              = 'Lägg till bilder och andra filer';
+$lang['qb_sig']                = 'Infoga signatur';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Specialtecken';
+$lang['upperns']               = 'hoppa till föräldernamnrymd';
+$lang['admin_register']        = 'Lägg till ny användare';
+$lang['metaedit']              = 'Redigera metadata';
+$lang['metasaveerr']           = 'Skrivning av metadata misslyckades';
+$lang['metasaveok']            = 'Metadata sparad';
+$lang['img_backto']            = 'Tillbaka till';
+$lang['img_title']             = 'Rubrik';
+$lang['img_caption']           = 'Bildtext';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Filnamn';
+$lang['img_fsize']             = 'Storlek';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Nyckelord';
+$lang['subscribe_success']     = 'Lade till %s i prenumerationslistan för %s';
+$lang['subscribe_error']       = 'Fel vid tillägg av %s i prenumerationslistan för %s';
+$lang['subscribe_noaddress']   = 'Det finns ingen adress knuten till ditt konto, det går inte att lägga till dig i prenumerationslistan';
+$lang['unsubscribe_success']   = 'Tog bort %s från prenumerationslistan för %s';
+$lang['unsubscribe_error']     = 'Fel vid borttagning %s från prenumerationslistan list för %s';
+$lang['authmodfailed']         = 'Felaktiga inställningar för användarautentisering. Var vänlig meddela wikiadministratören.';
+$lang['authtempfail']          = 'Tillfälligt fel på användarautentisering. Om felet kvarstår, var vänlig meddela wikiadministratören.';
+$lang['i_chooselang']          = 'Välj språk';
+$lang['i_installer']           = 'Installation av DokuWiki';
+$lang['i_wikiname']            = 'Wikins namn';
+$lang['i_enableacl']           = 'Aktivera behörighetslistan (ACL) (rekommenderas)';
+$lang['i_superuser']           = 'Användarnamn för administratören';
+$lang['i_problems']            = 'Installationsprogrammet hittade några problem som visas nedan. Du kan inte fortsätta innan du har fixat dem.';
+$lang['i_modified']            = 'Av säkerhetsskäl fungerar det här skriptet bara med en ny och omodifierad installation av Dokuwiki.
+                         Du får antingen packa upp det nedladdade paketet på nytt, eller konsultera de kompletta
+                         <a href="http://dokuwiki.org/install">instruktionerna för installation av Dokuwiki</a>';
+$lang['i_funcna']              = 'PHP-funktionen <code>%s</code> är inte tillgänglig. Kanske ditt webbhotell har avaktiverat den av någon anledning?';
+$lang['i_phpver']              = 'Din PHP-version <code>%s</code> är lägre än vad som krävs <code>%s</code>. Du behöver uppgradera din PHP-installation.';
+$lang['i_permfail']            = '<code>%s</code> är inte skrivbar av DokuWiki. Du behöver ändra filskyddet på den här katalogen!';
+$lang['i_confexists']          = '<code>%s</code> finns redan';
+$lang['i_writeerr']            = 'Kan inte skapa <code>%s</code>. Kontrollera filskyddet på kataloger/filer och skapa filen manuellt.';
+$lang['i_badhash']             = 'okänd eller ändrad dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - felaktig eller blank';
+$lang['i_success']             = 'Konfigurationen avslutades utan fel. Du kan radera filen install.php nu. Fortsätt till
+                        <a href="doku.php">din nya DokuWiki</a>.';
+$lang['i_failure']             = 'Fel uppstod vid skrivning av konfigurationsfilerna. Du kan behöva ordna till dem manuellt innan
+                         du kan använda <a href="doku.php">din nya DokuWiki</a>.';
+$lang['i_policy']              = 'Initial ACL-policy';
+$lang['i_pol0']                = 'Öppen wiki (alla får läsa, skriva och ladda upp filer)';
+$lang['i_pol1']                = 'Publik wiki (alla får läsa, registrerade användare för skriva och ladda upp filer)';
+$lang['i_pol2']                = 'Sluten wiki (endast registrerade användare får läsa, skriva och ladda upp filer)';
+$lang['i_retry']               = 'Försök igen';
+$lang['mu_intro']              = 'Här kan du ladda upp flera filer på en gång. Klicka på bläddra-knappen för att lägga till dem i kön. Tryck på ladda upp när du är klar.';
+$lang['mu_gridname']           = 'Filnamn';
+$lang['mu_gridsize']           = 'Storlek';
+$lang['mu_gridstat']           = 'Status';
+$lang['mu_namespace']          = 'Namnrymd';
+$lang['mu_browse']             = 'Bläddra';
+$lang['mu_toobig']             = 'för stor';
+$lang['mu_ready']              = 'redo att ladda upp';
+$lang['mu_done']               = 'komplett';
+$lang['mu_fail']               = 'misslyckades';
+$lang['mu_authfail']           = 'sessionen över tid';
+$lang['mu_progress']           = '@PCT@% uppladdade';
+$lang['mu_filetypes']          = 'Tillåtna filtyper';
+$lang['mu_info']               = 'filerna uppladdade.';
+$lang['mu_lasterr']            = 'Senaste fel:';
+$lang['recent_global']         = 'Du bevakar ändringar i namnrymden <b>%s</b>. Du kan också titta på <a href="%s">senaste ändringar för hela wikin</a>.';
+$lang['years']                 = '%d år sedan';
+$lang['months']                = '%d månader sedan';
+$lang['weeks']                 = '%d veckor sedan';
+$lang['days']                  = '%d dagar sedan';
+$lang['hours']                 = '%d timmar sedan';
+$lang['minutes']               = '%d minuter sedan';
+$lang['seconds']               = '%d sekunder sedan';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/locked.txt
new file mode 100644
index 000000000..cb64eaf02
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/locked.txt
@@ -0,0 +1,3 @@
+====== Sidan låst ======
+
+Den här sidan är för närvarande låst för redigering av en annan användare. Du måste vänta tills den användaren är klar med sin redigering, eller tills dess att dokumentlåset upphör att gälla.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/login.txt
new file mode 100644
index 000000000..5f0e3b262
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/login.txt
@@ -0,0 +1,4 @@
+====== Logga in ======
+
+Du är inte inloggad! Ange ditt användarnamn och lösenord i formuläret nedan för att logga in. Stöd för cookies måste vara aktiverat i din webbläsare för att du skall kunna logga in.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/mailtext.txt
new file mode 100644
index 000000000..616bb4eee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/mailtext.txt
@@ -0,0 +1,17 @@
+En sida i din DokuWiki har lagts till eller ändrats. Här är detaljerna:
+
+Datum                : @DATE@
+Webbläsare           : @BROWSER@
+IP-adress            : @IPADDRESS@
+Datornamn            : @HOSTNAME@
+Tidigare version     : @OLDPAGE@
+Aktuell version      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Användare            : @USER@
+
+@DIFF@
+
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/newpage.txt
new file mode 100644
index 000000000..3e0951056
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/newpage.txt
@@ -0,0 +1,3 @@
+====== Det här ämnet finns inte ännu ======
+
+Du har följt en länk till ett ämne som inte finns ännu. Du kan skapa det genom att klicka på ''Skapa den här sidan''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/norev.txt
new file mode 100644
index 000000000..46df86235
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/norev.txt
@@ -0,0 +1,4 @@
+====== Det finns ingen sådan version ======
+
+Den angivna versionen finns inte. Använd ''Historik'' för en förteckning över de versioner som finns av detta dokument.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/preview.txt
new file mode 100644
index 000000000..5c3a65341
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/preview.txt
@@ -0,0 +1,4 @@
+====== Förhandsgranskning ======
+
+Detta är en förhandstitt på hur din text kommer att se ut när den visas. Kom ihåg: Den är **inte sparad** ännu!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/pwconfirm.txt
new file mode 100644
index 000000000..541437716
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hej @FULLNAME@!
+
+Någon har bett om ett nytt lösenord för ditt konto på @TITLE@
+(@DOKUWIKIURL@)
+
+Om det inte var du som bad om ett nytt lösenord kan du helt
+enkelt ignorera det här brevet.
+
+För att bekräfta att förfrågan verkligen kom från dig, var vänlig
+och använd följande länk.
+
+@CONFIRM@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/read.txt
new file mode 100644
index 000000000..5391b3ddf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/read.txt
@@ -0,0 +1,2 @@
+Denna sida är skrivskyddad. Du kan titta på källkoden, men inte ändra den. Kontakta administratören om du anser att du bör kunna ändra sidan.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/recent.txt
new file mode 100644
index 000000000..d8c39dfa5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/recent.txt
@@ -0,0 +1,5 @@
+====== Senaste ändringarna ======
+
+Följande sidor/dokument har nyligen uppdaterats.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/register.txt
new file mode 100644
index 000000000..e75d2a672
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/register.txt
@@ -0,0 +1,4 @@
+====== Registrera dig som användare ======
+
+Fyll i all information som efterfrågas i formuläret nedan för att skapa ett nytt konto i denna wiki. Var särskilt noga med att ange en **giltig e-postadress** - om du inte blir ombedd att ange ett lösenord här kommer ett nytt lösenord att skickas till den adressen.  Användarnamnet skall vara ett giltigt [[doku>pagename|sidnamn]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/registermail.txt
new file mode 100644
index 000000000..c0edc3728
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/registermail.txt
@@ -0,0 +1,14 @@
+En ny användare har registrerat sig. Här är detaljerna:
+
+Användarnamn : @NEWUSER@
+Namn         : @NEWNAME@
+E-post       : @NEWEMAIL@
+
+Datum        : @DATE@
+Webbläsare   : @BROWSER@
+IP-adress    : @IPADDRESS@
+Datornamn    : @HOSTNAME@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/resendpwd.txt
new file mode 100644
index 000000000..0757ee9dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Skicka nytt lösenord ======
+
+Fyll i ditt användarnamn i formuläret nedan för att få ett nytt lösenord till ditt konto i denna wiki. En länk för verifiering kommer att skickas till din registrerade e-postadress.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/revisions.txt
new file mode 100644
index 000000000..b9dfc5600
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/revisions.txt
@@ -0,0 +1,4 @@
+====== Historik ======
+
+Här visas tidigare versioner av detta dokument. För att återställa dokumentet till en tidigare version, välj den önskade versionen nedan, klicka på ''Redigera sida'' och spara sedan dokumentet.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/searchpage.txt
new file mode 100644
index 000000000..bcc88cd95
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/searchpage.txt
@@ -0,0 +1,5 @@
+====== Sök ======
+
+Nedan ser du resultatet av sökningen. Om du inte hittar det du letar efter, så kan du skapa eller redigera sidan med någon av knapparna.
+
+===== Resultat =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/showrev.txt
new file mode 100644
index 000000000..a79b30b11
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/showrev.txt
@@ -0,0 +1,2 @@
+**Detta är en gammal version av dokumentet!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/stopwords.txt
new file mode 100644
index 000000000..357659673
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/stopwords.txt
@@ -0,0 +1,129 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+
+# Följande svenska stoppord kommer från
+# http://snowball.tartarus.org/algorithms/swedish/stop.txt. Ord kortare än tre
+# bokstäver har tagits bort (se kommentaren ovan) Se även
+# http://www.cling.gu.se/theses/2004/cl0sknub_cl0tsven.pdf. Vi behåller de
+# engelska orden eftersom det är rätt vanligt med engelska texter.
+och
+det
+att
+jag
+hon
+som
+han
+den
+med
+var
+sig
+för
+till
+men
+ett
+hade
+icke
+mig
+henne
+sin
+har
+inte
+hans
+honom
+skulle
+hennes
+där
+min
+man
+vid
+kunde
+något
+från
+när
+efter
+upp
+dem
+vara
+vad
+över
+dig
+kan
+sina
+här
+mot
+alla
+under
+någon
+eller
+allt
+mycket
+sedan
+denna
+själv
+detta
+utan
+varit
+hur
+ingen
+mitt
+bli
+blev
+oss
+din
+dessa
+några
+deras
+blir
+mina
+samma
+vilken
+sådan
+vår
+blivit
+dess
+inom
+mellan
+sådant
+varför
+varje
+vilka
+ditt
+vem
+vilket
+sitta
+sådana
+vart
+dina
+vars
+vårt
+våra
+ert
+era
+vilkas
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/subscribermail.txt
new file mode 100644
index 000000000..147585caf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/subscribermail.txt
@@ -0,0 +1,24 @@
+Hej!
+
+Sidan @PAGE@ i wikin @TITLE@ har ändrats.
+Här är ändringarna:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum        : @DATE@
+Användare    : @USER@
+Kommentar    : @SUMMARY@
+Gammal sida  : @OLDPAGE@
+Ny sida      : @NEWPAGE@
+
+För att säga upp prenumerationen på den här sidan,
+logga in i wikin på
+@DOKUWIKIURL@ och gå till
+@NEWPAGE@
+där du väljer 'Säg upp prenumeration på ändringar'.
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/updateprofile.txt
new file mode 100644
index 000000000..98ed6e33f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Uppdatera din användarprofil ======
+
+Du behöver bara fylla i de fält som du vill ändra. Du kan inte ändra ditt användarnamn.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/uploadmail.txt
new file mode 100644
index 000000000..5963adcbd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/uploadmail.txt
@@ -0,0 +1,14 @@
+En fil har laddats upp till din DokuWiki. Här är detaljerna:
+
+Fil         : @MEDIA@
+Datum       : @DATE@
+Webbläsare  : @BROWSER@
+IP-adress   : @IPADDRESS@
+Datornamn   : @HOSTNAME@
+Storlek     : @SIZE@
+MIME-typ    : @MIME@
+Användare   : @USER@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/wordblock.txt
new file mode 100644
index 000000000..e1b632ce4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/sv/wordblock.txt
@@ -0,0 +1,4 @@
+====== Stoppade SPAM ======
+
+Dina ändringar har **inte** sparats på grund av att de innehåller ett eller flera ord som spärrats. Om du har försökt att spara skräp, s k ''spam'' -- Fyyy på dig! Om du anser att det här beror på ett fel, kontakta wikins administratör.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/admin.txt
new file mode 100644
index 000000000..677e779b6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/admin.txt
@@ -0,0 +1,3 @@
+====== งานธุรการควบคุมระบบ ======
+
+ด้านล่างนี้คุณสามารถพบรายการงานควบคุมระบบทั้งหมดในโดกุวิกิ
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/adminplugins.txt
new file mode 100644
index 000000000..85a6b17bd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/adminplugins.txt
@@ -0,0 +1 @@
+====== ปลั๊กอินเสริม ======
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/backlinks.txt
new file mode 100644
index 000000000..fff6898d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/backlinks.txt
@@ -0,0 +1,3 @@
+====== ลิงค์กลับ(Backlinks) ======
+
+นี่คือรายชื่อเพจที่ชี้ลิงค์กลับมายังเพจปัจจุบัน
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/conflict.txt
new file mode 100644
index 000000000..5e786a6b3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/conflict.txt
@@ -0,0 +1,5 @@
+====== มีเนื้อหารุ่นใหม่กว่าเกิดขึ้น ======
+
+มีเอกสารรุ่นใหม่กว่าที่คุณได้แก้ไขไว้ มันเกิดขึ้นเมื่อผู้ใช้รายอื่นได้ทำการแก้ไขเอกสารในขณะที่ขณะเดียวกันกับที่คุณกำลังแก้ไขมัน
+
+ให้ตรวจสอบความแตกต่างที่แสดงไว้ด้านล่างนี้ให้ทั่วถึง, แล้วตัดสินใจว่าจะเก็บฉบับไหนไว้ ถ้าคุณเลือก "บันทึก", ฉบับของคุณจะถูกบันทึกไว้ หรือกด "ยกเลิก" เพื่อเก็บฉบับปัจจุบัน
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/denied.txt
new file mode 100644
index 000000000..88b012a67
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/denied.txt
@@ -0,0 +1,3 @@
+====== ปฏิเสธสิทธิ์ ======
+
+ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ บางทีคุณอาจจะลืมล็อกอิน?
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/diff.txt
new file mode 100644
index 000000000..e21759e03
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/diff.txt
@@ -0,0 +1,3 @@
+====== ความแตกต่าง ======
+
+นี่เป็นการแสดงความแตกต่างระหว่างเพจสองรุ่น
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/draft.txt
new file mode 100644
index 000000000..37b1841a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/draft.txt
@@ -0,0 +1,5 @@
+====== พบไฟล์ฉบับร่าง ======
+
+เซสชั่นที่คุณแก้ไขฉบับล่าสุดในเพจนี้ไม่ถูกจัดเก็บให้สมบูรณ์ โดกุวิกิได้ทำการบันทึกฉบับร่างให้โดยอัตโนมัติในระหว่างที่คุณกำลังทำงาน อันซึ่งขณะนี้คุณอาจต้องการใช้มันเพื่อแก้ไขต่อ ด้านล่างนี้คุณจะเห็นข้อมูลที่ถูกบันทึกไว้จากการทำงานครั้งล่าสุด
+
+กรุณาตัดสินใจว่าคุณต้องการที่จะ //กู้คืน//งานฉบับที่แก้ไขล่าสุด, //ลบทิ้ง/// ตัวฉบับร่างที่ได้บันทึกอัตโนมัติไว้, //ยกเลิก// กระบวนการแก้ไขนี้
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/edit.txt
new file mode 100644
index 000000000..81dc0000b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/edit.txt
@@ -0,0 +1 @@
+แก้ไขหน้านี้แล้วกด "บันทึก" ให้อ่าน[[wiki:syntax|ไวยกรณ์วิกิ]] สำหรับค้นหาไวยกรณ์ที่ใช้ในวิกิ และกรุณาแก้ไขเฉพาะเพจที่คุณสามารถ**ปรับปรุง**ให้มันดีขึ้นได้, ถ้าหากคุณต้องการที่จะทดสอบอะไรบางอย่าง ให้ไปลองเล่นครั้งแรกได้ใน[[playground:playground|สนามเด็กเล่น]]
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/editrev.txt
new file mode 100644
index 000000000..28e6760d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/editrev.txt
@@ -0,0 +1,2 @@
+**คุณได้โหลดเอาเอกสารฉบับเก่าขึ้นมา!** ถ้าคุณบันทึกมัน คุณจะสร้างเอกสารรุ่นใหม่ด้วยข้อมูลเหล่านี้
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/index.txt
new file mode 100644
index 000000000..eb32a64c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/index.txt
@@ -0,0 +1,2 @@
+====== ดัชนี ======
+นี่คือดัชนีรวมทุกเพจ เรียงตาม[[doku>namespaces|เนมสเปซ]]
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/lang.php
new file mode 100644
index 000000000..e7937ecbc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/lang.php
@@ -0,0 +1,249 @@
+<?php
+/**
+ * th language file
+ *
+ * This file was initially built by fetching translations from other
+ * Wiki projects. See the @url lines below. Additional translations
+ * and fixes where done for DokuWiki by the people mentioned in the
+ * lines starting with @author
+ *
+ * @url http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/languages/messages/MessagesTh.php?view=co
+ * @author Komgrit Niyomrath <n.komgrit@gmail.com>
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Arthit Suriyawongkul <arthit@gmail.com>
+ * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
+ * @author Thanasak Sompaisansin <jombthep@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“	';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'แก้ไขหน้านี้';
+$lang['btn_source']            = 'ดูโค้ด';
+$lang['btn_show']              = 'แสดงเพจ';
+$lang['btn_create']            = 'สร้างเพจนี้';
+$lang['btn_search']            = 'ค้นหา';
+$lang['btn_save']              = 'บันทึก';
+$lang['btn_preview']           = 'แสดงตัวอย่าง';
+$lang['btn_top']               = 'กลับสู่ด้านบน';
+$lang['btn_newer']             = '<< ใหม่กว่า';
+$lang['btn_older']             = 'เก่ากว่า >>';
+$lang['btn_revs']              = 'ฉบับเก่าๆ';
+$lang['btn_recent']            = 'ปรับปรุงล่าสุด';
+$lang['btn_upload']            = 'ส่งข้อมูลเข้าสู่ระบบ';
+$lang['btn_cancel']            = 'ยกเลิก';
+$lang['btn_index']             = 'ดัชนี';
+$lang['btn_secedit']           = 'แก้ไข';
+$lang['btn_login']             = 'ล็อกอิน';
+$lang['btn_logout']            = 'ล็อกเอาต์';
+$lang['btn_admin']             = 'ผู้ควบคุมระบบ';
+$lang['btn_update']            = 'ปรับปรุง';
+$lang['btn_delete']            = 'ลบ';
+$lang['btn_back']              = 'ย้อนกลับ';
+$lang['btn_backlink']          = 'หน้าที่ลิงก์มา';
+$lang['btn_backtomedia']       = 'กลับไปยังหน้าเลือกไฟล์สื่อ';
+$lang['btn_subscribe']         = 'เฝ้าดู';
+$lang['btn_unsubscribe']       = 'เลิกเฝ้าดู';
+$lang['btn_subscribens']       = 'สมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
+$lang['btn_unsubscribens']     = 'ยกเลิกสมัครเพื่อตามการเปลี่ยนแปลงเนมสเปซ';
+$lang['btn_profile']           = 'แก้ข้อมูลผู้ใช้';
+$lang['btn_reset']             = 'เริ่มใหม่';
+$lang['btn_resendpwd']         = 'ลืมรหัส ส่งให้ใหม่ทางอีเมล';
+$lang['btn_draft']             = 'แก้ไขเอกสารฉบับร่าง';
+$lang['btn_recover']           = 'กู้คืนเอกสารฉบับร่าง';
+$lang['btn_draftdel']          = 'ลบเอกสารฉบับร่าง';
+$lang['btn_revert']            = 'กู้คืน';
+$lang['loggedinas']            = 'ลงชื่อเข้าใช้เป็น';
+$lang['user']                  = 'ชื่อผู้ใช้:';
+$lang['pass']                  = 'รหัสผ่าน';
+$lang['newpass']               = 'รหัสผ่านใหม่';
+$lang['oldpass']               = 'รหัสผ่านเดิม:';
+$lang['passchk']               = 'พิมพ์รหัสผ่านอีกครั้ง:';
+$lang['remember']              = 'จำชื่อและรหัสผ่าน';
+$lang['fullname']              = 'ชื่อจริง:';
+$lang['email']                 = 'อีเมล:';
+$lang['register']              = 'สร้างบัญชีผู้ใช้';
+$lang['profile']               = 'ข้อมูลส่วนตัวผู้ใช้';
+$lang['badlogin']              = 'ขัดข้อง:';
+$lang['minoredit']             = 'เป็นการแก้ไขเล็กน้อย';
+$lang['draftdate']             = 'บันทึกฉบับร่างเมื่อ';
+$lang['nosecedit']             = 'ในช่วงเวลาที่ผ่านมานี้เพจถูกแก้ไขไปแล้ว, เนื้อหาในเซคชั่นนี้ไม่ทันสมัย กรุณาโหลดเพจใหม่ทั้งหน้าแทน';
+$lang['regmissing']            = 'ขออภัย คุณต้องกรอกให้ครบทุกช่อง';
+$lang['reguexists']            = 'ชื่อบัญชีที่ใส่นั้นมีผู้อื่นได้ใช้แล้ว กรุณาเลือกชื่อผู้ใช้อื่น';
+$lang['regsuccess']            = 'ผู้ใช้ถูกสร้างแล้ว และรหัสผ่านได้ถูกส่งไปทางอีเมลแล้ว';
+$lang['regsuccess2']           = 'ชื่อบัญชีได้ถูกสร้างขึ้น';
+$lang['regmailfail']           = 'ดูเหมือนจะมีข้อผิดพลาดในการส่งรหัสผ่านทางเมล์ กรุณาติดต่อผู้ดูแลระบบ';
+$lang['regbadmail']            = 'รูปแบบอีเมลไม่ถูกต้อง ให้ใส่อีเมลให้ถูกต้องตามรูปแบบอีเมล หรือให้ทำช่องอีเมลให้ว่างแทน';
+$lang['regbadpass']            = 'รหัสผ่านที่ใส่ไม่ถูกต้อง';
+$lang['regpwmail']             = 'รหัสผ่านเข้าโดกุวิกิของคุณ';
+$lang['reghere']               = 'คุณยังไม่มีบัญชีหรือ ก็แค่สร้างขึ้นมาสักอันหนึ่ง';
+$lang['profna']                = 'วิกินี้ไม่รองรับการแก้ไขข้อมูลส่วนตัว';
+$lang['profnochange']          = 'ไม่มีการเปลี่ยนแปลงข้อมูลส่วนตัว';
+$lang['profnoempty']           = 'ไม่อนุญาติให้เว้นว่างชื่อ หรืออีเมล';
+$lang['profchanged']           = 'ปรับปรุงข้อมูลส่วนตัวผู้ใช้สำเร็จ';
+$lang['pwdforget']             = 'ลืมรหัสผ่านหรือ? เอาอันใหม่สิ';
+$lang['resendna']              = 'วิกินี้ไม่รองรับการส่งรหัสผ่านซ้ำ';
+$lang['resendpwd']             = 'ส่งรหัสผ่านใหม่ให้กับ';
+$lang['resendpwdmissing']      = 'ขออภัย, คุณต้องกรอกทุกช่อง';
+$lang['resendpwdnouser']       = 'ขออภัย, เราไม่พบผู้ใช้คนนี้ในฐานข้อมูลของเรา';
+$lang['resendpwdbadauth']      = 'ขออภัย, รหัสนี้ยังใช้ไม่ได้ กรุณาตรวจสอบว่าคุณกดลิ้งค์ยืนยันแล้ว';
+$lang['resendpwdconfirm']      = 'อีเมลยืนยันได้ถูกส่งไปที่อีเมลที่ได้ถูกเสนอ ก่อนที่อีเมลจะถูกส่งไปที่ชื่อบัญชีนั้น คุณต้องปฏิบัติตามคำแนะนำในอีเมลเพื่อยืนยันว่าหมายเลยบัญชีนั้นเป็นของคุณ';
+$lang['resendpwdsuccess']      = 'รหัสผ่านใหม่ของคุณได้ถูกส่งให้แล้วทางอีเมล';
+$lang['license']               = 'เว้นแต่จะได้แจ้งไว้เป็นอื่นใด เนื้อหาบนวิกินี้ถูกกำหนดสิทธิ์ไว้ภายใต้สัญญาอนุญาติต่อไปนี้:';
+$lang['licenseok']             = 'โปรดทราบ: เมื่อเริ่มแก้ไขหน้านี้ ถือว่าคุณตกลงให้สิทธิ์กับเนื้อหาของคุณอยู่ภายใต้สัญญาอนุญาตินี้';
+$lang['searchmedia']           = 'สืบค้นไฟล์ชื่อ:';
+$lang['searchmedia_in']        = 'สืบค้นใน %s';
+$lang['txt_upload']            = 'เลือกไฟล์ที่จะอัพโหลด';
+$lang['txt_filename']          = 'อัพโหลดเป็น(ตัวเลือก)';
+$lang['txt_overwrt']           = 'เขียนทับไฟล์ที่มีอยู่แล้ว';
+$lang['lockedby']              = 'ตอนนี้ถูกล๊อคโดย';
+$lang['lockexpire']            = 'การล๊อคจะหมดอายุเมื่อ';
+$lang['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['notsavedyet']           = 'การแก้ไขที่ไม่ได้บันทึกจะสูญหาย \n ต้องการทำต่อจริงๆหรือ?';
+$lang['rssfailed']             = 'มีข้อผิดพลาดขณะดูดฟีดนี้';
+$lang['nothingfound']          = 'ไม่พบสิ่งใด';
+$lang['mediaselect']           = 'ไฟล์สื่อ';
+$lang['fileupload']            = 'อัปโหลด';
+$lang['uploadsucc']            = 'อัปโหลดสำเร็จ';
+$lang['uploadfail']            = 'เกิดความขัดข้องในการอัปโหลด';
+$lang['uploadwrong']           = 'การอัพโหลดถูกปฏิเสธ ส่วนขยายไฟล์นี้ต้องห้าม!';
+$lang['uploadexist']           = 'ไฟล์นี้มีอยู่แล้ว ไม่มีการบันทึกใดๆเกิดขึ้น';
+$lang['uploadbadcontent']      = 'เนื้อหาที่อัพโหลดไม่ตรงกับส่วนขยายไฟล์ %s ';
+$lang['uploadspam']            = 'การอัพโหลดถูกกีดกันจากบัญชีดำสแปม';
+$lang['uploadxss']             = 'ไฟล์นี้มีส่วนประกอบของโค้ดเอชทีเอ็มแอลหรือสคริปต์ ซึ่งอาจก่อให้เกิดความผิดพลาดในการแสดงผลของเว็บเบราว์เซอร์';
+$lang['uploadsize']            = 'ไฟล์ที่อัพโหลดใหญ่เกินไป (สูงสุด %s)';
+$lang['deletesucc']            = 'ไฟล์ "%s" ถูกลบ';
+$lang['deletefail']            = '"%s" ไม่สามารถลบได้ - ให้ตรวจสอบสิทธิ์การใช้ของคุณ';
+$lang['mediainuse']            = 'ไฟล์ "%s" ไม่ได้ถูกลบ - มันถูกใช้อยู่';
+$lang['namespaces']            = 'เนมสเปซ';
+$lang['mediafiles']            = 'มีไฟล์พร้อมใช้อยู่ใน';
+$lang['js']['searchmedia']     = 'ค้นหาไฟล์';
+$lang['js']['keepopen']        = 'เปิดหน้าต่างไว้ระหว่างที่เลือก';
+$lang['js']['hidedetails']     = 'ซ่อนรายละเอียด';
+$lang['js']['nosmblinks']      = 'เชื่อมไปยังหน้าต่างแบ่งปัน ทำงานได้กับเฉพาะไมโครซอฟท์อินเตอร์เน็ตเอ็กซโปรเรอร์(IE) คุณยังคงสามารถคัดลอกและแปะลิ้งค์ได้';
+$lang['js']['linkwiz']         = 'ลิงค์วิเศษ';
+$lang['js']['linkto']          = 'ลิงค์ไป:';
+$lang['js']['del_confirm']     = 'ต้องการลบรายการที่เลือกจริงๆหรือ?';
+$lang['js']['mu_btn']          = 'อัพโหลดหลายๆไฟล์ในครั้งเดียว';
+$lang['mediausage']            = 'ให้ใช้ไวยกรณ์ต่อไปนี้เพื่ออ้างอิงไฟล์นี้';
+$lang['mediaview']             = 'ดูไฟล์ต้นฉบับ';
+$lang['mediaroot']             = 'ราก(รูท)';
+$lang['mediaupload']           = 'อัพโหลดไฟล์ไปยังเนมสเปซปัจจุบันจากที่นี่ หากจะสร้างเนมสเปซย่อย ให้พิมพ์ต่อข้อความของคุณหลังชื่อไฟล์ในช่อง "อัพโหลดเป็น" โดยให้คั่นด้วยโคล่อน(:)';
+$lang['mediaextchange']        = 'ส่วนขยายไฟล์ถูกเปลี่ยนจาก .%s ไปเป็น .%s!';
+$lang['reference']             = 'อ้างอิงสำหรับ';
+$lang['ref_inuse']             = 'ไม่สามารถลบไฟล์ได้ เพราะมันยังคงถูกใช้โดยเพจดังต่อไปนี้:';
+$lang['ref_hidden']            = 'มีการอ้างอิงบางรายการในเพจ คุณไม่มีสิทธิ์ในการอ่าน';
+$lang['hits']                  = 'คำที่ตรงกัน';
+$lang['quickhits']             = 'ชื่อเพจที่ตรงกัน';
+$lang['toc']                   = 'สารบัญ';
+$lang['current']               = 'ฉบับปัจจุบัน';
+$lang['yours']                 = 'ฉบับของคุณ';
+$lang['diff']                  = 'แสดงจุดแตกต่างกับฉบับปัจจุบัน';
+$lang['diff2']                 = 'แสดงจุดแตกต่างระหว่างฉบับที่เลือกไว้';
+$lang['line']                  = 'บรรทัด';
+$lang['breadcrumb']            = 'ตามรอย';
+$lang['youarehere']            = 'คุณอยู่ที่นี่';
+$lang['lastmod']               = 'แก้ไขครั้งล่าสุด';
+$lang['by']                    = 'โดย';
+$lang['deleted']               = 'ถูกถอดออก';
+$lang['created']               = 'ถูกสร้าง';
+$lang['restored']              = 'ย้อนไปรุ่นก่อนหน้า';
+$lang['external_edit']         = 'แก้ไขภายนอก';
+$lang['summary']               = 'สรุป(หมายเหตุ)การแก้ไขนี้';
+$lang['noflash']               = 'ต้องการตัวเล่นแฟลช <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a> เพื่อแสดงผลเนื้อหานี้';
+$lang['download']              = 'ดาวน์โหลดสนิปเป็ด(Snippet)';
+$lang['mail_newpage']          = 'เพิ่มเพจแล้ว:';
+$lang['mail_changed']          = 'แก้ไขเพจแล้ว:';
+$lang['mail_new_user']         = 'ผู้ใช้คนใหม่:';
+$lang['mail_upload']           = 'ไฟล์อัพโหลดแล้ว:';
+$lang['qb_bold']               = 'ทำตัวหนา';
+$lang['qb_italic']             = 'ทำตัวเอียง';
+$lang['qb_underl']             = 'ขีดเส้นใต้ข้อความ';
+$lang['qb_code']               = 'ข้อความเป็นโค้ดโปรแกรม';
+$lang['qb_strike']             = 'ขีดฆ่าข้อความ';
+$lang['qb_h1']                 = 'หัวเรื่องระดับที่ 1';
+$lang['qb_h2']                 = 'หัวเรื่องระดับที่ 2';
+$lang['qb_h3']                 = 'หัวเรื่องระดับที่ 3';
+$lang['qb_h4']                 = 'หัวเรื่องระดับที่ 4';
+$lang['qb_h5']                 = 'หัวเรื่องระดับที่ 5';
+$lang['qb_h']                  = 'หัวเรื่อง';
+$lang['qb_hs']                 = 'เลือกหัวเรื่อง';
+$lang['qb_hplus']              = 'หัวเรื่องที่สูงกว่า';
+$lang['qb_hminus']             = 'หัวเรื่องที่ต่ำกว่า';
+$lang['qb_hequal']             = 'หัวเรื่องระดับเดียวกัน';
+$lang['qb_link']               = 'ลิงก์ภายในเว็บ';
+$lang['qb_extlink']            = 'ลิงก์ไปที่อื่น (อย่าลืม http:// นำหน้าเสมอ)';
+$lang['qb_hr']                 = 'เส้นนอน';
+$lang['qb_ol']                 = 'รายการที่เรียงลำดับแล้ว';
+$lang['qb_ul']                 = 'รายการที่ยังไม่ได้เรียงลำดับ';
+$lang['qb_media']              = 'เพิ่มภาพและไฟล์อื่นๆ';
+$lang['qb_sig']                = 'ลายเซ็นพร้อมลงเวลา';
+$lang['qb_smileys']            = 'ภาพแสดงอารมณ์';
+$lang['qb_chars']              = 'อักขระพิเศษ';
+$lang['upperns']               = 'กระโดดขึ้นไปยังเนมสเปซแม่';
+$lang['admin_register']        = 'สร้างบัญชีผู้ใช้';
+$lang['metaedit']              = 'แก้ไขข้อมูลเมต้า';
+$lang['metasaveerr']           = 'มีข้อผิดพลาดในการเขียนข้อมูลเมต้า';
+$lang['metasaveok']            = 'บันทึกเมต้าดาต้าแล้ว';
+$lang['img_backto']            = 'กลับไปยัง';
+$lang['img_title']             = 'ชื่อภาพ';
+$lang['img_caption']           = 'คำบรรยายภาพ';
+$lang['img_date']              = 'วันที่';
+$lang['img_fname']             = 'ชื่อไฟล์';
+$lang['img_fsize']             = 'ขนาดภาพ';
+$lang['img_artist']            = 'ผู้สร้างสรรค์';
+$lang['img_copyr']             = 'ผู้ถือลิขสิทธิ์';
+$lang['img_format']            = 'รูปแบบ';
+$lang['img_camera']            = 'กล้อง';
+$lang['img_keywords']          = 'คำหลัก';
+$lang['subscribe_success']     = 'เพิ่ม %s เข้าไปในรายชื่อสมาชิกลงทะเบียนสำหรับ %s';
+$lang['subscribe_error']       = 'มีข้อผิดพลาดในการเพิ่ม %s ในรายชื่อสมัครสมาชิกสำหรับ %s';
+$lang['subscribe_noaddress']   = 'ไม่มีที่อยู่ที่ตรงกับชื่อล็อกอินของคุณ ชื่อคุณไม่สามารถถูกเพิ่มเข้าไปในรายชื่อสมัครสมาชิก';
+$lang['unsubscribe_success']   = 'ถอด % ออกจากรายชื่อสมัครสมาชิกของ %s';
+$lang['unsubscribe_error']     = 'มีข้อผิดพลาดในการถอด %s ออกจากรายชื่อสมาชิกของ %s';
+$lang['authmodfailed']         = 'มีการกำหนดค่าสิทธิ์ผู้ใช้ไว้ไม่ดี กรุณาแจ้งผู้ดูแลระบบวิกิของคุณ';
+$lang['authtempfail']          = 'ระบบตรวจสอบสิทธิ์ผู้ใช้ไม่พร้อมใช้งานชั่วคราว หากสถานการณ์ยังไม่เปลี่ยนแปลง กรุณาแจ้งผู้ดูแลระบวิกิของคุณ';
+$lang['i_chooselang']          = 'เลือกภาษาของคุณ';
+$lang['i_installer']           = 'ตัวติดตั้งโดกุวิกิ';
+$lang['i_wikiname']            = 'ชื่อวิกิ';
+$lang['i_enableacl']           = 'เปิดระบบ ACL(แนะนำ)';
+$lang['i_superuser']           = 'ซุปเปอร์ยูสเซอร์';
+$lang['i_problems']            = 'ตัวติดตั้งพบปัญหาบางประการ ตามที่ระบุด้านล่าง คุณไม่สามารถทำต่อได้จนกว่าจะได้แก้ไขสิ่งเหล่านั้น';
+$lang['i_modified']            = 'ด้วยเหตุผลด้านความปลอดภัย สคริปต์นี้จะทำงานกับเฉพาะโดกุวิกิที่ติดตั้งใหม่หรือยังไม่ได้ดัดแปลงแก้ไข
+คุณควรเลือกระหว่างคลี่ไฟล์จากแพคเกจที่ได้ดาวน์โหลดมาอีกครั้ง หรือศึกษาจากคู่มือ
+<a href="http://dokuwiki.org/install">Dokuwiki installation instructions</a>';
+$lang['i_funcna']              = 'PHP function <code>%s</code> ไม่สามารถใช้งานได้ อาจเป็นเพราะผู้ให้บริการโฮสไม่เปิดให้ใช้งาน';
+$lang['i_phpver']              = 'PHP รุ่นที่คุณกำลังใช้งานอยู่คือ <code>%s</code> คุณจำเป็นต้องอัพเกรด PHP ให้เป็นรุ่น <code>%s</code> หรือสูงกว่า';
+$lang['i_permfail']            = '<code>%s</code> DokuWiki ไม่สามารถเขียนข้อมูลได้ ต้องตั้งค่าสิทธิ์การอนุญาตของไดเรคทอรีนี้เสียก่อน!';
+$lang['i_confexists']          = '<code>%s</code> ถูกใช้งานไปแล้ว';
+$lang['i_writeerr']            = 'ไม่สามารถสร้าง <code>%s</code>. ตรวจสอบสิทธิ์การอนุญาตของไดเรคทอรีหรือไฟล์ แล้วสร้างไฟล์ด้วยตนเอง';
+$lang['i_policy']              = 'นโยบายสิทธิ์เข้าถึง(ACL)ตั้งต้น';
+$lang['i_pol0']                = 'วิกิเปิดกว้าง (ใครก็ อ่าน, เขียน, อัพโหลดได้)';
+$lang['i_pol1']                = 'วิกิสาธารณะ (ทุกคนอ่านได้, เขียน และ อัพโหลดเฉพาะผู้ใช้ที่ลงทะเบียนแล้ว)';
+$lang['i_pol2']                = 'วิกิภายใน (อ่าน, เขียน, อัพโหลด สำหรับผู้ใช้ที่ลงทะเบียนแล้วเท่านั้น)';
+$lang['i_retry']               = 'ลองใหม่';
+$lang['mu_intro']              = 'ที่นี่คุณสามารถอัพโหลดหลายๆไฟล์ได้พร้อมๆกัน คลิ๊กปุ่มบราวซ์เพื่อเพิ่มมันเข้าไปในคิว กดปุ่มอัพโหลดเมื่อเสร็จแล้ว';
+$lang['mu_gridname']           = 'ชื่อไฟล์';
+$lang['mu_gridsize']           = 'ขนาด';
+$lang['mu_gridstat']           = 'สถานะ';
+$lang['mu_namespace']          = 'เนมสเปซ';
+$lang['mu_browse']             = 'เรียกดู';
+$lang['mu_toobig']             = 'ใหญ่ไป';
+$lang['mu_ready']              = 'พร้อมอัปโหลด';
+$lang['mu_done']               = 'เสร็จสิ้น';
+$lang['mu_fail']               = 'ล้มเหลว';
+$lang['mu_authfail']           = 'วาระหมดอายุ';
+$lang['mu_progress']           = '@PCT@% อัปโหลดแล้ว';
+$lang['mu_filetypes']          = 'ชนิดแฟ้มที่อนุญาต';
+$lang['mu_info']               = 'แฟ้มอัปโหลดแล้ว';
+$lang['mu_lasterr']            = 'ผิดพลาดล่าสุด:';
+$lang['years']                 = '%d ปีก่อน';
+$lang['months']                = '%d เดือนก่อน';
+$lang['weeks']                 = '%d สัปดาห์ก่อน';
+$lang['days']                  = '%d วันก่อน';
+$lang['hours']                 = '%d ชั่วโมงก่อน';
+$lang['minutes']               = '%d นาทีก่อน';
+$lang['seconds']               = '%d วินาทีก่อน';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/locked.txt
new file mode 100644
index 000000000..a198ad717
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/locked.txt
@@ -0,0 +1,3 @@
+====== เพจถูกล๊อค ======
+
+เพจนี้กำลังถูกล๊อคจากการแก้ไขโดยผู้ใช้ท่านอื่น คุณต้องรอจนกว่าผู้ใช้คนนี้จะแก้ไขเสร็จ หรือการล๊อคนั้นหมดเวลา
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/login.txt
new file mode 100644
index 000000000..d384c2d27
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/login.txt
@@ -0,0 +1,4 @@
+====== ล็อกอิน ======
+
+คุณยังไม่ได้เข้าสู่ระบบ(ล็อกอิน)ในขณะนี้! กรอกรายละเอียดเพื่อพิสูจน์สิทธิ์ข้างล่างนี้เพื่อล็อกอิน คุณต้องเปิดคุ๊กกี้ให้ทำงานก่อนที่จะล็อกอิน
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/mailtext.txt
new file mode 100644
index 000000000..a4af8a0f3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/mailtext.txt
@@ -0,0 +1,17 @@
+เพจในโดกุวิกิของคุณได้ถูกเพิ่ม หรือแก้ไข นี่คือรายละเอียด:
+
+วันที่: @DATE@
+บราวเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ฉบับเก่า: @OLDPAGE@
+ฉบับใหม่: @NEWPAGE@
+สรุปการแก้ไข: @SUMMARY@
+ผู้ใช้: @USER@
+
+@DIFF@
+
+
+-- 
+จดหมายนี้สร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/newpage.txt
new file mode 100644
index 000000000..cab906d4c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/newpage.txt
@@ -0,0 +1,3 @@
+====== ยังไม่มีหัวข้อนี้ ======
+
+คุณได้กดลิ้งค์เข้ามายังหัวข้อที่ยังไม่ได้สร้าง ถ้าคุณได้รับอนุญาติ คุณอาจจะสร้างมันได้ด้วยการกดปุ่ม "สร้างเพจนี้"
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/norev.txt
new file mode 100644
index 000000000..9127a20c3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/norev.txt
@@ -0,0 +1,3 @@
+====== ไม่มีฉบับที่ระบุ ======
+
+ฉบับที่ระบุไม่มีอยู่จริง กรุณาใช้ปุ่ม "ฉบับเก่าๆ" เพื่อแสดงรายการรุ่นเก่าๆของเอกสารนี้ิ
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/preview.txt
new file mode 100644
index 000000000..caaf8ad2d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/preview.txt
@@ -0,0 +1,3 @@
+====== ดูตัวอย่าง ======
+
+นี่คือหน้าตัวอย่างของข้อความที่คุณกรอก จำไว้ว่า: มันยัง **ไม่ได้บันทึก** เก็บไว้!
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/pwconfirm.txt
new file mode 100644
index 000000000..e6ab876cf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/pwconfirm.txt
@@ -0,0 +1,14 @@
+เฮ้ @FULLNAME@!
+
+มีบางคนร้องขอรหัสผ่านใหม่สำหรับ @TITLE@ ของคุณ
+เพื่อล็อกอินที่ @DOKUWIKIURL@
+
+ถ้าคุรไม่ได้ร้องขอรหัสผ่านใหม่ ก็ไม่ต้องสนใจอีเมลนี้
+
+หากต้องการยืนยันว่านี่การร้องขอนี้ถูกส่งโดยคุณจริงๆ กรุณาใช้ลิงค์ดังต่อไปนี้
+
+@CONFIRM@
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/read.txt
new file mode 100644
index 000000000..ac4f31290
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/read.txt
@@ -0,0 +1 @@
+หน้านี้มีไว้อ่านอย่างเดียว คุณสามารถอ่านข้อความต้นฉบับ ไม่สามารถแก้ไขได้ ให้สอบถามผู้ดูแลระบบถ้าคุณคิดว่านี่คือข้อผิดพลาด
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/recent.txt
new file mode 100644
index 000000000..1655ae82b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/recent.txt
@@ -0,0 +1,3 @@
+====== การเปลี่ยนแปลงเมื่อเร็วๆนี้ ======
+
+เพจเหล่านี้ถูกเปลี่ยนแปลงเมื่อเร็วๆนี้
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/register.txt
new file mode 100644
index 000000000..ed4a40876
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/register.txt
@@ -0,0 +1,3 @@
+====== ลงทะเบียนเป็นผู้ใช้หน้าใหม่ ======
+
+กรอกข้อมูลทั้งหมดด้านล่างเพื่อสร้างบัญชีใหม่ในวิกินี้ ให้แน่ใจว่าคุณให้ **ที่อยู่อีเมลที่ใช้ได้จริง** ถ้าคุณไม่ถูกถามให้กรอกรหัสผา่นที่นี่, รหัสผ่านใหม่จะถูกส่งไปยังที่อยู่ดังกล่าว ชื่อล็อกอินควรจะใช้ได้ถูกต้องตาม[[doku>pagename|pagename]].
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/registermail.txt
new file mode 100644
index 000000000..a96026d31
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/registermail.txt
@@ -0,0 +1,14 @@
+มีผู้ใช้คนใหม่ได้ลงทะเบียน นี่คือรายละเอียด:
+
+ชื่อผู้ใช้ : @NEWUSER@
+ชื่อเต็ม : @NEWNAME@
+อีเมล : @NEWEMAIL@
+
+วันที่ : @DATE@
+บราวเซอร์ : @BROWSER@
+ที่อยู่ไอพี : @IPADDRESS@
+ชื่อโฮสต์ : @HOSTNAME@
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/resendpwd.txt
new file mode 100644
index 000000000..1935abedd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ส่งรหัสผ่านใหม่ ======
+
+กรุณากรอกชื่อผู้ใช้ในช่องด้านล่างเพื่อร้องขอรหัสผ่านใหม่จากบัญชีของคุณในวิกินี้ ลิงค์ยืนยันจะถูกส่งไปยังที่อยู่อีเมลที่คุณลงทะเบียนไว้
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/revisions.txt
new file mode 100644
index 000000000..98a49d724
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/revisions.txt
@@ -0,0 +1,3 @@
+====== ฉบับเก่า ======
+
+เหล่านี้เป็นรายการฉบับเก่าของเอกสารปัจจุบัน หากต้องการคืนสภาพฉบับเก่า ให้เลือกมันจากด้านล่าง, คลิ๊ก "แก้ไขเพจนี้" แล้วจึงค่อยบันทึกมัน
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/searchpage.txt
new file mode 100644
index 000000000..d6399a9e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/searchpage.txt
@@ -0,0 +1,4 @@
+====== สืบค้น ======
+คุณสามารถพบผลลัพธ์การสืบค้นของคุณด้านล่าง ถ้าคุณไม่พบสิ่งที่คนมองหา คุณสามารถเลือกที่จะสร้าง หรือแก้ไขชื่อเพจหลังจากดูผลสืบค้นแล้วด้วยปุ่มที่เหมาะสม
+
+====== ผลลัพธ์ ======
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/showrev.txt
new file mode 100644
index 000000000..f93869f38
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/showrev.txt
@@ -0,0 +1,2 @@
+**นี่คือเอกสารรุ่น/ฉบับเก่า**
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/subscribermail.txt
new file mode 100644
index 000000000..8f65b1061
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/subscribermail.txt
@@ -0,0 +1,22 @@
+สวัสดี!
+
+เพจ @PAGE@ ในวิกิ @TITLE@ ถูกแก้ไข และนี่คือรายการเปลี่ยนแปลง:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+วันที่ : @DATE@
+ผู้ใช้: @USER@
+สรุปการแก้ไข: @SUMMARY@
+ฉบับเก่า: @OLDPAGE@
+ฉบับใหม่: @NEWPAGE@
+
+เพื่อยกเลิกการแจ้งเตือนในเพจนี้, ให้ล็อกอินเข้าไปยังวิกิที่
+@DOKUWIKIURL@ แล้วเข้าไปที่ยัง
+@NEWPAGE@
+และยกเลิกการลงทะเบียนเฝ้าดูการเปลี่ยนแปลงของเพจ หรือ เนมสเปซ นั้นๆ
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดย โดกุวิกิที่
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/updateprofile.txt
new file mode 100644
index 000000000..3e0a8dffd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/updateprofile.txt
@@ -0,0 +1,3 @@
+====== ปรับปรุงข้อมูลส่วนตัวของบัญชีคุณ ======
+
+คุณเพียงต้องการกรอกช่องที่ต้องการแก้ไขเหล่านี้ให้ครบ แต่ไม่สามารถเปลี่ยนชื่อผู้ใช้ได้
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/uploadmail.txt
new file mode 100644
index 000000000..026965753
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/uploadmail.txt
@@ -0,0 +1,14 @@
+มีไฟล์ได้ถูกอัพโหลดเข้าไปยังโดกุวิกิของคุณ นี่คือรายละเอียด:
+
+ไฟล์: @MEDIA@
+วันที่: @DATE@
+เบราเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ขนาด: @SIZE@
+MIME Type : @MIME@
+ผู้ใช้: @USER@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/wordblock.txt
new file mode 100644
index 000000000..653e341e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/th/wordblock.txt
@@ -0,0 +1,3 @@
+====== สแปมถูกกีดกัน ======
+
+การเปลี่ยนแปลงของคุณ **ไม่**ได้รับการบันทึกเพราะมันมีหนึ่งข้อความต้องห้ามหรือมากกว่า ถ้าคุณพยายามสแปมวิกินี้ --คุณไม่น่ารักเลยนะ เด็กโง่! แต่ถ้าคุณคิดว่านี่เป็นข้อผิดพลาดแล้วละก็ ช่วยติดต่อผู้ดูแลวิกินี้ให้ด้วย
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/admin.txt
new file mode 100644
index 000000000..2292b6eeb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/admin.txt
@@ -0,0 +1,3 @@
+====== Yönetim ======
+
+Aşağıda DokuWiki için yapılabilecek yönetim işleri vardır.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/backlinks.txt
new file mode 100644
index 000000000..e219a60c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Geri linkler ======
+
+Bu sayfaya bağlantı veren sayfaların listesi aşağıdadır.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/conflict.txt
new file mode 100644
index 000000000..504947998
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/conflict.txt
@@ -0,0 +1,6 @@
+====== Yeni versiyon mevcut ======
+
+Değiştirdiğiniz dökümanın daha yeni bir versiyonu mevcut. Bu durum, siz dökümanı değiştirirken başka bir kullanıcının da aynı dökümanı değiştirmesi halinde olur.
+
+Aşağıda gösterilen farkları dikkatlice inceleyin, daha sonra hangi versiyonun korunacağına karar verin. Eğer ''Kaydet''i seçerseniz, sizin sürümünüz kaydedilir. Mevcut sürümü korumak için ''İptal''e tıklayın.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/denied.txt
new file mode 100644
index 000000000..04e9b8bfb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/denied.txt
@@ -0,0 +1,4 @@
+====== Yetki Reddedildi ======
+
+Üzgünüz, devam etmek için yetkiniz yok. Giriş yapmayı unutmuş olabilir misiniz?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/diff.txt
new file mode 100644
index 000000000..72baa676b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/diff.txt
@@ -0,0 +1,4 @@
+====== Farklar ======
+
+Bu sayfanın seçili sürümü ile mevcut sürümü arasındaki farkları gösterir.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/draft.txt
new file mode 100644
index 000000000..b1a8881b8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/draft.txt
@@ -0,0 +1,5 @@
+====== Taslak Dosyası Bulundu ======
+
+Bu sayfadaki en son oturumunuz düzgün olarak tamamlanmamış. DokuWiki otomatik olarak bir taslak kaydetmiş olduğu için çalışmanıza devam edebilirsiniz.  Aşağıda en son oturumunuzda kaydedilmiş olan taslağı görebilirsiniz.
+
+Bu taslağı //geri getirebilir//, //silebilir// veya düzenleme sürecinden //vazgeçebilirsiniz//.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/edit.txt
new file mode 100644
index 000000000..4f84c4e53
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/edit.txt
@@ -0,0 +1,2 @@
+Sayfayı değiştirin ve ''Kaydete'' basın. Wiki sözdizimi için [[wiki:syntax]]'a bakınız. Lütfen sayfayı sadece eğer **geliştirebiliyorsanız** değiştirin. Eğer testler yapmak istiyorsanız, [[playground:playground|playground]] adresini kullanın.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/editrev.txt
new file mode 100644
index 000000000..9c70fbed3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/editrev.txt
@@ -0,0 +1,2 @@
+**Sayfanın eski bir sürümünü yüklediniz!** Eğer kaydederseniz, bu veriyle yeni bir sürüm oluşturacaksınız.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/index.txt
new file mode 100644
index 000000000..e361e8784
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/index.txt
@@ -0,0 +1,4 @@
+====== İndeks ======
+
+Bu mevcut tüm sayfaların [[doku>namespaces|isim alanlarına]] göre sıralı bir indeksidir.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/install.html
new file mode 100644
index 000000000..59e7f57a7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/install.html
@@ -0,0 +1,8 @@
+<p>Bu sayfa <a href="http://dokuwiki.org">Dokuwiki</a> kurmanıza yardımcı olmaktadır. Kurulum hakkında bilgi sahibi olmak için <a href="http://dokuwiki.org/installer">bu sayfayı</a> ziyaret edebilirsiniz.</p>
+
+<p>DokuWiki wiki sayfalarını ve wiki sayfalarına ilişkin verileri (resimler, arama indeksi, geçmiş sürümler) dosyalarda tutar. DokuWikiyi sorunsuz olarak kullanmak için bu dosyaların bulunduğu dizinlere <b>mutlaka</b> yazma izniniz olması gereklidir.  Bu kurulum betiği yazma izinlerini ayarlayamamaktadır. İzinleri shell, FTP veya kontrol paneliniz (CPanel, Plesk vs.) aracılığı ile düzenleyebilirsiniz.</p>
+
+<p>Kurulum betiği <acronym title="access control list">ACL</acronym>'yi otomatik olarak ayarlamaktadır.  Böylece yönetici izinleri belirlenip, DokuWiki kullanımı kolaylaştırılmaktadır.</p>
+
+<p>Deneyimli kullanıcılar <a href="http://dokuwiki.org/install">bu sayfayı </a> 
+ edebilir ve <a href="http://dokuwiki.org/config">bu sayfa yardımıyla</a>  yapılandırma hakkında ekstra bilgi sahibi olabilir.</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/lang.php
new file mode 100644
index 000000000..dd045a6c7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/lang.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * turkish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Selim Farsakoğlu <farsakogluselim@yahoo.de>
+ * @author Aydın Coşkuner aydinweb@gmail.com
+ * @author Aydın Coşkuner <aydinweb@gmail.com>
+ * @author yavuzselim@gmail.com
+ * @author Cihan Kahveci kahvecicihan@gmail.com
+ * @author Yavuz Selim <yavuzselim@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Sayfayı düzenle';
+$lang['btn_source']            = 'Kaynağı göster';
+$lang['btn_show']              = 'Sayfayı göster';
+$lang['btn_create']            = 'Bu sayfayı oluştur';
+$lang['btn_search']            = 'Ara';
+$lang['btn_save']              = 'Kaydet';
+$lang['btn_preview']           = 'Önizleme';
+$lang['btn_top']               = 'Başa dön';
+$lang['btn_newer']             = '<< daha yeniler';
+$lang['btn_older']             = 'daha eskiler >>';
+$lang['btn_revs']              = 'Eski sürümler';
+$lang['btn_recent']            = 'En son değişiklikler';
+$lang['btn_upload']            = 'Yükle';
+$lang['btn_cancel']            = 'İptal';
+$lang['btn_index']             = 'İndeks';
+$lang['btn_secedit']           = 'Düzenle';
+$lang['btn_login']             = 'Giriş yap';
+$lang['btn_logout']            = 'Çıkış yap';
+$lang['btn_admin']             = 'Yönetici';
+$lang['btn_update']            = 'Güncelle';
+$lang['btn_delete']            = 'Sil';
+$lang['btn_back']              = 'Geri';
+$lang['btn_backlink']          = 'Geri linkler';
+$lang['btn_backtomedia']       = 'Çokluortam dosyası seçimine dön';
+$lang['btn_subscribe']         = 'Sayfa Değişikliklerini Bildir';
+$lang['btn_unsubscribe']       = 'Sayfa Değişikliklerini Bildirme';
+$lang['btn_subscribens']       = 'Namespace Değişikliklerini Bildir';
+$lang['btn_unsubscribens']     = 'Namespace Değişikliklerini Bildirme';
+$lang['btn_profile']           = 'Kullanıcı Bilgilerini Güncelle';
+$lang['btn_reset']             = 'Sıfırla';
+$lang['btn_resendpwd']         = 'Yeni parola gönder';
+$lang['btn_draft']             = 'Taslağı düzenle';
+$lang['btn_recover']           = 'Taslağı geri yükle';
+$lang['btn_draftdel']          = 'Taslağı sil';
+$lang['loggedinas']            = 'Giriş ismi';
+$lang['user']                  = 'Kullanıcı ismi';
+$lang['pass']                  = 'Parola';
+$lang['newpass']               = 'Yeni Parola';
+$lang['oldpass']               = 'Kullanılan parolayı doğrula';
+$lang['passchk']               = 'Bir kez daha girin';
+$lang['remember']              = 'Beni hatırla';
+$lang['fullname']              = 'Tam isim';
+$lang['email']                 = 'E-posta';
+$lang['register']              = 'Kayıt ol';
+$lang['profile']               = 'Kullanıcı Bilgileri';
+$lang['badlogin']              = 'Üzgünüz, Kullanıcı adı veya şifre yanlış oldu.';
+$lang['minoredit']             = 'Küçük Değişiklikler';
+$lang['draftdate']             = 'Taslak şu saatte otomatik kaydedildi:';
+$lang['nosecedit']             = 'Sayfa yakın zamanda değiştirilmiştir, bölüm bilgisi eski kalmıştır. Bunun için bölüm yerine tüm sayfa yüklenmiştir.';
+$lang['regmissing']            = 'Üzgünüz, tüm alanları doldurmalısınız.';
+$lang['reguexists']            = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
+$lang['regsuccess']            = 'Kullanıcı oluşturuldu ve şifre e-posta adresine gönderildi.';
+$lang['regsuccess2']           = 'Kullanıcı oluşturuldu.';
+$lang['regmailfail']           = 'Şifrenizi e-posta ile gönderirken bir hata oluşmuş gibi görünüyor. Lütfen yönetici ile temasa geçiniz!';
+$lang['regbadmail']            = 'Verilen e-posta adresi geçersiz gibi görünüyor - bunun bir hata olduğunu düşünüyorsanız yönetici ile temasa geçiniz.';
+$lang['regbadpass']            = 'Girilen parolalar aynı değil. Lütfen tekrar deneyiniz.';
+$lang['regpwmail']             = 'DokuWiki parolanız';
+$lang['reghere']               = 'Daha hesabınız yok mu? Hemen bir tane açtırın!';
+$lang['profna']                = 'Bu wiki kullanıcı bilgilerini değiştirmeyi desteklememektedir';
+$lang['profnochange']          = 'Değişiklik yok, birşey yapılmadı.';
+$lang['profnoempty']           = 'Boş isim veya e-posta adresine izin verilmiyor.';
+$lang['profchanged']           = 'Kullanıcı bilgileri başarıyla değiştirildi.';
+$lang['pwdforget']             = 'Parolanızı mı unuttunuz? Yeni bir parola alın';
+$lang['resendna']              = 'Bu wiki parolayı tekrar göndermeyi desteklememektedir.';
+$lang['resendpwd']             = 'Yeni parolayı gönder:';
+$lang['resendpwdmissing']      = 'Üzgünüz, tüm alanları doldurmalısınız.';
+$lang['resendpwdnouser']       = 'Üzgünüz,  veritabanımızda bu kullanıcıyı bulamadık.';
+$lang['resendpwdbadauth']      = 'Üzgünüz, bu doğrulama kodu doğru değil. Doğrulama linkini tam olarak kullandığınıza emin olun.';
+$lang['resendpwdconfirm']      = 'Doğrulama linki e-posta adresinize gönderildi.';
+$lang['resendpwdsuccess']      = 'Yeni parolanız e-posta adresinize gönderildi.';
+$lang['license']               = 'Aksi belirtilmediği halde, bu wikinin içeriğinin telif hakları şu lisans ile korunmaktadır:';
+$lang['licenseok']             = 'Not: Bu sayfayı değiştirerek yazınızın şu lisans ile yayınlanmasını kabul etmiş olacaksınız:';
+$lang['txt_upload']            = 'Yüklenecek dosyayı seç';
+$lang['txt_filename']          = 'Dosya adı (zorunlu değil)';
+$lang['txt_overwrt']           = 'Mevcut dosyanın üstüne yaz';
+$lang['lockedby']              = 'Şu an şunun tarafından kilitli:';
+$lang['lockexpire']            = 'Kilitin açılma tarihi:';
+$lang['willexpire']            = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
+$lang['notsavedyet']           = 'Kaydedilmemiş değişiklikler kaybolacak.\nDevam etmek istiyor musunuz?';
+$lang['rssfailed']             = 'Bu beslemeyi çekerken hata oluştu: ';
+$lang['nothingfound']          = 'Hiçbir şey yok.';
+$lang['mediaselect']           = 'Çokluortam dosyası seçimi';
+$lang['fileupload']            = 'Çokluortam dosyası yükleme';
+$lang['uploadsucc']            = 'Yükleme tamam';
+$lang['uploadfail']            = 'Yükleme başarısız. Yetki hatası olabilir!';
+$lang['uploadwrong']           = 'Yükleme engellendi. Bu dosya uzantısına izin verilmiyor!';
+$lang['uploadexist']           = 'Dosya zaten var. Hiçbir şey yapılmadı.';
+$lang['uploadbadcontent']      = 'Yüklenen içerik %s uzantısı ile uyuşmuyor.';
+$lang['uploadspam']            = 'Yükleme işlemi spam karalistesi tarafından engellendi.';
+$lang['uploadxss']             = 'Yükleme işlemi muhtemel kötü içerik sebebiyle engellendi.';
+$lang['uploadsize']            = 'Yüklenmek istenen dosya boyutu çok büyük (en fazla %s)';
+$lang['deletesucc']            = '"%s" dosyası silindi.';
+$lang['deletefail']            = '"%s" silinemedi - yetkileri kontrol et.';
+$lang['mediainuse']            = '"%s" dosyası silinmedi, hala kullanımda.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Şuradaki kullanıma hazır dosyalar:';
+$lang['js']['keepopen']        = 'Seçim yapıldığında bu pencereyi açık tut';
+$lang['js']['hidedetails']     = 'Ayrıntıları gizle';
+$lang['js']['nosmblinks']      = 'Windows paylaşımı sadece Microsoft Internet Explorer ile çalışmaktadır. Yine de hala bağlantıyı kopyalayıp yapıştırarak kullanabilirsiniz. ';
+$lang['js']['mu_btn']          = 'Birden fazla dosyayı bir seferde gönder';
+$lang['mediausage']            = 'Şu ';
+$lang['mediaview']             = 'Özgün dosyayı göster';
+$lang['mediaroot']             = 'Kök dizini';
+$lang['mediaupload']           = 'Dosya bu namespace\'e yüklenir. Alt namespace oluşturmak için "Dosya adı" kısmınının başına alt namespace adını ekleyip ardından iki nokta koyun.';
+$lang['mediaextchange']        = 'Dosya uzantısı .%s\'den .%s\'e çevrildi!';
+$lang['reference']             = 'Şunun için referanslar:';
+$lang['ref_inuse']             = 'Dosya silinemiyor, çünkü şu sayfalar tarafından hala kullanılmakta:';
+$lang['ref_hidden']            = 'Bazı referanslar okuma yetkiniz olmayan sayfalarda';
+$lang['hits']                  = 'tane bulundu';
+$lang['quickhits']             = 'Uyan sayfalar';
+$lang['toc']                   = 'İçindekiler';
+$lang['current']               = 'mevcut';
+$lang['yours']                 = 'Senin Sürümün';
+$lang['diff']                  = 'Kullanılan sürüm ile farkları göster';
+$lang['diff2']                 = 'Seçili sürümler arasındaki farkı göster';
+$lang['line']                  = 'Satır';
+$lang['breadcrumb']            = 'İz';
+$lang['youarehere']            = 'Buradasınız';
+$lang['lastmod']               = 'Son değiştirilme';
+$lang['by']                    = 'Değiştiren:';
+$lang['deleted']               = 'silindi';
+$lang['created']               = 'oluşturuldu';
+$lang['restored']              = 'eski sürüme dönüldü';
+$lang['external_edit']         = 'Dışarıdan düzenle';
+$lang['summary']               = 'Özeti düzenle';
+$lang['noflash']               = 'Bu içeriği göstermek için <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Eklentisi</a> gerekmektedir.';
+$lang['mail_newpage']          = 'sayfa eklenme:';
+$lang['mail_changed']          = 'sayfa değiştirilme:';
+$lang['mail_new_user']         = 'yeni kullanıcı';
+$lang['mail_upload']           = 'dosya yüklendi:';
+$lang['qb_bold']               = 'Kalın Yazı';
+$lang['qb_italic']             = 'Eğik Yazı';
+$lang['qb_underl']             = 'Altı Çizgili Yazı';
+$lang['qb_code']               = 'Kod Haline Getir';
+$lang['qb_strike']             = 'Ortası Çizilmiş Yazı';
+$lang['qb_h1']                 = '1. Seviye Başlık';
+$lang['qb_h2']                 = '2. Seviye Başlık';
+$lang['qb_h3']                 = '3. Seviye Başlık';
+$lang['qb_h4']                 = '4. Seviye Başlık';
+$lang['qb_h5']                 = '5. Seviye Başlık';
+$lang['qb_link']               = 'İç Bağlantı';
+$lang['qb_extlink']            = 'Dış Bağlantı';
+$lang['qb_hr']                 = 'Yatay Çizgi';
+$lang['qb_ol']                 = 'Sıralı liste';
+$lang['qb_ul']                 = 'Sırasız liste';
+$lang['qb_media']              = 'Resim ve başka dosyalar ekle';
+$lang['qb_sig']                = 'İmza Ekle';
+$lang['qb_smileys']            = 'Gülen Yüzler';
+$lang['qb_chars']              = 'Özel Karakterler';
+$lang['js']['del_confirm']           = 'Bu girişi sil?';
+$lang['admin_register']        = 'Yeni kullanıcı ekle...';
+$lang['metaedit']              = 'Metaverileri Değiştir';
+$lang['metasaveerr']           = 'Metaveri yazma başarısız ';
+$lang['metasaveok']            = 'Metaveri kaydedildi';
+$lang['img_backto']            = 'Şuna dön:';
+$lang['img_title']             = 'Başlık';
+$lang['img_caption']           = 'Serlevha';
+$lang['img_date']              = 'Tarih';
+$lang['img_fname']             = 'Dosya Adı';
+$lang['img_fsize']             = 'Boyut';
+$lang['img_artist']            = 'Fotoğrafçı';
+$lang['img_copyr']             = 'Telif Hakkı';
+$lang['img_format']            = 'Biçim';
+$lang['img_camera']            = 'Fotoğraf Makinası';
+$lang['img_keywords']          = 'Anahtar Sözcükler';
+$lang['subscribe_success']     = '%s, %s\'in abonelik listesine eklendi';
+$lang['subscribe_error']       = '%s; %s\'in abonelik listesine eklenirken hata oluştu';
+$lang['subscribe_noaddress']   = 'Giriş bilgilerinizle ilişkili bir adres yok, abonelik listesine eklenemezsiniz';
+$lang['unsubscribe_success']   = '%s, %s\'in abonelik listesinden çıkartıldı';
+$lang['unsubscribe_error']     = '%s, %s\'in listesinden çıkartılırken hata oluştu';
+$lang['authmodfailed']         = 'Yanlış kullanıcı onaylama ayarı. Lütfen Wiki yöneticisine bildiriniz.';
+$lang['authtempfail']          = 'Kullanıcı doğrulama geçici olarak yapılamıyor. Eğer bu durum devam ederse lütfen Wiki yöneticine haber veriniz.';
+$lang['i_chooselang']          = 'Dili seçiniz';
+$lang['i_installer']           = 'Dokuwiki Kurulum Sihirbazı';
+$lang['i_wikiname']            = 'Wiki Adı';
+$lang['i_enableacl']           = 'ACL\'yi etkinleştir (tavsiye edilir)';
+$lang['i_superuser']           = 'Ana Kullanıcı';
+$lang['i_problems']            = 'Kurulum sihirbazı aşağıda gösterilen sorunları buldu. Bunları düzeltmeden devam etmeniz mümkün değil.';
+$lang['i_modified']            = 'Güzenlik sebebiyle bu script sadece yeni ve değiştirilmemiş bir Dokuwiki kurulumunda çalışır. Ya indirdiğiniz paketi yeniden açmalı ya da <a href="http://dokuwiki.org/install"> adresindeki Dokuwiki kurulum kılavuzu</a>na bakmalısınız.';
+$lang['i_funcna']              = '<code>%s</code> PHP fonksiyonu bulunmamaktadır. Barındırma(Hosting) hizmetinde bu özellik kapatılmış olabilir.';
+$lang['i_phpver']              = '<code>%s</code> PHP sürümü, gereken <code>%s</code>  sürümünden daha düşük. PHP kurulumunu yükseltmeniz gerekmektedir.';
+$lang['i_permfail']            = '<code>%s</code> Dokuwiki tarafından yazılabilir değil. İzin ayarlarını bu klasör için düzeltmeniz gerekmektedir!';
+$lang['i_confexists']          = '<code>%s</code> zaten var';
+$lang['i_writeerr']            = '<code>%s</code> oluşturulamadı. Dosya/Klasör izin ayarlarını gözden geçirip dosyayı elle oluşturmalısınız.';
+$lang['i_badhash']             = 'dokuwiki.php tanınamadı ya da değiştirilmiş (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - Yanlış veya boş değer';
+$lang['i_success']             = 'Kurulum başarıyla tamamlandı. Şimdi install.php dosyasını silebilirsiniz. <a href="doku.php">Yeni DokuWikiniz</a>i kullanabilirsiniz.';
+$lang['i_failure']             = 'Ayar dosyalarını yazarken bazı hatalar oluştu. <a href="doku.php">Yeni DokuWikiniz</a>i kullanmadan önce bu hatalarınızı elle düzeltmeniz gerekebilir.';
+$lang['i_policy']              = 'İlk ACL ayarı';
+$lang['i_pol0']                = 'Tamamen Açık Wiki (herkes okuyabilir, yazabilir ve dosya yükleyebilir)';
+$lang['i_pol1']                = 'Açık Wiki (herkes okuyabilir, ancak  sadece üye olanlar yazabilir ve dosya yükleyebilir)';
+$lang['i_pol2']                = 'Kapalı Wiki (sadece üye olanlar okuyabilir, yazabilir ve dosya yükleyebilir)';
+$lang['i_retry']               = 'Tekrar Dene';
+$lang['mu_intro']              = 'Burada birden fazla dosyayı bir seferde yükleyebilirsiniz. Sıraya eklemek için Gözat butonuna tıklayın. Bitince yükleye tıklayın';
+$lang['mu_gridname']           = 'Dosya Adı';
+$lang['mu_gridsize']           = 'Boyutu';
+$lang['mu_gridstat']           = 'Durumu';
+$lang['mu_namespace']          = 'Namespace';
+$lang['mu_browse']             = 'Gözat';
+$lang['mu_toobig']             = 'çok büyük';
+$lang['mu_ready']              = 'yüklenmeye hazır';
+$lang['mu_done']               = 'tamamlandı';
+$lang['mu_fail']               = 'başarısız';
+$lang['mu_authfail']           = 'oturum zaman aşımına uğradı';
+$lang['mu_progress']           = '@PCT@% yüklendi';
+$lang['mu_filetypes']          = 'İzin verilen Dosya Türleri';
+$lang['recent_global']         = '<b>%s</b> namespace\'i içerisinde yapılan değişiklikleri görüntülemektesiniz. Wiki\'deki tüm değişiklikleri de <a href="%s">bu adresten</a> görebilirsiniz. ';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/locked.txt
new file mode 100644
index 000000000..14385426e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/locked.txt
@@ -0,0 +1,4 @@
+====== Sayfa kilitli ======
+
+Bu sayfa şu anda başka bir kullanıcının değiştirmesi için kilitli. Kilitin süresi geçene veya bu kullanıcı değiştirmeyi bitirene kadar beklemelisiniz.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/login.txt
new file mode 100644
index 000000000..2ce378d00
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/login.txt
@@ -0,0 +1,4 @@
+====== Giriş ======
+
+Şu an giriş yapmış değilsiniz! Giriş yapmak için giriş bilgilerinizi aşağıya yazın. Giriş yapmak için çerezleri açmalısınız.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/mailtext.txt
new file mode 100644
index 000000000..7e8fc8d81
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/mailtext.txt
@@ -0,0 +1,16 @@
+DokuWikinizde bir sayfa eklendi veya değişti. Detaylar şunlar:
+
+Tarih            : @DATE@
+Tarayıcı         : @BROWSER@
+IP-Adresi        : @IPADDRESS@
+Sunucu adı       : @HOSTNAME@
+Eski Sürüm       : @OLDPAGE@
+Yeni Sürüm       : @NEWPAGE@
+Değiştirme Özeti : @SUMMARY@
+Kullanıcı        : @USER@
+
+@DIFF@
+
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/newpage.txt
new file mode 100644
index 000000000..8a47e6bf3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/newpage.txt
@@ -0,0 +1,4 @@
+====== Bu başlık henüz mevcut değil ======
+
+Henüz mevcut olmayan bir başlığın linkiyle geldiniz. ''bu sayfayı oluştur'' tuşuna tıklayarak sayfayı oluşturabilirsiniz.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/norev.txt
new file mode 100644
index 000000000..e6f97bef2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/norev.txt
@@ -0,0 +1,4 @@
+====== Böyle bir sürüm yok ======
+
+Belirtilen sürüm mevcut değil. Bu dökümanın eski sürümlerinin bir listesine ulaşmak için ''Eski sürümler'' tuşunu kullanın.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/preview.txt
new file mode 100644
index 000000000..71a8a42f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/preview.txt
@@ -0,0 +1,4 @@
+====== Önizleme ======
+
+Bu yazınızın nasıl çıkacağının bir önizlemesi. Unutma: Yazı henüz **kaydedilmedi!**
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/pwconfirm.txt
new file mode 100644
index 000000000..22348bb75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/pwconfirm.txt
@@ -0,0 +1,13 @@
+Merhaba @FULLNAME@!
+
+@DOKUWIKIURL@ adresinde kullanılan @TITLE@ hesabı için parola talebinde bulunuldu.
+
+Eğer böyle bir talebiniz olmadıysa, bu e-postayı görmezden gelebilirsiniz.
+
+Onaylamak istiyorsanız aşağıdaki linke tıklayınız.
+
+@CONFIRM@
+
+-- 
+Bu e-posta aşağıdaki DokuWiki tarafından otomatik olarak oluşturulmuştur.
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/read.txt
new file mode 100644
index 000000000..59314f152
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/read.txt
@@ -0,0 +1,2 @@
+Bu sayfa salt okunur. Kaynağı görebilirsiniz ama değiştiremezsiniz. Bunun yanlış olduğunu düşünüyorsanız yöneticiye danışın.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/recent.txt
new file mode 100644
index 000000000..99efc8fb1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/recent.txt
@@ -0,0 +1,5 @@
+====== Son değişiklikler ======
+
+Aşağıdaki sayfalar yakın zamanda değiştirildi.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/register.txt
new file mode 100644
index 000000000..b67e4b5c5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/register.txt
@@ -0,0 +1,4 @@
+====== Yeni kullanıcı olarak kaydolun ======
+
+Bu wikide yeni bir hesap açmak için aşağıdaki tüm bilgileri doldurunuz. **Doğru e-posta adresi verdiğinizden** emin olun, yeni parolanız e-postanıza gönderilecek. Giriş adınız geçerli bir [[doku>pagename|sayfa adı]] olmalıdır.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/registermail.txt
new file mode 100644
index 000000000..7754a5671
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/registermail.txt
@@ -0,0 +1,13 @@
+Yeni bir kullanıcı kayıt oldu. Ayrıntıları aşağıda listelenmiştir:
+
+Kullanıcı adı : @NEWUSER@
+İsim : @NEWNAME@
+E-posta : @NEWEMAIL@
+
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Numarası : @IPADDRESS@
+Host : @HOSTNAME@
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/resendpwd.txt
new file mode 100644
index 000000000..1a34396ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Yeni Parola Gönderimi ======
+
+Lütfen bu wikide kullanmış olduğunuz kullanıcı adını aşağıdaki forma yazınız. Onay linki, kayıtlı e-posta adresinize gönderilecektir.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/revisions.txt
new file mode 100644
index 000000000..841fba2b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/revisions.txt
@@ -0,0 +1,4 @@
+====== Eski sürümler ======
+
+Bunlar mevcut dökümanın daha eski sürümleridir. Eski bir sürüme çevirmek için, sürümü aşağıdan seçin, ''Sayfayı değiştir''e tıklayın ve kaydedin.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/searchpage.txt
new file mode 100644
index 000000000..ae6d50c77
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/searchpage.txt
@@ -0,0 +1,5 @@
+====== Arama ======
+
+Aşağıda aramanın sonuçları listelenmiştir. Aradığınız şeyi bulamadıysanız, ''Sayfayı değiştir'' tuşuna tıklayarak girdiğiniz sorgu adıyla yeni bir sayfa oluşturabilirsiniz .
+
+===== Sonuçlar =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/showrev.txt
new file mode 100644
index 000000000..4cf3d2638
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/showrev.txt
@@ -0,0 +1,2 @@
+**Bu, dökümanın eski bir sürümüdür!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/stopwords.txt
new file mode 100644
index 000000000..293067a1c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/stopwords.txt
@@ -0,0 +1,29 @@
+# Bu indeksleyicinin yok saydığı kelimelerin bir listesidir, satır başına bir kelime yazılır
+# Bu dosyayı değiştirirken UNIX satır sonları (tek satır sonu) kullandığınız emin olun
+# 3 karakterden kısa kelimeleri eklenmesine gerek yoktur, bunlar zaten indekslenmez
+# Bu liste http://www.ranks.nl/stopwords/ altındakilerden derlenmiştir
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/subscribermail.txt
new file mode 100644
index 000000000..a37a8cf41
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/subscribermail.txt
@@ -0,0 +1,18 @@
+Merhaba!
+
+
+
+@TITLE@ wikisindeki @PAGE@ sayfası değiştirildi.
+Değişiklikler aşağıdadır:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Bu sayfaya abonelikten çıkmak için
+@DOKUWIKIURL@ adresindeki wikiye gir, ardından
+@NEWPAGE@
+sayfasına git ve 'Sayfa Değişikliklerini Bildirme' butonuna tıkla.
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/updateprofile.txt
new file mode 100644
index 000000000..20b07f949
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Kullanıcı Bilgilerini Güncelleme ======
+
+İstediğiniz kullanıcı bilgilerini değiştirebilirsiniz. Ancak kullanıcı adınızı değiştirmeniz mümkün değildir.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/uploadmail.txt
new file mode 100644
index 000000000..2d75345ba
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/uploadmail.txt
@@ -0,0 +1,13 @@
+Yeni dosya yüklendi. Ayrıntıları aşağıda listelenmiştir:
+
+Dosya : @MEDIA@
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Adresi : @IPADDRESS@
+Host : @HOSTNAME@
+Boyut : @SIZE@
+MIME Type : @MIME@
+Kullanıcı : @USER@
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/wordblock.txt
new file mode 100644
index 000000000..506cbc793
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/tr/wordblock.txt
@@ -0,0 +1,4 @@
+====== SPAM bloke edildi ======
+
+Değişiklikleriniz **kaydedilmedi**, çünkü değişikliklerinizde bir veya daha fazla engellenen kelime var. Eğer Wikiyi spamlamaya çalışıyorsan -- Oh olsun! Eğer bunun bir hata olduğunu düşünüyorsanız, bu Wiki yöneticisiyle iletişime geçin.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/admin.txt
new file mode 100644
index 000000000..f698d937e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/admin.txt
@@ -0,0 +1,4 @@
+====== Адміністрування ======
+
+Нижче ви можете знайти перелік адміністративних задач, що наявні в ДокуВікі.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/adminplugins.txt
new file mode 100644
index 000000000..3689ccd00
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/adminplugins.txt
@@ -0,0 +1 @@
+===== Додаткові плагіни =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/backlinks.txt
new file mode 100644
index 000000000..5f293e56f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/backlinks.txt
@@ -0,0 +1,3 @@
+====== Зворотні зв'язки ======
+
+Це перелік сторінок, які, здається, посилаються на поточну сторінку.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/conflict.txt
new file mode 100644
index 000000000..5a8930721
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/conflict.txt
@@ -0,0 +1,8 @@
+====== Існує більш нова версія ======
+
+Існує новіша версія документу, що ви редагували. Це може статися, коли інший користувач змінив документ під час вашого редагування.
+
+Уважно перегляньте розбіжності та вирішіть, яку версію залишити. Якщо ви натиснете
+''зберегти'', буде збережена ваша версія. Якщо натиснете ''скасувати'' --- то залишиться
+поточна версія.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/denied.txt
new file mode 100644
index 000000000..5db12e1bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/denied.txt
@@ -0,0 +1,4 @@
+====== Доступ заборонено ======
+
+Вибачте, але у вас не вистачає прав для продовження. Можливо ви забули увійти в систему?
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/diff.txt
new file mode 100644
index 000000000..cfdf9a887
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/diff.txt
@@ -0,0 +1,4 @@
+====== Розбіжності ======
+
+Тут показані розбіжності між вибраною ревізією та поточною версією сторінки.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/draft.txt
new file mode 100644
index 000000000..f6acca8ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/draft.txt
@@ -0,0 +1,6 @@
+====== Знайдено чернетку ======
+
+Останнє редагування цієї сторінки не було завершено коректно. ДокуВікі автоматично зберегла чернетку під час вашої роботи. Ви можете використати чернетку для продовження редагування. Нижче ви можете побачити дані, збережені з попереднього сеансу.
+
+Будь ласка вирішить, чи ви бажаєте //відновити// останній сеанс редагування, //знищити// збережену чернетку або //скасувати// редагування.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/edit.txt
new file mode 100644
index 000000000..82dbc1a50
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/edit.txt
@@ -0,0 +1 @@
+Відредагуйте сторінку та натисніть ''Зберегти''. Використовуйте [[wiki:syntax|посібник]] з синтаксису для довідки. Будь ласка, змінюйте сторінку лише у тому випадку, коли ви можете **покращити** її. Якщо ви бажаєте щось спробувати, використовуйте спеціальну сторінку [[playground:playground]]
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/editrev.txt
new file mode 100644
index 000000000..aae86fa50
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/editrev.txt
@@ -0,0 +1,2 @@
+**Ви завантажили стару версію документу!** Якщо ви збережете її, ви створите нову версію з ціми даними.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/index.txt
new file mode 100644
index 000000000..0ba0d185b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/index.txt
@@ -0,0 +1,4 @@
+====== Зміст ======
+
+Це перелік усіх доступних сторінок, упоряджених за [[doku>namespaces|просторами імен]]
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/install.html
new file mode 100644
index 000000000..084da8662
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/install.html
@@ -0,0 +1,21 @@
+<p>Ця сторінка допомагає при першій установці та настройці <a href="http://dokuwiki.org">ДокуВікі</a>. 
+Більше інформації про програму установки можна знайти на <a href="http://dokuwiki.org/installer">сторінці документації</a>.</p>
+
+<p>ДокуВікі використовую звичайні файли для зберігання сторінок вікі та іншої інформації,
+щодо цих сторінок (наприклад, зображень, індексів пошуку, старих ревізій та ін.). Для
+успішного функціонування ДокуВікі <strong>має</strong> мати права на запис для папок, що
+містять ці файли. Ця програма установки не може змінювати права доступу. Звичайно це 
+робиться за допомогою інтерпретатора shell, або, якщо ви використовуєте хостинг,
+за допомогою FTP або панелі управління хостингом (наприклад cPanel).</p>
+
+<p>Ця програма установки налаштує вашу ДокуВікі для використання 
+<acronym title="список контролю доступу">ACL</acronym>, що, в свою чергу, 
+дозволить адміністратору входити до адміністративного меню для установки доданків,
+керування користувачами, керування правами доступу до сторінок Вікі та змін параметрів
+конфігурації. Це не є обов'язковим для роботи ДокуВікі, але зробить життя адміністратора
+значно легшим.</p>
+
+<p>Досвідчені користувачі, або користувачі, що мають особливі вимоги до налагодження, мають 
+використовувати ці посилання для детальної інформації, щодо
+<a href="http://dokuwiki.org/install">інструкцій з установки</a>
+та <a href="http://dokuwiki.org/config">параметрів конфігурації</a>.</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/lang.php
new file mode 100644
index 000000000..5f94d9b47
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/lang.php
@@ -0,0 +1,244 @@
+<?php
+/**
+ * ukrainian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Oleksiy Voronin <ovoronin@gmail.com>
+ * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia <okunia@gmail.com>
+ * @author Uko uko@uar.net
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Редагувати';
+$lang['btn_source']            = 'Показати вихідний текст';
+$lang['btn_show']              = 'Показати сторінку';
+$lang['btn_create']            = 'Створити сторінку';
+$lang['btn_search']            = 'Пошук';
+$lang['btn_save']              = 'Зберегти';
+$lang['btn_preview']           = 'Перегляд';
+$lang['btn_top']               = 'Повернутися наверх';
+$lang['btn_newer']             = '<< більш нові';
+$lang['btn_older']             = 'більш старі >>';
+$lang['btn_revs']              = 'Старі ревізії';
+$lang['btn_recent']            = 'Недавні зміни';
+$lang['btn_upload']            = 'Завантажити';
+$lang['btn_cancel']            = 'Скасувати';
+$lang['btn_index']             = 'Зміст';
+$lang['btn_secedit']           = 'Редагувати';
+$lang['btn_login']             = 'Увійти';
+$lang['btn_logout']            = 'Вийти';
+$lang['btn_admin']             = 'Керування';
+$lang['btn_update']            = 'Оновити';
+$lang['btn_delete']            = 'Знищити';
+$lang['btn_back']              = 'Назад';
+$lang['btn_backlink']          = 'Посилання сюди';
+$lang['btn_backtomedia']       = 'Назад до вибору медіа-файлу';
+$lang['btn_subscribe']         = 'Підписатися';
+$lang['btn_unsubscribe']       = 'Відписатися';
+$lang['btn_subscribens']       = 'Підписатися на зміни в просторі імен';
+$lang['btn_unsubscribens']     = 'Відписатися від змін простору імен';
+$lang['btn_profile']           = 'Оновити профіль';
+$lang['btn_reset']             = 'Очисти';
+$lang['btn_resendpwd']         = 'Надіслати новий пароль';
+$lang['btn_draft']             = 'Редагувати чернетку';
+$lang['btn_recover']           = 'Відновити чернетку';
+$lang['btn_draftdel']          = 'Знищити чернетку';
+$lang['btn_revert']            = 'Відновити';
+$lang['loggedinas']            = 'Ви';
+$lang['user']                  = 'Користувач';
+$lang['pass']                  = 'Пароль';
+$lang['newpass']               = 'Новий пароль';
+$lang['oldpass']               = 'Поточний пароль';
+$lang['passchk']               = 'ще раз';
+$lang['remember']              = 'Запам\'ятати мене';
+$lang['fullname']              = 'Повне ім\'я';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = 'Реєстрація';
+$lang['profile']               = 'Профіль користувача';
+$lang['badlogin']              = 'Вибачте, невірне ім\'я чи пароль.';
+$lang['minoredit']             = 'Незначні зміни';
+$lang['draftdate']             = 'Чернетка збережена';
+$lang['nosecedit']             = 'Сторінку змінено, дані розділу застарілі. Завантажено сторінку повністю.';
+$lang['regmissing']            = 'Необхідно заповнити всі поля.';
+$lang['reguexists']            = 'Користувач з таким іменем вже існує.';
+$lang['regsuccess']            = 'Користувача створено. Пароль відправлено на e-mail.';
+$lang['regsuccess2']           = 'Користувача створено.';
+$lang['regmailfail']           = 'При відправленні пароля сталась помилка. Зв’яжіться з адміністратором!';
+$lang['regbadmail']            = 'Схоже, що адреса e-mail невірна - якщо ви вважаєте, що це помилка, зв’яжіться з адміністратором';
+$lang['regbadpass']            = 'Надані паролі не співпадають, спробуйте ще раз.';
+$lang['regpwmail']             = 'Пароль ДокуВікі';
+$lang['reghere']               = 'Ще не маєте облікового запису? Отримайте його негайно';
+$lang['profna']                = 'Ця Вікі не підтримує зміни профілю';
+$lang['profnochange']          = 'Немає змін, немає що робити.';
+$lang['profnoempty']           = 'Ім’я або e-mail не можуть бути пустими.';
+$lang['profchanged']           = 'Профіль успішно змінено.';
+$lang['pwdforget']             = 'Забули пароль? Отримайте новий';
+$lang['resendna']              = 'Ця Вікі не підтримує повторне відправлення пароля.';
+$lang['resendpwd']             = 'Надіслати пароль для';
+$lang['resendpwdmissing']      = 'Необхідно заповнити усі поля.';
+$lang['resendpwdnouser']       = 'Такий користувач не існує.';
+$lang['resendpwdbadauth']      = 'Код автентифікації невірний. Перевірте, чи ви використали повне посилання для підтвердження.';
+$lang['resendpwdconfirm']      = 'Посилання для підтвердження відіслано на e-mail.';
+$lang['resendpwdsuccess']      = 'Новий пароль відіслано на e-mail.';
+$lang['license']               = 'Якщо не вказано інше, вміст цієї Вікі підпадає під дію такої ліцензії:';
+$lang['licenseok']             = 'Примітка. Редагуючи ці сторінку, ви погоджуєтесь на розповсюдження інформації за такою ліцензією:';
+$lang['searchmedia']           = 'Пошук файлу:';
+$lang['searchmedia_in']        = 'Шукати у %s';
+$lang['txt_upload']            = 'Виберіть файл для завантаження';
+$lang['txt_filename']          = 'Завантажити як (не обов\'язкове)';
+$lang['txt_overwrt']           = 'Перезаписати існуючий файл';
+$lang['lockedby']              = 'Заблоковано';
+$lang['lockexpire']            = 'Блокування завершується в';
+$lang['willexpire']            = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
+$lang['notsavedyet']           = 'Незбережені зміни будуть втрачені.\n Дійсно продовжити?';
+$lang['rssfailed']             = 'Виникла помилка під час отримання RSS-стрічки: ';
+$lang['nothingfound']          = 'Нічого не знайдено.';
+$lang['mediaselect']           = 'Вибір медіа-файлу';
+$lang['fileupload']            = 'Завантаження медіа-файлу';
+$lang['uploadsucc']            = 'Завантаження пройшло успішно';
+$lang['uploadfail']            = 'Помилка при завантаженні. Можливо неправильні права?';
+$lang['uploadwrong']           = 'Завантаження заборонено. Таке розширення файлу не дозволяється!';
+$lang['uploadexist']           = 'Файл вже існує. Нічого не зроблено.';
+$lang['uploadbadcontent']      = 'Завантажений вміст не відповідає розширенню %s.';
+$lang['uploadspam']            = 'Завантаження заблоковано спам-фільтром.';
+$lang['uploadxss']             = 'Завантаження заблоковано через можливість злонаміреного вмісту.';
+$lang['uploadsize']            = 'Завантажений файл надто великий (максимум %s).';
+$lang['deletesucc']            = 'Файл "%s" знищено.';
+$lang['deletefail']            = 'Неможливо знищити "%s" - перевірте права доступу.';
+$lang['mediainuse']            = '"%s" не знищено - файл використовується.';
+$lang['namespaces']            = 'Простори імен';
+$lang['mediafiles']            = 'Доступні файли';
+$lang['js']['searchmedia']     = 'Шукати файли';
+$lang['js']['keepopen']        = 'Тримати вікно відкритим під час вибору';
+$lang['js']['hidedetails']     = 'Сховати деталі';
+$lang['js']['nosmblinks']      = 'Посилання на мережеві папки працює лише в Internet Explorer.
+Ви можете скопіювати посилання і відкрити його за допомогою Internet Explorer.';
+$lang['js']['linkwiz']         = 'Чарівник посилань';
+$lang['js']['linkto']          = 'Посилання на:';
+$lang['js']['del_confirm']     = 'Дійсно знищити обрані елементи?';
+$lang['js']['mu_btn']          = 'Завантажити одночасно кілька файлів';
+$lang['mediausage']            = 'Для посилання на цей файл використовуйте такий синтаксис:';
+$lang['mediaview']             = 'Переглянути початковий файл';
+$lang['mediaroot']             = 'корінь';
+$lang['mediaupload']           = 'Завантаження файлу у поточний простір імен. Щоб створити простори імен, додайте їх в початок імені файлу та розділіть двокрапками.';
+$lang['mediaextchange']        = 'Розширення файлу змінено з .%s на .%s!';
+$lang['reference']             = 'Посилання для';
+$lang['ref_inuse']             = 'Цей файл не може бути знищено, оскільки він використовується такими сторінками:';
+$lang['ref_hidden']            = 'Деякі посилання існують на сторінках, для читання яких у вас немає прав.';
+$lang['hits']                  = 'Збіги';
+$lang['quickhits']             = 'Збіги у назвах сторінок';
+$lang['toc']                   = 'Зміст';
+$lang['current']               = 'поточний';
+$lang['yours']                 = 'Ваша версія';
+$lang['diff']                  = 'показати відмінності від поточної версії';
+$lang['diff2']                 = 'Показати відмінності між вибраними версіями';
+$lang['line']                  = 'Рядок';
+$lang['breadcrumb']            = 'Відвідано';
+$lang['youarehere']            = 'Ви тут';
+$lang['lastmod']               = 'В останнє змінено';
+$lang['by']                    = ' ';
+$lang['deleted']               = 'знищено';
+$lang['created']               = 'створено';
+$lang['restored']              = 'відновлено стару ревізію';
+$lang['external_edit']         = 'зовнішнє редагування';
+$lang['summary']               = 'Підсумок змін';
+$lang['noflash']               = 'Для перегляду цієї сторінки необхідно встановити <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>.';
+$lang['download']              = 'Завантажити фрагмент';
+$lang['mail_newpage']          = 'сторінку додано:';
+$lang['mail_changed']          = 'сторінку змінено:';
+$lang['mail_new_user']         = 'новий користувач:';
+$lang['mail_upload']           = 'завантажено файл:';
+$lang['qb_bold']               = 'Напівжирний текст';
+$lang['qb_italic']             = 'Курсив';
+$lang['qb_underl']             = 'Підкреслений текст';
+$lang['qb_code']               = 'Текст коду';
+$lang['qb_strike']             = 'Закреслений текст';
+$lang['qb_h1']                 = 'Заголовок 1-го рівня';
+$lang['qb_h2']                 = 'Заголовок 2-го рівня';
+$lang['qb_h3']                 = 'Заголовок 3-го рівня';
+$lang['qb_h4']                 = 'Заголовок 4-го рівня';
+$lang['qb_h5']                 = 'Заголовок 5-го рівня';
+$lang['qb_h']                  = 'Заголовок';
+$lang['qb_hs']                 = 'Вибрати заголовок';
+$lang['qb_hplus']              = 'Заголовок вищого рівня';
+$lang['qb_hminus']             = 'Заголовок нищого рівня';
+$lang['qb_hequal']             = 'Заголовок того ж рівня';
+$lang['qb_link']               = 'Внутрішнє посилання';
+$lang['qb_extlink']            = 'Зовнішнє посилання';
+$lang['qb_hr']                 = 'Роздільник';
+$lang['qb_ol']                 = 'Елемент нумерованого списку';
+$lang['qb_ul']                 = 'Елемент ненумерованого списку';
+$lang['qb_media']              = 'Додати зображень та інші файли';
+$lang['qb_sig']                = 'Додати підпис';
+$lang['qb_smileys']            = 'Посмішки';
+$lang['qb_chars']              = 'Спеціальні символи';
+$lang['upperns']               = 'Перейти до батьківського простору імен';
+$lang['admin_register']        = 'Додати нового користувача';
+$lang['metaedit']              = 'Редагувати метадані';
+$lang['metasaveerr']           = 'Помилка запису метаданих';
+$lang['metasaveok']            = 'Метадані збережено';
+$lang['img_backto']            = 'Повернутися до';
+$lang['img_title']             = 'Назва';
+$lang['img_caption']           = 'Підпис';
+$lang['img_date']              = 'Дата';
+$lang['img_fname']             = 'Ім’я файлу';
+$lang['img_fsize']             = 'Розмір';
+$lang['img_artist']            = 'Фотограф';
+$lang['img_copyr']             = 'Авторські права';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Камера';
+$lang['img_keywords']          = 'Ключові слова';
+$lang['subscribe_success']     = '%s доданий(на) до списку розсилки для сторінки %s';
+$lang['subscribe_error']       = 'Помилка при доданні %s до списку розсилки для сторінки %s';
+$lang['subscribe_noaddress']   = 'У вашому профілі немає адреси e-mail, ви не можете користуватися списками розсилки';
+$lang['unsubscribe_success']   = '%s вилучено зі списку розсилки для сторінки %s';
+$lang['unsubscribe_error']     = 'Помилка при вилученні %s зі списку розсилки для %s';
+$lang['authmodfailed']         = 'Неправильна настройка автентифікації користувача. Будь ласка, повідомте про це адміністратора.';
+$lang['authtempfail']          = 'Автентифікація користувача тимчасово не доступна. Якщо це буде продовжуватись, будь ласка, повідомте адміністратора.';
+$lang['i_chooselang']          = 'Виберіть мову';
+$lang['i_installer']           = 'Програма установки ДокуВікі';
+$lang['i_wikiname']            = 'Назва Вікі';
+$lang['i_enableacl']           = 'Дозволити використання ACL (рекомендовано)';
+$lang['i_superuser']           = 'Суперкористувач';
+$lang['i_problems']            = 'Програма установки знайшла декілька проблем, що вказані нижче. Ви не можете продовжити, поки не виправите їх';
+$lang['i_modified']            = 'З причин безпеки цей скрипт буде працювати тільки з новою та немодифікованою установкою ДокуВікі.
+Вам слід або ще раз розпакувати файли із завантаженого пакету, або звернутися до повної <a href="http://dokuwiki.org/install">інструкції з установки ДокуВікі</a>';
+$lang['i_funcna']              = 'Функція PHP <code>%s</code> не доступна. Можливо, хостинг-провайдер відключив її з якихось причин?';
+$lang['i_phpver']              = 'Версія PHP <code>%s</code> менша, ніж необхідно - <code>%s</code>. Необхідно оновити PHP.';
+$lang['i_permfail']            = 'ДокуВікі не має прав на запис <code>%s</code>. Необхідно змінити права доступа для цієї папки!';
+$lang['i_confexists']          = '<code>%s</code> вже існує';
+$lang['i_writeerr']            = 'Неможливо створити <code>%s</code>. Необхідно перевірити права доступа для файлу/папки та створити файл вручну.';
+$lang['i_badhash']             = 'Невпізнаний або модифікований dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - невірне або пусте значення.';
+$lang['i_success']             = 'Настройку завершено. Ми можете знищити файл install.php.
+Перейдіть до <a href="doku.php">вашої нової ДокуВікі</a>';
+$lang['i_failure']             = 'При збереженні файлу конфігурації виникли помилки. Можливо вам доведеться виправити їх самостійно
+до початку використання <a href="doku.php">вашої нової ДокуВікі</a>.';
+$lang['i_policy']              = 'Початкова політика ACL';
+$lang['i_pol0']                = 'Відкрита Вікі (читання, запис та завантаження файлів для всіх)';
+$lang['i_pol1']                = 'Публічна Вікі (читання для всіх, запис та завантаження для зареєстрованих користувачів)';
+$lang['i_pol2']                = 'Закрита Вікі (читання, запис та завантаження тільки для зареєстрованих користувачів)';
+$lang['i_retry']               = 'Повторити';
+$lang['mu_intro']              = 'Тут ви можете завантажити одночасно кілька файлів. Натисніть кнопку "Вибрати", щоб додати файли в чергу. Після закінчення натисніть кнопку "Завантажити"';
+$lang['mu_gridname']           = 'Ім’я файлу';
+$lang['mu_gridsize']           = 'Розмір';
+$lang['mu_gridstat']           = 'Статус';
+$lang['mu_namespace']          = 'Простір імен';
+$lang['mu_browse']             = 'Вибрати';
+$lang['mu_toobig']             = 'надто великий';
+$lang['mu_ready']              = 'готовий до завантаження';
+$lang['mu_done']               = 'закінчено';
+$lang['mu_fail']               = 'невдале';
+$lang['mu_authfail']           = 'закінчено термін дії сесії';
+$lang['mu_progress']           = 'Завантаження @PCT@%';
+$lang['mu_filetypes']          = 'Дозволені типи файлів';
+$lang['mu_info']               = 'Файли завантажено';
+$lang['mu_lasterr']            = 'Остання помилка:';
+$lang['recent_global']         = 'Ви переглядаєте зміни в межах простору імен <b>%s</b>. Також можна <a href="%s">переглянути зміни в межах усієї Вікі</a>.';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/locked.txt
new file mode 100644
index 000000000..367c286bf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/locked.txt
@@ -0,0 +1,3 @@
+====== Сторінку заблоковано ======
+
+Цю сторінку заблоковано іншим користувачем для редагування. Зачекайте, поки цей користувач завершить редагування або закінчиться час блокування.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/login.txt
new file mode 100644
index 000000000..f45f81024
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/login.txt
@@ -0,0 +1,4 @@
+====== Вхід до вікі ======
+
+Ви не ввійшли до системи. Введіть ваші реєстраційні дані для того, щоб увійти. У вашому браузері повинні бути увімкнені файли cookies.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/mailtext.txt
new file mode 100644
index 000000000..5bd25c3c3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/mailtext.txt
@@ -0,0 +1,17 @@
+Сторінка в вашому ДокуВікі була змінена. Деталі нижче:
+
+Дата         : @DATE@
+Оглядач      : @BROWSER@
+Адреса IP    : @IPADDRESS@
+Ім'я вузла   : @HOSTNAME@
+Стара ревізія: @OLDPAGE@
+Нова ревізія : @NEWPAGE@
+Підсумок змін : @SUMMARY@
+Користувач   : @USER@
+
+@DIFF@
+
+
+-- 
+Це повідомлення було створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/newpage.txt
new file mode 100644
index 000000000..39cdecc35
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/newpage.txt
@@ -0,0 +1,4 @@
+====== Сторінка ще не існує ======
+
+Ви прийшли за посиланням на сторінку, що ще не існує. Якщо ваші права дозволяють, ви можете створити цю сторінку натиснувши кнопку ''Створити сторінку''.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/norev.txt
new file mode 100644
index 000000000..3c9295fce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/norev.txt
@@ -0,0 +1,4 @@
+====== Немає такої ревізії ======
+
+Вказана ревізія не існує. Використовуйте кнопку ''Старі ревізії'', щоб отримати перелік ревізій цього документу.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/preview.txt
new file mode 100644
index 000000000..b4174c7a4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/preview.txt
@@ -0,0 +1,4 @@
+====== Попередній перегляд ======
+
+Це попередній перегляд того, як буде виглядати ваш текст. Не забувайте, текст ще **не збережено**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/pwconfirm.txt
new file mode 100644
index 000000000..7a46f536a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/pwconfirm.txt
@@ -0,0 +1,14 @@
+Доброго дня, @FULLNAME@!
+
+Хтось запитав новий пароль для користувача @TITLE@ на @DOKUWIKIURL@
+
+Якщо це були не ви, ігноруйте це повідомлення.
+
+Для підтвердження, що це дійсно ви запитали новий пароль, будь ласка
+перейдіть за наступним посиланням.
+
+@CONFIRM@
+
+-- 
+Це повідомлення створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/read.txt
new file mode 100644
index 000000000..59ea6a1b6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/read.txt
@@ -0,0 +1,2 @@
+Ця сторінка доступна тільки для перегляду. Ви можете продивитися вихідний текст, але не можете змінювати його. Якщо ви вважаєте, що це не вірно, зверніться до адміністратора.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/recent.txt
new file mode 100644
index 000000000..645e3d869
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/recent.txt
@@ -0,0 +1,4 @@
+====== Останні зміни ======
+
+Вказані нижче сторінки було змінено нещодавно.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/register.txt
new file mode 100644
index 000000000..8fffc002e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/register.txt
@@ -0,0 +1,4 @@
+====== Реєстрація нового користувача ======
+
+Введіть необхідну інформацію для того, щоб створити нового користувача у цій Вікі. Переконайтеся. що ви ввели **правильну адресу e-mail** - якщо ви не ввели пароль, то новий пароль буде відіслано на цю адресу. Ім'я користувача повинно бути дозволеною [[doku>pagename|назвою сторінки]] вікі.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/registermail.txt
new file mode 100644
index 000000000..9b55d85bf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/registermail.txt
@@ -0,0 +1,14 @@
+Зареєстровано нового користувача. Перегляньте деталі:
+
+Користувач  : @NEWUSER@
+Повне ім'я  : @NEWNAME@
+E-Mail      : @NEWEMAIL@
+
+Дата        : @DATE@
+Браузер     : @BROWSER@
+Адреса IP   : @IPADDRESS@
+Назва хосту : @HOSTNAME@
+
+-- 
+Це повідомлення створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/resendpwd.txt
new file mode 100644
index 000000000..208efad55
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Надіслати новий пароль ======
+
+Заповніть відомості для того, щоб отримати новий пароль у цій Вікі. Новий пароль буде надіслано на e-mail, що вказано у реєстраційних даних. Ім'я користувача повинно бути дозволеним іменем користувача Вікі.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/revisions.txt
new file mode 100644
index 000000000..646de2a2f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/revisions.txt
@@ -0,0 +1,4 @@
+====== Старі ревізії ======
+
+Це старі версії поточного документа. Для того, щоб повернутися до старої версії, виберіть її, натисніть ''Редагувати'', та збережіть сторінку.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/searchpage.txt
new file mode 100644
index 000000000..971c24814
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/searchpage.txt
@@ -0,0 +1,5 @@
+====== Пошук ======
+
+Дивіться результати пошуку нижче. Якщо ви не знайшли те, що ви шукали, ви можете створити або редагувати сторінку, що має таке ж ім’я, що і пошуковий запит за допомогою відповідної кнопки.
+
+===== Результати =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/showrev.txt
new file mode 100644
index 000000000..2706b35d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/showrev.txt
@@ -0,0 +1,2 @@
+**Це стара версія документу!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/stopwords.txt
new file mode 100644
index 000000000..288ab8e9f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/stopwords.txt
@@ -0,0 +1,3 @@
+# Це список ігнорованих індексатором слів, одне слово в рядку
+# При редагуванні цього файлу переконайтеся, що використовуєте символи переведення рядку, як в UNIX (одиночні)
+# Слова, коротші за 3 символи включати не треба. Вони ігноруються в будь-якому випадку
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/subscribermail.txt
new file mode 100644
index 000000000..8d4dfebb4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/subscribermail.txt
@@ -0,0 +1,22 @@
+Доброго дня!
+
+Сторінка @PAGE@ в вікі @TITLE@ змінилася.
+Перегляньте зміни:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Дата: @DATE@
+Користувач : @USER@
+Підсумок змін: @SUMMARY@
+Стара ревізія: @OLDPAGE@
+Нова ревізця: @NEWPAGE@
+
+Щоб відписатися від цих повідомлень, увійдіть в вікі за адресою
+@DOKUWIKIURL@, відвідайте @NEWPAGE@
+та оберіть 'Відписатися'
+
+-- 
+Це повідомлення створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/updateprofile.txt
new file mode 100644
index 000000000..d043f99a7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Оновити ваш профіль ======
+
+Необхідно заповнити тільки ті поля, які ви бажаєте змінити. Ви не можете змінити ім’я користувача.
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/uploadmail.txt
new file mode 100644
index 000000000..6eb8c93c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/uploadmail.txt
@@ -0,0 +1,14 @@
+На вашу ДокуВікі завантажено файл. Деталі:
+
+Файл : @MEDIA@
+Дата : @DATE@
+Браузер : @BROWSER@
+IP-Адреса : @IPADDRESS@
+Назва вузла : @HOSTNAME@
+Розмір : @SIZE@
+Тип MIME : @MIME@
+Користувач : @USER@
+
+-- 
+Цей лист автоматично створено ДокуВікі на сайті:
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/wordblock.txt
new file mode 100644
index 000000000..869f93a87
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/uk/wordblock.txt
@@ -0,0 +1,4 @@
+====== Заблокований СПАМ ======
+
+Ваші зміни **не були** збережені тому що вони містять одне чи декілька заблокованих слів. Якщо ви намагались додати спам до вікі, то нехай вам буде соромно. Якщо ви вважаєте, що це помилка, зверніться до адміністратора цієї Вікі.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/admin.txt
new file mode 100644
index 000000000..d8ac73e8c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/admin.txt
@@ -0,0 +1,3 @@
+====== Quản lý ======
+
+Sau đây là các mục quản lý trong DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/backlinks.txt
new file mode 100644
index 000000000..231ab5d8c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/backlinks.txt
@@ -0,0 +1,3 @@
+====== Nối về trước ======
+
+Đây là danh sách các trang hình như đã nối vào trang này.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/conflict.txt
new file mode 100644
index 000000000..0df1ddbe4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/conflict.txt
@@ -0,0 +1,5 @@
+====== Có phiên bản mới hơn ======
+
+Trang bạn đang biên soạn có một phiên bản mới hơn. Việc này xảy ra khi một bạn đổi trang ấy khi bạn đang biên soạn trang này.
+
+Xem kỹ những thay đổi dưới đây, rồi quyết định giữ phiên bản nào. Nếu chọn ''bảo lưu'', phiên bản của bạn được giữ lại. Bấm ''huỷ'' để giữ phiên bản kia.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/denied.txt
new file mode 100644
index 000000000..e70ed5d5f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/denied.txt
@@ -0,0 +1,3 @@
+====== Không được phép vào ======
+
+Rất tiếc là bạn không được phép để tiếp tục. Bạn quen đăng nhập hay sao?
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/diff.txt
new file mode 100644
index 000000000..10bfd0f30
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/diff.txt
@@ -0,0 +1,4 @@
+====== Khác biệt ======
+
+Đây là những khác biệt giữa phiên bạn được chọn và phiên bản hiện tại của trang này.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/edit.txt
new file mode 100644
index 000000000..b00316a7c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/edit.txt
@@ -0,0 +1 @@
+Biên soạn trang này và bấm ''Bảo lưu''. Xem [[wiki:syntax]] về cú pháp của Wiki. Xin bạn biên soạn trang này nếu bạn có thể **cải tiến** nó. Nếu bạn muốn thí nghiệm, bạn có thể tập những bước đầu ở [[playground:playground]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/editrev.txt
new file mode 100644
index 000000000..076466c06
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/editrev.txt
@@ -0,0 +1,2 @@
+**Bạn đã nạp một phiên bản cũ của văn kiện!** Nếu bảo lưu, bạn sẽ tạo phiên bản với dữ kiện này.
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/index.txt
new file mode 100644
index 000000000..708d2030d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/index.txt
@@ -0,0 +1,3 @@
+====== Mục lục ======
+
+Đây là mục lục của tất cả các trang, xếp theo thứ tự [[doku>namespaces|namespaces]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/lang.php
new file mode 100644
index 000000000..23f42d69a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/lang.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * vietnamese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     James Do <jdo@myrealbox.com>
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Biên soạn trang này';
+$lang['btn_source'] = 'Xem mã nguồn';
+$lang['btn_show']   = 'Xem trang';
+$lang['btn_create'] = 'Tạo trang này';
+$lang['btn_search'] = 'Tìm';
+$lang['btn_save']   = 'Lưu';
+$lang['btn_preview']= 'Duyệt trước';
+$lang['btn_top']    = 'Trở lên trên';
+$lang['btn_revs']   = 'Các phiên bản cũ';
+$lang['btn_recent'] = 'Thay đổi gần đây';
+$lang['btn_upload'] = 'Tải lên';
+$lang['btn_cancel'] = 'Huỷ bỏ';
+$lang['btn_index']  = 'Mục lục';
+$lang['btn_secedit']= 'Biên soạn';
+$lang['btn_login']  = 'Đăng nhập';
+$lang['btn_logout'] = 'Thoát';
+$lang['btn_admin']  = 'Quản lý';
+$lang['btn_update'] = 'Cập nhật';
+$lang['btn_delete'] = 'Xoá';
+
+$lang['loggedinas'] = 'Username đang dùng';
+$lang['user']       = 'Username';
+$lang['pass']       = 'Password';
+$lang['remember']   = 'Lưu username/password lại';
+$lang['fullname']   = 'Họ và tên';
+$lang['email']      = 'E-Mail';
+$lang['register']   = 'Đăng ký';
+$lang['badlogin']   = 'Username hoặc password không đúng.';
+
+$lang['regmissing'] = 'Bạn cần điền vào tất cả các trường';
+$lang['reguexists'] = 'Bạn khác đã dùng username này rồi.';
+$lang['regsuccess'] = 'Đã tạo username, và đã gởi password.';
+$lang['regmailfail']= 'Không gởi password được. Xin bạn liên hệ với người quản lý.';
+$lang['regbadmail'] = 'Email hình như không đúng. Xin bạn liên hệ với người quản lý.';
+$lang['regpwmail']  = 'Password DokuWiki của bạn là';
+$lang['reghere']    = 'Xin bạn đăng ký username nếu chưa có.';
+
+$lang['txt_upload']   = 'Chọn tệp để tải lên';
+$lang['txt_filename'] = 'Điền wikiname (tuỳ ý)';
+$lang['lockedby']     = 'Đang khoá bởi';
+$lang['lockexpire']   = 'Khoá sẽ hết hạn vào lúc';
+$lang['willexpire']   = 'Khoá của bạn để biên soạn trang này sẽ hết hạn trong vòng 1 phút.\nĐể tránh xung đột, bạn nên bấm nút xem trước để lập lại thời gian khoá';
+
+$lang['notsavedyet'] = 'Hiện có những thay đổi chưa được bảo lưu, và sẽ mất.\nBạn thật sự muốn tiếp tục?';
+$lang['rssfailed']   = 'Rút nguồn này gặp phải lỗi';
+$lang['nothingfound']= 'Không tìm được gì';
+
+$lang['mediaselect'] = 'Chọn tệp media';
+$lang['fileupload']  = 'Tải lên tệp media';
+$lang['uploadsucc']  = 'Tải lên thành công';
+$lang['uploadfail']  = 'Tải lên thất bại. Có thể vì không đủ phép?';
+$lang['uploadwrong'] = 'Tải lên bị từ chối. Cấm tải loại tệp này';
+$lang['namespaces']  = 'Đề tài';
+$lang['mediafiles']  = 'Tệp có sẵn ở';
+
+$lang['hits']       = 'Trùng';
+$lang['quickhits']  = 'Trang trùng hợp';
+$lang['toc']        = 'Nội dung';
+$lang['current']    = 'hiện tại';
+$lang['yours']      = 'Phiên bản hiện tại';
+$lang['diff']       = 'cho xem khác biệt với phiên bản hiện tại';
+$lang['line']       = 'Dòng';
+$lang['breadcrumb'] = 'Trang đã xem';
+$lang['lastmod']    = 'Thời điểm thay đổi';
+$lang['by']         = 'do';
+$lang['deleted']    = 'bị xoá';
+$lang['created']    = 'được tạo ra';
+$lang['restored']   = 'phiên bản cũ đã được khôi phục';
+$lang['summary']    = 'Tóm tắt biên soạn';
+
+$lang['mail_newpage'] = 'Trang được thêm:';
+$lang['mail_changed'] = 'Trang thay đổi:';
+
+$lang['js']['nosmblinks'] = "Nối với các Windows shares chỉ có hiệu lực với Microsoft Internet Explorer.\nBạn vẫn có thể sao và chép các mốc nối.";
+
+$lang['qb_bold']    = 'Chữ đậm';
+$lang['qb_italic']  = 'Chữ nghiêng';
+$lang['qb_underl']  = 'Chữ gạch dưới';
+$lang['qb_code']    = 'Chữ mã nguồn';
+$lang['qb_h1']      = 'Đầu đề cấp 1';
+$lang['qb_h2']      = 'Đầu đề cấp 2';
+$lang['qb_h3']      = 'Đầu đề cấp 3';
+$lang['qb_h4']      = 'Đầu đề cấp 4';
+$lang['qb_h5']      = 'Đầu đề cấp 5';
+$lang['qb_link']    = 'Mốc nối nội tại';
+$lang['qb_extlink'] = 'Mốc nối ra ngoài';
+$lang['qb_hr']      = 'Gạch ngang';
+$lang['qb_ol']      = 'Điểm trong danh sách có thứ tự';
+$lang['qb_ul']      = 'Điểm trong danh sách không đánh số';
+$lang['qb_media']   = 'Thêm ảnh và tệp khác';
+$lang['qb_sig']     = 'Đặt chữ ký';
+
+$lang['js']['del_confirm']= 'Xoá mục này?';
+
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/locked.txt
new file mode 100644
index 000000000..acb0981c5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/locked.txt
@@ -0,0 +1,3 @@
+====== Trang bị khoá ======
+
+Trang này đang bị khoá để một bạn khác biên soạn. Bạn cần đợi cho đến khi nào bạn kia đã biên soạn xong, hoặc khoá hết hạn.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/login.txt
new file mode 100644
index 000000000..4265a79df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/login.txt
@@ -0,0 +1,3 @@
+====== Đăng nhập ======
+
+Hiện bạn chưa đăng nhập! Điền vào những chi tiết chứng minh ở phía dưới. Máy của bạn cần đặt chế độ nhận cookies để đăng nhập.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/mailtext.txt
new file mode 100644
index 000000000..3fcdf5595
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/mailtext.txt
@@ -0,0 +1,16 @@
+Một trang trên DokuWiki của bạn vừa được bổ sung hoặc thay đổi. Sau đây là chi tiết:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/newpage.txt
new file mode 100644
index 000000000..b03bb5224
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/newpage.txt
@@ -0,0 +1,3 @@
+====== Chưa có đề tài này ======
+
+Bạn vừa nối vào một đề tài chưa có. Bạn có tạo đề tài này bằng cách bấm vào nút ''Tạo trang này''.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/norev.txt
new file mode 100644
index 000000000..0fa27d898
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/norev.txt
@@ -0,0 +1,3 @@
+====== Phiên bản chưa có ======
+
+Chưa có phiên bản được chỉ định. Xin bấm nút ''Phiên bản cũ'' để xem danh sách các phiên bản của văn kiện này.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/preview.txt
new file mode 100644
index 000000000..81069a2c4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/preview.txt
@@ -0,0 +1,3 @@
+====== Xem trước ======
+
+Văn kiện của bạn sẽ thể hiện như sau. Nên nhớ: Văn kiện này **chưa được bảo lưu**!
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/read.txt
new file mode 100644
index 000000000..ffeffc7bf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/read.txt
@@ -0,0 +1 @@
+Trang này chỉ được đọc thôi. Bạn có thể xem mã nguồn, nhưng không được thay đổi. Xin bạn hỏi người quản lý nếu không đúng.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/recent.txt
new file mode 100644
index 000000000..fe6628f6e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/recent.txt
@@ -0,0 +1,3 @@
+====== Thay đổi gần đây ======
+
+Những trang sau được thay đổi gần đây.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/register.txt
new file mode 100644
index 000000000..f7d35c84b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/register.txt
@@ -0,0 +1,3 @@
+====== Đăng ký mới ======
+
+Xin điền vào mọi thông tin sau đây để tạo một username mới cho wiki này. Bạn cần cung cấp **e-mail chính xác** - để gởi password mới của bạn đến đấy. Username cần là một [[doku>pagename|pagename]] hợp lệ.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/revisions.txt
new file mode 100644
index 000000000..943e3fff1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/revisions.txt
@@ -0,0 +1,3 @@
+====== Phiên bản cũ ======
+
+Sau đây là các phiên bản cũ của văn kiện này. Để quây về một phiên bản cũ, chọn ở phía dưới, bấm vào ''Biên soạn trang này'' để bảo lưu.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/searchpage.txt
new file mode 100644
index 000000000..821ca9f7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/searchpage.txt
@@ -0,0 +1,5 @@
+====== Tìm ======
+
+Sau đây là kết quả của câu hỏi của bạn. Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể một trang mới, cùng tên câu hỏi của bạn, bằng cách bấm vào nút ''Biên soạn trang này''.
+
+===== Kết quả =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/showrev.txt
new file mode 100644
index 000000000..a146f4ef3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/showrev.txt
@@ -0,0 +1,2 @@
+**Đây là một phiên bản cũ cùa văn kiện!**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/wordblock.txt
new file mode 100644
index 000000000..b219ca141
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/vi/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM bị chận ======
+
+Các thay đổi **không** được bảo lưu vì có một hoặc nhiều từ bị ngăn chận. Nếu muốn spam Wiki này -- ngưng liền! Nếu đây là một sai lầm, liên lạc với người quản lý của Wiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/admin.txt
new file mode 100644
index 000000000..3cc10335d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/admin.txt
@@ -0,0 +1,4 @@
+====== 管理選單 ======
+
+以下為 DokuWiki 的管理設定
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/adminplugins.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/adminplugins.txt
new file mode 100644
index 000000000..fb1999269
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/adminplugins.txt
@@ -0,0 +1 @@
+===== 外加插件 =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/backlinks.txt
new file mode 100644
index 000000000..381a76812
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/backlinks.txt
@@ -0,0 +1,5 @@
+====== 被引用的連結(Backlinks) ======
+
+這裡是有引用、連結到原先頁面的清單。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/conflict.txt
new file mode 100644
index 000000000..e52613dc8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/conflict.txt
@@ -0,0 +1,4 @@
+====== 有一個更新的版本已存在 ======
+
+有一個您所編輯的更新版本已經存在了。\\ 這狀況之所以會發生：乃是因為當您正在編修它的時候，而其他使用者已變更這份文件。\\ 請檢驗以下的差異，然後決定要用哪一份。\\ 若您選擇「''儲存''」，那您的版本就會被存下來了。而「取消」則會保留為現在這版本。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/denied.txt
new file mode 100644
index 000000000..20c512abc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/denied.txt
@@ -0,0 +1,4 @@
+====== 拒絕尚未授權 ======
+
+很抱歉您權限不夠以致無法繼續。或許您忘了先登入您的帳號嗎？
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/diff.txt
new file mode 100644
index 000000000..a064f81ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/diff.txt
@@ -0,0 +1,4 @@
+====== 差異處 ======
+
+這裡會顯示出所選的版次與目前版次的差異處。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/draft.txt
new file mode 100644
index 000000000..81a092be0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/draft.txt
@@ -0,0 +1,5 @@
+====== 發現草稿檔案 ======
+
+您上次編輯此頁面並未正確的完成。DokuWiki在您編輯的時候自動儲存一份草稿使得您可以繼續編輯。以下您可以觀看上次編輯的資料。
+
+請決定你要//復原//您遺失的編輯文件，//刪除//這份草稿，或者//取消//目前的編輯程序。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/edit.txt
new file mode 100644
index 000000000..5be7fbb4e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/edit.txt
@@ -0,0 +1 @@
+提示：編修本頁並按「''儲存''」即可。 不懂 Wiki 語法？沒關係點一下 [[wiki:syntax|中文語法]] 。若您覺得可讓本文品質「**更好**」的話，那就請繼續吧 :) \\ 　　　但若只想練習或測試東西的話，那麼請先多利用 [[playground:playground|新手試煉場]] 來試煉您的身手吧。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/editrev.txt
new file mode 100644
index 000000000..b344e0772
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/editrev.txt
@@ -0,0 +1,2 @@
+**您目前載入的是本份文件的舊版！！** 若存檔的話，那這些資料就會被存成另一份了喔。
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/index.txt
new file mode 100644
index 000000000..961095bff
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/index.txt
@@ -0,0 +1,3 @@
+====== 索引頁 ======
+
+目前您所看到的是用 [[doku>namespaces|namespaces]] 來排序目前所有可用的頁面清單。\\ 請直接按您想要的頁面或者用「顯示頁面」來檢視目前所在頁面
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/install.html
new file mode 100644
index 000000000..879c152b5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/install.html
@@ -0,0 +1,8 @@
+<p>本页面旨在帮助您完成第一次安装和配置 <a href="http://dokuwiki.org">Dokuwiki</a>。关于安装工具的更多信息请参阅其 <a href="http://dokuwiki.org/installer">官方文档页面</a>。</p>
+
+<p>DokuWiki 使用普通的文件保存维基页面和其他与这些页面挂钩的信息（例如：图像，搜索索引，修订记录等）。为了能正常运行，DokuWiki <strong>必须</strong> 拥有针对那些路径和文件的写权限。本安装工具不能用于设置这些权限。对权限的操作通常通过命令行或使用您的网络服务提供商的 FTP 或控制面板（例如 cPanel）进行操作。</p>
+
+<p>本安装工具将设置您的 DokuWiki 配置 <acronym title="访问控制列表">ACL</acronym>，它能让管理员登录并使用“管理”功能来安装插件，管理用户，管理访问权限和其他配置设置。它并不是 DokuWiki 正常运行所必须的，但安装之后它将更方便您的管理。</p>
+
+<p>有经验的用户或有特殊需求的用户请参阅更详细的 <a href="http://dokuwiki.org/install">安装指南</a>
+和 <a href="http://dokuwiki.org/config">配置设置</a>。</p>
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/lang.php
new file mode 100644
index 000000000..f936123f4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/lang.php
@@ -0,0 +1,252 @@
+<?php
+/**
+ * Chinese(Traditional) language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author chinsan <chinsan@mail2000.com.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * @author Cheng-Wei Chien <e.cwchien@gmail.com>
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = '編修本頁';
+$lang['btn_source']            = '顯示頁面來源';
+$lang['btn_show']              = '顯示頁面';
+$lang['btn_create']            = '建立此頁';
+$lang['btn_search']            = '搜尋';
+$lang['btn_save']              = '儲存';
+$lang['btn_preview']           = '預覽';
+$lang['btn_top']               = '回到頁頂';
+$lang['btn_newer']             = '<< 較新';
+$lang['btn_older']             = '較舊 >>';
+$lang['btn_revs']              = '舊版';
+$lang['btn_recent']            = '最近更新';
+$lang['btn_upload']            = '上傳';
+$lang['btn_cancel']            = '取消';
+$lang['btn_index']             = '索引頁';
+$lang['btn_secedit']           = '改這段';
+$lang['btn_login']             = '登入';
+$lang['btn_logout']            = '登出';
+$lang['btn_admin']             = '管理選單';
+$lang['btn_update']            = '更新設定';
+$lang['btn_delete']            = '刪除';
+$lang['btn_back']              = '回上一步';
+$lang['btn_backlink']          = '反向連結';
+$lang['btn_backtomedia']       = '重新選擇圖檔';
+$lang['btn_subscribe']         = '訂閱更動通知';
+$lang['btn_unsubscribe']       = '退訂更動通知';
+$lang['btn_subscribens']       = '訂閱命名空間更改';
+$lang['btn_unsubscribens']     = '退訂命名空間更改';
+$lang['btn_profile']           = '更新個人資料';
+$lang['btn_reset']             = '資料重設';
+$lang['btn_resendpwd']         = '寄新密碼';
+$lang['btn_draft']             = '編輯草稿';
+$lang['btn_recover']           = '復原草稿';
+$lang['btn_draftdel']          = '捨棄草稿';
+$lang['btn_revert']            = '復原';
+$lang['loggedinas']            = '登入為';
+$lang['user']                  = '帳號';
+$lang['pass']                  = '密碼';
+$lang['newpass']               = '新的密碼';
+$lang['oldpass']               = '目前的密碼';
+$lang['passchk']               = '再次打新的密碼';
+$lang['remember']              = '記住帳號密碼';
+$lang['fullname']              = '暱稱';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = '註冊';
+$lang['profile']               = '使用者個人資料';
+$lang['badlogin']              = '很抱歉，您的使用者名稱或密碼可能有錯誤';
+$lang['minoredit']             = '次要性的修改';
+$lang['draftdate']             = '草稿自動存檔於';
+$lang['nosecedit']             = '此頁面已經同時被修改，部份過時的資料取代了全頁。';
+$lang['regmissing']            = '很抱歉，所有的欄位都要填哦';
+$lang['reguexists']            = '很抱歉，已有人註冊該帳號了喔';
+$lang['regsuccess']            = '使用者已建立，密碼已經用 email 寄到您信箱了唷。';
+$lang['regsuccess2']           = '使用者已建立';
+$lang['regmailfail']           = '寄出密碼信似乎發生錯誤，請跟管理者聯絡！';
+$lang['regbadmail']            = '您輸入的 email 似乎不對，如果您認為是正確的，請與管理者聯絡。';
+$lang['regbadpass']            = '兩次打的密碼不一致，請再重試，謝謝。';
+$lang['regpwmail']             = '您的 DokuWiki 帳號密碼';
+$lang['reghere']               = '您還沒有帳號對吧？來註冊一個吧。';
+$lang['profna']                = '本 wiki 不開放修改個人資料';
+$lang['profnochange']          = '未做任何變更';
+$lang['profnoempty']           = '帳號或 email 地址不可以沒有寫喔！';
+$lang['profchanged']           = '個人資料已成功更新囉。';
+$lang['pwdforget']             = '忘記密碼嗎？寄新密碼！';
+$lang['resendna']              = '本 wiki 不開放重寄新密碼';
+$lang['resendpwd']             = '寄新密碼給';
+$lang['resendpwdmissing']      = '很抱歉，您必須全填這些資料才可以';
+$lang['resendpwdnouser']       = '很抱歉，資料庫內查無此人';
+$lang['resendpwdbadauth']      = '對不起，該認証碼錯誤。請使用完整的確認鏈接。';
+$lang['resendpwdconfirm']      = '確認鏈接已經通過郵件發送給您了。';
+$lang['resendpwdsuccess']      = '新密碼函已經以 email 寄出了。';
+$lang['license']               = '如未特別註明，此 wiki 上得內容都是根據以下的授權方式：';
+$lang['licenseok']             = '注意：編輯此頁面表示你已同意以下的授權方式：';
+$lang['searchmedia']           = '搜尋檔名：';
+$lang['searchmedia_in']        = '在 %s 裡搜尋';
+$lang['txt_upload']            = '請選擇要上傳的檔案';
+$lang['txt_filename']          = '請輸入要存在 wiki 內的檔案名稱 (非必要)';
+$lang['txt_overwrt']           = '是否要覆蓋原有檔案';
+$lang['lockedby']              = '目前已被下列人員鎖定';
+$lang['lockexpire']            = '預計解除鎖定於';
+$lang['willexpire']            = '您目前編輯這頁的鎖定將會在一分鐘內解除。\若要避免發生意外，請按「預覽」鍵來重新設定鎖定狀態';
+$lang['notsavedyet']           = '有尚未儲存的變更將會遺失。\n真的要繼續嗎？';
+$lang['rssfailed']             = '當抓取餵送過來的 RSS 資料時發生錯誤: ';
+$lang['nothingfound']          = '沒找到任何結果。';
+$lang['mediaselect']           = '選擇圖檔';
+$lang['fileupload']            = '上傳圖檔';
+$lang['uploadsucc']            = '上傳成功';
+$lang['uploadfail']            = '上傳失敗。或許權限設定錯誤了嗎？';
+$lang['uploadwrong']           = '拒絕上傳。該檔案類型不被支援。';
+$lang['uploadexist']           = '該檔案已有存在了喔，故取消上傳動作。';
+$lang['uploadbadcontent']      = '上傳檔案的內容不符合 %s 檔的副檔名';
+$lang['uploadspam']            = '被SPAM黑名單限制上傳';
+$lang['uploadxss']             = '因為可能惡意的內容被限制上傳';
+$lang['uploadsize']            = '上傳的檔案尺寸過大(最大：%s)';
+$lang['deletesucc']            = '"%s" 檔已刪除完畢。';
+$lang['deletefail']            = '"%s" 檔無法刪除，請先檢查權限設定。';
+$lang['mediainuse']            = '"%s" 檔因還在使用中，故目前尚無法刪除。';
+$lang['namespaces']            = '命名空間';
+$lang['mediafiles']            = '可用的檔案有';
+$lang['js']['searchmedia']     = '搜尋檔案';
+$lang['js']['keepopen']        = '於選擇時保持視窗開啟';
+$lang['js']['hidedetails']     = '隱藏詳細內容';
+$lang['js']['nosmblinks']      = '只有在 Microsoft IE 下才能執行「連結到 Windows shares」。
+不過您仍可拷貝、複製這連結';
+$lang['js']['linkwiz']         = '建立連結精靈';
+$lang['js']['linkto']          = '連至：';
+$lang['js']['del_confirm']     = '確定要刪除該管理規則?';
+$lang['js']['mu_btn']          = '上傳多個檔案';
+$lang['mediausage']            = '使用以下的語法來連結此檔案:';
+$lang['mediaview']             = '檢視原始檔案';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = '上傳文件至當前的命名空間。要創建次級命名空間，將其名稱加在“上傳並重命名為”文件名的前面，並用英文冒號隔開';
+$lang['mediaextchange']        = '檔案類型已由 .%s 變更為 .%s 囉!';
+$lang['reference']             = '引用到本頁的，合計有';
+$lang['ref_inuse']             = '這檔還不能刪除，因為還有以下的頁面在使用它：';
+$lang['ref_hidden']            = '有些引用到這個的頁面，您目前還沒有權限可讀取喔。';
+$lang['hits']                  = '個符合';
+$lang['quickhits']             = '符合的頁面名稱';
+$lang['toc']                   = '本頁目錄';
+$lang['current']               = '目前版本';
+$lang['yours']                 = '您的版本';
+$lang['diff']                  = '顯示跟目前版本的差異';
+$lang['diff2']                 = '顯示與選擇版本的差異';
+$lang['line']                  = '行';
+$lang['breadcrumb']            = '目前的足跡';
+$lang['youarehere']            = '(目前所在位置)';
+$lang['lastmod']               = '上一次變更';
+$lang['by']                    = '來自';
+$lang['deleted']               = '移除';
+$lang['created']               = '建立';
+$lang['restored']              = '已恢復為舊版';
+$lang['external_edit']         = '外部編輯';
+$lang['summary']               = '編輯摘要';
+$lang['noflash']               = '顯示此內容需要<a href="http://www.adobe.com/products/flashplayer/">Adobe Flash Plugin</a>';
+$lang['download']              = '下載程式碼片段';
+$lang['mail_newpage']          = '增加的頁面:';
+$lang['mail_changed']          = '變更的頁面:';
+$lang['mail_new_user']         = '新使用者:';
+$lang['mail_upload']           = '已上傳檔案:';
+$lang['qb_bold']               = '粗體';
+$lang['qb_italic']             = '斜體';
+$lang['qb_underl']             = '底線';
+$lang['qb_code']               = '程式碼';
+$lang['qb_strike']             = '刪除線';
+$lang['qb_h1']                 = 'H1 標題';
+$lang['qb_h2']                 = 'H2 標題';
+$lang['qb_h3']                 = 'H3 標題';
+$lang['qb_h4']                 = 'H4 標題';
+$lang['qb_h5']                 = 'H5 標題';
+$lang['qb_h']                  = '標題';
+$lang['qb_hs']                 = '選擇標題';
+$lang['qb_hplus']              = '較大標題';
+$lang['qb_hminus']             = '較小標題';
+$lang['qb_hequal']             = '同等標題';
+$lang['qb_link']               = 'WIKI內部連結';
+$lang['qb_extlink']            = '連結外部URL';
+$lang['qb_hr']                 = '水平線';
+$lang['qb_ol']                 = '項目表(數字)';
+$lang['qb_ul']                 = '項目表(符號)';
+$lang['qb_media']              = '加入圖片或檔案';
+$lang['qb_sig']                = '插入簽名';
+$lang['qb_smileys']            = '表情符號';
+$lang['qb_chars']              = '特殊字元';
+$lang['upperns']               = '前往父命名空間';
+$lang['admin_register']        = '新增使用者中';
+$lang['metaedit']              = '更改相片資料(EXIF)';
+$lang['metasaveerr']           = '相片資料(EXIF)儲存失敗喔';
+$lang['metasaveok']            = '相片資料已成功儲存';
+$lang['img_backto']            = '回上一頁';
+$lang['img_title']             = '標題';
+$lang['img_caption']           = '照片說明';
+$lang['img_date']              = '日期';
+$lang['img_fname']             = '檔名';
+$lang['img_fsize']             = '大小';
+$lang['img_artist']            = '攝影者';
+$lang['img_copyr']             = '版權';
+$lang['img_format']            = '格式';
+$lang['img_camera']            = '相機';
+$lang['img_keywords']          = '關鍵字';
+$lang['subscribe_success']     = '已將『%s』加入 %s 訂閱清單內';
+$lang['subscribe_error']       = '要把『%s』加入 %s 訂閱清單時，發生錯誤';
+$lang['subscribe_noaddress']   = '您的帳號內並無 Email 資料，因此還無法使用訂閱功能唷。';
+$lang['unsubscribe_success']   = '已將『%s』從 %s 訂閱清單中移除';
+$lang['unsubscribe_error']     = '要把『%s』從 %s 訂閱清單中移除時，發生錯誤';
+$lang['authmodfailed']         = '帳號認證的設定不正確，請通知該 Wiki 管理員。';
+$lang['authtempfail']          = '帳號認證目前暫不提供，若本狀況持續發生的話，請通知該 Wiki 管理員。';
+$lang['i_chooselang']          = '選擇您的語系';
+$lang['i_installer']           = 'DokuWiki 安裝工具';
+$lang['i_wikiname']            = 'Wiki名稱';
+$lang['i_enableacl']           = '使用ACL(建議)';
+$lang['i_superuser']           = '超級用戶';
+$lang['i_problems']            = 'Installer發現一些問題，顯示如下。您將無法繼續直到您修正它們。';
+$lang['i_modified']            = '由於安全上的考慮，該腳本隻能用於全新且做任何改動的 Dokuwiki 安裝包。
+                         您可以重新解壓下載的程序包，或查閱完整的
+                         <a href=\"http://dokuwiki.org/install\">Dokuwiki 安裝指南</a>';
+$lang['i_funcna']              = 'PHP function <code>%s</code> 無法使用. 也許你的主機供應者停用它或是其他原因?';
+$lang['i_phpver']              = '您的 PHP 版本 <code>%s</code> 比所需要的版本 <code>%s</code> 還低. 您需要更新您的PHP.';
+$lang['i_permfail']            = '<code>%s</code> 無法被 DokuWiki 所寫入. 您需要修正該目錄的權限!';
+$lang['i_confexists']          = '<code>%s</code>已經存在';
+$lang['i_writeerr']            = '無法建立 <code>%s</code>. 您必須檢查目錄/檔案的權限並手動建立該檔案.';
+$lang['i_badhash']             = '無法辨識或被變更的dokuwiki.php (hash=<code>%s</code>)';
+$lang['i_badval']              = '<code>%s</code> - 非法或是空的值';
+$lang['i_success']             = '設定已經成功地完成. 您現在可以刪除 install.php 這個檔案. 繼續到
+<a href="doku.php">您的新 DokuWiki</a>.';
+$lang['i_failure']             = '在寫入設定檔時發生了一些錯誤.您必須在使用<a href="doku.php">你的新 Dokuwiki</a> 之前手動修正它們';
+$lang['i_policy']              = '初步的ACL政策';
+$lang['i_pol0']                = '開放的 Wiki (可被任何人讀, 寫, 上傳)';
+$lang['i_pol1']                = '公開的 Wiki (可被任何人讀, 但是只能被註冊的使用者寫與上傳)';
+$lang['i_pol2']                = '封閉的 Wiki (只能被註冊的使用者讀, 寫, 上傳)';
+$lang['i_retry']               = '重試';
+$lang['mu_intro']              = '您可以在這裡一次上傳多個檔案。按下瀏覽按鈕加入檔案，然後按上傳按鈕開始上傳。';
+$lang['mu_gridname']           = '檔案名稱';
+$lang['mu_gridsize']           = '檔案大小';
+$lang['mu_gridstat']           = '狀態';
+$lang['mu_namespace']          = '命名空間';
+$lang['mu_browse']             = '瀏覽';
+$lang['mu_toobig']             = '太大';
+$lang['mu_ready']              = '準備上傳';
+$lang['mu_done']               = '完成';
+$lang['mu_fail']               = '失敗';
+$lang['mu_authfail']           = '作業階段逾時';
+$lang['mu_progress']           = '@PCT@% 已上傳';
+$lang['mu_filetypes']          = '接受的檔案類型';
+$lang['mu_info']               = '檔案已上傳。';
+$lang['mu_lasterr']            = '最新一筆錯誤紀錄：';
+$lang['recent_global']         = '您正在閱讀命名空間： <b>%s</b> 中的變更。您亦可觀看整個 wiki 的<a href="%s">最近更新</a>。';
+$lang['years']                 = '%d 年前';
+$lang['months']                = '%d 個月前';
+$lang['weeks']                 = '%d 週前';
+$lang['days']                  = '%d 天前';
+$lang['hours']                 = '%d 個小時前';
+$lang['minutes']               = '%d 分鐘前';
+$lang['seconds']               = '%s 秒鐘前';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/locked.txt
new file mode 100644
index 000000000..16a06e802
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/locked.txt
@@ -0,0 +1,3 @@
+====== 頁面目前是鎖定狀態中 ======
+
+本頁目前正由其他使用者編修中，您必須先等到他完成或者鎖定狀態自動解除。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/login.txt
new file mode 100644
index 000000000..fda49a199
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/login.txt
@@ -0,0 +1,5 @@
+====== 登入 ======
+
+您尚未登入，請輸入您的使用者名稱跟密碼。 另外，瀏覽器需要打開 cookies 設定以進行登入。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/mailtext.txt
new file mode 100644
index 000000000..f6bb0480e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/mailtext.txt
@@ -0,0 +1,16 @@
+在您的 DokuWiki 有新增、變動過一頁了。以下是細節資料：
+
+日期        : @DATE@
+瀏覽器      : @BROWSER@
+IP-Address  : @IPADDRESS@
+機器名稱    : @HOSTNAME@
+舊版次      : @OLDPAGE@
+新版次      : @NEWPAGE@
+編輯摘要    : @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+這封信是由 @DOKUWIKIURL@ 的 DokuWiki 自動產生
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/newpage.txt
new file mode 100644
index 000000000..bd38f5586
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/newpage.txt
@@ -0,0 +1,3 @@
+====== 目前尚未有該主題喔 ======
+
+您目前到的這主題尚未建立頁面。但也可以用 「''建立此頁''」來建立。 
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/norev.txt
new file mode 100644
index 000000000..e2b6a175b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/norev.txt
@@ -0,0 +1,4 @@
+====== 很抱歉，並無該版次的 ======
+
+該版次的文件並不存在。請用 「''舊版''」 鍵來檢視目前該文件的所有舊版次。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/preview.txt
new file mode 100644
index 000000000..c68f94819
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/preview.txt
@@ -0,0 +1,4 @@
+====== 預覽 ======
+
+以下是預覽該文件的狀態。請記住：**它還沒被儲存喔**!
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/pwconfirm.txt
new file mode 100644
index 000000000..b8ad7e1ed
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/pwconfirm.txt
@@ -0,0 +1,13 @@
+@FULLNAME@ 您好！
+
+有人請求為您在 @DOKUWIKIURL@ 注冊的用戶名 @TITLE@ 發送新密碼
+
+如果您沒有請求發送新密碼，請忽略這封郵件。
+
+為了確認發送新密碼請求的確來自您，請使用下面的鏈接。
+
+@CONFIRM@
+
+-- 
+本郵件由 DokuWiki 自動創建
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/read.txt
new file mode 100644
index 000000000..364f4adea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/read.txt
@@ -0,0 +1,3 @@
+本頁是唯讀的，可以看是怎麼寫的，但不能更動它。如這是誤判，請向管理員詢問。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/recent.txt
new file mode 100644
index 000000000..28314294b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/recent.txt
@@ -0,0 +1,5 @@
+====== 最近更新 ======
+
+以下的頁面是最近才更新的：
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/register.txt
new file mode 100644
index 000000000..1a5ec67e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/register.txt
@@ -0,0 +1,4 @@
+====== 註冊新使用者 ======
+
+請填以下欄位的資料來註冊 wiki 帳號，\\ 還有請確定您有提供一個 **合法的 e-mail 地址** - 也就是您的新密碼會被寄到那。\\ 而登錄的使用者名稱應該是合法的。 [[doku>pagename|pagename]].
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/registermail.txt
new file mode 100644
index 000000000..434f4f877
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/registermail.txt
@@ -0,0 +1,13 @@
+一個新使用者已經註冊. 以下是詳細內容:
+
+帳號 : @NEWUSER@
+全名 : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+日期 : @DATE@
+瀏覽器 : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+這封信是由 @DOKUWIKIURL@ 的 DokuWiki 所產生的
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/resendpwd.txt
new file mode 100644
index 000000000..9250bf4e0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/resendpwd.txt
@@ -0,0 +1,3 @@
+====== 寄送新密碼 ======
+
+請在下面的欄位填上資料，以便重新寄發新的 wiki 密碼到您註冊時所填的 email 地址。 帳號(user name)就是你的 wiki 帳號。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/revisions.txt
new file mode 100644
index 000000000..479705b95
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/revisions.txt
@@ -0,0 +1,3 @@
+====== 舊版 ======
+
+以下是該文件的舊版本。如要恢復成某個舊版次，就點下它，然後按「編修本頁」，並存檔起來就可以了。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/searchpage.txt
new file mode 100644
index 000000000..9f3d8ee94
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/searchpage.txt
@@ -0,0 +1,5 @@
+====== 搜尋精靈 ======
+
+提示：您可以在下列找到您的搜尋結果。若沒找到妳想找的東西，那麼可以在妳查詢之後用「建立此頁」來建立新的頁面哦。
+
+===== 搜尋結果 =====
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/showrev.txt
new file mode 100644
index 000000000..35b6aa59f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/showrev.txt
@@ -0,0 +1,2 @@
+**這是本文件的舊版了喔！**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/stopwords.txt
new file mode 100644
index 000000000..55b67ed16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/stopwords.txt
@@ -0,0 +1,31 @@
+# 這檔是製作索引檔(index)時不要列入的關鍵字，格式為每字(詞)就使用一行。
+# 在修改時，請注意要用 UNIX 格式的換行符號(newline)處理，而非 DOS 的 CR-LR 喔
+# (如果在 MS Windows 環境使用的話，可使用 vim win32版 或 UltraEdit或其他類似編輯器修改)
+#
+# 還有，不必把小於 3 個字元(英數字元)都包括進來。
+# 目前本清單的內容是以 http://www.ranks.nl/stopwords/ 為基礎而發展的。
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/subscribermail.txt
new file mode 100644
index 000000000..3ccb80091
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/subscribermail.txt
@@ -0,0 +1,16 @@
+哈囉，您好!
+
+在 @TITLE@ 的 @PAGE@ 頁面已經有了變更囉，以下是變動幅度紀錄:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+若要取消本頁的變動訂閱通知，請先登入
+@DOKUWIKIURL@  ，然後進入
+@NEWPAGE@
+並選擇 『退訂更動通知』，謝謝 ^_^
+
+-- 
+本信是由 DokuWiki 系統自動產生
+@DOKUWIKIURL@
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/updateprofile.txt
new file mode 100644
index 000000000..f92c215ea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/updateprofile.txt
@@ -0,0 +1,5 @@
+====== 更新個人資料 ======
+
+請注意：只需變更想更新的資料欄位就好，而帳號名稱是不可以變更的。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/uploadmail.txt
new file mode 100644
index 000000000..e7222959b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/uploadmail.txt
@@ -0,0 +1,13 @@
+一個檔案已經被上傳到您的 DokuWiki. 以下是詳細內容:
+
+檔名 : @MEDIA@
+日期 : @DATE@
+瀏覽器 : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+尺寸 : @SIZE@
+MIME Type : @MIME@
+帳號 : @USER@
+
+-- 
+這封信是由 @DOKUWIKIURL@ 的 DokuWiki 所產生的
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/wordblock.txt
new file mode 100644
index 000000000..671e88b87
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh-tw/wordblock.txt
@@ -0,0 +1,4 @@
+====== 拒絕垃圾資料(SPAM blocked) ======
+
+您的變更並**不會**被存起來，因為它包含了一些被限制的字眼。若您還試著要丟垃圾資料到 Wiki 的話， -- Bad dog! 不過，若您認為這是誤判，那麼請與這個 Wiki 的管理員(Admin)談。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/admin.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/admin.txt
new file mode 100644
index 000000000..bf6476e9c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/admin.txt
@@ -0,0 +1,3 @@
+====== 管理 ======
+
+在下面您能找到 DokuWiki 中可用管理任务的列表。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/backlinks.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/backlinks.txt
new file mode 100644
index 000000000..19e3feea6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/backlinks.txt
@@ -0,0 +1,3 @@
+====== 反向链接 ======
+
+这里是能够反向链接到当前页面的其他页面列表。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt
new file mode 100644
index 000000000..92eedf45b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/conflict.txt
@@ -0,0 +1,5 @@
+====== 存在一个更新的版本 ======
+
+您编辑的文档存在一个更新的版本。这种情况的发生是因为在您编辑时有另一个用户更改了该文档。
+
+请仔细检查下面列出的差别，并决定保留哪个版本。如果您选择“保存”，您的版本将被保留。点击“取消”将保留当前版本。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/denied.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/denied.txt
new file mode 100644
index 000000000..276741c40
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/denied.txt
@@ -0,0 +1,3 @@
+====== 拒绝授权 ======
+
+对不起，您没有足够权限，无法继续。也许您忘了登录？
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/diff.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/diff.txt
new file mode 100644
index 000000000..19e8ef752
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/diff.txt
@@ -0,0 +1,3 @@
+====== 差别 ======
+
+这里会显示出您选择的修订版和当前版本之间的差别。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/draft.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/draft.txt
new file mode 100644
index 000000000..615cb07bf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/draft.txt
@@ -0,0 +1,7 @@
+====== 发现草稿 ======
+
+您在本页最后的编辑过程没有正常结束。DokuWiki 在您的编辑过程中自动保存了一份草稿，您现在可以使用它继续编辑。 下面是最后编辑时的数据。
+
+请决定您希望 //恢复// 您丢失的编辑数据，//删除// 自动保存的草稿，或者 //取消// 本编辑过程。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/edit.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/edit.txt
new file mode 100644
index 000000000..846e89817
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/edit.txt
@@ -0,0 +1 @@
+编辑本页后请点击“保存”。请参阅 [[wiki:syntax]] 了解维基语法。只有在您能 **改进** 该页面的前提下才编辑它。如果您想尝试一些东西，请先到 [[playground:playground|playground]] 热身。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/editrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/editrev.txt
new file mode 100644
index 000000000..82013cbbd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/editrev.txt
@@ -0,0 +1,2 @@
+**您载入了该文档旧的修订版！** 如果您保存了它，您就会用这些数据创建一份新的修订版。
+----
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/index.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/index.txt
new file mode 100644
index 000000000..efb07b9e3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/index.txt
@@ -0,0 +1,3 @@
+====== 索引 ======
+
+这是根据 [[doku>namespaces|命名空间]] 排列的所有可访问页面的索引。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/install.html b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/install.html
new file mode 100644
index 000000000..8c7a93c19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/install.html
@@ -0,0 +1,8 @@
+<p>本页面旨在帮助您完成第一次安装和配置 <a href="http://dokuwiki.org">Dokuwiki</a>。关于安装工具的更多信息请参阅其 <a href="http://dokuwiki.org/installer">官方文档页面</a>。</p>
+
+<p>DokuWiki 使用普通的文件保存维基页面和其他与这些页面挂钩的信息（例如：图像，搜索索引，修订记录等）。为了能正常运行，DokuWiki <strong>必须</strong> 拥有针对那些路径和文件的写权限。本安装工具不能用于设置这些权限。对权限的操作通常通过命令行或使用您的网络服务提供商的 FTP 或控制面板（例如 cPanel）进行操作。</p>
+
+<p>本安装工具将设置您的 DokuWiki 配置 <acronym title="访问控制列表">ACL</acronym>，它能让管理员登录并使用“管理”功能来安装插件，管理用户，管理访问权限和其他配置设置。它并不是 DokuWiki 正常运行所必须的，但安装之后它将更方便您的管理。</p>
+
+<p>有经验的用户或有特殊需求的用户请参阅更详细的 <a href="http://dokuwiki.org/install">安装指南</a>
+和 <a href="http://dokuwiki.org/config">配置设置</a>。</p>
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/lang.php b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/lang.php
new file mode 100644
index 000000000..ffb759fde
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/lang.php
@@ -0,0 +1,230 @@
+<?php
+/**
+ * Chinese(Simplified) language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author ZDYX <zhangduyixiong@gmail.com>
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan <simonzhan@21cn.com>
+ * @author mr.jinyi@gmail.com
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = '编辑本页';
+$lang['btn_source']            = '显示源文件';
+$lang['btn_show']              = '显示页面';
+$lang['btn_create']            = '创建该页面';
+$lang['btn_search']            = '搜索';
+$lang['btn_save']              = '保存';
+$lang['btn_preview']           = '预览';
+$lang['btn_top']               = '到顶部';
+$lang['btn_newer']             = '<< 较新的';
+$lang['btn_older']             = '较旧的 >>';
+$lang['btn_revs']              = '修订记录';
+$lang['btn_recent']            = '最近更改';
+$lang['btn_upload']            = '上传';
+$lang['btn_cancel']            = '取消';
+$lang['btn_index']             = '索引';
+$lang['btn_secedit']           = '编辑';
+$lang['btn_login']             = '登录';
+$lang['btn_logout']            = '退出';
+$lang['btn_admin']             = '管理';
+$lang['btn_update']            = '更新';
+$lang['btn_delete']            = '删除';
+$lang['btn_back']              = '返回';
+$lang['btn_backlink']          = '反向链接';
+$lang['btn_backtomedia']       = '返回到媒体文件选择工具';
+$lang['btn_subscribe']         = '订阅本页更改';
+$lang['btn_unsubscribe']       = '退订本页更改';
+$lang['btn_subscribens']       = '订阅命名空间更改';
+$lang['btn_unsubscribens']     = '退订命名空间更改';
+$lang['btn_profile']           = '更新个人信息';
+$lang['btn_reset']             = '重设';
+$lang['btn_resendpwd']         = '发送新密码';
+$lang['btn_draft']             = '编辑草稿';
+$lang['btn_recover']           = '恢复草稿';
+$lang['btn_draftdel']          = '删除草稿';
+$lang['loggedinas']            = '登录为';
+$lang['user']                  = '用户名';
+$lang['pass']                  = '密码';
+$lang['newpass']               = '请输入新密码';
+$lang['oldpass']               = '请输入当前密码';
+$lang['passchk']               = '请再输一次';
+$lang['remember']              = '记住我';
+$lang['fullname']              = '全名';
+$lang['email']                 = 'E-Mail';
+$lang['register']              = '注册';
+$lang['profile']               = '用户信息';
+$lang['badlogin']              = '对不起，用户名或密码错误。';
+$lang['minoredit']             = '轻微修改';
+$lang['draftdate']             = '草稿自动保存于';
+$lang['nosecedit']             = '在您编辑期间本页刚被他人修改过，局部信息已过期，故载入全页。';
+$lang['regmissing']            = '对不起，您必须填写所有的区域。';
+$lang['reguexists']            = '对不起，该用户名已经存在。';
+$lang['regsuccess']            = '新用户已建立，密码将通过电子邮件发送给您。';
+$lang['regsuccess2']           = '新用户已建立';
+$lang['regmailfail']           = '发送密码邮件时产生错误。请联系管理员！';
+$lang['regbadmail']            = '您输入的邮件地址有问题——如果您认为这是系统错误，请联系管理员。';
+$lang['regbadpass']            = '您输入的密码与系统产生的不符，请重试。';
+$lang['regpwmail']             = '您的 DokuWiki 密码';
+$lang['reghere']               = '还没有账号？立即注册';
+$lang['profna']                = '本维基不支持修改个人信息';
+$lang['profnochange']          = '没有改动，不进行操作。';
+$lang['profnoempty']           = '不允许使用空的用户名或邮件地址。';
+$lang['profchanged']           = '用户信息更新成功。';
+$lang['pwdforget']             = '忘记密码？立即获取新密码';
+$lang['resendna']              = '本维基不支持二次发送密码。';
+$lang['resendpwd']             = '发送新密码给';
+$lang['resendpwdmissing']      = '对不起，您必须填写所有的区域。';
+$lang['resendpwdnouser']       = '对不起，在我们的用户数据中找不到该用户。';
+$lang['resendpwdbadauth']      = '对不起，该认证码错误。请使用完整的确认链接。';
+$lang['resendpwdconfirm']      = '确认链接已经通过邮件发送给您了。';
+$lang['resendpwdsuccess']      = '您的新密码已经通过邮件发送给您了。';
+$lang['license']               = '除额外注明的地方外，本维基上的内容按下列许可协议发布：';
+$lang['licenseok']             = '当您选择开始编辑本页，即寓示你同意将你贡献的内容按下列许可协议发布：';
+$lang['txt_upload']            = '选择要上传的文件';
+$lang['txt_filename']          = '上传并重命名为（可选）';
+$lang['txt_overwrt']           = '覆盖已存在的同名文件';
+$lang['lockedby']              = '目前已被下列人员锁定';
+$lang['lockexpire']            = '预计锁定解除于';
+$lang['willexpire']            = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['notsavedyet']           = '未保存的更改将丢失。\n真的要继续？';
+$lang['rssfailed']             = '获取该 RSS 信息时产生错误：';
+$lang['nothingfound']          = '什么都没有找到。';
+$lang['mediaselect']           = '媒体文件';
+$lang['fileupload']            = '上传媒体文件';
+$lang['uploadsucc']            = '上传成功';
+$lang['uploadfail']            = '上传失败。也许是上传权限错误。';
+$lang['uploadwrong']           = '上传失败。该扩展名被禁止。';
+$lang['uploadexist']           = '文件已存在。不进行操作。';
+$lang['uploadbadcontent']      = '上传的文件与扩展名 %s 不符。';
+$lang['uploadspam']            = '上传操作被垃圾信息黑名单阻止。';
+$lang['uploadxss']             = '上传操作因可能存在恶意内容而被阻止。';
+$lang['uploadsize']            = '上传的文件过大。（最大 %s)';
+$lang['deletesucc']            = '文件“%s”已经被删除。';
+$lang['deletefail']            = '无法删除“%s”- 请检查权限。';
+$lang['mediainuse']            = '文件“%s”无法删除 - 它正被使用中。';
+$lang['namespaces']            = '命名空间';
+$lang['mediafiles']            = '可用的文件';
+$lang['js']['keepopen']        = '选中后不自动关闭窗口';
+$lang['js']['hidedetails']     = '隐藏详细信息';
+$lang['js']['nosmblinks']      = '连接到 Windows 共享功能只有在 IE 浏览器中才能正常使用。
+但您仍能复制并粘贴该链接。';
+$lang['js']['mu_btn']          = '一次上传了多个文件';
+$lang['mediausage']            = '使用下列字符链接到该文件：';
+$lang['mediaview']             = '查看该文件';
+$lang['mediaroot']             = '根目录';
+$lang['mediaupload']           = '上传文件至当前的命名空间。要创建次级命名空间，将其名称加在“上传并重命名为”文件名的前面，并用英文冒号隔开';
+$lang['mediaextchange']        = '文件的扩展名由 .%s 改为了 .%s！';
+$lang['reference']             = '相关的';
+$lang['ref_inuse']             = '该文件无法删除，因为它正被下列页面使用：';
+$lang['ref_hidden']            = '一些相关的页面您并没有权限阅读';
+$lang['hits']                  = '符合';
+$lang['quickhits']             = '匹配的页面名称';
+$lang['toc']                   = '目录';
+$lang['current']               = '当前版本';
+$lang['yours']                 = '您的版本';
+$lang['diff']                  = '显示与当前版本的差别';
+$lang['diff2']                 = '显示跟目前版本的差异';
+$lang['line']                  = '行';
+$lang['breadcrumb']            = '您的足迹';
+$lang['youarehere']            = '您在这里';
+$lang['lastmod']               = '最后更改';
+$lang['by']                    = '由';
+$lang['deleted']               = '移除';
+$lang['created']               = '创建';
+$lang['restored']              = '已恢复为旧版';
+$lang['external_edit']         = '外部编辑';
+$lang['summary']               = '编辑摘要';
+$lang['noflash']               = '需要 <a href="http://www.adobe.com/products/flashplayer/">Adobe Flash 插件</a> 来播放本内容。 ';
+$lang['mail_newpage']          = '添加页面：';
+$lang['mail_changed']          = '更改页面：';
+$lang['mail_new_user']         = '新用户：';
+$lang['mail_upload']           = '已上传的文件：';
+$lang['qb_bold']               = '粗体';
+$lang['qb_italic']             = '斜体';
+$lang['qb_underl']             = '下划线';
+$lang['qb_code']               = '代码';
+$lang['qb_strike']             = '删除线';
+$lang['qb_h1']                 = '标题 H1';
+$lang['qb_h2']                 = '标题 H2 ';
+$lang['qb_h3']                 = '标题 H3';
+$lang['qb_h4']                 = '标题 H4';
+$lang['qb_h5']                 = '标题 H5';
+$lang['qb_link']               = '内部链接';
+$lang['qb_extlink']            = '外部链接';
+$lang['qb_hr']                 = '水平线';
+$lang['qb_ol']                 = '数字列表项目';
+$lang['qb_ul']                 = '普通列表项目';
+$lang['qb_media']              = '插入图像或其他文件';
+$lang['qb_sig']                = '插入签名';
+$lang['qb_smileys']            = '表情符号';
+$lang['qb_chars']              = '特殊字符';
+$lang['js']['del_confirm']           = '真的要删除选中的项目吗？';
+$lang['admin_register']        = '添加新用户';
+$lang['metaedit']              = '编辑元数据';
+$lang['metasaveerr']           = '写入元数据失败';
+$lang['metasaveok']            = '元数据已保存';
+$lang['img_backto']            = '返回到';
+$lang['img_title']             = '标题';
+$lang['img_caption']           = '说明';
+$lang['img_date']              = '日期';
+$lang['img_fname']             = '名称';
+$lang['img_fsize']             = '大小';
+$lang['img_artist']            = '摄影师';
+$lang['img_copyr']             = '版权';
+$lang['img_format']            = '格式';
+$lang['img_camera']            = '相机';
+$lang['img_keywords']          = '关键字';
+$lang['subscribe_success']     = '已将 %s 成功添加到 %s 的订阅列表';
+$lang['subscribe_error']       = '无法将 %s 添加到 %s 的订阅列表';
+$lang['subscribe_noaddress']   = '您的登录信息中不包含电子邮件地址，您无法加入订阅列表';
+$lang['unsubscribe_success']   = '已将 %s 从 %s 的订阅列表中成功删除';
+$lang['unsubscribe_error']     = '无法将 %s 从 %s 的订阅列表中删除';
+$lang['authmodfailed']         = '错误的用户认证设置。请通知维基管理员。';
+$lang['authtempfail']          = '用户认证暂时无法使用。如果该状态一直存在，请通知维基管理员。';
+$lang['i_chooselang']          = '选择您的语言';
+$lang['i_installer']           = 'DokuWiki 安装工具';
+$lang['i_wikiname']            = '维基名称';
+$lang['i_enableacl']           = '启用 ACL（推荐）';
+$lang['i_superuser']           = '超级用户';
+$lang['i_problems']            = '安装工具发现一些问题，已在下面列出。您必须先修复这些问题，才能继续安装。';
+$lang['i_modified']            = '由于安全上的考虑，该脚本只能用于全新且做任何改动的 Dokuwiki 安装包。
+                         您可以重新解压下载的程序包，或查阅完整的
+                         <a href="http://dokuwiki.org/install">Dokuwiki 安装指南</a>';
+$lang['i_funcna']              = 'PHP 功能 <code>%s</code> 无法使用。也许您的服务器提供商因为某些原因禁用了它。';
+$lang['i_phpver']              = '您的 PHP 版本 <code>%s</code> 低于最低要求的 <code>%s</code>。您需要升级您的 PHP 版本。';
+$lang['i_permfail']            = 'DokuWiki 无法写入 <code>%s</code>。您需要修改该路径的权限设定！';
+$lang['i_confexists']          = '<code>%s</code> 已经存在';
+$lang['i_writeerr']            = '无法创建 <code>%s</code>。您需要检查该路径/文件的权限设定并手动创建该文件。';
+$lang['i_badhash']             = '无法识别的或被修改的 dokuwiki.php（值=<code>%s</code>）';
+$lang['i_badval']              = '<code>%s</code> - 非法或空值';
+$lang['i_success']             = '配置成功完成。您现在可以删除 install.php 了。继续进入
+                        <a href="doku.php">您全新的 DokuWiki</a>。';
+$lang['i_failure']             = '写入配置文件的时候产生一些错误。在使用 <a href="doku.php">您全新安装的 DokuWiki</a> 前
+                         您需要手动修复它们。';
+$lang['i_policy']              = '初始的 ACL 政策';
+$lang['i_pol0']                = '开放的维基（任何人都有读、写、上传的权限）';
+$lang['i_pol1']                = '公共的维基（任何人都有读的权限，只有注册用户才有写和上传的权限）';
+$lang['i_pol2']                = '关闭的维基（只有注册用户才有读、写、上传的权限）';
+$lang['i_retry']               = '重试';
+$lang['mu_intro']              = '您可以在此一次上传多个文件。点按浏览按钮添加文件到上传队列中，先好后按上传钮。';
+$lang['mu_gridname']           = '文件名';
+$lang['mu_gridsize']           = '大小';
+$lang['mu_gridstat']           = '状态';
+$lang['mu_namespace']          = '名称空间';
+$lang['mu_browse']             = '浏览';
+$lang['mu_toobig']             = '过大';
+$lang['mu_ready']              = '准备好上传';
+$lang['mu_done']               = '完成';
+$lang['mu_fail']               = '失败';
+$lang['mu_authfail']           = '会话过期';
+$lang['mu_progress']           = '@PCT@% 上传完成';
+$lang['mu_filetypes']          = '允许的文件类型';
+$lang['recent_global']         = '您当前看到的是<b>%s</b> 名称空间的变动。你还可以在<a href="%s">查看整个维基的近期变动</a>。';
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/locked.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/locked.txt
new file mode 100644
index 000000000..321e4a047
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/locked.txt
@@ -0,0 +1,3 @@
+====== 页面已锁定 ======
+
+本页面目前正被其他用户编辑。您要等到该用户完成编辑或锁定因过期而自动解除后才能编辑。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/login.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/login.txt
new file mode 100644
index 000000000..8ff8b3846
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/login.txt
@@ -0,0 +1,3 @@
+====== 登录 ======
+
+您尚未登录！请在下方输入您的用户名和密码进行登录。 您的浏览器需要支持 Cookies 才能正常登录。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/mailtext.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/mailtext.txt
new file mode 100644
index 000000000..311acf1b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/mailtext.txt
@@ -0,0 +1,17 @@
+您的 DokuWiki 中有一个页面被添加或更改了。以下是详细资料：
+
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
+修订记录    : @OLDPAGE@
+最新修订    : @NEWPAGE@
+编辑摘要    : @SUMMARY@
+用户        : @USER@
+
+@DIFF@
+
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/newpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/newpage.txt
new file mode 100644
index 000000000..6f96b568d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/newpage.txt
@@ -0,0 +1,3 @@
+====== 该主题尚不存在 ======
+
+您访问的页面并不存在。如果允许，您可以使用“创建该页面”按钮来创建它。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/norev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/norev.txt
new file mode 100644
index 000000000..3fe5aabd8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/norev.txt
@@ -0,0 +1,3 @@
+====== 没有该修订版 ======
+
+您指定的修订版并不存在。请使用“修订记录”按钮查看本页面的修订记录列表。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/preview.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/preview.txt
new file mode 100644
index 000000000..dbb3de675
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/preview.txt
@@ -0,0 +1,3 @@
+====== 预览 ======
+
+这是该文件的效果预览。请记住：它**并没有被保存**！
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/pwconfirm.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/pwconfirm.txt
new file mode 100644
index 000000000..7e48751a6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/pwconfirm.txt
@@ -0,0 +1,15 @@
+@FULLNAME@ 您好！
+
+有人请求为您在 @DOKUWIKIURL@ 注册的用户名 @TITLE@ 发送新密码
+
+如果您没有请求发送新密码，请忽略这封邮件。
+
+为了确认发送新密码请求的确来自您，请使用下面的链接。
+
+@CONFIRM@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/read.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/read.txt
new file mode 100644
index 000000000..eb47765a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/read.txt
@@ -0,0 +1,2 @@
+本页面只读。您可以查看源文件，但不能更改它。如果您觉得这是系统错误，请联系管理员。
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/recent.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/recent.txt
new file mode 100644
index 000000000..95634d037
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/recent.txt
@@ -0,0 +1,5 @@
+====== 最近更新 ======
+
+以下的页面是最近才更新的：
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/register.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/register.txt
new file mode 100644
index 000000000..7410ff1c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/register.txt
@@ -0,0 +1,3 @@
+====== 注册新用户 ======
+
+填写以下资料来创建一个新帐户。请确定您提供的是 **正确的 E-mail 地址** - 如果您没有被要求在这里输入密码，那么新密码将通过您的邮件地址发送给您。 用于登录的用户名必须合法，请参阅 [[doku>pagename|pagename]]。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/registermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/registermail.txt
new file mode 100644
index 000000000..9647b5fad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/registermail.txt
@@ -0,0 +1,16 @@
+新用户已创建。下面是详细信息：
+
+用户名      : @NEWUSER@
+全名        : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/resendpwd.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/resendpwd.txt
new file mode 100644
index 000000000..f98e469e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/resendpwd.txt
@@ -0,0 +1,5 @@
+====== 发送新密码 ======
+
+请在下列区域中输入您的用户名来获取新密码。 一封包含确认链接的邮件将发送给您注册的邮件地址。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/revisions.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/revisions.txt
new file mode 100644
index 000000000..89d2a7857
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/revisions.txt
@@ -0,0 +1,3 @@
+====== 修订记录 ======
+
+以下是当前文档的修订记录。如果要回复到某个旧的修订版，请在下面选择它，并点击“编辑本页”，之后保存即可。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/searchpage.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/searchpage.txt
new file mode 100644
index 000000000..8222e242c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/searchpage.txt
@@ -0,0 +1,5 @@
+====== 搜索 ======
+
+下面将显示您的搜索结果。如果没有找到您想要的东西，您可以使用相应的按钮来创建或编辑该页面。
+
+===== 搜索结果 =====
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/showrev.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/showrev.txt
new file mode 100644
index 000000000..770fecc98
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/showrev.txt
@@ -0,0 +1,2 @@
+**这是本文档旧的修订版！**
+----
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/stopwords.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/stopwords.txt
new file mode 100644
index 000000000..bc6eb48ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/stopwords.txt
@@ -0,0 +1,29 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/subscribermail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/subscribermail.txt
new file mode 100644
index 000000000..1a0a0aa16
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/subscribermail.txt
@@ -0,0 +1,19 @@
+您好！
+
+@TITLE@ 中的 @PAGE@ 页面已更改。
+下面是更改的详细情况：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+要退订本页，请登录维基
+@DOKUWIKIURL@ 然后访问
+@NEWPAGE@
+并选择'退订更改'。
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/updateprofile.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/updateprofile.txt
new file mode 100644
index 000000000..007578801
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/updateprofile.txt
@@ -0,0 +1,5 @@
+====== 更新您帐户的信息 ======
+
+您只需要填写希望更改的区域即可。您不能更改用户名。
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/uploadmail.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/uploadmail.txt
new file mode 100644
index 000000000..b820cee2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/uploadmail.txt
@@ -0,0 +1,20 @@
+您好！
+
+一个文件被上传到您的 DokuWiki 站点。下面是详细信息：
+
+文件名 : @MEDIA@
+日期 : @DATE@
+浏览器 : @BROWSER@
+IP 地址 : @IPADDRESS@
+主机名 : @HOSTNAME@
+大小 : @SIZE@
+MIME 类型 : @MIME@
+用户 : @USER@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/wordblock.txt b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/wordblock.txt
new file mode 100644
index 000000000..72c473a59
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/lang/zh/wordblock.txt
@@ -0,0 +1,3 @@
+====== 拒绝垃圾资料 ======
+
+您的更改 **并没有** 保存，因为它包含了一个或多个被限制的字眼。如果您尝试为本维基添加垃圾信息 -- 你是一个大坏蛋！如果您认为这是一个系统错误，请联系本维基的管理员。
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/mail.php b/mod/dokuwiki/vendors/dokuwiki/inc/mail.php
new file mode 100644
index 000000000..3b0592b8b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/mail.php
@@ -0,0 +1,266 @@
+<?php
+/**
+ * Mail functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/EmailAddressValidator.php');
+
+// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
+// think different
+if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
+#define('MAILHEADER_ASCIIONLY',1);
+
+/**
+ * Patterns for use in email detection and validation
+ *
+ * NOTE: there is an unquoted '/' in RFC2822_ATEXT, it must remain unquoted to be used in the parser
+ * the pattern uses non-capturing groups as captured groups aren't allowed in the parser
+ * select pattern delimiters with care!
+ *
+ * May not be completly RFC conform!
+ * @link http://www.faqs.org/rfcs/rfc2822.html (paras 3.4.1 & 3.2.4)
+ *
+ * @author Chris Smith <chris@jalakai.co.uk>
+ * Check if a given mail address is valid
+ */
+if (!defined('RFC2822_ATEXT')) define('RFC2822_ATEXT',"0-9a-zA-Z!#$%&'*+/=?^_`{|}~-");
+if (!defined('PREG_PATTERN_VALID_EMAIL')) define('PREG_PATTERN_VALID_EMAIL', '['.RFC2822_ATEXT.']+(?:\.['.RFC2822_ATEXT.']+)*@(?i:[0-9a-z][0-9a-z-]*\.)+(?i:[a-z]{2,4}|museum|travel)');
+
+
+
+/**
+ * UTF-8 autoencoding replacement for PHPs mail function
+ *
+ * Email address fields (To, From, Cc, Bcc can contain a textpart and an address
+ * like this: 'Andreas Gohr <andi@splitbrain.org>' - the text part is encoded
+ * automatically. You can seperate receivers by commas.
+ *
+ * @param string $to      Receiver of the mail (multiple seperated by commas)
+ * @param string $subject Mailsubject
+ * @param string $body    Messagebody
+ * @param string $from    Sender address
+ * @param string $cc      CarbonCopy receiver (multiple seperated by commas)
+ * @param string $bcc     BlindCarbonCopy receiver (multiple seperated by commas)
+ * @param string $headers Additional Headers (seperated by MAILHEADER_EOL
+ * @param string $params  Additonal Sendmail params (passed to mail())
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    mail()
+ */
+function mail_send($to, $subject, $body, $from='', $cc='', $bcc='', $headers=null, $params=null){
+
+    $message = compact('to','subject','body','from','cc','bcc','headers','params');
+    return trigger_event('MAIL_MESSAGE_SEND',$message,'_mail_send_action');
+}
+
+function _mail_send_action($data) {
+
+    // retrieve parameters from event data, $to, $subject, $body, $from, $cc, $bcc, $headers, $params
+    $to = $data['to'];
+    $subject = $data['subject'];
+    $body = $data['body'];
+
+    // add robustness in case plugin removes any of these optional values
+    $from = isset($data['from']) ? $data['from'] : '';
+    $cc = isset($data['cc']) ? $data['cc'] : '';
+    $bcc = isset($data['bcc']) ? $data['bcc'] : '';
+    $headers = isset($data['headers']) ? $data['headers'] : null;
+    $params = isset($data['params']) ? $data['params'] : null;
+
+    // end additional code to support event ... original mail_send() code from here
+
+    if(defined('MAILHEADER_ASCIIONLY')){
+        $subject = utf8_deaccent($subject);
+        $subject = utf8_strip($subject);
+    }
+
+    if(!utf8_isASCII($subject)) {
+        $subject = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
+        // Spaces must be encoded according to rfc2047. Use the "_" shorthand
+        $subject = preg_replace('/ /', '_', $subject);
+    }
+
+    $header  = '';
+
+    // No named recipients for To: in Windows (see FS#652)
+    $usenames = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true;
+
+    $to = mail_encode_address($to,'',$usenames);
+    $header .= mail_encode_address($from,'From');
+    $header .= mail_encode_address($cc,'Cc');
+    $header .= mail_encode_address($bcc,'Bcc');
+    $header .= 'MIME-Version: 1.0'.MAILHEADER_EOL;
+    $header .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL;
+    $header .= 'Content-Transfer-Encoding: quoted-printable'.MAILHEADER_EOL;
+    $header .= $headers;
+    $header  = trim($header);
+
+    $body = mail_quotedprintable_encode($body);
+
+    if($params == null){
+        return @mail($to,$subject,$body,$header);
+    }else{
+        return @mail($to,$subject,$body,$header,$params);
+    }
+}
+
+/**
+ * Encodes an email address header
+ *
+ * Unicode characters will be deaccented and encoded
+ * quoted_printable for headers.
+ * Addresses may not contain Non-ASCII data!
+ *
+ * Example:
+ *   mail_encode_address("föö <foo@bar.com>, me@somewhere.com","TBcc");
+ *
+ * @param string  $string Multiple adresses separated by commas
+ * @param string  $header Name of the header (To,Bcc,Cc,...)
+ * @param boolean $names  Allow named Recipients?
+ */
+function mail_encode_address($string,$header='',$names=true){
+    $headers = '';
+    $parts = explode(',',$string);
+    foreach ($parts as $part){
+        $part = trim($part);
+
+        // parse address
+        if(preg_match('#(.*?)<(.*?)>#',$part,$matches)){
+            $text = trim($matches[1]);
+            $addr = $matches[2];
+        }else{
+            $addr = $part;
+        }
+
+        // skip empty ones
+        if(empty($addr)){
+            continue;
+        }
+
+        // FIXME: is there a way to encode the localpart of a emailaddress?
+        if(!utf8_isASCII($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not ASCII"),-1);
+            continue;
+        }
+
+        if(!mail_isvalid($addr)){
+            msg(htmlspecialchars("E-Mail address <$addr> is not valid"),-1);
+            continue;
+        }
+
+        // text was given
+        if(!empty($text) && $names){
+            // add address quotes
+            $addr = "<$addr>";
+
+            if(defined('MAILHEADER_ASCIIONLY')){
+                $text = utf8_deaccent($text);
+                $text = utf8_strip($text);
+            }
+
+            if(!utf8_isASCII($text)){
+                $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text,0).'?=';
+            }
+        }else{
+            $text = '';
+        }
+
+        // add to header comma seperated
+        if($headers != ''){
+            $headers .= ',';
+            if($header) $headers .= MAILHEADER_EOL.' '; // avoid overlong mail headers
+        }
+        $headers .= $text.' '.$addr;
+    }
+
+    if(empty($headers)) return null;
+
+    //if headername was given add it and close correctly
+    if($header) $headers = $header.': '.$headers.MAILHEADER_EOL;
+
+    return $headers;
+}
+
+/**
+ * Check if a given mail address is valid
+ *
+ * @param   string $email the address to check
+ * @return  bool          true if address is valid
+ */
+function mail_isvalid($email){
+    $validator = new EmailAddressValidator;
+    return $validator->check_email_address($email);
+}
+
+/**
+ * Quoted printable encoding
+ *
+ * @author umu <umuAThrz.tu-chemnitz.de>
+ * @link   http://www.php.net/manual/en/function.imap-8bit.php#61216
+ */
+function mail_quotedprintable_encode($sText,$maxlen=74,$bEmulate_imap_8bit=true) {
+    // split text into lines
+    $aLines= preg_split("/(?:\r\n|\r|\n)/", $sText);
+    $cnt = count($aLines);
+
+    for ($i=0;$i<$cnt;$i++) {
+        $sLine =& $aLines[$i];
+        if (strlen($sLine)===0) continue; // do nothing, if empty
+
+        $sRegExp = '/[^\x09\x20\x21-\x3C\x3E-\x7E]/e';
+
+        // imap_8bit encodes x09 everywhere, not only at lineends,
+        // for EBCDIC safeness encode !"#$@[\]^`{|}~,
+        // for complete safeness encode every character :)
+        if ($bEmulate_imap_8bit)
+            $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/e';
+
+        $sReplmt = 'sprintf( "=%02X", ord ( "$0" ) ) ;';
+        $sLine = preg_replace( $sRegExp, $sReplmt, $sLine );
+
+        // encode x09,x20 at lineends
+        {
+            $iLength = strlen($sLine);
+            $iLastChar = ord($sLine{$iLength-1});
+
+            //              !!!!!!!!
+            // imap_8_bit does not encode x20 at the very end of a text,
+            // here is, where I don't agree with imap_8_bit,
+            // please correct me, if I'm wrong,
+            // or comment next line for RFC2045 conformance, if you like
+            if (!($bEmulate_imap_8bit && ($i==count($aLines)-1))){
+                if (($iLastChar==0x09)||($iLastChar==0x20)) {
+                    $sLine{$iLength-1}='=';
+                    $sLine .= ($iLastChar==0x09)?'09':'20';
+                }
+            }
+        }    // imap_8bit encodes x20 before chr(13), too
+        // although IMHO not requested by RFC2045, why not do it safer :)
+        // and why not encode any x20 around chr(10) or chr(13)
+        if ($bEmulate_imap_8bit) {
+            $sLine=str_replace(' =0D','=20=0D',$sLine);
+            //$sLine=str_replace(' =0A','=20=0A',$sLine);
+            //$sLine=str_replace('=0D ','=0D=20',$sLine);
+            //$sLine=str_replace('=0A ','=0A=20',$sLine);
+        }
+
+        // finally split into softlines no longer than $maxlen chars,
+        // for even more safeness one could encode x09,x20
+        // at the very first character of the line
+        // and after soft linebreaks, as well,
+        // but this wouldn't be caught by such an easy RegExp
+        if($maxlen){
+            preg_match_all( '/.{1,'.($maxlen - 2).'}([^=]{0,2})?/', $sLine, $aMatch );
+            $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's
+        }
+    }
+
+    // join lines into text
+    return implode(MAILHEADER_EOL,$aLines);
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/media.php b/mod/dokuwiki/vendors/dokuwiki/inc/media.php
new file mode 100644
index 000000000..9090dbd22
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/media.php
@@ -0,0 +1,1102 @@
+<?php
+/**
+ * All output and handler function needed for the media management popup
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/html.php');
+require_once(DOKU_INC.'inc/search.php');
+require_once(DOKU_INC.'inc/JpegMeta.php');
+
+/**
+ * Lists pages which currently use a media file selected for deletion
+ *
+ * References uses the same visual as search results and share
+ * their CSS tags except pagenames won't be links.
+ *
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+function media_filesinuse($data,$id){
+    global $lang;
+    echo '<h1>'.$lang['reference'].' <code>'.hsc(noNS($id)).'</code></h1>';
+    echo '<p>'.hsc($lang['ref_inuse']).'</p>';
+
+    $hidden=0; //count of hits without read permission
+    foreach($data as $row){
+        if(auth_quickaclcheck($row) >= AUTH_READ && isVisiblePage($row)){
+            echo '<div class="search_result">';
+            echo '<span class="mediaref_ref">'.hsc($row).'</span>';
+            echo '</div>';
+        }else
+            $hidden++;
+    }
+    if ($hidden){
+        print '<div class="mediaref_hidden">'.$lang['ref_hidden'].'</div>';
+    }
+}
+
+/**
+ * Handles the saving of image meta data
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_metasave($id,$auth,$data){
+    if($auth < AUTH_UPLOAD) return false;
+    if(!checkSecurityToken()) return false;
+    global $lang;
+    global $conf;
+    $src = mediaFN($id);
+
+    $meta = new JpegMeta($src);
+    $meta->_parseAll();
+
+    foreach($data as $key => $val){
+        $val=trim($val);
+        if(empty($val)){
+            $meta->deleteField($key);
+        }else{
+            $meta->setField($key,$val);
+        }
+    }
+
+    if($meta->save()){
+        if($conf['fperm']) chmod($src, $conf['fperm']);
+        msg($lang['metasaveok'],1);
+        return $id;
+    }else{
+        msg($lang['metasaveerr'],-1);
+        return false;
+    }
+}
+
+/**
+ * Display the form to edit image meta data
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_metaform($id,$auth){
+    if($auth < AUTH_UPLOAD) return false;
+    global $lang, $config_cascade;
+
+    // load the field descriptions
+    static $fields = null;
+    if(is_null($fields)){
+
+        foreach (array('default','local') as $config_group) {
+            if (empty($config_cascade['mediameta'][$config_group])) continue;
+            foreach ($config_cascade['mediameta'][$config_group] as $config_file) {
+                if(@file_exists($config_file)){
+                    include($config_file);
+                }
+            }
+        }
+    }
+
+    $src = mediaFN($id);
+
+    // output
+    echo '<h1>'.hsc(noNS($id)).'</h1>'.NL;
+    echo '<form action="'.DOKU_BASE.'lib/exe/mediamanager.php" accept-charset="utf-8" method="post" class="meta">'.NL;
+    formSecurityToken();
+    foreach($fields as $key => $field){
+        // get current value
+        $tags = array($field[0]);
+        if(is_array($field[3])) $tags = array_merge($tags,$field[3]);
+        $value = tpl_img_getTag($tags,'',$src);
+        $value = cleanText($value);
+
+        // prepare attributes
+        $p = array();
+        $p['class'] = 'edit';
+        $p['id']    = 'meta__'.$key;
+        $p['name']  = 'meta['.$field[0].']';
+
+        // put label
+        echo '<div class="metafield">';
+        echo '<label for="meta__'.$key.'">';
+        echo ($lang[$field[1]]) ? $lang[$field[1]] : $field[1];
+        echo ':</label>';
+
+        // put input field
+        if($field[2] == 'text'){
+            $p['value'] = $value;
+            $p['type']  = 'text';
+            $att = buildAttributes($p);
+            echo "<input $att/>".NL;
+        }else{
+            $att = buildAttributes($p);
+            echo "<textarea $att rows=\"6\" cols=\"50\">".formText($value).'</textarea>'.NL;
+        }
+        echo '</div>'.NL;
+    }
+    echo '<div class="buttons">'.NL;
+    echo '<input type="hidden" name="img" value="'.hsc($id).'" />'.NL;
+    echo '<input name="do[save]" type="submit" value="'.$lang['btn_save'].
+        '" title="'.$lang['btn_save'].' [S]" accesskey="s" class="button" />'.NL;
+    echo '<input name="do[cancel]" type="submit" value="'.$lang['btn_cancel'].
+        '" title="'.$lang['btn_cancel'].' [C]" accesskey="c" class="button" />'.NL;
+    echo '</div>'.NL;
+    echo '</form>'.NL;
+}
+
+/**
+ * Conveinience function to check if a media file is still in use
+ *
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function media_inuse($id) {
+    global $conf;
+    $mediareferences = array();
+    if($conf['refcheck']){
+        require_once(DOKU_INC.'inc/fulltext.php');
+        $mediareferences = ft_mediause($id,$conf['refshow']);
+        if(!count($mediareferences)) {
+            return false;
+        } else {
+            return $mediareferences;
+        }
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Handles media file deletions
+ *
+ * If configured, checks for media references before deletion
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @return mixed false on error, true on delete or array with refs
+ */
+function media_delete($id,$auth){
+    if($auth < AUTH_DELETE) return false;
+    if(!checkSecurityToken()) return false;
+    global $conf;
+    global $lang;
+
+    $file = mediaFN($id);
+
+    // trigger an event - MEDIA_DELETE_FILE
+    $data['id']   = $id;
+    $data['name'] = basename($file);
+    $data['path'] = $file;
+    $data['size'] = (@file_exists($file)) ? filesize($file) : 0;
+
+    $data['unl'] = false;
+    $data['del'] = false;
+    $evt = new Doku_Event('MEDIA_DELETE_FILE',$data);
+    if ($evt->advise_before()) {
+        $data['unl'] = @unlink($file);
+        if($data['unl']){
+            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE);
+            $data['del'] = io_sweepNS($id,'mediadir');
+        }
+    }
+    $evt->advise_after();
+    unset($evt);
+
+    if($data['unl'] && $data['del']){
+        // current namespace was removed. redirecting to root ns passing msg along
+        send_redirect(DOKU_URL.'lib/exe/mediamanager.php?msg1='.
+                rawurlencode(sprintf(noNS($id),$lang['deletesucc'])));
+    }
+
+    return $data['unl'];
+}
+
+/**
+ * Handles media file uploads
+ *
+ * This generates an action event and delegates to _media_upload_action().
+ * Action plugins are allowed to pre/postprocess the uploaded file.
+ * (The triggered event is preventable.)
+ *
+ * Event data:
+ * $data[0]     fn_tmp: the temporary file name (read from $_FILES)
+ * $data[1]     fn: the file name of the uploaded file
+ * $data[2]     id: the future directory id of the uploaded file
+ * $data[3]     imime: the mimetype of the uploaded file
+ * $data[4]     overwrite: if an existing file is going to be overwritten
+ *
+ * @triggers MEDIA_UPLOAD_FINISH
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michael Klier <chi@chimeric.de>
+ * @return mixed false on error, id of the new file on success
+ */
+function media_upload($ns,$auth){
+    if($auth < AUTH_UPLOAD) return false;
+    if(!checkSecurityToken()) return false;
+    require_once(DOKU_INC.'inc/confutils.php');
+    global $lang;
+    global $conf;
+
+    // get file and id
+    $id   = $_POST['id'];
+    $file = $_FILES['upload'];
+    if(empty($id)) $id = $file['name'];
+
+    // check for errors (messages are done in lib/exe/mediamanager.php)
+    if($file['error']) return false;
+
+    // check extensions
+    list($fext,$fmime,$dl) = mimetype($file['name']);
+    list($iext,$imime,$dl) = mimetype($id);
+    if($fext && !$iext){
+        // no extension specified in id - read original one
+        $id   .= '.'.$fext;
+        $imime = $fmime;
+    }elseif($fext && $fext != $iext){
+        // extension was changed, print warning
+        msg(sprintf($lang['mediaextchange'],$fext,$iext));
+    }
+
+    // get filename
+    $id   = cleanID($ns.':'.$id,false,true);
+    $fn   = mediaFN($id);
+
+    // get filetype regexp
+    $types = array_keys(getMimeTypes());
+    $types = array_map(create_function('$q','return preg_quote($q,"/");'),$types);
+    $regex = join('|',$types);
+
+    // because a temp file was created already
+    if(preg_match('/\.('.$regex.')$/i',$fn)){
+        //check for overwrite
+        $overwrite = @file_exists($fn);
+        if($overwrite && (!$_REQUEST['ow'] || $auth < AUTH_DELETE)){
+            msg($lang['uploadexist'],0);
+            return false;
+        }
+        // check for valid content
+        $ok = media_contentcheck($file['tmp_name'],$imime);
+        if($ok == -1){
+            msg(sprintf($lang['uploadbadcontent'],".$iext"),-1);
+            return false;
+        }elseif($ok == -2){
+            msg($lang['uploadspam'],-1);
+            return false;
+        }elseif($ok == -3){
+            msg($lang['uploadxss'],-1);
+            return false;
+        }
+
+        // prepare event data
+        $data[0] = $file['tmp_name'];
+        $data[1] = $fn;
+        $data[2] = $id;
+        $data[3] = $imime;
+        $data[4] = $overwrite;
+
+        // trigger event
+        return trigger_event('MEDIA_UPLOAD_FINISH', $data, '_media_upload_action', true);
+
+    }else{
+        msg($lang['uploadwrong'],-1);
+    }
+    return false;
+}
+
+/**
+ * Callback adapter for media_upload_finish()
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function _media_upload_action($data) {
+    // fixme do further sanity tests of given data?
+    if(is_array($data) && count($data)===5) {
+        return media_upload_finish($data[0], $data[1], $data[2], $data[3], $data[4]);
+    } else {
+        return false; //callback error
+    }
+}
+
+/**
+ * Saves an uploaded media file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite) {
+    global $conf;
+    global $lang;
+
+    // prepare directory
+    io_createNamespace($id, 'media');
+
+    if(move_uploaded_file($fn_tmp, $fn)) {
+        // Set the correct permission here.
+        // Always chmod media because they may be saved with different permissions than expected from the php umask.
+        // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
+        chmod($fn, $conf['fmode']);
+        msg($lang['uploadsucc'],1);
+        media_notify($id,$fn,$imime);
+        // add a log entry to the media changelog
+        if ($overwrite) {
+            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_EDIT);
+        } else {
+            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_CREATE);
+        }
+        return $id;
+    }else{
+        msg($lang['uploadfail'],-1);
+    }
+}
+
+/**
+ * This function checks if the uploaded content is really what the
+ * mimetype says it is. We also do spam checking for text types here.
+ *
+ * We need to do this stuff because we can not rely on the browser
+ * to do this check correctly. Yes, IE is broken as usual.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @link   http://www.splitbrain.org/blog/2007-02/12-internet_explorer_facilitates_cross_site_scripting
+ * @fixme  check all 26 magic IE filetypes here?
+ */
+function media_contentcheck($file,$mime){
+    global $conf;
+    if($conf['iexssprotect']){
+        $fh = @fopen($file, 'rb');
+        if($fh){
+            $bytes = fread($fh, 256);
+            fclose($fh);
+            if(preg_match('/<(script|a|img|html|body|iframe)[\s>]/i',$bytes)){
+                return -3;
+            }
+        }
+    }
+    if(substr($mime,0,6) == 'image/'){
+        $info = @getimagesize($file);
+        if($mime == 'image/gif' && $info[2] != 1){
+            return -1;
+        }elseif($mime == 'image/jpeg' && $info[2] != 2){
+            return -1;
+        }elseif($mime == 'image/png' && $info[2] != 3){
+            return -1;
+        }
+        # fixme maybe check other images types as well
+    }elseif(substr($mime,0,5) == 'text/'){
+        global $TEXT;
+        $TEXT = io_readFile($file);
+        if(checkwordblock()){
+            return -2;
+        }
+    }
+    return 0;
+}
+
+/**
+ * Send a notify mail on uploads
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_notify($id,$file,$mime){
+    global $lang;
+    global $conf;
+    if(empty($conf['notify'])) return; //notify enabled?
+
+    $ip = clientIP();
+
+    $text = rawLocale('uploadmail');
+    $text = str_replace('@DATE@',dformat(),$text);
+    $text = str_replace('@BROWSER@',$_SERVER['HTTP_USER_AGENT'],$text);
+    $text = str_replace('@IPADDRESS@',$ip,$text);
+    $text = str_replace('@HOSTNAME@',gethostsbyaddrs($ip),$text);
+    $text = str_replace('@DOKUWIKIURL@',DOKU_URL,$text);
+    $text = str_replace('@USER@',$_SERVER['REMOTE_USER'],$text);
+    $text = str_replace('@MIME@',$mime,$text);
+    $text = str_replace('@MEDIA@',ml($id,'',true,'&',true),$text);
+    $text = str_replace('@SIZE@',filesize_h(filesize($file)),$text);
+
+    $from = $conf['mailfrom'];
+    $from = str_replace('@USER@',$_SERVER['REMOTE_USER'],$from);
+    $from = str_replace('@NAME@',$INFO['userinfo']['name'],$from);
+    $from = str_replace('@MAIL@',$INFO['userinfo']['mail'],$from);
+
+    $subject = '['.$conf['title'].'] '.$lang['mail_upload'].' '.$id;
+
+    mail_send($conf['notify'],$subject,$text,$from);
+}
+
+/**
+ * List all files in a given Media namespace
+ */
+function media_filelist($ns,$auth=null,$jump=''){
+    global $conf;
+    global $lang;
+    $ns = cleanID($ns);
+
+    // check auth our self if not given (needed for ajax calls)
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '<h1 id="media__ns">:'.hsc($ns).'</h1>'.NL;
+
+    if($auth < AUTH_READ){
+        // FIXME: print permission warning here instead?
+        echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+    }else{
+        media_uploadform($ns, $auth);
+
+        $dir = utf8_encodeFN(str_replace(':','/',$ns));
+        $data = array();
+        search($data,$conf['mediadir'],'search_media',
+                array('showmsg'=>true,'depth'=>1),$dir);
+
+        if(!count($data)){
+            echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+        }else foreach($data as $item){
+            media_printfile($item,$auth,$jump);
+        }
+    }
+    media_searchform($ns);
+}
+
+/**
+ * List all files found by the search request
+ *
+ * @author Tobias Sarnowski <sarnowski@cosmocode.de>
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ * @triggers MEDIA_SEARCH
+ */
+function media_searchlist($query,$ns,$auth=null){
+    global $conf;
+    global $lang;
+    $ns = cleanID($ns);
+
+    if ($query) {
+        $evdata = array(
+                'ns'    => $ns,
+                'data'  => array(),
+                'query' => $query
+                );
+        $evt = new Doku_Event('MEDIA_SEARCH', $evdata);
+        if ($evt->advise_before()) {
+            $dir = utf8_encodeFN(str_replace(':','/',$evdata['ns']));
+            $pattern = '/'.preg_quote($evdata['query'],'/').'/i';
+            search($evdata['data'],
+                    $conf['mediadir'],
+                    'search_media',
+                    array('showmsg'=>false,'pattern'=>$pattern),
+                    $dir);
+        }
+        $evt->advise_after();
+        unset($evt);
+    }
+
+    echo '<h1 id="media__ns">'.sprintf($lang['searchmedia_in'],hsc($ns).':*').'</h1>'.NL;
+    media_searchform($ns,$query);
+
+    if(!count($evdata['data'])){
+        echo '<div class="nothing">'.$lang['nothingfound'].'</div>'.NL;
+    }else foreach($evdata['data'] as $item){
+        media_printfile($item,$item['perm'],'',true);
+    }
+}
+
+/**
+ * Print action links for a file depending on filetype
+ * and available permissions
+ */
+function media_fileactions($item,$auth){
+    global $lang;
+
+    // view button
+    $link = ml($item['id'],'',true);
+    echo ' <a href="'.$link.'" target="_blank"><img src="'.DOKU_MEDIA.'lib/images/magnifier.png" '.
+        'alt="'.$lang['mediaview'].'" title="'.$lang['mediaview'].'" class="btn" /></a>';
+
+    // no further actions if not writable
+    if(!$item['writable']) return;
+
+    // delete button
+    if($auth >= AUTH_DELETE){
+        echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+            '&amp;sectok='.getSecurityToken().'" class="btn_media_delete" title="'.$item['id'].'">'.
+            '<img src="'.DOKU_MEDIA.'lib/images/trash.png" alt="'.$lang['btn_delete'].'" '.
+            'title="'.$lang['btn_delete'].'" class="btn" /></a>';
+    }
+
+    // edit button
+    if($auth >= AUTH_UPLOAD && $item['isimg'] && $item['meta']->getField('File.Mime') == 'image/jpeg'){
+        echo ' <a href="'.DOKU_BASE.'lib/exe/mediamanager.php?edit='.rawurlencode($item['id']).'">'.
+            '<img src="'.DOKU_MEDIA.'lib/images/pencil.png" alt="'.$lang['metaedit'].'" '.
+            'title="'.$lang['metaedit'].'" class="btn" /></a>';
+    }
+
+}
+
+/**
+ * Formats and prints one file in the list
+ */
+function media_printfile($item,$auth,$jump,$display_namespace=false){
+    global $lang;
+    global $conf;
+
+    // Prepare zebra coloring
+    // I always wanted to use this variable name :-D
+    static $twibble = 1;
+    $twibble *= -1;
+    $zebra = ($twibble == -1) ? 'odd' : 'even';
+
+    // Automatically jump to recent action
+    if($jump == $item['id']) {
+        $jump = ' id="scroll__here" ';
+    }else{
+        $jump = '';
+    }
+
+    // Prepare fileicons
+    list($ext,$mime,$dl) = mimetype($item['file'],false);
+    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+    $class = 'select mediafile mf_'.$class;
+
+    // Prepare filename
+    $file = utf8_decodeFN($item['file']);
+
+    // Prepare info
+    $info = '';
+    if($item['isimg']){
+        $info .= (int) $item['meta']->getField('File.Width');
+        $info .= '&#215;';
+        $info .= (int) $item['meta']->getField('File.Height');
+        $info .= ' ';
+    }
+    $info .= '<i>'.dformat($item['mtime']).'</i>';
+    $info .= ' ';
+    $info .= filesize_h($item['size']);
+
+    // output
+    echo '<div class="'.$zebra.'"'.$jump.'>'.NL;
+    if (!$display_namespace) {
+        echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($file).'</a> ';
+    } else {
+        echo '<a name="h_:'.$item['id'].'" class="'.$class.'">'.hsc($item['id']).'</a><br/>';
+    }
+    echo '<span class="info">('.$info.')</span>'.NL;
+    media_fileactions($item,$auth);
+    echo '<div class="example" id="ex_'.str_replace(':','_',$item['id']).'">';
+    echo $lang['mediausage'].' <code>{{:'.$item['id'].'}}</code>';
+    echo '</div>';
+    if($item['isimg']) media_printimgdetail($item);
+    echo '<div class="clearer"></div>'.NL;
+    echo '</div>'.NL;
+}
+
+/**
+ * Prints a thumbnail and metainfos
+ */
+function media_printimgdetail($item){
+    // prepare thumbnail
+    $w = (int) $item['meta']->getField('File.Width');
+    $h = (int) $item['meta']->getField('File.Height');
+    if($w>120 || $h>120){
+        $ratio = $item['meta']->getResizeRatio(120);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    $src = ml($item['id'],array('w'=>$w,'h'=>$h));
+    $p = array();
+    $p['width']  = $w;
+    $p['height'] = $h;
+    $p['alt']    = $item['id'];
+    $p['class']  = 'thumb';
+    $att = buildAttributes($p);
+
+    // output
+    echo '<div class="detail">';
+    echo '<div class="thumb">';
+    echo '<a name="d_:'.$item['id'].'" class="select">';
+    echo '<img src="'.$src.'" '.$att.' />';
+    echo '</a>';
+    echo '</div>';
+
+    // read EXIF/IPTC data
+    $t = $item['meta']->getField(array('IPTC.Headline','xmp.dc:title'));
+    $d = $item['meta']->getField(array('IPTC.Caption','EXIF.UserComment',
+                'EXIF.TIFFImageDescription',
+                'EXIF.TIFFUserComment'));
+    if(utf8_strlen($d) > 250) $d = utf8_substr($d,0,250).'...';
+    $k = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
+
+    // print EXIF/IPTC data
+    if($t || $d || $k ){
+        echo '<p>';
+        if($t) echo '<strong>'.htmlspecialchars($t).'</strong><br />';
+        if($d) echo htmlspecialchars($d).'<br />';
+        if($t) echo '<em>'.htmlspecialchars($k).'</em>';
+        echo '</p>';
+    }
+    echo '</div>';
+}
+
+/**
+ * Print the media upload form if permissions are correct
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_uploadform($ns, $auth){
+    global $lang;
+
+    if($auth < AUTH_UPLOAD) return; //fixme print info on missing permissions?
+
+    // The default HTML upload form
+    $form = new Doku_Form(array('id'      => 'dw__upload',
+                                'action'  => DOKU_BASE.'lib/exe/mediamanager.php',
+                                'enctype' => 'multipart/form-data'));
+    $form->addElement('<div class="upload">' . $lang['mediaupload'] . '</div>');
+    $form->addElement(formSecurityToken());
+    $form->addHidden('ns', hsc($ns));
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeFileField('upload', $lang['txt_upload'].':', 'upload__file'));
+    $form->addElement(form_makeCloseTag('p'));
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeTextField('id', '', $lang['txt_filename'].':', 'upload__name'));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
+    $form->addElement(form_makeCloseTag('p'));
+
+    if($auth >= AUTH_DELETE){
+        $form->addElement(form_makeOpenTag('p'));
+        $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check'));
+        $form->addElement(form_makeCloseTag('p'));
+    }
+    html_form('upload', $form);
+
+    // prepare flashvars for multiupload
+    $opt = array(
+            'L_gridname'  => $lang['mu_gridname'] ,
+            'L_gridsize'  => $lang['mu_gridsize'] ,
+            'L_gridstat'  => $lang['mu_gridstat'] ,
+            'L_namespace' => $lang['mu_namespace'] ,
+            'L_overwrite' => $lang['txt_overwrt'],
+            'L_browse'    => $lang['mu_browse'],
+            'L_upload'    => $lang['btn_upload'],
+            'L_toobig'    => $lang['mu_toobig'],
+            'L_ready'     => $lang['mu_ready'],
+            'L_done'      => $lang['mu_done'],
+            'L_fail'      => $lang['mu_fail'],
+            'L_authfail'  => $lang['mu_authfail'],
+            'L_progress'  => $lang['mu_progress'],
+            'L_filetypes' => $lang['mu_filetypes'],
+            'L_info'      => $lang['mu_info'],
+            'L_lasterr'   => $lang['mu_lasterr'],
+
+            'O_ns'        => ":$ns",
+            'O_backend'   => 'mediamanager.php?'.session_name().'='.session_id(),
+            'O_maxsize'   => php_to_byte(ini_get('upload_max_filesize')),
+            'O_extensions'=> join('|',array_keys(getMimeTypes())),
+            'O_overwrite' => ($auth >= AUTH_DELETE),
+            'O_sectok'    => getSecurityToken(),
+            'O_authtok'   => auth_createToken(),
+            );
+    $var = buildURLparams($opt);
+    // output the flash uploader
+    ?>
+        <div id="dw__flashupload" style="display:none">
+        <div class="upload"><?php echo $lang['mu_intro']?></div>
+        <?php echo html_flashobject('multipleUpload.swf','500','190',null,$opt); ?>
+        </div>
+        <?php
+}
+
+/**
+ * Print the search field form
+ *
+ * @author Tobias Sarnowski <sarnowski@cosmocode.de>
+ */
+function media_searchform($ns,$query=''){
+    global $lang;
+
+    // The default HTML search form
+    $form = new Doku_Form(array('id' => 'dw__mediasearch', 'action' => DOKU_BASE.'lib/exe/mediamanager.php'));
+    $form->addElement('<div class="upload">' . $lang['mediasearch'] . '</div>');
+    $form->addElement(formSecurityToken());
+    $form->addHidden('ns', $ns);
+    $form->addHidden('do', 'searchlist');
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeTextField('q', $query,$lang['searchmedia'],'','',array('title'=>sprintf($lang['searchmedia_in'],hsc($ns).':*'))));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_search']));
+    $form->addElement(form_makeCloseTag('p'));
+    html_form('searchmedia', $form);
+}
+
+/**
+ * Build a tree outline of available media namespaces
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_nstree($ns){
+    global $conf;
+    global $lang;
+
+    // currently selected namespace
+    $ns  = cleanID($ns);
+    if(empty($ns)){
+        $ns = dirname(str_replace(':','/',$ID));
+        if($ns == '.') $ns ='';
+    }
+    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    $data = array();
+    search($data,$conf['mediadir'],'search_index',array('ns' => $ns, 'nofiles' => true));
+
+    // wrap a list with the root level around the other namespaces
+    $item = array( 'level' => 0, 'id' => '',
+            'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
+
+    echo '<ul class="idx">';
+    echo media_nstree_li($item);
+    echo media_nstree_item($item);
+    echo html_buildlist($data,'idx','media_nstree_item','media_nstree_li');
+    echo '</li>';
+    echo '</ul>';
+}
+
+/**
+ * Userfunction for html_buildlist
+ *
+ * Prints a media namespace tree item
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_nstree_item($item){
+    $pos   = strrpos($item['id'], ':');
+    $label = substr($item['id'], $pos > 0 ? $pos + 1 : 0);
+    if(!$item['label']) $item['label'] = $label;
+
+    $ret  = '';
+    $ret .= '<a href="'.DOKU_BASE.'lib/exe/mediamanager.php?ns='.idfilter($item['id']).'" class="idx_dir">';
+    $ret .= $item['label'];
+    $ret .= '</a>';
+    return $ret;
+}
+
+/**
+ * Userfunction for html_buildlist
+ *
+ * Prints a media namespace tree item opener
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_nstree_li($item){
+    $class='media level'.$item['level'];
+    if($item['open']){
+        $class .= ' open';
+        $img   = DOKU_BASE.'lib/images/minus.gif';
+        $alt   = '&minus;';
+    }else{
+        $class .= ' closed';
+        $img   = DOKU_BASE.'lib/images/plus.gif';
+        $alt   = '+';
+    }
+    return '<li class="'.$class.'">'.
+        '<img src="'.$img.'" alt="'.$alt.'" />';
+}
+
+/**
+ * Resizes the given image to the given size
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function media_resize_image($file, $ext, $w, $h=0){
+    global $conf;
+
+    $info = @getimagesize($file); //get original size
+    if($info == false) return $file; // that's no image - it's a spaceship!
+
+    if(!$h) $h = round(($w * $info[1]) / $info[0]);
+
+    // we wont scale up to infinity
+    if($w > 2000 || $h > 2000) return $file;
+
+    //cache
+    $local = getCacheName($file,'.media.'.$w.'x'.$h.'.'.$ext);
+    $mtime = @filemtime($local); // 0 if not exists
+
+    if( $mtime > filemtime($file) ||
+            media_resize_imageIM($ext,$file,$info[0],$info[1],$local,$w,$h) ||
+            media_resize_imageGD($ext,$file,$info[0],$info[1],$local,$w,$h) ){
+        if($conf['fperm']) chmod($local, $conf['fperm']);
+        return $local;
+    }
+    //still here? resizing failed
+    return $file;
+}
+
+/**
+ * Crops the given image to the wanted ratio, then calls media_resize_image to scale it
+ * to the wanted size
+ *
+ * Crops are centered horizontally but prefer the upper third of an vertical
+ * image because most pics are more interesting in that area (rule of thirds)
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function media_crop_image($file, $ext, $w, $h=0){
+    global $conf;
+
+    if(!$h) $h = $w;
+    $info = @getimagesize($file); //get original size
+    if($info == false) return $file; // that's no image - it's a spaceship!
+
+    // calculate crop size
+    $fr = $info[0]/$info[1];
+    $tr = $w/$h;
+    if($tr >= 1){
+        if($tr > $fr){
+            $cw = $info[0];
+            $ch = (int) $info[0]/$tr;
+        }else{
+            $cw = (int) $info[1]*$tr;
+            $ch = $info[1];
+        }
+    }else{
+        if($tr < $fr){
+            $cw = (int) $info[1]*$tr;
+            $ch = $info[1];
+        }else{
+            $cw = $info[0];
+            $ch = (int) $info[0]/$tr;
+        }
+    }
+    // calculate crop offset
+    $cx = (int) ($info[0]-$cw)/2;
+    $cy = (int) ($info[1]-$ch)/3;
+
+    //cache
+    $local = getCacheName($file,'.media.'.$cw.'x'.$ch.'.crop.'.$ext);
+    $mtime = @filemtime($local); // 0 if not exists
+
+    if( $mtime > filemtime($file) ||
+            media_crop_imageIM($ext,$file,$info[0],$info[1],$local,$cw,$ch,$cx,$cy) ||
+            media_resize_imageGD($ext,$file,$cw,$ch,$local,$cw,$ch,$cx,$cy) ){
+        if($conf['fperm']) chmod($local, $conf['fperm']);
+        return media_resize_image($local,$ext, $w, $h);
+    }
+
+    //still here? cropping failed
+    return media_resize_image($file,$ext, $w, $h);
+}
+
+/**
+ * Download a remote file and return local filename
+ *
+ * returns false if download fails. Uses cached file if available and
+ * wanted
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @author  Pavel Vitis <Pavel.Vitis@seznam.cz>
+ */
+function media_get_from_URL($url,$ext,$cache){
+    global $conf;
+
+    // if no cache or fetchsize just redirect
+    if ($cache==0)           return false;
+    if (!$conf['fetchsize']) return false;
+
+    $local = getCacheName(strtolower($url),".media.$ext");
+    $mtime = @filemtime($local); // 0 if not exists
+
+    //decide if download needed:
+    if( ($mtime == 0) ||                           // cache does not exist
+            ($cache != -1 && $mtime < time()-$cache)   // 'recache' and cache has expired
+      ){
+        if(media_image_download($url,$local)){
+            return $local;
+        }else{
+            return false;
+        }
+    }
+
+    //if cache exists use it else
+    if($mtime) return $local;
+
+    //else return false
+    return false;
+}
+
+/**
+ * Download image files
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_image_download($url,$file){
+    global $conf;
+    $http = new DokuHTTPClient();
+    $http->max_bodysize = $conf['fetchsize'];
+    $http->timeout = 25; //max. 25 sec
+    $http->header_regexp = '!\r\nContent-Type: image/(jpe?g|gif|png)!i';
+
+    $data = $http->get($url);
+    if(!$data) return false;
+
+    $fileexists = @file_exists($file);
+    $fp = @fopen($file,"w");
+    if(!$fp) return false;
+    fwrite($fp,$data);
+    fclose($fp);
+    if(!$fileexists and $conf['fperm']) chmod($file, $conf['fperm']);
+
+    // check if it is really an image
+    $info = @getimagesize($file);
+    if(!$info){
+        @unlink($file);
+        return false;
+    }
+
+    return true;
+}
+
+/**
+ * resize images using external ImageMagick convert program
+ *
+ * @author Pavel Vitis <Pavel.Vitis@seznam.cz>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_resize_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h){
+    global $conf;
+
+    // check if convert is configured
+    if(!$conf['im_convert']) return false;
+
+    // prepare command
+    $cmd  = $conf['im_convert'];
+    $cmd .= ' -resize '.$to_w.'x'.$to_h.'!';
+    if ($ext == 'jpg' || $ext == 'jpeg') {
+        $cmd .= ' -quality '.$conf['jpg_quality'];
+    }
+    $cmd .= " $from $to";
+
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
+}
+
+/**
+ * crop images using external ImageMagick convert program
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function media_crop_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x,$ofs_y){
+    global $conf;
+
+    // check if convert is configured
+    if(!$conf['im_convert']) return false;
+
+    // prepare command
+    $cmd  = $conf['im_convert'];
+    $cmd .= ' -crop '.$to_w.'x'.$to_h.'+'.$ofs_x.'+'.$ofs_y;
+    if ($ext == 'jpg' || $ext == 'jpeg') {
+        $cmd .= ' -quality '.$conf['jpg_quality'];
+    }
+    $cmd .= " $from $to";
+
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
+}
+
+/**
+ * resize or crop images using PHP's libGD support
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Sebastian Wienecke <s_wienecke@web.de>
+ */
+function media_resize_imageGD($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x=0,$ofs_y=0){
+    global $conf;
+
+    if($conf['gdlib'] < 1) return false; //no GDlib available or wanted
+
+    // check available memory
+    if(!is_mem_available(($from_w * $from_h * 4) + ($to_w * $to_h * 4))){
+        return false;
+    }
+
+    // create an image of the given filetype
+    if ($ext == 'jpg' || $ext == 'jpeg'){
+        if(!function_exists("imagecreatefromjpeg")) return false;
+        $image = @imagecreatefromjpeg($from);
+    }elseif($ext == 'png') {
+        if(!function_exists("imagecreatefrompng")) return false;
+        $image = @imagecreatefrompng($from);
+
+    }elseif($ext == 'gif') {
+        if(!function_exists("imagecreatefromgif")) return false;
+        $image = @imagecreatefromgif($from);
+    }
+    if(!$image) return false;
+
+    if(($conf['gdlib']>1) && function_exists("imagecreatetruecolor") && $ext != 'gif'){
+        $newimg = @imagecreatetruecolor ($to_w, $to_h);
+    }
+    if(!$newimg) $newimg = @imagecreate($to_w, $to_h);
+    if(!$newimg){
+        imagedestroy($image);
+        return false;
+    }
+
+    //keep png alpha channel if possible
+    if($ext == 'png' && $conf['gdlib']>1 && function_exists('imagesavealpha')){
+        imagealphablending($newimg, false);
+        imagesavealpha($newimg,true);
+    }
+
+    //keep gif transparent color if possible
+    if($ext == 'gif' && function_exists('imagefill') && function_exists('imagecolorallocate')) {
+        if(function_exists('imagecolorsforindex') && function_exists('imagecolortransparent')) {
+            $transcolorindex = @imagecolortransparent($image);
+            if($transcolorindex >= 0 ) { //transparent color exists
+                $transcolor = @imagecolorsforindex($image, $transcolorindex);
+                $transcolorindex = @imagecolorallocate($newimg, $transcolor['red'], $transcolor['green'], $transcolor['blue']);
+                @imagefill($newimg, 0, 0, $transcolorindex);
+                @imagecolortransparent($newimg, $transcolorindex);
+            }else{ //filling with white
+                $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
+                @imagefill($newimg, 0, 0, $whitecolorindex);
+            }
+        }else{ //filling with white
+            $whitecolorindex = @imagecolorallocate($newimg, 255, 255, 255);
+            @imagefill($newimg, 0, 0, $whitecolorindex);
+        }
+    }
+
+    //try resampling first
+    if(function_exists("imagecopyresampled")){
+        if(!@imagecopyresampled($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h)) {
+            imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
+        }
+    }else{
+        imagecopyresized($newimg, $image, 0, 0, $ofs_x, $ofs_y, $to_w, $to_h, $from_w, $from_h);
+    }
+
+    $okay = false;
+    if ($ext == 'jpg' || $ext == 'jpeg'){
+        if(!function_exists('imagejpeg')){
+            $okay = false;
+        }else{
+            $okay = imagejpeg($newimg, $to, $conf['jpg_quality']);
+        }
+    }elseif($ext == 'png') {
+        if(!function_exists('imagepng')){
+            $okay = false;
+        }else{
+            $okay =  imagepng($newimg, $to);
+        }
+    }elseif($ext == 'gif') {
+        if(!function_exists('imagegif')){
+            $okay = false;
+        }else{
+            $okay = imagegif($newimg, $to);
+        }
+    }
+
+    // destroy GD image ressources
+    if($image) imagedestroy($image);
+    if($newimg) imagedestroy($newimg);
+
+    return $okay;
+}
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/pageutils.php b/mod/dokuwiki/vendors/dokuwiki/inc/pageutils.php
new file mode 100644
index 000000000..9c192e5e6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/pageutils.php
@@ -0,0 +1,537 @@
+<?php
+/**
+ * Utilities for handling pagenames
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @todo       Combine similar functions like {wiki,media,meta}FN()
+ */
+
+/**
+ * Fetch the an ID from request
+ *
+ * Uses either standard $_REQUEST variable or extracts it from
+ * the full request URI when userewrite is set to 2
+ *
+ * For $param='id' $conf['start'] is returned if no id was found.
+ * If the second parameter is true (default) the ID is cleaned.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function getID($param='id',$clean=true){
+    global $conf;
+
+    $id = isset($_REQUEST[$param]) ? $_REQUEST[$param] : null;
+
+    $request = $_SERVER['REQUEST_URI'];
+
+    //construct page id from request URI
+    if(empty($id) && $conf['userewrite'] == 2){
+        //get the script URL
+        if($conf['basedir']){
+            $relpath = '';
+            if($param != 'id') {
+                $relpath = 'lib/exe/';
+            }
+            $script = $conf['basedir'].$relpath.basename($_SERVER['SCRIPT_FILENAME']);
+
+        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['PATH_TRANSLATED']){
+            $request = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                    $_SERVER['PATH_TRANSLATED']);
+        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
+            $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                    $_SERVER['SCRIPT_FILENAME']);
+            $script = '/'.$script;
+        }else{
+            $script = $_SERVER['SCRIPT_NAME'];
+        }
+
+        //clean script and request (fixes a windows problem)
+        $script  = preg_replace('/\/\/+/','/',$script);
+        $request = preg_replace('/\/\/+/','/',$request);
+
+        //remove script URL and Querystring to gain the id
+        if(preg_match('/^'.preg_quote($script,'/').'(.*)/',$request, $match)){
+            $id = preg_replace ('/\?.*/','',$match[1]);
+        }
+        $id = urldecode($id);
+        //strip leading slashes
+        $id = preg_replace('!^/+!','',$id);
+    }
+
+    // Namespace autolinking from URL
+    if(substr($id,-1) == ':' || ($conf['useslash'] && substr($id,-1) == '/')){
+        if(page_exists($id.$conf['start'])){
+            // start page inside namespace
+            $id = $id.$conf['start'];
+        }elseif(page_exists($id.noNS(cleanID($id)))){
+            // page named like the NS inside the NS
+            $id = $id.noNS(cleanID($id));
+        }elseif(page_exists($id)){
+            // page like namespace exists
+            $id = substr($id,0,-1);
+        }else{
+            // fall back to default
+            $id = $id.$conf['start'];
+        }
+        send_redirect(wl($id,'',true));
+    }
+
+    if($clean) $id = cleanID($id);
+    if(empty($id) && $param=='id') $id = $conf['start'];
+
+    return $id;
+}
+
+/**
+ * Remove unwanted chars from ID
+ *
+ * Cleans a given ID to only use allowed characters. Accented characters are
+ * converted to unaccented ones
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string  $raw_id    The pageid to clean
+ * @param  boolean $ascii     Force ASCII
+ * @param  boolean $media     Allow leading or trailing _ for media files
+ */
+function cleanID($raw_id,$ascii=false,$media=false){
+    global $conf;
+    global $lang;
+    static $sepcharpat = null;
+
+    global $cache_cleanid;
+    $cache = & $cache_cleanid;
+
+    // check if it's already in the memory cache
+    if (isset($cache[(string)$raw_id])) {
+        return $cache[(string)$raw_id];
+    }
+
+    $sepchar = $conf['sepchar'];
+    if($sepcharpat == null) // build string only once to save clock cycles
+        $sepcharpat = '#\\'.$sepchar.'+#';
+
+    $id = trim((string)$raw_id);
+    $id = utf8_strtolower($id);
+
+    //alternative namespace seperator
+    $id = strtr($id,';',':');
+    if($conf['useslash']){
+        $id = strtr($id,'/',':');
+    }else{
+        $id = strtr($id,'/',$sepchar);
+    }
+
+    if($conf['deaccent'] == 2 || $ascii) $id = utf8_romanize($id);
+    if($conf['deaccent'] || $ascii) $id = utf8_deaccent($id,-1);
+
+    //remove specials
+    $id = utf8_stripspecials($id,$sepchar,'\*');
+
+    if($ascii) $id = utf8_strip($id);
+
+    //clean up
+    $id = preg_replace($sepcharpat,$sepchar,$id);
+    $id = preg_replace('#:+#',':',$id);
+    $id = ($media ? trim($id,':.-') : trim($id,':._-'));
+    $id = preg_replace('#:[:\._\-]+#',':',$id);
+
+    $cache[(string)$raw_id] = $id;
+    return($id);
+}
+
+/**
+ * Return namespacepart of a wiki ID
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function getNS($id){
+    $pos = strrpos((string)$id,':');
+    if($pos!==false){
+        return substr((string)$id,0,$pos);
+    }
+    return false;
+}
+
+/**
+ * Returns the ID without the namespace
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function noNS($id) {
+    $pos = strrpos($id, ':');
+    if ($pos!==false) {
+        return substr($id, $pos+1);
+    } else {
+        return $id;
+    }
+}
+
+/**
+ * Returns the current namespace
+ *
+ * @author Nathan Fritz <fritzn@crown.edu>
+ */
+function curNS($id) {
+    return noNS(getNS($id));
+}
+
+/**
+ * Returns the ID without the namespace or current namespace for 'start' pages
+ *
+ * @author Nathan Fritz <fritzn@crown.edu>
+ */
+function noNSorNS($id) {
+    global $conf;
+
+    $p = noNS($id);
+    if ($p == $conf['start']) {
+        $p = curNS($id);
+        if ($p == false) {
+            return noNS($id);
+        }
+    }
+    return $p;
+}
+
+/**
+ * Creates a XHTML valid linkid from a given headline title
+ *
+ * @param string  $title   The headline title
+ * @param array   $check   List of existing IDs
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function sectionID($title,&$check) {
+    $title = str_replace(array(':','.'),'',cleanID($title));
+    $new = ltrim($title,'0123456789_-');
+    if(empty($new)){
+        $title = 'section'.preg_replace('/[^0-9]+/','',$title); //keep numbers from headline
+    }else{
+        $title = $new;
+    }
+
+    if(is_array($check)){
+        // make sure tiles are unique
+        $num = '';
+        while(in_array($title.$num,$check)){
+            ($num) ? $num++ : $num = 1;
+        }
+        $title = $title.$num;
+        $check[] = $title;
+    }
+
+    return $title;
+}
+
+
+/**
+ * Wiki page existence check
+ *
+ * parameters as for wikiFN
+ *
+ * @author Chris Smith <chris@jalakai.co.uk>
+ */
+function page_exists($id,$rev='',$clean=true) {
+    return @file_exists(wikiFN($id,$rev,$clean));
+}
+
+/**
+ * returns the full path to the datafile specified by ID and optional revision
+ *
+ * The filename is URL encoded to protect Unicode chars
+ *
+ * @param  $raw_id  string   id of wikipage
+ * @param  $rev     string   page revision, empty string for current
+ * @param  $clean   bool     flag indicating that $raw_id should be cleaned.  Only set to false
+ *                           when $id is guaranteed to have been cleaned already.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function wikiFN($raw_id,$rev='',$clean=true){
+    global $conf;
+
+    global $cache_wikifn;
+    $cache = & $cache_wikifn;
+
+    if (isset($cache[$raw_id]) && isset($cache[$raw_id][$rev])) {
+        return $cache[$raw_id][$rev];
+    }
+
+    $id = $raw_id;
+
+    if ($clean) $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    if(empty($rev)){
+        $fn = $conf['datadir'].'/'.utf8_encodeFN($id).'.txt';
+    }else{
+        $fn = $conf['olddir'].'/'.utf8_encodeFN($id).'.'.$rev.'.txt';
+        if($conf['compression']){
+            //test for extensions here, we want to read both compressions
+            if (@file_exists($fn . '.gz')){
+                $fn .= '.gz';
+            }else if(@file_exists($fn . '.bz2')){
+                $fn .= '.bz2';
+            }else{
+                //file doesnt exist yet, so we take the configured extension
+                $fn .= '.' . $conf['compression'];
+            }
+        }
+    }
+
+    if (!isset($cache[$raw_id])) { $cache[$raw_id] = array(); }
+    $cache[$raw_id][$rev] = $fn;
+    return $fn;
+}
+
+/**
+ * Returns the full path to the file for locking the page while editing.
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function wikiLockFN($id) {
+    global $conf;
+    return $conf['lockdir'].'/'.md5(cleanID($id)).'.lock';
+}
+
+
+/**
+ * returns the full path to the meta file specified by ID and extension
+ *
+ * The filename is URL encoded to protect Unicode chars
+ *
+ * @author Steven Danz <steven-danz@kc.rr.com>
+ */
+function metaFN($id,$ext){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['metadir'].'/'.utf8_encodeFN($id).$ext;
+    return $fn;
+}
+
+/**
+ * returns an array of full paths to all metafiles of a given ID
+ *
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ */
+function metaFiles($id){
+    $name   = noNS($id);
+    $ns     = getNS($id);
+    $dir    = ($ns) ? metaFN($ns,'').'/' : metaFN($ns,'');
+    $files  = array();
+
+    $dh = @opendir($dir);
+    if(!$dh) return $files;
+    while(($file = readdir($dh)) !== false){
+        if(strpos($file,$name.'.') === 0 && !is_dir($dir.$file))
+            $files[] = $dir.$file;
+    }
+    closedir($dh);
+
+    return $files;
+}
+
+/**
+ * returns the full path to the mediafile specified by ID
+ *
+ * The filename is URL encoded to protect Unicode chars
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function mediaFN($id){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    return $fn;
+}
+
+/**
+ * Returns the full filepath to a localized textfile if local
+ * version isn't found the english one is returned
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function localeFN($id){
+    global $conf;
+    $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.txt';
+    if(!@file_exists($file)){
+        //fall back to english
+        $file = DOKU_INC.'inc/lang/en/'.$id.'.txt';
+    }
+    return $file;
+}
+
+/**
+ * Resolve relative paths in IDs
+ *
+ * Do not call directly use resolve_mediaid or resolve_pageid
+ * instead
+ *
+ * Partyly based on a cleanPath function found at
+ * http://www.php.net/manual/en/function.realpath.php#57016
+ *
+ * @author <bart at mediawave dot nl>
+ */
+function resolve_id($ns,$id,$clean=true){
+    global $conf;
+
+    // some pre cleaning for useslash:
+    if($conf['useslash']) $id = str_replace('/',':',$id);
+
+    // if the id starts with a dot we need to handle the
+    // relative stuff
+    if($id{0} == '.'){
+        // normalize initial dots without a colon
+        $id = preg_replace('/^(\.+)(?=[^:\.])/','\1:',$id);
+        // prepend the current namespace
+        $id = $ns.':'.$id;
+
+        // cleanup relatives
+        $result = array();
+        $pathA  = explode(':', $id);
+        if (!$pathA[0]) $result[] = '';
+        foreach ($pathA AS $key => $dir) {
+            if ($dir == '..') {
+                if (end($result) == '..') {
+                    $result[] = '..';
+                } elseif (!array_pop($result)) {
+                    $result[] = '..';
+                }
+            } elseif ($dir && $dir != '.') {
+                $result[] = $dir;
+            }
+        }
+        if (!end($pathA)) $result[] = '';
+        $id = implode(':', $result);
+    }elseif($ns !== false && strpos($id,':') === false){
+        //if link contains no namespace. add current namespace (if any)
+        $id = $ns.':'.$id;
+    }
+
+    if($clean) $id = cleanID($id);
+    return $id;
+}
+
+/**
+ * Returns a full media id
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function resolve_mediaid($ns,&$page,&$exists){
+    $page   = resolve_id($ns,$page);
+    $file   = mediaFN($page);
+    $exists = @file_exists($file);
+}
+
+/**
+ * Returns a full page id
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function resolve_pageid($ns,&$page,&$exists){
+    global $conf;
+    $exists = false;
+
+    //keep hashlink if exists then clean both parts
+    if (strpos($page,'#')) {
+        list($page,$hash) = explode('#',$page,2);
+    } else {
+        $hash = '';
+    }
+    $hash = cleanID($hash);
+    $page = resolve_id($ns,$page,false); // resolve but don't clean, yet
+
+    // get filename (calls clean itself)
+    $file = wikiFN($page);
+
+    // if ends with colon or slash we have a namespace link
+    if(substr($page,-1) == ':' || ($conf['useslash'] && substr($page,-1) == '/')){
+        if(page_exists($page.$conf['start'])){
+            // start page inside namespace
+            $page = $page.$conf['start'];
+            $exists = true;
+        }elseif(page_exists($page.noNS(cleanID($page)))){
+            // page named like the NS inside the NS
+            $page = $page.noNS(cleanID($page));
+            $exists = true;
+        }elseif(page_exists($page)){
+            // page like namespace exists
+            $page = $page;
+            $exists = true;
+        }else{
+            // fall back to default
+            $page = $page.$conf['start'];
+        }
+    }else{
+        //check alternative plural/nonplural form
+        if(!@file_exists($file)){
+            if( $conf['autoplural'] ){
+                if(substr($page,-1) == 's'){
+                    $try = substr($page,0,-1);
+                }else{
+                    $try = $page.'s';
+                }
+                if(page_exists($try)){
+                    $page   = $try;
+                    $exists = true;
+                }
+            }
+        }else{
+            $exists = true;
+        }
+    }
+
+    // now make sure we have a clean page
+    $page = cleanID($page);
+
+    //add hash if any
+    if(!empty($hash)) $page .= '#'.$hash;
+}
+
+/**
+ * Returns the name of a cachefile from given data
+ *
+ * The needed directory is created by this function!
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ *
+ * @param string $data  This data is used to create a unique md5 name
+ * @param string $ext   This is appended to the filename if given
+ * @return string       The filename of the cachefile
+ */
+function getCacheName($data,$ext=''){
+    global $conf;
+    $md5  = md5($data);
+    $file = $conf['cachedir'].'/'.$md5{0}.'/'.$md5.$ext;
+    io_makeFileDir($file);
+    return $file;
+}
+
+/**
+ * Checks a pageid against $conf['hidepages']
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function isHiddenPage($id){
+    global $conf;
+    global $ACT;
+    if(empty($conf['hidepages'])) return false;
+    if($ACT == 'admin') return false;
+
+    if(preg_match('/'.$conf['hidepages'].'/ui',':'.$id)){
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Reverse of isHiddenPage
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function isVisiblePage($id){
+    return !isHiddenPage($id);
+}
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/code.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/code.php
new file mode 100644
index 000000000..4d94dcf4e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/code.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * A simple renderer that allows downloading of code and file snippets
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/parser/renderer.php';
+
+class Doku_Renderer_code extends Doku_Renderer {
+    var $_codeblock=0;
+
+    /**
+     * Send the wanted code block to the browser
+     *
+     * When the correct block was found it exits the script.
+     */
+    function code($text, $language = NULL, $filename='' ) {
+        if(!$language) $language = 'txt';
+        if(!$filename) $filename = 'snippet.'.$language;
+        $filename = basename($filename);
+
+        if($this->_codeblock == $_REQUEST['codeblock']){
+            header("Content-Type: text/plain; charset=utf-8");
+            header("Content-Disposition: attachment; filename=$filename");
+            header("X-Robots-Tag: noindex");
+            echo trim($text,"\r\n");
+            exit;
+        }
+
+        $this->_codeblock++;
+    }
+
+    /**
+     * Wraps around code()
+     */
+    function file($text, $language = NULL, $filename='') {
+        $this->code($text, $language, $filename);
+    }
+
+    /**
+     * This should never be reached, if it is send a 404
+     */
+    function document_end() {
+        header("HTTP/1.0 404 Not Found");
+        echo '404 - Not found';
+        exit;
+    }
+
+    /**
+     * Return the format of the renderer
+     *
+     * @returns string 'code'
+     */
+    function getFormat(){
+        return 'code';
+    }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/handler.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/handler.php
new file mode 100644
index 000000000..9fe5866ad
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/handler.php
@@ -0,0 +1,1697 @@
+<?php
+if(!defined('DOKU_INC')) die('meh.');
+if (!defined('DOKU_PARSER_EOL')) define('DOKU_PARSER_EOL',"\n");   // add this to make handling test cases simpler
+
+class Doku_Handler {
+
+    var $Renderer = NULL;
+
+    var $CallWriter = NULL;
+
+    var $calls = array();
+
+    var $status = array(
+        'section' => false,
+        'section_edit_start' => -1,
+        'section_edit_level' => 1,
+        'section_edit_title' => ''
+    );
+
+    var $rewriteBlocks = true;
+
+    function Doku_Handler() {
+        $this->CallWriter = & new Doku_Handler_CallWriter($this);
+    }
+
+    function _addCall($handler, $args, $pos) {
+        $call = array($handler,$args, $pos);
+        $this->CallWriter->writeCall($call);
+    }
+
+    function addPluginCall($plugin, $args, $state, $pos, $match) {
+        $call = array('plugin',array($plugin, $args, $state, $match), $pos);
+        $this->CallWriter->writeCall($call);
+    }
+
+    function _finalize(){
+
+        $this->CallWriter->finalise();
+
+        if ( $this->status['section'] ) {
+           $last_call = end($this->calls);
+           array_push($this->calls,array('section_close',array(), $last_call[2]));
+           if ($this->status['section_edit_start']>1) {
+               // ignore last edit section if there is only one header
+               array_push($this->calls,array('section_edit',array($this->status['section_edit_start'], 0, $this->status['section_edit_level'], $this->status['section_edit_title']), $last_call[2]));
+           }
+        }
+
+        if ( $this->rewriteBlocks ) {
+            $B = & new Doku_Handler_Block();
+            $this->calls = $B->process($this->calls);
+        }
+
+        trigger_event('PARSER_HANDLER_DONE',$this);
+
+        array_unshift($this->calls,array('document_start',array(),0));
+        $last_call = end($this->calls);
+        array_push($this->calls,array('document_end',array(),$last_call[2]));
+    }
+
+    function fetch() {
+        $call = each($this->calls);
+        if ( $call ) {
+            return $call['value'];
+        }
+        return false;
+    }
+
+
+    /**
+     * Special plugin handler
+     *
+     * This handler is called for all modes starting with 'plugin_'.
+     * An additional parameter with the plugin name is passed
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function plugin($match, $state, $pos, $pluginname){
+        $data = array($match);
+        $plugin =& plugin_load('syntax',$pluginname);
+        if($plugin != null){
+            $data = $plugin->handle($match, $state, $pos, $this);
+        }
+        if ($data !== false) {
+          $this->addPluginCall($pluginname,$data,$state,$pos,$match);
+        }
+        return true;
+    }
+
+    function base($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+                return true;
+            break;
+        }
+    }
+
+    function header($match, $state, $pos) {
+        global $conf;
+
+        // get level and title
+        $title = trim($match);
+        $level = 7 - strspn($title,'=');
+        if($level < 1) $level = 1;
+        $title = trim($title,'=');
+        $title = trim($title);
+
+        if ($this->status['section']) $this->_addCall('section_close',array(),$pos);
+
+        if ($level<=$conf['maxseclevel']) {
+            $this->_addCall('section_edit',array($this->status['section_edit_start'], $pos-1, $this->status['section_edit_level'], $this->status['section_edit_title']), $pos);
+            $this->status['section_edit_start'] = $pos;
+            $this->status['section_edit_level'] = $level;
+            $this->status['section_edit_title'] = $title;
+        }
+
+        $this->_addCall('header',array($title,$level,$pos), $pos);
+
+        $this->_addCall('section_open',array($level),$pos);
+        $this->status['section'] = true;
+        return true;
+    }
+
+    function notoc($match, $state, $pos) {
+        $this->_addCall('notoc',array(),$pos);
+        return true;
+    }
+
+    function nocache($match, $state, $pos) {
+        $this->_addCall('nocache',array(),$pos);
+        return true;
+    }
+
+    function linebreak($match, $state, $pos) {
+        $this->_addCall('linebreak',array(),$pos);
+        return true;
+    }
+
+    function eol($match, $state, $pos) {
+        $this->_addCall('eol',array(),$pos);
+        return true;
+    }
+
+    function hr($match, $state, $pos) {
+        $this->_addCall('hr',array(),$pos);
+        return true;
+    }
+
+    function _nestingTag($match, $state, $pos, $name) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $this->_addCall($name.'_open', array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall($name.'_close', array(), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+            break;
+        }
+    }
+
+    function strong($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'strong');
+        return true;
+    }
+
+    function emphasis($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'emphasis');
+        return true;
+    }
+
+    function underline($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'underline');
+        return true;
+    }
+
+    function monospace($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'monospace');
+        return true;
+    }
+
+    function subscript($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'subscript');
+        return true;
+    }
+
+    function superscript($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'superscript');
+        return true;
+    }
+
+    function deleted($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'deleted');
+        return true;
+    }
+
+
+    function footnote($match, $state, $pos) {
+//        $this->_nestingTag($match, $state, $pos, 'footnote');
+        if (!isset($this->_footnote)) $this->_footnote = false;
+
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                // footnotes can not be nested - however due to limitations in lexer it can't be prevented
+                // we will still enter a new footnote mode, we just do nothing
+                if ($this->_footnote) {
+                  $this->_addCall('cdata',array($match), $pos);
+                  break;
+                }
+
+                $this->_footnote = true;
+
+                $ReWriter = & new Doku_Handler_Nest($this->CallWriter,'footnote_close');
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('footnote_open', array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                // check whether we have already exitted the footnote mode, can happen if the modes were nested
+                if (!$this->_footnote) {
+                  $this->_addCall('cdata',array($match), $pos);
+                  break;
+                }
+
+                $this->_footnote = false;
+
+                $this->_addCall('footnote_close', array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata', array($match), $pos);
+            break;
+        }
+        return true;
+    }
+
+    function listblock($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $ReWriter = & new Doku_Handler_List($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('list_open', array($match), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('list_close', array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('list_item', array($match), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata', array($match), $pos);
+            break;
+        }
+        return true;
+    }
+
+    function unformatted($match, $state, $pos) {
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('unformatted',array($match), $pos);
+        }
+        return true;
+    }
+
+    function php($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('php',array($match), $pos);
+        }
+        return true;
+    }
+
+    function phpblock($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('phpblock',array($match), $pos);
+        }
+        return true;
+    }
+
+    function html($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('html',array($match), $pos);
+        }
+        return true;
+    }
+
+    function htmlblock($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('htmlblock',array($match), $pos);
+        }
+        return true;
+    }
+
+    function preformatted($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $ReWriter = & new Doku_Handler_Preformatted($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('preformatted_start',array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('preformatted_end',array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('preformatted_newline',array(), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('preformatted_content',array($match), $pos);
+            break;
+        }
+
+        return true;
+    }
+
+    function quote($match, $state, $pos) {
+
+        switch ( $state ) {
+
+            case DOKU_LEXER_ENTER:
+                $ReWriter = & new Doku_Handler_Quote($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('quote_start',array($match), $pos);
+            break;
+
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('quote_end',array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('quote_newline',array($match), $pos);
+            break;
+
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+            break;
+
+        }
+
+        return true;
+    }
+
+    function file($match, $state, $pos) {
+        return $this->code($match, $state, $pos, 'file');
+    }
+
+    function code($match, $state, $pos, $type='code') {
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $matches = explode('>',$match,2);
+            $matches[0] = trim($matches[0]);
+
+            list($language,$filename) = explode(' ',$matches[0],2);
+            $language = trim($language);
+            $filename = trim($filename);
+            if ( $language == '' )  $language = null;
+            if ( $language == '-' ) $language = null;
+            if ( $filename == '' )  $filename = null;
+            # We shortcut html here.
+            if($language == 'html') $language = 'html4strict';
+            $this->_addCall(
+                    $type,
+                    array($matches[1],$language,$filename),
+                    $pos
+                );
+        }
+        return true;
+    }
+
+    function acronym($match, $state, $pos) {
+        $this->_addCall('acronym',array($match), $pos);
+        return true;
+    }
+
+    function smiley($match, $state, $pos) {
+        $this->_addCall('smiley',array($match), $pos);
+        return true;
+    }
+
+    function wordblock($match, $state, $pos) {
+        $this->_addCall('wordblock',array($match), $pos);
+        return true;
+    }
+
+    function entity($match, $state, $pos) {
+        $this->_addCall('entity',array($match), $pos);
+        return true;
+    }
+
+    function multiplyentity($match, $state, $pos) {
+        preg_match_all('/\d+/',$match,$matches);
+        $this->_addCall('multiplyentity',array($matches[0][0],$matches[0][1]), $pos);
+        return true;
+    }
+
+    function singlequoteopening($match, $state, $pos) {
+        $this->_addCall('singlequoteopening',array(), $pos);
+        return true;
+    }
+
+    function singlequoteclosing($match, $state, $pos) {
+        $this->_addCall('singlequoteclosing',array(), $pos);
+        return true;
+    }
+
+    function apostrophe($match, $state, $pos) {
+        $this->_addCall('apostrophe',array(), $pos);
+        return true;
+    }
+
+    function doublequoteopening($match, $state, $pos) {
+        $this->_addCall('doublequoteopening',array(), $pos);
+        return true;
+    }
+
+    function doublequoteclosing($match, $state, $pos) {
+        $this->_addCall('doublequoteclosing',array(), $pos);
+        return true;
+    }
+
+    function camelcaselink($match, $state, $pos) {
+        $this->_addCall('camelcaselink',array($match), $pos);
+        return true;
+    }
+
+    /*
+    */
+    function internallink($match, $state, $pos) {
+        // Strip the opening and closing markup
+        $link = preg_replace(array('/^\[\[/','/\]\]$/u'),'',$match);
+
+        // Split title from URL
+        $link = explode('|',$link,2);
+        if ( !isset($link[1]) ) {
+            $link[1] = NULL;
+        } else if ( preg_match('/^\{\{[^\}]+\}\}$/',$link[1]) ) {
+            // If the title is an image, convert it to an array containing the image details
+            $link[1] = Doku_Handler_Parse_Media($link[1]);
+        }
+        $link[0] = trim($link[0]);
+
+        //decide which kind of link it is
+
+        if ( preg_match('/^[a-zA-Z0-9\.]+>{1}.*$/u',$link[0]) ) {
+        // Interwiki
+            $interwiki = explode('>',$link[0],2);
+            $this->_addCall(
+                'interwikilink',
+                array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]),
+                $pos
+                );
+        }elseif ( preg_match('/^\\\\\\\\[\w.:?\-;,]+?\\\\/u',$link[0]) ) {
+        // Windows Share
+            $this->_addCall(
+                'windowssharelink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }elseif ( preg_match('#^([a-z0-9\-\.+]+?)://#i',$link[0]) ) {
+        // external link (accepts all protocols)
+            $this->_addCall(
+                    'externallink',
+                    array($link[0],$link[1]),
+                    $pos
+                    );
+        }elseif ( preg_match('<'.PREG_PATTERN_VALID_EMAIL.'>',$link[0]) ) {
+        // E-Mail (pattern above is defined in inc/mail.php)
+            $this->_addCall(
+                'emaillink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }elseif ( preg_match('!^#.+!',$link[0]) ){
+        // local link
+            $this->_addCall(
+                'locallink',
+                array(substr($link[0],1),$link[1]),
+                $pos
+                );
+        }else{
+        // internal link
+            $this->_addCall(
+                'internallink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }
+
+        return true;
+    }
+
+    function filelink($match, $state, $pos) {
+        $this->_addCall('filelink',array($match, NULL), $pos);
+        return true;
+    }
+
+    function windowssharelink($match, $state, $pos) {
+        $this->_addCall('windowssharelink',array($match, NULL), $pos);
+        return true;
+    }
+
+    function media($match, $state, $pos) {
+        $p = Doku_Handler_Parse_Media($match);
+
+        $this->_addCall(
+              $p['type'],
+              array($p['src'], $p['title'], $p['align'], $p['width'],
+                     $p['height'], $p['cache'], $p['linking']),
+              $pos
+             );
+        return true;
+    }
+
+    function rss($match, $state, $pos) {
+        $link = preg_replace(array('/^\{\{rss>/','/\}\}$/'),'',$match);
+
+        // get params
+        list($link,$params) = explode(' ',$link,2);
+
+        $p = array();
+        if(preg_match('/\b(\d+)\b/',$params,$match)){
+            $p['max'] = $match[1];
+        }else{
+            $p['max'] = 8;
+        }
+        $p['reverse'] = (preg_match('/rev/',$params));
+        $p['author']  = (preg_match('/\b(by|author)/',$params));
+        $p['date']    = (preg_match('/\b(date)/',$params));
+        $p['details'] = (preg_match('/\b(desc|detail)/',$params));
+
+        if (preg_match('/\b(\d+)([dhm])\b/',$params,$match)) {
+          $period = array('d' => 86400, 'h' => 3600, 'm' => 60);
+          $p['refresh'] = max(600,$match[1]*$period[$match[2]]);  // n * period in seconds, minimum 10 minutes
+        } else {
+          $p['refresh'] = 14400;   // default to 4 hours
+        }
+
+        $this->_addCall('rss',array($link,$p),$pos);
+        return true;
+    }
+
+    function externallink($match, $state, $pos) {
+        $url   = $match;
+        $title = null;
+
+        // add protocol on simple short URLs
+        if(substr($url,0,3) == 'ftp' && (substr($url,0,6) != 'ftp://')){
+            $title = $url;
+            $url   = 'ftp://'.$url;
+        }
+        if(substr($url,0,3) == 'www' && (substr($url,0,7) != 'http://')){
+            $title = $url;
+            $url = 'http://'.$url;
+        }
+
+        $this->_addCall('externallink',array($url, $title), $pos);
+        return true;
+    }
+
+    function emaillink($match, $state, $pos) {
+        $email = preg_replace(array('/^</','/>$/'),'',$match);
+        $this->_addCall('emaillink',array($email, NULL), $pos);
+        return true;
+    }
+
+    function table($match, $state, $pos) {
+        switch ( $state ) {
+
+            case DOKU_LEXER_ENTER:
+
+                $ReWriter = & new Doku_Handler_Table($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+
+                $this->_addCall('table_start', array(), $pos);
+                if ( trim($match) == '^' ) {
+                    $this->_addCall('tableheader', array(), $pos);
+                } else {
+                    $this->_addCall('tablecell', array(), $pos);
+                }
+            break;
+
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('table_end', array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+
+            case DOKU_LEXER_UNMATCHED:
+                if ( trim($match) != '' ) {
+                    $this->_addCall('cdata',array($match), $pos);
+                }
+            break;
+
+            case DOKU_LEXER_MATCHED:
+                if ( $match == ' ' ){
+                    $this->_addCall('cdata', array($match), $pos);
+                } else if ( preg_match('/:::/',$match) ) {
+                    $this->_addCall('rowspan', array($match), $pos);
+                } else if ( preg_match('/\t+/',$match) ) {
+                    $this->_addCall('table_align', array($match), $pos);
+                } else if ( preg_match('/ {2,}/',$match) ) {
+                    $this->_addCall('table_align', array($match), $pos);
+                } else if ( $match == "\n|" ) {
+                    $this->_addCall('table_row', array(), $pos);
+                    $this->_addCall('tablecell', array(), $pos);
+                } else if ( $match == "\n^" ) {
+                    $this->_addCall('table_row', array(), $pos);
+                    $this->_addCall('tableheader', array(), $pos);
+                } else if ( $match == '|' ) {
+                    $this->_addCall('tablecell', array(), $pos);
+                } else if ( $match == '^' ) {
+                    $this->_addCall('tableheader', array(), $pos);
+                }
+            break;
+        }
+        return true;
+    }
+}
+
+//------------------------------------------------------------------------
+function Doku_Handler_Parse_Media($match) {
+
+    // Strip the opening and closing markup
+    $link = preg_replace(array('/^\{\{/','/\}\}$/u'),'',$match);
+
+    // Split title from URL
+    $link = explode('|',$link,2);
+
+
+    // Check alignment
+    $ralign = (bool)preg_match('/^ /',$link[0]);
+    $lalign = (bool)preg_match('/ $/',$link[0]);
+
+    // Logic = what's that ;)...
+    if ( $lalign & $ralign ) {
+        $align = 'center';
+    } else if ( $ralign ) {
+        $align = 'right';
+    } else if ( $lalign ) {
+        $align = 'left';
+    } else {
+        $align = NULL;
+    }
+
+    // The title...
+    if ( !isset($link[1]) ) {
+        $link[1] = NULL;
+    }
+
+    //remove aligning spaces
+    $link[0] = trim($link[0]);
+
+    //split into src and parameters (using the very last questionmark)
+    $pos = strrpos($link[0], '?');
+    if($pos !== false){
+        $src   = substr($link[0],0,$pos);
+        $param = substr($link[0],$pos+1);
+    }else{
+        $src   = $link[0];
+        $param = '';
+    }
+
+    //parse width and height
+    if(preg_match('#(\d+)(x(\d+))?#i',$param,$size)){
+        ($size[1]) ? $w = $size[1] : $w = NULL;
+        ($size[3]) ? $h = $size[3] : $h = NULL;
+    } else {
+        $w = NULL;
+        $h = NULL;
+    }
+
+    //get linking command
+    if(preg_match('/nolink/i',$param)){
+        $linking = 'nolink';
+    }else if(preg_match('/direct/i',$param)){
+        $linking = 'direct';
+    }else if(preg_match('/linkonly/i',$param)){
+        $linking = 'linkonly';
+    }else{
+        $linking = 'details';
+    }
+
+    //get caching command
+    if (preg_match('/(nocache|recache)/i',$param,$cachemode)){
+        $cache = $cachemode[1];
+    }else{
+        $cache = 'cache';
+    }
+
+    // Check whether this is a local or remote image
+    if ( preg_match('#^(https?|ftp)#i',$src) ) {
+        $call = 'externalmedia';
+    } else {
+        $call = 'internalmedia';
+    }
+
+    $params = array(
+        'type'=>$call,
+        'src'=>$src,
+        'title'=>$link[1],
+        'align'=>$align,
+        'width'=>$w,
+        'height'=>$h,
+        'cache'=>$cache,
+        'linking'=>$linking,
+    );
+
+    return $params;
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_CallWriter {
+
+    var $Handler;
+
+    function Doku_Handler_CallWriter(& $Handler) {
+        $this->Handler = & $Handler;
+    }
+
+    function writeCall($call) {
+        $this->Handler->calls[] = $call;
+    }
+
+    function writeCalls($calls) {
+        $this->Handler->calls = array_merge($this->Handler->calls, $calls);
+    }
+
+    // function is required, but since this call writer is first/highest in
+    // the chain it is not required to do anything
+    function finalise() {
+    }
+}
+
+//------------------------------------------------------------------------
+/**
+ * Generic call writer class to handle nesting of rendering instructions
+ * within a render instruction. Also see nest() method of renderer base class
+ *
+ * @author    Chris Smith <chris@jalakai.co.uk>
+ */
+class Doku_Handler_Nest {
+
+    var $CallWriter;
+    var $calls = array();
+
+    var $closingInstruction;
+
+    /**
+     * constructor
+     *
+     * @param  object     $CallWriter     the renderers current call writer
+     * @param  string     $close          closing instruction name, this is required to properly terminate the
+     *                                    syntax mode if the document ends without a closing pattern
+     */
+    function Doku_Handler_Nest(& $CallWriter, $close="nest_close") {
+        $this->CallWriter = & $CallWriter;
+
+        $this->closingInstruction = $close;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array($this->closingInstruction,array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+    }
+
+    function process() {
+        // merge consecutive cdata
+        $unmerged_calls = $this->calls;
+        $this->calls = array();
+
+        foreach ($unmerged_calls as $call) $this->addCall($call);
+
+        $first_call = reset($this->calls);
+        $this->CallWriter->writeCall(array("nest", array($this->calls), $first_call[2]));
+    }
+
+    function addCall($call) {
+        $key = count($this->calls);
+        if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) {
+            $this->calls[$key-1][1][0] .= $call[1][0];
+        } else if ($call[0] == 'eol') {
+            // do nothing (eol shouldn't be allowed, to counter preformatted fix in #1652 & #1699)
+        } else {
+            $this->calls[] = $call;
+        }
+    }
+}
+
+class Doku_Handler_List {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $listCalls = array();
+    var $listStack = array();
+
+    function Doku_Handler_List(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+#        $this->CallWriter->writeCalls($this->calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('list_close',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+    }
+
+    //------------------------------------------------------------------------
+    function process() {
+
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+                case 'list_item':
+                    $this->listOpen($call);
+                break;
+                case 'list_open':
+                    $this->listStart($call);
+                break;
+                case 'list_close':
+                    $this->listEnd($call);
+                break;
+                default:
+                    $this->listContent($call);
+                break;
+            }
+        }
+
+        $this->CallWriter->writeCalls($this->listCalls);
+    }
+
+    //------------------------------------------------------------------------
+    function listStart($call) {
+        $depth = $this->interpretSyntax($call[1][0], $listType);
+
+        $this->initialDepth = $depth;
+        $this->listStack[] = array($listType, $depth);
+
+        $this->listCalls[] = array('list'.$listType.'_open',array(),$call[2]);
+        $this->listCalls[] = array('listitem_open',array(1),$call[2]);
+        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+    }
+
+    //------------------------------------------------------------------------
+    function listEnd($call) {
+        $closeContent = true;
+
+        while ( $list = array_pop($this->listStack) ) {
+            if ( $closeContent ) {
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $closeContent = false;
+            }
+            $this->listCalls[] = array('listitem_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$list[0].'_close', array(), $call[2]);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    function listOpen($call) {
+        $depth = $this->interpretSyntax($call[1][0], $listType);
+        $end = end($this->listStack);
+
+        // Not allowed to be shallower than initialDepth
+        if ( $depth < $this->initialDepth ) {
+            $depth = $this->initialDepth;
+        }
+
+        //------------------------------------------------------------------------
+        if ( $depth == $end[1] ) {
+
+            // Just another item in the list...
+            if ( $listType == $end[0] ) {
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
+                $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+            // Switched list type...
+            } else {
+
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                $this->listCalls[] = array('list'.$end[0].'_close', array(), $call[2]);
+                $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+                $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+                $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                array_pop($this->listStack);
+                $this->listStack[] = array($listType, $depth);
+            }
+
+        //------------------------------------------------------------------------
+        // Getting deeper...
+        } else if ( $depth > $end[1] ) {
+
+            $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+            $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+            $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+            $this->listStack[] = array($listType, $depth);
+
+        //------------------------------------------------------------------------
+        // Getting shallower ( $depth < $end[1] )
+        } else {
+            $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+            $this->listCalls[] = array('listitem_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$end[0].'_close',array(),$call[2]);
+
+            // Throw away the end - done
+            array_pop($this->listStack);
+
+            while (1) {
+                $end = end($this->listStack);
+
+                if ( $end[1] <= $depth ) {
+
+                    // Normalize depths
+                    $depth = $end[1];
+
+                    $this->listCalls[] = array('listitem_close',array(),$call[2]);
+
+                    if ( $end[0] == $listType ) {
+                        $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
+                        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                    } else {
+                        // Switching list type...
+                        $this->listCalls[] = array('list'.$end[0].'_close', array(), $call[2]);
+                        $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+                        $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+                        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                        array_pop($this->listStack);
+                        $this->listStack[] = array($listType, $depth);
+                    }
+
+                    break;
+
+                // Haven't dropped down far enough yet.... ( $end[1] > $depth )
+                } else {
+
+                    $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                    $this->listCalls[] = array('list'.$end[0].'_close',array(),$call[2]);
+
+                    array_pop($this->listStack);
+
+                }
+
+            }
+
+        }
+    }
+
+    //------------------------------------------------------------------------
+    function listContent($call) {
+        $this->listCalls[] = $call;
+    }
+
+    //------------------------------------------------------------------------
+    function interpretSyntax($match, & $type) {
+        if ( substr($match,-1) == '*' ) {
+            $type = 'u';
+        } else {
+            $type = 'o';
+        }
+        // Is the +1 needed? It used to be count(explode(...))
+        // but I don't think the number is seen outside this handler
+        return substr_count(str_replace("\t",'  ',$match), '  ') + 1;
+    }
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Preformatted {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $pos;
+    var $text ='';
+
+
+
+    function Doku_Handler_Preformatted(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+#        $this->CallWriter->writeCalls($this->calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('preformatted_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+    }
+
+    function process() {
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+                case 'preformatted_start':
+                    $this->pos = $call[2];
+                break;
+                case 'preformatted_newline':
+                    $this->text .= "\n";
+                break;
+                case 'preformatted_content':
+                    $this->text .= $call[1][0];
+                break;
+                case 'preformatted_end':
+                    if (trim($this->text)) {
+                      $this->CallWriter->writeCall(array('preformatted',array($this->text),$this->pos));
+                    }
+                    // see FS#1699 & FS#1652, add 'eol' instructions to ensure proper triggering of following p_open
+                    $this->CallWriter->writeCall(array('eol',array(),$this->pos));
+                    $this->CallWriter->writeCall(array('eol',array(),$this->pos));
+                break;
+            }
+        }
+    }
+
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Quote {
+
+    var $CallWriter;
+
+    var $calls = array();
+
+    var $quoteCalls = array();
+
+    function Doku_Handler_Quote(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('quote_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+    }
+
+    function process() {
+
+        $quoteDepth = 1;
+
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+
+                case 'quote_start':
+
+                    $this->quoteCalls[] = array('quote_open',array(),$call[2]);
+
+                case 'quote_newline':
+
+                    $quoteLength = $this->getDepth($call[1][0]);
+
+                    if ( $quoteLength > $quoteDepth ) {
+                        $quoteDiff = $quoteLength - $quoteDepth;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_open',array(),$call[2]);
+                        }
+                    } else if ( $quoteLength < $quoteDepth ) {
+                        $quoteDiff = $quoteDepth - $quoteLength;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+                        }
+                    } else {
+                        if ($call[0] != 'quote_start') $this->quoteCalls[] = array('linebreak',array(),$call[2]);
+                    }
+
+                    $quoteDepth = $quoteLength;
+
+                break;
+
+                case 'quote_end':
+
+                    if ( $quoteDepth > 1 ) {
+                        $quoteDiff = $quoteDepth - 1;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+                        }
+                    }
+
+                    $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+
+                    $this->CallWriter->writeCalls($this->quoteCalls);
+                break;
+
+                default:
+                    $this->quoteCalls[] = $call;
+                break;
+            }
+        }
+    }
+
+    function getDepth($marker) {
+        preg_match('/>{1,}/', $marker, $matches);
+        $quoteLength = strlen($matches[0]);
+        return $quoteLength;
+    }
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Table {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $tableCalls = array();
+    var $maxCols = 0;
+    var $maxRows = 1;
+    var $currentCols = 0;
+    var $firstCell = false;
+    var $lastCellType = 'tablecell';
+
+    function Doku_Handler_Table(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('table_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+    }
+
+    //------------------------------------------------------------------------
+    function process() {
+        foreach ( $this->calls as $call ) {
+            switch ( $call[0] ) {
+                case 'table_start':
+                    $this->tableStart($call);
+                break;
+                case 'table_row':
+                    $this->tableRowClose(array('tablerow_close',$call[1],$call[2]));
+                    $this->tableRowOpen(array('tablerow_open',$call[1],$call[2]));
+                break;
+                case 'tableheader':
+                case 'tablecell':
+                    $this->tableCell($call);
+                break;
+                case 'table_end':
+                    $this->tableRowClose(array('tablerow_close',$call[1],$call[2]));
+                    $this->tableEnd($call);
+                break;
+                default:
+                    $this->tableDefault($call);
+                break;
+            }
+        }
+        $this->CallWriter->writeCalls($this->tableCalls);
+    }
+
+    function tableStart($call) {
+        $this->tableCalls[] = array('table_open',array(),$call[2]);
+        $this->tableCalls[] = array('tablerow_open',array(),$call[2]);
+        $this->firstCell = true;
+    }
+
+    function tableEnd($call) {
+        $this->tableCalls[] = array('table_close',array(),$call[2]);
+        $this->finalizeTable();
+    }
+
+    function tableRowOpen($call) {
+        $this->tableCalls[] = $call;
+        $this->currentCols = 0;
+        $this->firstCell = true;
+        $this->lastCellType = 'tablecell';
+        $this->maxRows++;
+    }
+
+    function tableRowClose($call) {
+        // Strip off final cell opening and anything after it
+        while ( $discard = array_pop($this->tableCalls ) ) {
+
+            if ( $discard[0] == 'tablecell_open' || $discard[0] == 'tableheader_open') {
+                break;
+            }
+        }
+        $this->tableCalls[] = $call;
+
+        if ( $this->currentCols > $this->maxCols ) {
+            $this->maxCols = $this->currentCols;
+        }
+    }
+
+    function tableCell($call) {
+        if ( !$this->firstCell ) {
+
+            // Increase the span
+            $lastCall = end($this->tableCalls);
+
+            // A cell call which follows an open cell means an empty cell so span
+            if ( $lastCall[0] == 'tablecell_open' || $lastCall[0] == 'tableheader_open' ) {
+                 $this->tableCalls[] = array('colspan',array(),$call[2]);
+
+            }
+
+            $this->tableCalls[] = array($this->lastCellType.'_close',array(),$call[2]);
+            $this->tableCalls[] = array($call[0].'_open',array(1,NULL,1),$call[2]);
+            $this->lastCellType = $call[0];
+
+        } else {
+
+            $this->tableCalls[] = array($call[0].'_open',array(1,NULL,1),$call[2]);
+            $this->lastCellType = $call[0];
+            $this->firstCell = false;
+
+        }
+
+        $this->currentCols++;
+    }
+
+    function tableDefault($call) {
+        $this->tableCalls[] = $call;
+    }
+
+    function finalizeTable() {
+
+        // Add the max cols and rows to the table opening
+        if ( $this->tableCalls[0][0] == 'table_open' ) {
+            // Adjust to num cols not num col delimeters
+            $this->tableCalls[0][1][] = $this->maxCols - 1;
+            $this->tableCalls[0][1][] = $this->maxRows;
+        } else {
+            trigger_error('First element in table call list is not table_open');
+        }
+
+        $lastRow = 0;
+        $lastCell = 0;
+        $cellKey = array();
+        $toDelete = array();
+
+        // Look for the colspan elements and increment the colspan on the
+        // previous non-empty opening cell. Once done, delete all the cells
+        // that contain colspans
+        foreach ( $this->tableCalls as $key => $call ) {
+
+            if ( $call[0] == 'tablerow_open' ) {
+
+                $lastRow++;
+                $lastCell = 0;
+
+            } else if ( $call[0] == 'tablecell_open' || $call[0] == 'tableheader_open' ) {
+
+                $lastCell++;
+                $cellKey[$lastRow][$lastCell] = $key;
+
+            } else if ( $call[0] == 'table_align' ) {
+
+                $prev = in_array($this->tableCalls[$key-1][0], array('tablecell_open', 'tableheader_open'));
+                $next = in_array($this->tableCalls[$key+1][0], array('tablecell_close', 'tableheader_close'));
+                // If the cell is empty, align left
+                if ($prev && $next) {
+                    $this->tableCalls[$key-1][1][1] = 'left';
+
+                // If the previous element was a cell open, align right
+                } elseif ($prev) {
+                    $this->tableCalls[$key-1][1][1] = 'right';
+
+                // If the next element is the close of an element, align either center or left
+                } elseif ( $next) {
+                    if ( $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] == 'right' ) {
+                        $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] = 'center';
+                    } else {
+                        $this->tableCalls[$cellKey[$lastRow][$lastCell]][1][1] = 'left';
+                    }
+
+                }
+
+                // Now convert the whitespace back to cdata
+                $this->tableCalls[$key][0] = 'cdata';
+
+            } else if ( $call[0] == 'colspan' ) {
+
+                $this->tableCalls[$key-1][1][0] = false;
+
+                for($i = $key-2; $i >= $cellKey[$lastRow][1]; $i--) {
+
+                    if ( $this->tableCalls[$i][0] == 'tablecell_open' || $this->tableCalls[$i][0] == 'tableheader_open' ) {
+
+                        if ( false !== $this->tableCalls[$i][1][0] ) {
+                            $this->tableCalls[$i][1][0]++;
+                            break;
+                        }
+
+
+                    }
+                }
+
+                $toDelete[] = $key-1;
+                $toDelete[] = $key;
+                $toDelete[] = $key+1;
+
+            } else if ( $call[0] == 'rowspan' ) {
+
+                if ( $this->tableCalls[$key-1][0] == 'cdata' ) {
+                    // ignore rowspan if previous call was cdata (text mixed with :::) we don't have to check next call as that wont match regex
+                    $this->tableCalls[$key][0] = 'cdata';
+
+                } else {
+
+                    $this->tableCalls[$key-1][1][2] = false;
+
+                    for($i = $lastRow-1; $i > 0; $i--) {
+
+                        if ( $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tablecell_open' || $this->tableCalls[$cellKey[$i][$lastCell]][0] == 'tableheader_open' ) {
+
+                            if ( false !== $this->tableCalls[$cellKey[$i][$lastCell]][1][2] ) {
+                                $this->tableCalls[$cellKey[$i][$lastCell]][1][2]++;
+                                break;
+                            }
+
+
+                        }
+                    }
+
+                    $toDelete[] = $key-1;
+                    $toDelete[] = $key;
+                    $toDelete[] = $key+1; 
+                }
+            }
+        }
+
+
+        // condense cdata
+        $cnt = count($this->tableCalls);
+        for( $key = 0; $key < $cnt; $key++){
+            if($this->tableCalls[$key][0] == 'cdata'){
+                $ckey = $key;
+                $key++;
+                while($this->tableCalls[$key][0] == 'cdata'){
+                    $this->tableCalls[$ckey][1][0] .= $this->tableCalls[$key][1][0];
+                    $toDelete[] = $key;
+                    $key++;
+                }
+                continue;
+            }
+        }
+
+        foreach ( $toDelete as $delete ) {
+            unset($this->tableCalls[$delete]);
+        }
+        $this->tableCalls = array_values($this->tableCalls);
+    }
+}
+
+
+/**
+ * Handler for paragraphs
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+class Doku_Handler_Block {
+
+    var $calls = array();
+
+    var $blockStack = array();
+
+    var $inParagraph = false;
+    var $atStart = true;
+    var $skipEolKey = -1;
+
+    // Blocks these should not be inside paragraphs
+    var $blockOpen = array(
+            'header',
+            'listu_open','listo_open','listitem_open','listcontent_open',
+            'table_open','tablerow_open','tablecell_open','tableheader_open',
+            'quote_open',
+            'section_open', // Needed to prevent p_open between header and section_open
+            'code','file','hr','preformatted','rss',
+            'htmlblock','phpblock',
+        );
+
+    var $blockClose = array(
+            'header',
+            'listu_close','listo_close','listitem_close','listcontent_close',
+            'table_close','tablerow_close','tablecell_close','tableheader_close',
+            'quote_close',
+            'section_close', // Needed to prevent p_close after section_close
+            'code','file','hr','preformatted','rss',
+            'htmlblock','phpblock',
+        );
+
+    // Stacks can contain paragraphs
+    var $stackOpen = array(
+        'footnote_open','section_open',
+        );
+
+    var $stackClose = array(
+        'footnote_close','section_close',
+        );
+
+
+    /**
+     * Constructor. Adds loaded syntax plugins to the block and stack
+     * arrays
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function Doku_Handler_Block(){
+        global $DOKU_PLUGINS;
+        //check if syntax plugins were loaded
+        if(empty($DOKU_PLUGINS['syntax'])) return;
+        foreach($DOKU_PLUGINS['syntax'] as $n => $p){
+            $ptype = $p->getPType();
+            if($ptype == 'block'){
+                $this->blockOpen[]  = 'plugin_'.$n;
+                $this->blockClose[] = 'plugin_'.$n;
+            }elseif($ptype == 'stack'){
+                $this->stackOpen[]  = 'plugin_'.$n;
+                $this->stackClose[] = 'plugin_'.$n;
+            }
+        }
+    }
+
+    /**
+     * Close a paragraph if needed
+     *
+     * This function makes sure there are no empty paragraphs on the stack
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function closeParagraph($pos){
+        // look back if there was any content - we don't want empty paragraphs
+        $content = '';
+        for($i=count($this->calls)-1; $i>=0; $i--){
+            if($this->calls[$i][0] == 'p_open'){
+                break;
+            }elseif($this->calls[$i][0] == 'cdata'){
+                $content .= $this->calls[$i][1][0];
+            }else{
+                $content = 'found markup';
+                break;
+            }
+        }
+
+        if(trim($content)==''){
+            //remove the whole paragraph
+            array_splice($this->calls,$i);
+        }else{
+            if ($this->calls[count($this->calls)-1][0] == 'section_edit') {
+                $tmp = array_pop($this->calls);
+                $this->calls[] = array('p_close',array(), $pos);
+                $this->calls[] = $tmp;
+            } else {
+                $this->calls[] = array('p_close',array(), $pos);
+            }
+        }
+
+        $this->inParagraph = false;
+    }
+
+    /**
+     * Processes the whole instruction stack to open and close paragraphs
+     *
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @todo   This thing is really messy and should be rewritten
+     */
+    function process($calls) {
+        foreach ( $calls as $key => $call ) {
+            $cname = $call[0];
+            if($cname == 'plugin') {
+                $cname='plugin_'.$call[1][0];
+
+                $plugin = true;
+                $plugin_open = (($call[1][2] == DOKU_LEXER_ENTER) || ($call[1][2] == DOKU_LEXER_SPECIAL));
+                $plugin_close = (($call[1][2] == DOKU_LEXER_EXIT) || ($call[1][2] == DOKU_LEXER_SPECIAL));
+            } else {
+                $plugin = false;
+            }
+
+            // Process blocks which are stack like... (contain linefeeds)
+            if ( in_array($cname,$this->stackOpen ) && (!$plugin || $plugin_open) ) {
+
+                $this->calls[] = $call;
+
+                // Hack - footnotes shouldn't immediately contain a p_open
+                if ( $cname != 'footnote_open' ) {
+                    $this->addToStack();
+                } else {
+                    $this->addToStack(false);
+                }
+                continue;
+            }
+
+            if ( in_array($cname,$this->stackClose ) && (!$plugin || $plugin_close)) {
+
+                if ( $this->inParagraph ) {
+                    $this->closeParagraph($call[2]);
+                }
+                $this->calls[] = $call;
+                $this->removeFromStack();
+                continue;
+            }
+
+            if ( !$this->atStart ) {
+
+                if ( $cname == 'eol' ) {
+
+                    // Check this isn't an eol instruction to skip...
+                    if ( $this->skipEolKey != $key ) {
+                        // Look to see if the next instruction is an EOL
+                        if ( isset($calls[$key+1]) && $calls[$key+1][0] == 'eol' ) {
+
+                            if ( $this->inParagraph ) {
+                                //$this->calls[] = array('p_close',array(), $call[2]);
+                                $this->closeParagraph($call[2]);
+                            }
+
+                            $this->calls[] = array('p_open',array(), $call[2]);
+                            $this->inParagraph = true;
+
+
+                            // Mark the next instruction for skipping
+                            $this->skipEolKey = $key+1;
+
+                        }else{
+                            //if this is just a single eol make a space from it
+                            $this->addCall(array('cdata',array(DOKU_PARSER_EOL), $call[2]));
+                        }
+                    }
+
+
+                } else {
+
+                    $storeCall = true;
+                    if ( $this->inParagraph && (in_array($cname, $this->blockOpen) && (!$plugin || $plugin_open))) {
+                        $this->closeParagraph($call[2]);
+                        $this->calls[] = $call;
+                        $storeCall = false;
+                    }
+
+                    if ( in_array($cname, $this->blockClose) && (!$plugin || $plugin_close)) {
+                        if ( $this->inParagraph ) {
+                            $this->closeParagraph($call[2]);
+                        }
+                        if ( $storeCall ) {
+                            $this->calls[] = $call;
+                            $storeCall = false;
+                        }
+
+                        // This really sucks and suggests this whole class sucks but...
+                        if ( isset($calls[$key+1])) {
+                            $cname_plusone = $calls[$key+1][0];
+                            if ($cname_plusone == 'plugin') {
+                                $cname_plusone = 'plugin'.$calls[$key+1][1][0];
+
+                                // plugin test, true if plugin has a state which precludes it requiring blockOpen or blockClose
+                                $plugin_plusone = true;
+                                $plugin_test = ($call[$key+1][1][2] == DOKU_LEXER_MATCHED) || ($call[$key+1][1][2] == DOKU_LEXER_MATCHED);
+                            } else {
+                                $plugin_plusone = false;
+                            }
+                            if ((!in_array($cname_plusone, $this->blockOpen) && !in_array($cname_plusone, $this->blockClose)) ||
+                                ($plugin_plusone && $plugin_test)
+                                ) {
+
+                                $this->calls[] = array('p_open',array(), $call[2]);
+                                $this->inParagraph = true;
+                            }
+                        }
+                    }
+
+                    if ( $storeCall ) {
+                        $this->addCall($call);
+                    }
+
+                }
+
+
+            } else {
+
+                // Unless there's already a block at the start, start a paragraph
+                if ( !in_array($cname,$this->blockOpen) ) {
+                    $this->calls[] = array('p_open',array(), $call[2]);
+                    if ( $call[0] != 'eol' ) {
+                        $this->calls[] = $call;
+                    }
+                    $this->atStart = false;
+                    $this->inParagraph = true;
+                } else {
+                    $this->addCall($call);
+                    $this->atStart = false;
+                }
+
+            }
+
+        }
+
+        if ( $this->inParagraph ) {
+            if ( $cname == 'p_open' ) {
+                // Ditch the last call
+                array_pop($this->calls);
+            } else if ( !in_array($cname, $this->blockClose) ) {
+                //$this->calls[] = array('p_close',array(), $call[2]);
+                $this->closeParagraph($call[2]);
+            } else {
+                $last_call = array_pop($this->calls);
+                //$this->calls[] = array('p_close',array(), $call[2]);
+                $this->closeParagraph($call[2]);
+                $this->calls[] = $last_call;
+            }
+        }
+
+        return $this->calls;
+    }
+
+    function addToStack($newStart = true) {
+        $this->blockStack[] = array($this->atStart, $this->inParagraph);
+        $this->atStart = $newStart;
+        $this->inParagraph = false;
+    }
+
+    function removeFromStack() {
+        $state = array_pop($this->blockStack);
+        $this->atStart = $state[0];
+        $this->inParagraph = $state[1];
+    }
+
+    function addCall($call) {
+        $key = count($this->calls);
+        if ($key and ($call[0] == 'cdata') and ($this->calls[$key-1][0] == 'cdata')) {
+            $this->calls[$key-1][1][0] .= $call[1][0];
+        } else {
+            $this->calls[] = $call;
+        }
+    }
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/lexer.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/lexer.php
new file mode 100644
index 000000000..afd260a05
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/lexer.php
@@ -0,0 +1,600 @@
+<?php
+/**
+* Author Markus Baker: http://www.lastcraft.com
+* Version adapted from Simple Test: http://sourceforge.net/projects/simpletest/
+* For an intro to the Lexer see:
+* http://www.phppatterns.com/index.php/article/articleview/106/1/2/
+* @author Marcus Baker
+* @package Doku
+* @subpackage Lexer
+* @version $Id: lexer.php,v 1.1 2005/03/23 23:14:09 harryf Exp $
+*/
+
+/**
+* Init path constant
+*/
+if(!defined('DOKU_INC')) die('meh.');
+
+/**#@+
+ * lexer mode constant
+ */
+define("DOKU_LEXER_ENTER", 1);
+define("DOKU_LEXER_MATCHED", 2);
+define("DOKU_LEXER_UNMATCHED", 3);
+define("DOKU_LEXER_EXIT", 4);
+define("DOKU_LEXER_SPECIAL", 5);
+/**#@-*/
+
+/**
+ *    Compounded regular expression. Any of
+ *    the contained patterns could match and
+ *    when one does it's label is returned.
+ *    @package Doku
+ *    @subpackage Lexer
+ */
+class Doku_LexerParallelRegex {
+    var $_patterns;
+    var $_labels;
+    var $_regex;
+    var $_case;
+
+    /**
+     *    Constructor. Starts with no patterns.
+     *    @param boolean $case    True for case sensitive, false
+     *                            for insensitive.
+     *    @access public
+     */
+    function Doku_LexerParallelRegex($case) {
+        $this->_case = $case;
+        $this->_patterns = array();
+        $this->_labels = array();
+        $this->_regex = null;
+    }
+
+    /**
+     *    Adds a pattern with an optional label.
+     *    @param mixed $pattern       Perl style regex. Must be UTF-8
+     *                                encoded. If its a string, the (, )
+     *                                lose their meaning unless they
+     *                                form part of a lookahead or
+     *                                lookbehind assertation.
+     *    @param string $label        Label of regex to be returned
+     *                                on a match. Label must be ASCII
+     *    @access public
+     */
+    function addPattern($pattern, $label = true) {
+        $count = count($this->_patterns);
+        $this->_patterns[$count] = $pattern;
+        $this->_labels[$count] = $label;
+        $this->_regex = null;
+    }
+
+    /**
+     *    Attempts to match all patterns at once against
+     *    a string.
+     *    @param string $subject      String to match against.
+     *    @param string $match        First matched portion of
+     *                                subject.
+     *    @return boolean             True on success.
+     *    @access public
+     */
+    function match($subject, &$match) {
+        if (count($this->_patterns) == 0) {
+            return false;
+        }
+        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+            $match = "";
+            return false;
+        }
+
+        $match = $matches[0];
+        $size = count($matches);
+        for ($i = 1; $i < $size; $i++) {
+            if ($matches[$i] && isset($this->_labels[$i - 1])) {
+                return $this->_labels[$i - 1];
+            }
+        }
+        return true;
+    }
+
+    /**
+     *    Attempts to split the string against all patterns at once
+     *
+     *    @param string $subject      String to match against.
+     *    @param array $split         The split result: array containing, pre-match, match & post-match strings
+     *    @return boolean             True on success.
+     *    @access public
+     *
+     *    @author Christopher Smith <chris@jalakai.co.uk>
+     */
+    function split($subject, &$split) {
+        if (count($this->_patterns) == 0) {
+            return false;
+        }
+
+        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+            if(function_exists('preg_last_error')){
+                $err = preg_last_error();
+                switch($err){
+                    case PREG_BACKTRACK_LIMIT_ERROR:
+                        msg('A PCRE backtrack error occured. Try to increase the pcre.backtrack_limit in php.ini',-1);
+                        break;
+                    case PREG_RECURSION_LIMIT_ERROR:
+                        msg('A PCRE recursion error occured. Try to increase the pcre.recursion_limit in php.ini',-1);
+                        break;
+                    case PREG_BAD_UTF8_ERROR:
+                        msg('A PCRE UTF-8 error occured. This might be caused by a faulty plugin',-1);
+                        break;
+                    case PREG_INTERNAL_ERROR:
+                        msg('A PCRE internal error occured. This might be caused by a faulty plugin',-1);
+                        break;
+                }
+            }
+
+            $split = array($subject, "", "");
+            return false;
+        }
+
+        $idx = count($matches)-2;
+        list($pre, $post) = preg_split($this->_patterns[$idx].$this->_getPerlMatchingFlags(), $subject, 2);
+        $split = array($pre, $matches[0], $post);
+
+        return isset($this->_labels[$idx]) ? $this->_labels[$idx] : true;
+    }
+
+    /**
+     *    Compounds the patterns into a single
+     *    regular expression separated with the
+     *    "or" operator. Caches the regex.
+     *    Will automatically escape (, ) and / tokens.
+     *    @param array $patterns    List of patterns in order.
+     *    @access private
+     */
+    function _getCompoundedRegex() {
+        if ($this->_regex == null) {
+            $cnt = count($this->_patterns);
+            for ($i = 0; $i < $cnt; $i++) {
+
+                /*
+                 * decompose the input pattern into "(", "(?", ")",
+                 * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"...
+                 * elements.
+                 */
+                preg_match_all('/\\\\.|' .
+                               '\(\?|' .
+                               '[()]|' .
+                               '\[\^?\]?(?:\\\\.|\[:[^]]*:\]|[^]\\\\])*\]|' .
+                               '[^[()\\\\]+/', $this->_patterns[$i], $elts);
+
+                $pattern = "";
+                $level = 0;
+
+                foreach ($elts[0] as $elt) {
+                    /*
+                     * for "(", ")" remember the nesting level, add "\"
+                     * only to the non-"(?" ones.
+                     */
+
+                    switch($elt) {
+                    case '(':
+                        $pattern .= '\(';
+                        break;
+                    case ')':
+                        if ($level > 0)
+                            $level--; /* closing (? */
+                        else
+                            $pattern .= '\\';
+                        $pattern .= ')';
+                        break;
+                    case '(?':
+                        $level++;
+                        $pattern .= '(?';
+                        break;
+                    default:
+                        if (substr($elt, 0, 1) == '\\')
+                            $pattern .= $elt;
+                        else
+                            $pattern .= str_replace('/', '\/', $elt);
+                    }
+                }
+                $this->_patterns[$i] = "($pattern)";
+            }
+            $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
+        }
+        return $this->_regex;
+    }
+
+    /**
+     *    Accessor for perl regex mode flags to use.
+     *    @return string       Perl regex flags.
+     *    @access private
+     */
+    function _getPerlMatchingFlags() {
+        return ($this->_case ? "msS" : "msSi");
+    }
+}
+
+/**
+ *    States for a stack machine.
+ *    @package Lexer
+ *    @subpackage Lexer
+ */
+class Doku_LexerStateStack {
+    var $_stack;
+
+    /**
+     *    Constructor. Starts in named state.
+     *    @param string $start        Starting state name.
+     *    @access public
+     */
+    function Doku_LexerStateStack($start) {
+        $this->_stack = array($start);
+    }
+
+    /**
+     *    Accessor for current state.
+     *    @return string       State.
+     *    @access public
+     */
+    function getCurrent() {
+        return $this->_stack[count($this->_stack) - 1];
+    }
+
+    /**
+     *    Adds a state to the stack and sets it
+     *    to be the current state.
+     *    @param string $state        New state.
+     *    @access public
+     */
+    function enter($state) {
+        array_push($this->_stack, $state);
+    }
+
+    /**
+     *    Leaves the current state and reverts
+     *    to the previous one.
+     *    @return boolean    False if we drop off
+     *                       the bottom of the list.
+     *    @access public
+     */
+    function leave() {
+        if (count($this->_stack) == 1) {
+            return false;
+        }
+        array_pop($this->_stack);
+        return true;
+    }
+}
+
+/**
+ *    Accepts text and breaks it into tokens.
+ *    Some optimisation to make the sure the
+ *    content is only scanned by the PHP regex
+ *    parser once. Lexer modes must not start
+ *    with leading underscores.
+ *    @package Doku
+ *    @subpackage Lexer
+ */
+class Doku_Lexer {
+    var $_regexes;
+    var $_parser;
+    var $_mode;
+    var $_mode_handlers;
+    var $_case;
+
+    /**
+     *    Sets up the lexer in case insensitive matching
+     *    by default.
+     *    @param Doku_Parser $parser  Handling strategy by
+     *                                    reference.
+     *    @param string $start            Starting handler.
+     *    @param boolean $case            True for case sensitive.
+     *    @access public
+     */
+    function Doku_Lexer(&$parser, $start = "accept", $case = false) {
+        $this->_case = $case;
+        $this->_regexes = array();
+        $this->_parser = &$parser;
+        $this->_mode = &new Doku_LexerStateStack($start);
+        $this->_mode_handlers = array();
+    }
+
+    /**
+     *    Adds a token search pattern for a particular
+     *    parsing mode. The pattern does not change the
+     *    current mode.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @access public
+     */
+    function addPattern($pattern, $mode = "accept") {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern);
+    }
+
+    /**
+     *    Adds a pattern that will enter a new parsing
+     *    mode. Useful for entering parenthesis, strings,
+     *    tags, etc.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $new_mode     Change parsing to this new
+     *                                nested mode.
+     *    @access public
+     */
+    function addEntryPattern($pattern, $mode, $new_mode) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, $new_mode);
+    }
+
+    /**
+     *    Adds a pattern that will exit the current mode
+     *    and re-enter the previous one.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Mode to leave.
+     *    @access public
+     */
+    function addExitPattern($pattern, $mode) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, "__exit");
+    }
+
+    /**
+     *    Adds a pattern that has a special mode. Acts as an entry
+     *    and exit pattern in one go, effectively calling a special
+     *    parser handler for this token only.
+     *    @param string $pattern      Perl style regex, but ( and )
+     *                                lose the usual meaning.
+     *    @param string $mode         Should only apply this
+     *                                pattern when dealing with
+     *                                this type of input.
+     *    @param string $special      Use this mode for this one token.
+     *    @access public
+     */
+    function addSpecialPattern($pattern, $mode, $special) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, "_$special");
+    }
+
+    /**
+     *    Adds a mapping from a mode to another handler.
+     *    @param string $mode        Mode to be remapped.
+     *    @param string $handler     New target handler.
+     *    @access public
+     */
+    function mapHandler($mode, $handler) {
+        $this->_mode_handlers[$mode] = $handler;
+    }
+
+    /**
+     *    Splits the page text into tokens. Will fail
+     *    if the handlers report an error or if no
+     *    content is consumed. If successful then each
+     *    unparsed and parsed token invokes a call to the
+     *    held listener.
+     *    @param string $raw        Raw HTML text.
+     *    @return boolean           True on success, else false.
+     *    @access public
+     */
+    function parse($raw) {
+        if (! isset($this->_parser)) {
+            return false;
+        }
+        $initialLength = strlen($raw);
+        $length = $initialLength;
+        $pos = 0;
+        while (is_array($parsed = $this->_reduce($raw))) {
+            list($unmatched, $matched, $mode) = $parsed;
+            $currentLength = strlen($raw);
+            $matchPos = $initialLength - $currentLength - strlen($matched);
+            if (! $this->_dispatchTokens($unmatched, $matched, $mode, $pos, $matchPos)) {
+                return false;
+            }
+            if ($currentLength == $length) {
+                return false;
+            }
+            $length = $currentLength;
+            $pos = $initialLength - $currentLength;
+        }
+        if (!$parsed) {
+            return false;
+        }
+        return $this->_invokeParser($raw, DOKU_LEXER_UNMATCHED, $pos);
+    }
+
+    /**
+     *    Sends the matched token and any leading unmatched
+     *    text to the parser changing the lexer to a new
+     *    mode if one is listed.
+     *    @param string $unmatched    Unmatched leading portion.
+     *    @param string $matched      Actual token match.
+     *    @param string $mode         Mode after match. A boolean
+     *                                false mode causes no change.
+     *    @param int $pos         Current byte index location in raw doc
+     *                                thats being parsed
+     *    @return boolean             False if there was any error
+     *                                from the parser.
+     *    @access private
+     */
+    function _dispatchTokens($unmatched, $matched, $mode = false, $initialPos, $matchPos) {
+        if (! $this->_invokeParser($unmatched, DOKU_LEXER_UNMATCHED, $initialPos) ){
+            return false;
+        }
+        if ($this->_isModeEnd($mode)) {
+            if (! $this->_invokeParser($matched, DOKU_LEXER_EXIT, $matchPos)) {
+                return false;
+            }
+            return $this->_mode->leave();
+        }
+        if ($this->_isSpecialMode($mode)) {
+            $this->_mode->enter($this->_decodeSpecial($mode));
+            if (! $this->_invokeParser($matched, DOKU_LEXER_SPECIAL, $matchPos)) {
+                return false;
+            }
+            return $this->_mode->leave();
+        }
+        if (is_string($mode)) {
+            $this->_mode->enter($mode);
+            return $this->_invokeParser($matched, DOKU_LEXER_ENTER, $matchPos);
+        }
+        return $this->_invokeParser($matched, DOKU_LEXER_MATCHED, $matchPos);
+    }
+
+    /**
+     *    Tests to see if the new mode is actually to leave
+     *    the current mode and pop an item from the matching
+     *    mode stack.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    function _isModeEnd($mode) {
+        return ($mode === "__exit");
+    }
+
+    /**
+     *    Test to see if the mode is one where this mode
+     *    is entered for this token only and automatically
+     *    leaves immediately afterwoods.
+     *    @param string $mode    Mode to test.
+     *    @return boolean        True if this is the exit mode.
+     *    @access private
+     */
+    function _isSpecialMode($mode) {
+        return (strncmp($mode, "_", 1) == 0);
+    }
+
+    /**
+     *    Strips the magic underscore marking single token
+     *    modes.
+     *    @param string $mode    Mode to decode.
+     *    @return string         Underlying mode name.
+     *    @access private
+     */
+    function _decodeSpecial($mode) {
+        return substr($mode, 1);
+    }
+
+    /**
+     *    Calls the parser method named after the current
+     *    mode. Empty content will be ignored. The lexer
+     *    has a parser handler for each mode in the lexer.
+     *    @param string $content        Text parsed.
+     *    @param boolean $is_match      Token is recognised rather
+     *                                  than unparsed data.
+     *    @param int $pos         Current byte index location in raw doc
+     *                                thats being parsed
+     *    @access private
+     */
+    function _invokeParser($content, $is_match, $pos) {
+        if (($content === "") || ($content === false)) {
+            return true;
+        }
+        $handler = $this->_mode->getCurrent();
+        if (isset($this->_mode_handlers[$handler])) {
+            $handler = $this->_mode_handlers[$handler];
+        }
+
+        // modes starting with plugin_ are all handled by the same
+        // handler but with an additional parameter
+        if(substr($handler,0,7)=='plugin_'){
+          list($handler,$plugin) = explode('_',$handler,2);
+              return $this->_parser->$handler($content, $is_match, $pos, $plugin);
+        }
+
+            return $this->_parser->$handler($content, $is_match, $pos);
+        }
+
+    /**
+     *    Tries to match a chunk of text and if successful
+     *    removes the recognised chunk and any leading
+     *    unparsed data. Empty strings will not be matched.
+     *    @param string $raw         The subject to parse. This is the
+     *                               content that will be eaten.
+     *    @return array              Three item list of unparsed
+     *                               content followed by the
+     *                               recognised token and finally the
+     *                               action the parser is to take.
+     *                               True if no match, false if there
+     *                               is a parsing error.
+     *    @access private
+     */
+    function _reduce(&$raw) {
+        if (! isset($this->_regexes[$this->_mode->getCurrent()])) {
+            return false;
+        }
+        if ($raw === "") {
+            return true;
+        }
+        if ($action = $this->_regexes[$this->_mode->getCurrent()]->split($raw, $split)) {
+            list($unparsed, $match, $raw) = $split;
+            return array($unparsed, $match, $action);
+        }
+        return true;
+    }
+}
+
+/**
+* Escapes regex characters other than (, ) and /
+* @TODO
+*/
+function Doku_Lexer_Escape($str) {
+    //$str = addslashes($str);
+    $chars = array(
+        '/\\\\/',
+        '/\./',
+        '/\+/',
+        '/\*/',
+        '/\?/',
+        '/\[/',
+        '/\^/',
+        '/\]/',
+        '/\$/',
+        '/\{/',
+        '/\}/',
+        '/\=/',
+        '/\!/',
+        '/\</',
+        '/\>/',
+        '/\|/',
+        '/\:/'
+        );
+
+    $escaped = array(
+        '\\\\\\\\',
+        '\.',
+        '\+',
+        '\*',
+        '\?',
+        '\[',
+        '\^',
+        '\]',
+        '\$',
+        '\{',
+        '\}',
+        '\=',
+        '\!',
+        '\<',
+        '\>',
+        '\|',
+        '\:'
+        );
+    return preg_replace($chars, $escaped, $str);
+}
+
+//Setup VIM: ex: et ts=4 sw=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/metadata.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/metadata.php
new file mode 100644
index 000000000..fc60e5774
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/metadata.php
@@ -0,0 +1,483 @@
+<?php
+/**
+ * Renderer for metadata
+ *
+ * @author Esther Brunner <wikidesign@gmail.com>
+ */
+if(!defined('DOKU_INC')) die('meh.');
+
+if ( !defined('DOKU_LF') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_LF',"\n");
+}
+
+if ( !defined('DOKU_TAB') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_TAB',"\t");
+}
+
+require_once DOKU_INC . 'inc/parser/renderer.php';
+
+/**
+ * The Renderer
+ */
+class Doku_Renderer_metadata extends Doku_Renderer {
+
+  var $doc  = '';
+  var $meta = array();
+  var $persistent = array();
+
+  var $headers = array();
+  var $capture = true;
+  var $store   = '';
+  var $firstimage = '';
+
+  function getFormat(){
+    return 'metadata';
+  }
+
+  function document_start(){
+    global $ID;
+
+    $this->headers = array();
+
+    // external pages are missing create date
+    if(!$this->persistent['date']['created']){
+        $this->persistent['date']['created'] = filectime(wikiFN($ID));
+    }
+    if(!isset($this->persistent['creator'])){
+        $this->persistent['creator'] = '';
+    }
+    // reset metadata to persistent values
+    $this->meta = $this->persistent;
+  }
+
+  function document_end(){
+    global $ID;
+
+    // store internal info in metadata (notoc,nocache)
+    $this->meta['internal'] = $this->info;
+
+    if (!isset($this->meta['description']['abstract'])){
+      // cut off too long abstracts
+      $this->doc = trim($this->doc);
+      if (strlen($this->doc) > 500)
+        $this->doc = utf8_substr($this->doc, 0, 500).'…';
+      $this->meta['description']['abstract'] = $this->doc;
+    }
+
+    $this->meta['relation']['firstimage'] = $this->firstimage;
+
+    if(!isset($this->meta['date']['modified'])){
+        $this->meta['date']['modified'] = filemtime(wikiFN($ID));
+    }
+
+  }
+
+  function toc_additem($id, $text, $level) {
+    global $conf;
+
+    //only add items within configured levels
+    if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
+      // the TOC is one of our standard ul list arrays ;-)
+      $this->meta['description']['tableofcontents'][] = array(
+        'hid'   => $id,
+        'title' => $text,
+        'type'  => 'ul',
+        'level' => $level-$conf['toptoclevel']+1
+      );
+    }
+
+  }
+
+  function header($text, $level, $pos) {
+    if (!isset($this->meta['title'])) $this->meta['title'] = $text;
+
+    // add the header to the TOC
+    $hid = $this->_headerToLink($text,'true');
+    $this->toc_additem($hid, $text, $level);
+
+    // add to summary
+    if ($this->capture && ($level > 1)) $this->doc .= DOKU_LF.$text.DOKU_LF;
+  }
+
+  function section_open($level){}
+  function section_close(){}
+
+  function cdata($text){
+    if ($this->capture) $this->doc .= $text;
+  }
+
+  function p_open(){
+    if ($this->capture) $this->doc .= DOKU_LF;
+  }
+
+  function p_close(){
+    if ($this->capture){
+      if (strlen($this->doc) > 250) $this->capture = false;
+      else $this->doc .= DOKU_LF;
+    }
+  }
+
+  function linebreak(){
+    if ($this->capture) $this->doc .= DOKU_LF;
+  }
+
+  function hr(){
+    if ($this->capture){
+      if (strlen($this->doc) > 250) $this->capture = false;
+      else $this->doc .= DOKU_LF.'----------'.DOKU_LF;
+    }
+  }
+
+  function strong_open(){}
+  function strong_close(){}
+
+  function emphasis_open(){}
+  function emphasis_close(){}
+
+  function underline_open(){}
+  function underline_close(){}
+
+  function monospace_open(){}
+  function monospace_close(){}
+
+  function subscript_open(){}
+  function subscript_close(){}
+
+  function superscript_open(){}
+  function superscript_close(){}
+
+  function deleted_open(){}
+  function deleted_close(){}
+
+  /**
+   * Callback for footnote start syntax
+   *
+   * All following content will go to the footnote instead of
+   * the document. To achieve this the previous rendered content
+   * is moved to $store and $doc is cleared
+   *
+   * @author Andreas Gohr <andi@splitbrain.org>
+   */
+  function footnote_open() {
+    if ($this->capture){
+      // move current content to store and record footnote
+      $this->store = $this->doc;
+      $this->doc   = '';
+    }
+  }
+
+  /**
+   * Callback for footnote end syntax
+   *
+   * All rendered content is moved to the $footnotes array and the old
+   * content is restored from $store again
+   *
+   * @author Andreas Gohr
+   */
+  function footnote_close() {
+    if ($this->capture){
+      // restore old content
+      $this->doc = $this->store;
+      $this->store = '';
+    }
+  }
+
+  function listu_open(){
+    if ($this->capture) $this->doc .= DOKU_LF;
+  }
+
+  function listu_close(){
+    if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
+  }
+
+  function listo_open(){
+    if ($this->capture) $this->doc .= DOKU_LF;
+  }
+
+  function listo_close(){
+    if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
+  }
+
+  function listitem_open($level){
+    if ($this->capture) $this->doc .= str_repeat(DOKU_TAB, $level).'* ';
+  }
+
+  function listitem_close(){
+    if ($this->capture) $this->doc .= DOKU_LF;
+  }
+
+  function listcontent_open(){}
+  function listcontent_close(){}
+
+  function unformatted($text){
+    if ($this->capture) $this->doc .= $text;
+  }
+
+  function php($text){}
+
+  function phpblock($text){}
+
+  function html($text){}
+
+  function htmlblock($text){}
+
+  function preformatted($text){
+    if ($this->capture) $this->doc .= $text;
+  }
+
+  function file($text, $lang = null, $file = null){
+    if ($this->capture){
+      $this->doc .= DOKU_LF.$text;
+      if (strlen($this->doc) > 250) $this->capture = false;
+      else $this->doc .= DOKU_LF;
+    }
+  }
+
+  function quote_open(){
+    if ($this->capture) $this->doc .= DOKU_LF.DOKU_TAB.'"';
+  }
+
+  function quote_close(){
+    if ($this->capture){
+      $this->doc .= '"';
+      if (strlen($this->doc) > 250) $this->capture = false;
+      else $this->doc .= DOKU_LF;
+    }
+  }
+
+  function code($text, $language = NULL, $file = null){
+    if ($this->capture){
+      $this->doc .= DOKU_LF.$text;
+      if (strlen($this->doc) > 250) $this->capture = false;
+      else $this->doc .= DOKU_LF;
+    }
+  }
+
+  function acronym($acronym){
+    if ($this->capture) $this->doc .= $acronym;
+  }
+
+  function smiley($smiley){
+    if ($this->capture) $this->doc .= $smiley;
+  }
+
+  function entity($entity){
+    if ($this->capture) $this->doc .= $entity;
+  }
+
+  function multiplyentity($x, $y){
+    if ($this->capture) $this->doc .= $x.'×'.$y;
+  }
+
+  function singlequoteopening(){
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['singlequoteopening'];
+  }
+
+  function singlequoteclosing(){
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['singlequoteclosing'];
+  }
+
+  function apostrophe() {
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['apostrophe'];
+  }
+
+  function doublequoteopening(){
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['doublequoteopening'];
+  }
+
+  function doublequoteclosing(){
+    global $lang;
+    if ($this->capture) $this->doc .= $lang['doublequoteclosing'];
+  }
+
+  function camelcaselink($link) {
+    $this->internallink($link, $link);
+  }
+
+  function locallink($hash, $name = NULL){}
+
+  /**
+   * keep track of internal links in $this->meta['relation']['references']
+   */
+  function internallink($id, $name = NULL){
+    global $ID;
+
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
+    $default = $this->_simpleTitle($id);
+
+    // first resolve and clean up the $id
+    resolve_pageid(getNS($ID), $id, $exists);
+    list($page, $hash) = explode('#', $id, 2);
+
+    // set metadata
+    $this->meta['relation']['references'][$page] = $exists;
+    // $data = array('relation' => array('isreferencedby' => array($ID => true)));
+    // p_set_metadata($id, $data);
+
+    // add link title to summary
+    if ($this->capture){
+      $name = $this->_getLinkTitle($name, $default, $id);
+      $this->doc .= $name;
+    }
+  }
+
+  function externallink($url, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
+    if ($this->capture){
+      if ($name) $this->doc .= $name;
+      else $this->doc .= '<'.$url.'>';
+    }
+  }
+
+  function interwikilink($match, $name = NULL, $wikiName, $wikiUri){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
+    if ($this->capture){
+      list($wikiUri, $hash) = explode('#', $wikiUri, 2);
+      $name = $this->_getLinkTitle($name, $wikiName.'>'.$wikiUri);
+      $this->doc .= $name;
+    }
+  }
+
+  function windowssharelink($url, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
+    if ($this->capture){
+      if ($name) $this->doc .= $name;
+      else $this->doc .= '<'.$url.'>';
+    }
+  }
+
+  function emaillink($address, $name = NULL){
+    if(is_array($name))
+        $this->_firstimage($name['src']);
+
+    if ($this->capture){
+      if ($name) $this->doc .= $name;
+      else $this->doc .= '<'.$address.'>';
+    }
+  }
+
+  function internalmedia($src, $title=NULL, $align=NULL, $width=NULL,
+                         $height=NULL, $cache=NULL, $linking=NULL){
+    if ($this->capture && $title) $this->doc .= '['.$title.']';
+    $this->_firstimage($src);
+  }
+
+  function externalmedia($src, $title=NULL, $align=NULL, $width=NULL,
+                         $height=NULL, $cache=NULL, $linking=NULL){
+    if ($this->capture && $title) $this->doc .= '['.$title.']';
+    $this->_firstimage($src);
+  }
+
+  function rss($url,$params) {
+    $this->meta['relation']['haspart'][$url] = true;
+
+    $this->meta['date']['valid']['age'] =
+            isset($this->meta['date']['valid']['age']) ?
+                min($this->meta['date']['valid']['age'],$params['refresh']) :
+                $params['refresh'];
+  }
+
+  function table_open($maxcols = NULL, $numrows = NULL){}
+  function table_close(){}
+
+  function tablerow_open(){}
+  function tablerow_close(){}
+
+  function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){}
+  function tableheader_close(){}
+
+  function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){}
+  function tablecell_close(){}
+
+  //----------------------------------------------------------
+  // Utils
+
+  /**
+   * Removes any Namespace from the given name but keeps
+   * casing and special chars
+   *
+   * @author Andreas Gohr <andi@splitbrain.org>
+   */
+  function _simpleTitle($name){
+    global $conf;
+
+    if(is_array($name)) return '';
+
+    if($conf['useslash']){
+        $nssep = '[:;/]';
+    }else{
+        $nssep = '[:;]';
+    }
+    $name = preg_replace('!.*'.$nssep.'!','',$name);
+    //if there is a hash we use the anchor name only
+    $name = preg_replace('!.*#!','',$name);
+    return $name;
+  }
+
+  /**
+   * Creates a linkid from a headline
+   *
+   * @param string  $title   The headline title
+   * @param boolean $create  Create a new unique ID?
+   * @author Andreas Gohr <andi@splitbrain.org>
+   */
+  function _headerToLink($title, $create=false) {
+      if($create){
+          return sectionID($title,$this->headers);
+      }else{
+          $check = false;
+          return sectionID($title,$check);
+      }
+  }
+
+  /**
+   * Construct a title and handle images in titles
+   *
+   * @author Harry Fuecks <hfuecks@gmail.com>
+   */
+  function _getLinkTitle($title, $default, $id=NULL) {
+    global $conf;
+
+    $isImage = false;
+    if (is_null($title)){
+      if (useHeading('content') && $id){
+        $heading = p_get_first_heading($id,false);
+        if ($heading) return $heading;
+      }
+      return $default;
+    } else if (is_string($title)){
+      return $title;
+    } else if (is_array($title)){
+      return '['.$title['title'].']';
+    }
+  }
+
+  function _firstimage($src){
+    if($this->firstimage) return;
+    global $ID;
+
+    list($src,$hash) = explode('#',$src,2);
+    if(!preg_match('/^https?:\/\//i',$src)){
+        resolve_mediaid(getNS($ID),$src, $exists);
+    }
+    if(preg_match('/.(jpe?g|gif|png)$/i',$src)){
+        $this->firstimage = $src;
+    }
+  }
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/parser.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/parser.php
new file mode 100644
index 000000000..a78b08a29
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/parser.php
@@ -0,0 +1,956 @@
+<?php
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/parser/lexer.php';
+require_once DOKU_INC . 'inc/parser/handler.php';
+
+
+/**
+ * Define various types of modes used by the parser - they are used to
+ * populate the list of modes another mode accepts
+ */
+global $PARSER_MODES;
+$PARSER_MODES = array(
+    // containers are complex modes that can contain many other modes
+    // hr breaks the principle but they shouldn't be used in tables / lists
+    // so they are put here
+    'container'    => array('listblock','table','quote','hr'),
+
+    // some mode are allowed inside the base mode only
+    'baseonly'     => array('header'),
+
+    // modes for styling text -- footnote behaves similar to styling
+    'formatting'   => array('strong', 'emphasis', 'underline', 'monospace',
+                            'subscript', 'superscript', 'deleted', 'footnote'),
+
+    // modes where the token is simply replaced - they can not contain any
+    // other modes
+    'substition'   => array('acronym','smiley','wordblock','entity',
+                            'camelcaselink', 'internallink','media',
+                            'externallink','linebreak','emaillink',
+                            'windowssharelink','filelink','notoc',
+                            'nocache','multiplyentity','quotes','rss'),
+
+    // modes which have a start and end token but inside which
+    // no other modes should be applied
+    'protected'    => array('preformatted','code','file','php','html','htmlblock','phpblock'),
+
+    // inside this mode no wiki markup should be applied but lineendings
+    // and whitespace isn't preserved
+    'disabled'     => array('unformatted'),
+
+    // used to mark paragraph boundaries
+    'paragraphs'   => array('eol')
+);
+
+//-------------------------------------------------------------------
+
+/**
+* Sets up the Lexer with modes and points it to the Handler
+* For an intro to the Lexer see: wiki:parser
+*/
+class Doku_Parser {
+
+    var $Handler;
+
+    var $Lexer;
+
+    var $modes = array();
+
+    var $connected = false;
+
+    function addBaseMode(& $BaseMode) {
+        $this->modes['base'] = & $BaseMode;
+        if ( !$this->Lexer ) {
+            $this->Lexer = & new Doku_Lexer($this->Handler,'base', true);
+        }
+        $this->modes['base']->Lexer = & $this->Lexer;
+    }
+
+    /**
+    * PHP preserves order of associative elements
+    * Mode sequence is important
+    */
+    function addMode($name, & $Mode) {
+        if ( !isset($this->modes['base']) ) {
+            $this->addBaseMode(new Doku_Parser_Mode_base());
+        }
+        $Mode->Lexer = & $this->Lexer;
+        $this->modes[$name] = & $Mode;
+    }
+
+    function connectModes() {
+
+        if ( $this->connected ) {
+            return;
+        }
+
+        foreach ( array_keys($this->modes) as $mode ) {
+
+            // Base isn't connected to anything
+            if ( $mode == 'base' ) {
+                continue;
+            }
+
+            $this->modes[$mode]->preConnect();
+
+            foreach ( array_keys($this->modes) as $cm ) {
+
+                if ( $this->modes[$cm]->accepts($mode) ) {
+                    $this->modes[$mode]->connectTo($cm);
+                }
+
+            }
+
+            $this->modes[$mode]->postConnect();
+        }
+
+        $this->connected = true;
+    }
+
+    function parse($doc) {
+        if ( $this->Lexer ) {
+            $this->connectModes();
+            // Normalize CRs and pad doc
+            $doc = "\n".str_replace("\r\n","\n",$doc)."\n";
+            $this->Lexer->parse($doc);
+            $this->Handler->_finalize();
+            return $this->Handler->calls;
+        } else {
+            return false;
+        }
+    }
+
+}
+
+//-------------------------------------------------------------------
+/**
+ * This class and all the subclasses below are
+ * used to reduce the effort required to register
+ * modes with the Lexer. For performance these
+ * could all be eliminated later perhaps, or
+ * the Parser could be serialized to a file once
+ * all modes are registered
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+*/
+class Doku_Parser_Mode {
+
+    var $Lexer;
+
+    var $allowedModes = array();
+
+    // returns a number used to determine in which order modes are added
+    function getSort() {
+        trigger_error('getSort() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    // Called before any calls to connectTo
+    function preConnect() {}
+
+    // Connects the mode
+    function connectTo($mode) {}
+
+    // Called after all calls to connectTo
+    function postConnect() {}
+
+    function accepts($mode) {
+        return in_array($mode, (array) $this->allowedModes );
+    }
+
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_base extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_base() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['container'],
+                $PARSER_MODES['baseonly'],
+                $PARSER_MODES['paragraphs'],
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['protected'],
+                $PARSER_MODES['disabled']
+            );
+    }
+
+    function getSort() {
+        return 0;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_footnote extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_footnote() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['container'],
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['protected'],
+                $PARSER_MODES['disabled']
+            );
+
+        unset($this->allowedModes[array_search('footnote', $this->allowedModes)]);
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern(
+            '\x28\x28(?=.*\x29\x29)',$mode,'footnote'
+            );
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern(
+            '\x29\x29','footnote'
+            );
+    }
+
+    function getSort() {
+        return 150;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_header extends Doku_Parser_Mode {
+
+    function preConnect() {
+        //we're not picky about the closing ones, two are enough
+        $this->Lexer->addSpecialPattern(
+                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',
+                            'base',
+                            'header'
+                        );
+    }
+
+    function getSort() {
+        return 50;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_notoc extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('~~NOTOC~~',$mode,'notoc');
+    }
+
+    function getSort() {
+        return 30;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_nocache extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('~~NOCACHE~~',$mode,'nocache');
+    }
+
+    function getSort() {
+        return 40;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_linebreak extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('\x5C{2}(?:[ \t]|(?=\n))',$mode,'linebreak');
+    }
+
+    function getSort() {
+        return 140;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_eol extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $badModes = array('listblock','table');
+        if ( in_array($mode, $badModes) ) {
+            return;
+        }
+        // see FS#1652, pattern extended to swallow preceding whitespace to avoid issues with lines that only contain whitespace
+        $this->Lexer->addSpecialPattern('(?:^[ \t]*)?\n',$mode,'eol');
+    }
+
+    function getSort() {
+        return 370;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_hr extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('\n[ \t]*-{4,}[ \t]*(?=\n)',$mode,'hr');
+    }
+
+    function getSort() {
+        return 160;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
+    var $type;
+
+    var $formatting = array (
+        'strong' => array (
+            'entry'=>'\*\*(?=.*\*\*)',
+            'exit'=>'\*\*',
+            'sort'=>70
+            ),
+
+        'emphasis'=> array (
+            'entry'=>'//(?=[^\x00]*[^:])', //hack for bugs #384 #763 #1468
+            'exit'=>'//',
+            'sort'=>80
+            ),
+
+        'underline'=> array (
+            'entry'=>'__(?=.*__)',
+            'exit'=>'__',
+            'sort'=>90
+            ),
+
+        'monospace'=> array (
+            'entry'=>'\x27\x27(?=.*\x27\x27)',
+            'exit'=>'\x27\x27',
+            'sort'=>100
+            ),
+
+        'subscript'=> array (
+            'entry'=>'<sub>(?=.*</sub>)',
+            'exit'=>'</sub>',
+            'sort'=>110
+            ),
+
+        'superscript'=> array (
+            'entry'=>'<sup>(?=.*</sup>)',
+            'exit'=>'</sup>',
+            'sort'=>120
+            ),
+
+        'deleted'=> array (
+            'entry'=>'<del>(?=.*</del>)',
+            'exit'=>'</del>',
+            'sort'=>130
+            ),
+        );
+
+    function Doku_Parser_Mode_formatting($type) {
+        global $PARSER_MODES;
+
+        if ( !array_key_exists($type, $this->formatting) ) {
+            trigger_error('Invalid formatting type '.$type, E_USER_WARNING);
+        }
+
+        $this->type = $type;
+
+        // formatting may contain other formatting but not it self
+        $modes = $PARSER_MODES['formatting'];
+        $key = array_search($type, $modes);
+        if ( is_int($key) ) {
+            unset($modes[$key]);
+        }
+
+        $this->allowedModes = array_merge (
+                $modes,
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled']
+            );
+    }
+
+    function connectTo($mode) {
+
+        // Can't nest formatting in itself
+        if ( $mode == $this->type ) {
+            return;
+        }
+
+        $this->Lexer->addEntryPattern(
+                $this->formatting[$this->type]['entry'],
+                $mode,
+                $this->type
+            );
+    }
+
+    function postConnect() {
+
+        $this->Lexer->addExitPattern(
+            $this->formatting[$this->type]['exit'],
+            $this->type
+            );
+
+    }
+
+    function getSort() {
+        return $this->formatting[$this->type]['sort'];
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_listblock extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_listblock() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected'] #XXX new
+            );
+
+    //    $this->allowedModes[] = 'footnote';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('\n {2,}[\-\*]',$mode,'listblock');
+        $this->Lexer->addEntryPattern('\n\t{1,}[\-\*]',$mode,'listblock');
+
+        $this->Lexer->addPattern('\n {2,}[\-\*]','listblock');
+        $this->Lexer->addPattern('\n\t{1,}[\-\*]','listblock');
+
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('\n','listblock');
+    }
+
+    function getSort() {
+        return 10;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_table extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_table() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected']
+            );
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('\n\^',$mode,'table');
+        $this->Lexer->addEntryPattern('\n\|',$mode,'table');
+    }
+
+    function postConnect() {
+        $this->Lexer->addPattern('\n\^','table');
+        $this->Lexer->addPattern('\n\|','table');
+        $this->Lexer->addPattern('[\t ]*:::[\t ]*(?=[\|\^])','table');
+        $this->Lexer->addPattern('[\t ]+','table');
+        $this->Lexer->addPattern('\^','table');
+        $this->Lexer->addPattern('\|','table');
+        $this->Lexer->addExitPattern('\n','table');
+    }
+
+    function getSort() {
+        return 60;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_unformatted extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('<nowiki>(?=.*</nowiki>)',$mode,'unformatted');
+        $this->Lexer->addEntryPattern('%%(?=.*%%)',$mode,'unformattedalt');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('</nowiki>','unformatted');
+        $this->Lexer->addExitPattern('%%','unformattedalt');
+        $this->Lexer->mapHandler('unformattedalt','unformatted');
+    }
+
+    function getSort() {
+        return 170;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_php extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('<php>(?=.*</php>)',$mode,'php');
+        $this->Lexer->addEntryPattern('<PHP>(?=.*</PHP>)',$mode,'phpblock');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('</php>','php');
+        $this->Lexer->addExitPattern('</PHP>','phpblock');
+    }
+
+    function getSort() {
+        return 180;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_html extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('<html>(?=.*</html>)',$mode,'html');
+        $this->Lexer->addEntryPattern('<HTML>(?=.*</HTML>)',$mode,'htmlblock');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('</html>','html');
+        $this->Lexer->addExitPattern('</HTML>','htmlblock');
+    }
+
+    function getSort() {
+        return 190;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_preformatted extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Has hard coded awareness of lists...
+        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');
+        $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');
+
+        // How to effect a sub pattern with the Lexer!
+        $this->Lexer->addPattern('\n  ','preformatted');
+        $this->Lexer->addPattern('\n\t','preformatted');
+
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('\n','preformatted');
+    }
+
+    function getSort() {
+        return 20;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_code extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('<code(?=.*</code>)',$mode,'code');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('</code>','code');
+    }
+
+    function getSort() {
+        return 200;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_file extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('<file(?=.*</file>)',$mode,'file');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('</file>','file');
+    }
+
+    function getSort() {
+        return 210;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_quote extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_quote() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected'] #XXX new
+            );
+            #$this->allowedModes[] = 'footnote';
+            #$this->allowedModes[] = 'preformatted';
+            #$this->allowedModes[] = 'unformatted';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('\n>{1,}',$mode,'quote');
+    }
+
+    function postConnect() {
+        $this->Lexer->addPattern('\n>{1,}','quote');
+        $this->Lexer->addExitPattern('\n','quote');
+    }
+
+    function getSort() {
+        return 220;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_acronym extends Doku_Parser_Mode {
+    // A list
+    var $acronyms = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_acronym($acronyms) {
+    	usort($acronyms,array($this,'_compare'));
+        $this->acronyms = $acronyms;
+    }
+
+    function preConnect() {
+        if(!count($this->acronyms)) return;
+
+        $bound = '[\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]';
+        $acronyms = array_map('Doku_Lexer_Escape',$this->acronyms);
+        $this->pattern = '(?<=^|'.$bound.')(?:'.join('|',$acronyms).')(?='.$bound.')';
+    }
+
+    function connectTo($mode) {
+        if(!count($this->acronyms)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'acronym');
+        }
+    }
+
+    function getSort() {
+        return 240;
+    }
+
+    /**
+     * sort callback to order by string length descending
+     */
+    function _compare($a,$b) {
+        $a_len = strlen($a);
+        $b_len = strlen($b);
+        if ($a_len > $b_len) {
+          return -1;
+        } else if ($a_len < $b_len) {
+          return 1;
+        }
+
+    	return 0;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_smiley extends Doku_Parser_Mode {
+    // A list
+    var $smileys = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_smiley($smileys) {
+        $this->smileys = $smileys;
+    }
+
+    function preConnect() {
+        if(!count($this->smileys) || $this->pattern != '') return;
+
+        $sep = '';
+        foreach ( $this->smileys as $smiley ) {
+            $this->pattern .= $sep.'(?<=\W|^)'.Doku_Lexer_Escape($smiley).'(?=\W|$)';
+            $sep = '|';
+        }
+    }
+
+    function connectTo($mode) {
+        if(!count($this->smileys)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'smiley');
+        }
+    }
+
+    function getSort() {
+        return 230;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_wordblock extends Doku_Parser_Mode {
+    // A list
+    var $badwords = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_wordblock($badwords) {
+        $this->badwords = $badwords;
+    }
+
+    function preConnect() {
+
+        if ( count($this->badwords) == 0 || $this->pattern != '') {
+            return;
+        }
+
+        $sep = '';
+        foreach ( $this->badwords as $badword ) {
+            $this->pattern .= $sep.'(?<=\b)(?i)'.Doku_Lexer_Escape($badword).'(?-i)(?=\b)';
+            $sep = '|';
+        }
+
+    }
+
+    function connectTo($mode) {
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'wordblock');
+        }
+    }
+
+    function getSort() {
+        return 250;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_entity extends Doku_Parser_Mode {
+    // A list
+    var $entities = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_entity($entities) {
+        $this->entities = $entities;
+    }
+
+    function preConnect() {
+        if(!count($this->entities) || $this->pattern != '') return;
+
+        $sep = '';
+        foreach ( $this->entities as $entity ) {
+            $this->pattern .= $sep.Doku_Lexer_Escape($entity);
+            $sep = '|';
+        }
+    }
+
+    function connectTo($mode) {
+        if(!count($this->entities)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'entity');
+        }
+    }
+
+    function getSort() {
+        return 260;
+    }
+}
+
+//-------------------------------------------------------------------
+// Implements the 640x480 replacement
+class Doku_Parser_Mode_multiplyentity extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+
+        $this->Lexer->addSpecialPattern(
+                    '(?<=\b)(?:[1-9]|\d{2,})[xX]\d+(?=\b)',$mode,'multiplyentity'
+                );
+
+    }
+
+    function getSort() {
+        return 270;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_quotes extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        global $conf;
+
+        $ws   =  '\s/\#~:+=&%@\-\x28\x29\]\[{}><"\'';   // whitespace
+        $punc =  ';,\.?!';
+
+        if($conf['typography'] == 2){
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[$ws])'(?=[^$ws$punc])",$mode,'singlequoteopening'
+                    );
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[^$ws]|[$punc])'(?=$|[$ws$punc])",$mode,'singlequoteclosing'
+                    );
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[^$ws$punc])'(?=$|[^$ws$punc])",$mode,'apostrophe'
+                    );
+        }
+
+        $this->Lexer->addSpecialPattern(
+                    "(?<=^|[$ws])\"(?=[^$ws$punc])",$mode,'doublequoteopening'
+                );
+        $this->Lexer->addSpecialPattern(
+                    "\"",$mode,'doublequoteclosing'
+                );
+
+
+    }
+
+    function getSort() {
+        return 280;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_camelcaselink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+                '\b[A-Z]+[a-z]+[A-Z][A-Za-z]*\b',$mode,'camelcaselink'
+            );
+    }
+
+    function getSort() {
+        return 290;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_internallink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Word boundaries?
+        $this->Lexer->addSpecialPattern("\[\[.+?\]\]",$mode,'internallink');
+    }
+
+    function getSort() {
+        return 300;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_media extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Word boundaries?
+        $this->Lexer->addSpecialPattern("\{\{[^\}]+\}\}",$mode,'media');
+    }
+
+    function getSort() {
+        return 320;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_rss extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern("\{\{rss>[^\}]+\}\}",$mode,'rss');
+    }
+
+    function getSort() {
+        return 310;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_externallink extends Doku_Parser_Mode {
+    var $schemes = array();
+    var $patterns = array();
+
+    function preConnect() {
+        if(count($this->patterns)) return;
+
+        $ltrs = '\w';
+        $gunk = '/\#~:.?+=&%@!\-';
+        $punc = '.:?\-;,';
+        $host = $ltrs.$punc;
+        $any  = $ltrs.$gunk.$punc;
+
+        $this->schemes = getSchemes();
+        foreach ( $this->schemes as $scheme ) {
+            $this->patterns[] = '\b(?i)'.$scheme.'(?-i)://['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        }
+
+        $this->patterns[] = '\b(?i)www?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        $this->patterns[] = '\b(?i)ftp?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+    }
+
+    function connectTo($mode) {
+
+        foreach ( $this->patterns as $pattern ) {
+            $this->Lexer->addSpecialPattern($pattern,$mode,'externallink');
+        }
+    }
+
+    function getSort() {
+        return 330;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_filelink extends Doku_Parser_Mode {
+
+    var $pattern;
+
+    function preConnect() {
+
+        $ltrs = '\w';
+        $gunk = '/\#~:.?+=&%@!\-';
+        $punc = '.:?\-;,';
+        $host = $ltrs.$punc;
+        $any  = $ltrs.$gunk.$punc;
+
+        $this->pattern = '\b(?i)file(?-i)://['.$any.']+?['.
+            $punc.']*[^'.$any.']';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+            $this->pattern,$mode,'filelink');
+    }
+
+    function getSort() {
+        return 360;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_windowssharelink extends Doku_Parser_Mode {
+
+    var $pattern;
+
+    function preConnect() {
+        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w$]+)+";
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+            $this->pattern,$mode,'windowssharelink');
+    }
+
+    function getSort() {
+        return 350;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_emaillink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // pattern below is defined in inc/mail.php
+        $this->Lexer->addSpecialPattern('<'.PREG_PATTERN_VALID_EMAIL.'>',$mode,'emaillink');
+    }
+
+    function getSort() {
+        return 340;
+    }
+}
+
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/renderer.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/renderer.php
new file mode 100644
index 000000000..6082e935d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/renderer.php
@@ -0,0 +1,322 @@
+<?php
+/**
+ * Renderer output base class
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/parser/renderer.php';
+require_once DOKU_INC . 'inc/plugin.php';
+require_once DOKU_INC . 'inc/pluginutils.php';
+
+/**
+ * An empty renderer, produces no output
+ *
+ * Inherits from DokuWiki_Plugin for giving additional functions to render plugins
+ */
+class Doku_Renderer extends DokuWiki_Plugin {
+    var $info = array(
+        'cache' => true, // may the rendered result cached?
+        'toc'   => true, // render the TOC?
+    );
+
+    // keep some config options
+    var $acronyms = array();
+    var $smileys = array();
+    var $badwords = array();
+    var $entities = array();
+    var $interwiki = array();
+
+    // allows renderer to be used again, clean out any per-use values
+    function reset() {
+    }
+
+    function nocache() {
+        $this->info['cache'] = false;
+    }
+
+    function notoc() {
+        $this->info['toc'] = false;
+    }
+
+    /**
+     * Returns the format produced by this renderer.
+     *
+     * Has to be overidden by decendend classes
+     */
+    function getFormat(){
+        trigger_error('getFormat() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+
+    //handle plugin rendering
+    function plugin($name,$data){
+        $plugin =& plugin_load('syntax',$name);
+        if($plugin != null){
+            $plugin->render($this->getFormat(),$this,$data);
+        }
+    }
+
+    /**
+     * handle nested render instructions
+     * this method (and nest_close method) should not be overloaded in actual renderer output classes
+     */
+    function nest($instructions) {
+
+      foreach ( $instructions as $instruction ) {
+        // execute the callback against ourself
+        call_user_func_array(array(&$this, $instruction[0]),$instruction[1]);
+      }
+    }
+
+    // dummy closing instruction issued by Doku_Handler_Nest, normally the syntax mode should
+    // override this instruction when instantiating Doku_Handler_Nest - however plugins will not
+    // be able to - as their instructions require data.
+    function nest_close() {}
+
+    function document_start() {}
+
+    function document_end() {}
+
+    function render_TOC() { return ''; }
+
+    function toc_additem($id, $text, $level) {}
+
+    function header($text, $level, $pos) {}
+
+    function section_edit($start, $end, $level, $name) {}
+
+    function section_open($level) {}
+
+    function section_close() {}
+
+    function cdata($text) {}
+
+    function p_open() {}
+
+    function p_close() {}
+
+    function linebreak() {}
+
+    function hr() {}
+
+    function strong_open() {}
+
+    function strong_close() {}
+
+    function emphasis_open() {}
+
+    function emphasis_close() {}
+
+    function underline_open() {}
+
+    function underline_close() {}
+
+    function monospace_open() {}
+
+    function monospace_close() {}
+
+    function subscript_open() {}
+
+    function subscript_close() {}
+
+    function superscript_open() {}
+
+    function superscript_close() {}
+
+    function deleted_open() {}
+
+    function deleted_close() {}
+
+    function footnote_open() {}
+
+    function footnote_close() {}
+
+    function listu_open() {}
+
+    function listu_close() {}
+
+    function listo_open() {}
+
+    function listo_close() {}
+
+    function listitem_open($level) {}
+
+    function listitem_close() {}
+
+    function listcontent_open() {}
+
+    function listcontent_close() {}
+
+    function unformatted($text) {}
+
+    function php($text) {}
+
+    function phpblock($text) {}
+
+    function html($text) {}
+
+    function htmlblock($text) {}
+
+    function preformatted($text) {}
+
+    function quote_open() {}
+
+    function quote_close() {}
+
+    function file($text, $lang = null, $file = null ) {}
+
+    function code($text, $lang = null, $file = null ) {}
+
+    function acronym($acronym) {}
+
+    function smiley($smiley) {}
+
+    function wordblock($word) {}
+
+    function entity($entity) {}
+
+    // 640x480 ($x=640, $y=480)
+    function multiplyentity($x, $y) {}
+
+    function singlequoteopening() {}
+
+    function singlequoteclosing() {}
+
+    function apostrophe() {}
+
+    function doublequoteopening() {}
+
+    function doublequoteclosing() {}
+
+    // $link like 'SomePage'
+    function camelcaselink($link) {}
+
+    function locallink($hash, $name = NULL) {}
+
+    // $link like 'wiki:syntax', $title could be an array (media)
+    function internallink($link, $title = NULL) {}
+
+    // $link is full URL with scheme, $title could be an array (media)
+    function externallink($link, $title = NULL) {}
+
+    function rss ($url,$params) {}
+
+    // $link is the original link - probably not much use
+    // $wikiName is an indentifier for the wiki
+    // $wikiUri is the URL fragment to append to some known URL
+    function interwikilink($link, $title = NULL, $wikiName, $wikiUri) {}
+
+    // Link to file on users OS, $title could be an array (media)
+    function filelink($link, $title = NULL) {}
+
+    // Link to a Windows share, , $title could be an array (media)
+    function windowssharelink($link, $title = NULL) {}
+
+//  function email($address, $title = NULL) {}
+    function emaillink($address, $name = NULL) {}
+
+    function internalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
+                            $height=NULL, $cache=NULL, $linking=NULL) {}
+
+    function externalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
+                            $height=NULL, $cache=NULL, $linking=NULL) {}
+
+    function internalmedialink (
+        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
+        ) {}
+
+    function externalmedialink(
+        $src,$title=NULL,$align=NULL,$width=NULL,$height=NULL,$cache=NULL
+        ) {}
+
+    function table_open($maxcols = NULL, $numrows = NULL){}
+
+    function table_close(){}
+
+    function tablerow_open(){}
+
+    function tablerow_close(){}
+
+    function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){}
+
+    function tableheader_close(){}
+
+    function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){}
+
+    function tablecell_close(){}
+
+
+    // util functions follow, you probably won't need to reimplement them
+
+
+    /**
+     * Removes any Namespace from the given name but keeps
+     * casing and special chars
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _simpleTitle($name){
+        global $conf;
+
+        //if there is a hash we use the ancor name only
+        list($name,$hash) = explode('#',$name,2);
+        if($hash) return $hash;
+
+        //trim colons or slash of a namespace link
+        $name = rtrim($name,':');
+        if($conf['useslash'])
+          $name = rtrim($name,'/');
+
+        if($conf['useslash']){
+            $nssep = '[:;/]';
+        }else{
+            $nssep = '[:;]';
+        }
+        $name = preg_replace('!.*'.$nssep.'!','',$name);
+
+        if(!$name) return $this->_simpleTitle($conf['start']);
+        return $name;
+    }
+
+    /**
+     * Resolve an interwikilink
+     */
+    function _resolveInterWiki(&$shortcut,$reference){
+        //get interwiki URL
+        if ( isset($this->interwiki[$shortcut]) ) {
+            $url = $this->interwiki[$shortcut];
+        } else {
+            // Default to Google I'm feeling lucky
+            $url = 'http://www.google.com/search?q={URL}&amp;btnI=lucky';
+            $shortcut = 'go';
+        }
+
+        //split into hash and url part
+        list($reference,$hash) = explode('#',$reference,2);
+
+        //replace placeholder
+        if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){
+            //use placeholders
+            $url = str_replace('{URL}',rawurlencode($reference),$url);
+            $url = str_replace('{NAME}',$reference,$url);
+            $parsed = parse_url($reference);
+            if(!$parsed['port']) $parsed['port'] = 80;
+            $url = str_replace('{SCHEME}',$parsed['scheme'],$url);
+            $url = str_replace('{HOST}',$parsed['host'],$url);
+            $url = str_replace('{PORT}',$parsed['port'],$url);
+            $url = str_replace('{PATH}',$parsed['path'],$url);
+            $url = str_replace('{QUERY}',$parsed['query'],$url);
+        }else{
+            //default
+            $url = $url.rawurlencode($reference);
+        }
+        if($hash) $url .= '#'.rawurlencode($hash);
+
+        return $url;
+    }
+}
+
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtml.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtml.php
new file mode 100644
index 000000000..4d5333f7a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtml.php
@@ -0,0 +1,1142 @@
+<?php
+/**
+ * Renderer for XHTML output
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+if(!defined('DOKU_INC')) die('meh.');
+
+if ( !defined('DOKU_LF') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_LF',"\n");
+}
+
+if ( !defined('DOKU_TAB') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_TAB',"\t");
+}
+
+require_once DOKU_INC . 'inc/parser/renderer.php';
+require_once DOKU_INC . 'inc/html.php';
+
+/**
+ * The Renderer
+ */
+class Doku_Renderer_xhtml extends Doku_Renderer {
+
+    // @access public
+    var $doc = '';        // will contain the whole document
+    var $toc = array();   // will contain the Table of Contents
+
+
+    var $headers = array();
+    var $footnotes = array();
+    var $lastlevel = 0;
+    var $node = array(0,0,0,0,0);
+    var $store = '';
+
+    var $_counter   = array(); // used as global counter, introduced for table classes
+    var $_codeblock = 0; // counts the code and file blocks, used to provide download links
+
+    function getFormat(){
+        return 'xhtml';
+    }
+
+
+    function document_start() {
+        //reset some internals
+        $this->toc     = array();
+        $this->headers = array();
+    }
+
+    function document_end() {
+        if ( count ($this->footnotes) > 0 ) {
+            $this->doc .= '<div class="footnotes">'.DOKU_LF;
+
+            $id = 0;
+            foreach ( $this->footnotes as $footnote ) {
+                $id++;   // the number of the current footnote
+
+                // check its not a placeholder that indicates actual footnote text is elsewhere
+                if (substr($footnote, 0, 5) != "@@FNT") {
+
+                    // open the footnote and set the anchor and backlink
+                    $this->doc .= '<div class="fn">';
+                    $this->doc .= '<sup><a href="#fnt__'.$id.'" id="fn__'.$id.'" name="fn__'.$id.'" class="fn_bot">';
+                    $this->doc .= $id.')</a></sup> '.DOKU_LF;
+
+                    // get any other footnotes that use the same markup
+                    $alt = array_keys($this->footnotes, "@@FNT$id");
+
+                    if (count($alt)) {
+                      foreach ($alt as $ref) {
+                        // set anchor and backlink for the other footnotes
+                        $this->doc .= ', <sup><a href="#fnt__'.($ref+1).'" id="fn__'.($ref+1).'" name="fn__'.($ref+1).'" class="fn_bot">';
+                        $this->doc .= ($ref+1).')</a></sup> '.DOKU_LF;
+                      }
+                    }
+
+                    // add footnote markup and close this footnote
+                    $this->doc .= $footnote;
+                    $this->doc .= '</div>' . DOKU_LF;
+                }
+            }
+            $this->doc .= '</div>'.DOKU_LF;
+        }
+
+        // Prepare the TOC
+        global $conf;
+        if($this->info['toc'] && is_array($this->toc) && $conf['tocminheads'] && count($this->toc) >= $conf['tocminheads']){
+            global $TOC;
+            $TOC = $this->toc;
+        }
+
+        // make sure there are no empty paragraphs
+        $this->doc = preg_replace('#<p>\s*</p>#','',$this->doc);
+    }
+
+    function toc_additem($id, $text, $level) {
+        global $conf;
+
+        //handle TOC
+        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
+            $this->toc[] = html_mktocitem($id, $text, $level-$conf['toptoclevel']+1);
+        }
+    }
+
+    function header($text, $level, $pos) {
+        if(!$text) return; //skip empty headlines
+
+        $hid = $this->_headerToLink($text,true);
+
+        //only add items within configured levels
+        $this->toc_additem($hid, $text, $level);
+
+        // adjust $node to reflect hierarchy of levels
+        $this->node[$level-1]++;
+        if ($level < $this->lastlevel) {
+            for ($i = 0; $i < $this->lastlevel-$level; $i++) {
+                $this->node[$this->lastlevel-$i-1] = 0;
+            }
+        }
+        $this->lastlevel = $level;
+
+        // write the header
+        $this->doc .= DOKU_LF.'<h'.$level.'><a name="'.$hid.'" id="'.$hid.'">';
+        $this->doc .= $this->_xmlEntities($text);
+        $this->doc .= "</a></h$level>".DOKU_LF;
+    }
+
+     /**
+     * Section edit marker is replaced by an edit button when
+     * the page is editable. Replacement done in 'inc/html.php#html_secedit'
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @author Ben Coburn   <btcoburn@silicodon.net>
+     */
+    function section_edit($start, $end, $level, $name) {
+        global $conf;
+
+        if ($start!=-1 && $level<=$conf['maxseclevel']) {
+            $name = str_replace('"', '', $name);
+            $this->doc .= '<!-- SECTION "'.$name.'" ['.$start.'-'.(($end===0)?'':$end).'] -->';
+        }
+    }
+
+    function section_open($level) {
+        $this->doc .= "<div class=\"level$level\">".DOKU_LF;
+    }
+
+    function section_close() {
+        $this->doc .= DOKU_LF.'</div>'.DOKU_LF;
+    }
+
+    function cdata($text) {
+        $this->doc .= $this->_xmlEntities($text);
+    }
+
+    function p_open() {
+        $this->doc .= DOKU_LF.'<p>'.DOKU_LF;
+    }
+
+    function p_close() {
+        $this->doc .= DOKU_LF.'</p>'.DOKU_LF;
+    }
+
+    function linebreak() {
+        $this->doc .= '<br/>'.DOKU_LF;
+    }
+
+    function hr() {
+        $this->doc .= '<hr />'.DOKU_LF;
+    }
+
+    function strong_open() {
+        $this->doc .= '<strong>';
+    }
+
+    function strong_close() {
+        $this->doc .= '</strong>';
+    }
+
+    function emphasis_open() {
+        $this->doc .= '<em>';
+    }
+
+    function emphasis_close() {
+        $this->doc .= '</em>';
+    }
+
+    function underline_open() {
+        $this->doc .= '<em class="u">';
+    }
+
+    function underline_close() {
+        $this->doc .= '</em>';
+    }
+
+    function monospace_open() {
+        $this->doc .= '<code>';
+    }
+
+    function monospace_close() {
+        $this->doc .= '</code>';
+    }
+
+    function subscript_open() {
+        $this->doc .= '<sub>';
+    }
+
+    function subscript_close() {
+        $this->doc .= '</sub>';
+    }
+
+    function superscript_open() {
+        $this->doc .= '<sup>';
+    }
+
+    function superscript_close() {
+        $this->doc .= '</sup>';
+    }
+
+    function deleted_open() {
+        $this->doc .= '<del>';
+    }
+
+    function deleted_close() {
+        $this->doc .= '</del>';
+    }
+
+    /**
+     * Callback for footnote start syntax
+     *
+     * All following content will go to the footnote instead of
+     * the document. To achieve this the previous rendered content
+     * is moved to $store and $doc is cleared
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function footnote_open() {
+
+        // move current content to store and record footnote
+        $this->store = $this->doc;
+        $this->doc   = '';
+    }
+
+    /**
+     * Callback for footnote end syntax
+     *
+     * All rendered content is moved to the $footnotes array and the old
+     * content is restored from $store again
+     *
+     * @author Andreas Gohr
+     */
+    function footnote_close() {
+
+        // recover footnote into the stack and restore old content
+        $footnote = $this->doc;
+        $this->doc = $this->store;
+        $this->store = '';
+
+        // check to see if this footnote has been seen before
+        $i = array_search($footnote, $this->footnotes);
+
+        if ($i === false) {
+            // its a new footnote, add it to the $footnotes array
+            $id = count($this->footnotes)+1;
+            $this->footnotes[count($this->footnotes)] = $footnote;
+        } else {
+            // seen this one before, translate the index to an id and save a placeholder
+            $i++;
+            $id = count($this->footnotes)+1;
+            $this->footnotes[count($this->footnotes)] = "@@FNT".($i);
+        }
+
+        // output the footnote reference and link
+        $this->doc .= '<sup><a href="#fn__'.$id.'" name="fnt__'.$id.'" id="fnt__'.$id.'" class="fn_top">'.$id.')</a></sup>';
+    }
+
+    function listu_open() {
+        $this->doc .= '<ul>'.DOKU_LF;
+    }
+
+    function listu_close() {
+        $this->doc .= '</ul>'.DOKU_LF;
+    }
+
+    function listo_open() {
+        $this->doc .= '<ol>'.DOKU_LF;
+    }
+
+    function listo_close() {
+        $this->doc .= '</ol>'.DOKU_LF;
+    }
+
+    function listitem_open($level) {
+        $this->doc .= '<li class="level'.$level.'">';
+    }
+
+    function listitem_close() {
+        $this->doc .= '</li>'.DOKU_LF;
+    }
+
+    function listcontent_open() {
+        $this->doc .= '<div class="li">';
+    }
+
+    function listcontent_close() {
+        $this->doc .= '</div>'.DOKU_LF;
+    }
+
+    function unformatted($text) {
+        $this->doc .= $this->_xmlEntities($text);
+    }
+
+    /**
+     * Execute PHP code if allowed
+     *
+     * @param  string   $wrapper   html element to wrap result if $conf['phpok'] is okff
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function php($text, $wrapper='code') {
+        global $conf;
+
+        if($conf['phpok']){
+          ob_start();
+          eval($text);
+          $this->doc .= ob_get_contents();
+          ob_end_clean();
+        } else {
+          $this->doc .= p_xhtml_cached_geshi($text, 'php', $wrapper);
+        }
+    }
+
+    function phpblock($text) {
+        $this->php($text, 'pre');
+    }
+
+    /**
+     * Insert HTML if allowed
+     *
+     * @param  string   $wrapper   html element to wrap result if $conf['htmlok'] is okff
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function html($text, $wrapper='code') {
+        global $conf;
+
+        if($conf['htmlok']){
+          $this->doc .= $text;
+        } else {
+          $this->doc .= p_xhtml_cached_geshi($text, 'html4strict', $wrapper);
+        }
+    }
+
+    function htmlblock($text) {
+        $this->html($text, 'pre');
+    }
+
+    function quote_open() {
+        $this->doc .= '<blockquote><div class="no">'.DOKU_LF;
+    }
+
+    function quote_close() {
+        $this->doc .= '</div></blockquote>'.DOKU_LF;
+    }
+
+    function preformatted($text) {
+        $this->doc .= '<pre class="code">' . trim($this->_xmlEntities($text),"\n\r") . '</pre>'. DOKU_LF;
+    }
+
+    function file($text, $language=null, $filename=null) {
+        $this->_highlight('file',$text,$language,$filename);
+    }
+
+    function code($text, $language=null, $filename=null) {
+        $this->_highlight('code',$text,$language,$filename);
+    }
+
+    /**
+     * Use GeSHi to highlight language syntax in code and file blocks
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _highlight($type, $text, $language=null, $filename=null) {
+        global $conf;
+        global $ID;
+        global $lang;
+
+        if($filename){
+            // add icon
+            list($ext) = mimetype($filename,false);
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $class = 'mediafile mf_'.$class;
+
+            $this->doc .= '<dl class="'.$type.'">'.DOKU_LF;
+            $this->doc .= '<dt><a href="'.exportlink($ID,'code',array('codeblock'=>$this->_codeblock)).'" title="'.$lang['download'].'" class="'.$class.'">';
+            $this->doc .= hsc($filename);
+            $this->doc .= '</a></dt>'.DOKU_LF.'<dd>';
+        }
+
+        if ( is_null($language) ) {
+            $this->doc .= '<pre class="'.$type.'">'.$this->_xmlEntities($text).'</pre>'.DOKU_LF;
+        } else {
+            $class = 'code'; //we always need the code class to make the syntax highlighting apply
+            if($type != 'code') $class .= ' '.$type;
+
+            $this->doc .= "<pre class=\"$class $language\">".p_xhtml_cached_geshi($text, $language, '').'</pre>'.DOKU_LF;
+        }
+
+        if($filename){
+            $this->doc .= '</dd></dl>'.DOKU_LF;
+        }
+
+        $this->_codeblock++;
+    }
+
+    function acronym($acronym) {
+
+        if ( array_key_exists($acronym, $this->acronyms) ) {
+
+            $title = $this->_xmlEntities($this->acronyms[$acronym]);
+
+            $this->doc .= '<acronym title="'.$title
+                .'">'.$this->_xmlEntities($acronym).'</acronym>';
+
+        } else {
+            $this->doc .= $this->_xmlEntities($acronym);
+        }
+    }
+
+    function smiley($smiley) {
+        if ( array_key_exists($smiley, $this->smileys) ) {
+            $title = $this->_xmlEntities($this->smileys[$smiley]);
+            $this->doc .= '<img src="'.DOKU_BASE.'lib/images/smileys/'.$this->smileys[$smiley].
+                '" class="middle" alt="'.
+                    $this->_xmlEntities($smiley).'" />';
+        } else {
+            $this->doc .= $this->_xmlEntities($smiley);
+        }
+    }
+
+    /*
+    * not used
+    function wordblock($word) {
+        if ( array_key_exists($word, $this->badwords) ) {
+            $this->doc .= '** BLEEP **';
+        } else {
+            $this->doc .= $this->_xmlEntities($word);
+        }
+    }
+    */
+
+    function entity($entity) {
+        if ( array_key_exists($entity, $this->entities) ) {
+            $this->doc .= $this->entities[$entity];
+        } else {
+            $this->doc .= $this->_xmlEntities($entity);
+        }
+    }
+
+    function multiplyentity($x, $y) {
+        $this->doc .= "$x&times;$y";
+    }
+
+    function singlequoteopening() {
+        global $lang;
+        $this->doc .= $lang['singlequoteopening'];
+    }
+
+    function singlequoteclosing() {
+        global $lang;
+        $this->doc .= $lang['singlequoteclosing'];
+    }
+
+    function apostrophe() {
+        global $lang;
+        $this->doc .= $lang['apostrophe'];
+    }
+
+    function doublequoteopening() {
+        global $lang;
+        $this->doc .= $lang['doublequoteopening'];
+    }
+
+    function doublequoteclosing() {
+        global $lang;
+        $this->doc .= $lang['doublequoteclosing'];
+    }
+
+    /**
+    */
+    function camelcaselink($link) {
+      $this->internallink($link,$link);
+    }
+
+
+    function locallink($hash, $name = NULL){
+        global $ID;
+        $name  = $this->_getLinkTitle($name, $hash, $isImage);
+        $hash  = $this->_headerToLink($hash);
+        $title = $ID.' &crarr;';
+        $this->doc .= '<a href="#'.$hash.'" title="'.$title.'" class="wikilink1">';
+        $this->doc .= $name;
+        $this->doc .= '</a>';
+    }
+
+    /**
+     * Render an internal Wiki Link
+     *
+     * $search,$returnonly & $linktype are not for the renderer but are used
+     * elsewhere - no need to implement them in other renderers
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function internallink($id, $name = NULL, $search=NULL,$returnonly=false,$linktype='content') {
+        global $conf;
+        global $ID;
+        // default name is based on $id as given
+        $default = $this->_simpleTitle($id);
+
+        // now first resolve and clean up the $id
+        resolve_pageid(getNS($ID),$id,$exists);
+        $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype);
+        if ( !$isImage ) {
+            if ( $exists ) {
+                $class='wikilink1';
+            } else {
+                $class='wikilink2';
+                $link['rel']='nofollow';
+            }
+        } else {
+            $class='media';
+        }
+
+        //keep hash anchor
+        list($id,$hash) = explode('#',$id,2);
+        if(!empty($hash)) $hash = $this->_headerToLink($hash);
+
+        //prepare for formating
+        $link['target'] = $conf['target']['wiki'];
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        // highlight link to current page
+        if ($id == $ID) {
+            $link['pre']    = '<span class="curid">';
+            $link['suf']    = '</span>';
+        }
+        $link['more']   = '';
+        $link['class']  = $class;
+        $link['url']    = wl($id);
+        $link['name']   = $name;
+        $link['title']  = $id;
+        //add search string
+        if($search){
+            ($conf['userewrite']) ? $link['url'].='?' : $link['url'].='&amp;';
+            if(is_array($search)){
+                $search = array_map('rawurlencode',$search);
+                $link['url'] .= 's[]='.join('&amp;s[]=',$search);
+            }else{
+                $link['url'] .= 's='.rawurlencode($search);
+            }
+        }
+
+        //keep hash
+        if($hash) $link['url'].='#'.$hash;
+
+        //output formatted
+        if($returnonly){
+            return $this->_formatLink($link);
+        }else{
+            $this->doc .= $this->_formatLink($link);
+        }
+    }
+
+    function externallink($url, $name = NULL) {
+        global $conf;
+
+        $name = $this->_getLinkTitle($name, $url, $isImage);
+
+        if ( !$isImage ) {
+            $class='urlextern';
+        } else {
+            $class='media';
+        }
+
+        //prepare for formating
+        $link['target'] = $conf['target']['extern'];
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['class']  = $class;
+        $link['url']    = $url;
+
+        $link['name']   = $name;
+        $link['title']  = $this->_xmlEntities($url);
+        if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+    */
+    function interwikilink($match, $name = NULL, $wikiName, $wikiUri) {
+        global $conf;
+
+        $link = array();
+        $link['target'] = $conf['target']['interwiki'];
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['name']   = $this->_getLinkTitle($name, $wikiUri, $isImage);
+
+        //get interwiki URL
+        $url = $this->_resolveInterWiki($wikiName,$wikiUri);
+
+        if ( !$isImage ) {
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName);
+            $link['class'] = "interwiki iw_$class";
+        } else {
+            $link['class'] = 'media';
+        }
+
+        //do we stay at the same server? Use local target
+        if( strpos($url,DOKU_URL) === 0 ){
+            $link['target'] = $conf['target']['wiki'];
+        }
+
+        $link['url'] = $url;
+        $link['title'] = htmlspecialchars($link['url']);
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+     */
+    function windowssharelink($url, $name = NULL) {
+        global $conf;
+        global $lang;
+        //simple setup
+        $link['target'] = $conf['target']['windows'];
+        $link['pre']    = '';
+        $link['suf']   = '';
+        $link['style']  = '';
+
+        $link['name'] = $this->_getLinkTitle($name, $url, $isImage);
+        if ( !$isImage ) {
+            $link['class'] = 'windows';
+        } else {
+            $link['class'] = 'media';
+        }
+
+
+        $link['title'] = $this->_xmlEntities($url);
+        $url = str_replace('\\','/',$url);
+        $url = 'file:///'.$url;
+        $link['url'] = $url;
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    function emaillink($address, $name = NULL) {
+        global $conf;
+        //simple setup
+        $link = array();
+        $link['target'] = '';
+        $link['pre']    = '';
+        $link['suf']   = '';
+        $link['style']  = '';
+        $link['more']   = '';
+
+        $name = $this->_getLinkTitle($name, '', $isImage);
+        if ( !$isImage ) {
+            $link['class']='mail JSnocheck';
+        } else {
+            $link['class']='media JSnocheck';
+        }
+
+        $address = $this->_xmlEntities($address);
+        $address = obfuscate($address);
+        $title   = $address;
+
+        if(empty($name)){
+            $name = $address;
+        }
+
+        if($conf['mailguard'] == 'visible') $address = rawurlencode($address);
+
+        $link['url']   = 'mailto:'.$address;
+        $link['name']  = $name;
+        $link['title'] = $title;
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    function internalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
+                            $height=NULL, $cache=NULL, $linking=NULL) {
+        global $ID;
+        list($src,$hash) = explode('#',$src,2);
+        resolve_mediaid(getNS($ID),$src, $exists);
+
+        $noLink = false;
+        $render = ($linking == 'linkonly') ? false : true;
+        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+
+        list($ext,$mime,$dl) = mimetype($src,false);
+        if(substr($mime,0,5) == 'image' && $render){
+            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),($linking=='direct'));
+        }elseif($mime == 'application/x-shockwave-flash' && $render){
+            // don't link flash movies
+            $noLink = true;
+        }else{
+            // add file icons
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $link['class'] .= ' mediafile mf_'.$class;
+            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
+        }
+
+        if($hash) $link['url'] .= '#'.$hash;
+
+        //markup non existing files
+        if (!$exists)
+          $link['class'] .= ' wikilink2';
+
+        //output formatted
+        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+        else $this->doc .= $this->_formatLink($link);
+    }
+
+    function externalmedia ($src, $title=NULL, $align=NULL, $width=NULL,
+                            $height=NULL, $cache=NULL, $linking=NULL) {
+        list($src,$hash) = explode('#',$src,2);
+        $noLink = false;
+        $render = ($linking == 'linkonly') ? false : true;
+        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+
+        $link['url']    = ml($src,array('cache'=>$cache));
+
+        list($ext,$mime,$dl) = mimetype($src,false);
+        if(substr($mime,0,5) == 'image' && $render){
+            // link only jpeg images
+            // if ($ext != 'jpg' && $ext != 'jpeg') $noLink = true;
+        }elseif($mime == 'application/x-shockwave-flash' && $render){
+            // don't link flash movies
+            $noLink = true;
+        }else{
+            // add file icons
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $link['class'] .= ' mediafile mf_'.$class;
+        }
+
+        if($hash) $link['url'] .= '#'.$hash;
+
+        //output formatted
+        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+        else $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+     * Renders an RSS feed
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function rss ($url,$params){
+        global $lang;
+        global $conf;
+
+        require_once(DOKU_INC.'inc/FeedParser.php');
+        $feed = new FeedParser();
+        $feed->set_feed_url($url);
+
+        //disable warning while fetching
+        if (!defined('DOKU_E_LEVEL')) { $elvl = error_reporting(E_ERROR); }
+        $rc = $feed->init();
+        if (!defined('DOKU_E_LEVEL')) { error_reporting($elvl); }
+
+        //decide on start and end
+        if($params['reverse']){
+            $mod = -1;
+            $start = $feed->get_item_quantity()-1;
+            $end   = $start - ($params['max']);
+            $end   = ($end < -1) ? -1 : $end;
+        }else{
+            $mod   = 1;
+            $start = 0;
+            $end   = $feed->get_item_quantity();
+            $end   = ($end > $params['max']) ? $params['max'] : $end;;
+        }
+
+        $this->doc .= '<ul class="rss">';
+        if($rc){
+            for ($x = $start; $x != $end; $x += $mod) {
+                $item = $feed->get_item($x);
+                $this->doc .= '<li><div class="li">';
+                // support feeds without links
+                $lnkurl = $item->get_permalink();
+                if($lnkurl){
+                    // title is escaped by SimplePie, we unescape here because it
+                    // is escaped again in externallink() FS#1705
+                    $this->externallink($item->get_permalink(),
+                                        htmlspecialchars_decode($item->get_title()));
+                }else{
+                    $this->doc .= ' '.$item->get_title();
+                }
+                if($params['author']){
+                    $author = $item->get_author(0);
+                    if($author){
+                        $name = $author->get_name();
+                        if(!$name) $name = $author->get_email();
+                        if($name) $this->doc .= ' '.$lang['by'].' '.$name;
+                    }
+                }
+                if($params['date']){
+                    $this->doc .= ' ('.$item->get_local_date($conf['dformat']).')';
+                }
+                if($params['details']){
+                    $this->doc .= '<div class="detail">';
+                    if($conf['htmlok']){
+                        $this->doc .= $item->get_description();
+                    }else{
+                        $this->doc .= strip_tags($item->get_description());
+                    }
+                    $this->doc .= '</div>';
+                }
+
+                $this->doc .= '</div></li>';
+            }
+        }else{
+            $this->doc .= '<li><div class="li">';
+            $this->doc .= '<em>'.$lang['rssfailed'].'</em>';
+            $this->externallink($url);
+            if($conf['allowdebug']){
+                $this->doc .= '<!--'.hsc($feed->error).'-->';
+            }
+            $this->doc .= '</div></li>';
+        }
+        $this->doc .= '</ul>';
+    }
+
+    // $numrows not yet implemented
+    function table_open($maxcols = NULL, $numrows = NULL){
+        // initialize the row counter used for classes
+        $this->_counter['row_counter'] = 0;
+        $this->doc .= '<table class="inline">'.DOKU_LF;
+    }
+
+    function table_close(){
+        $this->doc .= '</table>'.DOKU_LF;
+    }
+
+    function tablerow_open(){
+        // initialize the cell counter used for classes
+        $this->_counter['cell_counter'] = 0;
+        $class = 'row' . $this->_counter['row_counter']++;
+        $this->doc .= DOKU_TAB . '<tr class="'.$class.'">' . DOKU_LF . DOKU_TAB . DOKU_TAB;
+    }
+
+    function tablerow_close(){
+        $this->doc .= DOKU_LF . DOKU_TAB . '</tr>' . DOKU_LF;
+    }
+
+    function tableheader_open($colspan = 1, $align = NULL, $rowspan = 1){
+        $class = 'class="col' . $this->_counter['cell_counter']++;
+        if ( !is_null($align) ) {
+            $class .= ' '.$align.'align';
+        }
+        $class .= '"';
+        $this->doc .= '<th ' . $class;
+        if ( $colspan > 1 ) {
+            $this->_counter['cell_counter'] += $colspan-1;
+            $this->doc .= ' colspan="'.$colspan.'"';
+        }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
+        $this->doc .= '>';
+    }
+
+    function tableheader_close(){
+        $this->doc .= '</th>';
+    }
+
+    function tablecell_open($colspan = 1, $align = NULL, $rowspan = 1){
+        $class = 'class="col' . $this->_counter['cell_counter']++;
+        if ( !is_null($align) ) {
+            $class .= ' '.$align.'align';
+        }
+        $class .= '"';
+        $this->doc .= '<td '.$class;
+        if ( $colspan > 1 ) {
+            $this->_counter['cell_counter'] += $colspan-1;
+            $this->doc .= ' colspan="'.$colspan.'"';
+        }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
+        $this->doc .= '>';
+    }
+
+    function tablecell_close(){
+        $this->doc .= '</td>';
+    }
+
+    //----------------------------------------------------------
+    // Utils
+
+    /**
+     * Build a link
+     *
+     * Assembles all parts defined in $link returns HTML for the link
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _formatLink($link){
+        //make sure the url is XHTML compliant (skip mailto)
+        if(substr($link['url'],0,7) != 'mailto:'){
+            $link['url'] = str_replace('&','&amp;',$link['url']);
+            $link['url'] = str_replace('&amp;amp;','&amp;',$link['url']);
+        }
+        //remove double encodings in titles
+        $link['title'] = str_replace('&amp;amp;','&amp;',$link['title']);
+
+        // be sure there are no bad chars in url or title
+        // (we can't do this for name because it can contain an img tag)
+        $link['url']   = strtr($link['url'],array('>'=>'%3E','<'=>'%3C','"'=>'%22'));
+        $link['title'] = strtr($link['title'],array('>'=>'&gt;','<'=>'&lt;','"'=>'&quot;'));
+
+        $ret  = '';
+        $ret .= $link['pre'];
+        $ret .= '<a href="'.$link['url'].'"';
+        if(!empty($link['class']))  $ret .= ' class="'.$link['class'].'"';
+        if(!empty($link['target'])) $ret .= ' target="'.$link['target'].'"';
+        if(!empty($link['title']))  $ret .= ' title="'.$link['title'].'"';
+        if(!empty($link['style']))  $ret .= ' style="'.$link['style'].'"';
+        if(!empty($link['rel']))    $ret .= ' rel="'.$link['rel'].'"';
+        if(!empty($link['more']))   $ret .= ' '.$link['more'];
+        $ret .= '>';
+        $ret .= $link['name'];
+        $ret .= '</a>';
+        $ret .= $link['suf'];
+        return $ret;
+    }
+
+    /**
+     * Renders internal and external media
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _media ($src, $title=NULL, $align=NULL, $width=NULL,
+                      $height=NULL, $cache=NULL, $render = true) {
+
+        $ret = '';
+
+        list($ext,$mime,$dl) = mimetype($src);
+        if(substr($mime,0,5) == 'image'){
+            // first get the $title
+            if (!is_null($title)) {
+                $title  = $this->_xmlEntities($title);
+            }elseif($ext == 'jpg' || $ext == 'jpeg'){
+                //try to use the caption from IPTC/EXIF
+                require_once(DOKU_INC.'inc/JpegMeta.php');
+                $jpeg =& new JpegMeta(mediaFN($src));
+                if($jpeg !== false) $cap = $jpeg->getTitle();
+                if($cap){
+                    $title = $this->_xmlEntities($cap);
+                }
+            }
+            if (!$render) {
+                // if the picture is not supposed to be rendered
+                // return the title of the picture
+                if (!$title) {
+                    // just show the sourcename
+                    $title = $this->_xmlEntities(basename(noNS($src)));
+                }
+                return $title;
+            }
+            //add image tag
+            $ret .= '<img src="'.ml($src,array('w'=>$width,'h'=>$height,'cache'=>$cache)).'"';
+            $ret .= ' class="media'.$align.'"';
+
+            // make left/right alignment for no-CSS view work (feeds)
+            if($align == 'right') $ret .= ' align="right"';
+            if($align == 'left')  $ret .= ' align="left"';
+
+            if ($title) {
+                $ret .= ' title="' . $title . '"';
+                $ret .= ' alt="'   . $title .'"';
+            }else{
+                $ret .= ' alt=""';
+            }
+
+            if ( !is_null($width) )
+                $ret .= ' width="'.$this->_xmlEntities($width).'"';
+
+            if ( !is_null($height) )
+                $ret .= ' height="'.$this->_xmlEntities($height).'"';
+
+            $ret .= ' />';
+
+        }elseif($mime == 'application/x-shockwave-flash'){
+            if (!$render) {
+                // if the flash is not supposed to be rendered
+                // return the title of the flash
+                if (!$title) {
+                    // just show the sourcename
+                    $title = basename(noNS($src));
+                }
+                return $this->_xmlEntities($title);
+            }
+
+            $att = array();
+            $att['class'] = "media$align";
+            if($align == 'right') $att['align'] = 'right';
+            if($align == 'left')  $att['align'] = 'left';
+            $ret .= html_flashobject(ml($src,array('cache'=>$cache)),$width,$height,
+                                     array('quality' => 'high'),
+                                     null,
+                                     $att,
+                                     $this->_xmlEntities($title));
+        }elseif($title){
+            // well at least we have a title to display
+            $ret .= $this->_xmlEntities($title);
+        }else{
+            // just show the sourcename
+            $ret .= $this->_xmlEntities(basename(noNS($src)));
+        }
+
+        return $ret;
+    }
+
+    function _xmlEntities($string) {
+        return htmlspecialchars($string,ENT_QUOTES,'UTF-8');
+    }
+
+    /**
+     * Creates a linkid from a headline
+     *
+     * @param string  $title   The headline title
+     * @param boolean $create  Create a new unique ID?
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _headerToLink($title,$create=false) {
+        if($create){
+            return sectionID($title,$this->headers);
+        }else{
+            $check = false;
+            return sectionID($title,$check);
+        }
+    }
+
+    /**
+     * Construct a title and handle images in titles
+     *
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     */
+    function _getLinkTitle($title, $default, & $isImage, $id=NULL, $linktype='content') {
+        global $conf;
+
+        $isImage = false;
+        if ( is_array($title) ) {
+            $isImage = true;
+            return $this->_imageTitle($title);
+        } elseif ( is_null($title) || trim($title)=='') {
+            if (useHeading($linktype) && $id) {
+                $heading = p_get_first_heading($id,true);
+                if ($heading) {
+                    return $this->_xmlEntities($heading);
+                }
+            }
+            return $this->_xmlEntities($default);
+        } else {
+            return $this->_xmlEntities($title);
+        }
+    }
+
+    /**
+     * Returns an HTML code for images used in link titles
+     *
+     * @todo Resolve namespace on internal images
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _imageTitle($img) {
+        global $ID;
+
+        // some fixes on $img['src']
+        // see internalmedia() and externalmedia()
+        list($img['src'],$hash) = explode('#',$img['src'],2);
+        if ($img['type'] == 'internalmedia') {
+            resolve_mediaid(getNS($ID),$img['src'],$exists);
+        }
+
+        return $this->_media($img['src'],
+                              $img['title'],
+                              $img['align'],
+                              $img['width'],
+                              $img['height'],
+                              $img['cache']);
+    }
+
+    /**
+     * _getMediaLinkConf is a helperfunction to internalmedia() and externalmedia()
+     * which returns a basic link to a media.
+     *
+     * @author Pierre Spring <pierre.spring@liip.ch>
+     * @param string $src
+     * @param string $title
+     * @param string $align
+     * @param string $width
+     * @param string $height
+     * @param string $cache
+     * @param string $render
+     * @access protected
+     * @return array
+     */
+    function _getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render)
+    {
+        global $conf;
+
+        $link = array();
+        $link['class']  = 'media';
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['target'] = $conf['target']['media'];
+        $link['title']  = $this->_xmlEntities($src);
+        $link['name']   = $this->_media($src, $title, $align, $width, $height, $cache, $render);
+
+        return $link;
+    }
+
+
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtmlsummary.php b/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtmlsummary.php
new file mode 100644
index 000000000..b187fef01
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parser/xhtmlsummary.php
@@ -0,0 +1,90 @@
+<?php
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/parser/xhtml.php';
+
+/**
+ * The summary XHTML form selects either up to the first two paragraphs
+ * it find in a page or the first section (whichever comes first)
+ * It strips out the table of contents if one exists
+ * Section divs are not used - everything should be nested in a single
+ * div with CSS class "page"
+ * Headings have their a name link removed and section editing links
+ * removed
+ * It also attempts to capture the first heading in a page for
+ * use as the title of the page.
+ *
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @todo   Is this currently used anywhere? Should it?
+ */
+class Doku_Renderer_xhtmlsummary extends Doku_Renderer_xhtml {
+
+    // Namespace these variables to
+    // avoid clashes with parent classes
+    var $sum_paragraphs = 0;
+    var $sum_capture = true;
+    var $sum_inSection = false;
+    var $sum_summary = '';
+    var $sum_pageTitle = false;
+
+    function document_start() {
+        $this->doc .= DOKU_LF.'<div>'.DOKU_LF;
+    }
+
+    function document_end() {
+        $this->doc = $this->sum_summary;
+        $this->doc .= DOKU_LF.'</div>'.DOKU_LF;
+    }
+
+    // FIXME not supported anymore
+    function toc_open() {
+        $this->sum_summary .= $this->doc;
+    }
+
+    // FIXME not supported anymore
+    function toc_close() {
+        $this->doc = '';
+    }
+
+    function header($text, $level, $pos) {
+        if ( !$this->sum_pageTitle ) {
+            $this->info['sum_pagetitle'] = $text;
+            $this->sum_pageTitle = true;
+        }
+        $this->doc .= DOKU_LF.'<h'.$level.'>';
+        $this->doc .= $this->_xmlEntities($text);
+        $this->doc .= "</h$level>".DOKU_LF;
+    }
+
+    function section_open($level) {
+        if ( $this->sum_capture ) {
+            $this->sum_inSection = true;
+        }
+    }
+
+    function section_close() {
+        if ( $this->sum_capture && $this->sum_inSection ) {
+            $this->sum_summary .= $this->doc;
+            $this->sum_capture = false;
+        }
+    }
+
+    function p_open() {
+        if ( $this->sum_capture && $this->sum_paragraphs < 2 ) {
+            $this->sum_paragraphs++;
+        }
+        parent :: p_open();
+    }
+
+    function p_close() {
+        parent :: p_close();
+        if ( $this->sum_capture && $this->sum_paragraphs >= 2 ) {
+            $this->sum_summary .= $this->doc;
+            $this->sum_capture = false;
+        }
+    }
+
+}
+
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/parserutils.php b/mod/dokuwiki/vendors/dokuwiki/inc/parserutils.php
new file mode 100644
index 000000000..e2dd85979
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/parserutils.php
@@ -0,0 +1,672 @@
+<?php
+/**
+ * Utilities for accessing the parser
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Harry Fuecks <hfuecks@gmail.com>
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/confutils.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/pluginutils.php');
+require_once(DOKU_INC.'inc/cache.php');
+
+/**
+ * Returns the parsed Wikitext in XHTML for the given id and revision.
+ *
+ * If $excuse is true an explanation is returned if the file
+ * wasn't found
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_wiki_xhtml($id, $rev='', $excuse=true){
+    $file = wikiFN($id,$rev);
+    $ret  = '';
+
+    //ensure $id is in global $ID (needed for parsing)
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    if($rev){
+        if(@file_exists($file)){
+            $ret = p_render('xhtml',p_get_instructions(io_readWikiPage($file,$id,$rev)),$info); //no caching on old revisions
+        }elseif($excuse){
+            $ret = p_locale_xhtml('norev');
+        }
+    }else{
+        if(@file_exists($file)){
+            $ret = p_cached_output($file,'xhtml',$id);
+        }elseif($excuse){
+            $ret = p_locale_xhtml('newpage');
+        }
+    }
+
+    //restore ID (just in case)
+    $ID = $keep;
+
+    return $ret;
+}
+
+/**
+ * Returns starting summary for a page (e.g. the first few
+ * paragraphs), marked up in XHTML.
+ *
+ * If $excuse is true an explanation is returned if the file
+ * wasn't found
+ *
+ * @param string wiki page id
+ * @param reference populated with page title from heading or page id
+ * @deprecated
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ */
+function p_wiki_xhtml_summary($id, &$title, $rev='', $excuse=true){
+    $file = wikiFN($id,$rev);
+    $ret  = '';
+
+    //ensure $id is in global $ID (needed for parsing)
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    if($rev){
+        if(@file_exists($file)){
+            //no caching on old revisions
+            $ins = p_get_instructions(io_readWikiPage($file,$id,$rev));
+        }elseif($excuse){
+            $ret = p_locale_xhtml('norev');
+            //restore ID (just in case)
+            $ID = $keep;
+            return $ret;
+        }
+
+    }else{
+
+        if(@file_exists($file)){
+            // The XHTML for a summary is not cached so use the instruction cache
+            $ins = p_cached_instructions($file);
+        }elseif($excuse){
+            $ret = p_locale_xhtml('newpage');
+            //restore ID (just in case)
+            $ID = $keep;
+            return $ret;
+        }
+    }
+
+    $ret = p_render('xhtmlsummary',$ins,$info);
+
+    if ( $info['sum_pagetitle'] ) {
+        $title = $info['sum_pagetitle'];
+    } else {
+        $title = $id;
+    }
+
+    $ID = $keep;
+    return $ret;
+}
+
+/**
+ * Returns the specified local text in parsed format
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_locale_xhtml($id){
+    //fetch parsed locale
+    $html = p_cached_output(localeFN($id));
+    return $html;
+}
+
+/**
+ *     *** DEPRECATED ***
+ *
+ * use p_cached_output()
+ *
+ * Returns the given file parsed to XHTML
+ *
+ * Uses and creates a cachefile
+ *
+ * @deprecated
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @todo   rewrite to use mode instead of hardcoded XHTML
+ */
+function p_cached_xhtml($file){
+    return p_cached_output($file);
+}
+
+/**
+ * Returns the given file parsed into the requested output format
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Chris Smith <chris@jalakai.co.uk>
+ */
+function p_cached_output($file, $format='xhtml', $id='') {
+    global $conf;
+
+    $cache = new cache_renderer($id, $file, $format);
+    if ($cache->useCache()) {
+        $parsed = $cache->retrieveCache(false);
+        if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- cachefile {$cache->cache} used -->\n";
+    } else {
+        $parsed = p_render($format, p_cached_instructions($file,false,$id), $info);
+
+        if ($info['cache']) {
+            $cache->storeCache($parsed);               //save cachefile
+            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, but created {$cache->cache} -->\n";
+        }else{
+            $cache->removeCache();                     //try to delete cachefile
+            if($conf['allowdebug'] && $format=='xhtml') $parsed .= "\n<!-- no cachefile used, caching forbidden -->\n";
+        }
+    }
+
+    return $parsed;
+}
+
+/**
+ * Returns the render instructions for a file
+ *
+ * Uses and creates a serialized cache file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_cached_instructions($file,$cacheonly=false,$id='') {
+    global $conf;
+    static $run = null;
+    if(is_null($run)) $run = array();
+
+    $cache = new cache_instructions($id, $file);
+
+    if ($cacheonly || $cache->useCache() || isset($run[$file])) {
+        return $cache->retrieveCache();
+    } else if (@file_exists($file)) {
+        // no cache - do some work
+        $ins = p_get_instructions(io_readWikiPage($file,$id));
+        if ($cache->storeCache($ins)) {
+            $run[$file] = true; // we won't rebuild these instructions in the same run again
+        } else {
+            msg('Unable to save cache file. Hint: disk full; file permissions; safe_mode setting.',-1);
+        }
+        return $ins;
+    }
+
+    return null;
+}
+
+/**
+ * turns a page into a list of instructions
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_get_instructions($text){
+
+    $modes = p_get_parsermodes();
+
+    // Create the parser
+    $Parser = & new Doku_Parser();
+
+    // Add the Handler
+    $Parser->Handler = & new Doku_Handler();
+
+    //add modes to parser
+    foreach($modes as $mode){
+        $Parser->addMode($mode['mode'],$mode['obj']);
+    }
+
+    // Do the parsing
+    trigger_event('PARSER_WIKITEXT_PREPROCESS', $text);
+    $p = $Parser->parse($text);
+    //  dbg($p);
+    return $p;
+}
+
+/**
+ * returns the metadata of a page
+ *
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ */
+function p_get_metadata($id, $key=false, $render=false){
+    global $ID, $INFO, $cache_metadata;
+
+    // cache the current page
+    // Benchmarking shows the current page's metadata is generally the only page metadata
+    // accessed several times. This may catch a few other pages, but that shouldn't be an issue.
+    $cache = ($ID == $id);
+    $meta = p_read_metadata($id, $cache);
+
+    // metadata has never been rendered before - do it! (but not for non-existent pages)
+    if ($render && !isset($meta['current']['description']['abstract']) && page_exists($id)){
+        $meta = p_render_metadata($id, $meta);
+        io_saveFile(metaFN($id, '.meta'), serialize($meta));
+
+        // sync cached copies, including $INFO metadata
+        if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
+        if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
+    }
+
+    // filter by $key
+    if ($key){
+        list($key, $subkey) = explode(' ', $key, 2);
+        $subkey = trim($subkey);
+
+        if ($subkey) {
+            return isset($meta['current'][$key][$subkey]) ? $meta['current'][$key][$subkey] : null;
+        }
+
+        return isset($meta['current'][$key]) ? $meta['current'][$key] : null;
+    }
+
+    return $meta['current'];
+}
+
+/**
+ * sets metadata elements of a page
+ *
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ */
+function p_set_metadata($id, $data, $render=false, $persistent=true){
+    if (!is_array($data)) return false;
+
+    global $ID;
+
+    // cache the current page
+    $cache = ($ID == $id);
+    $orig = p_read_metadata($id, $cache);
+
+    // render metadata first?
+    $meta = $render ? p_render_metadata($id, $orig) : $orig;
+
+    // now add the passed metadata
+    $protected = array('description', 'date', 'contributor');
+    foreach ($data as $key => $value){
+
+        // be careful with sub-arrays of $meta['relation']
+        if ($key == 'relation'){
+
+            foreach ($value as $subkey => $subvalue){
+                $meta['current'][$key][$subkey] = !empty($meta['current'][$key][$subkey]) ? array_merge($meta['current'][$key][$subkey], $subvalue) : $subvalue;
+                if ($persistent)
+                    $meta['persistent'][$key][$subkey] = !empty($meta['persistent'][$key][$subkey]) ? array_merge($meta['persistent'][$key][$subkey], $subvalue) : $subvalue;
+            }
+
+            // be careful with some senisitive arrays of $meta
+        } elseif (in_array($key, $protected)){
+
+            // these keys, must have subkeys - a legitimate value must be an array
+            if (is_array($value)) {
+                $meta['current'][$key] = !empty($meta['current'][$key]) ? array_merge($meta['current'][$key],$value) : $value;
+
+                if ($persistent) {
+                    $meta['persistent'][$key] = !empty($meta['persistent'][$key]) ? array_merge($meta['persistent'][$key],$value) : $value;
+                }
+            }
+
+            // no special treatment for the rest
+        } else {
+            $meta['current'][$key] = $value;
+            if ($persistent) $meta['persistent'][$key] = $value;
+        }
+    }
+
+    // save only if metadata changed
+    if ($meta == $orig) return true;
+
+    // sync cached copies, including $INFO metadata
+    global $cache_metadata, $INFO;
+
+    if (!empty($cache_metadata[$id])) $cache_metadata[$id] = $meta;
+    if (!empty($INFO) && ($id == $INFO['id'])) { $INFO['meta'] = $meta['current']; }
+
+    return io_saveFile(metaFN($id, '.meta'), serialize($meta));
+}
+
+/**
+ * Purges the non-persistant part of the meta data
+ * used on page deletion
+ *
+ * @author Michael Klier <chi@chimeric.de>
+ */
+function p_purge_metadata($id) {
+    $metafn = metaFN('id', '.meta');
+    $meta   = p_read_metadata($id);
+    foreach($meta['current'] as $key => $value) {
+        if(is_array($meta[$key])) {
+            $meta['current'][$key] = array();
+        } else {
+            $meta['current'][$key] = '';
+        }
+    }
+    return io_saveFile(metaFN($id, '.meta'), serialize($meta));
+}
+
+/**
+ * read the metadata from source/cache for $id
+ * (internal use only - called by p_get_metadata & p_set_metadata)
+ *
+ * this function also converts the metadata from the original format to
+ * the current format ('current' & 'persistent' arrays)
+ *
+ * @author   Christopher Smith <chris@jalakai.co.uk>
+ *
+ * @param    string   $id      absolute wiki page id
+ * @param    bool     $cache   whether or not to cache metadata in memory
+ *                             (only use for metadata likely to be accessed several times)
+ *
+ * @return   array             metadata
+ */
+function p_read_metadata($id,$cache=false) {
+    global $cache_metadata;
+
+    if (isset($cache_metadata[(string)$id])) return $cache_metadata[(string)$id];
+
+    $file = metaFN($id, '.meta');
+    $meta = @file_exists($file) ? unserialize(io_readFile($file, false)) : array('current'=>array(),'persistent'=>array());
+
+    // convert $meta from old format to new (current+persistent) format
+    if (!isset($meta['current'])) {
+        $meta = array('current'=>$meta,'persistent'=>$meta);
+
+        // remove non-persistent keys
+        unset($meta['persistent']['title']);
+        unset($meta['persistent']['description']['abstract']);
+        unset($meta['persistent']['description']['tableofcontents']);
+        unset($meta['persistent']['relation']['haspart']);
+        unset($meta['persistent']['relation']['references']);
+        unset($meta['persistent']['date']['valid']);
+
+        if (empty($meta['persistent']['description'])) unset($meta['persistent']['description']);
+        if (empty($meta['persistent']['relation'])) unset($meta['persistent']['relation']);
+        if (empty($meta['persistent']['date'])) unset($meta['persistent']['date']);
+
+        // save converted metadata
+        io_saveFile($file, serialize($meta));
+    }
+
+    if ($cache) {
+        $cache_metadata[(string)$id] = $meta;
+    }
+
+    return $meta;
+}
+
+/**
+ * renders the metadata of a page
+ *
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ */
+function p_render_metadata($id, $orig){
+    // make sure the correct ID is in global ID
+    global $ID;
+    $keep = $ID;
+    $ID   = $id;
+
+    // add an extra key for the event - to tell event handlers the page whose metadata this is
+    $orig['page'] = $id;
+    $evt = new Doku_Event('PARSER_METADATA_RENDER', $orig);
+    if ($evt->advise_before()) {
+
+        require_once DOKU_INC."inc/parser/metadata.php";
+
+        // get instructions
+        $instructions = p_cached_instructions(wikiFN($id),false,$id);
+        if(is_null($instructions)){
+            $ID = $keep;
+            return null; // something went wrong with the instructions
+        }
+
+        // set up the renderer
+        $renderer = & new Doku_Renderer_metadata();
+        $renderer->meta = $orig['current'];
+        $renderer->persistent = $orig['persistent'];
+
+        // loop through the instructions
+        foreach ($instructions as $instruction){
+            // execute the callback against the renderer
+            call_user_func_array(array(&$renderer, $instruction[0]), $instruction[1]);
+        }
+
+        $evt->result = array('current'=>$renderer->meta,'persistent'=>$renderer->persistent);
+    }
+    $evt->advise_after();
+
+    $ID = $keep;
+    return $evt->result;
+}
+
+/**
+ * returns all available parser syntax modes in correct order
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_get_parsermodes(){
+    global $conf;
+
+    //reuse old data
+    static $modes = null;
+    if($modes != null){
+        return $modes;
+    }
+
+    //import parser classes and mode definitions
+    require_once DOKU_INC . 'inc/parser/parser.php';
+
+    // we now collect all syntax modes and their objects, then they will
+    // be sorted and added to the parser in correct order
+    $modes = array();
+
+    // add syntax plugins
+    $pluginlist = plugin_list('syntax');
+    if(count($pluginlist)){
+        global $PARSER_MODES;
+        $obj = null;
+        foreach($pluginlist as $p){
+            if(!$obj =& plugin_load('syntax',$p)) continue; //attempt to load plugin into $obj
+            $PARSER_MODES[$obj->getType()][] = "plugin_$p"; //register mode type
+            //add to modes
+            $modes[] = array(
+                    'sort' => $obj->getSort(),
+                    'mode' => "plugin_$p",
+                    'obj'  => $obj,
+                    );
+            unset($obj); //remove the reference
+        }
+    }
+
+    // add default modes
+    $std_modes = array('listblock','preformatted','notoc','nocache',
+            'header','table','linebreak','footnote','hr',
+            'unformatted','php','html','code','file','quote',
+            'internallink','rss','media','externallink',
+            'emaillink','windowssharelink','eol');
+    if($conf['typography']){
+        $std_modes[] = 'quotes';
+        $std_modes[] = 'multiplyentity';
+    }
+    foreach($std_modes as $m){
+        $class = "Doku_Parser_Mode_$m";
+        $obj   = new $class();
+        $modes[] = array(
+                'sort' => $obj->getSort(),
+                'mode' => $m,
+                'obj'  => $obj
+                );
+    }
+
+    // add formatting modes
+    $fmt_modes = array('strong','emphasis','underline','monospace',
+            'subscript','superscript','deleted');
+    foreach($fmt_modes as $m){
+        $obj   = new Doku_Parser_Mode_formatting($m);
+        $modes[] = array(
+                'sort' => $obj->getSort(),
+                'mode' => $m,
+                'obj'  => $obj
+                );
+    }
+
+    // add modes which need files
+    $obj     = new Doku_Parser_Mode_smiley(array_keys(getSmileys()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'smiley','obj'  => $obj );
+    $obj     = new Doku_Parser_Mode_acronym(array_keys(getAcronyms()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'acronym','obj'  => $obj );
+    $obj     = new Doku_Parser_Mode_entity(array_keys(getEntities()));
+    $modes[] = array('sort' => $obj->getSort(), 'mode' => 'entity','obj'  => $obj );
+
+    // add optional camelcase mode
+    if($conf['camelcase']){
+        $obj     = new Doku_Parser_Mode_camelcaselink();
+        $modes[] = array('sort' => $obj->getSort(), 'mode' => 'camelcaselink','obj'  => $obj );
+    }
+
+    //sort modes
+    usort($modes,'p_sort_modes');
+
+    return $modes;
+}
+
+/**
+ * Callback function for usort
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_sort_modes($a, $b){
+    if($a['sort'] == $b['sort']) return 0;
+    return ($a['sort'] < $b['sort']) ? -1 : 1;
+}
+
+/**
+ * Renders a list of instruction to the specified output mode
+ *
+ * In the $info array are informations from the renderer returned
+ *
+ * @author Harry Fuecks <hfuecks@gmail.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_render($mode,$instructions,&$info){
+    if(is_null($instructions)) return '';
+
+    $Renderer =& p_get_renderer($mode);
+    if (is_null($Renderer)) return null;
+
+    $Renderer->reset();
+
+    $Renderer->smileys = getSmileys();
+    $Renderer->entities = getEntities();
+    $Renderer->acronyms = getAcronyms();
+    $Renderer->interwiki = getInterwiki();
+
+    // Loop through the instructions
+    foreach ( $instructions as $instruction ) {
+        // Execute the callback against the Renderer
+        call_user_func_array(array(&$Renderer, $instruction[0]),$instruction[1]);
+    }
+
+    //set info array
+    $info = $Renderer->info;
+
+    // Post process and return the output
+    $data = array($mode,& $Renderer->doc);
+    trigger_event('RENDERER_CONTENT_POSTPROCESS',$data);
+    return $Renderer->doc;
+}
+
+function & p_get_renderer($mode) {
+    global $conf, $plugin_controller;
+
+    $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
+
+    // try default renderer first:
+    $file = DOKU_INC."inc/parser/$rname.php";
+    if(@file_exists($file)){
+        require_once $file;
+        $rclass = "Doku_Renderer_$rname";
+
+        if ( !class_exists($rclass) ) {
+            trigger_error("Unable to resolve render class $rclass",E_USER_WARNING);
+            msg("Renderer '$rname' for $mode not valid",-1);
+            return null;
+        }
+        $Renderer = & new $rclass();
+    }else{
+        // Maybe a plugin/component is available?
+        list($plugin, $component) = $plugin_controller->_splitName($rname);
+        if (!$plugin_controller->isdisabled($plugin)){
+            $Renderer =& $plugin_controller->load('renderer',$rname, true);
+        }
+
+        if(is_null($Renderer)){
+            msg("No renderer '$rname' found for mode '$mode'",-1);
+            return null;
+        }
+    }
+
+    return $Renderer;
+}
+
+/**
+ * Gets the first heading from a file
+ *
+ * @param   string   $id       dokuwiki page id
+ * @param   bool     $render   rerender if first heading not known
+ *                             default: true  -- must be set to false for calls from the metadata renderer to
+ *                                               protects against loops and excessive resource usage when pages
+ *                                               for which only a first heading is required will attempt to
+ *                                               render metadata for all the pages for which they require first
+ *                                               headings ... and so on.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_get_first_heading($id, $render=true){
+    return p_get_metadata($id,'title',$render);
+}
+
+/**
+ * Wrapper for GeSHi Code Highlighter, provides caching of its output
+ *
+ * @param  string   $code       source code to be highlighted
+ * @param  string   $language   language to provide highlighting
+ * @param  string   $wrapper    html element to wrap the returned highlighted text
+ *
+ * @author Christopher Smith <chris@jalakai.co.uk>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
+    global $conf, $config_cascade;
+    $language = strtolower($language);
+
+    // remove any leading or trailing blank lines
+    $code = preg_replace('/^\s*?\n|\s*?\n$/','',$code);
+
+    $cache = getCacheName($language.$code,".code");
+    $ctime = @filemtime($cache);
+    if($ctime && !$_REQUEST['purge'] &&
+            $ctime > filemtime(DOKU_INC.'inc/geshi.php') &&                 // geshi changed
+            $ctime > @filemtime(DOKU_INC.'inc/geshi/'.$language.'.php') &&  // language syntax definition changed
+            $ctime > filemtime(reset($config_cascade['main']['default']))){ // dokuwiki changed
+        $highlighted_code = io_readFile($cache, false);
+
+    } else {
+
+        require_once(DOKU_INC . 'inc/geshi.php');
+
+        $geshi = new GeSHi($code, $language, DOKU_INC . 'inc/geshi');
+        $geshi->set_encoding('utf-8');
+        $geshi->enable_classes();
+        $geshi->set_header_type(GESHI_HEADER_PRE);
+        $geshi->set_link_target($conf['target']['extern']);
+
+        // remove GeSHi's wrapper element (we'll replace it with our own later)
+        // we need to use a GeSHi wrapper to avoid <BR> throughout the highlighted text
+        $highlighted_code = trim(preg_replace('!^<pre[^>]*>|</pre>$!','',$geshi->parse_code()),"\n\r");
+        io_saveFile($cache,$highlighted_code);
+    }
+
+    // add a wrapper element if required
+    if ($wrapper) {
+        return "<$wrapper class=\"code $language\">$highlighted_code</$wrapper>";
+    } else {
+        return $highlighted_code;
+    }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/plugin.php b/mod/dokuwiki/vendors/dokuwiki/inc/plugin.php
new file mode 100644
index 000000000..364534739
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/plugin.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * DokuWiki Plugin base class
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Christopher Smith <chris@jalakai.co.uk>
+ */
+
+/**
+ * Do not inherit directly from this class, instead inherit from the specialized
+ * ones in lib/plugin
+ */
+class DokuWiki_Plugin {
+
+    var $localised = false;        // set to true by setupLocale() after loading language dependent strings
+    var $lang = array();           // array to hold language dependent strings, best accessed via ->getLang()
+    var $configloaded = false;     // set to true by loadConfig() after loading plugin configuration variables
+    var $conf = array();           // array to hold plugin settings, best accessed via ->getConf()
+
+    /**
+     * General Info
+     *
+     * Needs to return a associative array with the following values:
+     *
+     * author - Author of the plugin
+     * email  - Email address to contact the author
+     * date   - Last modified date of the plugin in YYYY-MM-DD format
+     * name   - Name of the plugin
+     * desc   - Short description of the plugin (Text only)
+     * url    - Website with more information on the plugin (eg. syntax description)
+     */
+    function getInfo(){
+        $parts = explode('_',get_class($this));
+        $info  = DOKU_PLUGIN.'/'.$parts[2].'/plugin.info.txt';
+        if(@file_exists($info)) return confToHash($info);
+        trigger_error('getInfo() not implemented in '.get_class($this).' and '.$info.' not found', E_USER_WARNING);
+    }
+
+    // plugin introspection methods
+    // extract from class name, format = <plugin type>_plugin_<name>[_<component name>]
+    function getPluginType() {
+        list($t) = explode('_', get_class($this), 2);
+        return $t;
+    }
+    function getPluginName() {
+        list($t, $p, $n) = explode('_', get_class($this), 4);
+        return $n;
+    }
+    function getPluginComponent() {
+        list($t, $p, $n, $c) = explode('_', get_class($this), 4);
+        return (isset($c)?$c:'');
+    }
+
+    // localisation methods
+    /**
+     * getLang($id)
+     * use this function to access plugin language strings
+     * to try to minimise unnecessary loading of the strings when the plugin doesn't require them
+     * e.g. when info plugin is querying plugins for information about themselves.
+     *
+     * @param   $id     id of the string to be retrieved
+     * @return  string  string in appropriate language or english if not available
+     */
+    function getLang($id) {
+        if (!$this->localised) $this->setupLocale();
+
+        return (isset($this->lang[$id]) ? $this->lang[$id] : '');
+    }
+
+    /**
+     * locale_xhtml($id)
+     *
+     * retrieve a language dependent file and pass to xhtml renderer for display
+     * plugin equivalent of p_locale_xhtml()
+     *
+     * @param   $id     id of language dependent wiki page
+     * @return  string  parsed contents of the wiki page in xhtml format
+     */
+    function locale_xhtml($id) {
+        return p_cached_output($this->localFN($id));
+    }
+
+    /**
+     * localFN($id)
+     * prepends appropriate path for a language dependent filename
+     * plugin equivalent of localFN()
+     */
+    function localFN($id) {
+        global $conf;
+        $plugin = $this->getPluginName();
+        $file = DOKU_PLUGIN.$plugin.'/lang/'.$conf['lang'].'/'.$id.'.txt';
+        if(!@file_exists($file)){
+            //fall back to english
+            $file = DOKU_PLUGIN.$plugin.'/lang/en/'.$id.'.txt';
+        }
+        return $file;
+    }
+
+    /**
+     *  setupLocale()
+     *  reads all the plugins language dependent strings into $this->lang
+     *  this function is automatically called by getLang()
+     */
+    function setupLocale() {
+        if ($this->localised) return;
+
+        global $conf;            // definitely don't invoke "global $lang"
+        $path = DOKU_PLUGIN.$this->getPluginName().'/lang/';
+
+        $lang = array();
+
+        // don't include once, in case several plugin components require the same language file
+        @include($path.'en/lang.php');
+        if ($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
+
+        $this->lang = $lang;
+        $this->localised = true;
+    }
+
+    // configuration methods
+    /**
+     * getConf($setting)
+     *
+     * use this function to access plugin configuration variables
+     */
+    function getConf($setting){
+
+        if (!$this->configloaded){ $this->loadConfig(); }
+
+        return $this->conf[$setting];
+    }
+
+    /**
+     * loadConfig()
+     * merges the plugin's default settings with any local settings
+     * this function is automatically called through getConf()
+     */
+    function loadConfig(){
+        global $conf;
+
+        $defaults = $this->readDefaultSettings();
+        $plugin = $this->getPluginName();
+
+        foreach ($defaults as $key => $value) {
+            if (isset($conf['plugin'][$plugin][$key])) continue;
+            $conf['plugin'][$plugin][$key] = $value;
+        }
+
+        $this->configloaded = true;
+        $this->conf =& $conf['plugin'][$plugin];
+    }
+
+    /**
+     * read the plugin's default configuration settings from conf/default.php
+     * this function is automatically called through getConf()
+     *
+     * @return    array    setting => value
+     */
+    function readDefaultSettings() {
+
+        $path = DOKU_PLUGIN.$this->getPluginName().'/conf/';
+        $conf = array();
+
+        if (@file_exists($path.'default.php')) {
+            include($path.'default.php');
+        }
+
+        return $conf;
+    }
+
+    /**
+     * Loads a given helper plugin (if enabled)
+     *
+     * @author  Esther Brunner <wikidesign@gmail.com>
+     *
+     * @param   $name   name of plugin to load
+     * @param   $msg    message to display in case the plugin is not available
+     *
+     * @return  object  helper plugin object
+     */
+    function loadHelper($name, $msg){
+        if (!plugin_isdisabled($name)){
+            $obj =& plugin_load('helper',$name);
+        }else{
+            $obj = null;
+        }
+        if (is_null($obj) && $msg) msg("Helper plugin $name is not available or invalid.",-1);
+        return $obj;
+    }
+
+    // standard functions for outputing email addresses and links
+    // use these to avoid having to duplicate code to produce links in line with the installation configuration
+
+    /**
+     * email
+     * standardised function to generate an email link according to obfuscation settings
+     */
+    function email($email, $name='', $class='', $more='') {
+        if (!$email) return $name;
+        $email = obfuscate($email);
+        if (!$name) $name = $email;
+        $class = "class='".($class ? $class : 'mail')."'";
+        return "<a href='mailto:$email' $class title='$email' $more>$name</a>";
+    }
+
+    /**
+     * external_link
+     * standardised function to generate an external link according to conf settings
+     */
+    function external_link($link, $title='', $class='', $target='', $more='') {
+        global $conf;
+
+        $link = htmlentities($link);
+        if (!$title) $title = $link;
+        if (!$target) $target = $conf['target']['extern'];
+        if ($conf['relnofollow']) $more .= ' rel="nofollow"';
+
+        if ($class) $class = " class='$class'";
+        if ($target) $target = " target='$target'";
+        if ($more) $more = " ".trim($more);
+
+        return "<a href='$link'$class$target$more>$title</a>";
+    }
+
+    /**
+     * output text string through the parser, allows dokuwiki markup to be used
+     * very ineffecient for small pieces of data - try not to use
+     */
+    function render($text, $format='xhtml') {
+        return p_render($format, p_get_instructions($text),$info);
+    }
+
+    /**
+     * Allow the plugin to prevent DokuWiki creating a second instance of itself
+     *
+     * @return bool   true if the plugin can not be instantiated more than once
+     */
+    function isSingleton() {
+        return false;
+    }
+
+    // deprecated functions
+    function plugin_localFN($id) { return $this->localFN($id); }
+    function plugin_locale_xhtml($id) { return $this->locale_xhtml($id); }
+    function plugin_email($e, $n='', $c='', $m='') { return $this->email($e, $n, $c, $m); }
+    function plugin_link($l, $t='', $c='', $to='', $m='') { return $this->external_link($l, $t, $c, $to, $m); }
+    function plugin_render($t, $f='xhtml') { return $this->render($t, $f); }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/plugincontroller.class.php b/mod/dokuwiki/vendors/dokuwiki/inc/plugincontroller.class.php
new file mode 100644
index 000000000..4400a4187
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/plugincontroller.class.php
@@ -0,0 +1,172 @@
+<?php
+/**
+ * Class to encapsulate access to dokuwiki plugins
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Christopher Smith <chris@jalakai.co.uk>
+ */
+
+// plugin related constants
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+
+class Doku_Plugin_Controller {
+
+    var $list_enabled = array();
+    var $list_disabled = array();
+    var $list_bytype = array();
+
+    function Doku_Plugin_Controller() {
+        $this->_populateMasterList();
+    }
+
+    /**
+     * Returns a list of available plugins of given type
+     *
+     * @param $type  string, plugin_type name;
+     *               the type of plugin to return,
+     *               use empty string for all types
+     * @param $all   bool;
+     *               false to only return enabled plugins,
+     *               true to return both enabled and disabled plugins
+     *
+     * @return       array of plugin names
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function getList($type='',$all=false){
+
+        // request the complete list
+        if (!$type) {
+            return $all ? array_merge($this->list_enabled,$this->list_disabled) : $this->list_enabled;
+        }
+
+        if (!isset($this->list_bytype[$type]['enabled'])) {
+            $this->list_bytype[$type]['enabled'] = $this->_getListByType($type,true);
+        }
+        if ($all && !isset($this->list_bytype[$type]['disabled'])) {
+            $this->list_bytype[$type]['disabled'] = $this->_getListByType($type,false);
+        }
+
+        return $all ? array_merge($this->list_bytype[$type]['enabled'],$this->list_bytype[$type]['disabled']) : $this->list_bytype[$type]['enabled'];
+    }
+
+    /**
+     * Loads the given plugin and creates an object of it
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     *
+     * @param  $type string     type of plugin to load
+     * @param  $name string     name of the plugin to load
+     * @param  $new  bool       true to return a new instance of the plugin, false to use an already loaded instance
+     * @return objectreference  the plugin object or null on failure
+     */
+    function &load($type,$name,$new=false){
+        //we keep all loaded plugins available in global scope for reuse
+        global $DOKU_PLUGINS;
+
+        //plugin already loaded?
+        if(!empty($DOKU_PLUGINS[$type][$name])){
+            if ($new  && !$DOKU_PLUGINS[$type][$name]->isSingleton()) {
+                $class = $type.'_plugin_'.$name;
+                return class_exists($class) ? new $class : null;
+            } else {
+                return $DOKU_PLUGINS[$type][$name];
+            }
+        }
+
+        //try to load the wanted plugin file
+        list($plugin,$component) = $this->_splitName($name);
+        $dir = $this->get_directory($plugin);
+        $file = $component ? "$type/$component.php" : "$type.php";
+
+        if(!is_file(DOKU_PLUGIN."$dir/$file")){
+            return null;
+        }
+
+        if (!include_once(DOKU_PLUGIN."$dir/$file")) {
+            return null;
+        }
+
+        //construct class and instantiate
+        $class = $type.'_plugin_'.$name;
+        if (!class_exists($class)) return null;
+
+        $DOKU_PLUGINS[$type][$name] = new $class;
+        return $DOKU_PLUGINS[$type][$name];
+    }
+
+    function isdisabled($plugin) {
+        return (array_search($plugin, $this->list_enabled) === false);
+    }
+
+    function enable($plugin) {
+        if (array_search($plugin, $this->list_disabled) !== false) {
+            return @unlink(DOKU_PLUGIN.$plugin.'/disabled');
+        }
+        return false;
+    }
+
+    function disable($plugin) {
+        if (array_search($plugin, $this->list_enabled) !== false) {
+            return @touch(DOKU_PLUGIN.$plugin.'/disabled');
+        }
+        return false;
+    }
+
+    function get_directory($plugin) {
+        return $plugin;
+    }
+
+    function _populateMasterList() {
+        if ($dh = opendir(DOKU_PLUGIN)) {
+            while (false !== ($plugin = readdir($dh))) {
+                if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp') continue;
+                if (is_file(DOKU_PLUGIN.$plugin)) continue;
+
+                if (substr($plugin,-9) == '.disabled') {
+                    // the plugin was disabled by rc2009-01-26
+                    // disabling mechanism was changed back very soon again
+                    // to keep everything simple we just skip the plugin completely
+                }elseif(@file_exists(DOKU_PLUGIN.$plugin.'/disabled')){
+                    $this->list_disabled[] = $plugin;
+                } else {
+                    $this->list_enabled[] = $plugin;
+                }
+            }
+        }
+    }
+
+    function _getListByType($type, $enabled) {
+        $master_list = $enabled ? $this->list_enabled : $this->list_disabled;
+
+        $plugins = array();
+        foreach ($master_list as $plugin) {
+            $dir = $this->get_directory($plugin);
+
+            if (@file_exists(DOKU_PLUGIN."$dir/$type.php")){
+                $plugins[] = $plugin;
+            } else {
+                if ($dp = @opendir(DOKU_PLUGIN."$dir/$type/")) {
+                    while (false !== ($component = readdir($dp))) {
+                        if (substr($component,0,1) == '.' || strtolower(substr($component, -4)) != ".php") continue;
+                        if (is_file(DOKU_PLUGIN."$dir/$type/$component")) {
+                            $plugins[] = $plugin.'_'.substr($component, 0, -4);
+                        }
+                    }
+                    closedir($dp);
+                }
+            }
+        }
+
+        return $plugins;
+    }
+
+    function _splitName($name) {
+        if (array_search($name, $this->list_enabled + $this->list_disabled) === false) {
+            return explode('_',$name,2);
+        }
+
+        return array($name,'');
+    }
+
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/pluginutils.php b/mod/dokuwiki/vendors/dokuwiki/inc/pluginutils.php
new file mode 100644
index 000000000..8294d1ec8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/pluginutils.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Utilities for handling plugins
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+// plugin related constants
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+require_once(DOKU_INC.'inc/plugincontroller.class.php');
+
+$plugin_types = array('admin','syntax','action','renderer', 'helper');
+
+global $plugin_controller_class, $plugin_controller;
+if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller';
+
+$plugin_controller = new $plugin_controller_class();
+
+/**
+ * Original plugin functions, remain for backwards compatibility
+ */
+function plugin_list($type='',$all=false) {
+    global $plugin_controller;
+    return $plugin_controller->getList($type,$all);
+}
+function &plugin_load($type,$name,$new=false) {
+    global $plugin_controller;
+    return $plugin_controller->load($type,$name,$new);
+}
+function plugin_isdisabled($plugin) {
+    global $plugin_controller;
+    return $plugin_controller->isdisabled($plugin);
+}
+function plugin_enable($plugin) {
+    global $plugin_controller;
+    return $plugin_controller->enable($plugin);
+}
+function plugin_disable($plugin) {
+    global $plugin_controller;
+    return $plugin_controller->disable($plugin);
+}
+function plugin_directory($plugin) {
+    global $plugin_controller;
+    return $plugin_controller->get_directory($plugin);
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/search.php b/mod/dokuwiki/vendors/dokuwiki/inc/search.php
new file mode 100644
index 000000000..2b9a51fb3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/search.php
@@ -0,0 +1,630 @@
+<?php
+/**
+ * DokuWiki search functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/common.php');
+
+/**
+ * recurse direcory
+ *
+ * This function recurses into a given base directory
+ * and calls the supplied function for each file and directory
+ *
+ * @param   array ref $data The results of the search are stored here
+ * @param   string    $base Where to start the search
+ * @param   callback  $func Callback (function name or arayy with object,method)
+ * @param   string    $dir  Current directory beyond $base
+ * @param   int       $lvl  Recursion Level
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search(&$data,$base,$func,$opts,$dir='',$lvl=1){
+    $dirs   = array();
+    $files  = array();
+
+    //read in directories and files
+    $dh = @opendir($base.'/'.$dir);
+    if(!$dh) return;
+    while(($file = readdir($dh)) !== false){
+        if(preg_match('/^[\._]/',$file)) continue; //skip hidden files and upper dirs
+        if(is_dir($base.'/'.$dir.'/'.$file)){
+            $dirs[] = $dir.'/'.$file;
+            continue;
+        }
+        $files[] = $dir.'/'.$file;
+    }
+    closedir($dh);
+    sort($files);
+    sort($dirs);
+
+    //give directories to userfunction then recurse
+    foreach($dirs as $dir){
+        if (call_user_func_array($func, array(&$data,$base,$dir,'d',$lvl,$opts))){
+            search($data,$base,$func,$opts,$dir,$lvl+1);
+        }
+    }
+    //now handle the files
+    foreach($files as $file){
+        call_user_func_array($func, array(&$data,$base,$file,'f',$lvl,$opts));
+    }
+}
+
+/**
+ * Wrapper around call_user_func_array.
+ *
+ * @deprecated
+ */
+function search_callback($func,&$data,$base,$file,$type,$lvl,$opts){
+    return call_user_func_array($func, array(&$data,$base,$file,$type,$lvl,$opts));
+}
+
+/**
+ * The following functions are userfunctions to use with the search
+ * function above. This function is called for every found file or
+ * directory. When a directory is given to the function it has to
+ * decide if this directory should be traversed (true) or not (false)
+ * The function has to accept the following parameters:
+ *
+ * &$data - Reference to the result data structure
+ * $base  - Base usually $conf['datadir']
+ * $file  - current file or directory relative to $base
+ * $type  - Type either 'd' for directory or 'f' for file
+ * $lvl   - Current recursion depht
+ * $opts  - option array as given to search()
+ *
+ * return values for files are ignored
+ *
+ * All functions should check the ACL for document READ rights
+ * namespaces (directories) are NOT checked as this would break
+ * the recursion (You can have an nonreadable dir over a readable
+ * one deeper nested) also make sure to check the file type (for example
+ * in case of lockfiles).
+ */
+
+/**
+ * Searches for pages beginning with the given query
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function search_qsearch(&$data,$base,$file,$type,$lvl,$opts){
+    $opts = array(
+            'idmatch'   => '(^|:)'.preg_quote($opts['query'],'/').'/',
+            'listfiles' => true,
+            'pagesonly' => true,
+            );
+    return search_universal($data,$base,$file,$type,$lvl,$opts);
+}
+
+/**
+ * Build the browsable index of pages
+ *
+ * $opts['ns'] is the current namespace
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_index(&$data,$base,$file,$type,$lvl,$opts){
+    global $conf;
+    $return = true;
+
+    $item = array();
+
+    if($type == 'd' && !preg_match('#^'.$file.'(/|$)#','/'.$opts['ns'])){
+        //add but don't recurse
+        $return = false;
+    }elseif($type == 'f' && ($opts['nofiles'] || substr($file,-4) != '.txt')){
+        //don't add
+        return false;
+    }
+
+    $id = pathID($file);
+
+    if($type=='d' && $conf['sneaky_index'] && auth_quickaclcheck($id.':') < AUTH_READ){
+        return false;
+    }
+
+    //check hidden
+    if(isHiddenPage($id)){
+        return false;
+    }
+
+    //check ACL
+    if($type=='f' && auth_quickaclcheck($id) < AUTH_READ){
+        return false;
+    }
+
+    $data[]=array( 'id'    => $id,
+            'type'  => $type,
+            'level' => $lvl,
+            'open'  => $return );
+    return $return;
+}
+
+/**
+ * List all namespaces
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){
+    $opts = array(
+            'listdirs' => true,
+            );
+    return search_universal($data,$base,$file,$type,$lvl,$opts);
+}
+
+/**
+ * List all mediafiles in a namespace
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_media(&$data,$base,$file,$type,$lvl,$opts){
+
+    //we do nothing with directories
+    if($type == 'd') {
+        if(!$opts['depth']) return true; // recurse forever
+        $depth = substr_count($file,'/');
+        if($depth >= $opts['depth']) return false; // depth reached
+        return true;
+    }
+
+    $info         = array();
+    $info['id']   = pathID($file,true);
+    if($info['id'] != cleanID($info['id'])){
+        if($opts['showmsg'])
+            msg(hsc($info['id']).' is not a valid file name for DokuWiki - skipped',-1);
+        return false; // skip non-valid files
+    }
+
+    //check ACL for namespace (we have no ACL for mediafiles)
+    $info['perm'] = auth_quickaclcheck(getNS($info['id']).':*');
+    if(!$opts['skipacl'] && $info['perm'] < AUTH_READ){
+        return false;
+    }
+
+    //check pattern filter
+    if($opts['pattern'] && !@preg_match($opts['pattern'], $info['id'])){
+        return false;
+    }
+
+    $info['file']     = basename($file);
+    $info['size']     = filesize($base.'/'.$file);
+    $info['mtime']    = filemtime($base.'/'.$file);
+    $info['writable'] = is_writable($base.'/'.$file);
+    if(preg_match("/\.(jpe?g|gif|png)$/",$file)){
+        $info['isimg'] = true;
+        require_once(DOKU_INC.'inc/JpegMeta.php');
+        $info['meta']  = new JpegMeta($base.'/'.$file);
+    }else{
+        $info['isimg'] = false;
+    }
+    if($opts['hash']){
+        $info['hash'] = md5(io_readFile(wikiFN($info['id']),false));
+    }
+
+    $data[] = $info;
+
+    return false;
+}
+
+/**
+ * This function just lists documents (for RSS namespace export)
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_list(&$data,$base,$file,$type,$lvl,$opts){
+    //we do nothing with directories
+    if($type == 'd') return false;
+    //only search txt files
+    if(substr($file,-4) == '.txt'){
+        //check ACL
+        $id = pathID($file);
+        if(auth_quickaclcheck($id) < AUTH_READ){
+            return false;
+        }
+        $data[]['id'] = $id;
+    }
+    return false;
+}
+
+/**
+ * Quicksearch for searching matching pagenames
+ *
+ * $opts['query'] is the search query
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_pagename(&$data,$base,$file,$type,$lvl,$opts){
+    //we do nothing with directories
+    if($type == 'd') return true;
+    //only search txt files
+    if(substr($file,-4) != '.txt') return true;
+
+    //simple stringmatching
+    if (!empty($opts['query'])){
+        if(strpos($file,$opts['query']) !== false){
+            //check ACL
+            $id = pathID($file);
+            if(auth_quickaclcheck($id) < AUTH_READ){
+                return false;
+            }
+            $data[]['id'] = $id;
+        }
+    }
+    return true;
+}
+
+/**
+ * Just lists all documents
+ *
+ * $opts['depth']   recursion level, 0 for all
+ * $opts['hash']    do md5 sum of content?
+ * $opts['skipacl'] list everything regardless of ACL
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function search_allpages(&$data,$base,$file,$type,$lvl,$opts){
+    //we do nothing with directories
+    if($type == 'd'){
+        if(!$opts['depth']) return true; // recurse forever
+        $parts = explode('/',ltrim($file,'/'));
+        if(count($parts) == $opts['depth']) return false; // depth reached
+        return true;
+    }
+
+    //only search txt files
+    if(substr($file,-4) != '.txt') return true;
+
+    $item['id']   = pathID($file);
+    if(!$opts['skipacl'] && auth_quickaclcheck($item['id']) < AUTH_READ){
+        return false;
+    }
+
+    $item['rev']   = filemtime($base.'/'.$file);
+    $item['mtime'] = $item['rev'];
+    $item['size']  = filesize($base.'/'.$file);
+    if($opts['hash']){
+        $item['hash'] = md5(trim(rawWiki($item['id'])));
+    }
+
+    $data[] = $item;
+    return true;
+}
+
+/**
+ * Search for backlinks to a given page
+ *
+ * $opts['ns']    namespace of the page
+ * $opts['name']  name of the page without namespace
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @deprecated Replaced by ft_backlinks()
+ */
+function search_backlinks(&$data,$base,$file,$type,$lvl,$opts){
+    //we do nothing with directories
+    if($type == 'd') return true;
+    //only search txt files
+    if(substr($file,-4) != '.txt') return true;
+
+    //absolute search id
+    $sid = cleanID($opts['ns'].':'.$opts['name']);
+
+    //current id and namespace
+    $cid = pathID($file);
+    $cns = getNS($cid);
+
+    //check ACL
+    if(auth_quickaclcheck($cid) < AUTH_READ){
+        return false;
+    }
+
+    //fetch instructions
+    require_once(DOKU_INC.'inc/parserutils.php');
+    $instructions = p_cached_instructions($base.$file,true);
+    if(is_null($instructions)) return false;
+
+    //check all links for match
+    foreach($instructions as $ins){
+        if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){
+            $mid = $ins[1][0];
+            resolve_pageid($cns,$mid,$exists); //exists is not used
+            if($mid == $sid){
+                //we have a match - finish
+                $data[]['id'] = $cid;
+                break;
+            }
+        }
+    }
+
+    return false;
+}
+
+/**
+ * Fulltextsearch
+ *
+ * $opts['query'] is the search query
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @deprecated - fulltext indexer is used instead
+ */
+function search_fulltext(&$data,$base,$file,$type,$lvl,$opts){
+    //we do nothing with directories
+    if($type == 'd') return true;
+    //only search txt files
+    if(substr($file,-4) != '.txt') return true;
+
+    //check ACL
+    $id = pathID($file);
+    if(auth_quickaclcheck($id) < AUTH_READ){
+        return false;
+    }
+
+    //create regexp from queries
+    $poswords = array();
+    $negwords = array();
+    $qpreg = preg_split('/\s+/',$opts['query']);
+
+    foreach($qpreg as $word){
+        switch(substr($word,0,1)){
+            case '-':
+                if(strlen($word) > 1){  // catch single '-'
+                    array_push($negwords,preg_quote(substr($word,1),'#'));
+                }
+                break;
+            case '+':
+                if(strlen($word) > 1){  // catch single '+'
+                    array_push($poswords,preg_quote(substr($word,1),'#'));
+                }
+                break;
+            default:
+                array_push($poswords,preg_quote($word,'#'));
+                break;
+        }
+    }
+
+    // a search without any posword is useless
+    if (!count($poswords)) return true;
+
+    $reg  = '^(?=.*?'.join(')(?=.*?',$poswords).')';
+            $reg .= count($negwords) ? '((?!'.join('|',$negwords).').)*$' : '.*$';
+            search_regex($data,$base,$file,$reg,$poswords);
+            return true;
+            }
+
+            /**
+             * Reference search
+             * This fuction searches for existing references to a given media file
+             * and returns an array with the found pages. It doesn't pay any
+             * attention to ACL permissions to find every reference. The caller
+             * must check if the user has the appropriate rights to see the found
+             * page and eventually have to prevent the result from displaying.
+             *
+             * @param array  $data Reference to the result data structure
+             * @param string $base Base usually $conf['datadir']
+             * @param string $file current file or directory relative to $base
+             * @param char   $type Type either 'd' for directory or 'f' for file
+             * @param int    $lvl  Current recursion depht
+             * @param mixed  $opts option array as given to search()
+             *
+             * $opts['query'] is the demanded media file name
+             *
+             * @author  Andreas Gohr <andi@splitbrain.org>
+             * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+             */
+function search_reference(&$data,$base,$file,$type,$lvl,$opts){
+    global $conf;
+
+    //we do nothing with directories
+    if($type == 'd') return true;
+
+    //only search txt files
+    if(substr($file,-4) != '.txt') return true;
+
+    //we finish after 'cnt' references found. The return value
+    //'false' will skip subdirectories to speed search up.
+    $cnt = $conf['refshow'] > 0 ? $conf['refshow'] : 1;
+    if(count($data) >= $cnt) return false;
+
+    $reg = '\{\{ *\:?'.$opts['query'].' *(\|.*)?\}\}';
+    search_regex($data,$base,$file,$reg,array($opts['query']));
+    return true;
+}
+
+/* ------------- helper functions below -------------- */
+
+/**
+ * fulltext search helper
+ * searches a text file with a given regular expression
+ * no ACL checks are performed. This have to be done by
+ * the caller if necessary.
+ *
+ * @param array  $data  reference to array for results
+ * @param string $base  base directory
+ * @param string $file  file name to search in
+ * @param string $reg   regular expression to search for
+ * @param array  $words words that should be marked in the results
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @author  Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ *
+ * @deprecated - fulltext indexer is used instead
+ */
+function search_regex(&$data,$base,$file,$reg,$words){
+
+    //get text
+    $text = io_readfile($base.'/'.$file);
+    //lowercase text (u modifier does not help with case)
+    $lctext = utf8_strtolower($text);
+
+    //do the fulltext search
+    $matches = array();
+    if($cnt = preg_match_all('#'.$reg.'#usi',$lctext,$matches)){
+        //this is not the best way for snippet generation but the fastest I could find
+        $q = $words[0];  //use first word for snippet creation
+        $p = utf8_strpos($lctext,$q);
+        $f = $p - 100;
+        $l = utf8_strlen($q) + 200;
+        if($f < 0) $f = 0;
+        $snippet = '<span class="search_sep"> ... </span>'.
+            htmlspecialchars(utf8_substr($text,$f,$l)).
+            '<span class="search_sep"> ... </span>';
+        $mark    = '('.join('|', $words).')';
+        $snippet = preg_replace('#'.$mark.'#si','<strong class="search_hit">\\1</strong>',$snippet);
+
+        $data[] = array(
+                'id'       => pathID($file),
+                'count'    => preg_match_all('#'.$mark.'#usi',$lctext,$matches),
+                'poswords' => join(' ',$words),
+                'snippet'  => $snippet,
+                );
+    }
+
+    return true;
+}
+
+
+/**
+ * fulltext sort
+ *
+ * Callback sort function for use with usort to sort the data
+ * structure created by search_fulltext. Sorts descending by count
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function sort_search_fulltext($a,$b){
+    if($a['count'] > $b['count']){
+        return -1;
+    }elseif($a['count'] < $b['count']){
+        return 1;
+    }else{
+        return strcmp($a['id'],$b['id']);
+    }
+}
+
+/**
+ * translates a document path to an ID
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ * @todo    move to pageutils
+ */
+function pathID($path,$keeptxt=false){
+    $id = utf8_decodeFN($path);
+    $id = str_replace('/',':',$id);
+    if(!$keeptxt) $id = preg_replace('#\.txt$#','',$id);
+    $id = preg_replace('#^:+#','',$id);
+    $id = preg_replace('#:+$#','',$id);
+    return $id;
+}
+
+
+/**
+ * This is a very universal callback for the search() function, replacing
+ * many of the former individual functions at the cost of a more complex
+ * setup.
+ *
+ * How the function behaves, depends on the options passed in the $opts
+ * array, where the following settings can be used.
+ *
+ * depth      int     recursion depth. 0 for unlimited
+ * keeptxt    bool    keep .txt extension for IDs
+ * listfiles  bool    include files in listing
+ * listdirs   bool    include namespaces in listing
+ * pagesonly  bool    restrict files to pages
+ * skipacl    bool    do not check for READ permission
+ * sneakyacl  bool    don't recurse into nonreadable dirs
+ * hash       bool    create MD5 hash for files
+ * meta       bool    return file metadata
+ * filematch  string  match files against this regexp
+ * idmatch    string  match full ID against this regexp
+ * dirmatch   string  match directory against this regexp when adding
+ * nsmatch    string  match namespace against this regexp when adding
+ * recmatch   string  match directory against this regexp when recursing
+ * showmsg    bool    warn about non-ID files
+ * showhidden bool    show hidden files too
+ * firsthead  bool    return first heading for pages
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function search_universal(&$data,$base,$file,$type,$lvl,$opts){
+    $item   = array();
+    $return = true;
+
+    // get ID and check if it is a valid one
+    $item['id'] = pathID($file);
+    if($item['id'] != cleanID($item['id'])){
+        if($opts['showmsg'])
+            msg(hsc($item['id']).' is not a valid file name for DokuWiki - skipped',-1);
+        return false; // skip non-valid files
+    }
+    $item['ns']  = getNS($item['id']);
+
+    if($type == 'd') {
+        // decide if to recursion into this directory is wanted
+        if(!$opts['depth']){
+            $return = true; // recurse forever
+        }else{
+            $depth = substr_count($file,'/');
+            if($depth >= $opts['depth']){
+                $return = false; // depth reached
+            }else{
+                $return = true;
+            }
+        }
+        if($return && !preg_match('/'.$opts['recmatch'].'/',$file)){
+            $return = false; // doesn't match
+        }
+    }
+
+    // check ACL
+    if(!$opts['skipacl']){
+        if($type == 'd'){
+            $item['perm'] = auth_quickaclcheck($item['id'].':*');
+        }else{
+            $item['perm'] = auth_quickaclcheck($item['id']); //FIXME check namespace for media files
+        }
+    }else{
+        $item['perm'] = AUTH_DELETE;
+    }
+
+    // are we done here maybe?
+    if($type == 'd'){
+        if(!$opts['listdirs']) return $return;
+        if(!$opts['skipacl'] && $opts['sneakyacl'] && $item['perm'] < AUTH_READ) return false; //neither list nor recurse
+        if($opts['dirmatch'] && !preg_match('/'.$opts['dirmatch'].'/',$file)) return $return;
+        if($opts['nsmatch'] && !preg_match('/'.$opts['nsmatch'].'/',$item['ns'])) return $return;
+    }else{
+        if(!$opts['listfiles']) return $return;
+        if(!$opts['skipacl'] && $item['perm'] < AUTH_READ) return $return;
+        if($opts['pagesonly'] && (substr($file,-4) != '.txt')) return $return;
+        if(!$conf['showhidden'] && isHiddenPage($id)) return $return;
+        if($opts['filematch'] && !preg_match('/'.$opts['filematch'].'/',$file)) return $return;
+        if($opts['idmatch'] && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return;
+    }
+
+    // still here? prepare the item
+    $item['type']  = $type;
+    $item['level'] = $lvl;
+    $item['open']  = $return;
+
+    if($opts['meta']){
+        $item['file']       = basename($file);
+        $item['size']       = filesize($base.'/'.$file);
+        $item['mtime']      = filemtime($base.'/'.$file);
+        $item['rev']        = $item['mtime'];
+        $item['writable']   = is_writable($base.'/'.$file);
+        $item['executable'] = is_executable($base.'/'.$file);
+    }
+
+    if($type == 'f'){
+        if($opts['hash']) $item['hash'] = md5(io_readFile($base.'/'.$file,false));
+        if($opts['firsthead']) $item['title'] = p_get_first_heading($item['id'],false);
+    }
+
+    // finally add the item
+    $data[] = $item;
+    return $return;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/template.php b/mod/dokuwiki/vendors/dokuwiki/inc/template.php
new file mode 100644
index 000000000..b7790060c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/template.php
@@ -0,0 +1,1413 @@
+<?php
+/**
+ * DokuWiki template functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * Returns the path to the given template, uses
+ * default one if the custom version doesn't exist.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function template($tpl){
+  global $conf;
+
+  if(@is_readable(DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$tpl))
+    return DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$tpl;
+
+  return DOKU_INC.'lib/tpl/default/'.$tpl;
+}
+
+/**
+ * Print the content
+ *
+ * This function is used for printing all the usual content
+ * (defined by the global $ACT var) by calling the appropriate
+ * outputfunction(s) from html.php
+ *
+ * Everything that doesn't use the main template file isn't
+ * handled by this function. ACL stuff is not done here either.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+function tpl_content($prependTOC=true) {
+    global $ACT;
+    global $INFO;
+    $INFO['prependTOC'] = $prependTOC;
+
+    ob_start();
+    trigger_event('TPL_ACT_RENDER',$ACT,'tpl_content_core');
+    $html_output = ob_get_clean();
+    trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln');
+
+    return !empty($html_output);
+}
+
+function tpl_content_core(){
+  global $ACT;
+  global $TEXT;
+  global $PRE;
+  global $SUF;
+  global $SUM;
+  global $IDX;
+
+  switch($ACT){
+    case 'show':
+      html_show();
+      break;
+    case 'preview':
+      html_edit($TEXT);
+      html_show($TEXT);
+      break;
+    case 'recover':
+      html_edit($TEXT);
+      break;
+    case 'edit':
+      html_edit();
+      break;
+    case 'draft':
+      html_draft();
+      break;
+    case 'wordblock':
+      html_edit($TEXT,'wordblock');
+      break;
+    case 'search':
+      html_search();
+      break;
+    case 'revisions':
+      $first = isset($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
+      html_revisions($first);
+      break;
+    case 'diff':
+      html_diff();
+      break;
+    case 'recent':
+      if (is_array($_REQUEST['first'])) {
+        $_REQUEST['first'] = array_keys($_REQUEST['first']);
+        $_REQUEST['first'] = $_REQUEST['first'][0];
+      }
+      $first = is_numeric($_REQUEST['first']) ? intval($_REQUEST['first']) : 0;
+      html_recent($first);
+      break;
+    case 'index':
+      html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly?
+      break;
+    case 'backlink':
+      html_backlinks();
+      break;
+    case 'conflict':
+      html_conflict(con($PRE,$TEXT,$SUF),$SUM);
+      html_diff(con($PRE,$TEXT,$SUF),false);
+      break;
+    case 'locked':
+      html_locked();
+      html_edit();
+      break;
+    case 'login':
+      html_login();
+      break;
+    case 'register':
+      html_register();
+      break;
+    case 'resendpwd':
+      html_resendpwd();
+      break;
+    case 'denied':
+      print p_locale_xhtml('denied');
+      break;
+    case 'profile' :
+      html_updateprofile();
+      break;
+    case 'admin':
+      tpl_admin();
+      break;
+    default:
+      $evt = new Doku_Event('TPL_ACT_UNKNOWN',$ACT);
+      if ($evt->advise_before())
+        msg("Failed to handle command: ".hsc($ACT),-1);
+      $evt->advise_after();
+      unset($evt);
+      return false;
+  }
+  return true;
+}
+
+/**
+ * Places the TOC where the function is called
+ *
+ * If you use this you most probably want to call tpl_content with
+ * a false argument
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_toc($return=false){
+    global $TOC;
+    global $ACT;
+    global $ID;
+    global $REV;
+    global $INFO;
+    global $conf;
+    $toc = array();
+
+    if(is_array($TOC)){
+        // if a TOC was prepared in global scope, always use it
+        $toc = $TOC;
+    }elseif(($ACT == 'show' || substr($ACT,0,6) == 'export') && !$REV && $INFO['exists']){
+        // get TOC from metadata, render if neccessary
+        $meta = p_get_metadata($ID, false, true);
+        if(isset($meta['internal']['toc'])){
+            $tocok = $meta['internal']['toc'];
+        }else{
+            $tocok = true;
+        }
+        $toc   = $meta['description']['tableofcontents'];
+        if(!$tocok || !is_array($toc) || !$conf['tocminheads'] || count($toc) < $conf['tocminheads']){
+            $toc = array();
+        }
+    }elseif($ACT == 'admin'){
+        // try to load admin plugin TOC FIXME: duplicates code from tpl_admin
+        $plugin = null;
+	$page = get_input('dokupage');
+        if (!empty($page)) {
+            $pluginlist = plugin_list('admin');
+            if (in_array($page, $pluginlist)) {
+                // attempt to load the plugin
+                $plugin =& plugin_load('admin',$page);
+            }
+        }
+        if ( ($plugin !== null) &&
+             (!$plugin->forAdminOnly() || $INFO['isadmin']) ){
+            $toc = $plugin->getTOC();
+            $TOC = $toc; // avoid later rebuild
+        }
+    }
+
+    trigger_event('TPL_TOC_RENDER', $toc, NULL, false);
+    $html = html_TOC($toc);
+    if($return) return $html;
+    echo $html;
+}
+
+/**
+ * Handle the admin page contents
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_admin(){
+    global $INFO;
+    global $TOC;
+
+    $plugin = null;
+    $page = get_input('dokupage');
+    if (!empty($page)) {
+        $pluginlist = plugin_list('admin');
+
+        if (in_array($page, $pluginlist)) {
+
+          // attempt to load the plugin
+          $plugin =& plugin_load('admin',$page);
+        }
+    }
+
+    if ($plugin !== null){
+        if($plugin->forAdminOnly() && !$INFO['isadmin']){
+            msg('For admins only',-1);
+            html_admin();
+        }else{
+            if(!is_array($TOC)) $TOC = $plugin->getTOC(); //if TOC wasn't requested yet
+            if($INFO['prependTOC']) tpl_toc();
+            $plugin->html();
+        }
+    }else{
+        html_admin();
+    }
+    return true;
+}
+
+/**
+ * Print the correct HTML meta headers
+ *
+ * This has to go into the head section of your template.
+ *
+ * @triggers TPL_METAHEADER_OUTPUT
+ * @param  boolean $alt Should feeds and alternative format links be added?
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_metaheaders($alt=true){
+  global $ID;
+  global $REV;
+  global $INFO;
+  global $JSINFO;
+  global $ACT;
+  global $QUERY;
+  global $lang;
+  global $conf;
+  $it=2;
+
+  // prepare the head array
+  $head = array();
+
+  // prepare seed for js and css 
+  $tseed = 0;
+  $depends = getConfigFiles('main');
+  foreach($depends as $f) {
+      $time = @filemtime($f);
+      if($time > $tseed) $tseed = $time;
+  }
+
+  // the usual stuff
+  $head['meta'][] = array( 'name'=>'generator', 'content'=>'DokuWiki '.getVersion() );
+  $head['link'][] = array( 'rel'=>'search', 'type'=>'application/opensearchdescription+xml',
+                           'href'=>DOKU_BASE.'lib/exe/opensearch.php', 'title'=>$conf['title'] );
+  $head['link'][] = array( 'rel'=>'start', 'href'=>DOKU_BASE );
+  if(actionOK('index')){
+    $head['link'][] = array( 'rel'=>'contents', 'href'=> wl($ID,'do=index',false,'&'),
+                           'title'=>$lang['btn_index'] );
+  }
+
+  if($alt){
+    $head['link'][] = array( 'rel'=>'alternate', 'type'=>'application/rss+xml',
+                             'title'=>'Recent Changes', 'href'=>DOKU_BASE.'feed.php');
+    $head['link'][] = array( 'rel'=>'alternate', 'type'=>'application/rss+xml',
+                             'title'=>'Current Namespace',
+                             'href'=>DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']);
+    if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']){
+        $head['link'][] = array( 'rel'=>'edit',
+                                 'title'=>$lang['btn_edit'],
+                                 'href'=> wl($ID,'do=edit',false,'&'));
+    }
+
+    if($ACT == 'search'){
+      $head['link'][] = array( 'rel'=>'alternate', 'type'=>'application/rss+xml',
+                               'title'=>'Search Result',
+                               'href'=>DOKU_BASE.'feed.php?mode=search&q='.$QUERY);
+    }
+
+    if(actionOK('export_xhtml')){
+      $head['link'][] = array( 'rel'=>'alternate', 'type'=>'text/html', 'title'=>'Plain HTML',
+                               'href'=>exportlink($ID, 'xhtml', '', false, '&'));
+    }
+
+    if(actionOK('export_raw')){
+      $head['link'][] = array( 'rel'=>'alternate', 'type'=>'text/plain', 'title'=>'Wiki Markup',
+                               'href'=>exportlink($ID, 'raw', '', false, '&'));
+    }
+  }
+
+  // setup robot tags apropriate for different modes
+  if( ($ACT=='show' || $ACT=='export_xhtml') && !$REV){
+    if($INFO['exists']){
+      //delay indexing:
+      if((time() - $INFO['lastmod']) >= $conf['indexdelay']){
+        $head['meta'][] = array( 'name'=>'robots', 'content'=>'index,follow');
+      }else{
+        $head['meta'][] = array( 'name'=>'robots', 'content'=>'noindex,nofollow');
+      }
+      $head['link'][] = array( 'rel'=>'canonical', 'href'=>wl($ID,'',true,'&') );
+    }else{
+      $head['meta'][] = array( 'name'=>'robots', 'content'=>'noindex,follow');
+    }
+  }elseif(defined('DOKU_MEDIADETAIL')){
+    $head['meta'][] = array( 'name'=>'robots', 'content'=>'index,follow');
+  }else{
+    $head['meta'][] = array( 'name'=>'robots', 'content'=>'noindex,nofollow');
+  }
+
+  // set metadata
+  if($ACT == 'show' || $ACT=='export_xhtml'){
+    // date of modification
+    if($REV){
+      $head['meta'][] = array( 'name'=>'date', 'content'=>date('Y-m-d\TH:i:sO',$REV));
+    }else{
+      $head['meta'][] = array( 'name'=>'date', 'content'=>date('Y-m-d\TH:i:sO',$INFO['lastmod']));
+    }
+
+    // keywords (explicit or implicit)
+    if(!empty($INFO['meta']['subject'])){
+      $head['meta'][] = array( 'name'=>'keywords', 'content'=>join(',',$INFO['meta']['subject']));
+    }else{
+      $head['meta'][] = array( 'name'=>'keywords', 'content'=>str_replace(':',',',$ID));
+    }
+  }
+
+  // load stylesheets
+  $head['link'][] = array('rel'=>'stylesheet', 'media'=>'all', 'type'=>'text/css',
+                          'href'=>DOKU_BASE.'lib/exe/css.php?s=all&t='.$conf['template'].'&tseed='.$tseed);
+  $head['link'][] = array('rel'=>'stylesheet', 'media'=>'screen', 'type'=>'text/css',
+                          'href'=>DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed);
+  $head['link'][] = array('rel'=>'stylesheet', 'media'=>'print', 'type'=>'text/css',
+                          'href'=>DOKU_BASE.'lib/exe/css.php?s=print&t='.$conf['template'].'&tseed='.$tseed);
+
+  // make $INFO and other vars available to JavaScripts
+  require_once(DOKU_INC.'inc/JSON.php');
+  $json = new JSON();
+  $script = "var NS='".$INFO['namespace']."';";
+  if($conf['useacl'] && $_SERVER['REMOTE_USER']){
+      require_once(DOKU_INC.'inc/toolbar.php');
+      $script .= "var SIG='".toolbar_signature()."';";
+  }
+  $script .= 'var JSINFO = '.$json->encode($JSINFO).';';
+  $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8',
+                               '_data'=> $script);
+
+  // load external javascript
+  $head['script'][] = array( 'type'=>'text/javascript', 'charset'=>'utf-8', '_data'=>'',
+                             'src'=>DOKU_BASE.'lib/exe/js.php'.'?tseed='.$tseed);
+
+
+  // trigger event here
+  trigger_event('TPL_METAHEADER_OUTPUT',$head,'_tpl_metaheaders_action',true);
+  return true;
+}
+
+/**
+ * prints the array build by tpl_metaheaders
+ *
+ * $data is an array of different header tags. Each tag can have multiple
+ * instances. Attributes are given as key value pairs. Values will be HTML
+ * encoded automatically so they should be provided as is in the $data array.
+ *
+ * For tags having a body attribute specify the the body data in the special
+ * attribute '_data'. This field will NOT BE ESCAPED automatically.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function _tpl_metaheaders_action($data){
+  foreach($data as $tag => $inst){
+    foreach($inst as $attr){
+      echo '<',$tag,' ',buildAttributes($attr);
+      if(isset($attr['_data']) || $tag == 'script'){
+          if($tag == 'script' && $attr['_data'])
+            $attr['_data'] = "<!--//--><![CDATA[//><!--\n".
+                             $attr['_data'].
+                             "\n//--><!]]>";
+
+          echo '>',$attr['_data'],'</',$tag,'>';
+      }else{
+        echo '/>';
+      }
+      echo "\n";
+    }
+  }
+}
+
+/**
+ * Print a link
+ *
+ * Just builds a link.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_link($url,$name,$more='',$return=false){
+  $out = '<a href="'.$url.'" ';
+  if ($more) $out .= ' '.$more;
+  $out .= ">$name</a>";
+  if ($return) return $out;
+  print $out;
+  return true;
+}
+
+/**
+ * Prints a link to a WikiPage
+ *
+ * Wrapper around html_wikilink
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_pagelink($id,$name=NULL){
+  print html_wikilink($id,$name);
+  return true;
+}
+
+/**
+ * get the parent page
+ *
+ * Tries to find out which page is parent.
+ * returns false if none is available
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_getparent($id){
+  global $conf;
+  $parent = getNS($id).':';
+  resolve_pageid('',$parent,$exists);
+  if($parent == $id) {
+    $pos = strrpos (getNS($id),':');
+    $parent = substr($parent,0,$pos).':';
+    resolve_pageid('',$parent,$exists);
+    if($parent == $id) return false;
+  }
+  return $parent;
+}
+
+/**
+ * Print one of the buttons
+ *
+ * Available Buttons are
+ *
+ *  edit        - edit/create/show/draft button
+ *  history     - old revisions
+ *  recent      - recent changes
+ *  login       - login/logout button - if ACL enabled
+ *  profile     - user profile button (if logged in)
+ *  index       - The index
+ *  admin       - admin page - if enough rights
+ *  top         - a back to top button
+ *  back        - a back to parent button - if available
+ *  backlink    - links to the list of backlinks
+ *  subscription- subscribe/unsubscribe button
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+function tpl_button($type,$return=false){
+  global $ACT;
+  global $ID;
+  global $REV;
+  global $NS;
+  global $INFO;
+  global $conf;
+  global $auth;
+
+  // check disabled actions and fix the badly named ones
+  $ctype = $type;
+  if($type == 'history') $ctype='revisions';
+  if(!actionOK($ctype)) return false;
+
+  $out = '';
+  switch($type){
+    case 'edit':
+      #most complicated type - we need to decide on current action
+      if($ACT == 'show' || $ACT == 'search'){
+        if($INFO['writable']){
+          if(!empty($INFO['draft'])){
+            $out .= html_btn('draft',$ID,'e',array('do' => 'draft'),'post');
+          }else{
+            if($INFO['exists']){
+              $out .= html_btn('edit',$ID,'e',array('do' => 'edit','rev' => $REV),'post');
+            }else{
+              $out .= html_btn('create',$ID,'e',array('do' => 'edit','rev' => $REV),'post');
+            }
+          }
+        }else{
+          if(!actionOK('source')) return false; //pseudo action
+          $out .= html_btn('source',$ID,'v',array('do' => 'edit','rev' => $REV),'post');
+        }
+      }else{
+          $out .= html_btn('show',$ID,'v',array('do' => 'show'));
+      }
+      break;
+    case 'history':
+      if(actionOK('revisions'))
+        $out .= html_btn('revs',$ID,'o',array('do' => 'revisions'));
+      break;
+    case 'recent':
+      if(actionOK('recent'))
+        $out .= html_btn('recent',$ID,'r',array('do' => 'recent'));
+      break;
+    case 'index':
+      if(actionOK('index'))
+        $out .= html_btn('index',$ID,'x',array('do' => 'index'));
+      break;
+    case 'back':
+      if ($parent = tpl_getparent($ID)) {
+        $out .= html_btn('back',$parent,'b',array('do' => 'show'));
+      }
+      break;
+    case 'top':
+      $out .= html_topbtn();
+      break;
+    case 'login':
+      if($conf['useacl'] && $auth){
+        if(isset($_SERVER['REMOTE_USER'])){
+          $out .= html_btn('logout',$ID,'',array('do' => 'logout', 'sectok' => getSecurityToken()));
+        }else{
+          $out .= html_btn('login',$ID,'',array('do' => 'login', 'sectok' => getSecurityToken()));
+        }
+      }
+      break;
+    case 'admin':
+      if($INFO['ismanager']){
+        $out .= html_btn('admin',$ID,'',array('do' => 'admin'));
+      }
+      break;
+    case 'revert':
+      if($INFO['ismanager'] && $REV && $INFO['writable'] && actionOK('revert')){
+        $out .= html_btn('revert',$ID,'',array('do' => 'revert', 'rev' => $REV, 'sectok' => getSecurityToken()));
+      }
+      break;
+    case 'subscribe':
+    case 'subscription':
+      if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+        if($_SERVER['REMOTE_USER']){
+          if($INFO['subscribed']){
+            if(actionOK('unsubscribe'))
+              $out .= html_btn('unsubscribe',$ID,'',array('do' => 'unsubscribe',));
+          } else {
+            if(actionOK('subscribe'))
+              $out .= html_btn('subscribe',$ID,'',array('do' => 'subscribe',));
+          }
+        }
+      }
+      if($type == 'subscribe') break;
+      // else: fall through for backward compatibility
+    case 'subscribens':
+      if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+        if($_SERVER['REMOTE_USER']){
+          if($INFO['subscribedns']){
+            if(actionOK('unsubscribens'))
+              $out .= html_btn('unsubscribens',$ID,'',array('do' => 'unsubscribens',));
+          } else {
+            if(actionOK('subscribens'))
+              $out .= html_btn('subscribens',$ID,'',array('do' => 'subscribens',));
+          }
+        }
+      }
+      break;
+    case 'backlink':
+      if(actionOK('backlink'))
+        $out .= html_btn('backlink',$ID,'',array('do' => 'backlink'));
+      break;
+    case 'profile':
+      if($conf['useacl'] && isset($_SERVER['REMOTE_USER']) && $auth &&
+          $auth->canDo('Profile') && ($ACT!='profile')){
+        $out .= html_btn('profile',$ID,'',array('do' => 'profile'));
+      }
+      break;
+    default:
+      $out .= '[unknown button type]';
+      break;
+  }
+  if ($return) return $out;
+  print $out;
+  return $out ? true : false;
+}
+
+/**
+ * Like the action buttons but links
+ *
+ * Available links are
+ *
+ *  edit    - edit/create/show link
+ *  history - old revisions
+ *  recent  - recent changes
+ *  login   - login/logout link - if ACL enabled
+ *  profile - user profile link (if logged in)
+ *  index   - The index
+ *  admin   - admin page - if enough rights
+ *  top     - a back to top link
+ *  back    - a back to parent link - if available
+ *  backlink - links to the list of backlinks
+ *  subscribe/subscription - subscribe/unsubscribe link
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @see    tpl_button
+ */
+function tpl_actionlink($type,$pre='',$suf='',$inner='',$return=false){
+  global $ID;
+  global $INFO;
+  global $REV;
+  global $ACT;
+  global $conf;
+  global $lang;
+  global $auth;
+
+  // check disabled actions and fix the badly named ones
+  $ctype = $type;
+  if($type == 'history') $ctype='revisions';
+  if(!actionOK($ctype)) return false;
+
+  $out = '';
+  switch($type){
+    case 'edit':
+      #most complicated type - we need to decide on current action
+      if($ACT == 'show' || $ACT == 'search'){
+        if($INFO['writable']){
+          if(!empty($INFO['draft'])) {
+            $out .= tpl_link(wl($ID,'do=draft'),
+                       $pre.(($inner)?$inner:$lang['btn_draft']).$suf,
+                       'class="action edit" accesskey="e" rel="nofollow"',1);
+          } else {
+            if($INFO['exists']){
+              $out .= tpl_link(wl($ID,'do=edit&amp;rev='.$REV),
+                       $pre.(($inner)?$inner:$lang['btn_edit']).$suf,
+                       'class="action edit" accesskey="e" rel="nofollow"',1);
+            }else{
+              $out .= tpl_link(wl($ID,'do=edit&amp;rev='.$REV),
+                       $pre.(($inner)?$inner:$lang['btn_create']).$suf,
+                       'class="action create" accesskey="e" rel="nofollow"',1);
+            }
+          }
+        }else{
+          if(actionOK('source')) //pseudo action
+            $out .= tpl_link(wl($ID,'do=edit&amp;rev='.$REV),
+                   $pre.(($inner)?$inner:$lang['btn_source']).$suf,
+                   'class="action source" accesskey="v" rel="nofollow"',1);
+        }
+      }else{
+          $out .= tpl_link(wl($ID,'do=show'),
+                   $pre.(($inner)?$inner:$lang['btn_show']).$suf,
+                   'class="action show" accesskey="v" rel="nofollow"',1);
+      }
+      break;
+    case 'history':
+      if(actionOK('revisions'))
+        $out .= tpl_link(wl($ID,'do=revisions'),
+               $pre.(($inner)?$inner:$lang['btn_revs']).$suf,
+               'class="action revisions" accesskey="o" rel="nofollow"',1);
+      break;
+    case 'recent':
+      if(actionOK('recent'))
+        $out .= tpl_link(wl($ID,'do=recent'),
+               $pre.(($inner)?$inner:$lang['btn_recent']).$suf,
+              'class="action recent" accesskey="r" rel="nofollow"',1);
+      break;
+    case 'index':
+      if(actionOK('index'))
+        $out .= tpl_link(wl($ID,'do=index'),
+               $pre.(($inner)?$inner:$lang['btn_index']).$suf,
+              'class="action index" accesskey="x" rel="nofollow"',1);
+      break;
+    case 'top':
+      $out .= '<a href="#dokuwiki__top" class="action top" accesskey="x">'.
+            $pre.(($inner)?$inner:$lang['btn_top']).$suf.'</a>';
+      break;
+    case 'back':
+      if ($parent = tpl_getparent($ID)) {
+        $out .= tpl_link(wl($parent,'do=show'),
+        $pre.(($inner)?$inner:$lang['btn_back']).$suf,
+        'class="action back" accesskey="b" rel="nofollow"',1);
+      }
+      break;
+    case 'login':
+      if($conf['useacl'] && $auth){
+        if($_SERVER['REMOTE_USER']){
+          $out .= tpl_link(wl($ID,'do=logout&amp;sectok='.getSecurityToken()),
+                   $pre.(($inner)?$inner:$lang['btn_logout']).$suf,
+                   'class="action logout" rel="nofollow"',1);
+        }else{
+          $out .= tpl_link(wl($ID,'do=login&amp;sectok='.getSecurityToken()),
+                   $pre.(($inner)?$inner:$lang['btn_login']).$suf,
+                   'class="action login" rel="nofollow"',1);
+        }
+      }
+      break;
+    case 'admin':
+      if($INFO['ismanager']){
+        $out .= tpl_link(wl($ID,'do=admin'),
+                 $pre.(($inner)?$inner:$lang['btn_admin']).$suf,
+                 'class="action admin" rel="nofollow"',1);
+      }
+      break;
+    case 'revert':
+      if($INFO['ismanager'] && $REV && $INFO['writable'] && actionOK('revert')){
+        $out .= tpl_link(wl($ID,array('do' => 'revert', 'rev' => $REV, 'sectok' => getSecurityToken())),
+                 $pre.(($inner)?$inner:$lang['btn_revert']).$suf,
+                 'class="action revert" rel="nofollow"',1);
+      }
+      break;
+   case 'subscribe':
+   case 'subscription':
+      if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+        if($_SERVER['REMOTE_USER']){
+          if($INFO['subscribed']) {
+            if(actionOK('unsubscribe'))
+              $out .= tpl_link(wl($ID,'do=unsubscribe'),
+                     $pre.(($inner)?$inner:$lang['btn_unsubscribe']).$suf,
+                     'class="action unsubscribe" rel="nofollow"',1);
+          } else {
+            if(actionOK('subscribe'))
+              $out .= tpl_link(wl($ID,'do=subscribe'),
+                     $pre.(($inner)?$inner:$lang['btn_subscribe']).$suf,
+                     'class="action subscribe" rel="nofollow"',1);
+          }
+        }
+      }
+      if($type == 'subscribe') break;
+      // else: fall through for backward compatibility
+    case 'subscribens':
+      if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+        if($_SERVER['REMOTE_USER']){
+          if($INFO['subscribedns']) {
+            if(actionOK('unsubscribens'))
+              $out .= tpl_link(wl($ID,'do=unsubscribens'),
+                     $pre.(($inner)?$inner:$lang['btn_unsubscribens']).$suf,
+                     'class="action unsubscribens" rel="nofollow"',1);
+          } else {
+            if(actionOK('subscribens'))
+              $out .= tpl_link(wl($ID,'do=subscribens'),
+                     $pre.(($inner)?$inner:$lang['btn_subscribens']).$suf,
+                     'class="action subscribens" rel="nofollow"',1);
+          }
+        }
+      }
+      break;
+    case 'backlink':
+      if(actionOK('backlink'))
+        $out .= tpl_link(wl($ID,'do=backlink'),
+               $pre.(($inner)?$inner:$lang['btn_backlink']).$suf,
+               'class="action backlink" rel="nofollow"',1);
+      break;
+    case 'profile':
+      if($conf['useacl'] && $auth && $_SERVER['REMOTE_USER'] &&
+         $auth->canDo('Profile') && ($ACT!='profile')){
+        $out .= tpl_link(wl($ID,'do=profile'),
+                 $pre.(($inner)?$inner:$lang['btn_profile']).$suf,
+                 'class="action profile" rel="nofollow"',1);
+      }
+      break;
+    default:
+      $out .= '[unknown link type]';
+      break;
+  }
+  if ($return) return $out;
+  print $out;
+  return $out ? true : false;
+}
+
+/**
+ * Wrapper around tpl_button() and tpl_actionlink()
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+function tpl_action($type,$link=0,$wrapper=false,$return=false,$pre='',$suf='',$inner='') {
+    $out = '';
+    if ($link) $out .= tpl_actionlink($type,$pre,$suf,$inner,1);
+    else $out .= tpl_button($type,1);
+    if ($out && $wrapper) $out = "<$wrapper>$out</$wrapper>";
+
+    if ($return) return $out;
+    print $out;
+    return $out ? true : false;
+}
+
+/**
+ * Print the search form
+ *
+ * If the first parameter is given a div with the ID 'qsearch_out' will
+ * be added which instructs the ajax pagequicksearch to kick in and place
+ * its output into this div. The second parameter controls the propritary
+ * attribute autocomplete. If set to false this attribute will be set with an
+ * value of "off" to instruct the browser to disable it's own built in
+ * autocompletion feature (MSIE and Firefox)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_searchform($ajax=true,$autocomplete=true){
+  global $lang;
+  global $ACT;
+  global $QUERY;
+
+  // don't print the search form if search action has been disabled
+  if (!actionOk('search')) return false;
+
+  print '<form action="'.wl().'" accept-charset="utf-8" class="search" id="dw__search"><div class="no">';
+  print '<input type="hidden" name="do" value="search" />';
+  print '<input type="text" ';
+  if($ACT == 'search') print 'value="'.htmlspecialchars($QUERY).'" ';
+  if(!$autocomplete) print 'autocomplete="off" ';
+  print 'id="qsearch__in" accesskey="f" name="id" class="edit" title="[F]" />';
+  print '<input type="submit" value="'.$lang['btn_search'].'" class="button" title="'.$lang['btn_search'].'" />';
+  if($ajax) print '<div id="qsearch__out" class="ajax_qsearch JSpopup"></div>';
+  print '</div></form>';
+  return true;
+}
+
+/**
+ * Print the breadcrumbs trace
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_breadcrumbs($sep='&raquo;'){
+  global $lang;
+  global $conf;
+
+  //check if enabled
+  if(!$conf['breadcrumbs']) return false;
+
+  $crumbs = breadcrumbs(); //setup crumb trace
+
+  //reverse crumborder in right-to-left mode, add RLM character to fix heb/eng display mixups
+  if($lang['direction'] == 'rtl') {
+    $crumbs = array_reverse($crumbs,true);
+    $crumbs_sep = ' &#8207;<span class="bcsep">'.$sep.'</span>&#8207; ';
+  } else {
+    $crumbs_sep = ' <span class="bcsep">'.$sep.'</span> ';
+  }
+
+  //render crumbs, highlight the last one
+  print '<span class="bchead">'.$lang['breadcrumb'].':</span>';
+  $last = count($crumbs);
+  $i = 0;
+  foreach ($crumbs as $id => $name){
+    $i++;
+    echo $crumbs_sep;
+    if ($i == $last) print '<span class="curid">';
+    tpl_link(wl($id),hsc($name),'class="breadcrumbs" title="'.$id.'"');
+    if ($i == $last) print '</span>';
+  }
+  return true;
+}
+
+/**
+ * Hierarchical breadcrumbs
+ *
+ * This code was suggested as replacement for the usual breadcrumbs.
+ * It only makes sense with a deep site structure.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Nigel McNie <oracle.shinoda@gmail.com>
+ * @author Sean Coates <sean@caedmon.net>
+ * @author <fredrik@averpil.com>
+ * @todo   May behave strangely in RTL languages
+ */
+function tpl_youarehere($sep=' &raquo; '){
+  global $conf;
+  global $ID;
+  global $lang;
+
+  // check if enabled
+  if(!$conf['youarehere']) return false;
+
+  $parts = explode(':', $ID);
+  $count = count($parts);
+
+  if($GLOBALS['ACT'] == 'search')
+  {
+    $parts = array($conf['start']);
+    $count = 1;
+  }
+
+  echo '<span class="bchead">'.$lang['youarehere'].': </span>';
+
+  // always print the startpage
+  $title = useHeading('navigation') ? p_get_first_heading($conf['start']) : $conf['start'];
+  if(!$title) $title = $conf['start'];
+  tpl_link(wl($conf['start']),hsc($title),'title="'.$conf['start'].'"');
+
+  // print intermediate namespace links
+  $part = '';
+  for($i=0; $i<$count - 1; $i++){
+    $part .= $parts[$i].':';
+    $page = $part;
+    resolve_pageid('',$page,$exists);
+    if ($page == $conf['start']) continue; // Skip startpage
+
+    // output
+    echo $sep;
+    if($exists){
+      $title = useHeading('navigation') ? p_get_first_heading($page) : $parts[$i];
+      tpl_link(wl($page),hsc($title),'title="'.$page.'"');
+    }else{
+      tpl_link(wl($page),$parts[$i],'title="'.$page.'" class="wikilink2" rel="nofollow"');
+    }
+  }
+
+  // print current page, skipping start page, skipping for namespace index
+  if(isset($page) && $page==$part.$parts[$i]) return;
+  $page = $part.$parts[$i];
+  if($page == $conf['start']) return;
+  echo $sep;
+  if(page_exists($page)){
+    $title = useHeading('navigation') ? p_get_first_heading($page) : $parts[$i];
+    tpl_link(wl($page),hsc($title),'title="'.$page.'"');
+  }else{
+    tpl_link(wl($page),$parts[$i],'title="'.$page.'" class="wikilink2" rel="nofollow"');
+  }
+  return true;
+}
+
+/**
+ * Print info if the user is logged in
+ * and show full name in that case
+ *
+ * Could be enhanced with a profile link in future?
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_userinfo(){
+  global $lang;
+  global $INFO;
+  if(isset($_SERVER['REMOTE_USER'])){
+    print $lang['loggedinas'].': '.$INFO['userinfo']['name'].' ('.$_SERVER['REMOTE_USER'].')';
+    return true;
+  }
+  return false;
+}
+
+/**
+ * Print some info about the current page
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_pageinfo($ret=false){
+  global $conf;
+  global $lang;
+  global $INFO;
+  global $ID;
+
+  // return if we are not allowed to view the page
+  if (!auth_quickaclcheck($ID)) { return false; }
+
+  // prepare date and path
+  $fn = $INFO['filepath'];
+  if(!$conf['fullpath']){
+    if($INFO['rev']){
+      $fn = str_replace(fullpath($conf['olddir']).'/','',$fn);
+    }else{
+      $fn = str_replace(fullpath($conf['datadir']).'/','',$fn);
+    }
+  }
+  $fn = utf8_decodeFN($fn);
+  $date = dformat($INFO['lastmod']);
+
+  // print it
+  if($INFO['exists']){
+    $out = '';
+    $out .= $fn;
+    $out .= ' &middot; ';
+    $out .= $lang['lastmod'];
+    $out .= ': ';
+    $out .= $date;
+    if($INFO['editor']){
+      $out .= ' '.$lang['by'].' ';
+      $out .= editorinfo($INFO['editor']);
+    }else{
+      $out .= ' ('.$lang['external_edit'].')';
+    }
+    if($INFO['locked']){
+      $out .= ' &middot; ';
+      $out .= $lang['lockedby'];
+      $out .= ': ';
+      $out .= editorinfo($INFO['locked']);
+    }
+    if($ret){
+        return $out;
+    }else{
+        echo $out;
+        return true;
+    }
+  }
+  return false;
+}
+
+/**
+ * Prints or returns the name of the given page (current one if none given).
+ *
+ * If useheading is enabled this will use the first headline else
+ * the given ID is used.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_pagetitle($id=null, $ret=false){
+  global $conf;
+  if(is_null($id)){
+    global $ID;
+    $id = $ID;
+  }
+
+  $name = $id;
+  if (useHeading('navigation')) {
+    $title = p_get_first_heading($id);
+    if ($title) $name = $title;
+  }
+
+  if ($ret) {
+      return hsc($name);
+  } else {
+      print hsc($name);
+      return true;
+  }
+}
+
+/**
+ * Returns the requested EXIF/IPTC tag from the current image
+ *
+ * If $tags is an array all given tags are tried until a
+ * value is found. If no value is found $alt is returned.
+ *
+ * Which texts are known is defined in the functions _exifTagNames
+ * and _iptcTagNames() in inc/jpeg.php (You need to prepend IPTC
+ * to the names of the latter one)
+ *
+ * Only allowed in: detail.php
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_img_getTag($tags,$alt='',$src=null){
+  // Init Exif Reader
+  global $SRC;
+
+  if(is_null($src)) $src = $SRC;
+
+  static $meta = null;
+  if(is_null($meta)) $meta = new JpegMeta($src);
+  if($meta === false) return $alt;
+  $info = $meta->getField($tags);
+  if($info == false) return $alt;
+  return $info;
+}
+
+/**
+ * Prints the image with a link to the full sized version
+ *
+ * Only allowed in: detail.php
+ */
+function tpl_img($maxwidth=0,$maxheight=0){
+  global $IMG;
+  $w = tpl_img_getTag('File.Width');
+  $h = tpl_img_getTag('File.Height');
+
+  //resize to given max values
+  $ratio = 1;
+  if($w >= $h){
+    if($maxwidth && $w >= $maxwidth){
+      $ratio = $maxwidth/$w;
+    }elseif($maxheight && $h > $maxheight){
+      $ratio = $maxheight/$h;
+    }
+  }else{
+    if($maxheight && $h >= $maxheight){
+      $ratio = $maxheight/$h;
+    }elseif($maxwidth && $w > $maxwidth){
+      $ratio = $maxwidth/$w;
+    }
+  }
+  if($ratio){
+    $w = floor($ratio*$w);
+    $h = floor($ratio*$h);
+  }
+
+  //prepare URLs
+  $url=ml($IMG,array('cache'=>$_REQUEST['cache']));
+  $src=ml($IMG,array('cache'=>$_REQUEST['cache'],'w'=>$w,'h'=>$h));
+
+  //prepare attributes
+  $alt=tpl_img_getTag('Simple.Title');
+  $p = array();
+  if($w) $p['width']  = $w;
+  if($h) $p['height'] = $h;
+         $p['class']  = 'img_detail';
+  if($alt){
+    $p['alt']   = $alt;
+    $p['title'] = $alt;
+  }else{
+    $p['alt'] = '';
+  }
+  $p = buildAttributes($p);
+
+  print '<a href="'.$url.'">';
+  print '<img src="'.$src.'" '.$p.'/>';
+  print '</a>';
+  return true;
+}
+
+/**
+ * This function inserts a 1x1 pixel gif which in reality
+ * is the indexer function.
+ *
+ * Should be called somewhere at the very end of the main.php
+ * template
+ */
+function tpl_indexerWebBug(){
+  global $ID;
+  global $INFO;
+  if(!$INFO['exists']) return false;
+
+  if(isHiddenPage($ID)) return false; //no need to index hidden pages
+
+  $p = array();
+  $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).
+                 '&'.time();
+  $p['width']  = 1;
+  $p['height'] = 1;
+  $p['alt']    = '';
+  $att = buildAttributes($p);
+  print "<img $att />";
+  return true;
+}
+
+// configuration methods
+/**
+ * tpl_getConf($id)
+ *
+ * use this function to access template configuration variables
+ */
+function tpl_getConf($id){
+  global $conf;
+  global $tpl_configloaded;
+
+  $tpl = $conf['template'];
+
+  if (!$tpl_configloaded){
+    $tconf = tpl_loadConfig();
+    if ($tconf !== false){
+      foreach ($tconf as $key => $value){
+        if (isset($conf['tpl'][$tpl][$key])) continue;
+        $conf['tpl'][$tpl][$key] = $value;
+      }
+      $tpl_configloaded = true;
+    }
+  }
+
+  return $conf['tpl'][$tpl][$id];
+}
+
+/**
+ * tpl_loadConfig()
+ * reads all template configuration variables
+ * this function is automatically called by tpl_getConf()
+ */
+function tpl_loadConfig(){
+
+  $file = DOKU_TPLINC.'/conf/default.php';
+  $conf = array();
+
+  if (!@file_exists($file)) return false;
+
+  // load default config file
+  include($file);
+
+  return $conf;
+}
+
+/**
+ * prints the "main content" in the mediamanger popup
+ *
+ * Depending on the user's actions this may be a list of
+ * files in a namespace, the meta editing dialog or
+ * a message of referencing pages
+ *
+ * Only allowed in mediamanager.php
+ *
+ * @triggers MEDIAMANAGER_CONTENT_OUTPUT
+ * @param bool $fromajax - set true when calling this function via ajax
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_mediaContent($fromajax=false){
+  global $IMG;
+  global $AUTH;
+  global $INUSE;
+  global $NS;
+  global $JUMPTO;
+
+  if(is_array($_REQUEST['do'])){
+    $do = array_shift(array_keys($_REQUEST['do']));
+  }else{
+    $do = $_REQUEST['do'];
+  }
+  if(in_array($do,array('save','cancel'))) $do = '';
+
+  if(!$do){
+      if($_REQUEST['edit']){
+        $do = 'metaform';
+      }elseif(is_array($INUSE)){
+        $do = 'filesinuse';
+      }else{
+        $do = 'filelist';
+      }
+  }
+
+  // output the content pane, wrapped in an event.
+  if(!$fromajax) ptln('<div id="media__content">');
+  $data = array( 'do' => $do);
+  $evt = new Doku_Event('MEDIAMANAGER_CONTENT_OUTPUT', $data);
+  if ($evt->advise_before()) {
+    $do = $data['do'];
+    if($do == 'metaform'){
+      media_metaform($IMG,$AUTH);
+    }elseif($do == 'filesinuse'){
+      media_filesinuse($INUSE,$IMG);
+    }elseif($do == 'filelist'){
+      media_filelist($NS,$AUTH,$JUMPTO);
+    }elseif($do == 'searchlist'){
+      media_searchlist($_REQUEST['q'],$NS,$AUTH);
+    }else{
+      msg('Unknown action '.hsc($do),-1);
+    }
+  }
+  $evt->advise_after();
+  unset($evt);
+  if(!$fromajax) ptln('</div>');
+
+}
+
+/**
+ * prints the namespace tree in the mediamanger popup
+ *
+ * Only allowed in mediamanager.php
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_mediaTree(){
+  global $NS;
+
+  ptln('<div id="media__tree">');
+  media_nstree($NS);
+  ptln('</div>');
+}
+
+
+/**
+ * Print a dropdown menu with all DokuWiki actions
+ *
+ * Note: this will not use any pretty URLs
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_actiondropdown($empty='',$button='&gt;'){
+    global $ID;
+    global $INFO;
+    global $REV;
+    global $ACT;
+    global $conf;
+    global $lang;
+    global $auth;
+
+
+    echo '<form method="post" accept-charset="utf-8">'; #FIXME action
+    echo '<input type="hidden" name="id" value="'.$ID.'" />';
+    if($REV) echo '<input type="hidden" name="rev" value="'.$REV.'" />';
+    echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />';
+
+    echo '<select name="do" id="action__selector" class="edit">';
+    echo '<option value="">'.$empty.'</option>';
+
+    echo '<optgroup label=" &mdash; ">';
+        // 'edit' - most complicated type, we need to decide on current action
+        if($ACT == 'show' || $ACT == 'search'){
+            if($INFO['writable']){
+                if(!empty($INFO['draft'])) {
+                    echo '<option value="edit">'.$lang['btn_draft'].'</option>';
+                } else {
+                    if($INFO['exists']){
+                        echo '<option value="edit">'.$lang['btn_edit'].'</option>';
+                    }else{
+                        echo '<option value="edit">'.$lang['btn_create'].'</option>';
+                    }
+                }
+            }else if(actionOK('source')) { //pseudo action
+                echo '<option value="edit">'.$lang['btn_source'].'</option>';
+            }
+        }else{
+            echo '<option value="show">'.$lang['btn_show'].'</option>';
+        }
+
+        echo '<option value="revisions">'.$lang['btn_revs'].'</option>';
+        if($INFO['ismanager'] && $REV && $INFO['writable'] && actionOK('revert')){
+            echo '<option value="revert">'.$lang['btn_revert'].'</option>';
+        }
+        echo '<option value="backlink">'.$lang['btn_backlink'].'</option>';
+    echo '</optgroup>';
+
+    echo '<optgroup label=" &mdash; ">';
+        echo '<option value="recent">'.$lang['btn_recent'].'</option>';
+        echo '<option value="index">'.$lang['btn_index'].'</option>';
+    echo '</optgroup>';
+
+    echo '<optgroup label=" &mdash; ">';
+        if($conf['useacl'] && $auth){
+            if($_SERVER['REMOTE_USER']){
+                echo '<option value="logout">'.$lang['btn_logout'].'</option>';
+            }else{
+                echo '<option value="login">'.$lang['btn_login'].'</option>';
+            }
+        }
+
+        if($conf['useacl'] && $auth && $_SERVER['REMOTE_USER'] &&
+             $auth->canDo('Profile') && ($ACT!='profile')){
+            echo '<option value="profile">'.$lang['btn_profile'].'</option>';
+        }
+
+        if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+            if($_SERVER['REMOTE_USER']){
+                if($INFO['subscribed']) {
+                    echo '<option value="unsubscribe">'.$lang['btn_unsubscribe'].'</option>';
+                } else {
+                    echo '<option value="subscribe">'.$lang['btn_subscribe'].'</option>';
+                }
+            }
+        }
+
+        if($conf['useacl'] && $auth && $ACT == 'show' && $conf['subscribers'] == 1){
+            if($_SERVER['REMOTE_USER']){
+                if($INFO['subscribedns']) {
+                    echo '<option value="unsubscribens">'.$lang['btn_unsubscribens'].'</option>';
+                } else {
+                    echo '<option value="subscribens">'.$lang['btn_subscribens'].'</option>';
+                }
+            }
+        }
+
+        if($INFO['ismanager']){
+            echo '<option value="admin">'.$lang['btn_admin'].'</option>';
+        }
+    echo '</optgroup>';
+
+    echo '</select>';
+    echo '<input type="submit" value="'.$button.'" id="action__selectorbtn" />';
+    echo '</form>';
+}
+
+/**
+ * Print a informational line about the used license
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @param  string $img    - print image? (|button|badge)
+ * @param  bool   $return - when true don't print, but return HTML
+ */
+function tpl_license($img='badge',$imgonly=false,$return=false){
+    global $license;
+    global $conf;
+    global $lang;
+    if(!$conf['license']) return '';
+    if(!is_array($license[$conf['license']])) return '';
+    $lic = $license[$conf['license']];
+
+    $out  = '<div class="license">';
+    if($img){
+        $src = license_img($img);
+        if($src){
+            $out .= '<a href="'.$lic['url'].'" rel="license"';
+            if($conf['target']['external']) $out .= ' target="'.$conf['target']['external'].'"';
+            $out .= '><img src="'.DOKU_BASE.$src.'" class="medialeft lic'.$img.'" alt="'.$lic['name'].'" /></a> ';
+        }
+    }
+    if(!$imgonly) {
+        $out .= $lang['license'];
+        $out .= '<a href="'.$lic['url'].'" rel="license" class="urlextern"';
+        if(isset($conf['target']['external'])) $out .= ' target="'.$conf['target']['external'].'"';
+        $out .= '>'.$lic['name'].'</a>';
+    }
+    $out .= '</div>';
+
+    if($return) return $out;
+    echo $out;
+}
+
+
+/**
+ * Includes the rendered XHTML of a given page
+ *
+ * This function is useful to populate sidebars or similar features in a
+ * template
+ */
+function tpl_include_page($pageid,$print=true){
+    global $ID;
+    $oldid = $ID;
+    $html = p_wiki_xhtml($pageid,'',false);
+    $ID = $oldid;
+
+    if(!$print) return $html;
+    echo $html;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/toolbar.php b/mod/dokuwiki/vendors/dokuwiki/inc/toolbar.php
new file mode 100644
index 000000000..9140970d1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/toolbar.php
@@ -0,0 +1,241 @@
+<?php
+/**
+ * Editing toolbar functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+require_once(DOKU_INC.'inc/JSON.php');
+
+
+/**
+ * Prepares and prints an JavaScript array with all toolbar buttons
+ *
+ * @emits  TOOLBAR_DEFINE
+ * @param  string $varname Name of the JS variable to fill
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function toolbar_JSdefines($varname){
+    global $ID;
+    global $conf;
+    global $lang;
+
+    $menu = array();
+
+    $evt = new Doku_Event('TOOLBAR_DEFINE', $menu);
+    if ($evt->advise_before()){
+
+        // build button array
+        $menu = array_merge($menu, array(
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_bold'],
+                'icon'   => 'bold.png',
+                'key'    => 'b',
+                'open'   => '**',
+                'close'  => '**',
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_italic'],
+                'icon'   => 'italic.png',
+                'key'    => 'i',
+                'open'   => '//',
+                'close'  => '//',
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_underl'],
+                'icon'   => 'underline.png',
+                'key'    => 'u',
+                'open'   => '__',
+                'close'  => '__',
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_code'],
+                'icon'   => 'mono.png',
+                'key'    => 'c',
+                'open'   => "''",
+                'close'  => "''",
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_strike'],
+                'icon'   => 'strike.png',
+                'key'    => 'd',
+                'open'  => '<del>',
+                'close'   => '</del>',
+                ),
+
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hequal'],
+                'icon'   => 'hequal.png',
+                'key'    => '8',
+                'text'   => $lang['qb_h'],
+                'mod'    => 0
+               ),
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hminus'],
+                'icon'   => 'hminus.png',
+                'key'    => '9',
+                'text'   => $lang['qb_h'],
+                'mod'    => 1
+               ),
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hplus'],
+                'icon'   => 'hplus.png',
+                'key'    => '0',
+                'text'   => $lang['qb_h'],
+                'mod'    => -1
+               ),
+
+           array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_hs'],
+                'icon'   => 'h.png',
+                'class'  => 'pk_hl',
+                'list'   => array(
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h1'],
+                                    'icon'   => 'h1.png',
+                                    'key'    => '1',
+                                    'open'   => '====== ',
+                                    'close'  => ' ======\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h2'],
+                                    'icon'   => 'h2.png',
+                                    'key'    => '2',
+                                    'open'   => '===== ',
+                                    'close'  => ' =====\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h3'],
+                                    'icon'   => 'h3.png',
+                                    'key'    => '3',
+                                    'open'   => '==== ',
+                                    'close'  => ' ====\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h4'],
+                                    'icon'   => 'h4.png',
+                                    'key'    => '4',
+                                    'open'   => '=== ',
+                                    'close'  => ' ===\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h5'],
+                                    'icon'   => 'h5.png',
+                                    'key'    => '5',
+                                    'open'   => '== ',
+                                    'close'  => ' ==\n',
+                                    ),
+                            )
+                ),
+
+           array(
+                'type'   => 'linkwiz',
+                'title'  => $lang['qb_link'],
+                'icon'   => 'link.png',
+                'key'    => 'l',
+                'open'   => '[[',
+                'close'  => ']]',
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_extlink'],
+                'icon'   => 'linkextern.png',
+                'open'   => '[[',
+                'close'  => ']]',
+                'sample' => 'http://example.com|'.$lang['qb_extlink'],
+                ),
+           array(
+                'type'   => 'formatln',
+                'title'  => $lang['qb_ol'],
+                'icon'   => 'ol.png',
+                'open'   => '  - ',
+                'close'  => '',
+                'key'    => '-',
+                ),
+           array(
+                'type'   => 'formatln',
+                'title'  => $lang['qb_ul'],
+                'icon'   => 'ul.png',
+                'open'   => '  * ',
+                'close'  => '',
+                'key'    => '.',
+                ),
+           array(
+                'type'   => 'insert',
+                'title'  => $lang['qb_hr'],
+                'icon'   => 'hr.png',
+                'insert' => '\n----\n',
+                ),
+           array(
+                'type'   => 'mediapopup',
+                'title'  => $lang['qb_media'],
+                'icon'   => 'image.png',
+                'url'    => 'lib/exe/mediamanager.php?ns=',
+                'name'   => 'mediaselect',
+                'options'=> 'width=750,height=500,left=20,top=20,scrollbars=yes,resizable=yes',
+                ),
+          array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_smileys'],
+                'icon'   => 'smiley.png',
+                'list'   => getSmileys(),
+                'icobase'=> 'smileys',
+               ),
+          array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_chars'],
+                'icon'   => 'chars.png',
+                'list'   => explode(' ','À à Á á Â â Ã ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ × „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″ [ ] { } ~ ( ) % § $ # | @'),
+               ),
+          array(
+                'type'   => 'signature',
+                'title'  => $lang['qb_sig'],
+                'icon'   => 'sig.png',
+                'key'    => 'y',
+               ),
+        ));
+    } // end event TOOLBAR_DEFINE default action
+    $evt->advise_after();
+    unset($evt);
+
+    // use JSON to build the JavaScript array
+    $json = new JSON();
+    print "var $varname = ".$json->encode($menu).";\n";
+}
+
+/**
+ * prepares the signature string as configured in the config
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function toolbar_signature(){
+    global $conf;
+    global $INFO;
+
+    $sig = $conf['signature'];
+    $sig = strftime($sig);
+    $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
+    $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
+    $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
+    $sig = str_replace('@DATE@',dformat(),$sig);
+    $sig = str_replace('\\\\n','\\n',addslashes($sig));
+    return $sig;
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/inc/utf8.php b/mod/dokuwiki/vendors/dokuwiki/inc/utf8.php
new file mode 100644
index 000000000..b078540d2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/inc/utf8.php
@@ -0,0 +1,1657 @@
+<?php
+/**
+ * UTF8 helper functions
+ *
+ * @license    LGPL (http://www.gnu.org/copyleft/lesser.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+/**
+ * check for mb_string support
+ */
+if(!defined('UTF8_MBSTRING')){
+    if(function_exists('mb_substr') && !defined('UTF8_NOMBSTRING')){
+        define('UTF8_MBSTRING',1);
+    }else{
+        define('UTF8_MBSTRING',0);
+    }
+}
+
+if(UTF8_MBSTRING){ mb_internal_encoding('UTF-8'); }
+
+if(!function_exists('utf8_encodeFN')){
+    /**
+     * URL-Encode a filename to allow unicodecharacters
+     *
+     * Slashes are not encoded
+     *
+     * When the second parameter is true the string will
+     * be encoded only if non ASCII characters are detected -
+     * This makes it safe to run it multiple times on the
+     * same string (default is true)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    urlencode
+     */
+    function utf8_encodeFN($file,$safe=true){
+        if($safe && preg_match('#^[a-zA-Z0-9/_\-.%]+$#',$file)){
+            return $file;
+        }
+        $file = urlencode($file);
+        $file = str_replace('%2F','/',$file);
+        return $file;
+    }
+}
+
+if(!function_exists('utf8_decodeFN')){
+    /**
+     * URL-Decode a filename
+     *
+     * This is just a wrapper around urldecode
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    urldecode
+     */
+    function utf8_decodeFN($file){
+        $file = urldecode($file);
+        return $file;
+    }
+}
+
+if(!function_exists('utf8_isASCII')){
+    /**
+     * Checks if a string contains 7bit ASCII only
+     *
+     * @author Andreas Haerter <netzmeister@andreas-haerter.de>
+     */
+    function utf8_isASCII($str){
+        return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1);
+    }
+}
+
+if(!function_exists('utf8_strip')){
+    /**
+     * Strips all highbyte chars
+     *
+     * Returns a pure ASCII7 string
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function utf8_strip($str){
+        $ascii = '';
+        $len = strlen($str);
+        for($i=0; $i<$len; $i++){
+            if(ord($str{$i}) <128){
+                $ascii .= $str{$i};
+            }
+        }
+        return $ascii;
+    }
+}
+
+if(!function_exists('utf8_check')){
+    /**
+     * Tries to detect if a string is in Unicode encoding
+     *
+     * @author <bmorel@ssi.fr>
+     * @link   http://www.php.net/manual/en/function.utf8-encode.php
+     */
+    function utf8_check($Str) {
+        $len = strlen($Str);
+        for ($i=0; $i<$len; $i++) {
+            $b = ord($Str[$i]);
+            if ($b < 0x80) continue; # 0bbbbbbb
+            elseif (($b & 0xE0) == 0xC0) $n=1; # 110bbbbb
+            elseif (($b & 0xF0) == 0xE0) $n=2; # 1110bbbb
+            elseif (($b & 0xF8) == 0xF0) $n=3; # 11110bbb
+            elseif (($b & 0xFC) == 0xF8) $n=4; # 111110bb
+            elseif (($b & 0xFE) == 0xFC) $n=5; # 1111110b
+            else return false; # Does not match any model
+
+            for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+                if ((++$i == $len) || ((ord($Str[$i]) & 0xC0) != 0x80))
+                    return false;
+            }
+        }
+        return true;
+    }
+}
+
+if(!function_exists('utf8_strlen')){
+    /**
+     * Unicode aware replacement for strlen()
+     *
+     * utf8_decode() converts characters that are not in ISO-8859-1
+     * to '?', which, for the purpose of counting, is alright - It's
+     * even faster than mb_strlen.
+     *
+     * @author <chernyshevsky at hotmail dot com>
+     * @see    strlen()
+     * @see    utf8_decode()
+     */
+    function utf8_strlen($string){
+        return strlen(utf8_decode($string));
+    }
+}
+
+if(!function_exists('utf8_substr')){
+    /**
+     * UTF-8 aware alternative to substr
+     *
+     * Return part of a string given character offset (and optionally length)
+     *
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     * @author Chris Smith <chris@jalakai.co.uk>
+     * @param string
+     * @param integer number of UTF-8 characters offset (from left)
+     * @param integer (optional) length in UTF-8 characters from offset
+     * @return mixed string or false if failure
+     */
+    function utf8_substr($str, $offset, $length = null) {
+        if(UTF8_MBSTRING){
+            if( $length === null ){
+                return mb_substr($str, $offset);
+            }else{
+                return mb_substr($str, $offset, $length);
+            }
+        }
+
+        /*
+         * Notes:
+         *
+         * no mb string support, so we'll use pcre regex's with 'u' flag
+         * pcre only supports repetitions of less than 65536, in order to accept up to MAXINT values for
+         * offset and length, we'll repeat a group of 65535 characters when needed (ok, up to MAXINT-65536)
+         *
+         * substr documentation states false can be returned in some cases (e.g. offset > string length)
+         * mb_substr never returns false, it will return an empty string instead.
+         *
+         * calculating the number of characters in the string is a relatively expensive operation, so
+         * we only carry it out when necessary. It isn't necessary for +ve offsets and no specified length
+         */
+
+        // cast parameters to appropriate types to avoid multiple notices/warnings
+        $str = (string)$str;                          // generates E_NOTICE for PHP4 objects, but not PHP5 objects
+        $offset = (int)$offset;
+        if (!is_null($length)) $length = (int)$length;
+
+        // handle trivial cases
+        if ($length === 0) return '';
+        if ($offset < 0 && $length < 0 && $length < $offset) return '';
+
+        $offset_pattern = '';
+        $length_pattern = '';
+
+        // normalise -ve offsets (we could use a tail anchored pattern, but they are horribly slow!)
+        if ($offset < 0) {
+            $strlen = strlen(utf8_decode($str));        // see notes
+            $offset = $strlen + $offset;
+            if ($offset < 0) $offset = 0;
+        }
+
+        // establish a pattern for offset, a non-captured group equal in length to offset
+        if ($offset > 0) {
+            $Ox = (int)($offset/65535);
+            $Oy = $offset%65535;
+
+            if ($Ox) $offset_pattern = '(?:.{65535}){'.$Ox.'}';
+            $offset_pattern = '^(?:'.$offset_pattern.'.{'.$Oy.'})';
+        } else {
+            $offset_pattern = '^';                      // offset == 0; just anchor the pattern
+        }
+
+        // establish a pattern for length
+        if (is_null($length)) {
+            $length_pattern = '(.*)$';                  // the rest of the string
+        } else {
+
+            if (!isset($strlen)) $strlen = strlen(utf8_decode($str));    // see notes
+            if ($offset > $strlen) return '';           // another trivial case
+
+            if ($length > 0) {
+
+                $length = min($strlen-$offset, $length);  // reduce any length that would go passed the end of the string
+
+                $Lx = (int)($length/65535);
+                $Ly = $length%65535;
+
+                // +ve length requires ... a captured group of length characters
+                if ($Lx) $length_pattern = '(?:.{65535}){'.$Lx.'}';
+                    $length_pattern = '('.$length_pattern.'.{'.$Ly.'})';
+
+            } else if ($length < 0) {
+
+                if ($length < ($offset - $strlen)) return '';
+
+                $Lx = (int)((-$length)/65535);
+                $Ly = (-$length)%65535;
+
+                // -ve length requires ... capture everything except a group of -length characters
+                //                         anchored at the tail-end of the string
+                if ($Lx) $length_pattern = '(?:.{65535}){'.$Lx.'}';
+                $length_pattern = '(.*)(?:'.$length_pattern.'.{'.$Ly.'})$';
+            }
+        }
+
+        if (!preg_match('#'.$offset_pattern.$length_pattern.'#us',$str,$match)) return '';
+        return $match[1];
+    }
+}
+
+if(!function_exists('utf8_substr_replace')){
+    /**
+     * Unicode aware replacement for substr_replace()
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    substr_replace()
+     */
+    function utf8_substr_replace($string, $replacement, $start , $length=0 ){
+        $ret = '';
+        if($start>0) $ret .= utf8_substr($string, 0, $start);
+        $ret .= $replacement;
+        $ret .= utf8_substr($string, $start+$length);
+        return $ret;
+    }
+}
+
+if(!function_exists('utf8_ltrim')){
+    /**
+     * Unicode aware replacement for ltrim()
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    ltrim()
+     * @return string
+     */
+    function utf8_ltrim($str,$charlist=''){
+        if($charlist == '') return ltrim($str);
+
+        //quote charlist for use in a characterclass
+        $charlist = preg_replace('!([\\\\\\-\\]\\[/])!','\\\${1}',$charlist);
+
+        return preg_replace('/^['.$charlist.']+/u','',$str);
+    }
+}
+
+if(!function_exists('utf8_rtrim')){
+    /**
+     * Unicode aware replacement for rtrim()
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    rtrim()
+     * @return string
+     */
+    function  utf8_rtrim($str,$charlist=''){
+        if($charlist == '') return rtrim($str);
+
+        //quote charlist for use in a characterclass
+        $charlist = preg_replace('!([\\\\\\-\\]\\[/])!','\\\${1}',$charlist);
+
+        return preg_replace('/['.$charlist.']+$/u','',$str);
+    }
+}
+
+if(!function_exists('utf8_trim')){
+    /**
+     * Unicode aware replacement for trim()
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @see    trim()
+     * @return string
+     */
+    function  utf8_trim($str,$charlist='') {
+        if($charlist == '') return trim($str);
+
+        return utf8_ltrim(utf8_rtrim($str,$charlist),$charlist);
+    }
+}
+
+if(!function_exists('utf8_strtolower')){
+    /**
+     * This is a unicode aware replacement for strtolower()
+     *
+     * Uses mb_string extension if available
+     *
+     * @author Leo Feyer <leo@typolight.org>
+     * @see    strtolower()
+     * @see    utf8_strtoupper()
+     */
+    function utf8_strtolower($string){
+        if(UTF8_MBSTRING) return mb_strtolower($string,'utf-8');
+
+        global $UTF8_UPPER_TO_LOWER;
+        return strtr($string,$UTF8_UPPER_TO_LOWER);
+    }
+}
+
+if(!function_exists('utf8_strtoupper')){
+    /**
+     * This is a unicode aware replacement for strtoupper()
+     *
+     * Uses mb_string extension if available
+     *
+     * @author Leo Feyer <leo@typolight.org>
+     * @see    strtoupper()
+     * @see    utf8_strtoupper()
+     */
+    function utf8_strtoupper($string){
+        if(UTF8_MBSTRING) return mb_strtoupper($string,'utf-8');
+
+        global $UTF8_LOWER_TO_UPPER;
+        return strtr($string,$UTF8_LOWER_TO_UPPER);
+    }
+}
+
+if(!function_exists('utf8_ucfirst')){
+    /**
+     * UTF-8 aware alternative to ucfirst
+     * Make a string's first character uppercase
+     *
+     * @author Harry Fuecks
+     * @param string
+     * @return string with first character as upper case (if applicable)
+     */
+    function utf8_ucfirst($str){
+        switch ( utf8_strlen($str) ) {
+            case 0:
+                return '';
+            case 1:
+                return utf8_strtoupper($str);
+            default:
+                preg_match('/^(.{1})(.*)$/us', $str, $matches);
+                return utf8_strtoupper($matches[1]).$matches[2];
+        }
+    }
+}
+
+if(!function_exists('utf8_ucwords')){
+    /**
+     * UTF-8 aware alternative to ucwords
+     * Uppercase the first character of each word in a string
+     *
+     * @author Harry Fuecks
+     * @param string
+     * @return string with first char of each word uppercase
+     * @see http://www.php.net/ucwords
+     */
+    function utf8_ucwords($str) {
+        // Note: [\x0c\x09\x0b\x0a\x0d\x20] matches;
+        // form feeds, horizontal tabs, vertical tabs, linefeeds and carriage returns
+        // This corresponds to the definition of a "word" defined at http://www.php.net/ucwords
+        $pattern = '/(^|([\x0c\x09\x0b\x0a\x0d\x20]+))([^\x0c\x09\x0b\x0a\x0d\x20]{1})[^\x0c\x09\x0b\x0a\x0d\x20]*/u';
+
+        return preg_replace_callback($pattern, 'utf8_ucwords_callback',$str);
+    }
+
+    /**
+     * Callback function for preg_replace_callback call in utf8_ucwords
+     * You don't need to call this yourself
+     *
+     * @author Harry Fuecks
+     * @param array of matches corresponding to a single word
+     * @return string with first char of the word in uppercase
+     * @see utf8_ucwords
+     * @see utf8_strtoupper
+     */
+    function utf8_ucwords_callback($matches) {
+        $leadingws = $matches[2];
+        $ucfirst = utf8_strtoupper($matches[3]);
+        $ucword = utf8_substr_replace(ltrim($matches[0]),$ucfirst,0,1);
+        return $leadingws . $ucword;
+    }
+}
+
+if(!function_exists('utf8_deaccent')){
+    /**
+     * Replace accented UTF-8 characters by unaccented ASCII-7 equivalents
+     *
+     * Use the optional parameter to just deaccent lower ($case = -1) or upper ($case = 1)
+     * letters. Default is to deaccent both cases ($case = 0)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function utf8_deaccent($string,$case=0){
+        if($case <= 0){
+            global $UTF8_LOWER_ACCENTS;
+            $string = strtr($string,$UTF8_LOWER_ACCENTS);
+        }
+        if($case >= 0){
+            global $UTF8_UPPER_ACCENTS;
+            $string = strtr($string,$UTF8_UPPER_ACCENTS);
+        }
+        return $string;
+    }
+}
+
+if(!function_exists('utf8_romanize')){
+    /**
+     * Romanize a non-latin string
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function utf8_romanize($string){
+        if(utf8_isASCII($string)) return $string; //nothing to do
+
+        global $UTF8_ROMANIZATION;
+        return strtr($string,$UTF8_ROMANIZATION);
+    }
+}
+
+if(!function_exists('utf8_stripspecials')){
+    /**
+     * Removes special characters (nonalphanumeric) from a UTF-8 string
+     *
+     * This function adds the controlchars 0x00 to 0x19 to the array of
+     * stripped chars (they are not included in $UTF8_SPECIAL_CHARS)
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     * @param  string $string     The UTF8 string to strip of special chars
+     * @param  string $repl       Replace special with this string
+     * @param  string $additional Additional chars to strip (used in regexp char class)
+     */
+    function utf8_stripspecials($string,$repl='',$additional=''){
+        global $UTF8_SPECIAL_CHARS;
+        global $UTF8_SPECIAL_CHARS2;
+
+        static $specials = null;
+        if(is_null($specials)){
+            #$specials = preg_quote(unicode_to_utf8($UTF8_SPECIAL_CHARS), '/');
+            $specials = preg_quote($UTF8_SPECIAL_CHARS2, '/');
+        }
+
+        return preg_replace('/['.$additional.'\x00-\x19'.$specials.']/u',$repl,$string);
+    }
+}
+
+if(!function_exists('utf8_strpos')){
+    /**
+     * This is an Unicode aware replacement for strpos
+     *
+     * @author Leo Feyer <leo@typolight.org>
+     * @see    strpos()
+     * @param  string
+     * @param  string
+     * @param  integer
+     * @return integer
+     */
+    function utf8_strpos($haystack, $needle, $offset=0){
+        $comp = 0;
+        $length = null;
+
+        while (is_null($length) || $length < $offset) {
+            $pos = strpos($haystack, $needle, $offset + $comp);
+
+            if ($pos === false)
+                return false;
+
+            $length = utf8_strlen(substr($haystack, 0, $pos));
+
+            if ($length < $offset)
+                $comp = $pos - $length;
+        }
+
+        return $length;
+    }
+}
+
+if(!function_exists('utf8_tohtml')){
+    /**
+     * Encodes UTF-8 characters to HTML entities
+     *
+     * @author Tom N Harris <tnharris@whoopdedo.org>
+     * @author <vpribish at shopping dot com>
+     * @link   http://www.php.net/manual/en/function.utf8-decode.php
+     */
+    function utf8_tohtml ($str) {
+        $ret = '';
+        foreach (utf8_to_unicode($str) as $cp) {
+            if ($cp < 0x80)
+                $ret .= chr($cp);
+            elseif ($cp < 0x100)
+                $ret .= "&#$cp;";
+            else
+                $ret .= '&#x'.dechex($cp).';';
+        }
+        return $ret;
+    }
+}
+
+if(!function_exists('utf8_unhtml')){
+    /**
+     * Decodes HTML entities to UTF-8 characters
+     *
+     * Convert any &#..; entity to a codepoint,
+     * The entities flag defaults to only decoding numeric entities.
+     * Pass HTML_ENTITIES and named entities, including &amp; &lt; etc.
+     * are handled as well. Avoids the problem that would occur if you
+     * had to decode "&amp;#38;&#38;amp;#38;"
+     *
+     * unhtmlspecialchars(utf8_unhtml($s)) -> "&#38;&#38;"
+     * utf8_unhtml(unhtmlspecialchars($s)) -> "&&amp#38;"
+     * what it should be                   -> "&#38;&amp#38;"
+     *
+     * @author Tom N Harris <tnharris@whoopdedo.org>
+     * @param  string  $str      UTF-8 encoded string
+     * @param  boolean $entities Flag controlling decoding of named entities.
+     * @return UTF-8 encoded string with numeric (and named) entities replaced.
+     */
+    function utf8_unhtml($str, $entities=null) {
+        static $decoder = null;
+        if (is_null($decoder))
+            $decoder = new utf8_entity_decoder();
+        if (is_null($entities))
+            return preg_replace_callback('/(&#([Xx])?([0-9A-Za-z]+);)/m',
+                                         'utf8_decode_numeric', $str);
+        else
+            return preg_replace_callback('/&(#)?([Xx])?([0-9A-Za-z]+);/m',
+                                         array(&$decoder, 'decode'), $str);
+    }
+}
+
+if(!function_exists('utf8_decode_numeric')){
+    function utf8_decode_numeric($ent) {
+        switch ($ent[2]) {
+            case 'X':
+            case 'x':
+                $cp = hexdec($ent[3]);
+                break;
+            default:
+                $cp = intval($ent[3]);
+                break;
+        }
+        return unicode_to_utf8(array($cp));
+    }
+}
+
+if(!class_exists('utf8_entity_decoder')){
+    class utf8_entity_decoder {
+        var $table;
+        function utf8_entity_decoder() {
+            $table = get_html_translation_table(HTML_ENTITIES);
+            $table = array_flip($table);
+            $this->table = array_map(array(&$this,'makeutf8'), $table);
+        }
+        function makeutf8($c) {
+            return unicode_to_utf8(array(ord($c)));
+        }
+        function decode($ent) {
+            if ($ent[1] == '#') {
+                return utf8_decode_numeric($ent);
+            } elseif (array_key_exists($ent[0],$this->table)) {
+                return $this->table[$ent[0]];
+            } else {
+                return $ent[0];
+            }
+        }
+    }
+}
+
+if(!function_exists('utf8_to_unicode')){
+    /**
+     * Takes an UTF-8 string and returns an array of ints representing the
+     * Unicode characters. Astral planes are supported ie. the ints in the
+     * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+     * are not allowed.
+     *
+     * If $strict is set to true the function returns false if the input
+     * string isn't a valid UTF-8 octet sequence and raises a PHP error at
+     * level E_USER_WARNING
+     *
+     * Note: this function has been modified slightly in this library to
+     * trigger errors on encountering bad bytes
+     *
+     * @author <hsivonen@iki.fi>
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     * @param  string  UTF-8 encoded string
+     * @param  boolean Check for invalid sequences?
+     * @return mixed array of unicode code points or false if UTF-8 invalid
+     * @see    unicode_to_utf8
+     * @link   http://hsivonen.iki.fi/php-utf8/
+     * @link   http://sourceforge.net/projects/phputf8/
+     */
+    function utf8_to_unicode($str,$strict=false) {
+        $mState = 0;     // cached expected number of octets after the current octet
+                         // until the beginning of the next UTF8 character sequence
+        $mUcs4  = 0;     // cached Unicode character
+        $mBytes = 1;     // cached expected number of octets in the current sequence
+
+        $out = array();
+
+        $len = strlen($str);
+
+        for($i = 0; $i < $len; $i++) {
+
+            $in = ord($str{$i});
+
+            if ( $mState == 0) {
+
+                // When mState is zero we expect either a US-ASCII character or a
+                // multi-octet sequence.
+                if (0 == (0x80 & ($in))) {
+                    // US-ASCII, pass straight through.
+                    $out[] = $in;
+                    $mBytes = 1;
+
+                } else if (0xC0 == (0xE0 & ($in))) {
+                    // First octet of 2 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                    $mState = 1;
+                    $mBytes = 2;
+
+                } else if (0xE0 == (0xF0 & ($in))) {
+                    // First octet of 3 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                    $mState = 2;
+                    $mBytes = 3;
+
+                } else if (0xF0 == (0xF8 & ($in))) {
+                    // First octet of 4 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x07) << 18;
+                    $mState = 3;
+                    $mBytes = 4;
+
+                } else if (0xF8 == (0xFC & ($in))) {
+                    /* First octet of 5 octet sequence.
+                     *
+                     * This is illegal because the encoded codepoint must be either
+                     * (a) not the shortest form or
+                     * (b) outside the Unicode range of 0-0x10FFFF.
+                     * Rather than trying to resynchronize, we will carry on until the end
+                     * of the sequence and let the later error handling code catch it.
+                     */
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x03) << 24;
+                    $mState = 4;
+                    $mBytes = 5;
+
+                } else if (0xFC == (0xFE & ($in))) {
+                    // First octet of 6 octet sequence, see comments for 5 octet sequence.
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 1) << 30;
+                    $mState = 5;
+                    $mBytes = 6;
+
+                } elseif($strict) {
+                    /* Current octet is neither in the US-ASCII range nor a legal first
+                     * octet of a multi-octet sequence.
+                     */
+                    trigger_error(
+                            'utf8_to_unicode: Illegal sequence identifier '.
+                                'in UTF-8 at byte '.$i,
+                            E_USER_WARNING
+                        );
+                    return false;
+
+                }
+
+            } else {
+
+                // When mState is non-zero, we expect a continuation of the multi-octet
+                // sequence
+                if (0x80 == (0xC0 & ($in))) {
+
+                    // Legal continuation.
+                    $shift = ($mState - 1) * 6;
+                    $tmp = $in;
+                    $tmp = ($tmp & 0x0000003F) << $shift;
+                    $mUcs4 |= $tmp;
+
+                    /**
+                     * End of the multi-octet sequence. mUcs4 now contains the final
+                     * Unicode codepoint to be output
+                     */
+                    if (0 == --$mState) {
+
+                        /*
+                         * Check for illegal sequences and codepoints.
+                         */
+                        // From Unicode 3.1, non-shortest form is illegal
+                        if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                            ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                            ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+                            (4 < $mBytes) ||
+                            // From Unicode 3.2, surrogate characters are illegal
+                            (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+                            // Codepoints outside the Unicode range are illegal
+                            ($mUcs4 > 0x10FFFF)) {
+
+                            if($strict){
+                                trigger_error(
+                                        'utf8_to_unicode: Illegal sequence or codepoint '.
+                                            'in UTF-8 at byte '.$i,
+                                        E_USER_WARNING
+                                    );
+
+                                return false;
+                            }
+
+                        }
+
+                        if (0xFEFF != $mUcs4) {
+                            // BOM is legal but we don't want to output it
+                            $out[] = $mUcs4;
+                        }
+
+                        //initialize UTF8 cache
+                        $mState = 0;
+                        $mUcs4  = 0;
+                        $mBytes = 1;
+                    }
+
+                } elseif($strict) {
+                    /**
+                     *((0xC0 & (*in) != 0x80) && (mState != 0))
+                     * Incomplete multi-octet sequence.
+                     */
+                    trigger_error(
+                            'utf8_to_unicode: Incomplete multi-octet '.
+                            '   sequence in UTF-8 at byte '.$i,
+                            E_USER_WARNING
+                        );
+
+                    return false;
+                }
+            }
+        }
+        return $out;
+    }
+}
+
+if(!function_exists('unicode_to_utf8')){
+    /**
+     * Takes an array of ints representing the Unicode characters and returns
+     * a UTF-8 string. Astral planes are supported ie. the ints in the
+     * input can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+     * are not allowed.
+     *
+     * If $strict is set to true the function returns false if the input
+     * array contains ints that represent surrogates or are outside the
+     * Unicode range and raises a PHP error at level E_USER_WARNING
+     *
+     * Note: this function has been modified slightly in this library to use
+     * output buffering to concatenate the UTF-8 string (faster) as well as
+     * reference the array by it's keys
+     *
+     * @param  array of unicode code points representing a string
+     * @param  boolean Check for invalid sequences?
+     * @return mixed UTF-8 string or false if array contains invalid code points
+     * @author <hsivonen@iki.fi>
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     * @see    utf8_to_unicode
+     * @link   http://hsivonen.iki.fi/php-utf8/
+     * @link   http://sourceforge.net/projects/phputf8/
+     */
+    function unicode_to_utf8($arr,$strict=false) {
+        if (!is_array($arr)) return '';
+        ob_start();
+
+        foreach (array_keys($arr) as $k) {
+
+            if ( ($arr[$k] >= 0) && ($arr[$k] <= 0x007f) ) {
+                # ASCII range (including control chars)
+
+                echo chr($arr[$k]);
+
+            } else if ($arr[$k] <= 0x07ff) {
+                # 2 byte sequence
+
+                echo chr(0xc0 | ($arr[$k] >> 6));
+                echo chr(0x80 | ($arr[$k] & 0x003f));
+
+            } else if($arr[$k] == 0xFEFF) {
+                # Byte order mark (skip)
+
+                // nop -- zap the BOM
+
+            } else if ($arr[$k] >= 0xD800 && $arr[$k] <= 0xDFFF) {
+                # Test for illegal surrogates
+
+                // found a surrogate
+                if($strict){
+                    trigger_error(
+                        'unicode_to_utf8: Illegal surrogate '.
+                            'at index: '.$k.', value: '.$arr[$k],
+                        E_USER_WARNING
+                        );
+                    return false;
+                }
+
+            } else if ($arr[$k] <= 0xffff) {
+                # 3 byte sequence
+
+                echo chr(0xe0 | ($arr[$k] >> 12));
+                echo chr(0x80 | (($arr[$k] >> 6) & 0x003f));
+                echo chr(0x80 | ($arr[$k] & 0x003f));
+
+            } else if ($arr[$k] <= 0x10ffff) {
+                # 4 byte sequence
+
+                echo chr(0xf0 | ($arr[$k] >> 18));
+                echo chr(0x80 | (($arr[$k] >> 12) & 0x3f));
+                echo chr(0x80 | (($arr[$k] >> 6) & 0x3f));
+                echo chr(0x80 | ($arr[$k] & 0x3f));
+
+            } elseif($strict) {
+
+                trigger_error(
+                    'unicode_to_utf8: Codepoint out of Unicode range '.
+                        'at index: '.$k.', value: '.$arr[$k],
+                    E_USER_WARNING
+                    );
+
+                // out of range
+                return false;
+            }
+        }
+
+        $result = ob_get_contents();
+        ob_end_clean();
+        return $result;
+    }
+}
+
+if(!function_exists('utf8_to_utf16be')){
+    /**
+     * UTF-8 to UTF-16BE conversion.
+     *
+     * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     */
+    function utf8_to_utf16be(&$str, $bom = false) {
+        $out = $bom ? "\xFE\xFF" : '';
+        if(UTF8_MBSTRING) return $out.mb_convert_encoding($str,'UTF-16BE','UTF-8');
+
+        $uni = utf8_to_unicode($str);
+        foreach($uni as $cp){
+            $out .= pack('n',$cp);
+        }
+        return $out;
+    }
+}
+
+if(!function_exists('utf16be_to_utf8')){
+    /**
+     * UTF-8 to UTF-16BE conversion.
+     *
+     * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     */
+    function utf16be_to_utf8(&$str) {
+        $uni = unpack('n*',$str);
+        return unicode_to_utf8($uni);
+    }
+}
+
+if(!function_exists('utf8_bad_replace')){
+    /**
+     * Replace bad bytes with an alternative character
+     *
+     * ASCII character is recommended for replacement char
+     *
+     * PCRE Pattern to locate bad bytes in a UTF-8 string
+     * Comes from W3 FAQ: Multilingual Forms
+     * Note: modified to include full ASCII range including control chars
+     *
+     * @author Harry Fuecks <hfuecks@gmail.com>
+     * @see http://www.w3.org/International/questions/qa-forms-utf-8
+     * @param string to search
+     * @param string to replace bad bytes with (defaults to '?') - use ASCII
+     * @return string
+     */
+    function utf8_bad_replace($str, $replace = '') {
+        $UTF8_BAD =
+         '([\x00-\x7F]'.                          # ASCII (including control chars)
+         '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+         '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+         '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+         '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+         '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+         '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+         '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+         '|(.{1}))';                              # invalid byte
+        ob_start();
+        while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+            if ( !isset($matches[2])) {
+                echo $matches[0];
+            } else {
+                echo $replace;
+            }
+            $str = substr($str,strlen($matches[0]));
+        }
+        $result = ob_get_contents();
+        ob_end_clean();
+        return $result;
+    }
+}
+
+if(!function_exists('utf8_correctIdx')){
+    /**
+     * adjust a byte index into a utf8 string to a utf8 character boundary
+     *
+     * @param $str   string   utf8 character string
+     * @param $i     int      byte index into $str
+     * @param $next  bool     direction to search for boundary,
+     *                           false = up (current character)
+     *                           true = down (next character)
+     *
+     * @return int            byte index into $str now pointing to a utf8 character boundary
+     *
+     * @author       chris smith <chris@jalakai.co.uk>
+     */
+    function utf8_correctIdx(&$str,$i,$next=false) {
+
+        if ($i <= 0) return 0;
+
+        $limit = strlen($str);
+        if ($i>=$limit) return $limit;
+
+        if ($next) {
+            while (($i<$limit) && ((ord($str[$i]) & 0xC0) == 0x80)) $i++;
+        } else {
+            while ($i && ((ord($str[$i]) & 0xC0) == 0x80)) $i--;
+        }
+
+        return $i;
+    }
+}
+
+// only needed if no mb_string available
+if(!UTF8_MBSTRING){
+    /**
+     * UTF-8 Case lookup table
+     *
+     * This lookuptable defines the upper case letters to their correspponding
+     * lower case letter in UTF-8
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    global $UTF8_LOWER_TO_UPPER;
+    if(empty($UTF8_LOWER_TO_UPPER)) $UTF8_LOWER_TO_UPPER = array(
+            "ｚ"=>"Ｚ","ｙ"=>"Ｙ","ｘ"=>"Ｘ","ｗ"=>"Ｗ","ｖ"=>"Ｖ","ｕ"=>"Ｕ","ｔ"=>"Ｔ","ｓ"=>"Ｓ","ｒ"=>"Ｒ","ｑ"=>"Ｑ",
+            "ｐ"=>"Ｐ","ｏ"=>"Ｏ","ｎ"=>"Ｎ","ｍ"=>"Ｍ","ｌ"=>"Ｌ","ｋ"=>"Ｋ","ｊ"=>"Ｊ","ｉ"=>"Ｉ","ｈ"=>"Ｈ","ｇ"=>"Ｇ",
+            "ｆ"=>"Ｆ","ｅ"=>"Ｅ","ｄ"=>"Ｄ","ｃ"=>"Ｃ","ｂ"=>"Ｂ","ａ"=>"Ａ","ῳ"=>"ῼ","ῥ"=>"Ῥ","ῡ"=>"Ῡ","ῑ"=>"Ῑ",
+            "ῐ"=>"Ῐ","ῃ"=>"ῌ","ι"=>"Ι","ᾳ"=>"ᾼ","ᾱ"=>"Ᾱ","ᾰ"=>"Ᾰ","ᾧ"=>"ᾯ","ᾦ"=>"ᾮ","ᾥ"=>"ᾭ","ᾤ"=>"ᾬ",
+            "ᾣ"=>"ᾫ","ᾢ"=>"ᾪ","ᾡ"=>"ᾩ","ᾗ"=>"ᾟ","ᾖ"=>"ᾞ","ᾕ"=>"ᾝ","ᾔ"=>"ᾜ","ᾓ"=>"ᾛ","ᾒ"=>"ᾚ","ᾑ"=>"ᾙ",
+            "ᾐ"=>"ᾘ","ᾇ"=>"ᾏ","ᾆ"=>"ᾎ","ᾅ"=>"ᾍ","ᾄ"=>"ᾌ","ᾃ"=>"ᾋ","ᾂ"=>"ᾊ","ᾁ"=>"ᾉ","ᾀ"=>"ᾈ","ώ"=>"Ώ",
+            "ὼ"=>"Ὼ","ύ"=>"Ύ","ὺ"=>"Ὺ","ό"=>"Ό","ὸ"=>"Ὸ","ί"=>"Ί","ὶ"=>"Ὶ","ή"=>"Ή","ὴ"=>"Ὴ","έ"=>"Έ",
+            "ὲ"=>"Ὲ","ά"=>"Ά","ὰ"=>"Ὰ","ὧ"=>"Ὧ","ὦ"=>"Ὦ","ὥ"=>"Ὥ","ὤ"=>"Ὤ","ὣ"=>"Ὣ","ὢ"=>"Ὢ","ὡ"=>"Ὡ",
+            "ὗ"=>"Ὗ","ὕ"=>"Ὕ","ὓ"=>"Ὓ","ὑ"=>"Ὑ","ὅ"=>"Ὅ","ὄ"=>"Ὄ","ὃ"=>"Ὃ","ὂ"=>"Ὂ","ὁ"=>"Ὁ","ὀ"=>"Ὀ",
+            "ἷ"=>"Ἷ","ἶ"=>"Ἶ","ἵ"=>"Ἵ","ἴ"=>"Ἴ","ἳ"=>"Ἳ","ἲ"=>"Ἲ","ἱ"=>"Ἱ","ἰ"=>"Ἰ","ἧ"=>"Ἧ","ἦ"=>"Ἦ",
+            "ἥ"=>"Ἥ","ἤ"=>"Ἤ","ἣ"=>"Ἣ","ἢ"=>"Ἢ","ἡ"=>"Ἡ","ἕ"=>"Ἕ","ἔ"=>"Ἔ","ἓ"=>"Ἓ","ἒ"=>"Ἒ","ἑ"=>"Ἑ",
+            "ἐ"=>"Ἐ","ἇ"=>"Ἇ","ἆ"=>"Ἆ","ἅ"=>"Ἅ","ἄ"=>"Ἄ","ἃ"=>"Ἃ","ἂ"=>"Ἂ","ἁ"=>"Ἁ","ἀ"=>"Ἀ","ỹ"=>"Ỹ",
+            "ỷ"=>"Ỷ","ỵ"=>"Ỵ","ỳ"=>"Ỳ","ự"=>"Ự","ữ"=>"Ữ","ử"=>"Ử","ừ"=>"Ừ","ứ"=>"Ứ","ủ"=>"Ủ","ụ"=>"Ụ",
+            "ợ"=>"Ợ","ỡ"=>"Ỡ","ở"=>"Ở","ờ"=>"Ờ","ớ"=>"Ớ","ộ"=>"Ộ","ỗ"=>"Ỗ","ổ"=>"Ổ","ồ"=>"Ồ","ố"=>"Ố",
+            "ỏ"=>"Ỏ","ọ"=>"Ọ","ị"=>"Ị","ỉ"=>"Ỉ","ệ"=>"Ệ","ễ"=>"Ễ","ể"=>"Ể","ề"=>"Ề","ế"=>"Ế","ẽ"=>"Ẽ",
+            "ẻ"=>"Ẻ","ẹ"=>"Ẹ","ặ"=>"Ặ","ẵ"=>"Ẵ","ẳ"=>"Ẳ","ằ"=>"Ằ","ắ"=>"Ắ","ậ"=>"Ậ","ẫ"=>"Ẫ","ẩ"=>"Ẩ",
+            "ầ"=>"Ầ","ấ"=>"Ấ","ả"=>"Ả","ạ"=>"Ạ","ẛ"=>"Ṡ","ẕ"=>"Ẕ","ẓ"=>"Ẓ","ẑ"=>"Ẑ","ẏ"=>"Ẏ","ẍ"=>"Ẍ",
+            "ẋ"=>"Ẋ","ẉ"=>"Ẉ","ẇ"=>"Ẇ","ẅ"=>"Ẅ","ẃ"=>"Ẃ","ẁ"=>"Ẁ","ṿ"=>"Ṿ","ṽ"=>"Ṽ","ṻ"=>"Ṻ","ṹ"=>"Ṹ",
+            "ṷ"=>"Ṷ","ṵ"=>"Ṵ","ṳ"=>"Ṳ","ṱ"=>"Ṱ","ṯ"=>"Ṯ","ṭ"=>"Ṭ","ṫ"=>"Ṫ","ṩ"=>"Ṩ","ṧ"=>"Ṧ","ṥ"=>"Ṥ",
+            "ṣ"=>"Ṣ","ṡ"=>"Ṡ","ṟ"=>"Ṟ","ṝ"=>"Ṝ","ṛ"=>"Ṛ","ṙ"=>"Ṙ","ṗ"=>"Ṗ","ṕ"=>"Ṕ","ṓ"=>"Ṓ","ṑ"=>"Ṑ",
+            "ṏ"=>"Ṏ","ṍ"=>"Ṍ","ṋ"=>"Ṋ","ṉ"=>"Ṉ","ṇ"=>"Ṇ","ṅ"=>"Ṅ","ṃ"=>"Ṃ","ṁ"=>"Ṁ","ḿ"=>"Ḿ","ḽ"=>"Ḽ",
+            "ḻ"=>"Ḻ","ḹ"=>"Ḹ","ḷ"=>"Ḷ","ḵ"=>"Ḵ","ḳ"=>"Ḳ","ḱ"=>"Ḱ","ḯ"=>"Ḯ","ḭ"=>"Ḭ","ḫ"=>"Ḫ","ḩ"=>"Ḩ",
+            "ḧ"=>"Ḧ","ḥ"=>"Ḥ","ḣ"=>"Ḣ","ḡ"=>"Ḡ","ḟ"=>"Ḟ","ḝ"=>"Ḝ","ḛ"=>"Ḛ","ḙ"=>"Ḙ","ḗ"=>"Ḗ","ḕ"=>"Ḕ",
+            "ḓ"=>"Ḓ","ḑ"=>"Ḑ","ḏ"=>"Ḏ","ḍ"=>"Ḍ","ḋ"=>"Ḋ","ḉ"=>"Ḉ","ḇ"=>"Ḇ","ḅ"=>"Ḅ","ḃ"=>"Ḃ","ḁ"=>"Ḁ",
+            "ֆ"=>"Ֆ","օ"=>"Օ","ք"=>"Ք","փ"=>"Փ","ւ"=>"Ւ","ց"=>"Ց","ր"=>"Ր","տ"=>"Տ","վ"=>"Վ","ս"=>"Ս",
+            "ռ"=>"Ռ","ջ"=>"Ջ","պ"=>"Պ","չ"=>"Չ","ո"=>"Ո","շ"=>"Շ","ն"=>"Ն","յ"=>"Յ","մ"=>"Մ","ճ"=>"Ճ",
+            "ղ"=>"Ղ","ձ"=>"Ձ","հ"=>"Հ","կ"=>"Կ","ծ"=>"Ծ","խ"=>"Խ","լ"=>"Լ","ի"=>"Ի","ժ"=>"Ժ","թ"=>"Թ",
+            "ը"=>"Ը","է"=>"Է","զ"=>"Զ","ե"=>"Ե","դ"=>"Դ","գ"=>"Գ","բ"=>"Բ","ա"=>"Ա","ԏ"=>"Ԏ","ԍ"=>"Ԍ",
+            "ԋ"=>"Ԋ","ԉ"=>"Ԉ","ԇ"=>"Ԇ","ԅ"=>"Ԅ","ԃ"=>"Ԃ","ԁ"=>"Ԁ","ӹ"=>"Ӹ","ӵ"=>"Ӵ","ӳ"=>"Ӳ","ӱ"=>"Ӱ",
+            "ӯ"=>"Ӯ","ӭ"=>"Ӭ","ӫ"=>"Ӫ","ө"=>"Ө","ӧ"=>"Ӧ","ӥ"=>"Ӥ","ӣ"=>"Ӣ","ӡ"=>"Ӡ","ӟ"=>"Ӟ","ӝ"=>"Ӝ",
+            "ӛ"=>"Ӛ","ә"=>"Ә","ӗ"=>"Ӗ","ӕ"=>"Ӕ","ӓ"=>"Ӓ","ӑ"=>"Ӑ","ӎ"=>"Ӎ","ӌ"=>"Ӌ","ӊ"=>"Ӊ","ӈ"=>"Ӈ",
+            "ӆ"=>"Ӆ","ӄ"=>"Ӄ","ӂ"=>"Ӂ","ҿ"=>"Ҿ","ҽ"=>"Ҽ","һ"=>"Һ","ҹ"=>"Ҹ","ҷ"=>"Ҷ","ҵ"=>"Ҵ","ҳ"=>"Ҳ",
+            "ұ"=>"Ұ","ү"=>"Ү","ҭ"=>"Ҭ","ҫ"=>"Ҫ","ҩ"=>"Ҩ","ҧ"=>"Ҧ","ҥ"=>"Ҥ","ң"=>"Ң","ҡ"=>"Ҡ","ҟ"=>"Ҟ",
+            "ҝ"=>"Ҝ","қ"=>"Қ","ҙ"=>"Ҙ","җ"=>"Җ","ҕ"=>"Ҕ","ғ"=>"Ғ","ґ"=>"Ґ","ҏ"=>"Ҏ","ҍ"=>"Ҍ","ҋ"=>"Ҋ",
+            "ҁ"=>"Ҁ","ѿ"=>"Ѿ","ѽ"=>"Ѽ","ѻ"=>"Ѻ","ѹ"=>"Ѹ","ѷ"=>"Ѷ","ѵ"=>"Ѵ","ѳ"=>"Ѳ","ѱ"=>"Ѱ","ѯ"=>"Ѯ",
+            "ѭ"=>"Ѭ","ѫ"=>"Ѫ","ѩ"=>"Ѩ","ѧ"=>"Ѧ","ѥ"=>"Ѥ","ѣ"=>"Ѣ","ѡ"=>"Ѡ","џ"=>"Џ","ў"=>"Ў","ѝ"=>"Ѝ",
+            "ќ"=>"Ќ","ћ"=>"Ћ","њ"=>"Њ","љ"=>"Љ","ј"=>"Ј","ї"=>"Ї","і"=>"І","ѕ"=>"Ѕ","є"=>"Є","ѓ"=>"Ѓ",
+            "ђ"=>"Ђ","ё"=>"Ё","ѐ"=>"Ѐ","я"=>"Я","ю"=>"Ю","э"=>"Э","ь"=>"Ь","ы"=>"Ы","ъ"=>"Ъ","щ"=>"Щ",
+            "ш"=>"Ш","ч"=>"Ч","ц"=>"Ц","х"=>"Х","ф"=>"Ф","у"=>"У","т"=>"Т","с"=>"С","р"=>"Р","п"=>"П",
+            "о"=>"О","н"=>"Н","м"=>"М","л"=>"Л","к"=>"К","й"=>"Й","и"=>"И","з"=>"З","ж"=>"Ж","е"=>"Е",
+            "д"=>"Д","г"=>"Г","в"=>"В","б"=>"Б","а"=>"А","ϵ"=>"Ε","ϲ"=>"Σ","ϱ"=>"Ρ","ϰ"=>"Κ","ϯ"=>"Ϯ",
+            "ϭ"=>"Ϭ","ϫ"=>"Ϫ","ϩ"=>"Ϩ","ϧ"=>"Ϧ","ϥ"=>"Ϥ","ϣ"=>"Ϣ","ϡ"=>"Ϡ","ϟ"=>"Ϟ","ϝ"=>"Ϝ","ϛ"=>"Ϛ",
+            "ϙ"=>"Ϙ","ϖ"=>"Π","ϕ"=>"Φ","ϑ"=>"Θ","ϐ"=>"Β","ώ"=>"Ώ","ύ"=>"Ύ","ό"=>"Ό","ϋ"=>"Ϋ","ϊ"=>"Ϊ",
+            "ω"=>"Ω","ψ"=>"Ψ","χ"=>"Χ","φ"=>"Φ","υ"=>"Υ","τ"=>"Τ","σ"=>"Σ","ς"=>"Σ","ρ"=>"Ρ","π"=>"Π",
+            "ο"=>"Ο","ξ"=>"Ξ","ν"=>"Ν","μ"=>"Μ","λ"=>"Λ","κ"=>"Κ","ι"=>"Ι","θ"=>"Θ","η"=>"Η","ζ"=>"Ζ",
+            "ε"=>"Ε","δ"=>"Δ","γ"=>"Γ","β"=>"Β","α"=>"Α","ί"=>"Ί","ή"=>"Ή","έ"=>"Έ","ά"=>"Ά","ʒ"=>"Ʒ",
+            "ʋ"=>"Ʋ","ʊ"=>"Ʊ","ʈ"=>"Ʈ","ʃ"=>"Ʃ","ʀ"=>"Ʀ","ɵ"=>"Ɵ","ɲ"=>"Ɲ","ɯ"=>"Ɯ","ɩ"=>"Ɩ","ɨ"=>"Ɨ",
+            "ɣ"=>"Ɣ","ɛ"=>"Ɛ","ə"=>"Ə","ɗ"=>"Ɗ","ɖ"=>"Ɖ","ɔ"=>"Ɔ","ɓ"=>"Ɓ","ȳ"=>"Ȳ","ȱ"=>"Ȱ","ȯ"=>"Ȯ",
+            "ȭ"=>"Ȭ","ȫ"=>"Ȫ","ȩ"=>"Ȩ","ȧ"=>"Ȧ","ȥ"=>"Ȥ","ȣ"=>"Ȣ","ȟ"=>"Ȟ","ȝ"=>"Ȝ","ț"=>"Ț","ș"=>"Ș",
+            "ȗ"=>"Ȗ","ȕ"=>"Ȕ","ȓ"=>"Ȓ","ȑ"=>"Ȑ","ȏ"=>"Ȏ","ȍ"=>"Ȍ","ȋ"=>"Ȋ","ȉ"=>"Ȉ","ȇ"=>"Ȇ","ȅ"=>"Ȅ",
+            "ȃ"=>"Ȃ","ȁ"=>"Ȁ","ǿ"=>"Ǿ","ǽ"=>"Ǽ","ǻ"=>"Ǻ","ǹ"=>"Ǹ","ǵ"=>"Ǵ","ǳ"=>"ǲ","ǯ"=>"Ǯ","ǭ"=>"Ǭ",
+            "ǫ"=>"Ǫ","ǩ"=>"Ǩ","ǧ"=>"Ǧ","ǥ"=>"Ǥ","ǣ"=>"Ǣ","ǡ"=>"Ǡ","ǟ"=>"Ǟ","ǝ"=>"Ǝ","ǜ"=>"Ǜ","ǚ"=>"Ǚ",
+            "ǘ"=>"Ǘ","ǖ"=>"Ǖ","ǔ"=>"Ǔ","ǒ"=>"Ǒ","ǐ"=>"Ǐ","ǎ"=>"Ǎ","ǌ"=>"ǋ","ǉ"=>"ǈ","ǆ"=>"ǅ","ƿ"=>"Ƿ",
+            "ƽ"=>"Ƽ","ƹ"=>"Ƹ","ƶ"=>"Ƶ","ƴ"=>"Ƴ","ư"=>"Ư","ƭ"=>"Ƭ","ƨ"=>"Ƨ","ƥ"=>"Ƥ","ƣ"=>"Ƣ","ơ"=>"Ơ",
+            "ƞ"=>"Ƞ","ƙ"=>"Ƙ","ƕ"=>"Ƕ","ƒ"=>"Ƒ","ƌ"=>"Ƌ","ƈ"=>"Ƈ","ƅ"=>"Ƅ","ƃ"=>"Ƃ","ſ"=>"S","ž"=>"Ž",
+            "ż"=>"Ż","ź"=>"Ź","ŷ"=>"Ŷ","ŵ"=>"Ŵ","ų"=>"Ų","ű"=>"Ű","ů"=>"Ů","ŭ"=>"Ŭ","ū"=>"Ū","ũ"=>"Ũ",
+            "ŧ"=>"Ŧ","ť"=>"Ť","ţ"=>"Ţ","š"=>"Š","ş"=>"Ş","ŝ"=>"Ŝ","ś"=>"Ś","ř"=>"Ř","ŗ"=>"Ŗ","ŕ"=>"Ŕ",
+            "œ"=>"Œ","ő"=>"Ő","ŏ"=>"Ŏ","ō"=>"Ō","ŋ"=>"Ŋ","ň"=>"Ň","ņ"=>"Ņ","ń"=>"Ń","ł"=>"Ł","ŀ"=>"Ŀ",
+            "ľ"=>"Ľ","ļ"=>"Ļ","ĺ"=>"Ĺ","ķ"=>"Ķ","ĵ"=>"Ĵ","ĳ"=>"Ĳ","ı"=>"I","į"=>"Į","ĭ"=>"Ĭ","ī"=>"Ī",
+            "ĩ"=>"Ĩ","ħ"=>"Ħ","ĥ"=>"Ĥ","ģ"=>"Ģ","ġ"=>"Ġ","ğ"=>"Ğ","ĝ"=>"Ĝ","ě"=>"Ě","ę"=>"Ę","ė"=>"Ė",
+            "ĕ"=>"Ĕ","ē"=>"Ē","đ"=>"Đ","ď"=>"Ď","č"=>"Č","ċ"=>"Ċ","ĉ"=>"Ĉ","ć"=>"Ć","ą"=>"Ą","ă"=>"Ă",
+            "ā"=>"Ā","ÿ"=>"Ÿ","þ"=>"Þ","ý"=>"Ý","ü"=>"Ü","û"=>"Û","ú"=>"Ú","ù"=>"Ù","ø"=>"Ø","ö"=>"Ö",
+            "õ"=>"Õ","ô"=>"Ô","ó"=>"Ó","ò"=>"Ò","ñ"=>"Ñ","ð"=>"Ð","ï"=>"Ï","î"=>"Î","í"=>"Í","ì"=>"Ì",
+            "ë"=>"Ë","ê"=>"Ê","é"=>"É","è"=>"È","ç"=>"Ç","æ"=>"Æ","å"=>"Å","ä"=>"Ä","ã"=>"Ã","â"=>"Â",
+            "á"=>"Á","à"=>"À","µ"=>"Μ","z"=>"Z","y"=>"Y","x"=>"X","w"=>"W","v"=>"V","u"=>"U","t"=>"T",
+            "s"=>"S","r"=>"R","q"=>"Q","p"=>"P","o"=>"O","n"=>"N","m"=>"M","l"=>"L","k"=>"K","j"=>"J",
+            "i"=>"I","h"=>"H","g"=>"G","f"=>"F","e"=>"E","d"=>"D","c"=>"C","b"=>"B","a"=>"A"
+                );
+
+    /**
+     * UTF-8 Case lookup table
+     *
+     * This lookuptable defines the lower case letters to their correspponding
+     * upper case letter in UTF-8
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    global $UTF8_UPPER_TO_LOWER;
+    if(empty($UTF8_UPPER_TO_LOWER)) $UTF8_UPPER_TO_LOWER = array (
+            "Ｚ"=>"ｚ","Ｙ"=>"ｙ","Ｘ"=>"ｘ","Ｗ"=>"ｗ","Ｖ"=>"ｖ","Ｕ"=>"ｕ","Ｔ"=>"ｔ","Ｓ"=>"ｓ","Ｒ"=>"ｒ","Ｑ"=>"ｑ",
+            "Ｐ"=>"ｐ","Ｏ"=>"ｏ","Ｎ"=>"ｎ","Ｍ"=>"ｍ","Ｌ"=>"ｌ","Ｋ"=>"ｋ","Ｊ"=>"ｊ","Ｉ"=>"ｉ","Ｈ"=>"ｈ","Ｇ"=>"ｇ",
+            "Ｆ"=>"ｆ","Ｅ"=>"ｅ","Ｄ"=>"ｄ","Ｃ"=>"ｃ","Ｂ"=>"ｂ","Ａ"=>"ａ","ῼ"=>"ῳ","Ῥ"=>"ῥ","Ῡ"=>"ῡ","Ῑ"=>"ῑ",
+            "Ῐ"=>"ῐ","ῌ"=>"ῃ","Ι"=>"ι","ᾼ"=>"ᾳ","Ᾱ"=>"ᾱ","Ᾰ"=>"ᾰ","ᾯ"=>"ᾧ","ᾮ"=>"ᾦ","ᾭ"=>"ᾥ","ᾬ"=>"ᾤ",
+            "ᾫ"=>"ᾣ","ᾪ"=>"ᾢ","ᾩ"=>"ᾡ","ᾟ"=>"ᾗ","ᾞ"=>"ᾖ","ᾝ"=>"ᾕ","ᾜ"=>"ᾔ","ᾛ"=>"ᾓ","ᾚ"=>"ᾒ","ᾙ"=>"ᾑ",
+            "ᾘ"=>"ᾐ","ᾏ"=>"ᾇ","ᾎ"=>"ᾆ","ᾍ"=>"ᾅ","ᾌ"=>"ᾄ","ᾋ"=>"ᾃ","ᾊ"=>"ᾂ","ᾉ"=>"ᾁ","ᾈ"=>"ᾀ","Ώ"=>"ώ",
+            "Ὼ"=>"ὼ","Ύ"=>"ύ","Ὺ"=>"ὺ","Ό"=>"ό","Ὸ"=>"ὸ","Ί"=>"ί","Ὶ"=>"ὶ","Ή"=>"ή","Ὴ"=>"ὴ","Έ"=>"έ",
+            "Ὲ"=>"ὲ","Ά"=>"ά","Ὰ"=>"ὰ","Ὧ"=>"ὧ","Ὦ"=>"ὦ","Ὥ"=>"ὥ","Ὤ"=>"ὤ","Ὣ"=>"ὣ","Ὢ"=>"ὢ","Ὡ"=>"ὡ",
+            "Ὗ"=>"ὗ","Ὕ"=>"ὕ","Ὓ"=>"ὓ","Ὑ"=>"ὑ","Ὅ"=>"ὅ","Ὄ"=>"ὄ","Ὃ"=>"ὃ","Ὂ"=>"ὂ","Ὁ"=>"ὁ","Ὀ"=>"ὀ",
+            "Ἷ"=>"ἷ","Ἶ"=>"ἶ","Ἵ"=>"ἵ","Ἴ"=>"ἴ","Ἳ"=>"ἳ","Ἲ"=>"ἲ","Ἱ"=>"ἱ","Ἰ"=>"ἰ","Ἧ"=>"ἧ","Ἦ"=>"ἦ",
+            "Ἥ"=>"ἥ","Ἤ"=>"ἤ","Ἣ"=>"ἣ","Ἢ"=>"ἢ","Ἡ"=>"ἡ","Ἕ"=>"ἕ","Ἔ"=>"ἔ","Ἓ"=>"ἓ","Ἒ"=>"ἒ","Ἑ"=>"ἑ",
+            "Ἐ"=>"ἐ","Ἇ"=>"ἇ","Ἆ"=>"ἆ","Ἅ"=>"ἅ","Ἄ"=>"ἄ","Ἃ"=>"ἃ","Ἂ"=>"ἂ","Ἁ"=>"ἁ","Ἀ"=>"ἀ","Ỹ"=>"ỹ",
+            "Ỷ"=>"ỷ","Ỵ"=>"ỵ","Ỳ"=>"ỳ","Ự"=>"ự","Ữ"=>"ữ","Ử"=>"ử","Ừ"=>"ừ","Ứ"=>"ứ","Ủ"=>"ủ","Ụ"=>"ụ",
+            "Ợ"=>"ợ","Ỡ"=>"ỡ","Ở"=>"ở","Ờ"=>"ờ","Ớ"=>"ớ","Ộ"=>"ộ","Ỗ"=>"ỗ","Ổ"=>"ổ","Ồ"=>"ồ","Ố"=>"ố",
+            "Ỏ"=>"ỏ","Ọ"=>"ọ","Ị"=>"ị","Ỉ"=>"ỉ","Ệ"=>"ệ","Ễ"=>"ễ","Ể"=>"ể","Ề"=>"ề","Ế"=>"ế","Ẽ"=>"ẽ",
+            "Ẻ"=>"ẻ","Ẹ"=>"ẹ","Ặ"=>"ặ","Ẵ"=>"ẵ","Ẳ"=>"ẳ","Ằ"=>"ằ","Ắ"=>"ắ","Ậ"=>"ậ","Ẫ"=>"ẫ","Ẩ"=>"ẩ",
+            "Ầ"=>"ầ","Ấ"=>"ấ","Ả"=>"ả","Ạ"=>"ạ","Ṡ"=>"ẛ","Ẕ"=>"ẕ","Ẓ"=>"ẓ","Ẑ"=>"ẑ","Ẏ"=>"ẏ","Ẍ"=>"ẍ",
+            "Ẋ"=>"ẋ","Ẉ"=>"ẉ","Ẇ"=>"ẇ","Ẅ"=>"ẅ","Ẃ"=>"ẃ","Ẁ"=>"ẁ","Ṿ"=>"ṿ","Ṽ"=>"ṽ","Ṻ"=>"ṻ","Ṹ"=>"ṹ",
+            "Ṷ"=>"ṷ","Ṵ"=>"ṵ","Ṳ"=>"ṳ","Ṱ"=>"ṱ","Ṯ"=>"ṯ","Ṭ"=>"ṭ","Ṫ"=>"ṫ","Ṩ"=>"ṩ","Ṧ"=>"ṧ","Ṥ"=>"ṥ",
+            "Ṣ"=>"ṣ","Ṡ"=>"ṡ","Ṟ"=>"ṟ","Ṝ"=>"ṝ","Ṛ"=>"ṛ","Ṙ"=>"ṙ","Ṗ"=>"ṗ","Ṕ"=>"ṕ","Ṓ"=>"ṓ","Ṑ"=>"ṑ",
+            "Ṏ"=>"ṏ","Ṍ"=>"ṍ","Ṋ"=>"ṋ","Ṉ"=>"ṉ","Ṇ"=>"ṇ","Ṅ"=>"ṅ","Ṃ"=>"ṃ","Ṁ"=>"ṁ","Ḿ"=>"ḿ","Ḽ"=>"ḽ",
+            "Ḻ"=>"ḻ","Ḹ"=>"ḹ","Ḷ"=>"ḷ","Ḵ"=>"ḵ","Ḳ"=>"ḳ","Ḱ"=>"ḱ","Ḯ"=>"ḯ","Ḭ"=>"ḭ","Ḫ"=>"ḫ","Ḩ"=>"ḩ",
+            "Ḧ"=>"ḧ","Ḥ"=>"ḥ","Ḣ"=>"ḣ","Ḡ"=>"ḡ","Ḟ"=>"ḟ","Ḝ"=>"ḝ","Ḛ"=>"ḛ","Ḙ"=>"ḙ","Ḗ"=>"ḗ","Ḕ"=>"ḕ",
+            "Ḓ"=>"ḓ","Ḑ"=>"ḑ","Ḏ"=>"ḏ","Ḍ"=>"ḍ","Ḋ"=>"ḋ","Ḉ"=>"ḉ","Ḇ"=>"ḇ","Ḅ"=>"ḅ","Ḃ"=>"ḃ","Ḁ"=>"ḁ",
+            "Ֆ"=>"ֆ","Օ"=>"օ","Ք"=>"ք","Փ"=>"փ","Ւ"=>"ւ","Ց"=>"ց","Ր"=>"ր","Տ"=>"տ","Վ"=>"վ","Ս"=>"ս",
+            "Ռ"=>"ռ","Ջ"=>"ջ","Պ"=>"պ","Չ"=>"չ","Ո"=>"ո","Շ"=>"շ","Ն"=>"ն","Յ"=>"յ","Մ"=>"մ","Ճ"=>"ճ",
+            "Ղ"=>"ղ","Ձ"=>"ձ","Հ"=>"հ","Կ"=>"կ","Ծ"=>"ծ","Խ"=>"խ","Լ"=>"լ","Ի"=>"ի","Ժ"=>"ժ","Թ"=>"թ",
+            "Ը"=>"ը","Է"=>"է","Զ"=>"զ","Ե"=>"ե","Դ"=>"դ","Գ"=>"գ","Բ"=>"բ","Ա"=>"ա","Ԏ"=>"ԏ","Ԍ"=>"ԍ",
+            "Ԋ"=>"ԋ","Ԉ"=>"ԉ","Ԇ"=>"ԇ","Ԅ"=>"ԅ","Ԃ"=>"ԃ","Ԁ"=>"ԁ","Ӹ"=>"ӹ","Ӵ"=>"ӵ","Ӳ"=>"ӳ","Ӱ"=>"ӱ",
+            "Ӯ"=>"ӯ","Ӭ"=>"ӭ","Ӫ"=>"ӫ","Ө"=>"ө","Ӧ"=>"ӧ","Ӥ"=>"ӥ","Ӣ"=>"ӣ","Ӡ"=>"ӡ","Ӟ"=>"ӟ","Ӝ"=>"ӝ",
+            "Ӛ"=>"ӛ","Ә"=>"ә","Ӗ"=>"ӗ","Ӕ"=>"ӕ","Ӓ"=>"ӓ","Ӑ"=>"ӑ","Ӎ"=>"ӎ","Ӌ"=>"ӌ","Ӊ"=>"ӊ","Ӈ"=>"ӈ",
+            "Ӆ"=>"ӆ","Ӄ"=>"ӄ","Ӂ"=>"ӂ","Ҿ"=>"ҿ","Ҽ"=>"ҽ","Һ"=>"һ","Ҹ"=>"ҹ","Ҷ"=>"ҷ","Ҵ"=>"ҵ","Ҳ"=>"ҳ",
+            "Ұ"=>"ұ","Ү"=>"ү","Ҭ"=>"ҭ","Ҫ"=>"ҫ","Ҩ"=>"ҩ","Ҧ"=>"ҧ","Ҥ"=>"ҥ","Ң"=>"ң","Ҡ"=>"ҡ","Ҟ"=>"ҟ",
+            "Ҝ"=>"ҝ","Қ"=>"қ","Ҙ"=>"ҙ","Җ"=>"җ","Ҕ"=>"ҕ","Ғ"=>"ғ","Ґ"=>"ґ","Ҏ"=>"ҏ","Ҍ"=>"ҍ","Ҋ"=>"ҋ",
+            "Ҁ"=>"ҁ","Ѿ"=>"ѿ","Ѽ"=>"ѽ","Ѻ"=>"ѻ","Ѹ"=>"ѹ","Ѷ"=>"ѷ","Ѵ"=>"ѵ","Ѳ"=>"ѳ","Ѱ"=>"ѱ","Ѯ"=>"ѯ",
+            "Ѭ"=>"ѭ","Ѫ"=>"ѫ","Ѩ"=>"ѩ","Ѧ"=>"ѧ","Ѥ"=>"ѥ","Ѣ"=>"ѣ","Ѡ"=>"ѡ","Џ"=>"џ","Ў"=>"ў","Ѝ"=>"ѝ",
+            "Ќ"=>"ќ","Ћ"=>"ћ","Њ"=>"њ","Љ"=>"љ","Ј"=>"ј","Ї"=>"ї","І"=>"і","Ѕ"=>"ѕ","Є"=>"є","Ѓ"=>"ѓ",
+            "Ђ"=>"ђ","Ё"=>"ё","Ѐ"=>"ѐ","Я"=>"я","Ю"=>"ю","Э"=>"э","Ь"=>"ь","Ы"=>"ы","Ъ"=>"ъ","Щ"=>"щ",
+            "Ш"=>"ш","Ч"=>"ч","Ц"=>"ц","Х"=>"х","Ф"=>"ф","У"=>"у","Т"=>"т","С"=>"с","Р"=>"р","П"=>"п",
+            "О"=>"о","Н"=>"н","М"=>"м","Л"=>"л","К"=>"к","Й"=>"й","И"=>"и","З"=>"з","Ж"=>"ж","Е"=>"е",
+            "Д"=>"д","Г"=>"г","В"=>"в","Б"=>"б","А"=>"а","Ε"=>"ϵ","Σ"=>"ϲ","Ρ"=>"ϱ","Κ"=>"ϰ","Ϯ"=>"ϯ",
+            "Ϭ"=>"ϭ","Ϫ"=>"ϫ","Ϩ"=>"ϩ","Ϧ"=>"ϧ","Ϥ"=>"ϥ","Ϣ"=>"ϣ","Ϡ"=>"ϡ","Ϟ"=>"ϟ","Ϝ"=>"ϝ","Ϛ"=>"ϛ",
+            "Ϙ"=>"ϙ","Π"=>"ϖ","Φ"=>"ϕ","Θ"=>"ϑ","Β"=>"ϐ","Ώ"=>"ώ","Ύ"=>"ύ","Ό"=>"ό","Ϋ"=>"ϋ","Ϊ"=>"ϊ",
+            "Ω"=>"ω","Ψ"=>"ψ","Χ"=>"χ","Φ"=>"φ","Υ"=>"υ","Τ"=>"τ","Σ"=>"σ","Σ"=>"ς","Ρ"=>"ρ","Π"=>"π",
+            "Ο"=>"ο","Ξ"=>"ξ","Ν"=>"ν","Μ"=>"μ","Λ"=>"λ","Κ"=>"κ","Ι"=>"ι","Θ"=>"θ","Η"=>"η","Ζ"=>"ζ",
+            "Ε"=>"ε","Δ"=>"δ","Γ"=>"γ","Β"=>"β","Α"=>"α","Ί"=>"ί","Ή"=>"ή","Έ"=>"έ","Ά"=>"ά","Ʒ"=>"ʒ",
+            "Ʋ"=>"ʋ","Ʊ"=>"ʊ","Ʈ"=>"ʈ","Ʃ"=>"ʃ","Ʀ"=>"ʀ","Ɵ"=>"ɵ","Ɲ"=>"ɲ","Ɯ"=>"ɯ","Ɩ"=>"ɩ","Ɨ"=>"ɨ",
+            "Ɣ"=>"ɣ","Ɛ"=>"ɛ","Ə"=>"ə","Ɗ"=>"ɗ","Ɖ"=>"ɖ","Ɔ"=>"ɔ","Ɓ"=>"ɓ","Ȳ"=>"ȳ","Ȱ"=>"ȱ","Ȯ"=>"ȯ",
+            "Ȭ"=>"ȭ","Ȫ"=>"ȫ","Ȩ"=>"ȩ","Ȧ"=>"ȧ","Ȥ"=>"ȥ","Ȣ"=>"ȣ","Ȟ"=>"ȟ","Ȝ"=>"ȝ","Ț"=>"ț","Ș"=>"ș",
+            "Ȗ"=>"ȗ","Ȕ"=>"ȕ","Ȓ"=>"ȓ","Ȑ"=>"ȑ","Ȏ"=>"ȏ","Ȍ"=>"ȍ","Ȋ"=>"ȋ","Ȉ"=>"ȉ","Ȇ"=>"ȇ","Ȅ"=>"ȅ",
+            "Ȃ"=>"ȃ","Ȁ"=>"ȁ","Ǿ"=>"ǿ","Ǽ"=>"ǽ","Ǻ"=>"ǻ","Ǹ"=>"ǹ","Ǵ"=>"ǵ","ǲ"=>"ǳ","Ǯ"=>"ǯ","Ǭ"=>"ǭ",
+            "Ǫ"=>"ǫ","Ǩ"=>"ǩ","Ǧ"=>"ǧ","Ǥ"=>"ǥ","Ǣ"=>"ǣ","Ǡ"=>"ǡ","Ǟ"=>"ǟ","Ǝ"=>"ǝ","Ǜ"=>"ǜ","Ǚ"=>"ǚ",
+            "Ǘ"=>"ǘ","Ǖ"=>"ǖ","Ǔ"=>"ǔ","Ǒ"=>"ǒ","Ǐ"=>"ǐ","Ǎ"=>"ǎ","ǋ"=>"ǌ","ǈ"=>"ǉ","ǅ"=>"ǆ","Ƿ"=>"ƿ",
+            "Ƽ"=>"ƽ","Ƹ"=>"ƹ","Ƶ"=>"ƶ","Ƴ"=>"ƴ","Ư"=>"ư","Ƭ"=>"ƭ","Ƨ"=>"ƨ","Ƥ"=>"ƥ","Ƣ"=>"ƣ","Ơ"=>"ơ",
+            "Ƞ"=>"ƞ","Ƙ"=>"ƙ","Ƕ"=>"ƕ","Ƒ"=>"ƒ","Ƌ"=>"ƌ","Ƈ"=>"ƈ","Ƅ"=>"ƅ","Ƃ"=>"ƃ","S"=>"ſ","Ž"=>"ž",
+            "Ż"=>"ż","Ź"=>"ź","Ŷ"=>"ŷ","Ŵ"=>"ŵ","Ų"=>"ų","Ű"=>"ű","Ů"=>"ů","Ŭ"=>"ŭ","Ū"=>"ū","Ũ"=>"ũ",
+            "Ŧ"=>"ŧ","Ť"=>"ť","Ţ"=>"ţ","Š"=>"š","Ş"=>"ş","Ŝ"=>"ŝ","Ś"=>"ś","Ř"=>"ř","Ŗ"=>"ŗ","Ŕ"=>"ŕ",
+            "Œ"=>"œ","Ő"=>"ő","Ŏ"=>"ŏ","Ō"=>"ō","Ŋ"=>"ŋ","Ň"=>"ň","Ņ"=>"ņ","Ń"=>"ń","Ł"=>"ł","Ŀ"=>"ŀ",
+            "Ľ"=>"ľ","Ļ"=>"ļ","Ĺ"=>"ĺ","Ķ"=>"ķ","Ĵ"=>"ĵ","Ĳ"=>"ĳ","I"=>"ı","Į"=>"į","Ĭ"=>"ĭ","Ī"=>"ī",
+            "Ĩ"=>"ĩ","Ħ"=>"ħ","Ĥ"=>"ĥ","Ģ"=>"ģ","Ġ"=>"ġ","Ğ"=>"ğ","Ĝ"=>"ĝ","Ě"=>"ě","Ę"=>"ę","Ė"=>"ė",
+            "Ĕ"=>"ĕ","Ē"=>"ē","Đ"=>"đ","Ď"=>"ď","Č"=>"č","Ċ"=>"ċ","Ĉ"=>"ĉ","Ć"=>"ć","Ą"=>"ą","Ă"=>"ă",
+            "Ā"=>"ā","Ÿ"=>"ÿ","Þ"=>"þ","Ý"=>"ý","Ü"=>"ü","Û"=>"û","Ú"=>"ú","Ù"=>"ù","Ø"=>"ø","Ö"=>"ö",
+            "Õ"=>"õ","Ô"=>"ô","Ó"=>"ó","Ò"=>"ò","Ñ"=>"ñ","Ð"=>"ð","Ï"=>"ï","Î"=>"î","Í"=>"í","Ì"=>"ì",
+            "Ë"=>"ë","Ê"=>"ê","É"=>"é","È"=>"è","Ç"=>"ç","Æ"=>"æ","Å"=>"å","Ä"=>"ä","Ã"=>"ã","Â"=>"â",
+            "Á"=>"á","À"=>"à","Μ"=>"µ","Z"=>"z","Y"=>"y","X"=>"x","W"=>"w","V"=>"v","U"=>"u","T"=>"t",
+            "S"=>"s","R"=>"r","Q"=>"q","P"=>"p","O"=>"o","N"=>"n","M"=>"m","L"=>"l","K"=>"k","J"=>"j",
+            "I"=>"i","H"=>"h","G"=>"g","F"=>"f","E"=>"e","D"=>"d","C"=>"c","B"=>"b","A"=>"a"
+                );
+}; // end of case lookup tables
+
+/**
+ * UTF-8 lookup table for lower case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are lower case letters only.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_deaccent()
+ */
+global $UTF8_LOWER_ACCENTS;
+if(empty($UTF8_LOWER_ACCENTS)) $UTF8_LOWER_ACCENTS = array(
+  'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
+  'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
+  'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
+  'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o',
+  'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c',
+  'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't',
+  'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l',
+  'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
+  'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't',
+  'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o',
+  'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j',
+  'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o',
+  'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
+  'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
+  'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
+);
+
+/**
+ * UTF-8 lookup table for upper case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are upper case letters only.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_deaccent()
+ */
+global $UTF8_UPPER_ACCENTS;
+if(empty($UTF8_UPPER_ACCENTS)) $UTF8_UPPER_ACCENTS = array(
+  'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
+  'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
+  'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
+  'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O',
+  'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C',
+  'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T',
+  'Ū' => 'U', 'Č' => 'C', 'Ö' => 'Oe', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L',
+  'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z',
+  'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T',
+  'Ŗ' => 'R', 'Ä' => 'Ae', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'Ue', 'Ò' => 'O',
+  'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J',
+  'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O',
+  'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
+  'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
+  'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
+);
+
+/**
+ * UTF-8 array of common special characters
+ *
+ * This array should contain all special characters (not a letter or digit)
+ * defined in the various local charsets - it's not a complete list of non-alphanum
+ * characters in UTF-8. It's not perfect but should match most cases of special
+ * chars.
+ *
+ * The controlchars 0x00 to 0x19 are _not_ included in this array. The space 0x20 is!
+ * These chars are _not_ in the array either:  _ (0x5f), : 0x3a, . 0x2e, - 0x2d, * 0x2a
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @see    utf8_stripspecials()
+ */
+global $UTF8_SPECIAL_CHARS;
+if(empty($UTF8_SPECIAL_CHARS)) $UTF8_SPECIAL_CHARS = array(
+  0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023,
+  0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029,         0x002b, 0x002c,
+          0x002f,         0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x005b,
+  0x005c, 0x005d, 0x005e,         0x0060, 0x007b, 0x007c, 0x007d, 0x007e,
+  0x007f, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092,
+  0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c,
+  0x009d, 0x009e, 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6,
+  0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba,
+  0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00d7, 0x00f7, 0x02c7, 0x02d8, 0x02d9,
+  0x02da, 0x02db, 0x02dc, 0x02dd, 0x0300, 0x0301, 0x0303, 0x0309, 0x0323, 0x0384,
+  0x0385, 0x0387, 0x03c6, 0x03d1, 0x03d2, 0x03d5, 0x03d6, 0x05b0, 0x05b1,
+  0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05bb, 0x05bc,
+  0x05bd, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f3, 0x05f4, 0x060c,
+  0x061b, 0x061f, 0x0640, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651,
+  0x0652, 0x066a, 0x0e3f, 0x200c, 0x200d, 0x200e, 0x200f, 0x2013, 0x2014, 0x2015,
+  0x2017, 0x2018, 0x2019, 0x201a, 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2022,
+  0x2026, 0x2030, 0x2032, 0x2033, 0x2039, 0x203a, 0x2044, 0x20a7, 0x20aa, 0x20ab,
+  0x20ac, 0x2116, 0x2118, 0x2122, 0x2126, 0x2135, 0x2190, 0x2191, 0x2192, 0x2193,
+  0x2194, 0x2195, 0x21b5, 0x21d0, 0x21d1, 0x21d2, 0x21d3, 0x21d4, 0x2200, 0x2202,
+  0x2203, 0x2205, 0x2206, 0x2207, 0x2208, 0x2209, 0x220b, 0x220f, 0x2211, 0x2212,
+  0x2215, 0x2217, 0x2219, 0x221a, 0x221d, 0x221e, 0x2220, 0x2227, 0x2228, 0x2229,
+  0x222a, 0x222b, 0x2234, 0x223c, 0x2245, 0x2248, 0x2260, 0x2261, 0x2264, 0x2265,
+  0x2282, 0x2283, 0x2284, 0x2286, 0x2287, 0x2295, 0x2297, 0x22a5, 0x22c5, 0x2310,
+  0x2320, 0x2321, 0x2329, 0x232a, 0x2469, 0x2500, 0x2502, 0x250c, 0x2510, 0x2514,
+  0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2550, 0x2551, 0x2552, 0x2553,
+  0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d,
+  0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+  0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
+  0x2591, 0x2592, 0x2593, 0x25a0, 0x25b2, 0x25bc, 0x25c6, 0x25ca, 0x25cf, 0x25d7,
+  0x2605, 0x260e, 0x261b, 0x261e, 0x2660, 0x2663, 0x2665, 0x2666, 0x2701, 0x2702,
+  0x2703, 0x2704, 0x2706, 0x2707, 0x2708, 0x2709, 0x270c, 0x270d, 0x270e, 0x270f,
+  0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719,
+  0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 0x2720, 0x2721, 0x2722, 0x2723,
+  0x2724, 0x2725, 0x2726, 0x2727, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e,
+  0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738,
+  0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2742,
+  0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274d,
+  0x274f, 0x2750, 0x2751, 0x2752, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
+  0x275d, 0x275e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x277f,
+  0x2789, 0x2793, 0x2794, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e,
+  0x279f, 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8,
+  0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 0x27b1, 0x27b2, 0x27b3,
+  0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd,
+  0x27be, 0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c,
+  0x300d, 0x300e, 0x300f, 0x3010, 0x3011, 0x3012, 0x3014, 0x3015, 0x3016, 0x3017,
+  0x3018, 0x3019, 0x301a, 0x301b, 0x3036,
+  0xf6d9, 0xf6da, 0xf6db, 0xf8d7, 0xf8d8, 0xf8d9, 0xf8da, 0xf8db, 0xf8dc,
+  0xf8dd, 0xf8de, 0xf8df, 0xf8e0, 0xf8e1, 0xf8e2, 0xf8e3, 0xf8e4, 0xf8e5, 0xf8e6,
+  0xf8e7, 0xf8e8, 0xf8e9, 0xf8ea, 0xf8eb, 0xf8ec, 0xf8ed, 0xf8ee, 0xf8ef, 0xf8f0,
+  0xf8f1, 0xf8f2, 0xf8f3, 0xf8f4, 0xf8f5, 0xf8f6, 0xf8f7, 0xf8f8, 0xf8f9, 0xf8fa,
+  0xf8fb, 0xf8fc, 0xf8fd, 0xf8fe, 0xfe7c, 0xfe7d,
+          0xff01, 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08, 0xff09,
+  0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff1a, 0xff1b, 0xff1c,
+  0xff1d, 0xff1e, 0xff1f, 0xff20, 0xff3b, 0xff3c, 0xff3d, 0xff3e, 0xff40, 0xff5b,
+  0xff5c, 0xff5d, 0xff5e, 0xff5f, 0xff60, 0xff61, 0xff62, 0xff63, 0xff64, 0xff65,
+  0xffe0, 0xffe1, 0xffe2, 0xffe3, 0xffe4, 0xffe5, 0xffe6, 0xffe8, 0xffe9, 0xffea,
+  0xffeb, 0xffec, 0xffed, 0xffee,
+  0x01d6fc, 0x01d6fd, 0x01d6fe, 0x01d6ff, 0x01d700, 0x01d701, 0x01d702, 0x01d703,
+  0x01d704, 0x01d705, 0x01d706, 0x01d707, 0x01d708, 0x01d709, 0x01d70a, 0x01d70b,
+  0x01d70c, 0x01d70d, 0x01d70e, 0x01d70f, 0x01d710, 0x01d711, 0x01d712, 0x01d713,
+  0x01d714, 0x01d715, 0x01d716, 0x01d717, 0x01d718, 0x01d719, 0x01d71a, 0x01d71b,
+  0xc2a0, 0xe28087, 0xe280af, 0xe281a0, 0xefbbbf,
+);
+
+// utf8 version of above data
+global $UTF8_SPECIAL_CHARS2;
+if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 =
+    "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~�'.
+    '� ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½�'.
+    '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
+    '�ׁׂ׃׳״،؛؟ـًٌٍَُِّْ٪฿‌‍‎‏–—―‗‘’‚“”�'.
+    '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'.
+    '⇐⇑⇒⇓⇔∀∂∃∅∆∇∈∉∋∏∑−∕∗∙√∝∞∠∧∨�'.
+    '�∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌐⌠⌡〈〉⑩─�'.
+    '��┌┐└┘├┤┬┴┼═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠'.
+    '╡╢╣╤╥╦╧╨╩╪╫╬▀▄█▌▐░▒▓■▲▼◆◊●�'.
+    '�★☎☛☞♠♣♥♦✁✂✃✄✆✇✈✉✌✍✎✏✐✑✒✓✔✕�'.
+    '��✗✘✙✚✛✜✝✞✟✠✡✢✣✤✥✦✧✩✪✫✬✭✮✯✰✱'.
+    '✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❄❅❆❇❈❉❊❋�'.
+    '�❏❐❑❒❖❘❙❚❛❜❝❞❡❢❣❤❥❦❧❿➉➓➔➘➙➚�'.
+    '��➜➝➞➟➠➡➢➣➤➥➦➧➨➩➪➫➬➭➮➯➱➲➳➴➵➶'.
+    '➷➸➹➺➻➼➽➾'.
+    '　、。〃〈〉《》「」『』【】〒〔〕〖〗〘〙〚〛〶'.
+    '�'.
+    '�ﹼﹽ'.
+    '！＂＃＄％＆＇（）＊＋，－．／：；＜＝＞？＠［＼］＾｀｛｜｝～'.
+    '｟｠｡｢｣､･￠￡￢￣￤￥￦￨￩￪￫￬￭￮'.
+    '𝛼𝛽𝛾𝛿𝜀𝜁𝜂𝜃𝜄𝜅𝜆𝜇𝜈𝜉𝜊𝜋𝜌𝜍𝜎𝜏𝜐𝜑𝜒𝜓𝜔𝜕𝜖𝜗𝜘𝜙𝜚𝜛'.
+    '   ⁠';
+
+/**
+ * Romanization lookup table
+ *
+ * This lookup tables provides a way to transform strings written in a language
+ * different from the ones based upon latin letters into plain ASCII.
+ *
+ * Please note: this is not a scientific transliteration table. It only works
+ * oneway from nonlatin to ASCII and it works by simple character replacement
+ * only. Specialities of each language are not supported.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Vitaly Blokhin <vitinfo@vitn.com>
+ * @link   http://www.uconv.com/translit.htm
+ * @author Bisqwit <bisqwit@iki.fi>
+ * @link   http://kanjidict.stc.cx/hiragana.php?src=2
+ * @link   http://www.translatum.gr/converter/greek-transliteration.htm
+ * @link   http://en.wikipedia.org/wiki/Royal_Thai_General_System_of_Transcription
+ * @link   http://www.btranslations.com/resources/romanization/korean.asp
+ * @author Arthit Suriyawongkul <arthit@gmail.com>
+ * @author Denis Scheither <amorphis@uni-bremen.de>
+ */
+global $UTF8_ROMANIZATION;
+if(empty($UTF8_ROMANIZATION)) $UTF8_ROMANIZATION = array(
+  // scandinavian - differs from what we do in deaccent
+  'å'=>'a','Å'=>'A','ä'=>'a','Ä'=>'A','ö'=>'o','Ö'=>'O',
+
+  //russian cyrillic
+  'а'=>'a','А'=>'A','б'=>'b','Б'=>'B','в'=>'v','В'=>'V','г'=>'g','Г'=>'G',
+  'д'=>'d','Д'=>'D','е'=>'e','Е'=>'E','ё'=>'jo','Ё'=>'Jo','ж'=>'zh','Ж'=>'Zh',
+  'з'=>'z','З'=>'Z','и'=>'i','И'=>'I','й'=>'j','Й'=>'J','к'=>'k','К'=>'K',
+  'л'=>'l','Л'=>'L','м'=>'m','М'=>'M','н'=>'n','Н'=>'N','о'=>'o','О'=>'O',
+  'п'=>'p','П'=>'P','р'=>'r','Р'=>'R','с'=>'s','С'=>'S','т'=>'t','Т'=>'T',
+  'у'=>'u','У'=>'U','ф'=>'f','Ф'=>'F','х'=>'x','Х'=>'X','ц'=>'c','Ц'=>'C',
+  'ч'=>'ch','Ч'=>'Ch','ш'=>'sh','Ш'=>'Sh','щ'=>'sch','Щ'=>'Sch','ъ'=>'',
+  'Ъ'=>'','ы'=>'y','Ы'=>'Y','ь'=>'','Ь'=>'','э'=>'eh','Э'=>'Eh','ю'=>'ju',
+  'Ю'=>'Ju','я'=>'ja','Я'=>'Ja',
+  // Ukrainian cyrillic
+  'Ґ'=>'Gh','ґ'=>'gh','Є'=>'Je','є'=>'je','І'=>'I','і'=>'i','Ї'=>'Ji','ї'=>'ji',
+  // Georgian
+  'ა'=>'a','ბ'=>'b','გ'=>'g','დ'=>'d','ე'=>'e','ვ'=>'v','ზ'=>'z','თ'=>'th',
+  'ი'=>'i','კ'=>'p','ლ'=>'l','მ'=>'m','ნ'=>'n','ო'=>'o','პ'=>'p','ჟ'=>'zh',
+  'რ'=>'r','ს'=>'s','ტ'=>'t','უ'=>'u','ფ'=>'ph','ქ'=>'kh','ღ'=>'gh','ყ'=>'q',
+  'შ'=>'sh','ჩ'=>'ch','ც'=>'c','ძ'=>'dh','წ'=>'w','ჭ'=>'j','ხ'=>'x','ჯ'=>'jh',
+  'ჰ'=>'xh',
+  //Sanskrit
+  'अ'=>'a','आ'=>'ah','इ'=>'i','ई'=>'ih','उ'=>'u','ऊ'=>'uh','ऋ'=>'ry',
+  'ॠ'=>'ryh','ऌ'=>'ly','ॡ'=>'lyh','ए'=>'e','ऐ'=>'ay','ओ'=>'o','औ'=>'aw',
+  'अं'=>'amh','अः'=>'aq','क'=>'k','ख'=>'kh','ग'=>'g','घ'=>'gh','ङ'=>'nh',
+  'च'=>'c','छ'=>'ch','ज'=>'j','झ'=>'jh','ञ'=>'ny','ट'=>'tq','ठ'=>'tqh',
+  'ड'=>'dq','ढ'=>'dqh','ण'=>'nq','त'=>'t','थ'=>'th','द'=>'d','ध'=>'dh',
+  'न'=>'n','प'=>'p','फ'=>'ph','ब'=>'b','भ'=>'bh','म'=>'m','य'=>'z','र'=>'r',
+  'ल'=>'l','व'=>'v','श'=>'sh','ष'=>'sqh','स'=>'s','ह'=>'x',
+  //Hebrew
+  'א'=>'a', 'ב'=>'b','ג'=>'g','ד'=>'d','ה'=>'h','ו'=>'v','ז'=>'z','ח'=>'kh','ט'=>'th',
+  'י'=>'y','ך'=>'h','כ'=>'k','ל'=>'l','ם'=>'m','מ'=>'m','ן'=>'n','נ'=>'n',
+  'ס'=>'s','ע'=>'ah','ף'=>'f','פ'=>'p','ץ'=>'c','צ'=>'c','ק'=>'q','ר'=>'r',
+  'ש'=>'sh','ת'=>'t',
+  //Arabic
+  'ا'=>'a','ب'=>'b','ت'=>'t','ث'=>'th','ج'=>'g','ح'=>'xh','خ'=>'x','د'=>'d',
+  'ذ'=>'dh','ر'=>'r','ز'=>'z','س'=>'s','ش'=>'sh','ص'=>'s\'','ض'=>'d\'',
+  'ط'=>'t\'','ظ'=>'z\'','ع'=>'y','غ'=>'gh','ف'=>'f','ق'=>'q','ك'=>'k',
+  'ل'=>'l','م'=>'m','ن'=>'n','ه'=>'x\'','و'=>'u','ي'=>'i',
+
+  // Japanese characters  (last update: 2008-05-09)
+
+  // Japanese hiragana
+
+  // 3 character syllables, っ doubles the consonant after
+  'っちゃ'=>'ccha','っちぇ'=>'cche','っちょ'=>'ccho','っちゅ'=>'cchu',
+  'っびゃ'=>'bbya','っびぇ'=>'bbye','っびぃ'=>'bbyi','っびょ'=>'bbyo','っびゅ'=>'bbyu',
+  'っぴゃ'=>'ppya','っぴぇ'=>'ppye','っぴぃ'=>'ppyi','っぴょ'=>'ppyo','っぴゅ'=>'ppyu',
+  'っちゃ'=>'ccha','っちぇ'=>'cche','っち'=>'cchi','っちょ'=>'ccho','っちゅ'=>'cchu',
+  // 'っひゃ'=>'hya','っひぇ'=>'hye','っひぃ'=>'hyi','っひょ'=>'hyo','っひゅ'=>'hyu',
+  'っきゃ'=>'kkya','っきぇ'=>'kkye','っきぃ'=>'kkyi','っきょ'=>'kkyo','っきゅ'=>'kkyu',
+  'っぎゃ'=>'ggya','っぎぇ'=>'ggye','っぎぃ'=>'ggyi','っぎょ'=>'ggyo','っぎゅ'=>'ggyu',
+  'っみゃ'=>'mmya','っみぇ'=>'mmye','っみぃ'=>'mmyi','っみょ'=>'mmyo','っみゅ'=>'mmyu',
+  'っにゃ'=>'nnya','っにぇ'=>'nnye','っにぃ'=>'nnyi','っにょ'=>'nnyo','っにゅ'=>'nnyu',
+  'っりゃ'=>'rrya','っりぇ'=>'rrye','っりぃ'=>'rryi','っりょ'=>'rryo','っりゅ'=>'rryu',
+  'っしゃ'=>'ssha','っしぇ'=>'sshe','っし'=>'sshi','っしょ'=>'ssho','っしゅ'=>'sshu',
+
+  // seperate hiragana 'n' ('n' + 'i' != 'ni', normally we would write "kon'nichi wa" but the apostrophe would be converted to _ anyway)
+  'んあ'=>'n_a','んえ'=>'n_e','んい'=>'n_i','んお'=>'n_o','んう'=>'n_u',
+  'んや'=>'n_ya','んよ'=>'n_yo','んゆ'=>'n_yu',
+
+   // 2 character syllables - normal
+  'ふぁ'=>'fa','ふぇ'=>'fe','ふぃ'=>'fi','ふぉ'=>'fo',
+  'ちゃ'=>'cha','ちぇ'=>'che','ち'=>'chi','ちょ'=>'cho','ちゅ'=>'chu',
+  'ひゃ'=>'hya','ひぇ'=>'hye','ひぃ'=>'hyi','ひょ'=>'hyo','ひゅ'=>'hyu',
+  'びゃ'=>'bya','びぇ'=>'bye','びぃ'=>'byi','びょ'=>'byo','びゅ'=>'byu',
+  'ぴゃ'=>'pya','ぴぇ'=>'pye','ぴぃ'=>'pyi','ぴょ'=>'pyo','ぴゅ'=>'pyu',
+  'きゃ'=>'kya','きぇ'=>'kye','きぃ'=>'kyi','きょ'=>'kyo','きゅ'=>'kyu',
+  'ぎゃ'=>'gya','ぎぇ'=>'gye','ぎぃ'=>'gyi','ぎょ'=>'gyo','ぎゅ'=>'gyu',
+  'みゃ'=>'mya','みぇ'=>'mye','みぃ'=>'myi','みょ'=>'myo','みゅ'=>'myu',
+  'にゃ'=>'nya','にぇ'=>'nye','にぃ'=>'nyi','にょ'=>'nyo','にゅ'=>'nyu',
+  'りゃ'=>'rya','りぇ'=>'rye','りぃ'=>'ryi','りょ'=>'ryo','りゅ'=>'ryu',
+  'しゃ'=>'sha','しぇ'=>'she','し'=>'shi','しょ'=>'sho','しゅ'=>'shu',
+  'じゃ'=>'ja','じぇ'=>'je','じょ'=>'jo','じゅ'=>'ju',
+  'うぇ'=>'we','うぃ'=>'wi',
+  'いぇ'=>'ye',
+
+  // 2 character syllables, っ doubles the consonant after
+  'っば'=>'bba','っべ'=>'bbe','っび'=>'bbi','っぼ'=>'bbo','っぶ'=>'bbu',
+  'っぱ'=>'ppa','っぺ'=>'ppe','っぴ'=>'ppi','っぽ'=>'ppo','っぷ'=>'ppu',
+  'った'=>'tta','って'=>'tte','っち'=>'cchi','っと'=>'tto','っつ'=>'ttsu',
+  'っだ'=>'dda','っで'=>'dde','っぢ'=>'ddi','っど'=>'ddo','っづ'=>'ddu',
+  'っが'=>'gga','っげ'=>'gge','っぎ'=>'ggi','っご'=>'ggo','っぐ'=>'ggu',
+  'っか'=>'kka','っけ'=>'kke','っき'=>'kki','っこ'=>'kko','っく'=>'kku',
+  'っま'=>'mma','っめ'=>'mme','っみ'=>'mmi','っも'=>'mmo','っむ'=>'mmu',
+  'っな'=>'nna','っね'=>'nne','っに'=>'nni','っの'=>'nno','っぬ'=>'nnu',
+  'っら'=>'rra','っれ'=>'rre','っり'=>'rri','っろ'=>'rro','っる'=>'rru',
+  'っさ'=>'ssa','っせ'=>'sse','っし'=>'sshi','っそ'=>'sso','っす'=>'ssu',
+  'っざ'=>'zza','っぜ'=>'zze','っじ'=>'jji','っぞ'=>'zzo','っず'=>'zzu',
+
+  // 1 character syllabels
+  'あ'=>'a','え'=>'e','い'=>'i','お'=>'o','う'=>'u','ん'=>'n',
+  'は'=>'ha','へ'=>'he','ひ'=>'hi','ほ'=>'ho','ふ'=>'fu',
+  'ば'=>'ba','べ'=>'be','び'=>'bi','ぼ'=>'bo','ぶ'=>'bu',
+  'ぱ'=>'pa','ぺ'=>'pe','ぴ'=>'pi','ぽ'=>'po','ぷ'=>'pu',
+  'た'=>'ta','て'=>'te','ち'=>'chi','と'=>'to','つ'=>'tsu',
+  'だ'=>'da','で'=>'de','ぢ'=>'di','ど'=>'do','づ'=>'du',
+  'が'=>'ga','げ'=>'ge','ぎ'=>'gi','ご'=>'go','ぐ'=>'gu',
+  'か'=>'ka','け'=>'ke','き'=>'ki','こ'=>'ko','く'=>'ku',
+  'ま'=>'ma','め'=>'me','み'=>'mi','も'=>'mo','む'=>'mu',
+  'な'=>'na','ね'=>'ne','に'=>'ni','の'=>'no','ぬ'=>'nu',
+  'ら'=>'ra','れ'=>'re','り'=>'ri','ろ'=>'ro','る'=>'ru',
+  'さ'=>'sa','せ'=>'se','し'=>'shi','そ'=>'so','す'=>'su',
+  'わ'=>'wa','を'=>'wo',
+  'ざ'=>'za','ぜ'=>'ze','じ'=>'ji','ぞ'=>'zo','ず'=>'zu',
+  'や'=>'ya','よ'=>'yo','ゆ'=>'yu',
+  // old characters
+  'ゑ'=>'we','ゐ'=>'wi',
+
+  //  convert what's left (probably only kicks in when something's missing above)
+  // 'ぁ'=>'a','ぇ'=>'e','ぃ'=>'i','ぉ'=>'o','ぅ'=>'u',
+  // 'ゃ'=>'ya','ょ'=>'yo','ゅ'=>'yu',
+
+  // never seen one of those (disabled for the moment)
+  // 'ヴぁ'=>'va','ヴぇ'=>'ve','ヴぃ'=>'vi','ヴぉ'=>'vo','ヴ'=>'vu',
+  // 'でゃ'=>'dha','でぇ'=>'dhe','でぃ'=>'dhi','でょ'=>'dho','でゅ'=>'dhu',
+  // 'どぁ'=>'dwa','どぇ'=>'dwe','どぃ'=>'dwi','どぉ'=>'dwo','どぅ'=>'dwu',
+  // 'ぢゃ'=>'dya','ぢぇ'=>'dye','ぢぃ'=>'dyi','ぢょ'=>'dyo','ぢゅ'=>'dyu',
+  // 'ふぁ'=>'fwa','ふぇ'=>'fwe','ふぃ'=>'fwi','ふぉ'=>'fwo','ふぅ'=>'fwu',
+  // 'ふゃ'=>'fya','ふぇ'=>'fye','ふぃ'=>'fyi','ふょ'=>'fyo','ふゅ'=>'fyu',
+  // 'すぁ'=>'swa','すぇ'=>'swe','すぃ'=>'swi','すぉ'=>'swo','すぅ'=>'swu',
+  // 'てゃ'=>'tha','てぇ'=>'the','てぃ'=>'thi','てょ'=>'tho','てゅ'=>'thu',
+  // 'つゃ'=>'tsa','つぇ'=>'tse','つぃ'=>'tsi','つょ'=>'tso','つ'=>'tsu',
+  // 'とぁ'=>'twa','とぇ'=>'twe','とぃ'=>'twi','とぉ'=>'two','とぅ'=>'twu',
+  // 'ヴゃ'=>'vya','ヴぇ'=>'vye','ヴぃ'=>'vyi','ヴょ'=>'vyo','ヴゅ'=>'vyu',
+  // 'うぁ'=>'wha','うぇ'=>'whe','うぃ'=>'whi','うぉ'=>'who','うぅ'=>'whu',
+  // 'じゃ'=>'zha','じぇ'=>'zhe','じぃ'=>'zhi','じょ'=>'zho','じゅ'=>'zhu',
+  // 'じゃ'=>'zya','じぇ'=>'zye','じぃ'=>'zyi','じょ'=>'zyo','じゅ'=>'zyu',
+
+  // 'spare' characters from other romanization systems
+  // 'だ'=>'da','で'=>'de','ぢ'=>'di','ど'=>'do','づ'=>'du',
+  // 'ら'=>'la','れ'=>'le','り'=>'li','ろ'=>'lo','る'=>'lu',
+  // 'さ'=>'sa','せ'=>'se','し'=>'si','そ'=>'so','す'=>'su',
+  // 'ちゃ'=>'cya','ちぇ'=>'cye','ちぃ'=>'cyi','ちょ'=>'cyo','ちゅ'=>'cyu',
+  //'じゃ'=>'jya','じぇ'=>'jye','じぃ'=>'jyi','じょ'=>'jyo','じゅ'=>'jyu',
+  //'りゃ'=>'lya','りぇ'=>'lye','りぃ'=>'lyi','りょ'=>'lyo','りゅ'=>'lyu',
+  //'しゃ'=>'sya','しぇ'=>'sye','しぃ'=>'syi','しょ'=>'syo','しゅ'=>'syu',
+  //'ちゃ'=>'tya','ちぇ'=>'tye','ちぃ'=>'tyi','ちょ'=>'tyo','ちゅ'=>'tyu',
+  //'し'=>'ci',,い'=>'yi','ぢ'=>'dzi',
+  //'っじゃ'=>'jja','っじぇ'=>'jje','っじ'=>'jji','っじょ'=>'jjo','っじゅ'=>'jju',
+
+
+  // Japanese katakana
+
+  // 4 character syllables: ッ doubles the consonant after, ー doubles the vowel before (usualy written with macron, but we don't want that in our URLs)
+  'ッビャー'=>'bbyaa','ッビェー'=>'bbyee','ッビィー'=>'bbyii','ッビョー'=>'bbyoo','ッビュー'=>'bbyuu',
+  'ッピャー'=>'ppyaa','ッピェー'=>'ppyee','ッピィー'=>'ppyii','ッピョー'=>'ppyoo','ッピュー'=>'ppyuu',
+  'ッキャー'=>'kkyaa','ッキェー'=>'kkyee','ッキィー'=>'kkyii','ッキョー'=>'kkyoo','ッキュー'=>'kkyuu',
+  'ッギャー'=>'ggyaa','ッギェー'=>'ggyee','ッギィー'=>'ggyii','ッギョー'=>'ggyoo','ッギュー'=>'ggyuu',
+  'ッミャー'=>'mmyaa','ッミェー'=>'mmyee','ッミィー'=>'mmyii','ッミョー'=>'mmyoo','ッミュー'=>'mmyuu',
+  'ッニャー'=>'nnyaa','ッニェー'=>'nnyee','ッニィー'=>'nnyii','ッニョー'=>'nnyoo','ッニュー'=>'nnyuu',
+  'ッリャー'=>'rryaa','ッリェー'=>'rryee','ッリィー'=>'rryii','ッリョー'=>'rryoo','ッリュー'=>'rryuu',
+  'ッシャー'=>'sshaa','ッシェー'=>'sshee','ッシー'=>'sshii','ッショー'=>'sshoo','ッシュー'=>'sshuu',
+  'ッチャー'=>'cchaa','ッチェー'=>'cchee','ッチー'=>'cchii','ッチョー'=>'cchoo','ッチュー'=>'cchuu',
+  'ッティー'=>'ttii',
+  'ッヂィー'=>'ddii',
+
+  // 3 character syllables - doubled vowels
+  'ファー'=>'faa','フェー'=>'fee','フィー'=>'fii','フォー'=>'foo',
+  'フャー'=>'fyaa','フェー'=>'fyee','フィー'=>'fyii','フョー'=>'fyoo','フュー'=>'fyuu',
+  'ヒャー'=>'hyaa','ヒェー'=>'hyee','ヒィー'=>'hyii','ヒョー'=>'hyoo','ヒュー'=>'hyuu',
+  'ビャー'=>'byaa','ビェー'=>'byee','ビィー'=>'byii','ビョー'=>'byoo','ビュー'=>'byuu',
+  'ピャー'=>'pyaa','ピェー'=>'pyee','ピィー'=>'pyii','ピョー'=>'pyoo','ピュー'=>'pyuu',
+  'キャー'=>'kyaa','キェー'=>'kyee','キィー'=>'kyii','キョー'=>'kyoo','キュー'=>'kyuu',
+  'ギャー'=>'gyaa','ギェー'=>'gyee','ギィー'=>'gyii','ギョー'=>'gyoo','ギュー'=>'gyuu',
+  'ミャー'=>'myaa','ミェー'=>'myee','ミィー'=>'myii','ミョー'=>'myoo','ミュー'=>'myuu',
+  'ニャー'=>'nyaa','ニェー'=>'nyee','ニィー'=>'nyii','ニョー'=>'nyoo','ニュー'=>'nyuu',
+  'リャー'=>'ryaa','リェー'=>'ryee','リィー'=>'ryii','リョー'=>'ryoo','リュー'=>'ryuu',
+  'シャー'=>'shaa','シェー'=>'shee','シー'=>'shii','ショー'=>'shoo','シュー'=>'shuu',
+  'ジャー'=>'jaa','ジェー'=>'jee','ジー'=>'jii','ジョー'=>'joo','ジュー'=>'juu',
+  'スァー'=>'swaa','スェー'=>'swee','スィー'=>'swii','スォー'=>'swoo','スゥー'=>'swuu',
+  'デァー'=>'daa','デェー'=>'dee','ディー'=>'dii','デォー'=>'doo','デゥー'=>'duu',
+  'チャー'=>'chaa','チェー'=>'chee','チー'=>'chii','チョー'=>'choo','チュー'=>'chuu',
+  'ヂャー'=>'dyaa','ヂェー'=>'dyee','ヂィー'=>'dyii','ヂョー'=>'dyoo','ヂュー'=>'dyuu',
+  'ツャー'=>'tsaa','ツェー'=>'tsee','ツィー'=>'tsii','ツョー'=>'tsoo','ツー'=>'tsuu',
+  'トァー'=>'twaa','トェー'=>'twee','トィー'=>'twii','トォー'=>'twoo','トゥー'=>'twuu',
+  'ドァー'=>'dwaa','ドェー'=>'dwee','ドィー'=>'dwii','ドォー'=>'dwoo','ドゥー'=>'dwuu',
+  'ウァー'=>'whaa','ウェー'=>'whee','ウィー'=>'whii','ウォー'=>'whoo','ウゥー'=>'whuu',
+  'ヴャー'=>'vyaa','ヴェー'=>'vyee','ヴィー'=>'vyii','ヴョー'=>'vyoo','ヴュー'=>'vyuu',
+  'ヴァー'=>'vaa','ヴェー'=>'vee','ヴィー'=>'vii','ヴォー'=>'voo','ヴー'=>'vuu',
+  'ウェー'=>'wee','ウィー'=>'wii',
+  'イェー'=>'yee',
+  'ティー'=>'tii',
+  'ヂィー'=>'dii',
+
+  // 3 character syllables - doubled consonants
+  'ッビャ'=>'bbya','ッビェ'=>'bbye','ッビィ'=>'bbyi','ッビョ'=>'bbyo','ッビュ'=>'bbyu',
+  'ッピャ'=>'ppya','ッピェ'=>'ppye','ッピィ'=>'ppyi','ッピョ'=>'ppyo','ッピュ'=>'ppyu',
+  'ッキャ'=>'kkya','ッキェ'=>'kkye','ッキィ'=>'kkyi','ッキョ'=>'kkyo','ッキュ'=>'kkyu',
+  'ッギャ'=>'ggya','ッギェ'=>'ggye','ッギィ'=>'ggyi','ッギョ'=>'ggyo','ッギュ'=>'ggyu',
+  'ッミャ'=>'mmya','ッミェ'=>'mmye','ッミィ'=>'mmyi','ッミョ'=>'mmyo','ッミュ'=>'mmyu',
+  'ッニャ'=>'nnya','ッニェ'=>'nnye','ッニィ'=>'nnyi','ッニョ'=>'nnyo','ッニュ'=>'nnyu',
+  'ッリャ'=>'rrya','ッリェ'=>'rrye','ッリィ'=>'rryi','ッリョ'=>'rryo','ッリュ'=>'rryu',
+  'ッシャ'=>'ssha','ッシェ'=>'sshe','ッシ'=>'sshi','ッショ'=>'ssho','ッシュ'=>'sshu',
+  'ッチャ'=>'ccha','ッチェ'=>'cche','ッチ'=>'cchi','ッチョ'=>'ccho','ッチュ'=>'cchu',
+  'ッティ'=>'tti',
+  'ッヂィ'=>'ddi',
+
+  // 3 character syllables - doubled vowel and consonants
+  'ッバー'=>'bbaa','ッベー'=>'bbee','ッビー'=>'bbii','ッボー'=>'bboo','ッブー'=>'bbuu',
+  'ッパー'=>'ppaa','ッペー'=>'ppee','ッピー'=>'ppii','ッポー'=>'ppoo','ップー'=>'ppuu',
+  'ッケー'=>'kkee','ッキー'=>'kkii','ッコー'=>'kkoo','ックー'=>'kkuu','ッカー'=>'kkaa',
+  'ッガー'=>'ggaa','ッゲー'=>'ggee','ッギー'=>'ggii','ッゴー'=>'ggoo','ッグー'=>'gguu',
+  'ッマー'=>'maa','ッメー'=>'mee','ッミー'=>'mii','ッモー'=>'moo','ッムー'=>'muu',
+  'ッナー'=>'nnaa','ッネー'=>'nnee','ッニー'=>'nnii','ッノー'=>'nnoo','ッヌー'=>'nnuu',
+  'ッラー'=>'rraa','ッレー'=>'rree','ッリー'=>'rrii','ッロー'=>'rroo','ッルー'=>'rruu',
+  'ッサー'=>'ssaa','ッセー'=>'ssee','ッシー'=>'sshii','ッソー'=>'ssoo','ッスー'=>'ssuu',
+  'ッザー'=>'zzaa','ッゼー'=>'zzee','ッジー'=>'jjii','ッゾー'=>'zzoo','ッズー'=>'zzuu',
+  'ッター'=>'ttaa','ッテー'=>'ttee','ッチー'=>'chii','ットー'=>'ttoo','ッツー'=>'ttsuu',
+  'ッダー'=>'ddaa','ッデー'=>'ddee','ッヂー'=>'ddii','ッドー'=>'ddoo','ッヅー'=>'dduu',
+
+  // 2 character syllables - normal
+  'ファ'=>'fa','フェ'=>'fe','フィ'=>'fi','フォ'=>'fo','フゥ'=>'fu',
+  // 'フャ'=>'fya','フェ'=>'fye','フィ'=>'fyi','フョ'=>'fyo','フュ'=>'fyu',
+  'フャ'=>'fa','フェ'=>'fe','フィ'=>'fi','フョ'=>'fo','フュ'=>'fu',
+  'ヒャ'=>'hya','ヒェ'=>'hye','ヒィ'=>'hyi','ヒョ'=>'hyo','ヒュ'=>'hyu',
+  'ビャ'=>'bya','ビェ'=>'bye','ビィ'=>'byi','ビョ'=>'byo','ビュ'=>'byu',
+  'ピャ'=>'pya','ピェ'=>'pye','ピィ'=>'pyi','ピョ'=>'pyo','ピュ'=>'pyu',
+  'キャ'=>'kya','キェ'=>'kye','キィ'=>'kyi','キョ'=>'kyo','キュ'=>'kyu',
+  'ギャ'=>'gya','ギェ'=>'gye','ギィ'=>'gyi','ギョ'=>'gyo','ギュ'=>'gyu',
+  'ミャ'=>'mya','ミェ'=>'mye','ミィ'=>'myi','ミョ'=>'myo','ミュ'=>'myu',
+  'ニャ'=>'nya','ニェ'=>'nye','ニィ'=>'nyi','ニョ'=>'nyo','ニュ'=>'nyu',
+  'リャ'=>'rya','リェ'=>'rye','リィ'=>'ryi','リョ'=>'ryo','リュ'=>'ryu',
+  'シャ'=>'sha','シェ'=>'she','ショ'=>'sho','シュ'=>'shu',
+  'ジャ'=>'ja','ジェ'=>'je','ジョ'=>'jo','ジュ'=>'ju',
+  'スァ'=>'swa','スェ'=>'swe','スィ'=>'swi','スォ'=>'swo','スゥ'=>'swu',
+  'デァ'=>'da','デェ'=>'de','ディ'=>'di','デォ'=>'do','デゥ'=>'du',
+  'チャ'=>'cha','チェ'=>'che','チ'=>'chi','チョ'=>'cho','チュ'=>'chu',
+  // 'ヂャ'=>'dya','ヂェ'=>'dye','ヂィ'=>'dyi','ヂョ'=>'dyo','ヂュ'=>'dyu',
+  'ツャ'=>'tsa','ツェ'=>'tse','ツィ'=>'tsi','ツョ'=>'tso','ツ'=>'tsu',
+  'トァ'=>'twa','トェ'=>'twe','トィ'=>'twi','トォ'=>'two','トゥ'=>'twu',
+  'ドァ'=>'dwa','ドェ'=>'dwe','ドィ'=>'dwi','ドォ'=>'dwo','ドゥ'=>'dwu',
+  'ウァ'=>'wha','ウェ'=>'whe','ウィ'=>'whi','ウォ'=>'who','ウゥ'=>'whu',
+  'ヴャ'=>'vya','ヴェ'=>'vye','ヴィ'=>'vyi','ヴョ'=>'vyo','ヴュ'=>'vyu',
+  'ヴァ'=>'va','ヴェ'=>'ve','ヴィ'=>'vi','ヴォ'=>'vo','ヴ'=>'vu',
+  'ウェ'=>'we','ウィ'=>'wi',
+  'イェ'=>'ye',
+  'ティ'=>'ti',
+  'ヂィ'=>'di',
+
+  // 2 character syllables - doubled vocal
+  'アー'=>'aa','エー'=>'ee','イー'=>'ii','オー'=>'oo','ウー'=>'uu',
+  'ダー'=>'daa','デー'=>'dee','ヂー'=>'dii','ドー'=>'doo','ヅー'=>'duu',
+  'ハー'=>'haa','ヘー'=>'hee','ヒー'=>'hii','ホー'=>'hoo','フー'=>'fuu',
+  'バー'=>'baa','ベー'=>'bee','ビー'=>'bii','ボー'=>'boo','ブー'=>'buu',
+  'パー'=>'paa','ペー'=>'pee','ピー'=>'pii','ポー'=>'poo','プー'=>'puu',
+  'ケー'=>'kee','キー'=>'kii','コー'=>'koo','クー'=>'kuu','カー'=>'kaa',
+  'ガー'=>'gaa','ゲー'=>'gee','ギー'=>'gii','ゴー'=>'goo','グー'=>'guu',
+  'マー'=>'maa','メー'=>'mee','ミー'=>'mii','モー'=>'moo','ムー'=>'muu',
+  'ナー'=>'naa','ネー'=>'nee','ニー'=>'nii','ノー'=>'noo','ヌー'=>'nuu',
+  'ラー'=>'raa','レー'=>'ree','リー'=>'rii','ロー'=>'roo','ルー'=>'ruu',
+  'サー'=>'saa','セー'=>'see','シー'=>'shii','ソー'=>'soo','スー'=>'suu',
+  'ザー'=>'zaa','ゼー'=>'zee','ジー'=>'jii','ゾー'=>'zoo','ズー'=>'zuu',
+  'ター'=>'taa','テー'=>'tee','チー'=>'chii','トー'=>'too','ツー'=>'tsuu',
+  'ワー'=>'waa','ヲー'=>'woo',
+  'ヤー'=>'yaa','ヨー'=>'yoo','ユー'=>'yuu',
+  'ヵー'=>'kaa','ヶー'=>'kee',
+  // old characters
+  'ヱー'=>'wee','ヰー'=>'wii',
+
+  // seperate katakana 'n'
+  'ンア'=>'n_a','ンエ'=>'n_e','ンイ'=>'n_i','ンオ'=>'n_o','ンウ'=>'n_u',
+  'ンヤ'=>'n_ya','ンヨ'=>'n_yo','ンユ'=>'n_yu',
+
+  // 2 character syllables - doubled consonants
+  'ッバ'=>'bba','ッベ'=>'bbe','ッビ'=>'bbi','ッボ'=>'bbo','ッブ'=>'bbu',
+  'ッパ'=>'ppa','ッペ'=>'ppe','ッピ'=>'ppi','ッポ'=>'ppo','ップ'=>'ppu',
+  'ッケ'=>'kke','ッキ'=>'kki','ッコ'=>'kko','ック'=>'kku','ッカ'=>'kka',
+  'ッガ'=>'gga','ッゲ'=>'gge','ッギ'=>'ggi','ッゴ'=>'ggo','ッグ'=>'ggu',
+  'ッマ'=>'ma','ッメ'=>'me','ッミ'=>'mi','ッモ'=>'mo','ッム'=>'mu',
+  'ッナ'=>'nna','ッネ'=>'nne','ッニ'=>'nni','ッノ'=>'nno','ッヌ'=>'nnu',
+  'ッラ'=>'rra','ッレ'=>'rre','ッリ'=>'rri','ッロ'=>'rro','ッル'=>'rru',
+  'ッサ'=>'ssa','ッセ'=>'sse','ッシ'=>'sshi','ッソ'=>'sso','ッス'=>'ssu',
+  'ッザ'=>'zza','ッゼ'=>'zze','ッジ'=>'jji','ッゾ'=>'zzo','ッズ'=>'zzu',
+  'ッタ'=>'tta','ッテ'=>'tte','ッチ'=>'cchi','ット'=>'tto','ッツ'=>'ttsu',
+  'ッダ'=>'dda','ッデ'=>'dde','ッヂ'=>'ddi','ッド'=>'ddo','ッヅ'=>'ddu',
+
+  // 1 character syllables
+  'ア'=>'a','エ'=>'e','イ'=>'i','オ'=>'o','ウ'=>'u','ン'=>'n',
+  'ハ'=>'ha','ヘ'=>'he','ヒ'=>'hi','ホ'=>'ho','フ'=>'fu',
+  'バ'=>'ba','ベ'=>'be','ビ'=>'bi','ボ'=>'bo','ブ'=>'bu',
+  'パ'=>'pa','ペ'=>'pe','ピ'=>'pi','ポ'=>'po','プ'=>'pu',
+  'ケ'=>'ke','キ'=>'ki','コ'=>'ko','ク'=>'ku','カ'=>'ka',
+  'ガ'=>'ga','ゲ'=>'ge','ギ'=>'gi','ゴ'=>'go','グ'=>'gu',
+  'マ'=>'ma','メ'=>'me','ミ'=>'mi','モ'=>'mo','ム'=>'mu',
+  'ナ'=>'na','ネ'=>'ne','ニ'=>'ni','ノ'=>'no','ヌ'=>'nu',
+  'ラ'=>'ra','レ'=>'re','リ'=>'ri','ロ'=>'ro','ル'=>'ru',
+  'サ'=>'sa','セ'=>'se','シ'=>'shi','ソ'=>'so','ス'=>'su',
+  'ザ'=>'za','ゼ'=>'ze','ジ'=>'ji','ゾ'=>'zo','ズ'=>'zu',
+  'タ'=>'ta','テ'=>'te','チ'=>'chi','ト'=>'to','ツ'=>'tsu',
+  'ダ'=>'da','デ'=>'de','ヂ'=>'di','ド'=>'do','ヅ'=>'du',
+  'ワ'=>'wa','ヲ'=>'wo',
+  'ヤ'=>'ya','ヨ'=>'yo','ユ'=>'yu',
+  'ヵ'=>'ka','ヶ'=>'ke',
+  // old characters
+  'ヱ'=>'we','ヰ'=>'wi',
+
+  //  convert what's left (probably only kicks in when something's missing above)
+  'ァ'=>'a','ェ'=>'e','ィ'=>'i','ォ'=>'o','ゥ'=>'u',
+  'ャ'=>'ya','ョ'=>'yo','ュ'=>'yu',
+
+  // special characters
+  '・'=>'_','、'=>'_',
+  'ー'=>'_', // when used with hiragana (seldom), this character would not be converted otherwise
+
+  // 'ラ'=>'la','レ'=>'le','リ'=>'li','ロ'=>'lo','ル'=>'lu',
+  // 'チャ'=>'cya','チェ'=>'cye','チィ'=>'cyi','チョ'=>'cyo','チュ'=>'cyu',
+  //'デャ'=>'dha','デェ'=>'dhe','ディ'=>'dhi','デョ'=>'dho','デュ'=>'dhu',
+  // 'リャ'=>'lya','リェ'=>'lye','リィ'=>'lyi','リョ'=>'lyo','リュ'=>'lyu',
+  // 'テャ'=>'tha','テェ'=>'the','ティ'=>'thi','テョ'=>'tho','テュ'=>'thu',
+  //'ファ'=>'fwa','フェ'=>'fwe','フィ'=>'fwi','フォ'=>'fwo','フゥ'=>'fwu',
+  //'チャ'=>'tya','チェ'=>'tye','チィ'=>'tyi','チョ'=>'tyo','チュ'=>'tyu',
+  // 'ジャ'=>'jya','ジェ'=>'jye','ジィ'=>'jyi','ジョ'=>'jyo','ジュ'=>'jyu',
+  // 'ジャ'=>'zha','ジェ'=>'zhe','ジィ'=>'zhi','ジョ'=>'zho','ジュ'=>'zhu',
+  //'ジャ'=>'zya','ジェ'=>'zye','ジィ'=>'zyi','ジョ'=>'zyo','ジュ'=>'zyu',
+  //'シャ'=>'sya','シェ'=>'sye','シィ'=>'syi','ショ'=>'syo','シュ'=>'syu',
+  //'シ'=>'ci','フ'=>'hu',シ'=>'si','チ'=>'ti','ツ'=>'tu','イ'=>'yi','ヂ'=>'dzi',
+
+  // "Greeklish"
+  'Γ'=>'G','Δ'=>'E','Θ'=>'Th','Λ'=>'L','Ξ'=>'X','Π'=>'P','Σ'=>'S','Φ'=>'F','Ψ'=>'Ps',
+  'γ'=>'g','δ'=>'e','θ'=>'th','λ'=>'l','ξ'=>'x','π'=>'p','σ'=>'s','φ'=>'f','ψ'=>'ps',
+
+  // Thai
+  'ก'=>'k','ข'=>'kh','ฃ'=>'kh','ค'=>'kh','ฅ'=>'kh','ฆ'=>'kh','ง'=>'ng','จ'=>'ch',
+  'ฉ'=>'ch','ช'=>'ch','ซ'=>'s','ฌ'=>'ch','ญ'=>'y','ฎ'=>'d','ฏ'=>'t','ฐ'=>'th',
+  'ฑ'=>'d','ฒ'=>'th','ณ'=>'n','ด'=>'d','ต'=>'t','ถ'=>'th','ท'=>'th','ธ'=>'th',
+  'น'=>'n','บ'=>'b','ป'=>'p','ผ'=>'ph','ฝ'=>'f','พ'=>'ph','ฟ'=>'f','ภ'=>'ph',
+  'ม'=>'m','ย'=>'y','ร'=>'r','ฤ'=>'rue','ฤๅ'=>'rue','ล'=>'l','ฦ'=>'lue',
+  'ฦๅ'=>'lue','ว'=>'w','ศ'=>'s','ษ'=>'s','ส'=>'s','ห'=>'h','ฬ'=>'l','ฮ'=>'h',
+  'ะ'=>'a','ั'=>'a','รร'=>'a','า'=>'a','ๅ'=>'a','ำ'=>'am','ํา'=>'am',
+  'ิ'=>'i','ี'=>'i','ึ'=>'ue','ี'=>'ue','ุ'=>'u','ู'=>'u',
+  'เ'=>'e','แ'=>'ae','โ'=>'o','อ'=>'o',
+  'ียะ'=>'ia','ีย'=>'ia','ือะ'=>'uea','ือ'=>'uea','ัวะ'=>'ua','ัว'=>'ua',
+  'ใ'=>'ai','ไ'=>'ai','ัย'=>'ai','าย'=>'ai','าว'=>'ao',
+  'ุย'=>'ui','อย'=>'oi','ือย'=>'ueai','วย'=>'uai',
+  'ิว'=>'io','็ว'=>'eo','ียว'=>'iao',
+  '่'=>'','้'=>'','๊'=>'','๋'=>'','็'=>'',
+  '์'=>'','๎'=>'','ํ'=>'','ฺ'=>'',
+  'ๆ'=>'2','๏'=>'o','ฯ'=>'-','๚'=>'-','๛'=>'-',
+  '๐'=>'0','๑'=>'1','๒'=>'2','๓'=>'3','๔'=>'4',
+  '๕'=>'5','๖'=>'6','๗'=>'7','๘'=>'8','๙'=>'9',
+
+  // Korean
+  'ㄱ'=>'k','ㅋ'=>'kh','ㄲ'=>'kk','ㄷ'=>'t','ㅌ'=>'th','ㄸ'=>'tt','ㅂ'=>'p',
+  'ㅍ'=>'ph','ㅃ'=>'pp','ㅈ'=>'c','ㅊ'=>'ch','ㅉ'=>'cc','ㅅ'=>'s','ㅆ'=>'ss',
+  'ㅎ'=>'h','ㅇ'=>'ng','ㄴ'=>'n','ㄹ'=>'l','ㅁ'=>'m', 'ㅏ'=>'a','ㅓ'=>'e','ㅗ'=>'o',
+  'ㅜ'=>'wu','ㅡ'=>'u','ㅣ'=>'i','ㅐ'=>'ay','ㅔ'=>'ey','ㅚ'=>'oy','ㅘ'=>'wa','ㅝ'=>'we',
+  'ㅟ'=>'wi','ㅙ'=>'way','ㅞ'=>'wey','ㅢ'=>'uy','ㅑ'=>'ya','ㅕ'=>'ye','ㅛ'=>'oy',
+  'ㅠ'=>'yu','ㅒ'=>'yay','ㅖ'=>'yey',
+);
+
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/index.php b/mod/dokuwiki/vendors/dokuwiki/index.php
new file mode 100644
index 000000000..ad0807727
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/index.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * Forwarder to doku.php
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+header("Location: doku.php");
diff --git a/mod/dokuwiki/vendors/dokuwiki/install.php b/mod/dokuwiki/vendors/dokuwiki/install.php
new file mode 100644
index 000000000..414d3e99e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/install.php
@@ -0,0 +1,516 @@
+<?php
+/**
+ * Dokuwiki installation assistance
+ *
+ * @author      Chris Smith <chris@jalakai.co.uk>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
+if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
+
+// check for error reporting override or set error reporting to sane values
+if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
+else { error_reporting(DOKU_E_LEVEL); }
+
+// kill magic quotes
+if (get_magic_quotes_gpc() && !defined('MAGIC_QUOTES_STRIPPED')) {
+    if (!empty($_GET))    remove_magic_quotes($_GET);
+    if (!empty($_POST))   remove_magic_quotes($_POST);
+    if (!empty($_COOKIE)) remove_magic_quotes($_COOKIE);
+    if (!empty($_REQUEST)) remove_magic_quotes($_REQUEST);
+    @ini_set('magic_quotes_gpc', 0);
+    define('MAGIC_QUOTES_STRIPPED',1);
+}
+@set_magic_quotes_runtime(0);
+@ini_set('magic_quotes_sybase',0);
+
+// language strings
+require_once(DOKU_INC.'inc/lang/en/lang.php');
+$LC = preg_replace('/[^a-z\-]+/','',$_REQUEST['l']);
+if(!$LC) $LC = 'en';
+if($LC && $LC != 'en' ) {
+    require_once(DOKU_INC.'inc/lang/'.$LC.'/lang.php');
+}
+
+// initialise variables ...
+$error = array();
+
+$dokuwiki_hash = array(
+    '2005-09-22'   => 'e33223e957b0b0a130d0520db08f8fb7',
+    '2006-03-05'   => '51295727f79ab9af309a2fd9e0b61acc',
+    '2006-03-09'   => '51295727f79ab9af309a2fd9e0b61acc',
+    '2006-11-06'   => 'b3a8af76845977c2000d85d6990dd72b',
+    '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
+    '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
+    '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
+    '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
+    '2009-12-25' => '993c4b2b385643efe5abf8e7010e11f4',
+);
+
+
+
+// begin output
+header('Content-Type: text/html; charset=utf-8');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $LC?>"
+ lang="<?php echo $LC?>" dir="<?php echo $lang['direction']?>">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title><?php echo $lang['i_installer']?></title>
+    <style type="text/css">
+        body { width: 90%; margin: 0 auto; font: 84% Verdana, Helvetica, Arial, sans-serif; }
+        img { border: none }
+        br.cl { clear:both; }
+        code { font-size: 110%; color: #800000; }
+        fieldset { border: none }
+        label { display: block; margin-top: 0.5em; }
+        select.text, input.text { width: 30em; margin: 0 0.5em; }
+    </style>
+    <script type="text/javascript" language="javascript">
+        function acltoggle(){
+            var cb = document.getElementById('acl');
+            var fs = document.getElementById('acldep');
+            if(!cb || !fs) return;
+            if(cb.checked){
+                fs.style.display = '';
+            }else{
+                fs.style.display = 'none';
+            }
+        }
+        window.onload = function(){
+            acltoggle();
+            var cb = document.getElementById('acl');
+            if(cb) cb.onchange = acltoggle;
+        };
+    </script>
+</head>
+<body style="">
+    <h1 style="float:left">
+        <img src="lib/exe/fetch.php?media=wiki:dokuwiki-128.png&w=64"
+             style="vertical-align: middle;" alt="" />
+        <?php echo $lang['i_installer']?>
+    </h1>
+    <div style="float:right; margin: 1em;">
+        <?php langsel()?>
+    </div>
+    <br class="cl" />
+
+    <div style="float: right; width: 34%;">
+        <?php
+            if(@file_exists(DOKU_INC.'inc/lang/'.$LC.'/install.html')){
+                include(DOKU_INC.'inc/lang/'.$LC.'/install.html');
+            }else{
+                print "<div lang=\"en\" dir=\"ltr\">\n";
+                include(DOKU_INC.'inc/lang/en/install.html');
+                print "</div>\n";
+            }
+        ?>
+    </div>
+
+    <div style="float: left; width: 58%;">
+        <?php
+            if(! (check_functions() && check_permissions()) ){
+                echo '<p>'.$lang['i_problems'].'</p>';
+                print_errors();
+                print_retry();
+            }elseif(!check_configs()){
+                echo '<p>'.$lang['i_modified'].'</p>';
+                print_errors();
+            }elseif($_REQUEST['submit']){
+                if(!check_data($_REQUEST['d'])){
+                    print_errors();
+                    print_form($_REQUEST['d']);
+                }elseif(!store_data($_REQUEST['d'])){
+                    echo '<p>'.$lang['i_failure'].'</p>';
+                    print_errors();
+                }else{
+                    echo '<p>'.$lang['i_success'].'</p>';
+                }
+            }else{
+                print_form($_REQUEST['d']);
+            }
+        ?>
+    </div>
+
+<div style="clear: both">
+  <a href="http://dokuwiki.org/"><img src="lib/tpl/default/images/button-dw.png" alt="driven by DokuWiki" /></a>
+  <a href="http://www.php.net"><img src="lib/tpl/default/images/button-php.gif" alt="powered by PHP" /></a>
+</div>
+</body>
+</html>
+<?php
+
+/**
+ * Print the input form
+ */
+function print_form($d){
+    global $lang;
+    global $LC;
+
+    if(!is_array($d)) $d = array();
+    $d = array_map('htmlspecialchars',$d);
+
+    if(!isset($d['acl'])) $d['acl']=1;
+
+    ?>
+    <form action="" method="post">
+    <input type="hidden" name="l" value="<?php echo $LC ?>" />
+    <fieldset>
+        <label for="title"><?php echo $lang['i_wikiname']?>
+        <input type="text" name="d[title]" id="title" value="<?php echo $d['title'] ?>" style="width: 20em;" />
+        </label>
+
+        <fieldset style="margin-top: 1em;">
+            <label for="acl">
+            <input type="checkbox" name="d[acl]" id="acl" <?php echo(($d['acl'] ? 'checked="checked"' : ''));?> />
+            <?php echo $lang['i_enableacl']?></label>
+
+            <fieldset id="acldep">
+                <label for="superuser"><?php echo $lang['i_superuser']?></label>
+                <input class="text" type="text" name="d[superuser]" id="superuser" value="<?php echo $d['superuser'] ?>" />
+
+                <label for="fullname"><?php echo $lang['fullname']?></label>
+                <input class="text" type="text" name="d[fullname]" id="fullname" value="<?php echo $d['fullname'] ?>" />
+
+                <label for="email"><?php echo $lang['email']?></label>
+                <input class="text" type="text" name="d[email]" id="email" value="<?php echo $d['email'] ?>" />
+
+                <label for="password"><?php echo $lang['pass']?></label>
+                <input class="text" type="password" name="d[password]" id="password" />
+
+                <label for="confirm"><?php echo $lang['passchk']?></label>
+                <input class="text" type="password" name="d[confirm]" id="confirm" />
+
+                <label for="policy"><?php echo $lang['i_policy']?></label>
+                <select class="text" name="d[policy]" id="policy">
+                    <option value="0" <?php echo ($d['policy'] == 0)?'selected="selected"':'' ?>><?php echo $lang['i_pol0']?></option>
+                    <option value="1" <?php echo ($d['policy'] == 1)?'selected="selected"':'' ?>><?php echo $lang['i_pol1']?></option>
+                    <option value="2" <?php echo ($d['policy'] == 2)?'selected="selected"':'' ?>><?php echo $lang['i_pol2']?></option>
+                </select>
+            </fieldset>
+        </fieldset>
+
+    </fieldset>
+    <fieldset id="process">
+        <input class="button" type="submit" name="submit" value="<?php echo $lang['btn_save']?>" />
+    </fieldset>
+    </form>
+    <?php
+}
+
+function print_retry() {
+  global $lang;
+  global $LC;
+?>
+    <form action="" method="get">
+      <fieldset>
+        <input type="hidden" name="l" value="<?php echo $LC ?>" />
+        <input class="button" type="submit" value="<?php echo $lang['i_retry'];?>" />
+      </fieldset>
+    </form>
+<?php
+}
+
+/**
+ * Check validity of data
+ *
+ * @author Andreas Gohr
+ */
+function check_data(&$d){
+    global $lang;
+    global $error;
+
+    //autolowercase the username
+    $d['superuser'] = strtolower($d['superuser']);
+
+    $ok = true;
+
+    // check input
+    if(empty($d['title'])){
+        $error[] = sprintf($lang['i_badval'],$lang['i_wikiname']);
+        $ok      = false;
+    }
+    if($d['acl']){
+        if(!preg_match('/^[a-z1-9_]+$/',$d['superuser'])){
+            $error[] = sprintf($lang['i_badval'],$lang['i_superuser']);
+            $ok      = false;
+        }
+        if(empty($d['password'])){
+            $error[] = sprintf($lang['i_badval'],$lang['pass']);
+            $ok      = false;
+        }
+        if($d['confirm'] != $d['password']){
+            $error[] = sprintf($lang['i_badval'],$lang['passchk']);
+            $ok      = false;
+        }
+        if(empty($d['fullname']) || strstr($d['fullname'],':')){
+            $error[] = sprintf($lang['i_badval'],$lang['fullname']);
+            $ok      = false;
+        }
+        if(empty($d['email']) || strstr($d['email'],':') || !strstr($d['email'],'@')){
+            $error[] = sprintf($lang['i_badval'],$lang['email']);
+            $ok      = false;
+        }
+    }
+    return $ok;
+}
+
+/**
+ * Writes the data to the config files
+ *
+ * @author  Chris Smith <chris@jalakai.co.uk>
+ */
+function store_data($d){
+    global $LC;
+    $ok = true;
+    $d['policy'] = (int) $d['policy'];
+
+    // create local.php
+    $now    = date('r');
+    $output = <<<EOT
+<?php
+/**
+ * Dokuwiki's Main Configuration File - Local Settings
+ * Auto-generated by install script
+ * Date: $now
+ */
+
+EOT;
+    $output .= '$conf[\'title\'] = \''.addslashes($d['title'])."';\n";
+    $output .= '$conf[\'lang\'] = \''.addslashes($LC)."';\n";
+    if($d['acl']){
+        $output .= '$conf[\'useacl\'] = 1'.";\n";
+        $output .= "\$conf['superuser'] = '@admin';\n";
+    }
+    $ok = $ok && fileWrite(DOKU_LOCAL.'local.php',$output);
+
+    if ($d['acl']) {
+        // create users.auth.php
+        // --- user:MD5password:Real Name:email:groups,comma,seperated
+        $output = join(":",array($d['superuser'], md5($d['password']), $d['fullname'], $d['email'], 'admin,user'));
+        $output = @file_get_contents(DOKU_CONF.'users.auth.php.dist')."\n$output\n";
+        $ok = $ok && fileWrite(DOKU_LOCAL.'users.auth.php', $output);
+
+        // create acl.auth.php
+        $output = <<<EOT
+# acl.auth.php
+# <?php exit()?>
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Auto-generated by install script
+# Date: $now
+
+EOT;
+        if($d['policy'] == 2){
+            $output .=  "*               @ALL          0\n";
+            $output .=  "*               @user         8\n";
+        }elseif($d['policy'] == 1){
+            $output .=  "*               @ALL          1\n";
+            $output .=  "*               @user         8\n";
+        }else{
+            $output .=  "*               @ALL          8\n";
+        }
+        $ok = $ok && fileWrite(DOKU_LOCAL.'acl.auth.php', $output);
+    }
+    return $ok;
+}
+
+/**
+ * Write the given content to a file
+ *
+ * @author  Chris Smith <chris@jalakai.co.uk>
+ */
+function fileWrite($filename, $data) {
+    global $error;
+    global $lang;
+
+    if (($fp = @fopen($filename, 'wb')) === false) {
+        $filename = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $filename);
+        $error[]  = sprintf($lang['i_writeerr'],$filename);
+        return false;
+    }
+
+    if (!empty($data)) { fwrite($fp, $data);  }
+    fclose($fp);
+    return true;
+}
+
+
+/**
+ * check installation dependent local config files and tests for a known
+ * unmodified main config file
+ *
+ * @author      Chris Smith <chris@jalakai.co.uk>
+ */
+function check_configs(){
+    global $error;
+    global $lang;
+    global $dokuwiki_hash;
+
+    $ok = true;
+
+    $config_files = array(
+        'local' => DOKU_LOCAL.'local.php',
+        'users' => DOKU_LOCAL.'users.auth.php',
+        'auth'  => DOKU_LOCAL.'acl.auth.php'
+    );
+
+
+    // main dokuwiki config file (conf/dokuwiki.php) must not have been modified
+    $installation_hash = md5(preg_replace("/(\015\012)|(\015)/","\012",
+                             @file_get_contents(DOKU_CONF.'dokuwiki.php')));
+    if (!in_array($installation_hash, $dokuwiki_hash)) {
+        $error[] = sprintf($lang['i_badhash'],$installation_hash);
+        $ok = false;
+    }
+
+    // configs shouldn't exist
+    foreach ($config_files as $file) {
+        if (@file_exists($file)) {
+            $file    = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $file);
+            $error[] = sprintf($lang['i_confexists'],$file);
+            $ok      = false;
+        }
+    }
+    return $ok;
+}
+
+
+/**
+ * Check other installation dir/file permission requirements
+ *
+ * @author      Chris Smith <chris@jalakai.co.uk>
+ */
+function check_permissions(){
+    global $error;
+    global $lang;
+
+    $dirs = array(
+        'conf'      => DOKU_LOCAL,
+        'data'      => DOKU_INC.'data',
+        'pages'     => DOKU_INC.'data/pages',
+        'attic'     => DOKU_INC.'data/attic',
+        'media'     => DOKU_INC.'data/media',
+        'meta'      => DOKU_INC.'data/meta',
+        'cache'     => DOKU_INC.'data/cache',
+        'locks'     => DOKU_INC.'data/locks',
+        'index'     => DOKU_INC.'data/index',
+        'tmp'       => DOKU_INC.'data/tmp'
+    );
+
+    $ok = true;
+    foreach($dirs as $dir){
+        if(!@file_exists("$dir/.") || !@is_writable($dir)){
+            $dir     = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}', $dir);
+            $error[] = sprintf($lang['i_permfail'],$dir);
+            $ok      = false;
+        }
+    }
+    return $ok;
+}
+
+/**
+ * Check the availability of functions used in DokuWiki and the PHP version
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function check_functions(){
+    global $error;
+    global $lang;
+    $ok = true;
+
+    if(version_compare(phpversion(),'5.1.2','<')){
+        $error[] = sprintf($lang['i_phpver'],phpversion(),'5.1.2');
+        $ok = false;
+    }
+
+    $funcs = explode(' ','addslashes basename call_user_func chmod copy fgets '.
+                         'file file_exists fseek flush filesize ftell fopen '.
+                         'glob header ignore_user_abort ini_get mail mkdir '.
+                         'ob_start opendir parse_ini_file readfile realpath '.
+                         'rename rmdir serialize session_start unlink usleep '.
+                         'preg_replace file_get_contents htmlspecialchars_decode');
+
+    if (!function_exists('mb_substr')) {
+      $funcs[] = 'utf8_encode';
+      $funcs[] = 'utf8_decode';
+    }
+
+    foreach($funcs as $func){
+        if(!function_exists($func)){
+            $error[] = sprintf($lang['i_funcna'],$func);
+            $ok = false;
+        }
+    }
+    return $ok;
+}
+
+/**
+ * Print language selection
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function langsel(){
+    global $lang;
+    global $LC;
+
+    $dir = DOKU_INC.'inc/lang';
+    $dh  = opendir($dir);
+    if(!$dh) return;
+
+    $langs = array();
+    while (($file = readdir($dh)) !== false) {
+        if(preg_match('/^[\._]/',$file)) continue;
+        if(is_dir($dir.'/'.$file) && @file_exists($dir.'/'.$file.'/lang.php')){
+            $langs[] = $file;
+        }
+    }
+    closedir($dh);
+    sort($langs);
+
+    echo '<form action="">';
+    echo $lang['i_chooselang'];
+    echo ': <select name="l" onchange="submit()">';
+    foreach($langs as $l){
+        $sel = ($l == $LC) ? 'selected="selected"' : '';
+        echo '<option value="'.$l.'" '.$sel.'>'.$l.'</option>';
+    }
+    echo '</select> ';
+    echo '<input type="submit" value="'.$lang['btn_update'].'" />';
+    echo '</form>';
+}
+
+/**
+ * Print global error array
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function print_errors(){
+    global $error;
+    echo '<ul>';
+    foreach ($error as $err){
+        echo "<li>$err</li>";
+    }
+    echo '</ul>';
+}
+
+/**
+ * remove magic quotes recursivly
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function remove_magic_quotes(&$array) {
+  foreach (array_keys($array) as $key) {
+    if (is_array($array[$key])) {
+      remove_magic_quotes($array[$key]);
+    }else {
+      $array[$key] = stripslashes($array[$key]);
+    }
+  }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/_fla/MultipleUpload.as b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/MultipleUpload.as
new file mode 100644
index 000000000..c5e7799f9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/MultipleUpload.as
@@ -0,0 +1,329 @@
+/**
+ * Flash Multi Upload
+ *
+ * Based on a example from Alastair Dawson
+ *
+ * @link http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/
+ * @author Alastair Dawson
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+// delegate
+import mx.utils.Delegate;
+// ui components
+import mx.controls.DataGrid;
+import mx.controls.gridclasses.DataGridColumn
+import mx.controls.Button;
+import mx.controls.TextInput;
+import mx.controls.CheckBox;
+import mx.controls.Label;
+// file reference
+import flash.net.FileReferenceList;
+import flash.net.FileReference;
+
+class MultipleUpload {
+
+    private var fileRef:FileReferenceList;
+    private var fileRefListener:Object;
+    private var list:Array;
+    private var dp:Array;
+
+    private var files_dg:DataGrid;
+    private var browse_btn:Button;
+    private var upload_btn:Button;
+    private var ns_input:TextInput;
+    private var ns_label:Label;
+    private var overwrite_cb:CheckBox;
+
+    private var url:String;
+    private var upurl:String;
+    private var current:Number;
+    private var done:Number;
+    private var lasterror:String;
+
+    /**
+     * Constructor.
+     *
+     * Initializes the needed objects and stage objects
+     */
+    public function MultipleUpload(fdg:DataGrid, bb:Button, ub:Button, nsi:TextInput, nsl:Label, ob:CheckBox) {
+        // references for objects on the stage
+        files_dg = fdg;
+        browse_btn = bb;
+        upload_btn = ub;
+        ns_input = nsi;
+        ns_label = nsl;
+        overwrite_cb = ob;
+
+        // file list references & listener
+        fileRef = new FileReferenceList();
+        fileRefListener = new Object();
+        fileRef.addListener(fileRefListener);
+
+        // setup
+        iniUI();
+        inifileRefListener();
+    }
+
+    /**
+     * Initializes the User Interface
+     *
+     * Uses flashvars to access possibly localized names
+     */
+    private function iniUI() {
+        // register button handlers
+        browse_btn.onRelease = Delegate.create(this, this.browse);
+        upload_btn.onRelease = Delegate.create(this, this.upload);
+
+        // columns for dataGrid
+        var col:DataGridColumn;
+        col = new DataGridColumn('name');
+        col.headerText = ( _root.L_gridname ? _root.L_gridname : 'Filename' );
+        col.sortable = false;
+        files_dg.addColumn(col);
+        col = new DataGridColumn('size');
+        col.headerText = ( _root.L_gridsize ? _root.L_gridsize : 'Size' );
+        col.sortable = false;
+        files_dg.addColumn(col);
+        col = new DataGridColumn('status');
+        col.headerText = ( _root.L_gridstat ? _root.L_gridstat : 'Status' );
+        col.sortable = false;
+        files_dg.addColumn(col);
+
+        // label translations
+        if(_root.L_overwrite) overwrite_cb.label = _root.L_overwrite;
+        if(_root.L_browse)    browse_btn.label   = _root.L_browse;
+        if(_root.L_upload)    upload_btn.label   = _root.L_upload;
+        if(_root.L_namespace) ns_label.text     = _root.L_namespace;
+
+        // prefill input field
+        if(_root.O_ns) ns_input.text = _root.O_ns;
+
+        // disable buttons
+        upload_btn.enabled = false;
+        if(!_root.O_overwrite) overwrite_cb.visible = false;
+
+        // initalize the data provider list
+        dp   = new Array();
+        list = new Array();
+        files_dg.spaceColumnsEqually();
+    }
+
+    /**
+     * Open files selection dialog
+     *
+     * Adds the allowed file types
+     */
+    private function browse() {
+        if(_root.O_extensions){
+            var exts:Array = _root.O_extensions.split('|');
+            var filter:Object = new Object();
+            filter.description = (_root.L_filetypes ? _root.L_filetypes : 'Allowed filetypes');
+            filter.extension   = '';
+            for(var i:Number = 0; i<exts.length; i++){
+                filter.extension += '*.'+exts[i]+';';
+            }
+            filter.extension = filter.extension.substr(0,filter.extension.length-1);
+            var apply:Array = new Array();
+            apply.push(filter);
+            fileRef.browse(apply);
+        }else{
+            fileRef.browse();
+        }
+    }
+
+    /**
+     * Initiates the upload process
+     */
+    private function upload() {
+        // prepare backend URL
+        this.url  = _root.O_backend; // from flashvars
+        this.url += '&ns='+escape(ns_input.text);
+
+        // prepare upload url
+        this.upurl = this.url;
+        this.upurl += '&sectok='+escape(_root.O_sectok);
+        this.upurl += '&authtok='+escape(_root.O_authtok);
+        if(overwrite_cb.selected) this.upurl += '&ow=1';
+
+        // disable buttons
+        upload_btn.enabled = false;
+        browse_btn.enabled = false;
+        ns_input.enabled = false;
+        overwrite_cb.enabled = false;
+
+        // init states
+        this.current = -1;
+        this.done = 0;
+        this.lasterror = '';
+
+        // start process detached
+        _global.setTimeout(this,'uploadNext',100);
+        nextFrame();
+    }
+
+    /**
+     * Uploads the next file in the list
+     */
+    private function uploadNext(){
+        this.current++;
+        if(this.current >= this.list.length){
+            return this.uploadDone();
+        }
+
+        var file = this.list[this.current];
+
+        if(_root.O_maxsize && (file.size > _root.O_maxsize)){
+            this.lasterror = (_root.L_toobig ? _root.L_toobig : 'too big');
+            _global.setTimeout(this,'uploadNext',100);
+            nextFrame();
+        }else{
+            file.addListener(fileRefListener);
+            file.upload(upurl);
+            // continues in the handlers
+        }
+    }
+
+    /**
+     * Redirect to the namespace and set a success/error message
+     *
+     * Called when all files in the list where processed
+     */
+    private function uploadDone(){
+        var info = (_root.L_info ? _root.L_info : 'files uploaded');
+        if(this.done == this.list.length){
+            this.url += '&msg1='+escape(this.done+'/'+this.list.length+' '+info);
+        }else{
+            var lasterr = (_root.L_lasterr ? _root.L_lasterr : 'Last error:');
+            this.url += '&err='+escape(this.done+'/'+this.list.length+' '+info+' '+lasterr+' '+this.lasterror);
+        }
+
+        // when done redirect
+        getURL(this.url,'_self');
+    }
+
+    /**
+     * Set the status of a given file in the data grid
+     */
+    private function setStatus(file,msg){
+        for(var i:Number = 0; i < list.length; i++) {
+            if (list[i].name == file.name) {
+                files_dg.editField(i, 'status', msg);
+                nextFrame();
+                return;
+            }
+        }
+    }
+
+    /**
+     * Initialize the file reference listener
+     */
+    private function inifileRefListener() {
+        fileRefListener.onSelect        = Delegate.create(this, this.onSelect);
+        fileRefListener.onCancel        = Delegate.create(this, this.onCancel);
+        fileRefListener.onOpen          = Delegate.create(this, this.onOpen);
+        fileRefListener.onProgress      = Delegate.create(this, this.onProgress);
+        fileRefListener.onComplete      = Delegate.create(this, this.onComplete);
+        fileRefListener.onHTTPError     = Delegate.create(this, this.onHTTPError);
+        fileRefListener.onIOError       = Delegate.create(this, this.onIOError);
+        fileRefListener.onSecurityError = Delegate.create(this, this.onSecurityError);
+    }
+
+    /**
+     * Handle file selection
+     *
+     * Files are added as in a list of references and beautified into the data grid dataprovider array
+     *
+     * Multiple browses will add to the list
+     */
+    private function onSelect(fileRefList:FileReferenceList) {
+        var sel = fileRefList.fileList;
+        for(var i:Number = 0; i < sel.length; i++) {
+            // check size
+            var stat:String;
+            if(_root.O_maxsize && sel[i].size > _root.O_maxsize){
+                stat = (_root.L_toobig ? _root.L_toobig : 'too big');
+            }else{
+                stat = (_root.L_ready ? _root.L_ready : 'ready for upload');
+            }
+            // add to grid
+            dp.push({name:sel[i].name, size:Math.round(sel[i].size / 1000) + " kb", status:stat});
+            // add to reference list
+            list.push(sel[i]);
+        }
+        // update dataGrid
+        files_dg.dataProvider = dp;
+        files_dg.spaceColumnsEqually();
+
+        if(list.length > 0) upload_btn.enabled = true;
+    }
+
+    /**
+     * Does nothing
+     */
+    private function onCancel() {
+    }
+
+    /**
+     * Does nothing
+     */
+    private function onOpen(file:FileReference) {
+    }
+
+    /**
+     * Set the upload progress
+     */
+    private function onProgress(file:FileReference, bytesLoaded:Number, bytesTotal:Number) {
+        var percentDone = Math.round((bytesLoaded / bytesTotal) * 100);
+        var msg:String = 'uploading @PCT@%';
+        if(_root.L_progress) msg = _root.L_progress;
+        msg = msg.split('@PCT@').join(percentDone);
+        this.setStatus(file,msg);
+    }
+
+    /**
+     * Handle upload completion
+     */
+    private function onComplete(file:FileReference) {
+        this.setStatus(file,(_root.L_done ? _root.L_done : 'complete'));
+        this.done++;
+        uploadNext();
+    }
+
+    /**
+     * Handle upload errors
+     */
+    private function onHTTPError(file:FileReference, httpError:Number) {
+        var error;
+        if(httpError == 400){
+            error = (_root.L_fail ? _root.L_fail : 'failed');
+        }else if(httpError == 401){
+            error = (_root.L_authfail ? _root.L_authfail : 'auth failed');
+        }else{
+            error = "HTTP Error " + httpError
+        }
+        this.setStatus(file,error);
+        this.lasterror = error;
+        uploadNext();
+    }
+
+    /**
+     * Handle IO errors
+     */
+    private function onIOError(file:FileReference) {
+        this.setStatus(file,"IO Error");
+        this.lasterror = "IO Error";
+        uploadNext();
+    }
+
+    /**
+     * Handle Security errors
+     */
+    private function onSecurityError(file:FileReference, errorString:String) {
+        this.setStatus(file,"SecurityError: " + errorString);
+        this.lasterror = "SecurityError: " + errorString;
+        uploadNext();
+    }
+
+
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/_fla/README b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/README
new file mode 100644
index 000000000..6ecc72ac1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/README
@@ -0,0 +1,4 @@
+This directory contains the sources for the Flash Multiuploader. Its based on
+a example from Alastair Dawson given at
+http://blog.vixiom.com/2006/09/08/multiple-file-upload-with-flash-and-ruby-on-rails/
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/_fla/index.html b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/index.html
new file mode 100644
index 000000000..d614603ac
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=../../" />
+<meta name="robots" content="noindex" />
+<title>nothing here...</title>
+</head>
+<body>
+<!-- this is just here to prevent directory browsing -->
+</body>
+</html>
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/_fla/multipleUpload.fla b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/multipleUpload.fla
new file mode 100644
index 000000000..220616960
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/_fla/multipleUpload.fla
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/ajax.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/ajax.php
new file mode 100644
index 000000000..4618abd71
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/ajax.php
@@ -0,0 +1,370 @@
+<?php
+/**
+ * DokuWiki AJAX call handler
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+//fix for Opera XMLHttpRequests
+if(!count($_POST) && $HTTP_RAW_POST_DATA){
+  parse_str($HTTP_RAW_POST_DATA, $_POST);
+}
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/auth.php');
+//close sesseion
+session_write_close();
+
+header('Content-Type: text/html; charset=utf-8');
+
+
+//call the requested function
+if(isset($_POST['call']))
+  $call = $_POST['call'];
+else if(isset($_GET['call']))
+  $call = $_GET['call'];
+else
+  exit;
+
+$callfn = 'ajax_'.$call;
+
+if(function_exists($callfn)){
+  $callfn();
+}else{
+  $evt = new Doku_Event('AJAX_CALL_UNKNOWN', $call);
+  if ($evt->advise_before()) {
+    print "AJAX call '".htmlspecialchars($call)."' unknown!\n";
+    exit;
+  }
+  $evt->advise_after();
+  unset($evt);
+}
+
+/**
+ * Searches for matching pagenames
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_qsearch(){
+  global $conf;
+  global $lang;
+
+  $query = cleanID($_POST['q']);
+  if(empty($query)) $query = cleanID($_GET['q']);
+  if(empty($query)) return;
+
+  require_once(DOKU_INC.'inc/html.php');
+  require_once(DOKU_INC.'inc/fulltext.php');
+
+  $data = array();
+  $data = ft_pageLookup($query);
+
+  if(!count($data)) return;
+
+  print '<strong>'.$lang['quickhits'].'</strong>';
+  print '<ul>';
+  foreach($data as $id){
+    print '<li>';
+    $ns = getNS($id);
+    if($ns){
+      $name = shorten(noNS($id), ' ('.$ns.')',30);
+    }else{
+      $name = $id;
+    }
+    print html_wikilink(':'.$id,$name);
+    print '</li>';
+  }
+  print '</ul>';
+}
+
+/**
+ * Support OpenSearch suggestions
+ *
+ * @link   http://www.opensearch.org/Specifications/OpenSearch/Extensions/Suggestions/1.0
+ * @author Mike Frysinger <vapier@gentoo.org>
+ */
+function ajax_suggestions() {
+  global $conf;
+  global $lang;
+
+  $query = cleanID($_POST['q']);
+  if(empty($query)) $query = cleanID($_GET['q']);
+  if(empty($query)) return;
+
+  require_once(DOKU_INC.'inc/html.php');
+  require_once(DOKU_INC.'inc/fulltext.php');
+  require_once(DOKU_INC.'inc/JSON.php');
+
+  $data = array();
+  $data = ft_pageLookup($query);
+  if(!count($data)) return;
+
+  // limit results to 15 hits
+  $data = array_slice($data, 0, 15);
+  $data = array_map('trim',$data);
+  $data = array_map('noNS',$data);
+  $data = array_unique($data);
+  sort($data);
+
+  /* now construct a json */
+  $suggestions = array(
+    $query,  // the original query
+    $data,   // some suggestions
+    array(), // no description
+    array()  // no urls
+  );
+  $json = new JSON();
+
+  header('Content-Type: application/x-suggestions+json');
+  print $json->encode($suggestions);
+}
+
+/**
+ * Refresh a page lock and save draft
+ *
+ * Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_lock(){
+  global $conf;
+  global $lang;
+  $id = cleanID($_POST['id']);
+  if(empty($id)) return;
+
+  if(!checklock($id)){
+    lock($id);
+    echo 1;
+  }
+
+  if($conf['usedraft'] && $_POST['wikitext']){
+    $client = $_SERVER['REMOTE_USER'];
+    if(!$client) $client = clientIP(true);
+
+    $draft = array('id'     => $id,
+                   'prefix' => $_POST['prefix'],
+                   'text'   => $_POST['wikitext'],
+                   'suffix' => $_POST['suffix'],
+                   'date'   => $_POST['date'],
+                   'client' => $client,
+                  );
+    $cname = getCacheName($draft['client'].$id,'.draft');
+    if(io_saveFile($cname,serialize($draft))){
+      echo $lang['draftdate'].' '.dformat();
+    }
+  }
+
+}
+
+/**
+ * Delete a draft
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_draftdel(){
+  $id = cleanID($_POST['id']);
+  if(empty($id)) return;
+
+  $client = $_SERVER['REMOTE_USER'];
+  if(!$client) $client = clientIP(true);
+
+  $cname = getCacheName($client.$id,'.draft');
+  @unlink($cname);
+}
+
+/**
+ * Return subnamespaces for the Mediamanager
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_medians(){
+  global $conf;
+  require_once(DOKU_INC.'inc/search.php');
+  require_once(DOKU_INC.'inc/media.php');
+
+  // wanted namespace
+  $ns  = cleanID($_POST['ns']);
+  $dir  = utf8_encodeFN(str_replace(':','/',$ns));
+
+  $lvl = count(explode(':',$ns));
+
+  $data = array();
+  search($data,$conf['mediadir'],'search_index',array('nofiles' => true),$dir);
+  foreach($data as $item){
+    $item['level'] = $lvl+1;
+    echo media_nstree_li($item);
+    echo media_nstree_item($item);
+    echo '</li>';
+  }
+}
+
+/**
+ * Return list of files for the Mediamanager
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_medialist(){
+  global $conf;
+  global $NS;
+  require_once(DOKU_INC.'inc/media.php');
+  require_once(DOKU_INC.'inc/template.php');
+
+  $NS = $_POST['ns'];
+  tpl_mediaContent(true);
+}
+
+/**
+ * Return list of search result for the Mediamanager
+ *
+ * @author Tobias Sarnowski <sarnowski@cosmocode.de>
+ */
+function ajax_mediasearchlist(){
+  global $conf;
+  require_once(DOKU_INC.'inc/media.php');
+
+  media_searchlist($_POST['ns']);
+}
+
+/**
+ * Return sub index for index view
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function ajax_index(){
+  global $conf;
+  require_once(DOKU_INC.'inc/search.php');
+  require_once(DOKU_INC.'inc/html.php');
+
+  // wanted namespace
+  $ns  = cleanID($_POST['idx']);
+  $dir  = utf8_encodeFN(str_replace(':','/',$ns));
+
+  $lvl = count(explode(':',$ns));
+
+  $data = array();
+  search($data,$conf['datadir'],'search_index',array('ns' => $ns),$dir);
+  foreach($data as $item){
+    $item['level'] = $lvl+1;
+    echo html_li_index($item);
+    echo '<div class="li">';
+    echo html_list_index($item);
+    echo '</div>';
+    echo '</li>';
+  }
+}
+
+/**
+ * List matching namespaces and pages for the link wizard
+ *
+ * @author Andreas Gohr <gohr@cosmocode.de>
+ */
+function ajax_linkwiz(){
+  global $conf;
+  global $lang;
+  require_once(DOKU_INC.'inc/html.php');
+
+  $q  = ltrim($_POST['q'],':');
+  $id = noNS($q);
+  $ns = getNS($q);
+
+  $ns = cleanID($ns);
+  $id = cleanID($id);
+
+  $nsd  = utf8_encodeFN(str_replace(':','/',$ns));
+  $idd  = utf8_encodeFN(str_replace(':','/',$id));
+
+  $data = array();
+  if($q && !$ns){
+
+    // use index to lookup matching pages
+    require_once(DOKU_INC.'inc/fulltext.php');
+    require_once(DOKU_INC.'inc/parserutils.php');
+    $pages = array();
+    $pages = ft_pageLookup($id,false);
+
+    // result contains matches in pages and namespaces
+    // we now extract the matching namespaces to show
+    // them seperately
+    $dirs  = array();
+    $count = count($pages);
+    for($i=0; $i<$count; $i++){
+      if(strpos(noNS($pages[$i]),$id) === false){
+        // match was in the namespace
+        $dirs[getNS($pages[$i])] = 1; // assoc array avoids dupes
+      }else{
+        // it is a matching page, add it to the result
+        $data[] = array(
+          'id'    => $pages[$i],
+          'title' => p_get_first_heading($pages[$i],false),
+          'type'  => 'f',
+        );
+      }
+      unset($pages[$i]);
+    }
+    foreach($dirs as $dir => $junk){
+      $data[] = array(
+        'id'   => $dir,
+        'type' => 'd',
+      );
+    }
+
+  }else{
+
+    require_once(DOKU_INC.'inc/search.php');
+    $opts = array(
+      'depth' => 1,
+      'listfiles' => true,
+      'listdirs'  => true,
+      'pagesonly' => true,
+      'firsthead' => true,
+    );
+    if($id) $opts['filematch'] = '^.*\/'.$id;
+    if($id) $opts['dirmatch']  = '^.*\/'.$id;
+    search($data,$conf['datadir'],'search_universal',$opts,$nsd);
+
+    // add back to upper
+    if($ns){
+        array_unshift($data,array(
+            'id'   => getNS($ns),
+            'type' => 'u',
+        ));
+    }
+  }
+
+  // fixme sort results in a useful way ?
+
+  if(!count($data)){
+    echo $lang['nothingfound'];
+    exit;
+  }
+
+  // output the found data
+  $even = 1;
+  foreach($data as $item){
+    $even *= -1; //zebra
+
+    if(($item['type'] == 'd' || $item['type'] == 'u') && $item['id']) $item['id'] .= ':';
+    $link = wl($item['id']);
+
+    echo '<div class="'.(($even > 0)?'even':'odd').' type_'.$item['type'].'">';
+
+
+    if($item['type'] == 'u'){
+        $name = $lang['upperns'];
+    }else{
+        $name = htmlspecialchars($item['id']);
+    }
+
+    echo '<a href="'.$link.'" title="'.htmlspecialchars($item['id']).'" class="wikilink1">'.$name.'</a>';
+
+    if($item['title']){
+      echo '<span>'.htmlspecialchars($item['title']).'</span>';
+    }
+    echo '</div>';
+  }
+
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/css.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/css.php
new file mode 100644
index 000000000..2cb383de0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/css.php
@@ -0,0 +1,330 @@
+<?php
+/**
+ * DokuWiki StyleSheet creator
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/httputils.php');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/confutils.php');
+
+// Main (don't run when UNIT test)
+if(!defined('SIMPLE_TEST')){
+    header('Content-Type: text/css; charset=utf-8');
+    css_out();
+}
+
+
+// ---------------------- functions ------------------------------
+
+/**
+ * Output all needed Styles
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_out(){
+    global $conf;
+    global $lang;
+    $style = '';
+    if (isset($_REQUEST['s']) &&
+        in_array($_REQUEST['s'], array('all', 'print', 'feed'))) {
+        $style = $_REQUEST['s'];
+    }
+
+    $tpl = trim(preg_replace('/[^\w-]+/','',$_REQUEST['t']));
+    if($tpl){
+        $tplinc = DOKU_INC.'lib/tpl/'.$tpl.'/';
+        $tpldir = DOKU_BASE.'lib/tpl/'.$tpl.'/';
+    }else{
+        $tplinc = DOKU_TPLINC;
+        $tpldir = DOKU_TPL;
+    }
+
+    // The generated script depends on some dynamic options
+    $cache = getCacheName('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tplinc.$style,'.css');
+
+    // load template styles
+    $tplstyles = array();
+    if(@file_exists($tplinc.'style.ini')){
+        $ini = parse_ini_file($tplinc.'style.ini',true);
+        foreach($ini['stylesheets'] as $file => $mode){
+            $tplstyles[$mode][$tplinc.$file] = $tpldir;
+        }
+    }
+
+    // Array of needed files and their web locations, the latter ones
+    // are needed to fix relative paths in the stylesheets
+    $files   = array();
+    //if (isset($tplstyles['all'])) $files = array_merge($files, $tplstyles['all']);
+    if(!empty($style)){
+        $files[DOKU_INC.'lib/styles/'.$style.'.css'] = DOKU_MEDIA.'lib/styles/';
+        // load plugin, template, user styles
+        $files = array_merge($files, css_pluginstyles($style));
+        if (isset($tplstyles[$style])) $files = array_merge($files, $tplstyles[$style]);
+        $files[DOKU_CONF.'user'.$style.'.css'] = DOKU_MEDIA;
+    }else{
+        $files[DOKU_INC.'lib/styles/style.css'] = DOKU_MEDIA.'lib/styles/';
+        // load plugin, template, user styles
+        $files = array_merge($files, css_pluginstyles('screen'));
+        if (isset($tplstyles['screen'])) $files = array_merge($files, $tplstyles['screen']);
+        if($lang['direction'] == 'rtl'){
+            if (isset($tplstyles['rtl'])) $files = array_merge($files, $tplstyles['rtl']);
+        }
+        $files[DOKU_CONF.'userstyle.css'] = DOKU_BASE;
+    }
+
+    // check cache age & handle conditional request
+    header('Cache-Control: public, max-age=3600');
+    header('Pragma: public');
+    if(css_cacheok($cache,array_keys($files),$tplinc)){
+        http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
+
+        // finally send output
+        if ($conf['gzip_output'] && http_gzip_valid($cache)) {
+          header('Vary: Accept-Encoding');
+          header('Content-Encoding: gzip');
+          readfile($cache.".gz");
+        } else {
+          if (!http_sendfile($cache)) readfile($cache);
+        }
+
+        return;
+    } else {
+        http_conditionalRequest(time());
+    }
+
+    // start output buffering and build the stylesheet
+    ob_start();
+
+    // print the default classes for interwiki links and file downloads
+    css_interwiki();
+    css_filetypes();
+
+    // load files
+    foreach($files as $file => $location){
+        print css_loadfile($file, $location);
+    }
+
+    // end output buffering and get contents
+    $css = ob_get_contents();
+    ob_end_clean();
+
+    // apply style replacements
+    $css = css_applystyle($css,$tplinc);
+
+    // compress whitespace and comments
+    if($conf['compress']){
+        $css = css_compress($css);
+    }
+
+    // save cache file
+    io_saveFile($cache,$css);
+    if(function_exists('gzopen')) io_saveFile("$cache.gz",$css);
+
+    // finally send output
+    if ($conf['gzip_output']) {
+      header('Vary: Accept-Encoding');
+      header('Content-Encoding: gzip');
+      print gzencode($css,9,FORCE_GZIP);
+    } else {
+      print $css;
+    }
+}
+
+/**
+ * Checks if a CSS Cache file still is valid
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_cacheok($cache,$files,$tplinc){
+    global $config_cascade;
+
+    if(isset($_REQUEST['purge'])) return false; //support purge request
+
+    $ctime = @filemtime($cache);
+    if(!$ctime) return false; //There is no cache
+
+    // some additional files to check
+    $files = array_merge($files, getConfigFiles('main'));
+    $files[] = $tplinc.'style.ini';
+    $files[] = __FILE__;
+
+    // now walk the files
+    foreach($files as $file){
+        if(@filemtime($file) > $ctime){
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * Does placeholder replacements in the style according to
+ * the ones defined in a templates style.ini file
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_applystyle($css,$tplinc){
+    if(@file_exists($tplinc.'style.ini')){
+        $ini = parse_ini_file($tplinc.'style.ini',true);
+        $css = strtr($css,$ini['replacements']);
+    }
+    return $css;
+}
+
+/**
+ * Prints classes for interwikilinks
+ *
+ * Interwiki links have two classes: 'interwiki' and 'iw_$name>' where
+ * $name is the identifier given in the config. All Interwiki links get
+ * an default style with a default icon. If a special icon is available
+ * for an interwiki URL it is set in it's own class. Both classes can be
+ * overwritten in the template or userstyles.
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_interwiki(){
+
+    // default style
+    echo 'a.interwiki {';
+    echo ' background: transparent url('.DOKU_MEDIA.'lib/images/interwiki.png) 0px 1px no-repeat;';
+    echo ' padding-left: 16px;';
+    echo '}';
+
+    // additional styles when icon available
+    $iwlinks = getInterwiki();
+    foreach(array_keys($iwlinks) as $iw){
+        $class = preg_replace('/[^_\-a-z0-9]+/i','_',$iw);
+        if(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
+            echo "a.iw_$class {";
+            echo '  background-image: url('.DOKU_MEDIA.'lib/images/interwiki/'.$iw.'.png)';
+            echo '}';
+        }elseif(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
+            echo "a.iw_$class {";
+            echo '  background-image: url('.DOKU_MEDIA.'lib/images/interwiki/'.$iw.'.gif)';
+            echo '}';
+        }
+    }
+}
+
+/**
+ * Prints classes for file download links
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_filetypes(){
+
+    // default style
+    echo 'a.mediafile {';
+    echo ' background: transparent url('.DOKU_MEDIA.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
+    echo ' padding-left: 18px;';
+    echo ' padding-bottom: 1px;';
+    echo '}';
+
+    // additional styles when icon available
+    // scan directory for all icons
+    $exts = array();
+    if($dh = opendir(DOKU_INC.'lib/images/fileicons')){
+        while(false !== ($file = readdir($dh))){
+            if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){
+                $ext = strtolower($match[1]);
+                $type = '.'.strtolower($match[2]);
+                if($ext!='file' && (!isset($exts[$ext]) || $type=='.png')){
+                    $exts[$ext] = $type;
+                }
+            }
+        }
+        closedir($dh);
+    }
+    foreach($exts as $ext=>$type){
+        $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
+        echo "a.mf_$class {";
+        echo '  background-image: url('.DOKU_MEDIA.'lib/images/fileicons/'.$ext.$type.')';
+        echo '}';
+    }
+}
+
+/**
+ * Loads a given file and fixes relative URLs with the
+ * given location prefix
+ */
+function css_loadfile($file,$location=''){
+    if(!@file_exists($file)) return '';
+    $css = io_readFile($file);
+    if(!$location) return $css;
+
+    $css = preg_replace('#(url\([ \'"]*)((?!/|http://|https://| |\'|"))#','\\1'.$location.'\\3',$css);
+    return $css;
+}
+
+
+/**
+ * Returns a list of possible Plugin Styles (no existance check here)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_pluginstyles($mode='screen'){
+    global $lang;
+    $list = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        if($mode == 'all'){
+            $list[DOKU_PLUGIN."$p/all.css"]  = DOKU_BASE."lib/plugins/$p/";
+        }elseif($mode == 'print'){
+            $list[DOKU_PLUGIN."$p/print.css"]  = DOKU_BASE."lib/plugins/$p/";
+        }elseif($mode == 'feed'){
+            $list[DOKU_PLUGIN."$p/feed.css"]  = DOKU_BASE."lib/plugins/$p/";
+        }else{
+            $list[DOKU_PLUGIN."$p/style.css"]  = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/screen.css"] = DOKU_BASE."lib/plugins/$p/";
+        }
+        if($lang['direction'] == 'rtl'){
+            $list[DOKU_PLUGIN."$p/rtl.css"] = DOKU_BASE."lib/plugins/$p/";
+        }
+    }
+    return $list;
+}
+
+/**
+ * Very simple CSS optimizer
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_compress($css){
+    //strip comments through a callback
+    $css = preg_replace_callback('#(/\*)(.*?)(\*/)#s','css_comment_cb',$css);
+
+    //strip (incorrect but common) one line comments
+    $css = preg_replace('/(?<!:)\/\/.*$/m','',$css);
+
+    // strip whitespaces
+    $css = preg_replace('![\r\n\t ]+!',' ',$css);
+    $css = preg_replace('/ ?([:;,{}\/]) ?/','\\1',$css);
+
+    // shorten colors
+    $css = preg_replace("/#([0-9a-fA-F]{1})\\1([0-9a-fA-F]{1})\\2([0-9a-fA-F]{1})\\3/", "#\\1\\2\\3",$css);
+
+    return $css;
+}
+
+/**
+ * Callback for css_compress()
+ *
+ * Keeps short comments (< 5 chars) to maintain typical browser hacks
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function css_comment_cb($matches){
+    if(strlen($matches[2]) > 4) return '';
+    return $matches[0];
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/detail.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/detail.php
new file mode 100644
index 000000000..f30e039d4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/detail.php
@@ -0,0 +1,58 @@
+<?php
+  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+  define('DOKU_MEDIADETAIL',1);
+  require_once(DOKU_INC.'inc/init.php');
+  require_once(DOKU_INC.'inc/common.php');
+  require_once(DOKU_INC.'inc/lang/en/lang.php');
+  require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
+  require_once(DOKU_INC.'inc/JpegMeta.php');
+  require_once(DOKU_INC.'inc/html.php');
+  require_once(DOKU_INC.'inc/template.php');
+  require_once(DOKU_INC.'inc/auth.php');
+  //close session
+  session_write_close();
+
+  $IMG  = getID('media');
+  $ID   = cleanID($_REQUEST['id']);
+
+  if($conf['allowdebug'] && $_REQUEST['debug']){
+      print '<pre>';
+      foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
+          print '$'."conf['$x'] = '".$conf[$x]."';\n";
+      }
+      foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '.
+                      'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){
+          print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n";
+      }
+      print "getID('media'): ".getID('media')."\n";
+      print "getID('media',false): ".getID('media',false)."\n";
+      print '</pre>';
+  }
+
+  $ERROR = false;
+  // check image permissions
+  $AUTH = auth_quickaclcheck($IMG);
+  if($AUTH >= AUTH_READ){
+    // check if image exists
+    $SRC = mediaFN($IMG);
+    if(!@file_exists($SRC)){
+      //doesn't exist!
+
+    }
+  }else{
+    // no auth
+    $ERROR = p_locale_xhtml('denied');
+  }
+
+  /*if(!$ERROR){
+    // load EXIF/IPTC/image details
+    $INFO = array();
+    $INFO['std']['']
+    imagesize
+  }*/
+
+
+  //start output and load template
+  header('Content-Type: text/html; charset=utf-8');
+  include(template('detail.php'));
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/fetch.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/fetch.php
new file mode 100644
index 000000000..11877ef36
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/fetch.php
@@ -0,0 +1,173 @@
+<?php
+/**
+ * DokuWiki media passthrough file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+  if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+  define('DOKU_DISABLE_GZIP_OUTPUT', 1);
+  require_once(DOKU_INC.'inc/init.php');
+  require_once(DOKU_INC.'inc/common.php');
+  require_once(DOKU_INC.'inc/media.php');
+  require_once(DOKU_INC.'inc/pageutils.php');
+  require_once(DOKU_INC.'inc/httputils.php');
+  require_once(DOKU_INC.'inc/confutils.php');
+  require_once(DOKU_INC.'inc/auth.php');
+
+  //close sesseion
+  session_write_close();
+
+  $mimetypes = getMimeTypes();
+
+  //get input
+  $MEDIA  = stripctl(getID('media',false)); // no cleaning except control chars - maybe external
+  $CACHE  = calc_cache($_REQUEST['cache']);
+  $WIDTH  = (int) $_REQUEST['w'];
+  $HEIGHT = (int) $_REQUEST['h'];
+  list($EXT,$MIME,$DL) = mimetype($MEDIA,false);
+  if($EXT === false){
+    $EXT  = 'unknown';
+    $MIME = 'application/octet-stream';
+    $DL   = true;
+  }
+
+  //media to local file
+  if(preg_match('#^(https?)://#i',$MEDIA)){
+    //check hash
+    if(substr(md5(auth_cookiesalt().$MEDIA),0,6) != $_REQUEST['hash']){
+      header("HTTP/1.0 412 Precondition Failed");
+      print 'Precondition Failed';
+      exit;
+    }
+    //handle external images
+    if(strncmp($MIME,'image/',6) == 0) $FILE = media_get_from_URL($MEDIA,$EXT,$CACHE);
+    if(!$FILE){
+      //download failed - redirect to original URL
+      header('Location: '.$MEDIA);
+      exit;
+    }
+  }else{
+    $MEDIA = cleanID($MEDIA);
+    if(empty($MEDIA)){
+      header("HTTP/1.0 400 Bad Request");
+      print 'Bad request';
+      exit;
+    }
+
+    //check permissions (namespace only)
+    if(auth_quickaclcheck(getNS($MEDIA).':X') < AUTH_READ){
+      header("HTTP/1.0 401 Unauthorized");
+      //fixme add some image for imagefiles
+      print 'Unauthorized';
+      exit;
+    }
+    $FILE  = mediaFN($MEDIA);
+  }
+
+  //check file existance
+  if(!@file_exists($FILE)){
+    header("HTTP/1.0 404 Not Found");
+    //FIXME add some default broken image
+    print 'Not Found';
+    exit;
+  }
+
+  $ORIG = $FILE;
+
+  //handle image resizing/cropping
+  if((substr($MIME,0,5) == 'image') && $WIDTH){
+    if($HEIGHT){
+        $FILE = media_crop_image($FILE,$EXT,$WIDTH,$HEIGHT);
+    }else{
+        $FILE = media_resize_image($FILE,$EXT,$WIDTH,$HEIGHT);
+    }
+  }
+
+  // finally send the file to the client
+  $data = array('file'     => $FILE,
+                'mime'     => $MIME,
+                'download' => $DL,
+                'cache'    => $CACHE,
+                'orig'     => $ORIG,
+                'ext'      => $EXT,
+                'width'    => $WIDTH,
+                'height'   => $HEIGHT);
+
+  $evt = new Doku_Event('MEDIA_SENDFILE', $data);
+  if ($evt->advise_before()) {
+    sendFile($data['file'],$data['mime'],$data['download'],$data['cache']);
+  }
+
+/* ------------------------------------------------------------------------ */
+
+/**
+ * Set headers and send the file to the client
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function sendFile($file,$mime,$dl,$cache){
+  global $conf;
+  $fmtime = @filemtime($file);
+  // send headers
+  header("Content-Type: $mime");
+  // smart http caching headers
+  if ($cache==-1) {
+    // cache
+    // cachetime or one hour
+    header('Expires: '.gmdate("D, d M Y H:i:s", time()+max($conf['cachetime'], 3600)).' GMT');
+    header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($conf['cachetime'], 3600));
+    header('Pragma: public');
+  } else if ($cache>0) {
+    // recache
+    // remaining cachetime + 10 seconds so the newly recached media is used
+    header('Expires: '.gmdate("D, d M Y H:i:s", $fmtime+$conf['cachetime']+10).' GMT');
+    header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.max($fmtime-time()+$conf['cachetime']+10, 0));
+    header('Pragma: public');
+  } else if ($cache==0) {
+    // nocache
+    header('Cache-Control: must-revalidate, no-transform, post-check=0, pre-check=0');
+    header('Pragma: public');
+  }
+  //send important headers first, script stops here if '304 Not Modified' response
+  http_conditionalRequest($fmtime);
+
+
+  //download or display?
+  if($dl){
+    header('Content-Disposition: attachment; filename="'.basename($file).'";');
+  }else{
+    header('Content-Disposition: inline; filename="'.basename($file).'";');
+  }
+
+  //use x-sendfile header to pass the delivery to compatible webservers
+  if (http_sendfile($file)) exit;
+
+  // send file contents
+  $fp = @fopen($file,"rb");
+  if($fp){
+    http_rangeRequest($fp,filesize($file),$mime);
+  }else{
+    header("HTTP/1.0 500 Internal Server Error");
+    print "Could not read $file - bad permissions?";
+  }
+}
+
+/**
+ * Returns the wanted cachetime in seconds
+ *
+ * Resolves named constants
+ *
+ * @author  Andreas Gohr <andi@splitbrain.org>
+ */
+function calc_cache($cache){
+  global $conf;
+
+  if(strtolower($cache) == 'nocache') return 0; //never cache
+  if(strtolower($cache) == 'recache') return $conf['cachetime']; //use standard cache
+  return -1; //cache endless
+}
+
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/index.html b/mod/dokuwiki/vendors/dokuwiki/lib/exe/index.html
new file mode 100644
index 000000000..d614603ac
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=../../" />
+<meta name="robots" content="noindex" />
+<title>nothing here...</title>
+</head>
+<body>
+<!-- this is just here to prevent directory browsing -->
+</body>
+</html>
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/indexer.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/indexer.php
new file mode 100644
index 000000000..872f6b5be
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/indexer.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * DokuWiki indexer
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+define('DOKU_DISABLE_GZIP_OUTPUT',1);
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/events.php');
+session_write_close();  //close session
+if(!defined('NL')) define('NL',"\n");
+global $ID;
+// Version tag used to force rebuild on upgrade
+define('INDEXER_VERSION', 2);
+
+// keep running after browser closes connection
+@ignore_user_abort(true);
+
+// check if user abort worked, if yes send output early
+$defer = !@ignore_user_abort() || $conf['broken_iua'];
+if(!$defer){
+    sendGIF(); // send gif
+}
+
+$ID = cleanID($_REQUEST['id']);
+
+// Catch any possible output (e.g. errors)
+if(!isset($_REQUEST['debug'])) ob_start();
+
+// run one of the jobs
+$tmp = array(); // No event data
+$evt = new Doku_Event('INDEXER_TASKS_RUN', $tmp);
+if ($evt->advise_before()) {
+  runIndexer() or
+  metaUpdate() or
+  runSitemapper() or
+  runTrimRecentChanges() or
+  runTrimRecentChanges(true) or
+  $evt->advise_after();
+}
+if($defer) sendGIF();
+
+if(!isset($_REQUEST['debug'])) ob_end_clean();
+exit;
+
+// --------------------------------------------------------------------
+
+/**
+ * Trims the recent changes cache (or imports the old changelog) as needed.
+ *
+ * @param media_changes If the media changelog shall be trimmed instead of
+ * the page changelog
+ *
+ * @author Ben Coburn <btcoburn@silicodon.net>
+ */
+function runTrimRecentChanges($media_changes = false) {
+    global $conf;
+
+    $fn = ($media_changes ? $conf['media_changelog'] : $conf['changelog']);
+
+    // Trim the Recent Changes
+    // Trims the recent changes cache to the last $conf['changes_days'] recent
+    // changes or $conf['recent'] items, which ever is larger.
+    // The trimming is only done once a day.
+    if (@file_exists($fn) &&
+        (@filemtime($fn.'.trimmed')+86400)<time() &&
+        !@file_exists($fn.'_tmp')) {
+            @touch($fn.'.trimmed');
+            io_lock($fn);
+            $lines = file($fn);
+            if (count($lines)<=$conf['recent']) {
+                // nothing to trim
+                io_unlock($fn);
+                return false;
+            }
+
+            io_saveFile($fn.'_tmp', '');          // presave tmp as 2nd lock
+            $trim_time = time() - $conf['recent_days']*86400;
+            $out_lines = array();
+
+            for ($i=0; $i<count($lines); $i++) {
+              $log = parseChangelogLine($lines[$i]);
+              if ($log === false) continue;                      // discard junk
+              if ($log['date'] < $trim_time) {
+                $old_lines[$log['date'].".$i"] = $lines[$i];     // keep old lines for now (append .$i to prevent key collisions)
+              } else {
+                $out_lines[$log['date'].".$i"] = $lines[$i];     // definitely keep these lines
+              }
+            }
+
+            if (count($lines)==count($out_lines)) {
+              // nothing to trim
+              @unlink($fn.'_tmp');
+              io_unlock($fn);
+              return false;
+            }
+
+            // sort the final result, it shouldn't be necessary,
+            //   however the extra robustness in making the changelog cache self-correcting is worth it
+            ksort($out_lines);
+            $extra = $conf['recent'] - count($out_lines);        // do we need extra lines do bring us up to minimum
+            if ($extra > 0) {
+              ksort($old_lines);
+              $out_lines = array_merge(array_slice($old_lines,-$extra),$out_lines);
+            }
+
+            // save trimmed changelog
+            io_saveFile($fn.'_tmp', implode('', $out_lines));
+            @unlink($fn);
+            if (!rename($fn.'_tmp', $fn)) {
+                // rename failed so try another way...
+                io_unlock($fn);
+                io_saveFile($fn, implode('', $out_lines));
+                @unlink($fn.'_tmp');
+            } else {
+                io_unlock($fn);
+            }
+            return true;
+    }
+
+    // nothing done
+    return false;
+}
+
+/**
+ * Runs the indexer for the current page
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function runIndexer(){
+    global $ID;
+    global $conf;
+    print "runIndexer(): started".NL;
+
+    // Move index files (if needed)
+    // Uses the importoldindex plugin to upgrade the index automatically.
+    // FIXME: Remove this from runIndexer when it is no longer needed.
+    if (@file_exists($conf['cachedir'].'/page.idx') &&
+        (!@file_exists($conf['indexdir'].'/page.idx') ||
+         !filesize($conf['indexdir'].'/page.idx'))  &&
+        !@file_exists($conf['indexdir'].'/index_importing')) {
+        echo "trigger TEMPORARY_INDEX_UPGRADE_EVENT\n";
+        $tmp = array(); // no event data
+        trigger_event('TEMPORARY_INDEX_UPGRADE_EVENT', $tmp);
+    }
+
+    if(!$ID) return false;
+
+    // check if indexing needed
+    $idxtag = metaFN($ID,'.indexed');
+    if(@file_exists($idxtag)){
+        if(io_readFile($idxtag) >= INDEXER_VERSION){
+            $last = @filemtime($idxtag);
+            if($last > @filemtime(wikiFN($ID))){
+                print "runIndexer(): index for $ID up to date".NL;
+                return false;
+            }
+        }
+    }
+
+    // try to aquire a lock
+    $lock = $conf['lockdir'].'/_indexer.lock';
+    while(!@mkdir($lock,$conf['dmode'])){
+        usleep(50);
+        if(time()-@filemtime($lock) > 60*5){
+            // looks like a stale lock - remove it
+            @rmdir($lock);
+            print "runIndexer(): stale lock removed".NL;
+        }else{
+            print "runIndexer(): indexer locked".NL;
+            return false;
+        }
+    }
+    if($conf['dperm']) chmod($lock, $conf['dperm']);
+
+    require_once(DOKU_INC.'inc/indexer.php');
+
+    // upgrade to version 2
+    if (!@file_exists($conf['indexdir'].'/pageword.idx'))
+        idx_upgradePageWords();
+
+    // do the work
+    idx_addPage($ID);
+
+    // we're finished - save and free lock
+    io_saveFile(metaFN($ID,'.indexed'),INDEXER_VERSION);
+    @rmdir($lock);
+    print "runIndexer(): finished".NL;
+    return true;
+}
+
+/**
+ * Will render the metadata for the page if not exists yet
+ *
+ * This makes sure pages which are created from outside DokuWiki will
+ * gain their data when viewed for the first time.
+ */
+function metaUpdate(){
+    global $ID;
+    print "metaUpdate(): started".NL;
+
+    if(!$ID) return false;
+    $file = metaFN($ID, '.meta');
+    echo "meta file: $file".NL;
+
+    // rendering needed?
+    if (@file_exists($file)) return false;
+    if (!@file_exists(wikiFN($ID))) return false;
+
+    require_once(DOKU_INC.'inc/common.php');
+    require_once(DOKU_INC.'inc/parserutils.php');
+    global $conf;
+
+
+    // gather some additional info from changelog
+    $info = io_grep($conf['changelog'],
+                    '/^(\d+)\t(\d+\.\d+\.\d+\.\d+)\t'.preg_quote($ID,'/').'\t([^\t]+)\t([^\t\n]+)/',
+                    0,true);
+
+    $meta = array();
+    if(!empty($info)){
+        $meta['date']['created'] = $info[0][1];
+        foreach($info as $item){
+            if($item[4] != '*'){
+                $meta['date']['modified'] = $item[1];
+                if($item[3]){
+                    $meta['contributor'][$item[3]] = $item[3];
+                }
+            }
+        }
+    }
+
+    $meta = p_render_metadata($ID, $meta);
+    io_saveFile($file, serialize($meta));
+
+    echo "metaUpdate(): finished".NL;
+    return true;
+}
+
+/**
+ * Builds a Google Sitemap of all public pages known to the indexer
+ *
+ * The map is placed in the root directory named sitemap.xml.gz - This
+ * file needs to be writable!
+ *
+ * @author Andreas Gohr
+ * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
+ */
+function runSitemapper(){
+    global $conf;
+    print "runSitemapper(): started".NL;
+    if(!$conf['sitemap']) return false;
+
+    if($conf['compression'] == 'bz2' || $conf['compression'] == 'gz'){
+        $sitemap = 'sitemap.xml.gz';
+    }else{
+        $sitemap = 'sitemap.xml';
+    }
+    print "runSitemapper(): using $sitemap".NL;
+
+    if(@file_exists(DOKU_INC.$sitemap)){
+        if(!is_writable(DOKU_INC.$sitemap)) return false;
+    }else{
+        if(!is_writable(DOKU_INC)) return false;
+    }
+
+    if(@filesize(DOKU_INC.$sitemap) &&
+       @filemtime(DOKU_INC.$sitemap) > (time()-($conf['sitemap']*60*60*24))){
+       print 'runSitemapper(): Sitemap up to date'.NL;
+       return false;
+    }
+
+    $pages = file($conf['indexdir'].'/page.idx');
+    print 'runSitemapper(): creating sitemap using '.count($pages).' pages'.NL;
+
+    // build the sitemap
+    ob_start();
+    print '<?xml version="1.0" encoding="UTF-8"?>'.NL;
+    print '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.NL;
+    foreach($pages as $id){
+        $id = trim($id);
+        $file = wikiFN($id);
+
+        //skip hidden, non existing and restricted files
+        if(isHiddenPage($id)) continue;
+        $date = @filemtime($file);
+        if(!$date) continue;
+        if(auth_aclcheck($id,'','') < AUTH_READ) continue;
+
+        print '  <url>'.NL;
+        print '    <loc>'.wl($id,'',true).'</loc>'.NL;
+        print '    <lastmod>'.date_iso8601($date).'</lastmod>'.NL;
+        print '  </url>'.NL;
+    }
+    print '</urlset>'.NL;
+    $data = ob_get_contents();
+    ob_end_clean();
+
+    //save the new sitemap
+    io_saveFile(DOKU_INC.$sitemap,$data);
+
+    //ping search engines...
+    $http = new DokuHTTPClient();
+    $http->timeout = 8;
+
+    //ping google
+    print 'runSitemapper(): pinging google'.NL;
+    $url  = 'http://www.google.com/webmasters/sitemaps/ping?sitemap=';
+    $url .= urlencode(DOKU_URL.$sitemap);
+    $resp = $http->get($url);
+    if($http->error) print 'runSitemapper(): '.$http->error.NL;
+    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
+
+    //ping yahoo
+    print 'runSitemapper(): pinging yahoo'.NL;
+    $url  = 'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=dokuwiki&url=';
+    $url .= urlencode(DOKU_URL.$sitemap);
+    $resp = $http->get($url);
+    if($http->error) print 'runSitemapper(): '.$http->error.NL;
+    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
+
+    //ping microsoft
+    print 'runSitemapper(): pinging microsoft'.NL;
+    $url  = 'http://www.bing.com/webmaster/ping.aspx?siteMap=';
+    $url .= urlencode(DOKU_URL.$sitemap);
+    $resp = $http->get($url);
+    if($http->error) print 'runSitemapper(): '.$http->error.NL;
+    print 'runSitemapper(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp)).NL;
+
+    print 'runSitemapper(): finished'.NL;
+    return true;
+}
+
+/**
+ * Formats a timestamp as ISO 8601 date
+ *
+ * @author <ungu at terong dot com>
+ * @link http://www.php.net/manual/en/function.date.php#54072
+ */
+function date_iso8601($int_date) {
+   //$int_date: current date in UNIX timestamp
+   $date_mod = date('Y-m-d\TH:i:s', $int_date);
+   $pre_timezone = date('O', $int_date);
+   $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2);
+   $date_mod .= $time_zone;
+   return $date_mod;
+}
+
+/**
+ * Just send a 1x1 pixel blank gif to the browser
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Harry Fuecks <fuecks@gmail.com>
+ */
+function sendGIF(){
+    if(isset($_REQUEST['debug'])){
+        header('Content-Type: text/plain');
+        return;
+    }
+    $img = base64_decode('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAIBTAA7');
+    header('Content-Type: image/gif');
+    header('Content-Length: '.strlen($img));
+    header('Connection: Close');
+    print $img;
+    flush();
+    // Browser should drop connection after this
+    // Thinks it's got the whole image
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
+// No trailing PHP closing tag - no output please!
+// See Note at http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/js.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/js.php
new file mode 100644
index 000000000..cb1016231
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/js.php
@@ -0,0 +1,397 @@
+<?php
+/**
+ * DokuWiki JavaScript creator
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('NL')) define('NL',"\n");
+if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/httputils.php');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/JSON.php');
+
+// Main (don't run when UNIT test)
+if(!defined('SIMPLE_TEST')){
+    header('Content-Type: text/javascript; charset=utf-8');
+    js_out();
+}
+
+
+// ---------------------- functions ------------------------------
+
+/**
+ * Output all needed JavaScript
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_out(){
+    global $conf;
+    global $lang;
+
+    // The generated script depends on some dynamic options
+    $cache = getCacheName('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
+
+    // array of core files
+    $files = array(
+                DOKU_INC.'lib/scripts/helpers.js',
+                DOKU_INC.'lib/scripts/events.js',
+                DOKU_INC.'lib/scripts/cookie.js',
+                DOKU_INC.'lib/scripts/script.js',
+                DOKU_INC.'lib/scripts/tw-sack.js',
+                DOKU_INC.'lib/scripts/ajax.js',
+                DOKU_INC.'lib/scripts/index.js',
+                DOKU_INC.'lib/scripts/drag.js',
+                DOKU_INC.'lib/scripts/textselection.js',
+                DOKU_INC.'lib/scripts/toolbar.js',
+                DOKU_INC.'lib/scripts/edit.js',
+                DOKU_INC.'lib/scripts/linkwiz.js',
+                DOKU_INC.'lib/scripts/media.js',
+                DOKU_TPLINC.'script.js',
+            );
+
+    // add possible plugin scripts and userscript
+    $files   = array_merge($files,js_pluginscripts());
+    $files[] = DOKU_CONF.'userscript.js';
+
+    // check cache age & handle conditional request
+    header('Cache-Control: public, max-age=3600');
+    header('Pragma: public');
+    if(js_cacheok($cache,$files)){
+        http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
+
+        // finally send output
+        if ($conf['gzip_output'] && http_gzip_valid($cache)) {
+            header('Vary: Accept-Encoding');
+            header('Content-Encoding: gzip');
+            readfile($cache.".gz");
+        } else {
+            if (!http_sendfile($cache)) readfile($cache);
+        }
+        return;
+    } else {
+        http_conditionalRequest(time());
+    }
+
+    // start output buffering and build the script
+    ob_start();
+
+    // add some global variables
+    print "var DOKU_BASE   = '".DOKU_BASE."';";
+    print "var DOKU_MEDIA   = '".DOKU_MEDIA."';";
+    print "var DOKU_TPL    = '".DOKU_TPL."';";
+    print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
+    print "var DOKU_UHC    = ".((int) useHeading('content')).";";
+
+    // load JS specific translations
+    $json = new JSON();
+    $lang['js']['plugins'] = js_pluginstrings();
+    echo 'LANG = '.$json->encode($lang['js']).";\n";
+
+    // load toolbar
+    require_once(DOKU_INC.'inc/toolbar.php');
+    toolbar_JSdefines('toolbar');
+
+    // load files
+    foreach($files as $file){
+        echo "\n\n/* XXXXXXXXXX begin of ".str_replace(DOKU_INC, '', $file) ." XXXXXXXXXX */\n\n";
+        js_load($file);
+        echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n";
+    }
+
+
+    // init stuff
+    js_runonstart("ajax_qsearch.init('qsearch__in','qsearch__out')");
+    js_runonstart("addEvent(document,'click',closePopups)");
+    js_runonstart('addTocToggle()');
+    js_runonstart("initSizeCtl('size__ctl','wiki__text')");
+    js_runonstart("initToolbar('tool__bar','wiki__text',toolbar)");
+    js_runonstart("initChangeCheck('".js_escape($lang['notsavedyet'])."')");
+    js_runonstart("locktimer.init(".($conf['locktime'] - 60).",'".js_escape($lang['willexpire'])."',".$conf['usedraft'].")");
+    js_runonstart('scrollToMarker()');
+    js_runonstart('focusMarker()');
+
+    // end output buffering and get contents
+    $js = ob_get_contents();
+    ob_end_clean();
+
+    // compress whitespace and comments
+    if($conf['compress']){
+        $js = js_compress($js);
+    }
+
+    $js .= "\n"; // https://bugzilla.mozilla.org/show_bug.cgi?id=316033
+
+    // save cache file
+    io_saveFile($cache,$js);
+    if(function_exists('gzopen')) io_saveFile("$cache.gz",$js);
+
+    // finally send output
+    if ($conf['gzip_output']) {
+        header('Vary: Accept-Encoding');
+        header('Content-Encoding: gzip');
+        print gzencode($js,9,FORCE_GZIP);
+    } else {
+        print $js;
+    }
+}
+
+/**
+ * Load the given file, handle include calls and print it
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_load($file){
+    if(!@file_exists($file)) return;
+    static $loaded = array();
+
+    $data = io_readFile($file);
+    while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\./]+)\s*\*/#',$data,$match)){
+        $ifile = $match[2];
+
+        // is it a include_once?
+        if($match[1]){
+            $base = basename($ifile);
+            if($loaded[$base]) continue;
+            $loaded[$base] = true;
+        }
+
+        if($ifile{0} != '/') $ifile = dirname($file).'/'.$ifile;
+
+        if(@file_exists($ifile)){
+            $idata = io_readFile($ifile);
+        }else{
+            $idata = '';
+        }
+        $data  = str_replace($match[0],$idata,$data);
+    }
+    echo $data;
+}
+
+/**
+ * Checks if a JavaScript Cache file still is valid
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_cacheok($cache,$files){
+    if(isset($_REQUEST['purge'])) return false; //support purge request
+
+    $ctime = @filemtime($cache);
+    if(!$ctime) return false; //There is no cache
+
+    // some additional files to check
+    $files = array_merge($files, getConfigFiles('main'));
+    $files[] = DOKU_CONF.'userscript.js';
+    $files[] = __FILE__;
+
+    // now walk the files
+    foreach($files as $file){
+        if(@filemtime($file) > $ctime){
+            return false;
+        }
+    }
+    return true;
+}
+
+/**
+ * Returns a list of possible Plugin Scripts (no existance check here)
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_pluginscripts(){
+    $list = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        $list[] = DOKU_PLUGIN."$p/script.js";
+    }
+    return $list;
+}
+
+/**
+ * Return an two-dimensional array with strings from the language file of each plugin.
+ *
+ * - $lang['js'] must be an array.
+ * - Nothing is returned for plugins without an entry for $lang['js']
+ *
+ * @author Gabriel Birke <birke@d-scribe.de>
+ */
+function js_pluginstrings()
+{
+    global $conf;
+    $pluginstrings = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        if (isset($lang)) unset($lang);
+        if (@file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
+            include DOKU_PLUGIN."$p/lang/en/lang.php";
+        }
+        if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
+            include DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php";
+        }
+        if (isset($lang['js'])) {
+            $pluginstrings[$p] = $lang['js'];
+        }
+    }
+    return $pluginstrings;
+}
+
+/**
+ * Escapes a String to be embedded in a JavaScript call, keeps \n
+ * as newline
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_escape($string){
+    return str_replace('\\\\n','\\n',addslashes($string));
+}
+
+/**
+ * Adds the given JavaScript code to the window.onload() event
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function js_runonstart($func){
+    echo "addInitEvent(function(){ $func; });".NL;
+}
+
+/**
+ * Strip comments and whitespaces from given JavaScript Code
+ *
+ * This is a port of Nick Galbreath's python tool jsstrip.py which is
+ * released under BSD license. See link for original code.
+ *
+ * @author Nick Galbreath <nickg@modp.com>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @link   http://code.google.com/p/jsstrip/
+ */
+function js_compress($s){
+    $s = ltrim($s);     // strip all initial whitespace
+    $s .= "\n";
+    $i = 0;             // char index for input string
+    $j = 0;             // char forward index for input string
+    $line = 0;          // line number of file (close to it anyways)
+    $slen = strlen($s); // size of input string
+    $lch  = '';         // last char added
+    $result = '';       // we store the final result here
+
+    // items that don't need spaces next to them
+    $chars = "^&|!+\-*\/%=\?:;,{}()<>% \t\n\r'\"[]";
+
+    $regex_starters = array("(", "=", "[", "," , ":");
+
+    $whitespaces_chars = array(" ", "\t", "\n", "\r", "\0", "\x0B");
+
+    while($i < $slen){
+        // skip all "boring" characters.  This is either
+        // reserved word (e.g. "for", "else", "if") or a
+        // variable/object/method (e.g. "foo.color")
+        while ($i < $slen && (strpos($chars,$s[$i]) === false) ){
+            $result .= $s{$i};
+            $i = $i + 1;
+        }
+
+        $ch = $s{$i};
+        // multiline comments (keeping IE conditionals)
+        if($ch == '/' && $s{$i+1} == '*' && $s{$i+2} != '@'){
+            $endC = strpos($s,'*/',$i+2);
+            if($endC === false) trigger_error('Found invalid /*..*/ comment', E_USER_ERROR);
+            $i = $endC + 2;
+            continue;
+        }
+
+        // singleline
+        if($ch == '/' && $s{$i+1} == '/'){
+            $endC = strpos($s,"\n",$i+2);
+            if($endC === false) trigger_error('Invalid comment', E_USER_ERROR);
+            $i = $endC;
+            continue;
+        }
+
+        // tricky.  might be an RE
+        if($ch == '/'){
+            // rewind, skip white space
+            $j = 1;
+            while(in_array($s{$i-$j}, $whitespaces_chars)){
+                $j = $j + 1;
+            }
+            if( in_array($s{$i-$j}, $regex_starters) ){
+                // yes, this is an re
+                // now move forward and find the end of it
+                $j = 1;
+                while($s{$i+$j} != '/'){
+                    while( ($s{$i+$j} != '\\') && ($s{$i+$j} != '/')){
+                        $j = $j + 1;
+                    }
+                    if($s{$i+$j} == '\\') $j = $j + 2;
+                }
+                $result .= substr($s,$i,$j+1);
+                $i = $i + $j + 1;
+                continue;
+            }
+        }
+
+        // double quote strings
+        if($ch == '"'){
+            $j = 1;
+            while( $s{$i+$j} != '"' && ($i+$j < $slen)){
+                if( $s{$i+$j} == '\\' && ($s{$i+$j+1} == '"' || $s{$i+$j+1} == '\\') ){
+                    $j += 2;
+                }else{
+                    $j += 1;
+                }
+            }
+            $result .= substr($s,$i,$j+1);
+            $i = $i + $j + 1;
+            continue;
+        }
+
+        // single quote strings
+        if($ch == "'"){
+            $j = 1;
+            while( $s{$i+$j} != "'" && ($i+$j < $slen)){
+                if( $s{$i+$j} == '\\' && ($s{$i+$j+1} == "'" || $s{$i+$j+1} == '\\') ){
+                    $j += 2;
+                }else{
+                    $j += 1;
+                }
+            }
+            $result .= substr($s,$i,$j+1);
+            $i = $i + $j + 1;
+            continue;
+        }
+
+        // whitespaces
+        if( $ch == ' ' || $ch == "\r" || $ch == "\n" || $ch == "\t" ){
+            // leading spaces
+            if($i+1 < $slen && (strpos($chars,$s[$i+1]) !== false)){
+                $i = $i + 1;
+                continue;
+            }
+            // trailing spaces
+            //  if this ch is space AND the last char processed
+            //  is special, then skip the space
+            $lch = substr($result,-1);
+            if($lch && (strpos($chars,$lch) !== false)){
+                $i = $i + 1;
+                continue;
+            }
+            // else after all of this convert the "whitespace" to
+            // a single space.  It will get appended below
+            $ch = ' ';
+        }
+
+        // other chars
+        $result .= $ch;
+        $i = $i + 1;
+    }
+
+    return trim($result);
+}
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/mediamanager.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/mediamanager.php
new file mode 100644
index 000000000..f6e91b858
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/mediamanager.php
@@ -0,0 +1,105 @@
+<?php
+    if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+    define('DOKU_MEDIAMANAGER',1);
+
+    // for multi uploader:
+    @ini_set('session.use_only_cookies',0);
+
+    require_once(DOKU_INC.'inc/init.php');
+    require_once(DOKU_INC.'inc/lang/en/lang.php');
+    require_once(DOKU_INC.'inc/lang/'.$conf['lang'].'/lang.php');
+    require_once(DOKU_INC.'inc/media.php');
+    require_once(DOKU_INC.'inc/common.php');
+    require_once(DOKU_INC.'inc/search.php');
+    require_once(DOKU_INC.'inc/template.php');
+    require_once(DOKU_INC.'inc/auth.php');
+
+    trigger_event('MEDIAMANAGER_STARTED',$tmp=array());
+    session_write_close();  //close session
+
+    // handle passed message
+    if($_REQUEST['msg1']) msg(hsc($_REQUEST['msg1']),1);
+    if($_REQUEST['err']) msg(hsc($_REQUEST['err']),-1);
+
+
+    // get namespace to display (either direct or from deletion order)
+    if($_REQUEST['delete']){
+        $DEL = cleanID($_REQUEST['delete']);
+        $IMG = $DEL;
+        $NS  = getNS($DEL);
+    }elseif($_REQUEST['edit']){
+        $IMG = cleanID($_REQUEST['edit']);
+        $NS  = getNS($IMG);
+    }elseif($_REQUEST['img']){
+        $IMG = cleanID($_REQUEST['img']);
+        $NS  = getNS($IMG);
+    }else{
+        $NS = $_REQUEST['ns'];
+        $NS = cleanID($NS);
+    }
+
+    // check auth
+    $AUTH = auth_quickaclcheck("$NS:*");
+
+    // create the given namespace (just for beautification)
+    if($AUTH >= AUTH_UPLOAD) { io_createNamespace("$NS:xxx", 'media'); }
+
+    // handle flash upload
+    if(isset($_FILES['Filedata'])){
+        $_FILES['upload'] =& $_FILES['Filedata'];
+        $JUMPTO = media_upload($NS,$AUTH);
+        if($JUMPTO == false){
+            header("HTTP/1.0 400 Bad Request");
+            echo 'Upload failed';
+        }
+        echo 'ok';
+        exit;
+    }
+
+    // give info on PHP catched upload errors
+    if($_FILES['upload']['error']){
+        switch($_FILES['upload']['error']){
+            case 1:
+            case 2:
+                msg(sprintf($lang['uploadsize'],
+                    filesize_h(php_to_byte(ini_get('upload_max_filesize')))),-1);
+                break;
+            default:
+                msg($lang['uploadfail'].' ('.$_FILES['upload']['error'].')',-1);
+        }
+        unset($_FILES['upload']);
+    }
+
+    // handle upload
+    if($_FILES['upload']['tmp_name']){
+        $JUMPTO = media_upload($NS,$AUTH);
+        if($JUMPTO) $NS = getNS($JUMPTO);
+    }
+
+    // handle meta saving
+    if($IMG && $_REQUEST['do']['save']){
+        $JUMPTO = media_metasave($IMG,$AUTH,$_REQUEST['meta']);
+    }
+
+    // handle deletion
+    if($DEL) {
+        $INUSE = media_inuse($DEL);
+        if(!$INUSE) {
+            if(media_delete($DEL,$AUTH)) {
+                msg(sprintf($lang['deletesucc'],noNS($DEL)),1);
+            } else {
+                msg(sprintf($lang['deletefail'],noNS($DEL)),-1);
+            }
+        } else {
+            if(!$conf['refshow']) {
+                unset($INUSE);
+                msg(sprintf($lang['mediainuse'],noNS($DEL)),0);
+            }
+        }
+    }
+
+    // finished - start output
+    header('Content-Type: text/html; charset=utf-8');
+    include(template('mediamanager.php'));
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/multipleUpload.swf b/mod/dokuwiki/vendors/dokuwiki/lib/exe/multipleUpload.swf
new file mode 100644
index 000000000..888aab045
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/multipleUpload.swf
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/opensearch.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/opensearch.php
new file mode 100644
index 000000000..f16b4f681
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/opensearch.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * DokuWiki OpenSearch creator
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @link       http://www.opensearch.org/
+ * @author     Mike Frysinger <vapier@gentoo.org>
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/init.php');
+
+// try to be clever about the favicon location
+if(file_exists(DOKU_INC.'favicon.ico')){
+    $ico = DOKU_URL.'favicon.ico';
+}elseif(file_exists(DOKU_TPLINC.'images/favicon.ico')){
+    $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
+}elseif(file_exists(DOKU_TPLINC.'favicon.ico')){
+    $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
+}else{
+    $ico = DOKU_URL.'lib/tpl/default/images/favicon.ico';
+}
+
+// output
+header('Content-Type: application/opensearchdescription+xml; charset=utf-8');
+echo '<?xml version="1.0"?>'.NL;
+echo '<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">'.NL;
+echo '  <ShortName>'.htmlspecialchars($conf['title']).'</ShortName>'.NL;
+echo '  <Image width="16" height="16" type="image/x-icon">'.$ico.'</Image>'.NL;
+echo '  <Url type="text/html" template="'.DOKU_URL.DOKU_SCRIPT.'?do=search&amp;id={searchTerms}" />'.NL;
+echo '  <Url type="application/x-suggestions+json" template="'.
+        DOKU_URL.'lib/exe/ajax.php?call=suggestions&amp;q={searchTerms}" />'.NL;
+echo '</OpenSearchDescription>'.NL;
+
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/exe/xmlrpc.php b/mod/dokuwiki/vendors/dokuwiki/lib/exe/xmlrpc.php
new file mode 100644
index 000000000..d3913482f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/exe/xmlrpc.php
@@ -0,0 +1,921 @@
+<?php
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+
+// fix when '<?xml' isn't on the very first line
+if(isset($HTTP_RAW_POST_DATA)) $HTTP_RAW_POST_DATA = trim($HTTP_RAW_POST_DATA);
+
+/**
+ * Increased whenever the API is changed
+ */
+define('DOKU_XMLRPC_API_VERSION',2);
+
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/auth.php');
+session_write_close();  //close session
+
+if(!$conf['xmlrpc']) die('XML-RPC server not enabled.');
+
+require_once(DOKU_INC.'inc/IXR_Library.php');
+
+
+/**
+ * Contains needed wrapper functions and registers all available
+ * XMLRPC functions.
+ */
+class dokuwiki_xmlrpc_server extends IXR_IntrospectionServer {
+    var $methods       = array();
+    var $public_methods = array();
+
+    /**
+     * Checks if the current user is allowed to execute non anonymous methods
+     */
+    function checkAuth(){
+        global $conf;
+        global $USERINFO;
+
+        if(!$conf['useacl']) return true; //no ACL - then no checks
+
+        $allowed = explode(',',$conf['xmlrpcuser']);
+        $allowed = array_map('trim', $allowed);
+        $allowed = array_unique($allowed);
+        $allowed = array_filter($allowed);
+
+        if(!count($allowed)) return true; //no restrictions
+
+        $user   = $_SERVER['REMOTE_USER'];
+        $groups = (array) $USERINFO['grps'];
+
+        if(in_array($user,$allowed)) return true; //user explicitly mentioned
+
+        //check group memberships
+        foreach($groups as $group){
+            if(in_array('@'.$group,$allowed)) return true;
+        }
+
+        //still here? no access!
+        return false;
+    }
+
+    /**
+     * Adds a callback, extends parent method
+     *
+     * add another parameter to define if anonymous access to
+     * this method should be granted.
+     */
+    function addCallback($method, $callback, $args, $help, $public=false){
+        if($public) $this->public_methods[] = $method;
+        return parent::addCallback($method, $callback, $args, $help);
+    }
+
+    /**
+     * Execute a call, extends parent method
+     *
+     * Checks for authentication first
+     */
+    function call($methodname, $args){
+        if(!in_array($methodname,$this->public_methods) && !$this->checkAuth()){
+            return new IXR_Error(-32603, 'server error. not authorized to call method "'.$methodname.'".');
+        }
+        return parent::call($methodname, $args);
+    }
+
+    /**
+     * Constructor. Register methods and run Server
+     */
+    function dokuwiki_xmlrpc_server(){
+        $this->IXR_IntrospectionServer();
+
+        /* DokuWiki's own methods */
+        $this->addCallback(
+            'dokuwiki.getXMLRPCAPIVersion',
+            'this:getAPIVersion',
+            array('integer'),
+            'Returns the XMLRPC API version.',
+            true
+        );
+
+        $this->addCallback(
+            'dokuwiki.getVersion',
+            'getVersion',
+            array('string'),
+            'Returns the running DokuWiki version.',
+            true
+        );
+
+        $this->addCallback(
+            'dokuwiki.login',
+            'this:login',
+            array('integer','string','string'),
+            'Tries to login with the given credentials and sets auth cookies.',
+            true
+        );
+
+        $this->addCallback(
+            'dokuwiki.getPagelist',
+            'this:readNamespace',
+            array('struct','string','struct'),
+            'List all pages within the given namespace.'
+        );
+
+        $this->addCallback(
+            'dokuwiki.getTime',
+            'time',
+            array('int'),
+            'Return the current time at the wiki server.'
+        );
+
+        $this->addCallback(
+            'dokuwiki.setLocks',
+            'this:setLocks',
+            array('struct','struct'),
+            'Lock or unlock pages.'
+        );
+
+        /* Wiki API v2 http://www.jspwiki.org/wiki/WikiRPCInterface2 */
+        $this->addCallback(
+            'wiki.getRPCVersionSupported',
+            'this:wiki_RPCVersion',
+            array('int'),
+            'Returns 2 with the supported RPC API version.',
+            true
+        );
+        $this->addCallback(
+            'wiki.getPage',
+            'this:rawPage',
+            array('string','string'),
+            'Get the raw Wiki text of page, latest version.'
+        );
+        $this->addCallback(
+            'wiki.getPageVersion',
+            'this:rawPage',
+            array('string','string','int'),
+            'Get the raw Wiki text of page.'
+        );
+        $this->addCallback(
+            'wiki.getPageHTML',
+            'this:htmlPage',
+            array('string','string'),
+            'Return page in rendered HTML, latest version.'
+        );
+        $this->addCallback(
+            'wiki.getPageHTMLVersion',
+            'this:htmlPage',
+            array('string','string','int'),
+            'Return page in rendered HTML.'
+        );
+        $this->addCallback(
+            'wiki.getAllPages',
+            'this:listPages',
+            array('struct'),
+            'Returns a list of all pages. The result is an array of utf8 pagenames.'
+        );
+        $this->addCallback(
+            'wiki.getAttachments',
+            'this:listAttachments',
+            array('struct', 'string', 'struct'),
+            'Returns a list of all media files.'
+        );
+        $this->addCallback(
+            'wiki.getBackLinks',
+            'this:listBackLinks',
+            array('struct','string'),
+            'Returns the pages that link to this page.'
+        );
+        $this->addCallback(
+            'wiki.getPageInfo',
+            'this:pageInfo',
+            array('struct','string'),
+            'Returns a struct with infos about the page.'
+        );
+        $this->addCallback(
+            'wiki.getPageInfoVersion',
+            'this:pageInfo',
+            array('struct','string','int'),
+            'Returns a struct with infos about the page.'
+        );
+        $this->addCallback(
+            'wiki.getPageVersions',
+            'this:pageVersions',
+            array('struct','string','int'),
+            'Returns the available revisions of the page.'
+        );
+        $this->addCallback(
+            'wiki.putPage',
+            'this:putPage',
+            array('int', 'string', 'string', 'struct'),
+            'Saves a wiki page.'
+        );
+        $this->addCallback(
+            'wiki.listLinks',
+            'this:listLinks',
+            array('struct','string'),
+            'Lists all links contained in a wiki page.'
+        );
+        $this->addCallback(
+            'wiki.getRecentChanges',
+            'this:getRecentChanges',
+            array('struct','int'),
+            'Returns a struct about all recent changes since given timestamp.'
+        );
+        $this->addCallback(
+            'wiki.getRecentMediaChanges',
+            'this:getRecentMediaChanges',
+            array('struct','int'),
+            'Returns a struct about all recent media changes since given timestamp.'
+        );
+        $this->addCallback(
+            'wiki.aclCheck',
+            'this:aclCheck',
+            array('int', 'string'),
+            'Returns the permissions of a given wiki page.'
+        );
+        $this->addCallback(
+            'wiki.putAttachment',
+            'this:putAttachment',
+            array('struct', 'string', 'base64', 'struct'),
+            'Upload a file to the wiki.'
+        );
+        $this->addCallback(
+            'wiki.deleteAttachment',
+            'this:deleteAttachment',
+            array('int', 'string'),
+            'Delete a file from the wiki.'
+        );
+        $this->addCallback(
+            'wiki.getAttachment',
+            'this:getAttachment',
+            array('base64', 'string'),
+            'Download a file from the wiki.'
+        );
+        $this->addCallback(
+            'wiki.getAttachmentInfo',
+            'this:getAttachmentInfo',
+            array('struct', 'string'),
+            'Returns a struct with infos about the attachment.'
+        );
+
+        /**
+         * Trigger XMLRPC_CALLBACK_REGISTER, action plugins can use this event
+         * to extend the XMLRPC interface and register their own callbacks.
+         *
+         * Event data:
+         *  The XMLRPC server object:
+         *
+         *  $event->data->addCallback() - register a callback, the second
+         *  paramter has to be of the form "plugin:<pluginname>:<plugin
+         *  method>"
+         *
+         *  $event->data->callbacks - an array which holds all awaylable
+         *  callbacks
+         */
+        trigger_event('XMLRPC_CALLBACK_REGISTER', $this);
+
+        $this->serve();
+    }
+
+    /**
+     * Return a raw wiki page
+     */
+    function rawPage($id,$rev=''){
+        if(auth_quickaclcheck($id) < AUTH_READ){
+            return new IXR_Error(1, 'You are not allowed to read this page');
+        }
+        $text = rawWiki($id,$rev);
+        if(!$text) {
+            $data = array($id);
+            return trigger_event('HTML_PAGE_FROMTEMPLATE',$data,'pageTemplate',true);
+        } else {
+            return $text;
+        }
+    }
+
+    /**
+     * Return a media file encoded in base64
+     *
+     * @author Gina Haeussge <osd@foosel.net>
+     */
+    function getAttachment($id){
+        $id = cleanID($id);
+        if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ)
+            return new IXR_Error(1, 'You are not allowed to read this file');
+
+        $file = mediaFN($id);
+        if (!@ file_exists($file))
+            return new IXR_Error(1, 'The requested file does not exist');
+
+        $data = io_readFile($file, false);
+        $base64 = base64_encode($data);
+        return $base64;
+    }
+
+    /**
+     * Return info about a media file
+     *
+     * @author Gina Haeussge <osd@foosel.net>
+     */
+    function getAttachmentInfo($id){
+        $id = cleanID($id);
+        $info = array(
+            'lastModified' => 0,
+            'size' => 0,
+        );
+
+        $file = mediaFN($id);
+        if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){
+            $info['lastModified'] = new IXR_Date(filemtime($file));
+            $info['size'] = filesize($file);
+        }
+
+        return $info;
+    }
+
+    /**
+     * Return a wiki page rendered to html
+     */
+    function htmlPage($id,$rev=''){
+        if(auth_quickaclcheck($id) < AUTH_READ){
+            return new IXR_Error(1, 'You are not allowed to read this page');
+        }
+        return p_wiki_xhtml($id,$rev,false);
+    }
+
+    /**
+     * List all pages - we use the indexer list here
+     */
+    function listPages(){
+        global $conf;
+
+        $list  = array();
+        $pages = file($conf['indexdir'] . '/page.idx');
+        $pages = array_filter($pages, 'isVisiblePage');
+
+        foreach(array_keys($pages) as $idx) {
+            if(page_exists($pages[$idx])) {
+                $perm = auth_quickaclcheck($pages[$idx]);
+                if($perm >= AUTH_READ) {
+                    $page = array();
+                    $page['id'] = trim($pages[$idx]);
+                    $page['perms'] = $perm;
+                    $page['size'] = @filesize(wikiFN($pages[$idx]));
+                    $page['lastModified'] = new IXR_Date(@filemtime(wikiFN($pages[$idx])));
+                    $list[] = $page;
+                }
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * List all pages in the given namespace (and below)
+     */
+    function readNamespace($ns,$opts){
+        global $conf;
+
+        if(!is_array($opts)) $opts=array();
+
+        $ns = cleanID($ns);
+        $dir = utf8_encodeFN(str_replace(':', '/', $ns));
+        $data = array();
+        require_once(DOKU_INC.'inc/search.php');
+        $opts['skipacl'] = 0; // no ACL skipping for XMLRPC
+        search($data, $conf['datadir'], 'search_allpages', $opts, $dir);
+        return $data;
+    }
+
+    /**
+     * List all media files.
+     *
+     * Available options are 'recursive' for also including the subnamespaces
+     * in the listing, and 'pattern' for filtering the returned files against
+     * a regular expression matching their name.
+     *
+     * @author Gina Haeussge <osd@foosel.net>
+     */
+    function listAttachments($ns, $options = array()) {
+        global $conf;
+        global $lang;
+
+        $ns = cleanID($ns);
+
+        if (!is_array($options)) $options = array();
+        $options['skipacl'] = 0; // no ACL skipping for XMLRPC
+
+
+        if(auth_quickaclcheck($ns.':*') >= AUTH_READ) {
+            $dir = utf8_encodeFN(str_replace(':', '/', $ns));
+
+            $data = array();
+            require_once(DOKU_INC.'inc/search.php');
+            search($data, $conf['mediadir'], 'search_media', $options, $dir);
+            $len = count($data);
+            if(!$len) return array();
+
+            for($i=0; $i<$len; $i++) {
+                unset($data[$i]['meta']);
+                $data[$i]['lastModified'] = new IXR_Date($data[$i]['mtime']);
+            }
+            return $data;
+        } else {
+            return new IXR_Error(1, 'You are not allowed to list media files.');
+        }
+    }
+
+    /**
+     * Return a list of backlinks
+     */
+    function listBackLinks($id){
+        require_once(DOKU_INC.'inc/fulltext.php');
+        return ft_backlinks($id);
+    }
+
+    /**
+     * Return some basic data about a page
+     */
+    function pageInfo($id,$rev=''){
+        if(auth_quickaclcheck($id) < AUTH_READ){
+            return new IXR_Error(1, 'You are not allowed to read this page');
+        }
+        $file = wikiFN($id,$rev);
+        $time = @filemtime($file);
+        if(!$time){
+            return new IXR_Error(10, 'The requested page does not exist');
+        }
+
+        $info = getRevisionInfo($id, $time, 1024);
+
+        $data = array(
+            'name'         => $id,
+            'lastModified' => new IXR_Date($time),
+            'author'       => (($info['user']) ? $info['user'] : $info['ip']),
+            'version'      => $time
+        );
+
+        return ($data);
+    }
+
+    /**
+     * Save a wiki page
+     *
+     * @author Michael Klier <chi@chimeric.de>
+     */
+    function putPage($id, $text, $params) {
+        global $TEXT;
+        global $lang;
+        global $conf;
+
+        $id    = cleanID($id);
+        $TEXT  = cleanText($text);
+        $sum   = $params['sum'];
+        $minor = $params['minor'];
+
+        if(empty($id))
+            return new IXR_Error(1, 'Empty page ID');
+
+        if(!page_exists($id) && trim($TEXT) == '' ) {
+            return new IXR_ERROR(1, 'Refusing to write an empty new wiki page');
+        }
+
+        if(auth_quickaclcheck($id) < AUTH_EDIT)
+            return new IXR_Error(1, 'You are not allowed to edit this page');
+
+        // Check, if page is locked
+        if(checklock($id))
+            return new IXR_Error(1, 'The page is currently locked');
+
+        // SPAM check
+        if(checkwordblock())
+            return new IXR_Error(1, 'Positive wordblock check');
+
+        // autoset summary on new pages
+        if(!page_exists($id) && empty($sum)) {
+            $sum = $lang['created'];
+        }
+
+        // autoset summary on deleted pages
+        if(page_exists($id) && empty($TEXT) && empty($sum)) {
+            $sum = $lang['deleted'];
+        }
+
+        lock($id);
+
+        saveWikiText($id,$TEXT,$sum,$minor);
+
+        unlock($id);
+
+        // run the indexer if page wasn't indexed yet
+        if(!@file_exists(metaFN($id, '.indexed'))) {
+            // try to aquire a lock
+            $lock = $conf['lockdir'].'/_indexer.lock';
+            while(!@mkdir($lock,$conf['dmode'])){
+                usleep(50);
+                if(time()-@filemtime($lock) > 60*5){
+                    // looks like a stale lock - remove it
+                    @rmdir($lock);
+                }else{
+                    return false;
+                }
+            }
+            if($conf['dperm']) chmod($lock, $conf['dperm']);
+
+            require_once(DOKU_INC.'inc/indexer.php');
+
+            // do the work
+            idx_addPage($id);
+
+            // we're finished - save and free lock
+            io_saveFile(metaFN($id,'.indexed'),INDEXER_VERSION);
+            @rmdir($lock);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Uploads a file to the wiki.
+     *
+     * Michael Klier <chi@chimeric.de>
+     */
+    function putAttachment($id, $file, $params) {
+        global $conf;
+        global $lang;
+
+        $auth = auth_quickaclcheck(getNS($id).':*');
+        if($auth >= AUTH_UPLOAD) {
+            if(!isset($id)) {
+                return new IXR_ERROR(1, 'Filename not given.');
+            }
+
+            $ftmp = $conf['tmpdir'] . '/' . $id;
+
+            // save temporary file
+            @unlink($ftmp);
+            $buff = base64_decode($file);
+            io_saveFile($ftmp, $buff);
+
+            // get filename
+            list($iext, $imime,$dl) = mimetype($id);
+            $id = cleanID($id);
+            $fn = mediaFN($id);
+
+            // get filetype regexp
+            $types = array_keys(getMimeTypes());
+            $types = array_map(create_function('$q','return preg_quote($q,"/");'),$types);
+            $regex = join('|',$types);
+
+            // because a temp file was created already
+            if(preg_match('/\.('.$regex.')$/i',$fn)) {
+                //check for overwrite
+                $overwrite = @file_exists($fn);
+                if($overwrite && (!$params['ow'] || $auth < AUTH_DELETE)) {
+                    return new IXR_ERROR(1, $lang['uploadexist'].'1');
+                }
+                // check for valid content
+                @require_once(DOKU_INC.'inc/media.php');
+                $ok = media_contentcheck($ftmp, $imime);
+                if($ok == -1) {
+                    return new IXR_ERROR(1, sprintf($lang['uploadexist'].'2', ".$iext"));
+                } elseif($ok == -2) {
+                    return new IXR_ERROR(1, $lang['uploadspam']);
+                } elseif($ok == -3) {
+                    return new IXR_ERROR(1, $lang['uploadxss']);
+                }
+
+                // prepare event data
+                $data[0] = $ftmp;
+                $data[1] = $fn;
+                $data[2] = $id;
+                $data[3] = $imime;
+                $data[4] = $overwrite;
+
+                // trigger event
+                require_once(DOKU_INC.'inc/events.php');
+                return trigger_event('MEDIA_UPLOAD_FINISH', $data, array($this, '_media_upload_action'), true);
+
+            } else {
+                return new IXR_ERROR(1, $lang['uploadwrong']);
+            }
+        } else {
+            return new IXR_ERROR(1, "You don't have permissions to upload files.");
+        }
+    }
+
+    /**
+     * Deletes a file from the wiki.
+     *
+     * @author Gina Haeussge <osd@foosel.net>
+     */
+    function deleteAttachment($id){
+        $auth = auth_quickaclcheck(getNS($id).':*');
+        if($auth < AUTH_DELETE) return new IXR_ERROR(1, "You don't have permissions to delete files.");
+        global $conf;
+        global $lang;
+
+        // check for references if needed
+        $mediareferences = array();
+        if($conf['refcheck']){
+            require_once(DOKU_INC.'inc/fulltext.php');
+            $mediareferences = ft_mediause($id,$conf['refshow']);
+        }
+
+        if(!count($mediareferences)){
+            $file = mediaFN($id);
+            if(@unlink($file)){
+                require_once(DOKU_INC.'inc/changelog.php');
+                addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE);
+                io_sweepNS($id,'mediadir');
+                return 0;
+            }
+            //something went wrong
+               return new IXR_ERROR(1, 'Could not delete file');
+        } else {
+            return new IXR_ERROR(1, 'File is still referenced');
+        }
+    }
+
+    /**
+     * Moves the temporary file to its final destination.
+     *
+     * Michael Klier <chi@chimeric.de>
+     */
+    function _media_upload_action($data) {
+        global $conf;
+
+        if(is_array($data) && count($data)===5) {
+            io_createNamespace($data[2], 'media');
+            if(rename($data[0], $data[1])) {
+                chmod($data[1], $conf['fmode']);
+                media_notify($data[2], $data[1], $data[3]);
+                // add a log entry to the media changelog
+                require_once(DOKU_INC.'inc/changelog.php');
+                if ($data[4]) {
+                    addMediaLogEntry(time(), $data[2], DOKU_CHANGE_TYPE_EDIT);
+                } else {
+                    addMediaLogEntry(time(), $data[2], DOKU_CHANGE_TYPE_CREATE);
+                }
+                return $data[2];
+            } else {
+                return new IXR_ERROR(1, 'Upload failed.');
+            }
+        } else {
+            return new IXR_ERROR(1, 'Upload failed.');
+        }
+    }
+
+    /**
+    * Returns the permissions of a given wiki page
+    */
+    function aclCheck($id) {
+        return auth_quickaclcheck($id);
+    }
+
+    /**
+     * Lists all links contained in a wiki page
+     *
+     * @author Michael Klier <chi@chimeric.de>
+     */
+    function listLinks($id) {
+        if(auth_quickaclcheck($id) < AUTH_READ){
+            return new IXR_Error(1, 'You are not allowed to read this page');
+        }
+        $links = array();
+
+        // resolve page instructions
+        $ins   = p_cached_instructions(wikiFN(cleanID($id)));
+
+        // instantiate new Renderer - needed for interwiki links
+        include(DOKU_INC.'inc/parser/xhtml.php');
+        $Renderer = new Doku_Renderer_xhtml();
+        $Renderer->interwiki = getInterwiki();
+
+        // parse parse instructions
+        foreach($ins as $in) {
+            $link = array();
+            switch($in[0]) {
+                case 'internallink':
+                    $link['type'] = 'local';
+                    $link['page'] = $in[1][0];
+                    $link['href'] = wl($in[1][0]);
+                    array_push($links,$link);
+                    break;
+                case 'externallink':
+                    $link['type'] = 'extern';
+                    $link['page'] = $in[1][0];
+                    $link['href'] = $in[1][0];
+                    array_push($links,$link);
+                    break;
+                case 'interwikilink':
+                    $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]);
+                    $link['type'] = 'extern';
+                    $link['page'] = $url;
+                    $link['href'] = $url;
+                    array_push($links,$link);
+                    break;
+            }
+        }
+
+        return ($links);
+    }
+
+    /**
+     * Returns a list of recent changes since give timestamp
+     *
+     * @author Michael Hamann <michael@content-space.de>
+     * @author Michael Klier <chi@chimeric.de>
+     */
+    function getRecentChanges($timestamp) {
+        if(strlen($timestamp) != 10)
+            return new IXR_Error(20, 'The provided value is not a valid timestamp');
+
+        require_once(DOKU_INC.'inc/changelog.php');
+        require_once(DOKU_INC.'inc/pageutils.php');
+
+        $recents = getRecentsSince($timestamp);
+
+        $changes = array();
+
+        foreach ($recents as $recent) {
+            $change = array();
+            $change['name']         = $recent['id'];
+            $change['lastModified'] = new IXR_Date($recent['date']);
+            $change['author']       = $recent['user'];
+            $change['version']      = $recent['date'];
+            $change['perms']        = $recent['perms'];
+            $change['size']         = @filesize(wikiFN($recent['id']));
+            array_push($changes, $change);
+        }
+
+        if (!empty($changes)) {
+            return $changes;
+        } else {
+            // in case we still have nothing at this point
+            return new IXR_Error(30, 'There are no changes in the specified timeframe');
+        }
+    }
+
+    /**
+     * Returns a list of recent media changes since give timestamp
+     *
+     * @author Michael Hamann <michael@content-space.de>
+     * @author Michael Klier <chi@chimeric.de>
+     */
+    function getRecentMediaChanges($timestamp) {
+        if(strlen($timestamp) != 10)
+            return new IXR_Error(20, 'The provided value is not a valid timestamp');
+
+        require_once(DOKU_INC.'inc/changelog.php');
+        require_once(DOKU_INC.'inc/pageutils.php');
+
+        $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES);
+
+        $changes = array();
+
+        foreach ($recents as $recent) {
+            $change = array();
+            $change['name']         = $recent['id'];
+            $change['lastModified'] = new IXR_Date($recent['date']);
+            $change['author']       = $recent['user'];
+            $change['version']      = $recent['date'];
+            $change['perms']        = $recent['perms'];
+            $change['size']         = @filesize(mediaFN($recent['id']));
+            array_push($changes, $change);
+        }
+
+        if (!empty($changes)) {
+            return $changes;
+        } else {
+            // in case we still have nothing at this point
+            return new IXR_Error(30, 'There are no changes in the specified timeframe');
+        }
+    }
+
+    /**
+     * Returns a list of available revisions of a given wiki page
+     *
+     * @author Michael Klier <chi@chimeric.de>
+     */
+    function pageVersions($id, $first) {
+        global $conf;
+
+        $versions = array();
+
+        if(empty($id))
+            return new IXR_Error(1, 'Empty page ID');
+
+        require_once(DOKU_INC.'inc/changelog.php');
+
+        $revisions = getRevisions($id, $first, $conf['recent']+1);
+
+        if(count($revisions)==0 && $first!=0) {
+            $first=0;
+            $revisions = getRevisions($id, $first, $conf['recent']+1);
+        }
+
+        if(count($revisions)>0 && $first==0) {
+            array_unshift($revisions, '');  // include current revision
+            array_pop($revisions);          // remove extra log entry
+        }
+
+        $hasNext = false;
+        if(count($revisions)>$conf['recent']) {
+            $hasNext = true;
+            array_pop($revisions); // remove extra log entry
+        }
+
+        if(!empty($revisions)) {
+            foreach($revisions as $rev) {
+                $file = wikiFN($id,$rev);
+                $time = @filemtime($file);
+                // we check if the page actually exists, if this is not the
+                // case this can lead to less pages being returned than
+                // specified via $conf['recent']
+                if($time){
+                    $info = getRevisionInfo($id, $time, 1024);
+                    if(!empty($info)) {
+                        $data['user'] = $info['user'];
+                        $data['ip']   = $info['ip'];
+                        $data['type'] = $info['type'];
+                        $data['sum']  = $info['sum'];
+                        $data['modified'] = new IXR_Date($info['date']);
+                        $data['version'] = $info['date'];
+                        array_push($versions, $data);
+                    }
+                }
+            }
+            return $versions;
+        } else {
+            return array();
+        }
+    }
+
+    /**
+     * The version of Wiki RPC API supported
+     */
+    function wiki_RPCVersion(){
+        return 2;
+    }
+
+
+    /**
+     * Locks or unlocks a given batch of pages
+     *
+     * Give an associative array with two keys: lock and unlock. Both should contain a
+     * list of pages to lock or unlock
+     *
+     * Returns an associative array with the keys locked, lockfail, unlocked and
+     * unlockfail, each containing lists of pages.
+     */
+    function setLocks($set){
+        $locked     = array();
+        $lockfail   = array();
+        $unlocked   = array();
+        $unlockfail = array();
+
+        foreach((array) $set['lock'] as $id){
+            if(checklock($id)){
+                $lockfail[] = $id;
+            }else{
+                lock($id);
+                $locked[] = $id;
+            }
+        }
+
+        foreach((array) $set['unlock'] as $id){
+            if(unlock($id)){
+                $unlocked[] = $id;
+            }else{
+                $unlockfail[] = $id;
+            }
+        }
+
+        return array(
+            'locked'     => $locked,
+            'lockfail'   => $lockfail,
+            'unlocked'   => $unlocked,
+            'unlockfail' => $unlockfail,
+        );
+    }
+
+    function getAPIVersion(){
+        return DOKU_XMLRPC_API_VERSION;
+    }
+
+    function login($user,$pass){
+        global $conf;
+        global $auth;
+        if(!$conf['useacl']) return 0;
+        if(!$auth) return 0;
+        if($auth->canDo('external')){
+            return $auth->trustExternal($user,$pass,false);
+        }else{
+            return auth_login($user,$pass,false,true);
+        }
+    }
+
+
+}
+
+$server = new dokuwiki_xmlrpc_server();
+
+// vim:ts=4:sw=4:et:enc=utf-8:
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/README b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/README
new file mode 100644
index 000000000..90bab9578
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/README
@@ -0,0 +1,2 @@
+These icons were taken from the nuvoX KDE icon theme and are GPL licensed
+See http://www.kde-look.org/content/show.php/nuvoX?content=38467
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/acl.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/acl.png
new file mode 100644
index 000000000..96fb4cd56
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/acl.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/config.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/config.png
new file mode 100644
index 000000000..e4d376d85
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/config.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/plugin.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/plugin.png
new file mode 100644
index 000000000..e2823bac7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/plugin.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/popularity.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/popularity.png
new file mode 100644
index 000000000..4e22aaf0d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/popularity.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/revert.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/revert.png
new file mode 100644
index 000000000..002d3a75b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/revert.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/usermanager.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/usermanager.png
new file mode 100644
index 000000000..c5c8dc6d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/admin/usermanager.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_down.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_down.gif
new file mode 100644
index 000000000..ff13b9585
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_down.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_up.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_up.gif
new file mode 100644
index 000000000..d491c18db
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/arrow_up.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/at.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/at.gif
new file mode 100644
index 000000000..8bdf40d54
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/at.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/blank.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/blank.gif
new file mode 100644
index 000000000..9935f8210
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/blank.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/close.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/close.png
new file mode 100644
index 000000000..e1b498c14
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/close.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/del.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/del.png
new file mode 100644
index 000000000..a3260d718
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/del.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/diff.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/diff.png
new file mode 100644
index 000000000..0b98d79ac
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/diff.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/edit.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/edit.gif
new file mode 100644
index 000000000..a2a23de7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/edit.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/error.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/error.png
new file mode 100644
index 000000000..8a1ba4c66
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/error.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/bz2.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/bz2.png
new file mode 100644
index 000000000..d48cae038
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/bz2.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/c.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/c.png
new file mode 100644
index 000000000..9446afcb4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/c.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/conf.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/conf.png
new file mode 100644
index 000000000..ddffe6fd1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/conf.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cpp.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cpp.png
new file mode 100644
index 000000000..2dc51b16d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cpp.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cs.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cs.png
new file mode 100644
index 000000000..d5db29ba5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/cs.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/css.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/css.png
new file mode 100644
index 000000000..89c1537fd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/css.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/deb.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/deb.png
new file mode 100644
index 000000000..9229d8783
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/deb.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/doc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/doc.png
new file mode 100644
index 000000000..932567f8a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/doc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/file.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/file.png
new file mode 100644
index 000000000..817014fa7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/file.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gif.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gif.png
new file mode 100644
index 000000000..b4c07a912
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gif.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gz.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gz.png
new file mode 100644
index 000000000..2426bd169
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/gz.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/htm.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/htm.png
new file mode 100644
index 000000000..1a6812185
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/htm.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/html.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/html.png
new file mode 100644
index 000000000..672cbce42
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/html.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/index.php b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/index.php
new file mode 100644
index 000000000..c1e64fe2a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/index.php
@@ -0,0 +1,50 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+ lang="en" dir="ltr">
+<head>
+    <title>filetype icons</title>
+
+    <style type="text/css">
+        body {
+            background-color: #ccc;
+            font-family: Arial;
+        }
+
+        .box {
+            width: 200px;
+            float:left;
+            padding: 0.5em;
+            margin: 0;
+        }
+
+        .white {
+            background-color: #fff;
+        }
+
+        .black {
+            background-color: #000;
+        }
+    </style>
+
+</head>
+<body>
+
+<div class="white box">
+<?php
+foreach (glob('*.png') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+<div class="black box">
+<?php
+foreach (glob('*.png') as $img) {
+    echo '<img src="'.$img.'" alt="'.$img.'" title="'.$img.'" /> ';
+}
+?>
+</div>
+
+</body>
+</html>
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/java.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/java.png
new file mode 100644
index 000000000..c5f2fd09f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/java.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpeg.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpeg.png
new file mode 100644
index 000000000..aa4cc23a5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpeg.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpg.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpg.png
new file mode 100644
index 000000000..1fb6cc1fb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/jpg.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/js.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/js.png
new file mode 100644
index 000000000..0c314eb56
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/js.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/lua.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/lua.png
new file mode 100644
index 000000000..7c07d023f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/lua.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odc.png
new file mode 100644
index 000000000..47f65c84d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odf.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odf.png
new file mode 100644
index 000000000..a2fbc5195
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odf.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odg.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odg.png
new file mode 100644
index 000000000..434f18262
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odg.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odi.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odi.png
new file mode 100644
index 000000000..74f6303d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odi.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odp.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odp.png
new file mode 100644
index 000000000..a5c77f845
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odp.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ods.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ods.png
new file mode 100644
index 000000000..2ab1273f0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ods.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odt.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odt.png
new file mode 100644
index 000000000..b0c21fc1f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/odt.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pdf.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pdf.png
new file mode 100644
index 000000000..638066dea
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pdf.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/php.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/php.png
new file mode 100644
index 000000000..e735f875b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/php.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pl.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pl.png
new file mode 100644
index 000000000..6ac381cd7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/pl.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/png.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/png.png
new file mode 100644
index 000000000..f0b5b00ee
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/png.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ppt.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ppt.png
new file mode 100644
index 000000000..adaefc602
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ppt.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ps.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ps.png
new file mode 100644
index 000000000..c51c763ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/ps.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/py.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/py.png
new file mode 100644
index 000000000..a21b8da49
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/py.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rar.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rar.png
new file mode 100644
index 000000000..a6af4d1ca
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rar.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rb.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rb.png
new file mode 100644
index 000000000..45f448978
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rb.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rpm.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rpm.png
new file mode 100644
index 000000000..22212eafa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rpm.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rtf.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rtf.png
new file mode 100644
index 000000000..d8bada5fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/rtf.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/swf.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/swf.png
new file mode 100644
index 000000000..0729ed020
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/swf.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxc.png
new file mode 100644
index 000000000..419c183c1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxd.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxd.png
new file mode 100644
index 000000000..5801bb23a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxd.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxi.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxi.png
new file mode 100644
index 000000000..2a94290d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxi.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxw.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxw.png
new file mode 100644
index 000000000..6da97beb3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/sxw.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tar.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tar.png
new file mode 100644
index 000000000..5a2f717fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tar.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tgz.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tgz.png
new file mode 100644
index 000000000..141acf564
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/tgz.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/txt.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/txt.png
new file mode 100644
index 000000000..da20009c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/txt.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xls.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xls.png
new file mode 100644
index 000000000..e8cd58dc0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xls.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xml.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xml.png
new file mode 100644
index 000000000..eb4632397
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/xml.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/zip.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/zip.png
new file mode 100644
index 000000000..999ffbe80
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/fileicons/zip.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/history.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/history.png
new file mode 100644
index 000000000..ef9e311d3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/history.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/index.html b/mod/dokuwiki/vendors/dokuwiki/lib/images/index.html
new file mode 100644
index 000000000..d614603ac
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=../../" />
+<meta name="robots" content="noindex" />
+<title>nothing here...</title>
+</head>
+<body>
+<!-- this is just here to prevent directory browsing -->
+</body>
+</html>
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/info.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/info.png
new file mode 100644
index 000000000..a237c1782
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/info.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki.png
new file mode 100644
index 000000000..73d6f8d39
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.de.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.de.gif
new file mode 100644
index 000000000..f52c1c581
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.de.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.gif
new file mode 100644
index 000000000..f52c1c581
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.uk.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.uk.gif
new file mode 100644
index 000000000..f52c1c581
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/amazon.uk.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/coral.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/coral.gif
new file mode 100644
index 000000000..0f9f67587
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/coral.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/doku.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/doku.gif
new file mode 100644
index 000000000..7dc4248e8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/doku.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/dokubug.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/dokubug.gif
new file mode 100644
index 000000000..3432b8d57
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/dokubug.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/google.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/google.gif
new file mode 100644
index 000000000..fb39f6152
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/google.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/meatball.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/meatball.gif
new file mode 100644
index 000000000..7ac545436
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/meatball.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/phpfn.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/phpfn.gif
new file mode 100644
index 000000000..638d4c450
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/phpfn.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/sb.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/sb.gif
new file mode 100644
index 000000000..e272a29b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/sb.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wiki.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wiki.gif
new file mode 100644
index 000000000..e8dc5d274
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wiki.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wp.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wp.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wp.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpde.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpde.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpde.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpes.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpes.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpes.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpfr.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpfr.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpfr.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpjp.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpjp.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpjp.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpmeta.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpmeta.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wpmeta.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wppl.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wppl.gif
new file mode 100644
index 000000000..ca853b8c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/interwiki/wppl.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/larger.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/larger.gif
new file mode 100644
index 000000000..e137c92fa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/larger.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-nd.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-nd.png
new file mode 100644
index 000000000..49f272f82
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-nd.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-sa.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-sa.png
new file mode 100644
index 000000000..0f2a0f107
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc-sa.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc.png
new file mode 100644
index 000000000..5f9821470
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nd.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nd.png
new file mode 100644
index 000000000..8f317035e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-nd.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-sa.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-sa.png
new file mode 100644
index 000000000..f0a944e0b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by-sa.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by.png
new file mode 100644
index 000000000..822491edb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc-by.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc.png
new file mode 100644
index 000000000..a66f4d1a0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/cc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/gnufdl.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/gnufdl.png
new file mode 100644
index 000000000..1371aba88
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/gnufdl.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/publicdomain.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/publicdomain.png
new file mode 100644
index 000000000..cedc39c62
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/badge/publicdomain.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-nd.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-nd.png
new file mode 100644
index 000000000..b27ead2f6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-nd.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-sa.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-sa.png
new file mode 100644
index 000000000..1c54f994d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc-sa.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc.png
new file mode 100644
index 000000000..33c7b1fa4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nd.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nd.png
new file mode 100644
index 000000000..52073c043
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-nd.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-sa.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-sa.png
new file mode 100644
index 000000000..0b1880f91
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by-sa.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by.png
new file mode 100644
index 000000000..99d8efd35
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc-by.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc.png
new file mode 100644
index 000000000..adfa085bd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/cc.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/gnufdl.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/gnufdl.png
new file mode 100644
index 000000000..cb815ac13
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/gnufdl.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/publicdomain.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/publicdomain.png
new file mode 100644
index 000000000..f78e73d02
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/license/button/publicdomain.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/list-minus.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/list-minus.gif
new file mode 100644
index 000000000..36902f159
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/list-minus.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/list-plus.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/list-plus.gif
new file mode 100644
index 000000000..adc3fac8a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/list-plus.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/loading.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/loading.gif
new file mode 100644
index 000000000..240bd88c5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/loading.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/magnifier.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/magnifier.png
new file mode 100644
index 000000000..cf3d97f75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/magnifier.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/minus.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/minus.gif
new file mode 100644
index 000000000..499a2e2aa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/minus.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/multiupload.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/multiupload.png
new file mode 100644
index 000000000..1e8efa063
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/multiupload.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/notify.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/notify.png
new file mode 100644
index 000000000..6e0015df4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/notify.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/ns.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/ns.png
new file mode 100644
index 000000000..da3c2a2d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/ns.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/page.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/page.png
new file mode 100644
index 000000000..03ddd799f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/page.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/pencil.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/pencil.png
new file mode 100644
index 000000000..0bfecd50e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/pencil.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/plus.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/plus.gif
new file mode 100644
index 000000000..9306686d8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/plus.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smaller.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smaller.gif
new file mode 100644
index 000000000..66d3a51e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smaller.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/delete.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/delete.gif
new file mode 100644
index 000000000..d668348b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/delete.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/fixme.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/fixme.gif
new file mode 100644
index 000000000..b66ea99d6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/fixme.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_arrow.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_arrow.gif
new file mode 100644
index 000000000..2880055cc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_arrow.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_biggrin.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_biggrin.gif
new file mode 100644
index 000000000..d3527723c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_biggrin.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_confused.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_confused.gif
new file mode 100644
index 000000000..0c49e0698
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_confused.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cool.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cool.gif
new file mode 100644
index 000000000..cead0306c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cool.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cry.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cry.gif
new file mode 100644
index 000000000..7d54b1f99
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_cry.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt.gif
new file mode 100644
index 000000000..fd7903b19
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt2.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt2.gif
new file mode 100644
index 000000000..eb4b70b66
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_doubt2.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_eek.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_eek.gif
new file mode 100644
index 000000000..5d3978106
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_eek.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_evil.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_evil.gif
new file mode 100644
index 000000000..ab1aa8e12
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_evil.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_exclaim.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_exclaim.gif
new file mode 100644
index 000000000..6e50e2eec
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_exclaim.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_frown.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_frown.gif
new file mode 100644
index 000000000..d2ac78c04
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_frown.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_fun.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_fun.gif
new file mode 100644
index 000000000..a8bb8a303
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_fun.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_idea.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_idea.gif
new file mode 100644
index 000000000..a40ae0d7e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_idea.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_kaddi.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_kaddi.gif
new file mode 100644
index 000000000..1410f7f1e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_kaddi.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_lol.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_lol.gif
new file mode 100644
index 000000000..374ba150f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_lol.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_mrgreen.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_mrgreen.gif
new file mode 100644
index 000000000..b54cd0f94
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_mrgreen.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_neutral.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_neutral.gif
new file mode 100644
index 000000000..4f311567e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_neutral.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_question.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_question.gif
new file mode 100644
index 000000000..9d072265b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_question.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_razz.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_razz.gif
new file mode 100644
index 000000000..29da2a2fc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_razz.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_redface.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_redface.gif
new file mode 100644
index 000000000..ad7628320
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_redface.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_rolleyes.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_rolleyes.gif
new file mode 100644
index 000000000..d7f5f2f4b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_rolleyes.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_sad.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_sad.gif
new file mode 100644
index 000000000..d2ac78c04
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_sad.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_silenced.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_silenced.gif
new file mode 100644
index 000000000..448399b2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_silenced.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile.gif
new file mode 100644
index 000000000..7b1f6d304
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile2.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile2.gif
new file mode 100644
index 000000000..769639d32
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_smile2.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_surprised.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_surprised.gif
new file mode 100644
index 000000000..cb2142431
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_surprised.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_twisted.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_twisted.gif
new file mode 100644
index 000000000..502fe247e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_twisted.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_wink.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_wink.gif
new file mode 100644
index 000000000..d14828804
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/smileys/icon_wink.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/success.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/success.png
new file mode 100644
index 000000000..a5ae9f11b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/success.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/throbber.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/throbber.gif
new file mode 100644
index 000000000..d04bd3949
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/throbber.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/bold.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/bold.png
new file mode 100644
index 000000000..7ebe99ee9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/bold.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/chars.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/chars.png
new file mode 100644
index 000000000..3f3396aeb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/chars.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h.png
new file mode 100644
index 000000000..aae052462
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h1.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h1.png
new file mode 100644
index 000000000..93dae935f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h1.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h2.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h2.png
new file mode 100644
index 000000000..f0eee3bd0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h2.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h3.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h3.png
new file mode 100644
index 000000000..8cfd4c077
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h3.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h4.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h4.png
new file mode 100644
index 000000000..7b8f51a1b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h4.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h5.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h5.png
new file mode 100644
index 000000000..44b00d9c8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/h5.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hequal.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hequal.png
new file mode 100644
index 000000000..8fc6b0d75
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hequal.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hminus.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hminus.png
new file mode 100644
index 000000000..f9d67adcb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hminus.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hplus.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hplus.png
new file mode 100644
index 000000000..66f3d5e33
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hplus.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hr.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hr.png
new file mode 100644
index 000000000..f86a8ec94
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/hr.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/image.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/image.png
new file mode 100644
index 000000000..1aab5d7de
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/image.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/italic.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/italic.png
new file mode 100644
index 000000000..324e7c036
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/italic.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/link.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/link.png
new file mode 100644
index 000000000..41e52c6ab
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/link.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/linkextern.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/linkextern.png
new file mode 100644
index 000000000..75afd3dc2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/linkextern.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/mono.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/mono.png
new file mode 100644
index 000000000..178cec9f2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/mono.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ol.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ol.png
new file mode 100644
index 000000000..3162fa21d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ol.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/sig.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/sig.png
new file mode 100644
index 000000000..ef997b7cd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/sig.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/smiley.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/smiley.png
new file mode 100644
index 000000000..e92845cb4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/smiley.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/strike.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/strike.png
new file mode 100644
index 000000000..203aacc2b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/strike.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ul.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ul.png
new file mode 100644
index 000000000..471171db4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/ul.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/underline.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/underline.png
new file mode 100644
index 000000000..bf9665a68
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/toolbar/underline.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/trash.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/trash.png
new file mode 100644
index 000000000..ebad933c8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/trash.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/up.png b/mod/dokuwiki/vendors/dokuwiki/lib/images/up.png
new file mode 100644
index 000000000..557d5e6a9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/up.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/images/wrap.gif b/mod/dokuwiki/vendors/dokuwiki/lib/images/wrap.gif
new file mode 100644
index 000000000..f2253e4a2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/images/wrap.gif
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/index.html b/mod/dokuwiki/vendors/dokuwiki/lib/index.html
new file mode 100644
index 000000000..8cb33512e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/index.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="refresh" content="0; URL=../" />
+<meta name="robots" content="noindex" />
+<title>nothing here...</title>
+</head>
+<body>
+<!-- this is just here to prevent directory browsing -->
+</body>
+</html>
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/admin.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/admin.php
new file mode 100644
index 000000000..34149ea05
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/admin.php
@@ -0,0 +1,809 @@
+<?php
+/**
+ * ACL administration functions
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Anika Henke <anika@selfthinker.org> (concepts)
+ * @author     Frank Schubert <frank@schokilade.de> (old version)
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+require_once(DOKU_PLUGIN.'admin.php');
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_acl extends DokuWiki_Admin_Plugin {
+    var $acl = null;
+    var $ns  = null;
+    var $who = '';
+    var $usersgroups = array();
+    var $specials = array();
+
+    /**
+     * return some info
+     */
+    function getInfo(){
+        return array(
+            'author' => 'Andreas Gohr',
+            'email'  => 'andi@splitbrain.org',
+            'date'   => '2010-01-17',
+            'name'   => 'ACL Manager',
+            'desc'   => 'Manage Page Access Control Lists',
+            'url'    => 'http://dokuwiki.org/plugin:acl',
+        );
+    }
+
+    /**
+     * return prompt for admin menu
+     */
+    function getMenuText($language) {
+        return $this->getLang('admin_acl');
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    function getMenuSort() {
+        return 1;
+    }
+
+    /**
+     * handle user request
+     *
+     * Initializes internal vars and handles modifications
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function handle() {
+        global $AUTH_ACL;
+        global $ID;
+        global $auth;
+        // fresh 1:1 copy without replacements
+	$AUTH_ACL = $this->load_acl_config(false);
+        // namespace given?
+        if($_REQUEST['ns'] == '*'){
+            $this->ns = '*';
+        }else{
+            $this->ns = cleanID($_REQUEST['ns']);
+        }
+
+        // user or group choosen?
+        $who = trim($_REQUEST['acl_w']);
+        if($_REQUEST['acl_t'] == '__g__' && $who){
+            $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
+        }elseif($_REQUEST['acl_t'] == '__u__' && $who){
+            $this->who = ltrim($auth->cleanUser($who),'@');
+        }elseif($_REQUEST['acl_t'] &&
+                $_REQUEST['acl_t'] != '__u__' &&
+                $_REQUEST['acl_t'] != '__g__'){
+            $this->who = $_REQUEST['acl_t'];
+        }elseif($who){
+            $this->who = $who;
+        }
+
+        // handle modifications
+        if(isset($_REQUEST['cmd']) && checkSecurityToken()){
+
+		//error_log("dokuwiki:acl:cms!!!");
+            // scope for modifications
+            if($this->ns){
+                if($this->ns == '*'){
+                    $scope = '*';
+                }else{
+                    $scope = $this->ns.':*';
+                }
+            }else{
+                $scope = $ID;
+            }
+
+            if(isset($_REQUEST['cmd']['save']) && $scope && $this->who && isset($_REQUEST['acl'])){
+		//error_log("dokuwiki:acl:save!!!");
+                // handle additions or single modifications
+                $this->_acl_del($scope, $this->who);
+                $this->_acl_add($scope, $this->who, (int) $_REQUEST['acl']);
+            }elseif(isset($_REQUEST['cmd']['del']) && $scope && $this->who){
+		//error_log("dokuwiki:acl:delete!!!");
+                // handle single deletions
+                $this->_acl_del($scope, $this->who);
+            }elseif(isset($_REQUEST['cmd']['update'])){
+		//error_log("dokuwiki:acl:update!!!");
+                // handle update of the whole file
+                foreach((array) $_REQUEST['del'] as $where => $names){
+                    // remove all rules marked for deletion
+                    foreach($names as $who) {
+                        unset($_REQUEST['acl'][$where][$who]);
+			//error_log("dokuwiki:acl:where_who:".$where.":".$who);
+			}
+                }
+                // prepare lines
+                $lines = array();
+                // keep header
+                foreach($AUTH_ACL as $line){
+                    if($line{0} == '#'){
+                        $lines[] = $line."\n";
+                    }else{
+                        $lines[] = $line."\n";
+                    }
+                }
+                // re-add all rules
+                foreach((array) $_REQUEST['acl'] as $where => $opt){
+                    foreach($opt as $who => $perm){
+			//error_log("dokuwiki:acl:where_acl:".$where.":".$who);
+                        $who = auth_nameencode($who,true);
+                        $lines[] = "$where\t$who\t$perm\n";
+                    }
+                }
+                // save it
+	    	$AUTH_ACL = $this->save_acl_config(join('',$lines));
+
+            }
+
+	    $AUTH_ACL = $this->load_acl_config(false);
+        }
+
+        // initialize ACL array
+        $this->_init_acl_config();
+    }
+
+    /**
+     * ACL Output function
+     *
+     * print a table with all significant permissions for the
+     * current id
+     *
+     * @author  Frank Schubert <frank@schokilade.de>
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function html() {
+        global $ID;
+
+        echo '<div id="acl_manager">'.NL;
+        echo '<h1>'.$this->getLang('admin_acl').'</h1>'.NL;
+        echo '<div class="level1">'.NL;
+
+        echo '<div id="acl__tree">'.NL;
+        $this->_html_explorer($_REQUEST['ns']);
+        echo '</div>'.NL;
+
+        echo '<div id="acl__detail">'.NL;
+        $this->_html_detail();
+        echo '</div>'.NL;
+        echo '</div>'.NL;
+
+        echo '<div class="clearer"></div>';
+        echo '<h2>'.$this->getLang('current').'</h2>'.NL;
+        echo '<div class="level2">'.NL;
+        $this->_html_table();
+        echo '</div>'.NL;
+
+        echo '<div class="footnotes"><div class="fn">'.NL;
+        echo '<sup><a id="fn__1" class="fn_bot" name="fn__1" href="#fnt__1">1)</a></sup>'.NL;
+        echo $this->getLang('p_include');
+        echo '</div></div>';
+
+        echo '</div>'.NL;
+    }
+
+    /**
+     * returns array with set options for building links
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _get_opts($addopts=null){
+        global $ID;
+        $opts = array(
+                    'do'=>'admin',
+                    'dokupage'=>'acl',
+                );
+        if($this->ns) $opts['ns'] = $this->ns;
+        if($this->who) $opts['acl_w'] = $this->who;
+
+        if(is_null($addopts)) return $opts;
+        return array_merge($opts, $addopts);
+    }
+
+    /**
+     * Display a tree menu to select a page or namespace
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_explorer(){
+        require_once(DOKU_INC.'inc/search.php');
+        global $conf;
+        global $ID;
+        global $lang;
+
+        $dir = $conf['datadir'];
+        $ns  = $this->ns;
+        if(empty($ns)){
+            $ns = dirname(str_replace(':','/',$ID));
+            if($ns == '.') $ns ='';
+        }elseif($ns == '*'){
+            $ns ='';
+        }
+        $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+        $data = $this->_get_tree($ns);
+
+        // wrap a list with the root level around the other namespaces
+        $item = array( 'level' => 0, 'id' => '*', 'type' => 'd',
+                   'open' =>'true', 'label' => '['.$lang['mediaroot'].']');
+
+        echo '<ul class="acltree">';
+        echo $this->_html_li_acl($item);
+        echo '<div class="li">';
+        echo $this->_html_list_acl($item);
+        echo '</div>';
+        echo html_buildlist($data,'acl',
+                            array($this,'_html_list_acl'),
+                            array($this,'_html_li_acl'));
+        echo '</li>';
+        echo '</ul>';
+
+    }
+
+    /**
+     * get a combined list of media and page files
+     *
+     * @param string $folder an already converted filesystem folder of the current namespace
+     * @param string $limit  limit the search to this folder
+     */
+    function _get_tree($folder,$limit=''){
+        global $conf;
+
+        // read tree structure from pages and media
+        $data = array();
+        search($data,$conf['datadir'],'search_index',array('ns' => $folder),$limit);
+        $media = array();
+        search($media,$conf['mediadir'],'search_index',array('ns' => $folder, 'nofiles' => true),$limit);
+        $data = array_merge($data,$media);
+        unset($media);
+
+        // combine by sorting and removing duplicates
+        usort($data,array($this,'_tree_sort'));
+        $count = count($data);
+        if($count>0) for($i=1; $i<$count; $i++){
+            if($data[$i]['type'] == 'f') break; // namespaces come first, we're done
+            if($data[$i-1]['id'] == $data[$i]['id']) unset($data[$i]);
+        }
+        return $data;
+    }
+
+    /**
+     * usort callback
+     *
+     * Sorts the combined trees of media and page files
+     */
+    function _tree_sort($a,$b){
+        if($a['type'] == 'd' && $b['type'] == 'f'){
+            return -1;
+        }elseif($a['type'] == 'f' && $b['type'] == 'd'){
+            return 1;
+        }else{
+            return strcmp($a['id'],$b['id']);
+        }
+    }
+
+    /**
+     * Display the current ACL for selected where/who combination with
+     * selectors and modification form
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_detail(){
+        global $conf;
+        global $ID;
+
+        echo '<form action="'.wl().'" method="post" accept-charset="utf-8"><div class="no">'.NL;
+
+        echo '<div id="acl__user">';
+        echo $this->getLang('acl_perms').' ';
+        $inl =  $this->_html_select();
+        echo '<input type="text" name="acl_w" class="edit" value="'.(($inl)?'':hsc(ltrim($this->who,'@'))).'" />'.NL;
+        echo '<input type="submit" value="'.$this->getLang('btn_select').'" class="button" />'.NL;
+        echo '</div>'.NL;
+
+        echo '<div id="acl__info">';
+        $this->_html_info();
+        echo '</div>';
+
+        echo '<input type="hidden" name="ns" value="'.hsc($this->ns).'" />'.NL;
+        echo '<input type="hidden" name="id" value="'.hsc($ID).'" />'.NL;
+        echo '<input type="hidden" name="do" value="admin" />'.NL;
+        echo '<input type="hidden" name="dokupage" value="acl" />'.NL;
+        echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
+        echo '</div></form>'.NL;
+    }
+
+    /**
+     * Print infos and editor
+     */
+    function _html_info(){
+        global $ID;
+
+        if($this->who){
+            $current = $this->_get_exact_perm();
+
+            // explain current permissions
+            $this->_html_explain($current);
+            // load editor
+            $this->_html_acleditor($current);
+        }else{
+            echo '<p>';
+            if($this->ns){
+                printf($this->getLang('p_choose_ns'),hsc($this->ns));
+            }else{
+                printf($this->getLang('p_choose_id'),hsc($ID));
+            }
+            echo '</p>';
+
+            echo $this->locale_xhtml('help');
+        }
+    }
+
+    /**
+     * Display the ACL editor
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_acleditor($current){
+        global $lang;
+
+        echo '<fieldset>';
+        if(is_null($current)){
+            echo '<legend>'.$this->getLang('acl_new').'</legend>';
+        }else{
+            echo '<legend>'.$this->getLang('acl_mod').'</legend>';
+        }
+
+
+        echo $this->_html_checkboxes($current,empty($this->ns),'acl');
+
+        if(is_null($current)){
+            echo '<input type="submit" name="cmd[save]" class="button" value="'.$lang['btn_save'].'" />'.NL;
+        }else{
+            echo '<input type="submit" name="cmd[save]" class="button" value="'.$lang['btn_update'].'" />'.NL;
+            echo '<input type="submit" name="cmd[del]" class="button" value="'.$lang['btn_delete'].'" />'.NL;
+        }
+
+        echo '</fieldset>';
+    }
+
+    /**
+     * Explain the currently set permissions in plain english/$lang
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_explain($current){
+        global $ID;
+        global $auth;
+
+        $who = $this->who;
+        $ns  = $this->ns;
+
+        // prepare where to check
+        if($ns){
+            if($ns == '*'){
+                $check='*';
+            }else{
+                $check=$ns.':*';
+            }
+        }else{
+            $check = $ID;
+        }
+
+        // prepare who to check
+        if($who{0} == '@'){
+            $user   = '';
+            $groups = array(ltrim($who,'@'));
+        }else{
+            $user = auth_nameencode($who);
+            $info = $auth->getUserData($user);
+            if($info === false){
+                $groups = array();
+            }else{
+                $groups = $info['grps'];
+            }
+        }
+
+        // check the permissions
+        $perm = auth_aclcheck($check,$user,$groups);
+
+        // build array of named permissions
+        $names = array();
+        if($perm){
+            if($ns){
+                if($perm >= AUTH_DELETE) $names[] = $this->getLang('acl_perm16');
+                if($perm >= AUTH_UPLOAD) $names[] = $this->getLang('acl_perm8');
+                if($perm >= AUTH_CREATE) $names[] = $this->getLang('acl_perm4');
+            }
+            if($perm >= AUTH_EDIT) $names[] = $this->getLang('acl_perm2');
+            if($perm >= AUTH_READ) $names[] = $this->getLang('acl_perm1');
+            $names = array_reverse($names);
+        }else{
+            $names[] = $this->getLang('acl_perm0');
+        }
+
+        // print permission explanation
+        echo '<p>';
+        if($user){
+            if($ns){
+                printf($this->getLang('p_user_ns'),hsc($who),hsc($ns),join(', ',$names));
+            }else{
+                printf($this->getLang('p_user_id'),hsc($who),hsc($ID),join(', ',$names));
+            }
+        }else{
+            if($ns){
+                printf($this->getLang('p_group_ns'),hsc(ltrim($who,'@')),hsc($ns),join(', ',$names));
+            }else{
+                printf($this->getLang('p_group_id'),hsc(ltrim($who,'@')),hsc($ID),join(', ',$names));
+            }
+        }
+        echo '</p>';
+
+        // add note if admin
+        if($perm == AUTH_ADMIN){
+            echo '<p>'.$this->getLang('p_isadmin').'</p>';
+        }elseif(is_null($current)){
+            echo '<p>'.$this->getLang('p_inherited').'</p>';
+        }
+    }
+
+
+    /**
+     * Item formatter for the tree view
+     *
+     * User function for html_buildlist()
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_list_acl($item){
+        global $ID;
+        $ret = '';
+        // what to display
+        if($item['label']){
+            $base = $item['label'];
+        }else{
+            $base = ':'.$item['id'];
+            $base = substr($base,strrpos($base,':')+1);
+        }
+
+        // highlight?
+        if( ($item['type']=='d' && $item['id'] == $this->ns) ||
+            ($item['type']!='d' && $item['id'] == $ID)) $cl = ' cur';
+
+        // namespace or page?
+        if($item['type']=='d'){
+            if($item['open']){
+                $img   = DOKU_BASE.'lib/images/minus.gif';
+                $alt   = '&minus;';
+            }else{
+                $img   = DOKU_BASE.'lib/images/plus.gif';
+                $alt   = '+';
+            }
+            $ret .= '<img src="'.$img.'" alt="'.$alt.'" />';
+            $ret .= '<a href="'.wl('',$this->_get_opts(array('ns'=>$item['id'],'sectok'=>getSecurityToken()))).'" class="idx_dir'.$cl.'">';
+            $ret .= $base;
+            $ret .= '</a>';
+        }else{
+            $ret .= '<a href="'.wl('',$this->_get_opts(array('id'=>$item['id'],'ns'=>'','sectok'=>getSecurityToken()))).'" class="wikilink1'.$cl.'">';
+            $ret .= noNS($item['id']);
+            $ret .= '</a>';
+        }
+        return $ret;
+    }
+
+
+    function _html_li_acl($item){
+            return '<li class="level'.$item['level'].'">';
+    }
+
+
+    /**
+     * Get current ACL settings as multidim array
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _init_acl_config(){
+        global $AUTH_ACL;
+        global $conf;
+        $acl_config=array();
+        $usersgroups = array();
+
+        // get special users and groups
+        $this->specials[] = '@ALL';
+        $this->specials[] = '@'.$conf['defaultgroup'];
+        if($conf['manager'] != '!!not set!!'){
+            $this->specials = array_merge($this->specials,
+                                          array_map('trim',
+                                                    explode(',',$conf['manager'])));
+        }
+        $this->specials = array_filter($this->specials);
+        $this->specials = array_unique($this->specials);
+        sort($this->specials);
+
+        foreach($AUTH_ACL as $line){
+            $line = trim(preg_replace('/#.*$/','',$line)); //ignore comments
+            if(!$line) continue;
+
+            $acl = preg_split('/\s+/',$line);
+            //0 is pagename, 1 is user, 2 is acl
+
+            $acl[1] = rawurldecode($acl[1]);
+            $acl_config[$acl[0]][$acl[1]] = $acl[2];
+
+            // store non-special users and groups for later selection dialog
+            $ug = $acl[1];
+            if(in_array($ug,$this->specials)) continue;
+            $usersgroups[] = $ug;
+        }
+
+        $usersgroups = array_unique($usersgroups);
+        sort($usersgroups);
+        ksort($acl_config);
+
+        $this->acl = $acl_config;
+        $this->usersgroups = $usersgroups;
+    }
+
+    /**
+     * Display all currently set permissions in a table
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_table(){
+        global $lang;
+        global $ID;
+
+        echo '<form action="'.wl().'" method="post" accept-charset="utf-8"><div class="no">'.NL;
+        if($this->ns){
+            echo '<input type="hidden" name="ns" value="'.hsc($this->ns).'" />'.NL;
+        }else{
+            echo '<input type="hidden" name="id" value="'.hsc($ID).'" />'.NL;
+        }
+        echo '<input type="hidden" name="acl_w" value="'.hsc($this->who).'" />'.NL;
+        echo '<input type="hidden" name="do" value="admin" />'.NL;
+        echo '<input type="hidden" name="dokupage" value="acl" />'.NL;
+        echo '<input type="hidden" name="sectok" value="'.getSecurityToken().'" />'.NL;
+        echo '<table class="inline">';
+        echo '<tr>';
+        echo '<th>'.$this->getLang('where').'</th>';
+        echo '<th>'.$this->getLang('who').'</th>';
+        echo '<th>'.$this->getLang('perm').'<sup><a id="fnt__1" class="fn_top" name="fnt__1" href="#fn__1">1)</a></sup></th>';
+        echo '<th>'.$lang['btn_delete'].'</th>';
+        echo '</tr>';
+        foreach($this->acl as $where => $set){
+            foreach($set as $who => $perm){
+                echo '<tr>';
+                echo '<td>';
+                if(substr($where,-1) == '*'){
+                    echo '<span class="aclns">'.hsc($where).'</span>';
+                    $ispage = false;
+                }else{
+                    echo '<span class="aclpage">'.hsc($where).'</span>';
+                    $ispage = true;
+                }
+                echo '</td>';
+
+                echo '<td>';
+                if($who{0} == '@'){
+                    echo '<span class="aclgroup">'.hsc($who).'</span>';
+                }else{
+                    echo '<span class="acluser">'.hsc($who).'</span>';
+                }
+                echo '</td>';
+
+                echo '<td>';
+                echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']');
+                echo '</td>';
+
+                echo '<td align="center">';
+                echo '<input type="checkbox" name="del['.hsc($where).'][]" value="'.hsc($who).'" />';
+                echo '</td>';
+                echo '</tr>';
+            }
+        }
+
+        echo '<tr>';
+        echo '<th align="right" colspan="4">';
+        echo '<input type="submit" value="'.$lang['btn_update'].'" name="cmd[update]" class="button" />';
+        echo '</th>';
+        echo '</tr>';
+        echo '</table>';
+        echo '</div></form>'.NL;
+    }
+
+
+    /**
+     * Returns the permission which were set for exactly the given user/group
+     * and page/namespace. Returns null if no exact match is available
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    function _get_exact_perm(){
+        global $ID;
+        if($this->ns){
+            if($this->ns == '*'){
+                $check = '*';
+            }else{
+                $check = $this->ns.':*';
+            }
+        }else{
+            $check = $ID;
+        }
+
+        if(isset($this->acl[$check][$this->who])){
+            return $this->acl[$check][$this->who];
+        }else{
+            return null;
+        }
+    }
+
+    function load_acl_config($full) {
+	global $auth;
+	if($auth->cando['getACL']) {
+                $acl = $auth->getACL();
+        } else {
+                $acl = file(DOKU_CONF.'acl.auth.php');
+        }
+	if ($full) return join("\n", $acl)."\n";
+	return $acl;
+    }
+    function save_acl_config($newconfig) {
+	global $auth;
+	if($auth->cando['getACL']) {
+                        $auth->setACL($newconfig);
+			return true;
+        } else {
+                        return io_saveFile(DOKU_CONF.'acl.auth.php', $newconfig);
+        }
+
+    }
+
+    /**
+     * adds new acl-entry to conf/acl.auth.php
+     *
+     * @author  Frank Schubert <frank@schokilade.de>
+     */
+    function _acl_add($acl_scope, $acl_user, $acl_level){
+	$acl_config = $this->load_acl_config(true);
+        $acl_user = auth_nameencode($acl_user,true);
+
+        // max level for pagenames is edit
+        if(strpos($acl_scope,'*') === false) {
+            if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT;
+        }
+
+
+        $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
+
+        $new_config = $acl_config.$new_acl;
+	return $this->save_acl_config($new_config);
+    }
+
+    /**
+     * remove acl-entry from conf/acl.auth.php
+     *
+     * @author  Frank Schubert <frank@schokilade.de>
+     */
+    function _acl_del($acl_scope, $acl_user){
+	$acl_config = $this->load_acl_config(false);
+        $acl_user = auth_nameencode($acl_user,true);
+
+        $acl_pattern = '^'.preg_quote($acl_scope,'/').'\s+'.$acl_user.'\s+[0-8].*$';
+
+        // save all non!-matching
+        $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
+
+	return $this->save_acl_config(join("\n",$new_config)."\n");
+    }
+
+    /**
+     * print the permission radio boxes
+     *
+     * @author  Frank Schubert <frank@schokilade.de>
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_checkboxes($setperm,$ispage,$name){
+        global $lang;
+
+        static $label = 0; //number labels
+        $ret = '';
+
+        if($ispage && $setperm > AUTH_EDIT) $perm = AUTH_EDIT;
+
+        foreach(array(AUTH_NONE,AUTH_READ,AUTH_EDIT,AUTH_CREATE,AUTH_UPLOAD,AUTH_DELETE) as $perm){
+            $label += 1;
+
+            //general checkbox attributes
+            $atts = array( 'type'  => 'radio',
+                           'id'    => 'pbox'.$label,
+                           'name'  => $name,
+                           'value' => $perm );
+            //dynamic attributes
+            if(!is_null($setperm) && $setperm == $perm) $atts['checked']  = 'checked';
+            if($ispage && $perm > AUTH_EDIT){
+                $atts['disabled'] = 'disabled';
+                $class = ' class="disabled"';
+            }else{
+                $class = '';
+            }
+
+            //build code
+            $ret .= '<label for="pbox'.$label.'" title="'.$this->getLang('acl_perm'.$perm).'"'.$class.'>';
+            $ret .= '<input '.html_attbuild($atts).' />&nbsp;';
+            $ret .= $this->getLang('acl_perm'.$perm);
+            $ret .= '</label>'.NL;
+        }
+        return $ret;
+    }
+
+    /**
+     * Print a user/group selector (reusing already used users and groups)
+     *
+     * @author  Andreas Gohr <andi@splitbrain.org>
+     */
+    function _html_select(){
+        global $conf;
+        $inlist = false;
+
+        if($this->who &&
+           !in_array($this->who,$this->usersgroups) &&
+           !in_array($this->who,$this->specials)){
+
+            if($this->who{0} == '@'){
+                $gsel = ' selected="selected"';
+            }else{
+                $usel   = ' selected="selected"';
+            }
+        }else{
+            $usel = '';
+            $gsel = '';
+            $inlist = true;
+        }
+
+
+        echo '<select name="acl_t" class="edit">'.NL;
+        echo '  <option value="__g__" class="aclgroup"'.$gsel.'>'.$this->getLang('acl_group').':</option>'.NL;
+        echo '  <option value="__u__"  class="acluser"'.$usel.'>'.$this->getLang('acl_user').':</option>'.NL;
+        echo '  <optgroup label="&nbsp;">'.NL;
+        foreach($this->specials as $ug){
+            if($ug == $this->who){
+                $sel    = ' selected="selected"';
+                $inlist = true;
+            }else{
+                $sel = '';
+            }
+
+            if($ug{0} == '@'){
+                    echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
+            }else{
+                    echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
+            }
+        }
+        echo '  </optgroup>'.NL;
+        echo '  <optgroup label="&nbsp;">'.NL;
+        foreach($this->usersgroups as $ug){
+            if($ug == $this->who){
+                $sel    = ' selected="selected"';
+                $inlist = true;
+            }else{
+                $sel = '';
+            }
+
+            if($ug{0} == '@'){
+                    echo '  <option value="'.hsc($ug).'" class="aclgroup"'.$sel.'>'.hsc($ug).'</option>'.NL;
+            }else{
+                    echo '  <option value="'.hsc($ug).'" class="acluser"'.$sel.'>'.hsc($ug).'</option>'.NL;
+            }
+        }
+        echo '  </optgroup>'.NL;
+        echo '</select>'.NL;
+        return $inlist;
+    }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/ajax.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/ajax.php
new file mode 100644
index 000000000..d3e88d932
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/ajax.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * AJAX call handler for ACL plugin
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ */
+
+//fix for Opera XMLHttpRequests
+if(!count($_POST) && $HTTP_RAW_POST_DATA){
+  parse_str($HTTP_RAW_POST_DATA, $_POST);
+}
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../../');
+require_once(DOKU_INC.'inc/init.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/auth.php');
+//close session
+session_write_close();
+
+if(!auth_isadmin()) die('for admins only');
+if(!checkSecurityToken()) die('CRSF Attack');
+
+$ID    = getID();
+
+require_once(DOKU_INC.'inc/pluginutils.php');
+require_once(DOKU_INC.'inc/html.php');
+$acl = plugin_load('admin','acl');
+$acl->handle();
+
+$ajax = $_REQUEST['ajax'];
+header('Content-Type: text/html; charset=utf-8');
+
+if($ajax == 'info'){
+    $acl->_html_info();
+}elseif($ajax == 'tree'){
+    require_once(DOKU_INC.'inc/search.php');
+    global $conf;
+    global $ID;
+
+    $dir = $conf['datadir'];
+    $ns  = $_REQUEST['ns'];
+    if($ns == '*'){
+        $ns ='';
+    }
+    $ns  = cleanID($ns);
+    $lvl = count(explode(':',$ns));
+    $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    $data = $acl->_get_tree($ns,$ns);
+
+    foreach($data as $item){
+        $item['level'] = $lvl+1;
+        echo $acl->_html_li_acl($item);
+        echo '<div class="li">';
+        echo $acl->_html_list_acl($item);
+        echo '</div>';
+        echo '</li>';
+    }
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/af/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/af/lang.php
new file mode 100644
index 000000000..04d9b0acf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/af/lang.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Afrikaans language file
+ *
+ */
+$lang['page']                  = 'Bladsy';
+$lang['acl_perm0']             = 'Niks';
+$lang['acl_perm1']             = 'Lees';
+$lang['acl_perm2']             = 'Verander';
+$lang['acl_perm4']             = 'Maak';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ar/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ar/lang.php
new file mode 100644
index 000000000..ced250243
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ar/lang.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Arabic language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Mostafa Hussein <mostafa@gmail.com>
+ * @author Yaman Hokan <always.smile.yh@hotmail.com>
+ */
+$lang['admin_acl']             = 'إدارة قوائم التحكم بالدخول';
+$lang['acl_group']             = 'مجموعة';
+$lang['acl_user']              = 'مستخدم';
+$lang['acl_perms']             = 'ترخيص لـ';
+$lang['page']                  = 'صفحة';
+$lang['namespace']             = 'فضاء التسمية';
+$lang['btn_select']            = 'اختيار';
+$lang['who']                   = 'اسم المستخدم / المجموعة';
+$lang['perm']                  = 'التصاريح';
+$lang['acl_perm0']             = 'لا يوجد';
+$lang['acl_perm1']             = 'قراءة';
+$lang['acl_perm2']             = 'تحرير';
+$lang['acl_perm4']             = 'إنشاء';
+$lang['acl_perm8']             = 'تحميل';
+$lang['acl_perm16']            = 'مسح';
+$lang['acl_new']               = 'أضف أضافة جديدة';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/help.txt
new file mode 100644
index 000000000..23028cb35
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/help.txt
@@ -0,0 +1,11 @@
+=== Помощ ===
+
+На тази страница можете да добавяте и премахвате разрешения за определяне на имена и страници във Вашето Wiki.
+
+Левият панел показва всички налични имена и страници.
+
+Формата по-горе ви позволява да видите и промените разрешенията на избрания потребител или група.
+
+В таблицата по-долу са показани всички актуални правила за контрол на достъпа. Можете да я използвате за бързо изтриване или промяна на множество правила.
+
+Четене на [[doku>acl|ACL документацията]] може да ви помогне да разберете напълно как работи контрола на достъпа в DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/lang.php
new file mode 100644
index 000000000..9facd4259
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/bg/lang.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * bulgarian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Nikolay Vladimirov <nikolay@vladimiroff.com>
+ * @author Viktor Usunov <usun0v@mail.bg>
+ */
+$lang['admin_acl']             = 'Управление на списъците за достъп';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Потребител';
+$lang['acl_perms']             = 'Права за';
+$lang['page']                  = 'Страница';
+$lang['namespace']             = 'Именно пространство';
+$lang['btn_select']            = 'Избери';
+$lang['p_user_id']             = 'Потребителят <b class="acluser">%s</b> има в момента следните права за страницата <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Потребителят <b class="acluser">%s</b> има в момента следните права в именното пространство <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Членове на групата <b class="aclgroup">%s</b> имат в момента следните права за страницата <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Членове на групата <b class="aclgroup">%s</b> имат в момента следните права в именното пространство <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Моля <b>въведете потребител или група</b> в полето горе, за да видите или промените правата за страницата <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Моля <b>въведете потребител или група</b> в полето горе, за да видите или промените правата за именното пространство <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Забележка: Тези разрешения не са определени изрично, но са били наследени от други групи или именни пространства.';
+$lang['p_isadmin']             = 'Забележка: Избраните група или потребител притежават пълни права, според конфигурацията им.';
+$lang['p_include']             = 'Висши разрешения включват по-нисши такива. Създаване или премахване на разрешения се прилага само за именни пространства, не за страници.';
+$lang['current']               = 'Текущи ACL права';
+$lang['where']                 = 'Страница/Именно постранство';
+$lang['who']                   = 'Потребител/Група';
+$lang['perm']                  = 'Права';
+$lang['acl_perm0']             = 'Никакви';
+$lang['acl_perm1']             = 'Четене';
+$lang['acl_perm2']             = 'Редактиране';
+$lang['acl_perm4']             = 'Създаване';
+$lang['acl_perm8']             = 'Качване';
+$lang['acl_perm16']            = 'Изтриване';
+$lang['acl_new']               = 'Добавяне на ново';
+$lang['acl_mod']               = 'Промяна на вписване';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/help.txt
new file mode 100644
index 000000000..87450d2fa
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/help.txt
@@ -0,0 +1,15 @@
+=== Ajuda ràpida: ===
+
+En esta pàgina pot afegir i llevar permissos per a espais de noms i
+pàgines del wiki.
+
+El panel esquerre mostra tots els espais de noms i pàgines disponibles.
+
+El formulari de dalt permet vore i modificar els permissos de l'usuari
+o grup seleccionat.
+
+En la taula de baix es mostren totes les regles d'accés actuals. Pot
+usar-la per a canviar o borrar ràpidament vàries regles.
+
+Llegint la [[doku>acl|documentació oficial sobre ACL]] podrà
+comprendre millor com funciona el control d'accés en DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/lang.php
new file mode 100644
index 000000000..ef0ae92eb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca-valencia/lang.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * valencian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Bernat Arlandis i Mañó <berarma@ya.com>
+ * @author Bernat Arlandis <berarma@ya.com>
+ * @author Bernat Arlandis <berarma@llenguaitecnologia.com>
+ */
+$lang['admin_acl']             = 'Gestor de les llistes de control d\'accés';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Usuari';
+$lang['acl_perms']             = 'Permissos per a';
+$lang['page']                  = 'Pàgina';
+$lang['namespace']             = 'Espai de noms';
+$lang['btn_select']            = 'Seleccionar';
+$lang['p_user_id']             = 'L\'usuari <b class="acluser">%s</b> té actualment els següents permissos en la pàgina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'L\'usuari <b class="acluser">%s</b> té actualment els següents permissos en l\'espai de noms <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Els membres del grup <b class="aclgroup">%s</b> tenen actualment els següents permissos en la pàgina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Els membres del grup <b class="aclgroup">%s</b> tenen actualment els següents permissos en l\'espai de noms <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Per favor, <b>introduïxca un usuari o grup</b> en el formulari de dalt per a vore o editar els per a la pàgina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Per favor, <b>introduïxca un usuari o grup</b> en el formulari de dalt per a vore o editar els permissos per a l\'espai de noms <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: estos permissos no s\'han indicat explícitament sino que s\'hereten d\'atres grups o d\'espais de noms antecessors.';
+$lang['p_isadmin']             = 'Nota: el grup o usuari seleccionat té sempre tots els permissos perque està configurat com a super-usuari.';
+$lang['p_include']             = 'Els permissos més alts inclouen als més baixos. Els permissos per a crear, enviar i borrar només valen per a espais de noms, pàgines no.';
+$lang['current']               = 'Regles ACL actuals';
+$lang['where']                 = 'Pàgina/espai de noms';
+$lang['who']                   = 'Usuari/grup';
+$lang['perm']                  = 'Permissos';
+$lang['acl_perm0']             = 'Cap';
+$lang['acl_perm1']             = 'Llegir';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Pujar';
+$lang['acl_perm16']            = 'Borrar';
+$lang['acl_new']               = 'Afegir entrada nova';
+$lang['acl_mod']               = 'Modificar entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/help.txt
new file mode 100644
index 000000000..d9bcc126d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/help.txt
@@ -0,0 +1,11 @@
+=== Ajuda ràpida ===
+
+En aquesta pàgina podeu afegir i treure permisos per a espais i pàgines del vostre wiki.
+
+La subfinestra de l'esquerra mostra tots els espais i pàgines disponibles.
+
+El formulari de dalt us permet veure i modificar els permisos de l'usuari o grup que seleccioneu.
+
+En la taula de baix es mostren totes les regles de control d'accés que hagin estat definides. Podeu utilitzar aquesta taula per suprimir o modificar ràpidament totes les regles que vulgueu.
+
+Llegir la [[doku>acl|documentació oficial sobre ACL]] us pot ajudar a entendre del tot com funciona el control d'accés en DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/lang.php
new file mode 100644
index 000000000..10f656062
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ca/lang.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * catalan language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Carles Bellver <carles.bellver@cent.uji.es>
+ * @author Carles Bellver <carles.bellver@gmail.com>
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ */
+$lang['admin_acl']             = 'Gestió de la Llista de Control d\'Accés';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Usuari';
+$lang['acl_perms']             = 'Permisos per a';
+$lang['page']                  = 'Pàgina';
+$lang['namespace']             = 'Espai';
+$lang['btn_select']            = 'Selecciona';
+$lang['p_user_id']             = 'L\'usuari <b class="acluser">%s</b> té a hores d\'ara els permisos següents en la pàgina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'L\'usuari <b class="acluser">%s</b> té a hores d\'ara els permisos següents en l\'espai <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Els membres del grup <b class="aclgroup">%s</b> tenen a hores d\'ara els permisos següents en la pàgina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Els membres del grup <b class="aclgroup">%s</b> tenen a hores d\'ara els permisos següents en l\'espai <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = '<b>Introduïu un usuari o grup</b> en el formulari de dalt per veure o editar els seus permisos en la pàgina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = '<b>Introduïu un usuari o grup</b> en el formulari de dalt per veure o editar els seus permisos en l\'espai <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: aquests permisos no s\'han definit explícitament, sinó que són heretats d\'altres grups o d\'espais d\'ordre superior.';
+$lang['p_isadmin']             = 'Nota: l\'usuari o grup seleccionat té sempre tots els permisos perquè ha estat configurat com a superusuari.';
+$lang['p_include']             = 'Els permisos més alts inclouen tots els permisos inferiors. Els permisos per a crear, penjar i suprimir només s\'apliquen als espais, no a pàgines.';
+$lang['current']               = 'Regles ACL actuals';
+$lang['where']                 = 'Pàgina/espai';
+$lang['who']                   = 'Usuari/grup';
+$lang['perm']                  = 'Permisos';
+$lang['acl_perm0']             = 'Cap';
+$lang['acl_perm1']             = 'Lectura';
+$lang['acl_perm2']             = 'Edició';
+$lang['acl_perm4']             = 'Creació';
+$lang['acl_perm8']             = 'Penjar fitxers';
+$lang['acl_perm16']            = 'Suprimir';
+$lang['acl_new']               = 'Afegeix nova entrada';
+$lang['acl_mod']               = 'Modifica entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/help.txt
new file mode 100644
index 000000000..1dbc88ad0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/help.txt
@@ -0,0 +1,11 @@
+=== Nápověda: ===
+
+Na této stránce můžete přidávat a odebírat oprávnění na jmenné prostory a stránky Vaší wiki.
+
+Levý panel zobrazuje všechny dostupné jmenné prostory a stránky.
+
+Formulář výše umožňuje vidět a modifikovat oprávnění vybraného uživatele nebo skupiny.
+
+V tabulce uvedené níže jsou zobrazeny všechny aktuální pravidla pro řízení přístupu (oprávnění). Zde můžete rychle odebírat a měnit více položek (oprávnění) najednou.
+
+Pro detailnější nápovědu si přečtěte stránku [[doku>acl|oficiální dokumentaci ACL]], která Vám může pomoci plně pochopit princip, jak řízení přístupu na DokuWiki funguje.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/lang.php
new file mode 100644
index 000000000..899d30ced
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/cs/lang.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Czech language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Bohumir Zamecnik <bohumir@zamecnik.org>
+ * @author Zbynek Krivka <zbynek.krivka@seznam.cz>
+ * @author tomas@valenta.cz
+ */
+$lang['admin_acl']             = 'Správa přístupových práv';
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Uživatel';
+$lang['acl_perms']             = 'Práva pro';
+$lang['page']                  = 'Stránka';
+$lang['namespace']             = 'Jmenný prostor';
+$lang['btn_select']            = 'Vybrat';
+$lang['p_user_id']             = 'Uživatel <b class="acluser">%s</b> má nyní na stránku <b class="aclpage">%s</b> následující oprávnění: <i>%s</i>.';
+$lang['p_user_ns']             = 'Uživatel <b class="acluser">%s</b> má nyní na jmenný prostor <b class="aclns">%s</b> následující oprávnění: <i>%s</i>.';
+$lang['p_group_id']            = 'Členové skupiny <b class="aclgroup">%s</b> mají nyní na stránku <b class="aclpage">%s</b> následující oprávnění: <i>%s</i>.';
+$lang['p_group_ns']            = 'Členové skupiny <b class="aclgroup">%s</b> mají nyní na jmenný prostor <b class="aclns">%s</b> následující oprávnění: <i>%s</i>.';
+$lang['p_choose_id']           = 'Prosím, <b>vložte uživatele nebo skupinu</b> ve formě uvedené výše, abyste mohli prohlížet a editovat množinu oprávnění pro stránku <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Prosím, <b>vložte uživatele nebo skupinu</b> ve formě uvedené výše, abyste mohli prohlížet a editovat množinu oprávnění pro jmenný prostor <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Poznámka: Tato oprávnění nebyla nastavena explicitně, ale jsou zděděna z jiné skupiny nebo z nadřazeného jmenného prostoru.';
+$lang['p_isadmin']             = 'Poznámka: Vybraná skupina nebo uživatel má vždy plná oprávnění, protože je nastaven jako správce (superuser).';
+$lang['p_include']             = 'Vyšší oprávnění zahrnují nižší oprávnění. Vytvořit, Nahrát a Smazat se vztahují jen k jmenným prostorů, nikoliv ke stránkám.';
+$lang['current']               = 'Aktuální ACL pravidla';
+$lang['where']                 = 'Stránka/Jmenný prostor';
+$lang['who']                   = 'Uživatel/Skupina';
+$lang['perm']                  = 'Oprávnění';
+$lang['acl_perm0']             = 'Žádné';
+$lang['acl_perm1']             = 'Čtení';
+$lang['acl_perm2']             = 'Úpravy';
+$lang['acl_perm4']             = 'Vytvoření';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Mazání';
+$lang['acl_new']               = 'Přidat novou položku';
+$lang['acl_mod']               = 'Editovat položku';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/help.txt
new file mode 100644
index 000000000..c8eedfc48
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/help.txt
@@ -0,0 +1,11 @@
+=== Vejledning ===
+
+På denne side kan du tilføje og fjerne tilladelser for navnerum og sider i din wiki.
+
+Panelet i venstre side viser alle tilgængelige navnerum og sider.
+
+I kassen for oven giver dig mulighed for at se og ændre tilladelser for en bestemt bruger eller gruppe.
+
+Nedenstående skema viser dig alle de satte regler for adgangskontrol. Du kan bruge den til hurtigt at slette eller ændre nogle af dem.
+
+Ved at læse [[doku>acl|den officielle vejledning til ACL]] kan du opnå yderligere hjælp til at blive sat helt ind i, hvordan adgangskontrol virker i DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/lang.php
new file mode 100644
index 000000000..c95ff1582
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/da/lang.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Danish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author koeppe <koeppe@kazur.dk>
+ * @author Jon Bendtsen <bendtsen@diku.dk>
+ * @author Lars Næsbye Christensen <larsnaesbye@stud.ku.dk>
+ * @author Kalle Sommer Nielsen <kalle@php.net>
+ * @author Esben Laursen <hyber@hyber.dk>
+ * @author Harith <haj@berlingske.dk>
+ * @author Daniel Ejsing-Duun <dokuwiki@zilvador.dk>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['admin_acl']             = 'Rettighedsadministration';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Bruger';
+$lang['acl_perms']             = 'Rettigheder for';
+$lang['page']                  = 'Dokument';
+$lang['namespace']             = 'Navnerum';
+$lang['btn_select']            = 'Vælg';
+$lang['p_user_id']             = 'Bruger <b class="acluser">%s</b> har følgende adgang på siden <b class="aclpage">%s</b>: <i>%s</i>';
+$lang['p_user_ns']             = 'Bruger <b class="acluser">%s</b> har foreløbig følgende tilladelse i navnerummet <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Medlemmerne af gruppen <b class="aclgroup">%s</b> har foreløbigt de følgende tilladelser på siden <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Medlemmerne af gruppen <b class="aclgroup">%s</b> har foreløbigt de følgende tilladelser i navnerummet <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Venligst <b>udfyld en bruger eller gruppe</b> i ovennævnte formular for at se eller redigere tilladelserne for denne side<b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Venligst <b>udfyld en bruger eller gruppe</b> i ovennævnte formular for at se eller redigere tilladelserne for navnerummet <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Bemærk: Disse tilladelser var ikke lagt entydigt ind, men var arvet fra andre grupper eller højere navnerum.';
+$lang['p_isadmin']             = 'Bemærk: Den valgte gruppe eller bruger har altid fuld adgang, fordi den er sat til at være en supergruppe eller -bruger';
+$lang['p_include']             = 'Højere tilladelse inkluderer også lavere. Tilladelser til at oprette, lægge filer op og slette gælder kun for navnerum, ikke sider.';
+$lang['current']               = 'Aktuelle ACL-regler';
+$lang['where']                 = 'Side/navnerum';
+$lang['who']                   = 'Bruger/gruppe';
+$lang['perm']                  = 'Adgangsniveau';
+$lang['acl_perm0']             = 'Ingen';
+$lang['acl_perm1']             = 'Læs';
+$lang['acl_perm2']             = 'Skriv';
+$lang['acl_perm4']             = 'Opret';
+$lang['acl_perm8']             = 'Overføre';
+$lang['acl_perm16']            = 'Slet';
+$lang['acl_new']               = 'Tilføj ny post';
+$lang['acl_mod']               = 'Ændre post';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/help.txt
new file mode 100644
index 000000000..d7930f8df
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/help.txt
@@ -0,0 +1,11 @@
+=== Schnellhilfe ===
+
+Auf dieser Seite kannst Du Rechte für Namensräume und Seiten in deinem Wiki hinzufügen oder entfernen.
+
+Der linke Bereich zeigt alle Namensräume und Seiten.
+
+Das obere Formular zeigt die die Rechte der ausgewählten Gruppe bzw. Benutzers.
+
+In der Tabelle unten werden alle momentan gesetzten Zugriffsregeln gezeigt. Hier kannst Du schnell mehrere Regeln löschen oder ändern.
+
+Das Lesen von [[doku>acl|official documentation on ACL]] kann Dir helfen zu verstehen, wie die Zugriffskontrole in DokuWiki funktioniert.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/lang.php
new file mode 100644
index 000000000..56dedfc61
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de-informal/lang.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * German (informal) language file
+ *
+ * @author Alexander Fischer <tbanus@os-forge.net>
+ * @author Juergen Schwarzer <jschwarzer@freenet.de>
+ */
+$lang['admin_acl']             = 'Zugriffskontrollsystem Management';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Benutzer';
+$lang['acl_perms']             = 'Rechte für';
+$lang['page']                  = 'Seite';
+$lang['namespace']             = 'Namensraum';
+$lang['btn_select']            = 'Auswählen';
+$lang['p_user_id']             = 'Benutzer <b class="acluser">%s</b> hat im Moment folgende Rechte auf der Seite <b class="aclpage">%s</b>: <i>%s</i>';
+$lang['p_user_ns']             = 'Benutzer <b class="acluser">%s</b> hat momentan die folgenden Rechte im Namensraum<b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Die Gruppenmitglieder <b class="aclgroup">%s</b> haben momentan die folgenden Rechte auf der Seite <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Die Mitglieder der Gruppe <b class="aclgroup">%s</b> haben gerade Zugriff in folgenden Namensräumen <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen der Seite<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_choose_ns']           = 'Bitte <b>gib einen Nutzer oder eine Gruppe</b> in das Formular ein, um die Berechtigungen des Namenraumes<b class="aclpage">%s</b> anzusehen oder zu bearbeiten.';
+$lang['p_inherited']           = 'Hinweis: Diese Rechte wuredn nicht explizit gesetzt sondern geerbt von anderen Grupen oder übergeordneten Namensräumen.';
+$lang['p_isadmin']             = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
+$lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Loeschrechte sind nur fuer Namensräume, nicht fuer Seiten.';
+$lang['current']               = 'Momentane Zugriffsregeln';
+$lang['where']                 = 'Seite/Namensraum';
+$lang['who']                   = 'Benutzer/Gruppe';
+$lang['perm']                  = 'Rechte';
+$lang['acl_perm0']             = 'Keine';
+$lang['acl_perm1']             = 'Lesen';
+$lang['acl_perm2']             = 'Editieren';
+$lang['acl_perm4']             = 'Erstellen';
+$lang['acl_perm8']             = 'Hochladen';
+$lang['acl_perm16']            = 'Löschen';
+$lang['acl_new']               = 'Neuen Eintrag zufügen';
+$lang['acl_mod']               = 'Eintrag modifizieren';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/help.txt
new file mode 100644
index 000000000..783ae22e7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/help.txt
@@ -0,0 +1,11 @@
+=== Kurzhilfe ===
+
+Auf dieser Seite können sie Zugriffsberechtigungen für Seiten und Namensräume festlegen und ändern.
+
+Die Liste links zeigt alle verfügbaren Namensräume und Seiten.
+
+Das Formular oben erlaubt Anzeige, Ändern und Hinzufügen von Zugriffsregeln für einen ausgewählten Nutzer oder eine Gruppe.
+
+In der Tabelle unten werden alle bestehenden Regeln aufgeführt und können dort modifiziert oder gelöscht werden.
+
+Für ein tiefergehendes Verständnis wie Zugriffsbeschränkungen in DokuWiki funktionieren, sollten Sie die [[doku>acl|offizielle Dokumentation]] lesen.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/lang.php
new file mode 100644
index 000000000..022ea6683
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/de/lang.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * german language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Christof <gagi@fin.de>
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Esther Brunner <esther@kaffeehaus.ch>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author Michael Klier <chi@chimeric.de>
+ * @author Leo Moll <leo@yeasoft.com>
+ * @author Florian Anderiasch <fa@art-core.org>
+ * @author Robin Kluth <commi1993@gmail.com>
+ * @author Arne Pelka <mail@arnepelka.de>
+ * @author Dirk Einecke <dirk@dirkeinecke.de>
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider <robog@GMX.de>
+ */
+$lang['admin_acl']             = 'Zugangsverwaltung';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Benutzer';
+$lang['acl_perms']             = 'Berechtigungen für';
+$lang['page']                  = 'Seite';
+$lang['namespace']             = 'Namensraum';
+$lang['btn_select']            = 'Auswählen';
+$lang['p_user_id']             = 'Nutzer <b class="acluser">%s</b> hat momentan folgende Berechtigungen für die Seite <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Nutzer <b class="acluser">%s</b> hat momentan folgende Berechtigungen im Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für die Seite <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Mitglieder der Gruppe <b class="aclgroup">%s</b> haben momentan folgende Berechtigungen für den Namensraum <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für die Seite <b class="aclpage">%s</b> zu sehen oder zu ändern.';
+$lang['p_choose_ns']           = 'Bitte geben Sie in obigem Formular eine <b>einen Nutzer oder eine Gruppe</b> an, um die Berechtigungen für den Namensraum <b class="aclns">%s</b> zu sehen oder zu ändern.';
+$lang['p_inherited']           = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.';
+$lang['p_isadmin']             = 'Hinweis: Die ausgewählte Gruppe oder Nutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.';
+$lang['p_include']             = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten';
+$lang['current']               = 'Momentane Zugriffsregeln';
+$lang['where']                 = 'Seite/Namensraum';
+$lang['who']                   = 'Nutzer/Gruppe';
+$lang['perm']                  = 'Berechtigungen';
+$lang['acl_perm0']             = 'Keine';
+$lang['acl_perm1']             = 'Lesen';
+$lang['acl_perm2']             = 'Bearbeiten';
+$lang['acl_perm4']             = 'Anlegen';
+$lang['acl_perm8']             = 'Hochladen';
+$lang['acl_perm16']            = 'Entfernen';
+$lang['acl_new']               = 'Eintrag hinzufügen';
+$lang['acl_mod']               = 'Eintrag bearbeiten';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/help.txt
new file mode 100644
index 000000000..ea2f816c0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/help.txt
@@ -0,0 +1,10 @@
+=== Γρήγορη Βοήθεια: ===
+
+Στη σελίδα αυτή μπορείτε να προσθέσετε και αφαιρέσετε δικαιώματα πρόσβασης για φακέλους και σελίδες στο wiki σας.
+
+Το αριστερό πλαίσιο δείχνει όλους τους διαθέσιμους φακέλους και αρχεία.
+
+Η παραπάνω φόρμα επιτρέπει να δείτε και να τροποποιήσετε τα διακαιώματα μίας επιλεγμένης ομάδας χρηστών ή ενός χρήστη.
+
+Στον παρακάτω πίνακα εμφανίζονται όλοι οι τρέχοντες κανόνες παραχώρησης δικαιωμάτων πρόσβασης. Μπορείτε να τον χρησιμοποιήσετε ώστε να σβήσετε ή να τροποποιήσετε γρήγορα πολλαπλούς κανόνες.
+Διαβάζοντας την [[doku>acl|επίσημη τεκμηρίωση για τις Λίστες Δικαιωμάτων Πρόσβασης - ACL]] ίσως σας βοηθήσει να καταλάβετε πλήρως το πως αυτές εφαρμόζονται στην DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/lang.php
new file mode 100644
index 000000000..da8a72ab3
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/el/lang.php
@@ -0,0 +1,43 @@
+<?php
+/**
+ * Greek language file
+ *
+ * Based on DokuWiki Version rc2007-05-24 english language file
+ * Original english language file contents included for reference
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author Thanos Massias <tm@thriasio.gr>
+ * @author Αθανάσιος Νταής <homunculus@wana.gr>
+ * @author Konstantinos Koryllos <koryllos@gmail.com>
+ */
+$lang['admin_acl']             = 'Διαχείριση Δικαιωμάτων Πρόσβασης';
+$lang['acl_group']             = 'Ομάδα';
+$lang['acl_user']              = 'Χρήστης';
+$lang['acl_perms']             = 'Δικαιώματα για';
+$lang['page']                  = 'Σελίδα';
+$lang['namespace']             = 'Φάκελος';
+$lang['btn_select']            = 'Επιλογή';
+$lang['p_user_id']             = 'Ο χρήστης <b class="acluser">%s</b> έχει τα ακόλουθα δικαιώματα πρόσβασης στην σελίδα <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Ο χρήστης <b class="acluser">%s</b> έχει τα ακόλουθα δικαιώματα πρόσβασης στον φάκελο <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Τα μέλη της ομάδας <b class="aclgroup">%s</b> έχουν τα ακόλουθα δικαιώματα πρόσβασης στην σελίδα <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Τα μέλη της ομάδας <b class="aclgroup">%s</b> έχουν τα ακόλουθα δικαιώματα πρόσβασης στον φάκελο <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Παρακαλώ <b>δώστε ένα όνομα χρήστη ή ομάδας χρηστών</b> στην παραπάνω μορφή για να δείτε τα αντίστοιχα δικαιώματα πρόσβασης για την σελίδα <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Παρακαλώ <b>δώστε ένα όνομα χρήστη ή ομάδας χρηστών</b> στην παραπάνω μορφή για να δείτε τα αντίστοιχα δικαιώματα πρόσβασης για τον φάκελο <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Σημείωση: Αυτά τα διακαιώματα χρήσης δεν ορίστηκαν άμεσα αλλά κληρονομήθηκαν από άλλες ομάδες χρηστών ή φακέλους σε υψηλότερο επίπεδο.';
+$lang['p_isadmin']             = 'Σημείωση: Η επιλεγμένη ομάδα χρηστών ή χρήστης έχει πάντα πλήρη διακαιώματα πρόσβασης διότι είναι δηλωμένος σαν υπερχρήστης (superuser).';
+$lang['p_include']             = 'Τα υψηλότερα δικαιώματα πρόσβασης περιλαμβάνουν τα χαμηλότερα. Τα δικαιώματα για Δημιουργία, Φόρτωση και Διαγραφή αφορούν μόνο φακέλους και όχι σελίδες. ';
+$lang['current']               = 'Τρέχοντες κανόνες Λίστας Δικαιωμάτων Πρόσβασης - ACL';
+$lang['where']                 = 'Σελίδα/Φάκελος';
+$lang['who']                   = 'Χρήστης/Ομάδα χρηστών';
+$lang['perm']                  = 'Δικαιώματα πρόσβασης';
+$lang['acl_perm0']             = 'Κανένα';
+$lang['acl_perm1']             = 'Ανάγνωση';
+$lang['acl_perm2']             = 'Τροποποίηση';
+$lang['acl_perm4']             = 'Δημιουργία';
+$lang['acl_perm8']             = 'Φόρτωση';
+$lang['acl_perm16']            = 'Διαγραφή';
+$lang['acl_new']               = 'Προσθήκη νέας εγγραφής';
+$lang['acl_mod']               = 'Τροποποίηση εγγραφής';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/help.txt
new file mode 100644
index 000000000..2b80cc4c7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/help.txt
@@ -0,0 +1,12 @@
+=== Quick Help: ===
+
+On this page you can add and remove permissions for namespaces and pages in your wiki.
+
+The left pane displays all available namespaces and pages.
+
+The form above allows you to see and modify the permissions of a selected user or group.
+
+In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules.
+
+Reading the [[doku>acl|official documentation on ACL]] might help you to fully understand how access control works in DokuWiki.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/lang.php
new file mode 100644
index 000000000..38ff20c88
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/en/lang.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * english language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Andreas Gohr <andi@splitbrain.org>
+ * @author     Anika Henke <anika@selfthinker.org>
+ * @author     Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ */
+
+$lang['admin_acl']  = 'Access Control List Management';
+$lang['acl_group']  = 'Group';
+$lang['acl_user']   = 'User';
+$lang['acl_perms']  = 'Permissions for';
+$lang['page']       = 'Page';
+$lang['namespace']  = 'Namespace';
+
+$lang['btn_select']  = 'Select';
+
+$lang['p_user_id']    = 'User <b class="acluser">%s</b> currently has the following permissions on page <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']    = 'User <b class="acluser">%s</b> currently has the following permissions in namespace <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']   = 'Members of group <b class="aclgroup">%s</b> currently have the following permissions on page <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']   = 'Members of group <b class="aclgroup">%s</b> currently have the following permissions in namespace <b class="aclns">%s</b>: <i>%s</i>.';
+
+$lang['p_choose_id']  = 'Please <b>enter a user or group</b> in the form above to view or edit the permissions set for the page <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']  = 'Please <b>enter a user or group</b> in the form above to view or edit the permissions set for the namespace <b class="aclns">%s</b>.';
+
+
+$lang['p_inherited']  = 'Note: Those permissions were not set explicitly but were inherited from other groups or higher namespaces.';
+$lang['p_isadmin']    = 'Note: The selected group or user has always full permissions because it is configured as superuser.';
+$lang['p_include']    = 'Higher permissions include lower ones. Create, Upload and Delete permissions only apply to namespaces, not pages.';
+
+$lang['current'] = 'Current ACL Rules';
+$lang['where'] = 'Page/Namespace';
+$lang['who']   = 'User/Group';
+$lang['perm']  = 'Permissions';
+
+$lang['acl_perm0']  = 'None';
+$lang['acl_perm1']  = 'Read';
+$lang['acl_perm2']  = 'Edit';
+$lang['acl_perm4']  = 'Create';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Delete';
+$lang['acl_new']    = 'Add new Entry';
+$lang['acl_mod']    = 'Modify Entry';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/help.txt
new file mode 100644
index 000000000..0c03b8605
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/help.txt
@@ -0,0 +1,11 @@
+=== Helpeto: ===
+
+En tiu ĉi paĝo vi povas aldoni kaj forigi rajtojn por nomspacoj kaj paĝoj en via vikio.
+
+La maldekstra panelo montras ĉiujn disponeblajn nomspacojn kaj paĝojn.
+
+La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto aŭ grupo.
+
+En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montritaj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn.
+
+Legado de la [[doku>acl|oficiala dokumentaro pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/lang.php
new file mode 100644
index 000000000..97a07c3c9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eo/lang.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Esperantolanguage file
+ *
+ * @author Felipe Castro <fefcas@uol.com.br>
+ * @author Felipo Kastro <fefcas@gmail.com>
+ * @author Felipe Castro <fefcas@gmail.com>
+ * @author Robert Bogenschneider <robog@gmx.de>
+ * @author Erik Pedersen <erik pedersen@shaw.ca>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Robert Bogenschneider <robog@GMX.de>
+ */
+$lang['admin_acl']             = 'Administrado de Alirkontrola Listo (ACL)';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Uzanto';
+$lang['acl_perms']             = 'Rajtoj por';
+$lang['page']                  = 'Paĝo';
+$lang['namespace']             = 'Nomspaco';
+$lang['btn_select']            = 'Elekti';
+$lang['p_user_id']             = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Uzanto <b class="acluser">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la paĝo <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Anoj de la grupo <b class="aclgroup">%s</b> aktuale havas la jenajn rajtojn en la nomspaco <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Bonvole <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la paĝo <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Bonvole <b>enmeti uzanton aŭ grupon</b> en la suba agordilo por rigardi aŭ redakti la aron da rajtoj por la nomspaco <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Rimarko: tiuj rajtoj ne estis rekte difinitaj, sed ili estis hereditaj el aliaj pli superaj grupoj aŭ nomspacoj.';
+$lang['p_isadmin']             = 'Rimarko: la elektita grupo aŭ uzanto ĉiam havas plenan rajtaron ĉar ĝi estas difinita kiel superuzanto.';
+$lang['p_include']             = 'Plialtaj permesoj inkluzivas malpli altajn. La permesoj por Krei, Alŝuti kaj Forigi nur aplikeblas al nomspacoj, ne al paĝoj.';
+$lang['current']               = 'Aktuala regularo ACL';
+$lang['where']                 = 'Paĝo/Nomspaco';
+$lang['who']                   = 'Uzanto/Grupo';
+$lang['perm']                  = 'Rajtoj';
+$lang['acl_perm0']             = 'Nenio';
+$lang['acl_perm1']             = 'Legi';
+$lang['acl_perm2']             = 'Redakti';
+$lang['acl_perm4']             = 'Krei';
+$lang['acl_perm8']             = 'Alŝuti';
+$lang['acl_perm16']            = 'Forigi';
+$lang['acl_new']               = 'Aldoni novan Enmetaĵon';
+$lang['acl_mod']               = 'Modifi Enmetaĵon';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/help.txt
new file mode 100644
index 000000000..c683477a8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/help.txt
@@ -0,0 +1,11 @@
+=== Ayuda rápida: ===
+
+En esta página puede agregar o retirar permisos para los espacios de nombres y páginas en su wiki.
+
+El panel de la izquierda muiestra todos los espacios de nombres y páginas
+
+El formulario inferior permite  ver y modificar los permisos del usuario o grupo elegido.
+
+En la tabla anterior se muestran todas  las reglas de control de acceso vigentes  Puede usarla para borrar o cambiar varias reglas rápidamente.
+
+Consultar el  [[doku>acl|official documentation on ACL]] puede ayudarle a entender completamente como el control de acceso trabaja en DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/lang.php
new file mode 100644
index 000000000..3a23c71da
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/es/lang.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Spanish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Miguel Pagano <miguel.pagano@gmail.com>
+ * @author Oscar M. Lage <r0sk10@gmail.com>
+ * @author Gabriel Castillo <gch@pumas.ii.unam.mx>
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Manuel Meco <manuel.meco@gmail.com>
+ * @author VictorCastelan <victorcastelan@gmail.com>
+ * @author Jordan Mero  hack.jord@gmail.com
+ * @author Felipe Martinez <metalmartinez@gmail.com>
+ * @author Javier Aranda <internet@javierav.com>
+ * @author Zerial <fernando@zerial.org>
+ * @author Marvin Ortega <maty1206@maryanlinux.com>
+ * @author Daniel Castro Alvarado <dancas2@gmail.com>
+ * @author Fernando J. Gómez <fjgomez@gmail.com>
+ */
+$lang['admin_acl']             = 'Administración de lista de control de acceso';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuario';
+$lang['acl_perms']             = 'Permiso para';
+$lang['page']                  = 'Página';
+$lang['namespace']             = 'Espacio de nombres';
+$lang['btn_select']            = 'Seleccionar';
+$lang['p_user_id']             = 'El usuario <b class="acluser">%s</b> tiene los siguientes permisos sobre la página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'El usuario <b class="acluser">%s</b> tiene los siguientes permisos sobre el espacio de nombres <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Los miembros del grupo <b class="aclgroup">%s</b> tienen actualmente los siguientes permisos sobre la página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Los miembros del grupo <b class="aclgroup">%s</b> tienen actualmente los siguientes permisos sobre el espacio de nombres <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Por favor <b>proporcione un usuario o grupo</b>en el formulario arriba mostrado para ver o editar los permisos asignados sobre la página<b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Por favor <b>proporcione un usuario o grupo</b>en el formulario arriba mostrado para ver o editar los permisos asignados sobre el espacio de nombres <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: Esos permisos no fueron establecidos explícitamente sino que fueron heredados desde otros grupos o espacios de nombres superiores';
+$lang['p_isadmin']             = 'Nota: El grupo o usuario seleccionado simepre tiene permisos totales debido a que se encuentra configurado como superusuario.';
+$lang['p_include']             = 'Los permisos superiores incluyen a los inferiores. Los permisos Crear, Cargar y Eliminar sólo se aplican a los espacios de nombres, no a las páginas.';
+$lang['current']               = 'Reglas ACL vigentes';
+$lang['where']                 = 'Página/Espacio de nombres';
+$lang['who']                   = 'Usuario/Grupo';
+$lang['perm']                  = 'Permisos';
+$lang['acl_perm0']             = 'ninguno';
+$lang['acl_perm1']             = 'Leer';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Subir un fichero';
+$lang['acl_perm16']            = 'Borrar';
+$lang['acl_new']               = 'Agregar una nueva entrada';
+$lang['acl_mod']               = 'Modificar una entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/et/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/et/lang.php
new file mode 100644
index 000000000..e90d5eaa9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/et/lang.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Estonian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Oliver S6ro <seem.iges@mail.ee>
+ * @author     Aari Juhanson <aari@vmg.vil.ee>
+ * @author     Kaiko Kaur <kaiko@kultuur.edu.ee>
+ */
+
+$lang['admin_acl']  = 'Ligipääsukontrolli nimekirja haldamine';
+$lang['acl_group']  = 'Grupp';
+$lang['acl_user']   = 'Kasutaja';
+$lang['acl_perms']  = 'Lubatud';
+$lang['page']       = 'leht';
+$lang['namespace']  = 'alajaotus';
+
+$lang['acl_perm1']  = 'Lugemine';
+$lang['acl_perm2']  = 'Toimetamine';
+$lang['acl_perm4']  = 'Tekitamine';
+$lang['acl_perm8']  = 'Üles laadimine';
+$lang['acl_new']    = 'Uue kirje lisamine';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/help.txt
new file mode 100644
index 000000000..9e6070a10
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/help.txt
@@ -0,0 +1,11 @@
+=== Laguntza Bizkorra: ===
+
+Orri honetan wiki-ko orri eta izen-espazioen baimenak gehitu eta kendu ahal ditzakezu.
+
+Ezkerreko panelak eskuragarri dauden orri eta izen-espazioak erakusten ditu.
+
+Goiko formularioak aukeratutako erabiltzaile edo taldearen baimenak ikusi eta aldatzea ahalbidetzen dizu.
+
+Beheko taulan une honetan ezarritako atzipen kontrol arauak daude. Hainbat arau bizkor ezabatu edo aldatzeko erabili dezakezu.
+
+[[doku>acl|Atzipen Kontrol Listen inguruko dokumentazio ofiziala]] irakurtzeak atzipen kontrolak DokuWiki-n nola funtzionatzen duen ulertzen lagundu zaitzaike.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/lang.php
new file mode 100644
index 000000000..99e70ad00
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/eu/lang.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Basque language file
+ *
+ * @author Inko Illarramendi <inko.i.a@gmail.com>
+ */
+$lang['admin_acl']             = 'Atzipen Kontrol Listaren Kudeaketa';
+$lang['acl_group']             = 'Taldea';
+$lang['acl_user']              = 'Erabiltzailea';
+$lang['acl_perms']             = 'Baimenak honetarako:';
+$lang['page']                  = 'Orria';
+$lang['namespace']             = 'Izen-espazioa';
+$lang['btn_select']            = 'Aukeratu';
+$lang['p_user_id']             = '<b class="acluser">%s</b> erabiltzaileak une honetan honako baimenak ditu <b class="aclpage">%s</b> orrian: <i>%s</i>.';
+$lang['p_user_ns']             = '<b class="acluser">%s</b> erabiltzaileak une honetan honako baimenak ditu <b class="aclns">%s</b> izen-espazioan: <i>%s</i>.';
+$lang['p_group_id']            = '<b class="aclgroup">%s</b> taldeko kideek une honetan honako baimenak dituzte <b class="aclpage">%s</b> orrian: <i>%s</i>.';
+$lang['p_group_ns']            = '<b class="aclgroup">%s</b> taldeko kideek une honetan honako baimenak dituzte <b class="aclns">%s</b> izen-espazioan: <i>%s</i>.';
+$lang['p_choose_id']           = 'Mesedez <b>sartu erabiltzaile edo taldea</b> goiko formularioan <b class="aclpage">%s</b> orrian ezarritako baimenak ikusi edo aldatzeko.';
+$lang['p_choose_ns']           = 'Mesedez <b>sartu erabiltzaile edo taldea</b> goiko formularioan <b class="aclns">%s</b> izen-espazioan ezarritako baimenak ikusi edo aldatzeko.';
+$lang['p_inherited']           = 'Oharra: Baimen horiek ez dira esplizituki jarriak, beste talde batzuetatik edo goragoko izen-espazioetatik heredatuak baizik.';
+$lang['p_isadmin']             = 'Oharra: Aukeratutako talde edo erabiltzaileak beti daika baimen osoa, supererabiltzaile gisa konfiguratuta  baitago.';
+$lang['p_include']             = 'Baimen handiagoek baimen txikiagoak barneratzen dituzte. Sortu, Igo eta Ezabatu baimenak izen-espazioei soilik aplikatzen zaizkie, ez orriei.';
+$lang['current']               = 'Uneko AKL Arauak';
+$lang['where']                 = 'Orria/Izen-espazioa';
+$lang['who']                   = 'Erabiltzailea/Taldea';
+$lang['perm']                  = 'Baimenak';
+$lang['acl_perm0']             = 'Inork';
+$lang['acl_perm1']             = 'Irakurri';
+$lang['acl_perm2']             = 'Editatu';
+$lang['acl_perm4']             = 'Sortu';
+$lang['acl_perm8']             = 'Igo';
+$lang['acl_perm16']            = 'Ezabatu';
+$lang['acl_new']               = 'Sarrera berri bat gehitu';
+$lang['acl_mod']               = 'Aldatu Sarrera';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/help.txt
new file mode 100644
index 000000000..1ec797faf
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/help.txt
@@ -0,0 +1,11 @@
+=== راهنما: ===
+
+در این صفحه شما می‌توانید دسترسی صفحات و فضای‌نام‌ها را مدیریت کنید.
+
+در قسمت سمت راست، لیست تمام صفحات و فضای‌نام‌ها را مشاهده می‌کنید.
+
+در فرم بالا می‌توانید دسترسی‌های کاربران و گروه‌های مختلف را مشاهده و ویرایش کنید.
+
+در جدول زیر، تمامی قوانین مدیریتی را مشاهده می‌کنید. شما می‌توانید آن‌ها را حذف یا تعدادی از آن‌ها رو تغییر دهید.
+
+ممکن است خواندن [[doku>acl|مطلب رسمی در مورد مدیریت دسترسی‌ها]] شما را در درک بهتر این قسمت DokuWiki یاری کند.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/lang.php
new file mode 100644
index 000000000..ed576c271
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fa/lang.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Persian language file
+ *
+ * @author behrad eslamifar <behrad_es@yahoo.com)
+ * @author Mohsen Firoozmandan <info@mambolearn.com>
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi <omidmr@gmail.com>
+ * @author Mohammad Reza Shoaei <shoaei@gmail.com>
+ */
+$lang['admin_acl']             = 'مدیریت کنترل دسترسی‌ها';
+$lang['acl_group']             = 'گروه';
+$lang['acl_user']              = 'کاربر';
+$lang['acl_perms']             = 'مجوز برای';
+$lang['page']                  = 'صفحه';
+$lang['namespace']             = 'فضای‌نام';
+$lang['btn_select']            = 'انتخاب';
+$lang['p_user_id']             = 'کاربر <b class="acluser">%s</b> دسترسی‌های زیر را برای صفحه‌ی <b class="aclpage">%s</b> دارد: <i>%s</i>.';
+$lang['p_user_ns']             = 'کاربر <b class="acluser">%s</b> دسترسی‌های زیر را برای فضای‌نام <b class="aclpage">%s</b> دارد: <i>%s</i>.';
+$lang['p_group_id']            = 'اعضای گروه <b class="aclgroup">%s</b> دسترسی‌های زیر را برای صفحه‌ی <b class="aclpage">%s</b> دارند: <i>%s</i>.';
+$lang['p_group_ns']            = 'اعضای گروه <b class="aclgroup">%s</b> دسترسی‌های زیر را برای فضای‌نام <b class="aclpage">%s</b> دارند: <i>%s</i>.';
+$lang['p_choose_id']           = 'خواهشمندیم <b>نام یک کاربر یا گروه</b> را در فرم بالا وارد کنید تا دسترسی‌های آن را برای صفحه‌ی <b class="aclpage">%s</b> ببینید و ویرایش کنید.';
+$lang['p_choose_ns']           = 'خواهشمندیم <b>نام یک کاربر یا گروه</b> را در فرم بالا وارد کنید تا دسترسی‌های آن را برای فضای‌نام <b class="aclpage">%s</b> ببینید و ویرایش کنید.';
+$lang['p_inherited']           = 'توجه: دسترسی‌ها مستقیمن مقداردهی نشده است، بلکه از گروه‌های بالا یا فضای‌نام گرفته شده است.';
+$lang['p_isadmin']             = 'توجه: کاربر یا گروه انتخاب شده همیشه با تمام دسترسی می‌باشد، زیرا به عنوان «superuser» انتخاب شده است.';
+$lang['p_include']             = 'دسترسی‌های بالا، دسترسی‌های پایین را شامل می‌شود. ایجاد، ارسال و حذف فقط به فضای‌نام الحاق می‌شود.';
+$lang['current']               = 'قوانین دسترسی فعلی';
+$lang['where']                 = 'صفحه/فضای‌نام';
+$lang['who']                   = 'کاربر/گروه';
+$lang['perm']                  = 'دسترسی‌ها';
+$lang['acl_perm0']             = 'هیچ‌کدام';
+$lang['acl_perm1']             = 'خواندن';
+$lang['acl_perm2']             = 'ویزایش';
+$lang['acl_perm4']             = 'ایجاد';
+$lang['acl_perm8']             = 'ارسال';
+$lang['acl_perm16']            = 'حذف';
+$lang['acl_new']               = 'اضافه کردن ورودی جدید';
+$lang['acl_mod']               = 'ویرایش ورودی';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/help.txt
new file mode 100644
index 000000000..d821f2d89
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/help.txt
@@ -0,0 +1,11 @@
+=== Pika-apu: ===
+
+Tällä sivulla voit lisätä tai poistaa oikeuksia wikisi nimiavaruuksiin tai sivuihin.
+
+Vasen osa näyttää kaikki tarjolla olevat nimiavaruudet ja sivut.
+
+Yllä olevan kaavakkeen avulla voit katsoa ja muokata oikeuksia valitulle käyttäjälle ja ryhmälle.
+
+Alla olevassa taulukossa on näkyvissä päällä olevat pääsyoikeudet. Voit käyttää sitä muokataksesi tai poistaaksesi useita oikeuksia.
+
+[[doku>acl|Virallisen käyttöoikeus (ACL) dokumentaation]]  lukeminen voi helpottaa sinua täysin ymmärtämään mitän käyttöoikeudet toimivat DokuWikissä.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/lang.php
new file mode 100644
index 000000000..04074d8d4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fi/lang.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Finnish language file
+ *
+ * @author otto@valjakko.net
+ * @author Otto Vainio <otto@valjakko.net>
+ * @author Teemu Mattila <ghcsystems@gmail.com>
+ */
+$lang['admin_acl']             = 'Käyttöoikeudet (ACL)';
+$lang['acl_group']             = 'Ryhmä';
+$lang['acl_user']              = 'Käyttäjä';
+$lang['acl_perms']             = 'Oikeudet';
+$lang['page']                  = 'Sivu';
+$lang['namespace']             = 'Nimiavaruus';
+$lang['btn_select']            = 'Valitse';
+$lang['p_user_id']             = 'Käyttäjällä <b class="acluser">%s</b> on tällä hetkellä seuraavat oikeudet sivulla <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Käyttäjällä <b class="acluser">%s</b> on tällä hetkellä seuraavat oikeudet nimiavaruudessa <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Ryhmän <b class="aclgroup">%s</b> jäsenillä on tällä hetkellä seuraavat oikeudet sivulla <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Ryhmän <b class="aclgroup">%s</b> jäsenillä on tällä hetkellä seuraavat oikeudet nimiavaruudessa <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Ole hyvä ja <b>syötä ryhmän nimi</b> yllä olevaan kaavakkeeseen katsoaksesi tai muokataksesi oikeuksia sivulle <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Ole hyvä ja <b>syötä ryhmän nimi</b> yllä olevaan kaavakkeeseen katsoaksesi tai muokataksesi oikeuksia nimiavaruuteen <b class="aclpage">%s</b>.';
+$lang['p_inherited']           = 'Huomaa: Oikeuksia ei ole erikseen asetettu, vaan ne on peritty toiselta ryhmältä tai ylemmältä nimiavaruudelta.';
+$lang['p_isadmin']             = 'Huomaa: Valitulla ryhmällä tai käyttäjällä on aina täydet oikeudet, koska se on määritelty pääkäyttäjäksi (Superuser)';
+$lang['p_include']             = 'Korkeammat oikeudet sisältävät matalammat. Luonti-, Lähetys- ja Poisto-oikeudet vaikuttavat vain nimiavaruuksiin, ei sivuihin.';
+$lang['current']               = 'Tämänhetkiset käyttöoikeudet (ACL)';
+$lang['where']                 = 'Sivu/Nimiavaruus';
+$lang['who']                   = 'Käyttäjä/Ryhmä';
+$lang['perm']                  = 'Oikeudet';
+$lang['acl_perm0']             = 'Ei mitään';
+$lang['acl_perm1']             = 'Luku';
+$lang['acl_perm2']             = 'Muokkaus';
+$lang['acl_perm4']             = 'Luonti';
+$lang['acl_perm8']             = 'Lähetys';
+$lang['acl_perm16']            = 'Poisto';
+$lang['acl_new']               = 'Lisää uusi';
+$lang['acl_mod']               = 'Muokkaa';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/help.txt
new file mode 100644
index 000000000..69661bb9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/help.txt
@@ -0,0 +1,9 @@
+=== Aide rapide : ===
+
+Cette page vous permet d'ajouter ou de supprimer des permissions pour les catégories et les pages de votre wiki. Le panneau de gauche liste toutes les catégories et les pages disponibles.
+
+Le formulaire au dessus permet d'afficher et de modifier les permissions d'un utilisateur ou d'un groupe sélectionné.
+
+Dans la table ci-dessous toutes les listes de contrôle d'accès actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs ACLs.
+
+La lecture de [[doku>acl|la documentation officielle des ACLs]] pourra vous permettre de comprendre complètement le fonctionnement du contrôle d'accès dans DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/lang.php
new file mode 100644
index 000000000..efdc5f074
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/fr/lang.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * french language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Sébastien Bauer <sebastien.bauer@advalvas.be>
+ * @author Antoine Fixary <antoine.fixary@freesbee.fr>
+ * @author cumulus <pta-n56@myamail.com>
+ * @author Gwenn Gueguen <contact@demisel.net>
+ * @author Guy Brand <gb@isis.u-strasbg.fr>
+ * @author Fabien Chabreuil <fabien@integralpersonality.com>
+ * @author Stéphane Chamberland <stephane.chamberland@ec.gc.ca>
+ * @author Maurice A. LeBlanc <leblancma@cooptel.qc.ca>
+ * @author gb@isis.u-strasbg.fr
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri <guillaume.turri@gmail.com>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author olivier duperray <duperray.olivier@laposte.net>
+ * @author Vincent Feltz <psycho@feltzv.fr>
+ */
+$lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
+$lang['acl_group']             = 'Groupe';
+$lang['acl_user']              = 'Utilisateur';
+$lang['acl_perms']             = 'Permission pour';
+$lang['page']                  = 'Page';
+$lang['namespace']             = 'Catégorie';
+$lang['btn_select']            = 'Sélectionner';
+$lang['p_user_id']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Permissions actuelles de l\'utilisateur <b class="acluser">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la page <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Permissions actuelles des membres du groupe <b class="aclgroup">%s</b> sur la catégorie <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessus pour afficher ou éditer les permissions relatives à la page <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Saisissez un nom <b>d\'utilisateur ou de groupe</b> dans le formulaire ci-dessous pour afficher ou éditer les permissions relatives à la catégorie <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Note : Ces permissions n\'ont pas été explicitement fixées mais sont héritées d\'autres groupes ou catégories supérieures.';
+$lang['p_isadmin']             = 'Note : Le groupe ou l\'utilisateur sélectionné dispose de toutes les permissions car il est paramétré en tant que superutilisateur.';
+$lang['p_include']             = 'Les permissions les plus élevées induisent les plus faibles. Création, Télécharger, et Effacer, ne s\'appliquent qu\'aux catégories ; pas aux pages.';
+$lang['current']               = 'ACL actuelles';
+$lang['where']                 = 'Page/Catégorie';
+$lang['who']                   = 'Utilisateur/Groupe';
+$lang['perm']                  = 'Permissions';
+$lang['acl_perm0']             = 'Aucune';
+$lang['acl_perm1']             = 'Lecture';
+$lang['acl_perm2']             = 'Écriture';
+$lang['acl_perm4']             = 'Création';
+$lang['acl_perm8']             = 'Télécharger';
+$lang['acl_perm16']            = 'Effacer';
+$lang['acl_new']               = 'Ajouter une nouvelle entrée';
+$lang['acl_mod']               = 'Modifier l\'entrée';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/help.txt
new file mode 100644
index 000000000..c427b182f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/help.txt
@@ -0,0 +1,11 @@
+=== Axuda rápida: ===
+
+Nesta páxina pode engadir e eliminar os permisos para os nomes de espazo e as páxinas do seu wiki.
+
+O panel da esquerda mostra todos os nomes de espazo e páxinas dispoñíbeis.
+
+O formulario de arriba permítelle ver e modificar os permisos da persoa usuaria ou grupo seleccionada.
+
+Na táboa de abaixo móstranse todas as regras de control de accesos estabelecidas. Pode empregala para cambiar ou eliminar varias regras dun xeito rápido.
+
+A lectura da [[doku>acl|documentación oficial da ACL]] pode servirlle de axuda para comprender como funciona o control de accesos no Dokuwiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/lang.php
new file mode 100644
index 000000000..184cf7e1d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/gl/lang.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Galicianlanguage file
+ *
+ * @author CiberIrmandade da Fala <infoxeral@ciberirmandade.org>
+ * @author Tagen Ata <localizacion@tagenata.com>
+ * @author Leandro Regueiro <leandro.regueiro@gmail.com>
+ */
+$lang['admin_acl']             = 'Xestión da Lista de control de acceso (ACL)';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuaria/o';
+$lang['acl_perms']             = 'Permisos para';
+$lang['page']                  = 'Páxina';
+$lang['namespace']             = 'Nome de espazo';
+$lang['btn_select']            = 'Selecciona';
+$lang['p_user_id']             = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'A persoa usuaria <b class="acluser">%s</b> dispón actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos na páxina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'As e os integrantes do grupo <b class="aclgroup">%s</b> dispoñen actualmente dos seguintes permisos no nome de espazo <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos para a páxina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = '<b>Insira un nome de usuaria/o ou grupo</b> no formulario de arriba para ver ou editar os permisos estabelecidos no nome de espazo <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: Estes permisos non foron estabelecidos explicitamente senón que foron herdados doutros grupos ou nomes de espazo maiores.';
+$lang['p_isadmin']             = 'Nota: O grupo ou a persoa usuaria seleccionado terá sempre permisos completos por estar configurado como superusuaria/o.';
+$lang['p_include']             = 'Os permisos máis grandes inclúen os menores. Os permisos de Creación, Subida e Eliminación só se aplican aos nomes de espazo, non ás páxinas.';
+$lang['current']               = 'Regras ACL actuais';
+$lang['where']                 = 'Páxina/Nome de espazo';
+$lang['who']                   = 'Usuaria/o/Grupo';
+$lang['perm']                  = 'Permisos';
+$lang['acl_perm0']             = 'Ningún';
+$lang['acl_perm1']             = 'Ler';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Subir ficheiros';
+$lang['acl_perm16']            = 'Eliminar';
+$lang['acl_new']               = 'Engadir una entrada';
+$lang['acl_mod']               = 'Modificar unha entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/help.txt
new file mode 100644
index 000000000..33f2933b9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/help.txt
@@ -0,0 +1,11 @@
+=== עזרה חפוזה: ===
+
+בדף זה ניתן להוסיף ולהסיר הרשאות למרחבי שמות ולדפים בויקי שלך.
+
+הצד השמאלי מציג את כל מרבי השמות והדפים הזמינים.
+
+הטופס מעלה מאפשר לך לראות ולשנות את ההרשאות של משתמש או קבוצה נבחרים.
+
+בטבלה מטה מוצגים כל כללי בקרת הגישה הנוכחיים. ניתן להשתמש בה כדי למחוק או לשנות מספר כללים במהירות.
+
+קריאת [[doku>acl|התיעוד הרשמי ל-ACL ACL]] יכולה לעזור לך להבין באופן מלא כיצד בקרת הגישה עובדת בדוקוויקי.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/lang.php
new file mode 100644
index 000000000..7d73c63dd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/he/lang.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * hebrew language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author DoK <kamberd@yahoo.com>
+ * @author Dotan Kamber <kamberd@yahoo.com>
+ * @author Moshe Kaplan <mokplan@gmail.com>
+ */
+$lang['admin_acl']             = 'ניהול רשימת בקרת גישות';
+$lang['acl_group']             = 'קבוצה';
+$lang['acl_user']              = 'משתמש';
+$lang['acl_perms']             = 'הרשאות עבור';
+$lang['page']                  = 'דף';
+$lang['namespace']             = 'מרחב שמות';
+$lang['p_user_id']             = 'למשתמש <b class="acluser">%s</b> יש כרגע את ההרשאות הבאות בדף <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'למשתמש <b class="acluser">%s</b> יש כרגע את ההרשאות הבאות במרחב השם <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'לחברי קבוצת <b class="aclgroup">%s</b> יש כרגע את ההרשאות הבאות בדף <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'לחברי קבוצת <b class="aclgroup">%s</b> יש כרגע את ההרשאות הבאות במרחב השם <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'נא <b>להזין משתמש או קבוצה</b> בטופס מעלה כדי לצפות או לערוך את ההרשאות המוגדרות עבור הדף <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'נא <b>להזין משתמש או קבוצה</b> בטופס מעלה כדי לצפות או לערוך את ההרשאות המוגדרות עבור מרחב השם <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'לתשומת לבך: הרשאות אלו לא הוגדרו באופן מפורש אלא נורשו מקבוצות אחרות או ממרחב שמות גבוה יותר.';
+$lang['p_isadmin']             = 'לתשומת לבך: לקבוצה או המשתמש שנבחרו יש תמיד הרשאות מלאות בגלל הגדרתם כמשתמש-על.';
+$lang['current']               = 'חוקי ה-ACL הנוכחיים';
+$lang['where']                 = 'דף/מרחב שם';
+$lang['who']                   = 'משתמש/קבוצה';
+$lang['perm']                  = 'הרשאות';
+$lang['acl_perm0']             = 'ללא';
+$lang['acl_perm1']             = 'קריאה';
+$lang['acl_perm2']             = 'עריכה';
+$lang['acl_perm4']             = 'יצירה';
+$lang['acl_perm8']             = 'העלאה';
+$lang['acl_perm16']            = 'מחיקה';
+$lang['acl_new']               = 'הוספת רשומה חדשה';
+$lang['acl_mod']               = 'שינויי מובאה';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hi/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hi/lang.php
new file mode 100644
index 000000000..d8630a281
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hi/lang.php
@@ -0,0 +1,6 @@
+<?php
+/**
+ * Hindi language file
+ *
+ * @author Abhinav Tyagi <abhinavtyagi11@gmail.com>
+ */
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hr/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hr/lang.php
new file mode 100644
index 000000000..d2094b77b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hr/lang.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * Croatian language file
+ *
+ * @author Branko Rihtman <theney@gmail.com>
+ * @author Dražen Odobašić <dodobasic@gmail.com>
+ */
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/help.txt
new file mode 100644
index 000000000..57f16a39c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/help.txt
@@ -0,0 +1,12 @@
+=== Hozzáférési lista (ACL) kezelő ===
+
+Ezen az oldalon jogokat oszthat és vehet el a wiki oldalakhoz és névterekhez.
+
+A bal oldalon látható az összes névtér és oldal.
+
+A felső form segít a kiválasztott felhasználó vagy csoport jogosultságainak megtekintésében vagy változtatásában.
+
+Az alsó táblázat mutatja az összes jelenleg érvényes hozzáférési szabályt. Ennek segítségével gyorsan törölhetők vagy megváltoztathatók a szabályok.
+
+A [[doku>acl|hivatalos ACL dokumentáció]] segíthet a DokuWiki hozzáférés-kezelés működésének megértésében.
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/lang.php
new file mode 100644
index 000000000..4fb1720ae
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/hu/lang.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Hungarian language file
+ *
+ * @author Sandor TIHANYI <stihanyi+dw@gmail.com>
+ * @author Siaynoq Mage <siaynoqmage@gmail.com>
+ * @author schilling.janos@gmail.com
+ */
+$lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
+$lang['acl_group']             = 'Csoport:';
+$lang['acl_user']              = 'Felhasználó:';
+$lang['acl_perms']             = 'Jogosultság ehhez:';
+$lang['page']                  = 'oldal';
+$lang['namespace']             = 'névtér';
+$lang['btn_select']            = 'Kiválaszt';
+$lang['p_user_id']             = 'A(z) <b class="acluser">%s</b> felhasználónak jelenleg a következő jogosultsága van ezen az oldalon:  <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'A(z) <b class="acluser">%s</b> felhasználónak jelenleg a következő jogosultsága van ebben a névtérben: <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'A(z) <b class="aclgroup">%s</b> csoport tagjainak jelenleg a következő jogosultsága van ezen az oldalon:  <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'A(z) <b class="aclgroup">%s</b> csoport tagjainak jelenleg a következő jogosultsága van ebben a névtérben: <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'A felső formon <b>adjon meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclpage">%s</b> oldalhoz beállított jogosultságait megtekinteni vagy változtatni szeretné.';
+$lang['p_choose_ns']           = 'A felső formon <b>adjon meg egy felhasználót vagy csoportot</b>, akinek a(z) <b class="aclns">%s</b> névtérhez beállított jogosultságait megtekinteni vagy változtatni szeretné.';
+$lang['p_inherited']           = 'Megjegyzés: ezek a jogok nem itt lettek explicit beállítva, hanem öröklődtek egyéb csoportokból vagy felsőbb névterekből.';
+$lang['p_isadmin']             = 'Megjegyzés: a kiválasztott csoportnak vagy felhasználónak mindig teljes jogosultsága lesz, mert Wiki-gazdának van beállítva.';
+$lang['p_include']             = 'A magasabb jogok tartalmazzák az alacsonyabbakat.  A Létrehozás, Feltöltés és Törlés jogosultságok csak névterekre alkalmazhatók, az egyes oldalakra nem.';
+$lang['current']               = 'Jelenlegi hozzáférési szabályok';
+$lang['where']                 = 'Oldal/névtér';
+$lang['who']                   = 'Felhasználó/Csoport';
+$lang['perm']                  = 'Jogosultságok';
+$lang['acl_perm0']             = 'Semmi';
+$lang['acl_perm1']             = 'Olvasás';
+$lang['acl_perm2']             = 'Szerkesztés';
+$lang['acl_perm4']             = 'Létrehozás';
+$lang['acl_perm8']             = 'Feltöltés';
+$lang['acl_perm16']            = 'Törlés';
+$lang['acl_new']               = 'Új bejegyzés hozzáadása';
+$lang['acl_mod']               = 'Bejegyzés módosítása';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id-ni/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id-ni/lang.php
new file mode 100644
index 000000000..d367340b7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id-ni/lang.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * idni language file
+ *
+ * @author Harefa <fidelis@harefa.com>
+ * @author Yustinus Waruwu <juswaruwu@gmail.com>
+ */
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id/lang.php
new file mode 100644
index 000000000..650637635
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/id/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Indonesian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author mubaidillah <mubaidillah@gmail.com>
+ * @author Yustinus Waruwu <juswaruwu@gmail.com>
+ */
+$lang['admin_acl']             = 'Manajemen Daftar Pengendali Akses';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'User';
+$lang['acl_perms']             = 'Ijin untuk';
+$lang['page']                  = 'Halaman';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Pilih';
+$lang['acl_perm1']             = 'Baca';
+$lang['acl_perm2']             = 'Ubah';
+$lang['acl_perm4']             = 'Buat';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Hapus';
+$lang['acl_new']               = 'Tambah Entry baru';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/is/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/is/lang.php
new file mode 100644
index 000000000..b45faa80a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/is/lang.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Icelandic language file
+ *
+ * @author Hrannar Baldursson <hrannar.baldursson@gmail.com>
+ * @author Ólafur Gunnlaugsson <oli@audiotools.com>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['acl_group']             = 'Hópur';
+$lang['acl_user']              = 'Notandi';
+$lang['page']                  = 'Síða';
+$lang['namespace']             = 'Nafnrými';
+$lang['btn_select']            = 'Veldu';
+$lang['where']                 = 'Síða/Nafnrými';
+$lang['acl_perm16']            = 'Eyða';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/help.txt
new file mode 100644
index 000000000..5e4b08dd6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/help.txt
@@ -0,0 +1,11 @@
+=== Breve Aiuto: ===
+
+In questa pagina puoi aggiungere e rimuovere permessi per categorie e pagine del tuo wiki.
+
+Il pannello di sinistra mostra tutte le categorie e le pagine disponibili.
+
+Il campo sopra ti permette di vedere e modificare i permessi di un utente o gruppo selezionato.
+
+Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per cancellare o cambiare al volo varie regole.
+
+Leggere la [[doku>acl|official documentation on ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/lang.php
new file mode 100644
index 000000000..344987e8b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/it/lang.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Italian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Giorgio Vecchiocattivi <giorgio@vecchio.it>
+ * @author Roberto Bolli <http://www.rbnet.it/>
+ * @author Pietro Battiston toobaz@email.it
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda <lbreda@gmail.com>
+ * @author snarchio@alice.it
+ * @author robocap <robocap1@gmail.com>
+ */
+$lang['admin_acl']             = 'Gestione Lista Controllo Accessi (ACL)';
+$lang['acl_group']             = 'Gruppo';
+$lang['acl_user']              = 'Utente';
+$lang['acl_perms']             = 'Permessi per';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Categoria';
+$lang['btn_select']            = 'Seleziona';
+$lang['p_user_id']             = 'L\'utente <b class="acluser">%s</b> attualmente ha i seguenti permessi sulla pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'L\'utente <b class="acluser">%s</b> attualmente ha i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi sulla pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'I membri del gruppo<b class="aclgroup">%s</b> attualmente hanno i seguenti permessi per la categoria <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Per favore <b>inserisci un utente o gruppo</b> nel campo sopra per modificare i permessi impostati per la pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Per favore <b>inserisci un utente o un gruppo</b> nel campo sopra per modificare i permessi impostati per la categoria <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Nota: Questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
+$lang['p_isadmin']             = 'Nota: Il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
+$lang['p_include']             = 'I permessi più elevati includono i permessi inferiori. I permessi di Creazione, Upload e Cancellazione si applicano soltanto alle categorie e non alle pagine.';
+$lang['current']               = 'Regole ACL attuali';
+$lang['where']                 = 'Pagina/Categoria';
+$lang['who']                   = 'Utente/Gruppo';
+$lang['perm']                  = 'Permessi';
+$lang['acl_perm0']             = 'Nessuno';
+$lang['acl_perm1']             = 'Lettura';
+$lang['acl_perm2']             = 'Modifica';
+$lang['acl_perm4']             = 'Creazione';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Cancellazione';
+$lang['acl_new']               = 'Aggiungi nuovo record';
+$lang['acl_mod']               = 'Modifica record';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/help.txt
new file mode 100644
index 000000000..f7867f8e2
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/help.txt
@@ -0,0 +1,11 @@
+=== クイックヘルプ： ===
+
+このページでは、Wiki内の名前空間とページに対する権限を追加・削除することができます。
+
+左側のボックスには存在する名前空間とページが表示されています。
+
+上記のフォームを使って、選択したユーザーもしくはグループの権限を閲覧・変更することができます。
+
+以下のテープルには、現在設定されているアクセスコントロールのルールが表示されています。このテーブルを使って、複数のルールを素早く変更・削除することが可能です。
+
+DokuWikiのアクセスコントロールについては、[[doku>acl|official documentation on ACL]] をお読み下さい。
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/lang.php
new file mode 100644
index 000000000..831fd2d5c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ja/lang.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * japanese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Davilin(Yuji Takenaka) <webmaster@davilin.com>
+ * @author Yuji Takenaka <webmaster@davilin.com>
+ * @author Ikuo Obataya <i.obataya@gmail.com>
+ * @author Daniel Dupriest <kououken@gmail.com>
+ * @author Kazutaka Miyasaka <kazmiya@gmail.com>
+ */
+$lang['admin_acl']             = 'アクセスコントロール管理';
+$lang['acl_group']             = 'グループ';
+$lang['acl_user']              = 'ユーザー';
+$lang['acl_perms']             = '権限を追加';
+$lang['page']                  = '文書';
+$lang['namespace']             = '名前空間';
+$lang['btn_select']            = '選択';
+$lang['p_user_id']             = 'ユーザー <b class="acluser">%s</b> は、ページ <b class="aclpage">%s</b> に対して次の権限を持っています: <i>%s</i>';
+$lang['p_user_ns']             = 'ユーザー <b class="acluser">%s</b> は、名前空間 <b class="aclns">%s</b> に対して次の権限を持っています: <i>%s</i>';
+$lang['p_group_id']            = 'グループ <b class="aclgroup">%s</b> のメンバーは、ページ <b class="aclpage">%s</b> に対して次の権限を持っています: <i>%s</i>';
+$lang['p_group_ns']            = 'グループ <b class="aclgroup">%s</b> のメンバーは、名前空間 <b class="aclns">%s</b> に対して次の権限を持っています: <i>%s</i>';
+$lang['p_choose_id']           = 'ページ <b class="aclpage">%s</b> にセットされた権限を閲覧・編集するためには、上記のフォームに<b>ユーザー名もしくはグループ名を入力して下さい</b>。';
+$lang['p_choose_ns']           = '名前空間 <b class="aclns">%s</b> にセットされた権限を閲覧・編集するためには、上記のフォームに<b>ユーザー名もしくはグループ名を入力して下さい</b>。';
+$lang['p_inherited']           = '注意：これらの権限は明示されていませんが、他のグループもしくは上位の名前空間の権限を継承します。';
+$lang['p_isadmin']             = '注意：選択したグループもしくはユーザーはスーパーユーザーであるため、全ての権限があります。';
+$lang['p_include']             = '高次の権限は、それより低次の権限を含みます。作成・アップロード・削除の権限は、ページではなく名前空間のみに適用されます。';
+$lang['current']               = '現在のACLルール';
+$lang['where']                 = 'ページ/名前空間';
+$lang['who']                   = 'ユーザー/グループ';
+$lang['perm']                  = '権限';
+$lang['acl_perm0']             = '無し';
+$lang['acl_perm1']             = '読取';
+$lang['acl_perm2']             = '編集';
+$lang['acl_perm4']             = '作成';
+$lang['acl_perm8']             = 'アップロード';
+$lang['acl_perm16']            = '削除';
+$lang['acl_new']               = '新規エントリ';
+$lang['acl_mod']               = 'エントリの編集';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/help.txt
new file mode 100644
index 000000000..516198ee5
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/help.txt
@@ -0,0 +1,11 @@
+=== 도움말: ===
+
+현재 페이지에서 위키 네임스페이스와 페이지에 대한 접근 권한을 추가하거나 삭제할 수 있습니다.
+
+왼쪽 영역을 선택가능한 네임스페이스들과 페이지 목록을 보여줍니다.
+
+위쪽 입력 양식에서 선택된 사용자와 그룹의 접근 권한을 보거나 변경할 수 있습니다.
+
+아래 테이블에서 현재 설정된 모든 접근 제어 규칙들을 볼 수 있으며, 즉시 여러 규칙들을 삭제하거나  변경할 수 있습니다.
+
+DokuWiki에서 접근 제어가 어떻게 동작되는지 알려면  [[doku>acl|official documentation on ACL]] 읽기 바랍니다.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/lang.php
new file mode 100644
index 000000000..43a5ceeeb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ko/lang.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * korean language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Matthias Grimm <matthiasgrimm@users.sourceforge.net>
+ * @author jk Lee
+ * @author dongnak@gmail.com
+ * @author Song Younghwan <purluno@gmail.com>
+ * @author SONG Younghwan <purluno@gmail.com>
+ */
+$lang['admin_acl']             = '접근 제어 목록 관리';
+$lang['acl_group']             = '그룹';
+$lang['acl_user']              = '사용자';
+$lang['acl_perms']             = '권한';
+$lang['page']                  = '페이지';
+$lang['namespace']             = '네임스페이스';
+$lang['btn_select']            = '선택';
+$lang['p_user_id']             = '사용자 <b class="acluser">%s</b>는 현재 <b class="aclpage">%s</b>: <i>%s</i> 페이지 접근이 가능합니다.';
+$lang['p_user_ns']             = '사용자 <b class="acluser">%s</b>는 현재 <b class="aclns">%s</b>: <i>%s</i> 네임스페이스 접근이 가능합니다.';
+$lang['p_group_id']            = '그룹 <b class="aclgroup">%s</b> 사용자는 현재 <b class="aclpage">%s</b>: <i>%s</i> 페이지 접근이 가능합니다.';
+$lang['p_group_ns']            = '그룹 <b class="aclgroup">%s</b> 사용자는 현재 <b class="aclns">%s</b>: <i>%s</i> 네임스페이스 접근이 가능합니다.';
+$lang['p_choose_id']           = '<b class="aclpage">%s</b> 페이지 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
+$lang['p_choose_ns']           = '<b class="aclns">%s</b> 네임스페이스 접근 권한을 보거나 변경하려면 <b>사용자</b>나 <b>그룹</b>을 위 양식에 입력하기 바랍니다.';
+$lang['p_inherited']           = '주의: 권한이 명시적으로 설정되지 않았으므로 다른 그룹들이나 상위 네임스페이스로 부터 가져왔습니다.';
+$lang['p_isadmin']             = '주의: 슈퍼유저로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
+$lang['p_include']             = '더 높은 접근권한은 하위를 포함합니다. 페이지가 아닌 네임스페이스에는 생성, 업로드, 삭제 권한만 적용됩니다.';
+$lang['current']               = '현 ACL 규칙';
+$lang['where']                 = '페이지/네임스페이스';
+$lang['who']                   = '사용자/그룹';
+$lang['perm']                  = '접근 권한';
+$lang['acl_perm0']             = '없음';
+$lang['acl_perm1']             = '읽기';
+$lang['acl_perm2']             = '수정';
+$lang['acl_perm4']             = '생성';
+$lang['acl_perm8']             = '업로드';
+$lang['acl_perm16']            = '삭제';
+$lang['acl_new']               = '새 항목 추가';
+$lang['acl_mod']               = '선택 항목 변경';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lt/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lt/lang.php
new file mode 100644
index 000000000..f11944746
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lt/lang.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * lithuanian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Linas Valiukas <shirshegsm@gmail.com>
+ * @author audrius.klevas@gmail.com
+ * @author Arunas Vaitekunas <aras@fan.lt>
+ */
+$lang['admin_acl']             = 'Priėjimo Kontrolės Sąrašų valdymas';
+$lang['acl_group']             = 'Grupė';
+$lang['acl_user']              = 'Vartotojas';
+$lang['acl_perms']             = 'Leidimai';
+$lang['page']                  = 'Puslapis';
+$lang['namespace']             = 'Pavadinimas';
+$lang['btn_select']            = 'Rinktis';
+$lang['acl_perm1']             = 'Skaityti';
+$lang['acl_perm2']             = 'Redaguoti';
+$lang['acl_perm4']             = 'Sukurti';
+$lang['acl_perm8']             = 'Atsiųsti';
+$lang['acl_perm16']            = 'Ištrinti';
+$lang['acl_new']               = 'Pridėti naują įrašą';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/help.txt
new file mode 100644
index 000000000..f570d798c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/help.txt
@@ -0,0 +1,11 @@
+=== Īsa palīdzība ===
+
+Šajā lapā var uzdot un noņemt tiesības uz lapām un nodaļām.
+
+Kreisajā pusē parādītas visas pieejamās nodaļas un lapas.
+
+Formā augšpusē var redzēt un grozīt norādītā lietotāja vai grupas tiesības .
+
+Apakšā tabulā  parādīts visu tiesību saraksts. To var lietot, lai ātri mainītu vairākus pieejas tiesību noteikumus.
+
+[[doku>acl|Officiālajos piekļuves tiesību noteikumu dokumentos]] var atrast izvērstu informāciju, kā darbojas DokuWiki sistēmas piekļuves tiesību kontrole.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/lang.php
new file mode 100644
index 000000000..f478b32c6
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/lv/lang.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * latvian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Aivars Miška <allefm@gmail.com>
+ */
+$lang['admin_acl']             = 'Piekļuves tiesību vadība';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Lietotājs';
+$lang['acl_perms']             = 'Tiesības';
+$lang['page']                  = 'Lapa';
+$lang['namespace']             = 'Nodaļa';
+$lang['btn_select']            = 'Izvēlēties';
+$lang['p_user_id']             = 'Lietotājam <b class="acluser">%s</b> ir tiesības <i>%s</i> lapu <b class="aclpage">%s</b> .';
+$lang['p_user_ns']             = 'Lietotājam <b class="acluser">%s</b> nodaļā <b class="aclns">%s</b> ir tiesības <i>%s</i>.';
+$lang['p_group_id']            = 'Grupas <b class="aclgroup">%s</b> biedriem ir tiesības <i>%s</i> lapu <b class="aclpage">%s</b>.';
+$lang['p_group_ns']            = 'Grupas <b class="aclgroup">%s</b> biedriem ir tiesības <i>%s</i> nodaļu  <b class="aclns">%s</b>: .';
+$lang['p_choose_id']           = 'Lūdzu <b>ieraksti lietotāju vai grupu</b> augstāk norādītajā laukā, lai skatītu vai labotu tiesības lapai <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Lūdzu <b>ieraksti lietotāju vai grupu</b> augstāk norādītajā laukā, lai skatītu vai labotu tiesības nodaļai <b class="aclpage">%s</b>.';
+$lang['p_inherited']           = 'Ievēro: Šīs tiesības nav tieši uzdotas, bet mantotas no citām grupām vai augstākām nodaļām. ';
+$lang['p_isadmin']             = 'Ievēro: Norādītajai grupai vai lietotājam vienmēr ir visas tiesības, jo tas konfigurēts kā <i>superuser</i>.';
+$lang['p_include']             = 'Augstāka atļauja iekļauj arī zemākās tiesības. Izveidošanas, augšupielādēšanas un dzēšanas tiesības attiecas tikai uz nodaļām, nevis lapām.';
+$lang['current']               = 'Patreizējo tiesību saraksts (ACL)';
+$lang['where']                 = 'Lapa/nodaļa';
+$lang['who']                   = 'Lietotājs/grupa';
+$lang['perm']                  = 'Tiesības';
+$lang['acl_perm0']             = 'nekādas';
+$lang['acl_perm1']             = 'lasīt';
+$lang['acl_perm2']             = 'labot';
+$lang['acl_perm4']             = 'izveidot';
+$lang['acl_perm8']             = 'augšupielādēt';
+$lang['acl_perm16']            = 'dzēst';
+$lang['acl_new']               = 'pievienot jaunu šķirkli';
+$lang['acl_mod']               = 'labot šķirkli';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/help.txt
new file mode 100644
index 000000000..e8aa13b52
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/help.txt
@@ -0,0 +1,12 @@
+=== त्वरित मदत ===
+
+या पानावर तुमची तुमच्या विकी मधील पाने किंवा नेमस्पेस वरील परवानग्या बदलू शकता.
+
+डाविकडील मार्जिन मधे सर्व उपलब्ध पाने आणि नेमस्पेस दाखवले आहेत.
+
+वरील फॉर्म वापरून तुमची निवडलेल्या सदस्य किंवा गटाच्या परवानग्या बदलू शकता.
+
+खालील टेबल मधे सध्या सेट असलेले नियम दिलेले आहेत.
+हे टेबल वापरून तुम्ही चटकन हे नियम बदलू शकता.
+
+[[doku>acl| ACL वरील अधिकृत माहितीसंग्रह ]] वाचून तुम्हाला डॉक्युविकिमधे परवानगीची व्यवस्था कशी काम करते ते नीट समजेल.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/lang.php
new file mode 100644
index 000000000..978df758a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/mr/lang.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Marathi language file
+ *
+ * @author ghatothkach@hotmail.com
+ * @author Padmanabh Kulkarni <kulkarnipadmanabh@gmail.com>
+ * @author Padmanabh Kulkarni<kulkarnipadmanabh@gmail.com>
+ * @author shantanoo@gmail.com
+ */
+$lang['admin_acl']             = 'Access Control List  व्यवस्थापन';
+$lang['acl_group']             = 'गट';
+$lang['acl_user']              = 'सदस्य';
+$lang['acl_perms']             = 'परवानगी \'च्या साठी';
+$lang['page']                  = 'पान';
+$lang['namespace']             = 'नेमस्पेस';
+$lang['btn_select']            = 'निवडा';
+$lang['p_user_id']             = '<b class="acluser">%s</b> ह्या सदस्याला सध्या <b class="aclpage">%s</b> या पानावर पुढील परवानग्या आहेत : <i>%s</i>.';
+$lang['p_user_ns']             = '<b class="acluser">%s</b> या सदस्याला सध्या <b class="aclns">%s</b> या नेमस्पेसवर पुढील परवानग्या आहेत : <i>%s</i>.';
+$lang['p_group_id']            = '<b class="aclgroup">%s</b> या गटाच्या सदस्याना सध्या <b class="aclpage">%s</b> या पानावर पुढील परवानग्या आहेत : <i>%s</i>.';
+$lang['p_group_ns']            = '<b class="aclgroup">%s</b> या गटाच्या सदस्याना सध्या <b class="aclns">%s</b> या नेमस्पेसवर पुढील परवानग्या आहेत : <i>%s</i>.';
+$lang['p_choose_id']           = 'वरील फॉर्म मधे एखाद्या <b>सदस्य किंवा गटाचे </b> नाव टाकुन <b class="aclpage">%s</b> या पानासाठी त्यांच्या परवानग्या पाहू/बदलू शकता.';
+$lang['p_choose_ns']           = 'वरील फॉर्म मधे एखाद्या <b>सदस्य किंवा गटाचे </b> नाव टाकुन <b class="aclns">%s</b> या नेमस्पेससाठी त्यांच्या परवानग्या पाहू/बदलू शकता.';
+$lang['p_inherited']           = 'टीप : ह्या परवानग्या प्रत्यक्ष सेट केल्या नसून त्या इतर गट किंवा अधिक उच्च नेमस्पेस कडून वारसाहक्काने  :) आल्या आहेत.';
+$lang['p_isadmin']             = 'टीप : निवडलेल्या सदस्य किंवा गटाला कायम सर्व परवानग्या असतात कारण तो सुपर सदस्य म्हणुन सेट केला आहे.';
+$lang['p_include']             = 'उच्च परवानग्यांमधे त्याखालिल परवानग्या अध्याहृत असतात. क्रिएट, अपलोड आणि डिलीट परवानग्या फ़क्त नामसमुहावर (नेमस्पेस) लागू असतात, पानांवर नाही.';
+$lang['current']               = 'सद्य ACL नियम';
+$lang['where']                 = 'पान/नेमस्पेस';
+$lang['who']                   = 'सदस्य/गट';
+$lang['perm']                  = 'परवानग्या';
+$lang['acl_perm0']             = 'काही नाही.';
+$lang['acl_perm1']             = 'वाचन';
+$lang['acl_perm2']             = 'संपादन';
+$lang['acl_perm4']             = 'निर्माण';
+$lang['acl_perm8']             = 'अपलोड';
+$lang['acl_perm16']            = 'डिलीट';
+$lang['acl_new']               = 'नवीन एंट्री करा';
+$lang['acl_mod']               = 'एंट्री बदला';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ne/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ne/lang.php
new file mode 100644
index 000000000..6a29a9fa8
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ne/lang.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Nepali language file
+ *
+ * @author Saroj Kumar Dhakal <lotusnagarkot@gmail.com>
+ * @author SarojKumar Dhakal <lotusnagarkot@yahoo.com>
+ * @author Saroj Dhakal<lotusnagarkot@yahoo.com>
+ */
+$lang['admin_acl']             = 'एक्सेस कन्ट्रोल लिस्ट व्यवस्थापन';
+$lang['acl_group']             = 'समूह';
+$lang['acl_user']              = 'प्रोगकर्ता';
+$lang['acl_perms']             = 'को लागि अनुमति';
+$lang['page']                  = 'पृष्ठ';
+$lang['namespace']             = 'नेमस्पेस';
+$lang['btn_select']            = 'छान्नुहोस्';
+$lang['current']               = 'हालैको ACL नियमहरु ';
+$lang['where']                 = 'पृष्ठ / नेमस्पेस';
+$lang['who']                   = 'प्रयोगकर्ता / समूह ';
+$lang['perm']                  = 'अनुमति';
+$lang['acl_perm0']             = 'कुनै पनि होइन';
+$lang['acl_perm1']             = 'पठन गर्नुहोस्';
+$lang['acl_perm2']             = 'सम्पादन गर्नुहोस्';
+$lang['acl_perm4']             = 'निर्माण गर्नुहोस्';
+$lang['acl_perm8']             = 'अपलोड गर्नुहोस्';
+$lang['acl_perm16']            = 'मेटाउनुहोस्';
+$lang['acl_new']               = 'नयाँ प्रविष्ठि गर्नुहोस्';
+$lang['acl_mod']               = 'प्रविष्ठि सच्याउनुहोस्';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/help.txt
new file mode 100644
index 000000000..255f21ba0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/help.txt
@@ -0,0 +1,11 @@
+=== Snelle hulp: ===
+
+Op deze pagina kun je bevoegdheden toevoegen en verwijderen voor namespaces en pagina's in je wiki.
+
+Het linkerpaneel geeft alle beschikbare namespaces en pagina's weer.
+
+In het formulier hierboven kun je bevoegdheden zien en aanpassen voor een selecteerde gebruiker of groep.
+
+In de tabel hieronder worden alle momenteel ingestelde toegangsregels weergegeven. Je kunt hier snel regels wijzigen of verwijderen.
+
+Lees de  [[doku>acl|documentatie over ACLs]] om de mogelijkheden volledig te begrijpen.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/lang.php
new file mode 100644
index 000000000..d45bb5907
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/nl/lang.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * dutch language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author François Kooman <fkooman.tuxed.net>
+ * @author Jack van Klaren <dokuwiki@afentoe.xs4all.nl>
+ * @author Riny Heijdendael <riny@heijdendael.nl>
+ * @author Koen Huybrechts <huybkoen@gmail.com>
+ * @author Wouter Schoot <wouter@schoot.org>
+ * @author John de Graaff <john@de-graaff.net>
+ * @author Niels Schoot <niels.schoot@quintiq.com>
+ * @author Dion Nicolaas <dion@nicolaas.net>
+ * @author Danny Rotsaert <danny.rotsaert@edpnet.be>
+ * @author Marijn Hofstra hofstra.m@gmail.com
+ * @author Matthias Carchon webmaster@c-mattic.be
+ */
+$lang['admin_acl']             = 'Toegangsrechten';
+$lang['acl_group']             = 'Groep';
+$lang['acl_user']              = 'Gebruiker';
+$lang['acl_perms']             = 'Permissies voor';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Selecteer';
+$lang['p_user_id']             = 'Gebruiker <b class="acluser">%s</b> heeft momenteel de volgende bevoegdheden op pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Gebruiker <b class="acluser">%s</b> heeft momenteel de volgende bevoegdheden op namespace <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Leden van groep <b class="aclgroup">%s</b> hebben momenteel de volgende bevoegdheden op pagina <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Leden van groep <b class="aclgroup">%s</b>hebben momenteel de volgende bevoegdheden op namespace <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Vul een <b>gebruiker of groep</b> in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de pagina <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Vul een <b>gebruiker of groep</b> in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de namespace <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Let op: Deze permissies zijn niet expliciet ingesteld maar overerfd van andere groepen of hogere namespaces.';
+$lang['p_isadmin']             = 'Let op: De geselecteerde groep of gebruiker heeft altijd volledige toegangsrechten omdat hij als superuser geconfigureerd is.';
+$lang['p_include']             = 'Hogere permissies bevatten ook de lagere. Aanmaken, uploaden en verwijderen gelden alleen voor namespaces, niet voor pagina\'s.';
+$lang['current']               = 'Huidige ACL regels';
+$lang['where']                 = 'Pagina/namespace';
+$lang['who']                   = 'Gebruiker/Groep';
+$lang['perm']                  = 'Bevoegdheden';
+$lang['acl_perm0']             = 'Geen';
+$lang['acl_perm1']             = 'Lezen';
+$lang['acl_perm2']             = 'Bewerken';
+$lang['acl_perm4']             = 'Aanmaken';
+$lang['acl_perm8']             = 'Uploaden';
+$lang['acl_perm16']            = 'Verwijderen';
+$lang['acl_new']               = 'Nieuwe regel toevoegen';
+$lang['acl_mod']               = 'Regel aanpassen';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/help.txt
new file mode 100644
index 000000000..f02b6bdbd
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/help.txt
@@ -0,0 +1,11 @@
+===Lynhjelp===
+
+På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki.
+
+Venstre panel viser alle tilgjengelige navnerom og sider.
+
+Skjemaet over tillater deg å se og modifisere tillatelser for en valgt bruker eller gruppe.
+
+I tabellen nedenfor vises alle nærværende satte adgangskontroll-regler. Du kan bruke den til raskt å slette eller endre mange regler i slengen.
+
+Å lese  [[doku>acl|den offisielle dokumentasjonen for ACL]]  kan hjelpe deg å fullt ut forstå hvordan adgangskontroll fungerer i DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/lang.php
new file mode 100644
index 000000000..cd9e2edfb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/no/lang.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Norwegian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Reidar Mosvold <Reidar.Mosvold@hit.no>
+ * @author Jorge Barrera Grandon <jorge@digitalwolves.org>
+ * @author Thomas Nygreen <nygreen@gmail.com>
+ * @author Arild Burud <arildb@met.no>
+ * @author Torkill Bruland <torkar-b@online.no>
+ * @author Rune M. Andersen <rune.andersen@gmail.com>
+ * @author Jakob Vad Nielsen (me@jakobnielsen.net)
+ * @author Kjell Tore Næsgaard  <kjell.t.nasgaard@ntnu.no>
+ * @author Knut Staring <knutst@gmail.com>
+ * @author Lisa Ditlefsen <lisa@vervesearch.com>
+ * @author Erik Pedersen <erik.pedersen@shaw.ca>
+ * @author Erik Bjørn Pedersen <erik.pedersen@shaw.ca>
+ */
+$lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Bruker';
+$lang['acl_perms']             = 'Rettigheter for';
+$lang['page']                  = 'Side';
+$lang['namespace']             = 'Navnerom';
+$lang['btn_select']            = 'Velg';
+$lang['p_user_id']             = 'Bruker <b class="acluser">%s</b> har for tiden følgende tillatelser i for siden  <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Bruker <b class="acluser">%s</b> har for tiden følgende tillatelser i navnerom <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Medlemmer av gruppe <b class="aclgroup">%s</b> har for tiden følgende tillatelser i for siden <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Medlemmer av gruppe <b class="aclgroup">%s</b> har for tiden følgende tillatelser i navnerom <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = '<b>Før inn en bruker eller gruppe</b> i skjemaet over for å vise eller redigere tillatelser satt for siden <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = '<b>Før inn en bruker eller gruppe</b> i skjemaet over for å vise eller redigere tillatelser satt for navnerommet <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Merk: Disse tillatelser ble ikke eksplisitt satt, men ble arvet fra andre grupper eller høyere navnerom.';
+$lang['p_isadmin']             = 'Merk: Den valgte gruppen eller bruker har altid fulle tillatelser fordi vedkommende er konfigurert som superbruker.';
+$lang['p_include']             = 'Høyere tillgangsrettigheter inkluderer lavere. Rettigheter for å opprette, laste opp og slette gjelder bare  for navnerom, ikke enkeltsider.';
+$lang['current']               = 'Någjeldende ACL-regler';
+$lang['where']                 = 'Side/Navnerom';
+$lang['who']                   = 'Bruker/Gruppe';
+$lang['perm']                  = 'Tillatelser';
+$lang['acl_perm0']             = 'Ingen';
+$lang['acl_perm1']             = 'Lese';
+$lang['acl_perm2']             = 'Redigere';
+$lang['acl_perm4']             = 'Lage';
+$lang['acl_perm8']             = 'Laste opp';
+$lang['acl_perm16']            = 'Slette';
+$lang['acl_new']               = 'Legg til ny oppføring';
+$lang['acl_mod']               = 'Modifiser oppføring';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/help.txt
new file mode 100644
index 000000000..331fd2a7a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/help.txt
@@ -0,0 +1,11 @@
+=== Pomoc ===
+
+Na tej stronie możesz zmienić uprawnienia do stron i katalogów w wiki.
+
+Lewy panel pokazuje wszystkie dostępne katalogi i strony.
+
+Formularz powyżej pozwala wyświetlać uprawnienia wybranego użytkownika oraz grupy.
+
+W tabeli poniżej znajdują się wszystkie aktywne reguły dotyczące uprawnień.
+
+Więcej informacji na temat uprawnień w DokuWiki możesz znaleźć w [[doku>acl|oficjalnej dokumentacji uprawnień]].
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/lang.php
new file mode 100644
index 000000000..63a870c50
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pl/lang.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * polish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Grzegorz Żur <grzegorz.zur@gmail.com>
+ * @author Mariusz Kujawski <marinespl@gmail.com>
+ * @author Maciej Kurczewski <pipijajko@gmail.com>
+ * @author Sławomir Boczek <slawkens@gmail.com>
+ */
+$lang['admin_acl']             = 'Zarządzanie uprawnieniami';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Użytkownik';
+$lang['acl_perms']             = 'Uprawnienia użytkownika';
+$lang['page']                  = 'Strona';
+$lang['namespace']             = 'Katalog';
+$lang['btn_select']            = 'Wybierz';
+$lang['p_user_id']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Użytkownik <b class="acluser">%s</b> posiada następujące uprawnienia do katalogów <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Członkowie grupy <b class="aclgroup">%s</b> posiadają następujące uprawnienia do strony <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do strony <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Podaj <b>nazwę użytkownika lub grupy</b> w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do katalogu <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Uwaga: Uprawnienia nie zostały nadane wprost ale są dziedziczone z grupy lub katalogu.';
+$lang['p_isadmin']             = 'Uwaga: Wybrana grupa lub użytkownika zawsze dysponuje pełnymi uprawnieniami ponieważ posiada uprawnienia administratora.';
+$lang['p_include']             = 'Szersze uprawnienia zawierają węższe. Tworzenie, przesyłanie plików oraz usuwanie mają znaczenie tylko dla katalogów, nie dla stron.';
+$lang['current']               = 'Aktywne reguły zarządzania uprawnieniami';
+$lang['where']                 = 'Strona/Katalog';
+$lang['who']                   = 'Użytkownik/Grupa';
+$lang['perm']                  = 'Uprawnienie';
+$lang['acl_perm0']             = 'Żadne';
+$lang['acl_perm1']             = 'Czytanie';
+$lang['acl_perm2']             = 'Zmiana';
+$lang['acl_perm4']             = 'Tworzenie';
+$lang['acl_perm8']             = 'Przesyłanie plików';
+$lang['acl_perm16']            = 'Usuwanie';
+$lang['acl_new']               = 'Dodaj nowy wpis';
+$lang['acl_mod']               = 'Zmień wpis';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/help.txt
new file mode 100644
index 000000000..b2a49a90d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/help.txt
@@ -0,0 +1,11 @@
+=== Ajuda rápida: ===
+
+Nessa página você pode adicionar e remover permissões para espaços de nomes e páginas do seu wiki.
+
+O painel à esquerda mostra todos os espaços de nomes e páginas disponíveis.
+
+O formulário acima permite a visualização e modificação das permissões de um determinado usuário ou grupo.
+
+Na tabela abaixo são exibidas todas as regras de controle de acesso definidas. Você pode usá-la para excluir ou mudar rapidamente várias regras.
+
+A leitura da [[doku>acl|documentação oficial sobre ACL]] pode ajudar a compreender melhor como o controle de acessos funciona no DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/lang.php
new file mode 100644
index 000000000..82a19b290
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt-br/lang.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Brazilian Portuguese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Luis Fernando Enciso <lfenciso@certto.com.br>
+ * @author Alauton/Loug
+ * @author Frederico Gonçalves Guimarães <frederico@teia.bio.br>
+ * @author Felipe Castro <fefcas@gmail.com>
+ * @author Lucien Raven <lucienraven@yahoo.com.br>
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Flávio Veras <flaviove@gmail.com>
+ * @author Jeferson Propheta <jeferson.propheta@gmail.com>
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas <luis@dantas.com>
+ * @author Frederico Guimarães <frederico@teia.bio.br>
+ * @author Jair Henrique <jair.henrique@gmail.com>
+ * @author Luis Dantas <luisdantas@gmail.com>
+ */
+$lang['admin_acl']             = 'Administração da Lista de Controles de Acesso';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuário';
+$lang['acl_perms']             = 'Permissões para';
+$lang['page']                  = 'Página';
+$lang['namespace']             = 'Espaço de nomes';
+$lang['btn_select']            = 'Selecionar';
+$lang['p_user_id']             = 'O usuário <b class="acluser">%s</b> possui as seguintes permissões na página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'O usuário <b class="acluser">%s</b> possui as seguintes permissões no espaço de nomes <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Os membros do grupo <b class="aclgroup">%s</b> possuem as seguintes permissões na página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Os membros do grupo <b class="aclgroup">%s</b> possuem as seguintes permissões no espaço de nomes <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Por favor <b>digite um usuário ou grupo</b> no formulário acima para ver ou editar as permissões para a página <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Por favor <b>digite um usuário ou grupo</b> no formulário acima para ver ou editar as permissões para o espaço de nomes <b class="aclpage">%s</b>.';
+$lang['p_inherited']           = 'Nota: Essas permissões não foram definidas explicitamente, mas sim herdadas de outros grupos ou espaço de nomes superiores.';
+$lang['p_isadmin']             = 'Nota: O grupo ou usuário selecionado sempre tem permissões completas, porque ele está configurado como superusuário.';
+$lang['p_include']             = 'As permissões superiores incluem as inferiores. Permissões para Criar, Enviar e Apagar aplicam-se apenas aos espaços de nomes e não às páginas.';
+$lang['current']               = 'Regras atuais da ACL';
+$lang['where']                 = 'Página/Espaço de nomes';
+$lang['who']                   = 'Usuário/Grupo';
+$lang['perm']                  = 'Permissões';
+$lang['acl_perm0']             = 'Nenhuma';
+$lang['acl_perm1']             = 'Ler';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Criar';
+$lang['acl_perm8']             = 'Enviar';
+$lang['acl_perm16']            = 'Excluir';
+$lang['acl_new']               = 'Adicionar nova entrada';
+$lang['acl_mod']               = 'Modificar a entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/help.txt
new file mode 100644
index 000000000..cf4619deb
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/help.txt
@@ -0,0 +1,9 @@
+=== Auxílio Rápido ===
+
+Nesta página podes adicionar e remover permissões para espaço de nomes e páginas no seu wiki.
+
+O painel esquerdo exibe todos os espaço de nomes e páginas. O formulario acima permite a visualização e modificar as permissões de um selecionado utilizador ou grupo.
+
+Na tabela inferior são exibidas todas as actuais regras de controle de acesso. Podes utilisá-la para excluir ou mudar rapidamente várias regras ao mesmo tempo.
+
+A leitura da [[doku>acl|documentação oficial acerca ACL]] pode ajudar a compreender melhor como o controle de acessos funciona no DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/lang.php
new file mode 100644
index 000000000..6e094fd74
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/pt/lang.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Portuguese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
+ * @author José Monteiro <Jose.Monteiro@DoWeDo-IT.com>
+ * @author Enrico Nicoletto <liverig@gmail.com>
+ * @author Fil <fil@meteopt.com>
+ * @author André Neves <drakferion@gmail.com>
+ */
+$lang['admin_acl']             = 'Gestão de ACLs';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Utilizador';
+$lang['acl_perms']             = 'Permissão para';
+$lang['page']                  = 'Documento';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Selecionar';
+$lang['p_user_id']             = 'O utilizador <b class="acluser">%s</b> tem as seguintes permissões na página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'O utilizador <b class="acluser">%s</b> tem as seguintes permissões no espaço de nomes <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Os membros do grupo <b class="aclgroup">%s</b> têm as seguintes permissões na página <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Os membros do grupo <b class="aclgroup">%s</b> têm as seguintes permissões no espaço de nomes <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Por favor <b>digite um utilizador ou grupo</b> no formulário acima para ver ou editar as permissões para a página <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Por favor <b>digite um utilizador ou grupo</b> no formulário acima para ver ou editar as permissões para o espaço de nomes <b class="aclpage">%s</b>.';
+$lang['p_inherited']           = 'Nota: Essas permissões não foram definidas explicitamente, mas sim herdadas de outros grupos ou espaço de nomes superiores.';
+$lang['p_isadmin']             = 'Nota: O grupo ou utilizador seleccionado tem sempre permissões completas, porque ele está configurado como superutilizador.';
+$lang['p_include']             = 'As permissões superiores incluem as inferiores. Permissões para Criar, Enviar e Apagar aplicam-se apenas aos espaços de nomes e não às páginas.';
+$lang['current']               = 'Regras Actuais ACL';
+$lang['where']                 = 'Página/Espaço de Nomes';
+$lang['who']                   = 'Utilizador/Grupo';
+$lang['perm']                  = 'Permissões';
+$lang['acl_perm0']             = 'Nenhum';
+$lang['acl_perm1']             = 'Ler';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Criar';
+$lang['acl_perm8']             = 'Carregar';
+$lang['acl_perm16']            = 'Remover';
+$lang['acl_new']               = 'Adicionar nova entrada';
+$lang['acl_mod']               = 'Modificar Entrada';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/help.txt
new file mode 100644
index 000000000..3f762613c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/help.txt
@@ -0,0 +1,11 @@
+=== Quick Help: ===
+
+Pe această pagină puteţi adăuga şi elimina autorizaţiile pentru spaţiile de nume şi paginile din wiki.
+
+Panoul din stânga afişează toate spaţiile de nume şi paginile disponibile.
+
+Formularul de sus vă permite să vedeţi şi să modificaţi autorizaţiile unui anume utilizator sau grup.
+
+In tabelul de jos sunt arătate toate regulile de control a accesului setate. Îl puteţi folosi pentru a şterge sau modifica rapid mai multe reguli.
+
+Consultarea [[doku>acl|official documentation on ACL]] vă poate ajuta să înţelegeţi deplin cum funcţionează controlul accesului în DocuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/lang.php
new file mode 100644
index 000000000..296baa291
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ro/lang.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Romanian language file
+ *
+ * @author Sergiu Baltariu <s_baltariu@yahoo.com>
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi <n30@mandrivausers.ro>
+ * @author Emanuel-Emeric Andrași <n30@mandrivausers.ro>
+ * @author Emanuel-Emeric Andraşi <em.andrasi@mandrivausers.ro>
+ * @author Emanuel-Emeric Andrasi <em.andrasi@mandrivausers.ro>
+ */
+$lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Utilizator';
+$lang['acl_perms']             = 'Autorizare pentru';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Spaţiu de nume';
+$lang['btn_select']            = 'Selectează';
+$lang['p_user_id']             = 'Utilizatorul <b class="acluser">%s</b> are următoarele autorizaţii pe pagină <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Utilizatorul <b class="acluser">%s</b> are următoarele autorizaţii pe spaţiul de nume <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Membrii grupului <b class="aclgroup">%s</b> au următoarele autorizaţii pe pagină <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Membrii grupului <b class="aclgroup">%s</b> au următoarele autorizaţii pe spaţiul de nume <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = '<b>Introduceţi un utilizator sau un grup</b> în formularul de mai sus pentru a vizualiza sau edita autorizaţiile paginii <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = '<b>Introduceţi un utilizator sau un grup</b> în formularul de mai sus pentru a vizualiza sau edita autorizaţiile spaţiului de nume <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Notă: Aceste autorizaţii nu au fost setate explicit ci au fost moştenite de la alte grupuri sau spaţii de nume superioare ierarhic.';
+$lang['p_isadmin']             = 'Notă: Grupul sau utilizatorul selectat are intotdeauna toate autorizatiile întrucât este configurat ca superutilizator.';
+$lang['p_include']             = 'Permisiunile superioare le includ pe cele inferioare. Permisiunile de Creare, Upload şi Ştergere se aplică doar numelor de spaţiu, nu paginilor.';
+$lang['current']               = 'Reguli ACL actuale';
+$lang['where']                 = 'Pagină/Spaţiu de nume';
+$lang['who']                   = 'Utilizator/Grup';
+$lang['perm']                  = 'Autorizaţii';
+$lang['acl_perm0']             = 'Nici una';
+$lang['acl_perm1']             = 'Citire';
+$lang['acl_perm2']             = 'Editare';
+$lang['acl_perm4']             = 'Creare';
+$lang['acl_perm8']             = 'Încărcare';
+$lang['acl_perm16']            = 'Ştergere';
+$lang['acl_new']               = 'Adaugă intrare nouă';
+$lang['acl_mod']               = 'Modifică intrare';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/help.txt
new file mode 100644
index 000000000..f969151fe
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/help.txt
@@ -0,0 +1,11 @@
+=== Краткая Справка: ===
+
+На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам вашей вики.
+
+На панели слева отображены доступные пространства имён и страницы.
+
+Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.
+
+Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.
+
+Прочтение  [[doku>acl|официальной документации по ACL]]  может помочь вам в полном понимании работы управления правами доступа в DokuWiki.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/lang.php
new file mode 100644
index 000000000..496e67510
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/ru/lang.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Russian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Denis Simakov <akinoame1@gmail.com>
+ * @author Змей Этерийский evil_snake@eternion.ru
+ * @author Hikaru Nakajima <jisatsu@mail.ru>
+ * @author Alexei Tereschenko <alexeitlex@yahoo.com>
+ * @author Irina Ponomareva irinaponomareva@webperfectionist.com
+ * @author Alexander Sorkin <kibizoid@gmail.com>
+ * @author Kirill Krasnov <krasnovforum@gmail.com>
+ * @author Vlad Tsybenko <vlad.development@gmail.com>
+ */
+$lang['admin_acl']             = 'Управление списками контроля доступа';
+$lang['acl_group']             = 'Группа';
+$lang['acl_user']              = 'Пользователь';
+$lang['acl_perms']             = 'Права доступа для';
+$lang['page']                  = 'Страница';
+$lang['namespace']             = 'Пространство имен';
+$lang['btn_select']            = 'Выбрать';
+$lang['p_user_id']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Сейчас пользователь <b class="acluser">%s</b> имеет следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Сейчас члены группы <b class="aclgroup">%s</b> имеют следующие права на доступ к странице <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Сейчас члены группы <b class="aclgroup">%s</b> cимеют следующие права на доступ к пространству имён <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к странице <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Пожалуйста, <b>введите пользователя или группу</b> в форме выше, чтобы просмотреть или отредактировать права на доступ к пространству имён <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Замечание: Эти права доступа не были заданы явно, а были унаследованы от других групп или пространств имён более высокого порядка.';
+$lang['p_isadmin']             = 'Замечание: Выбранный пользователь всегда имеет полные права так, как он является суперпользователем.';
+$lang['p_include']             = 'Более высокие права доступа включают в себя более низкие. Права доступа Создание, Загрузка и Удаление относятся только к пространствам имён, а не к страницам.';
+$lang['current']               = 'Текущие права ACL';
+$lang['where']                 = 'Страница/Пространство имён';
+$lang['who']                   = 'Пользователь/Группа';
+$lang['perm']                  = 'Права доступа';
+$lang['acl_perm0']             = 'Нет доступа';
+$lang['acl_perm1']             = 'Чтение';
+$lang['acl_perm2']             = 'Правка';
+$lang['acl_perm4']             = 'Создание';
+$lang['acl_perm8']             = 'Загрузка файлов';
+$lang['acl_perm16']            = 'Удаление';
+$lang['acl_new']               = 'Добавить новую запись';
+$lang['acl_mod']               = 'Отредактировать запись';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/help.txt
new file mode 100644
index 000000000..1167bf5e9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/help.txt
@@ -0,0 +1,11 @@
+=== Krátka nápoveda: ===
+
+Na tejto stránke môžete pridávať alebo rušiť oprávnenia pre menné priestory a stránky vo Vašej wiki.
+
+Ľavý panel zobrazuje všetky dostupné menné priestory a stránky.
+
+Formulár zobrazený vyššie Vam dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu.
+
+V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel naraz.
+
+Prečítanie [[doku>acl|oficiálnej dokumentácie ACL]] Vám môže pomôcť plne pochopiť spôsob ako fungujú prístupové pravidlá (oprávnenia) v DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/lang.php
new file mode 100644
index 000000000..398f8c63d
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sk/lang.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * Slovak language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Ondrej Vegh <ov@vsieti.sk>
+ * @author Michal Mesko <michal.mesko@gmail.com>
+ * @author exusik@gmail.com
+ * @author Martin Michalek <michalek.dev@gmail.com>
+ */
+$lang['admin_acl']             = 'Správa zoznamu prístupových práv';
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Užívateľ';
+$lang['acl_perms']             = 'Práva pre';
+$lang['page']                  = 'Stránka';
+$lang['namespace']             = 'Menný priestor';
+$lang['btn_select']            = 'Vybrať';
+$lang['p_user_id']             = 'Používateľ <b class="acluser">%s</b> má aktuálne nasledujúce oprávnenia k stránke <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Používateľ <b class="acluser">%s</b> má aktuálne nasledujúce oprávnenia v mennom priestore <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Členovia skupiny <b class="aclgroup">%s</b> majú aktuálne nasledujúce oprávnenia k stránke <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Členovia skupiny <b class="aclgroup">%s</b> majú aktuálne nasledujúce oprávnenia v mennom priestore <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Prosím <b>zadajte používateľa alebo skupinu</b> do formulára zobrazeného vyššie, aby ste mohli prezerať alebo meniť oprávnenia k stránke <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Prosím <b>zadajte používateľa alebo skupinu</b> do formulára zobrazeného vyššie, aby ste mohli prezerať alebo meniť oprávnenia v mennom priestore <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Poznámka: Tieto oprávnenia neboli nastavené explicitne, ale boli odvodené z inej skupiny alebo nadradeného menného priestoru.';
+$lang['p_isadmin']             = 'Poznámka: Vybraná skupina alebo používateľ má vždy najvyššie oprávnenia, pretože je vedená/vedený ako správca.';
+$lang['p_include']             = 'Vyššie oprávnenia zahŕňajú nižšie. Oprávnenie Vytvoriť, Nahrať a Zmazať sa vzťahujú iba k menným priestorom, nie ku stránkam.';
+$lang['current']               = 'Aktuálne pravidlá prístupu (ACL)';
+$lang['where']                 = 'Stránka/Menný priestor';
+$lang['who']                   = 'Používateľ/Skupina';
+$lang['perm']                  = 'Povolenia';
+$lang['acl_perm0']             = 'Žiadne';
+$lang['acl_perm1']             = 'Čítať';
+$lang['acl_perm2']             = 'Zmeniť';
+$lang['acl_perm4']             = 'Vytvoriť';
+$lang['acl_perm8']             = 'Nahrať súbor';
+$lang['acl_perm16']            = 'Zmazať';
+$lang['acl_new']               = 'Pridať nový záznam';
+$lang['acl_mod']               = 'Upraviť záznam';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sl/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sl/lang.php
new file mode 100644
index 000000000..32141fbce
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sl/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Slovenian language file
+ *
+ * @author Dejan Levec <webphp@gmail.com>
+ * @author Boštjan Seničar <senicar@gmail.com>
+ */
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Uporabnik';
+$lang['acl_perms']             = 'Dovoljenja za';
+$lang['page']                  = 'Stran';
+$lang['btn_select']            = 'Izberi';
+$lang['who']                   = 'Uporabnik/Skupina';
+$lang['perm']                  = 'Dovoljenja';
+$lang['acl_perm1']             = 'Preberi';
+$lang['acl_perm2']             = 'Uredi';
+$lang['acl_perm4']             = 'Ustvari';
+$lang['acl_perm8']             = 'Naloži';
+$lang['acl_perm16']            = 'Zbriši';
+$lang['acl_new']               = 'Dodaj nov zapis';
+$lang['acl_mod']               = 'Spremeni zapis';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/help.txt
new file mode 100644
index 000000000..0ec8921d4
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/help.txt
@@ -0,0 +1,11 @@
+=== Приручна помоћ: ===
+
+На овој страни можете додати или уклонити дозволе за странице и именске просторе на Вашем викију.
+
+Леви панел приказује све доступне именске просторе и странице.
+
+Формулар изнад омогућава приказ и измену дозвола за одабране кориснике или групе.
+
+У табели испод су приказане све тренутно постављене дозволе. Можете је користити за брзо брисање или измену више правила.
+
+Читање [[doku>acl|званичне документације о ACL]] Вам може помоћи у потпуном разумевању рада дозвола приступа у DokuWiki-ју.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/lang.php
new file mode 100644
index 000000000..6e1649992
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sr/lang.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * serbian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Filip Brcic <brcha@users.sourceforge.net>
+ * @author Иван Петровић petrovicivan@ubuntusrbija.org
+ * @author Ivan Petrovic <petrovicivan@ubuntusrbija.org>
+ */
+$lang['admin_acl']             = 'Управљање листом контроле приступа';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Корисник';
+$lang['acl_perms']             = 'Дозволе за';
+$lang['page']                  = 'Страница';
+$lang['namespace']             = 'Именски простор';
+$lang['btn_select']            = 'Одабери';
+$lang['p_user_id']             = 'Корисник <b class="acluser">%s</b> тренутно има следеће дозволе за ову страницу <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Корисник <b class="acluser">%s</b> тренутно има следеће дозволе за овај именски простор <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Чланови групе <b class="acluser">%s</b> тренутно имају следеће дозволе за ову страницу <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Чланови групе <b class="acluser">%s</b> тренутно имају следеће дозволе за овај именски простор <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Молим Вас <b>унесите корисника или групу</b> у формулар изнад да бисте приказали или изменили дозволе за страницу <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Молим Вас <b>унесите корисника или групу</b> у формулар изнад да бисте приказали или изменили дозволе за именски простор <b class="aclpage">%s</b>.';
+$lang['p_inherited']           = 'Напомена: Ове дозволе се не постављају експлицитно већ само тамо где се не сударају са осталим групама или вишем иманском простору.';
+$lang['p_isadmin']             = 'Напомена: Одабран корисник или група има увек пуне дозволе јер је постављен за суперкорисника.';
+$lang['p_include']             = 'Више дозволе укључују ниже. Дозволе одавања, слања и брисања ће бити примењене само на именске просторе, не и на стране.';
+$lang['current']               = 'Тренутна правила проступа';
+$lang['where']                 = 'Страница/Именски простор';
+$lang['who']                   = 'Корисник/Група';
+$lang['perm']                  = 'Дозволе';
+$lang['acl_perm0']             = 'Ништа';
+$lang['acl_perm1']             = 'Читање';
+$lang['acl_perm2']             = 'Измена';
+$lang['acl_perm4']             = 'Прављење';
+$lang['acl_perm8']             = 'Слање';
+$lang['acl_perm16']            = 'Брисање';
+$lang['acl_new']               = 'Додај нови унос';
+$lang['acl_mod']               = 'Измени унос';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/help.txt
new file mode 100644
index 000000000..5ba770fa0
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/help.txt
@@ -0,0 +1,8 @@
+=== Hjälp ===
+På den här sidan kan du lägga till och ta bort åtkomsträttigheter för namnrymder och enstaka sidor i din wiki.
+
+Till vänster visas alla tillgängliga namnrymder och sidor du kan välja.  I formuläret ovanför kan du sedan välja användare eller grupp för vilken åtkomsträttigheterna ska visas eller ändras.
+
+Tabellen nedanför visar samtliga uppsatta regler för åtkomsträttigheter. Den kan du använda för att snabbt ta bort eller ändra flera regler på en gång.
+
+Läs gärna [[doku>acl|den officiella dokumentationen för ACL]] som kan hjälpa dig till fullo förstå hur åtkomsträttigheter fungerar i DokuWiki.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/lang.php
new file mode 100644
index 000000000..b5fd3b866
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/sv/lang.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * swedish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Per Foreby <per@foreby.se>
+ * @author Nicklas Henriksson <nicklas[at]nihe.se>
+ * @author Håkan Sandell <hakan.sandell[at]mydata.se>
+ * @author Dennis Karlsson
+ * @author Tormod Otter Johansson <tormod@latast.se>
+ * @author emil@sys.nu
+ * @author Pontus Bergendahl <pontus.bergendahl@gmail.com>
+ * @author Tormod Johansson tormod.otter.johansson@gmail.com
+ * @author Emil Lind <emil@sys.nu>
+ * @author Bogge Bogge <bogge@bogge.com>
+ * @author Peter Åström <eaustreum@gmail.com>
+ * @author Håkan Sandell <hakan.sandell@home.se>
+ */
+$lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
+$lang['acl_group']             = 'Grupp';
+$lang['acl_user']              = 'Användare';
+$lang['acl_perms']             = 'Behörighet för';
+$lang['page']                  = 'Sida';
+$lang['namespace']             = 'Namnrymd';
+$lang['btn_select']            = 'Välj';
+$lang['p_user_id']             = 'Användaren <b class="acluser">%s</b> har förnärvarande följande rättigheter på sidan <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Användaren <b class="acluser">%s</b> har för närvarande följande rättigheter i namnrymden <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Medlemmar av gruppen <b class="aclgroup">%s</b> har för närvarande följande rättigheter på sidan <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Medlemmar av gruppen <b class="aclgroup">%s</b> har för närvarande följande rättigheter i namnrymden <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Vänligen <b>ange en användare eller grupp</b> i formuläret ovan för att visa eller ändra rättigheterna för sidan <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Vänligen <b>ange en användare eller grupp</b> i formuläret ovan för att visa eller ändra rättigheterna för namnrymden <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Notering: De här rättigheterna är inte explicit satta utan var ärvda från andra grupper eller högre namnrymder.';
+$lang['p_isadmin']             = 'Notering: Den valda gruppen eller användaren har alltid fulla rättigheter på grund av att den är konfigurerad som superanvändare.';
+$lang['p_include']             = 'Högre rättigheter inkluderar lägre. Rättigheter för Skapa, Ladda upp och Radera är endast applicerbara namnrymder, inte sidor.';
+$lang['current']               = 'Nuvarande ACL regler';
+$lang['where']                 = 'Sida/Namnrymd';
+$lang['who']                   = 'Användare/Grupp';
+$lang['perm']                  = 'Rättigheter';
+$lang['acl_perm0']             = 'Inga';
+$lang['acl_perm1']             = 'Läsa';
+$lang['acl_perm2']             = 'Redigera';
+$lang['acl_perm4']             = 'Skapa';
+$lang['acl_perm8']             = 'Ladda upp';
+$lang['acl_perm16']            = 'Radera';
+$lang['acl_new']               = 'Lägg till ny behörighet';
+$lang['acl_mod']               = 'Ändra behörighet';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/help.txt
new file mode 100644
index 000000000..52edca93f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/help.txt
@@ -0,0 +1,11 @@
+=== ตัวช่วยอย่างเร็ว ===
+
+ในหน้านี้คุณสามารถเพิ่มและถอดสิทธิ์สำหรับเนมสเปซ และเพจในวิกิของคุณ
+
+แถบด้านซ้ายจะแสดงรายชื่อเนมสเปซ และเพจที่มีอยู่ทั้งหมด
+
+แบบฟอร์มข้างบนอนุญาติให้คุณมองเห็น และแก้ไขสิทธิ์ของผู้ใช้หรือกลุ่มที่เลือกไว้ได้
+
+ในตารางด้านล่างได้แสดงกฏควบคุมการเข้าถึงทั้งหมดไว้ คุณสามารถใช้มันลบ หรือเปลี่ยนกฏครั้งละหลายๆตัวพร้อมกันได้อย่างรวดเร็ว
+
+การอ่าน [[doku>acl|official documentation on ACL]] น่าจะช่วยให้คุณเข้าใจวิธีควบคุมการเข้าถึงของโดกุวิกิได้อย่างถ่องแท้
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/lang.php
new file mode 100644
index 000000000..472c33cdc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/th/lang.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Thai language file
+ *
+ * @author Komgrit Niyomrath <n.komgrit@gmail.com>
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Kittithat Arnontavilas <mrtomyum@gmail.com>
+ * @author Thanasak Sompaisansin <jombthep@gmail.com>
+ */
+$lang['admin_acl']             = 'จัดการรายชื่อเพื่อควบคุมการเข้าถึง (Access Control List:ACL)';
+$lang['acl_group']             = 'กลุ่ม';
+$lang['acl_user']              = 'ผู้ใช้';
+$lang['acl_perms']             = 'สิทธิสำหรับ';
+$lang['page']                  = 'เพจ';
+$lang['namespace']             = 'เนมสเปซ';
+$lang['btn_select']            = 'เลือก';
+$lang['where']                 = 'เพจ/เนมสเปซ';
+$lang['who']                   = 'ผู้ใช้/กลุ่ม';
+$lang['perm']                  = 'สิทธิ์';
+$lang['acl_perm0']             = 'ไร้สิทธิ์';
+$lang['acl_perm1']             = 'อ่าน';
+$lang['acl_perm2']             = 'แก้ไข';
+$lang['acl_perm4']             = 'สร้าง';
+$lang['acl_perm8']             = 'อัพโหลด';
+$lang['acl_perm16']            = 'ลบ';
+$lang['acl_new']               = 'เพิ่มเนื้อหาใหม่';
+$lang['acl_mod']               = 'ปรับแก้เนื้อหา';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/help.txt
new file mode 100644
index 000000000..b467c5019
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/help.txt
@@ -0,0 +1,11 @@
+=== Hızlı yardım: ===
+
+Bu sayfada Wiki'nizin namespace ve sayfaları için izinleri belirleyebilirsiniz.
+
+Soldaki kısım varolan namespace ve sayfaları listeler.
+
+Yukarıdaki kısım seçilen bir kullanıcı veya grup için izinleri görüp değiştirmenizi sağlar.
+
+Aşağıdaki tablo ise varolan erişim kontrol kurallarını gösterir. Bu tabloyu birden fazla kuralı hızlıca silip değiştirmek için kullanabilirsiniz.
+
+Resmi ACL dökümanını ([[doku>acl|official documentation on ACL]]) okuyarak erişim kontrolünün nasıl çalıştığını öğrenebilirsiniz.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/lang.php
new file mode 100644
index 000000000..45fbe7489
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/tr/lang.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * turkish language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Selim Farsakoğlu <farsakogluselim@yahoo.de>
+ * @author Aydın Coşkuner aydinweb@gmail.com
+ * @author Aydın Coşkuner <aydinweb@gmail.com>
+ * @author yavuzselim@gmail.com
+ * @author Cihan Kahveci kahvecicihan@gmail.com
+ * @author Yavuz Selim <yavuzselim@gmail.com>
+ */
+$lang['admin_acl']             = 'Erişim Kontrol Listesi (ACL) Yönetimi';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Kullanıcı';
+$lang['acl_perms']             = 'Şunun için yetkiler:';
+$lang['page']                  = 'Sayfa';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Seç';
+$lang['p_user_id']             = '<b class="acluser">%s</b> kullanıcısının şu anda <b class="aclpage">%s</b> sayfası için yetkisi: <i>%s</i>.';
+$lang['p_user_ns']             = '<b class="acluser">%s</b> kullanıcısının şu anda <b class="aclns">%s</b> namesapace\'i için yetkisi: <i>%s</i>.';
+$lang['p_group_id']            = '<b class="aclgroup">%s</b> grubunun şu anda <b class="aclpage">%s</b> sayfası için yetkisi: <i>%s</i>.';
+$lang['p_group_ns']            = '<b class="aclgroup">%s</b> grubunun şu anda <b class="aclns">%s</b> namesapace\'i için yetkisi: <i>%s</i>.';
+$lang['p_choose_id']           = 'Lütfen <b class="aclpage">%s</b> sayfasına izin verilen yetkilerini görmek veya değiştirmek için yukarıdaki forma <b>bir kullanıcı veya grup adı</b> girin.';
+$lang['p_choose_ns']           = 'Lütfen <b class="aclpage">%s</b> namespace\'ie izin verilen yetkileri görmek veya değiştirmek için yukarıdaki forma <b>bir kullanıcı veya grup adı</b> girin.';
+$lang['p_inherited']           = 'Not: Bu izinler doğrudan ayarlanmadan başka grup veya üst namespace\'lerden gelmektedir.';
+$lang['p_isadmin']             = 'Not: Seçili grup veya kullanıcı, "Ana kullanıcı" olarak atandığından tüm izinlere sahiptir.';
+$lang['p_include']             = 'Üst seviye izinler alt izinleri içermektedir. Oluşturma, Yükleme ve Silme yetkisi sadece namespace\'e uygulanmaktadır. Bu yetki sayfalara uygulanmaz.';
+$lang['current']               = 'Şimdiki ACL(İzin Kontrol listesi) kuralları';
+$lang['where']                 = 'Sayfa/Namespace';
+$lang['who']                   = 'Kullanıcı/Grup';
+$lang['perm']                  = 'İzinler';
+$lang['acl_perm0']             = 'Yok';
+$lang['acl_perm1']             = 'Okuma';
+$lang['acl_perm2']             = 'Değiştirme';
+$lang['acl_perm4']             = 'Oluşturma';
+$lang['acl_perm8']             = 'Yükleme';
+$lang['acl_perm16']            = 'Silme';
+$lang['acl_new']               = 'Yeni giriş ekle';
+$lang['acl_mod']               = 'Eski girişi değiştirme';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/help.txt
new file mode 100644
index 000000000..d16af0aa9
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/help.txt
@@ -0,0 +1,11 @@
+=== Швидка довідка: ===
+
+На цій сторінці ви можете додавати чи знищувати права доступу для просторів імен чи сторінок вашої вікі.
+
+Ліва панель показує всі доступні простори імен і сторінки.
+
+Верхня форма дозволяє переглянути і редагувати права доступу для обраного користувача чи групи
+
+В таблиці знизу показані всі оголошені правила доступу. Можете її використовувати для швидкого знищення чи модифікації кількох правил.
+
+Додаткова допомога в [[doku>acl|офіційній документації по ACL]] допоможе вам більше зрозуміти як працює контроль доступу у ДокуВікі.
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/lang.php
new file mode 100644
index 000000000..dc3e6a963
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/uk/lang.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * ukrainian language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author Oleksiy Voronin <ovoronin@gmail.com>
+ * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia <okunia@gmail.com>
+ * @author Uko uko@uar.net
+ */
+$lang['admin_acl']             = 'Керування списками контролю доступу';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Користувач';
+$lang['acl_perms']             = 'Права доступу для';
+$lang['page']                  = 'Сторінка';
+$lang['namespace']             = 'Простір імен';
+$lang['btn_select']            = 'Вибрати';
+$lang['p_user_id']             = 'Користувач <b class="acluser">%s</b> зараз має такі права доступу до сторінки <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_user_ns']             = 'Користувач <b class="acluser">%s</b> зараз має такі права доступу до простору імен <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_group_id']            = 'Члени групи <b class="aclgroup">%s</b> зараз мають такі права для сторінки <b class="aclpage">%s</b>: <i>%s</i>.';
+$lang['p_group_ns']            = 'Члени групи <b class="aclgroup">%s</b> зараз мають такі права доступу до простору імен <b class="aclns">%s</b>: <i>%s</i>.';
+$lang['p_choose_id']           = 'Будь-ласка <b>введіть користувача або групу<b> в поле зверху, щоб подивитися чи змінити права доступу до сторінки <b class="aclpage">%s</b>.';
+$lang['p_choose_ns']           = 'Будь-ласка <b>введіть користувача або групу<b> у вікно зверху, щоб подивитися чи змінити права доступу до сторінки <b class="aclns">%s</b>.';
+$lang['p_inherited']           = 'Зверніть увагу! Права доступу, не встановлені явно, наслідуються від інших груп чи вищих просторів імен.';
+$lang['p_isadmin']             = 'Зверніть увагу! Обрані група чи користувач завжди мають повні права доступу, оскільки вони є суперкористувачами.';
+$lang['p_include']             = 'Старші права доступу включають молодші. Створення, Завантаження і Вилучення застосовні лише до просторів імен.';
+$lang['current']               = 'Поточні правила ACL';
+$lang['where']                 = 'Сторінка/Простір імен';
+$lang['who']                   = 'Користувач/Група';
+$lang['perm']                  = 'Права доступу';
+$lang['acl_perm0']             = 'Жодних';
+$lang['acl_perm1']             = 'Читання';
+$lang['acl_perm2']             = 'Редагування';
+$lang['acl_perm4']             = 'Створення';
+$lang['acl_perm8']             = 'Завантаження';
+$lang['acl_perm16']            = 'Вилучення';
+$lang['acl_new']               = 'Додати новий запис';
+$lang['acl_mod']               = 'Змінити запис';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/vi/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/vi/lang.php
new file mode 100644
index 000000000..4458d806b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/vi/lang.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * vietnamese language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     James Do <jdo@myrealbox.com>
+ */
+
+$lang['admin_acl']  = 'Quản lý phép truy nhật {Access Control List}';
+$lang['acl_group']  = 'Nhóm';
+$lang['acl_user']   = 'Người';
+$lang['acl_perms']  = 'Phép truy nhập cho';
+$lang['page']       = 'Trang';
+$lang['namespace']  = 'Không gian tên';
+
+$lang['acl_perm1']  = 'Đọc';
+$lang['acl_perm2']  = 'Biên soạn';
+$lang['acl_perm4']  = 'Tạo';
+$lang['acl_perm8']  = 'Tải lên';
+$lang['acl_new']    = 'Thêm mục mới';
+//Setup VIM: ex: et ts=2 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/help.txt
new file mode 100644
index 000000000..871c1f4f1
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/help.txt
@@ -0,0 +1,11 @@
+=== 快速指南: ===
+
+在此頁面你可以為你的wiki中的namespace以及頁面增加或移除權限
+
+左方的面板顯示了所有的namespace以及頁面
+
+上方的表格允許你觀看以及修改被選擇的使用者或群組的權限
+
+下方的表格顯示了目前所有的存取控制規則(ACL) 你可以使用它快速的刪除或更改多項規則
+
+閱讀 [[doku>acl|official documentation on ACL]] 也許可以幫助你去完整地了解在DokuWiki中, 存取控制是如何運作的.
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/lang.php
new file mode 100644
index 000000000..d64e85a92
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh-tw/lang.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Chinese(Traditional) language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author chinsan <chinsan@mail2000.com.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmail.com>
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San <waynesan@zerozone.tw>
+ * @author Li-Jiun Huang <ljhuang.tw@gmai.com>
+ * @author Cheng-Wei Chien <e.cwchien@gmail.com>
+ */
+$lang['admin_acl']             = '設定 ACL 存取名單';
+$lang['acl_group']             = '群組';
+$lang['acl_user']              = '帳號';
+$lang['acl_perms']             = '設定權限於';
+$lang['page']                  = '頁面';
+$lang['namespace']             = '命名空間';
+$lang['btn_select']            = '選擇';
+$lang['p_user_id']             = '使用者 <b class="acluser">%s</b> 在頁面 <b class="aclpage">%s</b>目前擁有以下的權限: <i>%s</i>.';
+$lang['p_user_ns']             = '用戶 <b class=\"acluser\">%s</b> 當前在命名空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
+$lang['p_group_id']            = '群組 <b class="aclgroup">%s</b> 的成員目前對於頁面 <b class="aclpage">%s</b> 擁有以下的權限: <i>%s</i>.';
+$lang['p_group_ns']            = '<b class=\"aclgroup\">%s</b> 組成員當前在命名空間 <b class=\"aclns\">%s</b> 擁有以下權限：<i>%s</i>。';
+$lang['p_choose_id']           = '請在上方的表格中 <b>輸入一個帳號或群組</b> 來觀看或編輯頁面 <b class="aclpage">%s</b> 的權限.';
+$lang['p_choose_ns']           = '請在上表中<b>輸入用戶名或組名稱</b>，來查看或編輯命名空間 <b class=\"aclns\">%s</b> 的權限設置。';
+$lang['p_inherited']           = '請注意：這些權限並沒有明確設定，而是從其他組或更高級的名稱空間繼承而來。';
+$lang['p_isadmin']             = '請注意：選定的組或用戶擁有完全權限，因為它被設定為超級用戶。';
+$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能在命名空間中使用，而非頁面。';
+$lang['current']               = '目前的ACL規則';
+$lang['where']                 = '頁面/命名空間';
+$lang['who']                   = '使用者/群組';
+$lang['perm']                  = '權限';
+$lang['acl_perm0']             = '無';
+$lang['acl_perm1']             = '讀取權限';
+$lang['acl_perm2']             = '編輯頁面';
+$lang['acl_perm4']             = '新增頁面';
+$lang['acl_perm8']             = '上傳圖檔';
+$lang['acl_perm16']            = '刪除檔案';
+$lang['acl_new']               = '新增管理規則';
+$lang['acl_mod']               = '修改規則';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/help.txt b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/help.txt
new file mode 100644
index 000000000..526dcee9b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/help.txt
@@ -0,0 +1,11 @@
+=== 快速帮助 ===
+
+本页中您可以添加或移除命名空间或页面的权限。
+
+左边的窗格显示的是全部可用的命名空间和页面。
+
+您可以在上方的表格中查看并修改选定用户或组的权限。
+
+下方的表格中显示的是当前设置的全部访问控制规则。 您可以通过它快速删除或更改多条规则。
+
+参阅 [[doku>acl|official documentation on ACL]] 能帮助您完整地理解 DokuWiki 中的访问控制是如何工作的。
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/lang.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/lang.php
new file mode 100644
index 000000000..6ae32b01c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/lang/zh/lang.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Chinese(Simplified) language file
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author ZDYX <zhangduyixiong@gmail.com>
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan <simonzhan@21cn.com>
+ * @author mr.jinyi@gmail.com
+ */
+$lang['admin_acl']             = '访问控制列表（ACL）管理器';
+$lang['acl_group']             = '组';
+$lang['acl_user']              = '用户';
+$lang['acl_perms']             = '许可给';
+$lang['page']                  = '页面';
+$lang['namespace']             = '命名空间';
+$lang['btn_select']            = '選擇';
+$lang['p_user_id']             = '用户 <b class="acluser">%s</b> 当前在页面 <b class="aclpage">%s</b> 拥有以下权限：<i>%s</i>。';
+$lang['p_user_ns']             = '用户 <b class="acluser">%s</b> 当前在命名空间 <b class="aclns">%s</b> 拥有以下权限：<i>%s</i>。';
+$lang['p_group_id']            = '<b class="aclgroup">%s</b> 组成员当前在页面 <b class="aclpage">%s</b> 拥有以下权限：<i>%s</i>。';
+$lang['p_group_ns']            = '<b class="aclgroup">%s</b> 组成员当前在命名空间 <b class="aclns">%s</b> 拥有以下权限：<i>%s</i>。';
+$lang['p_choose_id']           = '请在上表中<b>输入用户名或组名称</b>，来查看或编辑页面 <b class="aclpage">%s</b> 的权限设置。';
+$lang['p_choose_ns']           = '请在上表中<b>输入用户名或组名称</b>，来查看或编辑命名空间 <b class="aclns">%s</b> 的权限设置。';
+$lang['p_inherited']           = '请注意：这些权限并没有明确设定，而是从其他组或更高级的名称空间继承而来。';
+$lang['p_isadmin']             = '请注意：选定的组或用户拥有完全权限，因为它被设定为超级用户。';
+$lang['p_include']             = '高权限包含低权限。创建、上传和删除权限只能应用于名称空间，而不是单个页面。';
+$lang['current']               = '当前 ACL 规则';
+$lang['where']                 = '页面/命名空间';
+$lang['who']                   = '用户/组';
+$lang['perm']                  = '权限';
+$lang['acl_perm0']             = '无';
+$lang['acl_perm1']             = '读取';
+$lang['acl_perm2']             = '编辑';
+$lang['acl_perm4']             = '创建';
+$lang['acl_perm8']             = '上传';
+$lang['acl_perm16']            = '删除';
+$lang['acl_new']               = '添加新条目';
+$lang['acl_mod']               = '编辑条目';
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/group.png b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/group.png
new file mode 100644
index 000000000..7fb4e1f1e
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/group.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/ns.png b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/ns.png
new file mode 100644
index 000000000..da3c2a2d7
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/ns.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/page.png b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/page.png
new file mode 100644
index 000000000..03ddd799f
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/page.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/user.png b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/user.png
new file mode 100644
index 000000000..8fd539e9c
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/pix/user.png
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/script.js b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/script.js
new file mode 100644
index 000000000..21f161a97
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/script.js
@@ -0,0 +1,163 @@
+acl = {
+    init: function(){
+        this.ctl = DOKUid('acl_manager');
+        if(!this.ctl) return;
+
+        var sel = DOKUid('acl__user').getElementsByTagName('select')[0];
+
+        addEvent(sel,'change',acl.userselhandler);
+        addEvent(DOKUid('acl__tree'),'click',acl.treehandler);
+        addEvent(DOKUid('acl__user').getElementsByTagName('input')[1],'click',acl.loadinfo);
+    },
+
+
+    /**
+     * Handle user dropdown
+     */
+    userselhandler: function(e){
+        // make entry field visible/invisible
+        if(this.value == '__g__' || this.value == '__u__'){
+            DOKUid('acl__user').getElementsByTagName('input')[0].style.display = ''; //acl_w
+            DOKUid('acl__user').getElementsByTagName('input')[1].style.display = ''; //submit
+        }else{
+            DOKUid('acl__user').getElementsByTagName('input')[0].style.display = 'none';
+            DOKUid('acl__user').getElementsByTagName('input')[1].style.display = 'none';
+        }
+
+        acl.loadinfo();
+    },
+
+    /**
+     * Load the current permission info and edit form
+     *
+     * @param frm - Form element with needed data
+     */
+    loadinfo: function(){
+        // get form
+        var frm = DOKUid('acl__detail').getElementsByTagName('form')[0];
+
+        // prepare an AJAX call
+        var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php');
+        ajax.AjaxFailedAlert = '';
+        ajax.encodeURIString = false;
+        if(ajax.failed) return true;
+
+        // prepare data
+        var data = Array();
+        data[0] = ajax.encVar('ns',frm.elements['ns'].value);
+        data[1] = ajax.encVar('id',frm.elements['id'].value);
+        data[2] = ajax.encVar('acl_t',frm.elements['acl_t'].value);
+        data[3] = ajax.encVar('acl_w',frm.elements['acl_w'].value);
+        data[4] = ajax.encVar('sectok',frm.elements['sectok'].value);
+        data[5] = ajax.encVar('ajax','info');
+
+        ajax.elementObj = DOKUid('acl__info');
+
+        ajax.runAJAX(data.join('&'));
+        return false;
+    },
+
+    /**
+     * parse URL attributes into a associative array
+     *
+     * @todo put into global script lib?
+     */
+    parseatt: function(str){
+        if(str[0] == '?') str = str.substr(1);
+        var attributes = {};
+        var all = str.split('&');
+        for(var i=0; i<all.length; i++){
+            var att = all[i].split('=');
+            attributes[att[0]] = decodeURIComponent(att[1]);
+        }
+        return attributes;
+    },
+
+    /**
+     * htmlspecialchars equivalent
+     *
+     * @todo put in gloabl scripts lib?
+     */
+    hsc: function(str) {
+        str = str.replace(/&/g,"&amp;");
+        str = str.replace(/\"/g,"&quot;");
+        str = str.replace(/\'/g,"&#039;");
+        str = str.replace(/</g,"&lt;");
+        str = str.replace(/>/g,"&gt;");
+        return str;
+    },
+
+
+    /**
+     * Open or close a subtree using AJAX
+     *
+     * @author Andreas Gohr <andi@splitbrain.org>
+     */
+    treetoggle: function(clicky){
+        var listitem = clicky.parentNode.parentNode;
+
+        // if already open, close by removing the sublist
+        var sublists = listitem.getElementsByTagName('ul');
+        if(sublists.length){
+            listitem.removeChild(sublists[0]);
+            clicky.src = DOKU_BASE+'lib/images/plus.gif';
+            clicky.alt = '+';
+            return false;
+        }
+
+        // get the enclosed link (is always the first one)
+        var link = listitem.getElementsByTagName('a')[0];
+
+        // prepare an AJAX call to fetch the subtree
+        var ajax = new sack(DOKU_BASE + 'lib/plugins/acl/ajax.php');
+        ajax.AjaxFailedAlert = '';
+        ajax.encodeURIString = false;
+        if(ajax.failed) return true;
+
+        //prepare the new ul
+        var ul = document.createElement('ul');
+        listitem.appendChild(ul);
+        ajax.elementObj = ul;
+        ajax.runAJAX(link.search.substr(1)+'&ajax=tree');
+        clicky.src = DOKU_BASE+'lib/images/minus.gif';
+        return false;
+    },
+
+    /**
+     * Handles all clicks in the tree, dispatching the right action based on the
+     * clicked element
+     */
+    treehandler: function(e){
+        if(e.target.src){ // is it an image?
+            acl.treetoggle(e.target);
+        } else if(e.target.href){ // is it a link?
+            // remove highlighting
+            var obj = getElementsByClass('cur',DOKUid('acl__tree'),'a');
+            for(var i=0; i<obj.length; i++){
+                obj[i].className = obj[i].className.replace(/ cur/,'');
+            }
+
+            // add new highlighting
+            e.target.className += ' cur';
+
+            // set new page to detail form
+            var frm = DOKUid('acl__detail').getElementsByTagName('form')[0];
+            if(e.target.className.search(/wikilink1/) > -1){
+                frm.elements['ns'].value = '';
+                frm.elements['id'].value = acl.hsc(acl.parseatt(e.target.search)['id']);
+            }else if(e.target.className.search(/idx_dir/) > -1){
+                frm.elements['ns'].value = acl.hsc(acl.parseatt(e.target.search)['ns']);
+                frm.elements['id'].value = '';
+            }
+
+            acl.loadinfo();
+        }
+
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+    }
+
+};
+
+addInitEvent(acl.init);
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/style.css b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/style.css
new file mode 100644
index 000000000..0c5a9819b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/acl/style.css
@@ -0,0 +1,96 @@
+
+div#acl_manager div#acl__tree {
+    font-size: 90%;
+    width: 25%;
+    height: 300px;
+    float: left;
+    overflow: auto;
+    border: 1px solid __border__;
+    text-align: left;
+}
+
+div#acl_manager div#acl__tree a.cur {
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+div#acl_manager div#acl__tree ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+div#acl_manager div#acl__tree li {
+    padding-left: 1em;
+}
+
+div#acl_manager div#acl__tree ul img {
+    margin-right: 0.25em;
+    cursor: pointer;
+}
+
+div#acl_manager div#acl__detail {
+    width: 73%;
+    height: 300px;
+    float: right;
+    overflow: auto;
+}
+
+div#acl_manager div#acl__detail fieldset {
+    width: 90%;
+}
+
+div#acl_manager div#acl__detail div#acl__user {
+    border: 1px solid __border__;
+    padding: 0.5em;
+    margin-bottom: 0.6em;
+}
+
+div#acl_manager table.inline {
+    width: 100%;
+    margin: 0;
+}
+
+div#acl_manager .aclgroup {
+    background: transparent url(pix/group.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+
+div#acl_manager .acluser {
+    background: transparent url(pix/user.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+
+div#acl_manager .aclpage {
+    background: transparent url(pix/page.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+
+div#acl_manager .aclns {
+    background: transparent url(pix/ns.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+
+div#acl_manager label.disabled {
+  color: __text_neu__!important;
+}
+
+#acl_manager label {
+  text-align: left;
+  font-weight: normal;
+  display: inline;
+}
+
+#acl_manager table {
+  margin-left: 10%;
+  width: 80%;
+}
+
+#acl_manager table tr {
+    background-color: inherit;
+}
+
+#acl_manager table tr:hover {
+    background-color: __background_alt__;
+}
+
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/action.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/action.php
new file mode 100644
index 000000000..a26bc654a
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/action.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Action Plugin Prototype
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Christopher Smith <chris@jalakai.co.uk>
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+require_once(DOKU_INC.'inc/plugin.php');
+
+/**
+ * All DokuWiki plugins to interfere with the event system
+ * need to inherit from this class
+ */
+class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
+
+     /**
+      * Registers a callback function for a given event
+      */
+      function register($controller) {
+        trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
+      }
+}
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/admin.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/admin.php
new file mode 100644
index 000000000..2eeda3f7b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/admin.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Admin Plugin Prototype
+ *
+ * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ * @author     Christopher Smith <chris@jalakai.co.uk>
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+require_once(DOKU_INC.'inc/plugin.php');
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
+
+    function getMenuText($language) {
+        $menutext = $this->getLang('menu');
+        if (!$menutext) {
+            $info = $this->getInfo();
+            $menutext = $info['name'].' ...';
+        }
+        return $menutext;
+    }
+
+    function getMenuSort() {
+        return 1000;
+    }
+
+    function handle() {
+        trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    function html() {
+        trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    function forAdminOnly() {
+        return true;
+    }
+
+    function getTOC(){
+        return array();
+    }
+}
+//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/print.css b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/print.css
new file mode 100644
index 000000000..956b8a38b
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/print.css
@@ -0,0 +1,274 @@
+@CHARSET "UTF-8";
+
+/* plugin:box */
+div.box {
+  width: 50%;
+  margin: 1em auto;
+  border: 1px solid;
+  padding: 4px;
+  overflow: hidden;
+}
+
+/* rounded corners styles from Stu Nicholls snazzy borders, http://www.cssplay.co.uk/boxes/snazzy.html */
+.xtop, .xbottom {background:transparent; font-size:0; line-height: 1px;}
+.xb1, .xb2, .xb3, .xb4 {display:block; overflow:hidden; border-style: solid;}
+.xb2, .xb3 {height:1px;}
+.xb2, .xb3, .xb4 {border-width:0 1px;}
+.xb1 {height: 0; margin:0 5px; border-width:1px 0 0 0;}
+.xb2 {margin:0 3px; border-width:0 2px;}
+.xb3 {margin:0 2px;}
+.xb4 {height:2px; margin:0 1px;}
+
+div.box .xtop, div.box .xbottom {display: none;}
+div.box.round > .xtop, div.box.round > .xbottom {display: block;}
+
+div.box.round { border: none; padding: 0;}
+div.box.round > .xbox {display:block; border-width:0 1px; border-style: solid; padding: 0 4px; }
+
+div.box p.box_title, div.box p.box_caption {
+  font-size: 90%;
+  margin: 0;
+  padding: 2px 6px;
+  line-height: 1.2;
+}
+
+div.box p.box_title { margin-bottom: 4px;}
+div.box p.box_caption { margin-top: 4px;}
+
+div.box .box_content {
+  margin: 0;
+  padding: 0 6px;
+  border-width: 1px;
+  border-style: dashed;
+  line-height: 1.2;
+}
+
+/* floating alignment */
+
+div.box.left {
+  float: left;
+  margin-right: 1em;
+}
+ 
+div.box.right {
+  float: right;
+  margin-left: 1em;
+}
+
+/* colours */
+/* default */
+div.box, div.box .box_content, div.box .xbox, div.box .xb1, div.box .xb2, div.box .xb3, div.box .xb4 {
+  border-color:  __dark__;
+}
+
+div.box, div.box .xbox, div.box .xb1, div.box .xb2, div.box .xb3, div.box .xb4 {
+  background: __light__;
+}
+
+div.box p.box_title, div.box p.box_caption { background: __medium__;}
+div.box .box_content { background: __lighter__;}
+
+/* blue */
+div.box.blue, div.box.blue > * > .box_content, div.box.blue > .xbox, 
+div.box.blue > * > .xb1, div.box.blue > * > .xb2, div.box.blue > * > .xb3, div.box.blue > * > .xb4 {
+  border-color:  #bbbbdd;
+}
+
+div.box.blue, div.box.blue > .xbox, 
+div.box.blue > * > .xb1, div.box.blue > * > .xb2, div.box.blue > * > .xb3, div.box.blue > * > .xb4 {
+  background: #e4ecf8;
+}
+
+div.box.blue > * > p.box_title, div.box.blue > * > p.box_caption {background: #cad0ee;}
+div.box.blue > * > .box_content {background: #f4f8fd;}
+
+/* red */
+div.box.red, div.box.red > * > .box_content, div.box.red > .xbox, 
+div.box.red > * > .xb1, div.box.red > * > .xb2, div.box.red > * > .xb3, div.box.red > * > .xb4 {
+  border-color:  #ddbbbb;
+}
+
+div.box.red, div.box.red > .xbox, 
+div.box.red > * > .xb1, div.box.red > * > .xb2, div.box.red > * > .xb3, div.box.red > * > .xb4 {
+  background: #f8ece4;
+}
+
+div.box.red > * > p.box_title, div.box.red > * > p.box_caption {background: #eed0ca;}
+div.box.red > * > .box_content {background: #fdf4ec;}
+
+/* green */
+div.box.green, div.box.green > * > .box_content, div.box.green > .xbox, 
+div.box.green > * > .xb1, div.box.green > * > .xb2, div.box.green > * > .xb3, div.box.green > * > .xb4 {
+  border-color:  #bbddbb;
+}
+
+div.box.green, div.box.green > .xbox, 
+div.box.green > * > .xb1, div.box.green > * > .xb2, div.box.green > * > .xb3, div.box.green > * > .xb4 {
+  background: #e4f8f2;
+}
+
+div.box.green > * > p.box_title, div.box.green > * > p.box_caption {background: #c4e4d4;}
+div.box.green > * > .box_content {background: #ecfaf6;}
+
+/* orange */
+div.box.orange, div.box.orange > * > .box_content, div.box.orange > .xbox, 
+div.box.orange > * > .xb1, div.box.orange > * > .xb2, div.box.orange > * > .xb3, div.box.orange > * > .xb4 {
+  border-color:  #da3;
+}
+
+div.box.orange, div.box.orange > .xbox, 
+div.box.orange > * > .xb1, div.box.orange > * > .xb2, div.box.orange > * > .xb3, div.box.orange > * > .xb4 {
+  background: #f4e8ca;
+}
+
+div.box.orange > * > p.box_title, div.box.orange > * > p.box_caption {background: #f0d499;}
+div.box.orange > * > .box_content {background: #f8f0da;}
+
+/* must come last to override coloured background when using rounded corners */
+
+div.box.round {
+  background: transparent !important;
+}
+
+/* IE fixes for unsupported child selector \*/
+
+* html div.box div.box, * html div.box div.box .box_content, * html div.box div.box .xbox, 
+* html div.box div.box .xb1, * html div.box div.box .xb2, 
+* html div.box div.box .xb3, * html div.box div.box .xb4 {
+  border-color:  __dark__;
+}
+
+* html div.box div.box, * html div.box div.box .xbox, 
+* html div.box div.box .xb1, * html div.box div.box .xb2, 
+* html div.box div.box .xb3, * html div.box div.box .xb4 {
+  background: __light__;
+}
+
+* html div.box div.box p.box_title, * html div.box div.box p.box_caption { background: __medium__;}
+* html div.box div.box .box_content { background: __lighter__;}
+
+* html div.box.round .xtop, * html div.box.round .xbottom {display: block;}
+* html div.box.round .xbox {display:block; border-width:0 1px; border-style: solid; padding: 0 4px; }
+
+/* blue */
+* html div.box.blue .box_content, * html div.box.blue .xbox, 
+* html div.box.blue .xb1, * html div.box.blue .xb2, * html div.box.blue .xb3, * html div.box.blue .xb4 {
+  border-color:  #bbbbdd;
+}
+
+* html div.box.blue .xbox, 
+* html div.box.blue .xb1, * html div.box.blue .xb2, * html div.box.blue .xb3, * html div.box.blue .xb4 {
+  background: #e4ecf8;
+}
+
+* html div.box.blue p.box_title, * html div.box.blue p.box_caption {background: #cad0ee;}
+* html div.box.blue .box_content {background: #f4f8fd;}
+
+/* nested blue */
+* html div.box div.box.blue .box_content, * html div.box div.box.blue .xbox, 
+* html div.box div.box.blue .xb1, * html div.box div.box.blue .xb2, 
+* html div.box div.box.blue .xb3, * html div.box div.box.blue .xb4 {
+  border-color:  #bbbbdd;
+}
+
+* html div.box div.box.blue .xbox, 
+* html div.box div.box.blue .xb1, * html div.box div.box.blue .xb2, 
+* html div.box div.box.blue .xb3, * html div.box div.box.blue .xb4 {
+  background: #e4ecf8;
+}
+
+* html div.box div.box.blue p.box_title, 
+* html div.box div.box.blue p.box_caption {background: #cad0ee;}
+* html div.box div.box.blue .box_content {background: #f4f8fd;}
+
+/* red */
+* html div.box.red .box_content, * html div.box.red .xbox, 
+* html div.box.red .xb1, * html div.box.red .xb2, * html div.box.red .xb3, * html div.box.red .xb4 {
+  border-color:  #ddbbbb;
+}
+
+* html div.box.red .xbox, 
+* html div.box.red .xb1, * html div.box.red .xb2, * html div.box.red .xb3, * html div.box.red .xb4 {
+  background: #f8ece4;
+}
+
+* html div.box.red p.box_title, * html div.box.red p.box_caption {background: #eed0ca;}
+* html div.box.red .box_content {background: #fdf4ec;}
+
+/* nested red */
+* html div.box div.box.red .box_content, * html div.box div.box.red .xbox, 
+* html div.box div.box.red .xb1, * html div.box div.box.red .xb2, 
+* html div.box div.box.red .xb3, * html div.box div.box.red .xb4 {
+  border-color:  #ddbbbb;
+}
+
+* html div.box div.box.red .xbox, 
+* html div.box div.box.red .xb1, * html div.box div.box.red .xb2, 
+* html div.box div.box.red .xb3, * html div.box div.box.red .xb4 {
+  background: #f8ece4;
+}
+
+* html div.box div.box.red p.box_title, * html div.box div.box.red p.box_caption {background: #eed0ca;}
+* html div.box div.box.red .box_content {background: #fdf4ec;}
+
+/* green */
+* html div.box.green .box_content, * html div.box.green .xbox, 
+* html div.box.green .xb1, * html div.box.green .xb2, * html div.box.green .xb3, * html div.box.green .xb4 {
+  border-color:  #bbddbb;
+}
+
+* html div.box.green .xbox, 
+* html div.box.green .xb1, * html div.box.green .xb2, * html div.box.green .xb3, * html div.box.green .xb4 {
+  background: #e4f8f2;
+}
+
+* html div.box.green p.box_title, * html div.box.green p.box_caption {background: #c4e4d4;}
+* html div.box.green .box_content {background: #ecfaf6;}
+
+/* nested green */
+* html div.box div.box.green .box_content, * html div.box div.box.green .xbox, 
+* html div.box div.box.green .xb1, * html div.box div.box.green .xb2, 
+* html div.box div.box.green .xb3, * html div.box div.box.green .xb4 {
+  border-color:  #bbddbb;
+}
+
+* html div.box div.box.green .xbox, 
+* html div.box div.box.green .xb1, * html div.box div.box.green .xb2, 
+* html div.box div.box.green .xb3, * html div.box div.box.green .xb4 {
+  background: #e4f8f2;
+}
+
+* html div.box div.box.green p.box_title, * html div.box div.box.green p.box_caption {background: #c4e4d4;}
+* html div.box div.box.green .box_content {background: #ecfaf6;}
+
+/* orange */
+* html div.box.orange .box_content, * html div.box.orange .xbox, 
+* html div.box.orange .xb1, * html div.box.orange .xb2, * html div.box.orange .xb3, * html div.box.orange .xb4 {
+  border-color:  #da3;
+}
+
+* html div.box.orange .xbox, 
+* html div.box.orange .xb1, * html div.box.orange .xb2, * html div.box.orange .xb3, * html div.box.orange .xb4 {
+  background: #f4e8ca;
+}
+
+* html div.box.orange p.box_title, * html div.box.orange p.box_caption {background: #f0d499;}
+* html div.box.orange .box_content {background: #f8f0da;}
+
+/* nestedorange */
+* html div.box div.box.orange .box_content, * html div.box div.box.orange .xbox, 
+* html div.box div.box.orange .xb1, * html div.box div.box.orange .xb2, 
+* html div.box div.box.orange .xb3, * html div.box div.box.orange .xb4 {
+  border-color:  #da3;
+}
+
+* html div.box div.box.orange .xbox, 
+* html div.box div.box.orange .xb1, * html div.box div.box.orange .xb2, 
+* html div.box div.box.orange .xb3, * html div.box div.box.orange .xb4 {
+  background: #f4e8ca;
+}
+
+* html div.box div.box.orange p.box_title, * html div.box div.box.orange p.box_caption {background: #f0d499;}
+* html div.box div.box.orange .box_content {background: #f8f0da;}
+
+/* end plugin:box */
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/style.css b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/style.css
new file mode 100644
index 000000000..f20d765bc
--- /dev/null
+++ b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/style.css
@@ -0,0 +1,272 @@
+/* plugin:box */
+div.box {
+  width: 50%;
+  margin: 1em auto;
+  border: 1px solid;
+  padding: 4px;
+  overflow: hidden;
+}
+
+/* rounded corners styles from Stu Nicholls snazzy borders, http://www.cssplay.co.uk/boxes/snazzy.html */
+.xtop, .xbottom {background:transparent; font-size:0; line-height: 1px;}
+.xb1, .xb2, .xb3, .xb4 {display:block; overflow:hidden; border-style: solid;}
+.xb2, .xb3 {height:1px;}
+.xb2, .xb3, .xb4 {border-width:0 1px;}
+.xb1 {height: 0; margin:0 5px; border-width:1px 0 0 0;}
+.xb2 {margin:0 3px; border-width:0 2px;}
+.xb3 {margin:0 2px;}
+.xb4 {height:2px; margin:0 1px;}
+
+div.box .xtop, div.box .xbottom {display: none;}
+div.box.round > .xtop, div.box.round > .xbottom {display: block;}
+
+div.box.round { border: none; padding: 0;}
+div.box.round > .xbox {display:block; border-width:0 1px; border-style: solid; padding: 0 4px; }
+
+div.box p.box_title, div.box p.box_caption {
+  font-size: 90%;
+  margin: 0;
+  padding: 2px 6px;
+  line-height: 1.2;
+}
+
+div.box p.box_title { margin-bottom: 4px;}
+div.box p.box_caption { margin-top: 4px;}
+
+div.box .box_content {
+  margin: 0;
+  padding: 0 6px;
+  border-width: 1px;
+  border-style: dashed;
+  line-height: 1.2;
+}
+
+/* floating alignment */
+
+div.box.left {
+  float: left;
+  margin-right: 1em;
+}
+ 
+div.box.right {
+  float: right;
+  margin-left: 1em;
+}
+
+/* colours */
+/* default */
+div.box, div.box .box_content, div.box .xbox, div.box .xb1, div.box .xb2, div.box .xb3, div.box .xb4 {
+  border-color:  __dark__;
+}
+
+div.box, div.box .xbox, div.box .xb1, div.box .xb2, div.box .xb3, div.box .xb4 {
+  background: __light__;
+}
+
+div.box p.box_title, div.box p.box_caption { background: __medium__;}
+div.box .box_content { background: __lighter__;}
+
+/* blue */
+div.box.blue, div.box.blue > * > .box_content, div.box.blue > .xbox, 
+div.box.blue > * > .xb1, div.box.blue > * > .xb2, div.box.blue > * > .xb3, div.box.blue > * > .xb4 {
+  border-color:  #bbbbdd;
+}
+
+div.box.blue, div.box.blue > .xbox, 
+div.box.blue > * > .xb1, div.box.blue > * > .xb2, div.box.blue > * > .xb3, div.box.blue > * > .xb4 {
+  background: #e4ecf8;
+}
+
+div.box.blue > * > p.box_title, div.box.blue > * > p.box_caption {background: #cad0ee;}
+div.box.blue > * > .box_content {background: #f4f8fd;}
+
+/* red */
+div.box.red, div.box.red > * > .box_content, div.box.red > .xbox, 
+div.box.red > * > .xb1, div.box.red > * > .xb2, div.box.red > * > .xb3, div.box.red > * > .xb4 {
+  border-color:  #ddbbbb;
+}
+
+div.box.red, div.box.red > .xbox, 
+div.box.red > * > .xb1, div.box.red > * > .xb2, div.box.red > * > .xb3, div.box.red > * > .xb4 {
+  background: #f8ece4;
+}
+
+div.box.red > * > p.box_title, div.box.red > * > p.box_caption {background: #eed0ca;}
+div.box.red > * > .box_content {background: #fdf4ec;}
+
+/* green */
+div.box.green, div.box.green > * > .box_content, div.box.green > .xbox, 
+div.box.green > * > .xb1, div.box.green > * > .xb2, div.box.green > * > .xb3, div.box.green > * > .xb4 {
+  border-color:  #bbddbb;
+}
+
+div.box.green, div.box.green > .xbox, 
+div.box.green > * > .xb1, div.box.green > * > .xb2, div.box.green > * > .xb3, div.box.green > * > .xb4 {
+  background: #e4f8f2;
+}
+
+div.box.green > * > p.box_title, div.box.green > * > p.box_caption {background: #c4e4d4;}
+div.box.green > * > .box_content {background: #ecfaf6;}
+
+/* orange */
+div.box.orange, div.box.orange > * > .box_content, div.box.orange > .xbox, 
+div.box.orange > * > .xb1, div.box.orange > * > .xb2, div.box.orange > * > .xb3, div.box.orange > * > .xb4 {
+  border-color:  #da3;
+}
+
+div.box.orange, div.box.orange > .xbox, 
+div.box.orange > * > .xb1, div.box.orange > * > .xb2, div.box.orange > * > .xb3, div.box.orange > * > .xb4 {
+  background: #f4e8ca;
+}
+
+div.box.orange > * > p.box_title, div.box.orange > * > p.box_caption {background: #f0d499;}
+div.box.orange > * > .box_content {background: #f8f0da;}
+
+/* must come last to override coloured background when using rounded corners */
+
+div.box.round {
+  background: transparent !important;
+}
+
+/* IE fixes for unsupported child selector \*/
+
+* html div.box div.box, * html div.box div.box .box_content, * html div.box div.box .xbox, 
+* html div.box div.box .xb1, * html div.box div.box .xb2, 
+* html div.box div.box .xb3, * html div.box div.box .xb4 {
+  border-color:  __dark__;
+}
+
+* html div.box div.box, * html div.box div.box .xbox, 
+* html div.box div.box .xb1, * html div.box div.box .xb2, 
+* html div.box div.box .xb3, * html div.box div.box .xb4 {
+  background: __light__;
+}
+
+* html div.box div.box p.box_title, * html div.box div.box p.box_caption { background: __medium__;}
+* html div.box div.box .box_content { background: __lighter__;}
+
+* html div.box.round .xtop, * html div.box.round .xbottom {display: block;}
+* html div.box.round .xbox {display:block; border-width:0 1px; border-style: solid; padding: 0 4px; }
+
+/* blue */
+* html div.box.blue .box_content, * html div.box.blue .xbox, 
+* html div.box.blue .xb1, * html div.box.blue .xb2, * html div.box.blue .xb3, * html div.box.blue .xb4 {
+  border-color:  #bbbbdd;
+}
+
+* html div.box.blue .xbox, 
+* html div.box.blue .xb1, * html div.box.blue .xb2, * html div.box.blue .xb3, * html div.box.blue .xb4 {
+  background: #e4ecf8;
+}
+
+* html div.box.blue p.box_title, * html div.box.blue p.box_caption {background: #cad0ee;}
+* html div.box.blue .box_content {background: #f4f8fd;}
+
+/* nested blue */
+* html div.box div.box.blue .box_content, * html div.box div.box.blue .xbox, 
+* html div.box div.box.blue .xb1, * html div.box div.box.blue .xb2, 
+* html div.box div.box.blue .xb3, * html div.box div.box.blue .xb4 {
+  border-color:  #bbbbdd;
+}
+
+* html div.box div.box.blue .xbox, 
+* html div.box div.box.blue .xb1, * html div.box div.box.blue .xb2, 
+* html div.box div.box.blue .xb3, * html div.box div.box.blue .xb4 {
+  background: #e4ecf8;
+}
+
+* html div.box div.box.blue p.box_title, 
+* html div.box div.box.blue p.box_caption {background: #cad0ee;}
+* html div.box div.box.blue .box_content {background: #f4f8fd;}
+
+/* red */
+* html div.box.red .box_content, * html div.box.red .xbox, 
+* html div.box.red .xb1, * html div.box.red .xb2, * html div.box.red .xb3, * html div.box.red .xb4 {
+  border-color:  #ddbbbb;
+}
+
+* html div.box.red .xbox, 
+* html div.box.red .xb1, * html div.box.red .xb2, * html div.box.red .xb3, * html div.box.red .xb4 {
+  background: #f8ece4;
+}
+
+* html div.box.red p.box_title, * html div.box.red p.box_caption {background: #eed0ca;}
+* html div.box.red .box_content {background: #fdf4ec;}
+
+/* nested red */
+* html div.box div.box.red .box_content, * html div.box div.box.red .xbox, 
+* html div.box div.box.red .xb1, * html div.box div.box.red .xb2, 
+* html div.box div.box.red .xb3, * html div.box div.box.red .xb4 {
+  border-color:  #ddbbbb;
+}
+
+* html div.box div.box.red .xbox, 
+* html div.box div.box.red .xb1, * html div.box div.box.red .xb2, 
+* html div.box div.box.red .xb3, * html div.box div.box.red .xb4 {
+  background: #f8ece4;
+}
+
+* html div.box div.box.red p.box_title, * html div.box div.box.red p.box_caption {background: #eed0ca;}
+* html div.box div.box.red .box_content {background: #fdf4ec;}
+
+/* green */
+* html div.box.green .box_content, * html div.box.green .xbox, 
+* html div.box.green .xb1, * html div.box.green .xb2, * html div.box.green .xb3, * html div.box.green .xb4 {
+  border-color:  #bbddbb;
+}
+
+* html div.box.green .xbox, 
+* html div.box.green .xb1, * html div.box.green .xb2, * html div.box.green .xb3, * html div.box.green .xb4 {
+  background: #e4f8f2;
+}
+
+* html div.box.green p.box_title, * html div.box.green p.box_caption {background: #c4e4d4;}
+* html div.box.green .box_content {background: #ecfaf6;}
+
+/* nested green */
+* html div.box div.box.green .box_content, * html div.box div.box.green .xbox, 
+* html div.box div.box.green .xb1, * html div.box div.box.green .xb2, 
+* html div.box div.box.green .xb3, * html div.box div.box.green .xb4 {
+  border-color:  #bbddbb;
+}
+
+* html div.box div.box.green .xbox, 
+* html div.box div.box.green .xb1, * html div.box div.box.green .xb2, 
+* html div.box div.box.green .xb3, * html div.box div.box.green .xb4 {
+  background: #e4f8f2;
+}
+
+* html div.box div.box.green p.box_title, * html div.box div.box.green p.box_caption {background: #c4e4d4;}
+* html div.box div.box.green .box_content {background: #ecfaf6;}
+
+/* orange */
+* html div.box.orange .box_content, * html div.box.orange .xbox, 
+* html div.box.orange .xb1, * html div.box.orange .xb2, * html div.box.orange .xb3, * html div.box.orange .xb4 {
+  border-color:  #da3;
+}
+
+* html div.box.orange .xbox, 
+* html div.box.orange .xb1, * html div.box.orange .xb2, * html div.box.orange .xb3, * html div.box.orange .xb4 {
+  background: #f4e8ca;
+}
+
+* html div.box.orange p.box_title, * html div.box.orange p.box_caption {background: #f0d499;}
+* html div.box.orange .box_content {background: #f8f0da;}
+
+/* nestedorange */
+* html div.box div.box.orange .box_content, * html div.box div.box.orange .xbox, 
+* html div.box div.box.orange .xb1, * html div.box div.box.orange .xb2, 
+* html div.box div.box.orange .xb3, * html div.box div.box.orange .xb4 {
+  border-color:  #da3;
+}
+
+* html div.box div.box.orange .xbox, 
+* html div.box div.box.orange .xb1, * html div.box div.box.orange .xb2, 
+* html div.box div.box.orange .xb3, * html div.box div.box.orange .xb4 {
+  background: #f4e8ca;
+}
+
+* html div.box div.box.orange p.box_title, * html div.box div.box.orange p.box_caption {background: #f0d499;}
+* html div.box div.box.orange .box_content {background: #f8f0da;}
+
+/* end plugin:box */
+\ No newline at end of file
diff --git a/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/syntax.php b/mod/dokuwiki/vendors/dokuwiki/lib/plugins/box/syntax.php
new file mode 100644
index 000000000..35f96f85a
--- /dev/null
+++ b/